7530 files changed, 70121 insertions, 84629 deletions

diff --git a/Manifest b/Manifest
index 78a7c762017e..3e27fe4cc68e 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29291 BLAKE2B bbf7bfb5e6105253ac4aebd1a65739e4a8937812141049caef4f15d453126deb5e535aff4d32ccdd70e73060814c8de63125d36ceb6655e9f0f29fea898d53c0 SHA512 78a239f29c831c765f9ed7283eb21dff6a7f6e23ec983ff5b2972d9ab077c5d39fd909a7779f4e0a9044ceb3a097b652ca2a064e300d27fd627e3f92a3952876
-TIMESTAMP 2021-07-12T07:09:01Z
+MANIFEST Manifest.files.gz 29302 BLAKE2B ff0f87631ff38ba399234639b47cd1f7099491e676f22c991f1cac8c80dc28ba223d7abdcb0c925a25e5b2ed146b4e38590b2e8e49082f954bff855e669948a6 SHA512 40f520674f308439db41bee7a633c87dc87c4d0cb46e16101eaba3e614d896c73e3038b465447d554cb3ed8b26b55b0be48a4ccd96680c45859d46132aa598b6
+TIMESTAMP 2021-07-17T17:39:11Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDr6o1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDzFb9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCy3g/+KhTXW/mSkOWpG7xCc+/pJRnlzRSw6eSt0ta3O3oqszDTpTO+ruuTbLCs
-BvE4f2Tp9S5A4pgUzip/wCBkYMOccpJhS7bjgnXgTHAyoM/wdAzyP6N+2eRtsc7z
-lu+HDkEbMmXxFIz665+DfvVAI19ZOPi1TKgjg2Ude8Hj0l1Z1jHbbtb7L1gIJhSF
-11nNmjTnnP7y5F5AM3tdQGvk4YiUL64GSo1L43H72+JRqYV4nuAVkdL84+HH3/eb
-gt1z167kToF51j0lG/pbm0RbQy4NUWOYy2h9VQpZtiykm8Xn6bgbAg+h+I1c6USt
-Gc/WGo9a9t6jx0ytmdyMXL2v3AYASMIx4Zcj6bkvDzfxn7ThVtIkO7ckhHPbnt8H
-XjIVNzMi5cOyrllMRMrqD/ny3xwuTzy1OCL9mE6Su9FSbv8+ZBP65ngkKR3nYHpC
-c2WATdkLCyscEiZ8ExmCLnCJKrAHFJLsEtJdE7bzH7U4hpw/XcOjipQHFBGluLn3
-Tmv6Lq8kj6YWN3IKNNo1wRelKtDdILhGYf7Gei+nccnTmB/AY+GLL1XLXDxSpWg1
-DeY/C7yq34kb77oLobyOCyIg+Y+TRzFHTVn4iJjCXh/JbZOhZw+K7HB+dZo1Owk8
-NVBCLCLnwodcZ+6UZaw8jR3p0U7XBoznlPKVnTD+I74l8fF/f6g=
-=UHEu
+klBV2RAAs+ZsBCYgEmPngonUMfZTHrEC4YLkFlwkFETWPubAJQk/VbJRdqoV/8Jx
+2QzHWutMCL8a605N9qIgF2JkGgrnBDNT5FonNcp5cYPt403HWW1uXAX9Nedq4aU0
+nMvHUn8IwRSqcoJfxIKj11DbPs+xjY8Y/1pGZIWu5jEuxkins7ANKUVxWtVfRvtf
+TSppYllTb4ZiJAhv8l3gG22tuRCZGnt02/G0bgYmFUKmGHvRFRxLtav7X2xexOVi
+6gisZxbAoa+nEalJsozxUCXTrleaeo2e/MauMFE5dUREDm3jrWXNcS1N+LytAvsy
+Pku0s+meqGqVFfuZ6pCNhBQFS2p4ts3Md5GzVVcXL0HR8FpHedy3BuF0+BDVUb6n
+RvkPqCtA0F82TwJWXt/Emh+ohueYrDFJPLd59s56umKLja3kSQi3TL9xdaK+SOwf
+3neeK3U+/vudmm1mg08POpJVBPvXHMBtOHgZapjKEdyB8BEXva/HG5wfcAGlrywf
+8BALze+xQjBEAtVL+RFvnHQZYPhZP9LoG5uNeXHbyqVHqhCcFU9zlMS7lEAs3Jo4
+VAuTwQqwHj8tm66zJHGXUKYM1fgzjmFYV4GIv4acUlNAY+X8QxzX08X9DVBjeTTC
+Mn4SN5+LbAAOsEnGAkE1GIyMVJOzgxowfTOn9q9HuxUmPtF0t20=
+=rQEF
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 53de15899469..c6d3b830459f 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 56c62607ce62..3c4e8a8c1e8c 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/arpwatch/Manifest b/acct-group/arpwatch/Manifest
new file mode 100644
index 000000000000..0d4147241647
--- /dev/null
+++ b/acct-group/arpwatch/Manifest
@@ -0,0 +1,2 @@
+EBUILD arpwatch-0.ebuild 202 BLAKE2B 42851fd4afbaa1cc79f347c3e182e1a386bef5ffbfa05ba25dc666b4b9e3d9d0267469177b8b808eb4d5f2abe62eeb6c8c64f20022e1dfe7c31db04f8be00a33 SHA512 8f8fd154767bf076291c128a47e26ba79f5c9c3f3756c4be96397eae5a68c46c77c0724141e00b0fff79ad226b292be5b7e5a0e6c9c342ec211a8452c8027766
+MISC metadata.xml 279 BLAKE2B e82e78f26d4ac6d2d37b0799b4f097bef3e46787927d5ecec571f13b200afc5fb0414dafb7be3c2f4fb02fd8e0846a822566cd97895dfa0de03645b916c2f07d SHA512 c63811d8a01de3739c7406edaaaa9097cbba34d0d6b812948e011612718bec5c0a8ce0157ba0a0a60eb6382aca9005ba99d3207936cecee4b9974e7e8259ad98
diff --git a/acct-group/arpwatch/arpwatch-0.ebuild b/acct-group/arpwatch/arpwatch-0.ebuild
new file mode 100644
index 000000000000..c232fe3a362c
--- /dev/null
+++ b/acct-group/arpwatch/arpwatch-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/arpwatch"
+
+ACCT_GROUP_ID="170"
diff --git a/acct-group/arpwatch/metadata.xml b/acct-group/arpwatch/metadata.xml
new file mode 100644
index 000000000000..7a30dbc2bd6a
--- /dev/null
+++ b/acct-group/arpwatch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/axtls/Manifest b/acct-group/axtls/Manifest
new file mode 100644
index 000000000000..f7c3b929616e
--- /dev/null
+++ b/acct-group/axtls/Manifest
@@ -0,0 +1,2 @@
+EBUILD axtls-0.ebuild 195 BLAKE2B f35f2407ec1ce76ca312719ea2ad58e155071e63d6b3c9a8869aa4aab0d802da9265ec355c6c0b2d3c886889b22ecaac4e7a22ee899fb1f1ba03e5381b396741 SHA512 5da2aa28b7baf4dfccff5eac2b9c28aaafac780b0f3b0f6abefc06a8a38baafe9d001614533e607b61d63695696ab97d4fe6118e251c594eb48ca163425de23c
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/acct-group/axtls/axtls-0.ebuild b/acct-group/axtls/axtls-0.ebuild
new file mode 100644
index 000000000000..4534ecf5b634
--- /dev/null
+++ b/acct-group/axtls/axtls-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-libs/axtls"
+
+ACCT_GROUP_ID="147"
diff --git a/acct-group/axtls/metadata.xml b/acct-group/axtls/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/axtls/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/badvpn/Manifest b/acct-group/badvpn/Manifest
new file mode 100644
index 000000000000..221f745263ac
--- /dev/null
+++ b/acct-group/badvpn/Manifest
@@ -0,0 +1,2 @@
+EBUILD badvpn-0.ebuild 195 BLAKE2B 13a7b20a2d3821334b79c3087e59ad99a228f897ba0ec6e4ac42a2e63a705e9f9a33c226d07841ac791d28f528cccac473905e3fd627503b0344649de4b55756 SHA512 18cbb76e85c68eb2b117ed214d27bd218b61881c443698cd14023cb4a326d6160af73f166a0525a3ef00d45fea3aba632bcd84434e10f215d323115ea170bcc4
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/badvpn/badvpn-0.ebuild b/acct-group/badvpn/badvpn-0.ebuild
new file mode 100644
index 000000000000..75a69db4196e
--- /dev/null
+++ b/acct-group/badvpn/badvpn-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/badvpn"
+
+ACCT_GROUP_ID="116"
diff --git a/acct-group/badvpn/metadata.xml b/acct-group/badvpn/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/badvpn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/beanstalk/Manifest b/acct-group/beanstalk/Manifest
new file mode 100644
index 000000000000..3df46a02b767
--- /dev/null
+++ b/acct-group/beanstalk/Manifest
@@ -0,0 +1,2 @@
+EBUILD beanstalk-0.ebuild 200 BLAKE2B eccf77f37a2fd17d9a82c21d80f1b20161384085ef8829c4f276492389396c91da59ac91a5b0c539d522ee87637897771aa9a5e728780b7ff691f2debdbd2329 SHA512 09ebb4c311836332456f82351ded8a6fdca1a12e0c9064d96a15387e6437aafd5fd232de95b7d05702d0ff65cb465a6dc7979be6345cd5872c8c73bda1281afe
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/acct-group/beanstalk/beanstalk-0.ebuild b/acct-group/beanstalk/beanstalk-0.ebuild
new file mode 100644
index 000000000000..2fd201660183
--- /dev/null
+++ b/acct-group/beanstalk/beanstalk-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/beanstalkd"
+
+ACCT_GROUP_ID="137"
diff --git a/acct-group/beanstalk/metadata.xml b/acct-group/beanstalk/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/acct-group/beanstalk/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/bitflu/Manifest b/acct-group/bitflu/Manifest
new file mode 100644
index 000000000000..b4d99f035448
--- /dev/null
+++ b/acct-group/bitflu/Manifest
@@ -0,0 +1,2 @@
+EBUILD bitflu-0.ebuild 195 BLAKE2B 9984ef1713787e09a397a5c24344e60de1478b603616bd4a945f8051988dfc72f285a4e9ab8b7a671887ee09b0d046d861f7d80640b5460c3da44253d3e04800 SHA512 3515dbd442f26176a8d7eea23ec2721a864e2fe95fd0bf5aeb8a91d763bc822bb7faa8458d97ac6459694d4d155b3e0829d510104c4c64f7da82cea2554f5430
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/acct-group/bitflu/bitflu-0.ebuild b/acct-group/bitflu/bitflu-0.ebuild
new file mode 100644
index 000000000000..b0544d2346e2
--- /dev/null
+++ b/acct-group/bitflu/bitflu-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-p2p/bitflu"
+
+ACCT_GROUP_ID="148"
diff --git a/acct-group/bitflu/metadata.xml b/acct-group/bitflu/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/bitflu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/burrow_exporter/Manifest b/acct-group/burrow_exporter/Manifest
new file mode 100644
index 000000000000..a44688eb1d86
--- /dev/null
+++ b/acct-group/burrow_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD burrow_exporter-0.ebuild 207 BLAKE2B 8181d8a0b769529fae61a9d4066722a35614a735bcddf70ad37a3ba38f5006a050f76e2c185e2cf5dc66903e6d6dc7803246da5d45725152d323a7e9b35b3221 SHA512 50274d43beffe7d7e9662af79dce43cd1f1202be44a3eec8e8e915d16a7fff5205e08ff2923a029caa96b2e405ea6e9f5fbbf8528c591455bb6d5d01f8472b18
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/burrow_exporter/burrow_exporter-0.ebuild b/acct-group/burrow_exporter/burrow_exporter-0.ebuild
new file mode 100644
index 000000000000..2999dfc0ea12
--- /dev/null
+++ b/acct-group/burrow_exporter/burrow_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/burrow_exporter"
+
+ACCT_GROUP_ID="96"
diff --git a/acct-group/burrow_exporter/metadata.xml b/acct-group/burrow_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/burrow_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/cockroach/Manifest b/acct-group/cockroach/Manifest
new file mode 100644
index 000000000000..1a1aac474862
--- /dev/null
+++ b/acct-group/cockroach/Manifest
@@ -0,0 +1,2 @@
+EBUILD cockroach-0.ebuild 197 BLAKE2B 6da2c17141bb788c5236443e48f3eae0d09af0814ade208f9acc080e373376b13923278b612d54ff6a4b0ddcadc56cdfb290c0da89372d0564007d3d35a14c13 SHA512 c57038c2a55b265af1a4ad9b64d6abaa0142ff9f2b52c1462a64769cbf0510df6bd665e93e50c3b41d2a2011304ba01bce2d58ffd3593a32e2f958e473e9dc83
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/cockroach/cockroach-0.ebuild b/acct-group/cockroach/cockroach-0.ebuild
new file mode 100644
index 000000000000..7f9e3bf019d1
--- /dev/null
+++ b/acct-group/cockroach/cockroach-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/cockroach"
+
+ACCT_GROUP_ID="110"
diff --git a/acct-group/cockroach/metadata.xml b/acct-group/cockroach/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/cockroach/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/cron/Manifest b/acct-group/cron/Manifest
new file mode 100644
index 000000000000..3b1feb3774af
--- /dev/null
+++ b/acct-group/cron/Manifest
@@ -0,0 +1,2 @@
+EBUILD cron-0.ebuild 200 BLAKE2B 5fbf0e93ac15528e4670b06f405302cce8f8e9f29ec6d12138dc1f0384b4645a6bd5690b1c863c94dd5ee62b56f5888d01553b45ecf73a49f4f6cfabb71b06c8 SHA512 23690ab72f412d18b23a36aed6ebfd88a4608d299a5d79b18d88dc487d1cb5feaddbdc08d2bdef13e661b258d7c42b9b2c4e77612259ad99493fd3b56d316bd0
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/acct-group/cron/cron-0.ebuild b/acct-group/cron/cron-0.ebuild
new file mode 100644
index 000000000000..84116177ac0d
--- /dev/null
+++ b/acct-group/cron/cron-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/cronbase"
+
+ACCT_GROUP_ID="16"
diff --git a/acct-group/cron/metadata.xml b/acct-group/cron/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/cron/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/dbskkd/Manifest b/acct-group/dbskkd/Manifest
new file mode 100644
index 000000000000..27a4d5ce3ebb
--- /dev/null
+++ b/acct-group/dbskkd/Manifest
@@ -0,0 +1,2 @@
+EBUILD dbskkd-0.ebuild 200 BLAKE2B 698108f0525faf5a33527ddbd46a59459fb6cdb2d034b2780b17da94cad3c97e9e7b0336a70f68eece60b96cdc109a1737925e75bc6ceb5ddea316df6fe48e19 SHA512 37b0ab0360c4e82092944521d60f9faf1dc10b4e324bc0ce4dd9b600ab3d84f77e24e80aee56e6d824de28d476f8b34faef67cdec4519c2441b43c043ba4b164
+MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/acct-group/dbskkd/dbskkd-0.ebuild b/acct-group/dbskkd/dbskkd-0.ebuild
new file mode 100644
index 000000000000..84040068089f
--- /dev/null
+++ b/acct-group/dbskkd/dbskkd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-i18n/dbskkd-cdb"
+
+ACCT_GROUP_ID="146"
diff --git a/acct-group/dbskkd/metadata.xml b/acct-group/dbskkd/metadata.xml
new file mode 100644
index 000000000000..6f2ca22da233
--- /dev/null
+++ b/acct-group/dbskkd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/drone/Manifest b/acct-group/drone/Manifest
new file mode 100644
index 000000000000..2e615ff94bd4
--- /dev/null
+++ b/acct-group/drone/Manifest
@@ -0,0 +1,2 @@
+EBUILD drone-0.ebuild 195 BLAKE2B d2e0f02d0bdf5f98571a955e78ba080a31da3979ceb037089685a89f796d5244595c40949174a1f19fe4c25f1f920573278395aff64880bf6a995e6688eda7b7 SHA512 5feaeb4795c1e377381e6654665bbcb9f94dd7f6d91847561a551ebf2480e0e7f3bf67fc0cfb74605715c456448470f037838a4a79bf75a4a621d06d75f815c8
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/drone/drone-0.ebuild b/acct-group/drone/drone-0.ebuild
new file mode 100644
index 000000000000..7e4e2c35ad8b
--- /dev/null
+++ b/acct-group/drone/drone-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-util/drone"
+
+ACCT_GROUP_ID="112"
diff --git a/acct-group/drone/metadata.xml b/acct-group/drone/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/drone/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/elasticsearch_exporter/Manifest b/acct-group/elasticsearch_exporter/Manifest
new file mode 100644
index 000000000000..161372128bef
--- /dev/null
+++ b/acct-group/elasticsearch_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD elasticsearch_exporter-0.ebuild 214 BLAKE2B 3a6cf3212105d849852811796414cb3ec8247390b337f9b746eedefae612985cf709c93f757795b8f08bfe772bb1cf905dbc5c2aababb618916c9157d868062e SHA512 2fb404d28705504a633a6687fc844ec214520ccd01c94308ef6279fde2b5548a9cfb11f4084a2148885333bc21f9207ace25d2d08fe3c753a7367c718c016432
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0.ebuild
new file mode 100644
index 000000000000..b28c7b674996
--- /dev/null
+++ b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/elasticsearch_exporter"
+
+ACCT_GROUP_ID="98"
diff --git a/acct-group/elasticsearch_exporter/metadata.xml b/acct-group/elasticsearch_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/elasticsearch_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/fcron/Manifest b/acct-group/fcron/Manifest
new file mode 100644
index 000000000000..4b4229b30a3c
--- /dev/null
+++ b/acct-group/fcron/Manifest
@@ -0,0 +1,2 @@
+EBUILD fcron-0.ebuild 198 BLAKE2B 1ad655d295d405331c2e7b52dfa9794ab379989c4e3eb5cb2e5a43b8f4ebd1310866700b7127cb64fd1cabbe3e466c6a10cec9e3297d5823e1cae554d50c138c SHA512 e219d07d6a9474be2182bea70a7900170f4c3fd36cb9b7fc518b7f2d510fceef0d02dd98b9d4c96cd3eaafe23f92da624a7746598116d05bbec3538eb0ba6e01
+MISC metadata.xml 364 BLAKE2B 887c538de00fc598971f0d15f6010bf24e833fdd9a722fa7fb673a4b94c03cb7c34c787be036795861841a6c89028fd5e1bab56c063f20b48d5cd3e51c7e8b96 SHA512 ab949d886664b054e13d9503320af6d728044234fc1004686bbaedd66fbbd1899b896e085ae70edf3a4b0972242a43d4cd8a78ee23270bac41b5919ccac9bed1
diff --git a/acct-group/fcron/fcron-0.ebuild b/acct-group/fcron/fcron-0.ebuild
new file mode 100644
index 000000000000..2eb3684b77bf
--- /dev/null
+++ b/acct-group/fcron/fcron-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/fcron"
+
+ACCT_GROUP_ID="120"
diff --git a/acct-group/fcron/metadata.xml b/acct-group/fcron/metadata.xml
new file mode 100644
index 000000000000..891fc5d08472
--- /dev/null
+++ b/acct-group/fcron/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/firebird/Manifest b/acct-group/firebird/Manifest
new file mode 100644
index 000000000000..a150d227d0d1
--- /dev/null
+++ b/acct-group/firebird/Manifest
@@ -0,0 +1,2 @@
+EBUILD firebird-0.ebuild 196 BLAKE2B 82e905f4994ef5ad3253aa96cf173fe6f020fb53e7313b0eeacbacea9a96cf7fbf0c39c5c5f8ac2fdb61e6a3c8926164e0fe39e639748c8c7858f5fa60560cec SHA512 1766e60a268b1066eb54807ce4ace3b15bc5d764cc98035412085dc6493ccaa21ec236cd538130e1786127f89611b10e73c4eb3b5a2641bf3ad70010c9ce31ca
+MISC metadata.xml 218 BLAKE2B cd2e4ec5a2aaa2c10db0bdd84c8915c4d165c68d185b42473a6da9513579e5222a8d9ed2f5f94a52e8c6160cbc7498512b100e6942df921e4e4afa0aa44cf653 SHA512 4457b406a19cb1a28ca01b4582dfd4a4b848c1af9064352cc1988a30971fdb0afb7984ace0153097ac0e95f17915bbec9eaccba419cc87ad53d16ddd1cb53b5b
diff --git a/acct-group/firebird/firebird-0.ebuild b/acct-group/firebird/firebird-0.ebuild
new file mode 100644
index 000000000000..4494d9646e31
--- /dev/null
+++ b/acct-group/firebird/firebird-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/firebird"
+
+ACCT_GROUP_ID="450"
diff --git a/acct-group/firebird/metadata.xml b/acct-group/firebird/metadata.xml
new file mode 100644
index 000000000000..278489a3490c
--- /dev/null
+++ b/acct-group/firebird/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/fluentd/Manifest b/acct-group/fluentd/Manifest
new file mode 100644
index 000000000000..b79df159d0f5
--- /dev/null
+++ b/acct-group/fluentd/Manifest
@@ -0,0 +1,2 @@
+EBUILD fluentd-0.ebuild 197 BLAKE2B 125ed1081e43d37d91b12d2f567956d5c5893d88970d46a62b6ff6438ddf9b6033d946b69e694fb94e53c9315c16e75c3faa9cf64a8f65d5732ffb7131873ba4 SHA512 e67702fc10602e2c9ed2ffd9cab25f59cfb1502a7a54dc90f15054d6a0cccad61c0536e501b88fbeefa1253278eb8ee0c5e93577281b2c3a692411d8f63bcca2
+MISC metadata.xml 360 BLAKE2B 8f27f3c2cba1df2480158615d134d918e0b0fcc96ef217f1fc042b6161f6b9c34bde913ddc3b0dbcce42b42532a455979ea6bcdb5e44a6d9a5802dedccbf32f7 SHA512 8dedbc382b9ec20a180fd514881378a8dfe6fd88f215473b54815cbe30dea2d992bf17aa7b5125ae9b7d6497b1e03f4fea6a4ddb1f8f487ee2f87db967e1adbe
diff --git a/acct-group/fluentd/fluentd-0.ebuild b/acct-group/fluentd/fluentd-0.ebuild
new file mode 100644
index 000000000000..377320d79ee7
--- /dev/null
+++ b/acct-group/fluentd/fluentd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/fluentd"
+
+ACCT_GROUP_ID="93"
diff --git a/acct-group/fluentd/metadata.xml b/acct-group/fluentd/metadata.xml
new file mode 100644
index 000000000000..85700153bc09
--- /dev/null
+++ b/acct-group/fluentd/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>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/foldingathome/Manifest b/acct-group/foldingathome/Manifest
new file mode 100644
index 000000000000..87abc11cc442
--- /dev/null
+++ b/acct-group/foldingathome/Manifest
@@ -0,0 +1,2 @@
+EBUILD foldingathome-0.ebuild 206 BLAKE2B 17725af0e44ca6edbff1c3494350986684603a31ee2e2c21fb31cbf8912d0489f345c3fefd6275f36f3c2cf35f91c70d8ca65cdfe6131993537148ab66585a86 SHA512 156f42bce29ee516f7ad154b5ca9f134163b942f1efd8e269f3cc8879e5b873c21af7ea585b60f9fc9926fe2cdf295e40f623d7dc1ec5ae1a9973045ed830516
+MISC metadata.xml 261 BLAKE2B 3768c926bca545090342a947ba83e706a8954c51b99a5e7b3476ba5198cd326fe1c3b8efb51dfd6be1800682556b8ceea065e388981463ab32f3d687951872f3 SHA512 537da0d3aa2741ebe4442d5dd9b53409decfc9d12ca8e5af8e737c4deb2910c884207e2d441025d19469816100889f04c11038bdffd6a1a15c6217495445090a
diff --git a/acct-group/foldingathome/foldingathome-0.ebuild b/acct-group/foldingathome/foldingathome-0.ebuild
new file mode 100644
index 000000000000..216461c86938
--- /dev/null
+++ b/acct-group/foldingathome/foldingathome-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sci-biology/foldingathome"
+
+ACCT_GROUP_ID="128"
diff --git a/acct-group/foldingathome/metadata.xml b/acct-group/foldingathome/metadata.xml
new file mode 100644
index 000000000000..8417d1580d40
--- /dev/null
+++ b/acct-group/foldingathome/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/gauth/Manifest b/acct-group/gauth/Manifest
new file mode 100644
index 000000000000..0dae23a590be
--- /dev/null
+++ b/acct-group/gauth/Manifest
@@ -0,0 +1,2 @@
+EBUILD gauth-0.ebuild 219 BLAKE2B 5e675535d9e40dd480e39dfcadbef52d352591fae5ee3e6eaab2df8ddfee2fed282f5be5a8914fe91524cf8e32d9c369faf439e8eb62bcfc4abe8f1e7885ac93 SHA512 65fba78e00650a955f88937969904ce13c2c9ada86281dfd327319601881f96150a3b0f9b39b58b2361b0e0461727eecfb9146632f9134ecd8e454012d98c955
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/acct-group/gauth/gauth-0.ebuild b/acct-group/gauth/gauth-0.ebuild
new file mode 100644
index 000000000000..31dc4549fa33
--- /dev/null
+++ b/acct-group/gauth/gauth-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-auth/google-authenticator-wrappers"
+
+ACCT_GROUP_ID="138"
diff --git a/acct-group/gauth/metadata.xml b/acct-group/gauth/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/acct-group/gauth/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/gnump3d/Manifest b/acct-group/gnump3d/Manifest
new file mode 100644
index 000000000000..7529e361daf3
--- /dev/null
+++ b/acct-group/gnump3d/Manifest
@@ -0,0 +1,2 @@
+EBUILD gnump3d-0.ebuild 200 BLAKE2B 69294fb3cd21ebe3681e66507a3a4adfde3e4f8743e1ae83151bafadef7915849dfa6f04cb7c14f9b05c3471970144d474ffdcb2c8e69d55c0615f9cda3beab3 SHA512 c7bd38802918aa3d279ff83411fd1f542075c4251a19cc4155c96000197e0b9c7256d2eedef4603fbca42eeffa564825f9936e117fe79ac555f94182e9a282c4
+MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/acct-group/gnump3d/gnump3d-0.ebuild b/acct-group/gnump3d/gnump3d-0.ebuild
new file mode 100644
index 000000000000..3c4504e2ac75
--- /dev/null
+++ b/acct-group/gnump3d/gnump3d-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/gnump3d"
+
+ACCT_GROUP_ID="160"
diff --git a/acct-group/gnump3d/metadata.xml b/acct-group/gnump3d/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/acct-group/gnump3d/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/gopherd/Manifest b/acct-group/gopherd/Manifest
new file mode 100644
index 000000000000..d47fc3ae03c1
--- /dev/null
+++ b/acct-group/gopherd/Manifest
@@ -0,0 +1,2 @@
+EBUILD gopherd-0.ebuild 199 BLAKE2B 9b864f89ef0ebe533a1b724aa1e41d8d7de82fad19b863fa04a93a847811b25aa28448db23e7453ede2ff20a4da3436e7e7e206b947efd2cc3ba146b404cc607 SHA512 6b3fdda00cd10e61c58a678f0d04bdabc642b044181c7802053eee366913d1770fd650cb3d445ebd501ff6621fb39196e21ad1a65eee616267c278dc73378bee
+MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/acct-group/gopherd/gopherd-0.ebuild b/acct-group/gopherd/gopherd-0.ebuild
new file mode 100644
index 000000000000..7c433e9e43e0
--- /dev/null
+++ b/acct-group/gopherd/gopherd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/geomyidae"
+
+ACCT_GROUP_ID="132"
diff --git a/acct-group/gopherd/metadata.xml b/acct-group/gopherd/metadata.xml
new file mode 100644
index 000000000000..5b159fbcadd1
--- /dev/null
+++ b/acct-group/gopherd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/grok_exporter/Manifest b/acct-group/grok_exporter/Manifest
new file mode 100644
index 000000000000..c08b455bedf3
--- /dev/null
+++ b/acct-group/grok_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD grok_exporter-0.ebuild 206 BLAKE2B 40ff5681b7dad38023e20a9420df292b70f515de539d0ee64529564c0410f04047e5249de53d390d72f20f86d8b7fd6ce1d3c07899dadee54aa543f78b2aa58f SHA512 25829b366a145f275ebac9402cf77e2dd36b5a41cf119d87feffb0cca0551300b63fbbd668523d49d7f0f9ac6564037541dfb7e43f45fe55983b1cc8bb5f787f
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/grok_exporter/grok_exporter-0.ebuild b/acct-group/grok_exporter/grok_exporter-0.ebuild
new file mode 100644
index 000000000000..ff2c696b3fb0
--- /dev/null
+++ b/acct-group/grok_exporter/grok_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/grok_exporter"
+
+ACCT_GROUP_ID="104"
diff --git a/acct-group/grok_exporter/metadata.xml b/acct-group/grok_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/grok_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/h2o/Manifest b/acct-group/h2o/Manifest
new file mode 100644
index 000000000000..c3bbcf034331
--- /dev/null
+++ b/acct-group/h2o/Manifest
@@ -0,0 +1,2 @@
+EBUILD h2o-0.ebuild 196 BLAKE2B 07de1acb5bf808d50b2900a0092ae06c179031e148e8f6158d37ebf1cf333c05024da51900a26fbc25f030f2555cb52b137ea58654b47d2c7b40b9da03085158 SHA512 30209ec782ccf4761a035cd792dd7dc744b18ed58e6cbcb6bf3dd38caca26a7b948445eb9698d3e2858e0751223d1d70c18db21ec9d8d68c401de22d4e091ff4
+MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/acct-group/h2o/h2o-0.ebuild b/acct-group/h2o/h2o-0.ebuild
new file mode 100644
index 000000000000..210bbacb211f
--- /dev/null
+++ b/acct-group/h2o/h2o-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/h2o"
+
+ACCT_GROUP_ID="141"
diff --git a/acct-group/h2o/metadata.xml b/acct-group/h2o/metadata.xml
new file mode 100644
index 000000000000..7ffc4339bc56
--- /dev/null
+++ b/acct-group/h2o/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/haclient/Manifest b/acct-group/haclient/Manifest
new file mode 100644
index 000000000000..4af5629f8aa3
--- /dev/null
+++ b/acct-group/haclient/Manifest
@@ -0,0 +1,2 @@
+EBUILD haclient-0.ebuild 205 BLAKE2B e1563547ecfe119304885954fd71188321221b86f76bf7e11466ff6f2891a292be9b03b20564502067e81e1f96b927302b791cc859a3e0d88b1d0e139b7173c3 SHA512 51cac51cb51b11918c2db3e8534480fa49b1b03a922adfe743506cd0dc8ee1ad0a3ee88844c24ab5aa10f5c3121d8e2dc0941a65c201abdf880bdddc9cb085a5
+MISC metadata.xml 257 BLAKE2B 7384ec22c045377599221b8961bb3ff4febe50844c76a23d5084628c4568765831eee20ccc61b0c90d4f940688e9b68d33fd5db65321399f5caa0fdb7e023be0 SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980
diff --git a/acct-group/haclient/haclient-0.ebuild b/acct-group/haclient/haclient-0.ebuild
new file mode 100644
index 000000000000..26dcd63c48e7
--- /dev/null
+++ b/acct-group/haclient/haclient-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-cluster/cluster-glue"
+
+ACCT_GROUP_ID="204"
diff --git a/acct-group/haclient/metadata.xml b/acct-group/haclient/metadata.xml
new file mode 100644
index 000000000000..8bf4b5f36954
--- /dev/null
+++ b/acct-group/haclient/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/icecast/Manifest b/acct-group/icecast/Manifest
new file mode 100644
index 000000000000..3f7ced182000
--- /dev/null
+++ b/acct-group/icecast/Manifest
@@ -0,0 +1,2 @@
+EBUILD icecast-0.ebuild 197 BLAKE2B 11758515e3f6984495a294d289eb57b694ea4f709fe106338f5e0aeef0be096a37a0b6c34ac934b5bb52acc9f5e75d14ca54427b98640add086e60ad71cbc3c0 SHA512 58d3e9f5fbef07d32cf3eaf7f58df90eb01f35fe9eeac5c56a23a2b8d48ba817f50404a31fbae5883de78a4a115d80f1b791bf979c312efbfb031bb8a2da28b5
+MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/acct-group/icecast/icecast-0.ebuild b/acct-group/icecast/icecast-0.ebuild
new file mode 100644
index 000000000000..8e91828cfb66
--- /dev/null
+++ b/acct-group/icecast/icecast-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/icecast"
+
+ACCT_GROUP_ID="131"
diff --git a/acct-group/icecast/metadata.xml b/acct-group/icecast/metadata.xml
new file mode 100644
index 000000000000..95aa13f6c5ef
--- /dev/null
+++ b/acct-group/icecast/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/icecream/Manifest b/acct-group/icecream/Manifest
new file mode 100644
index 000000000000..4ae2b0987c69
--- /dev/null
+++ b/acct-group/icecream/Manifest
@@ -0,0 +1,2 @@
+EBUILD icecream-0.ebuild 199 BLAKE2B 5ad5878f3278c629f1053228d22ebff5dcc0ccbcafda8ff64bbbf18886529cb04be68924f74346339bc37cdc016de63fe52b685db6ef840903c59aab3dd178c1 SHA512 b54cfbfb17b47a939baa9395e88bf403cacd0bc66b2482f35a98758301888bc1b4e1a6f56dff6fd8669f2a13083588a1fe43ad38fd377b68f62ab485725dc31f
+MISC metadata.xml 257 BLAKE2B 7384ec22c045377599221b8961bb3ff4febe50844c76a23d5084628c4568765831eee20ccc61b0c90d4f940688e9b68d33fd5db65321399f5caa0fdb7e023be0 SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980
diff --git a/acct-group/icecream/icecream-0.ebuild b/acct-group/icecream/icecream-0.ebuild
new file mode 100644
index 000000000000..08f8a89a7b97
--- /dev/null
+++ b/acct-group/icecream/icecream-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-devel/icecream"
+
+ACCT_GROUP_ID="145"
diff --git a/acct-group/icecream/metadata.xml b/acct-group/icecream/metadata.xml
new file mode 100644
index 000000000000..8bf4b5f36954
--- /dev/null
+++ b/acct-group/icecream/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/ices/Manifest b/acct-group/ices/Manifest
new file mode 100644
index 000000000000..b3f212b928b1
--- /dev/null
+++ b/acct-group/ices/Manifest
@@ -0,0 +1,2 @@
+EBUILD ices-0.ebuild 194 BLAKE2B b09ee9771e5a131e7d39ae8d2a44e23a0983e30e9556d79dd0b629ff998a969fa5bfae97e917c8c157e186a07aa82c2fb932e9b3b462baf9fe1de2a25ef3e67f SHA512 7bcd391b1f6c88a60f00d7b49fe424b7de18ad1d64260d73380e1d2bfd82e6167f3bea23f6eeb70cf2c76a9855fb34abc75542e0a37ca0b7905279003e9e5a08
+MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/acct-group/ices/ices-0.ebuild b/acct-group/ices/ices-0.ebuild
new file mode 100644
index 000000000000..0efbe032797f
--- /dev/null
+++ b/acct-group/ices/ices-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/ices"
+
+ACCT_GROUP_ID="162"
diff --git a/acct-group/ices/metadata.xml b/acct-group/ices/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/acct-group/ices/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/ipsentinel/Manifest b/acct-group/ipsentinel/Manifest
new file mode 100644
index 000000000000..50ae612c86e4
--- /dev/null
+++ b/acct-group/ipsentinel/Manifest
@@ -0,0 +1,2 @@
+EBUILD ipsentinel-0.ebuild 201 BLAKE2B c895adeeacc338175b16d481b136dc1e061fa969fe0031e96e8e593201177895ba4462b7a6da8ae3e234360070cf6940e502ab3e4cc865d1e54b681c8839ff66 SHA512 cc261891d44dfa0cb1fbf40e6722f1ef15495056c149dab9e1dab959b8005dfa08104e0c198be0bbeec691ce8db4178d49284a2153bc3f6541dad56b029c308e
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/acct-group/ipsentinel/ipsentinel-0.ebuild b/acct-group/ipsentinel/ipsentinel-0.ebuild
new file mode 100644
index 000000000000..0ab3a10e014b
--- /dev/null
+++ b/acct-group/ipsentinel/ipsentinel-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/ip-sentinel"
+
+ACCT_GROUP_ID="163"
diff --git a/acct-group/ipsentinel/metadata.xml b/acct-group/ipsentinel/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/acct-group/ipsentinel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/karma/Manifest b/acct-group/karma/Manifest
new file mode 100644
index 000000000000..c1db55bcef53
--- /dev/null
+++ b/acct-group/karma/Manifest
@@ -0,0 +1,2 @@
+EBUILD karma-0.ebuild 199 BLAKE2B ee6137b960a3bec6c51b4d05232364c2bd79afcef52343542e5e13a1bbe71391c07ab1c04cd324fc5865ff1611a554ac99cf64ac7031c39dabc3fbce92f94f8f SHA512 0779092d8a6c61a478576e972071ddb9a72559e10a1f273c48cc9dde47fa1e50288ae48f8826f12860b63c3df6ae5613e6010b5050bd263721747b70d28421bd
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/karma/karma-0.ebuild b/acct-group/karma/karma-0.ebuild
new file mode 100644
index 000000000000..1631d655b6bf
--- /dev/null
+++ b/acct-group/karma/karma-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/karma-bin"
+
+ACCT_GROUP_ID="118"
diff --git a/acct-group/karma/metadata.xml b/acct-group/karma/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/karma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/lightdm/Manifest b/acct-group/lightdm/Manifest
new file mode 100644
index 000000000000..6b657207941c
--- /dev/null
+++ b/acct-group/lightdm/Manifest
@@ -0,0 +1,2 @@
+EBUILD lightdm-0.ebuild 197 BLAKE2B e03e2cbd0b3833d9638969d417f5b8dfa10d5ff1701777161700f64bd4ee6d7f3d878c86ca60ce8335a42aa200d6953c4c863e053303eaa6a4d26929b920748e SHA512 7ec044af94cc68e77ceee50dcc38c074b8345b386c321c3edbec1c2c38d36119bf97d22bd1520bbc9050cc5740f5b88a9b3fdb26c45409ca6bb06c4d06c4efd9
+MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/acct-group/lightdm/lightdm-0.ebuild b/acct-group/lightdm/lightdm-0.ebuild
new file mode 100644
index 000000000000..eeedf50e22a1
--- /dev/null
+++ b/acct-group/lightdm/lightdm-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for x11-misc/lightdm"
+
+ACCT_GROUP_ID="134"
diff --git a/acct-group/lightdm/metadata.xml b/acct-group/lightdm/metadata.xml
new file mode 100644
index 000000000000..95aa13f6c5ef
--- /dev/null
+++ b/acct-group/lightdm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/monkeyd/Manifest b/acct-group/monkeyd/Manifest
new file mode 100644
index 000000000000..9fed619df78b
--- /dev/null
+++ b/acct-group/monkeyd/Manifest
@@ -0,0 +1,2 @@
+EBUILD monkeyd-0.ebuild 200 BLAKE2B 6d586274beb543fe6774793606ad298b19bedbf4a1e4f72353333047db8ba3d09f1d589b2b33f020d4ef9c74f2c5412a248127660ee02324e95eb8bead6efd18 SHA512 8f77053946db48d3a523ac5319a4955ea554f458da68bfe4c8ecbd4243a43a106966c06672ca37ce51ff96fd6164bc43540319e9112947370aa3d74a93d6efcd
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/acct-group/monkeyd/metadata.xml b/acct-group/monkeyd/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/monkeyd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/monkeyd/monkeyd-0.ebuild b/acct-group/monkeyd/monkeyd-0.ebuild
new file mode 100644
index 000000000000..6869bd2a7451
--- /dev/null
+++ b/acct-group/monkeyd/monkeyd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/monkeyd"
+
+ACCT_GROUP_ID="149"
diff --git a/acct-group/munge/Manifest b/acct-group/munge/Manifest
new file mode 100644
index 000000000000..5ead7b45175f
--- /dev/null
+++ b/acct-group/munge/Manifest
@@ -0,0 +1,2 @@
+EBUILD munge-0.ebuild 195 BLAKE2B ba7588db342e2d031b3d5a4ea43755f98fa4e9ffdfb2cae8abb93904d818720f56b91c59353a9cb0518a6b43b69868979f98ffaf023908aa59ef419735781560 SHA512 ea0b09ab44300d1cc8a4f6d8755dd2dab64dbf8adbb1f22bb725163129352cf27498c0ccb4b588718bd8cd399c09b01009947232da0f5b3f87f23208165d908e
+MISC metadata.xml 257 BLAKE2B 7384ec22c045377599221b8961bb3ff4febe50844c76a23d5084628c4568765831eee20ccc61b0c90d4f940688e9b68d33fd5db65321399f5caa0fdb7e023be0 SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980
diff --git a/acct-group/munge/metadata.xml b/acct-group/munge/metadata.xml
new file mode 100644
index 000000000000..8bf4b5f36954
--- /dev/null
+++ b/acct-group/munge/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/munge/munge-0.ebuild b/acct-group/munge/munge-0.ebuild
new file mode 100644
index 000000000000..d51744087c22
--- /dev/null
+++ b/acct-group/munge/munge-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-auth/munge"
+
+ACCT_GROUP_ID="144"
diff --git a/acct-group/netperf/Manifest b/acct-group/netperf/Manifest
new file mode 100644
index 000000000000..7297e08e6270
--- /dev/null
+++ b/acct-group/netperf/Manifest
@@ -0,0 +1,2 @@
+EBUILD netperf-0.ebuild 201 BLAKE2B e4910d32e12de0f9ecf4014c3b92b6a405fa0bb5f106c5aba2c741c1f6601d3509ed90ab126e64982c8ab3083490da24e5c674f65e431116a0b76f725dbdba94 SHA512 efbdafe04392a0e340a938efa062959dc249235acf50889bde6a9f1447d84246dcb2ca7dd307feb378cb74527faa81611ec7a676938ec493178c7ffd83f06542
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/acct-group/netperf/metadata.xml b/acct-group/netperf/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/acct-group/netperf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/netperf/netperf-0.ebuild b/acct-group/netperf/netperf-0.ebuild
new file mode 100644
index 000000000000..f4a3499b161f
--- /dev/null
+++ b/acct-group/netperf/netperf-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/netperf"
+
+ACCT_GROUP_ID="168"
diff --git a/acct-group/nginx/Manifest b/acct-group/nginx/Manifest
new file mode 100644
index 000000000000..fa84fdadf8c9
--- /dev/null
+++ b/acct-group/nginx/Manifest
@@ -0,0 +1,2 @@
+EBUILD nginx-0.ebuild 197 BLAKE2B 3d34398140c96ce4cf6393cbc4dcff87226605fa9b6272be4c4f08bbf6e21e75ea3c4c536519af56927a3bbe92b91dd7885108729d67bc1bf63e9402de24d534 SHA512 c2e84cf6c6fd573bcec12c8b3701372cd4a63e72eba50b70c214fa2f2fe86ccf9e9353dbd37d308307424530cba56d7eae664868d7b6fdd7369a849bea877cf7
+MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/acct-group/nginx/metadata.xml b/acct-group/nginx/metadata.xml
new file mode 100644
index 000000000000..a32d600f949d
--- /dev/null
+++ b/acct-group/nginx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/nginx/nginx-0.ebuild b/acct-group/nginx/nginx-0.ebuild
new file mode 100644
index 000000000000..3377bb72a49b
--- /dev/null
+++ b/acct-group/nginx/nginx-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/nginx"
+
+ACCT_GROUP_ID="82"
diff --git a/acct-group/ngrep/Manifest b/acct-group/ngrep/Manifest
index a3c509a70efd..15c4f3e00a6c 100644
--- a/acct-group/ngrep/Manifest
+++ b/acct-group/ngrep/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngrep-0.ebuild 199 BLAKE2B 50c8efbc42491d57ab4a2fe728e6a3070b96353be21121717e913f3018741917b0b2f2d35197b1d3f76795a7e371abc06341dce838777b617751857db821b457 SHA512 11655aa3684f983c7be245e7aa84fddd8b5794e080c6efea778e36760751544c6891e5f20391799637dcc1697c6d928ed1a612a3d575b6c7e1569b15989a11b9
+EBUILD ngrep-0-r1.ebuild 199 BLAKE2B f8df4a2844817902ce9c8d9e88c698dbafed83067e064dcfb41ab2ed8ea9b8778ef2604adeb13f927bf2145f3b6ce84728b2a619b9393e39cc450f01e8fecd65 SHA512 c87cb919c6e986cc304fc13240b45ec7569fbbd3c2e27c4db50c6e80a03e72f70b1b6ac685c94872f5a218369e450533927c5503c3dbecbbb45ff36a7f5e7e5c
 MISC metadata.xml 624 BLAKE2B a37785fd96ebd3bf967401c12c22db12ae9501836d6718b4390ace7dbe45701e793d3821cf510cec63b760c64b77ab12a63481d6cdd7c379d3209fba7b059d58 SHA512 cba79cac4f0cbbd9dabb2b17586565a145aff17f16b2cc3c34bc4b3c63e83dd5522168a1e5ca22df63ded54ea26f850bccf972791ccf8eb41ce9899f7f26d31d
diff --git a/acct-group/ngrep/ngrep-0-r1.ebuild b/acct-group/ngrep/ngrep-0-r1.ebuild
new file mode 100644
index 000000000000..c01e5f34d05e
--- /dev/null
+++ b/acct-group/ngrep/ngrep-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/ngrep"
+
+ACCT_GROUP_ID="185"
diff --git a/acct-group/ngrep/ngrep-0.ebuild b/acct-group/ngrep/ngrep-0.ebuild
deleted file mode 100644
index 059b68a8193d..000000000000
--- a/acct-group/ngrep/ngrep-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-analyzer/ngrep"
-
-ACCT_GROUP_ID="186"
diff --git a/acct-group/nm-openconnect/Manifest b/acct-group/nm-openconnect/Manifest
new file mode 100644
index 000000000000..c248746ef3b6
--- /dev/null
+++ b/acct-group/nm-openconnect/Manifest
@@ -0,0 +1,2 @@
+EBUILD nm-openconnect-0.ebuild 215 BLAKE2B 3a0fee76befe88ccb1dd8581420fed87c926ba5308ea64676ab754a2736d043eaf4aef24a3c77c8eb35f0015611c5772115d426e19a4f233fa83293de929b183 SHA512 6f0780ae8f0c6112e84838bca4fd3f21d5dd38738fe80829a31c3a1831a71a6dec93ec16fc846eb746c338d2a2601cd08aea0a86b1cc46b55be0aa3f8f72689d
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-group/nm-openconnect/metadata.xml b/acct-group/nm-openconnect/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/acct-group/nm-openconnect/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/nm-openconnect/nm-openconnect-0.ebuild b/acct-group/nm-openconnect/nm-openconnect-0.ebuild
new file mode 100644
index 000000000000..cf11b4322042
--- /dev/null
+++ b/acct-group/nm-openconnect/nm-openconnect-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/networkmanager-openconnect"
+
+ACCT_GROUP_ID="142"
diff --git a/acct-group/nm-openvpn/Manifest b/acct-group/nm-openvpn/Manifest
new file mode 100644
index 000000000000..5a11b8e51d68
--- /dev/null
+++ b/acct-group/nm-openvpn/Manifest
@@ -0,0 +1,2 @@
+EBUILD nm-openvpn-0.ebuild 211 BLAKE2B b490a9fb057d16fece1720e2e50b09d6f81a71fc0520fe932f979068d1dc78b3819e882a036e887056c9a32fe254161b331a56fa330529d5b9d788f93fb9d5e6 SHA512 8cef0fec22ee80dc3d9b3f3c334be6cdfe16549a0aae2df4eb1c3e2b9a9ee72559fd8566711d3fa520099c43e30eb6bf7f533b1e2a2d7984a42b71fd6fcdbc4d
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/acct-group/nm-openvpn/metadata.xml b/acct-group/nm-openvpn/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/acct-group/nm-openvpn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/nm-openvpn/nm-openvpn-0.ebuild b/acct-group/nm-openvpn/nm-openvpn-0.ebuild
new file mode 100644
index 000000000000..2c34fcd00534
--- /dev/null
+++ b/acct-group/nm-openvpn/nm-openvpn-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/networkmanager-openvpn"
+
+ACCT_GROUP_ID="143"
diff --git a/acct-group/opendnssec/Manifest b/acct-group/opendnssec/Manifest
new file mode 100644
index 000000000000..c0bfe886d130
--- /dev/null
+++ b/acct-group/opendnssec/Manifest
@@ -0,0 +1,2 @@
+EBUILD opendnssec-0.ebuild 199 BLAKE2B 456bea0ea1fd33ace88925e18ffaad5e9706e06203fd3ceec15d5d5c0b6ef91c0f4621c07ae0fbb99376c5abd0af1a04b6ed3853152736d0ad83a65d9c6af2e0 SHA512 9f39dbeab6105d5d27228ce6480710f9fcaac990b43dce28e305f96975e3888be5730ae16abc4bdb6c4cc91cd35aa85af06aac37d35e1c37118fb6e5a6e1aae4
+MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/acct-group/opendnssec/metadata.xml b/acct-group/opendnssec/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/acct-group/opendnssec/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/opendnssec/opendnssec-0.ebuild b/acct-group/opendnssec/opendnssec-0.ebuild
new file mode 100644
index 000000000000..b1ab40784094
--- /dev/null
+++ b/acct-group/opendnssec/opendnssec-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/opendnssec"
+
+ACCT_GROUP_ID="151"
diff --git a/acct-group/opm/Manifest b/acct-group/opm/Manifest
new file mode 100644
index 000000000000..20fac0038d81
--- /dev/null
+++ b/acct-group/opm/Manifest
@@ -0,0 +1,2 @@
+EBUILD opm-0.ebuild 192 BLAKE2B c114cc4ffeaed296f0fc10ba58d589d427ddc527cde37f302201919225a28cbd67f7291933100822fe96c37ad7b28de486817b9fd6eb090ebeeda4b27ddbe0df SHA512 ba0472cbf53cc4bd27523de8b3579f9963dadc282b1ced34bb741c0a8a71dc365912ed8ef014ca01c37a2678d027bf7e0cc45970c2f507a5a7d680852320c83b
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-group/opm/metadata.xml b/acct-group/opm/metadata.xml
new file mode 100644
index 000000000000..979bcc7aec93
--- /dev/null
+++ b/acct-group/opm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/opm/opm-0.ebuild b/acct-group/opm/opm-0.ebuild
new file mode 100644
index 000000000000..a394950e5804
--- /dev/null
+++ b/acct-group/opm/opm-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for an open proxy monitor"
+ACCT_GROUP_ID=127
diff --git a/acct-group/partimag/Manifest b/acct-group/partimag/Manifest
new file mode 100644
index 000000000000..78da23515667
--- /dev/null
+++ b/acct-group/partimag/Manifest
@@ -0,0 +1,2 @@
+EBUILD partimag-0.ebuild 199 BLAKE2B 29a40d7555b7d25aff006e1e295d01aa83a52750449e13885e1053411be6ddf3e770a9e4c39f1125b0caa26242cc954c948f1ee599023ac31481fac8f7a89715 SHA512 d676989dea98f7aae4b3adcb3998501b012ce068fe84867a5352d8a650f4e1497c3254a160fca1a1ee2dda63e64bd97ce6ba0f1cc497e120437d118fdf28e749
+MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/acct-group/partimag/metadata.xml b/acct-group/partimag/metadata.xml
new file mode 100644
index 000000000000..4eb20a048df2
--- /dev/null
+++ b/acct-group/partimag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/partimag/partimag-0.ebuild b/acct-group/partimag/partimag-0.ebuild
new file mode 100644
index 000000000000..15a7d3eb6b96
--- /dev/null
+++ b/acct-group/partimag/partimag-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-block/partimage"
+
+ACCT_GROUP_ID="91"
diff --git a/acct-group/pgagent/Manifest b/acct-group/pgagent/Manifest
new file mode 100644
index 000000000000..878dbeaaca95
--- /dev/null
+++ b/acct-group/pgagent/Manifest
@@ -0,0 +1,2 @@
+EBUILD pgagent-0.ebuild 195 BLAKE2B 237e57921dc02b2289aa4c032e23115c8be30188bec4de08657047ebade6819c093ac00117724af524096a116e1cd7ab120a128e88d6614810f11cca90312636 SHA512 58de205afa5f66a6c9a219db86681b4281302f4a484798ca0c8450292eaf1d8dc6be8967246f057cf470471a665bc1c4f0879386e687a14ee00db0373f1179eb
+MISC metadata.xml 280 BLAKE2B 75bfaba3095bd67dfa80654885579e51053fd130ae4e3ad61ac75192eebad9fe8d08cbdf63773dad3837ef2805e0594d0823655966fde8876ba5919e01f0e698 SHA512 efb5fb6652ac8cd75fff4eea8b2b044a2c9201cce2faf3bbe13a97565d150e64f9ba0dd8bb691a44a1b6726455306ea8b6c1b121678a721a82e7ea8b6589c94f
diff --git a/acct-group/pgagent/metadata.xml b/acct-group/pgagent/metadata.xml
new file mode 100644
index 000000000000..711734ad7566
--- /dev/null
+++ b/acct-group/pgagent/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/pgagent/pgagent-0.ebuild b/acct-group/pgagent/pgagent-0.ebuild
new file mode 100644
index 000000000000..a5716bd1cb4d
--- /dev/null
+++ b/acct-group/pgagent/pgagent-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/pgagent"
+
+ACCT_GROUP_ID="135"
diff --git a/acct-group/pushgateway/Manifest b/acct-group/pushgateway/Manifest
new file mode 100644
index 000000000000..3cc373ad29fc
--- /dev/null
+++ b/acct-group/pushgateway/Manifest
@@ -0,0 +1,2 @@
+EBUILD pushgateway-0.ebuild 204 BLAKE2B 193c8282ec16a5e026a3c632a4fa65f3359576355857f9a36a1c08b3d452ca3b734f566b67962c1be0b5732bbcd571b962db81a6f72ec1e3ea5f8b3e19d3eee6 SHA512 f3241947a68282cd2f770ffc534f9df5b0bddb6421139d87681d49b10ac43bac6a683b8c6f8407220899430bbb9aadfc9382f4a419d6b284a08e7e04f8b6d937
+MISC metadata.xml 244 BLAKE2B 69bff1931d3487cac65b10ff2068c2ffeb68b772ca4ed4842f39d8c92403572314769f3babca3204dbf3ebec92d813821ab79ba7c78e8ca9d161149e4db88fba SHA512 ee1587876b1ab6b66fc7a7eaa9d6c1c8fa0389f885da6fd6dd88bfcea3d179f0dc36a5c8be70fefa35cfb16eb4f92f41c24a438e9db57580949a1e796b1b2d78
diff --git a/acct-group/pushgateway/metadata.xml b/acct-group/pushgateway/metadata.xml
new file mode 100644
index 000000000000..9e1d47466c8d
--- /dev/null
+++ b/acct-group/pushgateway/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/pushgateway/pushgateway-0.ebuild b/acct-group/pushgateway/pushgateway-0.ebuild
new file mode 100644
index 000000000000..c064f6390f10
--- /dev/null
+++ b/acct-group/pushgateway/pushgateway-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/pushgateway"
+
+ACCT_GROUP_ID="288"
diff --git a/acct-group/rabbitmq/Manifest b/acct-group/rabbitmq/Manifest
new file mode 100644
index 000000000000..0fd9f94ca2c0
--- /dev/null
+++ b/acct-group/rabbitmq/Manifest
@@ -0,0 +1,2 @@
+EBUILD rabbitmq-0.ebuild 205 BLAKE2B f8896181cbe6d286636ffbfa52e911c25b92f78488c7564faac59042494c165a75e092fbd14ed0d6b533b88fd20d3daf5a8b128f253f046753ff79fb989d5f35 SHA512 4f8312deab54040de08ecc51e0d1d2f1949e2999b0e0d96bcd1da4ba3189f9254b5e0891dd0506e5a30c7db2c91719f259890541a81d342aa1f96cbbb820dcb3
+MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/acct-group/rabbitmq/metadata.xml b/acct-group/rabbitmq/metadata.xml
new file mode 100644
index 000000000000..69bc0ccc3d1f
--- /dev/null
+++ b/acct-group/rabbitmq/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ultrabug@gentoo.org</email>
+		<name>Ultrabug</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/rabbitmq/rabbitmq-0.ebuild b/acct-group/rabbitmq/rabbitmq-0.ebuild
new file mode 100644
index 000000000000..58c6c1ee1b21
--- /dev/null
+++ b/acct-group/rabbitmq/rabbitmq-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/rabbitmq-server"
+
+ACCT_GROUP_ID="121"
diff --git a/acct-group/rabbitmq_exporter/Manifest b/acct-group/rabbitmq_exporter/Manifest
new file mode 100644
index 000000000000..c8af9ac00446
--- /dev/null
+++ b/acct-group/rabbitmq_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD rabbitmq_exporter-0.ebuild 210 BLAKE2B 44dbd22eba325fcb068d6e3e82ab84604ac00d284563ab603ed7b4fb41e069bce58cc291157d9afde836c0f32e8545aae8f037085a71ef1c50fee42d7dae2751 SHA512 c4ddd655d87a51123bb0db20bce824b0f44baef6325097b26fe34c44c4a537a8ada1939524702b397ff2d5628653780f9e88d20628ea9e4b90781a1e80a8d176
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/rabbitmq_exporter/metadata.xml b/acct-group/rabbitmq_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/rabbitmq_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
new file mode 100644
index 000000000000..bd882d0b8866
--- /dev/null
+++ b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/rabbitmq_exporter"
+
+ACCT_GROUP_ID="107"
diff --git a/acct-group/rbot/Manifest b/acct-group/rbot/Manifest
new file mode 100644
index 000000000000..6f57052f88ce
--- /dev/null
+++ b/acct-group/rbot/Manifest
@@ -0,0 +1,2 @@
+EBUILD rbot-0.ebuild 193 BLAKE2B 42f069dcd54e57f4799206e10451f5c3104654e426fbd860d82691eb5cf5f4860a6ec504e49f097521b74bc9ec923310140dc34487416bfd56959185f8eb232a SHA512 549ed3658c753edcc78e75c8508ff669d70398b29b285b0f823e1492064560cae1ce13752daf8d9ba5b55034dd63f3e6130240601c866e5058f586d4a7e4edeb
+MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/acct-group/rbot/metadata.xml b/acct-group/rbot/metadata.xml
new file mode 100644
index 000000000000..eb1e47f2edfb
--- /dev/null
+++ b/acct-group/rbot/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/rbot/rbot-0.ebuild b/acct-group/rbot/rbot-0.ebuild
new file mode 100644
index 000000000000..2e26e14ae37f
--- /dev/null
+++ b/acct-group/rbot/rbot-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-irc/rbot"
+
+ACCT_GROUP_ID="129"
diff --git a/acct-group/redsocks/Manifest b/acct-group/redsocks/Manifest
new file mode 100644
index 000000000000..fa6e29afc4e9
--- /dev/null
+++ b/acct-group/redsocks/Manifest
@@ -0,0 +1,2 @@
+EBUILD redsocks-0.ebuild 199 BLAKE2B 871091bf11f5ed6886ecc4653a098c76a77de2aae4a9aa932e15a5609f89c94782c3d4ac722522e3914be439bf2004cbff7aa1963a4b8b81def58640cbddcac6 SHA512 f5f4dcafebe6c270e863780cb3f0e62c103e2900eb4242ceb659565379de6b987b65a80f63e2a11f0fedd289bc8ecf09fd7b83ef0b7babce2ccd7a5b4eb19b02
+MISC metadata.xml 246 BLAKE2B c7559c694569e2eb079aa44ab82aac05dd7218624519133b1d1de233f6d4bce0872ada012e00dc369051e9685d9a25d314c05318d1b109ee81945dd739da51df SHA512 0d07f784095273f14c7d63a215a76c84fec302e6e52717f0e47c29916aa90149239dfe7ed3227a42e2863226e4448d8a2e8321ccc589ad6d9f725731b45559a2
diff --git a/acct-group/redsocks/metadata.xml b/acct-group/redsocks/metadata.xml
new file mode 100644
index 000000000000..b58e8386fcb2
--- /dev/null
+++ b/acct-group/redsocks/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/redsocks/redsocks-0.ebuild b/acct-group/redsocks/redsocks-0.ebuild
new file mode 100644
index 000000000000..49d81346469b
--- /dev/null
+++ b/acct-group/redsocks/redsocks-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-proxy/redsocks"
+
+ACCT_GROUP_ID="155"
diff --git a/acct-group/reg/Manifest b/acct-group/reg/Manifest
new file mode 100644
index 000000000000..8ee215849b77
--- /dev/null
+++ b/acct-group/reg/Manifest
@@ -0,0 +1,2 @@
+EBUILD reg-0.ebuild 197 BLAKE2B 0069dbf2afffd74e3f30f93cf9b1ade8cbcd4a94be1670bc3f5a69e987cf3e43bcb34db0732e1b583356f94ef672afad1098ef5c657ae8c8b03e21f0b404861c SHA512 b42cfbc87e89d233aa20c397c076cd7fad09e6b0e9c6ef2ba5e79fd188793701b772ef5a08e809b268fac03960ea42c4b84351457f56e0a377317584a1e92058
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/reg/metadata.xml b/acct-group/reg/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/reg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/reg/reg-0.ebuild b/acct-group/reg/reg-0.ebuild
new file mode 100644
index 000000000000..2c729ac8231a
--- /dev/null
+++ b/acct-group/reg/reg-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-emulation/reg"
+
+ACCT_GROUP_ID="94"
diff --git a/acct-group/registry/Manifest b/acct-group/registry/Manifest
new file mode 100644
index 000000000000..66c1c762dfb0
--- /dev/null
+++ b/acct-group/registry/Manifest
@@ -0,0 +1,2 @@
+EBUILD registry-0.ebuild 210 BLAKE2B 3653df3dfee430c15e1d3916d019b7bc2639366a5e7595e2e2a6a77986867a5f7385dde68e5c287776808a1cb06655b973daa38059db28073898b0431b8da732 SHA512 68224dceda61cac038f5a404287505aaa92bea98f1f37eb9b8cad87d0a7432b13a91414c7f7de6c5c11efe9300cde3157bdd5bdec83f3d653f92670f830e83b8
+MISC metadata.xml 218 BLAKE2B f63c4372636935e7256d36ac161834b70e06a230bb93dda9861c41e6851132374566392a61846230a1eb2fd83b9538d06d79bbcc5a46aef706499020d3eefd15 SHA512 af3366d437ebdd44a0ef73c5b166e55c5443423447f72b0de88bc3cf6e8f23ffb823ef10ad6051a01a05ac73ae6e87cec58064b582854bf34120bbd755d859eb
diff --git a/acct-group/registry/metadata.xml b/acct-group/registry/metadata.xml
new file mode 100644
index 000000000000..9a7ba2ff3c46
--- /dev/null
+++ b/acct-group/registry/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/registry/registry-0.ebuild b/acct-group/registry/registry-0.ebuild
new file mode 100644
index 000000000000..1c05abd01b75
--- /dev/null
+++ b/acct-group/registry/registry-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-emulation/docker-registry"
+
+ACCT_GROUP_ID="295"
diff --git a/acct-group/resin/Manifest b/acct-group/resin/Manifest
new file mode 100644
index 000000000000..a6dcb735139c
--- /dev/null
+++ b/acct-group/resin/Manifest
@@ -0,0 +1,2 @@
+EBUILD resin-0.ebuild 198 BLAKE2B 33938ca7ce614daab42ee70d939a1f0b40422d2dc945d6af4ec59848bb537a411df5d22a35004ee1a43595acb5edb084d2c4e823ab365464dc1b43bc40115802 SHA512 358d09178d271a7172511ec9464d12fbe5809eb732ee575f527be0716bea5ab5f1ccf955c31f51a6162ab0460b3d97f49b0aeadd94740f1866abdae737474624
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/acct-group/resin/metadata.xml b/acct-group/resin/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/acct-group/resin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/resin/resin-0.ebuild b/acct-group/resin/resin-0.ebuild
new file mode 100644
index 000000000000..110eae9c3c1a
--- /dev/null
+++ b/acct-group/resin/resin-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/resin"
+
+ACCT_GROUP_ID="140"
diff --git a/acct-group/roccat/Manifest b/acct-group/roccat/Manifest
new file mode 100644
index 000000000000..1ff42b7d0e5f
--- /dev/null
+++ b/acct-group/roccat/Manifest
@@ -0,0 +1,2 @@
+EBUILD roccat-0.ebuild 202 BLAKE2B a3305df2b97ab57f4e46e2a14ee83194ce28de85d1bb1b83be878fa9c8ea74d1a7e3c981c90c7b19bac77e412628596262e7024136ad815ae0a86242f4b03bba SHA512 c31cf6808281c7108d8bd251a3bc9ba8c49a2deb3eab0852ee1a021213d489e14793b1ae28594be04f036e7a60ed86b0b10545abf04dc67e85dd07f0f703739f
+MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/acct-group/roccat/metadata.xml b/acct-group/roccat/metadata.xml
new file mode 100644
index 000000000000..95aa13f6c5ef
--- /dev/null
+++ b/acct-group/roccat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/roccat/roccat-0.ebuild b/acct-group/roccat/roccat-0.ebuild
new file mode 100644
index 000000000000..8c8638f0a4e2
--- /dev/null
+++ b/acct-group/roccat/roccat-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-apps/roccat-tools"
+
+ACCT_GROUP_ID="203"
diff --git a/acct-group/ros/Manifest b/acct-group/ros/Manifest
new file mode 100644
index 000000000000..d750ffc6825f
--- /dev/null
+++ b/acct-group/ros/Manifest
@@ -0,0 +1,2 @@
+EBUILD ros-0.ebuild 198 BLAKE2B cd27b150402dba07c213c2a7f8539359b064a3ce14c82c8e3cf7f1f93dadc038b188f212a5982dd7a223ac836a530406fd54dc661ab4b28c02a2edeca9809679 SHA512 2914c969b0ee18d858caa90102731eafaa4e2a7554b53a39bef600fd5bcfa822dbdf8996804dede3c8eaae1f1924c8178c4c488242b2d9d1e64bd86de9d0ffde
+MISC metadata.xml 249 BLAKE2B 05e1e70021900498f37045733d9cf72175655cc72ef45d5cc5593c6fe6c04bf8a1895a6b40470e31ba15254dbf2c0e71dca9da3e1a7e7a0c76ffea90ca518f82 SHA512 f6c1880cb315572548c1cea0233124f8dfb99091c9dff06484f02847e4a6ab4bbecd627f2d561ef3d666c99c240195031294d170024fd2549dec228b7058bb71
diff --git a/acct-group/ros/metadata.xml b/acct-group/ros/metadata.xml
new file mode 100644
index 000000000000..74ced8bea005
--- /dev/null
+++ b/acct-group/ros/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/ros/ros-0.ebuild b/acct-group/ros/ros-0.ebuild
new file mode 100644
index 000000000000..373c97151c4e
--- /dev/null
+++ b/acct-group/ros/ros-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-ros/roslaunch"
+
+ACCT_GROUP_ID="130"
diff --git a/acct-group/rplayd/Manifest b/acct-group/rplayd/Manifest
new file mode 100644
index 000000000000..9304431c6cc6
--- /dev/null
+++ b/acct-group/rplayd/Manifest
@@ -0,0 +1,2 @@
+EBUILD rplayd-0.ebuild 198 BLAKE2B 3b693da3ec392f259a4f3311ce811de03e43aba4227f9f00569347a44ace689d802e81e68fe34dfefa22127ce30333d799b427f44f9e2cb2000ce3df8790196c SHA512 a1eb32fb45332050a918dd99bc862924fcbd769214d7a6b7dbc1f6da15af37e85ba60db8c9d38bae0e865e4c3162cc7e0553ecd9ae8602226fbaabf672e9c28e
+MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/acct-group/rplayd/metadata.xml b/acct-group/rplayd/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/acct-group/rplayd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/rplayd/rplayd-0.ebuild b/acct-group/rplayd/rplayd-0.ebuild
new file mode 100644
index 000000000000..744523e8b26c
--- /dev/null
+++ b/acct-group/rplayd/rplayd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/rplay"
+
+ACCT_GROUP_ID="161"
diff --git a/acct-group/rt/Manifest b/acct-group/rt/Manifest
new file mode 100644
index 000000000000..b508c8c61a9d
--- /dev/null
+++ b/acct-group/rt/Manifest
@@ -0,0 +1,2 @@
+EBUILD rt-0.ebuild 192 BLAKE2B b89bc6ed49015602984ca18ccd9dba65976acc927638faf019cf8e9daadd1027b927668e2297ebbf9ee6664668de1906636e8b24969474db51c55fbff4550ae6 SHA512 fbd478e40473e20b555da6e007664483a95694f9abcf5f7d194e586320a9b9ea16551f52197a86eb6303afca7360f9dff0a3aff1d10518bfaefb4c82747f3a26
+MISC metadata.xml 364 BLAKE2B 22da06b13858eead1f5afca7152b8ec85baddd736452cdb5e616f2771535b91b3a346d7f21c804e1957d9db8de3875e9889341eb44aae4e6c2509984dede542d SHA512 d99a4abc1e8d979bd73f4f19abc7932d2d8753d1e748649068b9f2731fec9d927f2ba20472af8d0f79c66e8d67eb304467ecd98df8909bcd6b7f458c8ef0ecbd
diff --git a/acct-group/rt/metadata.xml b/acct-group/rt/metadata.xml
new file mode 100644
index 000000000000..b5bf61d42076
--- /dev/null
+++ b/acct-group/rt/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>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/rt/rt-0.ebuild b/acct-group/rt/rt-0.ebuild
new file mode 100644
index 000000000000..460d0c3d7dcc
--- /dev/null
+++ b/acct-group/rt/rt-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/rt"
+
+ACCT_GROUP_ID="126"
diff --git a/acct-group/rundeck/Manifest b/acct-group/rundeck/Manifest
new file mode 100644
index 000000000000..99ac79814b3b
--- /dev/null
+++ b/acct-group/rundeck/Manifest
@@ -0,0 +1,2 @@
+EBUILD rundeck-0.ebuild 201 BLAKE2B b0f579e4be3fde229a44722c95f835fd2971588f36a3e255de8b9ba92dfbace65da2470fcca144d834bc4f89ff01181c7dee310af09d4899195aa716a9859269 SHA512 2b2ada083da1509384d184c90568ba64151c1c78b9873d62b15a78e4dafa0b66c83aaf5af04fcbdd664553f8976f027433cba8a79e9f2fdba7b0483e6f43fe16
+MISC metadata.xml 357 BLAKE2B 12dd8fa6e9f2fde87a1099ccfff29321cf82cb73617fb8c173f9ec3f28171b41f266a8a5a12224bef3c3fa56c830ed961630a640c1299a75c71b69ec6ecc0549 SHA512 381f317e07e399bc38d3b6eb773d9d8846fab3644deead6401f525cdf9d64987270edf4b38a2a82b0197fc2998ef825cec2d789ac84365d066271f0b16c859cf
diff --git a/acct-group/rundeck/metadata.xml b/acct-group/rundeck/metadata.xml
new file mode 100644
index 000000000000..141fcf81ab49
--- /dev/null
+++ b/acct-group/rundeck/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>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Gentoo Java team</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/rundeck/rundeck-0.ebuild b/acct-group/rundeck/rundeck-0.ebuild
new file mode 100644
index 000000000000..9a51c176b28f
--- /dev/null
+++ b/acct-group/rundeck/rundeck-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/rundeck-bin"
+
+ACCT_GROUP_ID="109"
diff --git a/acct-group/scanlogd/Manifest b/acct-group/scanlogd/Manifest
new file mode 100644
index 000000000000..94d8a53fcedd
--- /dev/null
+++ b/acct-group/scanlogd/Manifest
@@ -0,0 +1,2 @@
+EBUILD scanlogd-0.ebuild 202 BLAKE2B 0632a682e9aa2330f9ca0368f45ae408fea262d3eb876e18d2d0e24d3027151aed1c303dcc3486b084f8b98aef8a3e0affda5783b3f520bcf599679a2d865369 SHA512 bf86ba312bf77e5caee19c74cfdbf4f838291b3888eadb4c8b73c7789ad95589993f2e7df4d1b1926ee200a9de83d6db328b85ccef82b27db3a63e78053c6c0f
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/acct-group/scanlogd/metadata.xml b/acct-group/scanlogd/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/acct-group/scanlogd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/scanlogd/scanlogd-0.ebuild b/acct-group/scanlogd/scanlogd-0.ebuild
new file mode 100644
index 000000000000..ba71638b34cd
--- /dev/null
+++ b/acct-group/scanlogd/scanlogd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/scanlogd"
+
+ACCT_GROUP_ID="166"
diff --git a/acct-group/sguil/Manifest b/acct-group/sguil/Manifest
new file mode 100644
index 000000000000..f7eae2ada7b4
--- /dev/null
+++ b/acct-group/sguil/Manifest
@@ -0,0 +1,2 @@
+EBUILD sguil-0.ebuild 206 BLAKE2B 590a8f105d3f5f3c2c6cfacb60c28852c41193e94ae79ac1f5d9dc6c8c2050fb1a02b745e7ecde4343a7000205fed82fc43260bed112f9a6c606ddf3127e2255 SHA512 e696d16989f91d22e7a671ecc4d5ffcbc1dfee25a6e41ff562dd500f749e414252bf4ec2089afb60dc4e04d469d12dac761fdb9d13b0bce2651d6a5c0ae3cf30
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/acct-group/sguil/metadata.xml b/acct-group/sguil/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/acct-group/sguil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/sguil/sguil-0.ebuild b/acct-group/sguil/sguil-0.ebuild
new file mode 100644
index 000000000000..15fbe00afd0d
--- /dev/null
+++ b/acct-group/sguil/sguil-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/sguil-sensor"
+
+ACCT_GROUP_ID="165"
diff --git a/acct-group/smokeping/Manifest b/acct-group/smokeping/Manifest
new file mode 100644
index 000000000000..548694c793f9
--- /dev/null
+++ b/acct-group/smokeping/Manifest
@@ -0,0 +1,2 @@
+EBUILD smokeping-0.ebuild 203 BLAKE2B 6a1784d9b0d200ffb64008cfa9eb33a03767fd9c186711b04f3c15860f58007eb3a829ecae3201d83d4906b8debe74cddd78e6e4845ba83e53d6236840c295f9 SHA512 c8544454f12dbb11f28aab193b3dbf9563f548ea71a892c6f5ffe59261e604d0cf8a5e37955d335bba7572ac42d6ef56322cf9f73784b2bd8323014c1ba0726e
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/acct-group/smokeping/metadata.xml b/acct-group/smokeping/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/acct-group/smokeping/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/smokeping/smokeping-0.ebuild b/acct-group/smokeping/smokeping-0.ebuild
new file mode 100644
index 000000000000..0d00bb46fcb0
--- /dev/null
+++ b/acct-group/smokeping/smokeping-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/smokeping"
+
+ACCT_GROUP_ID="164"
diff --git a/acct-group/snmp_exporter/Manifest b/acct-group/snmp_exporter/Manifest
new file mode 100644
index 000000000000..46a34bb7ec53
--- /dev/null
+++ b/acct-group/snmp_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD snmp_exporter-0.ebuild 206 BLAKE2B b83bfceeccdf6167771d4286816727164688c25dfc73e683b825c1d242e33f4bc2b5e7f364c5f4ba29a5a942100e886bdad69db0110256a8b8bb7694bf37edae SHA512 6483e633e558569d1fb500c06697a2f93de2771705d2d45dab11863c0378356ce229a936f3ad8562210ef25a3f59fb57f6362ff22b4114e312d6a055ec68c89f
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/snmp_exporter/metadata.xml b/acct-group/snmp_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/snmp_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/snmp_exporter/snmp_exporter-0.ebuild b/acct-group/snmp_exporter/snmp_exporter-0.ebuild
new file mode 100644
index 000000000000..52cf4f2d532e
--- /dev/null
+++ b/acct-group/snmp_exporter/snmp_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/snmp_exporter"
+
+ACCT_GROUP_ID="108"
diff --git a/acct-group/speech/Manifest b/acct-group/speech/Manifest
new file mode 100644
index 000000000000..efd1afc30eaf
--- /dev/null
+++ b/acct-group/speech/Manifest
@@ -0,0 +1,2 @@
+EBUILD speech-0.ebuild 205 BLAKE2B 7b960972fe177e2b222cafeea903e1b8ea243c3644e485e43eb8cdde58694b06174e04be5c82b4df81e6405b9fa51ed918adc3dafb151f4ac9829eb07239d44a SHA512 9c52193ae21c8a57efdff2effce1412a25b0b8ff6d44d3584638ef66de38537da1ff69d6e4180bb0164f9258578ab7a42adf4659d972df403735ad11b15916ff
+MISC metadata.xml 463 BLAKE2B 2cfbfda36bbc54d37d0a8689470d4fb3c8a27cca5ec82f40c42f5a82f8d824cb679d66302a1d96045c707fb940c339725515eff36c963887355de1ce319e4baa SHA512 ad1d0b19999f151b963e0563af86397b927673890fa5626beb3d5bd1336ef494172028c1c29d997d9039d4516c00f042ad3bbf03e614ee34f14c9cdcac7456ed
diff --git a/acct-group/speech/metadata.xml b/acct-group/speech/metadata.xml
new file mode 100644
index 000000000000..5614581ab26a
--- /dev/null
+++ b/acct-group/speech/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>williamh@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/speech/speech-0.ebuild b/acct-group/speech/speech-0.ebuild
new file mode 100644
index 000000000000..2910ead7862d
--- /dev/null
+++ b/acct-group/speech/speech-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-accessibility/eflite"
+
+ACCT_GROUP_ID="202"
diff --git a/acct-group/spread/Manifest b/acct-group/spread/Manifest
new file mode 100644
index 000000000000..c26b1685d0d7
--- /dev/null
+++ b/acct-group/spread/Manifest
@@ -0,0 +1,2 @@
+EBUILD spread-0.ebuild 196 BLAKE2B 887fdafacaf92e3b4cafa7f0c1992e3cccaafd7f6719e7adbad1bbe044e924181c7c0286f7b0a6510620e511bfddd00aaefdd6f639ffa0ba8e7ab03c0bcb169b SHA512 af939665ed6b8ea9d56c54ccea9629e221786a95d534af7408a7a8b3fd7be9c64517d96a8e8bdfceb0a4ffef2561686a34d7a925a9be7faa29cf2ccf5ffc47a0
+MISC metadata.xml 245 BLAKE2B 922e349900957e202d9925c3b56ddbc4e93034b041d2d500a4f85b60a78f34089bae6ab910423c336af01717f3a3c6003ebbcb6f51d0d7e1a07574e70e7cfe86 SHA512 4706a02393a13e76abffdbffc63ca8bcc70dd9d7145241e0469ab0511df26bf7d6be8d31fdabff7916d23ab1dc886e3d9886551d8ad80074488a31d02952ad16
diff --git a/acct-group/spread/metadata.xml b/acct-group/spread/metadata.xml
new file mode 100644
index 000000000000..269a11fe6430
--- /dev/null
+++ b/acct-group/spread/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kumba@gentoo.org</email>
+		<name>Joshua Kinard</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/spread/spread-0.ebuild b/acct-group/spread/spread-0.ebuild
new file mode 100644
index 000000000000..7bbdd3539cd6
--- /dev/null
+++ b/acct-group/spread/spread-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/spread"
+
+ACCT_GROUP_ID="159"
diff --git a/acct-group/subsonic/Manifest b/acct-group/subsonic/Manifest
new file mode 100644
index 000000000000..a787f94e40cd
--- /dev/null
+++ b/acct-group/subsonic/Manifest
@@ -0,0 +1,2 @@
+EBUILD subsonic-0.ebuild 205 BLAKE2B 2f8febacb48638a2ddaa1b7b24a9e0ade43327bbc800d3fc50a3fe9c9cf15b8c4627596528b94680c9192364fa145c59ee012656c1cd15554de1b054946679d5 SHA512 6867a68856f7e0b62de69e0af1ab01b6cfe38f02f1cf6494cc10435ae5cedfc1b29dd6aa4c9402200fecb847329e3ea7ad708c0ff8ad83826bd978674b2fbfcd
+MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/acct-group/subsonic/metadata.xml b/acct-group/subsonic/metadata.xml
new file mode 100644
index 000000000000..76f45cdee0f4
--- /dev/null
+++ b/acct-group/subsonic/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/subsonic/subsonic-0.ebuild b/acct-group/subsonic/subsonic-0.ebuild
new file mode 100644
index 000000000000..95e9e9317296
--- /dev/null
+++ b/acct-group/subsonic/subsonic-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/subsonic-bin"
+
+ACCT_GROUP_ID="136"
diff --git a/acct-group/taskd/Manifest b/acct-group/taskd/Manifest
new file mode 100644
index 000000000000..9f072d5b366b
--- /dev/null
+++ b/acct-group/taskd/Manifest
@@ -0,0 +1,2 @@
+EBUILD taskd-0.ebuild 195 BLAKE2B 9ed344a17f1a4febaf83b45f5bb2e6e415d6a99a23ee6e9aa4b6c073e560e1461763e4ff703d03fa4d66791e9055182b7482d960951e76ca09a783036f2f8ffc SHA512 53603cbaadbfe27fb848a5353b958532fa7ed23aa52a6afbc753c0b472b5c9af28549ed86de1c58586a37e75c4070039a1ff74119e577aea2100cbfd6243d8ef
+MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/acct-group/taskd/metadata.xml b/acct-group/taskd/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/acct-group/taskd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/taskd/taskd-0.ebuild b/acct-group/taskd/taskd-0.ebuild
new file mode 100644
index 000000000000..16ca38a8ade9
--- /dev/null
+++ b/acct-group/taskd/taskd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/taskd"
+
+ACCT_GROUP_ID="152"
diff --git a/acct-group/thttpd/Manifest b/acct-group/thttpd/Manifest
new file mode 100644
index 000000000000..40fc8e4e5a78
--- /dev/null
+++ b/acct-group/thttpd/Manifest
@@ -0,0 +1,2 @@
+EBUILD thttpd-0.ebuild 199 BLAKE2B b74105cf658b121c1e5e6ec9cc59f46ad699d60b2562e295adfb1b7ed8e1705401adee59b2dd3b5cda4d890fab10658e779c07d733bcae6198d543fa0133904a SHA512 fdcbf9892cf372fe3fce0cec357950106ec79749cdafb1d56f8577f7699bc01163b6d4a540ba588e3cd2beee3ce053e9ae7ce4d5e71668fedb2f5ff7178fff6b
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/acct-group/thttpd/metadata.xml b/acct-group/thttpd/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/thttpd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/thttpd/thttpd-0.ebuild b/acct-group/thttpd/thttpd-0.ebuild
new file mode 100644
index 000000000000..f30403a01946
--- /dev/null
+++ b/acct-group/thttpd/thttpd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/thttpd"
+
+ACCT_GROUP_ID="155"
diff --git a/acct-group/trickster/Manifest b/acct-group/trickster/Manifest
new file mode 100644
index 000000000000..b17ee1223511
--- /dev/null
+++ b/acct-group/trickster/Manifest
@@ -0,0 +1,2 @@
+EBUILD trickster-0.ebuild 199 BLAKE2B 459f60815906d19191ec56ac0cb854cfed5be34cb67c7a8fc97e639f75ceb67bb3ddeb5306d54573a9d6f01d7191e76626a0ed10b73b588079d00370605c1fcc SHA512 589173af42c5bb1d365d9a731730ede3b1b75dc812a86c36db89fe952ac0269efa67487f7497e667e4b51bb9cef7c34b7e57d7615c1496c5333c502094ea8151
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/trickster/metadata.xml b/acct-group/trickster/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/trickster/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/trickster/trickster-0.ebuild b/acct-group/trickster/trickster-0.ebuild
new file mode 100644
index 000000000000..fa5e88995312
--- /dev/null
+++ b/acct-group/trickster/trickster-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/trickster"
+
+ACCT_GROUP_ID="119"
diff --git a/acct-group/uwsgi_exporter/Manifest b/acct-group/uwsgi_exporter/Manifest
new file mode 100644
index 000000000000..08e79a604b43
--- /dev/null
+++ b/acct-group/uwsgi_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD uwsgi_exporter-0.ebuild 207 BLAKE2B 80cc391b4c0d7ee7e5119e0bd02a9078cbaadca69cbc70078ee597c1c645e32a2a24628d0a9562f37b3a28ba4b1e3287f01c11ad46b50ae3e1a45ab69735ce29 SHA512 a616c801d56e29b68f541d3d7059be1627b088314818bd6a060620a9656cb244a2d619858a92e72fef4b18b1e42258ea47af5021ef71aaa2c1ad76d96464e28d
+MISC metadata.xml 244 BLAKE2B 69bff1931d3487cac65b10ff2068c2ffeb68b772ca4ed4842f39d8c92403572314769f3babca3204dbf3ebec92d813821ab79ba7c78e8ca9d161149e4db88fba SHA512 ee1587876b1ab6b66fc7a7eaa9d6c1c8fa0389f885da6fd6dd88bfcea3d179f0dc36a5c8be70fefa35cfb16eb4f92f41c24a438e9db57580949a1e796b1b2d78
diff --git a/acct-group/uwsgi_exporter/metadata.xml b/acct-group/uwsgi_exporter/metadata.xml
new file mode 100644
index 000000000000..9e1d47466c8d
--- /dev/null
+++ b/acct-group/uwsgi_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild b/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
new file mode 100644
index 000000000000..4c7c20d457ec
--- /dev/null
+++ b/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/uwsgi_exporter"
+
+ACCT_GROUP_ID="289"
diff --git a/acct-group/vacation/Manifest b/acct-group/vacation/Manifest
new file mode 100644
index 000000000000..a9e7c5b7096d
--- /dev/null
+++ b/acct-group/vacation/Manifest
@@ -0,0 +1,2 @@
+EBUILD vacation-0.ebuild 202 BLAKE2B 9d5a031f8918f93846e9e7ad53b988b47f0fabf2a8d31b1f94fdaf0b8d28f80c65cc4455ecea1b1378e5495e334077242302a3ec411588f413eafdb0881b718c SHA512 46296c551ab2d2b112589d84039a9a7dceb6820b75fe3545e37e1da6aa51f491db4d633cbd5c5be7ca62bc2c085ec35871a4550448d3a643e7cce20062720777
+MISC metadata.xml 364 BLAKE2B 22da06b13858eead1f5afca7152b8ec85baddd736452cdb5e616f2771535b91b3a346d7f21c804e1957d9db8de3875e9889341eb44aae4e6c2509984dede542d SHA512 d99a4abc1e8d979bd73f4f19abc7932d2d8753d1e748649068b9f2731fec9d927f2ba20472af8d0f79c66e8d67eb304467ecd98df8909bcd6b7f458c8ef0ecbd
diff --git a/acct-group/vacation/metadata.xml b/acct-group/vacation/metadata.xml
new file mode 100644
index 000000000000..b5bf61d42076
--- /dev/null
+++ b/acct-group/vacation/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>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/vacation/vacation-0.ebuild b/acct-group/vacation/vacation-0.ebuild
new file mode 100644
index 000000000000..94ef2caa53ed
--- /dev/null
+++ b/acct-group/vacation/vacation-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/postfixadmin"
+
+ACCT_GROUP_ID="125"
diff --git a/acct-group/vdr/Manifest b/acct-group/vdr/Manifest
new file mode 100644
index 000000000000..32d02178d96f
--- /dev/null
+++ b/acct-group/vdr/Manifest
@@ -0,0 +1,2 @@
+EBUILD vdr-0-r1.ebuild 208 BLAKE2B a55bd513896ec5b08e9a8eb9d1ebf8b7ae925aa5614f4c786cb4933e40d897e1e8a44ff61a723d411b2c0cfeda40794eb7cbe94b7755ef5ec14ac2798caed7b3 SHA512 d6be4ca4431c873ba1c733bf2c36e6ed9cfb5883cca934926574508bc076ca1322a135845cb917461c4b574d84b84790ccbd96f75b6df08c072ec66790317745
+MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/acct-group/vdr/metadata.xml b/acct-group/vdr/metadata.xml
new file mode 100644
index 000000000000..984a01fab265
--- /dev/null
+++ b/acct-group/vdr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/vdr/vdr-0-r1.ebuild b/acct-group/vdr/vdr-0-r1.ebuild
new file mode 100644
index 000000000000..b150a48a3abe
--- /dev/null
+++ b/acct-group/vdr/vdr-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the VDR (VideoDiskRecorder)"
+
+ACCT_GROUP_ID="452"
diff --git a/acct-group/xwax/Manifest b/acct-group/xwax/Manifest
new file mode 100644
index 000000000000..30189c63ec40
--- /dev/null
+++ b/acct-group/xwax/Manifest
@@ -0,0 +1,2 @@
+EBUILD xwax-0.ebuild 197 BLAKE2B 7c8e274d1cb9b1c055600e4e08c891e90860cad19d0b6427ca75d0f8372ac04b84c8ead0fa37d736949eaad439041b79266f08e966b8f6f9c4925d411d881029 SHA512 867331da7ae6accbcc81e2b6def0999822f18297c1bd7895cfd172b7ec8046bd8454c11f61524e917153ce64e06880671c80f6046d99619816e7e308dba7229c
+MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/acct-group/xwax/metadata.xml b/acct-group/xwax/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/acct-group/xwax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/xwax/xwax-0.ebuild b/acct-group/xwax/xwax-0.ebuild
new file mode 100644
index 000000000000..fa5f01bc8577
--- /dev/null
+++ b/acct-group/xwax/xwax-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/xwax"
+
+ACCT_GROUP_ID="205"
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index b1d18363fe6d..91d670d156ab 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/arpwatch/Manifest b/acct-user/arpwatch/Manifest
new file mode 100644
index 000000000000..225419fcc8b3
--- /dev/null
+++ b/acct-user/arpwatch/Manifest
@@ -0,0 +1,2 @@
+EBUILD arpwatch-0.ebuild 251 BLAKE2B e60481baae233c93b88306b2fa140f6f0a59dba30c8d8e2261d9badf36503da50becf803649d8f2d3f29e7b0494fdf926ef2544af7dddfb19e7a58f970d7eca1 SHA512 90a8826b5368bd7610c37cf9a15d4ffefb0c8a9d76681fd770ca938d245e3d0fc2efe6ec795c08108c8969486af1e3b474804fc611d7afe346a366c5995921e1
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/acct-user/arpwatch/arpwatch-0.ebuild b/acct-user/arpwatch/arpwatch-0.ebuild
new file mode 100644
index 000000000000..24f4e8b490e2
--- /dev/null
+++ b/acct-user/arpwatch/arpwatch-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/arpwatch"
+
+ACCT_USER_GROUPS=( "arpwatch" )
+ACCT_USER_ID="170"
+
+acct-user_add_deps
diff --git a/acct-user/arpwatch/metadata.xml b/acct-user/arpwatch/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/acct-user/arpwatch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/gnump3d/Manifest b/acct-user/gnump3d/Manifest
new file mode 100644
index 000000000000..c0f8cd4b3a05
--- /dev/null
+++ b/acct-user/gnump3d/Manifest
@@ -0,0 +1,2 @@
+EBUILD gnump3d-0.ebuild 248 BLAKE2B 75238ff7e3b99f72a975759c0b4918b86c3c76718db502d2349df4c00c1057cffe2926a9dfba2d4a15f8dfd804fd622a8a7e688f2d68b8b3f8b9132285ec5bf8 SHA512 7c2c1cf691282d0af2d8fd912fcfe1b843b4fa8ad3bc53c9426765e442061db11a2623e3528fec25bc9daddfdb5fe0038c0517916a756f81708d4d3e15b7003e
+MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/acct-user/gnump3d/gnump3d-0.ebuild b/acct-user/gnump3d/gnump3d-0.ebuild
new file mode 100644
index 000000000000..131534a55167
--- /dev/null
+++ b/acct-user/gnump3d/gnump3d-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/gnump3d"
+
+ACCT_USER_GROUPS=( "gnump3d" )
+ACCT_USER_ID="160"
+
+acct-user_add_deps
diff --git a/acct-user/gnump3d/metadata.xml b/acct-user/gnump3d/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/acct-user/gnump3d/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/ices/Manifest b/acct-user/ices/Manifest
new file mode 100644
index 000000000000..ac5a4db07788
--- /dev/null
+++ b/acct-user/ices/Manifest
@@ -0,0 +1,2 @@
+EBUILD ices-0.ebuild 239 BLAKE2B 6e86c9440965d6054a0becf5fe6f41561fc1de03a7beb6983496881f938692f42d0c6ec0f8cb9c7ee026acec1c55d486535ee0748698472e8ff4a576990204ac SHA512 f4fd5573968347da2b1ff2cbfc3f077a31f97419e16f94dc8b43dd83d6168d3750cb114ca9f8820880cb90282a0b635a5c3a81bd575d6925f6f38c7f213ad72c
+MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/acct-user/ices/ices-0.ebuild b/acct-user/ices/ices-0.ebuild
new file mode 100644
index 000000000000..f5e3508280b0
--- /dev/null
+++ b/acct-user/ices/ices-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/ices"
+
+ACCT_USER_GROUPS=( "ices" )
+ACCT_USER_ID="162"
+
+acct-user_add_deps
diff --git a/acct-user/ices/metadata.xml b/acct-user/ices/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/acct-user/ices/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/ipsentinel/Manifest b/acct-user/ipsentinel/Manifest
new file mode 100644
index 000000000000..4afa1beb66c9
--- /dev/null
+++ b/acct-user/ipsentinel/Manifest
@@ -0,0 +1,2 @@
+EBUILD ipsentinel-0.ebuild 252 BLAKE2B c08fbd023b03aaf56f920408d10085e4287c1e3c296b27ac0e0d35ca76cac40e80707d3682c26b3e46668a11e0a67df4fd9235682cd32a8090d8ffad8ece347d SHA512 5f96ec48919d170a946273203eb10445fc7279a03c615572649f7139cd28f02992acc8474d73865ff5436b60c40351dc6cf0209f68eefcef7b8dddefdd697db9
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/acct-user/ipsentinel/ipsentinel-0.ebuild b/acct-user/ipsentinel/ipsentinel-0.ebuild
new file mode 100644
index 000000000000..1dceb5b8104a
--- /dev/null
+++ b/acct-user/ipsentinel/ipsentinel-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/ip-sentinel"
+
+ACCT_USER_GROUPS=( "ipsentinel" )
+ACCT_USER_ID="163"
+
+acct-user_add_deps
diff --git a/acct-user/ipsentinel/metadata.xml b/acct-user/ipsentinel/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/acct-user/ipsentinel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/netperf/Manifest b/acct-user/netperf/Manifest
new file mode 100644
index 000000000000..72ea330ddeac
--- /dev/null
+++ b/acct-user/netperf/Manifest
@@ -0,0 +1,2 @@
+EBUILD netperf-0.ebuild 249 BLAKE2B 0a861f33f2ded71d79e8ac917ed1f92c04b7f8caf1d11618a2a12c437ccdf27be63c7e4d562f6a84e9e57b1d7fe336946b4cc1a9f9411eee5691483b5cfe6d54 SHA512 e47c542031adcf69166926e3f3cb6f047ac6c6dfe29b585827571a240d0be8aca57876b525c49d72554bab931b25115748456d99d35efdcd0ee9819168f6e5aa
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/acct-user/netperf/metadata.xml b/acct-user/netperf/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/acct-user/netperf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/netperf/netperf-0.ebuild b/acct-user/netperf/netperf-0.ebuild
new file mode 100644
index 000000000000..479d3788dbaa
--- /dev/null
+++ b/acct-user/netperf/netperf-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/netperf"
+
+ACCT_USER_GROUPS=( "netperf" )
+ACCT_USER_ID="168"
+
+acct-user_add_deps
diff --git a/acct-user/ngrep/Manifest b/acct-user/ngrep/Manifest
index ee3b9c6c13b9..2a31887e5d99 100644
--- a/acct-user/ngrep/Manifest
+++ b/acct-user/ngrep/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngrep-0.ebuild 245 BLAKE2B 118c2cfbcd27c841f57c51bae87fd088974c1c83e2762c098a4230e4c9893cbde3b5cbcdd670a2bed679aae5dc3547709a805cafb2e37fe62701cdb6328be077 SHA512 4d6271bd9d91af25c39d0e44fcdcf2d51b702f0344c34e31a7e088e439c1e18222197b360543d206630d785ee83d7c02fee7199c3d260c4c2894d6389b718134
+EBUILD ngrep-0-r1.ebuild 245 BLAKE2B d3f29f165009a42f8802285ba094410cc1739a6355a9fc16ab4ae3c45ff91cee325c46e803138e2bb0ba58eebf228c0398eef68d2010476b4799e304e1044628 SHA512 1b1ea5e82218b74d3a2d0a3df0bf8f6e6b1973149e44ee887f3c0c533f2135b864a5cb7e6310f6783a6f52af0c9be973b87f4fdc599cec60a5e5833622f0cd7f
 MISC metadata.xml 624 BLAKE2B a37785fd96ebd3bf967401c12c22db12ae9501836d6718b4390ace7dbe45701e793d3821cf510cec63b760c64b77ab12a63481d6cdd7c379d3209fba7b059d58 SHA512 cba79cac4f0cbbd9dabb2b17586565a145aff17f16b2cc3c34bc4b3c63e83dd5522168a1e5ca22df63ded54ea26f850bccf972791ccf8eb41ce9899f7f26d31d
diff --git a/acct-user/ngrep/ngrep-0-r1.ebuild b/acct-user/ngrep/ngrep-0-r1.ebuild
new file mode 100644
index 000000000000..4851b7fcb10f
--- /dev/null
+++ b/acct-user/ngrep/ngrep-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/ngrep"
+
+ACCT_USER_GROUPS=( "ngrep" )
+ACCT_USER_ID="185"
+
+acct-user_add_deps
diff --git a/acct-user/ngrep/ngrep-0.ebuild b/acct-user/ngrep/ngrep-0.ebuild
deleted file mode 100644
index 1ca27085ca6d..000000000000
--- a/acct-user/ngrep/ngrep-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/ngrep"
-
-ACCT_USER_GROUPS=( "ngrep" )
-ACCT_USER_ID="186"
-
-acct-user_add_deps
diff --git a/acct-user/opendnssec/Manifest b/acct-user/opendnssec/Manifest
new file mode 100644
index 000000000000..3b1e6bf09db0
--- /dev/null
+++ b/acct-user/opendnssec/Manifest
@@ -0,0 +1,2 @@
+EBUILD opendnssec-0.ebuild 250 BLAKE2B 9f59fef05559a90467941d0cd5b8a199fe8091a4bd8d018ff51842d4b6d0cfbf2fe00fa543ec920c9b7cb23d6aefe6414466804f3f136e1aa0825bcbf433c288 SHA512 81411499e8bdd721a8d376c8398b4cd97392fab5067ddcfffdbe105dbf23190a795440fbd7ab3478f13158133541e0b3f2170cb754c877926bc4abe7d575764a
+MISC metadata.xml 218 BLAKE2B 48f6dc072d599bb422bd1033c1b1ecc05aba8ac787c9a10425ecf89d08140c859a122f19502f1de050ea7341f4947aee0b88d10ee605b2a60ec4542ff29ac489 SHA512 c1894fa0ad03968827a0eb6410381bdaa9491a4b450f9a50959a93700f803ddc83f020040f4db06ed3ba68c12adb4a73b192525ef7e70c0bd10125e3da578c65
diff --git a/acct-user/opendnssec/metadata.xml b/acct-user/opendnssec/metadata.xml
new file mode 100644
index 000000000000..56df135ff5a0
--- /dev/null
+++ b/acct-user/opendnssec/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mschiff@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/opendnssec/opendnssec-0.ebuild b/acct-user/opendnssec/opendnssec-0.ebuild
new file mode 100644
index 000000000000..620602fb74b7
--- /dev/null
+++ b/acct-user/opendnssec/opendnssec-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/opendnssec"
+
+ACCT_USER_GROUPS=( "opendnssec" )
+ACCT_USER_ID="151"
+
+acct-user_add_deps
diff --git a/acct-user/opm/Manifest b/acct-user/opm/Manifest
new file mode 100644
index 000000000000..c9cc181de7dc
--- /dev/null
+++ b/acct-user/opm/Manifest
@@ -0,0 +1,2 @@
+EBUILD opm-0-r1.ebuild 234 BLAKE2B 2daab98a3eaa01d77f8d3b79b9df1b879ddd455122329020b83d199e954543fb9c41498a2b55fc0b8deee898360971529d6fc9c5890c58c3eed9842592fd2c56 SHA512 ef134ec8d47b2675558f41701d57c724395cd8f75ec6ae3a0e07d8f878f02fb3108e9eaceed6d0ce7816f7d627c09542ecb837e7846fe06dd04775005c7159f8
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/acct-user/opm/metadata.xml b/acct-user/opm/metadata.xml
new file mode 100644
index 000000000000..979bcc7aec93
--- /dev/null
+++ b/acct-user/opm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/opm/opm-0-r1.ebuild b/acct-user/opm/opm-0-r1.ebuild
new file mode 100644
index 000000000000..ed82e1d8a36c
--- /dev/null
+++ b/acct-user/opm/opm-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for an open proxy monitor"
+ACCT_USER_ID=127
+ACCT_USER_GROUPS=( opm )
+
+acct-user_add_deps
diff --git a/acct-user/redsocks/Manifest b/acct-user/redsocks/Manifest
new file mode 100644
index 000000000000..c28c45214398
--- /dev/null
+++ b/acct-user/redsocks/Manifest
@@ -0,0 +1,2 @@
+EBUILD redsocks-0.ebuild 248 BLAKE2B 0fd52aea14d5f4c4ab852d8c2138b9805b56bc2031f236ac0ac26fb7f65e7f6ab440baf46248d9c5d1295474a5634b769a00ba9dbfd6b46f0420ab88d12300e5 SHA512 dc102441032879b9d75cdc9bfbccb621913d44fc5f688ceed82f8da9f60d7ebf5ab92154ab0d77559901bd39ca0bff85af02efafbde0427c0491d1c29acd3054
+MISC metadata.xml 246 BLAKE2B c7559c694569e2eb079aa44ab82aac05dd7218624519133b1d1de233f6d4bce0872ada012e00dc369051e9685d9a25d314c05318d1b109ee81945dd739da51df SHA512 0d07f784095273f14c7d63a215a76c84fec302e6e52717f0e47c29916aa90149239dfe7ed3227a42e2863226e4448d8a2e8321ccc589ad6d9f725731b45559a2
diff --git a/acct-user/redsocks/metadata.xml b/acct-user/redsocks/metadata.xml
new file mode 100644
index 000000000000..b58e8386fcb2
--- /dev/null
+++ b/acct-user/redsocks/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/redsocks/redsocks-0.ebuild b/acct-user/redsocks/redsocks-0.ebuild
new file mode 100644
index 000000000000..05a1acdcd320
--- /dev/null
+++ b/acct-user/redsocks/redsocks-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-proxy/redsocks"
+
+ACCT_USER_GROUPS=( "redsocks" )
+ACCT_USER_ID="155"
+
+acct-user_add_deps
diff --git a/acct-user/rplayd/Manifest b/acct-user/rplayd/Manifest
new file mode 100644
index 000000000000..1196f98ca2e6
--- /dev/null
+++ b/acct-user/rplayd/Manifest
@@ -0,0 +1,2 @@
+EBUILD rplayd-0.ebuild 245 BLAKE2B cb1ad829dc0e82512496e95a0ad3ddd76434c586cc891f2fd8538e782afce7fc16ad797f064ef38f31a79c3a6b49e1950163a17fb8bcd79962f9f931a35f6909 SHA512 cb666dd1a1eae8fca37fbcabc0e7fdc13cfdffe9b6f40b472365d7d0808e6e0e7416eab85a9356c45d5488894599478b9f0decc658587bf0eddacbe64472b2be
+MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/acct-user/rplayd/metadata.xml b/acct-user/rplayd/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/acct-user/rplayd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/rplayd/rplayd-0.ebuild b/acct-user/rplayd/rplayd-0.ebuild
new file mode 100644
index 000000000000..d0f4a9ffa47e
--- /dev/null
+++ b/acct-user/rplayd/rplayd-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/rplay"
+
+ACCT_USER_GROUPS=( "rplayd" )
+ACCT_USER_ID="161"
+
+acct-user_add_deps
diff --git a/acct-user/scanlogd/Manifest b/acct-user/scanlogd/Manifest
new file mode 100644
index 000000000000..44b67d1261b4
--- /dev/null
+++ b/acct-user/scanlogd/Manifest
@@ -0,0 +1,2 @@
+EBUILD scanlogd-0.ebuild 251 BLAKE2B 5ca99c2e438d3e234569ac47168e946f0b45715ccb97fdc2e8c930ae6f90336c57023d47432c80895e9f660546870a32325d527b5026efe40e568c7ef9610572 SHA512 ba1e552bdd48e440e2f04747167dcd20d19cb0fc5d7a1b3f6bebc649a6606b4e255000a01350c967e7ce9f0471c866938d25bf35b4d0ee698deb192c69e6bf3c
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/acct-user/scanlogd/metadata.xml b/acct-user/scanlogd/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/acct-user/scanlogd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/scanlogd/scanlogd-0.ebuild b/acct-user/scanlogd/scanlogd-0.ebuild
new file mode 100644
index 000000000000..21ec18b7a255
--- /dev/null
+++ b/acct-user/scanlogd/scanlogd-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/scanlogd"
+
+ACCT_USER_GROUPS=( "scanlogd" )
+ACCT_USER_ID="166"
+
+acct-user_add_deps
diff --git a/acct-user/sguil/Manifest b/acct-user/sguil/Manifest
new file mode 100644
index 000000000000..ece0f23202dc
--- /dev/null
+++ b/acct-user/sguil/Manifest
@@ -0,0 +1,2 @@
+EBUILD sguil-0.ebuild 284 BLAKE2B 1e47c59b531e7d7aa405a28b775526456b9bb078e19ede68e1493440c95d8d0796595591a57eee4b72c4529d076123d5c98325dfdaee04d7381c3c3c6743aa39 SHA512 9ef071fda592ac8de68b3c218d0dd7e2283f41590a1a0caadbc7a9500115fdaa8b2b9690349549c65bc447cf6c778f7c3ddb34bdfb69199a536be5584b3e0aeb
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/acct-user/sguil/metadata.xml b/acct-user/sguil/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/acct-user/sguil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/sguil/sguil-0.ebuild b/acct-user/sguil/sguil-0.ebuild
new file mode 100644
index 000000000000..01910dcc0edd
--- /dev/null
+++ b/acct-user/sguil/sguil-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/sguil-sensor"
+
+ACCT_USER_GROUPS=( "sguil" )
+ACCT_USER_HOME="/var/lib/sguil"
+ACCT_USER_ID="165"
+
+acct-user_add_deps
diff --git a/acct-user/smokeping/Manifest b/acct-user/smokeping/Manifest
new file mode 100644
index 000000000000..1b702ad8c871
--- /dev/null
+++ b/acct-user/smokeping/Manifest
@@ -0,0 +1,2 @@
+EBUILD smokeping-0.ebuild 289 BLAKE2B 7cca7dd113b27fa7f5bf675964f6acee2dd470ba590d443866db0467eaf2cd09c940b29f377b6a38e5c3581a5dbef047d6f8eb5f34af1b5f5377f3d1b71c02d4 SHA512 17c15053df57fecceaf2922943f39340d2969e0406309156db4b163b8e1dd1fa582a375b2424712330fc77527a1ab2acff2a0c94a39a84a5488abaeae455fb17
+MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/acct-user/smokeping/metadata.xml b/acct-user/smokeping/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/acct-user/smokeping/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/smokeping/smokeping-0.ebuild b/acct-user/smokeping/smokeping-0.ebuild
new file mode 100644
index 000000000000..b3c157563d54
--- /dev/null
+++ b/acct-user/smokeping/smokeping-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/smokeping"
+
+ACCT_USER_GROUPS=( "smokeping" )
+ACCT_USER_HOME="/var/lib/smokeping"
+ACCT_USER_ID="164"
+
+acct-user_add_deps
diff --git a/acct-user/spread/Manifest b/acct-user/spread/Manifest
new file mode 100644
index 000000000000..d293adb765d0
--- /dev/null
+++ b/acct-user/spread/Manifest
@@ -0,0 +1,2 @@
+EBUILD spread-0.ebuild 243 BLAKE2B 42b87ad57755d4f18c74690b61a6de8d3688ceac7b983342c26f982a62ed6465d443c6d2250c01cffcd70df053ae0f70714431b4b20e7150cce59d2ffe79c05b SHA512 f3a8d28ea3f2761d349b84fcf3efbd0022088298f2259e0fbf2d9f09c53b71092abd9a37db918cfe92165fd9ab0b7ca2324567a0a9c801f56dd9f05612a13757
+MISC metadata.xml 245 BLAKE2B 922e349900957e202d9925c3b56ddbc4e93034b041d2d500a4f85b60a78f34089bae6ab910423c336af01717f3a3c6003ebbcb6f51d0d7e1a07574e70e7cfe86 SHA512 4706a02393a13e76abffdbffc63ca8bcc70dd9d7145241e0469ab0511df26bf7d6be8d31fdabff7916d23ab1dc886e3d9886551d8ad80074488a31d02952ad16
diff --git a/acct-user/spread/metadata.xml b/acct-user/spread/metadata.xml
new file mode 100644
index 000000000000..269a11fe6430
--- /dev/null
+++ b/acct-user/spread/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kumba@gentoo.org</email>
+		<name>Joshua Kinard</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/spread/spread-0.ebuild b/acct-user/spread/spread-0.ebuild
new file mode 100644
index 000000000000..25e453efacf3
--- /dev/null
+++ b/acct-user/spread/spread-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/spread"
+
+ACCT_USER_GROUPS=( "spread" )
+ACCT_USER_ID="159"
+
+acct-user_add_deps
diff --git a/acct-user/taskd/Manifest b/acct-user/taskd/Manifest
new file mode 100644
index 000000000000..288a6515e00d
--- /dev/null
+++ b/acct-user/taskd/Manifest
@@ -0,0 +1,2 @@
+EBUILD taskd-0.ebuild 301 BLAKE2B c2362be0d6bcf628ed0d81240d5c6c4cf8e1964ad3f9b5ae4dcacf6d61999a825c28ede707ec28693fd14baf3aeefb8085c4aa732367ffbd265e06f2c238c29a SHA512 871f65a0942d0a28b2a128c50f1d7e410430c6e209c9656214e391fd142d60ba73132903ef262558ec9410422b0f7931343901192c286ab281e97eb5179d5fe3
+MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/acct-user/taskd/metadata.xml b/acct-user/taskd/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/acct-user/taskd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/taskd/taskd-0.ebuild b/acct-user/taskd/taskd-0.ebuild
new file mode 100644
index 000000000000..013b234af3d5
--- /dev/null
+++ b/acct-user/taskd/taskd-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-misc/taskd"
+
+ACCT_USER_GROUPS=( "taskd" )
+ACCT_USER_HOME="/var/lib/taskd"
+ACCT_USER_ID="152"
+ACCT_USER_SHELL="/bin/bash"
+
+acct-user_add_deps
diff --git a/acct-user/timidity/Manifest b/acct-user/timidity/Manifest
new file mode 100644
index 000000000000..0541f5c38438
--- /dev/null
+++ b/acct-user/timidity/Manifest
@@ -0,0 +1,2 @@
+EBUILD timidity-0.ebuild 313 BLAKE2B d3b6a42dd652ec2001ed91e4e57956a9683fed36da7ff094e0b0d8526f2632bcbea17de54c4b0b66b7e7233799c6057e73d8591303e7678efb3d47d92372d829 SHA512 7ffd1902fa991204654aa6a51fe5df8eac60c5890eb6ab52158431e94d8406410521ae85be91dddae332955a7d6a870c1e202ce5ea6a3bba2918415d3c0ec8fd
+MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/acct-user/timidity/metadata.xml b/acct-user/timidity/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/acct-user/timidity/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/timidity/timidity-0.ebuild b/acct-user/timidity/timidity-0.ebuild
new file mode 100644
index 000000000000..c4e6822876db
--- /dev/null
+++ b/acct-user/timidity/timidity-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/timidity++"
+
+ACCT_USER_GROUPS=( "nobody" )
+ACCT_USER_HOME="/var/lib/timidity"
+ACCT_USER_HOME_PERMS="0700"
+ACCT_USER_ID="306"
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 53ae130c2ef7..ec1ea15b839a 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 6c82e0563e0c..1dbf401990ee 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,6 +1,8 @@
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
 DIST at-spi2-core-2.40.1.tar.xz 197064 BLAKE2B dfa19413e6688678fcc0c0ed76d0fca0d5de5039c9b1e42dc10c9c387c0cbffb3c6a38570f9e74c343fa86310f2c3f6fcf0e311c57d11b5adeac5faf7bdf9630 SHA512 fcb73e78a85db9b982ae10d8c968c7732079832877fa0214c30a04b9e27910448c3f5456b8628ed4a3d4dbd59037c8c206916ad1462ca5c7a44409a702096b14
 DIST at-spi2-core-2.40.2.tar.xz 197476 BLAKE2B a3b6f1edb7beace2a54cc651f8bf5d002009a3d2791306f2b0a33c351c68d04e0a1003ab11f215333d498c50d17139b978e7f232df802f6c620bbe31997a8e1c SHA512 854fbba39064ba4b1d9728fc4943e811f0a9557f1096f32d7a6486bcb6c73379ab84c5fb8ce5288bf4dab1d1cd3e0664c492977450d4da503ce4b08abfc75fd9
+DIST at-spi2-core-2.40.3.tar.xz 197528 BLAKE2B bc248d57d51cea6ae6dd6c737d85f10599a9c177a3a59f95ffc8f96f74b7da057f75e2b961c281650795ba8d5387a9439b00a0f277731af3d490cc8f34c3ab1a SHA512 85adf3da0a369d7f3481646a495a9c4c3337da3ae6a20ce8c924f8621d3d6ed1d9461bfac0e821dfe86e4ad6b930e4fd65d24c26401cbea644ef4951e5dda5ce
 EBUILD at-spi2-core-2.40.1.ebuild 1384 BLAKE2B 228eb7444c10a142f85d16e78161dc73005ca47a5a37fbc8444812165cbcb0dd13f7da139c814f95ecb4f2a2a8195e8921e0c2788042e8f443c4a7e63567ea93 SHA512 fa0af448995e79332fa7c05e51fcd1306c2cafb2aca601d42f2f6dccac7bcb569140a7abb98a8c54c0a69bc1b82150427843ffef4aa5fb855063000e395575fe
 EBUILD at-spi2-core-2.40.2.ebuild 1460 BLAKE2B 956c62b7ed372f0a4c2aff7a8ee3e955d58c7aea2eff137780bbf5ffcc130da681dfb7949046dde9fd773d23689cc3eab130d93ae5b68fbf7419d05cc909de65 SHA512 b7b828807497f21544b072740bc51199039c7daae2de4e750010179bc0dd545cc26b26b99ce8e473a4d876afc18aeb9043e3e54b4f218a9b74eafbe87c0149c2
+EBUILD at-spi2-core-2.40.3.ebuild 1465 BLAKE2B e2632d36d893350a1e21586f8bf8ec30e777150b1f66665f91f05fe2bab96a4229d092645c6ecae6593380740acd43c66abef7378ff3241448d7c1f7de3bce84 SHA512 c619dc92fb6eebfb74fa637768dea2d89fc8d56d64686dd38b5046d80581b13bbb2b9432886ab57092a9445ba9b674c9f6a2c0f6c74aa8d0bc73ec5897ee3541
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.40.3.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.40.3.ebuild
new file mode 100644
index 000000000000..015d93ad1499
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.40.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson-multilib systemd virtualx xdg
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="X gtk-doc +introspection"
+REQUIRED_USE="gtk-doc? ( X )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
+	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
+		$(meson_native_use_bool gtk-doc docs)
+		-Dintrospection=$(multilib_native_usex introspection)
+		-Dx11=$(usex X)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/app-accessibility/espeak-ng/Manifest b/app-accessibility/espeak-ng/Manifest
index 46ef11b3e15c..0fbd57c9c542 100644
--- a/app-accessibility/espeak-ng/Manifest
+++ b/app-accessibility/espeak-ng/Manifest
@@ -1,4 +1,4 @@
 DIST espeak-ng-1.50.tar.gz 13665536 BLAKE2B c64c2a474374d4b6fe13bf3a99f5dfb661923c13ebd6c0bc323e7f26d9d90945c7075cc5c8f4b51e5db3303632c8c9daca7a65a1883e09d7c3faf63dd725ea3f SHA512 297dd80a6cdae3e2b8acf6823475220ce89d6a5fb68ea303156ad52cb3e7388049b6921759d4ed4e3d2e2ebd19bf931259e454f74a2ac0b7ecf4ce56c1d60c0c
-EBUILD espeak-ng-1.50.ebuild 1677 BLAKE2B 715736244fe38b41dcc89bc43c324fdc2298648c8e7e862f738b2a380786520862d28906cf38f53af38ad2066879527fb3386b7f373d09bd07a0c8e9a88cf009 SHA512 88c03f6c0e98e2c9fe5bccc99f2f8da2d7923b6ecc88147651180af58e58a53dfe42ecab14afc06b042fe62d1149cc4a30d452e340882b8bdb02a74156111e98
+EBUILD espeak-ng-1.50.ebuild 1684 BLAKE2B 745129b08144b2092d21129c4a89b39fc2a69dfb94781df4d4ae43c3f6cd31e6e3e3c72e4c975982d748694a94e78fcebf3dd124ea9860d152d4913f3d18cd01 SHA512 935d3f574dc485154051c58269c41d65bfea65c72b82a159035a9cb0326070ea7bd4c927a0f6fbf8317da8154f5bd1c574f4595d8540f1e36afd71cd2db8315c
 EBUILD espeak-ng-9999.ebuild 1643 BLAKE2B c37bf379661ac3fdaf2bc6078868de82d57620dcbb0ce101065f28e275c985dbf034481bb7544dbf6858e1bd283f077f4f6eac01a2dc97b3333a2ea78e315c21 SHA512 1dc4ec1cfb1b317cfe645ba7f30a09689d00bad68f367d74e4564626535f564493f890cf26efc1738b8df084fc68b94a3a31407ff3eade05c1f189fc836105c4
 MISC metadata.xml 958 BLAKE2B 53575e74a7bee6def4121686f918e22d1143be5004b75426ec24be70209b6521b39a64200210f002e6936845bd461d13cf4dac70b99998d1e7fb299ae30ec923 SHA512 189ad2db25f9cc75948c11d13fe7271eaf5e386253a72c8d831ee9b5a9fa277723828e07ccc95e0be432ad3544ed45030596ea5ec74eb4436d012c13a636eeff
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild
index 4382cc4984e5..095c9ff84703 100644
--- a/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3+ Turkowski unicode"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
 
 COMMON_DEPEND="
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index ea5b475385f6..ed9c2ab11975 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,7 +1,5 @@
 DIST kontrast-20.12.3.tar.xz 122468 BLAKE2B 4e29c034ba87781ffef03a37ecc7219eed488585bc47b0b3420950cdfe8fa92e9f4fd2a35dea76ac296318cb8c8be38fcf92061bca105fcfafa9dc9121afbabe SHA512 d6a4b60416f43bc1e9ba2539b13f33233c988417c7e8f05dd295d7e4946301943db9493123a07c48b0844c7aa55a22a3f1b898c3a00cccc6f6aae295d89d90c8
-DIST kontrast-21.04.2.tar.xz 123756 BLAKE2B db8c244dc793ea5bd3377cfacc16ac8a52118d317f97be90513476d99029b972adcad4964605f987e40efd697b300ebb777b0cf6ae1567ca5146e246256303ea SHA512 fb277eee121edd36fd05bfdd6b2758bc98b4026c56dc0c5523a47ca2ac958e34b37c785c5b63dbf1dd46a5e625fd33d130d66c72d5857769f71baa136c02dcdd
 DIST kontrast-21.04.3.tar.xz 123764 BLAKE2B 8788b3b0e479b39a2065be61ae2e4fdc34c393a12be6547b596be1dd60fce8d3c8a98b2d7bb8ac7626c75570c92b52cd13cbfec1c61470c09abba931e5c7d7ab SHA512 fc966e28e790d49e2c87d45c506a7cf5170115f6528821f8634ab2e767ba725b9c6934cdfec5a308c751ff1b83fc59bea31dc50a462a81d71f47652a8b974e2a
 EBUILD kontrast-20.12.3.ebuild 816 BLAKE2B c014e86a0d6d9f93398ff8ad565e09e698c6a7bee12d7abe9d3fc1c88986e5f74f029ee960b11b81b146aace044758ab4f3c75a1cefbe085670cd6bced016604 SHA512 d5431072659281f8c691b3d4fbe004d64d2cdd97fe7f7a7add7e9d3dccf01603c4b959ee351f2d773f201ae1c61512ac0cc696d7c2acad5d0d3e822acbf100c7
-EBUILD kontrast-21.04.2.ebuild 808 BLAKE2B 495bd0b2cc247bbf03c2738c3a276ecafd52b81780578060b445774c78adc2ce6599954426082f7cf1d9b7c4a1cf74f921052605a523fa73e88a0062877d4c2a SHA512 cd09249358eab250e7bc17078b7b6fafb4a26432bec06f355cdb7ea2dd08447ce1c7904944d412328682abafc1b6258ee65e561b68f9556f079111cb15399ffa
 EBUILD kontrast-21.04.3.ebuild 808 BLAKE2B 495bd0b2cc247bbf03c2738c3a276ecafd52b81780578060b445774c78adc2ce6599954426082f7cf1d9b7c4a1cf74f921052605a523fa73e88a0062877d4c2a SHA512 cd09249358eab250e7bc17078b7b6fafb4a26432bec06f355cdb7ea2dd08447ce1c7904944d412328682abafc1b6258ee65e561b68f9556f079111cb15399ffa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-accessibility/kontrast/kontrast-21.04.2.ebuild b/app-accessibility/kontrast/kontrast-21.04.2.ebuild
deleted file mode 100644
index 88b97cc55cc8..000000000000
--- a/app-accessibility/kontrast/kontrast-21.04.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_GEAR="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible"
-HOMEPAGE="https://apps.kde.org/kontrast/"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	kde-plasma/xdg-desktop-portal-kde
-"
diff --git a/app-accessibility/mbrola-voices/Manifest b/app-accessibility/mbrola-voices/Manifest
index 1ff98a2e498c..cbebafbd5328 100644
--- a/app-accessibility/mbrola-voices/Manifest
+++ b/app-accessibility/mbrola-voices/Manifest
@@ -1,3 +1,3 @@
 DIST mbrola-voices-0_pre20200331.tar.gz 583211254 BLAKE2B c8cb55597759a65f0e5f1be6197575b424ec4831444acfcb42fa17b8eb98672990195dd9305e93c66d488fb2b6c492286970e953c198c2038ea23c5b71d75ba2 SHA512 8476e80984279fddab1bda07e9352bee9f11499dc5b59652cd4bc0385b08a83259c080748e7040fa10cc03c9b0f1e1d1a39f80ddd782073c92f49fadc9af9585
-EBUILD mbrola-voices-0_pre20200331.ebuild 1472 BLAKE2B 35ed402c545422c7b7ee9b916e00b94afc5080075bc1ad2caf17059cf716a5cec2d208dcba57dbb8bbac3b65dc91aca7d436e454f498d023b06aace656b7497d SHA512 5a4987cc349c9914ce6f4457e533560c4d4bb0fcde7d4eb9ea6c908850872b0a91d39c1d18a06295d3e987194b0a9d003e10f2600ce5160ec29131d7096249e6
+EBUILD mbrola-voices-0_pre20200331.ebuild 1484 BLAKE2B dc79e8724b904c860782f80eac91fc7084744e0bbd4dbef35096572bdacbcaeacda90b15b5127dcc5578a29c0ff3996189060d89f50535e13f374d16267448f3 SHA512 d9c4ea322605c4bc79bc3002b346fa03851d014d3f6cbc752463c51e2fdaa8642acc69d0b05ff239c713c9ba0daa9c259dfe5cf34a5fcfd404329f11990e0938
 MISC metadata.xml 293 BLAKE2B fff126ea045039c9f75bfdb054633c15752126e9bc4756c3d7e010f3414a8c185614369fe9726f8050ca1b46ade846b3e1e4bd121d07a3b9b0f7c6577b6eb3f5 SHA512 fe6c1d06769062cc09e0feab51d001f00790e965e91e5cda28c0c0dc26238766b05026d37de211c65ee1ccc298cb97807bcd4480f2754d4d94cac011dbc627b7
diff --git a/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild b/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild
index c172f4b1001d..83c79b923259 100644
--- a/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild
+++ b/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/numediart/mbrola-voices/archive/${GIT_COMMIT}.tar.gz
 
 LICENSE="MBROLA-VOICES"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc"
 
 # This maps the l10n values to the appropriate voices
 declare -A voicemap
diff --git a/app-accessibility/mbrola/Manifest b/app-accessibility/mbrola/Manifest
index 34bc01c5d532..321ae89cde02 100644
--- a/app-accessibility/mbrola/Manifest
+++ b/app-accessibility/mbrola/Manifest
@@ -25,5 +25,5 @@ DIST us1-980512.zip 6562915 BLAKE2B 72d884f6f8a83a07786363be8cd919748334bae52637
 DIST us2-980812.zip 6387442 BLAKE2B 73502264a3900255f91edf5e3b92baff706205a72002faaed6b3a8eb0a7e0e32c21e14870cfa07a546c8bea6112b5433ca64b09b455070c49aaf2f059591025f SHA512 a8aea10bc08f6c66e863994a5238fc2caba1d308f5c9ef35ccd18d01eb92a38fcbc0b96593a56bd7abd2f714fe722aa6b3e2c3141da92a4c8c06e81efb843ac6
 DIST us3-990208.zip 6195800 BLAKE2B cf58531738ed412f75ff3c6d9788db8afd3468c10e5c07775b893516f399e3d14ef2bd5ebc5bb57ebb363d3c077924a496984f680e2ab9c45d05efc70642df19 SHA512 dbc6b0cdc3040ec3747f25a15dd17f35f0e97c40a153ae44e43a7e8030302e7e7c8710b10fe8184cc38f907de07a187ac0a7e3816be2230ce969aa014641d0ae
 EBUILD mbrola-3.0.1h-r6.ebuild 2652 BLAKE2B 7012ae6d8eee190816a5d59387fc177c5895b472a6d1dbaad9d5a2b270dd2bdffa69f28ebac3ac77323ce23653d58a0f3cf9d7ef59a689cdcdccb63c911663ea SHA512 90faedb6610c6a9b955f91f463297f7116a3696ee50bdf12728c9492c369eb42b5cc7b4a8b78fcb64c31b6449f03276069bb5fc9acdcb4fb6e57d3be2d9c0aa2
-EBUILD mbrola-3.3-r1.ebuild 649 BLAKE2B 06d5490c84d7094a9c637a53761b189070fd5daa47cf99ee8795e0fe4b66ef77da4b66a048f94bb266ee004cc90165f309c8ef9a29071fd6a811c0027e835c49 SHA512 2c957352f3acc84d7caa2ead50a3c00648f3e4d9cdbba1f677ca33b7c5058823fe3c98e22f9b4d46f3e4e11ae93b34d230ab3edfcbbeb3693cea0e2d7af504d9
+EBUILD mbrola-3.3-r1.ebuild 661 BLAKE2B 3c54de54f6ed36c575b53814e990b21d76660d59cead60273b4b0b33a04cec50ee6ddcb98d1ec33c6a2f9ebdadfeb83951e7f7019934a57c64bcaf23ef050fc1 SHA512 36575cb68332ff216d1b658c77009b2f54ea41f1c4ad1362274fdc0c8c8cd9d9d9c457e58bfc2e14d74b223baf756b007a5dcf26760b93c5da8e862c87cc92ed
 MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
diff --git a/app-accessibility/mbrola/mbrola-3.3-r1.ebuild b/app-accessibility/mbrola/mbrola-3.3-r1.ebuild
index b86978b89634..d82410b159a7 100644
--- a/app-accessibility/mbrola/mbrola-3.3-r1.ebuild
+++ b/app-accessibility/mbrola/mbrola-3.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/numediart/MBROLA/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc"
 
 RDEPEND="app-accessibility/mbrola-voices"
 
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 99bd91ebe903..174a25f5ecbf 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ananicy/Manifest b/app-admin/ananicy/Manifest
new file mode 100644
index 000000000000..89e2c7b5510f
--- /dev/null
+++ b/app-admin/ananicy/Manifest
@@ -0,0 +1,5 @@
+AUX ananicy-fix-sysctl-path.patch 433 BLAKE2B 4d6638820063feac22a79f132101d8db66a666d4bb63fd3529f05c6bf948af4062af6718919983937899cda0b4d0222896e6cf4ff61a7a594264a3149fe25ee2 SHA512 cfeaaa452c2a341cc309bd53851e9baf264311c13d67746a4f92f70e689b149cc685de18e865e8872fbe28107fda77d7ecdaa78e0647068fb76bd9946ecd6a66
+AUX ananicy.initd 323 BLAKE2B 772d684592df03e949cac1584c4b4dd0ab91fea078d775dde715bfc78f4e4643165fa5163b88c78e98a3bad1d40ef8fc573dd5441c354b9f3d99cae18aa9ffc0 SHA512 11f0dc63ca29236bfef785348f6017f1b59d57bd694d4eb2f0a910685e8c8892be19bc6a22a22ff63be387a4f02651de2d14da685b31ced972f4fde687e4dacc
+DIST ananicy-2.2.1.tar.gz 43197 BLAKE2B 5fc1fb201c50d7b93b62d089bf341c105b2e931349966e97b2becd0744f24ebd8900ea54e113bc3fc7a2648f4e088a2215b669861a311f2c92f30a8583ad95ad SHA512 858bbfbf196a2b8f512e4f09d8a0f176ef33fbbf610c8de437dc7889830a6f8a302c4d864faa8e28c71d4c1229c112e56b7fd84918d85786153228217aaec7ef
+EBUILD ananicy-2.2.1-r1.ebuild 777 BLAKE2B de374e9635ab3530e12dc993ddfa0aaf91f7641fbab0e8780c1cf9c5e153c8dd1e35338549c42c38d5296a11a73d057b01c219d1dd4d704997079b2d1e22cbdb SHA512 6a8e913b5b285fdfc47bdf1456609aa2c02fcb5d8b13d34dcd6f39be42667d7449440e45467ede8db0dde0c039ed49775498b464f6314668892a04bfa9a73b21
+MISC metadata.xml 555 BLAKE2B 4cb1aaf3528c0c3aabee2a5b53181b5bffd47aa3c4bb66a99ba7b7e85fa33b404c4c2d2051759268b26579a6a23573afe80d485218fe3c2c16efd31df8223b6b SHA512 cfd9974b7efd32da1e8ab8fb885d80219ebabf8f68e8fb74fba0b5dd02c19b24e279a8f15d86d9e4884fd29011808fa11d433e4e3e09b6e999bd5dd31649e03a
diff --git a/app-admin/ananicy/ananicy-2.2.1-r1.ebuild b/app-admin/ananicy/ananicy-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..d2188b3b440d
--- /dev/null
+++ b/app-admin/ananicy/ananicy-2.2.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit python-single-r1
+
+DESCRIPTION="ANother Auto NICe daemon"
+HOMEPAGE="https://github.com/Nefelim4ag/Ananicy"
+SRC_URI="https://github.com/Nefelim4ag/Ananicy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	sys-process/schedtool"
+BDEPEND="${PYTHON_DEPS}"
+
+DOCS=( README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-sysctl-path.patch"
+)
+
+src_compile() {
+	return
+}
+
+src_install() {
+	emake PREFIX="${D}" install
+
+	python_fix_shebang "${ED}"/usr/bin/ananicy
+	doinitd "${FILESDIR}"/ananicy.initd
+
+	einstalldocs
+}
diff --git a/app-admin/ananicy/files/ananicy-fix-sysctl-path.patch b/app-admin/ananicy/files/ananicy-fix-sysctl-path.patch
new file mode 100644
index 000000000000..1c44fe8c402e
--- /dev/null
+++ b/app-admin/ananicy/files/ananicy-fix-sysctl-path.patch
@@ -0,0 +1,14 @@
+--- a/ananicy.service
++++ b/ananicy.service
+@@ -4,9 +4,9 @@
+ 
+ [Service]
+ Type=notify
+-ExecStartPre=/sbin/sysctl -e kernel.sched_autogroup_enabled=0
++ExecStartPre=/usr/sbin/sysctl -e kernel.sched_autogroup_enabled=0
+ ExecStart=/usr/bin/ananicy start
+-ExecStopPost=/sbin/sysctl -e kernel.sched_autogroup_enabled=1
++ExecStopPost=/usr/sbin/sysctl -e kernel.sched_autogroup_enabled=1
+ Nice=19
+ SuccessExitStatus=143
+ OOMScoreAdjust=-999
diff --git a/app-admin/ananicy/files/ananicy.initd b/app-admin/ananicy/files/ananicy.initd
new file mode 100644
index 000000000000..e2c31dfb10b7
--- /dev/null
+++ b/app-admin/ananicy/files/ananicy.initd
@@ -0,0 +1,18 @@
+#!/usr/bin/openrc-run
+
+pidfile="/run/ananicy.pid"
+command="/usr/bin/ananicy"
+command_args="start"
+command_background=true
+
+start_pre() {
+	/usr/sbin/sysctl -e kernel.sched_autogroup_enabled=0
+}
+
+stop_post() {
+	/usr/sbin/sysctl -e kernel.sched_autogroup_enabled=1
+}
+
+stop() {
+	start-stop-daemon --stop --pidfile "$pidfile"
+}
diff --git a/app-admin/ananicy/metadata.xml b/app-admin/ananicy/metadata.xml
new file mode 100644
index 000000000000..1385d9ae3f88
--- /dev/null
+++ b/app-admin/ananicy/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/Nefelim4ag/Ananicy/issues</bugs-to>
+		<remote-id type="github">Nefelim4ag/Ananicy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 941ec99a6bd5..468f691df146 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -4,5 +4,5 @@ DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac8
 DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039 SHA512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724
 EBUILD apache-tools-2.4.46-r1.ebuild 2507 BLAKE2B fda19f030d70903240275e0885f52cd200e1d6c7a157da0a061fe77c78afff72fcbf295496f0cc002e3056c22e2519bfe0bc6868f0ddc5805e461ae609613f87 SHA512 603ccb716b54f27c804049ed71eb19c2ecc072115d9a9ee65b5ded7368e60fea4c845eec67e1ee653bad07a24e4a9af1833ce58dbf2dca83b8acdc7b1f54b7e5
 EBUILD apache-tools-2.4.47-r1.ebuild 2516 BLAKE2B a6694ce1f0971df73b64bb2a1058b479535ff1e1c364f9ed54b490a0f8ecc16f04ab598e24a0d659901e48d1d67ae3b910c6572d9ac3b223f091f5534a0122dc SHA512 09dcae7c3d6a5929dab3ebdc3730d30f748e52608b176f744ad6016cd81ca7dac25c514350069c20a259cf00a0ccdad0292592e19a38180f38a10c9e84028610
-EBUILD apache-tools-2.4.48-r1.ebuild 2510 BLAKE2B 82de57e9d4d59882269f12d5dd1de4271fbe1877e9574584d0c0369d47688d6472940ce739939d1eb09358eafaa3d44e27e2a0363c7d4a2a3cc07cff6aaa8d8e SHA512 ebcc85a1bfbd23e6bf8a8ad01497648def60cce4e45fe261782b84ce00d2e7eda85e3967a32a09a2a598899baa7870b9d27221d03f864c48a4a175b1e2602bcd
+EBUILD apache-tools-2.4.48-r1.ebuild 2509 BLAKE2B 60422b202ceae122dfc4a57e2f59a4ad713426e849a481eabb8b7da0e2b286be2da0c41e1f9fa346998b6de133464dbda5c9b553c83d0240e7a54e88742f8a33 SHA512 9836d90b893dbdb72f4de1b2a3a3c22137512f5b3cdcddebf0ba6cb8a1028122e999e2a89f060c569f7514b23021589cb3ba63110cad19c08b8e8f441a0280d7
 MISC metadata.xml 468 BLAKE2B 850e5a23a188280992a745276f7466b0287d4e1ca9dee8c61046612273bf7484c24e60d95ccc6637c65c88d851719bed812e2c1f3e951fdca1c7058c68aaa0db SHA512 d9b6eabeaba642f760ceca4b4b39b5db7bae5369c6766ce230c5cf0949e3152affa6ec5116ffa4ead983d987387c767600b8f36ebe1b8cf1323ed5c2cb14fab2
diff --git a/app-admin/apache-tools/apache-tools-2.4.48-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.48-r1.ebuild
index 9c515ffb38a5..c808fc3ae5cb 100644
--- a/app-admin/apache-tools/apache-tools-2.4.48-r1.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.48-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 2d045e6a76d4..66feb79c0f1f 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,16 +1,10 @@
 AUX awscli-1.19.47-py39.patch 2498 BLAKE2B 39f698d756422eecbb6a37bec572f00e184775b816f467d1b0275740b59678518db7ae44240476048c0f11d8d01403e8f9a03ad0f64414206fe77c15c4d695d0 SHA512 6a80d35495b63572e5e8ee6550a1c693d71adceaad79fba9d097668049a5c9d425b7eaaba008458cde8eb3e406e6e2850b6d43e6a610e9f28cb44278b231312a
 DIST awscli-1.19.104.tar.gz 2024567 BLAKE2B 82662ffe6a05dd329210ff84962e1ad37ece63a8f964c3c6bb293f53fea3af151bb088150260b3b279730871b7e962f2c580385b21a56a8bc2f86b437fab92d4 SHA512 444e533219e23b5151bab29d2d65deb8de9008b883b08ae553dd322b3f4e96d3836fedabc7be0393303ea146a0b8ad8220d4f4de458bca00303dc0798e543840
-DIST awscli-1.19.105.tar.gz 2024530 BLAKE2B 8d05c41aa76338f30edf8640923250fa3d3954e942243552338837ec163f987c583573269d94a63f47f48fbb0beab4c6265e9197b465563374e4afb45ae20843 SHA512 73207ca67d490df705022844e6d025d051a276698204fcf82171e0075f5db2c347de0634cffc48fbd210314d66fd79c61d4129003ddbd6db698adc710fbb2068
-DIST awscli-1.19.106.tar.gz 2025184 BLAKE2B ee1006df7feef7ca3dcae3625a5e318dd1d5ed70a3c0c30fffd431fa41713f1932d2750edd2fd251513eaa631f93c6c9d4ab2e0bb052f246b5b13e48c355646a SHA512 404b7d14622f1250f3cc5ea290dd796fb99aeb141101ca55bb672375d09fb4fccb67c2d926f0a3f7e5efc4c48022197a0de20e59590d4758e5fe0975c63f2bb5
-DIST awscli-1.19.107.tar.gz 2025880 BLAKE2B bbb307072a63a9722496aaae52c2f9fbc2743b8a4fdc2fffdb2b4e9b6be9013868a2130211ef9ab427bc2180ad1d19209fd6411d8cde26a5f02db7f3c643297b SHA512 69ebd9f3397230a7c49ef551258b38e8c66b370f70a8e050fa9c721dd5ebca3a9e0da70c2804417eba4e68bd7620fa2d2802d007369e5cd0bee49bfc512b7853
-DIST awscli-1.19.108.tar.gz 2026311 BLAKE2B 7404fb3010fa122bf210133667696df0e83c0c5d5adc717b75995cd95077f4ebcdd53375e687dce7d52eb1ef264110302f049897c18b7856be9d5e5a24f50ff3 SHA512 f061de7c7cc926f3fc5dc41a33068c8d575e1027f50099c148e80b5be55497508b44b11821e7f675e73bbcbfef12539e4d73afcd6a849d6ad7fc4f72b857b4d7
-DIST awscli-1.19.109.tar.gz 2026658 BLAKE2B 3ec642d44057795519e9e94ce73a6b26b42976018355f029ad7ec5fd6515497c725aad5872b3e061ff15cb7263823577bb3dfd1f43c3f1617ee996c982e722b0 SHA512 71c419359a12b159b06a7f769dbaaea8d5be0de4b71fb002bf3dd4c26810354038fc1057155235b26ad43b3af258e141c139cc84654e11650aa33d013381a192
-DIST awscli-1.19.97.tar.gz 2020143 BLAKE2B 2dac6f59a04a958b09e0f8b7d056583015762df78ed1349b55c6301d3189e1100bd8ab98445ded3ccc0ddbf1148ddf0475086704f123b0db1ccfd1cacb6b4680 SHA512 4e4e0f34ba02819232427f7571a4b10d22b167788d758c9ac43749607ea7a4c498259fcc5c69fb32d66faffc535a5b3045006168b64506f2b0f9fbbaa804e387
-EBUILD awscli-1.19.104.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.105.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.106.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.107.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.108.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.109.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.97.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
+DIST awscli-1.19.112.tar.gz 2028010 BLAKE2B c5f973a2a0cf002038cdc46d0760f5e5fad942b1383f21819459d51fd3e3a17617e23d45d284345fac1760a812ffc81842068e8517bb500559a330ea8183968e SHA512 4ad9e960826baa057a2e72ddc2afce1012b766b5f691236435347c3e4ce210ee0b14003c16615262ec707d0c65b7f7f71a15fcf80a0fdfefb21ab6a28cfb1d55
+DIST awscli-1.20.0.tar.gz 2028152 BLAKE2B d746335fc3414e773fbf3cb60b68ea1242162c7fb6f9e8222bec1bff992ec08e7239b9279de70551d05a99b2bd2743e8e2b8f65e01655574a542660fbb4a6ad7 SHA512 0aa478e9c28afa922958881f2f7795c6925e342964fb171176c81bce1fc4a0529dc9eb2fefaa05b670376781671e1531bbfe5114d0f0a748c964c5ace2c79ee4
+DIST awscli-1.20.1.tar.gz 2028927 BLAKE2B bd535f1eba64987c8389c8003b90a1361e95db00a62f13138b35d0f4b6a5130b2e52e38663f4560bf58fe6b86e668ee142a0228001d8cde583d096ce81612264 SHA512 b704ff3f482dd2ccfdf78d01ccff214c9cb9f7b12b1af0a7c615b9567a931a8bc47a444dd8f136a958346750a60fb03a084993a7deb0c234448a9889918c97e6
+EBUILD awscli-1.19.104.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
+EBUILD awscli-1.19.112.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.0.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.1.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.19.104.ebuild b/app-admin/awscli/awscli-1.19.104.ebuild
index ff429f8d3a3e..4221a0155f55 100644
--- a/app-admin/awscli/awscli-1.19.104.ebuild
+++ b/app-admin/awscli/awscli-1.19.104.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/aws-cli-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # botocore is x.(y+1).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.19.108.ebuild b/app-admin/awscli/awscli-1.19.108.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.108.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.109.ebuild b/app-admin/awscli/awscli-1.19.109.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.109.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.105.ebuild b/app-admin/awscli/awscli-1.19.112.ebuild
index ff429f8d3a3e..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.19.105.ebuild
+++ b/app-admin/awscli/awscli-1.19.112.ebuild
diff --git a/app-admin/awscli/awscli-1.19.97.ebuild b/app-admin/awscli/awscli-1.19.97.ebuild
deleted file mode 100644
index 4221a0155f55..000000000000
--- a/app-admin/awscli/awscli-1.19.97.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.106.ebuild b/app-admin/awscli/awscli-1.20.0.ebuild
index ff429f8d3a3e..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.19.106.ebuild
+++ b/app-admin/awscli/awscli-1.20.0.ebuild
diff --git a/app-admin/awscli/awscli-1.19.107.ebuild b/app-admin/awscli/awscli-1.20.1.ebuild
index ff429f8d3a3e..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.19.107.ebuild
+++ b/app-admin/awscli/awscli-1.20.1.ebuild
diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
index cd4e2fa99526..f46a7b53ba5b 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1,5 +1,5 @@
-DIST Bitwarden-1.26.4-amd64.deb 58223196 BLAKE2B 38726d9feb35f15130e81a479d74e5c80d344656d46dd9b9e82a7deab9d83b21b3d0a30dc2e8fc9a371b72f2dabe06234c955077fd16163f8e8ad551b49e98c6 SHA512 b0de7ed7b00b5308a2137b2632150bd288a7383a13295814c6c6af1a85f911a6790ad162f67af07844f8fca80044b95f58a37e6ab762429d061f3c9af3616e11
 DIST Bitwarden-1.26.5-amd64.deb 58215042 BLAKE2B 216e5042e925bc12a9feb1c038cacddc05b6c4aad8b76413ec50771cbfdab399c64e8388277d571708094e6b14b7d89b3c20ffd3d23d4010340b9d94068560cc SHA512 c2506a9f64d47138e6ce53bb7211e2562f9bb9847f4b48b059dd504eec312f6852571aaa550830f54488c0d67d02c0eb67bcac049a688098d1b8a55492b008f7
-EBUILD bitwarden-desktop-bin-1.26.4.ebuild 1542 BLAKE2B 11501d3da996b5cc3654875d7b63e4923d4c35e5a068ab06d90a3274a757d2a6a7fe9f450f2e15fe9d4f56aa2cda8b4eaa37071743ec7e05e4040e690d447a26 SHA512 c136b33d192e8cf381c9e52f6244fd8673f0ea9fb2040c1147b478baa548fb6fd92fd2203c40a9b987407c3fe9730b0e0a5b04737d2d1597a989bcec8c3cde50
+DIST Bitwarden-1.27.1-amd64.deb 58099834 BLAKE2B 285d737cd38c60966778657537efa1d5e53edd46fbf25721631d6d8b50b097093ee5ba41a475c3c9aec6ddbffae48cadb0d8a994c9f6ec88cf005af1bf5c1cdc SHA512 92a6a5d3d64a17ddf2b742d9328adf27566da466c9c4d22fff910eb9dabeda77f65fad07424e6abc8c4cace04c365ada84588d05270a5cf615eda36a5741e81c
 EBUILD bitwarden-desktop-bin-1.26.5.ebuild 1542 BLAKE2B 11501d3da996b5cc3654875d7b63e4923d4c35e5a068ab06d90a3274a757d2a6a7fe9f450f2e15fe9d4f56aa2cda8b4eaa37071743ec7e05e4040e690d447a26 SHA512 c136b33d192e8cf381c9e52f6244fd8673f0ea9fb2040c1147b478baa548fb6fd92fd2203c40a9b987407c3fe9730b0e0a5b04737d2d1597a989bcec8c3cde50
+EBUILD bitwarden-desktop-bin-1.27.1.ebuild 1542 BLAKE2B 11501d3da996b5cc3654875d7b63e4923d4c35e5a068ab06d90a3274a757d2a6a7fe9f450f2e15fe9d4f56aa2cda8b4eaa37071743ec7e05e4040e690d447a26 SHA512 c136b33d192e8cf381c9e52f6244fd8673f0ea9fb2040c1147b478baa548fb6fd92fd2203c40a9b987407c3fe9730b0e0a5b04737d2d1597a989bcec8c3cde50
 MISC metadata.xml 303 BLAKE2B d92d9a59d759d67d5c87577ad1b8255f016f1228044100ba18d6ec73a7ca054ca0403399d677f2470a782721e7179d693860eb2c52a35cace59e58348d38df93 SHA512 81073a2078b481982c3beffcb76a84e19521e4bc6255095848e5479fc13c5a60b8a0d861156b02ff26c80529111dade666758e22a341ba8a31f9a89304a215c1
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.26.4.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.27.1.ebuild
index 1adffd714ed2..1adffd714ed2 100644
--- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.26.4.ebuild
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.27.1.ebuild
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 92bd042f5421..bafebe76eca5 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -6,21 +6,14 @@ AUX consul.service 359 BLAKE2B 04a42a1546d2e4dbf57b9d75b32feddd4d0f4f8b6f750b1b4
 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip 2508208 BLAKE2B d17c22f3d8e3f0b52bab350e86c8fe29ea474e104ba89e3238e71dbd29139717a0d26586589f47303da4eb743fe86a76f727b772707584aba5bf76d8f5ef1969 SHA512 6dc6f4229011d8606e1eb3c046640f6938dae2e12a1b0a9e2a22b7d26b4ab50051cee09d17fc05298ef5d4901a6b7e12d4b06b8b8eac6b1e71442653eb25b541
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595
-DIST consul-1.7.11.tar.gz 22803471 BLAKE2B 05f839d4ca025600d56833534872dc2207b561c0b44643d788baa791b02137cbd7146223145d53697fa20e5ff707a3cfcc01fed993b7d6558b82579919667e6b SHA512 82dab9baef3ff48dd83dd0fd3e7d5d989af8bdd142cf4e169e6de7610bd51d00cce5e76b60e6e6827ec606c2d6d2c1d46ac0502d493b13dd7fc4d42441fc1c79
-DIST consul-1.7.14.tar.gz 22795760 BLAKE2B dc99fc3597b4d48d3328097bf79df5e0783459278c443a1c557caec89287b16fd09769a943c5b0364b094c42e646aa66284d2ea6d833501268e926eead46cdb1 SHA512 641f0df322ee337614cf9cf3e6cf6a038923e068651ed1073b6097e5c4650378382fe2deac157e2f1e2762fbe30f0a8f6fc198504676ac2c06ad3bc5aadf156b
-DIST consul-1.8.12.tar.gz 28501714 BLAKE2B 3a04ad2000debf34c53d66869a7654024a8bd164ce45971c5785cef012cf30cfbf16a7075eb5601642eccecc107589323edb3d106841515e630d670a4bcde26d SHA512 0e34adbb88f26e1c26cddc7ba938284fd0954e9f79ecfc85edb3fbbeb796006529d09476beea6c1e3d2f373f47a68b9a8e6c1a31161829413d9729f3b29e1a03
-DIST consul-1.9.6.tar.gz 29345700 BLAKE2B 2a2f1ff8fb4c8d9381a89146e3c66534e6c2182c0a6da423103773376bfa35b28bca0e9257795a11fa4e26aa38417c4603de1ab3841ca2ee0c57b7d97f15d0b4 SHA512 a4e87899b048dca3898b22e171a0011656f6c1e54b8c1a5aa732b658ec3495b4f8ae78921ce138498cda066a302bd782c8854f092aa31c832ad0c921214990fc
-DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
-DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip 16060635 BLAKE2B 6c358031305d8c8245b52bc58ed08cea5cb07c3e80cb3043f369ac6faf893a95d66c31fec38f07fe9029f53239c509bc060cfdebda8ac8d5ae556dfa0d6851e3 SHA512 bfd8f9859e519d6e45f2324e3907f88a1e661ca597f8bb3b7ae772246ba9972e09d0883abc887346fed55928f5d8422cf4212e32377e9900137cd63f0f9a93b8
+DIST consul-1.10.1.tar.gz 29598444 BLAKE2B 4761865882641c1a31e343a210916755dac0ff4ce319a61e6108c621181bc15ff52b9b18f59d9af27ee3eede1dfeb3a338930781955fbacb76c7df0ffe6cc188 SHA512 c3d03ad65f15d648bf88472f1f90c6e5f57846bc5fd58194f212a57a29c7122354749a7a5ec70dd644d455c0bbc3e49c42709fa5c0b82d05d5b384f6d0304219
+DIST consul-1.8.14.tar.gz 28544486 BLAKE2B 3262131e1f030423472473497a278f35cf26c78fa63f8a2df12cdf7941b7031f2d7cd9c5b4028be86ed4f266a730ebfd9962925baf2f467abad1a9c6d9b898bd SHA512 0cfde7dbf31e833a9ffea869bda8d4c533075a400f8dcf407de97807632d7170f47f5c4c96a0e7156a0e3ff3937bf72a6e737ba1022f0e1556f4601a807f2d2e
+DIST consul-1.9.8.tar.gz 29403682 BLAKE2B d435fc0f117de0b1a4a035dcd2f582a785319bf18f6775cbc817507459e5825ee8544893e46f650fc17375c585d91e5e9ed021ebe92a063a832f9ed6ab2c3dfa SHA512 9c726bbdcfc66fd1bc0c41dd3f74ba1b1e7048ab70e89517da8c0fe09ff0d9195190f0c4836e0d09807b9ee2ce020f6eed24d4f620ac60ded941f470fbb1f868
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip 34780090 BLAKE2B 7a465854f74837c79c1b2166116d89b2156645f9ae80b13f0cd860eafddd17caf1a34f7876f54c5ede094fe808eb39f4a1bec54e02efc53fd0bd897c80bde21f SHA512 88a7e1ba6ac2bd373d82f0a6381565c24014b0cd339efcd815ce93dc9f223354f561cbe7bd021fd5635599331a23b7e9ca084754325c68edeecd6f5e1cc47227
-DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
-DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.zip 182451 BLAKE2B 2a85fa5cb2fe3aad0a86717c8d22401d66f618fcb96126116da93a3a44b8aa930142351fef5c27deea410eab0cac1f273bd562165e58d2e40eb28f798df25866 SHA512 1b3d019f82da165adbc05eff04be5f44a8804361edfd156b43c2349790bce8826e8009ebede11fd8670c23ade514bfe9ef4ce66d26a505249fca8149ccd2bcc8
-DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.7.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod 315 BLAKE2B 649b180d4b41279bde5a3ad4e7a8380b3e23d9428af2b2904612abfce99e5abf53ab7fa27ac7805faff0be8c2d52d685c7edc1380b909ad2c033beaae87be7f3 SHA512 eca3516d2491afa621522aae14e0e5c8632b984d8c6daff3a69df9b2b46416eeacdbd11de8cbc2247fb1119051466d24a4c178b065b630a684be8476be1ef15c
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip 106412 BLAKE2B bf3d221898e0a13c2cb46fd95a1c8ca4c3983bb95f4a4b9eef327ca783a33c97cf4f31edc275012112ab30324d4ae8f2fdca75d2df59abaad9efe2f9638e4a70 SHA512 8dfebef6d6eb01b0d0fce523180faf49369b213f7ef6e6f2f19ab744a4e0e6cc6c4fb5394e9ac425419efc7bff429a13f1e1d3dc374ccdf0b4df485b1ca07fae
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
@@ -50,9 +43,7 @@ DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip 9362 BLAKE2B a
 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!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
-DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip 27548 BLAKE2B ef103ac58733cbf5daa09f5c67cfa3e9256c96b884b63cc039cd644da9f039d78a5047b6473a43bf88c421b3e6a7d8faf5b8b845adb99fdfd7c8558a7b67336f SHA512 689c6ae1c9872dff6f065f1123b8027e77006080a3596359495c6466c6254e85250882e6086b8f9e526ab94c25509c0cc22350c9cc0778a3214eb746474cb0a7
 DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
 DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip 34337 BLAKE2B 7caec3639ca080f2da9fe83a9d7d68d7038d5f926bace22c149a52b0c1b09e97a9c37c1c408a77add3391412249f74687ccb8237376122ae307e899df1e09e04 SHA512 f16a6a25abaef19382e50de8c791947ef9d65ed69c275bb20b38aa72c03e6b161b5db1974908c223cb62d393eeda0d9317f6ca9ab1db2fc5f7db5e967e3d730d
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod 37 BLAKE2B 21cbcf43ce9e4dc3485c260f4b20ae34fa1aa41676ccdc1f4bd28fdbd9402db8c1f77d4c644e5044a0f2cc44e06a6109791f6d6cc4620b32e1d2c36426df65a5 SHA512 752909cad98e7eafe9ff00951c27d955242d3d76c99c3e52427987f1c81720af76ad1da5e4d67e31bc192822b7de299edeb2077b248c0f070b6adfde4e9b8ec2
@@ -77,25 +68,22 @@ DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip 3902 BLAKE2B 8662340cd5095c6ccf535a54e79af09fe46640ba0b119b44a29052ad012519d9b5886bd4ea81f4946d0c4573f63538b450ee864a48d8c04e1c9e7358c2588e8a SHA512 c73ff22440aa8f5825b7e6820c270582d5512cc096e69b6ee034ed67ec3eb87b3266b82eacf37b985e872a693256be6f377814d3cc604180ea939b42971ebe80
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
-DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 37264 BLAKE2B 13a34ae8ce6866da183bb7f9f5dcdb702ffe846a3c5e789e99f6e112a1e64b1dbbe8777727e5678b4bdcac75ec32ddc52ff303b95b5ee3fd22423eaab44809c2 SHA512 e1b8ad2c09c16599c6e5053f871df9f66698c7a632276c1e68c80c9737216751939b7b7024449ed63da0a292688b4d7a441d64512aa4bd8684e418f4e5da4446
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod 582 BLAKE2B 92aab40d86d733eb8f751fb23e40621b5b3bbfbd8b1d194bc6e689b6df763b4030aa83ab78654dc8e536274af6de247b8fc7e4e35e6cbf2f6fb5532291deec6b SHA512 aa43d2e262a603661ac3dc7aef111aea6e348e11c5384840d2be06224a6c2c580fcc0e3c6645a0d48b48826b0aff92562f0c6504eae980ff5610d2ffd2255d88
-DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip 41353 BLAKE2B 850ec7d356246c8b47c8594aaba8db95d979ca7fb50b383ec02c6802faf089bb170ea7e86f7e1fe8f95fbed4208c6f39c307871d74b8052de5ccd9d6ae29d49e SHA512 b533a51ecc7709cb74da88cd3dea70b3605e75a88b93d16aca5aafa100352002f5b1c1c6d9c33d6c93ce74663d27b7cf82c8fa8db7aadca4d42e8a7f6354f78e
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod 753 BLAKE2B 5d81e99f1c39cafd4dd39f7202f71ea5fa3eba3f1c970e9c51e674e9aba8ce527034679105ed92843c7c69caec3770ef6fad38cc172df670f1643270300fb821 SHA512 8a04b0f60d9393afdc4b106413a1022e213509cadc222d592b8a98cc06188eda9ab8b7fdc346e8e70e15f40294ed41fe5510205d64ff40c427a6fbbcbd16f530
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip 44812 BLAKE2B ba556ac48b565838fd1686825e0bf8417d0473cdd1d0c9f28ce88cbda83b9e61bdfc9cc8b86351d0ad1d57b2aeb978800200bb023d9cd1bdbd013237e1813d92 SHA512 6a71cedd6356d9e17ffa7af4e005a7d17f1c004b6b68f487ac75b13668d22f18c06ea0c0e4c9b62d5d60b27054a3afa0e73d4adbab6ad46ede4b4387500c27d4
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.zip 47374 BLAKE2B 021e1956ed377ee200d28aa4a6b9559fd81654ee039fde644059ec4c10a43554fa091689788e8fc773c438f60a7c3036f47b7416c8d967152cbfe29ac89ab465 SHA512 08520d539031a646219d6e84139ad9f8398ebb443182a95cf4d48cc2ec6be24abc63ba8d18ae129851e5ffa5ee5988be1a8ae67658c9327cbd2c0e65a7d25c13
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.8.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.8.zip 48412 BLAKE2B 42781f44c038abe5faf52ada36c71ee0e03aeb202ec5cc412348c2ca2c542e31a87b6f25f55c9c6695b55f3ea0f106126b7118d3171d2ad22878e0caabc44d70 SHA512 e64d273ffb4a36e510eb9642ea043c18dac1511a59836a66667cec06996c0ea75903ac7273e479ceb9ecfc51c3a61f6b225387c128ded08bbb89e0f0650391c3
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
-DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip 7271 BLAKE2B 4590233953ed1577a41ef4425403585d5cf9d0bf770bc00d38de4601015911eb56f695145beb53739ba7a64ae0113686fae54842a61504005f5f1a519e98ff53 SHA512 6936a577297949e1a146e3efdbe88e9c81205ccac46974f092846bcfbd533a2c8f0f161bc74da60d7a0d8aa6c5d2b1591fa294320c3e97854626407f0f838423
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip 13988218 BLAKE2B af9b087b7c9fdf75ef92dadbfa49ad427238a49426bb50269cf3ffc72dbb15e5bfd9975308b0260bc507bebedf683ba78428d33e03780fd2895224b929e680f6 SHA512 a019196698556d6877dda5757f8bd062d2f4320b0e81c7a4fb92140e85623d95ff7d52fa42ecc88a762db53d29068d63e654ac3affb0efbcc0d49a1800711955
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
-DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
-DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip 14678 BLAKE2B 3f95d78aa356a314f8da501f8085a880201766e184abb6c222c45e09c0c3b5e1e1eb7b89cc8ed46b77b09be8860fdf3e28525d9a451964ad64a96c6ee848a41d SHA512 be60a4c8059a9cb07ceb12e079b1224b6f871ecb1d7953906ab303cfe86d00cb979e203299f00fe828b2f6d2a3f5d55814c50809e9b872ab6d96db73f3771498
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
@@ -108,6 +96,9 @@ DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae25
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
+DIST github.com%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%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod 51 BLAKE2B 3d0af1f8d7979de88067539579b73ce3d5d81a477ff042831692c738e9b4c99de13a3beb20fde003df06145e26d472621a2ff2857fd584aa1527df3730fc5efd SHA512 d1c83d2dbd4e242bfa9d8b9b58cddbd4a1ad112d1f5d1ca757fc31c6a31bf460d08cc3c9bf14c977fa74d2099ec83d5e45c05fd6121f800e26da6a837d862ccd
 DIST github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip 148431 BLAKE2B dc5c356b179df55561c4b673f7c9b4e7eac70388410f3ead0c3a23165450d12154cdcf44eae51550e8e5f0dcfa92fa4df0439a320feabf8b00a6aa6afc134401 SHA512 51705b4747969ed96b7233c2c0159e8a81c6be1bd35b68e3058fcd9440185df30105293d9b936388aabf9bfefe9670cd930c608ad4058e0285f9b7d2d86352a4
 DIST github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod 47 BLAKE2B ef512f7530c4c3fc3319129afa2fdb655d40af9aca697d22e4470528cc41ef9dd5ffea2258792d0efc7e1e5de2de2fe760651df84c3d39989c4d96b58e85371c SHA512 027b177fb04d5bcfaa0e524e6682b639bd91f7aad9ba14e22cc1b4f352e2c3bcd4d93348ed013cd839eccdb01449db40170243e7895c2cfa3f6980279faf39e3
@@ -137,7 +128,6 @@ DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B a
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
 DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
 DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod 36 BLAKE2B b2d14ed2b18ba9e3045a221d8fcae5b3bec5ce4dc1b8c919abedfaeaefff1acfa4092c2d5f7608947b87a017eb2c669c3844fdc0fff530578865a5cbcc98a6e2 SHA512 141b803e807cdeb49160790c358603a86e140ae05226d26149232da13a3c8f05e3c6391a13a442f0eaa02a4e95c7e5785e49dcff7f635a26e667456c77cedfa0
-DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.zip 78188 BLAKE2B 8ddb94e03aa6c071f319bf1b219e80456f0849d028aff4e78c97e122bdfe3a7e7a7eba236f046ab6b870daff65f4cc6a27185f293760865c1be97585bbce0c18 SHA512 1f6e893dcc1b972eedcf031b316e91983af2965d9720a663eda94d164dcc988f1efa5108aafad25c0afe158dabd397044c03ad16aaa822b4511a5b0fe586e51d
 DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod 36 BLAKE2B b2d14ed2b18ba9e3045a221d8fcae5b3bec5ce4dc1b8c919abedfaeaefff1acfa4092c2d5f7608947b87a017eb2c669c3844fdc0fff530578865a5cbcc98a6e2 SHA512 141b803e807cdeb49160790c358603a86e140ae05226d26149232da13a3c8f05e3c6391a13a442f0eaa02a4e95c7e5785e49dcff7f635a26e667456c77cedfa0
 DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip 98598 BLAKE2B 01f2a30dd9c4e73f1ccf0e14b10f35edef2a75c3c3309f1b02ac529cc5acf4398b9106c78564bb8e812df837b60c4b81e0b83145c0384020d74d9aa739ad8353 SHA512 ca2ea2c6d10e25142ae0878e84feb2856c549d7c17cbdd4e629b2e615ac03e24d53aac38a4367294a33109d5cafa0e6b2b615dcdfcb97627ebebaaca120d9f41
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
@@ -159,7 +149,6 @@ DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip 194391 BLAKE2B 78828261a7d5bee8399f689ed8de5a90e1a74e54a935d166078a477c79aaacb04663382c8531663a5ec8b3d225bd9e11e3ee4f3eb9fc94b2714fd6c8d34e9a25 SHA512 6091a63fbfe97f1b9bc5a9524e1065666ce653ae85b9dc7999f322f08dd48fe1959be515d2daed0dcacc3a83b80505dad5cf5a9d190cf8136a7a663a460806a0
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
 DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod 32 BLAKE2B a73ae1e577fbb84fd72de422c367c1003355c117a9660cadbb5d6d52fcd0c102fa3b22c7c7dfb6e149dc14ddcb9b5fef847fb2a7b9379a35405c7bd9d83ff1b5 SHA512 2ef8ab60b4320b9358614a28a02b4207f3986c4a06798c3e253a79bfb63692dfb1765476e9d154e15f9d5e30983609c98b6ee39ae910c678a3773fddca208cee
@@ -168,16 +157,12 @@ DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip 49672 BLAKE2B 79227374
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.mod 121 BLAKE2B 3b2b42800cf70cdfcc5a34ccde0b38f8bb16756e47fd83215563e653667a993416007880ac26a9f41f1f18318d9803b9ee90eaa98b2d4de16edcb7b74eb54760 SHA512 1a666d5599c4bbdfc3c174047e187af75d1a3e66e344ae76d714b387c39dda9632bb6c7ea1ead5a830a2aea1c5a5e2d051d552535cc7e0bc3dbf71383a1c4e5b
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.zip 49890 BLAKE2B 738ff71723727e7950bd225a765e5f6ff47eaea5942d2e437b015103f1a06405f6c050b6a7222c2b6ab41506adf6b6768c4c2e7345a9503bbd7d737bb355b2e4 SHA512 c4331256ead0f5ef5684e155cdcd053cacd01123bb049edcf2c1a6692ad3c2c3653da6420d0e625b96ffaad0e429980590778370075d4857fee5c7b60e33d2d3
 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%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
-DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
 DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod 48 BLAKE2B dc30053a3f292ba19e5dcf7d7f287a15a970703b98bc83525dad946a8719b42e5a12575baa4206ed4237a202f1c4d57874813badff88aa80723d743a61c5e86f SHA512 e129ba3d01fa1a966c010ec4b453dccdb191dd7f8cf4f8295294e0a69f1a03d9d8cbc738d3fd3347a28beaccb205e443a40786866953f1c4dd761ebd2c889bbc
 DIST github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod 33 BLAKE2B f3047b593a38c87128a1304a48b8bdcaf8d5c06d275460f5e0908eb499259b2228754404015935d871f529697b1153c3a86a151cab4fa7aded7d109b4c40f48c SHA512 ea09ddecc4d78f7e9e0407c02de1e3754c68f5efcefa2ea075086f26c203c6cb9551a4d4fd0241b86b14000dd9501bac8e3d9857a98b56445c371a882caeaf28
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
-DIST github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod 31 BLAKE2B ad0f7f1eefdcb8962e8a70fc9d27b8c4618a2374e588db1afa039cdaa34b0b612b7249adba1cf61147e46da5dbad1edcab05085d503c7babe31745de553c7f39 SHA512 42b1f72e0d2eade3b2ff4d6689be08a404e8ee9e565f2f9e141d20e11d2f6865052fa5b829712647662204f496cad00a57fade2003c321b76929773a2777e4ab
-DIST github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip 55812 BLAKE2B 404048ef7688e941201d56f92e82c122e33b680bb31b35dcb0ebfafe45ae2fb27d1392198a0b6006cf6769fee17857ad87d8662da0fcc5dbc5d52ae253c1a5c3 SHA512 3aa4ffedc9412d199b82e68581e1cd357b23e1b89531ba3014c341e5c446a230c21baab253fdb7aaf6e4a1cd5d7c489cfc30d8697ec6f650a0743b6b0e038bc7
 DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod 91 BLAKE2B 4aa00d10dbc5cf003c458093f8a81e56c440ddfb3e060c40cebcbeea3f04b152c19a6c879460a164e07e7df2b9a6ed86e16cef70ca34396e8fcf384907d5c606 SHA512 7ef69b0fa12691253fc58e94d67162abb06b86a762aaec858611cd1885bab3b60f14ccdf9cf75eefd24c0018aded83408461d7d709580fc89c123ee5a2e64614
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
@@ -195,9 +180,7 @@ DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod
 DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod 31 BLAKE2B 5b9a7c710473f58b57d11fb76ec3ea044f5c7bcf2532298a7bd687897e4731416f423c051c601e7012426958060519f664e9c481ac5a791b0b1603e83b406bcd SHA512 2dc02a7038b6c4e9f172e5787e70de1dcf44d1abe19fba03c586d7051f723e78bef3067f25d1bd47ca591b4f252fd76febf8494af610d8a2bdec57c306dfb496
 DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip 9917 BLAKE2B 05fc1ba323b28f45cfe34bb3c03eb7537696adbadf99a4a2ef8d192e2e84b4c96333a094712e6bb0da46db605a80841648ee24f91f248911a8fdf92710b57008 SHA512 3a198965e71ec55a5c78c126a23af7bdafaf8a493666a1ff89e9a8aaeb2addfe8c8a7ff1362f0a940483525f96e31bf72c92780e0cda1db55650323989fb11a4
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip 2461758 BLAKE2B e02c6e6512de9be1410923a6b3eec36a087f8de00e1d1e715a61e6f26a18352db169b1dbec49e3d563e294d8c65c51ca5b55361dff70d1e9e20976e46209209e SHA512 7f9d1d2671c82a1df5f79a154340dd1fa1e92952feb03a1ddaedb1f6cea371bde8d6f7c774a4351aa87abc2646f97891d0beb4d175fe9d51e2f761d37f2699ec
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip 2656615 BLAKE2B 08542db845ecffd88d279cd63919a705d566084bb556aa4a6c98164a11520ec6476841128134f8fac2e5132d5fb298c9ef6670074891e91ca90577a8535049ff SHA512 2e51e876c4533c4b34f0017f6f13ff3c34922a1905f6a4f90bab241152dbb344689d8d1f5ff1040c79632feb21fbd8f213831179bd424579ac9b5bb602325bac
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip 2737734 BLAKE2B 6d5345f7334008fd717d25d3a3d8f18b77408de943a1deb60ec3fc488ead17a2d41fb2f91ee174195b87f01446fcb61106fa2798acbfd2c477863e7a1740a71f SHA512 b86f02e94eccf0d66190b6ce8025774e2c9d181d4308a4725c2dcd3e7234e71965250826c6ef604665922a2986c3c7e54309b22004fddafe8ebbabe33baafbe1
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
@@ -205,13 +188,10 @@ DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip 73573 BLAKE2B f0f57b09b2a880cabccb2b6d33ccac1ec2d36e6ecee84c2f7b487bcceaf1a1accf9b19996a31118498401af9904f3d8dd8126d6428a0c1f7f2ece4416562c2f8 SHA512 761035674673e77c79d8cf72c29bf297429f58a03e92dc37988f769d650b8ad21bf7785404f236c2f9a9a761987c6c35771758393ef723d8ac2acee811cedce8
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6 SHA512 d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 461624 BLAKE2B 37b2bbde9cd1153fe5811ae008983179820ce40fd6816155fc7b7d040e29b8725509f68c30b5099b686e9a6ff31a2d029188aa526ada6375fb9c7a236b8a7d1a SHA512 a99c2150515bc3deef1d7887644497fc4aaa96ed6c2aaeae91aabfaee6668c144b34a2c75ca829636c7e88d59b297601867b0f188ac048de452b5e0767480608
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090
@@ -219,31 +199,26 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip 458317 BLAKE2B df49024ad50
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
-DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip 17980 BLAKE2B b0947bc6a71032e97255b113d70760d85eb09f72e8733a9d660b5b45b7eb3e2bf67b00b57c674a3b6c1a90388e7e80569ac8d36ff5aff7d50af9f7c28f22c3aa SHA512 d30c86fa4d25a5f542ef349e0ae2fd4579de5c3c1bb69ea3cd1bf20978a772ab9934ca68e01b9e5db2e5d8d6d7cfa96a4547ae7330e97c03670ae1dc8585bbd2
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 74164 BLAKE2B 6a3c04c2986b35dcc32f14553534758c3270c294a5e2595487f884e32e76cac2ebbc34cf7e42232eb7d85e71fee7660b513de4e365981e625515b086c341d15c SHA512 7be2dd2b362f56ad7fb7be35b62a841ca051d4fe31ffe1ca784e393b0cfe44674a050cf1129a15094872bc16c8ed9bc62afe0e7017bcaf1a4eb9b2e39423f790
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
-DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip 9257 BLAKE2B 4082e7b230ac5242c79ba7e1c2ed5d51e76b5cfab0e0b366aac04daeb99d77ce6d2e78fc9ba5d6b7b470cad128bba917a914b6a11ed532559d108e8a0aed3cf1 SHA512 05954f59ae284c142a0526af3b155e78f3b9728fc016e9fb7a8294214139a6268fa8012a8be993f5ce4854022e15eb5d58ba1b1c7811305d575fb69878149ff2
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372
-DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372
-DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip 16817 BLAKE2B a3592faa6456fa855094ab193d3d09d8729d8e9dc9c1dfee62698bfe1e20306860009106626e356a0582e5a8f29dad2dbe454b1d13fda38b9ad6f0f1489b8f44 SHA512 669d022eade451baf0504b024b88024571ece521d223a908b2369e1de0a6b71199789b909961838f4eb2aba4508f6cb983511d01c33e157828f44ccee2b1602c
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip 16584 BLAKE2B 91b7f51050c2ee0261447144d1f86c7952cdd5f3096d72040b069dd2737c008084bb456b57400d3fa5cd26ce3bb34265c0cfcee94c4dace3468ef13b62d73c74 SHA512 6e265617828739486750cb8c5a8337f3e17f83664821208778528d93e608bd142902aaefcd64d4e6fb8542e5b0938b12191ea070fb5deefbff946daa146e9278
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip 22166 BLAKE2B 32c6a771070fe4da18b8cffb964f6d983244c79e33f50fe0b2cfe47eab04a6bfa8cff977fe7c200b73af264ef347bc24aebd1f88c8a22d3a30b0aa9e0b5497be SHA512 883f2d065ef1834580284954c9df239f3db3b40de7fc925baf563be9d4da4f0d873e156814b3eb99b6a1fad7cd3257a574f271679f783301595a12bec5b62175
 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-20210601050228-01bbb1931b22.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.zip 1853652 BLAKE2B 0858cbd2473f203cf4a6127696ee1d04fb9367ccf89b7ad1e8a0a3bd17594a328dfab53b33204b9f319ab52a16c23415e8bb898c746adcefb7c395d90a3d95f0 SHA512 bd28eff954ee08d8e74432357dd33cfd6eb5f46dc75816ecec3a594a32e2196081ee90f828b6b6d0dfb66b30f8f907f58ca638bc5a70a6f01cb34e8d51301be4
 DIST github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod 34 BLAKE2B 2ccba8347a642af8518a868d34286011a61a2f540151a9ee37cb20a821041af46d787f1e59e55f428a380d8a27d0beee4494ee7a514a7f90dab18d06f67b8ea8 SHA512 5cc997fe8abd3a4ebaea6f2a023f3b9aa7d31de3f57d1b2693efbef17a93b5a9937403c4c7ac06b78951f04d517ad59e41b171b3fefe0330db88a705d74e94c1
 DIST github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip 39658 BLAKE2B 16dd91d050b8e32594fc01e02ed1cfb23e4b33e922af6c94ba17ac18d419337217cb231b864eb5bd5cd0a6d9a19e73f8c5405cf283cb111cb9dfaa4a84f7ab1b SHA512 f74c5dbacf2e1c5899b66c9ce1aa0298be7e36a04e493cbb8ef65254013c6f00caddf203c20638a9ff229637144e26b892ea16bd546c8eff0bd2f101d3d9f4b1
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
@@ -253,15 +228,10 @@ DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4
 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.2.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip 596836 BLAKE2B 09db31490155fba99fa74f0aa3198dc94c113a3c8478fb366426b61922d74eecda5648fbe5172a315d450238f8f3b92873eaddfdb05b4f6d391bc6fd8ca13374 SHA512 c27b14bc8afb6cba3d835aa91a011747849800a2716722f6f4b9a1fefd03aa34da2cd098fb9bac60901af9dfcb1d344db5bf066372afc2b5d07cdf40e3843ef3
-DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.mod 42 BLAKE2B d45f19486e49c3288bd7f55b18dd296a05c8264b6eb2880269e778dad0b13bf178803311ec2accce3e1bbdf14ebe07be28d72de8647db82c81f062111962359b SHA512 355b395b1a48d208a8de8ee47662146556565d6a8b1753c45528617b77d0cb4ee06e8af500292666516e305e68e7aec31172c2ec271208ea9d5c759faf56284a
-DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.zip 1514960 BLAKE2B e7eddbce203ba495c9438ea5ad5d7444bd339ac31c3585fcc4dab839b73ee6290e8d67350e2e6987b4e07a4605a91f36a201911e1d173a29a7dc2c29af5cbf67 SHA512 0c767358a394bedbc6ac6ec51707a6255843a02a6cd243442fe3ef0c19605c312f8121e858e6c43ad32b653882a68801ce3b90616cc34b37692723959129760b
 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-20180825215210-0210a2f0f73c.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
-DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.zip 252346 BLAKE2B 5c1f60fcb550e1bacb2b88526d36badbdac49f06450e3fb98994f5b8b95f0d8034093c85861ccc84bf1dc25d34c173fafff25c4584008042098209a09c4a2b96 SHA512 6b0d752ee71cb0b3c8e06ec51c77a5b202028f8779237481ad8d0541d4b37beafc27cca8d431cc2294e5cbb739f65610e7dca63b7d4a25464b2cd555e2e6d7a9
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
-DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip 20646 BLAKE2B 9a92c4a9908648db90f4cc1de9fc1589718d1c30bc673c6eb194c9c1d69ce8844e06e6662c61debd6eaf9885f502887c8518c820c34a7963f946a332ba6a04aa SHA512 d1e689bf8336bf6354f35a73deeda6aa22d80320f09b86adcdee153c015aabfe86232eb3efc28512c23c26e6761f9d3b3ea3319d2dc1a052e321cc76b5c59313
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
@@ -280,8 +250,6 @@ DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod 146 BLAKE2B 22e9af8
 DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip 9823 BLAKE2B e5903b074df6b1b2d94ff628cb927ef3a718bc3fdcbb5172231ac490deb0be75243f9cd365886ac985f44deae884e3541d22e27b2b6826900c4199f70c50a20c SHA512 49f21614fd2d2bf704828d93003e8fbdd687dd18db7e4377b3571d7bf867e0bb94d67df08867fcb64857a9b2a7e570d5e2a74da981448856ce61c78b771e5339
 DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.mod 146 BLAKE2B 22e9af8c710fd531f641b7dcca5341312623409b3e70ebde5c7ded86ba237cee14d1d1f6d645b1d96b874f7c2e274aec4aaab894d55bde45098a8e38987c71c4 SHA512 379b39171f176146f7020b2a871e9e66d77e26c417e6e81a92edb1ec609fb55e4d6417a6e12b17fe9a4e3be6551c4f28381232b20f9a9f0807f25cfbea1863e1
 DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip 16296 BLAKE2B 8e6e588b2d0bcc8ef3b6def22a0e0b7d1474321cb4b48c716be5a8a52b3c0ade6a9bc062ec4bf8f65f0cc0b016ce2dcc8d42c1eefe2b2ef0dadab82cb980e0bc SHA512 b85d89cd3ff65d27933b81dde7c0c7ddfaca19a68dc7aa0835b709c9c0ba3059d15adaf9ad27ea06e078ed5e4f203bbbdd52f3f24ec3b23c93e08e5dcfa7e01a
-DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.mod 3970 BLAKE2B b88c72783696107ae26fa0b15d1b3df2b200a51e138a1f0a0aab739e7645bf9338e40c50a0d2a529f067f2c91cf77f1b2e7dbca3634fa82d251cce6f7d7b00fc SHA512 53e72b9d5ba2aa02af996c7f21a1c34ba25aa5421aaf9991e41ee8c39c4f2b25e55cba874c52355bfa173ed69d176e4ab3e7db411c5033afdb2d6fda26f26ddc
-DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip 91411 BLAKE2B 69926327b0e4dd7d82dfb50bde7962d46b16ca1b3664107ce2d9ed5255be72dda1f6dfd35ef4575d3e585cab51a96897facd840e0342e29f5cd2a1ffdd00a9e8 SHA512 83156da81791810d6471475f89af3f47a74eb3859be9d0a6c14d747baee746ef9130bda36471fe360a930368f8862ce5e748e4d359526bd8cb4c33a2b018bcb5
 DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod 2222 BLAKE2B 96cebe381605e123a48d1ab2733a9bfb351441178579caf6a31b6e1276b2fbdf956da85c563fcde295d9380abf49b5678677278af8ec5db648297da1d85a22d0 SHA512 fa31fb1ac7931846abfc67ce547135b6d76050054c26a67f8c81ffc829ca43585278e5a9906c1e9a95c440bb3701ff3b416cb1ad06f376eec2083c22a8cd7220
 DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip 103173 BLAKE2B fe4486c0da267e7d62e8a9eff42d2388235a5077940e6d8a94a0d97d5f498d93e1bad28e093436eeacd20234c582b52d2d0e20f70bda9c72e577b9d1eeb452c6 SHA512 4c04545406d9c248a8eb01e02fde4f3052c1cacce627f0baea6fd8068bc6b4d175fef71bef5965c8ac698393726cb36bc34a59297a919eaad7e3ea48376354ef
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod 37 BLAKE2B 3e6a6550c5fd7b237c484b2d7ff9d4fdcf02eeef8be89f18169d50c0ca7c58849c362d363428893035a5720d094cceb407c8565ed680ff248c305cd4acf886b2 SHA512 f2a0acca0b74daa85f1b49e2a56bf2d58c17570379d80c696428e31c028ace8436bd734b032996b2e3a52396d90cfaf3c0a99fd414c10fe1d67727a0da962ac0
@@ -289,14 +257,10 @@ DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod 297 BLAKE2B 2b94bfb4df
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip 42172 BLAKE2B ff4b18df1f223c00368c8be01634c08d8433e3993ac90c7243ca1c32c7871ee2222f25346a2c234b4d8f47ea4d6f62dc34c3eec86438d2cf95c8315779ff8391 SHA512 7305cb1a2a729c091267b1d4f1d59634c8cdafc39ae3355230e205e9aac960f321f6b07fdc3f3cd67f7f64daeaf287e214115df480bb7a318dcf51241260f642
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip 30671 BLAKE2B 4e9d64059a74036d71a06344d4cc1d7593c9757c6bf364b05dfe3c990e4a6a01faff3700a9af31c8cfdd6ab6f90fc9f0e07bd4e05c2ca9cdc47079ece6d770b3 SHA512 1bcd649feb0ee9b1210b17b249eccad8ca175b16c9af8f8fa16dc034761f62bad27c6bbdbffeca83c2992ce6d49124a29cc302b9b3c94324d6fec9340d722a83
-DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
-DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip 34982 BLAKE2B 182c247773cc6c2ad4ae42f255fb4e1c7f2e9664b07141e36bd763e498afa315e34e24007b6a8e857422dae46a99c199666effa09d1935888d2c96fd2fcc5bd9 SHA512 98eb544687e67eecfca40a285133e306402cade215b9776f5276c16113c0da1484795195894b0b0eb6a965909c1658ce0acafd3d98864cf2d2fa246fe5b18d94
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
-DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
-DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip 26063 BLAKE2B a8905f3ce68e07fa295a303cdb9ac8f78f746da9f82e32e44a227dc57608e21dc2a95d7e33f1daf1f91d5dff32e1dfa3a95eae3730e590cb3723f46afe51ec56 SHA512 b374cab2eea5ff0b1b314822094f872df5c07479553611722fc4dce1aff98dd36919f8c1e8d8d36ac7c7da9a51e95e2f6ba971d2f0575ac5f1cad1ceec3d9f13
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip 27085 BLAKE2B 43d07f0c6f351d78cc4bba75c1392574b537a5b8c52b1a86311092ae01cef11c2debc002d1cfb3f71bb74d262e2c24745ae3467d92d6264b5cc4f381a362fc74 SHA512 d5b1da656921ab950265b0789a70232e287b263c61e46122cf0ff2fc7fb294d018909bbdc6988577be990870381c65999f8c9df0d05ed48efe4fc313a28e8f90
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
@@ -306,24 +270,21 @@ DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod 102 BLAKE2B a2c5aaa93ab
 DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip 39600 BLAKE2B 134b58a09e3417ff72b1568d798d63d621d15a069c69852dabc9950dc8567d2f6eed06a0110fd058b9e9f289fbe9213b35977293faf770b0bc1e887161aef0a9 SHA512 b22f0255a075b7666f10b542fa810d99ab2cd15bd49697330e83199c63d2fe21c317247ae03f3814d5ceb4194a9afac96f4b39422f12d669a9086f96d7e2d28e
 DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.mod 159 BLAKE2B b8decf11dd5318f6752c4fbf259b036737c0bed14d6764fa95966b73b8d0becd7ebda90b6f504401eee6a78e2dea0f252bfea08ef0394183da6e5954265bcd29 SHA512 caa11c7fcae8cf29369b1276911a7ce1f18c86af25ff4bd5e0949fff63dbcb99f57322ea335dff159f00653d1eeaaeb9f130efa8967ca440dc1e8417520aca81
 DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.zip 45061 BLAKE2B c89e9877a6c93f5dd0bd88ba1caaa390cf645f5ad16e29feb364643f4ff35e152332b6c381caf93db0176bd7b32fb3b412d78e5746487964c9c8f786186f5e67 SHA512 9c6541984800816462813a6fec63e19aa01ccc7888c8551d357ad08a85f9d7debfb513384e28363932cbd9a2865f4b69831b76a47a6289db7b33169a97152e33
+DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.1.mod 159 BLAKE2B b8decf11dd5318f6752c4fbf259b036737c0bed14d6764fa95966b73b8d0becd7ebda90b6f504401eee6a78e2dea0f252bfea08ef0394183da6e5954265bcd29 SHA512 caa11c7fcae8cf29369b1276911a7ce1f18c86af25ff4bd5e0949fff63dbcb99f57322ea335dff159f00653d1eeaaeb9f130efa8967ca440dc1e8417520aca81
+DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.1.zip 45718 BLAKE2B 528753628627d5de6b0a395d7c2f7dbba279000ddf20ecdd50cdd0d15ae486c608e5fff25d56e71f53b7498afc6a386561b7e3b2936e516a542ffe2e9cf47915 SHA512 b1dea5afe39793498f04f5b78630145760f6c090e7a996599e735f657fb2f999ac12341a980ec729a84280be734dd9ad4b1c9cb6f603e82400547f3181c849bb
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip 63182 BLAKE2B 6f6ca7aef3a60232a715cecb6f2a4f642fc32388229890699371d7a901498726bace0e37c800db4096769c65cebef01dc4abff9a111daa3cae8fd8352ff18174 SHA512 a50702f312dc7b0a9dc95c3415980e51d082e0c36820917b7ff5bc0965e06d5ead6d7749cf8c87c7671456e9c07e9625e342b644aa6f49a10b4483a198f845b4
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
-DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6e5519fc2dc1209382c6ffb6f73d29dc97b6cfa03ef525d6095e65870a1ce25ca59d56648e24bc399f53f6879c0a3ce91e27645a48734602292c7d99bfe16 SHA512 8f86f79788cec64d9ce4f02af2ab7acd64f2014e5b592256f07563841444520bf4810a1dfa76abf04909dbe5f3298c67c0a88e636e45a181e461a2fac08d385c
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip 17595 BLAKE2B 06dae93e8077ab6235d59b57646a162ff31e044624bab3b6ec86c7aaadf49c36b262b957704151db889c515c425630299d396d0b76919403eabf4a3e71098ef6 SHA512 aa4b145476a80d7be7959bf7d0a9a278765496dbf915d083fbc40c5b216a52126af9ba12cf09f9cc178ce53987822ed61c92e2a0295fa977f8a460262e857c30
 DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod 770 BLAKE2B 22eef413edcfeb0337641d6567fdfb73d32f8ab2b3e624a3e5dafa15d31ca15c98c9740d4e9c8652adc5cd9f336153c029b086c260cf9ed8beda64b9c0c06028 SHA512 65489f1fe43c58303bd999f4c8d96b6bdb4d194b78e14d2ae9de9ce4fa877827f47d5d3c79e8417c88d1571b135678c069571e528b061238a9d59dfc8b472097
 DIST github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod 276 BLAKE2B 1ed39160b23bffe3c57b2d21b4881b8c9adad956bb2b929a8ae2abe94d8abbec24c73a7a679cf7051f7b8b0a61167ce8c6958532dcff3df4de87a2148196626c SHA512 4385e13d97a4b7243d73f9415c943c40595444bc576f917ca59ea8cf6da3a5794b82ece26a484fb06fc2e2aaf0a46e3904ba22f9236f673c59fdf7e09a297546
 DIST github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip 20140 BLAKE2B 21b3ae179e61ad340a764c28fa866c4b438f658b544e9687f03eb024ecd5b5588ca94454d7904cb0b1358751e3c0532bcf826c358bf6efde25c801b6f7059fff SHA512 ea0f407cec7f99a370593a66539dfa0265856faf9972e89182d169063c5ab7270ea92d46f558f2fc234e5c47e9875784f7a1b0b56996720aaff2b7d2f39b5c4c
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
-DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
-DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip 17666 BLAKE2B 17ec61e27967762f6f2d29e8dc23f4fba5c4ba0ee5acf7dd342e7437956af4348096da9df87c47c24bdc5f0d11544a1e5638125e888a9f163c97086259cbd888 SHA512 62644e1aad01d8475a0fe8878492477f11c5ac26cb0142a69b0afaf46a74ef3e3658b199ee6f505941f19d9ede170d62237422758e2800d81b251f365ac8bbbd
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
-DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip 22283 BLAKE2B c4c50530c98e584d408da87abf3d41470211b02dd1fdbedc7f06671fd8bdb9176a286414c0530975b44651f2a263230d7c450e35ffd435aeca100795e895f0f5 SHA512 d3cc4de24a8fc43b1efffb2e18fa5879bf57f2220f4a890fa3e357a3c05111ac55a36aea22fcddec115d50b19d04a9d452d28d6c05a60c39be301b11d8391558
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip 24036 BLAKE2B 30e48b301ee1aabd326394047f39d4ee2208aac617b2c3435d24c10735862c1fbd021aaa62f22e10ac07834e30e329d80aa5aa75267658b26c7a64112d0eed63 SHA512 4e72d97d59cb97db89cc6457b443ec4be7294e678d0edfefa0f76ee545c3663bafb223d9f7b2dc2e67c19429816e084e9da65e542788abcadea13657272ec8be
-DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip 15463 BLAKE2B 88fb544a56eb6266a2ed75b3b6380f52d11d725e8711f2fbe321bd30494201d43db01398348fca95ef76ebb46ce26f3f523be67bc2d56f264f5c9fc3ac1cb8c1 SHA512 891f2adbadf938d7d070d80198f50a62e187a6aa6fa6b489e0055b98a9b2547b43cda11ee983815026b1e6f0f8864d695bf7e72d70290423ff53b4872d310735
 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
@@ -333,19 +294,15 @@ DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecf
 DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip 6210 BLAKE2B b5d3b234531523546445cfc48d9c4198fd0ffe8c91ad6d2b3349f28d5073a6d3cd76f0db36380d69ea5617357a8677a81ef8cebe04c0dbc4538bec1810f817ae SHA512 50519f8c8efb7b3494c857373cb119b924f2ace674f07bd0d0da5939a75f8c154b5cc8875fd35135228a9e8e221fccc174aa298d21bd490b89a0f2d9aeb38e09
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
-DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip 8042 BLAKE2B 9ea2dd58a5d47047a84965e956e0d228e0c7f836c6b0111fca63ca2313c1721341ba31e7e741febc8f5b1053298116d69d6dc96f1497b59b343da59b57f7c3f9 SHA512 1afcd111ce5ec191a932e6f51f0aa9b05ffd3320793c022cc66766bf01431ee4b9cdd3e7a0544b6b1616fabeea262f54270660fb723de8ecebc8f919e7a94e34
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
-DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip 15533 BLAKE2B 68044230c48b4076c3d87d9c46cd96d3b0f293683129f72c6612f0091aac8e7d722945ade6e689c4174baabe37a9f9cd78d722d9a61bc304034525e8605522d9 SHA512 b0d8eb07cb45a5d0e048956fad5c1c822e15d4b5544f59eb2ce925d8e9cc14a8de072f3f4a1792706b293b1d9a0530391f2243234dbeead9bdd77f229ebfba8c
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip 15917 BLAKE2B 66bf9607834472667be4da679727ff2b004e95dc52e4c69d1470586244387b3cb2afb792b8f7d858c4edb3f73151771eed8d7509c7da91ad31655a945ac4d326 SHA512 b1267266cdb9895cfc0707dcfbb3dbcc8e3a53adb297811ee70d20f6a77d080f5cb0c4b8438e68d933a7ebf701c0c3e3f9a1b881916fbdf5b4832d5ae790ebe8
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip 16706 BLAKE2B 3077f81adf72f995a24e9e8e0fd90e0457d5c210cba7b820dfed7a2cddb06eef4ad4747ff0da2e663419ba891df9fa7ff374e1bc73f2326faddcde17bd3e6bae SHA512 c44bca4c63fc38ebd97c2abb7b5bfa2af635548723697d9533590242b936f1b55b119d0f4a327f1b02c546d571cd0d085f727c00057634d8c2316d1c7249fecd
-DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
-DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
@@ -355,13 +312,14 @@ DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip
 DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.mod 128 BLAKE2B 1eb83fbb14a562b773bab2b3a7935d400cfc3921c643e9854c593bef8b55a82e19d88f0bdcf5fb814536a85d52a8ba53a55295631dbd5d6aac9d51a547d1b966 SHA512 107d9cdeca3151466c4b6833d8b39808ac5f3e05308ce9d78bb8afa18623bb91248ebd156f78343c4af95ddb91bbeab33515d7e414f5244753970b8b9948b498
 DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip 76818 BLAKE2B cd424057541a171dfbb35273ed72f55d6a9aeeddb9c067da8712f85114e7a0ff9b9c20efcc8da77b5e26da09fd844c7e5137e18f7e15392dd68200381a830e69 SHA512 b68047c19a41e5293a7591d40f66421f1fd9755a2e58d53cddc055cdd377ea6cf313da8b3e53628ff6bed401e0d7c7deb865ca15ceec6abf828b6f71bc7cff59
 DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
-DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip 14557 BLAKE2B 7b306a1151cda04a778b2606fbd7e5257a80da359ee6f02374bcf7199f16e3513be56c706d8af2fe2e683c46b80f9680e6831f0e022f3c8dbc5e0c16020d7a72 SHA512 96125081b3fe8233d3c2885c52cbd46c7091f4dbe7ff3e542f934c21c75f498b6bbb89200f9ed27dcc572b16dcb31bd400bb4d74b4e75e171c565ce7c1ecb3cd
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.mod 138 BLAKE2B d85f4eef3c91522fbdc57eb29bb343cbe7b478c1b7980160daa93c9171bacd92be319ea0bf49981d0ee77868ed4be6a78020768fd61aa5e24332d8eadff15c1f SHA512 501d255124e6f43485d797cabcd3943993165d31e7fa2058667bac5c2a3c6492d9bc5881573b68d6da0dad4329eeea02141430a6c24e81045c7636bedc1d161f
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.zip 14742 BLAKE2B e124179ca8fd3e17b471858642cb22b841d2c370cd17758bb8725b2a54641a916190f98a2e355b7233317efe1bfec474c7ccf23d853e44fbf683fc2cebc6608d SHA512 6cf9bc0a7851e19ef082b25c377e9b20791bb6a7f2091bc49eff12fd2fff5a698a1cdcda8a9f5b02bf536a372f00119bf6aa3c42f07370927a41b6fc4a42c401
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.4.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.4.zip 114601 BLAKE2B b5f3409ebb08f7cdab7ba7f00d57e198e9abc848fd611861df29cbb3b8eebad3fb9cf67e58bd7f387ac6fa62cd42d60a8896c3b7b211a366138f719611dc6123 SHA512 fcc8094c9f4913eb9d2004fff78626c0a9fafa7bef79606ee2def6bdbb64e0e08725bb8861b58ff4ec2048a55ea892eed17ec44782a4aa83286ea6f21d2c79e9
 DIST github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod 47 BLAKE2B 67dc6ab625743aeecd408ea7bf04f70243ffb0a997cfc49206db31f0de98b3a30ef06afcc69726d771512585ea9f855bd42306de4a15ae99c07f49138cb79c20 SHA512 d1ab435b05bfa15b854c2ad3ead3678f0671f79fe9ec7d1352122438e62e40fcae32501a0f539f10747cc8762e8d94c0535d176f89c626c650beacb9c4f82f49
 DIST github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip 4515 BLAKE2B ae028eecfc31eea1056857da702cf0f4521a43ae5a1f1e2a267c1aefb9b5e703703d4f13d87928089e67d4721df1bbed2f7247e72db2cf7b24281114e5956327 SHA512 de6607396bc85d72d44c291a4d4eec7c98f0b54c27a92fbe0b89bc8916ca59294c419e4591da7d12ebe0541867bfb9c57f46ca4be19562129646ec2a764c0604
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
@@ -369,22 +327,19 @@ DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod 410 BLAKE2B 192e571d096d665
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip 156422 BLAKE2B 18071e2808ed442be205365d206d4f36042953663db3b219b4a54e90e723e42d753d465ba86614732495f0d3d06c6ae577cfc0ae8d0f715ad4a88c8bb340ec73 SHA512 dc554594229ea4caebdc7dfe34ddd5fc054ee59f8717a6afe2d32197ccf9b357a7f66c30d019c6d7b89685869e0e04c0dbcecbdaaf79e47c766c7573dad54d4d
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.zip 157790 BLAKE2B 29623bc436d2a1f1057532b98858f3e3309a0ae1cb209ca9e242d56eba97b84ac2b2f3533a542df9cbc8dd5521c5a09747adee1e38d3f3ec2b6a5517a0713684 SHA512 c689267a27346d83ac054c5202746c69bf79e5accc69a07c833ab00fe4f2a780ccbf41ed62d50e411322e62ba6603031134662c9e0dca18cd1ec3a52179a062b
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.1.mod 233 BLAKE2B 5a1324854b1f65cb37077cee6097e04e24f099eb48355d84f8df7b82f5bc8b0ecf01021c63591cb83363c1b8156455ce86a0a2599f9ba6ec2a94fafd107df1ad SHA512 a687048d5ba12f826081a5c4c39501e0dfe949b98e7c8b4b4bfa2b9be27fb650d6fe8ec31ca379ab0c13b79909a1edbe1f410500651f7226206bd4e0d21eb296
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.1.zip 145952 BLAKE2B 251dd64bc3f63086bfbca60fd2804d1025d70bcff1f64282b37b8050d8f7d3b8ff6b2c5149abfa2a9f0fe6f7825fda0629ab23a69418e48ad2780b9a8f13f7f0 SHA512 91a9d81f71ea87c6ad69d4a5b8c0133d859502e75373624c353a0343d75acb4e8ba4b041a243efd529d3ba1308000b2b8200d010c40f995b172309758e50fe15
 DIST github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.mod 256 BLAKE2B 3011050c4c07a10c30d083c928a167fa6c7bcdad04d4591d23dd7f0e8e91d6c108e023da39c64664fa1c9edfd1cde9ee381fc136256e727cdb367e42b63d284c SHA512 5446adc8997410fdc10c3f8dbd8562a0d36e9033165e54b71fcd2cf844324e69f8c324a8e1016656224a552699e01054cb2a70d439578067d8fd64d7366dedc9
 DIST github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.zip 56923 BLAKE2B a3098f6fc5c3762d91392f6e106136a14759e63d60eaec20fdeaba8a7b741bac621b56146ccb2e86613c74c579bde762b5d91b53f474bb8d855919c4665c0c63 SHA512 38f275d7e3646b28a5a66ca8b118cf75d92340b7cd388db20ace9d8f6ceef44f08fb09693a9e16a63ed901a6a5f66d45303e708cdd2e028fe436c664269c3e84
 DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod 40 BLAKE2B 77f35128903a84139dfc23055bf87c4fd8b4843953c764f0ec004a8a2b10599de19bd767a569080422179bd8ad66218d3639025cf1d83eb5cab22599b5da2c3a SHA512 76ce93f04caa8045ed49fccbbbfe76fc278bb7d94c973e408d0695e8c9c5e569b3dc9d4af8722f13c4718753aa72fea76a238dc8243aff34bbfd10d4b684e38a
 DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip 12245 BLAKE2B a83d39eea2c911303550703d23c6c6be3e71c47c008d9bfc947303b5efe87f60983ba00a5fa3d28359959940ccf299a82971cc4cea9ab0bc28e7214db83398df SHA512 6b88063dd61b36a5bce08e49fa630d2a59d9e3617c9f9b5b747993cc66029209597e296dcdb38c126559226139bacb57dacf451bda3e50d6e85c7b4953e4dc80
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
-DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip 550154 BLAKE2B e085f5b4c23e656f548e9d92cc3ecddb47a2431569240977ff7d7c2786c090115d5e360d478c3faa30b16a31a99f05959777144b9225f32afef69d77d9a9ab57 SHA512 818dfed4d0813bcc28c4b383daf039515593039e9171e1d970809e4fc5688dbf053bdb5b8b068ea9159397e0c240efacf0138d464699451406178569f77b6148
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.zip 550550 BLAKE2B e871add76e92ff6d4f3a708ffe644e99f61126ee6008260249f1e76372a5449832e14583ee1b54109d52d6678f1267bff795fc5a7b0298cb63c8eb751433cab1 SHA512 487de808f4ee33a22ffe1b6c3c57e102e54c2162ad1016fdb243a16f2dd1555dc8d978d636b03d2ec5eff30fa436771ade7719c4a650472533b36c0868c418c6
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip 553094 BLAKE2B 87ad7b11fc8edf2edd2a619f1cc262f2caecab0ec3c626f30e809ad9c366476e49049e8f6adb7f55c9a719ec19505eebf2db55d93559ec134f42479e78cbe968 SHA512 0daaf5d99ee54e7ff0ea882e77a38ab344cb427a8833a5c7fa30936d401d4c9edd6ea603b48821c072b6dabb2d9f31d74ea38180e23cc0949756b8e828ea0070
-DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod 577 BLAKE2B 6966cd924bfb433dee02347599c131e85701a7ad37be76369b3a72ba8d6d3927abf1337426eb508a5a27c77f5005240a08ade70e93e546ed752a70fee483a3ef SHA512 78b71a31222bb3bcb5310c929587b13f19343f6aae9284654bdc3ebee9249c9a8440d428af8273acba18ff144265bcb2e8cccbcec6e18b9cbec2fb0f73dd3abf
-DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip 72918 BLAKE2B 13c10ae1ffb312d91cc1a4dbcb072ca3e9ab4cba3758a04c6c4ea0d7b875453819fa8188861bf6f284f57e44a70f8d6c436699289f44a33082ed8088b1323bd3 SHA512 c4d0ef607d0116b64507ebf631d5190bc6cd2c5508ccf060b226ab7c4798a45b595fae0d132968918ccdb644cf05335d7de76c84ac7a188f4b7aafe8068d725d
 DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod 639 BLAKE2B 3573ac4768f18bbb167c0d524d4a51b9cd31ace23ec4e9dd1c6980eb84dd3120b6a336fa164ec3983a7f4b32a5531819dd3d2e7b6c9829ca3714302ae1820e0d SHA512 44a1ac2d2408a9cf14670e9fe4f32fd0df797d60d0de05030f41a7887503f03c79fe06cd49755c9083a914c126d76c716d8c2bee70d1edd44d3a9bd38d3d1406
 DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip 103305 BLAKE2B d5c8a1952f46d435943fc9f40ea001699d2ec26df8405e89797994be0d5afe6603909dfef88a7f7899a17298a73652e90693f49eb660ff29504621fd034b9625 SHA512 7d3ee8537b3390db69a83a4fdca5a883705d81270bcadc3ce82b6396e7751af40da2e38ea3d2d7d2eab05ac0828b367d60e2892d7838a28d5cdd53400b5f5ef9
-DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod 1594 BLAKE2B c6b069c73847f3b115faacacc323ab407df86f81a9056347ebbd15eb12ac642d8e8a7b0410afbd076f18b704c18830144a4bed5a98e6f31d67c14fd1219fa7a0 SHA512 c4a38235e1b91838e6743f4bff89ba737e6427a65e9a2d34c750b63a75ea86b7ce13243b93d13d34f9f384dbf678fbae5c5b5e056eeece9d17511b9e197444e9
-DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip 317301 BLAKE2B b4763083e5d6e71330e880a5daa29192dc20db6217b869f9714a29967f8a606ea6e8e8190b26fdd553017045069123fec3bc2ab7884eaf0cde2f328fda16dc56 SHA512 93290fae6c7317919fbb85229e00ac7e56728aa1a226bf1cb57a6defde4491cb8032c4d0c022ef4e06056af47fc2b1a6944521069cf9336dfba4a57227343075
 DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod 1198 BLAKE2B 6c06f699d99ae4b389918fd96bf7df7e61c573cddfd261ded88aabc7535a79bb62feb2c1a9ef61ea81cbc3df979de97c87093d8e06fe5341f09cea49f6b08f63 SHA512 eb9a9bead036c59a35e051874d86749b1a17f08a6bcdbbc4bffdbecd403c49121335599fcd0b9bc4e932c0b55363eff5f95908c0208d5bc9d6ee2470486cfb0e
 DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip 357137 BLAKE2B 3e39351e122e878d3d18859f7bc5d5bc2991a5efb0b42c67e73626c46c2d16ceee8a1135e4129a4e12111dd18006a9ffe8307b8a015eb67dd7c913425ef12a1f SHA512 17fad4f469ecfa0a48ca4fc6e89373a595ba379902c243decbe4ab6819736e629f8499fc414429837f2b07361b3788ecdbdc8dbf29e380b397f58f196242e907
 DIST github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod 32 BLAKE2B 40839230d4a1fd6d28597a39b0d98ac4aace76a96dcf2d222f073554b8df6de4fab48c0613b7bc2da1b4912e338ede282043a3f615a87c246bfd71488a671337 SHA512 614955fd74641e34555d843e335d5e35cf79dcc6e3b4d43bb0ba4fd6fed7d332365eb874d6bdb7c3b5be576dc3d09356c8206d1aa4d70378581001342f4f7310
@@ -395,7 +350,7 @@ DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zi
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.zip 28949 BLAKE2B 5b32b51af5020eb8e48a78bd2307952b576c91f1b7f4667ac9f8eb9ffcefda3e177db0d2139f5a6f388b048b49e10c64dd3bebc38d4fe42af0bf7ada96f0c56e SHA512 8004b328f3162fa52314dbfcaf6eb880e1ecd205960176ba54812e0b8632cfd1b1977abbb559086f4bba867b027357fd4776d7bb58b10138bc09f27af294e072
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
-DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
+DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.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.6.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip 25340 BLAKE2B 3d0fcc2379f60900d4003da2a3663e77ed131986dcbe209aa13a59198f1fb8b182401c50475b4b39986ac1dee1e165f952bc7de758d141f5cbe028dabd6eca64 SHA512 4ef5c92c16747f375f83866581302be13f9425c9257eb4d73d197cd2b9332f7125b5864a1dbf423a96b1c03ef21ce32ab5cd1837760258a07052be40bd4e6399
@@ -408,51 +363,36 @@ DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip 231432 BLAKE2B 99b12826322d86b39d622bba690286fbc43b9e0336161d5218e6620caac0580fc7b3a021e60047a19815e35a4821d31066bf1ee6ca0e49f7bbfb1df10df21380 SHA512 331f1c4fa97173f022210d15719a9ae8a0dcc1c7574e1f019959070bd8cc3f77e34dba16d78e8d9e0083fee2ac24751aa36d5cdc0b2d1303a5118156ea514b7f
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
 DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod 35 BLAKE2B 58f9081333c4d484056fc9fbc8be7f41cd1f059a20c2786635176a283c47a1d526fe2b5718fc03832a4879c70b9523c9cc3fa6a3d75081778621911e7123af0c SHA512 cb340ca055291eefd8e3f05764d45dc8f11fc25486e8ecc7f4510ef925d0d6a1b81f29c23aebed0e03beb6bd3bbab45ab9ee9344e9d4cf3f4407c2a7031e2ebd
-DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.zip 239778 BLAKE2B 717103b58dea44b53bf0cfbab1d8032a72128f412df0ef9b4d0365da8a23b32b3947fe20dd2c6b5360ead4422359b08727fb2f078521bda5c52ffd3fee2070ea SHA512 6a6caad10268100f03b489d9ebf20ddceba0869d1d6adbf0a55c8fc206ff7302b059dfd165e9f0614e239a71f74bc774039df639d7bcc81eb2a7fba95c4830a4
 DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod 1251 BLAKE2B e874cab57ba23b565a34a866bb77560917cdbd4b5fc70e5e2092c39f5e29c37647ec2eb7c135ef6db5c23320ebc44be93c0978788c702528a66ff81cef77968f SHA512 172cf8fba2401f921243d281f008de4af0f6c4e3c174f5337740d78c12fc0f12e252a2c1a71bdd39e385ca424d3961b1e15446665269a8baed2b92cae0658c0c
 DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip 259634 BLAKE2B 962e78ce6ee1825bb61ca1f450a00466ba338db6515e74764871a6ef809f224a609b04448ecd2756c573fe679f82f1764b5bd0f7e7aaf7fb8aefb66b5d9dbdbd SHA512 3972a6ff9a2780ee2da5768c9422ddf4766502bf9242d4d1b0f9d30a2afbff31faebd214f704703375cf0c83dce413cdf0be2ce404a86cedb60c2029053d009f
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip 128914 BLAKE2B 0584ab3dce388bdfa32846c4eb13a143565cbce8f884e5ac50efb194934d82790f6fabebff4f20ca88dd96b0ac0f1d352b30c51037040d1e4e6bb427960cae67 SHA512 28ccf98d677a0ac08bbc2d8e8c94e5880f2c612e891487c8a4a051b67b9d1ff71fd47eecb357ed2c3f7ea25b6444dd1ead2d9942a45ade8c0927de18cec54060
 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.7.zip 131514 BLAKE2B 477f1ba8434036d96652435c432190539006ee38ccf606671cf319e356c6047c3913c6dffad6e4af13e023dbcb6ce93455797e37d3e5b9524b75ddbcbe0e906e SHA512 e64c91926d1e3688151b4f511f506fe4c2acd0a2ab839a43d12c77145e23215e7ce3ea281651f46bb945a07e04a1d2b6bccdfc3d862b3b7cce074e5817ac014e
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip 133805 BLAKE2B e9a015f12e82e7258f4995a093cb3c710c2ada1bcd4d0e5fd70fa00b7917753c41ff23fd4ef5cd30615024791526a053c623c28b4cc3b2d304d17960b35dedeb SHA512 2ed727a07740077cf749c197615814b52511614129d15e4e4f7f04a70fdea7edb8a55522d33a9e7a29595d3c41170f7a912a7acd9fe88c6c8215df721d4d87f5
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
-DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
-DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec
 DIST github.com%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.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip 11508 BLAKE2B 609b34f41f3c1579ae15bbdd5f9632dd58e9082917acce355ffc5402c33ea45bb0bda32d009a0a58c6cd60327aa87008453e0c4c36ed2a1be41c4f5337de72d9 SHA512 0f792e6f960b0cb8f9a30c25d3a3f30e7c459a05d7f03f68c98cb581967fc48b377314cb83b990c9509cde5680389bee0ce2b0b1efedbceb5592f38a9ae6a3ec
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
-DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod 33 BLAKE2B 86b48a32cb6fc28be9a4bff7a4bb26476927a721756fbbdbed15c5616fe1a24c923012bb0e7096461a98f3a502cdb0b6629ad7fe271a19a603076647b0509c1e SHA512 57b4b2e6362f8ae9ea2f6051a0759ede6e9ef235b150e612e6851604e6d64878df76b986caa743113ff3c849ba812b072a3f82b9e2f31a06bb07380daf3f109b
-DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod 111 BLAKE2B cc5feebcb8909656facde261e7ce1b4d57be6af1021845409567aa6748d9b53f69a101d7fce3031a8b579266d28c8edbabc6193939c99968387e6ad1ef8827e9 SHA512 11ccbd759b2a4a93296b0904b0059bb8327a7dfc79b603dc01d218fb7beef19e2bc55fc7a7290de833c138a0c254a3289ae58364d2d9441b7a25f480704bec63
-DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod 111 BLAKE2B bea53bdd22d5d5fc097a7fb5ea923b1fe0e5fc18abef971c00f917fa0340295d95f9439a2b4787ccced87c49061e8555619e316c3c32a738e880d9d6fbfef4d6 SHA512 debde42d51813c72b30425ca7bc3073fdd430c84951f1c757732f50b6c99e551b702d55edc03ad36526899f9e69d7e8cab6d9fd059bd11ac16c05a1b2a716912
-DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.16.mod 111 BLAKE2B 2591929da90611ec56cffaf63040dc59571aea7f617086ee9272e66370685c1d3ad66b41509252a4b27717a1372e3a52615f88c470a25e8e9600a3da5589baab SHA512 93c961c1636221fadfe33ac5cd35e7e62c12d6cb3665745dd47a3608ee1a305d95e2c6bdb39b086336288a93b969f08e43160f2f8202ffeab238d20694fd9437
-DIST github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod 111 BLAKE2B e638065c3ace96da9dd096f3ea519ccdbfe58ba7928d8e4ac944c518e018e1020c1728195a6ef8d7c4429befc8dc8a2a4d38096fad75fc2268b67a9616fed3ad SHA512 4c3322f28173656e62b7cecacb357abbde7aec5c6657581b2519a8a913a3f1ab75d446015a42a8be6c4f3dd8d6e3e0bcaaa2f234738cfb5385e62864399fe0c7
-DIST github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod 111 BLAKE2B 1cc3dbb03800b78de071cb5cb6a7c4e5fd066544959591c31bf819fc30fccc52fb819547ec85cd190c6da2bf8de9caa73dfafa35759a503ad0672d8885295f09 SHA512 b1455a3542da84f26ddbd93fb6c0c683bff5c272be5f3c0eabf6a2082dad7d0a6f2bee00a538ddd06390b126a13b7b5710ce023778788f84b04eb8ac0c07e98f
-DIST github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod 120 BLAKE2B f6155af40edbc708d9bf99a9c4403dd5c75780404099278d2f3b3737843eac0a06518413529999f1387329b93f499fdb5dfb143b6e94a2e737d05e9d067ae35d SHA512 edea2397b688b2b8a16a38ca58bbe99ee9206d799414a503db000d70c7b7ffea6e956553c1ee1bbc81e0349277f111864f725c53762e1e0af20abf1025e80c36
 DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod 34 BLAKE2B 4217c6bd7b66d286e9ff72af7851bc7fc833e894887789e6610645e36bb72c66995d1c308170b54e21035195ff96ec6af8811b835f75995af0fc93be45d6b9d7 SHA512 5a5f833d51cc196adf1bc58ab4804951c2475b229c1a3c707c79b45e59e8ce98e9ba52d2624eb73617491c28bdcdb834038c4c5c75982559865d3d2b110994b8
 DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip 333347 BLAKE2B 6aaa8e120b76c9b831a1531377d249ad3c8e857035e1a9b23ad7c7237f4a4124d5031771df03da60fed4ac7433f9959bf25ba6fe2024385d355eeb41ea3c01c3 SHA512 08cb3b6745ce23e422e0e0d8d5c68bf9c7aa9e2ffbb44813b66c29ee10d457eab613bd6d609ac0522c18b763d0dbc53d8a33c8dda8cf0a9651ca1cfef946f9d5
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod 104 BLAKE2B ee5067e0e89fe2d374ea852dac828c094db84c3a3d2d8a991abeaf40385431015577eeb6b11a66033e8da599e808f9385a84843fd8f87dea487bd3bc9ba233da SHA512 f144089cc85271c7d91b9a6faf169018bb12177dd770db0092dfd0b4c71846e5cc6dea385c0158a974cfe86971e5642858a6d633c64d3b598f1ab254fd47db28
@@ -474,14 +414,10 @@ DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip 30608 BLAKE2B 68db36e6420be62aa1594d415cc95da064c3f80e220891bc747ab61d1bada168fa8c33875bb8f5a1b3cbfcae6b9f48cc28fd792b884f7378b797f5f7445c268a SHA512 41d05b304a7325dbb01dc2704407f5a7c7f7c1255c58cfde66b1d9668b15e1b5e83b5159b25a6ad7d6fed90e64446b32c1633135a018bbb4357c495e3efc8a83
 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip 11210 BLAKE2B a469026ecf6a1ee2f2d56091fd90f00857cf5e57164ead9e53c15af03d10a8b737a1d2b2fc336e3e972af014dacf8f1321ee1fa1cc9dab93790fb6d03ae195ed SHA512 30b1a531823403a911d9f877352218890bbea15d82390b4561ebaa4bab09f493d49181ea5c34078c18df31b1896165e80c4862b450ef5858ed8af55b2a0c42eb
-DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
 DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
 DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
-DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip 4603 BLAKE2B 409e75eaeb540957751fdf5471d8db1aecefc29511c1344edb6b9091c1052bcf22c06611d929b652682434fbd50f0b730d959e69a1979737ef29cb101ac5aba2 SHA512 e4c9a39de4fcc5087e1dfc0071920c53a95fdbd23c8e0b30cf56f7d11625e6eec44f5fd0ab6b942a5cbed86ee2b02d525f03ee026f7d60f70d1e14a82d9b335b
-DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
-DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.zip 4619 BLAKE2B 1b7f74c9c949ac5a590447646f5ba0c94c8ca3ce100577450f0ad436bef2d5773d08dbeab902b48e70929486c0ccf0b9d3b4a1a7cde52d5e7355c4380198cfe1 SHA512 dce03675e6485a49826b01c998c83ea3dd5ea9623d0b73ca9e1959a2c8a972f6ad13e657d6f60c8693c229bf41b20cf362e278f8a22b40bb70db3bc94006912a
 DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod 58 BLAKE2B 2333737b61035e619ec57fca1e42fed937df5b9fcc706b0969ecc1fb50c3219ee8ced339c50642a40e34325ff8d06210793c5903e20bbc3032b589c40f0721b6 SHA512 3c179a55d85399100f631854ca36958ad6acc897f34c527c429b58e10a3a5fc3289c304b5d3268928bf9689b5ecbfc6790eff9a3293d9e3e7e7af7a4c90df95a
 DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip 3839 BLAKE2B def4bb0b04892d37faadaec991c88b8ec4d6e0818dca363a918f6a78c38b67e5644bef045187c10eeec0278af3ce00b8b90ed4de9cc7fbd983d62141e27fd6f1 SHA512 60f66de1251f9b249676408f2df84bb121e5229e0d649e806800f0196aead7dae8d12172beac0d631159c303c1ec526e01f6582bc346392cbf7940db4d17e063
 DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
@@ -489,12 +425,11 @@ DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e
 DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip 8307 BLAKE2B 9656fc8e80cad1297cf826b533222e3e3504ef579e63e722ea3b6daee0766280b1e19fba11ed20f0fd5130b02dce370ff7798cd6575a3bb248c1cedeb86e1b1c SHA512 52a1aa9e4bec478d326a2bd8dcb0083f7314f308d338b7da0aff8d5cb7797463cc5e75674b44094fd0fff42f394eb3826bde2f5c1ce48c29e2a92766a0734b52
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
-DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
-DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
-DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip 28419 BLAKE2B 401adf54267565490e3df3de54063893cdc3dec5babdd5ac4410a85ef16a65dbe13168ffe85a78ed9cf13d02cc873fde44fe5927c691b99587a96dd49aa3ce22 SHA512 33509ea85f0e0b364d5844f27ee5616d53b4665b75851a6a860169d5cb08f9c1e531ffa0b7108dfac4098e17b0d641dfe6ff824ae7abd0a9ee4c1ab47848a1ab
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip 31024 BLAKE2B 0764e170ebb5ee0b3c4a827b6df9eb62d6804202375a3c37b115879f7c716c026f80aa08118b6bb7ac1a1572070efe8acb235e1ae2e1a4f154a5cff4f4a4bc80 SHA512 e61765ecbb25ee639710d666f5523cbdca9ac5792782926d5ae7e0b13545e0bc5d0aa5d090bfb5e2b6ea218b55fa3fe4ceb8a51e5ac432f7d6e5c9eb86aa043c
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1-0.20210112042008-8ebf2d61a8b4.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1-0.20210112042008-8ebf2d61a8b4.zip 33752 BLAKE2B c9a297ca4c27fbb404dcc53f3803d3721fd0294dd4a3a569f78253158b6eca00c5bc740d710ed2836b259fc188b6d9e0600044a51ec98e1a777a204b89bd69e5 SHA512 71b788086af4f95e42c413af91d6f6c2c0d25c69ac2ff51041a58a4f63f65a49c319c9f9d2c18fba6d762f2cb7fcf856b6e81f53377ac09f74e1c80ee7cf2db1
 DIST github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod 104 BLAKE2B 22fb94f808eec8235c32993a7348c9ccaaaadb1d425ed711b42b30c4f72c214ded4b00f09a0801a07132944675da4b5150c76992b38e3c09c6b33ea9dda995b3 SHA512 bd4fe6712436e85787eea6bcbfa7eb9d4b63e06fa1bcfe357778fdce536d8cd5080b00a41f98f1634b26c1e1e0f2444255fcfab11d0a168678bac405532de5b9
 DIST github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip 14397 BLAKE2B 9e44364de4d4fc682832d57a60475d3cbc44f1bd64de899dd6857d2bb576d6a64b918cfd6d0bd950f45a30b49715de3d498fc7533279cb0260a4be1abe6d725c SHA512 4482a9382f9a95f747c1f895874bbc317296f0e5c0f34c74f7dad4c6a1cbf70a491d0edb0267523f8bce6e4f519f18f5961ab6206861631575df59f49ac9c701
 DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
@@ -517,10 +452,8 @@ DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e904
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
-DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip 239560 BLAKE2B bbb8130df38c1ed95d80391504e92b60fd17fb3e41076c66562619297b602cc5f8fd8ee9782d3c7a5d4f004ecc08fb64bbc52270d9059b4cf3742c10b4a03aa9 SHA512 d14ec67e27936b1d9dcf885d8ec11e942a7beff9cd52a504504c3c88caaeb03eec4153fdfa0b0032f2d53f16cf5c28c00b4c504c81f8b8004cd4c6deb1ce19db
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
-DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod 37 BLAKE2B ed6f4a483b165555bd8e0483e5ea03f2b46f9aaa60d0c0275877d1ca107561627e1c8b894bbc3d0054f3229e05f828f9aedf9de9ea8c58879dc2cf8543aee8c0 SHA512 73d11fe4f2a7a420d84b2a749f589bb586d9280ec3f4864825d4d2a557aa5f0e1c2a8acc2dc2661cb06425a35d9cd94d06617ca11aa0a92af786dd25f9911466
 DIST github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip 44333 BLAKE2B 0c915c31d64606ea905b35d962953770fc868ed63c1408d7ce61d96165f3995371bd865defbfa120ceeb7cd0a394cf34364727229129b53f44d50a5208b675ef SHA512 915840cde63a7b85eba397ebd26cc4d61b65df9327ff1f190ac68fc1acd2c044e5dd3b5d0630322177df6d62a8120a1ffe8f7c45c7e66036b848e3af432ab95c
@@ -531,9 +464,7 @@ DIST github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B
 DIST github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip 15715 BLAKE2B fecf95052bf2bf9ca21e6fdab3c9ee60a01afe8de700050877f1ce4af0c6f05ca044ea9be9228280e6dd2682616f14cfedf678a92c66c00936b8fde0fe336082 SHA512 0bd072a733e99c2af2cd83792a13a0c0f625e63ef71fa9ecf1a50c9d93c2879c5965bc5457655617ff4f23cdb854718958d9657557ab09730ed0404a252f8749
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
-DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip 22487 BLAKE2B 93907f2e048ce0d8be7636d9ddbfb61f051c6142402f725609692a1644cfb4b504ebc36efeb36ef1e70463b54c809b7c71b9596705a0b0e1dc5f7a52252be5cb SHA512 1619cb9a2613384fa025772cba512f24c29947945bf1d85e476a52be8f5711d4bcb670750dae0554741de3c9190f70ea2a2c60e6b04e5e5fe4bb653269f5a849
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
-DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip 3703141 BLAKE2B 0c8b5a768e298b8bdf314459aeb938a4a05dfa22bdee1b0a2d65e7b02edbf2be6b73ee51a331f4b1d14caef6bd9a001b11a72b85f5de3efcc044501fc2e0d3ce SHA512 b5352137315ec28c2f40f201629a4e60ac26a218a3c75666cf56959cff953fbb6153123413fd1518a1a636d10edac9022ba9f38065274b9f88a89e937283eefd
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip 20573582 BLAKE2B 4c5dd3e4f8ff6edabbd14b78486d6213064a8ee351a45efae43bab610899148060dba9143998f37667d8170a90a70187558b9eba9db36ef6cec5e18df020c466 SHA512 fda30f0b48b9561870599645cb9dc0a788d0f1fb8217e813ecbcf9a36d29d2185a53670bf81e21709484b22b851c0b46ae99265327f4af4c78eb5e95821d8264
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
@@ -543,41 +474,31 @@ DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
-DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip 30137 BLAKE2B 0a91beca32707841cfe1369c4139ca20fe8ad59c60e029ab9aa81f1473f35a52bcece594ada0b5c39a7c74b7e5c242f211516a325b89e02e7f1fedc7c8027988 SHA512 ea36b27874c4cb46a27507907458e217c72f988f857dd43986bb58317d9564d6b2dd7ca84f6e70de92030114b3e6893dea61f315535254a826f897b60cc9f601
 DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod 136 BLAKE2B 3708d63176898e5b9b06ad69d2ca1b4bc3bc62c5dabc6df3d77f476ea9b588f27efc18ce5f098b50ac0fdd7c71b36f76175e2cc3cee878c3f4815303b17071e8 SHA512 9138e434a2810bd96269cda05a0cb03bc7e6f28949f6d6379468567e40938846c85f581b4bc3549a53605dd9436e25662f27f216a60a4bdd816b038d6af570c0
 DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip 33879 BLAKE2B 2941a11911a8b9857e5dafc63c6477a1fa80dbc7118720302735277d9d10d292b0da58575da6a3a961a517912079a7c55d7101fd1e401297b189e06623c15299 SHA512 e88934a079336ceec1566612c97e0e5b0fd38fdf91377917d92208f39415c0ef2503fb3ac8923af4dfc43e146a71b5e28d4ad810efed32ffd9831e1e2aedf495
 DIST github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod 39 BLAKE2B f2e759320f64fa232673f4f5326c688510df6d43523a08df1b4b7524f92e294bf196c13049fb36feb846916a66b4baf7969cc0200b7109467b1f468dd6ab61cd SHA512 c0602d22e7cb8f1a20a354cafe61518a84a1499f793cdbb4e1d258d62b4f83a2c2a72e6cda49894eb2885ff524baaa47c542937c68bf338c76de5953aa468436
 DIST github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip 28952 BLAKE2B a72e9c41216bb0203159553009e315b7ec7ddd1bb8de8128d1398fe249279c2eba29145cbbc03327c7b776fa1a81290fca6752674ba16cb687771b2f64a6b506 SHA512 3ac7061b6e91d01d3c1421a3b45d216d435a78931fda9fa7471544eb0f923de514c319b3383919a942de0f45ea33eef66e549f1a5109253f43abc74e3ea342c8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod 540 BLAKE2B 4d43a0901fa46da74e62fa22f61dfebdf6468f2766bd43dfd487d7a5434f961d181ecf26015ff9134e8d3f9c2dc03da6abbcd0030348facda3a499af9a04665d SHA512 9add81238044589ae2cf38042b963953d507e40945118fd62ac1cbf41bde1b001a69423c50b7045b721488b3d53489b4ce3c544b68f6c4e31e340d2581f7c8a6
-DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip 193855 BLAKE2B 992f1dd35201c2f388e3fb03bc51a592a4b36db69a27b52d9e840a95d920cfdffcb2dce6fe2b8fc30a718d87b07383df2ce8e97a4a2a40d4f2f0ceec35c1d4a7 SHA512 79cebb06e6a958cded21781e651e1afd406c7502a945f2c97c9b910d0621a46a7a84f8fc8fbe7c21547146ec407a8f475eb0e711f37273e28f2fa5b3062ad19d
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
-DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip 200972 BLAKE2B 6b6aa2cc4006f6671b0f54def912df6ff1aba7b69bd08c1950f7415032e2de383af556cd793f991989f1542cab5d7bc8a73894504c2f3b757a23007ba76b21b6 SHA512 c01081549c9e62a75d99ff37fb4bf3e620dd9e6a22a049c1b0b1b53604086ba68a5c366a7373423354b25cf7298c642956db7eca4b04be4b9431fe24ec8da125
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod 612 BLAKE2B e77946b5137a632121f113e6d7b390d25891d1fdf214b7c07ee0307aa4e78f5d19e96d1f4bf01aa1d62a2b0918727db1e128fdca6b6f1daeb08632b940a3084e SHA512 46eb82a74b845f5eda8cd01e8ae182e5dec7867306b31a40cb5c6bb9df2045c3259070b57388cc7826f54ee7b9fddaf980436f74ed500ab88748a13f12b30ff8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip 211100 BLAKE2B 82df0588c836241be81b4dac2a5a5fbef1d358c23d9443f9ec516e87cd618a9af9a9c6fbf891f679d4ffac2830e5a0915d397f131db37db9f1327c5f2a3f03a2 SHA512 84caa262ad3014b633f4cbb3deafaa9a2ea486b2d8d4c871994efaea4ebde04a15a025a03e4996863fb294744b38ab647aca90b3d29814dfd52f4d63ac0f709e
 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-20180712105110-5c3871d89910.zip 68325 BLAKE2B 9b783cb98fd4f1ceb158d8a72ffdc7d0c232a8a9740de221b4321b2c7e240d98bb5f2bfca74222c6a7796368d48b1d3e315229a9d2c0436d5590bc200be31817 SHA512 25290d540c185fa2010b06596a70b6d06d4ae14fd92b4e5596b48074e4e5ef5ec6b990c8d0bc39cb44f0c2a83a0a1ac4415f86ea4e3fb69970bb2496f148d0c9
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
-DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip 69217 BLAKE2B 738c4f5d28aff0b5e5eaa04f50e9a4e4671bb0a06dafb2174720cc0e6fa79ee87123f55776cdc051124434a3889232d512b32d08b1db1d2cb7f54e251b617e94 SHA512 6cf7daa3b86c574afbf5d91d3d4f372fb31c06ff93d59aa128d8ef025b5c22fcbca5a148b21637ed97127e5e2150305e48c241be1ee4c1b23ae32a09f19ffaa0
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
-DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip 69219 BLAKE2B 6ecc62f2f3ae4622ba6e19c51f7ff7ca3bafcadcb38cb7a9d79dfcc2ddd7183d79dca8e0d6b534f5a2dc508c21e0fb349310b4feaac35c1f7b1166c3febd1228 SHA512 934c3e50ebdc1ea65ccfd4de1e2e0f0ebdece54be1cccaffa5e325c667ab22bae84a7fc7ead1066e75094697a86452fdc36fab57b955f42337708de32e7eec32
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
-DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip 132691 BLAKE2B 9bfe80a4f61a6b7a2e0dbd235e1a05ca032982ef14a9989c415ad143c84c42cdcace926a5683f2273b84c5babe8c0e5b95c680805324217a7afa18b3c82b0bec SHA512 4459c32fb8b90650c6fca37477e2ec49c5e3eb68a8151c88099017fd2c9c13d2a066bef75061a47ed27398e96aa40a6cbe2524146ad1f315d94d7359d0a7ba74
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
-DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip 151692 BLAKE2B 89c5a1012d53a62b773c2c3e9a20426564f01e70abd39ea67cc76abc00f38e6f1443ccb31c0ad89920cff80ad94c5f7e72c5d67eb3aa44e047c0bea758be242b SHA512 121a4e3ffbf959722b4333b5e449dd54b6a84548bb580e429b21fc6fdb6a494456ea55208a039f7be6dc7b7fedcf0c6183edd0dd727cd7ebe0ec517a8e999c85
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod 829 BLAKE2B 14a7c9b3754cce16715135e33ee294058d999f343d74281b9fd111a9c0a5632b90b6594d1ed220165b58614a695b2b2aae27b2ed9aa35ba1acc768ad12e46ea3 SHA512 4cb3dba50a3b47b9db735de9df4bd7b35d02464065919502bb1e17236c2f6b1bf1e74f312a8d0127d2d570344c30d58063d62031d3439f52a6dd8f47b29b9996
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip 161521 BLAKE2B a412eaeb17bb3e932cb53393de6eeab563068918c9ff384ce32d2caf958b3e3e472f554c70b518b472663f42e2060a97062029e55b694a6c93a67af4eec2d626 SHA512 692c2ceadacddee42e9415892d7eaec95cbf5319db3cfd6b5406b39c99df942b4dec7095003ffb8a36a82424b9ebb312f8bf28913ff902320cad2253337e899e
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip 103337 BLAKE2B 0bbcc8096a261b4697bf5cb23b3141a885a5d987db3187d776860206ee796c41e78210e5e36942fdee76862033d629f2e2fbe72522a50c846aef973c22ff6d74 SHA512 132a26cbef951377102cff398932b442920500d12e80ad50bbe05ced623d1618e0d56d95ec5fa36354f4295ef9757e4750fe91a25add4f2175d12e6245269425
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip 132055 BLAKE2B ed3f24a397ca21aee9972a2fb1bcd12acdcd5b7aa5b21a36cd8e8c1b1e04bf3a1264cd7b21147e1f69e76792fb0d36f4cd44f51178376a9daeb092e69eb8a2f3 SHA512 e3f4d97e22ad8d27a3c8bcdb6516f4e1574348b864deb6f1569f3d94098987f35bc87c7a34f95e84834fcd8c750b3a177f847b586b72b91af0e0f9a735bc3f20
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.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%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
@@ -598,22 +519,15 @@ DIST github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.m
 DIST github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod 30 BLAKE2B 77431281d4cec52a254453afe8c7438154b0ecae0116ba085401536adc1f71f6a7eea8b0e2181893b004d805e3ff8b3a7f212ac82e41877cd08c2cf0fc47af05 SHA512 5101454134688f96467dbbdf475b1d9bd9e446c29eb2cd04b85430ea0130c09dcbd8141d5ca0d63e63b74349c3dbf59d978ef2115a03c920ff2abfad10fe9a62
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 4415 BLAKE2B f50a9fd1f74506625ae9460c6071bbbd1dd3ad3d83264fb7def028c757e8ad8f865fc7255db6e9b5cdb7a1744ac1f741bc6184f064eee7108f6fc0facc81f639 SHA512 acd19ece301ac146ae50dd784e3dc1c2cbc0c00a562fc5d2759b7b8a4acf0b5bf83d5bcd54122130877a1568a13709c28ab7e1cc7ba269ec91aa1b1a86c2065a
-DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
-DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip 205379 BLAKE2B 7e069cea8b9950e7302c3568f9793664cfe7c0c1264b552930c4876f4d0d5365744a5098eed1670fec1b8f595a22c593d4cfa6d67c1fb24dba57adba2245e778 SHA512 00afbae051f41af4efe229cf2851a923c7e9570e24e8b1a01d5e395f9abfaabce590e9998e185391c38970faaba6911a1a6139e2851a5bed2b4a20c27c352a2c
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.zip 237135 BLAKE2B 9e8ab4f0dc1539b578ad21a2b74bb5a64460912bdd1f8508a390d7c4790d4482a02993e31ab2c94572b9e68d86b8d50beea52e17c777301e2c1c7562afabacac SHA512 dde9012abcc21ee5ac43b962a0e55693d456171b4d0e71388efbc3376880dfc6973991cca66da28488f46ca5ee862b8b2c08472f26835ffa34b8c47dec5d428e
 DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.mod 258 BLAKE2B 45e0afcb6b9fd29005ea523e2576e5c5e82f62095a8abb059e7a9b13de9e23d2cd743ae15ae8bea50a07d7c172b03836eea887ca5d381f947c50a655c2cecb7b SHA512 65f7f3695c82e7039187709df388db8049aff76aae334427e78cf224cce118835df370b4d59430fa87f652fb1f6980a92586a081e32c866159d42dd5ede26a70
 DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip 232475 BLAKE2B 25d425cf72f811b9dc03c023e401dc78094366d223f48c5d751a006fb494d595e1c1014afc4292843368b9e93e4e2aecf5f6a77b19d7f4fd92bbe3b253d6f599 SHA512 46d27a762b8d27799904150ed77755a530be4e8eb47c61ab63c545915c682765b5adf885af9911004a7015a821eb86d7ba2b81188f3cc3031855e784d72b6964
-DIST github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod 29 BLAKE2B 5a64bc6a74e308dc780f55617c18661ee4a570f5c536a1d8470ae197f5bde87ba88412e360585c3e7191289a2c478ec7c96c18cdd7ab9e10fc92cb8b098281b0 SHA512 54b48a0f515bb99c21f86f0cc9dfe9e06dff5bf8de3a453b1d91816e28d04fe64a52d01c2c5a651b51cf21d328fba8f97a3cba92e23d66e229034f8aed23a545
-DIST github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip 54143 BLAKE2B b408a5d554b816351ce754904755e90525b4bf74b7e529d0dd378fa8eae70a64677cae34f1efa9477d865fa752fd88ee9d1e5d420608e03078ed0f7d1aaaab4b SHA512 b06876629d4ff5d9145a1608ea513baa72b04087dd8ef5e4ae1ea611480770bb041be9b84d19a66855fc57596cec861e70e53660bb63c9385b0e72462fe913da
 DIST github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod 37 BLAKE2B 9945435440e0d3be57cdb12cab697382fe91c56329289bbde332bbd1fd15928a5101d7fcadd89064ecbd103130514a1cad383db097d02d596138fad0348c15d0 SHA512 7f46d39bc8f24a5c5c1ff513c0f0018d5341a008526a49bf0b3694008c272b3080b0386a44ba6c27f2894bef19dfbec5095c9189ed222ed5a55797788668315e
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
-DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip 41533 BLAKE2B d48cd9a1b2cc78151c663390ee002dbf4049f4c36def23a75152fc58d4cbd0f629620c5e9e0c624ac4775ace1a4a531ef5b42fd908681f4c90bbe6bc5f2c1241 SHA512 b59eadbaea21ad46cdb61df84d6774549eb0c885cc4dad073643ba896c9fb2a07d4e5cdb3baef1a37ec88242ceda745c6583961db12aace7c26c3bc951be789e
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
-DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
-DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod 41 BLAKE2B aeccb766735cab34f6559537127886e3227273ec40f78cb289b852430e5cb967e2b3b8a798dd20ab0d1c8481c62d25976a76831092bc114cc6c04214ce7ab081 SHA512 8ce1457d8f4e3cd2d997306844a157198039ae5feb9132f22d5768c1de32800469f682d33a8c3c455f7728332136f376858c23bf00da180a53f9d32d4e4ef291
 DIST github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod 41 BLAKE2B 5d4d27e0f2c2a03d5ea5a22e208ac33d9a4eba122ac4ca95618d2c3681e63540907800a6e6e28bab54c720e88a4454440a23c0911e1c86855f67b67128f5e011 SHA512 a887a2c822f38592ebd66fdcb2c13a3c2f3a7c3de53eba3c0cff66106dd287332c2d0287ffa4c1b386f1fc008047152e79820bd56d64864a7941d10a91bb4019
 DIST github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip 711899 BLAKE2B 59e7ab12479e515512a2d7a9f20cdbe0b490f6bff444d0856d4d3432698762ef0537933461c88de17a3a844702e5b63cbad7493ac9f58af30f968b008b38ed35 SHA512 906a0e32262d50a20ff827163fa91ebad2b4a1af3ae90625532630fe66c6ddfefc6dfefb2a399be3f511db8da305280e65d6d0cc901483ca1448724150d20964
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
@@ -625,9 +539,7 @@ DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
@@ -639,7 +551,6 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.m
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
@@ -677,16 +588,13 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod 88 BL
 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-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
 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-20191106202628-ed6320f186d4.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip 1845086 BLAKE2B 967aa93280eeac0b9ce3e269d135ee547cbcf007d6411e94eb8b7a6b32dbec501fef102f908e977c670e57c60672b0fc91ea16d17d106cc526d91ddf4427897e SHA512 86b0caeffaa24b588f4439370b3b5b2bb087c9a76e409dfdef278d42a2f21d57aa8ee019353b75178f72441339eb796cacaec5706f9bc73e820743137ab531b8
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip 1867651 BLAKE2B 7e9654d95bf03c5462d4d6420e676bd4a0e8769c5cb7954797a66c89298ed16063581391294b7c3e7c1e735ba0cfe3b60e899fbd2821b98179b2669740271a68 SHA512 a0560b1c03857faee4e6f6d959d042258f30bea2bb86af07c701a21c7a6d7e44a8929acd3e42503daed070c3597abede768af32814e252441f85823f330e573f
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip 1876176 BLAKE2B 84ea067e58783d36780037272d669162fce90fac23d5bb6090898e14ed6753ebd4bafc001b3e3ec792a29a2a802d57763a365a3f89f1acfc37f18e320aee42e6 SHA512 1a94d4b9e787a0f322cf9ee223c3b01d8dbd34b59381330808d2682ae05de0cdad62c31e085c554033e852bc5fe49d789993a668a2d75bd7eb8b2389ac774e65
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.zip 1876107 BLAKE2B 26a90e5dcfe05fac82496bac10442319680f5ab9f7f8e0f48f3994b677d2187f9cf735bb7da92ec74ce280f5c4bbf24893aefe4c859137c198118a3ebfc5557e SHA512 fd50b978909b5b2259da0cc5d4db8fe582b003f4b9c2e387a9491f2648521475c640a21a80d375ba006f0892595cd14c4e1c130a31e7da5a2cbd8b8673feec87
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod 247 BLAKE2B 66c7bddf0c6300cb14884379a13eacf7ce4cbd1e86cdd94fbef5f67bbb27e263ecd4cc2c936b7f95751b7afadee561629014be9d997159c742be2e5ce7bf099d SHA512 36d6474a79deda7b8749681b46e682e0440d07b3e8930279c66a45c0d42a6f2c6dd75b7bc7c3cc1ef50cdeff988442630af904ff0f58bb2def5f49040ade16cc
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip 1874670 BLAKE2B 15ddedd5ae7c1f4f279502fc220fed70155caf23a21b9a79c2bae6eafded5ef966b07b2c4e2748735017fa1e312062052c291ac2862adf5e1b7f9b110f9b6508 SHA512 6494794aff8498860f5af522d4a4921278c6aed6e7ce6bef3c8cfeabfb78810e932b66d47746a2bd416c538d5a277ccb82cab45a479b37fd0484dbe44cc78825
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
@@ -715,20 +623,15 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip 1423356 BLAKE2B 412d4c362e9d11899790082861e26002ed0fe500b4d5d0b9caa1a00ee9363337d1e47cdc6a232d858d00ff10da2b581c000d20208539098a8fe1f83d012fb00e SHA512 dbd74ce99432faf080dc0980624adfea31cd74d53949a4b747e14d6464632c48e78c40a1b862305bb5650cfb1b202f2c024f44f9ffdcc104555e9f42b4eae30f
 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-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.zip 1503269 BLAKE2B afc7425e8a2354a2ea7de4b9e007d7091796edc22fe2783f2ec1cac2d0554d87aafbcf49fb838b1ae4f0193f936fc4cbb87fad4ceb4e5cf4e2b020b73db7c648 SHA512 66fe99252beeb16a4a8b3e37da32343955f1727043bde2ab9e5797d1e6b65b85c97292b43ba0f19587e03e02d6bffa7b8cb0986ebb714e992b9d91571dfdfa6b
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip 1505530 BLAKE2B b26f3f943953ecb17996f44c0e8278b56c7d01648227cc0b73cbb17e9fc44b40bbbac34ac4996fb88115a6451178d3c94f4c17a43cedd30f9c147312fd7e04ce SHA512 7b36db6f767f03d0a14ee599c6d1bcc7cf5cb8df69b9dd46d7544aac59ff6aa1bdf38af0f3f31328f02b7643f7655b375f8116f829b22993ae49951ab28cbef9
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.mod 179 BLAKE2B 1d41797e9cd238f294cd4d01f3115a496d72952d4aa92116e99de7fef6d5881b8e532e4c419c36dbd58a04e4cfd27c814936e5b51ca99f47c9bee8578eb9d71e SHA512 ea5604f4e47cf196e4ab474016327b04c27aab3ef394d19f15a0a34d763f659c1764dea0554de8afbc9ec28168681f1ea1e03a6ef64fc1355f0e0d7c4ef709a1
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.zip 1565732 BLAKE2B b9900aab23b1d046cbe8cfd1743c7759b3f3f9f4b949c31aa21c372200ecb9b1203e6b5a87190b78946e9f7679692d2fb2dae629ce364e7f39d3ebec8472960f SHA512 c91659717675053c6ba6cd022cd62ddc905cdfc61e271396c93fccad8063605399539c4b7695713a45a6e2e42c74a2e36e1bf7c992e84140da6835fc2209f4fc
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 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-20180821212333-d2e6202438be.zip 81780 BLAKE2B 48e9b7ec89ad3f9cec88fe6c62ce64348a9217a134aab7306a07fd8cb28eeff91b15cf6f59ffec36df23a086195322f28e76fc16c026f33d2f419dcd3f84de04 SHA512 c7656f3c10140a5cb08620ce0647d0b2026272ec41bcd9df346dd2b5de5bd2236835ea117091646151a991f8f3aeeebd0cdfc1f784015d140162db5dc49f7325
 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
@@ -737,9 +640,7 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip 27020 BLAKE2B 0ba91b5129426896f009357980019a5e1c4cd5568108e615346a2d65421a6a595035069e6366d98af40260a020f90f6b55214e273a7dc92a80d3faee540bc0d0 SHA512 a9408e27c31248e5e6b24c0f255512c97e73e0a972a94e0bf0b0181eae42c1213e02e6988a71178abb05c2624da2e6b7beb12f2a494b630753a083dc3133b58d
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
@@ -769,14 +670,12 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip 1914030 BLAKE2B 7c223aa748649c75cfd8e921bcb10cdae7b52fd8d9096c7a5a0b0a167a307a4813e7b0976647e2d70c658f1a75e9821f78f0969c9ef73da3d498d6755d504f2f SHA512 43ed7210474ffec7b4f9a0dc29e9f4ae5f2ab6ecc5b9f02ed28d9751d8f11e3cc27700e5b0838a76f450d9bfe074d56176d5140daa3f3d40b287695ebd3dec18
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.zip 1490646 BLAKE2B 5114099217e143e032f735ca97dec7aa76515d49d08fdc2058612f1d8aaa0d4500c077c9df6521e94b84edf50983fc146ff5363a0811d4b60aba5145ed8f036e SHA512 0e1627eaa50ccfada08460b02929f5c2c91945a4082b2f2a9c70060d40dfca25d87bc2b056380960158226ea892f5f885bb012e686ff9177d57426486df34def
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -785,22 +684,18 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip 1668274 BLAKE2B 645747d7f0335ab88c1619a25ce393c5b2b41f5f44385be6b5b46fcaafd6ddce02a43d09d9895b72f33200a97fc2fbf4ba9e1278efa4d479d676d1b968ba4b94 SHA512 ae86b110902a7b6aca121458220b84077d1ee17666b5e89ecd3e7e5bfb6a1cc1ec5d062078426b108aaeb3eb5fed6b9cdcf5cf25c333aecbcc2288dff9d23a74
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip 23281 BLAKE2B b2fedb31c347f2b5b8bc3c0311f5078ab84359736379206227bd7ad4378cffb67f39cf078707a7095ecfac3c243bbac54b64cf41375a4261fbc9af9887d134de SHA512 267fab133c0ae306a1f484d17a9c3bc7bafb1ae77df3412ea4047de34a940b6425524a93b7b41d010cbf32160482fa3a370f93654e4ff73b6d11e45463bc185a
 DIST golang.org%2Fx%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.1-0.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip 11992 BLAKE2B f5b83bee24babf643a85b1ad338c9cda760634c279e495f2faae96138854cf433abd98552ecf7e4fb815bce96f38a8cb2601dcca0966f244d6e55e9622a95542 SHA512 3b325af08ffac024bf39a06676e4daf051b82bc765803224fd14c3251b87c5d4376269eb4ad6f2a511b72e065b062bc41823400cde602013cc1d3e687509f85c
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip 12009 BLAKE2B 62af63a123635afd495a0e621ed365f31b284aba1f891d09f4334d63d46a5dc0387aa055901e6e74bf358e1757ae91ed8515d3e2c9b9388f7f356841eb6543ab SHA512 a1727535cbe56fd9c94619ef7821c06d1b2f2cc386a839451aec9b1d101118b0f1e64ee78e7aaa72660f9a780e1c74e0fed3f07bc8f8b4dae9f7bcab4323ea01
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -815,7 +710,6 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BL
 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-20190907020128-2ca718005c18.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.zip 2908944 BLAKE2B ed5521ac56f8fb0bdd6404dcbdf90bb0281367b3afe1075784e09681a9a2e24bfdca192b77ac0870f50df900b3fb3e3116cce6ad109f75f4fe0286c820c46cf3 SHA512 8cb13d39ad71c10de694ae288d5c2374426e8b674d6968b02da1fec13d2c7637bc105d2ab509acdd856c747ab8c804fb5fd2a1ccdbc73def16dfc568ef1732e5
 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-20200513154647-78b527d18275.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip 3126124 BLAKE2B 9e774521f22e4aee369dd03497702dd04dc6a83fb2e94d49428281d99892e8b7cad13c840231d721b0f338fdcc930812b374b5e4eb9db96e5fd8d81239252826 SHA512 b009aa0668073fa9872f10bd5a6ae95d55ea2b9187b074d21bac30fbdf587e574e24b75e491124973185a62a8de725a742d0524c0509b237ff4b6a51f4f5bb23
@@ -823,21 +717,16 @@ DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 B
 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-20180829000535-087779f1d2c9.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
-DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip 10163656 BLAKE2B 5bc64691f0fea7b5457b2f1e27257fc52e6393169e3965beb422e15ab293d50bc1d49ff40a8552249182f00af6cc91851729e388ca30d1ac1367cbbd64874ab7 SHA512 3b6c2b3e08efdaba51ec595726141a0dffc3a07df10930aab028cd16055b71a3a89dbd070c55e09d87c32eb46b0b4e405c560571f514e1bb743d116164b2a546
 DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
 DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
 DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip 13193468 BLAKE2B 26449251871cda35dedc488c3c8c8fc4dc14b1bf79dfa5160b44e6890d5b350111277b1791b18d91a42bd91b6f382baf3caf62584e41c4a928afe17d564e2e6a SHA512 85d4096a7d867d8f4bcc1b3cc582512d94c626023d8abd20ca343009e62b600150076f161f3582ec88c6263695fec0c11de69290a6c6cd04a177272740132be8
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 408151 BLAKE2B 9f815084675da034d639cf3e8648ee5dd2d1282d2bb6937ffc91956b5cfa46809499441a39636e4f0565c4307854977201ecc8cfaf38b46557c3e715cef0722e SHA512 1eeb760cf1057c306f2301ef4c7065cdd6dc18cdeefefd3a1cc8cc22efa312ee5ba7da6b79a4e7666bc09429d1ca73d7bc1db574f9cd33d271a72700a070a219
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip 417366 BLAKE2B 71895742e5a6ad69c7b0db979f725e0171b6df432633912dfda6f367510b0b4d5a2b41d94c7a8eecdbb4de90d2e92818d7f6dc1ba99e41ba54184d39134513b9 SHA512 263419180987380202def791006a59739446ed956bef6314ea378cb6da54079967ddcecf031080295e66755b7312f76795b0f74b876e4928700b877fe1e1e9de
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip 6533885 BLAKE2B 194748b0fc9279db95843c40fb88495765086b0aa42472c3952ca9b58e1c5ec1b90654e63ecd308a474d8afb846c9fc233a7f298b7c53efc5e48453409878e80 SHA512 676aa55eade0c609837f446ca93b9b823cb0943ccfff344808f7a2b2e4a0d7c8d34674d7b218d6a5fde6d98be5d8ca4a3f6e4476c69c2e9df3a22c8c662a1414
 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
@@ -849,31 +738,23 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.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.0.zip 1053293 BLAKE2B e4e5c8bae0f39f767f6540659b58a82def27b93eb1bcc9eddd77e9a009af2a40b412e38200633410860ef5e6d02e9f180be190ca0f7d2d44fb687a8027babfe1 SHA512 aa3b29dcb253ff9b89819d888b176378cf62a386e99800395a5ca54b03d152ffb3e591f78954bf241037c6a55497317d089c50c971a342d4c821e93495b9ac50
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip 1000340 BLAKE2B dfc5083cf762cd6df1ab2d43d6d45225db97754ec1c165970563052be25e3655c365dc5011aa7d7b0b2b72700aa1759361155f2dcd34bd1941357fa5ac6cba49 SHA512 a13a30ca3ced87795e4e31dd43eea70f6ff42bad5795464170377a1a0e9fcd9029f5d2ffbae18dff2360f6f290bb6ea320b075626ca13a50899365f3d38dc3eb
 DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
-DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip 8866 BLAKE2B 279099b17d2f9a46f3b5e2db1e9855fb352eb840cad4c70e67b4612a6305a83d7926ed28396f0e84e27b56778b15f262ec497a835f7e2327ec82d1ec9388c69d SHA512 1649454679bdb5427e34f9ed83952cc509369ca04ee3776beff20096589bbe4d24bd6f6121c816ad4b9563da6fb0c0e4ddc873196160b42da6c07a204b21d43c
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
-DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod 28 BLAKE2B 0fbbe5d1e239fce8fc245a0a54a09a57ba1a669a6ed93aabefe8fd333549b3309ad9e6eb15cff2f0a853d3830e6b5cd60961835b14e2dd13aad5812cca6ee04c SHA512 00151108bdaa29a2097ab78c99c93bf0ec27af203696a11bc7ba55e36d7115ad13279110c245bd3a2cc84b63bb2a8840964e3b2e1334a0d085ac1e8ec5239bad
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
-DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
 DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
-DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip 5369 BLAKE2B 348bf4892c8cba465502595b388fcec4f11024b9359f202af0cdecb00ccb28c742304361d38b663dabb0650f185100780578eb33c03207c1acec26b81ca1fdb1 SHA512 bf982d63fea6bd93f2b6be4d5bdc986d1316b6f92ee7af9b604b6f0af1dab44d09697b913a7c8ba59d5bed26296721b6cb7ad25b7a4481cf8d649c8a3e2099d8
 DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
 DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip 15882 BLAKE2B 00d4a14f02231cee71bf55946b52e491df36745bffbc58affd61d73e0266bf259bd19595364c094dda028f84838442c65be69e240f8a23aa5d83f4eb7b3d3d84 SHA512 bfd1d29d3514659d778c1ef699b23bd6b5980620992d9aba56f62bc3870cf438a7f179e9b7bfc02f398cf1ffaf13652fd9b8d1c90c0fbf2ab315bf0b02a97c2b
 DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
 DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip 2645616 BLAKE2B e128dd04ef8a6855c7c0a5dadcfec1e24402799efeb868d894f783c5554a44214fe69781652887a3d496aa1bb58766d33cdf74d106cd0004ec5e018ea078455e SHA512 4b72a2b0ad43f1b1fe1c60e0dc51d39ff04b5bf2b9a761fce22c65904961267f4c61d598b2035137cdb1e1dcce9420cb36fe8882f7cade6dbb7adb3e5795f8a9
-DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
-DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip 343284 BLAKE2B a4f4f886636b920a987942524f504c0049ca3c9d9ca5be16101109235e77e9a8a14106fee9fb2d02d403a056dcf5f42b0a4e4f57d33dbc78a88e0df5682162f8 SHA512 0b212e847ef8972bbc9dc96685c9fafcef5552e96c622134cb1aac903aa3f6f5a1aa65a2f179e93396fcf32ea4139a34f46c4e6fb3558c9da8579282095d1baa
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip 353844 BLAKE2B e4d24ee5a99951c19c32328d6eef3fd6c886338bc7189eec9e60c99fe89e5728b3f00824d0f321bbc921738a40900d8d90ab4d9879e8efee529ed4273df0c2a1 SHA512 7ec385824affaaa72aca2b5af052dc7e941a24b1712e0e1945fe6276df3b02ca9eaaf79fdc0888e398aaf10ce3b261f0d23b2c6485184e6a6587e1d04f1c8742
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
-DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
@@ -887,20 +768,12 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLA
 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 k8s.io%2Fapi%2F@v%2Fv0.0.0-20180806132203-61b11ee65332.mod 18 BLAKE2B 48d83ca0453fa02ae989399480a204d7ff4ff720824fb3d303fc5a44f3f64d688f012a63d4863e5293afb1448eb5f57a3a0d62539add4d8686a6d1efc351376a SHA512 2c0d1d009643dc254c905d3f8c547304de4497bb5550ecdb1a47f35b0c7bcda2f9b8392ced569fac88dd3074f7ed02530494c02650bb4eed4af99ddfe91a64af
-DIST k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.mod 18 BLAKE2B 48d83ca0453fa02ae989399480a204d7ff4ff720824fb3d303fc5a44f3f64d688f012a63d4863e5293afb1448eb5f57a3a0d62539add4d8686a6d1efc351376a SHA512 2c0d1d009643dc254c905d3f8c547304de4497bb5550ecdb1a47f35b0c7bcda2f9b8392ced569fac88dd3074f7ed02530494c02650bb4eed4af99ddfe91a64af
-DIST k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.zip 902131 BLAKE2B 70b4f899a4c29e438662ea53047c20426a8c76f3c7d13ff89d6c808cbaaa1d054d97533cf4daa61fd17daf869b9bfbda69832f1ef2470b484970c72a44a0a4ec SHA512 ab6e144d29bf0a83b25c158404a349ef23b66910b5b099ed85c640fdfbb051d30c32d63a34df0d0fe1f8ed153db4b34fe88078a17a5f23e254b794aec82a4a60
 DIST k8s.io%2Fapi%2F@v%2Fv0.16.9.mod 362 BLAKE2B fc4880bcadba3a5c10de2bdba9726aba1ff2b7eaec4b8a8383c372c083b9ba95dd00efca1c77dfffe5b234aa4f54f309763c26952729dfa5459ff7f8db2a76d0 SHA512 4f17e439574dad6d0a74061ece6bf0a34ea1892297fe4e7f92f1164766fd7f05ad6d70e1072dc4922cf115437fc8bba32d3340cf0efad632e6efa5d4e68d05b3
 DIST k8s.io%2Fapi%2F@v%2Fv0.16.9.zip 4367020 BLAKE2B b6ff33e2920b69d8c0b881f8f4124efcbfdd301051be8d93c9b4407ff8dd83ab52920f82ac12169de8accc588658fc68e679b22a770552c3182c74046e3e163b SHA512 6cf65f39111d7d7587aa7d725fbe150e8f5aedd63915baf29454c1db06a78920e0d43628f26deb9d1f7ea7dcfb1669d75e3da07a45e865060c39a11261a1cfb7
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20180821005732-488889b0007f.mod 27 BLAKE2B b7a39696a90ac33cefc9cc615fa6900378d705c665fd17ad605e51b9c69f684c7cb7388739787794d43067a9b4cee88d7a5e71e1a4e7f1c76e948821dd155d93 SHA512 c5682355b95ccb06e22d2ac8582b3d9dd27a42c37006dda71f320f1c86be224254881286aed98b08312f01beeedba3a385d53a341939dfbe2803b2bd5d853a2e
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod 27 BLAKE2B b7a39696a90ac33cefc9cc615fa6900378d705c665fd17ad605e51b9c69f684c7cb7388739787794d43067a9b4cee88d7a5e71e1a4e7f1c76e948821dd155d93 SHA512 c5682355b95ccb06e22d2ac8582b3d9dd27a42c37006dda71f320f1c86be224254881286aed98b08312f01beeedba3a385d53a341939dfbe2803b2bd5d853a2e
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip 707954 BLAKE2B cddd4883d55c346b4e0a8d3050a71cc2c5f95879078ed3fda79f7e633ad8304c5e8401529a9e3d4b0432419fe0f64e9fe2f5bfe23f708ad93671968a24cfa195 SHA512 0caa23d1e454060521384eac7d5cf8b50c023060621bedac8e0c0a2804629adf535eceec2ca79e15781648c95e495573da18f016ae4567d48d77aeca66949ca2
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod 1469 BLAKE2B c9a0fbcf4ebc74f5fcfc77deffc5420146e98db93c87eec324ec6908ae8a3e65077e89bb810ca565f3ad46e438b440c031716784fc28100adf0319b49ef30060 SHA512 8ef8130cf7e43e089f1d164ca5de542dabc895bb57416486323ce4ef585069573fac83db26c5f7e40e241d39a5194bbab6558e50b94ea8b73c5f55c1d07bfe93
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip 757801 BLAKE2B a44110fadd2917522090f95d6e9166a9fc6edd9423f7d801751ee7106f73132cf9552ac0860526a1649ac22343e6c0a2ebac0b8bd7b28d41683c92aca6bb7be4 SHA512 1cd5cd08a972fb6f09e3756bc74e550591c1b98a7af8aa6885bc15f4da97a97ee95e7ed301ff3d8ae5e6155373ac8ee02d60cc57e8d0db0512a4d76436428284
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod 1431 BLAKE2B 9d7661e0466f40f35147aa9791042ed82f6a204e30a9a3ef13d141d0845343813a7a4cad97698b66317392f6d04132eddf5a9d90cbac3f9bb2a2ba9221ac1d4d SHA512 69c014b3f957982624c56ed0286cff303d3401cdee7e64ed96a8c47fa366a32d2a08c8f80ec1662a0b45456fc3a96eff2b37daf6ad141635c84d4e06a5382a9a
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip 1542153 BLAKE2B 0af48f81be355f7df53fc099a9a1ff9ff9addabaa31f361d63e3fe87eeae3d1fad34c20a5110e79448014ac1c0e522266d9c19de510902a3e2bd9994a6cd9b5e SHA512 839b2f007dc67cae4fa4ed43bb80adef88a16a2a8726c605d0e6d2b050b22de94bc3ad9318183d951be601cc41a7a7b09c250eba8cfedb927352865c7ca7a5e8
-DIST k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod 24 BLAKE2B e7c6a4736834c042c1326573259f9b789da58f8c53cf0f36b47086b94fa9f5a94ad9b36baa17f7c437218eca6ac6293e4ff1e50378f27e94ef609ff249520261 SHA512 ec86bdb5262590a5169f49362588e90e95a0874fbf2bd670ea27dac7d883be2d7f56e8277336d7ead06f9068ea43375c8fc6f055e1322fc8f802550c927e6d85
-DIST k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip 1299988 BLAKE2B 326b691a1fafec6307354fec0fd2883dd5713e1a3e236d58f3c0dead4afbe7a28268cd25cc5169e09df8c77501b5e0a7593fe27c6c3f7fb8038a668b4bb66121 SHA512 b6b7a2d6615e36848f0b5094aa160014f193c54e8f9eac7d640e5b96ed4bc0ff5abd726c360191e0393b71eff8db549a26897d9a951f03d866d30018b7f7e683
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.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
@@ -912,8 +785,7 @@ DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip 94436 BLAKE2B
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
-EBUILD consul-1.7.11.ebuild 28790 BLAKE2B 05f60bbebcfdb68ed3160d80e7fa802d640e4a677969d4cdb88779ce77e79ee87bceadb0a91d243d1f802b230d88bf637afeaf4922a05735d5d24981f4e59322 SHA512 3ee2e21eb3b27ddd87638f1cfc3bb338d2ebbeab227afb0c7f12640319d6f5bb3b86ea990c3505ff93be2b2d7d6ee5e7eae9070c1a980ae9bcbd909606bd17f3
-EBUILD consul-1.7.14.ebuild 29009 BLAKE2B 7dc403bc996c74f9410e93c232184ede6597ce96d661565e154662b7b8122cda05f80c2107902b520923d380f906059d572c3580503543054f1bc405c452e3ff SHA512 9d57c1a8881c45878eea17216d6c464e8f6fc578c029a8d99fb7fc43a96645200a70132527b9dbf7dd437e3bc780f2d8dc75b0faf013b874852e776ca725e1ee
-EBUILD consul-1.8.12.ebuild 40523 BLAKE2B 255501b6f1c80ab7ffd79f3774c26574b380277daed7b0c5bcc7f9a60595e1c80d370b699b0ef407581605740eafb8af012e737d16d3b2892a69873d7ecbae45 SHA512 6a47400a7766fc530b97ee8c7354bfe2393fe4fe2dac3fe29fa1baa1aee8bd5ae24b72727281980e88aab4158171f05a09cfff7319c864f27dd66c91a15b2ab5
-EBUILD consul-1.9.6.ebuild 39201 BLAKE2B 115ec42fa0225598b0af5c81f61abdf785672114443970d86e5321ba8485af029c07e09287555b596c4f69fe65d29b6eee4595ddb8b7e6b01fcc37c01e7a9a63 SHA512 f322e820a1ab59bdbfa95e204a32ff34678fa5dc0a5fdc83860c139577f6dea9745842848084e8d714642f9765bd4b4dee5f22aa0626d6f2cab8450429e1de96
+EBUILD consul-1.10.1.ebuild 39854 BLAKE2B f2d0decd2fcd19efe003b1be8a4cfad28a1d64d5cce647c2d85272fde139de19340f9ef70b53b39ecd20bc8ff64c87f2e0ea35e36a231aacc433f463c099f1f5 SHA512 a4cb4aa94796b58609cb74197692434a806daa10476ce0430fba3c925584e02cd97ba2f951c2d37eef5e7b09502691da440495647d8e18850fff8276d065e15d
+EBUILD consul-1.8.14.ebuild 39078 BLAKE2B 054608083ee15cd97dafe041476598d2177d9f9d2f9a6098e08814882a4da8d5305ddd08e333ac6f84601deb582bf675ffed79d79e97da564de58014c12c6225 SHA512 01cdfd401d898b5c2b7b957155ef485f63d3b7f626a27327803a5e8c2ab93d74467a2c10b87fb89c06845004c3a8b2d281cc3d56a83e042f18091d253ab811f2
+EBUILD consul-1.9.8.ebuild 39704 BLAKE2B 92f86e6eb064b632c50b519a097449f441e7b944d02baa4501d0090fab2076c361d2cd09efc108e2588b36a1d484d798f1e42fdcc3c838e6391c6c06f70d6eb0 SHA512 09e7966a11cb9a864b4b3e0e7b6ee7f0b8a4004f40633bdba4d8b5bd5cb9b67be5a15e6b52c5068f9e26ee5c3fb581a13c989f9e8212362c5276a6d68dc2f5b5
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.10.1.ebuild b/app-admin/consul/consul-1.10.1.ebuild
new file mode 100644
index 000000000000..fa7b8e93d7a1
--- /dev/null
+++ b/app-admin/consul/consul-1.10.1.ebuild
@@ -0,0 +1,783 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+
+# Upstream doesn't use "-mod=vendor" in their build system, and the
+# vendor directory is incomplete.
+# On the next bump, remove this if they have added "-mod=vendor"
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0"
+"cloud.google.com/go v0.38.0/go.mod"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+"github.com/Azure/go-autorest/autorest v0.10.0"
+"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.3.0"
+"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/Microsoft/go-winio v0.4.3"
+"github.com/Microsoft/go-winio v0.4.3/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.0.1"
+"github.com/NYTimes/gziphandler v1.0.1/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-metrics v0.3.0/go.mod"
+"github.com/armon/go-metrics v0.3.8"
+"github.com/armon/go-metrics v0.3.8/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/aws/aws-sdk-go v1.25.37/go.mod"
+"github.com/aws/aws-sdk-go v1.25.41"
+"github.com/aws/aws-sdk-go v1.25.41/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/boltdb/bolt v1.3.1"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
+"github.com/cockroachdb/apd v1.1.0/go.mod"
+"github.com/coredns/coredns v1.1.2"
+"github.com/coredns/coredns v1.1.2/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+"github.com/coreos/go-oidc v2.1.0+incompatible"
+"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/digitalocean/godo v1.1.1/go.mod"
+"github.com/digitalocean/godo v1.10.0"
+"github.com/digitalocean/godo v1.10.0/go.mod"
+"github.com/dimchansky/utfbom v1.1.0"
+"github.com/dimchansky/utfbom v1.1.0/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/go-connections v0.3.0"
+"github.com/docker/go-connections v0.3.0/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.5"
+"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/frankban/quicktest v1.11.0"
+"github.com/frankban/quicktest v1.11.0/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-ole/go-ole v1.2.4"
+"github.com/go-ole/go-ole v1.2.4/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/go-test/deep v1.0.2"
+"github.com/go-test/deep v1.0.2/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.5"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/snappy v0.0.1"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.2"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+"github.com/google/go-querystring v1.0.0"
+"github.com/google/go-querystring v1.0.0/go.mod"
+"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.2.0"
+"github.com/google/gofuzz v1.2.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22"
+"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+"github.com/googleapis/gnostic v0.2.0"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-bexpr v0.1.2"
+"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
+"github.com/hashicorp/go-checkpoint v0.5.0"
+"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-connlimit v0.3.0"
+"github.com/hashicorp/go-connlimit v0.3.0/go.mod"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-hclog v0.14.1"
+"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.3.0"
+"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
+"github.com/hashicorp/go-memdb v1.3.1"
+"github.com/hashicorp/go-memdb v1.3.1/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-raftchunking v0.6.1"
+"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-uuid v1.0.2"
+"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+"github.com/hashicorp/go-version v1.1.0/go.mod"
+"github.com/hashicorp/go-version v1.2.1"
+"github.com/hashicorp/go-version v1.2.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/hcl v1.0.0"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038"
+"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/mdns v1.0.4"
+"github.com/hashicorp/mdns v1.0.4/go.mod"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/memberlist v0.2.4"
+"github.com/hashicorp/memberlist v0.2.4/go.mod"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
+"github.com/hashicorp/raft v1.1.1/go.mod"
+"github.com/hashicorp/raft v1.2.0/go.mod"
+"github.com/hashicorp/raft v1.3.1"
+"github.com/hashicorp/raft v1.3.1/go.mod"
+"github.com/hashicorp/raft-autopilot v0.1.5"
+"github.com/hashicorp/raft-autopilot v0.1.5/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+"github.com/hashicorp/serf v0.9.5"
+"github.com/hashicorp/serf v0.9.5/go.mod"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce"
+"github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.6"
+"github.com/imdario/mergo v0.3.6/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.9"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/lib/pq v1.1.1/go.mod"
+"github.com/linode/linodego v0.7.1"
+"github.com/linode/linodego v0.7.1/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-runewidth v0.0.3/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/miekg/dns v1.1.41"
+"github.com/miekg/dns v1.1.41/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/cli v1.1.0"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/copystructure v1.0.0"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.14.0"
+"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.2/go.mod"
+"github.com/mitchellh/mapstructure v1.4.1-0.20210112042008-8ebf2d61a8b4"
+"github.com/mitchellh/mapstructure v1.4.1-0.20210112042008-8ebf2d61a8b4/go.mod"
+"github.com/mitchellh/pointerstructure v1.0.0"
+"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.1"
+"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/patrickmn/go-cache v2.1.0+incompatible"
+"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.9.1"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rboyer/safeio v0.2.1"
+"github.com/rboyer/safeio v0.2.1/go.mod"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rs/zerolog v1.4.0/go.mod"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/shirou/gopsutil/v3 v3.20.10"
+"github.com/shirou/gopsutil/v3 v3.20.10/go.mod"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.1/go.mod"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.5/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.3.2/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.6.1"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+"github.com/vmware/govmomi v0.18.0"
+"github.com/vmware/govmomi v0.18.0/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0"
+"go.opencensus.io v0.22.0/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/goleak v1.1.10"
+"go.uber.org/goleak v1.1.10/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a"
+"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/mod v0.2.0"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1"
+"golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
+"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44"
+"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/text v0.3.6"
+"golang.org/x/text v0.3.6/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275/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.4.0/go.mod"
+"google.golang.org/api v0.9.0"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.0"
+"google.golang.org/appengine v1.6.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.22.0/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.25.1"
+"google.golang.org/grpc v1.25.1/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/resty.v1 v1.12.0"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"k8s.io/api v0.16.9"
+"k8s.io/api v0.16.9/go.mod"
+"k8s.io/apimachinery v0.16.9"
+"k8s.io/apimachinery v0.16.9/go.mod"
+"k8s.io/client-go v0.16.9"
+"k8s.io/client-go v0.16.9/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+"sigs.k8s.io/yaml v1.1.0"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+	local git_commit
+	git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go)
+	git_commit=${git_commit#*\"}
+	git_commit=${git_commit%\"*}
+	[[ ${git_commit} ]] || die "failed to determine gitCommit"
+
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${git_commit}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-1.7.11.ebuild b/app-admin/consul/consul-1.7.11.ebuild
deleted file mode 100644
index a9f380bdcbd1..000000000000
--- a/app-admin/consul/consul-1.7.11.ebuild
+++ /dev/null
@@ -1,581 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-GIT_COMMIT=5ed69b69a
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-
-# Upstream doesn't use "-mod=vendor" in their build system, and the
-# vendor directory is incomplete.
-# On the next bump, remove this if they have added "-mod=vendor"
-EGO_SUM=(
-"cloud.google.com/go v0.26.0"
-"cloud.google.com/go v0.26.0/go.mod"
-"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible"
-"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible/go.mod"
-"github.com/Azure/go-autorest v10.7.0+incompatible/go.mod"
-"github.com/Azure/go-autorest v10.15.3+incompatible"
-"github.com/Azure/go-autorest v10.15.3+incompatible/go.mod"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/DataDog/datadog-go v2.2.0+incompatible"
-"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-"github.com/DataDog/datadog-go v3.2.0+incompatible"
-"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
-"github.com/Microsoft/go-winio v0.4.3"
-"github.com/Microsoft/go-winio v0.4.3/go.mod"
-"github.com/NYTimes/gziphandler v1.0.1"
-"github.com/NYTimes/gziphandler v1.0.1/go.mod"
-"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
-"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
-"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
-"github.com/armon/go-metrics v0.3.4"
-"github.com/armon/go-metrics v0.3.4/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-"github.com/armon/go-radix v1.0.0"
-"github.com/armon/go-radix v1.0.0/go.mod"
-"github.com/aws/aws-sdk-go v1.25.41"
-"github.com/aws/aws-sdk-go v1.25.41/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/bgentry/speakeasy v0.1.0"
-"github.com/bgentry/speakeasy v0.1.0/go.mod"
-"github.com/boltdb/bolt v1.3.1"
-"github.com/boltdb/bolt v1.3.1/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-"github.com/circonus-labs/circonusllhist v0.1.3"
-"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
-"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
-"github.com/coredns/coredns v1.1.2"
-"github.com/coredns/coredns v1.1.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/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-"github.com/digitalocean/godo v1.1.1"
-"github.com/digitalocean/godo v1.1.1/go.mod"
-"github.com/digitalocean/godo v1.10.0"
-"github.com/digitalocean/godo v1.10.0/go.mod"
-"github.com/dimchansky/utfbom v1.1.0"
-"github.com/dimchansky/utfbom v1.1.0/go.mod"
-"github.com/dnaeon/go-vcr v1.0.1"
-"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-"github.com/docker/go-connections v0.3.0"
-"github.com/docker/go-connections v0.3.0/go.mod"
-"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
-"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.5"
-"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/fatih/color v1.7.0"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/fatih/color v1.9.0"
-"github.com/fatih/color v1.9.0/go.mod"
-"github.com/fatih/structs v1.1.0/go.mod"
-"github.com/fsnotify/fsnotify v1.4.7"
-"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-"github.com/ghodss/yaml v1.0.0"
-"github.com/ghodss/yaml v1.0.0/go.mod"
-"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-ldap/ldap v3.0.2+incompatible"
-"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-ole/go-ole v1.2.1"
-"github.com/go-ole/go-ole v1.2.1/go.mod"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
-"github.com/go-test/deep v1.0.2"
-"github.com/go-test/deep v1.0.2/go.mod"
-"github.com/gogo/protobuf v1.1.1"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/gogo/protobuf v1.2.1"
-"github.com/gogo/protobuf v1.2.1/go.mod"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-"github.com/golang/mock v1.1.1"
-"github.com/golang/mock v1.1.1/go.mod"
-"github.com/golang/protobuf v1.2.0"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/snappy v0.0.1"
-"github.com/golang/snappy v0.0.1/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/google/go-cmp v0.2.0"
-"github.com/google/go-cmp v0.2.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/go-querystring v0.0.0-20170111101155-53e6ce116135"
-"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
-"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf"
-"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
-"github.com/google/gofuzz v1.0.0"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/googleapis/gnostic v0.2.0"
-"github.com/googleapis/gnostic v0.2.0/go.mod"
-"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca"
-"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca/go.mod"
-"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c"
-"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-"github.com/hashicorp/errwrap v1.0.0"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/go-bexpr v0.1.2"
-"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
-"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
-"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.1"
-"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-"github.com/hashicorp/go-connlimit v0.2.0"
-"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
-"github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2"
-"github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2/go.mod"
-"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-"github.com/hashicorp/go-hclog v0.8.0/go.mod"
-"github.com/hashicorp/go-hclog v0.9.1"
-"github.com/hashicorp/go-hclog v0.9.1/go.mod"
-"github.com/hashicorp/go-hclog v0.12.0"
-"github.com/hashicorp/go-hclog v0.12.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.0.0"
-"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.1.0"
-"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.2.0"
-"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
-"github.com/hashicorp/go-memdb v1.0.3"
-"github.com/hashicorp/go-memdb v1.0.3/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.5"
-"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-"github.com/hashicorp/go-multierror v1.0.0"
-"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-"github.com/hashicorp/go-multierror v1.1.0"
-"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-"github.com/hashicorp/go-raftchunking v0.6.1"
-"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.5.4"
-"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.2"
-"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.2"
-"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
-"github.com/hashicorp/go-syslog v1.0.0"
-"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.1"
-"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-"github.com/hashicorp/go-version v1.1.0"
-"github.com/hashicorp/go-version v1.1.0/go.mod"
-"github.com/hashicorp/go.net v0.0.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.1"
-"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.4"
-"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-"github.com/hashicorp/hcl v1.0.0"
-"github.com/hashicorp/hcl v1.0.0/go.mod"
-"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
-"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
-"github.com/hashicorp/logutils v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.1"
-"github.com/hashicorp/mdns v1.0.1/go.mod"
-"github.com/hashicorp/memberlist v0.2.2"
-"github.com/hashicorp/memberlist v0.2.2/go.mod"
-"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
-"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
-"github.com/hashicorp/raft v1.1.1/go.mod"
-"github.com/hashicorp/raft v1.1.2"
-"github.com/hashicorp/raft v1.1.2/go.mod"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-"github.com/hashicorp/serf v0.9.3"
-"github.com/hashicorp/serf v0.9.3/go.mod"
-"github.com/hashicorp/vault/api v1.0.4"
-"github.com/hashicorp/vault/api v1.0.4/go.mod"
-"github.com/hashicorp/vault/sdk v0.1.13"
-"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-"github.com/hpcloud/tail v1.0.0"
-"github.com/hpcloud/tail v1.0.0/go.mod"
-"github.com/imdario/mergo v0.3.6"
-"github.com/imdario/mergo v0.3.6/go.mod"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62"
-"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
-"github.com/json-iterator/go v1.1.5"
-"github.com/json-iterator/go v1.1.5/go.mod"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.9"
-"github.com/json-iterator/go v1.1.9/go.mod"
-"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/kisielk/errcheck v1.1.0/go.mod"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pretty v0.2.0"
-"github.com/kr/pretty v0.2.0/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/text v0.1.0"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
-"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
-"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
-"github.com/likexian/gokit v0.20.16/go.mod"
-"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
-"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
-"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
-"github.com/linode/linodego v0.7.1"
-"github.com/linode/linodego v0.7.1/go.mod"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-colorable v0.1.4/go.mod"
-"github.com/mattn/go-colorable v0.1.6"
-"github.com/mattn/go-colorable v0.1.6/go.mod"
-"github.com/mattn/go-isatty v0.0.3/go.mod"
-"github.com/mattn/go-isatty v0.0.8/go.mod"
-"github.com/mattn/go-isatty v0.0.10/go.mod"
-"github.com/mattn/go-isatty v0.0.11/go.mod"
-"github.com/mattn/go-isatty v0.0.12"
-"github.com/mattn/go-isatty v0.0.12/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/miekg/dns v1.0.14/go.mod"
-"github.com/miekg/dns v1.1.26"
-"github.com/miekg/dns v1.1.26/go.mod"
-"github.com/mitchellh/cli v1.0.0/go.mod"
-"github.com/mitchellh/cli v1.1.0"
-"github.com/mitchellh/cli v1.1.0/go.mod"
-"github.com/mitchellh/copystructure v1.0.0"
-"github.com/mitchellh/copystructure v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.1.0"
-"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.0"
-"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.3"
-"github.com/mitchellh/go-testing-interface v1.0.3/go.mod"
-"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
-"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-"github.com/mitchellh/mapstructure v1.2.3"
-"github.com/mitchellh/mapstructure v1.2.3/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.1"
-"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
-"github.com/oklog/run v1.0.0/go.mod"
-"github.com/onsi/ginkgo v1.6.0"
-"github.com/onsi/ginkgo v1.6.0/go.mod"
-"github.com/onsi/gomega v1.4.1/go.mod"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-"github.com/pascaldekloe/goe v0.1.0"
-"github.com/pascaldekloe/goe v0.1.0/go.mod"
-"github.com/peterbourgon/diskv v2.0.1+incompatible"
-"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.0.5+incompatible"
-"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"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/posener/complete v1.1.1/go.mod"
-"github.com/posener/complete v1.2.3"
-"github.com/posener/complete v1.2.3/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v0.9.2"
-"github.com/prometheus/client_golang v0.9.2/go.mod"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.4.0"
-"github.com/prometheus/client_golang v1.4.0/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275"
-"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.9.1"
-"github.com/prometheus/common v0.9.1/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a"
-"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.0.8"
-"github.com/prometheus/procfs v0.0.8/go.mod"
-"github.com/rboyer/safeio v0.2.1"
-"github.com/rboyer/safeio v0.2.1/go.mod"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
-"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-"github.com/ryanuber/columnize v2.1.0+incompatible"
-"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
-"github.com/ryanuber/go-glob v1.0.0"
-"github.com/ryanuber/go-glob v1.0.0/go.mod"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880"
-"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod"
-"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
-"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
-"github.com/sirupsen/logrus v1.0.6"
-"github.com/sirupsen/logrus v1.0.6/go.mod"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.2"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf/go.mod"
-"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
-"github.com/spf13/pflag v1.0.2/go.mod"
-"github.com/spf13/pflag v1.0.3"
-"github.com/spf13/pflag v1.0.3/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
-"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-"github.com/vmware/govmomi v0.18.0"
-"github.com/vmware/govmomi v0.18.0/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
-"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4"
-"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4/go.mod"
-"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20190923162816-aa69164e4478"
-"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-"golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-"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-20180823144017-11551d06cbcc/go.mod"
-"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
-"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
-"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
-"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-"golang.org/x/text v0.3.2"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
-"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9"
-"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod"
-"google.golang.org/appengine v1.1.0/go.mod"
-"google.golang.org/appengine v1.4.0"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107"
-"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-"google.golang.org/grpc v1.14.0/go.mod"
-"google.golang.org/grpc v1.19.0/go.mod"
-"google.golang.org/grpc v1.22.0/go.mod"
-"google.golang.org/grpc v1.23.0"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.25.1"
-"google.golang.org/grpc v1.25.1/go.mod"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/fsnotify.v1 v1.4.7"
-"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-"gopkg.in/inf.v0 v0.9.1"
-"gopkg.in/inf.v0 v0.9.1/go.mod"
-"gopkg.in/resty.v1 v1.12.0"
-"gopkg.in/resty.v1 v1.12.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.3.1"
-"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.2.8"
-"gopkg.in/yaml.v2 v2.2.8/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-"k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod"
-"k8s.io/api v0.0.0-20190325185214-7544f9db76f6"
-"k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod"
-"k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod"
-"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841"
-"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod"
-"k8s.io/client-go v8.0.0+incompatible"
-"k8s.io/client-go v8.0.0+incompatible/go.mod"
-)
-go-module_set_globals
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="amd64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.7.14.ebuild b/app-admin/consul/consul-1.7.14.ebuild
deleted file mode 100644
index a61c40aeee1e..000000000000
--- a/app-admin/consul/consul-1.7.14.ebuild
+++ /dev/null
@@ -1,586 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-
-# Upstream doesn't use "-mod=vendor" in their build system, and the
-# vendor directory is incomplete.
-# On the next bump, remove this if they have added "-mod=vendor"
-EGO_SUM=(
-"cloud.google.com/go v0.26.0"
-"cloud.google.com/go v0.26.0/go.mod"
-"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible"
-"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible/go.mod"
-"github.com/Azure/go-autorest v10.7.0+incompatible/go.mod"
-"github.com/Azure/go-autorest v10.15.3+incompatible"
-"github.com/Azure/go-autorest v10.15.3+incompatible/go.mod"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/DataDog/datadog-go v2.2.0+incompatible"
-"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-"github.com/DataDog/datadog-go v3.2.0+incompatible"
-"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
-"github.com/Microsoft/go-winio v0.4.3"
-"github.com/Microsoft/go-winio v0.4.3/go.mod"
-"github.com/NYTimes/gziphandler v1.0.1"
-"github.com/NYTimes/gziphandler v1.0.1/go.mod"
-"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
-"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
-"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
-"github.com/armon/go-metrics v0.3.4"
-"github.com/armon/go-metrics v0.3.4/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-"github.com/armon/go-radix v1.0.0"
-"github.com/armon/go-radix v1.0.0/go.mod"
-"github.com/aws/aws-sdk-go v1.25.41"
-"github.com/aws/aws-sdk-go v1.25.41/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/bgentry/speakeasy v0.1.0"
-"github.com/bgentry/speakeasy v0.1.0/go.mod"
-"github.com/boltdb/bolt v1.3.1"
-"github.com/boltdb/bolt v1.3.1/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-"github.com/circonus-labs/circonusllhist v0.1.3"
-"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
-"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
-"github.com/coredns/coredns v1.1.2"
-"github.com/coredns/coredns v1.1.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/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-"github.com/digitalocean/godo v1.1.1"
-"github.com/digitalocean/godo v1.1.1/go.mod"
-"github.com/digitalocean/godo v1.10.0"
-"github.com/digitalocean/godo v1.10.0/go.mod"
-"github.com/dimchansky/utfbom v1.1.0"
-"github.com/dimchansky/utfbom v1.1.0/go.mod"
-"github.com/dnaeon/go-vcr v1.0.1"
-"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-"github.com/docker/go-connections v0.3.0"
-"github.com/docker/go-connections v0.3.0/go.mod"
-"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
-"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.5"
-"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/fatih/color v1.7.0"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/fatih/color v1.9.0"
-"github.com/fatih/color v1.9.0/go.mod"
-"github.com/fatih/structs v1.1.0/go.mod"
-"github.com/fsnotify/fsnotify v1.4.7"
-"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-"github.com/ghodss/yaml v1.0.0"
-"github.com/ghodss/yaml v1.0.0/go.mod"
-"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-ldap/ldap v3.0.2+incompatible"
-"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-ole/go-ole v1.2.1"
-"github.com/go-ole/go-ole v1.2.1/go.mod"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
-"github.com/go-test/deep v1.0.2"
-"github.com/go-test/deep v1.0.2/go.mod"
-"github.com/gogo/protobuf v1.1.1"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/gogo/protobuf v1.2.1"
-"github.com/gogo/protobuf v1.2.1/go.mod"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-"github.com/golang/mock v1.1.1"
-"github.com/golang/mock v1.1.1/go.mod"
-"github.com/golang/protobuf v1.2.0"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/snappy v0.0.1"
-"github.com/golang/snappy v0.0.1/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/google/go-cmp v0.2.0"
-"github.com/google/go-cmp v0.2.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/go-querystring v0.0.0-20170111101155-53e6ce116135"
-"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
-"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf"
-"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
-"github.com/google/gofuzz v1.0.0"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/googleapis/gnostic v0.2.0"
-"github.com/googleapis/gnostic v0.2.0/go.mod"
-"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca"
-"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca/go.mod"
-"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c"
-"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-"github.com/hashicorp/errwrap v1.0.0"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/go-bexpr v0.1.2"
-"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
-"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
-"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.1"
-"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-"github.com/hashicorp/go-connlimit v0.2.0"
-"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
-"github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2"
-"github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2/go.mod"
-"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-"github.com/hashicorp/go-hclog v0.8.0/go.mod"
-"github.com/hashicorp/go-hclog v0.9.1"
-"github.com/hashicorp/go-hclog v0.9.1/go.mod"
-"github.com/hashicorp/go-hclog v0.12.0"
-"github.com/hashicorp/go-hclog v0.12.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.0.0"
-"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.1.0"
-"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.2.0"
-"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
-"github.com/hashicorp/go-memdb v1.0.3"
-"github.com/hashicorp/go-memdb v1.0.3/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.5"
-"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-"github.com/hashicorp/go-multierror v1.0.0"
-"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-"github.com/hashicorp/go-multierror v1.1.0"
-"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-"github.com/hashicorp/go-raftchunking v0.6.1"
-"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.5.4"
-"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.2"
-"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.2"
-"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
-"github.com/hashicorp/go-syslog v1.0.0"
-"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.1"
-"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-"github.com/hashicorp/go-version v1.1.0"
-"github.com/hashicorp/go-version v1.1.0/go.mod"
-"github.com/hashicorp/go.net v0.0.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.1"
-"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.4"
-"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-"github.com/hashicorp/hcl v1.0.0"
-"github.com/hashicorp/hcl v1.0.0/go.mod"
-"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
-"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
-"github.com/hashicorp/logutils v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.1"
-"github.com/hashicorp/mdns v1.0.1/go.mod"
-"github.com/hashicorp/memberlist v0.2.2"
-"github.com/hashicorp/memberlist v0.2.2/go.mod"
-"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
-"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
-"github.com/hashicorp/raft v1.1.1/go.mod"
-"github.com/hashicorp/raft v1.1.2"
-"github.com/hashicorp/raft v1.1.2/go.mod"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-"github.com/hashicorp/serf v0.9.3"
-"github.com/hashicorp/serf v0.9.3/go.mod"
-"github.com/hashicorp/vault/api v1.0.4"
-"github.com/hashicorp/vault/api v1.0.4/go.mod"
-"github.com/hashicorp/vault/sdk v0.1.13"
-"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-"github.com/hpcloud/tail v1.0.0"
-"github.com/hpcloud/tail v1.0.0/go.mod"
-"github.com/imdario/mergo v0.3.6"
-"github.com/imdario/mergo v0.3.6/go.mod"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62"
-"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
-"github.com/json-iterator/go v1.1.5"
-"github.com/json-iterator/go v1.1.5/go.mod"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.9"
-"github.com/json-iterator/go v1.1.9/go.mod"
-"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/kisielk/errcheck v1.1.0/go.mod"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pretty v0.2.0"
-"github.com/kr/pretty v0.2.0/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/text v0.1.0"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
-"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
-"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
-"github.com/likexian/gokit v0.20.16/go.mod"
-"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
-"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
-"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
-"github.com/linode/linodego v0.7.1"
-"github.com/linode/linodego v0.7.1/go.mod"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-colorable v0.1.4/go.mod"
-"github.com/mattn/go-colorable v0.1.6"
-"github.com/mattn/go-colorable v0.1.6/go.mod"
-"github.com/mattn/go-isatty v0.0.3/go.mod"
-"github.com/mattn/go-isatty v0.0.8/go.mod"
-"github.com/mattn/go-isatty v0.0.10/go.mod"
-"github.com/mattn/go-isatty v0.0.11/go.mod"
-"github.com/mattn/go-isatty v0.0.12"
-"github.com/mattn/go-isatty v0.0.12/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/miekg/dns v1.0.14/go.mod"
-"github.com/miekg/dns v1.1.26"
-"github.com/miekg/dns v1.1.26/go.mod"
-"github.com/mitchellh/cli v1.0.0/go.mod"
-"github.com/mitchellh/cli v1.1.0"
-"github.com/mitchellh/cli v1.1.0/go.mod"
-"github.com/mitchellh/copystructure v1.0.0"
-"github.com/mitchellh/copystructure v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.1.0"
-"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.0"
-"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.3"
-"github.com/mitchellh/go-testing-interface v1.0.3/go.mod"
-"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
-"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-"github.com/mitchellh/mapstructure v1.2.3"
-"github.com/mitchellh/mapstructure v1.2.3/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.1"
-"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
-"github.com/oklog/run v1.0.0/go.mod"
-"github.com/onsi/ginkgo v1.6.0"
-"github.com/onsi/ginkgo v1.6.0/go.mod"
-"github.com/onsi/gomega v1.4.1/go.mod"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-"github.com/pascaldekloe/goe v0.1.0"
-"github.com/pascaldekloe/goe v0.1.0/go.mod"
-"github.com/peterbourgon/diskv v2.0.1+incompatible"
-"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.0.5+incompatible"
-"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"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/posener/complete v1.1.1/go.mod"
-"github.com/posener/complete v1.2.3"
-"github.com/posener/complete v1.2.3/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v0.9.2"
-"github.com/prometheus/client_golang v0.9.2/go.mod"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.4.0"
-"github.com/prometheus/client_golang v1.4.0/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275"
-"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.9.1"
-"github.com/prometheus/common v0.9.1/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a"
-"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.0.8"
-"github.com/prometheus/procfs v0.0.8/go.mod"
-"github.com/rboyer/safeio v0.2.1"
-"github.com/rboyer/safeio v0.2.1/go.mod"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
-"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-"github.com/ryanuber/columnize v2.1.0+incompatible"
-"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
-"github.com/ryanuber/go-glob v1.0.0"
-"github.com/ryanuber/go-glob v1.0.0/go.mod"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880"
-"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod"
-"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
-"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
-"github.com/sirupsen/logrus v1.0.6"
-"github.com/sirupsen/logrus v1.0.6/go.mod"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.2"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf/go.mod"
-"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
-"github.com/spf13/pflag v1.0.2/go.mod"
-"github.com/spf13/pflag v1.0.3"
-"github.com/spf13/pflag v1.0.3/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
-"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-"github.com/vmware/govmomi v0.18.0"
-"github.com/vmware/govmomi v0.18.0/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
-"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4"
-"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4/go.mod"
-"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20190923162816-aa69164e4478"
-"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-"golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-"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-20180823144017-11551d06cbcc/go.mod"
-"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
-"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
-"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
-"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-"golang.org/x/text v0.3.2"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
-"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9"
-"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod"
-"google.golang.org/appengine v1.1.0/go.mod"
-"google.golang.org/appengine v1.4.0"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107"
-"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-"google.golang.org/grpc v1.14.0/go.mod"
-"google.golang.org/grpc v1.19.0/go.mod"
-"google.golang.org/grpc v1.22.0/go.mod"
-"google.golang.org/grpc v1.23.0"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.25.1"
-"google.golang.org/grpc v1.25.1/go.mod"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/fsnotify.v1 v1.4.7"
-"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-"gopkg.in/inf.v0 v0.9.1"
-"gopkg.in/inf.v0 v0.9.1/go.mod"
-"gopkg.in/resty.v1 v1.12.0"
-"gopkg.in/resty.v1 v1.12.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.3.1"
-"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.2.8"
-"gopkg.in/yaml.v2 v2.2.8/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-"k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod"
-"k8s.io/api v0.0.0-20190325185214-7544f9db76f6"
-"k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod"
-"k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod"
-"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841"
-"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod"
-"k8s.io/client-go v8.0.0+incompatible"
-"k8s.io/client-go v8.0.0+incompatible/go.mod"
-)
-go-module_set_globals
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	local git_commit
-	git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go)
-	git_commit=${git_commit#*\"}
-	git_commit=${git_commit%\"*}
-	[[ ${git_commit} ]] || die "failed to determine gitCommit"
-
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${git_commit}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.8.12.ebuild b/app-admin/consul/consul-1.8.12.ebuild
deleted file mode 100644
index 56da23c9b4e0..000000000000
--- a/app-admin/consul/consul-1.8.12.ebuild
+++ /dev/null
@@ -1,801 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-
-# Upstream doesn't use "-mod=vendor" in their build system, and the
-# vendor directory is incomplete.
-# On the next bump, remove this if they have added "-mod=vendor"
-EGO_SUM=(
-"cloud.google.com/go v0.26.0/go.mod"
-"cloud.google.com/go v0.34.0/go.mod"
-"cloud.google.com/go v0.38.0"
-"cloud.google.com/go v0.38.0/go.mod"
-"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
-"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-"github.com/Azure/go-autorest/autorest v0.10.0"
-"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.2.0"
-"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/to v0.3.0"
-"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.2.0"
-"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-"github.com/Azure/go-autorest/logger v0.1.0"
-"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.5.0"
-"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-"github.com/BurntSushi/toml v0.3.1"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/DataDog/datadog-go v2.2.0+incompatible"
-"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-"github.com/DataDog/datadog-go v3.2.0+incompatible"
-"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
-"github.com/Microsoft/go-winio v0.4.3"
-"github.com/Microsoft/go-winio v0.4.3/go.mod"
-"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-"github.com/NYTimes/gziphandler v1.0.1"
-"github.com/NYTimes/gziphandler v1.0.1/go.mod"
-"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
-"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
-"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-"github.com/armon/go-metrics v0.3.0/go.mod"
-"github.com/armon/go-metrics v0.3.4"
-"github.com/armon/go-metrics v0.3.4/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-"github.com/armon/go-radix v1.0.0"
-"github.com/armon/go-radix v1.0.0/go.mod"
-"github.com/aws/aws-sdk-go v1.25.37/go.mod"
-"github.com/aws/aws-sdk-go v1.25.41"
-"github.com/aws/aws-sdk-go v1.25.41/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/bgentry/speakeasy v0.1.0"
-"github.com/bgentry/speakeasy v0.1.0/go.mod"
-"github.com/boltdb/bolt v1.3.1"
-"github.com/boltdb/bolt v1.3.1/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/cespare/xxhash v1.1.0"
-"github.com/cespare/xxhash v1.1.0/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-"github.com/circonus-labs/circonusllhist v0.1.3"
-"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
-"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
-"github.com/cockroachdb/apd v1.1.0/go.mod"
-"github.com/coredns/coredns v1.1.2"
-"github.com/coredns/coredns v1.1.2/go.mod"
-"github.com/coreos/bbolt v1.3.2/go.mod"
-"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-"github.com/coreos/go-oidc v2.1.0+incompatible"
-"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
-"github.com/coreos/go-semver v0.2.0/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-"github.com/digitalocean/godo v1.1.1/go.mod"
-"github.com/digitalocean/godo v1.10.0"
-"github.com/digitalocean/godo v1.10.0/go.mod"
-"github.com/dimchansky/utfbom v1.1.0"
-"github.com/dimchansky/utfbom v1.1.0/go.mod"
-"github.com/dnaeon/go-vcr v1.0.1"
-"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-"github.com/docker/go-connections v0.3.0"
-"github.com/docker/go-connections v0.3.0/go.mod"
-"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-"github.com/dustin/go-humanize v1.0.0/go.mod"
-"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
-"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.5"
-"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/fatih/color v1.9.0"
-"github.com/fatih/color v1.9.0/go.mod"
-"github.com/fatih/structs v1.1.0/go.mod"
-"github.com/frankban/quicktest v1.11.1"
-"github.com/frankban/quicktest v1.11.1/go.mod"
-"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-"github.com/ghodss/yaml v1.0.0"
-"github.com/ghodss/yaml v1.0.0/go.mod"
-"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
-"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-logr/logr v0.1.0/go.mod"
-"github.com/go-ole/go-ole v1.2.1"
-"github.com/go-ole/go-ole v1.2.1/go.mod"
-"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
-"github.com/go-test/deep v1.0.2"
-"github.com/go-test/deep v1.0.2/go.mod"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/gogo/protobuf v1.2.1/go.mod"
-"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
-"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-"github.com/golang/mock v1.1.1/go.mod"
-"github.com/golang/mock v1.2.0/go.mod"
-"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/snappy v0.0.1"
-"github.com/golang/snappy v0.0.1/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/google/btree v1.0.0"
-"github.com/google/btree v1.0.0/go.mod"
-"github.com/google/go-cmp v0.2.0/go.mod"
-"github.com/google/go-cmp v0.3.0"
-"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/go-cmp v0.5.2"
-"github.com/google/go-cmp v0.5.2/go.mod"
-"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
-"github.com/google/go-querystring v1.0.0"
-"github.com/google/go-querystring v1.0.0/go.mod"
-"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-"github.com/google/gofuzz v1.0.0"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/google/martian v2.1.0+incompatible/go.mod"
-"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
-"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
-"github.com/google/uuid v1.1.1/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.5"
-"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-"github.com/googleapis/gnostic v0.2.0"
-"github.com/googleapis/gnostic v0.2.0/go.mod"
-"github.com/gophercloud/gophercloud v0.1.0"
-"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-"github.com/gorilla/websocket v1.4.0/go.mod"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-"github.com/hashicorp/errwrap v1.0.0"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/go-bexpr v0.1.2"
-"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
-"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
-"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.1"
-"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-"github.com/hashicorp/go-connlimit v0.2.0"
-"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
-"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
-"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
-"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-"github.com/hashicorp/go-hclog v0.9.1/go.mod"
-"github.com/hashicorp/go-hclog v0.9.2/go.mod"
-"github.com/hashicorp/go-hclog v0.12.0"
-"github.com/hashicorp/go-hclog v0.12.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.1.0"
-"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.2.0"
-"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
-"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
-"github.com/hashicorp/go-memdb v1.0.3"
-"github.com/hashicorp/go-memdb v1.0.3/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.5"
-"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-"github.com/hashicorp/go-multierror v1.0.0"
-"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-"github.com/hashicorp/go-multierror v1.1.0"
-"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-"github.com/hashicorp/go-raftchunking v0.6.1"
-"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.6.6"
-"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.6.7"
-"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.2"
-"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.2"
-"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
-"github.com/hashicorp/go-syslog v1.0.0"
-"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.1"
-"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-"github.com/hashicorp/go-uuid v1.0.2"
-"github.com/hashicorp/go-uuid v1.0.2/go.mod"
-"github.com/hashicorp/go-version v1.1.0/go.mod"
-"github.com/hashicorp/go-version v1.2.0"
-"github.com/hashicorp/go-version v1.2.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.1"
-"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.4"
-"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-"github.com/hashicorp/hcl v1.0.0"
-"github.com/hashicorp/hcl v1.0.0/go.mod"
-"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
-"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
-"github.com/hashicorp/logutils v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.1"
-"github.com/hashicorp/mdns v1.0.1/go.mod"
-"github.com/hashicorp/memberlist v0.2.2"
-"github.com/hashicorp/memberlist v0.2.2/go.mod"
-"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
-"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
-"github.com/hashicorp/raft v1.1.1/go.mod"
-"github.com/hashicorp/raft v1.1.2"
-"github.com/hashicorp/raft v1.1.2/go.mod"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-"github.com/hashicorp/serf v0.9.3"
-"github.com/hashicorp/serf v0.9.3/go.mod"
-"github.com/hashicorp/serf v0.9.4"
-"github.com/hashicorp/serf v0.9.4/go.mod"
-"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086"
-"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod"
-"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267"
-"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-"github.com/hpcloud/tail v1.0.0/go.mod"
-"github.com/imdario/mergo v0.3.5/go.mod"
-"github.com/imdario/mergo v0.3.6"
-"github.com/imdario/mergo v0.3.6/go.mod"
-"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
-"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-"github.com/jonboulle/clockwork v0.1.0/go.mod"
-"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
-"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
-"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
-"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.7"
-"github.com/json-iterator/go v1.1.7/go.mod"
-"github.com/json-iterator/go v1.1.9"
-"github.com/json-iterator/go v1.1.9/go.mod"
-"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/kisielk/errcheck v1.1.0/go.mod"
-"github.com/kisielk/errcheck v1.2.0/go.mod"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pretty v0.2.0"
-"github.com/kr/pretty v0.2.0/go.mod"
-"github.com/kr/pretty v0.2.1"
-"github.com/kr/pretty v0.2.1/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/text v0.1.0"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/lib/pq v1.1.1/go.mod"
-"github.com/linode/linodego v0.7.1"
-"github.com/linode/linodego v0.7.1/go.mod"
-"github.com/magiconair/properties v1.8.0/go.mod"
-"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-colorable v0.1.4"
-"github.com/mattn/go-colorable v0.1.4/go.mod"
-"github.com/mattn/go-colorable v0.1.6"
-"github.com/mattn/go-colorable v0.1.6/go.mod"
-"github.com/mattn/go-isatty v0.0.3/go.mod"
-"github.com/mattn/go-isatty v0.0.8/go.mod"
-"github.com/mattn/go-isatty v0.0.10/go.mod"
-"github.com/mattn/go-isatty v0.0.11/go.mod"
-"github.com/mattn/go-isatty v0.0.12"
-"github.com/mattn/go-isatty v0.0.12/go.mod"
-"github.com/mattn/go-runewidth v0.0.3/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/miekg/dns v1.0.14/go.mod"
-"github.com/miekg/dns v1.1.26"
-"github.com/miekg/dns v1.1.26/go.mod"
-"github.com/mitchellh/cli v1.0.0/go.mod"
-"github.com/mitchellh/cli v1.1.0"
-"github.com/mitchellh/cli v1.1.0/go.mod"
-"github.com/mitchellh/copystructure v1.0.0"
-"github.com/mitchellh/copystructure v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.1.0"
-"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-"github.com/mitchellh/go-testing-interface v1.14.0"
-"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
-"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
-"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-"github.com/mitchellh/mapstructure v1.1.2"
-"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-"github.com/mitchellh/mapstructure v1.3.2/go.mod"
-"github.com/mitchellh/mapstructure v1.3.3"
-"github.com/mitchellh/mapstructure v1.3.3/go.mod"
-"github.com/mitchellh/pointerstructure v1.0.0"
-"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.1"
-"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
-"github.com/oklog/run v1.0.0/go.mod"
-"github.com/oklog/ulid v1.3.1/go.mod"
-"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
-"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-"github.com/onsi/ginkgo v1.6.0/go.mod"
-"github.com/onsi/ginkgo v1.8.0/go.mod"
-"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-"github.com/onsi/gomega v1.5.0/go.mod"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-"github.com/pascaldekloe/goe v0.1.0"
-"github.com/pascaldekloe/goe v0.1.0/go.mod"
-"github.com/patrickmn/go-cache v2.1.0+incompatible"
-"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
-"github.com/pelletier/go-toml v1.2.0/go.mod"
-"github.com/peterbourgon/diskv v2.0.1+incompatible"
-"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.0.5+incompatible"
-"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.5.2+incompatible"
-"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
-"github.com/pkg/errors v0.8.0/go.mod"
-"github.com/pkg/errors v0.8.1"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/posener/complete v1.1.1"
-"github.com/posener/complete v1.1.1/go.mod"
-"github.com/posener/complete v1.2.3"
-"github.com/posener/complete v1.2.3/go.mod"
-"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
-"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v0.9.2/go.mod"
-"github.com/prometheus/client_golang v0.9.3/go.mod"
-"github.com/prometheus/client_golang v1.0.0"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.4.0"
-"github.com/prometheus/client_golang v1.4.0/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-"github.com/prometheus/common v0.4.0/go.mod"
-"github.com/prometheus/common v0.4.1"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.9.1"
-"github.com/prometheus/common v0.9.1/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-"github.com/prometheus/procfs v0.0.2"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.0.8"
-"github.com/prometheus/procfs v0.0.8/go.mod"
-"github.com/prometheus/tsdb v0.7.1/go.mod"
-"github.com/rboyer/safeio v0.2.1"
-"github.com/rboyer/safeio v0.2.1/go.mod"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
-"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-"github.com/rs/zerolog v1.4.0/go.mod"
-"github.com/russross/blackfriday v1.5.2/go.mod"
-"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-"github.com/ryanuber/columnize v2.1.0+incompatible"
-"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
-"github.com/ryanuber/go-glob v1.0.0"
-"github.com/ryanuber/go-glob v1.0.0/go.mod"
-"github.com/satori/go.uuid v1.2.0/go.mod"
-"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
-"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-"github.com/shirou/gopsutil v2.20.9+incompatible"
-"github.com/shirou/gopsutil v2.20.9+incompatible/go.mod"
-"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
-"github.com/sirupsen/logrus v1.0.6/go.mod"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.2"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
-"github.com/soheilhy/cmux v0.1.4/go.mod"
-"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-"github.com/spf13/afero v1.1.2/go.mod"
-"github.com/spf13/afero v1.2.1/go.mod"
-"github.com/spf13/afero v1.2.2/go.mod"
-"github.com/spf13/cast v1.3.0/go.mod"
-"github.com/spf13/cobra v0.0.5/go.mod"
-"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-"github.com/spf13/pflag v1.0.3/go.mod"
-"github.com/spf13/pflag v1.0.5"
-"github.com/spf13/pflag v1.0.5/go.mod"
-"github.com/spf13/viper v1.3.2/go.mod"
-"github.com/spf13/viper v1.4.0/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/stretchr/testify v1.5.1"
-"github.com/stretchr/testify v1.5.1/go.mod"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
-"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-"github.com/ugorji/go v1.1.4/go.mod"
-"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-"github.com/vmware/govmomi v0.18.0"
-"github.com/vmware/govmomi v0.18.0/go.mod"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-"github.com/yuin/goldmark v1.1.27/go.mod"
-"go.etcd.io/bbolt v1.3.2/go.mod"
-"go.opencensus.io v0.21.0/go.mod"
-"go.opencensus.io v0.22.0"
-"go.opencensus.io v0.22.0/go.mod"
-"go.uber.org/atomic v1.4.0/go.mod"
-"go.uber.org/goleak v1.0.0"
-"go.uber.org/goleak v1.0.0/go.mod"
-"go.uber.org/multierr v1.1.0/go.mod"
-"go.uber.org/zap v1.10.0/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
-"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
-"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
-"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
-"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
-"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
-"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-"golang.org/x/mod v0.2.0"
-"golang.org/x/mod v0.2.0/go.mod"
-"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
-"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-"golang.org/x/net v0.0.0-20200602114024-627f9648deb9"
-"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
-"golang.org/x/net v0.0.0-20200904194848-62affa334b73"
-"golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
-"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
-"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
-"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
-"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
-"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
-"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
-"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
-"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf"
-"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf/go.mod"
-"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-"golang.org/x/text v0.3.2"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/text v0.3.3"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1"
-"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
-"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
-"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11"
-"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
-"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-"golang.org/x/tools v0.0.0-20200513154647-78b527d18275"
-"golang.org/x/tools v0.0.0-20200513154647-78b527d18275/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.4.0/go.mod"
-"google.golang.org/api v0.9.0"
-"google.golang.org/api v0.9.0/go.mod"
-"google.golang.org/appengine v1.1.0/go.mod"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/appengine v1.5.0/go.mod"
-"google.golang.org/appengine v1.6.0"
-"google.golang.org/appengine v1.6.0/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-"google.golang.org/grpc v1.14.0/go.mod"
-"google.golang.org/grpc v1.19.0/go.mod"
-"google.golang.org/grpc v1.20.1/go.mod"
-"google.golang.org/grpc v1.21.0/go.mod"
-"google.golang.org/grpc v1.22.0/go.mod"
-"google.golang.org/grpc v1.23.0"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.25.1"
-"google.golang.org/grpc v1.25.1/go.mod"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-"gopkg.in/inf.v0 v0.9.1"
-"gopkg.in/inf.v0 v0.9.1/go.mod"
-"gopkg.in/resty.v1 v1.12.0"
-"gopkg.in/resty.v1 v1.12.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.5.1"
-"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.2.8"
-"gopkg.in/yaml.v2 v2.2.8/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-"k8s.io/api v0.16.9"
-"k8s.io/api v0.16.9/go.mod"
-"k8s.io/apimachinery v0.16.9"
-"k8s.io/apimachinery v0.16.9/go.mod"
-"k8s.io/client-go v0.16.9"
-"k8s.io/client-go v0.16.9/go.mod"
-"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-"k8s.io/klog v0.3.0/go.mod"
-"k8s.io/klog v1.0.0"
-"k8s.io/klog v1.0.0/go.mod"
-"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
-"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
-"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
-"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-"sigs.k8s.io/yaml v1.1.0"
-"sigs.k8s.io/yaml v1.1.0/go.mod"
-)
-go-module_set_globals
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	local git_commit
-	git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go)
-	git_commit=${git_commit#*\"}
-	git_commit=${git_commit%\"*}
-	[[ ${git_commit} ]] || die "failed to determine gitCommit"
-
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${git_commit}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.8.14.ebuild b/app-admin/consul/consul-1.8.14.ebuild
new file mode 100644
index 000000000000..df6124ede31c
--- /dev/null
+++ b/app-admin/consul/consul-1.8.14.ebuild
@@ -0,0 +1,767 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+
+# Upstream doesn't use "-mod=vendor" in their build system, and the
+# vendor directory is incomplete.
+# On the next bump, remove this if they have added "-mod=vendor"
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0"
+"cloud.google.com/go v0.38.0/go.mod"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+"github.com/Azure/go-autorest/autorest v0.10.0"
+"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.3.0"
+"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/Microsoft/go-winio v0.4.3"
+"github.com/Microsoft/go-winio v0.4.3/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.0.1"
+"github.com/NYTimes/gziphandler v1.0.1/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
+"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-metrics v0.3.0/go.mod"
+"github.com/armon/go-metrics v0.3.4"
+"github.com/armon/go-metrics v0.3.4/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/aws/aws-sdk-go v1.25.37/go.mod"
+"github.com/aws/aws-sdk-go v1.25.41"
+"github.com/aws/aws-sdk-go v1.25.41/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/boltdb/bolt v1.3.1"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
+"github.com/cockroachdb/apd v1.1.0/go.mod"
+"github.com/coredns/coredns v1.1.2"
+"github.com/coredns/coredns v1.1.2/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+"github.com/coreos/go-oidc v2.1.0+incompatible"
+"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/digitalocean/godo v1.1.1/go.mod"
+"github.com/digitalocean/godo v1.10.0"
+"github.com/digitalocean/godo v1.10.0/go.mod"
+"github.com/dimchansky/utfbom v1.1.0"
+"github.com/dimchansky/utfbom v1.1.0/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/go-connections v0.3.0"
+"github.com/docker/go-connections v0.3.0/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.5"
+"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/frankban/quicktest v1.11.1"
+"github.com/frankban/quicktest v1.11.1/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-ole/go-ole v1.2.1"
+"github.com/go-ole/go-ole v1.2.1/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/go-test/deep v1.0.2"
+"github.com/go-test/deep v1.0.2/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/snappy v0.0.1"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.2"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+"github.com/google/go-querystring v1.0.0"
+"github.com/google/go-querystring v1.0.0/go.mod"
+"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+"github.com/google/gofuzz v1.0.0"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22"
+"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+"github.com/googleapis/gnostic v0.2.0"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-bexpr v0.1.2"
+"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
+"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
+"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-connlimit v0.2.0"
+"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.2.0"
+"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
+"github.com/hashicorp/go-memdb v1.0.3"
+"github.com/hashicorp/go-memdb v1.0.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-raftchunking v0.6.1"
+"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-uuid v1.0.2"
+"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+"github.com/hashicorp/go-version v1.1.0/go.mod"
+"github.com/hashicorp/go-version v1.2.0"
+"github.com/hashicorp/go-version v1.2.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/hcl v1.0.0"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
+"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/memberlist v0.2.2"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
+"github.com/hashicorp/raft v1.1.1/go.mod"
+"github.com/hashicorp/raft v1.1.2"
+"github.com/hashicorp/raft v1.1.2/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+"github.com/hashicorp/serf v0.9.3/go.mod"
+"github.com/hashicorp/serf v0.9.4"
+"github.com/hashicorp/serf v0.9.4/go.mod"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.6"
+"github.com/imdario/mergo v0.3.6/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.9"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/lib/pq v1.1.1/go.mod"
+"github.com/linode/linodego v0.7.1"
+"github.com/linode/linodego v0.7.1/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-runewidth v0.0.3/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/cli v1.1.0"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/copystructure v1.0.0"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.14.0"
+"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.3"
+"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+"github.com/mitchellh/pointerstructure v1.0.0"
+"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.1"
+"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/patrickmn/go-cache v2.1.0+incompatible"
+"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.9.1"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rboyer/safeio v0.2.1"
+"github.com/rboyer/safeio v0.2.1/go.mod"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rs/zerolog v1.4.0/go.mod"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/shirou/gopsutil v2.20.9+incompatible"
+"github.com/shirou/gopsutil v2.20.9+incompatible/go.mod"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.1/go.mod"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.5/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.3.2/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+"github.com/vmware/govmomi v0.18.0"
+"github.com/vmware/govmomi v0.18.0/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0"
+"go.opencensus.io v0.22.0/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/goleak v1.0.0"
+"go.uber.org/goleak v1.0.0/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/mod v0.2.0"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+"golang.org/x/net v0.0.0-20200904194848-62affa334b73"
+"golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf"
+"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275/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.4.0/go.mod"
+"google.golang.org/api v0.9.0"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.0"
+"google.golang.org/appengine v1.6.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.22.0/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.25.1"
+"google.golang.org/grpc v1.25.1/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/resty.v1 v1.12.0"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"k8s.io/api v0.16.9"
+"k8s.io/api v0.16.9/go.mod"
+"k8s.io/apimachinery v0.16.9"
+"k8s.io/apimachinery v0.16.9/go.mod"
+"k8s.io/client-go v0.16.9"
+"k8s.io/client-go v0.16.9/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+"sigs.k8s.io/yaml v1.1.0"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="amd64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+	local git_commit
+	git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go)
+	git_commit=${git_commit#*\"}
+	git_commit=${git_commit%\"*}
+	[[ ${git_commit} ]] || die "failed to determine gitCommit"
+
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${git_commit}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-1.9.6.ebuild b/app-admin/consul/consul-1.9.6.ebuild
deleted file mode 100644
index e90a2c48106e..000000000000
--- a/app-admin/consul/consul-1.9.6.ebuild
+++ /dev/null
@@ -1,773 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-
-# Upstream doesn't use "-mod=vendor" in their build system, and the
-# vendor directory is incomplete.
-# On the next bump, remove this if they have added "-mod=vendor"
-EGO_SUM=(
-"cloud.google.com/go v0.26.0/go.mod"
-"cloud.google.com/go v0.34.0/go.mod"
-"cloud.google.com/go v0.38.0"
-"cloud.google.com/go v0.38.0/go.mod"
-"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
-"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-"github.com/Azure/go-autorest/autorest v0.10.0"
-"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.2.0"
-"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/to v0.3.0"
-"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.2.0"
-"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-"github.com/Azure/go-autorest/logger v0.1.0"
-"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.5.0"
-"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-"github.com/DataDog/datadog-go v3.2.0+incompatible"
-"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
-"github.com/Microsoft/go-winio v0.4.3"
-"github.com/Microsoft/go-winio v0.4.3/go.mod"
-"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-"github.com/NYTimes/gziphandler v1.0.1"
-"github.com/NYTimes/gziphandler v1.0.1/go.mod"
-"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
-"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-"github.com/armon/go-metrics v0.3.0/go.mod"
-"github.com/armon/go-metrics v0.3.6"
-"github.com/armon/go-metrics v0.3.6/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-"github.com/armon/go-radix v1.0.0"
-"github.com/armon/go-radix v1.0.0/go.mod"
-"github.com/aws/aws-sdk-go v1.25.37/go.mod"
-"github.com/aws/aws-sdk-go v1.25.41"
-"github.com/aws/aws-sdk-go v1.25.41/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/bgentry/speakeasy v0.1.0"
-"github.com/bgentry/speakeasy v0.1.0/go.mod"
-"github.com/boltdb/bolt v1.3.1"
-"github.com/boltdb/bolt v1.3.1/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/cespare/xxhash v1.1.0"
-"github.com/cespare/xxhash v1.1.0/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-"github.com/circonus-labs/circonusllhist v0.1.3"
-"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
-"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
-"github.com/cockroachdb/apd v1.1.0/go.mod"
-"github.com/coredns/coredns v1.1.2"
-"github.com/coredns/coredns v1.1.2/go.mod"
-"github.com/coreos/bbolt v1.3.2/go.mod"
-"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-"github.com/coreos/go-oidc v2.1.0+incompatible"
-"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
-"github.com/coreos/go-semver v0.2.0/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-"github.com/digitalocean/godo v1.1.1/go.mod"
-"github.com/digitalocean/godo v1.10.0"
-"github.com/digitalocean/godo v1.10.0/go.mod"
-"github.com/dimchansky/utfbom v1.1.0"
-"github.com/dimchansky/utfbom v1.1.0/go.mod"
-"github.com/dnaeon/go-vcr v1.0.1"
-"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-"github.com/docker/go-connections v0.3.0"
-"github.com/docker/go-connections v0.3.0/go.mod"
-"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-"github.com/dustin/go-humanize v1.0.0/go.mod"
-"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
-"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.5"
-"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/fatih/color v1.9.0"
-"github.com/fatih/color v1.9.0/go.mod"
-"github.com/fatih/structs v1.1.0/go.mod"
-"github.com/frankban/quicktest v1.11.0"
-"github.com/frankban/quicktest v1.11.0/go.mod"
-"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-"github.com/ghodss/yaml v1.0.0/go.mod"
-"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
-"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-logr/logr v0.1.0/go.mod"
-"github.com/go-ole/go-ole v1.2.4"
-"github.com/go-ole/go-ole v1.2.4/go.mod"
-"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
-"github.com/go-test/deep v1.0.2"
-"github.com/go-test/deep v1.0.2/go.mod"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/gogo/protobuf v1.2.1/go.mod"
-"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
-"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-"github.com/golang/mock v1.1.1/go.mod"
-"github.com/golang/mock v1.2.0/go.mod"
-"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/protobuf v1.3.5"
-"github.com/golang/protobuf v1.3.5/go.mod"
-"github.com/golang/snappy v0.0.1"
-"github.com/golang/snappy v0.0.1/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/google/btree v1.0.0"
-"github.com/google/btree v1.0.0/go.mod"
-"github.com/google/go-cmp v0.2.0/go.mod"
-"github.com/google/go-cmp v0.3.0/go.mod"
-"github.com/google/go-cmp v0.3.1/go.mod"
-"github.com/google/go-cmp v0.4.0/go.mod"
-"github.com/google/go-cmp v0.5.2"
-"github.com/google/go-cmp v0.5.2/go.mod"
-"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
-"github.com/google/go-querystring v1.0.0"
-"github.com/google/go-querystring v1.0.0/go.mod"
-"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/google/gofuzz v1.2.0"
-"github.com/google/gofuzz v1.2.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/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
-"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
-"github.com/google/uuid v1.1.1/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.5"
-"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-"github.com/googleapis/gnostic v0.2.0"
-"github.com/googleapis/gnostic v0.2.0/go.mod"
-"github.com/gophercloud/gophercloud v0.1.0"
-"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-"github.com/gorilla/websocket v1.4.0/go.mod"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-"github.com/hashicorp/errwrap v1.0.0"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/go-bexpr v0.1.2"
-"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
-"github.com/hashicorp/go-checkpoint v0.5.0"
-"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.1"
-"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-"github.com/hashicorp/go-connlimit v0.3.0"
-"github.com/hashicorp/go-connlimit v0.3.0/go.mod"
-"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
-"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
-"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-"github.com/hashicorp/go-hclog v0.9.1/go.mod"
-"github.com/hashicorp/go-hclog v0.9.2/go.mod"
-"github.com/hashicorp/go-hclog v0.12.0/go.mod"
-"github.com/hashicorp/go-hclog v0.14.1"
-"github.com/hashicorp/go-hclog v0.14.1/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.3.0"
-"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
-"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
-"github.com/hashicorp/go-memdb v1.3.0"
-"github.com/hashicorp/go-memdb v1.3.0/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.5"
-"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-"github.com/hashicorp/go-multierror v1.1.0"
-"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-"github.com/hashicorp/go-raftchunking v0.6.1"
-"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.6.7"
-"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.2"
-"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.2"
-"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
-"github.com/hashicorp/go-syslog v1.0.0"
-"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-"github.com/hashicorp/go-uuid v1.0.2"
-"github.com/hashicorp/go-uuid v1.0.2/go.mod"
-"github.com/hashicorp/go-version v1.1.0/go.mod"
-"github.com/hashicorp/go-version v1.2.1"
-"github.com/hashicorp/go-version v1.2.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.4"
-"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-"github.com/hashicorp/hcl v1.0.0"
-"github.com/hashicorp/hcl v1.0.0/go.mod"
-"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038"
-"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/go.mod"
-"github.com/hashicorp/logutils v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.1/go.mod"
-"github.com/hashicorp/mdns v1.0.4"
-"github.com/hashicorp/mdns v1.0.4/go.mod"
-"github.com/hashicorp/memberlist v0.2.2"
-"github.com/hashicorp/memberlist v0.2.2/go.mod"
-"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
-"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
-"github.com/hashicorp/raft v1.1.1/go.mod"
-"github.com/hashicorp/raft v1.2.0"
-"github.com/hashicorp/raft v1.2.0/go.mod"
-"github.com/hashicorp/raft-autopilot v0.1.5"
-"github.com/hashicorp/raft-autopilot v0.1.5/go.mod"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-"github.com/hashicorp/serf v0.9.5"
-"github.com/hashicorp/serf v0.9.5/go.mod"
-"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086"
-"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod"
-"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267"
-"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce"
-"github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/go.mod"
-"github.com/hpcloud/tail v1.0.0/go.mod"
-"github.com/imdario/mergo v0.3.5/go.mod"
-"github.com/imdario/mergo v0.3.6"
-"github.com/imdario/mergo v0.3.6/go.mod"
-"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
-"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-"github.com/jonboulle/clockwork v0.1.0/go.mod"
-"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
-"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
-"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
-"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.7/go.mod"
-"github.com/json-iterator/go v1.1.9"
-"github.com/json-iterator/go v1.1.9/go.mod"
-"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/kisielk/errcheck v1.1.0/go.mod"
-"github.com/kisielk/errcheck v1.2.0/go.mod"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pretty v0.2.0/go.mod"
-"github.com/kr/pretty v0.2.1"
-"github.com/kr/pretty v0.2.1/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/text v0.1.0"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/lib/pq v1.1.1/go.mod"
-"github.com/linode/linodego v0.7.1"
-"github.com/linode/linodego v0.7.1/go.mod"
-"github.com/magiconair/properties v1.8.0/go.mod"
-"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-colorable v0.1.4/go.mod"
-"github.com/mattn/go-colorable v0.1.6"
-"github.com/mattn/go-colorable v0.1.6/go.mod"
-"github.com/mattn/go-isatty v0.0.3/go.mod"
-"github.com/mattn/go-isatty v0.0.8/go.mod"
-"github.com/mattn/go-isatty v0.0.10/go.mod"
-"github.com/mattn/go-isatty v0.0.11/go.mod"
-"github.com/mattn/go-isatty v0.0.12"
-"github.com/mattn/go-isatty v0.0.12/go.mod"
-"github.com/mattn/go-runewidth v0.0.3/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/miekg/dns v1.0.14/go.mod"
-"github.com/miekg/dns v1.1.26/go.mod"
-"github.com/miekg/dns v1.1.41"
-"github.com/miekg/dns v1.1.41/go.mod"
-"github.com/mitchellh/cli v1.0.0/go.mod"
-"github.com/mitchellh/cli v1.1.0"
-"github.com/mitchellh/cli v1.1.0/go.mod"
-"github.com/mitchellh/copystructure v1.0.0"
-"github.com/mitchellh/copystructure v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.1.0"
-"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-"github.com/mitchellh/go-testing-interface v1.14.0"
-"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
-"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
-"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-"github.com/mitchellh/mapstructure v1.3.2/go.mod"
-"github.com/mitchellh/mapstructure v1.3.3"
-"github.com/mitchellh/mapstructure v1.3.3/go.mod"
-"github.com/mitchellh/pointerstructure v1.0.0"
-"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.1"
-"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
-"github.com/oklog/run v1.0.0/go.mod"
-"github.com/oklog/ulid v1.3.1/go.mod"
-"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
-"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-"github.com/onsi/ginkgo v1.6.0/go.mod"
-"github.com/onsi/ginkgo v1.8.0/go.mod"
-"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-"github.com/onsi/gomega v1.5.0/go.mod"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-"github.com/pascaldekloe/goe v0.1.0"
-"github.com/pascaldekloe/goe v0.1.0/go.mod"
-"github.com/patrickmn/go-cache v2.1.0+incompatible"
-"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
-"github.com/pelletier/go-toml v1.2.0/go.mod"
-"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.5.2+incompatible"
-"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
-"github.com/pkg/errors v0.8.0/go.mod"
-"github.com/pkg/errors v0.8.1"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/posener/complete v1.1.1/go.mod"
-"github.com/posener/complete v1.2.3"
-"github.com/posener/complete v1.2.3/go.mod"
-"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
-"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v0.9.2/go.mod"
-"github.com/prometheus/client_golang v0.9.3/go.mod"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.4.0"
-"github.com/prometheus/client_golang v1.4.0/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-"github.com/prometheus/common v0.4.0/go.mod"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.9.1"
-"github.com/prometheus/common v0.9.1/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.0.8"
-"github.com/prometheus/procfs v0.0.8/go.mod"
-"github.com/prometheus/tsdb v0.7.1/go.mod"
-"github.com/rboyer/safeio v0.2.1"
-"github.com/rboyer/safeio v0.2.1/go.mod"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
-"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-"github.com/rs/zerolog v1.4.0/go.mod"
-"github.com/russross/blackfriday v1.5.2/go.mod"
-"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-"github.com/ryanuber/columnize v2.1.0+incompatible"
-"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
-"github.com/ryanuber/go-glob v1.0.0"
-"github.com/ryanuber/go-glob v1.0.0/go.mod"
-"github.com/satori/go.uuid v1.2.0/go.mod"
-"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
-"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-"github.com/shirou/gopsutil/v3 v3.20.10"
-"github.com/shirou/gopsutil/v3 v3.20.10/go.mod"
-"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
-"github.com/sirupsen/logrus v1.0.6/go.mod"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.2"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
-"github.com/soheilhy/cmux v0.1.4/go.mod"
-"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-"github.com/spf13/afero v1.1.2/go.mod"
-"github.com/spf13/afero v1.2.1/go.mod"
-"github.com/spf13/afero v1.2.2/go.mod"
-"github.com/spf13/cast v1.3.0/go.mod"
-"github.com/spf13/cobra v0.0.5/go.mod"
-"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-"github.com/spf13/pflag v1.0.3/go.mod"
-"github.com/spf13/pflag v1.0.5"
-"github.com/spf13/pflag v1.0.5/go.mod"
-"github.com/spf13/viper v1.3.2/go.mod"
-"github.com/spf13/viper v1.4.0/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/stretchr/testify v1.6.1"
-"github.com/stretchr/testify v1.6.1/go.mod"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
-"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-"github.com/ugorji/go v1.1.4/go.mod"
-"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-"github.com/vmware/govmomi v0.18.0"
-"github.com/vmware/govmomi v0.18.0/go.mod"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-"github.com/yuin/goldmark v1.1.27/go.mod"
-"go.etcd.io/bbolt v1.3.2/go.mod"
-"go.opencensus.io v0.21.0/go.mod"
-"go.opencensus.io v0.22.0"
-"go.opencensus.io v0.22.0/go.mod"
-"go.uber.org/atomic v1.4.0/go.mod"
-"go.uber.org/goleak v1.1.10"
-"go.uber.org/goleak v1.1.10/go.mod"
-"go.uber.org/multierr v1.1.0/go.mod"
-"go.uber.org/zap v1.10.0/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
-"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
-"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
-"golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae"
-"golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae/go.mod"
-"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
-"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-"golang.org/x/mod v0.2.0"
-"golang.org/x/mod v0.2.0/go.mod"
-"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
-"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
-"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-"golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1"
-"golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
-"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
-"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
-"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
-"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
-"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
-"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod"
-"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
-"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44"
-"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/text v0.3.6"
-"golang.org/x/text v0.3.6/go.mod"
-"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
-"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
-"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
-"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-"golang.org/x/tools v0.0.0-20200513154647-78b527d18275"
-"golang.org/x/tools v0.0.0-20200513154647-78b527d18275/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.4.0/go.mod"
-"google.golang.org/api v0.9.0"
-"google.golang.org/api v0.9.0/go.mod"
-"google.golang.org/appengine v1.1.0/go.mod"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/appengine v1.5.0/go.mod"
-"google.golang.org/appengine v1.6.0"
-"google.golang.org/appengine v1.6.0/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-"google.golang.org/grpc v1.14.0/go.mod"
-"google.golang.org/grpc v1.19.0/go.mod"
-"google.golang.org/grpc v1.20.1/go.mod"
-"google.golang.org/grpc v1.21.0/go.mod"
-"google.golang.org/grpc v1.22.0/go.mod"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.25.1"
-"google.golang.org/grpc v1.25.1/go.mod"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-"gopkg.in/inf.v0 v0.9.1"
-"gopkg.in/inf.v0 v0.9.1/go.mod"
-"gopkg.in/resty.v1 v1.12.0"
-"gopkg.in/resty.v1 v1.12.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.5.1"
-"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.2.8"
-"gopkg.in/yaml.v2 v2.2.8/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-"k8s.io/api v0.16.9"
-"k8s.io/api v0.16.9/go.mod"
-"k8s.io/apimachinery v0.16.9"
-"k8s.io/apimachinery v0.16.9/go.mod"
-"k8s.io/client-go v0.16.9"
-"k8s.io/client-go v0.16.9/go.mod"
-"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-"k8s.io/klog v0.3.0/go.mod"
-"k8s.io/klog v1.0.0"
-"k8s.io/klog v1.0.0/go.mod"
-"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
-"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
-"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
-"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-"sigs.k8s.io/yaml v1.1.0"
-"sigs.k8s.io/yaml v1.1.0/go.mod"
-)
-go-module_set_globals
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	local git_commit
-	git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go)
-	git_commit=${git_commit#*\"}
-	git_commit=${git_commit%\"*}
-	[[ ${git_commit} ]] || die "failed to determine gitCommit"
-
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${git_commit}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.9.8.ebuild b/app-admin/consul/consul-1.9.8.ebuild
new file mode 100644
index 000000000000..596e718b1e04
--- /dev/null
+++ b/app-admin/consul/consul-1.9.8.ebuild
@@ -0,0 +1,781 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+
+# Upstream doesn't use "-mod=vendor" in their build system, and the
+# vendor directory is incomplete.
+# On the next bump, remove this if they have added "-mod=vendor"
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0"
+"cloud.google.com/go v0.38.0/go.mod"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+"github.com/Azure/go-autorest/autorest v0.10.0"
+"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.3.0"
+"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/Microsoft/go-winio v0.4.3"
+"github.com/Microsoft/go-winio v0.4.3/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.0.1"
+"github.com/NYTimes/gziphandler v1.0.1/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-metrics v0.3.0/go.mod"
+"github.com/armon/go-metrics v0.3.6"
+"github.com/armon/go-metrics v0.3.6/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/aws/aws-sdk-go v1.25.37/go.mod"
+"github.com/aws/aws-sdk-go v1.25.41"
+"github.com/aws/aws-sdk-go v1.25.41/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/boltdb/bolt v1.3.1"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
+"github.com/cockroachdb/apd v1.1.0/go.mod"
+"github.com/coredns/coredns v1.1.2"
+"github.com/coredns/coredns v1.1.2/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+"github.com/coreos/go-oidc v2.1.0+incompatible"
+"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/digitalocean/godo v1.1.1/go.mod"
+"github.com/digitalocean/godo v1.10.0"
+"github.com/digitalocean/godo v1.10.0/go.mod"
+"github.com/dimchansky/utfbom v1.1.0"
+"github.com/dimchansky/utfbom v1.1.0/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/go-connections v0.3.0"
+"github.com/docker/go-connections v0.3.0/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.5"
+"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/frankban/quicktest v1.11.0"
+"github.com/frankban/quicktest v1.11.0/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-ole/go-ole v1.2.4"
+"github.com/go-ole/go-ole v1.2.4/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/go-test/deep v1.0.2"
+"github.com/go-test/deep v1.0.2/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.5"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/snappy v0.0.1"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.2"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+"github.com/google/go-querystring v1.0.0"
+"github.com/google/go-querystring v1.0.0/go.mod"
+"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.2.0"
+"github.com/google/gofuzz v1.2.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22"
+"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+"github.com/googleapis/gnostic v0.2.0"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-bexpr v0.1.2"
+"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
+"github.com/hashicorp/go-checkpoint v0.5.0"
+"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-connlimit v0.3.0"
+"github.com/hashicorp/go-connlimit v0.3.0/go.mod"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-hclog v0.14.1"
+"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.3.0"
+"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
+"github.com/hashicorp/go-memdb v1.3.0"
+"github.com/hashicorp/go-memdb v1.3.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-raftchunking v0.6.1"
+"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-uuid v1.0.2"
+"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+"github.com/hashicorp/go-version v1.1.0/go.mod"
+"github.com/hashicorp/go-version v1.2.1"
+"github.com/hashicorp/go-version v1.2.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/hcl v1.0.0"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038"
+"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/mdns v1.0.4"
+"github.com/hashicorp/mdns v1.0.4/go.mod"
+"github.com/hashicorp/memberlist v0.2.2"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
+"github.com/hashicorp/raft v1.1.1/go.mod"
+"github.com/hashicorp/raft v1.2.0"
+"github.com/hashicorp/raft v1.2.0/go.mod"
+"github.com/hashicorp/raft-autopilot v0.1.5"
+"github.com/hashicorp/raft-autopilot v0.1.5/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+"github.com/hashicorp/serf v0.9.5"
+"github.com/hashicorp/serf v0.9.5/go.mod"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce"
+"github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.6"
+"github.com/imdario/mergo v0.3.6/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.9"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/lib/pq v1.1.1/go.mod"
+"github.com/linode/linodego v0.7.1"
+"github.com/linode/linodego v0.7.1/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-runewidth v0.0.3/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/miekg/dns v1.1.41"
+"github.com/miekg/dns v1.1.41/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/cli v1.1.0"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/copystructure v1.0.0"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.14.0"
+"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.3"
+"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+"github.com/mitchellh/pointerstructure v1.0.0"
+"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.1"
+"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/patrickmn/go-cache v2.1.0+incompatible"
+"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.9.1"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rboyer/safeio v0.2.1"
+"github.com/rboyer/safeio v0.2.1/go.mod"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rs/zerolog v1.4.0/go.mod"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/shirou/gopsutil/v3 v3.20.10"
+"github.com/shirou/gopsutil/v3 v3.20.10/go.mod"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.1/go.mod"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.5/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.3.2/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.6.1"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+"github.com/vmware/govmomi v0.18.0"
+"github.com/vmware/govmomi v0.18.0/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0"
+"go.opencensus.io v0.22.0/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/goleak v1.1.10"
+"go.uber.org/goleak v1.1.10/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a"
+"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/mod v0.2.0"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1"
+"golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
+"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44"
+"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/text v0.3.6"
+"golang.org/x/text v0.3.6/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275/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.4.0/go.mod"
+"google.golang.org/api v0.9.0"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.0"
+"google.golang.org/appengine v1.6.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.22.0/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.25.1"
+"google.golang.org/grpc v1.25.1/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/resty.v1 v1.12.0"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"k8s.io/api v0.16.9"
+"k8s.io/api v0.16.9/go.mod"
+"k8s.io/apimachinery v0.16.9"
+"k8s.io/apimachinery v0.16.9/go.mod"
+"k8s.io/client-go v0.16.9"
+"k8s.io/client-go v0.16.9/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+"sigs.k8s.io/yaml v1.1.0"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+	local git_commit
+	git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go)
+	git_commit=${git_commit#*\"}
+	git_commit=${git_commit%\"*}
+	[[ ${git_commit} ]] || die "failed to determine gitCommit"
+
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${git_commit}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 4a8c390b195d..60c2b4c466e5 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.36.0.tar.gz 5233021 BLAKE2B b1d2fc014773c0a4939e114ea611e067ae9e646126f5ca4c37c78fb06e84df8c3c535570994808fb5aab2545ff3a40a2bbba12642bb5dc02abf6e6f88ba388af SHA512 9d5cb8bef91d78223b625a6b81721d172a9e613199c3f7a0bb225302a498b9625f6dc029b03ca6bbdae0afc59317f2f00637206507724c3852fe09b4095eb807
-EBUILD exo-1.36.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.37.0.tar.gz 5232994 BLAKE2B 9d6a965a8c08e7a2fe1f2854c0af3e61fc880e01b1567c30a032742363b83a2a30f0f2ef5db0f4d6fbd96b4bb99feb3106894c86f084155e5dcb6b8eb1185517 SHA512 133cfc85289c13f849cc3e8987b209fd402363e4d413c8f36850b20177a4cbf74c23241a8a7473f1fa62e86d4c977f0787fa5eae2a2d52f829802e41918a9a86
+EBUILD exo-1.37.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.36.0.ebuild b/app-admin/exo/exo-1.37.0.ebuild
index 49b1772f318b..49b1772f318b 100644
--- a/app-admin/exo/exo-1.36.0.ebuild
+++ b/app-admin/exo/exo-1.37.0.ebuild
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index 88c11efe27f7..da0f948d8fea 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -6,5 +6,5 @@ AUX fam-2.7.0-sysmacros.patch 343 BLAKE2B c4b1d4ff996517f9c7a9f17b3e4a7c12053fb4
 AUX famd 393 BLAKE2B 5e6fd2f1e7eb9c48fcae90da144a1b6953e2469d0e4f3c7124e5f71440ae2de5195179d0abc969ef11fb59cb2290d541518e36a983e98c735d36837ca0ae8e29 SHA512 ddad96e311a678c5907086b69a6478c5c6e735ff2614846585a2b26476a5049ab90f984d82eba5ba3f0175c3675d478e2abdf4ef2bf98c457a9e1304324979e1
 DIST fam_2.7.0-17.3.diff.gz 28847 BLAKE2B d46e0d60d438459b43e24d2757771f02f3b5eec1b297f16a0359b26d14fbfba9701ebdc63d9b4dbbe2247cc7b38b9670ed9900a896224a3c4d8affc1481a8a79 SHA512 67d339e1cd4409897b044aa9b4c755a43b939982ee70c0ab5d99afd807994ad1f571a52bf04125a633cc3a735e99ff9e156caf2fb4288f5c008121a4eb9379b6
 DIST fam_2.7.0.orig.tar.gz 301945 BLAKE2B 9219c15b998bbac49e76eeac86f2de666ac49dca773c82ff6220c11ee77f0381b93ddbeeb500a7775bff3cc29ad6e7008e12304f0b0e361cbcc951d9f995a229 SHA512 dae6e883ef10214b1506d342e32cb5c59d0b4b7b66c1b099daa836958651ff3b04d526b4e516abd96e51587a97a8950e9517d1b38c6f7e6637ee3e7d20243531
-EBUILD fam-2.7.0_p17_p3.ebuild 2041 BLAKE2B 21bc169e8c846a9f1d8364c52ca4988b95f534b9ce34f159452eb8963504546f2b2bf23b9504b408fb827ed9cfba497c6b23902b34acf9d692707597bbb7c65a SHA512 2a17273a4257d00dd35bdfcb6321a18a4eb380674198f589cb45735069022a62db236cd76d869c9023409290850768a099a58a803d44090cc1f883ff0f9fe4a4
+EBUILD fam-2.7.0_p17_p3.ebuild 2048 BLAKE2B caecc598369820a004499350f9c0464618638129fb094c922a225520228bf6745ecfdcd5815b25b2b9db25226653d006f03ca2b63901a53c65c950cd197add7e SHA512 6ce12eca3e2fb4a38cc47948ebe9a2aaff8d1a2c93f8d42fe82505523637a514e393051b85fa2dcdcceeb3d79209ad85a42e5cc5d926d587d2386fc31190c269
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/fam/fam-2.7.0_p17_p3.ebuild b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
index 801f387b200c..9e7ecb066422 100644
--- a/app-admin/fam/fam-2.7.0_p17_p3.ebuild
+++ b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${PN}-${FAM_PV}
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
index 9f163f47b8d5..a57f6168adcb 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -6,5 +6,5 @@ AUX gam-server-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75
 DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST pkg-config-0.26.tar.gz 396399 BLAKE2B 5a88cf825d6ad99d198418798b28c779cfd4c0bcfaa023e915a818c141a504c49a6281ea0b2d04a7a9ec89f9924c87f8b1ddaa5a088952715397081383b3528a SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
-EBUILD gam-server-0.1.10-r2.ebuild 2610 BLAKE2B a12e66ddb778b0a4a48e81c51ec82263139e9b99421d9cbc12cabe723df3bffe7c69b12bb281973f47a704bfdefa3ef5f2c335dc321fcc81f9d13549d22ac67a SHA512 6b53145685991006cd656ae29cf403959a5b557df0eeaac3bff569cade8a25ac7bfc4c2b57fafc16517ba8d1bc98a95dfb3a3dbadca6f1d0fc2dc192460e5e53
+EBUILD gam-server-0.1.10-r2.ebuild 2617 BLAKE2B 0a69d182922d3a95995eef47ac4587336258dfc983e13017e842928b16ebd6e747744acccaf922b58897b9bdcf6bf9821d5c21d84e85dd874f978c10d1833e8e SHA512 8ada6086382ff417ebe800b5de7ff0423ce920cc79ce45ec40b3d029355857d96616bccc9a8bd4aded70227c3d0fae117d27b5878ae3fdce30ad44e1dbc585dc
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index 9e0e8c5ef8f2..18a07d6a7eb0 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-solaris"
 IUSE="debug kernel_linux"
 
 RDEPEND=">=dev-libs/glib-2:2
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index 753525e3f787..2dc8df170d65 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,2 +1,2 @@
-EBUILD gamin-0.1.10-r1.ebuild 588 BLAKE2B 994797d15f7581a42434a497cb0941f3e035154a40b47d45b9540f06eb2d413de97149e5b996aa35c72c27db6e7ac335f4270f4d06fb5214650d873ee072c7e0 SHA512 a877d2f0d469998ba1df5f92689c2800a3d4a9ac108ea11c91c083e3e844c8771ebf2c62060b5d2f6585d6ce7f691cfb212bbf63c56f08195e76e77f11511f97
+EBUILD gamin-0.1.10-r1.ebuild 595 BLAKE2B 8e5765f13763a63463c935c046af171d841f234af0405c332d1d714a59f4e310120157cd3527182e8bc0b6668e3e16476afe36f622ab230c6aaccac90e545af5 SHA512 5f623ce8a41922976dfbd83672b1073e7d76a4e0bff7cb883b73b5b2963d75009273c7029908221ae33179a36be4d25ad86c8d08e813e60e2a56b11721885656
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild
index c9c84e7ac3c8..a19d50b7724b 100644
--- a/app-admin/gamin/gamin-0.1.10-r1.ebuild
+++ b/app-admin/gamin/gamin-0.1.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!app-admin/fam
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 0e71290f6049..ddc84ecf8b5c 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -4,6 +4,6 @@ DIST keepassxc-2.6.5.tar.gz 9809372 BLAKE2B d51782c65fffc4499d85cfa893a908b1f596
 DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f SHA512 fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7
 EBUILD keepassxc-2.6.4-r2.ebuild 2233 BLAKE2B 53fa2d144f16bf30f5068fcdc231756418fcc84b0d7410bcbedb4c5502846de645918bb69d4df8015ba2c98224327dbc5a669679a06e064f55f40941cd47c24c SHA512 2e71956c1bf0cc4e77f03a02621c1b38e183a14f47be9945953b454265449b385f1146f7bbefc7e274c2116b12008318fa81954442082c59f50eb4b2a80f2fdc
 EBUILD keepassxc-2.6.5.ebuild 2336 BLAKE2B 263676014991a0cdcd9a3bf10eae75033b1b9f6429a852f3ae761038ae150340390e6dafb2b094f5477d1ab405517ce6910fbc4ee2eef57702a081f099bb74a7 SHA512 5268dceef5a921ef191acbe703762fed1bf846eaaeabdd37bcaf17f9e14e0413e1adcba32a9b92d6d1bf6ba9d7ec1b1fc3f69a1dc304554bcd792bad87a39b27
-EBUILD keepassxc-2.6.6.ebuild 2383 BLAKE2B 7841f87cab95d61fa2dc474989995214593166c5425d219c0ea62b9f370474d87678ca26153e1244ecb85806b7cd18be15ca6503e85c7edf8fc8a2b1f03cdc3a SHA512 282ce6aa44d55afd78a1d61506b1fe730ad3aa00210486032f048edfaabebbbb31bc8d12296b1780de0f20cf4f05adf358cb82a8f3da5217021c447b6a427e18
+EBUILD keepassxc-2.6.6.ebuild 2381 BLAKE2B 551bca5f58e013b4e90b4122bd02e623429839c168831687bd07a3f9c7f4a09ed2b2e2bab786354c1beb739326da08e7dc7a43c716353222e838cc34a5fbe623 SHA512 1526ab18936e4309935ffb58e549cdc72726d15ddadc6c00fc4fa68f7149fa0aff8ecee9d86872ee933d58255333a883316dc96c6a527baaca1e5464cfed899d
 EBUILD keepassxc-9999.ebuild 2383 BLAKE2B fa4dffbc4af69468ead77d7e9e380e391cef1319bb61f3d9e1fd78ea521f24a9aa991f2209db4da2e7f70dab38b6165d11ee5d766be6fd96d05c4149f92afcc7 SHA512 1aeda66e8167df7d5245c2f1361b6b473d7f598fe308f43e2ccd6badff83aad178122f0396555607e89485e851fe3e4be25923e9c0c225d3baf8ce6762250252
 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
diff --git a/app-admin/keepassxc/keepassxc-2.6.6.ebuild b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
index f6bd89c1df74..e88a934d8a69 100644
--- a/app-admin/keepassxc/keepassxc-2.6.6.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+		KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	fi
 else
 	inherit git-r3
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index af99c3460a01..bf150a9aa683 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,7 +1,12 @@
 AUX lnav-0.8.4-disable-tests.patch 385 BLAKE2B b00a7e4af717a567bf9a7bbecc77500afc22ccab48caaa3781a3d786f4487bcedc59db06b01bfbdcf7871b08cc3b8841582341bec1d707ccf3c94e180a3e59f6 SHA512 f199ec2e9b9a87b8665705051c2a833b8643b18f4793f00587b27eebf0fd455e3d09cbe40613c4e87db58fb91d1f491893d6d9eae38d81de4bb96452e1fb8489
 AUX lnav-0.9.0-bug639332-tinfow.patch 579 BLAKE2B 17707472f4fa764e27d98a1ae426f65a1ad45dacdc34e4c19b608298b7bbc094ddf3c49ded6987ac2c2f145dc58ff9f520a49c44551b277182b76ef13b2fc2fb SHA512 b69da2eac944affd7c70bdf9bcc2be333d5d67d1415e05ebbfd87bff85369ffbe61399b05440637941bdfa4d220ae1ba100342a9e028ee789f3c9f0f1e2dec2c
+AUX lnav-0.9.0-bug713600_0.patch 1077 BLAKE2B e4f2978bac67ec15e6c0320d2136a1edf020941d26bc1b7a63ba23a0139b8a00731c9a8e4e3d5667d9179d05b46e795f99dada4eeafca0b97f24d805ba754e25 SHA512 a90ec77439c9ab74d7b5742542fb2904f154219f63c27ab4e91656f674387bad0cc316c02a60cad72623952e2260b7f4c42dba2f4bdb96c549e2122942ebb039
+AUX lnav-0.9.0-bug713600_1.patch 1090 BLAKE2B 2bf0a77205fa38fd5bd5ca28c65f2b67562b3cbcffd740ee82f1d59e017b1fce9a8ce3a70282d642ce34667a69de2c3a20b20f0fdf9640dc6f9cdb644c923e91 SHA512 821e9f49cd990edff0061f694666a6c9875b023bda2218cd598ef2e2a5d6ae5b6c405249834259035d7d2ee6a91de72f915977ef0bc9ba1bb4936ece72597c95
+AUX lnav-0.9.0-bug786456.patch 12401 BLAKE2B 698644b7b573dd15e3c91125ad80f6794be037f1ccbd8e9505166a0a13968222515672ca502dfc85acffd2d3e594ba8d3802f5561825f7c2a25943970f565f0e SHA512 8c2f6da60355aa9b0b90e9cdbe00b389e5b473bbf2b7705635b1167ab22c2add8c6fd3ec4e8903f6e457c6b1c5e60536b393357b4e5b3403a124f83413d4de33
+AUX lnav-0.9.0-bug792582.patch 3615 BLAKE2B 3e1c71ea871aa909067f3d6a1fa75dc314e4000dc4c8875fa806fcd92bdfd74c2fff4f248742691aa0c1797b7343700f9ab03450ec4504f993750b6e2f020a8f SHA512 2704893f2ae634cf4f15d61a40b3276fc27d40b08373d928b05123e16bc364f0f874dd09c34eeb493604e5f92676d69a7e552c3f9f7362c27998214060bc79ee
 DIST lnav-0.8.5.tar.gz 908012 BLAKE2B a53e79d9403e5f3c731c88a171ddcb62027016b6d7d16fb618aeb9857ff86d1cc9c982d23bd172cc95f5e200afe84b488422ad4fc0aeb440cf2a96506829198e SHA512 fbb61d454dc89388aeaaeca6ba1366f84cbd75260ef8e2f26a4208ab22f175886438dad7f40e4c21089209c7713c1ebcc3a722a248083c8d55f264cf139a79fe
 DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151
 EBUILD lnav-0.8.5.ebuild 769 BLAKE2B b08fe37937578081017b9431dc1aa9d191f6f79e09c1c8b3d3f6ec704688bbba9808a72e9df73f77c88f0bd42bf392a252a07ca723363a35a0d5e1c912fe8aeb SHA512 8361c2a5730cbcbdaae957ab04401685e332b4ff67fcf03441d72bdd6a8d54b95c9caa9378096d32b691c14ab0e135310b7c7c15cf7c1ba2aa4c6eb66a4601da
-EBUILD lnav-0.9.0.ebuild 840 BLAKE2B cc25dbfa40662f380fe3114885cb014c88bb1fa1586207cd0a2f588bbbf0a0921089a44198025e20dd9a9ac90dd2445cbaa62879f278143b90e9e29fea974ef8 SHA512 d7f6d7972d71bb9f96f9cd68a4a320afbe66fa7381a3c80c10eb7c3bb51b929fbef107afe657a2879a38b75159d96eb9a1fab9abc04653989a4358f7d3c9ae47
+EBUILD lnav-0.9.0-r1.ebuild 1127 BLAKE2B 3db56f6846bedb38d6605cebd74c21d210bd1293c71e707a05f00b1ee6bd5fdd330fc137de8090f15a20394ba31374e288bf28e9b7d8b13284fa550cc1da4cfa SHA512 0b536153247f3ab9e6d017ad3a21cfef41f8cee76efa7da19293162984b7ec8b8ad6e2bd9c49a6e729f6cb6e42b0df2c195d844290d7d38bd678d156be0a356d
+EBUILD lnav-0.9.0.ebuild 944 BLAKE2B dc46210b028568171b31b40b3531a24ae7ca2e2aa9f80e1c9538a10ae80e77973b628c5389cf644feb1358152ff2b4f38e0e2fe5c3d898fa8c8f4b4139697e82 SHA512 8d243ec4fafae0bc1c1558b0a9c980874d47bdeeaf3451e0e8647d5825f09647254d76d02e29d71f323f45d63df1b45d42864f2e41cbdc45124bc988c615ad42
 MISC metadata.xml 780 BLAKE2B 2cef44f3fda69ccc20f16a7f75cac035bfec429767dc12966c6729fa1b0b72ac66333d3f3ab7341f7b1b2a0fdd8f533577a04fcf15df7f268ca0a99f8c0acb07 SHA512 b9a91a8dfb2f0f528fb89fc6ea20867792baccdb12386dd8e92f4462b16869b51a796ed44f3f44faa41f8745db18d2c1fe5dd0df82aad6f40486b47b37a8a6e2
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch
new file mode 100644
index 000000000000..47aef6d593da
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch
@@ -0,0 +1,36 @@
+From 60dde499ac87c2399ac24ae85c98ed8cce564858 Mon Sep 17 00:00:00 2001
+From: Timothy Stack <timothyshanestack@gmail.com>
+Date: Thu, 31 Dec 2020 23:23:56 -0800
+Subject: [PATCH] [tests] fix test to make it insensitive to the current date
+
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ test/test_sql.sh | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/test_sql.sh b/test/test_sql.sh
+index c7480ecc..bbb98dce 100644
+--- a/test/test_sql.sh
++++ b/test/test_sql.sh
+@@ -1012,13 +1012,13 @@ EOF
+ 
+ 
+ cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \
+-    -c ";select log_time from syslog_log where log_procname = 'automount'"
++    -c ";select log_body from syslog_log where log_procname = 'automount'"
+ 
+ check_output "querying against stdin is not working?" <<EOF
+-        log_time
+-2020-11-03 09:23:38.000
+-2020-11-03 09:23:38.000
+-2020-11-03 09:23:38.000
++                log_body
++ lookup(file): lookup for foobar failed
++ attempting to mount entry /auto/opt
++ lookup(file): lookup for opt failed
+ EOF
+ 
+ 
+-- 
+2.31.1
+
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch
new file mode 100644
index 000000000000..58aa7264a0de
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch
@@ -0,0 +1,32 @@
+From cc072d29ead6f1df896bc61b83d7d41dab0b7132 Mon Sep 17 00:00:00 2001
+From: Timothy Stack <timothyshanestack@gmail.com>
+Date: Thu, 31 Dec 2020 23:26:57 -0800
+Subject: [PATCH] [tests] update another date-sensitive test
+
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ test/test_sql.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/test_sql.sh b/test/test_sql.sh
+index bbb98dce..22941c2a 100644
+--- a/test/test_sql.sh
++++ b/test/test_sql.sh
+@@ -1023,11 +1023,11 @@ EOF
+ 
+ 
+ cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \
+-    -c ";select log_time from syslog_log where log_procname = 'sudo'"
++    -c ";select log_body from syslog_log where log_procname = 'sudo'"
+ 
+ check_output "single result is not working?" <<EOF
+-        log_time
+-2020-11-03 09:47:02.000
++                                                      log_body
++ timstack : TTY=pts/6 ; PWD=/auto/wstimstack/rpms/lbuild/test ; USER=root ; COMMAND=/usr/bin/tail /var/log/messages
+ EOF
+ 
+ # Create a dummy database for the next couple of tests to consume.
+-- 
+2.31.1
+
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch
new file mode 100644
index 000000000000..e77dd17854e5
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch
@@ -0,0 +1,561 @@
+From e6d2e2d2b95c27cc85397d4af9528111c5304d02 Mon Sep 17 00:00:00 2001
+From: Timothy Stack <timothyshanestack@gmail.com>
+Date: Sun, 30 May 2021 13:33:05 -0700
+Subject: [PATCH] [logfile] add notes for automatic decisions and fix compile
+ errors
+
+Fixes #864
+
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ m4/ax_cxx_compile_stdcxx.m4 | 462 +++++++++++++++++++++++++++++++++---
+ src/base/result.h           |   1 +
+ src/logfile.hh              |  13 +
+ src/optional.hpp            |  45 +++-
+ src/pcrepp/pcrepp.hh        |   1 +
+ 5 files changed, 482 insertions(+), 40 deletions(-)
+
+diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
+index 2c18e49c..9413da62 100644
+--- a/m4/ax_cxx_compile_stdcxx.m4
++++ b/m4/ax_cxx_compile_stdcxx.m4
+@@ -1,5 +1,5 @@
+ # ===========================================================================
+-#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
++#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
+ # ===========================================================================
+ #
+ # SYNOPSIS
+@@ -16,7 +16,7 @@
+ #   The second argument, if specified, indicates whether you insist on an
+ #   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+ #   -std=c++11).  If neither is specified, you get whatever works, with
+-#   preference for an extended mode.
++#   preference for no added switch, and then for an extended mode.
+ #
+ #   The third argument, if specified 'mandatory' or if left unspecified,
+ #   indicates that baseline support for the specified C++ standard is
+@@ -33,21 +33,24 @@
+ #   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
+ #   Copyright (c) 2015 Paul Norman <penorman@mac.com>
+ #   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
++#   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
++#   Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
++#   Copyright (c) 2020 Jason Merrill <jason@redhat.com>
+ #
+ #   Copying and distribution of this file, with or without modification, are
+ #   permitted in any medium without royalty provided the copyright notice
+ #   and this notice are preserved.  This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 4
++#serial 12
+ 
+ dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
+ dnl  (serial version number 13).
+ 
+ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
+-  m4_if([$1], [11], [],
+-        [$1], [14], [],
+-        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
++  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
++        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
++        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
+         [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
+   m4_if([$2], [], [],
+         [$2], [ext], [],
+@@ -59,18 +62,21 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
+         [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
+   AC_LANG_PUSH([C++])dnl
+   ac_success=no
+-  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
+-  ax_cv_cxx_compile_cxx$1,
+-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+-    [ax_cv_cxx_compile_cxx$1=yes],
+-    [ax_cv_cxx_compile_cxx$1=no])])
+-  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
+-    ac_success=yes
+-  fi
++
++  m4_if([$2], [], [dnl
++    AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
++		   ax_cv_cxx_compile_cxx$1,
++      [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
++        [ax_cv_cxx_compile_cxx$1=yes],
++        [ax_cv_cxx_compile_cxx$1=no])])
++    if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
++      ac_success=yes
++    fi])
+ 
+   m4_if([$2], [noext], [], [dnl
+   if test x$ac_success = xno; then
+-    for switch in -std=gnu++$1 -std=gnu++0x; do
++    for alternative in ${ax_cxx_compile_alternatives}; do
++      switch="-std=gnu++${alternative}"
+       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+       AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                      $cachevar,
+@@ -96,22 +102,27 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
+     dnl HP's aCC needs +std=c++11 according to:
+     dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
+     dnl Cray's crayCC needs "-h std=c++11"
+-    for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
+-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+-                     $cachevar,
+-        [ac_save_CXX="$CXX"
+-         CXX="$CXX $switch"
+-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+-          [eval $cachevar=yes],
+-          [eval $cachevar=no])
+-         CXX="$ac_save_CXX"])
+-      if eval test x\$$cachevar = xyes; then
+-        CXX="$CXX $switch"
+-        if test -n "$CXXCPP" ; then
+-          CXXCPP="$CXXCPP $switch"
++    for alternative in ${ax_cxx_compile_alternatives}; do
++      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
++        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
++        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
++                       $cachevar,
++          [ac_save_CXX="$CXX"
++           CXX="$CXX $switch"
++           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
++            [eval $cachevar=yes],
++            [eval $cachevar=no])
++           CXX="$ac_save_CXX"])
++        if eval test x\$$cachevar = xyes; then
++          CXX="$CXX $switch"
++          if test -n "$CXXCPP" ; then
++            CXXCPP="$CXXCPP $switch"
++          fi
++          ac_success=yes
++          break
+         fi
+-        ac_success=yes
++      done
++      if test x$ac_success = xyes; then
+         break
+       fi
+     done
+@@ -148,6 +159,11 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+ )
+ 
++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
++  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
++  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
++  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
++)
+ 
+ dnl  Tests for new features in C++11
+ 
+@@ -185,11 +201,13 @@ namespace cxx11
+ 
+     struct Base
+     {
++      virtual ~Base() {}
+       virtual void f() {}
+     };
+ 
+     struct Derived : public Base
+     {
++      virtual ~Derived() override {}
+       virtual void f() override {}
+     };
+ 
+@@ -518,7 +536,7 @@ namespace cxx14
+ 
+   }
+ 
+-  namespace test_digit_seperators
++  namespace test_digit_separators
+   {
+ 
+     constexpr auto ten_million = 100'000'000;
+@@ -560,3 +578,385 @@ namespace cxx14
+ #endif  // __cplusplus >= 201402L
+ 
+ ]])
++
++
++dnl  Tests for new features in C++17
++
++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
++
++// If the compiler admits that it is not ready for C++17, why torture it?
++// Hopefully, this will speed up the test.
++
++#ifndef __cplusplus
++
++#error "This is not a C++ compiler"
++
++#elif __cplusplus < 201703L
++
++#error "This is not a C++17 compiler"
++
++#else
++
++#include <initializer_list>
++#include <utility>
++#include <type_traits>
++
++namespace cxx17
++{
++
++  namespace test_constexpr_lambdas
++  {
++
++    constexpr int foo = [](){return 42;}();
++
++  }
++
++  namespace test::nested_namespace::definitions
++  {
++
++  }
++
++  namespace test_fold_expression
++  {
++
++    template<typename... Args>
++    int multiply(Args... args)
++    {
++      return (args * ... * 1);
++    }
++
++    template<typename... Args>
++    bool all(Args... args)
++    {
++      return (args && ...);
++    }
++
++  }
++
++  namespace test_extended_static_assert
++  {
++
++    static_assert (true);
++
++  }
++
++  namespace test_auto_brace_init_list
++  {
++
++    auto foo = {5};
++    auto bar {5};
++
++    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
++    static_assert(std::is_same<int, decltype(bar)>::value);
++  }
++
++  namespace test_typename_in_template_template_parameter
++  {
++
++    template<template<typename> typename X> struct D;
++
++  }
++
++  namespace test_fallthrough_nodiscard_maybe_unused_attributes
++  {
++
++    int f1()
++    {
++      return 42;
++    }
++
++    [[nodiscard]] int f2()
++    {
++      [[maybe_unused]] auto unused = f1();
++
++      switch (f1())
++      {
++      case 17:
++        f1();
++        [[fallthrough]];
++      case 42:
++        f1();
++      }
++      return f1();
++    }
++
++  }
++
++  namespace test_extended_aggregate_initialization
++  {
++
++    struct base1
++    {
++      int b1, b2 = 42;
++    };
++
++    struct base2
++    {
++      base2() {
++        b3 = 42;
++      }
++      int b3;
++    };
++
++    struct derived : base1, base2
++    {
++        int d;
++    };
++
++    derived d1 {{1, 2}, {}, 4};  // full initialization
++    derived d2 {{}, {}, 4};      // value-initialized bases
++
++  }
++
++  namespace test_general_range_based_for_loop
++  {
++
++    struct iter
++    {
++      int i;
++
++      int& operator* ()
++      {
++        return i;
++      }
++
++      const int& operator* () const
++      {
++        return i;
++      }
++
++      iter& operator++()
++      {
++        ++i;
++        return *this;
++      }
++    };
++
++    struct sentinel
++    {
++      int i;
++    };
++
++    bool operator== (const iter& i, const sentinel& s)
++    {
++      return i.i == s.i;
++    }
++
++    bool operator!= (const iter& i, const sentinel& s)
++    {
++      return !(i == s);
++    }
++
++    struct range
++    {
++      iter begin() const
++      {
++        return {0};
++      }
++
++      sentinel end() const
++      {
++        return {5};
++      }
++    };
++
++    void f()
++    {
++      range r {};
++
++      for (auto i : r)
++      {
++        [[maybe_unused]] auto v = i;
++      }
++    }
++
++  }
++
++  namespace test_lambda_capture_asterisk_this_by_value
++  {
++
++    struct t
++    {
++      int i;
++      int foo()
++      {
++        return [*this]()
++        {
++          return i;
++        }();
++      }
++    };
++
++  }
++
++  namespace test_enum_class_construction
++  {
++
++    enum class byte : unsigned char
++    {};
++
++    byte foo {42};
++
++  }
++
++  namespace test_constexpr_if
++  {
++
++    template <bool cond>
++    int f ()
++    {
++      if constexpr(cond)
++      {
++        return 13;
++      }
++      else
++      {
++        return 42;
++      }
++    }
++
++  }
++
++  namespace test_selection_statement_with_initializer
++  {
++
++    int f()
++    {
++      return 13;
++    }
++
++    int f2()
++    {
++      if (auto i = f(); i > 0)
++      {
++        return 3;
++      }
++
++      switch (auto i = f(); i + 4)
++      {
++      case 17:
++        return 2;
++
++      default:
++        return 1;
++      }
++    }
++
++  }
++
++  namespace test_template_argument_deduction_for_class_templates
++  {
++
++    template <typename T1, typename T2>
++    struct pair
++    {
++      pair (T1 p1, T2 p2)
++        : m1 {p1},
++          m2 {p2}
++      {}
++
++      T1 m1;
++      T2 m2;
++    };
++
++    void f()
++    {
++      [[maybe_unused]] auto p = pair{13, 42u};
++    }
++
++  }
++
++  namespace test_non_type_auto_template_parameters
++  {
++
++    template <auto n>
++    struct B
++    {};
++
++    B<5> b1;
++    B<'a'> b2;
++
++  }
++
++  namespace test_structured_bindings
++  {
++
++    int arr[2] = { 1, 2 };
++    std::pair<int, int> pr = { 1, 2 };
++
++    auto f1() -> int(&)[2]
++    {
++      return arr;
++    }
++
++    auto f2() -> std::pair<int, int>&
++    {
++      return pr;
++    }
++
++    struct S
++    {
++      int x1 : 2;
++      volatile double y1;
++    };
++
++    S f3()
++    {
++      return {};
++    }
++
++    auto [ x1, y1 ] = f1();
++    auto& [ xr1, yr1 ] = f1();
++    auto [ x2, y2 ] = f2();
++    auto& [ xr2, yr2 ] = f2();
++    const auto [ x3, y3 ] = f3();
++
++  }
++
++  namespace test_exception_spec_type_system
++  {
++
++    struct Good {};
++    struct Bad {};
++
++    void g1() noexcept;
++    void g2();
++
++    template<typename T>
++    Bad
++    f(T*, T*);
++
++    template<typename T1, typename T2>
++    Good
++    f(T1*, T2*);
++
++    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
++
++  }
++
++  namespace test_inline_variables
++  {
++
++    template<class T> void f(T)
++    {}
++
++    template<class T> inline T g(T)
++    {
++      return T{};
++    }
++
++    template<> inline void f<>(int)
++    {}
++
++    template<> int g<>(int)
++    {
++      return 5;
++    }
++
++  }
++
++}  // namespace cxx17
++
++#endif  // __cplusplus < 201703L
++
++]])
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
new file mode 100644
index 000000000000..9059712242a6
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
@@ -0,0 +1,97 @@
+From 141436933a8d30edfd33aa5fcfb0c93cfa3ae9d5 Mon Sep 17 00:00:00 2001
+From: Timothy Stack <timothyshanestack@gmail.com>
+Date: Wed, 9 Dec 2020 15:35:06 -0800
+Subject: [PATCH] [view_curses] use VC_ROLE instead of VC_STYLE where possible
+ and fix segv in mvwattrline
+
+Fixes #806
+
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ src/highlighter.cc        |  4 +++-
+ src/logfile_sub_source.cc | 17 ++++++++++-------
+ src/view_curses.cc        |  9 ++++++---
+ 3 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/src/highlighter.cc b/src/highlighter.cc
+index 24aafebd..110ca03f 100644
+--- a/src/highlighter.cc
++++ b/src/highlighter.cc
+@@ -115,7 +115,9 @@ void highlighter::annotate(attr_line_t &al, int start) const
+                                     vc.match_color(this->h_bg));
+                 }
+                 if (this->h_role != view_colors::VCR_NONE) {
+-                    attrs |= vc.attrs_for_role(this->h_role);
++                    sa.emplace_back(lr,
++                                    &view_curses::VC_ROLE,
++                                    this->h_role);
+                 }
+                 sa.emplace_back(lr, &view_curses::VC_STYLE, attrs);
+ 
+diff --git a/src/logfile_sub_source.cc b/src/logfile_sub_source.cc
+index 14e87002..dce0d4ae 100644
+--- a/src/logfile_sub_source.cc
++++ b/src/logfile_sub_source.cc
+@@ -468,25 +468,28 @@ void logfile_sub_source::text_attrs_for_line(textview_curses &lv,
+ 
+         shift_string_attrs(value_out, 0, time_offset_end);
+ 
+-        attrs = vc.attrs_for_role(view_colors::VCR_OFFSET_TIME);
+-        value_out.emplace_back(lr, &view_curses::VC_STYLE, attrs);
++        value_out.emplace_back(lr,
++                               &view_curses::VC_ROLE,
++                               view_colors::VCR_OFFSET_TIME);
+         value_out.emplace_back(line_range(12, 13),
+             &view_curses::VC_GRAPHIC, ACS_VLINE);
+ 
+-        int bar_attrs = 0;
++        view_colors::role_t bar_role = view_colors::VCR_NONE;
+ 
+         switch (this->get_line_accel_direction(vis_line_t(row))) {
+         case log_accel::A_STEADY:
+             break;
+         case log_accel::A_DECEL:
+-            bar_attrs = vc.attrs_for_role(view_colors::VCR_DIFF_DELETE);
++            bar_role = view_colors::VCR_DIFF_DELETE;
+             break;
+         case log_accel::A_ACCEL:
+-            bar_attrs = vc.attrs_for_role(view_colors::VCR_DIFF_ADD);
++            bar_role = view_colors::VCR_DIFF_ADD;
+             break;
+         }
+-        value_out.push_back(
+-            string_attr(line_range(12, 13), &view_curses::VC_STYLE, bar_attrs));
++        if (bar_role != view_colors::VCR_NONE) {
++            value_out.emplace_back(
++                line_range(12, 13), &view_curses::VC_ROLE, bar_role);
++        }
+     }
+ 
+     lr.lr_start = 0;
+diff --git a/src/view_curses.cc b/src/view_curses.cc
+index 4a36a3ad..2456d53d 100644
+--- a/src/view_curses.cc
++++ b/src/view_curses.cc
+@@ -402,13 +402,16 @@ void view_curses::mvwattrline(WINDOW *window,
+             }
+         }
+ 
++        if (attr_range.lr_end == -1) {
++            attr_range.lr_end = line_width_chars;
++        }
++        if (attr_range.lr_end < lr_chars.lr_start) {
++            continue;
++        }
+         attr_range.lr_start = max(0, attr_range.lr_start - lr_chars.lr_start);
+         if (attr_range.lr_start > line_width_chars) {
+             continue;
+         }
+-        if (attr_range.lr_end == -1) {
+-            attr_range.lr_end = lr_chars.lr_start + line_width_chars;
+-        }
+ 
+         attr_range.lr_end = min(line_width_chars, attr_range.lr_end - lr_chars.lr_start);
+ 
+-- 
+2.31.1
+
diff --git a/app-admin/lnav/lnav-0.9.0-r1.ebuild b/app-admin/lnav/lnav-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..1a6b79c93526
--- /dev/null
+++ b/app-admin/lnav/lnav-0.9.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A curses-based tool for viewing and analyzing log files"
+HOMEPAGE="https://lnav.org"
+SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="unicode"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	>=dev-db/sqlite-3.9.0
+	dev-libs/libpcre[cxx]
+	>=net-misc/curl-7.23.0
+	sys-libs/ncurses:0=[unicode?]
+	sys-libs/readline:0=
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.4-disable-tests.patch
+	# bug 723242
+	"${FILESDIR}"/${PN}-0.9.0-bug639332-tinfow.patch
+	# bug 713600
+	"${FILESDIR}"/${PN}-0.9.0-bug713600_0.patch
+	"${FILESDIR}"/${PN}-0.9.0-bug713600_1.patch
+	# Fix a segfault when using right arrow
+	# bug 792582
+	"${FILESDIR}"/${PN}-0.9.0-bug792582.patch
+	# Fix a build failure on gcc
+	# bug 786456
+	"${FILESDIR}"/${PN}-0.9.0-bug786456.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with unicode ncursesw)
+}
diff --git a/app-admin/lnav/lnav-0.9.0.ebuild b/app-admin/lnav/lnav-0.9.0.ebuild
index 73758b4838f4..bc2f04f49352 100644
--- a/app-admin/lnav/lnav-0.9.0.ebuild
+++ b/app-admin/lnav/lnav-0.9.0.ebuild
@@ -29,6 +29,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.4-disable-tests.patch
 	# bug 723242
 	"${FILESDIR}"/${PN}-0.9.0-bug639332-tinfow.patch
+	# bug 713600
+	"${FILESDIR}"/${PN}-0.9.0-bug713600_0.patch
+	"${FILESDIR}"/${PN}-0.9.0-bug713600_1.patch
 )
 
 src_prepare() {
diff --git a/app-admin/logcheck/Manifest b/app-admin/logcheck/Manifest
index c3622640ead9..ff2542d3c8fc 100644
--- a/app-admin/logcheck/Manifest
+++ b/app-admin/logcheck/Manifest
@@ -1,6 +1,4 @@
 AUX logcheck.cron 184 BLAKE2B 5b773a77dace97e78efa565d8edf3bd715f564721ba0097e82a3894009fa86b6faffd3018a5270e224de2aefaaf07afa76c40b507d6ddffcf5ca4fb137ac6c09 SHA512 fd0b1bc8c836b766bfbb6102012996d27e378475571167b4d4df98301793624483aca2bd51ec19a2aa367e78b062ddde67355452db8dc1d69fe84a20a2081c30
-DIST logcheck_1.3.18.tar.xz 131252 BLAKE2B 024259d965c02d5f27a82f1df1e947d48e4b1bad705882243c4b743a1c061012f2437ecab1a97265f5a330fdec2f813a36c078dca282f54fdfaab03833340320 SHA512 3ab75969f732efa123d9df2c8b44557e4a7eddef8332a8357463930714148a13130c763c22e562bd60e106abf5e18cf39b3572e0c048727a117fbc67430b7e3f
 DIST logcheck_1.3.23.tar.xz 133540 BLAKE2B 7eae2f34027c40d3efc272bc82179962d4a5ba8613e4e6218e9730a0ce3ff00af7e040c0550ac7414ae08191a36bb37ec0358de97367deab48b552782bc25c8e SHA512 635a96c3e0beaf6056e5b96b3bd69134c3330308452e3bcf8cc28cb36365f07806046bf498cbfaf5cfbc38a812eb2723ddf51a16304140e8f7091f1e6005ec4d
-EBUILD logcheck-1.3.18-r1.ebuild 1366 BLAKE2B 3860c10cdb145ae50d9025117d38b7f330fb3cb730e37e86904bc57b860bf83c3cb90cf52af3b2cbc2566a851a02361148da4d049c48bdc017df34005780944e SHA512 fe6b92b43f853bdc1b61e05f8d0c1b1de4ced21e9160a99122bd588ed58711ebde62f9d5aba5f8cecba0ee9b550ce77f44e3373f271aa06c995826899421b2ed
 EBUILD logcheck-1.3.23.ebuild 1321 BLAKE2B b0e04c8d4b2aa8cb66cc259d6ed76c21ef9b868993c41bb96367a5881f0f70791dc49e878b97728372ea816ca5159fbabe42658fb91e56cf328944ef8b4b321c SHA512 839619f5dba2dd94f85748eb6da2d59cea2286632016c93683e4f873e37967d5e5b24544001ebcf3f7fb4b6f5df452c90730a54c040a06b66056a9f72257da7c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/logcheck/logcheck-1.3.18-r1.ebuild b/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
deleted file mode 100644
index eae9a3e73278..000000000000
--- a/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit readme.gentoo-r1 user
-
-DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
-HOMEPAGE="https://packages.debian.org/sid/logcheck"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!app-admin/logsentry
-	app-misc/lockfile-progs
-	dev-lang/perl
-	dev-perl/mime-construct
-	virtual/mailx
-"
-
-DOC_CONTENTS="
-	Please read the guide at https://wiki.gentoo.org/wiki/Logcheck
-	for installation instructions.
-"
-
-pkg_setup() {
-	enewgroup logcheck
-	enewuser logcheck -1 -1 -1 logcheck
-}
-
-src_prepare() {
-	default
-	# Add /var/log/messages support, bug #531524
-	echo "/var/log/messages" >> etc/logcheck.logfiles
-}
-
-src_install() {
-	default
-
-	# Do not install /var/lock, bug #449968 . Use rmdir to make sure
-	# the directories removed are empty.
-	rmdir "${D}/var/lock/logcheck" || die
-	rmdir "${D}/var/lock" || die
-
-	keepdir /var/lib/logcheck
-
-	readme.gentoo_create_doc
-	dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
-	doman docs/logtail.8 docs/logtail2.8
-
-	exeinto /etc/cron.hourly
-	doexe "${FILESDIR}/${PN}.cron"
-}
-
-pkg_postinst() {
-	chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
-	readme.gentoo_print_elog
-}
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index b6a8f6d4ea72..fba530ccb6df 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -4,5 +4,6 @@ AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a
 DIST mcelog-175.tar.gz 315350 BLAKE2B a324af0f4961fb0f6f2af1b198e07a34c24fb5874edd550ca9bdfe452d84cf48d9565530a290a3cdba51eb4ad57f3bbe3d3c9b2beb6d3411195d6dccdb9dfd64 SHA512 992789817a3963a3f118121149bf9b217609f54d85a71c2adb671728cf04777ccb062033df68793afff5fb6a0080b50b4e6fa89cbcd0970d92ca4246155ea13a
 DIST mcelog-177.tar.gz 315474 BLAKE2B 8c6920b01ba836460067f322a17e5a69c2a9a447127ae583ddd151f3cd290aca039a63e95601789cd71c4ef75d4213e39918e08b600aeda3e06bb800119209c5 SHA512 b73d103c7b326e6aa2cb22a05b7df29e24f5b8f9e564a9d2d05627e0af80ee581d62b422e35a68cf3e43a3e1aaf905cccb08a65286c9f77c8c8c2ac41e880fbf
 EBUILD mcelog-175.ebuild 1353 BLAKE2B d6b73b5c2cba965f04baa24493349a8a9e20b584f36056d68905bf0072f53dc25dbf53096ff2484b501a2e143b7110718c8a97e983270350e72ac3d81523b36f SHA512 50587acc615805ef2b615ced31b64de5a614cd72afb5aa5953a03652fb98bb6d947deb3c86116ebb6c8db4822bbcb0e8a693c9d17cd1e36a25baab4ba9a6d295
+EBUILD mcelog-177-r1.ebuild 1160 BLAKE2B 09d326e4b1e37b94cd1b31d9632a375632e9297315e82ae91c33af8915e93ce8f96ef173afc074632b8fef2d44320307743362d463e62b8c36e91416aa13a1ec SHA512 d11bb734c6474a25246a0e74ad4be087990a34e68bd8a91a894798aa4d379f03c63e8e061d6408a32fb53b473e736e3fef1497f6941cc87e96ec4f36f2dc23e4
 EBUILD mcelog-177.ebuild 1355 BLAKE2B c1c875cfb1efeae3e9818a0c1393cca8e05e2444861c426959f212e3a6ffbe1efc3a6b5ad0bdee4f14e8eb0cbfa06fcccd87a8fa8d0cce112ad79a1474d17a76 SHA512 07f1dee935160cafe5a52ec266744b7911095d012eb91d403863e3a4996768c24ea7cf15cacf6600184ba02fec380d3c8bb7390ca92eb9d4066b34bb3fd16595
 MISC metadata.xml 537 BLAKE2B 565ccc3c3b497c157bad02578153aa33529089d8147f70d1e8efd88531ff3b5e615c7733780e6b991b1e7adc3a15c37d79076185141c0f5942958cdab89d84ca SHA512 e63aa74914714bbc4419369a567180acbcb40e162b3d0fa3998ee36e898982401a59f82bc4a848906b8f12de5e87f48114d7c1c1e0dfffe6e656af491c92af25
diff --git a/app-admin/mcelog/mcelog-177-r1.ebuild b/app-admin/mcelog/mcelog-177-r1.ebuild
new file mode 100644
index 000000000000..2ed1d04cc6aa
--- /dev/null
+++ b/app-admin/mcelog/mcelog-177-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit ${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+}
diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest
index f9c7af57767e..d399c674f99d 100644
--- a/app-admin/ps_mem/Manifest
+++ b/app-admin/ps_mem/Manifest
@@ -1,5 +1,3 @@
-DIST ps_mem-3.13_p20200417.tar.gz 18472 BLAKE2B 43e04d0357458107fb25600024243baaec703124fc58a819c011c847a52ad6fb7384ef38a5aa965e3ae88288cca6c76a15819466839eb729a63c4492eaa4ec0d SHA512 9694cec5d696a42dfe2f60dd024f541283e2f52aafb499ee2e551574133262bb0fc4bf6eb0e7075fb1b129aff6cd8fe6968f411f56ee1d31eb6f9aebff2d9852
 DIST ps_mem-3.13_p20201212.tar.gz 18513 BLAKE2B f3eea2008dbb60d34f8f3f1b6369f426685f35e5a39d40eb40dc682b01d20722f54cf965e3ee6a08ccaa14c17341c1c2ae3adbcb4b55c64798ed31ceb6f29ff7 SHA512 7f3f382d803ed2c5c7005f6b79ff8d19cb3d1aa1155717b5eeb94582c49886bce2e18d5ed41133294b7e3b7f2fbfe1d0a517619d0be6bbaf36fc71c7c5a181b6
-EBUILD ps_mem-3.13_p20200417.ebuild 717 BLAKE2B 9cb4b4632cee80201fe0fb763d2ec8b4a5ba56505060d2c24eff1dfa9b9c0c6b29b47b1662a3a85f52e55027c31560aee0559940bbef82248a537b10b10a0547 SHA512 3920b4b030b62d181ced8e1b1b31b6dd5f6b6ed1f5e1f849c0e3ae484431d8278480ec97fe4ae2b0712b9bfe41baf98c411598e20e1fccda5744545039cff3ba
 EBUILD ps_mem-3.13_p20201212.ebuild 718 BLAKE2B 55502cd434c015639491d5ba845a963642e00aa093481334545a11b0f82c3616259de5e8e682a926adc52e0c76d7d75bca51267bbfd3b79b30d5e42160b45c66 SHA512 169a19e94a0dc6420c7ed5ed7b7d7d6342475f413abb3c65765d268d119861f3b25569ad6e1bd60ebe6a88c3a1cc5d61ebc623f063ce914c021deb969d53ca9d
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild b/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
deleted file mode 100644
index 4133b6830efb..000000000000
--- a/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 vcs-snapshot
-
-COMMIT="fc75a8cc3cda05c53a4ae4fe296deeb9fc43908d"
-
-DESCRIPTION="A utility to report core memory usage per program"
-HOMEPAGE="https://github.com/pixelb/ps_mem"
-SRC_URI="https://github.com/pixelb/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 sparc x86"
-IUSE=""
-
-python_install() {
-	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman ${PN}.1
-}
diff --git a/app-admin/ryzen_monitor/Manifest b/app-admin/ryzen_monitor/Manifest
new file mode 100644
index 000000000000..07620e144c88
--- /dev/null
+++ b/app-admin/ryzen_monitor/Manifest
@@ -0,0 +1,4 @@
+AUX CFLAGS_override_fix.patch 267 BLAKE2B 617cd3a3b5b57dc211df80f434f111c7321fc4a49642abf3f65cf2089aca8a28ed5a16500180a385968a20816a944320f1ac64805672a53a64e8ad3330739173 SHA512 ffb1b168c5014f5a705f691bad4abcf76708d3ca8582007bf462511e5b861d4981b3b975403b951cd20b973a585fe636173cfe6fd8546fb8ef821212b76c2373
+DIST ryzen_monitor-1.0.4.tar.gz 33716 BLAKE2B f755cc946b26ea5566c1bd304f84e3a3aee80383d151ec8e702919837d04287d4b3b4000b4f9587003cb20b2be45d4af727eb941c0080772b5f94104d68f8b78 SHA512 93cb55b64db75596da88d8f1f3c5eab38cce52d7ae9bb8b7895d62d39ec0b4c0157bad3ed688c32cc0aecf09eb211614b81159a31c704a0f028751ded46723c5
+EBUILD ryzen_monitor-1.0.4.ebuild 628 BLAKE2B 0864562db3701cfa3809ff5cfcdf8e6bdfac17c5d515ee996cc4f1bd291bac5534cfe454a68ba5548299a26993e2c19981f7fc789b8022effdc7839ecfe5d9b6 SHA512 f9dfd7a093ea9b0ba3ee0e79501824b7c32867efc1b1dd6de201f5dda20d9ea2d01ac51d079a9f8b06d2c35267c004ba85670caaa738726d6c7d8f8cf6840151
+MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch b/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch
new file mode 100644
index 000000000000..efe7fc5e45ff
--- /dev/null
+++ b/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index 5142282..4c0dbb8 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,7 +3,7 @@ STRIP = strip
+ 
+ CFLAGS = -O3 -mtune=native -march=native
+-CFLAGS += -Ilib
++override CFLAGS += -Ilib
+ LDFLAGS = -lm
+ 
+ SFLAGS = --strip-all
+ 
diff --git a/app-admin/ryzen_monitor/metadata.xml b/app-admin/ryzen_monitor/metadata.xml
new file mode 100644
index 000000000000..8072ef2372e4
--- /dev/null
+++ b/app-admin/ryzen_monitor/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.4.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.4.ebuild
new file mode 100644
index 000000000000..9ac20aa45272
--- /dev/null
+++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+SRC_URI="https://github.com/hattedsquirrel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU "
+HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor"
+
+SLOT="0"
+LICENSE="AGPL-3"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-admin/ryzen_smu"
+
+PATCHES=(
+	"${FILESDIR}"/CFLAGS_override_fix.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin src/ryzen_monitor
+}
diff --git a/app-admin/ryzen_smu/Manifest b/app-admin/ryzen_smu/Manifest
new file mode 100644
index 000000000000..fbb7b5acf016
--- /dev/null
+++ b/app-admin/ryzen_smu/Manifest
@@ -0,0 +1,6 @@
+AUX ryzen_smu.conf 10 BLAKE2B 4099cb0962beb496d9eed8887cceadb7c442bf8af1252e7dc30940453c21439826f586e788977cd096b8574353926e2dcf8423efc05caf2ab5fa735139fac987 SHA512 862161eebcfc772c64a30fa402cb8e7961856416611af0585ba16264a7ad94f213aaacff24c49dd09b996b9a785e0def68252c1c4150345c44940e42cd3a05eb
+DIST ryzen_smu-0.1.2.tar.gz 169644 BLAKE2B 48445c857d10077b87513d1ccaf6b94d46f6c9179f327de4309d699a17bdd6b41f956e29e324a466451fb2ed68218730c0a02a19b820909cc606eaeea85ed9ab SHA512 7a47b193c7143c3b6bcc2943f9ee895fa1184c9c14953e728cda4f6c8416bef19f0c5fa34344bc47e21101f47816961c4a5f222fd70a7d29401452f90c75ba04
+DIST ryzen_smu-0.1.2_p20210627.tar.xz 151900 BLAKE2B c3845755753256aeee4e68d106e2f61c3c2578a31035eebac60d6e484f60a592de1c67574519d48cf251403cc118dd98efd030d4d7eee23f58b8f7b0d2e0ca8c SHA512 65578d8696fe3b8d002895614df72d57700fb1a5b8587fe0671a6863446fad72425400f9f6767abfdc636927132820e63b7f780fd9e88b5ab4b13668be405ed0
+EBUILD ryzen_smu-0.1.2.ebuild 724 BLAKE2B a45c479b48c4d540fdfa31b3a63f61a3eacf6dfdf4466f680c102c2f21121b349dca167c7bb04b3280c79d9cba54db7c26cfbae2ec42d7499e401f9994d99d27 SHA512 1aa4caeae2b43da502f388eb27aac72ecf6ffa5b34eb1cc52ff83e7f5deaa02cb67c50cfc110a2c7bafe18239a52c15c16e3bf26f39ee81a1a19637306126fe4
+EBUILD ryzen_smu-0.1.2_p20210627.ebuild 717 BLAKE2B 6f0f45a1144629851eb32ef6b4b6e2c084cb92d68bffcac988791ea1d6139e9456dd5c55b81814af4fa81ed04cf7e58d235f11ae722059e823a36a4dda4be8ee SHA512 ca1ed98ed54d984fcf8d974ef123446d5fc16852982e4815083ac66bb7ed93beee76fea8cf63f633bf1a77effa650cffcfb6e918a27a9ebeaeb7ca7d5fdd8f5c
+MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/app-admin/ryzen_smu/files/ryzen_smu.conf b/app-admin/ryzen_smu/files/ryzen_smu.conf
new file mode 100644
index 000000000000..fb6a82663e3a
--- /dev/null
+++ b/app-admin/ryzen_smu/files/ryzen_smu.conf
@@ -0,0 +1 @@
+ryzen_smu
diff --git a/app-admin/ryzen_smu/metadata.xml b/app-admin/ryzen_smu/metadata.xml
new file mode 100644
index 000000000000..8072ef2372e4
--- /dev/null
+++ b/app-admin/ryzen_smu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/ryzen_smu/ryzen_smu-0.1.2.ebuild b/app-admin/ryzen_smu/ryzen_smu-0.1.2.ebuild
new file mode 100644
index 000000000000..4e4a1bbe5e0c
--- /dev/null
+++ b/app-admin/ryzen_smu/ryzen_smu-0.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod linux-info
+
+SRC_URI="https://github.com/leogx9r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Kernel driver for AMD Ryzen's System Management Unit"
+HOMEPAGE="https://github.com/leogx9r/ryzen_smu"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+MODULE_NAMES="ryzen_smu(misc)"
+
+pkg_setup() {
+	linux_config_exists
+
+	linux-mod_pkg_setup
+
+	BUILD_TARGETS="modules"
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERNEL_BUILD=${KERNEL_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/ryzen_smu.conf ryzen_smu.conf
+
+}
diff --git a/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20210627.ebuild b/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20210627.ebuild
new file mode 100644
index 000000000000..74f80a772eb0
--- /dev/null
+++ b/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20210627.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod linux-info
+
+SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Kernel driver for AMD Ryzen's System Management Unit"
+HOMEPAGE="https://github.com/leogx9r/ryzen_smu"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+MODULE_NAMES="ryzen_smu(misc)"
+
+pkg_setup() {
+	linux_config_exists
+
+	linux-mod_pkg_setup
+
+	BUILD_TARGETS="modules"
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERNEL_BUILD=${KERNEL_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/ryzen_smu.conf ryzen_smu.conf
+
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 618cd5e7d3b4..4d8b38487ffa 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -35,10 +35,10 @@ DIST salt-3001.6.tar.gz 15736056 BLAKE2B 00e7674452e9d61c3cd487d27a3a1f3435c6b12
 DIST salt-3002.5.tar.gz 15784880 BLAKE2B baa90bb0caea572dfbe12d92fb488ee0c4adef9a07221f394009cd43a62ffef18c57f2e7cdcfcd923807c7a3d02ce6833480f74d70250c29d311420f30514300 SHA512 dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1
 DIST salt-3003.1.tar.gz 16010476 BLAKE2B 3cd141061d8fa6ad00fe60615e8d36fda9fb26264adb2722d34e0b93c626fe09d78c3b9280ad8fe98924469a1ede1ad93cc06bde24a121c3db8c957be0ab7d75 SHA512 bf5ec7f1d16c776be5c2e90bff30e11817f369c3b08c0fe8bd991e7be31179b10cbd244048fb08c05aff30d7b6037c0575c311da4a0f300ce02bcf677aa6616f
 DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38
-EBUILD salt-3000.8-r1.ebuild 6607 BLAKE2B 836d773a15e113447bddc988f783ad1ebdcbf1c434e5c16d490c3a65bb60b70d76d4ed550408fa34bde0d38d992ff8b1173e1c61b03e508886689c1ec2c0812c SHA512 f4a0c7a3a951a8d98f3240800cbdb61d2c19ce6229641b36dfdd9b81808918bdbe3265c9db6c8d6f70eef023000358d73a72507ac9314c87e300414821bbbe8d
-EBUILD salt-3000.9-r1.ebuild 6649 BLAKE2B 66677b3408322036e59bd64f3f0c64bffa916079e40c08273ad326191fe57962846b862933b1319cdbba81077a26c3e7569796205d7ac7ce89068feb32b283b0 SHA512 8f2095fc664c4d92c0a1ef2d250e70e25ab1468185466644c51d15ecfdd6f393919b6f9a18a1b1d46701ab839ebcb851360477e19f942223245bbf98bafbba94
-EBUILD salt-3001.6-r1.ebuild 6230 BLAKE2B 2d426df7b28e4f24bd7bcf79bc6a641816e04c58189e69a9b90e367d859d8238eab992a5c2366bf0b91f2e6880b0c67b586fd3df9ddd49cbce06d54bddefeb83 SHA512 db15971b900f13c27f9e61d954562e67de3d9bdc14420cf22460a41ab528f96ea5cbb1703828b73478998f62015be56ae08b69b30d5ebe511fa533f1b01c0584
-EBUILD salt-3002.5-r1.ebuild 6266 BLAKE2B 48c7fb0bd4b5dad34c7c998a4083bf9a34d1413bd1e62c9018906c6fde58bfe97da696b235534bf96ef9a6e1e9c4c2f89262ed6859a88d21b73f50a370f5ecc1 SHA512 8e06b18090a9fa3624e5d9677efbf42d5286f3118d39f22cee8c99ae093f09fc5bb2faa4bab4bf51bdb12b1403632ccf22da49146aac2203d57d754def6ad5db
-EBUILD salt-3003-r1.ebuild 6566 BLAKE2B 1390e1fe90572ddae6755496cf76d433e652d5279b57d9a73617d779ccdc16ed799855f9be4422cb8aea4c1da090f9769dcb9e391183a35ca9e22b890fed9b19 SHA512 01f6716f24f4a97142aa37fdb37dac3b49dc67aaef6f41352489043d77692ae2ef4a5f5c71c1aed3754b04ddc29b1156b1e2923756f4db7bc27d0b645ee3b6e1
-EBUILD salt-3003.1.ebuild 6678 BLAKE2B fe0015562b80785d745d2025d561f150aba7e0199f3d356573bb95e71dffca7c3b0db1f9cdbdbb0c3482df726b55f7010aee9471ad6d7d9cf34a7a9856951ee1 SHA512 78c63b69c41db96fb7ce3b40949bfa178b7faff880939606a3ec6c5bba3cdfe5e155017d05fe484b9afb037dca8eba9c29ddf05e8ca094512025f01eec099a90
+EBUILD salt-3000.8-r1.ebuild 6619 BLAKE2B edeb4e38aab16c71206a6fea80e6e72d89659e427af66961235a854368ee785963a4cf1800cb4a725722fd433a56349b4e5fbb58626ee563c489de2c1b4fbc13 SHA512 439fca4963d8ec8f840c4fc2a3d49c04256ba53ef4f222887188b3c877bd0cdbbe24a081bfbcf75d02a5a6e39c0544bbb634fc6aacf850983825549b84cf372d
+EBUILD salt-3000.9-r1.ebuild 6661 BLAKE2B 0234da9585d1606983d13022f59878394d47d4b3389655568164d22a45f1de52af53c8f1ff9978f4c41abc2c3531d1a25687ed7300011fb9372756836093e8c4 SHA512 08d14c253e18b99cd85b07ae3eaa1f5161881badf4fb9a744093704b5f3da1f693a81f415c6a95360bd3c54762657a3be549a45f4f3c9743d6e893f8c6482b6d
+EBUILD salt-3001.6-r1.ebuild 6242 BLAKE2B 570ba5f2830435467db7eb562c58f3f45199b2519ce0f88eee298e66b3b05a9d5f111dc399709bc70e97d6c109275a676dcb2b8fb0a3eeb55fffb4a053974ce2 SHA512 06a37ac98911040244f18b562affe9732315ed8feb0944f00a5c82e31061966d173cc33e138be8ce852da755532e436742f778130c5a61aa9e38b966e8d2c811
+EBUILD salt-3002.5-r1.ebuild 6273 BLAKE2B e9768ac7fcd7a11c6c05bf8b9900428af79aa63cd1332208ec15295cfc769945bf77e16afaa696e26efbdcba525df1ab520838bffce7319470a742133544a759 SHA512 ceee568eba9776ccb8bacbabf914899f1bd4d27fdcc777a2296b046169601cdb269c2e32e2dba7d052dc780a5990e0d1deb5dee2c4180f6383ea9a45922e33c5
+EBUILD salt-3003-r1.ebuild 6578 BLAKE2B 3741769a693c4d2bd6868c0cd3ef47697e25a97675336c08c2af482702d48c43e6a54ed71092f1ba754c52938533d8dc8a94e6f5e678c77419824b2b51e04924 SHA512 c5bb47ee8a74e07bae14a368ad48f7ae5906a738ee04a48c4d2efea32f6cf65475e1d4db4107d61fd9fd267cf105d36a682171ae4af4745eed51e587a78514a7
+EBUILD salt-3003.1-r1.ebuild 6810 BLAKE2B a66ce2731f94e3a870a0ffb5ba0e2627a7c6cf345009b33b1095bd3e7439fb12450abc2d9aa858106bf590cceb198fbe449dd50b32e3bb2214bb96e9bc560309 SHA512 009ab916c2f44a7e99bc5fbc1e50709a361eaf395d26babadf88f5e05322a0b44596911cbd310fc4089928fbc1f100923b274307f759d169a40c604c6b377a31
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/salt-3000.8-r1.ebuild b/app-admin/salt/salt-3000.8-r1.ebuild
index 986ee5e8b93e..13ed8d22824d 100644
--- a/app-admin/salt/salt-3000.8-r1.ebuild
+++ b/app-admin/salt/salt-3000.8-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 		https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/salt/salt-3000.9-r1.ebuild b/app-admin/salt/salt-3000.9-r1.ebuild
index 876a4b185475..5be41e9acbe2 100644
--- a/app-admin/salt/salt-3000.9-r1.ebuild
+++ b/app-admin/salt/salt-3000.9-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 		https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/salt/salt-3001.6-r1.ebuild b/app-admin/salt/salt-3001.6-r1.ebuild
index 69dcc1cddbd0..e6a695ff300f 100644
--- a/app-admin/salt/salt-3001.6-r1.ebuild
+++ b/app-admin/salt/salt-3001.6-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/salt/salt-3002.5-r1.ebuild b/app-admin/salt/salt-3002.5-r1.ebuild
index 91a7919ea18b..45c6151ec8e8 100644
--- a/app-admin/salt/salt-3002.5-r1.ebuild
+++ b/app-admin/salt/salt-3002.5-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/salt/salt-3003-r1.ebuild b/app-admin/salt/salt-3003-r1.ebuild
index 19b06ebd0227..0d4ef8fc9027 100644
--- a/app-admin/salt/salt-3003-r1.ebuild
+++ b/app-admin/salt/salt-3003-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/salt/salt-3003.1-r1.ebuild b/app-admin/salt/salt-3003.1-r1.ebuild
new file mode 100644
index 000000000000..5c542bc2bd47
--- /dev/null
+++ b/app-admin/salt/salt-3003.1-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax"
+
+RDEPEND="
+	sys-apps/pciutils
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist(-)]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
+	)
+	neutron? (
+		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/libcloud[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+	"${FILESDIR}/salt-3002-tests.patch"
+	"${FILESDIR}/salt-3003-tests.patch"
+	"${FILESDIR}/salt-3003.1-tests.patch"
+)
+
+python_prepare_all() {
+	# remove tests with external dependencies that may not be available, and
+	# tests that don't work in sandbox
+	rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
+	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
+	rm tests/pytests/functional/transport/server/test_req_channel.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+	rm -r tests/integration/cloud || die
+	rm -r tests/kitchen/tests/wordpress/tests || die
+	rm tests/kitchen/test_kitchen.py || die
+	rm tests/unit/modules/test_network.py || die
+
+	# tests require root access
+	rm tests/integration/pillar/test_git_pillar.py || die
+	rm tests/integration/states/test_supervisord.py || die
+	rm tests/pytests/unit/client/test_ssh.py || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
+	# pycryptodome rather than pycryptodomex
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	einfo "Fixing collections.abc warnings for ${EPYTHON}"
+	local abc
+	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
+
+	# removes contextvars, see bug: https://bugs.gentoo.org/799431
+	sed -i '/^contextvars/d' requirements/base.txt || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	# testsuite likes lots of files
+	ulimit -n 4096 || die
+
+	# ${T} is too long a path for the tests to work
+	local TMPDIR
+	TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)"
+	(
+		export TMPDIR
+		cleanup() { rm -rf "${TMPDIR}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${TMPDIR}"
+
+		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
+			"${EPYTHON}" -m pytest -vv \
+			|| die "testing failed with ${EPYTHON}"
+	)
+}
+
+pkg_postinst() {
+	if use python_targets_python3_8; then
+		if use nova; then
+			ewarn "Salt's nova functionality will not work with python3.8 since"
+			ewarn "dev-python/python-novaclient does not support it yet"
+		fi
+		if use neutron; then
+			ewarn "Salt's neutron functionality will not work with python3.8 since"
+			ewarn "dev-python/python-neutronclient does not support it yet"
+		fi
+		if use libvirt; then
+			ewarn "Salt's libvirt functionality will not work with python3.8 since"
+			ewarn "dev-python/libvirt-python does not support it yet"
+		fi
+	fi
+}
diff --git a/app-admin/salt/salt-3003.1.ebuild b/app-admin/salt/salt-3003.1.ebuild
deleted file mode 100644
index fe9927cb4610..000000000000
--- a/app-admin/salt/salt-3003.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
-	mongodb neutron	nova openssl portage profile redis selinux test raet
-	+zeromq vim-syntax"
-
-RDEPEND="
-	sys-apps/pciutils
-	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? (
-		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
-	)
-	openssl? (
-		dev-libs/openssl:0=[-bindist(-)]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
-	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	nova? (
-		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
-	)
-	neutron? (
-		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
-	)
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )
-	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}]
-		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/libcloud[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
-	test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
-	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
-	"${FILESDIR}/salt-3002-tests.patch"
-	"${FILESDIR}/salt-3003-tests.patch"
-	"${FILESDIR}/salt-3003.1-tests.patch"
-)
-
-python_prepare_all() {
-	# remove tests with external dependencies that may not be available, and
-	# tests that don't work in sandbox
-	rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
-	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
-	rm tests/unit/states/test_boto_vpc.py || die
-	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
-	rm tests/pytests/functional/transport/server/test_req_channel.py || die
-
-	# tests that require network access
-	rm tests/unit/{states,modules}/test_zcbuildout.py || die
-	rm -r tests/integration/cloud || die
-	rm -r tests/kitchen/tests/wordpress/tests || die
-	rm tests/kitchen/test_kitchen.py || die
-	rm tests/unit/modules/test_network.py || die
-
-	# tests require root access
-	rm tests/integration/pillar/test_git_pillar.py || die
-	rm tests/integration/states/test_supervisord.py || die
-	rm tests/pytests/unit/client/test_ssh.py || die
-
-	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
-	find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
-	# pycryptodome rather than pycryptodomex
-	find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_prepare() {
-	einfo "Fixing collections.abc warnings for ${EPYTHON}"
-	local abc
-	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
-	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 4096 || die
-
-	# ${T} is too long a path for the tests to work
-	local TMPDIR
-	TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)"
-	(
-		export TMPDIR
-		cleanup() { rm -rf "${TMPDIR}" || die; }
-
-		trap cleanup EXIT
-
-		addwrite "${TMPDIR}"
-
-		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
-			"${EPYTHON}" -m pytest -vv \
-			|| die "testing failed with ${EPYTHON}"
-	)
-}
-
-pkg_postinst() {
-	if use python_targets_python3_8; then
-		if use nova; then
-			ewarn "Salt's nova functionality will not work with python3.8 since"
-			ewarn "dev-python/python-novaclient does not support it yet"
-		fi
-		if use neutron; then
-			ewarn "Salt's neutron functionality will not work with python3.8 since"
-			ewarn "dev-python/python-neutronclient does not support it yet"
-		fi
-		if use libvirt; then
-			ewarn "Salt's libvirt functionality will not work with python3.8 since"
-			ewarn "dev-python/libvirt-python does not support it yet"
-		fi
-	fi
-}
diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
index fc86d6d8fcb4..a99e13133603 100644
--- a/app-admin/serf/Manifest
+++ b/app-admin/serf/Manifest
@@ -39,18 +39,12 @@ DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip 6210 BLAKE2B b5d3b2345
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
-DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
-DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.zip 525053 BLAKE2B c667a83b0ff18782c883406910620d3eb32b541043520e782953a71c33ebdbdc149612f87df68fb645f72db9c888c1d0ea8165210c35498bb840b9047ff0d1aa SHA512 5e60b4baa404de9210496a710ef1bd73b8795f679c6079719d7ff30c5a545f9ee407108981a3019bba008100f35b722f9eade9e48c09df4b8a245b0dac228ccd
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip 19501 BLAKE2B 6c60c3832f5bd1d3c50b058611c9896a3db90dd727401506bdcb656966368cc9af7d8384a714e370dd69714856b63351db4485716dff566c3518434919cc4035 SHA512 02cde99c414bb38d5586ce722128e6c9a940583c9c4a99f1ec30787988235de6a3a1c516c150aa2bc94dab7723a9988c7efa2d8b151d05c9c36c04af6d145168
 DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
 DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip 9174 BLAKE2B d972fd0c0a8b7135723ae51a6e57ce7b686c7d4b88313c2df73fc537874405595f82f58f5ca51da4036667f6d48f74022225209bcf148228e1d0deb0a6d3d709 SHA512 f2935ed7cc01bfb3aa7ff86dc4172edcf5fe20727c59a43676565d81c878de1dc6a0c49bd51076bf2e078ff71f72ad689802c0286d26e0bad26b2ded74d222d2
-DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
-DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.zip 14575 BLAKE2B aa85d696951ae3aefd27eb419d146d6475bd8d9039d2385fd44a1ec7d0ebda4d1d82a7cea586a6090d67b0d7f692ea958b62ea1d8d75caba640ddc58469b7996 SHA512 498f6c6cefcfd5558cac0f3485e2a11f4ce9aeb9ccf4d9c460354da5268d17bd5a301ac60cf93d73062a236330d254da8c2ca02fe0a339d25f9a70fe064ac610
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip 14557 BLAKE2B 7b306a1151cda04a778b2606fbd7e5257a80da359ee6f02374bcf7199f16e3513be56c706d8af2fe2e683c46b80f9680e6831f0e022f3c8dbc5e0c16020d7a72 SHA512 96125081b3fe8233d3c2885c52cbd46c7091f4dbe7ff3e542f934c21c75f498b6bbb89200f9ed27dcc572b16dcb31bd400bb4d74b4e75e171c565ce7c1ecb3cd
-DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
-DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.zip 103250 BLAKE2B d322a7ccfc3ca434f8f44cc07769e4179197d1d48d85bf7c4e666f9a6c12640dc4196937af09ba7a07c9da1bdbba5749f2c37744ae28b7c526174aa7af072866 SHA512 af29d68cb9eeadc11a5d0e9033ac0c9a9aa9972935b2cc7eb76e951db9b12124f16b0a6ad91a5990b37c08c8b39258f32a9e63afad75e114fc853ec89504db93
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
@@ -68,14 +62,8 @@ DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip 205179 BLAKE2B fb8268a263b729fdeebf985c355c67aa1f3d2d9cfa21dc8268852df9788a2b27b06586be0d715e0d65211272b41117810e2441594bb1f74013cfcfd794baed18 SHA512 21644fd845a9e20e7b142e5671cc53cc39a0de3461b8374b6fb1719b44d464014041458e547e1621a765c3156742b0d5f2c6bd168f4ea49e9819af0d9f25ac79
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod 371 BLAKE2B 3ff3ff24a8fa567c715a8698c5a636f3eb2b1bf95263dc71a57d506a8fdf9e25cd741b8d0564ba95c04c696ba536ba44149da16572e13c1b5134c24dd0edddec SHA512 5a25ee9f24cf52fccb76de4ca0d1ee7bf309044e6700d48273bc1ceba948831320a51a7013584f60496df642284a4a282b2ed44e7d6290e96927927a220619d6
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip 214127 BLAKE2B 305af1bdb26a01095cb780a27be74f6a3d53c72b1af1b6388dc284290271c6a2cd39e06b6d8856d81584b35be6c2ff1ee38d79175502a9e2bab782f29cb855ae SHA512 2ac387028c1ffe54d5223a0325e2c36c827ad93e24c628ac353da6b4b97df9ccbb3f8d0440449d3b190f30ffcfd7fb865e3e030b882dcbdea116f20e3184fcf5
-DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
-DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip 30028 BLAKE2B 2d6bd9a97203fa6b04ff50734a1f7da69641cc4fab3830aef9820c63f680182efebc9802ab33aa471c4701bce8ae571cb1ca13a8f48f820358b921ca19ef98ee SHA512 37d61427d0ff8e8b7f9183046aaaf829e5006abb3b0e3824c0dfab2c96f03dbecbaab9ea983a8835da953ec664cc6074097f13382edd4fb19ee7eeb21cff4668
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip 30608 BLAKE2B 68db36e6420be62aa1594d415cc95da064c3f80e220891bc747ab61d1bada168fa8c33875bb8f5a1b3cbfcae6b9f48cc28fd792b884f7378b797f5f7445c268a SHA512 41d05b304a7325dbb01dc2704407f5a7c7f7c1255c58cfde66b1d9668b15e1b5e83b5159b25a6ad7d6fed90e64446b32c1633135a018bbb4357c495e3efc8a83
-DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
-DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.zip 19998 BLAKE2B 744a88d9e7abc1a41322870a5bf3cb7f132c768f29975271342723f7395b2d29034be3f706eb239c8b3c50874c5512233be3fa0deedde611805e592bc2992957 SHA512 a81874721f0491ef2bc82d3c3a0e40aaa4db4754d04783375853b05d29f3e57b01df01e81d786771c6612024875797ac7ea6a3142fc0c6957ffadebb4b29576d
-DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
-DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip 2536 BLAKE2B 5f26ee7bc9146338a1bea319bd563161f921017bb208967b7745a06e7482232f00f7c32f23cd526efb44211e9275d0fd27556f77ad3fbb033677b12e79d520ea SHA512 c27fae2305ad9b3dabd7bf99214b86540ad21a6b2bc746c67251813769da9d49aea1cfe473fb4effa9ab7ed9e1397c36c9906445a68e84be1215ed2b3148ab9c
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.zip 19493 BLAKE2B 225ef4b00c72d940339165b6ece105ab8c7cf054a0798aedbd1a479f8b3f44560552ddbafe3185c5b49bcc8894764634eabb096b3e22f0e28b74e7455a587479 SHA512 60293937f16bc9e9c466eb6b33e17c8a2b533ade698c804d757192dcea5e744a4e6762755624071c422825c5d7b533c5020a0e8c8213b0ed8eb32f99e6db8a7c
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
@@ -92,20 +80,14 @@ DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 4415 BLAKE2B f50a9fd1f74506625ae9460c6071bbbd1dd3ad3d83264fb7def028c757e8ad8f865fc7255db6e9b5cdb7a1744ac1f741bc6184f064eee7108f6fc0facc81f639 SHA512 acd19ece301ac146ae50dd784e3dc1c2cbc0c00a562fc5d2759b7b8a4acf0b5bf83d5bcd54122130877a1568a13709c28ab7e1cc7ba269ec91aa1b1a86c2065a
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
-DIST github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 BLAKE2B ce589f986762768fc22148963a35a152a48c17aa55b9db5d5cf41e4e349be63ed0cea2afe3f916479bfc82bc951e4d427d223122ec6c472e58de02e55290ca07 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d
-DIST github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 BLAKE2B fdb82b106446b0fe5d5c6c9cca2c8303fbef305ae1c45a82ca7ba5bbc9ce4db3708d7680bfe95099e73a5f5a3d687f25d77c7b535f3e1dc71e5fe8915eb9642e SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.zip 1762275 BLAKE2B 5025486c3ccef3c6967216f6ee8dac5416f37ce22c5f8b3236038100766b768278c5beb2f1483d89111f24c81061fd79231bf8b26cb0170bb340eb77f001af6b SHA512 8605ec4abfddbc56652ad2106863f5e316708f5bd055cc28ff557029377b4f9df98215a1fa8c8832b7bc7f959d89d212b663e7f6dec725aa680dc38813f7fe8c
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.zip 1825975 BLAKE2B 8524a8f4a8a97083e7f3e680b5882b417f8f13fe989361e25f785cca9c7e26214f643b47e10f3827eab878c783aa588864ef58972d34db1a8a788726cbb19844 SHA512 cd4dc434a7db8bec5cc82fcfcf19c7d2ef46314cdc38d471069a03e5bf24988f159fa1bd2487b02bc95ee1d5358035f20dc663b7d5ad814e7c9bb468307ff20d
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.zip 1322810 BLAKE2B 5457e6fe2004a8b694d792518f1f707c69ce44d005d7c2f6623a0fd36eb099a683022677d6042861a891e421a594212c979adddb56bee840bea15cac9c8de5e5 SHA512 2b34a5da99f3d41b13a7a8414d5948aa15b584beb1ff3e650fa99ec53f23b17b914778b0523b19f8e06623d9c8240441334c5e4026435a9201b8bcc9b46e29a4
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -135,10 +117,6 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
-DIST serf-0.8.1.tar.gz 1445011 BLAKE2B 5fcf1e3e87c777852656426529daab4ceb3e997d70ac54d81f48bbea37ebe2dab9c27d0b2fff3c4e031a7995eaaa25378ccbbd359ef0cc265cc58db4ddb25c21 SHA512 81a4bc2e1659324980fd59464af021ad5ec80431dc1b49b875bb0c97c8f92766dfee9b204bd8c9ab4e175a281bc23815f5e3008ecfb2848c7354c33603bb5514
-DIST serf-0.8.2.tar.gz 1969342 BLAKE2B c9dc51ff5547edb0299907abbfe719c7286ce2bdfa2a79d04857c339ea481362f6406320f1d20b61362eb8b243f6b19fd51414bbffddda39cf8911eb776dce4a SHA512 65567753e642e78bf1b33acb7ba75f08bb5eb5e3e8f0482688617ff84985de28297f6c86336a1a9bc203f3275b4f36210e1cb50c556f2f5f24be9ad518876469
 DIST serf-0.9.5.tar.gz 2301292 BLAKE2B a3864aba7962fd19223d7fa2557298bf5f4c7f1afa3e72bfd131f815de09c5d9e67c5d01589519ffbb019dea634afa32c458a75c25e0cde82e647eea9ecf7f95 SHA512 a527d9a257365242e307af171f1ead1fd4fa302f6ec7774aeac508f98a422da649533a7b16843656e322b42aa20d900582df5668d14ef2d20c24ec9722d06383
-EBUILD serf-0.8.1-r1.ebuild 2103 BLAKE2B 2da8b75a519b39ada23d07d65b481cfcbe5f09536edef531b177315529ceb001fd3e766f255008b55e636fb958e49780db16b14b129aae55f4d66fdc89e33d05 SHA512 234045563ab81168df44440cc4c496e8c5933ab4229d3d395d0dc1f8cbbf3b78783b60fd0c19e73ff7cb4b795540470552ef5bf11d399ac7946282cbeae2f131
-EBUILD serf-0.8.2.ebuild 5095 BLAKE2B aa4364402c7b450df15c4c2a03e273a2cfe9f58dbe255aef53fcb7c1e12e2508f2295f8e20fcb1691709744446952aac091e6c68913b416df9c793b692eacaac SHA512 297e462f4bdab599b65e4009dee06a13f1cf934c8e89e78185f6969e22d219d7de32deeed803d9601af1719c1bdabf6d36edc22e31b35edcbdbd4244efffc87c
 EBUILD serf-0.9.5.ebuild 6944 BLAKE2B f23f5428f04c45f2bdd51f47c1f45813480003c99a334adcf10a7803f55fa4ceaa67fa0400453c0b0df09fea95817e1f62bec27b8977353bed20cd5218c17581 SHA512 b20ca0b2f61137373c4777d5a580def9b60ca10d5fb5627c319fdf1d1eec5750ef4a4189ce29b556e49db72797682e9a07217c134cdb704dd3656a4dbba46f5e
 MISC metadata.xml 297 BLAKE2B 0d2ca75df2b4667d5b2cfcc0b17ef36c88d2996e661d3393eed3ea61c256a760c4844d9f99c4b280a8409e288392689ab17f46adc40188134307b7ea6060f9b9 SHA512 a4e75bdd3c86842ac3de4852d00f264e877c9784754eb9b2d4d38c39123115ded6beae61628b5315d7c19bfbefd1e0360491b37656e34a87b33498b246521e76
diff --git a/app-admin/serf/serf-0.8.1-r1.ebuild b/app-admin/serf/serf-0.8.1-r1.ebuild
deleted file mode 100644
index ecfede899054..000000000000
--- a/app-admin/serf/serf-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-	"github.com/mitchellh/gox c9740af9c6574448fd48eb30a71f964014c7a837"
-	"github.com/mitchellh/iochan 87b45ffd0e9581375c491fef3d32130bb15c5bd7"
-)
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/serf"
-DESCRIPTION="Service orchestration and management tool"
-HOMEPAGE="https://www.serfdom.io/"
-SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="
-	>=dev-lang/go-1.6:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup serf
-	enewuser serf -1 -1 /var/lib/${PN} serf
-}
-
-src_prepare() {
-	eapply_user
-	# Avoid the need to have a git checkout
-	sed -e 's:^GIT.*::' \
-		-e 's:-X main.GitCommit.*:" \\:' \
-		-i "${S}/src/${EGO_PN}/scripts/build.sh" || die
-
-	# go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
-	sed -e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:^GIT.*::' \
-		-i "${S}/src/${EGO_PN}/GNUmakefile" || die
-}
-
-src_compile() {
-	export GOPATH="${S}"
-	mkdir "${S}/src/github.com/mitchellh" || die
-	mv "${S}/src/${EGO_PN}/vendor/github.com/mitchellh/"{gox,iochan} \
-		"${S}/src/github.com/mitchellh" || die
-	go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	PATH=${PATH}:${S}/bin \
-		emake -C "${S}/src/${EGO_PN}" dev
-}
-
-src_test() {
-	emake -C "${S}/src/${EGO_PN}" test
-}
-
-src_install() {
-	local x
-
-	dobin "${S}/bin/${PN}"
-
-	keepdir /etc/serf.d
-	insinto /etc/serf.d
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners serf:serf "${x}"
-	done
-
-	newinitd "${FILESDIR}/serf.initd" "${PN}"
-	newconfd "${FILESDIR}/serf.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/serf.service"
-}
diff --git a/app-admin/serf/serf-0.8.2.ebuild b/app-admin/serf/serf-0.8.2.ebuild
deleted file mode 100644
index 5d36502be39f..000000000000
--- a/app-admin/serf/serf-0.8.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_SUM=(
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-"github.com/bgentry/speakeasy v0.1.0"
-"github.com/bgentry/speakeasy v0.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.0"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/fatih/color v1.7.0"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/hashicorp/errwrap v1.0.0"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.0.0"
-"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.3"
-"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-"github.com/hashicorp/go-multierror v1.0.0"
-"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.0"
-"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-"github.com/hashicorp/go-syslog v1.0.0"
-"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.1"
-"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-"github.com/hashicorp/go.net v0.0.1"
-"github.com/hashicorp/go.net v0.0.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/logutils v1.0.0"
-"github.com/hashicorp/logutils v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.0"
-"github.com/hashicorp/mdns v1.0.0/go.mod"
-"github.com/hashicorp/memberlist v0.1.3"
-"github.com/hashicorp/memberlist v0.1.3/go.mod"
-"github.com/mattn/go-colorable v0.0.9"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-isatty v0.0.3"
-"github.com/mattn/go-isatty v0.0.3/go.mod"
-"github.com/miekg/dns v1.0.14"
-"github.com/miekg/dns v1.0.14/go.mod"
-"github.com/mitchellh/cli v1.0.0"
-"github.com/mitchellh/cli v1.0.0/go.mod"
-"github.com/mitchellh/gox v0.4.0"
-"github.com/mitchellh/gox v0.4.0/go.mod"
-"github.com/mitchellh/iochan v1.0.0"
-"github.com/mitchellh/iochan v1.0.0/go.mod"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/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"
-"github.com/posener/complete v1.1.1/go.mod"
-"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f"
-"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3"
-"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc"
-"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5"
-"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-)
-
-inherit go-module systemd
-go-module_set_globals
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/serf"
-DESCRIPTION="Service orchestration and management tool"
-HOMEPAGE="https://www.serfdom.io/"
-SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
-IUSE=""
-RESTRICT="test"
-BDEPEND=""
-RDEPEND="
-	acct-user/serf
-	acct-group/serf"
-
-src_prepare() {
-	default
-	sed -e 's|\(^VERSION[[:space:]]*:=\).*|\1'${PV}'|' \
-		-e 's|\(GITSHA[[:space:]]*:=\).*|\1'${PV}'|' \
-		-e 's|\(GITBRANCH[[:space:]]*:=\).*|\1'${PV}'|' \
-		-i  GNUmakefile || die
-}
-
-src_compile() {
-	mkdir -p ./bin
-	go build -o ./bin/serf ./cmd/serf || die
-}
-
-src_install() {
-	local x
-
-	dobin "${S}/bin/${PN}"
-
-	keepdir /etc/serf.d
-	insinto /etc/serf.d
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners serf:serf "${x}"
-	done
-
-	newinitd "${FILESDIR}/serf.initd" "${PN}"
-	newconfd "${FILESDIR}/serf.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/serf.service"
-}
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 6b92ed04572e..5e26a324b37a 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -4,6 +4,6 @@ AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6
 DIST sysklogd-2.2.2.tar.gz 441106 BLAKE2B b99c63027468967083bb1338a6299bf2f58415c1d20a43f23ff613a5ce318c45c43640824bc82fe3ea423cd9432930a070354bb7a51281bd113b4d088bf17643 SHA512 5db5b0fc58530634627463a5b79ebc3b27c54284b371ce8c37cb6de4ed542640fb8a36e594bb73c0a541d22c6fa0ff985ad06cb2b76cd30cce988741ded86903
 DIST sysklogd-2.2.3.tar.gz 441630 BLAKE2B e23b95aea9d98effc6a88dd14c4fafa358274ea839e7a07ab51bd0257fe0398a1ba6b629c4711d679fffaf03f04c177454f536bdd78dcad2b9f2ae36ff91138e SHA512 db1675256f0f0b0874e2e6a68fb086294bef1d6d3f3e9a6470f8d797ae504b2ab03ed23dc2753c8108a230c3f617e67c4a71e099a2ffeb7ffc8a0efdd07e8d17
 EBUILD sysklogd-2.2.2.ebuild 2105 BLAKE2B d5b44d227c6d5b66ce0a19ca580f4cbc4d044c3c10ac991a0f50b9f9a5628cb274fcb9ae372e8007b85c9d8fe07ad99dae124b58e88bafda28b407cd0a5628cd SHA512 ea12b83058cfdbd1d7277b569cc2028588b7e95b6505511306e060b8da92d7e39cca6d9a298e0816c6e4d1b79f3245514c554e0bffdc2af1ba958261b7a12364
-EBUILD sysklogd-2.2.3.ebuild 2106 BLAKE2B debd9ffc70e97286847725289bbce8fcf6f09e30946ecca694549ad0cca1c66b33479a6059db89639539ae735398981c723086971e5529ac88625a03be9956b8 SHA512 e1b772bcebb6e8ab75fa07429a3f9a95e10bd9723ca9d8c1d69f2198cebfaca23bd42d0a3b021853a85c8ba971b80c94956ff232c233281be93bbd298aaf21f8
+EBUILD sysklogd-2.2.3.ebuild 2105 BLAKE2B d5b44d227c6d5b66ce0a19ca580f4cbc4d044c3c10ac991a0f50b9f9a5628cb274fcb9ae372e8007b85c9d8fe07ad99dae124b58e88bafda28b407cd0a5628cd SHA512 ea12b83058cfdbd1d7277b569cc2028588b7e95b6505511306e060b8da92d7e39cca6d9a298e0816c6e4d1b79f3245514c554e0bffdc2af1ba958261b7a12364
 EBUILD sysklogd-9999.ebuild 2111 BLAKE2B 380deab4839155c659052403cd67e098c53717468ab8cb464d2bf274cfad0965f077cf8f82af8813090c748db3aeb5afb767c5924f871db4940bbf77d23569bf SHA512 541b2164b31189e74fc82de2717864e8ccfd7f4cd1b2b33524c2f239f64a24ff67ddc21f4dde18b88a87c31ec18ea397fcfcdcf19f0a1e4410c2d1b6a597be43
 MISC metadata.xml 432 BLAKE2B 6333f9e73c96d80b69a0ae252660f93ae1466fc44fa379a461e7b611dae4841d0511887ce9a1ec3aa1f49bdb33a98fedce734be92b53580578f0e6a5ca67f192 SHA512 37d1ffbcdd86f5e94f5e38902bcb710fce1eb1c2702c06e05b00d56b02f51c6babbc05b8d1aa43317d336ab58af1df88e173dd152e4b62ca4fce411fe4a8ac23
diff --git a/app-admin/sysklogd/sysklogd-2.2.3.ebuild b/app-admin/sysklogd/sysklogd-2.2.3.ebuild
index 2ee4e653b29a..28b6cb446dec 100644
--- a/app-admin/sysklogd/sysklogd-2.2.3.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.2.3.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
 else
 	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="BSD"
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 33b5467c2ef9..03fc49027c8e 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -10,7 +10,7 @@ AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a0
 DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd SHA512 ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52
 DIST syslog-ng-3.31.2.tar.gz 5727835 BLAKE2B a71190fe1580702a4d904c8a4d31a123d2aa0d01bb5a6e21f32f8502ec99f6109b45537c1a5022b0baeae89456b4b919bb8c88077d00aa9724398b7588254d89 SHA512 22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385
 DIST syslog-ng-3.32.1.tar.gz 5782744 BLAKE2B 43600ac7bf3bcd090353aa5a3d3b3c7701b8794328a111a0ef306dffbf5462880ef3e86f4f8b63580402848b7a4e333112ae1c5514c5e8d41103db4a0d4de159 SHA512 c5a72e4815c2791cb609cbb93993cbb2c52f3ac869e062984b6a359f11232f523c5db3555857f0fef0071764a677f1efdb2aa1f24b4abe7cea13590973d09280
-EBUILD syslog-ng-3.30.1-r2.ebuild 4891 BLAKE2B fb7787fe4959853f90c1a626c2172945248ae06ed6bee47b3695c9a720e8d04249c01d318858571e29c23063741d18620a149a16f35b5fb37e92f772660db4bf SHA512 a87fac1a89d4072159310a7f9aacdecf8028b0180908a71a9143c06f8d3a892f4ada3653bd154ec6aca332e4b894d479e7818596214f13ba3ea86b8be7ec6404
+EBUILD syslog-ng-3.30.1-r2.ebuild 4889 BLAKE2B a84207505959119191dd2097e7e0c6dce89b1c4ca0a8ef1a6af5dda47d0d4966febe5c4c0ae6417163b32ab7a14be7539bff337fc682434d8127c45eb60f07aa SHA512 a20d19bf12e39237513e8677e03f24bd4d8bc0f5a22cc67bb316f9269200a11dead42e8de51c9af18c168944ad807293203239c076ebb4591a6fbf5d256d4d1d
 EBUILD syslog-ng-3.30.1.ebuild 4839 BLAKE2B 92c837ecd1d724d06457e586dfc35e483ab233b7cd0ed9fbb461174c2659d9aba967aff62a33cec504f13b85656b8b736f61b0cb57bc70fcee96cda795bd7d91 SHA512 b02e32aa65e0df8ca222d219bf70ccbb0260b40e3db98db7a9ac37998e8059992f35a2bb9d03a5adb2d60756bf065e9a4aa1ddd94dacf40505a701bcf6c373ad
 EBUILD syslog-ng-3.31.2-r1.ebuild 4940 BLAKE2B d7d0f6fec4570cbe20336b8332d17930ee310d904540fce3cb83434b98227e8fb40e7b7cde5eccaa16fc2142660d626361fca11d42ba386cd9196e7b1faef72c SHA512 af3b35519d289d06b74eaa2be42190c862743b18c85cdf75ab67193d6bff386fef5df546ea9e04290fec8cef41aa909a2d716869ac9cdeec0aa2d4cc7fc184db
 EBUILD syslog-ng-3.32.1-r1.ebuild 4941 BLAKE2B d06d4fd5bc2104c335d46d626657e800712382b0e8db648d737efe2a7be53e4766fc2795179aa08ae749edb7b152d9d1e3292c248b51dcd3d69216b07743abce SHA512 f1d1449199a773fc8474690ac5d074eec485d4f7f142825d7982c8279c781e0f8427d4be6c256be1a8569560d75e98ea74ae742e3f5cfcd3511da2d73d15c83b
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
index ee66ff528305..0bdfee84774b 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 156d4cd4066c..3969b162625e 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,6 +1,4 @@
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
-DIST sysstat-12.5.3.tar.gz 1504415 BLAKE2B a3dc267182939190441b6cfebff938881fe4a06a8c7d1c406c014ddc28c0ecb33af5f480b77cce56bfcd4c7af81c4fec09eccb989561dd979f03a94ea6521f5b SHA512 3f09ff2e7ca38497eb07dcd8770c0b7fe5cfa1140537b215a1648446f65d933852b97dd5a1a9596afa57b04f20da64385e3b2e384be8d7b5902f228dc01230a5
 DIST sysstat-12.5.4.tar.gz 1474379 BLAKE2B 73bd4ebc44cc57cd3dba4fecbcd45026929bdbeab6b99c5b13db7d37252dff8da987ee5ac00d545aebdc72f924d0100166e9e876f6684e064f7020f3fa7a7cb5 SHA512 c051f136d404684a21b11e968968e34f0f114b4568369c6449c64b7745269065a3dc492039ded7c415fe39970aca54cc81646589b0959ade43e9be6f6cd4c0dc
-EBUILD sysstat-12.5.3.ebuild 1881 BLAKE2B 1f285b96455f80ebfd841afec6ef75d483e26e1e91ef3987bd39bccf01cb26d4b28492c7aa368a7666dca3b80e7584f94c0749115a91b89e423a661c9568a1bb SHA512 5350bb48dd51622d5e6acb9b72b50531f34e046380af4547e4f232087a41a72aaeafdafad0a63a12c818363931293d2161db0fd085a672d66db760f6d9816367
-EBUILD sysstat-12.5.4.ebuild 1883 BLAKE2B 67aeb058ef409281022f4653ead6757a02048fcc7068b945fdb4c2559c0ef5bc01aefbcf775574a26855e0eee23c49840f69ca48f46facb517efa5466d932f69 SHA512 d3e721bc7cf8525c7b1450a3afd169044b09d1282423879bbb48abb490f5ad206028455b6ae3f527bf9243ceb6b8fc2b397e932fbf20d18ac4274eda4546cc79
+EBUILD sysstat-12.5.4.ebuild 1881 BLAKE2B 1f285b96455f80ebfd841afec6ef75d483e26e1e91ef3987bd39bccf01cb26d4b28492c7aa368a7666dca3b80e7584f94c0749115a91b89e423a661c9568a1bb SHA512 5350bb48dd51622d5e6acb9b72b50531f34e046380af4547e4f232087a41a72aaeafdafad0a63a12c818363931293d2161db0fd085a672d66db760f6d9816367
 MISC metadata.xml 362 BLAKE2B feda4d7de32dd65f3f8d0c2b263e88f88d4601db855e600299b15cf3fa735deca9d5fceef6bd444341e9779c88e83142bd1f4126c9e69efc57c0865a74246824 SHA512 7fd37cdf3ba90f14371aa39016cb5a84fe0fba0e5798ef98757db29dd2915554d30369c2d171f8013dca8183aac9a8fcfd4df67dd336aa1393aa5f984a14ae30
diff --git a/app-admin/sysstat/sysstat-12.5.3.ebuild b/app-admin/sysstat/sysstat-12.5.3.ebuild
deleted file mode 100644
index ddcb57509fa0..000000000000
--- a/app-admin/sysstat/sysstat-12.5.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="dcron debug nls lm-sensors selinux static systemd"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	!dcron? ( !sys-process/dcron )
-	selinux? ( sec-policy/selinux-sysstat )
-"
-
-REQUIRED_USE="dcron? ( !systemd )"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	use dcron && { sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die ; }
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/lib/sa \
-		conf_dir=/etc \
-		econf \
-			$(use_enable !systemd use-crond) \
-			$(use_enable lm-sensors sensors) \
-			$(use_enable nls) \
-			$(usex debug --enable-debuginfo '') \
-			--disable-compress-manpg \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	LFLAGS="${LDFLAGS}" default
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
diff --git a/app-admin/sysstat/sysstat-12.5.4.ebuild b/app-admin/sysstat/sysstat-12.5.4.ebuild
index 5c14067a38b3..ddcb57509fa0 100644
--- a/app-admin/sysstat/sysstat-12.5.4.ebuild
+++ b/app-admin/sysstat/sysstat-12.5.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="dcron debug nls lm-sensors selinux static systemd"
 
 CDEPEND="
diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest
index 4b0d6e05c5e9..fe9dd3b7f86b 100644
--- a/app-admin/xkcdpass/Manifest
+++ b/app-admin/xkcdpass/Manifest
@@ -1,6 +1,3 @@
-AUX xkcdpass-manpage-fix.patch 1806 BLAKE2B fd959982af5a44cf478ebc93196f7f341d49de754d0620707ee5fd5df9bc13d395de271298e413bb92b8df38ad66b9c2430ed1ab59159cd0372f79b20e571c9c SHA512 ade31ad878cf3d5e70ca5098a87abbfdbfdbc540f3ab2efb6f7baba2e9009aab657eddaf5a5ce67c046b4b232087a93a2e7b7d1cc3738f0441445803eceb0763
-DIST xkcdpass-1.17.6.tar.gz 8216233 BLAKE2B dc6f8b1bf76eba5271bf6027baf6bfbe5a18081ac85970ba35be3d0cf4e08d98d60b8bc819c05512aab94d621cf93fe9dca74a0108cdd4d94ad6ae830c28d3c2 SHA512 db47d6f0d5711e1aa4520fa3afb78b085b2e5a7599fa7eecbc3f806f5c7edceae9c54c250923147c87a837b54b5efd0d8f34f9c08e3104341f1243de0edf87f9
 DIST xkcdpass-1.19.2.tar.gz 2073808 BLAKE2B 19ad3f505ab672b1a2554e534896b15c77eb9741e7da01e22efff44d069ff6a482c122ec7fa616bc3789d2ce4bd5f6050c06bcff9661476d15fbc78edc505c36 SHA512 20376fc22fb4d251e2b921d4db48fea2109a4c42832614d41e807b262130111c58e01d1ded2019fad230a458953a2f185d92cfe95f3950aaa0a97750b3b3a2b6
-EBUILD xkcdpass-1.17.6-r1.ebuild 1071 BLAKE2B 61a1b88480b55782418d05ad2959e8581d1acc9958482be8ee3f5a45738230557a5623aca723c2bc23adf255824642c01b6dc0c3df6b152a52c5e14fbc6ddb56 SHA512 035e9eab70611acc942aacbc62b77aa4f7039a5ff731131a4d9fbf7cc0b52dd0e6d6eea76bf0f38dd2050f7e206c0d623313471d627cbd87ae42796456d76216
 EBUILD xkcdpass-1.19.2.ebuild 1017 BLAKE2B 7c62cb22065aded7d6d66b26d298d8bd9664216c7a1e5979c8722a681e3b5aa8b389ab917749317618f28933531d901a614b23e7fe353856d718c1977adc0f35 SHA512 e856f101a1b7bc1a0f3dd0ed73dfa254a25a63afa394a3b67ffbe2c53b70eafcbb480bcafea0cc7b608fe46aaefd636ff208046cea996762981349286dc5f2c0
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-admin/xkcdpass/files/xkcdpass-manpage-fix.patch b/app-admin/xkcdpass/files/xkcdpass-manpage-fix.patch
deleted file mode 100644
index a4d9e3464ce8..000000000000
--- a/app-admin/xkcdpass/files/xkcdpass-manpage-fix.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -ur xkcdpass-1.17.6/xkcdpass.1 xkcdpass-1.17.6.new/xkcdpass.1
---- xkcdpass-1.17.6/xkcdpass.1	2021-02-26 12:58:59.441739487 -0600
-+++ xkcdpass-1.17.6.new/xkcdpass.1	2021-02-26 13:11:21.195161091 -0600
-@@ -1,40 +1,14 @@
--.SH xkcdpass
--.SS generate memorable, secure multiword passphrases
--.TP
--.B Author
--|authorname| |authoremail|
--.RS
--.RE
--.TP
--.B Date
--2015\-01\-17
--.RS
--.RE
--.TP
--.B Copyright
--BSD license, attribution and disclaimer required, no endorsement
--allowed.
--.RS
--.RE
--.TP
--.B Manual section
--1
--.RS
--.RE
--.TP
--.B Manual group
--Admin
--.RS
--.RE
--.SS SYNOPSIS
--.PP
--\f[B]xkcdpass\f[] [ option ...
--]
--.PD 0
--.P
--.PD
--\f[B]xkcdpass\f[] \f[B]\-\-help\f[]
--.SS DESCRIPTION
-+.TH xkcdpass 1
-+.SH NAME
-+xkcdpass - generate memorable, secure multiword passphrases
-+.SH SYNOPSIS
-+.PP
-+.B xkcdpass
-+[ options ]
-+.br
-+.B xkcdpass
-+--help
-+.SH DESCRIPTION
- .PP
- A flexible and scriptable password generator which generates strong
- passphrases, inspired by XKCD 936:
-@@ -45,7 +19,7 @@
- >\ correct\ horse\ battery\ staple
- \f[]
- .fi
--.SS OPTIONS
-+.SH OPTIONS
- .PP
- \f[B]\-\-help\f[]
- .RS
-@@ -156,22 +130,14 @@
- \f[]
- .fi
- .RE
--.SS HISTORY
-+.SH HISTORY
- .PP
- The \f[B]xkcdpass\f[] command invokes the Python program
- \f[C]xkcd_password.py\f[].
- .PP
--The inspiration for the program\[aq]s purpose is the XKCD 936_ “Password
-+The inspiration for the program\[aq]s purpose is the XKCD 936 “Password
- Strength� cartoon.
- .PP
- The application is maintained by Steven Tobin <<steven@steventob.in>>.
- .PP
- This manual page was written by |authorname| |authoremail|.
--.SS 
--.RS
--.PP
--Local variables: mode: rst coding: utf\-8 time\-stamp\-format:
--"%:y\-%02m\-%02d" time\-stamp\-start: "^:Date:[ ]+" time\-stamp\-end:
--"$" time\-stamp\-line\-limit: 20 End: vim: filetype=rst
--fileencoding=utf\-8 :
--.RE
diff --git a/app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild b/app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild
deleted file mode 100644
index 766235ec8213..000000000000
--- a/app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Password generator inspired by XKCD 936"
-HOMEPAGE="https://github.com/redacted/XKCD-password-generator"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD CC-BY-3.0
-	l10n_de? ( GPL-3 )
-	l10n_it? ( CC-BY-SA-3.0 )
-	l10n_no? ( CC-BY-4.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
-
-PATCHES=( "${FILESDIR}"/xkcdpass-manpage-fix.patch )
-
-src_prepare() {
-	default
-
-	use l10n_de || rm ${PN}/static/ger-anlx
-	use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy}
-	use l10n_es || rm ${PN}/static/spa-mich
-	use l10n_fi || rm ${PN}/static/fin-kotus
-	use l10n_fr || rm ${PN}/static/fr-*
-	use l10n_it || rm ${PN}/static/ita-wiki
-	use l10n_no || rm ${PN}/static/nor-nb
-	use l10n_pt || rm ${PN}/static/pt-*
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman ${PN}.1
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 274c24fcfc84..c998f2393a6d 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index d20c9e6360d7..53ac9578b22f 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,4 +1,4 @@
 AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c
 DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
-EBUILD libarchive-3.5.1.ebuild 3768 BLAKE2B c2d8d0cfe99fedfa134f22d9f7147fe443270a9bc1ea31c1277459b52bb2ec6bd2db0b9c2e3b9962fd7b0516d20231abbf2efeecd30ec4bad204ebf945813c49 SHA512 275df5dfeef66002bf0005049f3d82eff1f7b59ed9bcc42b14b026492962b842c67b3ba342259cecfca5d2dab1cd4668e86cee8e177dab2c1669d378b8d74d15
+EBUILD libarchive-3.5.1-r1.ebuild 3761 BLAKE2B 712b3e29fe3ade19f8bd24dcfc6005842743221a4b9bda3ca212b0e166829726ca71c1ea09fa1b7055e2734808725049c8d4737cae7411874a92a0b991a8e6a0 SHA512 d8258ddff7b030c6c3ea399db91825695fc7d5e5d5b9f92a3a78b63cc7057c695027a8a567e68b223ca545ec34d50c48787bae44c9a00d9d6b67445a2514307a
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.5.1-r1.ebuild b/app-arch/libarchive/libarchive-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..495a49a99ae6
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.5.1-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="https://www.libarchive.org/"
+SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+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="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs xattr +zlib zstd"
+
+RDEPEND="
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch  # drop on next release
+)
+
+src_prepare() {
+	default
+	elibtoolize  # is required for Solaris sol2_ld linker fix
+}
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with blake2 libb2)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		$(use_with zlib)
+		$(use_with zstd)
+
+		# Windows-specific
+		--without-cng
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+		)
+	else
+		myconf+=(
+			--disable-bsdcat
+			--disable-bsdcpio
+			--disable-bsdtar
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+src_test() {
+	mkdir -p "${T}"/bin || die
+	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
+	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
+	local -x PATH=${T}/bin:${PATH}
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	# sandbox is breaking long symlink behavior
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+	# some locales trigger different output that breaks tests
+	local -x LC_ALL=C
+	emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+
+		# Create symlinks for FreeBSD
+		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
+			# Exclude cat for the time being #589876
+			for bin in cpio tar; do
+				dosym bsd${bin} /usr/bin/${bin}
+				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
+				doman "${T}"/${bin}.1
+			done
+		fi
+	else
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+multilib_src_install_all() {
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/app-arch/libarchive/libarchive-3.5.1.ebuild b/app-arch/libarchive/libarchive-3.5.1.ebuild
deleted file mode 100644
index 1319a7f8b960..000000000000
--- a/app-arch/libarchive/libarchive-3.5.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/"
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-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="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
-
-RDEPEND="
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch  # drop on next release
-)
-
-src_prepare() {
-	default
-	elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with blake2 libb2)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		$(use_with zlib)
-		$(use_with zstd)
-
-		# Windows-specific
-		--without-cng
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
-		)
-	else
-		myconf+=(
-			--disable-bsdcat
-			--disable-bsdcpio
-			--disable-bsdtar
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-src_test() {
-	mkdir -p "${T}"/bin || die
-	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
-	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
-	local -x PATH=${T}/bin:${PATH}
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	# sandbox is breaking long symlink behavior
-	local -x SANDBOX_ON=0
-	local -x LD_PRELOAD=
-	# some locales trigger different output that breaks tests
-	local -x LC_ALL=C
-	emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-
-		# Create symlinks for FreeBSD
-		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-			# Exclude cat for the time being #589876
-			for bin in cpio tar; do
-				dosym bsd${bin} /usr/bin/${bin}
-				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-				doman "${T}"/${bin}.1
-			done
-		fi
-	else
-		local install_targets=(
-			install-includeHEADERS
-			install-libLTLIBRARIES
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${install_targets[@]}"
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-multilib_src_install_all() {
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 356299366b15..337b29352de9 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,9 +1,5 @@
-AUX makeself-2.2.0-help-header.patch 6728 BLAKE2B 7d0211074f68346ead19fd58d9440976ee0e5f0367b0776c186ced0ee77769cca7597948f2894aee68e9d3f42fb6e0e19dcdc378ce0dfe714596ab8ad705d13b SHA512 5cdee18f5190086e8421d091406df5aeefdc9fe3aaee6c26aa990b1eb7d6f415c8c8ebf67137a1b2a22470c14749d394808ed9e5a4fc6f737cd87c32651e2a8c
-AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af406f0f82c2c301e3b8f95c40534a18313eaffb6ac7ce68cbde1d988efa3503bb46f950936706e41590 SHA512 ebfe1dd13a11cd00a853e6a4e7d6094b5f923fbe987f6b5a778fec09e00e2b2daf1e5daab0eb04850d4471019fb95f88a5d2b9d88520f5738a29997d81f2c1c3
 DIST makeself-2.4.3.tar.gz 32613 BLAKE2B 2295b6d47a8105f2b495260abb0c9ae85875c821d0291a19b5af894c1cef669f338c4e10de8128fe38008e7e08079d1f29949884f202cab680c7fd62e2f00dd9 SHA512 d404c7920c7f69ae29c7168bcf76806b6e2aae2e8916bb7feed998d031ce8b2cd205b83ad960a90b01189c97f9242eb3ef574194ba3ee51c605fe99dafbd6c13
-DIST makeself-2.4.4.tar.gz 38889 BLAKE2B eac74fa28ac39cbc6b18d11671bfa32d6c0b04b55b3603c6c928483dd64af38d416936ef242f55aa4840affd4bf7fb91c2987f87afab093816331e50f16379ab SHA512 3d4d03458f7f11a8df46340d1b489ca60d413d5ed857cc67bb8ef15335ce2848e4675e080791c26fdf29423f813d468b4b797438fe0876dad54e85c6346b9b8b
-DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
-EBUILD makeself-2.2.0-r2.ebuild 695 BLAKE2B 24c8845a3765c0540fbc61a0d479a52aa48368c5992391b24a6e50d4d21df96973fd4c24dfb37d72eade758d1350b04dcce6061603e1e36df7aad1c461440cf7 SHA512 3686991760d6bdaca0ae09db9506f6337609550052041ec60a5d1da3321ed99a08f1f5e149c56228b0086f1a664531b8df81690496bf80774fe8f7546bb08022
-EBUILD makeself-2.4.3.ebuild 942 BLAKE2B c9853c874c7653c35ab3656b80357bef22ebcee730a9f2be6eecc857302dce32dcf90e4ad5e15874babcbbd44f6331440517089a086f8c225cc1c1e2f14d490f SHA512 8357031146ec48a52bdf7957c8faa50eab5ca9fa6e68ceb6462666da63c7f2bb61892efe8bfea4ae50659dd3b60c41b7dab3669de1b0ba2131ba8fb99ec36d0c
-EBUILD makeself-2.4.4.ebuild 1171 BLAKE2B ebad131c264fd1caacb5bedeb4ff3298ff35c095db7954cf017e34d232c9631b427bea0d582a1b5b27373e16ab7d84477166fe23a401cba58d05f2f2442a8974 SHA512 e65cac5fb12545c8060434cde76c02911e0dc065ce3be4829e2cb5c051353f9d1853589b7791afbb10926d7c073315f7aba57b110f1fb5a13834c171e0000f72
+DIST makeself-2.4.5.tar.gz 39012 BLAKE2B f79cf1c087e89c4fd09f328fb795a3f8a78ee38060dbbd1590e3dcdf22a346b0c12bf6837d1636efadb2a66f6a762308de7ee9dd2fc62a7c88d417d257c5f0f6 SHA512 1dae74586f6bd5afb526801b7ffa7fc7962ff74b0f190cdd51da93c21421864b72f5fe18090cb2ff6ad27f0907fbf3aeb5545f3f70e33dbc9e505a78505f5f90
+EBUILD makeself-2.4.3.ebuild 929 BLAKE2B cf5cf22da092ef5ed0b9e9f32c237d49529ebf0be2b7d998a8109ad19613237feb6d4c8f8f72bce28d0c5da43efed7e4473c8f03d56ece72a0fb34388ebf5f8d SHA512 1eb89f4e0f5b4eeedec4f538052f6dd1bf21f515cb90ea5561f7e7eaa9e2694fad6266f36687c19f9fa3464ef87ab849271de50182ca024a703c00330409f7ef
+EBUILD makeself-2.4.5.ebuild 1158 BLAKE2B 943cb467f061b207812394cacb456070c552c549092fa2a3ec93f32a6ea108915f40dd1990662ba766f67f7e3f02b10c9056fe482dbed8114b1ef3684ced305f SHA512 1f0454d64d30047c29454a294aa156a1da0d7b02ff94d1bcd8e5f2550cf4cf19e27ac9a28f98cec2014dc119c66695817f2e83865da4c9aa32b5ea4ec543186a
 MISC metadata.xml 513 BLAKE2B 25f348226db47085523f7e1f74b1b557982acf56ba2b33252e250cc45400137be2090e29dad3b009e7b11c2d2942e564e7c499c7566c857ad5b05849553014c0 SHA512 48b0f4efee7e7dd1dc3e5bc0b2585748a15e4e2e0e41eb764709b41b4eb45d6ef98b712fc5265c2892e70b6c99c00e15542430e854811961d3acb5a803c6d5c5
diff --git a/app-arch/makeself/files/makeself-2.2.0-help-header.patch b/app-arch/makeself/files/makeself-2.2.0-help-header.patch
deleted file mode 100644
index 5726bf55f7da..000000000000
--- a/app-arch/makeself/files/makeself-2.2.0-help-header.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From c9f605cb4a3903985f2c6f816c30c1edf728c1b5 Mon Sep 17 00:00:00 2001
-From: Jon Salz <jsalz@google.com>
-Date: Mon, 27 Jan 2014 16:04:33 +0800
-Subject: [PATCH] Add --help-header option to prepend a string to the archive's
- --help.
-
----
- makeself-header.sh |  3 ++-
- makeself.sh        | 71 ++++++++++++++++++++++++++++++------------------------
- 2 files changed, 41 insertions(+), 33 deletions(-)
-
-diff --git a/makeself-header.sh b/makeself-header.sh
-index e3f6c11..f97758c 100755
---- a/makeself-header.sh
-+++ b/makeself-header.sh
-@@ -13,6 +13,7 @@ label="$LABEL"
- script="$SCRIPT"
- scriptargs="$SCRIPTARGS"
- licensetxt="$LICENSE"
-+helpheader='$HELPHEADER'
- targetdir="$archdirname"
- filesizes="$filesizes"
- keep="$KEEP"
-@@ -119,7 +120,7 @@ MS_dd_Progress()
- MS_Help()
- {
-     cat << EOH >&2
--Makeself version $MS_VERSION
-+\${helpheader}Makeself version $MS_VERSION
-  1) Getting help or info about \$0 :
-   \$0 --help   Print this message
-   \$0 --info   Print embedded info : title, default target directory, embedded script ...
-diff --git a/makeself.sh b/makeself.sh
-index 361d710..cb2d6f2 100755
---- a/makeself.sh
-+++ b/makeself.sh
-@@ -88,38 +88,39 @@ MS_Usage()
- {
-     echo "Usage: $0 [params] archive_dir file_name label startup_script [args]"
-     echo "params can be one or more of the following :"
--    echo "    --version | -v  : Print out Makeself version number and exit"
--    echo "    --help | -h     : Print out this help message"
--    echo "    --quiet | -q    : Do not print any messages other than errors."
--    echo "    --gzip          : Compress using gzip (default if detected)"
--    echo "    --bzip2         : Compress using bzip2 instead of gzip"
--    echo "    --pbzip2        : Compress using pbzip2 instead of gzip"
--    echo "    --xz            : Compress using xz instead of gzip"
--    echo "    --compress      : Compress using the UNIX 'compress' command"
--    echo "    --complevel lvl : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
--    echo "    --base64        : Instead of compressing, encode the data using base64"
--    echo "    --nocomp        : Do not compress the data"
--    echo "    --notemp        : The archive will create archive_dir in the"
--    echo "                      current directory and uncompress in ./archive_dir"
--    echo "    --copy          : Upon extraction, the archive will first copy itself to"
--    echo "                      a temporary directory"
--    echo "    --append        : Append more files to an existing Makeself archive"
--    echo "                      The label and startup scripts will then be ignored"
--    echo "    --target dir    : Extract directly to a target directory"
--    echo "                      directory path can be either absolute or relative"
--    echo "    --current       : Files will be extracted to the current directory"
--    echo "                      Both --current and --target imply --notemp"
--    echo "    --tar-extra opt : Append more options to the tar command line"
--    echo "    --nomd5         : Don't calculate an MD5 for archive"
--    echo "    --nocrc         : Don't calculate a CRC for archive"
--    echo "    --header file   : Specify location of the header script"
--    echo "    --follow        : Follow the symlinks in the archive"
--    echo "    --noprogress    : Do not show the progress during the decompression"
--    echo "    --nox11         : Disable automatic spawn of a xterm"
--    echo "    --nowait        : Do not wait for user input after executing embedded"
--    echo "                      program from an xterm"
--    echo "    --lsm file      : LSM file describing the package"
--    echo "    --license file  : Append a license file"
-+    echo "    --version | -v     : Print out Makeself version number and exit"
-+    echo "    --help | -h        : Print out this help message"
-+    echo "    --quiet | -q       : Do not print any messages other than errors."
-+    echo "    --gzip             : Compress using gzip (default if detected)"
-+    echo "    --bzip2            : Compress using bzip2 instead of gzip"
-+    echo "    --pbzip2           : Compress using pbzip2 instead of gzip"
-+    echo "    --xz               : Compress using xz instead of gzip"
-+    echo "    --compress         : Compress using the UNIX 'compress' command"
-+    echo "    --complevel lvl    : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
-+    echo "    --base64           : Instead of compressing, encode the data using base64"
-+    echo "    --nocomp           : Do not compress the data"
-+    echo "    --notemp           : The archive will create archive_dir in the"
-+    echo "                         current directory and uncompress in ./archive_dir"
-+    echo "    --copy             : Upon extraction, the archive will first copy itself to"
-+    echo "                         a temporary directory"
-+    echo "    --append           : Append more files to an existing Makeself archive"
-+    echo "                         The label and startup scripts will then be ignored"
-+    echo "    --target dir       : Extract directly to a target directory"
-+    echo "                         directory path can be either absolute or relative"
-+    echo "    --current          : Files will be extracted to the current directory"
-+    echo "                         Both --current and --target imply --notemp"
-+    echo "    --tar-extra opt    : Append more options to the tar command line"
-+    echo "    --nomd5            : Don't calculate an MD5 for archive"
-+    echo "    --nocrc            : Don't calculate a CRC for archive"
-+    echo "    --header file      : Specify location of the header script"
-+    echo "    --follow           : Follow the symlinks in the archive"
-+    echo "    --noprogress       : Do not show the progress during the decompression"
-+    echo "    --nox11            : Disable automatic spawn of a xterm"
-+    echo "    --nowait           : Do not wait for user input after executing embedded"
-+    echo "                         program from an xterm"
-+    echo "    --lsm file         : LSM file describing the package"
-+    echo "    --license file     : Append a license file"
-+    echo "    --help-header file : Add a header to the archive's --help output"
-     echo
-     echo "Do not forget to give a fully qualified startup script name"
-     echo "(i.e. with a ./ prefix if inside the archive)."
-@@ -254,6 +255,12 @@ do
- 	LSM_CMD="cat \"$2\" >> \"\$archname\""
-     if ! shift 2; then MS_Help; exit 1; fi
- 	;;
-+    --help-header)
-+	HELPHEADER=`sed -e "s/'/'\\\\\''/g" $2`
-+    if ! shift 2; then MS_Help; exit 1; fi
-+	[ -n "$HELPHEADER" ] && HELPHEADER="$HELPHEADER
-+"
-+    ;;
-     -q | --quiet)
- 	QUIET=y
- 	shift
--- 
-1.8.5.5
-
diff --git a/app-arch/makeself/files/makeself-unpack b/app-arch/makeself/files/makeself-unpack
deleted file mode 100644
index 90b98312c8b9..000000000000
--- a/app-arch/makeself/files/makeself-unpack
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-# Glue to keep unpack_makeself() unchanged
-source /lib/gentoo/functions.sh
-find_unpackable_file() { echo "$@"; }
-debug-print() { :; }
-emktemp() { mktemp "$@"; }
-die() { eerror "$*"; exit 1; }
-assert() { _pipestatus="${PIPESTATUS[*]}"; [[ "${_pipestatus// /}" -eq 0 ]] || die; }
-
-# Straight copied from unpacker.eclass ... should be kept in sync
-
-unpack_banner() {
-	echo ">>> Unpacking ${1##*/} to ${PWD}"
-}
-
-unpack_makeself() {
-	local src_input=${1:-${A}}
-	local src=$(find_unpackable_file "${src_input}")
-	local skip=$2
-	local exe=$3
-
-	[[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
-
-	unpack_banner "${src}"
-
-	if [[ -z ${skip} ]] ; then
-		local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
-		local skip=0
-		exe=tail
-		case ${ver} in
-			1.5.*|1.6.0-nv*)	# tested 1.5.{3,4,5} ... guessing 1.5.x series is same
-				skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
-				;;
-			2.0|2.0.1)
-				skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
-				;;
-			2.1.1)
-				skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
-				(( skip++ ))
-				;;
-			2.1.2)
-				skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
-				(( skip++ ))
-				;;
-			2.1.3)
-				skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
-				(( skip++ ))
-				;;
-			2.1.4|2.1.5|2.1.6|2.2.0)
-				skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
-				skip=$(head -n ${skip} "${src}" | wc -c)
-				exe="dd"
-				;;
-			*)
-				eerror "I'm sorry, but I was unable to support the Makeself file."
-				eerror "The version I detected was '${ver}'."
-				eerror "Please file a bug about the file ${src##*/} at"
-				eerror "http://bugs.gentoo.org/ so that support can be added."
-				die "makeself version '${ver}' not supported"
-				;;
-		esac
-		debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
-	fi
-	case ${exe} in
-		tail)	exe="tail -n +${skip} '${src}'";;
-		dd)		exe="dd ibs=${skip} skip=1 if='${src}'";;
-		*)		die "makeself cant handle exe '${exe}'"
-	esac
-
-	# lets grab the first few bytes of the file to figure out what kind of archive it is
-	local filetype tmpfile=$(emktemp)
-	eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
-	filetype=$(file -b "${tmpfile}") || die
-	case ${filetype} in
-		*tar\ archive*)
-			eval ${exe} | tar --no-same-owner -xf -
-			;;
-		bzip2*)
-			eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
-			;;
-		gzip*)
-			eval ${exe} | tar --no-same-owner -xzf -
-			;;
-		compress*)
-			eval ${exe} | gunzip | tar --no-same-owner -xf -
-			;;
-		XZ*)
-			eval ${exe} | unxz | tar --no-same-owner -xf -
-			;;
-		*)
-			eerror "Unknown filetype \"${filetype}\" ?"
-			false
-			;;
-	esac
-	assert "failure unpacking (${filetype}) makeself ${src##*/} ('${ver}' +${skip})"
-	rm "${tmpfile}"
-}
-
-for x; do unpack_makeself "$x" ; done
diff --git a/app-arch/makeself/makeself-2.2.0-r2.ebuild b/app-arch/makeself/makeself-2.2.0-r2.ebuild
deleted file mode 100644
index 04f9402991c5..000000000000
--- a/app-arch/makeself/makeself-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
-SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-release-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sys-apps/gentoo-functions"
-
-PATCHES=( "${FILESDIR}/${P}-help-header.patch" )
-
-src_install() {
-	dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack
-	dosym makeself.sh /usr/bin/makeself
-	doman makeself.1
-	dodoc README.md makeself.lsm
-}
diff --git a/app-arch/makeself/makeself-2.4.3.ebuild b/app-arch/makeself/makeself-2.4.3.ebuild
index 2cd2a9fa8709..32df98cc0e0c 100644
--- a/app-arch/makeself/makeself-2.4.3.ebuild
+++ b/app-arch/makeself/makeself-2.4.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit optfeature
 
 DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
+HOMEPAGE="https://makeself.io/"
 SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-release-${PV}"
 
diff --git a/app-arch/makeself/makeself-2.4.4.ebuild b/app-arch/makeself/makeself-2.4.4.ebuild
deleted file mode 100644
index 17f5cf26fdd7..000000000000
--- a/app-arch/makeself/makeself-2.4.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit optfeature
-
-DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
-SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-# NB: The test framework requires bashunit (which isn't a big deal), but the
-# tests themselves are not of great quality.  You should avoid running them
-# yourself as they like to run commands like gpg against your own ~/ settings.
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-src_compile() { :; }
-
-src_install() {
-	dobin makeself-header.sh makeself.sh
-	dosym makeself.sh /usr/bin/makeself
-	doman makeself.1
-	dodoc README.md makeself.lsm
-}
-
-pkg_postinst() {
-	optfeature "lz4 support" app-arch/lz4
-	optfeature "lzop support" app-arch/lzop
-	optfeature "pbzip2 support" app-arch/pbzip2
-	optfeature "pigz support" app-arch/pigz
-	optfeature "zstd support" app-arch/zstd
-
-	# Also bzip2 and xz are supported but they are in @system.
-}
diff --git a/app-arch/makeself/makeself-2.4.5.ebuild b/app-arch/makeself/makeself-2.4.5.ebuild
new file mode 100644
index 000000000000..6e66645515bd
--- /dev/null
+++ b/app-arch/makeself/makeself-2.4.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit optfeature
+
+DESCRIPTION="Shell script that generates a self-extractible tar.gz"
+HOMEPAGE="https://makeself.io/"
+SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+# NB: The test framework requires bashunit (which isn't a big deal), but the
+# tests themselves are not of great quality.  You should avoid running them
+# yourself as they like to run commands like gpg against your own ~/ settings.
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	dobin makeself-header.sh makeself.sh
+	dosym makeself.sh /usr/bin/makeself
+	doman makeself.1
+	dodoc README.md makeself.lsm
+}
+
+pkg_postinst() {
+	optfeature "lz4 support" app-arch/lz4
+	optfeature "lzop support" app-arch/lzop
+	optfeature "pbzip2 support" app-arch/pbzip2
+	optfeature "pigz support" app-arch/pigz
+	optfeature "zstd support" app-arch/zstd
+
+	# Also bzip2 and xz are supported but they are in @system.
+}
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index da96124396a3..9aba7c4285d9 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,8 +1,3 @@
-AUX 2.4-trailing-junk.patch 916 BLAKE2B 1487b9fc75bafe50cd00aac14e867f073c8d8db22067a645ed67aec9ebf46c1599d174679a56a23806d546b3a43739f6f5137dc9dd3f7e62b8b0aaaf61e0dd99 SHA512 8159a6b8c5c7086269dbaa06f73262fb53125edbb360ad22526d47364e8006735e72650d869f81335620177a78eb828aa87198905ec0e7ac41dea731261b10dc
-DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-DIST pigz-2.5.tar.gz 106438 BLAKE2B d1db42e412d91243aebdc06204a032e1d9dd7e01f659cc428e8a194df26242782d22328658b773b61ccbdf1e34a7ada4d358a93d9c6eda7d7e78c4291ca901ac SHA512 8f52900b8664c67b5b1813ac2f6e226d899c72ba19eefd6424181dc4dc0416d38ad3c7e5fe3dce6bdb58f5ac34ec0269f846c43f9aef6f69a121713113c1643a
 DIST pigz-2.6.tar.gz 106840 BLAKE2B 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba SHA512 04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2
-EBUILD pigz-2.4-r1.ebuild 1012 BLAKE2B e1c0774598db74d40076ae564be85a4162e8b8bf30021af753f5898796fd3af76669e7cf3ed1f150700e9018bd9f689b572bb011c10ee9b1e5d005f0c5b9a6d4 SHA512 2a31104d83f09e9dbfde55b198abb677c43e00d5f0ce22a5c00acfabe9953c3afb486e153e60000ccf7ba7eadd54886b75ee92afba0d3053faa31fa8a273d1de
-EBUILD pigz-2.5.ebuild 966 BLAKE2B 92b57b79d8a6a4e48a43063ae241b3191399732b7beeea86cce1498e5aead468826468b942b218083bd99521d9c9db29eb35a44efd06adc5ca03f6040303fbb1 SHA512 7231d728746338e81679c0cad7538d1274a3590e579a98694ef5f0be973877b81ae4569b5114f4c0bcd6aa5e66607de3dedf360e4a6d5dc7777263a9b27ef74d
-EBUILD pigz-2.6.ebuild 966 BLAKE2B 92b57b79d8a6a4e48a43063ae241b3191399732b7beeea86cce1498e5aead468826468b942b218083bd99521d9c9db29eb35a44efd06adc5ca03f6040303fbb1 SHA512 7231d728746338e81679c0cad7538d1274a3590e579a98694ef5f0be973877b81ae4569b5114f4c0bcd6aa5e66607de3dedf360e4a6d5dc7777263a9b27ef74d
+EBUILD pigz-2.6.ebuild 959 BLAKE2B 0f3b28b07d4af30775e5c1d1e061a5cffe8e1b2d9f01dd31e9f4ad9b606e6fdbb7ccd2c55dd9397557ee0285ebbc34bc7ac8e64467613013568513b330b0f3da SHA512 b16444c8e914dd220e19c6cd931c5e2ab21cec731d173b1b33245d2456f2fe5f05cf9254850c23e56a3cf5a87626a3e7c065feaa5d04a0412e66db5eecc8b170
 MISC metadata.xml 739 BLAKE2B 66bac4d792d20a9edc0a4b52f55c4f02e5e9ff79b9c67365af252b928dd68b63f71a6cc75c31f824c5c0f63917f6c4c11de2cc2e82d78b7ce4518f9ac1868223 SHA512 26106d41b334587ca0aabd620d481ce6c8729fc279ddb97a529286910936a8a25d42a2f09b8ee48b9ac9343cd3384a6f7d6ccaaf39ab111214e88aff5203e90e
diff --git a/app-arch/pigz/files/2.4-trailing-junk.patch b/app-arch/pigz/files/2.4-trailing-junk.patch
deleted file mode 100644
index eb5585b7d362..000000000000
--- a/app-arch/pigz/files/2.4-trailing-junk.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1414ff3eb0b1ac9e5f096b0a28efa459cb8be1cd Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Fri, 10 Jul 2020 19:46:10 -0700
-Subject: [PATCH] Ignore trailing junk on .gz by default, to emulate gzip.
-
-backport of
-https://github.com/madler/pigz/commit/9696c84cb1963651707e649978afb07d0c11b254
----
- pigz.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pigz.c b/pigz.c
-index bbbfd2c..f2e79d7 100644
---- a/pigz.c
-+++ b/pigz.c
-@@ -3368,7 +3368,7 @@ local void infchk(void) {
-         cat();
-     else if (was > 1 && get_header(0) != -5)
-         complain("warning: %s: entries after the first were ignored", g.inf);
--    else if ((was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
-+    else if (( g.verbosity > 1 && was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
-         complain("warning: %s: trailing junk was ignored", g.inf);
- }
- 
--- 
-2.27.0
-
diff --git a/app-arch/pigz/pigz-2.4-r1.ebuild b/app-arch/pigz/pigz-2.4-r1.ebuild
deleted file mode 100644
index f23df83523ad..000000000000
--- a/app-arch/pigz/pigz-2.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A parallel implementation of gzip"
-HOMEPAGE="https://www.zlib.net/pigz/"
-SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
-IUSE="static symlink test"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( app-arch/ncompress )"
-
-PATCHES=( "${FILESDIR}/${PV}-trailing-junk.patch" )
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/un${PN}
-	dodoc README
-	doman ${PN}.1
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/gzip
-		dosym un${PN} /usr/bin/gunzip
-	fi
-}
diff --git a/app-arch/pigz/pigz-2.5.ebuild b/app-arch/pigz/pigz-2.5.ebuild
deleted file mode 100644
index 3e1f3a17235d..000000000000
--- a/app-arch/pigz/pigz-2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A parallel implementation of gzip"
-HOMEPAGE="https://www.zlib.net/pigz/"
-SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
-IUSE="static symlink test"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( app-arch/ncompress )"
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/un${PN}
-	dodoc README
-	doman ${PN}.1
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/gzip
-		dosym un${PN} /usr/bin/gunzip
-	fi
-}
diff --git a/app-arch/pigz/pigz-2.6.ebuild b/app-arch/pigz/pigz-2.6.ebuild
index 3e1f3a17235d..f57fbf711a4b 100644
--- a/app-arch/pigz/pigz-2.6.ebuild
+++ b/app-arch/pigz/pigz-2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index b2afbebc8082..942e717db416 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -8,6 +8,6 @@ DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb6
 DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
 EBUILD rpm-4.14.2.1-r1.ebuild 3455 BLAKE2B 3636d33dfe5deec80c1ca78ff0df7a4ac29d6c42549eab4cf09927ceb538996ee6804a978331bd67debbf971e12fcf6956d79ef9df6f39ebfc81bce0a6f62c8a SHA512 96a0bc5a032e69eb91bd5967af59e242d4b9570621b6eba455a7f1f0d6ad67c1adb0c3eb2c8e7eb8587bf3022b328accefd3c7b0d3315f183c3cb4c1c24ec55c
-EBUILD rpm-4.16.0.ebuild 3935 BLAKE2B ca9fcf934a6acdfc918ccf658b1959528c5c11d0b5784402f5f599743a0a9536bf054ef8eef3cf3d9b0dfd13ce0c63d5e961d97790fb423c418cd4e48e87faff SHA512 bcbeec2d9533cdb7c41dde254fed52b579e118834cfbe033b7afa283e9813d34bb10fbd63bd31097bf974bfb1ca1037611ffdba87087d405c2aead85fb3b7f6c
-EBUILD rpm-4.16.1.3.ebuild 3632 BLAKE2B 81e8d2c8181bb2778fa6abc36b6c37db4470fd6bc2b6355f9f19a062b0d35eb7f102253c7b386baced9a2a7af054cb96be359c3c86b949c137370df72884049b SHA512 b2505da0564792233c403369f951696ee16ed5686718e616c249b438a2119fc73b656b63d4dae11c43bb759c8714923567adaebbf6ec2278e87bda10484c1bda
+EBUILD rpm-4.16.0.ebuild 3940 BLAKE2B 3e9adc41250a0cad5389abbcc0b6fc865f0db902b33dc00e2250de9eba0165bf9f9daf1565b9b5702afd2bde9a3043abd3aab7e25ca90ebe12e0161351f9673d SHA512 423a9e7ea8d95c9c96208aba406f4c22815cf533227bd795bb69d9c033af0e3d4b2e8baac3dc9469cb7f57a4cbb70cc6d6135c60b5cd96ca5ed98b238a3a4e65
+EBUILD rpm-4.16.1.3.ebuild 3642 BLAKE2B 20e3eebb5667d0367ae7d40892a0898c093e81a5d06a7e663b662bdbe93a9b1f8e5c9c48295ad5ca0aa49d2ff14974c79453d9625fc1ab607f818a02ccdd976a SHA512 092048f92e01f0c8aa7f42ee16a416fd3119b9571bf59f8c27a89e4bf328ac1ee56e2200d3ba227c2caaeafe86c3bc21817a34b603d0a3e0e56b1266a8008604
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild
index 3e6a36bfe072..cdb8d7392a5a 100644
--- a/app-arch/rpm/rpm-4.16.0.ebuild
+++ b/app-arch/rpm/rpm-4.16.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-2 )
+LUA_COMPAT=( lua5-{2..4} )
 PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild
index 1302a5a779e0..2603c2191f03 100644
--- a/app-arch/rpm/rpm-4.16.1.3.ebuild
+++ b/app-arch/rpm/rpm-4.16.1.3.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-2 )
-PYTHON_COMPAT=( python3_{7,8,9} )
+LUA_COMPAT=( lua5-{2..4} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index 1d2d3569a1b8..8b9fa7dca346 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,3 +1,5 @@
 DIST wimlib-1.13.3.tar.gz 1030667 BLAKE2B 2b897392bed3c4a390479f34925474c229ee835ab624c81a0baa7ebb8f3484f27aa4efb2a440debdcafe23b152b385bbe0f198d6f0560e8f88a34c7328a74edd SHA512 5c6e3bd1d7bda55812c818cc527cd241ac8a15276648f2a307db1f2a858de0b322e9f2beffda5bab991811aee3f4a953c3e31847bfa76a7d32ad5850595a15d4
-EBUILD wimlib-1.13.3.ebuild 1469 BLAKE2B 213d3087f76925360c0d8973ae99c967233c41cd17223617ee0eea4c8466db4d7264dffde3b8dfec0406bbbc1b12d1a147ebd2856d746c718444d6528e95d790 SHA512 5ec6b2df3632f5ed55de5ddbcd247e70b80638af5c6340d06dcc446ef721707fdc83871f97d9566ea740f9b7a53e73aff9eaf750e17bbdb2c8196fbaedae2aa6
-MISC metadata.xml 633 BLAKE2B 441e45675abb3671408e44a13ea6ae1738276a598e9e30522e4f58116936ae85a1971f92b2d2c791395abaed09640d2224ccd1ad889a845839212b29222d5cce SHA512 1f7e158976543a9e195330a8cdd5b0f87bae9154d9d01b30bb0e93f900af5410cf35a61e8ea5230b2cf5601717d0a46381febb1375e540da510f95d770e82281
+DIST wimlib-1.13.4.tar.gz 1040411 BLAKE2B 4563429d42be39b959a15ef66ac4c173531ff0c0b0f1a341812a4f870c9f189478f3ce78bf6240544f71b1746d98c9eae3f7182d646355343e26526559384f07 SHA512 480fe6fa6c6e8f1bf9c3960f5e1671f3266535b18dc72e9d7c4c05c7fb833d9b00db5ae9fb49154da6e71e536cae8b562cbf81ab5a124e2a79326927e2cf7344
+EBUILD wimlib-1.13.3.ebuild 1468 BLAKE2B f9fda406269868fee8864b80cbf402082ad5d94c1aa3bbb2e9f5f5c6b7782b5ad43a4175661f0c0b3a2155e90809002bef437b5c9f030edd35f9f46451ffce13 SHA512 7ed537bceba0e7089a5a05d814e8dbf7e2874dac3b7abeb13e9e093f1ed179168742fd1e18a15a5dcbf7927d7295d29c5ccfc19f52444332dd9c8ea3851151a9
+EBUILD wimlib-1.13.4.ebuild 1481 BLAKE2B 0ffb97b8efaa6259101dc9a46b16baf2f9b7639686507144ca8849a3d6afc11f71432608b4e2a1e6959d51f5ec9492112e23f279a305b312b52204bc5e54ed6e SHA512 6b83cb0cc66a068089f1a353a71a269ae69d3c30afc5ebbd1bd65e982466f01698e62e6d967f63ed2b3b1dcb6a0924b05b1c5e1647462f8aa17e0d904dfd015d
+MISC metadata.xml 788 BLAKE2B 39fb937f096a607648c23c57f4fb17947b7ff4705b97db69b3ebea637a4e85723ed333ba01b9755708644d0c7daa2e920d0fd192a586b051ea4682b335156ecc SHA512 638f1e0cf7242b2fbc8c55482b75391e435465e2a7de7cde48eb95e0c2c3d52db360e2595138577d9934285c2fd2b5dafd758a6f97431ece72db5625fab8c29b
diff --git a/app-arch/wimlib/metadata.xml b/app-arch/wimlib/metadata.xml
index 7d39835030d1..b591ed9e0496 100644
--- a/app-arch/wimlib/metadata.xml
+++ b/app-arch/wimlib/metadata.xml
@@ -1,22 +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="fuse">
-      Use fuse libraries
-    </flag>
-    <flag name="iso">
-      Install app-cdr/cdrtools in order to prepare iso images
-    </flag>
-    <flag name="ntfs">
-      Use libntfs-3g library from sys-fs/ntfs3g
-    </flag>
-    <flag name="openssl">
-      Use the SHA-1 message digest from libcrypto instead of compilling another implementation
-    </flag>
-    <flag name="yasm">
-      Use yasm assembler instead of nasm
-    </flag>
-  </use>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="fuse">Use fuse libraries</flag>
+		<flag name="iso">Install app-cdr/cdrtools in order to prepare iso images</flag>
+		<flag name="ntfs">Use libntfs-3g library from sys-fs/ntfs3g</flag>
+		<flag name="openssl">Use the SHA-1 message digest from libcrypto instead of compilling another implementation</flag>
+		<flag name="yasm">Use yasm assembler instead of nasm</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-arch/wimlib/wimlib-1.13.3.ebuild b/app-arch/wimlib/wimlib-1.13.3.ebuild
index 5c3f76379b53..be0165156be7 100644
--- a/app-arch/wimlib/wimlib-1.13.3.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.3.ebuild
@@ -11,7 +11,7 @@ else
 	MY_PV="${PV/_/-}"
 	MY_PV="${MY_PV^^}"
 	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="The open source Windows Imaging (WIM) library"
diff --git a/app-arch/wimlib/wimlib-1.13.4.ebuild b/app-arch/wimlib/wimlib-1.13.4.ebuild
new file mode 100644
index 000000000000..84e997127f0a
--- /dev/null
+++ b/app-arch/wimlib/wimlib-1.13.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pax-utils
+
+DESCRIPTION="The open source Windows Imaging (WIM) library"
+HOMEPAGE="https://wimlib.net"
+SRC_URI="https://wimlib.net/downloads/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
+SLOT="0"
+IUSE="cpu_flags_x86_ssse3 fuse iso ntfs ssl test threads yasm"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	cpu_flags_x86_ssse3? (
+		yasm? ( dev-lang/yasm )
+		!yasm? ( dev-lang/nasm )
+	)
+"
+RDEPEND="
+	dev-libs/libxml2:2
+	fuse? ( sys-fs/fuse:0 )
+	iso? (
+		app-arch/cabextract
+		app-cdr/cdrtools
+	)
+	ntfs? ( sys-fs/ntfs3g )
+	ssl? ( dev-libs/openssl:0= )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ntfs ntfs-3g)
+		$(use_with fuse)
+		$(use_with ssl libcrypto)
+		$(use_enable threads multithreaded-compression)
+		$(use_enable test test-support)
+		--disable-static
+	)
+
+	if use cpu_flags_x86_ssse3; then
+		if ! use ssl; then
+			myeconfargs+=( --enable-ssse3-sha1 )
+		else
+			elog "cpu_flags_x86_ssse3 and ssl can't be enabled together, "
+			elog "enabling ssl and disabling cpu_flags_x86_ssse3 for you."
+			myeconfargs+=( --disable-ssse3-sha1 )
+		fi
+	fi
+
+	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
+		econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	pax-mark m "${S}"/.libs/wimlib-imagex
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index f3b494ab1a35..6255ebe3c95f 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,4 @@
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
-EBUILD xz-utils-5.2.5.ebuild 2750 BLAKE2B 070d4a08f519ab557890b6587c2617025e0386f1216feff40b7e842f89f2b4497048d6468669f63e207f28f8a95553e3413dfc1f4f14fea691fee24b7159db6b SHA512 7db43473bc7120250ef288ea83a257fd4a576b3d958dd9d8c99e0942288ea8d1a8c753e3d3e106ac5a08d411b0fe26f4376669c6f28a2ecc8d1300b7f0543215
-EBUILD xz-utils-9999.ebuild 2758 BLAKE2B 577f2c05c90dbd5361114e1032556978b4fb028a97358ff07d6a19ca8e204505ae7b3a45790b53394db0db2b908bef453ccf511c5fdb5afa50320b1c7890eb0c SHA512 e52511314356824d8706c885b69ae6b2bbcd5799712d916b39718f1ca12cf7d66c6f4dc0c6512e02b130a6fcaf17d62864b5b0c606fdd501915e9cb05a73b06a
+EBUILD xz-utils-5.2.5-r1.ebuild 2736 BLAKE2B caf809358d5cca6b53534d2a3e12c74ea592ba2d4c27c3464fed1e37e76730a6c070ff12ebd0a89d5083bb75f6556574fff577809365fe0ce7fa97c304def8aa SHA512 bc662f0c55445f9cbc2fb49047d0c65cc8564cdc90cc6fdf1fb348865982b4050fe90a508fada72ff4cdefcca877d243b01efa5f8c3ba73a6100346af2f3e5c3
+EBUILD xz-utils-9999.ebuild 2744 BLAKE2B 6d7541d509b95264c5e29cd18eeaa755be7e3cb190bcb9907c18b6a2c8df6a27c3d8548a1b8aded4d723d2b71cc4b8822bbe644174d27ce57072185e25ead892 SHA512 7293c540ba6114237b58e5788cae3499645a655d1c4e96821b932e477147ae8a645dbb39cc7762113d10d5229496e3e59f12970260931eeff6bfc58ab062b133
 MISC metadata.xml 538 BLAKE2B 06981ff73e0b5996d9231d91eb18dfc31f03c7120d68eae5eb1bf98a5b99fecea4622ee0e3649fc655db4abc455a46627a0b77c971afb5729f7c8c5e50b0f616 SHA512 1f1cc9d8bb737ec14e06c1cc41f27dfc4140efb2e9c5bcb749ecc4cba11df9ee5513d8874e0f78a8ba8d597e16c532ad25891f31824beab2ec02e3455a95f8c3
diff --git a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
new file mode 100644
index 000000000000..d628150b10fa
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=7
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+	SRC_URI=""
+	BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+else
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!<app-arch/p7zip-4.57
+	!<app-i18n/man-pages-de-2.16"
+DEPEND="${RDEPEND}"
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-threads
+		$(use_enable nls)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# undo Solaris-based defaults pointing to /usr/xpg5/bin
+		myconf+=( --disable-path-for-script )
+		export gl_cv_posix_shell=${EPREFIX}/bin/sh
+	fi
+
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/xz-utils/xz-utils-5.2.5.ebuild b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
deleted file mode 100644
index fbfae9e95d0e..000000000000
--- a/app-arch/xz-utils/xz-utils-5.2.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI=7
-
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
-	inherit git-r3 autotools
-	SRC_URI=""
-	BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
-else
-	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
-
-RDEPEND="!<app-arch/lzma-4.63
-	!<app-arch/p7zip-4.57
-	!<app-i18n/man-pages-de-2.16"
-DEPEND="${RDEPEND}"
-
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize  # to allow building shared libs on Solaris/x64
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable nls)
-		$(use_enable threads)
-		$(use_enable static-libs static)
-	)
-	multilib_is_native_abi ||
-		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
-	if ! use extra-filters; then
-		myconf+=(
-			# LZMA1 + LZMA2 for standard .lzma & .xz files
-			--enable-encoders=lzma1,lzma2
-			--enable-decoders=lzma1,lzma2
-			# those are used by default, depending on preset
-			--enable-match-finders=hc3,hc4,bt4
-			# CRC64 is used by default, though some (old?) files use CRC32
-			--enable-checks=crc32,crc64
-		)
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# undo Solaris-based defaults pointing to /usr/xpg5/bin
-		myconf+=( --disable-path-for-script )
-		export gl_cv_posix_shell=${EPREFIX}/bin/sh
-	fi
-
-	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index f4e55c873afd..ae5ec60bf348 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!<app-arch/p7zip-4.57
@@ -49,8 +49,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myconf=(
+		--enable-threads
 		$(use_enable nls)
-		$(use_enable threads)
 		$(use_enable static-libs static)
 	)
 	multilib_is_native_abi ||
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 15e50c0e2de4..908b372aa5b2 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/backupninja/Manifest b/app-backup/backupninja/Manifest
index c65f80e6cfb1..e3a648c08f79 100644
--- a/app-backup/backupninja/Manifest
+++ b/app-backup/backupninja/Manifest
@@ -1,3 +1,4 @@
 DIST backupninja-backupninja_upstream-1.2.1.tar.gz 186791 BLAKE2B 2e761b5538c77f359b2cc8b8c593589303f36b5b4d4d9f65457a1786cc671bdc57ad067c5bc7678fbe1afdd17406c3dedd641f2553213ec28186defd4b9d1fd4 SHA512 974276697f908cbf2203fd0cd3ebfe4f44c350714616d3a74191df4f9e101ce6d5f90cd2887dc06c5ed937ea19f9b72db28f5735255fae9d6db4faeaacee808c
+EBUILD backupninja-1.2.1-r1.ebuild 540 BLAKE2B 0294d8998138600ca7267ff3c4c924545e1f64799adfe14d16320f6cd8cbb30fca5b4b2c0b786a0b9e986846ce016891acf3f930c67f407469975030a53b796b SHA512 013b51482c124539eb22d8ff161c688ae9f613706375ff950950abd1baadf39223ae5b3825f78584797ae6dfb8812826a57ce85e605a9e5a58fef8c018ec2dfc
 EBUILD backupninja-1.2.1.ebuild 538 BLAKE2B b0579f86d7755c9cd29d0be3af672e78cf12b1ccf30f63654921b5c09cb4929a6617dbaaa1b14ef099cdefa26cd9a4309d05dfc73055e5f730dd5d6d8a1043d8 SHA512 2dfebffda7334cb8dcaf19f70ded5136fa14e0b50fad943316a007f369f5b6f4d9acca2825f982f03b1dcec3f7bbe291cba6e166cab96d572a3a8cfcca9fe800
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-backup/backupninja/backupninja-1.2.1-r1.ebuild b/app-backup/backupninja/backupninja-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..09356e07f8ab
--- /dev/null
+++ b/app-backup/backupninja/backupninja-1.2.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="lightweight, extensible meta-backup system"
+HOMEPAGE="https://0xacab.org/liberate/backupninja"
+SRC_URI="https://0xacab.org/liberate/backupninja/-/archive/backupninja_upstream/${PV}/backupninja-backupninja_upstream-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-util/dialog"
+DEPEND=""
+
+S="${WORKDIR}/${PN}-${PN}_upstream-${PV}"
+
+src_configure() {
+	econf --localstatedir=/var #578614
+}
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index b3f3e78c8118..72226dafeeb3 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,6 +1,8 @@
 DIST borgbackup-1.1.15.tar.gz 3777355 BLAKE2B 388f3cd33280c9d1a27b9cd43509d317aa1c95d08418a43c176146243d83cf07b3033707ab5423eeb097e92bb31cf016f65fc3738ebff1bb8c704a54c6e8dd12 SHA512 db2f06a96897c07a71e9c4531d4f219ef5451009c08ae933348b1a02b7d6c95b4e814a25b4cf465c0021ff670fdd46076c486c2a466d056dd931cb7eee8b1ef3
 DIST borgbackup-1.1.16.tar.gz 3777030 BLAKE2B bf5ad487fd0cdcce341b14ad950bc447d89d025b1b3434c5d270539d1fc4aec92b52a750ab1079911e53478411f91c92be4f053c09289b1e38285caa03453f17 SHA512 9cdfe794329821c784461382633fd29f7f9b3cc6ef9e7fa2463ed178efd64ea367e56d49128d88b86bd516d36971282207ec173735ecb4eabc4ec7b4604ed773
+DIST borgbackup-1.1.17.tar.gz 3781411 BLAKE2B 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078 SHA512 6170680efcca35341031a8fcfd9434d2dca530bb6f7fcabbf452e6af6a8df5a825b4991d342f3c97bd7378d56b9ee86e6118f9281a31ba51235f49818852f4bb
 EBUILD borgbackup-1.1.15.ebuild 891 BLAKE2B fd7e6dc50e0ca6cfd0773115bae0888f23b8f54b6a0772f8bb1457fae9b991c1a0ed18c7f353a779771b1a46affbccecb06b2d74eea6ec2f649a934baa7a15d4 SHA512 6d7e21a3af4a26e7a3ffca6b317a0c509e9cfc94ab042c3698a634a4576aef02269642ac485de4cd23b6d8bcb22ccddfd36eccaa827111af8b7056b549b7c96a
 EBUILD borgbackup-1.1.16.ebuild 893 BLAKE2B 1abe061f0005516b4a28fc5e9b116c8c84c63cb0433fcbe5b9c8cec57fde4153959a6708af600a6a934cd882b35aff8425ef627548acb51c04292a782b77abaf SHA512 5581b6d662431756c2eac76b5281085387f82d77f30a633db73c7dd80edfe1629d2a854bdaf7d4a56add593cddb90eeb96c33fb3af83f651f9bd39290e239892
-EBUILD borgbackup-9999.ebuild 881 BLAKE2B 63f10540fdb36c49b9d0fa232b3205cb6d6694247e98f9afe8c8028b41fafd088e3d32b74be92e0a4ab2dcdf6f1bef352282e2c0d89feaaca689c14133bf3c6e SHA512 d1bbc1cddcce4b650ec8e1f68785e3a8d9d77ea9b7572dc498e63ee6765e874dd105004563cd81f1bb9d2a83b61a0f6f8be0a4702318ed5d4c3f0a6e55bfdd63
+EBUILD borgbackup-1.1.17.ebuild 893 BLAKE2B 782ea7c0ff09d89d9746bbdd73b1a6242e584befd3924ef7022056cc07454fd15c4916b5f41feb7b01023aef842cb298f820e712fccd2bbbf49b36be720948ba SHA512 3586419ea7e774c5f5949ad141cbc07812e22891b4160e9e3cdbc42347548334acf02f98b089be158235290b5ef4761f6e39af1a9f7de313c1dadd39be334a8a
+EBUILD borgbackup-9999.ebuild 893 BLAKE2B 782ea7c0ff09d89d9746bbdd73b1a6242e584befd3924ef7022056cc07454fd15c4916b5f41feb7b01023aef842cb298f820e712fccd2bbbf49b36be720948ba SHA512 3586419ea7e774c5f5949ad141cbc07812e22891b4160e9e3cdbc42347548334acf02f98b089be158235290b5ef4761f6e39af1a9f7de313c1dadd39be334a8a
 MISC metadata.xml 493 BLAKE2B 7c8c3f7dafce95377347ff7392fd80580f0bc9afb05654795ba86ab20bc54054395a46eaa172cd61ef1084a023cc26bfa9c835e9d73f921f842c03e668bcb6a6 SHA512 00aa284252b1ce793b4176f7eb1255984670924b3dc6ee75867d5a947761a3db7d3b917f412629edbe146b3d22050a4383afa8af4f017ebe68728d1b5575a473
diff --git a/app-backup/borgbackup/borgbackup-1.1.17.ebuild b/app-backup/borgbackup/borgbackup-1.1.17.ebuild
new file mode 100644
index 000000000000..534844c68647
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.17.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	virtual/acl
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	dev-libs/openssl:0=
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/*
+}
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index c1f01db7f213..534844c68647 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 1c9f2aab9aab..d607886bba69 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,9 +1,7 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
 DIST borgmatic-1.5.13.tar.gz 72469 BLAKE2B 3a71be201143a96968bb1ea6008b62e11f6ab199f44f38d0d66f31f24827a8f32cc7b8f50cc5d33a8bbd7046e6697afe509525be90dd9519f4c686b8737f64c5 SHA512 60bcbcc825db3f93a423ab8e44e0b0809ff4937d8e41bc56ec6226e4865c3a66fae8b6749d33cdb0692ea9dd07cfff56750ff2feee68c96791b83c9dd5f35433
-DIST borgmatic-1.5.14.tar.gz 273464 BLAKE2B 8325643c79f1e2e0a6d94f1e73dbf45bef82ba3d63c48b6652ffc2fb6a7d1dd5b45fb369346292129f948ae88216e93c2b0ab88ff889ae49cfb0dd321bed4125 SHA512 eb0aedfafe06f90dc3e54a19299a9ea7e8c83bdec0a305228bf13b951d75a5d2a68d2fe6b037adb57588b036081075fb697e000c8ea4ff467a582a6b1ac9fd60
 DIST borgmatic-1.5.15.tar.gz 275702 BLAKE2B c01c469a4e0b96f4a364e0e44cd26d60cf34bc1c969cbf9931ee5ec6688cf012a1c22acb20e3a434b765ef5ec68657a2507e292e5ed3b9e0587f8784e85ecfe9 SHA512 5520e2e903162caa42c66c1e172af225f5f9622c1b33e5f0854f2dc8379752865e8cb8c442e545ec4fc98509e5c7c863373b12e57cf0bbd417b4e8c0887a27fc
 EBUILD borgmatic-1.5.13.ebuild 2136 BLAKE2B d47ab1d52be44bcfdbd48f4ecc71d3e52745ac4aae355d01ea523c0365c0f2c99ad186cd1de8573e5ef55eacbf9807510926d32495ca6fde4ef4394168ff2463 SHA512 e8b6c7fe7f5eef392df91887539d908aa1fec90a05a0c1ff09950dcf225c180414e2f7760cc854f6d33bfd25d3c8cd1a6f69d904001902c04f55ed22bc62e5c9
-EBUILD borgmatic-1.5.14.ebuild 2137 BLAKE2B efdd1242292e60bf5c1bf85913b4958db1a995caddeff0059cb0995049e3c1938117be1c3e3e9f4bbe16bf2ff8f5b62b37b325ae1085b4dc519ab832274106d1 SHA512 60673b7f47c3451e0a97b2e739fc80e5065c212e5260cae281fc66cc42245a1c4f9ca587a8a413b9691ca932645f569521be195d8b9d16c8ab77e2e1d260320a
 EBUILD borgmatic-1.5.15.ebuild 2137 BLAKE2B efdd1242292e60bf5c1bf85913b4958db1a995caddeff0059cb0995049e3c1938117be1c3e3e9f4bbe16bf2ff8f5b62b37b325ae1085b4dc519ab832274106d1 SHA512 60673b7f47c3451e0a97b2e739fc80e5065c212e5260cae281fc66cc42245a1c4f9ca587a8a413b9691ca932645f569521be195d8b9d16c8ab77e2e1d260320a
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.14.ebuild b/app-backup/borgmatic/borgmatic-1.5.14.ebuild
deleted file mode 100644
index 06c3a588685e..000000000000
--- a/app-backup/borgmatic/borgmatic-1.5.14.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
-RESTRICT="test"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		dev-python/colorama[${PYTHON_USEDEP}]
-		>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-	')"
-#BDEPEND="
-#	test? (
-#		$(python_gen_cond_dep '
-#			dev-python/flexmock[${PYTHON_USEDEP}]
-#		')
-#	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# Unlike the other two test files in integration/commands, which use the
-	# relevant modules' respective APIs, test_borgmatic.py tries to call the
-	# 'borgmatic' executable - which by the time we execute src_test will
-	# not have been created yet. Adding --install to distutils_enable_tests would
-	# likely take care of this - but between the aforementioned behaviour
-	# inconsistency and the fact the only test run from this file as of version
-	# 1.5.13 is the parsing of contents of 'borgmatic --version', just skip it.
-	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
-}
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    generate-borgmatic-config"
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 57d5d6c108fb..4b88fb1902d6 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,3 @@
-DIST dar-2.6.14.tar.gz 2148023 BLAKE2B 36653d798d1da9cd87e84d2301b9f1fd657e92d1eee91ec1efadb54e94638860103c5e509479a2da846d432328e0a93ae92e1a4d23b6956ca55341ef767fe9a8 SHA512 2b116929fcc192ffee0c266959902b45dc9982ba77e017b3217715e0c63d1574d64083ca55a63e0bb6390e8955c41ca8b09da63934826fe4f0471a63ea739550
 DIST dar-2.7.1.tar.gz 2290659 BLAKE2B 89fa7ac208eb3009f5151f27022a7a449bb204cb035f320e33ff642588b5ab0389c2ed33b71b7a7c6240d205877073f26a04f0164ce05bb370db3bc3faf25fda SHA512 404e3281b2c420088623e4c6ba262d2a7a44848986e43d4c71aff77104395f1178445d560849a73e0dbacce6b8014df2bb20bc33471ae2d07d897bb6ad577bcc
-EBUILD dar-2.6.14.ebuild 2142 BLAKE2B bdcad71a1f72bfb7fa2c2919d5aa2f135dc573c73bd1de7e09af4560a6aa6da4ccd3756b0243cb06d1d87d98e707feb779b094db97b53f2cc39e88b482d8d662 SHA512 efd78340f12c311caa358739b44c698dc42203c219d52601a626c033ac77d75dc20dae108f4e566dc563356796d5426f79d1deb119a49930ce4d0ad355ead70a
 EBUILD dar-2.7.1.ebuild 2227 BLAKE2B 895d91efff0477b33aceb86ef3f007e71b6ffef85954e84c3617037863c658f3c8a810b5ceba94a5a6d896e40dc942165b6ea5a0b46dde2282a444ce986d99b0 SHA512 fb2e0d595a169d0cb7d29dbe398ef61acbc9fcb6b110d14ebf3ef7adc54e36891a1eae12dd5bf6560a115fab5b2b7004edfbbb1f5b8089c34a29e014cadca614
 MISC metadata.xml 1283 BLAKE2B c8686b55e5aab51bc28ace7dbc34af0e40b3b593d2fa8a5a27b746b4e14382b9762593cc9094c8e44bd98fac91eeff1bdce611210991230da6b5ec896e66626c SHA512 592dd28dfbb3dedfb2a7f731893f50e64d08aed3d8cc7aeb15a5d7e382c777d94e8c6b984e4aeeb7c73705a473bd5ae0d885d08b19bcc9370458e0891741d942
diff --git a/app-backup/dar/dar-2.6.14.ebuild b/app-backup/dar/dar-2.6.14.ebuild
deleted file mode 100644
index db1ecf5856f3..000000000000
--- a/app-backup/dar/dar-2.6.14.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="A full featured backup tool, aimed for disks"
-HOMEPAGE="http://dar.linux.free.fr/"
-SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
-IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls rsync threads xattr"
-
-RESTRICT="test" # need to be run as root
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	sys-libs/libcap
-	>=sys-libs/zlib-1.2.3:=
-	curl? ( net-misc/curl )
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	gpg? ( app-crypt/gpgme )
-	lzo? ( dev-libs/lzo:= )
-	rsync? ( net-libs/librsync:= )
-	threads? ( dev-libs/libthreadar:= )
-	xattr? ( sys-apps/attr:= )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	nls? (
-		sys-devel/gettext
-		virtual/libintl
-	)
-"
-
-REQUIRED_USE="?? ( dar32 dar64 )
-		gpg? ( gcrypt )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_configure() {
-	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
-	# logic.
-	# For example "--enable-dar-static" causes configure to DISABLE
-	# static builds of dar.
-	# Do _not_ use $(use_enable) until you have verified that the
-	# logic has been fixed by upstream.
-	local myconf=(
-		--disable-dar-static
-		--disable-python-binding
-		--disable-static
-		--disable-upx
-		$(usex curl '' --disable-libcurl-linking)
-		$(usex dar32 --enable-mode=32 '')
-		$(usex dar64 --enable-mode=64 '')
-		$(usex doc '' --disable-build-html)
-		$(usex gcrypt '' --disable-libgcrypt-linking)
-		$(usex gpg '' --disable-gpgme-linking)
-		$(usex lzo '' --disable-liblzo2-linking)
-		$(usex nls '' --disable-nls)
-		$(usex rsync '' --disable-librsync-linking)
-		$(usex threads '' --disable-threadar)
-		$(usex xattr '' --disable-ea-support)
-	)
-
-	# Bug 103741
-	filter-flags -fomit-frame-pointer
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
-
-	einstalldocs
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	# Bug 729150
-	rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die
-}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 9d65e81a243b..02797ac59db3 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 0531d2db0fe9..3f26882e2a7f 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,4 +1,6 @@
 AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cced8174a65e09f6196fb4fa50128199d462ee62f17c7c8c55e20aabafca1edec2d3ca7edb508dd5e8ac63ed SHA512 26a4f55ac8d57231d9cc137ac8243da4cc33a3efb6b5366891230087c3e4d7555bcf8c20a7608479142589254a8c049f3165807ecf9c0eba0eb72422e04279e8
 DIST siege-4.0.9.tar.gz 525804 BLAKE2B d857df05f40a0ac26a8abdd54e7de374125dde4c114bd1ac3ddd9e9856a30d4fdfefd325980717e59b5876df99a87f971c5b3f91d6478f9638f1860557615169 SHA512 6208b7924162be4dd7ea8cdc297930d28e8a1cb125cf26e8707c2cb67efad741cd090c12081ea80837314d4b5703da152a97b0e8fbf4c64ff64c6714eb4b5fc7
+DIST siege-4.1.0.tar.gz 541331 BLAKE2B c3e8e0f101e27a0902de80478e7c6595f44b4d129cfb265d66c48fcacef4129f587f9ca9ddd0c4d5016513ba19d7635135add1cb02290c4d2bbed5cea501a816 SHA512 15b3b82877153f044524cedc96750a6dab4d21ccbef1be53c0069adade6c3b4204287852a30a57275eea0f51c702857dff59648bd885c28ce65feae141cf6593
 EBUILD siege-4.0.9.ebuild 1226 BLAKE2B 72a44d34e64a9a241699b258ba76da665da5338312608270b2a6930285f134901747fe2ca2ecea1c6068d0a7b409bad26a32d7a8ecea7bc35d6be4bc1d05d99d SHA512 a4ec398482883d3a1e76b7389435e6945eb2997009e809c44e8a1cad5e53c65bfab3a4588c52066fc1590f754b9cd8a11fa2da64907e234e30d787f66118fdf9
+EBUILD siege-4.1.0.ebuild 1244 BLAKE2B 7d5116f71a2854533c283ba3f87efb45a7e7a093428e74e905d3d9c9f2e5ae36f3dce7d69b9142ada82c75b677cb7564b579589478acf36f891ec646112c798b SHA512 06da15cbdc195d6ca38b8110c30b334e606dab7fe4283ba002edc55324404cbb8927caf54f0817b0981c0c190e4d869fc064711480c7001d3738cb6cc5016e65
 MISC metadata.xml 855 BLAKE2B 4dfaca82343517227a9fe3f2507863665e5d966bead652ce7700a2a2aa86363750df02e6fb1dfa2ca86d781cca3cb02611325c6def60461692cb2213d5c78d65 SHA512 09a8da39fde59f4eb9e93d39c7e2dc3414e6bc24d0b4c24e7bcef5878f5987221ab7fc3e7285dbbf1be619ab1663a1aabd267ef00bfea9c4b3addd52473a0679
diff --git a/app-benchmarks/siege/siege-4.1.0.ebuild b/app-benchmarks/siege/siege-4.1.0.ebuild
new file mode 100644
index 000000000000..0789ff28e690
--- /dev/null
+++ b/app-benchmarks/siege/siege-4.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+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 ~arm64 ~hppa ~mips ~ppc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND="sys-libs/zlib
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# bundled macros break recent libtool
+	# remove /usr/lib from LDFLAGS, bug #732886
+	sed -i \
+		-e '/AC_PROG_SHELL/d' \
+		-e 's/SSL_LDFLAGS="-L.*lib"/SSL_LDFLAGS=""/g' \
+		-e 's/Z_LDFLAGS="-L.*lib"/Z_LDFLAGS=""/g' \
+		configure.ac || die
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with ssl ssl "${EPREFIX}/usr")
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}/${PN}".bash-completion "${PN}"
+}
+
+pkg_postinst() {
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index e0b678809b0a..4f24af20f477 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index edc62464cf4a..b2ac61511900 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -1,8 +1,6 @@
 AUX dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch 1626 BLAKE2B 0adc695494b95e300bc4b3539cdaf8c67ab8a6c60761977d93d375d1bb1c01ab5d8e65860de63f689b7a971a1f72fdae602e84620f54505ba7547067e6c3ba72 SHA512 402db0b683e71957ecba9d9280b3bf3f8911304ca06e4f767d3432376793d45e8c63ca8e16fea4cbf2f975ebcc467c6a9793ae64f15807ba88cd70b3b2d22d30
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
-DIST dolphin-plugins-21.04.2.tar.xz 253184 BLAKE2B 2ca0bdbdd1e658bd54a95790d722e23817aca2af1bff16b5056686e58b5ce60aeaecba05ec3a2faf69ccf4d1c4dd7ee91f59cec37da3693917ed9144c4e48ae2 SHA512 379e87f0ee28dd414c1ffe1f2e7775681cf639cda72a6357c357f2a7a30aefee77cfc8b52cb4030ff68555a38d0abf428ac155cbd2d3263ac55b4f41b9ae1fda
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 EBUILD dolphin-plugins-mountiso-20.12.3-r1.ebuild 1617 BLAKE2B d1a164b89a1b104202b93fd2fbea195afae867108bc55be65e04911e4a5cf137fdda16120be33a237bd7775acbde9428300e111df3270b2178649242beca76a5 SHA512 9b5b7e4637ffdcf1ebfbcce3a8e388c41c76b0add4cdbbeeed3672cbedb1cced8bde480c0b97f8edf8f0366073b768cfd92e76508459cadacf41015bd220fdb4
-EBUILD dolphin-plugins-mountiso-21.04.2.ebuild 1523 BLAKE2B 1127b12d30d2085ccf7fa8a250b85c4c09bca675fa9ba1ed03b03ce8b915f266a9435d4eefa004883ac4a0bd8a46836bd50e67b83cf31e070a87406a498de53f SHA512 b416ed8a83721ef91876c20d5af0d04fee27739ba1999c2a622d8909ce8ce965d5ca7057b2aab00dd33330e0bf8d62be1b2573cab56358d756e45df3a3ad1810
 EBUILD dolphin-plugins-mountiso-21.04.3.ebuild 1523 BLAKE2B 1127b12d30d2085ccf7fa8a250b85c4c09bca675fa9ba1ed03b03ce8b915f266a9435d4eefa004883ac4a0bd8a46836bd50e67b83cf31e070a87406a498de53f SHA512 b416ed8a83721ef91876c20d5af0d04fee27739ba1999c2a622d8909ce8ce965d5ca7057b2aab00dd33330e0bf8d62be1b2573cab56358d756e45df3a3ad1810
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.2.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.2.ebuild
deleted file mode 100644
index d0900ab81df2..000000000000
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="false"
-KDE_GEAR="true"
-KDE_ORG_CATEGORY="sdk"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="mountiso"
-KFMIN=5.80.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for ISO loopback device mounting"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_bogus_dep Qt5 Network
-	ecm_punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 5a11171381c4..ed5f018956e0 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/aescrypt/Manifest b/app-crypt/aescrypt/Manifest
index bebc7430d9c0..3e56c15826ad 100644
--- a/app-crypt/aescrypt/Manifest
+++ b/app-crypt/aescrypt/Manifest
@@ -1,4 +1,5 @@
 AUX aescrypt-3.14-iconv.patch 1104 BLAKE2B a6b9a8f41e86c9ac6fe16427752ae20da7177e5c1aec9f42373f94606954732632d84dc06a1425508115b3fc94f54f895c671eca691442c4d3d3b9163a27934e SHA512 fb3dd6a459e1378c44ffcd6a5b109f4bd178ee2e3190eed334bbfa4387fb11c4d070105598b4f0b989428f00a28f2064cf5f5064b71c49db269f4f4b55283960
+AUX aescrypt-3.14-ldflags.patch 632 BLAKE2B 76f47200abc65e747a60e28d5870296d0bbf0292ed34143afc0e4a9afd9ce75225f321dba92c71bf67fd9fe95b72d572080e97a6e1f6bca50604995634584351 SHA512 8ad8c9454b3865f8fcbab9463713bd7e6638a09df792a5d001e0fc2d0d11cc1f50235206d363300e977f6ce6f512c3911e02c9b706ac85069e1536c2734b73ac
 DIST aescrypt-3.14.tgz 38742 BLAKE2B 7122cb0246e28fd1301c58c13145c47ea3e20c8af61efc4115eec8a7ade720ecf2093f2e0156c05eb6cbb6e403bbeb3624745609f0ec1f2fd477edbd876e3373 SHA512 ac06604e2121f0c0f098e87d43c493b7285c58ac7419c284e6a93218dfa7381d4ca69ee775842fde89226092e05978d662eddefe734afe38f67b28df68d87b68
-EBUILD aescrypt-3.14.ebuild 1605 BLAKE2B 1464d3609f29b7d468b5419691d917fa52847cbb734a7eaf771a2ccb9cf47111445e4080855edc5e2b95d828445003eacad75abc0d5ca8acf88a385149a1ce31 SHA512 0743249ceede209664999891de2f5652970d08d7b7bfea2fb703555ea036a0d71c36fc2c7c0f661e9bfe767ccd11716971dc8f66b841963971a201411b461189
+EBUILD aescrypt-3.14.ebuild 1640 BLAKE2B 0a93b28537ca729fef75787a17549d1b6e9cfa4b6ac5458f336916e7013ece2deb3a47768b5cf794043d499e9e5047e8265e5bb4303c28651a3e4e8412fd0f11 SHA512 986a09e671d1eb8aa559728bbcb04f6edf158999d771b48753bdbda58165c879258acb36c11779522daca63eff83fa1593764e6f4b5fad4072ca7cb434d4bfc4
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/aescrypt/aescrypt-3.14.ebuild b/app-crypt/aescrypt/aescrypt-3.14.ebuild
index c40e124664a5..51a5d8403d18 100644
--- a/app-crypt/aescrypt/aescrypt-3.14.ebuild
+++ b/app-crypt/aescrypt/aescrypt-3.14.ebuild
@@ -18,7 +18,10 @@ RDEPEND="X? (
 	)
 	"
 
-PATCHES=( "${FILESDIR}/${P}-iconv.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-iconv.patch"
+	"${FILESDIR}/${P}-ldflags.patch"
+)
 
 src_prepare() {
 	xdg_src_prepare
diff --git a/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch b/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
new file mode 100644
index 000000000000..757f0e4e7fcb
--- /dev/null
+++ b/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
@@ -0,0 +1,20 @@
+diff -Naru a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2021-07-14 09:25:15.509797042 +0200
++++ b/src/Makefile	2021-07-14 09:25:46.689797121 +0200
+@@ -27,13 +27,13 @@
+ all: aescrypt aescrypt_keygen
+ 
+ aescrypt: $(AESCRYPT_OBJS)
+-	$(CC) $(CFLAGS) $(LIBS) -o $@ $(AESCRYPT_OBJS)
++	$(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(AESCRYPT_OBJS)
+ 
+ aescrypt_keygen: $(KEYGEN_OBJS)
+-	$(CC) $(CFLAGS) $(LIBS) -o $@ $(KEYGEN_OBJS)
++	$(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(KEYGEN_OBJS)
+ 
+ %.o: %.c %.h
+-	$(CC) $(CFLAGS) -c $*.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c $*.c
+ 
+ install: aescrypt
+ 	install -o root -g root -m 755 aescrypt /usr/bin
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index 2b63a6c9a623..64682632f14b 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -2,5 +2,4 @@ AUX gnupg-pkcs11-scd-proxy.confd 38 BLAKE2B 56951cac6c364a75191cbcf5b074e537bf97
 AUX gnupg-pkcs11-scd-proxy.initd 716 BLAKE2B 05f2057b6a2bc1824eef62139a70b193152bdf9b92c97244d5574d81d010a19978b2905f952539f0eded8b64e045053c7b0995aa2594dbcbee3eb8e44b149cd5 SHA512 b1719720150d7380c96e987bfa0f7932bdd30aa9462f9c11d9ac06ed58efbb0ef8c60df27b50dceed812a238ee01007abccd99edf7dbea0efcf0de2d35d032bf
 DIST gnupg-pkcs11-scd-0.9.2.tar.bz2 147337 BLAKE2B 52784721bd91929c9d6efdae599893f5425d02e5621ded69d5bc2b5dfa5dd56ca6e0989d99879a2de245e53ba7add3fdacd58fb3b1200135b0a0e618163ade2d SHA512 6afb9f0c50976636df611a0204edb0ec75aa194ba332314e3c2d7228ecf798e5f79923202f8f189b1e4aefa236a46165a5e3f0e0d98320dc4fac2bd9ac38249e
 EBUILD gnupg-pkcs11-scd-0.9.2-r1.ebuild 983 BLAKE2B a3e470da5e40017e38dda4f4033cb425717a4c45fc44967754935daeea8c2995b95be6cfc1cf7274e487d3caf4bf2150660e2bd45420ed198700cb6074a41629 SHA512 90c24f353f117428e2507d875173b98fabd4ae7fe056ba39f717b80ca0691992003427bed926632e118d5a036c09c287e4f16146980e1796361d18a6e618b10c
-EBUILD gnupg-pkcs11-scd-0.9.2.ebuild 1042 BLAKE2B b45b0a1edb07670ecd2d3d6ed2b94fac38188f98d9b013d347eea8a5bc2e1e799c4500c93ab9f5362514a08d2aa2578f7fdfa828e91e37fb9228c81969700b72 SHA512 1e6dfc071b27e67fed25d50ead332140db94443efe842cfa359cdd6e58eb3e847bc85ade3e25cd72e16d29e38b35faa4b217b87413c4ad08361aad91fd222623
 MISC metadata.xml 387 BLAKE2B b1d4e542415419708bf38f73f9b5c945e008bc8a8f5f022702a6d2a757e7608c87ca91a811c82e044ce6321685ad0734230a1e5bac74b5abe9c1040f48a2539c SHA512 a374050bc876f9cdf983c80b07e24b4cc5a4fbbcebd88aff1e353d287187c6099ec81867ca39a0495bc777b3c80d3d855b4ca2391757308de8adfd269f201576
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2.ebuild
deleted file mode 100644
index 5c5f9dd439b7..000000000000
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="PKCS#11 support for GnuPG"
-HOMEPAGE="http://gnupg-pkcs11.sourceforge.net"
-SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="proxy"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-libs/libassuan:=
-	>=dev-libs/libgcrypt-1.2.2:=
-	>=dev-libs/libgpg-error-1.3:=
-	>=dev-libs/pkcs11-helper-1.02:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	if use proxy; then
-		enewgroup gnupg-pkcs11
-		enewgroup gnupg-pkcs11-scd-proxy
-		enewuser gnupg-pkcs11-scd-proxy -1 -1 / gnupg-pkcs11-scd-proxy,gnupg-pkcs11
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable proxy) \
-		--with-proxy-socket=/run/gnupg-pkcs11-scd-proxy/cmd
-}
-
-src_install() {
-	default
-	if use proxy; then
-		newinitd "${FILESDIR}/gnupg-pkcs11-scd-proxy.initd" gnupg-pkcs11-scd-proxy
-		newconfd "${FILESDIR}/gnupg-pkcs11-scd-proxy.confd" gnupg-pkcs11-scd-proxy
-	fi
-}
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index c04accb5a12a..fd066b87f712 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,4 +1,5 @@
 DIST libmd-1.0.3.tar.xz 258584 BLAKE2B 35b732800a4b0a7b8d0a88eeff5e7e80fe55ab5ed05b7a7a1ffe866e156cc6dc6daca95f865a56297857b10b1bdfc9815b5bf0b198e8284f217498265c08fcc9 SHA512 f4b5a86bea7b9fac9f7f173032ee436d1e7141f760c1a114a785d31644edbf6802fe8193cc4cf3b5c66d38963be919c05055780bdf6bf5a47927690490ff5966
+EBUILD libmd-1.0.3-r1.ebuild 623 BLAKE2B 4dda188f2893c042a22b6bca8112380ffc1cc601dda51b9f5b4fd49b693cc6f0ff6033c05444cb64c42a08c061f49e1b0cb13d34781dad0e0c7ab978b428feec SHA512 ca0cc1694628f2e3d157f970496b7f3ed856e328cc93841d59e494b16a613beeadaf44c85c4f93022993ce26ad1cfec62685a31dc3d77d2613de8ae7de786d82
 EBUILD libmd-1.0.3.ebuild 563 BLAKE2B 0a43166defe23d160046741dd6811ccb897b4a27453c141dd854ce93b7134dc111bb0db9d4ab85592c0fc78e398fdf74dde2598e11092998a87f5557c033dcac SHA512 0b7b49b623b67ad57ef8f4eba25982f70eef5b378b03612a8cd4d9fdd566e1f618e81eb78ca06d010e7101bfdccbdf543bccaf460fc13149cd72f6aeb3e54ef7
-EBUILD libmd-9999.ebuild 523 BLAKE2B e512f27bd0203585b0e2f3eb11c6b38ea853949bdd5dfca7b2f744650b11a18994089bd847fd6a73c5a909ad7f7a9043c2421abaa811a7cf83ea9e4b5ba3ebad SHA512 0ff23822acfdf09f4ce1fa90184c64b58154fc0ab9d713424d32b120bc2670d63865b3be9c831c34c45a5afa308db9c5f5dc12753e9a4a7ff47b14d28eb0fe14
+EBUILD libmd-9999.ebuild 567 BLAKE2B c31c8d0780cd63516fae57497f80340712547fe78d17e16ad8d1c1f7320681ef914d0ffefc459593b2de6e0db054860296c72060bea33a4ef47de42dc3da8a14 SHA512 82345337a69a40c8f7199a3be295b18e530be415c712af1259b4e110f7cc80d50705559ad92ce0b7c001c8f6f95ad7d5fae3d09b3ec527a1b860e8577d078ed6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/libmd/libmd-1.0.3-r1.ebuild b/app-crypt/libmd/libmd-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..eedd72789dfb
--- /dev/null
+++ b/app-crypt/libmd/libmd-1.0.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Message Digest functions from BSD systems"
+HOMEPAGE="https://www.hadrons.org/software/libmd/"
+SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
+
+LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/app-crypt/libmd/libmd-9999.ebuild b/app-crypt/libmd/libmd-9999.ebuild
index 7ce508a893c1..b28c93edaff6 100644
--- a/app-crypt/libmd/libmd-9999.ebuild
+++ b/app-crypt/libmd/libmd-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools git-r3
+inherit autotools multilib-minimal git-r3
 
 DESCRIPTION="Message Digest functions from BSD systems"
 HOMEPAGE="https://www.hadrons.org/software/libmd/"
@@ -14,16 +14,14 @@ SLOT="0"
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
-src_configure() {
-	econf --disable-static
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
 }
 
-src_install() {
+multilib_src_install() {
 	default
-
-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 2941745cc4bd..75b3681a9140 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -4,5 +4,5 @@ AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c512
 DIST qca-2.3.2.tar.xz 735500 BLAKE2B 559b27c48c756f2b4f4f206d2157c90ae4856610f1539b4162a2bffe7fffe19b5c768d3d3f9d0486d2098fb403eb64372515815f49fd428d22dfc0405d99e435 SHA512 da6415a097c99b878f45730c1dd1e0bfc7f96858ad7018918ac7c2ae2eca830cb73e131173b1018ee4caa6c3a504b80c8ad28f8f9448c2fd1593161c2ac8aad4
 DIST qca-2.3.3.tar.xz 736456 BLAKE2B f0812fd33bd19293c8034e48bcf214d2d70dc1397860779c2c145fe841365384a8eb6bad9859520d32104010acb0cefb97e3a974b9852a37ca8039d52d9dbd03 SHA512 9a262350502daa1dd10802a7a24f0e4712d87d4ddcf752452a51caa8694a30835672f54f8e600aa8dc4afdac9ef073641deed52a24423e304d18ad2b83deeca6
 EBUILD qca-2.3.2.ebuild 1995 BLAKE2B f054015be5f10231bd5c491412d2abb0b9ad1c94158e88cfd8bd6db6ef6128428822c03af21c189f1df04cfa8833d331a8174fa9804c1b0b560d3d0b6e77d92d SHA512 ae7417c07673b4755651236964ceea2d5bc4ef69ad1ff78affbeaabb357caaafb0f4400ea41ed428de380111760ab46e0611e852e883406862cd878fb77c3f10
-EBUILD qca-2.3.3.ebuild 1843 BLAKE2B 698e16f4b33fb33e713eb8f4effb4e7018728946404d382edaab67ee47e51f3e42dcd0e7c900d0ad36038233ceb62e7e728776bf39d365f3ac2986e45da3a878 SHA512 09ccb227109a19da4deb6bcea01e4e04919d904b5f99ea835403c1d3caf0971f1f64bd7c67cc98f80e92ee02522f3cd66ad76af5ff2407f448368b254ac1354e
+EBUILD qca-2.3.3.ebuild 1841 BLAKE2B f7a05fe8034c4a51a21d8807e30a8648af7f6bb40c3e861a949f30bc149ca3b64c81ba209e9d16888d0e3f8a812a3838dfe41197863bb6dda40ea97bc4c4cf60 SHA512 8a945d877abda91ca1b9594b4288cfaf452ed57ae79bf812ec3dd658f6bee47a07dd9ab39ea436326a10f12386f8c34b3ce7b9fe7cf8da21a2a7b80396ce0bec
 MISC metadata.xml 745 BLAKE2B ff8e25b082d3c642fce099df1a218a4936bdc862a96fd237303d040c477544cf6368d23cc5de414d95f021e9c6ec475879225ab201f7c6d6711c04153ac53140 SHA512 6b82494b8dfe0d36da9818a6dcf775252dbb7051430232ccc2519c449cc2877da6478ca98f5b7a982a7660a869a0b8ae7a814fb18108ff42fed9712a9253e867
diff --git a/app-crypt/qca/qca-2.3.3.ebuild b/app-crypt/qca/qca-2.3.3.ebuild
index 5f2030b035fb..c1805f95d270 100644
--- a/app-crypt/qca/qca-2.3.3.ebuild
+++ b/app-crypt/qca/qca-2.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 8a13c035bf5c..344f3c39f3d1 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -3,9 +3,9 @@ AUX freebsd-triplet.patch 800 BLAKE2B 43f1f7e1fa43313e2f323a3e5031a463185c2388a3
 AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc451986ba837807b3d7a56b80f50c8248d734745f886d40d341a99fefaf439f95bdeb0382ee15ea9e4f8561f98703fba2d SHA512 3771077c64c28b1fcf310d7a449d3e1eb951d1669b2ad3ddffe76d98ac5821ea8af40013984c65f28c7fce3434b7173a74a77120847f557cab2dedefac0c8b58
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
-DIST rhash-1.4.0-src.tar.gz 406433 BLAKE2B 2af437cd3a049bb9473825026f8a6476c81b4400a47638c62ee3ecb3d3984f7f9fe97def91488094a2919e5baad967d3f49ec7d95363896e270251ad085bacac SHA512 2f02487fffe8d1bc70c4454829bbd250a15fbd09db5ef85c54d3e8ad1008e84616ea54483292deae45047a27964e27b26d9b3da8447e7c37dac1e2ce18a63a07
 DIST rhash-1.4.1-src.tar.gz 413274 BLAKE2B 2027bccc677e8a1766f0624e67f475713653ddb4be457f9c8434c45019bc730934ca860e69f8b8e1fec349e724b1a366df0f5fb98501c825b44f9b8105068ff7 SHA512 30bbef7ce7815ee4ac062c537206a0b895845f61de4b1fdc0c0494f66284d9f3c1b06f812ea913fa35a3342d230d25d0986a1db644c7b4464bc1185997beb638
+DIST rhash-1.4.2-src.tar.gz 416853 BLAKE2B 06322825116cb00aa4987b01610d967eb57c94aa29b43348ec2c31f053fd471a900fcee776714263213e9a79eaf389b2e79d7b34a5afd3e98d68198193b5cbe7 SHA512 41df57e8b3f32c93d8e6f2ac668b32aaa23eb2eaf90a83f109e61e511404a5036ea88bcf2854e19c1ade0f61960e0d9edf01f3d82e1c645fed36579e9d7a6a25
 EBUILD rhash-1.3.6-r1.ebuild 1815 BLAKE2B 25d7980d3736edd66242acec9de12ef8bc434993a083dd2e12b3f382ca90aefbb42d4e96b35b6c42c106184e6956c8e33aac424d2272e1ae7eb77ead02f4d5af SHA512 15307b2110d89a05d3afdb6ee43a87f3ec33c921d7796cc73831d2d60c7e25df7531a73badb5a9721aa010b58dba74f1536bea7b7c9ec283e2a7ad1e430af1c4
-EBUILD rhash-1.4.0.ebuild 1853 BLAKE2B e2307251210a5bd8f37c2c4f2fb1a3c3987a9f8b9b72d454e71620a81d5de46ab70f5e7b31520827fe13ed82c1fda46b06bdc1e0c54bb77e5b24a37ef026172c SHA512 ff01f491ef52ec9372e825eef2b7504ae5c0f10494968c9d51c00427f1cb9ec51f229c8926c666b7cb3198f9c278d5cd90452ec4978e825efa2f949ab65bc11e
 EBUILD rhash-1.4.1.ebuild 1885 BLAKE2B 65d6c7be3d3db04a2f43f1c1f4614ff3e812e56895ed7e0e0f8824e28a718224614366d08def5d1cb8f480744061b28ef00f08fe61e1859756af5cafeb0e282a SHA512 01e111abd4f61534bc6fef1ed0b76a085e377b698b0350855218e772927bc8adc557cc4e37928c9860649f775995a7e4da296bdb722b4589a5af13e3a4ef3f6b
+EBUILD rhash-1.4.2.ebuild 1885 BLAKE2B 65d6c7be3d3db04a2f43f1c1f4614ff3e812e56895ed7e0e0f8824e28a718224614366d08def5d1cb8f480744061b28ef00f08fe61e1859756af5cafeb0e282a SHA512 01e111abd4f61534bc6fef1ed0b76a085e377b698b0350855218e772927bc8adc557cc4e37928c9860649f775995a7e4da296bdb722b4589a5af13e3a4ef3f6b
 MISC metadata.xml 816 BLAKE2B bb6057383b42281881b70331deed4070724bf10bdd00eb8329d3f3133329aa47d8d64ea66c70500dbeb8f92995f527b012dfeadd96d5c2a1eb73ff0ceb20f43a SHA512 ef3d1b671c08f7f1e1394675f626fc399a7a07dbefaa1a4ef1201052db524f2063efca3470b0d4f58a03cb8a49bb086e37b0bb8357cfc761107b1d6563e79263
diff --git a/app-crypt/rhash/rhash-1.4.0.ebuild b/app-crypt/rhash/rhash-1.4.0.ebuild
deleted file mode 100644
index 4efaf57147b0..000000000000
--- a/app-crypt/rhash/rhash-1.4.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="http://rhash.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="debug nls ssl static-libs"
-
-RDEPEND="
-	ssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-)"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/RHash-${PV}"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
-		# we lack posix_memalign
-		sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
-			librhash/util.h || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	set -- \
-		./configure \
-		--target="${CHOST}" \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-openssl-runtime \
-		--disable-static \
-		--enable-lib-shared \
-		$(use_enable debug) \
-		$(use_enable nls gettext) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs lib-static)
-
-	echo "${@}"
-	"${@}" || die "configure failed"
-}
-
-# We would add compile-gmo to the build targets but install-gmo always
-# recompiles unconditionally. :(
-
-multilib_src_install() {
-	# -j1 needed due to race condition.
-	emake DESTDIR="${D}" -j1 \
-		install{,-lib-headers,-pkg-config} \
-		$(use nls && echo install-gmo) \
-		$(use kernel_Winnt || echo install-lib-so-link)
-}
-
-multilib_src_test() {
-	emake test
-}
diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild
new file mode 100644
index 000000000000..4aa5c894ec98
--- /dev/null
+++ b/app-crypt/rhash/rhash-1.4.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Console utility and library for computing and verifying file hash sums"
+HOMEPAGE="http://rhash.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug nls ssl static-libs"
+
+RDEPEND="
+	ssl? (
+		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+)"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/RHash-${PV}"
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
+		# we lack posix_memalign
+		sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
+			librhash/util.h || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	set -- \
+		./configure \
+		--target="${CHOST}" \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-openssl-runtime \
+		--disable-static \
+		--enable-lib-shared \
+		$(use_enable debug) \
+		$(use_enable nls gettext) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs lib-static)
+
+	echo "${@}"
+	"${@}" || die "configure failed"
+}
+
+# We would add compile-gmo to the build targets but install-gmo always
+# recompiles unconditionally. :(
+
+multilib_src_install() {
+	# -j1 needed due to race condition.
+	emake DESTDIR="${D}" -j1 \
+		install{,-lib-headers,-pkg-config} \
+		$(use nls && echo install-gmo) \
+		$(use kernel_Winnt || echo install-lib-so-link)
+}
+
+multilib_src_test() {
+	emake test
+}
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index 10de0e69b78d..e9907f129b42 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -2,5 +2,5 @@ AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aa
 AUX swtpm-0.5.0-disable-test-dependencies.patch 696 BLAKE2B 7cbfb36e82b88d125dabaab8508803cde8b4fe414b1bf0e193421a7632597baa3142dcefa1bd53c7ebe6fea529ad827fc65bfd42bd617c415043b795d5c36c15 SHA512 32931311e8a4c57ae167379db5ff3decc5c1b3b891f180e6ee4991a9cf366ac26049c2e3eabc434eef3890635317f2f2cb1a80cf827a4c3e44fe76943665e85c
 AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2ec4e3e1b8b0a9a41bcb4c45705e082b887d4739d7bd23481dd0c528f957b78e1c84d0e33a0e8b211ee2266018c79014b83afa SHA512 c90c438ad805db4310b2fd2b8c985f86c30e4010f08be9cae2de65d8ba4c4c65df8f80eb62636b30b2cc1d5df3ebc4a225bc32f77434d603aa71ee917560d5c8
 DIST swtpm-0.6.0.tar.gz 326049 BLAKE2B 52b310e4da1f256f440d9e0022cb6d5f5987b10aa85c8bf2837f5a5c61bc076f7d24d0a027987ef28ba0e7983a2fb04476103b88c33e3312536777366bf9b0cd SHA512 b12bb9cc486c50d0689a5655799c0d52f85d320a1d849fd56ee5c4b497472102c61b5d368f46a81e0b9feacc63b25b434bd6229f492951097af1e9c74a37cc96
-EBUILD swtpm-0.6.0-r1.ebuild 1409 BLAKE2B 01919cb57aa061848c6281432d37eda9d795cb7e7547af8fc8c28602ae24501df27c28db691c251752cdbcbcefdee4f12f0296bbc10975624a764ea57dcb0408 SHA512 f23c56d324600153812776aca837771aa8ae07dd878470d72bf5b0f1e2cd2aa4d2264ac3bcb162b04eb8ca6e07554d7c3714fe8719a6355188d3943e4b3e1fcd
+EBUILD swtpm-0.6.0-r1.ebuild 1414 BLAKE2B 5cac9b3d8611c4287917b34c2a1d8e557f7e524589a5e2ee52b7962cd180d843053066442e3d9c9f0208f71d956d07a2e86a031532ebf1fc7bb648f0834632a8 SHA512 f355298ff770aaae54e0897055a30880e5960a99017012ec207116480b93c165c52794d5020908fc9390c34d18d9937e0307fcc6a0ba891ff02aee49e8a166b1
 MISC metadata.xml 622 BLAKE2B fac6d084af4763e20d7bf965bc66f31cc8485d11b0a79169395e253730ab8cd9754ce6edc9f72f1289347497a1562bfdba083ef49bf4e13e5e99f01cb5ea7735 SHA512 c89423fcbfb975edbe115075aece42f43b833d8ebecfe86630f74e8b7de1cdc279fb3fc580fbf77d19529e8d52c657d0abbfcf95b30683df860d0b341ce3d17d
diff --git a/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild b/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
index 74281bd54827..b6fb875736dd 100644
--- a/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
+++ b/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc"
 IUSE="fuse +gnutls seccomp test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 916a38016958..224a80a70a96 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,6 +1,7 @@
 AUX tpm2-tools-4.3.0-Remove-WError.patch 360 BLAKE2B 440f48fca6e8aaf9b2c0fd094011738c467a22dc31bd94b53f6788b8fa52c00c5d7ebe074434be60b6370dcf1e94ee4d57bcfc93857fcf03dbdff30c8e157445 SHA512 0d246d1446b5b2ebca0e12467c746a731897311448840a7aac35b57d22edcdec0c9f424d1c95c9614d969a57dba458bbbad8826516cc05329b47d2dad05318fe
+AUX tpm2-tools-5.1.1-fix-tpm-checkquote.patch 1193 BLAKE2B d65717bc15b490c99123ad8022dace6b337b638b797d6f5b0aa783e04fd4f12f2f4281bcc5d53728a6b612c6106aa2ab1593bce9833fcd4109e94de1a1718135 SHA512 a38cdc124eaf1321d954dc969c3c5a409a90ee7d5d25eb0bb692b9a56f8340a6f783852e995a4e9790f5472c47d8475ad083b76015ccfddb7d74ea167cc54364
 DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b SHA512 1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
 DIST tpm2-tools-5.1.1.tar.gz 1044427 BLAKE2B 885ff61ad971c95d067bf8f9339de289f082f3103d1c382f45ac3ffbd4d5effc343ddc3c2c74b97b9d31f3f823d264991d1726c1f9c21d5c9b82ac1cdf714d3f SHA512 4e094dcffb66103773d85e866ab9ba8db5d0f205ff9658e08fe14e8e41250570a7f7274b4048934adf256ea41650fa498fc3d6da2786adc241a4bf2e8f7bf78e
 EBUILD tpm2-tools-4.3.2.ebuild 1052 BLAKE2B bf435ee4ce938f58cf82a835e4940c2044ee179a574e575fad1124222216c4d1147d302b9fbe95165303326758e7145112e120f7d1f70c0750fc62b75d4db1c2 SHA512 85155fc93543892a19be80b0826f20fb38be8cfe84ed2e4ae957e2c36bd075126b635fe54f848785aa866c0a22e1e7e19378a22361c30d3fba4f922299cc3048
-EBUILD tpm2-tools-5.1.1.ebuild 993 BLAKE2B e7e8750093ec1056288c291d4384d2c9e02efc208f259b9b476c59ad7f2057d01c7335beaf9475e1f6fe41d2dc615cfb208cd13477ca937e26c2dfd43af5c1f5 SHA512 7ba11ecb516c1e2de20481e784082ee25d101a5522c6219921dab922dd30ff3a5a8cc53997c3845941993e5f121ab2f0a4143832a985c5babf85e6c3be655e82
+EBUILD tpm2-tools-5.1.1-r1.ebuild 1575 BLAKE2B e9a949b1e0387b15b2e87bd95fbcb47edfb4b0cb92a6770274e5607d62617e8635a2265ac12031707c03d54b167b21c0730c92c13f8e0f1d104c4bf8fd03fc7b SHA512 7d6a7d2dd894fb521494110a818433ff804bc0deb72565a35c1e97120fa454978b422627768db3619ac89d68a0651e9077297d2b13d284b68dbdbca269356b8b
 MISC metadata.xml 559 BLAKE2B 6c0842aa4bbd95d2047bf3ce11c99fad96491481bbe52cdd81d0d02085d97799129ab5a249925c88c20afc1fba8890fb1809a1809a2c2c23e62bb36673031c98 SHA512 6fe7716a5db796b958fee79d65fa04b32196985f503bfb11ff4790c95f118fb5ca14cc9b4ef59b94caadc60c30453b629c6b93918fde505404646a0165947f5c
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch
new file mode 100644
index 000000000000..73fb0e3f487a
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch
@@ -0,0 +1,34 @@
+From 3d7edb1c70cba6c34c71c9b856c07b8adcebb15c Mon Sep 17 00:00:00 2001
+From: Alberto Planas <aplanas@suse.com>
+Date: Thu, 17 Jun 2021 11:07:25 +0200
+Subject: [PATCH] tpm2_checkquote: fix uninitialized variable
+
+The variable `temp_pcrs` is uninitialized, and later partially
+uninitialized when reading the selection data from file.
+
+When activating lto optimizations, this bug presents itself showing an
+error during the read of the quote:
+
+ERROR: Malformed PCR file, pcr count cannot be greater than 32, got: ...
+
+Fixes: #2767
+
+Co-authored-by: Martin Liska <marxin.liska@gmail.com>
+Signed-off-by: Alberto Planas <aplanas@suse.com>
+---
+ tools/misc/tpm2_checkquote.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/misc/tpm2_checkquote.c b/tools/misc/tpm2_checkquote.c
+index 531508579..8d780f111 100644
+--- a/tools/misc/tpm2_checkquote.c
++++ b/tools/misc/tpm2_checkquote.c
+@@ -376,7 +376,7 @@ static tool_rc init(void) {
+     TPM2B_ATTEST *msg = NULL;
+     TPML_PCR_SELECTION pcr_select;
+     tpm2_pcrs *pcrs;
+-    tpm2_pcrs temp_pcrs;
++    tpm2_pcrs temp_pcrs = {};
+     tool_rc return_value = tool_rc_general_error;
+ 
+     msg = message_from_file(ctx.msg_file_path);
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
new file mode 100644
index 000000000000..fb7168bfb2f4
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit autotools bash-completion-r1 python-single-r1
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi test"
+
+RDEPEND="net-misc/curl:=
+	>=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+	dev-libs/openssl:=
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	test? (
+		app-crypt/swtpm
+		app-crypt/tpm2-abrmd
+		app-editors/vim-core
+		dev-tcltk/expect
+		dev-util/cmocka
+		dev-python/pyyaml
+	)"
+BDEPEND="virtual/pkgconfig
+	sys-devel/autoconf-archive"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
+
+# One of the tests fails without this patch. See
+# https://github.com/tpm2-software/tpm2-tools/issues/2767
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.1-fix-tpm-checkquote.patch"
+)
+
+src_prepare() {
+	sed -i \
+	"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+	"${S}/configure.ac" || die
+	"${S}/scripts/utils/man_to_bashcompletion.sh"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable fapi) \
+		$(use_enable test unit) \
+		--with-bashcompdir=$(get_bashcompdir) \
+		--enable-hardening
+}
+
+src_install() {
+	default
+
+	mv "${D}/$(get_bashcompdir)/tpm2_completion.bash" \
+	   "${D}/$(get_bashcompdir)/tpm2" || die
+	for B in "${D}"/usr/bin/tpm2_*
+	do
+		TPM2_UTILS="${TPM2_UTILS} $(basename ${B})"
+	done
+	bashcomp_alias tpm2 ${TPM2_UTILS}
+}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.1.1.ebuild
deleted file mode 100644
index da8ba7b38474..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-	>=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	sys-devel/autoconf-archive"
-
-src_prepare() {
-	sed -i \
-	"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-	"${S}/configure.ac" || die
-	eautoreconf
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable fapi) \
-		--enable-hardening
-}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 9846b113d371..cc559f1459ee 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/canna-2ch/Manifest b/app-dicts/canna-2ch/Manifest
deleted file mode 100644
index 3ef44ca6963b..000000000000
--- a/app-dicts/canna-2ch/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 052ch.dics.dir 64 BLAKE2B 2c5c8acf76dfc1afce87371dbb896411bb79064a09bddd5605e0ce642cc4bb60752944f2e6a93722cc51f10f37659300fe68a8edfd359ba2c5543ea5112360e3 SHA512 5b1bbcd84a1cb5ba6a16e3f980493a51c123e6286231e4e8a12042479930e4d48392a70edfdafce8a1c218639a19f0aa5ddf4d39d2290a12b6adaea291c0fb13
-DIST canna-2ch-20040519.tar.gz 53168 BLAKE2B 247b30f7a97258eac52f9a1d32bd2a785dcfaccd50430fd251a287a80b7a7ab12d1f2c4894d9eb026552f033854b50fbc967a50b66b84d3d5fe68e1954beb6fb SHA512 62b6f633fd0d345e09ce1e0603f61fe1363880ecdc72932e7a8d6d4c17a23be619a749974a3f54a78642396834888f628f047f1a88db3c8d36a758468bd6d296
-EBUILD canna-2ch-20040519.ebuild 648 BLAKE2B fbc0bc1a3c8c4019bbe66972524f7e775feb15b84b1f47f9a57ee851e21e8564a679c9ea412618d45b8a6172f9c6d662e7f07caa3aafbaecb0a25e9c6f36b765 SHA512 4963c5f74304ad3430575489664e273a3150331660373cd5db436e1d82a0c3e8669f01e4cf772d3174bd8cda34f938674e41108909c0483c9b6cfe38e06de3c0
-MISC metadata.xml 322 BLAKE2B 387badfc988d38cce4610565153297b4e346e4e7cba3de038b764c5d276accd880d1e53d1b4a5bc1059908f729f1b38cf93e74c1af2a8aa32f7ce8b5c6a95f19 SHA512 a922bc9b936b97ac46a995b11559345553fea4b9870d5e97afe1886a360e8820ae0fb6041f0d125310acbc786da0840152779d60e6131af665e7ee8440e680d2
diff --git a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild b/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
deleted file mode 100644
index 6dad34d3dab0..000000000000
--- a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cannadic
-
-DESCRIPTION="Japanese Canna dictionary for 2channelers"
-HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna"
-SRC_URI="https://dev.gentoo.org/~naota/files/${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="canna"
-
-BDEPEND="canna? ( app-i18n/canna )"
-
-CANNADICS=( 2ch )
-DICSDIRFILE="${FILESDIR}"/052ch.dics.dir
-
-src_compile() {
-	# Anthy users do not need binary dictionary
-	if use canna; then
-		mkbindic nichan.ctd || die
-	fi
-}
diff --git a/app-dicts/canna-2ch/files/052ch.dics.dir b/app-dicts/canna-2ch/files/052ch.dics.dir
deleted file mode 100644
index 1ddc85d64336..000000000000
--- a/app-dicts/canna-2ch/files/052ch.dics.dir
+++ /dev/null
@@ -1,2 +0,0 @@
-nichan.cbd(nichan.mwd)		-2ch---
-nichan.cld(nichan.mwd)		-2ch---
diff --git a/app-dicts/canna-2ch/metadata.xml b/app-dicts/canna-2ch/metadata.xml
deleted file mode 100644
index 95f2f679f0e5..000000000000
--- a/app-dicts/canna-2ch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">omaemona</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-dicts/canna-cannadic/Manifest b/app-dicts/canna-cannadic/Manifest
deleted file mode 100644
index 5906eb5493f0..000000000000
--- a/app-dicts/canna-cannadic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 05cannadic.dics.dir 101 BLAKE2B 7ab80f9b113dcf0f57774b4cff5f78aa3f8640208f70424fe963fd904aa58ec7be369161a409007dbb97ae727d345eaf4f58e2855e64900ffa412b7d4c76c0a4 SHA512 6edc05f44046021b78954b598cb1b23ab0dc270278af1e52c92c752f5a3b14170771fc83d682b3cbeb0dffcca9831f4f2ac2a9f9975dca72f3e2ab3b0a7dbda2
-DIST cannadic-0.95c.tar.gz 1028308 BLAKE2B 1da5594fa27522693141ee0dd4afbc1b78be3f5839f85624aeedcdbd1757c27b760f1f1fa165fb77812ed8e952e91747dd16ba135359dd86d3417a9e07d43c13 SHA512 46092c45a49c823ad41a4aed690981bd5885e257a3a4fc23077b2f87bdd131e93438e3989b4abddbc6db1e949c0c21d41db00fcc204b5425ab0b107669bc144a
-EBUILD canna-cannadic-0.95c.ebuild 550 BLAKE2B 9ab13f8504519a718ce067d9179350a8dfd4aa4772ece0f2f5236b819fafca6c4b37a8740b3566743caa0f56e57fea95915291425c73906ceada5c7ceefc22f9 SHA512 6bddda4692dc955ae4820924dea71da5456acd450333ccf83861c191f2f608de719a02a2cb337ff37398bebb8dd2a6f7c864a64881669592e9fd08bbf1783bcd
-MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild b/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
deleted file mode 100644
index 2dfb22218416..000000000000
--- a/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cannadic
-
-MY_P="${P/canna-/}"
-
-DESCRIPTION="Japanese dictionary as a supplement/replacement to Canna3.5b2"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-BDEPEND="app-i18n/canna"
-
-CANNADICS=( gcanna gcannaf )
-DICSDIRFILE="${FILESDIR}"/05cannadic.dics.dir
-
-src_compile() {
-	emake maindic
-}
diff --git a/app-dicts/canna-cannadic/files/05cannadic.dics.dir b/app-dicts/canna-cannadic/files/05cannadic.dics.dir
deleted file mode 100644
index fbbd5b4cd819..000000000000
--- a/app-dicts/canna-cannadic/files/05cannadic.dics.dir
+++ /dev/null
@@ -1,3 +0,0 @@
-gcanna.cbd(gcanna.mwd)		-gcanna---
-gcanna.cld(gcanna.mwd)		-gcanna---
-gcannaf.ctd(.swd)		-gcannaf---
diff --git a/app-dicts/canna-cannadic/metadata.xml b/app-dicts/canna-cannadic/metadata.xml
deleted file mode 100644
index e1a49f498885..000000000000
--- a/app-dicts/canna-cannadic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
index 6abd5d130048..ad33f95652fa 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -3,5 +3,5 @@ DIST dict-en-20190101.oxt 6058651 BLAKE2B 617ded8d7df6e62767083be7b0651e1bd1e039
 DIST dict-en-20210601.oxt 6104083 BLAKE2B 192252e85918d3d47167ff9243f70178bc548de3e93152c4139e64ffb013e147fda1fa9c7741ce7bf74b149ec0ab6e001760990cd1ee33dad06fd5e3813ef591 SHA512 c9d791a12aa97d6c2a0928f9f500b22492208b415f877d6b5bd192b5da4c243c32b8d0b7af6b3f5cbfefe6b1c695626db204fc29a922dc4b083538ed144cb472
 EBUILD myspell-en-20170101.ebuild 894 BLAKE2B 72ac7b395b11a921c7b8587fb1f45065180b6e07a39584238724fdf803f3c14dabcb3842ad4749027be1808beb995ea417769cf0515d1755d9bcf8fabb78428e SHA512 4902c41f8e0fdeb6650faa4c6f1de459fc69fb0711ad8ce8b1253a9c644e455a0500baefce9838f98bde1eb100f53f867bcd4752ecf132ea4ceb23a55627fab5
 EBUILD myspell-en-20190101.ebuild 1462 BLAKE2B 3ff866f6234f137d86096dedbb361ce1576ff18625098b8e55db6766e5135bb26f87d4d04be352ecf9b49350011a1cf53eac3c016fae252b570a4e7fdc67ef47 SHA512 b4cb95cb61f09c5570bbc6fbc45d17dbb3273febba80cc5ee6e5bafebfd647a9cbbd7091f1b0eaefb82fe7f2fb31575267506aa7fb5ff5f3bb2b5f0c70b2303f
-EBUILD myspell-en-20210601-r1.ebuild 1382 BLAKE2B 8043bc9892152b7ec2efaf60b17a04f5a94a52b1d443bbafd2d444052c893fd041bbdd3ad279d8b61563e17e7dd88d6b023d34a2451a722c925cddad63779a84 SHA512 5a0ab74f186ee98dac2ecdc5862e04eb217172a291aa1a90c0640bf287f81c5c3cb3a66d5cd895493ed0f7ebbd463f6709f091dffd53c510a78013853e528834
+EBUILD myspell-en-20210601-r2.ebuild 1419 BLAKE2B c32973c47f47e69534ba2c53b6c2c4abed22f263fe19dbb96f53b553c791075eabc735050adb7856b972c23273ab049d26b21337b96b73286d5360e431bafaec SHA512 818d2322f214cc6de7e7a9fbd581394fb2381caa625269f10d9fb3badb1c869ecc3aff467941820a33fb499579d7beecf4a50b5d7fb0e6a4c5a6da204c0daa67
 MISC metadata.xml 421 BLAKE2B fb466302071e1dd8791daf82ab44cd37f896d1c47fb15c300cd08495d7777c6a980be2d765ab3af7b73e1a9813c4fae217486a0c6c72ff584d670ca201b53343 SHA512 6ab94a0265c95d3e55beb4f713add1f5e0da20d65250de3dcaf8b78e43d6b20b8d6b1c79d7c1204d774790423070b7f7056c86c36b08b7ff78b3fe52edb896d9
diff --git a/app-dicts/myspell-en/myspell-en-20210601-r1.ebuild b/app-dicts/myspell-en/myspell-en-20210601-r1.ebuild
deleted file mode 100644
index fca6fa3ff16d..000000000000
--- a/app-dicts/myspell-en/myspell-en-20210601-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/dict-en-20210601.oxt"
-
-LICENSE="BSD MIT LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
-IUSE+="${PLOCALES[@]/#/l10n_}"
-REQUIRED_USE="|| ( ${IUSE[@]} )"
-
-src_prepare() {
-	if use l10n_en-GB || use l10n_en; then
-		MYSPELL_HYPH+=( "hyph_en_GB.dic" )
-	fi
-	if use l10n_en-US || use l10n_en; then
-		MYSPELL_THES+=(
-			"th_en_US_v2.dat"
-			"th_en_US_v2.idx"
-		)
-	fi
-
-	MYSPELL_DICT=( )
-	for lang in "${PLOCALES[@]}"; do
-		if [[ "${lang}" == "en" ]]; then
-			continue
-		fi
-		local mylinguas="${lang//-/_}"
-		if use "l10n_${lang}" || use l10n_en; then
-			MYSPELL_DICT+=( "${mylinguas}.aff" "${mylinguas}.dic" )
-		else
-			rm "README_${mylinguas}.txt" || die
-			if [[ ${lang} == "en-US" ]]; then
-				rm "README_hyph_en_US.txt" || die
-			fi
-			if [[ ${lang} == "en-GB" ]]; then
-				rm "README_hyph_en_GB.txt" || die
-				rm "README_en_GB_thes.txt" || die
-			fi
-		fi
-	done
-
-	default
-}
diff --git a/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
new file mode 100644
index 000000000000..f4ccd7d28f0b
--- /dev/null
+++ b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit myspell-r2
+
+DESCRIPTION="English dictionaries for myspell/hunspell"
+HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/dict-en-20210601.oxt"
+
+LICENSE="BSD MIT LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
+IUSE+="${PLOCALES[@]/#/l10n_}"
+REQUIRED_USE="|| ( ${IUSE[@]} )"
+
+src_prepare() {
+	if use l10n_en-GB || use l10n_en; then
+		MYSPELL_HYPH+=( "hyph_en_GB.dic" )
+	fi
+	if use l10n_en-US || use l10n_en; then
+		MYSPELL_THES+=(
+			"th_en_US_v2.dat"
+			"th_en_US_v2.idx"
+		)
+		MYSPELL_HYPH+=( "hyph_en_US.dic" )
+	fi
+
+	MYSPELL_DICT=( )
+	for lang in "${PLOCALES[@]}"; do
+		if [[ "${lang}" == "en" ]]; then
+			continue
+		fi
+		local mylinguas="${lang//-/_}"
+		if use "l10n_${lang}" || use l10n_en; then
+			MYSPELL_DICT+=( "${mylinguas}.aff" "${mylinguas}.dic" )
+		else
+			rm "README_${mylinguas}.txt" || die
+			if [[ ${lang} == "en-US" ]]; then
+				rm "README_hyph_en_US.txt" || die
+			fi
+			if [[ ${lang} == "en-GB" ]]; then
+				rm "README_hyph_en_GB.txt" || die
+				rm "README_en_GB_thes.txt" || die
+			fi
+		fi
+	done
+
+	default
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 5c51ef3daa25..5fb3c215d7ac 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/csound-manual/Manifest b/app-doc/csound-manual/Manifest
index 01a77ea213ec..3ec4f0388a6c 100644
--- a/app-doc/csound-manual/Manifest
+++ b/app-doc/csound-manual/Manifest
@@ -7,5 +7,5 @@ DIST Csound6.16.0_manual-fr_pdf.zip 10042266 BLAKE2B 9bab455552487a476aebb26de07
 DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb SHA512 e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
 DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754 SHA512 18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
 EBUILD csound-manual-6.15-r1.ebuild 1620 BLAKE2B 18bb3ea7398c88a0efe2dbffc56a9c805efb742324e6a3e6c72e5d2248f63a8aa6c056774f7e989be691853ae2a825b2ead4b391e1e86abc56ddbeaae8af27f9 SHA512 7a80bc861002c97fd64611f5faaac62a97f6469014326c6b45d0cfe0ee4333b986e132f8eb12f67101c37b1eb175886aad63bbc46254552bebe697519a0684c0
-EBUILD csound-manual-6.16.ebuild 1622 BLAKE2B 45ad300bd8a0a21fe7d8a1e6081a5e06576a599f8bd0f49a6574299b674554dafa938f495031d7890b6c476f39d890da94c296eb24fb27486f5ad3c8d6da291d SHA512 6941c23359c7eb383af6625a0c35d794ecc733ac964b3e49b2a469f6849365eb42d7469cc9154b46a69288117779dc9c30d98eabfc7a9a5e37233558f7a2dae3
+EBUILD csound-manual-6.16.ebuild 1620 BLAKE2B 18bb3ea7398c88a0efe2dbffc56a9c805efb742324e6a3e6c72e5d2248f63a8aa6c056774f7e989be691853ae2a825b2ead4b391e1e86abc56ddbeaae8af27f9 SHA512 7a80bc861002c97fd64611f5faaac62a97f6469014326c6b45d0cfe0ee4333b986e132f8eb12f67101c37b1eb175886aad63bbc46254552bebe697519a0684c0
 MISC metadata.xml 457 BLAKE2B e435f21c93a42188d38ceedb4ed2dda795021393c4a03c5d5ef020f31b853a45117e5ae2e9080013cff833b3648f8992fbf44b162d84856286a5d057a91fd334 SHA512 d6cb43f4d0d9485ca457ea2463adfe1ab6f480e3065b986e0c6959c9d29d4fb57122116532118a9e98b4189f1fbd3fef5df5b035e1f7050b3992d98613027908
diff --git a/app-doc/csound-manual/csound-manual-6.16.ebuild b/app-doc/csound-manual/csound-manual-6.16.ebuild
index 987fffe48dd0..55b4000dcf73 100644
--- a/app-doc/csound-manual/csound-manual-6.16.ebuild
+++ b/app-doc/csound-manual/csound-manual-6.16.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="html"
 
 LANGS=" fr"
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 99ab7fb7ed13..9289478b63e7 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,6 +1,6 @@
-DIST eclass-manpages-20200913.tar.xz 411832 BLAKE2B b33b126ae2fb18755f193ccfbbe354c2015a5a0e16b7899ea2e8d547333bace6f0f70f6cf3f2793efdf53625f8ee6e5868fb60d56b57b82c61c26be6a1d8790a SHA512 8acd35b08ce6835de2c1bb79c4ae0746e9d9057f9ef897e5bfc885be1e55e7885c1e4172d0673bf10e0ac24dc705c7926a78bb2237319f059d65622dce4c08ec
 DIST eclass-manpages-20210104.tar.xz 413740 BLAKE2B af65e53d54af6036a1feb4eda09a2b06e4f94221b98dd333008a74059781381ecd0d66fb71ca6583278684c8faa9efb330ed939c9f49d8052de15194fa321dae SHA512 cf19f521484474c7c7660f2f056d24d5e6c0e29ccf177cd7e1aaa4e1b55a14c8eabd8ec14cc3c6957706370f5f046ffe9aad59e3b9309da51e17c200d724d539
-EBUILD eclass-manpages-20200913.ebuild 612 BLAKE2B c3894375b97d93b38f8184e097973fded258d7d48f49681b3faa2a4f890597ef0ac1ce28aa252fe2ce3e68eb340bb8bc48066a5c672b7a8e2133f54b44b65802 SHA512 f132453513b776395ecad075cb81c74800b393ca0f18e48fb5dce9c06b34d6535c55b37a882e3b2fd0d14204e0aec487f711b14d6d99a1cc4f20ae4a00bdf508
+DIST eclass-manpages-20210712.tar.xz 410588 BLAKE2B 776da6b26db95791401d562d3d550e1ab71dc19f54124fa37e78ab2595835fb05e7382b98007e58131698710b978dd87cbc10df1ea98c6ef01ec866418d6f9a6 SHA512 fb2bdc790d96f0662d84eddd01f291b4a3cac638c1e3df8975755e81d2d64dda14b0f60a77387da8544672080711d5047dda777d27a8cf2ded2634c47ecfee4b
 EBUILD eclass-manpages-20210104.ebuild 612 BLAKE2B c3894375b97d93b38f8184e097973fded258d7d48f49681b3faa2a4f890597ef0ac1ce28aa252fe2ce3e68eb340bb8bc48066a5c672b7a8e2133f54b44b65802 SHA512 f132453513b776395ecad075cb81c74800b393ca0f18e48fb5dce9c06b34d6535c55b37a882e3b2fd0d14204e0aec487f711b14d6d99a1cc4f20ae4a00bdf508
-EBUILD eclass-manpages-99999999.ebuild 734 BLAKE2B 3a2ad31d9607eb9eca6c26a9bdfc7ef076f03bbd72cd9df1c7affbb834a66fd682986a9596af9c1d4d1f3ba2af090d18915403b9028dba6a4c927a8e8e0ebdd3 SHA512 10d89fd7527b870b9bfe35b70be14de0c1f1a0ba5deb7a0e86e8965bf963d04a41fdfb2907bcb5aef0974ef6508e2717c9de383e28f9679dcb1dc87c60530199
+EBUILD eclass-manpages-20210712.ebuild 610 BLAKE2B cdccb1eb84fe2b2374aeecb1d0c21015d1d1696b2f7fcc1dd98934d000d510f098d820988b990ad5d452ebf3fc708426204b3efd886faf784d107834a36ef9c2 SHA512 09e6566515f0633cc015d73c71c15b59662a593873dab950aec4686494c9700a2b524b880fc444f9b9730b5313b7cd8f0f41b46d222c2641253c2836d6f694db
+EBUILD eclass-manpages-99999999.ebuild 732 BLAKE2B 3c2ed875bd0f30394b76ce99b52d5ba7bc25dc8291b8ceabbfd6d3e53e65b57ec3b5999347795c7d072f5fd8cfc856b096b0c9a669073392766199fb0493bd24 SHA512 8564643312dc92432b8aa2802c348d27fef22d6ae97065c6e461f61f33f767d23f04aa4d1bcc9b83e80ff7070895b74ba2c72282a1e0a0c922ee4c71965896a9
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-doc/eclass-manpages/eclass-manpages-20200913.ebuild b/app-doc/eclass-manpages/eclass-manpages-20200913.ebuild
deleted file mode 100644
index 68c4e97e55e4..000000000000
--- a/app-doc/eclass-manpages/eclass-manpages-20200913.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-
-BDEPEND="app-arch/xz-utils
-	sys-apps/gawk"
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
-}
diff --git a/app-doc/eclass-manpages/eclass-manpages-20210712.ebuild b/app-doc/eclass-manpages/eclass-manpages-20210712.ebuild
new file mode 100644
index 000000000000..d28b3ad5325c
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20210712.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stable. No need to change to ~arch.
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+
+BDEPEND="app-arch/xz-utils
+	sys-apps/gawk"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+}
diff --git a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
index 7b5da48dfdf2..20bbf855699a 100644
--- a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 inherit git-r3
 
diff --git a/app-doc/selflinux/Manifest b/app-doc/selflinux/Manifest
index 92254d564b8e..e439d961b9b6 100644
--- a/app-doc/selflinux/Manifest
+++ b/app-doc/selflinux/Manifest
@@ -1,4 +1,4 @@
 DIST SelfLinux-0.13.0-html.tar.gz 7379682 BLAKE2B 5baf00233fd69c3d115adef28c0644d0d4e563014c82649d7e4c906189a36543bd30528ea901f8b2b7c849721b220eeccc3787f67b016ca7161515e23fa8871c SHA512 bb7f16006863f958dd24c8f82db5e4538f00fc66f1b2efe7c52ed28d241fdcfdd366e973c91b730118ff485c2343f5a0fac293f080f0d6e86d24fca4beaaab72
-EBUILD selflinux-0.13.0-r1.ebuild 629 BLAKE2B cbc7e1c8e1d514a138a34924df8fb9e1ccab9bdaa382a759496c24ef7a33e15a04ea8f82e4059f8e9b18e2e5097c8112a5273270193ebe2ee8738075fcd65b4f SHA512 e55a7541412eb707b35bf192ee19775c01307b3798b35805131dc230ae02653bcab6a6a603a77a1928eaa10e0dfd570072461cf8d4b2dd76588f917ab3b7b918
+EBUILD selflinux-0.13.0-r1.ebuild 627 BLAKE2B 51a0250d9a0607640fc86a31621db905ef733cc5a59e73bf443149b05f0194d696346c01c2476a913ac2640e10ea1f954f073ab358030116beeef2528362bc7a SHA512 ebfe598bae4de7fa5d4d34b5ebd681b7c0fcfc87944e5c7e6c2a1a99d43e3fc385d30c99ba05b84d1f47cc020be327308e599a1651acbf36bd2a187b8012c226
 EBUILD selflinux-0.13.0.ebuild 417 BLAKE2B bb6cde83ebdfc3792083e5ecea696e429cddacdf46e52ebbc96d9f10373d6fce175c4eceb1c2104620c2baf7a70d13efc74f8521a4997c2f91dfcc7c1494e9c5 SHA512 bb9091b568dafce84f17abcb47ae4866f834b63d6b42c7ac717a68b6387c95129ffba1c9414f715158b2c161bf2ef7a9e70ee6c83747b5e512514aca0e3773d9
 MISC metadata.xml 270 BLAKE2B 9948dbd05e664315ac11842827c04e5b53bd4a1b773f119a1a9ce99aaf0d9be1795b064b10ef28bf6e5d3ecc2615fb8768e06aae866025e673fe326ea72ae624 SHA512 bb6ff3e49ce5fff927116af4f4676901362fba263d12bfeb04533a209ed743720feac7942fbe4f3ab367c7c07d6142a238cae7e16dbc8722ffbf126cf5fd169f
diff --git a/app-doc/selflinux/selflinux-0.13.0-r1.ebuild b/app-doc/selflinux/selflinux-0.13.0-r1.ebuild
index fae5d5e449a9..5c90c39fc0ab 100644
--- a/app-doc/selflinux/selflinux-0.13.0-r1.ebuild
+++ b/app-doc/selflinux/selflinux-0.13.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 HTML_DOCS=( "." )
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 6cc10ba2663a..76fcce90e15d 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 121aff842d75..b961ee444dc9 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -17,6 +17,7 @@ EBUILD emacs-25.3-r9.ebuild 11142 BLAKE2B 2eb2fe9e84133d53d874e66b05fe8f98c5460f
 EBUILD emacs-26.3-r4.ebuild 11785 BLAKE2B 807bbd1eda823268087003da546d68b5837c4984736e85db519e8ab02924b366a34e8df9d08dcfc0da8b7996c2d4a82a0abe305ceab26eb3783c895e6894c8c7 SHA512 2fb3a6622224509586aaea43dfde63d07e1d568baaa4d808e4285b5466f369fd34a21c56519b0a15e131cfd48f6cd046010eb62cdc6c3ac8e238f3ba4c1a22c5
 EBUILD emacs-27.1-r4.ebuild 14334 BLAKE2B c524e15aa87eebb1eacb52368fc11b17c429a10c83509e883cea3fada349d7a63e7947b1f3c050641ed65fabfbad2ebe965ec19f96b062ddc62162d344bc044a SHA512 7238304e452cf3bae3930c25726fb92a8b76c35155c35793a69aae08b23b7066b34cbb1ae18bd385388ec07170da14008cd89397bd9483a9033f4feaf1632baa
 EBUILD emacs-27.2-r2.ebuild 14431 BLAKE2B 037523522bc7036fdb4b612a6684ce37d213b16b8472b04ffe317d3f9d721d67a7bb7b7ed527f4d970b9030b0dae26b6f1c622238556522f71a9933dc7bd7399 SHA512 25c0edc1c7eee90126ca5b25e55542409ca727914613a1ee3c4aee4c6f28cd401a15f9606e6418afc507844df75f577701825255c8e216e5b4f3eb1514f160bc
-EBUILD emacs-27.2.9999.ebuild 14298 BLAKE2B 5649b3f948225639e73f6b4570f6facf9e81f57476354604c78a178be8f146d0e9325d98f3eb52689d2e02ba522ffe690e33e9c610b6e99584704a2f140b805e SHA512 e22fe0e2da09c9823bcedb148060a56d5b481826fe98f09a6112b3b27d65778e0db12a748e7ec42805345729a0ed0bc0ea46a7878e12588cf4cf999d69f6746b
-EBUILD emacs-28.0.9999.ebuild 14450 BLAKE2B dd079bf7a0a17ef35b16787419aef1531b4b7145fb74f4b9626aabac389ea18beb78f9a8668eb9f6e3d705c0d6644f1ffdd57428f98a034263a0a80e00f5b434 SHA512 9ccc3676c8b09e41a1734cbb8ad527072195667856f545807842e3aa25cb600d834bb6e8a1878ece4abe72e082d18115b6d2cc26a513c24cd08ddf89933fa6ba
+EBUILD emacs-27.2-r3.ebuild 14448 BLAKE2B 2e26400062699395c3aa1f6e78119d059a25ad5c5451e253f087a7bfaf42e5ef0344fa1f126e00d51631d79111b0f85efc2b1a493917f2120790bae1dec668e4 SHA512 f67cbb4f8cf247fb81c29dae8fe78f79aebfc9e6d50278b7f68a549f30430b7a671004ea04dd1b77b10a05379a9c251c69eb8856b8ac7d8dd285bf9d2fcbbc11
+EBUILD emacs-27.2.9999.ebuild 14308 BLAKE2B a56b974705669cfb5c2fe6a4d02d6640d2b8158891296c4948a7877a3681f6b634312e9dda78fb414122f66cfa4030079f296e7f3352330c66f405e6400558ae SHA512 dc909f5e206999c6572c65d81bd10abb7c8c9848403d852d433c0caf2830790d24df5525fe7c38e50ef8a518547acaf3a32c9d31439ee34c76702d029986588c
+EBUILD emacs-28.0.9999.ebuild 14473 BLAKE2B 8d7f734adcaf62e867fd3e70b74b9f0c360471ec4b75b53df8cda2c2609585efd52f3240c93019f8a28861c99a250ee82312aa5fda870b7f9395b8396fcbe13a SHA512 c368160c1c948ffea1267fbda0601ce6365022ad119cc14cbefbacd2293e463ae3f8d168a66656f68fe06c627c9481c6dbdc7d51cc0fd708be326a19dd2f8178
 MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
diff --git a/app-editors/emacs/emacs-27.2-r3.ebuild b/app-editors/emacs/emacs-27.2-r3.ebuild
new file mode 100644
index 000000000000..0245ab3cc2db
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2-r3.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	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"
+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 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[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? (
+			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="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	!app-editors/emacs-vcs:27
+	app-eselect/eselect-emacs"
+
+IDEPEND="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
+
+	default
+
+	# 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://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				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
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			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
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	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 || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	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 || die
+		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 -Q --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
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild
index 7089e4a9a735..6e936382b210 100644
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
@@ -125,8 +125,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 DEPEND="${RDEPEND}
 	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-	sys-apps/texinfo
+BDEPEND="sys-apps/texinfo
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
@@ -134,6 +133,8 @@ RDEPEND="${RDEPEND}
 	!app-editors/emacs-vcs:27
 	app-eselect/eselect-emacs"
 
+IDEPEND="app-eselect/eselect-emacs"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 682e0651a360..f5a41b7f06e7 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
@@ -118,14 +118,15 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 DEPEND="${RDEPEND}
 	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-	sys-apps/texinfo
+BDEPEND="sys-apps/texinfo
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
 	app-eselect/eselect-emacs"
 
+IDEPEND="app-eselect/eselect-emacs"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
@@ -148,7 +149,7 @@ src_prepare() {
 
 		# gccjit doesn't play well with ccache #801580
 		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} \
+		has ccache ${FEATURES} && tc-is-gcc \
 			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
 				| sed -n '/^libraries:/{s:^[^/]*::;p}')
 	fi
diff --git a/app-editors/ng/Manifest b/app-editors/ng/Manifest
index e29213bad9a4..a2d6012ea10d 100644
--- a/app-editors/ng/Manifest
+++ b/app-editors/ng/Manifest
@@ -1,5 +1,5 @@
 AUX ng-1.5beta1-configure.patch 658 BLAKE2B c76c062312f36e59c4f31f6d24ab992b7722ea3f8d323954b4a3981acc708e751b869e5ce3aafd47869e3893effc3d5705cde7648bb948d7acb7d79d906953e0 SHA512 afea99d16b06308feed87512ccfe084b3f3c222afdb9a3f430ec02882d99cf81d7506dd329601a58ab62d8def05e48f3ff502d0d76ecada8cca2c42931bdca1b
 AUX ng-1.5beta1-ncurses.patch 556 BLAKE2B 87321f8f920609a64cf356a45517b3f3328a204dd65c3fb02faf891c748d4b0dd9fb61814b13d6e99f75255b6b3f544e12f757ac393fdd31ff74a889e0fa619e SHA512 0c53ac22f5452af1ce59dfd6e2bd35868e824a922bbd4742ed20d9e2e24752c2fab52504b1365736dde04ba212c458ace9335a8399509d1043b686d997bfbfbf
 DIST ng-1.5beta1.tar.gz 662557 BLAKE2B 02f1f5277aaba279226d732351eb604205e8bfc030678551a5f2439bde61651bf5aa4e02e06f3283fdab710cc5a1ed9a3eae1e42fd4fa8a8145699b425c4e61e SHA512 eaf3ee067cd98aebc757def9880c5a324975e9f5d0f1db030b11853e86631bca892bf344358ca21b778f5e10ae0d2ed97553221a368326f7a4d9d41f6867abcd
-EBUILD ng-1.5_beta1-r2.ebuild 1210 BLAKE2B d35be1984b0551ded8200846ae9202ff3b2420cdd48e89c1376702737fffe96eb4be8038efe8986955ad2e6b5992b6ab8b9ac10e035e5fe92f47114ee6ad83e0 SHA512 94ef226b7adcd8133f7d245c0b457ae0d43b024d504db7da5a7ab1941de07df03f4387546c46fbfdf6f6ac32578f545e44a11d523830db3b95dfff21718fd26e
+EBUILD ng-1.5_beta1-r3.ebuild 1148 BLAKE2B 3aff452538e9ecf6cf08cad63c9012a19084e993703bc5bcdf47097ba5b1d5e80e4a167a6dc015fbe1e53c5becf9128ecec48acb6b8e843ed06184573534f19b SHA512 f8502ff42b24dd3901a16b3771ac041f588f26eab8a3a9476df2378580453abe147a441e950030481030ae9e25c61aeeaf1634df808f5a11040c329103c15ed6
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-editors/ng/ng-1.5_beta1-r2.ebuild b/app-editors/ng/ng-1.5_beta1-r2.ebuild
deleted file mode 100644
index f7b2c66ceb44..000000000000
--- a/app-editors/ng/ng-1.5_beta1-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-MY_P="${P/_beta/beta}"
-
-DESCRIPTION="Emacs like micro editor Ng -- based on mg2a"
-HOMEPAGE="http://tt.sakura.ne.jp/~amura/ng/"
-SRC_URI="http://tt.sakura.ne.jp/~amura/archives/ng/${MY_P}.tar.gz"
-
-LICENSE="Emacs"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="canna"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	!dev-java/nailgun
-	canna? ( app-i18n/canna )"
-
-DEPEND="
-	${RDEPEND}
-	sys-apps/sed"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${MY_P}-ncurses.patch"
-	"${FILESDIR}/${MY_P}-configure.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e "/NO_BACKUP/s/undef/define/" config.h || die "sed failed"
-	pushd sys/unix > /dev/null || die
-	eautoconf
-	popd > /dev/null || die
-	cp sys/unix/configure . || die
-}
-
-src_configure() {
-	econf $(use_enable canna)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ng
-	dodoc docs/* MANIFEST dot.ng
-
-	insinto /usr/share/ng
-	doins bin/*
-
-	insinto /etc/skel
-	newins dot.ng .ng
-}
-
-pkg_postinst() {
-	elog
-	elog "If you want to use user Config"
-	elog "cp /etc/skel/.ng ~/.ng"
-	elog "and edit your .ng configuration file."
-	elog
-}
diff --git a/app-editors/ng/ng-1.5_beta1-r3.ebuild b/app-editors/ng/ng-1.5_beta1-r3.ebuild
new file mode 100644
index 000000000000..428dbda5a7d9
--- /dev/null
+++ b/app-editors/ng/ng-1.5_beta1-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs
+
+MY_P="${P/_beta/beta}"
+
+DESCRIPTION="Emacs like micro editor Ng -- based on mg2a"
+HOMEPAGE="http://tt.sakura.ne.jp/~amura/ng/"
+SRC_URI="http://tt.sakura.ne.jp/~amura/archives/ng/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Emacs"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	!dev-java/nailgun"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${MY_P}-ncurses.patch"
+	"${FILESDIR}/${MY_P}-configure.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "/NO_BACKUP/s/undef/define/" config.h || die "sed failed"
+	pushd sys/unix > /dev/null || die
+	eautoconf
+	popd > /dev/null || die
+	cp sys/unix/configure . || die
+}
+
+src_configure() {
+	econf --disable-canna
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ng
+	dodoc docs/* MANIFEST dot.ng
+
+	insinto /usr/share/ng
+	doins bin/*
+
+	insinto /etc/skel
+	newins dot.ng .ng
+}
+
+pkg_postinst() {
+	elog
+	elog "If you want to use user Config"
+	elog "cp /etc/skel/.ng ~/.ng"
+	elog "and edit your .ng configuration file."
+	elog
+}
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index b4af4ef45756..6f253a2ec16f 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,6 +1,6 @@
 DIST ReText-7.1.0.tar.gz 484989 BLAKE2B 74f07218cba1d76d011e5347c65ec03ef84da29119c177f35cca206cb269ae4755fdb85448562a378d2ab610930d23b4eccb62a39807409c6e80a68102be2034 SHA512 92333f31f7a57440d642246ed30156384285bb44640a0d6e7654e82749681893eaef3cb16e41fa2d7b618aa59f1ea8cb07d431736b00f35cb9130d7294e3d105
 DIST ReText-7.2.1.tar.gz 522364 BLAKE2B 6334fd6dc1c625378426e408a0d4ad6bb9c02dcba18fcfa566d61ce006a44c34327686a8eb756f2195620e644e096b9393a7cfa73229aa0dab7d29ddf715edaa SHA512 1a375acb40792e3cae9f955a75ebac7c30c9e5cc719477989b28d8d7f06e18ad14d98f1a600a5b6d050b3276ef22bd46b5f1f07af90d561cca500674ff461604
 EBUILD retext-7.1.0.ebuild 1817 BLAKE2B 2d9d2f42c16af2849031e8f43f73d9848268dc9b82f7a863d9b0b1679d9cc52f4d45ec836b637daef785abf0a26f90e621fe1fb85fdc17a0315f81acc74cf477 SHA512 a1160568d324e1a5d240f27d01a978e412ec8f49832dc1661be049f3608a0407ddb152ec1d1a0ef79b274010ba7e1168a0afd747203bd561f37345acdc8431c6
-EBUILD retext-7.2.1.ebuild 1973 BLAKE2B a83f2e5da937ad51bb882b004313a649081e2bf7d19096521e6e62a9fab7dca755c511fc121a9293d0cf0d705c01ea0c31fc739eb500e7998ed677c9f08e29e7 SHA512 cad0fa71050cbd4446bfadbf1cae5575e154f1927db8e4147fb8065dfc57f4761da4d1325dc53cd3097043e635043d59c254ae567d86bcb86a27ec27263a0d7f
+EBUILD retext-7.2.1.ebuild 1971 BLAKE2B cb9b7cab80763e63ee71842f311d0fe3ead40e09184e76daacc85fdc0a7129f2f230d6e81680de0c8cdfa3a4af078c497b736c3235ae126fa9cecc5f9fec2d62 SHA512 97224ae9ec06fde4a75817ad918b795045d14ba147a5704d235f4867c848f4f438ce5c977581b547adead13e7178d26828d8b0d4d1633d0180e6c8b1360011e7
 EBUILD retext-9999.ebuild 1973 BLAKE2B a83f2e5da937ad51bb882b004313a649081e2bf7d19096521e6e62a9fab7dca755c511fc121a9293d0cf0d705c01ea0c31fc739eb500e7998ed677c9f08e29e7 SHA512 cad0fa71050cbd4446bfadbf1cae5575e154f1927db8e4147fb8065dfc57f4761da4d1325dc53cd3097043e635043d59c254ae567d86bcb86a27ec27263a0d7f
 MISC metadata.xml 526 BLAKE2B 62c3e6a8421b9698328bb9eae7040f56a4612b9b9ed94e0435673ee68e2d5b99e96b54bc30eb777bd91f6e47fc37b985552aa2575d7d5cdbbc0885c24b191ab3 SHA512 e46d73af70b8fdb762957cc0d84163f0c24139deab2f24c0bbeb4281e50ff7f5456a95f519ea95f084b46c601eff1419dbec324ce6d9305db71f8b25f759c287
diff --git a/app-editors/retext/retext-7.2.1.ebuild b/app-editors/retext/retext-7.2.1.ebuild
index 13399224b736..ecca89965b21 100644
--- a/app-editors/retext/retext-7.2.1.ebuild
+++ b/app-editors/retext/retext-7.2.1.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == *9999 ]]
 		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
 	else
 		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-		KEYWORDS="~amd64 ~x86"
+		KEYWORDS="amd64 x86"
 		S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
index 065f45b588f3..f52547c3e8ea 100644
--- a/app-editors/sublime-text/Manifest
+++ b/app-editors/sublime-text/Manifest
@@ -3,6 +3,8 @@ AUX sublime-text-4_p4107-set-explicit-startupwmclass-in-launcher.patch 800 BLAKE
 DIST sublime_text_3_build_3211_x32.tar.bz2 13806489 BLAKE2B 1e07df2fc9fb9fb60a6fbfe27a3d657ff80ef46ae91967fa384cfc84bfdc2b5952aea8dbfd9ff015f669b148c1a302cbe01521a72b584abccd51efdab51ac0d8 SHA512 4d19947459046407316382d187ea6fa4cff9b7d3e7ae3c46667d691b6ca425a1f1dfc8599a26cf61b970290a58924a3b605e111ff2802ed124683872c1802803
 DIST sublime_text_3_build_3211_x64.tar.bz2 13677324 BLAKE2B e2ac54c1e8ab90c0fcefb4baf225b02d13a3405e846f08163773ed52c6278f8e89a7b13c15e6c2d6241139d58be9c2c5a1201abb04a3cd68efdffc723075c5af SHA512 a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1
 DIST sublime_text_build_4107_x64.tar.xz 17096632 BLAKE2B 37c1839ef1edecb1f3017e4d99d2b8b0bf5c0aa1490495fe19a48cf38bb436e94913572a4dd5ad5f84e6b5445b6a9a2df35fec607beb0b520471b2dde7ef63fd SHA512 552051b34c612aa6ff53ef6275488467061221715de054dc1e657519c82899e24df1a9f8000086b68c5c1c6e0c98341c641f19a2d97c880efb25aa93ad82f8aa
+DIST sublime_text_build_4113_x64.tar.xz 17105200 BLAKE2B 6a23e9eb7ec5b7b5dfef2ef496e0b7fcf053be3349c8318e85373bc9c3d4d69da3e4e94971ae83832aa254c175a58062a33ffb14d2103c1cdb6888c1223f28ed SHA512 f0e5e8e28754c21bf5c9fc3e50502d22d72fec4819c68d8444cb341aa7ee4d6bc43edfda594fba3c446c2b252bd7a65340dd7a407d81f875971c219bb2236479
 EBUILD sublime-text-3_p3211-r1.ebuild 1645 BLAKE2B 5bdf8d1fdae1df2bc59937e2bd2382385aad77fb60a99e3ea4830239adc027f2c09663c9bec3b795d5f633d3625b2ff5a17b328b46986968e99e45ceeb71e515 SHA512 339364d412f075d97ae576e75dfc50a021fdbf2953a0a6de78f45b97d1db21f335a43a2373631b2a42becd8877b4003fc06b4669f3b092f86df0ff09b3c11f2d
 EBUILD sublime-text-4_p4107.ebuild 2055 BLAKE2B 71fc79523f06b4e66ad3469bd9b62aadc13f2ad66eb2028d80fd69ac358df2a303d71375d0cd406ef3460a299b9f467cbf4917a54a3c58c1a859b656d31408d0 SHA512 b871dbe20734510f84b2b0c421c27552f33786ef1e7f8715ba9bc34ec0eb20a02456f2d668b458cf591ff86f24c91f256c5aff0165a2be94549c749fcdf0d90c
+EBUILD sublime-text-4_p4113.ebuild 1944 BLAKE2B 6ea2f6b0705c7a0f3ae083deb217c7421b75f809f34051e04807f235f2c41cb5f7acbc0e1b7f5859cdacd5fefc3e78b447861456b1a57f796518f9e8ca250634 SHA512 ac4e7c50496ee6e67366f83e6fadb78c8284cb1db640258f9249db0e108fe50eda02081c63e08488548d75ca12882646594f5515c35e30fbe9888e74c6b18426
 MISC metadata.xml 215 BLAKE2B e5b704d936932650ad333b6ee575d0f6fb54f7b01e62f59912a5d88c8a76bfff888e9de639a9a4d6ec5882a3e9a57874eb89935bb3d1a3c3a79a4b1f58b944fb SHA512 d803656f1527d3fc8a2b3474c0ff52d86170950b70057a65ab412ce1adc926545393fe1cfb71731d573f057de2145edd90d642c644ef26222a2b413cd8922d47
diff --git a/app-editors/sublime-text/sublime-text-4_p4113.ebuild b/app-editors/sublime-text/sublime-text-4_p4113.ebuild
new file mode 100644
index 000000000000..6b349eca211e
--- /dev/null
+++ b/app-editors/sublime-text/sublime-text-4_p4113.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper xdg
+
+# get the major version from PV
+MY_PV=$(ver_cut 3)
+MY_PN=${PN/-/_}
+
+DESCRIPTION="Sophisticated text editor for code, markup and prose"
+HOMEPAGE="https://www.sublimetext.com"
+SRC_URI="
+	amd64? ( https://download.sublimetext.com/sublime_text_build_${MY_PV}_x64.tar.xz )"
+S="${WORKDIR}/${MY_PN}"
+
+LICENSE="Sublime"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	dbus? ( sys-apps/dbus )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch
+	"${FILESDIR}"/${PN}-4_p4107-set-explicit-startupwmclass-in-launcher.patch
+)
+
+QA_PREBUILT="*"
+
+# Sublime bundles the kitchen sink, which includes python and other assorted
+# modules. Do not try to unbundle these because you are guaranteed to fail.
+
+src_install() {
+	insinto /opt/${MY_PN}
+	doins -r Packages Lib Icon # /Icon is used at runtime by the application
+	doins changelog.txt libcrypto.so.1.1 libssl.so.1.1 sublime_text.desktop
+
+	# sublime_merge looks for /opt/sublime_text/sublime_text
+	exeinto /opt/${MY_PN}
+	doexe crash_reporter plugin_host-3.3 plugin_host-3.8 sublime_text
+
+	# sublime-text sets its WM_CLASS based on its argv[0]. A wrapper script is
+	# used instead of a symlink to preserve a consistent WM_CLASS regardless of
+	# how the application is launched. This causes the WM_CLASS to be
+	# "sublime_text" which matches the .desktop entry.
+	make_wrapper subl "/opt/${MY_PN}/sublime_text --fwdargv0 \"\$0\""
+	domenu sublime_text.desktop
+
+	local size
+	for size in 16 32 48 128 256; do
+		doicon --size ${size} Icon/${size}x${size}/${PN}.png
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog 'Sublime Text 4'"'"'s window class changes from WM_CLASS="subl" to'
+	elog 'WM_CLASS="sublime_text" matching other distributions.'
+}
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 108f6452a36d..e691aed0406c 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -3,5 +3,9 @@ AUX vscode.desktop 458 BLAKE2B 98bb17607ad9d8f82e0cbbd032718481cfc3d5118de6f15d8
 DIST vscode-1.57.1-amd64.tar.gz 104850563 BLAKE2B b3690382adfa3f8414b38bb784a6a595409fd766d21da05960a4d39344be0dc80bcb99b8b7b7d0d7f4bf5244bb35227e301696a4c16b1e0f9665a4f1f244f15a SHA512 928664a24a65c85db53d74c07b29d5e8bb1c204481fdc9204b3e254dc7f82c1a3090ffac933d331c29c1c9c4a9417200aa0216170058249fc539529130e9dfbc
 DIST vscode-1.57.1-arm.tar.gz 95393169 BLAKE2B dd004a41ec92796d9c2235be032c2cd5a79464926b392fb3c6d73bf0a49265bfeb0c234fd383a267578553501ad23d3e21f8e2edba591e2cb6d7f8a4118dda26 SHA512 3df5f8c15b0622c0d4cb470f095280c817675ccc160b51caeb04ed5471ae41da5d72da8128d5dd689c33d82718433786bdddeb87cca82d80a5eb638094be18e9
 DIST vscode-1.57.1-arm64.tar.gz 110176471 BLAKE2B 40765526445565714c4e487327af4d34d8b83d2eda8cb74431df680a0ad212fa7b24312d07759be077bba30c0ab721af6ced24d31262863524bacd41e4fc5f82 SHA512 f20f22b2e524918bce1bd0d2e43e1f15a11bf40b54c6b8e55fd4dbe2f39c5eb724c3354ab6e8b00b6f8a81f01d0dfe2c6483fc81344a538ee782ae2c1e0ec5bc
+DIST vscode-1.58.2-amd64.tar.gz 105591644 BLAKE2B bc130bfeab48f60f4149aa9d44aebbfba121cb629f1295acb23361a06e5071ddb2dc147c7d161b67f57d45fdb1337784a85bb4f08c6f82a48675c35be0037047 SHA512 00e4012d133e8755b13b1b0136078db872b7f202c59663ea46b137451338ca77f8020cc7fffa807ba5e5963105f0ce8ea0d2a0f29702078a64ace5743da6c83e
+DIST vscode-1.58.2-arm.tar.gz 96167069 BLAKE2B 1c19cf29c9419663216e3ccf521314e0102efcd18a69b0e3668259f8172a377300f1ca900e2d0cda325619a855fdcd6def5db34ebab0e6f79bc0ffd1cb2eb609 SHA512 32c4011c0a10827b73388b469246c179fc3aa06e883c1264f215cd96695821945401b4d0bfc7cf324768977eeb0c785ab4948fdb50899b26b9ca469087ab3b45
+DIST vscode-1.58.2-arm64.tar.gz 110942132 BLAKE2B 3fb2a83087789690ba930ae0910b931f8f2ed129049e536d172bd67be6d928afb2e17ba09756c1dd3f9c145354fa8eface31928f419f74df165bb0c60588dc57 SHA512 f1ae69955251b6e8e92eebf01edfd820cdbf06c887349ba1cb6db2ff8aee170183029a0f2b5075b8a07ed9a26e982b87d63fe0fe4a193fa71ff5ebb52fdf1221
 EBUILD vscode-1.57.1.ebuild 2498 BLAKE2B 6f0b4c2d4c6c9fc109fe05611d54bc953436e183cdcbd3f3fd4cba200ef35dcd60310a87d27a9282daab5bf738803f5c47ab9b64e4ad994673d815df469a1299 SHA512 e53bb2318c995aff9bc38444f4a09e726a6373b3737828b61c58dd638619a8ec877e754001ddc11a1bf8d869814bd0af098205a1199c967fbb79bed193767867
+EBUILD vscode-1.58.2.ebuild 2498 BLAKE2B 6f0b4c2d4c6c9fc109fe05611d54bc953436e183cdcbd3f3fd4cba200ef35dcd60310a87d27a9282daab5bf738803f5c47ab9b64e4ad994673d815df469a1299 SHA512 e53bb2318c995aff9bc38444f4a09e726a6373b3737828b61c58dd638619a8ec877e754001ddc11a1bf8d869814bd0af098205a1199c967fbb79bed193767867
 MISC metadata.xml 946 BLAKE2B 7c5b479e70b6b44c5614a30db4c1aac3ecf8ba399a01d9028888719fc76fb33f083ed248c853ce086a4124c40532254dc4a1fe19c196ca3720a75daecca27442 SHA512 0ddadafbf6dd1eb77e70669eeaff7ce22da48ee801b257ca6447ac16f8c22090510fdf84f432fc3a631d50dece3bd90a46f6a570faee8a5daab06a361d858050
diff --git a/app-editors/vscode/vscode-1.58.2.ebuild b/app-editors/vscode/vscode-1.58.2.ebuild
new file mode 100644
index 000000000000..044c01c33002
--- /dev/null
+++ b/app-editors/vscode/vscode-1.58.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils xdg
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret[crypt]
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libpng:0/16
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libnotify
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscode/code
+	/opt/vscode/libEGL.so
+	/opt/vscode/libffmpeg.so
+	/opt/vscode/libGLESv2.so
+	/opt/vscode/libvulkan.so*
+	/opt/vscode/chrome-sandbox
+	/opt/vscode/libvk_swiftshader.so
+	/opt/vscode/swiftshader/libEGL.so
+	/opt/vscode/swiftshader/libGLESv2.so
+	/opt/vscode/resources/app/extensions/*
+	/opt/vscode/resources/app/node_modules.asar.unpacked/*
+"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
+
+	# Install
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}code
+	fperms +x /opt/${PN}/chrome-sandbox
+	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+	dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
+	domenu "${FILESDIR}/vscode.desktop"
+	domenu "${FILESDIR}/vscode-url-handler.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "You may want to install some additional utils, check in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index caea39b91760..885d4584eda2 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -1,15 +1,11 @@
 AUX vscodium-url-handler.desktop 294 BLAKE2B 340dc0ae856092ec5d4d044ea1ac2ccbd4d4ac8eaa3bab6eb7a48eb21090b1bed24eda15f3eb4c22d0326a802b7ada77a5b6d7277b80d7885c529edb062e85f4 SHA512 6916dbcb0ff1eb131b1bc17aa8c601cf34bf1264702ca574bd6427d3b3daa6d7d69cf0591c48734205b0f12cec396917b89317107b2158b58a0a4ba8ca04cd86
 AUX vscodium.desktop 460 BLAKE2B f07817a1c718b3b981bf353a8b73c9457828b9f48524f01c2a7673111a729b2f81674beae006d566946b81e52a0df162e7ec8a97e050607ecf413f22f6f5b9b3 SHA512 fc05408dcb33ccab0a91e71da36e461bb40f5b8a2b8477f283080d050cb612f55385022228d73bc3b48ae2b7ebcedd63bfc5924c0d87928d91929da8577051c7
-DIST vscodium-1.56.2-amd64.tar.gz 108032091 BLAKE2B e6d66885f79a8f29e9316cf759d6b562029a3da9c3fc6d14742adda0ae20e4be05b6c08f8c1698f3340cd0ca97836c49d3ef82bca9a27318d5f6d5e36555455d SHA512 831444221a3055fde829920ad6c0b8c007aa539b614918b20af0e676ecd31f341497f9c7fb8d8fe95f757bc360446cac93e00ee1a828183e0feb1eefad1e0c11
-DIST vscodium-1.56.2-arm.tar.gz 96683293 BLAKE2B bdc6b89ebfa9e1be765aef63f8a2bcdbf2074b64d70833447b3a3caf148c7887c672077827b7467a681219eef0101bdf82581f589586a263397d2cc9951a8c0c SHA512 023c59d4ae6590437c9425fa02f70cd957c125ea69cfa1c4fe8812f2b7521b747421efe89fd3e4bd95b54f0bdea177941f72467af5d8036d51426b8139a48fc2
-DIST vscodium-1.56.2-arm64.tar.gz 113358341 BLAKE2B f7f8c8589985edd11ba80b4fff9ab1174d436a2516eabc02cd6b3f5d03559295f3fe6772a16e6825d6a23953107b5b7537ab28cedc040a8b35a4b25182ee8d29 SHA512 f0aec2074e93bc26cfc615029bbc9ab360993f00a70272002982c058c7746824f6d97fffb34a5d6c16597b4ad8453730f28b04c11e4d0fd8ccea873490b260d5
-DIST vscodium-1.57.0-amd64.tar.gz 107752144 BLAKE2B c7f6f07a526e25b52f5a93eecdcf285f32bf5af38ff4e0b4882303078c110555134e37d85fad01d92970758e867e17e199586878a0a3abebd6fc18866d1c557a SHA512 e58d6161cff2ab0ef206ae629c65d03a947cc9112826a880f86c296d19462edf03e66c2d17399268b32aed597ea688f93b20cade8aac79d97871306c4d967073
-DIST vscodium-1.57.0-arm.tar.gz 96394761 BLAKE2B 3fc3ab8d4be7343cc8597cf9c09a13e1e28a1bfce12b19a11f5bdf46c1d6931c12718306f19c78fd7c567b622bf40434165009b0b0b6b9de3b86005833188511 SHA512 d7eb1776ceedd0072b039a04ec194779d6c27decc92d311cc9bd8c630b776ec1c85e46b8c3afe93c3cae904f27a2e05d69c6ca4155cae6a90c44570f59afedb2
-DIST vscodium-1.57.0-arm64.tar.gz 113075134 BLAKE2B eeead9b70a8e7b353ac744b65b3854ce5954f242a777e974ba4c8a586aa8c99d6dc5ee793e01568275a3edc48f8287ee3c3c8d1ae6b3c54b9df8913d4f32f96d SHA512 0c8a282b36ec3067246b590c241b3301a623cc9b0bd15bdbc3a2ad6303399c24bb721264ea69f4342717d8ad29046e6ed25ff6b3449923a315e2df2ccc85e0db
 DIST vscodium-1.57.1-amd64.tar.gz 107747154 BLAKE2B 0a348d77616eb691b9a7ef7ded4a2f3b07cf6e44b0e37fdc4f93f0a2327d040aa8a5442f1b978d6c5086d188bcb1aedbefef5f449da05a3f772b1d029bf38e26 SHA512 f4560725d67e690a99b6c1911a1542f877a0caa44e5b6be1aa4a06e0c3c3b16454c06a1a3d881a6af43b4ab97619b9fa464dc979c99c2af0882fe2b2960499d6
 DIST vscodium-1.57.1-arm.tar.gz 96383568 BLAKE2B 13140773fe7442d0c947dba2e9b30ea80fda5f42bdf8557e214bca2741e92d99f8e11821e569fe69b1ade84cc277604a931422610cfdd8a35dfe05be30c9d20a SHA512 2d7e406674b22ce9ca12aee423147b31df8381e615e2a7341c3373509cd63146325dd276bacebd63221dac0cde8b6c0c3b9406c4a437612b46e2e55bf4bb6531
 DIST vscodium-1.57.1-arm64.tar.gz 113062013 BLAKE2B 8befda9f99183097963842fd86e5721563562aba540a4634c273de88fff344f4f3e0554329d5a964f610b5eef02e7f34fd3a2380a96abfa44debbcc7f250e3f2 SHA512 22254e07ea9527b4ecdc77b63aedd55a56b7ede719178a74eeea7134fadda0beab7b604549625c0a48dafe3d18e14c997111ffea261086a608faa9567af911b6
-EBUILD vscodium-1.56.2.ebuild 2353 BLAKE2B b0d5df95befc92bc17316a3948c93ae5cb0f7cc12d3cde72b92b805fbcbfde61913bac6a438d2cc1b809ae55b4cea7ee7775d5cbe87961addc7572b161b55f82 SHA512 7003ddd421cc3416d7aa26181e1da148ab152fcecda780c0fecba4b8f1d8df9bf7af89fac0fc4fb5a5e88d1c945348adafcd59d280f016c89bfe32147bbc98e7
-EBUILD vscodium-1.57.0.ebuild 2353 BLAKE2B b0d5df95befc92bc17316a3948c93ae5cb0f7cc12d3cde72b92b805fbcbfde61913bac6a438d2cc1b809ae55b4cea7ee7775d5cbe87961addc7572b161b55f82 SHA512 7003ddd421cc3416d7aa26181e1da148ab152fcecda780c0fecba4b8f1d8df9bf7af89fac0fc4fb5a5e88d1c945348adafcd59d280f016c89bfe32147bbc98e7
+DIST vscodium-1.58.2-amd64.tar.gz 109733827 BLAKE2B 0ada13724f2d4255a9ce58d0fd47415f2f5b4adfed144dae884914888df1f9bb735472e378fc2d4dd74fd1168c3361ad4e945a48607aeb3e095658a7b3e0df2c SHA512 dd98dbd88e64e526f78624e2e42bd116a689174d801412f7750c895794b0658b20b9451d336d0837f4030c11ce35368fb3dd0ade078bac393ada813c912a9a8d
+DIST vscodium-1.58.2-arm.tar.gz 98395232 BLAKE2B 74bb7a07f9d6a9f107cd74a1a593e7770d67d1f0b2e4b809dab420c8b17fe3902a05a26caf59e2474afdfd01a2d65b0889f2d4298cdf512cfa44df8321a8e65a SHA512 58a08f2a5be9c42410772b97d5456d75044454ace5de92e03ac5bd7ff2dcef284e1e747869752f548bb1237e248981e06a9f9a9b6be99f8e8a50cf52fe6dd2c4
+DIST vscodium-1.58.2-arm64.tar.gz 115052512 BLAKE2B d1047b34bf6132f47b7423e35a7cb92b98cbac782db1a086c068d0bd60fcc59c16852f18451ac860c8e8940fce08e6e7671fed3db3e19f7c80e34411865c7b5b SHA512 d34b53f9679006c30f2f422a8311a336eea778995fc8dc7cb0c24ecc02c88bbb2cd442f426fa88afd78f7175c16ce6c9f912eaa900d76fa25081824f91cabe0f
 EBUILD vscodium-1.57.1.ebuild 2353 BLAKE2B b0d5df95befc92bc17316a3948c93ae5cb0f7cc12d3cde72b92b805fbcbfde61913bac6a438d2cc1b809ae55b4cea7ee7775d5cbe87961addc7572b161b55f82 SHA512 7003ddd421cc3416d7aa26181e1da148ab152fcecda780c0fecba4b8f1d8df9bf7af89fac0fc4fb5a5e88d1c945348adafcd59d280f016c89bfe32147bbc98e7
+EBUILD vscodium-1.58.2.ebuild 2353 BLAKE2B b0d5df95befc92bc17316a3948c93ae5cb0f7cc12d3cde72b92b805fbcbfde61913bac6a438d2cc1b809ae55b4cea7ee7775d5cbe87961addc7572b161b55f82 SHA512 7003ddd421cc3416d7aa26181e1da148ab152fcecda780c0fecba4b8f1d8df9bf7af89fac0fc4fb5a5e88d1c945348adafcd59d280f016c89bfe32147bbc98e7
 MISC metadata.xml 1190 BLAKE2B d2a237155cf015fd18d0bf562747788584142e136c3ffd98ebe1a07c796562a65c27818c0ba0db9e5b64a3a8d1f5c9465e48de285f38042890160eedcdcf017f SHA512 f8e6986a85092e68c016aa34bd4948f0eea6f83b26935e07697ff1c536616c6829495467b2e09d4cda01699bae5c7825fcc711adc2f90e81e60592c168220d4e
diff --git a/app-editors/vscodium/vscodium-1.57.0.ebuild b/app-editors/vscodium/vscodium-1.57.0.ebuild
deleted file mode 100644
index e25a3967ed49..000000000000
--- a/app-editors/vscodium/vscodium-1.57.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils xdg
-
-DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
-HOMEPAGE="https://vscodium.com/"
-SRC_URI="
-	amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
-	arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
-	arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
-"
-
-RESTRICT="mirror strip bindist"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE=""
-
-RDEPEND="
-	app-accessibility/at-spi2-atk
-	app-crypt/libsecret[crypt]
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libpng:0/16
-	net-print/cups
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libnotify
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	/opt/vscodium/codium
-	/opt/vscodium/libEGL.so
-	/opt/vscodium/libffmpeg.so
-	/opt/vscodium/libGLESv2.so
-	/opt/vscodium/libvulkan.so*
-	/opt/vscodium/chrome-sandbox
-	/opt/vscodium/libvk_swiftshader.so
-	/opt/vscodium/swiftshader/libEGL.so
-	/opt/vscodium/swiftshader/libGLESv2.so
-	/opt/vscodium/resources/app/extensions/*
-	/opt/vscodium/resources/app/node_modules.asar.unpacked/*
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	# Cleanup
-	rm "${S}/resources/app/LICENSE.txt" || die
-
-	# Install
-	pax-mark m codium
-	insinto "/opt/${PN}"
-	doins -r *
-	fperms +x /opt/${PN}/{,bin/}codium
-	fperms +x /opt/${PN}/chrome-sandbox
-	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
-	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
-	dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
-	domenu "${FILESDIR}/vscodium.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscodium.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "When compared to the regular VSCode, VSCodium has a few quirks"
-	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
-}
diff --git a/app-editors/vscodium/vscodium-1.56.2.ebuild b/app-editors/vscodium/vscodium-1.58.2.ebuild
index e25a3967ed49..e25a3967ed49 100644
--- a/app-editors/vscodium/vscodium-1.56.2.ebuild
+++ b/app-editors/vscodium/vscodium-1.58.2.ebuild
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 334916d432d7..ff283ee93966 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -16,6 +16,6 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-EBUILD xemacs-21.4.24-r2.ebuild 7125 BLAKE2B 929ec8036ea1a05852199eca6b717ab8c0d390d7f33063cfb220f055aa45e6ea51324edccd73d65a4b9bebf6072f07e65d40d1471d10abefd57f6c915bb27921 SHA512 f0a76a418850c782730766d3fed0e04ec7c9350b7d2c5150348e6e44d0548c4f6ba8837fb8f97c6448deb866f7384b09038a93bfe9a7579f7f41b918b8d02d5f
-EBUILD xemacs-21.5.34-r5.ebuild 7366 BLAKE2B 1d57025f6063c61d68bd585611f4aa999ce8148d1c949c09d2d932742ad55dd838481ef85a5d8f6dc81312111c8d61d0249c912c4f3719d68bac9595caecba8b SHA512 e021ee82f0d451edce59867aaa62ec15ec7952b720b17679792966eabde1731030a2fe13aa41f5b88b96eb5a1f44896c2d214d2e5a8cf9a44907f7ed5d9f5fee
+EBUILD xemacs-21.4.24-r3.ebuild 7093 BLAKE2B b110be14467c17919c72baeff5339dcc1d135f883047cf699e781b4302a0b37a6f6dfa0175de4a66e64fc0d457531ad85a20d83ca8e01d6660dcb0a5a83565ba SHA512 5f01488f2bc7155de34d0c8e7fde30f51584abbe45ad3f2d482b442df26305f8765c0940255e607bc09f9b914facaeb554e0d969bb72e2891fae944cb08c5f9c
+EBUILD xemacs-21.5.34-r6.ebuild 7313 BLAKE2B 11dd52a16988b977ed372d0369e7b958248e2ead1926393170b9a4f58ca9062abe9d9e55963942cf53731dceb3c685b6936d46ed2d87e450614b9bcb050fdd9e SHA512 e9ef30136edec568b2c20067c1f6d5f991fea673f01f0dd04b9a7d69cf240c5a8535e7a5a7688716240ce5d4fe2472e44697a62ef4b230feff4011416bf0879c
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
deleted file mode 100644
index 557ca34677b6..000000000000
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=7
-
-WANT_AUTOCONF="2.1"
-inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
-	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-5"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-	# see bug 58350, 102540 and 143580
-	eapply "${FILESDIR}"/xemacs-21.4.19-db.patch
-	# see bug 576512
-	eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
-	eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
-	# see bug 615544
-	eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
-	eapply "${FILESDIR}"/xemacs-21.4.24-strsignal.patch
-
-	# Convert to utf-8
-	iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \
-	      && mv -f man/xemacs-faq.texi.tmp man/xemacs-faq.texi || die
-	iconv -f iso-8859-1 -t utf-8 -o man/lispref/ldap.texi.tmp man/lispref/ldap.texi \
-	      && mv -f man/lispref/ldap.texi.tmp man/lispref/ldap.texi || die
-
-	eapply_user
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac || die
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_configure() {
-	local myconf=""
-
-	# Can't build with pie. See bug #75028
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff ) $(use_with png )"
-		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	# Enabling modules will cause segfaults outside the XEmacs build directory
-	use ia64  && myconf="${myconf} --without-modules"
-
-	einfo "${myconf}"
-
-	# see bug 576512
-	append-cflags -fgnu89-inline
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--compiler=$(tc-getCC) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-system-malloc \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die "The configure script failed to run properly"
-}
-
-src_install() {
-	emake prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die "emake install failed"
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.4.24-r3.ebuild b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
new file mode 100644
index 000000000000..9b7467a98c25
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=7
+
+WANT_AUTOCONF="2.1"
+inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
+	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86"
+IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.6:0
+	>=media-libs/audiofile-0.2.3
+	gpm? ( >=sys-libs/gpm-1.19.6 )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( net-nds/openldap )
+	nas? ( media-libs/nas )
+	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+	dnd? ( x11-libs/dnd )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	athena? ( x11-libs/libXaw )
+	Xaw3d? ( x11-libs/libXaw3d )
+	neXt? ( x11-libs/neXtaw )
+	xface? ( media-libs/compface )
+	tiff? ( media-libs/tiff:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	jpeg? ( virtual/jpeg:0 )
+	!amd64? ( freewnn? ( app-i18n/freewnn ) )
+	>=sys-libs/ncurses-5.2:=
+	>=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-5"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+	# see bug 58350, 102540 and 143580
+	eapply "${FILESDIR}"/xemacs-21.4.19-db.patch
+	# see bug 576512
+	eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
+	eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
+	# see bug 615544
+	eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
+	eapply "${FILESDIR}"/xemacs-21.4.24-strsignal.patch
+
+	# Convert to utf-8
+	iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \
+	      && mv -f man/xemacs-faq.texi.tmp man/xemacs-faq.texi || die
+	iconv -f iso-8859-1 -t utf-8 -o man/lispref/ldap.texi.tmp man/lispref/ldap.texi \
+	      && mv -f man/lispref/ldap.texi.tmp man/lispref/ldap.texi || die
+
+	eapply_user
+
+	# Some binaries and man pages are installed under suffixed names
+	# to avoid collions with their GNU Emacs counterparts (see below).
+	# Fix internal filename references.
+	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+
+	# Run autoconf. XEmacs tries to be smart by providing a stub
+	# configure.ac file for autoconf 2.59 but this throws our
+	# autotools eclass so it must be removed first.
+	rm "${S}"/configure.ac || die
+	eautoconf
+
+	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+}
+
+src_configure() {
+	local myconf=""
+
+	# Can't build with pie. See bug #75028
+	test-flags -no-pie >/dev/null && append-flags -no-pie
+	filter-flags -pie
+
+	if use X; then
+
+		myconf="${myconf} --with-widgets=athena"
+		myconf="${myconf} --with-dialogs=athena"
+		myconf="${myconf} --with-menubars=lucid"
+		myconf="${myconf} --with-scrollbars=lucid"
+		if use motif ; then
+			myconf="--with-widgets=motif"
+			myconf="${myconf} --with-dialogs=motif"
+			myconf="${myconf} --with-scrollbars=motif"
+			myconf="${myconf} --with-menubars=lucid"
+		fi
+		if use athena ; then
+			myconf="--with-scrollbars=athena"
+		fi
+
+		if use Xaw3d; then
+			myconf="${myconf} --with-athena=3d"
+		elif use neXt; then
+			myconf="${myconf} --with-athena=next"
+		else
+			myconf="${myconf} --with-athena=xaw"
+		fi
+
+		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+		myconf="${myconf} $(use_with tiff ) $(use_with png )"
+		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-gif=no"
+	fi
+
+	if use mule ; then
+		myconf="${myconf} --with-mule"
+
+		if use xim ; then
+			if use motif ; then
+				myconf="${myconf} --with-xim=motif"
+			else
+				myconf="${myconf} --with-xim=xlib"
+			fi
+		else
+			myconf="${myconf} --with-xim=no"
+		fi
+
+		myconf="${myconf} $(use_with freewnn wnn )"
+	fi
+
+	# This determines the type of sounds we are playing
+	local soundconf="native"
+
+	# This determines how these sounds should be played
+	use nas	&& soundconf="${soundconf},nas"
+
+	myconf="${myconf} --with-sound=${soundconf}"
+
+	if use gdbm || use berkdb ; then
+		use gdbm && mydb="gdbm"
+
+		use berkdb && mydb="${mydb},berkdb"
+
+		myconf="${myconf} --with-database=${mydb}"
+	else
+		myconf="${myconf} --without-database"
+	fi
+
+	# Enabling modules will cause segfaults outside the XEmacs build directory
+	use ia64  && myconf="${myconf} --without-modules"
+
+	einfo "${myconf}"
+
+	# see bug 576512
+	append-cflags -fgnu89-inline
+
+	# Don't use econf because it uses options which this configure
+	# script does not understand (like --host).
+	./configure ${myconf} ${EXTRA_ECONF} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with eolconv file-coding ) \
+		$(use_with pop ) \
+		--compiler=$(tc-getCC) \
+		--prefix=/usr \
+		--without-canna \
+		--with-ncurses \
+		--with-system-malloc \
+		--with-msw=no \
+		--mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		|| die "The configure script failed to run properly"
+}
+
+src_install() {
+	emake prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man/man1 \
+		infodir="${D}"/usr/share/info \
+		install gzip-el || die "emake install failed"
+
+	# Rename some applications installed in bin so that it is clear
+	# which application installed them and so that conflicting
+	# packages (emacs) can't clobber the actual applications.
+	# Addresses bug #62991.
+	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
+		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+	done
+
+	# rename man pages
+	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
+		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
+	done
+
+	# install base packages directories
+	dodir /usr/lib/xemacs/xemacs-packages/
+	dodir /usr/lib/xemacs/site-packages/
+	dodir /usr/lib/xemacs/site-modules/
+	dodir /usr/lib/xemacs/site-lisp/
+
+	if use mule;
+	then
+		dodir /usr/lib/xemacs/mule-packages
+	fi
+
+	# remove extraneous info files
+	cd "${D}"/usr/share/info
+	rm -f dir info.info texinfo* termcap* standards*
+
+	cd "${S}"
+	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}
diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
deleted file mode 100644
index bcf39ec31bbd..000000000000
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=7
-
-inherit autotools flag-o-matic xdg-utils desktop
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0[xft=] )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
-	freewnn? ( app-i18n/freewnn )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-	default_src_unpack
-
-	use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
-	eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
-	eapply "${FILESDIR}/${P}-gcc5.patch"
-	eapply "${FILESDIR}/${P}-glibc-macro.patch"
-	eapply "${FILESDIR}/${P}-as-needed.patch"
-	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
-	eapply "${FILESDIR}/${P}-ar.patch"
-	eapply "${FILESDIR}/${P}-strsignal.patch"
-	eapply "${FILESDIR}/${P}-process-test-qa.patch"
-
-	eapply_user
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# bug #639642
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena or use Xaw3d ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff )"
-		myconf="${myconf} $(use_with png )"
-		myconf="${myconf} $(use_with jpeg )"
-		myconf="${myconf} $(use_with xface )"
-
-		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
-			myconf="${myconf} --with-xft=no"
-
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-xft=no
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} $(use_with canna )"
-		myconf="${myconf} $(use_with freewnn wnn )"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-	use alsa && soundconf="${soundconf},alsa"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm   && mydb="gdbm"
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	use debug && myconf="${myconf} --with-debug" ||
-		myconf="${myconf} --with-optimization"
-
-	econf ${myconf} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-msw=no \
-		--with-mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		--with-newgc \
-		--with-system-malloc \
-		--enable-option-checking=no \
-		--with-last-packages=/usr/lib/xemacs
-}
-
-src_compile() {
-	emake EMACSLOADPATH="${S}"/lisp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr \
-		mandir="${ED}"/usr/share/man/man1 \
-		infodir="${ED}"/usr/share/info \
-		libdir="${ED}"/usr/$(get_libdir) \
-		datadir="${ED}"/usr/share \
-		install
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags gnuclient gnudoit gnuattach; do
-		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${ED}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-
-	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
-	einfo "incompatibilities:"
-	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
-	einfo "- The X resource class has changed from Emacs to XEmacs,"
-	einfo "  settings in your .Xdefaults file should be updated accordingly."
-
-	if use xft;
-	then
-	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
-	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
-	fi
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
new file mode 100644
index 000000000000..7e8c4188da85
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=7
+
+inherit autotools flag-o-matic xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
+	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.6:0
+	>=media-libs/audiofile-0.2.3
+	gpm? ( >=sys-libs/gpm-1.19.6 )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( net-nds/openldap )
+	alsa? ( media-libs/alsa-lib )
+	nas? ( media-libs/nas )
+	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+	dnd? ( x11-libs/dnd )
+	motif? ( >=x11-libs/motif-2.3:0[xft=] )
+	athena? ( x11-libs/libXaw )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
+	neXt? ( x11-libs/neXtaw )
+	xface? ( media-libs/compface )
+	tiff? ( media-libs/tiff:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	jpeg? ( virtual/jpeg:0 )
+	freewnn? ( app-i18n/freewnn )
+	>=sys-libs/ncurses-5.2:=
+	>=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+	default_src_unpack
+
+	use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+	eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
+	eapply "${FILESDIR}/${P}-gcc5.patch"
+	eapply "${FILESDIR}/${P}-glibc-macro.patch"
+	eapply "${FILESDIR}/${P}-as-needed.patch"
+	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+	eapply "${FILESDIR}/${P}-ar.patch"
+	eapply "${FILESDIR}/${P}-strsignal.patch"
+	eapply "${FILESDIR}/${P}-process-test-qa.patch"
+
+	eapply_user
+
+	# Some binaries and man pages are installed under suffixed names
+	# to avoid collions with their GNU Emacs counterparts (see below).
+	# Fix internal filename references.
+	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# bug #639642
+	test-flags -no-pie >/dev/null && append-flags -no-pie
+	filter-flags -pie
+
+	if use X; then
+
+		myconf="${myconf} --with-widgets=athena"
+		myconf="${myconf} --with-dialogs=athena"
+		myconf="${myconf} --with-menubars=lucid"
+		myconf="${myconf} --with-scrollbars=lucid"
+		if use motif ; then
+			myconf="--with-widgets=motif"
+			myconf="${myconf} --with-dialogs=motif"
+			myconf="${myconf} --with-scrollbars=motif"
+			myconf="${myconf} --with-menubars=lucid"
+		fi
+		if use athena or use Xaw3d ; then
+			myconf="--with-scrollbars=athena"
+		fi
+
+		if use Xaw3d; then
+			myconf="${myconf} --with-athena=3d"
+		elif use neXt; then
+			myconf="${myconf} --with-athena=next"
+		else
+			myconf="${myconf} --with-athena=xaw"
+		fi
+
+		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+		myconf="${myconf} $(use_with tiff )"
+		myconf="${myconf} $(use_with png )"
+		myconf="${myconf} $(use_with jpeg )"
+		myconf="${myconf} $(use_with xface )"
+
+		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
+			myconf="${myconf} --with-xft=no"
+
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-xft=no
+			--with-gif=no"
+	fi
+
+	if use mule ; then
+		myconf="${myconf} --with-mule"
+
+		if use xim ; then
+			if use motif ; then
+				myconf="${myconf} --with-xim=motif"
+			else
+				myconf="${myconf} --with-xim=xlib"
+			fi
+		else
+			myconf="${myconf} --with-xim=no"
+		fi
+
+		myconf="${myconf} $(use_with freewnn wnn )"
+	fi
+
+	# This determines the type of sounds we are playing
+	local soundconf="native"
+
+	# This determines how these sounds should be played
+	use nas	&& soundconf="${soundconf},nas"
+	use alsa && soundconf="${soundconf},alsa"
+
+	myconf="${myconf} --with-sound=${soundconf}"
+
+	if use gdbm || use berkdb ; then
+		use gdbm   && mydb="gdbm"
+		use berkdb && mydb="${mydb},berkdb"
+
+		myconf="${myconf} --with-database=${mydb}"
+	else
+		myconf="${myconf} --without-database"
+	fi
+
+	use debug && myconf="${myconf} --with-debug" ||
+		myconf="${myconf} --with-optimization"
+
+	econf ${myconf} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with eolconv file-coding ) \
+		$(use_with pop ) \
+		--prefix=/usr \
+		--without-canna \
+		--with-ncurses \
+		--with-msw=no \
+		--with-mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		--with-newgc \
+		--with-system-malloc \
+		--enable-option-checking=no \
+		--with-last-packages=/usr/lib/xemacs
+}
+
+src_compile() {
+	emake EMACSLOADPATH="${S}"/lisp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr \
+		mandir="${ED}"/usr/share/man/man1 \
+		infodir="${ED}"/usr/share/info \
+		libdir="${ED}"/usr/$(get_libdir) \
+		datadir="${ED}"/usr/share \
+		install
+
+	# Rename some applications installed in bin so that it is clear
+	# which application installed them and so that conflicting
+	# packages (emacs) can't clobber the actual applications.
+	# Addresses bug #62991.
+	for i in b2m ctags etags gnuclient gnudoit gnuattach; do
+		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+	done
+
+	# rename man pages
+	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
+		mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
+	done
+
+	# install base packages directories
+	dodir /usr/lib/xemacs/xemacs-packages/
+	dodir /usr/lib/xemacs/site-packages/
+	dodir /usr/lib/xemacs/site-modules/
+	dodir /usr/lib/xemacs/site-lisp/
+
+	if use mule;
+	then
+		dodir /usr/lib/xemacs/mule-packages
+	fi
+
+	# remove extraneous info files
+	cd "${ED}"/usr/share/info
+	rm -f dir info.info texinfo* termcap* standards*
+
+	cd "${S}"
+	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
+
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+
+	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
+	einfo "incompatibilities:"
+	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
+	einfo "- The X resource class has changed from Emacs to XEmacs,"
+	einfo "  settings in your .Xdefaults file should be updated accordingly."
+
+	if use xft;
+	then
+	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
+	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
+	fi
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 27ee262a62ab..3de184f84c12 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 02f7c3e97865..289d1d5b0d41 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -2,6 +2,8 @@ AUX 50ebuild-mode-gentoo-1.51.el 1209 BLAKE2B 06da1836a37ec6eccddcac50e999e5e193
 AUX 50ebuild-mode-gentoo-1.52.el 1419 BLAKE2B e5242bd136609761e103acb6d7fea200b6f762b115b86f9ce64aeef7403327c79802ed5ca26127c3b83fba78fced025333aa7a6e4e796f2a1d58d1a7d3c5e6dc SHA512 d6169cb25438da932888a7104089471392afd6f5a95acc0fe96647aa4482054e91041bf77bdd694e700dcc51155aee9165fc98b21e8e9859a2235ea4c8a8e4af
 DIST ebuild-mode-1.51.tar.xz 35280 BLAKE2B 63f57919bb73937ce3d40b4d6762e78c78d273bcf67875434d12450e00632d457d3dedbe6f213c1979a60cbc0a0874723e3e9424fdcfb64a48acc885cc90e577 SHA512 ff9ece96fbe7bfc9c070769dc6667e8c33f8fb7ef20a2d347c670342ef7500b52b54a93ed37ac9ea13a89c1b89752f5dd6e56c234abe9a4fcd4eb6bad0d0b466
 DIST ebuild-mode-1.52.tar.xz 36100 BLAKE2B d5207d910088de9cf1a41580ce61c49632e8e7c1a1af5d95ba13a7865125ca487d770731bb49e12fdc36d3f557fadd51109de628e958166d064be025e4b91257 SHA512 852f968b44c80f98363d4663856317946992cf5d0daf9a9c63e8ec17c1a684e28c2de510ded98bd2ef84428d8d094c1b6f5060510e6475ce60183fbc8e5a0322
+DIST ebuild-mode-1.53.tar.xz 35920 BLAKE2B ee932441e23ba4b876e98feb9ff9dfea2e395296846e14f776ac10f4c5bab6b711161b4c890b0d8f2ccb5749db5bced3f693aa172e3ae92af506fee26fb5750a SHA512 8fcc28139c0cace21159a0b5026573f401f65b4501ff888f9818d8f5a506a7bc1f8d8a133f775619efc9e16e2172d6b5daba539b4e38b1a378c0b35395263ef9
 EBUILD ebuild-mode-1.51-r3.ebuild 729 BLAKE2B 46f74b1b56541e80f41bf14092627d542ca6c434bad44f606d548cc388102b78855db815fa6d151588e2fca2e6913781677687dcb1eb0b058db358d80669fb4e SHA512 7adf4ff115b8aa78d5dd7a6a222fa535dd85c26390e349896d17b8b729abdf73960bd8b4dd5014c47d87d26dcae28aba5f23a0262c4f8bbaf472c7468ae4c610
 EBUILD ebuild-mode-1.52.ebuild 736 BLAKE2B 5eb9b964d2c708c5334fe9f89ee78b7628ce2e20eb23124ffcb0481abf683355925db3ee0b8aedea84f86479559b9b314f8021579533ffcbe87eb89faf6cdc49 SHA512 54c3c580b468e24669e67bae3495e03683283fb1675d2e9d9977ae0111854d0ddfe63fcc878d7179bd5454bae20d9f75a46e5c1fba69de880038a103ed5fab25
+EBUILD ebuild-mode-1.53.ebuild 736 BLAKE2B b241e8af5d898ea544bf28cf7fe3904917a26b480ffc9591e3a7b3cc7d4f53aa6f6901aee704cc9d4856b9e55631b22aebddb777ab04863b777c104407c998d6 SHA512 5832a9f2bd3f0c0bf88e83dc836200a4323671a3737f019950d7ed673b77d176312ca3983828762968da1e2f6493518cc93297545ff5d384af9f52010950a9e7
 MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.53.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.53.ebuild
new file mode 100644
index 000000000000..c972bf6d3080
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.53.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.52.el"
+DOC_CONTENTS="Some optional features may require installation of additional
+	packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-run-mode/Manifest b/app-emacs/ebuild-run-mode/Manifest
new file mode 100644
index 000000000000..6f7b6fc0c22b
--- /dev/null
+++ b/app-emacs/ebuild-run-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50ebuild-run-mode-gentoo.el 207 BLAKE2B de66cdae167ef39fc79e4b4becbea9e9d8e750be7d4a2af5d3212bf878d98308b0d1e62e283d9e8b20f745d993890cf7d59b79bb91fc692bfc978d36a2f27fea SHA512 cad27bab7bc11a107ae7507787aab5ef9224132d6a5b5442b42c4cea6454032cef19ce830cb00db5e583f072c72ca7b82e0d9cc528b8befbe0c7d172c2ab7785
+DIST emacs-ebuild-run-mode-v20210713.tar.gz 17517 BLAKE2B b9f7cbf6e75125a35f939b0119446bc26e1303533b2d076be7edf5df3ae57773e3fa68721165c86e2f17538465f3b379e3702b786b3a82472dce6c29ddfea454 SHA512 2b9280a7fe73f6b8dde13b395d864193468a7792f02bf8eddb16b8ae1615f5741e7da585eb545e60980be85eeeb43929bb76acb2aae561c79acccb8bf26b75a4
+EBUILD ebuild-run-mode-20210713.ebuild 585 BLAKE2B 72060bf12954c0c212ada79196db43fc6f48fda37fc0f20add7c41bd01cbc3c69a28e208778601066e90f6101db8cc84324da8f2a5f41360d6c6b5aa61a4f90f SHA512 74c3c8174385ece2e03ab1a92f234b293b5d992ef4ae7587432f0c0baa042cc56857ae30a476ef1edce82a83d72b89db8020532c13e82ceb46cc22657f9487f4
+MISC metadata.xml 373 BLAKE2B 6051036dc6602c76f51b1916e3fa1391ffd72ecb86a5ea725439d83cc933e9466800c411e915400ab002d06825f0d74b6482c1f09f2b98abc326060ab03e03c9 SHA512 1ff160ec7f62a6c7408ffb2729805bf8210fadbf53de2b3edab4cfc886e82b5a099e737cf7295b1d234f57fd3742e70eea34fe3f5b712e90842308fe57c8c41d
diff --git a/app-emacs/ebuild-run-mode/ebuild-run-mode-20210713.ebuild b/app-emacs/ebuild-run-mode/ebuild-run-mode-20210713.ebuild
new file mode 100644
index 000000000000..1489c2283048
--- /dev/null
+++ b/app-emacs/ebuild-run-mode/ebuild-run-mode-20210713.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS="24.5"
+
+inherit elisp
+
+MY_PN="emacs-${PN}"
+DESCRIPTION="Major mode for Emacs buffers where ebuild commands run"
+HOMEPAGE="https://gitlab.com/akater/emacs-ebuild-run-mode"
+SRC_URI="https://gitlab.com/akater/${MY_PN}/-/archive/v${PV}/${MY_PN}-v${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-v${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=app-emacs/ebuild-mode-1.53"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ebuild-run-mode.org"
+
+src_compile() {
+	default
+}
diff --git a/app-emacs/ebuild-run-mode/files/50ebuild-run-mode-gentoo.el b/app-emacs/ebuild-run-mode/files/50ebuild-run-mode-gentoo.el
new file mode 100644
index 000000000000..a759994ce241
--- /dev/null
+++ b/app-emacs/ebuild-run-mode/files/50ebuild-run-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ebuild-run-mode "ebuild-run-mode"
+  "Major mode for non-interactive buffers spawned by `ebuild-run-command'.")
+(setq ebuild-log-buffer-mode 'ebuild-run-mode)
diff --git a/app-emacs/ebuild-run-mode/metadata.xml b/app-emacs/ebuild-run-mode/metadata.xml
new file mode 100644
index 000000000000..9ac6cba3e97d
--- /dev/null
+++ b/app-emacs/ebuild-run-mode/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="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="gitlab">akater/emacs-ebuild-run-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/yc/Manifest b/app-emacs/yc/Manifest
deleted file mode 100644
index 2dd5605d1f47..000000000000
--- a/app-emacs/yc/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 50yc-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-AUX sample.dot.emacs 357 BLAKE2B c81dcb247fdafb283e7007720a50e1988c96c0529f2064ea888457bb1530ab4da6411e46143c964713f063dbd4be5b3c858da2c20e0120875dcc1f5102d59fe9 SHA512 c7b40a8d25c3e8d58b8003637e1352fefdfd1f1ed30e9408f9c43bc3a653212fe12a943316900a6ce8fe7b5ab2f7ac7ddc5c749e24326322f2dddbaa07a4a1ca
-AUX sample.hosts.canna 15 BLAKE2B 5fc9ce93ee33d35f21175f285d9c4a4c2cdc6ef17265b33a241457d620ebbaf6185f00a9e3f27838c97748e1b5324d2e6e708b90e9b7199dbeabd4f7b88b18ce SHA512 2b9e6a582e38b11ef99f4530160b476d87d48aed6ab068122bc1f4edd1ece95cbc24eb6e304d0fce9b97b5c2c3e7dce00fe4ab42e386c7971f7a71dd0430a3df
-AUX yc-5.2.1-emacs-26.patch 478 BLAKE2B 0afdbaa3b9996b68efc7697964bd1adfc134899b386ea3e8518ba4a3384c118d645a9b7977e1b76222803b0851dd3b3a0a3afd4505b93494897c186182bab487 SHA512 adc47d253a03939ee986f814fa10cbdbdf01ab036aa0933f90daaaef385577f9ffd5a0740fae3dcae75d6c2e81fab5fe9cc4a9e4a6df1ae5528f476fb8a2e947
-DIST yc-4.0.13.tar.gz 43916 BLAKE2B 7e52c5269b3fbf492d17742aafe242208ba243dadcdd2fb14fbdb4c72765125a39bf7b7c6cd73c50335cc3c64916d0b12814a25f918415d1e20c8e47974f09df SHA512 2b5430766bbdbc77a0ec3aba6d51478ff91186a257e75a2a3af25a885bbddbf7180fbdf3b0876c1a65c149060bb754a44f77bb399c43cc666bd0add40226ca32
-DIST yc-5.2.1.el.gz 33305 BLAKE2B 8bed47715f49466425afefd036cf562055025564e50ae219e027848104e3851b6cba29f74bcf81487d2494d314a290eabe27e128968dbba9d475562e248a267b SHA512 11c8d63a9f6cb94118a00976518949ab50496f8b8f994a8e1c352be5deefc549540935e0727b036c2b3c493366cfb8c47f040fcc425174b6668ec9f5e8d499dc
-EBUILD yc-4.0.13.ebuild 1273 BLAKE2B 1eb45eb3bb0ff92b442ec8f9de3820822c1d7731ada7a07dc2eb41c209ad83008cbdadbd2cfdb6f1f05a4ea57f7e85510473d7211abe2eaa14d6d4b91686d221 SHA512 d094bce75b5e5de5abb8ea8fc2a4fc0bd3637dc4a0dd1db8bcaf210a23f2988d71ba6d9f11d6b352b06c18bda5811772657d0100546a526e04f0f49b87529ba0
-EBUILD yc-5.2.1.ebuild 1151 BLAKE2B 8b9cdc8ba30743bdcd1088f882e717cfe607c87dc638f60d606ea17231c2875a543197487aad5140cb002a4590ea776956b1207421ccbb5fc8c4b63d29713ec5 SHA512 08bb6640407064b328815fd59e13a16647221d0472bf29ab3256ded5abff22ab6f4243a96afffbae6c7e7dfd9cea7f567210281f441e9c14b37920f9c4582a50
-MISC metadata.xml 368 BLAKE2B e63250e7efb1177100aabd30f3552913f47e97bb768b975e3ddd303bb231975de700bdc7cb6cc7c75c7ba3c8a9cef686e636fa001b407b3ed0781b20fba5773b SHA512 d3f3a96a154b437e75f3f7417d009c16b9b7c18e391ed6b9c82503abcb81dca6141e14b531e90411afdc768d7020bdafd44d4865ef68e7a36ac5d6448a940f60
diff --git a/app-emacs/yc/files/50yc-gentoo.el b/app-emacs/yc/files/50yc-gentoo.el
deleted file mode 100644
index 431f7e90ae73..000000000000
--- a/app-emacs/yc/files/50yc-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/yc/files/sample.dot.emacs b/app-emacs/yc/files/sample.dot.emacs
deleted file mode 100644
index 101532e704a6..000000000000
--- a/app-emacs/yc/files/sample.dot.emacs
+++ /dev/null
@@ -1,12 +0,0 @@
-;;;; -*- mode: lisp-interaction; syntax: elisp; coding: iso-2022-7bit -*-
-
-;;;; Configuration for yc
-(setq yc-server-host "unix")
-;If you use inet socket service, enable the following line.
-;(setq yc-server-host "localhost")
-(setq yc-use-color t)
-(if (eq window-system 'x)
-    (setq yc-use-fence nil)
-  (setq yc-use-fence t))
-(load "yc")
-(global-yc-mode 1)
diff --git a/app-emacs/yc/files/sample.hosts.canna b/app-emacs/yc/files/sample.hosts.canna
deleted file mode 100644
index 960d75f5266c..000000000000
--- a/app-emacs/yc/files/sample.hosts.canna
+++ /dev/null
@@ -1,2 +0,0 @@
-localhost
-unix
diff --git a/app-emacs/yc/files/yc-5.2.1-emacs-26.patch b/app-emacs/yc/files/yc-5.2.1-emacs-26.patch
deleted file mode 100644
index 19925c65c454..000000000000
--- a/app-emacs/yc/files/yc-5.2.1-emacs-26.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/yc.el
-+++ b/yc.el
-@@ -2071,7 +2071,7 @@
- ;; $BJ8@a$r;XDj$7$J$$>l9g!"8=:_$NJ8@a$,BP>]$H$J$k(B
- ;; $BFI$_$r<hF@$7$?J8@a$O$=$NFI$_$r%-%c%C%7%e$9$k(B
- ;; cut $B$,(B $BHs(Bnil $B$N>l9g!";XDjJ8@a0J9_$NFI$_$r:o=|$9$k(B
--(defun yc-yomi (&optional idx &optional cut)
-+(defun yc-yomi (&optional idx cut)
-   (if (integerp idx)
-       (yc-put-bunsetsu-yomi idx (yc-get-bunsetsu-yomi idx cut) cut)
-     (yc-put-bunsetsu-yomi yc-mark (yc-get-bunsetsu-yomi yc-mark cut) cut)))
diff --git a/app-emacs/yc/metadata.xml b/app-emacs/yc/metadata.xml
deleted file mode 100644
index 2c9ca3c416d2..000000000000
--- a/app-emacs/yc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnu-emacs@gentoo.org</email>
-    <name>Gentoo GNU Emacs project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-emacs/yc/yc-4.0.13.ebuild b/app-emacs/yc/yc-4.0.13.ebuild
deleted file mode 100644
index a8ef9f8c8458..000000000000
--- a/app-emacs/yc/yc-4.0.13.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit elisp toolchain-funcs
-
-DESCRIPTION="Yet another Canna client on Emacsen"
-HOMEPAGE="http://www.ceres.dti.ne.jp/~knak/yc.html"
-SRC_URI="http://www.ceres.dti.ne.jp/~knak/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="app-i18n/canna"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	sed -i '/$(CC)/s/ -o / $(CFLAGS) $(LDFLAGS) -o /' Makefile
-
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	elisp_src_install
-
-	dobin icanna
-	dodoc "${FILESDIR}"/sample.{dot.emacs,hosts.canna}
-}
-
-pkg_postinst() {
-	elisp_pkg_postinst
-
-	elog "See the sample.dot.emacs in ${EPREFIX}/usr/share/doc/${PF}."
-	elog
-	elog "And If you use unix domain socket for connecting the canna server,"
-	elog "please confirm that there's *no* following line in your ~/.emacs:"
-	elog '  (setq yc-server-host "localhost")'
-	elog
-	elog "If you use inet domain socket for connecting the canna server,"
-	elog "please modify as following in ${EPREFIX}/etc/conf.d/canna:"
-	elog '  CANNASERVER_OPTS="-inet"'
-	elog
-	elog "And create ${EPREFIX}/etc/hosts.canna."
-	elog "See the sample.hosts.canna in ${EPREFIX}/usr/share/doc/${PF}."
-}
diff --git a/app-emacs/yc/yc-5.2.1.ebuild b/app-emacs/yc/yc-5.2.1.ebuild
deleted file mode 100644
index 22ccd0a32304..000000000000
--- a/app-emacs/yc/yc-5.2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit elisp
-
-DESCRIPTION="Yet another Canna client on Emacsen"
-HOMEPAGE="http://www.ceres.dti.ne.jp/~knak/yc.html"
-SRC_URI="http://www.ceres.dti.ne.jp/~knak/${P}.el.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="app-i18n/canna"
-
-ELISP_PATCHES="${P}-emacs-26.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-
-	dodoc "${FILESDIR}"/sample.{dot.emacs,hosts.canna}
-}
-
-pkg_postinst() {
-	elisp_pkg_postinst
-
-	elog "See the sample.dot.emacs in ${EPREFIX}/usr/share/doc/${PF}."
-	elog
-	elog "And If you use unix domain socket for connecting the canna server,"
-	elog "please confirm that there's *no* following line in your ~/.emacs:"
-	elog '  (setq yc-server-host "localhost")'
-	elog
-	elog "If you use inet domain socket for connecting the canna server,"
-	elog "please modify as following in ${EPREFIX}/etc/conf.d/canna:"
-	elog '  CANNASERVER_OPTS="-inet"'
-	elog
-	elog "And create ${EPREFIX}/etc/hosts.canna."
-	elog "See the sample.hosts.canna in ${EPREFIX}/usr/share/doc/${PF}."
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 10bf13f4d087..ab3f613cf9aa 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index c50cd5e0d52d..5b1948f5e559 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -22,10 +22,13 @@ DIST libvirt-7.3.0.tar.xz 8680468 BLAKE2B 88ad3dbac627203419eb80b28649613480a287
 DIST libvirt-7.3.0.tar.xz.asc 833 BLAKE2B 812a7cf4bcaef88a4229008579a18da19d78b0a988890359907e4067b5eb6d74176907875a3a27775ffabaf29fb4d0e92c7f2ec13042ef8657c09ad6b287984d SHA512 f5349bb6c7919b54518a2ffc058592fb588045d37d18dfce5efb7e2f512c2a19b0f956d6ee34a16982cdaec4c23954300f7e130656afeb3cf535c65a0d62c04e
 DIST libvirt-7.4.0.tar.xz 8617788 BLAKE2B 06271895ac39865df632b6ad669eb20d1f1bb774b4a854ee2461174ac5ccf688b0f8ecffc2d9d0b12491e0e948beb377d52efdf40a2729d14b4b3d9bc8835cc2 SHA512 efe3fb2813613c3c5e94ed49d0cae4ad92cca6a727a8b55808d8c3bdfacb355642796dfab49362ee59654f9471f9134b96374ced50cc9b3227f4f1c6201bf7f1
 DIST libvirt-7.4.0.tar.xz.asc 833 BLAKE2B c9d63bb9cdd604663754ccd927a5a1305131617b1d4edb51d289878ff67b7168e882ec1bf0f16aaea509aa32b8419a3c6420615051bd8f42216ce9d1aeae601b SHA512 9a887cf73fb494e55617a69863a0877fba56d180fecbec892a7990f76bc6e1fe15871b4e688e88289eb7acf3ab4a70c1d6202b224cf3c9a96ecb1ecfb2279b2c
+DIST libvirt-7.5.0.tar.xz 8642788 BLAKE2B 467dbd2a337beee5d9f10de7bc37ca988e85fad17fb75e6ab73c13cf79eceab27c9ff51bbe2ac9f6c121feed4c67860fa263e601e10f6b1dd7b8a647b53228a7 SHA512 cf89800c8970b8b1373ee32cc49ea88b87e76b50fd134df5da354be83e0ef490e514f16425c1c16eb3989fbadd3ba7d9976972fbbae6cb40db3d2ae94863219d
+DIST libvirt-7.5.0.tar.xz.asc 833 BLAKE2B ab9ba2a02e4af90002fffbcd0bc04f9faa1d5a23ab815d6b9b6ef1410d9d114fc07c1b29850b59d1ab4ea3a186f4b7d65f5a5ca37d65f3034146617445849dcb SHA512 ebcc1fcce10e19e0a4ae43fbf9bfd5b1b7732829eeb3543c84ba24e0a5d9872be692e7b6c105cdcd730d1c26b895b306387ab380623acf6bba242bd2c62ec7b2
 EBUILD libvirt-7.0.0-r3.ebuild 8786 BLAKE2B 6238ffc390bcaa58d3f22096c3fa774f1d584e888d5803f219a3fde22337119a8b66a72266405ec1c902fb083324da66492083ce8813d6089b913d97bc413153 SHA512 362878616424eb2416e3ce53d379864198bfddf47ef552c4451350a1eb1c52274ea8d158609a387d4d452d82097ef85d908962ebcfe5c29d31363ae3e77232d4
 EBUILD libvirt-7.1.0-r1.ebuild 8479 BLAKE2B 2b16121f4b0930eae86e7866ca7ad5859cc5009cca4d3b2d3e08566a40dbe94f54e324435fdaa8ac8c6b8eff269fc02421c503b52ffd7e5ab31577bc40b03873 SHA512 75a840582349c8c9373e6f15645818a0f5ba6c8aa4510ab62a16499c9dc7d06f23d1caf488ada35d6d51b24fb62cb96d9c362c0cef592b75adaee8516739c4c9
 EBUILD libvirt-7.2.0-r1.ebuild 8285 BLAKE2B 7d5c0c746e44714177a6192250992e190d57deb8ee342e7fe5f457b2bb6a905bff860544f7fd6267624d46b95b0e75caf905dc6c29ea273f8c72cb5edbaadd45 SHA512 a578a69498e3bbe5b5d9df0509c9cfc6294d49f351bdf4ab20df8392152d655777897c8d15e58c2ff344251c444b981f3f7e58c49b09d952816733dd73f0ab9d
 EBUILD libvirt-7.3.0.ebuild 8181 BLAKE2B 567f3971d685fb3a6a782b900e71bd176ccd4f14b4f62b3d713b3c17c5a1afcc9edd853b6d97cb4b5fa940ef9f1cd266b709c4b08ee87a9faf28f6548397c8ad SHA512 40d1484626c17acee923456ae6295a90a113b8d6810a4ca0c7a90e54fc87df3078190e4315b41f3f1a82af0acfe4c0222f5fd718215aabe22cf18b16b170ae1d
 EBUILD libvirt-7.4.0.ebuild 8205 BLAKE2B 3174d1cff6880724f68be9950b834931409a2f47860ecdc33bdf71d6eb1f5ab73112d37566b2b16e3d5321047998dd17a858e3901b1c4550855057631dc408c9 SHA512 582e804a9599f15666a1633709ddacece08238214f8a18c1372efa0ce3b67f5bbb3a492a5e334cbd2009a562c9d402d0afff5a366e981404fd95bc4a3f6c9dae
-EBUILD libvirt-9999.ebuild 8209 BLAKE2B 75eae972c65414567b4642006d3f8808a3891869b2f20b35b83e4915e3fe8fc260faed427ebec4a576b02f27db548b34b000a409fc41f565abc69def47611fdb SHA512 36087e78dcaa57efe1d479cc76323d6bc3634a72b2e2cf16a4f981f3cc5caca9f1854fad0d20f3745e836a4f86968659434237492f83779151405337a45dcf9b
+EBUILD libvirt-7.5.0.ebuild 8209 BLAKE2B 110567e3a8c637fae3d590e9c10b4de7ae5f0e0c3742fb812fea64df9e5401a66c34cd3a312dfa2eb05636950cd54021c402b40ee643ed47920d9dcd01539ba1 SHA512 1e88f9c6779d494bcf33ee2ccf245fb1c2d45fb53e421d88c13edaef9fff69f1b5f20c8622d08af241ca717291c42a36f5eb2f70822f69bd68b40ba492a008a3
+EBUILD libvirt-9999.ebuild 8209 BLAKE2B 110567e3a8c637fae3d590e9c10b4de7ae5f0e0c3742fb812fea64df9e5401a66c34cd3a312dfa2eb05636950cd54021c402b40ee643ed47920d9dcd01539ba1 SHA512 1e88f9c6779d494bcf33ee2ccf245fb1c2d45fb53e421d88c13edaef9fff69f1b5f20c8622d08af241ca717291c42a36f5eb2f70822f69bd68b40ba492a008a3
 MISC metadata.xml 3326 BLAKE2B 70997d3eee5387a0735faad11a891927ad7c96b5fed632c3774611a7c35159eacfd6b0e9561c09dd08d64112c6bd66ff011fd58ed23520bc4f4f531c0d5f4693 SHA512 651bf4d8eec1af7b08c8b1050f2a4d57fa8e205205c59f231d3f84be643a71633b1426e9df1c83c838636245503bfefeef66696ddb9dc9e8da6b1aadee741856
diff --git a/app-emulation/libvirt/libvirt-7.5.0.ebuild b/app-emulation/libvirt/libvirt-7.5.0.ebuild
new file mode 100644
index 000000000000..2abe4227b78a
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-7.5.0.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+	SRC_URI=""
+	SLOT="0"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
+	parted pcap policykit +qemu rbd sasl selinux +udev
+	virtualbox +virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.48.0
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	net-libs/libtirpc
+	net-libs/rpcsvc-proto
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-util/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:0= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-2.11
+		dev-libs/yajl
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6,script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_TARGET_MASQUERADE
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index ccc4f6f1ce73..2abe4227b78a 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -117,7 +117,7 @@ RDEPEND="
 	)
 	wireshark-plugins? ( net-analyzer/wireshark:= )
 	xen? (
-		>=app-emulation/xen-4.6.0
+		>=app-emulation/xen-4.9.0
 		app-emulation/xen-tools:=
 	)
 	udev? (
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 4a5686903739..a9ff4ea108cc 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -9,5 +9,5 @@ DIST lxd-4.0.5.tar.gz.asc 833 BLAKE2B f5b2ead748973831ec7ba7be00c34d26b16a6b168f
 DIST lxd-4.0.6.tar.gz 15353779 BLAKE2B f699e91c53b407e5a0e47fe40b133d6216754b1e5c5829ee68993468565f2080c12cbcbf8373d6da16ca94a3648ec51b874e66ff589be09dc95f2382d18f3e12 SHA512 58efaac50dbcbb3cf0e7aa1b3b43085beae4546dfcd081720b049c2b88bf120b9a74e7db1238bbdd8cc2449e039b076ece3734e8f46f3ddbdc70aaae8b326963
 DIST lxd-4.0.6.tar.gz.asc 833 BLAKE2B 6d1756b130a944a98e62d809c45129178bfc39158c71e09319cdaff7461b14bda467e44a781bb5c15d40afdae4d3ec86f98919738a8c169d3fff910d8e9fe58a SHA512 6c59bd8ec9bf0d9bd90c8ab2970cf6928c0bef3736631ea2a56ebc464f33940366d35925ddfc4104c13fa0fd4e1bea42796e0a2eb82a8bf395957829f938c7db
 EBUILD lxd-4.0.5.ebuild 3744 BLAKE2B 4034a472a91e650d7ac141f650db6fa8d78060491db95baa6bce4f246f1f1c34681d5e292ab31ea914bb5b7717b6ea820a2870f85391cd1e8270066b611b918a SHA512 c28ece030f7a3c4919e156585f031ff653851857029d3a0164fa4b095ecf0f61faeb3b44b49f350cf0985fe35295fad727b5c457cf7aeed87d5a096ae2add31e
-EBUILD lxd-4.0.6.ebuild 4115 BLAKE2B 019c8b4793dfae2500beac746d648f8aa6da361f1a2f07cf299c98d9be009cc9e1265e606b4ca675e26fe2ea0609dbeab1f51b7452c8da219774454703a892cc SHA512 da9d4fd73386998075dcfda89c6bb522250a7c1836cb708f0163a9cf9d2dead08c2875f50558b0001494b6d8dd455e23e8ba46a6a6c1c38d3a004317f5ceeb54
+EBUILD lxd-4.0.6-r1.ebuild 4147 BLAKE2B dd59abefccdae966cd5b4f02e2a81df39c82208dd4a82dc4e73878bff92c468be8ae07431930e54213e5b5e678ea28320fcce1704d4987c9a2ee3cfe6c988607 SHA512 ab448cf187f384e96f3d763a273905f2dadc6e59a83084c7dd6559f9ae4a561ba14406c93ad40c8327dd21e5f3bb9ac740b9e0b7ea7daa550a3dfc7c0a082350
 MISC metadata.xml 776 BLAKE2B 5f8e6d2639982bf6564567a9775e55b777d4bd9cb01818770b5089071262ceda815e5d94e853b7c08a470234729c08e313685610b3da457a23bb7edbf5b3ff52 SHA512 050d500629b4331f2f8bd2fa5cbcabadc988d737c891edb66ad8b2ee2fd378690b2fee4c70e0b380c2579cb9a39453768242d7acbead4c5390c7f01131b939c0
diff --git a/app-emulation/lxd/lxd-4.0.6-r1.ebuild b/app-emulation/lxd/lxd-4.0.6-r1.ebuild
new file mode 100644
index 000000000000..1a59fbf708cd
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.6-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="app-arch/xz-utils
+	>=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
+	dev-libs/dqlite
+	dev-libs/lzo
+	dev-libs/raft
+	>=dev-util/xdelta-3.0[lzma(+)]
+	net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+	acct-group/lxd
+	net-firewall/ebtables
+	net-firewall/iptables[ipv6?]
+	sys-apps/iproute2[ipv6?]
+	sys-fs/fuse:*
+	sys-fs/lxcfs
+	sys-fs/squashfs-tools[lzma]
+	virtual/acl"
+BDEPEND="dev-lang/go
+	nls? ( sys-devel/gettext )
+	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+	~CGROUPS
+	~IPC_NS
+	~NET_NS
+	~PID_NS
+
+	~SECCOMP
+	~USER_NS
+	~UTS_NS
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+	/usr/bin/lxc
+	/usr/bin/lxc-to-lxd
+	/usr/bin/lxd-agent
+	/usr/bin/lxd-benchmark
+	/usr/bin/lxd-p2c
+	/usr/sbin/lxd"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+	default
+
+	export GOPATH="${S}/_dist"
+
+	sed -i \
+		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
+		-e "s:make:make ${MAKEOPTS}:g" \
+		Makefile || die
+
+	# Fix hardcoded ovmf file path, see bug 763180
+	sed -i \
+		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
+		doc/environment.md \
+		lxd/apparmor/instance_qemu.go \
+		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
+
+	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
+	sed -i \
+		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
+		lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path."
+}
+
+src_configure() { :; }
+
+src_compile() {
+	export GOPATH="${S}/_dist"
+	export GO111MODULE=auto
+
+	cd "${S}" || die
+
+	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
+		go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
+	done
+
+	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
+
+	# Needs to be built statically
+	CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
+	CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	export GO111MODULE=auto
+	export GOPATH="${S}/_dist"
+	go test -v ${EGO_PN}/lxd || die
+}
+
+src_install() {
+	local bindir="_dist/bin"
+	export GOPATH="${S}/_dist"
+
+	dosbin ${bindir}/lxd
+
+	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+		dobin ${bindir}/${l}
+	done
+
+	cd "${S}" || die
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
+	newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
+
+	if use apparmor; then
+		systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service
+	else
+		systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
+	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
+
+	dodoc AUTHORS doc/*
+	use nls && domo po/*.mo
+}
+
+pkg_postinst() {
+	elog
+	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	elog "including a Quick Start."
+	elog
+	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
+	elog
+	optfeature "btrfs storage backend" sys-fs/btrfs-progs
+	optfeature "lvm2 storage backend" sys-fs/lvm2
+	optfeature "zfs storage backend" sys-fs/zfs
+	elog
+	elog "Be sure to add your local user to the lxd group."
+}
diff --git a/app-emulation/lxd/lxd-4.0.6.ebuild b/app-emulation/lxd/lxd-4.0.6.ebuild
deleted file mode 100644
index 92c4ad7891d6..000000000000
--- a/app-emulation/lxd/lxd-4.0.6.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
-	>=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-	dev-libs/dqlite
-	dev-libs/lzo
-	dev-libs/raft
-	net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-	acct-group/lxd
-	net-firewall/ebtables
-	net-firewall/iptables[ipv6?]
-	sys-apps/iproute2[ipv6?]
-	sys-fs/fuse:*
-	sys-fs/lxcfs
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND="dev-lang/go
-	nls? ( sys-devel/gettext )
-	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-	/usr/bin/lxc
-	/usr/bin/lxc-to-lxd
-	/usr/bin/lxd-agent
-	/usr/bin/lxd-benchmark
-	/usr/bin/lxd-p2c
-	/usr/sbin/lxd"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-	default
-
-	export GOPATH="${S}/_dist"
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
-		doc/environment.md \
-		lxd/apparmor/instance_qemu.go \
-		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path."
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export GO111MODULE=auto
-
-	cd "${S}" || die
-
-	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-		go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
-	done
-
-	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	export GO111MODULE=auto
-	export GOPATH="${S}/_dist"
-	go test -v ${EGO_PN}/lxd || die
-}
-
-src_install() {
-	local bindir="_dist/bin"
-	export GOPATH="${S}/_dist"
-
-	dosbin ${bindir}/lxd
-
-	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
-		dobin ${bindir}/${l}
-	done
-
-	cd "${S}" || die
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-	newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
-	if use apparmor; then
-		systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service
-	else
-		systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
-	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
-	dodoc AUTHORS doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-	elog
-	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
-	elog
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the lxd group."
-}
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 3b014716e005..949072d91cb6 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -2,5 +2,5 @@ AUX protontricks-1.5.0_no-setuptools-scm.patch 1321 BLAKE2B d96472bf9b0827cbc6bb
 DIST protontricks-1.5.0.tar.gz 46957 BLAKE2B 622affd9a1bfff3a5cd76fa8e279f25b5c91a6f040b6cc4e5f42e58be08a232fad2be179a47e063b45b1b1bb11b6ae9ce26cce499f4c1dae460be0bb8247e619 SHA512 6df3e0dd638684e70a8d40b7440e2340765109e31dd47fa5e33e4959bc34d3ff4cfa70c8689cafdcce82f1d97ba6d25de724ca7439e5d1ffd634b729ab222716
 DIST protontricks-1.5.2.tar.gz 49590 BLAKE2B 9a4f6b5869d2d23d104c3785a99549e74168d7dea429bed78ed00029ed6431460bab2c8fdd4f3905943b3e93075dea4bc9b0bf472f0044e5cbae3c335d128c12 SHA512 9e57c7ea61ae9a6638ee967041672a85962c9210fe329600bf30ab78f46b2a23cc6f859fb78e50e94686794b3fad81185d83222ca8f67e1dc73b578df7dcd411
 EBUILD protontricks-1.5.0.ebuild 1443 BLAKE2B a64ee0e8679859aa818b2c34e42dadfe9eb194c6f97d526cbc4dec8ff0121598f8fcb9e9a006d694318cfffa4f8040f25dd664c576bdcc7383669c5eb7d71dd4 SHA512 382d6f5fd98f523cf954763c5cb61bc39668af84eff511e38fe867d50d10b1971dbeb047137ecc5ed44f0a0a94eb62db78f38d86841bbb430dc7c657acce5ca2
-EBUILD protontricks-1.5.2.ebuild 1444 BLAKE2B cdb33ec0c2fa7d1c941f478f2613f54da28aac8b075deb185f3e96c294e88f1010f97d4f024fa36954371be55481c88ab4c274c222b1454778c50eeb528ce845 SHA512 d3e7c95a8f9869ce7722514b361f5e663092c5994a14a3e39345bd1b6dc5e13ebe31042767441ec32569cd43ed9129a99231cae52cb280b550817a5f6084018f
+EBUILD protontricks-1.5.2.ebuild 1443 BLAKE2B a64ee0e8679859aa818b2c34e42dadfe9eb194c6f97d526cbc4dec8ff0121598f8fcb9e9a006d694318cfffa4f8040f25dd664c576bdcc7383669c5eb7d71dd4 SHA512 382d6f5fd98f523cf954763c5cb61bc39668af84eff511e38fe867d50d10b1971dbeb047137ecc5ed44f0a0a94eb62db78f38d86841bbb430dc7c657acce5ca2
 MISC metadata.xml 808 BLAKE2B 9abbb6d1689e04026c239dc2bde4a2d975bb260473178e68c0ec3e37a3e4c3e6db701ece9e8551d5ba071db14effc7e59a15a5e13c2049a6cd9d0709562bf709 SHA512 21452c10fe698d461aa814bc1bddb6350fcd8f60b7c84d8949f1eb8a1932ae3f9214c123451334ac2108f6ad930d5e6f5b522eac477ed6f6af1c916326254c32
diff --git a/app-emulation/protontricks/protontricks-1.5.2.ebuild b/app-emulation/protontricks/protontricks-1.5.2.ebuild
index 06e0a22ded68..9db87c7635ec 100644
--- a/app-emulation/protontricks/protontricks-1.5.2.ebuild
+++ b/app-emulation/protontricks/protontricks-1.5.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+gui"
 
 RDEPEND="app-emulation/winetricks
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index e23929d2666f..de666664be77 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,3 +1,4 @@
+AUX wine-staging-6.12-winegcc-equals-args.patch 666 BLAKE2B 1546e146a5942c46c01e72d06693e0875dc84483159a404d1a13824b29e2539f2abe95f2086509de049ef0477a0846be7149e82949f5c55aa5c8da925679773f SHA512 6377b3f86966a19c1129c75da6e2bfdbee2c2ee7d7c38460778239adc01fd56328a20b74b9c73d5b757f0d53abc91bc498d71f988eba316267bb508234a98a8f
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST wine-6.10.tar.xz 24562432 BLAKE2B aeb4efc6fcbdbbbfa71a99112224c77e1da10468e47d49de87ecf06556008e83d6e3d8655fa4439293820663910897d512a77bb78ab771632f893b46745915af SHA512 f0e8f0bdab09c979772965d167d687e88998f3fd6537a592e201a2dc9097552e03b1c413516cc8c82665a8bf17580777f48bd1ed9033641f04e7ef7f0b29cc60
 DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812699f3d804bd3a7d939d099c88c4b19cf8d8e0bbe2463298abe398528c132443350f3d5eba0d23e7a3a2889c SHA512 d041ad99b6311f99df6ef40a64bc393acdc77ad4bf5f28111ebb88c133c3d338aff18f129fb30ae38cca24bf579834d4e6c7d252d5391f35b1ee81a91cc70c21
@@ -9,7 +10,7 @@ DIST wine-staging-6.12.1.tar.gz 9658943 BLAKE2B 9ea46ef75f2fd42790da35631893d634
 DIST wine-staging-6.9.tar.gz 9687986 BLAKE2B 72cf53616a619638fdc91d7501c8fcc2bb9c102a1a445a9c58dd23fbb5bccc27fcf2f9635ec65b23d93839514d8aa9ede29d84d6737e49776a1d99b716295ea4 SHA512 09732ce6fe5e5460ef5f30ab3dd5581c94b27e1d2c228bc395b1defd32fc5e908ab32eb2a56e489b154e1d0f638ad792c80a64d82d90a33c943102b379bef937
 EBUILD wine-staging-6.10.ebuild 21988 BLAKE2B 5ec71d6ed2b25316b5f34f5ea3b04b4ac8e5dd71ac8eecb78dc6b8ea1ad9c3a120ca10bc08055589ef58456acbfbea18002a98dfa05afc7d993881e20ebb9114 SHA512 6d7783fcd3aefb7c034621b239a2a77d43163140c98073703038f878df25dee0aad3de3fcf7fe6eb08ec1a083aeb2b5ea9a5d0e0175ad098522504829b4a402e
 EBUILD wine-staging-6.11.ebuild 21988 BLAKE2B 5ec71d6ed2b25316b5f34f5ea3b04b4ac8e5dd71ac8eecb78dc6b8ea1ad9c3a120ca10bc08055589ef58456acbfbea18002a98dfa05afc7d993881e20ebb9114 SHA512 6d7783fcd3aefb7c034621b239a2a77d43163140c98073703038f878df25dee0aad3de3fcf7fe6eb08ec1a083aeb2b5ea9a5d0e0175ad098522504829b4a402e
-EBUILD wine-staging-6.12.ebuild 21992 BLAKE2B 3020040698a9678a72328287ce335f7523c79108b3abf81bb0555de50cc9135c66c58aa0d68d79a5c9b25f6d7dc30ef53a4f94069ad3d5bacedefab3342af4db SHA512 91e243a045bb8889bfe1115ac1b47059c669a1df5aea6b8ce5f56b00a511ff86be7daf4956828dd343bef635a0a33fcc7405f2ded95641ac98603af7d2af45ed
+EBUILD wine-staging-6.12.ebuild 21984 BLAKE2B b685531dc6e0df7ff9cffedec50a5fc6d2fdd50d8a62c16a5164c1c3c73c23a83a8fa116bc02a2b76c037fbafbbe7e738fb19d93a38dcd2d5743c353fbff8b36 SHA512 a509f03f95b6eebe03eb44ab5b55471722d373f51e27818d6aa565791f0286ecd485b50f12428449b449c5f1716d276b40b55f63d2cdef9226238f0674becefe
 EBUILD wine-staging-6.9.ebuild 21988 BLAKE2B 7f8b7431a69b618ef9202c270d34bc8981555fe27cb29d7447ed447e7d6c42844544bc721bb9439f61b56adad9ffba6c6817d5191cd6991e39e60699839d2dfc SHA512 d0b5e90ff86627bc8e45fe351ac558c8e05e2486b5d4d49187ddee2292d9132541e3bf1341650b4a23c6b0ca1fd1aff1ba566c108491f4e3e3c54fb8cf768d58
-EBUILD wine-staging-9999.ebuild 21988 BLAKE2B 5ec71d6ed2b25316b5f34f5ea3b04b4ac8e5dd71ac8eecb78dc6b8ea1ad9c3a120ca10bc08055589ef58456acbfbea18002a98dfa05afc7d993881e20ebb9114 SHA512 6d7783fcd3aefb7c034621b239a2a77d43163140c98073703038f878df25dee0aad3de3fcf7fe6eb08ec1a083aeb2b5ea9a5d0e0175ad098522504829b4a402e
+EBUILD wine-staging-9999.ebuild 21913 BLAKE2B 99bba8fb8a7e11fba23be040ca3e95595b68f9a16d452d602604c3cbfe495536dd90d59a7a781357bbb4e46977a6bf7a90eae41b2da2a35423b69d7805920051 SHA512 6ba6dea0e8811385d7e9ff5eeb2c6705d238968c9577d5757c3fe2387ca638bdd74d5680e59166b3eb2f32bbffa241cf42f233c31fcb1b6bfe56a501066682aa
 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch b/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch
new file mode 100644
index 000000000000..562b63af063a
--- /dev/null
+++ b/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch
@@ -0,0 +1,13 @@
+https://bugs.winehq.org/show_bug.cgi?id=51413
+https://bugs.gentoo.org/800809
+--- a/tools/winegcc/winegcc.c
++++ b/tools/winegcc/winegcc.c
+@@ -1982,7 +1982,7 @@ int main(int argc, char **argv)
+                     if (strncmp("-Wl,", opts.args->base[i], 4) == 0)
+ 		    {
+                         unsigned int j;
+-                        strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",=");
++                        strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",");
+                         for (j = 0; j < Wl->size; j++)
+                         {
+                             if (!strcmp(Wl->base[j], "--image-base") && j < Wl->size - 1)
diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild b/app-emulation/wine-staging/wine-staging-6.12.ebuild
index 9f66da3e67f9..a2848d52589b 100644
--- a/app-emulation/wine-staging/wine-staging-6.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.12.ebuild
@@ -172,6 +172,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+	"${FILESDIR}/wine-staging-6.12-winegcc-equals-args.patch" #800809
 )
 PATCHES_BIN=()
 
@@ -528,10 +529,9 @@ multilib_src_configure() {
 		$(use_with vaapi va)
 	)
 
-	local PKG_CONFIG AR RANLIB
+	local PKG_CONFIG
 	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
+	tc-export PKG_CONFIG
 
 	if use amd64; then
 		if [[ ${ABI} == amd64 ]]; then
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 5fa927046960..97f1f4176260 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -528,10 +528,9 @@ multilib_src_configure() {
 		$(use_with vaapi va)
 	)
 
-	local PKG_CONFIG AR RANLIB
+	local PKG_CONFIG
 	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
+	tc-export PKG_CONFIG
 
 	if use amd64; then
 		if [[ ${ABI} == amd64 ]]; then
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index c8f09c18d043..5640b2ec087a 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,3 +1,4 @@
+AUX wine-vanilla-6.12-winegcc-equals-args.patch 666 BLAKE2B 1546e146a5942c46c01e72d06693e0875dc84483159a404d1a13824b29e2539f2abe95f2086509de049ef0477a0846be7149e82949f5c55aa5c8da925679773f SHA512 6377b3f86966a19c1129c75da6e2bfdbee2c2ee7d7c38460778239adc01fd56328a20b74b9c73d5b757f0d53abc91bc498d71f988eba316267bb508234a98a8f
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST wine-6.0.1.tar.xz 24210540 BLAKE2B 2075e59024e75594e0be0851db33981ebfcc57477bb9864055a938db0e39b8480f3c501b1d1fc39a9eee52303ad71ef71d24a0fb546697eecf3bb098f13317f1 SHA512 06b720d6adbbb7e2f15b963e4f3f1ff06e6d0d3973064d866ae720e6380bab8881fd1ebf16665435f5f7976b2c6dc72fd20631678a28e9d4d7b068c30cd22bb0
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
@@ -9,7 +10,7 @@ EBUILD wine-vanilla-6.0.1.ebuild 18915 BLAKE2B ecc7a573b29dbd2b9a95cfc04201af9e2
 EBUILD wine-vanilla-6.0.ebuild 18915 BLAKE2B add33613b0e99a5e4418bbaf6bc94bf30720faafd4b3453cab40b8da950ae9d2c0d4c4d6783e2b7d99ff71cdf2f5d87b723179d2bcc41272093c55529b4a8242 SHA512 19f1c7ae827c294ca145c718cf2df9f1a8eb2d7e245fbdb548d7e3fd566df5465d0ec6cc7d6b178589fed8381483d329ff4bbdeac7f13fe76872b404add79710
 EBUILD wine-vanilla-6.10.ebuild 18884 BLAKE2B 99275dd7937942e76730565e3427ac4b64f27515fd57ac65ffb1e8211034e1bbe9c9c5f512ae8bbe1e6424092f03551a40cd3af2fe4ae0cc4746f03023883ec2 SHA512 b7da7b218ca88f8dfbe8e6ad88210b5c142474235b9511c7504e394045dfc1a0815cfe174be214860f37bb613c8ef7c8a435fea32268677cc787d7c4d05b578d
 EBUILD wine-vanilla-6.11.ebuild 18884 BLAKE2B 99275dd7937942e76730565e3427ac4b64f27515fd57ac65ffb1e8211034e1bbe9c9c5f512ae8bbe1e6424092f03551a40cd3af2fe4ae0cc4746f03023883ec2 SHA512 b7da7b218ca88f8dfbe8e6ad88210b5c142474235b9511c7504e394045dfc1a0815cfe174be214860f37bb613c8ef7c8a435fea32268677cc787d7c4d05b578d
-EBUILD wine-vanilla-6.12.ebuild 18884 BLAKE2B 99275dd7937942e76730565e3427ac4b64f27515fd57ac65ffb1e8211034e1bbe9c9c5f512ae8bbe1e6424092f03551a40cd3af2fe4ae0cc4746f03023883ec2 SHA512 b7da7b218ca88f8dfbe8e6ad88210b5c142474235b9511c7504e394045dfc1a0815cfe174be214860f37bb613c8ef7c8a435fea32268677cc787d7c4d05b578d
+EBUILD wine-vanilla-6.12.ebuild 18951 BLAKE2B b39bc16766b5c193b0e5d456c9a3ed98f6ce7b0ec871d2f121cf8a68db7e80113d3f1aee647d988c011b772bf20ccacef11c96d6c570ef7d11f0158b4c599c99 SHA512 cc501e8b8840054a9e771c30c7fe46085f01447b38209f92b7c3763c4ccdece9526d98460cebd07e9cfacbc33435418333f1425aa4da2448b35c717f64719f06
 EBUILD wine-vanilla-6.9.ebuild 18884 BLAKE2B fb3768dde30b6e027b3528cda40b5c9b8917cad36538581025c77340c92ce09a40a07db339a37eef833cf1ba3062396bad4f3da7c1f474416d9c15c774363343 SHA512 e4d61af0bd111d056af52130102c66b0ddde02490777c7140c15452bc0cdf43d6d88480842d0f4b1c5dcb8ceae5f84109d7e5a1df160cf04f33d1a8bb3e3cf08
 EBUILD wine-vanilla-9999.ebuild 18884 BLAKE2B 99275dd7937942e76730565e3427ac4b64f27515fd57ac65ffb1e8211034e1bbe9c9c5f512ae8bbe1e6424092f03551a40cd3af2fe4ae0cc4746f03023883ec2 SHA512 b7da7b218ca88f8dfbe8e6ad88210b5c142474235b9511c7504e394045dfc1a0815cfe174be214860f37bb613c8ef7c8a435fea32268677cc787d7c4d05b578d
 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-6.12-winegcc-equals-args.patch b/app-emulation/wine-vanilla/files/wine-vanilla-6.12-winegcc-equals-args.patch
new file mode 100644
index 000000000000..562b63af063a
--- /dev/null
+++ b/app-emulation/wine-vanilla/files/wine-vanilla-6.12-winegcc-equals-args.patch
@@ -0,0 +1,13 @@
+https://bugs.winehq.org/show_bug.cgi?id=51413
+https://bugs.gentoo.org/800809
+--- a/tools/winegcc/winegcc.c
++++ b/tools/winegcc/winegcc.c
+@@ -1982,7 +1982,7 @@ int main(int argc, char **argv)
+                     if (strncmp("-Wl,", opts.args->base[i], 4) == 0)
+ 		    {
+                         unsigned int j;
+-                        strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",=");
++                        strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",");
+                         for (j = 0; j < Wl->size; j++)
+                         {
+                             if (!strcmp(Wl->base[j], "--image-base") && j < Wl->size - 1)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
index b16b5176cce9..e725ccf27b97 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild
@@ -144,6 +144,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+	"${FILESDIR}/wine-vanilla-6.12-winegcc-equals-args.patch" #800809
 )
 PATCHES_BIN=()
 
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
deleted file mode 100644
index b3b6e9ca814a..000000000000
--- a/app-emulation/xen-pvgrub/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX newlib-implicits.patch 5307 BLAKE2B bf4b9bb51d863815df6e0e4097be224a49ef67d997bee8cf7d7d282f17cd43983058701739c5b3fabbc1f5ce16c8e3962421a1f3a541f6884ccd0fb6e0b53bba SHA512 582cfa36dbb44e8abc83120d44af78a7a7cd3f7a009c65858f3d68276bf5f772b18c4692b7e68202f9ec246e29c785fa111b19bcaefc2f04f429f1b69e77d48f
-AUX xen-4.10-externals.patch 2742 BLAKE2B 286bb4901c2b09728087e804468f75a0b93e705c80d1621b19b01351bc5548fd7303d269e2f2178a5097011cb319d8f0ddb8486d975eabfca274acb1becf6a5f SHA512 25b1b4a731b6903e63f382a7a8db815126cbdb5b8754c7e3bea020152ba1c6174f89878489fa75132eca9ef242a57cb0990eb7d5b9cd5708ad34c97e4c892756
-AUX xen-pvgrub-4.8-jserver.patch 547 BLAKE2B 02539834c0c4d6c5b1d1b2304770bfca6372db20e1b213637f5e9874cb1288c2bb9bac72b5b4c1f97ee2dcc3f9646f4b9408daff2d1b975c2fdefc82f110da2f SHA512 38819b6041d679257a8ebf91f481bf3d9957d3c25ead64725fba9f83fee033235909a8599e986604546008c3077f37db332958fee70eafb4016d723c2e2bfc2a
-DIST grub-0.97.tar.gz 971783 BLAKE2B a7b6feb6dddb6eeb20e027071091b2d37930e5b40687f8c8ff860839db208f832713db61389014d21842e1e152cad0466dc9722a79cbb81bfa1566a30b6b82cc SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
-DIST lwip-1.3.0.tar.gz 398933 BLAKE2B 3567a593eec3d247213daaaab57d9456c9cae50329498ca55cee7726a59461f8e9d77d96cfc8204d6b7b7962f00664f44d3bc7f16a5a53f5e068a02d405fb457 SHA512 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d
-DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac690100ea63aaa4be03b86d12dade238478342514bd083cbc3d27964ac42eb8dae3873fdac5ff2c593fc4fb39b2309 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
-DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
-DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
-DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
-DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6
-DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
-DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
-EBUILD xen-pvgrub-4.13.2.ebuild 4534 BLAKE2B cf49a1dca1498e54e5ee83bb1c2adfaa6ae6e2d1f620b2b0106879a47fe83dad7de8cc00defa73201dff6d24a2f2583164439a519c3b9f19f9802958ecb1d556 SHA512 9fc46f79063d73174457939efb03b08ff47546d5052b047a9424a5f8f6dfde2930aa27f7e7aa813ff6e2f5380e18d0f7fda2eceebb5aceaab7f376b116f4fb4d
-EBUILD xen-pvgrub-4.13.3.ebuild 4535 BLAKE2B 8e01a6a859e56ab00d765dc80734ea1030c38340fc8edf4f59885209a37664356c5382791f920bbdfb2110a6a1bb65d637ff7a3cb05f84b7f917174009008a97 SHA512 e918e0e87a4b066e9f1a28129ba5063e9d7db4df23ce2b0857014413b3c7084afdf53d7e60aa003b121d81f1fb2e6173babfe8a3bdd028e8506f0842a7da659a
-EBUILD xen-pvgrub-4.14.1.ebuild 4537 BLAKE2B 626ef6e6c219b486e50482f03399983b14266409f9287764166ae5f1eb175d5813ad3d4b33c634b652897b84c411b331886eb22dcebe984de35ea570ec000a2a SHA512 46a49ef2d89b16cb045f9070e4d3e6a7c47d1da152c7ef2c888b20078c5463b21a2d57119c9721ff57c65352304de5a601d9ba26da368f2c69170d8b4319c554
-MISC metadata.xml 507 BLAKE2B 8b88290087f82d49524b825bff3b88bb3296b752a8aaa29281918754eed27a75d9213a648e6d0b7abc1f253d2259913449c497fa40aae93e1fdfa53d6105422c SHA512 d019d0c6553ebe58679dc42634e6327ced58e73a0cbe7d5b3cd70f20b689f3042b337700cb57f2ee5a5326b6195d5cca7e5a5d48c297888f226cd8b3e7dae79c
diff --git a/app-emulation/xen-pvgrub/files/newlib-implicits.patch b/app-emulation/xen-pvgrub/files/newlib-implicits.patch
deleted file mode 100644
index 73c04931b31d..000000000000
--- a/app-emulation/xen-pvgrub/files/newlib-implicits.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -ur newlib-1.16.0.orig/newlib/libc/stdlib/wcstoull.c newlib-1.16.0/newlib/libc/stdlib/wcstoull.c
---- newlib/libc/stdlib/wcstoull.c	2007-07-07 04:03:28.000000000 +0800
-+++ newlib/libc/stdlib/wcstoull.c	2012-12-02 14:19:40.905136553 +0800
-@@ -124,7 +124,7 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <reent.h>
--
-+#include <wchar.h>
- #ifndef _REENT_ONLY
- 
- unsigned long long
-diff -ur newlib-1.16.0.orig/newlib/doc/makedoc.c 
-newlib-1.16.0/newlib/doc/makedoc.c
---- newlib/doc/makedoc.c	2007-01-03 01:59:59.000000000 +0900
-+++ newlib/doc/makedoc.c	2012-12-02 16:53:42.700289294 +0800
-@@ -39,7 +39,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <ctype.h>
--
-+#include <string.h>
- #define DEF_SIZE 5000
- #define STACK 50
- 
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/lseek64r.c newlib-1.16.0/newlib/libc/reent/lseek64r.c
---- newlib/libc/reent/lseek64r.c	2003-06-04 03:48:07.000000000 +0800
-+++ newlib/libc/reent/lseek64r.c	2012-12-02 18:29:45.435760985 +0800
-@@ -1,8 +1,8 @@
- /* Reentrant versions of lseek system call. */
-
--#include <reent.h>
-+#include "../include/reent.h"
- #include <unistd.h>
--#include <_syslist.h>
-+#include "../include/_syslist.h"
-
- /* Some targets provides their own versions of this functions.  Those
-    targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
-diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/fseeko64.c newlib-1.16.0/newlib/libc/stdio64/fseeko64.c
---- newlib/libc/stdio64/fseeko64.c	2007-07-14 04:37:53.000000000 +0800
-+++ newlib/libc/stdio64/fseeko64.c	2012-12-02 18:26:29.955778906 +0800
-@@ -119,7 +119,7 @@
- 	  ptr->_errno = EOVERFLOW;
- 	  return EOF;
- 	}
--      return (_off64_t) _fseeko_r (ptr, fp, offset, whence);
-+      return (_off64_t) _fseeko64_r (ptr, fp, offset, whence);
-     }
- 
-   /* Make sure stdio is set up.  */
-
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/fstat64r.c newlib-1.16.0/newlib/libc/reent/fstat64r.c
---- newlib/libc/reent/fstat64r.c	2012-12-03 13:17:26.569703981 +0800
-+++ newlib/libc/reent/fstat64r.c	2003-06-04 03:48:07.000000000 +0800
-@@ -1,10 +1,10 @@
- /* Reentrant versions of fstat system call.  This implementation just
-    calls the fstat system call.  */
- 
--#include <reent.h>
-+#include "../include/reent.h">
- #include <unistd.h>
- #include <sys/stat.h>
--#include <_syslist.h>
-+#include "../include/_syslist.h"
- 
- #ifdef __LARGE64_FILES
- 
-diff -ur newlib-1.16.0.orig/libgloss/i386/cygmon-gmon.c newlib-1.16.0/libgloss/i386/cygmon-gmon.c
---- libgloss/i386/cygmon-gmon.c	2002-10-26 03:18:46.000000000 +0800
-+++ libgloss/i386/cygmon-gmon.c	2012-12-03 14:38:41.454257066 +0800
-@@ -68,6 +68,9 @@
- 
- #include "cygmon-gmon.h"
-
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <strings.h>
- /*
-  *	froms is actually a bunch of unsigned shorts indexing tos
- */
-@@ -78,6 +78,8 @@
- static char		*s_lowpc = 0;
- static char		*s_highpc = 0;
- static unsigned long	s_textsize = 0;
-+extern void profil_write(int, char*, int);
-+extern int moncontrol (int);
- 
- static int	ssiz;
- static char	*sbuf;
-diff -ur newlib-1.16.0.orig/newlib/libc/include/_syslist.h 
-newlib-1.16.0/newlib/libc/include/_syslist.h
---- newlib/libc/include/_syslist.h   2005-08-23 05:13:35.000000000 +0800
-+++ newlib/libc/include/_syslist.h        2012-12-03 17:20:03.092369483 +0800
-@@ -2,6 +2,7 @@
-    and only provide C names, so that we end up in violation of ANSI */
- #ifndef __SYSLIST_H
- #define __SYSLIST_H
-+#include <sys/types.h>
-
- #ifdef MISSING_SYSCALL_NAMES
- #define _close close
-
-#diff -ur newlib-1.16.0.orig/newlib/libc/Makefile.in newlib-1.16.0/newlib/libc/Makefile.in
-#--- newlib/libc/Makefile.in	2007-05-25 01:33:30.000000000 +0800
-#+++ newlib/libc/Makefile.in	2012-12-03 21:52:05.621873084 +0800
-diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/ftello64.c newlib-1.16.0/newlib/libc/stdio64/ftello64.c
---- newlib/libc/stdio64/ftello64.c	2007-07-14 04:37:53.000000000 +0800
-+++ newlib/libc/stdio64/ftello64.c	2012-12-04 18:34:46.491509484 +0800
-@@ -93,7 +93,7 @@
- 
-   /* Only do 64-bit tell on large file.  */
-   if (!(fp->_flags & __SL64))
--    return (_off64_t) _ftello_r (ptr, fp);
-+    return (_off64_t) _ftello64_r (ptr, fp);
- 
-   /* Ensure stdio is set up.  */
- 
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/open64r.c newlib-1.16.0/newlib/libc/reent/open64r.c
---- newlib/libc/reent/open64r.c	2002-08-27 02:56:06.000000000 +0800
-+++ newlib/libc/reent/open64r.c	2012-12-04 20:06:10.044006769 +0800
-@@ -1,8 +1,8 @@
- /* Reentrant versions of open system call. */
-
--#include <reent.h>
-+#include "../include/reent.h">
- #include <unistd.h>
--#include <fcntl.h>
-+#include <sys/_default_fcntl.h>
- #include <_syslist.h>
- 
- #ifdef __LARGE64_FILES
-diff -ur newlib-1.16.0.orig/newlib/libc/reent/signalr.c newlib-1.16.0/newlib/libc/reent/signalr.c
---- newlib/libc/reent/signalr.c 2012-12-05 07:33:25.623393126 +0800
-+++ newlib/libc/reent/signalr.c 2012-12-05 07:34:03.943389613 +0800
-@@ -1,10 +1,10 @@
- /* Reentrant versions of syscalls need to support signal/raise.
-    These implementations just call the usual system calls.  */
-
--#include <reent.h>
-+#include "../include/reent.h"
- #include <signal.h>
- #include <unistd.h>
--#include <_syslist.h>
-+#include "../include/_syslist.h"
-
- /* Some targets provides their own versions of these functions.  Those
-    targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
-
diff --git a/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch
deleted file mode 100644
index b206144e304e..000000000000
--- a/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/stubdom/Makefile	2013-07-09 18:46:56.000000000 +0800
-+++ b/stubdom/Makefile	2013-07-21 16:07:08.094663570 +0800
-@@ -68,12 +68,12 @@
- ##############
- 
- newlib-$(NEWLIB_VERSION).tar.gz:
--	$(FETCHER) $@ $(NEWLIB_URL)/$@
- 
- newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
- 	tar xzf $<
- 	patch -d $@ -p0 < newlib.patch
- 	patch -d $@ -p0 < newlib-chk.patch
-+	patch -d $@ -p0 < newlib-implicits.patch
- 	patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
- 	find $@ -type f | xargs perl -i.bak \
- 		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
-@@ -85,7 +85,7 @@
- $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
- 	mkdir -p newlib-$(XEN_TARGET_ARCH)
- 	( cd newlib-$(XEN_TARGET_ARCH) && \
--	  CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
-+	CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
- 	  $(MAKE) DESTDIR= && \
- 	  $(MAKE) DESTDIR= install )
- 
-@@ -94,7 +94,6 @@
- ############
- 
- zlib-$(ZLIB_VERSION).tar.gz:
--	$(FETCHER) $@ $(ZLIB_URL)/$@
- 
- zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz 
- 	tar xzf $<
-@@ -105,7 +104,7 @@
- cross-zlib: $(ZLIB_STAMPFILE)
- $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
- 	( cd $< && \
--	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
-+	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
- 	  $(MAKE) DESTDIR= libz.a && \
- 	  $(MAKE) DESTDIR= install )
- 
-@@ -114,7 +113,6 @@
- ##############
- 
- pciutils-$(LIBPCI_VERSION).tar.bz2:
--	$(FETCHER) $@ $(LIBPCI_URL)/$@
- 
- pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
- 	tar xjf $<
-@@ -142,7 +140,6 @@
- ######
- 
- lwip-$(LWIP_VERSION).tar.gz:
--	$(FETCHER) $@ $(LWIP_URL)/$@
- 
- lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
- 	tar xzf $<
-@@ -180,7 +177,6 @@
- # cross-polarssl
- #############
- polarssl-$(POLARSSL_VERSION)-gpl.tgz:
--	$(FETCHER) $@ $(POLARSSL_URL)/$@
- 
- polarssl-$(XEN_TARGET_ARCH): polarssl-$(POLARSSL_VERSION)-gpl.tgz
- 	tar xzf $<
-@@ -385,7 +382,6 @@
- ######
- 
- grub-$(GRUB_VERSION).tar.gz:
--	$(FETCHER) $@ $(GRUB_URL)/$@
- 
- grub-upstream: grub-$(GRUB_VERSION).tar.gz
- 	tar xzf $<
diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch
deleted file mode 100644
index aebc1ee5926e..000000000000
--- a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tools/firmware/vgabios/Makefile b/tools/firmware/vgabios/Makefile
-index 3284812..ef242b3 100644
---- a/tools/firmware/vgabios/Makefile
-+++ b/tools/firmware/vgabios/Makefile
-@@ -30,7 +30,7 @@ distclean: clean
- 
- .PHONY: release
- release: 
--	VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios
-+	VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" $(MAKE) bios cirrus-bios
- 	/bin/rm -f  *.o *.s *.ld86 \
-           temp.awk.* vgabios.*.orig _vgabios_.*.c core *.bak .#*
- 	cp VGABIOS-lgpl-latest.bin ../$(RELEASE).bin
diff --git a/app-emulation/xen-pvgrub/metadata.xml b/app-emulation/xen-pvgrub/metadata.xml
deleted file mode 100644
index d1684666642f..000000000000
--- a/app-emulation/xen-pvgrub/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>hydrapolic@gmail.com</email>
-		<name>Tomáš Mózes</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>xen@gentoo.org</email>
-		<name>Gentoo Xen Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild
deleted file mode 100644
index 2d85b41833fc..000000000000
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE='xml,threads(+)'
-
-inherit flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=https://alpha.gnu.org/gnu/grub
-
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="
-		https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-		$GRUB_URL/grub-0.97.tar.gz
-		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
-		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
-		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
-		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
-		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
-		${UPSTREAM_PATCHSET_URI}"
-
-S="${WORKDIR}/xen-${MY_PV}"
-
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext
-	sys-devel/bin86
-	sys-apps/texinfo
-	x11-libs/pixman"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-emulation/xen-tools-${PV}"
-
-# python2 only
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-retar-externals() {
-	# Purely to unclutter src_prepare
-	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
-
-	# eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
-	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
-		-i "${WORKDIR}"/zlib-1.2.3/configure || die
-	sed -e 's:^AR=ar rc:AR=ar:' \
-		-e s':$(AR) $@:$(AR) rc $@:' \
-		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die
-	einfo "zlib Makefile edited"
-
-	cd "${WORKDIR}" || die
-	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die
-	tar czp grub-0.97 -f grub-0.97.tar.gz || die
-	tar czp lwip -f lwip-1.3.0.tar.gz || die
-	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die
-	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die
-	mv $set "${S}"/stubdom/ || die
-	einfo "tarballs moved to source"
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
-	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
-
-	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
-	eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
-
-	# fix jobserver in Makefile
-	eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
-
-	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
-	retar-externals || die "re-tar procedure failed"
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
-
-	if use x86; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-	elif use amd64; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
-		if has_multilib_profile; then
-			multilib_toolchain_setup x86
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-		fi
-	fi
-}
-
-src_install() {
-	if use x86; then
-		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-	fi
-	if use amd64; then
-		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
-		if has_multilib_profile; then
-			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.3.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.3.ebuild
deleted file mode 100644
index 18c5c56da87c..000000000000
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.3.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='xml,threads(+)'
-
-inherit flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=https://alpha.gnu.org/gnu/grub
-
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="
-		https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-		$GRUB_URL/grub-0.97.tar.gz
-		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
-		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
-		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
-		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
-		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
-		${UPSTREAM_PATCHSET_URI}"
-
-S="${WORKDIR}/xen-${MY_PV}"
-
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext
-	sys-devel/bin86
-	sys-apps/texinfo
-	x11-libs/pixman"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-emulation/xen-tools-${PV}"
-
-# python2 only
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-retar-externals() {
-	# Purely to unclutter src_prepare
-	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
-
-	# eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
-	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
-		-i "${WORKDIR}"/zlib-1.2.3/configure || die
-	sed -e 's:^AR=ar rc:AR=ar:' \
-		-e s':$(AR) $@:$(AR) rc $@:' \
-		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die
-	einfo "zlib Makefile edited"
-
-	cd "${WORKDIR}" || die
-	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die
-	tar czp grub-0.97 -f grub-0.97.tar.gz || die
-	tar czp lwip -f lwip-1.3.0.tar.gz || die
-	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die
-	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die
-	mv $set "${S}"/stubdom/ || die
-	einfo "tarballs moved to source"
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
-	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
-
-	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
-	eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
-
-	# fix jobserver in Makefile
-	eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
-
-	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
-	retar-externals || die "re-tar procedure failed"
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
-
-	if use x86; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-	elif use amd64; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
-		if has_multilib_profile; then
-			multilib_toolchain_setup x86
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-		fi
-	fi
-}
-
-src_install() {
-	if use x86; then
-		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-	fi
-	if use amd64; then
-		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
-		if has_multilib_profile; then
-			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
deleted file mode 100644
index 5b25c3a3ccee..000000000000
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE='xml,threads(+)'
-
-inherit flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=https://alpha.gnu.org/gnu/grub
-
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="
-		https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-		$GRUB_URL/grub-0.97.tar.gz
-		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
-		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
-		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
-		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
-		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
-		${UPSTREAM_PATCHSET_URI}"
-
-S="${WORKDIR}/xen-${MY_PV}"
-
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext
-	sys-devel/bin86
-	sys-apps/texinfo
-	x11-libs/pixman"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-emulation/xen-tools-${PV}"
-
-# python2 only
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-retar-externals() {
-	# Purely to unclutter src_prepare
-	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
-
-	# eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
-	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
-		-i "${WORKDIR}"/zlib-1.2.3/configure || die
-	sed -e 's:^AR=ar rc:AR=ar:' \
-		-e s':$(AR) $@:$(AR) rc $@:' \
-		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die
-	einfo "zlib Makefile edited"
-
-	cd "${WORKDIR}" || die
-	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die
-	tar czp grub-0.97 -f grub-0.97.tar.gz || die
-	tar czp lwip -f lwip-1.3.0.tar.gz || die
-	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die
-	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die
-	mv $set "${S}"/stubdom/ || die
-	einfo "tarballs moved to source"
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
-	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
-
-	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
-	eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
-
-	# fix jobserver in Makefile
-	eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
-
-	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
-	retar-externals || die "re-tar procedure failed"
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
-
-	if use x86; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-	elif use amd64; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
-		if has_multilib_profile; then
-			multilib_toolchain_setup x86
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-		fi
-	fi
-}
-
-src_install() {
-	if use x86; then
-		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-	fi
-	if use amd64; then
-		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
-		if has_multilib_profile; then
-			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 9f08c21576a2..fb0302693cee 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,6 +1,7 @@
-AUX gentoo-patches.conf 2660 BLAKE2B 5ac5e031abbf9572db5df02d4c07b297e1c29020a9db56a5e1e542dc51db45fd2f0ac0ac8c3278cb87f2380c1164bce156d9f71af7395e56eb7396477665271c SHA512 65424ce9cafe200b9f94fa361cd0fe1840697376b866c1a10aeff2955ef4e032b0eebe4e5ea96d64de045084ec46832d80b4c375cc79a5e3558e97b8f7d4df7b
+AUX gentoo-patches.conf 2502 BLAKE2B 05b4fdbd2715099c6ef9bd988112614b518700a3b7bdd0190488ae9d602e1323e6a9ba2335790ace96390f3db8de243f53f20726ddc5df5939943fcbc7eeac2c SHA512 7c8735a4ef6a21caa62363bcbdc93783f9c56524a93572d587e94c5e3a42e687999f4239c284d81b57d2abdd51e2ec7f69367f171adef4d62c3f7bfef09b7b69
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
+AUX xen-tools-4.15.0-fix-xenstat-python-bindings.patch 850 BLAKE2B e0150d32e01ddda954b97eee9d4f0df97f01b710193e803c7db08776bee71b8a05b78ab1bec858c69834a3b61a7562dd25b6c78ad49dc9d5a68109ad171d17b7 SHA512 25df248f40d37be130f8601d5b7a0e21562c31e9d4e4b65af632048e7b29d63397434ce45afeee0eeb6686ed43f7b659427ca6e151cbd17007798058917abd7c
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
 AUX xencommons.confd 109 BLAKE2B 6a2023a95cd1e411abe57c321e1c5f13096b51299817ce547e8ff042cbdbf859a5c1f50135e946fe650e0ec9221db3389ff50bc23f6d88d0c0fd1805b64786be SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17
 AUX xencommons.initd 1451 BLAKE2B ef0cfa4fc7c4071b7a5822f4ad8983b9f7c386505e8b6967139c8921b002ff03a0a2be235060160d00d3890cffd15300b588c2b06a67a839df110c3737bbaee5 SHA512 1d25ae65ff073a5fc00aed2011af9e38f53d179dfadd06f791a4599c070a5ddbbf75d80b37e219b6de5d09e3466510c241311cbb018ef22cd3c97ce3b7c15b3c
@@ -17,18 +18,13 @@ DIST OpenSSL_1_1_1g.tar.gz 9975550 BLAKE2B 22efa4ffe5d56a861bc4e2e1bc9a558e79265
 DIST berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 148741 BLAKE2B 72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e999936552d09bbc733ab66c92968bd31 SHA512 8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
 DIST edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz 13192042 BLAKE2B 81afa7fd5f6f14fff35baa3c6c64583fa21c7b793ed847a3362fd05a926bb4402db911f9f78f4ffd76a6de9b815171dfa245ae41afac3b022cd108597e8c1ac3 SHA512 a032a1496db7ddc32a7d6d1a7d5fe4122ab43b13547ec019855166d785f162268ad82ceb3c41efafe1687e73fc72599ee6852741652451e1cb329fd655c69b6c
-DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b95266ec7fcee5c27065ba999b023ded9eb42a3690555e626911493f1dc995927fa67071bdc6432b3995df82134f8c49ea0d72eaf407f455dd1e2675d5b8d844 SHA512 8120696ba6d79fd9189664deed9b0489825d8d1edf7b931023b3979b7b9f82248e5b808c4517036cd40a85442ddf51a8dcad3b05d7f3c3cc6650654d53da4050
 DIST ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz 3931642 BLAKE2B bf0b5d9ea1d44803bc5c4aa0bf9188636e292b226ab759f32e3c2bfa3f80dd3f546526b9a11c1f67193793ede5309bfa67bdce80aba62ccca54597dc6e7e4ba4 SHA512 0a63f83c9135d05c6bfe7c4d12da3ff76271e35305a4d5654bd5aefa9ee59f5363546c65820c42133deb0fb5a0a0bcaa9b1c48396f9f996acea0d492a5f03f33
-DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
-DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6
 DIST xen-4.14.2-upstream-patches-0.tar.xz 23304 BLAKE2B 954e0a49e5c3ec122aefe52afe328f440b8a4c8db966e0fa91e0b6d6cb3c0462b75fb99b3e7392811bd2e680cd7945e8a4d68317245fd42fdf0ad6cab33fbc68 SHA512 64d243f0c8acfec87812e4d78e3d8b24a86315824853f4f3b17122b7119425d180650695bc12e1a30f5b30c6ef684be7c08b2bc677ca2f0668d0335d92e2bf78
 DIST xen-4.14.2.tar.gz 39973157 BLAKE2B db5d3570f79e0fd97872f5e5dd57a4eb39e005728387bfef3b51fabe1c693cfd8108d09b1026f5a5a7eb79de71be6f4af36d252f7e0b35a65a1567b7949e3e29 SHA512 83c9333b70dbee3e29c6bf08e5ad030676e6c4a32b976f3f5e6a8f8d0dd9e4898bac88dd8e1c9d2ad3509cebb5d212e1745f9392a469d7afeb841d79801ccf39
 DIST xen-4.15.0-upstream-patches-1.tar.xz 35180 BLAKE2B eb3b2a44b717a04daa4a2f158040cce78b42cba5a72c437d7b2f8f1237b808f6f13c2140d82e95056818db6c0eb706ebd7dead822a6a4e689e5d5e7c83523fdb SHA512 a7cfe2dbc82b15c48fa781a77b3ca1622fc2feac3874bf17cf56e82be46e9817913f94992e0e1a1cd2be2e719d4abb9a15744c8a1017e30c0d5c01d7db64dbb5
 DIST xen-4.15.0.tar.gz 40785399 BLAKE2B 8b0530f5516c39656506f4bb705952da0555a8ab7f47323473b171caeb7692f3107e9d94f13171d40576600064589eed35f4d210af02db4cc4706dd4fc202100 SHA512 93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7
-DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
 DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49
-EBUILD xen-tools-4.13.3-r1.ebuild 16771 BLAKE2B 702c2dabd243882ae7f6e9799bb61bd4562fff638c402ff2f0b94916a2a160f71b8b571346bec95061ef541af534a52432bf79091ab93f59a03e954ae3094728 SHA512 197047822f855ce583d61eb57be28547764e5a7d16fefd719fe724a5bdc5b4d857a29fccbe7c2d3e7e5c501412c634082ffe235b3554e32ecc967c225ec5579d
 EBUILD xen-tools-4.14.2-r1.ebuild 16912 BLAKE2B d10c3a4781ab7b5d459d086c103231c2b62dc17952cc6a60872488bc392d728c5476f87235292febf4ee3ae3fcdc0858624d0560749c3f4c253b784499e5c3c0 SHA512 54c40a7e8b588b666e110311c5e248cc3751c02f8815a51e2d922c602379d1626a29c965ed1464beeecb534728a1092e0b9c71ae90e87ccad4aa6a01138f662e
-EBUILD xen-tools-4.15.0-r1.ebuild 17080 BLAKE2B 37357d8bb055e4aa3ca97da7bccc119f42e4df73d79dfd11a7dba48f8cd62c9d56fbd028758c234e64a3c954459be2ccf8852e7b8fffad6ce721fcb3c9bbda6e SHA512 9cc5aa6d8cbd75b2a5245e5d6e3ab82629e6d7bd984f289a94c17a11085aa27576da4e6d3410dd92ebbc6cbad29ee23929f785aebe357c4bced513d3164b1340
+EBUILD xen-tools-4.15.0-r2.ebuild 17101 BLAKE2B 2b1543f54f21226d068620f6cb61cb2de89d90a5ea1a5708d1a4900175d02837c6f778b6e2946750f3b077dcc92dfa62bd9ac861f0e70c7566a3c51e29403348 SHA512 fb9548e1c484d271acb8d5bd7f0215febe1c912923f727ef818ba5bd67b9150f3f510252c5f8b3f2060e4409bedcc676bb81f47a763356cc9fda5d1d66b9cb9b
 MISC metadata.xml 1626 BLAKE2B 64ae7edd26ed6c4fc3777d042dc16b7848b52d5915ce6fc024cbd3b773301ff308b364e993750153bbcd8bb92d11d3d3fbbcc923f71464924e2fddcbbb7081b9 SHA512 d703b590e650ea9e8c2d70fd118c0c1420b2a90d799669ebe32f94e552888e9f9fbda7a0a06f158fe83615e0251559ebb1c3bb475f80efd11f5ba1d50e635299
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 4b1aac4eae65..d8c6e67b10c3 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -51,16 +51,6 @@ _gx056=" xen-tools-4.12.2-libxenstat-makefile.patch"
 # Fix building with gcc 10, bug #722930
 _gx060=" xen-tools-4.13.0-gcc10.patch"
 
-# xen-tools-4.13.3 patches set
-_gpv_xen_tools_4133_0="
-${_gx038}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037}
-${_gx053} ${_gx050} ${_gx051}
-${_gx054} ${_gx056}
-"
-
 # xen-tools-4.14.2 patches set
 _gpv_xen_tools_4142_0="
 	xen-tools-4.12.0-gcc8.patch
diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch b/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch
new file mode 100644
index 000000000000..3547b7346eed
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch
@@ -0,0 +1,18 @@
+--- a/tools/libs/stat/Makefile  2021-07-01 19:32:50.696318503 +0200
++++ b/tools/libs/stat/Makefile  2021-07-01 00:16:15.102473301 +0200
+@@ -51,12 +51,13 @@
+ .PHONY: uninstall-bindings
+ uninstall-bindings: uninstall-perl-bindings uninstall-python-bindings
+ 
+-$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) include/xenstat.h
++$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) ../../include/xenstat.h
+ 
+-SWIG_FLAGS=-module xenstat -Iinclude -I.
++SWIG_FLAGS=-module xenstat -Iinclude -I. -I../../include/
+ 
+ # Python bindings
+ PYTHON_FLAGS=`$(PYTHON) -c 'import distutils.sysconfig; print("-I" + distutils.sysconfig.get_python_inc(True) + " " + distutils.sysconfig.get_config_var("BLDLIBRARY"))'`
++PYTHON_FLAGS+=-Wno-error=missing-prototypes -fPIC -lxenstat
+ $(PYMOD): $(PYSRC)
+ $(PYSRC): bindings/swig/xenstat.i
+        swig -python $(SWIG_FLAGS) -outdir $(@D) -o $(PYSRC) $<
diff --git a/app-emulation/xen-tools/xen-tools-4.13.3-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.13.3-r1.ebuild
deleted file mode 100644
index 56e600d9a968..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.13.3-r1.ebuild
+++ /dev/null
@@ -1,520 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	UPSTREAM_VER=
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=21
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=
-
-	SEABIOS_VER="1.12.0"
-	EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
-	EDK2_OPENSSL_VERSION="1_1_1g"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-	IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.11
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
-	')
-	x86? ( sys-devel/dev86
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		sys-power/iasl )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-power/iasl
-		system-seabios? ( sys-firmware/seabios )
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		')
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		x11-libs/pixman
-		sdl? (
-			media-libs/libsdl[X]
-			media-libs/libsdl2[X]
-		)
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )
-	python? ( >=dev-lang/swig-4.0.0 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/elf2dmp
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-edid
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/edk2-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
-
-		# gcc 10
-		cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
-		echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		-i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	# disable jpeg automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
-		-i tools/Makefile || die
-
-	# disable png automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
-		-i tools/Makefile || die
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--localstatedir=${EPREFIX}/var \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_enable api xenapi) \
-		$(use_enable ipxe) \
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
-		$(use_enable ocaml ocamltools) \
-		$(use_enable ovmf) \
-		$(use_enable pam) \
-		$(use_enable rombios) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
-	use amd64 && myconf+=" $(use_enable qemu-traditional)"
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-
-	if use python; then
-		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
-		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
-	fi
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config system at boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.15.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.15.0-r1.ebuild
deleted file mode 100644
index c062f81eb418..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.15.0-r1.ebuild
+++ /dev/null
@@ -1,532 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=1
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=23
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=
-
-	SEABIOS_VER="1.14.0"
-	EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
-	EDK2_OPENSSL_VERSION="1_1_1g"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-	IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c"
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-misc/pax-utils
-	dev-lang/perl
-	>=sys-kernel/linux-headers-4.11
-	x11-libs/pixman
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
-	')
-	x86? ( sys-devel/dev86
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		sys-power/iasl )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-power/iasl
-		system-seabios? ( sys-firmware/seabios )
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		')
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		sdl? (
-			media-libs/libsdl[X]
-			media-libs/libsdl2[X]
-		)
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )
-	python? ( >=dev-lang/swig-4.0.0 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/libexec/xen/boot/xen-shim
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/elf2dmp
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-edid
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-storage-daemon
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/boot/xen-shim
-	usr/libexec/xen/libexec/qemu-pr-helper
-	usr/libexec/xen/libexec/virtfs-proxy-helper
-	usr/libexec/xen/libexec/virtiofsd
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/edk2-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
-
-		# gcc 11
-		cp "${WORKDIR}/patches-gentoo/${P}-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
-		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		-i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	# disable jpeg automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
-		-i tools/Makefile || die
-
-	# disable png automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
-		-i tools/Makefile || die
-
-	# disable docker (Bug #732970)
-	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
-		-i tools/Makefile || die
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--localstatedir=${EPREFIX}/var \
-		--disable-golang \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_enable api xenapi) \
-		$(use_enable ipxe) \
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
-		$(use_enable ocaml ocamltools) \
-		$(use_enable ovmf) \
-		$(use_enable pam) \
-		$(use_enable rombios) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
-	use amd64 && myconf+=" $(use_enable qemu-traditional)"
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	# Currently broken
-	#use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-
-	# Currently broken
-	#if use python; then
-		#python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
-		#python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
-	#fi
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config system at boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.15.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.15.0-r2.ebuild
new file mode 100644
index 000000000000..af982d2bd20a
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.15.0-r2.ebuild
@@ -0,0 +1,532 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=1
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=23
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=
+
+	SEABIOS_VER="1.14.0"
+	EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
+	EDK2_OPENSSL_VERSION="1_1_1g"
+	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c"
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-misc/pax-utils
+	dev-lang/perl
+	>=sys-kernel/linux-headers-4.11
+	x11-libs/pixman
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		sdl? (
+			media-libs/libsdl[X]
+			media-libs/libsdl2[X]
+		)
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )
+	python? ( >=dev-lang/swig-4.0.0 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/libexec/xen/boot/xen-shim
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/elf2dmp
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-edid
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-storage-daemon
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/boot/xen-shim
+	usr/libexec/xen/libexec/qemu-pr-helper
+	usr/libexec/xen/libexec/virtfs-proxy-helper
+	usr/libexec/xen/libexec/virtiofsd
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-fix-xenstat-python-bindings.patch" )
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/edk2-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+
+		# gcc 11
+		cp "${WORKDIR}/patches-gentoo/${P}-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
+		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		-i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	# disable jpeg automagic
+	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
+		-i tools/Makefile || die
+
+	# disable png automagic
+	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
+		-i tools/Makefile || die
+
+	# disable docker (Bug #732970)
+	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
+		-i tools/Makefile || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-golang \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable api xenapi) \
+		$(use_enable ipxe) \
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+		$(use_enable ocaml ocamltools) \
+		$(use_enable ovmf) \
+		$(use_enable pam) \
+		$(use_enable rombios) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+
+	if use python; then
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
+	fi
+
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config system at boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 145a2350c53d..4a5bdc20bfb1 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,12 +1,10 @@
 AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3f1c0d4bf9733189808f5e1c47f1d90d1784f17fa52ca1626972c81d20c5e1ee3d42d082cdefcf67eb8dc SHA512 17208dc107f4ae4c5ec226c2ac05126817134fb6084cd8923204dc1b014e645e12c34cd11296319127e595ccbf17747931e9df78218bf49814f66e3cc6a789fd
 AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
 AUX xen-4.15-efi.patch 2181 BLAKE2B a06b944dea37c3dfdbe4344191ec4a286348f46bcccf1b5a75f061e55b961d767972456803b8c9aa15120b2b2497651495e903925bf93b04c483e0713d9117a9 SHA512 7ec52fc65b5b8a22877c941f0ab6f249ba1d7b40ad7d50d8f0ac793069cc0eb85b1e5394ce81adf60fa23b01ecc8ce983e6c508b8e0d22189dc46e2c1ad8c1b4
-DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6
 DIST xen-4.14.2-upstream-patches-0.tar.xz 23304 BLAKE2B 954e0a49e5c3ec122aefe52afe328f440b8a4c8db966e0fa91e0b6d6cb3c0462b75fb99b3e7392811bd2e680cd7945e8a4d68317245fd42fdf0ad6cab33fbc68 SHA512 64d243f0c8acfec87812e4d78e3d8b24a86315824853f4f3b17122b7119425d180650695bc12e1a30f5b30c6ef684be7c08b2bc677ca2f0668d0335d92e2bf78
 DIST xen-4.14.2.tar.gz 39973157 BLAKE2B db5d3570f79e0fd97872f5e5dd57a4eb39e005728387bfef3b51fabe1c693cfd8108d09b1026f5a5a7eb79de71be6f4af36d252f7e0b35a65a1567b7949e3e29 SHA512 83c9333b70dbee3e29c6bf08e5ad030676e6c4a32b976f3f5e6a8f8d0dd9e4898bac88dd8e1c9d2ad3509cebb5d212e1745f9392a469d7afeb841d79801ccf39
 DIST xen-4.15.0-upstream-patches-1.tar.xz 35180 BLAKE2B eb3b2a44b717a04daa4a2f158040cce78b42cba5a72c437d7b2f8f1237b808f6f13c2140d82e95056818db6c0eb706ebd7dead822a6a4e689e5d5e7c83523fdb SHA512 a7cfe2dbc82b15c48fa781a77b3ca1622fc2feac3874bf17cf56e82be46e9817913f94992e0e1a1cd2be2e719d4abb9a15744c8a1017e30c0d5c01d7db64dbb5
 DIST xen-4.15.0.tar.gz 40785399 BLAKE2B 8b0530f5516c39656506f4bb705952da0555a8ab7f47323473b171caeb7692f3107e9d94f13171d40576600064589eed35f4d210af02db4cc4706dd4fc202100 SHA512 93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7
-EBUILD xen-4.13.3.ebuild 4461 BLAKE2B da41c70eb656b08ed46b7f6147c6b2d4b68368a0c3b0fe0bcb35d5ac279007158420b1035dc0ba6ab37565dc5345062bcb3689d932bed686bb240e06ac255ea8 SHA512 fbbb200018af4aa700e27890eff7d949f47c60187d815dd682f093b2364c78e33d194c5e66c19be09cb3f5d5be91f61e5c47782b3bfaab94aa3a29e572b22fe8
 EBUILD xen-4.14.2-r1.ebuild 4592 BLAKE2B a2864d4f2deab4f806b673a0e129bcee9b3142cd859d7c1293a8638d2122534439a042feab690e634e75deeb7c8afc7a94dd9188447faea283a59f2eec453537 SHA512 ff083e3655f2fa78b2f0f1c286298f56e96ab259ea9dce2389fd38dc0c2ad9ad0da2eadc966ebbbf8efefb6dc05445b969fabacb376ea30f72b339ece6d0b0d1
 EBUILD xen-4.15.0-r1.ebuild 4593 BLAKE2B 5000db5af318b142a4909265d0670602956cf098b1307379e2dbfc0d3edb36bd7c6429f0355d34065d2aa9148bbd77d0d1cb8333fe0d7ce5fd2d9d2d398eccd5 SHA512 084ba7c9cce964b200c65b05a43bd548d3fa541f39e0b7403a6f006a40415ed457cb25fdcb8b5ab9b12f97878a0d9a4897443eec1439bb66c0d4a6fe4b69cd44
 MISC metadata.xml 675 BLAKE2B aee4c4775c388078e51a97212be21fee3ddd4771121a129b7ddf0e2454dc3bd91f4fa1a2ce2a2057c655a0d32ae9631c9fd29a77a247601867949be4aa79de26 SHA512 f77204ce3cffb9c453c779de4cb7e41591972c5b59567a88d02ba079bd6f827d4aec23d9ce7c28b3affcadd370858cb1e66f6448b32e0dfb795af6a1be8598d2
diff --git a/app-emulation/xen/xen-4.13.3.ebuild b/app-emulation/xen/xen-4.13.3.ebuild
deleted file mode 100644
index 556820b0cbae..000000000000
--- a/app-emulation/xen/xen-4.13.3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ~arm -x86"
-	UPSTREAM_VER=
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
-	eapply "${FILESDIR}"/${PN}-4.11-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="/boot"
-	fi
-
-	default
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	# remove flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-
-	tc-ld-disable-gold # Bug 700374
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-
-	ewarn
-	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
-	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
-	ewarn "to work fine."
-	ewarn
-	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
-	ewarn
-	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
-}
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 6c9fb42af23a..ff0a5b204330 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/honggfuzz/Manifest b/app-forensics/honggfuzz/Manifest
index 5b076d3e81f2..2cd2bfd91b2f 100644
--- a/app-forensics/honggfuzz/Manifest
+++ b/app-forensics/honggfuzz/Manifest
@@ -1,4 +1,4 @@
 AUX honggfuzz-2.0-no-werror.patch 518 BLAKE2B aaf123687ea5f7fd584d1fd5e57f2f6ac50a8d80c3a1555d8b01d42df91a106848ec1d73007e6b67127e767770d91effa5e95dd9016f47fecac0e465e74cfe61 SHA512 7775f683cd5b22d91d3cf16cb0f8e7df50f5159a3f16ef42dc6125c961a856ddfc59c944319575e403747a2af768cd3f93437fc0bbc32bfc12f833f4cd7db0eb
 DIST honggfuzz-2.4.tar.gz 65224128 BLAKE2B b584b0f143fe64c8f64f134d7dc3116ec88232ec4a7b635d1cee2c8c5e7253524a8559c0b89fac11b67c1c3566891f189efc2201a1bf42410c78f211b2bc376e SHA512 bdb172e6e1f694ba8c200fb37ba84c4dd88875c9412fc26a45b7be302d234ac503c108eadb0c14fafbf8494ffaf70450975cf205e8a71b8b3b8902fdf455b4f6
-EBUILD honggfuzz-2.4.ebuild 894 BLAKE2B 352d9719d135c59d6cb0d41a3a172098398851f90938c7f14fe388d208c2ac3d12a756fe90ebed58941c95826f04de1b1758b09620aa243b9353ea074868fec3 SHA512 e9a5e91fb74ecd5a7e2c56867e4337548114f14b59d2d64f2a587927f54aa5bbcbea71bd32069c90d5ab439f51dbea218478473781d84c13dacd7d94b68534f4
+EBUILD honggfuzz-2.4.ebuild 906 BLAKE2B 795223cb4e67a359a5492b3e8620fdca4de54f9c712d3538cc3a8cddcc5f98336ceb4dd3f2a2cfc95b7a9cf6362bd4bca6158bb0f5a2cccf668d13c7893bba26 SHA512 881874e3ea09319f7d0d4a96354a22440af4a6d332629b9ecac0b78212a1c2fb33f31bbaca448c0662b780e09efc7d9d6424d560abddd54c7ffe2b70a54abb86
 MISC metadata.xml 443 BLAKE2B dea398a12eecb6e435b80a631eae1bfbf5beb7ba6106fa661f4cc5664d3fa3a38fadb214914ba0232d3d875070676e9153bfab18e956dd87a4d363565dc37a41 SHA512 5c4789db152d5fb335d84461addedaff128242c7e80c233b559ecefa82c5a37461b4c6ecdf4bfb5ce6dd6404782790c38b22c2793630ee22ed691ff64a690b49
diff --git a/app-forensics/honggfuzz/honggfuzz-2.4.ebuild b/app-forensics/honggfuzz/honggfuzz-2.4.ebuild
index 4cabbf845375..e73640196eb9 100644
--- a/app-forensics/honggfuzz/honggfuzz-2.4.ebuild
+++ b/app-forensics/honggfuzz/honggfuzz-2.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="A general purpose fuzzer with feedback support"
-HOMEPAGE="https://google.github.io/honggfuzz/"
+HOMEPAGE="https://honggfuzz.dev/"
 SRC_URI="https://github.com/google/honggfuzz/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -49,6 +49,7 @@ src_prepare() {
 
 src_install() {
 	dobin ${PN}
+	dobin hfuzz_cc/hfuzz-cc
 
 	einstalldocs
 }
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 4c18c7a76c2f..0134ba0258b4 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
index ef7f168d8330..b97a1530239e 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -1,5 +1,5 @@
 AUX 50anthy-gentoo.el 63 BLAKE2B 8680f0a54f0c16a4d869f52d1589c6af39d29c151a5f7e7182f7afb2417aa5ba2fea002d7638271f486f95931036a1e4e4a83af8d796c3b751760d5750adf1d6 SHA512 ca11bd44d092da07278905555513e8b5215413af64c46cfb9213cbd27948727133c06fb1fcfc1a48d67d196c693ed2835e8dbae142a52ff4dbd5ea8d49e6e65a
 AUX anthy-anthy_context_t.patch 174 BLAKE2B 0a38c7a467b5a0331762fa1083c2dffef8f4c39c8bfbf7ce0ec431f6f865dc8727fac391ff77a6a1cf5e455ca274c78b7a6ebf7a2326ba90c6cd979f8e3c7a3f SHA512 3f252628f77f53dd96eac50f08a36bb782f0ddc37446c1bdd5bd94fffa3454b9adcaff7118d76fdc7e8bc3f86b1a84e9830da5b67b2b0d281847b26ff62cdee3
 DIST anthy-9100h.tar.gz 4446148 BLAKE2B b07da205694db9223c22ebcf6158158247611be41448457ee112766d1ea5fe72eee3f2292276363245d751eb49bd582c39330cc6df5e52547b6188386439d29a SHA512 315ebd9e1af208f3ecaeaa13620213b35f004e47edb54e60c3e02c2997444cd2326cc58b725dd2d0bd6a723130884d946ea193ea3d92418082256b59ecc8d88b
-EBUILD anthy-9100h-r2.ebuild 1324 BLAKE2B cbbb511431cc23ac30fcf25dfe17059ad8cf5a7b5de25402ae12afc98cecbaf0c0250904ad583d253076d02873fcbfe20aa9c13fdfbc1d866f75a6017e62ac45 SHA512 f49dee3ff11e0de42712b901dd08dd5283010c96561e7680471ee42f888693b89cb14afa4a63b2949b8c7b5b76dc3cb9fd6c78f3dbf8ccaf329e22a65b0aa520
-MISC metadata.xml 907 BLAKE2B 4192793f866cd1747335aef0bcf556db1e39c80a8dd5661b66887ebd6deb498db52bf86020a426a0828d192dec0a41600cf328af344cad07cd20cf81e77776eb SHA512 1a57ac78da70868dd6580bac2c85b4510e1f4b1db2bb3629c17a16fbf9e44d711a355d3c488479d00a466930d4cce9980803e526f4b574e48a1a5b6e3bd3d24c
+EBUILD anthy-9100h-r3.ebuild 1056 BLAKE2B c81b450a0808bea13587bd39386ba92bf19137594b8da7fa50e8a72fba4b9b1cd884f29b83c7baf158851f7c9e451a30ab8a88401087dd0b0a90b3d5d3798b28 SHA512 61ae32a2b25e0c425b626bcfcacb9b5c18c4ca7608db01f86a1749591cdf01d02ae4eaa31b0422510a915beae536a0b2ac5a671e892dea9cdac06380bfe60a83
+MISC metadata.xml 806 BLAKE2B 53481d14a789c34c69cf56476e7930f57a18982d7ef7e6b1dbe3bdf3cf13a57fad5c2e76e8d1c6202d016b2b8d67c45b0e02ae953dcc90b60056648b34e9ca4e SHA512 ccdd97451f76963242b3698bb6ca76c98ee10110305a4a725289517c53910c9627967f6edb1949a218e4b411fb50b1fcf752be226f831471d5211ed8cdc5f0d7
diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r2.ebuild
deleted file mode 100644
index bfd867fdc12f..000000000000
--- a/app-i18n/anthy/anthy-9100h-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2003-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit elisp-common
-
-DESCRIPTION="Anthy -- free and secure Japanese input system"
-HOMEPAGE="http://anthy.osdn.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="canna-2ch emacs static-libs"
-
-BDEPEND="canna-2ch? ( app-dicts/canna-2ch )
-	emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND=""
-RDEPEND="${BDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-anthy_context_t.patch"
-)
-
-DOCS=(AUTHORS ChangeLog DIARY NEWS README)
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-
-	if use canna-2ch; then
-		einfo "Adding nichan.ctd to anthy.dic"
-		sed -e "/set_input_encoding eucjp/aread ${EPREFIX}/var/lib/canna/dic/canna/nichan.ctd" -i mkworddic/dict.args.in || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		EMACS="$(usex emacs "${EMACS}")"
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -type f -delete || die
-
-	rm doc/Makefile* || die
-	dodoc -r doc
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/anthy/anthy-9100h-r3.ebuild b/app-i18n/anthy/anthy-9100h-r3.ebuild
new file mode 100644
index 000000000000..0a4beeca472b
--- /dev/null
+++ b/app-i18n/anthy/anthy-9100h-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common
+
+DESCRIPTION="Anthy -- free and secure Japanese input system"
+HOMEPAGE="http://anthy.osdn.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="emacs static-libs"
+
+BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
+DEPEND=""
+RDEPEND="${BDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-anthy_context_t.patch" )
+DOCS=( AUTHORS ChangeLog DIARY NEWS README )
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		EMACS="$(usex emacs "${EMACS}")"
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -type f -delete || die
+
+	rm doc/Makefile* || die
+	dodoc -r doc
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-i18n/anthy/metadata.xml b/app-i18n/anthy/metadata.xml
index 7b0ba62c9e0a..794feb3174cc 100644
--- a/app-i18n/anthy/metadata.xml
+++ b/app-i18n/anthy/metadata.xml
@@ -15,9 +15,6 @@
     and <pkg>app-editors/emacs</pkg> (to enable Anthy support for emacs, build
     this package with emacs USE flag).
   </longdescription>
-  <use>
-    <flag name="canna-2ch">Enable support for <pkg>app-dicts/canna-2ch</pkg></flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge-jp">anthy</remote-id>
   </upstream>
diff --git a/app-i18n/canfep/Manifest b/app-i18n/canfep/Manifest
deleted file mode 100644
index 60402fad68aa..000000000000
--- a/app-i18n/canfep/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX canfep-posix-pty.patch 1674 BLAKE2B dfeda6e249501ed6b5a8bd185dbd9df735bd9f0825cf29ff83abdec9b7514f91f0a9eca61a4291a9dd9982262eb92f40db185630b6a89573de364b855ac1097f SHA512 dc02c9fca1e964f04c7fc223fee7935d5e68d25699bb279327904ac2ce042a9cf9fc02e4f1c4e59515c931a6a157861d113e685a8484242b791c367d132d5f7b
-AUX canfep-termcap.patch 6533 BLAKE2B c8e9ffa84390bac88e6ad1fc30e47d237a6fc10d3f8b727a730358faa69d76a24ddb9b1467d695eed691ceb9e1b5558baf12d45178e44b642fb3fc7ff0f9d36d SHA512 7ebaf5745bdc8b1aa1bd07879fe51c3c6410c1475f9e44535bf863f9ab0b7ee6ac0f3dca852c22036ae2ecfababfd976a0c3027ad9d33e3aae7e289c00bd60bc
-DIST canfep-1.0.tar.gz 8067 BLAKE2B 1a6e8af357d2b7aaccf442b0f8bab577ed05a5a0fdf2fb4c189105c2c41f739c2e559e740584bf393fcc52d3f3bd0bb6216e06e2b685f62f7dded9d576e95bed SHA512 0fd7c8ca56282fa537b76fe33f46e03d4f0f4727528ccad95cd4726888372da9158fc8bed2cdc67d645defb479040cd4a4d0999f69d38fd8b4080f7ece4e67d6
-DIST canfep_utf8.diff 7152 BLAKE2B e3848d5119b01d3296c93b5ed8495c6f93ecb1ef39f168d6e1685636055295b8f7277c6b680cadb648fe6847c92e3b038a9b5a9a58f23fe3490dcbe675bcc96f SHA512 32d946b8b78efd3b95736738497fe46a7d0e2383f2b665c8af79270d7b0d1404ca051e63fc67375f0b953b8f604475c8d6b2d683089bc97b098fa9524b89208c
-EBUILD canfep-1.0-r1.ebuild 1030 BLAKE2B 9b7c52e4f3c81cb16b202d4af35dcb18ca074df89f4fd8b8fbc82f3bbd10fb9f3d6b678bd8d08fb20010064dc5a827928c9e4975f8f57b3f2d8c6a7e3543568b SHA512 4ab9f1dae9fcf24bf1f1727c61e82f86d7332165ae3df89d4f160262f95cff748976e268c19c32ec58c6acbcd778143e66ec3b1a9eb72153ca92846639829d99
-MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/canfep/canfep-1.0-r1.ebuild b/app-i18n/canfep/canfep-1.0-r1.ebuild
deleted file mode 100644
index 4b2531818834..000000000000
--- a/app-i18n/canfep/canfep-1.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Canna Japanese kana-kanji frontend processor on console"
-#HOMEPAGE="http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/${PN}_utf8.diff )"
-
-LICENSE="canfep"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE="unicode"
-
-RDEPEND="app-i18n/canna
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-posix-pty.patch
-	"${FILESDIR}"/${PN}-termcap.patch
-)
-
-src_prepare() {
-	use unicode && eapply "${DISTDIR}"/${PN}_utf8.diff
-	sed -i 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' Makefile
-
-	default
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCXX)" \
-		CFLAGS="${CXXFLAGS}" \
-		LIBS="-lcanna $($(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc 00{changes,readme}
-}
diff --git a/app-i18n/canfep/files/canfep-posix-pty.patch b/app-i18n/canfep/files/canfep-posix-pty.patch
deleted file mode 100644
index caa451232ef4..000000000000
--- a/app-i18n/canfep/files/canfep-posix-pty.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=212709
-
-Author: OKUMURA N. Shin-ya <oku.ns@dream.com>
-
---- a/pty.C
-+++ b/pty.C
-@@ -257,6 +257,23 @@
-         }
-     }
- 
-+#if defined(_POSIX_C_SOURCE)
-+    // BSD pty ¤¬³«¤±¤Ê¤¤¤Î¤Ç¡¢POSIX ¤ÎÊýË¡¤ò»î¤¹
-+    if ((master = posix_openpt(O_RDWR)) >= 0) {
-+        if (grantpt(master) == 0 && unlockpt(master) == 0) {
-+            // ¥Þ¥¹¥¿¥Ç¥Ð¥¤¥¹Ì¾¤Ï¸ÇÄê
-+            strcpy(line, "/dev/ptmx");
-+            tcgetattr(0, &tt);
-+            tt.c_iflag &= ~ISTRIP;
-+            ioctl(0, TIOCGWINSZ, (char*) &win);
-+            return;
-+        }
-+        close(master);
-+    } else {
-+        perror("/dev/ptmx");
-+    }
-+#endif  // _POSIX_C_SOURCE
-+
-     printf("Out of pty's\n");
-     fail();
- }
-@@ -265,12 +282,36 @@
- void
- Pty::getslave()
- {
-+#if defined(_POSIX_C_SOURCE)
-+    // ¥Þ¥¹¥¿¥Ç¥Ð¥¤¥¹¤¬ POSIX Êý¼°¤Î¾ì¹ç
-+    if (strcmp(line, "/dev/ptmx") == 0) {
-+        char *slave_devname = ptsname(master);
-+        if (slave_devname == NULL) {
-+            perror("ptsname");
-+            fail();
-+        }
-+        slave = open(slave_devname, O_RDWR);
-+        if (slave < 0) {
-+            perror(slave_devname);
-+            fail();
-+        }
-+        strcpy(line, slave_devname);
-+    } else {
-+        line[strlen("/dev/")] = 't';
-+        slave = open(line, O_RDWR);
-+        if (slave < 0) {
-+            perror(line);
-+            fail();
-+        }
-+    }
-+#else   // ! _POSIX_C_SOURCE
-     line[strlen("/dev/")] = 't';
-     slave = open(line, O_RDWR);
-     if (slave < 0) {
-         perror(line);
-         fail();
-     }
-+#endif  // _POSIX_C_SOURCE
-     tcsetattr(slave, TCSAFLUSH, &tt);
-     if (!hs)
-         win.ws_row--;
diff --git a/app-i18n/canfep/files/canfep-termcap.patch b/app-i18n/canfep/files/canfep-termcap.patch
deleted file mode 100644
index afd215b07e79..000000000000
--- a/app-i18n/canfep/files/canfep-termcap.patch
+++ /dev/null
@@ -1,266 +0,0 @@
---- a/pty.C
-+++ b/pty.C
-@@ -4,9 +4,18 @@
- int Pty::child = 0;
- struct termios Pty::tt;
- int Pty::wfd = 0;
-+char Pty::buf[] = "";
-+char Pty::funcstr[] = "";
- int Pty::hs = 0;
-+char* Pty::so = 0;
-+char* Pty::se = 0;
-+char* Pty::us = 0;
-+char* Pty::ue = 0;
-+char* Pty::sc = 0;
-+char* Pty::rc = 0;
- char* Pty::ce = 0;
- char* Pty::ts = 0;
-+char* Pty::fs = 0;
- char* Pty::ds = 0;
- char Pty::endstr[] = "";
- char Pty::endmsg[] = "";
-@@ -14,88 +23,7 @@
- // ¥³¥ó¥¹¥È¥é¥¯¥¿¤À¤è¤ó
- Pty::Pty(int ac, char** av, char* amsg, char* emsg)
- {
--    // ´Ä¶­ÊÑ¿ô TERM ¤Î¥¨¥ó¥È¥ê¤ò¼èÆÀ
--    char buff[BUFSIZ];
--    char* term = getenv("TERM");
--    if (!term)
--        term = "vt100";
--    int ret = tgetent(buff, term);
--    if (ret != 1) {
--        tgetent(buff, "vt100");
--        putenv("TERM=vt100");
--    }
--
--    // termcap ¤«¤éÁõ¾þÍѤΥ¨¥ó¥È¥ê¤ò¼è¤Ã¤Æ¤¯¤ë
--    char funcstr[BUFSIZ];
--    char* pt = funcstr;
--
--    // ¥¹¥¿¥ó¥É¥¢¥¦¥È (ȿž)
--    so = tgetstr("so", &pt);
--    adjstr(so);
--    se = tgetstr("se", &pt);
--    adjstr(se);
--
--    // ¥¢¥ó¥À¡¼¥é¥¤¥ó (²¼Àþ)
--    us = tgetstr("us", &pt);
--    adjstr(us);
--    ue = tgetstr("ue", &pt);
--    adjstr(ue);
--
--    // ¥«¡¼¥½¥ë°ÌÃÖ¤ÎÊݸ¡¤Êݸ¤·¤¿°ÌÃ֤ؤÎÉüµ¢
--    sc = tgetstr("sc", &pt);
--    adjstr(sc);
--    rc = tgetstr("rc", &pt);
--    adjstr(rc);
--
--    // ¥«¡¼¥½¥ë°ÌÃÖ¤«¤é¹Ô¤ÎºÇ¸å¤Þ¤Ç¤òºï½ü¤¹¤ë
--    ce = tgetstr("ce", &pt);
--    adjstr(ce);
--
--    // ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤ò»ý¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«
--    hs = tgetflag("hs");
--
--    // kon ¤È jfbterm ¤Ç¤Ï¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤ò»È¤ï¤Ê¤¤
--    if (strcmp(term, "kon") == 0)
--        hs = 0;
--    if (strcmp(term, "jfbterm") == 0)
--        hs = 0;
--
--    // ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤Ø°ÜÆ°¡¤Ìá¤ë
--    if (hs) {
--        ts = tgoto(tgetstr("ts", &pt), 0, 0);
--        adjstr(ts);
--        fs = tgetstr("fs", &pt);
--        adjstr(fs);
--        ds = tgetstr("ds", &pt);
--        adjstr(ds);
--        if (ds) {
--            strcat(endstr, ds);
--            strcat(endstr, ce);
--        }
--    }
--    else {
--        char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
--        adjstr(cs);
--        if (cs) {
--            write(1, ce, strlen(ce));
--            write(1, cs, strlen(cs));
--        }
--        char* cl = tgetstr("cl", &pt);
--        adjstr(cl);
--        if (cl) {
--            write(1, cl, strlen(cl));
--            strcat(endstr, cl);
--        }
--        ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
--        adjstr(ds);
--        if (ds) {
--            strcat(endstr, ds);
--            strcat(endstr, ce);
--        }
--        ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
--        adjstr(ts);
--        fs = rc;
--    }
-+    gettermcap();
- 
-     // ³«»Ï¤È½ªÎ»¤Î¥á¥Ã¥»¡¼¥¸
-     if (amsg && ac == 1)
-@@ -209,21 +137,75 @@
-     done();
- }
- 
--// termcap ¥¨¥ó¥È¥ê¤«¤é¥Ñ¥Ç¥£¥ó¥°¤òºï½ü¤¹¤ë
- void
--Pty::adjstr(char* str)
-+Pty::gettermcap()
- {
--    char* sp = strdup(str);
--    char* p = sp;
--    while (*p != '\0') {
--        if (strncmp(p, "$<", 2) == 0) {
--            while (*p != '>')
--                p++;
--            *p = '\0';
-+    // ´Ä¶­ÊÑ¿ô TERM ¤Î¥¨¥ó¥È¥ê¤ò¼èÆÀ
-+    char* term = getenv("TERM");
-+    if (!term)
-+        term = "vt100";
-+    int ret = tgetent(buf, term);
-+    if (ret != 1) {
-+        tgetent(buf, "vt100");
-+        putenv("TERM=vt100");
-+    }
-+
-+    // termcap ¤«¤éÁõ¾þÍѤΥ¨¥ó¥È¥ê¤ò¼è¤Ã¤Æ¤¯¤ë
-+    char* pt = funcstr;
-+
-+    // ¥¹¥¿¥ó¥É¥¢¥¦¥È (ȿž)
-+    so = tgetstr("so", &pt);
-+    se = tgetstr("se", &pt);
-+
-+    // ¥¢¥ó¥À¡¼¥é¥¤¥ó (²¼Àþ)
-+    us = tgetstr("us", &pt);
-+    ue = tgetstr("ue", &pt);
-+
-+    // ¥«¡¼¥½¥ë°ÌÃÖ¤ÎÊݸ¡¤Êݸ¤·¤¿°ÌÃ֤ؤÎÉüµ¢
-+    sc = tgetstr("sc", &pt);
-+    rc = tgetstr("rc", &pt);
-+
-+    // ¥«¡¼¥½¥ë°ÌÃÖ¤«¤é¹Ô¤ÎºÇ¸å¤Þ¤Ç¤òºï½ü¤¹¤ë
-+    ce = tgetstr("ce", &pt);
-+
-+    // ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤ò»ý¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«
-+    hs = tgetflag("hs");
-+
-+    // kon ¤È jfbterm ¤Ç¤Ï¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤ò»È¤ï¤Ê¤¤
-+    if (strcmp(term, "kon") == 0)
-+        hs = 0;
-+    if (strcmp(term, "jfbterm") == 0)
-+        hs = 0;
-+
-+    // ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤Ø°ÜÆ°¡¤Ìá¤ë
-+    if (hs) {
-+        ts = tgoto(tgetstr("ts", &pt), 0, 0);
-+        fs = tgetstr("fs", &pt);
-+        ds = tgetstr("ds", &pt);
-+        if (ds) {
-+            strcat(endstr, ds);
-+            strcat(endstr, ce);
-         }
--        *str++ = *p++;
-     }
--    free(sp);
-+    else {
-+        char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
-+        if (cs) {
-+            write(1, ce, strlen(ce));
-+            write(1, cs, strlen(cs));
-+        }
-+        char* cl = tgetstr("cl", &pt);
-+        if (cl) {
-+            write(1, cl, strlen(cl));
-+            strcat(endstr, cl);
-+        }
-+        ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
-+        if (ds) {
-+            strcat(endstr, ds);
-+            strcat(endstr, ce);
-+        }
-+        ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
-+        fs = rc;
-+    }
- }
- 
- // ¥Þ¥¹¥¿¥Ç¥Ð¥¤¥¹¤ò¼è¤ë
-@@ -327,34 +309,7 @@
- {
-     signal(SIGWINCH, SIG_IGN);
- 
--    // ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤¬»È¤¨¤Ê¤¤¾ì¹ç¤Ï cs/ds/ts ¤ò¼è¤êľ¤¹
--    if (!hs) {
--        char buff[BUFSIZ];
--        char* term = getenv("TERM");
--        tgetent(buff, term);
--        char funcstr[BUFSIZ];
--        char* pt = funcstr;
--        char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
--        adjstr(cs);
--        if (cs) {
--            write(1, ce, strlen(ce));
--            write(1, cs, strlen(cs));
--        }
--        char* cl = tgetstr("cl", &pt);
--        adjstr(cl);
--        if (cl) {
--            write(1, cl, strlen(cl));
--            strcpy(endstr, cl);
--        }
--        ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
--        adjstr(ds);
--        if (ds) {
--            strcat(endstr, ds);
--            strcat(endstr, ce);
--        }
--        ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
--        adjstr(ts);
--    }
-+    gettermcap();
- 
-     // ¥¦¥£¥ó¥É¥¦¤Î¥µ¥¤¥º¤òÀßÄꤷľ¤¹ (stty -a ¤Î ¹Ô¿ô/·å¿ô Åù)
-     struct winsize win;
---- a/pty.H
-+++ b/pty.H
-@@ -50,18 +50,21 @@
-     int rfd;
-     static int wfd;
- private:
--    static void adjstr(char* str);
-+    static char buf[BUFSIZ];
-+    static char funcstr[BUFSIZ];
-+private:
-+    static void gettermcap();
- protected:
-     static int hs;
--    char* so;
--    char* se;
--    char* us;
--    char* ue;
--    char* sc;
--    char* rc;
-+    static char* so;
-+    static char* se;
-+    static char* us;
-+    static char* ue;
-+    static char* sc;
-+    static char* rc;
-     static char* ce;
-     static char* ts;
--    char* fs;
-+    static char* fs;
-     static char* ds;
- private:
-     static void finish();
diff --git a/app-i18n/canfep/metadata.xml b/app-i18n/canfep/metadata.xml
deleted file mode 100644
index e1a49f498885..000000000000
--- a/app-i18n/canfep/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
deleted file mode 100644
index b7d838aea8f9..000000000000
--- a/app-i18n/canna/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX canna-Wformat-security.patch 4545 BLAKE2B 796bd97f2b9af03a63c13cde02d59eda227b0b7ba51238de9780057447fd23bd42290e07d1585804e5141ef754919ddc10e908296a7ca8fcbf47366989196c34 SHA512 7c2649d98b5eac8d625586b245fff7e07b19616395e754a59443d7858e818f3651fb5e03e97ebcacb5ff4b2c1cb0f0c45aa0838ae85350e0c24906faa3a36102
-AUX canna-Wformat.patch 340 BLAKE2B b9b31b256ae43dc8ec4e1589bef9c6f221e4e8d4a8532ac7cb6e20ff58806b73b7009c30d83656c879b243fce674263e0b6f1077a8e30595704230cebaf71dd4 SHA512 38b2cc703ff69f29352b1c2bc4bc01c3387edaada98f724344525c68ee5a8ae1490ba0ce84fac53b00ca89b7cab201640631638ee578fb00211cc59d4d968bcd
-AUX canna-canuum.patch 779 BLAKE2B a27f98b535846fb387cb9946319a52c7b5fb22feb19bdc2f3f8860066234459ae66b643d298bdef821edc3c918956941dab6a8770b81e141a5709cda89d7b980 SHA512 62005fe564b7c6cb627c10af136e4ad15bfd6f2d17cd71093ae34b9e7f7f47c582ff5c32fadf5068fdaa5c685dd2b898cccb71ccd86b19b429e34f57c290cdd6
-AUX canna-gentoo.patch 4310 BLAKE2B 8386af1ba3b2c6c2a420246c6de5f218c92553c3569fb47bf275682570ca877c7e0d8cd61c36537218cca77f60421d7ccf460615ff957e54d9488f1df2789cd4 SHA512 31d893ba6fe873d1b9ceb5106c87d027b31013e049ed673d14e7f32232bf259b44a1fa397c133fa0b5a39252a61d400d4d1951a4448e4aaffad649f648652e6b
-AUX canna-kpdef.patch 202 BLAKE2B 44c443da25ac63ad7a418378df55c490c3f288c0ccbb6803fd6d7f2fcd764dca32650f484ec8a5267ca0d8db0349f3736e974a44e7ab0eeebee32a4a5603f3f1 SHA512 f258be22226109b63df7e2aae3a42fb42d13d9f3ca4b92ad9a15f477ac0a4906bf5af3065f4ebfc69a49165073451f310a6b8c43ad57cb772d9af6ece74a50df
-AUX canna-overflow.patch 788 BLAKE2B bd71eafb119ce107540ae4de355755e7e575ee8d197414e24831f6025d2445395a816a7b3c1a9824e5f9d6cc1b732389551abebbb706cfeeac17c1d61275f83a SHA512 7caaf95c9e01277247036488e3f154abca6e7811e17a2c7d1dd34f3a1906ee780ed2cd03a0435d051098d99521b55350d3332e218cebfdebf2391e1f38da541c
-AUX canna-posix-sort.patch 282 BLAKE2B f13360695b7209d1865494438ffc9f5e246173bc82a578ca2e2790072e338c59dd6dc762993624514337cf6d9001020fbf093307ea8c5ea408ae5d911649cc09 SHA512 310b16878d8f2fb0fa35d45ac43709186a70a36d4fba86abe78a6ccc7df410ddba38f7113effa69da4a5afe1ecf9d81175d285338e59793fee352eca93069d5d
-AUX canna.confd 129 BLAKE2B aef79cdd496fbf5a13929a8fa1b08b65ab15e15c9ce690d5f345372e6e5e15cf54b96ce851a564ba4a64613976630b4cc828fd0c9ec4d24f4e0305bc23eab3eb SHA512 401fdca224f3ab85ceff0786865efdda01c121481f9f084c3983f806d5e5543b706a844676d65529fd06a19d264877499c01c1ecc2b4a7dcb94e686c20d34a41
-AUX canna.hosts 5 BLAKE2B a10fe2813bf946464641605e8cdda362629a62817de0a7f72f2b0e54963d3370ebd8d9fa9db28753d1e0567d78c0e5c830c1e13db54e4eea562276263da9fda8 SHA512 88cabd1d372defd4bed25c23bafa0a883b13c1184be0287717df6a0946de0d39b73cdbda3660432f787cded46b57bd187106b12969e960760a9cc2db76e5b497
-AUX canna.initd 782 BLAKE2B 1e34cfc3ed28f5903600f591e55d0eb559aa5336eee54a54a7ab40d2be3816f6a62a947e9c87d4834425f71640c96847836830439f4eeb76a4f25a372fc9d1d0 SHA512 1fd348f2aa4139bbe6154b157b75bf8a39a8ddf36a9a072088279c88241981a9af9024df71aa777ca4e93270d53d0bea8363b31cfb07d229d4a37c48828779e6
-AUX update-canna-dics_dir 1101 BLAKE2B 9b429c2ddfb0e3c2c8a754f7fb61b776abbb809f81c93127e5f8be9ec768df6c28fcce75fe69a5b92a195ce49e20572c083aca5b4309f042a50b53bffafc4042 SHA512 135fdabf3995ddf82d3f14aece908e952f3d514fd83e2f86d8113b1026b7dcaea2156225be251a6d9a74a35ee075d5ebb32c05d9deb85905120287d0af1f4207
-DIST Canna37p3.tar.bz2 1263065 BLAKE2B b5fb496c0ef71dc57b2da1409eea2238ea62ece3286d498d694bc7a18cb0f5e052dca95d692b4302988acd2199d350b893ae4aedc91aab0b737c3e0675be9cba SHA512 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
-EBUILD canna-3.7_p3-r4.ebuild 3336 BLAKE2B b2ff41c2a285a79be1c643d7e79275967684c609484beb5fb45f31b99d2a4dca47b908aa87b281d9def01914869935ab0eeee650833da435c21b99c1b99df5d9 SHA512 e93ffdf2f98e97ce5dfb0704daad8389576e81ec7c1d1706a7711185e9548b8dd2206642a03f07d250db96e3e6b8a66796c82eb111b366c87f62b0ea1a5671db
-MISC metadata.xml 383 BLAKE2B 2947ceefe007eb9bcfd46a69a4b97a2406383931cb320cb594b96952697378147824461f1b55d5caddc419b19aebeb1c5ce69c0f0d31568cbbbe3d1d15fba9ba SHA512 8affc10d697147ea5430d73c40eb4e7621ee9a06d444725566d4e16a28ccab4f53aed3025905894fe6cba0ea874dcf0d2d583d3dcedf3a0ccc8b139af02e5e98
diff --git a/app-i18n/canna/canna-3.7_p3-r4.ebuild b/app-i18n/canna/canna-3.7_p3-r4.ebuild
deleted file mode 100644
index a5e3cf174d49..000000000000
--- a/app-i18n/canna/canna-3.7_p3-r4.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools cannadic toolchain-funcs
-
-MY_P="Canna${PV//[._]/}"
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.osdn.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="canuum doc ipv6"
-
-RDEPEND="
-	canuum? (
-		dev-libs/libspt
-		sys-libs/ncurses:=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	x11-misc/gccmakedep
-	x11-misc/imake
-	canuum? ( virtual/pkgconfig )
-	doc? (
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-langjapanese
-		dev-texlive/texlive-latexrecommended
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-canuum.patch
-	"${FILESDIR}"/${PN}-kpdef.patch
-	"${FILESDIR}"/${PN}-overflow.patch
-	"${FILESDIR}"/${PN}-posix-sort.patch
-	"${FILESDIR}"/${PN}-Wformat.patch
-	"${FILESDIR}"/${PN}-Wformat-security.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
-		-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
-		${PN^c}.conf || die
-
-	if use canuum; then
-		cd canuum || die
-		mv configure.{in,ac} || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	xmkmf -a || die
-
-	if use canuum; then
-		pushd canuum >/dev/null || die
-		xmkmf -a || die
-		# workaround for sys-libs/ncurses[tinfo]
-		sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs ncurses):" Makefile || die
-		popd >/dev/null || die
-	fi
-
-	if use doc; then
-		pushd doc/man/guide/tex >/dev/null || die
-		xmkmf -a || die
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	# bug #279706
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-		canna
-
-	if use canuum; then
-		einfo "Compiling canuum"
-		emake -C canuum -j1 \
-			CC="$(tc-getCC)" \
-			CDEBUGFLAGS="${CFLAGS}" \
-			LOCAL_LDFLAGS="${LDFLAGS}" \
-			canuum
-	fi
-
-	if use doc; then
-		# NOTE: build fails if infinality enabled in fontconfig
-		einfo "Compiling DVI, PS, and PDF documents"
-		# bug #223077
-		emake -C doc/man/guide/tex -j1 \
-			JLATEXCMD="platex -kanji=euc" \
-			DVI2PSCMD="dvips" \
-			VARTEXFONTS="${T}"/fonts \
-			canna.ps \
-			canna.pdf
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.man
-	einstalldocs
-	dodoc *CHANGES* INSTALL* RKCCONF* WHATIS*
-
-	if use canuum; then
-		emake -C canuum DESTDIR="${D}" install install.man
-		docinto canuum
-		dodoc README.jp
-	fi
-
-	if use doc; then
-		dodoc doc/man/guide/tex/canna.{dvi,ps,pdf}
-	fi
-
-	# for backward compatibility
-	dosbin "${FILESDIR}"/update-canna-dics_dir
-
-	keepdir /var/lib/canna/dic/{user,group}
-	fowners bin:bin /var/lib/canna/dic/{user,group}
-	fperms 0775 /var/lib/canna/dic/{user,group}
-
-	insinto /var/lib/canna/dic/dics.d
-	newins "${ED}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
-
-	keepdir /var/log/canna
-
-	newconfd "${FILESDIR}"/canna.confd canna
-	newinitd "${FILESDIR}"/canna.initd canna
-
-	insinto /etc
-	newins "${FILESDIR}"/canna.hosts hosts.canna
-}
-
-pkg_postinst() {
-	update-cannadic-dir
-
-	if ! locale -a | grep -iq "ja_JP.eucjp"; then
-		elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
-		elog
-		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> ${EROOT}/etc/locale.gen"
-		elog "# locale-gen"
-		elog
-	fi
-}
diff --git a/app-i18n/canna/files/canna-Wformat-security.patch b/app-i18n/canna/files/canna-Wformat-security.patch
deleted file mode 100644
index c83552b5cba5..000000000000
--- a/app-i18n/canna/files/canna-Wformat-security.patch
+++ /dev/null
@@ -1,199 +0,0 @@
---- a/cmd/catdic/can.c
-+++ b/cmd/catdic/can.c
-@@ -1236,7 +1236,7 @@
- 	break;
-       default:
- 	if (init[0] == '/') {
--	    (void)fprintf(stderr,msg_abnl);
-+	    (void)fprintf(stderr,"%s",msg_abnl);
- 	} else {
- 	    (void)fprintf(stderr,msg_abnls,init);
- 	}
-@@ -1297,11 +1297,11 @@
- 
-     if ( opt_fq ) {
-       if ( opt_s ) {
--        (void) fprintf(stderr,msg_sfq);
-+        (void) fprintf(stderr,"%s",msg_sfq);
-         exit(ERR_VALUE) ;
-       }  
-       if ( opt_l || opt_std ) {
--        (void) fprintf(stderr,msg_l);
-+        (void) fprintf(stderr,"%s",msg_l);
-         exit(ERR_VALUE) ;
-       }
-       mode = mode | PL_DIC ;
-@@ -1491,7 +1491,7 @@
-     break;
-   default:
-     if(init[0] == '/') {
--      fprintf(stderr,msg_abnl );
-+      fprintf(stderr,"%s",msg_abnl );
-     }
-     else {
-       fprintf(stderr,msg_abnls,init);
---- a/cmd/catdic/rutil.c
-+++ b/cmd/catdic/rutil.c
-@@ -271,7 +271,7 @@
- 	 "Dictionary \"%s\" does not exist.\n"), dicname);
-     break;
-   case NOTALC :
--    (void)fprintf(stderr, msg_mem);
-+    (void)fprintf(stderr, "%s", msg_mem);
-     break;
-   case BADF :
-     (void)fprintf(stderr, gettxt("cannacmd:196",
-@@ -297,7 +297,7 @@
- 	(void)fprintf(stderr,msg_abnls,init);
-     }
-     else {
--	(void)fprintf(stderr,msg_abnl);
-+	(void)fprintf(stderr,"%s",msg_abnl);
-     }
-     break;
-   }
-@@ -321,7 +321,7 @@
- 	(void)fprintf(stderr, msg_abnls, init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     ret = -1;
-     return ret;
-@@ -332,13 +332,13 @@
- 	  (void)fprintf(stderr, msg_mnts, init);
-       }
-       else {
--	  (void)fprintf(stderr, msg_mnt);
-+	  (void)fprintf(stderr, "%s", msg_mnt);
-       }
-       ret = -1;
-       return ret;
-     }
-     if ((mode & PL_DIC) == PL_DIC ) {
--      (void)fprintf(stderr,msg_fq);
-+      (void)fprintf(stderr,"%s",msg_fq);
-       ret = -1 ;
-       return ret ;
-     }
-@@ -359,7 +359,7 @@
-     ret = 0;
-     break;
-   case NOTALC :
--    (void)fprintf(stderr, msg_mem);
-+    (void)fprintf(stderr, "%s", msg_mem);
-     ret = -1;
-     break;
-   case BADF :
-@@ -421,7 +421,7 @@
-     ret = -1;
-     break;
-   case BADCONT :
--    (void)fprintf(stderr,msg_cnt);
-+    (void)fprintf(stderr,"%s",msg_cnt);
-     ret = -1;
-     break;
-   default:
-@@ -429,7 +429,7 @@
-       (void)fprintf(stderr, msg_abnls, init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     exit(ERR_VALUE);
-     break;
-@@ -448,7 +448,7 @@
-     ret = 0;
-     break;
-   case NOTALC :
--    (void)fprintf(stderr, msg_mem);
-+    (void)fprintf(stderr, "%s", msg_mem);
-     ret = -1;
-     break;
-   case BADF :
-@@ -509,11 +509,11 @@
-     ret = -1;
-     break;
-   case BADARG :
--    (void)fprintf(stderr,msg_fq);
-+    (void)fprintf(stderr,"%s",msg_fq);
-     ret = -1;
-     break;
-   case BADCONT :
--    (void)fprintf(stderr,msg_cnt);
-+    (void)fprintf(stderr,"%s",msg_cnt);
-     ret = -1;
-     break;
-   case NOENT  :   /* 91.12.03 */
-@@ -526,7 +526,7 @@
-       (void)fprintf(stderr, msg_abnls, init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     exit(ERR_VALUE);
-     break;
-@@ -556,7 +556,7 @@
-       (void)fprintf(stderr, msg_abnls,init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     ret = -1;
-     return ret;
-@@ -567,13 +567,13 @@
- 	(void)fprintf(stderr, msg_mnts, init);
-       }
-       else {
--	  (void)fprintf(stderr, msg_mnt);
-+	  (void)fprintf(stderr, "%s", msg_mnt);
-       }
-       ret = -1;
-       return ret;
-     }
-     if ((mode & PL_DIC) == PL_DIC ) {
--      (void)fprintf(stderr, msg_fq);
-+      (void)fprintf(stderr, "%s", msg_fq);
-       ret = -1 ;
-       return ret ;
-     }
-@@ -608,7 +608,7 @@
-     ret = -2;   /* 93.03.03 */
-     break;
-   case BADCONT :
--    (void)fprintf(stderr, msg_cnt);
-+    (void)fprintf(stderr, "%s", msg_cnt);
-     ret = -1;
-     break;
-   default:
-@@ -616,7 +616,7 @@
- 	(void)fprintf(stderr, msg_abnls, init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     ret = -1;
-     break;
-@@ -651,7 +651,7 @@
-     ret = -2;   /* 93.03.03 */
-     break;
-   case BADCONT :
--    (void)fprintf(stderr, msg_cnt);
-+    (void)fprintf(stderr, "%s", msg_cnt);
-     ret = -1;
-     break;
-   default:
-@@ -659,7 +659,7 @@
- 	(void)fprintf(stderr, msg_abnls, init);
-     }
-     else {
--	(void)fprintf(stderr, msg_abnl);
-+	(void)fprintf(stderr, "%s", msg_abnl);
-     }
-     ret = -1;
-     break;
diff --git a/app-i18n/canna/files/canna-Wformat.patch b/app-i18n/canna/files/canna-Wformat.patch
deleted file mode 100644
index a8f5aa37163e..000000000000
--- a/app-i18n/canna/files/canna-Wformat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/man/guide/tex/cannaindex.c
-+++ b/doc/man/guide/tex/cannaindex.c
-@@ -198,7 +198,7 @@
-   }
-   inf = fopen(argv[1], "r");
-   if (!inf) {
--    fprintf(stderr, "%s: Can not open file \"%s\".\n", argv[1]);
-+    fprintf(stderr, "%s: Can not open file \"%s\".\n", program, argv[1]);
-     exit(1);
-   }
-   pages = readindex(inf, entries);
diff --git a/app-i18n/canna/files/canna-canuum.patch b/app-i18n/canna/files/canna-canuum.patch
deleted file mode 100644
index 293ffbb54c90..000000000000
--- a/app-i18n/canna/files/canna-canuum.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/canuum/configure.in
-+++ b/canuum/configure.in
-@@ -401,7 +401,7 @@
- dnl
- olibs="$LIBS"
- AC_MSG_CHECKING(--with-term-libs argument)
--AC_ARG_WITH(tlib,
-+AC_ARG_WITH(term-libs,
- [  --with-term-libs=-lLIB    terminal library to be used ],)
- if test -n "$with_term_libs"; then
-   AC_MSG_RESULT($with_term_libs)
---- a/canuum/wnn_config.h
-+++ b/canuum/wnn_config.h
-@@ -149,8 +149,8 @@
- #define TTY_KCODE J_EUJIS
- #define PTY_KCODE J_EUJIS
- # else /* !DGUX */
--#define TTY_KCODE J_JIS
--#define PTY_KCODE J_JIS
-+#define TTY_KCODE J_EUJIS
-+#define PTY_KCODE J_EUJIS
- # endif
- #endif
- 
---- a/canuum/wnn_os.h
-+++ b/canuum/wnn_os.h
-@@ -41,6 +41,7 @@
- #include <signal.h>
- #if STDC_HEADERS
- #  include <stdlib.h>
-+#  include <string.h>
- #  include <limits.h>
- #endif /* STDC_HEADERS */
- 
diff --git a/app-i18n/canna/files/canna-gentoo.patch b/app-i18n/canna/files/canna-gentoo.patch
deleted file mode 100644
index 7ecfb4b9cd84..000000000000
--- a/app-i18n/canna/files/canna-gentoo.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/Canna.conf
-+++ b/Canna.conf
-@@ -109,12 +109,12 @@
- # define DefErrDir $(cannaPrefix)/log
- # define DefLibCannaDir $(cannaExecPrefix)/lib
- #else 
--# define DefCannaPrefix /usr/local/canna
-+# define DefCannaPrefix $(EPREFIX)/usr
- # ifdef ObsoleteInstallDir
- #  define DefErrDir /usr/spool/canna
- #  define DefLibCannaDir /usr/lib
- # else
--#  define DefErrDir /var/log
-+#  define DefErrDir $(EPREFIX)/var/log/$(PN)
- #  define DefLibCannaDir $(cannaExecPrefix)/lib
- # endif
- #endif
-@@ -123,7 +123,7 @@
- # define DefCannaLibDir $(cannaPrefix)/lib
- #else
- # define DefCannaSrvDir $(cannaExecPrefix)/sbin
--# define DefCannaLibDir $(cannaPrefix)/share/canna
-+# define DefCannaLibDir $(cannaPrefix)/share/$(PN)
- #endif
- 
- #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) \
-@@ -147,9 +147,11 @@
- XCOMM cannaLibDir = /var/lib/canna
- XCOMM cannaLibDir = /var/db/canna
- cannaLibDir = DefCannaLibDir
--XCOMM cannaManDir = $(cannaPrefix)/share/man
--cannaManDir = $(cannaPrefix)/man
--cannaIncDir = $(cannaPrefix)/include/canna
-+cannaManDir = $(cannaPrefix)/share/man
-+XCOMM cannaManDir = $(cannaPrefix)/man
-+cannaIncDir = $(cannaPrefix)/include/$(PN)
-+cannaShareDir = $(cannaPrefix)/share/$(PN)
-+cannaDocDir = $(cannaPrefix)/share/doc/$(PF)
- 
- libCannaDir = DefLibCannaDir
- ErrDir  = DefErrDir
-@@ -237,7 +239,7 @@
- /* #define UseInstalledLibCanna YES */
- #define UseInstalledLibCanna NO
- 
--DicDir   = $(cannaLibDir)/dic
-+DicDir   = $(EPREFIX)/var/lib/$(PN)/dic
- 
- /* ¤³¤³¤«¤é²¼¤ÏÊѹ¹ÉÔÍפǤ¹ */
- 
---- a/Imakefile
-+++ b/Imakefile
-@@ -87,6 +87,7 @@
- 	 echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\
- 	 echo "/* for lib/canna */";\
- 	 echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \
-+	 echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \
- 	 echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \
- 	 echo "/* for scripts */";\
- 	 echo "#define CANNABINDIR $(cannaBinDir)"; \
---- a/dic/phono/Imakefile
-+++ b/dic/phono/Imakefile
-@@ -27,9 +27,10 @@
- 
-        ROMAJI_DIC_DEF = -DSHIFT
- 
--               DICDIR = $(cannaLibDir)/dic
--            SAMPLEDIR = $(cannaLibDir)/sample
--         SAMPLESRCDIR = $(cannaLibDir)/sample/src
-+               DICDIR = $(DicDir)
-+        CANNASHAREDIR = $(cannaShareDir)
-+            SAMPLEDIR = $(cannaDocDir)/sample
-+         SAMPLESRCDIR = $(cannaDocDir)/sample/src
- 
-     KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
-             lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
-@@ -69,7 +70,7 @@
- MakeDirectories(install,$(DICDIR))
- MakeDirectories(install,$(SAMPLESRCDIR))
- 
--InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
-+InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
- 
- #ifdef USE_OBSOLETE_STYLE_FILENAME
- InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
---- a/lib/canna/romaji.c
-+++ b/lib/canna/romaji.c
-@@ -427,7 +427,6 @@
- 	}
-       }
-       
--#if 0 /* currently CANNASHAREDDIR is not defined */
-       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
-         extern jrUserInfoStruct *uinfo;
- 	
-@@ -450,7 +449,6 @@
- 	  }
- 	}
-       }
--#endif
-       
-       if (retval == (struct RkRxDic *)NULL) { /* Á´Éô¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤ */
- 	sprintf(rdic, 
---- a/misc/Imakefile
-+++ b/misc/Imakefile
-@@ -48,7 +48,7 @@
- MakeLintLibSubdirs($(SUBDIRS))
- MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
- 
--MakeDirectories(install,$(cannaLibDir)/sample/src)
-+MakeDirectories(install,$(cannaDocDir)/sample/src)
- 
- #ifdef USE_OBSOLETE_STYLE_FILENAME
- default.canna: default.ca
-@@ -58,8 +58,8 @@
- 	$(CP) default.ca default.canna
- #endif
- 
- InstallNonExec(default.canna,$(cannaLibDir))
--InstallNonExec(is.c,$(cannaLibDir)/sample/src)
-+InstallNonExec(is.c,$(cannaDocDir)/sample/src)
- 
- clean::
- 	$(RM) $(PROGRAMS)
---- a/misc/initfiles/Imakefile
-+++ b/misc/initfiles/Imakefile
-@@ -6,7 +6,7 @@
- #endif
- 
-             CANNAROOT = ../..
--            SAMPLEDIR = $(cannaLibDir)/sample
-+            SAMPLEDIR = $(cannaDocDir)/sample
- 
- all::
- 
---- a/server/Imakefile
-+++ b/server/Imakefile
-@@ -6,7 +6,7 @@
- #ifdef __EMX__
-          INSTFLAGS = $(INSTUGIDFLAGS)
- #else
--         INSTFLAGS = -s $(INSTUGIDFLAGS)
-+         INSTFLAGS = $(INSTUGIDFLAGS)
- #endif
-            DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags
-           INCLUDES = -I$(CANNAROOT)/include
diff --git a/app-i18n/canna/files/canna-kpdef.patch b/app-i18n/canna/files/canna-kpdef.patch
deleted file mode 100644
index b0b71b4442c8..000000000000
--- a/app-i18n/canna/files/canna-kpdef.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/dic/phono/default.kpdef
-+++ b/dic/phono/default.kpdef
-@@ -350,3 +350,15 @@
- _	¡²
- /	¡¿
- \\	¡ï
-+
-+# some useful romkan symbols
-+z,	¡Å
-+z-	¡Á
-+z.	¡Ä
-+z/	¡¦
-+z[	¡Ø
-+z]	¡Ù
-+zh	¢«
-+zj	¢­
-+zk	¢¬
-+zl	¢ª
diff --git a/app-i18n/canna/files/canna-overflow.patch b/app-i18n/canna/files/canna-overflow.patch
deleted file mode 100644
index ef3b6ad1b95d..000000000000
--- a/app-i18n/canna/files/canna-overflow.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cmd/catdic/rutil.c
-+++ b/cmd/catdic/rutil.c
-@@ -384,7 +384,7 @@
- 	(void)fprintf(stderr,gettxt("cannacmd:205", 
-     "Specified dictionary \"%s\" already exists. Do you overwrite it ? (y/n)"),
- 		      dicname);
--	fgets(ans,80,stdin);
-+	fgets(ans,sizeof(ans),stdin);
-     } else {
- 	(void)fprintf(stderr,gettxt("cannacmd:206", 
- 	    "Specified dictionary \"%s\" already exists."),dicname);
-@@ -474,7 +474,7 @@
-     if (isatty(fileno(stdin)) != 0) {
- 	(void)fprintf(stderr,gettxt("cannacmd:216", 
- "Personal learning file of dictionary \"%s\" exists. Do you overwrite it ? (y/n)"),dicname);
--	fgets(ans,80,stdin);
-+	fgets(ans,sizeof(ans),stdin);
-     } else {
- 	(void)fprintf(stderr,gettxt("cannacmd:217", 
-     "Personal learning file of system dictionary \"%s\" already exists."),
diff --git a/app-i18n/canna/files/canna-posix-sort.patch b/app-i18n/canna/files/canna-posix-sort.patch
deleted file mode 100644
index 1f98aaf5efdd..000000000000
--- a/app-i18n/canna/files/canna-posix-sort.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmd/mkbindic/mkbindic.cpp
-+++ b/cmd/mkbindic/mkbindic.cpp
-@@ -40,7 +40,7 @@
- bck_text=;
- flag=;
- compat_flag=;
--sortcmd="sort -d -s +0 -1"
-+sortcmd="sort -d -s -k 1,1"
- usage="usage: mkbindic [-m|-s] [-name dicname] [-c version] textfile [cpp-args ...]";
- : ${TMPDIR:=/tmp}
- 
diff --git a/app-i18n/canna/files/canna.confd b/app-i18n/canna/files/canna.confd
deleted file mode 100644
index d3fdce5425a2..000000000000
--- a/app-i18n/canna/files/canna.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-CANNASERVER_ENABLE_SYSLOG="yes"
-
-# Specify user to run as
-CANNASERVER_OWNER="bin"
-
-# Options for cannaserver
-CANNASERVER_OPTS=""
diff --git a/app-i18n/canna/files/canna.hosts b/app-i18n/canna/files/canna.hosts
deleted file mode 100644
index 509143d86315..000000000000
--- a/app-i18n/canna/files/canna.hosts
+++ /dev/null
@@ -1 +0,0 @@
-unix
diff --git a/app-i18n/canna/files/canna.initd b/app-i18n/canna/files/canna.initd
deleted file mode 100644
index 97dac733fa94..000000000000
--- a/app-i18n/canna/files/canna.initd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/${RC_SVCNAME}server"
-command_args="${CANNASERVER_OPTS}"
-
-# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna
-CANNASERVER_LOGFILE="/var/log/${RC_SVCNAME}/CANNA0msgs"
-
-depend() {
-	use logger
-	need net
-}
-
-start_pre() {
-	if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ]; then
-		command_args="${command_args} -syslog"
-	elif [ -z "${CANNASERVER_OWNER}" ]; then
-		checkpath "${CANNASERVER_LOGFILE}"
-	else
-		checkpath -o "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}"
-		command_args="${command_args} -u ${CANNASERVER_OWNER}"
-	fi
-}
-
-stop() {
-	ebegin "Stopping ${name:-${RC_SVCNAME}}"
-	/usr/sbin/${RC_SVCNAME}kill
-	eend ${?}
-}
diff --git a/app-i18n/canna/files/update-canna-dics_dir b/app-i18n/canna/files/update-canna-dics_dir
deleted file mode 100644
index a57290ec3bad..000000000000
--- a/app-i18n/canna/files/update-canna-dics_dir
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# update-canna-dics_dir
-# compiles dics.dir files for Canna Server
-# Copyright 2001 ISHIKAWA Mutsumi
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-SRC=/var/lib/canna/dic/dics.d
-DEST=/var/lib/canna/dic/canna
-
-for DIR in $SRC $DEST; do
-    VALID=yes
-    if [ ! -d $DIR ]; then
-	echo "$0: $DIR does not exist or is not a directory." >&2
-	VALID=
-    fi
-done
-
-if [ -n "$VALID" ]; then
-    # write new dics.dir file in case we are interrupted
-    echo '# dics.dir -- automatically generated file.  DO NOT EDIT.' > $DEST/dics.dir.update-new
-#    echo '# To modify, see update-canna-dics_dir(8). >> $DEST/dics.dir.update-new
-    # are there any files to process?
-    if [ "$(echo $SRC/*.dics.dir)" != "$SRC/*.dics.dir" ]; then
-	for file in $SRC/*.dics.dir; do
-	    echo "# $file" >> $DEST/dics.dir.update-new
-	    cat $file >> $DEST/dics.dir.update-new
-	done
-	mv $DEST/dics.dir.update-new $DEST/dics.dir
-    else
-      # no files to process, remove the one
-	rm -f $DEST/dics.dir
-    fi
-fi
-
-exit
diff --git a/app-i18n/canna/metadata.xml b/app-i18n/canna/metadata.xml
deleted file mode 100644
index af8866b3beb0..000000000000
--- a/app-i18n/canna/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <use>
-    <flag name="canuum">Build canuum</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge-jp">canna</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-i18n/im-canna/Manifest b/app-i18n/im-canna/Manifest
deleted file mode 100644
index 21a8626d96ae..000000000000
--- a/app-i18n/im-canna/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX im-canna-gentoo.patch 912 BLAKE2B f0f8b62ac935b8f0356d96dc0dbfdbef990c1e38e4765ac0715a34749dffae1c57961a5b4e99b58e62bf966ab1b3ba21633fa7e9bf7065e800488605c3ec5e1a SHA512 5b9c98b3495bafcb9eb31d431abba0490817518c9804de6b09d6287d5e45540bc78d27d1be2496bcb1c6435db28666adc9b5b3967195399d57576aaf79da4ecc
-DIST im-canna-0.3.2.2.tar.gz 314633 BLAKE2B 971ab1d00645a0bd977a156abd6a1d3ad767505b5bd45792332a399685388b53b08e3133bc435adb7a7e27125fb1ad2d538f78af2420679c6d6d17878251b2ac SHA512 6ec4253038ca97e3e6319c024e4d11ca5418bf478280c4b19b81a9c628310a06bcd4ec35334d3a2bbdff0245bdfa660c1cdfd949ddd6b768d3b73d78648edc81
-EBUILD im-canna-0.3.2.2-r1.ebuild 760 BLAKE2B e4e47802487fb4b626e63ea260c09ddf3b7fde7bd059bd58dff84b40fed4836c06aa87c6834ecad30985c0a2a6a1e3edad9c3002328d575425aaf79c17806a5d SHA512 252a5e5a133e95d3f49f70f2c49eda4ed64be6315c2813dcefb6759eb8e7b260829149a7791ec914e54f0dcfb72d361d8b3d029f0fe8c7b93ad88a33e858de62
-MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/im-canna/files/im-canna-gentoo.patch b/app-i18n/im-canna/files/im-canna-gentoo.patch
deleted file mode 100644
index 959e8697eb82..000000000000
--- a/app-i18n/im-canna/files/im-canna-gentoo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--moduledir = ${libdir}/gtk-2.0/2.4.0/immodules
-+moduledir = ${libdir}/gtk-2.0/${GTK_BINARY_VERSION}/immodules
- ## Makefile.am for gtk+/modules/input 
- if PLATFORM_WIN32
- no_undefined = -no-undefined
-@@ -6,11 +6,11 @@
- 
- SUBDIRS = po
- 
--INCLUDES = @GTK_DEP_CFLAGS@ -I/usr/include/canna -DIM_LOCALEDIR=\"${datadir}/locale\"
-+INCLUDES = @GTK_DEP_CFLAGS@ -DIM_LOCALEDIR=\"${datadir}/locale\"
- 
- DEPS =
- 
--LDADDS = @GTK_DEP_LIBS@ -lcanna
-+LDADDS = @GTK_DEP_LIBS@
- 
- EXTRA_DIST=	\
- 	im-canna.spec \
---- a/configure.in
-+++ b/configure.in
-@@ -21,8 +21,10 @@
- 
- GTK_DEP_CFLAGS=`pkg-config gtk+-2.0 --cflags`
- GTK_DEP_LIBS=`pkg-config gtk+-2.0 --libs`
-+GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
- AC_SUBST(GTK_DEP_CFLAGS)
- AC_SUBST(GTK_DEP_LIBS)
-+AC_SUBST(GTK_BINARY_VERSION)
- 
- LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
- LT_CURRENT=2
diff --git a/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild b/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
deleted file mode 100644
index f731d1bad990..000000000000
--- a/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools gnome2-utils
-
-DESCRIPTION="Japanese Canna input method module for GTK+2"
-HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
-SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-
-RDEPEND="app-i18n/canna
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/im-canna/metadata.xml b/app-i18n/im-canna/metadata.xml
deleted file mode 100644
index e1a49f498885..000000000000
--- a/app-i18n/im-canna/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 5636d627aba6..e6d2b52003fe 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,4 +1,6 @@
 AUX transifex-client-0.14.2-r1-timestamp.patch 646 BLAKE2B 22d8eced003f2ce5275ef4a8857637ccc0d094e3c9b8405b1c204b78af4bc26f20be9fadf8a7e50d44e10c131f79e9b66f4f03f8ee92c3e73a548236e2903c42 SHA512 339d8ef42935acfd79f438e725683e9592259b9edeb3249d6817957f9bb25ddcd99d05485ad5220af1329937aaf0ea1249ed34cc53bcb3137e461e97a45f6b95
 DIST transifex-client-0.14.2.tar.gz 211398 BLAKE2B 4210a06da9fd09e689d28ae77a90c65f96cbba7b44a2cc506c2e385dc2f34659bfbda25eb81cef850442f4b3da22a859e19761798ec123888564b0327f0c6503 SHA512 5d7f8241d61621197df95cb42b2a8fb8088e77543f076c2401db14f7e44d67e49478d0b04cb525fc6281b37e5026edc8121f90cb7332e669d63be6112264044d
+DIST transifex-client-0.14.3.tar.gz 211428 BLAKE2B cab17d7103016a78b226df6ca9905a0ddfd1b8765fb7b161c7390911ac5693d97e7a872a00cbc86e9c8e7d84fbcd85904768f463885bb679e22ab052463db418 SHA512 9034111fa0253ce8799c5ba181d6d35e2addd14b8c2edb7822d8d572255c27f49e4cfce9d82e7e70e352c32e87f2e7bdc6bf09c2a591e689606b0831414dd863
 EBUILD transifex-client-0.14.2-r1.ebuild 1067 BLAKE2B 2258efe8b37c219685021d786bbea084bfc72084f8d336961b3648671156718b7fc86f8a0e21f8c785518695d6195bd2a14a6b30984970a3a04a2616f36a920b SHA512 84064038c4fdef42b084db4d09bd8afd9df480e359658451b70e92a58ece5b9d71c5fbe8322749aa0dbea4251f29ffc9d853317d8b6de1c5afeacca4e004f73f
+EBUILD transifex-client-0.14.3.ebuild 1036 BLAKE2B 5af5c04f772c65f06360a7531f5d485f7c8ecf6ee36cceb69b7a89ec1688c09506555a57acaf7eb0ba1ffcb1b78288d19329c07a9f18250f5b895c44d0d7fc40 SHA512 1e490ed0086e08d75085cf68821e6fc63aa59798289d330ee25374b6b3c3aa9dbbf1751b01a70b82d971168b8a5f8a6ecf1f059be1f9de5bfc687b72c471e231
 MISC metadata.xml 541 BLAKE2B 39f4feade85a590470eaab0c19062530385df86cbec95d167e0ca1c9be370fa07db6f51bae60bb389a84516ee332095a29b33beba97f4c258ac29582639c0384 SHA512 3e713de19b4abe79be21cd33fb4751e662f6757aa83705dd4d130a17ed8cece026a60f9111c09a76e7f5f7e4465ecaadabb1c30c8cd6d58683de69d6a0c2b8db
diff --git a/app-i18n/transifex-client/transifex-client-0.14.3.ebuild b/app-i18n/transifex-client/transifex-client-0.14.3.ebuild
new file mode 100644
index 000000000000..f8e5d92fb22b
--- /dev/null
+++ b/app-i18n/transifex-client/transifex-client-0.14.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A command line interface for Transifex"
+HOMEPAGE="https://pypi.org/project/transifex-client/ https://www.transifex.net/ https://github.com/transifex/transifex-client"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/GitPython[${PYTHON_USEDEP}]
+	<dev-python/python-slugify-5.0.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	<dev-python/six-2.0.0[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.14.2-r1-timestamp.patch"
+)
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	default
+
+	sed -i -e 's:test_fetch_timestamp_from_git_tree:_&:' \
+		tests/test_utils.py || die
+	sed -i '/tests_require=\["mock>=3.0.5,<4.0"\]/d' setup.py || die
+}
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index bb7f9b892656..2a3680ab9d7f 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -6,5 +6,5 @@ AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716
 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 5533 BLAKE2B d7fe314c7709d6e17802f064295ca300a6601d53865d9a45b2aa918c3f6c0c03ad71f371f5adc57b746cd1d697246903d502fcf31d92c7cbe0663cdaea42f0ba SHA512 f735c01f5053df6dd09ad8d852a583d90e5fe562a777f5af88f7d88808467db5cadfbb2f59ff8746a9b2d323505a58f6139b5d79f48927785d52b63f83e09df1
+EBUILD uim-1.8.8-r1.ebuild 5483 BLAKE2B 21d7f261fba2a0c7e79f578ab8ecaa8464e20ed29a6ef70bad82703191cd11ad68ec65a77350efd5ef09a080c1782566534e7dda1b7c1d069b74c1df3a29662f SHA512 fac70ee9914a29ea22d3a84ffa99e77c5c86bdb50d7089370a31621538a20a1bf9d0a2f880ab11e090381fbe769e77f6863f169de0fbdc3e8f5ff918ba64af67
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/uim-1.8.8-r1.ebuild b/app-i18n/uim/uim-1.8.8-r1.ebuild
new file mode 100644
index 000000000000..1c032e933dce
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.8-r1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
+IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
+RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+	gtk2? ( X )
+	qt5? ( X )
+	xft? ( X )"
+
+COMMON_DEPEND="
+	anthy? ( app-i18n/anthy )
+	curl? ( net-misc/curl )
+	eb? ( dev-libs/eb )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	expat? ( dev-libs/expat )
+	gtk? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
+	libedit? ( dev-libs/libedit )
+	libffi? ( dev-libs/libffi:= )
+	libnotify? ( x11-libs/libnotify )
+	m17n-lib? ( dev-libs/m17n-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	qt5? ( dev-qt/qtx11extras:5 )
+	skk? ( app-i18n/skk-jisyo )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-scheme/sigscheme
+	X? (
+		media-fonts/font-sony-misc
+		l10n_ja? (
+			|| (
+				media-fonts/font-jis-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_ko? (
+			|| (
+				media-fonts/font-daewoo-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-CN? (
+			|| (
+				media-fonts/font-isas-misc
+				media-fonts/intlfonts
+			)
+		)
+		l10n_zh-TW? ( media-fonts/intlfonts )
+	)
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-tinfo.patch
+	"${FILESDIR}"/${PN}-xkb.patch
+	"${FILESDIR}"/${PN}-zh-TW.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+DOCS=( AUTHORS NEWS README RELNOTE doc )
+
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+	# fix build with >=dev-scheme/chicken-4, bug #656852
+	touch scm/json-parser-expanded.scm
+	# fix build with "-march=pentium4 -O2", bug #661806
+	use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with X x)
+		$(use_with anthy anthy-utf8)
+		$(use_with curl)
+		$(use_with eb)
+		$(use_enable emacs)
+		$(use_with emacs lispdir "${SITELISP}")
+		$(use_with expat)
+		$(use_with libedit)
+		$(use_with libffi ffi)
+		$(use_with gtk gtk3)
+		$(use_with gtk2)
+		$(use_with m17n-lib m17nlib)
+		$(use_enable ncurses fep)
+		$(use_enable nls)
+		$(use_with qt5)
+		$(use_with qt5 qt5-immodule)
+		_QMAKE5=$(qt5_get_bindir)/qmake
+		$(use_with skk)
+		$(use_with sqlite sqlite3)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_with xft)
+		--without-anthy
+		--without-canna
+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
+		--disable-gnome-applet
+		--disable-gnome3-applet
+		--disable-kde-applet
+		--disable-kde4-applet
+		--without-mana
+		--without-prime
+		--disable-qt4-qt3support
+	)
+
+	if (use gtk || use gtk2) && use anthy; then
+		myconf+=( --enable-dict )
+	else
+		myconf+=( --disable-dict )
+	fi
+
+	if use libnotify; then
+		myconf+=( --enable-notify=libnotify )
+	fi
+
+	if use gtk || use gtk2 || use qt5; then
+		myconf+=( --enable-pref )
+	else
+		myconf+=( --disable-pref )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die
+	fi
+}
+
+src_install() {
+	# bug #222677
+	emake -j1 DESTDIR="${D}" install
+	rm -f doc/Makefile*
+	einstalldocs
+
+	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+
+	insinto /etc/X11/xinit/xinput.d
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
+
+	if use X; then
+		docinto xim
+		dodoc xim/README*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN}-el emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+		docinto emacs
+		dodoc emacs/README*
+	fi
+
+	if use ncurses; then
+		docinto fep
+		dodoc fep/README*
+	fi
+}
+
+pkg_postinst() {
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+	elog
+	elog "If you would like to use uim-anthy as default input method, put"
+	elog "(define default-im-name 'anthy)"
+	elog "to your ~/.uim."
+	elog
+	elog "All input methods can be found by running uim-im-switcher-gtk, "
+	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
+
+	if use emacs; then
+		elisp-site-regen
+		elog
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
deleted file mode 100644
index e658b221ed76..000000000000
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
-	gtk2? ( X )
-	qt5? ( X )
-	xft? ( X )"
-
-COMMON_DEPEND="
-	anthy? ( app-i18n/anthy )
-	canna? ( app-i18n/canna )
-	curl? ( net-misc/curl )
-	eb? ( dev-libs/eb )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	expat? ( dev-libs/expat )
-	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	libedit? ( dev-libs/libedit )
-	libffi? ( dev-libs/libffi:= )
-	libnotify? ( x11-libs/libnotify )
-	m17n-lib? ( dev-libs/m17n-lib )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	qt5? ( dev-qt/qtx11extras:5 )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-scheme/sigscheme
-	X? (
-		media-fonts/font-sony-misc
-		l10n_ja? (
-			|| (
-				media-fonts/font-jis-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_ko? (
-			|| (
-				media-fonts/font-daewoo-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-CN? (
-			|| (
-				media-fonts/font-isas-misc
-				media-fonts/intlfonts
-			)
-		)
-		l10n_zh-TW? ( media-fonts/intlfonts )
-	)
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-tinfo.patch
-	"${FILESDIR}"/${PN}-xkb.patch
-	"${FILESDIR}"/${PN}-zh-TW.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-DOCS=( AUTHORS NEWS README RELNOTE doc )
-
-AT_NO_RECURSIVE="yes"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-	# fix build with >=dev-scheme/chicken-4, bug #656852
-	touch scm/json-parser-expanded.scm
-	# fix build with "-march=pentium4 -O2", bug #661806
-	use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with X x)
-		$(use_with anthy anthy-utf8)
-		$(use_with canna)
-		$(use_with curl)
-		$(use_with eb)
-		$(use_enable emacs)
-		$(use_with emacs lispdir "${SITELISP}")
-		$(use_with expat)
-		$(use_with libedit)
-		$(use_with libffi ffi)
-		$(use_with gtk gtk3)
-		$(use_with gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_enable ncurses fep)
-		$(use_enable nls)
-		$(use_with qt5)
-		$(use_with qt5 qt5-immodule)
-		_QMAKE5=$(qt5_get_bindir)/qmake
-		$(use_with skk)
-		$(use_with sqlite sqlite3)
-		$(use_enable ssl openssl)
-		$(use_enable static-libs static)
-		$(use_with xft)
-		--without-anthy
-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
-		--disable-gnome-applet
-		--disable-gnome3-applet
-		--disable-kde-applet
-		--disable-kde4-applet
-		--without-mana
-		--without-prime
-		--disable-qt4-qt3support
-	)
-
-	if (use gtk || use gtk2) && (use anthy || use canna); then
-		myconf+=( --enable-dict )
-	else
-		myconf+=( --disable-dict )
-	fi
-
-	if use libnotify; then
-		myconf+=( --enable-notify=libnotify )
-	fi
-
-	if use gtk || use gtk2 || use qt5; then
-		myconf+=( --enable-pref )
-	else
-		myconf+=( --disable-pref )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	# bug #222677
-	emake -j1 DESTDIR="${D}" install
-	rm -f doc/Makefile*
-	einstalldocs
-
-	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-
-	insinto /etc/X11/xinit/xinput.d
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX}:g" \
-		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
-	doins "${T}"/${PN}.conf
-
-	if use X; then
-		docinto xim
-		dodoc xim/README*
-	fi
-
-	if use emacs; then
-		elisp-install ${PN}-el emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
-		docinto emacs
-		dodoc emacs/README*
-	fi
-
-	if use ncurses; then
-		docinto fep
-		dodoc fep/README*
-	fi
-}
-
-pkg_postinst() {
-	elog "New input method switcher has been introduced. You need to set"
-	elog
-	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	elog
-	elog "If you would like to use uim-anthy as default input method, put"
-	elog "(define default-im-name 'anthy)"
-	elog "to your ~/.uim."
-	elog
-	elog "All input methods can be found by running uim-im-switcher-gtk, "
-	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
-
-	if use emacs; then
-		elisp-site-regen
-		elog
-		elog "uim is autoloaded with Emacs with a minimal set of features:"
-		elog "There is no keybinding defined to call it directly, so please"
-		elog "create one yourself and choose an input method."
-		elog "Integration with LEIM is not done with this ebuild, please have"
-		elog "a look at the documentation how to achieve this."
-	fi
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 9d36bed93d6f..7bc051932e43 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/thinkfan/Manifest b/app-laptop/thinkfan/Manifest
index dccc5516b2bc..f014c4a458f3 100644
--- a/app-laptop/thinkfan/Manifest
+++ b/app-laptop/thinkfan/Manifest
@@ -1,5 +1,7 @@
 DIST thinkfan-1.0.2.tar.gz 77653 BLAKE2B 1b40553380f9b873883f0dc587665f24cd2e07de7a7e743cb9f99a3282f380da2258265a612b1c97d2945fed31aee0d6cbc30ea2a18c0b212e877e7635eda336 SHA512 d9133538096a7c5757f599adfebc8217aa7334a102573d6757f03b5c012a09d600be923930fd9d62f4afa591f5eb7a70a1c328004bddef85494d1a7ce56b648f
 DIST thinkfan-1.2.1.tar.gz 84253 BLAKE2B 5a816b8cadbc72424384966b0bc6bcf17070eec703584c348bc28cf8ee59e4d67a56d351f0c1d9d55328326b21134f0158bf976f86336bb5d59b81c137b96c83 SHA512 27db9f54c26a85093ff7b9f8a0e26f679e413489f608b561b819a702fd077a33e62197e41a1f1f4495c66daa1ac70603c063e6ac4cdd09d13f4005f73685152d
+DIST thinkfan-1.2.2.tar.gz 85779 BLAKE2B 55d3806756aa638d8a97b74a8b6142f58e4b805c319cea2be0c4022fba7b9c2eb286956752788197aa50ee2a07f1fe826657ba0b95a47832a9f4e0f5070f3f82 SHA512 7991ef9e1891e9f4d843a0421404d8ccdedf398777f44ed0c6c58070849a6eae70044a72bad4ad9595e9528551212db228bf868371fb9a642918a69d2b4e917c
 EBUILD thinkfan-1.0.2.ebuild 909 BLAKE2B 7f8eba1b6807270d6d9fd71c68163f8c4837053f23aa76b68b4d45adfe803988f6607bc556cfc10c4d6e6afadbd8a8e08af4c057bf2e88e8bd3dc56a2db7391c SHA512 0c452ffb9c5bb01ebd956a91f422073a1bc65f247590bab15c666a45d921da6138041ebdf5064cec2038cded4860c522760298802b33beea3f6470c0f5901d1b
 EBUILD thinkfan-1.2.1.ebuild 911 BLAKE2B 180fa96487602980c8fd6af469ca54bb30826907aa23660fa1eff483ef79441e4313fd60302319853158cdf4d72d331dfee08d9fe7ef81e8a32483bf9395101c SHA512 33c42c44ea7251eab3b8164a0e397f6de51729730f5b4f754fb0420e20686afe0b79367323f73248569410060387e09cedeb0b6aa5826f6a81a43d84a20c1abf
+EBUILD thinkfan-1.2.2.ebuild 911 BLAKE2B 180fa96487602980c8fd6af469ca54bb30826907aa23660fa1eff483ef79441e4313fd60302319853158cdf4d72d331dfee08d9fe7ef81e8a32483bf9395101c SHA512 33c42c44ea7251eab3b8164a0e397f6de51729730f5b4f754fb0420e20686afe0b79367323f73248569410060387e09cedeb0b6aa5826f6a81a43d84a20c1abf
 MISC metadata.xml 744 BLAKE2B 7d5d7047bf3224b59f9336bff25a9d3a412267a8004c3f2b2c695c1eb780e201b8f73c47e90fd83229e1a09c36c8969a218b0edac6a4b47ac655b7faa1ca569d SHA512 ac6aee616147ebcaaceed19b22e22459a3dc8c725793428800ea3e03acd8cfb38b2076c155f036c07bc4e13faee8c4e4bacfa12d528442dbd25adae4fbe3ab9a
diff --git a/app-laptop/thinkfan/thinkfan-1.2.2.ebuild b/app-laptop/thinkfan/thinkfan-1.2.2.ebuild
new file mode 100644
index 000000000000..d59a97b5a27a
--- /dev/null
+++ b/app-laptop/thinkfan/thinkfan-1.2.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="Simple fan control program for thinkpads"
+HOMEPAGE="https://github.com/vmatare/thinkfan"
+SRC_URI="https://github.com/vmatare/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="atasmart nvidia +yaml"
+
+DEPEND="atasmart? ( dev-libs/libatasmart )
+	yaml? ( dev-cpp/yaml-cpp )"
+
+RDEPEND="${DEPEND}
+	nvidia? ( x11-drivers/nvidia-drivers )"
+
+DOC_CONTENTS="
+	Please read the documentation and copy an appropriate
+	file to /etc/thinkfan.conf.
+"
+
+src_configure() {
+	local mycmakeargs+=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DUSE_NVML="$(usex nvidia)"
+		-DUSE_ATASMART="$(usex atasmart)"
+		-DUSE_YAML="$(usex yaml)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	readme.gentoo_create_doc
+}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 8c544ce16dd9..ab2736dc53c4 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index db0637c5d111..5925de57ae3e 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -3,8 +3,40 @@ AUX node_exporter.initd 701 BLAKE2B 6dbe6f147332580c2f1433d293649d818bcb0033faf0
 AUX node_exporter.service 223 BLAKE2B 1d6646c85ac4da5ad6c8b62ec932d0e7dae6f6cd02a1148c4641562f21b9807fe371adef564804812c81df0252043be74abe7f4f980221f2ce4b762e4186cdbd SHA512 7d7c5122773cfd2ad9f4cf987b259ed98788cbba0288485cf1a32f0b973353b6ed93e0e03320a5bfdf0d5431c050de918a1ae912b140355d14d817b383cc920e
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76bfd106924e8a9ad50913946ae7e8243dc3e61356363a361384ee6c827bb4040976d783b217ad1619be3a34cba533940ed4ecfce4be41 SHA512 104e7cd0eb1c4a3bccfca3feb31f1530973d4829d853ee30e8e03c2ef80ccef784bc0560342d31d8dcdc6d410fe8f64a302140e452fb77d96ea2b342bfb8b319
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod 982 BLAKE2B 9e5e32bacbfe15d8c72b4ee66a6e4124a3d58b989ecf022cdcda38e99b83924382f412067de8f6bdf3b1ecf8deffdf8fc74a8be671221f39fc2c8b11b2919e88 SHA512 86e2e042bcb371780189029b21afe24ba8ee166a9c0a4eacc314444844cfca3dfdace1678b01a213b7452cd69acd1d46b7051614569b99ac6fed84887b0e3097
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod 1048 BLAKE2B 8e1306450c5e8dbba561b9b24ed532f78fdd40a27c989b2bb6a981f4583959f4ab71e913685444c291648254455662909243a547bd623aecc426a1a6971d0376 SHA512 deb18eadb388fdf52fc6345b05c30a459777f3cfc67ed44d072a16e214c4ad1ef88d4775d38a3abf03df26d42fad13405f6fba081c5c19c129ec39df1973d8fd
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod 1096 BLAKE2B 6e3982479d332fbcf74ee167d41289e6f4cb4c2982e85e0631bb4b2bad291d3b76d86a8c4e18b7aec9e6494b54e67a0ff2b2b65ff3f113f530501ba964f93e60 SHA512 cbd08504799b151d34a9f3594f0713077ed5b421ef9c0fe9dd90b773638617e6f6aa153e6241dbbffa891fdaad4b14e0523834cb45e84d28f7e213b007e7e08c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod 810 BLAKE2B 50cf503d994003d7974ad786a741c1429b44d6764bd9d9ba58139fc5fb88c0264a7e908699ee35667f4e827cbc59733f7fbb8b38837b495d4c23c2d10b1da114 SHA512 b6dd5fa24e928bad836e791a19a0d707c755d6c2b75c8f60f42a9e0410e91034373b01baa61104c24bf1565adade99656948c75be08cec2f945bb8bde91046d3
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod 831 BLAKE2B 9d34710c0f721d3f471c3da32555b4a3e559474afb8d30237b0935ce167e7bcb5507d2b19bd6675da724927109ed74ba79dc9dc3b3d8cb271515ef2c6bb0c7c1 SHA512 d1a718c4ba19ee0d4221858dd0710cc480fdf6c0b134f1ce5c4a805b15cac88a77e73f26e79f480b0852a6c0f499c63876dacdb3038ea40d38e9f8ae577ce219
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod 489 BLAKE2B 036e068699429032701dd26044fd2353645e54260a7aab7f924fbfa1e1954eb814addbd9a0751ed1c786ed6c44566db5289cd4ba9e54727d5b24b6edd38a8562 SHA512 5f6a8f8f2d4ab26bdf3f150f22e6ef4feb26f264630315fdde8c171b6c2da5314057c4d763d4c61a66bc42badeba2745f576d52009c4549919e4afafa748b3be
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod 649 BLAKE2B d4ef60eed1eb5c4b84623a6bfb8bcdd52be49ea6723e2c39f8c7c87e34943aed3629d7413fbffbbac9e888bfbafd6f0f07ee84002901afb3a8cf1090b87b53a3 SHA512 3adbceec8b4bd989e804054b56e271f73658adc8a4a8bd53e32ced709a8796b33d9cf09f5ea3165dff931acc942de45508ae79634dcd9722c2220814b275f425
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8e88465ca9c754b798d6f1f270e1fe5891221d482f6b5854524d09e3d19b6f75e494f69b4861e2f1b2329c08fe9e4235005f2dff41928950dccc3 SHA512 74886885016c92ce56b584665bdcc925404bab745a25ace03dacc2ace3f812a0d568ab8d19044097906b9da479037c41468c33f1243e6d55b36fba4571117607
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod 625 BLAKE2B 43378388e5a3391a431d0e842e23ef1fc74263a797bfefacebb61ad88b42f21d133d99638f06e03cadb7894d271884f06d1f3ad9743648c31b7d22bf7e19283d SHA512 0e2dc636df1de8119b3b4153466d8f31b4e2e9fa637c625ea0a7fd94951ee38edc02064cc00d7fe9a4d9f7e3d1ed521809003602398d68508772b11939755cdf
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod 622 BLAKE2B eda541042b6fe3c3f77512f322d535505b5545eb72dec0f4f3440af05e037bda987f1f97faf7a94ec946201e8ca26a2220bc570d7a9c40a08cfadd724fc2973e SHA512 2825d124965f45e40b36bc1d2f8133f8a1fb5ff94dd95d2ae4383bc4a300ddfe0efb75ace2f9408582525c377769bd1f75cd3c0c655c74aa75708f7a66c56352
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
+DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%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!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod 35 BLAKE2B 68297267e33add40ca12e681b6b4461ef8a3dd23eb205a365b13b158d0e055e3650fa9539eae43bbbf4ddb559c872b95ed541a3f4330a0ad3395089c4cb9c9f8 SHA512 73bd53e14c96c10e3288cd859b5d7758e6d2897369060b1581b6a4290e233877e408c9dc6350b763c2ab678a2e8f3e8f7f3bf563928b43ad37a48187ccc0ee7b
 DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod 33 BLAKE2B 7013f44d03c22c21595c5369c52e1538a526891c9fc4cccac37373504f13c66d7c504552251f46632917739dfa1d6c3a15e15aec4dc03b9c69902b0bcfc8785c SHA512 db3271d8abd514934ce5d06fd20f7490db8368e57822a2379bbfd4ccb94e67354400d487d388a57467a5a16cec339cbae9488cecf82e41d85918639bedaa0a87
 DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
@@ -43,8 +75,15 @@ DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod 177 BLAKE2B 0b2b115bd8498c8e4fe3c848cc9b8f1379165c4b1ee7abdb94733e3964ae15450bb6df4d8b959a03679d285cefac8862e0b57a9230f7d6137293c35d72366c54 SHA512 6e8fc3bc808aa947132c3fff22b4aa817fe2fae56fcdb5fb07445816fe45dd84db964dda36a795e9641dd2ce2a4df5487454884e42b0106603dfd7558e5928e9
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.mod 177 BLAKE2B 0b2b115bd8498c8e4fe3c848cc9b8f1379165c4b1ee7abdb94733e3964ae15450bb6df4d8b959a03679d285cefac8862e0b57a9230f7d6137293c35d72366c54 SHA512 6e8fc3bc808aa947132c3fff22b4aa817fe2fae56fcdb5fb07445816fe45dd84db964dda36a795e9641dd2ce2a4df5487454884e42b0106603dfd7558e5928e9
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.zip 1437780 BLAKE2B 3d95c9b416c708e291f63c19f80a0fbf1f1b6b99d1daca5d495af9450ce4788982f7a1d1dafd6e441e61ab5669ef6dc938123d542ff76bdd527052305209394e SHA512 3c3bc0ea9702a6b61675ba257dc83d6388b72dffdd0ca9bef7e485304986775b8e40a5241d1ff3242f1f76ff91202751fd6adb449a0854cd07e5f9fc157b2b51
 DIST github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod 32 BLAKE2B 5483978ddce5f57e08f1358c34e5ea6b26a234e017b2e3a9af91296de3c79756f73f8cd9629b7d04c88e2135f30781cd0f43fbf9eceacebf26f141bb297f376a SHA512 865b4cc3ac91138e9b4581be778685f89bb93cdaf2372bb7b5db6227e249a2be89d5d14c89bd0e874e01d744aafc08b30b3ccee18a472981bed0e7740d892da0
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
 DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
 DIST github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod 40 BLAKE2B 58aa150182b5b43107154bd337eb024049bc2c7e2d26cf4344c97d554e03d4175862ecbd1b65527aecc85b9824c474c3e5a49eacaad18e253cec50785963b18c SHA512 8a0be9bb45924e5d384fa68dc2e990a4705b46e8878558d4db10fb794c8e20b13ec54831e7387cf425613f3f33b5952702deed074bee5818fed3fb9cff7b4259
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
@@ -66,18 +105,27 @@ DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod 33 BLAKE2B 52211e27792f0607
 DIST github.com%2Fema%2Fqdisc%2F@v%2Fv0.0.0-20200603082823-62d0308e3e00.mod 259 BLAKE2B 8757fa37b86fd5da53fc6e617d3d065756517fe81916fd798b8501a761e1ce4bc82403c265078044629cc2af94797ec9f1b7f79f86487a925d79f92d222d995c SHA512 6d2d1f8c80c45e22999a94df9f3871359603cf9e3395a04bc065d0349eaa2d3460e6a341bb42aac2a8b26dfd61997f15b01f9c1712d861ff0c96ed1cd722dfc5
 DIST github.com%2Fema%2Fqdisc%2F@v%2Fv0.0.0-20200603082823-62d0308e3e00.zip 7089 BLAKE2B 7e7cb534da6d42e1b63df6e6f34c5c79fcfa25ad2e191db938822c6991c3a26ed9d29432b2e0319fc869785881ed055202c57df41a8b9f8a3c1399062fd81af7 SHA512 bb18c8bbba6721303c03af64f1cb04f250f5450f327a51f2210caa74826242a1b900d86afbd7408d45bb2c2985ee7153802c413ca4ffb42c1e6095d2b2141c3a
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod 46 BLAKE2B 26844d83faf5b29bc13a3a48ccf6a3648324503647617e8ff13baeabe4d95ebc0e4f2ca5014b553148964625323dc1a11bbc0a4fb5357be97770a3b6cf808bc5 SHA512 5ec3e01429b0c86caa7ee04de7fd70505cacce1ed540081ce4c40143c8776cbb75443dbaa47642da02e263c02c7e3557d6425c3cb60f03a5bc296a1cc3b6541d
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod 33 BLAKE2B 69d161a91f7a47f08054ac8715154885a3615d8366b32d226a08f3bc975f6c87d168006620ab53fff5ca938232f06ac9eccb1b7c0621c91f9d7368b38cf29bf4 SHA512 9376e6913b3d764bcf0de41f4d6cffec4da5a8d387488cf531113e1597371b838fc398020bc85fdbb0583fcd9fbc2fbcb23b246c3d8147a6c606bee3f0974882
 DIST github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod 32 BLAKE2B a4dc1d6fd70150916e3bab8b310fe7ba5c26aacb90241b18ddb51f2608ebcf4e82f29495e663181f5a7b1f0f09e0659607eae17850dd0bd3ea8dbdc0f4fa6ad1 SHA512 1e3cd7f2ca465a9930734e27984262e81d563551917c8af55c521f15cfbf56a423ef918fbd282b4947c81a65ffa1c17294d4cc83aae639d9432dd3a52fbe8e83
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod 121 BLAKE2B d9ab9021ab813b7b6985b19ffec32d7154e43a1a6def62015215f80f0be7f981786f112974b796bd69afd571015ee46bb8b7790bb52dd28da6b830563f1a6034 SHA512 50beb03164eb70760fe996a22127ba01c922fe6c817cbc6089c711cc19f6dc7e25ece6d1c9cd767a3b8b42b1cba84443690b01513a6740df6f8827e94bd1fc79
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip 49908 BLAKE2B 67bdf78212983dfc91c56ec978151d0d359e4c2f84ac7d68725ea1bf2404604011f63c73a293accd0d9e679996437a3678f5eb9dc0284b445a97c2cb70ca3638 SHA512 10f3c3075858f8c2096164ee49473611e9df69fe7df7ecc4b515c327f4f590a692b828553ada806054c896475257af706d903e5a964f8f2ce0f7706a6ba499b8
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod 2670 BLAKE2B 211a6d7642da991f148a7998fd35875f316a143c62337214ff428b4eecc7dee7db044e42f337edf531edc70b9aa99f46e349821864a63d384c7d050e414a608a SHA512 fdfed8273d2014838eaed6d4d2b0d92ae905fd796a0fec6c5a0eb27d15ec31c72e1e79973d909a1ac01df1a2e5afac99bf17d5cc7d08f507474c8e8e7ea88ef8
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.zip 461958 BLAKE2B 025cdb8036d1e055a68ecb215d0e8464e0840d5ad9f63c7ea11cbdb20998c74d21f5b9d019bd4b36335e9bb485b6fa5ee285eab1080b755aad8bed59e29e7d9a SHA512 fce6fbee13f3b4eae6182c000d809d9d96918ee93be3d460a6ff359b0889299a806e76b9caf364454211116b5acabca02caf2f401e900c95ec41a5bc54c4d693
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip 438465 BLAKE2B d9f6dbbbca901ff7f0d187ddcb5532ae520b78d94011d8331d78ede1fa43930979d2fea6d9ba23cb23741017aa62b279317efc1fb4d20e1eab10ac6349aa1c26 SHA512 cf24e24aa121b5e466ec7d838a3cca691d580163a1ab378a557427f8a5b7399cd11668425c0a9601178b43719bb5dd60029c52421d05720b173ac73f096d6737
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod 121 BLAKE2B 6463ba6a856a7bb4efcd00a3369f6593b31b8ef39da4bb16ce1acd741c0808d2243ca7787c0a52d4653a5b402841159e97cd4b42e0f6172ad39429beb2b06993 SHA512 564f0a1b0318004a7ed478c8f3a371ea2f59efd56eb2efec4fc806183de1b4a065d5b44aab6dbd40446d28caf5a74545a7ff6a3d428b1b41cb6df5eefc11e5c3
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.zip 45063 BLAKE2B e64431d884daf0d8d9f62910ea9970ad2ca5bc7e5684ca2148f03f4c9f4563f5c057de5d0f1b44a12536432f7f5ef019ccec6d113ab7ffa8213de68029e80090 SHA512 c5b1b8d35dc5ef3e18474a42edc4dd103238efa458b70328bc1ac0b3c90abec311719b18dc0c0b9bfcc1cfee77ee8374cb8936568ef62580db17c7d1a5c18f3c
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip 17559 BLAKE2B a527ab39ba8646129de4c22303bc8c1c58e9834b8ee898a55cfd6940c665134305290fe531e9c8f5c9a1d8d7171db671e479af5679c8abfc4b60c1200761d894 SHA512 a47e8dfb165764ae38985658525e16d7e0942248aae078d2bed543c355ab177e49743556503b59a27cdb33935954ba5d8f08d890b29e5d7fe5d606f2c5b57bdd
@@ -96,18 +144,30 @@ DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6 SHA512 d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 461624 BLAKE2B 37b2bbde9cd1153fe5811ae008983179820ce40fd6816155fc7b7d040e29b8725509f68c30b5099b686e9a6ff31a2d029188aa526ada6375fb9c7a236b8a7d1a SHA512 a99c2150515bc3deef1d7887644497fc4aaa96ed6c2aaeae91aabfaee6668c144b34a2c75ca829636c7e88d59b297601867b0f188ac048de452b5e0767480608
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090
 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%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
@@ -121,12 +181,29 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip 128896 BLAKE2B 4981d158f2cbe026d5b56192173ff9da3ee72a91c766235e485530d30524066f4c619e7beb7e8daaf8f38746239516e754be3915126a908910faa812fcc55b38 SHA512 371abaf9db7012c40704d4f5ff322dafa27211f434b477a632f88e57db3f2cda168cef55c293262425a1039caed3bee9a65d48fa8b3d71680d66d3cc041de845
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip 132988 BLAKE2B 48845d9df9bc0766f93a141ddc1989fcf850d76273824d62ee11297774703bed33b1dcbe77817b6eb417769ed11249d8089d248631a8c6669a75a6d34e048653 SHA512 22df4fc49c44a1e73eb72295195633bc04b67fda27df452893ae77932879b62b344455b880972e78022a61dafb30eba8b5b6a872f6c66e093323fd5d1c086466
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
@@ -159,6 +236,9 @@ DIST github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.mod 142 BLAKE2B 5643e29453
 DIST github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.zip 26045 BLAKE2B 4ea0852505863d4c6ffd437b28b8ea64b33c3c1388fe0fc4c0f7d6cff98e9feef7a906f5f6d842c468c697c59fecdd5da772ab77e5ca80248cf88f0a2a4f7617 SHA512 4b728fddccc9ad4862daa4f14f4a662db350a9c9660b4e627d1f8a12ae38b321034d752e227ec5fb20bee89645ed77c7797b886e6c4ebe1f48a696442f6a506a
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
 DIST github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod 29 BLAKE2B 7cd37a0dd89dc331943531c8477a4773980f42e0c135a159bcee3ae6bd82aa8f15c4d67e7fa60878a35c7fcb69d647738095087775e18c540059fff6f4dc192a SHA512 28dafc16202503db863783e4701ab30b34c71b4435a4859329fa635c0915f0ca408dcd8c73217e0751f879400845d8136e171bde5d0cf6b7fa7ec4ae3ea97f69
+DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
+DIST github.com%2Fillumos%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.mod 35 BLAKE2B 8ba236119905b49478f14f59296ea975b92ec28e0e1348374da7e77d8158a110feb271bd0626ae9362cd527a595f0839864635c403da058678389ef746e57c44 SHA512 b74d7bd10ce7519c6de9fc63e96f7b651da543bb458322896166039a1608c194dc32b6989d330a3841ec49b3ab0d7c6b42cc917e3f6dc595c1ccef33af80e3e3
+DIST github.com%2Fillumos%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.zip 37686 BLAKE2B 27cbc0ac6e7a54712a667c45fc5eedb83b6e4756aec92909d89efc9caa1af93adadffa95359de91d0b4e4759cb316d35c2e5646bec63db42edcebfe13768a344 SHA512 68ca9a6286bbd10176d7d2a63c1015c05a5cdf94ce2c9561b3e436b3ca49e4adfcf0fadaad1ecb1ae52afa59c633424608f7d0bfc780221940f8ecc3685d0b61
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod 46 BLAKE2B 825c65ce0e045d5c764d3ccae81a25c6224c44656bb8ceb93f39d06a0c8d766ce7562e5ea1ceed903a5d1ad4c035e27ee84b4311548d024e108a5cd6ca142508 SHA512 324450602d8234231b0cf40b07e8936948487354b8f6e92012f3e65ba3c646b0993e4722d3867a12d0bd3749c8dd6fca4a1118393e2ca682170e500b3d54e5fd
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
@@ -177,10 +257,17 @@ DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed163
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201220180245-69540ac93943.mod 183 BLAKE2B 6e7de9283060b1483674c6cd311f63dd1b56393b27112350b5eaba3b57247265be76ef1ec2adca6371a989d151288f26e8944ad54043c2e009807a519863d506 SHA512 9793ea1a24308fb13d97fce5ca7157438008987c83697c111e7bc6caa06455e34f1efa7f24db818b92966f2e87d24233f4c860aa0b1a4d45965b73b5b7e84b73
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210122163228-8d122574c736.mod 183 BLAKE2B 756efdb68c56af7496e5b5022fa290da5a08e03d353369d09b7df3fb3bfd5ecfbc673a03e9a1ec76f5997b0c96fff112cad2afafde3cb52bb4bb5d73a8588fc0 SHA512 c33847223aa68165116901e5072bcc8cde9524e7e39a73508cabc2784054bdca2976e228042b32239a41b4aeabe5e912d298b1887971998af28e991c2f013759
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210122163228-8d122574c736.zip 314646 BLAKE2B 66724ef0ea98b330e2a5af3feb37d21c017129f7ed68a5fd260e561c0b7ee1395ecf5aadcf8266c6e08cc0372142c6517ef2bef37047dd2f3af2a76b8ec9d268 SHA512 3ca961290ad66af236f2d996fc393e36508d5921555d7fe33a9f1fdb37fb11e14034eb2c01e5b8763b7b415be893583f0a263e5f3792bb4d0f639185d2d868f2
+DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210212075122-66c871082f2b.mod 183 BLAKE2B 07af76f6da8d21edcea5f51214cbb922389efa33e360ce19b7bf99fe63a40f71d1eaad6f2668c9388ecc1a8fa720695aa8d107b5f2d531916afaa1de3b5025d4 SHA512 70c48b170f2711b848bdc73c44612892af57c38b23812c4726af7e02de4aa7627c316127779b3d6106c86c82343b9d10e40a817aad12a4ff78d42309932523e7
+DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210525051524-4cc836578190.mod 214 BLAKE2B 617126f939ade8b353d6dbd39a6ebbf67f36397ea6d6c7b3909cce060bc714c166a374db47b0b1634575cf9efb27bfe7ed5cd4d2ff554e088f6358ff624d7fe3 SHA512 fdbc92c9f04c07244f8f88dd53328273a2c262059159880ca9c95c881dd596982fa1914d9b0f6e07d2f37c709009884ebdf7559dc150076d02fbbd1b451df06e
+DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210713125558-2bfdf1dbdbd6.mod 214 BLAKE2B d64021eb72b423680ee867f38bd7e001063435de4e062fdeef302a6de0eaf80dbf624f51ed6e99d071f0681e8908dfbb04ecd25b6e7ec994cdeca9d8aca0a46f SHA512 492d8a1d683b45d2f93c4253bed4cb8f00db895f335a9163d1a3b503c0020f10f8f674cda0e5e3220d0556463f230fcc127be06630efe2d75f49c0bd622e5c89
+DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210713125558-2bfdf1dbdbd6.zip 318927 BLAKE2B 9841bb05ae82da8d8d0f5c7f6cd92f976b15eb6a1d62bbe584208f333133d3d82494e4d2f9208fbad23e24d5e4676e7a0e03a0c0c697991b0f0e8a839f922691 SHA512 d0f6630dad6feab7608fc3ed05ccbe81d91fab38f58af3910d19489e09c9fbc3b79eabef3f4a12bf461dc565c59429b0bce934812ffa43c701a0bd81c18a2381
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod 51 BLAKE2B 2e102c58874af58833146011d2b9d64950522530e5bb51d643b06f98b258d7cb52efa2caa36a1fd4d39d4307a37712de7f22d45990ebab7a755b7cacedcc861f SHA512 e208321653fa4f40d2af68b6db37a368134e27463a45691a1642bfbe67186efa2a6fa41cddb3e443e465c7425d8d44cee8364953b39e1b08fc16b447431cecb3
@@ -193,6 +280,8 @@ DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 B
 DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip 9142 BLAKE2B 0db0e9a6ba33fd156c75943cce1b95385e53593d7f6957f0e6375b38625e1ee60a86b80229ce6cf0ee33de603fb0788892d0a3c3cd20a6969c1acca2521953da SHA512 5e493f08d6a45e8e12160b8c51eb380156ba1d2382523e1be159fa16d15d7ac32c8bbf2861e74791a0fdaa06155e95ad12b5f4999515a9a69dad1384ebbdfad0
 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.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip 11508 BLAKE2B 609b34f41f3c1579ae15bbdd5f9632dd58e9082917acce355ffc5402c33ea45bb0bda32d009a0a58c6cd60327aa87008453e0c4c36ed2a1be41c4f5337de72d9 SHA512 0f792e6f960b0cb8f9a30c25d3a3f30e7c459a05d7f03f68c98cb581967fc48b377314cb83b990c9509cde5680389bee0ce2b0b1efedbceb5592f38a9ae6a3ec
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
@@ -209,6 +298,8 @@ DIST github.com%2Fmattn%2Fgo-xmlrpc%2F@v%2Fv0.0.3.mod 43 BLAKE2B 8465ffaf4344d88
 DIST github.com%2Fmattn%2Fgo-xmlrpc%2F@v%2Fv0.0.3.zip 6485 BLAKE2B 5e20259b09b75904c1fd8160520e1479eb43496505ea8572e782dd8eabef84295bc5da7107dae370de880e0b8da2f0e98e05486212c52f40303a512475d077a8 SHA512 bc5dbb25852371700ef2ea0ffe782ff15525eadcd4d143d43c04a9efab19a420f855427a5b7821499bba750ba60ae539e52699b255130657a74e5b21165df6e1
 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%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.mod 416 BLAKE2B 878a68265b507bd89c54b26723feada5c0a60386f31994dca369e0104d93de8afc29d60cf5d941db0b6482a4022c1e96739e55db52a060abb4fc35b3f31f4ade SHA512 076bef366913fb12bdb853fe3a0685dcc61e1847b22ee9458ce9b568e405756b81362b372541e07d8fb2d915aa158593fda8f1778f56ee56c3fb9198995b47b0
+DIST github.com%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.zip 21974 BLAKE2B 4fd72de9e79812aef609897f25b72bbe1ed3b406a9cc8e3ba7b75f4169fd635c435d212b08d24ad61a4b1c2893b5200047264f580becad0bb0b85ef7bd5b204f SHA512 c620da931701702ac62441ee1f5bf1828937ee1197de3eadba136b03bac6349c5e9c3ac77db15909df5c3e85cd85ddfff49673c5af40283ba574106f43ee9141
 DIST github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.mod 234 BLAKE2B b1660dbb5765757fc3386a77b371bc5425822dc3d6840428a046e8223ff2c609302e6735a8e2e525ad643eaf300199d03d8c2f2ffdc4f2643a3caf3f7dc568c0 SHA512 a8c90ea59e48146137faa902e0948d73fb2e877d8e7cc18979f2e62ccd2b640bf67e4d718b7b3d3d17b1ef187012a23ebd91bd4f539e97219db318a28fbe7f0d
 DIST github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.zip 26695 BLAKE2B 9d585bc8b3f4a7365e1bc772869723190647722ab35777eb70e1b2df520bce470ecb02ab45ae620ba87d12fc86ef4bf4b5c8edb1a7bcbdd91f5a5f5821c8c6b1 SHA512 9d0d6f4853a857f7778a7c1521fd8a6a870de22483bfa19cdc6b46106798b16434f25c3ffeadb3f59a75665bbbcd93c8615854aaa8584ad8dd1abc7459b87307
 DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod 196 BLAKE2B 69661cd95029a767e20e49762a593633d3acd11e44b489bedc3f52c0a997826b5a07e9706b74edfebcf3aa94706836ee6362edcd32a9a7b6ff33dbb01ab0c1df SHA512 edb2c00f2879dfedf8116e6f21f8358ad89750e1b26ab25db625c55fcfbeface38b523c72e376bd7a5eee333d33e883cbf7ed26d07b4b3a567a162283d9aa006
@@ -223,6 +314,13 @@ DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.zip 75813 BLAKE2B 1d73838d138
 DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.mod 264 BLAKE2B 4dfab8aa041dcbcfcfdf2977f33f7930e658a527f341b399953383bef17160ad625d4a53f1340647311ca5d5606500b8d896353b7de62e3104fa643051c1e0ca SHA512 5982a106cf1fc5283e7a7b511349f850aaeae90ee15c5d7540d1ec70f778c34cce7d610ecfa5928e19555f18236d3bf78417374183ace8b79ded7881cdfea1fb
 DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.1.mod 328 BLAKE2B 7e4a7243ae61fb9a4ee122a33469bbb8b004686480239e389df999999e226d9ab8f192c84ca3765f4e7aa81a25f5299bbddbbb2890e59f37d3957dc3560b3648 SHA512 c5cff52d3c54b13d6dccfb67010dc4250783375a1f89f6a7369a162fe4ff4bba417bd868917f69c1b138ffebe8715cdd570b88440f37f58b420a73ef684bfed4
 DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.1.zip 74053 BLAKE2B c7de14e0b503aee6a6a6d4b53a17496a627604ec0f6709a08b921e7b2bdc1a6c4cc83319f8495d035f347bd8acfd8f9f78a2d22f071c8e5af60de4eb5dfdcbf6 SHA512 52fe069da010425c61232d1efc20e55629ce053b7592ee3974d52c167856d80290c76bb05614ea607c0338545149974b0a6abcf41564eb6b65d07e49326b74ad
+DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.2-0.20210123213345-5cc92139ae3e.mod 328 BLAKE2B 7e4a7243ae61fb9a4ee122a33469bbb8b004686480239e389df999999e226d9ab8f192c84ca3765f4e7aa81a25f5299bbddbbb2890e59f37d3957dc3560b3648 SHA512 c5cff52d3c54b13d6dccfb67010dc4250783375a1f89f6a7369a162fe4ff4bba417bd868917f69c1b138ffebe8715cdd570b88440f37f58b420a73ef684bfed4
+DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.3.0.mod 392 BLAKE2B 0214fe2210ff2364c0eee71385e90d780cd139aa9cc1771ab166da14ee26cc173251a31b6a04e039314bd5a1f5a29db2a4be184725a312e098cf946c12733e1b SHA512 1df040f6e751f4fa1e4caa04406da2022a00256bf12c813f6b11f1ab24ecc4157508d50bc980dc61756d727f45bafd577ef6785f53d2e1bb0d253a63c8c08492
+DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.0.mod 392 BLAKE2B e4ec1c4b2bbeb88ddc83f70d5fa5d93e0c403eb4699b01cbdafd4917b66d9a126376ed23e000dd235d9c153a8e19ec00c81665395f730b59b7b264c5f688dc53 SHA512 f43af87035b0a1c70abee9179534628b3423e3756769a3bf21447b6c81be406d3684a20e7dbcef9085078520cdd56dec5adbefb43f6fe318fed6dd23e8f0e9b9
+DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.1.mod 455 BLAKE2B 67395abfbdc1317efa3f473dae7975f1df3c394baf3b0b4f4aab105a3fbe23fcca8346e647e8660f9670d5d35560b25c7effcd7f7d499bc080d2e8a07dde63c6 SHA512 f7d641065734594f43b14059af28e24c5b2448bef971b166301fb6bbee3779203c3338db4b23bba628f43b028a1a75f370f4f2c0dc45d6c1e0a783c0af4e7d97
+DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.1.zip 72984 BLAKE2B 0a4f93005439b782dd6f207d91f105b69c08fc6f23e3b86a7d3e6fade9ab8adcdcaae80bc7d2caf69905f34ff9ebf0702d09533197ff0a383a368fd7ccfd8cf7 SHA512 8e6d1a86156ab0c6b54325fbffa76dc78929793cd2c417c845c92accc1d9050ad6769f26d1a07b18f8061645dbbb504de1a71fc790b2915b5060bfee53df5457
+DIST github.com%2Fmdlayher%2Fsocket%2F@v%2Fv0.0.0-20210307095302-262dc9984e00.mod 195 BLAKE2B d6db9ef7c12364835276d250ae784bb066e9b0715c2d3831c24f26a77b57a336a0f547f17bce3a039f2aa55f0c6845fbcc826837e74b27cc5e4e42810bdd65e0 SHA512 70b45161886b913894b792748af08ac4170cf07941c4bf067c311afa87f0c241e8694882858e6b46043ef6d014e5d0fb5232621014a4ab117d27ac5d4901a277
+DIST github.com%2Fmdlayher%2Fsocket%2F@v%2Fv0.0.0-20210307095302-262dc9984e00.zip 15222 BLAKE2B e7e013e441eaab24fe45530f15b33160292ace4893a952193f21631dbb05c226c5c3f86940d4ea7f5236a3474502845006779b5ed442492594b52ed744af49aa SHA512 8a3d3f47193c2cc01f6ad1c814df7bd56065f3a337681158367190c76f438f5c3719a6f10eccc18f581b3228d441066f566b2d2767e5f3c8190b3d35e6a3d944
 DIST github.com%2Fmdlayher%2Fwifi%2F@v%2Fv0.0.0-20200527114002-84f0b9457fdd.mod 32 BLAKE2B 675dce297bdda67d7eabdf0bda790656ec28d9d018b89db6c30a13cb2f769094c69e1534ff8f2607033b50e952d48f4083fd26cbc83e51545ffa34c60ba365a8 SHA512 ea1e8d89916bd16d2f58118ad13b17f34d8979fae7cfd29cf2350d2ca74b4d2a4bdda881e3e9a91ff638b913a2f89ca0ec44377ba03aa9bc40a47be12ca29213
 DIST github.com%2Fmdlayher%2Fwifi%2F@v%2Fv0.0.0-20200527114002-84f0b9457fdd.zip 89087 BLAKE2B 0ea6b8c8ee3bbf1bf00e6f06b1944c726c2951a99e183b4ee357e63810b19881519159f9bd5a79152b97a9a5421546bfea06685f5eca2a7ccb693f1a4a089416 SHA512 a0fa188a9b2a2e6accc616e6d35cf447dce7b4859e23490d8f18d6059c82af1edd23de1aed596ab4b52b8057d28676a5606d636c2f28bd16d00b1651fcff3adc
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
@@ -283,6 +381,8 @@ DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.zip 190367 BLAKE2B 36
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip 200972 BLAKE2B 6b6aa2cc4006f6671b0f54def912df6ff1aba7b69bd08c1950f7415032e2de383af556cd793f991989f1542cab5d7bc8a73894504c2f3b757a23007ba76b21b6 SHA512 c01081549c9e62a75d99ff37fb4bf3e620dd9e6a22a049c1b0b1b53604086ba68a5c366a7373423354b25cf7298c642956db7eca4b04be4b9431fe24ec8da125
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod 468 BLAKE2B 4ac6ec5b71271218f33b753092c494ec6dd01e73373df68af2f399d8d8ba32de0f02150c1c5fdac8518ac244391f126cdac602c63ec862bff559d76015cc78f5 SHA512 9c6244491c9a3012c4a2e575cdb361f7fa577f391ced254adfd8d567c361f073ce23ddd57a0f18ec3327189cf97ad737254c0d0ef2872085af6af7bf9dec1d72
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip 240896 BLAKE2B 4745181476be50303fdf0e66ec147d643995c809a1fd969c846f656d453025f2cd67089f3065b41bede74bfcaa65e5307dd9541457ed7f7ace31b6b567e2e135 SHA512 20c4e6baf239cbc8c8a754ec1b9ee814ff29df1b41332f75f7440b27864bc28397071f3f4d60ba6ff4d0aa531b7a20857e11ecca93057784f76f03876151e8f8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod 375 BLAKE2B fdacadbb6c23350ffa04e625324420df9b523d9fe5bccd8bd1d8f6d592d7ef5a2b4620c1d16c78bbbbbba2716f3edd015cc16ae5b0c3c31e5959ed12143ff3b2 SHA512 e98ebe9ff7f5f5c893ce7a54c12b3d5b86ae1f99a5117875bfb78aa2b59d9e9a95bd54e45e1a16e8bdfa79f38192626f49366a0ea4e36a25681e7448b544b144
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip 226158 BLAKE2B 899457f410f559d70cac7131e9c6057bfd749964b8b133943635b0ee78a12485d933718569d085f51dd34f831114c2f74986818536cf21ad642dac793b00390a SHA512 5c4d5e70be8984c9eea4211e06e1f9478fea4ee4cc227167b9a99d87fa773e060e42aa4866eaed39e58a251821840643d5117b12006a6809902daa08cca14b2b
@@ -302,12 +402,17 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip 163523 BLAKE2B 6d31ee2f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.mod 739 BLAKE2B 6a475498d76be0ec42814e1d5a932c707711b9538e8507afaa36a3ee6d26b78392f750e9553f960cd9768f3ba6a88b3d8c338b102ba48260c91b0f5b48e1cb06 SHA512 5d321367c7b93f913cb524c688dc515dfe28a0cd712665b61ac12dfebac8a67fd19ba578f8a3666b557b41670eb9f3cc718fb93ca413851552efd695859b7c4f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.zip 179538 BLAKE2B 63f0b8db91a63eeeeaca059ca5ab286c061ce89622af0a4083e1ba2456a09541eb01ca01c62d0f2c7f5e2fd6f35ce464443cfc787ccad3389099f508310f4f6f SHA512 5e715eb1efd6d64f6af867ec8c5171bbdca42881f6753e50390f59b6e68dda58976298e010ee1af178f116732f4fcea096f19d67eaf882120bd77f9290974f52
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod 794 BLAKE2B 91c9bb4469ac63bd98bdd1ce4d2f2cf3a233f62f6c30b1da0b2a94eb1215a975f3a19cf066c6bc5847fd1a642da6082b8377825987ab5ba21620c2ed9ef26af4 SHA512 05a0bd8a7de559925fc5ba7753d9fc80db41271fedfcd0ca3137f9620c68468c0bfb706e0b4915151657c74a5d64f52a5594736e19fa1421aa65124f551f0ddf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.mod 583 BLAKE2B a104cd758a5cc7962ce174ce93e8cdcb0320f4bc20b21ed3579a201e85ac851322ce06087d4f5514317731f97903a3e118d1001eb3ebd614158c1f7de9113e3e SHA512 550dd35c6ce6d98886c4f73ad3afedca13e12e39ba3c0958a4cf05a92db92187787591d33ebdbde6d961a451c615bed95cb75ec36b3e91ce0f2b12805d82d248
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.zip 178532 BLAKE2B febbb971264e16ce01088db8ba77506bac3966fe600d4229625117017bb913df03d51af54905d4f9efd0c35941d0133e7b4eefb489d0e6d9a264ef32824b12ee SHA512 17c617788d1d4cfe4a83e8bbe0772e7e3121d75b144b6751501dba0679dc7924432d9c94528c62052bacb9bd5719a7ebfe515d952a95ef4481cd4e45bce88ab1
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip 151692 BLAKE2B 89c5a1012d53a62b773c2c3e9a20426564f01e70abd39ea67cc76abc00f38e6f1443ccb31c0ad89920cff80ad94c5f7e72c5d67eb3aa44e047c0bea758be242b SHA512 121a4e3ffbf959722b4333b5e449dd54b6a84548bb580e429b21fc6fdb6a494456ea55208a039f7be6dc7b7fedcf0c6183edd0dd727cd7ebe0ec517a8e999c85
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip 153651 BLAKE2B ebff467e946cc220ee1bca6fb5507030a080b34be93ae6e5bcef4ef4c9069d19ceb542af6770a620bbf79b65f970898eb536d928d5140cb1de7a57c9f2cd5a57 SHA512 c90a315ff9dc3c8f4e0f1e392a2e23789417e291e5794a506b94d04c5591da529bd379158f9d4d02e9336e4c2336d0d8c68c2db59e89a7b390e11f212a92113f
 DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.mod 287 BLAKE2B 21f5e5b0f556844005234fb29f985a67de41a5344b0155e1bae329fd9d11412ef5cae6702b8d034bb7ab8d1c3f81ead7da62469a64814a3c4bfbca5dfa28ca6a SHA512 49ed1469c453e6ea78576c51424bee1f456705d7a2ab167d250364813c44eae39fb51e8fd0aa7418a585a48762d9e2c4afbc9119ebb76b781943dc1723ddfafc
 DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.zip 70154 BLAKE2B 70e3dc90ebec9462de8c05e1243bfa5754c1ffe421b5380e75ddef5109396453aeb18a107de3a03c1fc2f23243ba53668338fcfe1b289d85c8526bca5ce8c756 SHA512 f8b3286dbd38591987d4c4d4037d1fe16c5adb5bf971131dcda47c29a5c20286db863412056539829235c306bbb68b184052f26473a30fc8194b46a093881cae
+DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.mod 286 BLAKE2B 48741f0c3685fb8369151968db19610ce28f2a8341da2f3fc7d74ff221fd9b142cfcab2a336f9abffd69dc384972e14d1f033c5eb7de74013cd0617dab95e2fb SHA512 d736de8570a85068955bed17c17387873336142c02115cea7a257fd176310998cba737e9d121310a8dbb8d5cb98399b7427bc7a19da29ea10ab122efed8514b9
+DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.zip 69292 BLAKE2B 2708f198f1cc181291ac1c6c65717b7e0a071e8036819eed8b2a6437c1793c5ed7519a434d906490d2fb6d9a940d10db583f9f0dac0cbd9641bbc954e05959ff SHA512 e531cf841ed1145d4101484bfbb32f120f331ef81bb2ff3f7e7099f71acc646cafedb5f4d4ed49c7a8ccf2a9c8e292498e65b0b47b31245f28265d593dd185eb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
@@ -319,16 +424,22 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod 198 BLAKE2B 9b5c175c915d
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip 261840 BLAKE2B 0b2120e55db33da70f3764bfd57657445f66fb4ba22c0d05898aa46156228c4a3e232cfaf24e2881707cffe7d3b5694fe04c03f589ee12d6329e94c90847e62e SHA512 cc3c69c18a6bd2bdc5e98de10c0ad6f9c540d5639252b007851be73c405e3774d1ca16518d3edeec036258300692b82a959bef3d92878c772370f6b8892ecc64
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip 282768 BLAKE2B 22c62ac51bb14578571aa93f0acdecb984ca370b4617122078b28b8ec5ab4ac8cbd6e986d60335d5f9848028f51f94d8fcdae3d8b428c8d3c8196d97cb2f04db SHA512 1b73a550dfdda98e41da9ace048b230ba05bfe7518cec7b5f877c11afa58bdf9d53ad25fa848e316fcb5b25ff6eabb0a2d2688c1cfbd9642a8670b72c3f90a92
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.0.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.0.zip 297839 BLAKE2B 3d1fbe9dc0baa55e6a1cab1905954354f4120a4161496e5068ed2a6de888b812dce47b45bc94c3bf7c19ab9dbc42ce0859d2c265851113b2ee046042e426f6fb SHA512 385e2f718593b24b497c5f692992c80c909010acfd691fedde4b33513f23a663a391db6cfc47651ea2f88c0f20232f7ff5484c699eab32079a80566cfb91652b
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20201023143004-874930cb3ce0.mod 35 BLAKE2B bcdc10d46ac3b8a6a83e1cf12d688dea82392c2ccb341edbfc922324b689ecdbe9a2c3449030cefa1ad723976364b8f774e3d6f51dd944fefaabd84b3eb203e0 SHA512 96b3521ffde2955dd8ea8b22b14dfdc829fad79e89a4c54e9c243cf34829e650d40f3e176157bde0b3ba3ec89c40c67f51c49d4ab1e08bfed762018e12ab7024
+DIST github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20201023143004-874930cb3ce0.zip 18243 BLAKE2B 88323acba7c2913330746d94cf2aa3e10064cc27781b24a649463103f6945455ee96d7a7083eccea1dd81312cc66136254d5c0b4d77368066f3bc508bbbaf2b9 SHA512 9c958eda44a6379d276e5c800f7dfa93bb1152857607ba20eb63ce7e2b7df2e72e5f85983113daa1e1428c62e07b6541b89d10aa82e4fd73d60b6609330ef402
 DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod 38 BLAKE2B ce3c91e2fcd6c3748acf0e0f6355a0af01db3c7b36a793fc07b94b1072133f7f25f4c49473bb27007ba2de7233454a3728f24eacecda76388570810e62a5d161 SHA512 54235e8bcd2f98cfbfdfe187ee4b2cc7d0efe155710474100709b1a8c2e55cc2e24a16559857fb9edf484a0b76debbcef69d5c182efe52594c9858a37b6b10f0
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20200303194639-4e8294f9e9d5.mod 38 BLAKE2B ce19adf0becc2d2135b5a0e496293efd9c28e84bf13d0f14d37871b2db4c6599dcc3eb543572b3c843c3653e3208d576f085a0db3d18fb1f51b2e976629bd1c7 SHA512 2737fbd24570db5f909bd8f56959332451a1b8903d79e6db3734ba52dc08c9664299d4f36459594a47066a454e0d4377bb53ea0d434a7d9cc64134b4772a7ef1
 DIST github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20200303194639-4e8294f9e9d5.zip 38118 BLAKE2B 860a9ca6e35bcb9067d3eb55f8d89ab031cb8f727946c0487d9f8cc88011af8cbe5948f2d4d19faece55693e3b360bbc55671c543788a065a27ce444023c17c3 SHA512 e9416f1d4b8b1fabea864fee1710a78ba7772fff0705de6bda6cabd673c08941bda46862afa4247d68fd9d4bffd8bb9c05c1adfb4f4c3bd48d219439ec94d8b5
+DIST github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.mod 38 BLAKE2B ce19adf0becc2d2135b5a0e496293efd9c28e84bf13d0f14d37871b2db4c6599dcc3eb543572b3c843c3653e3208d576f085a0db3d18fb1f51b2e976629bd1c7 SHA512 2737fbd24570db5f909bd8f56959332451a1b8903d79e6db3734ba52dc08c9664299d4f36459594a47066a454e0d4377bb53ea0d434a7d9cc64134b4772a7ef1
+DIST github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.zip 37782 BLAKE2B a78726f1f310d101991a5f1ad6f6a3089ed065e62463eabbb18b59fea11563844316a063ee753323bccda6bc699ad0a6790fe693d1e3acda17678a90b9698e7d SHA512 084f9a5a55dabee4095dd178cffbf8b34b10c5907dd94451ac119baa337a79cb2535e8cc406f561102685a38df205de147a6a2db973ba90b87f3367507e84fb1
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
@@ -356,11 +467,18 @@ DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d4
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
 DIST go.opencensus.io%2F@v%2Fv0.20.1.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
 DIST go.opencensus.io%2F@v%2Fv0.20.2.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
 DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.4.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip 15027 BLAKE2B 06a2451071b8cb0de9b4e664d007584998c91acf4bcca04be7f6c4e97c2579a9cc174e4db220347a00b252392cd6f3aa3e08e27ef3a231d422512a419a199c2a SHA512 be6b2545811ac8a869fd0365c1126be58531a6c0b51690feb17d7e88a2b79dfec6a466ac317df15e4d038c02df0f72993ae3e50a218c9f7f6659787c7f8e9333
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
@@ -380,22 +498,47 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.zip 1844911 BLAKE2B 512a7175e03c2aac9c4f3a454a5f428e2567e2d862e362480835722c4f80b8aeeab1880510658da9b219741dc161492096ac2124ae763163103ac22255e52f78 SHA512 fc5402097646068a495867d50f55b00c2a774ddb99df373dc860c175383f8f1ab5c802bbefa55e013e45201a3077cb04f5dc8831f3ff320422623167d8c38568
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.zip 1861665 BLAKE2B 95df63738f62cd51ec4fe5e13e696123950f9e72d92909ead9b300615d8ce2a18be37548c4471e1348e3002f9df61327c1d957890b5e4e35aa25ed692d5456b7 SHA512 efd0155c4d968a337068e9d79847981f7f048dafcb98bfb53bf280222348e743d43e96e769ffa3eae984f29b762afe9dd7f93522869f8c5f445861f20d389779
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.zip 1874722 BLAKE2B bf7accca99c66208a9fed48a6cd003a5e29ba78bd28c836b5eeb0821c03a0729bc3b72177f249129f01292a4081731716b321e87dd577b9224aef22f081de179 SHA512 0f8c0643a716a7a84ed55906d7e5036ac99cfb0e3130486bd300e22fe942b825be6a46b6d217129232a0bd9f9fab98f5eca423feb0573ede7c23aa708b64aeec
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip 45710 BLAKE2B 7349ff19c5695071b04342199b7694af51d7a63b2a9940c72abdc8e2a03da41260da0ae09b039f1cf2c3752c7f2256164a3f0f4ce00410adcd5389cdc07e5cb9 SHA512 00ae7262d6a4f5839915a648e09a51fd939300b9f0404f2c13c062412d059b8278e3c40b2db2a927bffe74a940295834c18b77fb7dc58e88401e0b7606c13aeb
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.zip 134147 BLAKE2B f7d43790feeb13035488c2749d41a33f21f66f3d79d89f465918301f8c9bf9045efcbc191aedc6894628b35d9e79c9fb67e5c5109e3644799be747c6c233f322 SHA512 13d1a28e9df57073c8f25a8d86e17525ae17cb461bcb6affd82cc447394c8068d13653e32ecf1282af6c4811680f4883e3d856384480f7d9ad47b320fa76a1d6
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -408,26 +551,51 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.zip 1422506 BLAKE2B 910ec4e504c94c944c49110e12845ce3a9fc766d66efa523e14937664b6220aadc65056eecf1053460f18a76a21a9a2f4309e16aedf342003d48522ea9c2c2ef SHA512 1ab2269fa1b7cb5266c7cbbf25b8465002f08ef300c13e832db1de8864ab041d85a46e37f83b64a2843c58d340815b1eaa31776c675aac0a83b92ab102f19293
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.zip 1423692 BLAKE2B d41efe00d1c8704d51c1ed3606afce5efb01746e1409e3f845f9dc8c9ac05ea49a850b321da9310ff828198eaaf7a18edfbaea15c58a6b50a0b72e8f8a7c7e0d SHA512 541e08e5123503e247041f32792007368143f2dcf6c6b8440f529d7655d41895af77117500152302e94a28adbc11177f7f1d93603506c2baec74b0701f295b90
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip 1499901 BLAKE2B c60f861c6531bcfe3b3ba34efc287605a9e7089a7fcb98546a3b9ea46dc982821d3233d613c96d4e4660ca00923cdbc1593d94469fff552882ab83e3eb35d2c0 SHA512 8585cf85ad230928be11a456d2153f918d8403da892e1ccf0b638d0f79e2edbf30d9e18e687c33dba4d486ef743226c5f8ed23ef96b14f6c8910aa550b2e0f3b
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.zip 1503434 BLAKE2B fbe488dcc21384cecc664d4316702cb7d6d64511f7a5cd7645ba7c5b277c42e17574c21cf584644e3890dbbd6dd1a242267406c617c6c69285b60e629020d3f0 SHA512 0bb5a5bff662443e54bc1896896985f10dc0cf8b1307bf9a31136e1b3257ee6ae9cd8f3abe779a101f50b7fb70f07203fd803d737e83d26da634e73937e8cc3c
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.zip 1503276 BLAKE2B ee7a6071af9cfd60c928119c9a66770467c9610c027e1adf347460ff97a8a84256de915898d8b2aa6a844cd47660f1050ce25cce0aa6669d32eb51d50ea09904 SHA512 f4ddd2c8c10bc79f3c4f0d246ae5a88e36ba5e1d457dc16ac8e4315958432c3cf3debedfc222d4591cca2c72dad2eb5771be3e8c4fef1087f330f077c80b14a5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.zip 1583641 BLAKE2B f83348dd8fc8907f7a4251c600ec691eff20d86bf45a8af6646c715ab252fa9413dd0145364d7b4e0489043686e0497e79cc2e06532ccd97503c99fc87e6bd42 SHA512 9078bb5c9524a58dbbd099b931fa7df78cbf3f143313eaebab500f1bda247f8691bca3d92100bc4905ab7b97a5d3f94910fdbe4d58a16f03e19a153627149b7b
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.zip 1566157 BLAKE2B 34caf278d6440392338ac082a6b532066b9dc29a381f8afc063de39980814e97c72dbdc933151dea18ecd95ac3786a6b7a25d40c73237d7ae600e6f9b2f484ba SHA512 4692d098499dcc3c1781380ae4e7fc0245a8539c26e5d6b86f8b83bab14c241cd6599855992e24a5974f794f9129fc3812d216f45bfbe07cd4a303084e7491cc
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.zip 130280 BLAKE2B 059657166d467838c995726802e70dd5b8937ce28d20e13551e26ac1ad82f95b5e2e43eafe1dca541b532599e634b82c490b5308b3d73fa643da8d67b8a85619 SHA512 24239f223b233ab07c98dca5db08f569230403e564843f043fc7bddc82fd4ffd21c1e576bd97f4a1c1b462e47c9275cb59707a003c4f68b7b2af477b2c6f204b
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.zip 24743 BLAKE2B 916fbb71a738b80833a6e9ab44ac53568d4bf6e9400b8a63197cfcc96488c60b43d602664366fd82fb686bc9b5ebf80d2d6fda3cb791a83042c03d965ab7efb4 SHA512 cbc53e045f3837deea920bc08867a45c5ef3e0afb99f7f5179653790d36a541f4e96e5f9e3e36560aff2b38ebde5a5004992c09a8e2722d44cfaf81d654de5b4
@@ -437,6 +605,8 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip 28673 BLAKE2B d5a34f311e12038daf9c89b646bc5caf5566c08fc563fe2af3d113596d77cfe759942e35314e5b595c5704920d12b273ac30de865256b406287868d827d28938 SHA512 443917030bd593bf9ba4fee7748b5d9f15c82b7cbb21a586fc9a326de9c4f8fd8a7caf29131b0c8cf9fbf6a1363fdc7c8dd2ab897b569d3adaacfb55ad0d4601
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -454,20 +624,37 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190902133755-9109b7679e13.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190902133755-9109b7679e13.zip 1818056 BLAKE2B 86024fcf34bb9485955fc4deb5f62168984859330d3ca6f90751cd09de9d883af4cd09286e891d9f96798d275a16752a17e45026115b32288bdb0b3726141d44 SHA512 30cdef3d7ced797baf5c583d910f6b11f6f57abea6c5cdcb103904561534793f44efb391c2376a2113f62785089ebc9750d448686ca168c16a6cb8e459df7f40
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.zip 1863997 BLAKE2B 074232542f05e788f9561bca0b4e0436d7785478a8d8b237c4faae33842f25ae1d7ab7f792b2c4448d7fe4ad51ca907c798ef6debccdc25aa3890ee3e39e44e6 SHA512 22c2ebe81173272b8b21d74de4780910b960658715b9c98b7951058e1c5d9dc28602492277d4849959cc2a83e43f9d9a93e9bbf074ec67e38d83184f69153054
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip 1479123 BLAKE2B 45f0af63ffb886cbd78269a103067057346ab756631f228fc27b68459bdde97c84c100f99045e1a4a8d336513c4192b377048db8e09cefa703e94ca814d6eb07 SHA512 57783ce5463ce2a6a2d76d8ed3df08a23de896ca82e7456597a0fa55fe80bec64f899085fc727f0bf369495d1bca70a10e0f7071e7e66f6a5ecba1b4f42ffe54
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201118182958-a01c418693c7.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -476,16 +663,31 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201214210602-f9fddec55a1e.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210110051926-789bb1bd4061.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210110051926-789bb1bd4061.zip 1539677 BLAKE2B 19d73e22c16148ffb3795302343e2abbd2518f3002b58fa990b6606702efb76cef9aae4f6ca15e857efcd74e95b5fca167a027567ef537ed7957a1bb0934399b SHA512 6e5bec2123b5921bafb44b69c70948baa2e5c1ed492affd6b2505fce1c2efe17a4b725123be30b40b2605f1937b4224d8ca7cf0d9049935f6111336b983ad5bb
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210123111255-9b0068b26619.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip 1549338 BLAKE2B 94514181eb8c63293bcc8586586ed12574ed1aeb1f64247ec4953c4a591d8cfff3f32f8cb919eea69b67ee0b6edf406d65b7676dc27db2fea86549148f372127 SHA512 8ac070589db0adff74a784cf233ff80bfafbca77d840fc13f8f5c03e66bd62c960248e13aeee5d6b401282c913adc5d42ab3e4eef64ed199700c953500309ad4
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210216163648-f7da38b97c65.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210525143221-35b2ab0089ea.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip 1646674 BLAKE2B a2975e42ede4b3923b53f6c28b8360a49b47734e5512ffe9e52e8920f79af09420d3702d3d7e54e5755c04fddd0836e11c7fb83441065bf9dd31da363f5121a2 SHA512 6a36b9dd8ab6582abf0721e3fdfd19c2cbf9caf02a2f8aeff8952175553e35ab9f9972c2e524ad947e51e24f5eaee23984fc1670d512c04e50b2d71890c5d392
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -493,43 +695,138 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.zip 2895575 BLAKE2B 51c2094846430d9403618ecf192c3e8bdb4996a25c2eaee404b769648d88f2a1335d3630b74d8ec8288fb7122dd0b9715dc3946cf599cb6ddc174a22d15dd832 SHA512 80c08c953a4249d1b1c27a3c01083280f07fd3e391136c3ee15e07930467096028e4ee8429ded4e66b5bff173cfc14bc027970644c96126870008ec7862c05da
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod 271 BLAKE2B daceb2d4e388208a2619f2476085e0daa6b6546122a32355a3e005e6ac51ce72069c959a72c76078dedf82201fb217941091d3cc2b1bf4be8c77949b78ef6cd5 SHA512 c2c79e2a50a05d79909d58a13703e35f9cc9cf209be9593546c84883ac272e4e31a8ec9b2247d750b7cb42b088ad90214279c04b83a48173388fa13a71b6572d
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
+DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67
+DIST google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67
+DIST google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod 582 BLAKE2B cc82a660be4095a67922226ab37e8331301128d10332fe60fab27f17e1556b90031bf0c11dd53401fb0805632711296b561c1a7526d93545eaccb92c3ca5506a SHA512 930fb5295538f738db5258811eb8cb03e35f916a882cf271ef5175f0ea0d8fe905d040f5974b34cc9594b008f03fa7f4653ef7bcf5160d8498e18af0bc54d9af
 DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
+DIST google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod 582 BLAKE2B 9551c78d14cf644fc943fc5fd7446eb42482bcb793f5f20db40e61f44178a306ce9aa8d49fddc9e36fff3cd0874d4c7b84b2a2a2139f32e915c938f9c6cd5af5 SHA512 936dc2fb686660be7aa7982ff5b224ac0dabb22d3bceb27287453a8dff62d846b81316588db4f7cbbd9bd172faee0eea6f2a55a8bf0e0ccc7af6414808ca4c02
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip 417793 BLAKE2B 7219518f67d83fad94a863f889af4c3a28a48b60fced31f33a3026c00bccfb6319060c5ff4712fed598824b5bf1448b0981fc21a6755855e91ce53b4026db062 SHA512 26520c7bbc5ec3c02dc86e5882ffae74b040f0600aa99832cb08cead5d3cd5c21a32d6df332c2c74a76b6c2a684141720b4fce874a07241412bc01837784b115
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod 340 BLAKE2B 70822d80e0c64a18bea901e30359c66d790629dfcfd7b4512b215b2c29bcfcc862bb68f9480357118c7adbe6a1b42754ef7703bb28e608abef8f8cdcbf6d2396 SHA512 461bf9e9c747d61500f3884c67f82cdf9394b186b512f6ff7537620a8f7a8de7a5c30af81c9a1303c0babfbc748c80460313e6b8e440e1f553fd4e1e8e12321c
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod 323 BLAKE2B 76123f14f32c6702557406271ddd9e0304f0c9d5bb53c2b503a0a1ca74892da8a685270b6463faf7fe746f7398080f8364afc94b6f7ac8ba1170d645328ce5ca SHA512 67bb03661d5b872932d9a18ee7edc2908612a31db6391a8797e1cfa9aec45c6a3643b7943c4157db60f7e7aa235368a844c5e1fb382fa705074fc721c855a441
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod 323 BLAKE2B 264c38a1d0b5dec10ed5c1d4a073c68817dd538b602446ea3db3b53569f14dc1bd88250b6bc14656c5206d23e17858b986188fe0c217bf8853c76121d999b08f SHA512 ab15d32d1f044b9b5806dcf075f3cc4e32f2c79e9a273e5dd30848b6ebb26d71270627536f34010cfe23c130badcb02e5b6f306a1cc1f73ba76bb86bc5ba21b5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod 979 BLAKE2B cac1528e7af91a98ad2e1fcaee0892547eac67d1d6ce29473c1114eb2c373acebad87008124924adc3f1a98cc4a2911c1679cd7f24f025ffe0d4902d123a6639 SHA512 558a4f5d7910813809d7edead3f7e2300936a262e289905dc1e33ba293d89d9bb590ae0f8b00bedc1e30288257ac66d7edc2d3f3f657d2d31ffaef7ff0e24f92
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip 1491602 BLAKE2B 7fcfd0d05fe509a3e30885304b7ec76a538fdc9cde84d44fb90a32aebbd14bdffd5f3f7e36f9ba24ef87decec89fa824963780b152faf43f3799c8e64e822f34 SHA512 91a070430e3a44edc4f66d6b2ecfcfeb4c633a07c252d1494ecbc9a37141483cb7bc9bfc641022a59e740ccfe9c4ed52e263d59eb85b5bc37a66088bafb6ca8a
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.zip 1561863 BLAKE2B 45adceaa2751d3fd4fc1b55517aa1b11708013db858c4f52e3a8435629542a89fb53cc69fcc9f1b1345ce488c550d57ef0465313154d60a5a2fd958db75499f7 SHA512 b88c991dd4b03a46e8e5becfe22b50130a185988eaef4c0504a4da9dd3af7be7a060d1b8aedc199092d9813bd7ddc06a105340aa2925b6cc6246b2100b6df279
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
@@ -557,11 +854,20 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d7850
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST node_exporter-1.1.2.tar.gz 313873 BLAKE2B daeedd913ae5bf6d2d21ae7a1d496b48850d5f3363f60dc4b1b715f000c412709452568ec33a5b4ade166512698a129866e28a145b66638b81c056f49963c3f4 SHA512 d40ea07fa0bccaa8843e99034af9a4853e7885e6b851c89db8fa49a133a8db6ea75ea8b829a982c0b78961b9ed33b1b9356f5e25d72a7c9e4ce255b32335911b
+DIST node_exporter-1.2.0.tar.gz 320013 BLAKE2B b079e64749db803125d6226b56b4ea1c3c1858429f6df6a35acdb034edee3cbfbce3f351f62c6425f103e61696d6ecacb35006cef86df9701dd5b4b4eaadb63c SHA512 0774cb5c62e03e79fb1ff174d890891952acd743c30803cd915dc090fdfd05a855599d26097ef2378f4a37710897867d63c309ee99447b7f836dc5f0ef0af768
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
+DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
+DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 EBUILD node_exporter-1.1.2-r1.ebuild 31521 BLAKE2B ea0fc9ad2bd284b467985f01f91e6e77943439dd0c4d1b1ad7656bc96eb6a147b6c23b60d81734b68d41798aba1eb60d29844db249b4f26133f3ce0fd1499271 SHA512 989db2b1bdbd6b6741c35da128f624a8cc80401ebd209bf197d448d4fcbef1555a4e48bc017abdb9405ef61198dc72fc092fa217932b8d9cfde3efaf8a475f7c
+EBUILD node_exporter-1.2.0.ebuild 32998 BLAKE2B 7263b16f4763ce08c4395f19d8c0d28b1680bfd341e91d9f5013a4041d18b64d262261eeadd7549278bcbd41b134acbe90a6ba4e75fd67dbe0829fae19be65ac SHA512 ec1ed1d9a9e944630265a785980345901f5da93ad170807e2632524664eb966030f914ad37a1c01d12a53fffb34000abda586fbec74f4a4e596fcd5954d41635
 MISC metadata.xml 445 BLAKE2B 65ad954909f6cf7f8fb29c952bd191e8be48f734ab691ed5b49cc0c4136bb933bae3bbfb151b7d3bd83034472b49d2365d89c61191da90c9a1db11b7828a3439 SHA512 cef702cbf0fc117db0b8c8329835baad9e6465cb2dfb06d5f55b04577b12d3ee5d1d75003a9dbc262c2c1c84093b2124b23f7bb7c0be1ad88c06853a589ed075
diff --git a/app-metrics/node_exporter/node_exporter-1.2.0.ebuild b/app-metrics/node_exporter/node_exporter-1.2.0.ebuild
new file mode 100644
index 000000000000..11d5bdc01ad1
--- /dev/null
+++ b/app-metrics/node_exporter/node_exporter-1.2.0.ebuild
@@ -0,0 +1,620 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+MY_PV="v${PV/_rc/-rc.}"
+NODE_EXPORTER_COMMIT=b597c12
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+	"github.com/beevik/ntp v0.3.0"
+	"github.com/beevik/ntp v0.3.0/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/cilium/ebpf v0.5.0/go.mod"
+	"github.com/cilium/ebpf v0.6.2"
+	"github.com/cilium/ebpf v0.6.2/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf"
+	"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod"
+	"github.com/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/ema/qdisc v0.0.0-20200603082823-62d0308e3e00"
+	"github.com/ema/qdisc v0.0.0-20200603082823-62d0308e3e00/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/frankban/quicktest v1.11.3"
+	"github.com/frankban/quicktest v1.11.3/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-kit/log v0.1.0"
+	"github.com/go-kit/log v0.1.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.5.0"
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968"
+	"github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-cmp v0.5.6"
+	"github.com/google/go-cmp v0.5.6/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hodgesds/perf-utils v0.2.5"
+	"github.com/hodgesds/perf-utils v0.2.5/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/illumos/go-kstat v0.0.0-20210513183136-173c9b0a9973"
+	"github.com/illumos/go-kstat v0.0.0-20210513183136-173c9b0a9973/go.mod"
+	"github.com/josharian/native v0.0.0-20200817173448-b6b71def0850"
+	"github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod"
+	"github.com/jpillora/backoff v1.0.0"
+	"github.com/jpillora/backoff v1.0.0/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20190830100107-3784a6c7c552/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20210525051524-4cc836578190/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20210713125558-2bfdf1dbdbd6"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20210713125558-2bfdf1dbdbd6/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/json-iterator/go v1.1.11/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.1"
+	"github.com/kr/pretty v0.2.1/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lufia/iostat v1.1.0"
+	"github.com/lufia/iostat v1.1.0/go.mod"
+	"github.com/mattn/go-xmlrpc v0.0.3"
+	"github.com/mattn/go-xmlrpc v0.0.3/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43"
+	"github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod"
+	"github.com/mdlayher/genetlink v1.0.0"
+	"github.com/mdlayher/genetlink v1.0.0/go.mod"
+	"github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod"
+	"github.com/mdlayher/netlink v0.0.0-20190828143259-340058475d09/go.mod"
+	"github.com/mdlayher/netlink v1.0.0/go.mod"
+	"github.com/mdlayher/netlink v1.1.0/go.mod"
+	"github.com/mdlayher/netlink v1.1.1/go.mod"
+	"github.com/mdlayher/netlink v1.2.0/go.mod"
+	"github.com/mdlayher/netlink v1.2.1/go.mod"
+	"github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod"
+	"github.com/mdlayher/netlink v1.3.0/go.mod"
+	"github.com/mdlayher/netlink v1.4.0/go.mod"
+	"github.com/mdlayher/netlink v1.4.1"
+	"github.com/mdlayher/netlink v1.4.1/go.mod"
+	"github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00"
+	"github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod"
+	"github.com/mdlayher/wifi v0.0.0-20200527114002-84f0b9457fdd"
+	"github.com/mdlayher/wifi v0.0.0-20200527114002-84f0b9457fdd/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f"
+	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.7.1/go.mod"
+	"github.com/prometheus/client_golang v1.11.0"
+	"github.com/prometheus/client_golang v1.11.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.10.0/go.mod"
+	"github.com/prometheus/common v0.26.0/go.mod"
+	"github.com/prometheus/common v0.29.0"
+	"github.com/prometheus/common v0.29.0/go.mod"
+	"github.com/prometheus/exporter-toolkit v0.6.0"
+	"github.com/prometheus/exporter-toolkit v0.6.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.1.3/go.mod"
+	"github.com/prometheus/procfs v0.6.0/go.mod"
+	"github.com/prometheus/procfs v0.7.0"
+	"github.com/prometheus/procfs v0.7.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/safchain/ethtool v0.0.0-20201023143004-874930cb3ce0"
+	"github.com/safchain/ethtool v0.0.0-20201023143004-874930cb3ce0/go.mod"
+	"github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973"
+	"github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a"
+	"github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.uber.org/atomic v1.7.0"
+	"go.uber.org/atomic v1.7.0/go.mod"
+	"go.uber.org/multierr v1.6.0"
+	"go.uber.org/multierr v1.6.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e"
+	"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod"
+	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210525063256-abc453219eb5"
+	"golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c"
+	"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190219203350-90b0e4468f99/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190902133755-9109b7679e13/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod"
+	"golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod"
+	"golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod"
+	"golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod"
+	"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
+	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c"
+	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.6"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="acct-group/node_exporter
+	acct-user/node_exporter"
+DEPEND=">=dev-util/promu-0.3.0
+	${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu.yml || die
+	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu-cgo.yml || die
+}
+
+src_compile() {
+	mkdir -p bin || die
+	promu build -v --prefix node_exporter || die
+}
+
+src_install() {
+	dosbin node_exporter/node_exporter
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	systemd_dounit "${FILESDIR}"/node_exporter.service
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/lib/node_exporter /var/log/node_exporter
+	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+}
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 446930ca797c..8dded41d8fc5 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -24,6 +24,8 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod 734 BLAKE2B 0f3ff37abbf9359ae68c78
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.79.0.zip 2127808 BLAKE2B 1b33b009a83dba4f23eb72dea4c9d3a158116857972518a61e700698df4f64bfbfc892c5fa409fa2d0fce2058ba691ca47ffadeff12a47078ca1de47b9a52dba SHA512 bad708e42de89666433064cf3f018e354fe9d180e133cff2d740c65d4379587567f1a382b0c022f6873d79cb0c2d3563172013adf694e5321fdd11009c2f0253
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod 734 BLAKE2B e3ac7f5f2081a672878f5c017da4816147aa1d076dd1f24b9dd2a5ae07390323c15890f34d66a6089625da6a831545fb3c01a0a02a05c06a95a0799848172788 SHA512 0f20f17224815d31006304ee27cd0c79e25f3d83e962e1fff3e61483126b950dc21ecb7494dc585410b2ab7fa72f5c40c14d577ad85b50702d5b07758b2225a5
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.81.0.zip 2276606 BLAKE2B e010c7cc2e82ac275796a1c14dc22d7bdf682ae87e8e176a3ad71786908a08d9d8c90c73e76e5e71cdd755e82da123f78878d428013617434a4e5d9c6558d700 SHA512 84e080a54a2b5dd0e80b995acd7badf29540d2261799e492b0d5931cb4e636f56fb65cc945ace955f194f776504120a44d68653060296d80b0b24a0a46d3ff95
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.83.0.mod 717 BLAKE2B c7769274eab79772fa41793f0a6ab7560823e0bf101dfa0e5e583d6f59c3a7acaa74b7b4fcbacb5d4c9eab1472fc77fe31e6826d9c6e96e87ef27d9303466eff SHA512 1ff1b33b078484f834924b6c10c2d840749411314f56afbffc07f0ad4f97fc1b603aaac9293ff44e08600e56adbcf68398837eb5480b7b7b247de0ef4d1a30f1
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.83.0.zip 2504977 BLAKE2B 7070aebaaf5498a7a0adab8d58509e584ba767be32d6b93095a937b9c62e072dd48e16cf87f2bb587b839cd7d10f78eb6b8c3cc4b8668a7fbbed600576e6b919 SHA512 931d04fc10d6721b8b71df54c7aa2d497813f9f04813cf8797fa1161c7437072900fb272f91d5718aa5c38076e8e963d2790725df7a89c758ac60f3560c202ef
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
@@ -31,6 +33,7 @@ DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod 489 BLAKE2B 036e06869942
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod 649 BLAKE2B d4ef60eed1eb5c4b84623a6bfb8bcdd52be49ea6723e2c39f8c7c87e34943aed3629d7413fbffbbac9e888bfbafd6f0f07ee84002901afb3a8cf1090b87b53a3 SHA512 3adbceec8b4bd989e804054b56e271f73658adc8a4a8bd53e32ced709a8796b33d9cf09f5ea3165dff931acc942de45508ae79634dcd9722c2220814b275f425
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8e88465ca9c754b798d6f1f270e1fe5891221d482f6b5854524d09e3d19b6f75e494f69b4861e2f1b2329c08fe9e4235005f2dff41928950dccc3 SHA512 74886885016c92ce56b584665bdcc925404bab745a25ace03dacc2ace3f812a0d568ab8d19044097906b9da479037c41468c33f1243e6d55b36fba4571117607
 DIST cloud.google.com%2Fgo%2Fbigtable%2F@v%2Fv1.2.0.mod 617 BLAKE2B 4717d7bce69879f27db17c13d4c0b283a9939d32f5e116d885d170e2668235114aa0a7c70ca98a522e01a543285ee10ba47f5d8fccf2e6c3b8a7c123b3fc1bdd SHA512 850d2892d1be55d674990de6cad2b778372473f03fdbbe8d3fa61c0a87ba32a349d5f98a52aae006e079986c84a5ed56256629a1bfbabf65b89c0f068e7f9975
+DIST cloud.google.com%2Fgo%2Fbigtable%2F@v%2Fv1.3.0.mod 681 BLAKE2B 31018d66a5ad801e6bd060fdecce3c9e00ddccd4c4002b6c287a7c0a85807701ad189ec4b37af3cae9ce1f7c80e74c1102350334d7f4c825064cfd4bfeda2c83 SHA512 a2cb7d9cb7a09ad9a45d897cb14b8d4d316d3ac3d05a775971415c1f1b8d808a85ab611efc396e6e8b051cee85263ce5fb0244b84a205f70f588e0f9fcd05466
 DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
 DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
@@ -44,51 +47,85 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
 DIST collectd.org%2F@v%2Fv0.3.0.mod 20 BLAKE2B 7b96a22f921fe63455011f7665f2a9d857a574a9ec0f5045366dda86a1d2a9ef9a8afebe9c5640aa46fc8c06cc73769b13263aea16537ac63a938fb8df70833e SHA512 f214d1a62a9cbf57ab751b12c01e522933dc85f766efaa3d01f15730bc36c08bb3fd01bc3305d883d204f55871eb7996978b7bf8d4a43d2c1675c677d4179b06
 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%2Fv41.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv52.5.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv52.5.0+incompatible.zip 54271017 BLAKE2B d64416afd052f01b5b2264d3331944652b4262fba088b5a3459ab8d3f3ac79489ac033816b6b20cc5f2a6d97d981769567e24bf9a936d26c33ec378d7034ba87 SHA512 cf146d15a6baedcc6f52d0cfe45dd1bd540e56a5de00c5e12317ba9ec74e0a00e7b898590de284ef8025ebc4f1dfdaa09a64f4907ae835723f44be4db07e2948
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv54.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv54.0.0+incompatible.zip 53373218 BLAKE2B a429f2b01cabd7e9d733ec7c193ceea9725ee69ea67a39372bc87f8632c0292e11203dd389d646f3be266581834687c4923b6b2a448e3ced86223c4da3017be8 SHA512 aed12ec61278959b88c7a03dd32b74fe497e80e83ac1d126211128d37efee2937f2b7b8676069a41b1faa6cfcd88f4c5a7cc967f8b1927f363e2c198888d0227
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.2.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.2.0+incompatible.zip 55130461 BLAKE2B cb31c9a54694f9e16203a9b7202aba29d32fa4b43e5354540627990eb59abf0529aef381028cc1e5c38ac57aefc25a21e4e83d28e1d1ebc352a439d7f647250e SHA512 bd9373e5ab1361fdab95fc8ba1e22249ccc614e371b2b13f5ab7ee089e10247553978fe9498a64167df458db76ea069d1a15f7ca298cb26c06c14da41ffc4889
 DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod 36 BLAKE2B 52a2c5272e004524397df00dfa03b4c2d2ebd985a0c974236aad6b847d6b2b4b7c9b69ef48e263f4c67983b845b020d2004fe749b46fee3c0525da0416b20f3e SHA512 350a16c68553738ce8c2f4a6ac8beba66a7dcf2386a42aff938ebaa3bdc526bda8e5c51c493331eda4666cbcf8411ee7ca3aeb0768cc4f557f34585960f9eb84
 DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip 32735 BLAKE2B 5de266d7400ae80c027f209cea91c911e22b0ff4fc6a2e964e8906f1a86cc6905b9c12d2588d5fdc91d0d8e9501a0ddf2f7a376cca9935d21943386c3ef31979 SHA512 72621865ffc0cadd27603e2f4032f1cd9c9d8bdcb920b3ca9fd02dbf88e52876a6f092c5b74eceb136021c514b68dc599f0cbbf18ed1620b827d46462aa55e32
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip 24733 BLAKE2B 66be4a311f84fec9bf833da384747f93cded83fb7cfe07481ef9a8a5747b626c3da56437e24b687524403d463463599c193a0e4dd367f4afd4b7c41fee7dbea9 SHA512 b5615d6e8b8e3d1550218258027891063d3296af88918fd63559d2c108a5faad4ee1281c57dbbe51057f1c417ba94895a59e969550acc0ed276a7cf648ff6ac7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod 315 BLAKE2B 649b180d4b41279bde5a3ad4e7a8380b3e23d9428af2b2904612abfce99e5abf53ab7fa27ac7805faff0be8c2d52d685c7edc1380b909ad2c033beaae87be7f3 SHA512 eca3516d2491afa621522aae14e0e5c8632b984d8c6daff3a69df9b2b46416eeacdbd11de8cbc2247fb1119051466d24a4c178b065b630a684be8476be1ef15c
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1.mod 315 BLAKE2B 649b180d4b41279bde5a3ad4e7a8380b3e23d9428af2b2904612abfce99e5abf53ab7fa27ac7805faff0be8c2d52d685c7edc1380b909ad2c033beaae87be7f3 SHA512 eca3516d2491afa621522aae14e0e5c8632b984d8c6daff3a69df9b2b46416eeacdbd11de8cbc2247fb1119051466d24a4c178b065b630a684be8476be1ef15c
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod 366 BLAKE2B 97345e1c4c80024fd786edc92d87c2429bfb7562be7e96648e887d44bbc8d7b4a28da6510910feb8eafe4a390339e83a394ee64ce0686f18fbb291a4792d5c1e SHA512 bfb202512ad2101bd0d0bf6bd3e712f528a5f3b280ccaabe96c54ae06e5deb474cc0bdef0be5f3faae1dee6ca676531acfb4c4e53a5c34022a718e73f457c9e7
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.12.mod 366 BLAKE2B 74f1d402b4fc7bb6bf54c6467067256504fe2e37419de2a5be55b9c105ca2d1c7951ece398fac6cf98d02b990da9ad0d2aa1f4d12c17dd99ad3b6df068d4e727 SHA512 67b890270798e538335a74754514d4f2fde7e012f1201d30d3450087866612b88c5613185a5dbc899af84d65fb4265fec59ea064eec3e9362aeecd1187dbfd30
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod 367 BLAKE2B c2bcb0e7c4abd9be609740163521e205aadb8f07ba624a313356f59ba2ad0ae452f40f28b78579670b5b2ea861490340e42773e8fc9b04571581c9b1231794b1 SHA512 87bf6ed1a08ab82817e95baa6b605c56d368bfcc859edbc3b16200700beacfc92a413f59052ae59988d24fbffa66aa5acc20d5f0b1c0f784b3ecf0e6179d893f
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.zip 112025 BLAKE2B b3eb6a781432ae32e384e4bdcee16fee0117038ace90fccd959573ac3bc057805972fc54983c5e9eca32006163ede3aa46beda59b5cf2d4946e0e70cd3e09d42 SHA512 1083a5f773d78d0f79f121222d2853b9ffa5cbbbe80538a4c14217bf67d551918e9f35ff0d2b446113db60756c6d0d6676604171426ded48d93f122d49c4b9dc
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.19.mod 367 BLAKE2B c2bcb0e7c4abd9be609740163521e205aadb8f07ba624a313356f59ba2ad0ae452f40f28b78579670b5b2ea861490340e42773e8fc9b04571581c9b1231794b1 SHA512 87bf6ed1a08ab82817e95baa6b605c56d368bfcc859edbc3b16200700beacfc92a413f59052ae59988d24fbffa66aa5acc20d5f0b1c0f784b3ecf0e6179d893f
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.19.zip 112742 BLAKE2B 87d25be0c85d347929cd78d8db328eca4ca40afdb4b5b7a7aba92eebbd7008a97d5f31af1a5021be90817ad3c41aaa7068ae0b2706d8fffad683009b2d0e5bcb SHA512 b625fc794a405ffe3fdf96afcd172c18800aec936f951aecd0d849d49bf214babdcc10a10dc3c65c09367fb2ebd83c7a83f4ae5a318fa816215b80218e7f5e6a
+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.3.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924
+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.8.0.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7
+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.3.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod 376 BLAKE2B f7e3a3f97b6a61ca9d5497ff96984c9f445d2c138f9d90157658cc697d9531cace1a87f6e2a18414ee2f7f54eee81d7652b3006b8be6c0137a2c794d37bf845b SHA512 684a7c8f51caebd1bb90c7eac482ebf9a52228c57a5b31ea1b3d3019864bf669688742bf5f9159995e5a6ddb3786aad9dd10c37925767ce9f38641c9a7448e3b
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod 424 BLAKE2B 19dd207fb48b9175da4fb2afa17012cc48a2da5eea52ba9e2f32250b291ddaebc5fd8ffb42d19c8fb8fd1265ac2f7ae5525863010f6502c1c86616ca22600bcc SHA512 873698094ff3f392a54d01ae2b5744cbdce84e10b7c28b930aa7366d72dde4ece9636e168b003c46f8a21eeebddab150e687626338f6d938798b99c35bb62ced
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.zip 47890 BLAKE2B 3c86cf8b8a9be463073e3ea7eb96770a12f5d662532a4706b3c4c1ba30605ce1016662c9cdb7f95b8e30a9dfb26b612ef941ac8bf008b0ef2191fbef67e46909 SHA512 2c78eb875092f1cd18289c1e5f0585324bac3e534dfc0967c3f5c14dc1063b0b1ed3e602a121a750cc24110dffc6eba8d738a4f2055c1730221418857aa8d484
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.14.mod 424 BLAKE2B 19dd207fb48b9175da4fb2afa17012cc48a2da5eea52ba9e2f32250b291ddaebc5fd8ffb42d19c8fb8fd1265ac2f7ae5525863010f6502c1c86616ca22600bcc SHA512 873698094ff3f392a54d01ae2b5744cbdce84e10b7c28b930aa7366d72dde4ece9636e168b003c46f8a21eeebddab150e687626338f6d938798b99c35bb62ced
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.14.zip 47896 BLAKE2B d0b6ac98127c235e5103ba1f2b45940d5c973058e5bc7373534e76a4c8a1abaf51e5bf7f10f96b52bff495aa2a0f97aaaf00f1782f98c25f0231736f74296b7d SHA512 6f407cd44ea93583e926e7ef6f9d9e8a5a9c003d2cfb84b2c95281d52b3fbbcb6385e94fe1310f4d4a0dbee66349a45bb9ce3fcf58abb6db93d933a3fd49420a
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod 380 BLAKE2B b6ea0cb491b11963174850acd4d525607eec5b63196c774afd73f974048a9a99d0ad6209fff72bab5238109d80d7498b4f8bb126b3c8a170f34373d69d96f4ba SHA512 63536f9954ee05c36e35abee4e91f9791fa97e10a945bb51c710cb2aeaf3a567d999193f968ce54e8d530be617fb55dd6e3a0c0b88f8edc96d1f92d348b13cac
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod 324 BLAKE2B 1098a558b4802839f636e6a0adafd495bd65ca95352ee1839d8a8708ef33fc17c6f0a112104ddee27d423b7af8676b92621b0a1e77b5324de8977b12df1d92de SHA512 bd16fa0408713689dead4e6ef5503a83489512de98535a55dc0662f626840bcae0373f19379ee0489c32531350383dbee7c645071c5d5e83552053be564d283a
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod 302 BLAKE2B c913350af2596f077dd70ccd71c3a50c3edcb8027eeb2a3a8e5f92636debdaec2bba056077fbeaa1a99ac1f7a52fa72072b61c0e89a588d324d60df80b19517f SHA512 09e11d4655a40002fff8472827035f1834881b689f84aaebcbe3a9795f94bb9ce8b281a6a5bd02fa0e310912822f2c3dee5da2fc794bc5c34cdc9afe1000e306
+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.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod 118 BLAKE2B 6c3b0310b2a333471afa5fb1c2cee19265ab4180b71cbfaeb875ae27e5db270fdbd141eb8d498e0e8dc300e4e0d9ea681e99e1a2a3b52c891cad52155cb88a58 SHA512 d48c483ef76bb5ec8d721ba828cade25defd91bb2c0dfc3b44df36742b86e8e0650a2d010bc7843a0b4317633676c393f4044998cf7f953125bed93bb7fb9375
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip 18297 BLAKE2B 5691fe3176a689e7f79f39cac16d24e00334f2107892df1b4f38d0816a69decd6ad0a906a4932e0d79db60723f51d3a92a87b359bbb87df8b0ef2131dc097ef5 SHA512 9e4a0d741c735d4e285ce8b0fbb7f19e98424593cadc64a5b958e273bab208e8102140c4570069ee4e35ae3c1f5bcddba3cda854f7a6df6b50f736008a5a34a5
+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.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip 9299 BLAKE2B ade95bdf956e40a7c5a6e44d75d4b1b999aa02ef7b3a8bb6c33dac291d2ba06d4c691dc87ddedd6c3218b67b1fbb512529eea41d2d62a18226a82de2e01c0df6 SHA512 ff018e85092e3aaf288aba57d453088eaf24d22638f57f0d494dfa36899070c07938e50362d22267f1b40a65a69e7930a3214ea29f02ba6406a1de2b3c770de5
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod 111 BLAKE2B c5ae8e34a416406d265d2cacc6ebaf2e3f801eb0338d488eb413da396159a70b217309e4d560f1d50d173e3c717c7248f8969ba6da948bb86cba04ae0e30f32e SHA512 e3af601d732c07f5e995c21ea484fc2087aa693afacd77df8e9c1abf687c1476e41b50cd5178d07585672f0ef52cf454879ed13bd1a1ab6611428a320b73ea9d
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod 116 BLAKE2B 064d7cb8cabde1b322a8bc6d6bcf80acb5e25573d4bb50d0b9753421412ffb140f8db409903aff01a67d399773c94a0eac85734f05dae36b98402d4bb2fc5bfd SHA512 1b6a8f2c23e225f4f83de03e4e23e2ad31357785ec5e8d23e8300f249048f7d8e14419f991b509f6a3c8a05cd5ffd61e2385703e950cf1eafffdab95df4a8b02
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip 8129 BLAKE2B 235415e90169c74bc7a78bafbc4e98751fd7a57a6676e74bc05152d0c40b211cf7e9b27ebfb510952fa890c0e66d43f76e8585bdd12aea4ef0fad47df96b40c9 SHA512 4198cfaca3923afd7dfd6eb7ab5ea3fc01a03543b771995d38000f0bddf2ce02cc44f77782878ae05ab44f121bcf7ab4c5ba046e49807ca306883e9db410c8ad
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod 160 BLAKE2B 57c363c25bf42b884a85ac5a6f152745ba3138a2869041fb383de44432f6c38f39a8b11405ec9134a3e940d66d864d3686769686d81d7ce1e99c2dd22bec2cd1 SHA512 6fccb53dcdc93b44c1f2c071f09c27b0536f6ef071b6e96296c31b50e81eee3d4224e9d3e863f84c85fec70adb48f57324d363b735d4eb1ce5aa5709fd4889cf
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod 165 BLAKE2B e9cebab5c6e8af36d160a6cc9afa1f857ddd347bc18d4c2f69fecdee2c6b612af20a3622abdb1d5336d4b1e9dda97a32ec89f4dd0792a2e4569cf8da1868443b SHA512 c71897f18a99fd5d01dfd6d2a6a4d1c451497e08d756a878a2f2c5b30dea3131f8cdee708e5d8eb6add7aa9c2ad789e6c413c35fbd20b7bee441207be93b95aa
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip 15606 BLAKE2B d12ada3cb02c1999145b3b2ee3b739cb6c846f4f6c43150e71e4bed4d07f441d40a02e47294f79e7c3d724b5accc9e5a04236921f02f6a8928ebaca2d8eeded5 SHA512 a906dfdf08cc5b8a5d09700d73b52aedb66ee586024fc31396d4ce2542a83f4998c138738b354c5611b7d3fe4d09f3ea9cfe384241199c4d5b77d89a15d8a56b
+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.2.0.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
 DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
 DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip 10631 BLAKE2B 23199c0e4bffb67d890f4ac5729c97f3546e178e53f65c725fcf3728f625696ad96a6bbdd13fba9c45da6c849eed44e5143e6efd174c8dc0dc0b2a9345f61929 SHA512 974649535e3db11c2ac0ae8f3a3b401f0d967ce3562c55f92c41af6a9aaad69cc22066d00c15d8be17ac545e1b39689e35b3377eaae8d48571a961f86476e59f
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod 112 BLAKE2B 37e4e4987feb544f6382e506e0721975c975cfd239138221555dd238350b534400256fa7118705a7ded177877f3ead64275789839cbeff8c175aa3e4f8b9c8e5 SHA512 a513562aef7037e4f62d099d2fb3ee2015bb43d6bb32b734ef2597d32642d7cf7eb13f1e9a71edf424e274912d90de5db5c038b8cdc4276836740bc045cd1a90
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip 7440 BLAKE2B 51b84bff91f8490df83c9a013b58acc0cbc6fccb77ee765379e94797073521242aae7066de134c1064f460c15df57d9bce42e934d95336160413050c61b69276 SHA512 b602a1a658c95e12e71c814c40ca44356a615d48c1cc8f1aeb0130edf0c5eba10f2da2e335ff70989a1dbe4dfe789b86ff5f02424d6ae4ff3f5117e292951b3b
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
 DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
+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!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
 DIST github.com%2F!hdr!histogram%2Fhdrhistogram-go%2F@v%2Fv1.0.1.mod 434 BLAKE2B 28bc29d78246f4684c73dac6a10605db31ccdca22c582d394cd9c91f83376ac0175e4de4ee68828f17a59790930082fb6935e2eb7fb7ef840b0726c5851a6c22 SHA512 af99f4717954026a06eb886817c8c2c63dde23e8b1c98d2b8218a1482cdf48857c5acfc686c65c61dfa8c82aec5086bda9a33ebd5d89be93027372e837e39d9a
 DIST github.com%2F!hdr!histogram%2Fhdrhistogram-go%2F@v%2Fv1.0.1.zip 204110 BLAKE2B 6c141c2601c2c3eb2d8cf83cd865c14e4dda94d3a1840a4974c9d21949feab0161b0247db19b95f2ec31b2edcde5a208653acb1e5e2db4d776b045ab32ac472b SHA512 e3da1e60abe08fb1b7d6d15d4b7597a95c0ad82f1e52ce4e03bc254e767930da9f111198d08c21611f951ef7e2bab5b8d769d779a5ab09631949b4a3bab584bc
 DIST github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod 35 BLAKE2B 68297267e33add40ca12e681b6b4461ef8a3dd23eb205a365b13b158d0e055e3650fa9539eae43bbbf4ddb559c872b95ed541a3f4330a0ad3395089c4cb9c9f8 SHA512 73bd53e14c96c10e3288cd859b5d7758e6d2897369060b1581b6a4290e233877e408c9dc6350b763c2ab678a2e8f3e8f7f3bf563928b43ad37a48187ccc0ee7b
+DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod 37 BLAKE2B 60b2ec6aeaaece8fbe3ca154b432f677dbb46672fdbc95b503f613190df535c7254900c9cfaa3319ab2d7562513640c7cc9fe650d75d97dc09fe84a17e359a86 SHA512 4f01cd11b3ae6f26266154ee37e7a4084e61e865fa9427187a24a02631415f2367a4afad83b4e1cf772b263aaf8f180b4b177e30ae884cdcab239919c9e08bbc
+DIST github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.16.0+incompatible.mod 36 BLAKE2B 39effbee6cce58e89a4f700e32424a1353ae2c4410579a0cdccce4e5e44cb2e8f0bf9c5419eb199628b1be549d4c3deb890a3675579997096ace6393ab5267a8 SHA512 86c3285d609dcf781e8ac5d63a6d320af0cee0465e7071caa925e5c7cb259f46451b570c1a6c122ebd6b099e2fc2a5ed4bf6da7fff906a62709982649cbb9a72
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod 177 BLAKE2B 4dc3ea105907151260d8473539a5e8c9c32efea3087590cfc5521816e52da19dcc0f7d57ed067a15e82de427abed5a1271c45d5d3c7b284e6490251b0b29f289 SHA512 df4e0266024f6899aceda327e2634b0552f19bfc15db0dabd394cea6a15d3076b210800a083b79e4fa23a78852aab214325bd23040d5e064faaeb34af4ec4bf5
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.zip 111695 BLAKE2B 8e2a00ebba135af9cb0b8b766255bd2ad68fb762161599e568e3a1c5748263fa76a7f775b1179f58a32cf996c0e526f16d9db132d45839fe6edca62191340825 SHA512 4cf0575e874ee97053cc4928183e6f9f5e8734905477c67165c2b43a5b6de03732c652dbad1eaa92446dff10ae1972a6b4fc0fcc3b2e1184d1aff306402261ce
 DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip 15402 BLAKE2B efbf0c8a3f7e771b5a90ff620bfd513d476e21a672e3f7446202861121dcea08fa95d33b0438b6f1882273630e3cfe756c5934a14a1ab6b2676b117273616097 SHA512 4c39d0907455b1c60e539e8497477e676bf7656c3b30996d55104d6129ebaa02079e5d7d27856352446ec2570c54f0d945be83e2a3445a025c85d12834120ea6
+DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
 DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
 DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip 8169 BLAKE2B 61db06641c2c1db4102b72c097f63fae0bff296481556fa16e66ddd1808478aded29256befdc3d767b72f3abc91e376ae61656f8da2cfbfbb5ffbfe3fde20361 SHA512 9746be89f7fc5d50acd6376f77d43754e4a40d9da173a0b3226b78b1b1fab9afd859f15332ae5a429ce1e0e85227ceef05d94f2237c4969a8e6fc5e8454937e6
+DIST github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.mod 63 BLAKE2B 916adc4bf5f7566a39df9925dee67a62ad78fea197e51413ed236238494b1b2bc7fb6523a523f209664d53b884aa05a723bc155bef5be87a8a68ffc1f440fe74 SHA512 c7241375a4ca60dc0dd2e5493bab005c56e48e75da6d5a1cf5efcb2fe6ccb9bfc9f82941ec26649248f47c2b95cb5be28a00813b7603063bba830e73827dd97b
 DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod 33 BLAKE2B 7013f44d03c22c21595c5369c52e1538a526891c9fc4cccac37373504f13c66d7c504552251f46632917739dfa1d6c3a15e15aec4dc03b9c69902b0bcfc8785c SHA512 db3271d8abd514934ce5d06fd20f7490db8368e57822a2379bbfd4ccb94e67354400d487d388a57467a5a16cec339cbae9488cecf82e41d85918639bedaa0a87
 DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
 DIST github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8afd8d85fc5969d9c4b82c26f852d82fcdb08677ccf0d54d8d65b89af3ed5897125aa0d1f5fa6adca14e8b47850da8d5a70b5b3fb2f42a83ee84576137a2fc6a SHA512 e25b80b5e74a374b055238fc017a8c64ea89180ca07417abe673ad5eb0b53c9489b9d93f638da5b5cec250fe9a478345093dd2d1bf0b82fdfffe938ec1aa874d
@@ -104,13 +141,18 @@ DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.m
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20210208195552-ff826a37aa15.mod 88 BLAKE2B e68b2a7a39626a64da57cc09c741191628925ed60bb5558f7250d670ee75533d3e9f8142232f0d8388399a6fc2c15687bc148db4005638780c5214738035f818 SHA512 16082151aea1835d72dfa9fef4af569b923c60122fe916b062934ab469884f736e93835b411750dd6bc27b28665af0a05c1918f37720496c8336736ecba3b6f2
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20210208195552-ff826a37aa15.zip 7246 BLAKE2B 33a976530093cbb038a9d28dd6ecf595facd57553e26f949baa0f813392909725739d4427a5c3e014db9537edad5f457c431b459af6d409e6ffc7dcf0f3be64c SHA512 20622818dbd7ce60c1aa657f3cba8fa667acb314b731a374ac7d9e61475b992819a82cce9e3fc8c8afa50d8ae086413f3fe6f651e54d6eef5da25f35f6aa9775
 DIST github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod 33 BLAKE2B 5aced043cac582e67e8d3ddfef0a54dae0f7e4792dba23d7c6cb18fe687be98649a90e9aa46f591385003f945a2ffc192aca18bf1ef0516ac22fe1526d2e3b85 SHA512 8960a9c2dcaa7ab5225d3d10fbba4264032ff9bba80fd8efe2ecda6f9b925dab4db320a4650fba43c0d9c61d31005c6045eec4a650411bb549c60792f31c3b09
+DIST github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod 35 BLAKE2B 42febcb2e06c46797f14a850943d1df3c0e15630f376b8f1c860cf4e26ae4e2acbb38947f1348f501665f719943510aa2c0ad091f336e635430408794e61feed SHA512 c3d0bc6de3cac8395d0a231f041437b4caf00a4678270ae447b2e76bba3a588a6913cc1df6ba438bf6dd361b48860c365e9d32af55575208bd0f4b705b0504f6
 DIST github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod 44 BLAKE2B 9ee187c88e6e4eba0b58dc16701725ff50dfc3af729ff9b58c3dcd200854af59d50689ffc51caafbe6af5685d5796331fc69dcb4a1813f6124c4e6f1a0bb5725 SHA512 e594fe55205c9dd96af55f58d011e5ef916c66eb057f7c0cb73fda0388133b6b476bce423969f85c1b95eb87ed9ed48bce7570fdbd131e0ad5e7ac6010514c58
+DIST github.com%2Faokoli%2Fgoutils%2F@v%2Fv1.0.1.mod 33 BLAKE2B dbadf1cdab5b09126feb379cdcde51bb716658b130e1df5dcff57f4c5e18ba841a4a17a27a8cfa48656e25340c9e312162ad3d99dc3e00f52b4880e586317c04 SHA512 15ed869d5e1255a4074087ace7f70f2075edc683f811f47091afed4922010c618a7857196593549b5dd68fff8731a3a5e92497e98ac44a05a464ae8cb6f4acf2
 DIST github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20191024131854-af6fa24be0db.mod 1060 BLAKE2B 50eb8aa20b011a8dedf13e3a00defda30ee36bb4ed9405e648ea2cdd2a00cc379c8a1c41d3d5794300fb7624e59b2b5aee65d8b93555c736908ec1e7c2ac46c9 SHA512 8bcab95c89a92d8840a37ecedb7a000290e6db5a4354bf1339066d1fc02c16532be5eafd4ae3213df10eac236d08dfcf50a0a6b848f63c0557453a26dc36d3ea
+DIST github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200923215132-ac86123a3f01.mod 1087 BLAKE2B 92fdd8020c4e2a405418577e22c65fae5c1a485ef9990b300eb357c68b7953b1a1725251714d79e87114741d0e8a388eadc6047e915a80a6051bfa75e9197daa SHA512 9c39b9c6183b9fc0b975cb95aa0b7676771a4101255db290e4aebe40eebf02ca0e07fb74b5affbcfca8d22c619925a5777bf20eca23f9c90d2e12b879d58762a
 DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
 DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 37264 BLAKE2B 13a34ae8ce6866da183bb7f9f5dcdb702ffe846a3c5e789e99f6e112a1e64b1dbbe8777727e5678b4bdcac75ec32ddc52ff303b95b5ee3fd22423eaab44809c2 SHA512 e1b8ad2c09c16599c6e5053f871df9f66698c7a632276c1e68c80c9737216751939b7b7024449ed63da0a292688b4d7a441d64512aa4bd8684e418f4e5da4446
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.zip 44404 BLAKE2B d1706e84ea1345f4e4b76abe2455a85f798dca31fc628a83545f15aed99b2174bf07b2f62bfff7a4baf6c250e0c8d8009991194ac80a7cfeee73c9ef78d07340 SHA512 3f51d990b087a3762eb6895c8afc118a62af946f889a9f4bae0dc74b33bfa43c7a8e7ee50e97013871d67914a7f1986e500501ca7462547af301526f427f2853
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod 33 BLAKE2B c5557c9c02300d9fc6ecaac5694461cd440f5a1f5cf9ddcdb38e6fc51d9a55d9ca1e98bfabecb6c83fce81e87979e66e56c585760ef61fdf1866480c0e32eab3 SHA512 15b2cb1fba3e5103879548ffdad032ae30f0e723cfd26fa6bcf69afff14b18c2cf3373f511702b3690fbdb7040996c437f9cd0253bdfbf211b665ff14e97aafd
@@ -122,12 +164,18 @@ DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200907205600-7a23bdc6
 DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200907205600-7a23bdc65eef.zip 73879 BLAKE2B 0f9e74cc1df01c8a03d30bebb2349dcb7cb37ce9494ff0e4f4a14265141f56e5e88ab3d9be1a2d6d8d31959f6391e0368478c4a70ed7065ced2e2423e9c09d3b SHA512 c6bc941a546844ef3711a09fc01ab288f17e966c53dd416407fe196f73ec6b67f936f36ed57f61f079f2a7b2804e8da6dda858dcf6a16ea8831d2a0a9d6a6bd4
 DIST github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod 125 BLAKE2B bee4d59ba1392d0211558f6ce3511c887a474463f784cd92069df7be6de5281079d579613f0e5988ad1f3355bc8ccbecdae7f1fd551fb122f7a0e8ef11523e1d SHA512 7e6ec3815d053e7d49d2b0a3d4fdde6c6eeac6048ad0eb681da1305f6d9d5bb6671e31834ff6e5d840d9a7944efa52707d40fa737fa9ec3d3ed9d130b589f9c6
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.29.16.mod 293 BLAKE2B f9e61a09652a858841e6530749b9dfc87509f2360d87ba277003cf6eb48bb8a00e49d57dee39026bd68f9c38b48b23e415ab10a45220f529045462ef707ec8ee SHA512 498bef5869b7df953499ce3416d9336e36c7b992c46f1bd96331aa2a224be136e93385efcc827e579fc479e3ca38f7e54fb0eb1df3e90b9b16f43182dd4ac58d
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.28.mod 217 BLAKE2B 1ecb795a3b0fb98e5a1a90fe90bd37f399fa3668cce958c78343c2fcf9823f2a375a6faae68a552f74952cd8ad15897cf83760ceec9c54a3c104d535807a35ab SHA512 04f1943e2b78bc1480478a2946bcb0e15289008e1ccab9e0d7fddef8862750de3d22635b11b09b377b3abf0a51f38adf7ec13a246fd3cbf5f7dff7734c6ee2e1
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.3.mod 178 BLAKE2B 1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3 SHA512 376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.3.zip 20160984 BLAKE2B 97bae36ef754df87e5292cc10411e1c2dae68cf59f17a30af28c9dd61de391aec6cb4400ae02c757f617f66d474607378f5404824ba12af886e69cbeb48d1e8a SHA512 fef20142aa38370a16084d5d7c8fd8ba6fba683d9f31619c4ae71150c1589afe37353f6244e9817ce857a1bdee62a059d28dbb00a839f90dda90b8ae0bef92d9
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.35.mod 178 BLAKE2B 1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3 SHA512 376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.35.zip 20693630 BLAKE2B b2a8d9c4ac28903bec2ccb1e0dce9a2fbb73ae3284275fe89c5a049e77cc6f183a467079488bfd84dbf6f3a3fb4451fed7d4feaa39da758b0a3489574abb979e SHA512 1ec9f2a9dbb913272168e020e23c1cff86047e84bcff2830003cbc9a60dd9d075250ffd59a18bedae1fa3b764d31888acfa8c97b1b1277501c2c5a19df858013
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.60.mod 178 BLAKE2B 1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3 SHA512 376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.60.zip 21170076 BLAKE2B 844577d836c715376a06f2a4bbd89ea4979cdfaf7cde4dd4d05dc6d3c1c506f9da03badc4d3280149723db5e106446c731eaa0dd02e03c7f238e9e15a97e86ce SHA512 4258ad761cc9e30678188fc9883c3865a8f425a8c2b22c56836d6d18af58d80d1a8024cf4be47073d559c0a5c6e046ee467b725b272b230e9a3befeea36a5cc3
 DIST github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod 444 BLAKE2B 330419975445f724ee7b9a3ef8395fc7a153f189012dbe70e982865f5f556c2ab0d41a3465ec5cfddad034f12f226f77fcee9e3c1024693a0f9b13ee26f18092 SHA512 bfdf66b04b9c41824815a5a2707acce5c3f74aecf15a510d45adc84b732367885a18920d3dc50d968d0bc5e8a4fe3d519f7212de80baad4656c6867357c8fca7
+DIST github.com%2Fbenbjohnson%2Fimmutable%2F@v%2Fv0.2.1.mod 49 BLAKE2B f0b58cdc41e4d17ca9627576f9116cef3f6fc6329a24e4ffbb702d961ad9c66210d5479a8f937436565013d0cc9d807527176afef8bec352539d817c24d4852c SHA512 8771f9035de1a10355a6a4426d59d9c0790b4ead9109eefa2b5340305bf52bbb03806436389cbadbf21c13cb3bf3db8012bde9dd7189014362282694e783d113
+DIST github.com%2Fbenbjohnson%2Ftmpl%2F@v%2Fv1.0.0.mod 364 BLAKE2B 9a2a0ca90c5af6eafeb9e0f5f74c918cb4e2495e503e80537b2f126a60b9d0b9e927897a6cf2bc3dd95b3e8b6c5199f9ca7e475fd3403fa79d5abccfe77215a1 SHA512 bb526b7e7fd4d5b54f14db9ea89bbe2f0d9d5aa193c79e94c74a94394f94d7135c6a80258a851cef47d0bbfabd423a66aac09e825545f3d916398d390b3614f1
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
@@ -135,18 +183,25 @@ DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc6
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
 DIST github.com%2Fbmizerany%2Fpat%2F@v%2Fv0.0.0-20170815010413-6226ea591a40.mod 32 BLAKE2B 25b2fb5f8529b2f05f214278d44b7bb0470cf5c1b5ab7ab72461fef66ac68f911c4c092b073bf0b0f1688d596847eea2782b4d303d71ab3c2801c1a7b024dfe5 SHA512 f26adb57197a4c172e0e34fc6a4a897e54e2855a5bf67dc43667ddfb57d31e243d4a971044c456dc0d1c54351426d7582688705791c3844938dc76e0d1afc5aa
 DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
+DIST github.com%2Fbonitoo-io%2Fgo-sql-bigquery%2F@v%2Fv0.3.4-1.4.0.mod 135 BLAKE2B a12540dbe9c427639b816f0056bdd4a6a7cba0c82c969469de1696ee455beac7df0266c755e24e89decde737d452e584709110c4d163521a538de09ffc526a43 SHA512 0c53c98689f35f5bd72aff163350c66339807796276fdc17457cf0e2245618e3a711aa6b149a1cd15b77733d0b5a134e3384bb42c8011a39c4792e3c1267746d
 DIST github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.2.mod 35 BLAKE2B 275030ee2ce09666c11f6b20ba9d787119ced543b4e3f310900f5030544e956af15b407003d01849e807f0c8c256bb709619fdacba8c19b93e4806be5a1ae5d8 SHA512 cd905646c7ab3d19d41de121be3c8630c40ac2c55ca77b73afab555c54d1130f7c41c966ad91b84744fc2d52cbe3f6f7e7d1f2f9db5c8a29e7c799ec007bd4b2
+DIST github.com%2Fcactus%2Fgo-statsd-client%2Fstatsd%2F@v%2Fv0.0.0-20191106001114-12b4e2b38748.mod 58 BLAKE2B a209d3a66279f0435d351cca6a52e5245136dcf33ab7bdecfe88bbc7fd9458c56249a0cdc3c38f0fb907819589ce37e3065559a5a59ab56b8254aa9ece7734f8 SHA512 166f52438424adee08c875ea8a82ddc4d2bdf33bdfaac6a33174bf87fffd943076adca572ab88e436ea0b57b06674bbf600452a33e329db90fea1d4168bf2ee3
 DIST github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod 122 BLAKE2B 47d561554f8fc26402a1aff96895741d9d50e201237346d2d147eff3e5977f356a3dbadee8c8b3c492bba7f6be33d48ad89dbd8a02e710dd96a4b29b1f3c1fd6 SHA512 1f9d455792a66a48351a4ca57810d37306ff60474da6e8e308f983fcaca4326f6f64bab9c677900e014271b52333d1588e287493c2fa853bc7fa40717556a670
+DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv0.0.0-20181003080854-62661b46c409.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
 DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
 DIST github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.2.mod 47 BLAKE2B f238800b26c16806af21a26f7bc037b5b81768b47e48fb469740e3a8ef4febfa6514bcd86c596b8c9f4159dbc7d741cd17939f510394c1654656c27350952ff0 SHA512 c398310bf078b9e1c748d96334b1c10188057c8078ad7e7b58d0d0ac286221b7f95ae0ce6a69f6a4a4b8b50d89f2bddd9e03adfa447e37cfc250f395644c1764
+DIST github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.1.0.mod 47 BLAKE2B 83d00b9c631dc87a144389517fa91135db894a8a7caf77e8b80c48119f0aab490faf1a8e6db3bb3e5c58cbc040c24eb1d11e9b6bd2cd66e4ba4efcdcc136edee SHA512 1570ca7daa00c900f8ec382acf840ba047fef8673edba2e1430294527e9aadb9309197de1a7d4219373fbd8c5854934f11b3e25036ef1e2e7990e105ac6d8430
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.mod 45 BLAKE2B 294b4032890409da39f83e21947cbe4e039ae894cac4e044f4c91830c531ab543b510f7cb30dfc1fe05ea58b90733480456824361bf26e8f6e5445ef66346485 SHA512 2710d436147bc9075072e5e51a0df952bd39743f704d8d125ac27ea864bfa47a3ac6f0f6cd1bdcef9639736c11846176fd6f04e4e6c7c306ebf2177446eee066
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
 DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
 DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
+DIST github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod 51 BLAKE2B 3d0af1f8d7979de88067539579b73ce3d5d81a477ff042831692c738e9b4c99de13a3beb20fde003df06145e26d472621a2ff2857fd584aa1527df3730fc5efd SHA512 d1c83d2dbd4e242bfa9d8b9b58cddbd4a1ad112d1f5d1ca757fc31c6a31bf460d08cc3c9bf14c977fa74d2099ec83d5e45c05fd6121f800e26da6a837d862ccd
+DIST github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod 47 BLAKE2B ef512f7530c4c3fc3319129afa2fdb655d40af9aca697d22e4470528cc41ef9dd5ffea2258792d0efc7e1e5de2de2fe760651df84c3d39989c4d96b58e85371c SHA512 027b177fb04d5bcfaa0e524e6682b639bd91f7aad9ba14e22cc1b4f352e2c3bcd4d93348ed013cd839eccdb01449db40170243e7895c2cfa3f6980279faf39e3
 DIST github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod 32 BLAKE2B 5483978ddce5f57e08f1358c34e5ea6b26a234e017b2e3a9af91296de3c79756f73f8cd9629b7d04c88e2135f30781cd0f43fbf9eceacebf26f141bb297f376a SHA512 865b4cc3ac91138e9b4581be778685f89bb93cdaf2372bb7b5db6227e249a2be89d5d14c89bd0e874e01d744aafc08b30b3ccee18a472981bed0e7740d892da0
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
@@ -168,15 +223,20 @@ DIST github.com%2Fdave%2Fjennifer%2F@v%2Fv1.2.0.mod 32 BLAKE2B bac4a6712c426a393
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.mod 182 BLAKE2B 27d2e8f155923769d6df395281d9d2967f2bee262faff767c586e851c1595d8c74db1f890809bce63cd9544c4dfcdbda89e518a25e1a8925ff78607940e2a374 SHA512 14925087284b332c5458fa81d0e92f2a33b4a59e98b93dc6c99e0943f03c13165e8dbe1a27fe5a4d78b62b3b3bdc84d634bc31f346a70301cdf7da7463c85f92
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2Fv4%2F@v%2Fv4.0.0-preview1.mod 112 BLAKE2B 755edd2ecf415fb5672be22d9f344d1f33d097607b3198df5f5dd207b72c8ebf97a302cbd7a2227d8303c0721cc68c6b3e8e7e9d08d7fb4c6d10ef5e886d6eb2 SHA512 321ed7d217224697718f001c3d1fd7a56334acc30506464c77ba6fcf54134115f4519f8ea2d28e94724cdc2d02b66a186f1a5c35098c66a53aa436f8f5612300
 DIST github.com%2Fdgryski%2Fgo-bitstream%2F@v%2Fv0.0.0-20180413035011-3522498ce2c8.mod 39 BLAKE2B c435f602cec54957d1ef8546cd47d5f0171055be6cfbb65da80a055e7829ab42ed7f88ec10b04977f6c928794e754b86722cc686f7315e873565e767c34ff976 SHA512 afdd263d04c6c48931f5734013fbe50d810d027664bf5bca128ffb8ec2cb884466f68eda26ce54d899bd517b6c8151ca4e1f09cf767696dbb56ccae1a5cb398a
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20190329191031-25c5027a8c7b.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
 DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20200911182023-62edffca9245.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
 DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20200911182023-62edffca9245.zip 5923 BLAKE2B 3cb4780d44c02d706d5fbbdd0d508033dc5f72f018f5ef949bb1cab44e87e1f8032d78eef76a43233da73afedf4c937cceb7ded00bdd77ee251a67cfab2f7b0e SHA512 71ed2207658c5c675c6cd717dd34eebbcfce3126a15d7f2efcf5dbaf1336296391bae17020c165e7ed4ee24c12158e7678a99db8d9b31728ff36ed6b61c0464c
 DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.58.0.mod 507 BLAKE2B e01241c3c8407bec21260be1b0926622fc6af0ab4a61c77d142c6bc46204a15d57ee91a2d0491d0de0a2f2af05bbd528da4ba709fc1728acda88fca43f6671b9 SHA512 9bb85f88aed3bf1b11aaf1349c47f2e231313a7f07c6dc0980132b12598fa832560961b7880f959494db2c31c0ec5867c1eff01e432b30c966bd4dd447e5e4e2
 DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.58.0.zip 150462 BLAKE2B a9e96ca3464fd3af626cf98b907c4af6027a41e56c793319906a19c05a85f0eefd5536c7a77c250f5b2f07450d705803a9476dc267ac124d25e165d6f1d698dc SHA512 37fc65f91bb65a2785d467fa787ec8ead784acc1fa31523d3035d514843383905aa0c561fe4a936b3bc874f5a5d9bb87f51cfc262e2ac133c9718dc6bf501ab9
 DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.60.0.mod 507 BLAKE2B e01241c3c8407bec21260be1b0926622fc6af0ab4a61c77d142c6bc46204a15d57ee91a2d0491d0de0a2f2af05bbd528da4ba709fc1728acda88fca43f6671b9 SHA512 9bb85f88aed3bf1b11aaf1349c47f2e231313a7f07c6dc0980132b12598fa832560961b7880f959494db2c31c0ec5867c1eff01e432b30c966bd4dd447e5e4e2
 DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.60.0.zip 152063 BLAKE2B 574b2822f3e5e99d322f60de2e9fd458ee69011e3b11f6596493794a06e1341493e9e10a670ddc1490627ebc3a045c891b63519574178ea4aea811d86c748cef SHA512 83a7b72c3ef93e248d95ad4841061f877bbddba172be4506ec6cfb2ef64c5735f5a863e9c009074cb6327cbb13b2bbdfdfd562a6ad9d477d3106332c93f87e56
+DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.62.0.mod 507 BLAKE2B e01241c3c8407bec21260be1b0926622fc6af0ab4a61c77d142c6bc46204a15d57ee91a2d0491d0de0a2f2af05bbd528da4ba709fc1728acda88fca43f6671b9 SHA512 9bb85f88aed3bf1b11aaf1349c47f2e231313a7f07c6dc0980132b12598fa832560961b7880f959494db2c31c0ec5867c1eff01e432b30c966bd4dd447e5e4e2
+DIST github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.62.0.zip 153788 BLAKE2B 96832e06c28c6966d62ba78168dcf88f97d5af852f15e408a6e9f7268b58b0505f89840f99c1106af3af1c0ccc0b90f183a3bc05898876bed8029b3bec14355e SHA512 b44fe926a19562b82257d6a00b44234edd4f9cb9c9bfad3360903950242a5454e71880f7abdc84e06a6d59fcf103fa2a2cc90bd9d824219ff5813b6a4cd144c3
+DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
 DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
 DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip 27506 BLAKE2B 0c2accaecec1942bcb9febbe1986e283e3e84e82731a847711fe33031b84122a239561bb6bf7c35015b4bf3c53b77879d44a52ab1b184c5ed37ce33c8a418b32 SHA512 f445307fe15f2abdb2e8c0be22f1c180716411d413b8d27d1b46f00e5ccc49b963a7bc675021e03831fede8470b3c0b384d0cf0f4736256114dde204f5a56611
 DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
@@ -185,6 +245,8 @@ DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.mod 32 BLAKE2B 60
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.zip 4571399 BLAKE2B 01e24524ce18179649f706f1f205ac1a98be0d1803f8db4c08dea1aedbc742f418fcb72ae34dbf7c7f799d6d579a3187f98d97f2990edb9f82a50c0bad443ee0 SHA512 3755024e1c4e5f17b10b1527829147127060d594467fca5da55d47c26ea4f79669caecb1c54842ed609b0a918b51fd0b80f74093c3c020350893c4ce8aa38e19
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.6+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.6+incompatible.zip 4574445 BLAKE2B 80512e0154222f11ff11e0e635c5e877f8d76eb524f13454b3c6923dc2ddc24fe4ea203d0b6f1f0d9ade39e02bb3c3780913e29ad57fe69562c82bb2f5ace7d8 SHA512 ecb7ef6c7f9ded19433b23ceb035f260a4294a1fd8aaf3ce8e3c87845fd1ce376f3034b8bd2e9c668ba9c8cbc6404d238165d72edd40eed7d38b435e821a59eb
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.7+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.7+incompatible.zip 4574025 BLAKE2B eacbddfbda8fda890ed25bd144a1a96c6050267d020e9568158d565d9ea2e2a62348a64b06818666f0d0a68f0b105b246fcb0bd95a2b061f83fdb31b0cde2332 SHA512 e163d6cd0dc2302bb069c282ca55197eaa4736b7ff4411ffffcdcfdce6913c4656601c2cad38dfca36fccd63b45ebf74507178f2654a18304452d4f5db304293
 DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
 DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip 43214 BLAKE2B f64253be261a17ca9e2c6540d70b159c89b5f578921a7f6287e39be2a99fdec8b67191ff06315e5539585ffe812235ddd90c4a9754d8d63e512fec1991297709 SHA512 a61373f6a66f0ffecd3ffa78a99e6d9560419ab325f12101ae90f2623fdcb2e10adcf274459191263e1a80dd866fb98388434f9875c52e42dfd646d3d25264d3
 DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
@@ -193,12 +255,14 @@ DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip 14089 BLAKE2B a825c998f5a7
 DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
 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
 DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
 DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
 DIST github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod 43 BLAKE2B 1431139ee59695bdb732385a06f05f26856117d6fde79f5aa3e3bac98bd7f10e6786600c90b414baf7d10c2bde471ceaf265e471b3159a00a13dac8cd4736b57 SHA512 9b87dd132016fb64ec4679aabaca500e4d07b1131affaf5bd1eb2e780b48f2e1364d1cc9e655a6a298d5e2e2b74aa554b228d636e294f01c3ce53f6f53837f0e
 DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod 33 BLAKE2B 52211e27792f060734989af8b47b48f3f9edbdc94b49917d715bd8853a3f05ac714cfbf752d3171b4c223a8787497df16e1ee46b07203a6d2c4cae3540c66af1 SHA512 ddf8e796d04c0741342eae18ad343861ad7a76d030a5dd9a27b1a68b2944a0f94ec21b1513640179c73c16d79ac309b8552dae42d6e45bc0f03d33269666bbf6
 DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.zip 7269 BLAKE2B 470c1c97f98491797c00b10598113e1a86948ea9490eca41925c3c814083ead15e97e98affa53838523487b1c91857074d2f3df4bb3b0405a2e2680096c6080f SHA512 be798def35cc584c8510a0acbeb6e243e911d3429d8042804e8ebaccdc6c6a46043087e8abe4d894cf8f03347e666d877455d138941c300d4d4b4e20473b78fa
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod 46 BLAKE2B 26844d83faf5b29bc13a3a48ccf6a3648324503647617e8ff13baeabe4d95ebc0e4f2ca5014b553148964625323dc1a11bbc0a4fb5357be97770a3b6cf808bc5 SHA512 5ec3e01429b0c86caa7ee04de7fd70505cacce1ed540081ce4c40143c8776cbb75443dbaa47642da02e263c02c7e3557d6425c3cb60f03a5bc296a1cc3b6541d
@@ -209,6 +273,7 @@ DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod 543 BLAKE2B c7
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 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%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
@@ -217,6 +282,7 @@ DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dc
 DIST github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod 30 BLAKE2B 725b27caadd05c18fc518e46ce4f1a213cd6ed7b4da3edb02cd74b7c7d3dc37891692f195144bbfc455bdc9bc77e683b41122bb3d646796555e92f565cc0133c SHA512 d64a7c87d6a40c48684a61ed0f6a7e75590df7d72d55242863f1bf18af9bb9ef51c40ecf0c41fbc039e06f1651898a238375afb12f41af5978195887a9a16c9c
 DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod 39 BLAKE2B 03c2848adc48e404015826fc857d2a7b923efe39f2b11ec28e238ad2b06b0c5f4539f256443f91a116bc135923de7c4013a44285763b482d2baab5db1bdbefc8 SHA512 6c5546d979277d5488fb31eeb9fc33999dea631baec6902f937e19f4d65a23a2bb8620481c3ec69606eabd019be0096553097040bc778522b05f85ebc56bb787
 DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip 59458 BLAKE2B 3e319bcc242e354aac2efbc31d978bc5dbc0b1af3911835f96243d3077fa12ca37b16256e89223b95d1c89f0fee1cc8105210c6cd74a04a01b69d7c45d4da3ae SHA512 77e29db3609028cd2026db97add708afa8a0688ed76d40e2beb64e5cf93004714605d8cfb83cd2668d1be1c5401747652b09d0f6e7aecc3ea0a3a1e08c957f06
+DIST github.com%2Ffoxcpp%2Fgo-mockdns%2F@v%2Fv0.0.0-20201212160233-ede2f9158d15.mod 83 BLAKE2B 48ba1e164f94471f2030b375e469b702f445684929679429035f2d0de9c865825f82c89fabcd60a2182afe34669cecf5e1a6df6d2575f34408cd5a123665c78f SHA512 91ffbed1735be70d1888aa28a75871396c3ba9768070aa1117c0505936c99d9338b113de968f48d61288e3a62516551c09077653aecb868518e78315c7c04f7f
 DIST github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod 33 BLAKE2B 69d161a91f7a47f08054ac8715154885a3615d8366b32d226a08f3bc975f6c87d168006620ab53fff5ca938232f06ac9eccb1b7c0621c91f9d7368b38cf29bf4 SHA512 9376e6913b3d764bcf0de41f4d6cffec4da5a8d387488cf531113e1597371b838fc398020bc85fdbb0583fcd9fbc2fbcb23b246c3d8147a6c606bee3f0974882
 DIST github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod 32 BLAKE2B a4dc1d6fd70150916e3bab8b310fe7ba5c26aacb90241b18ddb51f2608ebcf4e82f29495e663181f5a7b1f0f09e0659607eae17850dd0bd3ea8dbdc0f4fa6ad1 SHA512 1e3cd7f2ca465a9930734e27984262e81d563551917c8af55c521f15cfbf56a423ef918fbd282b4947c81a65ffa1c17294d4cc83aae639d9432dd3a52fbe8e83
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
@@ -230,6 +296,7 @@ DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod
 DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
 DIST github.com%2Fglycerine%2Fgo-unsnap-stream%2F@v%2Fv0.0.0-20180323001048-9f0cb55181dd.mod 45 BLAKE2B bac7691d817e47764a81e469868f9b02deae3674d8853e7e9e089000dc2c8c94414c978dde8f7b8da65bb692bde21f569db9de8b94c2944d92b17b9534ef9b55 SHA512 d74f84f6297e89c221091296b305df98c6a28d30385a5a4dccbdb664040f23dd211528e2d859e259e862b0f626f94dcdd20ff58aa8afe26af5b95d9e675507e4
 DIST github.com%2Fglycerine%2Fgoconvey%2F@v%2Fv0.0.0-20190410193231-58a59202ab31.mod 37 BLAKE2B a1d5e990a4760ee43e0e3ecfcfed98cadb6870b30fd5bc4015c5d4ad89eed058453f2f48a771eb12f0952e7fca5a817aeb0139f529b6fa7a82a1445e19c066f2 SHA512 f8c65c717d960464e2773cd3f6d73a481d9694ed90627a08eefd42f9fbac72c60a5fa4b0b28942eac6292afe62d244eaed51a6514133a8d0ff41282b3bc71c26
+DIST github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.1.0+incompatible.mod 29 BLAKE2B 4332920508e4756b8f02245994a6817e6b12a463cea35613711952e2ebba0a902a2971e72cfebb82aaada062bdf9366d3a54326ed9ef41da0c3216e7547cb433 SHA512 7b02adad42c8b81f594661492450361cf74104c71257a8a27fc4117ac4bf8cec169f43fd2f1977a929c8ac94841eec03ddfbca3a19d1668f128ac028d81aec38
 DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
@@ -237,6 +304,8 @@ DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod 2670 BLAKE2B 211a6d7642da991f1
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.zip 461958 BLAKE2B 025cdb8036d1e055a68ecb215d0e8464e0840d5ad9f63c7ea11cbdb20998c74d21f5b9d019bd4b36335e9bb485b6fa5ee285eab1080b755aad8bed59e29e7d9a SHA512 fce6fbee13f3b4eae6182c000d809d9d96918ee93be3d460a6ff359b0889299a806e76b9caf364454211116b5acabca02caf2f401e900c95ec41a5bc54c4d693
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod 121 BLAKE2B 6463ba6a856a7bb4efcd00a3369f6593b31b8ef39da4bb16ce1acd741c0808d2243ca7787c0a52d4653a5b402841159e97cd4b42e0f6172ad39429beb2b06993 SHA512 564f0a1b0318004a7ed478c8f3a371ea2f59efd56eb2efec4fc806183de1b4a065d5b44aab6dbd40446d28caf5a74545a7ff6a3d428b1b41cb6df5eefc11e5c3
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.zip 45063 BLAKE2B e64431d884daf0d8d9f62910ea9970ad2ca5bc7e5684ca2148f03f4c9f4563f5c057de5d0f1b44a12536432f7f5ef019ccec6d113ab7ffa8213de68029e80090 SHA512 c5b1b8d35dc5ef3e18474a42edc4dd103238efa458b70328bc1ac0b3c90abec311719b18dc0c0b9bfcc1cfee77ee8374cb8936568ef62580db17c7d1a5c18f3c
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
@@ -261,12 +330,16 @@ DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.7.mod 386 BLAKE2B 9d3f52b6d44
 DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.8.mod 386 BLAKE2B 9d3f52b6d44d905f7d5ee42b14d115f2519e4300baf6512b9b2d63ce48d74d6a60dd91b03756ebb9b7f511c2e179897b1b67da25dad7d57d53ddd738fc61c3fb SHA512 aadaaac62be073e769e47e1cecefc55bf675617b9e9461cc45bee98e0cc8bc5a7899c4ee43ecc9154cde49bfa8ec310ee7cba6386c5b7f5346a432d7311909a4
 DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.9.mod 386 BLAKE2B 9d3f52b6d44d905f7d5ee42b14d115f2519e4300baf6512b9b2d63ce48d74d6a60dd91b03756ebb9b7f511c2e179897b1b67da25dad7d57d53ddd738fc61c3fb SHA512 aadaaac62be073e769e47e1cecefc55bf675617b9e9461cc45bee98e0cc8bc5a7899c4ee43ecc9154cde49bfa8ec310ee7cba6386c5b7f5346a432d7311909a4
 DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.9.zip 27898 BLAKE2B 516a04fa5f110e87d91589e98422e955cc82fd5447d63082905a7d835acac7870096a1069e786dafb88e92c002ff7aeee11a6d94ba3d0d2b48ec963d92ab77a1 SHA512 0cce56377066137a4271a0b21a811ab963241fadc6c9469856d65c624a060898f2bb043aeb399acbb5f297773704ffec5bafca49f14bd0655c775207ee2a3907
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.20.0.mod 386 BLAKE2B 9d3f52b6d44d905f7d5ee42b14d115f2519e4300baf6512b9b2d63ce48d74d6a60dd91b03756ebb9b7f511c2e179897b1b67da25dad7d57d53ddd738fc61c3fb SHA512 aadaaac62be073e769e47e1cecefc55bf675617b9e9461cc45bee98e0cc8bc5a7899c4ee43ecc9154cde49bfa8ec310ee7cba6386c5b7f5346a432d7311909a4
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.20.0.zip 28801 BLAKE2B b78466b3848bc8ddb0703af0a5333d3c5670a5fa0926c80e89938d6e7fbda9055ab9b22733d48239cf4073198d7e93c3704ef84ded98352b1051dc2a305072bd SHA512 d6cf24e3fc58288dc253db29ce9954ec9cf09c69895aeb32c8eb82c4f1d93b8d3a275a016f5c99052bba93693db5bd14068663424ea9aefced0c843335373553
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod 41 BLAKE2B f496cc326aeee2c6f1547b802fa1ea13a578144331451bb772a33e2934dcc655c9355f06f7845684130c6647d00decfa937c839909baa01a6d84f6e601a427e8 SHA512 56fe1d995f8f51197d68494fb2edc2d5c5cc863c881ed640a74ba80e292a54a0600f10c727b3dc8a209fc33c750d92ad658374d0dc3d083fa9750bb7174f5613
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod 335 BLAKE2B 9090c5311a481264437c2906edd2c7cced9e66653739156c88bdfa215612e17e6105edabe34e12f2dc7b3081e53b9941d02b3e7b61cf972c0da959cd855ccded SHA512 33d493241830d340c34e440c373a9f8ee35b4eb1691223d9e4c746db1a5416eac573ff913d4ac3bbfedd4fd738dc798a8840fd278bd20ca27c91100ca1c9d376
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod 335 BLAKE2B 9090c5311a481264437c2906edd2c7cced9e66653739156c88bdfa215612e17e6105edabe34e12f2dc7b3081e53b9941d02b3e7b61cf972c0da959cd855ccded SHA512 33d493241830d340c34e440c373a9f8ee35b4eb1691223d9e4c746db1a5416eac573ff913d4ac3bbfedd4fd738dc798a8840fd278bd20ca27c91100ca1c9d376
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod 126 BLAKE2B 27ace39813b8f55ba228ea7a2f298e26bc30daab931d25167887237a6e2a944014b132f143a20006e69861a6d4517d597ea6d56f74b2fa6941752f3161e44644 SHA512 a33deb764fbcafead3f863c4e20fbd6969e8ed04098fede6872555405fa4a352b31f771adfb5df03fd633ee5471dbe259407d873e230af01a1fd31b78042cee2
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod 210 BLAKE2B b3f610a7bbe7758041e145a17de7becfe6ef0d80bf8a2e6bb9de47883483b3ced7f09e0ef1d170f42f1c5928913cf80043727b3e62fc0025943f6a327a884f64 SHA512 d927113c08de347570e5ecf4ef7019c7574e9fa2d751273e8c68f114b49aa4a9d9c39e32937ddd1ad3d665757d59a4e498fe275578d40a6b0dc644ca7dd8fca2
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod 210 BLAKE2B b3f610a7bbe7758041e145a17de7becfe6ef0d80bf8a2e6bb9de47883483b3ced7f09e0ef1d170f42f1c5928913cf80043727b3e62fc0025943f6a327a884f64 SHA512 d927113c08de347570e5ecf4ef7019c7574e9fa2d751273e8c68f114b49aa4a9d9c39e32937ddd1ad3d665757d59a4e498fe275578d40a6b0dc644ca7dd8fca2
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip 18595 BLAKE2B 1d2f10a892b679a58ee2a5f73f423d91127bb8208fdf1bff862c8634d4fe1a93dbf721ece4c87b470232b78924a4ef190536dccc9acfa4a16f0ef21609e73d9b SHA512 c6b3a6bcbb93b2882a9873d0362b8618499f0f7d0aca697c5b9de04fef7f3c462fa11a55a175a0c1ceebf34bdad9df365dfa622dffc59abc4d881136aff5dd4f
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod 43 BLAKE2B ab024fc86c325a82315f5a99c39e1fc08440ee35d81fe09959816a0fff09aa5d852431fcc370dde082963ccbd0d79d74d987f1bacdd4796d6d1d11eb80089d63 SHA512 b3548cd55d406b9148e992e276f7178d68116825198f359971f22a1d9e7e2548cdf9605a1b8b6f04b3b66d92faa906dae781a53624344733fc471452f16f4312
 DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod 611 BLAKE2B e9be68fdc22a6dd742faa396fbc29905dafb4addd99c8b4dbf44aa642b06e698a4acd29c1d5d18b2bec85b817fff28aec2e9467644fd0807216df209b89f87e1 SHA512 4f4e1b9f6ace0cfbac71d20abde69a7a00c88d29e4b820ba92b4b3c6f786fcce251fe97a3d853e1c2e37518ea8c709101e542e0a866e09531c1fed6dc04b529a
 DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod 611 BLAKE2B e9be68fdc22a6dd742faa396fbc29905dafb4addd99c8b4dbf44aa642b06e698a4acd29c1d5d18b2bec85b817fff28aec2e9467644fd0807216df209b89f87e1 SHA512 4f4e1b9f6ace0cfbac71d20abde69a7a00c88d29e4b820ba92b4b3c6f786fcce251fe97a3d853e1c2e37518ea8c709101e542e0a866e09531c1fed6dc04b529a
 DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod 354 BLAKE2B fac3e9e9fd1514b1e07894e6931cd0368df9dcc09210519c569d81871ef1350810111ae38799b9f0b5692829d380b403d8f7468e81eab8ca22027ac3dd8f9adf SHA512 30bf4610b301503fed728f146ed4458dd3bf295e1e4f7e1ae4806f4ca6e8856be988a10642c84c5dad601d71ee5b7bbbbe0f3e371be1b382c3c3e869493721ab
@@ -291,13 +364,17 @@ DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.15.mod 420 BLAKE2B 6cb7d725e
 DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.16.mod 719 BLAKE2B bb13bab5dd2f47f267d06bd8103babfa7a039aeb49dc92d6cccbf1678f7ba203065f68b0de4189176a320fdb632d8ea035e0eb23d658e9e998e0a0ea2649bfae SHA512 033d13dd0b3affe8c1fb11f03c8f8e3a5e9b560d947a755b5793d57fd8d1d0db37284906b59cd6562af28884038d234debbdb7117bc268b63f86904b0c0219fa
 DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.24.mod 487 BLAKE2B f93f1c9551f9480c3babcf18b3d840aa794302746acfb69abc519db8abd7da042e8597c0ff8ff8580373afe2bde87e47a69552e726fd67e4566aba2e5880cb25 SHA512 188f10c0a79e5008d43844f12b7a4dacf13b161d10eee0c4ceab6d51a44db507c2f9a8b8b84a11e712ebb91638099ee20c6f5db29ba15a687cfed0b949843e91
 DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.24.zip 198206 BLAKE2B a32b49a0a62423e23d74f5e915ab2614e6375dae6a08e348ace7c5e4d0ec5e3f20ab38be0540e2c719d94ef5d75618d0ae60a1846f5ca6260e6356b07502c58e SHA512 e3b80892d76e4adaa5f5a87fba9f15f2624acb4eb3eaee9533730872da40031d5c6c68b47993f78cbc1166b0dd57cc86b1eed9eaa42684d34c24135bc94ea8f6
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.28.mod 533 BLAKE2B 81733ff97ed8625fd413b140f9aebf874ffe8508a0ddd1286eccd9ebb20c94cda4fae73f9e4276ad8cf48ec9168ef634566f409977d8e62ce7980440f6d5073e SHA512 dec3e34106895e1ff41a0b25f2dafd35606a90ff497e0c4b627f57a951d9803b926afb34a4ac50ac1e8065567ee1df3d3e70027fa469925e2b618f246e8eaf15
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.28.zip 203267 BLAKE2B c2cf5a33e6b2b8560b4e20f0d2adc901f2c3a3a664c996d2b061ff73db0d6e8a8212412a8afcb91c6fe5d0fdca606c7b2f7c4f74d98de2ccf84a85f45ad344b7 SHA512 eac4a408779a5c3fa4d78e8bb6c4a12e01230d8805e8b8ac03fa60474117134f9bb9827e504c15c383fb8acb7c6c974a0ec9f9a6243c9cb6da04cadd313a663a
 DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod 546 BLAKE2B 5def96d32f37b6d5db079cc1724ca10c0be93f33b06907aee142e45985bb1891c8850fa531ab10f0405a34cfaeea5adb538401c2ca8955511d758ca77f9bab73 SHA512 99fe69cb7910196d46060da7b382457189d9085c9eb4c15ee75c0acdbae283a5bf8df6aa30191b3202793a071301739de57d972b5daa2be81d86de9bf08a1c85
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod 34 BLAKE2B da7fc8b2c3dd4e49dc2efc50ae5d50571e906f68ebbaaeb863f4b3f6f03160a381d7b0e743863cb4253ba36afa2f5d7e518ac08fb4d6c08566d9931396d87fa9 SHA512 b75a0212825e9e0554f7654b1da4050ddda233853ddd86fcfeaac0202dcc4605f0608f3e5ea90056407ccef504330ac407493187a759a36fd716f508b20dc60c
 DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod 635 BLAKE2B 307198d3804e2ec4f864462d3a07dd070c6ac4c66b4e4a418b9734abcd02b617155c52da0eb59d29021ee9a0cd2700f0fa0af1f8bdf7f7d6bbbb6f9cf6daf4ca SHA512 3341e7a77c6a0aef340d0247f2c004cb9c2e5ff864a43d26a2c74eb73cc4a3cdead599ce7a1251f23715fd9463fe8e8e2c2a3ea75915664711a753cada3ed3f5
 DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod 635 BLAKE2B 307198d3804e2ec4f864462d3a07dd070c6ac4c66b4e4a418b9734abcd02b617155c52da0eb59d29021ee9a0cd2700f0fa0af1f8bdf7f7d6bbbb6f9cf6daf4ca SHA512 3341e7a77c6a0aef340d0247f2c004cb9c2e5ff864a43d26a2c74eb73cc4a3cdead599ce7a1251f23715fd9463fe8e8e2c2a3ea75915664711a753cada3ed3f5
 DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.15.mod 345 BLAKE2B 66df6d778310773776dc525f594119da05ece55656e7dcb733d90c0afb996a1a7deebd43123ec70ff56675a3f3c5cc312bd39c7e2cb0434ac8fbf4548846019a SHA512 6e08ca28aa47bbc9d73d17f4cd39adff431b45b18679d3adbfb88b323d393e06c5b00ad412071a6e1141745b316f0c92665df2dd05c2db287c504dbfff95b8b7
 DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod 515 BLAKE2B d901158241d70a76b23e81549a51db50d1a446939de537688dd1a43622b59ba7c118a17c697f6e2753a10b34d5f806a6418bc20de8aa35802c15ab50c87dc295 SHA512 fa3615e0bd38c5b0a55ed3a24ffe0534fecdc8b36b44ed47d7ce3784bad810bb2d5fe451fde2055e7c003454bcb20e9f560843056087e9b20d7afba899af065c
 DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod 589 BLAKE2B 9446db5ead7af8fe9e74376580e35fbec6d00ac8590e3e6ed4469ee237f549da84be7a1c282081a65f6112119d9af29c11a603640ac8dedd45e807a9582a55d3 SHA512 23d81877040f9b00f665fe8970912d413e944fe3c811970158cdd2df6778a4170199209de6039d535a896a87286392a2e342d48743235d99059ebda16086d231
 DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.6.mod 306 BLAKE2B 49030ac69185eb35210ed17e9cf5372b79a6d1602f1b70bfdd171501032a37babd91372f546ffc15d427a6b42aa6f2d409192ff9c54fe6422b196d3dab64bfc6 SHA512 a56eaa49fbe1e7afffd722e75a3a6df05e4d78606cf0e23445293226280f97054ce2d9a4c418adf5685c208ae434dc79778c0a36e3c9b66f1f9b25c76207b5de
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.7.mod 306 BLAKE2B 49030ac69185eb35210ed17e9cf5372b79a6d1602f1b70bfdd171501032a37babd91372f546ffc15d427a6b42aa6f2d409192ff9c54fe6422b196d3dab64bfc6 SHA512 a56eaa49fbe1e7afffd722e75a3a6df05e4d78606cf0e23445293226280f97054ce2d9a4c418adf5685c208ae434dc79778c0a36e3c9b66f1f9b25c76207b5de
 DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.8.mod 306 BLAKE2B 49030ac69185eb35210ed17e9cf5372b79a6d1602f1b70bfdd171501032a37babd91372f546ffc15d427a6b42aa6f2d409192ff9c54fe6422b196d3dab64bfc6 SHA512 a56eaa49fbe1e7afffd722e75a3a6df05e4d78606cf0e23445293226280f97054ce2d9a4c418adf5685c208ae434dc79778c0a36e3c9b66f1f9b25c76207b5de
 DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.0.mod 345 BLAKE2B 66df6d778310773776dc525f594119da05ece55656e7dcb733d90c0afb996a1a7deebd43123ec70ff56675a3f3c5cc312bd39c7e2cb0434ac8fbf4548846019a SHA512 6e08ca28aa47bbc9d73d17f4cd39adff431b45b18679d3adbfb88b323d393e06c5b00ad412071a6e1141745b316f0c92665df2dd05c2db287c504dbfff95b8b7
 DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.1.mod 345 BLAKE2B 4629de89f66f2c971549a079920859ad9d4771ab875306e99d433108cd78b82d9f0a60ada2fa6d2ffdb85340a6d33ddf6d65bc0d7d52403078cf6473147bec1a SHA512 bf32de27678fee02e4896b8ed183fa19560080c40397b08fd7afb8507b3f4c52f4a055d285bfd185be796ca14f001dc69dd7213bf52dfd1f218ad34493c1eade
@@ -315,12 +392,15 @@ DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.20.0.mod 311 BLAKE2B ff4af9d6ffd
 DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.20.0.zip 54890 BLAKE2B 58d19ee07a67fe2ab983fe838418d5be4d1efe53f4ec0ddbb1f700fae436b2c937f03d31b47f33a0275017a8a615814acb2c13947249a07515590995d12943b1 SHA512 c3037e3b7fbd54c9934a28ce2be771d305e4342727032f305b7217b887a20138674f54f65526a0e4d85b52f26ae0265589fa5fb7e26b50d80f296bf12238d2aa
 DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.20.1.mod 341 BLAKE2B 22e801a4942130488842ae34d4ae256b58a1e554a7cf81ae367fa97630ae65a608e82c1b22bdae0cc93099165b9cf5f6d8283b0806e054c056373a84c986cc9b SHA512 401fde398f551c590f37ba5c5dfdb85af69930f2edb7db0af76c1f220a243520eb42b2a0cf865154d03992f2d6314fae54a989945b9c02a8cc8e3ac4e921d99f
 DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.20.1.zip 60062 BLAKE2B 377218b2951b16d5ce2547acb113769882763bed37de54a83f821339d6150aea450c428f1b0e75437cc76ff251d9703ac97d6148b87f36fdc62552a03112921d SHA512 689ac73595a2c3c4f531d3d1db58de511d7be96ddfe6bbb84fc72ee2465f4a1f574ddf65e02335f28f7195c2eeb0556511d14b541ae85b13da72cf2acffdf0ce
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod 34 BLAKE2B 3eae155bd845592809662beb61207107add5a1e0edf380e313e262699dc421b3bbeabad5ea9ee73d29b6a694b2e58854b888e8fdb3dd9c7176ce637056cb90cc SHA512 81cbe6c6c48012994253a40b9c897207b8b4b79f35c09ede64ad7f8d22db8861ec823f2b4a7185334554c75bae3b614de236f804312c77b0027e97114ed4839e
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod 268 BLAKE2B e3e647da07e2cd516610877e931734786d91328d45936b0ad95237409389480c7c5c157787d5dea79f160f665a94abb17c3fbf23535f3cab3fb0b72944b8cb55 SHA512 0dd4ce8cf6ce20117da3e59a8224727f93f6daa29ad9ae7cc92b6d331bc8734f1a6dfbb816ec08da7b24b0f76c91ad770dab551c97e49bedcc403fc823c662ed
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod 268 BLAKE2B e3e647da07e2cd516610877e931734786d91328d45936b0ad95237409389480c7c5c157787d5dea79f160f665a94abb17c3fbf23535f3cab3fb0b72944b8cb55 SHA512 0dd4ce8cf6ce20117da3e59a8224727f93f6daa29ad9ae7cc92b6d331bc8734f1a6dfbb816ec08da7b24b0f76c91ad770dab551c97e49bedcc403fc823c662ed
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.12.mod 618 BLAKE2B 28d45b8e68e9996ff41b016b7fdd43d796e59684b3df87c471420b03e4e473af071e78edc40054b29592fdd92922fb291abb14fa663e4a74d4af2d3f5a4ae6a4 SHA512 4df6462ac42ea2c1aaeb019aff6ebd89548ab3e02b7923c3bad6931f389f0dc56e4184fc30fb802afa7beaf35a9b5bb2c8e06863f21fd56719c3df28817c5fac
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.13.mod 618 BLAKE2B a1710475a51b5883d9a2b8ccb0de566df2911551df66cbb00b1244af22019369e867e239d8e466501075b65d6be912d454eb6228b99c498b4d5e20471037bb7c SHA512 ac14dfdb900e1c43b7d7c487c47059b7b23b721c92196a372d2ce9dfe121ca3842039ffd4893d2b25d562c5afd3809604cf3f08a50a43e940917bc23b980dc5b
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.mod 618 BLAKE2B a1710475a51b5883d9a2b8ccb0de566df2911551df66cbb00b1244af22019369e867e239d8e466501075b65d6be912d454eb6228b99c498b4d5e20471037bb7c SHA512 ac14dfdb900e1c43b7d7c487c47059b7b23b721c92196a372d2ce9dfe121ca3842039ffd4893d2b25d562c5afd3809604cf3f08a50a43e940917bc23b980dc5b
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.zip 52002 BLAKE2B 0129a6d34389f3b890a3f51ad4dc31ea051dc9279cba5748b3becf6c06e07cab6a13c24c7989a82a44393b624e7179cf2821504ca540df2cb19541077e5bfc5e SHA512 25fd2a4643d7190ca6a68a72bd0063ce77acb3850fc81970830e3b6103b6639a5b8cfb4e7eb7c5cb5c3d3b0c2d376b654de44c4384eec3a44d44000837a365d3
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.15.mod 618 BLAKE2B a1710475a51b5883d9a2b8ccb0de566df2911551df66cbb00b1244af22019369e867e239d8e466501075b65d6be912d454eb6228b99c498b4d5e20471037bb7c SHA512 ac14dfdb900e1c43b7d7c487c47059b7b23b721c92196a372d2ce9dfe121ca3842039ffd4893d2b25d562c5afd3809604cf3f08a50a43e940917bc23b980dc5b
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.15.zip 52014 BLAKE2B 45bbd2fd4e6e6d083ad53594bc48f16424b27c098453b38d6b57aacd0a1fcb28a57f75ae26c3db0afd70a3f4790807039c03a050fab0a46add27459acb3a39eb SHA512 263b5dd6ed885176e5cf196f6a99b0b534b83bcaf3d990ea799b02105e3792f2595ef38bb0130bd057a504d242a838188336b0ec6dab0163184c39fa04de30fa
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.7.mod 508 BLAKE2B 5f2a8e18b6d5a03921b197cb0bd84c871522a6ca19cd74d506f668dac4e5a63cec401bf4933e7244c0a441b01995265b3b00abec4c16072de6db4448fe356aea SHA512 0330c5bdfb5c0ac2fd5e2a7b3763ee9182fadac4774ed3462ce68934a1eda3eb25f38cfa7ed2793ec12e8884a42980c348ac891ae3c68b73fc9b1d6c6182f37c
@@ -335,6 +415,8 @@ DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.mod 616 BLAKE2B 195302c90
 DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.1.mod 432 BLAKE2B da6b141cfdcadfbd35922e2290fb893abd1dd175a19501a8441bf38c919ea6d267d2323e397ca9175977d218e78ac5e514af5a7354a99afda32b0a289572df9c SHA512 c92b5ba188810e0abfa0463a31b76261befd60fb05ef4b0061125935855de68ce3fbe0678b4235d5b74acb6047fb8f1151767906f0b2ba84a9382908d2054fba
 DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.2.mod 495 BLAKE2B 97899166c18c99a00ef5860f55d7249597ebdded0c8d4b8bdc5e9ff3ff2a99788ea1e2a35bfce98a0d4dc2b0944d0a2119ebfc3ff01858db82f54f823b56e9cc SHA512 0f3d696b8936e49400bfd9932619f04b2564dc764829df202e58a4e48b40df6abd8c256e2b6c8e4f2b60ee29cad65f6038b29971252afcaac5b507db9a2c529d
 DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.2.zip 727824 BLAKE2B 360c2f322d1d4786666f5d82d0c08e23b4074dca4ae26414e61e4c6ce6510bf866e629dd6a7ae837aafa182d89dfe61c4bd78326bdab3a5fdbb425ca97450466 SHA512 49d0ab1036e1122dcb03c945bfaf3da0c3f607905bf12185bee6bf7385509e7e71484bc4a2d2e22fc05e72b378a14949a895c1b8e4f9e45ba8a1c2ca9ce6e5a5
+DIST github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.1.1-0.20191201195748-d7b97669fe48.mod 97 BLAKE2B e70314ad24e9e16d57fa0f33b05d49622ae6ff09e79d5fd65087bc23377d22acf77fbcacae08003d8cabd3c7871258b11af50a708c4e3078e83866dd16650654 SHA512 f5273fa6a330cfabbb07c4bd27be7eb2ca8bf8ff0ebd4aad935fa40884524a745af5e8022d710a90142efa561637eb9f96cc1622195ed18affa01681550fe4fc
+DIST github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.1.1-0.20191201195748-d7b97669fe48.zip 2647257 BLAKE2B 21bfc8aacf49dd3ae60476cc6933d130ad55dd60c0b4f8a6079439024ea72fa1190b3b60c63a8b47408dd25ad8b8b7ee09e4c8518e3e7b4dd4f6bf59d2230fd5 SHA512 92013f5b8d4347eb97542d61278f0427bae5cc71815a6580ecf30e142bc278817d6ab990d1e92e94df26ed86c3b412f84adc58edc63898da876c7b37df3c2917
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
@@ -367,10 +449,13 @@ DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.0.9.mod 899 BLAKE2B afc5ad3cb
 DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.2.0.mod 752 BLAKE2B 45ddce0b2f5a32cfa6cc2137a41b47c9278314348c3afbf1754048e8ef05f6958cf24c28ca9e9c23d5c2c5135457b06eeb6e0cba3081111dd9c86507bcf296c0 SHA512 47bdc60efd108ad1335f7da69dd774adfb4f542f2f9978df69660520a715edb285c30453c678657f01169ecff23feb760a534b46db88e1ed83171c5c5def1a2d
 DIST github.com%2Fgobuffalo%2Fsyncx%2F@v%2Fv0.0.0-20190224160051-33c29581e754.mod 180 BLAKE2B 3b1bdaa97b34b89903a4d9375a581a5318f75635f04b1e2c4f4a927b8a5cae4638a6cb55ecbf6908a18d04fd77177286952153e2fb73ddcdc22a9d1e6bfb8776 SHA512 cecafca4c0b08807902f0fbe560252fbd7901a258c57c374939013ca857e0082fa7af5b95bfd72625a10a441d169cc1728342754d6e0e924867d4dc120d6a43e
 DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
+DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv4.0.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
 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
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190730201129-28a6bbf47e48.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod 215 BLAKE2B 0077e3bcaad8a354f484c15844594107eb1a56d551e7ec55cd75e4594e50af02fe3850d9d212b0bc425da71c20bfd7dd470aa37be046b4eb88c28cb6bb63bb53 SHA512 8f928dfbe495a84c91744bf72527c5662422e608125f8b58908803289a39abfec1823d4628a52b987ab5150103ca588509ae0074fb08799d075e7ffc4157dc33
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip 2700673 BLAKE2B 84605b73500cebee7cae122f45003110ec3a50074d0649b9e7e1e25915b1c5e789017c628e8305523edb28d8f93733b9032f5b20a186b4cba4a38f90c0add6b6 SHA512 5d27fdbda403bc5ca722280af1fc331e48e45dc97d6e0b9f99f0d48d2d173292ae88904236f43851173528d0523fca86dc15a633dae218bbe05bc0fc22e1d477
@@ -391,6 +476,7 @@ DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod 132 BLAKE2B f3b71704fc425084aaee253539f0748260138ee1fb493a98c2d0acc7c4c0b3533efd5d13e4ec578d0ac070f7d6fe01447f6270bc420cdb78cf3dc854d38ce5d8 SHA512 8529555c2751bec1c55edb40c210cd6afeb4b5f9f0cc38f99911c9da7afd6363a42bf225c742116707cd22aec2fc217802ce1c8d52e11185a80cdf398e8c4941
+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
@@ -414,6 +500,7 @@ DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.zip 79266 BLAKE2B a012e020cf28ee7c9e096068c22514b643d4b299e9396a37f08a003a3167e341cdcf40e1cf424c22d81b9b696175210d42cb8398c9ff37a80d47f4daef10d82c SHA512 c8aeca0bebef35a5a5e87804cf3a74cfe879348fa091a8d49144e164449b9f15569a9ffb7f8f684149251762186ff898b1e8542ddf2ffc642ec625826523b5a1
+DIST github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod 35 BLAKE2B d6addf74aa6a2ad97c1792946aea166c48bbcf35fbc582a9dfeabbdba68992106b7cc7b2515ccf002f44bc74c0f0655089e3110e39fc312a683b1c364318279a SHA512 33a68d466b4aee3c41e6d70766e90fc7b7b8e904acb360d1a5e15236832ca47e5f45393a7f5c486893f6a8ca04af4ca4ced27b064c15a5189217141a325972a8
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
@@ -430,6 +517,8 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod 105 BLAKE2B ffd22df03c1b351f
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip 130974 BLAKE2B 6e4efb8abb584c3839c7b1ab80c8060c125b695bddddd44c57f72c0fbf9de85d40595ecff57f57ddb533e34dbe72a95e0e8043d91d462d68818699f194766e90 SHA512 9cff1690cb177e70b1d67ddd305e4317e3d1ef2825f5f3ed4639210f7f2ee6e89ff03970495757b922f16fade5fafae5cc14c8da2b95694faa3fa48c63f3313d
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip 132988 BLAKE2B 48845d9df9bc0766f93a141ddc1989fcf850d76273824d62ee11297774703bed33b1dcbe77817b6eb417769ed11249d8089d248631a8c6669a75a6d34e048653 SHA512 22df4fc49c44a1e73eb72295195633bc04b67fda27df452893ae77932879b62b344455b880972e78022a61dafb30eba8b5b6a872f6c66e093323fd5d1c086466
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
@@ -438,11 +527,13 @@ DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip 16936 BLAKE2B 04270e67b679a1
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
 DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
+DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.2.1.mod 325 BLAKE2B 1fc1dac97ee3aec3b241e5b53ed78c8ec01d33b391e3cba3e21e2e12bd2a7e65e9a61f6bf7a62bcef43e39d4832982d1591efe915ce6ee56724eb9e9f34a158c SHA512 06c412e77ce3fec3f136d9992f5187ffc6ace7a80dead0dbc0c97f289a66a65afb3fd6f43e9de8686d757e2aacdf783f231c676dc6e017ee26ddd731bbd39598
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200417002340-c6e0a841f49a.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
@@ -453,6 +544,9 @@ DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210323184331-8eee2492667d.mod 3
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210323184331-8eee2492667d.zip 1848423 BLAKE2B 35ea4125deaf62f28929062f9ba55d9f770bde42e4707c3cd3d3376a7866acef72ae7d3267e6eb03cffaae4cab7a37f0de0bed53468a29b7031510d227f146e9 SHA512 4d2955984938ed0f0797b752b771f33e51fca184cd0ba419aa78703c91f5d7e08b829db47780b9d0d2f1de78efd4692a42f25404ef3a74841a757286c54d2fe9
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210504235042-3a04a4d88a10.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210504235042-3a04a4d88a10.zip 1851005 BLAKE2B b587d798ba70ab2ba279477bffcb8491762589b2c43664c02f11282b0a518560318d75b7c663a731ac0ccd7f0d750bbc2993813827e951f1ce0f371a0cd33f68 SHA512 649fd713cd36ab7eba7cc26dc8e4465b32cec17364caac3b6d128547ffb466c54f3a04b5e45dc38438efec38e2cf47a6244a1abefb6de8e04f59a52c09d6dccd
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210609004039-a478d1d731e9.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210609004039-a478d1d731e9.zip 1853074 BLAKE2B ecb64968966dcba2f35d23a21a21981a136cff974a218b50ff2c5dfe4181d5ad63e974b35c70014e0b6f568b8f58f2744a060c86b46b5b17521c8357cee52d48 SHA512 3969fc5be923348a3d529ebbcdbcb4da5259ba71feff057feb55c80cc49443c3dcf4ce3c074237f679beb3da2fff08293957618e28e4c1e5ace4967c377a3b0a
 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
@@ -461,12 +555,18 @@ DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip 21638 BLAKE2B 63e755faff06cc52
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.0.mod 183 BLAKE2B d0b924588ff8bc8f0f19031808d4d1e33926040e3d66ada91561b5f549b663ea2a1ebf682ee9da7a133e36a1bd27312465ccb0076287c1d5625629431fd32b3c SHA512 0ceff1d2167408fab3f5b5d1b64563fcacdf5b1db94c4fc8bf4e90dd7fff9c7475862df9ac15566f0365e5b47b4476b8cd398a90dd011f4a73ebf5f7fa61a7cd
 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.10.0.mod 572 BLAKE2B 7d42f91a8230c31654878829577a0160bc3fc3f954d4ff246220b7ad8ea18f564a9d11a94fbd2a7c3f9663da5c5da4ef058f69e4e3778e42bb829ccc9ec9275b SHA512 b364b013c82f9f20de89cf5fdec98c666bd2301b064abfaf51f92d229d83838c249fb81687dfc0cfe636405a260283b85aa80fdf6f6224d7883d235225299695
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.16.0.mod 211 BLAKE2B efa9bcc5b54caf824678270f15dc2d05302399c1c3069adf6223b45a5edde4e45d9ea94c7891f3e692052997fb9814b4d148a929a5b8b1c907cdc0ce179f33b1 SHA512 ef7b03b7cf66d93d97195b8c4bc1c85a4718ec40e3f51432963825f320e64b56f50f3a06886cc09864ad374fbaedc5b06258e4859c9fc953be7f65753ca3428c
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.16.0.zip 1999410 BLAKE2B e6804a7562e7a2e9816110680fa48bcfac98be44e6e718499a7404d316723267d6e02f3916668515a4094017f6b0fedc62784b868c96230b091cd685bb6bfaeb SHA512 f28595538bb60ed15252fb018b3f7b311819f1931612154ed95b127be832affdbf44fff3e4067b782c54d90b74d7333c86f8e6658856e0294b6199a99b232f84
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.17.0.mod 211 BLAKE2B efa9bcc5b54caf824678270f15dc2d05302399c1c3069adf6223b45a5edde4e45d9ea94c7891f3e692052997fb9814b4d148a929a5b8b1c907cdc0ce179f33b1 SHA512 ef7b03b7cf66d93d97195b8c4bc1c85a4718ec40e3f51432963825f320e64b56f50f3a06886cc09864ad374fbaedc5b06258e4859c9fc953be7f65753ca3428c
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.17.0.zip 2014067 BLAKE2B cff554491a3a614b5c4b7916f23c4601ef152c5b6c7ff028493df56ed572b2c015714b8ea57ef5187e1bc7d72a7ff0ddc119c8c659644f7cbdfd7b07611145d5 SHA512 956fa45e669f2516675ff91642b04d4a8d7b56346bf743c5e2c285b924f9e202005c4ebf33594b2029f4b4dfa7ce4755d914fef58b16e13e6b05069e2465b2d4
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.18.0.mod 211 BLAKE2B efa9bcc5b54caf824678270f15dc2d05302399c1c3069adf6223b45a5edde4e45d9ea94c7891f3e692052997fb9814b4d148a929a5b8b1c907cdc0ce179f33b1 SHA512 ef7b03b7cf66d93d97195b8c4bc1c85a4718ec40e3f51432963825f320e64b56f50f3a06886cc09864ad374fbaedc5b06258e4859c9fc953be7f65753ca3428c
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.18.0.zip 2017374 BLAKE2B 4de8672d5b6544ef9f8151890b625020d1603da2311f8bcfdfe9dd6f5030ac35970e1c19e583c3bc6316da2bbd03787615ef41452ba2ca7ede8cc61d6b07e4e6 SHA512 50369b738454fd12802c61ea9691c5dcb356f812bed360f96f3f54ac79a7f7b2bb062cfa4dc3bd99f2245d7b09f33d2f1bfe17f35014f3121b99e56f2f7a5d45
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
@@ -477,28 +577,37 @@ DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74
 DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.14.4.mod 535 BLAKE2B d13cbc3f7c573edfeb62bc1829e401892482a78e9f6c9548318a068484ec76e6de3f25e9de18858d4b35a1880c17d7d49dc44e60cda8aa0090c2a3585e4fce6c SHA512 490d1e9dee7fe523b22e986888c28fe3c106976c0b5bfafffb2bb707588c9374b5062ac6bdcdb6735e6f8b3ce803e2ff8e908c56904226e70fa827941edb3d66
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod 588 BLAKE2B b3d6657ba787034ed2a14fdb98a7dee43e3d9dbcf253558c588f9dc550b58a294db9022d548d48717ece007f20f52f5004ccec0fe92415120f9110ccad5c9288 SHA512 6d314f14132c60d5dc614c81746fa3492dc821c77f2c0cfa90dccb3dddd5dac671682cd842d9ec4b0d03aefe1da92e5bc2275e9bfa2bbce60e8bcb8ea6bdb173
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.zip 685854 BLAKE2B 2de9f99bde4593ee24aeb819c12df9fe950a62e7e78428dfc18051012c5c3dd791da1e157a1e2f8c5f9367f2ba404ae8e5132071c1ab3bda1ce70cd1aab391de SHA512 0d0ee621079056418847820d55f794befc0eda9a9e569c06c9f099887e680be31683943dd4aa25813caff89e0e573c6d2ed3b27ee7c99cfaa381c34c0d1c1edc
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod 449 BLAKE2B b4fd520f53e935f4e33630427d57ba97a516afc5c20d4b4c62d06cefa9f77c6f2a043afacf95c9e496e8ff573c8feaa638987ffe014d4432555725a9c9f920dd SHA512 ef9f64ec39004adc78f354ecd2c614f0c76cde23549fbbd778b458699f4aa104972fb2e5c270e7e223fff6354c309873c4c3611c8d746d2045f2a69dac861830
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.mod 424 BLAKE2B 8e4575e659f7b2829ef4462f2a94694ea22ba05b538e309c958414f9c8e99de359b007813f6dccaf7bbb0fe2f0ba1b69a878eca6edcb0d6fae10cb6e930f6b7f SHA512 a0d2ae55eca543e43aa4ff03c5a1b27f0fdd405c019a67f9d50a3218888c4c9ee44ab212babeff6f950c86e0c9c2ff98c3f68d973e515f977dca46920a5a9fc5
 DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.8.1.mod 424 BLAKE2B 9e0bbb86c2fd0f5ff214d3b041587bf7e18f571add9745063306ddd6a52a85b7ab2d2061352153133c27b3d03b4dad2677e1dbb35fcd2a7642cebf1a78b3d500 SHA512 04b33da69befb972a2c28da406a6a1dd1b7414ebd35569e81f72af14f146307f4e0489daef720af78100e2c2c002bd511944f26948827b0ce9dd1a51c8d5c62d
 DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.8.1.zip 160400 BLAKE2B 47fd40e8f22c85829b05f1f9b19a4607d80eb3a6833a881a36c74d66ba666b4e06c56cd8dafdb8a1a939c873a6abdccf9d3e59f35f8336941848f9af383f59b6 SHA512 217d5be7184331c6a6647ed4ca3b868268d29b873e236b0ff59bdad451af1e4352ac39e63f3555c16380e1e650912956ac4f39c6a01422c6b7f92c010f43e802
 DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.mod 595 BLAKE2B 0feef849725bf5c462504df952e7f5ad79c2030ef3ee3dbb26d397cf2df6dfdd3329883a3dccaf661d2d0edfd2fb339c38d6901194bb782f2b016c6ef75e9cc8 SHA512 56bb4f1c943db405a3f669aec2300b644f9d7cc9bfc88ebbea37a0abbe7019e27e6edd3998c727d5701086056d180dfdb85b763f701f44e61804a6df7bb9cdee
 DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.7.0.mod 595 BLAKE2B 0feef849725bf5c462504df952e7f5ad79c2030ef3ee3dbb26d397cf2df6dfdd3329883a3dccaf661d2d0edfd2fb339c38d6901194bb782f2b016c6ef75e9cc8 SHA512 56bb4f1c943db405a3f669aec2300b644f9d7cc9bfc88ebbea37a0abbe7019e27e6edd3998c727d5701086056d180dfdb85b763f701f44e61804a6df7bb9cdee
 DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.7.0.zip 32856 BLAKE2B 4cf2ce44532be7493e9c73e4367793e3fb3c241b80da473ad67b2780d93f6261d2863fd71532de76f930d9e11d6e71e019e0fb6865405330ac9d957dbc785dd5 SHA512 2ccf46578accf867012c1d72c2cf074e1d88d2540ad7bf8917407445709accbcf8e320bbf6c8e7861f169e88c32a5d8421b5cb0e767b7804560ba596dc9fe01e
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip 9560 BLAKE2B 2c8039854037c0f11590c80605cd30bce58baed3e8ba11840e98e8b450d0b2303704d1a55252589529021af473fe1f47f7bf6a3edab5ecab4de4888088843b2a SHA512 d439e95bfd858cf71659e8ce905748749e9e15cf577b98b66d7d8dd6adbff8262219d0c26bbbe9a24021ed5d683d7b81dc560eec4a97f09a1b44fb8983a4177b
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip 42172 BLAKE2B ff4b18df1f223c00368c8be01634c08d8433e3993ac90c7243ca1c32c7871ee2222f25346a2c234b4d8f47ea4d6f62dc34c3eec86438d2cf95c8315779ff8391 SHA512 7305cb1a2a729c091267b1d4f1d59634c8cdafc39ae3355230e205e9aac960f321f6b07fdc3f3cd67f7f64daeaf287e214115df480bb7a318dcf51241260f642
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.2.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.2.zip 28148 BLAKE2B a12505d902ae56d2d134970980fd8a8ef4affaae2ea9b39f313d5b80bf4f647ff4b1b03d9dc88261eba574618495588c08374a4d21c515f33cbfab8c1e8af0d3 SHA512 31232be62c9a9bcf3cbb5e7a6ae0f59463347c2195446f6bcc106234ee722c468f74f3fa4fa7c1e6ce77d5802cc376dec5435c665c4ee5493b9769a5376e8317
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip 27085 BLAKE2B 43d07f0c6f351d78cc4bba75c1392574b537a5b8c52b1a86311092ae01cef11c2debc002d1cfb3f71bb74d262e2c24745ae3467d92d6264b5cc4f381a362fc74 SHA512 d5b1da656921ab950265b0789a70232e287b263c61e46122cf0ff2fc7fb294d018909bbdc6988577be990870381c65999f8c9df0d05ed48efe4fc313a28e8f90
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip 62565 BLAKE2B 81458eb1985472e46b2db22532790ea707b1c1fdd55a26df8cd371966a8ce672d35aaee79dc1984f3ed7c2ffc6d303c1c0132f7ca28487fbb379ef6e70cf34eb SHA512 4e898272a286e7abd48722e31c8f256cefb377d22bb8fba47db0bdd8d0a871659cfe1589d0d0254d7bee4ac9aa4edd5ced714546a5710e6dfc66d1f961e0f12d
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip 17595 BLAKE2B 06dae93e8077ab6235d59b57646a162ff31e044624bab3b6ec86c7aaadf49c36b262b957704151db889c515c425630299d396d0b76919403eabf4a3e71098ef6 SHA512 aa4b145476a80d7be7959bf7d0a9a278765496dbf915d083fbc40c5b216a52126af9ba12cf09f9cc178ce53987822ed61c92e2a0295fa977f8a460262e857c30
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip 15463 BLAKE2B 88fb544a56eb6266a2ed75b3b6380f52d11d725e8711f2fbe321bd30494201d43db01398348fca95ef76ebb46ce26f3f523be67bc2d56f264f5c9fc3ac1cb8c1 SHA512 891f2adbadf938d7d070d80198f50a62e187a6aa6fa6b489e0055b98a9b2547b43cda11ee983815026b1e6f0f8864d695bf7e72d70290423ff53b4872d310735
@@ -514,40 +623,65 @@ DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
 DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.4.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.0.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.3.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.3.zip 114408 BLAKE2B 32e1c3420942f4379aeff94f162b3584c1daa6a3b3500ad55e3e5b7f57360cc36c04f8de0f8f00e9d24941af0c787d25cb400edbcbfa9d2c809b86103531a940 SHA512 6c88b0bf6a1dc46e4ad0c4dbdb8ae5bd21a6e1332b0ec5ef8c31767890d6b14b5877edf06bce3b95da4d1f6cfdcc448cfac509547d00fa0a5218c969befcd343
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.0.mod 637 BLAKE2B 66ea021f5ca48fabeff8d0fb0049fd5b90c044102bbb492120aa91630dd4fd37f315020ec6cae4559ea4ab45cf826ffd41448e8b21e1eb41ba1c8f145bb2696a SHA512 5afbf9a96e8fc302d4f4ce11482a54f6fe015e94579334d8a8f3e080b7fb84ea25f5a41248991f6f1f02edb23ac737c01c18580ec5b44b74c3c182a54f88f508
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip 553094 BLAKE2B 87ad7b11fc8edf2edd2a619f1cc262f2caecab0ec3c626f30e809ad9c366476e49049e8f6adb7f55c9a719ec19505eebf2db55d93559ec134f42479e78cbe968 SHA512 0daaf5d99ee54e7ff0ea882e77a38ab344cb427a8833a5c7fa30936d401d4c9edd6ea603b48821c072b6dabb2d9f31d74ea38180e23cc0949756b8e828ea0070
 DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.24.0.mod 91 BLAKE2B a47b8f74cf10e1978bf3d8ca7bcd18be5f51e88beaafc879e6b0c2533cb6f3f437555225b3cfa07b44fe639c94a77185f6e485a5823111567f9ad96401603ec8 SHA512 ae3f485197be71a7e49548228e4b84e09943733c8c20e6eb156660e778ca496d8f75c4851c9aa1b13521102f5d2de2fd3869bda1cf1e0513f8e96478a92f91ad
 DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.24.0.zip 127123 BLAKE2B 9363fa1483028c1042a5f9209e1c152014311d162d47535e9fdf655b9fecec32d997b70d6a1bb656d8a47202880d04809cad64a7c01259bc6b33b14e93e90011 SHA512 dc42f23434810ea70ccc730d2fb37aaf1a57abf7233e1accf34054f03769c931818fd9601eda31a63641d782f09f0943ddad6ef5582ab2b61b1667589d88b797
 DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.25.0.mod 132 BLAKE2B b175e68ab59001c2d690368dab1e5d72ede2b48ab7fd86641b4d69daca3517c4876770779cefbd731f923d7795eb2b05124b6e6d9fc4d10861e2d9c134996d83 SHA512 5a2153f34834e34b737fc95fc35a2ac4b3496e308b23a425f84c1201905043ffc1bbb1bde3c2e4fac7be9cc8f1e33d7d8306bca45b976096a60a0c0c98978724
 DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.25.0.zip 131093 BLAKE2B 5c73e29e68d766351c5821eb67343f94acdbebf6900143adc610d6b17bea9ac9d0132366ac4d293c8790283f9449d13eb23f7ad13a68f1ed2dd6a1cbbf7e54e7 SHA512 427b4668a48e6b4c1ab6c455b8f327b67bca7fc85304378ea6dc06e8025b053889af649df3075a29e49933e48cfed830c5183db121320bcf49f6321cb66e49ad
+DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.26.2.mod 132 BLAKE2B b175e68ab59001c2d690368dab1e5d72ede2b48ab7fd86641b4d69daca3517c4876770779cefbd731f923d7795eb2b05124b6e6d9fc4d10861e2d9c134996d83 SHA512 5a2153f34834e34b737fc95fc35a2ac4b3496e308b23a425f84c1201905043ffc1bbb1bde3c2e4fac7be9cc8f1e33d7d8306bca45b976096a60a0c0c98978724
+DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.26.2.zip 131439 BLAKE2B d600a1ad8bd575f06275deea0de6f31b0f384033335214b1473335bf1b1d6e13976f97b9fe72ddcd59a5cdb29b1106b7f1f68f4a4751e511a59fea0c040e33f3 SHA512 6657dcb5588efc926a095152cc1286e9efe3e8d1548c18289e9f89dd45b57783e1b25318531d4bed55e12836056f19865ed2edeeeb6889571a90b594f40bdbf2
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.0.0.mod 34 BLAKE2B 81df5fc82ecf06f4af986fb96b311889bc5bcd3f540654d68db7dd4d9550794cc5238791bfef309e64e11bdfd87d630520f3f21c542c9c6c791c323cd8175e37 SHA512 205880e4165d85c7ee34805bfd02b5c7ff04368a7b4fd25ee1fef1968f3dd356b94125d1de4beff92b33b145009ebc49f01b57650660cdf14b81f99f1b5e2278
 DIST github.com%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%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.4.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip 25166 BLAKE2B 6451f037f868e44e6a478811061a0a02be96d5d9c05c7275239cbb23aa4e70c093d42a11b042c4160f8200974ff904a73db450d8112f328944cb42f3c5c62c31 SHA512 d87144fb20e616ae224e2fe41f21cac8b4bb6fe2210edbb5490a2193fd5d76d4d5e7d5039ef2c6a6811850e72d3449834f0209464e7933dbd18773382c0599c0
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finfluxdata%2Fflux%2F@v%2Fv0.113.0.mod 2646 BLAKE2B 5c710972c5f280e7af32fd5e0541c19a866c12c59fbe036bb3f7715ff2f9bc6fc57b569dafd793437264c35edf802f909624abc1e47ab08a48b4629d1efb4edd SHA512 345596a19d6f9fe6d85de242c5762b93962e4fc5922e7b948d24cab0c403204e638cab131a4a0cfbf9af0709d11a5b88d81e37cfbbd4441d9c593563e5b01650
+DIST github.com%2Finfluxdata%2Fflux%2F@v%2Fv0.65.0.mod 2193 BLAKE2B 5915c62df75a52c3605aa6411cc7c69f1658345bd8b75a8e381f188c6da251aa6a0fc55f3044137e39c5980938e387ae48b151e0a3fe862a259ba3ad9a698326 SHA512 14986b3e68f459c9978e6912df35ab1f95eaa16e1554ff7c69b5e63a8dea1b012593bd4c1937abc1361e295ce2abe22be4f3cc1c6a1087c5199d8324999b35fc
 DIST github.com%2Finfluxdata%2Fflux%2F@v%2Fv0.65.1.mod 2172 BLAKE2B d6e003af4680c7a44e6ab883051a17d17adf0a6a47e734203c4e577c8a3b0164d138e5267c99a73ea5825ea36b413a129681dee3a6957c0c304eaa0edf5b9051 SHA512 c64e72f8cf7b727c805c155b9a2725a3eda7d1533a9beb1c95223f1806a41d175c27673cac46005dd6484f9f76737e6b78e0c9b919271cb17330ada932d81a76
+DIST github.com%2Finfluxdata%2Fhttprouter%2F@v%2Fv1.3.1-0.20191122104820-ee83e2772f69.mod 48 BLAKE2B 65abf2ef1e16cbd93dcf8d0cfd70fafe75d69e6b910919a5bb0922e1d576bf4544901979d65ac964c5f2febd80492502c26aed06f5874cadf9fe3d603aef1a66 SHA512 471b73d87357dcd0fd5b980acca540ba90e3625c7c7e94010b760f262d32b937567281b2f79fedcfd397fafdf63eaa381e3c10e155e575ad05fe41f3dd566507
+DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.0.mod 2471 BLAKE2B d6e8046a910ce75cab5b73237c3c5f25f7db653dbe08cc4142b750b9e38933f9c55dcf699f9a4010021c65edf77366e740a0ed0f4d631fa6e7f47d12671ea381 SHA512 bc2945cce06eeb477ffe2859a257149d09368f83e77db8f466423b1441c8f8c5715a63bc32c8956f4a0313590052edc5f6ed873b5c5718ecaeefe6d395640e11
 DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.4.mod 2501 BLAKE2B fe5d21bacafd322b0cb8b2e4fbde2c82f4b5bc632080ef52c6bc88813844cf4193eb4be52f2a31061cd5180b3902baa24d6506f0108cb8fd9de9a689dbd6b422 SHA512 1d8f08e9678522dff4f47189b76010cac23f2906b021e7394b5b4ca771f5adbe040b14cb33b794e0229ab80d5070c06c5ac1b1356b0995e566572f058ce5971a
 DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.4.zip 12508400 BLAKE2B 9317c20a200dbbea4c2173756fcbd086fa21ff2db1d466530f239b13c3f4d06f28f0f8fedd0d43b17eed19d20d6c593f6f4ab7d6b4dcd89da5ba7547120f9cd3 SHA512 294743ae5358bda4dbe47de11b63fb974255570ad6d5f5b76a4429b6015af44d91835c6d9a15a8334a938d9d2b5f0e4ef19890e345ed498ce4eb2637f3086b0b
 DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.5.mod 2536 BLAKE2B 025d4849507324e9387fd2368ce7be152a567d09e754a47d51275e4d5525410c21bfeabcc00c0ab79573b3d0bc7f7b86ba718072571d6016f32b148af6c86c2d SHA512 b985230213b9a47e531131565d0ec12a378eab1f6170afb3d55d9683dd37fadd72fc282230b041bcd43fa4d1a1c22f9c1fa8182e0418dee7538f185b9d141271
 DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.5.zip 12519009 BLAKE2B 0c6ff633ece712cc5027900ed56f86218d33862967193a74a26aa4934b0b2fb1b0f8194ed97709e07fcc96091820339eb89dc78e1d2d1a52d3d898e9d578224f SHA512 4d9e202b30bd32fee83bf8fb0241c797a55c9df62d38e66615440facb53fc684c3697f8fd77bcfb07cd36734be327462c2787620cb7151d15bb5f88eb180c897
+DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.9.2.mod 2372 BLAKE2B 083c8d649929405fb61f8ae556d65c10c12bb61ef47c52192ad5b70401b836e5decc9b76179204332c06e82e98bb524722c87b500545d26a508b1376694616fa SHA512 8db844829346437812bd68214f87c95fb8dab9063a561b5d1a65c844cc10b0d3953c0d6230291b731971d3409b0afa8b3f8e2b6afd95d72f8159ea424dd25300
+DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.9.2.zip 12583954 BLAKE2B d50854368d71eb4606a4de7c08ea4d3b027ddbb5bfa20315c48660dbf730e5c6aa220b1a7c736dbff04f03bef902b98341a5d3e76c5ba3e34ac9b56d02a57efc SHA512 6198cc1b58019bbc76fe05723f360568270bcab1f14097ea7ffbc9c3b9b30447b680f699cbf39433bb06c7d769ce55665a510a25d5cc97cdef0729b35f62a899
 DIST github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod 46 BLAKE2B 825c65ce0e045d5c764d3ccae81a25c6224c44656bb8ceb93f39d06a0c8d766ce7562e5ea1ceed903a5d1ad4c035e27ee84b4311548d024e108a5cd6ca142508 SHA512 324450602d8234231b0cf40b07e8936948487354b8f6e92012f3e65ba3c646b0993e4722d3867a12d0bd3749c8dd6fca4a1118393e2ca682170e500b3d54e5fd
+DIST github.com%2Finfluxdata%2Finfluxql%2F@v%2Fv1.1.0.mod 38 BLAKE2B 0d8182450446ad0554f17ee1787f1068d4bffde6e80c2b3120d2422ea6066014e9b4e999d884302e48b794edadfe8fe88a70428658d6fd2a90c11183335455e5 SHA512 49d2580a785d3592fbc65e22870eff7bc5624516f955ca362ba8a45f1cb63df1b24e9302b9c041c5470ce110a0487313ab969238598a0afc10b4f0a76a03f9ab
 DIST github.com%2Finfluxdata%2Finfluxql%2F@v%2Fv1.1.1-0.20200828144457-65d3ef77d385.mod 88 BLAKE2B 33663dfe72c785654946bb76bb663eb3335275d778be681c7c9a653321ba5ca446fb3580b073dc9519578c45eff3728784e2077dd7697ff8923efde17512594c SHA512 e38a910673c951623a2b5d0a2855843fee0b78ccbc547bf8943493f036ae8a1ffc76b42474de9a25755de688d060a8d1be648f0fe81d7a69c831a01b5956ab10
+DIST github.com%2Finfluxdata%2Finfluxql%2F@v%2Fv1.1.1-0.20210223160523-b6ab99450c93.mod 88 BLAKE2B 33663dfe72c785654946bb76bb663eb3335275d778be681c7c9a653321ba5ca446fb3580b073dc9519578c45eff3728784e2077dd7697ff8923efde17512594c SHA512 e38a910673c951623a2b5d0a2855843fee0b78ccbc547bf8943493f036ae8a1ffc76b42474de9a25755de688d060a8d1be648f0fe81d7a69c831a01b5956ab10
 DIST github.com%2Finfluxdata%2Fline-protocol%2F@v%2Fv0.0.0-20180522152040-32c6aa80de5e.mod 43 BLAKE2B fddec34812812262b5b2e9499391dbad71c00fb2546658d031306189207c366ba5f9863735c4a52c09b838f2b052feda55bc8f9e424447905725079f7877ef49 SHA512 f40bb2ea09705727ab3be3b8598b471e32dbcf5a67e64580faae7ac80f8b8504964a30b8d84cdedafcb47577bbe021e73127a2053ce04340c27c00726572edd8
+DIST github.com%2Finfluxdata%2Fpkg-config%2F@v%2Fv0.2.6.mod 277 BLAKE2B eb0d5bfe78aa1d597bc396e7bf47eb3ba6f6d5df17219b0935204419e379c9b1b132e38dd7f1138e6ab0642a88f275eae24216affba1b6ad66f341b2e4a4b610 SHA512 36a44410d87683ee497998f325a80900bd1857700ba4beafd4b4cbb62d8d2cdda4e333352fb12e8c467c6953c49d579cd575da866948e94745a6a51d3d14fb21
+DIST github.com%2Finfluxdata%2Fpkg-config%2F@v%2Fv0.2.7.mod 277 BLAKE2B eb0d5bfe78aa1d597bc396e7bf47eb3ba6f6d5df17219b0935204419e379c9b1b132e38dd7f1138e6ab0642a88f275eae24216affba1b6ad66f341b2e4a4b610 SHA512 36a44410d87683ee497998f325a80900bd1857700ba4beafd4b4cbb62d8d2cdda4e333352fb12e8c467c6953c49d579cd575da866948e94745a6a51d3d14fb21
 DIST github.com%2Finfluxdata%2Fpromql%2Fv2%2F@v%2Fv2.12.0.mod 198 BLAKE2B e0abd56792debdf075818269c29a5928ea182b7e10792a2bce20f217db64b3922608067c6eb4a87a88c981c44478ea9e2ee3831905c724b103f98170718db37a SHA512 3cc83aabd3742a8dd775077f4c71055ba6a7949a7730af7da6df9e92bfdd7688c02b8c6f0df3f51b22f84a6defeb79040a6f1e9b78becb680358fdefd3e7528a
 DIST github.com%2Finfluxdata%2Froaring%2F@v%2Fv0.4.13-0.20180809181101-fc520f41fab6.mod 37 BLAKE2B ccb5fc7cf2c1564b9f5f0c9559d1aa34913d6c6d38b256d88fecd346b0a12532302585d13ffd00ace8e55d100fbd4cc468ff6e4163b45e352340ee5ae75c3580 SHA512 d56f2a532b077f1321c2e462db1a6091c5b272948b3cd2a272369a30539cb284a35bdc8a3bce39ce86808c81275d31e79cc9b0e61e42c0a2238f499c247755f7
 DIST github.com%2Finfluxdata%2Ftdigest%2F@v%2Fv0.0.0-20181121200506-bf2b5ad3c0a9.mod 259 BLAKE2B 4d4f1556bda08820db792730d893a735a856c824073e1b66f8b9a06e2512187038e4ae5f465d1f9b1e4e074c69722d5003917cf40dd6a0f61e0a32697a99c2fc SHA512 76e847d693e7e785e04ffeef5b48db94ff1a8a317a4037710522b596adf01e30c4b4a38e5e4b8040db55a5b1b3a68911fcb8b1e646473863c6644adfe5cf9759
+DIST github.com%2Finfluxdata%2Ftdigest%2F@v%2Fv0.0.2-0.20210216194612-fc98d27c9e8b.mod 268 BLAKE2B 1b7c9a36735c650541b7aa54e8d61e2f4d0e3f25a6edc1cdaa5a82e75bef84bd987a9a7c476e222fbceaae01b8dba838a7f6f5ad97d282f9e6a4a7b4f886523d SHA512 04208fd808d45388f3ff71b174d167f6133e55eb17e8e4a741661c36aa57c06acee397ebe9f99cf0bd3608cb32ca6d9325981f56bd618dfb1b2b92749e1f1bfc
 DIST github.com%2Finfluxdata%2Fusage-client%2F@v%2Fv0.0.0-20160829180054-6d3895376368.mod 42 BLAKE2B a4aee4aad699064a4fe353531afb259439d8b83aea1ef68037faeabffaa4eb5e74b8d8dc85a34e67c068e166510695da32711906ff7a4a99cd3bfe572d4d83ad SHA512 58805194d2ba4f084b920a808d036aeaf794ef9df76e5a251bdd0ec073b02dedcf1a9c78bb9022fc4b1cd3c1b89215464de81ae8ae6415baa0aedde273867d01
 DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
+DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.5.0.mod 106 BLAKE2B f2d9666a09d91d4a8f519f0ccf793cae39155c3a1d706a3330ea3b38efc56308e712a013a6681aa6013f0caa6bb92d7415fcfc23bd593d5f86f1e7215a66f8be SHA512 1071014b8f54d972badce9bf18aef9bc5cd4c37c1e2f909e45fd6b5741580dba0a7fa4f8836541d89dfdbce65c6f2329c32fe9ca9014cc49114bce67612c592b
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod 92 BLAKE2B 8b5eebcb883871ea090297a64f2ac5171b87eb4881fab71e73fc737e2ca4c301d8fa3a14f184d5c468120ea4b3f22c89867c952795fedbea7abc9b7e618d14c1 SHA512 8361dae50e9bc2db7887bd94f516f817dfc1a3c509c776640b0f9380343236d52a3f43a5ca0093a49a4ab6b5474ec2ad24a4c8549d5949e4f5fed0b322b83c21
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod 113 BLAKE2B 7ea9e809aab218e2d044bdd2e5994eb3489fd36cf7709613b6cc98b4c1acd6882ecb35b27cfc214779ef3fbeefc930d5803999e12440458af7d1314ec0eb2998 SHA512 50c1339c7ab002f6ceb599f51ec49717e88cc2c5ae1193fccc9431440a531dea27d54e1d0a87b987825545d106a2bbf0dbdbcfb9883fd0e8decad70d88514d68
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip 195725 BLAKE2B d41015982c16856e2ec6710fc7f4c40e7bd11f5b5dc365e8bca6c45fe5055185395724ceff5e35147ab7d493f41db1e7a1dcf90d386444367c1c04dc75abeede SHA512 133747a475094107084d3d8fdf03db36e88eb4673e7781e8779fc9e99da77ecc95dd8c22ac87e80d62cd10c2b6228be449544d1f33d22afb6b978a061b953895
 DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod 209 BLAKE2B 00b0c468a857190cd26890babb3e946e9ebbe5ebf0b94ae01519ba32a96f3d99b031140d6de003caee9ca076b33736c96fe4474fb715def44f6ea1eda3ef258c SHA512 8e54b9d01e16e47686cd7aa3b4b184b61a24b7d54fb83a37897c8b76621b3f4594fa86f05b8f08908f6999862e741309c49dcd90bcc928501be084b5667ddfbc
@@ -569,6 +703,7 @@ DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf
 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%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.0.0.mod 40 BLAKE2B b72c62e0cbfca034aaa00d7c23e4ae2e2d1cec4c259f9d1ab96c65b7e3336e050087815a7c8d47c87f5c04983d77f7e10d8dcfa22c74aacde1bbaa8830880f90 SHA512 bab26ae4f895940fbb77346904916a7b8098f580ada97021dae11d9d6a4ab14168f57c3ebb25364bd35baf64955f115b9e431c4f68ddfaa96bb478fe9b59a5d8
+DIST github.com%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.2.0.mod 290 BLAKE2B 8886bdb661c6df840ba61069f726e657f33d18e4ae67d0a61e5c313815d141d26cb43cd6099ee38a0331c09475ecd99b9c15e214557002e2f75d55d2e1da42c0 SHA512 7ba6e7ed382fd995e36d4b5f210b180145ce1b481b536bc32e3eaeb46355bbdd60d923003c393103296ee829ef918841ed3b84ed0812d43db37b6dbbfdc1d012
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod 51 BLAKE2B 2e102c58874af58833146011d2b9d64950522530e5bb51d643b06f98b258d7cb52efa2caa36a1fd4d39d4307a37712de7f22d45990ebab7a755b7cacedcc861f SHA512 e208321653fa4f40d2af68b6db37a368134e27463a45691a1642bfbe67186efa2a6fa41cddb3e443e465c7425d8d44cee8364953b39e1b08fc16b447431cecb3
@@ -598,11 +733,15 @@ DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod 34 BLAKE2B 1365a1cf7687e1b4d333eada
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20160406211939-eadb3ce320cb.mod 37 BLAKE2B 0ff43371511295cc3819b33c0dc26e3d9352a4b931ad3dabdf79561e5ee077ddfdaf5a601827246c0b5cd8992d53d47ef74aab0b7deac6d08ef5f60f44a728ff SHA512 60a202487e693d925ec13186a89ca6b7f322cf53b2bb3d8657d50a0fa0561ef9f2d8416901478fa9783b7a44774511486fcc8735b1d15b558f7ce111f53d5a27
 DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
 DIST github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod 267 BLAKE2B d2298b42ba1b8aed99658a846dd1ff5cadf5403411766efaa880ecd043a56703ac1089ea5edb04b391d710d99f9b1a1471628043be868fededf189130bf852e4 SHA512 76b19a140339b43774f3df87d1de97dd4bbdbf5939f523fe39faca051dd2a4b9e719dc147a0a2f931fd30871c30eb6a628d58bded12271e04f6de5d9dbab497d
 DIST github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod 414 BLAKE2B c0bcdf3e0a6f510eb3649030349e26c3d78608af9ea46150e891c17463491da92c544562b60cfaf35b8e6e11cba5b43bcfe0a8bbc3e3cf7832ba6114ba8cd9ae SHA512 1ca2109c477bea717b8f66a2d57c35373adea2fcaf4223d85770be21833824334e4f9010c1257db95e345d1fcab540c96a40e9abd7bb51cd993559c224e79500
+DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.28.5.mod 254 BLAKE2B 43bce3e9f90f211fad8a4e7b0e2d48fad313113446d745a599ce30bb4c8103a05d34428cdb76fce8238e493258ba18c98f901277194bc53a5a2215ba2490d065 SHA512 7c061af13863becbbd940b2b780d2e4983c9c122919917557b468deebff1bfb9e5b97aec66a7e7f9443a6a87ee72da322dac81fa2fe60e72a16550ab633cf2ba
+DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.28.5.zip 104903 BLAKE2B dec40a8b2f2af08acca7ee6e179fd4e33e505663bf7a29a766e56c20b6f35dc4880c6b5ec70d24cb574fe4777ad1e3715792452207a1fbea8c859986d33d7cc2 SHA512 6247e85263bc7187099734c9f3a2f4735988609ee2bd409a59808430a0af53c94a8640b023cb7258ff3c1aeb28d5c26cfadf0bc7fd00f2773f222ac2c6f0761c
 DIST github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod 43 BLAKE2B f49107f68b9d73c573cfe976efad9dfb5b4555aecc4b15eb4b1592d1ced4cd1cd09f1d2483e7476f8732dd1404a07d9d9a35df84c944cbe21b46409dc5802265 SHA512 f4286a907eaf928904461716aaec3d5e58a826f2f50c6568f70aacd2f14c9d226bb633ebf9fbc8e492961ca23f459be0c49b1ddc644fadcb7e90e99818fb03bd
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
@@ -631,9 +770,14 @@ DIST github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.0-20180907095812-13ff1204f104.mod 3
 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%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.22.mod 371 BLAKE2B 3ff3ff24a8fa567c715a8698c5a636f3eb2b1bf95263dc71a57d506a8fdf9e25cd741b8d0564ba95c04c696ba536ba44149da16572e13c1b5134c24dd0edddec SHA512 5a25ee9f24cf52fccb76de4ca0d1ee7bf309044e6700d48273bc1ceba948831320a51a7013584f60496df642284a4a282b2ed44e7d6290e96927927a220619d6
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod 371 BLAKE2B 3ff3ff24a8fa567c715a8698c5a636f3eb2b1bf95263dc71a57d506a8fdf9e25cd741b8d0564ba95c04c696ba536ba44149da16572e13c1b5134c24dd0edddec SHA512 5a25ee9f24cf52fccb76de4ca0d1ee7bf309044e6700d48273bc1ceba948831320a51a7013584f60496df642284a4a282b2ed44e7d6290e96927927a220619d6
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.29.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod 210 BLAKE2B 1f8fa2bba38f34095585872959f404b3a82f4ccf4d7665f86fa573ad62634420ac4efc8e5eb99f3a44bd6cb7aafaef7b6f4e4202fc956e36eda54d1500493702 SHA512 b4eb091abe317866a323b709143ab9c8c806ec52d14a05f6765e6be4ab33bf1bf8c5977530e017a72d668cffc8878f93f7ad89bf9241817fbf8789452e66e544
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip 235845 BLAKE2B 6e927f0d5a67ef81c17db697f4b0e2a804c7699aec395229899d4f7b8a7dac9dd2e062cffa7bb0e457e9be1276e709e79bcbd9165d762211e8d2a11a63a6d446 SHA512 536fbe2a387bb4f771762a6575d2dcdd970568fb7f2f3b8495abd4f0cfc5edb3efc3f058aa162948a6f33d91066257832749a72c212513b1f7cf13a704072ca7
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.42.mod 210 BLAKE2B fed94d9122ba026bcaab9c4b54425ca6ab054452981cb2c1d007c069b46a6df74aaabf2e5711864d53455b259208181215a7a4ee47cd4f43b7781b7168150fcc SHA512 2b16b7814601de871aec90dfdd1a56d763cdb7132816ceef18ffe94e7862844353044430a49f20305278e6d5e3b42aef11428b88e4b4d17469a38946fa859ea6
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.42.zip 237178 BLAKE2B 4a6964cc5fa4e6c8aa9e50beb75abd26c63bc1dcca09ca08cd3464d3df0b19a34187f73f57d53cfdcb8c526e74514b106e23c72fb3854810f7993aeb0e49ec3a SHA512 f5787ed7f33856509140c5d4a0b9143c67be07c77cb8b3c07c9c72ea75260cd03aab32b07cefe13d86fce88d8dabc2f85a096b1e607026fa3680462e2be51d9d
+DIST github.com%2Fmileusna%2Fuseragent%2F@v%2Fv0.0.0-20190129205925-3e331f0949a5.mod 37 BLAKE2B f2199f58107b47685234a30b032a6c74412f6c09b5fab73cf7e28d33f965e26dafeb664645408b0c044e4cd0c76b9dad2701b331ab881c1071670f3fb48508be SHA512 0bae18bfad33eacaeabd1aa4acfbd23c3280e3aad4d47f5767f79732db2d94f7f65c41d2496ac7e3265420a5d9c5b6f02fad10c9cdc4bade16c90e957f647412
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
@@ -646,6 +790,7 @@ DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50d
 DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.2.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.0.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
@@ -686,6 +831,7 @@ DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e904
 DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip 21676 BLAKE2B e526b9b4942340554bbdd07d83f4cb9678348c600793658644deeb1c64880d420fac1a95002cfd846e7c24d5aa5b1768b5bb1f71a1aed5e44e3755fe2a7c80c0 SHA512 6e24127bb86e9a0990567541b268c9ffb3a91d9cbb379b59b5120ed7f34d6e7f5f32b9efcbbe17553466fc07c06d34017644d7f751775b734b186af1e94d9629
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip 245650 BLAKE2B f917c3c8b6076add4a4cb59fcb1561b21785e9c7cd910c96f7decaeaf4f2c988566ef656925cf91842cb4218142d13f0487721c23dfd85bbdce1f847e12f1551 SHA512 bad04a31aa648777f437f3a7516549992962ef1c660694c02aee62508540c553a2ea36370b917d29a8e4510cc171d94590721c447e8878b562f55a7b0ca78f23
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
@@ -706,6 +852,7 @@ DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a78
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.mod 98 BLAKE2B c02a87e814d1c714464668cb563452e38abdf990ce032deeb5f7d5a7aa4975a6836943318cf7ec829d26c702811ec7fcee6c6c27ac3056722926dacc5b12e19f SHA512 00dbc2834d06b7c97a79f10cc59c588f37bf8f59658a2fcb16fc773507077d09426563028c247eff9bf2b5b849af8b0d12af45f9cae0b400263e9b49b868b56b
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.zip 49529 BLAKE2B 2d53d01d52d4e08323b8d59b8425a5ea43e47d44fb2872c69da6473b33b39f7303d464cfe100e9d441b1767185f875d8c6d3dd183c5f9b0523192efce6a81bd7 SHA512 37bccafecc500372653d1dfd7b03448242399cbce9cf21ef0b34831672332b2272b143ade48346b7d1914d017ce94957ccf53b96daf9a110a3f05a5929e0ad73
 DIST github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod 50 BLAKE2B 45544c1be596ddeb8fa01c80e7d96799912343c885784b18c114716ffdcbeaa05a772d819b9a762b7f155045be1ab3409d423c173356c6fb61b9dbf810c606e9 SHA512 edf1afd7200a64b2feecdcb8f1007e58444ab9737bc0e9d4cea67cf286116fb0ebd4d9b9ae10786bf71265d9b813b175f78deb0b416346736c9a7e39d741b6c8
+DIST github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv0.0.0-20190519235532-cf7a6c988dc9.mod 48 BLAKE2B c08c41c4980afcb2ed505a0061f4139c9af4242068d0527ee2f5f82125a1fa3db4c9c78a0995de0aac8fd7f86bbe134843d80a5659cdea287fd33bcadf85c208 SHA512 69c3f270258679fdd5517bdd5c08411bfc6157c63c52970fca5a223bbb192559ef67981fb38d1b3ca8498358cc98a640606a145c8acb98f224b45d48627f281e
 DIST github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv1.0.0.mod 116 BLAKE2B 684eed32a11a2cb5efa528a8daccd8506aabd72b2d924d07e1f8547fbee326dbe1e6d08f22695d5938950ffc63c5549da532434bce3b7f59300d953aa65954b7 SHA512 abb662e11ca6339a327299a8d8b77dd771ea540e2a9cc55df92794a3eefdead33c4ce0f18cbed1185e5042e8bfba93d3d9d1eca60cd2c49e90acaa6a957edf84
 DIST github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv1.0.0.zip 18848 BLAKE2B d08f6d7558679710a913d6dc3ac3829f29b0e1359f0efa6dd4dbdcd547e95eb2d86d4058da50f0086729bad4f153c3c1668e0499800c729105a575323f5bd957 SHA512 6f922339f80d78ac09f5a3ab0f8b84e6cea660a256b6c63b441b15154dfab5b779496ec3b66c038d251a4efe11bc5dac657fb2b06b34d3600fd9aec012a6328f
 DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod 1010 BLAKE2B 6bef0142218537a9452ead65865ba25d9bd2c9773cd87e199a72ec57c7de0143088044bb79e23c2d7a29d4275713efaeab457d8fe2b519006883b0c15f11e24d SHA512 10181677125b9bccfca933fa3ccc84c81381548b0bcbbf1c7423822f13902eca3907e06d9cff462126b4795b8ecba9fd0525e4dd9f90962697829b99dbc20bc7
@@ -715,6 +862,8 @@ DIST github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod 3
 DIST github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod 42 BLAKE2B 96c6dbda3f5479e2687e4dd71f0bda96d8f25d2edf4665e5e4b742c942fea4db9d879cb039442672cd9aea2d1667091355d745156911bdc21a3344fae5e52752 SHA512 64c2746a75d99c6637221fd8244cc1a07c805f055f4a1f3c1408e3b6c96471343caf438ae1b797c424d59660777011201f47f262ac7210aa81d37c6c3f28bcdd
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip 25325 BLAKE2B 5a4a2551f61bf5c4d0da0dc32ebdc22b9c8c8e52bd1f4e74a658c919ce8c685e8aa7d8a8eece85a8b4958a30459c7daf90424b7dc67c3460323c340aa2743e33 SHA512 da2634fbe6ebfafe3e70a9b6bdd1d9cbba051086a27f9b23eb49d04d2148c10b53b53f6b59161655e813bf7451d5663e8bd2a5b64476950435c3211a69e27b41
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip 24373 BLAKE2B 48d3d48ea7431eba6946ec134f22d789b1e71d5ed5d421214f7c8b1803e0c44988375f1464206209a30cd20ab22da83d34ac27a3efeac55869ec24219fd835d0 SHA512 540d0f75e2fc27aeada7b736a896555732d8f4940462003fa574921d4479523ec1d7cf08697dae09a9bc1aba37b06557639ffdd8458c73346a114fa445dcc9e0
 DIST github.com%2Fpaulbellamy%2Fratecounter%2F@v%2Fv0.2.0.mod 42 BLAKE2B f21a13c6a193574ad2c00817bd5ca777ed141f6128748e7536c9b209bfb88c3df66ad37948902bc905c1d75fecd43afd21877c379498dd52c95a83c63f7c17ee SHA512 33c99b140d2377785d09c2d510766936deb7d67fea5919d4d5d350d7021db27cb776b3587582e65d5c44d97b96280c4e24b13deb2210628953e6c08daaf07b2a
 DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.4.0.mod 153 BLAKE2B 7c79be25b5525550b75f64f8a73f68561fa21d30f71f069aab552807a7147863481ffa3003dce34e06832e2de9328411e1df95603232bb4648b50efc53ff81e0 SHA512 7db697befa192a2fab9e0bfa4f4af163e9bc71fe2b695e6b611e84066a03f02a6cf81003456a0178d176138ac43887b14f2ca9f6e9b9ceb62364b62ce0c435cc
@@ -725,6 +874,7 @@ DIST github.com%2Fpeterh%2Fliner%2F@v%2Fv1.0.1-0.20180619022028-8c1271fcf47f.mod
 DIST github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.mod 32 BLAKE2B 400d176245ffce370598e46c8fd88ac601298451d873a65c290009413570ed38f3c5be35fe800e95d1c23b894c9e8c1cc787ac54dc5c6b7e2d11c2f1ebd031dc SHA512 75eb2b85e2900d2e0a492e281f2b9f8b88a6b480478bc38e33b8d957ed2b65be5835f03dc8bf0903e80ddb5af268db410ce9db9a1569bc25e50523f74878fbeb
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod 69 BLAKE2B e3c2bc67965f266f7449c37a9cb421a8a5464cb18b54ec9c81223c81b3e19890e4b628e3d14a7904a6de4e8a83b53a21c01ae32f774fb583a8739eabd00daaeb SHA512 7b303db4973d7804f48fc036bd427a8258d34aac8a8ec95252e6602c7053be4428b5e15642263913686c3207cda00316132ec668bbaeb2748e093b1f359a1620
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod 30 BLAKE2B 3addf97309c342e8d5bcf397c7c22cdf02eaa571e0632595f9268678a2ca0ef9818cad13ccb3444547d001994d137325cb2cae16fed3c080aa6e62f206a3f059 SHA512 c084d8b2c486f343a891b3b2d21200f80161f2ba1303ae17f7a482949b1c10562e7f87ca44b4258d32a1743b0eb66f842bc184d80fe349e9deb965215ab98b2c
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
@@ -735,14 +885,22 @@ DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
 DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod 136 BLAKE2B 3708d63176898e5b9b06ad69d2ca1b4bc3bc62c5dabc6df3d77f476ea9b588f27efc18ce5f098b50ac0fdd7c71b36f76175e2cc3cee878c3f4815303b17071e8 SHA512 9138e434a2810bd96269cda05a0cb03bc7e6f28949f6d6379468567e40938846c85f581b4bc3549a53605dd9436e25662f27f216a60a4bdd816b038d6af570c0
+DIST github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.20.0.mod 1415 BLAKE2B b363f7637da5050060ea3956d20049c77b940ddc4f6b5e6f068a7f0a0e58cfbab93b25fcaab150430e554343914d92a8bf30066ee874725e313a6b0c81ec27ca SHA512 e69aef956328d2ecf4a0db3fc6bfed76ca97bed584b5dde26c597f9d6730933d4feb886521e5f50c60783268ac2c93195f371304c206cccd4e2bf4971a579d21
 DIST github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.21.0.mod 1343 BLAKE2B 2540b17e15516606ac7820a22932c9bc5d70ed1f23e8fb0712b03b63dbe04882e3f72825686974ff5172ceff342a633e4db28530ec07cacda4570cecba2c5b4f SHA512 a4dec3ab1d33f07c9be6d65ad12f7a62e68df3beb3cccb680d290feb792b9ca8a42aec5bd629c22541a64ec9e80f1f988ba7f0704821d65e6dd693df396bccdc
 DIST github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.21.0.zip 2251637 BLAKE2B dd402253932683999a41353c86cdc0dbcb22c3da5476bd845760d9783537bde88b20efcc47233e4bc82bc4cd5995fdde0724b2d32b0f00df38337247d097559d SHA512 8278e072c3ae064ab2a11f734527dbdbfba444a04aa7faa37d1fdb218bc4d39cacbc6983e7aa5dff894d353225c36d749cb73848021e1ac66c4bbb04beae6a04
+DIST github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.22.2.mod 1373 BLAKE2B 3e65e7154d4b1d1d87127a3b1ec82d9ee04b3bd1d69e5f8a813c93c0abbae78a9af06b59f8043ad25db7b6163aaefceff7ed2d76ddb392ae15ac49eadf221003 SHA512 d0a7f3fe6463dda6793b96d841ae5ab356483bd9c174d23e1deae3a9af9ad5d9679d608b7d9ced05424ee42005a3a900237a5366b6509d62f67002350d9d384f
+DIST github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.22.2.zip 2290150 BLAKE2B e8b6a21638a50d006a67a15a72b375016812e2f3144f8e09a621328cd12f6478e08e4518bc83eee9760a2840520bbf2c32dbf81c230b815619b42f9a7e7b1b58 SHA512 fa084303c9e5dc07cf046efc01c1b9501f168be0884fd63a42ccb64eb59082ef3b00857be9a81f126ca212074abd76ce50823cebd7d7e3272ce4f67efa43351f
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.mod 377 BLAKE2B dc1cdf5c083f87f165dcdfd61ba38bffecb85e0706995aeb5bc3ea3c9ae4465e86cebe7e089b4aaf1ec9f79f5b3d843db14d19b62ccdc32f09afabd41d3fede4 SHA512 01ef1e7e81764709488bca1ea7434352e33eda89dfc16aff0735cf16e774fdcf2507b3565c62c31b17c60b52abf3edb95afa0034596d4d07bd315da843d09471
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.zip 242496 BLAKE2B 885faf82949b17b3c6aa100a4bd0f65a6bb9597516766f401ea73bc59b4728b839024319e1457385f7e37c2053a09ce42fe471d7c348a66896266ac723748cfe SHA512 2f1d44c4377b9fa66d65bc3b744b66e522e52c89c5d54cfb251e7e07c821a164319de8c628d4b4650d646177c49ae03507eab5aa10bb2b198bc6b45cce513513
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod 468 BLAKE2B 4ac6ec5b71271218f33b753092c494ec6dd01e73373df68af2f399d8d8ba32de0f02150c1c5fdac8518ac244391f126cdac602c63ec862bff559d76015cc78f5 SHA512 9c6244491c9a3012c4a2e575cdb361f7fa577f391ced254adfd8d567c361f073ce23ddd57a0f18ec3327189cf97ad737254c0d0ef2872085af6af7bf9dec1d72
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip 240896 BLAKE2B 4745181476be50303fdf0e66ec147d643995c809a1fd969c846f656d453025f2cd67089f3065b41bede74bfcaa65e5307dd9541457ed7f7ace31b6b567e2e135 SHA512 20c4e6baf239cbc8c8a754ec1b9ee814ff29df1b41332f75f7440b27864bc28397071f3f4d60ba6ff4d0aa531b7a20857e11ecca93057784f76f03876151e8f8
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.2.1.mod 403 BLAKE2B 1f6b768b530eedeb17d97fb568df5a39f5d71fc75c5851b0a07b2cd6dff1884c5d42a4b19eb7ec5677699c4f99858b9d7301ec8fdb02b36ae6d401bc38c17a4c SHA512 fe961ef0875e1251f0387a7b1a49e41d7ccd1150e01d383c6893f020c8b0f403d87a407e47d96b498b92e61ec93cc5e1da681e35e586b3d63b4c54d1d4dd685d
 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.4.0.mod 612 BLAKE2B e77946b5137a632121f113e6d7b390d25891d1fdf214b7c07ee0307aa4e78f5d19e96d1f4bf01aa1d62a2b0918727db1e128fdca6b6f1daeb08632b940a3084e SHA512 46eb82a74b845f5eda8cd01e8ae182e5dec7867306b31a40cb5c6bb9df2045c3259070b57388cc7826f54ee7b9fddaf980436f74ed500ab88748a13f12b30ff8
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.5.1.mod 612 BLAKE2B e77946b5137a632121f113e6d7b390d25891d1fdf214b7c07ee0307aa4e78f5d19e96d1f4bf01aa1d62a2b0918727db1e128fdca6b6f1daeb08632b940a3084e SHA512 46eb82a74b845f5eda8cd01e8ae182e5dec7867306b31a40cb5c6bb9df2045c3259070b57388cc7826f54ee7b9fddaf980436f74ed500ab88748a13f12b30ff8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.6.0.mod 568 BLAKE2B b9afafc90713d607700297bf306b19e65ab9e250e4dd8c4cb437fabdc08fe1f7551e334245950107a6f52eb2c0db5ee62967efdb9037c89a49b102737614efef SHA512 3c53048eb63a00ce6a692d95f285790f7eca72e554262acfbaf8a30122efbc9767bc09abf3d6c16acea65c81e4a94c862fb8b627135711d92f89566cdec67d8c
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
@@ -760,20 +918,27 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.20.0.mod 739 BLAKE2B 6a475498d76
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.20.0.zip 180460 BLAKE2B 64fd19ca41a29247e3df6d848f63298434c3dcd865d85404e9394009ea5cc9bfaa47bf38c1eeb1aeb17280bc30d125edb34a7985832ba3721cf9153eced75bea SHA512 83a2d8c8513a1af34274104f76b7a83f9c12a5ec955c168f1d15100087ac2cb0855c7d9230f5c4fb4029c4a32174521574eaeabc2b537583f603b1f4ce217092
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.23.0.mod 795 BLAKE2B e4a9e295743ac54ff8705e360e9df54a4fd087396f01fdffacc54761282ec8132417c6960909cb613737eb1e5880e96f3204413c6a2e067b65910bf2c5675a7c SHA512 92aa0c40cc26322085725d1ec09be5d2ae8fb7dc57c57f56e2cce1b5d9f50ab71437466c94f9caa6ee58cf3c17e157003f2bbcb38ef6d533d6bc68406e7aafe7
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.23.0.zip 184515 BLAKE2B 5bf570295104958443a26bbf35f25bd3f8bceeb6cf0a78cb8b6666b470df36d16b9faf3b3c50a5a7ab5c24ba881f2e59b364f23f5b711477d1e666e0e2b0273e SHA512 c6923cf82be93e7e4339a9d1995c403becd11738d087510383c98e213a4d346b381c6f6e0a452c85e64b8e482723cf73823d837f62fcd6ac4a13e2b88ca30507
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod 794 BLAKE2B 91c9bb4469ac63bd98bdd1ce4d2f2cf3a233f62f6c30b1da0b2a94eb1215a975f3a19cf066c6bc5847fd1a642da6082b8377825987ab5ba21620c2ed9ef26af4 SHA512 05a0bd8a7de559925fc5ba7753d9fc80db41271fedfcd0ca3137f9620c68468c0bfb706e0b4915151657c74a5d64f52a5594736e19fa1421aa65124f551f0ddf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.mod 583 BLAKE2B a104cd758a5cc7962ce174ce93e8cdcb0320f4bc20b21ed3579a201e85ac851322ce06087d4f5514317731f97903a3e118d1001eb3ebd614158c1f7de9113e3e SHA512 550dd35c6ce6d98886c4f73ad3afedca13e12e39ba3c0958a4cf05a92db92187787591d33ebdbde6d961a451c615bed95cb75ec36b3e91ce0f2b12805d82d248
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.zip 178532 BLAKE2B febbb971264e16ce01088db8ba77506bac3966fe600d4229625117017bb913df03d51af54905d4f9efd0c35941d0133e7b4eefb489d0e6d9a264ef32824b12ee SHA512 17c617788d1d4cfe4a83e8bbe0772e7e3121d75b144b6751501dba0679dc7924432d9c94528c62052bacb9bd5719a7ebfe515d952a95ef4481cd4e45bce88ab1
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod 693 BLAKE2B 414677e90b5a1e5e2b5b498e46386fb2fa7c93314b390bc4337c74865b6a72f8a64804e4c30aefc54515e9261cda168358d70bc533e8686cbbe0f625b8957d08 SHA512 829b3d7349806cebfad94252c09095aba4c5cbe0cb77cc124e7fc514ded1d8faf0f158d21be97911b8937ab9d330b284139275837607950ca602b3faebef146c
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod 829 BLAKE2B 14a7c9b3754cce16715135e33ee294058d999f343d74281b9fd111a9c0a5632b90b6594d1ed220165b58614a695b2b2aae27b2ed9aa35ba1acc768ad12e46ea3 SHA512 4cb3dba50a3b47b9db735de9df4bd7b35d02464065919502bb1e17236c2f6b1bf1e74f312a8d0127d2d570344c30d58063d62031d3439f52a6dd8f47b29b9996
 DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.mod 287 BLAKE2B 21f5e5b0f556844005234fb29f985a67de41a5344b0155e1bae329fd9d11412ef5cae6702b8d034bb7ab8d1c3f81ead7da62469a64814a3c4bfbca5dfa28ca6a SHA512 49ed1469c453e6ea78576c51424bee1f456705d7a2ab167d250364813c44eae39fb51e8fd0aa7418a585a48762d9e2c4afbc9119ebb76b781943dc1723ddfafc
 DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.zip 70154 BLAKE2B 70e3dc90ebec9462de8c05e1243bfa5754c1ffe421b5380e75ddef5109396453aeb18a107de3a03c1fc2f23243ba53668338fcfe1b289d85c8526bca5ce8c756 SHA512 f8b3286dbd38591987d4c4d4037d1fe16c5adb5bf971131dcda47c29a5c20286db863412056539829235c306bbb68b184052f26473a30fc8194b46a093881cae
+DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.mod 286 BLAKE2B 48741f0c3685fb8369151968db19610ce28f2a8341da2f3fc7d74ff221fd9b142cfcab2a336f9abffd69dc384972e14d1f033c5eb7de74013cd0617dab95e2fb SHA512 d736de8570a85068955bed17c17387873336142c02115cea7a257fd176310998cba737e9d121310a8dbb8d5cb98399b7427bc7a19da29ea10ab122efed8514b9
+DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.zip 69292 BLAKE2B 2708f198f1cc181291ac1c6c65717b7e0a071e8036819eed8b2a6437c1793c5ed7519a434d906490d2fb6d9a940d10db583f9f0dac0cbd9641bbc954e05959ff SHA512 e531cf841ed1145d4101484bfbb32f120f331ef81bb2ff3f7e7099f71acc646cafedb5f4d4ed49c7a8ccf2a9c8e292498e65b0b47b31245f28265d593dd185eb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip 282768 BLAKE2B 22c62ac51bb14578571aa93f0acdecb984ca370b4617122078b28b8ec5ab4ac8cbd6e986d60335d5f9848028f51f94d8fcdae3d8b428c8d3c8196d97cb2f04db SHA512 1b73a550dfdda98e41da9ace048b230ba05bfe7518cec7b5f877c11afa58bdf9d53ad25fa848e316fcb5b25ff6eabb0a2d2688c1cfbd9642a8670b72c3f90a92
+DIST github.com%2Fprometheus%2Fprometheus%2F@v%2Fv0.0.0-20200609090129-a6600f564e3c.mod 3880 BLAKE2B ef9d47ff45318b110243452d7d084c18a1279574563c8da533b658ff2b8f7004eb7ed4667bdc0be18868f7b1aff07a099a3c8a1121ba49e1746a3c5e0ec586a8 SHA512 42582b0b66f7a74819c0025b61ce37ffeb99e0965b5309c73c95c8f2ed7ffdfe598b4143b3e44556a4e6595282b3f59205f2e35dfcab6308c8bcfeceee12ba46
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Fretailnext%2Fhllpp%2F@v%2Fv1.0.1-0.20180308014038-101a6d2f8b52.mod 35 BLAKE2B 236e030308da9f6665046299fb6076bc3bce65b5ffbc2820c463ff3af2c95f78581b8b0260930e85eec3e1f9b40c65d206a2fd947b4a5aa8b032ae608a5e8daf SHA512 ef6bdf93c07e5d0d7fb93b733a0a902adde1e2aa719673b9d3bcc1142cc4dfe001ec4455964a13000709e0c727f5f1655e36cf1eb114591ca30a32f9af707652
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
@@ -781,12 +946,15 @@ DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod 45 BLAKE2B 6fe371f17a31b
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.2.2.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frs%2Fcors%2F@v%2Fv1.6.0.mod 26 BLAKE2B 8b06c3629b4e4371ae833fd22ee446fb963e300c42e4a92fb215f10500a826df54285a3d9718546fceef0e47f949034d0de0bf8aa9ca49150cd2d58e8272b1e0 SHA512 306c53774adbaefecb2283f1d90c11b088d9a45a29215ea7c627ec6d97027192bf5fe99a3cb473415ab47764802859ce9878e83ef38fdc4a87b4c7b0c5226a71
 DIST github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod 26 BLAKE2B 8b06c3629b4e4371ae833fd22ee446fb963e300c42e4a92fb215f10500a826df54285a3d9718546fceef0e47f949034d0de0bf8aa9ca49150cd2d58e8272b1e0 SHA512 306c53774adbaefecb2283f1d90c11b088d9a45a29215ea7c627ec6d97027192bf5fe99a3cb473415ab47764802859ce9878e83ef38fdc4a87b4c7b0c5226a71
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
 DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod 38 BLAKE2B ce3c91e2fcd6c3748acf0e0f6355a0af01db3c7b36a793fc07b94b1072133f7f25f4c49473bb27007ba2de7233454a3728f24eacecda76388570810e62a5d161 SHA512 54235e8bcd2f98cfbfdfe187ee4b2cc7d0efe155710474100709b1a8c2e55cc2e24a16559857fb9edf484a0b76debbcef69d5c182efe52594c9858a37b6b10f0
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv0.0.0-20160603004225-b111a074d5ef.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
 DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.1-0.20181028125025-b2ce2384e17b.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
 DIST github.com%2Fscaleway%2Fscaleway-sdk-go%2F@v%2Fv1.0.0-beta.7.0.20210223165440-c65ae3540d44.mod 123 BLAKE2B 2263d93d56dd69d56f78c5f657a42eaef2feceffade8d9d45fc18a4a08469dbd11a2b0f60f68b6928b9e18393221dafdca1e9f35acf67e4a9b5fa2035127a7fc SHA512 f4e2c4b9c69ef697ce4700d04553f781cb203e1d782df7484e08f9f0a56a773731ee27046dac0992b4b6751c2c1c48a118a8c419935c837bff16c2059ee69be6
 DIST github.com%2Fscaleway%2Fscaleway-sdk-go%2F@v%2Fv1.0.0-beta.7.0.20210223165440-c65ae3540d44.zip 507237 BLAKE2B 9edc137d941d3032f9b94c18b38ebc2ee5d4069630b69a31a4b1810e102d13a8c3d6b84a09f4b6505a8c279bea7e3dfa145a7b35d8ad5dd7005a15a515d555e6 SHA512 32e773a52937547bffc7e1ce994685fd2dd8cdc9843a354179dbf23c72df39d326a8c55ba4a2122f4f30d06b0cde83aaedab704a7177f8ee2c10b43927f9ba7b
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
@@ -814,6 +982,7 @@ DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be79148623
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.3.4.mod 42 BLAKE2B a29f396a589449f8ffe9d6dd4529aca67c2064c370644fd34c7e644d5b6600c4b0d7db685ecbbfa0726df77d5ef5d9a3d6f9a2c392f68e93774d043d587daff2 SHA512 c316543a54fb4320e81b4724dca59f6a85a265bdbd7ae4fd00f324b4e8e60039771d34e32f7f24ba4ef185558afb03837d1b72e474ba21d9fc7a7d5ab17ac3fa
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
 DIST github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod 86 BLAKE2B 93d8710c720a6abfda7ce2f81229f4ba96088d4563b163f02fbe05c962e698f1ab1771ddc8a0296e8eab22a1e65f64258a5b3ad459f53de0d662e1ef3ca9edf9 SHA512 de0d160e304d1e1341fb3d3769ad300b61879ef491b3a293ebd1874ca259dc3fe95a3bd3f41b04e382cac8391174a54175e08b8422f243563e845208cac15070
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
@@ -843,19 +1012,28 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff111
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip 9803 BLAKE2B dbb2623f6e506180cc64bd0d00d88c0fae0f5334f21bedb6f23757a3fd297d11c91ea6726ac9ff1d3de7dbf4a3d400cc7771412ba7978034e78c170b635672d2 SHA512 760da1b31d891006582c28c8394a0cc3494adefbe76ae77882b8340f1ed057011d96ca10bce9d86e881899ea683e6af402770f6f769726811c7776e040c3a787
 DIST github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.0.2.mod 31 BLAKE2B 263bfb05ef35498c4876a40273bb21f3bb2c5145e95ee0365f912a6b46919b145d7497e97cfd88b68c47b581ea4d65c31cb3de65f15929137f89091faa5eda86 SHA512 c9dea92ef8c32130b2d28820cf3f4d49e43fea4b36e82343030c1acb63ca120927d94e0ec8d496ce2319a36a22654cf3463c0023d7ce6cc7d1d4b07832f31ced
+DIST github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.1.0.mod 31 BLAKE2B 263bfb05ef35498c4876a40273bb21f3bb2c5145e95ee0365f912a6b46919b145d7497e97cfd88b68c47b581ea4d65c31cb3de65f15929137f89091faa5eda86 SHA512 c9dea92ef8c32130b2d28820cf3f4d49e43fea4b36e82343030c1acb63ca120927d94e0ec8d496ce2319a36a22654cf3463c0023d7ce6cc7d1d4b07832f31ced
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod 32 BLAKE2B c5bd918ed79f8ad33509bee3028b85da9941f721e12735da810f7cf4238ddf83d3c5b7634c01944ebbe9d0c77fea36d5480d945d2dad9d9126cdb5ceb1cc1d11 SHA512 4168487b908d7fbec0813e5ac4d1cc854216d2355fd2843c2856ce81ee7bc399d9fc2b0811b5fbf1f0f1f26e92d327aab3d54b30809ffed621aff37a706e3417
+DIST github.com%2Fuber%2Fathenadriver%2F@v%2Fv1.1.4.mod 578 BLAKE2B ab43d755c1b7c02980b91909be9e322aaaa5b35d79db1f98355c9b04885a4b9e073fffa7ec9b2208a649b8f324c3d7d24492935541d05656a1af6562ead39156 SHA512 649ce885f9f31d766edb6aee02f84ccc927715f349468277b4d8c41b3d7e5658c549ec4d90dc21011ecced6e4905a72f646f68810ed7dc9149e984a181270d2b
+DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.23.0+incompatible.mod 40 BLAKE2B 5b237034cbfb2f1a2fcf7a15937c89241c76b74f8085486a24ac2b8082772af9e05274c3e6d46378492e8a478532c889bef2da72daea94ae413ee2fd54326806 SHA512 7a620df2c7dd83a7d5df69714186d055519d5422683147f6e02a19db4f12293ba0674091c3f361e0c11d9661ab9938b4f69c10892e9cd490403ef2bb748e5e8d
 DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.25.0+incompatible.mod 40 BLAKE2B 5b237034cbfb2f1a2fcf7a15937c89241c76b74f8085486a24ac2b8082772af9e05274c3e6d46378492e8a478532c889bef2da72daea94ae413ee2fd54326806 SHA512 7a620df2c7dd83a7d5df69714186d055519d5422683147f6e02a19db4f12293ba0674091c3f361e0c11d9661ab9938b4f69c10892e9cd490403ef2bb748e5e8d
 DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.25.0+incompatible.zip 357253 BLAKE2B 4017774fefd039f66468a17477dd5c1aaa47a3c62f51fec520cab9108072eb8facbb0e8554c31a5ea2dde6fe4167f5cdb54a02e631bf3067091aace395db1dd1 SHA512 ccdf90cfceba824df843f67e5c3ef934f762e7221be1f0cc7314dff4363b21eb2f1a6d51ba51369e2f8a4055a4d1fa97d35200c31335812bea4d426df448e5d5
 DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.28.0+incompatible.mod 40 BLAKE2B 5b237034cbfb2f1a2fcf7a15937c89241c76b74f8085486a24ac2b8082772af9e05274c3e6d46378492e8a478532c889bef2da72daea94ae413ee2fd54326806 SHA512 7a620df2c7dd83a7d5df69714186d055519d5422683147f6e02a19db4f12293ba0674091c3f361e0c11d9661ab9938b4f69c10892e9cd490403ef2bb748e5e8d
 DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.28.0+incompatible.zip 361742 BLAKE2B 60f883fcff614ce6a298b8c56afe653bea77b6bd8ad81d2c329616626608b7f06c72181c4580281bb4f54a905c6e000ee0af5a8b2728804f5967b423334ffeb9 SHA512 db2db30946af738db3ca8fa0ae180e8a334f74c7efea2320600e8680af6a8f47497154b758249212b2f5e58ec6edaebebb874b65d276eeeaceb5046605a4f83f
+DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.29.1+incompatible.mod 40 BLAKE2B 5b237034cbfb2f1a2fcf7a15937c89241c76b74f8085486a24ac2b8082772af9e05274c3e6d46378492e8a478532c889bef2da72daea94ae413ee2fd54326806 SHA512 7a620df2c7dd83a7d5df69714186d055519d5422683147f6e02a19db4f12293ba0674091c3f361e0c11d9661ab9938b4f69c10892e9cd490403ef2bb748e5e8d
+DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.29.1+incompatible.zip 389395 BLAKE2B 02dca57e1b44c0634c7a91cac32b249c670187dd738b991233dafc499d3994c46903222ab7bc24264e3a48d4018fd3abac9acaaad531723ff0fa7b89cbc3da27 SHA512 571f54d3fb9bb2fabba194c903ba5c52d44038e24eae2662582330f389c3019f6e7cdb935a66a76a2f10f0bf63b48ad5ff652e10be9f05e5853acdd3e7f9475b
+DIST github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.2.0+incompatible.mod 34 BLAKE2B 86524b6dd4255f923cdf5eff9681366c6eaaae6fe91f082ec77b87aab1ea6c96d890ca356e06abcbf7219590d08a6eed13131d39a253ca03baf9614c1e775506 SHA512 57a8b8c1e0646693137815a820547a8b9dbb35a132b25a735d1fdbe1fb829efab1eeec4907d5de44e248e953f033f3bb8040f6632bc899238b4329be1ce552fb
 DIST github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.4.0+incompatible.mod 34 BLAKE2B 86524b6dd4255f923cdf5eff9681366c6eaaae6fe91f082ec77b87aab1ea6c96d890ca356e06abcbf7219590d08a6eed13131d39a253ca03baf9614c1e775506 SHA512 57a8b8c1e0646693137815a820547a8b9dbb35a132b25a735d1fdbe1fb829efab1eeec4907d5de44e248e953f033f3bb8040f6632bc899238b4329be1ce552fb
 DIST github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.4.0+incompatible.zip 72259 BLAKE2B 250af2ce40105aba12c305ed07038398b92389d7f0c9bd0abef17b53133f1425c4c99b8a027deb6e62dffdaf769485b9b43ffecade4973aa6eafb4a17ba60d78 SHA512 ad13b739f1f39c702428ece17592cb8c3953bc0bf0187317b22828a6e0f7a4240fbc3cda4b95938cb86193a7c663cd37a848c07a8fadb6a8bc272a6aee2c0cac
 DIST github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.4.1+incompatible.mod 34 BLAKE2B 86524b6dd4255f923cdf5eff9681366c6eaaae6fe91f082ec77b87aab1ea6c96d890ca356e06abcbf7219590d08a6eed13131d39a253ca03baf9614c1e775506 SHA512 57a8b8c1e0646693137815a820547a8b9dbb35a132b25a735d1fdbe1fb829efab1eeec4907d5de44e248e953f033f3bb8040f6632bc899238b4329be1ce552fb
 DIST github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.4.1+incompatible.zip 73018 BLAKE2B 2a9336c9e04dc4687d9d31c5354374234dbd9cb21ce9d9ce442aabe4031bf869de41df9e066f21745f125f291cc5f10bd01faf35c4c2c5baedfc0b901b80edc5 SHA512 6c1c347f3938cd726e9e25d3af28dd5cbe5b560f47d5635a6ee3d1c0d5b9be1cbf516c57ee4670d50ef24a85d263303940a70810089efef6ecec28eb0f2904db
+DIST github.com%2Fuber-go%2Ftally%2F@v%2Fv3.3.15+incompatible.mod 32 BLAKE2B a2509ea1060ef474a324256bf66e6691c721a25e56c490bc9c7f21e0a4d1292f9e4002519dd1d1b085a907551c3a3f899430882d5394898cfdf8637a35417a48 SHA512 22e9c4b3e67322ef410438ce9261b961bb0ed93fbb5c1d8d8c056737cc1ed048d620517287b1ce53b0e65ae6e19a4b74decfa381036cdecbff04d013a1c8812f
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
 DIST github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod 311 BLAKE2B b7d3826a21681cf937eccbb37e11a505f6eccaaf1b82ab8f8b00cf433ab3478f1e2f87f5812fdbb6587e9700e2e8840e9eae935f7a51a257e957b468bfa3484c SHA512 41546de4beb8bce00d5adb8213b5d0440f4917eb0090d9a81fdbde098675c6ad1166f4f2383fe0c526f8069b2f5fa88d93f6fe95642b96a044e49475375b329b
 DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.3.mod 31 BLAKE2B eb05706f9dc60f41414a9d2b5c3acee3f615e0d1249c2e9b9776bc255fcfeb05593fb3bf06351d763d4ae4b465aee3f64d9630f4ae5fdd2d4e9ad847e5d4675d SHA512 f220b8b8bbc82fa03107ec51399e2e8c90a442b8b4ad57db441772c1ef66b16a77b71f0601f8aa22b60de4c1da4dffd1d746cd567158fbcd12b1677d88d4b17b
+DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.9.mod 31 BLAKE2B eb05706f9dc60f41414a9d2b5c3acee3f615e0d1249c2e9b9776bc255fcfeb05593fb3bf06351d763d4ae4b465aee3f64d9630f4ae5fdd2d4e9ad847e5d4675d SHA512 f220b8b8bbc82fa03107ec51399e2e8c90a442b8b4ad57db441772c1ef66b16a77b71f0601f8aa22b60de4c1da4dffd1d746cd567158fbcd12b1677d88d4b17b
 DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod 28 BLAKE2B 87b79aaa3dda433afe275fbb69b3abfaf808a8a992f37846b51a3cb9069b1a0e5506ce6166d5186eef8656b451c3f6fad5bdfb58a213a9dbab2e7820e9062c81 SHA512 2303a64b0acb96f5f73dc64468a81d6aa6fd9a08240a04d5025884d6076cf90eeb5b132979488431d6f885138702a22a606419cfc0aecd05798deeb3acc4fa1e
 DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv0.0.0-20180714160509-73f8eece6fdc.mod 33 BLAKE2B 602b301b7da6b66bdb3a5c9c88d4a74f776ea535fe1c4b1085840eaaea4ea5d9a05fc2f088b92fb85152d22025e89801eb476cdc26e031f8e3adb68fbb62542e SHA512 9c89175c24f82cba599f754d2efb8dec6def64b32735f9733b883b20a0758a6769afc527322ec5059ce275df6e034bc631a32c0a392a66e96c9d4d4a1087c4c8
 DIST github.com%2Fxdg-go%2Fpbkdf2%2F@v%2Fv1.0.0.mod 40 BLAKE2B ab170ae79a93117e9859e6c17a27b6e5954e6eea2e4c831a16e6672d66269bc9480b1fc24e3128ee15c8c18c4fe0e27ccd25f000e138b0f40976ec17b6832eb6 SHA512 72871f7a4a35901a2608ffcffeb2c5ef63ca6dfb7805d0e3f65e47fc6b8939977f5d9bbd93d64bab110300a803da0d5ec013213ba4cba0f02b2a62afdb493ebc
@@ -864,17 +1042,20 @@ DIST github.com%2Fxdg-go%2Fstringprep%2F@v%2Fv1.0.2.mod 79 BLAKE2B 726e98beddeaa
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20180616005107-d6fb6747feb6.mod 33 BLAKE2B 1fb8495d86422bc87ae3a29d7040d3deb46560e8986404fe66da26fa2f7eea5f38b1ab84a67b8e79c544841627025e882fee2aea3fadd75f69f1761238eac23b SHA512 3f30afa5211772645ee93a8b11eeec246fda17559bb23b1bbc93b614815998fcae1f45827f12922fd8d51bf84425e2154f690728a63b510d278d60a48549fb77
 DIST github.com%2Fxlab%2Ftreeprint%2F@v%2Fv1.0.0.mod 42 BLAKE2B 7f1707dc136483ec51919da03b8dd448983a9dc23ec576731454887705aaf207e9f2f80e5febf8fe5399946f72014f23f0f32672bc7aaef9bc1da92e8bb22ee5 SHA512 04bd4bb4121c2bf94a9224bd2ddeb8646525fb3a9abd1ea8834d9db851b7fe03c1a9b17356abd3134399073b20abdddb6f7534a6638eee848c79267f622ae7ec
+DIST github.com%2Fxlab%2Ftreeprint%2F@v%2Fv1.1.0.mod 86 BLAKE2B e51702a04dac0236a5feafb2135c325a50d5942c50135d4c2b16f059066166bad8019cfaa5108dc76fa116993d85aca58b300c50d31029e4f161b7bb03b77588 SHA512 a038ea2fb80d1c5b346c399bacb0d2971257ec2d826c81e146d07d17702698576bc7e550ed96948f18bc8c3611f50e6c4a7368bb2c198ece649db345183aab79
 DIST github.com%2Fyoumark%2Fpkcs8%2F@v%2Fv0.0.0-20181117223130-1be2e3e5546d.mod 32 BLAKE2B 6872fbf6dd97b120059e4a25961c2987370e44e9cb49a9c58ac9e3591ae31b573e7dc87de1698164cf36911879ad662aa2933a0790117485a7960fd0f6b6cb04 SHA512 b2f77afa922dd3adda401b844adc88384a6f0352170758d4578bcfc508c4d63d5748f2b085a4bf8f493f3388f58747b809450470249123c2e5f4fceda26751fb
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.0.mod 1094 BLAKE2B 374ab66042c9252dc3c2d9f5b93878b9cc5ddb46529f3b7892d715411ee68376f282e250860bcb3adeac6026ceb049be6e5d732ef1ee71c2d445e6cd8e8cb8ad SHA512 da5d3009eacc93265a7c80ac5f38866361e072a233a2798a3f0f3bdfcb2e85a0d50767783f0835e23a40ccb2bc42b303b3bcc2359a1eada345a179543bf7e232
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.2.mod 1094 BLAKE2B 374ab66042c9252dc3c2d9f5b93878b9cc5ddb46529f3b7892d715411ee68376f282e250860bcb3adeac6026ceb049be6e5d732ef1ee71c2d445e6cd8e8cb8ad SHA512 da5d3009eacc93265a7c80ac5f38866361e072a233a2798a3f0f3bdfcb2e85a0d50767783f0835e23a40ccb2bc42b303b3bcc2359a1eada345a179543bf7e232
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.4.mod 1094 BLAKE2B 374ab66042c9252dc3c2d9f5b93878b9cc5ddb46529f3b7892d715411ee68376f282e250860bcb3adeac6026ceb049be6e5d732ef1ee71c2d445e6cd8e8cb8ad SHA512 da5d3009eacc93265a7c80ac5f38866361e072a233a2798a3f0f3bdfcb2e85a0d50767783f0835e23a40ccb2bc42b303b3bcc2359a1eada345a179543bf7e232
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.3.mod 1079 BLAKE2B 857001d7f0c6bbf3518c4dd788a8cf00632920151b8353c44f6672a1ae4c8757374ca4142d324799a92cd2a453f61573e8b22012cdba410cc5b084f2d5c23b4f SHA512 8e292fa425ca61ef179127e45d7d81fd6b75f55844bb3a14eafd4af95026b78d84b31d699a5bc74e5c591b6253436c23f3edea18f04ae02def4a8b5db2e8d542
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.4.mod 1079 BLAKE2B 857001d7f0c6bbf3518c4dd788a8cf00632920151b8353c44f6672a1ae4c8757374ca4142d324799a92cd2a453f61573e8b22012cdba410cc5b084f2d5c23b4f SHA512 8e292fa425ca61ef179127e45d7d81fd6b75f55844bb3a14eafd4af95026b78d84b31d699a5bc74e5c591b6253436c23f3edea18f04ae02def4a8b5db2e8d542
@@ -894,20 +1075,31 @@ DIST go.opencensus.io%2F@v%2Fv0.23.0.mod 300 BLAKE2B 768900ce7738c5e1de5c550f1da
 DIST go.opencensus.io%2F@v%2Fv0.23.0.zip 309862 BLAKE2B cc1876f2670ad970a82ad2b58cac621086428e29145ec62f9917902100236471547339be24e2656fd5c3d6ed4b2a10861edb5879e85c0bb9308b0b334df0f4d3 SHA512 90ec312a3ef194251f06ca8c6535b97b0303b72c55cdb602f6f33b1c691188fd5289e4c7323d01d5c66b15411b28a4fea4bc817c41fad6a7d206448fbfa498c9
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.1.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip 53254 BLAKE2B 55083a93da944305baacb592cc1145f191412b4fa0a98ff3f4180484d7a3bf4dc65561d71670b8a462126f10ea82a3ca2846f73bacde8c9d8c485e895b329598 SHA512 127df97ad28854e4db92b6ef8f147c50eecf49e6a3f70dd0524325f24aa6bfe977127513443cd8926589587654212acfa4cb8f153e2290b8b27aaa09dd846368
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.8.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.8.0.zip 59438 BLAKE2B 0378c6ec03859999bf9c44163c731185133ab39268dde04f45609dec49c748a4112e9962b2dc0bd7ed547ba2dc67f5742b89c2870abe555ccf74f9b26f60e97a SHA512 d0d3d412bf823175b055de7a8464ad08057db06330065486c052c0e7e282cb8f81f9c4b81b30839fd2ce992d6c8932e3c3e1739c8bc6dfd3d855a1a422f542da
 DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
 DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip 24823 BLAKE2B 25394ce97a80093bcc7113c651d95fc383863a5efbb47825d053890ee2946f04ba4b9c4bb708458183b91f195133d22fb4bde840a25b6150c1c6a756ef417fd5 SHA512 cad58d0a0f37a7ba9ce7fc5d4598d511eda4bc675689f968b1d02c4b2e95d15976b6aae9d4b8655d2aa85e255308414e474fa6d42e4f49b31092e2b943648b36
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod 324 BLAKE2B 46301f4e5db74421da813b0c2d3d178417435ede42a1857da3d3af84b5ba353f10cad25fd48b777325dc33edd05f0a17b019a9f37c4e13f28e7ca5ee833c0d5a SHA512 aa82aeb1b0559b9c9b2585b8d584d9be60b6d6aa48e9613cec7ca440e267b93b2eaf67e3e88fc2faca68062792f3f6c9b03d080b6f13dc7f967e1b403521a909
 DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
 DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
 DIST go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1
+DIST go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1
+DIST go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod 257 BLAKE2B 2e5fab0b1a188fb7fffa1c9ca0799fa286f74732ceb0f45a904a3620f636af45d8b30d199cbb54ca46114aaffeeaf66bfa04715abe02711d6af46bbdba9bd6dd SHA512 4922fb6e20d2f5d2fa00888b8d644c51e1b558edb69b9f7d70a883314c3e971b6f8fc707b072aa0602d4c451ca0f20983796b65edcb737e5090dda1ffed0c757
 DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180505025534-4ec37c66abab.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-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-20190422162423-af44ce270edf.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
 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-20190530122614-20be4c3c3ed5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
@@ -917,7 +1109,11 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod 146 B
 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-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
 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-20191202143827-86a70503ff7e.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200422194213-44a606286825.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
@@ -925,6 +1121,8 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod 209 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip 1864231 BLAKE2B a7261951977aa8143153915d72e608ef263a760de7b4977a11d0d2ead32f88ad370b993ada6344556616343a700a93edce3294df354f93d51214cfe888b97836 SHA512 1b7237562a92560aedb2527d8242b46c5a421488f638c0049812ceed87144828ca682bc4eeb87869db947479ac9e1350e5abbd31e1ff3e53734d4ea25bf5c27d
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip 1864871 BLAKE2B c621f8aecb2a2732dab3954a1c74d8d657ce336ae195a1c81f2e4521069a8afa0e60e1e204460b922474dc17ea02ea5f5a7cc08902bb2da49ee7a4cb0e4e9d48 SHA512 3a80bda483d8e3b8297b09d97c2a199b132d4f932485fd30020ee3c9fe9ad08c1d2793a3cdd749f3d2731815713bdfa40c6a50234ff991392db7475d2c45abe2
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.zip 1874722 BLAKE2B bf7accca99c66208a9fed48a6cd003a5e29ba78bd28c836b5eeb0821c03a0729bc3b72177f249129f01292a4081731716b321e87dd577b9224aef22f081de179 SHA512 0f8c0643a716a7a84ed55906d7e5036ac99cfb0e3130486bd300e22fe942b825be6a46b6d217129232a0bd9f9fab98f5eca423feb0573ede7c23aa708b64aeec
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
@@ -953,6 +1151,8 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAK
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip 46110 BLAKE2B fa560c7a47a9724e278b64c4c96c4f28fbc5d1163a8e919f4e656527871420139d0c521172d9e7bf22401a21e6a0d4a802df9e7c6326f45d159138c5ec46b780 SHA512 393b1eb08da86deb3931b57743706b705567979f1e5f5b72520afa4690ad325ce6ae885520594683e510aa26889000fb5c042654612d902de092f29cd6a65786
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.zip 46224 BLAKE2B 6a3961daa35b847f0bd943fba549cf89b69af80881d5de257cef88ea147f4f903598ae9e36232c00bf192dcaffc9375ce99854fbf32f897c81cb55dc2c31f7d2 SHA512 6a0f52ae48069a22d899047df2c2dc8b33ba053a5092eaf4f5b5dca59b97c38e189099918a725746b09fe02de5d68079926770d5f915424de223d2d4406362d2
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
@@ -964,6 +1164,9 @@ DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc255
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.zip 139933 BLAKE2B 5a70b231f8ab087dbdc4e9d5966dfa7541c323c017ad4ebe8df082ce16f4ce25471ee48cc730ac0a75d52c9aedd9291a061c4456ccfe5436fc746d788eea94e1 SHA512 10a20cc5cce448963a6614e0124c3afc5b81bc183fe20908e23738156f122b3f7d43be099fe7e03f7fcb21c2ad207e33cc7e6dc5a9a0b3b43d5149dbcdbd8613
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip 141789 BLAKE2B dc517e61f7a9c895d827ff139a36b319c7dd335e85755dc394d01ceaf8b3ce07ef13201bf6d704c31895bf7d91c15acbc4ac75bc8cde065ab4f81839453e0c5c SHA512 6376ecdccd2eeaf828a2c1f560e116c003caf5e09fe68e94a37d193697c93b18bee14abbc06edca93ca57a924f9b270bbe1792df84a7bd66e3641ce6aecbc9b1
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-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
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -988,6 +1191,9 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.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-20191126235420-ef20fe5d7933.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -995,6 +1201,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
@@ -1014,9 +1221,14 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod 179 BLAKE2B cbbf790357e705f6b365164e871ec1a61f38f08d3657730186e53b1e3a3d802cc0af8032be7f59252707c6d19dcdeb6f8b9ec3d4e7af74c1511bae31da54046b SHA512 22eca632a9bff1e24cdbbd1060a6c8a1aaf3bf7e06aa96b40f1848877cab00b8687309b9466f703664c4988264fb5a62ee99bc216038bf1096bc21fa27ef988b
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210324051636-2c4c8ecb7826.mod 179 BLAKE2B cbbf790357e705f6b365164e871ec1a61f38f08d3657730186e53b1e3a3d802cc0af8032be7f59252707c6d19dcdeb6f8b9ec3d4e7af74c1511bae31da54046b SHA512 22eca632a9bff1e24cdbbd1060a6c8a1aaf3bf7e06aa96b40f1848877cab00b8687309b9466f703664c4988264fb5a62ee99bc216038bf1096bc21fa27ef988b
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210324051636-2c4c8ecb7826.zip 1586375 BLAKE2B c3521d4fd8505d4064496ce6a0a5e02dc82e458623ab8908e74c22333e74d43ab8be05c1715c0ff26d87b1ac7b506588b0c86b50ff78878bfe87a1b5522f1bd1 SHA512 27e7107aafe9c85884e15311eef8eb150a3560d70288b09030a1b7cb97dbdad2363c68e8eab1356b9619b01d6f001518c3901d7c6dbc82f50ffecc7e43c9051a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210421230115-4e50805a0758.mod 179 BLAKE2B 2135d571f5bb527c3cf3d22331821e16d21056ec63a2d8aebcd3bb68e87fb0328e969033bf8bb2dce70b32da108f64c835e053573cc3cd106750002c8d2a6733 SHA512 8b16ad94964bc1b28050bf95ca76b62cd7ca122b3ee05aad01c420540261e16f96f980fec33b450ac47c4b594949f46889bbe3ba6fbaa72930f94efa391d6d12
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210503060351-7fd8e65b6420.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210505214959-0714010a04ed.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210505214959-0714010a04ed.zip 1563787 BLAKE2B dacd05c5aa5769245e305f6a1909d8db3c9aa2fba479965b620ac2e093788f586e57102df3bcccfde8d4a8c13cac4a714c075506ffc5ff9146b339562d7b72a9 SHA512 5d517a263e8a7ec74a84c6306596a26f434bdffa85f3334c77665977a3f8f9359eb21720f1c9ba47f8a253ecc83efd725cacc5301df43948d17dfd1315120dd9
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210610132358-84b48f89b13b.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210610132358-84b48f89b13b.zip 1566855 BLAKE2B fd52fe25284121bed79d1ebd005a9ca4b2311414a34abb51b91873a6538fc30a64491e82a0b383a81010dcf64490d1cf3dc34461ebd8fa55e36d43b71d2e7cc0 SHA512 0029833e5edcbcd923efb82021f51c0074085e9a20ffd7678f3dfb6661144df1ca29393df45a2fabdc079f599e2a49de70eaf697a1c83b4858cfa8db9147d20e
 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
@@ -1032,6 +1244,8 @@ DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210323180902-22b0adad7558.mod 167 B
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210323180902-22b0adad7558.zip 130980 BLAKE2B 698c5b2d8407f8940d27bd3fed6e8d1e84073114f484e0d0f8788b9b323278e1358ec370976ed48f504ae0e0cb41fd14ec47bf973119feba3c465a1c34e20c36 SHA512 c5e8d37409cc300292efe99cc63732b10bf55042dbf3f274b60d1293a311c5c8bd1ab2634d068e2cc6c59f3136aea02d0d55717a2deb333a210d89ddd4576c3b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210427180440-81ed05c6b58c.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210427180440-81ed05c6b58c.zip 130229 BLAKE2B 960bba1d4984344578309e2a99a83e0e83f884eed2d622901d49c59659301c5e7d319f972daf65a8563f01a8ae36f5aa4a637c464bbedabf0170a804b71dd34a SHA512 8aa99ae68ac9c7fa59530f96109fff5b1cdcf09695aa5981fe17e36d873cb0700c005b9218fcdbfa3e7351e1316f55f243d492dd27cef31d3cc9c572def9ecc4
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.zip 130280 BLAKE2B 059657166d467838c995726802e70dd5b8937ce28d20e13551e26ac1ad82f95b5e2e43eafe1dca541b532599e634b82c490b5308b3d73fa643da8d67b8a85619 SHA512 24239f223b233ab07c98dca5db08f569230403e564843f043fc7bddc82fd4ffd21c1e576bd97f4a1c1b462e47c9275cb59707a003c4f68b7b2af477b2c6f204b
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
@@ -1045,6 +1259,7 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -1053,6 +1268,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.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-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -1075,7 +1291,9 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -1117,15 +1335,24 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.zip 1668149 BLAKE2B fba6d207700d62a3966569ae0b1506c69eb56b4e6177edfee503e8cc36094671c418edad48265cbd14e9c71cb50109e491908f42319611370b80cb8aea5d7bf7 SHA512 991e394766c3de8b70e8078e0173d4763ada985ab9dcf33725fca4faebde461e7592ca66b5e077c34039ac4ba6643a82fff174edaaee8d4ab309bf915c5255b5
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210420072515-93ed5bcd2bfe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210503080704-8803ae5d1324.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210503173754-0981d6026fa6.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210503173754-0981d6026fa6.zip 1696196 BLAKE2B f50a036ced86c4e2344468301c5cbc754b9fd75162bf610cd1765e452f0e2b0db5bd22e198c42079c5b64ca93d1a1f85eb7d5c7ffa59d224fe3fc5470b81979f SHA512 1130c1be393f73bd9375b3c0d00740e402101cb4fd8b8e321218af909a96ac821e377ed31eb182aafdd4bb3fa7ab73d5a35f2afe8e3f93fb6befec4fac34880a
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603125802-9665404d3644.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.zip 1644123 BLAKE2B f0bdd5627a676ea72767542669e8d0ad43ab0fd82386c6fe08da83e60a478c46d3899843703f9026cfecd416056d8dde242954faf5f3134f2b975dc8e61ca0e3 SHA512 ea2b0c8163b22097a9e6c57c9d2dfb75548f2b6004a775a6c97fceb1d2e3e1dbd4cb2050a36cd4e1e9cd0386794d7bd3a3b6b956b8a55009217b06e9b72f64b5
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip 23281 BLAKE2B b2fedb31c347f2b5b8bc3c0311f5078ab84359736379206227bd7ad4378cffb67f39cf078707a7095ecfac3c243bbac54b64cf41375a4261fbc9af9887d134de SHA512 267fab133c0ae306a1f484d17a9c3bc7bafb1ae77df3412ea4047de34a940b6425524a93b7b41d010cbf32160482fa3a370f93654e4ff73b6d11e45463bc185a
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip 23402 BLAKE2B 03ef6b566c4f9539fe7310adff76e37bac4e3aaf32559f1a228690195207530ff68ad1179b22594cb7a62f9dcceb41631452052eb8bdab852848ffa1e19c0fbb SHA512 3aaf366b00d38d9dfe1ab23a0c6df05e2fb586f44470ec9b7cc59fc113cc68567a4102352b4a416da137df619b44c61e28042124cebcc525e3c6ebf10f8fbff2
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -1140,13 +1367,17 @@ DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAK
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.zip 12060 BLAKE2B b2dde82c9b26a012e4c7047d5a267b4b6b78cf510a292dc98cd26bc9d58ca6c9fda4be3df63e687a0560ee44a783a5610f75764f80c1e31a88227903eb6fc0bc SHA512 f90053946276726caeab58ba23b298a9c36a576c0450ea558c35edcba87396d32318f1257fe39285dc30137e46b7b0a588d7231a4c1b6a4cc59eb2d22a3bdf01
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210611083556-38a9dc6acbc6.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210611083556-38a9dc6acbc6.zip 12062 BLAKE2B 67e76057d8491b9c7da4f609625c12899c4472c056ef59e53425af9b12dc8ee6b3ad943dd27677c50bcbcc609dc07d4f61c75d599bc3632cdc113d1d02eafb25 SHA512 223b651a299338f0b040e9d246f27194d879127eda10afc46ce47960347bdbabb84fa12684d0d25fed782e963569ac705e12ed0d85aeb229e709d5ef467ff8f6
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -1169,6 +1400,7 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod 155 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-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-20190813034749-528a2984e271.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 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-20190907020128-2ca718005c18.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
@@ -1181,6 +1413,8 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191203134012-c197fd4bf371.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
@@ -1193,15 +1427,18 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304024140-c4206d458c3f.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod 271 BLAKE2B daceb2d4e388208a2619f2476085e0daa6b6546122a32355a3e005e6ac51ce72069c959a72c76078dedf82201fb217941091d3cc2b1bf4be8c77949b78ef6cd5 SHA512 c2c79e2a50a05d79909d58a13703e35f9cc9cf209be9593546c84883ac272e4e31a8ec9b2247d750b7cb42b088ad90214279c04b83a48173388fa13a71b6572d
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200422205258-72e4a01eba43.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513201620-d5fe73897c97.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200721032237-77f530d86f9a.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod 270 BLAKE2B a160bf39c4d5efcdab43134808910d37ca9029684c921d91d4dea4e264bf24b592db0f063029f1c0b50e6dc8e1822394503b7acba305a82330371bf9cb5f2017 SHA512 9124d96cde52e0dee04886ef164f35a03a7c05b11398d3667cf0d28f84aac0bb5b44a0f52343033d62886ff62728cbdfa045e5f865c1d96203844f3986f95957
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
@@ -1211,6 +1448,10 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod 270 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod 323 BLAKE2B 703b8f1e36b74c6bea0f942558045ef2333c658e31a3b4c2b7924c8e436c31a7d596b60587027f7605f65f8fb20597e0a7e7628f0ec2eeb423f3519870d8e0a2 SHA512 13d4c5dc1bb206cae17c38b6e387386573b402a3679054c12a53acf384e15d5d77ebbb77ad374993b1bba547faf34f4189fe5d77b80d57f0831dac1ee54a98c0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip 3276723 BLAKE2B 12b3291e8ce52a94677d56ad3cbf020f56777301c8b308b1f05189d346caa6395e8a0e177efa226e15e6e9235c1e387031d34cf61b08b4fc0f3769d65120ded1 SHA512 e1beb4466d35acaf836e0a8f015177e44c346f4fa31599a0b022cb19cf7b6623a3d3efcaf9c00114cd6f86a7634f19c14208a8a48ca3adee780da67964a60b57
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3.zip 3474807 BLAKE2B f22664f8b9dd5afe1ad3b5e8f908ba48fe4f236eba59386f97c8f1959e8deeec092c363a2ebb98556cd50f01cdbe4fd5b463990f3a41c78af47ce8e7262ddafa SHA512 eefd96c8081f7d70c453dc97b8f11e51220092a53b82c13bc2ada634f42b261f77a0fcac13dda86cde771c99744ccb536bc1be610d68e8cb8030f5fd2d02fc2f
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
@@ -1243,6 +1484,9 @@ DIST google.golang.org%2Fapi%2F@v%2Fv0.42.0.zip 20478543 BLAKE2B b23ec99be933100
 DIST google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod 554 BLAKE2B 1762b991f8e9106a131452afda7303a8483cdd0dfc6551a97f4fbeb8e6588d4adc03b35972902eb6c86e2bd759d917b3de3e4354bd4460d6fccf8c83e31b7726 SHA512 d5a9b88edc13a0ae616c249beca3a712f5db2c643ef13c771f22e64b81548a32b46aa19fd87507bb27b385a9525423f586157bf9efd111d29677d38f02c85908
 DIST google.golang.org%2Fapi%2F@v%2Fv0.46.0.mod 607 BLAKE2B efc52d22ea37954d9f356acc14ea2e6aeb5970e933669b7ec51bc31323a5a2c1bc2628a641daeba057ad980ab3e59213f2dcda2a78106a66e01929ee46ac4706 SHA512 1611a6051784ba7eafc66baae39698e265139149685b8751f94a2b750b4df2be681e06899da6a16daaaca2ceda0242aa178e62355c0aadc7d428b4d058f2e752
 DIST google.golang.org%2Fapi%2F@v%2Fv0.46.0.zip 21480176 BLAKE2B d29e7a7a23217aa289dd61663d484db44f3256df56a92733ebf0c2820b8423d1de64d47fbe5138ad01d4607e72da9e22ffeea528e04cc6f41555729313a8f723 SHA512 b9cb92c2fb2aa6ec47b8455f653e69d15d62eba43019328848823d42fbcea62d44bfb2bc3a7b6bb82e964821e035b6621761a7d210e37efe878d9628a33fdb1e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.47.0.mod 661 BLAKE2B db842ff2a2911217bea521a84017983a98a9cf6b95b804da3abab14a8dc5237e722d7e80a0b1e196998de65b86e64fd34ea363bbfcc50ebfbc950b8c5e537e55 SHA512 9b7bd454c604432874fe9647a1768157bd384537992fe62bbc7a72e6feff614a4d33a7fbf89af1961ec71258115498980dabbbb040e7faebd9ef26a8802e8e31
+DIST google.golang.org%2Fapi%2F@v%2Fv0.48.0.mod 661 BLAKE2B 107ccb932948c454c8634c03a423ddfe3333c607fd82252be8d47d2081f27bf6235cdf6c2723ee799bab6dc2c480066739ed57782536335b419ccee8761467d3 SHA512 72192b22a77ca7c06873e9238461da5f9457a9901d7a269d1bccdf9749c818f24d2db7f007398fb2a0b197fec77ec186d8cebbcb8124ca24dac749248277a685
+DIST google.golang.org%2Fapi%2F@v%2Fv0.48.0.zip 22040610 BLAKE2B bb6677cb1d92630152fe85f545c079181939758cb1c13e947e1e018e7bd2d55850a1b0500a0f0f5f9abe76b57266a3f9f2ba15c0e25d2667368e6669772d2451 SHA512 be7f80758e5fd1eeda238ff07099b1621be34fcd46145f5ea20c5baae1ec1f3f427f23e7bc76c038c0e99bdc43ed84bfaa2e083af393d806e27bbd450ec6f806
 DIST google.golang.org%2Fapi%2F@v%2Fv0.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
@@ -1265,6 +1509,7 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190716160619-c506a9f90610.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
@@ -1279,6 +1524,7 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200420144010-e5e8543f8aeb.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
@@ -1300,6 +1546,10 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod 408 BLAKE2B ffa3c2000ed843b4274bfd1c06aedf4c5a9aa1fa9abbe06f96c2c09fb1ea8bc18e451fc226097659f5da5e603a67d00aee7d31d7bb7db22614de0c99950ff73a SHA512 c6d892fa8ab198a921437b1b017a9108e516f1d91a79b3fe0c39b674d19aa74385c30ae9456fdd1565c6c6308ce1b811d7b49db45e3fdedf1286aed38c1c48b4
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210429181445-86c259c2b4ab.mod 408 BLAKE2B 60b36881020cdd512e1981a98fffb1f83de54dbf69a6d55719e86995ac322d80c6c35f5b84d7b7b2346804350a50b023d23ea7dcde89d45feded023a90a0461c SHA512 8d6f7f28525e6ee67df587c2e013821259261f6dbf0a477dd26d0147aebca87ad0ad65fb662a37042252d2e82714f9c9e487164b74e67ad25a92e232ed9e5bee
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210429181445-86c259c2b4ab.zip 10542627 BLAKE2B 7f8d9309e649558c184044d747b83097a5b811ee3cca8b6975c4df9805cc19428c96aeaed2970fce955192a1450639a8b32f8604a071e3185a158c1d4af1d163 SHA512 d47a17242141285449c1e972ffd5b3fe193afeedbf8bdd33a797ef8d88fa62a5d448114f806ac0054fd5bca10f0e7bf08ce073644024bb19b53a74b2ca79709a
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210513213006-bf773b8c8384.mod 408 BLAKE2B 60b36881020cdd512e1981a98fffb1f83de54dbf69a6d55719e86995ac322d80c6c35f5b84d7b7b2346804350a50b023d23ea7dcde89d45feded023a90a0461c SHA512 8d6f7f28525e6ee67df587c2e013821259261f6dbf0a477dd26d0147aebca87ad0ad65fb662a37042252d2e82714f9c9e487164b74e67ad25a92e232ed9e5bee
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.mod 278 BLAKE2B bc29676533b5813b8383ab995cd9c117cfa3712c1a7091b504a3feb60614b704fd031692dabd7a479fef427efc584b697b74346fdea2fd6df6d09cca8efecf9e SHA512 dbc012381b6e5c891ca583f791ec02094b4d1c43f0c22d1d4a992497d5f2503fcc78fb8f119c891a474156dd8fcde92acc27e75f40cc026cd37913aa83298fc5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210604141403-392c879c8b08.mod 278 BLAKE2B bc29676533b5813b8383ab995cd9c117cfa3712c1a7091b504a3feb60614b704fd031692dabd7a479fef427efc584b697b74346fdea2fd6df6d09cca8efecf9e SHA512 dbc012381b6e5c891ca583f791ec02094b4d1c43f0c22d1d4a992497d5f2503fcc78fb8f119c891a474156dd8fcde92acc27e75f40cc026cd37913aa83298fc5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210604141403-392c879c8b08.zip 11219249 BLAKE2B 938f9eafb5080bf1d2bd516cb11702befe05a5963d586a880a8f46a3e8901e21ba80d4d8eae6acd3e8964911f3c4edbe49f4b944c416a7d27e6a3029b2a11e58 SHA512 d59b0e2de40f862759ca1ef3141f96959f6609a39b04fcd33f3f4b76e2f6f576cec377ad7235ffbcc4eafb7c9ee8f8fa0bdbc1257278604c4841abd5e9558161
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.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
@@ -1309,11 +1559,13 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd00291
 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.24.0.mod 771 BLAKE2B ec4ea0b34d044e7a4dab50109d3b4e9b0081c538bd568155c4aa7a6370dd0ec31a18f3d1d294ad87af95cd58f2ac885026d07d43d21df1eee2c926dd4d8b2712 SHA512 b6c886622095b3999f108230f6cd3dddb72157180b0ad1a539919289b2e0c8496ebfaab369d65e83d6fd6eeb97b618b49a834c7ad3b98afc996f290d49c936fa
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.0.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
@@ -1326,6 +1578,10 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.zip 1440855 BLAKE2B 7f62b8518bf7a18
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod 608 BLAKE2B 01e491f455fd8b3faf2dabdc8ba3e343c67461f3c58621a9c63575940474e3b4346e4eb1c8f260e78f3ca7cfecddf54f7656f590665d3596e6af1391974b284f SHA512 33faa853ccdf8c52a82c9c44e4b5f2dae76e5cc2c1e8227036f8f5fe7f1b496066fa72a379714491c6d2ac14e0ea8fe5419dc0a1626f9e60933b897903377b45
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.zip 1542670 BLAKE2B 47684b1978848233b02b390aea6e30880d5a34b57395a718abb39b35241e6cfe3b0b0a27b743c50e15bf48833ff08405a50dbb5c7f985c8e1fee85b6fcfd4aa2 SHA512 d39a4110640a15a48641d960aecffe1cff432a0bb40d3f740ee1aaa9c5227f940a42e9202d9bc707b145b4598fd6c81239cf9d04cdceece815baa8dea8e00947
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.37.1.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.zip 1561437 BLAKE2B 6d0db85a058df199dd8237906082862bba5de66e2c6f92e01e8d90a6473100a0a9075b7239be96495457d7b822b67ff84b9f00d6cbcc4cc2f24dfa3dd0977f4f SHA512 197022bcb7846cbc2257410b6bf0f1b64592e889b222633ed6c3cc3cc9efe1ab3ea36e57b5bd8fa2cf72bae75271821888e91a354b3cf57e3932f05a2bb8678c
+DIST google.golang.org%2Fgrpc%2Fcmd%2Fprotoc-gen-go-grpc%2F@v%2Fv1.1.0.mod 105 BLAKE2B 1fd1c6f20bdc1fb0a8a89ff7a9dd787d9c69a81f87249f44edefefb5bd1293a513ec4f7111be0df03044b54e42426b0b1083a24c76e50fa96f76aa393334e78b SHA512 e5e455ab72efe80c6d130c4631162f2d42690edff30064c0314700c8ce9d3c77b14554ff1b398aebb940e6501bef102af78a32e05b424b3b381625ca7d5e7cd0
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
@@ -1366,6 +1622,7 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
@@ -1386,33 +1643,49 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
+DIST k8s.io%2Fapi%2F@v%2Fv0.17.5.mod 505 BLAKE2B e70839a7271e9fdeeb44eac22455fff10b012833463a05ad838cf54ff4407d2fa610893eb1b68a4f9a53c2e68271ae4293d9e0809c3ea4654a2703c5f448517f SHA512 9f3d8e696878eed99ba9a6a89b01ef3f57728a4d371297bf517f3e83a33d9cb0c85fe1d6e3c3747842e99df86946696fe26fef50565887a3b2f3d7f7be148531
 DIST k8s.io%2Fapi%2F@v%2Fv0.20.5.mod 250 BLAKE2B 35809dfb793951f48d11e32047837c41deda9b75003c296c903067524edb388ffb14932ac01ca8a1379db847002683f7bfe7d8b6839bca0d063a7178b7acb7b0 SHA512 1d4a9d6ccd66843cac43a77bc57fa7d88ced194ca50792be383703ac9c36e32854cdfc9f642e0c1a7c11e4057f2929239431ebbff7de443c25b73aadb0de7994
 DIST k8s.io%2Fapi%2F@v%2Fv0.20.5.zip 3872967 BLAKE2B 94680d2c294efdcf6708a5dd774d32b073e11de91e0a341f048a8d621d2c690be115a2df7331a33251fcfe61d96a4d3fce61f360070ef5761717cddcb287084e SHA512 6a44ae7e35ea38b68c6eb0cd3f579d9826bfc7fd278a77c61c793676f857f8ec249a9b44b3b4a423596d40acd02547cd70b1ab13179c6a19b6822732d0d3ae05
 DIST k8s.io%2Fapi%2F@v%2Fv0.21.0.mod 250 BLAKE2B 0eac946e686083ba1022f9c0948284324ce598883bb4a2f6f459c1bc074996e77ac1453c7f4a5de7442af929755fefa1a8a71f4a1f1083ae868b1633f06f1394 SHA512 cd03e70eece77781756f4e1022c02a8a1c4912edcf8e47c1d8cd8e65ab719eee29cbaf06e26c36c1b04ac8f698724be03e16c8d1516c24c0122d49c0c6367f0a
 DIST k8s.io%2Fapi%2F@v%2Fv0.21.0.zip 4845407 BLAKE2B 42553a209b557d800d33c9bf75d91a90a25b1e73b50d07abede90945abbc91e8402ac48d24ccea2163bae820a382758c1fff5abe9336ea5df3070d9e34a94e3d SHA512 0b0fc2c18168ff193e9eb809a5c48a8dc36bd5982b9d110de5214219361c33f0d2c1d76d0a29e03300ed75669b9da5c98ddd804aca70f3fcd63bda3b22792bd2
+DIST k8s.io%2Fapi%2F@v%2Fv0.21.1.mod 250 BLAKE2B 26936d5b217786ad546f5a47e58d6303703da39be2b5c14c2b0086c74c868c787aee84a8c8092b33b0d92c7b61a4fc3b0561805eea5325a4ef95cc322a7a13af SHA512 630c02430eb68e1eeeab7e37a9a010d9f6b3f9277b65def77d20a5dd05f54efec822890fccc14ca3a99b84849deaa74a6c5d6ef28c9b9f8e78fe5e4a24b73070
+DIST k8s.io%2Fapi%2F@v%2Fv0.21.1.zip 4845450 BLAKE2B 71c4ae2eb1bf5f067f9e082d4d310c0aba6079556c5d01986a2fe7b367ce0caeaeacdea46c53f62dd2e5b5c907ca4364a817e19027b93ca92a13ab5646a03549 SHA512 e56c79bfd394ef93737329954fd2dd4afa38cf1f390fe72392583805ffbeccaf5a287d5e9132853fa59ba565c9412d9e1d7046a1f5fc45d681f0fd9e48a76e6c
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.17.5.mod 1618 BLAKE2B 7eef1d0d68c44090c14d4b18d6ed6f954ab09b1c2be861a7cadc856f8cff441f3e4e29e524d95c4fd162065852816ded3694d8150076db915e3f346b51d0cde0 SHA512 28abb1ab0fef9e346d4a05ba1d478c59baf8e73238b8bf71e90844a4c97945f82a2b1867e582116266bfc48dd9f7e8195dee66c032ef16a62e6f99b170892458
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.20.5.mod 1477 BLAKE2B 9093190a164cf46f5342b17755d15608ea7e75253ba12916153c03e69b311a879810dd52b28763b3f75b9ebd31c26bc35504fdf15da30cc68d35c6d5ae063a86 SHA512 957f6ec445363e9e13c972c951c65b7932708bd460afb42b08191740bb1e0b1547aa4f6e3a34031962753497cd079e074ec8a462dd8ed0953e434df36a7128f0
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.20.5.zip 802582 BLAKE2B 0a4f5f8ec7f7c2933e203fe16bde075b9074eb2b543d96df98aeb7cd8408c69037a970ed4211c6b8bc0ab1225e3a0c59f8b4be39a233b7d2a63605d5477d9904 SHA512 0faa24bded9e229ea0b6ff21400130042ff8835cc9d391fe43b0c3b0bc1d32f3bbc04e76cd512bc3edb8497d6285105ff877a186bc4793f0b7adb4c9412aded2
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.21.0.mod 1509 BLAKE2B 94ff3cd51f91ca0c359f52eed219a1ff43630d307a03569da812ed78f14091c68344449fbedac673c26d061961c1369abc7266e7524b6447c1820ae9dc7dcf7d SHA512 cbabe89a2add06e9c2b1aa080808f260be9a823cd6054f08c4ad2418ad5b158ea46354118e9aa222fddd4b93a4bc0299af2c638b661227f3dc3282e45f59f912
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.21.0.zip 809629 BLAKE2B 701a56c0b38bd3182e041b3fc6c4f5649a56339fe3227459122b4769f5b2eabce5443af3f2b84d7b02ce37cec9c22805faa841375a971b17c0447a2884b0866b SHA512 1ce5b4782d6dbd29f1b2b4577c8b0558f8aead3f999640dedf951af3ad0a83b05876a3025635e14c18ed01644107301ab37021368a936f5ae451445c962f0d5d
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.21.1.mod 1509 BLAKE2B 94ff3cd51f91ca0c359f52eed219a1ff43630d307a03569da812ed78f14091c68344449fbedac673c26d061961c1369abc7266e7524b6447c1820ae9dc7dcf7d SHA512 cbabe89a2add06e9c2b1aa080808f260be9a823cd6054f08c4ad2418ad5b158ea46354118e9aa222fddd4b93a4bc0299af2c638b661227f3dc3282e45f59f912
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.21.1.zip 810037 BLAKE2B 534e9750eb33b7ca649dac3ef80f554fe969bcc573087927929be2451ccb6d0a24157a3c27cc66d54c2cbe43298b0f64a7fbb8a8d035dba71ec0d0bc7a9aa7e6 SHA512 b0bf4b7f6ae83c93df43428b96e50d4e4b87ebcb3ac1dccdf3eaa532ab2a4d06bf7f1acf2eec779d431230d754cc37649a3a48c62efe2f115e31ab6ed1b26af8
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.17.5.mod 1649 BLAKE2B 88eabe9cc48ff5e032d8ae557db749e5bb9905ed2644010526466e226f5343f0b4215b84a9cf7c263f947ee1508e14bbe96963b23b7dc7e559fd9744a4ba897d SHA512 9010d9e76962393decc2df30d9154c9cf15948aaa07c6a2f364956f63fac36ef9b613f9ef1a94fa5914de09ba89ed9783a505ab6f61689c43abab28cf77edf21
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.20.5.mod 1273 BLAKE2B fe19bcb42b58707ac1c898a89bc78715cdacaf03d55b130c7947ac74aba05fcb03afc569cc914e5a0f30148c950f01de6ac70edc54925c4f09195e47f7d918da SHA512 a7478eec33bf58747acfc1ab1a880861894b94ba35e41359927112771d51aa0356fb29e7f65600ad4b2a54984724c41b0fb070fec05231c739b2be6a9ea36bde
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.20.5.zip 1723428 BLAKE2B e98d244968e0b3856504dadc85a92ba31f2207584bf6e372e43829e6a5dfe0dfc63ded47c566682b358ea4f363d0a237323240e455afe40fc8c99e1449803ed6 SHA512 733bb2a395dd94805e0e6e5cf90d5ea1564462a192ac849a9ca444d35b5493144460f44540f726824d8db472940837e5caf70e336e0b4e4e6baa5a80f8f846b5
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.21.0.mod 1385 BLAKE2B 2f7ec1aad8197c1267eb4c43a27cbc538d2ba81d783688f1635a654ce8a6f1da13b9972b9251eb2015ea833212bcbba84ba33abfca13b22d1f21fb9013313f5a SHA512 44dbd0ec2508f71e959e526a0f9cd4bc333e4a72be0b7fa9a9fcceb889b286839b9ac00f5443ddabe2981480044e79df4825d7984cfb690844796a8f77dd8469
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.21.0.zip 2599069 BLAKE2B cc267e340d85b5887012b03a8809f48e0e6d53cfde8f5889d4b24cf1210185625d01c0015a23ecb1233e92a17e61bda8e2e85c46eb147787cd6e17d023ab0c22 SHA512 ac6e4f5a3827553b77337d81dc4a9dd60d67404ee4dc832b4036348845022600c8a27d63f0751b390162fe0f6787fbf3dec9a2320217dd07c037625502276d61
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.21.1.mod 1385 BLAKE2B b73dacd31a7ab3aade3f22e8e666cd6d13d259e87480a082debdf6eb2d129cb92a0029e5c1d364a7279bf00462bc14bc541ffa4bde87facb5c71f08c261b4d32 SHA512 06f5b3da50cfcbbd00c3d88d2017ef052280d0d4f99f860cfa138ed73465e690027718c3f8f9e5b0e3c82e2162ba360c8130317829a96b2e122468f336e33346
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.21.1.zip 2599170 BLAKE2B 0043d6038474ee8bcebfbac81a89429c24332867400b89d296dbb34701dae0c4387d1ff9d99058f30be9189cf044201e560e062c96a8c0f126320770655724bd SHA512 51ddb6dc5c0f80e2e39d17a9a701abad0da1a68a4d947ad3e4d325a1957b3a595fd3895bc9c8249c9ef54d1fabb58a05d49c6444aa82223b87c93523a01ce44f
+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-20200413195148-3a45101e95ac.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200316234421-82d701f24f9d.mod 1715 BLAKE2B 8d0c03b03287eef4c06d0900889a1c0114814c6042ab2662478721e3d7c6ecef2d61658442a60863bfb64614a0a088e9331ee98070e67f0a8fca0adae5192d58 SHA512 4343731a4d790302f06453a015b1d034418f8da94552fb9e5bc1392deefec3af673c53ca388a3c55e8f9d8620364539fc44792c5225e30a50709c8cfb2e0401b
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod 1277 BLAKE2B 931fd6a123ccb62fee29d795690f778a4d39c8f84159bd85b80ff0d47f92d298985a6620eefece9c4c76d4e3ed795b4aaf8dfe6e53ceedebd68095a373fa2af9 SHA512 746bc18de0a8a3cfcd1707a3e6b01055a8e29dc2bebb6edb2a7abe8709c13199b288da6107ab3a85e35338a1b3c15eb73ac8f02243579aac0b9c4fe76c8f54fb
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.zip 1002101 BLAKE2B 3ffce7dc81c73dc390b68e8ee35a68b125880bfe214e0ac3acf6ec9dffd180b430951f4972c53a5bdbcb0012fa9a165870ba4316252ac90195e9fe4e358df1c5 SHA512 5dc73a20de4b31f0f93540f58d0c7394de26c302298be6268529ea2928f18d3f97bd33e4ee02cb4a8c14c31e798f694414b8ecbade75e1486206d28c1b8e265c
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.mod 1218 BLAKE2B 381df39fe48c112be512fb3c954797c40daa45f05cf5afcae61333340f125edef6d4261d3462022f02211b82b5840e845528db3a2eedd8380727e015856c8d8a SHA512 cefbc18554b31bc93feb3722d3af94dd84f1d363306b8c3f78e39465de2d51212d592b7bf97e851317fafc45c0efb20c73224be89d5f5bcfa756f0169417fd7f
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.zip 1002412 BLAKE2B 4c4599fa3e545e71b10c12cbfa4b59e20201cdb8ecb6f7ef9297a09f723bddf56a12df907d5fcf726eda044c5241fdca1b356b297c5476f0ebbaaf4fd36740eb SHA512 d8b702d4534b2a2c94f556e5f96857bebef9320747d73a6b647d88dd42ea62bc5672411c321d2e50f976a11aeeab00d8f36fb0defd26152f235bb13350b1dc2d
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip 166996 BLAKE2B 210f1ba6f4b371b8216157d219b23dfada39ef76a86152d10dd34673bcd486dbd93802b1d610e31c4ca794e8d2eb1744d77e84adde09277c11929937d6631410 SHA512 03eb8ba4916ec58144deb1a10f47019e127a688c7e3f87b3ba6fee85a2c41b92b6d7a9293c6bf8921b33f83f8e46be019fd4751fe6c1c98cb83a6080065d2b51
 DIST prometheus-2.26.1-asset.tar.xz 4630688 BLAKE2B 37471f1f66e5750a007e4a045bbf1053a28d0a25d2de3cc16fcf84be7250f7eae2041d382352614b94e7302cd568d434a5150f4b6cd4a0232587ba16648da49c SHA512 09d032d0e72b23505a1f662b462569c93ab0ee0457b790b7325bc754597f4dcd800cdfdf14423f656b2a4d7953edc3681c6bf8d44029ef2154b554c2be501abd
 DIST prometheus-2.26.1.tar.gz 5618446 BLAKE2B 6dc6cdd9d1466237d1238b21a3927ab6f86882a96199319e58f640b3dbaab040a676664fae3584619a35d3ca71677aafe5f19aacae784bacc772cc87f4aebf44 SHA512 b5a53b204b6295357d397b5394df8e52565094cdfc7018b658992284afde5e137e90a92accd5232c8d02ccf6bbaf88a0eadb46c24b7a1b9b02d7f387fabe5b8a
 DIST prometheus-2.27.1-asset.tar.xz 4563168 BLAKE2B d9f6ac6175cf0a15503641f9a474ce8376f324d3b12d528d6031b822aa238acc305d7f4c06ca2af0e93a22b23fa63646ea694acba8a9686e5e97e560f3f03229 SHA512 3f0ba2cfcfa56a4055471b80c9eb1ab0c69a301a9acc8286a841c352b459174c2e5ae9f4f1d94d37ce750e62114481836e0e0813f5a626183610fbb5e1eb5c00
 DIST prometheus-2.27.1.tar.gz 5646587 BLAKE2B 6e0777baaecf7abadedad36f675773320bdb1495bf4f9dae0524b1ae5a40a91cf7c88f54fefe500c6b6bfdf6836b47f3f963c275427ff9a8c641bcd5616f6e11 SHA512 5f35add37a982c7160498ecb61c62d6d837b2a66bc9e7c0c9df60909d47e4817452d38161ba3179db9c148d86d1f25e41cc7eb7d1ffb7899ac25f0d0a7b8bcea
+DIST prometheus-2.28.1-asset.tar.xz 4590472 BLAKE2B 1713c3d7fb5326ebb5782271439d3d4e98849a5f73c9d8ebf87322c002b110507a68d6d42693d20cfc0d8d136d04a738e8d361cdff43d1520e9ae4c0787ac6ec SHA512 25c6d7f4f57814f158c4e528b4040a26a85997f5dcb92d46be3f3339ceaa3e75c599cb359450f5b3f87e8c746296c93db496c616e2e91539097a870cb95847c2
+DIST prometheus-2.28.1.tar.gz 5673613 BLAKE2B c999760d7aceaaf23e813d92786ac6df34356ebb7bda5823fcb6b520b11b0c252f780d11f54eb57ff181d66da251c10d840c01550065844c976ba83722a681b8 SHA512 7e224229460cd895f4b19772f7b92570416889da84f397df69de965073e90e4a125f47d1e9eed6857fe33063a49fe70a113cffa7b38e3e83552f5ebd57a15f18
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv2%2F@v%2Fv2.0.1.mod 346 BLAKE2B cbb60864811350fd6dabcf039951b8d50580ca19d6fa13432a1d28e600968e7c9f4b205370d399adf5cf58fd3726c7bc9050a85d3947f39cc4756fb461120e6c SHA512 32aaca7f17067c7690857bf3617654b936b65903161be2a2a8869dfc3bec8520b08f79bb5cb2d4272eab46ec28c5fcf47d9d418c2eb18d032dcae3e7e7445355
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod 346 BLAKE2B f7711e6d8685f0d5323a98161f831fbe6d411fba26a6b1ad91ea656faea33eb4ffd9a1b33539b585643006d468f804368ab277db997273da67fec3dc72042ed3 SHA512 ad7e33e7a6eea993c180fe2d26dfea41511ea39e1c28f03ef681dd45e17e2fc0917d673b2a8ca8c09afe5dd832d949873b98c10968e691396a28ccd7ba6bc839
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.zip 229142 BLAKE2B 70e76301c337432c351134ebc32f723f80be1f8331b9ef80bff6d510b437f9d2ba613d40368c6170a17217d9ef6cd7b639450b64697ff63c3d0352f3733921ce SHA512 a941e1144613c7ddd2dfebac185bc65a9f68d794eaf29bccd4c8f9be209d3cf5c9d1d06d3be09a9af816d2e727f2e3ae92d22724c925ab3211afa1e226b058b4
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.0.mod 346 BLAKE2B f7711e6d8685f0d5323a98161f831fbe6d411fba26a6b1ad91ea656faea33eb4ffd9a1b33539b585643006d468f804368ab277db997273da67fec3dc72042ed3 SHA512 ad7e33e7a6eea993c180fe2d26dfea41511ea39e1c28f03ef681dd45e17e2fc0917d673b2a8ca8c09afe5dd832d949873b98c10968e691396a28ccd7ba6bc839
@@ -1423,4 +1696,5 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 EBUILD prometheus-2.26.1.ebuild 73369 BLAKE2B f6d0a801d4bcd124fe33f8c3228459f37603e08aaace895e992e0cf40e111636db055232655711a6ad3fac45a3a802351ece9ea6b496f367cab225c11d5207e3 SHA512 5dd58d1184f722bbd7c27843943238915849f55aeadfd6fd77f378e46af9dfa2e3d8ea637b69d9efdd75df292bb92ae449e3c341d736b04da685864f1b952e0f
 EBUILD prometheus-2.27.1.ebuild 74632 BLAKE2B d2bf47d1c7ccdca16d12f2cabfd51a4f0e5841bd9eadc785e77c653372906762bb3fdcc5980b8f0a6ab359184c44073e5406b7fd5a815bc35fd4892fa115b7a6 SHA512 7f7ef537a2eaf848685ab640decabcd5b7378dca3b1f39992f2ed9821ed88394a90a3bf0590a0662809edafb6a9483d501413ca462d44cec922b3a453cdd0956
+EBUILD prometheus-2.28.1.ebuild 85951 BLAKE2B 6316287e8bbf2a8d2affe5d792a1777bb603e1868785af542851a0b8f45f20e9060ed71a955f78fba19b4ce3b2cd1c00ab39517d1680172880243249831f163d SHA512 e40365870ca04528026f568350e1b7b16bf2721baea51280e92c420562c6ea76623fab0ce067d4589e59e49add49e29f9b19134020c85c5b3ddd69b18d02adec
 MISC metadata.xml 442 BLAKE2B 8f7eb4325848f5368202a3754ee05639b9e731303e3fe5f4389b47687a2c22cea3c5df32217f7685b6526529ac33140dda8ffd5b9de6ae39795df4d67a82d452 SHA512 18e47e040cb0f606d9c2d141aae7eb7e00f4f6caf9f1198204fc1aecc2845ce4f0aeeec6c49f5ffc68c211daadb4ca6c071df15b691ce2d80c7373014d945933
diff --git a/app-metrics/prometheus/prometheus-2.28.1.ebuild b/app-metrics/prometheus/prometheus-2.28.1.ebuild
new file mode 100644
index 000000000000..6143cab0db41
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.28.1.ebuild
@@ -0,0 +1,1625 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=b0944590a1c9a6b35dc5a696869f75f422b107a1
+MY_PV=v${PV/_rc/-rc.}
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.43.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.51.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go v0.72.0/go.mod"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go v0.78.0/go.mod"
+	"cloud.google.com/go v0.79.0/go.mod"
+	"cloud.google.com/go v0.81.0/go.mod"
+	"cloud.google.com/go v0.83.0"
+	"cloud.google.com/go v0.83.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/bigtable v1.2.0/go.mod"
+	"cloud.google.com/go/bigtable v1.3.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"collectd.org v0.3.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-sdk-for-go v41.3.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v55.2.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v55.2.0+incompatible/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.10.1/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.12/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.19"
+	"github.com/Azure/go-autorest/autorest v0.11.19/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.14"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.14/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.1"
+	"github.com/Azure/go-autorest/logger v0.2.1/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+	"github.com/HdrHistogram/hdrhistogram-go v1.0.1"
+	"github.com/HdrHistogram/hdrhistogram-go v1.0.1/go.mod"
+	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
+	"github.com/Masterminds/semver v1.4.2/go.mod"
+	"github.com/Masterminds/sprig v2.16.0+incompatible/go.mod"
+	"github.com/Microsoft/go-winio v0.4.16"
+	"github.com/Microsoft/go-winio v0.4.16/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/SAP/go-hdb v0.14.1/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/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+	"github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15"
+	"github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15/go.mod"
+	"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
+	"github.com/antihax/optional v1.0.0/go.mod"
+	"github.com/aokoli/goutils v1.0.1/go.mod"
+	"github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod"
+	"github.com/apache/arrow/go/arrow v0.0.0-20200923215132-ac86123a3f01/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/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-metrics v0.3.3"
+	"github.com/armon/go-metrics v0.3.3/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/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-20200108200545-475eaeb16496/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef"
+	"github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod"
+	"github.com/aws/aws-lambda-go v1.13.3/go.mod"
+	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.29.16/go.mod"
+	"github.com/aws/aws-sdk-go v1.30.12/go.mod"
+	"github.com/aws/aws-sdk-go v1.34.28/go.mod"
+	"github.com/aws/aws-sdk-go v1.38.60"
+	"github.com/aws/aws-sdk-go v1.38.60/go.mod"
+	"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
+	"github.com/benbjohnson/immutable v0.2.1/go.mod"
+	"github.com/benbjohnson/tmpl v1.0.0/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod"
+	"github.com/boltdb/bolt v1.3.1/go.mod"
+	"github.com/bonitoo-io/go-sql-bigquery v0.3.4-1.4.0/go.mod"
+	"github.com/c-bata/go-prompt v0.2.2/go.mod"
+	"github.com/cactus/go-statsd-client/statsd v0.0.0-20191106001114-12b4e2b38748/go.mod"
+	"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+	"github.com/cenkalti/backoff v0.0.0-20181003080854-62661b46c409/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+	"github.com/cenkalti/backoff/v4 v4.1.0/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.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+	"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+	"github.com/containerd/containerd v1.4.3"
+	"github.com/containerd/containerd v1.4.3/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/creack/pty v1.1.11"
+	"github.com/creack/pty v1.1.11/go.mod"
+	"github.com/dave/jennifer v1.2.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod"
+	"github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20190329191031-25c5027a8c7b/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20200911182023-62edffca9245"
+	"github.com/dgryski/go-sip13 v0.0.0-20200911182023-62edffca9245/go.mod"
+	"github.com/digitalocean/godo v1.62.0"
+	"github.com/digitalocean/godo v1.62.0/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/docker v20.10.7+incompatible"
+	"github.com/docker/docker v20.10.7+incompatible/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/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/eclipse/paho.mqtt.golang v1.2.0/go.mod"
+	"github.com/edsrzf/mmap-go v1.0.0"
+	"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.2.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/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+	"github.com/foxcpp/go-mockdns v0.0.0-20201212160233-ede2f9158d15/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/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/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod"
+	"github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod"
+	"github.com/go-chi/chi v4.1.0+incompatible/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-kit/kit v0.10.0"
+	"github.com/go-kit/kit v0.10.0/go.mod"
+	"github.com/go-kit/log v0.1.0"
+	"github.com/go-kit/log v0.1.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.5.0"
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+	"github.com/go-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.4/go.mod"
+	"github.com/go-openapi/analysis v0.19.5/go.mod"
+	"github.com/go-openapi/analysis v0.19.10/go.mod"
+	"github.com/go-openapi/analysis v0.19.16/go.mod"
+	"github.com/go-openapi/analysis v0.20.0"
+	"github.com/go-openapi/analysis v0.20.0/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/errors v0.19.3/go.mod"
+	"github.com/go-openapi/errors v0.19.4/go.mod"
+	"github.com/go-openapi/errors v0.19.6/go.mod"
+	"github.com/go-openapi/errors v0.19.7/go.mod"
+	"github.com/go-openapi/errors v0.19.8/go.mod"
+	"github.com/go-openapi/errors v0.19.9/go.mod"
+	"github.com/go-openapi/errors v0.20.0"
+	"github.com/go-openapi/errors v0.20.0/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/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.5"
+	"github.com/go-openapi/jsonpointer v0.19.5/go.mod"
+	"github.com/go-openapi/jsonreference v0.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/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.5"
+	"github.com/go-openapi/jsonreference v0.19.5/go.mod"
+	"github.com/go-openapi/loads v0.17.0/go.mod"
+	"github.com/go-openapi/loads v0.18.0/go.mod"
+	"github.com/go-openapi/loads v0.19.0/go.mod"
+	"github.com/go-openapi/loads v0.19.2/go.mod"
+	"github.com/go-openapi/loads v0.19.3/go.mod"
+	"github.com/go-openapi/loads v0.19.4/go.mod"
+	"github.com/go-openapi/loads v0.19.5/go.mod"
+	"github.com/go-openapi/loads v0.19.6/go.mod"
+	"github.com/go-openapi/loads v0.19.7/go.mod"
+	"github.com/go-openapi/loads v0.20.0/go.mod"
+	"github.com/go-openapi/loads v0.20.2"
+	"github.com/go-openapi/loads v0.20.2/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/runtime v0.19.15/go.mod"
+	"github.com/go-openapi/runtime v0.19.16/go.mod"
+	"github.com/go-openapi/runtime v0.19.24/go.mod"
+	"github.com/go-openapi/runtime v0.19.28"
+	"github.com/go-openapi/runtime v0.19.28/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/spec v0.17.0/go.mod"
+	"github.com/go-openapi/spec v0.18.0/go.mod"
+	"github.com/go-openapi/spec v0.19.2/go.mod"
+	"github.com/go-openapi/spec v0.19.3/go.mod"
+	"github.com/go-openapi/spec v0.19.6/go.mod"
+	"github.com/go-openapi/spec v0.19.7/go.mod"
+	"github.com/go-openapi/spec v0.19.8/go.mod"
+	"github.com/go-openapi/spec v0.19.15/go.mod"
+	"github.com/go-openapi/spec v0.20.0/go.mod"
+	"github.com/go-openapi/spec v0.20.1/go.mod"
+	"github.com/go-openapi/spec v0.20.3"
+	"github.com/go-openapi/spec v0.20.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.2/go.mod"
+	"github.com/go-openapi/strfmt v0.19.3/go.mod"
+	"github.com/go-openapi/strfmt v0.19.4/go.mod"
+	"github.com/go-openapi/strfmt v0.19.5/go.mod"
+	"github.com/go-openapi/strfmt v0.19.11/go.mod"
+	"github.com/go-openapi/strfmt v0.20.0/go.mod"
+	"github.com/go-openapi/strfmt v0.20.1"
+	"github.com/go-openapi/strfmt v0.20.1/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/go.mod"
+	"github.com/go-openapi/swag v0.19.7/go.mod"
+	"github.com/go-openapi/swag v0.19.9/go.mod"
+	"github.com/go-openapi/swag v0.19.12/go.mod"
+	"github.com/go-openapi/swag v0.19.13/go.mod"
+	"github.com/go-openapi/swag v0.19.14/go.mod"
+	"github.com/go-openapi/swag v0.19.15"
+	"github.com/go-openapi/swag v0.19.15/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.3/go.mod"
+	"github.com/go-openapi/validate v0.19.8/go.mod"
+	"github.com/go-openapi/validate v0.19.10/go.mod"
+	"github.com/go-openapi/validate v0.19.12/go.mod"
+	"github.com/go-openapi/validate v0.19.15/go.mod"
+	"github.com/go-openapi/validate v0.20.1/go.mod"
+	"github.com/go-openapi/validate v0.20.2"
+	"github.com/go-openapi/validate v0.20.2/go.mod"
+	"github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48"
+	"github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-zookeeper/zk v1.0.2"
+	"github.com/go-zookeeper/zk v1.0.2/go.mod"
+	"github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod"
+	"github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod"
+	"github.com/gobuffalo/depgen v0.1.0/go.mod"
+	"github.com/gobuffalo/envy v1.6.15/go.mod"
+	"github.com/gobuffalo/envy v1.7.0/go.mod"
+	"github.com/gobuffalo/flect v0.1.0/go.mod"
+	"github.com/gobuffalo/flect v0.1.1/go.mod"
+	"github.com/gobuffalo/flect v0.1.3/go.mod"
+	"github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod"
+	"github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod"
+	"github.com/gobuffalo/genny v0.1.0/go.mod"
+	"github.com/gobuffalo/genny v0.1.1/go.mod"
+	"github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod"
+	"github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod"
+	"github.com/gobuffalo/gogen v0.1.0/go.mod"
+	"github.com/gobuffalo/gogen v0.1.1/go.mod"
+	"github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod"
+	"github.com/gobuffalo/mapi v1.0.1/go.mod"
+	"github.com/gobuffalo/mapi v1.0.2/go.mod"
+	"github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod"
+	"github.com/gobuffalo/packd v0.1.0/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.0.9/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.2.0/go.mod"
+	"github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+	"github.com/gofrs/uuid v4.0.0+incompatible/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.2.2-0.20190723190241-65acae22fc9d/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48/go.mod"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/gogo/protobuf v1.3.2"
+	"github.com/gogo/protobuf v1.3.2/go.mod"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+	"github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod"
+	"github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/mock v1.5.0/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.1/go.mod"
+	"github.com/golang/protobuf v1.5.2"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/golang/snappy v0.0.3"
+	"github.com/golang/snappy v0.0.3/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/flatbuffers v1.11.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-cmp v0.5.6"
+	"github.com/google/go-cmp v0.5.6/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0/go.mod"
+	"github.com/google/martian/v3 v3.2.1/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200417002340-c6e0a841f49a/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+	"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+	"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod"
+	"github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9"
+	"github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.4.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/go.mod"
+	"github.com/gophercloud/gophercloud v0.10.0/go.mod"
+	"github.com/gophercloud/gophercloud v0.18.0"
+	"github.com/gophercloud/gophercloud v0.18.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/mux v1.6.2/go.mod"
+	"github.com/gorilla/mux v1.7.3"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.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.5/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.14.4/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.16.0"
+	"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+	"github.com/hashicorp/consul/api v1.3.0/go.mod"
+	"github.com/hashicorp/consul/api v1.4.0/go.mod"
+	"github.com/hashicorp/consul/api v1.8.1"
+	"github.com/hashicorp/consul/api v1.8.1/go.mod"
+	"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.4.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.7.0"
+	"github.com/hashicorp/consul/sdk v0.7.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+	"github.com/hashicorp/go-hclog v0.12.2"
+	"github.com/hashicorp/go-hclog v0.12.2/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.2.0"
+	"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.2"
+	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.2"
+	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.1/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/memberlist v0.1.4/go.mod"
+	"github.com/hashicorp/memberlist v0.2.0/go.mod"
+	"github.com/hashicorp/memberlist v0.2.2/go.mod"
+	"github.com/hashicorp/memberlist v0.2.3"
+	"github.com/hashicorp/memberlist v0.2.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/hashicorp/serf v0.9.0/go.mod"
+	"github.com/hashicorp/serf v0.9.5"
+	"github.com/hashicorp/serf v0.9.5/go.mod"
+	"github.com/hetznercloud/hcloud-go v1.26.2"
+	"github.com/hetznercloud/hcloud-go v1.26.2/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.0.0/go.mod"
+	"github.com/hudl/fargo v1.3.0/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+	"github.com/imdario/mergo v0.3.4/go.mod"
+	"github.com/imdario/mergo v0.3.5"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/influxdata/flux v0.65.0/go.mod"
+	"github.com/influxdata/flux v0.113.0/go.mod"
+	"github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69/go.mod"
+	"github.com/influxdata/influxdb v1.8.0/go.mod"
+	"github.com/influxdata/influxdb v1.9.2"
+	"github.com/influxdata/influxdb v1.9.2/go.mod"
+	"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+	"github.com/influxdata/influxql v1.1.0/go.mod"
+	"github.com/influxdata/influxql v1.1.1-0.20210223160523-b6ab99450c93/go.mod"
+	"github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod"
+	"github.com/influxdata/pkg-config v0.2.6/go.mod"
+	"github.com/influxdata/pkg-config v0.2.7/go.mod"
+	"github.com/influxdata/promql/v2 v2.12.0/go.mod"
+	"github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod"
+	"github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod"
+	"github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b/go.mod"
+	"github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0/go.mod"
+	"github.com/jessevdk/go-flags v1.5.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.4.0"
+	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/josharian/intern v1.0.0"
+	"github.com/josharian/intern v1.0.0/go.mod"
+	"github.com/jpillora/backoff v1.0.0"
+	"github.com/jpillora/backoff v1.0.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/json-iterator/go v1.1.11"
+	"github.com/json-iterator/go v1.1.11/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jsternberg/zap-logfmt v1.0.0/go.mod"
+	"github.com/jsternberg/zap-logfmt v1.2.0/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/julienschmidt/httprouter v1.3.0"
+	"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+	"github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod"
+	"github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod"
+	"github.com/karrick/godirwalk v1.8.0/go.mod"
+	"github.com/karrick/godirwalk v1.10.3/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.5.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.4.0/go.mod"
+	"github.com/klauspost/compress v1.9.5/go.mod"
+	"github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod"
+	"github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod"
+	"github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.5/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/kylelemons/godebug v0.0.0-20160406211939-eadb3ce320cb/go.mod"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+	"github.com/linode/linodego v0.28.5"
+	"github.com/linode/linodego v0.28.5/go.mod"
+	"github.com/lyft/protoc-gen-validate v0.0.13/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/go.mod"
+	"github.com/mailru/easyjson v0.7.1/go.mod"
+	"github.com/mailru/easyjson v0.7.6"
+	"github.com/mailru/easyjson v0.7.6/go.mod"
+	"github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod"
+	"github.com/markbates/safe v1.0.1/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/go.mod"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.3/go.mod"
+	"github.com/mattn/go-sqlite3 v1.11.0/go.mod"
+	"github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/miekg/dns v1.1.22/go.mod"
+	"github.com/miekg/dns v1.1.26/go.mod"
+	"github.com/miekg/dns v1.1.29/go.mod"
+	"github.com/miekg/dns v1.1.42"
+	"github.com/miekg/dns v1.1.42/go.mod"
+	"github.com/mileusna/useragent v0.0.0-20190129205925-3e331f0949a5/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/cli v1.1.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.2.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.1"
+	"github.com/mitchellh/mapstructure v1.4.1/go.mod"
+	"github.com/moby/spdystream v0.2.0/go.mod"
+	"github.com/moby/term v0.0.0-20201216013528-df9cb8a40635"
+	"github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/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/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f"
+	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/oklog/oklog v0.3.2/go.mod"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/oklog/run v1.1.0"
+	"github.com/oklog/run v1.1.0/go.mod"
+	"github.com/oklog/ulid v1.3.1"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.7.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega 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 v1.0.0"
+	"github.com/opencontainers/go-digest v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+	"github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod"
+	"github.com/opentracing-contrib/go-stdlib v1.0.0"
+	"github.com/opentracing-contrib/go-stdlib v1.0.0/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.0.3-0.20180606204148-bd9c31933947/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/opentracing/opentracing-go v1.2.0"
+	"github.com/opentracing/opentracing-go v1.2.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/pascaldekloe/goe v0.1.0"
+	"github.com/pascaldekloe/goe v0.1.0/go.mod"
+	"github.com/paulbellamy/ratecounter v0.2.0/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.4.0/go.mod"
+	"github.com/pelletier/go-toml v1.7.0/go.mod"
+	"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod"
+	"github.com/philhofer/fwd v1.0.0/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/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/profile v1.2.1/go.mod"
+	"github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.3/go.mod"
+	"github.com/prometheus/alertmanager v0.20.0/go.mod"
+	"github.com/prometheus/alertmanager v0.22.2"
+	"github.com/prometheus/alertmanager v0.22.2/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 v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.2.1/go.mod"
+	"github.com/prometheus/client_golang v1.3.0/go.mod"
+	"github.com/prometheus/client_golang v1.4.0/go.mod"
+	"github.com/prometheus/client_golang v1.5.1/go.mod"
+	"github.com/prometheus/client_golang v1.7.1/go.mod"
+	"github.com/prometheus/client_golang v1.10.0/go.mod"
+	"github.com/prometheus/client_golang v1.11.0"
+	"github.com/prometheus/client_golang v1.11.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.1.0/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.6.0/go.mod"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/common v0.10.0/go.mod"
+	"github.com/prometheus/common v0.15.0/go.mod"
+	"github.com/prometheus/common v0.18.0/go.mod"
+	"github.com/prometheus/common v0.23.0/go.mod"
+	"github.com/prometheus/common v0.26.0/go.mod"
+	"github.com/prometheus/common v0.29.0"
+	"github.com/prometheus/common v0.29.0/go.mod"
+	"github.com/prometheus/exporter-toolkit v0.5.1/go.mod"
+	"github.com/prometheus/exporter-toolkit v0.6.0"
+	"github.com/prometheus/exporter-toolkit v0.6.0/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.2/go.mod"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/procfs v0.0.11/go.mod"
+	"github.com/prometheus/procfs v0.1.3/go.mod"
+	"github.com/prometheus/procfs v0.6.0"
+	"github.com/prometheus/procfs v0.6.0/go.mod"
+	"github.com/prometheus/prometheus v0.0.0-20200609090129-a6600f564e3c/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+	"github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.2.2/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rs/cors v1.6.0/go.mod"
+	"github.com/rs/cors v1.7.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+	"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+	"github.com/satori/go.uuid v0.0.0-20160603004225-b111a074d5ef/go.mod"
+	"github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod"
+	"github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210223165440-c65ae3540d44"
+	"github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210223165440-c65ae3540d44/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/segmentio/kafka-go v0.1.0/go.mod"
+	"github.com/segmentio/kafka-go v0.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749"
+	"github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod"
+	"github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546"
+	"github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod"
+	"github.com/simonpasquier/klog-gokit v0.3.0"
+	"github.com/simonpasquier/klog-gokit v0.3.0/go.mod"
+	"github.com/simonpasquier/klog-gokit/v2 v2.1.0"
+	"github.com/simonpasquier/klog-gokit/v2 v2.1.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.6.0"
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/snowflakedb/gosnowflake v1.3.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.2.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/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.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/tidwall/pretty v1.0.0"
+	"github.com/tidwall/pretty v1.0.0/go.mod"
+	"github.com/tinylib/msgp v1.0.2/go.mod"
+	"github.com/tinylib/msgp v1.1.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+	"github.com/uber-go/tally v3.3.15+incompatible/go.mod"
+	"github.com/uber/athenadriver v1.1.4/go.mod"
+	"github.com/uber/jaeger-client-go v2.23.0+incompatible/go.mod"
+	"github.com/uber/jaeger-client-go v2.29.1+incompatible"
+	"github.com/uber/jaeger-client-go v2.29.1+incompatible/go.mod"
+	"github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod"
+	"github.com/uber/jaeger-lib v2.4.1+incompatible"
+	"github.com/uber/jaeger-lib v2.4.1+incompatible/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/willf/bitset v1.1.3/go.mod"
+	"github.com/willf/bitset v1.1.9/go.mod"
+	"github.com/xdg-go/pbkdf2 v1.0.0/go.mod"
+	"github.com/xdg-go/scram v1.0.2/go.mod"
+	"github.com/xdg-go/stringprep v1.0.2/go.mod"
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+	"github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod"
+	"github.com/xlab/treeprint v1.1.0/go.mod"
+	"github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark v1.3.5/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/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.mongodb.org/mongo-driver v1.3.0/go.mod"
+	"go.mongodb.org/mongo-driver v1.3.2/go.mod"
+	"go.mongodb.org/mongo-driver v1.3.4/go.mod"
+	"go.mongodb.org/mongo-driver v1.4.3/go.mod"
+	"go.mongodb.org/mongo-driver v1.4.4/go.mod"
+	"go.mongodb.org/mongo-driver v1.4.6/go.mod"
+	"go.mongodb.org/mongo-driver v1.5.1"
+	"go.mongodb.org/mongo-driver v1.5.1/go.mod"
+	"go.opencensus.io v0.20.1/go.mod"
+	"go.opencensus.io v0.20.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.opencensus.io v0.22.5/go.mod"
+	"go.opencensus.io v0.23.0"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/atomic v1.5.1/go.mod"
+	"go.uber.org/atomic v1.6.0/go.mod"
+	"go.uber.org/atomic v1.8.0"
+	"go.uber.org/atomic v1.8.0/go.mod"
+	"go.uber.org/goleak v1.1.10"
+	"go.uber.org/goleak v1.1.10/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/multierr v1.4.0/go.mod"
+	"go.uber.org/multierr v1.5.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.9.1/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"go.uber.org/zap v1.13.0/go.mod"
+	"go.uber.org/zap v1.14.0/go.mod"
+	"go.uber.org/zap v1.14.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20180505025534-4ec37c66abab/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-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-20190422162423-af44ce270edf/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+	"golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod"
+	"golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+	"golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod"
+	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e"
+	"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod"
+	"golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod"
+	"golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
+	"golang.org/x/lint v0.0.0-20210508222113-6edffad5e616"
+	"golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/mod v0.4.2"
+	"golang.org/x/mod v0.4.2/go.mod"
+	"golang.org/x/net v0.0.0-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-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+	"golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod"
+	"golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod"
+	"golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod"
+	"golang.org/x/net v0.0.0-20210610132358-84b48f89b13b"
+	"golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c"
+	"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-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-20190209173611-3b5209105503/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod"
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/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/go.mod"
+	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-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-20200107162124-548cf772de50/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod"
+	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
+	"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod"
+	"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
+	"golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod"
+	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1"
+	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/text v0.3.6"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+	"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod"
+	"golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6"
+	"golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
+	"golang.org/x/tools v0.0.0-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-20190206041539-40960b6deb8e/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod"
+	"golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod"
+	"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-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-20190813034749-528a2984e271/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
+	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+	"golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304024140-c4206d458c3f/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200422205258-72e4a01eba43/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20200721032237-77f530d86f9a/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+	"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+	"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+	"golang.org/x/tools v0.1.0/go.mod"
+	"golang.org/x/tools v0.1.1/go.mod"
+	"golang.org/x/tools v0.1.2/go.mod"
+	"golang.org/x/tools v0.1.3"
+	"golang.org/x/tools v0.1.3/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod"
+	"gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod"
+	"gonum.org/v1/gonum v0.6.0/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
+	"gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/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.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.35.0/go.mod"
+	"google.golang.org/api v0.36.0/go.mod"
+	"google.golang.org/api v0.40.0/go.mod"
+	"google.golang.org/api v0.41.0/go.mod"
+	"google.golang.org/api v0.43.0/go.mod"
+	"google.golang.org/api v0.47.0/go.mod"
+	"google.golang.org/api v0.48.0"
+	"google.golang.org/api v0.48.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/appengine v1.6.7"
+	"google.golang.org/appengine v1.6.7/go.mod"
+	"google.golang.org/genproto v0.0.0-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-20190716160619-c506a9f90610/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200420144010-e5e8543f8aeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
+	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+	"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
+	"google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod"
+	"google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08"
+	"google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod"
+	"google.golang.org/grpc v1.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.24.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/grpc v1.31.1/go.mod"
+	"google.golang.org/grpc v1.33.1/go.mod"
+	"google.golang.org/grpc v1.33.2/go.mod"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/grpc v1.35.0/go.mod"
+	"google.golang.org/grpc v1.36.0/go.mod"
+	"google.golang.org/grpc v1.36.1/go.mod"
+	"google.golang.org/grpc v1.37.0/go.mod"
+	"google.golang.org/grpc v1.37.1/go.mod"
+	"google.golang.org/grpc v1.38.0"
+	"google.golang.org/grpc v1.38.0/go.mod"
+	"google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/fsnotify/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gcfg.v1 v1.2.3/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/warnings.v0 v0.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"gotest.tools/v3 v3.0.2/go.mod"
+	"gotest.tools/v3 v3.0.3"
+	"gotest.tools/v3 v3.0.3/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"k8s.io/api v0.17.5/go.mod"
+	"k8s.io/api v0.21.1"
+	"k8s.io/api v0.21.1/go.mod"
+	"k8s.io/apimachinery v0.17.5/go.mod"
+	"k8s.io/apimachinery v0.21.1"
+	"k8s.io/apimachinery v0.21.1/go.mod"
+	"k8s.io/client-go v0.17.5/go.mod"
+	"k8s.io/client-go v0.21.1"
+	"k8s.io/client-go v0.21.1/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20200316234421-82d701f24f9d/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7"
+	"k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod"
+	"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod"
+	"k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod"
+	"k8s.io/utils v0.0.0-20201110183641-67b214c5f920"
+	"k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/pdf v0.1.1/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v2 v2.0.1/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.1.0"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+	"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}-asset.tar.xz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+COMMON_DEPEND="acct-group/prometheus
+	acct-user/prometheus"
+DEPEND="!app-metrics/prometheus-bin
+	${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+BDEPEND=">=dev-util/promu-0.3.0"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	mv ../assets_vfsdata.go web/ui || die
+	sed -i \
+		-e "s/{{.Branch}}/HEAD/" \
+		-e "s/{{.Revision}}/${GIT_COMMIT}/" \
+		-e "s/{{.Version}}/${PV}/" \
+		.promu.yml || die
+}
+
+src_compile() {
+	promu build -v --prefix bin || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+
+	systemd_dounit "${FILESDIR}"/prometheus.service
+	newinitd "${FILESDIR}"/prometheus.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 2083a5ffa15b..7b28bb531bc1 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index bc15ba97a718..f844c1fc6af4 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -1,4 +1,4 @@
-AUX abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch 1281 BLAKE2B d7de2b1609eaaae6ac9c993265d69faa41754b440b95da001622ea9a0033dbf93bc1d052561efc8ac580b6853b2314c061ad8331a83e1d08f6ae9d962cd5d384 SHA512 96be977b0c4bb22e580d8b2e4ecb2741dc0e45dbcd701d0aea3c65dc67d5725630ee322516837b522f43a85cf839bfaa67b8d50f1d82a38c6b13102621b299ad
+AUX abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch 1292 BLAKE2B fafc126e41c7dcd599d4101245b83e29814d5e5f1d9c1073b3bcc7385899909bb68f33e4d84a93a4cc3d4fedb2bcf19cfec4f1e7d9ac883c32f4962a7d9b5a45 SHA512 d0a779700e21b5a0c76e0ba3cafe9a85478e4f22b1d33e8486a2efdf37817e6ff9683d7e59ae6905578b48434e375f7f1956f86c65cd43abf6a231189cfa3474
 AUX abook-0.6.1-use-newer-macro-for-readline.patch 986 BLAKE2B bec102b0110e699df64758e0092d1e1bfb26b5e963f073e51f03e002d5cc31d34162ec5daf466866f032c64744bcc8ea4a1b6a930e3bc8a843303adf241391b6 SHA512 559551548a10a82ad529ab1181d42ed43f45c182530d88dd9c0cbb6423679109b5556cb9c1a27e7ea328db63e54b4196005850a1f8fe2a1dc95f3302c7efede1
 AUX abook-0.6.1-vformat.patch 336 BLAKE2B 9a45733e1ea3ddf996b6e75582771922c9189117580202e3f1270d6394b92ec0943207f803870709b2288755ac8e3ba150ceb3835ad178313eadea3bede347fb SHA512 e1da5d70edc8eecf0f860b0423a260bfb9b1f706a38872d8c793c76af3b899c86b9700df8816f952fb1430999acb00ac365dad58752c78c7535cae5d8b2814b6
 DIST abook-0.6.1.tar.gz 319558 BLAKE2B 9d750d97aac2336f1de22121035c0fc9c4707d970976f95890907e5ae2ae3249f563dc45fb34c32c2a5303a9cdb35256dc4581b5759058e14486ca2a7cfe3cdf SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66
diff --git a/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch b/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
index e6f98906af3e..00b8e4449048 100644
--- a/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
+++ b/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
@@ -34,7 +34,7 @@ We don't _always_ have split tinfo, e.g. Prefix.
 -		AC_CHECK_HEADERS(ncurses.h)],
 -		[CF_CURSES_LIBS])
 -	])
-+PKG_CHECK_MODULES(ncurses, ncurses)
++PKG_CHECK_MODULES(ncurses, [ncursesw ncurses])
 +LDFLAGS="${ncurses_LIBS} $LDFLAGS"
 +CPPFLAGS="${ncurses_CFLAGS} $CPPFLAGS"
  
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 0144ba432e44..8cbbceda6657 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,5 +1,3 @@
-DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
 DIST hivex-1.3.20.tar.gz 1727498 BLAKE2B db6448242fc4b72d75cc7234a49e146cb165b1b9b9e2e72fb2a05be37cbb1d8ca865ccc51c4d2d50199e69cae2d870743ecd41534290e9a100bb268c2437ee22 SHA512 366e84c2a13ff53c70036df60db6e2b469cd06e3405761df73c47978b4fa0245246a1ea912aa5852b1272221d55c6c100b40b00e4c9a6f5668d12ff7f93c787a
-EBUILD hivex-1.3.18.ebuild 2005 BLAKE2B cf7bbe9abeb19c88ed381a5bf2f3dcd354ffa98555becf6062c228497c7ba9802a570e99acf7922356a792929e0cccb29c4fcb8813609ab3d9ae1f1b017e511d SHA512 49e373ab59d13a7bfd818be97bdef226c16cef543f446de658d83c573d7878574cb363f462cd656c85295b98060b3b969e5b13ac4e3c62c2cc22e32e9ba1462d
 EBUILD hivex-1.3.20.ebuild 2145 BLAKE2B 3e3890b323f7c0f8ff968e6adf62067f5a088d43b8ab67521a63de24496c5684c5bdb3dc45d5269043f6f4df41e502dedf6ff3e57703cb5697451617ca61f2ea SHA512 a14d1fdbae2a0d80b1ea15b02fa90b67807e1fe3112706f68decd0638d123da134b59e3cf738bdf1cc87b5dfc41442c98406d55ed55209e4dbe44c7d5a08908f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/hivex/hivex-1.3.18.ebuild b/app-misc/hivex/hivex-1.3.18.ebuild
deleted file mode 100644
index 8d2e2ccca062..000000000000
--- a/app-misc/hivex/hivex-1.3.18.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_OPTIONAL=yes
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit perl-module ruby-ng python-single-r1 strip-linguas
-
-DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
-HOMEPAGE="https://libguestfs.org"
-SRC_URI="https://libguestfs.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ocaml readline +perl python test ruby"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	virtual/libiconv
-	virtual/libintl
-	ocaml? ( dev-lang/ocaml[ocamlopt]
-			 dev-ml/findlib[ocamlopt]
-			 )
-	perl? (
-		dev-lang/perl:=
-		dev-perl/IO-stringy
-	)
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0 )
-	ruby? ( $(ruby_implementations_depend) )
-	"
-
-DEPEND="${RDEPEND}
-	perl? (
-		test? (
-			dev-perl/Pod-Coverage
-			dev-perl/Test-Pod-Coverage
-		)
-	)"
-
-ruby_add_bdepend "ruby? ( dev-ruby/rake
-			virtual/rubygems
-			dev-ruby/rdoc )"
-ruby_add_rdepend "ruby? ( virtual/rubygems )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-			ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-DOCS=( README )
-
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all || die
-}
-
-src_configure() {
-	use ruby && ruby-ng_src_configure
-
-	if use perl; then
-		pushd perl
-		perl-module_src_configure
-		popd
-	fi
-
-	local myeconfargs=(
-		$(use_with readline)
-		$(use_enable ocaml)
-		$(use_enable perl)
-		--enable-nls
-		--disable-ruby
-		$(use_enable python)
-		--disable-rpath
-		--disable-static
-		)
-
-	econf ${myeconfargs[@]}
-}
-
-src_compile() {
-	default
-
-	use ruby && ruby-ng_src_compile
-}
-
-src_install() {
-	strip-linguas -i po
-
-	emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
-	if use python; then
-		python_optimize
-	fi
-
-	use ruby && ruby-ng_src_install
-
-	if use perl; then
-		perl_delete_localpod
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index ae70b902f295..462dfe476367 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,8 @@
 AUX mc-4.8.26-file-seccomp.patch 4794 BLAKE2B f6b2ba15b2f7f57aa620fc5745816be434d357f8b4023197691f8827c1e5d6555fa542e0aa3b471036c7d60a3ab5761d261e62d3fc599fd14593c82c4cd238dd SHA512 a65b414dfbb4f934351a87496e012131b1e811cd1fd21a91c167e8db212ee7485f097d3a5a4faed2d904e50e34cb7488a6ffbbcb41bf341167f3837f891e85b5
+AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
 AUX mc-4.8.26-shadow-crash.patch 936 BLAKE2B 65bf04b92a193de03457f95b94c7eff7677cedc0886fff4d934bd4e3bf94babf3650d5e56ad54eb73e41791e67089c9a65b6628615b87609035e6b823fd317e6 SHA512 8874e98bc5a9b032ff094d3042c71bf279f42c71840920ac3221011ae991fb199050e60d47ee8a65ef82bc5b64e4c14233fd3909c49de807fabf771a953a6c6a
 DIST mc-4.8.26.tar.xz 2492612 BLAKE2B e13ab99fb7d5a9e2cf1149ad96d763681b0186fbf5c03fc9e349a57a4a6f48b598c9eeed85e4cb94a18c5c5b89d4ee0e21f6d34c8cfd5e21da53551085aa3469 SHA512 f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
-EBUILD mc-4.8.26-r2.ebuild 3296 BLAKE2B 1ab86edd791e881d8ef14d4e9512883c347d7cdd6d637ad4060aa808abe4cefef79307d9062f89c5036c705266ed947c063f33ccc0372c107978183a1a486275 SHA512 3892c4431fff390216f52d53c68c9f958352c79b33f6a616d27190b00a78f423a096acc5132d204a0dbacb0115870c0fbad31b7b609da76b69e0be7f8db8d9fa
-EBUILD mc-9999.ebuild 3189 BLAKE2B def2ba759136e6f6c0753d4882a4b9741f412875a772970998b63ae9c5321ee50c8069bcc3d695bcae2f02ae309d28f9468ed763cf33b5ee5488269cc64f3c75 SHA512 687a919633b26bd0ac19285bca140b6d336d1ce03e13799ef0e188e0d4065c98df93a068cfbea31393d3d6567f3ebd6b44cf2db2e6e924ef0f45d1f17cfe4314
+EBUILD mc-4.8.26-r2.ebuild 3292 BLAKE2B 2c091aa3262679fbb18f0390a372ff4ab90d80575e7ddb1e79d1352ef8ab54aae9dee11ef4bedb796f6626d279bc6c6f763d52b5ac70f3d7048d32b7589067ed SHA512 8cb3aace49f07d83e771cbd1b4a1695f737642066044ab1c89df938b41174a0d9129a9f51b4f7ec729ec835690b931780ab3751eff073db5e06f888b8ae8a31f
+EBUILD mc-4.8.26-r3.ebuild 3588 BLAKE2B 207bb1c63c1f0de049301e593bacaeb27cbd4a08d1a97c65d64f934eff494a7fc2e2047adad2dc11f6339f48888a3560d2f2dc5d93b3b64a1f43a60a247f9e80 SHA512 f04a40556918d46d9cc8cf020d7e5293ea45ea32fdb47ae8c5281eaf182f814d3debc70737b81fd806f4a10f14e0d1311bbfab20cd78be5141972363d5d35ab0
+EBUILD mc-9999.ebuild 3185 BLAKE2B 0a015b440cfa6b88613d3f5ff90ccff9cce90c23fea551d2005bafd655c6280aab472fa1221d3e28622e197d6232db65d7318871274754dc12e61cf877b2781b SHA512 6575219427eed552a7d272adfaf8245ce0590783cb32a6605cd7a1a577e0ca747b5a8ded18858cdc4bc58169165be353371cf6db21b90358c8ae8a5f3f096094
 MISC metadata.xml 886 BLAKE2B 940640f07b9e76e2d2baced47b9ed9a699fad9fcbcd9583b5f78f1ea69f949a26f8f1b34f1de88e5faeeed523fe8b4486724d6f7884c3f186635753391d4d1a7 SHA512 a876eb2a3581ef4e44600c750fa54f7cb85d76ac1a83cbfa982b71313404c89d73dc876cb2d86cb53853ab1e404f93549bef4b4769de11d543cb118e4be8a15b
diff --git a/app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch b/app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch
new file mode 100644
index 000000000000..bde04c99b86e
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch
@@ -0,0 +1,16 @@
+Fix mouse-key input with ncurses6 in terminals without basic X10 mouse
+support, at the cost of breaking it with ncurses5. See discussion in
+https://midnight-commander.org/ticket/4144 .
+
+--- a/lib/tty/key.c
++++ b/lib/tty/key.c
+@@ -2124,8 +2124,7 @@
+         gboolean extended = c == MCKEY_EXTENDED_MOUSE;
+ 
+ #ifdef KEY_MOUSE
+-        extended = extended || (c == KEY_MOUSE && xmouse_seq == NULL
+-                                && xmouse_extended_seq != NULL);
++        extended = extended || (c == KEY_MOUSE && xmouse_extended_seq != NULL);
+ #endif /* KEY_MOUSE */
+ 
+         xmouse_get_event (event, extended);
diff --git a/app-misc/mc/mc-4.8.26-r2.ebuild b/app-misc/mc/mc-4.8.26-r2.ebuild
index 8ceabe7658df..ad9cf8c1f56d 100644
--- a/app-misc/mc/mc-4.8.26-r2.ebuild
+++ b/app-misc/mc/mc-4.8.26-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
 MY_P=${P/_/-}
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
+HOMEPAGE="https://midnight-commander.org"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
diff --git a/app-misc/mc/mc-4.8.26-r3.ebuild b/app-misc/mc/mc-4.8.26-r3.ebuild
new file mode 100644
index 000000000000..97a15d1bc054
--- /dev/null
+++ b/app-misc/mc/mc-4.8.26-r3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0=[unicode?] )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.26-file-seccomp.patch
+	"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
+	"${FILESDIR}"/${PN}-4.8.26-shadow-crash.patch
+)
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if use slang && use unicode ; then
+		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# patch touches configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local myeconfargs=(
+		--enable-charset
+		--enable-vfs
+		--with-homedir=$(usex xdg 'XDG' '.mc')
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+		$(use_enable kernel_linux vfs-undelfs)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
+		$(use_enable nls)
+		$(use_enable samba vfs-smb)
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Bug #759466
+	if ! has userpriv ${FEATURES} && [[ $(id -u) == 0 ]]; then
+		ewarn "You are emerging ${PN} as root with 'userpriv' disabled." \
+			"Expect some test failures, or emerge with 'FEATURES=userpriv'!"
+	fi
+
+	# CK_FORK=no to avoid using fork() in check library
+	# as mc mocks fork() itself: bug #644462.
+	#
+	# VERBOSE=1 to make test failures contain detailed
+	# information.
+	CK_FORK=no emake check VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	if use spell && ! has_version app-dicts/aspell-en ; then
+		elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
+		elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
+		elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
+		elog
+	fi
+
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 0c868d11135d..3bc775bf4695 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${LIVE_EBUILD} ]]; then
 fi
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
+HOMEPAGE="https://midnight-commander.org"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index 6ec3e56d9847..374618ee460d 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -1,7 +1,9 @@
 DIST QLC+_4.12.2.tar.gz 10804401 BLAKE2B 95b005985da99d1d1f557b4ac5d6ae7d844ea4f69a7cfa63d79b288ce654b5a70f9e6168f6fd4144496d3cff59a721972acd3ba47fd1477ab4bfd0218f5aeeda SHA512 b274f0559ce15e045d653f4c034dc083922a13c6f9c5e7ba11026b3be9bb85fe447bb489d536dd24bb99bd4b08433f24f1713b73701afff99fa845fcef2547af
 DIST QLC+_4.12.3.tar.gz 10954027 BLAKE2B 9a188e2bc2cce1a0a5170122989d5ee1194a83e7d1c8c05a80ad6271e903941effb5c63940a941fa32146699b3b2a7943b9938a5407420da69c1199b5f6f217b SHA512 f25601a44a81d2fd15c54a05588e687fa1f0c0473d0e2188fa0c052b905df806b0516f8b80bf28451a583aa241d137f858fe83b9d7e0e0747bcc3b0bae91d9f0
+DIST QLC+_4.12.4.tar.gz 11166224 BLAKE2B 37b5088c8e7be08fa39aa11e35b8284e60788da94ac4f2dfb9bf4b0615408735c8c1b7c61efe37810ea7ee662a4efe5c0e17d54d45a7b637ddef4a1cc4c5a760 SHA512 19893c5f29602e2e65db9eb162c3f45ce3f028424ecf17d7615f9d3ada8a871dd1a1827ea9a243d7bd0f23ba7e9fb2340531154ac557d5756f0aa05648c56b13
 DIST QLC+_5.0.0_alpha3.tar.gz 10016411 BLAKE2B 51c0885f6e2e286f9f63830bcd269db699946c0969cb0f0a0139f82a421a9a4957ab07612db7aa047fe6650a642479282f6cfe0d124a41a935dd853d09b7253f SHA512 e703747aa243bc4c6b2e9fc3cf1a4e67524fa13fa64a59054e66164e879073b1bd69756a42bb423ff05dcb7da946cbcd99bb9edc3fde9a70d75b8a9f164a71d0
 EBUILD qlcplus-4.12.2.ebuild 1217 BLAKE2B bd8c0c256e255ff88eed2f6f9e9f5d9f6af0011f1a5b540f254e8b068dcc7246cc8b08ef8e5ef12b7bfd4f2d9275929701f6dbff946aa37e888f2c4bdf4d45ab SHA512 f31e8a8572b0a6bb49576aed423449e33d6ea8bda937cbee4f4456202eb5b5b96e26d21a061c925f04f8e2364119827bd707ba7a8bd3215c6c7b86375e523e3f
 EBUILD qlcplus-4.12.3.ebuild 1217 BLAKE2B c4c507caf1551d22815ed9f2a863b5860fdb9e0aaaeef3e5dd7038e6e220c092bad8c3ac17861c3c13bf9df0f0c0a01088e9a3fc96d42715e84eced2ff4d33cf SHA512 4e10f5121e8d3c425c1a1c29ef7e72141cc3cbe5cdfe1273c83f6c63ea8e670a31259eae25f509847b4da8cfa424aa898e7c92d95d045f3aa8b6c3af617d2c80
+EBUILD qlcplus-4.12.4.ebuild 1217 BLAKE2B 9bc28c918fd34785f3c0dff2cadb3e83b364e790c12aa56fbaf9557ce021583e1c846d6e61ef3d75c99b2ab46ad35420f10fcd2a7402685e1490db7947885a09 SHA512 15a356f6ada2c4d0ebeb0d1363b963e51fa97609fb99a57555015bdf7aa59ab9aff657e49b97c2e2ec6aafc2084d761cb970679e1271fdcb29c53c50152b95b2
 EBUILD qlcplus-5.0.0_alpha3.ebuild 1550 BLAKE2B 2d6eaf0b2bbc348903813f202bb42f841d2f3da045827bc5b91cf9e6f27ee013e17b5b3c14d7cf45989af7f29dbd86d748eaaf69999df7e4a3b57f0c2c093f52 SHA512 dd496c3a3beba8fe9212bea0fb1b8e446ea9c5733df93133bbeeddd5180d6dd5004a57238bcd228da1cd2bd80dc9dc8da95f0ab41a0ff6b0d1e6bd3c9d98bae6
 MISC metadata.xml 485 BLAKE2B 4666f9cefe8331b06dcdace276a0abc7d69e9aa91d98f62db4b9cf35929bb0fb58bf7008914ad4e7808fa2f165e650cf5729863f72bbea7e2fc5f8de05291095 SHA512 925b1d7228135ef55a3c455821638fe8b2ea2f3eb591cfeb2576ad9c6f3870ecf9e9718fbc1f87aee7bebb0fbd0bba1e904fcd1cf5daa1d343d33448dc744c1d
diff --git a/app-misc/qlcplus/qlcplus-4.12.4.ebuild b/app-misc/qlcplus/qlcplus-4.12.4.ebuild
new file mode 100644
index 000000000000..e2652b670439
--- /dev/null
+++ b/app-misc/qlcplus/qlcplus-4.12.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils udev virtualx xdg
+
+DESCRIPTION="A software to control DMX or analog lighting systems"
+HOMEPAGE="https://www.qlcplus.org/"
+SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
+S="${WORKDIR}/qlcplus-QLC-_${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-embedded/libftdi:=
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/libmad
+	media-libs/libsndfile
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	virtual/libusb:1
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	default
+
+	sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
+		-i variables.pri || die
+
+	## Remove Werror-flag since there are some warnings with gcc-9.x
+	sed -e "s/QMAKE_CXXFLAGS += -Werror/#&/g" \
+		-i variables.pri || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-misc/taskd/Manifest b/app-misc/taskd/Manifest
index 466b973b9d5a..c2e7172cbfca 100644
--- a/app-misc/taskd/Manifest
+++ b/app-misc/taskd/Manifest
@@ -3,5 +3,5 @@ AUX taskd.confd 27 BLAKE2B e60babd7477263d12aebb306607a6edea2cc4675d265b4c7a9592
 AUX taskd.initd 397 BLAKE2B 537dab2a50eb56f9830a83164b51f221a6ad219009c4b1bd176631b198d000017acf31b8c162c1ad6ef217e10d93da9a78413a7deb40e569676eff195176ba5b SHA512 92663323b44d5cb36d86ab2b33c761214926c24d5ba3e84c4495e3e6158e1ff4fe603c2f7e79070c02e88ba90904f9b701bc75feedd2a9ce5f1b9982192e1d3f
 AUX taskd.logrotate 114 BLAKE2B ec9fe02930b299dc309771b1b2b696a6e6e93722760ccc56227d24d7fc38bfbc6ee37a7cdd17fc042df98aff8584a765e1833f4e24520cd99564b70a2bd81f06 SHA512 4d8c3c12dc203cc6c9f27ad6882934a2786504a5b6ef7dfedd43deb61faaa4ceff452adfc93e2ed0074dd2545a90867c2ff85bca73adf9d1c858adfc76649fc4
 DIST taskd-1.1.0.tar.gz 120115 BLAKE2B 1baabcd29afb2c44c5da19f6cb926546e9beb5716ea1a04d247e62c02b4a4c5bc4bf3347e32e0e417f3b5edf1b78f58d306f1d584340c344a13fd29cdd39dcc7 SHA512 df2349c354258fd1b014b1a9c78f68dc10c9e5a48357e282e8a760cf4e4aaf4d36486796ad094ee2b050e7506195b778e3316c90ef543a2f8242de313daa13aa
-EBUILD taskd-1.1.0-r2.ebuild 1836 BLAKE2B 909433beffba43894458d9ec9e59c2e2fa6ac44075c171f02e14a339c665e31e286ffec02a4c099350b30d1d02bb0a828c9e29389e46ce70ae808e7755ed1f59 SHA512 3d557c41b4a46ab5e5232280771448e7c89c2e5db9aea03850cb77c4abf3df85ddac50fdda14d3d76a34288f0ecc391766142e75637a70e54ea058ae5f96f19b
+EBUILD taskd-1.1.0-r3.ebuild 1758 BLAKE2B 31e4d6d82287155316d129d2c5aae16a8d27d76fe6741f0690f17a9859d04b4c96fc9d5c3408331299a97dd8c1786d20fe53a2a213132f75f2f5a5330621214c SHA512 938f211d97b52818ac1b267c08006d71fde3223b1d492b0784d061d17213dd888c0b0396af627a04ab8c8f035fab8e7237ea42447828334b025a66bd2cfce709
 MISC metadata.xml 246 BLAKE2B bf870c5ee1af2f88418b8fac2cdf8adc852cebf6ee3d22f009ac4dda5307a5ff26d419f6d53c161d1096334a37b924d3188e51a299d3a4903ab842c68ee648b6 SHA512 cf3bffaa344cc0785ce4b3a18c5cef7b508e943de589d67485df46802f0c9c1b9bd6d51b7197fc84431180f82b8affae22175ae0bfe7616b57f6874a861f6698
diff --git a/app-misc/taskd/taskd-1.1.0-r2.ebuild b/app-misc/taskd/taskd-1.1.0-r2.ebuild
deleted file mode 100644
index 1b18af5ecd11..000000000000
--- a/app-misc/taskd/taskd-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd user
-
-DESCRIPTION="Server part of Taskwarrior, a command-line todo list manager"
-HOMEPAGE="https://taskwarrior.org/"
-SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	net-libs/gnutls:=
-	sys-apps/util-linux
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DTASKD_DOCDIR=share/doc/${PF}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	systemd_dounit "${S}"/scripts/systemd/taskd.service
-
-	insinto /usr/share/${PN}/pki
-	doins pki/*
-
-	insinto /usr/share/${PN}/mon
-	doins mon/*
-
-	newinitd "${FILESDIR}"/taskd.initd taskd
-	newconfd "${FILESDIR}"/taskd.confd taskd
-
-	grep ^TASKDDATA= "${FILESDIR}"/taskd.confd > 90taskd || die
-	doenvd 90taskd
-
-	dodir /etc/taskd
-	keepdir /usr/libexec/taskd
-
-	diropts -m 0750
-	dodir /var/lib/taskd
-	keepdir /var/log/taskd
-
-	diropts -m 0700
-	keepdir /var/lib/taskd/orgs /etc/taskd/tls
-
-	insopts -m0600
-	insinto /etc/taskd
-	doins "${FILESDIR}"/config
-
-	dosym ../../../etc/taskd/config /var/lib/taskd/config
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/taskd.logrotate taskd
-}
-
-pkg_setup() {
-	enewgroup taskd
-	enewuser taskd -1 /bin/bash /var/lib/taskd taskd
-}
-
-pkg_postinst() {
-	chown taskd:taskd /var/lib/taskd{,/orgs} /var/log/taskd /etc/taskd/{config,tls}
-
-	elog "For configuration see 'man taskdrc' and edit /etc/taskd/config"
-	elog "You will need to configure certificates first in order to use taskd"
-	ewarn
-	ewarn "Do not use 'taskd init' as this will replace the config file and set"
-	ewarn "default but unsuitable paths"
-	ewarn
-	ewarn "In order to manage taskd via 'taskd' either relogin or run 'source /etc/profile'"
-}
diff --git a/app-misc/taskd/taskd-1.1.0-r3.ebuild b/app-misc/taskd/taskd-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..d86934a2f781
--- /dev/null
+++ b/app-misc/taskd/taskd-1.1.0-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="Server part of Taskwarrior, a command-line todo list manager"
+HOMEPAGE="https://taskwarrior.org/"
+SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	net-libs/gnutls:=
+	sys-apps/util-linux
+	sys-libs/readline:0=
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/taskd
+	acct-user/taskd
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DTASKD_DOCDIR=share/doc/${PF}
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	systemd_dounit "${S}"/scripts/systemd/taskd.service
+
+	insinto /usr/share/${PN}/pki
+	doins pki/*
+
+	insinto /usr/share/${PN}/mon
+	doins mon/*
+
+	newinitd "${FILESDIR}"/taskd.initd taskd
+	newconfd "${FILESDIR}"/taskd.confd taskd
+
+	grep ^TASKDDATA= "${FILESDIR}"/taskd.confd > 90taskd || die
+	doenvd 90taskd
+
+	dodir /etc/taskd
+	keepdir /usr/libexec/taskd
+
+	diropts -m 0750
+	dodir /var/lib/taskd
+	keepdir /var/log/taskd
+
+	diropts -m 0700
+	keepdir /var/lib/taskd/orgs /etc/taskd/tls
+
+	insopts -m0600
+	insinto /etc/taskd
+	doins "${FILESDIR}"/config
+
+	dosym ../../../etc/taskd/config /var/lib/taskd/config
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/taskd.logrotate taskd
+}
+
+pkg_postinst() {
+	chown taskd:taskd /var/lib/taskd{,/orgs} /var/log/taskd /etc/taskd/{config,tls}
+
+	elog "For configuration see 'man taskdrc' and edit /etc/taskd/config"
+	elog "You will need to configure certificates first in order to use taskd"
+	ewarn
+	ewarn "Do not use 'taskd init' as this will replace the config file and set"
+	ewarn "default but unsuitable paths"
+	ewarn
+	ewarn "In order to manage taskd via 'taskd' either relogin or run 'source /etc/profile'"
+}
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index d17689d07094..e0f0f7f870e6 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -1,10 +1,7 @@
 AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b741cbe20ad9af32aefa52566fe99dedc31abf30c3f74d74ced97ce094f07203b1473bc79d9ee2546e2 SHA512 8a9e054b2ae3f5479504b0d466a96687f5be2c5d1d8fda740597ca21d8854b4ba4bc8576f8f903392e1b3c7564e3e9e80eb39f30f5a8df0b228d1bdae04725f0
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
-DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
 DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
 DIST uptimed-0.4.3.tar.gz 55396 BLAKE2B bebea6559c436d2700df905b63fabd73b1c55463e8633409bc05cd16c7d110d8116f52e00d63879cfb2e0482f648bda04dcb5a1d5ff629699d2758dcc85ba53a SHA512 f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260
-EBUILD uptimed-0.4.1-r1.ebuild 1573 BLAKE2B 0a3565d49f793f34ee7942032460cf363d0fecf4603b86e256c154c634a528b446a641559f25b41340f00755346839876a2b024e37236e3269a28ad41747010a SHA512 b8417df07778fe93a935a1217b26992846ecf7389046c3ddfe8ef4b76960e5d86afd48f6c623972d9d463dd04b6deb83c965ee3a55ee1c93007e62760f3f332d
-EBUILD uptimed-0.4.1-r2.ebuild 1603 BLAKE2B 2fe5cb29ef9c1cc6c77898bc79ef14be68d90c8576bd2764cc939d4bbfb5d59dd9bc990618b7bcaa953335ccb3699d4558f3b96717b39886d107729fb01bb0be SHA512 c0a42a785ae77e3b4b79c0f7fef99696553294d5e54472b85b9990a6d562e76010f9903f46513899a103cd56edb6ba84345cc61f9bb621925da70e7ae6058e2b
 EBUILD uptimed-0.4.2.ebuild 1605 BLAKE2B f66561abfb9ab1ffab3f6ed3ef7aecb923f3a4727c52c82427c919057f506b34233dec125821cfefa5b0ad015a722c9b56be76ebf4f90341fd8da58175f2b638 SHA512 5a6e71aaa998f1ebec32c35a0cc3862cde612a2928a6cb8257e3e4ef8fcf97ffa384ec4392f2834164a0e85161fa7638930eff599755481df4c33475a0704996
 EBUILD uptimed-0.4.3.ebuild 1610 BLAKE2B d0e7bfc42af1f58fbb2ad1af6be005fd1205d3b2a02ea54df3436dfa7c1433c5c251db06db0eb4318276272103ed2fc39757008c0890393ea41c58cb89568f64 SHA512 55a244d867c1c3fe7c6b59b075664e8d9dda6fb20f0445b59c19f3a5162deb027fa6743b02190ce7045f43c13b1e7835a707ef20b2d3d5f3c8e13f2cfc97b9ee
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
deleted file mode 100644
index abc5e89c99e0..000000000000
--- a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools user systemd
-
-DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
-HOMEPAGE="https://github.com/rpodgorny/uptimed/"
-SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-pkg_setup() {
-	enewgroup uptimed
-	enewuser uptimed -1 -1 -1 uptimed
-}
-
-src_prepare() {
-	default
-	# fix configure.ac for >=automake-1.13 (bug #467582)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	local spooldir="/var/spool/${PN}"
-	keepdir ${spooldir}
-	fowners uptimed:uptimed ${spooldir}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	local spooldir="/var/spool/${PN}"
-	if [[ -d "${spooldir}" ]] ; then
-		einfo "Fixing permissions in ${spooldir}"
-		find ${spooldir} -type f -links 1 \
-			\( -name records -o -name records.old \) \
-			| xargs --no-run-if-empty chown uptimed:uptimed || die
-	fi
-	echo
-	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
-	elog "or systemctl start uptimed (for systemd)"
-	elog "To view your uptime records, use the command 'uprecords'."
-	echo
-}
diff --git a/app-misc/uptimed/uptimed-0.4.1-r2.ebuild b/app-misc/uptimed/uptimed-0.4.1-r2.ebuild
deleted file mode 100644
index f0e96cbc3b14..000000000000
--- a/app-misc/uptimed/uptimed-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
-HOMEPAGE="https://github.com/rpodgorny/uptimed/"
-SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	acct-group/uptimed
-	acct-user/uptimed
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	# fix configure.ac for >=automake-1.13 (bug #467582)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	local spooldir="/var/spool/${PN}"
-	keepdir ${spooldir}
-	fowners uptimed:uptimed ${spooldir}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	local spooldir="/var/spool/${PN}"
-	if [[ -d "${spooldir}" ]] ; then
-		einfo "Fixing permissions in ${spooldir}"
-		find ${spooldir} -type f -links 1 \
-			\( -name records -o -name records.old \) \
-			| xargs --no-run-if-empty chown uptimed:uptimed || die
-	fi
-	echo
-	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
-	elog "or systemctl start uptimed (for systemd)"
-	elog "To view your uptime records, use the command 'uprecords'."
-	echo
-}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index c7b82eba883e..b3bdeaeb1eca 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index 8dd3cec52311..e683e0f2f30d 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -1,5 +1,5 @@
-DIST homebank-5.4.3.tar.gz 3014659 BLAKE2B 7ec6aa1c8bdc7d26bae8ae751200a4ad9effd9aac08bd39a1969897d7904468f60606307be1b6e6587a662fd7874c8f73460e559c6d06820056811dd4e8fb85f SHA512 e2b3b45a6d35205c3d2bf24d4c0c065889fa4e7d92cc9551db873b8b33cc15e6c1dd721936b438db0725509233bf265446b0512e23973cbebae7af4a7dce96ba
 DIST homebank-5.5.1.tar.gz 3054854 BLAKE2B 8cfab126069b3404223645e3f37038db44040d873c2edbc06a5286ca936584016044d6e8dd4444166910b4c5a87874db5bdad43452aca2aa8f96ba0e7f648fbe SHA512 a13eccf92882d5bfe6b09a99d6c805337f68d5169c58615b750bf5994abd4df0709065e12d4cdc8eb0c80f758f602548b0279dc7eb089f7417f5da8fd1955626
-EBUILD homebank-5.4.3.ebuild 883 BLAKE2B d6d1b5caa1be46c441ab5ecc1219fde86d183f96e4148a3e81fcadea82641d9f360682e90b3d662097595b9cce98387f79d722bbffca5c93da585bd3678fe9de SHA512 d007f929c29906c9dc0c88b074805b9b296adbb58db8009d5d2c4b240b504b69aaa23be0bbd0fac1084c1ea4c929a804fda04b984b0a74e3f47ba1b9373e40f0
+DIST homebank-5.5.2.tar.gz 3056800 BLAKE2B c2c00214cb1311271b6c38ee8643ed1f6c6701ca07222fc60c6eb7d8c2fb4aecaacc188917825e386c13e908d22038602d7293f9d913b2c76d10956b5fbd3636 SHA512 c4279bb0f0d0ab58024c1d32148d987cc61c83ca77d8f523488a9c2dde9009469bce8291e8e90d5fdeae631813ec7556a5b4db7c709624f178fdee165feaa3ef
 EBUILD homebank-5.5.1.ebuild 884 BLAKE2B b6d654d0b2af04246f5d90d5a153536095f1470d44df86fb969e58b40ea1283b252370df74d12e8d21000e41ae78cbc31edc3ddcf43b2163a05a71e9ccf7d977 SHA512 7dc639ef94d2ce62ded832e451a9295dcad4efd4e882a6fba84264816071c07b933952862ce427c4e35dccdc7e81b3397cc75ffd05db9f03ffa4e4c6b0260c5c
+EBUILD homebank-5.5.2.ebuild 887 BLAKE2B eab06530017f136655a35a6a1cc9dfdbf2d1a92d47a13b053c156952e7e3720d52a706e7d3d8aeef5e3177fd9f0a8c72965e0762b462ac70c5bba9fca930573f SHA512 10730d420edbc51b90de6af09d8e92c4ca3a80f0d4adbe16e3f2d7d144601a569291e4acea2d7a1cdebcd1b64e126d178fe73bfbbd314ee2a16d031bc5f19665
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-office/homebank/homebank-5.4.3.ebuild b/app-office/homebank/homebank-5.4.3.ebuild
deleted file mode 100644
index 6d469b984ded..000000000000
--- a/app-office/homebank/homebank-5.4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit xdg
-
-DESCRIPTION="Free, easy, personal accounting for everyone"
-HOMEPAGE="http://homebank.free.fr/index.php"
-SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+ofx"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-
-RDEPEND=">=dev-libs/glib-2.39
-	>=net-libs/libsoup-2.26
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.8.3:= )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-lang/perl-5.8.1
-	dev-perl/XML-Parser
-	>=dev-util/intltool-0.40.5
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	default
-
-	# avoid using eautoreconf
-	sed -i -e 's|\$(datadir)/appdata|\$(datadir)/metainfo|' data/Makefile.{am,in} ||die
-}
-
-src_configure() {
-	econf $(use_with ofx)
-}
diff --git a/app-office/homebank/homebank-5.5.2.ebuild b/app-office/homebank/homebank-5.5.2.ebuild
new file mode 100644
index 000000000000..6eeaf4265c0c
--- /dev/null
+++ b/app-office/homebank/homebank-5.5.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit xdg
+
+DESCRIPTION="Free, easy, personal accounting for everyone"
+HOMEPAGE="http://homebank.free.fr/index.php"
+SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+ofx"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.39
+	>=net-libs/libsoup-2.26
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	ofx? ( >=dev-libs/libofx-0.8.3:= )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-lang/perl-5.8.1
+	dev-perl/XML-Parser
+	>=dev-util/intltool-0.40.5
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	default
+
+	# avoid using eautoreconf
+	sed -i -e 's|\$(datadir)/appdata|\$(datadir)/metainfo|' data/Makefile.{am,in} || die
+}
+
+src_configure() {
+	econf $(use_with ofx)
+}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 37738edd4741..7323206413f8 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/barry/Manifest b/app-pda/barry/Manifest
index b4cfe5510c35..8e5cb1ea146c 100644
--- a/app-pda/barry/Manifest
+++ b/app-pda/barry/Manifest
@@ -1,4 +1,4 @@
 AUX barry-0.18.4-shared_ptr.patch 746 BLAKE2B c45dbda427c25807e1cdb9d3d54a5695a92623230eaaabe41cff71236715c816f1d2de6e8c29f71d993288803010803fe046a3a96e39d9f0b6da3a7f452d793c SHA512 b376e3553aa22d3aa8a04cee766d34aae3d03ad3677174d5f02118653fbfe8391175238727cf0c21c0caf33a850cc10fa0fcf077266815e891bf5efbb3d0d745
 DIST barry-0.18.3.tar.bz2 3457451 BLAKE2B ba7f49e95ac85d764c1275f6dc06f4a7be080d8d725466e1bb8d23977437879f2f7bf7581d9f5bc1262a07f8d1478992ce3c62c9893504f1094dcfb16d944ebd SHA512 4944d22bd5f5a76201ca10ccaf9d12ecf21b298e5b9c8d3d503441e0ad0386a94699c48ae683004992508bb385e75ec137859509663148f2f148933fa508e7fd
-EBUILD barry-0.18.3.ebuild 2355 BLAKE2B 16a1e08d03387953612a25a052f7934d53839c393f7d4a49140a53955e937a9619cfd621e2a31288ed293fe406d432b40a3060fcabac7c697f145c10e09f031a SHA512 eb882b64c12354f2f0fb0d825f12c3bb7512b8047f63c2ca3ee9891f6985aac9bfcb1b189ccddb86e924895ea383124dc6e4279cddd4cd5272c4cd7f573e23b6
+EBUILD barry-0.18.3.ebuild 2080 BLAKE2B 60ea66f66b1cbf4fa19c89412dba9c3c7d648830d8d1dc27101e91e93dcd1afecef3db903f0e24ef3c718f3338b660d2c9f151eb48f2f07478a5cc32a2dd58bf SHA512 fdcf8657f7a3ef53d3739d8e7aee01e591190627754a92ec13687e7f40d23eda0efe23c0b0974ce67b0a9873f4bb111864af06f33838e5c44910ebbd2089745d
 MISC metadata.xml 524 BLAKE2B 4820baca6dc90863e98ad0bf91761455caf5dd4e009a1de4ef75b07b5283a34d3db055e2bc4a79e7daf9573e4ace6858e014c02d9d12cc691c7a837b06b2ddae SHA512 7d7ba574edf9acceeb1e33ee029741b399b4530bb7cc48cfefcbd7f3f543b3096eba596813c31c364051e8d17f27a7df7292e3551bcd48c4aabc66482b66e545
diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild
index 0709efae039f..2162d8fc9d85 100644
--- a/app-pda/barry/barry-0.18.3.ebuild
+++ b/app-pda/barry/barry-0.18.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit bash-completion-r1 desktop epatch flag-o-matic gnome2-utils udev
+inherit bash-completion-r1 desktop udev xdg
 
 DESCRIPTION="Sync, backup, program management, and charging for BlackBerry devices"
 HOMEPAGE="http://www.netdirect.ca/software/packages/barry/"
@@ -12,53 +12,58 @@ SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
 LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="boost doc gui nls static-libs"
+IUSE="boost doc gui nls"
 
-RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6
+RDEPEND="
+	>=dev-cpp/libxmlpp-2.6:2.6
 	dev-libs/glib:2
 	>=dev-libs/libtar-1.2.11-r2
 	>=media-libs/libsdl-1.2
 	>=sys-fs/fuse-2.5:=
 	sys-libs/zlib
 	virtual/libusb:1
-	boost? ( >=dev-libs/boost-1.33 )
+	boost? ( dev-libs/boost:= )
 	gui? (
 		dev-cpp/glibmm:2
 		dev-cpp/gtkmm:2.4
 		dev-cpp/libglademm:2.4
-		)"
-DEPEND="${RDEPEND}
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( >=app-doc/doxygen-1.5.6 )
 	nls? ( >=sys-devel/gettext-0.18.1.1 )"
 
-DOCS=( AUTHORS ChangeLog KnownBugs NEWS README TODO )
+PATCHES=( "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch
-
-	append-cxxflags -std=c++11
+	default
 
-	sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die
-	sed -i -e '/Icon/s:=.*:=barry:' "${S}"/menu/*.desktop || die
+	sed -e 's:plugdev:usb:g' -i udev/99-blackberry-perms.rules || die
+	sed -e '/Icon/s:=.*:=barry:' -i menu/*.desktop || die
 }
 
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_enable static-libs static) \
 		$(use_enable boost) \
 		$(use_enable gui) \
 		--disable-desktop \
-		--disable-rpath
+		--disable-rpath \
+		--disable-static
 }
 
 src_compile() {
 	default
 
 	if use doc; then
-		cd "${S}"
 		doxygen || die
+		# clean out cruft
+		find doc/www/doxygen/html/ \( \
+			-iname '*.map*' -o \
+			-iname '*.md5' -o \
+			-iname '*.php' -o \
+			-iname '*.sh' \) -delete || die
 	fi
 }
 
@@ -66,39 +71,26 @@ src_install() {
 	default
 
 	# docs
-	rm -rf "${S}"/doc/www/*.{php,sh}
-	find "${S}"/doc/www/doxygen/html -name "*.map" -size 0 -exec rm -f {} +
-	use doc && dohtml "${S}"/doc/www/doxygen/html/*
-	rm -rf "${S}"/doc/www
-	dodoc -r "${S}"/doc/*
+	dodoc KnownBugs
+	use doc && dodoc -r doc/www/doxygen/html
+	rm -rf doc/www || die
+	dodoc -r doc/.
 
 	# Skipping different (old Fedora) rules 69-blackberry.rules in purpose
-	udev_dorules "${S}"/udev/10-blackberry.rules "${S}"/udev/99-blackberry-perms.rules
+	udev_dorules udev/10-blackberry.rules udev/99-blackberry-perms.rules
 
 	# blacklist for BERRY_CHARGE kernel module
 	insinto /lib/modprobe.d
-	doins "${S}"/modprobe/blacklist-berry_charge.conf
+	doins modprobe/blacklist-berry_charge.conf
 
 	# pppd options files
 	docinto ppp
-	dodoc "${S}"/ppp/*
+	dodoc -r ppp/.
 
-	dobashcomp "${S}"/bash/btool "${S}"/bash/bjavaloader
+	dobashcomp bash/btool bash/bjavaloader
 
-	newicon -s scalable "${S}"/logo/${PN}_logo_icon.svg ${PN}.svg
-	use gui && domenu "${S}"/menu/barrybackup.desktop
+	newicon -s scalable logo/${PN}_logo_icon.svg ${PN}.svg
+	use gui && domenu menu/barrybackup.desktop
 
 	find "${ED}" -name '*.la' -delete || die
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index eab4552c2e19..833500e73946 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 40c837759e7d..e682e1362e11 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,9 +1,7 @@
-DIST portage-utils-0.87.tar.xz 1772956 BLAKE2B b1487d89303b524ffa9e6030feba181fcad73a6f38febf29f63b1f7bcd7a5080ddb1f907ca217040d064427f2060bb3885a61c30663594428be475a5bf7253f0 SHA512 a29f2d1fc85aea1c2b4c8b16fca0e9b559a980951f79cb10d7fd836d99ec65a904f2cbc54a949150ce490ba5d705b0aa5aa39f56365968b3dd591cb3d7c5eb21
 DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d9420fbfa20f9f2e03f4f53d118df4dc243cddce33994095a3e41bd1027a42c9c29cda65cb7cf4f45279a028b21555f4f8 SHA512 67290a69ad6ac40da3ce0f41d2630096690e69bb97a1428af921ccc582dcfbf903bbf98259f68afdbe9e96aef81672ea3352a9266a649e75f99acec7fa00cd8a
 DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
 DIST portage-utils-0.92.tar.xz 1819676 BLAKE2B 01798e3984745140bca1bcc1eda5c2aea7c517bee2656acfe1bd810fc8088ddcb474f2c64fee6832c5e1699e2ec8ad5a9c6d5afba8a2e2b6f1861d49fbf7fcb7 SHA512 7d36263c9c242c8e82786fa12e171a3f396f65520acb8caa91516862615bd71241699ab6c2232122f7009875aa0a10b06b614a842d45afc86e599b39711e12b3
-EBUILD portage-utils-0.87.ebuild 1707 BLAKE2B a411aaf8dc385843107696df153d2c29ff97c748b2bd39b8e64850d62d3a27ba10e4e29e9aa5cfdd666c93ad43a569a53fff3d76d5bced1b88224009cfe92e58 SHA512 c56bf366aa60766fb71d9f94adca194a1df24dec763fc1d3c5b638367a4987c79fb65c97ed35dabcc1024e1978a8c48e348dedc2b6515127ac53a6647504741a
-EBUILD portage-utils-0.90.1.ebuild 1335 BLAKE2B 2c97030539c2b8a4970536476f20df962199cb1eedfe562a7a77a7ce29c2974b447575f391441579629b1c963670bdbc03e8f97f46a0e6847f06d8e3a4bb0755 SHA512 ff5bf513452d919ea93310f380913317d4f4436db92c08289cd46ebe3345f7af3b272cb4b76091e13a04e0803ea60e61cc02822b74ae2629da6e10c45a23c4ed
+EBUILD portage-utils-0.90.1.ebuild 1344 BLAKE2B aa2a6db5a845dae33a6a5e711b3cc2f49d39458bb89bb3498b1b29a87909456f6e361f2108aff2b0dc36bd73189b5d6b0826e352ee47d80c0388bd47b5e08a92 SHA512 54523cfaa4e7362efe036e37f75cb8a40c356569952293ac2e9ee1a8ac289ea1e5f32b0c41c65ad505b5d3e0b686dd1bd4b6ac463ed78b33f89e2850119e170f
 EBUILD portage-utils-0.90.ebuild 1524 BLAKE2B 75878900c8ba8a8a6c8382a0be0a48bf5bb75ef28b12583e437a577cbf3138f6e562675344bb79b3516c7510baed5bf5d69339d0e6924570e21fc45c2f248c0e SHA512 9bd404d97610fedb1e036e5548be12932570fe7916ab486e02835baa1bfa8d8fa59a7c31689b17728d72ee9d8d1a4733823dc611a6c9b2eecc1d58f78b1165ac
 EBUILD portage-utils-0.92.ebuild 1528 BLAKE2B 6ffd2e8918b698d5bd889466372feb394b8aed16a16a388f4e2a17d33a94cac296359255efc8a2b339422a6b10ba957e68021895ce90c36c30997e2fb1d97416 SHA512 8aa781c65ec4e0cb67f9b34c1fc184f50b6c81d3c4b3518d51adbe6710d3f6f76ba53e8c6362a70750e2c72aec84b4be87794a8d8135e037bbef4ddcc5ad81e3
 EBUILD portage-utils-9999.ebuild 1528 BLAKE2B 6ffd2e8918b698d5bd889466372feb394b8aed16a16a388f4e2a17d33a94cac296359255efc8a2b339422a6b10ba957e68021895ce90c36c30997e2fb1d97416 SHA512 8aa781c65ec4e0cb67f9b34c1fc184f50b6c81d3c4b3518d51adbe6710d3f6f76ba53e8c6362a70750e2c72aec84b4be87794a8d8135e037bbef4ddcc5ad81e3
diff --git a/app-portage/portage-utils/portage-utils-0.87.ebuild b/app-portage/portage-utils/portage-utils-0.87.ebuild
deleted file mode 100644
index ce7e6dec67c0..000000000000
--- a/app-portage/portage-utils/portage-utils-0.87.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Small and fast Portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
-else
-	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="hppa ppc"
-fi
-
-RDEPEND="
-	qmanifest? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			app-crypt/libb2:=[static-libs]
-			dev-libs/openssl:0=[static-libs]
-			sys-libs/zlib:=[static-libs]
-			app-crypt/gpgme:=[static-libs]
-		)
-		!static? (
-			app-crypt/libb2:=
-			dev-libs/openssl:0=
-			sys-libs/zlib:=
-			app-crypt/gpgme:=
-		)
-	)
-	qtegrity? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			dev-libs/openssl:0=[static-libs]
-		)
-		!static? (
-			dev-libs/openssl:0=
-		)
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--with-eprefix="${EPREFIX}" \
-		$(use_enable qmanifest) \
-		$(use_enable qtegrity) \
-		$(use_enable openmp) \
-		$(use_enable static)
-}
-
-pkg_postinst() {
-	local pvr
-	local doshow=
-	for pvr in ${REPLACING_VERSIONS} ; do
-		[[ ${pvr} != "0.8"[012]* ]] && doshow=true
-	done
-
-	if [[ ${doshow} == true ]] ; then
-		elog "This version of Portage utils has undergone significant changes."
-		elog "Please read the elog manpages for applets like qlop(1) and"
-		elog "qfile(1) where argument options have changed."
-	fi
-}
diff --git a/app-portage/portage-utils/portage-utils-0.90.1.ebuild b/app-portage/portage-utils/portage-utils-0.90.1.ebuild
index c4a96b379926..98fc23048d55 100644
--- a/app-portage/portage-utils/portage-utils-0.90.1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.90.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="sparc x86"
+	KEYWORDS="hppa ppc sparc x86"
 fi
 
 RDEPEND="
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 491a9adde2d3..f85e2d61f6a1 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index e65a838cf9c9..04c50b4b0a15 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -1,4 +1,4 @@
 DIST autojump-22.5.3.tar.gz 55429 BLAKE2B 3a2773669f81d1a54c01cce9fe75bc01609265998b035b4ba1aa064f1132acf852b59eb04ebfa744e628152f0ab478cbef24e5aff326bf84cec6e2c9348e8360 SHA512 d1dd3cbb67fda4e0a17ec5028b947faf46be8a95a6cd8418127b927f42bc95b71538a06658b38b479c77d147a6cd5e8cef77639ef538c7d449414c469c13f140
-EBUILD autojump-22.5.3-r1.ebuild 1973 BLAKE2B dc81d398100adbe54cd9bd7c838f1752ff7561eba3b63573a99918463a3bdd7ee30efad01316dd3bc0cfea243e93cc3dc4e01600b7feffd65de9754f54ffcdfb SHA512 cec85f2406aebbdf51ff51063493a9aa6caed244f011fdb51e3c8cfea8baacbbb139c48e58cfb68f8c13663f3fbea327de8d385eeddfcc65cf286f8d6eff969a
+EBUILD autojump-22.5.3-r1.ebuild 1978 BLAKE2B ecaded7e032ea67fd9ff3aed9a29db660e8b88f8922df45a232a4809d98ecc4a544f099f42a16549806aaec88d40d31a593af23f959c076114aa96046e77affb SHA512 5dc6dbbe6485a09c9ae62a0d4fc90d76e9fe4720b71d03c61344ea856708823d34b693afe9f65e480d9d7f0a650bf2ee6f603ad5b703a8d7153188c0c4e87b5d
 EBUILD autojump-22.5.3.ebuild 1920 BLAKE2B 5ce4f10233f3c6e54124724ebc8ea3bb4ac41d377c870081ab68a614bdf10c7f81160e6eee1b62a0ec5198df4049f32112f31ed01fcd89c7637048829f1a1427 SHA512 beb84dfaa1c1dab86555fbb8421b0c12c38bb00124291dc4d10db14ade392440a65e5a45793ffb520d5ebca21d3dd58dc11a168a14c0cabfdcf849cddf77031b
 MISC metadata.xml 490 BLAKE2B 33ef64a70f2b0d3211861a9ae667a4ed930f850a0198661cd3371024ac6193c80d3121ca188f48cac4732741fdea08e918c8ef78161a921127ec82b1064dd1c1 SHA512 c7742421c4211de2b774bb6136261863bd69a93debe3f1ab4b921e9f19a7581ef2711fbe2090ada92b60f799cd6683368e48d974ab9698ae3c2b5f768cd34db9
diff --git a/app-shells/autojump/autojump-22.5.3-r1.ebuild b/app-shells/autojump/autojump-22.5.3-r1.ebuild
index a8d2faf130c3..aaddacf3c3c2 100644
--- a/app-shells/autojump/autojump-22.5.3-r1.ebuild
+++ b/app-shells/autojump/autojump-22.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wting/${PN}/archive/release-v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x64-macos"
+KEYWORDS="~amd64 ~hppa ~ppc ~x64-macos"
 IUSE="ipython test"
 REQUIRED_USE="ipython? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index a0eba10fd45d..5a1956b4f473 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -33,6 +33,6 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c99852
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-EBUILD fzf-0.27.0.ebuild 3235 BLAKE2B b8e9c08e4afe0a14d0d32c1cc6dc6733861cf4915ee95e32303b6cd493000fc07ec885a805a4688a7b366db8957f81581eda751949a52813a4ea705c9c05dca6 SHA512 df5eb8f6a49913e3fd77358c1ba1065d971f316a297f177f11c9f71e67f8a8a7f142b4b802af1c4c09975af1e22f8517cc9c71ebc813145188148e4a1a08de91
+EBUILD fzf-0.27.0.ebuild 3233 BLAKE2B 40484a098dd85208a347fcbc9e6f73c7fb1b893226984004349c167feac412d657b6c895a9ef88ab144f3bc660717e0138e140b2a6d7dc9369db2fe0bf7d0fcc SHA512 2b8ba9937253d1db140c98e3833899f2c5c3c0dc9a105a6296136bfde9598804c620416364974d8e6394264588876b79b20c99d6c8745f28b401fc80e6d83535
 EBUILD fzf-0.27.2.ebuild 3311 BLAKE2B 5b8d2a646525d77cb5901271887a1cf4b8d1fbafe6066f482e6f1e8b818d7443d0980cae95981bede17b61106dc7f7c01e0e07094934e144769f9b3cfab5bbbc SHA512 756c32caceff199aa7ad907e0dc1bc5fbe19c8070d316121dae7776c1c73896975ec12be9f407852910216f95040fb24257fa1ca087de690cc21c725846402eb
 MISC metadata.xml 594 BLAKE2B 3cdf328ffbca3bba7a07992f4820fd9bf20c0a58bc4ad331577ef3caafa15ddac3761d678cf1cb23f3b4c7cbdae82b4cd6bf002a547af43bde758e2a2ebcdec5 SHA512 f8badc347b1ecd79abf800487d29678bfbbd984c4af11cd9f9ffab6c516663593556d8db2306fcfe601857cc58521be1230c002aad8e8d2ed671a177c9b22c27
diff --git a/app-shells/fzf/fzf-0.27.0.ebuild b/app-shells/fzf/fzf-0.27.0.ebuild
index 8a094f3a5dbe..5296d17d194b 100644
--- a/app-shells/fzf/fzf-0.27.0.ebuild
+++ b/app-shells/fzf/fzf-0.27.0.ebuild
@@ -56,7 +56,7 @@ SRC_URI="
 
 LICENSE="MIT BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_compile() {
 	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index 4b4c7ceea156..6a98b52521d8 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -11,6 +11,7 @@ DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cc-1.0.52.crate 51006 BLAKE2B a19083042845bc1fcead482b1e644ce09701fc97aad60afc0750d7ee191e26257e5c926fb5a70bef8cc5a37a694581e6098a29c56e63868d67302bb270a8f8f8 SHA512 50558f9b76748298568a1e010ab85b0a0e1cf47d6f8589de718aac0afc130158b092e1be11b73bb1ff51d3a281c5e6ad72ecad5bce9dbff90b4c330c8d95dd90
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
@@ -22,6 +23,7 @@ DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST getrandom_package-0.1.20.crate 883 BLAKE2B b72ca1dac1e8745b3a8b49423c73340b0876eb507ecefb619bdc47c48b1320c2f2653bea9f370c0988b3103ff543ac6c22f915b7c48ab108af15126f8187047d SHA512 6152ce07fabbbb3176484e38493dc1099ebe4a56b573361a92fb624f8bb784ecd8f16f8ecdef988699156aace636548c8300b205371a90fbf14379cb257b41ae
 DIST hermit-abi-0.1.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
 DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
@@ -29,9 +31,11 @@ DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52
 DIST libsqlite3-sys-0.10.0.crate 2175426 BLAKE2B dc7cbbcb632e2de1e8fcd6372cb0a82ed044db1d8634fa88b4294efb01470528fc86cece8c1ba6c4800a97c39d78bebb4b858efaf7c3c74510f5cf675ca2a1f0 SHA512 df030105952e8e0ca9def15d914a2eb7fb81754c85465788f7a3df5626b647d4af7f93b11f2f6d6e3dba286fd101c779dd51de7f2732084ba9542120cbc0e299
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
 DIST lru-cache-0.1.2.crate 9307 BLAKE2B 606072bc5390a13cf24b4c64c77ba7f84c4c2b1a73c4abe8ead4e1d19067b063888d5cbe478dc9108d193f0a66aa5fb2ddc073f3edfac466de34f85a52a15ef2 SHA512 ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1
-DIST mcfly-0.5.3.tar.gz 201851 BLAKE2B e9be0b18ca8bfc423fd01634544f8795da3334f69c3a7fb1782322f96daa41d954ac69af88ea76294b4379fc5acd3aa677e92cb2ecc72df0941347b735f259ef SHA512 058a2cd95eb6f2bc0ff7af4f56b109e18624e86c8924da96d79ec032aeed11c5a710f38216ee9958d8affedbeee429241bae4a6fa5570d7812becfb2f4176632
 DIST mcfly-0.5.6.tar.gz 202647 BLAKE2B 9acd3eb94c3c36991a2f990d9cab8b327e064e639651c1664e2306ed3e2716609c0c9e8aeed8e4bf26c0e5daab078b61f982342ab06964bede644dda039ae341 SHA512 0e715a292df56170056aef3de9310671e6e6763741b5b918c14f55d74f24f8310a284e22e7697b994d304044a7fafdbc42049694b688f05c5598582ea743da1b
+DIST mcfly-0.5.7.tar.gz 205712 BLAKE2B 88fad8b6c51478bc9b21d58a547daddcf5eebc0f88f71e1bced9b07bf06083f4ea4f48c42db45eb92d668be49c2dd11b7878875fabc8c3f9d94e591bd3b99ad7 SHA512 d8245f9feafe7539d0401f87ca99a7a10e537b9f1cbe163d9eb5b5400758cff46c919829e56eb4f8ce3542b4f131e3f9072eb75d55df753fabc1f9a28483dcc4
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
+DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
@@ -64,6 +68,6 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD mcfly-0.5.3-r1.ebuild 2166 BLAKE2B 10190f9501ccd89ccb0d3e982cce820aff107a6812f0edfad6a9dcdd62efcbd7fa08d1d46dada41ac12218540cf2806f8cd3d8c3a3a8bee84149f6f0afb1dc6a SHA512 8282d58d80feab34defd073b9c4386b9961335cf1394ad5ad6931b7e722172fa59f86e0349501b6b14aeabb5b5d5889027c6db9b0f5a54ef40d797b106a1e309
 EBUILD mcfly-0.5.6.ebuild 2190 BLAKE2B c926c5b3688ddf33d86cb8988109bb02b0d47e157ebf229b22ba443562d2485b297ade3f5a5f7a0e5c0f5e87e8dce8accb0599fe051c32a4e0b3c0d51e4c5c1f SHA512 52c9103b3528dfbaadfbddea4d447eb16e79f099792291f262c8de37f36adf69b68497579ffba2cf710782053cca8222e5c66e74dc160f16bdb9b7495e0b5116
+EBUILD mcfly-0.5.7.ebuild 2331 BLAKE2B a284499c5c1d7e64daac0a36d95544d90d714b12459011f9c7de104ed2b7e5e9ab74f2d671a857a90d43955a9343306d0f87c67d7190f35aa6d0f2cf9ab7aef2 SHA512 7bed0f39e05e5a7b85b423b2dd58a50076575a59543dd86b6899ac78f5ad57b616cb78219e146ad52a4a1526c47bbfb818b6f6a687022a3935023bfbac41b7fc
 MISC metadata.xml 905 BLAKE2B dc23375a7d313454fbaf67f8b5312fe0acd5b9acbc5ed597fcb0027ea420519ef230b245eed61dbdc3c8779a5f87af18be5223c7cf9dcaa0e9619facad93442f SHA512 cc6209e5eb422500ff6a2d50c43424f1da0fb628929aa2093ec5ee844ef3d0afc5f234a4ce95c5edb5bf89d9ad60f624663d4d7e70f32a8b07ae02cb6cb0809a
diff --git a/app-shells/mcfly/mcfly-0.5.3-r1.ebuild b/app-shells/mcfly/mcfly-0.5.3-r1.ebuild
deleted file mode 100644
index f5542eb9926a..000000000000
--- a/app-shells/mcfly/mcfly-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.10
-ansi_term-0.11.0
-arrayref-0.3.6
-arrayvec-0.5.1
-atty-0.2.14
-autocfg-1.0.0
-base64-0.11.0
-bitflags-1.2.1
-blake2b_simd-0.5.10
-bstr-0.2.12
-byteorder-1.3.4
-cc-1.0.52
-cfg-if-0.1.10
-clap-2.33.0
-constant_time_eq-0.1.5
-crossbeam-utils-0.7.2
-csv-1.1.3
-csv-core-0.1.10
-dirs-2.0.2
-dirs-sys-0.3.4
-either-1.6.1
-getrandom-0.1.14
-hermit-abi-0.1.12
-itertools-0.9.0
-itoa-0.4.5
-lazy_static-1.4.0
-libc-0.2.69
-libsqlite3-sys-0.10.0
-linked-hash-map-0.5.3
-lru-cache-0.1.2
-memchr-2.3.3
-numtoa-0.1.0
-pkg-config-0.3.17
-ppv-lite86-0.2.6
-rand-0.7.3
-rand_chacha-0.2.2
-rand_core-0.5.1
-rand_hc-0.2.0
-redox_syscall-0.1.56
-redox_termios-0.1.1
-redox_users-0.3.4
-regex-1.3.7
-regex-automata-0.1.9
-regex-syntax-0.6.17
-relative-path-1.0.0
-rusqlite-0.15.0
-rust-argon2-0.7.0
-ryu-1.0.4
-serde-1.0.106
-shellexpand-2.0.0
-strsim-0.8.0
-termion-1.5.5
-textwrap-0.11.0
-thread_local-1.0.1
-time-0.1.43
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-vcpkg-0.2.8
-vec_map-0.8.2
-wasi-0.9.0+wasi-snapshot-preview1
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="Context-aware bash history search replacement (ctrl-r)"
-HOMEPAGE="https://github.com/cantino/mcfly"
-SRC_URI="https://github.com/cantino/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-db/sqlite:3"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="/usr/bin/mcfly"
-
-src_install() {
-	cargo_src_install
-
-	insinto "/usr/share/${PN}"
-	doins "${PN}".{bash,fish,zsh}
-
-	einstalldocs
-}
-
-pkg_postinst() {
-
-	elog "To start using ${PN}, add the following to your shell:"
-	elog
-	elog "~/.bashrc"
-	local p="${EPREFIX}/usr/share/${PN}/${PN}.bash"
-	elog "[[ -f ${p} ]] && source ${p}"
-	elog
-	elog "~/.config/fish/config.fish"
-	local p="${EPREFIX}/usr/share/${PN}/${PN}.fish"
-	elog "if test -r ${p}"
-	elog "    source ${p}"
-	elog "    mcfly_key_bindings"
-	elog
-	elog "~/.zsh"
-	local p="${EPREFIX}/usr/share/${PN}/${PN}.zsh"
-	elog "[[ -f ${p} ]] && source ${p}"
-}
diff --git a/app-shells/mcfly/mcfly-0.5.7.ebuild b/app-shells/mcfly/mcfly-0.5.7.ebuild
new file mode 100644
index 000000000000..4f0477924f90
--- /dev/null
+++ b/app-shells/mcfly/mcfly-0.5.7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick-0.7.10
+	ansi_term-0.11.0
+	arrayref-0.3.6
+	arrayvec-0.5.1
+	atty-0.2.14
+	autocfg-1.0.0
+	base64-0.11.0
+	bitflags-1.2.1
+	blake2b_simd-0.5.10
+	bstr-0.2.12
+	byteorder-1.3.4
+	cc-1.0.52
+	cfg-if-0.1.10
+	chrono-0.4.19
+	clap-2.33.0
+	constant_time_eq-0.1.5
+	crossbeam-utils-0.7.2
+	csv-1.1.3
+	csv-core-0.1.10
+	dirs-2.0.2
+	dirs-sys-0.3.4
+	either-1.6.1
+	getrandom-0.1.14
+	hermit-abi-0.1.12
+	humantime-2.1.0
+	itertools-0.9.0
+	itoa-0.4.5
+	lazy_static-1.4.0
+	libc-0.2.69
+	libsqlite3-sys-0.10.0
+	linked-hash-map-0.5.3
+	lru-cache-0.1.2
+	memchr-2.3.3
+	num-integer-0.1.44
+	num-traits-0.2.14
+	numtoa-0.1.0
+	pkg-config-0.3.17
+	ppv-lite86-0.2.6
+	rand-0.7.3
+	rand_chacha-0.2.2
+	rand_core-0.5.1
+	rand_hc-0.2.0
+	redox_syscall-0.1.56
+	redox_termios-0.1.1
+	redox_users-0.3.4
+	regex-1.3.7
+	regex-automata-0.1.9
+	regex-syntax-0.6.17
+	relative-path-1.0.0
+	rusqlite-0.15.0
+	rust-argon2-0.7.0
+	ryu-1.0.4
+	serde-1.0.106
+	shellexpand-2.0.0
+	strsim-0.8.0
+	termion-1.5.5
+	textwrap-0.11.0
+	thread_local-1.0.1
+	time-0.1.43
+	unicode-segmentation-1.6.0
+	unicode-width-0.1.7
+	vcpkg-0.2.8
+	vec_map-0.8.2
+	wasi-0.9.0+wasi-snapshot-preview1
+	winapi-0.3.8
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Context-aware bash history search replacement (ctrl-r)"
+HOMEPAGE="https://github.com/cantino/mcfly"
+SRC_URI="https://github.com/cantino/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 CC0-1.0 MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-db/sqlite:3"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="/usr/bin/mcfly"
+
+src_install() {
+	cargo_src_install
+
+	insinto "/usr/share/${PN}"
+	doins "${PN}".{bash,fish,zsh}
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "To start using ${PN}, add the following to your shell:"
+	elog
+	elog "~/.bashrc"
+	local p="${EPREFIX}/usr/share/${PN}/${PN}.bash"
+	elog "[[ -f ${p} ]] && source ${p}"
+	elog
+	elog "~/.config/fish/config.fish"
+	local p="${EPREFIX}/usr/share/${PN}/${PN}.fish"
+	elog "if test -r ${p}"
+	elog "    source ${p}"
+	elog "    mcfly_key_bindings"
+	elog
+	elog "~/.zsh"
+	local p="${EPREFIX}/usr/share/${PN}/${PN}.zsh"
+	elog "[[ -f ${p} ]] && source ${p}"
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 7b063a077c60..7758b31adf55 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 3a33f55950a7..af9bbc716e4c 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,5 @@
 DIST ansifilter-2.17.tar.bz2 436116 BLAKE2B 94a1788cffa66343643f48a18748d5359b090803cde723a02bc38f908c262631f1cd2eb150b6a743d66caa04983ea444ba150cf34ce07bdb456979e19631582f SHA512 ab9d590189482f2a27affd62b456c96b947b04d8c8b1214f1ea967971c8ed7df8a7c15d1079f957164d01916d144dcd5dc4b0ac05b452f9f4b8095273d3d3162
 DIST ansifilter-2.18.tar.bz2 436432 BLAKE2B 43c592e83a967ee86404332a464d57d202a73651b2e29da2d1d21163d295b6efba96ecb5861dacfa89b8f567c0367f7a32b8e658f8cefad82c5982f2f2bf70bb SHA512 ef7febed1fc31f5c7503648e4fc0a7aefc3da8e30ea649bd6f03eac2904667fb779049106ccb77ad16fbf655e979f6651b25b84ab126c940c66bedee115a28e2
 EBUILD ansifilter-2.17.ebuild 1124 BLAKE2B 89f6293eac8b6e77fdd676cb218f5d8858957ab61845b90f164a104510fdacc4e0a832f54a30a0c7f0f2d7a48fddd8f8654c4c3aafac5dbcaff820b371d64831 SHA512 e3607267879b723f3cd989e78fcf352c91cddf0e8a0b75756d3e54bc3b672e2c1d2ad14c8f8b59afad44b14fb5dbafaf49caf575f3d3a9ce32f89aae4e33ede7
-EBUILD ansifilter-2.18.ebuild 1131 BLAKE2B 331b5ab4a4adda957b863ccd733776aff805e71ad0f82d04b782d2aeb72416bcfb9a3ba54bc871cebf18e3460d2ba933090b4775c5824ea261337248b5f59431 SHA512 52b2df0a11bdd970c2f8e9c7bdd8085ddc441d2ba5eaf8eedaea22b7c68d0b1b07cca44c18a939ff0ce25416908dcf4805d3ffcf03867feda94786af4de1bfe2
+EBUILD ansifilter-2.18.ebuild 1128 BLAKE2B 73ab3b956a4baaa37bda981acf6c5161475239fb8767e464b4575a1ced7c24effa499a45d39935daca192d7fde0f797e3bb38692a2602c5a9ca8f2166f2c76dd SHA512 a47abfafd79f627350640e729769232fde9cdb7a25df4c137d3fa92a2d9613f32d21493fb69b1a0463d0c2069a658bdabd249ed064975d25b47df7d7f698ccd0
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.18.ebuild b/app-text/ansifilter/ansifilter-2.18.ebuild
index f1a848e9dc45..28c39b8bbaf6 100644
--- a/app-text/ansifilter/ansifilter-2.18.ebuild
+++ b/app-text/ansifilter/ansifilter-2.18.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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 7b250f418117..266d2a9765d9 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,4 +1,5 @@
 AUX gethopt-undefined.patch 358 BLAKE2B ccc264eece330bc0c8979731410488b070c91e73381ed4f00ff95f04c5f023948f304dd70c0f8ec4ff67abf266d80ce8931fa46f53486e2e0e003f151fbda4b7 SHA512 a7504f3ab60ff49b72e475e558e128522757874d4328abf7e488313dff7c2fc3650fffc12a03109601a14348f24f21a83ed0e83f9d6fe1176207ac2692800dc1
 DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
 EBUILD discount-2.2.7-r1.ebuild 1690 BLAKE2B 710bd40dc677328a0f8aaa6ad3a387d75fe939b289186d889f35002c08c82b52bfaa5fe138816eb7ecdbfd6ec437b863df0c248448cd99e92452a2cafeb995a1 SHA512 27008019ccf6fb42d7e364990baa6facb7f0c8d8e40375dcc44594ccef7c792648f8d1dcd6c69a895c5a059c3799722d43338bbbc1c443dc284433ac0da4156d
+EBUILD discount-2.2.7-r2.ebuild 1696 BLAKE2B cfb7a7bad5acd5e08d4a3600eacdbb6990def006b87e2f86ff8b37495260bddab4ce45871367299575d8d58401e4d52f2db9632d0e40bca04c42e0c64b799728 SHA512 5baf0d566839378f454dbf06b32289c215772f8b4dbaeb97c97869c597a69e49cf03c2393030f918a069b9cacab69e29c7f8908fe8d21298f4703a2f2bbce4e1
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-text/discount/discount-2.2.7-r2.ebuild b/app-text/discount/discount-2.2.7-r2.ebuild
new file mode 100644
index 000000000000..10b47fddbbbe
--- /dev/null
+++ b/app-text/discount/discount-2.2.7-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Markdown-to HTML translator written in C"
+HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
+SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/gethopt-undefined.patch )
+
+src_prepare() {
+	default
+
+	# for QA, we remove the Makefile’s usage of install -s.
+	# Drop ldconfig invocation.
+	# Force “librarian.sh� to respect LDFLAGS ($FLAGS should have CFLAGS
+	# at that point).
+	sed -i \
+		-e '/INSTALL_PROGRAM/s,\$_strip ,,' \
+		-e 's/\(LDCONFIG=\).*/\1:/' \
+		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
+		configure.inc || die "sed configure.inc failed"
+}
+
+src_configure() {
+	local configure_call=(
+		./configure.sh
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--prefix="${EPREFIX}/usr"
+		--mandir="${EPREFIX}/usr/share/man"
+		--shared
+		--pkg-config
+		$(usex minimal '' --enable-all-features)
+		# Enable deterministic HTML generation behavior. Otherwise, will
+		# actually call rand() as part of its serialization code...
+		--debian-glitch
+	)
+	einfo "Running ${configure_call[@]}"
+	CC="$(tc-getCC)" AR="$(tc-getAR)" \
+	"${configure_call[@]}" || die
+}
+
+src_compile() {
+	emake libmarkdown
+	emake
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(usex minimal install install.everything) \
+		SAMPLE_PFX="${PN}-"
+}
+
+pkg_postinst() {
+	if ! use minimal; then
+		elog 'Sample binaries with overly-generic names have been'
+		elog "prefixed with \"${PN}-\"."
+	fi
+}
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 67ad17217c10..957dc0412eee 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -3,6 +3,10 @@ AUX 40.1-build-Fix-t1lib-detection.patch 1017 BLAKE2B fbb53e5c0a0da025b0410af62a
 AUX 40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch 1207 BLAKE2B ebcf5f7fe0419ce853c492699b97cc17b0df17c2d86f66ccadd4aef7e08e324a79d358a81c7148b73efc6a4788eeac128532665b9f8abb41a65908771c051219 SHA512 4816954209c20debecc6d6ca20650ac0bb06979d4b0e8d7fc63bda5445372f405fabc6accf44f0c62fad37070dada8cbb157f615e093f7ec894dccabf6069a4d
 DIST evince-40.1.tar.xz 2928924 BLAKE2B e9376c186da9fed132b820b2e9a1ef6bb0997f22abca3d7b271691291ea4870132b48075ada5a992e056193e6af51bdf95e6bbdac79c789475fb985d692f9ccc SHA512 c688ee962cfff8b024b572161bae689d25b5b566ac623abeff38b4b8e6e541ce343023ed2c1ba0df1f65d6ec9a631aac3a748c940db556dbb89ab45ac565147d
 DIST evince-40.2.tar.xz 2928072 BLAKE2B 86051e8568044ec484a7a3c036a523ee44d22e46bdf5e75c6052d3302f92a27d48cb26e2408b176cfee3fafd3879a8771f4bf29a51f6b8085c31fa28f4885660 SHA512 f3ee19053a0bc6989a50fc790d1d54747d7aac5cbf0cd1e0eaea6cb743c0ebbbdf2565e88ea995fbba31c7f97e4279f9c0fa44c386bcf635a500033f6105ca9f
+DIST evince-40.3.tar.xz 2928396 BLAKE2B 00129c036a6b01efa44b7a72587e51d2399f4f262a0c38026e0797a44992675ef04861c869b81772774aad63e8ffd1453ab25c382fed6ad4759e899af41dd82f SHA512 cf0c5468121ba952df3e16682a29ec2e46e0796f3c51c347c75a0385ab528af28bdecc907e7a30087efa1d5d1b6a794416fdecdb995b2cc062e657b2368bc4e7
+DIST evince-40.4.tar.xz 2928100 BLAKE2B 491b2333e21093b032ec9c4f24c61cdaa31e4a46ee058b0f109b0998fb7216ada2c933e6202eae1d6193caad0cfa94a77434ef042555bab7cf4aeed959be759b SHA512 dbec3828f1e8f0b9b48dd90ce605ce83312e53cbeb8f8e7358c1318f1701680a69a9bcd26b7cf1da4b53679ae11e334ce514f5df4c5bbcc976581441e0d654cd
 EBUILD evince-40.1-r1.ebuild 3247 BLAKE2B 578562594a55320dd6e9d2c9f437cef0e737071cb74e396d1ee0c0e06c0244356bf1dd918b563c72c8dce2ff1d5a29d2c86361383cdbd404e912a90f4ee42b3c SHA512 492261623631a1a5c1192a26c7e3d06839554bbd389303641c7f488b3846ff5662ee06ca565c1db8ab7ab5c97a7c07bf1cc909e5f3a7da95b4498f533cda905d
 EBUILD evince-40.2.ebuild 3114 BLAKE2B 212af71efdef680ec92b16edfb8e3e7663f456f66aa33d87f9c6a3f3238ed3d47c560c73a5067290969c88a28e215ad96dcfde4c6e341807f071521de0972c0e SHA512 0868af950d265c5f12ab93a29eb547285cdb7e9ce07a6f82b3067fdaa507c47188f619d53dc3f987a6820a0518690cbac93fe9592df048e22b417194581ee917
+EBUILD evince-40.3.ebuild 3116 BLAKE2B fcb217f0a151a12b9a527a35386ef5b3c8b268465d72fce8ba0e60eb69897a93541c45d56dd840bc54f2179963aa5f12cb4a5a5fad4828795c08b5db0dafe644 SHA512 c0c3964ed4d4e6d23ed15fb427a56882f10ce8ebb00d078332ec0f1eaff1363b7f7910c6690d66363788e97a703d35278809bf83924b495aa025ab7f07ca5212
+EBUILD evince-40.4.ebuild 3116 BLAKE2B fcb217f0a151a12b9a527a35386ef5b3c8b268465d72fce8ba0e60eb69897a93541c45d56dd840bc54f2179963aa5f12cb4a5a5fad4828795c08b5db0dafe644 SHA512 c0c3964ed4d4e6d23ed15fb427a56882f10ce8ebb00d078332ec0f1eaff1363b7f7910c6690d66363788e97a703d35278809bf83924b495aa025ab7f07ca5212
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-40.3.ebuild b/app-text/evince/evince-40.3.ebuild
new file mode 100644
index 000000000000..f3d4f7e417e1
--- /dev/null
+++ b/app-text/evince/evince-40.3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.44.0:2
+	>=gui-libs/libhandy-1.0:1=
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.40:2
+	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.76.0[cairo]
+	>=app-arch/libarchive-3.2.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		>=app-text/libspectre-0.2:=
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10
+	)
+"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.33 )
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/40.0-internal-synctex.patch
+)
+
+src_prepare() {
+	default
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dplatform=gnome
+
+		-Dviewer=true
+		-Dpreviewer=true
+		-Dthumbnailer=true
+		$(meson_use nsplugin browser_plugin)
+		$(meson_use nautilus)
+
+		-Dcomics=enabled
+		$(meson_feature djvu)
+		$(meson_feature dvi)
+		-Dpdf=enabled
+		$(meson_feature postscript ps)
+		$(meson_feature tiff)
+		$(meson_feature xps)
+
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_doc=true
+		$(meson_use introspection)
+		-Ddbus=true
+		$(meson_feature gnome-keyring keyring)
+		$(meson_feature cups gtk_unix_print)
+		$(meson_feature gnome thumbnail_cache)
+		$(meson_feature gstreamer multimedia)
+		$(meson_feature spell gspell)
+
+		$(meson_feature t1lib)
+
+		-Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+}
diff --git a/app-text/evince/evince-40.4.ebuild b/app-text/evince/evince-40.4.ebuild
new file mode 100644
index 000000000000..f3d4f7e417e1
--- /dev/null
+++ b/app-text/evince/evince-40.4.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.44.0:2
+	>=gui-libs/libhandy-1.0:1=
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.40:2
+	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.76.0[cairo]
+	>=app-arch/libarchive-3.2.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		>=app-text/libspectre-0.2:=
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10
+	)
+"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.33 )
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/40.0-internal-synctex.patch
+)
+
+src_prepare() {
+	default
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dplatform=gnome
+
+		-Dviewer=true
+		-Dpreviewer=true
+		-Dthumbnailer=true
+		$(meson_use nsplugin browser_plugin)
+		$(meson_use nautilus)
+
+		-Dcomics=enabled
+		$(meson_feature djvu)
+		$(meson_feature dvi)
+		-Dpdf=enabled
+		$(meson_feature postscript ps)
+		$(meson_feature tiff)
+		$(meson_feature xps)
+
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_doc=true
+		$(meson_use introspection)
+		-Ddbus=true
+		$(meson_feature gnome-keyring keyring)
+		$(meson_feature cups gtk_unix_print)
+		$(meson_feature gnome thumbnail_cache)
+		$(meson_feature gstreamer multimedia)
+		$(meson_feature spell gspell)
+
+		$(meson_feature t1lib)
+
+		-Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+}
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 96c9224f5021..6f994a6926e3 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,5 @@
 DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
 EBUILD libpaper-1.1.24_p5.ebuild 1199 BLAKE2B ee864bb78ec30f830d0fa66e01f7de3bd31afaf51cb4dbac316997f25f8fc1281cc99217a9fc62b51a7be5dda03a9ab0540d0b944c1ef2fb19b8ce562da3ff96 SHA512 33a26ef7217a5fbc9e9873b18a8f32a5cb13c0bd4c6cc94824a3875fc27f51976a991edee82608f0117a91ae7cb7b4c4abed2dca2b397a8f2f19de9f7236af08
-EBUILD libpaper-1.1.28.ebuild 1149 BLAKE2B 82fb96c254f7c440f27bd5a8792764df0edc50366832a465002866b3156726d8423c530af196d10933290656f2fe3c5507c2b9c16022a59d0cc25a6e40e5baa2 SHA512 e4a5e79d3203017e6af6ae21674dd8fcd03bd0c4d287174060773d603fdf0175b21ebea2057332bc1cbbb8a73c9bee54e209f7f2dfbf2291616a507a753924c9
+EBUILD libpaper-1.1.28.ebuild 1146 BLAKE2B cb7163da02ca129b6b6b38b569051d7abfb59366efbc0315427eb2d2ec6ce380c58dcdaf0bd504cbe0fdd3fed267ea2aeccd334019d4d52c5556c2a38d44ff8e SHA512 a278608d0089455b7133ed3118f552ab1d47bf4d4878d7a4d4344240be82756660a95b1cf9514ecf53d06858446ab47aa4d0805904d98429e9f87d7257842c3b
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.28.ebuild b/app-text/libpaper/libpaper-1.1.28.ebuild
index cabd7abd8f93..87f52550286d 100644
--- a/app-text/libpaper/libpaper-1.1.28.ebuild
+++ b/app-text/libpaper/libpaper-1.1.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( README ChangeLog debian/changelog )
 
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index c76fde99ae28..19f5167350eb 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,3 +1,3 @@
 DIST teckit-2.5.10.tar.gz 2112617 BLAKE2B fe38bbecfeec61f2c926fc033230a753ce1435fdf77bebe3c6d6c427a46bd5019d23605ee3d73f733d6345301a26ad3b1fd207daa46fdf66a7728be4569758aa SHA512 c2d3bcf1245723bb3bbe9c147fc3024e667ab4d1280aa0f8b5394b2dd9bb75e3f2bf42f057744fa86ed551ebf3e0f13300072a0325888cb8f9501d874c356f34
-EBUILD teckit-2.5.10.ebuild 1034 BLAKE2B 9ab25bb85b8ee439b888ab4360cd8f02bc6b7b0c7bfd73136fea8701e6e775fff9d12a973b2130362b820f3f050d84f5c590cf82b492ac217790e3a2203f336f SHA512 42778273986caec141fb41f3def549f123a3cd119b69ebd2b8f27a4899bca2e57aaa650af9b6127ddf508e1f0447441a0c32fff9031daaa63519b12d5e86a480
+EBUILD teckit-2.5.10.ebuild 1042 BLAKE2B 3fa42b6e6f7da2da0cf0f32c891272e40530bf47f441b17b1f8e1aa796b64cd540b52452b361146efbdd878d14feccc418574697f76d02097dc0576632da0eda SHA512 4fdd15a76e5a24348ebd3d8af24eb2896b328c051e44bfa2e843707e68f9341671b35b9eded6dd9cd8225cc3ef135703f849b61ec97692563624cf70bd3ab1c6
 MISC metadata.xml 328 BLAKE2B 62957bc5c7f41162d3376974ee6812a6ec71eeb48e4740b710308c58bab8aef4155961db7171ba742d9da7d025840d7ec390575c3dfc47429e839e27b21a3d0b SHA512 ba8d102f0a114796f53adaeb95566a469d891a534bd5a13a43699b9438dcc2c78ffcfdaf851035e1e484463eaac34b925914f532e78c048ad096dafff144985a
diff --git a/app-text/teckit/teckit-2.5.10.ebuild b/app-text/teckit/teckit-2.5.10.ebuild
index 84fc007894c0..c77d8897bdec 100644
--- a/app-text/teckit/teckit-2.5.10.ebuild
+++ b/app-text/teckit/teckit-2.5.10.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Text Encoding Conversion toolkit"
-HOMEPAGE="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit"
+HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit"
 SRC_URI="https://github.com/silnrsi/teckit/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 9ca8912fbe07..d1b539e4f573 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index ba84b2ee2238..0ff000844dd4 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,4 +1,6 @@
 DIST gentoo-syntax-20210428.tar.bz2 18737 BLAKE2B 437bf954e2bca61e3f612761a056de3c248d8f1f7afd3d07fab01770b1ff6e0ed8adb7222a61683770f369392d2c6f52ec5594b946c9e7a69d1cc1f6033caa5b SHA512 db64f53e0c6dd0c9b7fa9142422e4b24f037e9fb012235756443556a20a2bbce9c0b712a5375f482d3caf83760bc96239afc17a1a4f2ad89e9a6166063c6af68
+DIST gentoo-syntax-20210716.tar.bz2 18872 BLAKE2B faef2f356331c8560cb8e8014ad1a32a299f94fe8d05be499955cb78f1537f85abe44864b782df34244c3e606443b2146bd58a55047b23d327a548a436e818dc SHA512 f1a374fb5cf05563ea8cafa2209c9e8ba62bc072cac99202f486c3f7412cbb63432a33830e285ba706f8f73ee7f7bfd4e0b30bfad6feee1643e862b86495b82e
 EBUILD gentoo-syntax-20210428.ebuild 1238 BLAKE2B 3916495228ba1ec18105d683abab3120935f1f4cef4c5696611369fcaf972d359659b671ba0ff4861550c25502cf16ec7124289f179bcc1ece7b39f5dc72c4eb SHA512 ee61a219cb0be58be48e458fd9955dd97ee6aa2358c31951b42a4168285969f8b31e507ff00b73b43484649c5a2225e6af34d24e6e4f8c078f075de4dbc4b2e4
+EBUILD gentoo-syntax-20210716.ebuild 1245 BLAKE2B 4de7b82e15d0e8e0716fa3b419297d3ce15bbe12d7fc8007e231bc09cd3d9236af4c5d08e7c6dec0c1058150eec401c37a24d3b5bade0319947617db9d358bb6 SHA512 9a14cb1d43d22cde53c0f7c9598bfdbb2cd1f0417bc69b604823f595b6f1a59a95aeb47cd61a68707abe8412a2ca44d71a67a51c731d7e083b2f4cab299e6584
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
 MISC metadata.xml 585 BLAKE2B 7f904a47ab12627ae911fa96328c50af2cb16b785fa0b60cace8a586b17de344625b749b52ef6b89b4751aba74bc25339b3e6c9105ee47d15b5c6539b5d902ee SHA512 dfed3c4c2b3697b00896591dc4b23eb6433ce77b4aaaab05119ca0b11e355e321b2cf5f0ab5e0b2dd075abd1a266908e07b80846a11d50f17155d7ab35e6c742
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20210716.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20210716.ebuild
new file mode 100644
index 000000000000..72f25ef766b6
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20210716.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
+HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
+SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	default
+	if use ignore-glep31 ; then
+		for f in ftplugin/*.vim ; do
+			ebegin "Removing UTF-8 rules from ${f} ..."
+			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
+				|| die "waah! bad sed voodoo. need more goats."
+			eend $?
+		done
+	fi
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		if use ignore-glep31 1>/dev/null ; then
+			ewarn "You have chosen to disable the rules which ensure GLEP 31"
+			ewarn "compliance. When editing ebuilds, please make sure you get"
+			ewarn "the character set correct."
+		fi
+	fi
+}
diff --git a/app-vim/salt-vim/Manifest b/app-vim/salt-vim/Manifest
index 7fd5ffd87842..b8bb9255dc2d 100644
--- a/app-vim/salt-vim/Manifest
+++ b/app-vim/salt-vim/Manifest
@@ -1,3 +1,3 @@
 DIST salt-vim-20151119.tar.gz 4009 BLAKE2B fc11e5b7ab54283c1e595b4dae608697504f5673862fb627455ae29768b2948a3fcb81117ae6f9bea460412927b22d95d8ea071013bc41848a624c035a7d5609 SHA512 4267263836c986c33d19739afc8ff710234f3519b3f2ed5f4ddd1a929691e02563dd87a0d722d098a2038610b3b0d5021d00497b25cc00bd6ec6b6fcfedb9105
-EBUILD salt-vim-20151119.ebuild 563 BLAKE2B ea04c3aabe20d770ff08373d5ddd182387309ae009fb77513d4cc40fdc35b67ce55195bd442a3ff7fb688bc054bd07c899dcef6a51e66518204ef8c9a6c6636b SHA512 ec97ae6cd285aebb70d0232734f5ca34da8f13ef282305a97101ef88eaeede21333ccc485e7a6608cda90a879e8990aacfa7becfd56138db700cead430affb0f
+EBUILD salt-vim-20151119.ebuild 570 BLAKE2B cbc40f8f40bd3b7642f4b0b67e789b67cef717d605b2c2844507960a6b3954e06ae2b3ec85a6bd8ba3585b51bf2d92b083e93c3bcfde2342c03fecca6a21eba4 SHA512 ee595c240e15fe502c9635b0bb15a23c6e4bdadaf2270305b2c02f68ca311b6d9c35d2ff762624e316f6498564deecf8dc287358057819a83681b694a25fe6b2
 MISC metadata.xml 442 BLAKE2B 83791e635a49aeda35b19391dbc091d91440f5e319e00397798e1b708f876546ffc729353472e07f56935b735a449c22cea49d94a481baea008b94971f917084 SHA512 070c99868fe3b9929748607fd0fb8d93860cce5eacbc84603c1dae349552908f9b18b61cf3814cb3042289aedc8e41c36c86ce4cdd18c9755fac2b11fb7dd880
diff --git a/app-vim/salt-vim/salt-vim-20151119.ebuild b/app-vim/salt-vim/salt-vim-20151119.ebuild
index b5584b455255..c094923f3dc7 100644
--- a/app-vim/salt-vim/salt-vim-20151119.ebuild
+++ b/app-vim/salt-vim/salt-vim-20151119.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Vim files for working on Salt files"
 HOMEPAGE="https://github.com/saltstack/salt-vim"
 SRC_URI="https://github.com/saltstack/${PN}/archive/${SALT_VIM_HASH}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="!<=app-admin/salt-2015.5.6
 	!~app-admin/salt-2015.8.0
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 863268b236ea..4d5e7460dc5c 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 92307f146ae8..430af8092d84 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,5 +1,7 @@
 DIST ebuild-mode-1.51.tar.xz 35280 BLAKE2B 63f57919bb73937ce3d40b4d6762e78c78d273bcf67875434d12450e00632d457d3dedbe6f213c1979a60cbc0a0874723e3e9424fdcfb64a48acc885cc90e577 SHA512 ff9ece96fbe7bfc9c070769dc6667e8c33f8fb7ef20a2d347c670342ef7500b52b54a93ed37ac9ea13a89c1b89752f5dd6e56c234abe9a4fcd4eb6bad0d0b466
 DIST ebuild-mode-1.52.tar.xz 36100 BLAKE2B d5207d910088de9cf1a41580ce61c49632e8e7c1a1af5d95ba13a7865125ca487d770731bb49e12fdc36d3f557fadd51109de628e958166d064be025e4b91257 SHA512 852f968b44c80f98363d4663856317946992cf5d0daf9a9c63e8ec17c1a684e28c2de510ded98bd2ef84428d8d094c1b6f5060510e6475ce60183fbc8e5a0322
+DIST ebuild-mode-1.53.tar.xz 35920 BLAKE2B ee932441e23ba4b876e98feb9ff9dfea2e395296846e14f776ac10f4c5bab6b711161b4c890b0d8f2ccb5749db5bced3f693aa172e3ae92af506fee26fb5750a SHA512 8fcc28139c0cace21159a0b5026573f401f65b4501ff888f9818d8f5a506a7bc1f8d8a133f775619efc9e16e2172d6b5daba539b4e38b1a378c0b35395263ef9
 EBUILD ebuild-mode-1.51.ebuild 1001 BLAKE2B 5cfd46db07183e4a042b09072272acadba4c698baddb1022583d4f80b76a07f176bec9d58f348dd888c7b805ceb380a5bd99bc810b6e259d0b0924d95e1ef2d3 SHA512 5770a49c1af09516ee92468db7c7151fd817581836c84a289a936e4f63eeff2b002bd369ba9790d831807c759eabffaa5ce4fb74cda9cf7778ea507a86345fc5
 EBUILD ebuild-mode-1.52.ebuild 1003 BLAKE2B 2db38863c7f77c607530f79f9323d48c8c3c9635223a0c7c9a607524358aa494ca158516bcee91327f16e96413a69d3ea98e43e4a038d3ba78bfd59cde283e8f SHA512 c7dc7282574a83fb85f8dc7950365ad90e27a15b3fdc1be137593d2e07811fd8984cb3893421c271a544d35adf812cac8de131fe41e138389294555140177747
+EBUILD ebuild-mode-1.53.ebuild 1003 BLAKE2B 65c69a3ffae1c8ce9fd288ea981dd42da2c6ee8bddfa0a5ef893eece67a870ee74954e30c73d9380cb77b7fc63389c5b4756624ed46b8543a97ef56f60258b64 SHA512 2c82012b75ea3d3b8a3cb54764a3edd6eb93d59fb0882f42adbb9fe3dc47aaf93639b8f4005ed1d829f7fe4c22e44ce31ac0d67f20eb619dd85e62c8e1106a34
 MISC metadata.xml 442 BLAKE2B 4ebee7ad84527b95636d2d3015859a08f57924ab1be858fc51c71a7fc54fae0be2b61bf680d6fb7a9bd905e224e6ccacce09ed03dde99a3736a261b2f5d4cce3 SHA512 a18d82336c06dce67c811dcf80a8fc90f01be6a4a535d85cd8aaa8474593c32a26a6f80540419da8c0b5c1575e6a00a62712e5fab8d50301407d3a13896898ad
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.53.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.53.ebuild
new file mode 100644
index 000000000000..417a5874359c
--- /dev/null
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.53.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND=">=app-editors/xemacs-21.4.20-r5
+	app-xemacs/sh-script"
+BDEPEND="${RDEPEND}"
+
+src_compile() {
+	local XEMACS="${EPREFIX}/usr/bin/xemacs"
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(add-to-list 'load-path \".\")" \
+		-f batch-byte-compile \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(setq autoload-package-name \"${PN}\")" \
+		-eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
+		-l autoload -f batch-update-autoloads \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+}
+
+src_install() {
+	insinto /usr/share/xemacs/site-packages/lisp/${PN}
+	doins *.el *.elc
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 6aaa409b147b..6ddb2a76b151 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index af5aebd2054e..6b88aade4a51 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -2,8 +2,10 @@ DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd
 DIST asio-1.17.0.tar.bz2 1694631 BLAKE2B 0463355eef1714604290be43247139ea0220c5614c3c280ccf6049b64a2bb920c9eb885cf5f00c7e007caf3b049fe5cd6589dad0cb23cda4994fd31c7ecd8102 SHA512 5978cbf452aff07d6d19a2e641824628f409ab74e2e1a964776dae4c586386149acea56e4c8aa1075b247d2ce566daad640c3bbd15e211df1f73fc7b02964353
 DIST asio-1.18.2.tar.bz2 1743146 BLAKE2B 8db47419180095e4f05a63e4f414f33399e44f1dfb36299c70fef8bfef347f25df67ae78abf6b6b051e350b10099ec49e751b129bb1913dadf792e24048233a2 SHA512 ebe659f958b1813c4a843dce94a8f51d3a3b9f8e0237aa0f032009adaf85400b63b04ac8d664c9424397927d34d78206cbc646d921a520ed415c505f086628b1
 DIST asio-1.19.0.tar.bz2 1840674 BLAKE2B 1abfc74356dcc86b07c2599ae5668b18c97fc1da39468aae5d8aff0f8b5826ea55de1c287816f370eac2c42608535ee44afaedc66afd88c84c9ebca665d42be9 SHA512 d9eb232a0165449985f655433de5d1fa2904edb7a241d55897d3e675d9feca9092342cbb0b6a7d84dbc8f3b6c147c62fa8af5536f065b3f77f800841bf443312
+DIST asio-1.19.1.tar.bz2 1842955 BLAKE2B d60c1f98ad563eb7c1b163baac3a5560be1cd712e6b21dedc367b547d62725f22c96cea2ebb4dce1e37163a540ae24d65e9ebc37cde0046c043e83685b7d80c9 SHA512 af4501fbd6965ef2efb1f71cd703dec9bb65aaa62243649899469b711f9260936bbce7d261a6bb0db5ca47b7bccb89f72b219b19a249171c18d0a30fb40607e2
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
 EBUILD asio-1.17.0.ebuild 1121 BLAKE2B b39f6f2a7060601d146fa3146fc0d487c894cf7ac2a4afb2d6b8370692944853f976b16e70a6e30aa3292f6e5b811a0718b503c6c061b49d63dbe87daac6ed46 SHA512 dd346b7cf8b7ff07ae8ddd387065350d1aefc938bb9dc20ab2c0af7946bb455cb5d1694aa064ca4e601ad477099d4ff96b729de524769510a292577ae27fb40e
 EBUILD asio-1.18.2.ebuild 1128 BLAKE2B 51a905624608b573a9bf246531d1c7d53f0fd685c2b02440b5c9493b2969e7ca418b323c8cf70c9f8caa526412f5f7a2c186520554dfc1d9b562d09f3814e20e SHA512 f08b8c89cd36ca32f6c9f58aa72c68abf9962495a6953f36c7df80f6c149099d0540c1dd26b91188a8e1051ac2380e0a054ced86332e3a659599e74c5b0a6bfa
 EBUILD asio-1.19.0.ebuild 1128 BLAKE2B 51a905624608b573a9bf246531d1c7d53f0fd685c2b02440b5c9493b2969e7ca418b323c8cf70c9f8caa526412f5f7a2c186520554dfc1d9b562d09f3814e20e SHA512 f08b8c89cd36ca32f6c9f58aa72c68abf9962495a6953f36c7df80f6c149099d0540c1dd26b91188a8e1051ac2380e0a054ced86332e3a659599e74c5b0a6bfa
+EBUILD asio-1.19.1.ebuild 1128 BLAKE2B 51a905624608b573a9bf246531d1c7d53f0fd685c2b02440b5c9493b2969e7ca418b323c8cf70c9f8caa526412f5f7a2c186520554dfc1d9b562d09f3814e20e SHA512 f08b8c89cd36ca32f6c9f58aa72c68abf9962495a6953f36c7df80f6c149099d0540c1dd26b91188a8e1051ac2380e0a054ced86332e3a659599e74c5b0a6bfa
 MISC metadata.xml 486 BLAKE2B 90de27749adaf253e5d03d290225f1d8b7f7ce36cf2ada6289d68b07513973fa21a47363aeb965da9914867e954e69b9e4868eb9a4ffe8e6e3a685bbe8ccf1d2 SHA512 11558b26c58abda9bae1b0314be4761f0637652b3ccc978d49f1a4dbfc57e12a126c9a152fabd6a8c81c628e8a47cae58b1456444671331c7d15369d6e07b0ff
diff --git a/dev-cpp/asio/asio-1.19.1.ebuild b/dev-cpp/asio/asio-1.19.1.ebuild
new file mode 100644
index 000000000000..82d648ca221a
--- /dev/null
+++ b/dev-cpp/asio/asio-1.19.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Asynchronous Network Library"
+HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples ssl test"
+RESTRICT="!test? ( test )"
+# test searches for libssl during ./configure, and REQUIRED_USE is easier than
+# patching configure to not search for it with USE=-ssl
+REQUIRED_USE="test? ( ssl )"
+
+RDEPEND="dev-libs/boost:=
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		# Don't build nor install any examples or unittests
+		# since we don't have a script to run them
+		cat > src/Makefile.in <<-EOF || die
+			all:
+
+			install:
+
+			clean:
+		EOF
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/. )
+	default
+
+	if use examples; then
+		# Get rid of the object files
+		emake clean
+		dodoc -r src/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest
new file mode 100644
index 000000000000..526588355b6a
--- /dev/null
+++ b/dev-cpp/sol2/Manifest
@@ -0,0 +1,6 @@
+AUX sol2-3.2.2-catch-depend.patch 910 BLAKE2B 2f4dc2a173500be6a0822f6e6e4a581facebc9f15d8a8b04151c9ec330c5c0962c5f521108fdc3681af9b74e0209505dfc9eb560076922998fc97ebc700d2c8e SHA512 a908179c944fed61cf22c5f14fb9670bf2cf2c63dd9d00ac6f5121c7058012d8dc551ad1f335d96d203152371ed98df4f18933aca7c96150b8402df2eff568bf
+AUX sol2-3.2.2-gcc11.patch 317 BLAKE2B 882fbef1e17414d81994896294aeb0e08304e310fec50f99f855391c02571117fbbb8debf9b07975a1c98063fc06560b559f75d11911ef7bf2f07d07830b810f SHA512 7936714263cccf67283afeba2d7a1ebdf3fb39cac45e3c82fd39a75b17c2f9fcb50424f476c486756a13c3235d63816a29f2e5aacebfda435cb21af07f2c51ef
+AUX sol2-3.2.2-luajit-pkgconf.patch 651 BLAKE2B 87460b8bca3281ed2d82a359225d5af072524a8b0dc1bb3d51dc17325d3863623579da25f6ffd9e696acf953ddd48525677a9b4367518b9c259cfe91a9cd7672 SHA512 bca0b431f7c63512e75aa3806a940062991077be58b7227cd042d686c0ae7446dd82adbf856d0824668ff35b86f90521e266b7738e13b4654e25c4bd0e3d2539
+DIST sol2-3.2.2.tar.gz 8531029 BLAKE2B 65fd220f5109e4917d06d5ef906ceccb7e292276f69bd49dfd826089a77e566af1811fdf660ffbfbd2437dca4b86ef5c4790dace9029805926e1ee0445b2e965 SHA512 e5a739b37aea7150f141f6a003c2689dd33155feed5bb3cf2569abbfe9f0062eacdaaf346be523d627f0e491b35e68822c80e1117fa09ece8c9d8d5af09fdbec
+EBUILD sol2-3.2.2.ebuild 1627 BLAKE2B 3614d7bfe8302da7716432d8a685e7837284863f672bde0c69e38e0eef41100cefa6c55951269eb248b70630dee89439d8d5ba0a79a71c6e950798d4238a9cfe SHA512 90ec2722fee65395d562039aed8609df9c5b17c60b3f8331bf5e177c996b6ff83ef1097b0405357ea243701b2aca09f41058c3099e3f48301e6eaa495cdc8b6e
+MISC metadata.xml 593 BLAKE2B 08278ba618676136058a0b7f07dd7ddc46c3b95dcd1f5a0c903cd6d8883ab65adf71296f3e25776c6b10fa7ab0db14b2e1cc11b9e5a68adb04dbe57d175d59d9 SHA512 bde42b613d126d4a1ef1e60ad153d816dbca9f57aca9c7f87955f629bfb6622c9f3434f2cb3f71c315d6c5fb866eb7386defdc343ce98bee56229b1f96ce3b4a
diff --git a/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch b/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch
new file mode 100644
index 000000000000..2da3c00c1612
--- /dev/null
+++ b/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch
@@ -0,0 +1,27 @@
+Use catch library from system
+
+--- a/tests/runtime_tests/CMakeLists.txt
++++ b/tests/runtime_tests/CMakeLists.txt
+@@ -22,12 +22,6 @@
+ 

+ # # # # sol3 tests - runtime tests

+ 

+-if (CMAKE_GENERATOR MATCHES "Visual Studio 14 2015")

+-	find_package(Catch 1.12.1 REQUIRED)

+-else()

+-	find_package(Catch REQUIRED)

+-endif()

+-

+ file(GLOB SOL2_RUNTIME_TEST_SOURCES source/*.cpp)

+ source_group(test_sources FILES ${SOL2_RUNTIME_TEST_SOURCES})

+ 

+@@ -38,7 +32,8 @@ function(CREATE_TEST test_target_name test_name target_sol)
+ 		OUTPUT_NAME ${test_name}

+ 		EXPORT_NAME sol2::${test_name})

+ 	target_link_libraries(${test_target_name} 

+-		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${CATCH_LIBRARIES} ${target_sol})

++		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol})

++	target_include_directories(${test_target_name} PRIVATE ${CATCH_INC_DIR})

+ 	

+ 	if (MSVC)

+ 		if (NOT CMAKE_COMPILER_ID MATCHES "Clang")

diff --git a/dev-cpp/sol2/files/sol2-3.2.2-gcc11.patch b/dev-cpp/sol2/files/sol2-3.2.2-gcc11.patch
new file mode 100644
index 000000000000..cc8c6bb1b4f7
--- /dev/null
+++ b/dev-cpp/sol2/files/sol2-3.2.2-gcc11.patch
@@ -0,0 +1,10 @@
+Add missing include needed for tests (and possibly consumers) with gcc11.
+
+Fixed upstream in:
+https://github.com/ThePhD/sol2/commit/e5e6466e09b632677d24a8f204d6a0ea0a8862b1
+--- a/include/sol/stack_core.hpp
++++ b/include/sol/stack_core.hpp
+@@ -42,2 +42,3 @@
+ #include <string>
++#include <limits>
+ #include <algorithm>
diff --git a/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch b/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch
new file mode 100644
index 000000000000..9b9c9f101769
--- /dev/null
+++ b/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch
@@ -0,0 +1,17 @@
+Use the lua version selected by lua eclass
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -188,7 +188,11 @@ if (SOL2_IS_TOP_LEVEL AND (SOL2_DO_TESTS OR SOL2_DO_EXAMPLES))
+ 
+ 	string(TOLOWER ${SOL2_LUA_VERSION} NORMALIZED_LUA_VERSION)
+ 	# Find way to get Lua: build if requested, or attempt to build if no matching version is found
+-	if (SOL2_BUILD_LUA)
++	if (TRUE)
++		find_package(PkgConfig REQUIRED)
++		pkg_check_modules(LUA REQUIRED lua IMPORTED_TARGET)
++		set(LUA_LIBRARIES PkgConfig::LUA)
++	elseif (SOL2_BUILD_LUA)
+ 		find_package(LuaBuild REQUIRED COMPONENTS ${SOL2_LUA_VERSION})
+ 	elseif (NOT SOL2_LUA_VERSION)
+ 		find_package(LuaBuild REQUIRED)
diff --git a/dev-cpp/sol2/metadata.xml b/dev-cpp/sol2/metadata.xml
new file mode 100644
index 000000000000..4376dd4a4616
--- /dev/null
+++ b/dev-cpp/sol2/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ThePhD/sol2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/sol2/sol2-3.2.2.ebuild b/dev-cpp/sol2/sol2-3.2.2.ebuild
new file mode 100644
index 000000000000..8af75c6deec7
--- /dev/null
+++ b/dev-cpp/sol2/sol2-3.2.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+inherit cmake lua
+
+DESCRIPTION="Header-only C++ <-> Lua API wrapper"
+HOMEPAGE="https://github.com/ThePhD/sol2"
+SRC_URI="https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="test? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		${LUA_DEPS}
+		dev-cpp/catch:0
+	)
+"
+BDEPEND="
+	test? (
+		virtual/pkgconfig
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc11.patch
+	"${FILESDIR}"/${P}-luajit-pkgconf.patch
+	"${FILESDIR}"/${P}-catch-depend.patch
+)
+
+src_prepare() {
+	# TODO: remove this sed on next bump
+	sed -i -e 's/-Werror//' \
+		tests/runtime_tests/CMakeLists.txt \
+		tests/regression_tests/1011/CMakeLists.txt \
+		tests/config_tests/function_pointers/CMakeLists.txt \
+		examples/customization/CMakeLists.txt \
+		examples/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	cmake_src_configure
+
+	if use test; then
+		sol2_configure_wrapper() {
+			local mycmakeargs=(
+				-DSOL2_BUILD_LUA=no
+				-DSOL2_TESTS=yes
+				-DSOL2_LUA_VERSION="${ELUA}"
+				-DCATCH_INC_DIR="${ESYSROOT}/usr/include/catch2"
+			)
+			cmake_src_configure
+		}
+		lua_foreach_impl sol2_configure_wrapper
+	fi
+}
+
+src_compile() {
+	use test && lua_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	sol2_test_wrapper() {
+		if [[ ${ELUA} == luajit ]]; then
+			einfo "Skipping test due to https://github.com/ThePhD/sol2/issues/1221"
+		else
+			cmake_src_test
+		fi
+	}
+	lua_foreach_impl sol2_test_wrapper
+}
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 7327b1b36d89..7cb8c9b874d7 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -4,5 +4,5 @@ DIST tbb-2020.2.tar.gz 2637172 BLAKE2B 6b6e65732d3971f7374058513004ca3cfc3855b83
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
 EBUILD tbb-2019.8.ebuild 3212 BLAKE2B 89073e2f92898de3ede7e4843fefb76b42453ed8c028e0b25821b375b7df0de2125e5ca1435d072ec36f1fbc3c900e709252da4741aa27a8103782d79487018c SHA512 56c50fa1857cb67b76349fdc2d488f17daf7329083f58dee8cd0e7859e943974cde7e5d089990676da78dce2040738de245ea6d4b58656a287463bc1060b1ed1
 EBUILD tbb-2020.2.ebuild 3390 BLAKE2B 93447f24b6b315e583b30e59c601cbd1c211882265305f80ee4154715a36069b164f3c932c597a31ac56a2a1dbc860586e82505a854ac27fa9a9261cc70a7a42 SHA512 5475c1d334a76a3ee8eb97ce83bd50d1155d14f7cbc7edb2996f999f4b9fee07a0f695cec35cb9ca9b4127e346cf291ad715aa73056732a65c44d5207b05f254
-EBUILD tbb-2020.3.ebuild 3384 BLAKE2B 81c592eac141065ea83b0157b7e2b15b761226b8913aeb489290666b1e2b65823ab5dae1c2ff09eba90b85bacf193b9234045e6467695c653de98e4eaa192aad SHA512 b087685bf5ebfb324ea11e3752aecceb45e51f08238d977e6f306a1bfdd4fa66c3f43108064cc284ab6a2aa9fa2c3be43a920f950c7ee7b9a5fa4e66102b5663
+EBUILD tbb-2020.3.ebuild 3391 BLAKE2B 518fa0a1a5ffc1b572b9366880f2e6a204e46f1751c923a76bd5cc96c69ad9bbc673bc89e23b9d46ef0c94e271d12001d0398d7e641d80a60d03fdaefa0789a5 SHA512 727e6797c6afc06f55359974add2b0578bcafa10b276bd603a8d6dc39adfe175cf89ee6c080d8543b4919bb9349adc812a4e3f39a5dcba68730acae30cc7be32
 MISC metadata.xml 687 BLAKE2B 3d71a46504de458f31f2de33441c575240d35c0c1fc8135721b58ecf89c30f2687bcbcabd2c0c78c52547a469ac7540bfba41c98799aa621f6802830af3fe6fa SHA512 ae6422c5a68ae7029f966c2cc717b52e8a018c2720838911b2ec9961dd3881f3cd4e0608b996023186d6c4dba1d465e5a726dd1a271c34b063a262efda0b753e
diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild
index 91e579d8a4e4..c654a5fad29f 100644
--- a/dev-cpp/tbb/tbb-2020.3.ebuild
+++ b/dev-cpp/tbb/tbb-2020.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.threadingbuildingblocks.org"
 SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples"
 
 DEPEND=""
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 2a12e235cb4c..3cab436b8d56 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -2,7 +2,10 @@ AUX yaml-cpp-0.6.3-CVE-2017-11692.patch 1433 BLAKE2B 9218756605cf721c86e9ab01b0d
 AUX yaml-cpp-0.6.3-abi-breakage.patch 1911 BLAKE2B e595bdf3dff91624aa75a233a6a95db3862a7bbe645a6219704fa25c0887321dc5c461d13b6694ebca31d0da795bb750701ad0c6b9f79be0eecd85b07a71a256 SHA512 0a3c0655a1319eda09796a7ddbcef8a27884cdcbc95d34d82b6202652da3b15d7afa6e22563af39f6c6c87b7a70bdee3c1216a5523604d309345d556ada702b9
 AUX yaml-cpp-0.6.3-fix-overflows.patch 4671 BLAKE2B 77a4256a41bc5f0de98ada425c15cea6b377430c0303205895136eaa7588f30d646af1cb670d74b3be405e392f1f3648ef3c3378ce115b983c6ff8bfe398d3fd SHA512 ed6a472e712511ccac1c94c837bc64b933e301476a6d19f59f468487d4ace3e1862e7da310214e5f25b81c907d92f3f9690eebce0ec4f7661fc6584de393c5fb
 AUX yaml-cpp-0.6.3-gtest.patch 1271 BLAKE2B caa8384b79dbb1e85b9248b2307f792734cb4f9bce11bd2cbd08a680604e3f396379c0c8b50de1bcad6cae32c0cbccba5f3a1bf155125f461079f10e728790fc SHA512 71c313d4ea78049a8a9c444447d54b10693d4dd61889933b0dabe575b633eeb0b5f80f7e58fcb2703c27daf4d11d5e16ef30017dc0a648db7196bc45b4eb4818
+AUX yaml-cpp-0.7.0-gtest.patch 846 BLAKE2B b9fe25d42402cb019a705c74ff87cfbb018ffd1c8bd6815f39683842f3c7bbdae6f08713dbc298880a5f2787ca24badd1e56a4fedd74340d87a2811f89332c7f SHA512 d7a89218fad73c9de6a5a9cfb5203089f63346c1df7abe5a21670c7a20c348dee55176113db6a2c494b04bab9687820b7ebd9c93f11cd82b9d8b6cde58b9f91c
 DIST yaml-cpp-0.6.3.tar.gz 1398768 BLAKE2B 07abe1c56740105a0af2335bb1cd48086cb614d9d04c61342e53788bfb043fd7eb2629e441a0a5be50898b288f3526f1707c5fdf1d734395b6450c3103773b14 SHA512 68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49
+DIST yaml-cpp-0.7.0.tar.gz 1033237 BLAKE2B 69a11a8503ad607aa0d54912a5e53d305a643fe2d36dd86fa96832e3d4930b39a85318dc130e438210a9ca60357f3aa9aa6cd0f2b6bc45728b648c545a437368 SHA512 2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522dddde398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5
 EBUILD yaml-cpp-0.6.3-r3.ebuild 1047 BLAKE2B 48e6082d4d7a9814504ace6472166f026bba2267459080cae0b20774a36bb873a25bb2811ab98b1ac24b349d344b304c9e671518444ebf9f704e78dbeb4b6261 SHA512 a8847865f37d31b0f69025f10f95ccf35bdd6c7badeb1377c24b155f9094fbb13bcbd2bb7e3ef9d6d1f60f57998a3f73074251ed043da694de7a48217694905e
 EBUILD yaml-cpp-0.6.3-r4.ebuild 1073 BLAKE2B a2a1737410781e389494b054d1539dec976d3a193ffaa530ac35f65014008928abc056f0f55caf32f48b18d7f1366a1797c37088be17f6bbbec410ce98655bd2 SHA512 be8bacf1a1a3fddb364405e5533af8e402fe42c3e7a7331f92ef644623871aabc86653f748115659c6ec888bcd824acc8617f367f022e941b92699d45ebe7325
+EBUILD yaml-cpp-0.7.0.ebuild 858 BLAKE2B 1e038fc0121b3f5a57b03b32a5c4ecbaa2d4ac4823b26b2a12fb17959488550d3379deadf7a25e4fae3daa2767785ca016e33ed159e7bc221418a14feeb03bc1 SHA512 4e62d0234f79e6b828fe1c06527585162c9e6990c4f16b75da1215379b5afa55d11471d9e1fa034aa9657b5b6c9b0b1728bf0b5e6ed7d50a26f580070d147153
 MISC metadata.xml 483 BLAKE2B fb58414ee0138fea102fe93a80dd4b16879d8237a567d40fc66cba3fdb81a23a138c58236a3f9175a516c4febce69766488b098bf3a42a71ea9d03f0584cbc8b SHA512 17512a7c75bed771506cf5cfdf0d4b218029a89a53e512052523735856ec283c45f3d039f89147f0781814beaf762e16f8d9145ed143ba08720ef34a73746717
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
new file mode 100644
index 000000000000..45eebb43ffe2
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
@@ -0,0 +1,28 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 5ebc1a6..f02c2bb 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,13 +1,10 @@
+ find_package(Threads REQUIRED)
++find_package(GTest REQUIRED CONFIG)
+ 
+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+ set(BUILD_MOCK ON CACHE BOOL "" FORCE)
+ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+ 
+-add_subdirectory(
+-  "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0"
+-  "${CMAKE_CURRENT_BINARY_DIR}/prefix")
+-
+ include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0/googletest/include")
+ 
+ set(test-new-api-pattern "new-api/*.cpp")
+@@ -38,7 +35,7 @@ target_link_libraries(yaml-cpp-tests
+   PRIVATE
+     Threads::Threads
+     yaml-cpp
+-    gmock)
++    GTest::gmock)
+ 
+ set_property(TARGET yaml-cpp-tests PROPERTY CXX_STANDARD_REQUIRED ON)
+ if (NOT DEFINED CMAKE_CXX_STANDARD)
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild
new file mode 100644
index 000000000000..0140ff9a1224
--- /dev/null
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+inherit cmake-multilib
+
+DESCRIPTION="YAML parser and emitter in C++"
+HOMEPAGE="https://github.com/jbeder/yaml-cpp"
+SRC_URI="https://github.com/jbeder/yaml-cpp/archive/${P}.tar.gz"
+S="${WORKDIR}/yaml-cpp-${P}"
+
+LICENSE="MIT"
+SLOT="0/0.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gtest.patch"
+)
+
+src_prepare() {
+	rm -r test/gtest-* || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DYAML_BUILD_SHARED_LIBS=ON
+		-DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule
+		-DYAML_CPP_BUILD_TESTS=$(usex test)
+	)
+
+	cmake-multilib_src_configure
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 4de79dec386a..0ae0ac4fa1d8 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 21d1e8f50548..76a04025537c 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -7,5 +7,5 @@ AUX server.properties 686 BLAKE2B 6b4482dfe6187adada772cffb1a46e39bacd9fa8ca5501
 AUX sqltool.rc 560 BLAKE2B 5f5e4bd1e9fe9759c2e2d5b6b5274343caa5028b29cfa4597c3a3348a1b07e4540d608d3dea5b189cf471b85721f15018490a7e4f8c56cc48ce648a07f0b7a45 SHA512 80ce53ad07c2091113787cb41232e5900426b042dcc3f62157569588538ad26d471e5d17aac62052902789065efb01647bfbc3488ff3d0f3c9e3df513895f57c
 DIST hsqldb_1_8_1_3.zip 3170550 BLAKE2B 0664bfa259af5091e3e76ca804e9c9890457ecc982ab07ee37640dc713053fb63d6dd295e9db4adb5e5436fac6275745526d3e830dd84e5daa3a32162627dc76 SHA512 0483ca3299b63b4931b07d49588c729231efca76a317b9620abbd5039127f3f79449eaa1e9d29c52782c58bdb0cc4879b1e3f30f669d2c02c880818f531a8442
 EBUILD hsqldb-1.8.1.3-r2.ebuild 5503 BLAKE2B f60641d2e1803e463cd2847c6a71aba983b96d47e55c864f7370829df797ad41aa6b22eaf28ae6c722b42703a0eef1383d005d97578047b5a5803981d0ca5606 SHA512 8006dfcc2160aaf0d7f3d01ee872ec61d3842d3208c0d265d27aa245fde3460ab3e98970d14893e8e21f3b23962311b28d3a8e539f7752eb52a3636d93174f85
-EBUILD hsqldb-1.8.1.3-r3.ebuild 5448 BLAKE2B 8b24ebff172a348b70cdbd7475c2002e0fae42ec4e5ca17125204c2a1252e25f89c0d2d92265ad840900824d6d3b78ee116ea65ed88e7d3224ad2411ccea5a13 SHA512 8f9217c4d821ce994070e119389fc00f56caa00e0e4ca048fc035f516ba4da7afdf9b520570858caf378332d16d29b03483a3a302da1df47b6b958c4c339fbdf
+EBUILD hsqldb-1.8.1.3-r3.ebuild 5447 BLAKE2B edb7b8daf637d17e2e56ec9b1993b639b5768b1e17262db39c214a97e9eee441a5d8feb7887dd2c1dc13ee30485f7320ab60653452f52f16eae7544010c6a0da SHA512 064e6f2342044eb07d4e88daa14c5acd752d211e89555fd28e0caa5f14dfbf99eaf92791c59cf1ef3f25dd9913aed8bfcdc95a65241d073b49ba2b7d6f5cdd46
 MISC metadata.xml 312 BLAKE2B 175d7bb3c54ffcc616117749062b16130ca8cf394ffd780991bd8bd5a21509527e2844cd4f1aaeba70b498274131d786b9a16d48d5ee8dca176e949e334093a6 SHA512 2b9fff35bd58701cd4992ddc02f6bc7a2027d90616a5b886ef352ad6c6781949a68478bb17bbc22382189ec73ddd1798f67c27941323cb0b727dfead38c7f975
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
index 52c9e1b3c181..af2617dc5ac2 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="
 	acct-group/hsqldb
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest
index 1f686d91fe04..04ca77fe2f7b 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -2,5 +2,5 @@ AUX fix_configure-1.2.62.patch 1668 BLAKE2B 5a572607b5c848c3616fcccac1e936f9218a
 AUX kyotocabinet-1.2.76-configure-8-byte-atomics.patch 1250 BLAKE2B 882c4897a40609bbfa1183cb97e80e5ed6d95d0035c30c836e3f252962db822249f8b48934923e816a720d3cbf64a6f47f80cef77528216f3171f332ca3a350b SHA512 4833cecd6c67515e0c59d7161be6891df290ae816593de1bf35718e9c9d8691db221bec5078c5dc7cf56e55b0086d61c415e148a7ee63b2a47ac4885f6d0960e
 AUX kyotocabinet-1.2.76-flags.patch 894 BLAKE2B 50efb4b21f0101a942eb758213cf703460056a951617298057567d08b116c7e0a631d631eace992ff447bed5b74940d2b60a8adad373cb77fe42b8c40bfcc9fd SHA512 60a15c54994a5f338cf168feb831d858fdd2cadd16ea0c8001ef652e8502797f5920d3fed0a3ec4a6a2d817381b4690410878a18c7c859df34e26b033f48fe03
 DIST kyotocabinet-1.2.77.tar.gz 949326 BLAKE2B faacde57e8c7fed3fb232ea6fd12b668f2d2ee352cd357d5e16e0d1740cd8f73e223964249efeae50f3ea5d0672117b2410b91ba557ebe1ac7ba4075ac28deab SHA512 f38794c11faa3f4b64097a2e314307e1a6b75ddc495103647ebe52786a689336754496e7083697417ea90436e7fad681f16440975abec9ae917874aa25153e0f
-EBUILD kyotocabinet-1.2.77.ebuild 1468 BLAKE2B de111d3501de76bf95ef8aa3f425e48fa5641fd0a6d8531bd2b9c6392d0d28c79aa59e745f230291215c8ec415f1a10ec46268a1ef7a169824f8817c5271c89e SHA512 d7c1e2db09eb594f708423a91729a61f93b920147ee137f3422fc48913596cc791cd4fa4ba0e4385876461daaa87232753385a949fd81511d27d645d8fcc9866
+EBUILD kyotocabinet-1.2.77.ebuild 1475 BLAKE2B 8307077889ecc6f11a7c36f9ef729d86482c8e0ce4ae0f904c67562c862749bd31f09604b5e4b3e9e82a2bbaa0c419f79f87481bf039e3aa89144d951936e517 SHA512 17d75eb589634c19f0e1df76bd1ed614e036903519f125ac06e4af8f4caa3941742110e53037686562bff6e5efe4ac1206d7321c98a78c230b467f752b9cd235
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild
index df0ceeaceb78..7221529d0b8c 100644
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fallabs.com/kyotocabinet/pkg/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug doc examples +lzma +lzo static-libs"
 
 DEPEND="sys-libs/zlib[static-libs?]
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 00b0ed64ca83..1acc393855b8 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -3,7 +3,9 @@ AUX mariadb-connector-c-3.1.11-fix-flow-control-statement.patch 401 BLAKE2B b5b2
 AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de
 DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17 SHA512 a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
+DIST mariadb-connector-c-3.2.3-src.tar.gz 992155 BLAKE2B 39f0c5f15c2b016e7708ca32f9f4c08ae87f52c38a1a6433ade66b03b9e2144744c559838c3c0bb98465b7e5c1d2f3d5678ee6b1197790c18740f990dbc82284 SHA512 0d45278ba55b3cda809d9d6c3d9726ec8b2f629c7da1205fcb936594ca6ea439039c02f484f7e31fca3e55288339c9bf64c06518988a8fed016c6ce544fac631
 EBUILD mariadb-connector-c-3.1.12.ebuild 2148 BLAKE2B a6328dd0a6416691513398220dda45e3fa4a3f857c5f908f11b06095252e02e15102708181af2aef2e809045ec4fa7617e379517499b27ee3dfb98aaf0cfd98b SHA512 9762c0c60084675e61e5843c7b113ba3809d8f60c082ebc3e0c4a167683cc71cb321de8633fcbe52faf0e4ef9c05e50efb7c8ee3ca6b9b0544e06fa5c89ca890
-EBUILD mariadb-connector-c-3.1.13.ebuild 2100 BLAKE2B e4f1e15cd076810e60cd11cd249c7fc011feb081c4b531a3c05d82285292075b8db2fc2076af5b3921c4a56a03c146ff992d41aa4ec3b8798f3b953e66d74013 SHA512 4ffed6c3362f28ce569086006cb49812e10d709572009a3fe7939c744c12a84b5f99756e4ab5a1df5d1935cdd34ed52c2596a60fd37e71d810bca22c021d9cc1
-EBUILD mariadb-connector-c-9999.ebuild 2093 BLAKE2B 1a9f992b2e29f63934855ae0a69658db3238ed8c78d72137156de975efd362d6600bd00712dd639b4da920b7ed08f51a14b053d16ecb3a4b776c823045003171 SHA512 8fb3c1e9478c8aee4f1ae70439f46fcc9fc6f454cc9eef2575153496e90de3841372934b211c11b83b967f919c5888072cdc0df60e9e3e8b6e5712c014f4c670
+EBUILD mariadb-connector-c-3.1.13.ebuild 2096 BLAKE2B ab84bfc07ef6bda7e14dad90833e3cf6154efe104d248fd6abd585e93883ba1d067953b43e68be6e97d539e9844bd3db99d16e233405a621872fd995c4a46244 SHA512 68dc9e2d3abcd36bec39ad8ccfdd61ddc14be693756e0fa4199ca68d33e633c470099eb61953e1d35a756050d49b991009b40088a984732b30daee9d76554083
+EBUILD mariadb-connector-c-3.2.3.ebuild 2129 BLAKE2B d166508f5a826a721b3822eab5a6f5a8c9161f084e0f2f7e57bea70897344b4f82fc2d26860e459002786e6b83ef0f214a42526ff9965594ea23847aa1c76ffe SHA512 e10c8135d1cfccc68d57990220d64ceba5b5aa33f9a6d9a507ac3ca5d4730b11802f31ccef9ced4673bd85e2640af21dc325262aa3e5e8c40ff0d258a14d94e2
+EBUILD mariadb-connector-c-9999.ebuild 2129 BLAKE2B d166508f5a826a721b3822eab5a6f5a8c9161f084e0f2f7e57bea70897344b4f82fc2d26860e459002786e6b83ef0f214a42526ff9965594ea23847aa1c76ffe SHA512 e10c8135d1cfccc68d57990220d64ceba5b5aa33f9a6d9a507ac3ca5d4730b11802f31ccef9ced4673bd85e2640af21dc325262aa3e5e8c40ff0d258a14d94e2
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index 17578c1fe2e7..86003f60c86e 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -11,7 +11,7 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	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"
 fi
 
 CMAKE_ECLASS=cmake
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.3.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.3.ebuild
new file mode 100644
index 000000000000..055778b5039c
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+else
+	MY_PN=${PN#mariadb-}
+	MY_PV=${PV/_b/-b}
+	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
+	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib toolchain-funcs
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos +ssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+		!gnutls? (
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/gentoo-layout-3.0.patch
+	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+multilib_src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+
+	local mycmakeargs=(
+		-DWITH_EXTERNAL_ZLIB=ON
+		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+		-DWITH_CURL=$(usex curl ON OFF)
+		-DWITH_ICONV=ON
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
+		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_LIBDIR="$(get_libdir)"
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+		-DINSTALL_BINDIR=bin
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index cfae428f3b4f..055778b5039c 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -11,7 +11,7 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 CMAKE_ECLASS=cmake
@@ -62,6 +62,7 @@ multilib_src_configure() {
 		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
 		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DINSTALL_LIBDIR="$(get_libdir)"
+		-DINSTALL_MANDIR=share/man
 		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
 		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index aaa0069bf5a7..6f22b6b52183 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -2,6 +2,7 @@ AUX mongodb-4.2.0-fix-scons.patch 1174 BLAKE2B 748de9efdb743c836ccb26239d4b3e736
 AUX mongodb-4.2.10-no-compass.patch 2151 BLAKE2B 724bf4e50c608f2336fcf587c78e68c713fb9b1469c5cf1203f1b155961daa16612ca13fd1fdc10326ebb587c7f339333f92f76d7c770fc043125cc1f931a594 SHA512 a13bea0614dfeb4fe2d81ad0448ecf2364ddd79a9d025f011fbd39c6da5a654e616424f91f7f88c32b00c780d9bc88c497f573b3f1b9a04849c67c4671a26c8d
 AUX mongodb-4.4.1-boost.patch 761 BLAKE2B 45295d05d23a8c2d72e333b14f06c40d32ff6c0610a244f71303fabf0bf0851d3a8a8c3df9f72aa7363a48a0b44bae45d81422970398f8b4f9753bab3dcf793a SHA512 504ec9a4e41f5e1c1a069d64e0958b260a3a8506d17638e62ddf6f1cd873b835f33a588b779e4851d63351faef4be1e0f4720e86f389128d062909b58fdb9aa2
 AUX mongodb-4.4.1-fix-scons.patch 1192 BLAKE2B 3fbb203ca07e1057cb53d1404eb118120990aad339143b5a5fa1e28b528d54dab4be201b82ebd483697485cc90f874db55323f1ae65a6a348f93004dfb23984f SHA512 b26f4d02ee22718278718b8baf20bd57cee7290fe2313a11c629234f29018effdeb1614bd01a98ff5cb62b6a0242acf3f553ea57277327c0d25092c4d80469cc
+AUX mongodb-4.4.1-gcc11.patch 250 BLAKE2B b92bcd6acee092f9da84005a0abc7c6b4ff12411b1bab9e550c794dff7dd7e8f520f5412b70aa030d26778168efc95adace864653eb43ba89109d415e23c5168 SHA512 10b099b09650119e075a4c6e926cc3538f7227df772af6b8eeeb33726fed41f2010f85fa6906b866705602b84a5baff92c557ef27ba1d4a6c862c40fcc4e7bbe
 AUX mongodb-4.4.1-no-compass.patch 1976 BLAKE2B e9bd55a6978309754ca112afc450eec218971314d2382fc03149dba8e584928870cfda84fca75736e1013481b4e5615cf2ec9df8ad0a8dda3f5a5b40da8fe997 SHA512 3a1495fbf79fcd9ff18bf457a0193d3d29a2a7c1c4886625dbc2fa2eaa9460f8fd96eee8b7c9d70bc7a9d1af9816f71dd347eccf837eff58da2daf4e11e15380
 AUX mongodb-4.4.1-unwind-gcc10.patch 386 BLAKE2B 45d1d7a84dfe99dde60ca27244b1c1b5f128b56cf57ebc4f5d75aa4c222a9434102b4bc0ba10193c5b40ea054d108f85c80144fcc03678d18b8e4c11036c5556 SHA512 d12af064ac2e57f8a173fec05b94391fa394fb144284afb1050c9c50ca714b226ee484e0984c5d4122e8470551e939302c1ee2121a17a9d2c583f942af0704e9
 AUX mongodb.conf-r3 722 BLAKE2B c053bf101f5e3e38cc68f2bcbe7fb66ed9e55da9382d2412a497d68b478573390eddc5f284f76d56ca4792fe6241f6d1273a6585a98f96a1cb20530499a15904 SHA512 ef193bfed673477aa0e868114bd52be6675492c164f218c71ccd02c4a620b5c4799ea1d18df0c3f2b364027b9f25e60ac4475bb216b25e1dc10bfd00a9f5d45d
@@ -19,7 +20,7 @@ DIST mongodb-src-r4.4.2.tar.gz 49816559 BLAKE2B 0e51302e7e414de9fef74872e44c8de1
 DIST mongodb-src-r4.4.4.tar.gz 49942905 BLAKE2B 8aa9813e87e216899b3c609b413ce6915d6ddf30faea3c0ecda2a14476fc6b08024614fa7b20e1703b5908759459e88e5e302539c27525c2359233743aa7dcda SHA512 a999528a8a6bf4bf0b8ff8f5169b1aadb3c4dab9c7d936c59d66f238b864fad6e8fb6a1b9ec27f395fca95152ee020f96a8c1cf8960a48de3ce5141f8dda7d88
 EBUILD mongodb-4.2.11.ebuild 4726 BLAKE2B 96668733887275f32dd52ef11fb0dbee680b7781b7c8d035b0b18608c813e7bb3cefb373911878b1e74d0f2798f1824414aeddb5c89daabaf2a7ab318ab7a0d8 SHA512 1dbf5e936a1fc05ed8031c5188566431ea156c2af835da3733965c48c26e862b8f2aab4e732657e2a03e455155e4b6822bcc651e5406acc8584b959d7bd71fde
 EBUILD mongodb-4.2.12.ebuild 4727 BLAKE2B ed78acf75ea3960ff6ba13c816e1a5e8b73696d083b45f596c4d31954467726d9e6096ce7f30b5a80a60dcd9b6ee99972cf83ed23fced789b9e4d8d29c9845a1 SHA512 6e8b9e847ffc3605d8a895c9b8701623159a3ede97cb45a1dc429e401c2cb3582e009333b4552d31e2246f1ff4d8a2dffe89d2eb54e4d99fe1315b6603c508b0
-EBUILD mongodb-4.4.1.ebuild 4812 BLAKE2B 338ca6eaf4962c665e204e9d44f146fbf2001f38bd2f155b9f4dcfdf8605a670bd9ed5fd6b65b74306d13b0ebdf9e587ddc92a6cf7b41fdcb9fc7b15e0b0daf6 SHA512 f4d44914344c3ef0cea98c36b13323012fe6c7d79b1581b29fd6c844a189bb404ea73f10e69f0a14404e2940d38ecbf4f7676266de91c75e7fdcfd36d8025796
-EBUILD mongodb-4.4.2.ebuild 4767 BLAKE2B bd042dd9a7736c7b45ec35281a73cc21998277d136ccd33d08365d255f98e206613bd6885176ddcce25fc475055f264e71ac22102aef919e59edf4888008dd76 SHA512 214daebc1902bad64a44619fdbe4de0c419446e668a6ac60f7d9fb3455cbf8bc30604df39c046228bd3327ad18ddf8f75e453589d0be490c9b3fb7968829a84d
-EBUILD mongodb-4.4.4.ebuild 4767 BLAKE2B bd042dd9a7736c7b45ec35281a73cc21998277d136ccd33d08365d255f98e206613bd6885176ddcce25fc475055f264e71ac22102aef919e59edf4888008dd76 SHA512 214daebc1902bad64a44619fdbe4de0c419446e668a6ac60f7d9fb3455cbf8bc30604df39c046228bd3327ad18ddf8f75e453589d0be490c9b3fb7968829a84d
+EBUILD mongodb-4.4.1.ebuild 4856 BLAKE2B 86aa185d44eea9397c191fe48a72d707e5b24bda578080524abc84ade90ebd6cca161f520263cf86b34e39c72ee57a4f96864876d3cf872d7e7c1e94208c7607 SHA512 698c382d279ca85f9d9bd8e1c03af4989967dbb1ca13f4fe90d1f73004b54f07736cafe46dc8bd34a43177131e7d150cde60ffbc6f5f7c36c1b1ed53999eaa90
+EBUILD mongodb-4.4.2.ebuild 4811 BLAKE2B f94d67a464ac8b2337a9a7a98a6016380d6205a2a9f5584075b85731e97bfd19125b361d21dd74c659ee4015010460162b81e5630cadc7b0b0b71e8709b331f9 SHA512 5471a98f97268856cf99a6e80ae1c916c35f962b191ac0602a16f56074a7560c6b48f6c5a551fcbecd56b1503d161b9854c950146dcb1633756eae5bf2467380
+EBUILD mongodb-4.4.4.ebuild 4811 BLAKE2B f94d67a464ac8b2337a9a7a98a6016380d6205a2a9f5584075b85731e97bfd19125b361d21dd74c659ee4015010460162b81e5630cadc7b0b0b71e8709b331f9 SHA512 5471a98f97268856cf99a6e80ae1c916c35f962b191ac0602a16f56074a7560c6b48f6c5a551fcbecd56b1503d161b9854c950146dcb1633756eae5bf2467380
 MISC metadata.xml 824 BLAKE2B d7e131d6292b092deb2001bbd6f3d6f6a908f57a064f36f64429696849633ae5ff8dee36604e9952a90ef160b834c56f91d085be7c67a6f9a973c83875bf426c SHA512 cc3555829b1587640259c30c8ede022846ad60993d064ba43d16b28ef5b4a46e5b1fad6818826d4668f0738d27a43f29c5ec769fd647076828e275b5d325e748
diff --git a/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch b/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch
new file mode 100644
index 000000000000..a6ff02dcf66f
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/768339
+
+--- a/src/mongo/db/exec/plan_stats.h
++++ b/src/mongo/db/exec/plan_stats.h
+@@ -33,6 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
++#include <optional>
+
+ #include "mongo/db/index/multikey_paths.h"
+ 
diff --git a/dev-db/mongodb/mongodb-4.4.1.ebuild b/dev-db/mongodb/mongodb-4.4.1.ebuild
index b26fac9d1d8d..15407a2446fa 100644
--- a/dev-db/mongodb/mongodb-4.4.1.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.1.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.1-no-compass.patch"
 	"${FILESDIR}/${PN}-4.4.1-unwind-gcc10.patch"
 	"${FILESDIR}/${PN}-4.4.1-boost.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -130,7 +131,7 @@ src_configure() {
 }
 
 src_compile() {
-	PREFIX="${ED}"/usr escons "${scons_opts[@]}" --nostrip install-core
+	PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
 }
 
 # FEATURES="test -usersandbox" emerge dev-db/mongodb
diff --git a/dev-db/mongodb/mongodb-4.4.2.ebuild b/dev-db/mongodb/mongodb-4.4.2.ebuild
index 1d0c36c3853c..c3ffcfa93d4c 100644
--- a/dev-db/mongodb/mongodb-4.4.2.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.2.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
 	"${FILESDIR}/${PN}-4.4.1-no-compass.patch"
 	"${FILESDIR}/${PN}-4.4.1-boost.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -129,7 +130,7 @@ src_configure() {
 }
 
 src_compile() {
-	PREFIX="${ED}"/usr escons "${scons_opts[@]}" --nostrip install-core
+	PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
 }
 
 # FEATURES="test -usersandbox" emerge dev-db/mongodb
diff --git a/dev-db/mongodb/mongodb-4.4.4.ebuild b/dev-db/mongodb/mongodb-4.4.4.ebuild
index 1d0c36c3853c..c3ffcfa93d4c 100644
--- a/dev-db/mongodb/mongodb-4.4.4.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.4.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
 	"${FILESDIR}/${PN}-4.4.1-no-compass.patch"
 	"${FILESDIR}/${PN}-4.4.1-boost.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -129,7 +130,7 @@ src_configure() {
 }
 
 src_compile() {
-	PREFIX="${ED}"/usr escons "${scons_opts[@]}" --nostrip install-core
+	PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
 }
 
 # FEATURES="test -usersandbox" emerge dev-db/mongodb
diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index f01b82bbd6da..815b44b23f27 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -2,70 +2,85 @@ AUX 18.3.0.0-makefile.patch 986 BLAKE2B 3cad2bb7e508f7ca4f25d67ba12b5f9221f739ba
 AUX 18.3.0.0-proc-makefile.patch 564 BLAKE2B fe06fa4e6df8bd2f563ffec9b0e2d1f22179a879b5e068b0480409eb6a531bf50b092a0abefd77804e5f0bb571c6a9a59b14afee6b157551b4bae833cb10f159 SHA512 8bbcd7a110f41842f1e40b037720f283a7ae763a77f4cceda19061ab114eb4d428bf0dfa2c45782bc6ea8c9daf3a185faa42e8cdc9c765f93107f23a32344f69
 AUX tnsnames.ora.sample 2939 BLAKE2B d02d4be5eae8c8da346f8b0ddd2b6808e59f8e77f805b22154a77d22db325d415ecaf811323de3c7a6764a9167fb7f9a9708d1cf2de891858bc43bd5e050954d SHA512 25bb734bf4b7ea1d2ce2bddfd241204e796cad0d1d49036e567237d7ca92d158ab7bf69ff3abe210050c8ee0a0630f9217ced22dc31770814d822f93b2af5845
 DIST instantclient-basic-linux-18.3.0.0.0dbru.zip 67930600 BLAKE2B 70d9c54a8df66859d40e4374cd3073613fbf3656850373ada6c9707a7076e0d0749e3b1a84e2d46d18643f80020ecf8c525224433c946946787388dc3f57c79c SHA512 3e1bda593c14d14942c7bf8393111792df01bc9d5a15ae0b4010bd29d71bda4ab044dca6741d00185976c70790fc24b5221afc436d33abe6277e7513cb8bd859
+DIST instantclient-basic-linux-19.11.0.0.0dbru.zip 70336706 BLAKE2B 061f6abc83bab7f2e6712e33274783f96caee3d97629d39cacd925af658f737a072207449468e05f89672bcfc7ff98f81d7d9c92a8f844664ce97b4c6afabf27 SHA512 da4db9c64c0f92c2b78cc6b26ff710e3330e937395d62942625921401042af27fdf80d25eb3748c97f4281442ddb72f3ddc5f68171a89ae289f3d2f492c56ef7
 DIST instantclient-basic-linux-19.3.0.0.0dbru.zip 69597591 BLAKE2B 4ac954c027a83c1a05b502203f1465bb29bb4e58486a98bec7848d9ae0bed6835fdc6bb5f889cc9dadc815d47e5e06258c11a6ab1fd045bd7a878858f3d1164b SHA512 d9a7c664cae598344ec7b9e9c43def9626dcc0d54d478843a5145dfb3dad5df51121c5b2e9f4bb48a240611981f7721441344649d1f267b667356271ac778beb
 DIST instantclient-basic-linux-19.5.0.0.0dbru.zip 69646008 BLAKE2B ad598da8040473e54b5134373c9a091c8fba3e13c7a1b4fe0d6b07cad36003236494432c246e79e9b09ab1cd7e38f0c5582b7db14d1d9860c8026aab26fcd5ea SHA512 1b6e7983469cc8873b17f1753ab147d6c23d7c664f2971a603910130526aeb60b0de9180fbccc01f7c952888c80afdfd7a090058e934b269c4a0a1aa9096388c
 DIST instantclient-basic-linux-19.6.0.0.0dbru.zip 69922395 BLAKE2B b8eb7f1f56ab8eff9a08098e65fe38f52f72951602917e2eaa30cdef4f6968f831deeeda16c89cdde5d2a0d443f5dc4aca773abaf614e66fa581da1a4757d717 SHA512 4782cf41ff9da3d52ffe021e7c20bf2d1fce6075edb74e765899268b60005468e8353bf3147cbbc07ae03a7a0f06828e9ef37b00a8492aacc349c3b57ce32f3f
 DIST instantclient-basic-linux.x64-18.3.0.0.0dbru.zip 72794506 BLAKE2B 22db5d69d48c33061db72bdc050e081ec24152c5e4655505c7f75407646f5ffa140aa51f4638ad8e7c5628476bb44358cb061b2d228ab1e36cd9464e49fcf1f6 SHA512 92e607e1711b24ddf10f11ecd3b389795acc544a567a95cb62b624e5913ad11a1707699b5df659f5fb33dae5cd56700036644e643c7edbe51e7a67e57a152ecc
 DIST instantclient-basic-linux.x64-18.5.0.0.0dbru.zip 72902980 BLAKE2B 23fd9885309507183758cf817b0d68342633ad08eb627f4136b967cf38e1910cefa905f17ffea7c929fafe2232eca71ee66a15153f202eb0d03236a1b21cdc30 SHA512 10e6f91dfe07ee4788a5f70ce65affe141061e7b1d6ea0eab6583bd2aed47d7281824e91da2103c53f15e49f02b94add8c3d524494cd4eacded90b2d1cc8743b
+DIST instantclient-basic-linux.x64-19.11.0.0.0dbru.zip 75943090 BLAKE2B 6e081d22af1161d1505847c6918cc618f92810d7803f2bb13b3c58f2e8c5bb3aa70d2006fbd1fcc193d3719ecf224c3541f3dc5c5ccfc6105a10c54c51ddd2c9 SHA512 0f7242a1becb062b6c55202587360895529e7ec277b0e41e27466dc01caf4b97cf0a256d0ccb9b71fb86b4802d9c427e0428f0419260b609d94472f89f7f33e6
 DIST instantclient-basic-linux.x64-19.3.0.0.0dbru.zip 75106438 BLAKE2B d3738c6a92251c75bf39afa996eecfeb9052c6cb6a8cd2080755c8108559257c4aaf660b6a12a1127228122836c85d15d84bb322d49921184ec67ee32ffbfddc SHA512 13ddda55c88fe72e761d9b9ce5bc5ccda4df0bd5ca6237efed34e6dfebf10866b116f3aa7eaf023a73458406584a4e57ecde825bf996fc0e844c030e4d8a3bba
 DIST instantclient-basic-linux.x64-19.5.0.0.0dbru.zip 75169949 BLAKE2B a2f63542408a26b52389734282268cc471b4e995242ce53a52bcbfdb7eb7174bca06f26c1d2291dfd797dab860c18c56f38e4a930486436de36f171ab30093a3 SHA512 7860d27392c4601969a480199f263fbda0f0952a2dcab36efcbdf501568b624c6219d4966a8ff4936b6657b865fd9130f5fdab6bdceec2a45f54fe448f94db4e
 DIST instantclient-basic-linux.x64-19.6.0.0.0dbru.zip 75462547 BLAKE2B c75747d3e03e1dbd8031dad41486261a74ae16b414f0e888b1596dfac752e7ed3bf04379b1b48a6107648fbd8de0207ebbfe306bbced2b5b9f5f6502c11ac4f0 SHA512 41dd2b7645f231a9c8a3e69e75bd679e8c9ad4e772777849b4a44f80c18a70ece92d400c3369de917c897bd2e4b9c59fa73fe36b5559831e508ab65965f9e278
 DIST instantclient-jdbc-linux-18.3.0.0.0dbru.zip 1574763 BLAKE2B 2ddbb6a6d61c3b6bc3e37b40f786dd86f5efadcf8cbe5b58dec2631b92ebae25065cb29f87ceed9a1f426ada094a9c0ef1887f8ea7b70e66527e9b75e11f213e SHA512 96298e579b6b5a81ae2ef679d6bf9a18f8bd08c33981d0a5b836c20710dc07d15d7964895a3d66c01075a20720d333f766ac439dc4f3867edac473e020eaf065
+DIST instantclient-jdbc-linux-19.11.0.0.0dbru.zip 1577534 BLAKE2B 954049186c80028567f5ec0bb30aa28f6d9092d8c8be7cfef67f94e397dc26b935cfbbf75bee3b32e56c3697fb5a7e3181f9948ef91177af68c648e102a7db77 SHA512 5717137a6ebf28669347dd6f03f61b7242a332b927b55502b9019d108714c77e3dd31894f6d5260df6553604b0255b657aed46b63262db9f2e7153c067387e0e
 DIST instantclient-jdbc-linux-19.3.0.0.0dbru.zip 1577507 BLAKE2B 2347eb36b1dbe7552753be35b2656edbb43140768379abb8e5c94be7fb3f66fa139becb332d328d8e7f0b7f0b4e32d86703d1760dba36f53471a5b6b3c9b2341 SHA512 66c60f97994a1f45b0ef9e1600da6de319476a6ec4f6a0c9a04516d86e9d89fde1cdfd3bbd8279df125f96326f52875a1daef2ecbb6525fa26482eb637133205
 DIST instantclient-jdbc-linux-19.5.0.0.0dbru.zip 1577511 BLAKE2B 59ecabee9e38d98aa9627a01fc5f3fab9c6c3afc44d8f44c7f231b8e2582852be06761fc03ccad0c7041d1910bd4d914aa6a7e494697844efbc1e62cf95bdd00 SHA512 d1198ece5e6bfc9ca8becfad4990246bc31c53d24f7fec886da979eaece60d53211ab3a6e792f9c8adbe866e3c4b990bfcce1e9ccd4271bf2e036b701a32d7c6
 DIST instantclient-jdbc-linux-19.6.0.0.0dbru.zip 1577514 BLAKE2B 8c8e9e762fdd1a3369aa668d4afeaf23c05100f4e74732b02d47b1056163aaf7d7f96fe51685f02ffe94aa730b4bc3c24f930af9739dfb8ca192b3e64003e73f SHA512 f57d7d3597f3c89396f2b185746ecd72e291c2db6e733adbd51bac32879390395bd3dfa3ac648a8f78aa472b767a8685d090ac49f85c2f68686b6a85fb138b27
 DIST instantclient-jdbc-linux.x64-18.3.0.0.0dbru.zip 1575572 BLAKE2B bb9d5ad0064b547a7152d4f9b170c646105b4a0731596fe381f7a2c63b720e36cc5a93eea59ea71aa3405999d972cf962a74063350c468a8d114ad28f5a0be0c SHA512 70ebece929cb11f34fdcb6aea75af3679f22d0b838c3d256d4c7c0249977423625b1244a54ca504b51d24e2f178b1784571e185574cd3db34c2cda8128298b60
 DIST instantclient-jdbc-linux.x64-18.5.0.0.0dbru.zip 1578269 BLAKE2B 88047325934da02e81e907c9c4caee540cb06da7d7c08562e90781c2f6004940ba20131d971018fe237cc09cfef010fdf6f912b2309006396315ad67c17b10b6 SHA512 e46a4326f61863a63be333bd588571bc037edd2de1f2462b799e17c65ca8556aeaf42e2eed3a7226bf8c89479b4a723fc6cf6582a65b5ee8a827ffdad1c06bc8
+DIST instantclient-jdbc-linux.x64-19.11.0.0.0dbru.zip 1578059 BLAKE2B f5db4ab8b4424d21bb685b43012f71a228fdf1444e055b44dcf029b3beeefcca96aaddc496ac5912d4b337ec5d2bbd959df6083c18f7921811e996a2d73e5af6 SHA512 b2f906ae887f0421ff2edb80a70d0ede1fa624792e45ebfd205ade3f24dcd3cbc596c3ee64c39d7143810a2a11fafc649ad46cb5549d519dd3a1ffb7476fb537
 DIST instantclient-jdbc-linux.x64-19.3.0.0.0dbru.zip 1578033 BLAKE2B 18c9fcca1282c316c67bf86258154d94a26d81779c1d36e782dd55d91fbaf40f03f1e403db9beefe114a27f09fd3d2bcfc643cf3e9a02ae68a5bc3d2eee51c16 SHA512 58813681a74286a7f080f729e3a237584a091487401af08619e2b4349323bf3def8cce22eb550d8ee5675e9a4c7ddddab8fa493bdd8c89981aff3ef0f65d1eb3
 DIST instantclient-jdbc-linux.x64-19.5.0.0.0dbru.zip 1578023 BLAKE2B 2919f4d5a304d16b284151c620134dfcb934251a35837aba2286bb9e1b1e79179642c4331a19994d0fde55ec2859dfd5a7a56167f2b07cd0939f5c85e9448721 SHA512 c62793038b154a10dbff738e31d9e0af4e7dd0435aa51b1839e49be528d8a7b567447b735d400c3327a28cace5b9e22b92d4d9eec0eec0ce77e9f6d7831007d0
 DIST instantclient-jdbc-linux.x64-19.6.0.0.0dbru.zip 1578022 BLAKE2B d7fc065f6cdd7d1856651f295762565f8c826e5e74c350287f8fb325b622dcbcab04f1bdb9b68e67a458b1ae1c26275f2926c9f98b61da00040a6c31c854329b SHA512 68824d2e4f4881da7653ddf6e09e7d32aeb53dc5e59b90647c33706f09081debc27b517714ee5af2af3ce25ee53ca664a17c5ca7e4695038a3bea1db82236071
 DIST instantclient-odbc-linux-18.3.0.0.0dbru.zip 605026 BLAKE2B 2f7808ef2706c65d1c876e44e7b831ea0629a218347f34dd4b81cce192b45b78b26c9e164b179232b1fceeeeb5f84d807ac6bef1f36fd7d077e620bbb6c093eb SHA512 370d3f34c57e33909642f18104de8b48c2ab0fd1cf679087f8601720ebc1097f64caceb118010b9e8d2f7207cef04210b22a36824de747683c3a1162ccb4f09e
+DIST instantclient-odbc-linux-19.11.0.0.0dbru.zip 600428 BLAKE2B b4bcb4131bab1fac2650bee8cf1db4f389e89bbf0e310f9df2a9f1ce29ebf35f8056e350175ceb406e82bd077825cb4e6ad405c5ec00929f2db2630e99630006 SHA512 9a21c2dc06b6e1c4ae7305ce248cbfe45e4ad830a48f3e088be11065471beda002fd5a6bcca71f5095ad70186d742bddffc82bdb79a4368e89c59bfd3f04af4b
 DIST instantclient-odbc-linux-19.3.0.0.0dbru.zip 600586 BLAKE2B ec76518290f306f41305b12da317ad6de8a73f5049ca6e06fb0e4197ecc9dc8f9855c469fa36e309615a749150580d3ff89a35bfe5878c6441fe4f6218ce3410 SHA512 77aa6c1c5f5a93b86e4e529656ab1b2eaa1e008e343d17193a074e758fc270a5b12d641a959c51b00d5cbc7a2b562c590e662701e66e295d218995ff266f005b
 DIST instantclient-odbc-linux-19.5.0.0.0dbru.zip 600590 BLAKE2B 6bfa2fa4e8e7ff5f2ea25c21ecacef97e9a1e403504d101a7c516b51eff814b5ee5dad36dcbb68be07324f560f3126ebd932e54b4834766cd8cc6f5705939da2 SHA512 bcb832d1d2011139cbc6afa68c34a5d747478db0b719c12211068396367c240d93f594f7533009b4a876484bf1894deec44a16cd5ca65ced353573d1068bb567
 DIST instantclient-odbc-linux-19.6.0.0.0dbru.zip 600498 BLAKE2B 0560d7038f0171428bca92ea78bcde6ae9169dde994d2cc4220f733ba9b7c198fbfa61db22f30f62a68ace44314c280976b0572ccf190d60bcc9c23a0ede3b60 SHA512 e6c1fd3f1545cf83da5ab9fc0781ee711434134d88836b045ec7ccf510a842a773b76365177aecd7ccc711a3aa6ec753dad94fa637c9df5bff22089babe7d824
 DIST instantclient-odbc-linux.x64-18.3.0.0.0dbru.zip 648825 BLAKE2B 1e96b87802c9ccc7d5f6ae2fdab501004e6fe8d4e155503bb983c82cdbfff729263e541689f4c2dbeeabfdd1037f0a97191e3a50842a8488a3267f24fec6b43d SHA512 23ad10a834fd92007147f8a7ad95dd9df4fbd5b786f7e2bb9afd6a12101fb934a40daa81ade914d8d0f59872591a1ae29438f23229b3767ed4ea3ff7cc730f66
 DIST instantclient-odbc-linux.x64-18.5.0.0.0dbru.zip 651470 BLAKE2B c5e7d794137fafb97ecb5fb647a640e59490270787c16f972882c03b34c4f404717f6f87e8501252f415a85b8d92031bba9910eb034c92c4f7fac37f66a3fe43 SHA512 b9e066af00b263b348f1e7a26dbf5672f01be79115bd75a47e2cff95f32fb412a8d03736e1c5ac663847a2d75ea5606cdb1fc27434f7690120c462f8eb15a6cf
+DIST instantclient-odbc-linux.x64-19.11.0.0.0dbru.zip 638686 BLAKE2B c9fa1b8988d85870bb4c2d9cb5c34c1572079c36a51da0ef726250f03ca0b53dbc19990582358011f099ca183d6148f8110cf80c1a17917549f6e38be503f706 SHA512 7d92ff08ea48de0e981cadad15a3c392749b3e20331b25f00f2f96ef7cc11a9802408f18dbfbf36366b0122d6c8fd256d43297c3bd87b4304b0479b1593e35fc
 DIST instantclient-odbc-linux.x64-19.3.0.0.0dbru.zip 638697 BLAKE2B 2a9077243a4718c7af4abc2c36b7ca3e2993acb904dd9873c91bf8c0010ebaf18d6864a6b488eaa3a66d6fa42f83d099367533dad65d228db6e21e2b4e23a6df SHA512 dc148301d7e0ce7d74d90619f4f6aa03a26d61033d36803de7623ad64ddd5da1b34e24704ec1cf948ec341ba91e96c1bc08a5b62da79555d248f245ae75e776d
 DIST instantclient-odbc-linux.x64-19.5.0.0.0dbru.zip 638692 BLAKE2B 6ab7357ee95d806ab60de2da2a82414aa2f5f0e7527cc4f44a4028a52a01abb334ac8c4076e5f26a6d0444943e46f6c1da7843d31ff7b1c1a9d31cf13a017c9b SHA512 ac145a24ed2a2287d28c45e16f87509786f044588443b470e4155351576bc5a7d94c845f6af38a58f1a5bd82a57a4b69a8719f46cc85b1f0c4173ab3ee927fbb
 DIST instantclient-odbc-linux.x64-19.6.0.0.0dbru.zip 638654 BLAKE2B ae618640b281852e48bb5c3bb6776c7445e824d98fa96c1308f71bfbf7ac81b65119af31a92c1909e2243956ad0457c21060618265bbb78aa1be8c008ce2fc32 SHA512 f0f02c067ec1250402dde3959de527fa7b85709c225a974c6867be5d24471e8da744a1707f52183987ea91e55c69fdc92459ce7b9979ee1ad1f4604963a7dac9
 DIST instantclient-precomp-linux-18.3.0.0.0dbru.zip 5200252 BLAKE2B 1d3613de34ccd61fd7c3795170d6d012491bc2c045c39f39db716ac7ce2e68e7e8da84c5b95afa8e50afb97d2fcad8e469f25627b9ec570f58f0b167a2f2348e SHA512 f783b6f346cc4848567a1b7284a93d1bf20a9555fa9cbfd57597b3856444969653cc6d6c3c3e710da6775d39d2efa6399b9e91f4f7458de43b0a404f4f693dd0
+DIST instantclient-precomp-linux-19.11.0.0.0dbru.zip 5194893 BLAKE2B cbfda89f2f97728234aa3aa58d13289be66db0127f1e73675ea2fae348d8dff28e86b85b0a5a8f372dc155a07d6aa71f2096ef5b3cdc3082ca80c107fac06f4b SHA512 196ea51fc11d59212e274669e623d86cd91c6a8d7425cab5a08044d216b118ef2e4597e0c2a904579f35de87b5fb87f9d6a6eeab927af5878c3a7e1e504730b5
 DIST instantclient-precomp-linux-19.3.0.0.0dbru.zip 5183647 BLAKE2B 79a37d25e5731978911d643bdd19c0b0f1f66b153ed7164358fe2038a987594a73a8aacbc2fd8c542557a099e52931666cc9df5d5fb1af30e3fd365378fd505b SHA512 a6f7d7f82d657bb32431aa81c4dfa1fb3ea31aaa6df9781e19fc78c2ef25bf168420c95e3d9fa8f4aa3912afd3fc98eaa45f63a28ddaa091c4e50360802735b3
 DIST instantclient-precomp-linux-19.5.0.0.0dbru.zip 5184902 BLAKE2B d9dd690b9aef42bb1c358540dd57357ab78b7f2c13014e017d70116a41a20f4d9a520436a8eaa46e007802ca49f8383853c832fadbc50ddc8e6119a491b0c880 SHA512 5cd41a92485fed47ca9297ae27078cb0eb6d3b4c4f7f348908e6d199ce8255617948637a362f1984bd75346e12d28f25ccdf7df1c376b669f9e7b57a9ee97cc9
 DIST instantclient-precomp-linux-19.6.0.0.0dbru.zip 5187123 BLAKE2B 29d0b54cf0575c242a3a8e742dca9771bacfb43870fa8a7c9ea6a15f51d951634b2c464c5e5b87cb0dbd63f95098812c0ed11edfb6999bd50155199aa3a6106a SHA512 2443ec5940f0bdcc151c913c42de58b0f30c052c8cfc13edd82771420d8393b6332d92a0cfa52afb8937e555624e871e3a2c0494c23770724c44081ea29fe353
 DIST instantclient-precomp-linux.x64-18.3.0.0.0dbru.zip 6403554 BLAKE2B bd8e1b3de4b8c12214ea066be22f7ca18133e62e1d9a70b2710578e967204561cdcc9f719f8c1310e19e94baca367e0aa8c482e637b2f13a51781328b229be92 SHA512 292322eb07e3707cf469cea8390636fb2fae99a50b3b900a9c43b5808ce741cb708541820de5e9aa9c341290ad5015be32d968c43e1a14aebf97dd5fd04fc925
 DIST instantclient-precomp-linux.x64-18.5.0.0.0dbru.zip 6401804 BLAKE2B 9098fa6966023e4cc48e9c4fe60aef5e7c4d15a5200fcf92716fc224fa741cb6bd41bbe58a1820ab4c4c95b5be2faee8f0d85dcf6d5c0f14c51943fd67b32856 SHA512 e44ddacecbcc7311f59490116fe44f0d9b303c0a669d9ecf43926bb5627b0a767400bd51e8ec1162d088ff52022d2fa0d2f4e9d83e7efc0e40b0c02679c1b109
+DIST instantclient-precomp-linux.x64-19.11.0.0.0dbru.zip 6254880 BLAKE2B 0035623721a12c096a38ee64bc41465682214763f123ce9c529c61b6081c6de54bd7835f8b4ef07dca5eafda5354a77fa589c7c54cde412e1bdd4f313e58b3bb SHA512 d322b7896992cef8e48cc48acc68a5730d2a04ba0af5130eafa6ada79b64b16a4bd8cfaa02a28587d0871713579a5215ff46162499cd1f422252ef8dab61b7ab
 DIST instantclient-precomp-linux.x64-19.3.0.0.0dbru.zip 6225945 BLAKE2B 1a17f20b7147496047f31cfeee56efb74c7daface1c7e6bab2a67258d410723b9e70b771fa9df9e16c2c27c831e97d538a69854e565ebd313f528a7f57a2f358 SHA512 6db99e0df10d439e93813ecdb27e5961232ab64a480b6aa0ee5e00a43e08bae2ade64b2abb60cad58e3139609f81835bde53d91ab35dedf427d3122d65c184b6
 DIST instantclient-precomp-linux.x64-19.5.0.0.0dbru.zip 6226878 BLAKE2B 5f1606d5e9bb8900b4181e781b270d6dc28b72def6f77edfb8ba241ca4b955c9f9fd2b61b8f4c97eb20845ae3397af7be8a574f175095b68478f299220f2332e SHA512 a4b200444efa597ee66b858f3eefd135fc36f038502301f9a1636ffdb6955c1bfca1fad278b57a0dad2fc90979eed4750d9ef631b64ed65495d5c600ea36cbb6
 DIST instantclient-precomp-linux.x64-19.6.0.0.0dbru.zip 6229434 BLAKE2B 9d0f5ee6f18fe7d9caf80765e8367d72c2336c7022e9fe35ddd284e13229280652c1daf816d14556f614c256a594e92dad35736a56e4d8ba535b68a47d63dda7 SHA512 ea98cf319c1c5937e2e95acfb474c83897a595e804dd3e2a3698a4584e37aa54f2b59e6990f4f9b1c947d8a39ef24e502037d85178ff02e84ee76c4f794952d8
 DIST instantclient-sdk-linux-18.3.0.0.0dbru.zip 927121 BLAKE2B 5b53d759cb82c854d67b9bebaffb07e442b62d13367e5acf19af2dec4dbca2ba3ee50c83f89cf6e865121ad039227d898e74fecf43439610254eb43a429422a0 SHA512 6e4ccafb69d047b96dbda2f493c175f005b593472ea3c9a75fed758d2f12d970509d58b32d94f7a59b3d0402a87efaa754e6487af9cde01f7211f0145434c6c9
+DIST instantclient-sdk-linux-19.11.0.0.0dbru.zip 933913 BLAKE2B 08cb6c94cd152f58fe9e52874b40dec56a6f7d3c9913122303b46f75ae2df0e13fff1a375136b6fffabe9ee7a7d844a2b95b1be380b6d957338b09a15c9fe83a SHA512 8d7aff3d066f423021a5babda86b1b378333966fd892146bf46a967495180fc099e9766deab27d81735fee845ab43ee48d8815fd96a73e3a235c4fde74952e40
 DIST instantclient-sdk-linux-19.3.0.0.0dbru.zip 932301 BLAKE2B 6c5cfe55a651b9364da3f24d5739813e1b8165fad6434b7a09da2acdeddda408ab4fb37aa34851a537a000a4a7718fbe41ccf8b5fd51aa1bb4fd2e8ec0db33f9 SHA512 8dda8500ffa9eac966f54818d1c19b7d8b878f09c0664e03cfcc8ee8e5b061de566e6b411d15c5db58ef0e97374c2311d16fffd6b4c124dc06bdfd8fa8916b7b
 DIST instantclient-sdk-linux-19.5.0.0.0dbru.zip 932492 BLAKE2B 35a8cf7186c754c957738a6a1f815f11a523fe7100ade7ceb646976f5ddea90aa0ca9ff435600f36cad774d7d72a96d9305c7344d8cf8639d84f41611bfd05f7 SHA512 9f9cf54d09b807ba9d3c96bf242aac293b95a9d4b19100cd64a5e84769db0b9541fea09de57a98b76d0500c68fbf2ef660a415c780812ae7b693064484e43ada
 DIST instantclient-sdk-linux-19.6.0.0.0dbru.zip 932525 BLAKE2B c27b3f474372fd2a08b811c519cf0bbad6197c26407e6a90006ac21ad153a2af68ef6a33b7e7ed28439e2a6481df36e37663faeb314ccc4d08e3ff76ea1e23bc SHA512 ecad27fb94d22aaa6ef797dadbeac4eb4275b7ce904c3e5759342fec73d2d2131d41abf17fbef0a6bdc55a5f78e78d6dba70507db819a3ffa9c4213a8e494614
 DIST instantclient-sdk-linux.x64-18.3.0.0.0dbru.zip 927118 BLAKE2B 9c6cd889843552cee3e84566d9c1b29369b1e7b20a01fac65676a33d6196b042a4c34cd2df8cf1ec5c8664a403e44e6a283f42912b7e056e093c744bd24ec24f SHA512 c9e1493601ec70541e437ded748f3be24deaa3f1037884fd003907bbab38b3099aef12dda1b9845c3eb3ce3827f743696f5ebe6d8dffe7974088c1329528b729
 DIST instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip 929988 BLAKE2B 942f99fbea74e253a0be1677cfe40d79a26cb7a6442631d626648a65aa4f20b730e4f1ff13effcce5c4befd2ce50ab038f88b61c6f05ccad262568b209b3048f SHA512 7adc9e315c7c8784e4648a97fa54e03eb26a05b7b35a1f5cf1105898701b31fdc22f0011b1ae192752adcf3ec9798ba635bb9a9a5d4bc768a9a519c3564a9375
+DIST instantclient-sdk-linux.x64-19.11.0.0.0dbru.zip 933906 BLAKE2B 7d15f4c5a53708fd311ca75c35db5cf1241070217c21acf05f181ad07259135fd64eeb8f84582ce1faa6bbdd9c3fc29c07e44d82ff60fe1bbb9acaf7f70612c3 SHA512 d964612f0bb571c5c1fe78d14f861b2189d917d23e9be936faa637d5a2f8b530dc93a1ae0130346b70897bd1382f23953ff3e7f3163a580b7c6058675ac5fcf2
 DIST instantclient-sdk-linux.x64-19.3.0.0.0dbru.zip 932294 BLAKE2B 26ea1ce34209c1dc92101e211f009ecd20cfdad4d88e946844cbd1f2b1f4365c7dd273e7079be1dc807c38393035847e47800d65b0ecebb3a705cc6cac092a0d SHA512 ec3527a8371bb9644f4912b8190cfde53bf2afd8bf2ec7376bad97dc4d4b37f010a5e0d30567e2398f51c07affeeb15515347df095587a9cff84ef657b7e8c6e
 DIST instantclient-sdk-linux.x64-19.5.0.0.0dbru.zip 932481 BLAKE2B 6a62e3c2a2889b5534133882c47aefc957c3e261c0ba7c161baed32657de0d15317356719ed9b354919fec8936dfb99044b707e83ae5ecd9d3359955e6de0005 SHA512 0f6521cc2c0430d15efe80fcece7b802146418591ae52b062f3571a85a60a8d8912b8d484e36360bc7428c0fe1e18043fac5bc7b3d484cdca9737931c1e72ffc
 DIST instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip 932514 BLAKE2B 8388f312a3790cd9bd7307fae8226867eae159a93099d418f430101b6b87ab9d081c74f1d31f2fa8f33e50bf3e643bcc21aae57dbc6e913fc4178ab6688e3f44 SHA512 a47d1a2d99419c383e1cb4ab236beb35d067552e6f88eba65fe38e26ce8afc2d45c0ca482b1f9f1c38337678880d60f8b73a72a5137b06c984bc930bc05c48d9
 DIST instantclient-sqlplus-linux-18.3.0.0.0dbru.zip 881315 BLAKE2B 787dd43ffaadd493d8cb3a9a8bbd160f75c51ad07e16d8eb7631e8368b4a8bfe9e574326837724b3573705e1c309cbe0bf364c1b98660534b05f5d72d28b1b11 SHA512 9087e5654143c9da3499fb7f1b8a15b04433cacc0d96257519788b3cd12a0aa480b37fa37fbe55a2f40940ea8da1eeae9881712a87d5942e142c0f29b580e54d
+DIST instantclient-sqlplus-linux-19.11.0.0.0dbru.zip 884155 BLAKE2B f681321cc43646af74eda4d6da102587123e0f3fb423d978066f014c4729ed046806f9c49cae6928704b4993459089e8d8c1ab4fb1aab912cd6fa7ee27382fe3 SHA512 1f4bc70b070c9a0597f1433913018021e87a7b059784a56e47842afd8a501039def6591f4e7a009f3f4598f23c45aa807578a74082174862ecb444b1855f7b22
 DIST instantclient-sqlplus-linux-19.3.0.0.0dbru.zip 883462 BLAKE2B c3891a6ea525add3030372bb96b57e31b3a2743dd5bddbf12d4e2d43b7732b244c265a15423ae48d93db609f37a449233c8c16f5fd7c1d345b6ef42c217bb8d2 SHA512 521b80d47320b4ea51a68bee8f05fa51fa5e74690e62817d1fdb5471eaed577cad6bd5364e18fa5c18dc0cf56b99e33b62488a93c176d860e471ce2a7e9facca
 DIST instantclient-sqlplus-linux-19.5.0.0.0dbru.zip 883548 BLAKE2B 43f6896f392b5d765506e7220ca74372603760dadd89a430a9e840afe85575c911ce326a5ced1b634d240a279491fb54a3df39f2289c30f736f3a70541dafb06 SHA512 eababf946085a114a91065b03a0d36a03b5d8442f0029b13dc95f698c086e8aaea64184d9a899b36ecec0f24943d0340aba400cb3fdd52f93367ecca76ccfcbe
 DIST instantclient-sqlplus-linux-19.6.0.0.0dbru.zip 883975 BLAKE2B f4b5949159bd9df48b3749c6119f3188e011598795fcdf3f0164b7a04e19c0899acfe11411678577e67aa79cd209d7da5aac1cfcb4ced9b1e96b709415bc9821 SHA512 72e4ea40c02be6b1c41729e4fad404a8dc53dacb31ca027e44a4152b83972e2ffe41c68c3682e7da8bf35bf9eafff0fc964da0f24097dc9b5cf4c247a952c025
 DIST instantclient-sqlplus-linux.x64-18.3.0.0.0dbru.zip 915778 BLAKE2B 8d93e462568a5bf5a294a5abcf0a0e30c08e9eef18c01a79b8f716261efbeb14a286d1058ddfa278108daeb49b74a3e296efa83291d7bc03f4ad35428c946701 SHA512 878ac2cf58aaa8cb237779fcd04378c95d738fd444eddd5745838fa86e8cd60f1c2be49f0f4fc3d4b16dca652fe66681ac0907a4aeddec1d9433e63d2f4e5db6
 DIST instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip 918469 BLAKE2B 14efa748e7a892334610fa7a615c56b07e25873d5761408b9cac642af11ae2d97062b8014e4c7dee06dc37676d7c9d1a409d80f50b9d162210e073c1c4ef67d5 SHA512 8c2866ad092893647086adc554c7fab3c9bdc5429c9e0715d68717065fe12f106d228a2f241fe76bdc677a4adfa6eb01b0d866fab2bebbb1491a087a4b9d4a50
+DIST instantclient-sqlplus-linux.x64-19.11.0.0.0dbru.zip 911265 BLAKE2B 78215f683458147792be3182eaf9edfde5943e8e470a7bcbe09c82c298df709bc7cdf919e349a9130b8d6313f2f8a1d04ad9b5b3c5ad91d49802ad14c3f15515 SHA512 dd1343ae49917a031cbd8d757d11da46354f157f46dd651afcde09b4b74a9e02008c6370eabf6bd313190629944cc075d6fbd893b491ad3505b7a05dbeecd963
 DIST instantclient-sqlplus-linux.x64-19.3.0.0.0dbru.zip 910409 BLAKE2B e05c8dd3c545842989a2650013ff7ac8b06b41bef07efcd312ff66c51929942e3336bc9bd9a53a197088433b2cdbcb5bfbf4b2f4e1a40d68cfe559207737446e SHA512 34320712009ea724edd71f04bb72dd58fb99d34b1a357e238c04c9a55c7120eafc8c675558755a85587c7e75801dde2a7f8fc54795dd7e3e61568f8cf27d791d
 DIST instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip 910437 BLAKE2B dc204e6dfc4ab8d22720067b6238ffff773a5db6522b2066306bbbfa8645cc62f952126b2f4bc548dc0096695914d7ca44c7b299f59a609c363739fca1be76e6 SHA512 83a8b7004585ea3a31f7abd55615c983963b3df2ed030e54057ab897442b38ce41fe66c2754ad034b37c588090fe478549db371b809e457846ca537b25b2fdb8
 DIST instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip 910905 BLAKE2B c1bed01f662ba15b80b6fb4bfb461bbdb7033183d7bf60823b1a6d6aeb7ecab4cd68c1cc889c61f11f5173c13d617494e7922fd84fb5757bf08396175c3ff68e SHA512 6140a8b9fbd78e2d199063dd70e441737079c54d4ed115a404a77ca2cd7503babf059b7c9ade5605dc2c5ffd9e058ac26a9e159f47f252e1399afb51608f8ce0
 DIST instantclient-tools-linux-18.3.0.0.0dbru.zip 1042756 BLAKE2B 1b1af7abb50b6977e0dd4bc0f2b5e89534cf5bffe216dbe553063761470c45f330f4a72ece428a3e0dc8162cebad3cf0ffa628f4b3879bc434ecda7b7b07570f SHA512 b809b83e2e7dbe19c13611c1eb819fa4648a127ddc8a97abaa794213c7f4b6d28b70956aac4f331389d088c6fccc998d0eda8dc39f2dedc338f3baf03bc3ceac
+DIST instantclient-tools-linux-19.11.0.0.0dbru.zip 1020021 BLAKE2B e2a615e0ffb4608af05931a8b49406c85db5d549761319c7116395fae206fe6cc0cf56b49e6c3968419e63616f2d07ad6ec3ed70c862fb2394b8dc0ce9f6dbb0 SHA512 255593c1e62a11f41793619c856d316815d77fa83cc9efee1d5366dc86b32e9909b042f7ac81ad693aafb8c34cdcc8faa7eebf816a90d037d36ce461df33f469
 DIST instantclient-tools-linux-19.3.0.0.0dbru.zip 1018792 BLAKE2B e24a264d59a4e29b8dcf56dfd09c80571612f465c8e2e91514c076553f27a0b07e66bb2ac0f3fcd6150c8a04ba861de04576e45ca1c03d173149296c029b8fcb SHA512 33103d934dec1bb6e34fb3f15cbbfba2ceec724334ca89bc55df3953779b3f4d45d70e7c9d1734481f366bb2e7e8ab58bef063415571acdf07022f193558ed54
 DIST instantclient-tools-linux-19.5.0.0.0dbru.zip 1018855 BLAKE2B 273d2abbee9d1a54d4ee4c1aa69c66fb7e8df97892ae66406ecbd941a4bcd2e5cc592d39b9d92856b4d211d8aa7361d39c0d5e875505fa5aabc39fa724df0347 SHA512 39e143a03ea428e84d5b124ed00edebb1d5de2b5a69f7614b171ae4e67d6fc7d2638a943fca78a52d0b548b6d300b30143b532604bcfc00f362100a0ac01795d
 DIST instantclient-tools-linux-19.6.0.0.0dbru.zip 1018444 BLAKE2B a29a10a7a98c8c8939263122dfba8fab3fe1101d48693c78cd75a5cecaecbc9a9f57319a13b09a8f87559c2e00e7205f17b6e01711213bd11c5db4914c853ed3 SHA512 ae7402555f61c2badeffb0cb5f2979142ea2e6b54c26d9b3a803b4babc14d176d3c787902b0323bc84dd5d9b273a4653d30e32d1578ac8e152e7280839e9dea6
 DIST instantclient-tools-linux.x64-18.3.0.0.0dbru.zip 1142609 BLAKE2B 5c915bd940b7bfaa42429710685cfafc5f0189607da2d789f4aaada2bc9d3365ad8e9ee31cc209830fa54b406ffe4b9b2fc2b5e0b6819ff176f7dbb566117a79 SHA512 2c198d9e723b39f7b512217eb08557dfa3c9ae32858acd882df8b9b24beecffe6b44eb089b50341edf01d7e4c0514d4b3de4aa06fa9185aa0538855963c174a4
 DIST instantclient-tools-linux.x64-18.5.0.0.0dbru.zip 1143747 BLAKE2B af5e70e1add6ca2042a213b5038a805ea3d6074703d5a677798684f60f681d6f7b642154d87a02fe973b5b12295ea9ef6f64c45836ceee66ce67d4e4498417b6 SHA512 7bbacdb1fa062c40b2389599ab522b02d63e68731d461fe45446685642b932ee741b8c9e0fde189d8f741db4131f6ac72c8124612e8668a00f90ed7c594fff50
+DIST instantclient-tools-linux.x64-19.11.0.0.0dbru.zip 1085194 BLAKE2B 321e1cd7704f6a5ad33a9ca0eed35feb4d8e4a3ac2b5a5d11f992569f0024ae8ef5b8fb42b02d627ee4a81d2ae9170367ba7107e0f975f89d189c576eef45edd SHA512 d355b0a457ede28b20004b4709ada5bb2c2c8a72a20a19df07bc4fb8607f78ed4d24bbf07a9f2157873b544de7a43406faa27374a0f2d6a47d63f36478e97d3e
 DIST instantclient-tools-linux.x64-19.3.0.0.0dbru.zip 1085243 BLAKE2B abcdf61f01e2bc67610043f1a66015050908f2c09f6aa8b615fd9e8b19a94a161d20b372119bc1bfc1a8ca8511a3859f67c48a39a3c2509fa326a350d7614721 SHA512 33df3a1c19d55ba94e0851bb4eaa83e0bfa72a132de2f5b98bb2a1b0528abee319b20211c7f08719c58250579506cda5c1f4de726f7b1e7c1c484dcb3986e43b
 DIST instantclient-tools-linux.x64-19.5.0.0.0dbru.zip 1085242 BLAKE2B 8d540be2f491d5c5a5e36808332e2a0d28092cb450dff6293851644ea11b8de0f376c87d2cfeea383d0f636e33ed196a89740e3d1ec060b75dc96bd291e18319 SHA512 fde38a0c935be334c96de339f84bbdc15ec956c753395a7a29c2b0d16c301e1fd0accb3d5fdc44082adf36934a7f6a1a2bae7a035d47c949337339bdec615d76
 DIST instantclient-tools-linux.x64-19.6.0.0.0dbru.zip 1083396 BLAKE2B ee38d11929aa76788777b7f5315c56e3ae1df32af210fbbc91c9d45c9b608598b865d9a1c60534c00c54daa8f638cc89fcd22f16212f99d624b9a39e2325c289 SHA512 0ff7dbaa402a417bc389eb15aa1c199fa39bdbc43bce5757213edc2f2b0f9b1fd40f90e2dfd929312e8cf82fb128dc5adc1dc78cd9767cf2028724f9239d3bc8
 EBUILD oracle-instantclient-18.3.0.0-r2.ebuild 12157 BLAKE2B f9e3ae626d0813dbe272d1e04e7f2181791cb0a109bce905e2be64aca2b80620e930c2d3e957e34ad217ee40d49baf51eb188ff99c9816c0c50a8b8b8c9454f6 SHA512 13b8d15365082825df1e09591eeb3d9fc3bcbcfb9e102e5968a77596aaaa8ef1860355c620131f7d437e96c714516075f30cd77d9f512decdb833519d21e49e6
 EBUILD oracle-instantclient-18.5.0.0.ebuild 11884 BLAKE2B b62511809a62094c960829e869e6f425bd50b0ba1336a7193f4fdb385b16ea8a29300b0b5e12f995f15a9dc89997f8ee0ee9c6ab6d3354c42b6113b94399f6ea SHA512 3a05a9744c42df61c78c9eb9169e51a5a2ad91826693da15e01920dbd4ca7653003d9816e5bae3cdf8373a9de385010335f46b9523b65ae4901590c7d645f228
+EBUILD oracle-instantclient-19.11.0.0.0.ebuild 10920 BLAKE2B 0e7721ee91bc0d78c4a45dba5ed009f5e736f0b562cc9bcace50e4ac31d739c298860f4f9e6aedf19948052dc29004cf3f404fdbed78e711be6ac154b5f72c87 SHA512 2cf83004905c65b71239c48178e5a5a5daf0ec5dcf0c591ca5a8166e7e9b26f8fa31709df244bce25e86c92df37d35e3462f4525565531358c0c9d2fbe1c01e5
 EBUILD oracle-instantclient-19.3.0.0-r1.ebuild 12157 BLAKE2B 1f1689f3905297aa6f2904f78734533076fe9474ae4a86982a2bc369b4808ad98852febfdd507c0b2634eb56faa3e72efc46f2e218ae5b041a51ce8bf13b605f SHA512 1b51df3f9591990a4feed60082f383ed1b60f57d23c086211373c532de2914e0592cd9d565d389b8d521acf4a2830a011cc1dba2ab12716ed7b6314941985129
 EBUILD oracle-instantclient-19.5.0.0.ebuild 12157 BLAKE2B 9c752cfdf50be01359d2126d1ef63ec34882316eb26a928bf54827ceef99c027a467a2d8982c92523c5b502fe0991c18addf26b1fa6eed74065df72883df5f66 SHA512 6ae1b128259f9194a297ddb9691e003a853a7a610caca2dbbe29aea84a2952d89aba91ac0fbebddf5abffbecd4b369e19363f92b98c88d840eed7aa8efbf7bee
 EBUILD oracle-instantclient-19.6.0.0-r1.ebuild 10891 BLAKE2B bd41652cd5412f7254d2eebea46815449591b6c7de8b7f1c36a8b257f8dc44504a44c003d936e864094f290131258b0d0f2510f7ee3cc0cc3d232faa8ab9c5ec SHA512 49709ce9e0d856edfe44203e87c28d78110d33549fe435d427040f21a39853f0efce33d93bd826c4c1fe7371c5c786f08de5c10ca49b83cc7c68d472918375bd
diff --git a/dev-db/oracle-instantclient/oracle-instantclient-19.11.0.0.0.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-19.11.0.0.0.ebuild
new file mode 100644
index 000000000000..1e100305629e
--- /dev/null
+++ b/dev-db/oracle-instantclient/oracle-instantclient-19.11.0.0.0.ebuild
@@ -0,0 +1,342 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pax-utils multilib-minimal
+
+DESCRIPTION="Oracle 18c Instant Client with SDK"
+HOMEPAGE="https://www.oracle.com/database/technologies/instant-client.html"
+
+MY_SOVER=19.1 # the library soname found in the zip files
+
+IUSE="jdbc odbc precomp +sdk +sqlplus tools"
+REQUIRED_USE="precomp? ( sdk )"
+
+MY_PVM=$(ver_cut 1-2)
+MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})"
+
+MY_PV=$(ver_cut 1-4)
+MY_PVP=$(ver_cut 5) # p2
+
+MY_URI="https://download.oracle.com/otn_software/linux/instantclient/$(ver_rs 1-5 '' $(ver_cut 1-5))"
+MY_PLAT_x86="Linux x86"
+MY_BITS_x86=32
+MY_A_x86="${MY_URI}/${PN/oracle-/}-basic-linux-${MY_PV}.0dbru.zip"
+MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
+MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
+MY_A_x86_precomp="${MY_A_x86/basic/precomp}"
+MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
+MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
+MY_A_x86_tools="${MY_A_x86/basic/tools}"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_BITS_amd64=64
+MY_A_amd64="${MY_URI}/${PN/oracle-}-basic-linux.x64-${MY_PV}.0dbru.zip"
+MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
+MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
+MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
+MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
+MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
+MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
+
+if [[ ${MY_PVP} == p* ]]
+then
+	MY_PVP=-${MY_PVP#p}
+	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
+	MY_A_x86_odbc="${MY_URI}/${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
+	MY_A_amd64_odbc="${MY_URI}/${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
+fi
+
+SRC_URI="
+	abi_x86_32? (
+		${MY_A_x86}
+		jdbc?    ( ${MY_A_x86_jdbc}    )
+		odbc?    ( ${MY_A_x86_odbc}    )
+		precomp? ( ${MY_A_x86_precomp} )
+		!abi_x86_64? (
+			sdk?     ( ${MY_A_x86_sdk}     )
+			sqlplus? ( ${MY_A_x86_sqlplus} )
+			tools?   ( ${MY_A_x86_tools}   )
+	) )
+	abi_x86_64? (
+		${MY_A_amd64}
+		jdbc?    ( ${MY_A_amd64_jdbc}    )
+		odbc?    ( ${MY_A_amd64_odbc}    )
+		precomp? ( ${MY_A_amd64_precomp} )
+		sdk?     ( ${MY_A_amd64_sdk}     )
+		sqlplus? ( ${MY_A_amd64_sqlplus} )
+		tools?   ( ${MY_A_amd64_tools}   )
+	)
+"
+
+LICENSE="OTN"
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror splitdebug test"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
+	!<dev-db/oracle-instantclient-basic-12
+	!<dev-db/oracle-instantclient-odbc-12
+	!<dev-db/oracle-instantclient-jdbc-12
+	!<dev-db/oracle-instantclient-sqlplus-12
+	odbc? ( dev-db/unixODBC )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="usr/lib*/oracle/client/*/*"
+
+set_my_abivars() {
+	if multilib_is_native_abi; then
+		MY_WORKDIR="${WORKDIR}"
+		MY_S="${S}"
+	else
+		MY_WORKDIR="${WORKDIR}/${ABI}"
+		MY_S="${MY_WORKDIR}/${MY_P}"
+	fi
+
+	local abi=${ABI}
+	[[ ${abi} == 'default' ]] && abi=${ARCH}
+	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
+	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
+	MY_A=MY_A_${abi}                ; MY_A=${!MY_A##*/}               # runtime distfile
+	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc##*/}       # jdbc distfile
+	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc##*/}       # odbc distfile
+	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp##*/} # precomp distfile
+	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk##*/}         # sdk distfile
+	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus##*/} # sqlplus distfile
+	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools##*/}     # tools distfile
+
+	[[ -n ${MY_PLAT} ]]
+}
+
+src_unpack() {
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		mkdir -p "${MY_WORKDIR}" || die
+		cd "${MY_WORKDIR}" || die
+		unpack ${MY_A}
+		use jdbc    && unpack ${MY_A_jdbc}
+		use odbc    && unpack ${MY_A_odbc}
+		use precomp && unpack ${MY_A_precomp}
+		if multilib_is_native_abi; then
+			use sdk     && unpack ${MY_A_sdk}
+			use sqlplus && unpack ${MY_A_sqlplus}
+			use tools   && unpack ${MY_A_tools}
+		fi
+	done
+}
+
+src_prepare() {
+	local PATCHES=()
+	if use precomp; then
+		PATCHES+=( "${FILESDIR}"/18.3.0.0-proc-makefile.patch )
+		# Not supporting COBOL for now
+		rm -f sdk/demo/*procob*
+	fi
+	if use sdk; then
+		PATCHES+=( "${FILESDIR}"/18.3.0.0-makefile.patch )
+		rm sdk/include/ldap.h || die #299562
+	fi
+	default
+}
+
+# silence configure&compile messages from multilib-minimal
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	# all content goes here without version number, bug#578402
+	local oracle_home=/usr/$(get_libdir)/oracle/client
+	local oracle_home_to_root=../../../.. # for dosym
+	local ldpath=
+
+	local ABI
+	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
+	do
+		if ! set_my_abivars; then
+			elog "Skipping unsupported ABI ${ABI}."
+			continue
+		fi
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		# shared libraries
+		into "${oracle_home}"
+		dolib.so lib*$(get_libname)*
+		use precomp && dolib.a cobsqlintf.o
+
+		# ensure to be linkable
+		[[ -e libocci$(get_libname) ]] ||
+		dosym libocci$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libocci$(get_libname)
+		[[ -e libclntsh$(get_libname) ]] ||
+		dosym libclntsh$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
+
+		# java archives
+		insinto "${oracle_home}"/$(get_libdir)
+		doins *.jar
+
+		# runtime library path
+		ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
+
+		# Vanilla filesystem layout does not support multilib
+		# installation, so we need to move the libs into the
+		# ABI specific libdir.  However, ruby-oci8 build system
+		# detects an instantclient along the shared libraries,
+		# and does expect the sdk right there.
+		use sdk && dosym ../sdk "${oracle_home}"/$(get_libdir)/sdk
+
+		eend $?
+	done
+
+	local DOCS=( BASIC_README )
+	local HTML_DOCS=()
+	local paxbins=( adrci genezi uidrvci )
+	local scripts=()
+
+	if use jdbc; then
+		DOCS+=( JDBC_README )
+	fi
+	if use odbc; then
+		DOCS+=( ODBC_README )
+		HTML_DOCS+=( help )
+		scripts+=( odbc_update_ini.sh )
+	fi
+	if use precomp; then
+		DOCS+=( PRECOMP_README )
+		paxbins+=( sdk/proc )
+		# Install pcscfg.cfg into /etc/oracle, as the user probably
+		# wants to add the include path for the compiler headers
+		# here and we do not want this to be overwritten.
+		insinto /etc/oracle
+		doins precomp/admin/pcscfg.cfg
+		sed -i -e "s%^sys_include=.*%sys_include=(${oracle_home}/sdk/include,${EPREFIX}/usr/include)%" \
+			"${ED}"/etc/oracle/pcscfg.cfg || die
+		dosym ../../${oracle_home_to_root}/etc/oracle/pcscfg.cfg "${oracle_home}/precomp/admin/pcscfg.cfg"
+		dosym ../.."${oracle_home}"/bin/proc /usr/bin/proc
+		# Not supporting COBOL for now
+		# paxbins+=( sdk/{procob,rtsora} )
+		# doins precomp/admin/pcbcfg.cfg
+	fi
+	if use sdk; then
+		einfo "Installing SDK ..."
+		DOCS+=( SDK_README )
+		scripts+=( sdk/ott )
+		insinto "${oracle_home}"/$(get_libdir)
+		doins sdk/ottclasses.zip
+		insinto "${oracle_home}"/sdk
+		doins -r sdk/{admin,demo,include}
+		# Some build systems simply expect ORACLE_HOME/include.
+		dosym sdk/include "${oracle_home}"/include
+		# Some build systems do not know the instant client,
+		# expecting headers in rdbms/public, see bug#669316.
+		# Additionally, some (probably older ruby-oci8) do
+		# require rdbms/public to be a real directory.
+		insinto "${oracle_home}"/rdbms/public
+		doins -r sdk/include/*
+		# Others (like the DBD::Oracle perl module) know the Oracle
+		# eXpress Edition's client, parsing an rdbms/demo/demo_xe.mk.
+		dosym ../../sdk/demo/demo.mk "${oracle_home}"/rdbms/demo/demo_xe.mk
+		# And some do expect /usr/include/oracle/<ver>/client/include,
+		# querying 'sqlplus' for the version number, also see bug#652096.
+		dosym ../../../.."${oracle_home}"/sdk/include /usr/include/oracle/${MY_PVM}/client
+		eend $?
+	fi
+	if use sqlplus; then
+		DOCS+=( SQLPLUS_README )
+		paxbins+=( sqlplus )
+		insinto "${oracle_home}"/sqlplus/admin
+		doins glogin.sql
+		dosym ../.."${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
+	fi
+	if use tools; then
+		DOCS+=( TOOLS_README )
+		paxbins+=( exp expdp imp impdp sqlldr wrc )
+	fi
+
+	einfo "Installing binaries for ${MY_PLAT} ..."
+	into "${oracle_home}"
+	dobin ${paxbins[*]} ${scripts[*]}
+	pushd "${ED}${oracle_home}/bin" >/dev/null || die
+	pax-mark -c ${paxbins[*]#*/} || die
+	popd >/dev/null || die
+	eend $?
+
+	einstalldocs
+
+	# create path for tnsnames.ora
+	insinto /etc/oracle
+	doins "${FILESDIR}"/tnsnames.ora.sample
+
+	# Add OCI libs to library path
+	{
+		echo "# ${EPREFIX}/etc/env.d/50${PN}"
+		echo "# Do not edit this file, but 99${PN} instead"
+		echo
+		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
+		echo "LDPATH=${ldpath}"
+		echo "TNS_ADMIN=${EPREFIX}/etc/oracle/"
+	} > "${T}"/50${PN}
+
+	doenvd "${T}"/50${PN}
+
+	# ensure ORACLE_HOME/lib exists
+	[[ -e ${ED}${oracle_home}/lib/. ]] ||
+	dosym $(get_libdir) "${oracle_home#/}"/lib
+}
+
+pkg_preinst() {
+	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
+		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
+	else
+		{
+			echo "# ${EPREFIX}/etc/env.d/99${PN}"
+			echo "# Configure system-wide defaults for your Oracle Instant Client here"
+			echo
+			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
+			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
+			echo "#NLS_LANG="
+		} > "${ED}/etc/env.d/99${PN}"
+	fi
+}
+
+pkg_postinst() {
+	elog "${P} does not provide an sqlnet.ora"
+	elog "configuration file, redirecting oracle diagnostics for database-"
+	elog "and network-issues into ~USER/oradiag_USER/ instead."
+	elog "It should be safe to ignore this message in sqlnet.log there:"
+	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
+	elog "If you want to directly analyse low-level debug info or don't want"
+	elog "to see it at all, so you really need an sqlnet.ora file, please"
+	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
+	elog ""
+	elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default,"
+	elog "put your tnsnames.ora there or configure TNS_ADMIN"
+	elog "to point to your user specific configuration."
+	if use precomp; then
+		elog ""
+		elog "The proc precompiler uses the system library headers, which in"
+		elog "turn include the headers of the used compiler."
+		elog "To make proc work, please add the compiler header path of your"
+		elog "preferred compiler to sys_include in:"
+		elog "  ${EPREFIX}/etc/oracle/pcscfg.cfg"
+		elog "Remember to update this setting when you switch or update the"
+		elog "compiler."
+		elog "For gcc, the headers are usually found in a path matching the"
+		elog "following pattern:"
+		elog "  ${EPREFIX}/usr/lib/gcc/*/*/include"
+		elog "The exact details depend on the architecture and the version of"
+		elog "the compiler to be used."
+	fi
+	ewarn "Please re-source your shell settings for ORACLE_HOME"
+	ewarn "  changes, such as: source ${EPREFIX}/etc/profile"
+}
diff --git a/dev-db/sqlcl-bin/Manifest b/dev-db/sqlcl-bin/Manifest
index 5076d61c0adc..491f27aea187 100644
--- a/dev-db/sqlcl-bin/Manifest
+++ b/dev-db/sqlcl-bin/Manifest
@@ -1,3 +1,3 @@
-DIST sqlcl-21.1.1.113.1704.zip 36960602 BLAKE2B b44d5679a92dbc74d42da3c00f9e37ec4fe5a9bc1e803bb32cdd3f88d2adaeecee05b8264de2a39ea8ee999b301f0ec3d2e56e5243326fb9bc9b8fc837453c7d SHA512 ae42c2ac9e13d6dbe4a3fc7653fae765a24ef7e80c06a1eb2213b2cd0df92774a7dd39f74b8f04bf188e4b8c5bd11001f5db3b9f5a78f1e5c847ad2df0c6256d
-EBUILD sqlcl-bin-21.1.1.113.1704.ebuild 937 BLAKE2B e21df4f4713969555029c69f4af4a494e0c4cd85bc5465aec3f915064b8f7ad562e1d12936cae5cc4c80005611c1d7f5defcf474a745f5a18a87a2d30ca2218b SHA512 0cc3d5ae15deeb45635d23a89ff82fada8450e4327df6565bf10faf522e431a1c09931e9d5ef64deb3173ec63b50d5247236aed6a1c2e7eed53b3fb300764fcb
+DIST sqlcl-21.2.0.174.2245.zip 37572475 BLAKE2B 331319acfdba2e09b31ba5f7e01549a37bb4226487487afcb5afe2bf8f933481c1131d8f4821f668cb5b13ff7f14866097565562ad383e09b23c7b2302670abf SHA512 410614af0acde54bc9fbacb0c2168fe049baccca0d3dbf7e9940176abd90250705aac92a69e09dd9c8854b124dab399bb36bbb381156724528e830ce897f022e
+EBUILD sqlcl-bin-21.2.0.174.2245.ebuild 772 BLAKE2B 1188b21b2856747bfbcf79357f3461447d6146c6fd720599e0004a8194d918c3a5acbf07c97581fd6d1f0d410a67022a35f44ebb6687b79f0ea53fcd34617aaf SHA512 34b76b878fb1e8a9562bee29df3d9aef6ee33fc0dd2f7471b8ad7632001c5625831f943d7a2faecf40dbaa96d4839dd22a849c0941c8b7a37031b557e81bfa62
 MISC metadata.xml 401 BLAKE2B 931e25a3d3febffc304151165b7573a1d3d6d1977ffb842dc25142083106f21e025ab8006757e97382e0287ee1240842e66ebbd44e6543382d08497559a6dd05 SHA512 4d7350199a900f6658f00ab900ba282cca1369248b03099ce0bce113bd33028893e7894605e035446d4c0d62f7231f05734fe19b6ebcf120d9e8ec6245053148
diff --git a/dev-db/sqlcl-bin/sqlcl-bin-21.1.1.113.1704.ebuild b/dev-db/sqlcl-bin/sqlcl-bin-21.1.1.113.1704.ebuild
deleted file mode 100644
index ab45e758fa33..000000000000
--- a/dev-db/sqlcl-bin/sqlcl-bin-21.1.1.113.1704.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-inherit java-pkg-2
-
-DESCRIPTION="Oracle SQLcl is the new SQL*Plus"
-HOMEPAGE="https://www.oracle.com/database/technologies/appdev/sqlcl.html"
-SRC_URI="${MY_P}.zip"
-RESTRICT="bindist fetch mirror"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-RDEPEND="dev-db/oracle-instantclient
-	dev-java/java-config:2
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please go to"
-	einfo
-	einfo "	${HOMEPAGE}"
-	einfo
-	einfo "and download"
-	einfo
-	einfo "	Command Line - SQLcl"
-	einfo "		${SRC_URI}"
-	einfo
-	einfo "which must be placed in DISTDIR directory."
-}
-
-src_install() {
-	java-pkg_dojar sqlcl/lib/*.jar sqlcl/lib/ext/*.jar
-
-	java-pkg_dolauncher "${MY_PN}" \
-		--main oracle.dbtools.raptor.scriptrunner.cmdline.SqlCli \
-		--java_args '-client -Xss30M'
-}
diff --git a/dev-db/sqlcl-bin/sqlcl-bin-21.2.0.174.2245.ebuild b/dev-db/sqlcl-bin/sqlcl-bin-21.2.0.174.2245.ebuild
new file mode 100644
index 000000000000..ec65b7343fd3
--- /dev/null
+++ b/dev-db/sqlcl-bin/sqlcl-bin-21.2.0.174.2245.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+inherit java-pkg-2
+
+DESCRIPTION="Oracle SQLcl is the new SQL*Plus"
+HOMEPAGE="https://www.oracle.com/database/technologies/appdev/sqlcl.html"
+SRC_URI="https://download.oracle.com/otn_software/java/sqldeveloper/${MY_P}.zip"
+RESTRICT="bindist mirror"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="dev-db/oracle-instantclient
+	dev-java/java-config:2
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}"
+
+src_install() {
+	java-pkg_dojar sqlcl/lib/*.jar sqlcl/lib/ext/*.jar
+
+	java-pkg_dolauncher "${MY_PN}" \
+		--main oracle.dbtools.raptor.scriptrunner.cmdline.SqlCli \
+		--java_args '-client -Xss30M'
+}
diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest
index 8adca84b9b9f..1ba98c1d9840 100644
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@@ -1,7 +1,7 @@
 AUX sqldeveloper 325 BLAKE2B e89acd5441362bc693296e2fef189e637944413094169c09be73bb1f514393f0239c7f4c5b186dd0e34bd1bda9730f4bb2e029b166f1db740ac34eff25097c84 SHA512 ab1d70c5b693efe5e6270d7fcd0ba7ef30852ed98fe88a1853c5b415178c51bbb754a4da6964b5e57e87c38015cc90ac2fc04b7aa121b660300434523457bad2
 AUX sqldeveloper-r1 407 BLAKE2B 26bf826e6ccf1cd45b52e7cdf6e694d88570118c0e98cab83f66f078ed79fea36fb3fa6df67dc271a74faad4307996c4968f6d316d9fc71d1a5360804f39782e SHA512 cf089f58c9de3677dbaa7b0c4bdd81e234bffac4c25f5a433c7854068ca33b5a4165d8a5d24188890d5d8c60c209adee5267a255505b978a5a7f73646fd1dfbe
-DIST sqldeveloper-20.4.1.407.0006-no-jre.zip 453418348 BLAKE2B ee9a29a4b11ae1e117b1cac8549804411f22ed62be601a1d0b9727561a4da3088efc9de0b9e8143bf895076ea341efec05e077a4290f3487120d0f09604be747 SHA512 a58bf62232cc5728e7576ce295a7a0020fe93575d23b24cd7daad2005ed1b92bcb4b8845ef88ba9738fa19fb4c21199505296ce2dc910c4d4799788589d7a3c7
+DIST sqldeveloper-21.2.0.187.1842-no-jre.zip 458192293 BLAKE2B 7aed56d9bddb8c75f2bbe7bd7fdb6c7be470903ea462c44bd650caeb818ad90d87c9415d5a2c9fc5a4622e8184ea12622979a99dda04d47171e9565061da463c SHA512 7f292cd55c460da61841d85ea2269a9c051370503aea621394ff97d6ef2a9adf12403cc88626b6fb446a493a6024dacbf4fa0667a4cbf7c831a6932b7e6dfb61
 DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 BLAKE2B 0c3adff04f148102e6460c7550f787329c7e5a69aca0b81c2de4725b9c9ea27c03bb2f588671a95371aa3612839805f2042855b443bb5635c70d0e0b2140295b SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874
-EBUILD sqldeveloper-20.4.1.407.0006.ebuild 2659 BLAKE2B 01f86f0fee080e14eb72c63a5f66c7d6f7af260bfbe9706b943e1aec72d2fa782d58a9f51f342a040a7bbf4e5ce0bcd2b09d9971394b096e872ec968694243b9 SHA512 670929938e63bfcfdd0db21eb17ce6ff8977f336a51ba6c2bca01cf84a7b0b82b1fd93abc86074a6abae9b8f976e49bca87eba44e12f7d126a1a022cbd1e731b
+EBUILD sqldeveloper-21.2.0.187.1842.ebuild 2828 BLAKE2B 74ca7e5d67d481c1dcd9dc24f56b551daa6767669519c8f5a6d9548eee02f978d4096be215f2e58fba0eaedfc296abade57acd2f2039208afb910dd33e2b97a1 SHA512 ddcae0c1f19f7a7d1cdc38a9ff1a5949c2979dc344eb51fa5125bfc78c03b5185a3ee69a1388e69d01513b53e834cf0619dc8f28370d15a35bea296a69323073
 EBUILD sqldeveloper-4.2.0.17.089.1709.ebuild 3218 BLAKE2B 3640beb6c918d9e2110eb409b4d51de29d1d74a2e1b37cce43b1dd14a74c712b6edf6842e005c697f9da13cc1e7327f0576d722c030c19ff99f9a8fa8b54a1a1 SHA512 27700ffcb3b832074bdd962133b4ca4fe8c6e5be26783a9999aa1b8e9809f82cfca4713265e493d31691d292760fba1e1a8388800aec19fdcc224b5be9ef54b0
 MISC metadata.xml 495 BLAKE2B b8622f4768a8dcd21e32030ec63b74281c7dbdc77fbddd6f2017035b7829a80eac3086d88c78bba3a0b4d6ab614f3bbb80019eae69240fe98d21f72d5f08c857 SHA512 d605e837de9cba7955733ee0043340be3efddeb0969166a3483a2f3e68c6a74dc4bed7f5f0fc19fe8af8c8d9dbaf3beb23797125a27a053fdc9a7e0f273d6368
diff --git a/dev-db/sqldeveloper/sqldeveloper-20.4.1.407.0006.ebuild b/dev-db/sqldeveloper/sqldeveloper-20.4.1.407.0006.ebuild
deleted file mode 100644
index 336fb680be3e..000000000000
--- a/dev-db/sqldeveloper/sqldeveloper-20.4.1.407.0006.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop java-pkg-2
-
-DESCRIPTION="Oracle SQL Developer is a graphical tool for database development"
-HOMEPAGE="https://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html"
-SRC_URI="${P}-no-jre.zip"
-
-RESTRICT="fetch"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-IUSE="mssql mysql postgres sybase"
-
-RDEPEND="mssql? ( dev-java/jtds:1.3 )
-	mysql? ( dev-java/jdbc-mysql:0 )
-	postgres? ( dev-java/jdbc-postgresql:0 )
-	sybase? ( dev-java/jtds:1.3 )
-	>=dev-java/openjdk-8:*[javafx]
-	>=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-QA_PREBUILT="
-	opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so
-"
-
-pkg_nofetch() {
-	eerror "Please go to"
-	eerror "	${HOMEPAGE}"
-	eerror "and download"
-	eerror "	Oracle SQL Developer for other platforms"
-	eerror "		${SRC_URI}"
-	eerror "and move it to /var/cache/distfiles"
-}
-
-src_prepare() {
-	default
-	find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} + || die
-	sed -i 's|"`dirname $0`"|/opt/sqldeveloper|' sqldeveloper.sh || die
-
-	rm -r netbeans/platform/modules/lib/i386 || die
-
-	# they both use jtds, enabling one of them also enables the other one
-	if use mssql && ! use sybase; then
-		einfo "You requested MSSQL support, this also enables Sybase support."
-	fi
-	if use sybase && ! use mssql; then
-		einfo "You requested Sybase support, this also enables MSSQL support."
-	fi
-
-	if use mssql || use sybase; then
-		echo "AddJavaLibFile $(java-pkg_getjars jtds-1.3)" >> sqldeveloper/bin/sqldeveloper.conf || die
-	fi
-
-	if use mysql; then
-		echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf || die
-	fi
-
-	if use postgres; then
-		echo "AddJavaLibFile $(java-pkg_getjars jdbc-postgresql)" >> sqldeveloper/bin/sqldeveloper.conf || die
-	fi
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r {configuration,d{ataminer,ropins},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},module{,s},netbeans,orakafka,rdbms,s{leepycat,ql{developer,j},vnkit}}
-
-	newbin "${FILESDIR}"/${PN}-r1 ${PN}
-
-	newicon icon.png ${PN}-32x32.png
-	make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32
-
-	# This is normally called automatically by java-pkg_dojar, which
-	# hasn't been used above. We need to create package.env to help the
-	# launcher select the correct VM.
-	java-pkg_do_write_
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you want to use the TNS connection type you need to set up the"
-	einfo "TNS_ADMIN environment variable to point to the directory your"
-	einfo "tnsnames.ora resides in."
-	echo
-}
diff --git a/dev-db/sqldeveloper/sqldeveloper-21.2.0.187.1842.ebuild b/dev-db/sqldeveloper/sqldeveloper-21.2.0.187.1842.ebuild
new file mode 100644
index 000000000000..47c5cd1e77d3
--- /dev/null
+++ b/dev-db/sqldeveloper/sqldeveloper-21.2.0.187.1842.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-pkg-2
+
+DESCRIPTION="Oracle SQL Developer is a graphical tool for database development"
+HOMEPAGE="https://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html"
+SRC_URI="${P}-no-jre.zip"
+S="${WORKDIR}/${PN}"
+
+RESTRICT="bindist fetch"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE="mssql mysql postgres sybase"
+
+RDEPEND="
+	>=dev-java/openjdk-8:*[javafx]
+	>=virtual/jre-1.8:*
+	mssql? ( dev-java/jtds:1.3 )
+	mysql? ( dev-java/jdbc-mysql:0 )
+	postgres? ( dev-java/jdbc-postgresql:0 )
+	sybase? ( dev-java/jtds:1.3 )
+"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="
+	opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so
+"
+
+pkg_nofetch() {
+	einfo "Please go to"
+	einfo "	${HOMEPAGE}"
+	einfo "and download"
+	einfo "	Oracle SQL Developer for other platforms"
+	einfo "		${SRC_URI}"
+	einfo "and move it to /var/cache/distfiles"
+}
+
+src_prepare() {
+	default
+	find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} + || die
+	sed -i 's|"`dirname $0`"|/opt/sqldeveloper|' sqldeveloper.sh || die
+
+	rm -r netbeans/platform/modules/lib/i386 || die
+	#rm -r modules/javafx/{osx-x64,windows-x64} || die
+	rm -r modules/javafx || die
+
+	# they both use jtds, enabling one of them also enables the other one
+	if use mssql && ! use sybase; then
+		einfo "You requested MSSQL support, this also enables Sybase support."
+	fi
+	if use sybase && ! use mssql; then
+		einfo "You requested Sybase support, this also enables MSSQL support."
+	fi
+
+	if use mssql || use sybase; then
+		echo "AddJavaLibFile $(java-pkg_getjars jtds-1.3)" >> sqldeveloper/bin/sqldeveloper.conf || die
+	fi
+
+	if use mysql; then
+		echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf || die
+	fi
+
+	if use postgres; then
+		echo "AddJavaLibFile $(java-pkg_getjars jdbc-postgresql)" >> sqldeveloper/bin/sqldeveloper.conf || die
+	fi
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r {configuration,d{ataminer,ropins},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},modules,netbeans,orakafka,rdbms,s{leepycat,ql{developer,j},vnkit}}
+
+	fperms +x /opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so
+
+	newbin "${FILESDIR}"/${PN}-r1 ${PN}
+
+	newicon icon.png ${PN}-32x32.png
+	make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32
+
+	# This is normally called automatically by java-pkg_dojar, which
+	# hasn't been used above. We need to create package.env to help the
+	# launcher select the correct VM.
+	java-pkg_do_write_
+}
+
+pkg_postinst() {
+	echo
+	einfo "If you want to use the TNS connection type you need to set up the"
+	einfo "TNS_ADMIN environment variable to point to the directory your"
+	einfo "tnsnames.ora resides in."
+	echo
+}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index cf9c9d287075..50cc8e0daede 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -26,5 +26,5 @@ EBUILD sqlite-3.35.1.ebuild 12993 BLAKE2B 1cf0e69091090563ed26fe2775f15565f00839
 EBUILD sqlite-3.35.2.ebuild 12993 BLAKE2B 1cf0e69091090563ed26fe2775f15565f008395df7faa1b0d13e970f7240aa9b371250f3ce318c97da956a611014b76d74aadd74beef7e3435d533d4ab7437e3 SHA512 62e893f13ea89fd7cf4f557554bee924dbac9dec449275fa7e89f369e2cef03a9599cb89197e2dc1116c469e5403615c39ee3d0c28aff3b85b59223f271c1d0a
 EBUILD sqlite-3.35.3.ebuild 12993 BLAKE2B 1cf0e69091090563ed26fe2775f15565f008395df7faa1b0d13e970f7240aa9b371250f3ce318c97da956a611014b76d74aadd74beef7e3435d533d4ab7437e3 SHA512 62e893f13ea89fd7cf4f557554bee924dbac9dec449275fa7e89f369e2cef03a9599cb89197e2dc1116c469e5403615c39ee3d0c28aff3b85b59223f271c1d0a
 EBUILD sqlite-3.35.4.ebuild 12993 BLAKE2B 1cf0e69091090563ed26fe2775f15565f008395df7faa1b0d13e970f7240aa9b371250f3ce318c97da956a611014b76d74aadd74beef7e3435d533d4ab7437e3 SHA512 62e893f13ea89fd7cf4f557554bee924dbac9dec449275fa7e89f369e2cef03a9599cb89197e2dc1116c469e5403615c39ee3d0c28aff3b85b59223f271c1d0a
-EBUILD sqlite-3.35.5.ebuild 12986 BLAKE2B aa0aaa85f247e64298ae4993e139cbe0ffb33425ce13d6b115aa4e40acb3f13031eb10d24a4f14bb5aac58cdcda00057b8ddb477bb2cb20b055416b37b59a94c SHA512 afb9a9843bb91275123b0ecac71abf0dca87849e36624128718c9ee7deaaed53515ea3fa496a6569a299762eb3a5eb61aec30cd2a0214f2e16e001375a4d6b4f
+EBUILD sqlite-3.35.5.ebuild 12985 BLAKE2B 09e7ce9ba2d0ce36aaea8fd8fb2c3886eaccf0bffe3e756273fd84aead4ae1dda99c76865745f77907bf9bc32f8600becb8fe6af3e593148e2cda050bfc6437c SHA512 71b522aaf44c07f4632877c3626f260659477df560a5ac647e698794967b5554e382abfe5aba5df4f73adbed685a806d34486ee5a1a458c15faa1b34cfee959f
 MISC metadata.xml 743 BLAKE2B 4e2cdd6391c851ad8a705895fc9a5b5f8d77df3ae9cdd96310b1a72d5f4963d19427b8c97f5690f49262e91e9f321f6aafcdd5fee222eede0505810a803265cc SHA512 06315ac56dd1d0e738e3d1161b611c4db053de49e1a35e536b06b9ad7c0f9276b50c390ea6572802b58d49b84c7f1a3c8e63496d04d0f4b0d603bba804fb1757
diff --git a/dev-db/sqlite/sqlite-3.35.5.ebuild b/dev-db/sqlite/sqlite-3.35.5.ebuild
index 64fd3ed89e5c..a9876482cab1 100644
--- a/dev-db/sqlite/sqlite-3.35.5.ebuild
+++ b/dev-db/sqlite/sqlite-3.35.5.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index b7b5fcd406a8..cc24dcdaa107 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,6 +1,6 @@
 DIST sqlitebrowser-3.12.1.tar.gz 3990525 BLAKE2B 9cccd48c83e1953091508f5760b3004c4690791cacc5784286e6ce5220a6e55e761d736d8fbbb135e419beba12def89f63a3d37d6c7e0281f50392f07bf25357 SHA512 f0a62958008693606d9ab04b0413fa10705c7b45fb970c218d8f1adfe8ca01895a6470f369ded6cb7a9338c27385838b8d57c89b5855b4050ce9bec0d69626d1
 DIST sqlitebrowser-3.12.2.tar.gz 3990817 BLAKE2B a0c1495814a814638428fa50e55d5afeb2d3f5c80c9aafbdea3cc444e8c681c48acd1f24126945a89d7284c3f0a23979f2b3541fae7c7a70803f7e7ad69be6f4 SHA512 a6afc0a4286f07adb7038f3a010c93e14204b477bde27b1599c9bfe3390422d3edfaa2a9381b1f13e63a7aaf90e931ee85358eb8b2c15b6ea55818d29c59395f
 EBUILD sqlitebrowser-3.12.1.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
-EBUILD sqlitebrowser-3.12.2.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
+EBUILD sqlitebrowser-3.12.2.ebuild 1301 BLAKE2B bedc37ffe74d907f6a6e0a9e0ea98dfb7af3a533f00de9a62977f15c1409efb99608c627f999c04619379f29187741336b54aee15fa89ae41682350bdcd91360 SHA512 1cf29aa2984418c8c982cb722e06d47e01c0247f4655332167c9f83537b3a698f496ffab9ed2869d7bee1bb731b23fff22181e0f9791b6071e6cfd0d51ad653c
 EBUILD sqlitebrowser-9999.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
 MISC metadata.xml 1506 BLAKE2B e52a311da6408b28b570e975745f05607d88a7b0fd2e6144ef008664ddaed062b67f355a141f61d926448829694907e2474d0d0b39088a7c7c8f8a509934d344 SHA512 a4ed70e46b0e86e266ce4a30f401517ab83dcef51fd048047e2dcd13b9c5cc7d9e985e69de5df73f670eaf969a86f835b65035e7093f9c195464dcb4ea09de7b
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
index d094723adf0a..6f50a5bd986f 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3+ MPL-2.0"
diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index c7f25065dfa2..9fcee11ae601 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,4 +1,4 @@
 AUX fix_rpath.patch 1792 BLAKE2B 38d89cc47984b4d83e2df79b444cba657b814a0d9f80d0c3172c49984a7c22eac40d7c880872be632244fcc2efbf24c52b5613ecbdef624db47df97d6c27c1c1 SHA512 aca59f03c289ed2ffc1df1a387d7f141df56968866187324d14239258c6b270a8a56739bfea7c8398af90f52c5ec7a87eedba4194eb3b097cd0df05cc8553964
 DIST tokyocabinet-1.4.48.tar.gz 1000485 BLAKE2B 4da2659a90dcee1cc99be286fe0e286ee75bd8179b75a944f229a3cc04169b8007220e36400d4934a7b5fde554bbc1783c4813fdf44b4a3530882ea0a8ef258e SHA512 b9995c838e713c13f781ab41062caefeb5c613f696dab08039f992f6860413d60a513114b83468cafdf7fc5b5e51ab880226972465d532f873f2a55f615e1440
-EBUILD tokyocabinet-1.4.48-r1.ebuild 1504 BLAKE2B 7be3bbe407d6283a0a8d2173348462e4d0d661f9461eb8c77f0b2d9cc1f2c4e8d4773cc4aa30201a81d27ffbeca8a097364b9228f387288d69b4f0cc53da6e87 SHA512 fc3d0c986990206a48d151d4be90f7914a09c43c48fb7cf7652edc66ea1c6be10df576dd2f735779f6d69b04b134218e812d8f9ad35f058d92892f78e015b687
+EBUILD tokyocabinet-1.4.48-r1.ebuild 1511 BLAKE2B 6bd4c856539aa600e54246ccc378b72cf9e3bd6ca14b48b21454ee3d261ba626ced6bb0b9b5d8302375568557d790aac81198d0039dd9f0921dcecff81a59022 SHA512 a43ba8be64d4de30619c46cd710c191c47fb5d51cebfcdc366720590c296ff4f55a8c64dc908a1c0567ee2a4543bf6ba55c5b6d6035fe9fa3ae205e87ca1aa96
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
index 0fe6fc6285d1..4efc8e3e6d20 100644
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fallabs.com/tokyocabinet/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 debug doc examples threads zlib"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index cc1931ec9918..9e5733f38d66 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index d08691c3c3a3..fc6c4d8f56e8 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -1,4 +1,6 @@
+AUX GNUInstallDirs.patch 2430 BLAKE2B 8eeebb7bd59273ef5a35e49a98a30bb0fde320231c9482532086fd653f97636c042edf98ad58473ae1ff28c1c10a392e4ded5d0818c27ba00b2b0ec3825d00c8 SHA512 cacae41b22e06836b44f0ceba91961945d4d5cbd60318eeb89b39023dfa00d201c5cd61c5f451c33996698a4757070614486ea859bb943a31a0453b8d598b8d6
 DIST physfs-3.0.2.tar.bz2 194888 BLAKE2B 67b6b04e3822c2528a31a2c60345238cb5f25ad031e32a6c3416b91bad6347af9f02dcfb8dc29a71c2bfc2b7cec7f0749ffbbd0dcadbc35703576ad895f568d9 SHA512 4024b6c3348e0b6fc1036aac330192112dfe17de3e3d14773be9f06e9a062df5a1006869f21162b4e0b584989f463788a35e64186b1913225c073fea62754472
+EBUILD physfs-3.0.2-r1.ebuild 1441 BLAKE2B 161353552955205041e25e28bb5927a27948f98285cba2813970f8be80ebd7d05e6a35a2718a0ea0cbac5af367328b5571ec1a5e979cf05b953a3c7e556233a8 SHA512 df9d3b5001f06515f842f99e74d604eb537c487aed2259bc1163f019d12c65bc43b5e1e717d238b10080e6146e90cb496ab4a21f3fc3ece991e87961c30bd7eb
 EBUILD physfs-3.0.2.ebuild 1389 BLAKE2B 29f19cd6330005b06d0f67bcda1bb8a3cd48dc7a414c232058f84968dc16c3e892b69bfb0ec366b22a078eadf58a252157d066f2a12d5b9500fc9010031777d4 SHA512 643cb5b1ee09c473d93eb4a86753217009d2ac8f90d51f2e16e80a5e27e76caa10447f372df29013d5f4a77bf3cdb5e2474ec00b655b1dd6229255f36ca8ee39
 EBUILD physfs-9999.ebuild 1392 BLAKE2B f3dc7a744b9c13ca021c368b7bc6dab0672d1beec8c6f7103e1e0d06ed94e445772ccf0eed0b87973cc099ee66d5e4e62e02ab7e727331f6154c584c370ddd09 SHA512 94eb68cc10fac176728c8084df9dbce5553b0250b565ea6249bd84e96bc8cd432f08e04c586b9de8e30e1d773bf5c921b34dd5dc1f8f983354471583684537ea
 MISC metadata.xml 2046 BLAKE2B 0bc4d4b847a4749f128b4a01d9a956182cd6b3b8bbb7c523ec62e4d9ab727e583e5265ea49fc835c32c3a43b4561d204b4fd07b93d2f09d5b6c19dc092734554 SHA512 93ef7139120382d372585bf5b9584c13ab9f8d40c4d99ad51fbf413490ca8451c12fae5be99e1740bf589401e49f2bddc9e804072f3b1bba9b3bee2fa91f5b80
diff --git a/dev-games/physfs/files/GNUInstallDirs.patch b/dev-games/physfs/files/GNUInstallDirs.patch
new file mode 100644
index 000000000000..ef7bb5d1f147
--- /dev/null
+++ b/dev-games/physfs/files/GNUInstallDirs.patch
@@ -0,0 +1,74 @@
+From 727d7a5265ad856fd473ad1c621d6c03dd306d6d Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 10 Jul 2021 22:55:53 +0100
+Subject: [PATCH] Use the GNUInstallDirs CMake module to respect installation
+ locations
+
+Apparently use of LIB_SUFFIX is now discouraged. GNUInstallDirs does a
+better job of setting a default.
+
+The libdir of ${prefix}/lib in the pkg-config file caused warnings,
+and possibly even failures, when linking on multilib systems where
+/usr/lib is for 32-bit libraries rather than 64-bit libraries.
+---
+ CMakeLists.txt      | 15 ++++++++-------
+ extras/physfs.pc.in |  6 +++---
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4a67c27..6c26cb1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,6 +14,8 @@ cmake_minimum_required(VERSION 2.8.4)
+ project(PhysicsFS)
+ set(PHYSFS_VERSION 3.0.2)
+ 
++include(GNUInstallDirs)
++
+ # Increment this if/when we break backwards compatibility.
+ set(PHYSFS_SOVERSION 1)
+ 
+@@ -213,11 +215,11 @@ if(PHYSFS_BUILD_TEST)
+     set(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";test_physfs")
+ endif()
+ 
+-install(TARGETS ${PHYSFS_INSTALL_TARGETS}
+-        RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib${LIB_SUFFIX}
+-        ARCHIVE DESTINATION lib${LIB_SUFFIX})
+-install(FILES src/physfs.h DESTINATION include)
++install(TARGETS ${PHYSFS_INSTALL_TARGETS} EXPORT PhysFSExport
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES src/physfs.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ find_package(Doxygen)
+ if(DOXYGEN_FOUND)
+@@ -271,7 +273,7 @@ if(NOT MSVC)
+     )
+     install(
+         FILES "${CMAKE_CURRENT_BINARY_DIR}/extras/physfs.pc"
+-        DESTINATION "lib${LIB_SUFFIX}/pkgconfig"
++        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+     )
+ endif()
+ 
+diff --git a/extras/physfs.pc.in b/extras/physfs.pc.in
+index 6cd0972..f7e0307 100644
+--- a/extras/physfs.pc.in
++++ b/extras/physfs.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++exec_prefix=@CMAKE_INSTALL_PREFIX@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: PhysicsFS
+ Description: PhysicsFS is a library to provide abstract access to various archives.
+-- 
+2.31.1
+
diff --git a/dev-games/physfs/physfs-3.0.2-r1.ebuild b/dev-games/physfs/physfs-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..0d225b66a069
--- /dev/null
+++ b/dev-games/physfs/physfs-3.0.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Abstraction layer for filesystem and archive access"
+HOMEPAGE="https://icculus.org/physfs/"
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="https://hg.icculus.org/icculus/physfs"
+	inherit mercurial
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	SRC_URI="https://icculus.org/physfs/downloads/${P}.tar.bz2"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/GNUInstallDirs.patch
+)
+
+DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DPHYSFS_BUILD_SHARED=ON
+		-DPHYSFS_BUILD_TEST=OFF
+		-DPHYSFS_BUILD_STATIC="$(usex static-libs)"
+		-DPHYSFS_ARCHIVE_7Z="$(usex 7zip)"
+		-DPHYSFS_ARCHIVE_GRP="$(usex grp)"
+		-DPHYSFS_ARCHIVE_HOG="$(usex hog)"
+		-DPHYSFS_ARCHIVE_ISO9660="$(usex iso)"
+		-DPHYSFS_ARCHIVE_MVL="$(usex mvl)"
+		-DPHYSFS_ARCHIVE_SLB="$(usex slb)"
+		-DPHYSFS_ARCHIVE_VDF="$(usex vdf)"
+		-DPHYSFS_ARCHIVE_WAD="$(usex wad)"
+		-DPHYSFS_ARCHIVE_QPAK="$(usex qpak)"
+		-DPHYSFS_ARCHIVE_ZIP="$(usex zip)"
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	if multilib_is_native_abi && use doc; then
+		cmake_src_compile docs
+		HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+}
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 418c59e210c9..4de20e16ace4 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,6 +1,8 @@
 AUX tiled-1.4.3-python-38.patch 479 BLAKE2B ec7a36fbaddb9cd5b954285e25cd02e1c169e9fce4bb51dcdde528c60849086d4a0cf1bd706b909f2fd87be8174faf0f3488317fb05ed4c801dfffdda9af94f2 SHA512 6694d4bd8d79f5575e1b95fc5aa5b832e2193ff9475ea4e624db12f8305eac5b1a20cac4549ae1924e803ee6f5e9ab7835496c02a66c1e7f834671ada8549ebd
 DIST tiled-1.4.3.tar.gz 17806808 BLAKE2B 81b5a32cc1e6f5f3b4af5520752d34572f0e78aad90df435d075b53ac18b39961aa22d23cff614cd83f0883fd2fd2bca69026160cb8b1b727fddaeff5764babe SHA512 1e75e323733e05563bf542364778d95f2f22484ec0d85b4a9e7fac782c117934b37b049724979be5c83de86a3900c7ca2e9f3c5a660c530d2ecd0f023eb22c2e
 DIST tiled-1.5.0.tar.gz 16694406 BLAKE2B ccab3ec9f5ac807126ddf5d26e4eaa06357e67ffbd63550bdad93e814ff02350f9138f62114a56b5e64bc6c7fd3f6664ab7da836cab7e478ea7075111fa1cae7 SHA512 eb25affdab481db29ab2bbaeb4abafd453b2b43ae47e4b8f9f2fd1ed0d8ed55fdb45ec1bdc0b484ba9a2d63afad5a0c9ba6376304ed4b1eab3918c36a0af29c9
+DIST tiled-1.7.1.tar.gz 16741752 BLAKE2B 2f9d2d43aa3aa52a2999a6e9e56bfe3846e095ac41236921e9ab42df40b93d0c3373d2f5f13a5f7c9a945ea0c03c4fe6b123ea6a8b3bc71ddc9863c714fccc17 SHA512 ed6ba20015434d9de6ae02aecb165a7fb7569a3d74471a7baec5d0f1b78b7905dd12cd565e1f9d1e41ff47e225cdfb81915ae09e3672efc21f16cefb39e03998
 EBUILD tiled-1.4.3-r1.ebuild 1449 BLAKE2B 017f74d6e359199357991d1c6077a9665dd3bdfcabce2a5a4c68a240aee3010059cd367ae64cfaa6c56f698182292a3725a1b6bb2a363af2e3ddf38b42dbe6ca SHA512 4c23db0081e14bae7e0b0bb6be5c949e46a4ecba6ea7a7f53f4920867ca9538b4201e31f342eae76e85182ca4da0fda2d88ef9a43ca9ef2cc92b39c3ef24b4f7
 EBUILD tiled-1.5.0.ebuild 1403 BLAKE2B f4f514d3f4f1f0a449d3074d214bfafb1e034a4a9343b2a834ddcdb7a8bc126a66d26947a367a9850eae36377f23d3528e3b1bbe7b4542e35e6c0bff89c7f858 SHA512 3763cd55f12be9f94e1342630d1c4dffdac36b5c8f3eef4db7f82782479c3f6edbdbbd97c7d16a3fe7fda312e64fc2ee2f95360e589189664033b4404dfbdcd6
+EBUILD tiled-1.7.1.ebuild 1429 BLAKE2B 0f1522f7dad4a0e8b17934da3588928083bd5775541b2da7343181c5021b0583df0d114371f8285b9a6a503993728b9b150e8c27ecbd889c215bac035e76a5aa SHA512 e8e2e1877ae5128be87aeb89f61b92b86e0ed0d98bf1658ad15d323598a90fed3053dbf4616ea690a36ece0689b34fdb197eca46eebd554ceb2597c26281e711
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/tiled-1.7.1.ebuild b/dev-games/tiled/tiled-1.7.1.ebuild
new file mode 100644
index 000000000000..e5119614dc18
--- /dev/null
+++ b/dev-games/tiled/tiled-1.7.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit python-single-r1 qmake-utils xdg-utils
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-arch/zstd:=
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtdbus-5.15:5
+	>=dev-qt/qtdeclarative-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtnetwork-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	eqmake5 \
+		LIBDIR="/usr/$(get_libdir)" \
+		PREFIX="/usr" \
+		SYSTEM_ZSTD="yes" \
+		DISABLE_PYTHON_PLUGIN="$(usex !python)" \
+		USE_FHS_PLUGIN_PATH="true"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index c15763cfc343..a6e857feeb8d 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 6179cad878f9..195055095f16 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -27,5 +27,5 @@ DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 B
 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-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
-EBUILD go-tools-0.1.4.ebuild 5458 BLAKE2B 1c1754156b8013d04dc5e6e6a0699987ff83ceebf6e39d583f2bbe37576abcd21beaf6a81b01885bb2539e83e87874773b88bf1f92a4429d8978bf4beee11e5a SHA512 560d237e2a2af8cce6f45a6e8c1a514654a25faca6fd04c51454359107ce59dd65a552bfc419e578dfdf1fc66a0f68d1f5b04cee731c50a65ee30316a03c1e5a
+EBUILD go-tools-0.1.4.ebuild 5504 BLAKE2B 23c260b6168d29d53d1e757a829bc68840ac8d79c768dc3a8446cef2675024177ab7740c22e6bb3e6028906d4120f6a1c023d9a0426834b82d7186428f4b13f4 SHA512 b1d23996599b2df2b54cd65a61b7abd2ca4bec6f3bbb476df7aade6ed5ddf7bd6e85ae5c416277566993a09e15955e6dbea025b1edd389a57d0360b130371fb3
 MISC metadata.xml 303 BLAKE2B ca3493d6189da59891e1f4627c08bdeb6eddce60e7c9dc4a6b90118b76cccdc67d0be1b3ecc62acf37da168654b21f1a0dd0e8968901631850599f02caf3bcbc SHA512 cdcd8e3342ce58c499a670fa5ad75301d6f90dc6275b745d796dc8c0470005bfb37ccb6193c935f0d12cc6d4b9b9959b4fee7bdc7e660bef944d925c22393ccf
diff --git a/dev-go/go-tools/go-tools-0.1.4.ebuild b/dev-go/go-tools/go-tools-0.1.4.ebuild
index 2807b22e10a6..36df26227c47 100644
--- a/dev-go/go-tools/go-tools-0.1.4.ebuild
+++ b/dev-go/go-tools/go-tools-0.1.4.ebuild
@@ -180,8 +180,10 @@ src_test() {
 
 src_install() {
 	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
-	exeinto "$(go env GOROOT)/bin"
+	local goroot=$(go env GOROOT)
+	goroot=${goroot#${EPREFIX}}
+	exeinto "${goroot}/bin"
 	doexe bin/*
 	dodir /usr/bin
-	ln "${ED}/$(go env GOROOT)/bin/godoc" "${ED}/usr/bin/godoc" || die
+	ln "${ED}/${goroot}/bin/godoc" "${ED}/usr/bin/godoc" || die
 }
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 8d50b6e6f8c2..470e30cbbd00 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 174d58981dde..45472d5a010f 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -2,5 +2,5 @@ AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
 DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
 EBUILD commons-httpclient-3.1-r2.ebuild 1680 BLAKE2B 39796278c783e63835011467992fc9d8891bd2c691924078b909d409cd5567a8ebe505a834bfe65617936b4196cc99bcd12770e6a0462c237b5a5ff0f33cef11 SHA512 c1c327018aa78ccadd57a06845771ce12eef99106092823763eb7285d9bee587aa654b3fafcfabc7e725d36a5db7cda5e276bc6c6c7c291bf19bfbb553116244
-EBUILD commons-httpclient-4.5.13.ebuild 2178 BLAKE2B d67eabd14e654db2e07113230008c9730024a4e7aff9b03259f3c9a973a7c2a1422dc47d9add60ec9f901da12df40b34f31a45b8085f4c1adbe6251bc4d37e0b SHA512 b19206d4ab9498d79a5737aa9057fbdb03acba110dbbdfc33f4ae820f10c54b2ecf8c27d8ecd4e69300ff6dc2ff12116f11dc89a6cba454ce94550a591a05fe9
+EBUILD commons-httpclient-4.5.13-r1.ebuild 2224 BLAKE2B df78302c2e2a43e993ef8415ec9ba3a32871a50ead217eaf14c2b73707f7f561322f5f866ccadf94444b52ec4ca29eb60084d9a0c6f9148661909e06a1ee30dd SHA512 adfb02f15e6e5bd9aa9fc180e0e1ac8b60d5ce64a4dd5a3de865eb5b5781f246cf055bf876495a44489c3b370466c151cc0fa22dbc30c4c295d80f3fb6b5d2ce
 MISC metadata.xml 456 BLAKE2B b4e2261943e4bd92d413eae20f60f23b79e7deb961d9c7e08f855f28cf69f0b45c5113a308138122a9cc4b42da1498e67c8be2093ce0252f60d5ef56ea55e72a SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
new file mode 100644
index 000000000000..a9080209c2fd
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz --slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-httpclient-4.5.13.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache HttpComponents Client"
+HOMEPAGE="https://hc.apache.org/httpcomponents-client"
+SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 x86"
+
+# Common dependencies
+# POM: httpcomponents-client-${PV}/httpclient/pom.xml
+# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
+
+CDEPEND="
+	dev-java/commons-codec:0
+	dev-java/commons-logging:0
+	dev-java/httpcore:0
+"
+
+# Compile dependencies
+# POM: httpcomponents-client-${PV}/httpclient/pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/mockito:0
+	)"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
+
+S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
+
+JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/java-deprecated"
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# Tests run: 929,  Failures: 1
+	# javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake
+	"org.apache.http.conn.ssl.TestSSLSocketFactory"
+)
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild
deleted file mode 100644
index 736ff629cee5..000000000000
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz --slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-httpclient-4.5.13.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache HttpComponents Client"
-HOMEPAGE="https://hc.apache.org/httpcomponents-client"
-SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-# Common dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
-
-CDEPEND="
-	dev-java/commons-codec:0
-	dev-java/commons-logging:0
-	dev-java/httpcore:0
-"
-
-# Compile dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/mockito:0
-	)"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
-
-S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
-
-JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/java-deprecated"
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# Tests run: 929,  Failures: 1
-	# javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake
-	"org.apache.http.conn.ssl.TestSSLSocketFactory"
-)
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index f73aba114cbc..3848ac07e9d7 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,5 +1,9 @@
+AUX dom4j-2.1.3-xpp3-add-removeAttribute.patch 1847 BLAKE2B 08e1bc056f0982c4fb30782321724137870afd81d1d9158cd6a2179fb50b8c77cec3e5c2e7e2d97072cd60122e7b5ad3b8a8107f7d85e99fda7ab06dd0f276bd SHA512 7c0da264384436bd3565d098059faac6ea0ac3a75d1bd21a22fa51dc9e77027c4acf0efccc0e1cfc7a4bed191e65d25eb4fc4b6fdb10f315202b1c93f0c15be4
 DIST dom4j-1.6.1-java5.patch.bz2 2900 BLAKE2B cdd7dc901f5292af3ef7f0ea200c3d22bbc8c0adc27606da3c8fbadc44625b114c995321723dca331f0b23d5248e1f9177f0def2f4138eebcbd4aaac0495d4dd SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96
 DIST dom4j-1.6.1.tar.gz 9687211 BLAKE2B 3daa3729ea071aa87c7c1e1e2b91f1635109774dd2bd564a85265a0286f1369373084b945409d9d5213d66a7e14224033d42c58d80125b7982eef8961eb29248 SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94
+DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219b4fe019da8f62a441dc3cea86ecf0554e32f8e717e21234b8ef8e2905946ab3722462f1fa748ad7e68e9e20 SHA512 8c4d7b4f2dd1b3f806e0d5103101998a094c31e9a4912539dcee32f24b35452c7f0d72c5f4cf55f8a8c9a416fee7284f9bca43ae56b0e66104b2b54fdb49ad96
+DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
 EBUILD dom4j-1.6.1-r8.ebuild 1907 BLAKE2B c2802e3270130c27a14cbcd02dfb9228f73e29f39f9866521af5f870396e43a0745836c2279f16b8f4452bed47f2529ac9cb488aa7fe982602affd9ef5fc2f00 SHA512 843e5b3a520ab7ed50fe1ec926b34d5ef114c2dd5d3d7813f12fbd00c018ba791f98294aa300b8042bd6659c31e2e25ee407710c0f9e8a36f79eba7a4e3c603f
 EBUILD dom4j-1.6.1-r9.ebuild 1900 BLAKE2B 314238d8a36167053c0b148c429206b042b5fa14929edd7c92741131596fc24f39e668d165abcb26ea3b5b14363777f725a30893e2395ee57564a875b6cc2306 SHA512 30dab95cdb84bae7a4873be00f1d37f8f412a31f19748a02370071a94407c7d0de1dcdcaaee67aad7d1e024db24218b88d206d373e781b5d2e18154dab051cb1
-MISC metadata.xml 638 BLAKE2B f46f8d2dd95d34b00a632c896e6baa1fa889722364d19b4eb9545f3b4158fd25c7d33351c420a5c4cd06b70944dff110df695f82b00e3c99bab601df21f19ef7 SHA512 77351358dfa7f4d7ae987e49acc828344448578423ad613e2fac18543949ca050e2746c469e0bb7e5b764a8512e3a97b675ab0e1cfbfe2493f013911fcf45f38
+EBUILD dom4j-2.1.3.ebuild 2235 BLAKE2B 0c26954207b20bca551adf3bc8a464e911adfe4aa1d0f4df1b2d2dd4b590d482396120d13d8d216b47a8b28734a2798200436329aa9730f3f3034dc4f5f36deb SHA512 949fb855f87ef0ba7707a5f5dd778ae654f5671a8c8521678d1296a3883fb34c27ccdfde30cb4282c9058786c53b137151545f571c14f96f7009522d67ac1b59
+MISC metadata.xml 714 BLAKE2B 9669602bf999a3bcf3f303afb06edfe82c3dbd1b52bc79b1a4cafbc944b0c75067715ecbcee9568734af95bbbdda480a972a5d7e26b454460abd16c9feeaa3b9 SHA512 4a1cf930f62685579e6361db5999f377bc8b17acb2b98d3d87fa4501f4de107f6f21822cd0b3d1c2808c3a17f157baf9346af56ebd3e8aa45ff8f4452d0244e4
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild b/dev-java/dom4j/dom4j-2.1.3.ebuild
new file mode 100644
index 000000000000..46f4b4956895
--- /dev/null
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom dom4j-2.1.3.pom --download-uri https://github.com/dom4j/dom4j/archive/refs/tags/version-2.1.3.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild dom4j-2.1.3.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.dom4j:dom4j:2.1.3"
+JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="flexible XML framework for Java"
+HOMEPAGE="https://dom4j.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -> ${P}.tar.gz
+	https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar"
+
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="jaxen"
+
+CDEPEND="
+	dev-java/jaxb-api:2
+	dev-java/xpp2:0
+	dev-java/xpp3:0
+	dev-java/xsdlib:0
+	jaxen? ( dev-java/jaxen:1.2[dom4j] )
+"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/xerces:2 )
+"
+
+# Runtime dependencies
+# POM: ${P}.pom
+# javax.xml.bind:jaxb-api:2.2.12 -> !!!groupId-not-found!!!
+# javax.xml.stream:stax-api:1.0-2 -> java-virtuals/stax-api:0
+# jaxen:jaxen:1.1.6 -> >=dev-java/jaxen-1.2.0:1.2
+# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-20090415:0
+# pull-parser:pull-parser:2 -> >=dev-java/xpp2-2.1.10:0
+# xpp3:xpp3:1.1.4c -> >=dev-java/xpp3-1.1.4c:0
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*
+"
+
+PATCHES=(
+	# XmlStartTag.java:31: error: ProxyXmlStartTag is not abstract and does not override abstract method removeAttributeByRawName
+	# patch from https://github.com/dom4j/dom4j/pull/22
+	"${FILESDIR}"/dom4j-2.1.3-xpp3-add-removeAttribute.patch
+)
+
+S="${WORKDIR}/${PN}-version-${PV}"
+
+# dom4j has a cyclic dependency on jaxen[dom4j].
+# The downloaded jaxen-1.2.0.jar is provided for compilation only.
+# No prebuilt software is actually installed onto the system.
+JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/jaxen-1.2.0.jar"
+JAVA_GENTOO_CLASSPATH="jaxb-api-2,xpp2,xpp3,xsdlib"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="testng,xerces-2"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="xml"
+
+src_prepare() {
+	default
+
+	if use jaxen; then
+		JAVA_GENTOO_CLASSPATH+=" jaxen-1.2"
+	fi
+}
diff --git a/dev-java/dom4j/files/dom4j-2.1.3-xpp3-add-removeAttribute.patch b/dev-java/dom4j/files/dom4j-2.1.3-xpp3-add-removeAttribute.patch
new file mode 100644
index 000000000000..a58a06dfcd61
--- /dev/null
+++ b/dev-java/dom4j/files/dom4j-2.1.3-xpp3-add-removeAttribute.patch
@@ -0,0 +1,47 @@
+diff --git a/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java b/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java
+index 08b88fc..aa27c10 100644
+--- a/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java
++++ b/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java
+@@ -211,7 +211,7 @@ public class ProxyXmlStartTag implements XmlStartTag {
+      * @throws XmlPullParserException
+      *             DOCUMENT ME!
+      */
+-    public void removeAtttributes() throws XmlPullParserException {
++    public void removeAttributes() throws XmlPullParserException {
+         if (element != null) {
+             element.setAttributes(new ArrayList());
+ 
+@@ -221,6 +221,33 @@ public class ProxyXmlStartTag implements XmlStartTag {
+         }
+     }
+ 
++    public boolean removeAttributeByName(String namespaceURI, String localName) throws XmlPullParserException {
++        if (element != null) {
++            for (Iterator<Attribute> iter = element.attributeIterator(); iter.hasNext();) {
++                Attribute attribute = iter.next();
++
++                if (namespaceURI.equals(attribute.getNamespaceURI())
++                        && localName.equals(attribute.getName())) {
++                    return element.remove(attribute);
++                }
++            }
++        }
++        return false;
++    }
++
++    public boolean removeAttributeByRawName(String rawName) throws XmlPullParserException {
++        if (element != null) {
++            for (Iterator<Attribute> iter = element.attributeIterator(); iter.hasNext();) {
++                Attribute attribute = iter.next();
++
++                if (rawName.equals(attribute.getQualifiedName())) {
++                    return element.remove(attribute);
++                }
++            }
++        }
++        return false;
++    }
++
+     public String getLocalName() {
+         return element.getName();
+     }
diff --git a/dev-java/dom4j/metadata.xml b/dev-java/dom4j/metadata.xml
index 2d873897cf3c..cdff47537f0c 100644
--- a/dev-java/dom4j/metadata.xml
+++ b/dev-java/dom4j/metadata.xml
@@ -5,6 +5,9 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<use>
+		<flag name="jaxen">Includes org.jaxen.dom4j package</flag>
+	</use>
 	<longdescription>
 		Easy to use, open source library for working with XML, XPath and
 		XSLT on the Java platform using the Java Collections Framework
diff --git a/dev-java/gwt/Manifest b/dev-java/gwt/Manifest
index bd92d7ebc1c1..d1896c6b941f 100644
--- a/dev-java/gwt/Manifest
+++ b/dev-java/gwt/Manifest
@@ -1,10 +1,6 @@
-AUX gwt-2.8.2-build-system.patch 758 BLAKE2B b1aca717473f2ebee42bfc2902c8eb0012698c8f7a059f5c9d29944b154c1a85ae296d8639271aaa6f749e5fa84de8e4e8ad5da45c90495e1f5ab429eff13740 SHA512 c469c23ded60e5f844abda0001f4ca99fd6756f9bd433f3e8a433c9441db3dd62d0523ab90b3f2eb1bf2b26675ef0f01a3ddf7dd371df844037a9f249c5b59a5
 AUX gwt-2.9.0-jsinterop-classpath.patch 1045 BLAKE2B 8efec183d5d7f2d2196d176d13e53c4356af3551838c3f32f586c673e03c8d3aa029d53ef490c2961482ed6ab1a4c53838f4060e1438cbd540823cfd11380f6b SHA512 85a0aad95157f0ab8adcefc43b6fa9d98d3970719ff7cc488e700ad23c0b3944c72ea837c689f4f50829d04c54b4693123a610a6f3600f522eb3026a1add4056
 AUX gwt-2.9.0-remove-git-usage.patch 1284 BLAKE2B cf06867ab6917e04a90a6f98f6868467dab8a54eda93847cf77a2e45917a59329c5be0857e3ad38eab942c90f696f9d6e8fd8509174b16c1cc72d242a01fcc3c SHA512 b32c808cf6514893aad5fdd07aa2724a9a3f0c9dede9aa1092ffe2470db02f481f6d2cba8b1521f221dfff0f2353dbe41aa1169eba28512f7c8feaf1dffba879
-DIST gwt-2.8.2.zip 22017212 BLAKE2B b112df08885e607c975f9585d6b83e2a12894e974850ada052918e4b946b11bfc8d9cf9d71f4e684121d9d16714885be549eed44d77a119e695c2b50cd6bc6c3 SHA512 ac16311c3b00b36d421eef914e73ad8dea01f022c87fc7ed722fdfee8eed391f1987cc1c34522978afc542cdb90eee791efcdcc725d9a395ab468e458b708074
 DIST gwt-2.9.0.tar.gz 13081965 BLAKE2B 8b18e4cad6df9b1a2336bdf537a26def021ccd950299a6064e9a7328d0161c093f56284cce7b8a0e0a0c72b0dc9604e5e5527332d1878afd19a3c95eed5129a7 SHA512 424484a42f28387734a89a3a12b48716031e194e3a712a5e7cbdb66f77ab68e72ff8751f70a4048f4b9f35d92948c285490fd8e23c34d5c5e5558fee33952bf5
 DIST gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz 575902138 BLAKE2B 518ed1752cc82a527521525e181db712a641d36db203f511bdcc5206de314aa1eb693415b690fc42f38c9beabaffc484ad6ec3444e3cd8b4f2a3fa2ab9505f11 SHA512 0365d664b4b14ec833c922c8fab5df269e69ac8f1526315810f4922132439b880ee15e7e8b80e8b505469a374ba4a47998c7ed07b5f53227d50100247fade82b
-DIST gwt-tools-f42d2729a3a8e6ba9b9aec069957bce5dc0f6f6d.zip 577453206 BLAKE2B 83a3824d6418727876b4708ed44ab1f58513a5b39d4e48f9bf21290ca358f76ec2ccd98ce2aee76afe7f621fb1f703bf459b8c3d6a3d4f32d4be807bc723513e SHA512 f4f033c972d955da40258020a9fb84ae90f30b7afeb1ae8044cf00f4f5f45200129bf84e2f69660a4eb80bb60f3a5a1d3c5af69fe9e07e0b985de0e708ca933f
-EBUILD gwt-2.8.2.ebuild 1855 BLAKE2B 3aaa9cc77f59b1de68576ffb181b79cea5df324bca29149430dfca81c114fe07401136e5afb8ee78dddaa7242c0ca00da4263483b7aabd756ff6c87daffb61b5 SHA512 806919aefcd54194e9c1b53066f2c7bd7585151c54b0a7706211dec59bf31e4ec4992a8a26df6217a9265019705c1ef777d1728314344e2dfa08bd42050491ee
 EBUILD gwt-2.9.0.ebuild 2239 BLAKE2B 4c3a7ee2474cdacbafebdf1107750f37e9e73573d032746fad912f2a40ab77773572b648592d567c8cf7105281a40af774f4bacd349f25f069306281d51ee877 SHA512 0c28f0495b51d5789524529f91f2eed43d92ef059990fa7d747b58b46f1157f8dd2fec912d6c773959a7fa3b8a03040923de5edd47471b1e8e73776c2754eca9
 MISC metadata.xml 766 BLAKE2B e023f4897d31fa31c961563600b21d9a03a26b1ac70b75859c66e558177e7b42b747cfb40d22760eb132b44ac5ec2ee8906a48ea09b591e8a5cc1dd7a91cc55e SHA512 c4fdbf613e76d4be2c71a15fc9f99f0cd744aa4508725dc36a11421eee6029a22af833c360b525002a5be76b74494b14ec093945e1c5f25a9c2fb71867cf3f32
diff --git a/dev-java/gwt/files/gwt-2.8.2-build-system.patch b/dev-java/gwt/files/gwt-2.8.2-build-system.patch
deleted file mode 100644
index 82340416e7a7..000000000000
--- a/dev-java/gwt/files/gwt-2.8.2-build-system.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gwt-2.8.2-orig/common.ant.xml	2017-10-18 22:39:31.000000000 +1100
-+++ gwt-2.8.2/common.ant.xml	2020-01-13 13:23:58.653719957 +1100
-@@ -277,9 +277,7 @@
- 
-   <macrodef name="gwt.getgitinfo" description="Identifies the GIT info of a workspace">
-     <sequential>
--      <exec executable="git" searchpath="true" outputproperty="gwt.gitrev">
--        <arg line="rev-parse --short HEAD"/>
--      </exec>
-+      <property name="gwt.gitrev" value="faff18e7a1f065e3a4ac4ef32ab5cce394557070"/>
-       <!-- Generally, filtering requires a sentinel file so that changes to git rev will
-          be noticed as invalidating the previously-generated filter output.  This property
-          names where such a sentinel lives; it is tested with <available/> and created
diff --git a/dev-java/gwt/gwt-2.8.2.ebuild b/dev-java/gwt/gwt-2.8.2.ebuild
deleted file mode 100644
index 0a0f40fa707a..000000000000
--- a/dev-java/gwt/gwt-2.8.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 java-utils-2
-
-GWT_TOOLS_COMMIT="f42d2729a3a8e6ba9b9aec069957bce5dc0f6f6d"
-GWT_TOOLS_PN="tools"
-
-GWT_COMMIT="faff18e7a1f065e3a4ac4ef32ab5cce394557070"
-
-DESCRIPTION="Google Web Toolkit library"
-HOMEPAGE="http://www.gwtproject.org/"
-SRC_URI="https://github.com/gwtproject/${PN}/archive/${PV}.zip -> ${P}.zip
-		https://github.com/gwtproject/${GWT_TOOLS_PN}/archive/${GWT_TOOLS_COMMIT}.zip -> ${PN}-${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}.zip"
-RESTRICT="mirror"
-SLOT="2.8"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND="
-		dev-java/json:0
-		dev-java/guava:20
-		dev-java/rhino:1.6
-		>=dev-java/asm-5.0.3:4
-		dev-java/eclipse-ecj:4.5
-		dev-java/validation-api:1.0
-"
-
-RDEPEND="
-		${CDEPEND}
-		>=virtual/jre-1.8:*"
-DEPEND="
-		${CDEPEND}
-		>=virtual/jdk-1.8:*"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_XML="build.xml"
-EANT_BUILD_TARGET="build"
-EANT_EXTRA_ARGS="-Dgwt.gitrev=${GWT_COMMIT}"
-EANT_GENTOO_CLASSPATH="
-		json
-		asm-4
-		guava-20
-		rhino-1.6
-		eclipse-ecj-4.5
-		validation-api-1.0
-"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-build-system.patch
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}" \
-		GWT_VERSION="${PV}" \
-		java-pkg-2_src_compile
-}
-
-src_test() {
-	GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}" \
-		GWT_VERSION="${PV}" \
-		TZ=America/Los_Angeles ANT_OPTS=-Dfile.encoding=UTF-8 \
-		ant ${EANT_EXTRA_ARGS} test || die
-}
-
-src_install() {
-	java-pkg_dojar \
-		build/lib/*.jar
-	java-pkg_dolauncher i18nCreator --main com.google.gwt.i18n.tools.I18NCreator --jar gwt-dev.jar
-	java-pkg_dolauncher webAppCreator --main com.google.gwt.user.tools.WebAppCreator --jar gwt-dev.jar
-}
diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest
index a5d04bdbc38e..70c4c022014c 100644
--- a/dev-java/httpcore/Manifest
+++ b/dev-java/httpcore/Manifest
@@ -1,3 +1,3 @@
 DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713
-EBUILD httpcore-4.4.14.ebuild 1592 BLAKE2B 692c414be0d6b732716b480552937a1bf7bad992d9c10825a63f0c881b706dbebe880515b0f7e23dbe22ff84b0db5f05884a30a2b55f3a8d2986c86677a2a7eb SHA512 cf8aa04377e6c60954f36e58126cfca7501a921a3e967cf183aa5723481737dc2ab7d9713df0632c0f98134883daf73d59f3e02ac10164c472645ff47d40b456
+EBUILD httpcore-4.4.14.ebuild 1591 BLAKE2B 86b63de69b8803971a875fd7b1aaf34d7ac65cf2e9f4b7683f99d2d585c0896ea89304c28583dc3301d446d80872af535f69867fb57fb1e8b127a356a7b985c8 SHA512 a2f1b1a16d53d7b0ce562a752a567d951bbc02b1297d9e9cd44ed258891e7c2bee0c61699d2438c4d7d2a43536b1fb932ae2db33f31a2e239301ef70a5960a25
 MISC metadata.xml 216 BLAKE2B da3631f8f6582ec2aad6497bbadf58b72bd143f39387aa3a5ee5842db7dc470f1693503286c6c1cde6e4f1ac72c271afabd139d1cb6f25de7d06a5469dd66c03 SHA512 241c7b10d088e8d6b9ace6781434e64c4a5d2eb80e5dfceea04e09a9637475e927ebd804588e5624622b24ef60a29331ad07f995360b0c1c2d5ffa25033a9f4d
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
index 5584b7dab67a..f5b9fdf5466a 100644
--- a/dev-java/httpcore/httpcore-4.4.14.ebuild
+++ b/dev-java/httpcore/httpcore-4.4.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 # Compile dependencies
 # POM: httpcore/pom.xml
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index de77a75c7e81..46bb20fc6299 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,6 +1,6 @@
 DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 BLAKE2B c16dc0e04127bf57df6390dc9d99a1e44040c0fe81ccacc88698493d3fd3483aae12d664a89bc13939655d21ce2d92b64537b073c0d1063bbf91e18129da5eb4 SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56
 DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 BLAKE2B eec4976124a9701367e7b61c652ed619df69fa12eb02c5288d9d1ba4845ca7e2315514fba1f75f15c8bbb90cba981972961e8d1e843a8a8ac2b000e5e4917975 SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860
 EBUILD sun-jai-bin-1.1.3-r1.ebuild 1099 BLAKE2B 0257abd4b7fd290f56200786782459183a09c1c55e7cfe8702b85447f8f05b8e80e21a688e26bdb000b5ae28cae43bd9f9ea3b234df2cc5e3723781c6f0c3e34 SHA512 621448fc993b3376701632312d1efc7d8e675b7f3eeaf1ed2391a58b3e0e10e212a8dae9b69f2d52473703ff695e1c0edd5fc416ba9fcf8dd4e98dd2c74e0150
-EBUILD sun-jai-bin-1.1.3-r2.ebuild 1097 BLAKE2B 6bd63c72f815f2e3c96ee7e74757e3e2bf23135c61d0fc09855069490935cb4ad752aee342e0dbe5168a5ed5da92e8479f2e0284aebf3e689f758906f6a5ba7e SHA512 f36c961a1c2de6786818febf77572ca6b57bbbd2a4c97044c27a77bc394b314ede408e9753762c6001616bbc6bea4bdc7247c301b844fec0484a1286385fd143
+EBUILD sun-jai-bin-1.1.3-r2.ebuild 1096 BLAKE2B c0087efbee4ff6b2055f4661401fb582016bb660bfaf13be938be60cafbb74e442384bf01f31291f844f57fc6a8de324d307ab9e1a46cc82aee19a2318d2ab62 SHA512 a06f8f9eb99a1682f0b96229300e77d9ccd8b40cd1576189da6c55757f09f1b6a6e280ba4666ad4b1c6e9c54dfe388ef526367d848de8676dcb32325c6a156b7
 EBUILD sun-jai-bin-1.1.3.ebuild 973 BLAKE2B 07e9e2c6e99b48b56f5ea8dc8d1bc8efc9d5a353b79b398ba078d92e1d92e286d61bad00a81a580e108a64317b3c87644889cb87dd1a69f51683f59380ab4a83 SHA512 2a2e4756e1b32c14d25642d912cba5b08371d4722b69fd0bf0db0f8c8d0348a7f4bbd136b9d28fe9355f3baeed54492c3b22bffce8f616c3d3c992feb518bc0e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
index 55b5518402a6..9ad9f62e197e 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="sun-bcla-jai"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
+KEYWORDS="amd64 ppc64"
 
 DEPEND=""
 RDEPEND="virtual/jre:1.8"
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 5bfd11d592ae..4af4635d55c1 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -19,4 +19,5 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
 EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
 EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 3c08a0ee771d859e07af9d01c9796571ec9295bc0be4058abb330bd62194f20c77744795fcd27412a7397e7a341b7556080d3a7589faa9548ab1f1ac97433005 SHA512 f5c8f79cb9c801062d21d17f6ccdc30b28d5d1716e63ecae00872fce2c7c1b8a6152882ab90ddf6a39d4f525429462415cef6597a9425ec59060d6d0fdbe5099
 EBUILD swt-4.10-r1.ebuild 4628 BLAKE2B 91201a8ef41b011d1727120b2bcd32daf3c7dd3e042f88e391b982234932751150425ff2cc119a82e0c5d58e4b9544f1e6568ce36f3a8a7ea69b522bbb2cf7d9 SHA512 826f37b9d626e79f22011a3f2dd64701a1899a9dc3009cac3fdbce2cf4ba0159133ec9355205eece0cc0ae6a6e6c6c98acd873a54fbf4a3080f00d92cc117cd0
+EBUILD swt-4.10-r2.ebuild 4644 BLAKE2B 3128a781fe1517bee80087d58a5920b6394363dd592d69ddbf733d6331a4eac1b7ca2c2ca2df8ab978a7264269eff3d0dd8147bd169275ab5632077548312438 SHA512 9401c712c6230413da3f4ebcbadce7dd0411f16930cd6adbe79daa193197b83bcfd41ac8f465a5ea27a34264da74a1458a8e8b806975a63e4b1e6ae15be778fa
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild
new file mode 100644
index 000000000000..8c3986977dbe
--- /dev/null
+++ b/dev-java/swt/swt-4.10-r2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="4.10"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="cairo opengl webkit"
+
+COMMON_DEP="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.32
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( >=x11-libs/cairo-1.4.14 )
+	opengl?	(
+		virtual/glu
+		virtual/opengl
+	)
+	webkit? (
+		net-libs/webkit-gtk:4
+	)"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.8:*[-headless-awt]
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.8:*"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so'
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
+)
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+src_prepare() {
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	# Apply patches
+	default
+
+	# Define missing g_thread_supported() to be already started.
+	sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die
+
+	# Webext is also in the library directory
+	sed -i 's|findResource([^,]\+|findResource("swt"|' \
+		"${S}"/src/org/eclipse/swt/browser/WebKit.java || die
+}
+
+src_compile() {
+	append-cflags -fcommon # https://bugs.gentoo.org/707838
+
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'ppc64' ]] ; then
+		# no big-endian support
+		AWT_ARCH="ppc64le"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/lib"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	export SWT_PTR_CFLAGS=-DJNI64
+
+	# Bug #461784, g_thread_init is deprecated since glib-2.32.
+	append-cflags -DNO__1g_1thread_1init
+
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	if use webkit ; then
+		einfo "Building WebKit component"
+		${make} make_webkit make_webkit2extension
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+	unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	local swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	remove_from_manifest() {
+		local subpkg=$1
+		sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
+	}
+	use cairo || remove_from_manifest cairo
+	use opengl || remove_from_manifest opengl.glx
+	use webkit || remove_from_manifest webkit
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo "/usr/$(get_libdir)/swt"
+	java-pkg_doso *.so
+
+	dodoc about.html
+}
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 138271183792..5ca7db78f381 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,3 @@
-DIST tomcat-native-1.2.28-src.tar.gz 423848 BLAKE2B f0528817e1ea7e90ce67d8e181c0f620211d36529809a4c89ae687f4cefe4b0f977eb53b87e70bd0132ef1a5a000df82fc8c70e08f9bb568644b47cbf8817470 SHA512 16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
 DIST tomcat-native-1.2.30-src.tar.gz 425741 BLAKE2B d39c7762db0f8c6b3422d1a4811d65793e2315e0d34fae8a37f250ff41a2c11a0c89ccaf8a361cda7cb16434dcd9678289ecec60cc5322a5fae2d6963c76f36c SHA512 51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
-EBUILD tomcat-native-1.2.28.ebuild 1182 BLAKE2B 9a7261837690e5b5a1bc07019bcf27f1c34e9c08740ede80ce86e844132736515c4ce9f18e940509f67f8f85616b376806180901da445a57f1026ceb1c085a02 SHA512 75b69feb9bd93291cd8d834394c8344fd792205d28ab6e381f07f0139b241a27c32befd5f63b3db40fac5365d22f79024ee08e6b9b38d38d4702cbab5b1f064b
 EBUILD tomcat-native-1.2.30.ebuild 1182 BLAKE2B 9a7261837690e5b5a1bc07019bcf27f1c34e9c08740ede80ce86e844132736515c4ce9f18e940509f67f8f85616b376806180901da445a57f1026ceb1c085a02 SHA512 75b69feb9bd93291cd8d834394c8344fd792205d28ab6e381f07f0139b241a27c32befd5f63b3db40fac5365d22f79024ee08e6b9b38d38d4702cbab5b1f064b
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild
deleted file mode 100644
index fd32b6403ca4..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0=
-	>=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-
-	cd native || die
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	eant jar
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native || die
-	default
-
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index b04b8f6cad4f..9f70e66f72cc 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,7 +8,6 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
 DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
 DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb
 DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
@@ -21,8 +20,7 @@ EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-8.5.66.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
-EBUILD tomcat-servlet-api-8.5.68.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
+EBUILD tomcat-servlet-api-8.5.68.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
 EBUILD tomcat-servlet-api-8.5.69.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
 EBUILD tomcat-servlet-api-9.0.46.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
 EBUILD tomcat-servlet-api-9.0.48.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild
deleted file mode 100644
index 8846bfbc900c..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild
index eaffc40f4037..8846bfbc900c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ea3e0f9c3963..ec4f55e51bd7 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 25e3455107cb..a0f7f4011fec 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -4,7 +4,9 @@ AUX R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch 469 BLAKE2B ee716b068316bbac0c07
 AUX R-3.6.2-no-gzip-doc.patch 443 BLAKE2B 1154e9f67f08e1d8b286152bd093789a0b94b3a2422bdb54d1d1d03729bd892811e68121309c41ef4323ed31efcea82f3e265b37445e9870bbd88c5413311345 SHA512 99678dbf809761a2991cd5cbe6ff5ba8d1c3e9388f69d94b30726caae4eee29ae50ee74aa24e3851d41559f804381ec18a2cd818b97b5417bf7ae660c93ad2a6
 DIST R-4.0.4.tar.gz 33687611 BLAKE2B 40cdfd98fe6c9193deb729d151631c2b0f935accf5ea6251704b633d2688278af1a5a67317152be023fb4a10315c64e473f58276bb0c3fadb1141c35391ad22e SHA512 811c4407a083eb776f92c3cbacb1dc7eada8890a8c27678c6c82bef9db52b1afaefeb408fbe11e46922740adee498f32e7ddf7451b3ab89cf60773737e47f8be
 DIST R-4.0.5.tar.gz 32466444 BLAKE2B 5dbbd289f4fd6347b4109eecaf65b50b5793a83edddd2cb391c20473607f136d91a8e9f4ab9e453f6927d2ca9145762920424e3a1dcea89309afde56efd5d32c SHA512 6ff5b0f9cb6b17f66cde1f5585d1b33659dbae8919d34c2e593f68a0bff4d0425aa9704d99284d103702a9cd42f613311f3a87af6b939b1af65dcec80bf2ca8c
+DIST R-4.1.0.tar.gz 33714683 BLAKE2B 22ba966b5a29f153f3ce6cbc467e815c397e7c6aade0db62c7d2ae044056d9227da4dcb8fbf33e661548f4f434c328415e297c6b07b3932ef3f47358c2543f42 SHA512 41519bf06a1ebc2bb582e9a7c35d0e82e213312dec8147861a7f9b28ee750cd40dfbf02737602d05698641fcea6182b0da8131e83edacc358e98eca0a393b729
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
 EBUILD R-4.0.4.ebuild 7311 BLAKE2B 63fc04096321ca5d5e3c947816ad02bf1b1fee47ea9e4500006ebc356dbf4aa70aca631497988ac33fb5a1e8ab2999a23f6b1d4519206a73993cefb79d2f9884 SHA512 6bcae68392035fcb25cf55e5e0dda41ad746ab5dcd1868477da801d8d7af82b0e3d0b52fa2d82009b43ea892bd9cf2c5b57c62aca4a7ee36a431e6f55b4cdf44
 EBUILD R-4.0.5-r1.ebuild 7315 BLAKE2B 0eca2b7badbd113c8acfcc8b76dd5fa505b93f8e7db26c54738b1d7454866567ad7c4e999ed7cb31f512501fbc4de5e2bb81f630a7aea3af200799ae7a99a3d0 SHA512 f1c78cbda7bce8ab0b32f7f01c4050e83c0b9da268b66bb86638fe6e5ccfa67b6409c8debdb6106a29b8fdfc43268ec602f7b865e134b72fb4bb2371ace26762
-MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1
+EBUILD R-4.1.0-r1.ebuild 7080 BLAKE2B 312412a327e25891d3b4236f648d4958b0d7ffcada36add367baeced3f325af645cb21c5126190643bfd92eba34d169c14a68e2cdfdc3b9c98de7e7254171e3b SHA512 978cf3808415dbcea5fcbf81a3e9877e236317bb89a821b2f812f0673631fee2e4be63a66c9b26ced3f85ef429ddca4482624e7e8d87b9c9172e87707d7325c8
+MISC metadata.xml 1260 BLAKE2B eb0399a7ff9cb5c8a2f26944065ea176fb379bfd509fe2f6115dc0deb625d0c92a6cf62736572024f9c1342865cbd8a6ed43f8c427939a08ded55dd73f5514df SHA512 71c20b8afc3a72627e89bf032db5c19369738bfe35fc6d3a2550f21bf70be1eec1a697ec13690f48a1f2604cd3973140311af6b745719fd724dea595b964e6ae
diff --git a/dev-lang/R/R-4.1.0-r1.ebuild b/dev-lang/R/R-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..ebf4b5c27c2e
--- /dev/null
+++ b/dev-lang/R/R-4.1.0-r1.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
+
+# latest git commit for R bash completion: https://github.com/deepayan/rcompletion
+BCPV=78d6830e28ea90a046da79a9b4f70c39594bb6d6
+
+DESCRIPTION="Language and environment for statistical computing and graphics"
+HOMEPAGE="https://www.r-project.org/"
+SRC_URI="
+	mirror://cran/src/base/R-4/${P}.tar.gz
+	https://raw.githubusercontent.com/deepayan/rcompletion/${BCPV}/bash_completion/R -> ${PN}-${BCPV}.bash_completion"
+
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline static-libs test tiff tk X"
+
+REQUIRED_USE="png? ( || ( cairo X ) )
+	jpeg? ( || ( cairo X ) )
+	tiff? ( || ( cairo X ) )
+"
+
+# At least one package installation in the test suite requires TeX,
+# and will fail without it (bug #718056).
+BDEPEND="virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsrecommended
+	)
+	test? ( virtual/latex-base )"
+DEPEND="
+	app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	app-text/ghostscript-gpl
+	dev-libs/libpcre2:=
+	net-libs/libtirpc
+	net-misc/curl
+	virtual/blas:0
+	|| ( sys-apps/coreutils app-misc/realpath )
+	cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= )
+	icu? ( dev-libs/icu:= )
+	jpeg? ( virtual/jpeg:0 )
+	lapack? ( virtual/lapack:0 )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng:0= )
+	readline? ( sys-libs/readline:0= )
+	tiff? ( media-libs/tiff:0= )
+	tk? ( dev-lang/tk:0= )
+	X? ( x11-libs/libXmu:0= x11-libs/libXt x11-misc/xdg-utils )"
+
+RDEPEND="${DEPEND}
+	sys-libs/zlib:0[minizip]
+	java? ( >=virtual/jre-1.8:* )"
+
+RESTRICT="minimal? ( test )
+	!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.1-parallel.patch
+	"${FILESDIR}"/${PN}-3.4.1-rmath-shared.patch
+	"${FILESDIR}"/${PN}-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
+	"${FILESDIR}"/${PN}-3.6.2-no-gzip-doc.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		FORTRAN_NEED_OPENMP=1
+	fi
+	fortran-2_pkg_setup
+	filter-ldflags -Wl,-Bdirect -Bdirect
+	# avoid using existing R installation
+	unset R_HOME
+}
+
+src_prepare() {
+	default
+
+	# fix packages.html for doc (gentoo bug #205103)
+	sed -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
+		-i src/library/tools/R/Rd.R || die
+
+	# fix Rscript path when installed (gentoo bug #221061)
+	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
+		-i src/unix/Makefile.in || die "sed unix Makefile failed"
+
+	# fix HTML links to manual (gentoo bug #273957)
+	sed -e 's:\.\./manual/:manual/:g' \
+		-i $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
+
+	use lapack && \
+		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
+
+	if use X; then
+		export R_BROWSER="$(type -p xdg-open)"
+		export R_PDFVIEWER="$(type -p xdg-open)"
+	fi
+	use perl && \
+		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
+
+	# don't search /usr/local
+	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
+	# Fix for Darwin (OS X)
+	if use prefix; then
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			sed -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
+				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
+				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
+				-e "/SHLIB_EXT/s/\.so/.dylib/" \
+				-i configure.ac || die
+			# sort of "undo" 2.14.1-rmath-shared.patch
+			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
+				-i src/nmath/standalone/Makefile.in || die
+		else
+			append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
+		fi
+	fi
+	AT_M4DIR=m4
+	eautoreconf
+}
+
+src_configure() {
+	#	--with-system-tre \
+	# tre is patched from upstream
+	econf \
+		--enable-byte-compiled-packages \
+		--enable-R-shlib \
+		--disable-R-framework \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable java) \
+		$(use_enable lto lto R) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable profile R-profiling) \
+		$(use_enable profile memory-profiling) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs R-static-lib) \
+		$(use_with cairo) \
+		$(use_with icu ICU) \
+		$(use_with jpeg jpeglib) \
+		$(use_with lapack) \
+		$(use_with !minimal recommended-packages) \
+		$(use_with png libpng) \
+		$(use_with readline) \
+		$(use_with tiff libtiff) \
+		$(use_with tk tcltk) \
+		$(use_with tk tk-config "${EPREFIX}"/usr/$(get_libdir)/tkConfig.sh) \
+		$(use_with tk tcl-config "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
+		$(use_with X x)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	emake AR="$(tc-getAR)"
+	emake -C src/nmath/standalone \
+		shared $(use static-libs && echo static) AR="$(tc-getAR)"
+	use doc && emake info pdf
+}
+
+src_install() {
+	default
+	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
+
+	if use doc; then
+		emake DESTDIR="${D}" install-info install-pdf
+		dosym ../manual /usr/share/doc/${PF}/html/manual
+	fi
+
+	cat > 99R <<-EOF
+		LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+		R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
+	EOF
+	doenvd 99R
+	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
+	# The buildsystem has a different understanding of install_names than
+	# we require.  Since it builds modules like shared objects (wrong), many
+	# objects (all modules) get an incorrect install_name.  Fixing the build
+	# system here is not really trivial.
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local mod
+		pushd "${ED}"/usr/$(get_libdir)/R > /dev/null
+		for mod in $(find . -name "*.dylib") ; do
+			mod=${mod#./}
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/R/${mod}" \
+				"${mod}"
+		done
+		popd > /dev/null
+	fi
+
+	# Users are encouraged to access some of the the R documentation
+	# interactively, through functions like "contributors()" that
+	# tries to open the "AUTHORS" file. Other files can be accessed
+	# by name with RShowDoc(), and the documentation for e.g. license()
+	# and RShowDoc() suggests a few of these names. Here we try to
+	# collect as many names as possible that a user might actually
+	# try to view through R, because if we don't decompress them,
+	# then R doesn't know what to do with 'em. Bug #556706.
+	INTERACTIVE_DOCS=(
+		AUTHORS
+		COPYING
+		FAQ
+		NEWS
+		THANKS
+	)
+
+	# Other data sources that are shipped as "documentation," but which
+	# need to be accessible via their original unmolested filenames.
+	INTERACTIVE_DATA=(
+		BioC_mirrors.csv
+		CRAN_mirrors.csv
+		KEYWORDS.db
+		NEWS.rds
+	)
+
+	NOCOMPRESS_DOCS=( "${INTERACTIVE_DOCS[@]}" "${INTERACTIVE_DATA[@]}" )
+
+	for f in "${NOCOMPRESS_DOCS[@]}"; do
+		docompress -x "/usr/share/doc/${PF}/${f}"
+	done
+}
+
+pkg_postinst() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}
diff --git a/dev-lang/R/metadata.xml b/dev-lang/R/metadata.xml
index 8972d9ed88ca..e9bebc0e016a 100644
--- a/dev-lang/R/metadata.xml
+++ b/dev-lang/R/metadata.xml
@@ -5,6 +5,11 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
+  <use>
+    <flag name="lto">
+      Use link-time optimization for R and its recommended packages.
+    </flag>
+  </use>
   <longdescription lang="en">
   R is GNU S, a system for statistical computation and graphics. It
   consists of a language plus a run-time environment with graphics, a
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index 35d8072fb417..f0b92e850e77 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -5,8 +5,9 @@ AUX crystal-0.27.0-gentoo-tests-long-unix-2.patch 469 BLAKE2B 66bcc1d0dd9582cac4
 AUX crystal-0.27.0-gentoo-tests-long-unix.patch 3317 BLAKE2B df1040abdb587ac3fffb8129d4f1bafc492e38ad5dcfdea5cfbf4426849b099c4d94dac61c93ae7fcae46b60dea1809f52ad373efcd89796a3c1f119614063c1 SHA512 a9ed819a864465e062b4d6a568f14fbb8adc1db01071c79164dede8b2b8d83e07b785cd8196826097de5119e0bdc7d6e194cf4e10cc677bd2bdf158d124c2ad2
 AUX crystal-0.27.0-max-age-0-test.patch 632 BLAKE2B d41416f4045b23d0a9c4e11e525d8537277090ee316d01cab9cce0373b07583b9e80a495c8f4db997fc4f1b15b17c080d590f8cb8b6f454dc1c0d1d48015a127 SHA512 7608cb37850e52af406fab0378f0748af7db9239f878720041d56751ce36e0f5874a79b1a971fdc6f261292d23868e3e35c9ddb0d3c10c2bb987767954a77988
 AUX crystal-0.31.0-verbose.patch 701 BLAKE2B 34b74f073edf2979074cfa9042c73945b4856c33ae5037a30e8e096c17939d4d041d569ef01236db5162ffd5574b6b5ba591861d7777c3cd70882f224108ce5c SHA512 c78d636ed7646fdab9ca5335ecd43ddaafeb8b7f0749a323e7d495df1e1d08093ab3cac582a7f2ddff1437da326c873d74ca7b474388e6cf3421e1318e2e5484
-DIST crystal-1.0.0-1-linux-i686.tar.gz 30753871 BLAKE2B 247d8327c001ef8e847d981ab771964faa90b5acb1dc1336288b4c401cd039bb259e22945aabae73b6e23cf6babec288a25e4490a860e9a6c5cc8076afb2e7d3 SHA512 36f48fbc44f254588b449c6c80dd47e8152e1e31785ce0111dcd4da9eed57c12aac7427807f4a60d86a9841726e197a6d08582438bffcc4ed16eaad35e6ea886
-DIST crystal-1.0.0-1-linux-x86_64.tar.gz 28189455 BLAKE2B 8313d201e8b8363f3f5025ab2bf2d44a981ca7185686474aa677d38986428b54e9d28fef01e12205ab58db67b516a043582a9965f31972bfa2ece5ff8bd640a0 SHA512 bbfe5010d2e620a58b25a3f7133f0f15c212ed085f020bbb8da39aca882d89c077068343fe182995ec09b436daaf8d252db232bf7fe3af087a5ab0728e0a758f
-DIST crystal-1.0.0.tar.gz 2435212 BLAKE2B 3204162abae8ef2e3e7a7a294f001b3906562c17121bb3646c1d1bac0d7b98433c77d9c8101bae9b3041996794784b8fce5dd3dfded33a27c8d229bc3b557c0c SHA512 aa56eb0131aecad15bebc6ef0ce2f34f0992a8362441dd662a518ddbc5e3818762c1c7228bc5b06aafdb8815e59d791654add9da8ba9a47a6a4fd34f6b039a8b
-EBUILD crystal-1.0.0.ebuild 3078 BLAKE2B 6eab0ead27ef8d8786f0bc6267817c9cbdc31178074013c3d5842df1bfe7f2bfdd30c95c459bea12b55720abb654c3d237add40ee74b69e0ae1045c2cc8dc3bc SHA512 b0cf132093890c200190248529c44b217a7aed694e47597d503767774f8565e60cc6c831d1d738a34c9b460118ea5c51bfab2c94d0efd587b79c4e051acf2618
+AUX crystal-1.1.0-verbose.patch 803 BLAKE2B 2fa91a0d3f5dda1cd2790a09a32dad212d471ed42eea3786ba9216fdff46f78630c45b0130fab36bde9435b857cd57d348a2df72520a8ef7fe1115da477a6855 SHA512 ea3b0ebfa28f345f904a8a829eec9c83b8bc2d764b5ae3640a4d60902ebe2aba1f58cb04a9a50dd7359784bfed0e1a154b31875323178b477089d7ba25cde4ec
+DIST crystal-1.1.0-1-linux-i686.tar.gz 30747190 BLAKE2B 7fe29248ae69c81cb0c79419488c5b544bb55810894ac1d7f276ccdf2d2d98c7c2bc4f8c007214e5ffd18ee39bdf6983f33b13c08f012105fce714eeaa18fac9 SHA512 df267250971c11d1e2f4f869a14f7b2f1e5a32cf15c407a0ee9291aeb4ddc21241c3f21c7706ee2305dfbf4ac645681a06bb70a6ee9246968a30f59b7595ea8a
+DIST crystal-1.1.0-1-linux-x86_64.tar.gz 27998777 BLAKE2B 06be8a51b28266b25f1a3629b1a1ac6f3878aacdd4ca4019ac201369ca0507f3ed27bfea46ea7d8d4dfa67888268a8e027586bb32e9964d4754661f43e36ac12 SHA512 8c4542ce0623e459b61591b7bd13f416ee30c89913ce827830e570225c72ec79ad5466d414b05f520d384f04363f11964ff8bf158f0ae798da3864208655319e
+DIST crystal-1.1.0.tar.gz 2476748 BLAKE2B 2874da651a8b4454c6a34b00ac4ef93be6beaabe01ff66aaac86583a9d9c1baccde9473358d70d78490b367db3a307af3b5219af6751c1d83cb5084e74955197 SHA512 fcd14338c4c6cb9189cfb9d4d93af7feab806a49e10b9c83399f9252f0c5f3488605141f09adef82d48343eab5653b754b9196fb659590df8d4deb2c4b6499f4
+EBUILD crystal-1.1.0.ebuild 3077 BLAKE2B af72e22439f83e8942e395396bce25139164627b3126abf42fb3bdabcd3e96140939f47af206f617b9dee21cf87f71123ea422799ee37bdb8a2f5d22c04bed14 SHA512 ff77873e8ee40d5851eb061e99cfc52502fc74d7365f2f1acd3f23262ff5fb7a016654e80c0b73c50ba5625c0fbc62a04990a6a8e5c3eb923467f24e070e9600
 MISC metadata.xml 994 BLAKE2B a4e4884456baf95cbfd22e489dfeeddb038230a9f4a0c609e89b1f154fb68cb8ae388a0169741359dc4f2bfc7d1d3e6fe75e70bde39ef4a8c1d309024862edfb SHA512 672eb799dfa83b2abc52222c3bbf448148b3d480f21ebc6eba18e2ffbc5fa2d4dd4d3cd6a35df8a6247d57549d1fbbcbbfd0518b71aae1ea875f8e20ccff94e2
diff --git a/dev-lang/crystal/crystal-1.0.0.ebuild b/dev-lang/crystal/crystal-1.0.0.ebuild
deleted file mode 100644
index 03283fb4e71d..000000000000
--- a/dev-lang/crystal/crystal-1.0.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-BV=${PV}-1
-BV_AMD64=${BV}-linux-x86_64
-BV_X86=${BV}-linux-i686
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )
-	x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
-
-RESTRICT=test # not stable for day-to-day runs
-
-LLVM_MAX_SLOT=11
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	dev-libs/boehm-gc[static-libs,threads]
-	dev-libs/libatomic_ops
-	dev-libs/libevent
-	dev-libs/libpcre
-	sys-libs/libunwind
-	dev-libs/pcl
-	dev-libs/gmp:0
-"
-RDEPEND="${DEPEND}
-	xml? ( dev-libs/libxml2 )
-	yaml? ( dev-libs/libyaml )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.31.0-verbose.patch
-	"${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch
-	"${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch
-	#"${FILESDIR}"/${PN}-0.27.0-max-age-0-test.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
-)
-
-src_prepare() {
-	default
-
-	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
-}
-
-src_compile() {
-	local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
-	if [[ ! -d ${bootstrap_path} ]]; then
-		eerror "Binary tarball does not contain expected directory:"
-		die "'${bootstrap_path}' path does not exist."
-	fi
-
-	# crystal uses 'LLVM_TARGETS' to override default list of targets
-	unset LLVM_TARGETS
-	emake \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
-		\
-		PATH="${bootstrap_path}:${PATH}" \
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
-	use doc && emake docs
-}
-
-src_test() {
-	# EXTRA_SPEC_FLAGS is useful to debug individual tests
-	# as part of full build:
-	#    USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
-	emake spec \
-		$(usex debug "" release=1) \
-		progress=true \
-		stats=1 \
-		threads=$(makeopts_jobs) \
-		verbose=1 \
-		\
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
-		\
-		CRYSTAL_PATH=src \
-		CRYSTAL_CONFIG_VERSION=${PV} \
-		\
-		"EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crystal
-	doins -r src/.
-	dobin .build/crystal
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/completion.zsh _crystal
-
-	use examples && dodoc -r samples
-
-	if use doc ; then
-		docinto api
-		dodoc -r docs/.
-	fi
-
-	newbashcomp etc/completion.bash ${PN}
-}
diff --git a/dev-lang/crystal/crystal-1.1.0.ebuild b/dev-lang/crystal/crystal-1.1.0.ebuild
new file mode 100644
index 000000000000..7af64a711416
--- /dev/null
+++ b/dev-lang/crystal/crystal-1.1.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
+
+BV=${PV}-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="https://crystal-lang.org"
+SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )
+	x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
+
+RESTRICT=test # not stable for day-to-day runs
+
+LLVM_MAX_SLOT=11
+
+DEPEND="
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	dev-libs/boehm-gc[static-libs,threads]
+	dev-libs/libatomic_ops
+	dev-libs/libevent
+	dev-libs/libpcre
+	sys-libs/libunwind
+	dev-libs/pcl
+	dev-libs/gmp:0
+"
+RDEPEND="${DEPEND}
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-verbose.patch
+	"${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch
+	"${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch
+	#"${FILESDIR}"/${PN}-0.27.0-max-age-0-test.patch
+	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
+	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
+)
+
+src_prepare() {
+	default
+
+	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
+}
+
+src_compile() {
+	local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
+	if [[ ! -d ${bootstrap_path} ]]; then
+		eerror "Binary tarball does not contain expected directory:"
+		die "'${bootstrap_path}' path does not exist."
+	fi
+
+	# crystal uses 'LLVM_TARGETS' to override default list of targets
+	unset LLVM_TARGETS
+	emake \
+		$(usex debug "" release=1) \
+		progress=true \
+		stats=1 \
+		threads=$(makeopts_jobs) \
+		verbose=1 \
+		\
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
+		\
+		PATH="${bootstrap_path}:${PATH}" \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV} \
+		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
+	use doc && emake docs
+}
+
+src_test() {
+	# EXTRA_SPEC_FLAGS is useful to debug individual tests
+	# as part of full build:
+	#    USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
+	emake spec \
+		$(usex debug "" release=1) \
+		progress=true \
+		stats=1 \
+		threads=$(makeopts_jobs) \
+		verbose=1 \
+		\
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
+		\
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV} \
+		\
+		"EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/crystal
+	doins -r src/.
+	dobin .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	use examples && dodoc -r samples
+
+	if use doc ; then
+		docinto api
+		dodoc -r docs/.
+	fi
+
+	newbashcomp etc/completion.bash ${PN}
+}
diff --git a/dev-lang/crystal/files/crystal-1.1.0-verbose.patch b/dev-lang/crystal/files/crystal-1.1.0-verbose.patch
new file mode 100644
index 000000000000..4e68afd1a94d
--- /dev/null
+++ b/dev-lang/crystal/files/crystal-1.1.0-verbose.patch
@@ -0,0 +1,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -29,3 +29,3 @@ SOURCES := $(shell find src -name '*.cr')
+ SPEC_SOURCES := $(shell find spec -name '*.cr')
+-override FLAGS += $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )$(if $(target),--cross-compile --target $(target) )
++override FLAGS += $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )$(if $(target),--cross-compile --target $(target) )$(if $(verbose),--verbose )
+ SPEC_FLAGS := $(if $(verbose),-v )$(if $(junit_output),--junit_output $(junit_output) )
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index ac8865c769db..cc15bd48f7c4 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -9,12 +9,10 @@ AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f
 AUX erlang-24.0.2-serial-configure.patch 586 BLAKE2B 3ad4fcbf35310dc11e8aaddca95a467414c60390a7e170c83d0775230a5a815212c6ddce55e98721b02e03511f80e67cfbd60e4b06bc86c615bb3a51d5015ec5 SHA512 abc81ef2a0b23fbe82542efefb1cbb12b1143e9282f7114ea929c18a5c02f2053caabb05ef9838d40b40f3ca59b06955528b122092438ee3d4ef6a8b567fc335
 DIST erlang-23.3.4.tar.gz 56664814 BLAKE2B ef8aa8d5a6fd1efc02a35459d1cb15eecf5f948127266bf782544e1da9a59765aca15070ea92df5558a4de017cc810e3542e2393e9470243fc6d9be13e9f37b6 SHA512 c8c5a9676163058276c703a0db0373508fad0ed9dff0aa9806ce59115ca766ff1d343c5a3917a920b249655fe188b974482ff378e9173c9fe00ea3907e618da5
 DIST erlang-24.0.2.tar.gz 58878378 BLAKE2B c2ea65cac39b654d9037ea9fcb47eb6eea96dec2483378f414bc33475e850121c1adaa30ea880070624496be9779539f98c864b0dd6eb92d3c4badaa121353d1 SHA512 d85e3e6a4177ac8c696dd666183f624065a89d35aa7f031cd6a7b105e0d1f9007de8d413880df47daf8f695485d952a81a14a01313b52f66534c1e5bd050093b
-DIST erlang-24.0.tar.gz 58258571 BLAKE2B ee71c1f19a1d990977d3764bf4122593a216e4bbbef7e5a8a5c7e22142171ef869b4a5ac01aa1f4495eaf79808cbb677d4163a52917879e2a615f08e20480c7e SHA512 bd3e4dbe640e80dc2173bc9c92178acbd6aee7a486a1eebb7fe8ec70963b8c94bb456af7ac592f434700cd8b1d98ef8351bfc7a76113bbbd0c9a0e20fd68629b
 DIST erlang_doc_html_23.3.tar.gz 36224657 BLAKE2B 7e2a3e16f4cfa0f15c01074740e02af7a45b480b4a94e764463717658ab7e5d0281f928c3ec585582b10168645e3e06cfe72cf6a0ba1b88f539b80f2b7ad99be SHA512 8be4aae46839239604b875b39339e7b6b6c677c099b3d749d5f1041c4508c1c3b4aa8136a93df12b1e5cb6333ef907276f5965c9726ed2b9e77a6043c8ef53b1
 DIST erlang_doc_html_24.0.tar.gz 39731398 BLAKE2B 8a9fe3acb4cc13691e16c477cf89e8298df1a99bbe6a6c9e59e3c34248ecdc21077835951087b5a5bbb23ddb28f3bd7ab8b058fe64ce56c342b825a6c0ef8948 SHA512 453f8a9cf779a4f43966615433afc3be3aae7a571acf45974947bd720a331ca05949bc310de5f3b33b72d274971103ede56875bbfe757ba17f903510f690d97e
 DIST erlang_doc_man_23.3.tar.gz 1456501 BLAKE2B 414bedee0e316d97b26d9d6418b799a9434a22e9980e7d3a83e2478d184d63d1633c0e10d0e180d929a3cacd82b4d703be86cbc8e99996037f6b37ea122f7a8c SHA512 6c661c210ffec4752afe624fa46700a0f62cc6589b74b859ab1dfde77d289e992988ac8744f7b4126d7512cd6d0aab3321f710a6324552b259bd7acd5b54a05e
 DIST erlang_doc_man_24.0.tar.gz 1666152 BLAKE2B aaef8165322f39f7410840eafe562ec5038d9c89b4fa99b3b1d5748ba70fe755ba732de403dd916328e1fdcec895e2a347db4fb8c8837b5e41155439c9c54ef6 SHA512 7251f6eeb0534cc8538236a2c4be9d732bf0a05ba6832f9b3859116f9148e469d004331924c7187b07204798afb66067bfd321c8905000c355775927e5841918
 EBUILD erlang-23.3.4.ebuild 4499 BLAKE2B 06891eb432ae12d43e860ce0773eb01768ea75ec4f16c365fbe16c22093039e5b18aaa4d3ca558f7a64cada0fc405ac0ba898065b80c778ad9253197302c5145 SHA512 09397c1f46fcf92ef160dee067b9dbf9e0a9125e112f28748180166ddd0394ad34f03e0ddcf32dccff101485927f41c1b1a4376a66bbfd52c8fb2f74bfac27d5
 EBUILD erlang-24.0.2.ebuild 4685 BLAKE2B 4591f62978ee5d34cffa95b167e344a886ea3ac0e02cbe4ecabc29e145a67dcaaee61b057061249878285628addd053ee51e35738d93e3f7353c5734b7901083 SHA512 fc1aeb839c93cae56fe2729b82508f5908fb30e9891ff5b08755e11473985c91706b10b679c296aaa8256505ad1c0650f29854988dc51af206f70ea94f60bb68
-EBUILD erlang-24.0.ebuild 4518 BLAKE2B 16fd9ddf0f829df46a5edd2349cd309ad931ef7b95c8e3cd4c02b5d3af38e72233ddd55cda5dcecf9b095ffb8d98d66d2082bd4b5a00f2a3a3d975b4c3af2d21 SHA512 e2b266b4bd283d8782303e6e213eb479e7fa1d4a7d69c3ffd0895d1fda7dcf5eda99445ef314a4497fb146dd40a7a1b25aaa7371b7b412bba148ff4c54bce16a
 MISC metadata.xml 864 BLAKE2B fb20217a05650be9d9f454a7ffe45aeb7e41ad4f9b1616efa94f5609db4d8de1b5848268e6224c256c2ff86b0d3bad578d6e4f0e43c4e8bf433e7a7e9210ae98 SHA512 c4aae8e974789ce095eeaf7d7517da16351b1ebb60cc98abdeebc41147be4bce084081d4f7a03727f9070434a9e1347c0ebf809a99931bc7177525726cb9c161
diff --git a/dev-lang/erlang/erlang-24.0.ebuild b/dev-lang/erlang/erlang-24.0.ebuild
deleted file mode 100644
index 87b209dcc6ee..000000000000
--- a/dev-lang/erlang/erlang-24.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-
-inherit elisp-common java-pkg-opt-2 systemd toolchain-funcs wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-# We use this subslot because Compiled HiPE Code can be loaded on the exact
-# same build of ERTS that was used when compiling the code.  See
-# http://erlang.org/doc/system_principles/misc.html for more information.
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	acct-group/epmd
-	acct-user/epmd
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( >=app-editors/emacs-23.1:* )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? ( >=dev-libs/openssl-0.9.7d:0= )
-	systemd? ( sys-apps/systemd )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	tc-export AR CPP CXX LD
-	./otp_build autoconf || die
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-
-		# don't search for static zlib
-		--with-ssl-zlib=no
-
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_enable sctp)
-		$(use_with ssl ssl)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(use_enable systemd)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		# Note: we explicitly install docs into:
-		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
-		# To maintain that layout we gather everything in 'html-docs'.
-		# See bug #684376.
-		mkdir html-docs || die
-		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init-r2 epmd
-	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
-	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/gforth/Manifest b/dev-lang/gforth/Manifest
index 3f8ba6d5246d..6f3403c9c204 100644
--- a/dev-lang/gforth/Manifest
+++ b/dev-lang/gforth/Manifest
@@ -4,6 +4,5 @@ AUX gforth-0.7.3-CFLAGS-LDFLAGS.patch 1097 BLAKE2B aa66797e6ebd04966f67275a8b0d9
 AUX gforth-0.7.3-rdynamic-auto.patch 634 BLAKE2B c824db023b690ef4e196715589017f2d74d607cefa8fd6a29e987a3df90aaf4e09f4ea7cc3475b93c8ea1f308049a117eb8ea258cc50e962ce5e501b513b3419 SHA512 32ad96b1de651088b375fa9b8decdd8f03f7c492ad6a11e7cbdc574557b2fe7458180ae71919e1f76c6175d443d50582c94876489af0c961a167b40b3d1a4b7d
 AUX gforth-0.7.3-rdynamic.patch 578 BLAKE2B 10e978a2f4edef4d66e839d2f9d047526e54235ed8c6a1a0b754a38149c2a2db2481bee898dfbc209cf8559b6f2cc408b13d594b7007b7710f3c619549321197 SHA512 2bb1491b82b87bcd387822da501078daad171950cf870f8644d909a848a4843e3fa99d8782d16524353edbffb71f704ff7bf5fa7bf326501f7dde2c294b2c8ee
 DIST gforth-0.7.3.tar.gz 2523433 BLAKE2B 1ba9095af7958aabf0d671f982c483f2046392fd9872678a58f314357875d286bee7f0d7bc38e9b21331acda80fd285c0489fed44d59c148ff6ec6b6bea7c174 SHA512 f034234acfb0fc727f28b564432219a100b916c6df4b847794a55b2fc3b8ed8714eca6de0df67c7c427b7c2bb4dd00f65cfd34e6eb60181e41ab84fea30304e4
-EBUILD gforth-0.7.3-r1.ebuild 1313 BLAKE2B 783f8030fb856719b5cac67216f21a6c3517e7b7c20772ec5fb6486033f6eb3eb6a3f313ed29ef38dde2f6dfc8bdc1da1239dddaeb98d057153947a676904654 SHA512 c970bfa352e8ca1ea1b46c0c5ff8bc3397577668616668b348f6d09ad99050210e26d9e06f1fc5aec8d56d79012cf8aab73fd28e73fb875fe6e366dd480f41ac
 EBUILD gforth-0.7.3-r2.ebuild 1639 BLAKE2B 9a9b3b2d0e1ba2a16426b5ae090f1d8ea19fd07bd02c09b3b0073cbb47de3d35c4ebc0138d88554a2895c086f0b229c8bb4cf70a00201ac5696e878a811272fb SHA512 5c03928607c6a0f5459590f667f966c6a8a9414841c7e5b54ce471139a53049e5f57d0b9e65749d929a36f54fe105778107cf854d5e8b395f12c15bbadc0b4c9
 MISC metadata.xml 326 BLAKE2B 6da20ce2a24c972471a238851ab8507c86dbadeb31012151be42584e9d57bebdce2756f559de384330dc046643f488d5c1113a14ee062c3876af781ec06bd0de SHA512 ddc827fdf3ad56400315226a9a396689925918c60a9bfec1c3f927a3408b16da0c2df51e987fd8943e5575446f98fe7a83547fa168fc6863f7bbff0bc5272dae
diff --git a/dev-lang/gforth/gforth-0.7.3-r1.ebuild b/dev-lang/gforth/gforth-0.7.3-r1.ebuild
deleted file mode 100644
index ddf2c89a40a8..000000000000
--- a/dev-lang/gforth/gforth-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common
-
-DESCRIPTION="GNU Forth is a fast and portable implementation of the ANSI Forth language"
-HOMEPAGE="https://www.gnu.org/software/gforth"
-SRC_URI="mirror://gnu/gforth/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="+check emacs"
-
-DEPEND="dev-libs/ffcall
-	emacs? ( >=app-editors/emacs-23.1:* )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0-make-elc.patch
-	"${FILESDIR}"/${PN}-0.7.3-rdynamic.patch
-	"${FILESDIR}"/${PN}-0.7.3-rdynamic-auto.patch
-)
-
-src_prepare() {
-	default
-
-	# We patches both configure and configure.ac.
-	# Avoid reruining aclocal.
-	touch aclocal.m4 configure || die
-}
-
-src_configure() {
-	econf \
-		$(use emacs || echo "--without-lispdir") \
-		$(use_with check)
-}
-
-src_compile() {
-	# Parallel make breaks here
-	emake -j1
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS BUGS ChangeLog NEWS* README* ToDo doc/glossaries.doc doc/*.ps
-
-	if use emacs; then
-		elisp-install ${PN} gforth.el gforth.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index cc1967a35725..bfb264a8343e 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,7 +1,11 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
 DIST go1.15.13.src.tar.gz 23039791 BLAKE2B 45a6cd985a27afa8b063dff1e4e4903abf76f03621bb6e4b64b03ef5ba2a9acd3d8b19e131464e6ef57d69bcb513ae81516e4b2a8b020b50503ca162385ed222 SHA512 3f77716c9721afacb27daa175e236bb25cfc93602f1531df18938fad94bf4f59e81b81f53fa977c2ebc9a912942275a1106043133fec166965e72766b1638ba1
+DIST go1.15.14.src.tar.gz 23041432 BLAKE2B bcc79756b77cb7c435360a91da853b723ba33287a803250ff6bc36d523eddc293265797dc63df2ca6c504050d56c34336dbed205025f2efdda9247fc9a07f7e3 SHA512 2bf18efcb3a5f9e54de0a0e7ee27a689c2dc895d9403bc6f66e500358e70d1d664d7f17102126c98bd26fa2a3346ead358684e45b1a354cde8764c715064dd92
 DIST go1.16.5.src.tar.gz 20921372 BLAKE2B a6565deb34b6cb167c41fc3af2e3bbdc8e22333adc9109de67c9e1f4bffb3d2c6e7d289e310f777d69092b3ee7a4dd706e13b0fe9ae5b0a16f270569953039df SHA512 ba90ce1f3faa39519eb5437009c4b710b493e42764a14b0821292a8a17b714fe5985ef20e6e3c340f71cb521ff63d45a23570d38fd752526a1262448c641d544
+DIST go1.16.6.src.tar.gz 20923044 BLAKE2B 7a46d33f947c1d7f2c6f5e0085cba89520fdb8859fc804c8318b85d0b0e888b74ca074affcf3119c2d80157485e8f679e37390cbd58c644b38948f7d15428b7b SHA512 82634763dce636c9e9cba1bbf74a669e8b88e6df095e80672f295edb82cc1fc4b8ffde91a1f56c3470f2c4d9ee0404f65146d7478b645890623f6c463513a61f
 EBUILD go-1.15.13.ebuild 4574 BLAKE2B 12cc502e407d5ccfc0a4ff3c63c724602e29b3806f8add96e1113f2a76f8444d971e7d1394d4a97b01f9755d743dee2cda4053a89d20d348c454a311277836d5 SHA512 6e4c888f2da630120c644fbc3f330af1c92c0847fb0f5bfb0fd42c888af8b7834c8508263801b34c946ed54e6414e7461411e2713f92f802c293af3624f0ad47
+EBUILD go-1.15.14.ebuild 4575 BLAKE2B aaa683bd2fc58619ac378f08719dd6f95cf038f6ecf6a8c9bdc74d423e919b71d81678caa251bf6314af487669e8667701f6f1a11f8c00fa8da54e5f62db9cd2 SHA512 f065629dd2fb6c5b307d7b805b25dcc532bf3a17706af201e1082ff09f49d546bd626941f4c942eb0893e0d3eb5109b170e7215243306c67aac4c87020c08f33
 EBUILD go-1.16.5.ebuild 4642 BLAKE2B 2a3ebc1f8b2797ef0ca78e81fd9201ddeb25d3d422170b6f383b853579a633bbd2c5040ec4e3d0bd904ec75aa9be0a43d0d4f243514ae58ff3d9f17f7ee53a57 SHA512 6cc0b8e18db98fbe1faef5185d87e369298b8019d4c7119c6ffb2225b89a2c51c9dd550f77b5e17ef2111dea89091b64ddd78b12e20c49c2c7bcb92fd9a1a36d
+EBUILD go-1.16.6.ebuild 4643 BLAKE2B 9165ef3dd8e8d26eca37a3dc1a5c50faa36f8c032da21edc8dc5cbd7047fa335521f872b47911b5be6864f876161bb8328f73a569029e6f6b20c1a8dc4e1b25f SHA512 7203fc1a26595fd412091e2dd7d4e3a5af249dcdbcc8cea8ab202ee3ec14f9cb651b0c9a442fdb0ef67c45c2d0880a684f5def3561eb2d9ab20e61e4f8459c8a
 EBUILD go-9999.ebuild 4579 BLAKE2B c74b2bdd8db85b106cc7fced8388d1d50a67ccd1cc003ccf984c04a3213191e662a7285cacca758edbaa56149007ca84ae5d869b06a5a3f9cb72239e7ad621e8 SHA512 8cb0132fa8cdbc8a45346013f15c66b0075f3df678c3d623a1d16ed03d6b0a04b6372c14d8fdddde00dfa2eee39661ea17104fd787b6609bb5e8407ee773fcbc
 MISC metadata.xml 462 BLAKE2B d9d4280e921286791a55619a7e5557c7041b0de157aa0f8bf6f17cf5041f802df4037270eeb3e8d37263f9fc17939c619a0dd3bce449c5f247279884da10bf67 SHA512 26fa7bfe26f00e8e1766cc0a1052fb8b5352799a33c9eb8f0c4f4523601d3eb5d1da8adc4b731f0d778039788734a9ad483f22e58e4bf1551ec8e9dccbcb87ba
diff --git a/dev-lang/go/go-1.15.14.ebuild b/dev-lang/go/go-1.15.14.ebuild
new file mode 100644
index 000000000000..1e456517ba79
--- /dev/null
+++ b/dev-lang/go/go-1.15.14.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* amd64 arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch() {
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm() {
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os() {
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple() {
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile() {
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install() {
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	einfo "due to the static linking nature of go."
+	einfo "If this is not done, the packages compiled with the older"
+	einfo "version of the compiler will not be updated until they are"
+	einfo "updated individually, which could mean they will have"
+	einfo "vulnerabilities."
+	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	einfo "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/go/go-1.16.6.ebuild b/dev-lang/go/go-1.16.6.ebuild
new file mode 100644
index 000000000000..4c8f5c8fbc88
--- /dev/null
+++ b/dev-lang/go/go-1.16.6.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* amd64 arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="cpu_flags_x86_sse2"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch() {
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm() {
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os() {
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple() {
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile() {
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="${PWD}"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	use arm && export GOARM=$(go_arm)
+	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install() {
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	einfo "due to the static linking nature of go."
+	einfo "If this is not done, the packages compiled with the older"
+	einfo "version of the compiler will not be updated until they are"
+	einfo "updated individually, which could mean they will have"
+	einfo "vulnerabilities."
+	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	einfo "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 344c09e844f0..b942a4dbcb65 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -5,5 +5,5 @@ DIST mujs-1.1.2.tar.xz 98340 BLAKE2B bbb290786c26fd604082eb123adc78a3b7d9387dafa
 DIST mujs-1.1.3.tar.xz 98332 BLAKE2B 4dc2c0e657d7dcbbd7f82765556e75e7992cdcaf15c7986bb76c0fb6c244057ba0771a2a59c246eaf7bb9ff080e8af6ade8ef9a95606dc8ebde99f7d73c245c1 SHA512 6a8d0650f1924b5889039ddd8529438226677c63f9317b980492fac4e8380385d5c33fe8a315f26ebd0f7ae94c6c3bc90fdb75a8e4a0df367e6e4e355692e890
 EBUILD mujs-1.1.0.ebuild 1365 BLAKE2B 4f940033e75d77ae741f68a915efef418cabc9f15ae3ecf4c388a0d2020cc7fbe8c003327653b3fdee4b8b7f591be929d19c77bf017f03811c037087130c4fb2 SHA512 cb79454936f47f9442ecaae261eeb1ad62635430ce416845cac82e14d24be7e7b86d07c2cccae0a83166f29e2e805d0458ef0ba98bb1d0da7f96bdc8027edfb1
 EBUILD mujs-1.1.2.ebuild 1901 BLAKE2B a0ae1459797b184ee970f8ea43a0609bf92e0c20c233a1272f3d44a03ba772e2cfd590430d1e8594243dc8003274060cc24b5230ee629c176bbec0f13f7a4a46 SHA512 d4ed6e3383b2b6cdd0556589c1c5ba7f8db60b42c30f9ba89db107bc8bf5afd119354eabe5e354c37a3f6b1bda53a04d391633323665adda0b0fbd599e5a5048
-EBUILD mujs-1.1.3.ebuild 1908 BLAKE2B a82ab3a14c96be2dc6bab9717a58355ca8668eebb7dcc237d05ab1b599a5a5768028d04ff0eb1bfb45430723ffbba1a1ed434d1441c3816b7420114541860814 SHA512 7dd96efaa1300d34516da9edbf3fd89a885c5f8bd507f711647767283c0ee51300afdd20ada2281ad4a10cc2d52dd9404dc3175dec375e985df199624e6f1471
+EBUILD mujs-1.1.3.ebuild 1901 BLAKE2B a0ae1459797b184ee970f8ea43a0609bf92e0c20c233a1272f3d44a03ba772e2cfd590430d1e8594243dc8003274060cc24b5230ee629c176bbec0f13f7a4a46 SHA512 d4ed6e3383b2b6cdd0556589c1c5ba7f8db60b42c30f9ba89db107bc8bf5afd119354eabe5e354c37a3f6b1bda53a04d391633323665adda0b0fbd599e5a5048
 MISC metadata.xml 547 BLAKE2B fcf818d9a103347b5b47f7b7c77654e84db6aa2a8dd12f169d58522cb47a455f02f0bf66fc85057a2a10916c4a24dcdca87a5f2e12c54d184ea8d5af1db65810 SHA512 e6bac32e74df77c2ded4e9a9e6200ab76e06217b9a236d6bf5f0df23a031eab2519f26e3d402ff106f9506a4dbe3baf66cae5f961f6d016e7c42fe83fc532799
diff --git a/dev-lang/mujs/mujs-1.1.3.ebuild b/dev-lang/mujs/mujs-1.1.3.ebuild
index bc0c2a8caca1..4f18b888b470 100644
--- a/dev-lang/mujs/mujs-1.1.3.ebuild
+++ b/dev-lang/mujs/mujs-1.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
 LICENSE="ISC"
 # subslot matches SONAME
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="sys-libs/readline:0="
 DEPEND="${RDEPEND}"
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index 5b04285ce23c..a43daad2ceb7 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -1,3 +1,3 @@
 DIST parrot-8.1.0.tar.gz 4700495 BLAKE2B a90cd3c43be2a6812eaf5a5881cfd97e7011b5b82234c5eaf61e54cba923544a2f2c649387afe55d4e710a1e92ff31b1d32454a230fda6005b40778598f1915e SHA512 f5c4ffeb22a8f4949081ba9d98e3129eb067f6f0ed139248ca1d521570ccbada5dfa69ca2e390868a00ed275780552a5cd06eb271ff14ff753bf8375b7c658c2
-EBUILD parrot-8.1.0-r3.ebuild 2493 BLAKE2B 2c4699627e852eb6b9eb19765cbc17abebc97340fe087aa1b2d63af90e684ce4e13e78bbcd5638d3e48d6314983edbb57c6ba6c1d28c2b034745bcd2dde594b2 SHA512 44636b8d381991e5c331da817f22aab5507305c7c3a91202fb11d52f29495d191d5ddb8311051e532674419da8c813f9b1ced9010d1fc6724026e31dad71ea42
+EBUILD parrot-8.1.0-r4.ebuild 2497 BLAKE2B bb0e7eacc42ec6f8c0eb8e4b5faff568f5c18aa73b5494b7606ca682ed81b2b7c49a7a7a821ec681cacaeb286904fa4853a25c8f4d6fad0750152e28182fc20c SHA512 8e389ae6adda374e0f60feb4eb7585a3e47f4e76d66b93303297b247be1d1854c1632083ae9f2c3bf082809e8b1950b6806ef70daf16084d8f497af987fa662e
 MISC metadata.xml 215 BLAKE2B 0147839ca51bcb1aed1f611c6a8c04aea7b280c6ca8857677d4ee111e14fac125e4b1878283502b65f58da42ea8e52febe6dd827a2bec28f1f24bafe562f1acd SHA512 595468e29b960c38b6144f0314eaa244039140156c1edff5dd904ecd0e3ea8bf58ce07d724704011cbbe44f26442d6ee19dec7b558fe3773ceb240f931be9f66
diff --git a/dev-lang/parrot/parrot-8.1.0-r3.ebuild b/dev-lang/parrot/parrot-8.1.0-r3.ebuild
deleted file mode 100644
index ad319217e9f1..000000000000
--- a/dev-lang/parrot/parrot-8.1.0-r3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-# weird failures
-RESTRICT="test"
-
-DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
-
-CDEPEND="sys-libs/readline:0=
-	dev-libs/libffi:=
-	net-libs/libnsl:0=
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4:0= )
-	ssl? ( dev-libs/openssl:0= )
-	pcre? ( dev-libs/libpcre )
-"
-RDEPEND="${CDEPEND}
-	doc? ( dev-perl/JSON )"
-DEPEND="${CDEPEND}"
-BDEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1
-	if use doc ; then
-		emake -j1 html
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	dosym parrot-ops2c /usr/bin/ops2c
-	rm -vfr "${ED}/usr/share/doc/${PF}/parrot" || die "Unable to prune excess docs"
-	DOCS=(
-		CREDITS
-		ChangeLog
-		DONORS.pod
-		PBC_COMPAT
-		PLATFORMS
-		README.pod
-		RESPONSIBLE_PARTIES
-		TODO
-	)
-	use doc && DOCS+=( editor )
-	use examples && DOCS+=( examples )
-	use doc && HTML_DOCS=(
-			docs/html/developer.html
-			docs/html/DONORS.pod.html
-			docs/html/index.html
-			docs/html/ops.html
-			docs/html/parrotbug.html
-			docs/html/pdds.html
-			docs/html/pmc.html
-			docs/html/tools.html
-			docs/html/docs
-			docs/html/src
-			docs/html/tools
-	)
-	einstalldocs
-}
diff --git a/dev-lang/parrot/parrot-8.1.0-r4.ebuild b/dev-lang/parrot/parrot-8.1.0-r4.ebuild
new file mode 100644
index 000000000000..1612f5348710
--- /dev/null
+++ b/dev-lang/parrot/parrot-8.1.0-r4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
+HOMEPAGE="http://www.parrot.org/"
+SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
+
+# weird failures
+RESTRICT="test"
+
+CDEPEND="sys-libs/readline:0=
+	dev-libs/libffi:=
+	net-libs/libnsl:0=
+	virtual/libcrypt:=
+	opengl? ( media-libs/freeglut )
+	nls? ( sys-devel/gettext )
+	unicode? ( >=dev-libs/icu-2.6:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3-r1:= )
+	gmp? ( >=dev-libs/gmp-4.1.4:0= )
+	ssl? ( dev-libs/openssl:0= )
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${CDEPEND}
+	doc? ( dev-perl/JSON )"
+DEPEND="${CDEPEND}"
+BDEPEND="dev-lang/perl[doc?]
+	${RDEPEND}"
+
+src_configure() {
+	myconf="--disable-rpath"
+	use unicode || myconf+=" --without-icu"
+	use ssl     || myconf+=" --without-crypto"
+	use gdbm    || myconf+=" --without-gdbm"
+	use nls     || myconf+=" --without-gettext"
+	use gmp     || myconf+=" --without-gmp"
+	use opengl  || myconf+=" --without-opengl"
+	use pcre    || myconf+=" --without-pcre"
+
+	perl Configure.pl \
+		--ccflags="${CFLAGS}" \
+		--linkflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--sysconfdir="${EPREFIX}"/etc \
+		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
+		$myconf || die
+}
+
+src_compile() {
+	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
+	# occasionally dies in parallel make
+	emake -j1
+	if use doc ; then
+		emake -j1 html
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	dosym parrot-ops2c /usr/bin/ops2c
+	rm -vfr "${ED}/usr/share/doc/${PF}/parrot" || die "Unable to prune excess docs"
+	DOCS=(
+		CREDITS
+		ChangeLog
+		DONORS.pod
+		PBC_COMPAT
+		PLATFORMS
+		README.pod
+		RESPONSIBLE_PARTIES
+		TODO
+	)
+	use doc && DOCS+=( editor )
+	use examples && DOCS+=( examples )
+	use doc && HTML_DOCS=(
+			docs/html/developer.html
+			docs/html/DONORS.pod.html
+			docs/html/index.html
+			docs/html/ops.html
+			docs/html/parrotbug.html
+			docs/html/pdds.html
+			docs/html/pmc.html
+			docs/html/tools.html
+			docs/html/docs
+			docs/html/src
+			docs/html/tools
+	)
+	einstalldocs
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 4e3e1e1df496..bb7263a99930 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -10,8 +10,8 @@ DIST php-7.4.19.tar.xz 10341424 BLAKE2B b5f549603a2d108d2d4c16dfb15c2088612e040e
 DIST php-7.4.21.tar.xz 10346628 BLAKE2B f758d6bef60f5e0c99bd097533d1663640362c2b752a3bd54389acc3bd7d173c1ba5d4b1c119b6ad50f5029aabe2349bb4646a33212dc3cf34fd294f24def401 SHA512 778ddbfe614fdc6a00bc82c61f4c636bdbe815ce3398415a29bd24a2fd4ca2113b3b804303585d8830242e04b0c202bbc7c725a46c9bad79b070a0e896e5e681
 DIST php-8.0.8.tar.xz 10674548 BLAKE2B d2446ae5b80e692106b89418864e4253e000741addb7526599ec8db96713f91a5ab3bccd5bbd2f536b16cc58afafdf22b19996d424dfdce3218a8083ee2bdf37 SHA512 1f8b94083b64705e24365af57169f8ff08115f31a7471238d9ed7a24b692e46c789f3fc00ff2bef2205243b9cd9c4736831e995a004afc7fc4127f3b74932428
 EBUILD php-7.3.28.ebuild 22673 BLAKE2B 6c64c471608b337f4ebd5d07a9cec58a38afdf3ca5b64d094e4e1a37040dc4f95331c1fb7bf8f3a8c5d3cf2b0f6b215b4b342fecb162c69bc29214cb250553bb SHA512 49b0d559c6999719ca732d9a40c9154806092083b7da2e5a11ab33718b638cb774de3a6af81949c408e99ba18a3720c4145022221921f3a7bd84572ac28c98c0
-EBUILD php-7.3.29.ebuild 22686 BLAKE2B 966d01cde10639b713957a0ff0976f5a66a0db5ea2b49a6dc9619f48f303a6ff45e2c7fba97f82c41d21b11a8c4cc88fb24f5258c7134c51a0bde9e51358f70d SHA512 24f40975212278e165477ec14047607b5bd6932fa0455b1e82c1666d9c33a4e0fa57ce3b537277f5e421f729e125da6dd7a943d07240dafac13d74f0cd4b1af9
+EBUILD php-7.3.29.ebuild 22684 BLAKE2B 01b33272a2dc23e573f4307c6beb33e7f9254cbed3853c09d61e012d004512bab2246391fa1b0ab59cca4eabefea915db28ebf49c145afd666a289c00d94cd67 SHA512 c7d30784876b88f8dff91e27899ed2f7e122a6adc5f723c74ca08ca4ab3771898fcb01cb6fa15108b715d38f7a2d2c1d7bf6f397569813df3523c284175634ab
 EBUILD php-7.4.19-r1.ebuild 21384 BLAKE2B f4a6d16ee301992c670ecb9e729a7cdb94cc012b5f825210be9a020bb12edd1ec05b9b3437575898f1825d91fdaa10e3164ae422e73fcbc60e0108e899c9cbaf SHA512 ac6f6956c8d253f2653f2b9f4e27940eae3af0f63c61175ec2a6ef7f87c95a4ecf51a77f6ad5a62eb161a2c7a6a697392f6bd75c9a0227653b910b867579a368
-EBUILD php-7.4.21-r1.ebuild 21397 BLAKE2B 4c1e46c57ff6347ca049763251fde77d9d105d41b61e1d436ab8b7fc7613b6918c3fb5523dedfe7cfd03493d995b75f85db4f72d98919f629f5236002a6705e3 SHA512 880db6017a1fc83bdafdfecac38424224cc8fdcd1261d8564b6ef5622cfb757f51705dd6e9bae585adc74d21260d9ddfc87d8bdab74a851dadb43cb9e56906f2
-EBUILD php-8.0.8-r1.ebuild 21340 BLAKE2B 9d00e868e00c51946e31edc11463c8f2a0837e4f04d2dfc7924c856be1d52f8a5e74c63d9108fe60822b95c5122f4365b4d766fc787d603d3638a3c92b24211b SHA512 b8d14730620acf71e8d8af1adb9f3aab156d58b94dcdd65810a0de82399d20d71f6abc1fb41beeae95d35156da85fceff3d78548ab22dafbf02e180eeb963bd5
-MISC metadata.xml 3268 BLAKE2B 4abc96d858186ab5bc6f0797fb3f1cf7f5aaa0b07a4652dcc16aa65e197bd73803f6bac717084c0c9a194e7da5b6632523105205011a0d39221aabc16ade8e2e SHA512 1413edb5293cb93ad8f94376f11b9952ca6369b667ae23baed56d9cbaa68cb9cfa5a80da7dd7184ba84f08d5a4054068da1c10daca81d1730e7b6edebba8b29f
+EBUILD php-7.4.21-r1.ebuild 21395 BLAKE2B 439c76eec889275c57f321c7b4f8c97fe79db63ac6795cd7ed4042dcf62ee01dc457d7b9ca97b59cfc5421fe4ffc7a6cd6652424aa296464624d6e623307f920 SHA512 6e3c43627b83f3b08d52ff9e534747d2a837ebf60dfb1b512c91a5a6b2167f9aaeb06caf43050f674d3cdba7999a24c3f24c560b617120542590335e6c82a84b
+EBUILD php-8.0.8-r2.ebuild 21420 BLAKE2B e34347417fcf4d27cba8f22b810bdb2adc397621d8977f24dae7e5f6d4e0a1ff618b51f5ff8bb1d2bcaa0598490202d921a6379b9cd0147d4a3d7cd0be9066a1 SHA512 de351dd668a70bfaab8871d1a92e3026227fa5cdda7a78529d7c8a0cfe25c8976fa0b7420f24bd17b69eb4bffd36453c9928125cfed22e37256f6a01e8d0dbf5
+MISC metadata.xml 3377 BLAKE2B c192a67082e05c42b046547d3a126fbbbebee6576ec9b892d9e5240a7ed7ed80830e10a6b35651db9a0b7276c56482cc472f563652077005b3aeaa60d3152b28 SHA512 105448eeb1939694a3bc535b98d644f4ef34cd92524c0a2c678ec795cef414689e071444020da673ea7592493d755747de1e03af5a48552a3aa87c871aa53495
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 7f13fad9d814..cd64929baa69 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -10,6 +10,7 @@
     <name>Michael Orlitzky</name>
   </maintainer>
   <use>
+    <flag name="apparmor">Support FPM application confinement through <pkg>sys-libs/libapparmor</pkg></flag>
     <flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag>
     <flag name="bcmath">Add support for libbcmath</flag>
     <flag name="cli">Enable CLI SAPI</flag>
diff --git a/dev-lang/php/php-7.3.29.ebuild b/dev-lang/php/php-7.3.29.ebuild
index 3130eec7a864..e903f2dfd696 100644
--- a/dev-lang/php/php-7.3.29.ebuild
+++ b/dev-lang/php/php-7.3.29.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-7.4.21-r1.ebuild b/dev-lang/php/php-7.4.21-r1.ebuild
index 8a65e5a674d7..e7a978ee081e 100644
--- a/dev-lang/php/php-7.4.21-r1.ebuild
+++ b/dev-lang/php/php-7.4.21-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-8.0.8-r1.ebuild b/dev-lang/php/php-8.0.8-r1.ebuild
deleted file mode 100644
index c0414dd262a5..000000000000
--- a/dev-lang/php/php-8.0.8-r1.ebuild
+++ /dev/null
@@ -1,748 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/rc}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.1:0= )
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-	"${FILESDIR}/php80-firebird-warnings.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.0.8-r2.ebuild b/dev-lang/php/php-8.0.8-r2.ebuild
new file mode 100644
index 000000000000..b602cca13124
--- /dev/null
+++ b/dev-lang/php/php-8.0.8-r2.ebuild
@@ -0,0 +1,749 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/rc}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.1:0= )
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php80-firebird-warnings.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 479d30ffc060..4b4318ce579c 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -38,7 +38,7 @@ DIST python-gentoo-patches-3.8.11.tar.xz 16932 BLAKE2B aaa1df33997f4077916fb7cca
 DIST python-gentoo-patches-3.9.5_p2.tar.xz 14728 BLAKE2B b6b0a0c316d99e8282bdbb5e62a90f84880ff89b0b1e236a5bce37fbdd3c3b187f7964873882dbcbc8c9765af107377240e8aac544987452830f0069aff471c0 SHA512 42e4dd48f4b93bd45a70093b447b4862ab286c1b5adc32d22a3e3d08e67db13bfa829bdbcf989fac9b7c8634a4735cfb4a7b16bfc40bdff0c11bc5a768bbeaf8
 DIST python-gentoo-patches-3.9.6.tar.xz 12432 BLAKE2B f63f39b4667eeb214312aa22142c728a1123e88f49c6de09d15e88434e9d630c5e0e588112d77c5cf1f5f25d0224e4fbf0c370488a908e9015f168d9f85e9eb5 SHA512 3e842fcd8574a7f026e401d725febb2815b2b7ac0a89b952a340c7974b911e81286b542d3de56fe5750296f2ab680415b54b8c35f219975af10354cddb1f257a
 EBUILD python-2.7.18_p10.ebuild 10278 BLAKE2B 94e34d8079101d6cab673cb4e0e36a67ce9e007eb6b7577f5d3f60b69bb609ea864a90b68cc07035d22ee44c7f57d3197c712a00c8b276ec703c140225b621c4 SHA512 8ca80a5ead91ef4cb3d91114e558eacc0bc6ac8ae8e7e1f8f3f89f702c4e681f154b3157e174d229c436b983b4c5cb325af8774ecf4c0e9243bb075d04e5f8a7
-EBUILD python-2.7.18_p11.ebuild 10243 BLAKE2B 837d896b6443c4456ae9b119dfeecf42225942e227443b0480cfa96c9433f207bc955679f7456df72a4f21b7a3e456735fbf7548d062e6f48cd8da544c472e52 SHA512 3ba5e44c87c4c39fc3cfd4890c3cfafa48e5121508ee9990ae0496da07b1607b7251f4cbc7df9b2960881b163fd3a6e250f382d8e84523adab563e37d97a62c8
+EBUILD python-2.7.18_p11.ebuild 10241 BLAKE2B a86ed6151546258142c7f16b9bce29c70d661fbdacd0b06012fa13857312950bada51d146799771b9cc3d21e063341d797ef15546668c945e02ca7e0d644f2bf SHA512 a3d3be9c103d21881b73f7594c7df299d9f7d079a6a38f4c25561a06c3821df2534370dd759450a0cb7e8fedd3e074c0e4afe446687bdac720233f4354570dcf
 EBUILD python-3.10.0_beta2.ebuild 10053 BLAKE2B f679214bcdba0a97939f2cac352bba88a8e82a82bcea379235ed770c7c1bd295ab0938690d9c822a8057a95d33ce5dba26ccb07bc5bd50dc1af2f567b400a816 SHA512 5fc6619cba4e79c9aaf28ec94634fb882075a08f0d33d8db2c9750717b63ad059517a1a25c58f4653f600c2f3d341c415f974045068dc9a516a068bf18a6aa50
 EBUILD python-3.10.0_beta3.ebuild 10016 BLAKE2B 04656f91662d38a3fe5b013ca103edd0eb81f18699df26380be118bba156e4b0875db393d73fc859248fc0963e432d1bc199e88d6135a891c8dbe14d0d0dcb36 SHA512 ba7426dbeaf91aad83da716b93c56a079f363fed1d0616e0a875f2ec4b69f60f44206125ec32de6d2e8e0f9daf8e1a98e887d31ae21739533822895f96d27861
 EBUILD python-3.10.0_beta4.ebuild 10016 BLAKE2B 04656f91662d38a3fe5b013ca103edd0eb81f18699df26380be118bba156e4b0875db393d73fc859248fc0963e432d1bc199e88d6135a891c8dbe14d0d0dcb36 SHA512 ba7426dbeaf91aad83da716b93c56a079f363fed1d0616e0a875f2ec4b69f60f44206125ec32de6d2e8e0f9daf8e1a98e887d31ae21739533822895f96d27861
diff --git a/dev-lang/python/python-2.7.18_p11.ebuild b/dev-lang/python/python-2.7.18_p11.ebuild
index 23252937c1a0..f474e3ffc3cd 100644
--- a/dev-lang/python/python-2.7.18_p11.ebuild
+++ b/dev-lang/python/python-2.7.18_p11.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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="berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/regina-rexx/Manifest b/dev-lang/regina-rexx/Manifest
index f8e62866f293..4300271a29a1 100644
--- a/dev-lang/regina-rexx/Manifest
+++ b/dev-lang/regina-rexx/Manifest
@@ -1,5 +1,5 @@
 AUX regina-rexx-3.9.1-makefile.patch 7808 BLAKE2B ebd6fb3dc0abd5574144cf967abf1be59505018bfc168d7d7e041b1182d13020e3c74203a7227f3029f2a19bc6c530d777d93955272b591b3c6bb3ec40644673 SHA512 51ae3d232419a605c8accdae401ed52b539acb6f64ef2830a06e2a9f25bbf68b63a2e0ecf40b9585df1c3df256bd855dd23ec13f6b31519d39ecde568e23a7a1
 AUX rxstack-r1 268 BLAKE2B 1bec862218eb0ef5087d5859f53adacf6fa22f3fc4b05a04ae89a861f32f800261e07620e1bab97a1aa7548f1232aad86367fc69c1696cd126edc4168064eb2b SHA512 823cc12df4986919b3177590b9da73c76474012361ff41eb93a04376df2efb3445b27da8931b9fdc5d960f5231a34ddaa7724d35d139eb2a1e340b025dfc460c
 DIST Regina-REXX-3.9.1.tar.gz 1358458 BLAKE2B 48a46895fa2a98359f9dc58e8f22cdedd8429459c4ca1680abc6b556d2da19731265666e6259a02d6886167c58273a39e0b7509d5dae31d5b8359ac6a69daaae SHA512 679d146d68598ccca28c4e66a12ab898d5bfb77e2e5d64ce5ffc9159b982dcda419815a83b05e5dfbe3acea84f8f59955726a6466defefe1ac24646c46609677
-EBUILD regina-rexx-3.9.1-r1.ebuild 841 BLAKE2B ea6593534c58e2f92d358ea1840abea1d250c279d4e567c1da97b7dad1d9a0736e66e72a3441cea38f4a155297c740132b64f705eea8fc1e3cfd4110cbef9189 SHA512 0539e2a60efe1ea95ccf4b0a465d2267cf883b7f34bc57b262d14b2c1b4dc1394864c14777c12e5d1a6833f83c3a529f806c8799f02fa69a83ad3b7b01921736
+EBUILD regina-rexx-3.9.1-r2.ebuild 890 BLAKE2B 072678be1438378fbbbdaa8f1d00964f790c653b8db24bf32f333a92a60821fe42aa44728a006341c515e62a9f1a2904a4caf66873b93cf60efea8be6fb472a2 SHA512 3fc174a81352a1953cac7cb2dd4756ed167025ac5db0d97fda70aebe59ea78fc46a7f8db0254964dd09f942ee2f08b5feba72831eb44021cafd5b32f9c4d1248
 MISC metadata.xml 621 BLAKE2B 1c2633a537f57bfad970ed33efc01f061466627bf3e3b3136c48c6f4c396a7e5367ba9b7bcab05a5eb5407b89bd5e3484435d250932ec7b3eba0c4d3911f9bff SHA512 a6d00129b209db3dde49a5807fcacf252e381d084d44233240c0d65105d19519943c24220daaa2aa423f63fbc7ecd438ddb359c4a77e261086b8a9bc388c1305
diff --git a/dev-lang/regina-rexx/regina-rexx-3.9.1-r1.ebuild b/dev-lang/regina-rexx/regina-rexx-3.9.1-r1.ebuild
deleted file mode 100644
index bc100fa59cf2..000000000000
--- a/dev-lang/regina-rexx/regina-rexx-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Portable Rexx interpreter"
-HOMEPAGE="https://regina-rexx.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/Regina-REXX-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-S="${WORKDIR}/Regina-REXX-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.9.1-makefile.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoconf
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	DOCS=( BUGS HACKERS.txt README.Unix README_SAFE TODO )
-	einstalldocs
-
-	newinitd "${FILESDIR}"/rxstack-r1 rxstack
-}
-
-pkg_postinst() {
-	elog "You may want to run"
-	elog
-	elog "\trc-update add rxstack default"
-	elog
-	elog "to enable Rexx queues (optional)."
-}
diff --git a/dev-lang/regina-rexx/regina-rexx-3.9.1-r2.ebuild b/dev-lang/regina-rexx/regina-rexx-3.9.1-r2.ebuild
new file mode 100644
index 000000000000..b09080ce292b
--- /dev/null
+++ b/dev-lang/regina-rexx/regina-rexx-3.9.1-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Portable Rexx interpreter"
+HOMEPAGE="https://regina-rexx.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/Regina-REXX-${PV}.tar.gz"
+S="${WORKDIR}/Regina-REXX-${PV}"
+
+LICENSE="LGPL-2.1 MPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="virtual/libcrypt:="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.9.1-makefile.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoconf
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	DOCS=( BUGS HACKERS.txt README.Unix README_SAFE TODO )
+	einstalldocs
+
+	newinitd "${FILESDIR}"/rxstack-r1 rxstack
+}
+
+pkg_postinst() {
+	elog "You may want to run"
+	elog
+	elog "\trc-update add rxstack default"
+	elog
+	elog "to enable Rexx queues (optional)."
+}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index efc17a90b6f3..9535c8ec2dcc 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -29,13 +29,10 @@ DIST ruby-3.0.0.tar.xz 14374176 BLAKE2B 9e7520e0b1ae6644285449c4ae92983d306772b3
 DIST ruby-3.0.1.tar.xz 14486780 BLAKE2B 60872c457f5bcb58e1bb1792ca13ae21c7cc30d22ae9bd072b3f6d6b83f41e535d905d19fd1aaf7a377801a5b610930bd1727219ab3c1461ee3d1ec7d041c2b6 SHA512 97d2e883656060846b304368d9d836e2f3ef39859c36171c9398a0573818e4ed75bfd7460f901a9553f7f53518c505327a66e74f83704a881469f5ac61fe13d7
 DIST ruby-3.0.2.tar.xz 14746080 BLAKE2B 47c5591261fb63b1ec3ca719ea6b0c348937456c3711351c1f5317d1e6a748de197e90c8bd4ff822f7b2d4580ad7ed0b54b9eb7aaa5166ea1a15ab2deae96439 SHA512 0f702e2d8ca1342a9d4284dbdd234a3588e057b92566353aa7c21835cf09a3932864b2acf459a976960a1704e9befa562155d36b98b7cda8bd99526e10a374c4
 EBUILD ruby-2.5.8-r2.ebuild 6154 BLAKE2B 1db3898b01e7af02e42c7c638046ec52f5cecb3acab8f638135b86db73a41f400766fb5cd2b7c99b5ac626d058739eb6f337c21b5e8f6bcfc5bc40a6189b8c2e SHA512 d284b48493f5915304ba42a4a91664bc247ba4c187d1ce7c54d6e163c6b8d65af7ec6d7b6086c949ee9545df0f0070353e59e4608900e1736a8d2ce65f943453
-EBUILD ruby-2.5.8-r3.ebuild 7037 BLAKE2B 7064f9de4c898589c0ad2cd3a753ad5559bf421d473181e535e227f7bf603ef99a30f229db34b5d77fb859253e7d71ff73f56f2fc600bf67ebf7d3a49432ed8b SHA512 02e150a9b65c81f377e8d6ee8f2082aa0617f4f0550393068ade5af977902b8cfd09678f92a06f30512c3d299092056f980e539203ced2a8788c6834f4a3f8dd
 EBUILD ruby-2.5.9-r1.ebuild 7030 BLAKE2B 3ccf395a5f5bf5a4c84c45ad5ac1e86201c471776207f0f03e05508bf0c8cb75c700c3ea9570f86b9af2c0c0936503d0d56127083b54533969b1a226574bda07 SHA512 4ebf5e39da37cc48e318ba70237336a1abf98ce209168e334d2dfce0b03e171f427dd1d285ec1d4da72cace005914f0111e1407f2a5c794e4305b8456eefe269
 EBUILD ruby-2.6.6-r4.ebuild 7447 BLAKE2B a9fea6aa6b0ec34c24fbafbbb822d439c31a322363feea029d3b158dbfe1b538f48e63883ff12003f292f2becbf8a7ea3f7fe38b55bb9d5b5cff5a39c16ff96d SHA512 bea1f6a4d148de144c581472e65df46e536dbbed1ae6864fb66a1f868d0b3379ce58e13f9784c13f068e9ea26cef83ee2a10a5e16ef430100d32597460a3e018
-EBUILD ruby-2.6.6-r5.ebuild 7543 BLAKE2B ca25d241c4c374fbc52d779f6184fa1adc299898358dcbd0d6134c077656adfe230eca285bbe6160d7a83ed9710f9a760d768e0d991b2371f69f9ae8922117c1 SHA512 4193aaefa02896a9b75163de6ef0ba3b796e34026635f35310457fed04e2f19b2aa8d5789760f4faca8657801954408b5dca03a796f4f7d62d5a6409f66f442a
-EBUILD ruby-2.6.7-r1.ebuild 7543 BLAKE2B ca25d241c4c374fbc52d779f6184fa1adc299898358dcbd0d6134c077656adfe230eca285bbe6160d7a83ed9710f9a760d768e0d991b2371f69f9ae8922117c1 SHA512 4193aaefa02896a9b75163de6ef0ba3b796e34026635f35310457fed04e2f19b2aa8d5789760f4faca8657801954408b5dca03a796f4f7d62d5a6409f66f442a
-EBUILD ruby-2.6.7-r2.ebuild 7475 BLAKE2B 1e1604c4df33b5a2d2d43364fc03989c0f0d8af2e61a7054bf7dc61061ba04c9e332edc32813f180280b73c50b1a20bdbfb6521c8e14b3ecd62fc8ce66fda578 SHA512 5de16a696427c92f207aa41816e3d6dea520e0df1cd63fc89fa173a8a503e327a9f8225733be493507306fa2b532795466798de7237c953da961d86372c2f470
-EBUILD ruby-2.6.8.ebuild 7477 BLAKE2B fd2f0b536c65606476d14f9b98a1e068c49fdcc542ae1e0dfb0fd4b3461988fbf727350d969964d9495fa7237368b966772045d66241b7d4e25b6f9cfa788312 SHA512 c3fd977ae7e399acae4ac8a80ff72f9b0493bf23bd3d5fdff3edc179199fcb66ebdfac54aed99ee0dffe34424688af8d914a6d3e496e051938473bddbddc6beb
+EBUILD ruby-2.6.7-r2.ebuild 7474 BLAKE2B db4f92898a7107eb9551860ab95536f523819a01bbfe7cb030637587d6e61983bd368dab4681f1e0ea473392bc1ba891b20e4d836e00af344a17153252c6306c SHA512 3f34d94280f7b0ce64315cfd5ac8d358cdbaf4a24b48cc27b5e4370b32f528ca4777d67c78db68758f365830bc5bf9790046a9e10e2671c275e59e6c62140163
+EBUILD ruby-2.6.8.ebuild 7475 BLAKE2B 7ca950960a0e56c348efb73d699abbda86818307154d9a6ad327ec7a66ea943290d755802af33cc02689c2899aeadc340636f6b26803b99989e938e47bfee70c SHA512 d4112393202753ee66259299f5ff0ead219b44a7e9396d2ba2288f54f80b9ceb543d01c45e3d44f0b212040803189d2f848f086da8cf259dd56aab1a3e7eadc0
 EBUILD ruby-2.7.2-r2.ebuild 7618 BLAKE2B 9f25ba7aabf169bf8dde5c684f234f449ebc6578ed74375d0af9c9f77a889ffbfe4f6814783d3bc23b609de47284dae51a71dd6ea27d307a757e1872dee5855c SHA512 6acdd0f0ab17a947b82f82b9ada872bd1dc7059369e227c766887d57a2a1d89611f33c904f2d9c8104e2de11457900cbe7d7330f50457ffe217c88c7187b76bf
 EBUILD ruby-2.7.2-r3.ebuild 7739 BLAKE2B 20eddedbf10c3eef2f6a284bdabc25d8e14935b03983c2bc74d2bda7a49ff24fd48914e99ba7f3c09d448d676390b0cf14da133c0d529796dfe2c5e09de29ac5 SHA512 08494d03019f3e3993c0a087e7a59a3393089d7cdda1b433fff6a23cae1c9c63108fc801cdb7ebeb1228a603d0f05b5fe5ed5e46f2410094beb597ff2ef522c9
 EBUILD ruby-2.7.3-r3.ebuild 7739 BLAKE2B 20eddedbf10c3eef2f6a284bdabc25d8e14935b03983c2bc74d2bda7a49ff24fd48914e99ba7f3c09d448d676390b0cf14da133c0d529796dfe2c5e09de29ac5 SHA512 08494d03019f3e3993c0a087e7a59a3393089d7cdda1b433fff6a23cae1c9c63108fc801cdb7ebeb1228a603d0f05b5fe5ed5e46f2410094beb597ff2ef522c9
diff --git a/dev-lang/ruby/ruby-2.5.8-r3.ebuild b/dev-lang/ruby/ruby-2.5.8-r3.ebuild
deleted file mode 100644
index 750b9e0ddb39..000000000000
--- a/dev-lang/ruby/ruby-2.5.8-r3.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-util/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20171225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
-	>=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
-	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
-	>=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
-	>=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
-	>=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
-	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby25]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby25]
-	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby25] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${SLOT}/{001,002,005,011}*.patch
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	if use prefix ; then
-		# Fix hardcoded SHELL var in mkmf library
-		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
-
-		if [[ ${CHOST} == *darwin* ]] ; then
-			# avoid symlink loop on Darwin (?!)
-			sed -i \
-				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
-				configure.ac || die
-
-			# make ar/libtool hack for Darwin work
-			sed -i \
-				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
-				configure.ac || die
-		fi
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}"
-}
-
-src_test() {
-	emake -j1 V=1 test
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
-		export DYLD_LIBRARY_PATH
-	fi
-
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		dodoc -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README*
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.6.6-r5.ebuild b/dev-lang/ruby/ruby-2.6.6-r5.ebuild
deleted file mode 100644
index 14fd240b2ddc..000000000000
--- a/dev-lang/ruby/ruby-2.6.6-r5.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-util/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20181225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26]
-	>=dev-ruby/minitest-5.11.3[ruby_targets_ruby26]
-	>=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26]
-	>=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26]
-	>=dev-ruby/rake-12.3.2[ruby_targets_ruby26]
-	>=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26]
-	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby26]
-	>=dev-ruby/bundler-1.17.2[ruby_targets_ruby26]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby26]
-	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	# 005 does not compile bigdecimal and is questionable because it
-	# compiles ruby in a non-standard way, may be dropped
-	eapply "${FILESDIR}"/2.6/{002,010}*.patch
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	if use prefix ; then
-		# Fix hardcoded SHELL var in mkmf library
-		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
-
-		if [[ ${CHOST} == *darwin* ]] ; then
-			# avoid symlink loop on Darwin (?!)
-			sed -i \
-				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
-				configure.ac || die
-
-			# make ar/libtool hack for Darwin work
-			sed -i \
-				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
-				configure.ac || die
-		fi
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support ) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	emake -j1 V=1 test
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	einfo "Removing default gems before installation"
-	rm -rf .ext/common/json.rb .ext/common/json ext/json || die
-	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
-		export DYLD_LIBRARY_PATH
-	fi
-
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	# Create directory for the default gems
-	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
-	fi
-
-	if use examples; then
-		dodoc -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README*
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.6.7-r1.ebuild b/dev-lang/ruby/ruby-2.6.7-r1.ebuild
deleted file mode 100644
index 14fd240b2ddc..000000000000
--- a/dev-lang/ruby/ruby-2.6.7-r1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-util/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20181225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26]
-	>=dev-ruby/minitest-5.11.3[ruby_targets_ruby26]
-	>=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26]
-	>=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26]
-	>=dev-ruby/rake-12.3.2[ruby_targets_ruby26]
-	>=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26]
-	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby26]
-	>=dev-ruby/bundler-1.17.2[ruby_targets_ruby26]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby26]
-	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	# 005 does not compile bigdecimal and is questionable because it
-	# compiles ruby in a non-standard way, may be dropped
-	eapply "${FILESDIR}"/2.6/{002,010}*.patch
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	if use prefix ; then
-		# Fix hardcoded SHELL var in mkmf library
-		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
-
-		if [[ ${CHOST} == *darwin* ]] ; then
-			# avoid symlink loop on Darwin (?!)
-			sed -i \
-				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
-				configure.ac || die
-
-			# make ar/libtool hack for Darwin work
-			sed -i \
-				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
-				configure.ac || die
-		fi
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support ) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	emake -j1 V=1 test
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	einfo "Removing default gems before installation"
-	rm -rf .ext/common/json.rb .ext/common/json ext/json || die
-	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
-		export DYLD_LIBRARY_PATH
-	fi
-
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	# Create directory for the default gems
-	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
-	fi
-
-	if use examples; then
-		dodoc -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README*
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.6.7-r2.ebuild b/dev-lang/ruby/ruby-2.6.7-r2.ebuild
index 9c6d2e69f21f..65396110665e 100644
--- a/dev-lang/ruby/ruby-2.6.7-r2.ebuild
+++ b/dev-lang/ruby/ruby-2.6.7-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.6.8.ebuild b/dev-lang/ruby/ruby-2.6.8.ebuild
index 407cab269e1c..bc4af4326b6c 100644
--- a/dev-lang/ruby/ruby-2.6.8.ebuild
+++ b/dev-lang/ruby/ruby-2.6.8.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 191d241ae7fb..3bc4ad9a4e3c 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,5 +1,3 @@
-DIST scala-2.13.1.tgz 19685743 BLAKE2B aaff6db71023f539d08da521ab1ff505a626605d9c298472d0c2e98a9a13d6b8440e89cf5ff4a53b7b9bcc48cbc1e3b55cc253563f54f18c369e13fc8c00a6c2 SHA512 028aa237c471cada1501cd5764b3c384c3f50e9fc327cddd3fa7c79e9cc909d86bf84d5fc28103054600f879a60c546fc45a837cdca54964eb57ec77f9c1613e
 DIST scala-2.13.6.tgz 23407489 BLAKE2B b65db49968dcbce2f5586aafaa4cd437156050050f209cce4a7d5edc18dfca3ebb60d2a726b4a26902723f993b78a673909c1139eb67e8eea4f35a4842b33c70 SHA512 445267cd7c1ddb8ef94d2edeb36567318c66429c88fcb183840998dc204a10253df09c33eb4de2f87b68b1a8cd4f557910fa3f061d4316314653eb64e91c0188
-EBUILD scala-bin-2.13.1-r1.ebuild 1314 BLAKE2B faed8c9c4a4d0d480bb91f2568e80518c7f6cb0a99694a1375be3acd96803bc31b72a33acd78751a07754816de621d3f7733ad00462117a8ac09d2b9e6d8e7cb SHA512 a592eb08248a9c1bebf37ec835da2f6259031e81a3d059cfb3cc846be84d8ac1f8dd26b5419e58e5709379840d96d81d44751dfaa0d0c828b855249b0b525989
 EBUILD scala-bin-2.13.6.ebuild 1314 BLAKE2B d418046f5d32e02b1f8bec7e0913b36d0c693ac86461da968e1683fb3e003145295e1ac016cde1c420d823de1e030de95fa4b8bb57250be6f1f22f800014a587 SHA512 2b92c6fd821780847b98bd6f557b24bacbc3f598e859366391cf0c69efbae4af4f09b6cc5c44d3a54f749299f3451699075e040dadc643cf84758cd24858b78c
 MISC metadata.xml 317 BLAKE2B 47b0d918ff9d4f2287fc0c43a022b978a816aa0d96362cf449210cd6b13810ed1352dbe69c5bea8281cdd3f3d03f4dcf714589e414b27abd5cd8c648e3d64994 SHA512 506fab7ebaa9e1caf96f239d6d85978171b98282ebe22a4948f61df62ce05a4c22772d81159cec9a99dd9a127b602e7593615204142e295d88835f9385a64bc8
diff --git a/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild b/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
deleted file mode 100644
index 9469077928d2..000000000000
--- a/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-*}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/"
-SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	!dev-lang/scala"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	ebegin 'Cleaning .bat files'
-	rm -f bin/*.bat || die
-	eend $?
-
-	ebegin 'Patching SCALA_HOME variable in bin/ directory'
-	local f
-	for f in bin/*; do
-		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' "$f" || die
-	done
-	eend $?
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	ebegin 'Installing bin scripts'
-	dobin bin/*
-	eend $?
-
-	ebegin 'Installing jar files'
-
-	cd lib/ || die
-
-	# Unversion those libs.
-	java-pkg_newjar jline-*.jar jline.jar
-	java-pkg_newjar scalap-*.jar scalap.jar
-
-	# Install these the usual way.
-	java-pkg_dojar scala-compiler.jar
-	java-pkg_dojar scala-library.jar
-	java-pkg_dojar scala-reflect.jar
-
-	eend $?
-
-	cd ../ || die
-
-	ebegin 'Installing man pages'
-	doman man/man1/*.1
-	eend $?
-
-	if use doc; then
-		ebegin 'Installing documentation'
-		java-pkg_dohtml -r doc/tools
-		eend $?
-	fi
-}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 2e0da5a328d9..0dede7b5107a 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -9,8 +9,10 @@ DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551
 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
 DIST firefox-78.10.1esr.source.tar.xz 334444960 BLAKE2B 76f9bae7f9fddbf3ab14293d1ec9e51b173961d0d5e0e1ef98b65328294f520369b89fb300a91d9f502b93215a15c228925a469b7b14ec576c9a9be874a6561a SHA512 a22773d9b3f0dca253805257f358a906769d23f15115e3a8851024f701e27dee45f056f7d34ebf1fcde0a3f91ec299639c2a12556e938a232cdea9e59835fde1
 DIST firefox-78.11.0esr.source.tar.xz 333002576 BLAKE2B a8268886f86afb41b86d227f8a8f642674ea9c0a85365acb517c6997099dbddad9779efa772cce645da6443a78d6e94c89a750152386f8dff7bbbf31bf5df129 SHA512 d02fc2eda587155b1c54ca12a6c5cde220a29f41f154f1c9b71ae8f966d8cc9439201a5b241e03fc0795b74e2479f7aa5d6b69f70b7639432e5382f321f7a6f4
+DIST firefox-78.12.0esr.source.tar.xz 333737488 BLAKE2B 775a55511a48f4210807d2648833bca6f95d9f4cd48b5d0de8cf0bf2609590c1615fca7ff855ae3643a25466d131e15dc293e6a57aa05e1d91d2cf819b0b89ca SHA512 646eb803e0d0e541773e3111708c7eaa85e784e4bae6e4a77dcecdc617ee29e2e349c9ef16ae7e663311734dd7491aebd904359124dda62672dbc18bfb608f0a
 DIST firefox-78esr-patches-13.tar.xz 83664 BLAKE2B 92250d5bc3821ee1ff032236bd00e01a53e0af4f9e39696a634edb39f0a182bf5ff74b7fc0f107c9c53136c64485c398391e3a857c8b2b904115fd13d17e2a4f SHA512 96739811bea833a6a9cb09075dfe49c6fa7f613e8bd41e1d830d6ae6851ce8e2f5d27c87d0035b6f3a099340dfd7eebe6ecb930ff25079e76cea92a7610293ca
 DIST firefox-78esr-patches-14.tar.xz 82976 BLAKE2B 08cc3618c8069f4169b7647e7eb699153d558bb89f8a4f1ed74d5ccd339f77119cd8f253df011f0c2f255ad889b65e843171d7559f469788463ca7e9aa2e96aa SHA512 1611c6f9d2c7d586e7b53810c1cfdb2682f5d289b1b019b71694b1ab2d8bbdfe827a73cfaf59f7e4808c0b90409ca4fa57e27655d8cdf0c578ffdbad33659f26
+DIST firefox-78esr-patches-15.tar.xz 65604 BLAKE2B 86e421e555ffd5f7f201d0f1a1c446c649739c67cdf8dca536efa115e09d9c357ce1551b7270c77e8bfe7dd53e0f3e6386496283879cf5e0c59b3c864951ebb3 SHA512 b229e895f083a0404cda1da0d8ae937429d5975ac52ab20e8b15611d9c737381a1076ebfa8c8a127dacac0e12a2a905ffd579facde2d80c6facc911e5739e34b
 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
 DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 0920432b5140e78297a9bcbccb54268d75a223d5e75e4ff90b3b01aab4f7736b4a4e05c47b3a925ff0a74607a0abad3b6583c75d070ef5142009b20ebaf6e4bf SHA512 187b231b246a5ae09e55c0fef77866b316d75f38f4c2e066d5d4325d8da63433027020c929439cab46af3253ac63ab2f780223a8fd2c6ff535b3409bb6c4aa0f
 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
@@ -24,5 +26,6 @@ EBUILD spidermonkey-52.9.1_pre1-r2.ebuild 4594 BLAKE2B 88d593c0c0f2adf19c1ea3227
 EBUILD spidermonkey-60.5.2_p0-r4.ebuild 4241 BLAKE2B b9e67510482c6bcd0161bb86204212731e95dedd7b538c3e6188d64404f7e11148f726d4a29b1022dca3ab22100c922a5431b0e14235a4697f3574f028a28381 SHA512 4d8e9a9a1a7744c24fcf66355035dcb8771ba2f2643929eb142350124c15c3b78a82653441e074cbcb6d985852e8bdbd0389abeed42225a5093887048e40af71
 EBUILD spidermonkey-68.12.0.ebuild 7310 BLAKE2B 78473b652614a2cd4001c40ff981555358043d9cce58bedde8670e76b1c03d3aaa11da156fc17d20200a2e1e08075d88c6cfca57e5f41f5aed758e6d4a0199b1 SHA512 7a792dd7c6976a56f685eadfc4929ea26045ba4c464aac61b9dcb4e9545306e14e0a8abb3aecdea516611ab2bfbf9c7b0a0b273c89bf58b3d0a24f0ffcee43a6
 EBUILD spidermonkey-78.10.1.ebuild 13020 BLAKE2B 1df644878ca6ced6f09412392dcf44a09226e8d7d436c5ead8e94d332d931aa3dd734565ca2e4c670871cf04c755b3b271640db34bbbcfdeb334187adb0d9e6f SHA512 c95d1e675d3c7822b5df2373c45e5535ea6ab7b0141a855c9a3d593edd9544de4faf975dbdc9bab276b5cdef8d96a736781aa24ac84574414eb08f66d9fab059
-EBUILD spidermonkey-78.11.0.ebuild 13025 BLAKE2B 32cfa314c9095eb6b052fc636dc5d853a6e7a24e1aeeeb60f33432467777173185e305f2e413b77c117069fda280de328dd5f0b55a9c3af4158c46bca743a169 SHA512 1d35220d170538a2baa44018a2215b41604c3f1c298e4627d7c70097d6f13dd7e49ebd3d91bcb1d2380d041e8493e6624877ce500d875a585b12dd5650a30dae
+EBUILD spidermonkey-78.11.0.ebuild 13023 BLAKE2B 5c6ac236be68d84fa31d433f425f3298ca114abd206312da92098284478a4e8f40b8358b8298cd3e7f340fb3ce7cc6e7c5609da87a3f2b7f123b2c09a0ac0779 SHA512 7f55e7770c7e3e7bb6ebb7bccf432934e0cdd585b04ed7d0612ddf667eda0bed8c6102dc7d687c9afc5b44cb693c51989766e1c42523e6372471b0001b9719f1
+EBUILD spidermonkey-78.12.0.ebuild 13025 BLAKE2B 6f01d125931f1129e729bdff3d0b30a335aeda470e4d9aca4673b7dea0f6a60d8b7b5c91355a5c3e876c1b7c80be4564417686b2fa9c40c87f520cba596c530f SHA512 69d88341223373d771c38513369bf25d4b017824490d6151a7cb62354c52a80ebd00cfac01a74b60a661e96b167ec550a1dc20f56bb2c09a985abb2b83e71f84
 MISC metadata.xml 868 BLAKE2B ee529f60bc83af6c54188ab4db2a1e05cbc3fcebf7732580cb5e507afada8560cb8812d4f155ae94c2ec87724bdfafe7312de86b47a95f599655695836c9b806 SHA512 caf3c383cd8109391cbf81baf5e942630bfd84ca6bc2a78430e58e5b0a40428e08b8a3d7c9fadccebaf94fe1aa673df837246fc32d5932b7f60dd43431ee1575
diff --git a/dev-lang/spidermonkey/spidermonkey-78.11.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.11.0.ebuild
index e29ec205e856..0a3d1f9ef6ae 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.11.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.11.0.ebuild
@@ -60,7 +60,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
 HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 x86"
 
 SLOT="78"
 LICENSE="MPL-2.0"
diff --git a/dev-lang/spidermonkey/spidermonkey-78.12.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.12.0.ebuild
new file mode 100644
index 000000000000..e724b716fe1e
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-78.12.0.ebuild
@@ -0,0 +1,454 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# Patch version
+FIREFOX_PATCHSET="firefox-78esr-patches-15.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-04.tar.xz"
+
+LLVM_MAX_SLOT=12
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
+
+MY_MAJOR=$(ver_cut 1)
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="firefox"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}
+	https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 ~x86"
+
+SLOT="78"
+LICENSE="MPL-2.0"
+IUSE="clang cpu_flags_arm_neon debug +jit lto test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=virtual/rust-1.41.0
+	virtual/pkgconfig
+	|| (
+		(
+			sys-devel/llvm:12
+			clang? (
+				sys-devel/clang:12
+				lto? ( =sys-devel/lld-12* )
+			)
+		)
+		(
+			sys-devel/llvm:11
+			clang? (
+				sys-devel/clang:11
+				lto? ( =sys-devel/lld-11* )
+			)
+		)
+		(
+			sys-devel/llvm:10
+			clang? (
+				sys-devel/clang:10
+				lto? ( =sys-devel/lld-10* )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)"
+
+CDEPEND=">=dev-libs/icu-67.1:=
+	>=dev-libs/nspr-4.25
+	sys-libs/readline:0=
+	>=sys-libs/zlib-1.2.3"
+
+DEPEND="${CDEPEND}
+	test? (
+		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	)"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/firefox-${MY_PV}/js/src"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/llvm:${LLVM_SLOT}" ; then
+		einfo "sys-devel/llvm:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+			einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use lto ; then
+			if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+				einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+python_check_deps() {
+	if use test ; then
+		has_version "dev-python/six[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_pretend() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="7600M"
+	else
+		CHECKREQS_DISK_BUILD="6400M"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use test ; then
+			CHECKREQS_DISK_BUILD="7600M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			# temp fix for https://bugs.gentoo.org/768543
+			# we can assume that rust 1.{49,50}.0 always uses llvm 11
+			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
+			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
+			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
+
+			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
+				local version_llvm_rust="11"
+			else
+				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+			fi
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_prepare() {
+	pushd ../.. &>/dev/null || die
+
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+
+	eapply "${WORKDIR}"/firefox-patches
+	eapply "${WORKDIR}"/spidermonkey-patches
+
+	default
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	# use prefix shell in wrapper linker scripts, bug #789660
+	hprefixify "${S}"/../../build/cargo-{,host-}linker
+
+	einfo "Removing pre-built binaries ..."
+	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	MOZJS_BUILDDIR="${WORKDIR}/build"
+	mkdir "${MOZJS_BUILDDIR}" || die
+
+	popd &>/dev/null || die
+	eautoconf
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	cd "${MOZJS_BUILDDIR}" || die
+
+	# ../python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	local -a myeconfargs=(
+		--host="${CBUILD:-${CHOST}}"
+		--target="${CHOST}"
+		--disable-jemalloc
+		--disable-optimize
+		--disable-strip
+		--enable-readline
+		--enable-shared-js
+		--with-intl-api
+		--with-system-icu
+		--with-system-nspr
+		--with-system-zlib
+		--with-toolchain-prefix="${CHOST}-"
+		$(use_enable debug)
+		$(use_enable jit)
+		$(use_enable test tests)
+	)
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		myeconfargs+=( --enable-rust-simd )
+	fi
+
+	# Modifications to better support ARM, bug 717344
+	if use cpu_flags_arm_neon ; then
+		myeconfargs+=( --with-fpu=neon )
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			myeconfargs+=( --with-thumb=yes )
+			myeconfargs+=( --with-thumb-interwork=no )
+		fi
+	fi
+
+	# Tell build system that we want to use LTO
+	if use lto ; then
+		myeconfargs+=( --enable-lto )
+
+		if use clang ; then
+			myeconfargs+=( --enable-linker=lld )
+		else
+			myeconfargs+=( --enable-linker=gold )
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	if tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# Forcing system-icu allows us to skip patching bundled ICU for PPC
+	# and other minor arches
+	ECONF_SOURCE="${S}" \
+		econf \
+		${myeconfargs[@]} \
+		XARGS="${EPREFIX}/usr/bin/xargs"
+}
+
+src_compile() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+}
+
+src_test() {
+	if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
+		einfo "Smoke-test successful, continuing with full test suite"
+	else
+		die "Smoke-test failed: did interpreter initialization fail?"
+	fi
+
+	local -a KNOWN_TESTFAILURES
+	KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/Date/toLocaleString_timeZone.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/Date/toLocaleDateString_timeZone.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/format.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/format_timeZone.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/timeZone_backward_links.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/tz-environment-variable.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DisplayNames/language.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DisplayNames/region.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/Locale/likely-subtags.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/Locale/likely-subtags-generated.js )
+	KNOWN_TESTFAILURES+=( test262/intl402/Locale/prototype/minimize/removing-likely-subtags-first-adds-likely-subtags.js )
+
+	if use x86 ; then
+		KNOWN_TESTFAILURES+=( non262/Date/timeclip.js )
+		KNOWN_TESTFAILURES+=( test262/built-ins/Number/prototype/toPrecision/return-values.js )
+		KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.1.js )
+		KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.2.js )
+	fi
+
+	if [[ $(tc-endian) == "big" ]] ; then
+		KNOWN_TESTFAILURES+=( test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js )
+	fi
+
+	echo "" > "${T}"/known_failures.list || die
+
+	local KNOWN_TESTFAILURE
+	for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+		echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+	done
+
+	PYTHONPATH="${S}/tests/lib" \
+		${PYTHON} \
+		"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+		--exclude-file="${T}"/known_failures.list \
+		"${MOZJS_BUILDDIR}"/js/src/js \
+		|| die
+
+	if use jit ; then
+		KNOWN_TESTFAILURES=()
+
+		echo "" > "${T}"/known_failures.list || die
+
+		for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+			echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+		done
+
+		PYTHONPATH="${S}/tests/lib" \
+			${PYTHON} \
+			"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+			--exclude-file="${T}"/known_failures.list \
+			"${MOZJS_BUILDDIR}"/js/src/js basic \
+			|| die
+	fi
+}
+
+src_install() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+
+	# fix soname links
+	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
+	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
+	popd &>/dev/null || die
+
+	# remove unneeded files
+	rm \
+		"${ED}"/usr/bin/js${MY_MAJOR}-config \
+		"${ED}"/usr/$(get_libdir)/libjs_static.ajs \
+		|| die
+
+	# fix permissions
+	chmod -x \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
+		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
+		|| die
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 2f3c12ed146b..b60245182f4d 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -3,8 +3,8 @@ DIST swipl-8.2.3.tar.gz 10999577 BLAKE2B 57cfa9f6fb97f0136a35da1850c7ae8da123d1c
 DIST swipl-8.2.4.tar.gz 10998859 BLAKE2B b18f26102a685ff5c66aeaf0c14a08c532f9327f9f995cd46657a71b6779d021eb4f5651b2be77883197c7c5ee31c23259f46ed559aeeb0bb53ad10aea0081ed SHA512 cdbd23d4a0e9699ecc32bdcad9979e4042fb0f24de84010f6f097bc7148af38150b0e61e393c057b0dbae932d0fc1c02a41808bcbafd2c23e24fd73070bed470
 DIST swipl-8.3.25.tar.gz 11186018 BLAKE2B a06befea48e065d516eeeb4ce2fa87342647d02ec509eaec208be143520af7d4de3217ac726720a36cdd15e1e263963cfc71bb2d7249ff55f9673e7e1bea5620 SHA512 4a06cd36ffbf22d8e582776c6181c8e848abe9bfca32e5e0e43d58e801c8b7c8e1d8556279716461df020530d0ea44cdcfe9390e8387b2a8e8936adf8c3f9774
 DIST swipl-8.3.26.tar.gz 11202495 BLAKE2B 5d0dcd7a77592ffa86c67f386708330c0b9efc855a084178613990b93308a4e8e9d8d0617a44ae8f8fca050afb6181158269eea0d5943458790d481b4cb544ce SHA512 bdae2a66200517f3452eaf97efcb21d223bfbcc3868d2defc7474272e2b947e3c3035f2b8e5a8ee192271849a4075752a1b8b9c7460e941290111cec85e4df29
-EBUILD swi-prolog-8.2.3-r1.ebuild 2638 BLAKE2B 9d46f34c3d035c75ce7ecc09600ece9766705305d7fe23760df165e507fc607059e1bd615319640ede894b9ccf285e461e1e94b78197730a4e0550671f9b1840 SHA512 0eaf416fd71c4ef82978c41c5363cc81a3cbeebb50f4115b5e64514fb82dd4fcfa9cadd11cf630eb33ef34b9ae128b721c9364d2f50bc5883a463ec380cd5e17
-EBUILD swi-prolog-8.2.4-r1.ebuild 2831 BLAKE2B abcef64cf914725a35ca4bfadf24030eb068e25ce477ff4227377c80334ca630c000ad0c06154fcea57fce8b68732529b1f1bc222d929c4a4087e7c19623c864 SHA512 c5c30a95d7ac79ab6fd2a2832e0a46a511164dddfc1ad32d3fbbf7dad2596a01b1c12ae1855147b7e94aebc2b7facfd724b2fb10f89d2c2354fc251457f385b5
-EBUILD swi-prolog-8.3.25-r1.ebuild 2830 BLAKE2B 71485d97656afe1e2c3a07bdf18cbe999b83999d8a45b825c49d05df7b93e9e3cb1663715679fa6043f8d389e72ade7794784b622f4ffc0deba0cf1a2ce22238 SHA512 3fb525550656ac67f0b93aca01eb16b33e48f8c56deb766cad1ca06a6a43fb2a7677a717401aca752b15e6c9a0a53351873f404cebc977ad36d454a944b0b502
-EBUILD swi-prolog-8.3.26.ebuild 2830 BLAKE2B 71485d97656afe1e2c3a07bdf18cbe999b83999d8a45b825c49d05df7b93e9e3cb1663715679fa6043f8d389e72ade7794784b622f4ffc0deba0cf1a2ce22238 SHA512 3fb525550656ac67f0b93aca01eb16b33e48f8c56deb766cad1ca06a6a43fb2a7677a717401aca752b15e6c9a0a53351873f404cebc977ad36d454a944b0b502
+EBUILD swi-prolog-8.2.3-r2.ebuild 2661 BLAKE2B 34a523f318cf39453bb07e8f484958585180f77b5cec51ccbc5f1cc5f26016dfa01793e1cc98ddd26dea30e33bdfb8ee14380a7465080fcc4f2b9edefc9675e3 SHA512 554e2e2c587fd0b7de160f8789ecfa8459149c2fca221fb7c8df9bb789b91247ae22eade75fc52b614eba2548db2314a013676c4c0bc7883a2166db0e8028ca8
+EBUILD swi-prolog-8.2.4-r2.ebuild 2854 BLAKE2B 61ed52d692815431f8965aaccb426dab4af427794b7fcc8b9882d16c535386d834b3433a5e0694a9848d41f28f8e56dd27ba1b54da1341b32c141e008c479736 SHA512 a13d74f6e0e69f7a219fb03e18f7de143e52a7e9ed5fdbac8da6dc0e1058802b70491ecf6a81b335377421ac6ecee1cf6aa035579b659d12c5d4ce37e0ec8624
+EBUILD swi-prolog-8.3.25-r2.ebuild 2853 BLAKE2B ac2ef59af6d586e10fb5891e7f2869c9792d0e5007d74cfa56b703a6c7ed0574f0698d3d1f683778fba1285c1014e6bf114fa7b5792fcfedd1b272e13c167335 SHA512 838263f5c7767e6c06abca9824edd02db7554daeac9b2146bea2e76e11489eef56c7df5d314b20e4625b715a3f38167a32e058771441cba08527e475759761e8
+EBUILD swi-prolog-8.3.26-r1.ebuild 2853 BLAKE2B ac2ef59af6d586e10fb5891e7f2869c9792d0e5007d74cfa56b703a6c7ed0574f0698d3d1f683778fba1285c1014e6bf114fa7b5792fcfedd1b272e13c167335 SHA512 838263f5c7767e6c06abca9824edd02db7554daeac9b2146bea2e76e11489eef56c7df5d314b20e4625b715a3f38167a32e058771441cba08527e475759761e8
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.3-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.3-r1.ebuild
deleted file mode 100644
index 39819e8af952..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.2.3-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="https://www.swi-prolog.org/"
-SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/swi-prolog/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	sys-libs/zlib
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? ( dev-libs/openssl:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	uuid? ( dev-libs/ossp-uuid )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	)
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXinerama
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )
-	yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	sed -i -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" CMakeLists.txt || die
-	sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DO_DEBUG
-
-	mycmakeargs=(
-		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-		-DUSE_GMP=$(usex gmp)
-		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
-		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
-		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
-		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
-		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
-		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
-		-DSWIPL_PACKAGES_YAML=$(usex yaml)
-		-DSWIPL_PACKAGES_SSL=$(usex ssl)
-		-DSWIPL_PACKAGES_JAVA=$(usex java)
-		-DSWIPL_PACKAGES_QT=$(usex qt5)
-		-DSWIPL_PACKAGES_X=$(usex X)
-		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
-		)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	XDG_CONFIG_DIRS="${HOME}" \
-	XDG_DATA_DIRS="${HOME}" \
-		cmake_src_compile
-}
-
-src_test() {
-	USE_PUBLIC_NETWORK_TESTS=false \
-	USE_ODBC_TESTS=false \
-		cmake_src_test -V
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.3-r2.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.3-r2.ebuild
new file mode 100644
index 000000000000..a681b43d480d
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.3-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="versatile implementation of the Prolog programming language"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/swi-prolog/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
+	berkdb? ( >=sys-libs/db-4:= )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0= )
+	ssl? ( dev-libs/openssl:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	uuid? ( dev-libs/ossp-uuid )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	)
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXinerama
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )
+	yaml? ( dev-libs/libyaml )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+BUILD_DIR="${S}/build"
+CMAKE_USE_DIR="${S}"
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	sed -i -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" CMakeLists.txt || die
+	sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use debug && append-flags -DO_DEBUG
+
+	mycmakeargs=(
+		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
+		-DUSE_GMP=$(usex gmp)
+		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
+		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
+		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
+		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
+		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
+		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
+		-DSWIPL_PACKAGES_YAML=$(usex yaml)
+		-DSWIPL_PACKAGES_SSL=$(usex ssl)
+		-DSWIPL_PACKAGES_JAVA=$(usex java)
+		-DSWIPL_PACKAGES_QT=$(usex qt5)
+		-DSWIPL_PACKAGES_X=$(usex X)
+		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+		)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	XDG_CONFIG_DIRS="${HOME}" \
+	XDG_DATA_DIRS="${HOME}" \
+		cmake_src_compile
+}
+
+src_test() {
+	USE_PUBLIC_NETWORK_TESTS=false \
+	USE_ODBC_TESTS=false \
+		cmake_src_test -V
+}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.4-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.4-r1.ebuild
deleted file mode 100644
index 40ca2887121c..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.2.4-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils flag-o-matic
-
-PATCHSET_VER="0"
-
-DESCRIPTION="Versatile implementation of the Prolog programming language"
-HOMEPAGE="https://www.swi-prolog.org/"
-SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	sys-libs/zlib
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? ( dev-libs/openssl:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	uuid? ( dev-libs/ossp-uuid )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	)
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXinerama
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )
-	yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-
-	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
-		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
-		-i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DO_DEBUG
-
-	local mycmakeargs=(
-		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-		-DUSE_GMP=$(usex gmp)
-		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
-		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
-		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
-		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
-		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
-		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
-		-DSWIPL_PACKAGES_YAML=$(usex yaml)
-		-DSWIPL_PACKAGES_SSL=$(usex ssl)
-		-DSWIPL_PACKAGES_JAVA=$(usex java)
-		-DSWIPL_PACKAGES_QT=$(usex qt5)
-		-DSWIPL_PACKAGES_X=$(usex X)
-		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	XDG_CONFIG_DIRS="${HOME}" \
-	XDG_DATA_DIRS="${HOME}" \
-		cmake_src_compile
-}
-
-src_test() {
-	USE_PUBLIC_NETWORK_TESTS=false \
-	USE_ODBC_TESTS=false \
-		cmake_src_test -V
-}
-
-src_install() {
-	cmake_src_install
-
-	if use qt5; then
-		doicon "${S}"/snap/gui/swipl.png
-		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
-	fi
-}
-
-pkg_postinst() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.4-r2.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.4-r2.ebuild
new file mode 100644
index 000000000000..3b46e7558599
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.4-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils flag-o-matic
+
+PATCHSET_VER="0"
+
+DESCRIPTION="Versatile implementation of the Prolog programming language"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
+	berkdb? ( >=sys-libs/db-4:= )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0= )
+	ssl? ( dev-libs/openssl:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	uuid? ( dev-libs/ossp-uuid )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	)
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXinerama
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )
+	yaml? ( dev-libs/libyaml )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+
+	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
+		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use debug && append-flags -DO_DEBUG
+
+	local mycmakeargs=(
+		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
+		-DUSE_GMP=$(usex gmp)
+		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
+		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
+		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
+		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
+		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
+		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
+		-DSWIPL_PACKAGES_YAML=$(usex yaml)
+		-DSWIPL_PACKAGES_SSL=$(usex ssl)
+		-DSWIPL_PACKAGES_JAVA=$(usex java)
+		-DSWIPL_PACKAGES_QT=$(usex qt5)
+		-DSWIPL_PACKAGES_X=$(usex X)
+		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	XDG_CONFIG_DIRS="${HOME}" \
+	XDG_DATA_DIRS="${HOME}" \
+		cmake_src_compile
+}
+
+src_test() {
+	USE_PUBLIC_NETWORK_TESTS=false \
+	USE_ODBC_TESTS=false \
+		cmake_src_test -V
+}
+
+src_install() {
+	cmake_src_install
+
+	if use qt5; then
+		doicon "${S}"/snap/gui/swipl.png
+		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
+	fi
+}
+
+pkg_postinst() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.25-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.25-r1.ebuild
deleted file mode 100644
index cf72f0070592..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.3.25-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils flag-o-matic
-
-PATCHSET_VER="0"
-
-DESCRIPTION="Versatile implementation of the Prolog programming language"
-HOMEPAGE="https://www.swi-prolog.org/"
-SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	sys-libs/zlib
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? ( dev-libs/openssl:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	uuid? ( dev-libs/ossp-uuid )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	)
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXinerama
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )
-	yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-
-	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
-		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
-		-i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DO_DEBUG
-
-	local mycmakeargs=(
-		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-		-DUSE_GMP=$(usex gmp)
-		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
-		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
-		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
-		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
-		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
-		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
-		-DSWIPL_PACKAGES_YAML=$(usex yaml)
-		-DSWIPL_PACKAGES_SSL=$(usex ssl)
-		-DSWIPL_PACKAGES_JAVA=$(usex java)
-		-DSWIPL_PACKAGES_QT=$(usex qt5)
-		-DSWIPL_PACKAGES_X=$(usex X)
-		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	XDG_CONFIG_DIRS="${HOME}" \
-	XDG_DATA_DIRS="${HOME}" \
-		cmake_src_compile
-}
-
-src_test() {
-	USE_PUBLIC_NETWORK_TESTS=false \
-	USE_ODBC_TESTS=false \
-		cmake_src_test -V
-}
-
-src_install() {
-	cmake_src_install
-
-	if use qt5; then
-		doicon "${S}"/snap/gui/swipl.png
-		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
-	fi
-}
-
-pkg_postinst() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.25-r2.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.25-r2.ebuild
new file mode 100644
index 000000000000..3b4293326d30
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.25-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils flag-o-matic
+
+PATCHSET_VER="0"
+
+DESCRIPTION="Versatile implementation of the Prolog programming language"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
+	berkdb? ( >=sys-libs/db-4:= )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0= )
+	ssl? ( dev-libs/openssl:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	uuid? ( dev-libs/ossp-uuid )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	)
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXinerama
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )
+	yaml? ( dev-libs/libyaml )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+
+	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
+		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use debug && append-flags -DO_DEBUG
+
+	local mycmakeargs=(
+		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
+		-DUSE_GMP=$(usex gmp)
+		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
+		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
+		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
+		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
+		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
+		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
+		-DSWIPL_PACKAGES_YAML=$(usex yaml)
+		-DSWIPL_PACKAGES_SSL=$(usex ssl)
+		-DSWIPL_PACKAGES_JAVA=$(usex java)
+		-DSWIPL_PACKAGES_QT=$(usex qt5)
+		-DSWIPL_PACKAGES_X=$(usex X)
+		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	XDG_CONFIG_DIRS="${HOME}" \
+	XDG_DATA_DIRS="${HOME}" \
+		cmake_src_compile
+}
+
+src_test() {
+	USE_PUBLIC_NETWORK_TESTS=false \
+	USE_ODBC_TESTS=false \
+		cmake_src_test -V
+}
+
+src_install() {
+	cmake_src_install
+
+	if use qt5; then
+		doicon "${S}"/snap/gui/swipl.png
+		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
+	fi
+}
+
+pkg_postinst() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.26-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.26-r1.ebuild
new file mode 100644
index 000000000000..3b4293326d30
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.26-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils flag-o-matic
+
+PATCHSET_VER="0"
+
+DESCRIPTION="Versatile implementation of the Prolog programming language"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
+	berkdb? ( >=sys-libs/db-4:= )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0= )
+	ssl? ( dev-libs/openssl:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	uuid? ( dev-libs/ossp-uuid )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	)
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXinerama
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )
+	yaml? ( dev-libs/libyaml )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+
+	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
+		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use debug && append-flags -DO_DEBUG
+
+	local mycmakeargs=(
+		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
+		-DUSE_GMP=$(usex gmp)
+		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
+		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
+		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
+		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
+		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
+		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
+		-DSWIPL_PACKAGES_YAML=$(usex yaml)
+		-DSWIPL_PACKAGES_SSL=$(usex ssl)
+		-DSWIPL_PACKAGES_JAVA=$(usex java)
+		-DSWIPL_PACKAGES_QT=$(usex qt5)
+		-DSWIPL_PACKAGES_X=$(usex X)
+		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	XDG_CONFIG_DIRS="${HOME}" \
+	XDG_DATA_DIRS="${HOME}" \
+		cmake_src_compile
+}
+
+src_test() {
+	USE_PUBLIC_NETWORK_TESTS=false \
+	USE_ODBC_TESTS=false \
+		cmake_src_test -V
+}
+
+src_install() {
+	cmake_src_install
+
+	if use qt5; then
+		doicon "${S}"/snap/gui/swipl.png
+		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
+	fi
+}
+
+pkg_postinst() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.26.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.26.ebuild
deleted file mode 100644
index cf72f0070592..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.3.26.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils flag-o-matic
-
-PATCHSET_VER="0"
-
-DESCRIPTION="Versatile implementation of the Prolog programming language"
-HOMEPAGE="https://www.swi-prolog.org/"
-SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	sys-libs/zlib
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? ( dev-libs/openssl:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	uuid? ( dev-libs/ossp-uuid )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	)
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXinerama
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )
-	yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-
-	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
-		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
-		-i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DO_DEBUG
-
-	local mycmakeargs=(
-		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-		-DUSE_GMP=$(usex gmp)
-		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
-		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
-		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
-		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
-		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
-		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
-		-DSWIPL_PACKAGES_YAML=$(usex yaml)
-		-DSWIPL_PACKAGES_SSL=$(usex ssl)
-		-DSWIPL_PACKAGES_JAVA=$(usex java)
-		-DSWIPL_PACKAGES_QT=$(usex qt5)
-		-DSWIPL_PACKAGES_X=$(usex X)
-		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	XDG_CONFIG_DIRS="${HOME}" \
-	XDG_DATA_DIRS="${HOME}" \
-		cmake_src_compile
-}
-
-src_test() {
-	USE_PUBLIC_NETWORK_TESTS=false \
-	USE_ODBC_TESTS=false \
-		cmake_src_test -V
-}
-
-src_install() {
-	cmake_src_install
-
-	if use qt5; then
-		doicon "${S}"/snap/gui/swipl.png
-		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
-	fi
-}
-
-pkg_postinst() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/dev-libs/Ice/Ice-3.6.5-r1.ebuild b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
deleted file mode 100644
index 56dd843d69fd..000000000000
--- a/dev-libs/Ice/Ice-3.6.5-r1.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby26"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-4"
-
-# This variable does not belong to any eclass. It is solely used in this ebuild
-BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 )
-
-inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
-LICENSE="GPL-2"
-SLOT="0/36"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug doc examples +readline mono php python ruby test"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	dev-libs/openssl:0=
-	|| (
-		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
-	)
-	dev-cpp/libmcpp
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby26) )
-	mono? ( dev-lang/mono )"
-DEPEND="${RDEPEND}
-	readline? ( sys-libs/readline:0= )
-	test? (
-		${PYTHON_DEPS}
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)"
-
-# Maintainer notes:
-# TODO: java bindings
-
-S="${WORKDIR}/${P,}"
-PHP_EXT_S="${S}/php"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
-	"${FILESDIR}/${P}-db6.patch"
-	"${FILESDIR}/${P}-csharp.patch"
-)
-
-pkg_setup() {
-	# prevent ruby-ng.eclass from messing with pkg_setup
-	return
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-L\$\(libdir\)||' \
-		cpp/config/Make.rules || die
-
-	sed -i \
-		-e 's|-O2 ||g' \
-		-e 's|-Werror ||g' \
-		cpp/config/Make.rules.Linux || die
-
-	sed -i \
-		-e 's|install-common||' \
-		{cpp,csharp,php,python,ruby}/Makefile || die
-
-	sed -i \
-		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-		csharp/config/Make.rules.cs || die
-
-	# skip mono tests, bug #498484
-	sed -i \
-		-e '/SUBDIRS/s|\ test||' \
-		csharp/Makefile || die
-
-	# skip udp test due to multicast
-	# skip IceGrid/admin bug #649850
-	# skip IceSSL tests due to requirement of internet connection
-	# skip IceStorm/single bug #636834
-	# IceUtil/stacktrace and IceStorm/stress fail with USE=debug
-	# Glacier2/staticFiltering requires network access
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \
-		cpp/Makefile || die
-
-	# fails even on unicode locale
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
-		ruby/Makefile || die
-
-	# fix for x86 IceBox test
-	sed -i \
-		-e 's|"32"|""|' \
-		scripts/TestUtil.py || die
-}
-
-src_configure() {
-	suitable_db_version() {
-		local ver
-		for ver in "${BERKDB_SLOTS[@]}"; do
-			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-				echo "${ver}"
-				return 0
-			fi
-		done
-		die "No suitable BerkDB versions found, aborting"
-	}
-
-	MAKE_RULES=(
-		"prefix=\"${ED}/usr\""
-		"install_docdir=\"${ED}/usr/share/doc/${PF}\""
-		"install_configdir=\"${ED}/usr/share/${P}/config\""
-		"install_mandir=\"${ED}/usr/share/man/man1\""
-		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
-		"LP64=yes"
-		"new_dtags=yes"
-		"NOTEST=$(usex !test)"
-		"USE_READLINE=$(usex readline)"
-		"OPTIMIZE=$(usex !debug)"
-	)
-
-	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
-	sed -i \
-		-e "s|g++|$(tc-getCXX)|" \
-		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
-		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die
-
-	if use python; then
-		local S="${S}/python"
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		SITERUBY="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		SITERUBYARCH="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
-		MAKE_RULES_RUBY=(
-			"install_rubydir=\"${ED}/${SITERUBY}\""
-			"install_libdir=\"${ED}/${SITERUBYARCH}\""
-		)
-
-		# make it use ruby26 only
-		sed -i \
-			-e 's|RUBY = ruby|\026|' \
-			ruby/config/Make.rules || die
-		sed -i \
-			-e 's|env ruby|\026|' \
-			ruby/config/s2rb.rb || die
-		sed -i \
-			-e 's|env ruby|\026|' \
-			ruby/scripts/slice2rb || die
-		sed -i \
-			-e 's|output.write("ruby|\026|' \
-			scripts/TestUtil.py || die
-	fi
-
-	MAKE_RULES_MONO=(
-		"GACINSTALL=yes"
-		"GAC_ROOT=\"${ED}/usr/$(get_libdir)\""
-		"GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\""
-		"install_libdir=\"${ED}/usr/$(get_libdir)\""
-		"install_pkgconfigdir=\"${ED}/usr/$(get_libdir)/pkgconfig\""
-	)
-
-	if has_version ">dev-lang/mono-4"; then
-		MAKE_RULES_MONO+=("MCS=mcs")
-	fi
-
-	use test && python_setup
-}
-
-src_compile() {
-	# Do not remove this export or build will break!
-	tc-export CXX
-
-	emake -C cpp "${MAKE_RULES[@]}"
-
-	if use php; then
-		local i
-		for i in $(php_get_slots); do
-			mkdir -p "${WORKDIR}/${i}" || die
-			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-
-			pushd "${WORKDIR}/${i}" >/dev/null || die
-			ln -s "${S}/cpp" || die
-			ln -s "${S}/config" || die
-			ln -s "${S}/slice" || die
-			ln -s "${S}/Makefile" || die
-
-			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
-			popd >/dev/null || die
-		done
-	fi
-
-	if use python; then
-		building() {
-			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
-		}
-		local S="${S}/python"
-		python_foreach_impl building
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
-	fi
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp "${MAKE_RULES[@]}" test
-
-	# php tests require the extension loaded and are therefore skipped
-
-	if use python; then
-		testing() {
-			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				PYTHON="${EPYTHON}" \
-				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D}/$(python_get_sitedir)\"" test
-		}
-		local S="${S}/python"
-		python_foreach_impl testing
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
-	fi
-
-	if use mono; then
-		# skip mono tests, bug #498484
-		ewarn "Tests for C# are currently disabled."
-		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
-	fi
-}
-
-src_install() {
-	local DOCS=( CHANGELOG*.md README.md )
-	use doc && DOCS+=( "${DISTDIR}/${PN}-3.6.4.pdf" )
-	einstalldocs
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp "${MAKE_RULES[@]}" install
-
-	if use examples; then
-		docinto examples-cpp
-		dodoc cpp/config/*.cfg
-		docompress -x /usr/share/doc/${PF}/examples-cpp
-	fi
-
-	if use php; then
-		insinto "/usr/share/php/${PN}"
-
-		local i
-		while IFS="" read -d $'\0' -r i; do
-			doins "${i}"
-		done < <(find "${S}/php/lib/" -name '*.php' -print0)
-
-		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
-
-		local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
-		for i in *; do
-			mkdir -p "${ED}/usr/share/php/${i}" || die
-			"${ED}"/usr/bin/slice2php \
-				-I"${ED}/usr/share/${P}/slice/" --all \
-				--output-dir "${ED}/usr/share/php/${i}" \
-				--ice "${ED}/usr/share/${P}/slice/${i}"/*
-		done
-
-		for i in $(php_get_slots); do
-			php_init_slot_env "${i}"
-			insinto "${EXT_DIR}"
-			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r3_createinifiles
-
-		popd >/dev/null || die
-	fi
-
-	if use python; then
-		installation() {
-			mkdir -p "${D}/$(python_get_sitedir)" || die
-
-			emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D}/$(python_get_sitedir)\"" \
-				install
-			python_optimize
-		}
-		local S="${S}/python"
-		python_foreach_impl installation
-	fi
-
-	if use ruby; then
-		dodir "${SITERUBY}"
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
-	fi
-}
diff --git a/dev-libs/Ice/Ice-3.6.5-r2.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
new file mode 100644
index 000000000000..7a584459e1ec
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby26"
+
+PHP_EXT_NAME="IcePHP"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+PHP_EXT_OPTIONAL_USE=php
+
+USE_PHP="php7-4"
+
+# This variable does not belong to any eclass. It is solely used in this ebuild
+BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 )
+
+inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="https://zeroc.com/products/ice"
+SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
+LICENSE="GPL-2"
+SLOT="0/36"
+KEYWORDS="amd64 ~arm x86"
+IUSE="debug doc examples +readline mono php python ruby test"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/expat-2.0.1
+	>=app-arch/bzip2-1.0.5
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	|| (
+		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
+	)
+	dev-cpp/libmcpp
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( $(ruby_implementation_depend ruby26) )
+	mono? ( dev-lang/mono )"
+DEPEND="${RDEPEND}
+	readline? ( sys-libs/readline:0= )
+	test? (
+		${PYTHON_DEPS}
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
+
+# Maintainer notes:
+# TODO: java bindings
+
+S="${WORKDIR}/${P,}"
+PHP_EXT_S="${S}/php"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
+	"${FILESDIR}/${P}-db6.patch"
+	"${FILESDIR}/${P}-csharp.patch"
+)
+
+pkg_setup() {
+	# prevent ruby-ng.eclass from messing with pkg_setup
+	return
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-L\$\(libdir\)||' \
+		cpp/config/Make.rules || die
+
+	sed -i \
+		-e 's|-O2 ||g' \
+		-e 's|-Werror ||g' \
+		cpp/config/Make.rules.Linux || die
+
+	sed -i \
+		-e 's|install-common||' \
+		{cpp,csharp,php,python,ruby}/Makefile || die
+
+	sed -i \
+		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
+		csharp/config/Make.rules.cs || die
+
+	# skip mono tests, bug #498484
+	sed -i \
+		-e '/SUBDIRS/s|\ test||' \
+		csharp/Makefile || die
+
+	# skip udp test due to multicast
+	# skip IceGrid/admin bug #649850
+	# skip IceSSL tests due to requirement of internet connection
+	# skip IceStorm/single bug #636834
+	# IceUtil/stacktrace and IceStorm/stress fail with USE=debug
+	# Glacier2/staticFiltering requires network access
+	sed -i \
+		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \
+		cpp/Makefile || die
+
+	# fails even on unicode locale
+	sed -i \
+		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
+		ruby/Makefile || die
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/TestUtil.py || die
+}
+
+src_configure() {
+	suitable_db_version() {
+		local ver
+		for ver in "${BERKDB_SLOTS[@]}"; do
+			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
+				echo "${ver}"
+				return 0
+			fi
+		done
+		die "No suitable BerkDB versions found, aborting"
+	}
+
+	MAKE_RULES=(
+		"prefix=\"${ED}/usr\""
+		"install_docdir=\"${ED}/usr/share/doc/${PF}\""
+		"install_configdir=\"${ED}/usr/share/${P}/config\""
+		"install_mandir=\"${ED}/usr/share/man/man1\""
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"LP64=yes"
+		"new_dtags=yes"
+		"NOTEST=$(usex !test)"
+		"USE_READLINE=$(usex readline)"
+		"OPTIMIZE=$(usex !debug)"
+	)
+
+	local BERKDB_VERSION="$(suitable_db_version)"
+	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
+	sed -i \
+		-e "s|g++|$(tc-getCXX)|" \
+		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
+		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
+		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
+		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
+		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die
+
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		SITERUBY="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED}/${SITERUBY}\""
+			"install_libdir=\"${ED}/${SITERUBYARCH}\""
+		)
+
+		# make it use ruby26 only
+		sed -i \
+			-e 's|RUBY = ruby|\026|' \
+			ruby/config/Make.rules || die
+		sed -i \
+			-e 's|env ruby|\026|' \
+			ruby/config/s2rb.rb || die
+		sed -i \
+			-e 's|env ruby|\026|' \
+			ruby/scripts/slice2rb || die
+		sed -i \
+			-e 's|output.write("ruby|\026|' \
+			scripts/TestUtil.py || die
+	fi
+
+	MAKE_RULES_MONO=(
+		"GACINSTALL=yes"
+		"GAC_ROOT=\"${ED}/usr/$(get_libdir)\""
+		"GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\""
+		"install_libdir=\"${ED}/usr/$(get_libdir)\""
+		"install_pkgconfigdir=\"${ED}/usr/$(get_libdir)/pkgconfig\""
+	)
+
+	if has_version ">dev-lang/mono-4"; then
+		MAKE_RULES_MONO+=("MCS=mcs")
+	fi
+
+	use test && python_setup
+}
+
+src_compile() {
+	# Do not remove this export or build will break!
+	tc-export CXX
+
+	emake -C cpp "${MAKE_RULES[@]}"
+
+	if use php; then
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
+
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
+		done
+	fi
+
+	if use python; then
+		building() {
+			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
+		}
+		local S="${S}/python"
+		python_foreach_impl building
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
+	fi
+
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
+	fi
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
+
+	# php tests require the extension loaded and are therefore skipped
+
+	if use python; then
+		testing() {
+			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				PYTHON="${EPYTHON}" \
+				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D}/$(python_get_sitedir)\"" test
+		}
+		local S="${S}/python"
+		python_foreach_impl testing
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
+	fi
+
+	if use mono; then
+		# skip mono tests, bug #498484
+		ewarn "Tests for C# are currently disabled."
+		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
+	fi
+}
+
+src_install() {
+	local DOCS=( CHANGELOG*.md README.md )
+	use doc && DOCS+=( "${DISTDIR}/${PN}-3.6.4.pdf" )
+	einstalldocs
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp "${MAKE_RULES[@]}" install
+
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
+	fi
+
+	if use php; then
+		insinto "/usr/share/php/${PN}"
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
+
+		local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+		for i in *; do
+			mkdir -p "${ED}/usr/share/php/${i}" || die
+			"${ED}"/usr/bin/slice2php \
+				-I"${ED}/usr/share/${P}/slice/" --all \
+				--output-dir "${ED}/usr/share/php/${i}" \
+				--ice "${ED}/usr/share/${P}/slice/${i}"/*
+		done
+
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
+			insinto "${EXT_DIR}"
+			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+
+		popd >/dev/null || die
+	fi
+
+	if use python; then
+		installation() {
+			mkdir -p "${D}/$(python_get_sitedir)" || die
+
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D}/$(python_get_sitedir)\"" \
+				install
+			python_optimize
+		}
+		local S="${S}/python"
+		python_foreach_impl installation
+	fi
+
+	if use ruby; then
+		dodir "${SITERUBY}"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
+	fi
+
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
+	fi
+}
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index e7907221b189..f64f3093821d 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -3,5 +3,5 @@ AUX Ice-3.6.5-csharp.patch 1573 BLAKE2B 2e69e87179bd938bb34f1ae9826b09b935cb9a13
 AUX Ice-3.6.5-db6.patch 1664 BLAKE2B 9ef67c83612875c68dd8fb7cea025ce3fca1e4384335108aa423ca63b53c6c723d9f7f9fd8fdc6895f8aedee0826efc225d89e487f5c95c395a8cdb1b893826a SHA512 ba94bddf3f43688ca74e5fd42fbafd7d0b6f02f616dfa4b6aff69ef1089f4404618cf07871d265b0b07037ca02a27fc397767d845a7e0edc60baa37704a064f0
 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
 DIST Ice-3.6.5.tar.gz 5505499 BLAKE2B e16e8932f09270ac6bb86984ab47fa229ad873ee343ac4f56bb48b6f9547387ded0392a76302afac2c98b6d31da7c1faf294574cdba52654e7dea0af16b4169d SHA512 3431928e6168d716919aa9b3126d17a8ae14895bb78a369902a2bb350b2e82923f38ee17965ed3696512a016fcd34dc128e9aaca40fb2b032e7f7eb07bcb903b
-EBUILD Ice-3.6.5-r1.ebuild 8460 BLAKE2B 4449caeb6e00dc506f2ba9fb7329035adf38cb6f1320c37e81723465ae4b1157069b7587867dae095a5553f21cf896042b674723e5e58981661cbddbe69b03ab SHA512 23530dcb82ead69074ae03caab0ddadfea367b458230d358999195d2794c30be15427cad63b5d76e91b6872d99ac5354b3d4ef5c72bd3c25770d0f7cb4937c7c
+EBUILD Ice-3.6.5-r2.ebuild 8480 BLAKE2B fcf14091f13c1c1d9e560b0a458be74ef63b348636d5aab8c199f820d04b29470f3de5234d48deb0850e1eed25d02c78bc791d6fb03f41d5f58110b2e8c91d01 SHA512 288435a80afe3179ac4a45f1d7e6e399d98273f3b55739f9cb5036d010afca9b5fa30987631d579a8ca43e9d207f4479be6abd30fa3aace0b70694aef5cfd713
 MISC metadata.xml 470 BLAKE2B 0a0f575d2237b74f0f369c49745408308af92797e19904ecd07a46cb56cf6f45366155318f727045448e3bb9639868672b4c55de224703803216d12b5b920262 SHA512 f0e959732e6800280277c32606ea6ba67947d071f17dbef5ced97970879e10198476ca3ecba2099818e3dbb2ded079dd2a1a9c5517cdd233455869e3d816444f
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ea1d041fc529..ef227456bd56 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index c2792ed9148b..faf64a5a0ecf 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,5 +2,5 @@ DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51
 DIST Botan-2.18.1.tar.xz 5953936 BLAKE2B 82f6a9563377542d059901adec0fc17a41b0184cf59af76084babec2591830314a4d7f8d3308eb393c4910c9b0e6c056625765f0d95b435f47dc94cf4b83b128 SHA512 2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3
 DIST Botan-2.18.1.tar.xz.asc 488 BLAKE2B d7e6f18ba969b1fffe5aec27ec28839bb6eefac438b0971bb24293a9a1dc104d4355feaae4f8749ea9ea9a729e9f0c0368782c60c2f1aaed58620624248d09d2 SHA512 0cb24d544e31f347e649661d28fedaad4352cd5096ad41e1513c7915138981c7c099e4ee6025893ed829a65082aaded738a94018a8e0bc079f4f0fb63bbec262
 EBUILD botan-2.17.3-r1.ebuild 3081 BLAKE2B 8f1566d33d79f8c580bfc50ff282a54d1ad779f6394f9f78102f8364c39fe45902f04ebf41f14ff5c91a9c6ffe7c197727c86ecb7ef00b89b6da30a33a365eb6 SHA512 157e5dc7e0e502b06f23bf9c2961f5b3db6b85ca1e118a5035261a19ed11ebbc9105631ee332b1af4d70d83fd90d5806fc7345639b33609c22327413428d8cc2
-EBUILD botan-2.18.1-r1.ebuild 4139 BLAKE2B 7a443cb25d91a23ffad72c4df7dfeec6d36823bd477c9c401f16b072a427f4f48f11cbe8270c22df77aa7be211419f08def4086698d07f652152a5654fe67c2f SHA512 1c3cf57e3b3949bdb704c7d1c1eb937fec79effd39c627338533d95fdc0897f6f1dff16b98c50b1d8a75ae1610efdda9176673bfd06f54bdb8030d4d76456fc6
+EBUILD botan-2.18.1-r1.ebuild 4140 BLAKE2B 6019744db3afa681660ff7f254357b05d02b9d3f108704b72f9b0c50d45fe8e0dd50fd7222c782f8dc62576efe5911b90b1b9edce877cd5e0570d89148d13d44 SHA512 519711a85c71389287a791583ba0ecaebee8008ff8fa25e0eb7e2a710f201365ebdc6812fff4dc78df980bf423e89c463ee5f07178d575de0d47302549ef1d48
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.18.1-r1.ebuild b/dev-libs/botan/botan-2.18.1-r1.ebuild
index 0e5c78c36a50..133a2313d2bc 100644
--- a/dev-libs/botan/botan-2.18.1-r1.ebuild
+++ b/dev-libs/botan/botan-2.18.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/botan.asc"
 inherit python-r1 toolchain-funcs verify-sig
 
diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index 45eafc20131a..0e215a8dbe62 100644
--- a/dev-libs/collada-dom/Manifest
+++ b/dev-libs/collada-dom/Manifest
@@ -1,5 +1,5 @@
 AUX take_snapshot.sh 330 BLAKE2B 7203b021e0d78d1985015e5c57d7e1eb3ff5b537c4ff448b5ab2b6d28a1baae28cce45a6c0e051bf190217ccd29539c6c40db9690b0845f9c797e7e2929f8fb1 SHA512 c8bbf4c5eac8d3d67f4017d8b5097925806864d54914ba3472f0c589bcb72b4d8d4330845170f8aa6051296285abbf8e404dd19103a3e4552fe41bc615ca0487
 DIST collada-dom-2.5.0.tar.gz 4509266 BLAKE2B bf09937680897850dd5c288fd4245b403f11d88a0dfecb8f22d83b82759078f2dce201ed871fb644b165deefce05893354badf75911ab56bb2730e318c472407 SHA512 f189d09e2396faa266734981bb7b5e91ec34b6faa9ad340206e769dae316496bf4271c129980668dc2756874dbb8c1157162197d0d3a74075e35200821875156
-EBUILD collada-dom-2.5.0.ebuild 759 BLAKE2B 1b9268f24e82771c5b42096afeacf20763e0d0d0415b61c88d3ae2104795ede987de4e4cbdae13db50942ba3f6a1a4b8812396a35177bab59daa22c0fbe1b7ed SHA512 110ab1efc0e4f3e6c1b41862231544a504021b1a7d71a4bdc03b5f18d188f0362f7bda306b0ff88dfb471f1ff131ef07307ffe62dcc4937bfc807e62132a63ce
-EBUILD collada-dom-9999.ebuild 763 BLAKE2B 426b2a43291d81d5db8e5b43517af4bbb41a1d4d737abc6a4328e5cdb3d949adc0657cd9594818a5a0812488b4625f017e46b8fedfbbb783a5e28bd399ce9f59 SHA512 1b27ccbc469f19699587b8bae8267029cf01b2d5a268815bd12944fa685f9ef8b2a202b523134ef24a6f781e1aa75e62217d1bb599e59c38733e7f34971b1c78
+EBUILD collada-dom-2.5.0.ebuild 764 BLAKE2B 56ebf126c5ef4afdea1cf16305fa663248ccbb43a6994ee43cd0e4025b9feccb348bb127f5a3be93e82db8d622a2f4d57012283c2cd269b080910966ef736373 SHA512 95a2808f91c2d6d639ed63f3c5a3a578d39dde0bec657ecb30a32498c292bff8ebfb90a93ea77bdb403cfff8a9b5f290f50438220bc59b73732a533c0c03e8e2
+EBUILD collada-dom-9999.ebuild 768 BLAKE2B 445d45af488bcb04be8b5bf919826d6196eca8166c6833044962fa523a73efce07e5e9f13e1e8f171d6d8d05a3926138947b25e32053eb5db729abe788e789f1 SHA512 eea520b3c82603ef29d117a127b7055c27c48880045704f43e070e90a1bf0bf2270880926c5299489351773910bda245a7533b9c5981e977b42e24bb4cc1ac45
 MISC metadata.xml 402 BLAKE2B 34446b3bb91ea6d424455de22a994a55c33f3ce088c7e8ff4307a25816c0d685d632c4b5628c939dbf5901cbcef7d2e143bcf45f64f7046c3419f0b7fd121935 SHA512 7798cc43db032d2cee13b739812802e530b3ea9ba6c4ef5439a439bb77884d68ddae6d0c6e11d491b44e7598fad936e5ac455ca5d7bd39ce5e1689ad2c2555e4
diff --git a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
index 0c48c4d35580..f6d4152a5a7a 100644
--- a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
+++ b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-libs/collada-dom/collada-dom-9999.ebuild b/dev-libs/collada-dom/collada-dom-9999.ebuild
index b81931fde2aa..e9f30a02de0f 100644
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild
+++ b/dev-libs/collada-dom/collada-dom-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 532cd010085e..dd89a3bb01e7 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,3 +1,3 @@
 DIST confuse-3.3.tar.xz 485140 BLAKE2B 41f426544341966e4a4148c40951dd7f6771b70b182e9ab9f19ce9be781c3ca42c86615f48e91f3997c8e0654111de2360a09c070afc21047b6edb4a8187755f SHA512 93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0
-EBUILD confuse-3.3.ebuild 1148 BLAKE2B 33c7de154ec7e06627fd9c0c6c04003d0d7ca7406ab33556b9de7d75efa3307809c7da82a9bec8cc51e4df601bf70107619c84eda60826fa86fa82c35f83e514 SHA512 789e489c79c406b72d04ab9e11ba8c32cc627cbd0469b1d2dbe828328b9f63988303ea4bec41f98dc0d6770a945d0285396c3186dd005316b9a2cc3624ecb53e
+EBUILD confuse-3.3.ebuild 1155 BLAKE2B 91debc5f0cf0cf0a609c64fa413b263e4feee7bce74ac26b49f6ebca2e3159b6cfad154f1f6ef5b8782bdf1531e5a699337dc4ed574029412edd9e0d495d0bd0 SHA512 3fc53680d57c338128efa0d303c597a0122507db33c99d2944c11971c435a9ce9c33b572cdc4bd10dd609565b194b97959753ade9a490ee1981c798fc4a548bd
 MISC metadata.xml 403 BLAKE2B 5727ddc37d600cb102f7e9cabe85d7331c3ae1d6a9ccd23cf278c36140a9ef044f4d5da75bd4bdbe8d21921cc8dc6f192c2cbc2c285a05ec072ab35e9084630d SHA512 83f6b89426a65efcba3fe250300faffd05d6fe647b36448d947d15d257e5acbb9b4e8034d745d51095eea141dba06ebfc4e0ae6e285b087c6815c51a6eb1d859
diff --git a/dev-libs/confuse/confuse-3.3.ebuild b/dev-libs/confuse/confuse-3.3.ebuild
index 9d2e44cd6075..1c901130ccd9 100644
--- a/dev-libs/confuse/confuse-3.3.ebuild
+++ b/dev-libs/confuse/confuse-3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/2.1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index f0da11c25103..377adfb4c512 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,4 +1,6 @@
 AUX dbus-glib-0.110-config-glib-genmarshal.conf 3281 BLAKE2B 5724ec3aa555d71b26739a8d4ded9773872fdfacdd6657070fb8ccd2b4164180655ecc7b83ef0c9440b867394c766c9276662d4d278a9d988909fba04b6d744d SHA512 76dafdb81234600b0717e79d1ce8cdc6668aaacbed607f929bc9d299dcad0330ccf62e2bbfe73338526770faaa40f9f5564a108d8830484bde2ab7a78cae6e03
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
+DIST dbus-glib-0.112.tar.gz 715340 BLAKE2B 24e1c222f0116b32c109682816f6c35771647f4c63cab93a6621bd68b71ea4dca62fbf9e6bb360386b8658146dbf34b0d7dc471db7525585412d120340c4c969 SHA512 7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e
 EBUILD dbus-glib-0.110.ebuild 2536 BLAKE2B 0371202a4ec7de8de93db1c50c9d038aa430a5080a79b255c395015b36e81e0df5b11fa83240fc65fdef175944af22b594a84f321f662dfb1f9e4465393c400d SHA512 219d236d22ed666f7d8109c940101b2cc44f86d352a2f2d5d17f4023c941f7c90766ea3e7deef12724f4bbb7a851d9eab134614f3551483e7dc3bb4def5546ea
+EBUILD dbus-glib-0.112.ebuild 2482 BLAKE2B 7e00520bfacac9e50c25013e35a063a5569c3d5d876078f6044e851492d92644672108a52c023456cc47b454e51dc287944b6e403d89ba3a310158e4fd50b854 SHA512 ee519a4ea27097bd44867a27ceb21e2d7a0882166df1e86e89f954787fed70a8bf150dcdd266554b9f4caa75c0ea4f409b3341e7ec19779519517e9357d75008
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.112.ebuild b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild
new file mode 100644
index 000000000000..91540650ce90
--- /dev/null
+++ b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 multilib-minimal toolchain-funcs
+
+DESCRIPTION="D-Bus bindings for glib"
+HOMEPAGE="https://dbus.freedesktop.org/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.8[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/glib-2.40:2
+	>=sys-apps/dbus-1.8
+	>=dev-util/glib-utils-2.40
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+" # CBUILD dependencies are needed to make a native tool while cross-compiling.
+
+DOCS=( AUTHORS CONTRIBUTING.md NEWS README )
+
+set_TBD() {
+	# out of sources build dir for make check
+	export TBD="${BUILD_DIR}-tests"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}"/var
+		--enable-bash-completion
+		--disable-gtk-doc
+		$(use_enable debug asserts)
+		$(use_enable static-libs static)
+	)
+
+	# Configure a CBUILD directory to make a native build tool.
+	if tc-is-cross-compiler; then
+		mkdir "${BUILD_DIR}-build" || die
+		cd "${BUILD_DIR}-build" || die
+		ECONF_SOURCE="${S}" econf_build
+		myconf+=( --with-dbus-binding-tool="$PWD/dbus/dbus-binding-tool" )
+		cd - || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	ln -s "${S}"/doc/reference/html doc/reference/html || die #460042
+
+	if use test; then
+		set_TBD
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf \
+			"${myconf[@]}" \
+			$(use_enable test checks) \
+			$(use_enable test tests) \
+			$(use_enable test asserts)
+	fi
+}
+
+multilib_src_compile() {
+	tc-is-cross-compiler && emake -C "${BUILD_DIR}-build"
+
+	emake
+
+	if use test; then
+		set_TBD
+		cd "${TBD}" || die
+		einfo "Running make in ${TBD}"
+		emake
+	fi
+}
+
+multilib_src_test() {
+	set_TBD
+	cd "${TBD}" || die
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send
+	rm -r "${ED}"/etc/bash_completion.d || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 35bfb8e1d68a..e42ba2013df8 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,8 +2,6 @@ AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b1
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
 AUX elfutils-0.185-static-inline.patch 361 BLAKE2B c480f9a4024922252c9917c5e69eb8b4c92c897f7ebb4284445a489b5b28c630ac28e337bff977f67c164abed688aa0ed0dc76a715f6270e1001a7a80d46799f SHA512 8ac89c40aa108b097f18deb82ec3267d987aa16473fb40105aa7f83465cbea4ac1538bf4fc84c957e61250f9b8b6ea1f5694dcd5b404902ce8b73f53eed3308a
-DIST elfutils-0.184.tar.bz2 9185468 BLAKE2B 8e45aa603a039fb128b96a1ffee4a0137fd1808d7087a2ddc8682a9bec1d65a56e6e6ad1419ac5e9f4490cc258c8ac0ee3e49775aab278efb1889bdceaf842bf SHA512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8
 DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
-EBUILD elfutils-0.184.ebuild 2367 BLAKE2B 0a3544424f08f2fc6cc603490b24a3be0f981f5ea459d97db81ee6b212fbd130d0acbe2556f6f33accd3b0a3812c10a1ba4aa5686cfb4e9174b43e9a0795d133 SHA512 92fc6617eb49b7f3e8952357497a3430a6750f28e4b4e8543e568cd1a17127aa296940b9ee7b366a0919bf3d065fbbd86273d09e04dc92919fe68a11252350b0
-EBUILD elfutils-0.185.ebuild 2416 BLAKE2B e59b6be97fcbc278f0713bac6c79d09ccc48655293337239e1b8ddd3d20c93e41dc69d4de550f12254680ea75de13eb7fac72bb2ccb9773a89201b51c384167a SHA512 82f28d2d1fa3eadb693a00da64baad0f79012808f293f94e864edec539065c17348b1580f9b834a0ffcc59a55f8b1c2f36ec0633ddb41521003cdbf61c6abba3
+EBUILD elfutils-0.185.ebuild 2414 BLAKE2B a24fd2616818ffff4813543cb90320c8d127b36f5afac5c2ab8617d8e6f7fe6c988782b36797160263b132df431b59ea99d29afeafa709c9754e648a18b3e8ab SHA512 77b9b6a7fca2a31ad74854d67455751ffbf366124458a98cb10c8f9ef6ba0a12d130ac788ff5afd3a6a9f02b2e868eba611bc1640b03b5c8744fbfd9bd817249
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.184.ebuild b/dev-libs/elfutils/elfutils-0.184.ebuild
deleted file mode 100644
index 38450aa6bc21..000000000000
--- a/dev-libs/elfutils/elfutils-0.184.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://elfutils.org/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
-	!dev-libs/libelf
-"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-BDEPEND="nls? ( sys-devel/gettext )
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4
-"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
-	"${FILESDIR}"/${PN}-0.177-disable-large.patch
-	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-	# https://sourceware.org/PR23914
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	use test && append-flags -g #407135
-
-	# Symbol aliases are implemented as asm statements.
-	# Will require porting: https://gcc.gnu.org/PR48200
-	filter-flags '-flto*'
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads thread-safety) \
-		$(use_enable valgrind) \
-		--disable-debuginfod \
-		--disable-libdebuginfod \
-		--program-prefix="eu-" \
-		--with-zlib \
-		$(use_with bzip2 bzlib) \
-		$(use_with lzma) \
-		$(use_with zstd)
-}
-
-multilib_src_test() {
-	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		emake check VERBOSE=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc NOTES
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/elfutils-0.185.ebuild b/dev-libs/elfutils/elfutils-0.185.ebuild
index c02044855553..a4f1cc565367 100644
--- a/dev-libs/elfutils/elfutils-0.185.ebuild
+++ b/dev-libs/elfutils/elfutils-0.185.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 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"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 95275ec10981..cfde982c3c61 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
 DIST ell-0.40.tar.xz 524256 BLAKE2B de7326cfc7d00970fdeb5f19e38b9c68e6443544f5a6397aa031a7dcd0d61c77ab72303ad51d36e8fbc2c34c954631636f7f42bae0c40cd75498882ab78e2c85 SHA512 bc721e300e5b689dc51f794019e731eb252ad74dd199bec7685373ffa32ad42950aae9e36cb74d3b6590016c046589acb3ae8c009c4a14bd89331913392e923e
 DIST ell-0.41.tar.xz 525240 BLAKE2B 80614190c1237fdbb867300418d474d50e163fba7ca15f4c74c3019b4d407da8319b67be5a88886894dd8869620bae1338e91d28993077690e93260ed1dc3cf6 SHA512 bfbc18195126196776a0d00b4ae8bd8358a6cd1d2f8221132fdae1f323172f148a3faad84a951774ca38a3a72e8d96512b9cac84d9ef3a6cddf4b1490b34453e
 EBUILD ell-0.40.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
-EBUILD ell-0.41.ebuild 1257 BLAKE2B 30e7c78fdbca48a13abdc36bd847bad0d5b5d937347336bc4eb90782e8134d7b1a618e73cd9d85598e8ed2f649f933256ee6bccf550407563d7d1ec923ed923b SHA512 6e42aa85804fe81fd3fc4960dabb84305f0eab4462ec57583581eda76f2713c390d34b57e66aeef170a65915041ff5737d3c914bdbaa14d5570371dfcf1392c1
+EBUILD ell-0.41.ebuild 1255 BLAKE2B 2f1cab8b6a2f77c85d80dee309aab8c74984638556a7eb88142dddff5c339014046bc981205c70b6401e5181ea3b8134356e2fd831a315822db894bf3898e03d SHA512 908ecb88433c7ddac197aafe986edac040a944a73bc46ac9c0c4fdc56c6f0a029ec15b1974754a9295acc91355ec22c5be520ddda8ab8a18cfdbf3a27a3efe9a
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 MISC metadata.xml 336 BLAKE2B 119f1779bc0632481e1053d02f3fc56df9504ad591e057148c5885d595538d5b3d16fe0b76361a2051433f710228b85af866ea0694f695fe0268f8990dd07c15 SHA512 16de07f5cf33c2a9d44817f75a005e035ad51718af1ae4eff6c31519858294dee82286ec5a80ed87b0487c8deb352d1e46f4f53a0ffb06c5a4f9d3f27e704284
diff --git a/dev-libs/ell/ell-0.41.ebuild b/dev-libs/ell/ell-0.41.ebuild
index 752fd7b7e630..1275d91a1a22 100644
--- a/dev-libs/ell/ell-0.41.ebuild
+++ b/dev-libs/ell/ell-0.41.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index 183e64d2b6e8..2df55cbacd84 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,6 +1,4 @@
 AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68
-DIST kopeninghours-21.04.2.tar.xz 62824 BLAKE2B 1bd346fc46894199fd0f80a5cb35768de4131d1c0daf4594f4500745f8b0e79209fe41308b8e005fa1b0c6424d1776aeece3dd39b065e6ce0159f9a094679df3 SHA512 566550704a1ffe92249a026ffca10ec52514e2460da459df6dbf457065cfab5c9462ff1b9a90aa9c35637121fdff00ac89986764b5c77b519f5ac5c2174faf85
 DIST kopeninghours-21.04.3.tar.xz 63212 BLAKE2B 8f16566559b529ca44aaa0cb6b8267cc4d253c82e336d210cd240191ea5b60e029d6acd914053707c010bf94628cfb43e9fa0cc5625f275808426f75ecaf8e6a SHA512 d368cdbfe9dfcd82a847b932ddd244bdabfabdf1d44dbf6fb371f3af294f538d77d9f955fdbf1d9a34a2f18e84e649ac32e4b6e296cd7a8cc84d0238ca89bd6d
-EBUILD kopeninghours-21.04.2.ebuild 1272 BLAKE2B 83c420614611a1f731fc709f3bbf9af4686850eb7ee2f6f0ff5501a3232ba96522a1d97ca3ca3c303ebed32c19eb963408f630d1eaf5b930cf9315f03f1ba4c3 SHA512 804adeee1a7b2d6372086661ef79a3b85cbaa73f539425990296d5d07c8d7819a5f58e4c4f3062dae86fb071be46bf166ce6f4659fc21439dcd6c75b7c0dbb56
 EBUILD kopeninghours-21.04.3.ebuild 1270 BLAKE2B dfb8a0fa97a7b193fec15c3576fff63bd2dc253c31dfa44a10852b1aba57e95e3df170a518df482b46c929eb5f25644756f61643de4005a04a65e1badf0222e6 SHA512 b8c2fd7aa936f4d14eb73208d7cb5362786cf7087c3b333adb990a723638513c3a12254395045612a873b30adb01c5d4d1dcb979fd7034448541700f44aeb861
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kopeninghours/kopeninghours-21.04.2.ebuild b/dev-libs/kopeninghours/kopeninghours-21.04.2.ebuild
deleted file mode 100644
index 405678cd3d3d..000000000000
--- a/dev-libs/kopeninghours/kopeninghours-21.04.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_GEAR="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
-HOMEPAGE="https://api.kde.org/kopeninghours/html/index.html
-https://invent.kde.org/libraries/kopeninghours"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	>=dev-libs/kpublictransport-${PVCUT}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-	python? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-21.03.90-boostpython.patch )
-
-pkg_setup() {
-	ecm_pkg_setup
-	python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
-		$(cmake_use_find_package python Boost)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	python_optimize
-}
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index 1691af278d46..c307d324bf7f 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,5 +1,3 @@
-DIST kosmindoormap-21.04.2.tar.xz 336984 BLAKE2B 723fbd372e14cc6d731dfccea933ba923fd804b8af4d463fa6eb78fdda8a200d67cf6bd780ad65127d93e44f44c237aa8e84987e7c2df972aa1c2ad731c0f319 SHA512 1bf6513577f0033009deaa506fcddd4407beaf0d8e44e2661b76352e851e154ce3a99e9f1e78c33428f2cdd7f4ba6637dc56882f7dbf97e583140a7972e82449
 DIST kosmindoormap-21.04.3.tar.xz 337008 BLAKE2B d1bf349a5b4362fe3cca6a9003ccdf17eb9425e1e2525f3bda39c962658fb9265f7f9f5206c6caec7f26fbdd876f4c9b06ab5662fd2061d1059a51ab089ddcee SHA512 08dc32bd07cc6653f2f12dc3060b102d5c94505f6ff539cdbcd0ed1972a7bec774df55d74f2831b1e6c537167a15a241c0875c6abd73c626718908a3d9f21a2d
-EBUILD kosmindoormap-21.04.2.ebuild 940 BLAKE2B 548d94aefcd80da2b3813e3687874926b9a0f1fb2c9832ac6f29fe0595acbf3c234114195dd197f6bcfc21654e33134ad94ac32cbbf749f56d2d3074f59a5af2 SHA512 6a6074d104464cab2495251346f38eedbd8874ac3de3b578d85dafb59544cbcb08b312fdc641025e3ef2f82a73d870b5f468ff0c716dafbf83ca73ad19d3c59e
 EBUILD kosmindoormap-21.04.3.ebuild 940 BLAKE2B 548d94aefcd80da2b3813e3687874926b9a0f1fb2c9832ac6f29fe0595acbf3c234114195dd197f6bcfc21654e33134ad94ac32cbbf749f56d2d3074f59a5af2 SHA512 6a6074d104464cab2495251346f38eedbd8874ac3de3b578d85dafb59544cbcb08b312fdc641025e3ef2f82a73d870b5f468ff0c716dafbf83ca73ad19d3c59e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kosmindoormap/kosmindoormap-21.04.2.ebuild b/dev-libs/kosmindoormap/kosmindoormap-21.04.2.ebuild
deleted file mode 100644
index a16f08aee91b..000000000000
--- a/dev-libs/kosmindoormap/kosmindoormap-21.04.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_GEAR="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/kpublictransport-${PVCUT}:5
-	dev-libs/protobuf:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
-	)
-	ecm_src_configure
-}
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index 621005b35342..0a45e3f43d77 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1,5 +1,3 @@
-DIST kpublictransport-21.04.2.tar.xz 392464 BLAKE2B a06eace8fb1c1ab1e753d4042868bba520b5e5692186097ede5f2a92d3deb2b139f0552d0dba7d306ea0738f2f1447c876dd3973efa3aba7857cb8f7cb8378dc SHA512 6b5f945349e0c0d460bc1e7d797de688370200596b0b60fa51cf7d815fdf692bb6e9aaa4be290ca78b3fcda12605a6b881a40c013640394a5c966bd52eaa423e
 DIST kpublictransport-21.04.3.tar.xz 392532 BLAKE2B 203580f29862dfca34406b250907bc1bc320524212cfef7830aa6f545c012c4bb94976f77c404c1e488655c54e1c724b10d8b38c0a15271b81a4707af25d943a SHA512 a952f11719dfc7223ca2a94ec59ac158f95a4034ed8c37918ab5b03cb06d5d0ad6270912e4823fcd535c745baec406e2b0f29360591d32ddd3b7591ad71c8688
-EBUILD kpublictransport-21.04.2.ebuild 803 BLAKE2B 3ead7d5be4f24fd8397b1a9c3f30eb7ff48ec05f1eed9266028e285c3e11730e920e1b8f5c57b3f9df8fd1a2ec19730dde6a8b27df3da1e1cf99e4e96a36577e SHA512 957a6ffc58a623523ad49fcd1eec7a6212a8d1040e74e60ab602ead09874fa9415f3148edd37c4ce10d05c8a91e12e38849ca67ca34560bac9b0084cfffef7a3
 EBUILD kpublictransport-21.04.3.ebuild 803 BLAKE2B 3ead7d5be4f24fd8397b1a9c3f30eb7ff48ec05f1eed9266028e285c3e11730e920e1b8f5c57b3f9df8fd1a2ec19730dde6a8b27df3da1e1cf99e4e96a36577e SHA512 957a6ffc58a623523ad49fcd1eec7a6212a8d1040e74e60ab602ead09874fa9415f3148edd37c4ce10d05c8a91e12e38849ca67ca34560bac9b0084cfffef7a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kpublictransport/kpublictransport-21.04.2.ebuild b/dev-libs/kpublictransport/kpublictransport-21.04.2.ebuild
deleted file mode 100644
index a5fa8262d790..000000000000
--- a/dev-libs/kpublictransport/kpublictransport-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_GEAR="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for accessing public transport timetables and other information"
-HOMEPAGE="https://invent.kde.org/libraries/kpublictransport
-	https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/protobuf:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
-	)
-	ecm_src_configure
-}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 48cb79e9dde7..19ccdfda5182 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,10 +1,8 @@
 AUX 1.12.2-shared_nowide.patch 4647 BLAKE2B 602e72f4265a803b715b8605c1dee3ccec9c876c7d5d50208a4cf9c1e6ad277370cb110707404d52a24b53cdbb017b5d2fc9bbecb37f69eaacd10d9d892c4a25 SHA512 1f95d6e0ac1000d2eb8cdfee6184ca74d2bb96a9dec50cdd1539cb7e3060decbf1e4863fa2594ce1cf3405b1edf270b94b82f1c9ca79aaeb6f32f11d10c7eece
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
-DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
-DIST leatherman-1.12.4.tar.gz 818043 BLAKE2B 7a8718d598bf48b70d555d2a21e2e930eba6b3407ad5414b43d30411acf4c9bf4193ad20058b63d3c8911b7c5b0d021f84d6eca6dd3d00165c7d145186f8177f SHA512 b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55
 DIST leatherman-1.12.5.tar.gz 818066 BLAKE2B 9d30fb224d3f4389f398294712dc85af782eeff877dd0a214fc60ee67d4a70467c1d32255cf8814f0cfc5428c660a315c24a9becdb1aa05f4d5c43ede8552af7 SHA512 dad1ee67f98a4cd12d9c6f022ae2b8c748e4c081918744030191d7c33f84983691f6bcfba3ddf5c0e5b4c36109ebd757325d6e42d88c74caaff942e6603d333e
-EBUILD leatherman-1.12.2.ebuild 1320 BLAKE2B 4b157ac54fbae7c222ac85e3e67471f8e70f9ad4cd8e9a63ad1f0d13828eb6b0eb3e35a61104995cdb708277e58cb3b0ed599e511ecd46168ed3e66a8b32b829 SHA512 75b4fff17ebd3984cc27accd6289f1ea67002aece98e36e5f0b40a8e6c0634fea81e01394bbe86b8fa009b9b8a584640a322e999aa811d639bb2d2703d58c9bd
-EBUILD leatherman-1.12.4.ebuild 1320 BLAKE2B 4b157ac54fbae7c222ac85e3e67471f8e70f9ad4cd8e9a63ad1f0d13828eb6b0eb3e35a61104995cdb708277e58cb3b0ed599e511ecd46168ed3e66a8b32b829 SHA512 75b4fff17ebd3984cc27accd6289f1ea67002aece98e36e5f0b40a8e6c0634fea81e01394bbe86b8fa009b9b8a584640a322e999aa811d639bb2d2703d58c9bd
-EBUILD leatherman-1.12.5.ebuild 1301 BLAKE2B 18a2b2846d2e251b1f7f7e00f2febd27c0f113ce61a3a4b489b2723a3bcaeb7ddebcb37d10aed0ec37cfd598f407f7c5e155e253b6428769c4e82b18c4c8ba91 SHA512 c2e05d17884a9a296b4cb5d4db242c16b88d212e02d7031e0bf35661d4a3ffdf2b2015b6ff4797aec8ff1a2a0c2e5162c320fd72adda97764e19d79815c72346
+DIST leatherman-1.12.6.tar.gz 818106 BLAKE2B 056ea52c355cf178e16be03f2a4fb54bf0e6aece4045545e7e45c50664e711db2bb756f56c9cd33a6dfe1de24c4ecb98766d4bd158ffb7757958274ba38f76db SHA512 4e2a1ee2e7226224f115648a78bc3e4798ef0528ef32e01d1e7ebcbeb1250fd6ed88001c9db21456feeef3bd6ff201b0fd68fd5feb2671a66d13519dd3454386
+EBUILD leatherman-1.12.5.ebuild 1296 BLAKE2B b9fb0dd761cec0c7826b1b1d2df2e60c8e675203f393de328e0384a7082e34404f806e4d58faf45a6d8853502f4b34c10db2421aa22a924e272c4b7ca1ab1bbd SHA512 3eb3d524ad470786a1e5d3c2be3989744e8b1a56d1b5fbabfad634427352e3ce0110bdd033625788e1383ff947296f43991b0cb2f8d26572a3191c07a449b392
+EBUILD leatherman-1.12.6.ebuild 1301 BLAKE2B 18a2b2846d2e251b1f7f7e00f2febd27c0f113ce61a3a4b489b2723a3bcaeb7ddebcb37d10aed0ec37cfd598f407f7c5e155e253b6428769c4e82b18c4c8ba91 SHA512 c2e05d17884a9a296b4cb5d4db242c16b88d212e02d7031e0bf35661d4a3ffdf2b2015b6ff4797aec8ff1a2a0c2e5162c320fd72adda97764e19d79815c72346
 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
deleted file mode 100644
index e41dffc8583c..000000000000
--- a/dev-libs/leatherman/leatherman-1.12.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-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"
-SLOT="0/${PV}"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.73:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	# vendored boost lib conflicts with boost 1.73 and above
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.12.4.ebuild b/dev-libs/leatherman/leatherman-1.12.4.ebuild
deleted file mode 100644
index e41dffc8583c..000000000000
--- a/dev-libs/leatherman/leatherman-1.12.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-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"
-SLOT="0/${PV}"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.73:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	# vendored boost lib conflicts with boost 1.73 and above
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.12.5.ebuild b/dev-libs/leatherman/leatherman-1.12.5.ebuild
index c105fc67cf23..93aeee4fe225 100644
--- a/dev-libs/leatherman/leatherman-1.12.5.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.5.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/leatherman/leatherman-1.12.6.ebuild b/dev-libs/leatherman/leatherman-1.12.6.ebuild
new file mode 100644
index 000000000000..c105fc67cf23
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+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"
+SLOT="0/${PV}"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.73:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	# vendored boost lib conflicts with boost 1.73 and above
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 5dc691266d32..002e67a12342 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,3 +1,5 @@
 DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3b9044756d6efad5de741d8f70270496f09803bbce8cd0000ff37e998f18e092037c850826c3c8e3f47ddfdb28 SHA512 b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9
+DIST libbsd-0.11.3.tar.xz 399712 BLAKE2B 1af04b8fcbc0bfa59fba549639d61a33ac934fe7ee42b506d1b0452e0b836b0bfdd3d8739de90465be46fe6a9d326a2d11bcf72280aa19ccba81db5da6d63d89 SHA512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5
 EBUILD libbsd-0.10.0.ebuild 1240 BLAKE2B 8fd9398aff8163c5651bd1ea4edfc1afc6e0a1c0309be8afec21dc719d5259b3931975f713e86e1825af00b2bccfe64b19fa69c7f7958739a0eb966c330ebfd2 SHA512 1ee29cd1a6175d09427a1d56311dad8b341c5094c7a24f8dceaa5e7114941e91ad9dc014153a57009ac79fe5851140def2e9cf0a3a238da654be87fce3640eba
+EBUILD libbsd-0.11.3.ebuild 1271 BLAKE2B 1316524cc5d92f4303183956851709019a73a017dfe7f9368b50dcbcb377d0d2e26c136f19cd118277678f91fbdc657d4e51a2931bcb0f2a0248edad9d8db8b4 SHA512 d1f9d9b6e2eeec540beaa4c89f0c039089cae47a499a38ebbce35cc07aa4c86922cb059519f23155a0d63d7d0bf4bfb8c7e59a22bd448f876feca5e10c25714a
 MISC metadata.xml 362 BLAKE2B 5ffa8ebebcf0fd8d01f49f14b8f6a210a45a057669f88343e77a25907af8b4608f24898f7ad8b0367b1fa162de3ea7f6ae1692d7655ef899f72760d9b156cc1d SHA512 6bf19529af2e728fd1bb249f5f15875726ceeeb98f820c618aa8d8b9db8aebef20019e38486c5490e2808af57e4531f54201083514e6d3e20415ed08dd22e3bc
diff --git a/dev-libs/libbsd/libbsd-0.11.3.ebuild b/dev-libs/libbsd/libbsd-0.11.3.ebuild
new file mode 100644
index 000000000000..d9667f872ea7
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.11.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Library to provide useful functions commonly found on BSD systems"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
+SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+
+LICENSE="BSD BSD-2 BSD-4 ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.17
+"
+
+pkg_setup() {
+	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
+	if ! has_version ${CATEGORY}/${PN}; then
+		if [[ -e ${f} ]]; then
+			eerror "${m}"
+			die "You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
+	# which is correct, see:
+	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 05a973e54bbe..fb7640139672 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,5 +1,5 @@
 AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c9febd8a5eed02db725151f886ad32e3a52ee7a62cabd31c0a218b23a9acf7d9c52b48c0d9aa597524886e38cfc4 SHA512 6da36c0f421b58819410df9507a973199fcafebb6447765c5de97fde6bdb16607f32dcb8b86da4216656c4d4ad4d21e153f15906a400249a7d44766d0539ecfb
 AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
-EBUILD libdnet-1.14-r2.ebuild 1549 BLAKE2B 40321bca56583e9edfc1f768b9566e1b8be271deb98a8db56457c64bf345bdf8308d04523fa30ad8b96457c3a65097a3f5fac9920e0f430a28feeda3957b97de SHA512 dc14df9d1d60dfb35cd2118dd632d07b174915c5e728c1bebd2e511bc204cb997b85d68f227b550b0124e5e631bdae94fd400bb39cba72a5ab0d2aa485ae7705
+EBUILD libdnet-1.14-r2.ebuild 1556 BLAKE2B 96aaeaf2f329d8fa1c099de16890346f8c68ef2f9a7f6119f3ecc2798e96786f8981cd94c4c0df4bab9eecfce475dd4472a28677a12c4cbf297a9721b3bc8dd4 SHA512 a75d48bd6088a332189f633f49d9227f8d19ee67002c53fcea32225ed899898e897d99de194dc5e14792ddd6741090c2c4b07d19fa1a9046b222faec84fe584a
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.14-r2.ebuild b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
index 88c4acfad33a..f8a7f4031b69 100644
--- a/dev-libs/libdnet/libdnet-1.14-r2.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 6b26bec3d752..fb76d10ddaa7 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -8,5 +8,5 @@ DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fba
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD libgamin-0.1.10-r6.ebuild 2961 BLAKE2B 9ed05b546592db1e1bc05c4085a0d0ac2bfd5fd592ec0f5654261274c4733f5febbe032472fc086224100f259ffd9ba0dc6a2f5f524717a96aeafbb9e35b1da2 SHA512 011b3aaac7e72db57b186e37ffd505c697e96ee0befc46ba75929920e2b145006a34895b2be42591fd85b962639adf9848722f9eb12a9e173ef6e2878f7a05d2
+EBUILD libgamin-0.1.10-r6.ebuild 2968 BLAKE2B 27b484eee03a933660abf532ec0878f9d369d7347f0bce84bedf6ef3f7ad8149f6fa138c4c628525b482e847d1d745d0c67a0040d15e0ae94cfc0841b229b18c SHA512 db519401cf52505a8b25de0bb33fd6db569d4c5d85c6b7f723afd71c3b65fdb1e612f34b80d31a023dc4a3573944d3e3c26e5493b81571c5fcc63a5aa7015573
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
index 786de79b0ac7..b861b0d7a072 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug kernel_linux static-libs"
 
 RESTRICT="test" # needs gam-server
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 3dd26f4e1dbb..e523c0a1df16 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,5 +3,5 @@ DIST libinput-1.17.3.tar.xz 612892 BLAKE2B 1acae8a5bc0f87b547c83a0f72e0693ac95cf
 DIST libinput-1.18.0.tar.xz 616732 BLAKE2B 4f12080b5e3496fdb5ccb1375a073860c26037ba47033a7d2d69a2f817b4ab5791aa89be08b193925cddd566a04144c73399cbb196a4cc9d3e07dcfb806d3eff SHA512 9a834f075d7a1f892416bb6b241eb052f749d3aa883c4b39c0f1c9616c115d6b9a541b587508646fddaf0d3fe57af92fe4629b522d1d51196499e7b523e0aa90
 EBUILD libinput-1.17.2.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
 EBUILD libinput-1.17.3.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
-EBUILD libinput-1.18.0.ebuild 2243 BLAKE2B c77ceb508066d2386668906388adabeca3506b38363e49e1a263a8e75d4cb1b4fdefb825cc4770faf1d078117b38cb2cf929315cc59664326d5be2a291528724 SHA512 5d6580cbdfe2549de9a35d80469d9e119e54b5ef76449e2356d3757414746115cf47042485790f34faa731b009ee6898fc324ef05441d325b4a69a663cd6b38e
+EBUILD libinput-1.18.0.ebuild 2241 BLAKE2B 14f411a26e778392c441c2dce4b7cf53e51f3098ab69b8a28244b4ebbb413b8b557158b4e7b38626d1d5ff6233b7e96219b9ad5756482a9d8c700855e551349d SHA512 4bd4aa63c5c3d0cae88bb161613091094d58ef7aa86f30b07f0460a7af710f92a31ade7d76660d61ffd496ab1075d3eacbfe76920473ea8e7c7c00eadf5a41e3
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.18.0.ebuild b/dev-libs/libinput/libinput-1.18.0.ebuild
index ccbd8f520e5d..47c3c7362ce4 100644
--- a/dev-libs/libinput/libinput-1.18.0.ebuild
+++ b/dev-libs/libinput/libinput-1.18.0.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 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index 5c80731693b5..ee3a40abcb28 100644
--- a/dev-libs/libmix/Manifest
+++ b/dev-libs/libmix/Manifest
@@ -2,5 +2,5 @@ AUX libmix-2.05-fix-pattern.patch 415 BLAKE2B 7a203b13fb8718ceccc8f173c08306bef0
 AUX libmix-2.05-gentoo-r1.patch 8328 BLAKE2B 56c32ae2f6d8c69a461c360bc8a2f73d642b9031ab216e296b99a89074883a057ec82cd9470dd145ee97a4d6e20d80ec4aebfead90c6cb4f53418aee9dbf48db SHA512 24043efc6a7ebdee97425e63e97bcd298d0e920604277bdcd176c22e20119cacd6ef33a296df815cd98ae327bd149003e3e34c33f939d96bee71be3bac79bf75
 AUX libmix-2.05-libnet.patch 509 BLAKE2B ab9f57a1f49750d32f77095824637a9588dd8234b90cc5fc906c29105c1df0547552488a38d54ffe48755b0a27e8a46b30fc4553ebead19ce2f806ca5006398e SHA512 3c5204728db7fdecadbd3149a4edb544dafadedffa7d8f1afe2e3290a378865f68ac1189eeab7a6e73176bb4af045f4049dfc75417c143a5aad705906c96b498
 DIST libmix-205.tgz 79860 BLAKE2B 35f2480c609ed62bb0f277cba38e325cb387acf250d78d6db81dcf83cdc8002be9482d834d14f3e026452b493f4794b0a9ffff42b5ba3cf15b1263fb5ebe59da SHA512 412a1506d15b5ff3fff7f32caf50dca9283c9d667e4bce40a20be45465fcfe72e177159f546d4b8059de94c107faf641d116621ea395bc0ddb91c2a1d77257ec
-EBUILD libmix-2.05-r7.ebuild 843 BLAKE2B a631e0daddd86b3c257aa51a6621d21c1840656fc5abe193f23f84c5c149b015367ccfac486cb37839b3b8a1d292d15ad2311531603c0392ca90eae332ac68de SHA512 76d66229e9292b2021c84e09cc204d0ae61c60061d7c2569cfc327b0091b42e1d77f7061a132b34175edc5f70593dc7f5618ea2d288e80404cbd1f1b8da1581b
+EBUILD libmix-2.05-r7.ebuild 850 BLAKE2B 014e98420d34bc1eba432cf9be9f81bb9ff0ac198e5cfa9795b182c1c1ee9295461cc2c3e764d4f5aa690af42acc5e6a7853c6097b661689325b14fa399b331a SHA512 bbe23b629500dc68d9f45dba2f1e428bceb00098e582ea1a2f7919d63bc013aa60532f98511edce246477974ce69ba660b807e2e15dc9e6589cb40827644d818
 MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index 0bedbeabb8a3..5e01c439716b 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 2223d4568217..cae407c7fc1a 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,4 +1,6 @@
 AUX libtpms-0.8.0-Remove-WError.patch 472 BLAKE2B 08bf1379957d35b123180d0e2434ee9f0bb050bb420e3ab176467f517489890491edf12a14d1ed28a6eb6d5adb3d7aabe274870de7ea691a9f53b169c269761c SHA512 2e7dcd146f8ac438c574ac662c513a95f4d99277c7123b86f633ea1b4c2d3c8dc758f4675258c519b6b1449cfe6f3573eb13241b7b255d09967965627eddf997
 DIST libtpms-0.8.3.tar.gz 1254474 BLAKE2B c71f52d6475d4328e93a35f88557de3400308984ec086f7e6b3c32ebc266e078b3a9864396546ba11fc310c1572efa1521bdac89075c5eba18cb35eef883e706 SHA512 07cf78c2a5b03f3c9179b041db57d5ec049dc0085c09e4fd5c9b54a247cf81a3b9982f0fb1cd571cd6b21b3d9824b061f8f38508fc25b6a23a6a6b06dea7115b
-EBUILD libtpms-0.8.3.ebuild 1192 BLAKE2B 7468ce6ecf8f88536d3025e84fdfc1d1dbd64c7417aafd7990e909a0fb7d01cc6574f0070098e757a5a7acd9e26f196a8d6bcd4eb5d4119b3f08b78365e35495 SHA512 71057c0acbddeb2ef39045e5b0c5751478be601242994103a4a20380aa29701e2300058a8120ee4d742f6520e1aa4de967e68941745438db6d0ffe3ab4111bb7
+DIST libtpms-0.8.4.tar.gz 1255255 BLAKE2B 0786b19dc8f3226508548ab16544ee8ac05e8d9de057eed840a0cb7577c1d1386d83af1a725ec91e64344e2459f9d4836268e2c9a097136cf76d59ea8e23b0c8 SHA512 58244a774cb6ec5dcbbc2d795628fca9eb64936874c72b169ea8288f2bf0cafa8127b1e89ed3ddbf5694df5a5944a7d61254dc729d75b63b3e4f9346b2f0a7b5
+EBUILD libtpms-0.8.3.ebuild 1197 BLAKE2B cfc4d452f26351fa66f744a42f1f24e2c2aa9e464f9189848ef24a01dd94bdbac7a609827407e0e062e90c6bd36646c4bca6aa76a2c52d3d5d7af93f8ae869c2 SHA512 714e720d1895494a214b86fe534f26c7bd28ea5bac0c0eb381e770952bda0f0edaf46bb7eb9cecfe11e5d2a6f8a7bc7c3bd97c00bc2cc8f2fb4656c3fa24f9a3
+EBUILD libtpms-0.8.4.ebuild 1289 BLAKE2B 5721991eb5d0fa307c854cb59c2666be4f4253817d0c5388da44e74ca4089ed32f681429cf45c571659781964e213bf0a0d44bc8f317a2d18e46efb21aec7881 SHA512 500846d4211cdc5d294d56fd4ec6db837bc7e6196ed0252763c1eb3eb1f32cc08f3fb5bad1220d08a64d4595a29c9704ebde5971d4d65ec0a2afd44e253975ea
 MISC metadata.xml 535 BLAKE2B bae20f8be44e80b54b497276a1913da891e9c1bf3e61d3ecc41c0db089ba78424dd470d2b3d9e6475f772d786c44b390cea07dba2498521fa5316144622bc4f7 SHA512 ad2c131b3183613382d1ecfb0b24b02ff3f1d2b4901ad586289298816ef39d4604e82ea1065df54f35883e0cc4052c0510f6971220df8196fe9477a105e50f68
diff --git a/dev-libs/libtpms/libtpms-0.8.3.ebuild b/dev-libs/libtpms/libtpms-0.8.3.ebuild
index b7031ae9a4d7..506699ace35a 100644
--- a/dev-libs/libtpms/libtpms-0.8.3.ebuild
+++ b/dev-libs/libtpms/libtpms-0.8.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/stefanberger/libtpms"
 SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc"
 
 DEPEND="dev-libs/openssl:0="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libtpms/libtpms-0.8.4.ebuild b/dev-libs/libtpms/libtpms-0.8.4.ebuild
new file mode 100644
index 000000000000..3eab05684d98
--- /dev/null
+++ b/dev-libs/libtpms/libtpms-0.8.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library providing software emultion of a TPM"
+HOMEPAGE="https://github.com/stefanberger/libtpms"
+SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc"
+
+DEPEND="dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.0-Remove-WError.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-openssl \
+		--with-tpm2
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.8.0; then
+		elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA"
+		elog "keys due to a flawed key creation algorithm. Because fixing this would render"
+		elog "existing sealed data inaccessible, to use the corrected algorithm, the old"
+		elog "TPM state file must be deleted and a new TPM state file created. Data still"
+		elog "sealed using the old state file will be permanently inaccessible. For the"
+		elog "details see https://github.com/stefanberger/libtpms/issues/183"
+	fi
+}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 10f27c167825..6135454b88ba 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -2,6 +2,6 @@ AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db26
 DIST libuv-1.41.0.tar.gz 1281268 BLAKE2B 6d6fef33953c4d03835adfdd66e9a44c61071440ceeea48d88bcf6593e2a35c7d0878369c87b38a92f66ead2ab0f799d4b7476ced3707ca7f41e39f93875bdc4 SHA512 bb08a1970a10e8d9571ffea3d021643de30ec212cd51317b98d6cf0cfe55d6877992921fb01d1188a6d466687335b77885685d924f8cb7200a0bec30eee05c65
 DIST libuv-1.41.1.tar.gz 1281506 BLAKE2B 4102df9559724c4f6bab090c57c8c976b7784bdc28243047c6c4cb2d61ce97deeb6f02e322238b98e9900575c981e8a586db852d5d34f0fd222a0091fc391a5b SHA512 dfd4996a2e8d6cc1ffe141921b2472070c8678cbbb8f0cf333dba7e7a36be0dee7fc3515152a27253252bbe48a9b29766d654f7f77137dd6f6bf0a8330c90fc4
 EBUILD libuv-1.41.0.ebuild 1358 BLAKE2B 9747dc11abcd8beecfb0c266b7ab6614d9b4e59da41dc26adb95099f7c586039bfcf4b962dd08bab5fc6d4a07011b83689cc8bb5825f39c8cad90e3f123a2d4b SHA512 470307b8d473833c187302907a74378e20123a16a382d801a4850d2b8adcaf610f019e6592b9766a304c807a12614a4d018d3da7b6b74ee746be8259ce046d29
-EBUILD libuv-1.41.1.ebuild 1366 BLAKE2B 417a761a89412ec9010fe8f7e28c64dd9faaa8c5dda6c5b920d372eb3283665db7cba9b73976264dbe043f898ae5a90e35e508cc628bc32491d803d38e141555 SHA512 265ab2037600825d36c12df3a4ff6db43631c28c481116963d9c5ba6bce555e18572bf91ac7900d74c1fc70d201d93499055bf89c9c8912b49ae7dda318b9479
+EBUILD libuv-1.41.1.ebuild 1365 BLAKE2B 2d2e5fe8270f112838f5b7c3edadb6163c72da25eba3169b388133d5484663213c044b5915bb7173d2c6d60edf42822774081952ac08f8194f508828fd843585 SHA512 4d0219d5b8e895de69b20cdf3e0c30c9f4b246f502ee6d183c8e95510a214431e12c7246b342126b419dbd94098706415e44cf5eb6cd1bfafec8e1aa50f85ce4
 EBUILD libuv-9999.ebuild 1366 BLAKE2B 417a761a89412ec9010fe8f7e28c64dd9faaa8c5dda6c5b920d372eb3283665db7cba9b73976264dbe043f898ae5a90e35e508cc628bc32491d803d38e141555 SHA512 265ab2037600825d36c12df3a4ff6db43631c28c481116963d9c5ba6bce555e18572bf91ac7900d74c1fc70d201d93499055bf89c9c8912b49ae7dda318b9479
 MISC metadata.xml 1429 BLAKE2B 78cfbe0bb9f028975aaf6721f96efe4e79ac0e14563a32bffcc4ed5509928c76ea28d5b7513290cdaf062c9edfccd8f8f1ffd30922739176a1919303a60e222b SHA512 c429cbb18602a7681a1c2bea6af32e889e33d788c5cdd1f1f5a8b99a9c533c5603bd612bca76ec37bbdc1eeb9bcf5ffa47018f71aaadf66785a3da06667661b0
diff --git a/dev-libs/libuv/libuv-1.41.1.ebuild b/dev-libs/libuv/libuv-1.41.1.ebuild
index f1d10ed56e94..94b9af4782f3 100644
--- a/dev-libs/libuv/libuv-1.41.1.ebuild
+++ b/dev-libs/libuv/libuv-1.41.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 7f79295a9f64..471fcc0da307 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,3 +1,5 @@
+DIST libwacom-1.11.tar.bz2 519285 BLAKE2B fb26190d752316b5d25659d2ae76681bfff1803463360aa138eab91ed7d7ef2d04dfb6bdd4f8c2effc45a495ef3afc312a817d4fd41cd8167172cafd9f5cee9f SHA512 24e8183502dd2b928d53b3d26d8479210e855c94c225649d63ac33062a30615654ff0ab8666a25503fb3253125539cd845ca467fb228a01c608dc3adbbec73b5
 DIST libwacom-1.9.tar.bz2 516223 BLAKE2B 272dd462bee6f152840fb684213d5cdf83cda05b71b95e28a4a307240fa3edcb42b7afb9ef0ac1bd8b470a138e54f3fed9509b02186aff771314fa87ecf3307a SHA512 d62da97038caeaf727800a680a4ef2ef49a56e632844b9a0d6c0eed9c808e033bc1d969aa1c523b4a1724dfb9b8b3665290ecb90fcdcfbf5f50cae2d06c0bffa
+EBUILD libwacom-1.11.ebuild 1367 BLAKE2B 952152d17625523859607ef17eeaabe11f946a56271b2602160ae304417af250d54517c14bd4b1f30eaae490b6852f00038fca28a5f77400c810c4466d32c3b8 SHA512 a16aee39b8cbe77fafbfb30dbec6b0ee66ef799b364c563cf5dd4a2459662aad0eeb16617809a7050bb3c07716a6aa3e241675fcd2eed9fc53d50b22ac82b3ff
 EBUILD libwacom-1.9.ebuild 1362 BLAKE2B 9362fa7a2ad34ac1c6a35dd056e34c5bfd821d92e8cfc1e593352088c3d8be6c0bbfa73e8ea9edd6a4baf5eec109db2cda72c59d366f9f5b463f011c18aa0593 SHA512 d89258d47923070b4b1e40ae689c7f473e28961d9ba068659bb5b5b4985a746b95cbdf0eb4f6c6910b486210b9d0db2ea498f097eb5fdaac1f2b2652c4d2ce3a
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-1.11.ebuild b/dev-libs/libwacom/libwacom-1.11.ebuild
new file mode 100644
index 000000000000..de40b8c9ca0d
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-1.11.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1 toolchain-funcs udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="https://github.com/linuxwacom/libwacom"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgudev:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-libevdev[${PYTHON_USEDEP}]
+			dev-python/pyudev[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
+
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+		-Dudev-dir=$(get_udevdir)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 3ac96b1fe53f..5cea0804428f 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -9,6 +9,7 @@ DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a
 DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
 DIST libxml2-2.9.12-r2-patchset.tar.bz2 5939 BLAKE2B e518a174385a121ca5545d0a51c2a2b4ddd21b1e7996e2806f368588b27d60e8318ab50ebfb90c3ee57ccece4f1c37e05c1daeed4203a4e9cb5a056ba530ad2b SHA512 06b96ab8426cd560c1147998965b5e718bee08536549a278269f6535ff1460ed97d83067ed0e8a4d834145a5e5a6caa912cf8aa5a33a360e4b1bc9d9135bfb04
 DIST libxml2-2.9.12-r3-patchset.tar.bz2 6281 BLAKE2B b7038f85009afdacc2fcf0b9cf30f915f20a2c8dfbe3749c6e74c637191f97169ee46b26deac5e347230d956f2d5aded218d09f0232f23b39ef4ad5e2fd09f61 SHA512 8170462eb3ecd2f834650309498a4e586fb3edb3114f42b3c95e96dc2ca81181e70ccd1790c440bd7ef4f489a2311b99765dcd12d9fb52207a11fb4394409ae8
+DIST libxml2-2.9.12-r4-patchset.tar.bz2 7006 BLAKE2B 64225a16346bff60f2bf3b6d32dffeec6887c44d308dd816d6de3b92ee7f7dd5599b5dfdae0b6ca9e056897c17b659ff36d170f972e1b6043ca3ec8de9c65050 SHA512 ca0734c894afc264851107c22a606b9094941a4452a946b769d6f7161b3301425da5bd3e26eeceb4e31e9721f76505aacf73eeaffa6699bb7395783915eff111
 DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
 DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
@@ -18,5 +19,6 @@ DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd10
 EBUILD libxml2-2.9.10-r5.ebuild 6644 BLAKE2B ce2df74f087c8f2c44ddfcc7ed98ac916e9441e425d08095dcea55c4cd28e3e8954ae8d700f2668fa942ffda0043d132027c64b736994425a63c5ccb30bfa9d6 SHA512 2219c61e1a9a9ece9e926e40cd924b6a3f8ba53660bee201b0123d439e31ab1190f8de985a1c9f78f56f8fc3d791cdb907a23fab54f0d823581c1e9273de4417
 EBUILD libxml2-2.9.12-r2.ebuild 6944 BLAKE2B 52a117d89831d0fb07eccc94bfba0e28444c5704cdbd476fe3cc8a0ac886f02ef63b0a7c8ff53ef371db422827c3527811b8f7709e60b40cb8aa548eedde9e41 SHA512 62b49df2388d217dcfa8a2e2c013869ffd4ea86569ebe6a6b7855f6c6c9d067606a03b8bb9f1147063ec9881560c8f5851cb925372d0140f9d4bd6b8e6da4021
 EBUILD libxml2-2.9.12-r3.ebuild 7098 BLAKE2B 610470493d1cbfb4094e1c8c2466fde0aeb9026b29c31d6f2790ca99c90361017a4e857b82e9340c6402554ca024383c08c165ebc8ab3aa54a368420a9bfeba0 SHA512 707f7efa06e4440be182a8ed3e16ace92c5869c272ebde85d14f9209fcf935375324ae0989b7a192b0dec57ca582696de4355c89aa7f8a3a75fefbadaa9b0805
+EBUILD libxml2-2.9.12-r4.ebuild 7293 BLAKE2B 2eee9e328543a0bcee103ccaae3035ea42795358c867c0db8beee383ca4b3b036c21d69217badcf1d1a75d83285e02ed6a16b4c3012f33ae1b11160dd9ea2a87 SHA512 a55bbed4a4de87318b83f1062338b70e5267945f07c7e4a902cb5153bde2cce9c4a9ae873b99c110e97f34b831d06fa6ec57992b83d8ad993a157c90ed9b7685
 EBUILD libxml2-2.9.12.ebuild 6677 BLAKE2B 935788b21c4c8908152c50266b36653455703a471b1a057bc165268620d26a1b3c42c0901032dd5b47c87ff6765423ca61007af28669850bf4b6adcdb6176a32 SHA512 c1ee354ea4eec2cb8820059059b08112194777f351d1ff281561cce2bd8ad26aa3fe05d5db3826c2f4f1d10ef5ae8037409ac65b02577ce81f88cad8f607dbb4
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild
new file mode 100644
index 000000000000..6027333fb815
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PATCHSET_VERSION="2.9.12-r4-patchset"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
+inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+SRC_URI="
+	ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+	verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc )
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+# Dropped keywords for now because it's a minor LDFLAGS fix, and it will ease upgrades
+# bug #802210
+#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="debug examples icu ipv6 lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-danielveillard )
+"
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS )
+
+PATCHES=(
+	## Gentoo
+	# Patches needed for prefix support
+	"${WORKDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	# Fix python detection, bug #567066
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
+	"${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+	# Fix python tests when building out of tree #565576
+	"${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
+	# bug #745162
+	"${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
+
+	# Avoid failure on missing fuzz.h when running tests
+	"${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch
+
+	# Respect LDFLAGS fully
+	"${WORKDIR}"/${PN}-2.9.12-respect-LDFLAGS-as-needed.patch
+
+	## Upstream
+	# Fix lxml compatibility (bug #790737)
+	"${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch
+	# Fix serialising empty HTML documents (bug #794733)
+	"${WORKDIR}"/${PN}-2.9.12-Fix-whitespace-when-serializing-empty-HTML-documents.patch
+)
+
+src_unpack() {
+	local tarname=${P/_rc/-rc}.tar.gz
+
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc}
+	fi
+
+	# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
+		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
+	fi
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+	#elibtoolize
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# 1) USE zlib support breaks gnome2
+	#    (libgnomeprint for instance fails to compile with
+	#    fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+	#
+	# 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
+	#    switch (enabling the libxml2 debug module). See bug #100898.
+	#
+	# 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		# Ensure python build dirs exist
+		mkdir -p "${BUILD_DIR}" || die
+
+		# Odd build system, also see bug #582130
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+
+	emake "$@"
+
+	popd > /dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_foreach_impl libxml2_py_emake \
+				top_builddir="${native_builddir}" \
+				all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake test
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		install
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	rm -rf "${ED}"/usr/share/doc/${P}
+
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index b3d661416ecf..dcc46fa8adf0 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.28.tar.gz 634470 BLAKE2B 1d75f761b171e5b6b34b58b80588b00a13d6ed041d8eee8bbda98ea6b9c381b98f386f653fbdaa75b3119f0701cdd1c25234863a6c5ec608c935dcbae2bf6463 SHA512 12a8013db5db531e22cbe9c3f2e1ddc2c31696e47f527880772933042f8ccb60cd03abd9ef865c4b4344c8efe88e9f275cea4b2c0c07fe6321ef31c9a77b0307
 DIST libzia-4.29.tar.gz 633172 BLAKE2B 418ce8eb6a034979948f284e5153c7cb903647e0e4776210d98a4d78c01a6147701c0be6afd21067a918ab91426cff3710cddfbdb8d4828da361c92fa71c987c SHA512 f487fb36faab0c96cb75ccbb3ce6cd51732648beb07d67a128402da294f406666fe0b65be6be49debd2b3bd78aa578c5c797aaad9dc4beac923333a0474442cc
+DIST libzia-4.30.tar.gz 633287 BLAKE2B 7ca2fa4eb4e887e77658dc66b455ab830da31634a121d2fc58ec4e038a62d09d2c392ca70dbe7df3740592d82e9861086f398d82fba1af8e4d6066c395dca3fd SHA512 ba04206427c6bfd63c4799e2728fd5487a75757a42281daf87c8aee87d3c685e5fa60a0c77409fa774e4fddaaa3336f96bce002e88e6ad54f9af2c2cc939b9fa
 EBUILD libzia-4.28.ebuild 972 BLAKE2B 9f4836d3afecae91e382f7a5bca85ff975027da86e4d9c1dcd100ffe283772bc526bb0086051b5d4459c4f562d25f0be303579b7f8f1facccca6fbb3353754c5 SHA512 5f024cd389418478031574adbc2f08a1550283fa3e1d3e37add45a232d9e2e4ec7e71d9cb1b48f5c24fc68f8374ff567b8765f7e58db11d8b0ba2cdab571b3f8
 EBUILD libzia-4.29.ebuild 974 BLAKE2B 5177c338c3ecad1e31a5280bb2d6464de5f4fe2b9f21fcc8bca57509de76d69ba40306753ee0caa93772fe9024a4c2284840480deb855300fa9fa7cb9f3e0916 SHA512 570e34e0a7e696447b8515dbf4cd382250128d11bb54608bb7635154da4b1b6bc76d547ae349b31341f87296791bb0b3f42a276a66092f5659fd5f88a633831d
+EBUILD libzia-4.30.ebuild 974 BLAKE2B 5177c338c3ecad1e31a5280bb2d6464de5f4fe2b9f21fcc8bca57509de76d69ba40306753ee0caa93772fe9024a4c2284840480deb855300fa9fa7cb9f3e0916 SHA512 570e34e0a7e696447b8515dbf4cd382250128d11bb54608bb7635154da4b1b6bc76d547ae349b31341f87296791bb0b3f42a276a66092f5659fd5f88a633831d
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.30.ebuild b/dev-libs/libzia/libzia-4.30.ebuild
new file mode 100644
index 000000000000..b085977f4099
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.30.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index ca8c311e519d..a53ae0239352 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1,6 +1,8 @@
 AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca055c02f6ff2d807dc36fb15c15e67c2aa5d3ac4ae11288e710e6e0e4830dced12a0817e395fcc2331547228eb8 SHA512 6f3a68b75fae6693ddbb47b88f8ede4a6994daa4476b3ca472b3ec62db26e36785e3bb7fe7375a9e78ffd0761a4d82351f5d02c30f8ddd55fa5648257526e98f
 AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313
+AUX newt-0.52.21-fix-non-POSIX-backticks.patch 794 BLAKE2B ffeba1923f7ce7d9f8349e6880b1439c3376f47cfa742e2b236b2072e3420120e1c6858437e1921295b752d63389aeea27eb5b22d39967d88f4894d153e22d42 SHA512 2e4c4c68add4a6ac107efa08fcff20d4a557252ebf246d38875d2f428432ba739469ab4200d94d3dfaf7ddec28e0b029e628e3b18678fad0cc2af731e7477032
+AUX newt-0.52.21-makefile-LDFLAGS-ordering.patch 1201 BLAKE2B 58d895ba0da3a1ce139a7257035ff41279c3432d002e57261e0d9051b6c6baf8044e774329bb24ed6807f42099817a4ca7cb2138ee3dbc37e3c3dafbf1d7d816 SHA512 e1f9e54238e2e6c700d301cb3017797b7dd396691528a7007bf4b316684269d6e4daf1f6973389e0403341bc650ffbed4b01ffa890e8d53af5a761941e93a03f
 AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
-EBUILD newt-0.52.21-r1.ebuild 2257 BLAKE2B 1a37298bb31eaa7c1dd2c9f7c84ce4559ffac24da3daf871fca504a27e31acc52e6025dab949f5b8bf16c8a7ae8b1f9375461367be926b0589a09e3c75e8495b SHA512 dc4bc7d10254340258012c60ea87315abbb7546715daacf4261d8b07a708df302d6388becd54ccdde8dda46501203dc43d8effc3da0b20793f737fba72dc467e
+EBUILD newt-0.52.21-r1.ebuild 2369 BLAKE2B f1cd44617d3daee421d3c8c9d9ba8c9e2b070b4192334967198492dc70a1f690f24cff6d7e457aff35484c6fcca5348410847989556d7b2a991097dcb30753cb SHA512 7a5b8d178f6129d0b2eb2f9ac33ee75e5bf0f2d5112c328e5964b35886648ddf826bb038ca85a2debeaf98cfb9a89c1c4614c38de39e11dd5b92dbc0c759ab7d
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/files/newt-0.52.21-fix-non-POSIX-backticks.patch b/dev-libs/newt/files/newt-0.52.21-fix-non-POSIX-backticks.patch
new file mode 100644
index 000000000000..3d6b87030dd6
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.52.21-fix-non-POSIX-backticks.patch
@@ -0,0 +1,27 @@
+From a37a8c15f4653b4edea414f42a0d76f3b1f5652c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 14 Jul 2021 05:19:25 +0100
+Subject: [PATCH] Fix non-POSIX backticks
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cb2b940..9ba4c64 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,8 +23,8 @@ AC_CHECK_SIZEOF([void *])
+ AC_MSG_CHECKING([for GNU ld])
+ LD=`$CC -print-prog-name=ld 2>&5`
+ 
+-if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0 -a \
+-   test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold"` = 0; then
++if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0 -a \
++   $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold") = 0; then
+   # Not
+   GNU_LD=""
+   AC_MSG_RESULT([no])
+-- 
+2.32.0
+
diff --git a/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch b/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch
new file mode 100644
index 000000000000..f05075adb371
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch
@@ -0,0 +1,30 @@
+From 22d44d2cbfcbec216d0028ebdf274247139a8045 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 14 Jul 2021 05:12:32 +0100
+Subject: [PATCH] Swap order of LDFLAGS and P*FLAGS
+
+Needed to respect as-needed.
+
+Bug: https://bugs.gentoo.org/798945
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1047efc..f0bc417 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -97,8 +97,8 @@ _snack.$(SOEXT):   snack.c $(LIBNEWTSH)
+ 		PLFLAGS=`$$pyconfig --libs`; \
+ 		echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+ 		$(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+-		echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
+-		$(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
++		echo $(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
++		$(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
+ 	done || :
+ 	touch $@
+ 
+-- 
+2.32.0
+
diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild
index 4eb95be86239..b2727a258f8d 100644
--- a/dev-libs/newt/newt-0.52.21-r1.ebuild
+++ b/dev-libs/newt/newt-0.52.21-r1.ebuild
@@ -29,6 +29,14 @@ RDEPEND="
 	"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.52.13-gold.patch
+	"${FILESDIR}"/${PN}-0.52.14-tcl.patch
+	"${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
+	"${FILESDIR}"/${PN}-0.52.21-makefile-LDFLAGS-ordering.patch
+	"${FILESDIR}"/${PN}-0.52.21-fix-non-POSIX-backticks.patch
+)
+
 src_prepare() {
 	# bug 73850
 	if use elibc_uclibc; then
@@ -54,11 +62,7 @@ src_prepare() {
 			|| die "sed po/Makefile"
 	fi
 
-	eapply \
-		"${FILESDIR}"/${PN}-0.52.13-gold.patch \
-		"${FILESDIR}"/${PN}-0.52.14-tcl.patch \
-		"${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
-	eapply_user
+	default
 	eautoreconf
 
 	# can't build out-of-source
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 3f3e77c032aa..1ae6a8ec1ce4 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -5,9 +5,11 @@ DIST nss-3.63.1.tar.gz 82166899 BLAKE2B a3c1939d16dcb083fae819659c0a61ff1d4dab70
 DIST nss-3.65.tar.gz 82386222 BLAKE2B 4e1876a12d042b67c6654a8396611ca33d5257b07c75b55201de229f0a6860577886f38d640837d6512b30a074d05b917bae4e34263d9c0f6f4606c80b369a04 SHA512 6f980f44056c69c74754124ce16d4880fb47440146d55906584f70d1be8e74885570308914d4482b3ee676a1f5b1e529616eae8ccd6906d678394dd929dd0825
 DIST nss-3.66.tar.gz 82401896 BLAKE2B ae369899af681e1c6ea8046098c83da08c2112b16d85a0eaee46e9d4f97dfb3f7c3e97eb681ec947b5648446c6db51e8f1396ec9bb6c731c9678ecf925e7f743 SHA512 327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467
 DIST nss-3.67.tar.gz 82402188 BLAKE2B 00733c3f3b47e9dd5d5492ecc67baf2507b2bb446a7245422065f1ff28fcfdca25b6e93854ab5b1bd8b2706821a143b5d1d33273008982416148a8ced8e5117e SHA512 1d3fa3fafbf3e54c9c3b54b0b3c291aebb48542380a1b704fa07359d3cefab93f166b31928c9db190ed58118e289e67ce8aa1619e4219d69b2c098484a22bc9d
+DIST nss-3.68.tar.gz 82405833 BLAKE2B 0a48c599bb3c97f41e41c5723e6c1b12d7f03469bf37593f62973817b7cbc9257b97a17ca2393d737bda51536c0b81169ec38b9ac6baa2c9dc7a61ae7817f103 SHA512 be1197320620ffc9c00aa8aec14de71b5c0bdbfc286309fcc5e995c74d1249cea798fd226ba613b345719238b73883af9f2bc28e1e1f698563767295df518a6e
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.63.1-r1.ebuild 9222 BLAKE2B 8c6ad2c1156913b3a21c056524ebde104e2b6d2d8422eb5f3ae8c9782bf671ce70f8e6ccc527201e7d4c6ce3e7a703d00fe349c719368f6df0d96a36f0be06d9 SHA512 e5e73cbf0cfb93d4493278e8ec93faeb704196d5ec19aaa3e27c42518c611605b87118f2fbfe546575cd549a98c2df2b09da42bcf4a26eb86af56678fbd8b1d9
 EBUILD nss-3.65-r1.ebuild 9230 BLAKE2B 408cc679ea3d4aab61374410a0ae450ba24881f2d33879a2f98548ab282f7ced8066eee1cf3d77e981784f7359126d773985e6bc024bb93e6932fe5e7a364cbb SHA512 d6d578c57b87341aa22ffb207be76c85de7442a7ed50ff91c910d8e9d49246a3fe39451b4ff6c85c9a082f4d87f7ae86808863823295c32244eafeeeed577b07
 EBUILD nss-3.66.ebuild 9230 BLAKE2B 408cc679ea3d4aab61374410a0ae450ba24881f2d33879a2f98548ab282f7ced8066eee1cf3d77e981784f7359126d773985e6bc024bb93e6932fe5e7a364cbb SHA512 d6d578c57b87341aa22ffb207be76c85de7442a7ed50ff91c910d8e9d49246a3fe39451b4ff6c85c9a082f4d87f7ae86808863823295c32244eafeeeed577b07
 EBUILD nss-3.67.ebuild 9237 BLAKE2B bc0ef88598f5eb481470668e32364f71b44ea23c69457a4ad9b5de894d2e0a8632b16de2cea8d233912c7da5c87995224044a7e08b416fde0ac1dc41abd0cf12 SHA512 c38fc9ccf18a4ea0fe7409e1839713b9fe0f95f3b7bf49d7915aa30fa07155c89a275cb914dd852d788e1c6a43026cefd019b535a82a3b857d7e52dd79d50f63
+EBUILD nss-3.68.ebuild 9237 BLAKE2B 3f37145dff053702335447f0034f45920c7e3ba828e38dbd59cabbe44dc41c1c8ed41079c225d56deeeef69a3545f7dfbf02d9b9d8c5af3509a3678211340a28 SHA512 ad5d2e8c3e4e38aafae17514a7e9f4e215d45111d995562c209e50b6061b4eb6c3a07842b3dc7df2897a47f535a57c291fd5fa4f2c90297ed0f58040edb7b967
 MISC metadata.xml 516 BLAKE2B d2657cd7422f790cd002e8cbf149bf840888d5a95598f5366dc88ef31fa7a34df20de3e4bab9a1e6a165dd34321317916bbb605c9f850d92bfef19bd4fdf5cba SHA512 5423340287855dc948c1897ae770c2f11a3a5fddce3e484803cccbcda6074825b5037d7fb16cdc837222c85be3c11f37c85045702462f73e56e9fe5ef1cd0259
diff --git a/dev-libs/nss/nss-3.68.ebuild b/dev-libs/nss/nss-3.68.ebuild
new file mode 100644
index 000000000000..6f5630e89284
--- /dev/null
+++ b/dev-libs/nss/nss-3.68.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.32"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert utils"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index a10bea38e1d1..e6d655704325 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -4,7 +4,9 @@ AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84
 DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
 DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af SHA512 817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
 DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e SHA512 46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
+DIST opencl-clang-12.0.0.tar.gz 25292 BLAKE2B 6979ce3f37b0e29e6b7ca9b015c04af6e01ceb6381158492a928d805b26b9bddf00b7a7a3edd987924f1c3a8ad914b7d6e9d9fea22b12166afceb25365edae6c SHA512 7fa05480b10be97dd784b8fb7579a2471cf3a904facd9949a980602085515bb3d42a042c74db80381771ad18f78bed2efdcb09538a865ac4a600d6190b8f9c31
 EBUILD opencl-clang-10.0.0.1-r1.ebuild 1135 BLAKE2B 1c99942d66a2bf1e3b9e8f4e8f778b2af0452529f6bfa1aab10e1fab66739296613853180e9b22a8aaea8c5f53dc84cbdd235a79b8d5fed479787f48e4148e8b SHA512 631065c3510b38de41ea37663bb95fe49fbce708f363a654ee532f50f5743b115b1c73d1b2a40258d3aa6f9ae38de196ba32aac31db6bf76ca97df44b2fbbdcb
 EBUILD opencl-clang-10.0.0.2-r1.ebuild 1156 BLAKE2B 267d9b3b910ec6e141aaa7ae309eae9b50f5212f5d56084ae4c339f1df563839ac24292d199544e152fc0f39e12dab5e8c9268470ca36deb0fc98bdef381d84a SHA512 647d1edbd6d2a69ea16e5388c56e0b933c0c5dce741b028a1369a07398fc485bb30cf4836641bb23faf68f63c0196a11300499e65ad67a4ae00de20dd2a1bfb8
 EBUILD opencl-clang-11.1.0_pre20201222.ebuild 1263 BLAKE2B b84ef38978e43306f5be92a6c138b4aa704d77374e70b8f2c3275168f0ae24bd3a303d87ebbbaaee04f85aaea3f8914493863171ee8ef874b429fcbeb31b6d5f SHA512 3879464f9d72f46bbd6dce799a63d1c62e174635299753df2d1174a4c47cc97ab8f3d698c06c2e636ca9f76ce564f55ee871852fa4aca40786fd3a1a925fc918
+EBUILD opencl-clang-12.0.0.ebuild 964 BLAKE2B 374605826e266e1d26621d4c8161f3adf523a6cdaa62ab75e82c52c14ddb935cedf88c51a4e443ee2f37e80436f950f61d56706bad9090521c3e4e0689666cc1 SHA512 c6bf4c8b449f2cb181337b7848b416faab498f6643e8aba00997c7680b1e5363751dd93839214725a7268b2f192f1d13b492a3eff85f2697196adf784b4a8b11
 MISC metadata.xml 250 BLAKE2B 7be2fdb3efeddaad6369a79b3c29566a4a6d596bb6ee9408bff4c82c1aa151ea3ee99f30d2b6813caa9348c9d7809b38c017a43c6b49251b75c9d7b365f7c5b5 SHA512 5e202e141a05c33cb2a627e147dc3439d344db0a04529fdbee7c0d164a40bf0a847818fb94f21f3a45f1104fb6be421fb16442db0688d50eef8b4771ab0e85ff
diff --git a/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild
new file mode 100644
index 000000000000..506fa5f64d2d
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib llvm
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="12"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-util/spirv-llvm-translator-12.0.0:12=[${MULTILIB_USEDEP}]
+	>=sys-devel/clang-12.0.0:12=[static-analyzer,${MULTILIB_USEDEP}]
+	sys-devel/llvm:12=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+LLVM_MAX_SLOT=12
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index 64afe3b7e273..8d09639ea026 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -3,5 +3,5 @@ AUX openct-0.6.20-slibtool.patch 1353 BLAKE2B b8a5747258cb7d5ac8bacda87c9eaf2f17
 AUX openct.initd 502 BLAKE2B 5f583c50b138d9017aecbda25aeb74f09643ea461be3449c50c4ca61a0379c50bf22036cfe46ec3e606519ddd94a49add053da48f8987d5e6f2e790408ad48d5 SHA512 18cb14070252c3f1babe117d5f6fe91639b1bdb07fab953573ba143e5cc49b55964ae56427f0cc741fb3d90e54eb2eec863864a340229929ad5f2aab21723f23
 DIST openct-0.6.20.tar.gz 702818 BLAKE2B 13637fa914394e1e553d750062535c879ba11c6587c42570e2bc92c4af9f732a9b0dfc06e2140f4965480363f8d65bc5831f905910d734c36034ccf1916ad302 SHA512 5175b418847200dbd4af0d8ab09546d94568639c67db67bdea93c68cb042c7ef901bb356784d6b1d9f4de914535eee5a450b39a15d1ab9a676ffce790a408a3e
 EBUILD openct-0.6.20-r4.ebuild 1868 BLAKE2B ebbf993782fcd0d9e1d8d355a7896a85e26660e516c856c33677db34424f28a737f8d30ddbbf3ff292c16cb404247d02d6dd8b3f3d54140e1ba565d4c0fea6cb SHA512 1680b4bcf2ab446a6998af48a5a3abff32860620784403ec240e1962a2fee5163e810e67de601439720ea613f9de5433c007338a6923ee3a2889b440db240dba
-EBUILD openct-0.6.20-r5.ebuild 1859 BLAKE2B 87fee515cdcc320f0e10fbf1b071af52f8dd72e8547670b689a52fe6abcf82a0213c77977c0a4b4d6a0e0f52629a9b7b8a783d5935cb31bff7cfff3575e4f47a SHA512 a26d692b9d2da8ccea128beae188590fe245f8239e9059fad47da1a15a54568aa76c9d0d8852e99dc4866da0cfe470f5062b26661f130edd1deabf3fc26e4480
+EBUILD openct-0.6.20-r5.ebuild 1855 BLAKE2B ba2a8828594d5784ca5af3ea60b36a7eb634b4cedda257b471d46da4fa171b7bd3b0e49eef192481a97480d229a36141708425611cfd89a11b73d9906bf4d777 SHA512 b71aed457d41defdfac52b1a98832dcfe38b9fdb5bd92148aee8baa2193f97b8e0d57d309fc62b7bb598007877c6e6c3ab161a033e33d311b2e947eab3f86533
 MISC metadata.xml 559 BLAKE2B 37c964c92180aef50b1af8902e5f5466627038019ed50715a80fe0a0fb512726dea43d494e134cc7f9c7581406d5071efa948815405a9c25ae17116c93137e84 SHA512 b893e775d0ae84baab3a0faef0cbc3e9704b28b4a079326444ee7ff1178f241db33f8cf8d2ef95685345eebb783cbb41d5a7fe0dcb9ece420b902ef08a867032
diff --git a/dev-libs/openct/openct-0.6.20-r5.ebuild b/dev-libs/openct/openct-0.6.20-r5.ebuild
index 6183a18acb12..d72b32674b28 100644
--- a/dev-libs/openct/openct-0.6.20-r5.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
 
 SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 25fd06e48637..6d1ae2ad531c 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,3 @@
-DIST qtkeychain-0.10.0.tar.gz 38488 BLAKE2B 229270158f08a17e391a68bb6eaf6a1924fd1e5caa9ba026e15619dd159d1514894000a74301a2f2dda706f0629b5bc06afeb38191700e834d412c9cff505263 SHA512 de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6
 DIST qtkeychain-0.11.1.tar.gz 41001 BLAKE2B 155ca333d403e6ad91c2f733dec06e7957d3998c8124156cf33ea9b79521a6838e9c5a317b591897543b820d436d89ce3eada6425318d801834c133b6c55c982 SHA512 45551003000b8ed76d44767c54d18dcbb956d5aeb63d8bf2f0fc06c61eab4d7d2e70b894e9c0729722dfcb5004f818f4f4c9a413444fc2aebe0271f104b500e6
-EBUILD qtkeychain-0.10.0.ebuild 912 BLAKE2B 341affb568d1a6d996ff9406b5b05ceff59a5d88b25c8e036836ea322dbd2f69877ab0dd86f4e14a7ce9263ca583825823ef2f7d62c1753cc61b7c04497b722e SHA512 63996a4ee7e2bed0f7a9f47db4f7815874dd4e85dbdc2c171794795e72afa57674db12132e94ade8a12d2ca84eaf30f77b1dc4ccaccba1e3235eacc84dc9d778
 EBUILD qtkeychain-0.11.1.ebuild 912 BLAKE2B d3aadb60a1d4f2bb71e5c375e295b52604d56ba985f7c1deffdeab62cf5fb2a6bc1251aadf2ac165b257fa8365f9c6e9624f6e02db0322127b173a0a4a793024 SHA512 c1a328752f37c523e5f9425d9a15110d9bc24fbc6759b99d3fc7e60a2bbc36472321d3f765a8c55f76fe6536011c5857cdda6e5bda86c462132e0b38b059979a
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
deleted file mode 100644
index 4c6ec3117e35..000000000000
--- a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-DESCRIPTION="Qt API for storing passwords securely"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="${HOMEPAGE}.git"
-fi
-
-LICENSE="BSD"
-SLOT="0/1"
-IUSE="gnome-keyring"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	gnome-keyring? (
-		app-crypt/libsecret
-		dev-libs/glib:2
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog ReadMe.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT4=OFF
-		-DQTKEYCHAIN_STATIC=OFF
-		-DBUILD_TEST_APPLICATION=OFF
-		-DBUILD_TRANSLATIONS=ON
-		-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index 3866c36cb0fb..5f3eefebef0c 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -15,6 +15,6 @@ EBUILD rocclr-3.10.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a0
 EBUILD rocclr-3.8.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-3.9.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-4.0.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
-EBUILD rocclr-4.1.0.ebuild 1156 BLAKE2B 0d5f9a4fa0a4dcf53be260c2dce9f1e560b38e44369f4b9395b9e2a48e746317826b7176666f9bd0b423a582a0ecb82fbb79168d6d3f263ad47306c8ea9db328 SHA512 d54d34e13ba0f2990ae2ac2144c2fac19b06f3b683711e0729194d8374f612bc7652af94231dbdece5dd83531e57ea706a1cfe0a063621229442aca2d33f8ed0
-EBUILD rocclr-4.2.0.ebuild 1156 BLAKE2B 0d5f9a4fa0a4dcf53be260c2dce9f1e560b38e44369f4b9395b9e2a48e746317826b7176666f9bd0b423a582a0ecb82fbb79168d6d3f263ad47306c8ea9db328 SHA512 d54d34e13ba0f2990ae2ac2144c2fac19b06f3b683711e0729194d8374f612bc7652af94231dbdece5dd83531e57ea706a1cfe0a063621229442aca2d33f8ed0
+EBUILD rocclr-4.1.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
+EBUILD rocclr-4.2.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
 MISC metadata.xml 511 BLAKE2B d2b374303172e793b16f6cb1dcd569e4f112ed2a2396f8ee85d053411b31688c2fac0c20ddf43205ad04aa36f910edcbc0de57b4e972615953b22e2475b3fd7e SHA512 349b4d3a8bc6414c5d015f8f50d4b09869e04dc67fe8317644cb148752dcdb767beb2d0eb18dc83bb50e9927e81fcbd1e43134e9a0ded14fd16bc109c8518365
diff --git a/dev-libs/rocclr/rocclr-4.1.0.ebuild b/dev-libs/rocclr/rocclr-4.1.0.ebuild
index 46dfd99646dc..14d12c5c2f5d 100644
--- a/dev-libs/rocclr/rocclr-4.1.0.ebuild
+++ b/dev-libs/rocclr/rocclr-4.1.0.ebuild
@@ -31,7 +31,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_COMGR_LIBRARY=YES
 		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="/usr"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 	)
 	cmake_src_configure
 }
@@ -40,5 +40,5 @@ src_install() {
 	cmake_src_install
 
 	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
 }
diff --git a/dev-libs/rocclr/rocclr-4.2.0.ebuild b/dev-libs/rocclr/rocclr-4.2.0.ebuild
index 46dfd99646dc..14d12c5c2f5d 100644
--- a/dev-libs/rocclr/rocclr-4.2.0.ebuild
+++ b/dev-libs/rocclr/rocclr-4.2.0.ebuild
@@ -31,7 +31,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_COMGR_LIBRARY=YES
 		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="/usr"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 	)
 	cmake_src_configure
 }
@@ -40,5 +40,5 @@ src_install() {
 	cmake_src_install
 
 	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
 }
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 60ef596f65f4..38fd0560f825 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,3 +1,5 @@
 DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
-EBUILD starpu-1.2.6-r1.ebuild 2219 BLAKE2B 8ecb15979996b37e5a1bb7bcfbf74cee8b18e386e1784000a85aa645f23a547efc6952f8241f0de8034bd561dfd93b0c54983755d34e0b8eb31c39a8729e6efd SHA512 43a764ff2d24978893584e0935156539fc59df453b9783a71b907ed7334a48843d28a407f0ea971c53954bb88d5c142d5959cf995e7c99254f6c56ab9885acf8
+DIST starpu-1.3.8.tar.gz 12895856 BLAKE2B f04096b03d5c035fb9cc6c193a482bfe9cd348c2245ac9e5cc22ad7595f8bd61ee71d7734c6e10db227c4185fc5719d3de804d82639ce0446b923ecb5c0c4249 SHA512 cd1a8c0246d91c6d405576329222292577282fa175201c758a9d5bd75d827ff59c7e2d9418082ffd5f14a26272fef449eed4a34778d0376d44c3594a2033849a
+EBUILD starpu-1.2.6-r1.ebuild 2235 BLAKE2B 48d84321048eb6613e0c87e2ce8405f4c30b473f35e3e111eb9ec246b0c19a2a50a00217a62664cd195c626c9e52078968f6f28f568167a121f649dd27b8917f SHA512 ebb30e1b5e50eefdcd333d30c1d9ad1eef5942550b5b9ce4434aa59b0cd389926419c59c2d4bf1bc0f6a808bbdc3d1a28e346f1f764e4cb9cc9ab8613d0ad46d
+EBUILD starpu-1.3.8.ebuild 2267 BLAKE2B 3d3f70701dfcf6ec74ab39c75b7552681e31fde47557148a80db8e76efc902a07ea842a27f7be4884c440015bc0efbdf70cd65a0c00013afeae029627d250b86 SHA512 7a70618315d6c3fbcb675ef2e5e17e4af383aa58facbba1c7566019ec148ab390a51a12e6477dd24c7d973474049588057a6889f5a69543aeeff0b16bad3fd61
 MISC metadata.xml 987 BLAKE2B 7b8a207da7c02ecbc5e1daab83666d19d8c1128c6e05376167707ea6b411b4bed2673d9f0c9840284ab5c6f684bed3a67fddb8fc6f25289799470a4e33792e11 SHA512 97e9412721fcec2cdee55d75ce4d8c6eb20af75adfc21bcd556a336a8ee57c138be47afb881fa77180cdc4c27975d000be965f2170f7f29db85056bfbb01cee9
diff --git a/dev-libs/starpu/starpu-1.2.6-r1.ebuild b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
index 8a4a7251ea18..641c60725b3a 100644
--- a/dev-libs/starpu/starpu-1.2.6-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 FORTRAN_STANDARD=90
 FORTRAN_NEEDED="fortran"
 inherit autotools cuda fortran-2 toolchain-funcs
@@ -11,8 +11,8 @@ HOMEPAGE="http://starpu.gforge.inria.fr/"
 SRC_URI="https://gforge.inria.fr/frs/download.php/file/37744/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0/5"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="
 	blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl
@@ -33,8 +33,8 @@ RDEPEND="
 	valgrind? ( dev-util/valgrind )
 "
 
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen virtual/latex-base )
 	test? ( gcc-plugin? ( dev-scheme/guile ) )
diff --git a/dev-libs/starpu/starpu-1.3.8.ebuild b/dev-libs/starpu/starpu-1.3.8.ebuild
new file mode 100644
index 000000000000..748f3df483f0
--- /dev/null
+++ b/dev-libs/starpu/starpu-1.3.8.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="fortran"
+FORTRAN_STANDARD=90
+
+inherit autotools cuda fortran-2 toolchain-funcs
+
+DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
+HOMEPAGE="https://starpu.gitlabpages.inria.fr/"
+SRC_URI="https://files.inria.fr/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="
+	blas cuda doc examples fftw fortran hdf5 mpi opencl opengl
+	openmp spinlock-check static-libs test valgrind
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-mathematics/glpk:0=
+	>=sys-apps/hwloc-2.3.0:0=
+	blas? ( virtual/blas )
+	cuda? ( dev-util/nvidia-cuda-toolkit
+			x11-drivers/nvidia-drivers )
+	fftw? ( sci-libs/fftw:3.0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	opengl? ( media-libs/freeglut:0= )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen virtual/latex-base )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die
+	sed -i -e 's/-O3//g;s/-D_FORTIFY_SOURCE=1//g' configure.ac || die
+	eautoreconf
+
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+
+	econf \
+		$(use mpi && use_enable test mpi-check) \
+		$(use_enable cuda) \
+		$(use_enable doc build-doc) \
+		$(use_enable doc build-doc-pdf) \
+		$(use_enable fftw starpufft) \
+		$(use_enable fortran) \
+		$(use_enable hdf5) \
+		$(use_enable mpi) \
+		$(use_enable opencl) \
+		$(use_enable opengl opengl-render) \
+		$(use_enable openmp) \
+		$(use_enable spinlock-check) \
+		$(use_enable static-libs static) \
+		$(use_enable valgrind) \
+		$(use_with mpi mpicc "$(type -P mpicc)") \
+		--disable-build-examples \
+		--disable-debug \
+		--disable-fstack-protector-all \
+		--disable-full-gdb-information
+}
+
+src_test() {
+	MAKEOPTS='-j1' default
+}
+
+src_install() {
+	default
+	use doc && dodoc -r doc/doxygen/*.pdf doc/doxygen/html
+	use examples && dodoc -r examples
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 5ebd8f780786..16b039e38d4a 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
 DIST tree-sitter-0.20.0.tar.gz 2876764 BLAKE2B 058f62c2067ce5fcf9440f281c63908f93fda09a6b3604d7196b9c56a15ba88ded7d75f9c21b4c5c4209f587fb5f326ae655cb5f5d84b46bfd783b2147048568 SHA512 a51fa0af45a6a99bb74ff53c15a4d7939eb24c6720e65ec7a96f74ffbce54801f14539e071ec6a4891dae778d7dea5edcecc6dd57716cc70a891c9e6cfa55013
-EBUILD tree-sitter-0.20.0.ebuild 777 BLAKE2B 43833ea5d0250dd2d8a0fc5cc9b7193b41f4d3f1ecfdcb9c0bb91e950d9e994a2105315b67f3911bf8ec38fb55c8e4fba0695333d2eb8ec7cf7b52913f21b98a SHA512 de14e983bf302da3394594f341f1fdb6e6ffaef60671e68f79a0c6c4b5f975e687f8aafcffb7e544b7fc16870c26e89083ac563c1b7861c351442f78b2e8b1bc
+EBUILD tree-sitter-0.20.0.ebuild 769 BLAKE2B 4b002ef473d20d7b2baa617cd5b336e58280d56b8f3386fa919750586cdb5493ae80e594e2f4e30f2bf3b6b4156c08dacd59aae2fcda9edd1c8cd32d1d7a9afa SHA512 f7a5d6b7df837e1cb9014b5870b1877a5f472809cabb97a464d7351c14196d454d89d0867769ef81b7fb02564574f96126210a037e67b0de11ced60b543174e7
 EBUILD tree-sitter-9999.ebuild 721 BLAKE2B c4f01a037f3f9d80c88cceda4c99449b93c80095a6622e3d66dd5bcbda1b326da581aab1a7fe2b2aa5904282b6b41d73864bd00b2d17cb99b24fff8d776f0411 SHA512 a19b1cd1cefe444a461e78f1b3298a715f4b2dc0151e00b831bbf4e5387be5db91db2178d612dc2a613cb3efd5d9c464f61e68b41cf357d57ef0ce4865bb985c
 MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.0.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.0.ebuild
index 3ae0a4de6290..1e6295e06d4b 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.20.0.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index f432c36bc3e5..06d5f394b4b9 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,3 +1,3 @@
 DIST uriparser-0.9.5.tar.bz2 176501 BLAKE2B 5ec3d993e60c62f2478e4012354cf82f2e4155ea1a69e9a3d6611d1765fe0f3b8ba5382c928852a5fd215f51ebb0688c9d713e9f1208f18f5ce2d8b8f0fb1dca SHA512 44d36a33565b7724d721e2b5e689530227bc87e609ee78f1d23e7353480191313b1b91039c7a046566d14b83eb320c97d75e74c8ef4841e1b9c8559c3feddb34
-EBUILD uriparser-0.9.5.ebuild 1410 BLAKE2B 34585430e663a8f5d2831271d16d2653688ee8924df945151a93e37efcfdf5785f077f872cd91e1e6b61c27b943615584da6c94d28281fa6b6fed4fcff7c002c SHA512 6581fee2794970dbe2f34542b51d3cfba32a94578b5797090a85e3de1ad876e5705ae7a829bafbfaa277cb47a7db6c5b16debf06556ab535d48b665a3d0e043b
+EBUILD uriparser-0.9.5.ebuild 1409 BLAKE2B 0e43acbd9931b5e77508787d3783370949ea8c8dfb0291888ae6d77d064d05a0a4a8bfdf2cc3c32ce8a856c34df39bc0f69b52d42499fccf19dde0afff2358a6 SHA512 42e5a7f98eaf9d9ecd831fc0c2c967254840aaf37367635d5e9820bfb7573f2a47517375898c3da634345acefe1e7aed2153b61bdbecd6792b79c5a82d1663a1
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.5.ebuild b/dev-libs/uriparser/uriparser-0.9.5.ebuild
index 9c4bfee7c144..ffb70dceb648 100644
--- a/dev-libs/uriparser/uriparser-0.9.5.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
 
 REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index b14e0c5e37e9..279c79345e91 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/hyperspec/Manifest b/dev-lisp/hyperspec/Manifest
index 8eceb6b4a79f..b76b7ec104d6 100644
--- a/dev-lisp/hyperspec/Manifest
+++ b/dev-lisp/hyperspec/Manifest
@@ -1,3 +1,3 @@
 DIST HyperSpec-7-0.tar.gz 2032830 BLAKE2B ec72b57fdcf669fe400dc2729191cc7c387172035d0663816fcc18450543052d3a958bd9042ef67bc70a1ccb07e74b189d32e1c790cdd1b721e8d74a6a88412d SHA512 1b9058fe1ae2e283f4a68211dc659021e04bd10373d7c2392f4fa496543e2454f96c7eb671bcb1e72c906456792f8a265a5e34bac24d01e2c0e7fb1ce359c370
-EBUILD hyperspec-7.0-r1.ebuild 574 BLAKE2B 967e16add9ac5b61af4c74466396ae2747bb55235aaf2c012abec64f851ce217049114e297fbac300fe00efd68d5964bef4fda6dabd0b5a23aa338cc1ac8cb3c SHA512 616381fbfc929e1cca7249875627abece27f76c924a1a701db0a77e5bd59df02ef9e951c85108a93f0a36fe7e22d7f7f59d40973afae4f55bca0ea4a1a0b0bf5
+EBUILD hyperspec-7.0-r2.ebuild 434 BLAKE2B fa7488beda86c36648aa9756e36b030cb1ca661d97860f87ee2d501c22a924fb916fde98e0c7f5ed97cf16584c4557cfa2fd6303b8c70077c46d48b03075ed25 SHA512 e90b88edb10526d52447566f97888009cde4da38ed78ba0487dd1d76965e0b56af315dce16c27e1366eb37d9cdfee22b4851823d9e2157cebe4ffed3fe86ce96
 MISC metadata.xml 261 BLAKE2B 161dea7ab371cbcbc08b8aac63e402f9fe994c08d55f2291360e900bf73e21f2c2ea67b6fcc3cb000f1cef03d1c41c6d2e5e16dd06d6916ec90d4e54a1ba3dd7 SHA512 fb754c4ed3579db5dbe303197a05647b7cfab0a3fe47fd2140d5f77641be752d10ccf49a9c267406a0f3ba3dcda8831f778b9596d723f65aff10142bfad60d3d
diff --git a/dev-lisp/hyperspec/hyperspec-7.0-r1.ebuild b/dev-lisp/hyperspec/hyperspec-7.0-r1.ebuild
deleted file mode 100644
index a5bf5ee0c5e9..000000000000
--- a/dev-lisp/hyperspec/hyperspec-7.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/./-}
-MY_P=HyperSpec-${MY_PV}
-
-DESCRIPTION="Common Lisp ANSI-standard Hyperspec"
-HOMEPAGE="http://www.lispworks.com/reference/HyperSpec/"
-SRC_URI="ftp://ftp.lispworks.com/pub/software_tools/reference/${MY_P}.tar.gz"
-LICENSE="HyperSpec"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-DEPEND=""
-
-S=${WORKDIR}/
-
-src_install() {
-	dodir /usr/share/doc/${P}
-	cp -r HyperSpec* "${D}/usr/share/doc/${P}"
-	dosym /usr/share/doc/${P} /usr/share/doc/hyperspec
-}
diff --git a/dev-lisp/hyperspec/hyperspec-7.0-r2.ebuild b/dev-lisp/hyperspec/hyperspec-7.0-r2.ebuild
new file mode 100644
index 000000000000..8f42e8c8c735
--- /dev/null
+++ b/dev-lisp/hyperspec/hyperspec-7.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=${PV/./-}
+MY_P=HyperSpec-${MY_PV}
+
+DESCRIPTION="Common Lisp ANSI-standard Hyperspec"
+HOMEPAGE="http://www.lispworks.com/reference/HyperSpec/"
+SRC_URI="ftp://ftp.lispworks.com/pub/software_tools/reference/${MY_P}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="HyperSpec"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+DOCS="HyperSpec*"
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
index e8eef6f58b46..ead9f3673088 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest
index 857aba3f36d1..51c409ec9b75 100644
--- a/dev-lua/LuaBitOp/Manifest
+++ b/dev-lua/LuaBitOp/Manifest
@@ -1,3 +1,3 @@
 DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
-EBUILD LuaBitOp-1.0.2-r102.ebuild 1787 BLAKE2B 12e717ab5d2dcb234207712214a6775977a1e9a3b333f56b5afdf9203abe4005f8a7b84c77c2b141b17b85694075fe2020269f84eff0de312506695cb4aed4b2 SHA512 3bfcd01757ce3a3bac4018f5c4214fc1a7a8d524b77986889acdd0da0f3d3c40cf4ffecfcd9e30212ef3729f7a38a6c8b1284747e8d41e03fd8dd1fd708c4718
+EBUILD LuaBitOp-1.0.2-r102.ebuild 1786 BLAKE2B a9ae25e330e14038a7eea586305fc032164bc348719a28e952484266f733888a90b3b4ac381a59eec633bddbf532682d654ba8ab3d4957c555e6a0470ed01588 SHA512 d43768abebfb7e44b2522bf7612dc6de789bb5c35d3b65eee60828a7372e85b21051304dbbc218901a184bb3aaf6746fe1014a5e9f81fec8277d844ab4d05c2f
 MISC metadata.xml 359 BLAKE2B 79db34737be833f5be7d7cfcfbee74d93b016909b64a8cfeeac382b70f1ef9487630c5dc64dde58d37ae98a16d0ee96f4dbff8667d125f4d0af4a97275a72b78 SHA512 21a61aecfde180a1f2d721eefc332780f6fcabadcecf5d19a00534e65c84e8c538c988239bfc938e4c7c6a60a5915f6f685b882314067521f7c293f37197b96a
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index bf2e93c6782c..a9a11a1054d1 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 2497c7d0424c..a14e62487a62 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 3e717c4b60fc..ca081c50075b 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -1,8 +1,9 @@
 AUX findlib.patch 645 BLAKE2B 63c8dc3a2b332129bf90af98b908e1ade5a15381a903ec9591973b6a2c3843fe254fb0001ce627ec831df5d4c6885d01de679f3d7b74e6538692de08a1fcf608 SHA512 4f5172bc7d603375bda331d40708ad14e7e9e7374f97cbd11da56473ca704421f7c801559dbcc753fe8004a809b80142158974a1c5c469eb2894580121cc9442
+AUX labltk-8.06.10-this-expression-has-type.patch 644 BLAKE2B 951ccdfa410298bb166f784e43ec85f5d9c60baba4d1c7b3bf9b745c57c57887ebe3b3864e18c9daa32351d37c98de50a0cbfe138e9c8c6391c3096ca91916e2 SHA512 6776041f27b7cacf4a62b6f0fa5929672efdd4147401d7a8b7536b33ddef9db8ec923c999e5ae8c39ef634526f4316517606c546f5c3b588d2f0c9c4415f96c2
 DIST labltk-8.06.10.tar.gz 371871 BLAKE2B da67b13aa0a0c179c2fcefe6b03f68225b6e886a1233de77b9749be32b8efc845cac60244f9a8494241c8c77c7d6991786280c274becb70f5527ad891c3aac69 SHA512 ef797d21adac48ca5ed35d95ad05fee26f9b6c99b0510909f6087abb9580b8efd219ca65b1efddb170b5409567d83eaaac0473898f5f4db3e15ae4f39df364c8
 DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
 DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
-EBUILD labltk-8.06.10.ebuild 980 BLAKE2B 030b066865f536672e2f097909a622175edb0e0fe622734628cce7cd556ee602041842e99beb79009089e6a59edb450e5542f4ca873ccc732c5bcb10187aab36 SHA512 8c25f38845bc032fba61c9f7694eaf8aa82ca1b80401aad0650fc350dea967dc60bfc53cd625e9de9c6b9f4b551a9c17d1d5adab033b0bd413576e8ece9c6d22
+EBUILD labltk-8.06.10.ebuild 1031 BLAKE2B 0b291f15603a68a55b067b06d97260aff40ccbf369ba3690a3abc3e5e1716761f461d5290c3213ee5ee1bfe384f22cca05b7db00fbffd0c92d24e8ddefe71916 SHA512 adb3cef90955814d4a0de78e636688132a964ce9d8a56a1867d1c535178812bea47cb9b256a017d82a4abf65dda4ec69617a16db5b8fea9f6fee6b89acc4e3b3
 EBUILD labltk-8.06.7.ebuild 992 BLAKE2B 67153839b68d13cfdbe8eab47a10c65d03beefbcc08b27edeb9d75c144ef563787978037e6a7a52f6c50707d0ecc52e77c29fe3de509bd19d8c670e4cc82344a SHA512 181baa5df2eada2fb0768691bdf37a2b18e91633e99b529205477310d8eed23a9fd35250aa19ae2e849a09b3ba660483911cc3a3aa60f862f3105ab7e0a1c417
 EBUILD labltk-8.06.9.ebuild 980 BLAKE2B 030b066865f536672e2f097909a622175edb0e0fe622734628cce7cd556ee602041842e99beb79009089e6a59edb450e5542f4ca873ccc732c5bcb10187aab36 SHA512 8c25f38845bc032fba61c9f7694eaf8aa82ca1b80401aad0650fc350dea967dc60bfc53cd625e9de9c6b9f4b551a9c17d1d5adab033b0bd413576e8ece9c6d22
 MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch b/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch
new file mode 100644
index 000000000000..8f9fde6bdd79
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch
@@ -0,0 +1,12 @@
+diff -urNp labltk-8.06.10-orig/browser/typecheck.ml labltk-8.06.10-dwok/browser/typecheck.ml
+--- labltk-8.06.10-orig/browser/typecheck.ml	2020-08-25 07:50:47.000000000 +0200
++++ labltk-8.06.10-dwok/browser/typecheck.ml	2021-02-26 01:55:00.000000000 +0100
+@@ -116,7 +116,7 @@ let f txt =
+     List.iter psl ~f:
+     begin function
+       Ptop_def pstr ->
+-        let str, sign, _names, env' = Typemod.type_structure !env pstr in
++        let str, sign, _names, env' = Typemod.type_structure !env pstr Location.none in
+         txt.structure <- txt.structure @ str.str_items;
+         txt.signature <- txt.signature @ sign;
+         env := env'
diff --git a/dev-ml/labltk/labltk-8.06.10.ebuild b/dev-ml/labltk/labltk-8.06.10.ebuild
index 10d78bc548ad..6acd06b500f4 100644
--- a/dev-ml/labltk/labltk-8.06.10.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/findlib.patch"
+	"${FILESDIR}"/${P}-this-expression-has-type.patch
 )
 
 src_configure() {
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index 279492b8edaa..d3d9615e5c37 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,3 +1,5 @@
 DIST mtime-1.1.0.tbz 15467 BLAKE2B 975fdb01c6a4806035a5fbc256d192d6c2f45bdfb750045293b10a732c5613108d9bce897d3c1be660af60d6e9bafbf299dedbc0d872d1c09f65f47b11c9a6b6 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c
+DIST mtime-1.2.0.tbz 16272 BLAKE2B 317201f8d5e7a55636e58748ffd269db5e88aed012e8dd7ed269d1f128f8d21ed0e707679b030b9c822bac98c9b76033e8d2402171c4ee758d8c936fbeee7ee9 SHA512 0f0ed220cd0f899643930814010f8592e1f47b6dc6c4dce8eebfb17a81b0abed093a3dbf9c02490af99bf81ea640372f73b4ab88fd8ef0e0c7c66920692a8778
 EBUILD mtime-1.1.0.ebuild 717 BLAKE2B d49774f2eb6d262680e3f0bd929ad61a91a16913864361d374188004c2ebd5c52ebefaae73d1b5a38c588a258fbd317f612f83392a32bce10b618ccd5c00d40b SHA512 03b1bcd56fa44c53c2e10967fa29a5211057dded1de5554db54cbed83a0dd8d3c9202d8dcddc157f1cdfaf494c9043e628e3777023ffd866b2151948ab12fd10
+EBUILD mtime-1.2.0.ebuild 723 BLAKE2B 3da03fa3bd6a6ddc6621e6ed26cc9cc54e55488ad504b81d5c38b38f68e991631b95aeb8dcd2b60892c729a849fa4a1e0e3fb349d8eaa0e2cafe2a231cac88a0 SHA512 22c755c8c00adac4711d1fecfeb3410688d2ecc022f46f696fc2c711e1f84a0558bb73683116a99f62d880f684895bf33a7d0389bc1260dce2fdbb880bfd7a65
 MISC metadata.xml 311 BLAKE2B ec6d4e0813be98a7a30d4e8ca05ac9c74953bb0fa763c7d004ac76f23dfefb8d157784dab7f0d3674a81e840659d16ba4f28ffe3ab6913aa6affefe80b8786eb SHA512 ac2409cb1fcd4b9ba1760c38024a96ac3dccb7337b78e7eff636c23cf7f2aeea22fdec377eb80afedfda0738a2396d511afb1d4f0913fb6e95ab8473a850b9df
diff --git a/dev-ml/mtime/mtime-1.2.0.ebuild b/dev-ml/mtime/mtime-1.2.0.ebuild
new file mode 100644
index 000000000000..a6d491ea6add
--- /dev/null
+++ b/dev-ml/mtime/mtime-1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit opam
+
+DESCRIPTION="OCaml module to access monotonic wall-clock time"
+HOMEPAGE="https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime"
+SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt]"
+DEPEND="${RDEPEND}
+	dev-ml/topkg
+	dev-ml/ocamlbuild
+	dev-ml/findlib"
+
+src_compile() {
+	ocaml pkg/pkg.ml build \
+		--with-js_of_ocaml false \
+		--tests $(usex test true false) \
+		|| die
+}
+
+src_test() {
+	ocaml pkg/pkg.ml test || die
+}
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 11812c43b272..8e041c71a240 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,3 +1,5 @@
 DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815
+DIST ocamlnet-4.1.9.tar.gz 4628747 BLAKE2B 40e41edee79ba5957d297506cdf1b907adc8d44a33f25f25b8b1a18487f5ec379fb328c86d6283f7da7cedd8d35b80809e1cd5224522d51afa3e5f2402ac8663 SHA512 a251724deb35e756c81d2d3ac836d413b659acdce6c0acf479a4fca48934ab62ad399a884197d00dbb7e7558132a56be1c8efd553c0a644d329418272f809a46
 EBUILD ocamlnet-4.1.8-r1.ebuild 1559 BLAKE2B 5f9a1839a3c3248f00250000d28770a2e60667a36b221b81c0fe37c8491f3089266aaad18464656ea6878965615660784f69351e6ff3f6abb0ad6dfb82494360 SHA512 3f7353bfd894c9acf9b9949fc0a2b9e153ab4c013a67c182771b914cb1750ea2f02251a184fe6ff3cdcacf8df2fb760e61982940c5877ec293b5f1307cef949c
+EBUILD ocamlnet-4.1.9.ebuild 1562 BLAKE2B 9c047b948a3b94cc6ee31d6cfa3693bdb882507c134d010e8d7a1b56e958f3eed0a20d2ef6825e7580fae87313e73f9bda17ad7b5a953ba3cd7b1f6623d43121 SHA512 d7ece3bdca5f2c7206f164020d26f1a724b01ebbc70f003cbff92cb1f1a626598bc656cb6e79ec928a81234f63e9ba74b4a234fe307a6b2680706d2172504573
 MISC metadata.xml 405 BLAKE2B 375c39f43bf129f891891710e6dc9125884f7ee0edad718664334d7fbcd612a812b019f9acacbf55868aa0d7b3f94b018f7e8b46a8a1a0228e53194fa16ac454 SHA512 102afded360029e38c9ff3a803280553c2f8d6af6756e28508ff2c2c237c62e21a3f2241d5c04b93c7d924adef2bbefe9e2696a6aa545b355fa1b98b78ef7b73
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
new file mode 100644
index 000000000000..c0ee784e835e
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
+RESTRICT="installsources strip"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+BDEPEND="
+	dev-ml/cppo
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-ml/findlib-1.0
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+	pcre? ( >=dev-ml/pcre-ocaml-5:= )
+	tk? ( dev-ml/labltk:= )
+	ssl? ( net-libs/gnutls:= )
+	kerberos? ( virtual/krb5 )
+	zip? ( dev-ml/camlzip:= )
+"
+DEPEND="${RDEPEND}"
+
+ocamlnet_use_with() {
+	if use $1; then
+		echo "-with-$2"
+	else
+		echo "-without-$2"
+	fi
+}
+
+ocamlnet_use_enable() {
+	if use $1; then
+		echo "-enable-$2"
+	else
+		echo "-disable-$2"
+	fi
+}
+
+src_configure() {
+	./configure \
+		-bindir /usr/bin \
+		-datadir /usr/share/${PN} \
+		$(ocamlnet_use_enable ssl gnutls) \
+		$(ocamlnet_use_enable kerberos gssapi) \
+		$(ocamlnet_use_enable pcre pcre) \
+		$(ocamlnet_use_enable tk tcl) \
+		$(ocamlnet_use_enable zip zip) \
+		$(ocamlnet_use_with httpd nethttpd) \
+		|| die "Error: econf failed!"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+src_install() {
+	findlib_src_install
+}
diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
index fce461c9933e..5f618a806dc4 100644
--- a/dev-ml/opam-file-format/Manifest
+++ b/dev-ml/opam-file-format/Manifest
@@ -1,5 +1,7 @@
 DIST opam-file-format-2.1.0.tar.gz 23233 BLAKE2B 34d832c5ee13a0db43e77f3b33e7728faa7dccccc8daed50dca89630ab11d6f307413b8fecfef5a7c3e0f7ea04ef27105c8f42d8b5227d2587bdc2c2defe59d3 SHA512 b948545497de0386457a9b5772924572249e38164aa49d5ab2ac9442d1231a56a3b8132a95197d74cbbe34336a7edc04eaca351a8763c4a009a512085ca0ab25
 DIST opam-file-format-2.1.2.tar.gz 32120 BLAKE2B 3756ae2e2ad8e60d9611f1879ee07179e5f98ce4bd9f0fa9759e723446aac60f811e282903a57803fdb1c742f7027fb3a4b0d018dee74762645f5f0ec28aaeda SHA512 24fcc8a89dd79fee4fb54cfcd3a9b392819eb8214c97f43e226d44f1bc98111effade15f21f1e13aa5d3555cb458cbe269ba78ee4a1470c554f479446012d7ee
+DIST opam-file-format-2.1.3.tar.gz 36255 BLAKE2B eabd343d1ebb5708e57a125cf6f15105e263d0cc0885717df58249313de77cf1063efa2fc0f9b92d67a83649f3bdd8fa65c13077ca4b3814182ec750701570a1 SHA512 90da53a2b19eb97c17ec71d3ac00969863ef3458f421189413b3ec2d96f8822da9fba51ef95f55064bbb17f1729104a1fe4fed1d61d5006568b53165f0c6931f
 EBUILD opam-file-format-2.1.0.ebuild 722 BLAKE2B 3f6748e96bc9e6c19827dd03e03869e9ae1b8e95a180bdc050aa75ad7ffe27d75cbca38345455bf6899b5b5797b045a781ce276165a643d79f12e2cebcab7208 SHA512 2ef42c81d573649da5690120aad105e178d89dcb8cae95c49f99d2c3452348f110ef0bad4563ad9f05c9d168f7d19f62155afb90b8d8b99c9110b7401bedc00c
 EBUILD opam-file-format-2.1.2.ebuild 572 BLAKE2B 3e889c1cd89dee0649cfa12fe06e23a2e97c3c77ed80391d931055593d93973c848e0b258e5f24665e1e48c942c22b88ad58528da2cf87baaff84c4a11ab3eb7 SHA512 a08f520e8296b67363d6f609cb78e17193d77b7ca3febe9caae653983404d81dd3cd3197bd097a9230f4a18a524fb0f64a26dad1a773fff7ff83464e64342486
+EBUILD opam-file-format-2.1.3.ebuild 578 BLAKE2B bb952e031263e0da424399f4e7d0a2adc0db94c9715fd77f6fb635dc2467fd02c4cf24a55ee6eac8cb35c4b16513975d71c1ce6c82878fd3173c8ea55f5fbcc1 SHA512 518e0af5afbc7526d57048f553e59e5b5ee91aabb37800c218cc472c43ff7e2a2a0bd533a47c29f84335f2b57601f048d80a4cf084961c5c3c13e75919a9ba5a
 MISC metadata.xml 424 BLAKE2B be67fa815545cce58cd870b84438927044fdca0ff12b9498217d3d04fe1e68981409e5c8d5b040da85f7969004cad18260b3bd0e105234f9ddd55271aa12c434 SHA512 282c587f3927e29035d987cb102c4b9042081d758787831335d7ce6b009193f7058e5c5e4e1ba5db3794e9dbdc79f2203e93783304f908aa26ffc7ddcd87969b
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
new file mode 100644
index 000000000000..fe3328205eeb
--- /dev/null
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV="${PV/_beta/-beta}"
+MY_PV="${MY_PV/_rc/-rc}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="Parser and printer for the opam file syntax"
+HOMEPAGE="https://github.com/ocaml/opam-file-format"
+SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-ml/alcotest )"
diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index 9d7c6553ca42..21fb7ef79591 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1,3 +1,5 @@
+DIST ppx_deriving-5.2.1.tar.gz 46148 BLAKE2B 75c5f95841e4e54d5a58221c27d4a904347fb2b20ff0189bbe99bcc200eefd4abb94a476a120b6c6c7d0eba3b2233054875868a71064d032815cc8907919371d SHA512 01d2eb920f3375960a9228138ccb5f2af49bfba1111894795c24b3c37d5a021d6bc95e9de1d867c35d03645334300ccc89f1fca0cb75007ec62e5620f328e078
 DIST ppx_deriving-5.2.tar.gz 45766 BLAKE2B 67d041b69ad675873500844f8ef638797e271c3a3a82467407914a073e6eb9ff84f911d128ccf507be051fb89c7c85991987793067046b0dd1ecdc534b658b05 SHA512 0daf7d0050b8e2b18b441da994e8cf1f05e37f7d88d1f4512204979f19ac4d116a6c72f683c615b091e0340a4d380684f9b2ed1b70d84fae6ca928843ed3f479
+EBUILD ppx_deriving-5.2.1.ebuild 657 BLAKE2B 7a8b29acdb993ea00b23bfa2c44d9ca4f0b4b3b232f73d5bf3c2dcd25e91b1fbadc208cd82ea33eb96399bccfc839ad05a33aec11284d5dc34e7e824077f12aa SHA512 aaaf59686dc348c264e8276a466406487d5c3d59316597d1013bcb49dace07136270aacce6ebe9138269e2dadaec9d408f30cebadb8ba000ce93172f6697db27
 EBUILD ppx_deriving-5.2.ebuild 657 BLAKE2B 7a8b29acdb993ea00b23bfa2c44d9ca4f0b4b3b232f73d5bf3c2dcd25e91b1fbadc208cd82ea33eb96399bccfc839ad05a33aec11284d5dc34e7e824077f12aa SHA512 aaaf59686dc348c264e8276a466406487d5c3d59316597d1013bcb49dace07136270aacce6ebe9138269e2dadaec9d408f30cebadb8ba000ce93172f6697db27
 MISC metadata.xml 424 BLAKE2B 1fe2e79c56e42f16e52478d935a44f69e665dc2910bfd0012bd085c94c3d35ce778a78cf6ab28cdc09fc3d6e5da051de6b3199f5e09fd6982dcbb83cfd3c24e2 SHA512 62b95e039b84dec56f36ea733b8bc766f392b7889fbd2604f933f8df9f9e743d42ad2ee670af2479d6836b705495564eb392d8794371934556f819813c2fb7ab
diff --git a/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild
new file mode 100644
index 000000000000..73a1495d16a7
--- /dev/null
+++ b/dev-ml/ppx_deriving/ppx_deriving-5.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Type-driven code generation for OCaml"
+HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving"
+SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-ml/ppx_tools:=
+	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/ppx_derivers:=
+	>=dev-ml/ppxlib-0.20.0:=
+	dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-ml/cppo
+	test? ( dev-ml/ounit2 )"
diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
index d66f3cfddefd..f00603e27ed9 100644
--- a/dev-ml/ppx_expect/Manifest
+++ b/dev-ml/ppx_expect/Manifest
@@ -1,4 +1,6 @@
 AUX ppx_expect-0.14.0-ppxlib-0.18.0.patch 1641 BLAKE2B ea0857a3681c6bce3a39191904a2223d899e9cfb362c9961e897c613dfa8f5879837cc80120653db88bd509c16b474079cf9c8ddfce3e6b79b12ddb284dab1e6 SHA512 11ab0e5d9a97d1a5749ba728c197c4a56905b21b7628d6a2c3594e46960b07bf6d9eb50d25ffc7bec77ea1e966d5016d8a20c5608f09817c73e06021c11ae372
 DIST ppx_expect-0.14.0.tar.gz 45661 BLAKE2B 0cba3840743d45f0f11936f090319aab3237c7a14389eb6d035a3b7cdac91e0b169c3ed84407e1bb01a00738bf97b62dba313965e93a2177388666764fe5854b SHA512 7de5d84640d16101d38140b5f621301c9935e3161a7c7d978373940be92fa7f14cad429e79eec294a20d1f379e969cf3c25d15810f1a4d3ad1bb8ba0eb7d7109
+DIST ppx_expect-0.14.1.tar.gz 45699 BLAKE2B b52d579d92156344ff44d30c88603840eb7d6a0d346de49fcbc01ef16fe3c33e664486de4cb2d09f74e853e39b9a01778e7e0f489497fdd34fc9582d895a0d3b SHA512 fd98e79d5b3bb935b2a4077a07894c159b48e142268c2e30ebff2cbfecc92266b454be69f5080b315eefa9184372e5e5248bd8a3b2b9d6cad59e2d517c94bd02
 EBUILD ppx_expect-0.14.0.ebuild 869 BLAKE2B 458e3ed359a5a9ca0bb597e03ceed5d6310713de23336b7b3537246218b5687100745aa0c3c55ff7b1b7d931b802419736ac0d93ff9216fd0d36d64bc28f6b9f SHA512 bd12f065567069707760be84f93a850098474ee979f606ee5c8feabb7c99627e409687879c725bcc14959cca602c04fadb55dbd69de9cc46d20c13d853e7c44c
+EBUILD ppx_expect-0.14.1.ebuild 819 BLAKE2B 71169c55952e0e96044296863463f225b4571a48b54f9bf69fbf19f822b6804a447d44538cd2deb8fef2a98c8535c6b0a6275514215d945ec5a528acb9a37b1e SHA512 37791ed2c19d3deb8f6749dddad265cf8da83e20646ae08ab5cc925f8eba215a787cbf4c4ea04b49f877024672379c4398fa589a4595de80223de56b6195775d
 MISC metadata.xml 423 BLAKE2B 4afccb4025d3128f93e902c5948fa54e2c616c6e1c915913ca08924c587c28f08f83b1750a52ca6bf3143102053eceedb7ed3834bb2499f345343c4430a073a1 SHA512 6d42ac946be64e8159ac5171de263c321d782c604a2c21a0b46e76b68774e6baea8ce168398da506ffa0d745e884d5f42f4753d8c978169134b20f3af10a9312
diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild
new file mode 100644
index 000000000000..9d7682d713fc
--- /dev/null
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Cram like framework for OCaml"
+HOMEPAGE="https://github.com/janestreet/ppx_expect"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-ml/base-0.14.0:=
+	>=dev-ml/ppx_here-0.14.0:=
+	>=dev-ml/ppx_inline_test-0.14.1:=
+	>=dev-ml/stdio-0.14.0:=
+	>=dev-ml/ppxlib-0.18.0:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/re:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/ppx_jane
+	)"
+# https://bugs.gentoo.org/749291#c2
+RESTRICT=test
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index 50c11ae5988c..cc778098e0d1 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -1,6 +1,8 @@
 AUX ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch 1548 BLAKE2B 2adef4e4a978e6a01b9f18aece888ce12c5ad0498411d9072c6ac4787e22d4053e89acff47e22d388305754304989e52c646eb93dc2652a93a0bf9b816c172f1 SHA512 92d4a04e54d290f90699d0c1f59d8805062d3949987787dfa5c033091948ededde5cc1d97d9b0be1b5a0b4168ba7e85720569f72e9de5325e6891357de800468
 DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584ec6be4793df706fd3be96670fe685aba82459f9a1e4c6117c594953a3f23c502cc609f1069d482d24278baf7ed87ed5 SHA512 5018abe07300f67cb2c8b8cd8242403a91ac6b7fda13fe43060b3b09635082a7ad45858c7c6442a5fcae2b6d7d398a03eec16cfcbc5fd59f7f3f5c5fd1ad56f9
 DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e94803106cf8a9a9326bf815d3094e166ce34b19f3d28b770d381ca3ce32227a80b15baa61e6f9c2d0082c47b87678c0f239 SHA512 d0121770030da142fd559b5f8d52d4a029d032c5ac9c79bf235190e0aaff58e5cce0a5ca5f198ca8a112e0970ca27ab18d4f201376ca6b799b91d71deb915f25
-EBUILD ppx_sexp_conv-0.14.1.ebuild 699 BLAKE2B 629dc5299189676f1535cce0ec12e9230a35e230a975c52f06befd417cd189088afdc25394b070daee6673c7ab246fb15eaa7519d3fac8d3410af1f18ec61ba4 SHA512 2a79625f9d25c80a06e831ea3a786deec6a4790deb595aa0d769fe851b26107c28a69ec9f69f17aa194a328ac24b922481428e21c7f3c75e41adeb86c59fab8a
+DIST ppx_sexp_conv-0.14.3.tar.gz 49886 BLAKE2B 9fda18267995cdd8efb9dafb069df6a51106a800b263f4c94129957a3f23d2bee72f39382623a320cb09ea13c255000ecf9670c19ccf49d55627c02bb0912224 SHA512 7de81d64e7eeb4d6097134606411830dd066f94222ed320a9c32752116961806ccf807f802e07c522c32aa6f7c20bb901804612a0ffc1b14807903c92acb2f44
+EBUILD ppx_sexp_conv-0.14.1.ebuild 722 BLAKE2B 56e8596dd6063a6ff69d82c8ca862357d25034add0beb42c4d5e044b0cc95de73c5cc93ceb4c8999df1a1eb3e0f8c11f434f4d1f1cbce157a476fc4c5491bc7d SHA512 569f6c2990f5197e1298ec369aab259143be88b267a0136b3702497fb36d00bebe761f0c443a528981dfd5b2239332d066d86945c1e29307b65be83466e9087b
 EBUILD ppx_sexp_conv-0.14.2.ebuild 712 BLAKE2B 7b4bd7f4d94c354ae22bdeab2a555c6e39772c22d8bdda8cefb1238161def9e9e193248bb2f9f05cb2477564ad2932bdb37a42be14cc47f40e1bcbf2757b3eb8 SHA512 a32b7d862a1b694023c22e068b7733cb5b2474e06c5324ade51d8942558750eb3164e708611e9261683974d55f979aa35d1309dcb992cc915172fcb302a8729f
-MISC metadata.xml 333 BLAKE2B 45f215f8e13fc5d782348eda68fe18a1975f6b1e5a7770b2d6f28429f26314c53d2b6bedbf4f195e5868123b5bf40bf208efcc83c2296399dad4d4fb3ac0b3a2 SHA512 7c1cb3a5c022fef141fe5144f122b4a11d4c4584f76998f47e0c57411ad3e64a545919ebe81939d941358760193aa062a5fe63737072f8e53afc46fae605463f
+EBUILD ppx_sexp_conv-0.14.3.ebuild 686 BLAKE2B 791c5c21e22e2369d8a2020131e683606edd0fec0e3e37254b2e94cbe69f3c0e344d895d1c0d04ecdf573a429a992af48ff155b0139fa6b23adf530f9904db96 SHA512 74851675ca6d1c0a691588c415a7eb6ec69f7fe9394e283f3d5c98142cb1a4b33f2b493b402ded4353ecb2b18912b797ee61ca6be03e43ec4aa489c85a45871c
+MISC metadata.xml 426 BLAKE2B a3f335ad820fa9f62edfcab410b969c88ce8d17fab45f98700c98eb4314ecec2289681789689865f1b7bdec8317260372b55894213e4054b3ebea6e35d483e37 SHA512 086121552fc62e22d63cd4861b961916b084706c62f40f7d6ea7f6db40a250e026ba072b88a7315fdecc53ffcf380668af4257b96fcd97f9fb28686e46163d78
diff --git a/dev-ml/ppx_sexp_conv/metadata.xml b/dev-ml/ppx_sexp_conv/metadata.xml
index 49e0dac594b0..9bee6e451eb3 100644
--- a/dev-ml/ppx_sexp_conv/metadata.xml
+++ b/dev-ml/ppx_sexp_conv/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="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
index 042c0aba3716..5ebf65b8435e 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
@@ -18,6 +18,7 @@ DEPEND="
 	>=dev-ml/base-0.14.0:=
 	dev-ml/findlib:=
 	>=dev-ml/ppxlib-0.18.0:=
+	<dev-ml/ppxlib-0.22:=
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
new file mode 100644
index 000000000000..4c7a9470da50
--- /dev/null
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Support Library for type-driven code generators"
+HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv"
+SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+# Upper bound on ppxlib for bug #769536
+DEPEND="
+	>=dev-ml/base-0.14.0:=
+	dev-ml/findlib:=
+	>=dev-ml/ppxlib-0.22.0:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-perl/Alien-GMP/Alien-GMP-1.160.0.ebuild b/dev-perl/Alien-GMP/Alien-GMP-1.160.0.ebuild
index 8a9a20bca1ff..ed4e08c39583 100644
--- a/dev-perl/Alien-GMP/Alien-GMP-1.160.0.ebuild
+++ b/dev-perl/Alien-GMP/Alien-GMP-1.160.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Alien package for the GNU Multiple Precision library"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~mips ppc x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/Alien-GMP/Manifest b/dev-perl/Alien-GMP/Manifest
index d6322c566fb5..9be98025f374 100644
--- a/dev-perl/Alien-GMP/Manifest
+++ b/dev-perl/Alien-GMP/Manifest
@@ -1,3 +1,3 @@
 DIST Alien-GMP-1.16.tar.gz 24737 BLAKE2B 6d4820e3e9c46a735aa1c9fac58e100b6a16cee5ad332b3b4f687b889c86eda7c0b083e1f1c11c881df4ee33055ac05d560b10bd78ab395236af1b9e8bc92a22 SHA512 cadf9ef0aa065dd8ce1ba9f3b2b3c369170edfe7faa41ea181192a27a17dce06dc3bd9a5a970fa8046466b9628dd4f8637d98494573b5d5e8148620c7db75459
-EBUILD Alien-GMP-1.160.0.ebuild 573 BLAKE2B 4a9b953088a824a947c6296fb61533bb5471307d71b270b4250e3f802810465c03c13f40bea7ac028a1be9bfaa198eb7ad5ff4890b425e78b2355b84f8120c18 SHA512 0eaf68ddaef31ef2eac313c252b0a44dacf8f9be339d78233dff3ae3dd3f17db23dcbb85669ccaee1a09785bd6c8df4c6bf824abc1448d7dfc8cb8f882663c12
+EBUILD Alien-GMP-1.160.0.ebuild 570 BLAKE2B 51e1329e7e5ad1f390ef9040d8ecacea8f5d54022f968c563b583f17286bb8a89b406fc5e28f79d6a8ac412f3d1105b9538ec654d02043a0f13870e6070d128e SHA512 43f003b1e686107ab72effefa3c23e4fdebfa79468377bc8c1186656bc0e03aeb94f0b3866f642164f8c4bb5d892f2fcb9e534a7ee067ebc0a889c0876746742
 MISC metadata.xml 293 BLAKE2B 2cfc5b9af7026aa174a9e9b83d2932c543ad88b591bd3c39ea2843da3e5b7ed5140899d46c40d51638af5d196adf9aa7af3b614461cf353905e9ab69305c0bfb SHA512 8fc4213021fd9558e5c2b69cc38f21df7abd313ed31c216a0b718d61004b45165e7898aa43b07c6243407dfc9e5c43d8110557b5fa2516b571d943ddb7d0b007
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.260.0.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.260.0.ebuild
index 69bda65b2f61..1f53218c0767 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.260.0.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.260.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Cpanel-JSON-XS/Manifest b/dev-perl/Cpanel-JSON-XS/Manifest
index a445fd3fc1de..08b4742f71e2 100644
--- a/dev-perl/Cpanel-JSON-XS/Manifest
+++ b/dev-perl/Cpanel-JSON-XS/Manifest
@@ -3,5 +3,5 @@ DIST Cpanel-JSON-XS-4.24.tar.gz 254008 BLAKE2B 4449d0d562388c547ab26e87048b49d2e
 DIST Cpanel-JSON-XS-4.26.tar.gz 254123 BLAKE2B 52a42c48b920a536a9c203964a4a379555f2032e75d5e32d5a9865f62a05e4377ce80ff1a2f882c9d5932f4b602de1f562b9e1e4fb3001813b6fffe2702be2bc SHA512 3193988a09670a5de6b6292e9f35e8c374518120648a206b769802fb4a66e6487a4ba05b3e89e214b9e3f5985452be74c17aa67e4bf96e88097812be75b2ed9e
 EBUILD Cpanel-JSON-XS-4.190.0.ebuild 1439 BLAKE2B e2a5b335a450d12ddd516ed99e1603f1d9e2705a322d2dff4f5f831ffc2cba5b246b9ad50b60a3db75246280d8004f763ac26542ddf8f65e3134a2ae16f59313 SHA512 e52fa56865fe26dc2c52ad16f721e4dbb977d46ec8bfde648681b0de33dfad7123c6f66d226e6db42864a8a2d8cb4d7f05f02d91a14ef0e91c0163cd667cb601
 EBUILD Cpanel-JSON-XS-4.240.0.ebuild 1462 BLAKE2B 623f1257ed431f84c6f2b0b370b164a76a8f8154f0f6b325600e144384cf315288b76d3692548a96cfeca7e2f1513a80d5acc49a1ba611b77be6827462117d8b SHA512 2d5148ff49da822dd6410d6d5a7bff6c975f5381f27b683a31fa9205ab2196e0500872c4bcb768b2055211ea12346da1cf47012f9dffca46cc7ff61bb4ba3e67
-EBUILD Cpanel-JSON-XS-4.260.0.ebuild 1466 BLAKE2B 805941097c8aa92847a54f785c948cd3234dbd2cd98fa29694f54a763481758e1fd7ca8c431e20e10f70b57a7ac370c27532d8eaac63241b44ccd60eb6f4fb26 SHA512 702c0b112b9f64583bb095b5ba0971c807ebae198f11b3a477a4cb46b78856c8dea50f1bb6f95f78893ace8766080d6015510ac955447e2579355f989cd875fb
+EBUILD Cpanel-JSON-XS-4.260.0.ebuild 1463 BLAKE2B da4e977f6729d21a390098baa0f0cd0eaa33f69cba417719922c0528e8b6bd3041b78a6c12cb98139b612e28e56e5a3e0e093bcf06b72288ac09f77685ccab84 SHA512 2a888ee58b27106830752d3520666b6708e293b9152d84a0106c9a71fad527600d1a3abc9afe807a4f979fa96ef7cb147671b49ea7b05d359974905c5ff8f659
 MISC metadata.xml 470 BLAKE2B bc977764b6c5673d270e895b5e923a87f917096620f1092fdad2049df0173ff321ec0be9f2b9ab926b02ce030d4d3fd7504024ff5167605c05edb04d20b4081e SHA512 4f3013da420d4c1d51df09efe590bd8bde9de5751cd1f35fb0935941cc1c541f6dadbf45b155849c70fefdb612d069357380e4b85d01e16454ba035d82d2c05f
diff --git a/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild b/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild
index 17c6d1fdf255..35fb94732665 100644
--- a/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild
+++ b/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Implements the RC4 encryption algorithm"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/Crypt-RC4/Manifest b/dev-perl/Crypt-RC4/Manifest
index ef879b71d804..0af5a175cf92 100644
--- a/dev-perl/Crypt-RC4/Manifest
+++ b/dev-perl/Crypt-RC4/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-RC4-2.02.tar.gz 4173 BLAKE2B efd6f7534bfaee0e018ab18ad8a3de9b81c65ea0ef597a937267919c24b01cdc7afe78489add2a1c51ba82e11b0c7b7aadfc708e6b57628d94c089a7466f25c1 SHA512 201f8eaa4b40689029524e28452565dd6245e5d49f1e38984a2008501754a76da15241fdfcd79ecc7134e50e39c3d085ac0fc6250ee8fefb79bf806c55b4848b
-EBUILD Crypt-RC4-2.20.0-r2.ebuild 386 BLAKE2B 6479f0a8a4211df3f3774fe6e606bfd216fe8be442b558d8ca8dc373889e23a7a58f902f4df00d249c214d4c8bc783c6d757679c497fdbb739b1dacc5f42bf8e SHA512 cca19b190f3ad45a9853c028a170773cb5424d46ff2f1a90a5955657a51a7cbe43aa25f87e9707f283626a3a41b820745f1ac6c80d839333e91904d1ee2e168a
+EBUILD Crypt-RC4-2.20.0-r2.ebuild 393 BLAKE2B df6352aed794443d5fdf66b9c33f1ca992afe2b23ac0e23ca231df3b1195500800096923d03db1f6755a0409215267b3c34e65cae6e98ddb55b51a4ead91cecb SHA512 a774958e298b04a44fa7b5364c1fe741a37b4911fa987b66b8c8a0b3bb1b97124f1b3afbbc35e1cede374536b21af3afbfd3f026941eeea16ebe13f8200ef3ea
 MISC metadata.xml 390 BLAKE2B c447fcddc6c19813eb0bc617657f579424ffdec89f3fe2609a127dcd7da2667b7edb6194588d722450f6847436a8d7f1333bb0b497a1fbf2244ebe472f435358 SHA512 5097a5cb75253ac6d4c1195b63c2c45a35c3d13960372dec4bbe9dc4c5a6816056fdb1a488a6919b0e35f12be901cec6a6505847467e73da2702da1a015385b2
diff --git a/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0-r1.ebuild b/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0-r1.ebuild
index b1a747c127a6..1855f2b09599 100644
--- a/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0-r1.ebuild
+++ b/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Pure perl implementation of MD5"
 LICENSE="|| ( Artistic GPL-1+ ) RSA"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Digest-Perl-MD5/Manifest b/dev-perl/Digest-Perl-MD5/Manifest
index 66685348c324..ed5409120ec2 100644
--- a/dev-perl/Digest-Perl-MD5/Manifest
+++ b/dev-perl/Digest-Perl-MD5/Manifest
@@ -1,3 +1,3 @@
 DIST Digest-Perl-MD5-1.9.tar.gz 72009 BLAKE2B 3e307dbd522fb85dad3cc5dcc8eb8cdd762754652150b7b6ed5ffa308a87f4f728cb33386d039859bbca91acf8552552da8213f384834be41c75bdf399887bd8 SHA512 015a1f046b85b5b89c1b44073d60116d483332cd667cb7230222df9651b7da837a532991e91848ff0b65f171b8870c2c4bda651da4ca54ea75d062ba6a55b525
-EBUILD Digest-Perl-MD5-1.900.0-r1.ebuild 501 BLAKE2B 445ccc6ea192cbfbb1b5684f00bc6db160be136ea7c37aabafcedaeb28f0061c7232a0a71d0ab72213e0d3112bd1855181c1766d0394e82ae85a9c9fdf4c3289 SHA512 7583cb4bf3242cabd80877e9e7446dea518df765e6eb555139f735c0a361f2c55a56a2086cc850662bbd2b516c621701147e51f9540cc9c5a9fa444e98b9f32b
+EBUILD Digest-Perl-MD5-1.900.0-r1.ebuild 508 BLAKE2B ff749d6e7fa04aecf2360b6dcaa46eeed4b39da87a9970291008f76656e822ddd20dec5a7c490629486877c862095cce81a9683038dd54ab2056987ce0c00c32 SHA512 c4e0802fd31e0088d5d03ea6faa02e6d8d4181b1557d910cdb684148130953639fb5ee4fda669a5b44f02c50e14034399d32d1caf149faf0f2c9ef70d02bb357
 MISC metadata.xml 403 BLAKE2B 21dcca199280dd32bedb49779c34b44f7ec119915415002b3dfbdd775aed0e524ff0a315a2030d3d7b6816a9a00f056618d502639251bd0bf08f4097bcc95943 SHA512 b61528734c4cd80f01fe85c545fbc2e56898f3a752f4116ce457b55433238a4aae0b3401adeb21a20b16a1a9a63857a82d1bdee4bf4a95f5c22696eef81aa597
diff --git a/dev-perl/GSSAPI/GSSAPI-0.280.0-r2.ebuild b/dev-perl/GSSAPI/GSSAPI-0.280.0-r2.ebuild
index b245660df2e3..01f76151d686 100644
--- a/dev-perl/GSSAPI/GSSAPI-0.280.0-r2.ebuild
+++ b/dev-perl/GSSAPI/GSSAPI-0.280.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension providing access to the GSSAPIv2 library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/GSSAPI/Manifest b/dev-perl/GSSAPI/Manifest
index 68093f57b149..2e4e635969ae 100644
--- a/dev-perl/GSSAPI/Manifest
+++ b/dev-perl/GSSAPI/Manifest
@@ -1,3 +1,3 @@
 DIST GSSAPI-0.28.tar.gz 67915 BLAKE2B 720dcaa7c3a03902f6a33190769f04665ff72a4a0308ebfa0e8d0d576e020f30dbef1eb1eb49295e703528e90ef21c1583a11c23cdc1a68f5588e6e929ef86be SHA512 4bae4729c216da099f6f0479ef34874fa62c1afc57bf56860e1ce082e9e6a902ec072f9e976ab2f1914df1bbad6b6689af04a9867b3ca1a9f11d0287e58aa204
-EBUILD GSSAPI-0.280.0-r2.ebuild 480 BLAKE2B 1f7ca17d566ac3d7acaebfee900512904e99a6aafbfdbbd8bf6649607dd8598f769d501ea8c1ff5f3dacfdb9a89d8c8e7a450fd1d6ac2d562323f480e4f75e3e SHA512 61b1dd83ac79ce34f40d30dc3af16d35f8392fa4fcfaa0316e1f702f25447a8591ed17d06e5c82b35a45ba15e54ae2f221e049fa4f12b4a9fb6a3ab6f7c5b233
+EBUILD GSSAPI-0.280.0-r2.ebuild 487 BLAKE2B c378e4135f86362e538464a38a178367bc5c7b57669682b1b8c57781f426b6f98a5cf1dce7dc0668506b857d0df5bddc459184a8d4bbb751aebc89d5dd8595e6 SHA512 be28896d20d1020d312987ff95385a7cf5a04bb31d254d4b036111678c4f773c44fa36bd4d89aea89a5a02fbe369b1712925bfd5f4a3df26e771ded655184db8
 MISC metadata.xml 565 BLAKE2B 86b4ad964ffcbdeb8e22b933fb2d36b229c2d55123fc46f42d95a34e0968b0499873990111199d46ddc353b0bc678d74b1a30f01a03a9a011130181f188e590e SHA512 a4f81fa84d30dbd8eb5aef34cd114ca4307edb95da7f1b80d4b055e7b23956b819723a7d886998a5c0b5308a446345d33934b5e4a778bdef55ea1ec0a61b38d9
diff --git a/dev-perl/Gtk3-ImageView/Manifest b/dev-perl/Gtk3-ImageView/Manifest
index b731c7c03857..4e60f4ba9a55 100644
--- a/dev-perl/Gtk3-ImageView/Manifest
+++ b/dev-perl/Gtk3-ImageView/Manifest
@@ -1,3 +1,3 @@
 DIST Gtk3-ImageView-9.tar.gz 16083 BLAKE2B f64723d2ee468c7ab423292bba8d995a62554877567fdfdd272e527920e037147783fcb9cea99ba1688f09303ee321abaee0e334a67db46bda6b0ed7e1ff9415 SHA512 1a52c53a03b6f9dd6abc69dbb03a8dd80df77e266eb972cb2438bd25d49765b203a70e2dfee1ae3cfdd27b4d987f9573eef3e47968c80550771dd3edbcf831cc
 EBUILD Gtk3-ImageView-9.0.0.ebuild 693 BLAKE2B e4dd5f0b6a67c34ea2971411015452c1d012611cd313733195ef7cad72adfee8a7c88c68d7489109a3bd571fb0ecaf8bc17c727fdf105a67722ff18ca33aa263 SHA512 3fb7e6b406aaf211ae4893f6c1ffb01d646b6b951ccd50cd66cdedccaf2534002a410630a47ed48bb444ebaa8436e439c68bb90a852542a70ed723bed355c55c
-MISC metadata.xml 952 BLAKE2B 767e779369ef5947f563c8fe2bb5592058a4c6ebc29a3be7ca49fe7a2ef586484afb15e46632e6db87e5eb92932602e10cc7a875cd3803537866f5ee1d52dec8 SHA512 a2e7a668fae93388d88a2c2db675d715a720866425f91885702a362e3932ed60ca6b1a08dbef4e44623518d4b9c224948bc51e7db315d8088f3d3a6cdd96b47f
+MISC metadata.xml 1017 BLAKE2B bebc2e45548a9e410ad22ea557f8d57e302489ed1d1dd823ef9cdee524d273f52043eb595856c0faba5237dea52adaba62b260b8d376ce4b29aff4ff89b02a37 SHA512 f35f6ec768e183b3a60d1a10b2015aec58e865233f9d261e8e3586bcd36fe826000cbb911331b48b84e4c041ee79604f6e4b339eff712cea112646ee8feaff46
diff --git a/dev-perl/Gtk3-ImageView/metadata.xml b/dev-perl/Gtk3-ImageView/metadata.xml
index 74cc4507df14..237c897ba8a1 100644
--- a/dev-perl/Gtk3-ImageView/metadata.xml
+++ b/dev-perl/Gtk3-ImageView/metadata.xml
@@ -14,6 +14,7 @@
 		<name>Gentoo Perl Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">carygravel/gtk3-imageview</remote-id>
 		<remote-id type="cpan">Gtk3-ImageView</remote-id>
 		<remote-id type="cpan-module">Gtk3::ImageView</remote-id>
 		<remote-id type="cpan-module">Gtk3::ImageView::Tool</remote-id>
diff --git a/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild b/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild
index 43e896197c09..60cb213a9194 100644
--- a/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild
+++ b/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="I/O on in-core objects like strings and arrays"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/IO-stringy/Manifest b/dev-perl/IO-stringy/Manifest
index 0104bd0026eb..a110692492af 100644
--- a/dev-perl/IO-stringy/Manifest
+++ b/dev-perl/IO-stringy/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Stringy-2.113.tar.gz 47755 BLAKE2B 50c35d93a3466d44854ab338812aca849521aceacb0e9568c54f9cf9e00286563292d9d0b7371d36640f59a016d4daef3407523e95464ec5d95bdc5283bb508d SHA512 5af104766c20b4336649dc4a19554ad204506c2476b4bf7d8ad7c2cfab15f0296efadb9019cd57e770a2a3c5f5686f7f010bddbd6efd51d300c54ca36286f094
 DIST IO-stringy-2.111.tar.gz 41515 BLAKE2B fc98766d2375a91f430397943be1462a2be8f1115f5c386da106b46cc2d20a09fbac5b3ed74f3ea509d51746281b3521e46e8610515ef1b3954c96aae7e30969 SHA512 9da8fb03945bc4a59cea3b3b2e22b15d56b133470e581d1cb03920bda2b4953e3c9e4a25d095ed8a384efb5a4c58db437c92cca6a81d583791191f1a37691a4a
 EBUILD IO-stringy-2.111.0.ebuild 520 BLAKE2B cb0324afc79c218403435fb7ddbcb3d577c810f7c6c7e6ca2860ae1b84c949e96bdf0135386a2e12d4c3cf4bef6ff242a9abede249fbe6b779d64481c403ffe0 SHA512 216d5effbc44e636576de9e3e0d16e6060821fd622a3e48c67717dac33451da28d48461c5029423f7972e83654a0f75d60d9d9a33ecfa0cb81896970eb8b27d6
-EBUILD IO-stringy-2.113.0.ebuild 456 BLAKE2B fe49a285cd40a43d5377ea4cfdbc5ada091cef883e6e7810416ef001fa2cdc67b5a10ea233ef74e4e7937f48bc16b636d911980d5b6319b5c6f8d2b7276350e4 SHA512 764c3d20d8458da1973eff6b9dd9f4edb0c81a1c28adfad6d896cd8290d265a7726797bc266639560c5bf64da4d8b3dcd5eaac9cedb618cf02d954fae05a09b2
+EBUILD IO-stringy-2.113.0.ebuild 463 BLAKE2B 2a6a26de1e5c63ef060f7cdb5aae8ceda297bc11989311e78e1f602f9826b88bfe029d7e7c0c5619ffb79c44ed82d0a5cd63a4ab465e94037f0676b7be58fef7 SHA512 951194dbdbacae68ade2efaeda1cb12925953585fde60a10b1a67589fbcd8061455661056168ca5c2c2e1b010df482285a834f69a143114c0f159125e614c66a
 MISC metadata.xml 989 BLAKE2B 108e776e58b6cc4d29280d4464382505de453567ab2a8db34867bc0e560b804dfeb90b28c18d06f4de5d61bcd7475cc5ff6be3b2c754697f43b7ae72bae7fb14 SHA512 59eaca17d8160900b45d600184d029ce8afa81db73174a4c4c237a50c8f344ddb0686d5991b80c73e8df572bdd67a4dfc72feb9ecb79f8103f83fef1e6b0b7cb
diff --git a/dev-perl/Inline-C/Inline-C-0.810.0.ebuild b/dev-perl/Inline-C/Inline-C-0.810.0.ebuild
index 9560b7f674f2..2b7de44db386 100644
--- a/dev-perl/Inline-C/Inline-C-0.810.0.ebuild
+++ b/dev-perl/Inline-C/Inline-C-0.810.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="C Language Support for Inline"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Inline-C/Manifest b/dev-perl/Inline-C/Manifest
index 2a1a9e3f2f0c..422049385b84 100644
--- a/dev-perl/Inline-C/Manifest
+++ b/dev-perl/Inline-C/Manifest
@@ -1,5 +1,5 @@
 DIST Inline-C-0.78.tar.gz 73695 BLAKE2B 79ec1ffaf7a35d2386bf774d153f79b1eee53c0be6deefbbe896fafce7083808251c5e2300e2fd19a78e559f9dc274e1546a86b763af996d4374d60ceba7f9a2 SHA512 368e68dfb9f1700534d9b391090e340172e3adde5fe15576f883e9341047fec35cea8660751883b27e128ad91dda363d513547368097a989457d669bbbdc8ce4
 DIST Inline-C-0.81.tar.gz 76855 BLAKE2B 04686ca513760bdf75a2ba4dabe723de9797ac348b2d6552dea93c8c84c590bc02d7255e56bb26a2e504c8bbabed47fd6f764d7dbdd402cc39c9cda344575462 SHA512 c3d0d669c26017b4b63cc101377d067438c31fc5d1e6187d01194f70158049e386683b792716aad58772eae839512ecaefd4b3ac7a2377dd1404a651c24b2277
 EBUILD Inline-C-0.780.0.ebuild 1004 BLAKE2B f6ec5c5b873d28ec003f911939a139e4f48ebcb5d65f09934364e159527e80bbb0c13edb7bf34460c58f945b0ce9b39792c44db2deeccfc0ba1a6a9d816bef78 SHA512 b992464f6dbdcf19269effb18efcad01e5f5e98128d56b81bb19f11f6e36b9e37d39012a309aa86da2e2c116213a6ca76c3fc3803b8d4a07c531ee6dabae0572
-EBUILD Inline-C-0.810.0.ebuild 998 BLAKE2B d2a0ea70e0d1a5cb7e9d1b99ec68a7afc27ad24def429cd9943d8cda58367b404a8070c9e52fa00e11cd30e00718edefe88f76f61f4d1c0d0851402266a28a23 SHA512 8e9d143983aba3930584a7949a0e066331466e4b0e8170cd88be91f99c6a11b624b3e36127c8dc201587de98825c44a5ae043313dde6c7d689734e67cc0dfa7b
+EBUILD Inline-C-0.810.0.ebuild 1003 BLAKE2B 34436cdae3a82921f1c7a88ab9145fe65771a4be286e251f2755261cd20684a9fcc6ada8799c79dc9992316719a2632d7a11af9b224d38b66f16a00d262aeaa3 SHA512 22b744cd8cc14fec17197662b2a81272650e09ef697a4e83ff6fefcf9323245242ef3761951ac936c66f0fed0223d6aa0005dc0ea055e487bd0d14179907c7b5
 MISC metadata.xml 388 BLAKE2B 1779d2509ba695421ec128b7cf2411c76018cc1d3e8de9cbd81e84b1a015afc4b812bb33f4a409b2bde6f93635515d4f9144a59c3aac4eb9f8ed9efb10c1ec21 SHA512 2fe7fdca3f78057fc5287ce5bb7b135b7e0b56a3785994d54c8b206fd9b069c189ef0bd172b6c398277b702b669a3d92f43d4232dd93b5e6fecbdef048af7124
diff --git a/dev-perl/Jcode/Jcode-2.70.0-r2.ebuild b/dev-perl/Jcode/Jcode-2.70.0-r2.ebuild
index 49bc320e6403..c0c03c929e45 100644
--- a/dev-perl/Jcode/Jcode-2.70.0-r2.ebuild
+++ b/dev-perl/Jcode/Jcode-2.70.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Japanese transcoding module for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/perl-MIME-Base64-2.1"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Jcode/Manifest b/dev-perl/Jcode/Manifest
index 0b9baf0d3cc8..74cabe4e69f2 100644
--- a/dev-perl/Jcode/Manifest
+++ b/dev-perl/Jcode/Manifest
@@ -1,3 +1,3 @@
 DIST Jcode-2.07.tar.gz 350179 BLAKE2B 71826dfa31ac87a50312fbdbbf7310cf7cde0fa2acb122757f009ff6c42d64e3e3499a6d51c8e8dd9d0800ae66dd9eb154c5d953a273791592892ee83bebb858 SHA512 821a917e24eda21bea3fe1188597b48463948c2ef75071882574eff1c1c8e3322aab8ff1ace0028bbc3340416cbaa834a6f0c9f82b18579206ba0cfe7b55062d
-EBUILD Jcode-2.70.0-r2.ebuild 478 BLAKE2B 730577312eeeef4b25180520b0517e5f12ba7537a185ed9197458a5bbba728461f948781794124f455b5f2a536b56c276a816df4e791055d3c9c5f33fab94cec SHA512 3c30ac2695dc81485d5c7cd8f5e0af67310c904849f61f00c766057fca150d502eafc24bbd582cbc22777b56b58e72c97ecc5a0e5a2b739a42f5212688676ba9
+EBUILD Jcode-2.70.0-r2.ebuild 485 BLAKE2B 4421ac6cd78fbae062ad5db2394ec7bbb88171d44c632f3a9640f76c637e7750b71e38b28f76a64d254d40cf44e4588e9d429da32c2816d673739ad72a49e73d SHA512 8a1a9106ec8e5934184d66aa98a8d777d5e7d866d9b4d92a7a5c12cec9aaeb32ac4c480716230d34f34f809ffd1631a3d6e3998ee27eb238d090a805c753d578
 MISC metadata.xml 819 BLAKE2B 1b731e19787e91076278b81e414320977a450d5ee1565a7570c0b990c304f9b5cda17237c6a0d7988d2847e81985fcf1b7e1a53f97409e39843c98de9289b18e SHA512 62a7b847af8eb03fe872f0ffdb9f15cd18a02153426972f74348e97590b71736fd10d9cb508731187ec65748c874cad1366a1e33608ebab52970e4d3ee2ba418
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.762.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.762.ebuild
new file mode 100644
index 000000000000..142916460281
--- /dev/null
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.762.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_EXAMPLES=( "examples/*" )
+
+if [[ "${PV}" != "9999" ]]; then
+	DIST_VERSION=${PV%.0}
+	DIST_AUTHOR="AKHUETTEL"
+	KEYWORDS="amd64 ~x86"
+	inherit perl-module
+else
+	EGIT_REPO_URI="https://github.com/lab-measurement/Lab-Measurement.git"
+	EGIT_BRANCH="master"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
+	inherit perl-module git-r3
+fi
+
+DESCRIPTION="Measurement control and automation with Perl"
+HOMEPAGE="https://www.labmeasurement.de"
+
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DZIL_PLUGINS=( Git PodWeaver AuthorsFromGit RPM )
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Class-ISA
+	>=dev-perl/Class-Method-Modifiers-2.110.0
+	>=dev-perl/Clone-0.310.0
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	>=dev-perl/Exception-Class-1.0.0
+	virtual/perl-Exporter
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	dev-perl/Hook-LexWrap
+	virtual/perl-IO
+	>=dev-perl/IO-Socket-Timeout-0.320.0
+	dev-perl/List-MoreUtils
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Math-Complex
+	dev-perl/Math-Round
+	>=virtual/perl-Module-Load-0.260.0
+	>=dev-perl/Moose-2.121.300
+	>=dev-perl/MooseX-Params-Validate-0.180.0
+	dev-perl/MooseX-StrictConstructor
+	>=dev-perl/PDL-2.7.0
+	dev-perl/PDL-Graphics-Gnuplot
+	>=dev-perl/Role-Tiny-1.3.4
+	virtual/perl-Socket
+	dev-perl/Statistics-Descriptive
+	virtual/perl-Storable
+	>=dev-perl/TermReadKey-2.300.0
+	virtual/perl-Thread-Semaphore
+	virtual/perl-Time-HiRes
+	dev-perl/Time-Monotonic
+	virtual/perl-Time-Piece
+	>=dev-perl/Try-Tiny-0.220.0
+	>=dev-perl/YAML-LibYAML-0.410.0
+	virtual/perl-autodie
+	>=dev-perl/namespace-autoclean-0.200.0
+	virtual/perl-parent
+	sci-visualization/gnuplot
+	dev-perl/Lab-VXI11
+	dev-perl/USB-TMC
+"
+DEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/File-Slurper
+		virtual/perl-File-Temp
+		dev-perl/Test-Fatal
+		dev-perl/Test-File
+		virtual/perl-Test-Simple
+		dev-perl/Text-Diff
+		dev-perl/aliased
+	)
+"
+if [[ "${PV}" == "9999" ]]; then
+	DEPEND="${DEPEND}
+		dev-perl/Dist-Zilla"
+	for dzp in "${DZIL_PLUGINS[@]}" ; do
+		DEPEND="${DEPEND}
+		dev-perl/Dist-Zilla-Plugin-${dzp}"
+	done
+fi
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+		mkdir -p "${S}" || die "Can't make ${S}"
+	else
+		default
+	fi
+}
+
+dzil_to_distdir() {
+	local dzil_root dest has_missing modname dzil_version
+	dzil_root="$1"
+	dest="$2"
+
+	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
+
+	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
+	einfo "Generating CPAN dist with ${dzil_version}"
+
+	has_missing=""
+
+	einfo "Checking dzil authordeps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+			has_missing=1
+			eerror "'dzil authordeps' indicates missing build dependencies"
+			eerror "These will prevent building, please report a bug"
+			eerror "Missing:"
+		fi
+		eerror "  ${modname}"
+	done < <( dzil authordeps --missing --versions )
+
+	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
+
+	einfo "Checking dzil build deps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+			has_missing=1
+			ewarn "'dzil listdeps' indicates missing build dependencies"
+			ewarn "These may prevent building, please report a bug if they do"
+			ewarn "Missing:"
+		fi
+		ewarn "  ${modname}"
+	done < <( dzil listdeps --missing --versions --author )
+
+	einfo "Generating release"
+	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]]; then
+		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
+	fi
+	cd "${S}" || die "Can't enter build dir"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
index 4bf9cc43266b..77af54a66108 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DZIL_PLUGINS=( Git PodWeaver AuthorsFromGit )
+DZIL_PLUGINS=( Git PodWeaver AuthorsFromGit RPM )
 
 RDEPEND="
 	virtual/perl-Carp
@@ -44,6 +44,7 @@ RDEPEND="
 	dev-perl/List-MoreUtils
 	virtual/perl-Scalar-List-Utils
 	virtual/perl-Math-Complex
+	dev-perl/Math-Round
 	>=virtual/perl-Module-Load-0.260.0
 	>=dev-perl/Moose-2.121.300
 	>=dev-perl/MooseX-Params-Validate-0.180.0
diff --git a/dev-perl/Lab-Measurement/Manifest b/dev-perl/Lab-Measurement/Manifest
index e0997b096eed..70a144610568 100644
--- a/dev-perl/Lab-Measurement/Manifest
+++ b/dev-perl/Lab-Measurement/Manifest
@@ -1,6 +1,8 @@
 DIST Lab-Measurement-3.741.tar.gz 621051 BLAKE2B bcde314015e410aec93e4bace1990621f58bc81dc3f010f27a37295b70432f3f65b0d46382e18bb57b18b00c3001a1757647a9f35cfe8a214036dd57bc27a64f SHA512 f1b43177c720a10567c99edfba78c0c35659f1b82b2eb03f66e383767a9ef5b415c9014b50013ba5caddf67bb4bd87dadea4295923a161f53a85d23ae8d8c6a0
 DIST Lab-Measurement-3.751.tar.gz 622310 BLAKE2B 5bac81b956aa457e8c6ba03c82b628495ab514aaf0d87f59c55afe7f7630f7df746f95d4165f734e980eb6b6921d31cf9ffe5285c38f968860310941ce06a597 SHA512 220dacb27799b222601eb12b666b637da7b47068191ee9779ee029ec21e1cb15908ab82bba18b499e0be7538469fe99ffe7f9eaa6b78ebe349fe5e30079ded70
+DIST Lab-Measurement-3.762.tar.gz 651690 BLAKE2B 9cced9cb51c45149db353a46ad2c253da5c9d1d2ec82889b9221b010a5fae3fffa54afe65f2f08b66238d1970b842ec913d8464c988938fee55b47423298467d SHA512 df9ee0f9535fbff44be18b61978c6b2735acbbeee510715d6b34812576053022a24be52ec04d1dba04edcd79fa6eaa13706e173dc2b3b4c0352fa7bdccb5d96e
 EBUILD Lab-Measurement-3.741.ebuild 3685 BLAKE2B 417593af0c162353e3c992809aef259995b523e54d086984442f2950cc43b66d6df503fb0281e6ec9436cc43ac585239f41d4418bd266d3cdeb1a459dcaf692a SHA512 edd6fca1f295a975c14e825a9bf011895bf6a66faca6b50804d235417cdef1ff3a7fd7d6d79130a1e2555209f03b6c74208bd53b8c56abcea36a6ec591c6258e
 EBUILD Lab-Measurement-3.751.ebuild 3685 BLAKE2B 417593af0c162353e3c992809aef259995b523e54d086984442f2950cc43b66d6df503fb0281e6ec9436cc43ac585239f41d4418bd266d3cdeb1a459dcaf692a SHA512 edd6fca1f295a975c14e825a9bf011895bf6a66faca6b50804d235417cdef1ff3a7fd7d6d79130a1e2555209f03b6c74208bd53b8c56abcea36a6ec591c6258e
-EBUILD Lab-Measurement-9999.ebuild 3685 BLAKE2B 1661c31f557556ce20e6baf0f65565387578b7aec884b0aa26ab022885ee1b3941b2d10d2917d279da775b1c8d18c712b8b803d9fc8b5575e7f16b37659e97e4 SHA512 9c0dcbe2e93c2b6928ec650785e0ac06d4ca467b68fafb7e0be3285efe7d2373d15b9a0e9cbe5f0553f7432c36c86d1e4c1ad4c38a455350e4d2deaf4bbddf70
+EBUILD Lab-Measurement-3.762.ebuild 3709 BLAKE2B 64882fb00fbf50a870c3d1d4b9b31f8ef03af0c05f57cf0f38df29fe7417343ff725028f9673da124a9ffeed0f3f386e6e1a46d46a45a6a457c957e4e2802108 SHA512 4c9f49d3d5ad8ea9ae0eca97cdf1d73236ec1a83c05598cff3d161dc51964953bb9fd26f1cf1d2d2a1d8a7565de93f98f4e5b925093d61cf71897d5524bf9fd7
+EBUILD Lab-Measurement-9999.ebuild 3710 BLAKE2B 7d337189ede2ec8331f67766518fb73cebd220727ae75ff2de3bb346eaa893edde47aa07d31b58a3ba1505834f08236a2c2f72ad9a190a636ec75b4a6d22469d SHA512 9f53a569f0443703d40d73ce4947e1acfd73d8ebabee5692df198e57e77dcca4f97a7b8c35ee471f299ccde9a51ee8767727a418677d93da5fbcb9834fc9329b
 MISC metadata.xml 3205 BLAKE2B d8be34e0b381d155cc4706306a50222a523e80a742616351e984cbeb8fbe9ea15fd626ef23163da0ab2f681998756e97e7bba412432c908008b1f34f1b201242 SHA512 cefb77a0d38bc965c8e4a5c9346eb0218a7b9cccc66535b460219fd52359df0db750e96eb88337d425caf5114b7cfcba9f8d3666c7d9e3c052bc2ae1a9e2ceae
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 240c50aae2ce..47091ad4b8d2 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Math-GMP/Manifest b/dev-perl/Math-GMP/Manifest
index 4129820a8d12..45ce1f517484 100644
--- a/dev-perl/Math-GMP/Manifest
+++ b/dev-perl/Math-GMP/Manifest
@@ -1,5 +1,5 @@
 DIST Math-GMP-2.15.tar.gz 33002 BLAKE2B 606bd63b05fab90e0da39ac75be4ccbe9a5386a6002920af8c9d135fcc8aaf746f8e72c25301a8a8de72edc80eef29202742441738afc90573e58c2626123289 SHA512 6c8c13eb168f6233d5bb172ae424aa1c7b5af2cd18aabe1a9a8f2989591245456270b684062684b29539060f91b041589c43cabcd2e7e277335ae188e5f386a2
 DIST Math-GMP-2.20.tar.gz 34224 BLAKE2B 752c87fcb3b1b9842822f57bd2ed8c8600ccd117103bc6d4fd957c20c3476224c471a7572557094163b7264781aa2e46ed58a6b3f6b185d691aad28dfa79f839 SHA512 e76a4f2ed9f700029a0b075fcdaecf6fb3792ecfef23fb75f014572b6471be9265b80551c741cda9fe3f323a351a23fb9e5edca2e05300b97509b225aa721b04
 EBUILD Math-GMP-2.150.0.ebuild 654 BLAKE2B be184c95cf88cd45a7a298d2fb40490d06d5d2643a566a48f98257ccfc694039743a75c51058a4215c01008934f39a5fb2569cdc8e7df1c0f71085de7506069d SHA512 261918e681a9c616e528dd86adfe7b71d3192db41654d31849a84b56823d75d805b43b7f2378a14d4bef28452c5f157addba930d52b97a2a42271e47f419b13c
-EBUILD Math-GMP-2.200.0.ebuild 644 BLAKE2B 1dd2de0e611ac595b9b0a374398e7b6f8bc889ee2260caa161276b7c668b161c778c0aa3a5dac2550fe5f58b7961392beda9342656f1dac6d740704e99bab16b SHA512 907146537ec4ed9a57be7f14921bff4cb41653b2075547dfd0693c9227f8bc83ad2a48dce3c121abb3548c0ff044e6a156d217145ad50be842a6096aca87695e
+EBUILD Math-GMP-2.200.0.ebuild 641 BLAKE2B 6dd36a83e3195bc351e71513990b7b85aa00a7020424b3a10d1d3d1fb36faa872f484a0309426d53dda5b92f82857ae5357e00220a61b4d6d3795c18850b6b99 SHA512 0a9e2f52ddf392813c5473d1cac045ab139df75be51671f51c6a663e07a0e5f81a4b0974e33319e82b91118c27ee6c6fbb97c074b5cf7117ce1c0c3eb7d6f5a1
 MISC metadata.xml 388 BLAKE2B 6cfc5a2262fb38c5b504e686d6c1f67da85a062f8cb901b93c678ad8d06a93c7e95b4097e2d4c2d2b97774d9b74d7791cbc54a2433deb0a461d7839d56bf4ee0 SHA512 acb992a862f439fe6031b2279984afb5527a27fb480f5030a89cfacd583fae6e4acd2dfac8d8d33582c09c07602a98e1ec6282aa0ccdeb57ce3c4c76f0a67f9f
diff --git a/dev-perl/Math-GMP/Math-GMP-2.200.0.ebuild b/dev-perl/Math-GMP/Math-GMP-2.200.0.ebuild
index 381d60b7debb..7e7823886559 100644
--- a/dev-perl/Math-GMP/Math-GMP-2.200.0.ebuild
+++ b/dev-perl/Math-GMP/Math-GMP-2.200.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="High speed arbitrary size integer math"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~mips ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Math-Round/Manifest b/dev-perl/Math-Round/Manifest
index 8880fe91e1a4..664a8d2bce58 100644
--- a/dev-perl/Math-Round/Manifest
+++ b/dev-perl/Math-Round/Manifest
@@ -1,3 +1,3 @@
 DIST Math-Round-0.07.tar.gz 5221 BLAKE2B a878c07ab5a97fc1357500f6563a8ea7607aa2bbefb0fd642d204befdea8bf574c862ebd5884d5d1ef7819bdb256507aa1c3bc7b79199c8c7f5216d35b87ca9c SHA512 7b25c907b4d2c7d8f9d9318991739ea6dfd104d75f9d7f88057739a21072a003306669a9affafed752a20ec97d6341560216492a80ac49f7b456ea54121211b7
-EBUILD Math-Round-0.70.0.ebuild 436 BLAKE2B 93e18a97336489d2e936508415f92ecc05cc856f2e0bcc349419812a2b49a8558fffae49de0be115ad834440dd0c7885a8c715b99ebbfa180894ffdeed24eac1 SHA512 36e1c7320d8d8c7d9992ba05f960c2f423b77a74ceb859894efb2a2550c80f35dc10ec567604d2d2a11f2d7fd20320080fd1310c545c006d1e09501aee9bb03a
+EBUILD Math-Round-0.70.0.ebuild 435 BLAKE2B 97cf4fdfd5e1fb92fa1dd361b8f32a0a252a2ef9cd9e1263d985aac1d536888d26ace08372d8e3be35f07d80323acf5c3809f89bceafe1ab150af8df797c231f SHA512 ae15e1abbd1e17ffb6931fb1da50d856cfca0e1d034a839d10e7081207b245cbb06718f55401a87e496950d0dbfb4a531af7e3ba73a502b4976ba2d3b717cbd2
 MISC metadata.xml 392 BLAKE2B 1ff771c5f337f7b906e3aff310302fadfa4da96b3d87cc2548222662d692b2ccc875978bfb8dee2f61e6540a63feb84c8a6a3d906cc273d713f8f039083be761 SHA512 8cb15eda93313b6e473eccf3c4fa71627fb039a456b143cb787e9bcaf9f32871ee621941873ef0f3141a9718e7612e7f2ef6b6d7e72bc0646ece647c472ecbaa
diff --git a/dev-perl/Math-Round/Math-Round-0.70.0.ebuild b/dev-perl/Math-Round/Math-Round-0.70.0.ebuild
index 02b439414437..3fe385485239 100644
--- a/dev-perl/Math-Round/Math-Round-0.70.0.ebuild
+++ b/dev-perl/Math-Round/Math-Round-0.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for rounding numbers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-perl/Mojolicious/Manifest b/dev-perl/Mojolicious/Manifest
index 36f45a04eb59..f3153d232d91 100644
--- a/dev-perl/Mojolicious/Manifest
+++ b/dev-perl/Mojolicious/Manifest
@@ -2,6 +2,6 @@ DIST Mojolicious-7.57.tar.gz 706093 BLAKE2B 13212367fe09a437a97093668558ded12164
 DIST Mojolicious-8.58.tar.gz 778040 BLAKE2B 80e36b370a89fc3712332e8322a4ef3083a82a2cf1bc798b7a48ee9afec17a19adb2c45774dd0588807f78aefcf147f28fe50c97fe4a66a71d652027931fc37e SHA512 bcd923955253e2d5b4b6dbef919dd3a960189f5724561232543cb0b5ae9e700fecea04851dd87092e04c22d6039940c45985eb23baa7977c794dc90bc58d0643
 DIST Mojolicious-9.19.tar.gz 841263 BLAKE2B 7510b268c1a5793ba78d8717f5683c3ca53fa95c0af8b374b5767ff4a7c532481a788c08ac66c88295e55307fbf164784547568ce1edbc35b3b03f340ed60336 SHA512 14c29473f040548de2efef8bf5cd5676554f9f518b52e0ee03ed30415942fbeff5f5f2a6dd7592798e433e3e83653ce815697d4614e4680c9a6b8c699b0a171a
 EBUILD Mojolicious-7.570.0.ebuild 682 BLAKE2B a4a1d51ba9c0184478d978dd4da94bcef00fa9481f24a13ac810339721ddd5c43bdc775f2e1a796b4bc11e04162298874338ddd5fa6b6c32f5e1570ee3cacfc6 SHA512 0efb15c91fe8ac2d491b1afd5f93b6e0b79f3ca62cc77aadcac4facad648255850b0f42b786963db09d0331156074f5aaa7954c55fe78a211bfec10be56dc261
-EBUILD Mojolicious-8.580.0.ebuild 655 BLAKE2B e43d3355ab06ece5742f6605c7dd560bfa8a7b0b575639f2946ac31b708f8e346318feb93bd3e08133afca567cd48804ee232f1f8cd51f572c1325cf28430bdf SHA512 bcc87a610a6c2e2e4f0579349cca960eea5396dd9771625993d74bd1a5da96ccd34c1b200aac52bef9fe6d796ef791a8a73767e63054ad6c9cbf03fd1a4fb3ff
+EBUILD Mojolicious-8.580.0.ebuild 652 BLAKE2B 9c35b6dda0eb3d8bc28bbb495459fed2bd1d68dbbec5f06dae295856280d723807157376e6a7e4a989e3835a44c44c9969e2f2408896722d5db95d76c232c3e0 SHA512 0af2bb47ac6150ae84ffddbb7191268fa62a20d410bb1aa0967ffb1d0296ce7592ef9d9a256f3b7c5bd38446fd7633612a8bc4a26fce5184135ec59a208cfefd
 EBUILD Mojolicious-9.190.0.ebuild 626 BLAKE2B 899e93c772c5b29f270af48f9d8864a5fae5d6367e22244502beb80f6835acbbc1c7fdf414c4436dfd94165563dba3e2e429e9d1fb3b051bdaa763a6b9060a33 SHA512 b4d12211c5ab8840f29f4cea489d5c1cddb393923043a1f414b71cd95c2f594870a5be77700129e2160319e14e7294075c500e260914f30b1d3a0114acd40851
 MISC metadata.xml 7807 BLAKE2B a7a3908fdaa74e3a1ddda4fe5ecb619ea104a97f8ba5c7e97a877eff762191abe47931e218c122f72fc375f2f3dbf21dfe78162d391871f724d0dbc151b4cac0 SHA512 944b54c0b0990a8d87bdc995041375da2831aefd927bb006aafa03fc71d87f6110b43eb9ad1239c2d6d2f1cdb802454f0ad3df81530d4d343bb3520e87ae026e
diff --git a/dev-perl/Mojolicious/Mojolicious-8.580.0.ebuild b/dev-perl/Mojolicious/Mojolicious-8.580.0.ebuild
index 343d4f6cb0dd..a7843d57d504 100644
--- a/dev-perl/Mojolicious/Mojolicious-8.580.0.ebuild
+++ b/dev-perl/Mojolicious/Mojolicious-8.580.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 LICENSE="Artistic-2"
 DESCRIPTION="Real-time web framework"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/MooX-late/Manifest b/dev-perl/MooX-late/Manifest
index 0dc1f37b627d..19fa229498b4 100644
--- a/dev-perl/MooX-late/Manifest
+++ b/dev-perl/MooX-late/Manifest
@@ -1,5 +1,5 @@
 DIST MooX-late-0.015.tar.gz 23339 BLAKE2B 96aaae7d69f3d6fccb01491cc2e99ed516a69d1569661ee8ab2b8fc8c751d5c3e3d9157f36a8ce2899bfebc14cb3e8bca3ef8d82c59006d789129b2217ca9568 SHA512 4d685f4e68abe10487a98def8f0e7b0bafbd9928af27e61a5ac410bcafa9833a4aebdc8cd5bdbebd1a6ee53b4b0d5ae9bfa3864cae428b21c926730365fefb6d
 DIST MooX-late-0.100.tar.gz 22113 BLAKE2B 3fe2dbbd8615e95c191b9fb6b89325210e1883f5dadb5129088833d4ae724d8abde91b0e2d8f4bb5cb449d4ea2d49514bfa64057e7347dae0c51c2e8d4e2cc76 SHA512 69450edbe7b2192094608a3ec543348d87223c9a124b86dc04a1cdf74b697adb331e5e1498533a557e5d4eded374770086d6696bdda597afe924520cad0c229c
-EBUILD MooX-late-0.100.0.ebuild 557 BLAKE2B 601468be45fcd1dcd47700d994b15ef2afc57a1bd72c01f604c5038a03e7632443f12c18515ffde93b3694c93b20f5dc32c581b58a8274c6c79d71ed19a0f8a9 SHA512 7710cd1ca30b68a574733ee61393aa7dda28f1f2209d09e430a88e81a19c039301b930a9ad3a831220b79bad5f37323e299aee5511d99ad31c7cd058b733adf4
+EBUILD MooX-late-0.100.0.ebuild 568 BLAKE2B 74df37aa34fa051eae479268de9a755bf32faaa04e390f190f0afb38647da0f631fcc19e33780cb273c1a79029f78ae8c0e1f18622f0982fe5cbb1aab2438c06 SHA512 4f97752d4f4f6ee73336d60eaa69a9cb90d63f8d1821b048f203d9c8de0c4f5c33e3ff7bd224607ddc600c5265dba7148cdccd78ddf2bb7d029761298a584b0e
 EBUILD MooX-late-0.15.0-r1.ebuild 574 BLAKE2B b974e73172b639c3a3fcbe7c05d6ec7863b91386cf269c0b7cf3d384b8f9322378cd9c6dd693d7f2b7d250424c085511c4f1599f877e5a778f19126dd2ab00a4 SHA512 4b18ab6e29b0c225bada74ab33c745417be0f5f0459ea9a2ffa03d98321af19d73185cee7436271fb9039ea8d017aae6abddb336178970992658a3d9f5a0a994
 MISC metadata.xml 452 BLAKE2B 825bc6de541442f1a874ecdabb7fcf15f7659e3df8494facf6565101cb0e20f32b0e372d2d6da9f2ac32d81994d2ae653cfcf8f04f6f362779aee135d463d8e1 SHA512 fc13162a215765c188761565a52bf62b58784a69dbd3f28aa35e622058592993593fdb86195bf163e084f345fc82891a7f033a6ff4b291eb45c73ed908be80a0
diff --git a/dev-perl/MooX-late/MooX-late-0.100.0.ebuild b/dev-perl/MooX-late/MooX-late-0.100.0.ebuild
index 9818092113d5..c0e93c1f7364 100644
--- a/dev-perl/MooX-late/MooX-late-0.100.0.ebuild
+++ b/dev-perl/MooX-late/MooX-late-0.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Easily translate Moose code to Moo"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa ~ppc"
 
 RDEPEND="
 	>=dev-perl/Moo-2.0.0
diff --git a/dev-perl/Moose/Manifest b/dev-perl/Moose/Manifest
index de48cbe16e0a..57bb02d2fd12 100644
--- a/dev-perl/Moose/Manifest
+++ b/dev-perl/Moose/Manifest
@@ -2,6 +2,6 @@ DIST Moose-2.2007.tar.gz 818526 BLAKE2B 77b7d0c7646477a34f285d03756c8ade891b2323
 DIST Moose-2.2014.tar.gz 899094 BLAKE2B 38b6f25808ea2bfdc0a275a5d95278dacae98bf02821c8647f83dae06f51254d2798c2de1f37431ae0e9aa5d09a2f208b6985d3e2d481d3020670265e7d57f75 SHA512 ee472cffe928b86732150bd68d1a74f7c2d5769ef3369339e429361a093f3381fdc327910c1a4b9576c01b88ae90f86f1f8979dc0784fcce8ffeb9b42d67aafc
 DIST Moose-2.2015.tar.gz 899314 BLAKE2B 6dc0d75d96d81c3c0ec9ef1678510879cdeacd36989d79ee830ce46f049072aea858c4933008da7e50edcb955b5461e8b973c2329bed271936f5766292936492 SHA512 162a0cd5f96f943cfd9f4a7f9fdc3f86341805045ecab418e1420e3b5e90b216d243515f073274bdb83846fddad78169ef5a2a6c41849466bb36a24c71a38b1b
 EBUILD Moose-2.200.700.ebuild 4157 BLAKE2B f2de1b4d3354addd7585b2b2a8827ede708193f0c027bbc7091c8bd06c655f04643752fc7325c1d66f885c0dd8549ecfb5d65950a8eda4c1546134dd9844276b SHA512 2053dafde49422d841630ebdbbc39d44d901f44cd079ba3e56d40960c3972c4d88d306ff5d341c51cca63f7aed76ff8db014fe0de7a21abf36700fcba9e895ac
-EBUILD Moose-2.201.400.ebuild 4189 BLAKE2B a478400f13ec5f2704680594bab996ab7496e625737c5f1d6faa84089c4cacb85d8003d385c1a7a6f4a63c0891ccb078d452c382ca4de0789712c5cf4799037b SHA512 33af096a18e337787670fa0bd65b452fa81532c622773b25bf603cf0c8fb93f8946c308a6941da5d2daac1fb26ba953ae9b42bf4cb41f5273d09fc76570a5ba9
+EBUILD Moose-2.201.400.ebuild 4188 BLAKE2B 8b978c8f72ae1dfd6ab6bdd4df1fb6356eb88cbc29053a5fb7ae7dfb3cbcc0acf9fc8c2e237c9350b45ddf2b7b8bf0fe80c1125a32f1d749bcd5d75f214c201e SHA512 1f4baa9d1ab3eb6ca9e5f5a3250b3fde1079613d3d5394986502671feacfb30b40a87d59d6c557efb700441edaa1f65cfd59def7d36acf3013ed8d3de5d427be
 EBUILD Moose-2.201.500.ebuild 4104 BLAKE2B 5087672dc2c4300db476d6672470ae1915be8693cf88d6f32f36717a8778131db3d0075ea770c6327de1cbcb985a9dca1b8514795c2724080f5cf7fab49b7441 SHA512 fa24c2c6bf4b6f88064352b44638857a4b83aee8c39e98a9d7454a519c38d0e38980a25c24ce7bedab0075b604e3e56536017e262a9d818a3941b2cff59ef9bc
 MISC metadata.xml 35448 BLAKE2B f6c44e9aedab6ac47f51848cc9ea2d3518f2854e59ef1742866394e2ab4cd7de18275e27da82c885df7d1865ae1ad8f397979f9a175dd10599290d4c566c4f8e SHA512 5d7a51806b0278fc5dd7cd1d487c0f211aefa638dbe6839eb5aeaf5219b03d97d7d0765bcfd603a9add64ea3f72ef770ffc9b39578cd728467e066f1abc12579
diff --git a/dev-perl/Moose/Moose-2.201.400.ebuild b/dev-perl/Moose/Moose-2.201.400.ebuild
index 950680d439a6..6f40db71d5ae 100644
--- a/dev-perl/Moose/Moose-2.201.400.ebuild
+++ b/dev-perl/Moose/Moose-2.201.400.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A postmodern object system for Perl 5"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-CIDR-Lite/Manifest b/dev-perl/Net-CIDR-Lite/Manifest
index 05c4615599f6..d76c526db6c6 100644
--- a/dev-perl/Net-CIDR-Lite/Manifest
+++ b/dev-perl/Net-CIDR-Lite/Manifest
@@ -1,5 +1,5 @@
 DIST Net-CIDR-Lite-0.21.tar.gz 9931 BLAKE2B 50378fc1b032bb19cf8033ef6e884d8d623c91f1a0581763da483a031013b70ed36580304e1d2cabcbca1099d5e3062a7642b8aa2913ad1576cb9bf865f675bc SHA512 c8a5b00a26fb823e637825eac72ca7002f401a1a623d8b77b694848975124f24fba86830df8d41f6bdba4d2e2f0f93b2b155ac1511b607efa67942189614dc7c
 DIST Net-CIDR-Lite-0.22.tar.gz 10823 BLAKE2B cee9074c573f16ebf6568316124afbc496b7d2644bdb0d2d8ff29f57c81c405db072576fb2ab071cbfbb84d8a2b2544fce425e481a1f8853d9e11bcb2423beca SHA512 5d89c0b6d950e5cb4c7eb9639829d76a67373865f5582f61d3e384636b176ac08335a9210d05a53c54105fecfb8ec98ae115cba3d181aed3032370d50f3aec9f
 EBUILD Net-CIDR-Lite-0.210.0-r1.ebuild 538 BLAKE2B e86b0b9cc0383ee22137b579cfc92f5f8e06cd059151df10afb354168abb6f3151bd88c99240170ad953864d42eb3e86e1b802499377ca4283105600f09605b8 SHA512 2132c0327a291ac65dd58589a9beae0b8c7df38f98297bc7580cc1692fd004a82ba957306fe5beb854e4b99892fad7c9dbaffb8c707b1193440fad5d07496986
-EBUILD Net-CIDR-Lite-0.220.0.ebuild 543 BLAKE2B a05ead74553855e0d4ea38615727ca860aa05fe31e12fce4e1fe0f9173b63d5faf2656257a19e7bcd34b432bafcb1270eeec621a4285efcc0f2429110817a00b SHA512 bd027b9fb91f31efcba34c419a03df105722868ba25712f6da27fa9e50421f929a6b315063045a6c5d9845148fe508e8ff1eb5112d9a9f554514829bf58c3ab5
+EBUILD Net-CIDR-Lite-0.220.0.ebuild 541 BLAKE2B 2acd8b4aab318b59060bf3c41a6bfbe42f2af5999e9050a235e9e51be3b0eb74d2c08f416347d551aac4edb13ef56322c10852fafa085a53c22e61861fae3e1c SHA512 7e57d3d12f7c4cb9e1d1610fa1ae6b44015fde3f4e02f7492a6d8f4e342327957cde544516e2d55818c40eddeafbd5d60d2ed63867e81562cac0e88de969d8be
 MISC metadata.xml 467 BLAKE2B ab893eecc1c077301285d29b33a5007ad21e15a0140f83620041599281c79221c6a00d2eede7f06e1ab9f9d23d38f05eab3e8b4f338afb2e11c597afec873783 SHA512 3ab581f43391e1f501e8c6bcf4b8d0adc640ab109ea7f948b201f2307636219bc781bc4b52ac0db2f012d8ae00789bba4925789120811b2f7a1aab5ff3fed7dd
diff --git a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.220.0.ebuild b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.220.0.ebuild
index d89933e3597f..e5325e02e7ab 100644
--- a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.220.0.ebuild
+++ b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for merging IPv4 or IPv6 CIDR addresses"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-DBus/Manifest b/dev-perl/Net-DBus/Manifest
index 6ab09b13e79b..d6f8cf5c81b9 100644
--- a/dev-perl/Net-DBus/Manifest
+++ b/dev-perl/Net-DBus/Manifest
@@ -1,6 +1,6 @@
 DIST Net-DBus-1.1.0.tar.gz 2075154 BLAKE2B e5f75f63678b72d2d80406af76430802c715c59e535487b4dcd8bf1502a3de915035eec26fdce020f44aab27ca46993b85d3e23dd62f472bcfce923b27306a11 SHA512 96f5983ef1e33b4abea93277e39e779821c8ee4b1f2bc7a4a3aaa3612b9513a426b9f8e04094eb8449e89324c22c264df2d34b3d3e43dace85f443a57c770cc3
 DIST Net-DBus-1.2.0.tar.gz 108296 BLAKE2B c5c4fadfe1c04f5f6dcc73f7d3ccb2a91555809209229f51a326494e73b5a0ccc83a89f427c19c73a82b9608decf85cd19ad469a635cf176d5b1dc42bdec98a0 SHA512 9dc95288ae81037985020e18db33331de6908b1280fc3b0ca898c183a5b577d21d240f4f1045393f9459a9be6e3425feffa9ea581e6af2bcf165cdf48348b255
-EBUILD Net-DBus-1.1.0-r1.ebuild 674 BLAKE2B f824188b0098367f2ce4063cc98a49fd0f4f6cadd07bb762f5826ff74e64a9cc98a77668a41af112b0929845858bffd66cb90bef8c7d5858882a1ca499e3b8d4 SHA512 65f6182219c7d962a02c2e9004ff28e31b37fe6b8c5d613e2d2c1834627d7a83df22a6d4dae37673369e1a2e6cbfc535ac5a0f9ad08ba69b1d50274dfde55138
+EBUILD Net-DBus-1.1.0-r1.ebuild 672 BLAKE2B 6a4c177b35eb0ce21d884f9c825810485fd2032848f58f26a70b0a0c71135b4f312f76eb4e96034b1db602b104b8d8f38d6722a2cf53c8704460d9755e7b3923 SHA512 7d6b7b66043cf8d06869e4d9150631b1ab9bf4b6825ff74aa91072782555a1db3e190756a183e3694685458fbae5ba4fa885f5f7bb50fe97b5da633bcee3c9f0
 EBUILD Net-DBus-1.1.0.ebuild 645 BLAKE2B 4758bda53d3d92f6aa8b2bd773167b6a1c002c3a502164859d58a4454f462c27b497f5f0c87ed3f2f997f10eba0f52f9def094117031bd185b18c6ff995e7a2d SHA512 ddf525f9022fe3478915eb5c7fb704a5e7b6a28b166134ea525d81902477d04e012feb7bd7960cfeb7b0d06d79e41416316e9d4873a716a90939ee81bd2d596c
 EBUILD Net-DBus-1.2.0.ebuild 606 BLAKE2B fabedc83808cc716555538b22596f5d5e34af9eadd8906f18512bb6111bade90ed7a2d4dbe878bd4408b0ef30e25b87bac95b2bf2e1c5a3a936ea96ca9bdfc08 SHA512 70c8e72d8e703065bc9bed76bce522413d183fccb2e9084029790b522758a3b9a14e03f97fde282f18a1e81b450d36a84649005a1361dd4a30910a9e18d95e7b
 MISC metadata.xml 2428 BLAKE2B 0ed3b699ea865b088921855030debc8a323d80d18a656f5e7a132b18ddccf34a926e1bf081bc779bc7583715c75a58dd4e79b04aa5c557a9cb42a26874bffa45 SHA512 ec204108cdc58e7a0c59d4f8ea88e04eb29e47ac52f83600bedd2279608cccb09c60840883f477be475ccea923e7a8344196b6053aefd7d8315dd8d628560f44
diff --git a/dev-perl/Net-DBus/Net-DBus-1.1.0-r1.ebuild b/dev-perl/Net-DBus/Net-DBus-1.1.0-r1.ebuild
index 201fa40f9ad2..c9b1b592cbfb 100644
--- a/dev-perl/Net-DBus/Net-DBus-1.1.0-r1.ebuild
+++ b/dev-perl/Net-DBus/Net-DBus-1.1.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the DBus message system"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-DNS-SEC/Manifest b/dev-perl/Net-DNS-SEC/Manifest
index db9102543467..d0c5b7eebd2d 100644
--- a/dev-perl/Net-DNS-SEC/Manifest
+++ b/dev-perl/Net-DNS-SEC/Manifest
@@ -1,7 +1,7 @@
 DIST Net-DNS-SEC-1.03.tar.gz 35605 BLAKE2B 8d7ab450986b4cc4f7d31ae50f3efdeb56e6a437269ff6a54d5ece26a863405f12faf16e52aff2ba991d6e8320ed5b5cd3d07fdee20a5b3db7da4683e02c6243 SHA512 17d9f2125b9ed687791941ea777927daf8cfe4a6a379d02cda499fb01a71606b1c01154a3d4f2f2ffb70f5a658aaf02e64c8e5cc308de8c8e0cc543271ee7bce
 DIST Net-DNS-SEC-1.16.tar.gz 46603 BLAKE2B 3f248ebe62b21c68ba06b13a13bab2b8507df4cefd10f87de88191590b05b4ed48cc04b228a78768bf3ff907d319c38eeae46d3e407180eb9722f5eb5ccf2b24 SHA512 47eaaaabfc76666a4c7da89fd9eb189fa065c7e0b60f5c166420c76226a0df938e95e5abfa83e6a1a49b92593aee078883b1a170d39426c84fdef22a2fc50ef0
 DIST Net-DNS-SEC-1.18.tar.gz 46301 BLAKE2B 9f943cf1391b8b1a07b361a837fd7b88b712372885024bb862b4ed606231b69c083e75dc2675a518452dae28873b867fc256a7a0f8f90c9900d80e8f6c5b25b6 SHA512 44f1bbcd9b5c8759ccbb8a9c40efb3d0533a991d6d9aec63ec8b1347a4cbf314470efebe4e5bc59fb19427405a4b8d41682c5231427783cace8f9779bccdc893
-EBUILD Net-DNS-SEC-1.160.0.ebuild 716 BLAKE2B 0cf69aae636661965c7e331db1206a283a66601cb65172028b6b54886fd7ed8c5979db7118e5f9b80c5d9aaff276e686da26c3845ca2c21a0e1e23c3ce327edb SHA512 4cc56b5dda6bdd28cae20ef391ae951ea19e2b3b3b51ce712beb434f58d0bced82783cf2a26d486425b2aaa8aba1ae24ecaea513cb6235262bca92f3048eadb1
+EBUILD Net-DNS-SEC-1.160.0.ebuild 713 BLAKE2B 5bdb6dc994545d767fcfeafc027a73a9539b057f716d7016e4ce3953e7032362a139f671f6a2516031f3431354c435e9d8d9432b47dda7c698cf642b7656acb1 SHA512 dc8273816526ce25fc3cdeb39ab0271300aeda25be1d54a3bb1aee397bfb3d08572d5b25d80fd4bbae1cc857ccc727f6cef184f22312ac56c05eb5b57aaa7780
 EBUILD Net-DNS-SEC-1.180.0.ebuild 706 BLAKE2B fb083c101f1651c3e5a1eb04e50c32f5b73644a11a2edc7acfbeb98ab5692b17b36553b31ef6ffffc35e8f450e509159102f17cea29a06be9f03b691bfe5803a SHA512 56a30349cd29777e191b33fb46641172dfa1a49e984cc3513579c56d70538b103e75dad17cefe97810613057e4600b2495ae381fa72f8efdfc68ab781238c324
 EBUILD Net-DNS-SEC-1.30.0.ebuild 2135 BLAKE2B b2f708f5079020496832455d214b5221086a297955b39a638c198e17d48cd108f0dc7a5919f414e1fad7bf75b6181085ead83aca5f01d6b09779efe137f030c4 SHA512 7c0ebf283c320b42d469effb5c71dafba128b9ed0c62f7a942905ac5fc0733628bf15a5b0a1a8956b96d5ecee297441aa96402aa211c36d931ff84ce596c86b0
 MISC metadata.xml 905 BLAKE2B eff2615e97186ac69154cb936b332c72472f0d87f670a22d0d7d11f8a2edbc798d9ec389d9f9762961b419a1d0a4b8d4fb93d7bd5c7c5250ca1e65dd9bf9cdd8 SHA512 62a66ba1f0d23791fbca7ff707e3a076053049e17cffc7c2c3435a117881ae02563e85a7a9c91e50b6d11ef18cc7246897a9886a2227c6e9ba67a093dd9e7638
diff --git a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.160.0.ebuild b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.160.0.ebuild
index f9dbb0380787..d7c02eae9910 100644
--- a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.160.0.ebuild
+++ b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.160.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="DNSSEC extensions to Net::DNS"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-DNS/Manifest b/dev-perl/Net-DNS/Manifest
index ec57c375e3fd..1128acf1e966 100644
--- a/dev-perl/Net-DNS/Manifest
+++ b/dev-perl/Net-DNS/Manifest
@@ -2,6 +2,6 @@ DIST Net-DNS-1.13.tar.gz 251658 BLAKE2B 3ade04bea24455f6a4dc2d3a5b3dd40f19bd1638
 DIST Net-DNS-1.23.tar.gz 257796 BLAKE2B 974ad41111af557e4c066403c93606ca924a900e8892f8dd275e4691beb672ab0dc7e0f3081ca134c39d562368ee1fbf8f174911f3dcca8f0fa3a2a1e44c736d SHA512 23c9df9e12340687d3399cbe7fb5f94dfa4ceae94be77227c42f0f707470ef90194ef64aa953ee36da5c2ba6a28d2bb4b59de04a9722ae3b0db6162916bde2b1
 DIST Net-DNS-1.31.tar.gz 249299 BLAKE2B d8456453240e388476ef918cc7731b9d790b8163885e18658182d927c2a594cb74a7983d33607d495c75b7638efd7bd2bb6368e1b5ec80e4eca9e809ba6bc97c SHA512 f406bc192f18b0a07171f3e81209ca705b9fa5fa8104533cbece1678bb08220636b438aa3a4a6a5f2d03a3a3166503a9fa8c5c16f92b1b3e8f8e2e2fdf0f8ddb
 EBUILD Net-DNS-1.130.0.ebuild 1720 BLAKE2B 3b332978e5e1f2600864a42785c5afe671457283a00577301a981b4d29120ea301552d50da0238efadb0220e1db23dbff367139b04a81691e3537ac03f15e3f6 SHA512 f3a309a3752e93bf9c98b107ddde669481d4e98e1d781efc6f963b390deddec894d6bfbb2e9734b89fa63075386177c0c2ec76c2eabb759a5ca3d3f47f7bb4e6
-EBUILD Net-DNS-1.230.0.ebuild 1654 BLAKE2B 15095a788e21a32d2fdb0a3d0376d0c3795db9ffa4d1207b9823dfc79351ed05e008cbce793544b82489a10a7752f72ac64233e2c96eae2b3f80f8c61760b514 SHA512 64da602b69f01bae52ae5554a494f8000ffeb2afaeda9a2dd96594bac1b878607fed4ea1902727c9b7befdf2e3d7c628ca96df4279f511adb6c23ce828b94540
+EBUILD Net-DNS-1.230.0.ebuild 1651 BLAKE2B 554f758a1483dfaa65e826c934a3a18ea30cf230eb1c34f0e1674a4e2643c7a350ffbbe5d013cca2fde4c54bb38f632d7db12c92b517dbd4d87302d7268cc027 SHA512 920c016da6d924d30e84f9ea1d59ee255c15ec55387297c9ff1ffcf18770a9d9aec93782d324bdec771a47c298deacff37aa4e824b7749cc5c13d6bfeba889f0
 EBUILD Net-DNS-1.310.0.ebuild 1764 BLAKE2B 687d1ba7ae3248d054efee08b293b4d452c537057b41fef5e212c79edd10a52141ba31eb83164c7c94f48dc22987025fd660a8e1d83bee3191e0bed009fcd1da SHA512 1413eaadfba0d66a3e8fe7d466b51f712809cf9d7d8df7cceecaa7ecb9fb0ca7172d50560398cca2316707b7033aa047d4f2098ae520cb7a00d70c80932344ef
 MISC metadata.xml 6047 BLAKE2B 84bf9581ba0861246ac5b879897686a27ea1203dfca0eef52d05bd2c2ad528263220a14850d9e7c1343738fada5783d371a21944092d762b3a421eb0d8ed5c31 SHA512 0c1dc9d990d691135ef183cfb51158d6d26b2d40b908ca7f0f8596813276fa5dc1352eb2fa8c83bbea4a62219dc071f83045c7f504c5f99e3ea807848d64b5d4
diff --git a/dev-perl/Net-DNS/Net-DNS-1.230.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.230.0.ebuild
index 1911c794c539..ff6374415e6c 100644
--- a/dev-perl/Net-DNS/Net-DNS-1.230.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-1.230.0.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs perl-module
 DESCRIPTION="Perl Interface to the Domain Name System"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-HTTP/Manifest b/dev-perl/Net-HTTP/Manifest
index 5d8dee1d1b51..7dcc14e2217b 100644
--- a/dev-perl/Net-HTTP/Manifest
+++ b/dev-perl/Net-HTTP/Manifest
@@ -1,5 +1,5 @@
 DIST Net-HTTP-6.17.tar.gz 37943 BLAKE2B 7b32a1bd12803fa5ccabed0e312f97eed9b932f448d2675a01cfa81de2d2d116c41dab1c1a5884a68621cde76bde1c006e6a88c40e88d09b7e60703c6658f14c SHA512 ce4453896fea1194342ed5279173fe3289ae7a2f489145930bd74eb680a347d974675b65d387aa7735d2c5404d7c5a34049b10a1ba87f36df0ad6e3d45d4f2f8
 DIST Net-HTTP-6.21.tar.gz 38914 BLAKE2B 7d0351912f279a60acf30c5867ba54023e29b7208fa3605bd493271f9b59b3c8ca4e26c093b80b24a8f9a98e57bef54304b70c98896d270f9580a7e88794db1d SHA512 ca50e54a893e38456dc107c216c6b119cce9c30b2d1ca47607e0fed426a79d2ed660818a5d5a6ef240cae28844c2d7ca613ce81f53e890e7f15b22e4d0e2887b
 EBUILD Net-HTTP-6.170.0.ebuild 818 BLAKE2B b1894fd753f7c65d10616ff34d4bd30c30e891cb5fdfea569de07fe3b6f70291d9ce468d6972629134cc956aa619eea0bf5246f81843583f3cf708450450165a SHA512 77c0bc18c35a8c71c494e101c4e507e81178c484b81af28cf46c5bc38db804537214d2c5c2b927837dd9c7945ff19144ea14338bedd6ab168811b6084dff4307
-EBUILD Net-HTTP-6.210.0.ebuild 827 BLAKE2B b65c4382482760d6dd0a72f45ba1c2566869093945d35311956704df76ad660d73c3de07bbc4ad3ac66b16712deefb9752a275ec38a244a7b88af41eb7db607e SHA512 312c9408527ae71696abd069bfbb1f02c02d8d1162371a665bc19ab7dbc8b7f105b1c05f30829b46521d0805f5036b7863b48050f3cd3248e4442ca2722cf5b9
+EBUILD Net-HTTP-6.210.0.ebuild 819 BLAKE2B 7c65e72a61024d2eff867798f910e24c9ff1322d5042452963abec48df5fd7497a73fbb0d866b11c597bc4c9d7dbe9abeeff82e7320b761bc8369189d5e36782 SHA512 2c98ad862a7241e9d6d6d1e9fee42c18834b79403eb730284eec6e9db3d82320bb33449ffcc62a1118cfdc7e56e565f4e386ae4f8ccd78f689a107bbe3013d8c
 MISC metadata.xml 552 BLAKE2B cceb9dac240083ce84261040992af424efbb107431e3c705afe9b8a328cf6fb69c1fa20dec1233fe71e7b2d1103161831293f780c2d1b2c7ff0a56352d1e3f89 SHA512 961ea4e69d6fee34cb1e0086fb4fd451ecb36192a1ab48373350f77e6f7e84e79f20dd7d8fb51429a7e678287f494472358d8e6ad5f8839ce2f159d7bdbb2be0
diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.210.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.210.0.ebuild
index e21a8e314cfe..f46efff7794a 100644
--- a/dev-perl/Net-HTTP/Net-HTTP-6.210.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Low-level HTTP connection (client)"
 
 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-solaris"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-IDN-Encode/Manifest b/dev-perl/Net-IDN-Encode/Manifest
index 83ec4b17c6ce..5eb64a3944b0 100644
--- a/dev-perl/Net-IDN-Encode/Manifest
+++ b/dev-perl/Net-IDN-Encode/Manifest
@@ -1,5 +1,3 @@
-DIST Net-IDN-Encode-2.400.tar.gz 432177 BLAKE2B 1377340423c72775414fd27d2c140d3eaf231d782f44570998add049f18a7904b0f24514bd1d79b88d0c828fbdc7974e702e33af3a05a5d1c22c00193e5890d1 SHA512 ea58d8825a9552851a0cac898744cdeb0e99e48f76809b58e7586d6992919339cc670506584df2d81c4e98cf7e6cfd1e96330e00f0e216f33033a743cb872d94
 DIST Net-IDN-Encode-2.500.tar.gz 648108 BLAKE2B 04ad7d093d4e296d12e7f1c6effe3d39bd96e4b748e28bbf54f73832470dfa1fc49e1c6bec089196f9543e7e129c8d02870ce01695503d473258d3e0a934506b SHA512 3537309ea391e4f762eb8ce43929bfa024d63ee59c94f8d2ea16179aa6ad66ecef29188551749593302f14dc5b3182dbce18ebaf5176a34b40d6fa5b7e5763fb
-EBUILD Net-IDN-Encode-2.400.0.ebuild 704 BLAKE2B 9c0aa029ad316bf42aafc4f1c114c6c2b1f58f34628d058618a6d3f50770421dd337e6fdca49929a1ff13a3cdc1a4e43e8cf81748b7287c5257542d18d37ee35 SHA512 da22e86e4f8beb8443f0f4f35619c9bf2e085ed91e9af836b3ec4ae5cca1b8416e6b492b99596f63a81b29a4d526678ac0747de89a46ce23338c1852ed86a1df
-EBUILD Net-IDN-Encode-2.500.0.ebuild 711 BLAKE2B 0dd28fafdb313e81e1d3f97a69e0adb982a53efa293cb8a537f4fcce9c4d11405c9d3788ad4433aee2dff589fd66f0b1440c406ca24c157190a4b408cdc4c698 SHA512 64c1fc3eaa4db87126200714ddf5031954258ebf190c78f287a6e55178d5e33b6f5dde0b3ebf4f25c5f8a7e718c17de73af4188cb54a217ecee6c766b8b5bc02
+EBUILD Net-IDN-Encode-2.500.0-r1.ebuild 673 BLAKE2B fb24086384d23a726b3084d9c502e6b0cb3d99c823a1de62407489ec8f867994dc1e4f649945f649bdc1f0b077f89e5561d9dfcae4ae9706960feb0d20942dd7 SHA512 dc7caeda77fac27b241d756f03d35c1bd5c308bcde30bc66f8cc4e4549eb978f2527438296966419aea8a2552b78de8905046aef02dd85d62585051edbb1d09e
 MISC metadata.xml 597 BLAKE2B 36725313df1fd525773e0b5df39fcfc8674c5d05e4d859c9a11cfae9adbd49c0a3e8a1f670134dda1932c72ce7a9d520f7429f4a24f8e290b851385372902d88 SHA512 d709bc4a5f6c71d2840c8e4c5d765f8d54e6ee1ad635612d1a0074ca8132afb618391f856a709423ccc47ee31608311feb48674dbe7c76a4ea01ceaf4dd15f65
diff --git a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild
deleted file mode 100644
index 0a6e8a036abc..000000000000
--- a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CFAERBER
-DIST_VERSION=2.400
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="Internationalizing Domain Names in Applications (IDNA)"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Unicode-Normalize
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-CBuilder
-	>=dev-perl/Module-Build-0.420.0
-	test? (
-		virtual/perl-Test-Simple
-		dev-perl/Test-NoWarnings
-	)
-"
diff --git a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0-r1.ebuild b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0-r1.ebuild
new file mode 100644
index 000000000000..36000975886b
--- /dev/null
+++ b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CFAERBER
+DIST_VERSION=2.500
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Internationalizing Domain Names in Applications (IDNA)"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-Unicode-Normalize
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder
+	>=dev-perl/Module-Build-0.420.0
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/Test-NoWarnings
+	)
+"
diff --git a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild
deleted file mode 100644
index aa0fdc7fb3a4..000000000000
--- a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CFAERBER
-DIST_VERSION=2.500
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="Internationalizing Domain Names in Applications (IDNA)"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Unicode-Normalize
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-CBuilder
-	>=dev-perl/Module-Build-0.420.0
-	test? (
-		virtual/perl-Test-Simple
-		dev-perl/Test-NoWarnings
-	)
-"
diff --git a/dev-perl/Net-IMAP-Simple-SSL/Manifest b/dev-perl/Net-IMAP-Simple-SSL/Manifest
index e3c4708ee648..53543483aaab 100644
--- a/dev-perl/Net-IMAP-Simple-SSL/Manifest
+++ b/dev-perl/Net-IMAP-Simple-SSL/Manifest
@@ -1,3 +1,3 @@
 DIST Net-IMAP-Simple-SSL-1.3.tar.gz 1726 BLAKE2B 053c82aedb9c2e2a9c0d54239752c08a87872f66437ade98cb5f959a101b7e52d5aa9aa3a5a5f8b356f2940eeb6b3afb0ee9208c5c18ca2ad2bb4cbda2b8cdce SHA512 cbf8867ba159aa7a0331109dd97f4465ddc416cd47e5232cc553be1019624fa33b0b656bc9e48c73d8f221e6215c8e2e1955c3d51f8050de90d84c92bfb204a2
-EBUILD Net-IMAP-Simple-SSL-1.300.0-r1.ebuild 360 BLAKE2B cff812d06844096632e37e143009d4fc955b368e1dd5f4282f36ff72e819e6cbde1ebfe4dea3bd21c1d90448aa0e60a8896befd92c0e39ae7641f01e3250852a SHA512 d89169418b8e460603211852e5ce28a5f795ba4bd7252d6679af598c4226ee2ac645ad06975bbc512b1f1eda80742d6ac925d6831bfb72b5046b89cd9485bfe1
+EBUILD Net-IMAP-Simple-SSL-1.300.0-r2.ebuild 332 BLAKE2B fdc6c2fbd420e01dbd4eb6a12715660c19b16b94761971ed1a1e14884927a30ffe1ad938acc65dff1a4785bbd5363cf8051b20b59ba01d03bbadb025734fde92 SHA512 ae39924bfd16d2a630d8f76935e9079c4b2c74c17845c9ed0a9721f7a269a81948e9a95f7f1dbe4846c9660dbf8f1354d53ecc10291c586388470ef1ad2ffc8c
 MISC metadata.xml 412 BLAKE2B 42a3745f7bc915a2b3f1910cf9abe4edfebdc183ee4b4fdcd9ee5eff03816c86aca88b4930fa3b9a365ae5c9dea2b1565deac59208f65ec1265b2533fdda1731 SHA512 6a3f2a6b44b8044a241d07ff8cfc950f12fefedd1f9d91da5b1ffd99b488592bf16404354e5a5a421e34b1b4a390a08af40d7bd7f89f5ecc1329403ef68058be
diff --git a/dev-perl/Net-IMAP-Simple-SSL/Net-IMAP-Simple-SSL-1.300.0-r1.ebuild b/dev-perl/Net-IMAP-Simple-SSL/Net-IMAP-Simple-SSL-1.300.0-r1.ebuild
deleted file mode 100644
index 2bb3560901fd..000000000000
--- a/dev-perl/Net-IMAP-Simple-SSL/Net-IMAP-Simple-SSL-1.300.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CWEST
-MODULE_VERSION=1.3
-inherit perl-module
-
-DESCRIPTION="SSL support for Net::IMAP::Simple"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/IO-Socket-SSL
-	dev-perl/Net-IMAP-Simple"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Net-IMAP-Simple-SSL/Net-IMAP-Simple-SSL-1.300.0-r2.ebuild b/dev-perl/Net-IMAP-Simple-SSL/Net-IMAP-Simple-SSL-1.300.0-r2.ebuild
new file mode 100644
index 000000000000..4d95a6ab8d71
--- /dev/null
+++ b/dev-perl/Net-IMAP-Simple-SSL/Net-IMAP-Simple-SSL-1.300.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CWEST
+DIST_VERSION=1.3
+inherit perl-module
+
+DESCRIPTION="SSL support for Net::IMAP::Simple"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-perl/IO-Socket-SSL
+	dev-perl/Net-IMAP-Simple"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/Net-IMAP-Simple/Manifest b/dev-perl/Net-IMAP-Simple/Manifest
index c6bc0f97d0f3..b0c1e71c614b 100644
--- a/dev-perl/Net-IMAP-Simple/Manifest
+++ b/dev-perl/Net-IMAP-Simple/Manifest
@@ -1,3 +1,5 @@
 DIST Net-IMAP-Simple-1.2209.tar.gz 45728 BLAKE2B ccd3648086d63e6865d83bd6c37e3f61ba536ea2be7771e3a674a0459a7455b21f50ad48a4ec7870a7cf88874e920bfb95a9200dae3ea6066b75fd91f061f508 SHA512 21da11eaa069fa6a9f63696fda8447001f345fb1562d8db74658e95be2dfbded323d7e1eaa2bf2d8909f38f27779a9048d820091600ee5f4b4af9bcf951cced1
+DIST Net-IMAP-Simple-1.2212.tar.gz 45917 BLAKE2B e5f7fabbc6cd36af0a07a0c0d76ad5f65c888b23748abea54ad49cf032fa860c02a18a58c65b1bbd9c60133d60550b058a5822005789727b0084261daed040a8 SHA512 0c34388e9358864f74aacdd7bb046590a4d821f025ccfdc2490db4dfe017fb5ee3dea1cae96a408ed6518cc7e3bae20fe92296b9822d62c9ab2b20f26f873e74
 EBUILD Net-IMAP-Simple-1.220.900.ebuild 709 BLAKE2B c5ceec1d9ad60d49aa707196260a272fc92bc9a73ffb5bd0b9c68da867e6a56ada3959e33848cc2ca4b80d9201182298c3acd81832f3f926ce6ce65be98710e6 SHA512 e528a0404d9a4331110ddb169c04f75c59f9962fc96254853225b1856007e8cfe1e1c580e4b79ea83205469c7df81dc56591e75210c823ed8aa0cb61abb34965
+EBUILD Net-IMAP-Simple-1.221.200.ebuild 511 BLAKE2B 39ce3fe32c3485e0550c415e244043aa1234c8a963bc0e8eca36d9bf9ffed4059a5134e7fccd00da1a7644cda8da96e0e1145a7c70acaadc76cd2193e9f070f3 SHA512 6f4762c5f2764b7a550acc650449c3504ef4b9720125b4611057e1799b46d46031df26d5a30a88f2584e71131e6e9e7e152ea7c3001a94d4d774fa64ed011960
 MISC metadata.xml 763 BLAKE2B 410e702cacd8d5501a1cdf81d73269862f697f10323f075e375be58fe7a2929d27d0dfdd6f98555302860a36b9b18ed147f0a96d23ea39afe93c0f260ac4a49a SHA512 4876d139e2b3a3395d963cc8a79982cfffbe3ceeffc8955d64d1c429746ae032293ff3e31655f38340615da2e0f66ef9fb6b5ad7dbfddbc66eb6cdc8b64e731d
diff --git a/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
new file mode 100644
index 000000000000..c09920f62912
--- /dev/null
+++ b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JETTERO
+DIST_VERSION=1.2212
+DIST_EXAMPLES=( "contrib/*" )
+DIST_WIKI="tests"
+inherit perl-module
+
+DESCRIPTION="Perl extension for simple IMAP account handling"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-IO
+	dev-perl/Parse-RecDescent
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+src_test() {
+	perl_rm_files t/{critic,pod{,_coverage}}.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Net-IP-Minimal/Manifest b/dev-perl/Net-IP-Minimal/Manifest
index 46e8e77510b7..e1a5e54ce719 100644
--- a/dev-perl/Net-IP-Minimal/Manifest
+++ b/dev-perl/Net-IP-Minimal/Manifest
@@ -1,3 +1,3 @@
 DIST Net-IP-Minimal-0.06.tar.gz 11486 BLAKE2B 13c081952f2116ac29b62589a818bb4aef42bd995195ca5589eaab9109a5dd096a5e301fb0fc84235cb15fff7fac2cea5fd088e79fd909dd3c814e4373936c5f SHA512 4251313f08af5c2890dfff54526ee88bad89e34caedbf924e75ef9ad823756b9e7c6c9d4d1fac982d30a6cd1b23e13c0b01d65ffefc9d4a944ff4bcc528d0b74
-EBUILD Net-IP-Minimal-0.60.0.ebuild 351 BLAKE2B 0addea7866395c681b4c85dbfc18983fad989276357874b4430f46dfdf53ddbcb95e77f787857b72a63ac7e5937b91f292371e7ae42cfefbb5ba5937b99aff80 SHA512 1bc37b90d01c3b68241313afbecefbdb7d5f6c5808fc6250979e78e3f1c99bb825882d8240454b87654442f0c61973430337740ecdac27d31832dd20da82909b
+EBUILD Net-IP-Minimal-0.60.0-r1.ebuild 322 BLAKE2B 52aa823fd98ad380c87b029c5079a41afac77b361d8b0ba0cd96111fca7a6809ed739554cfa1cc8365fb49df9f8bca73cc9acdc1427808d4caa6daa8cb43abb4 SHA512 c0f1eb1f99760f8070639b63745ad73b6c91e503656de98aad356ae5829153526b179bc5eb3922eeca66e8a1c71abbd7dffd9cb53486fe5cbe0dcd0d8a7c78a3
 MISC metadata.xml 389 BLAKE2B a7cc726827d2c3db4a6454bb64f8f4732243c819232c6a6c5f4fbc34984d9c1fb443b9194036a40eaf8a016b64660c29d1be285978126d082303205f6d562b9d SHA512 d3097821ef375f996f594428a7013dd2da5c73d59b023fdc5c63295087ac39c7e2cee362a33b0f7d9302f7c587677967833416b2c11c591a9701b1fa9feaa412
diff --git a/dev-perl/Net-IP-Minimal/Net-IP-Minimal-0.60.0-r1.ebuild b/dev-perl/Net-IP-Minimal/Net-IP-Minimal-0.60.0-r1.ebuild
new file mode 100644
index 000000000000..1da3a49df9b3
--- /dev/null
+++ b/dev-perl/Net-IP-Minimal/Net-IP-Minimal-0.60.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION='Minimal functions from Net::IP'
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+"
diff --git a/dev-perl/Net-IP-Minimal/Net-IP-Minimal-0.60.0.ebuild b/dev-perl/Net-IP-Minimal/Net-IP-Minimal-0.60.0.ebuild
deleted file mode 100644
index 79555d227bba..000000000000
--- a/dev-perl/Net-IP-Minimal/Net-IP-Minimal-0.60.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MODULE_AUTHOR=BINGOS
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION='Minimal functions from Net::IP'
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Net-IP/Manifest b/dev-perl/Net-IP/Manifest
index f05c5c313adc..e5aba579a67d 100644
--- a/dev-perl/Net-IP/Manifest
+++ b/dev-perl/Net-IP/Manifest
@@ -1,4 +1,4 @@
 AUX initip-0.patch 395 BLAKE2B fda4b973f8a8667ba0158835d52fe2c83a7b26f15fd085ee1e1ebbf187b79e48acfc44ca0e6759ab0b9dc64a930cd0c88cf54c4dce9ac5e1c8824222e4987043 SHA512 3133c2f47e1d6f2a94ff8d7e00c23501f438164925302fb598711d71768980461bdb2827cadb6db28fa0f6c24c35746d176dff0a7673e7ace8b591ecbcfd3f2b
 DIST Net-IP-1.26.tar.gz 30866 BLAKE2B 202d581145c798cbb129c51f84b206f11506ef131b44c186ced06dc3afe95030cdc4b814ce5ff27c675faa1d711bda5950e94d230cdaad9e46cd29a0a350e444 SHA512 c561f32b6ca5dc082e2bc6c47000a2ca0f5ee7abb47105f5b1bf98cb76723287416de0a767ea63c18f87964df7f3982c7258fe1208afa22cff0378ae3509d9eb
-EBUILD Net-IP-1.260.0-r1.ebuild 446 BLAKE2B 329124a4b4f2e4b6e93adbf578458339b9060361b759592602a32006b0b214297034ee95d57a9ff925e02738d507fa5b21fbf416ae5a7f748bdefd6e1f2e8173 SHA512 a00d4dd9ed8103e979d37540a1387aa976781c80ba5bfd238beb2ab1e2bec48eca03d664703628f02d80542d785784de0ab6cb6e3d3a06265e923227eca2f1fb
+EBUILD Net-IP-1.260.0-r2.ebuild 420 BLAKE2B 9a996aa0274e89fbcff4e4dcfedb7e6471cb7fa2eb7a981fb29ec9e70c5ad720febc2e81a5ce7e64e9c496891c9032f84dec705e581e5e288f9743f1f1a757f0 SHA512 42632721c948ef0c8066da141510cfc02a7983610bea6e95940e937463abd208440ffe1ed6edb1e1f428a3cacb8540b2af4bce2b2a4a17a74c56911c1550737d
 MISC metadata.xml 384 BLAKE2B 2326d01c0cfe6e2f8985c343a7b89fd3f96cd2dd083ab6dd88f05c8698b9f73b55aceec0936f03664348e7af7957a93d85f0344391c2c4c8f3511f698167b34c SHA512 b11de0b22595ff1b61cda3f6c1f067564fa584cb2a80a88d344c47fd1bf00131615483695eadb2a6e045e42973a0e1e42294183e85964e9ebd17786a667bf962
diff --git a/dev-perl/Net-IP/Net-IP-1.260.0-r1.ebuild b/dev-perl/Net-IP/Net-IP-1.260.0-r1.ebuild
deleted file mode 100644
index 959086c86639..000000000000
--- a/dev-perl/Net-IP/Net-IP-1.260.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MANU
-MODULE_VERSION=1.26
-inherit perl-module
-
-DESCRIPTION="Perl extension for manipulating IPv4/IPv6 addresses"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/initip-0.patch" )
-SRC_TEST="do"
diff --git a/dev-perl/Net-IP/Net-IP-1.260.0-r2.ebuild b/dev-perl/Net-IP/Net-IP-1.260.0-r2.ebuild
new file mode 100644
index 000000000000..ca788a6c042c
--- /dev/null
+++ b/dev-perl/Net-IP/Net-IP-1.260.0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MANU
+DIST_VERSION=1.26
+inherit perl-module
+
+DESCRIPTION="Perl extension for manipulating IPv4/IPv6 addresses"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+PATCHES=( "${FILESDIR}/initip-0.patch" )
diff --git a/dev-perl/Net-IPv4Addr/Manifest b/dev-perl/Net-IPv4Addr/Manifest
index 2ad63835db97..418f554a1464 100644
--- a/dev-perl/Net-IPv4Addr/Manifest
+++ b/dev-perl/Net-IPv4Addr/Manifest
@@ -1,3 +1,3 @@
 DIST Net-IPv4Addr-0.10.tar.gz 8429 BLAKE2B 2a424c042c6585b14ae23abc4ee829a8c34a461ec6b5b44d48d78230fc49a340e409e05927bc473f9534d0baec2cc0238abe17af069c2500eb885ecb8a31c419 SHA512 66381f9be27c010721970d1af245885379bcc0b57c4c1179fc00e89a53a2d53e7836789b13d4c5f0079fac63d7987e12ee71f3168517ea5e1064d5fe1f7455af
-EBUILD Net-IPv4Addr-0.100.0.ebuild 307 BLAKE2B 4069cc9a7d7b2e707761a1b171706c799b08e2cc085deac8d6e4e55b1dc1a9d14a751fcf78d728d02d69f3202c960a385a8371bf6067461e9de0b477d3ff8a5e SHA512 06fc1d4614543ff2d10933c47258f3ac086b50e9c84d7333d84ae03d0af152a084ce04f2de6c6797aeddd5cb6a1f34196c35b1e21f20efae9697c8ffbb1a237e
+EBUILD Net-IPv4Addr-0.100.0-r1.ebuild 287 BLAKE2B a8145ae96d350936a41a174f5cba91d7aa51c8e176ccc92b95042029a5b6ac4e3e3244639c16640989fbef88bb81452a330f2690b8732f1d46af8ff06b02336b SHA512 1e691840cf9990efa7b19458cd6625874381e7f2ee390c2f2ad76bbbd43544bdd4f0a7264f7acd4f08b433c82069314de5c57dd2494e5f6b2772bb6d6bf58e6e
 MISC metadata.xml 475 BLAKE2B 466f49ec3cc178aafd4a5bbc6fd1ea6315c09ba9155b2b4a8d713962c1025dfdae3cc904a4ccbb5c51e23f4cfb06a92f0f483e9fecc5e31c58410daa699c84fa SHA512 0798233cad5538d1d895fb5a0f6d92c930e6471feedcbb2d3229cd339391ec36a7e0adc619c556f683cdc020c6da94df315e289e74e09845b5ec88b034e85767
diff --git a/dev-perl/Net-IPv4Addr/Net-IPv4Addr-0.100.0-r1.ebuild b/dev-perl/Net-IPv4Addr/Net-IPv4Addr-0.100.0-r1.ebuild
new file mode 100644
index 000000000000..8ea4124c81ab
--- /dev/null
+++ b/dev-perl/Net-IPv4Addr/Net-IPv4Addr-0.100.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=FRAJULAC
+DIST_VERSION=0.10
+inherit perl-module
+
+DESCRIPTION="Perl extension for manipulating IPv4 addresses"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-perl/Net-IPv4Addr/Net-IPv4Addr-0.100.0.ebuild b/dev-perl/Net-IPv4Addr/Net-IPv4Addr-0.100.0.ebuild
deleted file mode 100644
index 0c93a4754d13..000000000000
--- a/dev-perl/Net-IPv4Addr/Net-IPv4Addr-0.100.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=FRAJULAC
-MODULE_VERSION=0.10
-inherit perl-module
-
-DESCRIPTION="Perl extension for manipulating IPv4 addresses"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND=""
-
-SRC_TEST=do
diff --git a/dev-perl/Net-IRC/Manifest b/dev-perl/Net-IRC/Manifest
index 854c82286112..32fe9e005871 100644
--- a/dev-perl/Net-IRC/Manifest
+++ b/dev-perl/Net-IRC/Manifest
@@ -1,3 +1,3 @@
 DIST Net-IRC-0.79.tar.gz 50043 BLAKE2B 97d76b92f96b757836418ef0cb5914a45fd922f78a8f42b430c77c20798c7d25226195ebc55f1473b2279ef2dbbd6fd50d8499d879d60638d6c582921d461d17 SHA512 daf51ec64aa4e630a4e3d6da48a24cc01737fe702269633d4b392662aacd45d3ed00adfe1fbd32905575f9905dee362d68ff030c7918fa17acb9a508474177f5
-EBUILD Net-IRC-0.790.0-r1.ebuild 557 BLAKE2B d9d5d246bfd58674971013dd5f8ff130792dd9e57f71e6c27e091ae62fc4c5e7437ec23c687511b7bf7fe5388a9baca5e9a65694855375fd95953c66023ecbf8 SHA512 854e88b0a241a72fcdeb5e86e2961020568b70858013c2cd7ada524f7a5d7d6c71ae60baf12c2537e72ac4b9a223581dd17b3e3199d0a61beed4b231d48538d9
+EBUILD Net-IRC-0.790.0-r2.ebuild 528 BLAKE2B dadf1f97714e8126044a103c0c229ec8bd47b1b025b3715cf865430fc45cca0f9969e6104d95d7ffd84d320ee7f0e38e97b30eb399540cf3357a9c2a78fdd37c SHA512 53c758d27ec51e373d7d83d69370c4c49a78d6f8f869d928395cae72e0e1d63fbbfc365f42947899f339fc4c61f20bb3ac235794a42f1517858b9962cd5f98dd
 MISC metadata.xml 1053 BLAKE2B 24bd1fd775a4c66a478106586da7a895dd14dd9b841a27bd3b3c933da576fcd058fb14986aa09d46f90d323b9c555df0687475d4f97913bedc3b2e05ce129fc7 SHA512 81379370c322a0a2ca0b8117b3c448ff1e70b1def1b08802403321e0888ec93cfb5323d1f61c674a9a83562823f3c28a27cd9f7ba8a6119c00186c8bd07a4d6a
diff --git a/dev-perl/Net-IRC/Net-IRC-0.790.0-r1.ebuild b/dev-perl/Net-IRC/Net-IRC-0.790.0-r1.ebuild
deleted file mode 100644
index 19d2d739c1d7..000000000000
--- a/dev-perl/Net-IRC/Net-IRC-0.790.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR="APEIRON"
-MODULE_VERSION=0.79
-inherit perl-module
-
-DESCRIPTION="Perl IRC module"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86"
-IUSE=""
-
-SRC_TEST="do"
-
-mydoc="TODO"
-
-src_prepare() {
-	# Remove the stdin and warning input required re deprecated.
-	sed -i \
-		-e '/or die $warning/d' \
-		-e '/my $acceptance/,/$acceptance eq $ok/d' \
-		"${S}"/Makefile.PL || die "sed failed"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Net-IRC/Net-IRC-0.790.0-r2.ebuild b/dev-perl/Net-IRC/Net-IRC-0.790.0-r2.ebuild
new file mode 100644
index 000000000000..a9704cf07f6d
--- /dev/null
+++ b/dev-perl/Net-IRC/Net-IRC-0.790.0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=APEIRON
+DIST_VERSION=0.79
+inherit perl-module
+
+DESCRIPTION="Perl IRC module"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86"
+
+mydoc="TODO"
+
+src_prepare() {
+	# Remove the stdin and warning input required re deprecated.
+	sed -i \
+		-e '/or die $warning/d' \
+		-e '/my $acceptance/,/$acceptance eq $ok/d' \
+		"${S}"/Makefile.PL || die "sed failed"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Net-IRR/Manifest b/dev-perl/Net-IRR/Manifest
index a7e994da726a..a5b211b2c1cf 100644
--- a/dev-perl/Net-IRR/Manifest
+++ b/dev-perl/Net-IRR/Manifest
@@ -1,3 +1,3 @@
 DIST Net-IRR-0.08.tar.gz 5622 BLAKE2B 9cc3b6b5c43d9af7f8006528ab813d66629d9904ee78d05d73756cbb69a6d4b044e48f96460efd03738fee80e4f31454138868340d0d2a24d511b380a3687220 SHA512 1713451dd65b44c6e87bd8cc29228c898c3790be9d0b7d8adbebbf69b91c1557eb6fef47262fc40bc543f258087ceb87903fc7faf2a3d5059b8735c686fb5823
-EBUILD Net-IRR-0.80.0-r1.ebuild 417 BLAKE2B 8128983e9041bdaa34b4ef68bb17e6166263726b35811469fd1e60e6e254f0ab903f7f2ee884f9f02d2da2a225dd677507d5cf09f19f6000135ed947ee82a1e5 SHA512 b90adb237e4e1800e8324fe464a32470c681a260bb8865be30f50a99fbca3d2b9b7bdbe5660501940888267b7821269bd1a53cc01ca10c5e24cadf848d882c8a
+EBUILD Net-IRR-0.80.0-r2.ebuild 414 BLAKE2B 9539d4ed3b0e856d93e2f770011c1b15bc984ce4414633e0c1ea91326915981ff18cce03a898495ff11b70d591e3f7c7a8e7eaa2f8c72ed32c7255da6cf5f026 SHA512 0c5ff8676a7fab952422cb00e40e02591a73eef5b585358ccfcc3b1a77f6d9f9f94e416e635fb3a6fac3c81c0e043458000dde3568aff5ba1ace799b4e81d74d
 MISC metadata.xml 498 BLAKE2B 12ba2496cfb1a8933bc24bd5db39dc949670ecd468f96039cd00ec8557d71418c403c0bfe123996eab64b0f84b2f4798d5ff15953b5ddac38daa0504e2e4fd18 SHA512 ea3903e427b1ad12f7cd7eb2d50754923ed8ab3e4558a961e28dd6d7e736ee438cab4478cae4ea6b8db2dad82ace8eb48831df55a6df3c196fea2f1daafd3e96
diff --git a/dev-perl/Net-IRR/Net-IRR-0.80.0-r1.ebuild b/dev-perl/Net-IRR/Net-IRR-0.80.0-r1.ebuild
deleted file mode 100644
index 8dc760995815..000000000000
--- a/dev-perl/Net-IRR/Net-IRR-0.80.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR="TCAINE"
-DIST_VERSION="0.08"
-inherit perl-module
-
-DESCRIPTION="Internet Route Registry daemon (IRRd) client"
-
-RDEPEND="virtual/perl-IO"
-DEPEND="virtual/perl-ExtUtils-MakeMaker
-	${RDEPEND}"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_test() {
-	einfo "Tests deactivated; need network connectivity"
-}
diff --git a/dev-perl/Net-IRR/Net-IRR-0.80.0-r2.ebuild b/dev-perl/Net-IRR/Net-IRR-0.80.0-r2.ebuild
new file mode 100644
index 000000000000..4cdd057d0871
--- /dev/null
+++ b/dev-perl/Net-IRR/Net-IRR-0.80.0-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TCAINE
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="Internet Route Registry daemon (IRRd) client"
+
+RDEPEND="virtual/perl-IO"
+BDEPEND="virtual/perl-ExtUtils-MakeMaker
+	${RDEPEND}"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_test() {
+	einfo "Tests deactivated; need network connectivity"
+}
diff --git a/dev-perl/Net-Ident/Manifest b/dev-perl/Net-Ident/Manifest
index f1e3eeaf89f2..d3acbeb3c232 100644
--- a/dev-perl/Net-Ident/Manifest
+++ b/dev-perl/Net-Ident/Manifest
@@ -1,3 +1,5 @@
 DIST Net-Ident-1.24.tar.gz 26691 BLAKE2B f3133efbd32d568d333351111e36eb0d1cf2be88d5babc78465152a82e77f3e56d47a0f7e945719ea64233086a85add1c9c8645292d959e63cd5a3f2a186fbf4 SHA512 877a2699964323b009dbdbab134bb329acf71758e48165f4d19bb8e49d0c02786f58ab32bb1bc2ff6c4d375d4b64128207cbbf3c858a6db2e30bd2733474d740
+DIST Net-Ident-1.25.tar.gz 31423 BLAKE2B 99f4106a7bd8c47ac05dd0fdd1e6f1c627695db72391542ca61bd34d3f74014db1527b68f43dc76122c7582f47c1f5fd285293d1790d7099e22a66a95d8ab8ce SHA512 bc9e41d653380215e85908b87cac8858b4d50487f4c9e539de66a1c4d788a78250d3223d1edbf2c7dc475186db087dcf65d382c0ddb08a792c2f5f808f71dea5
 EBUILD Net-Ident-1.240.0-r1.ebuild 565 BLAKE2B 5b18eed211c78b3886fee93ac31952a7bfeb303282d436bad90e4591f2cdcb043a9a1ac6b87aa90014cac2ce03fe091e2570965f98b12480942b6fc1ec57fd76 SHA512 240bfa2196e958911ac7e3862b2475b8836c0ee05548a94b6fa970b861fc128f994bfce36ada1bb07be91f327ccefd478fce2c95f2832d137cb245cf77a735ab
+EBUILD Net-Ident-1.250.0.ebuild 532 BLAKE2B ad39d496993819061c9f418c75b4f109cdf65f7d05b791f259679a880fabbc2d368bfd2c92d854f7edb79980ec7b2a8bd3fd743348238485af06c4081193e301 SHA512 81f5b40de8c482eb6ed3dad041f3aa4bdf4aeeed0f7beba607c05bebb02d6ad64aedb0c29810800dd53ff21deca30d8abbbbc3368bf96da290f2afb49d61dadb
 MISC metadata.xml 390 BLAKE2B 5f3c71d090e39e5df3de9680b722396ad15c50ce7e16374000255aba2a237e0488409741dae7d9c24265bfd45a0a513f9c9a76ab62bf9bd0d670917dc5b38c3e SHA512 8cf5e0f58fbc82f98d9dd82acc2925b36c13f79325a7b7f38eaa6b298d0ae19e4667198dbcd2a0fc94eb6af159fa0e434fa8dbe8ae27656b1297303186d56c14
diff --git a/dev-perl/Net-Ident/Net-Ident-1.250.0.ebuild b/dev-perl/Net-Ident/Net-Ident-1.250.0.ebuild
new file mode 100644
index 000000000000..54169ff11e69
--- /dev/null
+++ b/dev-perl/Net-Ident/Net-Ident-1.250.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TODDR
+DIST_VERSION=1.25
+inherit perl-module
+
+DESCRIPTION="lookup the username on the remote end of a TCP/IP connection"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	virtual/perl-Socket
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Net-Jabber/Manifest b/dev-perl/Net-Jabber/Manifest
index 186674f7f306..f8ed5fff7a62 100644
--- a/dev-perl/Net-Jabber/Manifest
+++ b/dev-perl/Net-Jabber/Manifest
@@ -1,6 +1,5 @@
 AUX Net-Jabber-2.0-hash.patch 680 BLAKE2B 869fabdc2d107a8a64d606d2ba4d712fa334bae08b0a32760263b4ee2be7427e51ee0204b6736b44461c56e2d39932656aa3c5ac2491bf957d1bdcb00690889c SHA512 55500cd592d028f3ae211ec441ebb246265bb25d1a34122afcd14bf5b5aee93aad1d07e5b7a787f4d2a717058d95bd41ad5add930c69e3aa9e4bcc7a3bbcf3ee
 AUX Net-Jabber-2.0-no-dot-inc.patch 18091 BLAKE2B c22754f61e5467d0a1464181d529cf3cb57f28e3f2ffff071b8b3a7b71087204e996dbde35087998f04130744b525463ec67bd436b62302e5c64893e9aabec51 SHA512 8c31a256e6c8d638f7f01d8490a2c3c5ea813d55aece342317b114ceaf0c3b5a27779002483005f3d37efe2c95ade2c59f7fb894d5991bf38cabd660efe290a1
 DIST Net-Jabber-2.0.tar.gz 112416 BLAKE2B c8cd86949a934650464ce8dc4e5eb5c12bdd0323caf18773a73df31f72ee6a185d963e43ade22c15d5f7da73f0c5a52ab2e67da478157d7829ab2aa83610fe47 SHA512 2ad275fdef8a7ed17dc464f692b974e71bc3a5df5239943cceaec9509e6454945023e220ddfb42763e18813124f6b7f2d6d43faf3059e0680b753486961a1b4c
-EBUILD Net-Jabber-2.0.0-r1.ebuild 480 BLAKE2B 3e4037b067f6e274b365a4f6ae581d61b66dd0873d634f115b0d0b49871c7c2b8eca85e6d280c4b7e1195370614d8ca5c685555331ef401854d658b6d2a42db3 SHA512 f06358b9f4ad55a42b2194b98f2923efecd72f7024d2fd8d41c268dbaa6da41cb8906f53d0fcc97fea8dbcb35319e62ca9f287c9d33cadba4773ee319512c099
-EBUILD Net-Jabber-2.0.0-r2.ebuild 507 BLAKE2B 75c39cba403f4cf138f62a9c3b52c2b3c2fefad623621794d91ff502df5935ab213c78881a4cdee8bcf52a5be40ccb4b315a8c34b91df603b9facdff92bf4c6a SHA512 a6b1aaed5d09a485828c1218c73fe51f3857fbb579d16b7c6e103a2597ca445b96a504080585a06596dc97eea1f6b2030a6531c104c1ba5765b3a0b38084aa15
+EBUILD Net-Jabber-2.0.0-r2.ebuild 502 BLAKE2B 334c4161b8e1edf66ad8bf4ec6185640d82b10df2b44331093d538e37275122f5b527c94ecbd5aee85c6173faedd7b5b52d721f7192d0c0a1d72b1f2c8cbed81 SHA512 3024fb4f4b952894c4963881e0b2eb474a9125777bda35938f24115dd036a6c7afd3c5d99d964f2cec41404409b7d72c994729f2d48f7e712a141a0ff1faa174
 MISC metadata.xml 1595 BLAKE2B 298932e0ffa8ac325be6fcea585343bd9855292e170e8483d8a1f53965807f21705e452dc64a524c302cecc8088149165e4e99dcd84cee2fa47a0c8ddc66e50f SHA512 9738ba4fca9b95a23888d6936b0837e08e91fae227209e1bf4b73331544ce8b17c5551bc382779a892cbb00df56bcf525a66d1921e99ac43abced1d846deca85
diff --git a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild
deleted file mode 100644
index ccb1434eb2ce..000000000000
--- a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=REATMON
-MODULE_VERSION=2.0
-inherit perl-module
-
-DESCRIPTION="Jabber Perl library"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-perl/XML-Stream
-	dev-perl/Net-XMPP
-	dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.0-no-dot-inc.patch" )
-
-SRC_TEST="do"
diff --git a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
index 196dd0b47c8c..487c56d1b317 100644
--- a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
+++ b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Jabber Perl library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Net-LDAP-Server/Manifest b/dev-perl/Net-LDAP-Server/Manifest
index e6301d2a3027..744492e89918 100644
--- a/dev-perl/Net-LDAP-Server/Manifest
+++ b/dev-perl/Net-LDAP-Server/Manifest
@@ -1,3 +1,3 @@
 DIST Net-LDAP-Server-0.43.tar.gz 6707 BLAKE2B f09c3297cfb0e11872350f217964ee6adb0487e3fb97dc38087b78c0faa5ffdc7881446ee0159c743478b69cc2040018d8a7f31098251dd20be44e2ec77773a0 SHA512 b615da489a78c5db0270376c18bfa1cf2593dc1395647daf46bb15b7a8e967b8cfc4888cc07ee9736798972e89b1719fab02c2c7bf2884b0fc9ffc350880aca7
-EBUILD Net-LDAP-Server-0.430.0-r1.ebuild 472 BLAKE2B 3b9de2b9e5ad7114dfc54c5cfc6da1d752fd0223bedd15ef8ecdff5682158a24d010e9b15781dff3f714d7d501a3a7a54b6b874074cf87956e9d2a447d8cf61f SHA512 d64a79cef1bf1fa2e4ae35b399ee379095342cb701cf59bb235d9155affc47343b4fa5113d491fd80da3a01e5a5c282b95238b02f3089b08a119c8529e9a0147
+EBUILD Net-LDAP-Server-0.430.0-r2.ebuild 462 BLAKE2B 9503afc7d562ea89b32989f310d06d40a78cb8eb621de87ac4c9309f16ec663750fba274a62abbe1eefb5d75fbe4c4c3ccac61c59eb6d5a51373f83a92854b92 SHA512 d1680f98d3151388c827e9cfca6d30fea232e32e0a75bbbeb353697046050dedc1be10d82be732a2fedd74e3358e4ce929ba9770b35e85553a766920cfac2c41
 MISC metadata.xml 517 BLAKE2B 6c5e268502456d13ee281d2fb7c0db258104db5f8797e0e141a60b25a2c2f4005ef8d677f053a630b4ba9959ceff77767058c1cba7d37a389cead4ac2c2ea662 SHA512 c9afb1c84da0a420129c54eb6851db6b08e5daaa97a01a3ecc421826c08c503360517f5a1a84430b370909c702e48b36ab4b6c25e8a0c9599af62e5f12986a02
diff --git a/dev-perl/Net-LDAP-Server/Net-LDAP-Server-0.430.0-r1.ebuild b/dev-perl/Net-LDAP-Server/Net-LDAP-Server-0.430.0-r1.ebuild
deleted file mode 100644
index eb93fea012a8..000000000000
--- a/dev-perl/Net-LDAP-Server/Net-LDAP-Server-0.430.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=AAR
-DIST_VERSION=0.43
-DIST_EXAMPLES=( "examples/*" )
-inherit perl-module
-
-DESCRIPTION="LDAP server side protocol handling"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PERL_RM_FILES=(
-	t/02-pod.t
-	t/03-podcoverage.t
-)
-
-# Net::LDAP -> perl-ldap
-RDEPEND="dev-perl/perl-ldap
-	dev-perl/Convert-ASN1"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Net-LDAP-Server/Net-LDAP-Server-0.430.0-r2.ebuild b/dev-perl/Net-LDAP-Server/Net-LDAP-Server-0.430.0-r2.ebuild
new file mode 100644
index 000000000000..f2d66adadeaf
--- /dev/null
+++ b/dev-perl/Net-LDAP-Server/Net-LDAP-Server-0.430.0-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DIST_AUTHOR=AAR
+DIST_VERSION=0.43
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="LDAP server side protocol handling"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PERL_RM_FILES=(
+	t/02-pod.t
+	t/03-podcoverage.t
+)
+
+# Net::LDAP -> perl-ldap
+RDEPEND="dev-perl/perl-ldap
+	dev-perl/Convert-ASN1"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Net-LDAPapi/Manifest b/dev-perl/Net-LDAPapi/Manifest
index bd84e1447e94..7d47d231dba1 100644
--- a/dev-perl/Net-LDAPapi/Manifest
+++ b/dev-perl/Net-LDAPapi/Manifest
@@ -1,5 +1,7 @@
 AUX Net-LDAPapi-3.0.5-ldap_result-no_error.patch 779 BLAKE2B 9bfe88bf8e43fdcbe7586c497ce5eca4fbdee425aab8a4469bd0dd2932e304fb63d51cba4d5ffc5b307495a73b0ae821502a1e92fa326efb2d7cb7159715c0a6 SHA512 7ffa6d5dcc13aed3f3b7ba4672a77e154c1a0ba7de75b0c9754ccace383d628467351cc650b1ec910892a84e55331ad3599be92fa671f368dc4103efc51039dc
 AUX Net-LDAPapi-3.0.5-test-env.patch 1392 BLAKE2B c83dc553fd535e9fa7693d761f47b7016729f2b12ad40e57ea4d62610b3db68b4bedbb4c0c9f749a66bcb35b34452ccb0267ca15e5fdb8bfdff74bac7c8e0bfe SHA512 d743885c10656bf2132c1067ea94d78686ab2b7a90cae195d63ee505ac8c884e7b2e6036d55dd21ac94bff497be7dbec93d9fa720c81079bf8225517e13e34e9
 DIST Net-LDAPapi-3.0.5.tar.gz 67814 BLAKE2B 2f35000e23ba17016837cd4a0cbe86be5d25254d8a34dd39c8c82cbc5a1979bb56b5b8a37af81cf1e8f12326709e252181e441d051ca0b18314408348d1435be SHA512 f3a6f4bb2e182ca93de2aa6c7a80bf20d64152fec5c4bda54efb91ec2a9be52939922993b79a2cdd248be3b83e605fc9ca3e6020f2cfb49b85256361edb512bd
+DIST Net-LDAPapi-3.0.7.tar.gz 67902 BLAKE2B 6cec3e9d53aa3e1ee2b742f78869a0ded68f73c4e159e8b58a9063589271f610c847dcae2db5ce81e47971a783e4d097f68a84c4dead333264bcb0c9f4a4730a SHA512 230f906c94265ddb35fcd6dc0b5401f2b293064a61c5eb13bed271c47f5feb82e57abff4c41b89c5e8436aea6efa09dda6d290db793cb5cb8dd97cfd1cde96ee
 EBUILD Net-LDAPapi-3.0.5.ebuild 1590 BLAKE2B 535d55d579e2975f905d80ec52fb43de60450907de680add167835322ff2d2edfc84a24bd9fd3b09dd535c10ef7030ca6d3ead9d57ad687d7111289a96170794 SHA512 db52a55bb880e595694009fdd248e6837a4f11af044e946e70ae12e2fc00e4ca8e6bedc2e11a8f83b5a4da16304a5edb24d13568def9c5fa0c344024ae530e65
+EBUILD Net-LDAPapi-3.0.7.ebuild 1601 BLAKE2B 0767cd6807309701851c88615af092a68c288a1c1a834eed6e95343adcc55b14bc07fa736b306722dfd399dd0b4250eff537b8310bcb57bba38d6f3591ec549f SHA512 22e317302dfebe91e516f3bb56d06c694f5c2c949fc311fb863b94fe97a2df09a2d867d40a7992ec1405df18060b6e1205cb404be2f9277c1d6a0d20d4b63268
 MISC metadata.xml 452 BLAKE2B 1d64daf5e0530045a673741e5ec553711cca379a4bce03eb72a00eed916d5b8e94e5e5445f2a89b1f52cf1eaebe7e4db56ac6769691a55af6a1d7a604aed7653 SHA512 c37f664c8ff0662eb697e0cd0f8e6c08cadd4f23a870bbbdac0dca99e52e098c68832cf9daa1e0dea57104a090f39b9ca9ed11099e24b154caaab2c4896fe3ad
diff --git a/dev-perl/Net-LDAPapi/Net-LDAPapi-3.0.7.ebuild b/dev-perl/Net-LDAPapi/Net-LDAPapi-3.0.7.ebuild
new file mode 100644
index 000000000000..d55300f8d519
--- /dev/null
+++ b/dev-perl/Net-LDAPapi/Net-LDAPapi-3.0.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MISHIKAL
+DIST_EXAMPLES=( "examples/*" )
+inherit multilib perl-module
+
+DESCRIPTION="Perl5 Module Supporting LDAP API"
+HOMEPAGE="https://sourceforge.net/projects/net-ldapapi/
+	http://search.cpan.org/~mishikal/Net-LDAPapi/"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# LICENSE is given on the corresponding sourceforge project and matches the
+# default cpan/perl license
+
+RDEPEND="net-nds/openldap[sasl]
+	dev-libs/cyrus-sasl
+	>=dev-perl/Convert-ASN1-0.190.0"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.5-ldap_result-no_error.patch"
+	"${FILESDIR}/${PN}-3.0.5-test-env.patch"
+)
+
+src_configure() {
+	myconf="-sdk OpenLDAP -lib_path /usr/$(get_libdir) -include_path /usr/include"
+	perl-module_src_configure
+}
+
+src_install() {
+	mydoc="Credits Todo"
+	perl-module_src_install
+}
+
+src_test() {
+	local MODULES=(
+		"Net::LDAPapi ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	if [[ -n "${LDAP_TEST_HOST}" ]]; then
+		perl-module_src_test
+	else
+		elog "Comprehensive testing disabled without LDAP_TEST_HOST set. For details, see:"
+		elog "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
+	fi
+}
diff --git a/dev-perl/Net-LibIDN/Manifest b/dev-perl/Net-LibIDN/Manifest
index eb7866a7da9b..cd714dabd2b1 100644
--- a/dev-perl/Net-LibIDN/Manifest
+++ b/dev-perl/Net-LibIDN/Manifest
@@ -1,3 +1,3 @@
 DIST Net-LibIDN-0.12.tar.gz 14262 BLAKE2B aba0a67eba74a103c51ec95a859128e50390b48cf97f4c6828d6ecd869d89ff7dfe37f103053b45f38c2abe3852a7f2a8f63dd1f699b39db4d6129226c4b8e15 SHA512 2c80d0e3d4635e225e8866a1ef6335e3b8642662101e89fde6529aa07acc1eaf8adbe20fadd1d44898651f9d67a3d00c11ff71a22a2aa3027e81643e700d79ee
-EBUILD Net-LibIDN-0.120.0-r2.ebuild 474 BLAKE2B 75c9ffc759adad3bffb73e06bc7a7f0b1a5d4c7dd3d5ca09feb8515ce3773f4bd5d14c8850c8658d8f288a375730d6519f2a37e4869f6dc74f8dffdcea264e44 SHA512 5c9875d22c61bfd5a47519fd351a4149a57c9eb3712f172a7cd2397ca16b0f9c35991d69cd8d7cd6aacb3ecf0369270944dca31030e34b04a1953a162518449a
+EBUILD Net-LibIDN-0.120.0-r3.ebuild 487 BLAKE2B 6d6582fd30d0c822ee468f5060d8a0b31d35c1aee50e015d61752b73b55ab7e0c18a20c68a6a72bd7bafadc0ea4d2a70ab8c414ab64e540662d1a3e51cc99d1c SHA512 d61b5cd312fd1bb8aa4154eafdfa5a62e1de2d60af2425961fff43b393778c50e94cbfb99a85cd0e71519312478f29fa4051358c31c1fef31708977530fbb95a
 MISC metadata.xml 392 BLAKE2B 7fc5fc36e39da13513bf22ad3a3efacccfd7c919e6dd2c80542c7c2152e981a3a2085793b2f3021464d44a26b63e7cec426aa50688aa16ff4ca4aaa3eafb476d SHA512 af2500d22746fb98a00c8e7d2c83d5c10a2257b18fdc8e7b7f66e302459a660f842c247c4cfdcb9c4bba51a7344f965fb76d3f43af6742c6a7e3bd31caad139f
diff --git a/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r2.ebuild b/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r2.ebuild
deleted file mode 100644
index 9d0af4f57e5f..000000000000
--- a/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=THOR
-DIST_VERSION=0.12
-inherit perl-module
-
-DESCRIPTION="Perl bindings for GNU Libidn"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="net-dns/libidn:0="
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r3.ebuild b/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r3.ebuild
new file mode 100644
index 000000000000..a59a40ffea32
--- /dev/null
+++ b/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=THOR
+DIST_VERSION=0.12
+inherit perl-module
+
+DESCRIPTION="Perl bindings for GNU Libidn"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="net-dns/libidn:0="
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Net-LibIDN2/Manifest b/dev-perl/Net-LibIDN2/Manifest
index 63e47b3790e8..519a4d70fa26 100644
--- a/dev-perl/Net-LibIDN2/Manifest
+++ b/dev-perl/Net-LibIDN2/Manifest
@@ -1,5 +1,6 @@
 AUX Net-LibIDN2-1.0.0-libidn-2.0.5.patch 3614 BLAKE2B 06197281422b373e4456cfe487d974722270af6c5e7f71315b226a967a4395382cc74239b88f762b4541d6b63a2dcaf686f56ab51e81de494594a50565338a13 SHA512 8ed3455ec2445418a76cb259f70d67055506bffa212511e59d54a230d4082cbadce05c54d772506ae3805d618a88cf2bfa8d027f1627b1a8b76971f3ccfafadc
 DIST Net-LibIDN2-1.00.tar.gz 23603 BLAKE2B 61d16265263e934c45cbed9427636e73a2abae8f41f7294d4b682b0129c2a7bb2c316f522b5ee36988a0d860b53514f6c44d360c12479f26887a0d2873741993 SHA512 0b0c3bba9b2c8e748fd416ba465e6b4eb76fbdad1ee2d3459be032b7d5bdb0706da97e8ebb9de57a92acae06ce84aed357f5baa516ad40268797abda6d7fb38e
-EBUILD Net-LibIDN2-1.0.0-r1.ebuild 678 BLAKE2B 6045930b2454d4971c35aa4cc496e338f99acc1a1ea58c060c1da758197e0d066a778626e59c7aeb64e51eddd2660e77117835b6fd0f32a82d5bdb10f6b2296f SHA512 b2b9b3623619d2d96978ace4c80019ceefbfc9252ffab5284ba0ff973d0d49cb7882dc5491afe7989f4a60b53897092108aac74983d589fe13c22c60745029d4
-EBUILD Net-LibIDN2-1.0.0-r2.ebuild 910 BLAKE2B 4722c24c6a77b96d52a68770b2692b49955e98de7c2a5543dc9565a18964cbee89c522adf926bef4569f03cee89c3ef53c15778f36fb828bb4b0c3b03d33e1b2 SHA512 4d7fe55a0bf5328c3b1b4758632fb9babc7c5f719948d2a04cb44d492d834f2a585df88388f8586c189d6285c669f515c2397943993aa7cd0dc9f5c3d85519ae
+DIST Net-LibIDN2-1.01.tar.gz 24496 BLAKE2B 7373448c9085834301b23c4b16a653624b91b443d240d8a608e2bb9d3e51472508f43a89ea78aa26b47480a60c8055a6879ce7390a222b74d469e6a2e01d1f98 SHA512 b3eb430c99a458e9e5fbd16fb6b059bd660a995be7ebe806b44b46160db7a5502806d503ec03667ef9865634f403db2e665c3dcad58f4e221e918ef4d78eabd0
+EBUILD Net-LibIDN2-1.0.0-r2.ebuild 903 BLAKE2B 02d537207a60658ef6c67d6a9bef8f5169eee18c9532995e9e8b8b1676aca6a9aa1a0f1a8f4c44909e51d2139b09859f70fd462deb7cea0bfab9b64750d2adfc SHA512 ac64eca139ba8dafd578ae20ccde8e7f367953879d99f2a2c2f048f1976b7357d60523cee25fd96aa45a0a5e15349e671eb99edee1a2c57704b22e41e1299283
+EBUILD Net-LibIDN2-1.10.0.ebuild 818 BLAKE2B 381bf1358b1045a19af3b140455b675fe3c59965ac5a48e6507177ffc637b9c6fa503a3e8fc93c6685bf55765bc2979aaaf056781c68aa815face99fc4a27ce2 SHA512 ef6421bf5b4e32f9f34211de5187356f05be2184f09af418971cf1a2abc6df9d5a5ccda2d6e9da6783eabb3f07e1558bfaccdf88ddad5d9592c31b61bf729bff
 MISC metadata.xml 394 BLAKE2B 0e04894c656ca9bb0623be50369ef992244fd627478f8e23232fe937123df5e8f136247e6d2708dcaa1e9e475e6967466a756dae6c1b39d243b7777a36eaa81d SHA512 66adec760ee1638b405b6f14878ed1239a4efa0dc3708ae88c6a623138bcf765175cfd8a0a2a7a63ad606cf249e35496371a56e1bc257f7325dffc9fa62cd4a0
diff --git a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild
deleted file mode 100644
index f9cb58388fde..000000000000
--- a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=THOR
-DIST_VERSION=1.00
-inherit perl-module
-
-DESCRIPTION="Perl bindings for GNU Libidn2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="net-dns/libidn2:="
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-CBuilder
-	virtual/perl-ExtUtils-ParseXS
-	dev-perl/Module-Build
-	test? (
-		>=virtual/perl-Test-Simple-0.10.0
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}"-libidn-2.0.5.patch )
diff --git a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r2.ebuild b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r2.ebuild
index 9832664e5bb4..49a071f9c595 100644
--- a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r2.ebuild
+++ b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl bindings for GNU Libidn2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.10.0.ebuild b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.10.0.ebuild
new file mode 100644
index 000000000000..bb17b04b2334
--- /dev/null
+++ b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.10.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=THOR
+DIST_VERSION=1.01
+inherit perl-module
+
+DESCRIPTION="Perl bindings for GNU Libidn2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="net-dns/libidn2:="
+DEPEND="net-dns/libidn2:="
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	virtual/perl-ExtUtils-CBuilder
+	virtual/perl-ExtUtils-ParseXS
+	dev-perl/Module-Build
+	test? (
+		>=virtual/perl-Test-Simple-0.10.0
+	)
+"
+
+src_configure() {
+	unset LD
+	[[ -n "${CCLD}" ]] && export LD="${CCLD}"
+	perl-module_src_configure
+}
+
+src_compile() {
+	./Build --config optimize="${CFLAGS}" build || die
+}
diff --git a/dev-perl/Net-OAuth/Manifest b/dev-perl/Net-OAuth/Manifest
index 420840b971d1..348a10992b76 100644
--- a/dev-perl/Net-OAuth/Manifest
+++ b/dev-perl/Net-OAuth/Manifest
@@ -1,3 +1,3 @@
 DIST Net-OAuth-0.28.tar.gz 29063 BLAKE2B c1526bc668e18e85342fbd4ed62925ebb00e7a378524b0f71ef5534111b2064d4828b131ea65d491ee88f8ad37126681fdc8df2d9cfe769a866f3849e31135c2 SHA512 b38c3784221bdf56b5b55021cc7e74cf6c5ce47b6743b6fefae9e148ff61d3c1e068aa5829dfed13ffd070e1286ab0d743e2f7b7c900f5fd8cf78f788cff70c4
-EBUILD Net-OAuth-0.280.0-r1.ebuild 612 BLAKE2B d6e0b2ba646d6e1dc0e9b562bfc66a4055227c22327515f0fbbb716e62cc8573eade928cfe7a36446cfdb33c20f76afa7996e502595ac3196a816044fa716a16 SHA512 c902423093a82a89bd5b3f414b218bc555c4e7998f7dba5daa60535c707479f23045325e36bd6279d12ae0adeb5a4517583ac0205932be4ee22c3e8a4d2e2aa2
+EBUILD Net-OAuth-0.280.0-r2.ebuild 557 BLAKE2B 3a7d75c37fc7d317c466d7659aacf0dceb8252a92da7a780fe6a6f5a6e4cb4a2acdc9ebd48f2548666ebcae6b7608e21535aab9c26ac3fd7ab03460ac7b953f9 SHA512 5b627040c56d75326203888ecca8388eb7ccdbf9edecee575c0d4024c5cfd0a2db03707ace494947db2ea7bb990801741e7e7b62656391bb33764ff382f73fb0
 MISC metadata.xml 2191 BLAKE2B f017795952f48a214931a8c2b7f424d988e9dd0610129650e170a4c5769fddcfbd182c1bd28da1adf2adb03dbe953d32358213bb5614bca7c72977712bee62a1 SHA512 4e175e473abd585bc4fb75e43cfde138aa71343672d9230f8042a64e353dbd0210f27df35badecbb05923ed147398ed098802a89d135fc203ead56869a32c83b
diff --git a/dev-perl/Net-OAuth/Net-OAuth-0.280.0-r1.ebuild b/dev-perl/Net-OAuth/Net-OAuth-0.280.0-r1.ebuild
deleted file mode 100644
index 1d43fd8bd399..000000000000
--- a/dev-perl/Net-OAuth/Net-OAuth-0.280.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=KGRENNAN
-MODULE_VERSION=0.28
-inherit perl-module
-
-DESCRIPTION="OAuth protocol support"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Class-Accessor-0.31
-	>=dev-perl/Class-Data-Inheritable-0.06
-	dev-perl/Digest-HMAC
-	dev-perl/URI
-	virtual/perl-Digest-SHA
-	>=virtual/perl-Encode-2.35
-	dev-perl/libwww-perl
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		>=virtual/perl-Test-Simple-0.66
-		>=dev-perl/Test-Warn-0.21
-	)"
-
-SRC_TEST=do
diff --git a/dev-perl/Net-OAuth/Net-OAuth-0.280.0-r2.ebuild b/dev-perl/Net-OAuth/Net-OAuth-0.280.0-r2.ebuild
new file mode 100644
index 000000000000..1d785b033e84
--- /dev/null
+++ b/dev-perl/Net-OAuth/Net-OAuth-0.280.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=KGRENNAN
+DIST_VERSION=0.28
+inherit perl-module
+
+DESCRIPTION="OAuth protocol support"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Class-Accessor-0.31
+	>=dev-perl/Class-Data-Inheritable-0.06
+	dev-perl/Digest-HMAC
+	dev-perl/URI
+	virtual/perl-Digest-SHA
+	>=virtual/perl-Encode-2.35
+	dev-perl/libwww-perl
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? (
+		>=virtual/perl-Test-Simple-0.66
+		>=dev-perl/Test-Warn-0.21
+	)"
diff --git a/dev-perl/Net-OpenID-Common/Manifest b/dev-perl/Net-OpenID-Common/Manifest
index c92acb4f11fe..6acf1397fa60 100644
--- a/dev-perl/Net-OpenID-Common/Manifest
+++ b/dev-perl/Net-OpenID-Common/Manifest
@@ -1,3 +1,3 @@
 DIST Net-OpenID-Common-1.20.tar.gz 28306 BLAKE2B a6c14430ccc77e1c844170eba5dde6ecc98294e95a1d52d5bb1e263c123377e6b38bf278175ffe03622ae752dfc4d8e5aea8ebdd0de07b3ee8fa8c2c3e5e054f SHA512 9d503834e66b8b3f0cef2452b7cec70559723e02b9b846b14eba63aa73f03d58afa8802ffe7517eb5756d78609f3382137303361542f312969aee8c0a46f0c5f
-EBUILD Net-OpenID-Common-1.200.0.ebuild 685 BLAKE2B 45ab3a557b0abe82b160ae024c0046c0f24afec0b4da5eb4ffacdf79cc6c1886952333db7533abf3d23c99e455d2db6b703d61f191d67b28e51cde459592dc4a SHA512 77b2c3f99a53772ffa61c5875de04ee5e2b757129be2f747eca1e47506968a6f2f5079271ef63bbbcb429cf7ef2e5e6fb047d8b87211ad940082f3063b8e6057
+EBUILD Net-OpenID-Common-1.200.0-r1.ebuild 647 BLAKE2B f3a8eff15d1650ff4983a81b60aa16d7cea38163c1f825116eab111ba73e32eb79a2a590db4eb57f47d73432b8775e4a991de707cf3322ac16f4b4d76b97b77d SHA512 12a035b841ff8e3fc38e903108eaa8ce853be82c4a46c7f39e6ba3c254c26bfc99f3fb65cfb3392e0398b64c40ff61c005cf91142b912fd340fabf3c775e81ec
 MISC metadata.xml 1257 BLAKE2B 86df3b7d18455f9e9b7fd9e6c9bfdd14386120826d30b129deee3293b39e19144091eeae5e65e9203de6ed737d1f8e0c498ab82e7f9e5e3051823437b6808e9f SHA512 cf3d71c751a8e1854098b2fc687e4d93bb724c3f701b8f96194ebf0f07ec74fba015aff8d35a75c21566174211be86acb0b3c33263503e421deb3b830fad38b8
diff --git a/dev-perl/Net-OpenID-Common/Net-OpenID-Common-1.200.0-r1.ebuild b/dev-perl/Net-OpenID-Common/Net-OpenID-Common-1.200.0-r1.ebuild
new file mode 100644
index 000000000000..67cf01682e42
--- /dev/null
+++ b/dev-perl/Net-OpenID-Common/Net-OpenID-Common-1.200.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=WROG
+DIST_VERSION=1.20
+inherit perl-module
+
+DESCRIPTION="Libraries shared between Net::OpenID::Consumer and Net::OpenID::Server"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Crypt-DH-GMP-0.0.110
+	virtual/perl-Encode
+	>=dev-perl/HTML-Parser-3.400.0
+	>=dev-perl/HTTP-Message-5.814.0
+	virtual/perl-MIME-Base64
+	virtual/perl-Math-BigInt
+	virtual/perl-Time-Local
+	dev-perl/XML-Simple
+	!<dev-perl/Net-OpenID-Consumer-1.30.99
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Net-OpenID-Common/Net-OpenID-Common-1.200.0.ebuild b/dev-perl/Net-OpenID-Common/Net-OpenID-Common-1.200.0.ebuild
deleted file mode 100644
index 82df55e67313..000000000000
--- a/dev-perl/Net-OpenID-Common/Net-OpenID-Common-1.200.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=WROG
-DIST_VERSION=1.20
-inherit perl-module
-
-DESCRIPTION="Libraries shared between Net::OpenID::Consumer and Net::OpenID::Server"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Crypt-DH-GMP-0.0.110
-	virtual/perl-Encode
-	>=dev-perl/HTML-Parser-3.400.0
-	>=dev-perl/HTTP-Message-5.814.0
-	virtual/perl-MIME-Base64
-	virtual/perl-Math-BigInt
-	virtual/perl-Time-Local
-	dev-perl/XML-Simple
-	!<dev-perl/Net-OpenID-Consumer-1.30.99
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/Net-OpenID-Consumer/Manifest b/dev-perl/Net-OpenID-Consumer/Manifest
index 242dba5a15be..ba8391d0c21c 100644
--- a/dev-perl/Net-OpenID-Consumer/Manifest
+++ b/dev-perl/Net-OpenID-Consumer/Manifest
@@ -1,3 +1,3 @@
 DIST Net-OpenID-Consumer-1.18.tar.gz 58643 BLAKE2B c6a520c3496c00a54a6d6b15fae4133ed37adf01237801b9e197e0bdf1ee19ae19af1794baf8e60d41e0322da7ac999ee388de8edca68c9e910d7c17196a0aff SHA512 b8d06ada0f574a88a8a9aecc4f8d11f9a9f91e0320d649a3e99b0ad91b463d22b94919206e1514d1891031c2c6e82f61a6421aea4746ec7314503f1ba9d22fa4
-EBUILD Net-OpenID-Consumer-1.180.0.ebuild 615 BLAKE2B ce6a70e53b87c111e68a9831a186ec2ebfdaafed1285d352be294f33fd7f5558a493889163086df68309c9c779e71d4bd7683fb5771a9f1e937d8c313510984f SHA512 d30d7b4b1fcb92007d102a1ef5e40e290866f4e865192e3943fb70b9b64834fec2631a01cee1e45052b93650c42c2398f9142df7906ab396ba62428e7bc79f84
+EBUILD Net-OpenID-Consumer-1.180.0-r1.ebuild 577 BLAKE2B 0bbcf1b23971e48204bb40f6f0dc14a63e068fb545db561c8e03dfe4dfd26ee83e69e621321984d88f0e767f0d4989da5570e5ace118d6c91b11749d1ae4ea71 SHA512 15f7888251235085fa7debdf92eac641fb6898c502fd07367eb537d6035917371e39bdfb9202d75ad1577ac42351bec1f69b47b303333f1eaed451806c69685d
 MISC metadata.xml 633 BLAKE2B a0aef27021774abf839cd63357cf2eec3e3fc4845c6607c7c23a07eee5eac4282a8f7afd40111f88cb626400370b14ec162cee2cf3311f6055607cf845e7039a SHA512 2de38f6cb2dffa2db559c35a72456e33256c06b57250a4fcbf3b44947e20f088e60461eb0f4c6a57a65f265f2d372b6a4b5d01d825654e825ba76161a9057227
diff --git a/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.180.0-r1.ebuild b/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.180.0-r1.ebuild
new file mode 100644
index 000000000000..a98fa4ea8141
--- /dev/null
+++ b/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.180.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=WROG
+DIST_VERSION=1.18
+inherit perl-module
+
+DESCRIPTION="Library for consumers of OpenID identities"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Digest-SHA
+	dev-perl/HTTP-Message
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	virtual/perl-MIME-Base64
+	>=dev-perl/Net-OpenID-Common-1.190.0
+	virtual/perl-Storable
+	virtual/perl-Time-Local
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/CGI
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.180.0.ebuild b/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.180.0.ebuild
deleted file mode 100644
index 5712e6eeaafe..000000000000
--- a/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.180.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=WROG
-DIST_VERSION=1.18
-inherit perl-module
-
-DESCRIPTION="Library for consumers of OpenID identities"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Digest-SHA
-	dev-perl/HTTP-Message
-	dev-perl/JSON
-	dev-perl/libwww-perl
-	virtual/perl-MIME-Base64
-	>=dev-perl/Net-OpenID-Common-1.190.0
-	virtual/perl-Storable
-	virtual/perl-Time-Local
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/CGI
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Net-OpenSSH/Manifest b/dev-perl/Net-OpenSSH/Manifest
index edb27d8332b3..0989d3f0d3c4 100644
--- a/dev-perl/Net-OpenSSH/Manifest
+++ b/dev-perl/Net-OpenSSH/Manifest
@@ -1,3 +1,5 @@
 DIST Net-OpenSSH-0.74.tar.gz 73869 BLAKE2B cc76995765967050806e6fbf064f09107cb13beadcdb9f7ccd95bd7d3b2373b93f3141774c0d62d8f1684133d8734e848463174338dd70e325f3fd55b5874744 SHA512 27b35ed512fe6da160e71264aaf7e1696f8182c5e731a71b95f84736e2dd04b9d3324d3a26549d4426ab6ca470810e5e16c82fbb6a88526015122dee3411a73a
+DIST Net-OpenSSH-0.80.tar.gz 76893 BLAKE2B 48efa393c051d66e08c6ad6e353b998afa8c6b947b36e9e5f683c5341327f969b73c0c0c41902000219341215ef4b0a71968bd5d3cd979f13d93b256c984b466 SHA512 3b68b73b0d5ee5db2096e0ac3ec3c3f12b92ee1865217a81eff0378f416ffdaac252d4ae4de601da7cd4a771bbab6a4768be4cafa0eaa2ff93b31a3cf824875d
 EBUILD Net-OpenSSH-0.740.0.ebuild 496 BLAKE2B 8a2bbd2a009deb32d6d6a5d1589cee17a45e076e832ee824e5902116e17e7dc8a943fdb9c5f5b9362167862730bbb6af3c2051bbcb887cb2c52c08dd7ee65b1a SHA512 502949466dd54458dc3dac03b319398cd1be48f1c13ea8737c8b4ede75f37000f53af1ca90fd4c9d1610316fef0ac0c3d6b18f57911425e292aef1ef197d041c
+EBUILD Net-OpenSSH-0.800.0.ebuild 496 BLAKE2B 45152cd214bbd0c8a07cdfcaf9c3ad37d5a5a846574700464d94cb8cec9efca36640dc8554b537fb9a5c9c844a12d983b1085dc0a6880d9d751100caa92fe924 SHA512 8cd6f0140f4629c6a74ef1b177eff61dc577c8cdebccb9d863fffb301b71e6b3bbff8e3e39534735a5371595730572f306f3dff22e770263be67d4cbd70d251d
 MISC metadata.xml 1425 BLAKE2B 4b3401f8bf1cd42f49e817f566ad742b1edf118253a8a46b5337ff40cce2d6a7bd6f4d1f59c2cb00993ecc3ebe59a8e7fd4f54aba8d296775b7790102beaaa84 SHA512 82a592f238573c631a441de3207935b6f0f25a4bbb8a5c1628714112fbb2d1e20a0e870e77fcedc6411be8b6ad23060b4ab740bf0e6fea2ae93fbeb9641ff0ab
diff --git a/dev-perl/Net-OpenSSH/Net-OpenSSH-0.800.0.ebuild b/dev-perl/Net-OpenSSH/Net-OpenSSH-0.800.0.ebuild
new file mode 100644
index 000000000000..d7901b84df82
--- /dev/null
+++ b/dev-perl/Net-OpenSSH/Net-OpenSSH-0.800.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SALVA
+DIST_VERSION=0.80
+DIST_EXAMPLES=("sample/*")
+inherit perl-module
+
+DESCRIPTION="Net::OpenSSH, Perl wrapper for OpenSSH secure shell client"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	virtual/ssh
+	dev-perl/IO-Tty
+	!minimal? (
+		dev-perl/Net-SSH-Any
+		dev-perl/Net-SFTP-Foreign
+	)
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Net-Patricia/Manifest b/dev-perl/Net-Patricia/Manifest
index 69aaa231a2ee..d2df410232a9 100644
--- a/dev-perl/Net-Patricia/Manifest
+++ b/dev-perl/Net-Patricia/Manifest
@@ -1,4 +1,4 @@
 AUX Net-Patricia-1.22-no-lnsl.patch 947 BLAKE2B a0535920826937aa83fd1d9a64256a131a717131cd14338e2b7c067007e5e4c8d106745ad4dce9fbc8a6ba336e1c336f8f9bcd51fb2a31b5c63e620f12705bc8 SHA512 43f9907393952efb253cd8e8a9bdd1e6ed179750700855f46dbbf21b4e6e3838349dedda98c24896d177a4cfcf99289beb0053ab62327e161743f581954bbe58
 DIST Net-Patricia-1.22.tar.gz 27780 BLAKE2B 9f81e9551b4110bcc6e16f8393d39f5a5ef4521e1cb6c1ea58a35f37a7b4a4882eaa9a3418b0695fa17e295dbb325ee9583f129be1dfb476ffbad7150d08691c SHA512 d76702d30784f8448dcf3a5269e052bc7bd6f5fe5a16824b6e3ede1d0182deb139522e45e1fb78749a7527ddbc950c213d843e43f45b5b0ed63b5b985b329861
-EBUILD Net-Patricia-1.220.0-r1.ebuild 594 BLAKE2B a90e58a2ec9c5605c43cd2d2379d243e9bf120fba8dc458adf2ef7618bed339fdd4bd201ecf08be1a8ce567d3cf3f79e1638aabed91d0ac7d57b3156b061c1b5 SHA512 82100e1b5f42860652b66d5d65704c35815ac4a1ef25f5752146662d2500a7dd3710fee8eb6cde46655f4525d4b85c3659963deb06935d827dca81d2c3a67004
+EBUILD Net-Patricia-1.220.0-r2.ebuild 596 BLAKE2B 11edb16bea620627f6d371cc4a19ee9d533a1ee3070cfce041017621ad73a24f833f90ba28ba8a31c2cdea2ada99d2a23dcf76bfbe63c6fa5b8ed431f28ced2a SHA512 c5badb307a031909fe102d613a35287e82f4d21240814a26cf3f86a1e64ef06f8592db46cc3dcace91307878daf627d70a72d45103d2aa5b82fd3c715c2499ba
 MISC metadata.xml 535 BLAKE2B 85679f1ddf9ae459d8b64634e9f2512ae5d7e71cbc8808a9c7f8f89f22cc417cd9228c32d7064d0d5bfffb8d47f91b7c20f3ab947bf72fab2e17b958b7387943 SHA512 cac83e7065b4ea8cb0f54ebde75a1e6e31cbcab5462d1e48e773425bf5ab5a413859dbce470b0692884ca827911a5ca9ff85a02d9cececa5e1602ab6d2495577
diff --git a/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild b/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild
deleted file mode 100644
index 7fec77a03430..000000000000
--- a/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GRUBER
-DIST_VERSION=1.22
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="Patricia Trie perl module for fast IP address lookups"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6"
-
-RDEPEND="dev-perl/Net-CIDR-Lite
-	ipv6? (
-		dev-perl/Socket6
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=("${FILESDIR}/${PN}-1.22-no-lnsl.patch")
-src_compile() {
-	emake AR="$(tc-getAR)" OTHERLDFLAGS="${LDFLAGS}"
-}
diff --git a/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r2.ebuild b/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r2.ebuild
new file mode 100644
index 000000000000..9e7ed4aaa30f
--- /dev/null
+++ b/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=GRUBER
+DIST_VERSION=1.22
+inherit perl-module toolchain-funcs
+
+DESCRIPTION="Patricia Trie perl module for fast IP address lookups"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6"
+
+RDEPEND="dev-perl/Net-CIDR-Lite
+	ipv6? (
+		dev-perl/Socket6
+	)
+"
+BDEPEND="${RDEPEND}"
+
+PATCHES=("${FILESDIR}/${PN}-1.22-no-lnsl.patch")
+
+src_compile() {
+	emake AR="$(tc-getAR)" OTHERLDFLAGS="${LDFLAGS}"
+}
diff --git a/dev-perl/Net-Pcap/Manifest b/dev-perl/Net-Pcap/Manifest
index b7f9c28fb26a..2b453735727d 100644
--- a/dev-perl/Net-Pcap/Manifest
+++ b/dev-perl/Net-Pcap/Manifest
@@ -2,5 +2,4 @@ AUX Net-Pcap-0.18-libpcap-1.9.0.patch 1300 BLAKE2B 65cd73c1f6f3b097dd8fa2b86c409
 AUX Net-Pcap-0.18-test-error.patch 1302 BLAKE2B 5b61333702676ace4b987fea8b3df9fc0177ba41785b5471a170d3826c29175d39ef8b827ea40842598c4847e4aada61e2a86849bceafb2343e219694155358a SHA512 82fa8950ceb84966905646a1a210bfef23c8c3be8ef66b2db3702b3ccc66329c7148e3d74931f5e9bd1a73a312a16e7c10ce0232f344e4fb97e938b196c3daf9
 DIST Net-Pcap-0.18.tar.gz 94207 BLAKE2B 257e2b7c5bf6ad05936b64171db3ee530249f40d695ca2aba21d4bfe4796989e3a4aa955472b9c39e33aab5d67d2eebb26b43e173dbd359d01201926fa3a6b6e SHA512 63cc216345eb65b1e76efa657623c9d444d20f4b54ab0c75e787483baaa4f1de7e3a9294967aa7eccbdca04c60b089194dd7e0d19838f899b332c5881a8c7f6d
 EBUILD Net-Pcap-0.180.0-r1.ebuild 816 BLAKE2B b6c13c400f617676bdf5cb7f56661a6ce8ab7ff7a7e4ee9122a362c264e718492b8f08d04f0aa0c78c3cca3276ee39a5e0428f73e4be889e5d623df7bcc369dc SHA512 dfb79e87f108f85bc03078ca4b9f03d7a906d887919fee2fb2e749d018c2441d3cd19ed21406c2156ac20de4df702ca97bdd9138f43966d9a8531691669d6cb6
-EBUILD Net-Pcap-0.180.0.ebuild 759 BLAKE2B 08586fa4c87d70beaac48fa81bfac8b502b3aa70dad9800782505f6eaf3dfccc9a4056726ac366657f36ac6f40f40932e779ce41695ba11e3de9bb33b1601131 SHA512 e003fff2167595634800eec7263f003637336eb4717ed16df358959e5dd9a38c0fbda26bae1f6d521938b441aba780ffa2d6ff3bdd0194af716f3d9d7efec86b
 MISC metadata.xml 388 BLAKE2B 559872c430ea234e8e0a8c495f74fe56526039a9e28dce6a252a05167901c27d6fafe8b90e9107d6d29892256e3a89012c918614032f302ea38fb4e098f54354 SHA512 6ae51c30128320478983e55d7e6e4a69c8c6c17ef926b97e466bc1ba1c7808c3728cf46743789467151ac76074fb852f8648a5c6e6cd02396bcc8c7c10f8f89c
diff --git a/dev-perl/Net-Pcap/Net-Pcap-0.180.0.ebuild b/dev-perl/Net-Pcap/Net-Pcap-0.180.0.ebuild
deleted file mode 100644
index 4bbc2d5625b1..000000000000
--- a/dev-perl/Net-Pcap/Net-Pcap-0.180.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SAPER
-DIST_VERSION=0.18
-DIST_EXAMPLES=( "eg/*" )
-inherit perl-module
-
-DESCRIPTION="Interface to the pcap(3) LBL packet capture library"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-IUSE=""
-
-RDEPEND="net-libs/libpcap
-	dev-perl/IO-Interface"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-${DIST_VERSION}-test-error.patch"
-)
-
-src_test() {
-	if [[ $EUID != 0 ]]; then
-		elog "Comprehensive testing of this module requires root permissions."
-		elog "For details, see:"
-		elog "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
-	fi
-	perl_rm_files t/pod{,cover,spell}.t t/distchk.t t/portfs.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Net-PcapUtils/Manifest b/dev-perl/Net-PcapUtils/Manifest
index 880eefe25c29..90a8a8fd829b 100644
--- a/dev-perl/Net-PcapUtils/Manifest
+++ b/dev-perl/Net-PcapUtils/Manifest
@@ -1,4 +1,4 @@
 AUX Net-PcapUtils-0.01-testsuite.patch 1663 BLAKE2B 83daa118768919aa4f291bdcc0487bab98e015ac6009af16a6469f21ddc8488209295e53ed4fca7feedb51d9fd11ab840ea624f191ccc3f170d40397e054e70d SHA512 4cc5459adbfe378dcea6ad557244e1707d7c670e3ae4ef7d0030f07b46fbf337d7df8a70e7aa31e3ca8963745011a3a14ff1e41671a26e0417cd96a8e92bef6d
 DIST Net-PcapUtils-0.01.tar.gz 4370 BLAKE2B 475e55aea7efc4c7e603f826a081df05f9f5025a9de4f88354b9b1231cbbccc613440aea44fe7f6540ff6099a91002d86f015730c6a74557e9991af95f664f3d SHA512 19fa2215f6ee69005c585e7d381738c6a5fdbf6b09267a38014b7d4bd0f604ba21a7b16dd8d4aba20b8e290044c3a6ab1fc6f29070a666d7785a690bac228708
-EBUILD Net-PcapUtils-0.10.0-r2.ebuild 587 BLAKE2B 83626e91b5aad1517a301ef196d9607e1eff42408cb7a78c678d192fd275b896d83e87b38de9bb223dffeec954075dbec5f6f60bed2659bd579356f771263e07 SHA512 d7d1a6336c4727bf70f18dae424d8a651435d605714245b9a489f4a4bfa261a2259e80e72d15ccc1db08a3d1e90a897e21e1d0ce55884b82ad7f821266483aa5
+EBUILD Net-PcapUtils-0.10.0-r3.ebuild 383 BLAKE2B 371046a231be761cf7aaaab5cc3c583ac78f10a13d9c7ab4fca14b3f31dc1e51a4ee663bbd9e4342f7acf010c33e29353743fc4f6e417a342bb197720661b301 SHA512 6503186433e06f9bb917ac6333f24bccdf3f0ba7324d1ce52db247078d59eedd653a9ec31fb81f765838f4c639b0dcfe2f59efa7e94b7c609749e458f615e5dc
 MISC metadata.xml 398 BLAKE2B d181cced3de6be4951361621d643bdc8c1855fadb46c6d3d93e0eadf98f7d3baa44f95b7d778312bfd256d0b44fc5bf561353cf361cc235cef2d719c05ac2bd6 SHA512 5fd32cd69efc82ee5acc704b57f0a949db7379b2b051582ce4fdba51a02344424498b8b3654b792ed770f378cc5e469c3227c2f764967bb269f36c9114f305fe
diff --git a/dev-perl/Net-PcapUtils/Net-PcapUtils-0.10.0-r2.ebuild b/dev-perl/Net-PcapUtils/Net-PcapUtils-0.10.0-r2.ebuild
deleted file mode 100644
index cf97e85ab52e..000000000000
--- a/dev-perl/Net-PcapUtils/Net-PcapUtils-0.10.0-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TIMPOTTER
-DIST_VERSION=0.01
-inherit perl-module
-
-DESCRIPTION="Utility routines for use with Net::Pcap"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-perl/Net-Pcap"
-DEPEND="${RDEPEND}"
-PATCHES=("${FILESDIR}/${PN}-0.01-testsuite.patch")
-
-src_test() {
-	if [[ $EUID != 0 ]]; then
-		elog "Some tests require root privileges. For details, see:"
-		elog "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
-	fi
-	perl-module_src_test
-}
diff --git a/dev-perl/Net-PcapUtils/Net-PcapUtils-0.10.0-r3.ebuild b/dev-perl/Net-PcapUtils/Net-PcapUtils-0.10.0-r3.ebuild
new file mode 100644
index 000000000000..9a6b38d99b30
--- /dev/null
+++ b/dev-perl/Net-PcapUtils/Net-PcapUtils-0.10.0-r3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TIMPOTTER
+DIST_VERSION=0.01
+DIST_WIKI="tests"
+inherit perl-module
+
+DESCRIPTION="Utility routines for use with Net::Pcap"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="dev-perl/Net-Pcap"
+BDEPEND="${RDEPEND}"
+
+PATCHES=("${FILESDIR}/${PN}-0.01-testsuite.patch")
diff --git a/dev-perl/Net-RBLClient/Manifest b/dev-perl/Net-RBLClient/Manifest
index 4d56a47dc982..51c3beeab282 100644
--- a/dev-perl/Net-RBLClient/Manifest
+++ b/dev-perl/Net-RBLClient/Manifest
@@ -1,3 +1,3 @@
 DIST Net-RBLClient-0.5.tar.gz 6815 BLAKE2B 82cb854293022ee0dd16a9790602289ba7108dac9b02ec91059ce6db1fda5f4cbb58715e6c82d645fa53cd6ad7f32095c8d4e7513c868687f7e574f5abcc3787 SHA512 8991c21b22c083b82f79e1c8ffb59cc414731013610361bb192df5533bc56a0de4061d46905d7b1dd213d90f247ad5927955906a28a06ff1d3d135401c560d7e
-EBUILD Net-RBLClient-0.500.0-r2.ebuild 901 BLAKE2B 862bf834eda38c35931e0035f4af7b4471ef02ba0be04bb79d9fe04943aff61a3a4aad0eb34601859622ec99de8de29a8bc40298cc176725ad9b2796967f2ce9 SHA512 4b254fd9e3f14cf44e09a80b162111a30326b8e421cafc04c02f01b19f413b164b5d357ee20ad2b6df9d01d5401ec0148c7a335827fd46dd32103690e779920e
+EBUILD Net-RBLClient-0.500.0-r3.ebuild 905 BLAKE2B cfd532e0ff5b6e1a01c7be9260ba0b6222d8ad878c6d73e171b9e32e115f1c6530a49c94fc59a8397fb3697f68207680957a76736bf4a2a3d3818ea7d33d4d28 SHA512 75f69d2e98c3cbef2cb526f88eb6bb005cbbed9403cea63a40fd16853c97907003d7081f63ceffdf5136e2cf5e28771183ed867cb0300f8cff7de2caf1b0719d
 MISC metadata.xml 398 BLAKE2B 204e914f240cd1f8eef86c446ef6fa464696a3271dd94ac316af3015eb93c091d4bbf68ac25dd64cff9d56f36ba5976882a4ff1dcb5ed3427601c211e46ef141 SHA512 7a97fcf94a5344b4d646441bc5ce6d7208dbe3317503444d232eeaa26563c28971d704da31d30f77397651a0bac094c358ef8710c16e44587481899e56e82a19
diff --git a/dev-perl/Net-RBLClient/Net-RBLClient-0.500.0-r2.ebuild b/dev-perl/Net-RBLClient/Net-RBLClient-0.500.0-r2.ebuild
deleted file mode 100644
index 6e233217ad11..000000000000
--- a/dev-perl/Net-RBLClient/Net-RBLClient-0.500.0-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ABLUM
-DIST_VERSION=0.5
-inherit perl-module
-
-DESCRIPTION="Queries multiple Realtime Blackhole Lists in parallel"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/perl-Time-HiRes
-	dev-perl/Net-DNS"
-
-S=${WORKDIR}/RBLCLient-${DIST_VERSION} # second capitialized 'l' is deliberate
-
-src_test() {
-	local MODULES=(
-		"Net::RBLClient 0.4"
-	)
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-	perl-module_src_test
-}
diff --git a/dev-perl/Net-RBLClient/Net-RBLClient-0.500.0-r3.ebuild b/dev-perl/Net-RBLClient/Net-RBLClient-0.500.0-r3.ebuild
new file mode 100644
index 000000000000..7c43e9bda6bf
--- /dev/null
+++ b/dev-perl/Net-RBLClient/Net-RBLClient-0.500.0-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ABLUM
+DIST_VERSION=0.5
+inherit perl-module
+
+DESCRIPTION="Queries multiple Realtime Blackhole Lists in parallel"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
+
+RDEPEND="virtual/perl-Time-HiRes
+	dev-perl/Net-DNS"
+BDEPEND="${RDEPEND}
+"
+
+S=${WORKDIR}/RBLCLient-${DIST_VERSION} # second capitialized 'l' is deliberate
+
+src_test() {
+	local MODULES=(
+		"Net::RBLClient 0.4"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/Net-RawIP/Manifest b/dev-perl/Net-RawIP/Manifest
index 9eab7c7ce7e1..f08cd6d4ed10 100644
--- a/dev-perl/Net-RawIP/Manifest
+++ b/dev-perl/Net-RawIP/Manifest
@@ -1,4 +1,4 @@
 AUX Net-RawIP-0.25-no-network-tests.patch 727 BLAKE2B 419aaa8355b63e5128698a5fc625c67c364371dd61c1f4d02e2259895591349a0e142c59828bbea3d92ec6bf46d1e1117b5574fc33b025c64ca63e4f880e8952 SHA512 df4d6b376637da7bef5786ae1dd443ef91cd1d8a75f6dac074674408629c8cde02bb8a5adb3494adbfe0d5554292693f4b4cb2dd1104ce5ab09c66f37ecebcf6
 DIST Net-RawIP-0.25.tar.gz 43474 BLAKE2B aa6b4f5e7a697bf0d64760ca5fa7cf199c09e178e509dd21bebe1a13d833351ca57396b840f2fe21aacf5f2216edd06688e9278e9744cb41312a7495648076e8 SHA512 c48c77389db9dc8d5c64d67e5c62bac5e3314dbc36bcfa51aa20d07224492edaa65f5c71d47ca0b804ac62b1b02387e172cd3561eadaa3a1a8040968b182b3ca
-EBUILD Net-RawIP-0.250.0-r2.ebuild 491 BLAKE2B 3353e8ae7dbe4c445ae2c78cab0adaebb0144c90c2dbf4859f52f57ad996be4210f65690efb4ae0ef4a3315a20ac1e71c832acdef5702a5ede991312b08e328f SHA512 e28dd4cf944a8684286459f5bb009674fd0dfc5bb4963d1ef94eead146457b64c02ee849a45c9930394a1c04305c9c899f2ecbf0b3560472e61e89a40eb6e6e3
+EBUILD Net-RawIP-0.250.0-r3.ebuild 506 BLAKE2B 55dea5d1c2581d6253fb2782631e6d1b015e5a6e1d97dc220e20aab0ca1777a86374d07bd38f6a3c38d95eb9a23a2e687c8f494a1b698ddcdcead355a1a3c6a8 SHA512 452c605c1d7157d5356c7391bb32e0f28574e4cf9f7275d75eb5483b1f3eebf9f0a53b3351dd37af5a4d5714099eb9742b5bd8a7ec01426d6e897f2be475abe8
 MISC metadata.xml 846 BLAKE2B 8cce702f40688fc23679abbae21602eb27c9d4d4674ae21c0fc0983100e81e3675a7781b1d2bb99d531ddf1ea4f5626ffa44509caedad8fa414710600f26a2cc SHA512 b3fec49c85d47f83582c905d0a17fa7c0b478a6753f89ad1ef14d7efc9d087665ab64582d649eaee61c0ae0b0f10424325a1e60f782f19abf41b5a94b25500cc
diff --git a/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r2.ebuild b/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r2.ebuild
deleted file mode 100644
index d100cbdc71da..000000000000
--- a/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SAPER
-DIST_VERSION=0.25
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Raw IP packets manipulation Module"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
-PERL_RM_FILES=( "t/90-pod.t" "t/91-pod-coverage.t" "t/99-critic.t" )
-PATCHES=("${FILESDIR}/${PN}-0.25-no-network-tests.patch")
diff --git a/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r3.ebuild b/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r3.ebuild
new file mode 100644
index 000000000000..9185be3b1ca8
--- /dev/null
+++ b/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SAPER
+DIST_VERSION=0.25
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Raw IP packets manipulation Module"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+PERL_RM_FILES=( "t/90-pod.t" "t/91-pod-coverage.t" "t/99-critic.t" )
+
+PATCHES=("${FILESDIR}/${PN}-0.25-no-network-tests.patch")
diff --git a/dev-perl/Net-SFTP-Foreign/Manifest b/dev-perl/Net-SFTP-Foreign/Manifest
index 218008eb289e..2e7a7cfd54cd 100644
--- a/dev-perl/Net-SFTP-Foreign/Manifest
+++ b/dev-perl/Net-SFTP-Foreign/Manifest
@@ -1,3 +1,5 @@
 DIST Net-SFTP-Foreign-1.87.tar.gz 169840 BLAKE2B 469d66192dfacbae16e348980b0d718983382546600a8daef3bcf2caa9e32ec7355f3aca948af652632668d9f9d78aca1ff28a26b5e88cb0d1cb9a398371ebe6 SHA512 c121053ee4b5442b91d4c98b7c331b3a0f0b6eaa8d2292cbb7246884751effa76c5afa797bd3f4c5b7125b0cc5bf9bfcddfed7b0453e938284b89e679042af02
+DIST Net-SFTP-Foreign-1.93.tar.gz 170310 BLAKE2B f072158bbf6222274608e28b96946f7f748ccf44520b07e0d058f229f56cb7a37622cd2f712f460e698b83f7fb7f0bd9c40a2dd807eeb9cc2372bc8d8b1d4f47 SHA512 9ce362525b5323eb253241a3dc833da1206252696b903ded4343d0678f4dc426246cd6192ed6dec033d168604a8fbfdb033a626cba8ce6d3a5f34fef7fcbe909
 EBUILD Net-SFTP-Foreign-1.870.0.ebuild 504 BLAKE2B 4a6075d6301821dd995972fd277c4f5fa56427a74add193fc1489a9a769475a06f6863469f704b942fc2e6dab0ef2ba7d3982522118129d4e828fa4c91b99b49 SHA512 47760df13d30d131f51114a360e9134f1817d7432d59f973c1b1990f78ab29d679b22fac0ad04b789105cab60a1a2f088631649f9879564f77509a4b7dd059c0
+EBUILD Net-SFTP-Foreign-1.930.0.ebuild 475 BLAKE2B dabfda7bfb23e9ad537750dc35be28b38fddf182c9f0c428559d0d0b298b47eb7ee55d90c870febaf3d3bb82ec058b390eb74d9cf26a752f6ac203cd60df9d80 SHA512 e392ea2b61bb96afc6d8acf55dba88c489e5dbc6adfd2e734e30fbaeea91c9444af3fb713dc325325445a0b13d010071a86da3afdeced9100c3633fe08d0e4ae
 MISC metadata.xml 1397 BLAKE2B 9fec5b80e8475b36e5d8d3652697eec4bd6ad1cc5ba30594b26a1cbc2a5918455863f16cb10a2a6a1b0b43eab483a747e6140a3674c1bdf685fb6905cc106c22 SHA512 575148d6cd1614c51aa1d5b1c320c6716ba57ae748480a4b1a5193e3401e12debfb604ec005a2e53476e7384cdc7889760f8ae3bbc8c1a44a246b474eddf096d
diff --git a/dev-perl/Net-SFTP-Foreign/Net-SFTP-Foreign-1.930.0.ebuild b/dev-perl/Net-SFTP-Foreign/Net-SFTP-Foreign-1.930.0.ebuild
new file mode 100644
index 000000000000..c31858f2d4a9
--- /dev/null
+++ b/dev-perl/Net-SFTP-Foreign/Net-SFTP-Foreign-1.930.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SALVA
+DIST_VERSION=1.93
+DIST_EXAMPLES=("samples/*")
+inherit perl-module
+
+DESCRIPTION="SSH File Transfer Protocol client"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Time-HiRes
+	virtual/ssh
+"
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Net-SFTP/Manifest b/dev-perl/Net-SFTP/Manifest
index 9e67ab5cced7..2a5ad011aa47 100644
--- a/dev-perl/Net-SFTP/Manifest
+++ b/dev-perl/Net-SFTP/Manifest
@@ -1,3 +1,5 @@
 DIST Net-SFTP-0.10.tar.gz 24676 BLAKE2B 16d74c6f4d48b10071b18c83895c04bb04dbf5d66bf7258aafaedc3ee2bf35f6b42c7ef5127001303f67b541ff56b74d8b2c72539c3e0c6382dc79cbd89d2c30 SHA512 1810e7d0b6915c97cea392c39e948699aeaa7bddc3fa25575d4a94d42a858a5ac02031ef0c25e7756193fd5f3f9bb79ab3a3211d4b08ddb1dd5964687146d3c1
+DIST Net-SFTP-0.12.tar.gz 27017 BLAKE2B c2e4977592830de22f67621a17ab0989eba8ee1f1e31c7a0b4312920d6b0228be8687c1a14b60bd4d9ad0d1688e3fef8a035375a46c894d27d350c956c399601 SHA512 1b24366ba49ed8d54297ae6752536959256365a601e0c10842f1d1308f0fb47d6ddf576dc7c6d6aff3910299203d5a82e97104016d0202eef3cfc62a24a78dfa
 EBUILD Net-SFTP-0.100.0-r2.ebuild 385 BLAKE2B b9d33818e31b2842458d82c0c39f120999279283fec9500ca5f1b805b0bc1c576e0ad5962aeb80c26352bd3c619cdd118abc388880aeb27a7636cfd8a15a90b9 SHA512 38c04336bbdd98a0fcf82b89fadd035ff0b46d799ca250693d5f8e6e5fa94f3d98a16fc9e5e752ced79638e7dba84ed041b6db1de4e74656b3be59bdf2bdf186
+EBUILD Net-SFTP-0.120.0.ebuild 411 BLAKE2B 26bfa0a85818d0f2754dc50b3cb8fa959d35dd9b81666cda2293aa9d15c0989329a86733ec94756bebf4781c2ec0b5320ec36715a0f13f9cc93a12766d106118 SHA512 73759ba59ffa8adaa4dbd272c48066b93f54658b1b77a46d2a2ab3297991f8079f0b258948037e95b7adfd95271a0db1605e1a47b03d65751ec83d348a4afb2e
 MISC metadata.xml 649 BLAKE2B ccdfe4dcc670012a856fa65b37f486c55bf2044e7f4d5dd2dcdee521d086c3c7c87790c3990bae501958aec48efbb8c320102a2dd2b1d41999f0a4afd9970b78 SHA512 a364029ebb213eb5bf4d368da7ebaaf38eefcf19c48b7f2e782eb39c96ce3b8310e5d0acaf9d2c67a0b243924394c22c541598752eb4c85fb6da0080884c3b97
diff --git a/dev-perl/Net-SFTP/Net-SFTP-0.120.0.ebuild b/dev-perl/Net-SFTP/Net-SFTP-0.120.0.ebuild
new file mode 100644
index 000000000000..325f2659b877
--- /dev/null
+++ b/dev-perl/Net-SFTP/Net-SFTP-0.120.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LKINLEY
+DIST_VERSION=0.12
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Secure File Transfer Protocol client"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Math-Int64-0.540.0
+	>=dev-perl/Net-SSH-Perl-2.120.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Net-SMTP-SSL/Manifest b/dev-perl/Net-SMTP-SSL/Manifest
index 471f1540ae83..f71c5bc273d3 100644
--- a/dev-perl/Net-SMTP-SSL/Manifest
+++ b/dev-perl/Net-SMTP-SSL/Manifest
@@ -1,3 +1,3 @@
 DIST Net-SMTP-SSL-1.04.tar.gz 2457 BLAKE2B a55dea686b5dd6b0ecdf025a40a71f8a87fc8fdb8cab49b6e310c1bca8a513945ca33914d762174a907ec5f146765f7aea0f70f59be4e9fee88051d2bf9c8ba5 SHA512 dfbf59e5d895add19f5684c999c941ab56a58be39492a02e5a9bdac47039bf388279eda734c6b0422d228ac14efed899b3572561e6a34cfd9582423252efb509
-EBUILD Net-SMTP-SSL-1.40.0.ebuild 880 BLAKE2B 4e37ffd4ddfde48467856a42b4af0ad077d2bbb101ceeaf634958028091278696572e70d7c5aed27c7c45cfb2aaa0ea9925cadc254a7aaaebecd99d0b9dae85b SHA512 226d7c3dab922b17003730d5a618946e413c115bbe4477c90ba67214acced82838244f1996fb44f6f11ca783afb1654c9c515dfd76556c64232a78db3c1dad9d
+EBUILD Net-SMTP-SSL-1.40.0-r1.ebuild 842 BLAKE2B 40ffffe5d6df3484309c68cf1caa81de02b753161ec462cdadbaca777d560e56aa34aa931e5d120ba49f4dd35c0e88230fb280b3e15337a367d558bcb9cc1c66 SHA512 61505c564082b9c0f0fe70f988435e0cb0b4b41a514398a6ad05919acbcc5e527f35e58c97a67ee289d9ec9f1ced01444147ab42a4799c3ba707b51ac9dbfb63
 MISC metadata.xml 397 BLAKE2B d7303f80c582df42de65102844f16f8472b73945783da5e22e6fd4c953f43cba9b5d9d6a05f2addb1e7d64466a0b391a754694b89e778d85fc26d810e94e61f6 SHA512 fa14f661a6de196fecb439768409f142a6460928a42a191deee1c63febae99861143699013df1a9700a42e861aa3bc90f10c704c3f08eb186152dd2c72b1e7c7
diff --git a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0-r1.ebuild b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0-r1.ebuild
new file mode 100644
index 000000000000..13d536086e9e
--- /dev/null
+++ b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.04
+inherit perl-module
+
+DESCRIPTION="(Deprecated) SSL support for Net::SMTP"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	virtual/perl-libnet
+	dev-perl/IO-Socket-SSL
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.470.0 )
+"
+
+pkg_postinst() {
+	elog "This package is deprecated by upstream as equivalent support for SSL and"
+	elog "STARTTLS is available with Net::SMTP 2.35, found in:"
+	elog "  >=virtual/perl-libnet-1.28 ( >=dev-lang/perl-5.20.0 )"
+	elog "Subsequently, this package is only available for compatibility reasons, and"
+	elog "should be avoided in new code."
+}
diff --git a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild
deleted file mode 100644
index 626c938c284c..000000000000
--- a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RJBS
-DIST_VERSION=1.04
-inherit perl-module
-
-DESCRIPTION="(Deprecated) SSL support for Net::SMTP"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-libnet
-	dev-perl/IO-Socket-SSL
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.470.0 )
-"
-
-pkg_postinst() {
-	elog "This package is deprecated by upstream as equivalent support for SSL and"
-	elog "STARTTLS is available with Net::SMTP 2.35, found in:"
-	elog "  >=virtual/perl-libnet-1.28 ( >=dev-lang/perl-5.20.0 )"
-	elog "Subsequently, this package is only available for compatibility reasons, and"
-	elog "should be avoided in new code."
-}
diff --git a/dev-perl/Net-SMTP-TLS-ButMaintained/Manifest b/dev-perl/Net-SMTP-TLS-ButMaintained/Manifest
index e6489a7f849a..cb1aa53f0a10 100644
--- a/dev-perl/Net-SMTP-TLS-ButMaintained/Manifest
+++ b/dev-perl/Net-SMTP-TLS-ButMaintained/Manifest
@@ -1,3 +1,3 @@
 DIST Net-SMTP-TLS-ButMaintained-0.24.tar.gz 16293 BLAKE2B 176cc7cb8220db46f5c2fe031fc9463eecefcfb939c4b663f97f53dfcd432a2db29cec63aa5ca2ad1301456d932583b38bd4c0a8a726608084244e8d1ca5b734 SHA512 28c5145ed5a3ce2beecbe95dde33c6892a4384102f0fe7c795bc92206e34257cae5c993e8c748b462c87a494eab399e45e56737bc3c424aa155613bbee2e4588
-EBUILD Net-SMTP-TLS-ButMaintained-0.240.0-r1.ebuild 504 BLAKE2B 92e81e0219bd55dba67c2418fb9019f4de64034fd1ed9f93eb995bec2f2c4f1bcab36580a9dbe6fd4bc1a82295784c27cb487caf587d676718dbfbd1a1cb7b1d SHA512 34bd02fdb31993358832e8bd1b71dc2d197685292eb1529f2a9ef02a3470889518d953aa99826fdec897b6e695856c6b470ce495a89c81172ff09428ab261ffe
+EBUILD Net-SMTP-TLS-ButMaintained-0.240.0-r2.ebuild 477 BLAKE2B 1b244b6f1b2ef2f8738c13a01d8bf1a69af53af059d35bab5c53cb3e3c6817dfffffcd36d7e0757cb3ddeaac58940dbc83fdac7248a1d945fd45a6ab31ecb8fd SHA512 f60b6b63d1cacaf120d2366debbbb235a10df7aca1353ccb5a0113aaa59ee2ac86148bd1f234055b931ecee9ee93ff10dd00d3b9d2364b7b05d604fa82b9cf51
 MISC metadata.xml 414 BLAKE2B c739d0f2df88957cd1c09519ca20102ba476d433b2ae5ac93fae3f8d60409a8312c0ce9520c31547f0f0b28295a820b82f7e71e446766cd693895e75e457c122 SHA512 f979e87b69d2f15b1c95db46371ed76d3085cae3476c1790a7a4f876d23a5224b8cc738ce3c8242a906c5ee2d3eac9912c7236c409c263388e87317903371fd8
diff --git a/dev-perl/Net-SMTP-TLS-ButMaintained/Net-SMTP-TLS-ButMaintained-0.240.0-r1.ebuild b/dev-perl/Net-SMTP-TLS-ButMaintained/Net-SMTP-TLS-ButMaintained-0.240.0-r1.ebuild
deleted file mode 100644
index d509cc994edd..000000000000
--- a/dev-perl/Net-SMTP-TLS-ButMaintained/Net-SMTP-TLS-ButMaintained-0.240.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=FAYLAND
-MODULE_VERSION=0.24
-inherit perl-module
-
-DESCRIPTION="An SMTP client supporting TLS and AUTH"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-IO
-	virtual/perl-libnet
-	>=dev-perl/IO-Socket-SSL-1.760.0
-	dev-perl/Net-SSLeay
-	virtual/perl-MIME-Base64
-	dev-perl/Digest-HMAC
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Net-SMTP-TLS-ButMaintained/Net-SMTP-TLS-ButMaintained-0.240.0-r2.ebuild b/dev-perl/Net-SMTP-TLS-ButMaintained/Net-SMTP-TLS-ButMaintained-0.240.0-r2.ebuild
new file mode 100644
index 000000000000..254ca6deef6b
--- /dev/null
+++ b/dev-perl/Net-SMTP-TLS-ButMaintained/Net-SMTP-TLS-ButMaintained-0.240.0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=FAYLAND
+DIST_VERSION=0.24
+inherit perl-module
+
+DESCRIPTION="An SMTP client supporting TLS and AUTH"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-IO
+	virtual/perl-libnet
+	>=dev-perl/IO-Socket-SSL-1.760.0
+	dev-perl/Net-SSLeay
+	virtual/perl-MIME-Base64
+	dev-perl/Digest-HMAC
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+"
diff --git a/dev-perl/Net-SMTP-TLS/Manifest b/dev-perl/Net-SMTP-TLS/Manifest
index c34bfafe4d7d..bf5b82222fa9 100644
--- a/dev-perl/Net-SMTP-TLS/Manifest
+++ b/dev-perl/Net-SMTP-TLS/Manifest
@@ -1,4 +1,4 @@
 AUX 0.120.0-multiple-attachments-fix.patch 250 BLAKE2B 485e3fa5a2f0e7dd9550cac147ba83839ad2b91078c130e9f0d5c81c4be169011b8d17f31e0d15feb218b8f227d7758139fe3ef45d4977136625f98d33c80440 SHA512 5f2347dfaeb0d8f3c20fdd2947c42a805ebf11d1a84706b98a2b4eb5b14a85165f7553a5d3c0aeafb512d5071c3c27c5c3232185214a86e501b34adcb8ddba6a
 DIST Net-SMTP-TLS-0.12.tar.gz 5994 BLAKE2B e83df2f77b9017b3652b9075ebb55cb6b7a79dea100bd5e4957a4b6a129b424347734c6472a1a5626344e7411d6c1857124417415f7ede0a03b52d21ffb0bac1 SHA512 8a285e903c2096c305498594f3b298110fba2abf4042d22f6f098369bfb8091f41effbdb6ea00f4823e5aa4d5476b2840a07ccd77f36aa06629bacd8e6b9737c
-EBUILD Net-SMTP-TLS-0.120.0-r2.ebuild 474 BLAKE2B daf34862bff4898951e3c815575be7ba125fc6fe6bd093ca5baae924785cd24813dd96337dde1f3cc1152261bbdf3743e6c822ef016303b9bfcb6df604bfd4ad SHA512 9404bcdada0578ab3390e3b108662de21e3fa0df889b87743d7d050d554a2e47644498c58fbe15fc62066d64ab2d1db67f14276cffee4ddf8944464814829b8b
+EBUILD Net-SMTP-TLS-0.120.0-r3.ebuild 447 BLAKE2B cbae3a123e9460de1f4cbd0b6034009d0adca4568008dbc493dcc2dd1f3a37cfc3ef6e625c702b6d05cfd35049f9b2b372fc273ae51aecf6197f9e47f3252bf7 SHA512 5d3ec169b5be1f43a5d4fe59beac7a77ccacac2f635b7db8bfffdbbe43eda542cc9d736bbbf8deea10f4c2631f5331952d65666cf9eace9873064a21e18c3a63
 MISC metadata.xml 397 BLAKE2B 0f4d3b24ce0cb068f1e272676a32a0ada5a6b26150209a670578ae33128389d64f791281bf17721afec6979e896077a06ccb577ab3a7354a38b2feb389abfe27 SHA512 a0f700f470da4dcb04869a78219e3c9b10cc5e1e93568293871251ba5bdb893da9869d3d415d55ce72b033959ea4daab3b7f9e43ca9380a42ee151b53fa39118
diff --git a/dev-perl/Net-SMTP-TLS/Net-SMTP-TLS-0.120.0-r2.ebuild b/dev-perl/Net-SMTP-TLS/Net-SMTP-TLS-0.120.0-r2.ebuild
deleted file mode 100644
index d26d30a161c0..000000000000
--- a/dev-perl/Net-SMTP-TLS/Net-SMTP-TLS-0.120.0-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=AWESTHOLM
-MODULE_VERSION=0.12
-inherit perl-module
-
-DESCRIPTION="A SMTP client supporting TLS and AUTH"
-IUSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-perl/Net-SSLeay
-	dev-perl/IO-Socket-SSL
-	virtual/perl-MIME-Base64
-	dev-perl/Digest-HMAC"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
-
-PATCHES=( "${FILESDIR}/${PV}-multiple-attachments-fix.patch" )
diff --git a/dev-perl/Net-SMTP-TLS/Net-SMTP-TLS-0.120.0-r3.ebuild b/dev-perl/Net-SMTP-TLS/Net-SMTP-TLS-0.120.0-r3.ebuild
new file mode 100644
index 000000000000..74e66f356b54
--- /dev/null
+++ b/dev-perl/Net-SMTP-TLS/Net-SMTP-TLS-0.120.0-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=AWESTHOLM
+DIST_VERSION=0.12
+inherit perl-module
+
+DESCRIPTION="A SMTP client supporting TLS and AUTH"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-perl/Net-SSLeay
+	dev-perl/IO-Socket-SSL
+	virtual/perl-MIME-Base64
+	dev-perl/Digest-HMAC"
+BDEPEND="${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${PV}-multiple-attachments-fix.patch" )
diff --git a/dev-perl/Net-SMTPS/Manifest b/dev-perl/Net-SMTPS/Manifest
index f30dec82fe42..b5082d7732ab 100644
--- a/dev-perl/Net-SMTPS/Manifest
+++ b/dev-perl/Net-SMTPS/Manifest
@@ -1,3 +1,5 @@
 DIST Net-SMTPS-0.09.tar.gz 5263 BLAKE2B a2091fd29de5a3c8b8bee1612bb6b7813222f0cce45070aebfced77362b029795ca51c4de818b203b454c1be14d6c6835e57fe34bf95866d4b06f916ca96401a SHA512 856d7068fe3c41c48048dae564db5d526521753f58ac4ec9b973360991853c3a7b7ea3d3e25b17692601765be522fc5bf1456a0b645325e724a482ec559d5e5f
+DIST Net-SMTPS-0.10.tar.gz 5309 BLAKE2B 6832b95d40a92b8fbd5ff381967122ab8d03ae8550181b00f931e1526d8f46ea7557ec615ca07675228daa1759b7856442307305916892052f6a7d70f4a600c5 SHA512 e9d2202f63c5149ea72d8b37e27a5c0a7d0259de6a2afd7dad4b59ce00121cedb212d73c1f50d2b6ac77a0e0934bdc750fed3be4865c5f84b805befbdab802c4
+EBUILD Net-SMTPS-0.100.0.ebuild 426 BLAKE2B e7b2df2f1debd7dbbab3421e7cad09410196df7c8d8946b4bb8131de368e30421fef4c7119abc371d2f3f256023eec1c1c4c8969d1383886a767e4ed93c364c5 SHA512 c868376ffa8ef88fc4a653c8d56242e27a4e6d197d367458615a34276609f42ca661a1f75011a96814acb7b6353f14a19ed7fff4c167ac710638d3fa411bd726
 EBUILD Net-SMTPS-0.90.0.ebuild 428 BLAKE2B d72aea275ef5397554530143c6601751bac7879b5f9c4608a86acda9aba26921af330ece486835d19205bde6d5c202d07f6ae71154c994298da3b421293c6d90 SHA512 3ec99ad8bcb844c09f1c524be740e0e81d2ea7fb8f35b6952a6e0dc0d9887a8abda6cb65cc5541b7daa8bb58a3a09ea0e4ef679f0624bd536e772cf3d2b58b5e
 MISC metadata.xml 390 BLAKE2B af74dbd7e36b2b9b81b918b1b0579f814a0cc19aaff288a279074952fe2e8a08b27823d5357e4c2ed5cf1001cec89b58b3eba5343e93c7ca6a03645686a9f673 SHA512 340cb9b62b63a6a0448f348292ed54b9ffecce933ab1abb13b6a4c6722f6d73339bcc7c141bed2177c9c5e1e1d3260d221c67725ce119581348ecce514a1b163
diff --git a/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild b/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
new file mode 100644
index 000000000000..760a61b15458
--- /dev/null
+++ b/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TOMO
+DIST_VERSION=0.10
+DIST_SECTION=src
+inherit perl-module
+
+DESCRIPTION="SSL/STARTTLS support for Net::SMTP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Authen-SASL-2.0.0
+	>=dev-perl/IO-Socket-SSL-1.0.0
+	>=virtual/perl-libnet-2.0.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Net-SNMP/Manifest b/dev-perl/Net-SNMP/Manifest
index 90b905d9b0a3..d6bdd3b7948a 100644
--- a/dev-perl/Net-SNMP/Manifest
+++ b/dev-perl/Net-SNMP/Manifest
@@ -1,3 +1,3 @@
 DIST Net-SNMP-v6.0.1.tar.gz 94664 BLAKE2B c9ad2568fbef3ef880902fd6b073149312b7cfb24c570a96f8a7f48d1264f939ce29214ff809a37d6d53e065ff2aa978475e9a66c6c383b35186106bf23483ce SHA512 5e38d4a934661201d42fd4a2d08aeca8c4522e0e430303eec7af38d16ea0aee131a4ec563bf87874376fe4995a674a24451f2a12b71a9c51ed3632e6f65314df
-EBUILD Net-SNMP-6.0.1-r2.ebuild 961 BLAKE2B 939da8fd16ec919c6d9efc3190c5386d673923aaef89beaf16abbddb173c5c2ffa71886312d5dd0be6006cce62bc58f4390803fe3771184376620453ae4fc82d SHA512 ce7d14a99d6a21d98442aeeae649313557b8701c725fec7adb22b8fc431f373f24fd80c822f7bcd4718ecae529721884e815c8975f5b66c47cc0a648082cad34
+EBUILD Net-SNMP-6.0.1-r3.ebuild 898 BLAKE2B efa511f6c7ef2d1282fda2b91685a0ede1e465f9c3bc2433a100e973c775d58b493533143f399d9061484c0b97b1038714a9d152ccc7d645a586df5e111ec95a SHA512 da445350506f9e24b1f9788c27f35c7550501b316998fbd7e5eb3648299372f66da5241910525bade98510ed16cf66071d89b0265094ced358da285ffaf59988
 MISC metadata.xml 1396 BLAKE2B 0737facf9eeed6c09186b5e4ebbebbf1e6eb87946dcf2baf9417f98547747f1ba55b94a4ace8553bac806183609e4a9caed189e4118c03f2a611eadac9c034c0 SHA512 d0c2b6a1dbd9ab196e6ce8bd616abfb093a9e7bba7ac58704c14c31ed0bc5aa40db07715e2b82f3d2e2696b785e8dc6b0981c65c0f8ddd3bc7b8dc56eb5bba38
diff --git a/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r2.ebuild b/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r2.ebuild
deleted file mode 100644
index fb6756b45222..000000000000
--- a/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_VERSION=v${PV}
-DIST_AUTHOR=DTOWN
-inherit perl-module
-
-DESCRIPTION="A SNMP Perl Module"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~sparc-solaris ~x86-solaris"
-# Package warrants IUSE examples
-IUSE="examples test minimal"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!minimal? (
-		>=dev-perl/Crypt-DES-2.30.0
-		>=dev-perl/Crypt-Rijndael-1.20.0
-		>=dev-perl/Digest-HMAC-1.0
-		>=virtual/perl-Digest-MD5-2.110.0
-		>=dev-perl/Digest-SHA1-1.20.0
-		>=dev-perl/Socket6-0.230.0
-	)
-	virtual/perl-Carp
-	virtual/perl-Exporter
-	virtual/perl-IO
-	virtual/perl-Math-BigInt
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.360.0
-	test? ( virtual/perl-Test )
-"
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x usr/share/doc/${PF}/examples
-		insinto usr/share/doc/${PF}/
-		doins -r examples/
-	fi
-}
diff --git a/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r3.ebuild b/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r3.ebuild
new file mode 100644
index 000000000000..ac07cf24a685
--- /dev/null
+++ b/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_VERSION=v${PV}
+DIST_AUTHOR=DTOWN
+inherit perl-module
+
+DESCRIPTION="A SNMP Perl Module"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~sparc-solaris ~x86-solaris"
+IUSE="examples minimal"
+
+RDEPEND="
+	!minimal? (
+		>=dev-perl/Crypt-DES-2.30.0
+		>=dev-perl/Crypt-Rijndael-1.20.0
+		>=dev-perl/Digest-HMAC-1.0
+		>=virtual/perl-Digest-MD5-2.110.0
+		>=dev-perl/Digest-SHA1-1.20.0
+		>=dev-perl/Socket6-0.230.0
+	)
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	virtual/perl-IO
+	virtual/perl-Math-BigInt
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.360.0
+	test? ( virtual/perl-Test )
+"
+
+src_install() {
+	perl-module_src_install
+	if use examples; then
+		docompress -x usr/share/doc/${PF}/examples
+		insinto usr/share/doc/${PF}/
+		doins -r examples/
+	fi
+}
diff --git a/dev-perl/Net-SNPP/Manifest b/dev-perl/Net-SNPP/Manifest
index 96663403fb92..109624aed411 100644
--- a/dev-perl/Net-SNPP/Manifest
+++ b/dev-perl/Net-SNPP/Manifest
@@ -1,4 +1,4 @@
 AUX Net-SNPP-1.17-dummy-timeout.patch 1307 BLAKE2B c69dc13842f2ef0eca4c974bbc0c36dbc68df2ed522d0c91d8c191091bd86d1b90d30912428ce59f039d8462e84dd8c8a3209d8ea7324fd1b62905a4952e7ba6 SHA512 82320a2c40a25a66365c9375470782c7f4f609da3b0509115cde2540d011d147c7d0980794d9807cd2370ed990b7b8da14d4f519d5bfad45584fd962b7398a72
 DIST Net-SNPP-1.17.tar.gz 16099 BLAKE2B fb6a2186f1621b9ce06af45e707f8da8816a7e20412cb92082625fa3cdbe2ca135cd3dc4149c9f427c27f72341785d86f22417117a017034da73477d03ec82e9 SHA512 aa1e47736226cc528513f5339579aa20f1aabbc5c0ddee2e4ca24beb0f797f50805fcf547fc6b8d0564be9331256706894d2619ee5a32c574a21d3738d86dcda
-EBUILD Net-SNPP-1.170.0-r2.ebuild 394 BLAKE2B f976d5faf845e4ae91f68a7ab26ed6d29641a722d072cce81145670751a07093960347a36bd4b3658db881687f8a8e0e66cec564141e6de6b3bdf9cfb6f96e48 SHA512 f7154a81716e650eda29e4d6e957eac22f7e4543cbea1c8fb1a3ac26db6b99a3742d0aacd1279acc253059a2b5489f0d9546fac6d5aa724c6adda928bf3f7a53
+EBUILD Net-SNPP-1.170.0-r3.ebuild 388 BLAKE2B 01eeab7023e14c055fe7ac517643c2d1ecac4825440bbbbe06e8a69c20e0d5c524201ef7fc16a4c4d9b9f23bd7a97871b533fecd8ee1a7f59a257c8adf227278 SHA512 2b9f84f7047007392e112cca2c9135b639ab4b04b07880092bad80dfaa394fa7a8e0f0567304a59707aeba248d3b85b111c0105ee09f118524ceca2d82c3d047
 MISC metadata.xml 517 BLAKE2B 394f23e47bc0b3c4262ad7e7db40b5d166a67ee184f77f6e3a8906895b78e58e3ff685e4f39ff5c6318666386e7c041bc99570f646f9fcc27a1089b095e2440b SHA512 56c7df829746577210954b5a9442935a3cd964f3cc226165d3b8946a23f0cb1ab57731a6dbdef95454e051cb84dbd089a457769da842f1fc96db4ad33e4cca7e
diff --git a/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r2.ebuild b/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r2.ebuild
deleted file mode 100644
index a30c89ea8337..000000000000
--- a/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TOBEYA
-DIST_VERSION=1.17
-DIST_EXAMPLES=( "bin/*" )
-inherit perl-module
-
-DESCRIPTION="libnet SNPP component"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="virtual/perl-libnet"
-DEPEND="${RDEPEND}"
-PATCHES=("${FILESDIR}/${PN}-1.17-dummy-timeout.patch")
diff --git a/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r3.ebuild b/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r3.ebuild
new file mode 100644
index 000000000000..7e3392cd36c8
--- /dev/null
+++ b/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TOBEYA
+DIST_VERSION=1.17
+DIST_EXAMPLES=( "bin/*" )
+inherit perl-module
+
+DESCRIPTION="libnet SNPP component"
+
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
+
+RDEPEND="virtual/perl-libnet"
+BDEPEND="${RDEPEND}"
+
+PATCHES=("${FILESDIR}/${PN}-1.17-dummy-timeout.patch")
diff --git a/dev-perl/Net-SSH-Any/Manifest b/dev-perl/Net-SSH-Any/Manifest
index 4d4a7881c643..369e6553e65a 100644
--- a/dev-perl/Net-SSH-Any/Manifest
+++ b/dev-perl/Net-SSH-Any/Manifest
@@ -1,5 +1,3 @@
-DIST Net-SSH-Any-0.04.tar.gz 14688 BLAKE2B 325fb89e7c6f15c65f71f30864a2322261d1fff181cb3728676422648998eb1646e9c8e53767d7b6dcc5daeb297a5ec589240915aca7ff886b346c21d107409b SHA512 40d7ffc9efcd252dcdf8b3af86146c2f56c0c316d9935e231c0d1ef8a64e8fe9a3153a7106bfca0b1cbdadaa10c8918b525455593fb2d07301247180d4226c49
 DIST Net-SSH-Any-0.10.tar.gz 105899 BLAKE2B c83f21e5bddfac9ab7356c575ff164ac4fc4d3ea5ed260569db2b7d813e04a5397d8eeb94df8f367ec48c4ef86d503dd8e3ce9fefe0813b39493faa3a45b419b SHA512 b34e29e8e126b2296ecf67b01bf7420f511adbf6ef72369c2fcac51cd4dbfdf747c9cca9859bb48489675233dd9ce4b0d939c587244cd36c8791fa55b434fd96
-EBUILD Net-SSH-Any-0.100.0.ebuild 446 BLAKE2B 9e462ccc27cf4fdb237afd500137de2e6e94b3b14533d331ebf0024adee8328347daad1adddc2a9ec218973946a7fa1952cddfa589eb821fcc09e306aa9222a2 SHA512 15bf6be7853da775a8f4221e6d5f16476edaea4567bcf38bb85a2bbceee6f36a5d283571ec5a38e83c1491edc135970c1263f78a093ad54c91cb01b2516f03a8
-EBUILD Net-SSH-Any-0.40.0.ebuild 394 BLAKE2B ba2470889d6048d7beb764e6c265e6039d08b4216ea57527e8b90d4f231a749744db54472a8fc7892dbf4f0afe0686531eb5a3156cc15e96640fb9ed7272e053 SHA512 7058d90dab2a2c4ca389622894f55eb408214cbad3d58cda47b233d53ec8635e3372d689055155d80eec10619e4f7562c6a415562c49a6efe17ae14c3da54bba
+EBUILD Net-SSH-Any-0.100.0-r1.ebuild 409 BLAKE2B 68cb2e6d12e01aa0c1bb41015b2c9e7f4971ac551da06bd98eb1456d68afdc1fd9cb35862c872e18988e6d751696eeee62ff529f6bdc6c34a1779babbb055d4c SHA512 5a1a854301d491c130f10bdd89db37a1babb4f79447c2183d5246fbe3834f2703e5cb50f9fad913434836a6112a3d0c168ba13b0d23bdb9e3e8c39e5eca6cbeb
 MISC metadata.xml 3465 BLAKE2B 26365d209ac8f3aa7534465880a421a013c8fcde9cd688349bd01df550deec940c58a5f02ea84b272953b27e1f18056de2602f45716908825559a5099a8a2d6b SHA512 e4733d31c2bc676b0c5e98f4c6492f26619b680dd7c734f4105ea35e2f91cdbd985257401b9bd72e70ea04d2bd95e4a988887aec489279426791ebf6515ab643
diff --git a/dev-perl/Net-SSH-Any/Net-SSH-Any-0.100.0-r1.ebuild b/dev-perl/Net-SSH-Any/Net-SSH-Any-0.100.0-r1.ebuild
new file mode 100644
index 000000000000..0c29606506e1
--- /dev/null
+++ b/dev-perl/Net-SSH-Any/Net-SSH-Any-0.100.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SALVA
+DIST_VERSION=0.10
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Use any SSH module"
+
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~sparc x86"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-1.302.26
+	)
+"
+
+mydoc="docs/*"
diff --git a/dev-perl/Net-SSH-Any/Net-SSH-Any-0.100.0.ebuild b/dev-perl/Net-SSH-Any/Net-SSH-Any-0.100.0.ebuild
deleted file mode 100644
index 4e2816d88872..000000000000
--- a/dev-perl/Net-SSH-Any/Net-SSH-Any-0.100.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SALVA
-DIST_VERSION=0.10
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Use any SSH module"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-1.302.26
-	)
-"
-mydoc="docs/*"
diff --git a/dev-perl/Net-SSH-Any/Net-SSH-Any-0.40.0.ebuild b/dev-perl/Net-SSH-Any/Net-SSH-Any-0.40.0.ebuild
deleted file mode 100644
index d1f84e69763e..000000000000
--- a/dev-perl/Net-SSH-Any/Net-SSH-Any-0.40.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SALVA
-DIST_VERSION=0.04
-inherit perl-module
-
-DESCRIPTION="Use any SSH module"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc x86"
-IUSE=""
-RESTRICT="test" # All tests require SSH server + Test::SSH at present
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest b/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
index 619b80ac416e..2e23ea681ba0 100644
--- a/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
+++ b/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
@@ -1,3 +1,3 @@
 DIST Net-SSH-AuthorizedKeysFile-0.18.tar.gz 16413 BLAKE2B ee22c2b456a5b8ad98fb9648d86e106f04266ef132d079d512fe980c08cceecc06c3946ac4fa43ad8dddb47d266debf986db47e6a3b7d72d1d1bc999284a4989 SHA512 1ebb5f2faa9ab414e49b9c8e85c27c81f858bd18669ff5508fe4dd70e8980977348121034d69fb094fd75c3d8d2c686694092bf0c0db2bcecb7ba05d85fa8a4c
-EBUILD Net-SSH-AuthorizedKeysFile-0.180.0.ebuild 542 BLAKE2B c26574a091d85db003faec3b15fbaf10074fbb9937e1f47b306ec455ffa79eeaf12028015934bd917564c6061212ed51a13bb628edd968695667a6d4dc7186f2 SHA512 9a570ac994f4d1f0b578e0d28cc8d3cd09ee5d990edde1ffb71b273d9e597738d7ecd247ebd6e3b6c6670135e3a606d12f498702000a1d91641c6a285241c71b
+EBUILD Net-SSH-AuthorizedKeysFile-0.180.0-r1.ebuild 504 BLAKE2B 2d3c2357948a8f914a1557a352f831cf2e83412853183937ae92a4accf986898fdeb7c9ec881c8f2282734d4debeb45492e0d78144da95ab872a72417e63b3bd SHA512 bd5068e5b255688331d05e96eb1fbeba98b2ce2f50e0480b0f3612c95b5819727e91a45af96ef3ed7c342ea253a2cf826ed6a520fdc868e7d365ae8c1bbe0bf9
 MISC metadata.xml 723 BLAKE2B 477b2f65c10e4be49f5c3cf67bd7f72ee670e6284a8d18c554178c8004378b938833d217496161d8fee9b25af1b630d4aff8bb89db8d9808a8b50d1096cd1372 SHA512 6eca222199e3364ce3baa88e9080c4c50b119f5a2d0626ecd3135f33e601fb602aef549654aecd617309aab6d3c5c77e8e07d597a27b3c99be968d39122fbe5b
diff --git a/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r1.ebuild b/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r1.ebuild
new file mode 100644
index 000000000000..48b4fb66285f
--- /dev/null
+++ b/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MSCHILLI
+DIST_VERSION=0.18
+inherit perl-module
+
+DESCRIPTION="Read and modify ssh's authorized_keys files"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Spec
+	>=dev-perl/Log-Log4perl-1.0.0
+	virtual/perl-Text-ParseWords
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Temp
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0.ebuild b/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0.ebuild
deleted file mode 100644
index ac129d2db3fb..000000000000
--- a/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MSCHILLI
-DIST_VERSION=0.18
-inherit perl-module
-
-DESCRIPTION="Read and modify ssh's authorized_keys files"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-File-Spec
-	>=dev-perl/Log-Log4perl-1.0.0
-	virtual/perl-Text-ParseWords
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Temp
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Net-SSH-Perl/Manifest b/dev-perl/Net-SSH-Perl/Manifest
index 09722b647318..ccc642c52cb3 100644
--- a/dev-perl/Net-SSH-Perl/Manifest
+++ b/dev-perl/Net-SSH-Perl/Manifest
@@ -1,4 +1,4 @@
 AUX Net-SSH-Perl-2.14-no-signatures.patch 694 BLAKE2B a8c876af66c5a69899ac1039c9382633af773a0a9a9bbb2ae4c60d329754f1a7dfbb6d7d5d07bcd773cdffb8fedb1deaa8b670d83dec3e651fed31be33c35e0d SHA512 510a7ee30a9f479845bcdee82da2c1a9f8e90c5a06f0bd6a2ef952bdfe1a2978460423b8f18a3e907bf2cd76c6c101ed9e785e1d88ab7bfe103632449f2e0911
 DIST Net-SSH-Perl-2.14.tar.gz 256963 BLAKE2B 700e9a852ab65ce881db043bf7ce775bbb60022299bf27936b90bb78c085136df1c6119b67f48bfd540b6b7cc2cb6406c252c4a6b9a7b73fc11760c28e527f58 SHA512 49fee3e7969260a97453adfdac7ed3852130a7404ca5016f6d16549e478b8f2808f47c5801f2dbf991cfb33b5f2653d55360ba938d9b36016620a46e1ffea879
-EBUILD Net-SSH-Perl-2.140.0.ebuild 1036 BLAKE2B db86fdb5cb03c1dfc3eba9cc557580e1b7a23bf458fdfd69de329a8fc9c07cbb5ac5546be614fc209200c9cc77bc6fdfbe31b6e524f87a610fceb52fb20eea5d SHA512 7ca7e66336bff25c9078055b7dfa64b386dec8125a60103614242264be90bc3c126e29c433196eaf0173048bacea3fa9e300df92d4cddc166ebbefbdefd95495
+EBUILD Net-SSH-Perl-2.140.0-r1.ebuild 1006 BLAKE2B 6ea06c2629e6c9778901318d8bc1f02cf4992b41fc1f05f3865091a92fdd66cf3c77059909271c72b34649e6d3c802a52fd08374f0f17b3ab70682b7fd8a00ba SHA512 4a975b33e4d0ac38054d00aef01dcb0c1faaace6fa77d1277639e14f7e115075e08957f10143e2c248ef789f99b0d224a581bc925f6b74c34e0642539d9d758a
 MISC metadata.xml 6278 BLAKE2B 49b98328d8f5bd826e947619d83eece4f0df9bee761745c63dff5c2141aa87235da3014671655906460b25c3c0e574ef254b4854a55cdfe352a8d1309de1a462 SHA512 b26170845c8c31408f23cd9c843863b99c8ed912abbdff97fcb8b74e9cafccda114b48048e258e71293e7fc82762f1079ee8667ac60d79150fe1ec339cea82fb
diff --git a/dev-perl/Net-SSH-Perl/Net-SSH-Perl-2.140.0-r1.ebuild b/dev-perl/Net-SSH-Perl/Net-SSH-Perl-2.140.0-r1.ebuild
new file mode 100644
index 000000000000..6149ef5e4215
--- /dev/null
+++ b/dev-perl/Net-SSH-Perl/Net-SSH-Perl-2.140.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SCHWIGON
+DIST_VERSION=2.14
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Perl client Interface to SSH"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="minimal"
+
+RDEPEND="
+	>=dev-perl/Crypt-Curve25519-0.50.0
+	dev-perl/Crypt-IDEA
+	>=dev-perl/CryptX-0.32.0
+	virtual/perl-Digest-MD5
+	dev-perl/File-HomeDir
+	virtual/perl-File-Spec
+	virtual/perl-IO
+	>=dev-perl/Math-GMP-1.40.0
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/String-CRC32-1.200.0
+	!minimal? (
+		dev-perl/Digest-BubbleBabble
+		dev-perl/Crypt-RSA
+		dev-perl/TermReadKey
+	)
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.610.0 )
+"
+
+PERL_RM_FILES=(
+	# Gentoo integrity checks are used instead
+	'SIGNATURE'
+	't/00-signature.t'
+	# Annoying author tests
+	't/99-perlcritic.t'
+	't/99-pod.t'
+	't/99-spellcheck.t'
+	't/99-yaml.t'
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.14-no-signatures.patch"
+)
diff --git a/dev-perl/Net-SSH-Perl/Net-SSH-Perl-2.140.0.ebuild b/dev-perl/Net-SSH-Perl/Net-SSH-Perl-2.140.0.ebuild
deleted file mode 100644
index bf0582538d6d..000000000000
--- a/dev-perl/Net-SSH-Perl/Net-SSH-Perl-2.140.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SCHWIGON
-DIST_VERSION=2.14
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="Perl client Interface to SSH"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="minimal test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Crypt-Curve25519-0.50.0
-	dev-perl/Crypt-IDEA
-	>=dev-perl/CryptX-0.32.0
-	virtual/perl-Digest-MD5
-	dev-perl/File-HomeDir
-	virtual/perl-File-Spec
-	virtual/perl-IO
-	>=dev-perl/Math-GMP-1.40.0
-	virtual/perl-Scalar-List-Utils
-	>=dev-perl/String-CRC32-1.200.0
-	!minimal? (
-		dev-perl/Digest-BubbleBabble
-		dev-perl/Crypt-RSA
-		dev-perl/TermReadKey
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.610.0 )
-"
-
-PERL_RM_FILES=(
-	# Gentoo integrity checks are used instead
-	'SIGNATURE'
-	't/00-signature.t'
-	# Annoying author tests
-	't/99-perlcritic.t'
-	't/99-pod.t'
-	't/99-spellcheck.t'
-	't/99-yaml.t'
-)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.14-no-signatures.patch"
-)
diff --git a/dev-perl/Net-SSH2/Manifest b/dev-perl/Net-SSH2/Manifest
index 298664672502..2bdb9dbd5882 100644
--- a/dev-perl/Net-SSH2/Manifest
+++ b/dev-perl/Net-SSH2/Manifest
@@ -1,4 +1,6 @@
 AUX Net-SSH2-0.67-perl-5.26.patch 573 BLAKE2B a35b3085a0fec2ead6df71b1a65c4cf000bf506f3eb47a566e22a98494cbfced819f38bfa356200a3a15c039b20443ffa84becad70559b8ea9a0683343947d0c SHA512 988b599cd47ee699fe5f89a8f0e25b3c4f5efa9519aee7556f1a10c54ad7619ac033b94bde9ca77272917da6913aea2bc940a4e3c3b5ce79d541122c9afc88a5
 DIST Net-SSH2-0.67.tar.gz 140610 BLAKE2B dfc43e31f3ededcbdd51e87e91e223614212b3247925a16fcc708695b9b1957950e7609c8463d02db229ff3e3ac3fdfe99da6154f7216b2618a9298073babe20 SHA512 3d6dde36e9e763da024b6d03184d6e41675576914cb8ceffe7e98e64ad83a1418c499ac6afebbde8f871aebab7a78e2aa355905efcaec766d5146ef9e6fd7f5f
+DIST Net-SSH2-0.72.tar.gz 147016 BLAKE2B cc0b013dbc20377774ccb02792488326b6e46e496b66842ebbd0330bd85330880823d5becccf7470b800dd6b5f462f9f6386fcf40e12cba8b257cb77981dd75d SHA512 bd0453fa3c971111114f17f3972c0d98726020230ef4d5a21ccd102158d427b46ba3b508f95cf9119f2f207b7c2592adb06184db9cb0d7c69de854e7aa7c6851
 EBUILD Net-SSH2-0.670.0.ebuild 647 BLAKE2B cab278ecec69fc508e228cf6377f58bf1c3ffd9b3a75f2acec907eb554c329473afd7604f20dad00913fc2da540bdf947b5414b09071ac85968a1f61fcd02005 SHA512 f26a18f531c44699a51f647119be93c3e53455c30a6c1f578dcf64d5c4efc5b50f5f534ca4dcb1cdcb3b5759900d715d9cb879cd1a5e85d67989058b0b40c876
+EBUILD Net-SSH2-0.720.0.ebuild 615 BLAKE2B 96dc9fd8a4370cd19c57219a8bd14a4b32489df685047245893c348da71ea284b150e4f122f8b25c932a14dce5eb1313cd544d7ab6fd8deb667401dd7287dd5a SHA512 865b44a03d84dab65bc212b4f0f6f358fe36288f89ec84535527daf1649c71220bb7b7dba07d370bea519c7be1908fb5aca6cb503d6e7699e8bdb42ebd94a874
 MISC metadata.xml 920 BLAKE2B 176a87175199bb2f1c23eb8bddb27c81c749a0ac36b69d317e714e17353634153172b3f283bc83a7e373d2989d5efa52b6488c076d2a3d371751c3255631178b SHA512 022a2ad90599df69050f66e92b8b283038d1725623927222f727bd5392749c2bb2b374ffdba1bb630ae810196a81c48ad57d9caf9d8fbf034abf1792c14e38b9
diff --git a/dev-perl/Net-SSH2/Net-SSH2-0.720.0.ebuild b/dev-perl/Net-SSH2/Net-SSH2-0.720.0.ebuild
new file mode 100644
index 000000000000..720c9f9088a8
--- /dev/null
+++ b/dev-perl/Net-SSH2/Net-SSH2-0.720.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SALVA
+DIST_VERSION=0.72
+DIST_EXAMPLES=( "example/*" )
+inherit perl-module
+
+DESCRIPTION="Support for the SSH 2 protocol via libssh2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gcrypt"
+
+RDEPEND="
+	sys-libs/zlib
+	net-libs/libssh2
+	!gcrypt? (
+		dev-libs/openssl:0
+	)
+	gcrypt? (
+		dev-libs/libgcrypt:0
+	)
+"
+DEPEND="${RDEPEND}
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-Constant
+	>=virtual/perl-ExtUtils-MakeMaker-6.50
+"
+
+src_configure() {
+	use gcrypt && myconf=gcrypt
+	perl-module_src_configure
+}
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 1fb56d0d9d5d..d3d411f671ad 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1,5 +1,7 @@
 AUX Net-SSLeay-1.88-fix-libdir.patch 946 BLAKE2B 8f3522ccc62c5b09942d61dbe73fb87bec5c5fb15e460b5a00b4a0108f6c50299304acc7e37a268a46d75af86cbdfdfab80cdf2ebecf5836f676503869727cb5 SHA512 76ff12ce42631393dcf95008b3a4a5064f2f0cc54dd44b1002fe02fccdc4b8a47871f77b28ce43346f140058c23bd9d6be08261d6a4cecffc45ced5416aa4cb3
 AUX Net-SSLeay-1.88-fix-network-tests.patch 600 BLAKE2B aac7cfbf6770d56df1af455bb37b4cfa81879a880b35a315a90df9012b1fcbc545205b206777e6929454d31f881f2581d9dbd9f6b22cd849846bc0b9f3c6484b SHA512 7fd3078e55b4c829224289e7e1cc0628e2fb162dccf151b559022d5367ac06593a460779b28d9cae015dba6614d9e273399fa6b81144aefaf47d710f63b6c046
 DIST Net-SSLeay-1.88.tar.gz 436215 BLAKE2B 1a58296693cf41c464ac67a7f630598ccbf261ed0374a5381e3f718361b66418d13b5357bf7a49267a9e3bcd8d423fdedccd6b60d34aa60c975a5e3d1b0688e7 SHA512 37fc32ec003337f3dc18bf928139079a3127628c6fa0fccaed0c27b6bf3b216c2c5338ed1aaf9408b0add3be549df3218d3c5a6d6299793c1329d8a0813a1682
+DIST Net-SSLeay-1.90.tar.gz 534246 BLAKE2B 2510fa886db8b7c5f185aa1145ae1b50b7c4101a9bd80e17c8c1d77718765f288c9180464d831775c35aa94b5a6f6c8f717ecaeb4974f7280829b63f10567f22 SHA512 8a5f251b5ef1d8c2d619d984594a7a22ddeed2e5e726fe683a45f299d7878f4ca8ffab00480ebf5ef7a94ae1fcf6be05dfdaa68b8bfe2ad68443150765adb891
 EBUILD Net-SSLeay-1.880.0-r1.ebuild 1441 BLAKE2B a690275a48d732f9e3cca820b5381b38140f5679eeaf8a6f5790fa3745fb8ab311041ed27077ee3ca70a1f81dae2260ccd65a89b733a0866bb17cbdf1d1f0725 SHA512 f84c15e1b45864e0169e9f3bad8a86fd1f862893b49781b01505272896f0de35d3b6e75780577008b78a1f3d1675f877f34012b85562bb4fa8759ea68cbe2097
+EBUILD Net-SSLeay-1.900.0.ebuild 1419 BLAKE2B 6f4344e03aae690a603199ee21e6564bcc08b27c359597b70a02836c9d6403baccca727fa2906e8aeb4347130477ec9d4748d41324938f655eec8aa9d5518dc7 SHA512 2dfdee73d6586400476a6cdde52e5f496a45754918e6098d5eead4fcb2a82ce92929712d872042adc04ad8c858617425bfe78cab64931bcca4c26c82fea0ac5c
 MISC metadata.xml 458 BLAKE2B a1f463c2ae637ac0ce9708d85768747073cb613831fad5454e72801618889ce2a96a5b6393aa06df0d0a34a05ef3ddb3aaad00fa1647ec8bde8a5aa1b65a6e90 SHA512 1502d6c58c7345b12fca3555c3bde82403f0a7bdff6d253a31c4b5b82bc981127fb2bab9e03d47d50963c3cf70533ec8ceebc025b71fe9127bdc294f092d955b
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
new file mode 100644
index 000000000000..a4ebfbce2ba6
--- /dev/null
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHRISN
+DIST_VERSION=1.90
+DIST_EXAMPLES=("examples/*")
+inherit multilib perl-module
+
+DESCRIPTION="Perl extension for using OpenSSL"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="minimal examples"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	virtual/perl-MIME-Base64
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? (
+			dev-perl/Test-Exception
+			dev-perl/Test-Warn
+			dev-perl/Test-NoWarnings
+		)
+		virtual/perl-Test-Simple
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.88-fix-network-tests.patch"
+	"${FILESDIR}/${PN}-1.88-fix-libdir.patch"
+)
+
+PERL_RM_FILES=(
+	# Hateful author tests
+	't/local/01_pod.t'
+	't/local/02_pod_coverage.t'
+	't/local/kwalitee.t'
+)
+
+src_configure() {
+	if use test && has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+		export NETWORK_TESTS=yes
+	else
+		use test && einfo "Network tests will be skipped without DIST_TEST_OVERRIDE=~network"
+		export NETWORK_TESTS=no
+	fi
+	export LIBDIR=$(get_libdir)
+	perl-module_src_configure
+}
+
+src_compile() {
+	mymake=(
+		OPTIMIZE="${CFLAGS}"
+		OPENSSL_PREFIX="${EPREFIX}"/usr
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Net-Server-Coro/Manifest b/dev-perl/Net-Server-Coro/Manifest
index f0fa86333913..9ced10ca2888 100644
--- a/dev-perl/Net-Server-Coro/Manifest
+++ b/dev-perl/Net-Server-Coro/Manifest
@@ -1,3 +1,3 @@
 DIST Net-Server-Coro-1.3.tar.gz 27510 BLAKE2B 6b525b5994273b1d31a432e3ccb1ed709afebd1961781298fc90e1ff9c73fbf5a63521d70ee9ba9106d729bd65e26e537d49d954d6ad5058cfa797301a98bc81 SHA512 a49b904213f3964c6ba6e82281a69a23718cfc3c1882751ad71ad5231601a5baa6dc9d2260191a028ea6b3b5f11a3140150fedcb2e1ac59e49a263ced2437404
-EBUILD Net-Server-Coro-1.300.0-r1.ebuild 608 BLAKE2B 23237d2e7a44c31498cbd24c3124a6029635a0c23e6c8efd83da14eaa9b12c83558921e091c415ac6625e6640b3bc44db72081f7947e4930b054d85381102744 SHA512 367614038acdae0e2cc2a36255762f67398d08a88815dbfceaf600577c0a5976bee851930527b12b49c6590ed35ca2e6348c33643095c1a09ffbaaed66aa9a20
+EBUILD Net-Server-Coro-1.300.0-r2.ebuild 607 BLAKE2B ef2db4570bb19a131b3e750ae7f11499b8b323941bc1719af9a086126610dec617560985cd336ef7580612a82d7755ab2481d18b39844c0e076a04d2ee231e41 SHA512 2b29c99d2bd62ae3f65c958030d5a4d2247e0b2a888cddb24ec10f0c2bd7c38c1f64cec8db6e52cfe076f401663591018c877aa8d46623edbebe55c984a0e77f
 MISC metadata.xml 549 BLAKE2B 8a80c0ca2a3d7129802c5efdc7f04cb5b4b2df74cfef8dcc742363426329d5c83fef0b1451a36d7b9bc842bce2bedca8cbaaa4c6e6f5a86bb696693318d3d333 SHA512 34c3a1a04e0074aa147977d4741b66fbb5131fc8d0d7ff94501480683465446cc8d5e6f5cdcfcdd3940fdd5919e529d60b48587bce9ebf642aa3cc2e815a23b8
diff --git a/dev-perl/Net-Server-Coro/Net-Server-Coro-1.300.0-r1.ebuild b/dev-perl/Net-Server-Coro/Net-Server-Coro-1.300.0-r1.ebuild
deleted file mode 100644
index 0a4bc89181c8..000000000000
--- a/dev-perl/Net-Server-Coro/Net-Server-Coro-1.300.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ALEXMV
-DIST_VERSION=1.3
-inherit perl-module
-
-DESCRIPTION="A co-operative multithreaded server using Coro"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND="
-	dev-perl/Coro
-	dev-perl/AnyEvent
-	>=dev-perl/Net-Server-2
-	ssl? (
-		dev-perl/Net-SSLeay
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Net-Server-Coro/Net-Server-Coro-1.300.0-r2.ebuild b/dev-perl/Net-Server-Coro/Net-Server-Coro-1.300.0-r2.ebuild
new file mode 100644
index 000000000000..e09234b5eec4
--- /dev/null
+++ b/dev-perl/Net-Server-Coro/Net-Server-Coro-1.300.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ALEXMV
+DIST_VERSION=1.3
+inherit perl-module
+
+DESCRIPTION="A co-operative multithreaded server using Coro"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="
+	dev-perl/Coro
+	dev-perl/AnyEvent
+	>=dev-perl/Net-Server-2
+	ssl? (
+		dev-perl/Net-SSLeay
+	)
+"
+BDEPEND="${RDEPEND}
+"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Net-Server-Mail/Manifest b/dev-perl/Net-Server-Mail/Manifest
index c290d624dac1..fee6d3c431de 100644
--- a/dev-perl/Net-Server-Mail/Manifest
+++ b/dev-perl/Net-Server-Mail/Manifest
@@ -1,3 +1,3 @@
 DIST Net-Server-Mail-0.28.tar.gz 32022 BLAKE2B c4e1d7e66d99130b2b288c351b76e1d489208ac0269dfba04818149b78ad3ba4782c428c61166667f66e3ad3431a1a7836cf4515497e99c9b7b608e1c3fba928 SHA512 543567f09417b5be82625000bf8626c8d17b6b648710aec3338a0e7675f831628347ae757a8422760c915b23c48d30b4c3b2c875e6bf4a145cb0dd3659008d91
-EBUILD Net-Server-Mail-0.280.0.ebuild 529 BLAKE2B 51761e0b6da2920736833fd3b4ad4bf1d663dd8884c3aaa55e6db0b33d6f866122f100e8b00fc57a11620b471fd5564a3ffa604f30be8181330f99ddddc70960 SHA512 cfbb25b43e88a8a22d2dc42c03c634f304c982b7156ab78e74286c3fd17d648f4a7a2f17f90b5e1af8784f36f445443afcb9f8ed4fd9aa2327d6fda18687dc11
+EBUILD Net-Server-Mail-0.280.0-r1.ebuild 491 BLAKE2B 42bea163fa3f26504c9da91032f934d0a965e5eafadcb00476e5e096f97cd570c65e7f56f305858f1a90b4ed185c703ae3daa66890153cdbd922a8dc35d4f713 SHA512 9b4b907f6514477d497004c5be0d0f81dc33bb24aa408d0b855353d695cb7c73e9a2edd044e5d6c40aa4fe365843add100b51467d61a533411d11603f17bfd1a
 MISC metadata.xml 915 BLAKE2B ac184edf40f024a6e27863dd87370d2c2058091cc269dcb9517270e8b15437c5e6d9a497b2e3c89879c0c28e6d39a46479cba5ec6ba71f401b518d8c897df90c SHA512 af31c2c4e56d450d5bbff480a233ad4a8980934fc9955e661d53ef49fd51b1a3a3728ba20842f10b5cd3bd6245cec72bb13cdee9f1bd59066b2fa87462b59d0a
diff --git a/dev-perl/Net-Server-Mail/Net-Server-Mail-0.280.0-r1.ebuild b/dev-perl/Net-Server-Mail/Net-Server-Mail-0.280.0-r1.ebuild
new file mode 100644
index 000000000000..8e18820baf13
--- /dev/null
+++ b/dev-perl/Net-Server-Mail/Net-Server-Mail-0.280.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=GUIMARD
+DIST_VERSION=0.28
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Class to easily create a mail server"
+
+# Some files Artistic-2
+LICENSE="LGPL-2.1+ Artistic-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-perl/IO-Socket-SSL-1.831.0
+	virtual/perl-libnet
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( dev-perl/Test-Most )
+"
diff --git a/dev-perl/Net-Server-Mail/Net-Server-Mail-0.280.0.ebuild b/dev-perl/Net-Server-Mail/Net-Server-Mail-0.280.0.ebuild
deleted file mode 100644
index ced7129aed08..000000000000
--- a/dev-perl/Net-Server-Mail/Net-Server-Mail-0.280.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GUIMARD
-DIST_VERSION=0.28
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="Class to easily create a mail server"
-
-# Some files Artistic-2
-LICENSE="LGPL-2.1+ Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/IO-Socket-SSL-1.831.0
-	virtual/perl-libnet
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( dev-perl/Test-Most )
-"
diff --git a/dev-perl/Net-Server/Manifest b/dev-perl/Net-Server/Manifest
index 0568191e5129..ae7fb5a1d274 100644
--- a/dev-perl/Net-Server/Manifest
+++ b/dev-perl/Net-Server/Manifest
@@ -1,3 +1,5 @@
 DIST Net-Server-2.009.tar.gz 146781 BLAKE2B 64c0040790531dd79740bb320223e6a0e1dae07fabeeeedf8e91da523701020a8f5f7c798868d5451a022f2ef53e3fce927e5389b0ca669f01ca6de9b1d780f4 SHA512 36409f8d2478877c68cbfcbe9c08045b0c24a926b64f022faf3de8f4b4369ff417d5c41ff1e9800553c38da29c6d72ef301119c956cb26439f6b6366ff4b459c
+DIST Net-Server-2.010.tar.gz 145901 BLAKE2B 2b2339064e1e2a6d3296a19a497635fb4fafb7884e15cc04f3328df349086cbea561247c9d53a140e3c43a25be366fec566133a0e51dec1a4bec0d83f0950665 SHA512 b4c1a85263e81c4ad6f32e28acb5176002ad591a1140dca060b706901758f48d3c63c4077606d772540e18fc6fa6772e71d213d0a4940e903c597b0e0f844365
+EBUILD Net-Server-2.10.0.ebuild 595 BLAKE2B 7b6734af931190df87af47cbe53cb171f577da9834947d569a6167abd6d9392da63d800304574c9f8bd7306071ce81c916a0b27a6d191573044cd34b9a77d310 SHA512 0fb462b21ec35e5eac1040cb322f8b1c2fcf992b4e89b45dc28a1ad15eb1fe3e7c7814a3bafcdcb45122734bf90af873d84c52e8728f4686ce287821c0ba7100
 EBUILD Net-Server-2.9.0.ebuild 522 BLAKE2B b38491c5b16e13d383cdfbd26df8397a814cbeb17fe29497841c84e204c3e8db0497db5514cccf001f5cfbb10353fa5e742e5ec7c40d065b12e44d846df33861 SHA512 6d6394657623d7d8407ead77909baa7ccbb1c414b7297d89d918b3b8d087451d09f37e9267334f1a8ee3b035fac5050bfdfba075e5481557f50fe3a80dcc99ea
 MISC metadata.xml 1989 BLAKE2B 86de38764702f73faaaef141c87d38b424183676402d77618940f0cc3e9f8f7a435d19c8430877c64c0fc924a2c0d2f1e46a153789b65fb40fc2c424fdf39666 SHA512 547744a9e859be23a32c7776267bd5bfea1e8333e46c09ab2d80061b70df1a7becd26866a219ed5fc201bd5be0374f5e46041361afc4be2c25e9c39db5baafcd
diff --git a/dev-perl/Net-Server/Net-Server-2.10.0.ebuild b/dev-perl/Net-Server/Net-Server-2.10.0.ebuild
new file mode 100644
index 000000000000..1a022ac828ae
--- /dev/null
+++ b/dev-perl/Net-Server/Net-Server-2.10.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RHANDOM
+DIST_VERSION=2.010
+inherit perl-module
+
+DESCRIPTION="Extensible, general Perl server engine"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6"
+
+RDEPEND="
+	virtual/perl-File-Temp
+	virtual/perl-IO
+	virtual/perl-Time-HiRes
+	dev-perl/IO-Multiplex
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+"
+
+# Parallel testing causes tests to randomly fail
+DIST_TEST="do"
diff --git a/dev-perl/Net-Subnet/Manifest b/dev-perl/Net-Subnet/Manifest
index 46214da897ee..731fa2f16ea6 100644
--- a/dev-perl/Net-Subnet/Manifest
+++ b/dev-perl/Net-Subnet/Manifest
@@ -1,4 +1,4 @@
 AUX 1.30.0-pod-spelling.patch 491 BLAKE2B b8ac6e5132ae00d69a18a2882473638481c27e8618cfcdfd6e6f6cd350f71b54e4e53fd677621b2f1ac6f65bb3c999bf6745080595fca559853359dc7d734c2f SHA512 0eb9cdd317f78fd2d49e5d90eed52538f00a24f9019c757acc2280bf5d21bc606999197806816acc665ed13a9456b8a53eeee81e41222f2b0b0959734a697dc7
 DIST Net-Subnet-1.03.tar.gz 4305 BLAKE2B 95f9a04920196c1161a26f7f4ad1fc4a88e564c4f359e1f000a2560399024ff3ad11c5eabd52e26c843bcb7f8c5ec1adabc127c362ba3e02e0cd524a883b32b1 SHA512 a28518e63736021c2c33959c13b54ec4dce0f43854f824c551b585db96ef001e62f6ce413cbc946aaa6cfa28cc4631973074c8980c1b0507f37390f4d8c70fd4
-EBUILD Net-Subnet-1.30.0-r1.ebuild 509 BLAKE2B 88b69f03d41d26892f3ee4e7993c65ed52422943e1ceb318d1ce3f8da49c1c064e48af7ec4e408acd59e163c2c677427d7e8fff65bc740d767ce08475f9f68da SHA512 671fbea58be4956ffb79df7c9522f0a1f164a72a14e3944a3b5f11693d6d8c521a2ef272e2a367a063c3408c5973c5466ffcbfa81d8440bedf360af04a67dcf3
+EBUILD Net-Subnet-1.30.0-r2.ebuild 511 BLAKE2B a63c75a7a7196ec8e1b437fec6708d6ed1d58b34666d5b2d2010a2d3480cff41005591721813a3806eb780cf9b5a18aaf0efe24228b9f7b8cdc9c9b8c304f75a SHA512 914813edf1314c2786a7585ec28b36df0cb370e99c00ad25e8d386255770c2a2f53f08e43134a67b91c39041dd20061d0cb5a475b3d6ec900dd4709dced0b621
 MISC metadata.xml 392 BLAKE2B 734c2f60ea9f274c323106afb4f802e8c5c054d15e2eed88457d11bb290d116d63eafbe759a60f6f91002fe85c24730566fb7611763c0bedb2d8a455c69ae116 SHA512 70c88d7ba867e8395fe5d129cb1d62908df39c968aa94ee8df3662d511a1a0cbe5698b72a9edde38310e752322fdb58396183e06fec590d6280229b9f69c64b2
diff --git a/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r1.ebuild b/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r1.ebuild
deleted file mode 100644
index 6d625e4a5ccd..000000000000
--- a/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=JUERD
-DIST_VERSION=1.03
-inherit perl-module
-
-DESCRIPTION="Fast IP-in-subnet matcher for IPv4 and IPv6, CIDR or mask"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-perl/Socket6-0.250.0
-"
-DEPEND="${RDEPEND}"
-PATCHES=( ${FILESDIR}/${PV}-pod-spelling.patch )
diff --git a/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild b/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild
new file mode 100644
index 000000000000..767da50d4694
--- /dev/null
+++ b/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JUERD
+DIST_VERSION=1.03
+inherit perl-module
+
+DESCRIPTION="Fast IP-in-subnet matcher for IPv4 and IPv6, CIDR or mask"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/Socket6-0.250.0
+"
+BDEPEND="${RDEPEND}"
+
+PATCHES=( ${FILESDIR}/${PV}-pod-spelling.patch )
diff --git a/dev-perl/Net-Telnet-Cisco/Manifest b/dev-perl/Net-Telnet-Cisco/Manifest
index bef03a469d04..8d8c785edf89 100644
--- a/dev-perl/Net-Telnet-Cisco/Manifest
+++ b/dev-perl/Net-Telnet-Cisco/Manifest
@@ -1,4 +1,6 @@
 AUX Net-Telnet-Cisco-1.11-no-interactive-test.patch 3561 BLAKE2B 32e91eb50abf5bb0460f41edd225b1d575f20dc56f8704427798f5d590d83ad117a59c2789748407919fb3f7f7c2f431ff39377200640092c0edabc80490a87d SHA512 b1e162b90a03a7cd1ce59898ed4a9575928216e9af0ef724df41fd4303c1b1a18218cbb45303c1e1588927cee4dc6d15b6e52c060abfa99d04f58ef74dfbc1dc
 DIST Net-Telnet-Cisco-1.11.tar.gz 19282 BLAKE2B 39925b96a8d709f58012c12ec368c48a54549a324ae0fbcdc4cf97daed034b6cb76639b3fda1c3b77824e5c702f6b8e5abc4093558888788ce6cac19342575c4 SHA512 b12da84517df470d40d56a54e8d8c7b331bed87c3c330da7fc1efb7d078805e6f7348f0b52971d3c1b4e3d39014d76bbe7535c40ad3afa7efcf567521ddf0c4b
+DIST Net-Telnet-Cisco-1.12.tar.gz 19338 BLAKE2B d2b03706942df56ef48e6946241e3805676cf895732ecec03a01b0ae1a4e76b2b811c3120b1017fdc57c9b0ed58baaf42dc7f04baac4605b9c43aa367ae7500c SHA512 c4bc41839d4314610ed3659add2c50a95fbfd46fcc71ed50b16490a7d2acd3e480696de15a2f56fdb9bbad43fc8fea1bb4d1c19bc35140239a192027d85803a9
 EBUILD Net-Telnet-Cisco-1.110.0.ebuild 865 BLAKE2B 8ea5a464950e5da3d220731b88d785e39d93b75f71c9174ea91a645995fd16768e3f22ca97159762e849fdb405594acd255ed7c8d47f3a8d669174833ad1a574 SHA512 041bfb170ce67b59e4abfd9d6bc5bc9f1f3cc97619fd07dc7877ef058eb507237a05a624dab0312e225168e3094dfc8bff0e5375bcdb5ec32c05cbe4345b0887
+EBUILD Net-Telnet-Cisco-1.120.0.ebuild 563 BLAKE2B a71eaaa7e49bbeb48f3b3f42afa548e1302376bb6b29a2caa7923cf84552b61dc21564b6b703c6bbf89982e9b7b340b93e42aadefdfa5d25baf2ad848e922407 SHA512 1e743cfe1e03d7e89079d276006601eb25364ed0ca1b1e2b73b8f0401852e5fa6fe8f9560a8c33395fd52b7979b5b3cb474e7de8e61cf5b47df319313c53e529
 MISC metadata.xml 405 BLAKE2B 69bc843b13f3d936e191bc1a233e73d7e53567a18e272199fe14b5959d594158835de317f754c2edd20031e1987ab1a67385e7a8f68f72e5059c76418da05bb8 SHA512 8d84c7d06d47dc52c1a9a8f5fa64bf013283a1dad3b3e112d3ed0c8a16d367e04eb5c12326f97448771ac9b340863ad5a11f51b6a427271d15f2f62029787c75
diff --git a/dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.120.0.ebuild b/dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.120.0.ebuild
new file mode 100644
index 000000000000..1a5b2ce7f66e
--- /dev/null
+++ b/dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.120.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=VINSWORLD
+DIST_VERSION=1.12
+DIST_WIKI="tests"
+inherit perl-module
+
+DESCRIPTION="Automate telnet sessions w/ routers&switches"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-perl/Net-Telnet-3.20.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( dev-perl/TermReadKey )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.11-no-interactive-test.patch" )
+
+PERL_RM_FILES=( "t/02-pod-coverage.t" )
diff --git a/dev-perl/Net-Telnet/Manifest b/dev-perl/Net-Telnet/Manifest
index 03eac2278a8d..2286fcd6d990 100644
--- a/dev-perl/Net-Telnet/Manifest
+++ b/dev-perl/Net-Telnet/Manifest
@@ -1,3 +1,5 @@
 DIST Net-Telnet-3.04.tar.gz 40731 BLAKE2B 4967d03713e06dc49af883b143f67682ee33e3bee05686060cca30852f6c848d0f817b67c30efca44f5a9df769e0934adc042a8336eca88a4f9ee4d0a2f226f0 SHA512 1df68f55ad94d42e5e2be5e0669c2ecd0bc916f4ed929453ee2d136141ce413ff84b883d488c2f815c2c43132f7c3b36178177072fc5172c292e7bc39351dbdc
+DIST Net-Telnet-3.05.tar.gz 42553 BLAKE2B f77717498345010a5d1345e91998830cfa57be055fd335987e95b3a633980a593a239ec5f4220bfbeceb3e192f5cca1701f9e046c28cf1de1842d8bd5b65eadc SHA512 3864e2e6f2fb314d2d80c37597dddc0f4fe6b50c3ec96be3d823667929852fadefd0572945b3b442afe8da451fb279ad335762eeb7d328ad7f8777d3bd8e5a74
 EBUILD Net-Telnet-3.40.0.ebuild 474 BLAKE2B 53203effd95d56452f2e616a3f0077fd5a8e67ec285e1c82182f15fdabad5346797993332e1b1385f4c836f9c9c9e7f7b29b8efe33cc5d38189ac68cf0f000f0 SHA512 6ff59b82dd5884c7addbb3f3142af7533b3cb19bf51dead2239fee4a4440227bda6b8f32ef80d5ab84bedf742570a2824f62ab2d7742aa11a923486989f1b5f7
+EBUILD Net-Telnet-3.50.0.ebuild 472 BLAKE2B 8dee20edd99a2d60af1b6d1a139c329e07e3211dadfdd1ddd638aa0470687ee7abf65d86094ebce4d0f8f3aa7630cde7e0bfaba8e7c233ea169ee2a604f528a1 SHA512 68df46c88410b8702d17b7a27397483b2571e778bcbaed2388bc096f529a334deeab288a5b922e2cadeef9e89813b7d41435eb7bd6deb322cccf0800b1dfd2a9
 MISC metadata.xml 392 BLAKE2B c796a42a64667bb07eafed7abc3d7e5e9d46e22040da6a7a268a4ed60ab08d0a84f641c5224b60dba727d40fe7df943725f224fb31cd3c3f2bf372b9a72a5e12 SHA512 2eba3ef6ece516e572449b8d392efea1efaece9e209ac50387af1156eda499b474101ac1a65e53b5cecb9c4b46337aa754a040ace72290136c8f868b3cf98248
diff --git a/dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild b/dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild
new file mode 100644
index 000000000000..39cb096666b6
--- /dev/null
+++ b/dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JROGERS
+DIST_VERSION=3.05
+inherit perl-module
+
+DESCRIPTION="interact with TELNET port or other TCP ports in Perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND=">=virtual/perl-libnet-1.70.300"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Net-Trackback/Manifest b/dev-perl/Net-Trackback/Manifest
index 8b03c415e747..091d4db57654 100644
--- a/dev-perl/Net-Trackback/Manifest
+++ b/dev-perl/Net-Trackback/Manifest
@@ -1,3 +1,3 @@
 DIST Net-Trackback-1.01.tar.gz 9067 BLAKE2B cc56cffe541eacd030a27d703235571278c3702380e9ee6d4ecfa938654004e6dda22c946740c5e67e087adb5ff60aa2bb5b043caa819c3881bf1093c6c797b1 SHA512 4936734bcd44c14383d7b6ec6899ebeb048a46ba9f82e337406ef52e2803a52ab6203588d6a36e30db77cc227b6b59257f8924031c6234c45cfa9b305f51b588
-EBUILD Net-Trackback-1.10.0-r1.ebuild 393 BLAKE2B 3c2074188e7c0b2c996eb8a598d668cbfe57455736cb15e9a250962ccc4111e34f7195c8186a1a39410149bca953014acf2a2656095edad699479646ae91547c SHA512 40db99fd21243183ab56ae92dfc3ed51c395d2f6b31f79d3abf07a0e6deef2764769ffdca1cc4dc6a07af91459cd6e153969eb7e25d02f0e10df5c61c09d94ee
+EBUILD Net-Trackback-1.10.0-r2.ebuild 386 BLAKE2B 64c0e7a29bf9444d52319d54bc96bb294cab3171fbcd26c39a80949a37ff82da5100d9b918ccd15dddfea10932801257befbbef3966b753e43497fce9937c679 SHA512 00fd29c92f6365eedf1fdb7d2f06a1570b0a619a2ea5336187dde18d541fe7662407da88b28071c69eae2cfb51b5363663ef06181e427fe3d64caa32fb0a8b34
 MISC metadata.xml 718 BLAKE2B a146b6c250cdf52ea32ca8b0a1eb45ba746c0dbcab1354f22d0d7923343199f2d5e9d4702326be264fb1db36ef15da07029609da30bcea88b6a594549fab2124 SHA512 9fe122bc2d32d3303a716e0ee5306acd62b367b4173205de4a516434712f4e361671f0be894733df938cb1ecd7289a03b0e2d5963e4ce9bec3286cb5454044d6
diff --git a/dev-perl/Net-Trackback/Net-Trackback-1.10.0-r1.ebuild b/dev-perl/Net-Trackback/Net-Trackback-1.10.0-r1.ebuild
deleted file mode 100644
index b72ac189d876..000000000000
--- a/dev-perl/Net-Trackback/Net-Trackback-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_VERSION=1.01
-DIST_AUTHOR=TIMA
-inherit perl-module
-
-DESCRIPTION="Object-oriented interface for developing Trackback clients and servers"
-IUSE=""
-
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-perl/libwww-perl-5.831.0
-	>=dev-perl/Class-ErrorHandler-0.10.0"
-RDEPEND="${RDEPEND}"
diff --git a/dev-perl/Net-Trackback/Net-Trackback-1.10.0-r2.ebuild b/dev-perl/Net-Trackback/Net-Trackback-1.10.0-r2.ebuild
new file mode 100644
index 000000000000..2d7d05b52520
--- /dev/null
+++ b/dev-perl/Net-Trackback/Net-Trackback-1.10.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DIST_VERSION=1.01
+DIST_AUTHOR=TIMA
+inherit perl-module
+
+DESCRIPTION="Object-oriented interface for developing Trackback clients and servers"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-perl/libwww-perl-5.831.0
+	>=dev-perl/Class-ErrorHandler-0.10.0
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/Net-Twitter/Manifest b/dev-perl/Net-Twitter/Manifest
index 38cf09b739bf..0fc37d518b99 100644
--- a/dev-perl/Net-Twitter/Manifest
+++ b/dev-perl/Net-Twitter/Manifest
@@ -1,3 +1,5 @@
 DIST Net-Twitter-4.01042.tar.gz 139311 BLAKE2B 794a5617113454082a8c61da1299091d399231a4ab0ef9e5d105ee05cf9f6e6adc106599f98cf4202b12dbff66e4df2be42f008665376bc7dd61cfefac2037f9 SHA512 2b64116931a1adbae45716ad7cdf5e6b233780fdbc66c80b0b4954e5b5d869f0b2665e2fc3a8318f70a2ecbf1838726b4a264bf3919e69a20549599bd651ab1d
-EBUILD Net-Twitter-4.10.420.ebuild 1379 BLAKE2B 8f8c349c4bbcb47258285093aa704054d4c8974bacc6a969a7353573f805df43fa9c78b796af58b30a9e741b490e23768cfeb603abeb43aec02a974259f156dd SHA512 ff612c3054c2952608326966e98adb3ba387b5b93cf3d7ed22395776c21a0179738f48da52ffb3078044b2b7e943fb45859d2e3c8fdb840ba9f29d1c3d4a63da
+DIST Net-Twitter-4.01043.tar.gz 140431 BLAKE2B dcb97df53809ad65cbf594dfb22339ba07fa1c5c42db9ff3e9af9cbb84bb81677f07f47ab3baaf818bc65e609b28f45cd098a826c111c2979fcd1a2179342378 SHA512 498c83328064205b50923cd4d628b434dd32f62be649a00bc9776649b98f8b571cc6924671655c3460aaa0b362f76629c5336eff96d88b8aef45f6bc547a1790
+EBUILD Net-Twitter-4.10.420.ebuild 1379 BLAKE2B f9c0ed222d17705c0ace91c482ab59959d945f20354b09a8c46c7ef673e8db6a60220706e349bb5508c21c42bf78a7f91be0a4adc8a4201a37d237c1bbf5de0e SHA512 d0538954915341d0fbc4a6e3fadf9c051b4b4839b9965018f2bcf68a8c5855750d90c397701c41b5e290be0c6cd451f43de32c904569a1f1cf617f7f26af6b86
+EBUILD Net-Twitter-4.10.430.ebuild 1355 BLAKE2B acf3799e0d9deb09c3f1462640213c3c2046cde7c2cbd4a6210ce259a3be9f99f86ed118defe3eebd49f6e7543734f6f66f21c9aa00d19a6ad26ab37fa8bb726 SHA512 f4ecc42cf34d2eff12aacf2e84c0bce6978075ca5ef8a4234a230ffef1d40a75da95d053f9b3805d7febe342c91553babcbaed1f295ccebc3d14c60ef0234376
 MISC metadata.xml 2405 BLAKE2B 8671daac93c8eb74d49aeb717dcde57b59cde38765a1f076154d27ac369699288462cf74d6f6d91e76f9d2cf06e2370c1d9fe5d02d3d3f7d473affe052529f2c SHA512 e3317b3d4c61cf66fce6aaa4466387aa5dd34cf7500ee9a2ba8bba5bf65e6ce4ad13a0261da21be4c7a6f7bbd7a69b74677aac59bf1e852e5d4876edb7337e1c
diff --git a/dev-perl/Net-Twitter/Net-Twitter-4.10.420.ebuild b/dev-perl/Net-Twitter/Net-Twitter-4.10.420.ebuild
index df3657a02c18..ed7253786a1b 100644
--- a/dev-perl/Net-Twitter/Net-Twitter-4.10.420.ebuild
+++ b/dev-perl/Net-Twitter/Net-Twitter-4.10.420.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,8 +33,8 @@ RDEPEND="
 	>=dev-perl/Moose-0.940.0
 	dev-perl/MooseX-Role-Parameterized
 	dev-perl/Net-HTTP
-	!=dev-perl/Net-HTTP-6.40.0
-	!=dev-perl/Net-HTTP-6.50.0
+	!~dev-perl/Net-HTTP-6.40.0
+	!~dev-perl/Net-HTTP-6.50.0
 	virtual/perl-libnet
 	>=dev-perl/Net-OAuth-0.25
 	virtual/perl-Time-HiRes
diff --git a/dev-perl/Net-Twitter/Net-Twitter-4.10.430.ebuild b/dev-perl/Net-Twitter/Net-Twitter-4.10.430.ebuild
new file mode 100644
index 000000000000..451730b1e0f1
--- /dev/null
+++ b/dev-perl/Net-Twitter/Net-Twitter-4.10.430.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MMIMS
+DIST_VERSION=4.01043
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="A perl interface to the Twitter API (DEPRECATED)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Carp-Clan
+	dev-perl/Class-Load
+	dev-perl/Data-Visitor
+	>=dev-perl/DateTime-0.51
+	dev-perl/DateTime-Format-Strptime
+	>=dev-perl/Devel-StackTrace-1.21
+	virtual/perl-Digest-SHA
+	virtual/perl-Encode
+	dev-perl/HTML-Parser
+	dev-perl/HTTP-Message
+	>=dev-perl/IO-Socket-SSL-2.5.0
+	dev-perl/JSON-MaybeXS
+	dev-perl/LWP-Protocol-https
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/Moose-0.940.0
+	dev-perl/MooseX-Role-Parameterized
+	dev-perl/Net-HTTP
+	!~dev-perl/Net-HTTP-6.40.0
+	!~dev-perl/Net-HTTP-6.50.0
+	virtual/perl-libnet
+	>=dev-perl/Net-OAuth-0.25
+	virtual/perl-Time-HiRes
+	>=dev-perl/Try-Tiny-0.30.0
+	>=dev-perl/URI-1.400.0
+	virtual/perl-libnet
+	dev-perl/namespace-autoclean
+"
+
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
+	test? (
+		virtual/perl-Carp
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		>=dev-perl/libwww-perl-5.819.0
+		dev-perl/Test-Deep
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.980.0
+		dev-perl/Test-Warn
+	)
+"
+
+src_test() {
+	perl_rm_files 't/99-pod_spelling.t' t/author-*.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Net-UPnP/Manifest b/dev-perl/Net-UPnP/Manifest
index 9cb74e715778..576e951d599e 100644
--- a/dev-perl/Net-UPnP/Manifest
+++ b/dev-perl/Net-UPnP/Manifest
@@ -1,3 +1,5 @@
 DIST Net-UPnP-1.4.3.tar.gz 19169 BLAKE2B efb6145e0d39b111568cc452a8f707e747ec75a91cc0ddb3ed48420550822dced164904ae716f72d7ce0b43cca38202cb424ec3c2b77f44da2e97eac557528ab SHA512 72c8733402a7fec1ca24523dbf4b9d7baf0c1bcae44a36bc8ba2193cb40396f6285584c6fc11a961003477a9abbf0a4e2da9e1876e341ddc52da7850540fff8f
+DIST Net-UPnP-1.4.6.tar.gz 19614 BLAKE2B 40499451b7fdbb1d95d275234b717692c7b0eeeb9af67af7b6c3895c1f22186fd05f7945fc6e1715184106eab01a7463b67f6f361634a0727931eabc013d285d SHA512 0cc31576b867420cc7ba684147224daceef3a900066194ca6fc507a8ac309dc2186d02ecd46a4d18e50cd2cb9e6074c31e4fa6b55406657c057c80481f691055
 EBUILD Net-UPnP-1.4.3.ebuild 650 BLAKE2B f5248f92508cba2fe161e178792fed7eaa0495013f56c7ca2137d7e8c66bc55e05966830bab3e1e0ab32f95b93da6ec3ac2dd075c8fb265e93b22214654f46e0 SHA512 6bb043a661f76198c5ada500ecb920ad9884c59dd89db82b76771d9b03ff1ff42844c8181e396c214621554f174546f6206c49656565b7f25a9a195030883040
+EBUILD Net-UPnP-1.4.6.ebuild 594 BLAKE2B 2f24908a420c0ebde4042d7196952103c6cd05fb8777f69c60c877810edf75c50ec59e10a3ae4e1e80afe9f08628eb9cad8b315081a620ed2a9b5abb9b45febf SHA512 a17fc5d43a4c27f8096550da280f63e062ee7ab37eea11bb939908377b65d7be60b530ec178961e2ac862c8d2dc39ec430554a9cd29a189274cf8bd21526e62c
 MISC metadata.xml 1285 BLAKE2B 975e7e3cebbdb9d9c10bad3097661110f9deaa086f06789904d19b746b024f48c447d2be935ff748b9d814f0783dcf05903bfada7c0427aeccbddcea6021c23e SHA512 d413c2c506ec14491115b0c9c85abd922e0879772a0eda6676263adcc0e615f176afd77e22e538517c32234a20ea9ebf0f4532f5e9f15f1d2c8ed88a8d48b04b
diff --git a/dev-perl/Net-UPnP/Net-UPnP-1.4.6.ebuild b/dev-perl/Net-UPnP/Net-UPnP-1.4.6.ebuild
new file mode 100644
index 000000000000..676dac267268
--- /dev/null
+++ b/dev-perl/Net-UPnP/Net-UPnP-1.4.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SKONNO
+inherit perl-module
+
+DESCRIPTION="Perl extension for UPnP"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-solaris"
+
+IUSE="examples"
+
+RDEPEND="
+	virtual/perl-version
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_install() {
+	perl-module_src_install
+	if use examples; then
+		dodir usr/share/doc/${PF}/examples
+		docompress -x usr/share/doc/${PF}/examples
+		insinto usr/share/doc/${PF}/
+		doins -r examples/
+	fi
+}
diff --git a/dev-perl/Net-Whois-IP/Manifest b/dev-perl/Net-Whois-IP/Manifest
index d6e6bd16efcc..8200ddbb48b1 100644
--- a/dev-perl/Net-Whois-IP/Manifest
+++ b/dev-perl/Net-Whois-IP/Manifest
@@ -1,3 +1,3 @@
 DIST Net-Whois-IP-1.19.tar.gz 25192 BLAKE2B 41dff899207f548a4a3fae1c011c6d46692ec14a601fc4bebe0f976371ab5a170db64db4e330c706832142a0577bdd57c9261993e9c354877dbe46f44c739f86 SHA512 80d1be9dc6c8e9da74df97524f1a804f6ab64f1e016509944b1ba970c2a508e46cd6d633c6cfc2e9fa5d3fc8240500f81cbc90a27bdeab26cb7b590ba97758ae
-EBUILD Net-Whois-IP-1.190.0-r1.ebuild 1208 BLAKE2B 2a26220d690974ab226e275108658b286cf4da96f1d4025e04da5446d7f6b3881a917e926af31488c20f9a97b37567603a3c2e10267182bcee24e5391158d93e SHA512 dbaa8220a9d1554b8d57ab0708d06b78fbd5101fca04002318f92456631228d668ccf7c6d922a47063be14e8f9323406747282630ce7841608b5bc24b079c71a
+EBUILD Net-Whois-IP-1.190.0-r2.ebuild 1201 BLAKE2B fae491abcbf09531c0c051d17a7144362c4c60bef21ed6bbfa7f25681248e686658c927b3a19ebe8d3ada57155497169636cf301b2ccf03800877b317feca09b SHA512 055e0b7d2a58393edc0d6f43add5286968e2f43ec3a2f5d044b3b56e0d5c87d1e1db3cf3be8038eacecf76bb01202772f529e63031b9fe9f460477a1d69a6de5
 MISC metadata.xml 511 BLAKE2B 95f9e9610aa9ef5e95ab37f004f7fa0fa841ecaa6d5838b276fa738138bb5ce3169e464f126fd156ce503ce3a5feb1d660b4ae9ede9eca8f01ac253280cc12e2 SHA512 98c89481190eb891b08446f738e696898f9d7ce6ceaa6b852bbbf3d90aafdc5b7c224d75c537f5aae1da8f1c999cae9bcea0fd2f8eb8ac8efe9b1cb00957e122
diff --git a/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0-r1.ebuild b/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0-r1.ebuild
deleted file mode 100644
index 32f794ca21f1..000000000000
--- a/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_VERSION=${PV%0.0}
-DIST_AUTHOR=BSCHMITZ
-inherit perl-module
-
-DESCRIPTION="Perl extension for looking up the whois information for ip addresses"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-PERL_RM_FILES=(
-	"test.pl" # gets installed otherwise :(
-)
-RDEPEND="
-	dev-perl/Regexp-IPv6
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-src_test() {
-	local MODULES=(
-		"Net::Whois::IP ${DIST_VERSION}"
-	)
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-	# # All tests defined require networking
-	#  and all fail.
-	# https://rt.cpan.org/Public/Bug/Display.html?id=110961
-	# local my_test_control
-	# my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
-	# if ! has network ${my_test_control} ; then
-	#	perl_rm_files "t/test1.t" "t/testx.t"
-	# fi
-	# perl-module_src_test
-}
diff --git a/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0-r2.ebuild b/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0-r2.ebuild
new file mode 100644
index 000000000000..c6978b286737
--- /dev/null
+++ b/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_VERSION=${PV%0.0}
+DIST_AUTHOR=BSCHMITZ
+inherit perl-module
+
+DESCRIPTION="Perl extension for looking up the whois information for ip addresses"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PERL_RM_FILES=(
+	"test.pl" # gets installed otherwise :(
+)
+
+RDEPEND="
+	dev-perl/Regexp-IPv6
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+src_test() {
+	local MODULES=(
+		"Net::Whois::IP ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	# # All tests defined require networking
+	#  and all fail.
+	# https://rt.cpan.org/Public/Bug/Display.html?id=110961
+	# local my_test_control
+	# my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
+	# if ! has network ${my_test_control} ; then
+	#	perl_rm_files "t/test1.t" "t/testx.t"
+	# fi
+	# perl-module_src_test
+}
diff --git a/dev-perl/Net-XMPP/Manifest b/dev-perl/Net-XMPP/Manifest
index 17d0bb21554a..62e132d39a4b 100644
--- a/dev-perl/Net-XMPP/Manifest
+++ b/dev-perl/Net-XMPP/Manifest
@@ -1,5 +1,5 @@
 AUX 1.05-no-dot-inc.patch 3578 BLAKE2B 7fea81108b326bc20a3bb804cad1a75dd6d8ae590bf392612f2745c4e95cdfebc73603a5b3178f74846372e5dce8258974548c63a53a3bbd329e8e38e1e0bbce SHA512 01c8572fdef916ff937d36356d308c441cb2512f34fd1a5e2458b02b9f9c79619addea75b108a5030668bb50f8f086c9f4b51faf1e7e16722d535335634ec405
 AUX 1.05-no-network-tests.patch 1569 BLAKE2B 68d736865c0f727c03b64ef1dc8654a903f8098056fb9d7b1975ebdb5f2b4e0c7493d712d2fe35c1bd5533e60cfee475e321b37b24f3d7d773df0134aa7c2a5b SHA512 a51cbbacd06b94a94881b5b36164d596d5ee2d9818fc1ae544ddc7468cb92f0c7041863cc9aad4eb16c9885bf4b946e8bfc9ef7087280417651b8c5d7f79dc56
 DIST Net-XMPP-1.05.tar.gz 103876 BLAKE2B 5ddc98125b26518c59aa4ab39a974b9cbf1575bd59bb66d5329a43e1d5c3d150f34cc93f545f2cd56846e7b4e46142c47aff7da9b279181a02a57bf95ff1757b SHA512 cdd5474fcbdf7ff6c7d1247f9828f5dfb1828c258af366a831bab8e5faab423b73aa16c34228818526ebcc3180ef0ccc52d6e6cb61e2fe689458b87ec7fab699
-EBUILD Net-XMPP-1.50.0.ebuild 811 BLAKE2B 087f18925b7f8c2400db484cd8b2973699a564f57136165bcc7d8972799a635664efd036894bd612916e1b620144a20057d1ce7991a14c85a241017849c861bf SHA512 e9ee769c4595e20509467af5c86b58b476c2c470609188747c6ea4a13a9ddebb38b83251f84cece1985b20cca12eb7cf4803d11c83cb54f164267f915e9d1b1d
+EBUILD Net-XMPP-1.50.0-r1.ebuild 774 BLAKE2B 913159af15306aea67db2fcb1075132c43ed597812b547a4fa0fb606f9d9179a9f30aa47f49f99694b7ece2f248d0fcac9685145dffbb0ac5475627b176e8408 SHA512 dfc3f1f51489e455a40f06a0510b5777cb18e6639c9623c99bd18907b62739fb95dc753e2d9d8a78134b15e22a32f538c4bf4d9fdb17b2400e30519696402355
 MISC metadata.xml 1305 BLAKE2B 2ec03661e185b80764b28cce46f08bef4817cd3c1b2244b8222c1f5eb507afd77e143d7605b38cdf221639b8b1f13a959bf42dfce3da0cb0857e3112913f74f8 SHA512 4a016ed35a0d553609a3ce69b71095c00064f39a1960dad6bf53da42d3d9e65ee4fa7256128b5af2ca40779a69b28ea02286b6b0427a9692639fa8575c9068bd
diff --git a/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild b/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild
new file mode 100644
index 000000000000..2a739dddb436
--- /dev/null
+++ b/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DAPATRICK
+DIST_VERSION=1.05
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="XMPP Perl Library"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-perl/Authen-SASL-2.120.0
+	virtual/perl-Digest-SHA
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/XML-Stream-1.240.0
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.360.300
+	test? (
+		>=dev-perl/LWP-Online-1.70.0
+		>=dev-perl/YAML-Tiny-1.410.0
+		>=virtual/perl-Test-Simple-0.920.0
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${DIST_VERSION}-no-network-tests.patch"
+	"${FILESDIR}/${DIST_VERSION}-no-dot-inc.patch"
+)
diff --git a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild b/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild
deleted file mode 100644
index 82a2b51c041b..000000000000
--- a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DAPATRICK
-DIST_VERSION=1.05
-DIST_EXAMPLES=( "examples/*" )
-inherit perl-module
-
-DESCRIPTION="XMPP Perl Library"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Authen-SASL-2.120.0
-	virtual/perl-Digest-SHA
-	virtual/perl-Scalar-List-Utils
-	>=dev-perl/XML-Stream-1.240.0
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.360.300
-	test? (
-		>=dev-perl/LWP-Online-1.70.0
-		>=dev-perl/YAML-Tiny-1.410.0
-		>=virtual/perl-Test-Simple-0.920.0
-	)
-"
-PATCHES=(
-	"${FILESDIR}/${DIST_VERSION}-no-network-tests.patch"
-	"${FILESDIR}/${DIST_VERSION}-no-dot-inc.patch"
-)
diff --git a/dev-perl/NetPacket/Manifest b/dev-perl/NetPacket/Manifest
index da2ebbcf5954..5d2ec11f1b29 100644
--- a/dev-perl/NetPacket/Manifest
+++ b/dev-perl/NetPacket/Manifest
@@ -1,3 +1,5 @@
 DIST NetPacket-1.6.0.tar.gz 36685 BLAKE2B d612ff6209bcf6be67c23643cdb8a11a6884ef0c25a795e34482283d2f8664b2730586326b0f3560f67798f741c7645fc5a62d6f8c53738f269b11720ef11d4d SHA512 9482b35294177fbf0c67474f0b14c87b3d8fb61497cef2c65fb942ff9472dc527d24a68fa8656ca71a0ddd73edb4a02240341177a36c4ed0e9b832b20b120349
+DIST NetPacket-1.7.2.tar.gz 47544 BLAKE2B d0ee3567875bb363534a01526e962a0194383f169be01c3532f5b1f80b702bd846321c614dec0c73488624b32aa1e876c55ef9515c5f2c7a291f7beb016bc9c9 SHA512 94fb9b99f8d5443cce76c943ab562b44ee07448b0fbdd86bea35e0dc1aeabbce3871d7115f68c8ca013ad71390c51f2d5233a8f4ad71d796920c3f286cecf4c5
 EBUILD NetPacket-1.6.0.ebuild 541 BLAKE2B 0090f25b311ff5abc95182defeb623339d2754ef58e880abd76f16d8e8d18ad47e75c6e103665445e060a3f305900f789788d8959a5a33abcffe5b75715a6162 SHA512 2e6fa826c51178659125db3799bae11a4623a52d57ea320e7c518ea89a2f1dd0354f21d1ce28d0c48553eed863a66e6d1f8fd09a6c327a9711deaecb07979835
+EBUILD NetPacket-1.7.2.ebuild 479 BLAKE2B 743124ce525b763673a82dda6bbcf1d49eaabd3e9d9204b20308abc31998af4fd72310c4814846adad08ab28ab6136501e7f9f65d470a8666491bedbf7ac2201 SHA512 62e46b9d2c5545f445da6fcf582a56fb1849171a508cb73eddce416df2c80b7d29a1172920c6a15d4a06dfd208e43bcddba6e34358f39204557a3e106deda2a5
 MISC metadata.xml 822 BLAKE2B 548e7c05840f95d51cc2299780210107b1d98891fd2c00a6476c65c626ecfdc23f86440947e8355f935290d1a9fbaca293514f3647485e4891e07f23c1e7caf1 SHA512 1e1fc3f126a68716b196041e9c972544338ba7b9b94910d6d263d803fcbd5ff4425e46bccc60faaca30cf768dd3630e650b77114309d2b09f6d8b5bc6a0c46e8
diff --git a/dev-perl/NetPacket/NetPacket-1.7.2.ebuild b/dev-perl/NetPacket/NetPacket-1.7.2.ebuild
new file mode 100644
index 000000000000..8c554fd08884
--- /dev/null
+++ b/dev-perl/NetPacket/NetPacket-1.7.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=YANICK
+inherit perl-module
+
+DESCRIPTION="Assemble / disassemble network packets at the protocol level"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/OLE-StorageLite/Manifest b/dev-perl/OLE-StorageLite/Manifest
index 33830dc2d6f2..e462931c3a35 100644
--- a/dev-perl/OLE-StorageLite/Manifest
+++ b/dev-perl/OLE-StorageLite/Manifest
@@ -1,5 +1,5 @@
 DIST OLE-Storage_Lite-0.19.tar.gz 21952 BLAKE2B eec82ca4dfc28d82d3e709d778ba9dd693632d6008344ca8164ad32856790c8d624e5380cdcff32c9d5d734634d96e42025cbea51aeba7d96ee52397f93e553d SHA512 d59030ccdd519e14d0e84dacdce7a627d71d53c755c8aedbf903a3b78ba769d0b98fe6e813eeb8e6c35e45d5a1c19d519fa5792b183b8b2ec1de8fddccaa534c
 DIST OLE-Storage_Lite-0.20.tar.gz 22586 BLAKE2B 7cbcb9a249a3d7e131e3aecd9821cb57242230f14b3058ebaed0d956d2d4ecc2e7f1d7aa40aeff01ff581016beaca75ac92456923b98dbe7932ec37374ec678a SHA512 bcf89c561e02c850f6d5d27705dd671f0294e4a903cf7863f9dbf536203dfb3148ca4fa88ef91a429b96142bf1ae040989d8850fd171448e0db5dc9ae7fc1877
 EBUILD OLE-StorageLite-0.190.0-r1.ebuild 469 BLAKE2B 93f81fc37ff66a4e4ac5dfc58db0b0caff82d8910e8cf1a057940bbf4b15de65b1be5572c703c6aac2c2f0053f71f525202ff9d895cd003ee75e8bf3523c0923 SHA512 d091ac8005fc10618000037f2ba439fc1a7a7d89a4da5233be1be852cee450af77b208c4f545d0d5e5fb4f27b850badbb4f39db9fd307e74cff97e1799fbdcfb
-EBUILD OLE-StorageLite-0.200.0.ebuild 462 BLAKE2B 794d8c44b415b9797c2e40906e2e229fd803d52f18169c802e9a9018a9fd54f8aa23778b7dccc8f1e3a6aafbc2de81a092a47e2f66e755c02b0d0736b8bd948b SHA512 43e28e250b32f2de54d4d36a79c28663ad47ada7aa183d66e301fa7b922de0a4b5f1059e16171a776cf26689158b1fd416b9b2baac9604db8b2f423e49874c86
+EBUILD OLE-StorageLite-0.200.0.ebuild 469 BLAKE2B 5c8df2dd94a63488da9ef6b79c1c17f5da2eb0bf00d7d3804dbdc9a3b0bbe98bedca12c5e2e70c03f921d612157023ebe91335fc91620d1de915f4c24bd00144 SHA512 0bda4a72c4b2caed8da881c02f93752b23748d71688cc06dbc55df824a70be2af98bdf97e518939ec5cdc99c40673be02e2098f144ef038c30ffbe201baeedf2
 MISC metadata.xml 697 BLAKE2B 56c4bfc48ec655cc65dd586b208d40a8a35b30c88258337613b8f814b303398225972f66918b28bb288bf460f97ce415a12c5c10caf1aad8a5f4b94faed196a1 SHA512 ba17c8b1852db1f8575304e726d20921b69e42dca2c1bd05a30b7cf5af3e1845ec818e4297f72d6a98d0f40679fb6feec5d9fc7781e0383abea4ad365a0ebf9a
diff --git a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0.ebuild b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0.ebuild
index 411fb0e477f4..864aeb710cd7 100644
--- a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0.ebuild
+++ b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0.ebuild
@@ -11,5 +11,5 @@ inherit perl-module
 DESCRIPTION="Simple Class for OLE document interface"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-perl/PDL-Graphics-Gnuplot/Manifest b/dev-perl/PDL-Graphics-Gnuplot/Manifest
index 647ec0560461..a5b1c89032d0 100644
--- a/dev-perl/PDL-Graphics-Gnuplot/Manifest
+++ b/dev-perl/PDL-Graphics-Gnuplot/Manifest
@@ -1,7 +1,7 @@
 AUX PDL-Graphics-Gnuplot-2.13.0-components.patch 3302 BLAKE2B ab21bfbbe94e5a21c26a6ca10df4d09da6fdeb02e51067b83de1fcd4cceba8bc25c8e2ad5bc6e1adb78c55da018c2eaec4e56d0d387ad9730a0d3c4fbcac9832 SHA512 2060348e3361fa0c7ef9a1f3b3f5bed9b3f5e0e5da4bac70599d9b8601ea3bf033060c993fa7b15b804230894be62319d81451a667539f1c852b9970d581665e
 AUX PDL-Graphics-Gnuplot-2.13.0-titletest.patch 1010 BLAKE2B ad3e266a4de85b6046cd6b6c62c2b053f1dbb3045940adaaf0a256c943df427bdb724cc6f95827733e912c88a3786827e86559a0886ef6b5bfbb391d57358908 SHA512 75c3c05dbbc63d3dfbe7dd72ae3832fef4871ef75b46dae5bbf0ed3f61658767c39b9e2ad92300c92ffd6c67c674b3cc2d5c80db87c0ed95c5fbd92ce66ebd3f
-DIST PDL-Graphics-Gnuplot-2.013.tar.gz 149855 BLAKE2B f5ebe0ed1da97c4811b6d6fd52f9c5148efb0c8cb2fa3954134160221c074842c24e92460686b39011f245ca2bec27f4feee822d6f33a383bbff671445816682 SHA512 1cf184f0e4df1f3e42880f24acecdcc95e99bf9340851e0b6c258dd89d759c49852a7db5f83aea8a3714d85ac659d03b0f68e6853d58c7eb2efde6da6423f1f6
 DIST PDL-Graphics-Gnuplot-2.016.tar.gz 149882 BLAKE2B 2c2359d65643f72fac1249650be8343786415a72fd074ab426211e1fc933ce6a02ce789b93820c2a41a687d429b264ff743a3aa39e3df12c1a66de47115167f7 SHA512 3e82a8a10b7b48567e0746238c4b718e491f39afb53b965ae72a4e2aa0567914856bf6343ba3d571fdb240d284fc95570c51c4042d9bbc0e5de8aa6f7aaa21f2
-EBUILD PDL-Graphics-Gnuplot-2.13.0-r2.ebuild 758 BLAKE2B e20a31c6899518c8b076db63a61e9d40bb1beeb9c4cc93a6796ae6709c8164530d56e1510d8a1251173d0ebb9d261afcd362b294dd49c98838675e79ea7d6a29 SHA512 259b87fc8a894500a272ca6cb3cf28e98811e8e85f63b3f2a27476a4c752376b20a4adbf9661e8e6e474b0905fe43ff01d0f555c56ce5a0e460d0f229c738580
+DIST PDL-Graphics-Gnuplot-2.017.tar.gz 150197 BLAKE2B 22903f3d08a4d7268f3c024880ede8650f4e101c2ebab162ab0e2241f3a64b713fa740c212043332f981417686acd5478cd06b1bfdd6c6ac301372bdc8333407 SHA512 41aa5b5c6dcd77b6e6109971173f5c25d69b72fd01ef4d72f7c2d86c248a69ee63bb6f20420e766778b29124a5a0ebd1d964d49c4d802d502b4a0bbb1765b8f9
 EBUILD PDL-Graphics-Gnuplot-2.16.0.ebuild 673 BLAKE2B cbf1c84ebd58dde59768d082898b998193d95534cea96c00d87f1e0da1f3e3f00db035b23555055ee851659661d06bac3a2ead1801d9fb23934cc7a523da74f5 SHA512 ef3449d5ad520a9acfcbae52474d1e1a30a3dd4649da75efeac4b70a99ad2d50f35a02f8a60276c2a5ed6e1902a90aa6080bf74a9d4d765bb6f62a55123faaf0
+EBUILD PDL-Graphics-Gnuplot-2.17.0.ebuild 633 BLAKE2B 6f2d5f0ca32c2363a83feb05d53016ffa8df03c646be346c57b598731200198bcefc2c1edc87d5530b04e2225e26f2a618bea67b4e2c802fcde1ab21bd97d210 SHA512 2270bee4844ffa72b5487747b69a3cb5ae4233a5fd44cf49a36d6201a97af598a7932c4dfb23c58546ea00c960fb57bf88643cf72f4300a917e97e177e39ba12
 MISC metadata.xml 485 BLAKE2B 15f0bef37016030b3116f19f5bb637e9da8c7d86144bb0d1806fc1fc1969a3e5126fb864d8b4193bc64810e5e3385d64b2e3296c5cad56778820709b78197257 SHA512 8ed658238efaa82d1e5b3249bd3368446bd826cafeb362c068291cb8325efeb266d37efb7d76820081f1bd00367491260f373097be4d1639b781bfee9428e3ef
diff --git a/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.13.0-r2.ebuild b/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.13.0-r2.ebuild
deleted file mode 100644
index 0eaa42ebeb4c..000000000000
--- a/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.13.0-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_VERSION=2.013
-DIST_AUTHOR=ETJ
-inherit perl-module
-
-DESCRIPTION="Gnuplot-based plotting for PDL"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Alien-Gnuplot
-	virtual/perl-IO
-	dev-perl/IPC-Run
-	virtual/perl-Scalar-List-Utils
-	dev-perl/PDL
-	dev-perl/PDL-Transform-Color
-	dev-perl/Safe-Isa
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	|| ( sci-visualization/gnuplot[X] sci-visualization/gnuplot[qt4(-)] )
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.480.0
-	test? ( virtual/perl-Test-Simple )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-components.patch
-	"${FILESDIR}/${P}"-titletest.patch
-)
diff --git a/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.17.0.ebuild b/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.17.0.ebuild
new file mode 100644
index 000000000000..aed57d613241
--- /dev/null
+++ b/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.17.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_VERSION=2.017
+DIST_AUTHOR=ETJ
+inherit perl-module
+
+DESCRIPTION="Gnuplot-based plotting for PDL"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Alien-Gnuplot
+	virtual/perl-IO
+	dev-perl/IPC-Run
+	virtual/perl-Scalar-List-Utils
+	dev-perl/PDL
+	dev-perl/PDL-Transform-Color
+	dev-perl/Safe-Isa
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+	|| ( sci-visualization/gnuplot[X] sci-visualization/gnuplot[qt4(-)] )
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.480.0
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Parse-RecDescent/Manifest b/dev-perl/Parse-RecDescent/Manifest
index dbaa81eaae58..32218497edf6 100644
--- a/dev-perl/Parse-RecDescent/Manifest
+++ b/dev-perl/Parse-RecDescent/Manifest
@@ -1,3 +1,3 @@
 DIST Parse-RecDescent-1.967015.tar.gz 176996 BLAKE2B 016e65f95aa8e15ebb384005d996909febd0ade6f6f23a13f95d4a5b558261f307f80564c028849d16f10a39b216bfd562c4fd8c220e5cbede165fd4fc1d05e8 SHA512 38adbfc9a88f09d0465d862b845f48c0921ce462ffccaa7ce8b5f1b7090f33f70e7f00f9ee787fd698b5539804412c44f03e7942cf675d53a17a84c3510e5aa4
-EBUILD Parse-RecDescent-1.967.15.ebuild 870 BLAKE2B b678dc800061295da5c638b517b1144656a32b8d04818f37dece6ae5f63f5468bafd51b8ba0adfc1dbcba5d7eeda988efecf477dc09faf1acba702318f7af842 SHA512 73f122dd8751e698cd0f8bf66777132ae9d98af09378427a1f4b05b65812033c26b60a12ebcc77c0cd9b9e6011248febdfa5ae44756ec629b096c4a8f654405f
+EBUILD Parse-RecDescent-1.967.15.ebuild 877 BLAKE2B 656be81428d9d5c74b32a21004e28bc3ea1febf14a5101d86d07a91fdb228632815ccbfa1946137fa32cc2463f478d7904f04fa3201074c2297f2cfe8292dcab SHA512 f2fd7d95ebcade215bce5556519952eb7a5dfd8478f0e6df2d108483a8ca4b97bf407f7c7cf9103e8bdaae29ba6d633993ff714d2177995fd11298910453065b
 MISC metadata.xml 1669 BLAKE2B 4d6de78c4df041e7fb262a850f68c9c3d4a5ac4e30bf98c90b8292743b061a9dca24831ecb3bb6560b79bdf19c362cd6a19e92e8ce487b6565c3202c30c1c7d2 SHA512 5d50c5caa5b710ded5c1655254fd86bd7cc4e8cca9c3b8e8d2cb563028875a7c59955809114daf98c8c5cc34da3c49f67a9b42b591c9b128c929489d7bd1eda6
diff --git a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
index b41220a6d036..e69e3d1dd24c 100644
--- a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
+++ b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generate Recursive-Descent Parsers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test examples"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Parse-Yapp/Manifest b/dev-perl/Parse-Yapp/Manifest
index cfb7d4e95c40..709cb9201d00 100644
--- a/dev-perl/Parse-Yapp/Manifest
+++ b/dev-perl/Parse-Yapp/Manifest
@@ -1,3 +1,3 @@
 DIST Parse-Yapp-1.21.tar.gz 108661 BLAKE2B b5d8e135f8befc4841250c75385fb935757e665b213373c983428809e5990e9f50fed250c3af9a5253da0f6a1494883b23b6ae42e4ae23cff799c3663bd054f0 SHA512 dbf6182d4813ff7e355ea1713c748bfdf8290040a93f123acec645c7a1733fe457ab6e0ab51c4ec83cf82bc43d7fb35cbf89875df7b5c2ffc9635e85458cfeee
-EBUILD Parse-Yapp-1.210.0.ebuild 548 BLAKE2B 9fdbac34aceadcda2b29446960636bc8b8f6c84b7c540cea3cfb6a562b2143cd12cd078e024d600874cd6ae1a699488db02a8d76a29c375c62e2ddf4136d316a SHA512 6f5e4c5849c000f7d905af0cc7b617e3ada821a862ac6f603912b6187f66962182f106afc31db66be67593a12941c75859c5a5027a4f8d46258954ead9c80533
+EBUILD Parse-Yapp-1.210.0.ebuild 555 BLAKE2B 798b14155970451528e13ae03864ed8ef84c85f8d554607d3c3ae9f60b0266d004b578c5214e23558a1a9f812c4f111d715e428778c5cbfbc4b1707a549cee90 SHA512 dcdc4684f3491228a9758d0c7693715db44a0c9f947ae80c7f8e9bc1ad85c6af425ed85e69fe02bce140bec989379ca64849e4295b74a0f2b1a0f0a5404ee9e5
 MISC metadata.xml 787 BLAKE2B 18e36f0028b449575c6346a0744ccb0b8ed755bfb335ee3d4e694af34057b5f2834140fdf917833f4e929b044415a8e5e5c84e4a93db0a8299df67f3b3adc69a SHA512 18e901c94c1fe62a328678ffa46bffc2b12de70cd38f92f322f68531b3bf05214fbd2b159c6f56cf78202e6be4e6d4f41f83e92da51a66fd99d31fbbab34699c
diff --git a/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild b/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild
index cb91cdcdc551..78dfbbbfe907 100644
--- a/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild
+++ b/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Compiles yacc-like LALR grammars to generate Perl OO parser modules"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<net-fs/samba-4.10.6"
diff --git a/dev-perl/Pegex/Manifest b/dev-perl/Pegex/Manifest
index c3c736866d03..6dbaa3aa9264 100644
--- a/dev-perl/Pegex/Manifest
+++ b/dev-perl/Pegex/Manifest
@@ -1,5 +1,5 @@
 DIST Pegex-0.64.tar.gz 152976 BLAKE2B ae9fa7a75d8d8f8499f696439541c8a0708326ed3f0dd765fa3ba8339c12cf7cf4d72efc3bd58e85dfa30575e9b0d16a8297ff4728f3b2dd7b6ed8b4d4f7b8bd SHA512 e717a762405a77b2670e1d9b3ca2ef760db186b3f62a92cfc6e87049e71f3abd5476b44a285d27c622711557540a0d978b90d5c59afae63692986f510d7458ce
 DIST Pegex-0.75.tar.gz 148676 BLAKE2B 7b23a8c751f6272437d240e99f3e37521d4ebc4d76ea1493cd6830b3e12890b6079571db326844de06fef21051286f07f9a026cd57a15eb10e2909f378bdc9d1 SHA512 ff204b21085bc3ce5cf6dac70636443f206272ae9741055e8972eadb720d52a46e542dee5b6559cc308d9fb597d545bb4d148b02499e2f75fa08a6dc689dc30d
 EBUILD Pegex-0.640.0.ebuild 565 BLAKE2B 23e8d0905b36930b4fbb803b88b1605f5d3029f7defabe8fdef4387faf1ed8e167147ea5ad0def5bf45da5f070e980d1607fcb91b6b197409371b0b7ff173715 SHA512 ddc4382a297c1336fac08715316cab9e070c1390a4984470a20ae2a9df53ef26a14a3953b724354f0de13baeef6197cfec8e26fecb14d443560a1d9fabb25c40
-EBUILD Pegex-0.750.0.ebuild 671 BLAKE2B f43b64c09a55197a995e0b36d04853a88601ca4f602550778122b0088a23d090df1e0eb3d11b131ef4e16bfa8fb769e866eba2c907cb7d026b23f048698ee362 SHA512 cd8aeb5c4a257e33bc4e53ff458c0e398c92cfcd7f2e210217e74cd6de5c1deb74a82887404ff63bc5815a6f9fb60e2b6703cae8e737a7150931a2e8f4e0ae8b
+EBUILD Pegex-0.750.0.ebuild 676 BLAKE2B 5d7480c25b73db140cc704d078362de63c384a9db44bc3b5e3a6393b34c4cdf3f0428bb311828dffab8a4f15b76d9f1e80ebb50e33e0ae47196749442f2d23c8 SHA512 2f5da82dad4c0cda7a6d23be8398a21386fca43ba9b58c3be3f821534cc039765f585ba234a7020ea72d7a60a1c8f815e4acdc974086f905efbab4f82cd65a6b
 MISC metadata.xml 1440 BLAKE2B ff20746a0706d86325d32ca3b1b64ebdd9fed8955f7fe00c4b58de95d85a3e6ae787e464705bf66439b0ed5b17b297117604be442525efbedea5fd50dd2302ec SHA512 feb5e0cf1c8a13e85b80c013dddeab5a51253dd6e9205815e59c1248e067cd4c0e9000f4ebb729af6800f63af9339e5e88a9c8c269d1f147ad276945fbe01747
diff --git a/dev-perl/Pegex/Pegex-0.750.0.ebuild b/dev-perl/Pegex/Pegex-0.750.0.ebuild
index 4fda055b4ab1..9fdfa6976c61 100644
--- a/dev-perl/Pegex/Pegex-0.750.0.ebuild
+++ b/dev-perl/Pegex/Pegex-0.750.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Acmeist PEG Parser Framework"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Spreadsheet-ParseExcel/Manifest b/dev-perl/Spreadsheet-ParseExcel/Manifest
index 6b44a99f2927..2c396559019e 100644
--- a/dev-perl/Spreadsheet-ParseExcel/Manifest
+++ b/dev-perl/Spreadsheet-ParseExcel/Manifest
@@ -1,3 +1,3 @@
 DIST Spreadsheet-ParseExcel-0.65.tar.gz 206923 BLAKE2B 9a7726410a7382db63d9e8376eda6a235067fdd9af61967cbf758e640b9a090a3209b40b92c71e75fea5ce96ee968622ee8175ed4f21bde0866181375a69d709 SHA512 a57be764a9781d1e219d1aab940a9b834d1ddf90ebb4966eaeba86afea3de03617fbdeda67d9bc2bedd8651cc3feafd46905021150bbcd68cbc7453865877637
-EBUILD Spreadsheet-ParseExcel-0.650.0.ebuild 1019 BLAKE2B 38f1049394314ce8a59de5ffb410e01eb658e2cfd19652492ce6bc18b02d66d7fcc0fa6ba70a28ebbff233ce7cf42f7b1875b4757b78d8b7088d4772a5d81688 SHA512 7a405b835120c8f88effd95d39b42aaab89aa5524bc32dfaac88333af1d7583e0f17f3cfac111c960d0c969a64fa3e79bb64cc56fc7893289f5d22000d789d50
+EBUILD Spreadsheet-ParseExcel-0.650.0.ebuild 1026 BLAKE2B fe98a3ffae64ca00505a44ccea9a5cc4d8d7f8f839ccb5db75de211a25ca1acefa5636136681c47c3b5c8de28ae822a2f7a925496e5f296d67b11d8c32daeb03 SHA512 2909e770ad721e6b95b1759bcd84afbaee1a1e49d7ebb902fb7cb75a8a89b59a3fc54b7f9ec34d9a777b9f91db72d48f9b0451a8577e50571b2329f5eacb1870
 MISC metadata.xml 1554 BLAKE2B 755bda77a601fb12873b78a6d6450573e10ce49fc709d701a22f34fc8df101c3e2aa33ed71e3bad8a5181908569579a08d56c5c71e1360db8904faabf9ccdaaa SHA512 ef39e53d7356d429ef5eff63339523495542edb8f512d407e3bde745d75c9b119c361da214ba1b89f9cfb299cdbf917c7cda5d289f42a177156d15c7fe250925
diff --git a/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild b/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild
index 5bd6befc8442..5b88838b2d16 100644
--- a/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild
+++ b/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read information from an Excel file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test cjk unicode"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Spreadsheet-WriteExcel/Manifest b/dev-perl/Spreadsheet-WriteExcel/Manifest
index 32589be6624e..19c5eebe23a1 100644
--- a/dev-perl/Spreadsheet-WriteExcel/Manifest
+++ b/dev-perl/Spreadsheet-WriteExcel/Manifest
@@ -1,3 +1,3 @@
 DIST Spreadsheet-WriteExcel-2.40.tar.gz 480975 BLAKE2B 7015f1174227c7ea2f5e470452dfe115d9c7189c2656f19b2388198e7154858a9d48358c930a558842baf1f1a726d84431013888296c640b51a7bd5a241908d8 SHA512 aa6690b4b7b66620e6490f97b0d82520dbe2a51cdc0fd03c9f83bf963f609c39e5f9f45c31e0a68809d0ba8f8ea3120c7c53cddd48a875074d5dd8250d19574e
-EBUILD Spreadsheet-WriteExcel-2.400.0.ebuild 580 BLAKE2B 4e54d1ad17eb1397f8e71b5d4beea9cf1bb33cd1867d52d9dfc17094ab275bf5c1d6d428fff1ef54e83593d50c7bafb417a27c2de9e753c33a36c2ab46210fde SHA512 0a1cc40fe48bd48d32c47b77cc658229f5388c06a7f711512e06057cc6950a58e5af7b862b9239c33cdbb9a7586717dfd83b3b02ec31cc2c2eacb4f253ab779e
+EBUILD Spreadsheet-WriteExcel-2.400.0.ebuild 587 BLAKE2B 1908e8f4974661acd91091944a12de76d1ebaee35e6c49aa8598118b3d7e636767d11ea0be78f61960bb34dc340fa86736d3d05af6c67076be4aabafd84f7acd SHA512 9ce5afe3a1bce4fed44b73c5940de03b8b42af4d46f7119c3411237df33072b7a1c92ba19f3bef0c6e8bc0fd4fdb8c25e237eaf4483d5b386ce85ecec7a5af45
 MISC metadata.xml 1962 BLAKE2B 792e64d4e043bcdea370174e7ac4b2dbbc23d3207aa2db16ea3b300479f1ba6c9bbfa81361d9ea7e03dd98f549c4ce9baabdba62d4a3d3b04f3131c0632cff75 SHA512 43ec14548a37d130c4dfaf3771996a672b5c5faab91bdf9429ba826cc8f42048bf2fd04881c85566205a3ca5a48b05de01b647bc5370bb9f58cf279d86b2109a
diff --git a/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild b/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild
index 21b52135ff00..37c0c40d7045 100644
--- a/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild
+++ b/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Write cross-platform Excel binary file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/perl-File-Temp
diff --git a/dev-perl/Sub-HandlesVia/Manifest b/dev-perl/Sub-HandlesVia/Manifest
index d84400a557ba..55d220be8418 100644
--- a/dev-perl/Sub-HandlesVia/Manifest
+++ b/dev-perl/Sub-HandlesVia/Manifest
@@ -1,3 +1,3 @@
 DIST Sub-HandlesVia-0.016.tar.gz 99771 BLAKE2B 6df80cb330356c79896d881e1c66317f57db49c5a843d8615effff08c5e0dc24698fe180c1d822ab96fc2d7c049fe9affa363a1e1ff09f484c2182835fe6d175 SHA512 91932d7c56e4fc1bb9e737282ee45ffdcc6d4143ee0307cbcbee9fb3b3953bd955b62bc20809cef61d4e643a4d246dbab062a636a46f951a93bdf2f22a1b04d2
-EBUILD Sub-HandlesVia-0.16.0.ebuild 595 BLAKE2B ebfce4704a670d964d0eb029676abdb477d1529167cb2dd28c3ea976abb5fc513e7f07da5656dddf281e2731f944775bb01e4043cc44074cf1c05647c40752b4 SHA512 8a53b228f80c3ca848ce1371dd1a3534240921e4cd0f1cb8af0adf4399cda00588095ccafbe698cb00dcdcb780b5a092558b6c1504b070139395a92120e6400c
+EBUILD Sub-HandlesVia-0.16.0.ebuild 606 BLAKE2B af08c63e3e69f4df43c6166a94082ff80b3eb87a8984dad1723437d66a60b5f47dedca38c119f2b08d281d5883ccd4b55f0c596239b6cc88965a6e22db9a8258 SHA512 e2a70b246c1b1d70207a95c47d0763164e15c660103da5c004c0e6d6e06f8f082f4a8a0e4c2720b0920ced1c7d6f7ee2b3fad867c7e419dd638c5eea7f5d1224
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Sub-HandlesVia/Sub-HandlesVia-0.16.0.ebuild b/dev-perl/Sub-HandlesVia/Sub-HandlesVia-0.16.0.ebuild
index e2bb4a2c799a..77407640f4cc 100644
--- a/dev-perl/Sub-HandlesVia/Sub-HandlesVia-0.16.0.ebuild
+++ b/dev-perl/Sub-HandlesVia/Sub-HandlesVia-0.16.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="alternative handles_via implementation"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa ~ppc"
 
 RDEPEND="
 	dev-perl/Class-Method-Modifiers
diff --git a/dev-perl/Text-CSV_XS/Manifest b/dev-perl/Text-CSV_XS/Manifest
index bc4cdbcf1592..17fd4d8332e6 100644
--- a/dev-perl/Text-CSV_XS/Manifest
+++ b/dev-perl/Text-CSV_XS/Manifest
@@ -1,3 +1,3 @@
 DIST Text-CSV_XS-1.34.tgz 173425 BLAKE2B 45aff1d60521d2458687eb257ff5a90b9f9dad6595789945206402bffb8f61b17bb89ea18cf8308d01b057e162c239bda0aee014cb3054ee542bd6b250e8f0c1 SHA512 1a13dc0105f52997df87e9612d8696342e2823e4f871b4f5402ae6b48c1375c2eaf70f773bf32b2c176da1ba0deab34413c427013bcdf5e10322fc6901dd2b86
-EBUILD Text-CSV_XS-1.340.0.ebuild 693 BLAKE2B e9aee01bf2d96e71d48f10238e987705ad2a786774f9067e897b4e5a49816fd427f56320c5444a9a6ceb7eec23458323c1bca9bcd6b24f8cb2028adfb0de8774 SHA512 6bf86dc6a23e73c11f3c24b324e9e8b9be47fc2465e4e34480836a995196fcbbab7ffc7f749ee17be8ca3d1a741c10ad6cccbe5b62ec7801c0f8a4da6ed0e8d7
+EBUILD Text-CSV_XS-1.340.0.ebuild 700 BLAKE2B 02164d41ff29f287c909887a567a7b2e7d62ac451b86ff57bfeec375d0a591d1ed8e7c73db0f8d8f6072e2a3bf1ec3b113c6217feeedbab5f9bbdea2b7d288db SHA512 b6ced22959bcf5d693401e430fe9aaf188007634d8512c12293518f7398bec5c6fcdf9637785d1a6212e042d2b5a2a1b50413f6006db9aa129f3017b7de0d1a2
 MISC metadata.xml 394 BLAKE2B a2fedacdb00534d375306fe5b2475ae77ff16fc8d5dc277256221a0a7f6c540a9595cdcc3429f1f9a750a22eba94eeaf661757afbaec661b0fa0bbba99a5d635 SHA512 7afb3865b8c1b553b0d238a04eaaf38f66e017fb0520ab00dcb5bf1d069b753a57df45c0f539dcbdd9ae5af434c6ce0e1cd8cb1ce1ff8b20adbb3c65e411e2a6
diff --git a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild
index bfdc45ebb1e8..cb17603da9c9 100644
--- a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild
+++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Comma-separated values manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Unicode-Map/Manifest b/dev-perl/Unicode-Map/Manifest
index 392b032dbf07..b4060dde9f00 100644
--- a/dev-perl/Unicode-Map/Manifest
+++ b/dev-perl/Unicode-Map/Manifest
@@ -1,4 +1,4 @@
 AUX 0.112-no-scripts.patch 443 BLAKE2B 745c20741c58dc2d3ef964bf31b612fc93d752beb585d161988162e139b0476be9b15228fad68f4ee43e2da9e169bc5db938438ddafe0b4a3b5e83165f754fea SHA512 0cf99b32d0000fb105fee4e3df1205cf5402af3ad8229b58cefbca01e2acc58f36b681e80481d7e3b1abe77b6c40a60e652a18eb9e3a960238ea10f0d9c351d7
 DIST Unicode-Map-0.112.tar.gz 476116 BLAKE2B 2f59521fbd5b31d730f440f7e6d391269cc6a93894344378d7aa2245a2bee788c468d04fa9b04c79eadfdfc67a63311e6c7ca4bba97c89c26b0a86e692339936 SHA512 f66961ee84db7316289176cf43ddb8366ecfaf614130f8b1018931a92b96d16a97f231da6fdd1d8c1bd95ddd50f4b93d82ff87affbbd1162c894b1f302f27d4f
-EBUILD Unicode-Map-0.112.0-r1.ebuild 460 BLAKE2B 03d90c4f77ade3acf971e32b73b04a453c89a2936f06876dd5d180b5bb87be15d062a66c0a8bce7ccb33ff568a62e8c1c104e2045ad38d752153eb7efc8e062f SHA512 06d3bb91d96a4903c81eccf633b61015e4c77ea9a86b55e799caa3876f66cce599e4f980bf94fbb268f154bff8d633ff13f792f661ed805baafed2beec37e55c
+EBUILD Unicode-Map-0.112.0-r1.ebuild 467 BLAKE2B ce5ca03f6685cfc8ec4b69fd7f01f43b0be68395be718449904aadc4079aacf89b81c3eda47de5da10c091c86f352b6f3069e9998e0c8411352a862689a69228 SHA512 47b50c7aef5ae418a2eef862bd1ecf645cf4eb7e7ccc44b0060569c812bbb4917af6644f075c0851cc17af0b69e1dd3cf81bdd3af96513a04f6c071e3409c64f
 MISC metadata.xml 394 BLAKE2B 3a3adbf6528f04b049f4e509bd01f54079a0d246e20400957d18aefab3e09f0bff64ea4b0ec41a8fe95f7c5885290450c4526e590ee169f7364efb1379678871 SHA512 0b8564044a9f7d2a1fdbe30cafeb8525f12b09ca4bc6af232b825bffe3b08ee6a2291d9531cfa5376a07f239b3da5f73be2074b5f4f8584a1e87c15b8ee4a143
diff --git a/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild b/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild
index cd9e5a5b2802..93653ced65b1 100644
--- a/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild
+++ b/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Map charsets from and to utf16 code"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/XXX/Manifest b/dev-perl/XXX/Manifest
index 41b73141fd24..4a90df88e428 100644
--- a/dev-perl/XXX/Manifest
+++ b/dev-perl/XXX/Manifest
@@ -1,3 +1,3 @@
 DIST XXX-0.37.tar.gz 14440 BLAKE2B 1392c3fbcf2c0871845594d0ca7c48102693c186a319e684b7ccc0444fc22afcf1f05f91c83088b29c6df5419a8dc4982c020ca5496bc13b0793445d378406c4 SHA512 5f84c2b0c87152e9a60b224a7e7dea2819b9ebf77ce003e162c06c456029d5629c1401d90f258da078058c59ed0ff32dbe51abaeb6ebde3a403805e458dbabfc
-EBUILD XXX-0.370.0.ebuild 374 BLAKE2B b0be90d2e83ac13bf4a74bdab80808fdf2601a8e88d01a308e9abe250321ba7e73e250c6d2538b5339f1e2ed99a2a8cd6f6bb16e922288e6d4b876263b36dcad SHA512 c232b84a8b5d4c470201e4510127e3d09a1cb17917414bfa734f96c14e55020358419d9bfd2f74a7b64dcc3371c8a37bdd50d73ba7838ededee3a4b8abd4662c
+EBUILD XXX-0.370.0.ebuild 379 BLAKE2B da69f0b79c9f5d40f0323fa8a6f032a79f91a28330c6ca16b39b6a78406e4d7508fb78bcb9f59afbb4a85d594187ee6c2d1f36f2aade17a9ad51fffecf36bc91 SHA512 babff266d517f41f26ad8c737ac763058a0e21fa5f1f8ecf1ba6bfa4444209bf608e7dad0d7e5bb060001dfb82c9e3786a88067bb2a572193c215c2886232842
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/XXX/XXX-0.370.0.ebuild b/dev-perl/XXX/XXX-0.370.0.ebuild
index 2d0919c5d3e7..7ed3a4fd0db9 100644
--- a/dev-perl/XXX/XXX-0.370.0.ebuild
+++ b/dev-perl/XXX/XXX-0.370.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="See Your Data in the Nude"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-perl/YAML-PP-0.18.0
diff --git a/dev-perl/common-sense/Manifest b/dev-perl/common-sense/Manifest
index ea86e61c893d..98f4d9ad4614 100644
--- a/dev-perl/common-sense/Manifest
+++ b/dev-perl/common-sense/Manifest
@@ -1,5 +1,5 @@
 DIST common-sense-3.74.tar.gz 13002 BLAKE2B 234f86e1d51d650c43be0e79f1e87f24f07c529fc7724084fdb75048e3a7295961131dc108bc573e8d3ca757e6b51c657426adcfb800afdf8ded3d8bf86a352c SHA512 658ad70a2d1bbd0b26f91c4ea5d69b4cc0b632ede9532b88282987002a5e280f0475d63ee846b7bd2d38ef82f2680e20c2093803e4b62a984750ed447f318d60
 DIST common-sense-3.75.tar.gz 13516 BLAKE2B 0b790ff1d9295f2bd0c70ab172f99ede8686012745d12142775c22df8d5c13b62a32f2d947effb87a214398bae816092e73a390118020ccc18e124465d893791 SHA512 cb6034d9ff721a4122e0215db8ad5279ec4b189c3364593d427d70a1e84a1583a0e1447e276aa9a4fcaeb2f9d47a465a5bc4c0f842c803d3ddf91755311f4af4
 EBUILD common-sense-3.740.0-r1.ebuild 486 BLAKE2B 55629e7d923d428d109068d421843bed2a8b7d8d321b147047b416d8cfde123744762c9456a19630b623dc6023a38b313a5fd0000cd217c518ad0cad34d280cc SHA512 70b46ec57e7b8d710ea16266eccdaa2867c7b36fcb6534da3109660b79816e33409a1a3552908dbb9fcabf3df4dde7eb3224af1dca20f70e860cb4fc6c58e420
-EBUILD common-sense-3.750.0.ebuild 481 BLAKE2B 9762857349b1206449f9d1c079598b38b85826ab4e24ecbc21ba79b8e91977dc1f644e7e3b951dded8bf13e308289b02e631455ac77ede1787243080e9629080 SHA512 0d1105f5fc714a75145b756ff15506511307790496a44bee2cdd0c72e1ef632934955f41284c9634a2d7b554b0d972a4a5417094a9aaf395f730a253c042e998
+EBUILD common-sense-3.750.0.ebuild 479 BLAKE2B b88c0c7e75b9712b2271306e7e7c72b2d3dfc137fb118a26bb4912f510538309ed3c2ca6c16bda20209f70761644ab8708d81f0105426a3eda2ee30bfef8a190 SHA512 02416566de6cc327fb336d6555d3ded242c84033c097cb669ee8d63135050942216a6574063d19d2b206d62ba3346317a1549e20081bf1a32a538011e9c729e8
 MISC metadata.xml 396 BLAKE2B d3197948deba91188cc433d79f8c000591fe9d9b2d9022144a4ba7f8c532360401d24a5d8836ee4c66e01e5ee369a574d0d4778da08bc4735dc8cda752e726dd SHA512 5d18911426507b4496be965fc4ac8881a322f2996bad79d40693f62e63a09b82ddbc9ecc13a9d13cff4aab6441b08250f4538a0ffb4b20e216d6d191373d5caa
diff --git a/dev-perl/common-sense/common-sense-3.750.0.ebuild b/dev-perl/common-sense/common-sense-3.750.0.ebuild
index 7ead24488edb..5871beac0207 100644
--- a/dev-perl/common-sense/common-sense-3.750.0.ebuild
+++ b/dev-perl/common-sense/common-sense-3.750.0.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="Save a tree AND a kitten, use common::sense!"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/libwww-perl/Manifest b/dev-perl/libwww-perl/Manifest
index f7cc95a8febc..816453efffca 100644
--- a/dev-perl/libwww-perl/Manifest
+++ b/dev-perl/libwww-perl/Manifest
@@ -2,6 +2,6 @@ DIST libwww-perl-6.27.tar.gz 163020 BLAKE2B a0ad6068e5ef754dedd616b4a2904b2326b1
 DIST libwww-perl-6.53.tar.gz 177561 BLAKE2B 254b9c7c02baf339d9d63c00c4cca229575e161bc1dac9c3bad52f3d230f0af0f95d1510e2ef137101f941a887c5cb325dcba39a0ce052c7fa030135c1e14065 SHA512 d45bba79bf2f3d49cf6b14591a58d04f551e0f6666e6bac32ec31018091590d5efe4313781605287dab22693bafa547dc916b010aafcc677a35a7c3a1154c8ff
 DIST libwww-perl-6.55.tar.gz 177842 BLAKE2B 5952f311024357f8601e0e5583ae4cf9e18167aefc20a9901a090df7dd0b7f61266784fe3ca3a64d317cb089b0f8aa61e5fce61727ba7b43eaec555d131c98d2 SHA512 4a26bbcea343af513cc7d22761b7b9412da864bc7ff5e6d8cc6494978ceb829f001d1e221482a215e363e7f7857002120dbd12fda14b1b5778b1f437a5e338eb
 EBUILD libwww-perl-6.270.0.ebuild 1901 BLAKE2B 5ed99a37fa6b6c57faeb1900a1523d73bfb9caca49ee49a7a79def70506c508fbad373353ab5a6219b5f5bb9a2babe136f898c3720f33a8c8a0e58ce6395cee6 SHA512 31e0f15796ba09815a67b9481d002f33ecd4ce5818d44aaba592f457e21d4477ef70d0a06f518b32bdf0402b96e8efae87521f08062cddac04450370117bd1ed
-EBUILD libwww-perl-6.530.0.ebuild 2025 BLAKE2B f9eacf5ba1fcdc15534020df50afae52eb095b5681f28c852901b44c2a2da3cfd81f6001ca2f3b52891cec099530452e4d9585f83e1c64d6741f51286d2346dd SHA512 f0abe190564926324d2b2aa6a1ad88f6b7e2a6aad8482e52eaae0d9c0e8a9be5ae53c3cf76ed24cb4e06392b8d9d6b6865e52221bb24646cd88402d85c28ae67
+EBUILD libwww-perl-6.530.0.ebuild 2020 BLAKE2B 16198726a12e0f811f315cb8f90a143701ec85dd0c9fc2e05bdc16a6c4fbab10794ad8791f03e86c19ca95dbd3a820f9868692d096a73f2f239b1cc482e2b89e SHA512 426cecd9e22a7eb4184329823da763fdb9387d2ff2f72f771953a3541900e5b785518066b57a65a97909a14af039c99bf8598047720db9feb9586c2ef183c64e
 EBUILD libwww-perl-6.550.0.ebuild 1994 BLAKE2B a31f8d278e7aa56c45b0c20325b5ab942ddfc30ad792d054350603b8ddea7cb776205a838c6a7605e40d1386b45cc76a8424668192ee5edc143f2580fbd30248 SHA512 953f8cdc9348d69925db7ab7e35657540b6de3c602c98f8270d64005a32eb697c8466f9a301aaf7198143b1d0edc3fe8db8efc93b4998b00372659408a1a82ed
 MISC metadata.xml 1921 BLAKE2B 22c228aa757f00263a1f331482e24e83acdd93186747ad53aedf289f9a1fa97642a21a43ba97f64a508f023e27dcb0a8e78d2d4ba20ec296e6851e6f7370f5f4 SHA512 77a8184ec9d8248afd05f6cfaf8d69f26f85eff2ab95180cf763f9b2334e7fbb83ffa072cc5c9cdbb99a592db860ac4f7e3b21c29104a460f5e4a2f44e3251ee
diff --git a/dev-perl/libwww-perl/libwww-perl-6.530.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.530.0.ebuild
index 1b3d7d674446..169074f74776 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.530.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.530.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A collection of Perl Modules for the WWW"
 
 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-solaris"
 IUSE="ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Faker/Faker-8.10.1.ebuild b/dev-python/Faker/Faker-8.10.1.ebuild
new file mode 100644
index 000000000000..ada44c6701ce
--- /dev/null
+++ b/dev-python/Faker/Faker-8.10.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 9ae6ff8367ee..82820fa867fb 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,8 +1,10 @@
 DIST Faker-8.10.0.tar.gz 1149474 BLAKE2B 2a5304acb1ce88230660a468756ee79abc7ae0b6aeb850e3d05bb694cb9e5b596b1d9de4c8f1e82c208a3281efc026a290b6d96cd17bc6c523d22fcd61eaf756 SHA512 0d035663677bea9ef4a66c6f0cf5fb1e648e948deb4db07b352a8b8881f5774a9432524bef10e60f28d5d586ac66f0e207c3ad218edffd6071fa6ac614ac950b
+DIST Faker-8.10.1.tar.gz 1144158 BLAKE2B 7463566a8bf2f510ab89b7fd67ee3aea80ce65725063f83798a6f7ce959a1e5c4eef82504adc124add6ff028d6e248871123d0992f715d46485daa6d64d4179b SHA512 c5bb3b376757fe025255de67a184dfae959c834e937825515eaae083a2ce931f2c00ed1ade7ccba49adf182570cf533526e583e6a45c4fa08b41e22544139227
 DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
 DIST Faker-8.9.0.tar.gz 1148829 BLAKE2B b24a7fa87886cb38850808de2ffe1ceafab3c548c694af30d53b1f415d329264fe7e53f33f46b913d16310dd83d95fe591689a308bb7d4c653254e39defaa24b SHA512 d2e26ae140c30ae8069f8e0fd75bb9bf54aa00a7271b327e37dd248520256e137d192082071bc36a584fc864c54c050107ddecb40624288636c6b41caf1ea574
 DIST Faker-8.9.1.tar.gz 1148890 BLAKE2B 2cab6461bf6067d9dfd8872c19c8c11fa25ffef82b61b7e7676ffc187346d228703424a73278678f19263423716c74ecd47cfc1c17bf54d38bba712e456650b8 SHA512 f7016b320c7394b0eccc06e833a80e227cdbad9c0f34eb9f8f4413f56a4743f58bbd7ec5eac3b8c0642e7764c6c5986707d493f0c84daa75575a12061631c9c5
 EBUILD Faker-8.10.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
+EBUILD Faker-8.10.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.8.2.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
 EBUILD Faker-8.9.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.9.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
diff --git a/dev-python/GitPython/GitPython-3.1.15.ebuild b/dev-python/GitPython/GitPython-3.1.15.ebuild
deleted file mode 100644
index 66fe6caf3dd0..000000000000
--- a/dev-python/GitPython/GitPython-3.1.15.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.5-r1
-SMMAP_P=smmap-3.0.4
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-	rm -r test/performance || die
-	# tests requiring network access
-	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
-	sed -i -e 's:test_leaking_password_in_clone_logs:_&:' test/test_repo.py || die
-	rm test/test_installation.py || die
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/GitPython/GitPython-3.1.17.ebuild b/dev-python/GitPython/GitPython-3.1.17.ebuild
deleted file mode 100644
index 058915920815..000000000000
--- a/dev-python/GitPython/GitPython-3.1.17.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.7
-SMMAP_P=smmap-4.0.0
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	git rev-parse HEAD > .git/refs/remotes/origin/master || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-	rm -r test/performance || die
-	# tests requiring network access
-	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
-	sed -i -e 's:test_leaking_password_in_clone_logs:_&:' test/test_repo.py || die
-	# TODO
-	sed -e 's:test_root_module:_&:' \
-		-e 's:test_base_rw:_&:' \
-		-i test/test_submodule.py || die
-	rm test/test_installation.py || die
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/GitPython/GitPython-3.1.18.ebuild b/dev-python/GitPython/GitPython-3.1.18.ebuild
index 058915920815..2b4965f449ee 100644
--- a/dev-python/GitPython/GitPython-3.1.18.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.18.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index a5e32ea6f7b6..3563d8cbaee8 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,14 +1,6 @@
-DIST GitPython-3.1.15.gitbundle 4811422 BLAKE2B 16399b302f7f3f36b315bcaa1535992a43b02fd888586d135824f8f4dc5ba611875d68e6d3102d71edc93848a91d3b244176d6b735ef30d65fdf64c28d325ef9 SHA512 13064036f20aaa58cf7784a3a61ed9c9e08414e9126332fc629e976889c87a2a70b1c9270774df676dcc08ded0ee3629112c60b88025536a9d13a04491b7b1e2
-DIST GitPython-3.1.15.tar.gz 175132 BLAKE2B 5a0cc8176257a5fec9afbf81351da191fc70ad5678d3ee89d36807cdf01a7f69216916723ac551bcc29fbc07a88a9a0357d12d41b4f43888917bd45dd766328e SHA512 bee1e12625995a0264694796ec6f346a5258ec13c24517939e65eaf9b679d82afb7848c02e6222389609bdf3a0dccbce4af1bd59a5d12f2851da47878a21b210
-DIST GitPython-3.1.17.gitbundle 9249795 BLAKE2B 2c647de0e335d58d85eb5444e52f93adb13c5e2cf9a6272fa26a7fd68bc1f467ab2134ee88a4386af03b9816cd568b7366a202480ab0fd7540202b5757a7caf3 SHA512 576082e3f6f741183392e3fa51c3ed0f3c6de668562f07ead14500644afe01ea5d667a1c30f3a111326b3bcb320b42eadfeefb9eeccb699cb19661b330321a6b
-DIST GitPython-3.1.17.tar.gz 178303 BLAKE2B cc4a89c6d5ab8ae59439286ed4159aa4e6cc936e5ef011eecae2ba79010eb13a2e7e79635e1f89bfbc32dc58e4a6f11c9bb13f164d8111178b3302a2780d599c SHA512 c87d9de510f245a64d9df68f0e5c07744eef21669ef3beb81f2d0aefe4299f1cb4cfd2d37b87120b21781aea06fa9f8b2ccbfda1f2648c92cd9c73506b953ed4
 DIST GitPython-3.1.18.gitbundle 9129652 BLAKE2B df2ea8fa06d4209c532a239fa5bebde29314b467811526f67629f181a62b2b5ba235a3302b979dfd87993deca238a91820b3caa58fcb7cf3aaffc3bf76b0c731 SHA512 91fd937193db8a948fb575bf24a295c349e69b132128ed3b0c4fc3be89feb76ff47f31afe422c99ccbee4cf908b3040e9dd3f568db74785d12cf6cabbc356daa
 DIST GitPython-3.1.18.tar.gz 181199 BLAKE2B ac50cee78b5980c6d23ec60786e8d279558a2740480e0975c212de8d96abd58da95de8d66bc9c7c3f0c7d1baa1757460f36df53552b06bd6323d3f882d0b90ae SHA512 981b3f4eec71c4e1de6efa2381c3c411aedfc51918f9f58f397926d21dabdfabb54d498ae44a5b6ceca59adf99e866df8d04f97a86df942e81408a5a0e751a15
-DIST gitdb-4.0.5-r1.gitbundle 1499071 BLAKE2B e429014def18d645b7117b27f592ead9c518076eeee2f6cc42c4a231f9a4f61c8275ccb1def5d042d44f34863528570163e9e154bb1536a0917b10f135e2462c SHA512 6fcf345af9f72afa39f4ba931bf474b2596678f1b790e3d4e1e3f7420baafbad04689bcdee9e99407f7c2b1c6f0d36fcf524b408ceb37b95dc4980e9423b1ad7
 DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
-DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
-EBUILD GitPython-3.1.15.ebuild 1724 BLAKE2B 41e1ade8e6d756561c3bb44b30dd00517a6dc0065e6889366a9c2366c1c51461d15e1c7daec35c24f91662f2bd856f99f69dbe78b83b1460c164367d9913740f SHA512 18c6d02db8ad8895a55f63925c9d28e76a74682872eea299d2cef016b15ef14455619ca9ab9f4b22cacbdbcaf40da5d6ca72b8c63e5abae64e1fdd60e354a956
-EBUILD GitPython-3.1.17.ebuild 1932 BLAKE2B afc4d78a25819b3fc365f650b697cc50754d06377d6231fa455fcf4a1c7bdb6717c7759ee7685070c20c6688ae6f1986715ac724c982e559108325273cae0e20 SHA512 f39f578930daf8ffda3da9a8d88389b65b04100ef6014dbcdfe93d8934fb6c9466c466a1d51b83b74e4de0a1fae48b33a5e894f331d053369c02602efe4027c9
-EBUILD GitPython-3.1.18.ebuild 1932 BLAKE2B afc4d78a25819b3fc365f650b697cc50754d06377d6231fa455fcf4a1c7bdb6717c7759ee7685070c20c6688ae6f1986715ac724c982e559108325273cae0e20 SHA512 f39f578930daf8ffda3da9a8d88389b65b04100ef6014dbcdfe93d8934fb6c9466c466a1d51b83b74e4de0a1fae48b33a5e894f331d053369c02602efe4027c9
+EBUILD GitPython-3.1.18.ebuild 1929 BLAKE2B 3a33df8a43887f52e637aa66dca50cae9920a7e00ea51af8d0980ba79ad67882c8bdf362f4c8824d6a2475388f7d04327d8624b346466cc2a4c4d5c1ace3716e SHA512 34d346d78b2e7e57d108bbc65476975f31effc169fe69b8ad5fc253dbefeeb23db3faf461de46e427733191fa12aa49f49edbbb7e438d7cbd579dfb9d1b81d77
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index bae394e77978..9b0a11a27cd3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index b3efcd3df40c..82fb27d85ba2 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,4 +1,4 @@
 AUX PyPDF2-1.26.0-py3-tests.patch 1452 BLAKE2B bdeb36156cf9b6eec975f0b92f85cb6794259081ec8766b316e94efdf90ddf4bd2401fe1954d87e841628aa90b0978e9899f7562c5c15d71c2c271c6e8537894 SHA512 434d1cb0fb934149054d16521ca414291cbb83618de1468a2a9e630e75fddad4c33c3ba254ae00315b2075faad333b9b027625adda3a0cf064df3366989ea399
 DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef9c55fbf2d146b379586160cb985948e0feb7aed135f601535d034ef79ddc1af58a670b07ff7d3621907022ec SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
-EBUILD PyPDF2-1.26.0-r1.ebuild 769 BLAKE2B 20cdfb4de25ee14125951aa948199dde1a2a8e385436972503a043a6ef89c3d52ad4ed881014bf8963ac2aa8fce2b3d4ec9a212b89c7a35443e542d659f839b2 SHA512 7ff001c98d092e9a3762342b5a0803b36a892eafc7ab728b06ec2db78c8b6ef1f56145968f85c02097f182d539fa4392369f2659a7332fa8ae53d5fed3533bf9
+EBUILD PyPDF2-1.26.0-r1.ebuild 770 BLAKE2B 6ccbeaca61ff823afdc6323b37b158713c0779c674f0e96b353e723721fbd23cc34540ba0a9f5f3643615af010ca01cc424204fa6d154dac40ccad08cede9120 SHA512 d073b6cc3f1a0e2b434ddb729cf031231e3ff24711f54063e5a99306dfae97c8475409422b7ee4f212d4909eb71f6f9d22db94be5aff5f335d111fa34f08973e
 MISC metadata.xml 375 BLAKE2B 70bd4053cc8b7a65a31c3480f4205ff4945af86675b5f58a22efd3d27947b40cf49591746ae90d314e24d69d44dce606ef32b2c6fd7fac8aa1d431c6256c6c59 SHA512 9da6355a60e212e6e5ee3ac1c5cd1c357b243ab3131b2f6d261a4039c6cbc67c1e375be8685c900c533a0273b017b6d4428c7521539b917a2c380f9435b3cefa
diff --git a/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild b/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
index 7c767d86a71f..552d532d3717 100644
--- a/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
-DESCRIPTION="Python library to work with pdf files"
+DESCRIPTION="Python library to work with PDF files"
 HOMEPAGE="https://pypi.org/project/PyPDF2/ https://github.com/mstamy2/PyPDF2"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 22668f276efd..1483f1e5920a 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31 SHA512 7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b SHA512 25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
 EBUILD PyQtWebEngine-5.15.2.ebuild 1665 BLAKE2B 54f976b7e747e2d50aabf99728fc79c1efc49d782d806782677b00c5d32780abc206265760cdb06184ff188c289213c795cb3f65f947f439c69621424192a258 SHA512 3679084254b292ad8b7f51ee80cd9ccbb2e6015965abce43f8c27edcd84ab7e15e83ae40d731404c42805dce598e5dca3a4f665354a3244b86f4e6cd4b573742
-EBUILD PyQtWebEngine-5.15.4.ebuild 1709 BLAKE2B 2826b3c82d7b8bfb1c4c1f7a66360ad3eb90a6f0a72feaf058538c8a80913654f04666c29dfb4aea14eeb288bf27728d0100a88c34d1c2279410885bc3fd1e9b SHA512 070f06ff3fa5e7c7deb2e21992b50b77436f0a820656417c781de17f447e7a1572e1d402398655fdc0b438e7a50b8e3ade2d4f95e9c05218cb29106495866dc0
+EBUILD PyQtWebEngine-5.15.4.ebuild 1708 BLAKE2B 64d902a7393e50554350bb76281f592e0d4b6cd68131e7bfeb84d610fdf08cf0e85400699ec0f361e302183ab81284fe99be10f5329f4f7e13884703ab5a26ac SHA512 26f41890f33277171b2d473635878be377126d48ad9d8cf82a7a4475bc99b35885389daa9c70254819b2c44935b4ec2de2997644d1df4f8fa92eeea2a274bc3b
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
index aaa3aad7aad1..81bcbeb17ccb 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/SaltTesting/Manifest b/dev-python/SaltTesting/Manifest
index da84f40d43e5..81cc01fea3d6 100644
--- a/dev-python/SaltTesting/Manifest
+++ b/dev-python/SaltTesting/Manifest
@@ -1,4 +1,4 @@
 AUX SaltTesting-2018.9.21-python37.patch 1213 BLAKE2B 82257c24956fa9af21b63ca5c356219efb36d89371ec473bc9fe77aafd637d5310077db0312c7c594d3569821d12524c0ff30710018f9d481ac12706df246b0f SHA512 5ffd4e6bc726633a0957796ab531bb3a566a6a8cc39fc59df888afa7ce53c4b2b7fbbcf5e64dc111e5a603ecda3d7c5920f436b986f11df0ae4fdf9ad042b81e
 DIST SaltTesting-2018.9.21.tar.gz 459708 BLAKE2B c0c6d853ab335432464140b6db8939ae87b58f50c0ea63a547a09ab3e1899b52053e3f9ea90b183268b807db5d7f323f09f9b6d4186e1b4214d6984486f37139 SHA512 9ce79aaa0fd90fd75fa2a64112563751837d441518426cbdb5df93721fd186e9fe33609341a75bc173781cd9a97b477809a4c2e2d4fdd29a5331f0d096983db8
-EBUILD SaltTesting-2018.9.21.ebuild 811 BLAKE2B bf5382813fc053597aaf0059afc17165fe8bd95b03328896fe9e36716e43463798cc827038386cac02ddc81062a2ac74b970f8e913874f3e1cab6c317d023fae SHA512 2ae927ac01a7e70f78b7f7c373cd0660f27ff06f651114f5190ec3cba169a561e9e6f716090b479b861d96395f28f3d93ee38e49df35f30a8cf2d0b74105141f
+EBUILD SaltTesting-2018.9.21.ebuild 818 BLAKE2B 64467e8db3421e702a8c59ea2c7f1e1cd540fe05d2c3b8f21c4b6cdaf8dd1f0d9659de3b0a48e9c57bb6a64b27aeefc96a5445910cbc7b44c98e66194bc0f7d2 SHA512 1e84628032fe1e37b975b347fee7c9b166aae7bfeb720edfbb9f1cbd0a8639cac25e62d2bb0bacb75e4f629d14d8f5f978b230df28a4bf06813f6f444a8ff905
 MISC metadata.xml 333 BLAKE2B e600956c630527e61c16aeba7e9146732252ed6351301052a3aa1c6187f1b496a162ae7f656cb2c1fc6be3112a7920503af30028df8b4410aa460cc1975dbb31 SHA512 ea35cbbfa8be4ef354636ca16d31caf69cbde213be302049874e03d5167a7435c28605b3dbfe8d8285784375ba2a73718eaa24bf5e9985c559cb04a6b8ffb74a
diff --git a/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild b/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
index dd100667fd93..78e0db8dbe62 100644
--- a/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
+++ b/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/saltstack/salt-testing/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/salt-testing-${PV}"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 831f5fc724e8..13128b125082 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,5 +1,5 @@
 DIST absl-py-0.10.0.tar.gz 234053 BLAKE2B c7d85d7b351ec5d67ac5e98d5103b91ee7b91d3e01b15fff86ead2e177ba596719af8668f2ec1dd81b278557d902a90705803f5bd6aa7576b302641129eed050 SHA512 92862cc7997f469d7121746d1a8f8fcf99a4983eb033dc936e2ef22bcab896950a5e2bd8ce7fe6660b761cc16a39145104a7e2ba3588f38cde1964505d0265c3
 DIST absl-py-0.12.0.tar.gz 229360 BLAKE2B f913f1eff2d8efc1f5bc06c83d09dbd5c57ba5fdc39953ccbe99750da49676a95112d4dcbcb13e20bd380c7c07f4a3d01e69ae940a19a91dc37e51b2189fb66c SHA512 566cae120779920f8529eb797f9b26a662df0fa2ac853d78424e35d906f487069a945b2ad5a9a292aa90663e8c31c363925aa3114331f0f5f9fb479c79d781ac
 EBUILD absl-py-0.10.0.ebuild 562 BLAKE2B bdd34c24e60cfa203213557a361feba3fb19aac2d1ea6fa701523cc782a4e3880e4a52948d9817b9fdd9cc68491cb9b19dae6e4323ac38b4acbba872eccf9418 SHA512 23525ffdfaadb697bfecbe944c363de72179eb2b08aefb43cacccab93023f05a16cffcf60d0c902fe188010f96f65dc4299198b75c276ce1335e0d737ec6dc65
-EBUILD absl-py-0.12.0.ebuild 566 BLAKE2B 0da353f306b8066d1e839ad9932907a704e90992cbd1c88f7f67771b1a0e2700b8e42725e3880755f145bb4cbbbd3d832b4fda41da48410dd4d426007502a472 SHA512 47ece7a55802c04e397f349f07a3f09513b23c84429221137a2085cb5b9d504f3d05106d92e28051b76eff3f40049267fa8445539f1c861f0c2bb2bcf4c97854
+EBUILD absl-py-0.12.0.ebuild 564 BLAKE2B c51969eaee5e50113ce341d47cf50e9bcdc434d79798c06fa4a0d11cdb228e9bd640b786f9e1a539692dce4d783ca95bd15343b80893bc36e8ae19fcf6e8d563 SHA512 5221feff8f71a77f42579f6ad212c1c361fbf7c7aab1a1d0310b1a18f34cf2cdb7681bff37ad30cd289b6f256978ad1aaa568986e3514b4e105ef5e617db52ca
 MISC metadata.xml 576 BLAKE2B faf52655a8b6fd30293fa05a9b333806db3b2069a30ca7720bdaf971cb0242ee04350460d63f411c9e501cd4c6f0ba91e82ba32e3e067a9954acd954677475aa SHA512 cfb5ab7671b8cc6ecb55e3074cd31c42a52a293cff27210c7b5b955e1804b8b3a22da599142469097daa85331008e50a48da67b594bb55ecf5f8f8935191e527
diff --git a/dev-python/absl-py/absl-py-0.12.0.ebuild b/dev-python/absl-py/absl-py-0.12.0.ebuild
index ea6caeeaf535..b35f1e4e974b 100644
--- a/dev-python/absl-py/absl-py-0.12.0.ebuild
+++ b/dev-python/absl-py/absl-py-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index b2281e056039..a8ec88a083be 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,5 +1,9 @@
 DIST aesara-rel-2.0.10.tar.gz 8038338 BLAKE2B 411623fe6299c9f037a733ff44324c747a3ea1bd71f2d3ca8fad747ec4be0d0dd9a3991f0996ee2e723ec9bb44ba9b47606e3a2cf5f9e6beb27bfa39752b1f1f SHA512 c29a352f2fe85cf5f452fcf7b62d2ccefcac37cfec5336a5b14041cfae5a25aa03f3c95e372453d665995576b6c73765c0b0677628f2ed37e63a390f8bfa5121
 DIST aesara-rel-2.0.12.tar.gz 8154749 BLAKE2B 0e39102e985e9f9ed49f65c76389d76702b5d8fbe8c3e1130c61dce7c43eb70f5c73fd3557ff9aeaa1d186b33bb5803a04a4a5b0ce41076af7e923d05ce3353d SHA512 e68f5ce0c64a678219421a0bfc957d1594dc34c887af6f6373c00888387e5da83dec44b68b9309146ae2fd60c0677039980a87ee87ecc0ad3db2fbc80213cc34
+DIST aesara-rel-2.1.0.tar.gz 8161534 BLAKE2B e17b70f7422f0f252cd6d248c16ebe2d609b77724d08251fed39d5f90de9dd36ca4006d767f3be8b0d0058f77f2d670033d058a24a5fa2df2c24ff5193e69c7d SHA512 d5e766eff03858fbf851e1baa0877b1cbc328408b3d2e760c2827ee662a0188e3b6dc5ceecb1c09d1f727171cf4c98c89b618f66695942558f44734a7405a88c
+DIST aesara-rel-2.1.1.tar.gz 8163328 BLAKE2B 5f2d05560f0c3cad0b58017f152011c9f10ebc8360ff925b90f6863fd2c683614cb42e86a69c53f0b168012fa1771ba37924afdf4f9600befad7d5af5a56f7ba SHA512 6a823201a7c4ca00a375dd7e1fcb38f31762e1eebe1079a1859b6ee709eb030c2d884364576b7925f5790c394f979bd5a738925c69c44c8e529757f435fb1a1e
 EBUILD aesara-2.0.10.ebuild 1882 BLAKE2B 07942938c2bfcc6928cfea848b7c6cac65030068f2dc66003b16d832d8402e71c881f01aa3351f1f3dd648254d892a0a1088daa342f57aa5faf3012a651ea30a SHA512 88345779c53f58f8b5adeea79e8d49b865e9a7f374de940fb2785265aa7ce0e3625e369925791559030287052fe19b0d12272794ec1c381558824d7a6d57c3bb
 EBUILD aesara-2.0.12.ebuild 2103 BLAKE2B 4ca1ff4315ed988653a3d84372bcc510a4028fd409598be93d47da36702e1662b9784dcc9c8c526aaba5838ea76f3d8e41a39052f031746f1c7b9f67a58ad7a4 SHA512 4eed528151518ab260d595fa386cda1f209a4d3b299d8c80ebadebe916b9575c3c26442e21bfc870003464f2237b1b9621aa684b84c7f306669af523393eb6aa
+EBUILD aesara-2.1.0.ebuild 2112 BLAKE2B f359e7a97045e2d08e7e1110382c90132453b3c982a51ab2bac581a3455f37b4d49842d294c9ee1855f95fb23c46c8c82aa50574359f40e555c82c48fdf80f1d SHA512 b54b0895caa476d4bc3bbc9cf4b21456e0982ac89dd21587c4e040a1bcb33cfa958593fe60c59c11aa5e8622e0439478cff303efd5f5b921a295f9e6747ef906
+EBUILD aesara-2.1.1.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
 MISC metadata.xml 404 BLAKE2B 5f15a3e7f8771f0d8b95097374c87fb6793089f1a0e000c433a8f644be3cb7d945128d0b164b608405070b976c932c77738ed930bf4734129ba37f4feda667b3 SHA512 f7afb5e2c8053cbf8ace61197d234869ed86a06bf066652eac3ad800c7251d18113dfd2e3115281c10f016c56e845d9d34915e2eddbeac4e3a2f414a8e858148
diff --git a/dev-python/aesara/aesara-2.1.0.ebuild b/dev-python/aesara/aesara-2.1.0.ebuild
new file mode 100644
index 000000000000..b067b0298c71
--- /dev/null
+++ b/dev-python/aesara/aesara-2.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/aesara/aesara-2.1.1.ebuild b/dev-python/aesara/aesara-2.1.1.ebuild
new file mode 100644
index 000000000000..efa88e842a94
--- /dev/null
+++ b/dev-python/aesara/aesara-2.1.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/agate-sql/Manifest b/dev-python/agate-sql/Manifest
index 8b7138cfc420..f8763e930369 100644
--- a/dev-python/agate-sql/Manifest
+++ b/dev-python/agate-sql/Manifest
@@ -1,3 +1,5 @@
 DIST agate-sql-0.5.6.tar.gz 9091 BLAKE2B 9094a2bfb500422e7fe75d1c83182af698aa92942a305a69301d45d92f01960a7ffc7908f0eb2b66556a856be0f7388e222034428afd269d402488c6c05abd36 SHA512 b4234a86f8bcd5b22bcb1e18d0cec0ba21c8a3521e15f767886241e16285cbd296683f83bd366a82d1e549679b3712663adc080950dedb24a0e6db5b2541050a
+DIST agate-sql-0.5.7.tar.gz 14975 BLAKE2B 7890d5c21d89dd216a7a4c906189e1e44111bd96ef3476f0e6dc4c842dc3f25d537ee398f3c8e720d43e64001fa0ea93940d4a54ee31605eea9e8ae9aa4dec37 SHA512 df7e1d5975d9af0722f4bfa67f1e8679ed46759f8aaa5c76614ed5280c8347f727517568ba377c21dd8eb349f93b7a6d308959ae69bfedd125e6d99bd7bd9dcf
 EBUILD agate-sql-0.5.6.ebuild 1477 BLAKE2B f5a946abb127d8ce24ccd77fc573e6440df8b3c0d1317834e0128d9a8057e1b83f0e054aeb16f2e968c869fd2226d7e5bb1ba1a825d7f91df9dfabb01b80a7f0 SHA512 5e10af0fe07be21b99050734f01e562e0ac2b6fa7d7439eb81e883a601774756fdd32ec244ffdeb2a4ad084c361a0cb8689cdf7ff3f567a33ef5a816db1d02d5
+EBUILD agate-sql-0.5.7.ebuild 1406 BLAKE2B c1b9db47eddbd9cb8a2748b9b6560f0a2c26a0334c60572b01f80826e3766fc52b14aa29747545338ed1ed0ab8b2e4e96ec02ccb7a54ede0003d7f4f2b4a8a2b SHA512 d941e02a642f31f9bf7268a36a6c4cd460fa25d7eedb5761ec571615590cde84b69b3f8b50167a1040dd4e3259aee2a080aac7b432bff66ad428a8dc948d81bc
 MISC metadata.xml 512 BLAKE2B 0709aed8b06df8981ad0b0c2733a1acde06a0753701b6b35ad9662e5c66871529b968a71d39265d0fd72aec90f09f7166848e1155d240815041bff498d4be06a SHA512 f09f6203a8f90abb3646be9e8d2abb4d8b367a857f384a7c43d43862953c99111e05707eb4890a6a3abcfd33aa8717bc65b180771c0cc97e5ff1ed762978f95f
diff --git a/dev-python/agate-sql/agate-sql-0.5.7.ebuild b/dev-python/agate-sql/agate-sql-0.5.7.ebuild
new file mode 100644
index 000000000000..e58ff6efb206
--- /dev/null
+++ b/dev-python/agate-sql/agate-sql-0.5.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Adds SQL read/write support to agate."
+HOMEPAGE="https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+xml"
+
+# Other packages have BDEPEND="test? ( dev-python/agate-sql[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local sed_args=(
+		-e "/crate/d"
+		-e "/nose/d"
+		-e "/geojson/d"
+		-e "/Sphinx/d"
+		-e "/sphinx_rtd_theme/d"
+	)
+
+	sed "${sed_args[@]}" -i setup.py agate_sql.egg-info/requires.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
+		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_schema
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}"
+}
diff --git a/dev-python/agate/Manifest b/dev-python/agate/Manifest
index 2749f7ae899b..bd8ecd7c8cc8 100644
--- a/dev-python/agate/Manifest
+++ b/dev-python/agate/Manifest
@@ -1,3 +1,5 @@
 DIST agate-1.6.2.tar.gz 191216 BLAKE2B 63e89f6815a36dea956e8a919aeb926291eaf1f4d5eaac7f96dab97c6958dfee4788e18a4c1325a5b8cebf15df27b32e75409ddeab1289c1e8e548088fdc0ea7 SHA512 34d9e45d162bce69d28ad0ec07f5b410b2cdac831e5bd986ca8cb8902fd0ca1ec67663b2f956f42acaf18b8ca0fa169d5236aa4cee7457765e4e86d837e7794e
+DIST agate-1.6.3.tar.gz 202102 BLAKE2B b1a5624b4744b8f3ed266470da580cef2f2e1cf6159e1b33fcd461e4abd235c5e3fe0da35408a42c92fd4abf14a1f841a1ab9eb6cd31545d826a5223e85b4904 SHA512 e83a03c5a3e4b7fa9997030ce0d33e7b59b397e2ae07ee6a723eb7fb708a7fa8b8c4322dd034f42bf664bf2911d89731fd060e4ff33a237f83114a83312ac5ed
 EBUILD agate-1.6.2-r1.ebuild 2753 BLAKE2B 4c80f6ab093d11f85d96215ee86d929fc788ad7714e61632886f1806bd8909c677e5e65887919ab6514c88d08f6697fd37c0d657876e000f86a56c9b13db3fc3 SHA512 7b2bffbdf6dba030b97a6213e7d47c43a24e0f02d25b3420b313a5bd73d465a74c532680ffc8ec1a5d4cade29c6de6a299df251c4ca8fc3764c24eb129dc61ec
+EBUILD agate-1.6.3.ebuild 1375 BLAKE2B c6409f7f677ea26fa8dc305aa6b7664db636cc26a974ea760d2ea701008a9c8684e408c339ad317a5722e424b7bf48195bfa729a943e70c7176cf7f79b2850b7 SHA512 671f40e651ade42d04571c413df6beefbe7748162fd889b66ec99a41dd7b7699008b0e05735489dc6ce3c818af754da5f78d6dd552ddaff84b31316e86ece01a
 MISC metadata.xml 485 BLAKE2B 32cfa1d6bc9582bfe411d79e541837d48019eb8a3bcb956634f3a72f5c41ec30568cab69348e5c7419210b77263a93dd042bb88a1376706888a0e13b2553f456 SHA512 30edf8ea75b16bd491372ca7d72b953fb9d3d27c88b10829b7d90108e952fb3a8489541958621a34d288d9dfb5378063fe6973a15d71700bc1745d20093f7b87
diff --git a/dev-python/agate/agate-1.6.3.ebuild b/dev-python/agate/agate-1.6.3.ebuild
new file mode 100644
index 000000000000..52a588ad921a
--- /dev/null
+++ b/dev-python/agate/agate-1.6.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
+HOMEPAGE="https://github.com/wireservice/agate https://pypi.org/project/agate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+xml"
+
+# Other packages have BDEPEND="test? ( dev-python/agate[xml] )"
+LEATHER_VERSION_DEP=">=dev-python/leather-0.3.3-r2"
+TEST_AGAINST_RDEPEND="xml? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
+	${LEATHER_VERSION_DEP}[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# require specific locales
+		tests/test_data_types.py::TestDate::test_cast_format_locale
+		tests/test_data_types.py::TestDateTime::test_cast_format_locale
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
index 3aa0adc05667..65beeb04aca1 100644
--- a/dev-python/astor/Manifest
+++ b/dev-python/astor/Manifest
@@ -1,3 +1,3 @@
 DIST astor-0.8.1.tar.gz 35090 BLAKE2B 11e5e77d4f8a8617d0330d3091a1571744bb5773df926f41b10208e1c5beb7e82ad8961a460dd326e9130591dade495c77a36456618a97a5c22e41237805a4ce SHA512 cfc69a21fcbc9842bc26fbe8372e5c700d9957cc0c3c62de415155d2036163951f0ece88557829afd7c4dabba8a8e238a2335994ddfc020cb3db913eed5b6f28
-EBUILD astor-0.8.1.ebuild 599 BLAKE2B 69b12b56cabc24ed9c3faeeb4e63969beefe31120fd67a15e4aa747b6226d6709d486c9abce6df27b7e4342cbb7935e145031d180bbc9f790fd5c32b015c6850 SHA512 44c73464068dc6c9871c3e0ceaa3cdd8784f57d0f247b4d8a097292ad2e36d3925e4a02d50fb469b385dcbd197ad518fb60163415fcd9836d3f2bb95b15f576d
+EBUILD astor-0.8.1.ebuild 611 BLAKE2B bb4f0a6abb3c90578b3c67bc51bcb67c0e11f8bce9492d0c23b02505910b7d0c60091dfc5ed892ec710dc736805b4c8fcad7885a422442717f05eb88d8ce7b17 SHA512 1475a4b544b0a39bd4434ddf899c69d0cec19070608b091869536979d77e7ed83110e8829d3656b5410938876a8854800d569fe8f228d9823f68d0c61d751d49
 MISC metadata.xml 308 BLAKE2B 4eb385f663046756ae848b87d82301e3d2ddf388eae73431024dbf4758c5d4787f879ad167eda72ae011ab41cebc48718fc40a5ed86f3d382dea6165baf1a3cc SHA512 86cbc23c8c077f9849004214ba32c5096e64ea8092ff1940f3fb4c9bf4fd420f2883aed76a7b96774f639cb98ef14429a9e55993db07173443ee16b3ac393aab
diff --git a/dev-python/astor/astor-0.8.1.ebuild b/dev-python/astor/astor-0.8.1.ebuild
index 49a4d593853a..acbd1e50eea3 100644
--- a/dev-python/astor/astor-0.8.1.ebuild
+++ b/dev-python/astor/astor-0.8.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/astor/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86"
 IUSE=""
 
 distutils_enable_tests pytest
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index eb460b7a203c..f12c5ef53c07 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,7 +1,5 @@
-DIST aws-sam-translator-1.35.0.tar.gz 867345 BLAKE2B b2775f9ce0d3e20fa5b3b5a9b68100f1338576229a9380cf7afb08e9c75fedfb926a06c1c71b96df9883e5306de355f720e624d0d1150c12b58c4dc4098309f2 SHA512 14e22095d497df9e0fcfdaea83c93edd881837ed57e508cfcb484abd5241dce60059b349b3bba92c307515b4c4018e8e065342e9133e401004a04baf3182ec46
 DIST aws-sam-translator-1.36.0.tar.gz 878204 BLAKE2B 027837687709d2bbe166d4c40599156c8075b1902fe9f75aa5f29bc1f725e2cb97a1f7020cba2f75d5a7180e658e1d47cf4ff03ff3336b0ac21458426f6241fa SHA512 8af9e54d9a02ac3a315b1274d71a5e7413b5a39c6913036f0cc57cf1cd94d6d079f78e4810d5b501003bf5b06a4f25c2481c8abce0836c01da6f962dc0163651
 DIST aws-sam-translator-1.37.0.tar.gz 880633 BLAKE2B b3913b12fff38657662a16c13ae6ea3b836faa94eae986e7364543e7ece6cd53afbc9bc80380ce5c4500be57d1b588f617f3ec7e6104cf83357ffe733f4e50e2 SHA512 aeaf194d7c8338802762a667ac05e57a8fbffbae7d1a707a708392b1d103d4e30f42e683e077b5cbfc540bd38debac95c578dc2c02f2c3f7ed531ece64bb7200
-EBUILD aws-sam-translator-1.35.0.ebuild 1330 BLAKE2B 5d31edb593d63f47e2792a580388533b57d41465eb543f78c6806dbf64510ec19f661fb6aa705ec30196d4f380f8a2fee0f2b5d85ecbfc837b22ca1cf04119b6 SHA512 8f04a00e18491d4757758a999717cba86acab30f1daa8097d2f39848bfbe9e6d5800617d9a05424ceb491f9279da23564bc50e31bcbb5b8e19aadf748c28fbe9
-EBUILD aws-sam-translator-1.36.0.ebuild 1216 BLAKE2B ada96426305b989e71ae43b086230e4033bad4b426c01500a0a98692796eebcf1bd1a5aff3b3a211121330a74ef2b4d7835cba8c5899c6393b6c9a2b40cae2b9 SHA512 aede80a780473633841976a0a6355ce31bac5e8862692556b0af76577c7bd6653a194152f7c008d298f5a468b3c0ed7b90b9812e62f90fb795709d3ce8099311
+EBUILD aws-sam-translator-1.36.0.ebuild 1214 BLAKE2B bd359042998104aaf99fa92928a96080e3e87d2238cdf7aebc18fc5fdfcb42a12650488f259a051630e6a71ddccdb8097b78affb7f81e0f925535e4bf9f403b8 SHA512 52aa296ee137cdfecc6906e82b226b030af0beb1bfa67b90d17c26e44c40a58283d55760e82161ef7f8be0062fcdf03a14fd62a047532e1abd8ba33a9fea11ec
 EBUILD aws-sam-translator-1.37.0.ebuild 1216 BLAKE2B fe9784c4435b5c56390bfce87058de70b98af7620ffc6f58e3381ac0249a9d8e01d1a25f7b8538c33f02eff149628a620301dc88143f5a68b8ca714efc5f9c89 SHA512 4b82a3f9f589eabc4197187e1e87ff2ffa4e52643ce33f84796001fdd924528e6dc108c7f784d606d91f17cf7ae9182dd6c3bf336099de0a3909641219158326
 MISC metadata.xml 602 BLAKE2B ce51fd399f69177920ab2a99807491640ee4fc4193c46279a05f442b608b420122ba8b7302b3fab1724ba2b3bad5519b51d86ff050713ad5bf9953acd843dba0 SHA512 829df35f0b222b1a3c2c17e813bcd2c8d8311e694ce0244877a9e492a91edb9597be906e7a449d7ac641787643fd355a0014e3e9ef113023066c9ccf52f32e65
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild
deleted file mode 100644
index 93aa7dc89a4d..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/aws/serverless-application-model
-	https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	# don't install tests
-	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
index aa73432a351f..57f6ec0593c3 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-entry_points_selectable/Manifest b/dev-python/backports-entry_points_selectable/Manifest
new file mode 100644
index 000000000000..c564045b33fe
--- /dev/null
+++ b/dev-python/backports-entry_points_selectable/Manifest
@@ -0,0 +1,3 @@
+DIST backports.entry_points_selectable-1.1.0.gh.tar.gz 7689 BLAKE2B e7fb4372838b47e65e50d91acb034afaf326947bd76bbdf14b57834b94c72fb62afa6526931a96cc1e10b43eca9d95dce7fde431c24a4e15a4b2569ddf42faeb SHA512 abf8f5d228b52281160cedfd017f1a4273b8fce01ed29e9f0417f750125abacaf97a3cc6f363849702d1dc6f3c40602461f79bfcc2a36a3dfb962af1112046d2
+EBUILD backports-entry_points_selectable-1.1.0.ebuild 744 BLAKE2B f857b7930751ac7aeca55215a871cc25bdec8a7dccd85de558fe40e32e980b2c39050158e8bf8a39538e13e62d59f93b19a471fcb3b308310be311056d57a95e SHA512 7ca3d1d6ff22dd9fe0d53941b962ab079e8f1aea015ae5a2656cf10aaa2fd523b5d1edf03a34e03eb31ec741ce01d3765b0cf630e7b1b671309f1576531b11ae
+MISC metadata.xml 394 BLAKE2B a52263e74cb9051e6c7dc696d1f39e87ded29b3894f58a455b25dc469f084dc4e71dc00fa309a5ab7b1ad7c9fd87e6fd2b95e28be17304aee03bc29a6139b4c0 SHA512 79f57eb7cb48175fb0fbe2d6269c1c7fcc7b48dffede2b77d770333b9ed37bd2957e3531d4638ce3dc83f4bdce83d06477a032a683766a664399bcf5afa68949
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
new file mode 100644
index 000000000000..8911b4a6fa0c
--- /dev/null
+++ b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Compatibility shim providing selectable entry points"
+HOMEPAGE="
+	https://github.com/jaraco/backports.entry_points_selectable/
+	https://pypi.org/project/backports.entry-points-selectable/"
+SRC_URI="
+	https://github.com/jaraco/backports.entry_points_selectable/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/backports-entry_points_selectable/metadata.xml b/dev-python/backports-entry_points_selectable/metadata.xml
new file mode 100644
index 000000000000..d6f15c81c771
--- /dev/null
+++ b/dev-python/backports-entry_points_selectable/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="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jaraco/backports.entry_points_selectable</remote-id>
+		<remote-id type="pypi">backports.entry-points-selectable</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index df24a91f2f12..5eb0ffda4256 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1,3 +1,3 @@
 DIST backrefs-5.0.1.tar.gz 4120179 BLAKE2B 2cd8fb84c7e416be330cb9afdb894f6f8574b66698acc1d63abae8ff5bfcccd4bf29b724dcf2a25a637ea0fde46865b18a5ff1bfbff955a01798037752dc3d97 SHA512 e2212bd7dce017308fa558ccfe7faf617ed6107523db8b2e4a3ad7b60aa1d7aabdaea2632abd6a3f1f022eac949d7036a7afe522b5f086ef1888a0e67e834894
-EBUILD backrefs-5.0.1.ebuild 1164 BLAKE2B 041c0ac793ed5644857338d90ba774a8f11d934e7475465b76eb0800e98f335f8d43962ac6698c90e3325375f13433933778de52e6b379418bd8de2237d04cc0 SHA512 3eca0d88d2c5268d8d06e49577a73c90730ffc8b739e83336ea25c72095b5e07d81cdc912800a89c389126917ea2f393a11bc2ca414c8939a42ddb66237d13a3
+EBUILD backrefs-5.0.1.ebuild 1162 BLAKE2B 43b8a0801c86cf3106064ab6d4fe24177940ca141a724f087c097e9648f048a11dec46388ae352b17c7836677014ed295a08ad34583523b8d7ad509926a4a024 SHA512 582076d72d202285abb02fe71f5e5fa2380e181a52ceb4c2406cbaa29cef758f38d630c8b3c201d8a3fe0163cb26f244d10948e196712aa92eebdca3000cb330
 MISC metadata.xml 1127 BLAKE2B aae5baac8851a61252d27454a13959977d2d172360671f9ba29d45125359ad445ee53d8e699568a90084c9347c3c83191a1f8f24717b19007286d6ada1f5a1f0 SHA512 50114f5146d58366f5a7325142bdfe4eae5aef656f79853a1dbb9dd872428321b8bbbfdccc8684f62c0041ba6d18b9f70f6f4fcd8d49622c1dd8b58437423653
diff --git a/dev-python/backrefs/backrefs-5.0.1.ebuild b/dev-python/backrefs/backrefs-5.0.1.ebuild
index 60fd99b24c7b..6f53136ab0d4 100644
--- a/dev-python/backrefs/backrefs-5.0.1.ebuild
+++ b/dev-python/backrefs/backrefs-5.0.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 20cdfa6e2fa8..95096270a01c 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,13 +1,7 @@
-DIST bitarray-2.1.0.tar.gz 71169 BLAKE2B 8d82d49ac309605d989d29d492dbb94dd59c633f0987220ed28bbca7d2c3b0c4566ce147d0f65893c5dfaf1c2f702870d95181dfaa969050e13bcd4a9664ef51 SHA512 e91200b8829b63f297a1882fab293ac007991740a739587ba473abce183aa79a85e08db8a0fca5729b6e1d3e130965b2f14dc40acccf12d3231852498e2fb141
-DIST bitarray-2.1.1.tar.gz 72522 BLAKE2B 28afebad24c574706f3cc57d1b82890d8e98a2ba745765a1a8d9e60a630a1e1e6e467bdd7b953c4c75b08b302658f7704d83a8e01b351c1e99e66ebd52fbbf83 SHA512 d690e266d1ac9f8fba6f2dd2770b80d1fbb2a53baf2ba759c946a2d371d9804e5bfd6792fc2a64809fc10e78563e106c2d357474fa515423fdcd6964a8191718
-DIST bitarray-2.1.2.tar.gz 72530 BLAKE2B 85b98e3e7b89ded2f6d05aaf08efdc46982b92f67eac6153afe0814537ef84528a5a76e1b0de03d771e8b9ee69ce762fe34d908d14555a5e6c70583350009a9f SHA512 1db9d54a2721741732cf6d455b36d3fdeb550a3a6370e14d794c2d67a1a0d39ca6ddc8db939ec391b33dc86962db51cc4291d8d04db878758fdb411fff377819
 DIST bitarray-2.1.3.tar.gz 72556 BLAKE2B 737ba1e1586269d279198bd966c84abc95b74179e361f1e08644d3c4557085bdd99931ce9cec633e39d4fd454fa36d0170c5057a8931cbd8ca2fb8f3bdf71dc1 SHA512 de84b8b1c84be32f946a5f12e8a6ce84f9aecba6e5dc28c0cb0e1fa59434cc5b0757cd5e0b616163b134d460edaf4d53edd53da86ea517a97c818ee83855b174
-DIST bitarray-2.2.0.tar.gz 75776 BLAKE2B 4be063193ee4ee5c991213837b360a97ef26949e9e3c83fb25796705a9d22816c16024e9c657c95b57e5f6a5d60cf8f8c829efa847dd5691d0f62ebbca214239 SHA512 74d7f05a9d03adf660f17883782eb1f2bbd08922c3f6a9a7a44eb86cfb29ab8e3b7c2aa7acc27656d04713396e956771b3f9b429630b74f0dc39a6bad869fe25
 DIST bitarray-2.2.1.tar.gz 77371 BLAKE2B f6f699594a28fa680eaaa2ad260da00f9827090e770b22226e7a4bfd72c54759a80370f6842cb473dade6761b744175e4630af5e7b3fdd09768b7199e1a08e74 SHA512 7eb25359d405e0be63ca7faab50fd7ab652d8f838f09587b4faa94adc78952582e7c7c0b605820e5feafd18d35edf050f70f65bce1123b883ad47bd1e54244d3
-EBUILD bitarray-2.1.0.ebuild 555 BLAKE2B 4f7e2046976d57a5add057dbc5fbff927a02ec2047d981db903eadd48eb1f0d24eb7e6392df94f1a4c1d5c117e628f34300649ca6d52c2b2f0fb707dbc5ccb33 SHA512 dbadef341d58ca5ba03615f7c775c4be0215c31c88ba6bee3ebc8295436b2719d71ff01ac41015f7d5d7b3b657134fcc5a6d73635dc8976b4a9e55a0a416dfc4
-EBUILD bitarray-2.1.1.ebuild 557 BLAKE2B c8a3a316785b960272dd06ee3f2ad6091309cd16024f96404af5ada0cb39dbafa9ffb38df308be136291970d495b1eac3694c47e575853060df68004ab0fc5db SHA512 9f3af9db79c50d00f009490a995623e0bdcf9a066ed27154d585c11bac5453cdc0e2bfddbe97da38968755bd442313a52f89aaaea34a4b408606dbf7beb615a3
-EBUILD bitarray-2.1.2.ebuild 557 BLAKE2B c8a3a316785b960272dd06ee3f2ad6091309cd16024f96404af5ada0cb39dbafa9ffb38df308be136291970d495b1eac3694c47e575853060df68004ab0fc5db SHA512 9f3af9db79c50d00f009490a995623e0bdcf9a066ed27154d585c11bac5453cdc0e2bfddbe97da38968755bd442313a52f89aaaea34a4b408606dbf7beb615a3
-EBUILD bitarray-2.1.3.ebuild 557 BLAKE2B c8a3a316785b960272dd06ee3f2ad6091309cd16024f96404af5ada0cb39dbafa9ffb38df308be136291970d495b1eac3694c47e575853060df68004ab0fc5db SHA512 9f3af9db79c50d00f009490a995623e0bdcf9a066ed27154d585c11bac5453cdc0e2bfddbe97da38968755bd442313a52f89aaaea34a4b408606dbf7beb615a3
-EBUILD bitarray-2.2.0.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
+DIST bitarray-2.2.2.tar.gz 78273 BLAKE2B 1c9b9c4011b1b11481209aba6958aa3c58dc2c1f5188a97f8b6c15a8a77ed0338bfc64bfcf6da3667c317631e5d271408f443a33e214c8f123f2c764cc93d6b0 SHA512 98b02ecc39befa619c816117fdfc3d69efb931203bb509e92bdf800f5c64e8633a986751d1650cb33dd0c6c0df0653f70c97fe73d4334198b81f39aafec4e019
+EBUILD bitarray-2.1.3.ebuild 555 BLAKE2B 2b3a6ec7d61f8aab17773e44b70fa98a2ecc24384b22561fd83396bfc350ff7d9addf3228ae1580d0d9dc2dd6a2a6d094232b2e52568e06f6eb77540567bbdf6 SHA512 b7c65e4bffe459f8fef3c3af19be16f4fa1c948121ae044a8abcbf6f65ce7400d50641b3c794d698286b89b46b42479decdf8211c44aafc36c9c38acb619b2d5
 EBUILD bitarray-2.2.1.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
+EBUILD bitarray-2.2.2.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-2.1.0.ebuild b/dev-python/bitarray/bitarray-2.1.0.ebuild
deleted file mode 100644
index eadde2209108..000000000000
--- a/dev-python/bitarray/bitarray-2.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.1.1.ebuild b/dev-python/bitarray/bitarray-2.1.1.ebuild
deleted file mode 100644
index 15dfecb43203..000000000000
--- a/dev-python/bitarray/bitarray-2.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.1.2.ebuild b/dev-python/bitarray/bitarray-2.1.2.ebuild
deleted file mode 100644
index 15dfecb43203..000000000000
--- a/dev-python/bitarray/bitarray-2.1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.1.3.ebuild b/dev-python/bitarray/bitarray-2.1.3.ebuild
index 15dfecb43203..ad5f9ce0a0e5 100644
--- a/dev-python/bitarray/bitarray-2.1.3.ebuild
+++ b/dev-python/bitarray/bitarray-2.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bitarray/bitarray-2.2.0.ebuild b/dev-python/bitarray/bitarray-2.2.2.ebuild
index 2db993517908..2db993517908 100644
--- a/dev-python/bitarray/bitarray-2.2.0.ebuild
+++ b/dev-python/bitarray/bitarray-2.2.2.ebuild
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index f68f70e4604e..0cd71334b087 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,14 +1,8 @@
 AUX black-20.8_beta1-setuptools_scm.patch 467 BLAKE2B 4dd16dde09bdb9c9b8480eff2542f11cbe712919dec6678193fae1dd2d58c646c76ecc4831a6bcbb54ed5a7f3692f61953bbb8856e8dcf6b64918ccbf32fe69c SHA512 47df09f60aae9ebbddfdf513d9b6caa30aaf60d65cd21027e965b0544085d63312dcbdc54906a0d1ef0edfaaf00f3cc753a7af3c113f4001ef4b48ca53e04c6d
 DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
-DIST black-21.4b1.tar.gz 1135304 BLAKE2B 9dcb90109a9cbddb53682b6385f5b7ae5cc650251eeb8866921bdf8f04264d5ebeb2eaf4ca04fa761d461c6f389e352cafc2b2dc521fe6566a9d41da48830e44 SHA512 1a7d3ada1c91084c6e84df9367abca6d64315ba25dcb3a65ad13bfc3db76a13a84b1668fb23563e9f2ce61df72bcbd776b9d641ce670023465768c7269027e0a
-DIST black-21.4b2.tar.gz 1136152 BLAKE2B bd1ee42495953687e23338df793bfe791352ab91541dc9b563a1274378a6527dc9eccea92fcaaf3c67403448e0ce7d99f605ff7dab1d7d38926f0cc84a859e1d SHA512 6d74bb718aea64db6e83045af7e787419efd7fb647c7d2b49a412e92e796a800fa4f1496fdb28253af894956984e22836761d22677631726f705d78143a63444
-DIST black-21.5b1.tar.gz 1136153 BLAKE2B 60a8c1ad1e6b237a79f65b790924c405d12ab34f7b6067f069f26831c76fbf99a217316fa5e2b47421ec982da56b870850455f78a2a37ac7856f72b101ce4f65 SHA512 972c69d13fb1e3371273a3b185d4413f37e07a573cb7debda795dabb25bdca3d25fc1ba8bb41c8ce27088eda695a3ae1f12af5de3fd329dbd54019d3537d90b1
-DIST black-21.5b2.tar.gz 1143836 BLAKE2B 90e24ef83241dcccfe9c43e62e8369db8c961867c25f85ed526d7c0c4a9df0c75fc4709a07ab2e844c5a30d04c50f101f4a80348210d6b64c32fceb13ebd143f SHA512 3974588a6bdb9417d4886eceb0c79351e4129ea51c5d1de018acc2e571dab6f1ef244ac074e6e561e4353276939531d09050fbaeb93c891e47d780dd548b8f14
 DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5488ed4851b5afa3bf3166df9723c3815220b68eb5a069c167393f501063321addde19149ad4ef85d59938eac7 SHA512 0f676f6bcd8bcbbdc615a2086631b3cebf9b9612fabc62de78215a7319cabd4e200333340471dd26a6a80cb920f04bcfde5a8dd42d069c19dba471ade30487ac
+DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
-EBUILD black-21.4_beta1.ebuild 1519 BLAKE2B d6d3c0ce41131dff8bf570a315ad71ab2b41f5856e4e3f0700318b8ffe0cf74501924e8a7ca0ac90d2b406fe045552cf589bcdfc9638bcfe157bc53008e6bae2 SHA512 6b078742ca657d8fb7430e588301c36771a9db7c0235b80fd66fce599ddeb72611044656a572a4357312db635f02fcbd485f1f873c0945c2889d4d1e21210e60
-EBUILD black-21.4_beta2.ebuild 1519 BLAKE2B d6d3c0ce41131dff8bf570a315ad71ab2b41f5856e4e3f0700318b8ffe0cf74501924e8a7ca0ac90d2b406fe045552cf589bcdfc9638bcfe157bc53008e6bae2 SHA512 6b078742ca657d8fb7430e588301c36771a9db7c0235b80fd66fce599ddeb72611044656a572a4357312db635f02fcbd485f1f873c0945c2889d4d1e21210e60
-EBUILD black-21.5_beta1.ebuild 1569 BLAKE2B 6ed170af0fabe5c5f81468ffc19c687a936dc815338c1574481c4ddf900f6b09a67ac4d0fe1bc6b44377d6dda92bbf4b6f5afb6abdd48f5aa0e9eac8fe9fe1b4 SHA512 8662e404c08b9bbb4b837645fd67d77c1d5b7aaf85a054334d2980ccf27e4db1096c47bc2466bee3e56ca53574cc09cf7dc59ad616aeb3cfbfd1a4f089334980
-EBUILD black-21.5_beta2.ebuild 1544 BLAKE2B 7e8af30c33fda87f7d24aa2aa396f4cf748cdcd862ad747b7e012dae3b3b65c9c2556e3fbdd5bf5bbb6e79a4e3c0293f035cf1547664a2517aa0b9cbdc694337 SHA512 461b9e04c506c68497e0cbe6fd7eb6cc5f6f6ee36cb2596916f4dd0cf0a59479b112c1b03e8cd6d7d621a0690c315fc2e6a3e57a74dd4c64b8a3d345c3517746
-EBUILD black-21.6_beta0.ebuild 1538 BLAKE2B 044ceacdc37ddd64a97d74af6ec9ec03e4dfb1979870ec23ded907515bc8cd0338f7785b85ba173eaa4b57bba806f92d40a4aaca826a499d2d549b3a06754a0e SHA512 e762ae3aaa8a311210ca5602608fe6e7adea40a839e9e4d2145b900bc02dd30a96bcfddaf8af2490e2e95e0b802eca088a7c2cf37953d120aa61e9ffba0d6939
+EBUILD black-21.6_beta0.ebuild 1536 BLAKE2B 980dc773be1b94a4d1daf50f9a9432b734e166dd0dae79b239ecb720999dd06a1313ada814bc986878e6f433c2965fedd47c437e9fcd64bdc8bd59fb3fbbce45 SHA512 f4f1d020609bf8171e770a2c7f6a41f7ba5047facef5010d229c1881f86ff1bb635341cdff63148b5da0c5b1aac103fb67450ca35d929a7413faba706084094e
+EBUILD black-21.7_beta0.ebuild 1334 BLAKE2B 437d2ec4445a6653d4415e3f307fe84468eb99f0422bc1a0919f71773de361224ac57e52e932c595d77f4865c4726f5c1a64a4f740e25dbe9d3485398af946f2 SHA512 7450a4f89eb092402f7b662588fadeac5a2febd13f6320f303678c4871882a6fff9672cc11c771bbb2a96e0a10baba7d1b0bf9ab63f86dc67fb59193dabd4a65
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.4_beta1.ebuild b/dev-python/black/black-21.4_beta1.ebuild
deleted file mode 100644
index 9257824ce16c..000000000000
--- a/dev-python/black/black-21.4_beta1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_7)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	eunittest
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-21.4_beta2.ebuild b/dev-python/black/black-21.4_beta2.ebuild
deleted file mode 100644
index 9257824ce16c..000000000000
--- a/dev-python/black/black-21.4_beta2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_7)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	eunittest
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-21.5_beta1.ebuild b/dev-python/black/black-21.5_beta1.ebuild
deleted file mode 100644
index e02676ead3e7..000000000000
--- a/dev-python/black/black-21.5_beta1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_7)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	epytest -m "not python2"
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-21.5_beta2.ebuild b/dev-python/black/black-21.5_beta2.ebuild
deleted file mode 100644
index c80dfedc410a..000000000000
--- a/dev-python/black/black-21.5_beta2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_7)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	epytest -m "not python2"
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-21.6_beta0.ebuild b/dev-python/black/black-21.6_beta0.ebuild
index c69866925f81..0675c52604d4 100644
--- a/dev-python/black/black-21.6_beta0.ebuild
+++ b/dev-python/black/black-21.6_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/black/black-21.7_beta0.ebuild b/dev-python/black/black-21.7_beta0.ebuild
new file mode 100644
index 000000000000..38f9c3e07d94
--- /dev/null
+++ b/dev-python/black/black-21.7_beta0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 optfeature
+
+MY_PV="${PV//_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
+SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	<dev-python/pathspec-1[${PYTHON_USEDEP}]
+	<dev-python/tomli-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
+
+python_test() {
+	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
+	epytest -m "not python2"
+}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
+}
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 49973a093031..e10b90052936 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,4 +1,6 @@
 AUX bleach-3.2.1-py39.patch 1637 BLAKE2B eeb66b15ad738d07db70bbf4599ef393678ca737d122efb7b0c5b5ae6f153b8989b4efc0bf26bdc34c9391af0e81fae5a0f01bc25e2b11db0c5ca76785d6b848 SHA512 5bffd50d9be425a97d6032ad6a55e2d92826ea9e074ea76039a94377c2b4f53599a740cd7fd5c6f90aa2ba87882d46514d014889b0a09f8273fbd31fa98f5b50
 DIST bleach-3.3.0.tar.gz 181274 BLAKE2B 32883ef9a77bf1d0cd208217930474285e55f158dc8d7b9c4049ca896cdc5cfb873674aa5f5181c31d46345be29f954badd29969bf156b1cc10eb200214de367 SHA512 8e408289c5175234a383658552e48379da9f570866e4c248a4e5c0b7bdaa9a2e6be545943dd32968cdb425929d51de282cca0678fdc6dd06b6fc2c2f41b58097
+DIST bleach-3.3.1.tar.gz 183687 BLAKE2B 9ca70ff84919b6b893afdbf7914098efe7dc3c9f0c86a729a92754ba6dacc95752abc44cea96db282483cf53413d6a98421c95f102941d23adf89af00b2a5afd SHA512 bb68275f91a4c724c14594d008f58d31ab0a97b08fd45b6cbe8237a31a1bbfd24a19cea1a835efffb979739ce17a3c065099e677019e498e78d9a4222ff2d66c
 EBUILD bleach-3.3.0.ebuild 977 BLAKE2B e2b92647dd8040bcbda4d045e9decd1253e527c6d4850f5fc6de0608b7f21b65f063561dc59cadb4970487d9b7939c936e026a3eec3e88fbb02abd94d9b4077e SHA512 aa9378ec21b658cbb780fc69f547582d1c20cbe8018c5e13439512793164e7f98dc85d4d4e78dbc3e55ce4560260e6bc901372130d5a70b332bb798a0ea8816d
+EBUILD bleach-3.3.1.ebuild 989 BLAKE2B e8e9874d7a6147aa3bcbe782ef809f3f34d726f90ce8f812e2cca46ae6d22c93665334a001ea53406026aaaed2a12458eb2e8e6c5aa676c773ff9ef105282ed6 SHA512 beb43388c19a2fd8b9ec2200bd91b8feb3cfa591e2c40f572ff4df2c833eedf7a7ab86b9d8f6860baa7168701c065e783a816f8acce25f2e6291f72197f164dd
 MISC metadata.xml 400 BLAKE2B 931735ca08509e3a1f8803181a1eca6be10b654fe37244772eb43b918dcac641c1733e535f2504bfc311644e52506712857ea24bf4784cebcb8b6063194d1388 SHA512 b73e3cd77b2378668b4086395f9a268105d94992f7b9d23ca8cfb834d015cc3ca0ed995acadba9060a5e96d29bae128b850a803a11c4b3d993f518180d9b4b5a
diff --git a/dev-python/bleach/bleach-3.3.1.ebuild b/dev-python/bleach/bleach-3.3.1.ebuild
new file mode 100644
index 000000000000..0310e25c43fd
--- /dev/null
+++ b/dev-python/bleach/bleach-3.3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="
+	https://github.com/mozilla/bleach/
+	https://pypi.org/project/bleach/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/webencodings[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/bleach-3.2.1-py39.patch
+)
+
+src_prepare() {
+	# unbundle unpatched broken html5lib
+	rm -r bleach/_vendor || die
+	sed -i -e 's:bleach\._vendor\.::' \
+		bleach/html5lib_shim.py \
+		bleach/sanitizer.py \
+		tests/test_clean.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 3cd0542bf1b4..bf03e9c4823d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,16 +1,10 @@
 DIST boto3-1.17.104.tar.gz 387800 BLAKE2B 928824ab0a0c091fec430c5d86b0c5663f2a98042a76311588463f36f48a6bd9641fd25e07b63ad50afcb3ea9bfea0b5f3304e3c2689a2187198aac04549346c SHA512 477033e623476fa1e2e49cdb788f204ac49230088788cbae3f079de4561e7bbe56bb3b170480592a0ce056fcd2ea0cb3f14b4f5091279f46346465853a191829
-DIST boto3-1.17.105.tar.gz 387920 BLAKE2B 475342a93440418f6fc5682e7c24f386aaac8dc91e670e8c6ab7f949fb8557c97ca0f7e7929128742c3b1091cda2a42e0f1212528f8fb1c7ce1a6dcc3aea18c4 SHA512 a044f0a61f8ebea58f7ebbe670b4f0ba94f6c3abe69857340908be780e1cae5f5f3ce892ba16af44df62542883d30b93a9b42830123dd3fb31998ae8c642e1b4
-DIST boto3-1.17.106.tar.gz 388602 BLAKE2B f9cc023ce4c0810ea7eb004126941229536fc068ff51039dc9f9943d153f8fa717e832c7161f85332e3edf596f55b3ad7dfb9ef117b471f59fc269ee9c63818c SHA512 866286d91d157d513f35231f8d512cd9738c7795b044b41c8e2b1594ed83a6060bcb3a2e3c8388df2ed86c7b04e0ce2d42c88393d8a6753d04c2a007865033e4
-DIST boto3-1.17.107.tar.gz 389348 BLAKE2B 8c0893d8ad73563f63254877621440ba24dac76c577f5684bc37b5f99b9111be209f69efa324cc079209340051230a43b66004d09ccd5804d631b0c04083c384 SHA512 450222507aa3bae8062b788ac7f637dbe8a5e7a5baa0f45001a74a810c2579927a7400cef180b57a7d7e57c391d665930b577b39272681ca380b5e553385b1f8
-DIST boto3-1.17.108.tar.gz 389871 BLAKE2B 964ff0b2d7a437c569e2b19f5c24d228df6595f15d72350b2cae0cb43c5e1f4d8376c0a25ec393a0a0f085650b193afc852fef59d258dd1c3addbfff4c27ce62 SHA512 4b78af4e59f399aa022762b6d1dc14252d4f549cdbb9264e5762a927b3a7e391d336ca48d938b1245ceaaa243ec01ea642545bc97abe5f7a3f8f8774ee21e2ce
-DIST boto3-1.17.109.tar.gz 390366 BLAKE2B f39548e623fc65907b13d7d5ba8a16034e5f741a3343ef69e52984a2417b4fcf8c21cdd49854222781a41aef0e26a7ffeb38c7a2dc600321ef6e7574f43e785e SHA512 4e13a99db4be8d61b217afc9bf4626ae5e6be524684581d74b7d7ce180c8d74716a0ef196ab6b91a7ef6fa56a57887e6ab0d05da380ebf8ae5bb915ac1a844b2
-DIST boto3-1.17.97.tar.gz 383223 BLAKE2B 1a1b4e9f2c51d830762f27cf3e30038efb88322e300ac304d1cb88d5b7efc6af35ad9810cea7292c9807dcdfedb11ba039ee6d5dbb9162f2a1c6d6936ef75bcc SHA512 e74a59763cc9b8a51fd09121a790d29a7291d9380d4451c2e6af90902f18415a3780eeea7f7d63e052b295792b92c3cdd3b8597f7013241ebbbdb7e418cf73ce
-EBUILD boto3-1.17.104.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.105.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.106.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.107.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.108.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.109.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.97.ebuild 1336 BLAKE2B 7e8ad6dba926d35239c71ce2d80fbcaf13062ae03bbbd962bb4842f6ab01ee0226b8f41dd57b05c0e4602a45f43017213fd6da4ad6a1afe36307e006b0866d25 SHA512 185309d57be679c0cff90fc53e0868ddfe7dbbd6a8d46be2835b825cdd48ad9e942e9212b4c853caea0c90711a3b729a0181b6aeea980e9e01e0de13b01712a2
+DIST boto3-1.17.112.tar.gz 391748 BLAKE2B 071eddfe134face48b86985ccd0171e0d8994fc65cd75e26945dfcab29566f42aa965c82b736cc7dd821a920e6903e4c45917af1759214606c2448b46c528cff SHA512 dcee3f4e2dfaf8feeeecc82ca938a72d654ced7a44f32e3dab43a225d8dcf0b3d20f0699770cfcd8ede840f792d37e124597d096322b88ce54c2e27e109da6e7
+DIST boto3-1.18.0.tar.gz 392345 BLAKE2B 8d464e038892cd77d7b171c27f41eee31c630ebcadce6677f76ccc270f3f8471d7a8443d174ce1b6ea5cdcfe98973faa42ddda4123ec21d225464515bdcd862d SHA512 ba5af17ae6705bfdea4a9d6bccb18d3f1593980d594be4dbb3049123089ba7d8ecaaed685d8a3181ae50e95b537e7a50fed3be694b4f61d3ba250693ae249f4d
+DIST boto3-1.18.1.tar.gz 392759 BLAKE2B bfa0bcfba9a413fbb13b2698f3ef2461cac99a9fddea0fe16d790a0ddab60fcd46b13ac4026536b9f89fb65ff703d61a4f01499423aa54289f17fc0f035ea2d6 SHA512 1aca424ff105fe2049c94aeaff306a683dd4eb9ac9b88303ff4857f53ddb4d3f267ef69119f8cbdb8463ab12331b2d89149fd0b10ccd23c4fde9485e63ba0005
+EBUILD boto3-1.17.104.ebuild 1336 BLAKE2B cd492f68d066b954200ac23e330958382b0ed6d5dd6389b24824282197579442a7ea9b70db065259f436aebabb898fe9e9556f5be525fb7bf47960fd61903782 SHA512 32ecfbc280efd39c19295d6d38f3df12ef199263e741b13c35a0a927a609d90b250ba2a5a1324f045c493db7249d5889627d772767cf5de74946a35e5d17e9bc
+EBUILD boto3-1.17.112.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
+EBUILD boto3-1.18.0.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.1.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 605 BLAKE2B cb7041ecfae68d44cc4c533600c9527f901b3b57b4ac6b7877b489f849e1257f3ea157c901bb67dd44ef06296f02564b6b9e341bfd1d102b68512f7a40b48ede SHA512 2f9630e0d4396ae6f3a7a0aa328440fba250d330d4cb5e4a9cc68caaf0ffc133960294ca4fdd0bae150a212555ebdff07208e909c6f7207857a3b7774178dfc8
diff --git a/dev-python/boto3/boto3-1.17.104.ebuild b/dev-python/boto3/boto3-1.17.104.ebuild
index 75afb4bcf865..1e9c1265b2e7 100644
--- a/dev-python/boto3/boto3-1.17.104.ebuild
+++ b/dev-python/boto3/boto3-1.17.104.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.17.106.ebuild b/dev-python/boto3/boto3-1.17.106.ebuild
deleted file mode 100644
index 75afb4bcf865..000000000000
--- a/dev-python/boto3/boto3-1.17.106.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.107.ebuild b/dev-python/boto3/boto3-1.17.107.ebuild
deleted file mode 100644
index 75afb4bcf865..000000000000
--- a/dev-python/boto3/boto3-1.17.107.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.108.ebuild b/dev-python/boto3/boto3-1.17.108.ebuild
deleted file mode 100644
index 75afb4bcf865..000000000000
--- a/dev-python/boto3/boto3-1.17.108.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.109.ebuild b/dev-python/boto3/boto3-1.17.109.ebuild
deleted file mode 100644
index 75afb4bcf865..000000000000
--- a/dev-python/boto3/boto3-1.17.109.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.105.ebuild b/dev-python/boto3/boto3-1.17.112.ebuild
index 75afb4bcf865..75afb4bcf865 100644
--- a/dev-python/boto3/boto3-1.17.105.ebuild
+++ b/dev-python/boto3/boto3-1.17.112.ebuild
diff --git a/dev-python/boto3/boto3-1.17.97.ebuild b/dev-python/boto3/boto3-1.17.97.ebuild
deleted file mode 100644
index dc4338635795..000000000000
--- a/dev-python/boto3/boto3-1.17.97.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.0.ebuild b/dev-python/boto3/boto3-1.18.0.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.1.ebuild b/dev-python/boto3/boto3-1.18.1.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 2a5af42dc222..26cb3e2ecd71 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,17 +1,11 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 DIST botocore-1.20.104.tar.gz 7883624 BLAKE2B 4fb4c6abff5a2c3d3e19b11576e723f15a442b2d49e461a2a4c2bd613e26095ceb87f4b7ceb672f338ea04ad918060bed118f7bc4c184c46cce1d6a9f98d4239 SHA512 2201d87ce2e1c8979548698d6a46eb03c0a2026360b178fea895ad6a244efad534d9970d3c6343d50639d25b3b8643db6744658fec14e0fa29fd7c4b45c8e0d8
-DIST botocore-1.20.105.tar.gz 7883335 BLAKE2B b48347e304ea54b56a37faae8bcbe9c127118b5bfadc71ffff3f6914b57f4d819faaadfc25834e49c9523f073f639823db4046bcbd9b5b72ee1df4c2ad198338 SHA512 72267620e4ecb7e4e4fa446b8f5c0b42d2e0af372f9e8bcfea123e5d8a6f4638102d57a9eb9f3c6f2358c6c2b36e727552c0b350b07f95a79292fb3c2cf4dd99
-DIST botocore-1.20.106.tar.gz 7885164 BLAKE2B 3fa8b860a40a0915f6a59912fdee7b9e55fa88170da747d4d87464a5b44d6cbd5ce83cec383a7a1f41ec9a203d43a8cc006c7fc0005bfcf2869d66aa9f333b14 SHA512 135d789e2d5975697840dc4aca759b2d07d70d58efed7356a3323feb54faa2b8a339a48a3ac931270e335bc730eb8cc5e87f6fc2f9e3aebc452aab331ca49261
-DIST botocore-1.20.107.tar.gz 7893209 BLAKE2B 4e4882efef667ae91bb3e42a84748609390ef637d0a72a0b8b9dbab83a55cac9117553a0ef34bd38af98493d0972fd6178b322207c71914068eb3c634debaae9 SHA512 09c7a4bc4fab922aa7dbe94fcc0da6a462dbd90bdd51e8612431e5a790b46c56eab3b436048572a4a14c6ed2417ddca8efa52474d28fbe32558550c44b3fe0dd
-DIST botocore-1.20.108.tar.gz 7897833 BLAKE2B 3b4ee27640dbfce1c9923137ef21500649454eba8e1a5b569fb0d949253e619852b61344ff86c769e2f2314a089047fe9590a685982491b21f4f7feb0a33b220 SHA512 a394fa8fc686d07ad5e1a25f0403d4adf53aa6af565696c4bd5aab58ee8f739b761f4c8058263a05b028175d1256ab87fa7fae3035cee605f236749939cc0eab
-DIST botocore-1.20.109.tar.gz 7900306 BLAKE2B 1f2009ccb236ff7b4d9d3b45b34b2295c9bbbd4bce207c51514bf3f568985eb3d5fedaf0e5309266f46ad1e42466524d148d601452474b738b53c329f0164a84 SHA512 7f266b2395f79bfa629ac147abbf646bf049ea78b208228b3817912626845fffac9c89419c75444116ae6f14067805e291faeb942e6d25061d2e6f1c382d762e
-DIST botocore-1.20.97.tar.gz 7846552 BLAKE2B da0355cc229ba8a0632f67866bf06b27d7b257184b53670e5dc183c6b5a1f4d3a34145de0a3f04abd2adc08de3f0775e3c7e0dbecae729acb5bc05c7ce9acaf2 SHA512 7411d5de8ecf0c42c0142ded036189dcf378cd16f761071beb5bc2a2c240eabb0c4a8c669ce89a5b4e798a0aae92f0e67755627c2a84df77fc2e9557265a4e3b
-EBUILD botocore-1.20.104.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.105.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.106.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.107.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.108.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.109.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.97.ebuild 1509 BLAKE2B adaf8d92de73c9637d36076b667adf0923761053f3da84b9889e84ea5cd0871edcfe27ae1849df654616f1cda04d6ac5e73f4665e686929d4ef8abaf2a7b379a SHA512 366bc1f07343f294e02e78d76efcb60935e62435f58807b67ca96d9715ef8f787f922e0dc199ad9cbd9e2a9d57892c1d770da6cfd1eedb000b14342d29991aa1
+DIST botocore-1.20.112.tar.gz 7917776 BLAKE2B 6a5ebf3d32c505ec2c1fc4cd3d97aa94c76b6206dda6ba28a946dfdc9973073019389c05d1cf09a0eced701fe86a9b8a292835415c0b1ceea75959a3186f65c6 SHA512 4b36367ffdd011aeb7654fd5c52c38e95bae4c55e5af85e38b0764140539ad1f8b9d75b0c7fd1009fda8d005ef4b17673b06f85a76b52fcebf05925297b6bbbf
+DIST botocore-1.21.0.tar.gz 7955550 BLAKE2B 7e68375d07d858dc2071538c2382d8693df23fea5326938491c492abe55c060d0cdf98698cef9b06dac996a59c907ed780e5baadabbb7c10d5e41efa84c4750c SHA512 e56eea7f3c4f39f51ef1d53dfb42fd5d601167cca7c868b1cf2f291732a8cf90aaa874760f262085439df5726c6b610369a325e863533b593aa708fd901398a1
+DIST botocore-1.21.1.tar.gz 7954248 BLAKE2B d6e7a71d6dd90ed0fcf0dbab3182dcdfa4072e65a1f344d44ac30abc829ac6c546a0ebcdee51f61ae65008550acf65052b49530ae3b3a62d81af222e6e8a0929 SHA512 86d4b4159a96426e7ab853b06564604fd9729011199ba691f6204a7e5f52d9927b93511b73cfc03b65bce706563c6d50b577d85d0de0e50fb5d877472d8326dc
+EBUILD botocore-1.20.104.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
+EBUILD botocore-1.20.112.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.0.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.1.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 MISC metadata.xml 611 BLAKE2B 03764517dd63550373d7be154fef3a5e3a7e55abebc6ad58011b707d1e331c362dc6e13f6f1a6831827f8bf68dae027870abea885d8c5b3d8a64fcca4ae61fd0 SHA512 3532135859fe085e3fec2c04e0f5ab0eacb40345730178729736553f025037ffe77033d63407b4097f65cb31d1f300dd56b777d139630abe2f2f8f9991e0bd76
diff --git a/dev-python/botocore/botocore-1.20.104.ebuild b/dev-python/botocore/botocore-1.20.104.ebuild
index 30e0988848ad..6b848259897b 100644
--- a/dev-python/botocore/botocore-1.20.104.ebuild
+++ b/dev-python/botocore/botocore-1.20.104.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.20.108.ebuild b/dev-python/botocore/botocore-1.20.108.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.20.108.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.109.ebuild b/dev-python/botocore/botocore-1.20.109.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.20.109.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.105.ebuild b/dev-python/botocore/botocore-1.20.112.ebuild
index 30e0988848ad..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.20.105.ebuild
+++ b/dev-python/botocore/botocore-1.20.112.ebuild
diff --git a/dev-python/botocore/botocore-1.20.97.ebuild b/dev-python/botocore/botocore-1.20.97.ebuild
deleted file mode 100644
index 64b854be9334..000000000000
--- a/dev-python/botocore/botocore-1.20.97.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.106.ebuild b/dev-python/botocore/botocore-1.21.0.ebuild
index 30e0988848ad..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.20.106.ebuild
+++ b/dev-python/botocore/botocore-1.21.0.ebuild
diff --git a/dev-python/botocore/botocore-1.20.107.ebuild b/dev-python/botocore/botocore-1.21.1.ebuild
index 30e0988848ad..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.20.107.ebuild
+++ b/dev-python/botocore/botocore-1.21.1.ebuild
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index 1ea188fb7088..67a1de919032 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,3 +1,3 @@
 DIST bracex-2.1.1.tar.gz 26078 BLAKE2B 7313aac70d2bdb8473396a651a5d62a399084a0277e8c4665ef79fbe00347b86fc9793066584275f2a77c6c4cc217e6235f2f06ef4977f733039984c562ec529 SHA512 922f627a001c239cf5ace47fb2f295e04200116add01ff969f8de49067098dea43286c3c739d51286b283d354cb6e411b7e2e6cb1c4863ba78edccc7bd461c86
-EBUILD bracex-2.1.1.ebuild 1049 BLAKE2B dd4110fe090f59503599f248f7ef26cae5dc5e419f1723b8a7c9d57be5a9a11fd72676045b139a9145cbc47774361697a1b254fb03e392dcd78bb1db8f8eb21e SHA512 fcffd84b07718db713338dfe8c5093e40efadfd7e2ffce3e65f356df446c65e82a8fc342bf45c9285a38f31fcd9e2b0e29249c6d940e3ab924169e6073de6da6
+EBUILD bracex-2.1.1.ebuild 1047 BLAKE2B 8a3982def9da1bc47199e5b9a53f1c4cafaa8f90c817cead51977c64f476f557df777584717fc4cd77ab8e7bc4ff7525461c4f2e55631f0f1dcbfe2880135e6f SHA512 89ab3d7a6882a873bad4a3a32d5e021a74d2e2db2d59eb5751a97f5a10f75bc210026f1974b6fd6cf8212fa707fbae1c320de7bb59b0e3bf264f7577207c9e94
 MISC metadata.xml 1251 BLAKE2B 7c791f302e5cd7a9eb9f1693e7b6bbc08d2a124ed55e80283c3b795dea30b29077b48802e735e685a3f0bd9c45d8b7054c550d0e835e1eb3bd590d346bf9d76f SHA512 202e98c2241032d3f859e6484fe659d78a1a3e277674c05e69552dd8bd3df9797ee0813a04c88ebca0d5d281944082d3c71ae18370f23d43e2d1f18b78a37f5b
diff --git a/dev-python/bracex/bracex-2.1.1.ebuild b/dev-python/bracex/bracex-2.1.1.ebuild
index 14f6cc11376c..210344a4ca18 100644
--- a/dev-python/bracex/bracex-2.1.1.ebuild
+++ b/dev-python/bracex/bracex-2.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? ( dev-vcs/git )"
 
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index e4699bc19e67..2e3532b5db6a 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,4 +1,4 @@
 AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8bdbb0b7af8e60cf85391c673d86e3eb1218a393c9b454d3d94b88968421ed9f3d798cc1d28ba7510bc75ad3ec261 SHA512 3fc7c2785586f88b17864931528e8c8e25792855107e5e8b76aa79a198303b68bd8cc822a2a5ff7a646c9f11982a3b5992a9eeb3bd651bbde1792d13a1410021
 DIST cairocffi-1.2.0.tar.gz 70393 BLAKE2B b5cc69ec2805524e8f66a6234c4e19502181fad18c754379d91b05c2d2a88c82742f2b2057afcaac93f4d23ee64b41b2e84f029b6cb4ce2e7b3fa81ae0e8a485 SHA512 0f5b58ae85b2cc880bfb8ede6cbfe4905737211dab5b080815eb59f7cdd9c580367b9e00e7216d68ea9cbb84bda3f21ddcbccb2e744b86d6da8b991cffb96caf
-EBUILD cairocffi-1.2.0.ebuild 905 BLAKE2B 71bccf1cc8bd3a180658dd75636b53b37c657d332b28c787844399a53b35194e1d1280374df07fb2386bcce6d5013fa4802716e659fbbc018a42a0abc339fd77 SHA512 d99304de9392d993090546c13619d0e4e089d16a7d5dd6e87890b627e4ac7d289941072c024dee3c5471274d28abed3b1fe1f9787c73654371c71a00eee53d7f
+EBUILD cairocffi-1.2.0.ebuild 912 BLAKE2B bc8e0044f413f5e75f5327fd6991b9b75d844e4c9139f9f1a453162e099f472609e6005bfa3a3179608e75b10033ea6d794922016bd828c5d0ffd274205575a2 SHA512 55d351080e390c5d7e265133d19265fa21e2a7d6db0483824367ac43bb798d4f1553173890cf0fcc7070a3979f995d6ad4f7ab1e54a5229cc22c352659f64c5e
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-1.2.0.ebuild b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
index 39f10d4e3df1..e58a4d6e25e7 100644
--- a/dev-python/cairocffi/cairocffi-1.2.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cfgv/Manifest b/dev-python/cfgv/Manifest
index 702713db0ff4..df7166de5cbf 100644
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@@ -1,3 +1,3 @@
 DIST cfgv-3.3.0.tar.gz 10393 BLAKE2B d4cf565884aaab6a81716382ba8e3244e36a3381b771f7e206053fa80500205bd3b70b62b611ce4a7f0cb143a763d51eb10b1e29333b7f06e29cb406f9f7f6b8 SHA512 23a238c76635404b150bbc3bb1eafd8eb521171e69bb3f3fee55a0a24c12d2ee152cc7453a41952d2f41a6cb72575dacf4b990dbd443f69026a770c87a1e081f
-EBUILD cfgv-3.3.0.ebuild 469 BLAKE2B 17a7ce7b35d2bbcd30d9d72db1a8b09e1c97ef207af8a99de1cc7014d02ceb0280ae7666f052f14304daf17eb96bc11d319508dc340fd207f76fccbc459534ae SHA512 2515fcc3a2991cba61a083d98c46b21383fa3578a12e8f18be4fadc25dc1b06a51aa2dc3f97e44f0c2a3f227e230088c02b130752b544817a7e3573305627536
+EBUILD cfgv-3.3.0.ebuild 474 BLAKE2B 2faf90c53ef30224e4d89fdd66057be00f437db21be79607cf924465df55aec664349f1f2de5bf3634e08fb033f940a238f4fb6bab6a999125857031aa7e6e15 SHA512 93816049de0844dbb3a0767f10e0857aca8f408d3fa962b75e33c5aae45a4cd79236b8321a357550078769e6ed7047d4ada2133f7e8ec3f0a9f75ee088e858dc
 MISC metadata.xml 490 BLAKE2B 095a603aa93c514e7d04381159b3ab9442c329dc4270b065bb347671bc00497d7d8094499f45a9b0785f75c6f06a97669f3c1ada39d582065743697726cac1da SHA512 bf284020d3c30c217ffae1d1d114eb3e93d114a6bed44c6dad87abbe11903204cbf300453b7a46d86d2f9575428e8f6c10ea1f7e3c53974704b34f4aa9d3878b
diff --git a/dev-python/cfgv/cfgv-3.3.0.ebuild b/dev-python/cfgv/cfgv-3.3.0.ebuild
index 6ca33230df57..37eaf09fbe2d 100644
--- a/dev-python/cfgv/cfgv-3.3.0.ebuild
+++ b/dev-python/cfgv/cfgv-3.3.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~riscv"
+KEYWORDS="amd64 ~hppa ~ppc ~riscv"
 
 distutils_enable_tests pytest
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
new file mode 100644
index 000000000000..0645e12bc912
--- /dev/null
+++ b/dev-python/charset_normalizer/Manifest
@@ -0,0 +1,3 @@
+DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
+EBUILD charset_normalizer-2.0.3.ebuild 593 BLAKE2B ac1dbcf2b540243c357ea586a5a5d2e34865b4b9064eaab1cbaa1b57a7bc8b1aaa2715f01aa744f9b4627a53689a8ea12a0cc5adfc236f58f4d914d15be3f633 SHA512 fda4a6cad5a571c4552ae02d7afcd4906f44616c38d57c339496632045857e6cb3c726f31b051db9593a1182a2b4371197e093496a239fc3590c1e16633e28b1
+MISC metadata.xml 364 BLAKE2B be46c29b2fa986a53e4abf38f4f68a9882e3a01c0d3c524a0935a51a04d3e71d98548401ae96e84155c943dc2baf127f28e0f24d764d9e4cea466e2ba010f432 SHA512 bca4661b93af7b085ba8c71ba91188a984336c30467d4e38a7856c2522f83ae6dee122e3061a9b434a218bcb11e18583fc02b85c7629dca5cfbeb6aecc63bfeb
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
new file mode 100644
index 000000000000..c31319b41abb
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/ousret/charset_normalizer/"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/charset_normalizer/metadata.xml b/dev-python/charset_normalizer/metadata.xml
new file mode 100644
index 000000000000..1b65bbbd11b0
--- /dev/null
+++ b/dev-python/charset_normalizer/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="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ousret/charset_normalizer</remote-id>
+		<remote-id type="pypi">charset-normalizer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/click-help-colors/Manifest b/dev-python/click-help-colors/Manifest
index 199ecceff4b9..dda09a8df562 100644
--- a/dev-python/click-help-colors/Manifest
+++ b/dev-python/click-help-colors/Manifest
@@ -1,3 +1,5 @@
+DIST click-help-colors-0.9.1.tar.gz 101042 BLAKE2B 0f40d6d15f8e0a4647212f57e071c49b66bcd2b3d7ef582bd7d8a14135e50028f3ceb07987b5b74a868d998c12886a711f40e1d85b541566c63dca39e43a907d SHA512 ac4ce56ab249f7b98f670a6624700109f20a7c666e006b891d5c9fd4977512a0c94d82f6b43915952179abc946899f85fa1d358cd3d59508ef341ba22d8fc745
 DIST click-help-colors-0.9.tar.gz 100701 BLAKE2B 838507658aec9cea962d1f373bd771871837d1fe274c70fe4555efbd4e1825203d8728457c5836a482add26e86d4eed83b962811602864d43bf8174f49bd89cd SHA512 02cca02a5cec6b3b23fdeee4aef921cac1cf83d85bea8eb04dd100955dc27b2e4d098bad2f49694c0aa6548135fb979a1fd054525dcec27077f461a034d62a87
+EBUILD click-help-colors-0.9.1.ebuild 602 BLAKE2B 20b54e68755c6201107ecce9f1b1515cd845ea534bc665b9099dfb7a5901f8102bafcbac37d46278c19d519cf54e3ef4825e92023cdccf9a6469d1311be3cdf0 SHA512 88dfb13846fa12889862e55f927d9fba42b2bb9a9e0a85c59bb416cdd737457922d7233b07e008a3dfa4ad19d16675f09783aa63f5b6fe8fac37c3f225738329
 EBUILD click-help-colors-0.9.ebuild 612 BLAKE2B 093296e1bc0a492edcc6d6c29c1635d63352f2903f48103d1c0012daf5fe6429f7e5612da687810d4ae890542b3c260d9e431908522ffaa6d7859c5069d8e3ac SHA512 49175a08eda7d01d1f6211ac6021862a8b1f9e716b9d2e972530dadecdb225c32fb191906e55e8ea8b952c5392db28904ee40eb4b68ab13ff6778f2d8d422ebd
 MISC metadata.xml 420 BLAKE2B b7f9eb67dcb6e7e6f2de54e0f8d96974147d92a5839fffb5d68201dcaad1ff600caae1971d9d0608366fafebaa270d8aa750bee3e51fa3a97ca12c2fdf6842dc SHA512 b1fce393231a5053ff90f5163e2a4788500f0819a0623f2b8a0df391ce37f085d11ae69d7db41235195a31bc83c6ff729058d6ac0aa66d155a1a652f485d65be
diff --git a/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild b/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild
new file mode 100644
index 000000000000..251b5c3328a4
--- /dev/null
+++ b/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Colorization of help messages in Click"
+HOMEPAGE="https://github.com/click-contrib/click-help-colors"
+SRC_URI="
+	https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 097dead9116f..01f91444bae4 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,11 +1,5 @@
-DIST cmd2-1.5.0.tar.gz 662624 BLAKE2B ed46c4e70f1e09c612f66333bb601afab0158a899badd2b86ce193f7384c35d32c58d0a1238d5fc2b69adc11a233fba2089b0f4433c7b6159aeb347150128fb2 SHA512 ea7e26370e1f83dc95bd0db8a705ab8ea95935584123f4684e3b8debf23a37fbcadf2bc1634051eaddcaba92f2b22a0ab2582773630fab3d1482b4dc8a23acd6
-DIST cmd2-2.0.1.tar.gz 644705 BLAKE2B 5fa3b89d42252372b1b75863f8c1293182a555e6ab1b257f1a243c87685bd0aa643d2906741636143f7d3aa3be5ffea5f8616c25e99fbb8598573d3d1feada9e SHA512 880c5f2d80f81a850b545052df2bf3efaae8f44deb30186119a2d94277da59cb027da5bf35b2bc106b90c87883c8eec1a869df65988ced1b6a0d0c7e236569bb
-DIST cmd2-2.1.0.tar.gz 643826 BLAKE2B 532a09002ee957c7fc670f7507665153e39043598a54be0f1dba36de061d8bde6eade064c93a0dd1f9f95437e1dc833a6999b1bcbcb6d6c0e1d5e136aaadfe98 SHA512 0e262ceeab908077b1d698202559a6d093d493d6dda420d4dd5c069414c716a79a53276931e0fb80ad29ee0745525cd2b6ead6150a90daf11735dbcd66eeb2b8
 DIST cmd2-2.1.1.tar.gz 659548 BLAKE2B 17ff372505398df460b56b13c8ab7c8830a1bab25cc52429555bb3e0f766ef46d14a72826a5af58a6641ef533289296d00afa1e6d2980aea33c9792ce3173cbb SHA512 03624ce8eb6d94c7234427a8a7dfb9b321bab76679b166fc3af26ba581ceae74a90ab282f9d6ab0d48eec589614d5daa38ed88251dc7400b48c112863959d164
 DIST cmd2-2.1.2.tar.gz 660849 BLAKE2B a8c8db8036badc020b34e6d4cc62a6828a6f3788562d550826369d2ce6ddc41fdd29ab95bd56d35115a1e8c2cfdb6df97e3b25c3f414798aed9a597243b37967 SHA512 3f2edb336ec662e3b2e22abc947ffb669786142d29f0723b0d5bbf898ecff12096a91e08c4890dde79915b413c0f9a70945f1b5795ae12991e85d7ee79331d31
-EBUILD cmd2-1.5.0.ebuild 1412 BLAKE2B 5e7640c0555dfa7f8b441deadc7fbf444f6ef7de931d070966695f9e6a5d842dd9a84d4108109fb38f13fa5f53ecf7b276bbec5af5bfa8f5850a777af6868a63 SHA512 aeda875bc85e14c6667953dcac3a1ddf14ac5a7a255ad7d7f46a1b2ee376528d13deb2e5c2b84821a53a1f845743818e614202adacf0bef49eba05054a173cdd
-EBUILD cmd2-2.0.1.ebuild 1400 BLAKE2B 5cea68cb6690e13e75cc7533bf368890f16fe0b3adc5fe990f0a3fd36121e164033bf53dc845c39bdca28f1e1ea2692a0292ced3ef9619c13376ae226df56bb1 SHA512 eaeff2631073923d5bb6cd48b6c7edb6a1ff0bcfb4cd252803a9ba88bde6b8f7baa4c8ab3ba9e9570933d12618804dc2336fb192b0553a0cfc324d4fc900dcc5
-EBUILD cmd2-2.1.0.ebuild 1400 BLAKE2B 5cea68cb6690e13e75cc7533bf368890f16fe0b3adc5fe990f0a3fd36121e164033bf53dc845c39bdca28f1e1ea2692a0292ced3ef9619c13376ae226df56bb1 SHA512 eaeff2631073923d5bb6cd48b6c7edb6a1ff0bcfb4cd252803a9ba88bde6b8f7baa4c8ab3ba9e9570933d12618804dc2336fb192b0553a0cfc324d4fc900dcc5
-EBUILD cmd2-2.1.1.ebuild 1401 BLAKE2B 6d0655e38d6f9f91917057298035e818112b09b24a281979453b739cf0af5ca66287698d8582b5946f3f9c56a5c47b28348014cd87f5a8639c99210f65f8884b SHA512 86f66e4ee0252dcf4dd6e860e47c93c38dcc782a40fec4c7920a68c0cbc26eee85743e29935723e790e07129c2f65ad74b2477d07e08f4fef31e9f44590188fd
+EBUILD cmd2-2.1.1.ebuild 1396 BLAKE2B aaa14292dcb2fc80e0d4d4d65135a128dc7dc7c803fc18e4357275e2572f2fc2eb151fa114ef127fff1779d9c2e688c54d8227fde87c26dbc68235b558d168e2 SHA512 8e2e6bea3aac896eb28c08f48b2981f97619850122d4235c52c89f871313f3cb0f6a535f952374da5190ca8e4703d8426751207960be80bc7199e5ab00f43683
 EBUILD cmd2-2.1.2.ebuild 1401 BLAKE2B b1bca955a068f55b761600276fc997c7812e80a48a9a18183e0e1bdb8fcbf8a6c36b7e6dc0ee323084dfc66ccdd7a822aad468b988fd9d83ec1f384586946310 SHA512 417e6c9d09f29857743d4a007f75c0ca20fbd352af8e96ef4776547d169b12f974f41f64dfa3922c251558d7c5b14507126294ddfbc02f3a23c39633bb874292
 MISC metadata.xml 521 BLAKE2B 30386914ac906a5e6f08eff94faed7cc964475aca24a8055cd0636d602a1f8812936ae6a0560e7c31796d3461c07fa010e0b1d4d11eb1f6d3bbb6d414f475e5f SHA512 681e363e25381946d07e03d94649c8be03b50fa2415100be0374a69cf6225a284d37fddb002cadde62ba3ddba88e91c32d1d09e4a81266bd0fcf7eccab963bf8
diff --git a/dev-python/cmd2/cmd2-1.5.0.ebuild b/dev-python/cmd2/cmd2-1.5.0.ebuild
deleted file mode 100644
index abb40a0a9bf7..000000000000
--- a/dev-python/cmd2/cmd2-1.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-2.0.1.ebuild b/dev-python/cmd2/cmd2-2.0.1.ebuild
deleted file mode 100644
index 3e35f0efcaec..000000000000
--- a/dev-python/cmd2/cmd2-2.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-2.1.0.ebuild b/dev-python/cmd2/cmd2-2.1.0.ebuild
deleted file mode 100644
index 3e35f0efcaec..000000000000
--- a/dev-python/cmd2/cmd2-2.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-2.1.1.ebuild b/dev-python/cmd2/cmd2-2.1.1.ebuild
index 3caf2aa37e43..06714b1bd914 100644
--- a/dev-python/cmd2/cmd2-2.1.1.ebuild
+++ b/dev-python/cmd2/cmd2-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index aeae54005245..b02c17cfe6ac 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,7 +1,3 @@
-DIST croniter-1.0.12.tar.gz 38763 BLAKE2B 28bb662b05d893c782807687261b3bdafa0b1412d98dc8ceebcc0d9fff941f58b22a3abf9462c0f601bbe8701460350dad70d1239aa4f28978444698836b87b2 SHA512 ff5e35ddb0a6080ff95155de2ac5942fa1cab827a4cbb6e639553f8646b89063d0292b7fd69bc38fca90429da0272f3efeeefe0cbde0d83b9915ecb078340f08
-DIST croniter-1.0.13.tar.gz 38907 BLAKE2B 436bb766c39ad61343913e354d0838458e56048115ed5d15ef95b0dc0c22b38fb4e7ec3fe6162856d208d45268fd360c8b18698b7c61bb0f70636b79a6a84988 SHA512 721749a268734e06776ab968a1fb01926f416e1a42678ee28dcac9b4655a92b5cb17984a9b9d886f8d963484f1af7382b17e72fd3998e3e1e8101fa5038a4fa1
 DIST croniter-1.0.15.tar.gz 39164 BLAKE2B daf40bcc7c791dd2a65d2cd132c380dff03353ab6d7920adddff2b1b6a87166050be6ed2b7bac5eb2b9543dcab9a4f2f65738506dc35eff0836cc591e486f885 SHA512 5aebc8a60d278acae3cef7eee6ee0ec223e44ae01b69dae601f76cb14f135547557b1417498d71a84e187dd478605efdf15355f8ad0344e459b6b40d41e994af
-EBUILD croniter-1.0.12.ebuild 610 BLAKE2B cf3d4c1f620c95a3393fdf8ed058fbab4ff2945c569d142c880abaeffa51e5bc5ab4a21074aa7e4e5008ba2fa533ba1042a43e9f49c47133deade5d5d859a90c SHA512 a3107a73fc30c5a8426e250b4b4b6a52ba6b5622058ef82687ab9e6a216b171592ad087049664378ce22de19f2790f707a62fdc3c90ba99eef2d0642a9fb3d59
-EBUILD croniter-1.0.13.ebuild 613 BLAKE2B 44950745d0f17ca83fa917f90208a5d9cc9f19e29185ff3fd23f3c38a7f4f5e1928b864993513c04886b8cdd85d6895e43e9d8f1a17662d7961911dbcff641bc SHA512 e72ddbd17f2f33f96ed94eaf6bfa6f10a6bba4ef2dc06d4f078ee9257634ca28a0e2d0d6a7dabd9c658d8712e5f7bd0503b0b42392cee767e534153aec768b39
-EBUILD croniter-1.0.15.ebuild 613 BLAKE2B 44950745d0f17ca83fa917f90208a5d9cc9f19e29185ff3fd23f3c38a7f4f5e1928b864993513c04886b8cdd85d6895e43e9d8f1a17662d7961911dbcff641bc SHA512 e72ddbd17f2f33f96ed94eaf6bfa6f10a6bba4ef2dc06d4f078ee9257634ca28a0e2d0d6a7dabd9c658d8712e5f7bd0503b0b42392cee767e534153aec768b39
+EBUILD croniter-1.0.15.ebuild 611 BLAKE2B 6c31b21fb62dffe4ac035fb644bab20a22c8bf9bc582a818bb43e9a4bb4e870f148138741c11200c354e0869362f8a0b48f0090be04fd4c55d4af4f48c77c94c SHA512 1091b4d2cfccb52c6fe7d1b0e98f744a7ceec8da95e4ec83a0c54ee73117fe57c81b7b6c6d25eb07f3f60ebce23386f061553f4dbf23dd6ebd31b271227b01b3
 MISC metadata.xml 469 BLAKE2B 94811bf25a8bef886ba5ab75039994f844ba8d8311f993667e73492fff7775ae7846db93fab9b28d90c610f53ca3b8757d683a0e032c4c5693c0c348719529bf SHA512 092ee760431c977b57ba891289c77aba3f54616e7c2b8a48b6232c562c31c2a6e5d240bb7b7411d32080e5da119f47f6bff4d32b56ff10c22a0d4952b027b250
diff --git a/dev-python/croniter/croniter-1.0.12.ebuild b/dev-python/croniter/croniter-1.0.12.ebuild
deleted file mode 100644
index 51bb1316c8bb..000000000000
--- a/dev-python/croniter/croniter-1.0.12.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.0.13.ebuild b/dev-python/croniter/croniter-1.0.13.ebuild
deleted file mode 100644
index e9f104d3af45..000000000000
--- a/dev-python/croniter/croniter-1.0.13.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.0.15.ebuild b/dev-python/croniter/croniter-1.0.15.ebuild
index e9f104d3af45..277378fe8a2c 100644
--- a/dev-python/croniter/croniter-1.0.15.ebuild
+++ b/dev-python/croniter/croniter-1.0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/csvkit/Manifest b/dev-python/csvkit/Manifest
index d2ff863e20cb..2a074875bd42 100644
--- a/dev-python/csvkit/Manifest
+++ b/dev-python/csvkit/Manifest
@@ -1,3 +1,5 @@
 DIST csvkit-1.0.5.tar.gz 3783495 BLAKE2B 19210c23480cb3068af74c922a3495612f40bbf5c4985f7018c9c185564dd0c101292f165ddd03440220f582bfdc1590e2f75e8e5c92edd71e76e46a73b26547 SHA512 62dc7a5eefeda9c8824b24f8844b6c1ead5449797d9d004111885b03a1989ad89d1f48b3b7d4a69130885b85cc3c1352910737e416fc19f2038525632b1569f6
+DIST csvkit-1.0.6.tar.gz 3784737 BLAKE2B b1e4583443cbfc62f713d3b311bbe313cf4e69b7aa5aa13dc6970375a727a804ba1dbd176b25487027d3bc1a5696f2ce649a460c91ef7c5591c33bb3c6f48c33 SHA512 fb37404405f2f2c0bf803a1df8186aa9e3b11cbf3c4f6e1fe6dc06d53730aa91d462bebcca3917e9a451f1d81df053abd9ceedfaab085ab696f9ba701c873323
 EBUILD csvkit-1.0.5.ebuild 1297 BLAKE2B e00ecf1a78ab98bef348790fc76426f305f598f17893e36588e6d89e0f948f5c7b48b60e6be08d3918ee531696dee592be679759a8054a341130222ad1b733c2 SHA512 7a817661dc9279c841718449a63e218650358cfc8ea9f3bbe70e6b92f33da3156acfeda79be582660841eaa1182eeacc368815a2293cbe1b5fc23b7846755cb7
+EBUILD csvkit-1.0.6.ebuild 1291 BLAKE2B 7f9335b92e6064ac49bd9ba7c144a1837e6e757d21223b8b7862b6f994b7a96a12803b51891456a4316a3cb309563046297c6b40db04fb56b00afd1efe85d32d SHA512 85cb1f7b183a7970ea3b22504d51162791b4b7081648223f4ef9a14b7b4c7700c5764ffbdcc03865b787e2c86c152efdb2bee4856b545683258743f3e69339dc
 MISC metadata.xml 500 BLAKE2B b73dbe5965b76d39d6e97dd46e7de1c0d583fe0b48de00528169068c6d86123c25000a37115d2f9db48eb687a95eb6742975daad252591d4ff18a8ca65b6f4c4 SHA512 daea7035cb0f2e5a852c457e3bdacb15ed5ed618e21dbfc6a42d25d92b8b7f17f46e597783c5fde45a8e71719e035d78cc94ae2c8d76be3e5f36e3f559856b47
diff --git a/dev-python/csvkit/csvkit-1.0.6.ebuild b/dev-python/csvkit/csvkit-1.0.6.ebuild
new file mode 100644
index 000000000000..b703b4a252cb
--- /dev/null
+++ b/dev-python/csvkit/csvkit-1.0.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A suite of utilities for converting to and working with CSV."
+HOMEPAGE="https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/csvkit[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.6.1"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}"
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 77a51ddcec5c..e60d50583303 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -7,8 +7,10 @@ AUX cython-0.29.23-tracing-py310.patch 13401 BLAKE2B e2359644ef2dd2c2f9eadc41eac
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
 DIST cython-0.29.22.gh.tar.gz 2091955 BLAKE2B 8225fa6073d43de1e44e8cd22d52f9bde5d3b6e6e766c74d5ef18d77b57c0e1b22a21cae5b133b0b22f7207aa51dc0e76f1073db977190d42c2b55cc2d7e148e SHA512 b7f22112678f159bf1d0ad5fe4f7c103e96f240bab4d9dc07edd7c2f66a9887b9af72b32f1d5886361b48d428bc2b9499d3c5b59ce5af1068f20a26549783dd6
 DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564fd167f7d9c47e2ef4e8897e072f67497b8ed3994f45135c21f8b2bf3a2cff016fec9a808b2bbe9712174dd0a6b1a3e SHA512 093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a
+DIST cython-0.29.24.gh.tar.gz 2097245 BLAKE2B 9f5f2da0aed61d7fda2e14ea0669a2dd187cd053f3b82621342c7be29e26ff581b673a32e43bacd5c0df3e515f250eb23a64b1dae8911132fdca48175910a3dc SHA512 387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8
 EBUILD cython-0.29.21-r1.ebuild 1792 BLAKE2B 03fbab5e328ff2dba249e6a5bf17abdb4fe69217f3527a89c4920d78129bc4a40b267ac58f8eb70deddd432ea34538a44254e1a71931f7263fae8d3761b9c1a2 SHA512 7b0240e6ff14f2cf12e54deaf025cbb4c72984a351541b646234091159c0a4e2305339cd6a58f64b756a9f99aa39fee3e9b326127e5bcf98ccca5de26d9bdf3a
 EBUILD cython-0.29.21.ebuild 1987 BLAKE2B 1df83b6ef7f839622cd73c07384ccf0a6e722fe5ae9f42374ff9df2995e5b624e78a534c078534c341d034f984f73fc5c3abe954166ba8ef0f3fcc6aff2fbf06 SHA512 aa85e5d5ea9a1413686d8903af4c2c310f504ba0fc1ca469253010dae7a2abbb434b5d2e59f18b1a22f1149cfaade4b942466973e9559b913146abdf3b191155
 EBUILD cython-0.29.22.ebuild 1845 BLAKE2B fcace04a858c1fbbb291c7ac9c961c8fa2cfd9b222298082bb183cd0608015965110d0c809daf6cfc206c0f9db709d5689ac71711f8bf5c06cad0d974c09ce60 SHA512 c93468b1e423be8ddbc42bb507070d33a88454b85ddeae6eafbcaf3d50f6658f1732bb8f45381b714af3d141fb05ae76d294a8149a2cbb3cd7cf53893e1edab7
-EBUILD cython-0.29.23.ebuild 1953 BLAKE2B b7a6d286d13161035966badbfe62af11b8a9abb5df9b67516740b9c6295118032b3e6be38167f816cb30dd1938391eaddd40064fd2252b99896b89234e4824a8 SHA512 dc00e398f42d8604a980d2344532f0741f8c446a5d28b3fa6f641874e0a0e961bdb6aaa255a3b6076f361282246dbd5e71ad3956e154e9d43d27606a89557d1a
+EBUILD cython-0.29.23.ebuild 1952 BLAKE2B e8d88577efb70db3f75a7c0068bc1b9659132bde1927c3a50a92822020d6d575761ccacd66f2efea021570439c5c052cb352834071d8ef505247ba427d045da9 SHA512 cc6643d4a19a075e0e54184775596251060bcc9b73c6b9d6a26564c5588ab81734d30127c42b723d3c1e62d9afdc5f268dddf1a26df5c138634b9cabc5caca44
+EBUILD cython-0.29.24.ebuild 1826 BLAKE2B c412f584f72cd13a43a47d21d1406e692b634f964090b309868360c7fdd8244213633f831e970b4b1b5e756f636001ccfbd8a62499c2c5967f175d902dc35c07 SHA512 6e146597a191232445d624e1591c1e5cb52639743a9215e29c7ace4feb711d8c362d0d695eda698fe0f06d668bff157d39b6e501db0f341a275bf31c7aff175f
 MISC metadata.xml 605 BLAKE2B 900f2ffaa501d7ce5bef46115f7fdbda0966bf4ae048b4c27ac4be06e1b23de17c674e27f97627aed8d1d65b52bea01532d8a698bdbcd20b7c9fab4bad278b16 SHA512 66176bb6e00f70b610a41bfbc973bae2b4b8b9aeeeb6bdc9e14c2832d513d5452aec6509f8225daffb7e169d93311a4ccb026c935ead80ffeb35d91f1ae558fe
diff --git a/dev-python/cython/cython-0.29.23.ebuild b/dev-python/cython/cython-0.29.23.ebuild
index c202aeb4126f..bce6983a00f2 100644
--- a/dev-python/cython/cython-0.29.23.ebuild
+++ b/dev-python/cython/cython-0.29.23.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-0.29.24.ebuild b/dev-python/cython/cython-0.29.24.ebuild
new file mode 100644
index 000000000000..2dc83aee957e
--- /dev/null
+++ b/dev-python/cython/cython-0.29.24.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python3*')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 6309dc026729..f8ca5bee3a1d 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,11 +1,5 @@
-DIST dask-2021.5.0.tar.gz 3710206 BLAKE2B d02bd280a704cf03fb403c58567be33c414171ef3ee1eed2f788cf2b3026c2aa3806c19a8e9f239c93a0eb8ab2474f14fa80b8e1057ae0db1c0ce4a68f0cedad SHA512 bfc2c870df02f1879907621cb9abdce8bf03d07fea2823acea68b220ed414ee146036b73eb50c92608140ed18566e7a53807dcc1fdf534876920467979908592
-DIST dask-2021.6.0.tar.gz 3717136 BLAKE2B bc524dc4e885588ea92c0b24b6abe917b6a3989f7faa21d4dffa490f2952f4f7e90ce55e28ed97b34e44bf2c41a753fe80f092559999fa42e450b289c4b89933 SHA512 a4a1e86c286e0796f7ed79dd10c5c0f80e40bb246a7c25d45aed5e73a2d6c1da8743bf6b61ca784a8412403aa6e62007c937bbbdd8ffccf7170443454ff5601d
-DIST dask-2021.6.1.tar.gz 3725331 BLAKE2B 7b466507b968dafd2c6f3a3db70c3f557ed877bd489067ff5243794c44a9e77f9b72b4a000eb0865d2096845b3c6005739214bed1215ae053d9d1c313c6bb52c SHA512 c3c032ae8d67994cb924e23787a571ad75ac88ee682542aa486dd76b38ba25c809593e9bb11a716589eeea437aaf8b69a4ecdf676c417fe566d92a2b1a8678b6
 DIST dask-2021.6.2.tar.gz 3725731 BLAKE2B 957cf70c328462c87eb52bb2fe3d471705ab6bbc233badb8d5ba93ade4b7caa05e47399f26f37b69213df16e76fdf8f042a082a0d2d96797bca836311349a6b3 SHA512 2949a0a028d08794936faaeeea3b36c97ac1492288519efa0fd1e6bbb9b5b52b730657b8b342a47ca0183d98e9179836423847670fc12c14be0890daa4b773b4
 DIST dask-2021.7.0.tar.gz 3730549 BLAKE2B 8f76648614adbef8ca1feb01f5b39d4ad217eb5178c4b7ace72d3764062b172d83b74e9fad5eeff0a745025e0cb2bf47bdb14beb03b1520130332ece00c3e318 SHA512 3dbeefe08af6536f19a03ead69372dfa7a26eff66d768fa8e238341822136a2314fca0291694ad22bdfe3618a4ed6785d836ceb5cc4231f361d97f0cbba0edbf
-EBUILD dask-2021.5.0.ebuild 1128 BLAKE2B d11dd7ef54b5c61e5fb7f855f4654e5c81caac4dae773d88b3ec8e62f93464df5888fbefff87ad935ac8e2cee2acb2a5e2b3a910ae668b30bf6ef90d72265af8 SHA512 409347854836aff9cfe1047dfd36a5175094966205acc6216dfa2f6e1b0016df25d0822fc3ec6390808d30b90b69a6457e36df4d59dd31c694b2be2c5e4b4b35
-EBUILD dask-2021.6.0.ebuild 1130 BLAKE2B 0d9ab336ce9f03adb187c530e6af756648f079374998e6d7e38b04eb249ea3540488615717f22a9d6233c849f8a041016026763358c4533c1f4edda0e72b5cb0 SHA512 d11925208e98855335ba8b036728db1f42a57c4b263e124f77d20bd934ac8088f6ef06ce704cfa72a02dcc108aac3d73e474f7fa7d23e3236911ca090fb64b8b
-EBUILD dask-2021.6.1.ebuild 1130 BLAKE2B 0d9ab336ce9f03adb187c530e6af756648f079374998e6d7e38b04eb249ea3540488615717f22a9d6233c849f8a041016026763358c4533c1f4edda0e72b5cb0 SHA512 d11925208e98855335ba8b036728db1f42a57c4b263e124f77d20bd934ac8088f6ef06ce704cfa72a02dcc108aac3d73e474f7fa7d23e3236911ca090fb64b8b
-EBUILD dask-2021.6.2.ebuild 1130 BLAKE2B 0d9ab336ce9f03adb187c530e6af756648f079374998e6d7e38b04eb249ea3540488615717f22a9d6233c849f8a041016026763358c4533c1f4edda0e72b5cb0 SHA512 d11925208e98855335ba8b036728db1f42a57c4b263e124f77d20bd934ac8088f6ef06ce704cfa72a02dcc108aac3d73e474f7fa7d23e3236911ca090fb64b8b
+EBUILD dask-2021.6.2.ebuild 1128 BLAKE2B 2302fd9867ee06d58d1707bcb06658a23e633041974b604563859c5a67b084514e6fba886182dd3f721991f33d9ac9010a2b114b90e7f91fa192af88507fbeed SHA512 b378c693d991fc814d31d2c93541513d18bd79fb7220acbad444e6aea44295962e33f4249d84f7db25b66bb22a6b554abc76428a20e8680fbe87ae84f3c272f6
 EBUILD dask-2021.7.0.ebuild 1199 BLAKE2B 52cfc495d9df0fb9d3c6477baac98f8e8eddda366c79d1f83cf0c3c828418e436bd10b1aacb449d9a76f329b63b8ae882840105fb65e3429e3e6f0ef41657bc7 SHA512 0e9047e376151ddf90bcc6de0d46863d703472f67889e50c6869795be40fd163e7b728d24c870ca4d466e0e7a6dcda65beb6f7cb07caca88f951683a55896594
 MISC metadata.xml 670 BLAKE2B 1a15001a3836bd70c8d539b34283c9e3b19e3a37031de32f82e8b44a09de2031e572104b1dcc5a690c80c55981f0c510325ba700e4e859a15dcd0a3b06a6abd1 SHA512 41e31ef86be6c90bf9846bb9a753d6f6ed3119d0bca3f0b205c9f814045fccf99702ff901b7e5fb1d785fb5cdd5230ba7520dd6e6ae604761af1442e8ec81538
diff --git a/dev-python/dask/dask-2021.5.0.ebuild b/dev-python/dask/dask-2021.5.0.ebuild
deleted file mode 100644
index 77791c1017a3..000000000000
--- a/dev-python/dask/dask-2021.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2021.6.0.ebuild b/dev-python/dask/dask-2021.6.0.ebuild
deleted file mode 100644
index d3f5be8aad05..000000000000
--- a/dev-python/dask/dask-2021.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2021.6.1.ebuild b/dev-python/dask/dask-2021.6.1.ebuild
deleted file mode 100644
index d3f5be8aad05..000000000000
--- a/dev-python/dask/dask-2021.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2021.6.2.ebuild b/dev-python/dask/dask-2021.6.2.ebuild
index d3f5be8aad05..51598ceed7ff 100644
--- a/dev-python/dask/dask-2021.6.2.ebuild
+++ b/dev-python/dask/dask-2021.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index a4d9fd5425cc..6195340cf77a 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
-EBUILD dj-database-url-0.5.0.ebuild 567 BLAKE2B 64e1231fbe2a6788fb1dd244f20ef8809f53c92af5be1ce26637871f9e4047cf567143519e20819ca686ee2ccbc78950f9c9adca3a1c4389e63ff5fa33c9a60c SHA512 205d75b9e44e8841974c38db2390e702aa9dcc0e383b394832bf96befd5a70e0c756e4a97f7815b9773601fc95f87c116e587a59a8a174b227cf06e458d5a2c3
+EBUILD dj-database-url-0.5.0.ebuild 565 BLAKE2B df312b685b2ea17b13176100e0601a4a4378422f67492a2e28efe93706b97c2453a9ab1bf72faff4b2f53f48f7726241a51c0a4c4d47cd54b01e689ca30909bf SHA512 ce6ea354ce091e5f5c8f71785861e2e6febe2b8edde348513d7c2009159ac505c09d59922afd5e2786bbd599585abd3bc20f1d8f3396fb9d315c382401d983c1
 MISC metadata.xml 406 BLAKE2B 9e373049eda15ee3ac87de1a93c2c6ace80868cd42166bb9d8a895b0d558e84160de131c2e9db969dbfcaf0f8400176919800cb5b0b07202533022d707af1f0c SHA512 0003de2818ac2fb9acdbe55fb3c40d46f1a32fab1e9b4e03c7b9426a7f841d31abb323bb863282ff1b10503d751cb31c67d4ffb693bc56b8f262edbfc382777b
diff --git a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
index 3711e5754ad5..5892f0d17d7e 100644
--- a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
diff --git a/dev-python/dj-email-url/Manifest b/dev-python/dj-email-url/Manifest
index ea26e6610481..745305af6854 100644
--- a/dev-python/dj-email-url/Manifest
+++ b/dev-python/dj-email-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-email-url-1.0.2.tar.gz 7213 BLAKE2B b538fe96a1bcf0ab2fddb4f09f6bfafefd07a9a8d61fbdeaa3be3e21bd90d87488c852200a100c544023ee0a8b57dcc8d75cf6aeaad6489da106e911ce8e683e SHA512 446c2e9847f135981f32bb2116d8abd3fbb80765dd1301821992a97acbbbae8d74d1109fbf7bdc3ee469b9d40c4ac08f39befee36a06926a1d049291a5c0c837
-EBUILD dj-email-url-1.0.2.ebuild 624 BLAKE2B fa333a4aeb92456b13bbdfe78addc904081363c3a6075bc979d525e9c51067a8955e2e2ffd2a055b298c1ba1513e0e280eb7daba3073dd94673c2c076fb28b7a SHA512 f639fdb4ddd351d0722683136f374d2a92ecc8a7d72360c77076312ac69848d98c272d2ae96095b177832e0a43e02536d89076df921e9fd3888290ba45bd3766
+EBUILD dj-email-url-1.0.2.ebuild 620 BLAKE2B f10ccf850e88b3eebcf2860b97d5ec9272cd4a7df5acb0d1003e1d70bf2201388e79bdd429d9c1044107d1a3f9fca6881f91e0cb6b99bfa5d52f007bb52c5bff SHA512 bf462a4b00d4d8659d93a378c3041cd27db059762f76e0627532928f612bf5149fc97939191047bc08282e7aa3a61672724cf218e17a96f399e1a1036f963904
 MISC metadata.xml 407 BLAKE2B 724ee962580eb5c4ff6b2b8d82d7cc50a6d6778b73a06f1cad1f7dd2f64289de5b72dc9713aae488dcf23c57ee575d5080765f2d8bfe41b9f845fa81919eb628 SHA512 fe1d3809c17706d0801daf8c073ed5f70eb56c525a9ea978d1b449720a2cdf43086adbc61c4585123d6712b40242dd145513d9fab15e35889b1b4caa62ea9c33
diff --git a/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild b/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
index a3cc58516c25..859e0bbe7149 100644
--- a/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
+++ b/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/migonzalvar/dj-email-url/archive/refs/tags/v${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DOCS=( CHANGELOG.rst README.rst )
 
diff --git a/dev-python/dj-search-url/Manifest b/dev-python/dj-search-url/Manifest
index 341854185c58..6012788deaee 100644
--- a/dev-python/dj-search-url/Manifest
+++ b/dev-python/dj-search-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-search-url-0.1.tar.gz 2815 BLAKE2B 75abd5bcd0d4b39a40c2c1a28eb02e903a40198f111364774af53375c21424ce170dc4d5f2fe7b51e884849d7700efeb3c99d534272002f60397099ea27da898 SHA512 9b233a8dc1ec8d6a81154ddbf6966beeb8fe4b62c1c7faf5e623409403dc2d64db1749552878b2a1edab1d3264820840bf14e7fcc2e54fafe5ca4d68a207fa5d
-EBUILD dj-search-url-0.1.ebuild 464 BLAKE2B 1736b13890bee21d112be99a91552c40f104874adb63c99b62dc59a5a0c85fbd4ee9c5648789d08e8cedb383382b7cbfc676e1e4cf6e0b8679ab8b79c53f1f43 SHA512 2201e9cff8ecfafee0f2708c38dc442ae1a977720cf8b57992f2e18556bf98bad86a249a29b990bbe413871cd5a17990fe067f02e86432e81d483584536eedec
+EBUILD dj-search-url-0.1.ebuild 460 BLAKE2B 9144fb814241b607907c1d48a2eaed41c53bf065f85be67fc0d41b232b3674f549d58d8d281fe3355237c42dfea0c946c2a786652f750e88fd945367173599ec SHA512 c2f3aad09da9d9471af908db7d1d731e467de8252d43c53d3feaa411778873e64a558ba54b63311f34769aa7da26f701545064b49cfe20ecf4366685b17d00f0
 MISC metadata.xml 355 BLAKE2B 31e54d6f53ffffda0e1b261309311c03e4e3ab8e500c06bef6fb8629800fd32f779b4c6c1e69b868e557b47fd4b697db86bac49fc42b173a77d0b4765a8f997b SHA512 be285d36a522b446fa95c6ef5a976566922a9e2f0c9fd71b2ebaf2e0b8a4ff91c148e749e698f36fe618c57267cb01f2e5a56b950cf4a99cb9ee23b1b8807045
diff --git a/dev-python/dj-search-url/dj-search-url-0.1.ebuild b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
index 18576d01aa52..3d98438004a4 100644
--- a/dev-python/dj-search-url/dj-search-url-0.1.ebuild
+++ b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
diff --git a/dev-python/django-allauth/Manifest b/dev-python/django-allauth/Manifest
index 6af079e721ab..71892dde393b 100644
--- a/dev-python/django-allauth/Manifest
+++ b/dev-python/django-allauth/Manifest
@@ -1,3 +1,5 @@
 DIST django-allauth-0.42.0.tar.gz 549566 BLAKE2B aa346bcc47b9419776a68c023ab560e5cba0fd97eeaf4cb2f43da4b2c53619c65a3ec9e1313ff3ffa0ed051718d41ccea2d362f56d6bd8dcf4c5a0569ccbb7c9 SHA512 2c31a70dfd3becf0f921b0566204b8b3221b0c85e82cb8a8ad37ab557fc6f302b9c24bfdd6885978157f4ccb9044d1eed9973d066ee59877aee727c60d2a5b46
+DIST django-allauth-0.45.0.tar.gz 581007 BLAKE2B a0f586818e4d17ece5ed009481b71c0213bf265f45d391664d411268d53124c1d5df226ca40d98722691ace5f5ed50026b0a9db3bd34070ff855059bf3e237d6 SHA512 16b166a5f97e62fef3c801af17b6b7569bd27e597cec394032a2644397afc30512f52f0ff77af8036e414086cd207dc9f5d310dbc744627b55938243ba18e50f
 EBUILD django-allauth-0.42.0.ebuild 663 BLAKE2B 792557d0a5b45cd7b712cedbc312df96deb651388205407455ddd6fb637912c588144978eaa0038f3fbec061ba76b51a26ba55eda95b3f69a593f2e633c97694 SHA512 1a08051188196f026a1cfdd73b3f09f3c449cd2d5756bb1597b04554b3816c76645869374ccfecfc1f45fe5c0423e4cc3d9e25105a73a6a1ed3a2eb077f59142
-MISC metadata.xml 293 BLAKE2B 1f94d47b3f88a08c249d0d9dd6667e195b68ea8f47401ab02c6d5bc41619e5e4eb6877ffe881353c5d2b69fe9d71703a48002e5b5557aeb188ad592f8e2f4d54 SHA512 6d71d8644c96cab3551e98e13ba808a6d97685cf093a8e1c7968ce5e5a4ba3a358428e4b597c438d72be7b98a24714dc6ddd41ea970b6c97e902f9b5de0cdd8c
+EBUILD django-allauth-0.45.0.ebuild 1126 BLAKE2B e8ad92eebcc6c680cfa07f3f0e5a60e13cc93d303f4a4535d2479d81fc36cdde7107b7a108d5bfd467723b229558b776fe5ac84a71dc3ab9467df55489d9b960 SHA512 5c2cf7592801fc7b43f6d01b50ed9d90b723479436440ef14215daa9fb8c63363d955e6b9b85393231c25c3f78de4b3e92ed330e7c73e16adb8a7d7ab6ecf716
+MISC metadata.xml 394 BLAKE2B 9348d0e49b3a4b79f48484ec312841062b5ada42a5c6cea9e34f8da95fcec1c5766d5ac2d6d45c6ba0622eadece09b8ff696fd77f0bd304f481ffbd02b8d2f05 SHA512 7a746fc90952cfec4cbc788b8af481ba0c361d31a56016d061c10a77b8eabc8c2a80deaa070383c478469562821ed5a625fa7f73d7ecefeeac15e989459f2f4e
diff --git a/dev-python/django-allauth/django-allauth-0.45.0.ebuild b/dev-python/django-allauth/django-allauth-0.45.0.ebuild
new file mode 100644
index 000000000000..acee98cb30f9
--- /dev/null
+++ b/dev-python/django-allauth/django-allauth-0.45.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Django 3rd party (social) account authentication"
+HOMEPAGE="
+	https://www.intenct.nl/projects/django-allauth/
+	https://github.com/pennersr/django-allauth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# cryptography via pyjwt[crypto]
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/python3-openid[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )"
+
+DOCS=( README.rst AUTHORS ChangeLog.rst )
+
+src_test() {
+	# cern provider tests require Internet
+	rm allauth/socialaccount/providers/cern/tests.py || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=test_settings
+	local -x PYTHONPATH=.
+	django-admin test -v 2 || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django-allauth/metadata.xml b/dev-python/django-allauth/metadata.xml
index c2ab2a38263d..097826fe3092 100644
--- a/dev-python/django-allauth/metadata.xml
+++ b/dev-python/django-allauth/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-allauth</remote-id>
 	</upstream>
diff --git a/dev-python/django-cache-url/Manifest b/dev-python/django-cache-url/Manifest
index b99f1d3a9d0e..b375f79a6ec3 100644
--- a/dev-python/django-cache-url/Manifest
+++ b/dev-python/django-cache-url/Manifest
@@ -1,3 +1,3 @@
 DIST django-cache-url-3.2.3.tar.gz 8198 BLAKE2B 19c91cdb519fea9c80e4d5e89ec9d340fb9193ec3891f6fbb42ba07cac26aba2bc69c00c65797f0f70c1a4590ff7be2037eebf3bf4589270e68afe289f74945c SHA512 d5b3653de755a668c33d28d66d38d938fef84d3acbfd726463c85a45c49a4d13bf880723226be2946ef7ea784e10623e164e448263893f779effc3eaf75c959f
-EBUILD django-cache-url-3.2.3.ebuild 731 BLAKE2B 9ccc87c05eed78b8968ba9baa036a7ce8e9d6c3b27a2d6e4c2fb4321ba9f1dd882ba6f624ad078b6c20fa5c54d7fa489f04602ffca2b46d92752b27f48ee6eb1 SHA512 cc181f0f6d4d2bbff65d90feab4a66d156e9706bb94883fe09b9e724cf48d3e1f3bbfd26fb3f84fddc90da6be65f18c51f09ff540b9f4f0138be2da49b647d6f
+EBUILD django-cache-url-3.2.3.ebuild 727 BLAKE2B b6df11ac41e53cb5396d31ea7439511cbec1f1ad4451fbe2e793c9112e197f4a7d181fef7ae9ce6b2d616f71a71e73a94b6972652bddb4b2d47bfeec82247c6b SHA512 b5b2c9976c2f3c68d370636754eb3a111012b89a96d75fc41aae68e75a8f81befd41fc31e075b5683243e92977fe5439617e8d1d66af757feb4bd25e28cf8727
 MISC metadata.xml 413 BLAKE2B 7a014841105ea407191ef0fad8df2365a13101fcccf9324a3dfa3a55f67be9d5f9c3c33b766660cb1cfef9d14358634e304da3e62eb97b02652ff331b4643dba SHA512 89fe4d187320cc50d60a1d4821fd88d57e42efc6ffe4ccdbeb6b62c1d2d6e3b642997b1bf7bed054f0ec1fab0e774af7c2ca422a87dbf37b3d210d03073beea6
diff --git a/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild b/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
index 72fca067574e..b0d261f52401 100644
--- a/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
+++ b/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
 
diff --git a/dev-python/django-configurations/Manifest b/dev-python/django-configurations/Manifest
index ddb612ff3291..bab8cf0005cd 100644
--- a/dev-python/django-configurations/Manifest
+++ b/dev-python/django-configurations/Manifest
@@ -1,3 +1,3 @@
 DIST django-configurations-2.2.gh.tar.gz 41909 BLAKE2B 4107e37a694d4c9670f855886d870c7aea30e9b95788a6c09f6fb3c913d3ffc4d17ed250264ce9ff0408856787b4768cda67eecf26c135ccb338ffda7530fd41 SHA512 9c53811016c20ae4dedbb9e1951b45440b656fad2fb9544e94bbbabb65a5883846ee063647f107ac57c08e54db71206b89903ee1d02cbfc0c8d3dafe7520e5a2
-EBUILD django-configurations-2.2.ebuild 1451 BLAKE2B 08a4891cf646ac5c9c2afd1965ed4915ad88ab9141eb9c73888727edab3aa90040482708a493327e8a38cda54223f19447ad13ebf9e8994fc9fdf5ac027ff644 SHA512 a33ae01bc2cf8b12693f5424438848c7b9550c43ae3cbf027fcb619e9fe7035f97dead12e16162a3815973a675ee4580d3acabc8bbe337e74391fb2eca03b640
+EBUILD django-configurations-2.2.ebuild 1447 BLAKE2B cbf8aa50de4f1de3851af4e6de43393df6f37c622d8eaa6d8d0f4e77d62a8c69a118e8cec828e47f89418ec640470637295e4ecf6bb098930a2b2f8b444482b1 SHA512 3582413d81ff0b9c624c06f9520b524ef8bc2241c48b7ffc6f75091929b110af6294b27e5c7a5352d2b64771d8fe6cc22a696e3a65dd92c1c4ee0aa46430dddc
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/django-configurations/django-configurations-2.2.ebuild b/dev-python/django-configurations/django-configurations-2.2.ebuild
index 603cc16737b4..54d504b631ce 100644
--- a/dev-python/django-configurations/django-configurations-2.2.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 189994736473..65e7c90cc678 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,8 +1,6 @@
 AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949ed875ddfc4ec79687f81d6ebacbd5f06355c77ee457450515e4902f56746fe72c4773cd51cba37c9109d898185e SHA512 ea0c01a37494c5e13996c2652c99cf341cfe064365ca17dbe76a0b4b21b914a59c4ca83ab8e261f80878c22f971234478951f360df5f0fa2321d8f9bc974d28d
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
-DIST docutils-0.17.tar.gz 2014148 BLAKE2B 56d03d755651e9c022eb7ff79dd83bab8f8bbb2c8b6528c673b04b69db2c11084599bf7cc294ded3a024c4c1a688f232ff0f3c9f7a1ecafe1f857513d35123fd SHA512 e99886dc6420f6325426ebbe0d1528249592e372fe2a052548c9cd9c2fd87506cc8b74384a3cf4afb97a1d936a906e157e084785639aad59c4abbc672c33b689
 EBUILD docutils-0.16-r1.ebuild 1833 BLAKE2B d2f52781d4b94f3224d77d00d62285c60ac8726b574dc6038fead712056ca39c10c917c6f53c6c45d033fcfe0b3394706d8e73f18e93c632c96d68fbf2fef446 SHA512 724bcd297b886e8dd68368a0a70165ac67da72e379d2dc6aa476deafca26c94fdff1df7bad51a5507922b8dc00396e0b688f19da646c0bbe5c6d9093310083e2
-EBUILD docutils-0.17.1.ebuild 1756 BLAKE2B 0dbab29c0523ecb6cd1aebbe233460222f6e2c71da368f3ae39d1fcf05c19276e8dac759aaf1f9e37b06b9828f6d1193833e6b99b82631b6c148bb27fab662f0 SHA512 b36f39bd95e667799f6d74c5ad8150f7f356e2fec8e4322960a91a9fb46047e7d0f0be4bc1ce74a0e7878b86acaf54685e98b3512e1b5d8125f50a8d14628609
-EBUILD docutils-0.17.ebuild 1755 BLAKE2B f7370968b7426081c623dd6fab4e543d50aac5fddbfc936b918d76237942920dec10b2b1f8e1ea429144dd08fd85d138cb09e8c32f91e96585cb672053c81049 SHA512 f8c6fe9da047aa06e423172fa5a621ce22617d64e3781167f460073de732c15d4d64c8a046ce2f38354591b021ebe73bcc6bc2f7e806d770aef1e150bbab00c2
+EBUILD docutils-0.17.1.ebuild 1748 BLAKE2B 150d82c9667c782fcd015ec933a647fddf41022dac98253c7c4a187575d4526ad768cf6967f37dcbc89cd1030613b8a76466e6626021c23bf76020be24578cc0 SHA512 08d1c248a3db7098d50f8283b0d7a8b8e1cab5ffd7a8ff4ab8c779b216d3c74ec097f7185514c25ce1154b21f2ed3c03f09ef5b0d8d7ec69abd3f03d2cdb14df
 MISC metadata.xml 388 BLAKE2B 0781c1ff7eed3e16515aa155bad0f9bb80714c7297eab6840de07aea41d496f94d7c59db363518f914ce13b54cf2c038ecd05b86f6823df58ed01070b46d4775 SHA512 e977e1b753d903ded926f251b30443e07d3080bb33be1e7e66bf2a80e4d81da1fdc2bdff12e6cdb1a1746019adca4c3901f59daa816588301be42a85709995c1
diff --git a/dev-python/docutils/docutils-0.17.1.ebuild b/dev-python/docutils/docutils-0.17.1.ebuild
index 99cb6e787e95..4e3eb42d0c49 100644
--- a/dev-python/docutils/docutils-0.17.1.ebuild
+++ b/dev-python/docutils/docutils-0.17.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.17.ebuild b/dev-python/docutils/docutils-0.17.ebuild
deleted file mode 100644
index 3f2c2cceb548..000000000000
--- a/dev-python/docutils/docutils-0.17.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-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=""
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 1768e37c68be..7172ad3f65f0 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,5 @@
 DIST dulwich-0.20.21.tar.gz 399232 BLAKE2B d2768a4cc83ab2dad3b569c7c97c93ffea0293eb10ce269a7edfc7d5a6dc15d31d7637332d6968d40e67dcd2d76d6f9366f6d2e30527a666bc76fab32c5bab91 SHA512 1dc3042ef7ed0320b8e998d78c98e5d181981f665a708547b715ed5a16869f5c0c76b6228bf1e58cb957923ea9643ae2ae7cfca970056bc5230db18c5a110985
 DIST dulwich-0.20.23.tar.gz 414150 BLAKE2B 0f7bfb237acc6bad874465a5bfed21adc29a2ef23875fbcbb92e7e3ff0ed6a4191a30b3975f90ef20b8320575e42abf31f8ec2199d558382c917d0510c2a8d96 SHA512 8bad3528dc87e70b39b59b2f7218579327db4dbd15937b63db76c9b8e7ba6d22e963eaec45b8d675c92f250516a541c395fdac391db68d0932dc5d8cd7ed9fb9
 EBUILD dulwich-0.20.21.ebuild 1623 BLAKE2B f8973b73c094fe2ef5efb9ccb71f44e2da24c137a9b9bd28b5292217c78e1139ff8725417c422df4feadecbbf74ce0e0edc7b63f43e6761e2b9a203fffae986a SHA512 c43266e408a6a8b236036347694062a60c4c806736a4ec540957d509f5534d2c4e56212f23b8b67b48700b267718181977f01e1c389f33f8c90df98445bfae8c
-EBUILD dulwich-0.20.23.ebuild 1548 BLAKE2B 66ee88ada28614fb125803f920b2fa5eba210e832272f19b59c4692374cfb884af24b84b2ba1c0b54d75b6f373fe9f9e849b93befdf30942ac2b37a232c855b4 SHA512 eaace381edc5ae360527a272a180a010ed217bac9f815b4af13c03da5537629475e1befad28cd21a5f72e6368ee0d432b1d0e12372c12e0a93cad933190830f3
+EBUILD dulwich-0.20.23.ebuild 1591 BLAKE2B 8a24894a4b5a92580fb55eb8edd9940e579aed2b302117276380dcd06ce990743dd56657fbf46c2135205d0a2382b05b0e25982833378d7e28098158200ae36f SHA512 071970ec97321871868c1189b727bb03a88b34699e4b3fe477a301770d930d822da52724cdec24093c182ad7dde35002c072bf99931928f8f7ddd0eaaaa2b73f
 MISC metadata.xml 557 BLAKE2B 17a7d57f6d3a8d0a01808be1f9d5381ea21cec37bbaf193f6f5b28b3f8381fbdf5a00b06cefd89a777ca11f11556ed33b13e295aa5687d4eac76df537dc6fa41 SHA512 6325997c6f1fca6d8bd2fb3987ca8a53ee068847e4d184b36928a7265ff0aca1918dfbea34a8cd93f6d3b68aace8e28133d261766524f7da3639a307ace0e160
diff --git a/dev-python/dulwich/dulwich-0.20.23.ebuild b/dev-python/dulwich/dulwich-0.20.23.ebuild
index c3784feb382a..076237a6c33a 100644
--- a/dev-python/dulwich/dulwich-0.20.23.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.23.ebuild
@@ -29,6 +29,7 @@ BDEPEND="
 			dev-python/gevent[${PYTHON_USEDEP}]
 			dev-python/geventhttpclient[${PYTHON_USEDEP}]
 		) )
+		app-crypt/gpgme[python,${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/fastimport[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/editdistance-s/Manifest b/dev-python/editdistance-s/Manifest
index d92901d40b62..17b6a774aeff 100644
--- a/dev-python/editdistance-s/Manifest
+++ b/dev-python/editdistance-s/Manifest
@@ -1,3 +1,3 @@
 DIST editdistance-s-1.0.0.tar.gz 5408 BLAKE2B 5420dff814de4d61f7c36c88113c568562a174205d8a4ff2b52b60e797f7459d95fd2a909b70911cfd7d0d67096a3844888bb88866980a2c43f8967a96ef4c55 SHA512 148234a38f54f70a2d6bc64f6a166a8954c79fb89d5f5c0bf3f041fe60056332901484a0626e218a72ae992f476305cbb662dfa0acdda794727fc682c569d718
-EBUILD editdistance-s-1.0.0.ebuild 534 BLAKE2B 93d8dfa56d0d23eadc4b62a3a31f37ee864e2d8c840ad1809767f735d1e7e6ec8a5e59518405f46a4064c0f45796c59726209c582be1c858c32a47f53ee262ce SHA512 daac7ad3c73809f0effd66d530355c3e86ecc109b75faa9abf961f4f56cbc9cc51a87934962c92879a4ca18488190af9ee97d8824561ff4c0fb3c25884c6dea9
+EBUILD editdistance-s-1.0.0.ebuild 539 BLAKE2B 256a5ded75535d534d4db21dab430d1ae397a1cfd4cacb24e4709c400fef0f32601c71b584c6e4744f3af94d3003f6ff91e82935a947a078c1f66854f153deb2 SHA512 fbacd85c132bb10a1afd0e24d4719e030ab953af21cbba199ea8116af3939445fbaf46bc2d7e0500e849ce336e6c228a6030fe7a1980d8bb686fa128482d20ba
 MISC metadata.xml 769 BLAKE2B 385d6e712da66dfd89e385bc712157b3861c0238d2fd807755d636feb4625782e76e1f5272c4efe758cf0de14fa5bd63d519ddd04ff9c4fb4528566c5620f419 SHA512 df3869e4c09d072ab860470f74958a25a446e0c71c7529f13e85b3f82f8c18245aa1dd7e4594e1add53675f3b87da9726260a367c6c9cee17ea758b0bfe99b99
diff --git a/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild b/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
index 005f719417eb..624ee75314dd 100644
--- a/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
+++ b/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~riscv"
+KEYWORDS="amd64 ~hppa ~ppc ~riscv"
 
 RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 644ae4b64b8a..1cbf0b8e24df 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -4,7 +4,9 @@ AUX eventlet-0.30.2-test-timeout.patch 1421 BLAKE2B 11730b1a5827d1b30537eaecb896
 DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba283063333e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb
 DIST eventlet-0.30.2.tar.gz 401552 BLAKE2B 89291efde90d106a96eebd4ea4a892eeb005d6850262b28f7a4508f4f3ccfb9b49dc392dcb6eb0cf20c5d171d26d2a6639627188c97123546162e4e8c61c464d SHA512 af31a7b126f2120dd77699dcf25c7134af1bcf664f40b2422238a3d2120457d5a4d5764e23016ce209882a8b888f94d2776fe194c33092f4a33111b2ac8f0cf1
 DIST eventlet-0.31.0.tar.gz 402530 BLAKE2B d4d5983b22d04fbd6102b7e1ebe58c6e23cba04968478808445d946a3d8fc9ee0b668e83321397163d507cacf58f0cdd8547b0fb2649bad23819fbee0a6cc5ad SHA512 1721ec5d3c6c02361a5993237426d0466d87327e3d429d7b9f20d3466eebf08c60e57a2b1ab133956fe508835e5e84c52317aa51f962e8487f22a6207bbbfcf8
+DIST eventlet-0.31.1.tar.gz 412021 BLAKE2B 6358dca8e0a766f0cc2cef37586a8d38f5d87f03d8389a7cc11b3d2d616669825df2a416ae980eed8a980f8e81ce8b2848225921bb4536f5537a7954ed75fb64 SHA512 c240a332aaf8eeb4af429d1b190ae198b4bcb92ae1bc38ade3f824634327872526267c6ff02f7196e3f9dfd17d639af500c28a3ed70a773b1b050d6d967a88a5
 EBUILD eventlet-0.30.0-r1.ebuild 1785 BLAKE2B 6ba2285e9368427aa547becbaf4973654733990253be55b87500853925783456cbe4c72d7b9864ba1b2c062156386a4a5ba434bcfb5c091e80d9e162fa8189b1 SHA512 df33839410c4f074b6e5bd9d349226a0af9c94905b7beaf07410eef40776dd70fed116f40c30df9a152126ae26ea931839443f12107d3e0de1c58f628531ab31
 EBUILD eventlet-0.30.2-r1.ebuild 1693 BLAKE2B d263749a9074c7b39c4d0806a4ff806fe7bc50f5b8e2b5773e9d4d65d19bc5854c92e336170576e637f4996c927509c83eb40e779e04c1af5eafcaf291f48d20 SHA512 03c721c868e50becacffad8cef17633286ec1621fbe0bd3bda3f970ceacdb3de82d10324662954d0b984fa7465d82928dc244089627fba6b2bc62105cb023dbd
-EBUILD eventlet-0.31.0.ebuild 1693 BLAKE2B d263749a9074c7b39c4d0806a4ff806fe7bc50f5b8e2b5773e9d4d65d19bc5854c92e336170576e637f4996c927509c83eb40e779e04c1af5eafcaf291f48d20 SHA512 03c721c868e50becacffad8cef17633286ec1621fbe0bd3bda3f970ceacdb3de82d10324662954d0b984fa7465d82928dc244089627fba6b2bc62105cb023dbd
+EBUILD eventlet-0.31.0.ebuild 1692 BLAKE2B ffa99bff5e79ff2303d5db785cb4aa442dfc89df75ab4275cc18fa62d60858b45ac11756704c8e4bddde196ed89d30f5a63dd3fbe877e512c80ddf3778d7311f SHA512 32c51abb391651145b9a6098806b442014049a10e67b6127f3e3364f61460285330caf52f359974b44cc265a88184e61a11fb8ec4f2c70ce201b8bae52465b33
+EBUILD eventlet-0.31.1.ebuild 1151 BLAKE2B ee2f60580b1d985ed49ee3b4433db7aa2a975028bd863e538dd0d8d9f510a636b4ecc166b3f9ac66606a88a47aa653216c36af1ec608090410a941d9e6abfe11 SHA512 3d7fe3d2d14a1250f12f6001992e3fafdd17cf57b9aed26d540c2c02fad5a04b27203dd600893fb106ce2d36ed4cf41db1d614137f2fc63d7f000618f43059d8
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.31.0.ebuild b/dev-python/eventlet/eventlet-0.31.0.ebuild
index c335ba582bb7..cc5799f48b25 100644
--- a/dev-python/eventlet/eventlet-0.31.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.31.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/eventlet/eventlet-0.31.1.ebuild b/dev-python/eventlet/eventlet-0.31.1.ebuild
new file mode 100644
index 000000000000..3fc34d0e705d
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.31.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/eventlet-0.25.1-tests.patch"
+	"${FILESDIR}/eventlet-0.30.0-tests-socket.patch"
+	"${FILESDIR}/eventlet-0.30.2-test-timeout.patch"
+)
+
+distutils_enable_tests nose
+
+python_test() {
+	unset PYTHONPATH
+	export TMPDIR="${T}"
+	nosetests -v -x || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index e41ed24fe603..f797b90ad9d7 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,7 +1,3 @@
-DIST fasteners-0.16.2.gh.tar.gz 29549 BLAKE2B 603cfe3662194f8f493e915aa3689af1c4a5e74c9b96ddb75e44d0fd0df3d17b71c0473c6c5c1deb0c037bc7f5fcbf2cc48d36ceecf9ce0336a926daa352f028 SHA512 f1557f3ab44acb7975dd98c4c5b2b63cffa9e42c82c5b31750dcfbddbd19552ecfe5ada59c2409e5d12da77dc00185619349340f8e4e177139a09c47f0a5ca6f
 DIST fasteners-0.16.3.gh.tar.gz 29727 BLAKE2B 67b4bc260858abe7ee330c2c5a625ecfead11ed486f4f3c2a070eaa77addad300ee8398d6fe6d5ee0e517a25617dccd49500bd9e0abc3f9bad8216026c114686 SHA512 72b4ead49bb0c4f0e0c4ff47cab12f645af456e9100f270b72582b68239dd2536b1b641b38693f4f3635fc977e4ffa059c249e097e8842a1325333c4a6e864f9
-DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da
-EBUILD fasteners-0.16-r1.ebuild 654 BLAKE2B 1ad152a2d29ab8487b70412aa57889a2f7351449d221662a423fc696e4e16884af1917bd387251642cc57d3c3a21546221dd1449be577638f74f6734cf8f87e5 SHA512 28c3dac7d4620f6a6ce1a04361ce249cac21f68b7fd75ff1f83165be28050328ac9d994c78b589f17241afe52593dfac12b74a57c1f61c4675f14a454acad05c
-EBUILD fasteners-0.16.2.ebuild 707 BLAKE2B df46efc7b85996ee878b2e64764b4a32f27ae143916dde9a4fae6874b8896234a6f7e7964de826bf3c07ac23a9b6206edbb68e0ad079384f160a791151a94a2f SHA512 816ca129228a771284b482080712f98c89a1e148abf5aba95204da3735ce51fe16390dd23433b2339ce1bbb474bf8bcab429c3ee483804aa088c718bd019233c
-EBUILD fasteners-0.16.3.ebuild 737 BLAKE2B 7200bfe0ecbe92f675d880ccd42cb7af219507f00efcab5304b5351219efe636ed8ee6ce553220a5fafeea402f07b13ee35ede3176b38421bdb6a8f72197c560 SHA512 0a40edbe9e4cc5ab5b5c5c9c587316ff07a0c9d5099a37be4cfc529b719c79e2640ce8fba92fa635f6b32c1f801e12a8efee574ee658bd8fa6666b1a2876ad06
+EBUILD fasteners-0.16.3.ebuild 734 BLAKE2B babd0a48a14a94ff07ac9cde7a9bb7f19e21a0cb92d47eda29889d9870295d95b3cb38925b1264b246e55706dd798a51c059ca3894e83bef9f9731fa310e295e SHA512 3ce341b2ead3170f1a3f2ed313c6ea36bdfb5dcea09a2f4abac8963e6574d82218d6b831c75ee3dcc3d9cf9d92e907e07ed9ae9b344eeb60755de8508de2cb98
 MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.16-r1.ebuild b/dev-python/fasteners/fasteners-0.16-r1.ebuild
deleted file mode 100644
index ff7636a0dc6b..000000000000
--- a/dev-python/fasteners/fasteners-0.16-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package that provides useful locks"
-HOMEPAGE="https://github.com/harlowja/fasteners"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/diskcache[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/fasteners/fasteners-0.16.2.ebuild b/dev-python/fasteners/fasteners-0.16.2.ebuild
deleted file mode 100644
index 87fc43fd2b6e..000000000000
--- a/dev-python/fasteners/fasteners-0.16.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package that provides useful locks"
-HOMEPAGE="https://github.com/harlowja/fasteners/"
-SRC_URI="
-	https://github.com/harlowja/fasteners/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/diskcache[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fasteners/fasteners-0.16.3.ebuild b/dev-python/fasteners/fasteners-0.16.3.ebuild
index ac361e013dfd..65386ec95da6 100644
--- a/dev-python/fasteners/fasteners-0.16.3.ebuild
+++ b/dev-python/fasteners/fasteners-0.16.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index f2058a08fc05..934aa97623a3 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,7 +1,3 @@
-DIST Flask-Migrate-2.7.0.tar.gz 12627 BLAKE2B 2ad252ef6338bd45c2df4cf95ebaa137e43b5cce7780ccafcc9a0d972473ab230acae03ca14c1dd1f500ceb4c5fa1d0ed6a892bf7e2317c9dfd530a59c025da3 SHA512 9d5f5845c3483bc2ab1271431312331bbc45aeac5bd9464f99898e16e32d9ba124cb11f11fae59a29bf1d6e3dba5f2ca922ae32c2548a5d67d9286ca17d475ab
-DIST Flask-Migrate-3.0.0.tar.gz 11536 BLAKE2B 6bee958fc059f5980ed1b75309c7166940f6ecee536f83a7f7f219e0ce5acd4e62aecffcae5979d2da53b4b074c526c662b4c7c74be0548240f64501c0c2a27d SHA512 e13c3f96e68892b9319292998fcec43df253e01534d9d02a24fc54a2c2ef8fe87b5a01706842e9825819021d29a41f56f635963ed5157c6fc16bf9686212d107
 DIST Flask-Migrate-3.0.1.tar.gz 12154 BLAKE2B a6902b3ff1a369fa507d01c9c9bed13b0d93d167fa511a3b54f707e27cb48f40e30957414ae5c1443796c635894cf6ed17f72b9d3e3b0e1e7bdabfe4d5157d56 SHA512 cefad924e471730778dfca16da665b499733ff236ad2d499e27094b1caf73da5d6c8d667fe51bb5fc353ec9954e6952a22bb85c223ce9a4009d5a6e831284421
-EBUILD flask-migrate-2.7.0.ebuild 767 BLAKE2B 7047b2c454f80ce023606feb9488cda75fba4e4fc2810035d60274b6df62dbabaf16b0da5d17d6a530a3c59f8c916f929897f78d4b8b4c2d5174b775970ae38b SHA512 e4a1e22eecdcc339a028c6c0ad079905c6a057c874fb299296c664d525798e5d525f9762c6cdb7741a964e244af052a392af2745a35b1a29f2335b7786a0b247
-EBUILD flask-migrate-3.0.0.ebuild 659 BLAKE2B 492ea38d7a8319a3c5df29fc46a46e3483dbea58d78e67ccb043c52db697cc1bd04daaa3c02f4558c1beec39a0d77d507540f76e2330abb1782d0fc98b8b4fa5 SHA512 7a21716fae2c16802b730cf35d34e58361d4d3ac53ed65df25ca76dd5f0d3765f453f3e44939b483f7d77646b531407ee45db73bd5529cca7dfd26c34c12493e
-EBUILD flask-migrate-3.0.1.ebuild 659 BLAKE2B 492ea38d7a8319a3c5df29fc46a46e3483dbea58d78e67ccb043c52db697cc1bd04daaa3c02f4558c1beec39a0d77d507540f76e2330abb1782d0fc98b8b4fa5 SHA512 7a21716fae2c16802b730cf35d34e58361d4d3ac53ed65df25ca76dd5f0d3765f453f3e44939b483f7d77646b531407ee45db73bd5529cca7dfd26c34c12493e
+EBUILD flask-migrate-3.0.1-r1.ebuild 654 BLAKE2B 26b23baef434a602182fc1a1f627df0768f801e39b7364cd3062f62b5565c480cb5fd115d84616e9fc54301dee71725c82c8c563802c58f7bc84d7579045e274 SHA512 49a3000dc724c3097fe1afdc191e2b9683996b87fefd18c6923d0b0f91222848107efa373a3b0676e805d15575f533a38bfffd7046cbe1b1052fae27d3293012
 MISC metadata.xml 340 BLAKE2B eceae6698b65718607ddd4d7e50807ffb6ad3731c778ebb13cb8bb936b9a79f29efe1b633687b981ba1e2905cade1f88667329db975b495c2f576e95d57e8fb2 SHA512 cc5d07905739843c9ecb867388f9be5b459306665e6fccdb236b715bedd0c59b2f89969a7437b8c72a5963254d55000de57284de2ec9bde75b3c46b07c575225
diff --git a/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild b/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild
deleted file mode 100644
index e72818dcefbe..000000000000
--- a/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_PN="Flask-Migrate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
-HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/flask-migrate/flask-migrate-3.0.0.ebuild b/dev-python/flask-migrate/flask-migrate-3.0.0.ebuild
deleted file mode 100644
index 815f8aa2a278..000000000000
--- a/dev-python/flask-migrate/flask-migrate-3.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_PN="Flask-Migrate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
-HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/flask-migrate/flask-migrate-3.0.1-r1.ebuild b/dev-python/flask-migrate/flask-migrate-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..ab97cc945587
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-3.0.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_PN="Flask-Migrate"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
+HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
+	<dev-python/flask-2[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/flask-migrate/flask-migrate-3.0.1.ebuild b/dev-python/flask-migrate/flask-migrate-3.0.1.ebuild
deleted file mode 100644
index 815f8aa2a278..000000000000
--- a/dev-python/flask-migrate/flask-migrate-3.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_PN="Flask-Migrate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
-HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 5a8cdd2d2e7e..6e9c04bceb9d 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-WTF-0.14.3.tar.gz 44507 BLAKE2B d160e10b1434c0578708c265468b77624953eb2d4ddde9a6ed2ff5b4f4651e0d5d2483020f51c9e512e3cb04895ecaa8fd1d0bf9380211d0a916acd8428f353a SHA512 58bdb87e442dd49dcbc9090e6466ecbd0b5c6bd2f097a26e071a5c73e09256ac46cc2f794f138f0e0b45e4f65ce70c231c275dc69aa44df408d7d79b15198832
 DIST Flask-WTF-0.15.1.tar.gz 45540 BLAKE2B 95ed9efaa89b487f406811926a8b206d15ad9c065f99595a35ea2ca4f98ede671673204c4085de91afe1e1b91b611ceb0f43b9c68b46fdd0e38d9025ac666f70 SHA512 9741e2c2285a500866b160e8c906c38ca579fdae2235bcba2336c7125ba614a9f75167c82bfcb96a45e553170c5925cb1a530d0164ecc57dc76cf1b560c40855
-EBUILD flask-wtf-0.14.3.ebuild 1030 BLAKE2B 6741790ee45cb60146b5d2c36a0510e5f635cf19de6c5ab90705af10daa6af512b046a418df87741f3ecea27ea292c4d1b776bd477ab2c0272fcebfe260e8cc9 SHA512 4e6bcc04e4f8174a1b81c96997a1f8a72d44b772bf41cd8a76c27efd35376ca3cad229f533fce86731794d326f6583da4df22e19bded7ce07f877951338a2ddc
-EBUILD flask-wtf-0.15.1.ebuild 1012 BLAKE2B a378d29d4f6a24d9993f7f348397b5484fee746d5e3ed32625386058d71754a1e2a87150f458f8b7af57f43f627f55d89aa37d26075af3b173d29aca6ce945c4 SHA512 36cb6661181ab09ebd7fe87be92d15b2ee82403376eccda00911fe5e3c425a8defc43247bae06a66442aeb247b0d132bf0bf0f041976253201d3e468ea6c75d9
+EBUILD flask-wtf-0.15.1.ebuild 1010 BLAKE2B 6775c6ad4f00ded0f2eac08fb60890b28afdf4761ab2203a2996014a54544b379795df401d2a9798866e47fefde53f1d5879879a0069e7dcdf4fcb180b3e2211 SHA512 0a002fe933f4ed75aa095e26a1a12d7d1e3b5b485fb55b74e5776098351e1f52cc5a59458b864d20f151d69c9e74b03b4075e345b51b5b8ca2e2dff12c6c5fd7
 MISC metadata.xml 503 BLAKE2B 140d26af9657500e359d1d40308d83123de20d83b3536dd283d9692062b9dfb044801a3b099a7db74bc8df437049113d7e0ddd55d60b0bc1b46fb0fec53ee2c9 SHA512 ca4b90e216f28bfc736d5c617244d79c27b41564ecc33ad3f2d4bf2837bd478707ce7c08c01ac6579c839797686a94e748d725a594c7e7555352e93eaefe0c98
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
deleted file mode 100644
index 08f60600e256..000000000000
--- a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_PN="Flask-WTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple integration of Flask and WTForms"
-HOMEPAGE="https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/Babel-1[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-babel[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# tries to access things over the network
-	rm tests/test_recaptcha.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
index af7bd3457aa5..64af34e29e53 100644
--- a/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index ff6f6c2b596c..896e9cacd990 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,8 +1,7 @@
-DIST fonttools-4.23.1.tar.gz 2550938 BLAKE2B df592a9a9e54b4b542bb2e5dc0ea7d56f25cbe7b5cf38cb3e38e5f6feee1a8befbebab2b2c73ae814234a26440bcd3e6869335037c962d482694b4e35cd5dd78 SHA512 ef7faccfabdd66655195ad4d1d09599e302dcc393ff88cf005732930cec62df3c05e06795fafe7cd1ef89671faef2bf642f94e6ab33ebdacaa388c254a71792b
 DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4adbc6646598d773f0d3d6a8cd777e8fd3c74c14f00e6c4735a73e712e3fd42ddfc96f3f101d34b122fb9c471d4d94a3 SHA512 aa4ee8f0a7f9cb6d8a84497e6f33f891491cd06cc477a785715f8fde8e5b33cf781ef8b848bfab8cf9a97fc15c018d493c6baf0fb8fd314b8a348c36ff627f41
 DIST fonttools-4.25.0.tar.gz 2576777 BLAKE2B 802236b120ae78e2721d734875fba794fb9eafc125fbfea6b70c68d6a18a8b3c1ce685da18c83ee3364ff38f72707e42ed0ae25bc62d362c6271fff90da56d0c SHA512 c8f7512053ce611fa07bbc1fe844ee9d50cf09e19a2a27bed7df9d37d362b7daa910fbb651147f3690a03ec4d8adc8d96e8f0310eda24bb40208240182dc9b54
-EBUILD fonttools-4.23.1.ebuild 1275 BLAKE2B c141c4c40de9f3eec1679e8b574ec266962a6749c1a16fdf6fa8ebc7e8cb6cf705f7c0907a55793efa1f31d8f9bc65a9708a865ddd8897a5956c7161be354ace SHA512 4204c3df209a287f41da115fc6f04ae40938dfcc50721636c9273f69821c29e63ea9ebd33a2a7dfd0b97f067f519376f4f0707fbea10de8e87dce12527ebe5e2
+DIST fonttools-4.25.1.tar.gz 2577170 BLAKE2B 8cb03ef1f9cf4e61d5e6d4963bb5c43ec48838e0453cc293de1c763a29b34d69701b87430d8a85085f06c26671e00a91c89e4c50ba8d2fad4a9cc72b1f17d0e9 SHA512 ca3732bcc5e2b373983d34bd72e0ea36488f24aa442d25d0d16f6a473ef35323547f900b1ae87c42e64c451afe4f760291095738a4442c11c5566c9efd0aa944
 EBUILD fonttools-4.24.4-r1.ebuild 1295 BLAKE2B da50602b72774fa7dd8ea45e5a8decc1410637898075d60445a6949b1a38c826f9834dd60e0452d8b1f864a44d0fc620f1166ae32181ae8b01279630aeda390a SHA512 02668aa827368428afe0fe2633b7cdbab70590796a822a1eb15fea29d51428534e2ca53c1b66d574f2e7d10b3cfb1af0e99fa8c3c04e072844232081b29dcb95
-EBUILD fonttools-4.24.4.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
 EBUILD fonttools-4.25.0.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
+EBUILD fonttools-4.25.1.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 MISC metadata.xml 371 BLAKE2B 68c245e8fa48ff65af06976274a7352964e39e13147683e266688f953d82d67e0548dacfe675bbd2e6807945c2e367bf08de4d18f75d53f44b28ecdcc8e7f188 SHA512 489bf8cc57a5bd577fa8949ae0ea9ec8be9a77bd6853e549c830f60ba6a152bc7dd25b2f3426974ea6448120113808ff627f9179e5e1e70105003057008aa86c
diff --git a/dev-python/fonttools/fonttools-4.23.1.ebuild b/dev-python/fonttools/fonttools-4.23.1.ebuild
deleted file mode 100644
index 04af2aab63cb..000000000000
--- a/dev-python/fonttools/fonttools-4.23.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.24.4.ebuild b/dev-python/fonttools/fonttools-4.24.4.ebuild
deleted file mode 100644
index 95ced12ecf0d..000000000000
--- a/dev-python/fonttools/fonttools-4.24.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.25.1.ebuild b/dev-python/fonttools/fonttools-4.25.1.ebuild
new file mode 100644
index 000000000000..e40813acd252
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.25.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/frozen-flask/Manifest b/dev-python/frozen-flask/Manifest
index ae5d9a272aee..373ee4ceb7cd 100644
--- a/dev-python/frozen-flask/Manifest
+++ b/dev-python/frozen-flask/Manifest
@@ -1,7 +1,3 @@
-DIST Frozen-Flask-0.15.tar.gz 477516 BLAKE2B 1f9ecc59cabc547f7c4358c5fbbde0c57264a6c8e45bcf567c00f5c20eef288b8d261edf878e1295ef702d863c16dd605b59982abfe4daf9f073b29787b01921 SHA512 8cb80ccb5018abdaaf53a43c219504d57f2630af3d8d5c7bd6bee44c7cf483f50530bc00ff49fd674d54c0e1f6a5e0caa004bff04e95dec7f58a8bb443a36241
-DIST Frozen-Flask-0.17.tar.gz 179081 BLAKE2B ddd029bdcebfc6a682de5e052bfed50ede18cfeab29655d321dcbdf38070c61c4c9c2d2424a43d170ea34d7ea512b029014786b6f6a48b90d024ad512ccb0861 SHA512 278aff5ac5f581963f0b5935c7b52b44c93ba6dcac735ee3802bba899faa35ed6a170fcf2d6f7507948b277e6de9a30f46f99f0e61e94fc0c670181ec35ddf53
 DIST Frozen-Flask-0.18.tar.gz 179245 BLAKE2B a82695892aef9b6b4e3aeb91f12f78d7d661f2f2b0efc57c11f64524ed467b85d8d9e0e7b147cb78c3d0a641dfef0f683e0f77cfda560aada79e1b435424c0ce SHA512 6c2e4d900547cc5c0de4af23b96c5b9e1925101fb40f710bedc67ac52c303282aa223f6972f5b9cc813878bb15eb90cb0a007619dd5a9db2dec762f04dcc7ba0
-EBUILD frozen-flask-0.15.ebuild 853 BLAKE2B 47ef6e7daadd445e13f71cb7c625fc572c86ff74b895ba86e1e26dda1822a87dfb5fbca88d500dd986a6a8688422b8bf111aec513c36b889932a644b1b68ef3c SHA512 c8812a1e774e3daa75b3ff3e78ba4cde8e97518d958c96a6a53a0bc96f30f49c5d83d1beb2b13248a87df7c21bdb0ecaab92717680859a4a8312278e4d38f53d
-EBUILD frozen-flask-0.17.ebuild 655 BLAKE2B 87e16a6f16aba8fdb715d2c0fc64063af3e2eb3390a32be9b154affcdacdb46cb21f4b53597f89061f90d0b7a7fe3e454bef101feeb373c14a12f771d73b6eda SHA512 ab55e1941e7bad4f02dc76cbdcdef18f7f48b01e4576ab622098599651a5aeb53d2b80c1487db97d61df3632ffc14df7cd45d10678439dfe288fb66a2fa38701
-EBUILD frozen-flask-0.18.ebuild 653 BLAKE2B d6f37a08a31fcd609562d2ff41986643e332bd2d8bf2bbf3a98007c26895c26153532466996078199678465d63c5177b1ca27b012d8fb950e3c00e7a391afb7b SHA512 14efc578633a8ea57c3ca641be1d3fd3f95ee4da326e6981411642f2e651be815436b717994e717d7b99bb38a99b81a65e936dc2546729376a14d3b61a04135d
+EBUILD frozen-flask-0.18.ebuild 651 BLAKE2B a54a8b53d80e7b953980375f58ac986be8d8cce342ad727af9cc816d2d3dc62587a40544169c5384b8479c335d553cd25958c1ee4e6b011b385807536945355a SHA512 c32dbcdfc22d0261b9e383702e194ee079a0acf4ee132959f212bd325ac837fc2f1a8899eb02ee197bdb78ed0211c0b0ec29c36cc2dc8d7cd0ce5244a14d9c9c
 MISC metadata.xml 417 BLAKE2B 2bdbac5df39081dd75056d27c5e943bcf898baefbd76b6080e1cb8f6cfabe0ca9d0ba5b073c1929dd71d3207d7557dbd23267464d59633c1ded1e8e429708898 SHA512 94b50fe00a2434157ac8aabf79e19e68306b70a7112fa2ab20299e1754910c55182678309ba13c6e2910016e3614812067e482e6f6d638ad787c3baff4c2bd3e
diff --git a/dev-python/frozen-flask/frozen-flask-0.15.ebuild b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
deleted file mode 100644
index d34cbdb14e74..000000000000
--- a/dev-python/frozen-flask/frozen-flask-0.15.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="Frozen-Flask"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/Frozen-Flask/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests nose
-
-python_compile_all() {
-	if use doc; then
-		sed -i "s/'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-		sphinx-build -c docs docs docs/_build  || die
-		HTML_DOCS=( docs/_build/. )
-	fi
-}
diff --git a/dev-python/frozen-flask/frozen-flask-0.17.ebuild b/dev-python/frozen-flask/frozen-flask-0.17.ebuild
deleted file mode 100644
index 2b5a9bfaed65..000000000000
--- a/dev-python/frozen-flask/frozen-flask-0.17.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN="Frozen-Flask"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/Frozen-Flask/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="<dev-python/flask-2[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs \
-	dev-python/flask-sphinx-themes
-distutils_enable_tests nose
diff --git a/dev-python/frozen-flask/frozen-flask-0.18.ebuild b/dev-python/frozen-flask/frozen-flask-0.18.ebuild
index 53e03ad0acb4..a84f085abe91 100644
--- a/dev-python/frozen-flask/frozen-flask-0.18.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.18.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index f4a8c4ed9e97..5550ceffb6df 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,6 +1,8 @@
 AUX fsspec-2021.06.1-ujson.patch 1304 BLAKE2B 9a7a7580b7df2967c4d61b7334cb4561cc4a1ce056b9dab3d16bca132545edf6651291c6b69742421208c679b336017b0e92d7584ec24bf32eb26335a451b917 SHA512 5574a57ba32b678a35967c9560831feb993b5462ff986e2b4c9a3a93dfa497ceee206bed88a72cc41456dc255cf8aab4240f6c3fd624822cbe594c6839758324
 DIST filesystem_spec-2021.05.0.tar.gz 292796 BLAKE2B 5d56d860ced1a72c27d2031b7d257a4bcbd52f6b2fed5275fbcbf7088375fde26652f0a003e919ebd3948d5e9833d802304234282ca858a7a2a19bfa11f66aa8 SHA512 7c27a1ad4e21efdcc0f31f91a9929e4c09db7b9421e7bf8d2f485e961f6887a4a5c083f38f8d7b09005a4cf11f55c93cce4617e3dc6c2b241ed20f7847ad711e
 DIST filesystem_spec-2021.06.1.tar.gz 297254 BLAKE2B e360c0780df2ace31a2a7e15f7269f23140ddbc6bd6a1f657cfddbab2b1f285d79a0c88f8d63e406d4a53fd3737f77012eb9837479707a778ab043503ade9d18 SHA512 1d59c2c53b1a4a604ff3762eca8484d7ed60fba98548cc77d7ed014ddf1513cef046ceeec41911cdecd414bdbb4e3c669a3a3f65da08dabf5a70cc2985d06b73
+DIST filesystem_spec-2021.07.0.tar.gz 301517 BLAKE2B 84b189e636eaeb4d3724e1afc44795e83b3ac576ab8640b4fee916bb7cf341c5cd6b1b475616225927693d13f204a1750f913f2e6d35b541fb8ff26ee1019400 SHA512 bea483734e6c9773d93ee93b526c8074a28f0671fbee17b39858dc7a75fd71553ca6d8d5c4e2204446bca3e7c23f6d4c8e94b62ff920e546a2b71786d0dcb388
 EBUILD fsspec-2021.05.0.ebuild 1194 BLAKE2B 0fafb3ea6563b4cab99f604ebe85a5515556a1018f850f0c154feb87f7e3aa7e65a304b4c4d9c244feb36563051706280a09de761a9782f1bfb9db3f2a150b43 SHA512 8b7cfc0266f9ff8a2f60b7853b356b357d98714e43f7074940ff57d2abf7d1e2636bf6498bb33a6ca2b59b9a2d3162471033ef97b9a05f9d5f390c94cd095fef
 EBUILD fsspec-2021.06.1.ebuild 1241 BLAKE2B 0a79be9a0a6e0b512c24e86753380d98b38d81c31aec99dd08e42abac5aeab4f95abbeaff38c0ae89507e7a677117d01aa36535cd2730f066120a8a3f3733a07 SHA512 9319a05c1b9dc4be33a51fd3ba43b91bcb21bf46048e06df630086ff3e4a413fc83f48b255c2081070606ac56d7e88928803b4dbbd4feb081d218cdb687ec5da
+EBUILD fsspec-2021.07.0.ebuild 1196 BLAKE2B 6264230bccd83e7b2c525e622fd542d327f3cb7f1592033305748635ae528ca1ea319caf4cf6f369c211bd63df7452b9168ec72d0ecedaf924eb02c7e61d1afa SHA512 7908bd8aa040f87ca4b912894ef1195fbb7c1a2a4f203101def93c762363fc021884e92594c648b1e48fcaf692829bd91bdda946e0c096426a3939fb22f257d8
 MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/fsspec-2021.07.0.ebuild b/dev-python/fsspec/fsspec-2021.07.0.ebuild
new file mode 100644
index 000000000000..01506d4cf04b
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2021.07.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	# sftp and smb require server started via docker
+	epytest \
+		--deselect fsspec/tests/test_spec.py::test_find \
+		--ignore fsspec/implementations/tests/test_dbfs.py \
+		--ignore fsspec/implementations/tests/test_sftp.py \
+		--ignore fsspec/implementations/tests/test_smb.py
+}
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index 052496a3561e..7e615933f782 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,3 +1,3 @@
 DIST Genshi-0.7.5.tar.gz 266071 BLAKE2B 007a094f8ce9aa17209a2c1c7241eb5eb50c3be3439fa2066ac7ceab88fa4dccbcaa11809042445e23ad1ce106b2e9efa825ac11de03038f07b421e9b93c03f6 SHA512 b5be34094e2eea8f5fc373097414dc77ddfe0ab0a82901b6fd87af558cf62420f690fb39bff2d13bde3f7fef5ef000697372996877b48187ed068227dab59119
-EBUILD genshi-0.7.5.ebuild 824 BLAKE2B 602695955eab507971382b9bb3629b65c886f096ea6603a28c1fe930a1765b86943e5530b226a12a2f9d4cd9a5f30ada8a6efddf86b3876e077ee4d7e1ed17f8 SHA512 a855686406b39a5238c2e7f7706abf3f29156b5eb5b8ec248beebbd92665ebee3f87a0a9d574ee92cef8ad7fff269261c62782658132aceca4b5f124a1ee7cc1
+EBUILD genshi-0.7.5.ebuild 836 BLAKE2B 43630c37164a79841db2a3925e4e56b7d4107b5cf25b705be4d5746ead797b5153c922c6579e606a4b477ed24b7c2d81765a524ae3830e5fc95d5b95fb595699 SHA512 d3b97d03d6d483d09adb54224a99fe9f611e39538a09de4ff79a55ebd4f175060fa3ed31b748d268718daebdc6a877a3ff89bbaac28913c2d3d848ca85664e65
 MISC metadata.xml 388 BLAKE2B e8c4b18a11c58ef5960d0fa0967f1f0b65726366d82ae288c5190f7cf77321add975f653e1be53fe0b6959004f24b4dabf18bd2c0b2459554a82f2e6a8dc0398 SHA512 410dacee9c67277a3c4b5546d78d2ad7eaaaf46ab51181fddaa14c326480216e8b5f5ec19dbf0ef8f444482cdcfff834457ec9707a6e6b628024ce57cbb67081
diff --git a/dev-python/genshi/genshi-0.7.5.ebuild b/dev-python/genshi/genshi-0.7.5.ebuild
index fe7f34e0cfc5..63016f30c154 100644
--- a/dev-python/genshi/genshi-0.7.5.ebuild
+++ b/dev-python/genshi/genshi-0.7.5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index db2afc5260ba..30be977deeac 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,3 +1,3 @@
 DIST geventhttpclient-1.4.5.tar.gz 58183 BLAKE2B 48d44048e7040552824ed19ac49c6dda41536ffded56bae0d942c06f111a327a1d571872f35f388853b479ea1aaa6de518f86e7ee72e362360492530ade65131 SHA512 9ffe00c79b145dab104e1dce336e072060f315d9bee880daf64b5f1f52e661d810dab9a60286320a7d30cf0e794465f201c039cc31fe7ec325cdb3a8350c9f7d
-EBUILD geventhttpclient-1.4.5.ebuild 1513 BLAKE2B bf85eab82133c2a6e908a7f4867c28b05af9b20b2dd2c1b845afb056793f11836ba6aa18a9571ec8b8fe5e85122967868f9ef327c5d034c5f20d5d6699afba1d SHA512 d5e87185deaa2ef22168dce14e8edf923733902c40cbcad5c50a7b10f31473b8639caa615d2916f5e48b50bae6540ea139cdaf10581b511b625c2b2d664beac7
+EBUILD geventhttpclient-1.4.5.ebuild 1477 BLAKE2B 35bfeb29334f743c0bd7ee2ed476f51c056606f14caeaa149ea4d0cae6e66a5868b804528fc60cc542b07474b5598f30e6b007985255e1bc9b2798ab0497cb91 SHA512 68b9ef7dd73a8aa1da5fff02fec0edbce304bd0d3c26dc1be96f06ec3cce39f16a98e636673034d78cbead3a578c7a81fe1350876908bfdf0c23543147813fcf
 MISC metadata.xml 555 BLAKE2B a747ad2f270f2267b197d8489d253c18bc6093063f9cbc037afa0598931a244aa9da1d0d9d5c8e69a98c4f1fdfb8275917b9493dec895db5225a8918c51d0f43 SHA512 61c8affec2fd6d68f40d721842d7a121f6e24fdad560d131acf9e8b0f1a229afd2580fe9f78095da9a77b8dd9accf72b180eef797c4e143776e8beb7b7c36fcc
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
index 64318b31be0c..35efc6717e72 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -44,6 +44,6 @@ python_test() {
 	# Append to sys.path to avoid ImportError
 	# https://bugs.gentoo.org/667758
 	# Skip tests which require internet access
-	pytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
-		-m "not online" || die "Tests failed with ${EPYTHON}"
+	epytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
+		-m "not online"
 }
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
index 3327c9505150..78d68ee84e98 100644
--- a/dev-python/ghp-import/Manifest
+++ b/dev-python/ghp-import/Manifest
@@ -1,3 +1,3 @@
 DIST ghp-import-2.0.1.tar.gz 11158 BLAKE2B c091d193cbfd44d90e62fe843775412a74f7962228130ba381ca07f5af93ea2296e989cffd025fd7d6a50ae5e526afe69fb00f49a6780b9b2f49ee8f06e2d3e1 SHA512 8e53b1a516a8d9780159d57b3973ebe02bbc4f60788470ec823c99608c2b026f5c43a12796506adf039420f06964a11d9e7e318cf9ea10df167faddd8b6f9707
-EBUILD ghp-import-2.0.1.ebuild 449 BLAKE2B 12908d41c5864b4b7bd8b1c582404e10bada37e828d7d04ea9be7c6a4b0451330dd8a7dd44ee08bd3904d30a50c16235b73d8883b23169155807e778e819da98 SHA512 9758c81e3cd19fdabfedbd7f3dbe7189070575507ffa8baaf1cec6caec8536bf4c2095ab5e8591fc6cafdda72d1ff8d311374ffd1fc379af9afd8d59acd9bc70
+EBUILD ghp-import-2.0.1.ebuild 447 BLAKE2B 03d84d95b404e6d98921eeb1a5bfaf458a412d8800ebe4cca31cf590290eb791fe8c67fbb435e951f96490ff10b208409aa0ba71defbabf37f719d4bb1efeb9e SHA512 f3297201dfc4950d4107d00ee14506eb654c4d51031666a9b185074223627be49fb9a06abec51fa4b7ee3132c1c4993e588306f1a95f9a4e8ed6975bd90ef807
 MISC metadata.xml 409 BLAKE2B ac8dd9b78b629937b57e93e9ae18fa427036552d5ae43a9f46a1a59973943e402557e0008f0ed04dfb48ad9c4b82e33b86de79e062ebacc6e89b9c280d2506e4 SHA512 9f986d2b4d7d129504cd4c0a60b448ee1deb64a92019e7648108728c230b8602277ad906c520f834c2cf25fefb7940923d1abe51c9e188596e969abd366bf337
diff --git a/dev-python/ghp-import/ghp-import-2.0.1.ebuild b/dev-python/ghp-import/ghp-import-2.0.1.ebuild
index 5a4b8d9ef5fc..27790525a2cb 100644
--- a/dev-python/ghp-import/ghp-import-2.0.1.ebuild
+++ b/dev-python/ghp-import/ghp-import-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 2ba64f36f2f2..b55c10dd513d 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,10 +1,6 @@
-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
 AUX gmpy-2.1.0_beta5-failed-tests.patch 4756 BLAKE2B 1258a1b0dd5d0a86ffde979c8766e4829d35ef91c9c829c2d2b433ac5811d45995bdf089b3dc2dc6b58d9b3a10f0283b22d52551b06da4f7709d4f78c8366240 SHA512 a4478447e966292db24e208b763ac11463e7684372e7df5d2115e5908ca6fd88718005c3f8169dc0171e22160d10d3dac034106f50680bc7e1d86d96cc3bde11
 AUX gmpy-2.1.0_beta5-pyhash-nan.patch 379 BLAKE2B 2703f8fc891bb2742d8159834ae252014071745f5097b54990393ca560b804d1cf21b540efd71fea7d4371bb76f040d76596bc73f12f998554b58ae1a77c0051 SHA512 133d1c825f0af2108131ea9e702b5499e1970eef027fc63ee6516fea6cbe5a684aca2a3b8c09c20e3cbdbad87478d692d664bde75a04bae58feed63b8148e6bb
 AUX gmpy-2.1.0_beta5-test-input.patch 436 BLAKE2B c0cea44d17b1a44470c13893500dbad327b9f1b694eeeb65a62a307dadfcae06ad57450aeddfd410432a04d7d877dc14c330c0174c49784c676d4079b628f9ea SHA512 9647d199be4017495e1525223e6b40bef50655bc86ce348fd0db78ea56b832795925848ad6897c7c83f7ae92e0a683105a16ad8fcb312c5676005ddb6d35c7dc
-DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
 DIST gmpy2-2.1.0b5.tar.gz 264742 BLAKE2B 1dd6dc66f9ec8cb2738f449112aa44feb40ba983f6da5f7a0760016e79ffed19037d77d47c0c0b816f9088725207e50ba3bd423349ed4c744ff03059c4c6a19a SHA512 7dc647642d7b61af77258881a7b91ab967dd11a86ba88ff5b7fd41cd4c999d2bb4cfe586511e79cc5f21f0f00d0823bbd2620d69df051c8cead15090423a657a
-EBUILD gmpy-2.0.8-r2.ebuild 1716 BLAKE2B 85e9237fcdedc534b93243109f28754577f34328602317fb6a7d599f33839c5c3b019973e2a73974211d6e96e93653942de09946031ad87d996f66c90c1fc0d4 SHA512 195083630391eed0b1b392116d6a34722bbf4a1e40dc94448a0683d3b149a3f2f65937a95456879ce961fde2ee9da39370392599af5112f3ff913000369d6b50
 EBUILD gmpy-2.1.0_beta5.ebuild 1281 BLAKE2B 92940940091499078cf28762247c4cff6e93b083d4e9b0deca4d9640c44a9c96bbf3da8b8176af5d6d9140b42b2cad6ce7438a28c177dfb5dcf4838992742c5e SHA512 73f82946da64c4491d6c3aad5d2019df990818506f107be09a26cf7a5ac430ae197cd2040061d9f40120ccba99d51e1d3bdafc479e2218f6000565d6c436adf8
-MISC metadata.xml 779 BLAKE2B 39be0ec90382e04ec8e482738f0ee8a984f7532e4efa4db27bcd4d9c201b2aadc380e6c3faf180fb32e2d920638bbed4c15b1fefad1af1edfbce8b1f6a1feccb SHA512 af0aadfa3d9c3caaddf2763c33aaf77e0ab285228448f03a8388ec0a2abd199bc88256cce57b78141a437d16eb493e57785791b953898e69f9712dbf26b741fb
+MISC metadata.xml 686 BLAKE2B 825fe2a9401b5dc0f1c78febd69b60f26554bc909e253f0c6ae84c110cfd7c756cccbf46822b045130e770a6ef908eb78570f72ef8b186d5f3eeb915dc299dfb SHA512 6ce00ad42436897a2a2c25db8e7948854142f5e87b9638a56cae0db108173019ed186fb783f75e9967941b0a0fae51d0cecdec0cfbe2291a4d6320d83220e311
diff --git a/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch b/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch
deleted file mode 100644
index d21e5a55510d..000000000000
--- a/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur gmpy2-2.0.8.orig/src/gmpy.h gmpy2-2.0.8/src/gmpy.h
---- gmpy2-2.0.8.orig/src/gmpy.h	2018-04-03 22:44:35.494621951 -0700
-+++ gmpy2-2.0.8/src/gmpy.h	2018-04-03 22:45:33.580835296 -0700
-@@ -129,8 +129,13 @@
- #ifndef BITS_PER_UI
- /* Assume we are NOT using MPIR > 2.5. */
- #define BITS_PER_UI         BITS_PER_ULONG
-+#if defined(__mips__) && (_MIPS_SIM == _ABIN32)
-+typedef unsigned long long  mpir_ui;
-+typedef long long           mpir_si;
-+#else
- typedef unsigned long       mpir_ui;
- typedef long                mpir_si;
-+#endif
- #define mpz_fits_si_p       mpz_fits_slong_p
- #define mpz_fits_ui_p       mpz_fits_ulong_p
- #endif
diff --git a/dev-python/gmpy/files/gmpy-2.0.8-test-exit-status.patch b/dev-python/gmpy/files/gmpy-2.0.8-test-exit-status.patch
deleted file mode 100644
index ab4128ff55ca..000000000000
--- a/dev-python/gmpy/files/gmpy-2.0.8-test-exit-status.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -dupr a/test2/gmpy_test.py b/test2/gmpy_test.py
---- a/test2/gmpy_test.py	2019-11-22 09:21:42.313037873 +0100
-+++ b/test2/gmpy_test.py	2013-08-20 22:17:52.000000000 +0200
-@@ -34,11 +34,15 @@ writeln("  Caching Values: (Number)
- writeln("  Caching Values: (Size, limbs) {0}".format(_g.get_cache()[1]))
- 
- pf, pt = 0, 0
-+ret = 0
- for x in test_modules:
-     testit = x._test()
-     failures, tests = testit
-     if tests == 0: continue
-+    if failures > 0: ret = 1
-     writeln("%s %3d tests, %d failures" % (x.__name__, tests-pt, failures-pf))
-     pf, pt = failures, tests
- 
- doctest.master.summarize(1)
-+
-+sys.exit(ret)
-diff -dupr a/test3/gmpy_test.py b/test3/gmpy_test.py
---- a/test3/gmpy_test.py	2019-11-22 09:21:30.421908749 +0100
-+++ b/test3/gmpy_test.py	2013-08-20 22:17:52.000000000 +0200
-@@ -28,10 +28,12 @@ print("  Caching Values: (Number)      {
- print("  Caching Values: (Size, limbs) {0}".format(_g.get_cache()[1]))
- 
- pf, pt = 0, 0
-+ret = 0
- for x in test_modules:
-     testit = x._test()
-     failures, tests = testit
-     if tests == 0: continue
-+    if failures > 0: ret = 1
-     print("%s %3d tests, %d failures" % (x.__name__, tests-pt, failures-pf))
-     pf, pt = failures, tests
- 
-@@ -41,3 +43,5 @@ if sys.version_info < (3,1,1):
-     print("There is a known bug with Fraction == mpq for versions of Python")
-     print("less than 3.1.1. Please upgrade if you rely on comparisons between")
-     print("Python's Fraction and gmpy2's mpq.")
-+
-+sys.exit(ret)
diff --git a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild b/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
deleted file mode 100644
index dc45e33a9a13..000000000000
--- a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="https://github.com/aleaxit/gmpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
-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 ~x64-macos"
-IUSE="mpir"
-
-RDEPEND="
-	>=dev-libs/mpc-1.0.2:=
-	>=dev-libs/mpfr-3.1.2:=
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-mpir-types.patch
-	"${FILESDIR}"/gmpy-2.0.8-test-exit-status.patch
-)
-
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# rm non std test file
-	rm test*/gmpy_test_thr.py || die
-	# testing for contents of __dir__ is really silly, and fails
-	sed -i -e '/__dir__/,+1d' test3/*.py || die
-	# fix sphinx-1.8+ compat
-	# https://github.com/aleaxit/gmpy/commit/c35c1f3319fcf95e894a59a6d523851bad4abf66
-	sed -i -e 's:pngmath:imgmath:' docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(usex mpir --mpir --gmp)
-	)
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-	if python_is_python3; then
-		cd ../test3 || die
-	else
-		cd ../test2 || die
-	fi
-	"${EPYTHON}" gmpy_test.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/gmpy/metadata.xml b/dev-python/gmpy/metadata.xml
index fd738a835d7c..2b02c6f120d5 100644
--- a/dev-python/gmpy/metadata.xml
+++ b/dev-python/gmpy/metadata.xml
@@ -11,9 +11,6 @@
 		library, the MPFR (correctly rounded real floating-point arithmetic) and MPC
 		(correctly rounded complex floating-point arithmetic) libraries.
 	</longdescription>
-	<use>
-		<flag name="mpir">Use <pkg>sci-libs/mpir</pkg> as gmp implementation</flag>
-	</use>
 	<upstream>
 		<remote-id type="pypi">gmpy2</remote-id>
 		<remote-id type="github">aleaxit/gmpy</remote-id>
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index dbd783360298..5b1288363c1c 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,7 +1,9 @@
 DIST google-api-python-client-2.11.0.tar.gz 25408815 BLAKE2B 9bc7d0163961f5b6341fcb43f41a91dfe12702254047ac2b418ce89dad4f8f40400a7df1fff5ce9d73a05c5249b7242a4d642b866b97a34140826901f74f9d6e SHA512 6d31e0ed926f87f12400b1ec244f8e193d6559c58d6775c34ef5747af3ba633e76e8a883983438e84c6d31fe81ea57ac522f924270b80993cc6396cb6f3ae60e
 DIST google-api-python-client-2.12.0.tar.gz 25476570 BLAKE2B 7d5f53c19f00878ef717515f406a56d22ce520a0de4f8c5b4142de56263a5bdef76aaa64b3b87301f8c704ad279554f66425c746c8bb869ef735c061fc5d1b6a SHA512 47bfebe8649a4dbf2f8570f71ec4a0c4ececccf6734138e3c84e0501328f949485b5476227c123493b5874e43cc0ab72622ce9fb44484502e21e364f6c8cea54
+DIST google-api-python-client-2.13.0.tar.gz 25562934 BLAKE2B 6ce955995c0f2fa5d09e1c90e65d38a7f321421199f53957fb58934c1f067de03a48f47f1d161c9ad2cb852663316c5d0f873a32b9eedd7fffaa2b067d84ae05 SHA512 d2b0cf3c250a500e774970790390025119102e24eaf8c7a0c170139cf322c37f4c8cd3f406a41d18deb2597dfeb21e6304e173cfaafb4d6faeff23b2215d4072
 DIST google-api-python-client-2.8.0.tar.gz 25286774 BLAKE2B b21aebda062984b9eb8f2f5c563016f0f8f663883dc8ddb913053ff3df32c652c6a83f924f3e19136e5edec085e12c43cc584bc9898630122c77a219810033bc SHA512 cc3c55438b2f5835b52d17d04a749919c4865991ff78cf95920d0941a55e1493eae502a13f6565cfe1db799ce9950659e8baaa690bada058d711309861c8d07e
 EBUILD google-api-python-client-2.11.0.ebuild 1597 BLAKE2B 609d0be968a25f6a9c25ece4a5818f7a59c2613b0d69d5d06f5e9e7fcaef14aa0232b625065d239a8d942e6d6282a7a5241ee15eae00967e554f4b55565e5532 SHA512 3f7d210a01f471f95f6ca27d787bc6b63c45703210ef0d4d6ddf6809ff403ff8e61a3c27a8b0ae2fd52f1678454ff6f93d9a50a0a34eb1667e991906a6f8e83d
 EBUILD google-api-python-client-2.12.0.ebuild 1596 BLAKE2B 71224bf042ad3587892f68bdbc391941c3f172b3f1e748afc9b6c3a6e6065c2178d49598375a57e5ee3dc8c63c7d20ecb2d6cb9d41483a152abd7dfca014f7e0 SHA512 d39560f9b75602c06c531b0862d6e3bd40a7e81d6ce9b3bc698f847d5d6df9b95183aa24d31971a7a0a60f8a3a3acb9216c337021f6d7e30fc217f69b2859100
+EBUILD google-api-python-client-2.13.0.ebuild 1596 BLAKE2B 71224bf042ad3587892f68bdbc391941c3f172b3f1e748afc9b6c3a6e6065c2178d49598375a57e5ee3dc8c63c7d20ecb2d6cb9d41483a152abd7dfca014f7e0 SHA512 d39560f9b75602c06c531b0862d6e3bd40a7e81d6ce9b3bc698f847d5d6df9b95183aa24d31971a7a0a60f8a3a3acb9216c337021f6d7e30fc217f69b2859100
 EBUILD google-api-python-client-2.8.0.ebuild 1595 BLAKE2B a8b4a982d508bce1149197b8cdf1f692c9977d62ff9d49b70ea00d155d5f5aaa5deb3122c5c51fda73e465f86149282f233b5b9a8fbaa6795f8f46e2ff19e324 SHA512 a3d4b8ff6e569483d08b1eeedf1c6636a65d218f7967e8e2c89fc261ce5d70b0ce8a5f81064145ec9c3992615e0c114831081e558c4d2ee32bfc6aa0d6259524
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.13.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.13.0.ebuild
new file mode 100644
index 000000000000..68ec1c0b8c12
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.13.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 35af4196546e..4f7e8bddb751 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,7 @@
 DIST google-auth-1.30.2.tar.gz 169368 BLAKE2B c01191313b4bd7ffdc62fbca20aeadcb01fcb1f26e4c11504f88c2582b9a3dca10046edd5d2fe88c98980fb09e4d68da99bf0b8b5692abcf5271994515f91765 SHA512 f133ef403f8a3c92437055f2fd0e5f607199a0bfd9a76a44075a9be8ec16c4d4822d58d85fa52ade4c448e11cb6822f7e8da03ab72f3dddfb811c8d7a846f841
 DIST google-auth-1.32.1.tar.gz 171621 BLAKE2B e82f4666a38d3dbaa4aa4a4d5192afb711471432c0dcca44b1a1c52fa2171f1de0d7ffd8a7a6d5dc6dbc3a1dec16becabb26306a9ba3b3fd0998584dd1194cc6 SHA512 968c16c7fc5c8c589a94e24139c319ec7f2791b021d6240156d398d4795e6afee8e46591c4aa44457de6f98ca14e8edcb055fb3a02914b43ba5fab74a03d9fc6
+DIST google-auth-1.33.0.tar.gz 178385 BLAKE2B 7d98afcd3a1dfc12a2af48297188c10f9618483ebdeeb8f7e02fca59d6255210a64b4917507a4525a3d6838198035fd827a1276da2a1f06169e83d1ca75fb485 SHA512 19da14b89cac28cf824f258d3dc662cbf40f4227e840594148c7ea3a6640dc00f06653c1b29846a9569d938a0fa307aff1c8425c015ab46d276485210eeb1227
 EBUILD google-auth-1.30.2.ebuild 1444 BLAKE2B 860c43a699cc5f7e52abf7f37cebae31c74cef8c7ac585c09250d9771481916a516ce09f34af774431f0c050b4c266a9617959d48dc183a5d76ba85370381be8 SHA512 c3185dde8203aeb1f1d1b2f82b43cd81d3bbb9a6feaf30343078d893dcdd5dcc3d2be87e2331e095daad0ba4d774f1297bd5c923027016d0f6fddbb4d37c3d4a
 EBUILD google-auth-1.32.1.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
+EBUILD google-auth-1.33.0.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.33.0.ebuild b/dev-python/google-auth/google-auth-1.33.0.ebuild
new file mode 100644
index 000000000000..2bb9e016a997
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.33.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 8442925793a9..616e82cd8b3d 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,3 +1,5 @@
 DIST graphviz-0.16.zip 193031 BLAKE2B abedbe170eaf9d3ad83f91b5ad13aa9fbda8669ac19ebbd1087aeab3f9401b0b8e6557313e04d791451ee501c75bc2843d89d1a0f789a219b0db771467b4b8bb SHA512 7896901decf712657d4cb16fad58eab8492e1476e60a32b1a7fa37ede2e9c47ed31c00b7dedcaafdee291e2cfe6b2e2affa352282665782829fd3fb2f30bdf92
+DIST graphviz-0.17.zip 193647 BLAKE2B f2f5ad728157d60c48964d2cfdc76559310af6099a9eae16279b0f9e8a41c08d02d5f255be62222c1f0808750a26e67822b5fbb930f7ada5c6a614c3607494cd SHA512 02f5ef21f9e3bf3b609f43fe0d9cb51632ea43c878055746af62fda4dd55883f6ad58f69faecb6aba552100cc835901309c8c2ec833cd74c617619fce2d49600
 EBUILD graphviz-0.16.ebuild 743 BLAKE2B 76db9057ea6113733060b80840fde1f1cf16be3037bb2d800fdc889c8d62a6d684404c3a4e8aa8a0ceaa31e7bb55b8745249f7bf7ab585372a3df372f1065b7e SHA512 e309c4982445f2f11e3df428b47d563eb2d69beaeb5e93f71cf1f4daf4e1c376d57da923fc59ffa3caf3458df0a7a9b69fbcca02555db1b1b8a9cc4ef92211de
+EBUILD graphviz-0.17.ebuild 733 BLAKE2B 5362a98046f54f2079662066ec5290743912843b1dd1477b2664927c3c007960cbba95a579c52088f0888af064b104a92c79759e97afc2b6cd3869dfc35e15a9 SHA512 4da644d793af568e9cafa2248478e780ddb7e36c5010ef36b0d764adbfaab223673104aabb882803e180b83bfd25137137a91e5347bc0a554bcc24b3003e795b
 MISC metadata.xml 552 BLAKE2B e5a314fb4006a3081b0f54b84bb35243dc1e56e6cf19b8500dc683a02e48b687c8a086785fc1aadefb6301aa7112467820c1697b141010b96ee9504213d21a61 SHA512 d8513afc41a59f83476e98b296e6150d159096939645afc964d48a95dd36e6add4b2cda9a2ef2a5034050616c5c08d6c6222f71a0a0e0f83250f2be570c1c990
diff --git a/dev-python/graphviz/graphviz-0.17.ebuild b/dev-python/graphviz/graphviz-0.17.ebuild
new file mode 100644
index 000000000000..befd64b4a916
--- /dev/null
+++ b/dev-python/graphviz/graphviz-0.17.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Simple Python interface for Graphviz"
+HOMEPAGE="https://graphviz.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="media-gfx/graphviz"
+BDEPEND="
+	app-arch/unzip
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
+		media-gfx/graphviz[gts,pdf]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--cov --cov-report=term --cov-report=html::' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index a3f5817d5613..f4e139a97bc1 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,5 +1,3 @@
-DIST greenlet-1.0.0.tar.gz 84525 BLAKE2B b5b7094a3dd7b6426fb93fb147077e98e7313700be7a94c221cda3df3bb12f5322f0cea786b77b7b6500e5e97f71ba19b2c32535ccdbdf8a14c3db049cc2850a SHA512 7b615792c340e0eb8ca61bd09bde48ed15110d97254910bd8598312e15adb7267ba795e9e6b52f0998db27d8413d2e1aa9e977511c0d09cd3a5583b37475f882
 DIST greenlet-1.1.0.tar.gz 85043 BLAKE2B d9f5eccfe2dda528e5bc90bdc9c3992517b42c7d5f9d5549590b8f94003f715921585fa01219eea0348d6204b0109c4e342657fdf8150f09cabd2d6179e6e9f2 SHA512 13547917860d9a19f2fab519380121805d8f7801ad47b1584003833a5de66eb703373c71e67b32f13b770d429bcee6856b35bc6fc8afb7be598c2bf509bede03
-EBUILD greenlet-1.0.0.ebuild 621 BLAKE2B 13d40414ef75ebc22b0f644186b1b08e3541d7cda84e85d0a668af52707687ce2731bb83d425900b5200c2a4c9a85957b583dd5598c9c19c797bf9e3a850b608 SHA512 cfaeac8a8c70e369beb0094980f1d39ee83c3ff5e149bb312e4ba1b77ec1b5082addcb9f668dd51ba821e397f8544318ee1c692c3e6e7f224f847f3f033ca9ca
-EBUILD greenlet-1.1.0.ebuild 636 BLAKE2B 8312cc58b75017eb2468b0e184f969b0d2a43ad08273686a861fcf0f474f8203d0eb830865bba123c47a6d3bd54eace59aa4b7da959e87035bfb08bf89c0b48d SHA512 94da97e054882e802e6a7a26defbd349f5883a6764ee9246f55d6378acd178d4562bc8cb8308d8ab127a7f4e9475c6b2b8cf56c42ed0fef9c011bd599f601ef6
+EBUILD greenlet-1.1.0.ebuild 629 BLAKE2B fcaf199b1d8b9657639b45b0fed5f04cbca8a1a2f24aee2be3a49ada6d6583ff748693284724b1be2d1d16bc0a7bf3403cc555a81bc809ceb5f0a811266f21fb SHA512 8a4bc923718a42262bc49e2d230ef159df4d78f72de9d6f85188d14f9c6d5fc0c54ddc02d2e7cc90b1a342045956c090dfbab03e47c20315109c7b089f21a56c
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-1.0.0.ebuild b/dev-python/greenlet/greenlet-1.0.0.ebuild
deleted file mode 100644
index 378c8d4d0743..000000000000
--- a/dev-python/greenlet/greenlet-1.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="https://pypi.org/project/greenlet/"
-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 ~x64-macos"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest greenlet.tests
-}
diff --git a/dev-python/greenlet/greenlet-1.1.0.ebuild b/dev-python/greenlet/greenlet-1.1.0.ebuild
index 937b52748b27..1ea6eba1fd3b 100644
--- a/dev-python/greenlet/greenlet-1.1.0.ebuild
+++ b/dev-python/greenlet/greenlet-1.1.0.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 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index c941705adf4f..a438368121f3 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,3 +1,3 @@
 DIST h11-0.12.0.tar.gz 98121 BLAKE2B 8e510461e0256a49166ad3b11394d715634d036642629b216f0c94785245909fc3d9ab89ba3048b857f1ae030cae7ed0b3195745739d80c74028a85848a762db SHA512 ba2a2c185af270185ba5e1fd80ec9308e35afcd60a125a77cbeae2669f462983d063339371312f154a7c80c154ac97796ab36782b36549235435dcfd81b93421
-EBUILD h11-0.12.0.ebuild 483 BLAKE2B 43691ca359b3dab403a72ad35fb47afeb007e8567bb5d7bbc16a39c7d01471964f83396f1c585f4a1a57f0ab113a3e3d617e896399319cb675a29b82fb5a872b SHA512 868bc03095a37f5f3945a72e4855ec30e0eca2b37bd2d7d22a4397994576e3860806eb6321b6ab1f2bd648d4386985ce657fb0ca9dc387fd3fba52310996996e
+EBUILD h11-0.12.0.ebuild 481 BLAKE2B 2f378c3365977c1c9be04d45e087b7b5d92fba0665cc55906970d1a8eb62cc617b22c12bef885c400198849d3a9a9b43b7f5367732858e845f77a699b43a225d SHA512 b26ed5c592d8cceb5bf3969eaa2a4418f1760f6ce4824c290e82f280b400911fa35212d4292c1caadff5269d491e28b2bc5e806f4ec42c5314d8c6cd8db7b501
 MISC metadata.xml 362 BLAKE2B c2f92baeb3b7796d39c6001c0df00a04378e3a9c3037e1f547fd8991e6b71fecbd158c88263b26399edd7cbd4645af3dd7207295c1a6d554839e8c983da9c489 SHA512 29c2a05396fab9a3699538cde0f7842823e68ab6d5b19bb6c7cf7c47b7fc3617044562965ff7f706f1a9043d1c7169cb8f69b1828606fa2d42a9d0582faa0633
diff --git a/dev-python/h11/h11-0.12.0.ebuild b/dev-python/h11/h11-0.12.0.ebuild
index 4678c2f2d881..4ba4f935f5d5 100644
--- a/dev-python/h11/h11-0.12.0.ebuild
+++ b/dev-python/h11/h11-0.12.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 774a615d5cd0..28889dee327f 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,3 +1,5 @@
 DIST hcloud-python-1.12.0.tar.gz 88905 BLAKE2B 1e24cfa208f02a1068b0016ac8948358a3709eb4a2c1f73d75d8e3ee85bee7265b0da6f5cfc58afefee664a024becc57dfa3389f36c4e7ae0c0ae623944e51a3 SHA512 fc431041d2bbae749d5335dda0c8ccf6abcb3fdd8e3a467b50a2ff45e70f9b7a8378bc2b72c00be7c65cc8cf84e01fde7965c6bb731b7252d7da377648bc01eb
+DIST hcloud-python-1.13.0.tar.gz 89714 BLAKE2B 0d39d25c867e2433cec235b1ce101b3df8c5946cb4ccc7ffe658cb8a721eea5502f8fb2816491ac687a411a696c60ba4b1c602668385480d7a3645eb2a652c62 SHA512 4283b7b9be6add5ee6321645efc95b4bb77110417bff34327a533c416ee916c19511c35ef614fddbff184ee515fcf31bce740cdb6ad5c18ea7dd8e66c9760fc5
 EBUILD hcloud-python-1.12.0.ebuild 992 BLAKE2B b9dbea60ab939354671d428ceb8851d8195f9268a6f380fb542f9710b6ffebbaa5b345f9bdead549f828ff1207534837d789dd5bd2823f7940293c82f9d9c756 SHA512 2246a7df95faf8d89378cace8adb1e37bb739c6e7d319435238569d941c42639120c2300a9d87147bc2b25849c6e3fb758f88d4d91bd8cb68ab537cea3afdb31
+EBUILD hcloud-python-1.13.0.ebuild 992 BLAKE2B 55e2c8d323ec86318a0d77f2e9b3db2b778a728621af9cf5573ceae4dfa0aff47eb4c3dcb013071844959bf1b0c9fadc86e754e11b45a50354cea70de12dc68d SHA512 b22924bba14020d69609fcc82ccea8258257c424f4b936e72a6a1d1486c4a34cd7404b79329ab192f2db25afb008adfcd4f3bc85d9bda0dbce2f1aee892c8050
 MISC metadata.xml 482 BLAKE2B b58d0b4580285588a5d2078699bcc2bc2fbfdb3c207266ad7f798cee761added5f819341dbddfa27066e7037128065004694e21f043a2590dc54e3e4c6e2c688 SHA512 c3370f871cfcb333f24f293bf1435ef007d4d1d6d38573744e8efeda8910d1bf08685081fb9ef0a869ec134456231a36ca43e398e279d47ada7e4ffb5c645534
diff --git a/dev-python/hcloud-python/hcloud-python-1.13.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.13.0.ebuild
new file mode 100644
index 000000000000..ca78be85c160
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.13.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Official Hetzner Cloud python library"
+HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
+SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	# Integration tests need docker:
+	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
+	epytest --ignore tests/integration
+}
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 7f42d1e4e3d3..9789f4f463c5 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -8,6 +8,6 @@ EBUILD httpcore-0.12.3.ebuild 2176 BLAKE2B 919e436b249c0f06db0be31c034f416fe5b45
 EBUILD httpcore-0.13.0.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.1.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.2.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
-EBUILD httpcore-0.13.3.ebuild 2206 BLAKE2B 5c9882609ad0a8a7c65d74790d59c14d09a272370a812a9d3f88186faac634281a0fd5dd592b5e2fe9d9b2266115681ee1c3b5b175ae3d1f41734e680d667f87 SHA512 c1090a1df81438e2623817f615bf406570009a99ada2e8e2c6ca0e159a7b3e2d86395eb7f21f86f6c86372ee3308012e42f89f944cee49715d67a489029c4f9f
+EBUILD httpcore-0.13.3.ebuild 2204 BLAKE2B d03b92df7e8b0127162e2c6125f0e88184a82e151254241e6c3b1c080551d159d5bf34dc0ed81669a1d6ad7d92b060100f732178fd8f66068d794c900aaa667c SHA512 cc7c7f37bd4abc92d431c7b0169832736e4e38493ea0e4722e5a4021aa5204c23ee1774c66a4a16509deb1ae0f41f0a041ad279c9c1e311f9b01a5c3b2daa934
 EBUILD httpcore-0.13.6.ebuild 2302 BLAKE2B 500632e564d8dea5633644e0fdb4686d298053694347367aec4f4c8ca44d7a311036f43183ec5252ae8a39ff54883deeef5b6fdbd22211a9bd803d1a71f2b19f SHA512 189e5ffafe30e95f82ffcf02dbb6033895c6d0b91caa7f9b619dfff1e28db1a68f9b3bc5dcc56dea7a0e41691c889bc8ecf783d918d68c85fd1b74ab3fdbfce0
 MISC metadata.xml 453 BLAKE2B 9ecaf4c2d0b1da4ef7272fb7fd65dd2ea9bcf0ac036420317c838ed2cdf16119270d1a7ce1673057f6bb2c81b0e0776ac6291eab9830b30ba2954ba0d373ea61 SHA512 c885cf0a5bd4c74962160739702d07c34c834b252d050fbfca9f6fdbf469defba4a27c615c312bead882a4e126eb244982e3fdec6428626c51c6935ca8c004e3
diff --git a/dev-python/httpcore/httpcore-0.13.3.ebuild b/dev-python/httpcore/httpcore-0.13.3.ebuild
index 516a68d73f59..e43157c8ec6f 100644
--- a/dev-python/httpcore/httpcore-0.13.3.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
 
 RDEPEND="
 	<dev-python/h11-0.13[${PYTHON_USEDEP}]
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 0354a6081b26..6afc5f8ccebc 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -7,5 +7,5 @@ EBUILD httpretty-1.0.5.ebuild 1335 BLAKE2B f8c14b37da5c0e0045a7e921b0e7b6865e691
 EBUILD httpretty-1.1.0.ebuild 1198 BLAKE2B 8f6feb8bb19893c4c74b9653ec90414d5131197cd36b5bc4d1dccffa5a49dd6155e2045bbed9d60995853560708c1a767b013246627a666f24edada682b25bc1 SHA512 891e9a72f471f5529f2a5d3c10c04ab55cd38d7eb97c8b17633fb6c6e521d7ff81b0353ddc70e649e1dae7cc9471f9e37d8f1cdee2cdcb967344ea0be44e0402
 EBUILD httpretty-1.1.1.ebuild 1291 BLAKE2B 8e312ccbf0070c4af60df4a98aea0db7f5acdbd4fcda701369bdd644342f8bd88fe793224f748e1904b464d76ab488d499735ce7b5c27e4d60e5dc50676f6932 SHA512 4e8691c96e9da6da9881a232b860f56bf24048f4c030de3c0427e4b2ba058dfb6d695851462f2e52d9efb0c0343797a537c5ec9af2bcb5d4b614315dd73cd2f1
 EBUILD httpretty-1.1.2.ebuild 1292 BLAKE2B bd6d87a0272c166674446c84e2fc144039335196611a18a4e507111bf0ed71d6dfb9493d66f9ec4f2221383e7bd8705d1cedbe8d04d3659004d38558b6a57b2c SHA512 a27041caf6cfe7367b93ff5c574ef567a170c8d272e3064f9e23baa5ab74d2d7af00453ae27a02e88d7729d89cdff5e728a1afaf2fd472f39e832a1ee7e7ae31
-EBUILD httpretty-1.1.3.ebuild 1292 BLAKE2B bd6d87a0272c166674446c84e2fc144039335196611a18a4e507111bf0ed71d6dfb9493d66f9ec4f2221383e7bd8705d1cedbe8d04d3659004d38558b6a57b2c SHA512 a27041caf6cfe7367b93ff5c574ef567a170c8d272e3064f9e23baa5ab74d2d7af00453ae27a02e88d7729d89cdff5e728a1afaf2fd472f39e832a1ee7e7ae31
+EBUILD httpretty-1.1.3.ebuild 1290 BLAKE2B 9a5f8d0cd03ec6bc20e799012d4f15fd815bd4223a70f1434198366c5dbedf0ee358c3728e51cb4e694c718275f1189c7b45be5733ad6f8feda9ca3a1520a10b SHA512 0eab5a37e9c9ef42a360f957c84644df06dc4e0d493d0755c1f3810458f06841df3fda91d5e97ae1f17e309abafa2883bb02ab3da37b500d996baef12531f5ab
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-1.1.3.ebuild b/dev-python/httpretty/httpretty-1.1.3.ebuild
index bf841f155b15..cb404053d78a 100644
--- a/dev-python/httpretty/httpretty-1.1.3.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index bd8d16c58fb6..f5ee35ec7fc4 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,5 @@
 DIST httpx-0.18.1.tar.gz 1663996 BLAKE2B dcbfcb4a452b47b643d5114a535005f7f92170392202dedc6c152546430231d20fd8b94b7ecc1d2abacbc9d76acb14cbfdc268109b171cc40812504e696dcaab SHA512 954b020d117dd1064262f3ac2d3137d01bba344b1a061e5713c3889283334d9ca92d9ed3d23f6ce79d684e31bae2d83fca6993178ef55e5a91353b812ad489e3
 DIST httpx-0.18.2.tar.gz 1666756 BLAKE2B 3d1e25d503ae5306150c157bc83afdac9a475110d042e041b58de448a0dcfd75de3f4c15836b838dc799cd5f8b7e0d646e43bbe107ffad87d51ff016afe585cd SHA512 727974e5d5924fdd653987dd4f528d27bb2653085b01ef5efcdac39dc92ef2ed586f872c202349aa31105ad970cff914de4315c2d79338a6aa18bebb8126f392
-EBUILD httpx-0.18.1.ebuild 1313 BLAKE2B 68def2f215f9042245cbc6dc0f087da87450db00f24ec1b6882634ba7e682de347ceb13962de9689814024c83eecc62525fd01d00b55b9d075653f80ec4add09 SHA512 718acc217a2853e1cd17bf7c903b39d53d942139c88720e3f89bb7f3552c85ce75e614bfa4452abdae87607736889b04a85e0c925b6948ca916d6c670d72a426
+EBUILD httpx-0.18.1.ebuild 1311 BLAKE2B aabdabc7a3d4c38f89a5db92265aa76b1329dbe2c731159f08f55378a5ef78d0b49f29d742dc5895b20938d338ce3e0a9b63354cadf43a01475eac99c11ddc6c SHA512 2623ce502c30cb40e4e8f629248781f368a8944da809110ee259cd6cdb8108ad74fcd1940ab9b1d29fcbdabe52f3bbe6f6094a1e5e8f6809921281ebb3b288f5
 EBUILD httpx-0.18.2.ebuild 1547 BLAKE2B 7f267cb8f047aa1cf6c6ba635151d482730628c57fb080bb18c277b0b2e963c728074d537b2025e992b2351d3c0ee14169f0dda386bff5c710f9560075aeada4 SHA512 df6af32a04c4d9716f55261311101c62f6f5787aa28cc138933a16c7626e1dbb922a32957623a92a11d9c158e16027e3c86c31e4849b15518312255dab7df660
 MISC metadata.xml 444 BLAKE2B 62369fdf937f8caf46980620f2da0b16512ef94cbea9fecf0c336029a709e0975332d0d4e53ff4f3eeddeb9d231a5003dff9bbdf999846152bf578772b47d9a9 SHA512 bbbc7e622f0aae3b63e19765626ee13adf027d5ed98ca97fe04592b1f0a8da0cd0302b31f9cda90eaacf2bf5dad9c6472ddd795db75f0992ba4f084e4135ea3d
diff --git a/dev-python/httpx/httpx-0.18.1.ebuild b/dev-python/httpx/httpx-0.18.1.ebuild
index 7f70c6b70ccf..2a51074bafbf 100644
--- a/dev-python/httpx/httpx-0.18.1.ebuild
+++ b/dev-python/httpx/httpx-0.18.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index a339fd6a8a54..ef624c780a5b 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,13 +1,5 @@
 DIST humanize-3.10.0.tar.gz 65658 BLAKE2B c60aff8f5e2044c10e997f3546b30e8ac7c040ee57aea5342ccce7ea6341a8695c1b94bdc8cb2acc18c3f421667fd4090b7b110b47aa229cd10d5ac8b42d6dae SHA512 f31929ddc1055fb54294b67e25e3b41883ef4e8ff9b76082cdd4703d64a066d0a368d116a60e26465f07dd3a0df8c87bb459ff1b03153d8843d3eefb06ff6961
-DIST humanize-3.5.0.tar.gz 56651 BLAKE2B 05095fbdf7c55258bf3d01c73f47bf913e1fda3e6d8a2fcf666f4d70cfd6e437071140716b9f5b6a31c02c06da1d2df6f80d5d021c279d4f97f756f41f3c3bb3 SHA512 ca04d79533b08f1549cd530fec35352696b314d6d667476bf5506a482a4ff379fe6ae021a1f338aa6837877a90e57ce032cdc671b68be34dd52e0e41aad10170
-DIST humanize-3.7.0.tar.gz 44002 BLAKE2B ec253c07a38c83d67038836998a7159afe7d1f3e1f0f5ea0f946f987e18bf4943d7dd48e2e156009627e1bda2140017bf99df072671008a6e1daad704b693292 SHA512 e501cdb4dcb603601624f5df9a04a256669f06ac594d8a3a0c83543d1d8503bfcf4d7198ff87827e2c60dd63897c23b722be7497179c49a9f9b05d07289de4be
-DIST humanize-3.7.1.tar.gz 61846 BLAKE2B 6ed6e35dc15ef08a88cd15211212cbd4194363889ff0dbe4e53d76adb248da948d688e4eddf5a93548497b1e1e02145431e1c157fd26288fc27f2b9b7b2c80b7 SHA512 152ee6030de83be34bdb40908427ca4f1461191ce417faef273b070a1d347a43f4a44182cd0fa79b8935c07d97679205285bbd6fa43352d2d9cada53df5f112f
-DIST humanize-3.8.0.tar.gz 64298 BLAKE2B ba367054f66351b7b48bed69ab4ba63251dbdd6bb56c21cbd8d7846401d4a2428f6e069a0219b5a24bfde173d6ed2ef3116f01551137b4c0c1eddd8c9d6fc87b SHA512 8301f461c60fd990e50a24aef714d78a3b42fb82d792ac01b088e05b6bf765dfa34e2257c1a75e3da279db3b8d837bd6434398f33578c946fa17dc1a45122f75
 DIST humanize-3.9.0.tar.gz 64229 BLAKE2B 09aeec6a92c8e2e104032d4c61f054785ff58ce2dda68c4f3acffb17c7fa4e262b28a24b7c06d33671ea18d2eb05c9bcc0a82d5491e60afa161ebc0041945bf2 SHA512 75aa8f9f6b07d4b65e5589c3f337a92ee17769ab8da6608147b0f1ec3965b95788dd90cf0d0cae1b7c9be689b44910029ee72e2eba39a60c9926b67726c74353
 EBUILD humanize-3.10.0.ebuild 549 BLAKE2B bb3562a3052c164aa92488a4b5a4fd76600f0e88c882b45daca1f61007c5083881802fc0467c3a019573671293a570120ab8ccf139501e8d4597c68805ffdde4 SHA512 3d77dfc18318baf0072a39d4cd3eb60797b7157edfb132bb1bd40f77dc36f4c766d46123de3adbd6a28f41e5efbc40420fa28c094372169962a4249e83c9b93e
-EBUILD humanize-3.5.0.ebuild 547 BLAKE2B 1e7c1ac2157ef61f0885d14b939b0a92efaa7c2d2259b5dff8709b7be500081042791ea3de8b3354a4c71e671db0825029afa5b407e92b539fff2647f6bb3a12 SHA512 c6f99389b2225d05450700755005b546bea0987bc1ac470f2700e45fc3030712d7af5c03b00f239ebaa2729255d47fe171176d7e3001ef2b10470141a5d6e35d
-EBUILD humanize-3.7.0.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
-EBUILD humanize-3.7.1.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
-EBUILD humanize-3.8.0.ebuild 549 BLAKE2B b4ae479e1872c0c64c2e51eede1da98beca13b8457333336d2f1f75c6e849f6ecab8c807cc12c51bfdb7cf7c53a053f2d1d7281dde593a876deebdf3b37e4094 SHA512 12715667a633738b2727ecd0cad70d4532b40c75f62fc5fd6236b8f0a7b5dfdec3023c355cd08dfabe6ca50379106a3b512fa12815e98f2e2a7ef78302f1aaf3
-EBUILD humanize-3.9.0.ebuild 549 BLAKE2B b4ae479e1872c0c64c2e51eede1da98beca13b8457333336d2f1f75c6e849f6ecab8c807cc12c51bfdb7cf7c53a053f2d1d7281dde593a876deebdf3b37e4094 SHA512 12715667a633738b2727ecd0cad70d4532b40c75f62fc5fd6236b8f0a7b5dfdec3023c355cd08dfabe6ca50379106a3b512fa12815e98f2e2a7ef78302f1aaf3
+EBUILD humanize-3.9.0.ebuild 547 BLAKE2B 33dab2c67d880f84972528a538579c0c53d6850575b435dd621d3397e888161d7245af1c1f7627ae09164d75aff2f2a3f36c57aa36dfc13554145361f687d759 SHA512 fd88009835781655dabf1441a30b9124061fe4d55c556b4d228ff58a59e4d9a73e0e59d5cb411e08f7df79a4a00e3dee3d4e885426baeb92da873dca4c10d52c
 MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-3.5.0.ebuild b/dev-python/humanize/humanize-3.5.0.ebuild
deleted file mode 100644
index 7520e23c9527..000000000000
--- a/dev-python/humanize/humanize-3.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/humanize/humanize-3.7.0.ebuild b/dev-python/humanize/humanize-3.7.0.ebuild
deleted file mode 100644
index c806307de9e9..000000000000
--- a/dev-python/humanize/humanize-3.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/humanize/humanize-3.7.1.ebuild b/dev-python/humanize/humanize-3.7.1.ebuild
deleted file mode 100644
index c806307de9e9..000000000000
--- a/dev-python/humanize/humanize-3.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/humanize/humanize-3.8.0.ebuild b/dev-python/humanize/humanize-3.8.0.ebuild
deleted file mode 100644
index b6c00705226e..000000000000
--- a/dev-python/humanize/humanize-3.8.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/humanize/humanize-3.9.0.ebuild b/dev-python/humanize/humanize-3.9.0.ebuild
index b6c00705226e..2c5ae12b3424 100644
--- a/dev-python/humanize/humanize-3.9.0.ebuild
+++ b/dev-python/humanize/humanize-3.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
index 3be1b75b7934..407743bed8b5 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -4,10 +4,12 @@ DIST hvac-0.10.13.tar.gz 301612 BLAKE2B 1b3524f72b54bf6fdfde6c02ecae8f16e32363be
 DIST hvac-0.10.14.tar.gz 301617 BLAKE2B b3d721b245b9f7b0e8aa5404599da8f3fde3fe10a5b3d70cf1831faeaecc6e1c42f0228c2511eb8d24ef56fbb2a971487b0707a1640e3a48bf01d3e4811992e8 SHA512 3b3b5c64df5c57679a35e09cd61d29090c950dfaa11f64b4c3f8442a3ccf6512cc2d792f60e035815e4c4857813ba49612e0f52c5da3670bd692116a6bd28469
 DIST hvac-0.10.8.tar.gz 290963 BLAKE2B 539e604d2c0476c3f8bd9bf9e803f2d7c6ea8671cd86ef650a7a3e615fa3461135e956726a869fa8b9c1883b70c11eaa51f28e6d07f284dbb43b51a696dd9958 SHA512 010a851c39bdc4d420343fa42aef5cd7faa073c11bf1507fc563791b8c93e85367b2081d573123acccd467881bccb9f9f33487551cac763d91ee7e5341ea5568
 DIST hvac-0.10.9.tar.gz 291045 BLAKE2B 63c48b21e402a1af3f73e5b295061a2f82040cedd412fab69e8759e290a46eb67d1aa0ddaeb40c1638eefbc492441e238cbe4be114093015af6eabd99a0c0a75 SHA512 4af23583110ca4c2c9714f5234daf21ee199c2ac97cde01a220db6f5d89957b95c1e8b84904104e5a96ec39b54cea567973427a73ed7cae5806e794d37403a8d
+DIST hvac-0.11.0.tar.gz 306753 BLAKE2B 0300705044f6575ffeb9fa3dc28d6ee1139b6ce84f52b89920606b603355530823a1f2ec8ac251423c5a0305f3ea1ae15933e84dddb2e09c5d7880b5c0508ec8 SHA512 47226ba5113a4df48f115d02d2fb1fa7ab8b42895d38f7fad37c84814db71a57f4e455a9b46134bb577fbded1881e6272464b9f1d1d74142dc089bde03b0eba9
 EBUILD hvac-0.10.11.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
 EBUILD hvac-0.10.12.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
 EBUILD hvac-0.10.13.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
 EBUILD hvac-0.10.14.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
 EBUILD hvac-0.10.8.ebuild 1337 BLAKE2B 54e332ea5a21dab765c2da086cd35ae0ecb03f65db484e35cd84b0eb686f823f7d0ede10903e65b5ce824067c12a55ff22b62b6c8f9df7d5ad7238dc87c3da45 SHA512 cd9d8f51940498aa1749bee33833fcb1edae278abf764a87da4bdd01ce25ab944af827381b6ef232eb416ee878699711e1488875fca0b8ab29804bd1a29d7125
 EBUILD hvac-0.10.9.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
+EBUILD hvac-0.11.0.ebuild 1302 BLAKE2B 1e5f47e6b752cd39671ebe6212291872159e6a115069d5426088de090f3cf25a4a04884ea89a703b0e89b76d88f02dac50f034b805476e2d1915e065da0d6e0d SHA512 d8807072db9681d9778f56f3c3c0e49304fb14991d5fb14536b48aac01449aefa80a8ee2a79b2d4bb7ecd37b16916a62490ccecaaed06ee842a39922f61e6c49
 MISC metadata.xml 599 BLAKE2B 84158e64a8354d461d7a02cf871e3e2fe6b47d5983246d7bf01ce53467b68a2e45708b85728862853e4659fe7b0b514c2c2f268f67c660cd1948df9771233704 SHA512 6382293682cf7990487a76b88dcee4e43a1e679b751f8ae79fffb1ad0640db500ed16f9d75edcad919999f72858b7a6c6e86f0a1711c22c6394b5a8a8a2a2f95
diff --git a/dev-python/hvac/hvac-0.11.0.ebuild b/dev-python/hvac/hvac-0.11.0.ebuild
new file mode 100644
index 000000000000..18c424443e15
--- /dev/null
+++ b/dev-python/hvac/hvac-0.11.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="hashicorp vault client in python"
+HOMEPAGE="https://github.com/hvac/hvac"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hvac/hvac.git"
+else
+	SRC_URI="https://github.com/hvac/hvac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="
+	test? (
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/jwcrypto[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/python-jwt[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/pyhcl-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local ignore=(
+		# ldap_test is not packaged.
+		tests/integration_tests/api/auth_methods/test_ldap.py
+		# https://github.com/lepture/authlib is not packaged.
+		tests/integration_tests/api/auth_methods/test_oidc.py
+	)
+
+	epytest ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index f8ddfa06b287..a56e394f19f9 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,10 +1,5 @@
-AUX hypothesis-6.10.1-py310.patch 2493 BLAKE2B ffc3e9669407a20a2820a59980719d0a176348798a6aa9368f5249cae65cb7c8053f79fdf53d833709793b049bc2c3e4130ab3c9f166d48e5909da1ff07b86ac SHA512 c5762698d1a463ca942d024619453e5e89aeaf5b884eee099489ea91de71d82cf6797e661767cc77a6c84338dd4b989eb255b988ecc6938aa77418667ffaf048
-DIST hypothesis-python-6.10.1.tar.gz 9126246 BLAKE2B cc8cb3436d1de5d3d65a13cb5edefdbaae8bf9daed296eea9111ac46c002c34f43119f10b2ab1f45c5cbca5fe46d00738676290eb0e8437f2c10b5926d9e0915 SHA512 586b7f380cb850089f7d5321f11da92ef4a9b80e2ea925103e29c1f6c6c9da0a2a899a1a45ce77e0a40073f147561bc4fcbd5cb2ce77a9c0c65f6f64dfe4b716
-DIST hypothesis-python-6.13.14.tar.gz 9134690 BLAKE2B 821fa0baa47dd896fc5ec61d0a96fec3da225dbc35306e6cf684641262c9ff0b714ca95aff69daca4bda551033a67d90b411f0cc2abff8edd41e5d749939344f SHA512 74397fd77e6e70df918e0fa605180e2bfd509fb26ef8b4a86020524611a315950073c3babd65bb2d2ff65d39e027bc52da88c0125f422cc2493076398e733853
 DIST hypothesis-python-6.14.0.tar.gz 9135056 BLAKE2B 47d1efcee5e1c4037f1a20f08e3bc873fc143a2182bbde07e897812622c4d68923f78ac356bd97ef541566a27a874705eb2438747daaebe84f95fc2a2262bac1 SHA512 f7821449d3bf7f3656b52dad09027e40ea4af1779fcc7c0b995dac55843953fdab3f2ba69eb1b8de8258616f49cf8e5098c6a222d01071916c6f0c9fe184c80b
-DIST hypothesis-python-6.14.1.tar.gz 9135154 BLAKE2B 0fa62cf4b512acf433a94edd14b2bc4c2c86cdbcc95e4a2760a1914e85f1149d9a5db6b22222c4954d2db109d3bff877ca0e5e8ec6842ff5b3c794a211ea9b57 SHA512 b84776e2bfff130c4db7582defbe9bc55183d624b45defffebdc954ca8e1dda1dec78f921e1bc7839a1167c37bce693711cd500da547dc6f2a8fa610c0bd3540
-EBUILD hypothesis-6.10.1-r1.ebuild 1767 BLAKE2B 34c63c1f11e6400a4df180316a6b9ee2dc2b8d1eff3678e266379c0d19934f9ae4bcedcb2c10fc777ea1e872f5cf52b9c638d559c376d4ead2661a0b1587a657 SHA512 e639122ffdfcda78d53c50b5a59795f5b7e9c22f6ba203b7894dc4087a8ac0f510e54c4001a29c9870cbc12cf468ba3bf9e28193224381ea75a230125b3f3f66
-EBUILD hypothesis-6.13.14-r1.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
-EBUILD hypothesis-6.14.0-r1.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
-EBUILD hypothesis-6.14.1.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
+DIST hypothesis-python-6.14.2.tar.gz 9135496 BLAKE2B f77f0668c4d0c2f5a952e06a40ae7898631804d3406c9711eb30a4e5a11e73ba2772be3cb437aacea2a75cd65f688a2485b98885c19cf743020900b0cf70f08c SHA512 e495e1c471fd4b185e23326700e85bf90635fcc8bf316c758c3285803ff0f7ad0269351b3a7631033495bb6498a8f19cb8661c55248ec5e14ff2a09e0c3af3c1
+EBUILD hypothesis-6.14.0-r1.ebuild 1753 BLAKE2B 91d322af6a74614d3675c680d21ec4c89297f2717c016f32d4fb5d98243bd4786de42639bae152fb14a8502cbfaac41134e4d4010639b7152559e32157e92b4e SHA512 a864d799d54784324267fbe6c7006288b227f7c8de1162b3d2b5a5cc37ae0e745b4a8f67efc6dae43b56f9755dca232afcf355829fe7f1c7ff5de9176f43fe46
+EBUILD hypothesis-6.14.2.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/files/hypothesis-6.10.1-py310.patch b/dev-python/hypothesis/files/hypothesis-6.10.1-py310.patch
deleted file mode 100644
index f81186a46e6e..000000000000
--- a/dev-python/hypothesis/files/hypothesis-6.10.1-py310.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 27ee073728e70e930118a36ffa4f8123ce363099 Mon Sep 17 00:00:00 2001
-From: Zac-HD <zac.hatfield.dodds@gmail.com>
-Date: Wed, 5 May 2021 13:01:21 +1000
-Subject: [PATCH] Test on 3.10-dev again
-
-now that pytest has been fixed
----
- tests/cover/test_annotations.py | 4 +---
- tests/cover/test_lookup.py      | 7 +------
- tests/cover/test_lookup_py38.py | 2 --
- 4 files changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/tests/cover/test_annotations.py b/tests/cover/test_annotations.py
-index 564339d39..95ebea3c5 100644
---- a/tests/cover/test_annotations.py
-+++ b/tests/cover/test_annotations.py
-@@ -13,7 +13,6 @@
- #
- # END HEADER
- 
--import sys
- from inspect import getfullargspec
- 
- import attr
-@@ -116,8 +115,7 @@ def test_composite_edits_annotations():
- @pytest.mark.parametrize("nargs", [1, 2, 3])
- def test_given_edits_annotations(nargs):
-     spec_given = getfullargspec(given(*(nargs * [st.none()]))(pointless_composite))
--    expected = None if sys.version_info[:2] < (3, 10) else type(None)
--    assert spec_given.annotations.pop("return") == expected
-+    assert spec_given.annotations.pop("return") is None
-     assert len(spec_given.annotations) == 3 - nargs
- 
- 
-diff --git a/tests/cover/test_lookup.py b/tests/cover/test_lookup.py
-index b74eccc62..33cb78050 100644
---- a/tests/cover/test_lookup.py
-+++ b/tests/cover/test_lookup.py
-@@ -756,12 +756,7 @@ def test_compat_get_type_hints_aware_of_None_default():
-     find_any(strategy, lambda x: x.a is not None)
- 
-     assert typing.get_type_hints(constructor)["a"] == typing.Optional[str]
--    annotation = inspect.signature(constructor).parameters["a"].annotation
--    assert annotation == str or (
--        # See https://bugs.python.org/issue43006
--        annotation == typing.Optional[str]
--        and sys.version_info[:2] >= (3, 10)
--    )
-+    assert inspect.signature(constructor).parameters["a"].annotation == str
- 
- 
- _ValueType = typing.TypeVar("_ValueType")
-diff --git a/tests/cover/test_lookup_py38.py b/tests/cover/test_lookup_py38.py
-index 6a68254a7..db11777fe 100644
---- a/tests/cover/test_lookup_py38.py
-+++ b/tests/cover/test_lookup_py38.py
-@@ -14,7 +14,6 @@
- # END HEADER
- 
- import dataclasses
--import sys
- import typing
- 
- import pytest
-@@ -103,7 +102,6 @@ class NestedDict(typing.TypedDict):
-     inner: A
- 
- 
--@pytest.mark.skipif(sys.version_info[:2] >= (3, 10), reason="see issue #2897")
- @given(from_type(NestedDict))
- def test_typeddict_with_nested_value(value):
-     assert type(value) == dict
--- 
-2.31.1
-
diff --git a/dev-python/hypothesis/hypothesis-6.10.1-r1.ebuild b/dev-python/hypothesis/hypothesis-6.10.1-r1.ebuild
deleted file mode 100644
index b7536f7f4daa..000000000000
--- a/dev-python/hypothesis/hypothesis-6.10.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.14.0-r1.ebuild b/dev-python/hypothesis/hypothesis-6.14.0-r1.ebuild
index 536affb7ae13..9a316963749d 100644
--- a/dev-python/hypothesis/hypothesis-6.14.0-r1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.14.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.14.1.ebuild b/dev-python/hypothesis/hypothesis-6.14.1.ebuild
deleted file mode 100644
index 536affb7ae13..000000000000
--- a/dev-python/hypothesis/hypothesis-6.14.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!dev-python/pytest-describe
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.13.14-r1.ebuild b/dev-python/hypothesis/hypothesis-6.14.2.ebuild
index 536affb7ae13..536affb7ae13 100644
--- a/dev-python/hypothesis/hypothesis-6.13.14-r1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.14.2.ebuild
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 278a870dcdc1..ea322f6b2f37 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,5 @@
 DIST identify-2.2.10.tar.gz 101073 BLAKE2B 7049424855d23727180a4af137ebd7cbf88d6ca0187901bbe43abfcb820c1db17af8ff89345612909fc869f9ee8503d84e3d1218548535abb6f499eade284def SHA512 a6f9dfc3d969a30f50922cb9ad285d76c39774706b8c0d868bcbf96564a49841e54b6021e4fced56f17cebd25fadc69dd93714d475e4f517a05677bdabada4dc
 DIST identify-2.2.11.tar.gz 101117 BLAKE2B e316bd18a91b3d073b2bb24743ffcf5e6551ce5a9ddf62b1a30aaf937311b2d07de08d9abe01040de48c607d51e4cab121d778385f8336bc911409bedcd5fce3 SHA512 083dd600bc65f61c1aa41f87943b59a4f2edcbbc7a7d07d7a1375d181761edc4b853df87d4a2b2c0f3122f4f27ed10eb784d2dd75078418b50a471b1d5a0ad0f
 EBUILD identify-2.2.10.ebuild 505 BLAKE2B adbd3b5737c1bf6d8e809cc0d947f54d51af4d16526eedd4cd8409b773b0f37b9512a428e9febcd699c1491bae98f7c8e344f2b579f8302a26624e84c6016a03 SHA512 e1bee2e6abd986dfeaaf9003cc0febdff77754d6733ff27127e0bf9f497a00b1257683ef51454b66a37ce8c15c9dd839f1047061e25f5dd5fcd3fb5d07f627f5
-EBUILD identify-2.2.11.ebuild 506 BLAKE2B 604d1103e5fb710f2aeb448495f723d69f1309a797f6562274df56d63a19eac4a9c82782d96b2777332251d53fe2566afe0a2398c7a3b0fb076ba118ecb4de9e SHA512 ced4aca94d0e1857284abd9f172c05ff3f0627bec0fdf60f20ab1d5b1aa7b9863de429fd43cb6903d405d4bf560b1d796b63068655a2bff4de20084e276fb4ec
+EBUILD identify-2.2.11.ebuild 511 BLAKE2B 570fd7439d90d9f1426b18149d39a0b92afb147648dfe968b0971bcef3053d653617cb30e2073263900b3554ccf41802081a9e713e1f88ad33399431659a5d05 SHA512 d0e4d9cfc708807c79ba2a10547671732d87484ca44df21866c0b59fb846fee5e3cf1b4025c5c4c5213beeb4c7bd862d26c5d226d9e0f99c0d278d38f1267682
 MISC metadata.xml 476 BLAKE2B 396158e97712197ecfbad701cd368433e75aba1d79f81ed47726271c7b3a68675116aa994b8fd5ae2a5ea66cf9e047b23c1f81dd10b1f2812aba19e8a0aa3af4 SHA512 e2fa23ad8c27872eada3063f832eaa1962fee31301bbd36abc19f2e03bc8e984cbc0d9680afeeeecf928c8e2ccf9944c4d56767ec04491ccce31e406d9c0180e
diff --git a/dev-python/identify/identify-2.2.11.ebuild b/dev-python/identify/identify-2.2.11.ebuild
index dd2ddc4e73fb..939b1826a0b3 100644
--- a/dev-python/identify/identify-2.2.11.ebuild
+++ b/dev-python/identify/identify-2.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~riscv"
+KEYWORDS="~amd64 ~hppa ~ppc ~riscv"
 
 RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 881b5ecfbe38..7cc075487403 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,3 +1,3 @@
 DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d36e4eaf0825f88b920e6795cd042e2fc837ea6d72000bbc9cbc2fd1de911e08b4f6d189e692748b49e848dfb3fb SHA512 cd0ee20f6d6218eaf13499e40971b6750009ff01a1aefcb7dd45c77ae841296b9d9184013e6e7fe5bdef93587f85cdb8ff459af29424a0077538666260572b8e
-EBUILD immutables-0.15.ebuild 475 BLAKE2B 240cc713a3ea59ba174ddaf2d20ddc1497d440e601d37d4132ec65a7e01cbf87bb6a8d867384ed9fbde2f50ad275fa545867057c79763b850866f4eabf053cc3 SHA512 d8d103840d270c69574c3b8960f0a89fb492b9cea895843f747f239d3fb3667cf12e358f5d55fb1e6650d86ec0bb310d8dcaf6990e51d5a773cceb3377072dff
+EBUILD immutables-0.15.ebuild 487 BLAKE2B 6eb8f45620525e4dd42aea5ae122f9c60e4a1ed5c7585967a7866a71d79fde296565b6e6aa7654f7ca6cc1121cc9ad0ae21a96899c80fa7d3ca2b0c9bef29902 SHA512 1b5e71a31832081a6d6537c8e3084ad29e3492cb2b9042000d6ca488a93a4357bd62c1bf7d4b3023786508604d3750c09cfe54148c0663869e5f607297748a22
 MISC metadata.xml 352 BLAKE2B 65ae089f4fcda6735dce5a7772e25b57c69f38e728073213b7c3d1c96382f22cb570fea4890ba1c9086a327b7e24cf1e58514fa6363a1ca595ea9c66cc4a8289 SHA512 96bd2296b24b710cf4a4eecabf3918cc49fb70e859989074d1c07f16b48dca7e2439a4f5f00e5e2283598216fa574621cdb69c78d7a3e7ee9bca144b3955d4d6
diff --git a/dev-python/immutables/immutables-0.15.ebuild b/dev-python/immutables/immutables-0.15.ebuild
index 5f661a4e7c35..2b0a05431a20 100644
--- a/dev-python/immutables/immutables-0.15.ebuild
+++ b/dev-python/immutables/immutables-0.15.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 50139a3df8e3..3bd7b74e3445 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,9 +1,5 @@
-DIST importlib_metadata-4.3.1.tar.gz 38637 BLAKE2B f9c9330fd9b63bbea3fc30ed6d3cc384f9b241f0089ca7b0b5fe1934214e9f644c3884ecfc866b9b9e6af6c0fd7d04fc5e8af83e252d2e1b0e274fcf408a7323 SHA512 2202be5f7b7f1c1fdad4c6b290da60fa5c9576c665c11f9c62012791b50ee0b6da029bbe424c9501ac1f663f4df883fbd3c6cb9179cb80491b2b350cfa2eec30
 DIST importlib_metadata-4.5.0.tar.gz 39595 BLAKE2B 22ef03a47637f523b583cb8c442f7351e0b94633772978fea47dab9be583f35daa32691997b4110b832709658568b6eb79a006f109b969c6f25a638dcfcd4702 SHA512 62b9cefa502d751d36b5f43606ea86c46574fea159941b68319e5dd9aa53d6d990e630c36d72830c54eb2bba2f2be53201be2482974f833cc1da8869eb2a8dc2
-DIST importlib_metadata-4.6.0.tar.gz 39664 BLAKE2B 62278f46b0fb3428384ab52696de724c0b13409d2b80a07885beab34019fee9d8bd49c096a0b71b10801941ba9d3e66445acbdfcd589e6a44cec5ab7855dabdf SHA512 abc98e3dafc51f1c02c6a2bee8134c17d205d3ecaab301c0abf9a5e1bc0454fa8ad316caf78d764db88688271511f954c6eefbfd91750b5c026757436c63fbdf
 DIST importlib_metadata-4.6.1.tar.gz 39801 BLAKE2B 89a792eee17f31a86c27820a0b3972cd8f6a06314763930ccdf0cfce31435f8074e6f8f27050d1618713ee6d517f0cd8dfba6a86b1e8917af2769ae22ac40cf5 SHA512 2a0bcef3d49de00a1013eac48f1ce020cb89ab895f5e4a1673b46a1ad8f84515148eff33608847331de8ee05d7e10040e128b2c887065d3ca16d0bd338c761c0
-EBUILD importlib_metadata-4.3.1.ebuild 1279 BLAKE2B 9ccebd49fbb6f0af8c93beb89040b67f844b1311d089bfcda67790f900424df84830fd7a09d9066cdd8c84abfd5269082217fc7ada354fa757893c3a563d99c6 SHA512 594b68ffee5b91fcbf1577288f0b35e70e7567a93d3a99ba7f6be60b102ea3ce66d0c1c059597b2699d2b66748cc8f5de7e63cc54bac8dbb25f21ed6a545dddc
-EBUILD importlib_metadata-4.5.0.ebuild 1270 BLAKE2B ede4cc8856fe330f979294de30f3970c13a63b80d056354b5f06e458fecdb68828581737f4eb63e0dd60bf37b371b73a9411ab040e261514f21f1d46b3cbe2f8 SHA512 af85ffddd5fedb39e2e23d1cbebd8588e60d7ed350fc38ef7ac9feb0f3784ac4eec6e1a03b1fd18de4fe46845bca5b9b2a9b066f83aa50b89c4117bdd8be7f97
-EBUILD importlib_metadata-4.6.0.ebuild 1270 BLAKE2B ede4cc8856fe330f979294de30f3970c13a63b80d056354b5f06e458fecdb68828581737f4eb63e0dd60bf37b371b73a9411ab040e261514f21f1d46b3cbe2f8 SHA512 af85ffddd5fedb39e2e23d1cbebd8588e60d7ed350fc38ef7ac9feb0f3784ac4eec6e1a03b1fd18de4fe46845bca5b9b2a9b066f83aa50b89c4117bdd8be7f97
+EBUILD importlib_metadata-4.5.0.ebuild 1262 BLAKE2B 764a8124c532810fb8f76ea3fbc1a2ce68a94f352f4ec27595f99d42a9fdee037eebff73492f047bb68b44c5640877fccd715a19b5ec0e33d543216f144639ad SHA512 bae53e2a534148b86edcfc8feb5da606f298a4b8060a0ce26de93feedf9a9224b8c52f66421171d998504143821cc7fa6fb8e96bfc05ccc1415b50d09c03dd10
 EBUILD importlib_metadata-4.6.1.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
deleted file mode 100644
index d9c8a5523fcf..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild
index e583ebb91129..6f7bf5590182 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild
deleted file mode 100644
index e583ebb91129..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_8)
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index c7f7e597e691..1cb7367fc3e9 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -1,5 +1,5 @@
 AUX ioflo-1.7.8-network-test.patch 1090 BLAKE2B 37e6125a3d26b902e3938efe49162c6e9e1beece8960fe035255e79673bd8920f3ca5dee90595accd8dc8883f63727985060e3f8c3d357333065ef1b738b62fa SHA512 76ebc002679a656b21e0e8adbfa46552172392c691db1a39320320a9b0e1261a1bb0fa9058bac0063027b3b56bffa9bfcb1d8dc0b37d232971209123d2ff8aca
 AUX ioflo-2.0.2-python39.patch 3813 BLAKE2B a21f5829b5a2fd4200350949d66d4fd77f5ba2b21d5fdb95c7754745fc2cf41f18640d4c79f5e1037fc0d4ca016c7dac062567aa8662b0e41e702e4dd0a94931 SHA512 b588703d653848401fb8e13be949f6de4ff41143eae669ccdcae8edaaac1883be0a684112dacfdf11fa3f2842dbde0dce2b47a7680cb87761d30ffa4018569e8
 DIST ioflo-2.0.2.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b
-EBUILD ioflo-2.0.2.ebuild 876 BLAKE2B 037c9c8a54818b3325dc5d391187796f680dc11ab51605c48660f638a75863702de10f44187a6adae4a53631d023cbc0ad75f0823f21741a9747b9412d909d5a SHA512 c789368246b06892d92b69288b5881b94f80fd1ead3dc83e9dbe425a81064f066542cb5c12c6e8bdcd5325296d3673a908b49f72c9c01e0f894874a87a37a17f
+EBUILD ioflo-2.0.2.ebuild 883 BLAKE2B 6e5a60293a28646691a128428622f66e5b3720d59d5393627e0c61cce95b154c136f8614db8eecc77f025381fc9647f1917fcedb06966a3b17e98df72fa1ac72 SHA512 4ffb6a13d7417ac6ab6dedf900c288aaf2933e7ac047b78ce6566222de2ef023d76353e64cb11d62ee0b070746408a6e27b24ef14b993aabc6f5ef969875e268
 MISC metadata.xml 493 BLAKE2B f303d71fb596699fd8867406fe983144371e9da8143c3ee4dc4761f466503e2f6c38dbb81195d9f7c3c2a3eb40354d52401f66c231afc24eeba112966ee7a686 SHA512 2e787e4dd8f0d9f212da69c25f4a58e609d120dff641405708f08d206b07249acdbac2d6e151379c54f5c960e340f8f31c986f231fab74986d1db71539a87436
diff --git a/dev-python/ioflo/ioflo-2.0.2.ebuild b/dev-python/ioflo/ioflo-2.0.2.ebuild
index 368df270f7b5..a438d7011107 100644
--- a/dev-python/ioflo/ioflo-2.0.2.ebuild
+++ b/dev-python/ioflo/ioflo-2.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 0929696f8504..0e0a6f02fd52 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,11 +1,7 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-7.22.0.tar.gz 5143229 BLAKE2B be78fc7089d620cb9ad437ed8154b37ac8c7cd68ca18a2569cfcf7ea9af968c58eeee18c8d18a1f26459ccef73e59083ac27055c19e4df254836e484ce0a9908 SHA512 2647dcd5e0d9b6afc8d990d2c099ad7ed581b5eff6d657630929e0d0d9f8965e7c7924c51a10a797e7d7406212d7a06c941c163e6f6046aa62130049a9bbc0d0
-DIST ipython-7.23.1.tar.gz 5188898 BLAKE2B 9713b0f1f75e283e53ba19044c9919f0c4d0b1c120e63d7a79ab9c6b8783499ed115e86a24cab34fc13c46245fb43865b851e6f98a2ee729ee35c3db242fa2ba SHA512 9b35626a8a07c6bd0b93552341e5a61d3d90a60c72ad6e3fc71266d9509134366c46a7ae8aeca9c3acc7509dfeab47b5144f105cb3d1d05ef1c7acca6c2f365d
 DIST ipython-7.24.1.tar.gz 5146561 BLAKE2B ae63d024f488f44dbd61eb9f3e14ac5b8ad801b1db195632c184c6106d4c2e6d6143c1524ae6fc5a2f6f631683b73f241c9115c439c0f97a4fe540cc232fb181 SHA512 0ea8843a1f2e7f9357ff9896f2b6da058adb5fcbbad5c3b1fc4138a085eb57034c62c0b50d82dea0e563523649ec112edd4ef0c267a914f6a7d33b44be30b977
 DIST ipython-7.25.0.tar.gz 5147224 BLAKE2B 0a2ae7cd315ba1abde18cdfcb7ed5227e5fc43b9a053f82e7db0146cbec66b0c2a1585158e60c37559523b457ab339ad42ab8fb3fccfc9e5ea7b880593de2e73 SHA512 726d3577bfb05d0c01c55d7111f8ee03fa879427de0750ee25b0a6451365728b5fb8ccf79c42585268f768680b13f628956d292f27b9e622e5dee0b4d368d22b
-EBUILD ipython-7.22.0-r1.ebuild 3761 BLAKE2B 0fde64e41f1827ffaccc69fcb62db96e81c4c755bf7085d8890499eca01c776ed1ef500c20f277c1597c63c231587d2ddaf3ca68265629bf897d08f75a482cfe SHA512 bb27d30f8fa1fae515f1f92cca52846fe78bda310e35c84053cead7438898ec8b3d30475f36db3808d74e4ac02caf80f7bcabce4c570376a9f8661e6fecdb378
-EBUILD ipython-7.23.1.ebuild 3838 BLAKE2B a48aec0e4fe0de58169bccb994bcf0c19d8973d69496e2c19a4c9f8463ba76aa79312548d59bc7a11bb5a7ec6961c5cbdd97e05094cd7aae4e53928e5637aec8 SHA512 de1faf13bded5832d60748b48e98344a9e8fefc47bc2ff0e0090fc2579ee2d760ba65546691449c1d86d95de1a27681ecd23ac7de42e34f21449060310f79ddc
 EBUILD ipython-7.24.1-r1.ebuild 3837 BLAKE2B 0df904cebd3696dc2468b455f22ed1b374f7d5df1c77c3554ccde6356fc8cd1c71e00991ed2c95f6a88ccc20bd3a1a6267178afc8026a942c0335fe294872782 SHA512 b7446d3f4443044d60a4cd86a61f7f9bb18df87779124c10bfbc83865ee46fee9531b792adbe0cacd800924291f89455320aa8ff49e71ed29a6be790fffbf5cd
-EBUILD ipython-7.24.1.ebuild 3842 BLAKE2B 93e66fbd1e931294001afdad43c3a46f1aa0518fe17b2ba8dd04e928333ac7010f1cf505a67d8a79756f235833a1987027c19892b5b0a212575e8c1012ccce0d SHA512 86423c9f303347a54ba84a1eeeef3d67a4e622b56f4c42c314576056fdee9bf28bd5b19d40340c975d5f72ce34249fc0ef6a3714667ef73dd5b536336825d305
+EBUILD ipython-7.24.1.ebuild 3838 BLAKE2B 26db4ab35ee3aef7ef4c604c2ef6de13ebc998a6b6cf37fa4793cd7984fda1e406521aa8f11cf6eda87eaf2e840672fe48e6ed08f6490cf57cb474fd3c1bd056 SHA512 d6eb9f9cb7a5b2c537c65cfec76822d24762a42bcbff0a5ebdff6e91a5908986f3732f9e8dfdf03f2cb9ad151fe3fbc615cc63e7943afa2edc1ae08f309489ea
 EBUILD ipython-7.25.0.ebuild 4171 BLAKE2B 69e9ac23537c108dd0c07b3513c8b9324fed108c61a20ec0f908f906a73871ac285990c8baaff46e563c4cc6324f58214cf4b955dced990a8d6754c97c6397a1 SHA512 3e34d75deaf322826cd4a4681e8ee30d4fb566ff71150118df6ae3ebc489633da6dd705b005f7db6a7ba81b6acad0a8da4bf62d982a4b2a81994cb2f3f1c1ee7
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.22.0-r1.ebuild b/dev-python/ipython/ipython-7.22.0-r1.ebuild
deleted file mode 100644
index 657a62aa4b73..000000000000
--- a/dev-python/ipython/ipython-7.22.0-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-7.23.1.ebuild b/dev-python/ipython/ipython-7.23.1.ebuild
deleted file mode 100644
index f0c9377c3818..000000000000
--- a/dev-python/ipython/ipython-7.23.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-7.24.1.ebuild b/dev-python/ipython/ipython-7.24.1.ebuild
index c085c76819cb..1bd68d6c4693 100644
--- a/dev-python/ipython/ipython-7.24.1.ebuild
+++ b/dev-python/ipython/ipython-7.24.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index c42f407abdb2..ad63538b3369 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,3 +1,5 @@
 DIST iso8601-0.1.14.tar.gz 12722 BLAKE2B bbf56603d976d9f015ce04ed61c246b1b57e4edce1a912ac7ac5c932d122ca3855e917a7993b3e2d7ee6ba9ebbc9be6c554e69880abc30488698d8c354bf8ad4 SHA512 a461eb6cd011fed1ebec583b80ecf85b542c80dbdb4ad0213131febe0b58567bc0852283443c87923662b85e125ab66642b876b16ddfc3698445dd80e67e0720
+DIST iso8601-0.1.16.tar.gz 19599 BLAKE2B ea09dc8f2d339de895e420e1efd6207b7138ba34b37186d86df099fc404a2880b146e20b904cddb69e4dbe777c56b41ad6e04191da8d2062d87b37af4e61c124 SHA512 b049de4c5fb21bca2e3183e82c86149ac7cab684ad8c7281cb8ffc2c0e53a86b00f68f260cff659c19f8814a35970462d2dbd06b21bbc42ed1507b583df7e25e
 EBUILD iso8601-0.1.14.ebuild 544 BLAKE2B b9b9f5f9a651864a618841501eabaa0e5f5c3a1d971b72b4fc6940c5382b7b80c97eea88deca23e2b682fb5b856ddaa4f1937d460d2c5646475811ab0c7088c2 SHA512 8f91107b30a8ea4bd58efb1f8d9108a0923b7f0642eef90339be9e93b831e44f930135749c415490ad22e5522070e8d015e33d81709650018bdd1c0483fdca92
+EBUILD iso8601-0.1.16.ebuild 551 BLAKE2B 0169a6880af0657e0ee28a84424503da6a6baef62a1e66b72da8a4c88b156f3f64a1acd11cf6b65fe2735e6f21999cf802f00a59bec5096390d5dbc02c0ebf8d SHA512 f3110bf5907f3dc850a91cfc2ac8b36c113772d59b0ececad0e4b147446200f8f7850d42216d6b9fa29584aa80cea5af975020756cb2d29775937e241d18e3ee
 MISC metadata.xml 394 BLAKE2B 11ec2e471953befe48f94577e708d873fc6aeca3ea72af7ae5d069badb8bc87511685de5acdc289e4d77cf1cfe99ec9ac16a9fcb7edba73adb48c8df7b2ab634 SHA512 dc0926ce7410798e86865bc067798027ec1b4be5fa9962db67248cc806cc3e5486f288df86c045bbc938f66a941472e49f2c17db2da9b61ed3ae5a4fe2f202ea
diff --git a/dev-python/iso8601/iso8601-0.1.16.ebuild b/dev-python/iso8601/iso8601-0.1.16.ebuild
new file mode 100644
index 000000000000..cc7b6b92433d
--- /dev/null
+++ b/dev-python/iso8601/iso8601-0.1.16.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simple module to parse ISO 8601 dates"
+HOMEPAGE="https://pypi.org/project/iso8601/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 5e3c2f5436c6..5ac91ac9e822 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.text-3.5.0.tar.gz 15453 BLAKE2B 53a3553f09a6c33734684477fe1228b159269a6a7e38aa8381af54f17162d1658be1f91157fd092544141bd086fdded32bec2fa0103c4c6978301cae3e199a04 SHA512 da566f1a6d8343d05c51ca3f4635212094ddbc84fe9b460dd7630030a9b5bb28c97ccb0de5928da50230a182985c7e5bce8903d4019ce5afb89067ad938dd152
+DIST jaraco.text-3.5.1.tar.gz 11579 BLAKE2B 22753a39b839b575796952e12adf69a10a876d45240c5461f72afddb14d58bbc8396565fb094b3c314ab6d9fbadd7008a7dd66e788f54f17189a48c54b980f1a SHA512 468a2338b82c4352dba0ab40fb774329f115010fdf3633adb860297dffc64c54fb006f85e4d89580923c1e9136168bcf9fd689e33eebee32cd70382bb402debf
 EBUILD jaraco-text-3.5.0.ebuild 774 BLAKE2B 6e34a9d25f5a7772314604ee0c6e96e05911569ebf859a2dcf5c4c8d7ef477b8735457d3fc9c9fb7263ae67dfa03a0210402a94c73185ff2c0b760409ebaf9cb SHA512 d41ad8f81b160375f96758145af86fa1e5ff70b0f7a8af500962bb2526c2db037ba1138d575608d4e189e389dd2ad1bf4d3f2c676e95b4d4ebe9e05d1fe39b7e
+EBUILD jaraco-text-3.5.1.ebuild 778 BLAKE2B 9b6a89284e7842dc082b60e64b706beff0cd75776330647659c305dbd5453a9dac0a156de843129a4cb1e69accff453b76d316902529e83938958b462771a084 SHA512 b7a99ac4a55c5899907a11f29989d4ef6b020c8fdd1671a6e66e1a7b27de4f23306694841dfcfe29a04fb49e76580ab5a54056d64b1199a19e889b9b8e4802e4
 MISC metadata.xml 655 BLAKE2B 6bd01547bc069cfdd2a6d8ef05d0f62b17e54b54ac3d45ce3c66d765a5db88c52750d3f80053efe8eca8c36163deb36268e5a1683e65813d42fe1f033306d4c5 SHA512 94ad62364c1159d64d69d8781ed42f642d3877c2e6776f0d863d6b89fd085199d03a65f251b9fd1c21628d3210160ef120250ad7956d1589b8e06207831d2937
diff --git a/dev-python/jaraco-text/jaraco-text-3.5.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.5.1.ebuild
new file mode 100644
index 000000000000..0c032b9a238f
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-3.5.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.text"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index be7d106abff9..4fd6bc448415 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,5 +1,5 @@
 DIST jeepney-0.6.0.tar.gz 49513 BLAKE2B e5f9b5104cf07dbcd2d40c2d22b690dfd56c456ab56daf44f4abee83f0bfe7e1dfbad797348044d51e3dc20fbc6ce68bf8df54f9c1e46d7a86ceb22d3ab30f8d SHA512 140be9dd28ed853d2d41b6a8bbeb2f22c0270ce7bf33b943ec2ac010db17d4f06e253fa8637fbbb3044fe9ffdbfa1e15f0c663eb44bdd538f8c47c2e7dab3ca5
 DIST jeepney-0.7.0.tar.gz 61236 BLAKE2B ec477ed0d96d7d82a256c7f62900eff0282ebec4545e30807fd62cffb419ed763fd8042bdd4d72c6cf43ac09d24af9cd86797b1baec61ad5965e51b3d669175d SHA512 b1fac480da0d8798b28eae30cb22ee97d4f73a11922f7b1bce86eebf938c2980414c2d026ef5a1cdcd95813724873700d348b04ba337aaac0706b2c8b38ea6c2
 EBUILD jeepney-0.6.0.ebuild 1038 BLAKE2B 2c7df2b5380f85a8f19645135db863eac3038e58a031065d2a5f491fd5327651a774e37e7e434f1846bbe49abeeec90229c6874081b6c39a5116b08860f4b1b3 SHA512 f6143bbffb239ff02ee46ef558ae5296b98abb3e0a8387abf49a8776d7acf131ec348ba98ae63bfc83b9bb0cc454e0637eeb8e5bd435533edb9277fbf87de9f7
-EBUILD jeepney-0.7.0.ebuild 1205 BLAKE2B 4a9f93c53c0a5fe4eca0326046ae645c10306bcda750a76b11389f7d4b1c5001586f526db5d5c1a4078242a380c68f6867de68229f3a3e79abc88f26caa7c7af SHA512 c4d2a7747a95b4cb098940c881fbf5e89658bbf00e5abc1e2aa424bd8b2255f8c06f1de9a201be9099d370d7e2a1b15f3acb0fd70764198288ba24745f7cb1a5
+EBUILD jeepney-0.7.0.ebuild 1222 BLAKE2B 27408acabff65e66ba59ed00fe3ad21848272223cdd88fbc091af00bbe6857927a4c248b84555a33e40d54cf8fa95a8378da4f08a73d2311b63c511987c3d6c3 SHA512 4b3f4ef7784bbdd0ae264f5678f37ca325744aae3f3565590ca8425549485ba386bedeb6c83e0255ab132692f524c55d35d8d5db25a7146b09a3f0f8b471758e
 MISC metadata.xml 456 BLAKE2B e597aacc0128f9cd06d21a03ca156343861a56adba6449e12127025265c6019308ba2e8f360d7a4f43bbca3f95a78789d964bdd3e5bd5fea7d21d7b8eb413c74 SHA512 6cb3b5fae02190cce838221a1d5269bc005f985d5935f77880b066999340818338a747a9e24aa5d39ab71f69c842747068e3b573dcf475c7d552af1bc9af031b
diff --git a/dev-python/jeepney/jeepney-0.7.0.ebuild b/dev-python/jeepney/jeepney-0.7.0.ebuild
index 3a00e0fbbd6f..b09285f5ea52 100644
--- a/dev-python/jeepney/jeepney-0.7.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.7.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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index 8b617c79f1a3..d7303d9590bb 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,7 +1,3 @@
-DIST jwcrypto-0.8.0.tar.gz 81782 BLAKE2B a3cfb04f099a747c365f870c53d75574cdfaf8b98373f37cc107ebca956b414b7d7cb78f8fcd6d3964528d3bc8a217e5c645bf6e82531e951dfdd9ca03472111 SHA512 784134d27ff7abd31e1069763969513ed45f81fd2c242b7ff7036413c35ef374d535eae0123f5561a8e4eb2630cee40056d1c66454288e1310c4cbedecaac210
-DIST jwcrypto-0.9.0.tar.gz 83891 BLAKE2B 873f6764d13ea80e8c4e1709fcf4e2a70cb59834521154b35cb94a51ce5cbfa7f4e2d079a3c096b013eef6f3a6adc4935cd3416b22f20b9edce01e95dc1910fb SHA512 6a2670aad8a3db926c4a6e54a62f3b698b717a8bc1726ba8f13e2415f574202e205cab76c79564280dcb2b3b4002a7c03c172d20761c70f76dc007a1ae26dad5
 DIST jwcrypto-0.9.1.tar.gz 86363 BLAKE2B d5920b9471870855bc131c171dc5515cc23fb9b94c38b33ce4894bcbe6fb5d0fa87e8b88f6470b8d1c1a1bc158d0dd09f51ace50baab03c8a8df59adc6e7e11d SHA512 245221d5e570918c1db9abdad72a0b03fb3fbdbb4db46ece441cbd75d43246b1b35bfd75e20718b8fa125bcaa85088cd776a7c204dd68e51e63818ae438848eb
-EBUILD jwcrypto-0.8.0.ebuild 737 BLAKE2B 2b2cc0dd327b7e3c3bf04fb948bedc4aa129d233d6df7ff548a40e2adcc298b6972b5773db31a11a5703eb512082a31230e35af0ae05f55b19c2a99db0078eb3 SHA512 b577f5e61a310740465de05e5a2dd62949a7d70993905c3a9441e213025de1561498971a4433dbc0d9479f505d12b0f69a533d17fb13b532d4719c3ebe85a1e7
-EBUILD jwcrypto-0.9.0.ebuild 821 BLAKE2B 69eb2cf6614eb8b0c2c689999f4bbb3e690add1730aa78e973d07e4209926bad015b0c49c85d73371372db4b58a61eb95949a3de815e066226d0012aca114ef1 SHA512 df3c770bb7f11b709e2dc970379b9f1bceb71468f4bfdd19ea780f730c86ae3750f4ce05b975fe764cd537aefbca4ef787e6105516f5d9384f7fba64e01f7dac
-EBUILD jwcrypto-0.9.1.ebuild 821 BLAKE2B 7b857fc0570fb85038d4aedea4b2abaf08b506fa222eb96df27c46cd727e175cbadf3345ca44d8a8a9981566d4d10361c178a3feeaa8a5f97cbd203466b40f88 SHA512 d91586f4428301b3bd14d5af47e9d88ebf9baff6ca9eb5ce2e98476107d8c3229217560db7fcb8e4849c188e4d30f294ef131f29b93b789c91823186325af50c
+EBUILD jwcrypto-0.9.1.ebuild 819 BLAKE2B e13a6aad1792fd51ffddb6eb4238c2502fdfe8fce1b722cfcfabd4012c3cc122d3757f4bb8e54477142fa2e021908bfdb2a18e44e2403f305a7ec7e1fa22ce84 SHA512 cd8726a1e8950ebc74358c95cc46a4d0b6324e9a38a1758b8afd2da59396c34bb39efea8b0d867e2cde8e58b6fd55665df7feea613df06748f98395927657d42
 MISC metadata.xml 368 BLAKE2B d5656c56c5a851d766c1e6588409d4864688de0c3acd4f28fb00ce22a106e5cf7f3ca8d54a4e448250cfafd04f4a0acced22db2a99879da67eb80c03f141ca74 SHA512 fe3492bfd6ba81846e7ba185468617d19f06eb813d55e87ac8ac9d5c7997d069e2b0f90dbd11ec5508b1da1ddd1d6a291fbd524f0c9dcdbdc8447ca639b78735
diff --git a/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild b/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild
deleted file mode 100644
index 428fcc14e898..000000000000
--- a/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-
-HOMEPAGE="https://github.com/latchset/jwcrypto"
-SRC_URI="https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND=">=dev-python/cryptography-2.3[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "\|data_files = \[('share/doc/jwcrypto|d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-0.9.0.ebuild b/dev-python/jwcrypto/jwcrypto-0.9.0.ebuild
deleted file mode 100644
index a3d021af572a..000000000000
--- a/dev-python/jwcrypto/jwcrypto-0.9.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-
-HOMEPAGE="https://github.com/latchset/jwcrypto"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "\|data_files = \[('share/doc/jwcrypto|d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-0.9.1.ebuild b/dev-python/jwcrypto/jwcrypto-0.9.1.ebuild
index 99fd185f157c..8e667e7ee75a 100644
--- a/dev-python/jwcrypto/jwcrypto-0.9.1.ebuild
+++ b/dev-python/jwcrypto/jwcrypto-0.9.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/lesscpy/Manifest b/dev-python/lesscpy/Manifest
index 3e80559efa66..01ea8ee6a1e5 100644
--- a/dev-python/lesscpy/Manifest
+++ b/dev-python/lesscpy/Manifest
@@ -1,3 +1,5 @@
 DIST lesscpy-0.14.0.tar.gz 186505 BLAKE2B 6c7f4691c352573d081436d5f31ddacbd6b054810f07feafaf654a5c401d98c3274f86f03f68534f661b79bff3d708eb09bfdc0e3b9e800b7e2091060e64c370 SHA512 333015e3d4169fafedf0c295d12d5f0eadb8bea2576d147f1461e5854638b0501ea3038a945924efd81629b66dcc7ffcd3fabd12933529cb5fd4b962e87fe2c3
+DIST lesscpy-0.15.0.tar.gz 176879 BLAKE2B 942775e090d3fbc8af033163186d43650bf20967689459bedd87dba14063c199fa322a17310fde422e3d45370cc7fee3482ff2a388518c49b2b16fb40f241a69 SHA512 3e225dcd435b9fbf9b21ad7cae86612eee923946b0bafd502221a95df4df739bae8df62f33fe77a90ee8a1c12de05ba556b2d76a95b85c9d68d27ce6ae46a747
 EBUILD lesscpy-0.14.0.ebuild 487 BLAKE2B dff6bb39f3afafbe11a70f8dd03b14abdb0e5b6664dfd8f236d3688a88608400aca102083aef456ec4ef39a73b175ded66af81d499a6546f9933d527b6604653 SHA512 d150b3cf373c9cd399be71e1e5616552bacef307e7bffb20f113cabaf32143e1b0bd7ab4c4cf26b0c6fa017d92e6e159d9e39fae24eaabc56a15504d3d8aa280
+EBUILD lesscpy-0.15.0.ebuild 491 BLAKE2B 6bfaac93aa9ea6bfda50ca7439d141098a80993781338bca8ffbb4a0d730338f3d8d722f93337c6ecfb202d1ee3967a11c77f605c71f5bdfad851fe616ed89b3 SHA512 e7259409d3e3a807c6dc572f066dabb356cebcff7e83c3663324ae834c72f5989d3fe4c81b4c4b11341687347b405ccffa72892896998262d88749c8d0882700
 MISC metadata.xml 441 BLAKE2B c9c2bc6984c96c07afe8d866a5206ea1d64846137321c5d84c281796b3ffb240aef443ce2a380e44fb49d64ee05ac850aba23b83a2e4d5529c75747dbb55c248 SHA512 88fab7282fa26425cd6ad9bef796f763f80ea950ad855c20b1fcf327dd5b0cf3d99177a56231808fbb5f0358cf41abcccfbecc25e8f47e079ea977826fb2e95f
diff --git a/dev-python/lesscpy/lesscpy-0.15.0.ebuild b/dev-python/lesscpy/lesscpy-0.15.0.ebuild
new file mode 100644
index 000000000000..355dc111b941
--- /dev/null
+++ b/dev-python/lesscpy/lesscpy-0.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A compiler written in Python for the LESS language"
+HOMEPAGE="https://pypi.org/project/lesscpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 666e3ae5e369..3725c7c40c11 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,3 @@
 DIST libarchive-c-2.9.tar.gz 46408 BLAKE2B e24d9ce56919b6c6217da7629ac3c87023f44d2f1470f6632b3e3b478d29e76edb8fed5e4f8d7a75ab5efd160588dba82d23960d0224ce571ea01af9fd7efaec SHA512 b154cfe39247050c156d57f657b9668f3b1add879b7fb5b32cbc127becee63d1898fb1c4bd60e7fe72e814f544ddefa6680d582fec28b0feed90940fae8cc238
-EBUILD libarchive-c-2.9.ebuild 463 BLAKE2B 27b5db365d378f7d75a97bfe3c3b70c4b4d9ffe944f7fe5dffb7477ccf90d0c9cc18e9e7cc24f760372d74c01aae227c57a0c26a128f6390f7189deba92d7c9c SHA512 6321ddb395fd4c05c8076f5aa6ccaf133883afaff3bff98b0818175e693170eb5cde798cf2ad8c9d7fdb8e990d362dfdb4399b6b4ff001dc202d69bc3b935097
+EBUILD libarchive-c-2.9.ebuild 541 BLAKE2B 7d61c267e689f3185bbd040faa25aa330cce37ba071ec1656af63107c1e7212246ab7f25e8cd9d1331028153e07eb278be18d7cbfb6178d3634274586dd438be SHA512 11edbab9d4c5b0ffd79b13d2e5f770e7c3c33c670a9bbe122df057154c01a60842dc955bb20f6a724b3717d95273782adb5fbc9f133e6e67c1fde214b8168444
 MISC metadata.xml 561 BLAKE2B b7ed2b26ca60804ca1e6ed5c0d10d8ff4d673c1912cf9f6a7bfa2c02bfe004a9ca2a19d6f165add2d43cfb8e77007480ca168c22036013284d6e3f44f999a118 SHA512 3945224587cefaceaa0959d6b296c680d1a022f23ea07f6c62944aeba9a6fced9ac25738c3067b32f38e759ccfb3bf197d12a73761f9a13da3f57782c1c0d0e0
diff --git a/dev-python/libarchive-c/libarchive-c-2.9.ebuild b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
index 836c869f14ab..be0363504712 100644
--- a/dev-python/libarchive-c/libarchive-c-2.9.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A Python interface to libarchive"
@@ -13,6 +13,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="CC0-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
 RDEPEND="app-arch/libarchive"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index c99008829fce..64b43c4833a3 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,3 +1,3 @@
 DIST apache-libcloud-3.3.0.tar.bz2 1811722 BLAKE2B bfdacdda6bb39b3782915d71db6d736caa8a1d57c5120dac9020a1c4923ab08bf8983916fcac15723139b073858efdf178aa797dd592d7534a0b6ff35f8fc5ae SHA512 286ddd79b14633ceb59e1a4b015760a1e525b0282f3039f16c2fa4de940005da5fbde1b8262027103ca91c9653baed22d61dd136ddcc2b6886687ad8b27f3ea8
-EBUILD libcloud-3.3.0.ebuild 1193 BLAKE2B 873c259778092c31bbaf41d1a61a7193369f012204ef958dfe998ba1d32459933f8777d070bf33aa7ef59f8d6d918a04faed9158d3706e7510cb5053cc12df4d SHA512 393fea6dc4f23038c93f0d865d23a6672e0427ce12f93dd4115132c41f2940a5558fa192853895098c49c46688e56dc9b17acd52ae09d84ac84269ccc407a3e0
+EBUILD libcloud-3.3.0.ebuild 1200 BLAKE2B 3c278b434fb196fd1b39dab3962daf133aed125af9b001234795b6257a05c5de665de5c89f7fdbb4e48ecd6fe8abd805be2e02d2ee9ada49b5733f512e5d85a4 SHA512 70461bcc5ba5332259c68e18373736110f111148dc80d6df98b450ff43146ecdf5a9eb7f117b092f705c0535f7d5eaaf9727d3f8b4dc21efec48ac5d1b5bb9bc
 MISC metadata.xml 324 BLAKE2B aa05dc2d968f9550a607cc367c5ab6c3426a41e35cc9a29baaf25050978543fee5bdd676a4606c45fd9104ab6dbe2f2c2bf8f7c45d1b95805503f1cf20668b75 SHA512 809416c2bc54a84624712c77982b57734b6510c66dc731f517574949f13b2aa37b97c9ce4e5ea649262a4731a435187f271d0922e87bc647b2e696bfb40eab0d
diff --git a/dev-python/libcloud/libcloud-3.3.0.ebuild b/dev-python/libcloud/libcloud-3.3.0.ebuild
index db6fb2bc09cc..eae3be8212e2 100644
--- a/dev-python/libcloud/libcloud-3.3.0.ebuild
+++ b/dev-python/libcloud/libcloud-3.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="examples"
 
 RDEPEND=">=dev-python/requests-2.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index 3fa92874c4c4..8bc71c5d64e9 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1,4 +1,4 @@
 AUX libnacl-1.7.2-32bit.patch 890 BLAKE2B 40afbe3e71b550da59b9c26c2834ea72b151d847605572bec3b149edf714125698014a8e30c2e8d9c49cca489564ccf5fbdf0f7033caea528ee588716e222a2b SHA512 8ee93b8dcb23228b3f294a947a54f49afd9fc4dc9207fe999ca7349868cfc05741ea8cab004087c3f0544436fb445ea3f513b574076f6350b2390415a3be7426
 DIST libnacl-1.7.2.tar.gz 43343 BLAKE2B 4f7d03661e1385033c51821bf673c81ced11a1523b371ec7da42ed9cf75bdaadee1e679059dfae85871530652b5fea80bfb91c19a8a1eefb4ecf1b8661f11e19 SHA512 a4efbf73f73d9493ac365efa5a5bd6481f85ce4c880ad236bbf7478090bdea857e78e33e445c4e467d2a2032040863b835f32f9a942d2f1e467015bd76b0d469
-EBUILD libnacl-1.7.2-r1.ebuild 624 BLAKE2B 559734aafb12fa0bb12e65a8127eadceb720cb24ccd55522c3af276966fba962caf4e243c7877ad0c68cfbf23c9f171077d635f56dd2317159e830addd3dae0f SHA512 b42efbfb6dd6c0418d91e93e8c2342b2885b4cfdc829f17060b90d6cefb08475f49fe0d87233cd370c7c0d1b8e42b0449bfc1bbc576e83871a64042bdb2b3a50
+EBUILD libnacl-1.7.2-r1.ebuild 631 BLAKE2B c49e454bdaddee79475a575bb3012bb1ada8dd19cf3944239ae2084bf40d1e8c708646b9d5bf8eb53e2df916058c5cb7603eeda88b80893da375a07f003db8b9 SHA512 985a536440b91910563157bd151a45b566a5e5398cecd6fd86f9878334a2deeaefd2dd44d36d92b44dc223b6e684969092af167b8dbbd33ddcc59c0cac86d227
 MISC metadata.xml 495 BLAKE2B e77a0ee4b63cdc8594ff6dff8416db824eaf4a3fa50f143bcaf2c71b5e216078cd41ece0aad491240392896a06bf4dfb7f73dbd1e7e504999e1c32b642910537 SHA512 dd1c019a0685be6b3e1b6f124feeb0dd6ea0678e1f243504565bf467c62c3bbf4901990692b559c1e869d08bc4ee6338b8d7ae41410bc6a2d904d53283fd49b2
diff --git a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
index 004612b55001..f699c1fc60b9 100644
--- a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
+++ b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="dev-libs/libsodium"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 508e82aeb44d..62f858fcd395 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -8,10 +8,13 @@ DIST libvirt-python-7.3.0.tar.gz 216823 BLAKE2B 2f7ff569e1dc05ac013e21046eab2629
 DIST libvirt-python-7.3.0.tar.gz.asc 833 BLAKE2B b5c26dbf520570ab0b66f3b31a2570a6bab0e252970d0a952411b91d08141edb1a7b53a7404e29426558502dec3f9260bfc815209c524a761b87a70004acd008 SHA512 8467a0af37849b64aab33ff1083f6feb82c39f6c732f53f407037d3f7add5c5007e16d5906e268576239d61ab8d871356fd3e476b8a64fa7aeb51b018383dcf0
 DIST libvirt-python-7.4.0.tar.gz 217038 BLAKE2B a8cec1ab8652b2579daea23b746d01c58bff32cb59a0c3b18a93ff309dcfd2b60915c52cb907c3961289427da5e73c4cae973d4204c352b5892222255e05b576 SHA512 e266b04604a21c0c35cb6c080ca5279f3162dfc489fd5ed9542b9ff49567b02074bcac135897d1a8f2375a744c000dbd93b67831621744c2f596b16ca9116d1d
 DIST libvirt-python-7.4.0.tar.gz.asc 833 BLAKE2B c092743b62ed256267c129d253332322ffd1ee46b054938eb99404db81379cb8c6422e045f1855076f6420ce08e4482ab77db71e2ef6d38bc35136e95858684c SHA512 bca8a981517782e204f51eba465cf101aa0bcbf60e0e26a655c5fa2faaf1585b17988e627bd26b98bef2b95536ae852590773806365cff94860845acf2534d54
+DIST libvirt-python-7.5.0.tar.gz 217284 BLAKE2B 65bae31bc484da061e116c5fe0da68df07ec42160db852c9fb83a5c6f91762d762638fec918ea6164400622178e4cacc416ff343fd2df1bd94a62f1b1a6b93a7 SHA512 ae111e4b7db5662af5315642232e2308ebc349bf80a3f9fd372b0fa0ebcde8e25690368187c86d425faef397550caad3366e7b6a3e6a0c4b56fa58df5e8bc276
+DIST libvirt-python-7.5.0.tar.gz.asc 833 BLAKE2B a6963fe069985a3c4f24007f45dc04b26517dff38ff5f14b00816a65651d83ca5e68cc6e168a318240152da5e20d75176ece9108e50f1e1d3d074dc5d4942f5e SHA512 029ada81b25445df8107651b11299a9ad259c6f990ad5d1aad617e65af49493fe824989fd9ade2703c927c59f1a15ea50c4af2d90ddf3da41aabeccdd399730f
 EBUILD libvirt-python-7.0.0.ebuild 1191 BLAKE2B c1030acd572cf307d85b13e1bf5ed2bfaa165da32ce231d2d74254359eae67d80733349677a63532ea2e282303cbd9e9954f13a2d401a8db04cf289acd770d61 SHA512 7a60511c786ff65894121a094e905f76d018fe8163d3ea526bf788fc8beea81adc067658d82edf469615989b52e0216a469d7826855c481efd2b4ffb60c43496
 EBUILD libvirt-python-7.1.0.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
 EBUILD libvirt-python-7.2.0.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
 EBUILD libvirt-python-7.3.0.ebuild 1193 BLAKE2B 559037c19b568e34e157606b2264b933ae7a9e454b1717aa173799904ed56150c747b085ec4bd148cfcc496bbe0ceccc68ffa1f865a719026352237b1fe35ffb SHA512 d7e6b0457402a4e831e2f4286648c4cee086f7f66925d25ad4bbd4ee050123a3d953879edd094ce429fb97b1853e783e62c0be582a2e6664d8820912b9d44d6c
 EBUILD libvirt-python-7.4.0.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
+EBUILD libvirt-python-7.5.0.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
 EBUILD libvirt-python-9999.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
new file mode 100644
index 000000000000..f4d733c9c871
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1 verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index cfbd2265d868..476aace01939 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,4 +1,4 @@
 AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea733d07d879e6f58dd62003f30812cb4320e41484797cae4f113d271dc8c8625fe847270cae7e35085c2ae67a357 SHA512 f66c13ddee81acc63cb65c09f2836c9a2409f24bebc5b7e3b5fea3f7e626aa52e5d19798ef5ab281d0dd31c3efbc4378003bd93461cfda36fcc726fc871aadf4
 DIST llfuse-1.4.1.tar.gz 774540 BLAKE2B f135ff3cde6effe72f5adf1b9ed58566183775ad45acbd1906db1f5c60a38ab74f0c7b6cda949b3ff2c4b46f036c91e16f9231ede1c78359c87758e6abde9ea4 SHA512 e94045018e9d78b7b16355dd499a27694a77a70d61102d05938223b99686e4b9d90b5e14745d92a187ac8e34aa593a12d99bff1baccb19d4236d54eb66ec3e4f
-EBUILD llfuse-1.4.1.ebuild 796 BLAKE2B ab72bf58f469bceadcf53bfe1632e89087784a229b9b223f09980cffab48030c2c08ab2b3515aeebbff4d6646ee70fd5e9a6c41fe6883ecace88d27647aa1707 SHA512 6c72b914d282a9ab4aca510bac58628ba1a1ea763b64a7e0e341556575355b3f91c2ea9d50f60f3fcb03b6730be026dd07bef015730c02ec2bf2704dbfdb25a1
+EBUILD llfuse-1.4.1.ebuild 797 BLAKE2B de7cd0e6cd513c2b47eafca035da4dfa97b4ae3cc21bcafd4653476906878047ae7cc74898e102ee6343e14f03e6abccde0556343c72ac8752b0f41e5764d062 SHA512 9507cb950d0ab7746e5c45493700c1b3a8498bd7633628c30e31c1bf433a060ad332495820b9565011680921dd5ee794ca8d28787e52f4e23f0a5a3f56c50ad9
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/llfuse-1.4.1.ebuild b/dev-python/llfuse/llfuse-1.4.1.ebuild
index 0b4527b67c59..53c01e06a1df 100644
--- a/dev-python/llfuse/llfuse-1.4.1.ebuild
+++ b/dev-python/llfuse/llfuse-1.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index e60e31891994..765ea625fa70 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,5 +1,3 @@
-DIST Markups-3.1.0.tar.gz 20146 BLAKE2B 426c6f050868e423eeb7f01cee930b088c4b6f7748b7f198f03880cb7d6cc237575c6253d40631aad1601e193ff0e2b587906492c07b953903ee12422e06cb3c SHA512 eaf99b8f521dc93008e0e2519e5c6e8885609457739378d5af6e3aa044a9dd1370bf906a061d8a284d8ad4f9c5196c01a6d8dde3a4630898fe4711154cef7ce0
 DIST Markups-3.1.1.tar.gz 20482 BLAKE2B 26fb19e11aaede8eeadc5a3022785dd3663e7002c5fc4b17c3718d68bda55a9cba07fc1c83a78ca4dee06b4e911b74701fe11865e8933a9d385d032fac00eb0d SHA512 9e8e7b3cc86127fed0367faf257d761e0eae4ca5e11a9ddc8e99b2fc88c76ddb218ee371added56e2c19f5772754adc4c01a09503c308220f6a9d35e736220d7
-EBUILD markups-3.1.0.ebuild 928 BLAKE2B 4327e366240016b1a138d54c1b64df9f6f07a2c63484e96431f3157f6d4b796d4f43e6dd78b05b0514d6476b6cd5feaa996e931b7b194b19bd24b081627cdb82 SHA512 e8336de0269333efddf51d09a28a9baca1acd91a4155e26ce40c646bdf3757092f260c307f74c37e5728bf8c607dcd1488aa807d1903759a9580dd4d543fa21b
-EBUILD markups-3.1.1.ebuild 980 BLAKE2B 7b83ee24ab073c39cd7c6727791db04443426551b8c47b3525d3892d6b9ad7e47f4a0e60d1c6fd9cbd4f5d0df0aa36da68aa3bee4bdf59d393ddea28b6f3b867 SHA512 6a8bcd678feb239f4bb4471e92ec9c5abb0c397e3a7f0469cebfb4e80d09e8d9deccbc6586fb4906767d3e7a9dc7d8c4e724a12c4e71ccc5b096256702d90be8
+EBUILD markups-3.1.1.ebuild 978 BLAKE2B 5b00c69a8ff4438686d1ae12874b9c1e8628f369b5eb80a7eb10fa336e4308220aeb333144c77b090d2ad14fadd26882269e5735e546e0572b3f81cc18016962 SHA512 370eceb9be0241f38e677dd5b4ae35c9876f54dbad0d36476e136230302cac60079bd70752d92382a321fc72bd73b2559e02702d977c5cf9536a563cbc21380d
 MISC metadata.xml 680 BLAKE2B 863bfbb8aeee26e72ad3c6e9cae490e82b67ed54fabf3adc11e98f8894d181e02cb0d174babf003cbdfec1f8a4dcc6e07df47f952683a46e7a4f1c6e3bb2e8d0 SHA512 8e71b06846e8ec4ce1cb2a4cc9aa4e172912ed9a77f76d6a7e9b475432e65d39fbb130a375f35ac429c398ff4d2b32e5ce99386668a88a8cf715660339a961f4
diff --git a/dev-python/markups/markups-3.1.0.ebuild b/dev-python/markups/markups-3.1.0.ebuild
deleted file mode 100644
index 6ebb4c472a0a..000000000000
--- a/dev-python/markups/markups-3.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_P=${P^}
-
-DESCRIPTION="A wrapper around various text markups"
-HOMEPAGE="
-	https://pymarkups.readthedocs.io/en/latest/
-	https://github.com/retext-project/pymarkups
-	https://pypi.org/project/Markups/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7 pypy3)
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/python-markdown-math[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		app-text/pytextile[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/markups/markups-3.1.1.ebuild b/dev-python/markups/markups-3.1.1.ebuild
index c18b011171b4..91e91363b010 100644
--- a/dev-python/markups/markups-3.1.1.ebuild
+++ b/dev-python/markups/markups-3.1.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/mergedeep/Manifest b/dev-python/mergedeep/Manifest
index 3e501f8ba203..14d849a7f19d 100644
--- a/dev-python/mergedeep/Manifest
+++ b/dev-python/mergedeep/Manifest
@@ -1,3 +1,3 @@
 DIST mergedeep-1.3.4.tar.gz 26627 BLAKE2B 334f5ec6948185e3f7758e079e65d92fb04dd3ae3bb208cb8fc67d2fd2d90ce16fecb28562d42eea75db978d9d323983efb85abbf7e5ff18e40c95fb066c47e7 SHA512 24cb1dbae9be715045b66b6d3a3c3deb98a41176ff2fae405f254baeebf5f45b69c948f7780b67762e613e20b5df3c5987e730c5cd91fe7dd1fbda6408906559
-EBUILD mergedeep-1.3.4.ebuild 513 BLAKE2B ce6dadfeaec624baaa5305161ceb168d7ec157091ee0b4f521285db6eafc9e565acc10b241370ea3862ed42ed156a07c78ae96945deaf45000c3608f30f714af SHA512 9e729a875f6e5fa18c1bcf53569b29105d075277ea5bb4c80682ac5e867cbb6751b6104d3c50bb86155162c0cc1ce90a1d0377a57b5c4b826905e47396ff366e
+EBUILD mergedeep-1.3.4.ebuild 511 BLAKE2B b867f6b03bf4790f59f766dfe79399d0f4f1210712636a874de1d507da94f22dd85502740718e48a1df8e806a0ec426f6030c744e8f178206793a41e0739a367 SHA512 353de9220ef2b5dd4ad243397bb4f8ea667f96f8a5344cb8c03231dcb80a8450a54313ca034c8ed6c355a37655ce2466a42b96825c39a93ddcfe220ef067aa8b
 MISC metadata.xml 412 BLAKE2B 085413a8d8ed81d9d38d33f798513badf5c6e0c87c57faf17d07ceeb3e854e3389919508906001a7bcc9a181431780ab6358d85bb01b14ba7290e126c4622e24 SHA512 b5a17e3b5d5d434d12adeab6d6cce8f941c49a5da2ee9ad24a503fa80cb33c7b6dfab9d04cbeb004578802ae1cc5e8cef2b0b8af0ac45f7e7e6741c6a6d8339f
diff --git a/dev-python/mergedeep/mergedeep-1.3.4.ebuild b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
index 0c2aa596d75d..691a71938283 100644
--- a/dev-python/mergedeep/mergedeep-1.3.4.ebuild
+++ b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/clarketm/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source dev-python/alabaster dev-python/recommonmark
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index be238c017213..e443fec2b02c 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,3 +1,5 @@
 DIST micawber-0.5.3.tar.gz 34550 BLAKE2B 045eebd018d8b1f52cca9f043cfbc8de528a409e42ad9f785cfa00bbe223546c98d2d182ed2dca0047b3e73428b318e8db712466813a781154a8a6654d8cb9a4 SHA512 7b5c7e3bb5d92a50a3488229c59c5ae95355410cc0aacd49be2d96372a2d6ab9169aa6ab066d49c72e6a8b80358b3937b358c4bb8027779c5132f0929747dde8
+DIST micawber-0.5.4.tar.gz 34963 BLAKE2B 1c311e2d1c8f32f81be466893bf1eb34f8c38901b168a97c88f2043aba1624fa8b6d12460c7470c3bbd720ae29af23ab808a9464b13ebf5ec193f5818b6f3aa1 SHA512 26879174071256fd3f95e92b0ea01b11a44eab767aa7bb43ff62221212ea0ab1ad33b67060e2dec33963abad599b864573f6a9d5a98fcd8f1a6633a3c73d7c80
 EBUILD micawber-0.5.3.ebuild 670 BLAKE2B 2dd787f7ac0e6835e177affda8b3c8ea23fdcb784b86946f8c019bbcb01a0961cb7c5d3433c0294903703344a11cc09ed67f5089529652e9c2db51210db50a78 SHA512 c0ea1c2826099c4bfe62a7f36a84679e017f3f78aedc0385a9d48904f898000aa596fe283621840c56c7d6f182a3bd61c53ca05767c9b5c6484513b86b25438d
+EBUILD micawber-0.5.4.ebuild 671 BLAKE2B 2e0c8ccc38c08c52d034ae6e5059bd4e2247cb65a9fef72650c6051fdee2d35aee685935218221144ae99bc7cc939a4a989d62cc8fbb7ac6014b3dac67746c50 SHA512 8128b2c9458588c20d41cfd4e2beedeb494ac3c9d429aac713e4ad6c5b1b98996b80db29ea76399a17e3edee3ce15155d8e31d9d8f60c509f7824e20950f363c
 MISC metadata.xml 392 BLAKE2B e64309d757450287e941aade812040543a73b56dbeb26960bd1fade3bd0e8b45a3bb04be4f4f0c9720c6ea36967d9e9715f793cfd57435c64c7dece1986761ca SHA512 210939afb78c7bab48debb24886a5b482215ba5fbaac0e7d7faacbf6781e6d1766ff97e61d94070048ea13d351996b5bd2e8a56e9395e8fb47e1f63e730f30e1
diff --git a/dev-python/micawber/micawber-0.5.4.ebuild b/dev-python/micawber/micawber-0.5.4.ebuild
new file mode 100644
index 000000000000..268957d38262
--- /dev/null
+++ b/dev-python/micawber/micawber-0.5.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A small library for extracting rich content from urls"
+HOMEPAGE="https://github.com/coleifer/micawber/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" runtests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index d109a98df74c..c2d12ccba9f5 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1,5 +1,3 @@
-DIST minidb-2.0.4.tar.gz 14104 BLAKE2B 020996d1e83a84aad26d073b3fcf5161edc1698f0876e499b5dddf88bc5ad776d5203c9dfd49cb9651f66425dad5bf9b3a751940da2cb3f841157af23940ccb8 SHA512 c7f34b20fbfe3300957d1e73a6237850209b55ed08f7d9de1e5dc710fcce8360e359136f8f996aedb38620ae08122e3e1c44922c60db6c16a1d57711d47a8c61
 DIST minidb-2.0.5.tar.gz 11957 BLAKE2B 31b500e420f256988ddaff7271b143f628aea5ebf0abe77125d9ce5143dca3d3d3fb1061c39d325d5df564514b786d751dec90d82fc3310c0f76daf1b4683d02 SHA512 889e678a99c7a5dff5ae7ae2c3540e978f09616384450934f2f16797a3a06c9d863b57eced4b2cde0a4bdfa4923b754e473bde0905c86d948d3bdb81a8e6dbad
-EBUILD minidb-2.0.4.ebuild 442 BLAKE2B 6b5092dacc1675cc8b3a21bdb02e905e61afa543d727fd2df24d175a97a26edd7761d4a82a19c406e491717f351c2adbc167d8153b07822b2de1c10f3124d005 SHA512 c1b9dd78e7aa88a9ec4889c229255c839019e76c9985cd8f7ee04aaad5ec4419e20b350a77d9368ebfe7b85334b967f501a0810c4ab59545359636260528f3f3
-EBUILD minidb-2.0.5.ebuild 445 BLAKE2B 31e66d4c48eb5b1c2c0bd935726e9f8b542f980ea3c87ed89dbfbdc5a5a0cd5287c5598f70e8f626f3ca7da0f0d70c4dfcd7657c1af594cff7c4f781288f7af9 SHA512 ef239c76a74f9fae588be2391565deb5a53f82cf3719f07b73c949bf6bdd0838338ca5fcb95169dd344e6007223a8a02c4f73974d457f16a5c5090541f25406c
+EBUILD minidb-2.0.5.ebuild 442 BLAKE2B 6b5092dacc1675cc8b3a21bdb02e905e61afa543d727fd2df24d175a97a26edd7761d4a82a19c406e491717f351c2adbc167d8153b07822b2de1c10f3124d005 SHA512 c1b9dd78e7aa88a9ec4889c229255c839019e76c9985cd8f7ee04aaad5ec4419e20b350a77d9368ebfe7b85334b967f501a0810c4ab59545359636260528f3f3
 MISC metadata.xml 446 BLAKE2B 46a86136a6790fb2e9923525fec5e8b52420ab0342ca4089f2ca7ce55afe41d96bf39f55fd33af8e006f65e15f59eed09e0ec473ab72041e6bccee8bb06c51a1 SHA512 b29032fafb54b53261e748273f5cee899a91a87e2480057eac9aea9f170e2bda001fbdf1519349cc8e3d411cd64a1185f954920f461c52bb8652d87286207d92
diff --git a/dev-python/minidb/minidb-2.0.4.ebuild b/dev-python/minidb/minidb-2.0.4.ebuild
deleted file mode 100644
index 76b8f51300b0..000000000000
--- a/dev-python/minidb/minidb-2.0.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Simple SQLite-based object store"
-HOMEPAGE="https://thp.io/2010/minidb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/minidb/minidb-2.0.5.ebuild b/dev-python/minidb/minidb-2.0.5.ebuild
index 7fcf72270def..76b8f51300b0 100644
--- a/dev-python/minidb/minidb-2.0.5.ebuild
+++ b/dev-python/minidb/minidb-2.0.5.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index a9c0ff6deb84..5576f4c493c7 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -3,5 +3,5 @@ DIST mkdocs-git-revision-date-localized-plugin-0.9.2.tar.gz 367301 BLAKE2B ac4d6
 DIST mkdocs-git-revision-date-localized-plugin-0.9.tar.gz 367850 BLAKE2B 0bf02b9de2b9ee8c4ae36548ffab85a9c880fc89dd5a4f39961093e36fc0b87b53dce8269400c804fed67f5a3a3a2ec45e6486ec80706be0651b9ceefe7de6af SHA512 488cd20e7ce8cd8df4c277f3626b8d628ce58090791a1b7e36efbdcacf6bf434bd4bc3e73f0402fdc8cb60767e6d63fac56a56b0dfd4728d6a49438caf5ad3d2
 EBUILD mkdocs-git-revision-date-localized-plugin-0.8.ebuild 1159 BLAKE2B 393def0c9eed9f7002691b5cca836933220ffacaf4f6faf783118e33a60e760a2dc3f482fe578a835a9e17bd01581f7f60992918ccfa15b74a46fcd409963af0 SHA512 a8c330aa29186821bba5061ad871896cc48aed48a9915a33c50108604d03d451725d220d8b3b24c54941da37ad11e80c5498e903e8e659e75bd7322dab094bd4
 EBUILD mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild 1418 BLAKE2B 44467533c6c6798a632954e55a6021c9e588a1e00cdc1451b70d1e73b572a0e186b0da6b85fbb7bdd9fbce6ea7ac55aef865c1082cc966cd4765d6482cc3f5fc SHA512 1b5f02b39038855dc7d006daff0e68115a3ff6c36c46794b4c82cc79d209fb8c0d9bd7e36a409c56bdc9084c92cab4e613f2789765a7012507b87dfe71716ba3
-EBUILD mkdocs-git-revision-date-localized-plugin-0.9.ebuild 1250 BLAKE2B 5f82f2ff6f82d0dda5fd1617a9905e80058270ab61fe9506de4d68005e8401285ae05c481ba5e0d655dc962b3000ebe6f65d15cd8630efa849dd6bee47921cf8 SHA512 d74d67f788a065c29226631f13f7adef598b56c3311d76bb42a37f588dbde33bf0d463537a114c452e8fef73c7c18d9fbf6a1ddebc45b71791fe45e50a2135e4
+EBUILD mkdocs-git-revision-date-localized-plugin-0.9.ebuild 1248 BLAKE2B 5e42b07bb574e864f91516ab0c7cbf7eb654a2c5a2ac2bbc1511b583d833c43fd5b20658459d10be5a32a2424cc54b1ab96c14dd228154400dee3a97538b94e7 SHA512 b384e200cc1416b14aa71ee9386399ffac59d7fe999a8eee780ea4de34cc57055e3ca452912631a8ed3507d4eac7c37a6686ae2eba000e4d979c542fbd603bf2
 MISC metadata.xml 595 BLAKE2B 930979c48f81e50af6d892a4c66f93851d862cf0e0562ad6e6f9f903b4aa6db3a3d989e7ac45ac1d5f5ebfce27bf718e143587eef5890695c86c08bd66050118 SHA512 58e5db1bd1f0e6c613ba2957fa4d2d6ff34c067ce29a67bf4171235f38a4cbd57c5d8cc5e5687176f6ac270798ee9694a20dc64a8b720fc03119b5964f8401a1
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild
index baec4d97e38f..6d56c59ced43 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
index 70e39e6fc6c3..5a27ef9bdd13 100644
--- a/dev-python/mkdocs-material-extensions/Manifest
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-material-extensions-1.0.1.tar.gz 12259 BLAKE2B 464b0856f10f0b9311d5c6fe15def4af9384354ab86e62392052ae1bb7450bd09ac56b5d3e9f40b252b30c924f1cf35597ffc9c898f0cffb2c11a74b45da4090 SHA512 68bfdde71f654a9ae42cb6d4545005eddc235e74f6a4c49707853de9cb30261c77ab8c8534b15019c7030d01b97a32645f5355a9e6511470466bf0e6f17b6890
-EBUILD mkdocs-material-extensions-1.0.1.ebuild 976 BLAKE2B f1c673db7e500ce0f76edf726ab19ac3c201ec46f8beb8ef6c2d9ecc6455c06ad566b8a3a6628a8815d22726c8c6090c68b9b952f60e000e9e7aaf7102e928ba SHA512 fa813a88adafcf3a35745902daea4c8b261f88639a64d9c25536f44470b2a9a7682f4a6549ae78d456a9626e6f317bdbeeee7bab381de6c53aee4b33053cd713
+EBUILD mkdocs-material-extensions-1.0.1.ebuild 974 BLAKE2B b0995abe000be9ed652c8506070c2f82806bc5fe7451bc3217d7b43f25e68ae32cf665f16cd89f032e71e9f93430d81775d52ea5fc1185a57221b96f07d5b6ba SHA512 b9842cd2c791675d5da3093ee7f79b0860a558804c0253e5a69104567ea6ce01cecf8b4e95f5869c818a61a16fc0ed14e7f48f26d90331836745b58037881f9e
 MISC metadata.xml 450 BLAKE2B d5afa6fe4a8633ec7e42f01e9a35054017e11b4ca346e18c468b96baab394803a48f2241ab367dbb30055f9851b29de055279b062e4548cf6b72a1191b0fdf4a SHA512 d3a77bbb34d2f31023ec3186a1abea8399d20af672a2241aa94019945776d51aa96f8401542fd1476a3534763b390f54715d950c17b5227088777b223c5905c6
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
index e61b975d97e6..3c8c66fb5539 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # mkdocs-material depends on this package creating a circular dep
 PDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 2d96eee25175..23e4d9511b9c 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,5 +1,5 @@
 DIST mkdocs-material-7.1.1.tar.gz 6080208 BLAKE2B a67742ce923dc7bbefbb5638156f5a2f703bd54af96e59b1c580264ae3096d0a823df6cd88151f2c446a97b578bc4a620d694323f5a81cc33836181dad203214 SHA512 ab6b9b4b08268c15b42cf9d5d26ea0bc91151efb1b478602b495f603335792fcd1f9058ecc52767cb861969ab1db7aff2681653db35cb739173b56f7f32f9c65
 DIST mkdocs-material-7.1.9.tar.gz 6492415 BLAKE2B 67a86251289126320088dde4611ea1c1e75543e7edcb2f737dfcf21844f53a3457544716cded44f0954c2658cb107e5cae589efa2c71ee07151a39ed0f28401f SHA512 1a4296ff692842e61406b24ac50b1c02550a2581040611c263aa744c98031a54c6f380e6f655aa477f98d7507d2e8649434fc981928e9d27f09df71cccd22ecd
-EBUILD mkdocs-material-7.1.1.ebuild 818 BLAKE2B 8458825ae0286754a3568cfb3cd8987e6fcdd09043b218f340f88d38330f86cc56e91846b2c18d07186a3c7d8ff4b4ed23d30d800f67c7c7ab8648b3ed1a0466 SHA512 13a2b6a2783b3e6368c84a30898a799d9b2d2dc4cacb9a7e0ffc187312e7ea123c8ff9975986795748b353ac251e869baf5e45c016f54afec3138060680a3cb9
+EBUILD mkdocs-material-7.1.1.ebuild 816 BLAKE2B 6e872ef6c7186551647d37f7a80142f591b393fcea6cb132040809478f92aa1abbada00f92530b12e23cd7712944ac8b0a82db414d0a39c1be1cf28f4189ae5d SHA512 871fc55ae207e78a3c9ef1f50b887ced596d2ba7cd4a4606549f9877f1d4f660857d3f62aeb23d4eabc4d75f7a79406cf78c45d80b645cd145baf45efbd8eb5a
 EBUILD mkdocs-material-7.1.9.ebuild 817 BLAKE2B 7700357d46cf7298e980eaebd60a96823a0c6e31800fd35c260cc00ac4f73757fe7f13adc1003476e4ff4076cc00f59934fd8a11bff95d10cce32d2c75beeafa SHA512 e32d3869be7418b2453432021fd67930c58c6886fff89b805438d71b4b4567a7c3091e96a0201dbad4da7522525d07634eb7f1ceb6fb66e52ca82d62b3b93184
 MISC metadata.xml 1036 BLAKE2B d9f342d8f3da5a5b1ce9ee0e68938b0c8f7235ff84e39c59d9da18cec1b4553193aaa7eff85157c92fd014e971f2ac947bd252caad791605b0867cf2d7622ce4 SHA512 31db1dbe3433dbbcb6036ece9803d22913980644f014f8e8db80bb00899e0b98602016a08e887f7fdd5d99627d411ea8cb18fbb091faae0a03f8804e3497b52f
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.1.1.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.1.1.ebuild
index 770ffe961f24..7d1393d8fe64 100644
--- a/dev-python/mkdocs-material/mkdocs-material-7.1.1.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-7.1.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index d5df45439a96..89ed466490d7 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-minify-plugin-0.4.0.tar.gz 3097 BLAKE2B b1bba66539cc3470e922ff2bd1c6ae21de401ea343e2bd313bc93ec692e15794476681d48c9dceb9edd09f3c6274dd9174d5861137312ce9b9836e02f34a52e4 SHA512 6a42f649a2a867b2c796de3c602f19375705859fc9b3592fc1d8c102b42a96d7bb7150a4f75b281843ece40bd19ca5bb82654c658e1fe6d1b94f34c8279b2602
-EBUILD mkdocs-minify-plugin-0.4.0.ebuild 621 BLAKE2B 9e35cf1f1ddf1db3f5a29ed4099cf5b33392a55e6e8a5f4239c3e0c388d76e46e7bf68a4f407f816fa29f8356569a1a30c723c51d6b00093785a052b381451ff SHA512 76c3b5558d78f43803ce0a2dc000dc111705881be1f2c1bf6f4eb8c0cfd0afef2bc1631c17d7052b49c4a78689206654d091a9e39facff53b5ea6e22c1299aa8
+EBUILD mkdocs-minify-plugin-0.4.0.ebuild 619 BLAKE2B 304c5b739b486cb0162b65853a0f51a61d26ddcb699d0939ed931707b1b8112451190bc87aba5375940d198c5246099ac18242f31d7e195352501531f53ba6d0 SHA512 cbad58096ad05a54300ae8319a1ad78280488974f2ce21b8af03ff99d03e67ece279403e255eba7548f7d78d453f61a510ce8174f294738005ea99a0272dccc4
 MISC metadata.xml 436 BLAKE2B 8526d6e7cfa9eacf74fded910cb20aa183404673b4f79ac8bbaebe300ab5054bd7540b31d7a56f3e26ed3cc377a75be9e204ebfd12ccdf1d2cbba573b7f417be SHA512 8ce9979defb138817298e45dfcdba9444ee8452d1f027b6ba2dd3104e872fbfc53fc97e36becea6d46cf182fea709f7fcbde6c59572ea72c6a913fc572a999d7
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
index 6cff175d5b18..b1cba873c28c 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index 5f1fb3982475..92fdc6e0224a 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,5 +1,5 @@
 DIST mkdocs-redirects-1.0.1.tar.gz 5772 BLAKE2B e48a35b18690c040efcca2e3e6a97650a3f951b89d537537b54b297e61c590099c6891dd1d64f21dd4efcc4a20d3d709a2815280c2846324f9f57b5a953a31bb SHA512 e3eb31ce920aceab2e4c93988853fc0e63ba789db229ac798791061b26252416c5c68b2c221f82e3a08ce7522e6b2aa58ca606b9a31653f782e31c415861f7d0
 DIST mkdocs-redirects-1.0.3.tar.gz 5148 BLAKE2B 438e2751b4570e8347b06a67d86b0afbb99c9204cb0732719e3301d09ac70f268b0302dc9876d7dbb11f24a3dd4a6eba94c3fb3c765c21e934d72442a1ea37b2 SHA512 c33837473211e9ad13da23789f23242182c4f07fe662b448c17d3976f8eb6ee9acdd69ecb7836c025471862c3ff27c8e3bf9a7178596ec8abd940912d48ae9a7
 EBUILD mkdocs-redirects-1.0.1.ebuild 544 BLAKE2B df0b1da015351df4ced3ea65d78fbd02edb2301bdba6e8702cf5fdeae28ccf2934d38d5c55436c223081d917e2e1908a84e64e0f462b3bb4201b91b6962aee47 SHA512 f645caa7148922f8911027c0da213410baf6a40ce6211baaf4657966e383fc5244b63248d332e46fc88ba6ae4081653b9017d9702bc9f7cb6546d04372cdffad
-EBUILD mkdocs-redirects-1.0.3.ebuild 513 BLAKE2B aa1bf6f007694e6a652c638e966d0928b465ccceb7d8dbb6cae85253fbcb5d7bd0db4551e9bab4d002580aa6dcbd015549df252e4b181d7ec585cb8d9c38d018 SHA512 38078b9480ffe1a9012de29f84efedfa33c598d8bfde9e0b986df1836ab37558e73eb24f55d84cd8802e1330d60d9b83d4502df72593ee90c5b67d40285f0610
+EBUILD mkdocs-redirects-1.0.3.ebuild 511 BLAKE2B d05a906c588bbe09f5bcb11bb25531357cda5f626caa058301178d1742e1725a00ca13d6c12eea7f50f64eec75c8ef6344d274b78f3109c912d4afdc2647c36f SHA512 ca24b055fe722ecc673a0093a588358f303b4eb032ce687cf2199b50ffcbbeb7abfbe5039152c750f8a3e25d35d51d4fcb0599c9f871aa987a7c96770a85d3d9
 MISC metadata.xml 427 BLAKE2B d909be9be313ddf4f7930bcb591498a6194b2e574a2e73ff35be34c19198b4aca7c49c8f95db53810cfd4f3d5a1ba8c60b9ea4c1fd6ebd678dd48df4bc8aed8d SHA512 2013df82c0a0dfa0ca017c0022abee47623eb44fcf14627a622c259c8d400f560e1f1650cd6a648e2e75f0e40adb61a942ca1196ed32187eaf28934606346df8
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
index 9d5213fed30b..5bf26ec6b063 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 00e3a2c4ef63..5659de671f59 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,5 +1,5 @@
 DIST mkdocs-1.1.2.tar.gz 6987352 BLAKE2B 98bf604aa15eac693368e77e6658c3906909a0cdc323772550a65c35cc301929cdc136919a612438563cefd74c9076b2e273cb89e3ffbe04bff2a419e6e36513 SHA512 bf0e5ba8a15524ebe433fce9f2d16404922850ca562339d60e7860e243f9523321cbab5dca1f276a71d3158c7b1bfadfa25b134da50ef1cedc0b1a9658b6f10c
 DIST mkdocs-1.2.1.tar.gz 6918891 BLAKE2B a17fc551735de28391809971fdf8973c5adf23e512286041eab73bde02ae9ae597e357f4dcbb3fa9ea90a4b47e12a8390c3626641e89da45770b4df6f9d66029 SHA512 c1f9c3a46fd2c5d6819ea069bd48a82cbf5816bc1586a88e9eb776b2376106d9d5f8a0d9a70a9f9f56e39e9f29eaa3cbfa26a8c588acf568bde86f4028af9796
 EBUILD mkdocs-1.1.2-r2.ebuild 1864 BLAKE2B 4139562e8eaa9e525cab3da9bf98e8d026eb56ad4586a1fe9779fd4cc22a2637064b7449a33480f804b8fabab6cf94302a0407f23384e568b080f6cff2bc60b9 SHA512 7c0b734b407cd72f928527af9bd3bed6babf7f18d5c1dda43c7271c76496a2aa7fe34c62ef1e5cb03cc776a72bd47695f5bd180cc024ab1671fc4a98bc2e2427
-EBUILD mkdocs-1.2.1.ebuild 2119 BLAKE2B 241a1a7cb0b35db402c8d3447cfa505aa5560e7fa11f52812e472a1ae7b28a80e64a75fd315ee0c8eb2d22660600e0fdeb63830e39b8ad88b72f894d07a3af59 SHA512 63efb54b90930e66e44093ad8a454f703282c12beaf2d6fa2643e25065487cca90eb461dadb63bc8a20975020d82fd02bb7129353b3e777b63300b80bcebfe6b
+EBUILD mkdocs-1.2.1.ebuild 2117 BLAKE2B 781052ab12bd9605e4b6ce320c8db679db1e84c301c5566f55396dcc4c7c8e67f8fbcef4f5e6e39f91db5196dc6609d0f6a9e94c0cee4bd443102c8567dbd318 SHA512 425390d7bedab31ce6fef549c7eae9f9104ec2b4708303b600b84ef0af408c6377770f61df47296b18fe45697248ee6bff814d3c3b22e01878e092ab2f390968
 MISC metadata.xml 404 BLAKE2B 69b46289dc5228603da7575ea456d95e456c969bb5821820d91fa85599960ff9442bd1d7af810f936fbe94e9fcbc3ccace1156572d52f5445322a22c163bd2c1 SHA512 27dac2bb6455dcf92d9d86e3e1d9e29c87d5fafdc6d3e1f8afa059e562cfe9b233a29ed890cc7c3dff1e948d243b007f08b5decc4915deda6a0357d496a7be3f
diff --git a/dev-python/mkdocs/mkdocs-1.2.1.ebuild b/dev-python/mkdocs/mkdocs-1.2.1.ebuild
index 842e38bc6ad1..6d276646c764 100644
--- a/dev-python/mkdocs/mkdocs-1.2.1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc"
 
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index fd0b01813403..6ea28320037f 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -2,8 +2,8 @@ DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
 DIST mkdocs_pymdownx_material_extras-1.2.2.tar.gz 40542 BLAKE2B 583b06830fc230e28b0a8ed465c5c2c69700aa0707dfefea33bedbf87c00265ae5ce4bf9e3789a34b4ec195aef85e370b1f01470ba80c384669abf225486a312 SHA512 3db8aa9b22d24d0e374e5ef298685bb35c0a6b6b1916be12c756d540daac6e482d60c0dc7ce9662a8a05a71c1c75be9b8e0c0b8e7a25f495e2d652d91556ee7c
 DIST mkdocs_pymdownx_material_extras-1.4.0.tar.gz 41238 BLAKE2B d30f4d90822298c82bf9d7c5467d2f022664adee9c910eac82b2b35a740b29a4b01e4e5b61677ccfa98cdd9691032f67b9004065a405712b1d997b70615fec23 SHA512 a3131052d2b2d5619a487edcc5ea8b7b5386a4671ac210028fa72525610a0e86117ccaf3b095f64d2438c49e135a721d8312cae1c44de16bb699822e54b958a6
-EBUILD mkdocs_pymdownx_material_extras-1.0.7.ebuild 559 BLAKE2B a7f74cc62b62fac5f12309b34a9e458ba69b4e40903cdb148b5e0b3796208298f5fb15f4ed0d471ab1a7c8c2907bcd36292fb12d9f2b596941c5da73b668afce SHA512 6bf499a431ccac63b1235da6d386aaf6dc2e15b2f417a8c83a113e97b20be0654a08580e86c26069a726d57221aa6e08949745c7b584ec05eef3209f5112061e
-EBUILD mkdocs_pymdownx_material_extras-1.1.3.ebuild 559 BLAKE2B a7f74cc62b62fac5f12309b34a9e458ba69b4e40903cdb148b5e0b3796208298f5fb15f4ed0d471ab1a7c8c2907bcd36292fb12d9f2b596941c5da73b668afce SHA512 6bf499a431ccac63b1235da6d386aaf6dc2e15b2f417a8c83a113e97b20be0654a08580e86c26069a726d57221aa6e08949745c7b584ec05eef3209f5112061e
+EBUILD mkdocs_pymdownx_material_extras-1.0.7.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
+EBUILD mkdocs_pymdownx_material_extras-1.1.3.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
 EBUILD mkdocs_pymdownx_material_extras-1.2.2.ebuild 561 BLAKE2B 086ee2f238c7cbcec3a4028cf7642387eda803de5584b128e96789cccb14727a8ca2d49554faf20b6ffbe992ee9e75acf12a3fda1a9d5bb2aee6238d1521c9de SHA512 7b72bc9630030ee807c7dc5aa6f3ea989899e40648c403e6f5e195fff34055d1616ed97b292b0225e2c55c6a1067d08707c23501f80b5ef13b38ffd6b93e201a
 EBUILD mkdocs_pymdownx_material_extras-1.4.0.ebuild 560 BLAKE2B 87b6a130990fde80ac940cc8a3af232b705fc0d29cf2d8b1d85542ccc2094d707201ff1d268bc3f5d261f0e28e5b7d52836be4b916f266eba8499f9e00bc5eac SHA512 805e7a4fe0675b4cfac9acba15ff762382fef062d16c78fc2e95aaeb9021cb233521038bbc5de7aa236b87d0e62b4083fff9ddd5d5246b430838dbeaa96b1762
 MISC metadata.xml 1166 BLAKE2B 7f19da6ad1ea3ddd412be73a28b2fb4e4c46f2fff047f404bed33fdc108d93008209110abd88843cf16b9572663a50c7ffb3be9abda9049318c5051205240e55 SHA512 37d55fb8a55e5a9a60f8b9771de181944022e691548c0f2fca52e0f343004369af4c7d4235587a943112f64e72ba34ce203f8ab81848fa86d523679b30cff424
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild
index 463f6ecd3f86..3e74628e4576 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild
index 463f6ecd3f86..3e74628e4576 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index 3837a33d0ac6..8126621066d2 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,5 +1,3 @@
-DIST mongomock-3.22.1.tar.gz 121742 BLAKE2B b325fd917f27712d1fdd35564dd27e02a69a417b40c975b447d1d553a170fb45978303b47878e094c6360930b0293f7353552522b54c9228f8083ea88e672510 SHA512 efd8e46986076fb1b6aa2d68d17b136191bcb90408da305a860a99a86ce06c8377ea5f684902761ceb38b5e914b75f7307e9a73477a3297b502241d7517fc143
 DIST mongomock-3.23.0.tar.gz 123705 BLAKE2B d58f867628c8c80e1289c1a86fa910585431b5eca41818201dccd54d5adccb55c35aea41566ab2d483c7040cfcaa4c2afdbaad39fdd901497a0e1db4effd1c11 SHA512 35442f29907bb58693059a33f5941ca557965fe2b0b9b68ab3e4b31f5e2326bb41db8716a089dd18a1a1fdd5523a729b48a85e0caa0daca1bad2790c2ac017a9
-EBUILD mongomock-3.22.1.ebuild 852 BLAKE2B e64e7194e6900d55673d33e161d3aaf2a4bf9b7ce11078201c9c8df0befc617cc844c4d3634a0edbd8144c24aaba51e2f6aa24728179ebbab323ad28d9c462c1 SHA512 41919b31354f337d332efb5788e32c1f29b27d0694cdefa1869ee18147521ee8189defe867d80f732c872e38e0d081b257fb1389fe16249704b476e9ffd46023
-EBUILD mongomock-3.23.0.ebuild 854 BLAKE2B 5c3ea50a873f09f0514458c84103b23a044678f2a7d61280e592a3a5caeda6e3452d2af268ba295ecac6a28d6fab56885f543320cd61bae576190787b34a2d0a SHA512 4c3058fcc1100bb47f944c0c5a82b580b8a3dd5919f9ab788761e29efcfb0ffda0b57a0f6a3ec38acd213f8f629cbed888879a517dcd708795a4806b0ff028f6
+EBUILD mongomock-3.23.0.ebuild 852 BLAKE2B a2187f0eb4d75639f632b76578c38854f58c3033998de599c621601d35a4eea8eacf0d2d9e0ab21e490eaeb3c527b4a56c375d260cd41cd3e5934a7d81212e5b SHA512 34600bcb6719444f155ee72d2a3f8656b0fdbab4623601d47f509570e1dc60ab2248c1d2243f2d9d9e6611b121d5cd341276d6e3f2b59f1a36e6ca50871fc199
 MISC metadata.xml 395 BLAKE2B 348ffbb9c7274a10413f5805e9af06ebf7dd5ccc3b4493d7f876cbf370cec2d42a16280648097e2c1c273cddfbb55417f0b33f206acba49a91685bef1cf6be75 SHA512 dc60cc89f839255497b4cd2f9fd020cf0e300ffc2944ae681ced5368d6e4dbe307e10a6752aa1594a2730392928016e6a7dade21fda3f4ab715d09c332ed5d9c
diff --git a/dev-python/mongomock/mongomock-3.22.1.ebuild b/dev-python/mongomock/mongomock-3.22.1.ebuild
deleted file mode 100644
index ee1a2071f1e9..000000000000
--- a/dev-python/mongomock/mongomock-3.22.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to help testing Python code that interacts with MongoDB via Pymongo"
-HOMEPAGE="https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	>=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
-	>=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
-
-src_test() {
-	# Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
-	# TZ=UTC needed for date/time tests to pass
-	TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/mongomock/mongomock-3.23.0.ebuild b/dev-python/mongomock/mongomock-3.23.0.ebuild
index c7b70822284d..16470a32ad6a 100644
--- a/dev-python/mongomock/mongomock-3.23.0.ebuild
+++ b/dev-python/mongomock/mongomock-3.23.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 6292e82a6f62..f2d3f8d0985f 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -12,6 +12,7 @@ DIST moto-2.0.6.tar.gz 1557871 BLAKE2B dd4c23758bc9c98fbd2b2a70af744daa245fc8b4b
 DIST moto-2.0.7.tar.gz 1565849 BLAKE2B 1c6491828a43156fd347bcce80f3440cd8d4964e28bab19593e29fd88aed558652b08c81c577312f9c612adc666ddd35fdd46b4d2d8fb82eef380210e9c62d8d SHA512 5df26f478909c57d4ba76bb7c6e002c37d7f604084c157744be32da93dbb705605a7a85eb0774cbf2c0083f7096f01075ddb1a119cb7ac2f3931cf58896f1629
 DIST moto-2.0.8.tar.gz 1569426 BLAKE2B 746313241d49558ab49d7e2116406f128a315a9fca40956808e7f901e91518551a1f75c95c9ce5c92534221d1db3e01a3baa2cef6cadab9a9d024cc30d8ce0e2 SHA512 5cf1a47c97100b76ad9b69787ce4df00f24f93ba1a36a242cea535ede649af457ff043b44f1cce4a4e44b6735844652f69271f18edac0748b636f4e519545018
 DIST moto-2.0.9.tar.gz 1614328 BLAKE2B 0bb9e3dcc0c25476b7fdabeecc31be6904a21d6a77f6ce3d9c9c176625873d30c55321c8939ecb8bbc91ee64faab9cd7231150dfdcbd4d5d7d3dc8eae614d9f2 SHA512 41b32aa192dd5c5052a90f345f29e696f9cc6abb3698ea0b738f8805fc920f4abf7d418a64aecf6efd66162aad631c88754d5e4e349ca2ba5b393771038219cb
+DIST moto-2.1.0.tar.gz 1638267 BLAKE2B ee778cab1a9a448408bbc495a148201bb016c2ba29076062360db23d86d725758303c32e1fb1a3f9e11112deb1cbca686fc956ddafd259fd942654510ba12147 SHA512 cae18324200d827a1750c5dbe2df2ea68dc66a5b8ff40b4c873f7511d576417c1a2b20203cc126d84b99b1aec5ef8700825271893933e6cc4bd61c0082b9e9be
 EBUILD moto-1.3.14-r3.ebuild 2875 BLAKE2B de0b07e01a296d89ae22fe0a91c91fc76634f054a148c0cf60101d85df67f0a17cfd9a80cd41e264a0641e79602b5e3cf23b90f2eda98a50af78794ccc9ef0b7 SHA512 c6bef4b6f0899fbc31d97cc101fd14894814edcbf66df837f776fbb51780f86a95bfd94dbf278e274897ba25e4465938eb9bd0410910a95ecddea56962a70f3a
 EBUILD moto-1.3.16-r1.ebuild 3189 BLAKE2B 6c4612eda3bb91d40b7e0ad451568d5c877ef4d3a6563fdf13513d11abbb477702d542109174e91b7c1e580c366d448248453170480b7a15a8b8e9918814624b SHA512 5df5495f98a4929a7e97e257a2bd7b8ee44c915fa008b6d45674d6172ea17fb103b2c579e76a7d14944995019a73217e510c60938b42ea5d2885f92f785d92ad
 EBUILD moto-2.0.0.ebuild 2359 BLAKE2B c9204998835e0f41bc23d820a9ce677f33d1f18f614905cf2d572ef194fc422a7be02f5d37ca6a25389feeebf4e1bd8f8439ba1e44466a45b12678d8e0cf69e7 SHA512 3689854904d3c9f5152dc2211d52e21dd475151c18fb9463b288634cd0754cffa744e4de129655277e5b1f4d5b1bb78f451a7282a31203483d75a7990aa3d693
@@ -23,4 +24,5 @@ EBUILD moto-2.0.6.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668
 EBUILD moto-2.0.7.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
 EBUILD moto-2.0.8.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
 EBUILD moto-2.0.9.ebuild 2251 BLAKE2B dfbd64deaf75259e39927cccaa72be0634304863cf413828e07c49e160a9c0c14a50b0d3e4b5d34232d0cb7c579cd1e49eee22c6ad4d31ee9b889a89fd7bf602 SHA512 f99521935ac7d9d64f9954166caf37a2df6b50e8ec862100e320470ccbe7372d3580eeb9c193b288d5ac28407b055f73f26b1ec895e446d20f341c3f49845c35
+EBUILD moto-2.1.0.ebuild 2403 BLAKE2B f61936ee276141c887613a85ae20234e8cf6358005af3e48d2a441cb3dc74e0c8f82a6fbae511cd8ac21c00ed8decc4e88aa96f9586bb1c4bb8fe752c61d07eb SHA512 3209e5a97ebad0b689465bbbe48d0f1d5f2c34230f9b917f4bb4d8d6453dbefec90da1b844a01046aabee531e2dbd99933f4b01f74d47271f2ca32bdb877cbd7
 MISC metadata.xml 551 BLAKE2B 5473a586a27737f95b3795ff19bd08359fa5135aa60858c52b633d1ed53412fc1cbac3952f937ed497de18e90b00bd45725b920ad6fc75c8928181ca48ac5c45 SHA512 5b68da384123be90f74ea6cdd216f59ee004c4383b13da95fa17864c998ecb821fd0f16bf65abdc9b29f081a1e06be482518ede38139e29e32e46c962b3d4805
diff --git a/dev-python/moto/moto-2.1.0.ebuild b/dev-python/moto/moto-2.1.0.ebuild
new file mode 100644
index 000000000000..97c46227e99e
--- /dev/null
+++ b/dev-python/moto/moto-2.1.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local ignore=(
+		# incompatible versions?
+		tests/test_core/test_decorator_calls.py
+		tests/test_s3/test_s3_classdecorator.py
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/nagiosplugin/Manifest b/dev-python/nagiosplugin/Manifest
index c1bf906caef0..f8bf899325a2 100644
--- a/dev-python/nagiosplugin/Manifest
+++ b/dev-python/nagiosplugin/Manifest
@@ -1,3 +1,3 @@
 DIST nagiosplugin-1.3.2.tar.gz 54262 BLAKE2B af2a8a876105a1ea26671b39d611beaa46303998544adadee3370c6d1b5096fa93160121f89412f3778a2bbc1c3e95606a49413b8f3f0880c9c9ca4e946fb1b8 SHA512 899650852397bffb66ad53843233adec2c91e96656674a9b21c5a02ed97ce4db69c1440d1b88c5799a54745e69b8c05f52188403b5a2fe9050acbd0067806d50
-EBUILD nagiosplugin-1.3.2-r1.ebuild 519 BLAKE2B 06db7a6dd3762af975eaca01504c092b251cc8a285286dfd056adff7e149566cf2eb70a3379b3beaf3267e42b47794037dd9fb6d42bdc889f88fde6d6223e94e SHA512 33b654ad64c1b40d699e36720717fa1e911a20a15ffb424cfd9b51d85cde7e8af94bb7808cf1b648246458e17bb59d66fc45ed8f3fbb715d1f6e162686e723da
+EBUILD nagiosplugin-1.3.2-r1.ebuild 519 BLAKE2B 2bb80a882e89a374199fbf066e226f9a53487f806f9c24736aac39bf39d16db808daf303a9f82f364f0eb1cecae1cb0ff00e3833e1f6fec165d989de60acd31a SHA512 2d7b5bb31d6089d66a119970aeccca99b21d4d6517d445360accf54423d6eb1394b5ac0fb261cb942e7857b05b755657a25c8c4ef4575016aa8a624dd23309fa
 MISC metadata.xml 452 BLAKE2B 39030b9d85edf373418952f1986d9a1b4c5a73ca191112d9e979b754eb12891f16a522d19a4d4278853ec4b07aaaf14537ed64eed658886c02859d8a451eb81f SHA512 2eec420a3b59460798f9d8504d86a8d01afd309867f0bdb0f46f5a87484c06f8398221946bff4d06c150cf8085a6cbc15a9e61ba815519e696a26376cc018fe0
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
index 3608913aab40..d547b7438f37 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 742441f2fe6c..f016236fe3c4 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,5 +1,3 @@
-DIST nbsphinx-0.8.5.tar.gz 145770 BLAKE2B 734ce1081aa18b670f15d00b79930af5fac8a531a9a6d645ad903fcea537cd95561f41360c3028a60503bf878aff0d7105a0a753563ae5bb70ccb68db118e761 SHA512 1fdb52741e01afc7e3a67d97d3edee14b5270a3404da607c97c116b839ba23c641b2d3e338df81db52bd677d71861c62dcc08184ef92165d6a53a6841c1a96e5
 DIST nbsphinx-0.8.6.tar.gz 146019 BLAKE2B 106c121e9306c1b79771d49697f125b7c9272bddd9859b308d272e69cccf38fa306330bac01e8744f1a5a1e6831f63b73b43b0a2260eacceee4d2ff6c4ae61ef SHA512 11ff82be0633b3a2af2238d9dfe4406900804caf494885a5b3ff22f651c8c43000dadf83546ffaa85873901ef9625c2e786e53e866c27141fd9e9d58927ebf14
-EBUILD nbsphinx-0.8.5.ebuild 623 BLAKE2B 7664e14a7a77f0546c6ec7d30ff5cedae91071ca491ca531c83f1d9a707ec809f6b031e951e8f24f5e865bba8ca7d82d2df5936debc3ef9cdd2e04036e2cf8d0 SHA512 a76285e720a1847ada1ca241fd9999681ba2f70337b3704a1a4f5d2e792aa9504204079c07d75920a9b1f991297c9e8d2fe90dacafd621e28edd1fc5656ae82d
-EBUILD nbsphinx-0.8.6.ebuild 625 BLAKE2B 3881d7ca9b686e0003688ef8560328d054b3967d88e55a306418967a77401dbabade0ee5ffcfa444b89b636eec15ce02d62aae55a79c5efabab265670893c303 SHA512 29a3fcefa678731c7c4f7c2628d37e7e0ef41f27170241ae802c6dcfa26fea9abe39b54df811335ed8e3ff57f8235288ecc11c59790ff3fd89a8469379ab664c
+EBUILD nbsphinx-0.8.6.ebuild 623 BLAKE2B 7664e14a7a77f0546c6ec7d30ff5cedae91071ca491ca531c83f1d9a707ec809f6b031e951e8f24f5e865bba8ca7d82d2df5936debc3ef9cdd2e04036e2cf8d0 SHA512 a76285e720a1847ada1ca241fd9999681ba2f70337b3704a1a4f5d2e792aa9504204079c07d75920a9b1f991297c9e8d2fe90dacafd621e28edd1fc5656ae82d
 MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.5.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.5.ebuild
deleted file mode 100644
index 6d626dc40a76..000000000000
--- a/dev-python/nbsphinx/nbsphinx-0.8.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Notebook Tools for Sphinx"
-HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
index 94b3df799087..6d626dc40a76 100644
--- a/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 66053b4e052f..b93d6c078c96 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,6 +1,4 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
-DIST netifaces-0.10.9.tar.gz 28844 BLAKE2B abbe36ef82c5fa70bac60abe4c7bda671f8bc009567dfd38fcf2084bac5b09cbd42cc16c5c8023f3219129892f8def296e3cad8f9241d8c904a9c362c8077aa6 SHA512 8fc593de4d2cbda46a3e2430ede031360f1abfc64d47d00fbec09f3395fd83479bf29d97cb6834b1df06850c9ac2745c9344b6814f34be5975d4d5df98e05e87
 DIST netifaces-0.11.0.tar.gz 30106 BLAKE2B d531cec80142d005548ad30f4d13b23d0a7aa85f6907998bdc6d6081567234b169774b25d2e274d14e68564b16e96ff016c429c0a7aefabd6abae6994f1e7c5c SHA512 a53110efb78c89c4d72d002104866253a4c085dd27ff9f41d4cfe3811cc5619e7585ceda4e91e83cdd0645c40c745c61d205708ee9a34427b35f437a48f148e5
-EBUILD netifaces-0.10.9.ebuild 559 BLAKE2B 880319b79fa4545d2b218275dd435502997c7682c8bd9fc2bd1203405da17a10bd50b9063ba83351df2b98eb64d109dbec3b6e722817f3a7ece4c9580ee16172 SHA512 c5ecf5f66ede07513cb66cd4e4c61db85f32229dde380d6f6e7c5cbffb8856d4589a7f402967ab16ec855be58bc52c30a0b19c49b7e9538f9fa983444c43b5d1
 EBUILD netifaces-0.11.0.ebuild 559 BLAKE2B 880319b79fa4545d2b218275dd435502997c7682c8bd9fc2bd1203405da17a10bd50b9063ba83351df2b98eb64d109dbec3b6e722817f3a7ece4c9580ee16172 SHA512 c5ecf5f66ede07513cb66cd4e4c61db85f32229dde380d6f6e7c5cbffb8856d4589a7f402967ab16ec855be58bc52c30a0b19c49b7e9538f9fa983444c43b5d1
-MISC metadata.xml 513 BLAKE2B 2668fe590efd338d410c10a71076e5de04297b18f998b07dbb88a3df99e1c4e66ed92f97fcf6d06b2496bfec3ec308d3812f08b1640b73f1d2221beb669ad3d6 SHA512 88793ae0c8b539b78d70e1af3a18e65b7702e3663d950a9ea1ce7528ed3300ea0b4c69c5a48a652fac4c2a32ede679062dc929c165035a3cd4dec13513669691
+MISC metadata.xml 450 BLAKE2B 147759d8c03a11a4dd618cc134e7322f34b2cd542049d948cbfefaa4b4486cb6d90e61b15caf8f71cd300ebfa05a88bc908e83f51cfa044ad26e2276401e74b5 SHA512 6fc02f3284f0603ad1cd82c896856f2cee2d4cb575fc0c44782eec05012fe15f73f555f61f0eb4e4d7cb9f3ffb9cc2db27555b9511738766e1d39249ead24b60
diff --git a/dev-python/netifaces/metadata.xml b/dev-python/netifaces/metadata.xml
index e1a6f820cade..286c15195705 100644
--- a/dev-python/netifaces/metadata.xml
+++ b/dev-python/netifaces/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">netifaces</remote-id>
-    <remote-id type="bitbucket">al45tair/netifaces</remote-id>
     <remote-id type="github">al45tair/netifaces</remote-id>
     <bugs-to>https://github.com/al45tair/netifaces/issues</bugs-to>
   </upstream>
diff --git a/dev-python/netifaces/netifaces-0.10.9.ebuild b/dev-python/netifaces/netifaces-0.10.9.ebuild
deleted file mode 100644
index 9d457ffccb7e..000000000000
--- a/dev-python/netifaces/netifaces-0.10.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Portable network interface information"
-HOMEPAGE="
-	https://pypi.org/project/netifaces/
-	https://alastairs-place.net/projects/netifaces/
-	https://github.com/al45tair/netifaces
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index a81e628c4797..5b8926ad937d 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,3 +1,3 @@
 DIST nodeenv-1.6.0.tar.gz 35407 BLAKE2B b952fa95787b02353ff01c27a3e4b692c0cb27954e99af4c4aec682c00692bf3e509947ffd378639dcfdcb2d8077e1b2679f56cef7818997a13a31f882251a2a SHA512 abf4fe55ba478570a32ff3bb24fc3c60ba2d100822f8295c4c55c301ccdff2dc2d20ef76990ea3ac203e30db8a1e85f3ef2df671f87c0cf7305cf1aeb788efdd
-EBUILD nodeenv-1.6.0.ebuild 477 BLAKE2B d8b40745d5fa769adf2a43b955e04df728b50eb21a376cb2c5cd4c2567059749e7af668c608588d4d7f919da3831b433fa94d044781915ef0e734c7f23b6d424 SHA512 2269ef3d5681286927223cd6fc08277c314bff6824ed2af0484bcfe22bcbfeca3ac315eb8aa6152e4d4a95d1125ab7edde3c0b8266084d16eda8b46bb15606c9
+EBUILD nodeenv-1.6.0.ebuild 482 BLAKE2B f369eab23e330156d4e591f87d1447ba6b44735cc503a85588f460dc15fe0c2afa2883481ba8310a2e937e57232536e81e064ca7f254b8a7281d6a16b67e0503 SHA512 f669c43ea174e600992b77361c7f6bce9d90d6a65cdcf57086ad8cd45938d986852fd7c240e334682fe8f15f0e5821b4d268c10b851d502ba09185ccf58d0211
 MISC metadata.xml 377 BLAKE2B 10309882a21ce0f0f8b7ec7d4d6c057a1741e27d548eeac8126f39b8a564c8e0e2a1b26cb09f01402b928df40dfeb1169fcae44ff629c901ef68b51bd12391de SHA512 7cf97ad2163fca6b4bbf962373052497e64926848dde74beec8e6a194de669709474af570a35e9ffc31134d2c252852cec8167420d54ea5745a6d377a878b2a5
diff --git a/dev-python/nodeenv/nodeenv-1.6.0.ebuild b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
index ecdc71d1dc2d..1b1b6d009af2 100644
--- a/dev-python/nodeenv/nodeenv-1.6.0.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
 
 # requires network access
 RESTRICT="test"
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index f84a0b9a70f5..710f93f4de2f 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -1,3 +1,3 @@
 DIST ntlm-auth-1.5.0.tar.gz 41826 BLAKE2B fb313cdb4f1022e0cbc1ffcb048a587baca400a75e053ea8943d960f21746e847080db20169f55e6a3060a8b8502637ce7dc269b66bdaffe98c3f769b2b22358 SHA512 cf08b23e49d45c528404b70b6be88f6c3edee9fd0d4584f3962931a08a0982cdad4089963a95aea911b6eb4db32a932536cf6d9c02c292cd447e0a9c6b3b802b
-EBUILD ntlm-auth-1.5.0.ebuild 538 BLAKE2B e0fc0bfe7701cd27052da9d48fb2795ff31011ff5bb82e303f962eeb367cb0ab6d7aff095eb888d664208783c3ce4cec27ed54fa152bfe46e80cae53a3684b3d SHA512 45c0b651a50119a556c6a3f39599a9d237cdc6a6ffb7ccf77b033c01ec15e6b9955735598bc4b1e722e722b4bf1a3c92e5db58bf49db377cc85d28b4cf1f556f
+EBUILD ntlm-auth-1.5.0.ebuild 545 BLAKE2B 5e02bfd4d870dbaa37c62fbca4ec22f1ef1d6b3914f5962a35e5bf4d5315c71283a28ce3606b38e4352baf6c182b0492b82c6ab96c74831d41728cf70496588a SHA512 e271a3557d7d7485f0a97b9695da6b2016ed0f4764b1911f67050ad4d30b7c79b7fc481aa67483db6d21c696936ad45149aa2e3883255d57d71eb2cee9db4936
 MISC metadata.xml 508 BLAKE2B e1051ed1d65f86585a5948a4a97576d643e18937a6e7860e46aabc12f420b243dd151ae66804e9df26e5e877309a93a2a8580db9ac058b34914236b6d49b7313 SHA512 4787aa1fa219a019371ced0db59d1e0d9c31309c95e1dce467a75d2d54a9013aa18c9c242cda6a2e01f43268058bbeffd6f38e43d8ea8a23903c8b306a7026b0
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
index 087c78f81582..97883cb51cbd 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index a28cdbdbce4b..cfb0da80d123 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,5 +1,3 @@
-DIST numexpr-2.7.2.r1.gh.tar.gz 119099 BLAKE2B d424dd89761ecdad3e5a35a5c8b41f089c6eb7c9ca10a4309fb489bb7ab60c0b77863c1675583014265c057e27f3b9584a35e0ac6232044ed5f8b8c32fd330d6 SHA512 d786aeb3597a6b2196e92f364934a0bbc518c7973252c38f1e93c317d55220270b5d61320d7a465c87da979ec68e988b25182d527e0e96aa3a898f20a6997802
 DIST numexpr-2.7.3.tar.gz 114113 BLAKE2B 95dca4fbd3148bbf198f82827a63fac3e9de29f677457f2ad45040e24a38bb05e4e09738efa0cac793970e18bdcd252e2744da96062217fd35b4054b10112989 SHA512 8234a65ce96ea0a2f20cce7dce3de652362a9edc86af2e7a333cdd8ecd87866f75970859ff39b04d529acc062b806cc8c64f262c318edd2897200d7e54b429e7
-EBUILD numexpr-2.7.2_p1.ebuild 1254 BLAKE2B 899bd020ae001477eec6359a8ed1fe41d3d6f82009517e90bc177ebf4a8e6c2b661e61d4acd01ef4ae79d16f57c3c0eb856dc527cfaa40fb1d249b4e4b3e847c SHA512 c2f408169d0c9d30c074f7da8dc174e8225f35ffb28ab6b84f07261b43faba5f58f7082bde99e5b397120eea10e3f2ab6e2e93fbe3cb2f9caa28b4733c73d139
-EBUILD numexpr-2.7.3.ebuild 1217 BLAKE2B 1b2521fb96c8a93eb6f7a16859db9cdaeb783e4039830ffa88a67cc38ff14a2325fc44cd70f48bb147057b3fc66759bec4fdedc4cf0fd95e0fb3cdf09f160487 SHA512 7faf0405436d4c0a8122729761be87cb3c70bed5d1caca54ac727bbac49b1b6bdc099c2ff59e780ea2d70d15dabd54a31e7c89320fa2e55c518b6a8f827a20fa
+EBUILD numexpr-2.7.3.ebuild 1215 BLAKE2B 6d2490c16549f2c7033375b9c137fe0a59354c2a36a36d1ee900a49cbc6936a7b50824078a371ecff28b8a51473f17c993d154bbe36c4061bea7c834c8ab8907 SHA512 eaba741b531bcda54da607ab0e37d3ce9fa12fd25f8e109e81644363b8e4f7b0577fb83e755f0bc04a5943063c5ddb35585643c14ae3957382bedf25ca0d0f00
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.2_p1.ebuild b/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
deleted file mode 100644
index 679730c0dcac..000000000000
--- a/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
-HOMEPAGE="https://github.com/pydata/numexpr"
-SRC_URI="
-	https://github.com/pydata/numexpr/archive/v${PV%_p*}.tar.gz
-		-> ${P/_p/.r}.gh.tar.gz"
-S=${WORKDIR}/${P%_p*}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="mkl"
-
-RDEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	mkl? ( sci-libs/mkl )
-"
-
-python_prepare_all() {
-	# TODO: mkl can be used but it fails for me
-	# only works with mkl in tree. newer mkl will use pkgconfig
-	if use mkl; then
-		use amd64 && local ext="_lp64"
-		cat > site.cfg <<- _EOF_ || die
-			[mkl]
-			library_dirs = ${MKLROOT}/lib/em64t
-			include_dirs = ${MKLROOT}/include
-			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
-			mkl_intel_thread, mkl_core, iomp5
-		_EOF_
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" \
-		-c "import sys,numexpr; sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
-		|| die
-	pushd >/dev/null || die
-}
diff --git a/dev-python/numexpr/numexpr-2.7.3.ebuild b/dev-python/numexpr/numexpr-2.7.3.ebuild
index 78f0a10f5478..37cf6ffd3eb7 100644
--- a/dev-python/numexpr/numexpr-2.7.3.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index dc4745c89af8..b6f171f76b1d 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -16,6 +16,6 @@ DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58ef
 DIST numpy-user-1.20.3.pdf 4977046 BLAKE2B 3548463cc878645bb169255d3332681685d0f05e02abf4cfcdd03773826d34f5a25c020240652839867a76258b25ca601ed292462f80bdf18b92ecfb46710487 SHA512 f6c37152228eac1fb69ddfc3a37454066ed678d57f12a587e0edcfe0adb390cc0b470384c2751033f7407bac44df9f69b0da4f3da1c300e6fc02231035ff634c
 DIST numpy-user-1.21.0.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 EBUILD numpy-1.20.2-r1.ebuild 3789 BLAKE2B 04b13cd33ea2805716faf5c2d286e3f0928eeda592c0c6217501a1adbea30e614d940732041cb4236a89966db1cebae33b437ab55a309ff6be62e81bb6be5010 SHA512 9a2bb8e998e317e540b7a0fa70979a872db8b0a99cc1e6f72d1fa0ab1c11f26551be22eff1a84b2c25e9d39934246b955ea54fc72c25b2d89badc430bf048f38
-EBUILD numpy-1.20.3-r1.ebuild 3725 BLAKE2B c7ffce465a67bc7e94c87d472138b55270ce1c3ab90f4a0fec4c83ffd53cc478dc2b1340e1571f642c18a6c7d350a6211d425c6760e93ab533823176fcd0a73a SHA512 848823fcf321840855e4fc89efaad6521d168b7d5c133ac1dd81d8e466eedfaff346ca6d2832b17477b3b36746db0b68869f3fd06ed243d78b83f6cadea0e121
+EBUILD numpy-1.20.3-r1.ebuild 3724 BLAKE2B 3d3c2ade82decb593116388cbd00e6c688e0b308b2a4bccb122fa716e7e8826f83f0d9f2fb6edeb43578325007b97c228899be055c5ae90b2740bc5a5dcfc7c4 SHA512 496058416f50bcc39632458bac10017071df0231bb564be2b496c65f693f0bb12c6a01a50df72f70a7f98f872f8258c8030db766fbde2f89a5c8327b1a786dca
 EBUILD numpy-1.21.0.ebuild 3567 BLAKE2B 8bfccf3046fa52a171d97bfe22385688d37a383a772310833fd59ead145d8ef7e1c45567ab664f3462e99595bac7411faddba01863143d553db30017f88f1225 SHA512 77e8d721c372f06aaab330c69d21eaf699cd0b04f91a1466878f9e2e89169a14979f7ec834c906ca0905ce909215f74c0b9c77f0e08b39dbbe34d07f275a83e9
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/numpy-1.20.3-r1.ebuild b/dev-python/numpy/numpy-1.20.3-r1.ebuild
index 47910e45729d..7a4ba831636c 100644
--- a/dev-python/numpy/numpy-1.20.3-r1.ebuild
+++ b/dev-python/numpy/numpy-1.20.3-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index f3dda86cb811..21e77b2b3a2d 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,5 +1,3 @@
-DIST oauthlib-3.1.0.tar.gz 155362 BLAKE2B 83e9331589305c85acc755f9c4dab8558a19aa247aff5be0fe6c51d047fb9e96b64f17d07a3e33378f6ebc73a283e0162bab56e110aca581f73b628544042600 SHA512 c295de232e0215532c501d8f0803bd501a15fe89a746179ba4facca878e4927c8c05f07825f483c4a846922fb49d6d89f559a8b49bb72b19903f902d772b790e
 DIST oauthlib-3.1.1.tar.gz 161395 BLAKE2B bc127841a16429364191a69777741135594366a5c99b32f063ce9bec4b6a3e9b7eb67515aee4da37f26cc2e8b2a2450fc708a21da7e4944861b9adbd9e112018 SHA512 1c18f265a6017a6f2bf77507f5de095b439be36f309316993b547ded0f306461b058dcb85dc245bf26f65a9c77be44ca38f9053f3300a9b5cb92332b61a7f307
-EBUILD oauthlib-3.1.0.ebuild 733 BLAKE2B 724548ecf8f9ccbfecc76babefb80be4eda3d9411b44ad15d44caa37287b878722d02d8739e13a3e78167a524275b1af5c0859d38c48c421fd05af37105ec952 SHA512 cfcaf21c9b4f8f2124655ffbc41016362941e8af7ae50646c348ba02d8b2aa04296ffea26d491fb4d857da01a94681f605c50ea97b106869733c50492be349a8
-EBUILD oauthlib-3.1.1.ebuild 734 BLAKE2B 19c4b6687918b673508799f67977d76b8752c2a6b3d33adcb329c209fa2c26bba09c03c2adec6ac2c26b8e03f3b47d01b08324c6992e4f937f6fb9fa6e32bf51 SHA512 87ecdea7943b2f01b8c7dfbfe2c391cea1825bfff6f3389b53b0c247932a33fad4efe39f86c2777468495f5680c2037938869ecb3a2d9bfc9c6866ff9d799e2b
+EBUILD oauthlib-3.1.1.ebuild 733 BLAKE2B 306e3543d8b3782d93878940837308dc70c35c7c72725ee9cadf12f62e54c1cd709bab55055833cdb94830a5d359c552efdba85ea0ed9be013a5f0ad34e667c9 SHA512 5dc9c415db00516890c0a4a5eb75b0bfc942c8c77598ef0c542e218201edc8f39ef84d4a4fc1c514643f5a085a429796027a515cd1b7c41eb79c9637a9609ac4
 MISC metadata.xml 368 BLAKE2B 537cbafa42a979bb60e657d4bfb49fb6dfa3d6a0c749af96bc4daa6d1c7ad070026d9cd0b089426b0f9a5e07ce609325484f66bbfb9a275b31ca1552acb70058 SHA512 9c38212110ac83cd19c1397ceaa7ec1451e58d41400084b3bfff0ea8afe14ff72a161dd9726950cc31e3ab6b5efb4962356de92f32a3c50e3e61009e40627297
diff --git a/dev-python/oauthlib/oauthlib-3.1.0.ebuild b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
deleted file mode 100644
index d3e0b6c1dd96..000000000000
--- a/dev-python/oauthlib/oauthlib-3.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/oauthlib/oauthlib https://pypi.org/project/oauthlib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-# optional extras hard set as RDEPs. See setup.py
-RDEPEND="
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oauthlib/oauthlib-3.1.1.ebuild b/dev-python/oauthlib/oauthlib-3.1.1.ebuild
index 3695af141ab9..0f8ea8ae54b8 100644
--- a/dev-python/oauthlib/oauthlib-3.1.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 # optional extras hard set as RDEPs. See setup.py
 RDEPEND="
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 62828d3ee95d..7f343b76787e 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,3 +1,5 @@
 DIST openstacksdk-0.50.0.tar.gz 940210 BLAKE2B 0ca7740206139ced4e8fc761cee90c7b1d3a31a6fd64afbe1de9d46552dc6fe206351854a80f4e56d5a2852ca9c2714f8e8001434fafc39e16c60b8c5c935323 SHA512 d0e69ad046712d3d54b4e21faa20627faf96d633b1eeeac09c3b9c129a5912883f22945200b65233ff8517c67dab4c6eeac73817d2fe543cc5ba05c0d751e157
+DIST openstacksdk-0.58.0.tar.gz 1021818 BLAKE2B 530ec940b958d5c9b1a1caba71716201172e1141ebac208b26ea512732be152ccc6e928d20e38964eb455ff47fd6f42756d3f9af19800a45104b631d45d312c9 SHA512 94bb317e9f79ab419e5a0e7def4510d6686e3b8585721c15bd1f03eced5e8f45509cf925ed2b3e51a19ecd2d3e28469343cdae5a3df549f35bb61c448add5caa
 EBUILD openstacksdk-0.50.0-r1.ebuild 2638 BLAKE2B 21a753825ddba3277859677193c846e5d020a7a0068bbd0cea26556c20b91a6e45cde24d2ec2f232c87ea17c50ff78945ecea8c6363d328aa5bf88e72be73749 SHA512 1f38aeec5277791395340e3730da0a3bd9d136b4a97cf9c0e62849746a01b0f4e0a1c9cc568c27102a4651eadacd57e66f6f36b088f5c0d31fdd1e010e41c9ee
+EBUILD openstacksdk-0.58.0.ebuild 2641 BLAKE2B 9822fc8e057fb026eb11d4e46b5a5e9bca38e955234cb55579b1aa197d73f7b508980e5ec4baa799e7fe2173e56b0afea7ce066e3021c2b901ad6d2375bdd9fb SHA512 b55db7fa0b74b3b13f9c5bd643e0e37ab2ba87df9c26120091f7fb0db26883d1425914a27848983c16aa65e41daa1e8c5a4662f475b8501cca6e7436be38db62
 MISC metadata.xml 523 BLAKE2B ebaf30ed0d1a7740cf6ab3d1c4166d425c52bc729aaf44984905e658dc6821756c6d652dc3ace972e0ecff1a3331147c8d016ef828f99c5fe3c1c559cec92b23 SHA512 82035e25a5b7090fa89cf36e623a972de79884ddbfdcbc3d425e989230a9e0a458048cc352f353ff9fa4c7520cd5c4d6da472862dd919c706839661499a4540b
diff --git a/dev-python/openstacksdk/openstacksdk-0.58.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.58.0.ebuild
new file mode 100644
index 000000000000..d6cfb7dd5331
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.58.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+RDEPEND="${CDEPEND}
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
+	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+
+	# broken with the current version of dogpile.cache?
+	rm openstack/tests/unit/cloud/test_caching.py || die
+
+	# TODO
+	sed -e 's:test_generate_form:_&:' \
+		-e 's:test_create_static_large_object:_&:' \
+		-e 's:test_object_segment_retries:_&:' \
+		-e 's:test_object_segment_retry_failure:_&:' \
+		-e 's:test_slo_manifest_retry:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# unhappy about paths due to test runner
+	sed -e 's:test_method_not_supported:_&:' \
+		-i openstack/tests/unit/test_exceptions.py || die
+	sed -e 's:test_repr:_&:' \
+		-i openstack/tests/unit/test_resource.py || die
+
+	# functional tests require cloud instance access
+	eunittest -b openstack/tests/unit
+}
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 2d03eae23442..dbb6a489d6d0 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-config-8.3.3.tar.gz 154910 BLAKE2B d9d3d45d3f9bd191e2be9ef277719d723c35d36006836b2803dfa973283432745d6f11c7d764f2cf4a9ce62098cc0b94ba6aecb364869fd8957ffa309d47bb38 SHA512 6071fbcb4f9e641e6914d676bab3f58cd9e763219bcce0f7de16017a4e1d3a16fcf4296a36c232ac14d8c5c4555f4c433fedc1811e505e62decb0400a9cc2a7c
+DIST oslo-config-8.7.1.tar.gz 160536 BLAKE2B 71221141226024b6e7257c74afd082f297980bd45091de1a30c526d52c5514b970983c9389b82bb49283ef2176b7fc408f4b7f3fc29f9d6cdccb513652b7bee2 SHA512 a76995ff12204968fd9a52ca2922a89039858392b21befff827bf02c3466e365251d90e2d02894a50bece32751e9f5f86a651768665f404de2d3a438e53f158d
 EBUILD oslo-config-8.3.3-r1.ebuild 1343 BLAKE2B 278b0a27e97fbdc0e6e117053afaed3f491af46e2bdac48c69274f70416c763fb5245c11b3e0f7f874c00cabad867b5b19649cf371d9a989c01183d166f991a2 SHA512 32697eb830aba5a94120174b00eb3b802424cb78ce701063ea9072fdf7e4b3bd5664a40f72163a5827d2413fad1086bb4340faa12923b4dbefff6721ccf3dfe8
+EBUILD oslo-config-8.7.1.ebuild 1343 BLAKE2B 120d5d58bbc19bf4971c347f00b526de9ace49a563e20980cc5431308dad26e9e623db2bdebaed3d122dadb29edf78ad6f082dda4e567cf80c6401b977d36aff SHA512 b60eece73c43e521b25bf4987d7b505ad3c2ae76ba1c0476b210ab6ca577fa475b079d22d0f334f52598bee883fcdd5a3c37c2d843a2f676df796f4f229ef1f1
 MISC metadata.xml 695 BLAKE2B 0212d67590b4a45c15ca718cb088f52ef025b3fdf4327363d8cfafd705d06ae56cfd5ae8ce9b42bea04399398756ebcb7572495e5d470d2999a69a6e1a74369a SHA512 3ded64c073be245f2087840a098deece2ee6f4b84a7e412ee9a4c0cfbc72bbb2622dcba4912fb714dceb6abe025204212fd3c8861f68c7af3e6e8f1ba78520f1
diff --git a/dev-python/oslo-config/oslo-config-8.7.1.ebuild b/dev-python/oslo-config/oslo-config-8.7.1.ebuild
new file mode 100644
index 000000000000..e0f0e4b92ca8
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-8.7.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	local -x COLUMNS=80
+	eunittest -b
+}
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
index c9cb4686a265..3725c604f79e 100644
--- a/dev-python/outcome/Manifest
+++ b/dev-python/outcome/Manifest
@@ -1,3 +1,3 @@
 DIST outcome-1.1.0.tar.gz 18675 BLAKE2B eef22274bb4d1ddd19fa223167b6c8ce96f015ac0b3b0609aed3717deb306087457ab068fd2466d492fcc5859d561e6d3172ad14611a937ec59a75b604565953 SHA512 65de1c0a38b8cbb041a9fc3a79518eeacea54ec87341846ae80a9a2075369f72a397f5aa747ae179eaac8f341a7e07cc1641555fbb809cc7924b2171f7f3d90e
-EBUILD outcome-1.1.0.ebuild 727 BLAKE2B b31ac8c4de40572b2849b733afb2c6dc604921904a244b23059d8d2d725326acbafc0934983951858c28ac7091a39875a32e1f0b68a8be0e164fe856e9e6c8da SHA512 4800e54fecc267401fe65cc6b8b66f8403ada73a72988d4b13ed3aab03d75a19ea6abdd539f1d0651b5a5ef5a0d0a0d32dae92cd0ef9420a8caa98cda6ecc001
+EBUILD outcome-1.1.0.ebuild 744 BLAKE2B 3d89e842c1157a56f4c9d8f77ef18c424fc6112642a5d41a59b885a04a986611da992a6938471099264016ca8444184568bc9303089d31c414b292569d929d7a SHA512 f2b65755315d0f0b219bc52ab8abffddfa3d2781a1dfe1d0e5a21a4729a7eca87260bbc48308c83a58416670c97bb3aa2a383eeba49ba921535d6b64532d7267
 MISC metadata.xml 412 BLAKE2B a6981a62dd453c13e7568abd6842a1e800ac403566f6a719bde8eb2cf39e85d2d23790af491e44e00219937e8ceabda6203b9a9bb94ace8b42a3b1df9303607c SHA512 ac1240cfa6facb9a0703052eedad4b22c7176a7f1b6b191ddc52b80a9de4087c5edc910cf1c9906f5ffac0d74f4b6fac18cab8c34d5f478ce6146aa78768ad0b
diff --git a/dev-python/outcome/outcome-1.1.0.ebuild b/dev-python/outcome/outcome-1.1.0.ebuild
index ed7fdd7e6c1e..5a68cbd75ae8 100644
--- a/dev-python/outcome/outcome-1.1.0.ebuild
+++ b/dev-python/outcome/outcome-1.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 
 RDEPEND="dev-python/attrs[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pandas-datareader/Manifest b/dev-python/pandas-datareader/Manifest
index f36595a4977e..36b970223539 100644
--- a/dev-python/pandas-datareader/Manifest
+++ b/dev-python/pandas-datareader/Manifest
@@ -1,3 +1,5 @@
+DIST pandas-datareader-0.10.0.tar.gz 259641 BLAKE2B b8a5c7aaa76b30abd9297c820638731fc5d81b5ee2cd1a016c1d8d10dc237708b913a4ec505b9a703b02f470413725f58fa4cbf54ba70113bfae5d0ffb0875b9 SHA512 b078122c6c0a614aa5b55151446b830dba64382b0570761ac80baaf362ef8121fac2c4b53b8cacc367bf985ef1ecc16d44041f1d1f4b13fc1024fe6ab74f1d0b
 DIST pandas-datareader-0.9.0.tar.gz 261026 BLAKE2B dc8211ceb718124095896dce9de0d752f2c5c7bce022dd5197a6b3851ad8727e298b34d0657f76c9c40ca31b1cf76d8a467af251aa9131f921990e6f4f9ec25c SHA512 5ef2e06b6d02e2bc213387f8649e02c9ebd6df679da8ce433d4e8dd2c66e8cbc214a9cf9a4bc83ac2c7ad917cf72a9e6b09c9398623718736114efdc2c3e2815
+EBUILD pandas-datareader-0.10.0.ebuild 1138 BLAKE2B 521dc29343e42285a89dfa11cfefe32b63451a4711b7d13727f7270c8327485cdc3609e684b45d54b31d6fc2a14d58cec87aa6e6f7af6edf9b380fa73103003c SHA512 99efb1f1ca2111feb06c482d24dbb6f405c9faf8adafbc4e8166500c65d45348ee1bb24b3959a0b9a53734750a4bb1f5a26685dfc78368622641492ab1c75660
 EBUILD pandas-datareader-0.9.0.ebuild 966 BLAKE2B 4c6f49be7b8b57dd9167046d665109fd45fe96889416460e5fb55e012dd0c4ba03c05a65d87bad462336fd4ac17a7d564869e24cc58c883c3ad85d9a2600ba00 SHA512 1bb64bd7cb35e8f80e3f54a86737fee4222f2052944ab6f31a63a2e5891ff6cdff59ec181ddfa5674cb1535d441f9f72c95002a45b42d05702457986ec314f6e
 MISC metadata.xml 778 BLAKE2B aefc06a42b2978ea58cbdd08eb89421205280459a539c6e98ed2f4930f8f9f790a2d2a79a10efa25a6fa65a932cec64a49cdd0bf64c78b79951d8c06917db7e1 SHA512 e5e31c35cd34c82273cde55dfa51b0513fde2c4e69b6db9c2f0c83d8cdf53b85f42dc02ccdcfcead16f9e7e5d457f598096056a88b6ce419c30b645737170698
diff --git a/dev-python/pandas-datareader/pandas-datareader-0.10.0.ebuild b/dev-python/pandas-datareader/pandas-datareader-0.10.0.ebuild
new file mode 100644
index 000000000000..854753e74aff
--- /dev/null
+++ b/dev-python/pandas-datareader/pandas-datareader-0.10.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Pandas DataFrame extraction from a wide range of Internet sources"
+HOMEPAGE="https://github.com/pydata/pandas-datareader"
+SRC_URI="https://github.com/pydata/pandas-datareader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? ( dev-python/wrapt[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# looks like minor numpy incompatibility
+		pandas_datareader/tests/yahoo/test_yahoo.py::TestYahoo::test_get_data_null_as_missing_data
+	)
+	epytest pandas_datareader --only-stable --skip-requires-api-key \
+		${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/path-and-address/Manifest b/dev-python/path-and-address/Manifest
index f81536eec6c5..f2843b35cd31 100644
--- a/dev-python/path-and-address/Manifest
+++ b/dev-python/path-and-address/Manifest
@@ -1,3 +1,3 @@
 DIST path-and-address-2.0.1.zip 6503 BLAKE2B 146e73b5b54ea536f8b94da8ebbb923441564cf2137a55f3938552493b6fffe28c4e90c908a3fef2acb55e76f320519c7f59c0b2c99f144ebb29ca90d32e590a SHA512 11b2352389662412451e1e9f3e2997e81d36acbef7ad18c50328b9e9bb395f2f5fc8bca988ef14a7d9b76f5213cbfa17bb82df0e00f6989671181b104e4f1406
-EBUILD path-and-address-2.0.1.ebuild 464 BLAKE2B acd139fd4d711c5b2557dd04c8b979f70d734819d4729b602c2f0b0b2de9388f628c6c247ef1abaaf2888f625fac6bf82a23b7ebd505476ad8cd99f29ebf01a8 SHA512 b5b5230971f9eb728c6345b2ecd2799517219a45cacad7e114c1599ffb3924223ac9e25d5896778f2186c5582a2dc9cd7939dec344e774074e4930378f37437a
+EBUILD path-and-address-2.0.1.ebuild 465 BLAKE2B adef4b81ad264173fce2b832bf2f847dd8ae447321addad0f940ef11384ea293a2863bf69669e6faf22bcd6b7649e95409141e51e38acb74d0963d7ae01e4925 SHA512 8f6baa7b345a8904a0bf7b1244e9e4ace6d09e3fa0076cab06194030fddd000a5b2ea7b27cab9ed4aa3a0ad91b70d5b06285992bff80ac2c9a1a9b61473c7be4
 MISC metadata.xml 483 BLAKE2B fbf94e2696f78ef6fcc6896681f099a6e24544c731a713c3c18d40de6b953c42a26aafe1460d2472d4f7666d137f50d8b250c4fdc509b2b57915d1548f2c44bd SHA512 ed626cb3c0d04cd78d5c9feb2148da4eb14f7101cb1c38b3563976b7e4ca62a14a1310d35969839a2eb239ba6584512f8479e0e5ee4a859b9902a2b22adc13ad
diff --git a/dev-python/path-and-address/path-and-address-2.0.1.ebuild b/dev-python/path-and-address/path-and-address-2.0.1.ebuild
index 3d9dabb3977b..f592333b0391 100644
--- a/dev-python/path-and-address/path-and-address-2.0.1.ebuild
+++ b/dev-python/path-and-address/path-and-address-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 34acdf5b0697..702340202673 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -2,8 +2,10 @@ DIST pikepdf-2.12.2.tar.gz 2301822 BLAKE2B e600ab0809c44ba3749440ae6820761e28cc2
 DIST pikepdf-2.13.0.tar.gz 2302937 BLAKE2B 1a46cdf25badcc1d00dde22fba7dea837dde902295ccb3215d1441c5838acb2744aedb1696fb1fc57d55752bee66387bdd968695a6b3dfad5614c352d57366ae SHA512 a57188f420f93fbb00aa4df9857df0c64aade057639b1e1c126cca2da8b57d7be34117eae34038b5e873a8d65c5332f3f3f2f1812e7e748647ee657b8eebf78a
 DIST pikepdf-2.14.0.tar.gz 2309588 BLAKE2B ca0af8ada258742571afa1133ba5ea282ac7a44dd34b5ebc24091dcd36629ac97b1c7b0e7e65cf86f0933a13423b9b5011d53ec75cd7b0bd614917443e72b793 SHA512 3b6c61f14581934aca2293b1d42be1303234209bd5fdd24216db57df765470591d5252b912de9b797f885cbd52ad610666d86ddfd1c279b97b1058cea36eb378
 DIST pikepdf-2.14.2.tar.gz 2310009 BLAKE2B 1afddc090e8e92c57843fc25cd7a6c8ef75e4f9c46144b10e91a96747b0a800a38715ace4d9eb5a65944b4495531417e8a34d7c34e1136f04df6c2c359ac2771 SHA512 cad165078bb634d6e5202ff71ab8d11f89a47974a3dd33c237b804f2784582b739bebfc6ed99664c98cf274c16dadb718a81d95710827be711e7d7d4c9ce5f77
+DIST pikepdf-2.15.0.tar.gz 2310862 BLAKE2B b511f9e721174c28898ccf0a00c84162b850b911a08815f400ba7269a9860dfc4b77b311139cad30fd6817a09938d360f8348d9d42a5bf2cc72e630523835644 SHA512 d43cd5759d053416ed4ac84150a979175ade970ad7f3128641549690a47113656739694af0589ba9f7202410be08698e048a38525d9ce108090283d9f1546ff3
 EBUILD pikepdf-2.12.2.ebuild 1539 BLAKE2B 512ea496ba803b837f7ba7b9f717d3c7a4ae73c964d75048b5a6acb45b84a164a9dbb6479bfebdf4af82228ea9c3f70796678fe225822c053f36fb14c29ff17f SHA512 cc27ecd60eb8f31510ede37812de3d7fc041b9eb949cf4fcb3aa30cc486622d246b95129ee61d4cf6f8161ca06af501c5bf1b3b20530b712eea94cb191c3b08e
 EBUILD pikepdf-2.13.0.ebuild 1540 BLAKE2B 1e014c04828884ca9a5ab88c5a3fd1d1ea659c2a19662bd004a113846dbbea53f9fdb3661ce0c466c8b5b1470ff986bd1b63b1532571fb9ab485dd56b8c40fcc SHA512 1e2e6a64cce57d741d512f44cf2b325444d261c337b986fd1ef1eaac8cdc79f3a6d2a496b83a2a60f75ee242cd34ebcb7c02dc5601eaab3d663095fd3c00e0b3
 EBUILD pikepdf-2.14.0.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
 EBUILD pikepdf-2.14.2.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
+EBUILD pikepdf-2.15.0.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.15.0.ebuild b/dev-python/pikepdf/pikepdf-2.15.0.ebuild
new file mode 100644
index 000000000000..2e4514c389e8
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.15.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index b6f1fa0438d2..678fcb87debc 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,8 +1,4 @@
 AUX pkgconfig-1.5.4-brittle-tests.patch 546 BLAKE2B d80db0a12eee8f2007075015a46038beb3674fd89cb57105f7a0c2d8164572a3aa45377bc52a3937ed25b4eebcbcfe7bb347ca56bdc0db5d2f01901454fb4dc1 SHA512 f45782fb5330cf218b9550375f2b8f35ec82ca6bfc8a3963736a7cfbdac06a8d1fbe979fccbc78caecb7f5765f46e07f28cb3333f32f806825de2bd2e4365684
-DIST pkgconfig-1.5.2.tar.gz 6984 BLAKE2B 1d3b724853498505ef9f60de89b9f90e049334f42451202f07f29a0dc5efc21eb13045afebef3d20b0ed0bdedda053eb37ccbda0a8977febb408d3c69a2efb12 SHA512 7f457fd956f2b4e2580433311d166dd5537cafb95c0842a85f69bf84bbbde58861023acb7d221383b4306ec0ce31badc0481b2394b3e737de0db2e194c5e250f
-DIST pkgconfig-1.5.3.tar.gz 7310 BLAKE2B 361439cadf3f21a76d379a8b7eede9d2c73fa114c5816e8964b7086e867ca0d089dbcfdc219ea0d481934940fcf0a0ca2398b0850448bd3e577befb1266034a6 SHA512 00cb148977fb2b25d747ab1aa8d99deaf250df67d8c3ec0f47160714aabce4de3d96cd43e7292a8e4ccf850de1aceabc96d5516995365da088e00a731d538c24
 DIST pkgconfig-1.5.4.tar.gz 7323 BLAKE2B 3edc17a5491d788e23de875fabf01482e88d289b2376b4594c0a62fac5b761974c1b6b563f12862d202aeb9e63badb1cb105aebc9ac22b813f36d46952459c0e SHA512 c50593427122b24d3328fcbdf0d13eb9ce3ede068a23cd7c43d19a518386bf06ba42ac07d647d69bfda056baf8b6549955f9dfef78d785e64596833c4af5b831
-EBUILD pkgconfig-1.5.2.ebuild 572 BLAKE2B 89b889d939b11616e7b5eca89bac2d4277c33aad92b2ec2779825295d77ffb4e73b1eabf79f98a6d06647e3aaa4199d030288921bdece66e477239e916c099b8 SHA512 f0211e5cdd45fca40cf84116f84ec8fa68ad135d821416e7f0b36a5e23d9754904889df7ed9c73739d0d888e6d44673104b30c71f971c4dc60e2f3040f83b89a
-EBUILD pkgconfig-1.5.3.ebuild 576 BLAKE2B e2f64c528c8600a2e8b3a2022b60cddf4357017f9890c59a70b3abb21d0e301d22d747df3e731d39a41e8df3631a22dcfd661f2352c0604af85de0fdb628ba9e SHA512 6900df90c589879f31e366b28e1f5200ed1675a3385c936b705518e9181b391713b6647f3a4d90da9fc78e7ca427431d6a3f65445dd5d9a8193fd49f3c215243
-EBUILD pkgconfig-1.5.4.ebuild 628 BLAKE2B 3b73a5fb811d22156ac8f0f0353e805cd4243d5e748dc9f55575991807daf83b296671110d14667661922b5f6eb9f3af0f2cca2dbce06724b5dc98838d89e0d6 SHA512 8977cb9744c51d3c7931a19a3c6f65e31939eea3ebe92271996c83d1faa3cd9e4cac4c35a39bd0a85948121a133b6958bf92a570cd1803ec6ce7681b82a13de7
+EBUILD pkgconfig-1.5.4.ebuild 624 BLAKE2B d76cf08bf29092890e079aae24a2897015108ecf1618dde8b5f1d0da98242cebea18b33e8f8cb5ae52aeb714915029be9b712818c5375ed4e4a71fdb64cf81ff SHA512 206832f16380b46d2df65b429eb6214ac4f09d14f4fff9c3de435d5337dbdecc92fb2bc8019115c8216cf204921e358b6bb8d2ccee0057d352ef0256dd1e0023
 MISC metadata.xml 404 BLAKE2B 4bc0c1973b01332976f22eac000dcfaf395345073577b6e4237bf80bd7311b5612b33b6fa4a64dbf8723c853a6944d3c936a7dbcc4c3a77d2390620ff33850c1 SHA512 a89d3d1e412813a81ba120acbe38262ae38a25d73cda8dfde458299f2bc8685c67f0e7ca2c4e5fe1ebf4b5fabe05ac491aeb153280bf73294a48ee10afb290b8
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild
deleted file mode 100644
index bc417b9d0993..000000000000
--- a/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Interface Python with pkg-config"
-HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
-SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="virtual/pkgconfig"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.3.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.3.ebuild
deleted file mode 100644
index 829058f080c5..000000000000
--- a/dev-python/pkgconfig/pkgconfig-1.5.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Interface Python with pkg-config"
-HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
-SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="virtual/pkgconfig"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
index d4c0fd9d2b37..6a2f42edda33 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="virtual/pkgconfig"
 
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 463a31c98d84..783b0c32a98d 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,5 +1,5 @@
 DIST pkginfo-1.7.0.tar.gz 37209 BLAKE2B 70e2c7d69d4b9b5544017c0b0c388e375060f063a35a3467a420d8819d77eb0e9772735db78c0ad03560aa9e35dd0485945517f305056bd52d435e2462a3878b SHA512 0e41899fac552e6a3c401c7dab3e3cd57f31cc5f052e07537f15b699c85113800edac27d232571ecab4852fab1d73374eca381d1ab70c9a7461bb422ff03de3b
 DIST pkginfo-1.7.1.tar.gz 34280 BLAKE2B ad928cf80423977e5944e3110150afb3e5ae416bf1fd28aec8099c3f25e41956b49e4134cdee5e0621e5bdff44d7161c3b1783b3c6d15555eee86e2e14c29fbb SHA512 5b6374e45e7ccd68f3a28145c2fc350e630e97fcc5e97d46d05c32f0958a51e4713487b809099ddf0a9ab07840f7fb4409438ab7b7a9b0b05e94d292088b2c26
 EBUILD pkginfo-1.7.0.ebuild 670 BLAKE2B 31940e10fc7ebdc0efa3dae6b747ba2aedea057fa544202a2a2145586fe4a6a1a7ae66ec5f7ace67442379cabd2d9adc35710076e1f55de56459be8bbbb68d41 SHA512 affe6071bba09aa82a2719e42906a03a7c4c3343039994f1c5b2303ac0610b8f07343a6ddd33f0d2660e450399ed7b47779e3bae4c5768e0c10af138b4d2047d
-EBUILD pkginfo-1.7.1.ebuild 535 BLAKE2B a43378212cf468144387af910720c1dfc997ea732de2df69f515b0074ab7c8977809f40f3896f09ae819110e642719a65b828a599b54eef8f76f53d3f919eed1 SHA512 4baf561f206d8230c5e3fc3ade58fcf5a0bb07b1ebbdc7e26dd38969cbf2297943c928551d2a2e98b0e4cddf179db6c78a23bdc9fe494d169d1f260352f55b9f
+EBUILD pkginfo-1.7.1.ebuild 542 BLAKE2B 06699f587be520d7915d7981a586692ce110c2df7237810640b09bef0ae028dfb19f4f6ba09bc218dc40574f069b170ac730308ed73b64a397497181cdcd2d3c SHA512 5432fb0dd569c2cd7d81ef65c0b80d08b783236b8a6d2fa675bbf158a2abf046c972719687a1ced60bb9b0ef1dc9d36d10e49d222fc05698c884b910aa0edbe2
 MISC metadata.xml 345 BLAKE2B bae902e9e5c7357ce7df1d26ddb2c4c81ca0dbcf4d17eeef7127a49cc4a17794ba29483049ebd5518df71e18258c4ad375a90e0bfb2052fa95a9143431095662 SHA512 f970952fd577c2baadebf824932c4e825d962a497d7f41870a6d51301a5776d22809b923efcdf2ecb38322e4c53e11dbeb5083660ff0f93a3c301a88bb807151
diff --git a/dev-python/pkginfo/pkginfo-1.7.1.ebuild b/dev-python/pkginfo/pkginfo-1.7.1.ebuild
index 3e5a9ac19e76..eca35489b8d0 100644
--- a/dev-python/pkginfo/pkginfo-1.7.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 distutils_enable_tests unittest
 distutils_enable_sphinx docs
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
new file mode 100644
index 000000000000..d8fd843e8ae0
--- /dev/null
+++ b/dev-python/platformdirs/Manifest
@@ -0,0 +1,3 @@
+DIST platformdirs-2.0.2.gh.tar.gz 11365 BLAKE2B 53257c69f26dde3a0031c991cd6b5c72b361084342617f5c0590007a11a1d7d6e3c925dd6a8d73d3553cf1cc1d2b9fdf74fd0553d6b8891ef6b21d64bc0e256f SHA512 7cdfbcb4e37f2b4b551f3d685a40780518f9ba9c333cef0664965abaca320a10f6e944f967c0b0ba2d00e80df04b0e1e03426e6d1291e28d8f64128f50ebc1fc
+EBUILD platformdirs-2.0.2.ebuild 594 BLAKE2B 6ffbd439318d426e4d929c4f06370e6bdfadffeb90650594f1091af512f6bc1e8880f64a05e521d79bd407b66fb0f8f7fd3264c01ac8be79212b1352c8ebae81 SHA512 ad6637b33ff03b9f3af792f45fc090dd4840069911e85996b3d5ab874e54e0e9a3235536904bfa945c88e58b0b9308d04a838e31797873ce8e33a200e8245bbe
+MISC metadata.xml 358 BLAKE2B 59aae3db7ff7375600e504797a7fe4dbd4c0119d5b3fa31ef523854d8a8cd54ee60131f9bac4f608dbb5740a1e9dcf27d47cca75c7c83de4850600eb02aae2fd SHA512 09d5618647fdc5104705ac94e3af0a3bac586e27105f95d14c827b10265355a53deaa66483c12567596c2c4e8285c1cc0520f5475a1404aca3b1d677792d7654
diff --git a/dev-python/platformdirs/metadata.xml b/dev-python/platformdirs/metadata.xml
new file mode 100644
index 000000000000..37b79471151e
--- /dev/null
+++ b/dev-python/platformdirs/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="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">platformdirs/platformdirs</remote-id>
+		<remote-id type="pypi">platformdirs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/platformdirs/platformdirs-2.0.2.ebuild b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
new file mode 100644
index 000000000000..854f3231a6f5
--- /dev/null
+++ b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
+HOMEPAGE="
+	https://pypi.org/project/platformdirs/
+	https://github.com/platformdirs/platformdirs/"
+SRC_URI="
+	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/appdirs[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index 9d81cf2ff426..2b8df63e6bc0 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -3,5 +3,5 @@ DIST py-cpuinfo-7.0.0.tar.gz 95887 BLAKE2B 8f5764db94faf41dc554353ac2a21416998ef
 DIST py-cpuinfo-8.0.0.tar.gz 99791 BLAKE2B 95024b488142e3bbb2eaa69ffef229ac27f1cb55e297fb8de050ec4c410c1b13dbf674936365d84c5c473158338dd047f6dfba58c2a7dde4e21232af356ab20c SHA512 77351f9f2fd33b09d0ee998dd2b3eb971bbe9094bee5636356d5a5a2747ebba3c112cccfdf929f77e3b7de3c745f98ecfac8edeb0d84fede100b637b554d4fd9
 EBUILD py-cpuinfo-6.0.0.ebuild 528 BLAKE2B d600632563dda508e9de69ef4120651646b82a9c919051261faa6b2e303f6a1ace445a431e7540eb8f3fd9c76eb0588bd1840bce67a626527e96c22a1f1b79fc SHA512 d3a4fa095d1460c345b1b3046c3ab08bce7059d3b6a7256dc52ef5cd321fa93fdeefaa77afc475ee3d4a49fd5a5b979629552add27fe5defe84d31e4df58eb86
 EBUILD py-cpuinfo-7.0.0.ebuild 502 BLAKE2B 8da0ce27db88039ea6c7e12f015433a466e440006b6e24a0d14c8a047b8abaade732757e3a276419b24844b156b4052abf67a3e4f5fc56355ea0eee63a9182a7 SHA512 884577429bf5fb17eec88d51836945657cc6ddb14fb4d693d9a5d40b181ca98e47c20a98d1a9dfcc9fa057a49e7639c8e0c59560fed396c5e51234482d812a00
-EBUILD py-cpuinfo-8.0.0.ebuild 472 BLAKE2B 746a00ba70302348cea2d27a1da56957afac8ab18352cce15c67e060773af44584317089d171fef08494e813fd6810f9e1cd61077186c67bd876d780ae6ce80a SHA512 1358d618a32065cde3d86609bee08ec59def01c8d31c1d09b2ba626b53749c598936fbcff069ce7ff5cefbbd822eabb1edc13c4866f1cfeb542926b73e130104
+EBUILD py-cpuinfo-8.0.0.ebuild 479 BLAKE2B 42b5bba08824cc62f278a9045f6e8db6b33f04abfbbe9fe47ebf04b51fc2face05a23577e1bb89200c50aa51ab4ec669e7ee60de06b188ea6defcf292e29827b SHA512 30164a051144fcc2d4f5878b1a789459414fb4341d4d567126cc1725004a42618650ebc7aa7388a25f005ae7882650e2e72895210551947e5c1fdd93f835eb5f
 MISC metadata.xml 531 BLAKE2B bc7a99b8d7291478da528dfaddf83ef3297f97ed7b1516a81291f36fe7387c7611b4ad84cad47a16eed622a1976e6e418dbc7a2d9e4a853ecd60bc991c1ee438 SHA512 e951485f6fdcbfb48512aafab5fa3bace39dc72a327888de2e38dc209490a5d7e897974b45e3fcff3fac965cc1e283a8a2bf15ceee131c5a48dfb593044928d7
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
index 6fa77056b701..4fed92486e6e 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index a502a5bcb3eb..bb47c1e5980c 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,5 +1,7 @@
 DIST pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264
 DIST pybind11-2.6.2.tar.gz 647954 BLAKE2B e336d626d314538123a121d48998b15d9d16b80a6a513e85b4ef2b3179f73732ef23b85ab91d815f15c31f7e2c5091192e90b9ff8e727725882963a895367612 SHA512 1eb346ff6b8f827053265340925e2c8038b1e2a89c352fc09f15ebe86128e7ba1f48c4368b193941f034b30bee7f72a94343e05d4841fdbbd0e4d91ed3d32025
+DIST pybind11-2.7.0.tar.gz 666200 BLAKE2B 4f78493ecbea5068dd9ab6771c9b33859baf3e14a82a6a3b361a11620ce6495763f94acca0c0a9512fa92343fa2ff91fa3e2ff7f30731bdda823b2b3fc139302 SHA512 529596c8762f463868f942ca9c4d3e4ed141bc09c734defeeace2b0250234c3359ef1f231997389fbffca849e01ba1feb8d7edc385745b6d964771aa67ced720
 EBUILD pybind11-2.6.1.ebuild 1161 BLAKE2B 7659fbed755e30d43df45a866c38f04aebfb31522b2af3985977eba7a60789fbae631d404165610aa1968f0c276cbfab41e56a158ffdc32a7c47bc360bda2bab SHA512 1484031b362330e62f4f7e7d65ebcc2bc4473aaff5fff1c7e9ebbf67d914982074490295e640625a9cbd198e97334ec6814e5b52977af04285861f94fd41a461
 EBUILD pybind11-2.6.2.ebuild 1090 BLAKE2B d257373dc4744344f2e862ae70e35e620e4af9b0947e53ab16255b5d3018defe9860f48f6b72952ee817c7cfade63b3153120500f0a0558553ed5ff7bd39837c SHA512 7ab5833a1cf3a908a0b20ec135926029738a44681ddc346a4c0a5a220cd9ff850bf7ac2739cf25a996e714cc7e34e5ffb604378c1a76dfe0c8f6057e01d75415
+EBUILD pybind11-2.7.0.ebuild 1093 BLAKE2B 554211e048af6889ba187b6685d374cd1784395c8a5b87c30a04929b967987ea0cf7c2c8fa0dacf218dd5b7621d871ea77e2982b20f21a9142a8de88236e5d3b SHA512 93d2a3fc91065335b4e6165c910a1e5afd553f7e295fe67da427f35fb744447b0cfaac413f58a7be60e2d22be5d3f955a675353fa5c1bed834ec5707d9c8ee68
 MISC metadata.xml 419 BLAKE2B 4b76037af5a23b231241e9d53f12dd3866cb07811888d1de3e022d3ea812a83a17856107b257f608343aafe763975cfa621061e225c7ecdcc175f3bb0b8a51a8 SHA512 b17fc1d7231812f22077e7feb0400a3c1e9b66f29c125457b5cf568694ef35332d83fdf405d6c849df55e1f0e517a8c25ecd6f24d1d67ca6654cae8522bb10a2
diff --git a/dev-python/pybind11/pybind11-2.7.0.ebuild b/dev-python/pybind11/pybind11-2.7.0.ebuild
new file mode 100644
index 000000000000..b477308fbbe4
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..10} )
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
+SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DPYBIND11_LTO_CXX_FLAGS=
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	cmake_build check
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index bb7944768255..9656487a6210 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,5 +1,3 @@
-DIST pycairo-1.20.0.tar.gz 344370 BLAKE2B b72a3dfd3ad6332f6be2c0fc0650ef87d97a51881bd239421cdb6355016e952093f9fa05b7872d7cce4a50bc4bac27ff0fb4c11e446e51ada9d7c1adc019a175 SHA512 d32d008b741653d02324b206a438f5fd85f2a433201d6f8b98c8f1adc712abea611a4b5ed95c55258efb662dc579eed6b2f752b10d9fc2b6a7c8e5edd19e5266
 DIST pycairo-1.20.1.tar.gz 344639 BLAKE2B 7327a1b9aacc62eb7b2630ac2b9ce43ad7a44e60cb749b60a2973fb9036a84c1f3f4264da428d720158a5e32cd47f679d5956ebf3ce094e75d742584a68adda4 SHA512 bb2340170c1d39d50dd8ceeb1b6ceadd96ddbd27d78a8a5b7dadf7dc427558d766f65d62e1ceeae19ab200e7ffb5ad122b5e51daa8ef9bff08fcd97a44005697
-EBUILD pycairo-1.20.0.ebuild 1114 BLAKE2B 9d4513890596f702d48fcf67a67dcbd3026759afd9b5e209bcd4a3c1ac80cd1afe6ee0b513806a4517c6cc4ff683337ef4a561c5cb4fceeb73bed629ab31e9bd SHA512 117dfeae67a2586aa32ad8a14eea43e895cc2ae010516234228c5509919adc3de3ccc1a9034ef05abed374ffb76d74d83a86e0b8c124ec68bdb9b5140e4a02f8
-EBUILD pycairo-1.20.1.ebuild 1122 BLAKE2B da9b18fef5d40e4435a005bc0f0d7337af55feb65b460b161f11430e488cbae83b287fae6270c8ab4770955cb58f3703e445ba4064fe293e868cfdbdfd73e5a6 SHA512 4a3b82e0baebb7b431daf0675648df00781df81e5a80f3536fd66e861f4d4dca8db92c3a0d428d9ebf9531cbefa621dac92932bb91507c30e54ca51559962281
+EBUILD pycairo-1.20.1.ebuild 1114 BLAKE2B e05793de1c1559b8fe2225ca2bb720c4e213344068f827f80e7d68a237dff969891fa9161167989585cf1e40659aa5d1f213203c0b083707b2e143c190a72147 SHA512 731431901ede71b19fc57897224f1893af23daf9126261cc99e661da9c25a0cd04ff5ae4d6f6c58d4fb2218859b493d5f3fc484070c86bd08ff6f21b29c12643
 MISC metadata.xml 310 BLAKE2B f27144a3f463297efa01ba4b6d7198f455c9e62470e56e004cb2cea621e4f1f7d3adfc45099a60fe54d670debd0cce4aa68e2b34e756df8d593a150ac040d97f SHA512 0280f0bba6101b163ec1304d7f8fbc36d00d86cd7ce6f8c671dee74f7931aa363f5887c85cd8d582d4ba0cb78753a61efdbe38e072d68511ba3a66ac36aa490b
diff --git a/dev-python/pycairo/pycairo-1.20.0.ebuild b/dev-python/pycairo/pycairo-1.20.0.ebuild
deleted file mode 100644
index e815623d2dec..000000000000
--- a/dev-python/pycairo/pycairo-1.20.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=x11-libs/cairo-1.15.10[svg]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests setup.py
-
-python_install() {
-	distutils-r1_python_install \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.20.1.ebuild b/dev-python/pycairo/pycairo-1.20.1.ebuild
index 1e68e62256d3..46b6f9bda451 100644
--- a/dev-python/pycairo/pycairo-1.20.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.20.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index aa3efb27fbe3..dc8d67cfdf60 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,5 +1,3 @@
-DIST pycxx-7.1.2.tar.gz 150865 BLAKE2B bbf78d88ca13fafee1239c354167b56cef2f1d56d20b0fc81d9a5d7d82096ab5d6a88802f411719cc490179314f87ef89b1e53c2b8a3a784566f9ff9d16d7cc8 SHA512 67f8d8d1ec6ce63c39695cd56c3276767d5cb4b6cc2fcf7daf5aea4bac11114f5a1fa4784ecdb35be708859cf07fc88c8e9f00b7fc808169708fd0eef1056a63
 DIST pycxx-7.1.5.tar.gz 156343 BLAKE2B 099de7f88c19ec86aea67b503e6fbdc0df66bbdd3bdc0ff7f8ce77425be9486e6abebed8548f9ac764688a85e62cda77d3832f460e5678b4c07b1c6d2123b257 SHA512 0f980298739886d0c05ddd5ee23ebb234014b8276d811e62dc5b0a738666c6a011ad3f4aeeb7b1b404d8bff87dddfc30f68eec9c6bd13d5f262a2f7c53e273be
-EBUILD pycxx-7.1.2-r2.ebuild 916 BLAKE2B 723d0ceac9c91cfb1e804802688a8df7b8090a8c05305001392b002c3e11b234894ca94568ca1fcdc6a9648cb9c8346cd8901b4e8f36109e937a6f82735ff782 SHA512 7fcdaf0ad47fa1835799cba9f2737a02f0de91189da07d25a7301882892314c99de63f4e973a12ecca7491f840a2b01f1f59c13d438b199835e79c9d5ad155ed
-EBUILD pycxx-7.1.5.ebuild 920 BLAKE2B f272ec40a63328845ea0c0b3b126e43bb2cdef89f9d9b9f92acec6c492d55009d9223409cfdc3f22cf18f8989c1b55839c1a4ff35bab09aed285c531521371aa SHA512 8f19f3f9af119f1b5d02641bd449a79e2afada5483321d3c6e4124674931d0c01a06bd870a4617ba1b8130f1bd5842f6ac1625a35b2aa8aa91b4f74fcecb4f2d
+EBUILD pycxx-7.1.5.ebuild 916 BLAKE2B 723d0ceac9c91cfb1e804802688a8df7b8090a8c05305001392b002c3e11b234894ca94568ca1fcdc6a9648cb9c8346cd8901b4e8f36109e937a6f82735ff782 SHA512 7fcdaf0ad47fa1835799cba9f2737a02f0de91189da07d25a7301882892314c99de63f4e973a12ecca7491f840a2b01f1f59c13d438b199835e79c9d5ad155ed
 MISC metadata.xml 666 BLAKE2B 0a8399e3ae824bcc0eb1e3de5975bd8f13784b23e4f46cb721759ac443c814e431883a99c997f58cca0b9cde91ebc483e1723968ade62fb52d5347f8193cccb1 SHA512 4a948f43e4d44c47982f3ad341b60390bd57e1c1aa3eafd0e20bdf1a8bf4f861c446db90bfa3bcd6c7c206220ea3d5b884805b02ee6efddfb8c5dab4578aaab4
diff --git a/dev-python/pycxx/pycxx-7.1.2-r2.ebuild b/dev-python/pycxx/pycxx-7.1.2-r2.ebuild
deleted file mode 100644
index 6054ebaa5c9c..000000000000
--- a/dev-python/pycxx/pycxx-7.1.2-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Set of facilities to extend Python with C++"
-HOMEPAGE="http://cxx.sourceforge.net"
-SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="doc examples"
-
-python_prepare_all() {
-	# Without this, pysvn fails.
-	# Src/Python3/cxxextensions.c: No such file or directory
-	sed -e "/^#include/s:Src/::" -i Src/*.{c,cxx} || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Doc/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r Demo/Python{2,3}/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycxx/pycxx-7.1.5.ebuild b/dev-python/pycxx/pycxx-7.1.5.ebuild
index 24dbb09ec861..6054ebaa5c9c 100644
--- a/dev-python/pycxx/pycxx-7.1.5.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="doc examples"
 
 python_prepare_all() {
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index de79ce1060ad..9121758d5256 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,6 +1,3 @@
-AUX pyfakefs-4.4.0-py310.patch 10794 BLAKE2B 88da28df915be0fc9416972238dba6bd109eb8cf91207db609a0c5cf7a7377d0c11ac5da8a262306713d941657183a4780d8b919b796bc555faaa549dc229938 SHA512 a3a84c09c55feb27e375f04d8950b6dfbbe48e57f41beea3c799f278f82a9cfe9c1ed6af1a4f2a1bb3cad8b421a6492895d6f29712be81ebf69e1c1330ecc36b
-DIST pyfakefs-4.4.0.tar.gz 196236 BLAKE2B d19fb44320d9c7eab1e97ee4123da548f1e3b2f8f6b0e3be762b6228677fa165ed1b60364481c53f54e79e50a2f98d298e7ff6e65f40aa9c4e372a0f72e19d52 SHA512 774e5e213ee8ce17759cdeaa4ce1d70c43df25f0885c73c7e8aa923973a43f48d9fb19d45105a6a5c5d1c6a0c54c22fe4d80ec3ec92ac7cd97c50fb532af90bc
 DIST pyfakefs-4.5.0.tar.gz 198107 BLAKE2B ee055ba5e5b53fc91cfb83a29b6fe77f6ea89576c1f3f13e46cd71ddcfe81630f3639000de1ca14bd9a56bcf4a09046fce313f65722327b63098142e5c0030cf SHA512 24a4555b197d089c2a039354f693748415035a587d0194d7d6494b83b507db2dd7e34f748fccb18f151b2673f06ce290fab02f6eb56d2691d5ab72ac12b2b233
-EBUILD pyfakefs-4.4.0.ebuild 753 BLAKE2B 5e24605cbbc6f544344db431610089413798bbaba684b9b21932a6042332c103f8a28eb4bc80c9cff440ec434c9c55f532c20e046f901d64311432dea63987d6 SHA512 1a70326d1c5c6b456536e5987060ba581f4b4a5d0a9b147ef8e3e4d3a8f16879d91b3c06b2403f633fceac948da06609696833d390b2ab48e681501eea67e4d8
-EBUILD pyfakefs-4.5.0.ebuild 716 BLAKE2B abf1044d03473c964214f5f7e36cf36ea3390b486d54c6b078a9963b740e6454f0cd5cb94b50049c27046c3227725194ae7efd46af2e0800f26f3b4271d2ad0a SHA512 0d5a6dc807f05881c63147de4478cbdfdb5e7616e10ee1beb39c3590913acb3cc1d9be50968d592d917018403b1835b2759b9ddf8c3d37e7c29d7c5c65d5cfad
+EBUILD pyfakefs-4.5.0.ebuild 708 BLAKE2B 02def91440e97caf02b12247f2ee7ebef8409f574f58cbd0c82ed02c0f0532037843bf5f63aab26f63d505db731f7b5f2a0de3fd2f21de0762d83e001fc554a3 SHA512 d88d36a2f8a045a487ece7d1a18c2d3202368e666b0528d3e0a21b46d67533d8541c9d28c989cc84e312fe9276b14a37e049fb45cfe2ca0f04c103869419f9ec
 MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/files/pyfakefs-4.4.0-py310.patch b/dev-python/pyfakefs/files/pyfakefs-4.4.0-py310.patch
deleted file mode 100644
index 6ef35df7d1f8..000000000000
--- a/dev-python/pyfakefs/files/pyfakefs-4.4.0-py310.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From a8a70bb7746ba24aa60c9915311e1ff5b402146c Mon Sep 17 00:00:00 2001
-From: Carl Montanari <8515611+carlmontanari@users.noreply.github.com>
-Date: Thu, 13 May 2021 22:44:45 -0700
-Subject: [PATCH] Add support for Python 3.10 beta1 (#594)
-
-- add Python 3.10-beta1 to CI
-- adapt fake pathlib, fix pathlib.Path methods link_to, getcwd, lchmod
-- handle dummy encoding "locale" introduced in Python 3.10
-- do not test extra dependencies with Python 3.10 (some are not available)
----
- pyfakefs/fake_filesystem.py         | 15 ++++---
- pyfakefs/fake_pathlib.py            | 64 ++++++++++++++++++++++-------
- pyfakefs/helpers.py                 |  9 ++++
- pyfakefs/tests/fake_pathlib_test.py | 27 +++++++++---
- 6 files changed, 109 insertions(+), 32 deletions(-)
-
-diff --git a/pyfakefs/fake_filesystem.py b/pyfakefs/fake_filesystem.py
-index 1e9bfc8..971dc93 100644
---- a/pyfakefs/fake_filesystem.py
-+++ b/pyfakefs/fake_filesystem.py
-@@ -114,7 +114,7 @@ from pyfakefs.fake_scandir import scandir, walk
- from pyfakefs.helpers import (
-     FakeStatResult, BinaryBufferIO, TextBufferIO,
-     is_int_type, is_byte_string, is_unicode_string,
--    make_string_path, IS_WIN, to_string, matching_string
-+    make_string_path, IS_WIN, to_string, matching_string, real_encoding
- )
- from pyfakefs import __version__  # noqa: F401 for upwards compatibility
- 
-@@ -293,7 +293,7 @@ class FakeFile:
-         if st_mode >> 12 == 0:
-             st_mode |= S_IFREG
-         self.stat_result.st_mode = st_mode
--        self.encoding = encoding
-+        self.encoding = real_encoding(encoding)
-         self.errors = errors or 'strict'
-         self._byte_contents = self._encode_contents(contents)
-         self.stat_result.st_size = (
-@@ -430,7 +430,7 @@ class FakeFile:
-           OSError: if `st_size` is not a non-negative integer,
-                    or if it exceeds the available file system space.
-         """
--        self.encoding = encoding
-+        self.encoding = real_encoding(encoding)
-         changed = self._set_initial_contents(contents)
-         if self._side_effect is not None:
-             self._side_effect(self)
-@@ -1177,9 +1177,12 @@ class FakeFilesystem:
-             OSError: if the filesystem object doesn't exist.
-         """
-         # stat should return the tuple representing return value of os.stat
--        file_object = self.resolve(
--            entry_path, follow_symlinks,
--            allow_fd=True, check_read_perm=False)
-+        try:
-+            file_object = self.resolve(
-+                entry_path, follow_symlinks,
-+                allow_fd=True, check_read_perm=False)
-+        except TypeError:
-+            file_object = self.resolve(entry_path)
-         if not is_root():
-             # make sure stat raises if a parent dir is not readable
-             parent_dir = file_object.parent_dir
-diff --git a/pyfakefs/fake_pathlib.py b/pyfakefs/fake_pathlib.py
-index b43b178..09933fa 100644
---- a/pyfakefs/fake_pathlib.py
-+++ b/pyfakefs/fake_pathlib.py
-@@ -53,8 +53,8 @@ def init_module(filesystem):
- 
- def _wrap_strfunc(strfunc):
-     @functools.wraps(strfunc)
--    def _wrapped(pathobj, *args):
--        return strfunc(pathobj.filesystem, str(pathobj), *args)
-+    def _wrapped(pathobj, *args, **kwargs):
-+        return strfunc(pathobj.filesystem, str(pathobj), *args, **kwargs)
- 
-     return staticmethod(_wrapped)
- 
-@@ -94,19 +94,24 @@ class _FakeAccessor(accessor):
- 
-     listdir = _wrap_strfunc(FakeFilesystem.listdir)
- 
--    chmod = _wrap_strfunc(FakeFilesystem.chmod)
--
-     if use_scandir:
-         scandir = _wrap_strfunc(fake_scandir.scandir)
- 
-     if hasattr(os, "lchmod"):
-         lchmod = _wrap_strfunc(lambda fs, path, mode: FakeFilesystem.chmod(
-             fs, path, mode, follow_symlinks=False))
-+        chmod = _wrap_strfunc(FakeFilesystem.chmod)
-     else:
--        def lchmod(self, pathobj, mode):
-+        def lchmod(self, pathobj,  *args, **kwargs):
-             """Raises not implemented for Windows systems."""
-             raise NotImplementedError("lchmod() not available on this system")
- 
-+        def chmod(self, pathobj, *args, **kwargs):
-+            if "follow_symlinks" in kwargs and not kwargs["follow_symlinks"]:
-+                raise NotImplementedError(
-+                    "lchmod() not available on this system")
-+            return pathobj.filesystem.chmod(str(pathobj), *args, **kwargs)
-+
-     mkdir = _wrap_strfunc(FakeFilesystem.makedir)
- 
-     unlink = _wrap_strfunc(FakeFilesystem.remove)
-@@ -124,13 +129,21 @@ class _FakeAccessor(accessor):
-         FakeFilesystem.create_symlink(fs, file_path, link_target,
-                                       create_missing_dirs=False))
- 
--    if sys.version_info >= (3, 8):
-+    if (3, 8) <= sys.version_info < (3, 10):
-         link_to = _wrap_binary_strfunc(
-             lambda fs, file_path, link_target:
-             FakeFilesystem.link(fs, file_path, link_target))
- 
--    if sys.version_info >= (3, 9):
--        readlink = _wrap_strfunc(FakeFilesystem.readlink)
-+    if sys.version_info >= (3, 10):
-+        link = _wrap_binary_strfunc(
-+            lambda fs, file_path, link_target:
-+            FakeFilesystem.link(fs, file_path, link_target))
-+
-+        # this will use the fake filesystem because os is patched
-+        def getcwd(self):
-+            return os.getcwd()
-+
-+    readlink = _wrap_strfunc(FakeFilesystem.readlink)
- 
-     utime = _wrap_strfunc(FakeFilesystem.utime)
- 
-@@ -461,19 +474,42 @@ class FakePath(pathlib.Path):
-             cls = (FakePathlibModule.WindowsPath
-                    if cls.filesystem.is_windows_fs
-                    else FakePathlibModule.PosixPath)
--        self = cls._from_parts(args, init=True)
-+        self = cls._from_parts(args)
-         return self
- 
--    def _path(self):
--        """Returns the underlying path string as used by the fake filesystem.
--        """
--        return str(self)
-+    @classmethod
-+    def _from_parts(cls, args, init=False):  # pylint: disable=unused-argument
-+        # Overwritten to call _init to set the fake accessor,
-+        # which is not done since Python 3.10
-+        self = object.__new__(cls)
-+        self._init()
-+        drv, root, parts = self._parse_args(args)
-+        self._drv = drv
-+        self._root = root
-+        self._parts = parts
-+        return self
-+
-+    @classmethod
-+    def _from_parsed_parts(cls, drv, root, parts):
-+        # Overwritten to call _init to set the fake accessor,
-+        # which is not done since Python 3.10
-+        self = object.__new__(cls)
-+        self._init()
-+        self._drv = drv
-+        self._root = root
-+        self._parts = parts
-+        return self
- 
-     def _init(self, template=None):
-         """Initializer called from base class."""
-         self._accessor = _fake_accessor
-         self._closed = False
- 
-+    def _path(self):
-+        """Returns the underlying path string as used by the fake filesystem.
-+        """
-+        return str(self)
-+
-     @classmethod
-     def cwd(cls):
-         """Return a new path pointing to the current working directory
-@@ -722,7 +758,7 @@ class RealPath(pathlib.Path):
-         if cls is RealPathlibModule.Path:
-             cls = (RealPathlibModule.WindowsPath if os.name == 'nt'
-                    else RealPathlibModule.PosixPath)
--        self = cls._from_parts(args, init=True)
-+        self = cls._from_parts(args)
-         return self
- 
- 
-diff --git a/pyfakefs/helpers.py b/pyfakefs/helpers.py
-index aa3959d..08962fc 100644
---- a/pyfakefs/helpers.py
-+++ b/pyfakefs/helpers.py
-@@ -57,6 +57,15 @@ def to_string(path):
-     return path
- 
- 
-+def real_encoding(encoding):
-+    """Since Python 3.10, the new function ``io.text_encoding`` returns
-+    "locale" as the encoding if None is defined. This will be handled
-+    as no encoding in pyfakefs."""
-+    if sys.version_info >= (3, 10):
-+        return encoding if encoding != "locale" else None
-+    return encoding
-+
-+
- def matching_string(matched, string):
-     """Return the string as byte or unicode depending
-     on the type of matched, assuming string is an ASCII string.
-diff --git a/pyfakefs/tests/fake_pathlib_test.py b/pyfakefs/tests/fake_pathlib_test.py
-index 5dcc57f..efea509 100644
---- a/pyfakefs/tests/fake_pathlib_test.py
-+++ b/pyfakefs/tests/fake_pathlib_test.py
-@@ -378,10 +378,11 @@ class FakePathlibFileObjectPropertyTest(RealPathlibTestCase):
-         # we get stat.S_IFLNK | 0o755 under MacOs
-         self.assertEqual(link_stat.st_mode, stat.S_IFLNK | 0o777)
- 
--    @unittest.skipIf(sys.platform == 'darwin',
--                     'Different behavior under MacOs')
-     def test_lchmod(self):
-         self.skip_if_symlink_not_supported()
-+        if (sys.version_info >= (3, 10) and self.use_real_fs() and
-+                'chmod' not in os.supports_follow_symlinks):
-+            raise unittest.SkipTest('follow_symlinks not available for chmod')
-         file_stat = self.os.stat(self.file_path)
-         link_stat = self.os.lstat(self.file_link_path)
-         if not hasattr(os, "lchmod"):
-@@ -390,8 +391,9 @@ class FakePathlibFileObjectPropertyTest(RealPathlibTestCase):
-         else:
-             self.path(self.file_link_path).lchmod(0o444)
-             self.assertEqual(file_stat.st_mode, stat.S_IFREG | 0o666)
--            # we get stat.S_IFLNK | 0o755 under MacOs
--            self.assertEqual(link_stat.st_mode, stat.S_IFLNK | 0o444)
-+            # the exact mode depends on OS and Python version
-+            self.assertEqual(link_stat.st_mode & 0o777700,
-+                             stat.S_IFLNK | 0o700)
- 
-     def test_resolve(self):
-         self.create_dir(self.make_path('antoine', 'docs'))
-@@ -968,7 +970,22 @@ class FakePathlibUsageInOsFunctionsTest(RealPathlibTestCase):
-     def test_stat(self):
-         path = self.make_path('foo', 'bar', 'baz')
-         self.create_file(path, contents='1234567')
--        self.assertEqual(self.os.stat(path), self.os.stat(self.path(path)))
-+        self.assertEqual(self.os.stat(path), self.path(path).stat())
-+
-+    @unittest.skipIf(sys.version_info < (3, 10), "New in Python 3.10")
-+    def test_stat_follow_symlinks(self):
-+        self.check_posix_only()
-+        directory = self.make_path('foo')
-+        base_name = 'bar'
-+        file_path = self.path(self.os.path.join(directory, base_name))
-+        link_path = self.path(self.os.path.join(directory, 'link'))
-+        contents = "contents"
-+        self.create_file(file_path, contents=contents)
-+        self.create_symlink(link_path, base_name)
-+        self.assertEqual(len(contents),
-+                         link_path.stat(follow_symlinks=True)[stat.ST_SIZE])
-+        self.assertEqual(len(base_name),
-+                         link_path.stat(follow_symlinks=False)[stat.ST_SIZE])
- 
-     def test_utime(self):
-         path = self.make_path('some_file')
--- 
-2.31.1
-
diff --git a/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
deleted file mode 100644
index 5e06b22143d2..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild
index ba7f47bcc382..0eb0423563d4 100644
--- a/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.5.0.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 5c8dea3235a5..38b87e406824 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,7 +1,3 @@
-DIST pygit2-1.5.0.tar.gz 255958 BLAKE2B 696a4c39920e7f66962b69d2a838c55bfb6f96e7e5ee56a39aaa732926accc3bb6331042382fd22f377959cbc129be0320d94765d13db95fdb7c7f87a14f7608 SHA512 3f915c855ad08641391565906023d231550a38d4e7f8938fad4634a30e2ee1c81e2a0d3289052426e21d2c14814300a0f789eaaa9f3e62c3ece73cf53803bb80
-DIST pygit2-1.6.0.tar.gz 265798 BLAKE2B 8244cbcecdd9b9edcb8fb0cfbc2024f1d36a01c8a3e519e05770ca80d7a482393892bcbd4a61402e7622b84f02909a2a36b9767273d6322a94a15eb974fdb8fa SHA512 c051ce09d227b6ec0c7d3068b5b0220f5c150936d788462dfb3236c97954f9b76f6a1fd61cd42e604810582e3d1a5bc8784fc51c9fedac66ad1b42af580af494
 DIST pygit2-1.6.1.tar.gz 258338 BLAKE2B dc223e2a5231728c42ca7e0581483731fbab6ee090cf4aeeb27f186973b3c753fdf54c89679a88b97d834d717135f9b8f9a2adf492ed8572affa938c79d0f905 SHA512 67a78313493ba096cbae6805bda861495f33644fd180b5fb1cd99dcd226ef5a09ee85bd27d04d0697ef15503a4e902aa1384980870551f430fd9560ac949fe2f
-EBUILD pygit2-1.5.0.ebuild 922 BLAKE2B 1194e0c9d03c3fa228c6a42d7bc17ec367d412648ae81b6d25e018d159905ffe90e52ef8f517aba36a71d22291e3b346a92e6867eabb9ef4aa4345277dae2a9c SHA512 03cdfa2c18acfe175da8ed168bbc3202a20141fb3d2094261296b2ce172ac72bd94016f209ff9e4f72f9fba662339e35128c04e8389695269204f294bb616b5b
-EBUILD pygit2-1.6.0.ebuild 925 BLAKE2B 3661015b79daa9bc00d7c5378eb1c540b1652562faddf85ee99ab2c3ec67d15eee66f00deb6ce0ee72e1166ace5dfc4992d478aaebd012f531d78f1eef403d26 SHA512 c1274ce98f9abecd8010e7bbd2a38f7b7ff94c12a9d1cc1a37c59761ef78693d359eef7e26558ea43cbca8725ce468cf2d8455ab06de18fc8ba2f906965a0abe
-EBUILD pygit2-1.6.1.ebuild 925 BLAKE2B 3661015b79daa9bc00d7c5378eb1c540b1652562faddf85ee99ab2c3ec67d15eee66f00deb6ce0ee72e1166ace5dfc4992d478aaebd012f531d78f1eef403d26 SHA512 c1274ce98f9abecd8010e7bbd2a38f7b7ff94c12a9d1cc1a37c59761ef78693d359eef7e26558ea43cbca8725ce468cf2d8455ab06de18fc8ba2f906965a0abe
+EBUILD pygit2-1.6.1.ebuild 923 BLAKE2B 8e2927d2c74fd1f1217fd1aee7c553fa624f744f1958bcb7e715ef8994d73b6e2334ccba47a9d302979951a9d5568b0e9399160bc3bfd5f663866f176fac1e01 SHA512 98a6eed6802b240f748fcb636497bc14b38f4b14b27ff1553d9d23df031406f0e12b7034a8d9f4a03303671c8310c14c8d6c342f847d98a039c2a0a70080c7ac
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-1.5.0.ebuild b/dev-python/pygit2/pygit2-1.5.0.ebuild
deleted file mode 100644
index 3e10d2d8997c..000000000000
--- a/dev-python/pygit2/pygit2-1.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-libs/libgit2-1.1*
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.6.0.ebuild b/dev-python/pygit2/pygit2-1.6.0.ebuild
deleted file mode 100644
index b69f1d68cbe5..000000000000
--- a/dev-python/pygit2/pygit2-1.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-libs/libgit2-1.1*
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.6.1.ebuild b/dev-python/pygit2/pygit2-1.6.1.ebuild
index b69f1d68cbe5..69a3e8d9cbe4 100644
--- a/dev-python/pygit2/pygit2-1.6.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-libs/libgit2-1.1*
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 4aa91ea0fbf1..6c9b3239656c 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,3 +1,3 @@
 DIST pyinotify-0.9.6.tar.gz 60998 BLAKE2B 7fb55cfe5b2c02682b5842d95859a58f218ab591a4eee689b707e804c6fe8cde4cc1fb3dfbf54a044ff743deefa0ee5551bc6e27ca4dda1c608218a6c24597b2 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5
-EBUILD pyinotify-0.9.6.ebuild 734 BLAKE2B ed35a25827668ed5ae2ef74170cd83c20f56989e89401037b878bd7d884e798e0451c167283712c3b25d735ddea72c9291b24fc7542f78bcfb35cadab37fed99 SHA512 e0962f74457ae1a742a8a5270238ebe2bd186d3970c4e07a625df073fb125781e012c6526a59b58647fa021e69474642d8852ab0b68ca79ab173ceeb73b6b40d
+EBUILD pyinotify-0.9.6.ebuild 735 BLAKE2B ce89673e9867029b172ebd469b8908103a05eadf2772347075eb7f919a45f9fd74a7e87e92a06fe667a6faf010600516658915d377a20945984fe517a4b0eb56 SHA512 556b10149750474008f6389d68f4a1e2e982755719e0643a591605490c83aae8b24f707d1f0f930ca1bf1ab1301712782afac90b1b3af61df9f61e868c708cb0
 MISC metadata.xml 367 BLAKE2B 5c08d19d51faf9166d5ef8a7660a7c50fcaab71709b68e8dee43ec6d06e02eda7bc5781b72631f8e7b877431e458aa21460c8aaa4d18132d6fe107c158c4033b SHA512 0d8e82046735575615d9bd70b3fea5a9c529368cb48b16fe1c3eb0ad850676b143846cd772ce899d259f764bc3b6260e257ecca3eb50be70d2df6e08feaaf810
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index bef1ccac9373..63be1629b761 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 3f84b385b984..d8f917c870c8 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,3 +1,3 @@
 DIST PyKerberos-1.3.1.tar.gz 41954 BLAKE2B b95a3473c5803ebcb461db7f2589caa03e92f4cb3ba3a4890a31db99b687aa4c77ae4e58f09ae2339a1fd8acf6fe9ab5797e3b7178dfeb2ee7a95bb851fff402 SHA512 dcadc5c3b095d8bba947a745ac84cc558d7eebad139a0e86260891966786506a7a62600fde93fa14683971e436da8cc5cd3795817b20ba45ce7e39f8c05deb53
-EBUILD pykerberos-1.3.1.ebuild 1276 BLAKE2B 3e0d4f901777c3198c986637dfa95d61b7729881c3687cf9b2fc462c5f9bfb7c108e8c179b18bd606e25e39fbf3341df610961b89137f4b160740be535d606d2 SHA512 b815bb91818fc186a1ee32ccf42ff31d61104c2569a4acc96472fb815592e74f48c803ef13b52cb61cb77c0925a32e89facae3176284718b2fb9875f3544c1d7
+EBUILD pykerberos-1.3.1.ebuild 1283 BLAKE2B 19ecf428a0c437ddd2fb5786cc67913c884625be7c9eb220a6a40ec03a503f4cc2dd62e8940a644a99da808512bc1444da38b65bb109bdeeee48601ce689cb90 SHA512 9fa37d66f2c00937a1b23aa675d4faf15c65cb3dbb36e9821965140f65d257bc8d0ad866d1333050f6f9bba8712d301471046765da61dcadaa1e0bf43e696d8b
 MISC metadata.xml 371 BLAKE2B cc0afa6647f1f23014d9c89b3efc9f16916f6d703b2866ceaaba5fb3ad3899f18823e7eff64fb55bc265b3159b31b0fe40c302e92f9ebacedaad597a77686230 SHA512 77d94cdf0eeac0b8cf610e916a59d4b364c0196622515fee47bfae41a226f8acbade3d2dbb760b53696cc71f4b1639ad7de670e633172f6142a48c96969e8f33
diff --git a/dev-python/pykerberos/pykerberos-1.3.1.ebuild b/dev-python/pykerberos/pykerberos-1.3.1.ebuild
index 09b808a4d4c0..671c5af6453d 100644
--- a/dev-python/pykerberos/pykerberos-1.3.1.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.3.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/ccs-pykerberos-${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86"
 # test environment is non-trivial to set up, so just use docker
 # (see python_test below)
 # also for alpha/beta Python releases support:
diff --git a/dev-python/pyls-black/Manifest b/dev-python/pyls-black/Manifest
deleted file mode 100644
index 249fca122a7a..000000000000
--- a/dev-python/pyls-black/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pyls-black-0.4.6-gh.tar.gz 5121 BLAKE2B fb1265d40e7c8b85d066d8d3078a60ff719992abcd84efc9d9df582d6fd7e47f211dbed004081413955524e9455218085d78f1d843769a40168ac448139e283c SHA512 e9fa3faec0fb3f2a8bcbdd4c9b8b8e6662d1bcafa88f693b09e2a7a4df8c2d35df8d8f79c50bbb33342a07cde8931e7f136136ff40879898612b13bdff7277fc
-DIST pyls-black-0.4.7.gh.tar.gz 5166 BLAKE2B 46ed7dc96b9f3b70edd1923133b39169b37f0d2d909bed41742690920dd7ea9b935dfa17b8d8f8ab43d9e3b3e18a99811c015ae5506e950e8775df8a34c79a83 SHA512 a68861a8283ab9118fa0a5bad6a751d5ece422813de12c98eba624d97742cf3f4e0b02d3afa43fb129bac00c54b9b2702bafd590d2d1489bd4af773ee68db7b3
-EBUILD pyls-black-0.4.6-r1.ebuild 588 BLAKE2B 5be9ec47d5b4874b489969aaeec5af60eace5bb2c3ed1388f6b3ef7ae4b7f606a38a16254ed2f46c1a996bdcb73a147affca934080eb3e35be02c6557eb28b8c SHA512 3f020431e190add9ee08c322634b8903fd702e693f0b4c234385142be66e22b3990e9308ba69c7f5861214c3d784f79fa182ccdc0cc1353b77e9d7d18b6747dc
-EBUILD pyls-black-0.4.7.ebuild 590 BLAKE2B 19ef9d5650f496c581c28c9364eaaefdeaa56b8bc510a165d60d67faa527c22ff13b1033897fee48bb6e183667f3e7365f2ea8f35303939794b16cd302df54ee SHA512 02c2e64ed715be64b3609798293349dc22bf4f60203d4edcc6f785e6264c5eba09364de8e8bea4a2cc9c4d3174040ffe2e514090570caae63c9c3a2afd0d3028
-MISC metadata.xml 412 BLAKE2B 7222f35dacb0ee8c88e71efc1f9c11c4f029f479102dc2410dbc0d61e7cbf129fbc76bfc7dc62f0ee784a02ff92b8c90f74230e6f00988d455e8f0266e39ec51 SHA512 6059d5f251b81ef9a2b29d379b3d19859e4f8f1aa8588044f1a36a69aaed932840cc9c200efcedfa7ec8f918d8cf1d9ce45b89d73323cb2b872a2e14cb782e18
diff --git a/dev-python/pyls-black/metadata.xml b/dev-python/pyls-black/metadata.xml
deleted file mode 100644
index 7b06e078f1b6..000000000000
--- a/dev-python/pyls-black/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="pypi">pyls-black</remote-id>
-		<remote-id type="github">rupert/pyls-black</remote-id>
-	</upstream>
-	<stabilize-allarches/>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild b/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild
deleted file mode 100644
index ed69ccf14ff8..000000000000
--- a/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Black plugin for the Python Language Server"
-HOMEPAGE="https://github.com/rupert/pyls-black
-	https://pypi.org/project/pyls-black/"
-SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/python-language-server[${PYTHON_USEDEP}]
-	<dev-python/black-21[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pyls-black/pyls-black-0.4.7.ebuild b/dev-python/pyls-black/pyls-black-0.4.7.ebuild
deleted file mode 100644
index 825e437521bf..000000000000
--- a/dev-python/pyls-black/pyls-black-0.4.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Black plugin for the Python Language Server"
-HOMEPAGE="https://github.com/rupert/pyls-black
-	https://pypi.org/project/pyls-black/"
-SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/python-language-server[${PYTHON_USEDEP}]
-	>=dev-python/black-21[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index b24595c2d570..ccd5fd333620 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -2,6 +2,6 @@ DIST pymdown-extensions-8.0.1.tar.gz 642787 BLAKE2B fe25fd828633bb1a653430431de9
 DIST pymdown-extensions-8.1.1.tar.gz 650451 BLAKE2B d72b4ff60747a5f2142b778d75ba438757f35e1bb45d1cf005c9ec7b187b8c6aa1e890ca1bf01b3a202dfd38c8f813c928041870a30bb2e0fc035e2a5ff9809e SHA512 a1472858b6afeb9b582cf97a4471e09e25dddcb0504d58f8aa703802fe0c075a0af2fa8e1895f02b48b5959297c37cd1feee789741d93a1739f9d19c3341b108
 DIST pymdown-extensions-8.2.tar.gz 766818 BLAKE2B db14bcb0e7bf572e97c6dc7d7ebb00780ce081f9006a0d067c98c369433c147e42b93eab0dfaddfed6f93030ab32f0ae1c7c0ac3c08a1f7f07fee15a1be1a398 SHA512 220465b2a2d0f9563c119dae61d2527207a4f3a1d24ea1b1585997c9c23c4a7c0bbc23b4dc7c551e533ac3af20c7852cb7b8cce6dd3908844aafcd801d20e14d
 EBUILD pymdown-extensions-8.0.1.ebuild 1555 BLAKE2B c16c2095c8ef9b6f279474c62c9f931257f30d1eb0a98b0cb9bf3120d18ad6171fa225ba3ddce9ddd158798850eca5e0f36253105b7aeedfb8abe9b33be67bf9 SHA512 83c34fb23bc4652ef28ad6290944081bf554663d5ea881f6699f373cc9e34f72ea08542fef2365d439c137329baecd44340df67d20397a34733626b5c45a9b2c
-EBUILD pymdown-extensions-8.1.1.ebuild 1187 BLAKE2B d06ab2588741497006b6d79ceb4ed139dfc194c3bd38eb72878bac1aed762679cb9b3a1a040072323d54fd77d766e60285c501462e48174cb7ba0e4c7a3282e9 SHA512 8834351713a8403334c5022210d3a4c915bd99fdad7b97ab8621b8ea104b5060e4871abb624b593936684df6a8c44414dee7a2e711e0e6e75d6e022dbd172030
+EBUILD pymdown-extensions-8.1.1.ebuild 1185 BLAKE2B 42b00568115874f4cc6a7b0ba2dae3f34ecfe2463217f1c0283ced41f0140dd829eadacbcaccecec83a2aa0ebeeb27bf995de77027b5694a299b88e84a4c84c0 SHA512 e6a1fad2389362f42133bd54c13b8efa76f58db17c8aedc23b34538c2731433707117d88153b4ac914896ccdc08ef3d595478ce1e3ae55ef13f7ad8f9d60ea3f
 EBUILD pymdown-extensions-8.2.ebuild 1186 BLAKE2B c6b96e35f20edf2cc4739d8a48c3b5841da2600db2cf89617a9d8182ca2b87566278cc95e5e47b00e1baf28b87509462453285390d5db553846b3d4aea9f8686 SHA512 cf453c3792b8d8d9bda0713d24aece7e855797f42190d8d7f2e6df5046570303ac12f5447291e8691791ee1131fd29f6807b610e1fd100bdb555d955ca041353
 MISC metadata.xml 535 BLAKE2B 59f4bfe8eb59bcd482ed28ccb76baf82c3fb3ce15a3cf4fc342dc5ca8d0a0c47af6013a7c5d7888e93c1be22eaa326488580f3ff7764629081b754a2c650fb23 SHA512 a34f70e7d2acb37cd2aeed47b3b0d39899cde7c52450c83970e1b3b54575d32b621601783b6f29df8231985860d3ee9d59e9b007fc69f3cec4f2a2db1cfecd00
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild
index d0916e0941d5..53d62a8818eb 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest
index 127a068fa36e..4f2d9f12616e 100644
--- a/dev-python/pymdown-lexers/Manifest
+++ b/dev-python/pymdown-lexers/Manifest
@@ -1,3 +1,3 @@
 DIST pymdown-lexers-0_pre20210308.tar.gz 2962 BLAKE2B 6504974327727cf49c9a6584cf06dee1505c8e0266241b584f84c3a99f6e8344e3dafda2bcdd3773d06e634a6d6aecd1279b40f3126ffdddb77f3218a1a18034 SHA512 08beadf0ee24bc33b6eb231d297bdbb084954fba4a22fb0beed3bb08c2e188bf984465a61138affbcdbf843831bbd7d2f2d26c798c60048145a42d365ae81dd3
-EBUILD pymdown-lexers-0_pre20210308.ebuild 558 BLAKE2B d98ba583587cee81e8345731e11aff62a000d14c01f843fb09cf942551107fc2b026ee4cd31a2edab9796d0a6009dbd30523e21367fa2f6b3b0773de32a55a7e SHA512 9915aee7074fb0ca123f36edde001054d64ada8151a1127c2e6d801f624f6d02f55629ddb853cf29f8fcb4bbdb2c01ee75b839518350adf0db9d7bf5f5cecbf1
+EBUILD pymdown-lexers-0_pre20210308.ebuild 556 BLAKE2B 554b38a1aa7a4703cdc31c948972f2fddbbf14ee55a1e7902442a505cc355099cb96870dce13015d7b39b7f58f8f389e547e488af0a24f0ab5508f6873d0f185 SHA512 d5cf32b8f8ce028255652f2cd12fc15de7d89852b4cd456f17e3598c5f95010e539714cba9f20bf159dd0d4081ddbabe62ab2dcda37ea4b26e569593d2aaea43
 MISC metadata.xml 641 BLAKE2B 0dae0d22b6178cbfc32aa39edae5fad524fca8a26fc1b2b38bb1b07ee3c7296a8161dab003b114b2df0532bfead33beef86aa113dde8f74a374d0cd45ffef91b SHA512 9cc74eebcb0b409b11ff6135a4940c3534d7309bf9845d0948686939e7769dd86dc963209343f6950d5c1273c0c6f04ed3fe44c6d4ae1ffabfe2e98af8cfd7b5
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
index 5e7103789cd8..6c4ffc243f19 100644
--- a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
+++ b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index ce833137140c..7e7e68fb9349 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,7 +1,5 @@
 DIST pyopencl-2021.1.3.tar.gz 447070 BLAKE2B fcd8c5d06de9c14a7bcf3c3d37f89cb208adf0225cc88a081aefc86aac82a99026183f2c9975f34cd8247f784335e4ba6c0a09164ce01e527123b5c1dd952a76 SHA512 8799e73b3b1596387f619fd997f643228679fb1d9ab5ce6704da9df51922f96229efc98ab6b7a7361234848078b15bc67946a4188f4d17cb8760040b48b346e8
-DIST pyopencl-2021.2.3.tar.gz 450895 BLAKE2B 0395ee6ef32baa57fe9df0c9960f5d761cfced1cc8b87e51e7ebcc7cda6a6b651fc491acf6be525239576fedec2a8375935799fc77568e131dcb26436a59c6f1 SHA512 41ef44eac0112ceac15c1260198a0bd642c244f3ad45aa1d7feba70b55a3f257ce01f7c5a8eaf2ce1df263492452055286caad004101d8bdb2d4f7307fb339be
-DIST pyopencl-2021.2.5.tar.gz 449527 BLAKE2B 922970c6aa93d2ce600c1e107fa3303c42bd44a264f7c38b30c8d2c909ec12e4cf8fa21dbaffa558c7b183141802ac13fe1a1032230b611b56503cfbaeae40c1 SHA512 a8784e0c6ae9a3c2d8f463405d5bbfe4ac1df138fd5f1ca8ce622afaab787333574c6ee8f4a828c09dc36c1b7a5df8fbe5d70e2236be32d457c3e1cbdeb880e5
+DIST pyopencl-2021.2.6.tar.gz 450194 BLAKE2B be9d0bf653f77d33a4337deab9189a5a9031ff50526444283c6fb9f8625d0451cb211ff703b5eb86c18beebb973f8f7a7cc93da3efc6bb4e95cd533d633fde93 SHA512 b7bea4903a34104c538545c611554c1651ae7a94ee56d8c7129a88a9e547911fac085617b4238fac33534c9b981bcfdb9fabd716456a86fa428cfd42d9cb128c
 EBUILD pyopencl-2021.1.3.ebuild 1491 BLAKE2B 627fcf87c2a199260cb4697729d7fffe01dd0da7e0146fe6c981a7e2673c97496bfb1d90fd5c7354b64bb7a7f871d46b692855db6111f9cb4f559595de0f90f0 SHA512 820bbe51273f64d1f5aa2e781e68baebbc6ebe014b281b3c477876442e9a218d3cdad26b693aaacf48fba07df450d4c754b7356c140c553de9e6908b6af6447e
-EBUILD pyopencl-2021.2.3.ebuild 1495 BLAKE2B 31a08609895d8c8f7f7e3578bc02a13d4be00b0bfc3c18fa72790b61294e8b139aafe497e9acbc3aef4556b001bbab8189a6032b116a76e82d2bd36ba4c78f84 SHA512 8aa8bc4ab3bf426cab9e441489c0d537e51306ebef8a5fe2d26f7e6cb37599defd807ec140611c5d0fdc6e6a139ab84eb8d8a80bbbd43820b71bd8dd04863571
-EBUILD pyopencl-2021.2.5.ebuild 1405 BLAKE2B 68d74cea97af5cdaf30ab8ec8305410f1b9cb64bc5763429111c0a818e7da8ecad1de916779acc8f4a2ee0b1195205938d325a61cc5a55ec31eb0fe685d8742f SHA512 99ae298854a27a57682f2932b952d5e0b34f0c5a7056bccc06169a37421304bcd9e5a2232ddd730f83018a1f46a5e07ce7926bee7e51ff96f46b5019eb5a87d4
+EBUILD pyopencl-2021.2.6.ebuild 1405 BLAKE2B 68d74cea97af5cdaf30ab8ec8305410f1b9cb64bc5763429111c0a818e7da8ecad1de916779acc8f4a2ee0b1195205938d325a61cc5a55ec31eb0fe685d8742f SHA512 99ae298854a27a57682f2932b952d5e0b34f0c5a7056bccc06169a37421304bcd9e5a2232ddd730f83018a1f46a5e07ce7926bee7e51ff96f46b5019eb5a87d4
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2021.2.3.ebuild b/dev-python/pyopencl/pyopencl-2021.2.3.ebuild
deleted file mode 100644
index 32a5237b3e9e..000000000000
--- a/dev-python/pyopencl/pyopencl-2021.2.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples opengl"
-
-COMMON="dev-python/numpy[${PYTHON_USEDEP}]
-	>=virtual/opencl-2"
-RDEPEND="${COMMON}
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-DEPEND="${COMMON}
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	opengl? ( media-libs/libglvnd )"
-
-# The test suite fails if there are no OpenCL platforms available, and
-# even if there is one (which requires the presence of both an OpenCL
-# runtime *and* hardware supported by it - simply emerging any runtime
-# is not enough) the vast majority of tests end up skipped because by
-# default the portage user hasn't got sufficient privileges to talk
-# to the GPU.
-RESTRICT="test"
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-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/pyopencl/pyopencl-2021.2.5.ebuild b/dev-python/pyopencl/pyopencl-2021.2.6.ebuild
index 9c4b6ac92a78..9c4b6ac92a78 100644
--- a/dev-python/pyopencl/pyopencl-2021.2.5.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.2.6.ebuild
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index aa40231d792d..5e7f6e260a26 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -5,7 +5,7 @@ DIST pypy2.7-gentoo-patches-7.3.5rc3_p1.tar.xz 6932 BLAKE2B 730c52170dc5b6e893dc
 DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
 DIST pypy2.7-v7.3.5rc3-src.tar.bz2 21563312 BLAKE2B e343dcd617026ea5f951f3d24deeb59736c9a6ecc91d1b9c1bd980b6f3c239a5bf0edb9b72a0847a6aeeaead8aca9ecf537af81c9fcf0a2f6647c99edc0d1735 SHA512 e080771ea10a30820f8844b3f512a7681f2e619e8a37fa8ac60198f3c8c3780a8e08aa63749be375c00cd547994f428df44e2cd9f61b272b215ded433374e0a1
 EBUILD pypy-7.3.4.ebuild 4820 BLAKE2B efb4bb8f194568c909365e06d2f3c1593145bff3c3fdbfab867bd15368df13cef642029b41739b4547256819f322f4dbe251c64cfac1d8c525391ebca4e8aef0 SHA512 82809ab39edfb0cd54a377740ce223baee9ae9abeb348ee2ae2fd2e1dd203900a1def1ee4c276f748d3823cab04dce8da25e12f3c477cad4fe560252bbd714c4
-EBUILD pypy-7.3.4_p1.ebuild 4832 BLAKE2B 080ecff775d6d41f2ded992943f01c485da9dc3af9393abf3a38a2b4ae750585f89ad367c988bf9ed4592fe1db57676b1a4d3cf0363018e0a74bf47a0a18c47a SHA512 461e1ac7cce22891ee37b232c6156e8e829a127b05d7d358d2522a44c4e3df03c9feb2d88706d10d3ed2fd01d11011e18296d5dac8bb28e79de99a2abdce7472
+EBUILD pypy-7.3.4_p1.ebuild 4830 BLAKE2B e71ef5eaf761e2b805b3130c5f008573c088dfbff05ad135bce23e62549f5c1f3570c2c98486d2fe8e852e662574e27e089db25c14543994c31a5bdddb7915f1 SHA512 9c53907ede4770731868c4343923bc929824c63482bc090bde040874544a056aacb45df1a6b2b098febf658ba050facc3ee650275cd62b91dc8044e875612b23
 EBUILD pypy-7.3.5_rc3.ebuild 4777 BLAKE2B 7893108718dc64d1514fddbd491db3157b0ae067e4a6eeca980ddc5ed09eec88d8524a733816ad5124ac80c3e716dda1a8b1567f3d15a4e98588db0fbc24891d SHA512 19b23d8467aed4ceacae09b9f06d25ce111578e592a8414217101a8cd9b4a928e9da6e897133e23925ea812365e2fa52a9e1c44b657a2094e0a7ace13c7c4fa5
 EBUILD pypy-7.3.5_rc3_p1.ebuild 4787 BLAKE2B 1fe07cb6231ea4d2a584fb0e37d4a105f44b4d252f27b88088fa53c74b00bf8c257706afbdcea41b60e57b514aab3fb227f96b8c2534efaf54ae5c267fe58b30 SHA512 e949d2683425f7548326bf2a06ee1eb19b8736df88ab580a784ccff5655ade6804f1a86983103c7d9c45258a55fe80e8272e29fd285ca14ab1b4ef0fa8d541af
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/pypy-7.3.4_p1.ebuild b/dev-python/pypy/pypy-7.3.4_p1.ebuild
index 193e85b762a2..5900a0ab55e7 100644
--- a/dev-python/pypy/pypy-7.3.4_p1.ebuild
+++ b/dev-python/pypy/pypy-7.3.4_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index 2b5dc40c4879..198873509ef8 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,3 +1,3 @@
 DIST pyspelling-2.7.2.tar.gz 150911 BLAKE2B 813eca2c4bdf377fd7babec376dd2991713db59c66b509c656cb24a314776c2cc360ec9ff884baec6607f27cae3169672746580d3c58abad35dbfe9f605fc51e SHA512 2937c1985ec6f27713275d9f31d3529e35f219df211be0ac9f1ae89d5c92a1e52c51b982291be7bd25375eb6404f52ac0ad893afbe73aada1fb03923dc09f721
-EBUILD pyspelling-2.7.2.ebuild 1341 BLAKE2B 7de879854980c9690de5459caf5e620d06fb691a2077d2621a187964f7d8ac2201a0398f64b0da0dff9e575f857c9549b04273990957318b46657a7d634db7b9 SHA512 e8c7626558166281791fa12e17d2642fb3a3a6b154d31f265ec0084a64921595ecec32f2fe6b90713d69491537e37b69607afeb86c16b9c2bfe62ec272ddb525
+EBUILD pyspelling-2.7.2.ebuild 1339 BLAKE2B 96a39eebeca78294d1953d455a4565d90a2aedfdb3296e7f7e87c7ab7a21e36a0f1336dab2a23bc1601c1b5d0cc5b0686c4ecf84e8845153d8f4ddd5aa4ef9e3 SHA512 a87e64846eb564529264ed0144a1ffc956ddc6a508b4ccc3d88e733b7cfd419c877a3aa6085596f361c7857827c5e58b1073b3c8d24da8d7d087fe2c3dd5e4b9
 MISC metadata.xml 1922 BLAKE2B 0c37a511b81e5cbd3c859848c6dc5d6956534534a21a680abe897692e7da6f399d0cf9c0fbfde9e2246cd20fee7c7884f26c4a3362532b6888346bd559cf11b0 SHA512 64ed2646fb3210997ba08dc3a4eb33299d30015d4060d0bc3a24221ca1067aec99c907efa870092b3eafe1d5724524022d74d8f6feafba3013b65f7cdb8b2f9c
diff --git a/dev-python/pyspelling/pyspelling-2.7.2.ebuild b/dev-python/pyspelling/pyspelling-2.7.2.ebuild
index 3d26b00785e9..c22deee77eeb 100644
--- a/dev-python/pyspelling/pyspelling-2.7.2.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.7.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index eab7bc63e7ed..2e8759819115 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-django-4.3.0.gh.tar.gz 71525 BLAKE2B 0eba9d9917759369aa2e126539f17fc36874453caf59838be2baf660fe29487aa80490f2af4ecbd72a9ba1f63a8a87202af2eff7e9d28c9c0fc686b09b07e82a SHA512 3c3ac31ed75daa29ab473ef3b87b5c66333cf7ccd8d217eb120b7899f463aafe5982b1e867e26e3b9ab51f312612fbc3d9f1ed9169815507816267fd4de76757
 DIST pytest-django-4.4.0.gh.tar.gz 72905 BLAKE2B 4532bef9afdc7f11fdf9a16f019810d10e4e580b517958722184d361a69a195f6c66f7f3bc18be6cb7f63fe4576963c59a00d72bd8a42f104d26e5ad091c6d54 SHA512 47e4a84606aeb6bb99ed74603faf988298d52f81f74ec8e4608cb670f0f331ad0c6555f3e4a516fc7834aea4e634f849dc0ff6d446a86e924a116fbe90bd79e0
-EBUILD pytest-django-4.3.0.ebuild 818 BLAKE2B b27be5e4ef794426900ad4997bfeee3437f326baf706945efcec9679f1969435a96aa5c5ad58051ded1834bdcd4e20dc3e000643f20bc06c6a2ea7a935b0d089 SHA512 103a3ede84e5f4110a89abd25bbd0ed4b7d5d860399e912e7b1673e046b58a35c1ff21e4ee9e3a4647e1d4f5a01f7c75a0278f46033d1a5cdb34441e7e9051cb
-EBUILD pytest-django-4.4.0.ebuild 1290 BLAKE2B 5485f3b3a0685d11d34267831f9c41e2dccb086e3873b7cfec931a1ccf719d49bf037bb0e0dc2c1712a3a9f9a442b6787576ed7950c845b4811d05576b78c7f9 SHA512 bb0d2381f2d5450565f064d923488eb6139cd47f426deaf598bc6d7525c1ab2263a005be86f7a64473fd985b5a9cf04966df56dac10c96dd9bd05a73491ec542
+EBUILD pytest-django-4.4.0.ebuild 1286 BLAKE2B d897dc82fa35a4e9fc9d3eb2d71bdbcabd36451a873ac04bc890d179dd1552c73fe4e7bbdaf6378b919ecb8186e048420d181a5c1f56351f324a4fd18ddfd8fe SHA512 b58642feb8472dc8ec0081173ada5c6535b58d206304acabc48c48516dd6e7d3531d0b1812b705a88d22e139bfc5b9506da1040ad57fafa3aadced56c2bb5059
 MISC metadata.xml 404 BLAKE2B 24556c59793b77f5c6de6f5c1210575d7bf7b5dc55aa7427d630d21311a77b31e3c846d5198ebf9b0407a0b1a36eae17bbd37a988c376eda666680871de30ea6 SHA512 33db1ea8ab6490e9b09daf334f48aa8db16db565e264b47b120797aee63c08c99aa27cae3c0a55a21c87552f99ad1ba9a13ba3b53e4562608209efb87a227268
diff --git a/dev-python/pytest-django/pytest-django-4.3.0.ebuild b/dev-python/pytest-django/pytest-django-4.3.0.ebuild
deleted file mode 100644
index f5c36d290b8a..000000000000
--- a/dev-python/pytest-django/pytest-django-4.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django plugin for py.test"
-HOMEPAGE="
-	https://pypi.org/project/pytest-django/
-	https://pytest-django.readthedocs.io/
-	https://github.com/pytest-dev/pytest-django/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
-"
-
-# not all test dependencies are packaged and this package isn't worth it.
-RESTRICT="test"
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-django/pytest-django-4.4.0.ebuild b/dev-python/pytest-django/pytest-django-4.4.0.ebuild
index 8f1caf61c800..c106be4d96c2 100644
--- a/dev-python/pytest-django/pytest-django-4.4.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index dabe2c99a1c7..8af4a3b88b59 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-env-0.6.2.tar.gz 1693 BLAKE2B b303b8b2b486cd5f6c6273fefe709e3986183a56b6758b05f8bde973c561ebba9646538d38783749305740d8bd637966966a109fcd600cd6f6ee059449ffb328 SHA512 0b3bb21fc881023c102b584593c6e28840400ce8190810f33f9a421df4141e17dcfad2943c4159aaab82376b7b47b07b45f97c9cb232a7d17c4d35b55966596d
-EBUILD pytest-env-0.6.2.ebuild 444 BLAKE2B 637057885a5fe01b05342ecdee6c12ab116cad3438173041b2eec1dae58533acebcae0d20794b8ea6cbd774a0c1b3d8ad022a5ba8cd5c1293df5d2d5af74977a SHA512 9f5d18f32638bc02999536f24a95270ec37a273bd549e88afeb05772234afd00c03d1f459987effb446ba028a87595324d3f3be88b440da1c6cfc3dfc5694d4a
+EBUILD pytest-env-0.6.2.ebuild 449 BLAKE2B c4d50baaebb0d4521e622423dfa9aa40b94986c9a6cb418c74dc06d64ae88b3dbc164f70296247e2e49dbb7170b21e8a57a4ee0b79d1bc97452322fd38478b9b SHA512 9713ba407480c7b978850f77e0eaf9e1a790f725b235a6ba3e0287c910b4cbe0acb2cc17460ad0411f644285c02ef9c3c41a35ae1833e1810bb3e26ceb54dfff
 MISC metadata.xml 382 BLAKE2B eb1fdd8ca4d109c876623b0bfc00b9689e3cbd34593ffc00e6738f143f797887f469eb3304d084e3665eb3566365eeb3dd87452c60279da2f839becd1950a990 SHA512 2262a2ea6b21b75e76f056122ff0dc21e3a5970ab982de1d5b6156105bfdf1e3a7afa2ccb2d5d9e9f57b18f74b3c0ce067d87048829cc85c917d86424e816f94
diff --git a/dev-python/pytest-env/pytest-env-0.6.2.ebuild b/dev-python/pytest-env/pytest-env-0.6.2.ebuild
index 1f49f7caae58..bfa82056efcb 100644
--- a/dev-python/pytest-env/pytest-env-0.6.2.ebuild
+++ b/dev-python/pytest-env/pytest-env-0.6.2.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa"
+KEYWORDS="amd64 ~hppa ~ppc"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index c7164d0dd624..2a3f66e3dbfa 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-helpers-namespace-v2019.1.8.tar.gz 10274 BLAKE2B 1d232817e99909738f7f37466ba22fbeadf75f4fbfdd9b61790dd79418bedbce4ee219e5102ee2db1709ba991e323ce6edffc68c4e3a657c58cb628b505de098 SHA512 d5f4db3ece8b0e1719c4d1213a5e07a3c53257b089d3d74f90cf86f21a7951983a95286c7753f5e9486acc7e482d79c2a95d5a7b8eb22e19c7048db99fa3c421
-EBUILD pytest-helpers-namespace-2019.1.8-r1.ebuild 822 BLAKE2B 1e6411d1145360e4049a703b94e01ddba7214bef7b31f405092fe1dbd9bd5b98127369f692f111585694c6bb74b04f6a5afadf4a7164b58272048038291d9600 SHA512 3261593e567e887ef310c852ed2ce804dbbf278392ab0e1c29a2c24971d128bb85f70f4c520c237c483228173feced754887d83a7a86a63634024374458fd665
+EBUILD pytest-helpers-namespace-2019.1.8-r1.ebuild 829 BLAKE2B 345691a4f76889eaf53383b98c90a4180928c1e30d5b1e392ed2f9105dfa6dea85d9a8e40ea12371681eea0ccdd3bd5774dd17c2ea52532aabeb807c5f3e561d SHA512 af664d73031b7474bbda6e117034cfd82a9a1c2291a5439cd8395d18041aac1dae2eadebfe976c4affc4ae752da3f6b5bda8ab513b1f80a5e62d02a69daa6479
 MISC metadata.xml 415 BLAKE2B 6a073523c1bc77be20e0332514be3e351f5d83a22b5b03f4445ef136c37ffa07e779e32ae9f254306f2af2541ab47b2246ba7556a954b135b0fa70467688b09b SHA512 52e0c48feaa7d06214876c9efe87eaf0f27785aa095c013c5d6365e2a277eb56ef894a1bf5de754779d84ab38ab6deba2b5a68aa338b8d5735c6942beb214bc2
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
index 68cca9d51a2c..37fea95827a4 100644
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index b02cef2e7f9c..602919263233 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-salt-factories-0.121.1-tests.patch 12284 BLAKE2B 4374c59c530d5e0171763b376ecf883354ada4255943017ac60361309dc5799ef563233474a5fa1756e7193285e46d7186973c8413b558dfcb3408cd42aecb6f SHA512 08ef49871ca4882dcd57a51c99e40fb87267ff07c666c54ba475061fb113f5e985c0c23f586366c33cb00b07bc190b98e6d7bb080004ee8b7c171bdb016f9ef8
 DIST pytest-salt-factories-0.121.1.tar.gz 102121 BLAKE2B 92cd5953b11377f1646f01b86a677a50216d16bcb944235a3f04176aecbb005974c415adcbf23cc391aab41b1ee9596984516ab61ecdd8c944d4ce707c39ab00 SHA512 32252695c6e8b17ef17d3330c4b0b38bdce89201d5573b4efa3531a72e826ee1fb26fea3ad0408401dec867cee405f21031804c32eb8fe6ceaa00925b17725a1
-EBUILD pytest-salt-factories-0.121.1.ebuild 1732 BLAKE2B 40b25f2bfaaa83760dc91ffe291c49a6894f02216ba19f5d02d060c07a33f213e3b8dfbf3c64d752066df1eb40eec249433ad18410b407a8a8dd2b864d5f9c4d SHA512 0efe47206b8b0eaf74e56789a7fb3385c0c93ceb7d85271cbfa9d70d0ba813cbb0e71a50f9a5ba1b4a42757ff4d8d89131ee15457fb76bbc616da87999703211
+EBUILD pytest-salt-factories-0.121.1.ebuild 1739 BLAKE2B 2af58377499c95034448eb9701207cd0df64847757290e58c1e9165d2c5116a6c5fc4791e9ac0b3a3c60d90024d2465227df391011f00d15e36dc04ee23cc22a SHA512 906121fe13c0285af7329b42a3688ee18f558d32e856a84977434130b32a44c8235f374f01c3333db2878904753ad21ca0e32d977c98cf46b298aa35becdec7b
 MISC metadata.xml 357 BLAKE2B b94cb0c96e720905214dd706d61a7280f2209def7f2eaedf553d83204ee49fdb4c6f668531bbc39f9bc0ea32a728293d1c7892b6c1eb8f2babb185cd32b5d709 SHA512 ed4155a008f387aad4cbff6a314c5240484901f0bef50a3225b16ae1068ee4e01288b4c3692a9a075785c98140a20d51d17b44504eb77da3436ddefb3c0ce017
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild
index 9242c9775557..ade1afad5dbe 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index e67d3bf4bb60..226b19e71403 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-salt-2020.1.27-r2.patch 744 BLAKE2B 43eadb0fb01406efb9e67388a6b0ca5a021ae6ec622ec5dd5dfb1ab9575489c711dc805ce64e1373e4a0044490d71132ff4eb9584f3e9f2fb043a168d18d8349 SHA512 b0a0d56dc7d5ab43a1970488128c97de5f2c266523889896cab53040cb8eb426bda88cd8d641d706b6d09fbaf1b3f439cbfe947264cc004e766e6cc84350076f
 DIST pytest-salt-2020.1.27.tar.gz 64141 BLAKE2B 2b9261af2de28f8dce1abcd71b586594075916c8a5dbb27a24f15b9d95a575624be118d1c742f02020d3b968ffa4654cf6cd0dabefffe6876b87a4d1d58c3d60 SHA512 b0632e21f1ea5c3b57eb681cd8b270721cafd270321b708fca65427fc89817ed9e9a4216a520f35988c6866b1ed76ed84838009da9052a11cf8782d4dcf118ba
-EBUILD pytest-salt-2020.1.27-r3.ebuild 1118 BLAKE2B a4c0e7158b9c7b97e9677415a99a0c382581a394fca6f3d89008ae7d1f4879aab41a6cb9504690373c0a9c6b150bd3bc6f858d22ebe335a4e7159802453dc98f SHA512 d0266bd26017043833368f7553d054edebfb39ae0fad5c8f21e808a92f8a2b09c0c871e0cc1123010184e48f6854465bb66a2c041391e4a0597b6d9a0433b7d5
+EBUILD pytest-salt-2020.1.27-r3.ebuild 1125 BLAKE2B 97653e44532eb94f12e62a998588c8263f1e642038f32b83544621c1e7d046737187a9d79d73a6ef689871f1f476da390c718ce228fd1f4a78641cbeb567576d SHA512 dd7056b03b43e5c6924d46fa7dbb15413d75b556a594f02ad6c1eb42a39e7104037d511c7d7e064158e0a012f7f737f5ab4e4d31e429890393dd5913d3099881
 MISC metadata.xml 323 BLAKE2B 2eede80f9d146aa2dc511191d1e1ef7a689786878c2ba77ee62dc181d49ed07475f657886e6f9d662140ff378ddeaf65f979a6e483b92ff97834e934b225b430 SHA512 ca8b7955dc3025e3ed15ef0556b02a80b033dc2003bbb3030b42112e04d1945436a3ff2224bd2149ec34210d50a66fcc0b1577dd1464fc8e1e4ed097286e02a1
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
index 71b7c59306f1..22e46b7878fb 100644
--- a/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
+++ b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 # See bug #740882 re salt/tornado dependency
diff --git a/dev-python/pytest-tempdir/Manifest b/dev-python/pytest-tempdir/Manifest
index 07d3e1cebd75..71a56719b4b9 100644
--- a/dev-python/pytest-tempdir/Manifest
+++ b/dev-python/pytest-tempdir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-tempdir-2019.10.12.tar.gz 9859 BLAKE2B fe4d32d2de3d577952b90a811c38f1cfa0c16badf9115a1b70faf07f0123e29935c01bfc3c1b9c616a0eeb3e0da9f42a4415687a4862830e0edea505a99dfc04 SHA512 d6f8994423d9be90f4be20878f980ad4604475ccd4b65975cd3cad357c2d6a2a7bb8623e4ccd7441437ad72b7899d8b59ae19ca3a52c35a6c24456e44b7626de
-EBUILD pytest-tempdir-2019.10.12.ebuild 643 BLAKE2B 09379357f9edcf733b727007e48fb6bfa2549039688869c5b2841f54d04798aebad2a6fe51ba45820c84e017d33c8df9cb1ebedc308b3880d6a39b76fc8b12aa SHA512 93b3ae6e7e05071b62f608ca7f74c30dee24bec7b50da7c565db6f620d6eeed3e419249026c4f26a19c5d644d1a8945ab1206081e42e478467ebb95874c8cf99
+EBUILD pytest-tempdir-2019.10.12.ebuild 650 BLAKE2B 5ece3b87dcb9fcf28b757198af4f049a5f2c8e458107f109541dc00be6bb9b6dd814f8709f947857526275d2ce5a202bf1be961114ec2ffdf8c94e68ec29b67f SHA512 c5676a39f3aa7b7a123df72481e89142cbe1e373254a4aeea2ce04ddf2bca98449d186005c792ce4cfd3d24429e252dc8be7b7fdf0eb1c973ae5203798fc35be
 MISC metadata.xml 326 BLAKE2B 9e3ebe5f21ea79c1bcf36480d71363aacbd79499aa6ad5c2189aa08f4383400eed646a05c5f820bb803405fe198b4981cb5cbabe737c89a5f92e723eeac13285 SHA512 a221e01e2f66ab996b06e4dfaf6c8ffca79849e635ecb5f443574190a33e934b8e28839d142571cf8eb1f360ef418ed529b60a60fe5d99c0ba208e37cc0bf784
diff --git a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
index 42bd6f50ccbd..f347e2e070f7 100644
--- a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
+++ b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-trio/Manifest b/dev-python/pytest-trio/Manifest
index 08fb1e64efa5..d4944b5c63ff 100644
--- a/dev-python/pytest-trio/Manifest
+++ b/dev-python/pytest-trio/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-trio-0.7.0.tar.gz 47784 BLAKE2B 59b28df45e87804e0b6eb557a0cf259fdc3636cc7a03d78248fb814d55904ed01d00a530b194b2bfe93ccfb9de528d70a372faf1f6db24531c230319122db2e5 SHA512 547036c94f33cf8e755c88d608c5fddfa5c583fdaa7e604598d470e250a006c571702a81bac4f273b74450a8c10e4be404bad74d4104403fe1c9c70e872dff53
-EBUILD pytest-trio-0.7.0.ebuild 1084 BLAKE2B 9ac8375cad78d0ba31f4a0aeb7be8df0a4306de898a144b6c29f903e13358690a828c90e3cad36f661343058147a19f1a3e0af3f97df79e6c46420a6f57ca2f6 SHA512 b9b075ea6a20475f02aa7364020b0b7899531b69bd8bfa0c02aecd30d91459eef50c0f3c4283d5a0d2e03db27fb43f15321a3b3fe8108373c7aa3a44667117ce
+EBUILD pytest-trio-0.7.0.ebuild 1101 BLAKE2B 28bb8ffb9091eb3c837df4f67e37a534f819df97ecfb5325c9f1470a85d1ffba597c389e1962c205dc37812eabb28154d96900442260f242f5e2cc71a8fe268c SHA512 4c407e6a2a8f4611aa3bcac144baf4189735798f7b5d47c6210a1e4389b4be43ce2898968a1c82a05d9b1904b6c49f52d78af3a60386750cd73f84b7d2a0aaff
 MISC metadata.xml 419 BLAKE2B e4bf5b235b2b851e2677e138ab488308deb5265d00afa1c5ff2760e817c7a8c9fdbaeb095bf63ad6c9ff0a5dbb60df5c047b6ab9564c590becb7da76a3258db0 SHA512 1d21a7481afb771ee6507f6475f9460bd0f8441de68987e2a31923091b33bba4a9fe5d6a8ec0b313d8277942656388c1ae6fb9b7cc0de601655762b66b111e0a
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
index 7f687059bbc2..11892c344258 100644
--- a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index c9ad7b78ff18..89a418593031 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -4,11 +4,9 @@ AUX pytest-6.2.4-py310.patch 1288 BLAKE2B 7fc0054de8a991f71fec041372839b8df52da5
 DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
-DIST pytest-6.2.2.tar.gz 1116980 BLAKE2B 7e74050f01fdc4b1ba8a6d703915b0d707305e6e8299917fff8e0cedb873f998c9a904728b77e7234718016ccdac15d491d10411c582d1bfa60d2450a8a2fa7b SHA512 a81def83759c550c169b3db8ed43b4df40433a88acb663e2e9422ef562149ed52041724b7f3cc5d0d6b532f2243a8d9a9614ffbcd87ed571f7fdde7f036c2297
 DIST pytest-6.2.4.tar.gz 1118084 BLAKE2B 611db50e7432dfb6f8d212621a3803871fd8f6c05ec3cdefeb3958d0886f754326fc358a9a67bdb3f516388aab901b169c951471bf304adfb78fe457dc59d6c5 SHA512 43adc9a78e16a05f07e689e4557b63f2e0f4de5a1cdea6f24272b6a658a6b0a18721713cf46b5102cf2726ddbc4ffe131c39e652bd2511d285f40cbfcccc2289
 EBUILD pytest-4.6.11-r1.ebuild 2471 BLAKE2B 159e689c5597088979d0d1d0e9be37b0128f2a3bfe54cd0bc11ab6c4d7c26fca121a0bdaeaa1621964aa24d8b03580f0a00663a1b77a6a62195d031deb1bc712 SHA512 4533c66af3f820c63437504655af8607923ff0b0d386a38073dd32eaacf0f47043d3b31e6cca1aff353aeef7b82ea747737270db1e8cebbcb2fe69750fe24898
 EBUILD pytest-5.4.3.ebuild 1938 BLAKE2B e40cc338970d931c7cd51b5a6377f5d73cae21789fcea2a6f2b401f92fb9dbe6e12c45b3357a10b76c0d6bc11708f35b8fc65a3b7084328b5664c0ad2baa6c77 SHA512 dbfc71f4a77d366a1eb55d38a1c8f209f6e6d42fe22d0604a5695d8e99faae05883b82fec45b7192399ccbc7bddc25997291fca9638edc01d961b292190d25e1
 EBUILD pytest-6.1.2.ebuild 1662 BLAKE2B dddcee1dba302a810b80dd9832edc6af6f044ab728497498b5b4b762dfbe383d7255fce15b0615c37c3857ee2353546de2ee6b7093b01651f43ad4df7cbbfaf6 SHA512 e9ba570887b4ff0889abc2db20b3de2e634be5ba5ba60679f45c466006d3f7626c329c65f427b1cc6ede1942d2786ef4da44528a82d8be09752e1e028dcad2f6
-EBUILD pytest-6.2.2.ebuild 1680 BLAKE2B e415039d858be4f81b542b7c82d1781c61cad61c52575b145d9781057af6d12490c45a85d583add9dcf1555b0932a1db30beea6ecee45f9b7bcfcfcc2b62875b SHA512 0e4d8dfe3eed27af6c5ba337928ee417776b64dbaeb0dc8e8f163f6c7b3c62ddd0906f4a94250b21651bcaa088f865a7a485907123fe45a2a39b98b018e5c3af
-EBUILD pytest-6.2.4-r1.ebuild 1721 BLAKE2B 930d9090a3cd0c3e33d0b55bfc73711721c49fefa217d554be5d029966e00275c6b1694853cd5ec3832331e4df9ade9f0ba4a0539f3b053ed4519b4d5dee40f2 SHA512 ddf8d993ef02a0df97989c478896284a587653d57b0002b9747785aaf96e2c16502a7cf54c96ab1e9b5f9da15182d34d7bbe133a52f28fc263305d8e6ab4e2f3
+EBUILD pytest-6.2.4-r1.ebuild 1713 BLAKE2B b410805cb4f066f290490eb30ed49f9612b1090fe1fb5ae6c3e3f25e4b4225a77356e30ac68bc7a13081f15af4d971a49d19b233e099895304b465f9db6c5be8 SHA512 f7f7aed5d4655e3412250117f7015867e48e6b7111e95f3bc2e70d0791b662eb0cdb3f76b55ebef67051e5df4f61be7c36756045f02fc2324673c31c3cb91e2d
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.2.2.ebuild b/dev-python/pytest/pytest-6.2.2.ebuild
deleted file mode 100644
index 68c99e5b183b..000000000000
--- a/dev-python/pytest/pytest-6.2.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-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 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7 pypy3)
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-# flake cause a number of tests to fail
-DEPEND="
-	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-python_prepare_all() {
-	# fragile to warnings from other packages (setuptools)
-	# little value for us to run it
-	sed -i -e 's:test_no_warnings:_&:' \
-		testing/test_meta.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-6.2.4-r1.ebuild b/dev-python/pytest/pytest-6.2.4-r1.ebuild
index ced1fbce5e57..de8a62049379 100644
--- a/dev-python/pytest/pytest-6.2.4-r1.ebuild
+++ b/dev-python/pytest/pytest-6.2.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-backoff/Manifest b/dev-python/python-backoff/Manifest
index 86fb94f95d63..03fb8bf1811e 100644
--- a/dev-python/python-backoff/Manifest
+++ b/dev-python/python-backoff/Manifest
@@ -1,3 +1,5 @@
 DIST python-backoff-1.10.0.gh.tar.gz 15546 BLAKE2B 4e2ff1f63a4659c9dbf3135f32da44d4c127909178ffe0fe6935cef43558d61087498d0cd31260396da0ccdff360ee1025db2c0347fb865468abffed2f4adf49 SHA512 9a874a12462c56e8559d2d3d85508f546c397c9d419d1d9ab81d9a046d27b338068f6baeb768fa78b43eccd299de71ec7d1471c4fb153f8c02e6f7292f56b285
+DIST python-backoff-1.11.0.gh.tar.gz 17566 BLAKE2B 4afed5284eb3cbedf54e06fcd89861701613357c672ebabe2611a4bc28c3a6e4539e206cee24bb6a646f7c16c033f16ef56be3b21867aad760b71410749383b7 SHA512 0f5e176bf9d093a72068cf6e55ada8da3e8ec67b85b4fba2d697117dcb3c563a429ff53c5fe17b4a20a8b5ee0420930b789478bd89de5949b628158263413a60
 EBUILD python-backoff-1.10.0.ebuild 650 BLAKE2B 35dc9679fe73c508d9195200938545769084c06a61e08c2f52d3640743da205f0a3ab4730fb3137334388ea01c873a3a6ac1adf90326bf281fc015ec65e8d870 SHA512 523df6c47ad667885884ff686175244f555a7804eb073ea00ec0955030fa7a05ca9b9f4eb00ec1c3eee88826a5659d27f805e4d749911d122f960d6995c1dd32
+EBUILD python-backoff-1.11.0.ebuild 649 BLAKE2B 0e3701d5ba806bffd57f2c1323b69dff208c218fb7f05b54ca3cd6ac341fa8fc9d73af9747c81ff94680a66194b2eb089e9b7cc92c0f81844b44e3c5e5e969f3 SHA512 6405271093cab8a9c5d38d898ba82214ee99e475fd2cb23bafeb233097f6c96ab7d660c95f307d0b4bdec24dae165dbf0335dd0a2ccd075cfe944716728019cb
 MISC metadata.xml 386 BLAKE2B ad575b5fbec1d1816f4405f05e092307346a49ea9d70f38ac2429823efd2dd5538a5b5c039014e948bc1e1bc4b7695c62dc90345a232389c185645f11120bdad SHA512 83267ec512b870806fd0cd9d0c8bec3d9a42c8e54b0121b6345f1188626812efff0978cdc727f955bc2b02901741e69a9b20e9370454ecd7a6d8ef562b94a520
diff --git a/dev-python/python-backoff/python-backoff-1.11.0.ebuild b/dev-python/python-backoff/python-backoff-1.11.0.ebuild
new file mode 100644
index 000000000000..0d27ca00ec2d
--- /dev/null
+++ b/dev-python/python-backoff/python-backoff-1.11.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+MY_PN=${PN#python-}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Function decoration for backoff and retry"
+HOMEPAGE="https://github.com/litl/backoff https://pypi.org/project/backoff/"
+SRC_URI="https://github.com/litl/backoff/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.rst )
+
+BDEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index ca031abfc524..c7b7050f4c76 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,5 +1,8 @@
 AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch 3537 BLAKE2B 7f36974a98f5e6ff1961e91542e7c0ff8ee1d62ec4a400a8d8e09f60625660a5d76001855f876aedad7a66980fc5bab8cc2168436e8eddd9f2acfda0682c96cf SHA512 f540e9fd12d98d4d9ea2033187644856d7c7591e4a68f6143fb9335ff367a5b82f0dfdac90ba1ae8141d46a92f6a29015bfd71640fba60967571de4dfa8648bc
 AUX python-dateutil-2.8.1-no-pytest-cov.patch 687 BLAKE2B 97eb6d653a013b6fb279209804d7a82b4599ed672eb7a6b94654dc789ae3ad5e2978c9684439d94e405423c0a022ff70155c7d50f5d03a5e74cfe111a665ff7c SHA512 f4e90ed1d1cdab509a574319ae6cf0b646c2741eb05459c408caa29e1a6ca512e71a258ca8119c8e1f59948276c9e14e726b6f53cea868709bd89dea2280b700
+AUX python-dateutil-2.8.2-system-tzdata.patch 3495 BLAKE2B b3d5ca203731932044f16bcde48f8f981f6907ce8a9319423d41eb0baf62331d472c1a5dd72ec3ac1f059296423adaea18bd4ea6d660add56cfd73ea86f26bf2 SHA512 44d2f3f9f0c04401cb545dc0a757b682eb3a9a66e63cf64121e75243cebdfa53945c6ae9bf197cb6b754c9732e9407fc9384aa45b2d7181740bb1ae23af718fe
 DIST python-dateutil-2.8.1.tar.gz 331745 BLAKE2B 9785fe93976d9bbe21d6610133e37e558cdde4062a1a738ccbf2bf80aa062882ba59c60f2b9bfc44c53e0f8fc4b5ebdd5d12b6ba54a60706576360e453b2f160 SHA512 337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c
+DIST python-dateutil-2.8.2.tar.gz 357324 BLAKE2B 060f97280b63ed70e6d83fa5696af6dc3c729cdf5bc48c7a90e3e59eb0cc0360e5205536685550330d64ecc9b6e40ca12888409d6819dd136b17a67add2ec4e8 SHA512 6538858e4a3e2d1de1bf25b6d8b25e3a8d20bf60fb85e32d07ac491c90ce193e268bb5641371b8a79fb0f033a184bac9896b3bc643c1aca9ee9c6478286ac20c
 EBUILD python-dateutil-2.8.1-r3.ebuild 1340 BLAKE2B 8f8e2e3d36045f209552b16a6df0e5648a7410865b0d7116e747bac5a59a13a9e72d9583a953b14569ded3442bc7a414005b77f2952368e2d98f10b3a4c3a373 SHA512 38476d0ba7a9d468ad98c98000e65304afe65495d4e90c5294425ff3634102268956b976937a935aec70aed31faec12164cc993c49330f4cd8f775643a917fc6
+EBUILD python-dateutil-2.8.2.ebuild 1112 BLAKE2B 2029671dc44c981f31e18aa53a3d8f54d6ead96e96b2d9c2b4c61fa47fdadf0b25914028607c1d5eb8b4237b2bed424b9bef1ff807f7028ed84c601739ef0af0 SHA512 c26177bbc9348e49b285b8ce6eb7a9e197ecd7253b161d6bdf89efa10dd18836c6e1ce351fef77454e73a8953ae33dee9f9ec4df1a4283342c3538060583a21b
 MISC metadata.xml 603 BLAKE2B 1bf49feeeec3ffc2f767228a84b3f9edf53cf44d8a1df3fa8f85798c0d3ea8f448d6113d425baa6b4b342b88746133d2770b951488d602dbb175f5ff9a99ea36 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439
diff --git a/dev-python/python-dateutil/files/python-dateutil-2.8.2-system-tzdata.patch b/dev-python/python-dateutil/files/python-dateutil-2.8.2-system-tzdata.patch
new file mode 100644
index 000000000000..3790a29b4213
--- /dev/null
+++ b/dev-python/python-dateutil/files/python-dateutil-2.8.2-system-tzdata.patch
@@ -0,0 +1,104 @@
+From 907459c6f632a87fce5729f6eebd2adf5b94e577 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 3 Apr 2018 22:03:32 +0200
+Subject: [PATCH] zoneinfo: Get timezone data from system tzdata
+
+---
+ dateutil/test/test_imports.py |  3 +--
+ dateutil/zoneinfo/__init__.py | 25 ++++++++++++++-----------
+ 2 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/dateutil/test/test_imports.py b/dateutil/test/test_imports.py
+index 60b8600..b9f517c 100644
+--- a/dateutil/test/test_imports.py
++++ b/dateutil/test/test_imports.py
+@@ -168,9 +168,8 @@ def test_import_zone_info_from():
+ def test_import_zone_info_star():
+     from dateutil.zoneinfo import gettz
+     from dateutil.zoneinfo import gettz_db_metadata
+-    from dateutil.zoneinfo import rebuild
+ 
+-    zi_all = (gettz, gettz_db_metadata, rebuild)
++    zi_all = (gettz, gettz_db_metadata)
+ 
+     for var in zi_all:
+         assert var is not None
+diff --git a/dateutil/zoneinfo/__init__.py b/dateutil/zoneinfo/__init__.py
+index 34f11ad..e3f0f94 100644
+--- a/dateutil/zoneinfo/__init__.py
++++ b/dateutil/zoneinfo/__init__.py
+@@ -1,6 +1,7 @@
+ # -*- coding: utf-8 -*-
+ import warnings
+ import json
++import os
+ 
+ from tarfile import TarFile
+ from pkgutil import get_data
+@@ -10,7 +11,7 @@ from dateutil.tz import tzfile as _tzfile
+ 
+ __all__ = ["get_zonefile_instance", "gettz", "gettz_db_metadata"]
+ 
+-ZONEFILENAME = "dateutil-zoneinfo.tar.gz"
++ZONEDIRECTORY = "/usr/share/zoneinfo"
+ METADATA_FN = 'METADATA'
+ 
+ 
+@@ -19,12 +20,14 @@ class tzfile(_tzfile):
+         return (gettz, (self._filename,))
+ 
+ 
+-def getzoneinfofile_stream():
+-    try:
+-        return BytesIO(get_data(__name__, ZONEFILENAME))
+-    except IOError as e:  # TODO  switch to FileNotFoundError?
+-        warnings.warn("I/O error({0}): {1}".format(e.errno, e.strerror))
+-        return None
++def iter_zones(topdir):
++    for dirpath, dirnames, filenames in os.walk(topdir):
++        for f in filenames:
++            if f.endswith(('.list', '.tab', '.zi', 'leapseconds')):
++                continue
++            fpath = os.path.join(dirpath, f)
++            relpath = os.path.relpath(fpath, topdir)
++            yield (relpath, tzfile(fpath, filename=relpath))
+ 
+ 
+ class ZoneInfoFile(object):
+@@ -48,7 +51,7 @@ class ZoneInfoFile(object):
+                     # no metadata in tar file
+                     self.metadata = None
+         else:
+-            self.zones = {}
++            self.zones = dict(iter_zones(ZONEDIRECTORY))
+             self.metadata = None
+ 
+     def get(self, name, default=None):
+@@ -99,7 +102,7 @@ def get_zonefile_instance(new_instance=False):
+         zif = getattr(get_zonefile_instance, '_cached_instance', None)
+ 
+     if zif is None:
+-        zif = ZoneInfoFile(getzoneinfofile_stream())
++        zif = ZoneInfoFile()
+ 
+         get_zonefile_instance._cached_instance = zif
+ 
+@@ -140,7 +143,7 @@ def gettz(name):
+                   DeprecationWarning)
+ 
+     if len(_CLASS_ZONE_INSTANCE) == 0:
+-        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
++        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile())
+     return _CLASS_ZONE_INSTANCE[0].zones.get(name)
+ 
+ 
+@@ -163,5 +166,5 @@ def gettz_db_metadata():
+                   DeprecationWarning)
+ 
+     if len(_CLASS_ZONE_INSTANCE) == 0:
+-        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
++        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile())
+     return _CLASS_ZONE_INSTANCE[0].metadata
+-- 
+2.32.0
+
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.2.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.2.ebuild
new file mode 100644
index 000000000000..3ef5ec777d0f
--- /dev/null
+++ b/dev-python/python-dateutil/python-dateutil-2.8.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the standard Python datetime module"
+HOMEPAGE="
+	https://dateutil.readthedocs.io/
+	https://pypi.org/project/python-dateutil/
+	https://github.com/dateutil/dateutil/
+"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	sys-libs/timezone-data
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/python-dateutil-2.8.2-system-tzdata.patch"
+	"${FILESDIR}/python-dateutil-2.8.1-no-pytest-cov.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't install zoneinfo tarball
+	sed -i '/package_data=/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
index 9c905995d877..1b7621eaa2b6 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1,5 +1,3 @@
-DIST python-jose-3.2.0.tar.gz 102183 BLAKE2B edc0b0e651ec63333345eb29e0c08649823d8c59e88e2f39127081a04c2afedee0ae1c83709dc45bd81f4143cc0e1e76d22117ea11160ab6418372c69f1b216a SHA512 f81e0284ef2df05a5b2dfc5448f3cce0c8988c4ba5d40f935666ee1693a964db3db62609a38192e317bab6b3945fc5c3122b59f373dbc308363d123ea9752efa
 DIST python-jose-3.3.0.tar.gz 126578 BLAKE2B d1279d2a0788b4d395e760ee3a1b2ce8c9340ad12ebe103cb1ba98aea33566cf0134d5af75be9727fff96adab4fc88f1b471ba9ea7d36c16de10587a9efd1304 SHA512 de7147cc6e12406d6e459c32829acae46395acba727c53e65bc05f4794ee3050eecd355e3ae2e87f4ebdbd871f53822eea08a10f25d7ca6088fc6128dc7d9637
-EBUILD python-jose-3.2.0-r1.ebuild 1252 BLAKE2B d2a90b8cb648ee500eb53e177793101d5b6bb3ff3b899327fed9cc34ff27e4f7028bbb0d3a23d14373279aae07642fff089e3a2dcfa593492ca7a30fff2236f6 SHA512 fb8e25206927f2df6513e022fd2633cee0eaf709d55410eac69555a906161d5a41df96e7d8f4072d880631b5fedf22ea76b6dc8211cb59271d4ab93932792dd4
-EBUILD python-jose-3.3.0.ebuild 1045 BLAKE2B 05a04f299dc5c336d2ce2df7658453fc9137d13823af2cadde8b9ebbd001c9739109c38043f6bebb4bf64acc5554cea44fff7014a0347bce2d8998f0da4a1039 SHA512 97978a1ca6885f3521486411d5286c25ce21957a3ff81684316e3fde1f53fa3b5c9b4655eb086b6839dfc7c7ce8907c31995267393e441b2fc3937d707f779ae
+EBUILD python-jose-3.3.0.ebuild 1043 BLAKE2B 929b999150b6123e191b3d64d11b64b7a2ab8c49557938d4c27211800e671a6b9b5a4ce2931a5a48229c5f9140f70944bfb8074a146ea58fa29a3de9e048ee51 SHA512 368b5f6f72400d5dbafbf386708b6639bfcfcecb4f106d3bba382f512e470b4a1f2bf89ab3230f353206a151ea24f7881a5496856113e6053aaeae7e289c04de
 MISC metadata.xml 569 BLAKE2B ded16eceef718c98d5b51e15f3342262f07a57626e4f83cc851d0505112938351c0cb01e74bd9ac2bd190b2ee3f1ef4c5b748e37c7128e9b1861a48d2fa6e3e5 SHA512 9d2dee6efdf0bf24fdfac3b55a213331ec0696e58f8f101758efca0d56477c666ebd0184a573ce53c93cd00047b06d33f9bc4de33a43f96562f77a8c21a65747
diff --git a/dev-python/python-jose/python-jose-3.2.0-r1.ebuild b/dev-python/python-jose/python-jose-3.2.0-r1.ebuild
deleted file mode 100644
index a896c8929b37..000000000000
--- a/dev-python/python-jose/python-jose-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="A JavaScript Object Signing and Encryption (JOSE) implementation in Python"
-HOMEPAGE="https://github.com/mpdavis/python-jose https://pypi.org/project/python-jose/"
-# pypi tarball lacks unit tests
-SRC_URI="https://github.com/mpdavis/python-jose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.3.1[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	sed -e '/pytest-runner/d' \
-		-e '/ecdsa/s:<0.15::' \
-		-i setup.py || die
-	sed -e '/addopts/d' -i setup.cfg || die
-	sed -e 's/sphinxcontrib.napoleon/sphinx.ext.napoleon/' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		tests/algorithms/test_EC.py::TestECAlgorithm::test_key_too_short
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/python-jose/python-jose-3.3.0.ebuild b/dev-python/python-jose/python-jose-3.3.0.ebuild
index 5623443b5629..3b1de02e732b 100644
--- a/dev-python/python-jose/python-jose-3.3.0.ebuild
+++ b/dev-python/python-jose/python-jose-3.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mpdavis/python-jose/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 # TODO: require only one crypto backend?
 RDEPEND="
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
deleted file mode 100644
index 2c6374804614..000000000000
--- a/dev-python/python-jsonrpc-server/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch 341 BLAKE2B 99635861a87bcc613540c0440edba10a3011c43ddfe91e675483db603308a655b8b77a832fc013016c7d3d0fe1dbe7c02f925dfc6b20cb514a37ca3d66c3dafa SHA512 3da608b3c7ed162d2b32c93f2f0733cc26e3ae218c65d3000d607a553240baef8ea47cddd8323caa58fea2fec59e8bf3f9b120a977b4522642b88ae55cf88f28
-DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc
-EBUILD python-jsonrpc-server-0.4.0-r1.ebuild 821 BLAKE2B f9c096ed5ed2c0c762c301431193ed80133ab21c09b8c26187618f0b70a83dcfc1f4d665e452bc9ba694dcd10568db79786b7d0968d2c9955aea11c01e3ae147 SHA512 1a78d051d72373ecf324abbb6bd1e1c0bb8120c5c3f32208e2062cefc781b936802defabac414699518efc3220359630d61da6d4674cedeb5dbf0954461cb662
-MISC metadata.xml 366 BLAKE2B e8d4fa851e8430fc170e86701301b78af07fe2619a749aa5ddb21bca3faba59407bfce4e727b2dde95c52b9951725b2367c560eb3479de48ab5052f6c30ec222 SHA512 1b6b62d650e143cc4c0de9047b541489f9db4da3fd654e27bf8d8622e428a8a3e587ecc8bbaea8248e964b2d25c28d6ceb77be57f06704bf90a2f6baa18c4f4e
diff --git a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
deleted file mode 100644
index b639d69bbd04..000000000000
--- a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test/test_streams.py b/test/test_streams.py
-index 6985aec..9e64489 100644
---- a/test/test_streams.py
-+++ b/test/test_streams.py
-@@ -119,6 +119,7 @@ def test_writer_bad_message(wfile, writer):
-         hour=1,
-         minute=1,
-         second=1,
-+        tzinfo=datetime.timezone.utc
-     ))
-
-     assert wfile.getvalue() in [
diff --git a/dev-python/python-jsonrpc-server/metadata.xml b/dev-python/python-jsonrpc-server/metadata.xml
deleted file mode 100644
index cc81d1f0619e..000000000000
--- a/dev-python/python-jsonrpc-server/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">python-jsonrpc-server</remote-id>
-	</upstream>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
deleted file mode 100644
index f19ac1fc6571..000000000000
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 2 and 3 asynchronous JSON RPC server"
-HOMEPAGE="https://github.com/palantir/python-jsonrpc-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-)"
-
-RDEPEND=">=dev-python/ujson-3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-fix-test-with-ujson-3-and-up.patch" )
-
-python_prepare_all() {
-	# Remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-keyutils/Manifest b/dev-python/python-keyutils/Manifest
new file mode 100644
index 000000000000..fd2fb09cb625
--- /dev/null
+++ b/dev-python/python-keyutils/Manifest
@@ -0,0 +1,3 @@
+DIST python-keyutils-0.6.tar.gz 45427 BLAKE2B b62a1194bad87fe42c658c0603ff236e8e5594e8d19dbf8b29bac5b2ef5b3c6a6d19eae3d529c9408e06802c883fad365d41d27c656776a4994b58a43b8bf1fc SHA512 e282d553a644d9b38c6256e027ee553a123bf21e4222491e22699ca5bc5041dedc4e9a9a8c1bafa44985f3b1d5fafd85ded9ed5332b6d94d6c62f3fa6bcb6d0d
+EBUILD python-keyutils-0.6.ebuild 703 BLAKE2B aa0847246a0e2a527865ba06e02051dc2c3b4c9d3bf2e838947960a9b40a037646938c74c19ba72c1a0565b5f941bb7697deadaf4855bc349cb99d26de24a694 SHA512 da1fb4c3bbb7e5501803b273a5c0b0fdd04e1b01ff75ec6a1fb5e59a7217732f60144f63d17ec05e64cc84dd6ae5f2ae2e29cc0b5e0dddc307b01d9eca1a54a0
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/dev-python/python-keyutils/metadata.xml b/dev-python/python-keyutils/metadata.xml
new file mode 100644
index 000000000000..c67d4dcaca5b
--- /dev/null
+++ b/dev-python/python-keyutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-keyutils/python-keyutils-0.6.ebuild b/dev-python/python-keyutils/python-keyutils-0.6.ebuild
new file mode 100644
index 000000000000..3934da52194c
--- /dev/null
+++ b/dev-python/python-keyutils/python-keyutils-0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A set of python bindings for keyutils"
+HOMEPAGE="https://github.com/sassoftware/python-keyutils/"
+SRC_URI="https://github.com/sassoftware/python-keyutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-apps/keyutils"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	sed -i -e '/pytest-runner/d' setup.py || die
+}
+
+python_test() {
+	ln -s "${S}"/test "${BUILD_DIR}"/test || die
+	cd "${BUILD_DIR}" || die
+	distutils-r1_python_test
+}
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
deleted file mode 100644
index 90011ef1965e..000000000000
--- a/dev-python/python-language-server/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pyls-fix-test_folding.patch 1238 BLAKE2B 1942a7d0b21a25310c2fe361e7a91cd122b5131e75fe2a73e2251a8af7d83678dcfb04e2332d3f7d1bfe9c82cb2d14afff59e354b116169eb5323a245ec5b0a8 SHA512 688036513cacc382159cc8872d55664081020b29e530a4695863dec9bbdca7f728398a55e4b8f1359b0226cbc09d4bb791fda9294ae3141ab1b2797493f2fc32
-AUX pyls-jedi-18.patch 2620 BLAKE2B acd80d45c93096f8809f901381e04ac88a869c8198ddc30991ecde98690567df0740334c07d870b8bc9ccf149fb0534f2f4d03007493189c1a6e853e5833ac96 SHA512 804308c6ce4d6189bf65f33397550d10b848e109a7f547f4bda80e9a78b68921225369667d9c72c3dbb954bda8a35af038596fac3b4ae026f952776f9bbb2c16
-AUX pyls-numpy-1.20.patch 2387 BLAKE2B 98178536140797b12e0725d407ed65df772560eed8cade7d00a8f0c7ef691e8a6cc3141babbd337da6482e959b32c7666eef6ce35de41ec1a52328aee5b8c7ae SHA512 c5708708da39ca18162a567f8006a59b5255e3a46c209b1ed7a0e309280cc5fc606c39dbbd259f7103854ccca9123fb478ebbd95bc0ca420343672b453ae7bd3
-DIST python-language-server-0.36.2.tar.gz 74499 BLAKE2B 0bf950e236f8f898c3158afc2b3355948340639b607f474654b0334d484170a210b6e81c7508f12368223ae9915ccf19f76a1bcde41503230d8c008ba0818b47 SHA512 ee909d9332ef76c616d727ebfa36e80fd03ab57df8fc57265de21f0105cc0b64a518b2a8a582f88364d03a7d2a66e1030bcf5b3452ad3a891a3141da9b338373
-EBUILD python-language-server-0.36.2-r1.ebuild 2609 BLAKE2B 47972e2b5a39aa5f26f31e753aa9861accdf0aae48f9988d9c3172e7a59efac002ca1f139a9e9a91995cf2a887cf1781b826eeb0c01a796a6027f629758edbfe SHA512 032c5bdf6bb8f29787d75bbe4253bf0c4d72ce53f37155533c826aec8758ea91174581d72f458dfa9e86c1920ab6586a6092f47ed6a6faf26442000c8a7721f4
-MISC metadata.xml 367 BLAKE2B 5ec493b91dbf785b84d4596f7f019f3be92e239cc1effc38fa7b98e762d06ea60c6ab8203aad5bb5fa4b4fecd7fcfde5a1397469b179ecfec720ce06187dac34 SHA512 57e659d74065826e25af609c7a1c20f540b1a67fddea4697602b16901ee4905883742377284795baf4c8a2eab4716afaf209761d684207941a3406f0d55ef92d
diff --git a/dev-python/python-language-server/files/pyls-fix-test_folding.patch b/dev-python/python-language-server/files/pyls-fix-test_folding.patch
deleted file mode 100644
index 6980053bf48a..000000000000
--- a/dev-python/python-language-server/files/pyls-fix-test_folding.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2d3c52c7b9debd73073650d22a3aa6e86d5491aa Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Thu, 1 Apr 2021 21:33:38 +0200
-Subject: [PATCH 2/2] TST: accept folding of decorator parameters in Python 3.9
-
----
- test/plugins/test_folding.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/test/plugins/test_folding.py b/test/plugins/test_folding.py
-index 05f0cdd8..91ac0f3b 100644
---- a/test/plugins/test_folding.py
-+++ b/test/plugins/test_folding.py
-@@ -1,11 +1,11 @@
- # Copyright 2019 Palantir Technologies, Inc.
- 
-+import sys
- from textwrap import dedent
- 
- from pyls import uris
--from pyls.workspace import Document
- from pyls.plugins.folding import pyls_folding_range
--
-+from pyls.workspace import Document
- 
- DOC_URI = uris.from_fs_path(__file__)
- DOC = dedent("""
-@@ -146,6 +146,10 @@ def test_folding(workspace):
-                 {'startLine': 62, 'endLine': 63},
-                 {'startLine': 64, 'endLine': 65},
-                 {'startLine': 67, 'endLine': 68}]
-+    if sys.version_info[:2] >= (3, 9):
-+        # the argument list of the decorator is also folded in Python >= 3.9
-+        expected.insert(4, {'startLine': 9, 'endLine': 10})
-+
-     assert ranges == expected
- 
- 
diff --git a/dev-python/python-language-server/files/pyls-jedi-18.patch b/dev-python/python-language-server/files/pyls-jedi-18.patch
deleted file mode 100644
index 1410f3a81dd7..000000000000
--- a/dev-python/python-language-server/files/pyls-jedi-18.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 40afab312a6bf0dcd620c82e59555ea2967aacdf Mon Sep 17 00:00:00 2001
-From: bnavigator <code@bnavigator.de>
-Date: Tue, 5 Jan 2021 01:17:33 +0100
-Subject: [PATCH 1/2] bump jedi compatibility: compare to Path-like object
-
----
- pyls/plugins/symbols.py | 2 +-
- setup.py                | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pyls/plugins/symbols.py b/pyls/plugins/symbols.py
-index 6468dd83..69a09fe9 100644
---- a/pyls/plugins/symbols.py
-+++ b/pyls/plugins/symbols.py
-@@ -37,7 +37,7 @@ def pyls_document_symbols(config, document):
-                         not sym_full_name.startswith('__main__')):
-                     continue
- 
--        if _include_def(d) and document.path == d.module_path:
-+        if _include_def(d) and os.path.samefile(document.path, d.module_path):
-             tuple_range = _tuple_range(d)
-             if tuple_range in exclude:
-                 continue
-diff --git a/setup.py b/setup.py
-index 12782990..99d2b312 100755
---- a/setup.py
-+++ b/setup.py
-@@ -10,7 +10,7 @@
-         'configparser; python_version<"3.0"',
-         'future>=0.14.0; python_version<"3"',
-         'backports.functools_lru_cache; python_version<"3.2"',
--        'jedi>=0.17.2,<0.18.0',
-+        'jedi>=0.17.2,<0.19.0',
-         'python-jsonrpc-server>=0.4.0',
-         'pluggy',
-         'ujson<=2.0.3 ; platform_system!="Windows" and python_version<"3.0"',
-
-From e442467312fe967bff5f893b7e3f92da133182c8 Mon Sep 17 00:00:00 2001
-From: bnavigator <code@bnavigator.de>
-Date: Tue, 5 Jan 2021 01:37:25 +0100
-Subject: [PATCH 2/2] Curse you Python 2 on Windows: os.path.samefile not
- implemented
-
----
- pyls/plugins/symbols.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/pyls/plugins/symbols.py b/pyls/plugins/symbols.py
-index 69a09fe9..ef8e7fb8 100644
---- a/pyls/plugins/symbols.py
-+++ b/pyls/plugins/symbols.py
-@@ -36,8 +36,14 @@ def pyls_document_symbols(config, document):
-                 if (not sym_full_name.startswith(module_name) and
-                         not sym_full_name.startswith('__main__')):
-                     continue
--
--        if _include_def(d) and os.path.samefile(document.path, d.module_path):
-+        try:
-+            docismodule = os.path.samefile(document.path, d.module_path)
-+        except AttributeError:
-+            # Python 2 on Windows has no .samefile, but then these are
-+            # strings for sure
-+            docismodule = document.path == d.module_path
-+
-+        if _include_def(d) and docismodule:
-             tuple_range = _tuple_range(d)
-             if tuple_range in exclude:
-                 continue
diff --git a/dev-python/python-language-server/files/pyls-numpy-1.20.patch b/dev-python/python-language-server/files/pyls-numpy-1.20.patch
deleted file mode 100644
index ab1c5032ff46..000000000000
--- a/dev-python/python-language-server/files/pyls-numpy-1.20.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 48f5eca25c2da064bcc9aa0fefb5de525bec618f Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Tue, 30 Mar 2021 20:20:08 +0200
-Subject: [PATCH 1/3] don't test np.sin hover for numpy 1.20
-
----
- test/plugins/test_hover.py | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/test/plugins/test_hover.py b/test/plugins/test_hover.py
-index 2302b865..f36bcb29 100644
---- a/test/plugins/test_hover.py
-+++ b/test/plugins/test_hover.py
-@@ -46,9 +46,13 @@ def test_numpy_hover(workspace):
-     contents = 'NumPy\n=====\n\nProvides\n'
-     assert contents in pyls_hover(doc, numpy_hov_position_3)['contents'][0]
- 
--    contents = 'Trigonometric sine, element-wise.\n\n'
--    assert contents in pyls_hover(
--        doc, numpy_sin_hov_position)['contents'][0]
-+    # https://github.com/davidhalter/jedi/issues/1746
-+    import numpy as np
-+
-+    if np.lib.NumpyVersion(np.__version__) < '1.20.0':
-+        contents = 'Trigonometric sine, element-wise.\n\n'
-+        assert contents in pyls_hover(
-+            doc, numpy_sin_hov_position)['contents'][0]
- 
- 
- def test_hover(workspace):
-
-From 3ee06dac069e27edf6231651ae27bff78ae8aaff Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Tue, 30 Mar 2021 20:21:20 +0200
-Subject: [PATCH 2/3] test snippet support with builtin instead of numpy
-
----
- test/plugins/test_completion.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py
-index 247c2c23..91df89cb 100644
---- a/test/plugins/test_completion.py
-+++ b/test/plugins/test_completion.py
-@@ -216,14 +216,14 @@ def test_completion_with_class_objects(config, workspace):
- 
- 
- def test_snippet_parsing(config, workspace):
--    doc = 'import numpy as np\nnp.logical_and'
--    completion_position = {'line': 1, 'character': 14}
-+    doc = 'divmod'
-+    completion_position = {'line': 0, 'character': 6}
-     doc = Document(DOC_URI, workspace, doc)
-     config.capabilities['textDocument'] = {
-         'completion': {'completionItem': {'snippetSupport': True}}}
-     config.update({'plugins': {'jedi_completion': {'include_params': True}}})
-     completions = pyls_jedi_completions(config, doc, completion_position)
--    out = 'logical_and(${1:x1}, ${2:x2})$0'
-+    out = 'divmod(${1:a}, ${2:b})$0'
-     assert completions[0]['insertText'] == out
- 
- 
-
diff --git a/dev-python/python-language-server/metadata.xml b/dev-python/python-language-server/metadata.xml
deleted file mode 100644
index 46b054f2ca60..000000000000
--- a/dev-python/python-language-server/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">python-language-server</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild b/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild
deleted file mode 100644
index 19de44f065be..000000000000
--- a/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-DESCRIPTION="An implementation of the Language Server Protocol for Python"
-HOMEPAGE="https://github.com/palantir/python-language-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/autopep8[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-)"
-
-RDEPEND="
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/python-jsonrpc-server-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ujson-3[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/pyls-fix-test_folding.patch"
-	"${FILESDIR}/pyls-numpy-1.20.patch"
-	"${FILESDIR}/pyls-jedi-18.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	# allow the use of jedi-18
-	sed -i -e 's/jedi<0.18.0/jedi<0.19.0/g' python_language_server.egg-info/requires.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-podman/Manifest b/dev-python/python-podman/Manifest
index 537499301b7b..1231e1621af2 100644
--- a/dev-python/python-podman/Manifest
+++ b/dev-python/python-podman/Manifest
@@ -1,3 +1,5 @@
+DIST podman-py-3.2.0.tar.gz 165514 BLAKE2B 7e25d160b98e45cc147069249d850b3a3d6dac5227942d90ed99b8313befd9db04a6423015ae56959a53eeeb49958d9067eb6fb7127ee55bf50ebfcea617a220 SHA512 8ef165847de5fecd81e7b5564baeaa0298efd4d2e6f12e1dfe958eed77f945d9375d90ba93a8ebab4b090b228d451e96ce49d08288dc3daae1255a05127b25c7
 DIST python-podman-1.6.0.tar.gz 28733 BLAKE2B ef36b80d99be07def311c2a8574cc36131760b39f0c80fb8707fb99ec9c2234e297724fc662f936217f9c2ec24fed0f57fd680702fbbac0e8411fc7c90da0577 SHA512 e7d730f8cfef0944df82ee73edb858e3cfd76a91dace98a2638341a1eb3ba5b9076d52f2f634cb4a94e082a83553412cdb1c5b79041d5bf4615998d67bb4a03f
 EBUILD python-podman-1.6.0.ebuild 823 BLAKE2B f53c3b33eaab6ef349942cd7a293a91f11b1902d4dc9f7c011b01770de58079bbc7d9dd1716b9e5dfd86fca7a7acbefa30040eea05218e5cc67f47e4ced00ee5 SHA512 406df830e9a0d9d57beb33df9267fd103be8353cd7ff2925c04deb1f575857818b85f9009da4af473ccbbfd424bdf66f0eb3192d9da8133968a36779bc29e8fe
-MISC metadata.xml 377 BLAKE2B 75e5283150b5ef215448569254a4707ed648adc52a99664775fb21e1d49c4a0af6b6b559c5829aa759a20412a0f36b73a28b3375e5310b76a2648652e82e6fce SHA512 db373251d8bcd61548e6f173f071b399f93f253d311195f74ee2a07ac0440d934a7b5a1f838a8629f986dc6032780a5bc0be3b6665127d610fd7fd28586f143f
+EBUILD python-podman-3.2.0.ebuild 1044 BLAKE2B a9e0fb891cac4ef6fd2a973df6d0472a868ba45966f76360a93a4a924535be7abf9086797106ac6f195c0d0539617478489e5fc831a5261097198516651564b1 SHA512 f21cf86bbb0f9fbefe1a31294638df3a3f2678c1935d8d47605b32a5a245f6b27136e179dfb9905fc0b243caab93d8db49b3b7c3249bc9f19c5cae0a6174d2f0
+MISC metadata.xml 478 BLAKE2B a5456f4437b36f5720e217997a25f414eda48247d6720cb67b43034e1eb9748d1058c818aafc5ee342f7c4aec7789c2706c05fefd321d8f74bec475125af00e0 SHA512 c2513eb754a47f0c4e72cfdbbd3cfdded27fbcea247439531a3ac5ff74b7f346d2f9a03a17a4fb8fca8853b76c979eddddf4800d322404a9a9ccc1a8e6dbcdf5
diff --git a/dev-python/python-podman/metadata.xml b/dev-python/python-podman/metadata.xml
index 1264cba62cca..345f5fb9555a 100644
--- a/dev-python/python-podman/metadata.xml
+++ b/dev-python/python-podman/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">containers/python-podman</remote-id>
 		<remote-id type="pypi">podman</remote-id>
diff --git a/dev-python/python-podman/python-podman-3.2.0.ebuild b/dev-python/python-podman/python-podman-3.2.0.ebuild
new file mode 100644
index 000000000000..58c9d7fd927b
--- /dev/null
+++ b/dev-python/python-podman/python-podman-3.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+MY_P=podman-py-${PV}
+DESCRIPTION="A library to interact with a Podman server"
+HOMEPAGE="
+	https://github.com/containers/podman-py/
+	https://pypi.org/project/podman/"
+SRC_URI="
+	https://github.com/containers/podman-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO
+		podman/tests/unit/test_volumesmanager.py::VolumesManagerTestCase::test_get_404
+	)
+
+	# integration tests require a workable podman server,
+	# and it doesn't seem to work in ebuild env
+	epytest podman/tests/unit ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 5bfad814a2f4..3e2288e9c18e 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,3 +1,5 @@
 DIST pythran-0.9.11.gh.tar.gz 3570395 BLAKE2B deada9a608ed3d883308389d5a6ddfee2f0f74ecc74f1fd87bcee75eecabcab2acd576425b8e92d6fc6b212377f1c7295e766db32082339c98670a964a49ea10 SHA512 c8939b918216803ad8e2a133b16f0d8ea939e4d87d07ddb1a3d131afb0ddb76962c489270431808fbf129e76b5f9dbdc2b625097f37df2eefdb9834d319d028a
+DIST pythran-0.9.12.post1.gh.tar.gz 3612135 BLAKE2B 1c0650d249a0834a488aba6f48d1130b8897b4b220523d3aaa0f7557609f9cfcc208563980b6855132199fd394b45404c4c15c961380ea2089121c5c9eea65b2 SHA512 71a9dec2ca9eca85a2b3e52022e262135b4f1642d646bfc66323bd8b7545a11351d70aaec0fd90d82dc0ba23ec6733a30c8d807e5d90ff5c208d2995a6ac6f83
 EBUILD pythran-0.9.11.ebuild 1183 BLAKE2B 7c810169aff4d52fe1d23dcbb0dcf75a61f342ae4b2e7f47b01c8ae966389638cb38700bf06fa3e1285d8664706dbb6c6bbcef528a0e76652bb0bf5b8d5b0dd7 SHA512 53c038ee10e4411ade77b3917554f46a38354cd4855e854df6842654f4ba3d6c3ab616d4898ba164bfea2c9b38939ea2aee8b7adc6ecca25625534bdea7fde6b
+EBUILD pythran-0.9.12_p1.ebuild 1119 BLAKE2B 9d5b29d81e994b29b5463d6b9a3cd1dedd732bd2a15315c0fbbe3489873d1e8cf53d2abf1a0a8a7a1960da57bb79fcdadf12eb5aac08b05805a6b25734dfd850 SHA512 cc528373ec1f9d0cf50256422dd8f074b4f9066b578004e45a0a25fc99ffa9224591897d50f2cfce6266d83cda5e239b2a93f1c01d83105c970dcd999230e8e5
 MISC metadata.xml 353 BLAKE2B 3584e4357ca55b22b1bf1c707b22df13999c358ce3968fd968c2cb94db6014e325b6782b8bb2b6e97a7a6c584081fa974ddf01ea88103b51cbd0bd2b49300bb4 SHA512 13435a1f1b2de15e825165e9d71ad3f12f29f32fe55694b7e504b76a5b6738bf4ff7b2626b0c956a1edb66d744b3589dac320eca4af0db5e6c55f3ddf537550f
diff --git a/dev-python/pythran/pythran-0.9.12_p1.ebuild b/dev-python/pythran/pythran-0.9.12_p1.ebuild
new file mode 100644
index 000000000000..6cf9f49801e9
--- /dev/null
+++ b/dev-python/pythran/pythran-0.9.12_p1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Ahead of Time compiler for numeric kernels"
+HOMEPAGE="
+	https://pypi.org/project/pythran/
+	https://github.com/serge-sans-paille/pythran/"
+SRC_URI="
+	https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/beniget-0.4*[${PYTHON_USEDEP}]
+	=dev-python/gast-0.5*[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/cblas
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 741e97943c5d..f44bc948bfd4 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -1,5 +1,3 @@
-DIST PyVirtualDisplay-2.1.tar.gz 40798 BLAKE2B 315bb794b81948357919e98637b6276cca11739d019333c873a2b9c3d28d0bbece6996a70fe619f7acae658bcbaa2743dbbdfb23b7b8515c3a40858a83b07712 SHA512 f95a1622adfa1198d7f35757110e923e45bbfc18b31945c9efedb578e1a27fc91ffec403cc68269b2414837260b2b56ae9a58323ed5020af962757722d7a4517
 DIST PyVirtualDisplay-2.2.tar.gz 40882 BLAKE2B 8fb2227928c8475994e4e54a42dada2b1921678adcec562d9658e01edc0e356aea714cc9a507c93be66d9c61dceeaadde4f22cc636504f4403e985ac2df96248 SHA512 33567d12fc63359869e4baa2413794e9caacd147a5b6ffe2ca79e1292f6174ff7e04371fac5737002fccc6654d0a5dd44907fac774b666ca10588185c5c5f7cc
-EBUILD pyvirtualdisplay-2.1.ebuild 1130 BLAKE2B e09b3b90e6867f9a31738696ea25bf50e341e7f076dcd045b1eb686df36e1c3b0c432636f5f56517472c28298f6b58dd5d9c2650beb66d8af2ef868a30dfa6c4 SHA512 dee845a6a462ba14b0c2091f616a3928522f58b613d86b3f254d931eba196f654d039c62888eb2a3c0263269319776450fb89309b3ae22c8b1115f032b9dcd6a
-EBUILD pyvirtualdisplay-2.2.ebuild 1133 BLAKE2B b8c5b468a7516728da6f0bb9d6b6b4628a4852b6f65483a6b85912c286d7cc8f66d3714c25a81ab1094a6f4e75e45f2688ec75a06dd43db424e75898171a46e7 SHA512 5c8d43fac9b06b697db7374e09e34ed11ac4ea4f83d1de6eeaf1771bc97c6f44bbac9ca1ee262238098b7bb1d671850eecba44f127866422232246505962a5a7
+EBUILD pyvirtualdisplay-2.2.ebuild 1131 BLAKE2B eb088fec885e10696c04bb4e202168f476a69b4215ca0e669b2d492ce12ceb97498cec1ba98d7214b04e83a3c1a0a1393fbde80fcbddda4963449aef30e5dbf3 SHA512 1aa8a3d997f9ae67a0d148aaa0838e808bc0400b3fed3d011e4f0cb6e7f5ac2fbb1cb16299ccc0265a6ab14c0159277e8726800e88a6a7e6d949467456601df7
 MISC metadata.xml 462 BLAKE2B f073d91b8a3d4abe16621a1f22c7e00b650dfb74ffe5685803c2b1dd828d1f4cf7f182b008077daceb7bb43ba740901b5edfc8b2c5b8dcb6509ef6eb670348d2 SHA512 4c68e76fbddc9f6d840287dc38c5c869c6c258f160dcb684da50d0bb7749f0ed3580e638eb5b4a6c2fc38b66909afe0d502fde0a9799e0ef362016e8429a2451
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
deleted file mode 100644
index a43d0d517c0e..000000000000
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_P=PyVirtualDisplay-${PV}
-DESCRIPTION="Python wrapper for Xvfb, Xephyr and Xvnc"
-HOMEPAGE="https://github.com/ponty/PyVirtualDisplay"
-SRC_URI="
-	https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# pyvirtualdisplay.smartdisplay.DisplayTimeoutError: Timeout! elapsed time:60.3 timeout:60
-# tests hang in xvfb
-RESTRICT="test"
-
-RDEPEND="dev-python/easyprocess[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep \
-			'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_7 python3_8 )
-		dev-python/entrypoint2[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyscreenshot[${PYTHON_USEDEP}]
-		~dev-python/vncdotool-0.13.0[${PYTHON_USEDEP}]
-		x11-apps/xmessage
-		x11-base/xorg-server[xvfb,xephyr]
-		x11-misc/x11vnc
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild
index e61794a73854..96aa8f862014 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # pyvirtualdisplay.smartdisplay.DisplayTimeoutError: Timeout! elapsed time:60.3 timeout:60
 # tests hang in xvfb
diff --git a/dev-python/pyyaml_env_tag/Manifest b/dev-python/pyyaml_env_tag/Manifest
index 6560137ea140..fd0ea02d1eaf 100644
--- a/dev-python/pyyaml_env_tag/Manifest
+++ b/dev-python/pyyaml_env_tag/Manifest
@@ -1,3 +1,3 @@
 DIST pyyaml_env_tag-0.1.tar.gz 5631 BLAKE2B 2302f3fd7c33347b1e451f466b13fbad53f2b77ee305ce844cd5b5bf40e633de95f4604eb27660c5f61aca21845e6f70e40a0ab52386a44d9b4e9be3ec7a7f29 SHA512 7d3dbc08fb338b3de5bbe657fa8a98a330d7ac7962ac2ea6513ade362b36deaaad8d9e82eb018454d73fd26d90003861a3ffee9abc2e9ac51dea4ba315b5c1f9
-EBUILD pyyaml_env_tag-0.1.ebuild 514 BLAKE2B fc07f7efbc7f11f7e25ecc9b8b611cd769600929bd3452dd1e9111f8485e12c4cfaaed6f7845d995e53bb912ac31a35b5d66cc63f6db047f64d0a2f93ae13409 SHA512 a0bd7cbd648e33408bd239c4fc3f7236c589f431a9bdd5fb95176dfa0d107f78a7801f9b98d64e7e7e8f257ff885842b5d4b651361aae48345f0439d456a5020
+EBUILD pyyaml_env_tag-0.1.ebuild 512 BLAKE2B e2c3ce8b1984f28344092ac7e5ccc7e81cd7834b0a4c82c59ae97fe0f7530acfa50b0dc5787cbef7ae710577dbfc7260039f3ad8b4360ef886afc500892e456c SHA512 24dca4911336858fcb126de8dfe7af8ca52b5c5dde364b27437735254a5bca1b669b4eeff35714927b500d4ecf403ba67b475cce11141c1a4a001d4807a25b8e
 MISC metadata.xml 420 BLAKE2B b74e2b5f8cc876a6cef9ed5563bc2d9cc67bc14f6c0849ea6dd46096c66634a20c9ccf48fad3c0ace735f3561e457f5b205b2bf484859f242df955e5c28d171c SHA512 f6d40c3fe1b8b99e65296d078b602e733a380e89a01ef8dc9728e4b15ff1f34cb15c23b26863b0fabaacc2bc275c24e9d4f99dc042345e7bbd8dfa80a82e5c20
diff --git a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
index 4abd9f92c604..5486fc522427 100644
--- a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
+++ b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index e56360d21934..2579025a8dc8 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -1,4 +1,4 @@
 AUX raet-0.6.8-msgpack-1.0.patch 8061 BLAKE2B 90607848542b8ba5a219a872f6f4f4e12546ebf12e1d38cfc3c3259282eda97a641fcfa587646e83ffa5e98d5cc3b0e77c032ebf2358a5cd603e2ac58ad9a114 SHA512 524e2c787386a885796a3666dff792d7e2808585658227acbab51c90c7ebfdfb0435ea67bcdc23e9be6b43364452e23a085d4843e4c1ee1dd576e140007c4293
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
-EBUILD raet-0.6.8-r2.ebuild 942 BLAKE2B ca89b2ea0f37d2608e37afa6a893bab336b566973683ea0fad8e4a0cd4ce5a33721af845119b4e16e5b262b31a8a5e51c9a73b491e1897a39ef969d60ea38229 SHA512 ba3460bf49627f306fb394e9ab388906a5707d4e15091b6002ccc849a626e9b738644826f76d8bc713b3868c2795580d2eb2d956127fe479383f3d3fa38221b0
+EBUILD raet-0.6.8-r2.ebuild 949 BLAKE2B 63eacb1a51c4e047bc5a189a1183200c3061ebb55dc6050e3bdf5d50a938cb2481cd2ba3af93b2df6df1c8bb99a4b07f785781ccd68a97555a28eeb62ee0282e SHA512 b3f7cd9aaeaab8fd4d694a627229fe49022ffc6250d57978fe9463edbfb4c9d3c20c77efe4e97f60c5ccf15f5c529fafa94b0653e6c6b49752b2515f38d41d2e
 MISC metadata.xml 474 BLAKE2B 8b186f4c18696c3df8e3d6b29f5d45d3c040156a473edb5066fa79f449642e4f1a3274974bbfc02733cf9ae3bc04b22c06cb8ef80b9962d14b4ee26dedc329d9 SHA512 33760bd0996fbe1d95e4f4ed658eb4a6c221b4c8911842db2e0f443d317c9c079ecb5a8e8f5cfea1c47531a944c6d79b4f4bd29775ddef6cb6c6008c4f359e15
diff --git a/dev-python/raet/raet-0.6.8-r2.ebuild b/dev-python/raet/raet-0.6.8-r2.ebuild
index e6a8e72b2ee8..4e01ffe5e227 100644
--- a/dev-python/raet/raet-0.6.8-r2.ebuild
+++ b/dev-python/raet/raet-0.6.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index b1323834d097..b9ba9531846b 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,7 +1,5 @@
-DIST requests-cache-0.6.3.gh.tar.gz 50303 BLAKE2B e8507a19f3883c050e1d819bf9ce8ebf720a5c6517e4004ecf745f5a197a8feac9cbca18ffa99001be0baffbad41d2ebfba5b63d90b55eda1d754d279242bbc6 SHA512 1fa801f60623dce0a5cd834272a74acf80b6ae52a602ae81fbd7e3653467800d9a58fb8220e30d53ef1b896aa01f2017f93dcbc2dacfd685ee9ae286f47077f5
 DIST requests-cache-0.6.4.gh.tar.gz 50322 BLAKE2B c9a6cae957604bdfa6057621e028fad83476e5d918bbf9c58e73f09f8615398946f3cf6e3737c9ff916cba68d82ed66a674557fb733c74b874b0f68e2430d9a0 SHA512 31e2217e54892d8ec5fc9fcf60f650960621b1f97029c90deca925b9a1be9eb5a3ddb6ae68e581c805f20136f93eefa70d51e7e9f086ecbae76f8e550bbe3f1a
 DIST requests-cache-0.7.1.gh.tar.gz 959455 BLAKE2B ce41514f21dc0708e437f70b92eb9d84f47433d04a11476cd5afefd050089e2d138213fa0b2f6bac200bd6d59db996187481ef3544d289a5117f3fe7160027b5 SHA512 cd83134ce9500c20c63fa92546cca41772ba3582a669914cd0885ec5aadf6ae4a6c4fc6a83dce73d2d5b24a80db2fde65cdb0a89b4b5703ddeac1d710404a05d
-EBUILD requests-cache-0.6.3.ebuild 1141 BLAKE2B 40673e1032da1b5e785d6984b657a0e019ecd4e21851f5e8c36b28aaa66510a90c42b25cfdfdcdae6258837a6691d85278b1b7d2a3a3403da8bfa8981d0a455e SHA512 8df533649ab6ce4a5d137f542236d9a0804bb305b8e3b050ccb0e5f9591c51e4b49a6ad7e4b404a39164eecb7f6081715cd584b2e11b76f075fe6a605bb563f0
-EBUILD requests-cache-0.6.4.ebuild 1143 BLAKE2B e58329455d2f3b0d2ab391b55f50a6029f36288bebbc2e8b00b4b8ee97f6b0db034a74973bc4b69555cefe07d4e653bd4ece7fac1c0dad536509bc5881c1104c SHA512 75325063b3460c8ce23cc7b3fd628cd5dc9f37cfadbddef37fea164dc8e412867a3bf3b27f14b261d79beac0134ecd4c60c94022bb3411a648ec895e558a76cb
+EBUILD requests-cache-0.6.4.ebuild 1141 BLAKE2B 5d2037be26cba0679666805ce783f1d9aa8452b1d8da78e443e47d3990fb212dde552d44e228ab21834fac51cf0f39e6db8dca1c2f075ce809614e4b91fdf0db SHA512 3fd54f8b358d1cdf7f5f2a4d46baa4432111b2c8f641b91b77fc141c300d3bd0467ec0600a85be138c0bbec55a4e33b891f5d8acbb9ab5fc5ca6a2b28d76c4a4
 EBUILD requests-cache-0.7.1.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
 MISC metadata.xml 469 BLAKE2B 7a0fbb271ec0f40665d6fbce539cb49a818f5f3876642c7d9d721566fac8fa81b0f39f4a2ce6b2b0884b6c2ea79a1bbf8c95d2f86c75372725dbc53757f0154b SHA512 6485eecd67956b0ad5eaaad22c5e68e9bc9acaf0330aca6c3c0a378b5153ecc7a086fac08e9932d03ea4ff6448c63958fc8faeabefd4c68140f44b0fda0f31f5
diff --git a/dev-python/requests-cache/requests-cache-0.6.3.ebuild b/dev-python/requests-cache/requests-cache-0.6.3.ebuild
deleted file mode 100644
index f3c4e497d2ba..000000000000
--- a/dev-python/requests-cache/requests-cache-0.6.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/requests-cache/requests-cache-0.6.4.ebuild b/dev-python/requests-cache/requests-cache-0.6.4.ebuild
index bf347f9dcc78..2a55fc474fba 100644
--- a/dev-python/requests-cache/requests-cache-0.6.4.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.6.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
index 86c8b8cb56a0..851f0f1e8402 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1,3 +1,3 @@
 DIST requests-credssp-1.2.0.gh.tar.gz 23310 BLAKE2B 647dff76fbb47b9b972f403a9fb2a10ffab5e1915e32977e65b5f5c1cb206ec1b9fa884e12d687761087b2f7f4cb9e8bde631b68140cc50dbd9561a4999bdf55 SHA512 55458773cbf14a468d22d0b04186611385ff24fceda85052e69981bd6d4fd32a46f96b95fa36724b72fd9719485b2ed8906d1927284157e7bc685c0c42c2312c
-EBUILD requests-credssp-1.2.0.ebuild 878 BLAKE2B e34f9d4128167fea6b02f068ad883e34f15d7729eec1bd93dda0c781df6a4f0b70f2d7c08176dbcbef6fb7cb9fd7ff1d3e20d33cf90b4fb79eadfc267ade06aa SHA512 7f1011afb81d94bf4ae81a99d658c02cc27d79a8c9337b7a0a8e284cdccc4db646d31591bd909afe2c66f151f055b03f8e54e7c37fef4b79820b5177525e0757
+EBUILD requests-credssp-1.2.0.ebuild 885 BLAKE2B e491e7a93f7b35ef5f69889d0938f12fd4a1a4155b25187be025ca39212843292dbf8d404d3ad88b9b7b5f36b620595b45a285d07c6987a05a51e22c31333837 SHA512 cf9b9e1b1362a84be1fbfe9c4bd9c0d7303e2fa136d4eebbfc0a1aba7870a3d500eb0a88ab5692a9e0b402f511f78567f1382507059fb1af3b99afcd9ff7981e
 MISC metadata.xml 348 BLAKE2B 6f396d41aa8ae420dca6b00843920f99b4935e8d02b5be72dfa997ea1c22e1e34c742e98ab3ea3ec326740fe99133e71f9f3cf6b2a4209cc3e432a3fc59fe7e9 SHA512 a180aa3a93ac96a63fc25acffc9ea11a7b0eeebe336b046ba5d38594c84bf4056169e4fa0d1e0e8f660a19f8bad31321bc304028846ef8d1d9fe99e839cb9754
diff --git a/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild b/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
index 80e0ef853fae..b5d40075cda3 100644
--- a/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
+++ b/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jborean93/requests-credssp/archive/refs/tags/v${PV}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 # Needs unpackaged pyspnego (https://github.com/jborean93/pyspnego)
 RESTRICT="test"
 
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index 44d3fc9af13e..1a0b5e3f5157 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST requests-oauthlib-1.3.0.tar.gz 45449 BLAKE2B b7d0df59eefe801e09329bde8604d09fe0f45eac146172c5ae5f1a77df59229a89c70d78a97fca0f7b546a015e66d6d9dd4ac3efdd4de0100f77f2427106e197 SHA512 0eebd209dad892567de7d37f1482b5c7523eced3a73a68054674b29447d090c885b2388fd6f2db26436f14098833051c8888ace8b137889a4012e010efb0e86b
-EBUILD requests-oauthlib-1.3.0.ebuild 872 BLAKE2B 08f496bb01558c8e4cfcd269ccf0efdd67fa288acf4ecfd3e89eca368ee2b60a39886c7dfc0a8b1e496d777e855c213a305c4285ba71cec857fa448b10a43d14 SHA512 af0d60d87f050f4e89533e1373e7782a7ff935d84a82eca60e24040b856ac0215caeae26c17dc982d2709dfbe2abe3cc0b8b1867a01aff8ceaecf67db19a4888
+EBUILD requests-oauthlib-1.3.0.ebuild 918 BLAKE2B 487b6785d0b110ae57ad2a81901364d7109d636275f9f0d44c050de7f34b9ab9d33d878df187655bd5458cd3182fbc718fc8a71ee26eddd2aaf8724e5433274b SHA512 2884f3b7b287ba935ffc928ad896b0bd7b9e522e83ae00bdcc70f58f50fbb38476cd462a9b281f1eb37a14bfe8d600dc714f855c49cf85ada681c1faf9da73be
 MISC metadata.xml 386 BLAKE2B 2e2afd7ed7d90551f20f4917132d686b1c03f24cad9c55aa9f06587ec5988709c7e2cf602b5dc16f06ea345c5f1ca3cbbe7eab282e460658fd04a3aa99f4666b SHA512 ab2b57e2fc4308c5d6e27cd567a1a5cb45698b7795887c1cc3122617775c76ba6c7141cb3440a84c855fcd5cbcc567435c4ab1127483e01b1d5941b6c8ab2a09
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
index b3518a21213a..0dfb8b55327e 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="This project provides first-class OAuth library support for Requests"
@@ -23,14 +22,15 @@ BDEPEND="
 		dev-python/requests-mock[${PYTHON_USEDEP}]
 	)"
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 
-src_prepare() {
-	# require Internet access
-	sed -e 's:testCanPostBinaryData:_&:' \
-		-e 's:test_content_type_override:_&:' \
-		-e 's:test_url_is_native_str:_&:' \
-		-i tests/test_core.py || die
+python_test() {
+	local deselect=(
+		# Internet access
+		tests/test_core.py::OAuth1Test::testCanPostBinaryData
+		tests/test_core.py::OAuth1Test::test_content_type_override
+		tests/test_core.py::OAuth1Test::test_url_is_native_str
+	)
 
-	distutils-r1_src_prepare
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 9cc7867cecac..1fefc53938ab 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,3 +1,5 @@
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
+DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
+EBUILD requests-2.26.0.ebuild 1393 BLAKE2B b4ff97cefcfd30b21832983eec288313728875fbfcecb6e426c3fc1cec09174bf381451d1dbf1fa358a450600971f3bc0666eb96122697debccfed33957010f8 SHA512 9b4497c62a0514ba9ad0035a58b391c5925733f3e1d40896f2373b6485f33b883145714017ab73917177695b986e187f41f7395ce9272432953d49194e7fcdc3
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
new file mode 100644
index 000000000000..2d726cc23334
--- /dev/null
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="https://requests.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="socks5"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	dev-python/charset_normalizer[${PYTHON_USEDEP}]
+	<dev-python/idna-4[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# Internet
+		requests/__init__.py::requests
+		requests/api.py::requests.api.request
+		requests/models.py::requests.models.PreparedRequest
+		requests/sessions.py::requests.sessions.Session
+		tests/test_requests.py::TestRequests::test_https_warnings
+		tests/test_requests.py::TestTimeout::test_connect_timeout
+		tests/test_requests.py::TestTimeout::test_total_timeout_connect
+		# TODO: openssl?
+		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index a84c4a89f2b7..d7082d1aa605 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,5 +1,3 @@
-DIST rfc3986-1.4.0.tar.gz 44912 BLAKE2B 595a644f8f92823ad31113ce88218cb30d16b37ec7303c0d8e89d2d2b1e18448d99003e95d61dcf09cb64aae517037bae798d1e89c74b652d517a648e80856e8 SHA512 dbcddc09331b794eafed8c2d7b81b7b632ba5cae2741e33ad12e781bc923427a05febd2f2715d037f35769b18c8d790546dfd4bbebe6e71d35777745e446888b
 DIST rfc3986-1.5.0.tar.gz 49378 BLAKE2B f5ef923626fdcbe4d13729a5599012a8a93d234eef7f9ac9dc61620320062a69646f810a8f0ea04f371b9c423850982685e68201f08ba96ad9ead3ab11a9b40d SHA512 b291b88b6890f8c9fcfc353e05d1b8c0435be62f22768568ecf714af083b3c51d7a9b301fc9196d37ad4e6eeb8c6a237ba40914098e755b4ccdf36b7df7906c2
-EBUILD rfc3986-1.4.0.ebuild 676 BLAKE2B daf4a3ec5f79890d8aca2a3d51771516ce3d1140b17b5c39106374dc0ddcb1c876b4380078e9d12bcd9c12f821db6dd1bc10aa1ca25b33ac962b101bbc9e3ea1 SHA512 53d5ab9961f21fe91cd5091353d1a0f1969c79d8538a5bf917fd08d1bdcda5e0605dc707878419921cdbd80da3fad927466dcd20a3333f425c05f5754cd5498a
-EBUILD rfc3986-1.5.0.ebuild 685 BLAKE2B 37979b8caa609651053475d790f715eeb36a30242a7e72c086f106d4c6ef781ea9261ba4864fa9497e6957b14a0cc5737e121cbaddedeff4bf89c6daa52fe87e SHA512 08b1f069eec4aa56d60120163dd59ffb671a4d57abb7cdef165f6a0d0b1d77de8d0c0b6e82aa1ea2d1ec9e3e353df30b587e7514044db02f0c9b04c500da99f0
+EBUILD rfc3986-1.5.0.ebuild 677 BLAKE2B 6f8c27f60bbcd7a147221d969690bb1f67558a6799f4245d0ba340e62b2cb1a9ae646c6bc62ff56a4ddcbbaf4246dbc142af0c6c4ca65936fa4e64ce1132cffa SHA512 c524b8f6e8d0564ed14cbc7a4cb951d476e484f0b9bd625789d75fcc5aec234960dbc4992ffaa466df20145c6daabb35884ad46c08d44869a1ac945cb1f18d88
 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
deleted file mode 100644
index f57899e0bdd3..000000000000
--- a/dev-python/rfc3986/rfc3986-1.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Validating URI References per RFC 3986"
-HOMEPAGE="https://tools.ietf.org/html/rfc3986
-	https://github.com/python-hyper/rfc3986
-	https://rfc3986.rtfd.org"
-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 ~x64-macos"
-IUSE="idna"
-
-RDEPEND="
-	idna? ( dev-python/idna[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/idna[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rfc3986/rfc3986-1.5.0.ebuild b/dev-python/rfc3986/rfc3986-1.5.0.ebuild
index 3136ab2a64cd..9a5d1047575c 100644
--- a/dev-python/rfc3986/rfc3986-1.5.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.5.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="idna"
 
 RDEPEND="
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 9b7b5275f6b6..6012d9852b0d 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,7 +1,9 @@
 DIST rich-10.3.0.tar.gz 16237609 BLAKE2B ddac8f2ed7b3b39e647179cd03cf59994729d7d82bdfad6670284a692871b79f2f6ceb86fae0d47d76401f756c122ebcb5978d241d4a95b4f3d6c54de67132a1 SHA512 91886b19c91052a7fe24fb9ae8c98a59f882e6c387036420f17a4867f581e71839b990541fcedf7831d361a9cb535f05c13e45bf5505a4d1fcdc0d0f8e8b39c8
 DIST rich-10.4.0.tar.gz 16240850 BLAKE2B 76874e3efd9a8d696ba96579e1c658b1c76e71d353574cf3f9fb5d8a15810879f649d0ebfcbd1d72d9d496ce438cc08099b5d0416b932875704be2d0b4b28d0a SHA512 ecf6234ac862c1e04ab71c39763857d770c20200f5e1903a7d8e90fc1a67b5702a9eb0c67454ca48fb786a7631f60401f0a3299e82d864eca8c7afefedf21e26
 DIST rich-10.5.0.tar.gz 16242786 BLAKE2B d4d612555f9dca24b5150f5502d95bede784d7e6481e15948614de15a914d0cb3c83b64148a02db4ce8693feb1604c3729006fc0ca347eb10313aedcb795feca SHA512 c0471c0f35d3d9e5b5baf5798911073de02820a5bb5dcf42324bef2153a49a3019db44bc96b95247defe3be65f18097fc266a30bdeab153d9dda0ae38d34a79b
+DIST rich-10.6.0.tar.gz 16244447 BLAKE2B 79012a211e8f5510fd4cf0f2580971c51fee17a1e38905abc8227ba07eed1f2d25b7c356ecc907043a9e1898245cb6927cf226218c0ba20344865c1cd0a4a160 SHA512 59b777ef0fe3efe67138a7dbfc0c4e813b0a8c3d46adc6526b07241483919e0f71b478c0a66f3e0c207fcebdc0d639b7acf989ebf914c0e0fb6953029f0c9a16
 EBUILD rich-10.3.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
 EBUILD rich-10.4.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
 EBUILD rich-10.5.0.ebuild 735 BLAKE2B 2c23538ece26718559c8d0de5d8dfa8dc285efbfe4ac03e2f96b86e693f576fabd0213c57abe42068a2d0c4caf07d4b5df08d63b7eb8c3b500dce2884c352ad6 SHA512 46a0261d511fae0adb555234657eb80c2382528a86e8a7ce06fbcbd83dd682fe4d0855ae2e31e135bbaf4b6caac65a77754397d9ba5ef7c69430157b8ebea895
+EBUILD rich-10.6.0.ebuild 735 BLAKE2B 2c23538ece26718559c8d0de5d8dfa8dc285efbfe4ac03e2f96b86e693f576fabd0213c57abe42068a2d0c4caf07d4b5df08d63b7eb8c3b500dce2884c352ad6 SHA512 46a0261d511fae0adb555234657eb80c2382528a86e8a7ce06fbcbd83dd682fe4d0855ae2e31e135bbaf4b6caac65a77754397d9ba5ef7c69430157b8ebea895
 MISC metadata.xml 493 BLAKE2B 3ba69fa824ec59308ce763ccf317a1cb187586e17727e59e6f59f40a5f9d0a23c78ad20e67009a6ec460b317c471fa8c00d68fd8fc152cb5a87077aaa425af21 SHA512 186ecd75daa3aa481ccc5773ea797bb87afbf6f4017224b6e7d54985838f9beb1cc4a2faafef0ec1e24ce6b881ce95d7665d4f5945285032f19f7a86a5a7eb14
diff --git a/dev-python/rich/rich-10.6.0.ebuild b/dev-python/rich/rich-10.6.0.ebuild
new file mode 100644
index 000000000000..6d4831ee5fd9
--- /dev/null
+++ b/dev-python/rich/rich-10.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 276a0b81ae93..c12b83cf590a 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,3 +1,5 @@
 DIST s3transfer-0.4.2.tar.gz 129664 BLAKE2B fb3658efd7a6aa6ba42ca55a1f9efc19671806fa22db7f6f5a30aaf19615863e027cabd472345637fd41f2c0436ad8f6b034f6bdf75187a71d2c6eacdbdee914 SHA512 8dabdc0d233f6edcf35d9fe1a06b6fd5bb5f589f455d6d53ad989c7eb368cefab4fee90e707bb8fa09f2caac6a27e67ee7aa3ada5709be43f2b649302e412efc
+DIST s3transfer-0.5.0.tar.gz 133535 BLAKE2B 2ce9235fbffc4c42682345873becac6f0d574ac44de523e10178bf7d115b261acbd1753b1a41ca301b72fa96a6a93314572fe12ea4d286a325a0a36e3cf56b36 SHA512 e34d115d149f8f9715fa0147521eec63a5fd672ee513d690248fbca73003cf4c9e43775bd5b3616f7ad3a6734993a1c8b2ba789394d338a8ac4c841a0e51999c
 EBUILD s3transfer-0.4.2.ebuild 608 BLAKE2B d9c4554716475f82c88fdd395453ddf699758b8feff01da7c46e78d5a5d47693cb5fac87944d477931dc793ed557c46d1116f1bab2a4267c7a0e41f7f97fd8b4 SHA512 85cfcff25ba906a8811944990395565104aa009870b8926b1e75e8b89830a775f8f20b36beb07003587625a6452922ab14053e03ec047e59f518e28466da67d2
+EBUILD s3transfer-0.5.0.ebuild 615 BLAKE2B cde32893d10c8ae3da9c9fe8b686c139b8dd3f29670fa776cc01f2a2e5a57d146a1e2899091e9a8b0f86b40305bd01535f314f3e2d1f24102513132678b9a170 SHA512 665f2a152bf6367d2bb10e42526c8c7a77ca365fe076d2296d1729ad0bf6b4b2d6772ed99e3ff3313b62515c1bcafdec978cba123462f8629cfa9b78eb9d681e
 MISC metadata.xml 502 BLAKE2B 36893006073506d27c6f9c13e6b823e251906bd046a297c36373a2132ef809ad0babc4819122f89ce5b26e7c0ef1c410924594a27ff32c911c3c519cfd722889 SHA512 855d52af629703d3f31e35c16723220b26f45f977e131e41fe4a1ae9a98fb18a60fd89315a59c3f7d436d17a469ba8101e79d859d6968e627d423ef26894ab24
diff --git a/dev-python/s3transfer/s3transfer-0.5.0.ebuild b/dev-python/s3transfer/s3transfer-0.5.0.ebuild
new file mode 100644
index 000000000000..77bdca772930
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/{unit,functional}
+}
diff --git a/dev-python/simpy/Manifest b/dev-python/simpy/Manifest
index 84ff3868f71d..a5a8a50e2ec2 100644
--- a/dev-python/simpy/Manifest
+++ b/dev-python/simpy/Manifest
@@ -1,5 +1,3 @@
-DIST simpy-3.0.13.tar.gz 410773 BLAKE2B 3769782806b4c68554810cc44a5e59e6dbba2fda86a57b225c9c73d62dfe434a55dc1bc16727d0866684b8f43ea69a50bea96dcdc2109a491dd887d9973a51e9 SHA512 7961cb519ec3ad92fddd16204b1741132371c9b9989a9bc9905227fc50ee8baf3c8bbfd65fc12165cb58653114c26179cb3fbe4d09b082062a4180f09d40a259
 DIST simpy-4.0.1.tar.gz 410082 BLAKE2B 09c6f29d2792ac15bb4a3b42a1cdbd4d342aca0ef528aadbe37e01342534645939c9663977230ec7f6f1542a4354925e25f0c5b3bf6e20b29b6da2e69f3d5a90 SHA512 5cc4baada79503e3c2f2425b9f7f00d68f263283ff0cae048fba86665c4dcf70590683f6b7df50d1c1a914ac7cb471ed4b6850676030bea4a3a70fb40eb2cdb4
-EBUILD simpy-3.0.13.ebuild 836 BLAKE2B bd8b350b7df69d77c4b62ef4a91f5c4377ed3aae2cd372ce1c4f46d61fa176cd683b1bcc40ea8cf19b866bde29618e034190d6631af0a67f6892b2e19a76670d SHA512 c292e68f8d5f5f6a04342ba18e803f283125049d7ddab9b7241910f8249a3be24fda48c417bbd41f703d5539593fb896a8bb0c1d573819d9c1ccde88bfe86faa
-EBUILD simpy-4.0.1.ebuild 896 BLAKE2B 583ba15835e3b4ac163ecd8ba41bdaec160d3eab0c6e5edad21367fee2a06ea27dfc088bd50361247d1384319f12674c148c347e0c295023a5eb2d1d5c9bf325 SHA512 1164b2445a0422b15e43407603861839b40bd68cdf6b95e4ab4b58f3bd1536b281ea88bcbf90bf00a09b2758f9e1b4135fbd417335ff94b275698be5851ebcb4
+EBUILD simpy-4.0.1.ebuild 894 BLAKE2B 5c435abdd2d49374a29c53e27e19c75921405773acd69499696e56150c2451eb2543744bb349895edb111794b43946ba5040a4464e586007c265969d9d43b5a3 SHA512 89bff8e1e5566415afce1fbcf51ff3fd444f15c98480e4631bd3a90e59a5454dcce1e2d625e85613a68f909cf72696998f2c79676072285011be6d8be2519c4a
 MISC metadata.xml 383 BLAKE2B be75ad8df2181d19f5d653278454051eaa5c455fc5ff3882cf8e11bb50787847fbac3db1e33034c3f1372a82a15227d494f71af9644d6aee42069b41fb6b4f17 SHA512 fe339084efea01b5fe7375a1fbb2a8c21105164fea3881de4b5499771d6c649f6cbadde20cca9d02050d8a143311d2bcabea48dc30bd518e7e3ff2bb2f1ab169
diff --git a/dev-python/simpy/simpy-3.0.13.ebuild b/dev-python/simpy/simpy-3.0.13.ebuild
deleted file mode 100644
index 132ffc2dffb8..000000000000
--- a/dev-python/simpy/simpy-3.0.13.ebuild
+++ /dev/null
@@ -1,35 +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} )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1
-
-MY_P="${P/simpy/SimPy}"
-
-DESCRIPTION="Object-oriented, process-based discrete-event simulation language"
-HOMEPAGE="https://simpy.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests setup.py
-
-python_install_all() {
-	DOCS=( AUTHORS.rst CHANGES.rst README.rst )
-	if use doc; then
-		pushd docs > /dev/null || die
-		PYTHONPATH=.. emake html && HTML_DOCS=( docs/_build/html/. docs/_build/doctrees/. )
-		popd > /dev/null || die
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/simpy/simpy-4.0.1.ebuild b/dev-python/simpy/simpy-4.0.1.ebuild
index 89b69982a180..86288c2b3512 100644
--- a/dev-python/simpy/simpy-4.0.1.ebuild
+++ b/dev-python/simpy/simpy-4.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 9eac73703042..681c7175939a 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,6 +1,4 @@
-DIST slixmpp-1.7.0.tar.gz 931610 BLAKE2B bb84e33681cc2701dbfc164ad4e727236dbe5fe1206a4c4e93843f9cbd870b6b3efb03b89ae61ddde4249c4928a81edaea9caf1d04b88e3b5cb0e81b1fe3fad7 SHA512 1f70f6b0419877865b80213a50ba181639cbf64fd808695d7a95eae460635a537492f72bed0e6d77d33dc9a5da4ec505da4cd44526bdee2a39b56b98a9974cfc
 DIST slixmpp-1.7.1.tar.gz 931753 BLAKE2B 3de14be36353bc5f5f2cfbe002c44c5e843a7b36fa31a9dd315e363fc67e36d080df0dc70d82e65c6802c41377c2e98f56ff4e23cc5e9a92165c3d3b7565493f SHA512 5a59fcbb901e6f4456049f1ec2bbf781b1ec7c5a3ad4b66216d4c5daffa7f0606f74b941647fe2b53e6c8cdc476371305c7b7a2ca24d21450e19548f888be3b1
-EBUILD slixmpp-1.7.0.ebuild 792 BLAKE2B ac9f76de34858e5238a44ffcc16cbd3fd8f454ca916e2b2ceb997dbb35a3a54e1294f450458c95be02e9afb9b724973e7d2bb02660d87988a7b54cc556848ade SHA512 842725dc0d12d4fb4c05918dc6bc6e58fb50e3301328064eca0089c0f4302a3f3178b47a75ed3eebc77355dcfb84971137ec4ce97d200a69fab806bd60fcefed
 EBUILD slixmpp-1.7.1.ebuild 792 BLAKE2B ac9f76de34858e5238a44ffcc16cbd3fd8f454ca916e2b2ceb997dbb35a3a54e1294f450458c95be02e9afb9b724973e7d2bb02660d87988a7b54cc556848ade SHA512 842725dc0d12d4fb4c05918dc6bc6e58fb50e3301328064eca0089c0f4302a3f3178b47a75ed3eebc77355dcfb84971137ec4ce97d200a69fab806bd60fcefed
 EBUILD slixmpp-9999.ebuild 793 BLAKE2B 63bf913e348b5b649dc53de6ad7a249f1424a54bdeef0efe8c8a50f84e59cf6283b93a92ae3cbdb737e01bae159dd9a6289f2538007a92944c8cbadd0735a05f SHA512 893d9ffb7e5ad08e27bf0b889c5688f1b1154f6912e1eea2f40086c84bdffd30a3c7443a93eeb636ca2b42fc9e9418ee73fe67b7116db2b5ef2d94ef50c2fb26
 MISC metadata.xml 529 BLAKE2B 233dc2ff554368323e79fc11d7763b69d10e08a013789e19ad95c0ff2e7a392edbbde47f1811d69bf5b930824db4e399cb99d11dc90da2cf97c2347911c1f60f SHA512 8a6bf6d00fc0de5f3e12be9049ca25de2d866e5ef4352d9e1075676d9c6b66ecdee832b947a192b60832878be976666f131fab01627339a4f4406aa740ae4b25
diff --git a/dev-python/slixmpp/slixmpp-1.7.0.ebuild b/dev-python/slixmpp/slixmpp-1.7.0.ebuild
deleted file mode 100644
index 19974e840958..000000000000
--- a/dev-python/slixmpp/slixmpp-1.7.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 library for XMPP"
-HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-DEPEND="
-	net-dns/libidn
-"
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	"${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sniffio/Manifest b/dev-python/sniffio/Manifest
index 088b471218ad..c3d23d1a2c9f 100644
--- a/dev-python/sniffio/Manifest
+++ b/dev-python/sniffio/Manifest
@@ -1,3 +1,3 @@
 DIST sniffio-1.2.0.gh.tar.gz 17335 BLAKE2B 0d67baa18702ac38932680bdc741c87ee0a31342cc752c1463a7f90720ea0ebf6d62ef682a042c58e8fe96456e1461638e0f02c6f60da5f5e0d07464be27a4a3 SHA512 8e1dd2bb6fc22ee5824adfffe688ff0621b8c1ef5daea594dedce13d5e04a498e05816bb32e9bbed206a653a330ff710df57c888ddcff00a6254eafddc538273
-EBUILD sniffio-1.2.0.ebuild 692 BLAKE2B 1fa93eb766d2af0d4c2d2e16234c47e4ce5ea0c8a4c28a5faf978024199839cf0b3170d4fb89fa487c5ba46ba2f5fbd7326b701a2fd9134d91eeab10fe58fdf9 SHA512 a144200fcce459c4344596153c44ec2972428ee1e4a4933d8f8af8d13bffeeaf3d4db973714bdaa2c62f4dd582a10cf167eae4fb23ceda564bbce01a18a562f3
+EBUILD sniffio-1.2.0.ebuild 690 BLAKE2B d2223e5c286f3786d7f423ba546257c30d8405f4f853956d6422b13e901ef21544b620f80a8a2d502c4872fac30ac5d4d84200b9737d51ce22f5e9c7816ade80 SHA512 7623d40343fd6881d6df72a5c2bd2f84653ef9c39bb86de1eb84abffcd0b516a97cc616479e9ece7e83bc4eaa03635dd8bd66e50af1d4588079c453d0660fa81
 MISC metadata.xml 393 BLAKE2B 1e85a6ae107eb5dbdbaebf54211bca24f605c8b40d8dc9f941a485a5dd6714c9e6b69646e627d6fdfed874f5ecbc4217b158c6be66b392e583f4aab24fb4c609 SHA512 ed60062a1393a7a3bc73388ada684e70a51fead79e3bd5e4cf3fc14aea6ff133121f2fcdc68ae0277c0bf2290d3a0f18959d00eb835534e16abb58b19c7b0f9e
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index f33ec1b18fda..d05a53d6dd3a 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index 57a841d86904..20a1d5b86868 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx-panels-0.5.2.tar.gz 400415 BLAKE2B af103b3a10032590def4b41c650e9023fe94ec6e2fe764a09237cad4d928b1ff429a7a385770f2d07724897413f001ae4037c6e8638b3a9c1d63362c361fd999 SHA512 6d4eb566623543d0553790136e420e3f3a23e06f38b64642e2bb535a5401a954719135a9af89b3655190aebcd35024cecd40b887e7b2bb1394a2a575447316c0
 DIST sphinx-panels-0.6.0.tar.gz 400548 BLAKE2B 685b241ffe839face392950ccaa5c00d5613ee4076a4f8d62fdff32158f2d02c444375b7f656a89d4712f8bf895b937ff9fe650cab98670f03b0c4d75e545f97 SHA512 74064538ff8cd1c7c44b5daeda272217618ed33394694883046972b4262d503e1426e7573d8b49040d4b426651377b89fd4ad2a085f1e62827e7ef51e6912e5f
-EBUILD sphinx-panels-0.5.2.ebuild 687 BLAKE2B 299300167bf675d0c93afd131180eb8828831f349c9dff260277108d456ce55b2d1fcea21b2a5d9883e68e4e4a53bc4d2717334d2c62aa4ca8c22d8932cdc54a SHA512 845224a377c62fef4b30a551beddfd02e0db89eb9d09c5de15f149a764d3c499b402ce01aa31bea63c42afef1c2280fd9df342ffae2f8774bb4fe527e6868ce1
-EBUILD sphinx-panels-0.6.0.ebuild 688 BLAKE2B bba52262bf93fa85cbfb17e9e9c61e9fa874b26a9229f93893ddab6ec750ee26b12c5507ae8edd0cbed138b0882055e5238236a193967dfad18d01ad6285eced SHA512 2fb5a0249b925e6cd64d417ce56cd5adba01cdc215faeb4e56afc46daaefcd0dc73d495a3bb9d995a908a1f7e76600ceafea23fa5beda12387d8d60f19d075e7
+EBUILD sphinx-panels-0.6.0.ebuild 686 BLAKE2B b26b7edb5419644eca087c65ab32b6567e89b1471a6f9d808aada00332690f8d16336453e6885a2b21b9ab38f9c7535a01e1e5e058bc1f89a7d42b789c04a2a9 SHA512 6395879fd8d8dd0a64e73da984321ea5cd76b32d9d534859ab2eaf22b6c2773252c0ae8d9a2fcaea2f161eb4c1e3360494ca335944922a224a854027e5ba3c9d
 MISC metadata.xml 358 BLAKE2B 0b9979bdd35a02a66c8a0ba8bb27e7170ada70a9506ad8bf320288d4a40a04a75f8481bd6d084d49569131154e689277fdf43c7120e6c0927c373b4a4c922403 SHA512 a8a585957fdf380ab763cc95cf455a927c6bb0558cce5f0429ba43da72d2655ab15cb6f06f9e5360f24f854f275e0df67ec573167c02332a7dc3912e96b31b3a
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
deleted file mode 100644
index b61ecf063b9c..000000000000
--- a/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension for creating panels in a grid layout"
-HOMEPAGE="https://github.com/executablebooks/sphinx-panels"
-SRC_URI="https://github.com/executablebooks/sphinx-panels/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? ( dev-python/pytest-regressions[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
index 3476ddafa385..644f9878ebcc 100644
--- a/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
+++ b/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/executablebooks/sphinx-panels/archive/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index a3930da8bbfe..84bf005bad1a 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,9 +1,11 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.0.2-py310.patch 981 BLAKE2B d4f64e7b0cff10ea4c348735820d6cbb595c15e36185107a25819b11af2d79b7776296f167bcceefd0b2065af0611b5b2d3fb1e8ffc8d1d0ef14cab8f42671ae SHA512 0dee3be88a4dd39d5a34b8e388dd53609b586fb41473560e96ba8c850819b2da41d69e6e97af7f7a154bf4555f3020501409b2a54618605bef0d6628dc2f44e6
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
-DIST Sphinx-4.0.2.tar.gz 6162889 BLAKE2B c0309ca6752a76c11b5071d3ee368e80499bf68ca51a7f396be10d15b9bf9b03f85de3fef2b4e3c4795de99efa78af42a5b95b00d1f737952e6775631e63128a SHA512 836727258a83d38430de4f6073f637ec3c6c813707701b96c9ec58e35648fd1eb9af1c7c5da17dd95b63914fafcb9e25668129514701c5fdd3f49f7303c3f8ec
 DIST Sphinx-4.0.3.tar.gz 6164298 BLAKE2B 60726ed4cc4f92910bcfff20dde09beef89e4c171b6f12a327e981df8fa6569a901c0b8e994cd66263b87056548f9f966a2e3049341447ad28797bf120a42a70 SHA512 8dd561b220779efb4cf779f46b342a298f18bfeb7670e0485ba8fcae7a03b2bd30368b441237ed597e1d8f001e35bae13a7d4d44d6921a4fa1b8a7804a5850c7
+DIST Sphinx-4.1.0.tar.gz 6302885 BLAKE2B 7e2eafa236173c0fe7d761d1692ff8bb0c12ad8fae2894e2088fff0415d085a3ea652c59d4efc94788829c4261cbee161d85a5c35d6a282fb1a201f658425bb7 SHA512 482378b85b51e74bc2c841bc5ac7b7d5a0034b28e62d36182972439a1e48ce5faaa82e6c3daa35ff6a3f1b1ed1c4187564c77806e6d1804dae0f2c24262adbe6
+DIST Sphinx-4.1.1.tar.gz 6373009 BLAKE2B dd19089149d626a0a65af4ff1cd8acf5a5ea8d00b6c940d2d7c5e1c459ae37d993d82652114b9144a80971275a6e346942dce9a6a3798220dc77e0f88d8fc2e1 SHA512 6250fa568f9952471f3cb433a1e7a053c779540c0c049d0e0bad4f2b754935f8c9f351a297349bc15f1dcb4b152a550771f2f381b2eee92a68759e034fce23c4
 EBUILD sphinx-3.5.4.ebuild 4147 BLAKE2B 71424a28d134dbd1eb18babe105a5b98bb27c1dd92f64844121c3b0f465ed1c73f10b2cc8e9d49952a49eabc1d58ec748f3c207f60dce9b5ef8b1be71f9718ba SHA512 c83535c4082e426930df4bbbc4eea476ed50e109323b89f3baeaa2a27bd0aa61f48f3f09f9b2030f4335fb65b5ef7256640233d2183db36352e2cbce60044661
-EBUILD sphinx-4.0.2.ebuild 4294 BLAKE2B 192a601e803f47438f757baf4f0b981a19802c46c6f0299ac3990ebd5eedbcd8ad37ed6b378df3b03fda92b92db6d2d955f917c7c52bc7b4184a7dc988ef8e82 SHA512 ae00b4d6e7455fa035fcf5a5a67fe9fb9e7d0a72c8b1b5bcda75152378e855213181c294f773f1bb7b974ef3adc29dc85a3aba92af3f025e4edf9075e7038cf1
-EBUILD sphinx-4.0.3.ebuild 4301 BLAKE2B 96935c2160318d1cf0319b2a7d6d0a07922c2648a22ad7299d25a23cedf2eb48e2bdc7ee2002a852eb5e073b26a8ac07ea23e874da8110313cdccbab66863bd1 SHA512 d45a38d1d526c9f5b99fe5a37eab96178d449cfb9fd5ec6a5149768db007e97ca492876670232ea0ef8c57559aa275e77b833213d266eef4882dd92037eff9f3
+EBUILD sphinx-4.0.3.ebuild 4293 BLAKE2B 70552e6b75fa50af4d5af1aa491e7bc8f1aa3103e609c7cfec110ed466d624ec4d0bc1e291157d59383e25bdd4b7d90f794e0213394713b323a131831fcc4001 SHA512 01192407c223cdc47861631e4f211d526ae4f3c9546b91bd75d7a09d05adf9d8e53c8cb23eadcaf5a8cc7acf90772a0a0624df1e92146f81b17273b4dbffb16b
+EBUILD sphinx-4.1.0.ebuild 4343 BLAKE2B 78d3a74da8b013e5d80b0731ad1a6f5b19ae1e991f96c1a28b03234822f78ccea813275ecef944b75d16f75908d7ebfdc6b7077e291a8b86b4bb7f2d5833569c SHA512 b560de6ba97660341f97b3ad657fc62bd3d2ac56e749ec0576cc967da54698481e365300c95251d257a393209aba97bf13e6ea2b508a4d77f195ba951c8dacd5
+EBUILD sphinx-4.1.1.ebuild 4359 BLAKE2B d274c51e81c11455ac5c7eb17891ef9056b6f8bf26b75413afff72196df610c15ba5b1c9dde354e8e495a9e910bbfcc7f33cd207eea5741a14fc6fbe3aa03356 SHA512 09afc62e84ded1a76f1b967962fd8f33e77a4e2ca2a1e61883e1990e4cad1074405f38c3f9e6c375e1ea37af15acd3498d5254e7a459d264556e455d5f08ed05
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/sphinx-4.0.2.ebuild b/dev-python/sphinx/sphinx-4.0.2.ebuild
deleted file mode 100644
index 7cc217f2e354..000000000000
--- a/dev-python/sphinx/sphinx-4.0.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-	' python3_7)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-	"${FILESDIR}/${P}-py310.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	# remove unnecessary upper bounds
-	sed -e '/Jinja2/s:,<3.0::' \
-		-e '/MarkupSafe/s:<2.0::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local deselect=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
-		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_pycode_parser.py::test_annotated_assignment
-		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/sphinx/sphinx-4.0.3.ebuild b/dev-python/sphinx/sphinx-4.0.3.ebuild
index 343eaaf18187..938ba29ebe50 100644
--- a/dev-python/sphinx/sphinx-4.0.3.ebuild
+++ b/dev-python/sphinx/sphinx-4.0.3.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex"
 
 RDEPEND="
diff --git a/dev-python/sphinx/sphinx-4.1.0.ebuild b/dev-python/sphinx/sphinx-4.1.0.ebuild
new file mode 100644
index 000000000000..998f34e2eec6
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.1.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	# remove unnecessary upper bounds
+	sed -e '/Jinja2/s:,<3.0::' \
+		-e '/MarkupSafe/s:<2.0::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_enum_class
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sphinx/sphinx-4.1.1.ebuild b/dev-python/sphinx/sphinx-4.1.1.ebuild
new file mode 100644
index 000000000000..4a19323cee98
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.1.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	# remove unnecessary upper bounds
+	sed -e '/Jinja2/s:,<3.0::' \
+		-e '/MarkupSafe/s:<2.0::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_enum_class
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 8f44993c71b4..6a2a6e39ea70 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-htmlhelp-1.0.3.tar.gz 24248 BLAKE2B eeb7edd0bce99621ce6fa3a2bb9ba90a619af18403c8b4b0148a7d20fd3847f418f35bb1bb413531c0799b5b98be7b45aca51aa5c8120d9c997abb86ab0b0f01 SHA512 f37542c5789340bb26c41b84512e08998e4ef45ff2eb0fdb0e10f585cff27a145d5821b8eb3766d009e2b5a38c3d7efb127ab898982e1b6fd1d4ff7e26907db4
 DIST sphinxcontrib-htmlhelp-2.0.0.tar.gz 28144 BLAKE2B 09b0d9bcec57140278c4476fa0bbc40d359fc167d8ea891a1585fbdeafe6eb0b52442dbbc8d1d5b6edb3953b04fc29a71f6f74e58a281ebb0d79e5a30cb02749 SHA512 6ed673966615f3e818e00de4b7e59c27f0a0d7b494294f804540777c580480870c36002c08d8ad626b7b41a676fe40edc0b0b5ffc6ad8080f38f59c24e157636
-EBUILD sphinxcontrib-htmlhelp-1.0.3.ebuild 880 BLAKE2B dcdf06525954627e866d02f8e46df726d52794334da88c5a4b86768cfe32cb1459e9e15fb041f6077d6770b011ceb7ecffbd9b8b6debcd06f630317fa836d785 SHA512 fde00e62f1fe8244e6b0883344b0ec2cd01a0aa2aca6229bc0d20eeed32d79ecbd1e008774780edac645cf64bfc2d019c792d23a206a832c3694fd9d8516de40
-EBUILD sphinxcontrib-htmlhelp-2.0.0.ebuild 891 BLAKE2B 40f614f66f0584b0a516dbfc722a6b3b7397cebdf81e2a5ecc88df69767f0b334643ecfc7730172376113cd27411ca85206e64a3104d323add50110ec7f1e79b SHA512 11d207abf7f385a3f941bf01cfcab0a1f7ef3b35cb2370fdc2d3c8839becadf08f61b285fb2329f09bf719bd94d5028b0171fdd50089b07c4b3532694389f9dd
+EBUILD sphinxcontrib-htmlhelp-2.0.0.ebuild 883 BLAKE2B aa2b85973abaa2d33882f9dbb6d42bfdaa43fc10e5f035d09044d22c942597ceadd444ba4e1fc01e20cd2539cc28e1c98f8927d1fe366f693f311e5e688ba7e0 SHA512 6f4ce3de37a432462cc56bd8671f1f3f5bd718026c794031dbde466db399e542d94075e855e46158b86b2703a1001b74ab2614467dab84317027e12b779e0a5d
 MISC metadata.xml 398 BLAKE2B 84cee02bfaa0420c3bee0d1324270b84678a306904ecf3b30237d4ad7ceefffd97528109552e00d3aa1b2ad4eb6d9cd0e10341fb122c7a1830031870c1919dd8 SHA512 63c17014837ebf2e8bfce709fdfcd9de27c0071aa527a790c6e1e66c1246ae6e4635e8c30b7b486c9bdc727d7e044bfc30d848058bfb4eafe3eb8c32478a5b69
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
deleted file mode 100644
index bdfa2f9fc3ed..000000000000
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs HTML help book"
-HOMEPAGE="https://www.sphinx-doc.org
-	https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"
-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 ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
index 14ab5ad12120..b94a7f8825b9 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.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 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 91ca568e0e80..7354b569b36a 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-serializinghtml-1.1.4.tar.gz 18647 BLAKE2B aa5dcbacf28a0433cbe86d9da3f6dc5859ec6148f74714654f5095ed1f21042e0d4ab1cbfb1bc816c1de40136ac51cb6f78c913cebf5465a4a11c25b22b36a14 SHA512 d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0
 DIST sphinxcontrib-serializinghtml-1.1.5.tar.gz 21019 BLAKE2B e2da8b1e1300a327b8d508ce98e7c0d3eff1e0cea28cd874df4fbd9ed0bd4de6c17e107e622ec72e00bb237025ae26b2c5aaa33b2156cee2fad7c8f8d2c65ed5 SHA512 c5aabe4d29fd0455c269f8054089fdd61e1de5c35aa407740fc3baae4cfb3235d9fd5515c0489b0becd12abc8f18d0f42aa169ed315c00f30ba87e64ce851667
-EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 900 BLAKE2B 91819fd2ab09f086d43eb83e921a39feb186fe8d1b457981cccde0b20552fc4227542c767507b73e6b4241f5d53de6fb40237ba1b0a4f6e4f8f2273275dd40d5 SHA512 22a872ee63762ce8e34a3e96b9542189a927f1480b5b8914f05d7b6247fd4e17f5f67806fed9be17077c4a1ac197ca45b1be4e2721d91c72c673816ca4b62eb4
-EBUILD sphinxcontrib-serializinghtml-1.1.5.ebuild 868 BLAKE2B 892609bfae5872d24613e3f828eb4df2fba8e44f822c8726a367d79d034f954b1b808206c8caa4891df9585f15fc9a81ea4a98d11043f756d709ad8de846d304 SHA512 013eea94bb100f1b5eac099a53128f2c10b30a965694f42477d29858ffec6fc4ba2e6ebf19af765b0f8190b8990feb1b855aa2d4fa1150d1b3a22d3881d357b3
+EBUILD sphinxcontrib-serializinghtml-1.1.5.ebuild 860 BLAKE2B 6e51b03384cc721f8694ef7d3d53d4319a66a5995b12064988529decd6d6378b426eda5ec0f457cc31c75a93597186fd8a27eea33e78242392992d031d2ce8c7 SHA512 bb4c7d7b617419db0225de96db9933f6d275c14d4ccf885df871e2ff807e1cb518ac2524af8f8a47985b16c517697de7f271318dc3d490eef6f455ce481a396f
 MISC metadata.xml 436 BLAKE2B 1ff1b18113f36620c2fbab9af2fcb1ba8e827f5a3aa3ddd0eca46d40afbef8c6835f0b0df1e49e9783974aa536d1450f5bdfe8c5e1764e17339f5ebdb8dbd74c SHA512 ce1452b75f6f585ff90a1da0b6455693b18f462ec97bb4afe1ddefa2a1a684fcf87928a35911ce0fb99f2f4f039ab580bb4f17efc375930d57d788a00084936b
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
deleted file mode 100644
index 8a5b38c3c9eb..000000000000
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs outputs serialized HTML files"
-HOMEPAGE="https://www.sphinx-doc.org
-	https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"
-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 ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
index 7169bf18a7b3..a6e047c73b14 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.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 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-trio/Manifest b/dev-python/sphinxcontrib-trio/Manifest
index 9df0ef4cdc95..f71ba49be7bb 100644
--- a/dev-python/sphinxcontrib-trio/Manifest
+++ b/dev-python/sphinxcontrib-trio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-trio-1.1.2.tar.gz 24131 BLAKE2B 5ddaf5ed6c85905275e206fdd966745ce4dd7296595c488864df291cb7202725ccab722f306dd9d6c27d660f5cb3e43bf9ab2fe50e8aa5a7232c2615dddbdfd0 SHA512 cb90f37f463fbdd3f810eb6d76b4bdaaabe83317de0ad747fcee55980849d691e272884ecdfcbee58851cf536f268f2520caba281d7550fe3250e92c69164434
-EBUILD sphinxcontrib-trio-1.1.2.ebuild 962 BLAKE2B bbb6ce74523683d14759af7cca9beda5611293d93fb64a6069a7d8827613b73ba4d92114f89a794ebbdbe387c3f7bc1e833dce529fe617fccdd5ce2945660abf SHA512 3fc2e95b83b9818164a70cf5b8657629dde0e82b78ebc70783aa4fae9d7760784e6eda091d42925c26cf824b86435b9c87251032d18c8c3bd32a59199852edda
+EBUILD sphinxcontrib-trio-1.1.2.ebuild 979 BLAKE2B 8564e8ee80e444728259dd7761141c8972292ae7aa7a23e27d8612e4c63e0f65668ba0974f5abca8dfadda27bcdbeba702619ba5b2a16a69d317434d833fac3f SHA512 562169728184180e4fed07a34c5e72c7b00123cb469ccc91e4e9a1c177254ae1d25d6b9d0afd436fcc3108d540b1f13d597c14db70130c758757d359c94f12c9
 MISC metadata.xml 1117 BLAKE2B 947c7c2b888c24101db258e47efffbc6db4873c99cb9dd5c2076dfc25d25de04736db46d9fff88667f57f8f09f01c17f2937b2d7f641a8b7cb5baecf9d3d2b2e SHA512 57341896ef4194b5ddab0485e46bd8567c4514518c02e1049db21e9174c420175e47644d948c9c1a6dc03bd4248f235d2d811c6252be7c67f624e0b2883ff2ed
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
index d8b906e35f57..e192519714d9 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 5eda6cd45deb..75a893f38314 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -4,9 +4,11 @@ DIST SQLAlchemy-1.4.15.tar.gz 7621840 BLAKE2B 74299b92e8ae9d6017c961c44281cc4392
 DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f6cd79ca3c393abf66d7370754e8433d743e739803929aaf0e2788b0c0419c022ddda1517d38da6580f3afeee1bc4d4 SHA512 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0
 DIST SQLAlchemy-1.4.19.tar.gz 7675110 BLAKE2B 61afe9e8937cc1eca9a6c10eef03959422a6dc73e562b47c820b01fbeb61099113d1d30e4de0448ae07abc064db190a9a0b9550d4f8c324a73d277c2c9e7958b SHA512 656e5fd2c1e5c5f9979ad3e38b0f927e8756423d5c988ccb5247cde2f8d354b4623cb57af24c7226758878e429514ae828047fad623ee332ae524b714ab3f18f
 DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc162cb21e747b889fa032863435b6a922b9ad21c7ba136b94617710d3aa6ec331941b11b0fd87a8d543b633d3d605c36 SHA512 cb9ec5c74b27c93824b7d46844d2a122c719e358d917563039f3dd96a44d057d4daa239b2820893db42348f46546efc469a202999be2c722027abbb6eed50063
+DIST SQLAlchemy-1.4.21.tar.gz 7701480 BLAKE2B fd7898844241e381df1356b33f42c99f1d91e50cdf702d3d04302225b64ba7e5bd4ed0d140b1ef2c6a3c4480c282ef3aa6f1301083de68c63d4b86448a9420d2 SHA512 90e3e63f339d784bf46928031c24804bfc2221044e08061f3da7db9c905013fbf4f0cada3b870a1662234b0169a51a678ff6bd837610ba18ab7cd1eea048a028
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
 EBUILD sqlalchemy-1.4.15.ebuild 1699 BLAKE2B 5d6c0890d1352b0a96b01005a9bc8623956c5cfd5df44b1956200e9bb4b786c0121443d90997260b6b543456c3cb166704d60f37b8212e2b30b3e3ea37436710 SHA512 259402945476720ebe4aa1ea860ae8f43095b6916d1112fc4bc8616838a8efecddab01dca1937c800fa32bc8df8d15de67bc5eccc5330371a250473b4a8fea61
-EBUILD sqlalchemy-1.4.18.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
+EBUILD sqlalchemy-1.4.18.ebuild 1690 BLAKE2B 4a31c38037057fb338e12175331a2ed3347612c9df5c3817c0717d165d9544a204e55514130fd4d8ce3ab533138c2e9ef9f070d09815dbc2d21af82f76921ae1 SHA512 23f80e868cb99d48aa52da3881e210bb86e9576f339a5376c2922bb6b5b3f4f4a37c45f70ff8700557d157b19261937e45eab5b9f696671ae76c9e0579e9640c
 EBUILD sqlalchemy-1.4.19.ebuild 1704 BLAKE2B c6e674ffe8efcfcaab23945ff90090411622da56f9d65414a0c849b2f01bab12904c4a79c71383b4fac21aad265e6dc83a4543adb532fd44ae84aa7079185981 SHA512 1e6cc2c24dcc02930e1687d9c0424b3a98baa6e4be7182e65beea5c836dd0b6396d47abd84c0927d497a34b8cfa39b1dd84449753a471dfd99e65dcbd21c64d9
 EBUILD sqlalchemy-1.4.20.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
+EBUILD sqlalchemy-1.4.21.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
index 144d57d9ca1b..619a4c03c66b 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild
new file mode 100644
index 000000000000..144d57d9ca1b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 025af926c682..2d0919b00c5d 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,9 +1,7 @@
-DIST stripe-2.56.0.tar.gz 216066 BLAKE2B 1473c0b5a0f53cea18120b6234ed7f310c3625592423f16e77ca3a87c8a79f61c19c0c5f09d071a2be84e4f0d8b5323cc9f1de2e24a74bd24e557c9eb48b2c38 SHA512 1f2f08b5425ad48df9afc78f574109604319ccfcdb2fba8ca574008de5dadb349eec84d0e6cf532c57218bc8624af9b256a29ef01facb950a3cfd1168d8c2660
-DIST stripe-2.57.0.tar.gz 216286 BLAKE2B 9f2c3b7d4ae3f100647a1cae32d09f258703890eb97637ab2a9d3fc1d2fc30eae7042e4245d8f62a5cb4a5226337a7b22813d992842326aaa57d7ecb3a1da200 SHA512 c63efabc8febe79a01167ad4c166d9498f8623a3b1d36c292a3554cbacfc6aada1bf5ec720723b5a9de6e5c4fb770b8f44d1c95289aff4394a70a0301df61e93
 DIST stripe-2.58.0.tar.gz 216926 BLAKE2B 398b16ddab4050373ba5d7da3c8404b85b88d50749a5c3ce2e1704dbe04cdb99abc90b6c8837afbc3e086551e8dfa72baa3a5e68edf2ebb4e30aff157fb3ce8c SHA512 eee6154384fae69632e5e9ae7f972d97915b07da85c9f1af3849f5b9fea1e6f291c3d3e5b0e319c0d6dc0c035fec167f7711f650032016d3eb4709b333f3d5b7
 DIST stripe-2.59.0.tar.gz 219952 BLAKE2B f59d7e7f7c03f620dd2f43b5678208d72de0f947bf748c9c41d6782a6b01450a0547ddd5972a731fd1b8187479e1b813f890993ae097ec8c32acd4691256a4c3 SHA512 f27ed8457d1097aac43aaddaf39b8d1d9df25e837160407edea354b2fa8faf122ed86a9d36583ff56885e22663b230ee63af04baab0edad2711f3c691c8de51c
-EBUILD stripe-2.56.0.ebuild 1720 BLAKE2B a9d99433b7d151404034b4f8f8e54f4fe48bf54235a337bc2d682ee6b4f622f2765ac8caecf82c42fc185fcb16f428de12670bd8af6de839658c8a52a3158a3c SHA512 90bad27eaa41834eab73abfd0d2d8093335854df0758d7d01a52f97d1dbd03195b0ae430f60f5efa7427ce161b31a2ea10c6fcae0c521b8e735b584671219aa7
-EBUILD stripe-2.57.0.ebuild 1722 BLAKE2B c94800d5bb0cb03e31a9b897eff15cf76b2e2a922740346103e4ac62b4ceedf6b282999ca4b4a98b74b817eae9af22e07cd8790aae203941c3ac5e8dc2f99029 SHA512 efd8a8afa15e7187ddedb17c1b6e4b52f44493bf0766ccf0df2dad28ec3651b78f8475a1a39fb0af9f0c332fd971d5bf41bc2c400403cf83af9b2d2318234138
-EBUILD stripe-2.58.0.ebuild 1723 BLAKE2B 2b333392240a5fd20f5c7165fd2755a607677d2ae53d86c3ece65b7cdb81c1f65b9f1d0ff9ac2d8602ed50f290ce55f68ff9c0c38fbd8a861c3923583224865f SHA512 bf9e36a0c4957439ec88432125db54eb237e9f06195a3f252d3e5c846e8ddd4647471de433777f2e664124d5ae8661c04aac47871299f54623d45b60698cbfa1
-EBUILD stripe-2.59.0.ebuild 1711 BLAKE2B 0591488ef7dde4e4f172a77ec289362170f9a033c98e57f8007f9800148000e4dc6a18d52e410cd53f12671c3a5b7a228d599a1bbdc92c3dc25b3bbc712eac2f SHA512 ce1db42f27de81fc1dc326a60f4f0a2f2ddc64b2f96c74890861285739845aaff8f5dfbd1967b2d2f30630277523d315e913e7386c6b79d7cb8573e7e7670d50
+DIST stripe-2.60.0.tar.gz 219649 BLAKE2B 208826e62560f6e9acb5016cecae4f3128106d562f8b5de6caa106179f6991376bacd679ab4cd61a973a60f68a84aebb673d17c1ca8d10541c2ab4a1e761da0e SHA512 eaae2356ed83285713be6396c071b8f5761ad0ff651691b1560b06bca190a5c5df3659182e5a25e8d286257046162f32755854f0e382a280cb63180478114502
+EBUILD stripe-2.58.0.ebuild 1721 BLAKE2B 4a4d3a08a98e2ee9d1fee8cea34c3ef399e754a7f8fd5394f9ed810f89c9e03dc1025f0769d73f4b14842a0dbae9e016b17696c9f9f8e3e9f2499da2c2aa7f31 SHA512 233490a7aaa47b577b8930fdbfff9966eb3e6ee2f12b1af3118594356b30ab071c155ff38eb8c7bc2c706eaceed0c3a93b346d7dd9579f034491287dbf1605d6
+EBUILD stripe-2.59.0.ebuild 1711 BLAKE2B c8541c9fac95ff02cb6a4168127f1001177e8683c2fd19e5e0f8630ca0b68a63e94b712089538c3e5ad10bd6b2dfd918d010939cdf9bf9b51295681e9b7a031d SHA512 9c122483a9fc30275e8d01bf3de17abe46750c938a89e32202c3192576effca0af36c8a30d6837af2f3e5b9a8c5d1924e2a0f3d6ef257ca21fa6980dc05937f0
+EBUILD stripe-2.60.0.ebuild 1711 BLAKE2B c8541c9fac95ff02cb6a4168127f1001177e8683c2fd19e5e0f8630ca0b68a63e94b712089538c3e5ad10bd6b2dfd918d010939cdf9bf9b51295681e9b7a031d SHA512 9c122483a9fc30275e8d01bf3de17abe46750c938a89e32202c3192576effca0af36c8a30d6837af2f3e5b9a8c5d1924e2a0f3d6ef257ca21fa6980dc05937f0
 MISC metadata.xml 371 BLAKE2B 46520a75a660c8f40fe56dca2ac8536e4c680cee8039dc9f2858916c4f669a70220376f6c5a9d6a6cdd1b62bd626110b1c93f9c1383520b56b3c0c98d310734c SHA512 e2bfe317401810b10903c05ddc9ab3d5eae2873440bcc1ab3363ac7c1916baf3b06a0c4c3b6bc521fd4e3f2a3376e540c93a76c4d9b5e8c308d5af2c7a9525f7
diff --git a/dev-python/stripe/stripe-2.56.0.ebuild b/dev-python/stripe/stripe-2.56.0.ebuild
deleted file mode 100644
index dd6df66c4651..000000000000
--- a/dev-python/stripe/stripe-2.56.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="https://github.com/stripe/stripe-python"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-util/stripe-mock-0.103.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-2.57.0.ebuild b/dev-python/stripe/stripe-2.57.0.ebuild
deleted file mode 100644
index 3895e0af78a6..000000000000
--- a/dev-python/stripe/stripe-2.57.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="https://github.com/stripe/stripe-python"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-util/stripe-mock-0.103.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-2.58.0.ebuild b/dev-python/stripe/stripe-2.58.0.ebuild
index 5499e1b64756..d898c3a09953 100644
--- a/dev-python/stripe/stripe-2.58.0.ebuild
+++ b/dev-python/stripe/stripe-2.58.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
@@ -20,7 +20,7 @@ RDEPEND="
 DEPEND="
 	test? (
 		${RDEPEND}
-		>=dev-util/stripe-mock-0.103.0
+		>=dev-util/stripe-mock-0.106.0
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		net-misc/curl
 	)
diff --git a/dev-python/stripe/stripe-2.59.0.ebuild b/dev-python/stripe/stripe-2.59.0.ebuild
index eb4fd3325e69..b8c67ae0502c 100644
--- a/dev-python/stripe/stripe-2.59.0.ebuild
+++ b/dev-python/stripe/stripe-2.59.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		>=dev-util/stripe-mock-0.103.0
+		>=dev-util/stripe-mock-0.109.0
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		net-misc/curl
 	)
diff --git a/dev-python/stripe/stripe-2.60.0.ebuild b/dev-python/stripe/stripe-2.60.0.ebuild
new file mode 100644
index 000000000000..b8c67ae0502c
--- /dev/null
+++ b/dev-python/stripe/stripe-2.60.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.109.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index e21ab4c95e84..69bbcfb789ac 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,5 +1,7 @@
 DIST tenacity-7.0.0.tar.gz 33874 BLAKE2B 485b35058e246ac7c68a2d92a4bd30ae182d382d4258854afb1e61d0b31cd1674bfd92599b83425f4e9a92ca4c38e4a91b72a17d0de6f918474ebe59e6bd2d66 SHA512 a627112df19b9f6d1c53294daad7fe1b0aeaed15e6ec07054228575fbc76ca5c22f560ddd6fc176c5c22141669423547ba17f1e33c7d0e7e92d0188acad065c4
 DIST tenacity-8.0.0.tar.gz 35483 BLAKE2B bde48a9682d1ce661ec6a35387c8a3931e60f61ac605b95637ce88176a5346eed54047623d0ee116e5c6d279f265d9cee0fd69e2b805c50cd7e06390d6952813 SHA512 f9c8b74d53dc4973e833a2d2625d15b7f40b813b1cfe389511c1083e738d62b0793dbfab73ed13a9e88cc65a17d2c6d8b0a571f13732a26f4c957e16dd9bbefc
+DIST tenacity-8.0.1.tar.gz 37492 BLAKE2B 10438b3877862baa88d164837b201773c287e7ce11b6213c677c227cbddda02434b423c0f331746495e68ab130ff9a9c720cccd2def3efa8ca6df8eef441eee9 SHA512 b5a615306e25c93d2734d408cc73f4db5361d92b713c1e7bbb57cd7bf635f82c5ccffafe9c0a6bc0da4057d11c92012d2337a5e4f15465bf4e6839d1fa97b877
 EBUILD tenacity-7.0.0.ebuild 794 BLAKE2B 68db54a8a2ef401c99e796f4b1d7a25464740e7c12035debc70ec337757d1a828438b9cb926e99498583913afd28f103351e2e2f3ce2b695ac0cdd3e97fe4dbf SHA512 c6f937b7db7bc7c24d21846ad6fddfc9a46d137a2b24011ff9d76cd5ebd14dc9c86410f016fb292011d533112d89a3875576564afbb4961a8bf760f83345b43b
 EBUILD tenacity-8.0.0.ebuild 690 BLAKE2B 51424a9af61aae104788dd382cad89c2b4852ecd19385c878602624fe5214975d1ee457496864851e1462de54e68a0ec4359703183a2c9d2ae26b910919c7e50 SHA512 5f9852a46b8efe768fa02a1082aae3872340bb040736c10d20955a3f9a5a5625daab945393627eb3705d656a01f63118c0c9b0b78fbd2a42f076e7ab454f4afa
+EBUILD tenacity-8.0.1.ebuild 690 BLAKE2B 51424a9af61aae104788dd382cad89c2b4852ecd19385c878602624fe5214975d1ee457496864851e1462de54e68a0ec4359703183a2c9d2ae26b910919c7e50 SHA512 5f9852a46b8efe768fa02a1082aae3872340bb040736c10d20955a3f9a5a5625daab945393627eb3705d656a01f63118c0c9b0b78fbd2a42f076e7ab454f4afa
 MISC metadata.xml 855 BLAKE2B f8202daa921e00bbf7beee306ce1ae06d7a65784945c80417666f6924bad97af08b45fe761e79ea2aac4331552d8d146f45d1e086567791eda1a1bd78f57ce39 SHA512 dcb03bf33c2f0de3e945e0a9aa997c7a8896aa49f1db22c6de4185d16b41fe26e0a28b152b28014c6b4fcf2bef9a143f6d96f8b089d357b6f2b2b128b87cd286
diff --git a/dev-python/tenacity/tenacity-8.0.1.ebuild b/dev-python/tenacity/tenacity-8.0.1.ebuild
new file mode 100644
index 000000000000..4d837bd1e2de
--- /dev/null
+++ b/dev-python/tenacity/tenacity-8.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="https://github.com/jd/tenacity"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO: package typeguard
+		tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 829cee26b602..212b7e8fa068 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,5 +1,3 @@
-DIST terminado-0.10.0.tar.gz 14059 BLAKE2B 9fedf12900275154068f5bac97a7038bbd9f655b30a1f3f50f5a66f581b7ed7599116be8eb59d1a82234455574b3a85f239f25af81b03967e986da01b5cee87b SHA512 a0fdbe904e617659a96a594430da3bc00a8addf93b111557355cca48f7d7e39ea1f388d6cb4179de1c10a35c0bec0c69e97c38e1ce77823b5c938c04fa1a632a
 DIST terminado-0.10.1.tar.gz 13911 BLAKE2B e939bab2a23b75d803ba2260548a48a0f1c9925f6a2fe69ff7b549255539898e35f76e94526f8f470126d4d50466f8a85a14bbd3c38d2999d4e90ec4be3e0222 SHA512 fb6a6e27cec8e644565ecab3a7c43fd288c6ff9e18e68dda6d306532fa5e39274574f3dabdbf629cf00096256fef9a0419c98a3d9b7b038e04dd6ca1af16af46
-EBUILD terminado-0.10.0.ebuild 802 BLAKE2B a2c30c51e7dfd3b8307742708d85a87619da630bfbaa3fe81075d1eed96a9e4a41222e26046e21d417be164bca8390ab517b7d394f787f616d8582b1b06d6d9e SHA512 1205e475152844790ed927f7302486c15d4532f8e1e3d7c24cb7eeb969eb719361d6bfe1909d77aa00f3ad969a7295ced9f7d70cacb55feb9e8e0ca7b1385d28
-EBUILD terminado-0.10.1.ebuild 811 BLAKE2B 1107a705e5b0b85509ee821741d336585b42fb8243a98dc3c91afd6c6e16ec03ff028776bb23d102a949f7d068c24e9e0e9b145306801f54f65519c76bffd2a8 SHA512 ca2e46800d1e7243a34680a7258093cf25c8c63ae9bfcfc1f8bf9713aa727406ca1665a2fe0c49a122b3ce7929a7f762b21002e96c074ee700eaa969648119de
+EBUILD terminado-0.10.1.ebuild 809 BLAKE2B 8f3f0a83261f53e307f501ed29bf6ba2d55e039d400a24bfb7708c64d9857fbdb5af801b7b93f9113672d8a992c0883dd424935e55de727568794f1fb0fb5754 SHA512 55a12ae5625804379275ce5237523d6929f5a5f053c07b209f95fa2e39fd32053dbb5190635b87d3f36788947099290c106a5445134ef8d492395f0cc14174c2
 MISC metadata.xml 406 BLAKE2B dec60c3428988bbfd3007f2b26d8ecab06a95cbe5c4394e19f063e9dcab48a31d20c6e07d1600ee2249b72fd95d48fc80e9c9c32e44a74f2b2adc9d3fef84742 SHA512 7dc32ac28a0fc70ec0616c821723e1ed3a754da904963eba60e1cd634e955994fbcff05ab7bbc05df2b0beff74aec441349ba0b9566294e9ea387e6928c8d6dc
diff --git a/dev-python/terminado/terminado-0.10.0.ebuild b/dev-python/terminado/terminado-0.10.0.ebuild
deleted file mode 100644
index 07d6bc81835c..000000000000
--- a/dev-python/terminado/terminado-0.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
diff --git a/dev-python/terminado/terminado-0.10.1.ebuild b/dev-python/terminado/terminado-0.10.1.ebuild
index 381e53433fd7..f94f8bb0b938 100644
--- a/dev-python/terminado/terminado-0.10.1.ebuild
+++ b/dev-python/terminado/terminado-0.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index e6b3d5662c90..60caf1b518a1 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,3 +1,5 @@
 DIST testfixtures-6.17.1.tar.gz 121440 BLAKE2B 6fcdf4f99af7941044f5f3cdc3e1204b5730d514a009e95f14451537f62af6c6ebaa97356b7ca0dae6313bd81b2a83d981567346e20c477c2d17c6bca73ecdcf SHA512 fbf7c8cd39b83516a257c5a3bce724a8416af88cf1bac8d69457b2030873185c685feb12aea065df2af729a9b733b3e0afe76207bd78e9b5a0c2d464b727d99e
+DIST testfixtures-6.18.0.tar.gz 121584 BLAKE2B abf90012fe79d148c44d72a8aaa5277c95a33933c7b753eecdcaeb11279b4439ad9ea394270e440d9681c22789a17738d367b66adf3d04cf6e6289713c1ead59 SHA512 e6552e6b1837ae4ee4754ce3675bdbf2a68d8e46b892382bd8320290050f2c296348ef6310ce3ff46962bf1978c351fe2cdb853a73c9f800f68818f81d5caec9
 EBUILD testfixtures-6.17.1.ebuild 1106 BLAKE2B 2576814009e806ebbe03dfb62b966456fc060146ecafba73010d002a520132184f4056a36754af34dccd9a11464f1d5ec6473970d2cffcf49a115a7616d8de44 SHA512 102be0baf5c3b52fa8a7190fa747e823faeb0ed1e55683d2f99976d384d3bca82dce142340d6cade3d3bceb33c2130cb4ed2f17656edf1265e8c2242f7820b15
+EBUILD testfixtures-6.18.0.ebuild 1109 BLAKE2B 15c8cdcf5b433b32c4138a7d2060db19bbddf192ab326c4a0ae3907026196b3817f2b8c2a75919a69861748abee41ac0c7072508cf10784bfd45feeb1b1f9eaa SHA512 dcd27bff5c81ab2c204dc861a70a0bbf147bd3867bf36baf03401a966a1f33931f272e360c063e717018c10d74f16597707148048bac3911bcb02780519d69a7
 MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.18.0.ebuild b/dev-python/testfixtures/testfixtures-6.18.0.ebuild
new file mode 100644
index 000000000000..a0872c1838ea
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.18.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# kill weird way of declaring build deps
+	sed -e '/build=/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTHONPATH="."
+	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
+	epytest -Wignore::DeprecationWarning
+}
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index ff0488d757c1..b2ce524cd96e 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -2,5 +2,7 @@ AUX testtools-2.4.0-assertitemsequal.patch 869 BLAKE2B b7fe42aa06c20c0c281d27553
 AUX testtools-2.4.0-py310.patch 1325 BLAKE2B 3b7f3b370d2ce5b98e2a80ca438eaba4a224bcbde0c5f4307baaa5faf1b35f8dddf77b5fca8b45c6870910fbb784ab064c0178f8d77d7cd644c44ca94f2bd62b SHA512 bc96d58c2dd1744a7381d1418a000f213ce2c9253d54ed63fb11e686d05d684edb9e2873f0b15b7b99d5ae3deb1d435e4512ece1d1bad96947cc6654a7e6ad13
 AUX testtools-2.4.0-py39.patch 4816 BLAKE2B dc5198c0c8baab37ae645d97cb93c860e737142b691d00f96e35574dd0e77f8a163d4031a4b96aa9f28664af1a3a58552565bf5d887cef00c72e13ba9c3b3ea9 SHA512 a554d49e74f43269a847d767611f86fda655fe9ca27cf182c91975702b6928b4161e12d78283113b88b4d50b9fce240cd4fbf236e884e8b92698bdd512c42598
 DIST testtools-2.4.0.tar.gz 233032 BLAKE2B 8b0559039bfc5e18dfe8d70cc10f6e43ad2e1fbebf7d20d9c6c876c5672a6149064f558150d8eb09f569b82983ffe67e06143b14a1d8869efcc585839d6216ae SHA512 af26e163a4caeb207a554b19f86c7892ab5ebe904c144d85273464e880cd18a991c70a77ff817aefb15768fa38f382e9ed853cdefb212dc697b24072e17535c0
+DIST testtools-2.5.0.tar.gz 235399 BLAKE2B 62d62cd12f19eb3fad419dc06e7f0152bf8f70a9f60927b1d791f2905b34e13199ceac93b3d30735acae2c5db1e8554cc5a7f6c8588d1f05fb213c424e90a12b SHA512 6adbf9e90f0647a44130e99cd94e4c0cbfab3a1b5c28b6bb124d061defe69d8043186cfe554099936effe16a6b07d59927bfeb6820f5a0fb34970ff243030fd4
 EBUILD testtools-2.4.0-r2.ebuild 1845 BLAKE2B 2c51488922d8a57965fbfb779fb475aaf7d38cdf814a4c0ec8c722605187c301d45bc5fada426e5b1e1414335f881366834a823546bc345e1977002d3093094e SHA512 f09cc00b946a0f158b94da8639e44887e4d7c6cae754277b9a166ffb3292ced8bad7085c31335b6cca834b8b8eb19b4a7f781c6e13fdde365e71bdc019589165
+EBUILD testtools-2.5.0.ebuild 1124 BLAKE2B 365736c4ea8c6d6bf14b07c4ae39e9a96e65ff48e973a8cc5e9d21d1275699ed7fd294f4c907d842eb0e484e6214b065652abaa18b4c326c630ef84886ba161d SHA512 8ca227329c24bbda59653a700a87d25f55ed5bfb7a3e4f0c9a9d55f1b385b69ac448811cffe775a0b6aeacec69a6b6905c435adbb57a3c8e23c3686e89569ab1
 MISC metadata.xml 579 BLAKE2B 60320e15f2101c115cbd946efe6a2c8cfc12645a005bb9727f5c4fb7d28d91081f2b96b6120ad9a36a7bb6af61d7110afb97b7985306dea3d57427af834a8112 SHA512 c3c8805d1a8d7cc406104548d1d89ce8074ef989a623b5190da1cc1bbe9ecb8e6f181a6c05e5c74b87bc3a3fc27c6713642070f34d4961e385a470820ceda0f0
diff --git a/dev-python/testtools/testtools-2.5.0.ebuild b/dev-python/testtools/testtools-2.5.0.ebuild
new file mode 100644
index 000000000000..ef5d0f959a0d
--- /dev/null
+++ b/dev-python/testtools/testtools-2.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+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 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
+	dev-python/python-mimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	dev-python/pyrsistent[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx doc
+distutils_enable_tests unittest
+
+python_test() {
+	"${PYTHON}" -m testtools.run testtools.tests.test_suite ||
+		die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index fd93772f44c7..b45037d297c8 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,3 +1,5 @@
 DIST texttable-1.6.3.tar.gz 11574 BLAKE2B aebb306acb89f62963e9473ab6e22291a1ec93993a0106ddd2943f656737cb0960a10e680a69b6577ebb8ac0af3c6ecdfd8c58647a6ce37d9a6531e41f61f480 SHA512 89a26ef7d9947ec4edfc5791c91f2ac327c79bbc5aa0e0f89c0a63dbd80bc420027af073da935254faa143b9e8bef85a7bb352791b45b0cd60c7bcf569869f2d
+DIST texttable-1.6.4.tar.gz 11611 BLAKE2B a97a9beefc9547fe7487af5b6411effd7391e303a13161d7e1c9304a1b580cf47bb10c8649dfea5c6f8ba05bc6c3fd7595662e8b74b282696d9ee3a110746212 SHA512 300b02f5b682f1c09a3eb5abfd4ee9c724354505a3f9e8f68207fd7d244402f234437807d68b6b526c3d4ade9e527e66c921bcd47a5e86d680698d559da3fe1a
 EBUILD texttable-1.6.3.ebuild 659 BLAKE2B 3c62d947889229f01c5bdb5eff363221f9f63facdde893ba9cf57885dfbbd3a0ba88a702cd32a56ff75cd98f25df6d209554d2ce1220b6a3f6960500c955d474 SHA512 857dc931ae7432e85715bf31f71a711f585fa9a0aa9daca8dfc826ddb5b7806d006b1cdc6c74045cc1336dc83607fe61d97fb0165deaad6bcd6a2aa31289e1c8
+EBUILD texttable-1.6.4.ebuild 662 BLAKE2B 6ccbd82aed053f4ce17d43c639af43dcb6a39623ae37ab5fd9521e5a72d216477470836b5d1bd17d2408da0ca5f14e9943107d83baa095ced8a1f18abaa6b153 SHA512 cf333b294b3774eb1b813c0170bc27001bf9f0f30aa5a78373c0c30f691fc6f7bca915ce4aaa1bc8be8785b45a650006e7bca11251b86c032080cd1acfdf9d66
 MISC metadata.xml 415 BLAKE2B 11ff7752eaaef7044c1fdb52bef9a06af78430db5a83c4f502eed9b93417bfb6ed0d93ab5ced5fd979e1dfbec35b37f76018aa6bc8c11c64fb8e31af947b175f SHA512 b0eda5e903c15a6de61d24b01a1b97b6002bd40e51291fa74c2be1b1a54b44641354863b7c83a60c02609582fea55dc38e0cf8b3ce126a26c7d437aca77cc0ec
diff --git a/dev-python/texttable/texttable-1.6.4.ebuild b/dev-python/texttable/texttable-1.6.4.ebuild
new file mode 100644
index 000000000000..31621be8f4f9
--- /dev/null
+++ b/dev-python/texttable/texttable-1.6.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Module for creating simple ASCII tables"
+HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
+SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv tests.py || die
+}
+
+pkg_postinst() {
+	optfeature "better wrapping of CJK text" dev-python/cjkwrap
+}
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
new file mode 100644
index 000000000000..b399d4d800de
--- /dev/null
+++ b/dev-python/tomli/Manifest
@@ -0,0 +1,3 @@
+DIST tomli-1.0.4.gh.tar.gz 120508 BLAKE2B bd75568315b405598578b395ec0e20b7f37e9ceee58f145cda8adaf58a3fa549cd35902650f5b2aa84b764ab32eac8a21d3ffd94c0c4c43eab3c3a0b49203a71 SHA512 e30e06ea805c94359596c3d6db82464ccafcdde0172cae12d62c889c70986159b3198cf465183854bef1b048c21e487c2b0dad2825e2477d363885e749b238ee
+EBUILD tomli-1.0.4.ebuild 553 BLAKE2B 734bb35956cf2734f19d45411f29fda96f0d8a4dee404ed6e0b72ea95ec3e878cb6104e3ea82d85f6db744b92a4e540a9649bc5eda4d8d441bdbd8cf6bfcbf0f SHA512 2e2f5ef55cde44761eb4a879004faa4c03c23820702f1e2659860f8a2429fafd1a1ffbbf274123a8dd6247fb553b18c7ddb713da63d33a1743a18f477181e7c6
+MISC metadata.xml 338 BLAKE2B 9a121aa354145d8764982615b75e0d7bbafd9fd9f62d8aec58f75b07ee4c86a2e31d56d4f9e15025eafd639fb8bc378e2e7524d8d5310aadc98d06cd374644b7 SHA512 4be4620f741c382a83c748af54f8f9744703d0eef7302bff78d3d85da6b9c2628ad0bdda54b8bd75399f9e89ecf5eb80a961029574d85aaefbdd95cbf35b6099
diff --git a/dev-python/tomli/metadata.xml b/dev-python/tomli/metadata.xml
new file mode 100644
index 000000000000..8a278aa4b565
--- /dev/null
+++ b/dev-python/tomli/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="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hukkin/tomli</remote-id>
+		<remote-id type="pypi">tomli</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tomli/tomli-1.0.4.ebuild b/dev-python/tomli/tomli-1.0.4.ebuild
new file mode 100644
index 000000000000..770d80a88e1f
--- /dev/null
+++ b/dev-python/tomli/tomli-1.0.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A lil' TOML parser"
+HOMEPAGE="
+	https://pypi.org/project/tomli/
+	https://github.com/hukkin/tomli/"
+SRC_URI="
+	https://github.com/hukkin/tomli/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 42ba36c60bd7..74775d93d184 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,3 +1,5 @@
 DIST tox-3.23.1.tar.gz 303896 BLAKE2B d59160035a6412a69f9434bfb5b2b27aa9a2ebd5344b4898b677dac15dc91ab94feca67b8edde4c0ba68c8a6a12fa885091d82a088439257e9393a99e77ade88 SHA512 ec5daf106287b265d1abec8465df8ad053ecf59876038a7cb419a57e22373809e50f8131736762dc485f559363b1878abb49d909e7b6952b2e49eea77c193281
+DIST tox-3.24.0.tar.gz 304960 BLAKE2B 5f6256d27d75651929f2d4d511f6137f20c71ab44c57e5b908c0ba92d5d7998ad5df69bd937a963bdf27625eefb222b9be2c7dffbf44684092ef345f4e33d0ba SHA512 94879cb65c1d41cfca02b23c7d540b93f5d3667ce72135969c584f09e00e3a246d80851f7cefad1e199f0a56c526e4ffa31c2938428b6632a38ad72388925dcd
 EBUILD tox-3.23.1.ebuild 2143 BLAKE2B fa09dc3153a5270f787129456d0b5e392867aefe171e6419d0653e8d695ae21594f1dbe4e035e58b4b82b5b7307b001c2642bd07c7e87e35edf0ae7745e3ca5b SHA512 7fa17af47c1f9290fbfcce71dd3907ed4d11a636699acd3c2c0fb7b346ea96525616f26c15ad18cdda158469f9c20f0214f4cf921b1a2a7a2f9b6aebd61a017d
+EBUILD tox-3.24.0.ebuild 2135 BLAKE2B f78d5fe7f3a27431a673c4175b93454d60d315c15b7ad0d7175b68827358319c5325b2de26a304f6a26a98885d69ed7db600f6388f68d7adae95c0ad4ac692fe SHA512 ebf3832e9b2b5c9814a53b134f95f8b0c6fda3b1ac3bb234577c2b22e39839c120ce978df29a9c43d2ec4313fb2d2207c23ce15aa73e885888319a7278bdb2ca
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.24.0.ebuild b/dev-python/tox/tox-3.24.0.ebuild
new file mode 100644
index 000000000000..4fb372991c77
--- /dev/null
+++ b/dev-python/tox/tox-3.24.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+
+		# broken without tox installed first
+		# TODO: why it can't import itself?
+		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest --no-network ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 915c87e7dc69..ca26fa35540c 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,14 +1,8 @@
 AUX tree-sitter-0.19.0_p20210506-unbundle.patch 674 BLAKE2B 3b7f4efb2a0064c6682b40373c5c3d53107a5f31acbb71fa45c693511eb2efe14e798d65316435ff79d0c81412345484330d31a5ab79541d688f83e3ff3a0bbc SHA512 bdc2d9341abe62ca2fd34b847f8942e9747082d800bc152e17330b04d89b6f36e92ff1868b2ea79684ded038295c8593129a4779dfdb0b12587acd8d8e891a05
-DIST py-tree-sitter-0.19.0.tar.gz 112342 BLAKE2B f64db1bb078bd7b4a9b9e9c93c5eb449b9833870914ae5489dfc9d232c6f43d1779a5e9da47457f3152faae6997062c0a989893255bc66ec4747918342610bac SHA512 c06e921aa1a2fde97612fcbde61f0baa92730d927798076b3b6476bc26a84529d8a3299f4d4092ee85af84824c5d4444bf0800fe3cf1d15c66bcb2bf49a430e8
 DIST py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz 13411 BLAKE2B fa7e7f969a9136286ef18220f5776def84404121f9b7cce35422c925e194380d4a5a3fadc3da50d2d52d85f4100abeab1456e9749f93be20af9f3dd0854d5177 SHA512 4de7084928990ae61628599a8d6440606d70589b8becef6ee58ffdc1ac632660d050cab3947727dab6161dd74ccf6b9f74e83bfe4ff30c41d01caf25fbf6b8e5
 DIST tree-sitter-0.19.5.gh.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
 DIST tree-sitter-javascript-0.19.0.tar.gz 257637 BLAKE2B dc28bcbb003d623f5930dbf575f94f51c00eb008a77ba080f05e730fae63fb24d29c02ebb62d179a59d0f9cb8a02dbd3971440f299d952b1ec29b25bc6d21e34 SHA512 ef842787742e76d2534528ec710800df91958feaa4ba351558b5315f58a4bd85c729d088d139e15e0395726a690a97c05e03846c9176af0fd482777ae57087ed
 DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38ac527b7b9676cafd8f53faaee3d10316f91decd30c02078b1bb785a474615ae58e6edba1b28bc3311e6ff094435e5f53d64cd6 SHA512 df7c72f988a62af0774df1b3a60c86397725aaeb1e2ffaa9b1295ab22eec09bffaf391cad20fb0d08a20914b22af430c2248c26cad179fd68c9f2b32419c0b60
-DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
-DIST tree_sitter-0.2.2.tar.gz 110585 BLAKE2B 2798469b65bdc2447697797f937242dcfd2fe0dbb0afa7a41fe05463ec6c93afa63b26ee4e3e65585b57a2592ac444c2522469472cb0562f313f1261c358e5b3 SHA512 b32d7e3be408eedf52b53a5ae7613b3c423eb84d175d0fb31d63c052c2c4d3a7539b53d45276629a2a02c460289e877efa519c2055cdee477e23fe50cc452892
-EBUILD tree-sitter-0.19.0.ebuild 572 BLAKE2B 435e4dcfbef4d0bb3acbbe40222b1b834f2bb5fcf4b62a727f2421015110ec65b8756d38d0d8046d5436756c8523ebdb37eba89f0258404ee45294abf7eac3b4 SHA512 41d6e08dbc381bcb68b40f1d420f11500e0c53e549e68d352840bdc2079ce28c3aad741953c29e1680251df124fd9f84b8aa38bf86b120b881ca1254369ffaaf
-EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1287 BLAKE2B 3a1f9ac9ed82bbb3e79f52f3a51e7af8d66d1b559de7fd0646e73dc142819c8a74b11a4199cfa612684a3b0d17d8b0b0cf244e0daec3bebfe67eed73d1931221 SHA512 89fa71cbfde8ce26136a74911cb40a3e9a14771cb6dbb2039e6c50eb7c9102b0292e45bdf4529d45904cd7c56caa4ea41430cb78ca47496e9a4cdbda698c84e1
+EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1279 BLAKE2B c4a0bedcd484ba1e68392ec89b156df6b3f317fff921600033e82d43038efab715552e2999851ca1ebace2a63a900a964876ad0bd00a8c1a13578b8b0dacb2fa SHA512 c11bc9c4ccea1bfb94c593dca294fd940c686f30b70fe039e7f6f043865708d688fac8b2216e29c1695b07c2014e6a559a6e8c8c94a7daa4b2fcf7214571216f
 EBUILD tree-sitter-0.19.0_p20210506.ebuild 1444 BLAKE2B db1ea486fc9c3e8c586160d2d2e4cc1fd916f93f39c1394abe68f8e4247c98ae89084fd1512b0776046218a2f24d846e4f0cd9fef9da9f97f1f4ce8af31a8751 SHA512 f85feb015a225a3087be16b9e3c0adcbd324063caecc98cc52277e42288516d3a9f739d5c544c6893c1ccfa3b9f8760f52f0e5968837bb2c19dd9a3427d29769
-EBUILD tree-sitter-0.2.1.ebuild 543 BLAKE2B 351e3b054370ca42891b610933ed42997ddcb65e92accc84a7a4b1221f51caff54e76f7efd391738a24173f8207f68da78a456f041f29659f74b295eab566039 SHA512 3c62dc7df641bf32196be756fbb08352c8daae9e8fda39a5c60a819c98d9f12bba5289d7eb132d05cfebc10b1e793f73e856aa165209f9700eebaff881fa7359
-EBUILD tree-sitter-0.2.2.ebuild 549 BLAKE2B 9fe8a70cf46d813d37a63689a4895884998933a4e28d48ec9331173df1f68a0e61f8378b22d8c0ecaa08ba6f7b940eb92c981abb2ba6cab10e37ffff716569d7 SHA512 18fb5537c3571a9e5abf9c94ae81149755b4df19d8d97e07aee0380d30f4c64ceb44781a5d305873a6aeeda3ccc089562fc507618a899dc7852da2b4210dd7ae
 MISC metadata.xml 392 BLAKE2B 5359a33b220d2104d9a0e09ff6ee637c93dbbd3601d1004c194af9cf04ad46f9639f9f91b60576812847c2eb6b8c6988ba5fb3fac73ab30d81a0533b532c4490 SHA512 6047bcd144cd23f16232e5140c817e00af555f4c7b470b3492015e28042536015d64c2e19534a9c62fd4e869cdaca0fdcfcc30abbda034bf423f7ec72e909756
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
deleted file mode 100644
index 3e348d16eed9..000000000000
--- a/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python bindings to the Tree-sitter parsing library"
-HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> py-${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
index fa217361cd3e..7b8530aae75c 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-libs/tree-sitter:="
 DEPEND=${RDEPEND}
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
deleted file mode 100644
index 4204b16be7c6..000000000000
--- a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python bindings to the Tree-sitter parsing library"
-HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.2.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.2.ebuild
deleted file mode 100644
index 9f91d8ee2512..000000000000
--- a/dev-python/tree-sitter/tree-sitter-0.2.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python bindings to the Tree-sitter parsing library"
-HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index 53b2a01a2517..37052c7a3d74 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,3 +1,3 @@
 DIST trio-0.19.0.tar.gz 486036 BLAKE2B 052cadb8d251960b20349659b92f4d26c5b65128cbbfafee21a4a4b90463e43d9c9db6b35f3659d2b062c7d0b8b8914b31b38d2faed6c9d948c0ccbe85a0a250 SHA512 5297a3f48b786eac05b686f1e8bb0603a9c0133d6c4872a307cdc8f1e37aedb57d668b61c2568c82b7d1058b6604a22d2c5c2298f13d13f0daf8e9259aa76d7c
-EBUILD trio-0.19.0.ebuild 1443 BLAKE2B 65575f22f8838ce4dbcf24543e1124f2146f42920e187e3443c96e3c830e8cba49f1e6fa93c6998f304e410b690e860a5433943655fbc859723eb1c84642dbc4 SHA512 297cbdbb35a8e8fc016de8f702d40009d6d2281ea8dc041880a57f9d561eb81d4848b7aa7c90f44ea24b8c2cc2de45fd38510096e3521001a44dc2436b84c088
+EBUILD trio-0.19.0.ebuild 1460 BLAKE2B b84e95bbbd38381127ed4d2143768cd2f526b37315973017c14eec294eb277598b78e82778b22c9ea27115ddd451bb9668c93b3ff0cef9ef2967cc2d22d8d401 SHA512 dfdc72c7d6976b4872cc2e96fbe556d02c734dd7d270d5705b31559e41cc3400b56e1bc5b95153289260517db71fd478466aed6deda2962c0218dd51c1c715c3
 MISC metadata.xml 1958 BLAKE2B 303fd88e174740b04b8a3f5f7c4b55fb6279c54d7682dd455835a7071edc66c46b31833cef66f4880e4c047c783b928af81a1e8e9fd1e4f9303cee337bef103e SHA512 e916d2dcaf9ac82be7a1163d67017640c227e707589e830072f1af17328f77d3b721bb6014b99c53dff575a6c7448767056b436f50438c9ad04f820d1b292de1
diff --git a/dev-python/trio/trio-0.19.0.ebuild b/dev-python/trio/trio-0.19.0.ebuild
index 2a8335848c48..14c8b8b5850c 100644
--- a/dev-python/trio/trio-0.19.0.ebuild
+++ b/dev-python/trio/trio-0.19.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index ff7023f0e2d2..16b6cc1655da 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,5 +1,3 @@
-DIST trustme-0.7.0.tar.gz 27853 BLAKE2B 97313cfe10260c67e29b470b9b65d4bb190b6e3be9b6944599a3c318d87b984f44abfe581420cd0ef29afc8165029c67129104cfb7ccf9d68e3c686424de34ec SHA512 3b2aa69dc617c04af3a83ca424ef19b5eaf37495ba4bc5cc55004016a9ea63c8df3585bb7fe52709b1b18a2a55e51d6a1a2b21ebc12c57ac18133b20c958b1a8
 DIST trustme-0.8.0.tar.gz 29046 BLAKE2B 5f2dd542974466dd8e61fa0ba5cd78e824afd243dd3b27ca21aec4ba4905daaa0c46db8f4edb30dcb483acf44758d7ad8de4db9c3e07a05d4d3d084565722def SHA512 93b1007319f7d625410eddf92910607c8190533f9bb02a71ecc4c424e44ecea70749f6bceb917297241e179b0d50ce1ed330c208cf3de77d4d3a619f5436af9d
-EBUILD trustme-0.7.0.ebuild 810 BLAKE2B d20715d66309ed04d5d8684d4288be5fe911d87f0c56e2a24b11028a76ec1eef6ca32cd5e8be04beb49ec4b7983153e3e9a734c64d0b2043ff8b11b79869dd52 SHA512 dd9b8da40c86ab314137db96d5dd2e42e8cf3b25084159ddf0ae4803f1b21c3ba44d2b72a8b4b1de5e303295cfcd89bead23a6b09dc491d25de82913c5dbb872
-EBUILD trustme-0.8.0.ebuild 818 BLAKE2B af89986268058a4b962b9b0f4321462723d452a6fae079c178647bc7a81387385c22bfcd972848b3e7216f9d80a6d983043547e748f8740092fe06494e723446 SHA512 0a6cc8ba403f8d90944bde1161f2dfc7746c1ffed881658836edfa7ab96b3c8dbe5a14c5633504f8ceaa6600ca1bbeacf19c37ee2f32c3d4c1385f9ef6a9501d
+EBUILD trustme-0.8.0.ebuild 810 BLAKE2B d5dce7362c72101be2512db8bcf8f28eab7da67f4fee249df7bdf799ffc55a4cc30ffa4b97abc65496bd5cf7f405f19919e2d3bac4bd254b963e708d55a213f3 SHA512 c6f5129605a6f4e8cff554014627298a0c2d17d19bb396fd949cc3add5b13e125be80dae3608480f7b1f0bf1b1ec1294daeb0baa7fd62b4815d1046367638178
 MISC metadata.xml 443 BLAKE2B 8f591132e3a9478741063502a0da9709ba07974432fd9b008c59aee122f234b11b44c29b78b7f69600d7b385701c4c909b98472a7eb3d1a6cf5908acb436727f SHA512 38a7f228253d556064d94478e0e10ccf526368cff06f7201b82911f404e5e6d83a54b2658f6f241b8a8d1d600899dda9588023cb38fda828d94c6983add0f7f2
diff --git a/dev-python/trustme/trustme-0.7.0.ebuild b/dev-python/trustme/trustme-0.7.0.ebuild
deleted file mode 100644
index cc2a08a03187..000000000000
--- a/dev-python/trustme/trustme-0.7.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="https://github.com/python-trio/trustme"
-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 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/trustme/trustme-0.8.0.ebuild b/dev-python/trustme/trustme-0.8.0.ebuild
index 92cbabb2bb37..b56cc1f32e33 100644
--- a/dev-python/trustme/trustme-0.8.0.ebuild
+++ b/dev-python/trustme/trustme-0.8.0.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 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/twython/Manifest b/dev-python/twython/Manifest
index 81015e682a04..06c1e708871f 100644
--- a/dev-python/twython/Manifest
+++ b/dev-python/twython/Manifest
@@ -1,3 +1,5 @@
 DIST twython-3.7.0.gh.tar.gz 373183 BLAKE2B a84e10c1d61736af3e93f265d92104dac15d5f7a43d7fbdce4e8c58b641f671a1c4c10f44c5b6d6ce9f0646860d35c14414b17e84daeb74f6e2c8871207b6fd4 SHA512 33eb35ea811ec1964fcd51fad54ba53d60e6caf3b5b7d11ae138f7228be9fb1eca7a02b1c6699a62cc2f6c39e035cb5a28f53ef67a98d019cdf91c9874867871
+DIST twython-3.9.1.gh.tar.gz 372933 BLAKE2B 3db7f37e284ec83546e4f93a23e34c21ce9853e6206b62353e36b738ba591acadc55fd3dbbdf8cf7d74e63ab9966b9cdc7f49c5caa06e165bb7107b350509835 SHA512 e64d623dfa7ba2e81e09f9d8e784851b44201493d128ec576c4b5a9abc88debf1ca78f8a12933e0cd0a6b495012fa951bb62ea5d92db11186b37747b8576174f
 EBUILD twython-3.7.0.ebuild 900 BLAKE2B 11d5468dfd9a83fee82fbab7edd46933235894218eaeb38285b40758c5fce52eb9b736109deae083b728082bde8667c91aef209cff9b8ef22bbfe60334cc7da3 SHA512 3561737b9e2e08c13e0c7a8355b14539de2c53069ab39533fb9f0661ce6999e4005077b45942cf73225e3917a38da503f656589d6b4aa65812e8289644d17797
+EBUILD twython-3.9.1.ebuild 1191 BLAKE2B 63f4650af8fe26f89cff21a7098bbd670b4a1894e8a9bf98b44ab936e1a6f92d39ad3e225a9106a59907e8ab052a285be2d141f08077865957d23f98645873f4 SHA512 ef1e309c82e5fb6d689309c46e75eee7a1f5b028af3408a077f482761770cdd46000872c853b9e04b4809c0d193f9a7a45ff52324a9d89213999d7fbf0925034
 MISC metadata.xml 381 BLAKE2B 8c4300189076c3f5cb8498a4aae6ce79751ccc3b51295ac6c75b8b290f71cc9f0aea946a7d7c4e75434372459aedcf7d0286c31039221c06e48b945904e35814 SHA512 6ba06a2be42b96f85609cc2a10637ff911228a8f0a5b5fa1debc3d4c6ba6d9e57462f09cdcb96e12f75544fd3a161d5e3ecb5a89e8f50fa152dc7ccc795048f6
diff --git a/dev-python/twython/twython-3.9.1.ebuild b/dev-python/twython/twython-3.9.1.ebuild
new file mode 100644
index 000000000000..88ff3fa034fa
--- /dev/null
+++ b/dev-python/twython/twython-3.9.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="An easy way to access Twitter data with Python"
+HOMEPAGE="https://github.com/ryanmcgrath/twython"
+SRC_URI="
+	https://github.com/ryanmcgrath/twython/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/responses[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests are largely unmaintained and outdated
+		tests/test_core.py::TwythonAPITestCase::test_get_lastfunction_header_should_return_header
+		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_400_for_missing_auth_data
+		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_400_that_is_not_auth_related
+		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_401
+		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_rate_limit
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/uncertainties/Manifest b/dev-python/uncertainties/Manifest
index 5f4c29cb3ba3..5bb3aa6ca52a 100644
--- a/dev-python/uncertainties/Manifest
+++ b/dev-python/uncertainties/Manifest
@@ -1,3 +1,5 @@
 DIST uncertainties-3.1.4.tar.gz 148897 BLAKE2B 3e94b61ff6aac42a7910cafebee5b440541a020c58bc2ce402d0a056b5d278205f4a6556bf49073f5ded305cfa73ba7e9095e71d3963fd9b73e2e9e19ec360b5 SHA512 209ebbed1f9cf99e3263f6470b04fc737c6d34d878f7eb1d2a7df7e63d4d42b0460391a08f99d8fe09df8f7f0e1de8a8e6c2cbecaedc7f0373ab06d05fbeb955
+DIST uncertainties-3.1.6.tar.gz 158419 BLAKE2B 09582936a9b982efeee6cf3c99de568ebc820940ca2bfa1e4fd10edbcbd9447e7711158f8b98567a506d6c5a9ecf63b6e21d296c7f8d8dcbbaf4c2fb6a571355 SHA512 8835ed851d00bbe830770e57bc89ce57acf291e6cef2fca59897adb75e1e2de456da3631f73242ade20f567358b1d727b2b7f5df02e2f3e0cd8d861e81a6a211
 EBUILD uncertainties-3.1.4-r1.ebuild 794 BLAKE2B 3b880adc7f3f46c37a4b22253978397d653c609fb01cb38dc1405ac61ccfd476e2954e0cc0e0d699feae47145fbb105e7b26b3fcaf06184621d76d170aedb8b7 SHA512 e67922cf772593baf0b094ef05f46b4858f929f35b2443f0165a392a1a24990f7f7b8f4ae56d3ecab8928aa94285f671333c8048117783be3d3e846f09feaa4b
+EBUILD uncertainties-3.1.6.ebuild 793 BLAKE2B 12202195860e0a3ebf7d4f8743e27738b0f14efadbfb9f5ef4a1b1b430933aeaeac76c2cabaf00b6ca3a470c0d40eea30eb5873f61ec98062704e6a8b9ae9289 SHA512 e712ab8d227501f2014c146a26b5561da08e2e9421646dd7fd258804e60ceb69076081d642fac56ca4928e350e307912373146e1738b253e070d86394938af3f
 MISC metadata.xml 859 BLAKE2B 54ae46c343fada9aabb973c5297eccb0abe7299a2a1f0009df1d083698c91ce25339cf63d77857febee0798b27a84ba83dde95e19255f45f8cb0141c6a009954 SHA512 833af2fd16f097d61942c7f9323d8e38688eead6d5d10ae8e7f2547c950cd53ab6ce28f434d2c1bb2f15b71ec55bfc30b8bd53a94a0c5f02e824e3ecb08ecc89
diff --git a/dev-python/uncertainties/uncertainties-3.1.6.ebuild b/dev-python/uncertainties/uncertainties-3.1.6.ebuild
new file mode 100644
index 000000000000..96b4e0d8f983
--- /dev/null
+++ b/dev-python/uncertainties/uncertainties-3.1.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python module for calculations with uncertainties"
+HOMEPAGE="https://pythonhosted.org/uncertainties/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests nose
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 6fb55b85b2fc..cef081279a40 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,8 +1,5 @@
-AUX urllib3-1.26.4-test-ssltransport.patch 1267 BLAKE2B e82ae435cfa8a2821f3f61d91a2e4f9011c5f68d37fddd1a40ae4658566db45717379c48d11299eb260c2f8816f416ac69b0379b3c7f925075ee9c1051aab1bd SHA512 bf5d2bb2b48444724ee1cfb87f4a84b3a63cd6ca598ba4d92a44bde71c66a35b815905de51fe027abb2eea63ae353dc0df2338ddd4f819f678f8a39b5c6d685b
-DIST urllib3-1.26.4.tar.gz 293008 BLAKE2B 6ca88861baa87814d3856cd0f1fa0a6cb9e11ee745c782b598c4f5fe74b195ba47e8430b993ed8a5fb269153d700e4a803cd2ebc177e20e3186b3b26612262c7 SHA512 daf2ba432f2e4edaa6aa8c6bdaaea21fcb77cc5fdfd991f89b1f753b4f9901faab04120841e9fa8d93e2bd3d72cbdb647f1492d882266b4e0281c725e8d55a7a
 DIST urllib3-1.26.5.tar.gz 292865 BLAKE2B 0b22a485635f70f198c022c13d03af2b1a9b6907276e3bc3acaa2242e1c632447762f86e9588e735462e6479ff93a172f458691ea9bf28ceaebd5e1cfbc55501 SHA512 4a1899b223b00894d49f6dff5fc95d410e5b0ab28c11f7e3cd82d03e50438b0c5b0adf693a33fd80f1586312dc0012836713998674da15531bf82d52645881f6
 DIST urllib3-1.26.6.tar.gz 289927 BLAKE2B 197b0df759b27fc4906c565426e9c7b533fad56f10695ab5ae6c6c4d05d5c889dba906be526d8b8f41405f29696046b7db6e2cbb2fa16843af80e072138cc35f SHA512 19eb4b88b7a575db717db420ff79b304769d9a6d2b576a236d69719101c4d52d6b0079bd049c885e630f0dfd60471f8bb33836847e0569652cddece910ec2979
-EBUILD urllib3-1.26.4.ebuild 4265 BLAKE2B 17f981911cc9adf17b7fa989833a47554127d9bdc7c1f49605c0c949c0c82ca24e48e5e1bea38f8f549c5eb00e047cfddf03a967a0ea7bf1e83afa9901044f7f SHA512 f9d2190c141b4c4daa2d9e3d4fe577acb3d0787c8591ca46bce3ccf5e22872349fa459e63cd5cb96710f25a5910a2ce600d0003b7e72e5f9c4e0797c459d07f2
 EBUILD urllib3-1.26.5.ebuild 1962 BLAKE2B 619160dfebe98b7497545a2044c4af5522b54d3b53a956c86041bb50588562784feb41c32faaded7feb7769e364029a695decd7a22ecc5c5673a4bba5ece4aa6 SHA512 a54a2e38a40e134c8cf8fab84b99f5a810ae89452a0204ef12ee695b3aa3d616887b6ec3d908447c2f807a258050bd55ecd4a05687f38a7811f82486cf9b454e
 EBUILD urllib3-1.26.6.ebuild 1970 BLAKE2B e3dee58d1f4b280c2c2c8a84afcb9356450f045267ec321467933ffac73a9de5050473524d971cd65724b8de1b3e22ea824fc0cfd933a3083bd46b0b6bbb6dc0 SHA512 4d14b178b5d4df05883498a6cb0b38d1630ba11e20b3d93ccb57a27bf99e0d510389f1344155177501472f4ec4f39d8bf5c4ef4fcb6141a3d0d0e2eed5a86219
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/files/urllib3-1.26.4-test-ssltransport.patch b/dev-python/urllib3/files/urllib3-1.26.4-test-ssltransport.patch
deleted file mode 100644
index 346574fec91f..000000000000
--- a/dev-python/urllib3/files/urllib3-1.26.4-test-ssltransport.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/test/test_ssltransport.py b/test/test_ssltransport.py
-index 72b06b006..98682bd43 100644
---- a/test/test_ssltransport.py
-+++ b/test/test_ssltransport.py
-@@ -246,6 +246,7 @@ def proxy_handler(listener):
-                 )
-                 self._read_write_loop(client_sock, upstream_sock)
-                 upstream_sock.close()
-+                client_sock.close()
- 
-         self._start_server(proxy_handler)
- 
-@@ -274,6 +275,10 @@ def _read_write_loop(self, client_sock, server_sock, chunks=65536):
-                 if write_socket in writable:
-                     try:
-                         b = read_socket.recv(chunks)
-+                        if len(b) == 0:
-+                            # One of the sockets has EOFed, we return to close
-+                            # both.
-+                            return
-                         write_socket.send(b)
-                     except ssl.SSLEOFError:
-                         # It's possible, depending on shutdown order, that we'll
-@@ -322,6 +327,7 @@ def socket_handler(listener):
-                 request = consume_socket(ssock)
-                 validate_request(request)
-                 ssock.send(sample_response())
-+            sock.close()
- 
-         cls._start_server(socket_handler)
- 
diff --git a/dev-python/urllib3/urllib3-1.26.4.ebuild b/dev-python/urllib3/urllib3-1.26.4.ebuild
deleted file mode 100644
index e0026885ab4d..000000000000
--- a/dev-python/urllib3/urllib3-1.26.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-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 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-test-ssltransport.patch"
-)
-
-python_prepare_all() {
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	[[ ${EPYTHON} == python3* ]] || continue
-	# tests skipped for now
-	[[ ${EPYTHON} == python3.10 ]] && continue
-
-	local deselect=(
-		# TODO?
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-	)
-	[[ "${EPYTHON}" == python3.10 ]] && deselect+=(
-		# Fail because they rely on warnings and there are new deprecation warnings in 3.10
-		test/with_dummyserver/test_https.py::TestHTTPS::test_verified
-		test/with_dummyserver/test_https.py::TestHTTPS::test_verified_with_context
-		test/with_dummyserver/test_https.py::TestHTTPS::test_context_combines_with_ca_certs
-		test/with_dummyserver/test_https.py::TestHTTPS::test_ca_dir_verified
-		test/with_dummyserver/test_https.py::TestHTTPS::test_ssl_correct_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS::test_ssl_wrong_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_verified
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_verified_with_context
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_context_combines_with_ca_certs
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_ca_dir_verified
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_ssl_correct_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_ssl_wrong_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_default_tls_version_deprecations
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_no_tls_version_deprecation_with_ssl_version
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_no_tls_version_deprecation_with_ssl_context
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_verified
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_verified_with_context
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_context_combines_with_ca_certs
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_ca_dir_verified
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_ssl_correct_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_ssl_wrong_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_default_tls_version_deprecations
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_no_tls_version_deprecation_with_ssl_version
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_no_tls_version_deprecation_with_ssl_context
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index dd46542d3fda..ae1c33d9215b 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -3,5 +3,5 @@ DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977b
 DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 EBUILD uvicorn-0.13.4.ebuild 1297 BLAKE2B e2e429e266084c92acf6965e86220494101135001bf656ce9ed1ee08b8ea07b61a8cb844bd416ddfa77ae9c8dd0d3618a8438b3dd1b08d12857efce9e6fbcbbc SHA512 3fd28de46cea2f2b8a2a7aa688155127d1a6d8e7f79137443606019e05825a1f4ab1c1ecd1dd8f4a04c8dc8e6851b59136fdcc68d5d4344be98fe70f97714dc0
 EBUILD uvicorn-0.14.0-r1.ebuild 1281 BLAKE2B 822eb226ea59ca2daf2ed0fa81f97c30a1dc678d07684ee10bfe604cbd30d2bb0cd70c5b4bbb64c180bba9f605570546bfa81f457b40371edf672eb10f4689ca SHA512 c7e2629d574374a45973ec87a8e19d2157c449b727948116aee9e35d288bb5eb4c65fce223ac72693fe6dd84f7f505b8114504984ea89a3ea25f5e29495294b8
-EBUILD uvicorn-0.14.0.ebuild 1433 BLAKE2B 4d49fb57499a1e194296a500aca200571e19a4d25e08c239cd34a885e231f5131465e81077075ecaefb0a1291a6f9fb5671560dcf12c96c492360e04ef699907 SHA512 5150ae53a21b71bed057d77b26d0f57c39965dde04768d356569a705898f7cdd5f426d17c5dc5e2cbc546f442d4d66247977f679520539c39bb6117f6b0b414c
+EBUILD uvicorn-0.14.0.ebuild 1431 BLAKE2B 612bf782686c9814f0a497ca129148c91c4eab5c5078c57d330036e6d99c07bf7a0e442a7f7d722fc4db941a808551c525464e7282ab0cbbac454ecb30e706bf SHA512 5ab7ae041de478d207f5d9423f4da448d7f8c9465e25303823de9b27541d34ef8eb1255dd65640bd7e58f1a1ba02c97e1aabb118fe433e86df4622bc4a11bdab
 MISC metadata.xml 450 BLAKE2B e6413874e7247880323b72113f002ade2edff362d7464ebbd5890ec95946b97bc37d74c2d6e9ff7a6a416a45f32bbab1b6eca70db8964adc6be287793c0fb4b4 SHA512 a1138016ec2d87c77f82333a0d41a68113d87c74d50e1bd6ccef0e0300f53663ecb907959be2547b42cc5cd007f47626e98b8c8cdc7e3557d2dfd0a369447268
diff --git a/dev-python/uvicorn/uvicorn-0.14.0.ebuild b/dev-python/uvicorn/uvicorn-0.14.0.ebuild
index 3b12bff47fdf..a58ea4472de1 100644
--- a/dev-python/uvicorn/uvicorn-0.14.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.14.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index c88d05b32dec..120163e651eb 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,3 +1,5 @@
 DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
+DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
 EBUILD uvloop-0.15.2.ebuild 1179 BLAKE2B 90824270e60d1444e154fa694831fe6c9a6deefa790babfa7afc8deef627295545da7d966998165db1ebff37ed7ad466fbede4ecb13fce22586858ce3b75d335 SHA512 1df3a69ed7cf55669219004c1ed4c620788cee5a9f009e906575aadea9babdfdf61c549b1c850977ac4cb97e4c533d1644de6151d571bbf801b99f6075ad32e3
+EBUILD uvloop-0.15.3.ebuild 1181 BLAKE2B a39d893114caee875a7f414758c55c6dec6bb4fd55409b1a207f9ecdddc1e1f07a264458c198ad77b7d72f1c16054689065798836c90decb2f20fdcbd4718df7 SHA512 39909e1d61d8eaad914fb1d02b11fc3711d499ba7e276edaa55d065368550e71d8e2a3b70e63ece07f92f1ad0e09a2c4eed50ac6868ea1298255381eaff7e87a
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/uvloop-0.15.3.ebuild b/dev-python/uvloop/uvloop-0.15.3.ebuild
new file mode 100644
index 000000000000..35aac31b4a0f
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.15.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/libuv-1.11.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	cat <<EOF >> setup.cfg || die
+[build_ext]
+use-system-libuv=1
+EOF
+
+	# flake8 only
+	rm tests/test_sourcecode.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_ext --inplace build_sphinx
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 50e1c26ab9fd..87525cf56bed 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -3,6 +3,6 @@ AUX vdirsyncer-0.18.0-no-cov.patch 533 BLAKE2B 08f6d9dd09aeeb057bfa17fcd8a590cce
 DIST vdirsyncer-0.16.8.tar.gz 115819 BLAKE2B e0140718a1b41875421a7094e02cdeb865c500935e0c97bc18a614551586d79682641726df1a96e17a158604ed309f713f4caf4a484025eca5fbc6acbbe18f97 SHA512 12cb50f592085af37bd9c4207c0d31fdd38fc2a44712eb6288b12e7e7ee9af82070d1d405fa9579e935e545e6c92aafb6f8334ebde4976c4eb9412e78e7c5ada
 DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
 EBUILD vdirsyncer-0.16.8-r1.ebuild 1665 BLAKE2B 174aa65ac2b9177810b81bb22c7411e93599f91f2c624aa12fa2279e645280c800bc1b847dc7c096a67cfd4fb118788195905fa8a39c6588fe5803c553ad92ad SHA512 b3f8a0a58a3020f3870709c12f3125f87f2812c0883944204b065f1137a97f7ded95bfa9a33f887588404ab8e71f2bd7c0ce305a85590df978cd8b5722227cfa
-EBUILD vdirsyncer-0.18.0-r1.ebuild 1660 BLAKE2B 990d86787709a64738122a42fd9485c01ca249ad412b3acc6121ff4c4e911e7ed6464c15945ad881e3944e9c64b743d49daff55bad5edcd1f5556b8d0b14c137 SHA512 0c72e65ad73e60797519fdf5315835f1083f934a1bf7ecfd000a7d2d0a7caceefb0657edb96215cfe5b9e2b3167c9f8237a0c9fe07f7151478cdbf54f0c3b222
+EBUILD vdirsyncer-0.18.0-r2.ebuild 1664 BLAKE2B 8fe1cc11994e6041efc716a7a09a0964496a1e0dc6ced3063196243f893bfbbbe2f3a4b903d26c582c55f9b637b00eda7c4396917c26d99b1c56b578a7a719e7 SHA512 10388b153f0415962b204ac238c01f89b6bba06c30aece50cb93ab48144548c099a6660ae0020a16759fbf7f6dd928fc4e5c593013959c28a17233af04d5a5eb
 EBUILD vdirsyncer-0.18.0.ebuild 1502 BLAKE2B 4934fee920fc9aa7c9f54fc2afb7c96654009e2baae8a05629d45b44955e86ea57892ceced4109b4bf1ab1c29aba03785f5eb530e4522f13d47f7599ef6650dd SHA512 74781a7582a99b4731a15143cdd15b90c70b4aef609984561705e9558c4824e39846727103a5345966decbfa6a4b7f42a8cb89a6c529e26c38b5b592509ea985
 MISC metadata.xml 474 BLAKE2B 8ca29c2fdad6e97ba0c97240aff16ea6d2a2916344f78717521e28b20ebee3c35321d56333a736339278e9352a2cba182254078eb4ec148e858f1f7fa8638d5e SHA512 d8cd3952f9b86a7fdf7f38462a784fae8e59058157ca6c86929c05d8e06337af3af3980812557cf10bb6308a4a971356fdcbcee551be22f3cb5bbd154ee8c80b
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r1.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r1.ebuild
deleted file mode 100644
index 21d72fd5f54a..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/pimutils/vdirsyncer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-threading-0.5[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.18.0-no-cov.patch"
-)
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-distutils_enable_tests pytest
-
-python_test() {
-	# skip tests needing servers running
-	local -x DAV_SERVER=skip
-	local -x REMOTESTORAGE_SERVER=skip
-	# pytest dies hard if the envvars do not have any value...
-	local -x CI=false
-	local -x DETERMINISTIC_TESTS=false
-
-	local deselect=(
-		# test CA is too weak for modern python
-		tests/system/utils/test_main.py::test_request_ssl
-		tests/system/utils/test_main.py::test_request_ssl_fingerprints
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	systemd_dounit contrib/vdirsyncer.{service,timer}
-}
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r2.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r2.ebuild
new file mode 100644
index 000000000000..a701eaebffc2
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Synchronize calendars and contacts"
+HOMEPAGE="https://github.com/pimutils/vdirsyncer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/click-threading-0.5[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/atomicwrites[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.18.0-no-cov.patch"
+)
+
+DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
+
+distutils_enable_tests pytest
+
+python_test() {
+	# skip tests needing servers running
+	local -x DAV_SERVER=skip
+	local -x REMOTESTORAGE_SERVER=skip
+	# pytest dies hard if the envvars do not have any value...
+	local -x CI=false
+	local -x DETERMINISTIC_TESTS=false
+
+	local deselect=(
+		# test CA is too weak for modern python
+		tests/system/utils/test_main.py::test_request_ssl
+		tests/system/utils/test_main.py::test_request_ssl_fingerprints
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	systemd_douserunit contrib/vdirsyncer.{service,timer}
+}
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 53837ca26474..e2b7c6a72263 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,3 +1,5 @@
 DIST versioneer-0.19.tar.gz 47005 BLAKE2B cd4ce82bdb17cd10b628cf6013d1be171cc21115d9a065b845227fd6e5d1e988f8ab6fb001e2eeb6c1bfeda8a4afc8420937b0ec7437554d87e207713ccef381 SHA512 919c2e52e32b2fa1661ab2e10e3a698eb3f7c5102e66175d465d1a29237b86efa1520435ca581e321802cffeaa0ccd21fb66ba66946d72a05d13743c87a3e333
+DIST versioneer-0.20.tar.gz 50634 BLAKE2B 4a64f311b5b7028f15a20c8111f462399bf49340b6ac42272af20427fe5ce722c9d589c04dcb66fe66782ad3ce3491f5fd4807ca06b3caa2342fe3750bedc1be SHA512 7751af838639f06f1f87224b3f87e5d466cf11f32e4da35646a1ea84ba8d21901d47137fab6bde2632f5aaecc2f90f9bbf5968d3fcd3b074e5145762bdde1ae7
 EBUILD versioneer-0.19.ebuild 867 BLAKE2B 604a83efa3527d3b3981f247401d775d6f48bc2d2a79963429b7df09db63546446abe5f8fb20a5cb934eceb5a12708a5bc3bf8965f891c80725f4f5a56b5d28b SHA512 47556240dff382f65a669d74f8bb12299821c9510db2273bf3bbb8b2b93957a2e6d6698be2a0d6cb33ee1ad0da66edf6a9b1af42c8400df5323d21084daf2dfe
+EBUILD versioneer-0.20.ebuild 870 BLAKE2B bcc4a2cbf24a280f0f6b67fb33b972efddf75eeb21a6eb08a921c3c33aa0a93e04242fc3c8967f15649c82f14ff8a347c3a11b87fdc865479de4b4133da2e3c2 SHA512 9a9c17d977aa87fa43b467f5f28d546bd1011d1f7fa17c6e7f13c9ad7eb961cfacb9a96b36f35acc9b41a732b3eaae435accbb09b463fe0c8b733b1bfdab3f5b
 MISC metadata.xml 425 BLAKE2B 70d2a29bcd352f61add9b6ec9f302712d3f14556c3827c55273b4b2525c7f1b36c4ae2b2e4056aff955e864128d9e106b1c0a0424129818082047af19d8bb03d SHA512 4e2f07cd10a1dceebd43c8bdfda3c546a924b5283bd31417cecfe5b5af6b5868915f9e3343694a503c51bbe71fc9644c39f9335471b0ec98fcf780caa20f49c3
diff --git a/dev-python/versioneer/versioneer-0.20.ebuild b/dev-python/versioneer/versioneer-0.20.ebuild
new file mode 100644
index 000000000000..299d280fc6b3
--- /dev/null
+++ b/dev-python/versioneer/versioneer-0.20.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Easy VCS-based management of project version strings"
+HOMEPAGE="
+	https://pypi.org/project/versioneer/
+	https://github.com/python-versioneer/python-versioneer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+python_test() {
+	esetup.py make_versioneer
+
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	"${EPYTHON}" test/git/test_git.py -v || die
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index c1b47ca7529f..a00fd3e1f965 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,5 @@
 DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
+DIST virtualenv-20.6.0.tar.gz 8700762 BLAKE2B 718bbfda175ab4ef0820ba66b480060c0371c54a3e6c622c816d8c30141951c85b4f461fa03f71912a767b8d6a40733ab253062466e38a4a2e18b3169812e6a1 SHA512 7eff570f407a4986336d5a34bdcab1621d953aa6900d41962a85a5a44d7b68d378cda4a1bc1ddbfbc468580e051a98c37be17b0a52babbb00166718a987a591c
 EBUILD virtualenv-20.4.7.ebuild 4256 BLAKE2B 8fbe67f90a9b7079b5eb6b6e9c6c28fcc887fdcfa1bf31ba9fa02c62166ee8f7e42d1a98336110d452907133a0d75892b7d28c202a8075f88b32ac354dd57ca3 SHA512 db31bfb20d836ad986acff3b6ff5d16ef00a78379b02cf7d6be853aaaa08cbcbfcd7de106d47d398e9b8125644fc9daa164bfa6cb09a302e1f3135b709f38bb3
+EBUILD virtualenv-20.6.0.ebuild 4257 BLAKE2B fafac98f404cf0eac5065f36b0d96c6e6475483f1170ece02e8577ea80b8b9c53f25e493abe01fb9db99ab0646036ccccf669c8501b25db51c208564a7e0a372 SHA512 e3f1f2f6142b8b8b8fc6831776bb68039802ba16e702c1da4f0dee5c3cf33795cbf665dddce466e327ee18ff4478db1f46607f533e9731390c8377d0e583772a
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.6.0.ebuild b/dev-python/virtualenv/virtualenv-20.6.0.ebuild
new file mode 100644
index 000000000000..15279072aa1f
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.6.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' python3_7 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 2be750e5eba1..66fcb7dd133a 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,5 +1,5 @@
 DIST wcmatch-8.1.2.tar.gz 112726 BLAKE2B 4d91425f30e81f1ff3449b364b74f242b7393b7a4a162538e57406f9d5cc05d24277d6c0119c40266d4474c9c99919ade8d0450b1999abb39077ffc64f495719 SHA512 f96fc646db334407229ee9885b308eb2b27967d9b4e4245df33641605af678f3edfb54f53c5c8722b946029d39779fcd775299963530036c723cfa860dcfff38
 DIST wcmatch-8.2.tar.gz 113537 BLAKE2B d1fe53f7d2394af31750c0b98451749201b1adbd8d00a734418afd8e208a9480b913059f78f62016be2fc2109813406c096f8ab60973a716b6ca275377551281 SHA512 d56d868ec0578ae59eb5f39ff17005faed13162141e3ced15c60d8de5f8e8b1a16eaf66e7c73cffdbd288b94db57843112624de8e5b588d26a5e46d4edb72168
 EBUILD wcmatch-8.1.2.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
-EBUILD wcmatch-8.2.ebuild 1293 BLAKE2B b16a00ed341661f5623d87b8934e1bf3c6cd3c5bedb1b6c26bb8f4c6b657bc54197762700a8226d99c589c36672f12963d51e1b220dce97b501de3d461b0e8d7 SHA512 9ca84e9a8969094e7a51e90675645f9e14ad80482cbf13374eb06df97dc8282a42ab5d543ad787304c4637c1c188fc32d6a104448cabebadd9c91593bfaf7942
+EBUILD wcmatch-8.2.ebuild 1291 BLAKE2B 409128876860780c14ceadc564c6fc91c47f0663e7541b16b98efa7f963a4cfbea875ee0a77492cc931c00dc6a55d67d634c384d5fa98fc2e56a9fb15c454751 SHA512 c3f5e658f2b3ea4ff157065b5b93838b0f07b336bb88df2917bc99600a1fa783a2e61a4e1956a2eea3f9560a5dda43feaee0b587306692d9764decbf27bc329d
 MISC metadata.xml 3086 BLAKE2B 70a8843ac7d26d1ff596516cba4307a7e15ebf474997ee65edb44ba4d626b58ac75ba52158f90c471cb2b59bccb89eef22afedc0d6e18b8d6fef1faf1c361a36 SHA512 074dd8d50af976cb98853b05716adedb4abb848cce120f07967c17e7eeafadd3bc25f6cd1b71421aab80ee6652b72935677548b33ca2ffec7c18c79abd3a3ac2
diff --git a/dev-python/wcmatch/wcmatch-8.2.ebuild b/dev-python/wcmatch/wcmatch-8.2.ebuild
index 780c9e32404b..445b9af017e2 100644
--- a/dev-python/wcmatch/wcmatch-8.2.ebuild
+++ b/dev-python/wcmatch/wcmatch-8.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 5e6aa7667aa4..a480479f1b94 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1,3 @@
-DIST websocket-client-1.0.1.tar.gz 58561 BLAKE2B 852693b08cec5d8345ee0cd38d87a93abfd5ac52a72a0715705ae4a7d5f810288d9409e920424a317867e7292568a9a67b4fde8b892e9ff3fa011cf31c016f35 SHA512 349ecf0f80859e146e6039a29b50f8bb9a377ad65655c49b354702a7895ebed4f8849d979f04b1632c7926e3dfb707ae5791a75b3e9c66d35ad1445040d651b3
 DIST websocket-client-1.1.0.tar.gz 58890 BLAKE2B b7557f0847ee4ec31279d98661f2370f32eff35de5ea6207abe4afa6ef7314258da275d823487773722ac717888ca629284ef92870b5880fb385f7fb677506d6 SHA512 6f4b963455bdb6a0e0defff92a6b898ee4bdf605c18fef7e25e18e2c72a2ae360d760c2069a0ed330e5dc0f3347f16a9129c405d5c98cd2d56014f8636e7d5b5
-EBUILD websocket-client-1.0.1.ebuild 761 BLAKE2B 3c42e21cf50d7bf6edaf5e5799b98f86c4f5be718eaba47b7343439dee6c8e3b1e0b112c1d696dc9f6e4d5f7ebf37b8726019fd93d2cfd22986a4645b2edd5b3 SHA512 d9a9009813c17e358f4ba56182358c9a5af790a60d6e55f069d09560cc8b012284e807d2e3d6be7f156ca3887a5cf0892802ab0529ae13d1f7e2539820eba453
-EBUILD websocket-client-1.1.0.ebuild 764 BLAKE2B 47c0a056ee6c554fdff113986e69f5129964674bfa898a2bfd4204a7eee0fdffa1ece38151770c8b41978fb9c6eafe7ad526c2030692f08d5cca72d293e70a84 SHA512 9aa15924970489bdaee10bb79e84f17607fe5a91fb11b872925c82d6daa5af44ad8fc1b8a31c6067e14284a5f7af8cbe903fbcf692dd567ced48f521983599fb
+EBUILD websocket-client-1.1.0.ebuild 761 BLAKE2B 09a7a7ec1110f0d9b5c43504139c555f2777d2f3a12071daf6900ea9210d18d620506b7795f2e11ae353e32b0453557cb8bf901d2aef36027c000958c9b85495 SHA512 1607c7cac20dc8e8b8b6be41bf74d74acaf607c51ddef355b85e5565c5094355d69ecec545207ad248387a75b756de933fc2b0cff4b9df687c9e33a2fb233268
 MISC metadata.xml 497 BLAKE2B 1a68fcd42a257afae80db03043a732a321079f146c252a89d1c5399bc5800a5475fd36f31cef381544c9592e39a86c14eb5334ab1800a5191b0f7ec9e0806f19 SHA512 ce4184c2e87f87cd787cacf1c7b566df2fbf7dda97a6b6639e02c003ede6ac5b90494eb9b3b509c303a56fc4e829acc05ec9d3d01846e85b233a561d1cdbd5b4
diff --git a/dev-python/websocket-client/websocket-client-1.0.1.ebuild b/dev-python/websocket-client/websocket-client-1.0.1.ebuild
deleted file mode 100644
index 8dd24d35ef7a..000000000000
--- a/dev-python/websocket-client/websocket-client-1.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/websocket-client/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-IUSE="examples"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# Internet
-	sed -i -e 's:testConnect:_&:' websocket/tests/test_http.py || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.1.0.ebuild b/dev-python/websocket-client/websocket-client-1.1.0.ebuild
index 0f8d234c04a9..4465217884ac 100644
--- a/dev-python/websocket-client/websocket-client-1.1.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 4bbd2b246277..7d8f5061f653 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,3 @@
 DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
-EBUILD websockets-9.1.ebuild 482 BLAKE2B c8fadba95a9982b02f659ba823ca51677db596941d128cf4195ba33bd8b4bc7d49d9ad3730a673d428598dfdf60a4bc3d6d1e633d0e08058c607aaefeffba727 SHA512 f84fbb3a6de96aa941cd6f31037055ab455a2c869cda5808cd8c4ec016b1c0b087419a594e64f142551cabf2d14b890405f3b875c7d9d2ce3fa4c73c48d119d3
+EBUILD websockets-9.1.ebuild 481 BLAKE2B 0f681992c42ef67af0039703686dadc7e1841f4cdbbc6dabebd303b2fad9bde9c44749bde580707c6749050d6e370fef4dd814a2d090a5c77e56c868735b7e7a SHA512 2a886bb574e9ab7e9105bd69942fe57fa5f798bc2a4ff976f2774e754b3c8b52f2f861074bf431651922f225059b86283111b64b3d56f5acb63bb85ef3012a8f
 MISC metadata.xml 487 BLAKE2B 7d67f4b4e650d1cc83e80eb7ad5020ef997f92997d94f19274b7e0c794f9efdb3d085faa8582321f0732cf489a5358310368a2e22b8e471d815bc9b09a16f47e SHA512 6b88582ba918dd95faa5b7e3d4aeb59f7ff455a509c018c61f61a1d2e9f69734c9d02c9d666447ea787f771fd13b44f7a54b0e6147703187a7a9fe9fccf186e2
diff --git a/dev-python/websockets/websockets-9.1.ebuild b/dev-python/websockets/websockets-9.1.ebuild
index e4f500fb7ce9..a41e8123dd58 100644
--- a/dev-python/websockets/websockets-9.1.ebuild
+++ b/dev-python/websockets/websockets-9.1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index dccefa42bdae..c1ec50d5f5dd 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,5 @@
 DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
 DIST wsproto-1.0.0.tar.gz 53423 BLAKE2B b4cc8c1ef0ccf324821b893b57fc86ab744c639dd07604618485004ef56ca105b5515e1f34a08ccc93de941b1a93eb76ef0d1946f11e05f80d40b98bfe7e4c56 SHA512 36f8c4eebf84bfe869f7124330898d22416b423f47396f2e3f72069e14f1763514e1df700c3e8ee81467cf973197e10143e088978d0688930fa98518af8773fb
 EBUILD wsproto-0.15.0.ebuild 507 BLAKE2B a010d403ef7e818dc7577d45898ed3ccba0879182f935c1cab9f55549ad9721413c7828f769562bb0f52dbe5c74a6822980b3b5d329acf5e9859f8046f75d6f3 SHA512 5b57c2fe1a79e68e245e58415071cc73cad18a8124b72d58af71307d3633d7aa1fc90f7f0e0eb6076fc97307ee2b5e4f5e0c3a1b36d5b0a7d56fe5f5d8c871d9
-EBUILD wsproto-1.0.0.ebuild 537 BLAKE2B 8ebeaae8c56824ddcccc4462681fefc9b70861e4211e4a4a4ec16b9b07cb80179392f65830e372b244606849ea07fce2d20d1ace5eb0732453d8b3d14ea0dcd1 SHA512 e64585bc49eaab38b2e772792eb09cf68c454ca27225b565dadab407458598bdf65e5c1f0e4aa3509e0d8c36a27a1de8f7a1d0717e4c0b2eeb63c1eb143e2fcb
+EBUILD wsproto-1.0.0.ebuild 535 BLAKE2B f7eaf6a387aff4e1fb7b7d2356f4d884c095f6f62387b10d61b918b4fb3a84baeb74833a2e91e18446b8850c36cca220e103b9a265c9b97f5d6f1e7b01d27cdb SHA512 85b7ac12cd58fef469490bb6cdeb32cd27e1d4808a0c7a78429788ebf93049c5a67f33be0b005465e80028fde3c177a95059316b482269cc62f7bfb1d47674b2
 MISC metadata.xml 493 BLAKE2B 82485e0fa56d1f0e3e1bd3d6f54c929cacd58055d0993520134ed7bb74bfc34a990e65303b33ad2ec74c625f8c4d14f9f4e65a1c14e063995ce20a7bc6ae82b6 SHA512 83ef31eda65a98f50ee0e800cbb358b49f579ed893cd5cdcfb38a0da79b62a1359453127140dfce971b9dcbfc7da9efa83fc1426cfe40167f0ee987d0b9f9c56
diff --git a/dev-python/wsproto/wsproto-1.0.0.ebuild b/dev-python/wsproto/wsproto-1.0.0.ebuild
index 67d781f6a895..d900b8df44b7 100644
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
 
 RDEPEND=">=dev-python/h11-0.9[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 2aac06fd903e..de27c8a5feeb 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,5 +1,3 @@
-DIST xapp-2.0.2.tar.gz 19946 BLAKE2B fde2f4f30fa1dbb5d4778d82bcfb347a5b8f89635df6c298d0dc509a194c528b653a1cbe4537c878bde4a8b987852ca51e37a70b6c35f96c9882c5b1b277dd36 SHA512 2b5d2a259e55384426940e6284ec9f964f4f0220b8cb364606c938ef6e1717d40ddbc3730732dddc86d460f624ac6161fe5ab55c276aedba9187a79d9d53a60e
 DIST xapp-2.2.1.tar.gz 20739 BLAKE2B 11f3b8964aedc726235d1c9350b159ed5cc0e859f33d6390d06e8df225eb86d0d6a392d16023a460ae0dad69f4a65b3cc8c3a759e8a4e5abab491a6d71ea8ab9 SHA512 2c03a6201404d7c792e12b10241309c912ca6b1daaa56aa0867ddbb16af053f110e4cb05da969b1800678d60acc0e6d19fc097581e6b195fff9f68acb48505ff
-EBUILD xapp-2.0.2.ebuild 561 BLAKE2B 1f414320c5c90b1327885ff87a7595981531624c770ff49a992be274a466c170ea6ae6c1c99cd71904bf3507e535bb74a47592a7d1c04c17055ac90025783125 SHA512 3a13b8c5a56f9c0099b13b0a5b6e3172e5c8b08e253ac5adfee0522e3a405648af543e18a925051052b438d2eb96e0183dac89af57923c6cfab40adedce39ff9
-EBUILD xapp-2.2.1.ebuild 571 BLAKE2B b3981de1dc023c0d7d74a348cbb69df543bdc0f5295be7ee476c258623fc492846e724f896e91d658c823df5913bbf5aa451168d2f792116bcff28f6bd87471f SHA512 e47eaf052fcf960c5e3c9cf6592f2be0e46235b20eb0a770b52e97548a0fd20c20479a5bfe12a795f9b5df37cb3ea82bebfa7e44fd85693f41891d76bccdc800
+EBUILD xapp-2.2.1.ebuild 569 BLAKE2B 7dd8c9e30701e49a3516381944076e6116959535af8af142fd88568e8ec62b18acd31c95256cd7735fdec0a668e8f1c8f9518d7c73e6da82eb39ddf1d651021b SHA512 abf20714fcbd946f36774f69d2ea4a78eaca067505c29cbd015675429cff576ca72dd9dbe0da1c4119e5edbe19c031ad0f876d95e71db3e21219ba1d6c57ef0a
 MISC metadata.xml 515 BLAKE2B f15f4815cb83df69629385add9d7e08929a06ba83d988177ee0c2702ce1ef2a660539596f8befbc581d3f83046e03f87d99df4125dcf977067efae15bce8eca4 SHA512 dca7ce42a549559511a915a714ebcbdf2a94b501d361d67fbffefe646e767762184f7e6ecc8d7915cdbf4c73d88a17b29a1aa538f2fd3e9fdc1a6f2c5c3a3fee
diff --git a/dev-python/xapp/xapp-2.0.2.ebuild b/dev-python/xapp/xapp-2.0.2.ebuild
deleted file mode 100644
index 32cca5c4e63e..000000000000
--- a/dev-python/xapp/xapp-2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for x11-libs/xapps"
-HOMEPAGE="https://github.com/linuxmint/python3-xapp"
-SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	x11-libs/xapps[introspection]
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/python3-xapp-${PV}"
diff --git a/dev-python/xapp/xapp-2.2.1.ebuild b/dev-python/xapp/xapp-2.2.1.ebuild
index f61e9693a730..8e2fd9f17843 100644
--- a/dev-python/xapp/xapp-2.2.1.ebuild
+++ b/dev-python/xapp/xapp-2.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index e2d6c881ff83..3035e1ac2421 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,3 +1,3 @@
 DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
-EBUILD xcffib-0.11.1.ebuild 677 BLAKE2B 7de5fb7d9a6d5f332e7ddf1cd8c0494dd4f843e20ea726788818af6879609d3cac8a35815912ba379e24ce6e2166655264039efc49c6bbb8680c5e262b48542c SHA512 8cd8eb902f3c88281d02da9489515e92337aa0f0ef7a44ff4c8a0034d6b8902d7181acccd3637d44f4a63a247d78f4c6e9ae3a0707e99b1fb1a733e45f16ef66
+EBUILD xcffib-0.11.1.ebuild 684 BLAKE2B 4aa229f01fdb68e73f77ea92bfa21d41a402922656c2a6b6dba4d0c64cbfd8230cfff28c884f6a612b2af0dfb2d267ea081bfd32b08471116ee1957cae366a75 SHA512 fb4612ce2478dc9172aa48482a98a578f0171c60c8704f193b1e3197f641dbb83a7a7307ea9724e68e00b570c0f24342c8b380e3435073615eaacc1cdafb0d75
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
index c9185bb6b8a5..b76474023be7 100644
--- a/dev-python/xcffib/xcffib-0.11.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 15d3ed008e63..b812af578d80 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,3 +1,3 @@
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.3.0-r1.ebuild 677 BLAKE2B bd6c1237d3f37092ee94d38d77945d012608e472d9f49f4e9942d8093d1a436d52b1217e647e23677359e09c898535c40df58cffb59c33207de3158793172e60 SHA512 0273ed4a2103451b72397976b7aaf50b8d562c82f9a4f4735572284f70ce815d2ac4030197b553ce038ba7a8890e8ceaf83df937cf5368a2cfc28e68eb64cc59
+EBUILD xlwt-1.3.0-r1.ebuild 684 BLAKE2B 3d96b142de98d0e028720d75ea58aeffd34ae01fa0240a6499ab330c6e2d683398e96bcbbaf61aa78afb89cc8409c67f7367cd6a8d98e21621cc5dbaafdd6c89 SHA512 6286687c5d3df1a4c26c6bd9fec68a50e661c75da83d68110755e262c7939cf6bc1b02605d8f7cdc132d48ef915157562e9b38c622422e1a3db43fa5dd97f585
 MISC metadata.xml 683 BLAKE2B e7fb3a5b9305f16f70a91d6c9b0ced04d0372fe5b02e0dbc2107a3a51a81565b6fdcfc7e7d63518ef682cd37c4bc9135203357350b33438340fcce53be9480a8 SHA512 b046e4cb9c128733b280809c6f702b5ba1a082ad83f67525d1cb0c4764a42412f680bc88c1331cd2d8647c671f66d1c0841d968b8ac68fc5e70d64939dad7a74
diff --git a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
index d6f988af1eab..ea04e843e3df 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 431ee2d98969..2729013bdf08 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,3 @@
-DIST xmlschema-1.6.2.tar.gz 367141 BLAKE2B 32a1e4924765badc268d2d68458c4d6d0409c5f3b4e0109487cc538aec300817cf0649a43f77990e82b2c54252b2ab3e0593a503c217893661480f1632491f41 SHA512 5aaf022451fa069b2361af542d4d864995e8dae7d50f5e66a5d5567b4d8511bb46b5dcec68a780e89025ff02f5bbb6311c4fcd4fb17f6c24c0c02b00c6b4a341
 DIST xmlschema-1.6.4.tar.gz 369270 BLAKE2B f3b98f0b8b4446dfa67da778c6b63585a894f4dcc9fd7ea98637ccd54b26e63aebc7f3fbc00e13ce43730b88da0f773a491917d5eae9301b5d22f6efe620473b SHA512 7e13d20a6add1cc5b6d0f732e672be3eeeb2f107fd2031cd5c22d1059d24b7d818c534817ea115d0c5f011727175bdcae71a0b8d55f1d6bd263a7e38286c26fc
-EBUILD xmlschema-1.6.2.ebuild 776 BLAKE2B 0b817a920dd8e9c0225e4422555f3dab1fc85e5339fed940e0dcb90d7d05f0c06bdfd0e52a8d7ada5a021e4910c81c9e7cc802acedd9ecce76aee65fa145d02b SHA512 7687a1b298d768a761cb14503fc9ec4894132c549933137add5a833397dbc696372e4ebf30f30a04dc49629a9462d9525d141e8e9b9e8594e09bfc58d2c4a6b6
-EBUILD xmlschema-1.6.4.ebuild 787 BLAKE2B c865d0370163362a19b55bb6cced1105a23891b003bcffeed135dde62d94b76467c599a72162c45c4917b2a70fb9821ae340adfa566c91a775360b218bd3d78d SHA512 e986709ea63b9e0842e260333f1856e3d171dcf854f611498819bd456300203103a2e0e939e146942fca032d363cf7d16aa4d8107f154d0b9ddce246c0274139
+EBUILD xmlschema-1.6.4.ebuild 779 BLAKE2B b122698cef27e5e87ea640ba5c33838efbec2ed1f70373637046b666ac829fdf8583368d4ac325a02f782eb0b25771f7aabffcf3b2b5a2c4f281ec97c7e27f26 SHA512 392c42ad67bf932549a56d1f2de75871cf8f49739c110d84e4d61f5db02ed410d3374ecd2612288552b07dc87f0a0d7ee1af2d5c3f763c521031f14c2a9b00ec
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.6.2.ebuild b/dev-python/xmlschema/xmlschema-1.6.2.ebuild
deleted file mode 100644
index f53fafca8870..000000000000
--- a/dev-python/xmlschema/xmlschema-1.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.2.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.6.4.ebuild b/dev-python/xmlschema/xmlschema-1.6.4.ebuild
index 2d0e12ac9848..f109c54be1c3 100644
--- a/dev-python/xmlschema/xmlschema-1.6.4.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 7723d7b8963b..78141a401995 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index fdfb4ecee308..a874dacce235 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -11,5 +11,5 @@ DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df
 DIST qtwebengine-5.15.2_p20210421.tar.xz 320142308 BLAKE2B 1ed6e3daad8e8da7336c1575f524f1474eb043a44a86eebdc2375e9a01dbb21a4bf622b01525c627ff5846bb375b19617ca78f418749d6e4ce53b376da0b8317 SHA512 3a57cc8eb1aab086ae2ef69b1b1eaac47827d1f460ff53d5954b0dcb6753cc0e5fb24db490ea186141e6659e26a59862e8096126450a9fde6ed1230c00e4ceaa
 DIST qtwebengine-5.15.2_p20210625.tar.xz 320144708 BLAKE2B cd11e69a34ff0fa07d26262906a12304c39a12575024d61db18bc696284e9c5700090e5bfed217c89d2c8eac49b0ccb7d7ee0ba716ec3a81878de1301566884d SHA512 517a8cdaff684894456db8cfb5cfca412b8764e7035623d8190d9a06f6995742097a53eb67329d12bf8dc0a56372f7d09a54532ba804a5bff245ca8ef042a4e1
 EBUILD qtwebengine-5.15.2_p20210421.ebuild 7009 BLAKE2B df9abcb5458f76fe10c62f244fde878f6fbf58f34f65e53fb273c69a11042edd653d15951b87cc23011e8b151c5552ee756407d74ada92fcfef96ffd2f442d4d SHA512 8eb415726d7727da7923f7e49c0b66cb150ff7a1c3e663837e7e20a61bf3370abe46b5c5084d75ab5987b8a1bc8bd84d21683b0dc6d69256759d9f5665c3a2a4
-EBUILD qtwebengine-5.15.2_p20210625.ebuild 7220 BLAKE2B a6839ebdaebead1cae6041adf046f6033761ba967e440207463a60e947c65f2d126a59bf698a8d2126c767a0eb78fecbd171744804dc7339ae98e9a3451040de SHA512 a38ce5f2d6e925bcb6af16f861a0e4a8b0eb7d6d42957eda6006d68df37d29b9a3b4956b43c8fa30a5d7e5b5350b2b5e654ef42382fa2c38d78ead0925580216
+EBUILD qtwebengine-5.15.2_p20210625.ebuild 7219 BLAKE2B b8880c4a500f1497e875cbd56ab71bf197742aa5a3a69d8c0a44a691a82b8a35e2cc5799132fe514ed059f0a734d9835e25dc96c7350860ad2bc7346e48d1bfe SHA512 6ed27891c804297206ed480d882251c3e3908e32f998b0ff0dd059123305a38caea56a5b14e63dcb81c50854b873ba8caa8fcc0fff2ac10084747727252828a5
 MISC metadata.xml 1269 BLAKE2B f95392929bcecbce9334108e3446d631e2a91d1aceb0fa6347496d2d0eeaff8cff55e08b7c3bb39fb8b51667988a6cc2b8e500143f2ebe0d78e6985a6f7af3c1 SHA512 7949854cf55f26750ded6787ce295762af7fd16600f8b251b25e1c9dd4d643338ed4c3b2a8a3405a2c427ed8b5a9ad13a8566a640161768d4dbf6db7e54811a3
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
index 3736cd09ac13..0a38090c5253 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
 HOMEPAGE="https://www.qt.io/"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 	if [[ ${PV} == ${QTVER}_p* ]]; then
 		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/${P}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9cf6c5c8a9fe..59d1d9edb5c2 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 7d91bb460478..79675d4a0f58 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,7 +1,3 @@
-DIST addressable-2.6.0.gem 104448 BLAKE2B 664365962533d31786e2a362b61879fee544867b7aadc2ceb1ae6709374015a7f0f5c0bd32a81c8f2ae711a4ce1a07cd8f84821e74c3b6aa56b7474800567737 SHA512 71aa0ce8b61a07c1d01298dcd29cb2ba73d06ed1578908cae60351214f7d0bc6c9b8b0db7a78044fb1bed258bf00f2f093aa4e2bcb32575f4db2a79ee36b2648
-DIST addressable-2.7.0.gem 104960 BLAKE2B 4bca65d54ef1d3556cf4017ae68082635c0398b6f604eb3edc18da8f8e1e49e38b46485a8716da3c407fe0605dcc9a12c7a95be49a91c4198c2e2b1cab568805 SHA512 4c438bbfa8874fdcf11eef1d1f7cceb1855ea85948daff13615a0af129d35f92cc918f4bd5bbe4cd6ebccc67a86fc582265f915dc39831ec64209de0bdeeb732
 DIST addressable-2.8.0.gem 105984 BLAKE2B 82f053c9ad052ce1ed1b6927674bd5bcda86a3f70d46b63bfc1185d51b402996fd446647d705418791c5443a1767b4ecd0b891f26de63fbe737c62f7586bd57c SHA512 c684f17940f717c2a65f9716ab9b3659948d6d51a60c38a7295fcf6fdc1c5785d2d315d2de7dab9f66a6c31f62247177d78d5d6eb556f5bb49926d4f00f8e4c8
-EBUILD addressable-2.6.0.ebuild 1343 BLAKE2B b225c1f2f7a58272e83b7a6be35aeb220a2f5cc1f94185259179f3ed89356eefc90ec03ba65631c4c676981d841a6f8b7b9782de203b3876a6451f6fb1baf165 SHA512 2305bb1ad32f470d303ab3b702ebb6bcf2056233c997be75be3c802d653e8386bc29d5ff8666dfe477edacb0a2b62bf5a9b3bb0ba44c55e208459197bd6a44b3
-EBUILD addressable-2.7.0.ebuild 1310 BLAKE2B 9a404fd941bf78f539164435864da9dcababa6a7188eebb182b2c23511cda0b849ef10937d7fc5728c9cf853a50c588548936f87b359e44d98accaa22a238ab3 SHA512 65256c662589db08c03be5db84c6805a11a685eeb4d47c5f1fdff2651b63ab980b891714d2da11000f2a3b0849049768462c6bd67b15f5f9093ec026dd61e2c3
-EBUILD addressable-2.8.0.ebuild 1309 BLAKE2B 1d21f453cc184000f34cea2d633b0e3b48ce5b047e41318f131c8db4b2307b7a14d6ac9d97062c26e424c6cce515e9eca3852648bbf73bf7e2d4e6a122a9468e SHA512 abb0483cc7b38462a70d26a8f32b7fddab86813c47d908218d7678442eda4d1d54e1355f1168fef75890ba893e30a3958f56b48d69fd23ff8816549fe3b827be
+EBUILD addressable-2.8.0.ebuild 1308 BLAKE2B 8cf575a9d3976d8ccba3af401d8d8de7486185fd7b21490158ce2b09927059de16857f52e701e87477a6017711fad091404c2eac75aab03b491ece8463380fcb SHA512 d61746a00d0a8ac9eb479c000b2d5cf7dfe254e4ae2634c5e460b43490558318796f86786e6dc4e46fda88a634b25ff69f355634cbe74880cd7e588ad0b19ff9
 MISC metadata.xml 404 BLAKE2B 4362f3592286dd6cffae99340e1b4437af10ab4dbbe44585d3370b0970e7d02a881853329c9412bfc881c3f040995a204b758aead2c34cba4f9df8104f858479 SHA512 c335566562492b85e491233d4f908fe18c2713ed9ac3afe2cb4d9537d71bdfa1a10bf58f1ca9f29e5a695fde9a4ba0ff9b3c57122afe78907cc0b00b5c307351
diff --git a/dev-ruby/addressable/addressable-2.6.0.ebuild b/dev-ruby/addressable/addressable-2.6.0.ebuild
deleted file mode 100644
index 3915b0e20a59..000000000000
--- a/dev-ruby/addressable/addressable-2.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
-HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/public_suffix-2.0.2:* <dev-ruby/public_suffix-4:*"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	# Remove spec-related tasks so that we don't need to require rspec
-	# just to build the documentation, bug 383611.
-	sed -i -e '/spectask/d' Rakefile || die
-	rm -f tasks/rspec.rake || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '/^begin/,/^end/ s:^:#:' \
-		spec/spec_helper.rb || die
-
-	# Remove specs requiring network connectivity
-	rm -f spec/addressable/net_http_compat_spec.rb || die
-
-	# Remove spec that tests against an unreleased github fork
-	rm -f spec/addressable/rack_mount_compat_spec.rb || die
-}
diff --git a/dev-ruby/addressable/addressable-2.7.0.ebuild b/dev-ruby/addressable/addressable-2.7.0.ebuild
deleted file mode 100644
index 444a23a8b9eb..000000000000
--- a/dev-ruby/addressable/addressable-2.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
-HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "|| ( dev-ruby/public_suffix:4 dev-ruby/public_suffix:3 )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	# Remove spec-related tasks so that we don't need to require rspec
-	# just to build the documentation, bug 383611.
-	sed -i -e '/spectask/d' Rakefile || die
-	rm -f tasks/rspec.rake || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '/^begin/,/^end/ s:^:#:' \
-		spec/spec_helper.rb || die
-
-	# Remove specs requiring network connectivity
-	rm -f spec/addressable/net_http_compat_spec.rb || die
-
-	# Remove spec that tests against an unreleased github fork
-	rm -f spec/addressable/rack_mount_compat_spec.rb || die
-}
diff --git a/dev-ruby/addressable/addressable-2.8.0.ebuild b/dev-ruby/addressable/addressable-2.8.0.ebuild
index 4156f7ce623f..b0617373069a 100644
--- a/dev-ruby/addressable/addressable-2.8.0.ebuild
+++ b/dev-ruby/addressable/addressable-2.8.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "|| ( dev-ruby/public_suffix:4 dev-ruby/public_suffix:3 )"
diff --git a/dev-ruby/ansi/Manifest b/dev-ruby/ansi/Manifest
index 78fc0de90dc4..5766d8f48496 100644
--- a/dev-ruby/ansi/Manifest
+++ b/dev-ruby/ansi/Manifest
@@ -1,3 +1,4 @@
 DIST ansi-1.5.0.gem 41472 BLAKE2B 3d584a29d17b1d751c6ad2d87d36e75c2f72c4a766c674c8daf285b80df4e64c55d9dc798f101a6d393365b9306997601df18a52a4e6a348e3bbf0b06e5afc0d SHA512 969cc749c08c5446b67a45acd02b7ca0256660804c3f8c148b50e7638de41fd5297b6d56613ac979e50b57371c83b382474c6ad4126d4e130bbaea4ce0e14300
+EBUILD ansi-1.5.0-r1.ebuild 595 BLAKE2B 067aced6d405e7aea2cb5149b93bb5a943e9e3b47e10a8eb1889c6d70fde0b0a17a5fba7f758047c3acf56a9f15a1e796f7f41dc2ae2d5aae049e1585438787c SHA512 e909193a9ab6120bc8e77aa3ed462b1d929709a6cd4db8508161065a4965884f266ebd93731e154770618ad3f7820aeface88495d46c8d0827e97a0fd294ccff
 EBUILD ansi-1.5.0.ebuild 602 BLAKE2B aa7bd90e93cd0f5013173a4b545846791b2053d1575b83e58c356572ed0ce87b23de6f446dee1961bb8eb3239d3a0a7bffea584995ddb6ad7db7d6ef5f9e971d SHA512 7a208e1910ff78be02b95edc251e8a50e2db94c346aef1ae453c279901964553a83b057f2e5fb23cdcd42f3f4b67a8d1a91bdd2cf44fb8a4805574a38d9ca202
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ansi/ansi-1.5.0-r1.ebuild b/dev-ruby/ansi/ansi-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..5a8e4bd43e62
--- /dev/null
+++ b/dev-ruby/ansi/ansi-1.5.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="DEMO.md HISTORY.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The Ruby ANSI project is collection of ANSI escape codes for Ruby"
+HOMEPAGE="https://rubyworks.github.io/ansi/"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# Tests cause circular dependencies with dev-ruby/qed & dev-ruby/rubytest
+RESTRICT="test"
diff --git a/dev-ruby/bsearch/Manifest b/dev-ruby/bsearch/Manifest
index 3a05f8607656..f070e789bf64 100644
--- a/dev-ruby/bsearch/Manifest
+++ b/dev-ruby/bsearch/Manifest
@@ -1,4 +1,3 @@
 DIST bsearch-1.5.0.gem 27648 BLAKE2B 6b57cfbdfbb56df9c1c8374fccc59746241a7571aa7328519ef2f5c85e13e0cf8f54c90cb55deef2b08a902c9123c63d0b299ca7026ccde9b02aad02d4411181 SHA512 6246921be42e15ac35cf862833e156a01a0de9e0d2bff53af8eaadb3e7a512b7ab1e9dbef5b05282b82b26e589e45ecb6e31567b382dfc6eb62757e658cdc660
-EBUILD bsearch-1.5.0-r2.ebuild 593 BLAKE2B 153220aac36181ea9bbe634018c7a3a87b5ae7631ec07c3e1852fac6312a6f5dd2627d57ab1fb1b5cf9eb06dfb217054b096a35f7c10ce82e2da8c945fe9072a SHA512 bdfcf60163f64c4776b2473c57c291384d958fe9572f8470f7461c8487ddabf87f0bb459698c99601bfd55cac76eb987584c7d6f64f6adc45ed55625652a873b
 EBUILD bsearch-1.5.0-r3.ebuild 599 BLAKE2B f89844c7669ac8f2f957cafe8b4cb706cd22251d843f7ab539073137538fe9fb2766ccf13fcfd141768c7345c3b1dfbfc84a8b7251c740084ef7a0c26ddcb751 SHA512 c87e221c2771c48189b3c45491611ecc3d1741530e6caeb71b2f2ab088e3e969704c190d5cbef6ebd3cd0c7db76c221891d1de60d2cc7b3a953e2c3f57b6378c
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild
deleted file mode 100644
index 1aa7804b57ee..000000000000
--- a/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="doc/*"
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-fakegem
-DESCRIPTION="A binary search library for Ruby"
-HOMEPAGE="http://0xcc.net/ruby-bsearch/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i 's/ruby/\$\{RUBY\}/' test/test.sh || die
-}
-
-each_ruby_test() {
-	pushd test
-	RUBY=${RUBY} sh test.sh || die
-	popd
-}
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index f65200c47067..1511ce1bad67 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1,5 +1,6 @@
 DIST curb-0.9.10.gem 88064 BLAKE2B 8f761e752bc1fd0775f012373847330d3ced9d394e5159b74c8e329247f6221bbc26978755d84b91e75b4082b7bb50c7755db299f90f291516f355b4ab1ddc7c SHA512 eab82d3c1b34bf8e5bfd334abca38a80eaab255d31164ca189185b8b98d7f3760fb116babf50dce5aef01be30b15e9374e7a84e1b0926dba13c3e9f8d36c54ca
 DIST curb-0.9.11.gem 88576 BLAKE2B 1656a17070151ddd1bd63c3e23885d36d8e2b133b19e00347892363a9a20c88baa10932ceb5273733b18847d8d19dc403aa4b7f36fbd80c8dde126ae46743796 SHA512 000ee2054a5866de09042dfc5894330900e401aa94a0fe8bb133fe9c661f7899992adff0585e5ed3725d3564cd9819d76653655f3539faaa61ca6acabe3a8602
 EBUILD curb-0.9.10.ebuild 1382 BLAKE2B 691f384283cb988aee2cbdaeae453b538a551974583a913a93720f04ba28e3688173db154c272c93157336877faaaa83358e316fba21bccc985597a8813c7ae3 SHA512 ba77ab93dfc7c36e9094b5cba39ad0ef256e979bab2352f731d795590f5ba0efec653fd4871596e5379b11e04f27ca129d0c70a654e5b064e03b78fc43d443b4
-EBUILD curb-0.9.11.ebuild 1352 BLAKE2B cd85eb7e577b0576250063e258463a4d6a8c213bd48c6fdc9cde98503dcbd0beebdb53802c8ea251a4ec630bb7880a7afa2ad07ef8691ab916efe0550e7ecd51 SHA512 a62aabeb221292bb83a897b7ef96ad0d680fd2d3b5344290613d14dceb8ec944ba7ef005393f9ef8c507d2cc0401fea141d194c439fa1ad815b9c2c238bfbbd7
+EBUILD curb-0.9.11-r1.ebuild 1178 BLAKE2B 0c2c8b3791ee3dd8a995c22882271cdbbde12d12781361c7763fed8e66ede96fc7206ef49f27dcb1285c2f7e6c9e953176447d78da7410c9a86ed377974e1789 SHA512 71953ae1e5f1003486ec9e2126e263994d152333bbbe58fcabf209335e2f15d3accd81dba68faa8f4b8ab3024b3460ad48dde495279bb5765529c80d93b34d84
+EBUILD curb-0.9.11.ebuild 1351 BLAKE2B 482f6136e62728fd90f1b312fbd4fa59c2c005aa0380480700b77574020a6c92197843f56ad915d557a1666aadababd4723c620d5909b80d285fc0eb7533d4bf SHA512 065dcc8ceaab26c8227a47cf63cd0a4d630c2e69fe2e1f0eaa7a6f708fb38bb30a68c265b130225b3a8511d30c22d00db85747cff4901794c1ee633ec2778063
 MISC metadata.xml 335 BLAKE2B e68d36e70f8859cbc9d47397720949fdb7d048601e46c7380575f6c5ce43b04dccc2eb3bb0396a72beea0840f197ceeb5325e935431ef45022bdb2749e1cb57f SHA512 993073ca664dcfc0698a820063013ae20e431f0d2d1b5fa27e0871ba33ebcd09ac70de516ad943934a3a4783d3df4dc93e533082b3b47f245908a5eab4e94658
diff --git a/dev-ruby/curb/curb-0.9.11-r1.ebuild b/dev-ruby/curb/curb-0.9.11-r1.ebuild
new file mode 100644
index 000000000000..bf0097fb81a3
--- /dev/null
+++ b/dev-ruby/curb/curb-0.9.11-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby-language bindings for libcurl"
+HOMEPAGE="https://github.com/taf2/curb"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" net-misc/curl[ssl]"
+RDEPEND+=" net-misc/curl[ssl]"
+
+all_ruby_prepare() {
+	# fix tests when localhost is also ::1
+	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
+
+	# avoid tests making outside network connections
+	rm tests/bug_postfields_crash.rb || die
+	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
+		-i tests/tc_curl_easy.rb || die
+	sed -e '/test_connection_keepalive/aomit "network connection needed"' \
+		-i tests/tc_curl_multi.rb || die
+
+	# Fix test that expects wrong output
+	sed -i -e 's/200 OK /200 OK/' tests/tc_curl_easy.rb || die
+
+	# avoid failing tests where failure condition seems weird, no
+	# upstream travis so not clear if the test is indeed broken.
+	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
+}
diff --git a/dev-ruby/curb/curb-0.9.11.ebuild b/dev-ruby/curb/curb-0.9.11.ebuild
index c623b8cffa57..07ac269e3ecf 100644
--- a/dev-ruby/curb/curb-0.9.11.ebuild
+++ b/dev-ruby/curb/curb-0.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/taf2/curb"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND+=" net-misc/curl[ssl]"
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 9f3f5122dbce..ff286e149d91 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,5 +1,3 @@
-DIST dalli-2.7.10.tar.gz 52106 BLAKE2B 0531247c1d615acd7d1124b8aceb5635088b55e5a85753f10b8fbd786ec3573f13df096e1537d9a31f3801632406f28d918de5971cb28ec31d6eb8387d0c74f1 SHA512 1b6308ef37d729d85741306c10bf87c9b9733f83f0b4bf089f3eced36c48cddd9a77d2fb44a77778844d1cafaa3cec5110a9c90f6a67dee08a96e163e6ccaf65
 DIST dalli-2.7.11.tar.gz 52341 BLAKE2B 5b3a2bc57f4b0e3a9ac0d24ffa3bba89ea38665ac08ef3d7760fa6ce74db21d323a18e74a4f3009165364332731d7c6890df36c68409afbe21d3ac096275f028 SHA512 8f299a19d95293370564b6337bbdfeb32d928e0a95bf5f5df962ea20b039f4765da1797513ca96cabf93309484575481a02fb1e0c6d227f74c81fc72f95be22a
-EBUILD dalli-2.7.10.ebuild 1578 BLAKE2B aa257dd54dfd71304c5bf60d8373252466770d027a72bbb1c42af5e2c2593bc018c124208b8d78219ad3d6cd9ab6506117282bfc04e6922ff05dfede2a82ebe3 SHA512 0ce0ba0d10409a0531257e5f314c84b18839a0823941c0b5e36020cfdf55243002f98eb4cd4de64806e182c3f7a4559c5462e84727e6346c63f81476911a3162
 EBUILD dalli-2.7.11.ebuild 1574 BLAKE2B 5c873d42d667a2683c29a5eba6338330cf95eb5d5e854a0b9ec03dc94ca7c339538784dd58c9cc768bb8e2d5d216a4afc185289dbaeb5371dc52e9213a7c905c SHA512 af31e416ebf86d7db1e7ced950178d2e6489d44a98e2179949fd352ef8ad38c5bf322d6e9336a7a492ef767bbe97ebe477001664f5ab40d2878fb9cb46087f0f
 MISC metadata.xml 346 BLAKE2B e34b47009de19ff810f3c3893517533730fa09cc4713b5fb8ebc05011004e17466ca0a6e6df307e5748003a7b4c83691d28ca0d80b423f6f870c4f7fc9be88eb SHA512 22b3ca0c5024974556840a2cf47ffa0dac63b6a4573d2ca6244c3ec9231b1c8321c7f544bc979882a6bb6ca37545b8ccf4612ce9ffd1ab34521b24e896f57e41
diff --git a/dev-ruby/dalli/dalli-2.7.10.ebuild b/dev-ruby/dalli/dalli-2.7.10.ebuild
deleted file mode 100644
index 1a7d5a359029..000000000000
--- a/dev-ruby/dalli/dalli-2.7.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
-HOMEPAGE="https://github.com/petergoldstein/dalli"
-SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest:5
-		>=dev-ruby/mocha-0.13
-		dev-ruby/rack
-		dev-ruby/activesupport:5.2
-		dev-ruby/connection_pool )"
-
-all_ruby_prepare() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
-
-	sed -i -e '3igem "minitest", "~> 5.0"; gem "activesupport", "~>5.2.0"' \
-		-e '/bundler/ s:^:#:' test/helper.rb || die
-
-	# Drop rails dependency which is only used to display the version
-	# number, so we only need to depend on activesupport and avoid
-	# complicated circular dependencies.
-	sed -i -e '/rails/I s:^:#:' \
-		-e '14irequire "active_support"' test/helper.rb || die
-
-	# Fix test compatability with memcached 1.5.4 and higher
-	# https://github.com/petergoldstein/dalli/pull/672
-	sed -i -e '/memcached_low_mem_persistent/,/^end/ s/-M/-M -I 512k/' test/memcached_mock.rb || die
-}
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index ee8924deb2a8..008f8be44f59 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -4,6 +4,6 @@ DIST did_you_mean-1.4.0.gem 33792 BLAKE2B 9052b7ba7028f963595eeb79e668296b48db86
 DIST did_you_mean-1.5.0.gem 34304 BLAKE2B deefea833d1fe12733a6b1422e5ae43d0cfa7ff7ddc49665762a83866634ccd0a440e5a3b351cff6d9d308e85de0490d56d7b675d582f090e0e4fb07186c197f SHA512 7fa4cce3fb895bf026788bb5d558f88d4ddb62b7cae1e284969dc4f0570e88871d5f103514da2c9d79399dcf10ffc845a594afc9c676e90cbca4d5a38d74d7f8
 EBUILD did_you_mean-1.2.1.ebuild 654 BLAKE2B 10c32d22dd810f1b31670fa83421136e2c00d865abd3229181951737587ce47e7d3df774b7ea24d2da6f705452565ba13ba48c8003afe831325a192c49b43553 SHA512 ce3a72256075206d39f1b909127d48e3e67a9d39e0a19cfbbc58eff052eb4d180fbab1bf85a2242e76f400511f3cf972c11339dc88c92697b5bb9df1e3481de8
 EBUILD did_you_mean-1.3.1.ebuild 662 BLAKE2B 3883bda20b269918ab5f29944edb3990515fa92d88d2f424cde835eedb2abef59351e964ca448e565379cda95537ad5487a533cf5cd5c03f86878a1e9ef83683 SHA512 92cc1be246c7b3bc39b59f51f209aa84d3578734cd34c7a2690294d3600de749f277a7730a1fcc345a26421aba131e7a70e7dcc36f02e4ff0d0b0aacb113e9e8
-EBUILD did_you_mean-1.4.0.ebuild 675 BLAKE2B f7b20f3eff17cae21d79c08c2f09527ac9c0a702880db78b926a6a17834a4f65e15e76d15a32e8423f17c2afe70bee690929ce6a7f51354af7d38f010b36e1a5 SHA512 8aafa020477f954ee613da2738a7995a8665125257c1eea8a693d0259e026cd57057aa5c8d5c4d224d42f979ca0a713326eb9fa95f971e3ed382e06b5b11a23e
+EBUILD did_you_mean-1.4.0.ebuild 671 BLAKE2B fd3fdc75cc871aff0a6a79333478b812c9a4267a205a2a5a989b1268cb580e25f329670bd1013a4a0281eefcd0052992b510eba23d8fd0246690b46830ce0db1 SHA512 41e79222761387ffdde89cb974ff43dbcaa2a3360ba6afd8a84218874bf95fb9dc2f101a7029dc159d9d56fa43c43b25b6d73ba5e390343517f626d4abc16bc9
 EBUILD did_you_mean-1.5.0.ebuild 684 BLAKE2B 7bf3abbf2a57e6cd52f5a33002a74d184fd1ec46c2fef3a6bc0fbc48cdac08b4844bea63ab39650e1356728d8efc50e0b4db0501f6eddf0f9e4712fef2ad4d30 SHA512 480c2613442787878fb0faab0fb465c51a162ca075c092b55b494c729de658e3ada4b73ba168b30cc98f1bafb856d9c20c4bd4f9c43e1eaa1d07ccc7d7b25612
 MISC metadata.xml 345 BLAKE2B b3764e5648286cb66e03f3343a41b460ea2bb24f51e1c25e89e386c2b16769c9b1f88888b1e10b2c2d0a2346659195454e4ee8262aec0d4a9066795759cad053 SHA512 418114238e3e2db16ebcdd3de5213b3bc0f0a45ed719de1be60cb19015966cf39912f38d0858e22aa6330ac2e7fb58a1452e9623e7559c26161d70e0f29e66cb
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
index 0f04623fd013..efd54c983fff 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/diva/Manifest b/dev-ruby/diva/Manifest
index 51c516d8f7e9..5e04ae74355c 100644
--- a/dev-ruby/diva/Manifest
+++ b/dev-ruby/diva/Manifest
@@ -1,5 +1,3 @@
-DIST diva-1.0.2.gem 13824 BLAKE2B c292e11d9975691d85cb0500ec42b10422665abb9b236d44629d0a9518e318cf91891d4ad265aab81d13762d121910a8be92c602225d44bfa66e31e77082fa95 SHA512 b5d2df59e4144930ee18c7b738e8b93646057935364c2710d349761e68053f1c342b382de76dc1669076db7394ff906384a8952e1e7c44c71f208dc3604d67f4
 DIST diva-1.0.2.tar.gz 13638 BLAKE2B 461e8487e06749d0482b86fd30945dc83d53daea06750628839c899b6f8d419599c9cc322b62f58d3eb956a2a99a3674dd591c4bb2fc5483bd1853bc40154634 SHA512 b60d80ca55c98a2f6fcf269aa4a2188f2239b871b0e77f328490d5924a6d0e6801c67d0eef4de28b584303f38bed3752a3ceb2c1e4f2c7d17be13dad03c643b5
-EBUILD diva-1.0.2-r1.ebuild 734 BLAKE2B 2248bf4396bc284852f7cb900d87923d62f3ebc92b304d18499fa2c0152a9dce50884dc33ffd10ce7752b598d7b70dc7bd4eb3c96545d9bc36433aedcd8e9881 SHA512 a1d0a1bb5ccce158b9429c747763993cbc9a8f57c223d588254bb11989df6f31584e1a54f1ec5bbe65211331407b0a909af9d7887f71eb44903723b0e7082dc3
-EBUILD diva-1.0.2.ebuild 610 BLAKE2B 6bdb64d5897c04ba9010fe82d539cdce989c1adceccac317fcb340f3bd31db25fece406a3912a7fd13417f8771bbbe297473bfe572d8609c4004f33404e6df4c SHA512 951075f3cb56a0d98924f5b0cf2cf71bc398693a3a216522ae10de0e5e90539c8e56733122146a95ffe46e26eedec228ed8e2429d9101fa003709b796671281f
+EBUILD diva-1.0.2-r2.ebuild 750 BLAKE2B e1deda7cfbf138cc7c0b327b9e3bf0c658643cb215acf707cae29748a5f298925fc6ae626222f3dc2cd89f2ec5b2c0cfccbbf0e790ee496f266a455d3b05d066 SHA512 15a00e0f5c345774e5104f4c1e2e3712abe1b39ce96c90de7e5352583fb732750caf6127b8d581f0b6c13e2f77df7b134e855fade714caca277f5d85cb5da93b
 MISC metadata.xml 399 BLAKE2B 26a2baccac7448af4f7e749c1e8a69821a25864ca8f3672f137e73ae7a257ec87398239cd94479a06691ee3ddcfc0e4ead1b71f58ba2fe5541577099592466f2 SHA512 a95f31401006f69283159dbc1524b53e79454609c6bda896af06f472c84ff828162fea80594028fd8c02110cd190beacdfdee47dc27d69d5b01b10e29a4ce0b2
diff --git a/dev-ruby/diva/diva-1.0.2-r1.ebuild b/dev-ruby/diva/diva-1.0.2-r1.ebuild
deleted file mode 100644
index cd07c32b70cd..000000000000
--- a/dev-ruby/diva/diva-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implementation of expression for handling things."
-HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
-SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/addressable-2.8"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/diva/diva-1.0.2-r2.ebuild b/dev-ruby/diva/diva-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..70749dfdb14b
--- /dev/null
+++ b/dev-ruby/diva/diva-1.0.2-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of expression for handling things."
+HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
+SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/addressable-2.9"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/diva/diva-1.0.2.ebuild b/dev-ruby/diva/diva-1.0.2.ebuild
deleted file mode 100644
index f026d01e2f5a..000000000000
--- a/dev-ruby/diva/diva-1.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implementation of expression for handling things."
-HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/addressable-2.8"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index 5366b0fb14f4..f9294d8162aa 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,7 +1,9 @@
 DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
 DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
 DIST elasticsearch-ruby-6.8.2.tar.gz 343982 BLAKE2B 84878d08919d5a533943bf8a8b092f0ac74b6e1f160d822a9bbe079cb80d3dbfcc09619c1bcb25e0ad6015acfce383895e41ff9e6300a119c3a7ff53b22f0564 SHA512 c76ea7878726e7145a8c6b8759a916678da0d764620c15b77c3add08ec5d42147d0ff69a0e48ff2f8a4cceb39e7047afcd002862487d00752f84062d9df79874
+DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
 EBUILD elasticsearch-transport-6.8.0.ebuild 1286 BLAKE2B 74253518166d3899889640fd67d32b3a9851b85d04e8bfbda7cbe5219bd623f0d33b43497843dd487edcc47228df4ead1e05e192d8719f170eff5afd5bd5f03a SHA512 e897ff95b6406ae36bbea0b2d092c9de8990310aaecec94a97fad17cea20b9e953b294ef1f46ab237461f4789fc9b32f2ff0eca29a9a338d8db4e085317a5a41
 EBUILD elasticsearch-transport-6.8.1.ebuild 1245 BLAKE2B de79ad2d371cdc49172d4aa835048c11b462c5f7faec0e3512890b6ea36865b15289e46a5b0bff61ab9bf0fb1080d6333ff3c58f15558940112898903bebe4ea SHA512 72c619d7be6141257c7e91f6c436cdd349e0abdced71e93a05a143246ad56f0003a0ed876e53aaceba5b8b3c049cb82c4daf80261b867cd6cb44822f9d3e620b
 EBUILD elasticsearch-transport-6.8.2.ebuild 1266 BLAKE2B cd158092fb761a3a7e02917c62a9e75ae207142d04cb40d3377b48a28cdbf3e96fe05c9a46884bb4d52502b77e7c6dfecef1f68ed1261ea2ddbbcaf35feb4ef0 SHA512 ad6021417629213db68bcfdfcbf7773de1ddf07e49fcbae26ffa8df46a0505c335964f8da53ffeee8e5bde8d78c79821f31272df4b393dc1b66813646d52061e
+EBUILD elasticsearch-transport-6.8.3.ebuild 1259 BLAKE2B 8fb30418fe87bbb201b381a180767a80e0675507aea6c4bb69c0a5962a39f6d5de0926effd2bd647a241229fa5be9b5e447b0fc77fbe70c7cc316ef67b859ba2 SHA512 b9f1f1801ba6054480f03d1ab410249d2132e620320637582c118e740184909ff11da1ca256244da27b9a2aa238f4285148fb7d0462d766c8991c3768af2042f
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
new file mode 100644
index 000000000000..9e3d3dfb4e1c
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/patron
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 04e1a4205fc4..76b5d011962c 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -2,6 +2,8 @@ AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
 DIST facter-3.14.17.tar.gz 409415 BLAKE2B 5884d1244ee869b1e8880bb243996be5a0377adcbcc7e02ccd94a98f3a98d700ad129a457dcddcc3aeae6027fb818032331ce5690019fe7186e8deb9b022430d SHA512 109a7748d883748c516ff7262c7eb589f3c7321edc3882aad242f6fece566d1e6e81f340f3dbb3a7fed16c528ba0da8769984c394178efdd447f10de1841ff53
 DIST facter-3.14.18.tar.gz 409243 BLAKE2B 6d11498ecd82910ab82ec9674fbe7cf8d87f76f47dc6bf1a25c6138d498ad0c1d47ae5b2cb67fb092892e29279ff3263e2d025ff1317e4fb428105c943ee11e3 SHA512 537696324fd1ea653019fe3febdd168f40155d120bb0f9b899711c04f8252166731ab3530e2f03c01606e3549db3726e146b00781ac6ab5383f5ba2ce1e74d3f
+DIST facter-3.14.19.tar.gz 409345 BLAKE2B f977bb36ec8042ac950babd19ed398b8bd4fece854304a8a7a5f6b7608c3ad6ba4999b9038e401d599883da5bad63304b502fef164d1988d68a8477f1ff302a1 SHA512 65efc0237edc8198165e8229ca5d64e165a36e58718a863e14df9de9b64d4c9fb911d084e23daa982473f0703077b2cb0a5de8c544161591a894d537312c30f0
 EBUILD facter-3.14.17.ebuild 2102 BLAKE2B afba1a731812d9927d40d1ef098217ded54abcdefe0bac9488344d0786609ba4aefa28212dc299348995496a9fe09cffcbe2b2cb35985c1a186b2acf04965768 SHA512 a08dd0c33f5b89adb6f6b55b455e0297a69baffbb3cf5e54c8b758abc6bbc2765fad1f46a4cee1937f12ff25b6099eb0c61e2f5521bdbbd8c5df3bcb8cf1b680
-EBUILD facter-3.14.18.ebuild 2104 BLAKE2B 4b154757d004888f958fbb7d6d916fb44c540b2b46322134b8b5d4e2a1aa14939e85f76d7c7ebc8c594a16f6842de998b9135c1c69ecdd51a702ff097a09cac9 SHA512 1f345cf8e7fadcd7f95266084c0a5cf8e8d3b1e2b895127a6de610b6c63fc1d7ebda5f3093948851e7dd0718ac52e5ddd71f1fa9911cf3a269b43341ce3656b7
+EBUILD facter-3.14.18.ebuild 2102 BLAKE2B afba1a731812d9927d40d1ef098217ded54abcdefe0bac9488344d0786609ba4aefa28212dc299348995496a9fe09cffcbe2b2cb35985c1a186b2acf04965768 SHA512 a08dd0c33f5b89adb6f6b55b455e0297a69baffbb3cf5e54c8b758abc6bbc2765fad1f46a4cee1937f12ff25b6099eb0c61e2f5521bdbbd8c5df3bcb8cf1b680
+EBUILD facter-3.14.19.ebuild 2104 BLAKE2B 4b154757d004888f958fbb7d6d916fb44c540b2b46322134b8b5d4e2a1aa14939e85f76d7c7ebc8c594a16f6842de998b9135c1c69ecdd51a702ff097a09cac9 SHA512 1f345cf8e7fadcd7f95266084c0a5cf8e8d3b1e2b895127a6de610b6c63fc1d7ebda5f3093948851e7dd0718ac52e5ddd71f1fa9911cf3a269b43341ce3656b7
 MISC metadata.xml 539 BLAKE2B 5e7dc30c0696bd913c537091d3b9ea909870a833c82811ceef43633486e6434eacb22dd288e2ac544303e085eb60934619a5d8d39d8d2c70c2fccc319e00cf5c SHA512 33939edfb2a516911b9de80f36d80e1193086ac0f5bce5d2117706f976921fe23b90cbfd8a25311a9d5176c90ec7aed5987ad9821f5e410b97818782b50d83c7
diff --git a/dev-ruby/facter/facter-3.14.18.ebuild b/dev-ruby/facter/facter-3.14.18.ebuild
index 249ddd7569a6..b69eea0e499e 100644
--- a/dev-ruby/facter/facter-3.14.18.ebuild
+++ b/dev-ruby/facter/facter-3.14.18.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-ruby/facter/facter-3.14.19.ebuild b/dev-ruby/facter/facter-3.14.19.ebuild
new file mode 100644
index 000000000000..249ddd7569a6
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.19.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake eutils ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="
+	>=dev-cpp/cpp-hocon-0.2.1:=
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	dev-libs/boost:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+DEPEND="${RDEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
+	# be explicit about the version of rspec we test with
+	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
+)
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/faraday_middleware-multi_json/Manifest b/dev-ruby/faraday_middleware-multi_json/Manifest
index 24f6b5c79e3d..c17813b3a743 100644
--- a/dev-ruby/faraday_middleware-multi_json/Manifest
+++ b/dev-ruby/faraday_middleware-multi_json/Manifest
@@ -1,3 +1,4 @@
 DIST faraday_middleware-multi_json-0.0.6.tar.gz 3455 BLAKE2B 3fcdf69d90fe2da5cfe16851b5a5050429593c39c3d56eeab3e687ee89d036822197273fda44370878fb4087c29d6e2357b3220526c9adb8566a83f8d50bbac4 SHA512 4abc794a06725d4a584af08a58874162f1bea6424569f0fa6683ac0df7882708d3872e6a42024d7fa764d08688ceccbdf61d9870f23b71ea3c842440b495cc61
 EBUILD faraday_middleware-multi_json-0.0.6-r1.ebuild 889 BLAKE2B 0e1da545a766360827156ea53bc3349c0be8810be913dedd20328c8f44264e374c797f092a45ad5a41219eb75bff96626cf9732cb3bf3ddee7c21c0fa7bbc693 SHA512 f1e8e1b879ed78b7b2a1ab3eae0b5c5b500933cd29c0529f75af9b342c05d7c59d69af93cf39172be5c162703344ad72c28df1c9a9517b4c2e4246340ea283e8
+EBUILD faraday_middleware-multi_json-0.0.6-r2.ebuild 844 BLAKE2B d2e23997e306c0833703fb7abef250f7c500374a71010509cdc7ca32f2c80532ddd140ae2e836d1aa7678d8499144b66b58fab255692be0d998b6eca095c51c3 SHA512 7cfafeaa666a7f2a0acf158dd3a94ea42d94eea41058fcd4c23c2b20471240e4ce659c0a8152e03eba5743eb2405844cfe36cf4f498ca0d3ec202ce5c25ea034
 MISC metadata.xml 623 BLAKE2B 7be969984baa0dbd08ae9c667ab8a6dc7144de07d5a54721a0f8630ee458b02f8e21f2a693d43224d860daae2464e5e88e43b437c62dc695cf2d2c61cea13e9d SHA512 df56fd21e8b99a769ea2e9c214a2720f90e32d410b78bf884c13fca5a4f79d84f3c3f02163e7b3f39d86f15aa54e6bf1fbabc15e0bbbd4bac8c516f241b0d2e7
diff --git a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r2.ebuild b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r2.ebuild
new file mode 100644
index 000000000000..e32a1e15b425
--- /dev/null
+++ b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Response JSON parser using MultiJson and FaradayMiddleware"
+HOMEPAGE="https://github.com/denro/faraday_middleware-multi_json"
+SRC_URI="https://github.com/denro/faraday_middleware-multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday_middleware:*
+	dev-ruby/multi_json"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm -f Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index e56c420099dc..b3107a9a3992 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,4 +1,6 @@
 DIST haml-5.1.2.tar.gz 126059 BLAKE2B 5d805f29c28d0f6355f7b79e5724ec1639a808cfae75c26633edddcc82d964a48dbc1654b780fb706529ca22abcaba953a1af6f483386c336035c079a719e585 SHA512 405976de297bfdbd6f010442d940205c404f057a54cd7162feb400b1831af3e4e60fd05a637a2f480204428512ca7dd66c02aca22b0006d6d515c06968eb08a3
+DIST haml-5.2.1.tar.gz 129795 BLAKE2B f561d8969fd4b49f1bbbf943c612a5cd3205a1b3a1ef544b4939dec5746d6e04b438f8bf69a320b95455fb15ab5a8d6c4c7ffef0aeec3d0698d46e6ef0d37e34 SHA512 b7a034604346b6e62f7cf13cce5582d53d81644bd4fc3b178b4c1e175fbea2160a562a6a2b539d810288ccfbca2d12099694a314d9df4286aac33ed1e0e22fa5
 EBUILD haml-5.1.2-r1.ebuild 1680 BLAKE2B cb73b65a6f73e3e555a34b4f59800ef7338eb3ef0ac3e40b9b64b6252781b1f715b4bf9ceb2a12fdec6bdbcd5830b2f5efd3b72cc388d8333e1dab180d24e809 SHA512 06ca53ab7ed464657aed8c5b4c09d7357ac47e58f9f38c922d4addf257e3d7e16506244fab6328112f93e8004f675bdee49ea02abe97d894b937e251095e1f19
 EBUILD haml-5.1.2.ebuild 1659 BLAKE2B e9a2581d41907f0b6a587829ce8243e57c9f4582ad09f4e90eeaf02bcddf2704c9f96a0a384a14cefb9b4a1d93979df7a398cf7e69d1bd7e7b9bb42ed9b34aae SHA512 dba0fa00d2eb9b29acdcb2e707132b9a8f23a25e254cce611e04dad239eb8f8f885801cf52212880105f176fa96a0ac7e31337d3c59f2cf38a528855db241d38
+EBUILD haml-5.2.1.ebuild 1674 BLAKE2B b282fa4a7f509f560e41770f3fabc73c0203ee48f82a10ad6673565dc10ad2fb71d750f260e2a98b41fbe00d290059ecbd500fc8628e2bbe443b985223f14ed7 SHA512 24eb0d0616e6de073391615c1ea15261230c7f60da21cd2e8087ca1c90215a0fed91259063d1da09129a3a31020f174f09bb56b4271730327960dae629df1a87
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-5.2.1.ebuild b/dev-ruby/haml/haml-5.2.1.ebuild
new file mode 100644
index 000000000000..9c7af1f851bc
--- /dev/null
+++ b/dev-ruby/haml/haml-5.2.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true RUBYLIB=lib test"
+RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby web page templating engine"
+HOMEPAGE="https://haml.info/"
+SRC_URI="https://github.com/haml/haml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="doc test"
+
+RDEPEND="${RDEPEND} !!<dev-ruby/haml-4.0.7-r2"
+
+ruby_add_rdepend ">=dev-ruby/temple-0.8.0 dev-ruby/tilt:*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/nokogiri
+		dev-ruby/railties:6.0
+		dev-ruby/activemodel:6.0
+		dev-ruby/actionpack:6.0
+	)
+	doc? (
+		dev-ruby/yard
+		>=dev-ruby/maruku-0.7.2-r1
+	)"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
+	sed -i -e '/bundler/I s:^:#:' \
+		-e '/simplecov/I s:^:#:' \
+		-e '1igem "actionpack", "~>6.0.0"'\
+		-e '1igem "activesupport", "~>6.0.0"; gem "activemodel", "~>6.0.0"'\
+		-e '1igem "railties", "~>6.0.0"'\
+		test/test_helper.rb || die
+	# Remove test that fails when RedCloth is available
+	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,/^  end/ s/^/#/"\
+		test/filters_test.rb || die
+}
diff --git a/dev-ruby/launchy/Manifest b/dev-ruby/launchy/Manifest
index a006248d41ff..13c872c8d218 100644
--- a/dev-ruby/launchy/Manifest
+++ b/dev-ruby/launchy/Manifest
@@ -2,5 +2,5 @@ AUX launchy-2.4.2-drop-failing-test.patch 1033 BLAKE2B 77de99bf447ca68eb16bc1030
 DIST launchy-2.4.3.gem 29184 BLAKE2B d6e8e26f37a811fc994ee762791ea9ddb424dc99d23790905f80416734677535aa8b2087eab233dc1535556c240f260c5995185e10642cd682bbe508e3e30654 SHA512 7c3e0377c9a310b2e7a4d1544b4790f6f959d24b6aba91660e979eb943f4bee641e0b5a44687b693ffe99304ceb96a9a6cf9fed142e231af01135bd2b73321d6
 DIST launchy-2.5.0.gem 30208 BLAKE2B 30719f97fdf1bca8a66eb113992c8714103a7fe87262c3677a0fa64b58070593bcbdba7357b81e5bada9e8a143e6601e28ef2d2730f0028fdaecefad23156fd8 SHA512 d80811009155d9cea6a2e69b5f7482aaec7d0bf23ecca4cbe72e440fb4eae1c38bc5904e863998f1966c7a99b98bad1f4456cec1cb076f96f5a99b835448b39f
 EBUILD launchy-2.4.3-r2.ebuild 1098 BLAKE2B 75dd785ed55971e0184afa0128dd38ef722fd3d30cb11ad0d490f370ea39ba0bc2153fc91c91c97ee21a6f19052b0e5ce89b6bb7a44381c2ba1f20325e508a64 SHA512 c954f1f045b0c18e25a204ddaa15e1f6e137b80cf1e0b7db0c91b87ddb5a8bc53aca0f0b919a8f6854520851187535329ffeb6f21544c05f147bad6155808c3a
-EBUILD launchy-2.5.0.ebuild 990 BLAKE2B 019ae492d56b02799d0002c8a4de74939a316a90800dc50e1fe2225a87afa9dd9cf5986caf646e7ac7b520987951c4b65cca4ed475f4af6b0ed9f3a6a4f0e356 SHA512 338e0d6b709920e77f6cec7bdebca5e5804adba7e5cccdfae386e9615ed7308492e54a164742b6186dfaf7d563750f22f56b8f6ed7167018d71116d50cc49796
+EBUILD launchy-2.5.0.ebuild 989 BLAKE2B f774b55182abe23ad9f612075d1891b0d023d086c90cb42874a8816eeb1b9801cbc707c9c4ad7d666ac339a4cbd2fa589d7338cca7c84362388490e9f80fb269 SHA512 ac815e763a77cc91a4f7d2100b234bcd0eb0d4cdef5aa34f90dbba0a6528f9bd26fcf5a9b9e0d17225582e317a7b63e36efe1990573ee918bd153ceb623abf9b
 MISC metadata.xml 339 BLAKE2B 38d4d73836cb52b4a7a2771e032b4c146be4af4d6730de8b81e7a860ef510e7e8071a6e23ca6e67cd5b0df142172544dd6f1ecc1722ce16beb5cf6b64f4b24b8 SHA512 aeef903ca61304d96a205fadb63022e5e44f01f5e5da7d0d9211dc8dfdcfe21a45d1128ca10a4adb0ddcc4eea7bf1f0b0bbf5a6b2cd45978c1fa35fe304740fa
diff --git a/dev-ruby/launchy/launchy-2.5.0.ebuild b/dev-ruby/launchy/launchy-2.5.0.ebuild
index 62ac53250ba4..4ec867d948c5 100644
--- a/dev-ruby/launchy/launchy-2.5.0.ebuild
+++ b/dev-ruby/launchy/launchy-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/copiousfreetime/launchy"
 LICENSE="ISC"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/addressable-2.7"
diff --git a/dev-ruby/liquid-c/Manifest b/dev-ruby/liquid-c/Manifest
index 60298edd96c1..9173f0144e36 100644
--- a/dev-ruby/liquid-c/Manifest
+++ b/dev-ruby/liquid-c/Manifest
@@ -1,4 +1,3 @@
 DIST liquid-c-4.0.0.gem 15872 BLAKE2B 8083ae622da685db2aa557ffff0927a900a51c92227ea2523dcf4c408ff4df6f417cbf7fe019383220c3fe580d53f40d496787d8f7328a1e42c3f17a435eebe6 SHA512 a9f3618a7286c6417e9d22cad8c0716f84f33c43e9b12708711f9c4bdebb94a30e408b3dca99cdfe0a7c5b5e5b39ffa79e978ef6b44e5359975e3d74106932be
 EBUILD liquid-c-4.0.0-r1.ebuild 623 BLAKE2B 922e4803e0c8a5fffdebc21224850557fff29c0f7a1a6b350730a18be21de34c8e29e30c612c1d2962b1638d34050948cb3462ae0858d920a516dc57135d9397 SHA512 1ba9701e82ee75dd227757b94883fa0daa39cf6f6495c6bdffb6b8f5986c84569bb5a741ac4111f183f58ffd4b86fce170fb3204b54b2f416662c403401a3ef4
-EBUILD liquid-c-4.0.0.ebuild 779 BLAKE2B 3530d2fc60d4b5758e4c21b0ae65d8a2d1a9d49e291391d4ff5840c7839e53befdd9e137ab211083532af0d7dbe34d8de71175ba3fcf0fe4dfb7d68437861415 SHA512 f2d5f5266f82dfd5fd966261936b5ec8f91969c05d3c02852694ce41f644f9a453250004bb5a94e0d59712091ff08ea66b5eb45de9dd307ec77cd431069a09ea
 MISC metadata.xml 342 BLAKE2B af634d72b014424082fb52a22cf6ab3d792ec115c9ed1e4acdcd6988202bfce3256abf592c84ef7f795502f40be4fb0bf730ddc0900c703c7d5081290fe09a70 SHA512 443cd881ba1a56967dc7ebbb41fc28e14b33fe44ecc40aa5e5c38d1abb786b15913a07404faccdd41213205171e5caf16cd771478a414d7f3e52dc70c777a0a3
diff --git a/dev-ruby/liquid-c/liquid-c-4.0.0.ebuild b/dev-ruby/liquid-c/liquid-c-4.0.0.ebuild
deleted file mode 100644
index 859ab056980b..000000000000
--- a/dev-ruby/liquid-c/liquid-c-4.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Liquid performance extension in C"
-HOMEPAGE="https://github.com/Shopify/liquid-c"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-MY_PN=${PN/-/_}
-
-ruby_add_rdepend ">=dev-ruby/liquid-3.0.0:*"
-
-all_ruby_prepare() {
-	sed -i -e "s/-Werror//" ext/${MY_PN}/extconf.rb || die
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${MY_PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${MY_PN}
-	cp ext/${MY_PN}/${MY_PN}$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/liquid/Manifest b/dev-ruby/liquid/Manifest
index 06157c6dddac..e958d6407e2f 100644
--- a/dev-ruby/liquid/Manifest
+++ b/dev-ruby/liquid/Manifest
@@ -1,7 +1,5 @@
 DIST liquid-4.0.3.tar.gz 102242 BLAKE2B 4a025fd8501e237f7619ed989e185a6c55a234577c99423857a826b616c40625c1fd205d998a368488306a88c0b84fc3d3ac59bd01c1231055aa9f60a3d14338 SHA512 5aed3b98fa486a00744e0225f7a3b8004be8ded1e3347f9118fd062684fe33b725b84d1f88bdd5e881399e6efa60b4aa32f57cf10f4583aa27ec8c8288b52bf9
-DIST liquid-5.0.0.tar.gz 119166 BLAKE2B 429811adde3aad74c354eb9e129a0cef9c994839881246c9bfd06a9283e65eaa8b7786ff0d6cebdadf7363a9f2f67959b12b57d39bdc4343823116d3e81849de SHA512 77179bfb764a947bc3da0eab2963f951b189414ca01633b3817196d1267f8b098aba8c2ab1ce3129f8ae5a95fa8b39ad60940736a0f89f9ecd1a14b46d7d62b4
 DIST liquid-5.0.1.tar.gz 115523 BLAKE2B 52194481aef296785812a76979ee215e5adffbb73c4dd80de8f8dfb6995757d22a698a6acb950281f69cec32c2c06ba51fe273ba54c7454f308f5547faa9e1cf SHA512 e82fe4b67c338ef2e13652d2c5ba5d52e968c368aff724516a8ed2c157d149441fe73c66be866c0283fbd3472aeb83fec710f77afa1a92dca3206b5c8059ccf4
 EBUILD liquid-4.0.3.ebuild 776 BLAKE2B 8f24660c238c9bd6831bb6e60ee9985ed18a356ef53281064ae2c0f21d0aa00cd7b4dd95126519fbb6cbc40db0330af92f6ac1075bf874cb1b63825f38d67440 SHA512 7cdcaa8ee37c7c600095a678c8eb78536483a6a6fe0f18d2f8bff34b7288f8ef98cd06a8e491644b41f02e728ed1eac4bdd93a258764b349fb4488a050e005a8
-EBUILD liquid-5.0.0.ebuild 814 BLAKE2B 8595d5ac9c0042c60be21d190445d54add9f9f53b3b31ab0a8f91f1812c7076cf235e617cd0bef0ddbc99cef5fc9ce4f44c4cf9639d9f05b84f09740b419b581 SHA512 1f6e347cff859a070dbd79db8e82659943f1ccc790a0bc3429e8fc3f698e0934eebdb379cd34a47b962fec7c05ab050b7b027c01811ecd6b56866ec3ef45741f
 EBUILD liquid-5.0.1.ebuild 821 BLAKE2B 8ff2bd2cd01b6f4347bbb4806a546880745f414cf7cd03cdb4f9e8e4a445331139ebb8aec2538c10b54944b6b0e85f814b73cc9f96b7d1fa1621176dc7a26dd0 SHA512 b454a7780a1a64401dd8b3fdf3f0a865b95c104daac7586ff61bb211d4cf52ea55464d081a219d8ad1ebec9f425bcf7390dd746429b20128ec4be99807c7d2d8
 MISC metadata.xml 340 BLAKE2B d7b2ddfc79a4db0e45aee4759b455288a423c1f2e7364a6184fc49ab939b1ec792cbcb9175b302299217f8dda55253985a03770290e825618fbc490f44facade SHA512 cae45b7e74c0400be7b37f2632f7221e776ec8edab030e6520d1b0109d0448c3d18bf8c9590cae14403acc3f5bb6ca2aa3d29289db3ae8e10915faed16ddd02a
diff --git a/dev-ruby/liquid/liquid-5.0.0.ebuild b/dev-ruby/liquid/liquid-5.0.0.ebuild
deleted file mode 100644
index ae30ed98c39d..000000000000
--- a/dev-ruby/liquid/liquid-5.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Template engine for Ruby"
-HOMEPAGE="https://shopify.github.io/liquid/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# liquid-c is not packaged
-	sed -i -e '/LIQUID_C/ s:^:#:' Rakefile || die
-
-	# Avoid test requiring unpackaged stackprof
-	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/integration/context_test.rb || die
-}
diff --git a/dev-ruby/loquacious/Manifest b/dev-ruby/loquacious/Manifest
index 797e8c058de0..3e7faa2372c0 100644
--- a/dev-ruby/loquacious/Manifest
+++ b/dev-ruby/loquacious/Manifest
@@ -1,4 +1,3 @@
 DIST loquacious-1.9.1.gem 22528 BLAKE2B 5ab28283e40f63a1bacdf6e7ca0c3c9e64527c21bbc7992720b7e2581c156fd449e18e56e10d6cdbe6c4238e129a0b99f5bf1b0487afbd3fc988ba6e9835d37b SHA512 49d176d0229e80a5af69a7cdd24fb2947332faeb70846f28c21249e5297d81246f55eb7f033cc444999267ae727b26f7540f1ec4a542a65af11c3d3ddf7bb129
-EBUILD loquacious-1.9.1-r2.ebuild 662 BLAKE2B 42cb34b69b4f21d705755f1e5c4befd52337e3bff9915e6225469320c8ca088261ea6c09d2743dbb2b396282a7742de3ada75d1e7ad6837542a872070494ba9f SHA512 f345abcca1c9be6fb9567dfff6334c3b9a6ee92c05498e143e9a188e4875a47bb61bc0be0cc29179cc2aef2549f6e6f11b0cd0235965a8c76cb1380a49c84513
 EBUILD loquacious-1.9.1-r3.ebuild 531 BLAKE2B 29fd2a28d437033e3d813f4923964d74be25e86361b44776c103189bdf9231530e9dde66e286d0450a631b42a6f37e052d3f9ad3ddbe0fe79b7b2c0c1e317fe3 SHA512 67bdf578219575e2284cc0f09339ffec99d32fdd912015a7e567bbfd0db1ecd38e23c9cb39b7fba354b07184110863345cc41bdd6972ac09b48b9f158c5969bf
 MISC metadata.xml 340 BLAKE2B 7d541010db79dff55ebd4b1a4a42501ab93b654f0e732830ff7bdefb8b675b45fcda73a8b07699bc9d73e67937f5d168d29d2f9289902b1cf5b5aee72e09f275 SHA512 b68c4a29f683a2a736ebfae1c9e0ba646e80a4384946dc69879494c495b29f4ee0cbbbcfc42f0cc6ec6b8460c773d2ce410748ffb9f1ac81ce8394dd3b61621c
diff --git a/dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild b/dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild
deleted file mode 100644
index 3150989e1cb8..000000000000
--- a/dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Descriptive configuration files for Ruby written in Ruby"
-HOMEPAGE="https://github.com/TwP/loquacious"
-
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc lib || die "Documentation generation failed."
-	fi
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/mab/Manifest b/dev-ruby/mab/Manifest
index bfbc5df453b7..b5411cef683d 100644
--- a/dev-ruby/mab/Manifest
+++ b/dev-ruby/mab/Manifest
@@ -1,4 +1,3 @@
 DIST mab-0.0.3.gem 25088 BLAKE2B 70d250f0fde8a2b7cc8bd50836b8a95b9c0d3e4c738ab2698781c685de508ee58465ce2710ef1fdc63316bfd4db9e16b1951f0d04a9db2a7b9ec0e237bd1c416 SHA512 0761a8de59243356981555ac5000cd98a0413f75bd9eb84848f8efd77be1895a44cf3b90f1182193f90c63a256ebe4a179e8f94a992a30f30ccaf4183b8d4c67
 EBUILD mab-0.0.3-r1.ebuild 541 BLAKE2B 4046369675a31b62a70eb7f6d650cbf6cd848348e6858ef1ae4f43de7308d4d603cd4aa8d0022e81aa1b74daa43545b70e6d99b192ceb35e713d031d9d7d3223 SHA512 ccd2a309a7ab963ae03ca857b3870b6c0a891aefce8fb831af7216381aac1a1295a125b28fff150e67439bd965585466b9fc21317d73ac65f17d002c11851c2a
-EBUILD mab-0.0.3.ebuild 573 BLAKE2B c042d8ec7ea0b0b24fd1749d353e03f778446493bc2c4e5e01a0cd50e03fb0bd4e71901e4589f10b4abc7e6890601e61416e08bca549be4e056f7d87b286d4ae SHA512 35f973d05a03dfebfd064c9000b51e984bbd94a4790525e092979df4d98935c642ae03b4eb05fd64fa5d680c6430109aafb4ec1d44cd838cf8e24c9bf3f51d5b
 MISC metadata.xml 337 BLAKE2B 65d4aea77f54f888fc65d68815c6eba286e79571a6bde73d96cc20cfc220383e2604cbfe2f2ed21c7a95ff029aefff585b5651210632b32e5fa37d27a5adf65b SHA512 41b676005fd23abfa8809dd03a0b3beb994f0831e1b9a9a6afac7d1feb6462f04da0a9ae5a0f3a32d9ede7b8598330d96bada693850355ed1b29ebe64c7a292e
diff --git a/dev-ruby/mab/mab-0.0.3.ebuild b/dev-ruby/mab/mab-0.0.3.ebuild
deleted file mode 100644
index 4379705a46da..000000000000
--- a/dev-ruby/mab/mab-0.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Markup as Ruby"
-HOMEPAGE="https://github.com/camping/mab"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-IUSE="test"
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/minitest-4:0 )"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "minitest", "~> 4.0"' test/helper.rb || die
-}
diff --git a/dev-ruby/method_source/Manifest b/dev-ruby/method_source/Manifest
index c1659bae4b37..e262e3ba4846 100644
--- a/dev-ruby/method_source/Manifest
+++ b/dev-ruby/method_source/Manifest
@@ -1,5 +1,3 @@
-DIST method_source-0.9.2.gem 13824 BLAKE2B 842277a0a38331430c3c6a9f45c01d965de1997d8e9aa291d1948103c9812a23c5e67f3e7b7a2e6ec982de2a5eb841a78f6b8d1633ed17c5b7fa916698737ffb SHA512 87bac1d9ef2f1b09a26358d6d2e7e1035703d1bee9b6689567e8967baa544a456b63b2a1271305979ba077ebae32062708666588500e5810dd9f8e282d444b8c
 DIST method_source-1.0.0.gem 13824 BLAKE2B 1b6b4c23b2e73972acb69bf488f39d88fae3bffdc4e28559d880ce817199b9c1da8183f10cf8be5122535415b938c9f3964c9b4bade1dfba7fb4457c052185dd SHA512 d3a2dace01d987203d0520583120bfe08812237602421efc3ec7ff8054f2403b0aac13f15b8b91dfdb6e6679a519f707ede67ea6fed72cd8242edacc828a9caa
-EBUILD method_source-0.9.2.ebuild 476 BLAKE2B f6a213ef1e29263316b9b3793df3f61d76ad769856626d8d88d89010d3405689da2978dc66a2aa1ae6ac58c57d4b1f4d6cbc5bf46479b182957a81158e2c2cac SHA512 5ac9fa760b314feebcd75be01e06c0913cbd507eb5112bcd403a0226658810767516c8293d2c752a0a8325aa0bf1bc67097e47eac77ec9179780af020bd4e9ab
 EBUILD method_source-1.0.0.ebuild 445 BLAKE2B 0c7613d2cd57c530c66705197e9afbcadcb6c5c05f9b16d329ae950acf4f33a76a96f068854cc9073340a7a6cb0b8274355548b7dccb029feed1b1dabc9d738d SHA512 e8a0c531bec4e2f2dc3cd7a3d43ed598d7a333a2978585796339d1b9c31fe16db65982803fb563bbb967c9829bd6d35d4df0619d2e974726117fa8c92a9552dd
 MISC metadata.xml 348 BLAKE2B 055674d709a654248c63bf20a1867646170cd6b9e2d74cf54b6640ed14b5b0255b2e23986ed068a96412b0c288262fd207d0e267b70f356ee048635732f8a965 SHA512 425721c75e37753f9df91fdc628d1cdad2ab61fb9c49af31405df4070bcf429a703b8696ba5f0a596416f7d7f14ccb4285e39afd15302da6ec753a630d098e88
diff --git a/dev-ruby/method_source/method_source-0.9.2.ebuild b/dev-ruby/method_source/method_source-0.9.2.ebuild
deleted file mode 100644
index 150dcf7328f7..000000000000
--- a/dev-ruby/method_source/method_source-0.9.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retrieve the source code for a method"
-HOMEPAGE="https://github.com/banister/method_source"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-ruby/middleware/Manifest b/dev-ruby/middleware/Manifest
index a005251eb9f8..e5021f17d36b 100644
--- a/dev-ruby/middleware/Manifest
+++ b/dev-ruby/middleware/Manifest
@@ -1,3 +1,3 @@
 DIST middleware-0.1.0.gem 11264 BLAKE2B 27d8db46ef95f30a751c26aade2331285887abf8360a07a99bce02ad1193650edf1d9dab30078ae9a6e56d8e1f3384f7c357d5a01d9a5ed52fedc9d3c4f559d3 SHA512 a485c254accefb915a56a6aaebb0bf5fa8520e5aefb1dca9945f4402fd6fb28cd69b34692d5d276f2f025c6f919d983acba44ef0ad9d8966fc571f7cfd64da12
-EBUILD middleware-0.1.0.ebuild 632 BLAKE2B 37395c73354b5807529a1235684746325ebce6faa9e39c994a7b3eb16be0378414c4ad6b40ecacc0a46cc9db014073682485b7db8782219725bc2005fc8f415c SHA512 930254fae44a8aa3b0fbe5efc1002382bcc4a52c6f6c852a36e43cf998c5db2ea98e7e59780b656d53771a5bb2eb2fb9bdcb9bb3a49371374f2086f5ec7558f7
+EBUILD middleware-0.1.0.ebuild 632 BLAKE2B 19a2e3771c010a047dd112402a519a73b33fcf390e6b034ac330aee8874967ff53dc1116ddfcb08daa7e54530a0ce39ef77b20809f7e53b6fdf6449ae4498a2f SHA512 a27d87b99010eb5bb56778d43eb4a25c06bd2f0af207ef66285c84d96e674c31409c450f23c6383f3a79faeca2e9ac6f934ce06b0e40d4a579e9fe15a707dc72
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/middleware/middleware-0.1.0.ebuild b/dev-ruby/middleware/middleware-0.1.0.ebuild
index 8dd0a3713490..a2f671910072 100644
--- a/dev-ruby/middleware/middleware-0.1.0.ebuild
+++ b/dev-ruby/middleware/middleware-0.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md user_guide.md"
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index 604e6f38e713..054308e467d2 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -1,5 +1,5 @@
 DIST mime-types-2.99.2.gem 149504 BLAKE2B d2088d606b0210a8607d351ce7b7e3b7f25c3d518eaa3cb32ccfbf56a16eea104c908614f315317cece175003261d240f43bbf203619b54da35702abb94be8ce SHA512 46b3add451c3a6879f0f5df5f1e09c41d78d5a5b3872c2fcae7c8b097008cb04a9f5606360af9cc9880d7d659fe2dad19a118e6dfca1774ec3f5a5b852e31720
 DIST mime-types-3.3.1.gem 36352 BLAKE2B 66b97cc51d157d445d05823a3059efb6684a59d6b976945df77beb6497979a83d3ada4832cc36a42b6fad2353d1b5f2d7d1271a7947a0264978f30b857c0c7c3 SHA512 48646c5d3cc1b65ad0418bd765c86102d5dd7d0196f1b2b4b92acd350d6927e0c0fec3d30d04bf8b073d342f56b38663dee791f2c87f82b5743c6508265692ec
 EBUILD mime-types-2.99.2.ebuild 954 BLAKE2B f7b0ef6ce92e3ec23fa286d55e645864ee517a13deda8ad78b94addcbffd61f1ad9887a87ca912882b8e03b3336f08d0e4e4617e50808bad3fad2881f86655f3 SHA512 cff676037784df55c8da8e171d3efbc0c6a16567b1b52f938c45964cf8e7e1ff50cbcc098c90434e0468cb3a82e24c3ecc6612e9125ff86105140a69cf27d147
-EBUILD mime-types-3.3.1.ebuild 877 BLAKE2B 74caebe75eaaf61c08f1aa60a41f543e0cf2018aa40b261d0a5aa3c5dc30fbf4faf9daa8b132aaf3f534590b901daaac25c2f27f8bd82750c33a7d0d0b43a693 SHA512 b9e24113658f8c91d51db093c893e8a55dca01246619f5328a1572d526db70f6cae7a6cf2d6bf5ca723e12d57d379a8d4a706288bbdd04ed4b6bd5c318cd4f17
+EBUILD mime-types-3.3.1.ebuild 877 BLAKE2B 0fffe898532e1d6598e786fe93c873c9a4a6f5d6e705727da063db49e7bae8c0de59c5cd5fd892d9aab572799033233d361f6a19f515a1b3d28e93e6fc7d00ae SHA512 8f7cdafb8266ced32e0defaf7ad436d953419a2c674562717ee1cc534343609052bd0cfc6f44d0ef653427852d66a9ed88d4e77da1d48b856fc53f7de8b20cc7
 MISC metadata.xml 352 BLAKE2B 6edd7bc99a1f3c2522e87695e078800275b4e9301597961b8e9ba3b920f7b75c92c8133860be4642995d2501e9bcc6f8f7cdbf611d85aa8ea23dfeda9353011c SHA512 01ae71ee2d991c0669ce4f9ac252f8edcdbe1df3f2510e5497f9a0fd0bcc1dc10a10259dc1b3dd14b73edd58895911d363b6a60105b619033a2bf09f987f4b5b
diff --git a/dev-ruby/mime-types/mime-types-3.3.1.ebuild b/dev-ruby/mime-types/mime-types-3.3.1.ebuild
index ee3b386124d7..9c3229c8a73d 100644
--- a/dev-ruby/mime-types/mime-types-3.3.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-3.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
 
diff --git a/dev-ruby/minitest-bonus-assertions/Manifest b/dev-ruby/minitest-bonus-assertions/Manifest
index b39d96d5c866..1697f5bb0ecb 100644
--- a/dev-ruby/minitest-bonus-assertions/Manifest
+++ b/dev-ruby/minitest-bonus-assertions/Manifest
@@ -1,3 +1,4 @@
 DIST minitest-bonus-assertions-3.0.gem 13824 BLAKE2B 415f8b48875b8335ded9fc21b5430b575d3d104179066de19aa58d1602da7ff9994c8ceb49b1cf34fd4c8553c76999bf1b638d2c44761af84d510ca1e276cec1 SHA512 8b07e5d3be7cf68be53b06f6b545445efd9021ff5423bb67c4b0e8e40aa004d75f34eef3fc23ebe83bceaaa064c57a5ac1b9969a28f48203a6ae4c34092c5621
+EBUILD minitest-bonus-assertions-3.0-r1.ebuild 1111 BLAKE2B ef3775d53c760e64d0b7c5a1a53c975e772631d409574286c4811c9db12e71f430d81133a0592213dccfaea41d882ee80a8dd794b92d86dfab10e35310a8a145 SHA512 b11600c6913e2129b7273daf05bce2342a385fb9a12af26af2e16a55cc941288227bc9bc390e06265608d22ea7dea323a7bb9d5d92a3b6d7b46224e22cb43e68
 EBUILD minitest-bonus-assertions-3.0.ebuild 846 BLAKE2B dfc1e69788e12e01bddf68bdf1eb141910a44e5138db82f1151856306961b182bbc623ab791fd409c7c4366b214b17d468a249b2857153e13d697456085c7bf8 SHA512 bf0058400ce0d284e62785e80ffb03a352923d0234eb2ddfc15e49a377251fd3314833baa9f09ccadebab4a24ffb557de8a43912bd85d31f71f81fb1af1184dc
 MISC metadata.xml 362 BLAKE2B 95200bd3aaad44ff65f068e52fada9744ce88f2f07fa11c4da2ccd1b02f769255b42dfed8ac92dee531a8c736439cf9806e3ce68153d6197e484178a252a083e SHA512 271ca99c64e529107a901b00168c4b8f2039d7410166b6e2fa75be591bb889d30d693c345161c71b4484d188683328b4656eac3859ec90900fde35c31be14018
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
new file mode 100644
index 000000000000..21e882e70473
--- /dev/null
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Bonus assertions for minitest"
+HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-pretty_diff )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bisect\|focus\|moar\)/ s:^:#:' test/minitest_config.rb || die
+
+	# assert the right value (as specified in the text of the test)
+	# this probably needs more investigation, but this package is only used
+	# by another package from the same author so we'll go with it
+	sed -i -e '140 s/true/false/' -e '216 s/false/true/' test/test_minitest-bonus-assertions.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 28f0adc7fdbe..eeb9ca5633bb 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -5,7 +5,7 @@ DIST minitest-5.14.3.gem 84992 BLAKE2B baad3e8198bcee1b2748f81a7ea822785423c2bfb
 DIST minitest-5.14.4.gem 86016 BLAKE2B 1f7b8c72b41e1f4e47852021dd99df411a427ac8bbe564a2b86edbb727a4976030176331442a3a44f734347cc42f80444f8d3937e561f0063ec6bb3132d4c402 SHA512 f967a11cfce82e167879905082859273b270e8d8e663a0c1c553964a345fb8564547627b8cf97418ac5bda544bb76c1385438ad74ec8e846666dc2952d55c9e9
 EBUILD minitest-4.7.5-r2.ebuild 856 BLAKE2B 037aea7db96dd5a1527932f4ecd421ba48d039124492e2db19e11b09b5402cfe080555733097f5bedb1c1e6742af47e2b200f6174efabcf9296a85ce4f97da5b SHA512 6b6aa378b9321e4b4d8899ae1483630f10eb1fa5b433c7a7571d9c78f8c87e461296e0f058cc359d19df0b3e6b01a142a40c620ec7a682ba8f188709f2588bd9
 EBUILD minitest-5.11.3.ebuild 752 BLAKE2B 48915acc329f6639fc20abef18e420a51d3d76087e642cc8a58c55caf5a5f134d7690ecc60702890f598dc51eb8208092d179c2f2d1934e1231e8d1f1789a17a SHA512 7b44b8c01f1327d50acb399260575cac827ebfa3ddd463b582fafdd8197957d1225f9ca3a00355bf94b3930f0d10a95ece0f9747857cb011ae55a34f9f8c5c72
-EBUILD minitest-5.13.0.ebuild 726 BLAKE2B ad28e754b102a4cfbbf71139d948fcf7100edd6f9b29088ecf70d09b4787cd4418d4aeb5b483bda03cb9f8fc7fc9dd9d2259c1fd44a388afe4268020d0c44a8d SHA512 d6fe52d001458bc730239df23445b7dfa644caa995711bce013ed7d58481099eb02540a1000971fbdeaa9f2d3ca937f83ef72da4598d79e169db6f9b742e63ec
+EBUILD minitest-5.13.0.ebuild 722 BLAKE2B a3b9099d4311141eee35672a80e7a6f404b8c0b8fcee6cc9cf7aac4c71a01430bf8ffa7e36401d2a1c29ffebe6439b5257b88bd912dfc811cd314229511d6fc8 SHA512 9539c436c2ae5a3402329417ef6c9ba2079fa1d0d6631baf4fe36d71bd49ab52dbebde080847a2e142a2d22b7cc5342a39b65ec865f5c243fe5fd7fb8fda5f45
 EBUILD minitest-5.14.3.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 EBUILD minitest-5.14.4.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-5.13.0.ebuild b/dev-ruby/minitest/minitest-5.13.0.ebuild
index 440f6cd7e414..615f66eab20c 100644
--- a/dev-ruby/minitest/minitest-5.13.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.13.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 each_ruby_test() {
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 04ad0eb4095b..4a65148cad59 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,5 +1,5 @@
 DIST multi_json-1.14.1.tar.gz 24713 BLAKE2B 188d0fa3bf7a46a6cf4a5aa1d613523b4da3dee5061a5288146d1a367835b255f103dec265da9a218dd6dd21ecb38a7ce35d16a758ac7754b440f52c25f0b703 SHA512 19e2b6704a8ed39b8714da449c8961e740198772718ddba3d3b651f71f2b7d8c2c198d9cc16fe290f1df7b1e54d029c01147fdc431a8d2763944a4de802b89d9
 DIST multi_json-1.15.0.tar.gz 24932 BLAKE2B c99c5c6b152c91dedc38fd24f8697f918064c603bfd72c55213f3ac8afd14d3c0ba31b7c3fb91c9998fcc8a5386f41a6983c53b40119558b99194ba58c06cc91 SHA512 55c873e45cdc59e75823aa031eb6d792cb9dc744b13a682fc279a8375b925db7a984256d61aa5454795a59722794a774a0ed5b6bf518db253152f4af67f46dea
 EBUILD multi_json-1.14.1.ebuild 1957 BLAKE2B ca00098daf555e2ea8cd6096cf3d7b55b59130e52193abc53b794e04117b6d37daa47a482a958c42d752cb957664488519cb08555c6c8c70574402d0e7dfe0ad SHA512 007407b9978ed0dbf794698217b037c72c336082aa08b031dd7d03566e26ef6a2af63f4549c71672cdb72ed9d0d1626c20bf56309a9b26e0fd86582c19eb06a1
-EBUILD multi_json-1.15.0.ebuild 1957 BLAKE2B 364d94f09dd7909e05afab5df5beb4b0e3f60844dde573e9f62ff5f49f306a76964ae3ffe49a27c9cc3dbddabfb1d0f6542ecc77f119e205bb40962fcf74e19a SHA512 7570dcc3ff8c43651794f537df6aff23151e4b02f47123b0e580a726715cd47cf5b3ad2d3ee457be5f4039f8889fcc4d2c4c33e2e04864115849421dfa78ffbd
+EBUILD multi_json-1.15.0.ebuild 1964 BLAKE2B 1207a817bca9e2d938e76603069c2f30cc1e1f8512d83d8fe23a175b0d3cd0c976b03dd063bc0999d1e74286748ef628493007aca5205c0dd4f859cb113f7b25 SHA512 ec2e0321be2706a4802d742bfa96666e37760258bc0b0356b7af9b60263d6e3284f4974df62cc5c0b0b731d9fec31009fa2de678386f6c47e0caf138c464eb76
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.15.0.ebuild b/dev-ruby/multi_json/multi_json-1.15.0.ebuild
index 405e6f5ef364..9f6bd841dac7 100644
--- a/dev-ruby/multi_json/multi_json-1.15.0.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="yard"
diff --git a/dev-ruby/multi_test/Manifest b/dev-ruby/multi_test/Manifest
index bdd8ed7a0f45..7ec3bf72707c 100644
--- a/dev-ruby/multi_test/Manifest
+++ b/dev-ruby/multi_test/Manifest
@@ -1,3 +1,4 @@
 DIST multi_test-0.1.2.gem 9216 BLAKE2B 9a5888937c82f87822445855eb15406b4250b3b42f00116a2c54360ab35b923d08c4015d90b14003679aac5d674baec8756b74aae4a5246beeefbae262edcc1f SHA512 a0d59f51dc959b7febe9c32853b5ac5cbbb3215e8810de5e46fe10fa42931c1ea89df477155cc8124264d608c5928e54fd4e1949e7d0940f927e1430bfd60a2b
+EBUILD multi_test-0.1.2-r1.ebuild 520 BLAKE2B 2b468d87e40dc3072769c0cf111ca60cf25e9623489cc1bd4a32ff9775a217f54a9d69d5d838f07146c5e86667b14baa4c63de2132e6d568a516b0213a95a7b8 SHA512 66dbcc90dd5a64772016d81494dfda968a6ed4c8313a971204e9257290a5492657fc30ec2d9f7007d78d22cf5ab820fb99f3ad0cbd2bd0116b1a9d92ef92e507
 EBUILD multi_test-0.1.2.ebuild 550 BLAKE2B c580624a7e4be8674657f047a408847d4129f8dbd570bf836636ff347071aaf56c9bb34c74419e57c2c8ec202fda6c5adf5f1ae869623e64b4f118263c5a39a3 SHA512 d195dbe2ed2e4201a594f97b74dd1ad00fe8f5d2b1ed65a3623bdc687965fb9984a19fb7cf176e0f6052523570a801f0157f66948a3048c4305e15117650075d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild b/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..3c4074d80be4
--- /dev/null
+++ b/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A uniform interface for Ruby testing libraries"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+# Tests depend on specific versions of testing frameworks where bundler
+# downloads dependencies.
+RESTRICT="test"
diff --git a/dev-ruby/nanotest/Manifest b/dev-ruby/nanotest/Manifest
index a4a4197e43e6..2a20569c6d70 100644
--- a/dev-ruby/nanotest/Manifest
+++ b/dev-ruby/nanotest/Manifest
@@ -1,3 +1,4 @@
 DIST nanotest-0.9.4.1.gem 7680 BLAKE2B d6353949241c85df6286728938c017881763c332fe7deebfe641cf2ca85e65d9934ea4567494afd775d54171e5ebc86558ff1c376d6519fb9ff0f6d5addc1bfa SHA512 0ef48c747130fadb5f11818e131780b05032d57102a142293e29f135f75c1dd57c75005479880974342c257c645b3d2a4489432049683e3421743fa3e252cc09
+EBUILD nanotest-0.9.4.1-r1.ebuild 455 BLAKE2B ea20def2a3f89cd4b8510c06af5fc93c8b3ffadeea60b19edb08621904619cc61a4234f438c358f5bd448f7d75a81af27febbc0d27d6dda88b2649dbe9a1b605 SHA512 603188ccccf1789deea6b3a2c88d39f30ec096a11146ad00235c95dd150d5f32f5e20b15d12ac5ae5eedfc0c84321f4ba8e73ea1278c1ea1a8871e9955ecc4a0
 EBUILD nanotest-0.9.4.1.ebuild 486 BLAKE2B eddf679d269316f5eb8f2d3cdc866194cdde5b89035a9de238c9ecfb21f99d4fa70df3c78f4f862255fd5376ef583b938f45a75f39339e2c297b757a6ec00f27 SHA512 d8a7a0cf2d7a985085f850c273a893d387a8c1442bcef39c77c114752ff4103b42058ab025198ec0d890b81a02711073ff3e1e2f19d577e0dcbaa600c25d6da9
 MISC metadata.xml 341 BLAKE2B e0a1896a9c6b6c9e1dbe1824237ab79ff59ef337a6c38ea9a37d3244fa69dd58a6b32456eded92cc73ab769b15402c6cc3fc557db5133ee44cf5b9bb666d882e SHA512 9211350efb92ba99f2db802a2507abb8ea5995b6ad8734c5dc7df8f3d2e8a96ed7ac970c68948946ee69ae3821ce39db987feb3dffdb37e54a10d9311d9b93c5
diff --git a/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild b/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
new file mode 100644
index 000000000000..b9be42e26654
--- /dev/null
+++ b/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extremely mynymal test framework"
+HOMEPAGE="https://github.com/mynyml/nanotest"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_test() {
+	${RUBY} -I.:lib test/test_nanotest.rb || die
+}
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index 9852a3111eb9..83408b161d71 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1,5 +1,5 @@
 DIST patron-0.13.1.gem 64512 BLAKE2B 14f691cb0fd1c863a1ef634ba8aee94751095138e940f13bf09860e9e0061872fe14fa33416f59f82d4adc53963721d653936a3f058b27654ea7593d6068d0b7 SHA512 7b082ff7442c2635c38b37132cd61f6cd18d4792d41cbf3bed1201fb7371b75bb628a295f4e3dd173c23e086d3c1f54f0217df3f7d1a30c1031fcca86269e1e7
 DIST patron-0.13.3.gem 65024 BLAKE2B 87aa69aab49978d14a80ed9e09d74d7853da3512875cc3aecd3f387d1523b85c84625b57a5826e5f5f999cec4feaae58c1aaae96582144a5c9dc537c9d5a4224 SHA512 afbbbd9570e338a5d1b97b4ebeda76ac95a22c29d908629723d345a47400183c2ccee67ebcaf5b6f9ecb032eb3b847e70ec9eebff75b33045a3665c215abfbd0
 EBUILD patron-0.13.1-r1.ebuild 1239 BLAKE2B 613bcfaf54076838f6a7d291844e45dcfac06b734f541fbe997bc035e24704ea87078336f5347e97fce5ce372bff059bdf3d8f166172accf93abea87b466fdfa SHA512 12dd83689bd12377f3a7c985be9d10a44eaa08f5cef2425cf747551e8312165f40a3c619a1e3c0edfb3bd8fae46db711ee06a6924a38b9ff777de75f0d49b171
-EBUILD patron-0.13.3.ebuild 1255 BLAKE2B 54f0f577fccaab0a4d488f5f394e59ab036eca9a30d387d1c6754f18ca07ff9928e7c631732a800b2384213695fecbc02f7f570fb6dea918092344453617c490 SHA512 2d1a6722f3e9382e440f9630f304a77e07efc67779b977075ad78a34e365c02d03b04aa92419b89d4c2f7d3705b20d3444b2471735c7eeada96ef0e5ade130ad
+EBUILD patron-0.13.3-r1.ebuild 1080 BLAKE2B 585993a678221d13e90cfe26a67d60b590481caa89626cb5e30205fa2fd5423a3ec7f26af0229c38ec9aa88886517b6216eb2a649f3f5da4ac56b8fd58a9bf48 SHA512 f452088be24c7fbb29f020a0074ad6e46a012f2173772c72ddc52aca389b036c016fa5e3a57bd85af2387a1e1863ca296bb0055582f17945fd7fd58db70aa913
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/patron/patron-0.13.3-r1.ebuild b/dev-ruby/patron/patron-0.13.3-r1.ebuild
new file mode 100644
index 000000000000..08c165ff73fb
--- /dev/null
+++ b/dev-ruby/patron/patron-0.13.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/patron/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_DIR="lib/patron"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
+HOMEPAGE="https://toland.github.com/patron/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND+=" net-misc/curl"
+RDEPEND+=" net-misc/curl"
+
+ruby_add_bdepend "test? ( dev-ruby/rack www-servers/puma )"
+
+all_ruby_prepare() {
+	# Fix Rakefile
+	sed -i -e 's:rake/rdoctask:rdoc/task:' \
+		-e 's/README.txt/README.md/' \
+		-e '/bundler/I s:^:#:' \
+		-e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^end/ s:^:#:' \
+		Rakefile || die
+
+	# Avoid specs with failures. We were not running any specs before.
+	rm spec/session_ssl_spec.rb spec/session_spec.rb spec/response_spec.rb || die
+}
diff --git a/dev-ruby/patron/patron-0.13.3.ebuild b/dev-ruby/patron/patron-0.13.3.ebuild
deleted file mode 100644
index cb42adae716b..000000000000
--- a/dev-ruby/patron/patron-0.13.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
-HOMEPAGE="https://toland.github.com/patron/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND+=" net-misc/curl"
-RDEPEND+=" net-misc/curl"
-
-ruby_add_bdepend "test? ( dev-ruby/rack www-servers/puma )"
-
-all_ruby_prepare() {
-	# Fix Rakefile
-	sed -i -e 's:rake/rdoctask:rdoc/task:' \
-		-e 's/README.txt/README.md/' \
-		-e '/bundler/I s:^:#:' \
-		-e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/^end/ s:^:#:' \
-		Rakefile || die
-
-	# Avoid specs with failures. We were not running any specs before.
-	rm spec/session_ssl_spec.rb spec/session_spec.rb spec/response_spec.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/patron extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/patron V=1
-	cp ext/patron/session_ext$(get_modname) lib/patron/ || die "Unable to cp shared object file"
-}
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 166f96bfb40a..9746ca320693 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -3,7 +3,7 @@ DIST power_assert-1.1.7.tar.gz 17361 BLAKE2B 54fe379af9231a1794534f0199bb587418e
 DIST power_assert-1.2.0.tar.gz 17358 BLAKE2B 8b75b34f5d80f8f52370816b916e3bc3a60493b8f52a910346c51c70770e0645566b8b7c3dd551d8bb1f1cbdac5dfcebe043457bd025d819e3782e75e41e0f16 SHA512 2f001f6223fc3fb586c7b0457f775379040e11eb83b5bdda51c02b2b24e531aecd6e12e6ec80bf9407a768ab1a10b0a6b4c8f1a92ca69ea702faf56202bb635c
 DIST power_assert-2.0.0.tar.gz 16994 BLAKE2B 5106e77566100274000c55af1bd2ff9aaf00185ed1821ac966587461919210d7460e30aefdb5a880e7ef59e4f536121371d0862df2af91cb274ed79ded8c9771 SHA512 e6faf3cf50d2c70ae421bae20b885ac858fe11b10b1a8562d9ca88afbd397fa4812631f2aa02638c273eed518091dfaa020b6c002c0559383ddca625404bcc1c
 EBUILD power_assert-1.1.5.ebuild 1412 BLAKE2B bfcc18a05ad28ce098e70a7d936b336630a1135cf781e36c8d533502cf1e55610b579c32b52354736d8de18a583a3d29cf0efb397764d74bf1ad8094230a6259 SHA512 c2fe441390ca188dcc1be729f558e8ceba61d4b2f2d820e2f29b06d55d72abedc293d839c782aab017231d692047cffe0a0924256efdd9b7bc41fc1d9ee88972
-EBUILD power_assert-1.1.7.ebuild 1418 BLAKE2B 77c23bf247b72b0986119e86dd6e2fd2092a2864b999fe867b8fa5b239ee4b7a830efce689e511e248f2d0fcf4c124f9f925f3b4096e48d05a2fa2c4a24952ed SHA512 679d0a0ec9657b18f9f9c6a0a97b4b31d137230ea56b183ba11efd657e6e82dbeb60b2140b4d9542e66000288c11134f9400d3cc9fee665e7fa67ff785ffa76f
+EBUILD power_assert-1.1.7.ebuild 1414 BLAKE2B 9ab68f3657d538615b19676ba1680c51f788ed93896350fcbb5838a48856b6a072ceeda9aa82df00f2ca1ec02feb695042efa1951210bce5d37290d86e3573b7 SHA512 1a06eea79172c3615fb1f968fa976a804831bdda55fcaae94a4c2d842ea74d8d1238987646ba868a89540b5ca7fe398d60146e55a8e7ce49eb4feb3e0ce18ea7
 EBUILD power_assert-1.2.0.ebuild 1418 BLAKE2B 718d355df9a75002823eb6ef8ae10dc4ddff649c314be77db00252a34a7f5daf95a5979195f2fc3e8d7b28ff3af86ce4bf9b2e5d5faf2484ce3eec325a7843fa SHA512 fb221535b77d9e84daf56cfbbbbe5bc9d05d0ca93c68d2d9bc6b2a09023f7eed2df7cce5221c5c9f50b687f97d29b78f079b5ace1cbe17ada16b6bf8507362f5
 EBUILD power_assert-2.0.0.ebuild 1416 BLAKE2B 5542aee8023b5e64fc666b509d767945d13683c5bc439b5abef0950310c7d87b686c6e5fe48f79c473662c9a83eed9552206e513e4fee3075c172885a259f4fe SHA512 720bc07e6c6dd0aaa5441eb68ddc4afd66c1c5a2bcbea1715955473f3dfde554f739aff9fd2222cc3da3107fd463ec0282fc5ad4924d8fe14bd7feeb9f73a1d5
 MISC metadata.xml 343 BLAKE2B 207ac229bb41b7ab904b4d6e69ac07d36375964057ec90c69cc6d0be5dd90a5bf27b995b5daaa1802246aa7342db9bc904c1ee872b7b2faaa495318ab030537c SHA512 2c8420b8b06271c1bedadef4e94842e6fb80d49eae669f6ae62678c769a7b3af29af42dbb4660c6bd328b54a522902c5bad49e81fe0fe47d2bd3c1d9f89a7d4c
diff --git a/dev-ruby/power_assert/power_assert-1.1.7.ebuild b/dev-ruby/power_assert/power_assert-1.1.7.ebuild
index f3f3762ceae9..1b3b76a7dd1e 100644
--- a/dev-ruby/power_assert/power_assert-1.1.7.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
 SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( Ruby BSD-2 )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 71c3d7091969..9dc7c5e7c4f6 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,3 +1,3 @@
 DIST rack-2.2.3.tar.gz 278045 BLAKE2B 2182ab6ee2ca0e40bd131dc96cf15d7e1015570a0702c2419e50da9eae6afedc0f1543a2fdc1fb32022a65788ab486b7add688c8bf201ad46a3d101b6e625a8b SHA512 0daefd1fd7d1c83a5aaf0e8a3c0d734f805f6718c3f2d20673e78242f10fa99c24f8e8d480cb7f0ee299d96a4b691e4a19c967785de946dc863e9b78e0c3ac53
-EBUILD rack-2.2.3.ebuild 1497 BLAKE2B 1f6b9f2269300f3cb3964a03dbf9fca2b6513ce9a986a331a55924539d7b88d08b2a447088644a231598818df3a2c141249001e90ce4c3dc9dc5192fc8b021e5 SHA512 0a23e194f60820cd42f1dd57d3932ebb3da358fba0b8874a0e5e42a56bbbcd2d3136fe1b89daf62c0b0c91f90aa7c217aa2d33d7c4fc5393256bba265a00f54d
+EBUILD rack-2.2.3.ebuild 1501 BLAKE2B 48d15fce358233791b84eb7362d09144ad798d3c0d3c02131cf7715a8c87c8b2950f154a86b38637da1ea46cd35e4c352aec3e98d526bbbfa41d010ca073290b SHA512 404e4ccab6b31ab8360d975c49f3b7a1dafce05478ce4038971e4b312a1eecee6f5c08e31d668de6c14ee3e24c5f5ed8547ba3285ecf00fd8de2207912ba4278
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-2.2.3.ebuild b/dev-ruby/rack/rack-2.2.3.ebuild
index ae17712cf6c2..fb491147e693 100644
--- a/dev-ruby/rack/rack-2.2.3.ebuild
+++ b/dev-ruby/rack/rack-2.2.3.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/"
+HOMEPAGE="https://github.com/rack/rack"
 SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 2715f02b4443..a5046d6f2658 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -4,7 +4,7 @@ DIST rake-13.0.3.tar.gz 122825 BLAKE2B a36cc6d8e5f560bc502455a756b89d763899e71b7
 DIST rake-13.0.4.tar.gz 123399 BLAKE2B f91079b3e22f0b1e09857ac5f549ad1cd4372ccbd2bc152e1ed57241ebf05e8605992008a6f7e4f172f7a0fd77450092b9d03e7026e3cbba25c52731d4aaeb57 SHA512 78533cc966cf285ba5556645cc674affb41baa3076e873055491c5700c6b2301b2da8ec212f260a44d2fe83003bf84b12cd2b81775fc354c89e3fcd346030bb9
 DIST rake-13.0.6.tar.gz 123485 BLAKE2B 39c99b9d125ba7519bd8eaadac85646e785cc01fafad549becea5b2801f14d74085365743f1c5eb1126d0ae32b19ebcde636badc06670a0ad0dba419082e691f SHA512 1b438be96d8cedaf70e961b0bbd2217692b0b5537b2e1d5f599158e7da3e300cf6ab0c5f0c52fea89be0beb675effbbf563d24e55c84fb673b4982013355e03c
 EBUILD rake-12.3.3.ebuild 1263 BLAKE2B a866e416a95844a8769325352c83f439e6cd9eb72ea586ea62881203fe99b4e4b6a81553e32f3396321907a2595f789782440ac96bc87196f1ed4d32215a6cc5 SHA512 9bf0bbe94d8098e3bceb3a29f67b1779d089c81a4f0b0d978460d8c44792484c3217c62ed8d5c48ee96745d59e68221d0bd91f02253cb748187158dda722f0ff
-EBUILD rake-13.0.3-r1.ebuild 1453 BLAKE2B af9b2a7e9e26404d50a444d00f82298d204f4afaec07fa9fc8720340208718fad1615510c5d28da11067916a63f87565bd280e02f80469d30a777e29d3358ee0 SHA512 4a71a4fef8d421a67409fb10acc7691d57516c756c15b874a3bbe66634abe94ccbcdd9d250161e6b6c91624dfafcb7573a673215ac5465ee24fe55ae5909700a
+EBUILD rake-13.0.3-r1.ebuild 1449 BLAKE2B 85c2bf25d97ad075d5c394bf1604a83b98b51814fd3d5913665b980d65f4fbdf720d51cb48912d4e317d3c0c193f09ef27f09656462d3e2f3a33cc2560b45f51 SHA512 57c55d44d2037dc6dd498656628b156d9bc9e7a0d8bcac41a6f098896510904cc0b1ff25ab7d116beed25e914c90177888187468bc94437bddb902f6ca617ede
 EBUILD rake-13.0.3.ebuild 1447 BLAKE2B 20142be6848ce363e150b6d3b36611e99077794de5ee4ac7e22667e70245252ea5ae2c44243f1146405971ef31fbc74ae119e22e006e89e1d1c4bee894565db5 SHA512 7e6d6b6e16de8ebfab69c887d65751aff7c5902a3975bd99882ee060a0697391c58edd1c073d799aeec8fe0481d6e19bbad70b2116bb1ca67e6bc27e30a60158
 EBUILD rake-13.0.4.ebuild 1488 BLAKE2B 81506dd9027bf056da28aa18840319ce3502057ae76552bb5ab465929c9d9c7da0da84ef1f4fe61e22069667dbfda47a9081b370573f3d7ed9351cc8558234f8 SHA512 45f5cffd067f5c2b4d6429dfa18e17fa4ee9a10459260c9780f31eb66c8960fdc6c0655ebcb443959e9aed21cfea9dd7d73c3a5b2dd2e94e64d8a228338a0c97
 EBUILD rake-13.0.6.ebuild 1488 BLAKE2B 81506dd9027bf056da28aa18840319ce3502057ae76552bb5ab465929c9d9c7da0da84ef1f4fe61e22069667dbfda47a9081b370573f3d7ed9351cc8558234f8 SHA512 45f5cffd067f5c2b4d6429dfa18e17fa4ee9a10459260c9780f31eb66c8960fdc6c0655ebcb443959e9aed21cfea9dd7d73c3a5b2dd2e94e64d8a228338a0c97
diff --git a/dev-ruby/rake/rake-13.0.3-r1.ebuild b/dev-ruby/rake/rake-13.0.3-r1.ebuild
index 9c417b6ea5ad..080ae9f22d0b 100644
--- a/dev-ruby/rake/rake-13.0.3-r1.ebuild
+++ b/dev-ruby/rake/rake-13.0.3-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index e7d5fbc35df3..249157db7e55 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,5 +1,5 @@
 DIST rdoc-6.1.2.tar.gz 667607 BLAKE2B 4857bcf5f72d93fe4e9ea89acfda9ae82afd61a7ff501d2eea529330d2b8a63d7cc775490648fcff5000ee60417123244518f56a31593af8efccae8f925b21d9 SHA512 a54e36adf9f98117f0b5ae4490a0ab1ce12d9b1de5b7c61ffa326b36ef13885bb8f18147f3548f95a285b15470faba14965bc87088fa3ce584928d8ee396689f
 DIST rdoc-6.3.2.tar.gz 675963 BLAKE2B 1ac931ddf0af700f2460e415a6e8c505c9a3c0f2d65b5c25928285144181d925747dad0224f014abdc1680df9130df74ba82750a2cb1d02b042c0bcd63d22e6a SHA512 1bd8eaa6c1e5cc40492b1d6e461d831cfc05bf368c982f3266b63ea4984c10de40523f9e2106b1beebd96933a2006cb81c3daa26ee0196d99d1ed6da5b72a78f
 EBUILD rdoc-6.1.2.ebuild 2636 BLAKE2B b7e269de9371299b8c7580e928e48f250a417120553d1f3520ec0a6e590d3bd55679e0fbbaa2a7e9de2890ed7c4bd7e58b70ceaffb4df5daea47e255b5feb4b9 SHA512 8ba41314f28de3f789fc4f527092ea2d97115b198a99ff1c38edb6ab6b2ca62ad3f0b71cd435335fd7589481d90e2c2fc133d72b096a91ac0bc15b2d52d3c15b
-EBUILD rdoc-6.3.2.ebuild 2733 BLAKE2B 8cfd539a6832ae050cd4562d27ca25e4ae93a01fba046a72a9b067c0cc93d7e18e718c51719e01634dc496e3ee2355d1222c38e01fe5d3db2a2ad8642ac37a58 SHA512 f745058b6def46b4fc3323351af3f97fc3c0a64c8e788e72226b4d3fbffaaafa091c1f693453cc16570261f84ef0e425b1798e90bd733d1c62f95779864a4dec
+EBUILD rdoc-6.3.2.ebuild 2729 BLAKE2B 30f2f991e8bcf192aa431b491e78b4ab818046ecef646b87882fd828fae43b8126abeee6572b2bb63edef4295feca35360b51a16b6ee7545f19322f82e604479 SHA512 422a59699e874e6083255123d2ae6a230b800a50bb14562e968feb0169735631023299e5d15d8e49d7952a0726ba6a3e884d70564691edf874a6f25b29000c73
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-6.3.2.ebuild b/dev-ruby/rdoc/rdoc-6.3.2.ebuild
index 6102971b616a..94a5b480ad32 100644
--- a/dev-ruby/rdoc/rdoc-6.3.2.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.3.2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 5030d10f7e58..c137fa639151 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -5,5 +5,5 @@ DIST rmagick-4.2.2.tar.gz 1984143 BLAKE2B 8b8119a0002c48f3a289f72d4bbea6ac86cbec
 EBUILD rmagick-3.2.0.ebuild 1571 BLAKE2B 64042d8dca87fbb45cbbda5027238f514e3b318e8411bbc5533d69c1f363a29929059a3ece5feaae36addc9e2da64ea18329315a6b9dd2ccf3fc2c4d1b8818dd SHA512 bae5e087c94971cb2e5c5b1e60e72fbbfde68e134166d1ecd8b2f75deb61d2adcba6a43bc345f8395cc699c798e68ebc5b6d9402fc18ba9a4ba768de7551a5e7
 EBUILD rmagick-4.1.1.ebuild 1800 BLAKE2B eac789a51637261d6f46e3a04fffd3cb44cbc1a9d047c52720e2567905947ef91e23c381191134350c73f7684bc79615d064b54df1c219ca12f23fc5c0531da0 SHA512 5414a49a468403137b17f313b4d5823b4c69b7af2a13c048371aeea15578854c23e705834d771c9d0948467d70a585f025586079bcb60c5f953e8eb139ec582c
 EBUILD rmagick-4.1.2.ebuild 1815 BLAKE2B 28b551d3619913b9a89e3b3185f19959d82ad4f1536befbded1c96afed760aed4c52b9095fcfad8d7a2c2e73dc54246211358fcff459d9096996c8b04cdb65bb SHA512 8d3eb2320c6f37bc65dfdbbf2b19498132e85024544728ed0a9915db12a950bf21505bed98d6f75488e13dcfd0bcb9e42563bf0fe7e5bfff5b431f08f35b06d8
-EBUILD rmagick-4.2.2.ebuild 1841 BLAKE2B 512fb197aa4b20fde46b673279909f0bd5d37d317c7ef6703cd2718862ff7a0e78539c8c4fbdda844330d0518d1fd28595834ae286e0316fa595a681ab837283 SHA512 23109024feea6353232b9b3a0b4e5e964071d0bf81b7f4e045cd4f80978bbbd08d6bffcb04d90d25cb56f003c70682a6cbe5055917fc5821228f53dddbeaf511
+EBUILD rmagick-4.2.2.ebuild 1848 BLAKE2B da2ae7c6045f67c2c40359cdf747e11fb5952a49dbbd1db4daaaebbbf950b69a235a76b4d6d375124fcac8859c83201048b160c64fed9aa0f7b2577b815222b5 SHA512 1960e449264a4a01412b749cb6bbb00c2a331286bccb52624163ba7076c98ac3cf1c3d11ce928095f1aee8fb4a5f898931d565cf932719ce3da6af7bcc5c47a7
 MISC metadata.xml 341 BLAKE2B 537583fa385971de2e8ae510c7d32f11bf7644b3aac908b482833d26a2d92060255c2f15afd229c6c50207e969cbd5857705850440949788a6fac7329f26c757 SHA512 84bb956a38056526fd173c3f4aa972ea121712c15111a35e19e1f27b0cc797ebda4550ada88a46de7e66e058a66bb92d2e715d646068779843133a66d7523683
diff --git a/dev-ruby/rmagick/rmagick-4.2.2.ebuild b/dev-ruby/rmagick/rmagick-4.2.2.ebuild
index e5842e91c1cc..a5f3be5f88db 100644
--- a/dev-ruby/rmagick/rmagick-4.2.2.ebuild
+++ b/dev-ruby/rmagick/rmagick-4.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index a9399b2eab83..5173cc8e45d8 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -2,6 +2,6 @@ DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab6
 DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f71de3b04376dfbfc9c831ce075b4105f6a23a210f8508784b66c46f1126c188a3bd0548cc4f24060373b9c7e0b79101 SHA512 2d134e742e36cfaac0a52fa7ebd949391cfe58419956536a65fa3aefa2c7f3638fe19f7324ca3e0d2642cc5a9d33de11b09bd571844f1cfae9c077e5f27563d5
 DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
 EBUILD rspec-core-2.99.2-r2.ebuild 5100 BLAKE2B 44d2904b5aa3f222fad677c0ac53a5f46602e2fc5505b57f1e4b0d8c68bf8222b506d9cf0c1403a4e05292fbbba6eb658cec5727e48e4c79b6bb4af338d8d370 SHA512 6feaa484ecc73472c5f5909b82d9570fcd617c5eecd08e70037fc96f1695fb801f21baa12dc4224c79f54f615a0afb0b53c06d7758e215e08c2c34f034a7367b
-EBUILD rspec-core-3.10.1.ebuild 3128 BLAKE2B 9b96bc3dafe2a87b1c04cc54d76f46b9d54bfd3ede372576474a242bdc61df3403492e1a34b874ba8c25395b8605c87cdb76542a6c04c783c764c5cc9024126c SHA512 e0c0507300c4b79cc089b27ddc25964017cd487b533b83178b5e5989e2f258005e762c2a89c49d1222d3133c6a9deec27dd6ddb322435523389d1c026f7fb882
+EBUILD rspec-core-3.10.1.ebuild 3125 BLAKE2B 5ac35a42af2becc7e67ad6d6ce8ca021e01b8e5a468679cc902a3adf96f62ca68e251c6f856f7497e3745e52ecd9269f11443af45c9bd0f45efab4f732e9d0de SHA512 38823ba7b97764a20681b3d4d5bea66dd12c6a196e50a85141efa6ed4f77b222b094fc7364818868f1430d5f133a498c45be94b4f1685c031b8fd65525013403
 EBUILD rspec-core-3.9.3.ebuild 3122 BLAKE2B c8dcd45114eeb2f4acf1aea3934f9daa173ff57899cb234586f7e720508953d960bbc5d8bee29695140f4177660f0ab4081639a5b274d747b7b0f6b4a7530053 SHA512 6050a529b3c922a832403288731ac2b4ded5719693d735e5e6650c62b3a7a8a22a3091d2f66376b23a51538c2c36a61f7b638a0f5f6c701a58e4ac071a8eb076
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
index e6273670e72b..b05bc9ce2287 100644
--- a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 1218705dd33c..2c8456519bb3 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -2,6 +2,6 @@ DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc
 DIST rspec-expectations-3.10.1-git.tgz 212281 BLAKE2B a1872a7f71c198db1662eca48bcb34c054f05c16193395962cb47a7fa230c2f0f83bedee302a0ab6a81380a361640177ac3370d8829faa6bd362c07e3a551e5e SHA512 35999542bf70ff04a472e50434abb8815cac8bf10b680da458f5e0e6ee290a1a6356a22cc12f0a8a6310cf282bb6cd99f922fcc63a0cf1e252b167e451bcf7d4
 DIST rspec-expectations-3.9.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
 EBUILD rspec-expectations-2.99.2.ebuild 1624 BLAKE2B 4cbf18eee1c7b553b3fa9fb96e7c08f9f46bdb681dae046f8305e1af545746bbf77331412b0b4acffd522425c43c2d773524e4e29a8d8f68364f95f9e52c3166 SHA512 3f7a1635a4f8bae6a87f9523b42a1cd55c8e48ae2e580d7cd7066da60d6fe98c1a449263cc8e593e451bd5f2eb245065548faf1d540021ebc83ff90eba614b8b
-EBUILD rspec-expectations-3.10.1.ebuild 1309 BLAKE2B a101ab35dbe7e8920253f14d6b9dcb01befe0fdf1206fb2e77a4cccd48fc5667d670ca88017d9e8d0caec0ee8fbcc5cfcbb2b1da843cd0bb4c5925296f8bfdc3 SHA512 4b9cba5c1cc99fe4a25ed0dcfa4596814bbd6763948d6231705484f60e26a2dc9e8e2ec036d978f55e04219448156b03e0c25f95295c36ec654d57503a68d996
+EBUILD rspec-expectations-3.10.1.ebuild 1306 BLAKE2B 28372eebcca6d06e0c486c3fa243e058532e7a42f3479be047d159bbca79a2bda41974b417eb349014ec65146ccdc7d069f8b6bae8c50eb9ff5d04cc6b4b63fa SHA512 389c64ca000315648ee7d9db9d3129bdedf5b3446bdbc11486e2e4a6dbf8f196ff352837e5725e41b1c9bd801d17774b456410c76fa50992692c449d0ded1cf3
 EBUILD rspec-expectations-3.9.4.ebuild 1296 BLAKE2B 17662e721fd6dedf56a32fe1d93828a0585dea6e8e43a546f552ef8dc173f3db2bc42492c82d25c263dae964f1af6436147f53cf0a9b1518ecb82ed41edaf9f2 SHA512 847676fecf6abcaee6801ecd477cc86fac1de5c5bf98c2af411200ae5005dc5598a2ee2e1de8679f0e7a9d420be97360421557cc40afa9f1734d0ce69cfd5dcc
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
index 537e21832e7e..7f73a66c60bf 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index bd8a649f09fc..584b4a4266c3 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -2,6 +2,6 @@ DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602
 DIST rspec-mocks-3.10.2-git.tgz 196040 BLAKE2B 8e975dc8480d4709f650ff27c517104714156c551b8b9ec04681132bd92be80bdb11867730f462e7fb6b672430246a0a11404dec5638b5350b57d81a8eac2e57 SHA512 ab11fa77c5f9e3bec2003dc8825d9582dcbffa08a36818bd9cdbe2dfd357113de3712c818deafc165530f9e4d2683ec06e54d37c37aeb820ae3cd592f76cf2cb
 DIST rspec-mocks-3.9.1-git.tgz 192772 BLAKE2B abcc8fc82648993e6a407a8c4ac4f5b146b821e1e842c1dd2b95824d8468aac0ea796438d77e376c897675f66bd2bc9024da8fa5ccaf60139ea296b388d542cd SHA512 f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f
 EBUILD rspec-mocks-2.99.2.ebuild 1510 BLAKE2B 73e9ab4e1931b72fc900af16ca022a6ce1b2c053e32904b5b07f4023e3347c3e9974e6e834c0688b3feefae0720bad1000526b2702779ab19f4aeaae468b9052 SHA512 057e150cdbe87559c945285ba98ab615fbd900e538b48aeeb73847563cdf9e0b05fe287cbcbb0ed687c644df5cd085c68d078ac02b2182f998392fef04ccd56b
-EBUILD rspec-mocks-3.10.2.ebuild 1440 BLAKE2B 44f047bb22bdb66050a648899a26731b2b8c20bee0471dabdbaccbdc7e6ab2a5e2ff836a2afe0bf920d827a703fd4644cb39e0006859aae0975b109aae32f147 SHA512 09c91c2f981db4d0d2c37c856a8c1571fc59c70d608b8a5275c9c35dead957c493b4dd06e492e78cb0a25c4446c0420324cb1d050e01dc917aeed0e46810e924
+EBUILD rspec-mocks-3.10.2.ebuild 1437 BLAKE2B f4b39b710accdf9294a3cc292b1f2350056dc420c49121028cf63efd832633294a798ba7d78a27c3fb1b2bf1c154db4af1873f9f0f7063088a4635074d896981 SHA512 181e57bcff9ea21884ee889b894f2a6d0bcc7b08e3d6412fb5bbc28048d62c6eb00288edb404d62a355fb2a627f8bef0f2bdab52b30b2e5bc6a5323a87f894c6
 EBUILD rspec-mocks-3.9.1.ebuild 1435 BLAKE2B 82814e4352a4fad72c57ff163fcfc10ef08ac94b3048b3b96fa5c5a42e0d2612a8328365b5aa8002e8ef97c3fdc85d592eb9faf6c2d90a3b0a4b0c7c2f11479c SHA512 a5b411e0173fa229e6e754335911807c10768311508d8a2f8c0decff12c422cc6185290c9d2a5b9e94c9b510c8e739ae7a6e6c5957bcf9d1becbf0c56beaa90c
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
index 9d832837db1d..d631739fbd92 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 0a9fdb36a50f..7da1f55384cf 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,5 +1,5 @@
 DIST rspec-support-3.10.2-git.tgz 74812 BLAKE2B e6c7e768d0df05fa5e77055efcc69699192928a35029264300faccf500b1ce7367e74e9c2ae0f7f8f0a5e755692ac83b982d0a3dab3da3ab697ad2c5766aa30d SHA512 bd1fb5d737dfdbb7399d766854f0b173dad89675bac580cf65c5d42ab6cd04ad1773e7cfa875dfa4c6fac14f4ccbd6b48813bae5de26c931c804962d29b014be
 DIST rspec-support-3.9.4-git.tgz 72490 BLAKE2B 03c3ba8316a2c6a79faf68db87adf193b684b82119dd9c5b67f2954f3ce72cf03e3e16898e2f5d57d76aef37bb8fb08ab8dacf8aaef6d1445a8257e2be14afe5 SHA512 95be2e03c37117d6bc132ce466779a8ac3c4fedadfb2a6dabb1fa11601aae908e341c87436dd526bbc8b02040b23200c95bd113d0475405afdb4acd099c67403
-EBUILD rspec-support-3.10.2.ebuild 1763 BLAKE2B 88f33e6b7e92f6990167ad2895e61609a74e07e94aca63ac94e1994e08e2d5ad3db6ee8b921356b859b35b6536be6a4924e9678b97ae2d8d89e719582f66802d SHA512 3df03fa1c6e41919912ea34d4c71295e7686a2931c1d64c095a7b36f4801c3a20bfa2268100ad33e2f670cb3491526e1d8fb52e035a554b8a244a8ad42150781
+EBUILD rspec-support-3.10.2.ebuild 1760 BLAKE2B 68becc13b331d184866ac26c08e6860408f6e1e7e33dfadb3065c5c6b4a2f39ff6763fee5fdc3f15e40c59f84fb9dcad389928d476df169a4d1359b04a446efe SHA512 1d71453c4e900a03a61093e7bbe217eda35ea299e95c0e4472f02d07bfe93d7ee45c0c5386d4d53027d07c2b5cdf7f567ad61de2e4f1e4e661fe622a49350f24
 EBUILD rspec-support-3.9.4.ebuild 1751 BLAKE2B a68477e2a7e7deb6af3b4d4ff1a31cb3810b1e545ccdb309f73b9665527f14952caf2471b4f04da4174da930c25da66a348c804c80b214ce0a889f93d87fdc54 SHA512 ef906eb462681dfc4d95458228a9f796af4ccf59cba157392492601382a4eefe629bccee1f7d6359c877c159de40e31ca604395973f08cf700843b7604ae15b2
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
index c41890895656..cf0d5e801ecb 100644
--- a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 309347a7d483..7505b0be86f0 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -2,6 +2,6 @@ DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a67039988854
 DIST rspec-3.10.0.gem 10752 BLAKE2B e0af9c31a5263b0656341be7432e1597afa56af9bfc5e6d21f1daa7553e5bd3daf2b383a7e1a5b6f761a5880540020e7accd8d4eb6cca6e57d616dcc41690970 SHA512 dd1a3a1c7c73ae9c053e071d7851780d8cf61e92ddba24072b9f2c00a342ed08c81090332ba2eaf7ab96adac3fc723685996195e5cc584e15de57ff02a4455ec
 DIST rspec-3.9.0.gem 10752 BLAKE2B 212cebbae9e71b8a090757ec4b9902f20043eaf95b079a409247990e1fca4236e13d0e9a3bd9b9eacfbc2d2aaab19583452dbe08b298ca69a85e20f0163741c2 SHA512 a7dbb22f01d842a41b54c375d32d94c77a7b964d1ea5b1971e7c228dfd5dbfcfe03c007d687781addb93f819dde8de664dda307c266137fdd0a07dab96f96fad
 EBUILD rspec-2.99.0.ebuild 774 BLAKE2B 7063d9c2312d4609dee333c73b6c4f60f7762d27efc93cfc18f305aae582e55144635a6c7bd0178a4a86d02010cd932552c3fb801df1c31af46ea542c5d5de98 SHA512 481067515fd46d721fb2de15150e34b5d1652fd725e9af505a1ec3b074c100cdb5bc0996d305c9fa010dabbac2545c2980ad748cce101bd92aa56bf561fce104
-EBUILD rspec-3.10.0.ebuild 622 BLAKE2B b419700650bb77b58b3816513595a1eea6421cf6ef7da5bbd1151d4551d33e444d32a3b85fb31e3eb98c4b2300d34b3fe681620bdab6e5f3bdae221b99aad3c9 SHA512 cf2576c0ed33b7a3f2e25899cdf04db0826d772a487f55cdc3a5b6c70e2d16a51f76b3766ddf726fd961933d24a07ffcc96653a742d0ec66c4bcdccf4fe355a4
+EBUILD rspec-3.10.0.ebuild 619 BLAKE2B f4b8ebe12cde5ce7067e005570423763c5a79eb48e157dd8e6f0eb2ddd5f0df17c2f90a88479fb15c5d49c454e3d05ac81fad881c64227e15cfd9bdff90207d8 SHA512 3de4884a68a191d55e78889b00e1d525dfbf94e25bc9adddfb6e5c4d5dbc90e2ea4049ea2fc57c5f87de29b9fc131e10317a85cfe4b6408aefe705bb2569605d
 EBUILD rspec-3.9.0.ebuild 616 BLAKE2B 5ee7420b2f39d491dd42555ffd63047cbfb40d598b39912210b37a09bc0e7f7ba633a2e4f3d53ebdc3e6658bd1fc869cdb08cb85b033bb8d18fb4814439924fc SHA512 6654d32e2f13da07e83513131653defd0717f63563c30e631e68bbb5d2ddb5dc00649b19002d94dfd5071a6af56c0234f595f4b53705929ea61e936cb615c8b0
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.10.0.ebuild b/dev-ruby/rspec/rspec-3.10.0.ebuild
index 39189d6443ba..3fd3135389d8 100644
--- a/dev-ruby/rspec/rspec-3.10.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.10.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/ruby-sdl/Manifest b/dev-ruby/ruby-sdl/Manifest
index 6b92fb354164..110a877064e9 100644
--- a/dev-ruby/ruby-sdl/Manifest
+++ b/dev-ruby/ruby-sdl/Manifest
@@ -1,4 +1,3 @@
 DIST ruby-sdl-2.1.2.tar.gz 178105 BLAKE2B 84870279edcf2616159861267ffc8666b482786f43a30c8729cd4c59f25219956648270452bf38b72115e05235786ec8c0f0e7913469cc8573d9eda813d25726 SHA512 1ddae367fb4145cc8142edbf3c61acaf56604054f710ac37cadb8d04f93db24fc3595c1bc8e0fb5f330aabc815884f31b5f2a39c0108026fca442fc0b3bc2807
-EBUILD ruby-sdl-2.1.2-r2.ebuild 1904 BLAKE2B 087a42255287aac196d9f9bbf57afd667bb1fed656f0c448ab2c45987f749bc7840d786560a8cc0b90ddc57c70c943541ebdbdb0df54d5ad9b8205938452ea8e SHA512 68e3aae400697b6cb2f6d3b52c19bf6eb0a93db5d0ac1aca6d30b937b001392a3746bf24fcfec904c1af70da828411e9db98cc75c977d0eeeb06a7f72559d2f6
 EBUILD ruby-sdl-2.1.2-r3.ebuild 1922 BLAKE2B 5ae628cfc682b57e13e8c2a0700c643d6185ef03c76794993539fa31955ec37202e2ac1719a4ba346c7bf13a625590991f0c4e909fde4a604cca5330ebaecd3b SHA512 0542028ecb6d0c453ca568fda66cbb5802e571d7af2261ebc3e38abf2fedd1f37e8a686156fa0f44e1f7ea50e15a95b029f7df2662ef82e3f0e704282975ec34
 MISC metadata.xml 560 BLAKE2B 44c2c964436b58f2f3d088cc598db576b71e5f42a490e1ae616400686addaf188c82b0f5a4dfab56a61712d5858720007fb31df3f6b71d0e37e5b617dde67984 SHA512 a9eaf9e6a1cf02821fec770e3499796993aebfdf0a7f251773a12950cd42770beb1d5bbc34fad694e74522eeeea619cd659509c31f914f4ddd257a9ce1c17fbb
diff --git a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild
deleted file mode 100644
index cb9e8e2db868..000000000000
--- a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng
-
-RELEASE="rel-${PV//./-}"
-RUBY_S="rubysdl-${RELEASE}"
-
-DESCRIPTION="Ruby/SDL: Ruby bindings for SDL"
-HOMEPAGE="https://www.kmc.gr.jp/~ohai/rubysdl.en.html"
-SRC_URI="https://github.com/ohai/rubysdl/archive/${RELEASE}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="image mixer truetype mpeg sge"
-
-CDEPEND="
-	>=media-libs/libsdl-1.2.5
-	truetype? ( >=media-libs/sdl-ttf-2.0.6 )
-	image? ( >=media-libs/sdl-image-1.2.2 )
-	mixer? ( >=media-libs/sdl-mixer-1.2.4 )
-	mpeg? ( >=media-libs/smpeg-0.4.4-r1 )
-	sge? ( media-libs/sge )"
-DEPEND="${DEPEND} ${CDEPEND}"
-RDEPEND="${RDEPEND} ${CDEPEND}"
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1
-}
-
-each_ruby_install() {
-	emake V=1 DESTDIR="${D}" install
-}
-
-all_ruby_install() {
-	dodoc README.en README.ja NEWS.en NEWS.ja
-	insinto /usr/share/doc/${P}/doc
-	doins doc-en/*
-	insinto /usr/share/doc/${P}/sample
-	doins sample/*
-}
-
-pkg_postinst() {
-	if ! use image || ! use mixer || ! use truetype || ! use mpeg || ! use sge; then
-		echo ""
-		ewarn "If any of the following packages are not installed, Ruby/SDL"
-		ewarn "will be missing some functionality. This is ok, but may"
-		ewarn "cause errors in Ruby/SDL programs that need these libraries:"
-		ewarn ""
-		ewarn "\tmedia-libs/sdl-image\tImage loading (PNG, JPEG, etc.)"
-		ewarn "\tmedia-libs/sdl-mixer\tSound mixing"
-		ewarn "\tmedia-libs/sdl-ttf\tTrueType Fonts"
-		ewarn "\tmedia-libs/sge\t\tVarious cool graphics extensions"
-		ewarn "\tmedia-libs/smpeg\tMPEG playback (including mp3)"
-		ewarn ""
-		ewarn "If you need the functionality offered by these libraries,"
-		ewarn "emerge the desired libraries, then re-emerge dev-ruby/rubysdl"
-		echo ""
-	fi
-}
diff --git a/dev-ruby/ruby-shout/Manifest b/dev-ruby/ruby-shout/Manifest
index 47585a169dcb..631caf99ca59 100644
--- a/dev-ruby/ruby-shout/Manifest
+++ b/dev-ruby/ruby-shout/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-shout-2.2.2.gem 13312 BLAKE2B da84e8ca777e5c5e60f4319f030467cbbb0709f8e94c08d3b7c8bb30c4db2861d27852930a01f4a0625ca8cf71ed849fd39f0398708b838c3b6bdcf85c12609d SHA512 2553518d3cef655e9cd59a734860d290928171600676dd0fa4b65d84421286eb9d79cc897cfa5544570e3731c4f761e97e8cd1dd3488d9b62246af840a1d126d
-EBUILD ruby-shout-2.2.2-r1.ebuild 520 BLAKE2B 25583ca4c690e8aa60fe40f58d0b4cfb8edfbd2288fac670a7ab78dc2fc044c47db021d1e85a9d34958b1f4c700cad26dad7a81fa270654cfe445ce91775d3d1 SHA512 e0b52454520b02a9b3c9c65f1275a4fe781759cbf718ffaf355b2e8c3b34686be86f582400ae80b1f9ef0a1a063909a91495cdcdb90045ae20329f83c1e7b710
+EBUILD ruby-shout-2.2.2-r1.ebuild 519 BLAKE2B a3e7a464ef5d892bb85670a014900d460ae3d26b8ce4ba7cdc3cb7402d18d5802682f89e6521026d84ecfcde1c35dfaac5a4cac74c8fe5688684109b6e39bfb0 SHA512 87c95508d86bef5527857b8a4c74d2a09fb490e33edc8030234330d2ec86f164f74b89329d7f7fc0d880a6b7801f510afa47533ae254163eb60acbb15b03ecf5
 EBUILD ruby-shout-2.2.2.ebuild 759 BLAKE2B b398c1001db4a4fb12a5a9874d88febc32e388240c0b71803cbdea8927d1eadc75a56f100f0506a5fa77f5f28671c920ab27eeca57f8c7aa0fb481e238b605b5 SHA512 ca863f2c5e3cef05f7630c5b0482cad4f2ec2a1fce0cf1e006aa0099a56e3fb4c4197ff128c455349ffa3b9276780f0e5213be3155e94038f510c49b00ed1ee9
 MISC metadata.xml 331 BLAKE2B 0e79e6f0495cc496f53e48253657ec9678a6da31c49d09abc81f3c2e910d4528f6be7867b51cca2f01c8ec4df6f3771bcf91262f53b1eabdd421dc3c00085d47 SHA512 b5cf8ff6f45ac3f59dc4412a280a5057e3e1f30f2cf82db54db8f281894d753e9fc11aab699e766f2a532cd6ced1a1b784d6f5a8607c0ab5ee1a720b0d0d62a7
diff --git a/dev-ruby/ruby-shout/ruby-shout-2.2.2-r1.ebuild b/dev-ruby/ruby-shout/ruby-shout-2.2.2-r1.ebuild
index c3b5c5f07cbc..0e08b4e535f3 100644
--- a/dev-ruby/ruby-shout/ruby-shout-2.2.2-r1.ebuild
+++ b/dev-ruby/ruby-shout/ruby-shout-2.2.2-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/niko/ruby-shout"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND+=" >=media-libs/libshout-2.0"
diff --git a/dev-ruby/ruby2_keywords/Manifest b/dev-ruby/ruby2_keywords/Manifest
index 2bb33ff76af6..44973ffc3afa 100644
--- a/dev-ruby/ruby2_keywords/Manifest
+++ b/dev-ruby/ruby2_keywords/Manifest
@@ -1,5 +1,7 @@
 DIST ruby2_keywords-0.0.2.gem 4608 BLAKE2B a13fab6800dafe557ca05a14301ed37afdd0fef22b6c4a8458be758d96099dbad47c49d7b01bd3c7297aec51d971c944005f704fbdfc45d8f50249040c244250 SHA512 a7bc02980e073a899bf3de2e32711ca9820657d43cc44dede44ca31681d8586e7f808a93b6f6778aaaaf8b84da37a48c8062e69ca33477d9469e9634d616ed8d
 DIST ruby2_keywords-0.0.4.gem 5632 BLAKE2B 1d2d4a71823e61a14fdf15edc2ad8ed8df70e3f52f621940d3d3e00c18f58e76d7c18ca2ff409b1c2b5d77216f90e72e1d50bad00093fa1f7740ccf8375c11a2 SHA512 22cc0c9c08f84ee6485e02f1d1fa244219dc96846a638b428970e0876c83056b87939e8a3cddac833d6feb493e34420604e81a3973d7cfa4dc969a6639b13439
+DIST ruby2_keywords-0.0.5.gem 10752 BLAKE2B 430ddd02ed59c73c8dfff7762a2f4bbee2b4514d7c8c38a9bf34928a254799cc9e7401672d92b926e4284b005ed6ce59eb2f4503cabe76c5200626b89055bfa1 SHA512 f6b9078b111e68c0017e0025ecdccb976c7a32f35c1a8adf9fd879db0c91f89eb9bd799f9527a846e28056f2a5fbf0f3610cda9538570288c493613c35c83a6f
 EBUILD ruby2_keywords-0.0.2.ebuild 451 BLAKE2B b8a02855e056567760ccbbbd3c78a127cbf365e7272c9b274d370b2bcf5e1fa8aa39444ed1ccc8b01a188319e4776be9a43b1d2cf40869af9d672b9e664b4f2c SHA512 07b0152d0490fb0ae7c6a4d152faa51fcadb23980a53b6332aeb2c06ad80c5aa594f03c46b15ef57b8709fbdcc72f0fe83b7596b111b140585649b0e3626ad86
-EBUILD ruby2_keywords-0.0.4.ebuild 452 BLAKE2B bf9aa28b14bb2a2bb644ad486691d8d620f5e15118acd4441ed973627726e2de902f368c6abf86680364e555d71ebec8d359307dd0d852e76adf8f78f016aa97 SHA512 12b8b1e79bddbe977c3ceda9afd3248a41048a8956a968b24cf8ad9c3f18841dfffdc20f68eb174e41371a6a9bd6f7254baf66f083b1c532855a667ef0fdcd05
+EBUILD ruby2_keywords-0.0.4.ebuild 451 BLAKE2B 7c94ccaf9d58ac6d758b2d7fcf1eee5b5e662830004c7cd1eb80d6a083f3a781b9936376032998dc11c8c083bf16120ac08e74886dd23ced21b8cbaafd9db50d SHA512 f88a3ddb64d4c3e4425a25defdea9a86ae137b1d415d5bad4bf1e426756089c3a4f7d3ec739ec8a9c458f5b3585a5b97e986271eb3037e25b0da4b638b7b8515
+EBUILD ruby2_keywords-0.0.5.ebuild 445 BLAKE2B 21ef31e51d671924966fcb7406c5cc7c1d48be278dd89b6dd377fbc2af8ecd3f1b48ade7817e2e081152955be1fdd5406f53d5c2ecafe9bffadac9a2f54e3991 SHA512 03a3957c6dc0901d3d335df0ecf3a858ab5b158ce97db84e5f07b3b7d2e7fdf0af1b372cb60b38fa675793092410ac35c29d6167deff89175d81bb53c169a236
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild
index da9a11ff613a..edabe3ae9b88 100644
--- a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild
+++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/ruby/ruby2_keywords"
 
 LICENSE="Ruby"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
new file mode 100644
index 000000000000..4d5d7a620691
--- /dev/null
+++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shim library for Module#ruby2_keywords"
+HOMEPAGE="https://github.com/ruby/ruby2_keywords"
+
+LICENSE="Ruby"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/safe_yaml/Manifest b/dev-ruby/safe_yaml/Manifest
index 9fe5c0fe3aff..cf3ea0786631 100644
--- a/dev-ruby/safe_yaml/Manifest
+++ b/dev-ruby/safe_yaml/Manifest
@@ -1,4 +1,3 @@
 DIST safe_yaml-1.0.5.gem 30720 BLAKE2B affbf5331cf290c3e7932f53da9b0f488730ae9138f0b28eb1e8e0323c7056635ed73bcadebd52f725895030a153dab13e243d997e84004f5bfac82e82dcebe2 SHA512 d9c8d9c28c3c8708f97cb0545f58152af81056f5e79147424dd7bf625f8e533440d1ed41d6abe2faf84578754823a1215ba28772c2e8593bfcfc397d647187b9
-EBUILD safe_yaml-1.0.5-r1.ebuild 912 BLAKE2B 022ebcb9254456e24cc2caf938e501fa9daf1996ecc120cf37369d10d72eccd2589a0949a58df0c90e6384190e7125bdfa79c4585a8b8d164093b47ae30b9433 SHA512 225bdca6680502f7c4f27155890c6045f10a402d9c52a012b5a0c99183f54b596431ee16fb200354cbca0634eda8fe7cd746bba6a3b3a52f187cd121428b72f8
-EBUILD safe_yaml-1.0.5.ebuild 962 BLAKE2B 2c567ca3e55e46f8a378f25948a7f7282451193545310835ef4c648851528d622a1cbf8f3f1ce9958575a35799fdf09f4b69cb0bd12ef060ae09e2c61f0adbc4 SHA512 d5d5405de7ddb5e1d7b76040e207ab7865d5ddbbf629023a549d7c5839322a17d194376ed91bd4386a71ebabc80d9dbd03a9a8ceb9a69f744a2f05dbb286b991
+EBUILD safe_yaml-1.0.5-r1.ebuild 924 BLAKE2B d12fbf6548cafb0d9df1cabcd07baa13ebd39d7b18d898fec96c28d3f3e20b4c78e771878bde7f969a1906fa8ad6989d19a3ba335d9194289a0ceee8d5378ce5 SHA512 bae31c515637e12b6bd502c2aeef5634a875f8bb55c7c1e3aa028b84ee449d80a3cbd661df217a7ba0f83dde38c9f7326dce855b3d274463196d9c9d4485a7e1
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
index 00eda3df6685..8be3fdee610c 100644
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
+++ b/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://dtao.github.com/safe_yaml"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/hashie
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.5.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.5.ebuild
deleted file mode 100644
index b94009c285c2..000000000000
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse YAML safely, alternative implementation of YAML.load"
-HOMEPAGE="https://dtao.github.com/safe_yaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/hashie
-	dev-ruby/heredoc_unindent
-	dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/local timezone/askip "timezone"' spec/transform/to_date_spec.rb || die
-}
-
-each_ruby_test() {
-	# Run specs with monkeypatch
-	${RUBY} -S rspec-3 spec --tag ~libraries || die
-
-	# Running specs without monkeypatch
-	${RUBY} -S rspec-3 spec --tag libraries || die
-}
diff --git a/dev-ruby/sfl/Manifest b/dev-ruby/sfl/Manifest
index 1dee5a1f8f36..1ebcb66a42fe 100644
--- a/dev-ruby/sfl/Manifest
+++ b/dev-ruby/sfl/Manifest
@@ -1,4 +1,3 @@
 DIST sfl-2.2.gem 8192 BLAKE2B 631712748d0f58a9d76087a194cd889c4cc95696df2ac755a13357e7055f0277a146f6f3df58e678f95134ec9fa1d5ecf720c702b2bf2c7e4385d443381b3cdb SHA512 9b64a966ec4125ae39d273e9ea1529f422dd17bfe2c4696574ab7725c0aad42f974febe7359dafa073c2291b47c6e351e1d549e145d247ed7c2ea6ebc5c73932
-EBUILD sfl-2.2-r1.ebuild 612 BLAKE2B 22e09dd4f853fb61cd1a9ad515a0b987077a8358e1abd4c87324caddfb884f6eea49452e6d32b4cf57c59974a284c18ce0d0584eda830a6564da0b1f9ee419e1 SHA512 97c8bddb14c06b8859df5a878e4c654fb3a8d0264698f93602e79e4aaf3a79abdfb94e64bd009acc5720815554cc4c4d43d425a1be71cd63a59191812e1b367e
 EBUILD sfl-2.2-r2.ebuild 605 BLAKE2B 8e9a10ccb7c89daaeb7fe08a1acd2273a0dff544d7fcc01c940082ad6399242636bcbd353501b89ea4b331dd2fb1660abaf37f8ac1fa8ddca7b26796f12b25a9 SHA512 e7318884b0586d47c59099c3015cb2bdba32689522e61630c3a99d3d6209f1d909e5f5c449b920be0190cf25e40df34f45dd68e7f516b64e87d473945eb14ec6
 MISC metadata.xml 350 BLAKE2B 1e4b5ed1332607b056a79f85f6929b2f5a7705055127e0d0de3cbdccb851cde6f9f4f4462285e4c22847dc6ac807a5a9269b8dc9d8af840ad4f1e59391e5c055 SHA512 91539030961ec4d6d9b70ac65fc3b8236521dec596bc06f865e07f2aab3b0ba80584a2a49d07d4b008a7c5ae41e9c17017a1a309bb08af5d72df15509cff8dbc
diff --git a/dev-ruby/sfl/sfl-2.2-r1.ebuild b/dev-ruby/sfl/sfl-2.2-r1.ebuild
deleted file mode 100644
index 6e1a75b1a1b0..000000000000
--- a/dev-ruby/sfl/sfl-2.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library providing spawn() which is almost perfectly compatible with ruby 1.9's"
-HOMEPAGE="https://github.com/ujihisa/spawn-for-legacy"
-
-LICENSE="|| ( Ruby BSD-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE=""
-
-all_ruby_prepare() {
-	rm -f Gemfile* || die
-	sed -i -e "s:/tmp:${TMPDIR}:" spec/sfl_spec.rb || die
-}
diff --git a/dev-ruby/shoulda/Manifest b/dev-ruby/shoulda/Manifest
index 874e2ca55537..296023b6fece 100644
--- a/dev-ruby/shoulda/Manifest
+++ b/dev-ruby/shoulda/Manifest
@@ -1,6 +1,5 @@
 DIST shoulda-2.11.3.tar.gz 145068 BLAKE2B 5e6d9b78b255612ec18c78076f9c4d45265a3e02a8fd56a127ea8f235e3b344005942c4b6e53014e6328206501c178ce76e1554a9d995ba0de04f5afefe4a0f7 SHA512 0b347c4a8be177b5806364114c25dc786ca2ac95a11c93a723dbc9ea1f6d8ae62df7fb420a52d477cd1e10e8d894074072a040eef36ee8a43440e5256c8427e4
 DIST shoulda-3.6.0.tar.gz 22691 BLAKE2B 798b88e208355b0325b9e8b48f66687ad2702e1b5fc058d45504648fe7c7760b018eaf3d1c7bd45c68656c7bbba8fccc9b74d72003ee0b78ac53a277567609bb SHA512 10f7c6801eaabafa08eb2bc9c4d2a96237d4494aee7d40e5db8cf9c1abd8cccfe86aa21b0e68e2ec42cf222d285cdbec11ed2fdd804ffb8bd65ffd2efa3e72ac
-EBUILD shoulda-2.11.3-r2.ebuild 874 BLAKE2B 2441a2b6a261de6de5fa10a17f92dd22bead3ffaf6b75204b6607821dfdfbff876dee36dcf40c89bffbfe84194ba5525698ef533856d433f0d1c17165b25fc1e SHA512 afe6e330b0e5deb1453e64891fc42243cd9f0285adf300f588d1936b4a991757190d9a03c4b02cb7b5fc5b914495689cf7c3061ffee7dec543b2e7d5670d4426
 EBUILD shoulda-2.11.3-r3.ebuild 836 BLAKE2B a16178f1c34220fb8c01bb68468d10229439de2c101a8e9511a227286e4c38e29bffe0262916c74274de12d8dd2ae2e0d90db5ece4cb9b39f01e1ead5fb0da1d SHA512 a2e1fab8c023c84e90cb985e71ceba1f9aba2141f0820344bee7c085075dc130d46eaff25ef6b77dc558022774fe851a0766d053139a45b9b79b3d4cb32d736c
 EBUILD shoulda-3.6.0-r1.ebuild 924 BLAKE2B b0e4344f4255760b5ce637eb53e58af37d08e772218c77fceaafcf4f81195467cc1733ff9380f36b86d2d900378d54da046f0e1196ae6237ea5ea6fee4901fee SHA512 1a14864d13555c3631653bbf87fb5d77195e8b7c7532c889ff916a0f187c05a28f2e35ad13ab3c794bf8005a42b96e7f900195ee001b59284698f26370e8f7b4
 MISC metadata.xml 344 BLAKE2B 4f4a9e5d5bc1e6a6a10552ef0285ca16024cdd9bc838a25397b23de1f873a3ca87194d0912f8d0a0c24158d4f10fdb92fcecb15f246e96dc12a95e56604770fd SHA512 b4fa8d5ce8421c5541cdaf288da9a8589ea6f4682470b376921e987d5a5344352afc2f20edbdf1f54ac46fe658f46c4863ec4dc5dc8eebe1c3223a15c72f450d
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
deleted file mode 100644
index 2629e41c1005..000000000000
--- a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# Use rdoc recipe to avoid obsolete Rakefile
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTION_GUIDELINES.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="http://thoughtbot.com/projects/shoulda"
-SRC_URI="https://github.com/thoughtbot/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-RUBY_S="thoughtbot-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# tests seem to be quite broken :( They require working version of
-# various rails versions. There appear to be unit and matcher tests but
-# they can't be run on their own.
-RESTRICT=test
diff --git a/dev-ruby/subexec/Manifest b/dev-ruby/subexec/Manifest
index 68df4f931fe8..bc1b312fc1cd 100644
--- a/dev-ruby/subexec/Manifest
+++ b/dev-ruby/subexec/Manifest
@@ -1,4 +1,3 @@
 DIST subexec-0.2.3.tgz 4384 BLAKE2B 27dc40377f7b2fee33553543723b9e15cd02a1171bd24b5d213b3546b7b20267cb8cbf987c1a1f6c0285f594b194f1dc20c41314266587be30d961e4b514f8b9 SHA512 b6fc5ee802906a690a1d1542ada44aba1df5e6861a66f4df58623e366d8d3ab2349d2963817bf07089e1dc15932ca03f0020d16777012ec4b92879280868bb75
-EBUILD subexec-0.2.3-r1.ebuild 745 BLAKE2B 3ceec00621225756507737444ffc641b224c2e796cb8d83bb0ab6e186336fff8615cdcef587f4218ad05e3f343b3e991afddda624e0c13fc64566d0483bd2e57 SHA512 1e37a5f662a6c043464d6e91576ea3a5dcb2302b7db5dde5842ae04d24d98fb1402901a264a2b390722b32230455492098f8cb917f9835dce29fea5e70ff448e
 EBUILD subexec-0.2.3-r2.ebuild 778 BLAKE2B e445ee06e62edd9bd2e3c5e85556c18029383caf9b9e8df916f2c800504ed70a832c65ad6d88e0275ca2fc6cbe8d32c90dc16acf4d0cf6dd71998756e5b47b32 SHA512 dad2366e9ab0e5ae01541a43eae6189c46e41ae20e16794fe5d4cb6d6b0f77c636421e5bc0579dc94789a1535970031f276c10b4a121ef88309d4d0a66029e94
 MISC metadata.xml 341 BLAKE2B aa5ca57e8f90589a330fcec539b522d24e13584b305e4c89ccc0a1efd3e62b50887da931ec7fd2321810b165e6ac09c8ee0dfbe78447a0341a8a749526261b7b SHA512 3bfec664d4436ca5e76c8d73872f7bc23ccfd6fe676725d96c96a64651a33660d4f0ec6f3aaaa6c231594684904078a848622332d9729a4fee1ffbfc60e29972
diff --git a/dev-ruby/subexec/subexec-0.2.3-r1.ebuild b/dev-ruby/subexec/subexec-0.2.3-r1.ebuild
deleted file mode 100644
index b9f776efff11..000000000000
--- a/dev-ruby/subexec/subexec-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem eutils
-
-GITHUB_USER="nulayer"
-
-DESCRIPTION="Subexec spawns an external command with a timeout"
-HOMEPAGE="https://github.com/nulayer/subexec"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/shoulda )"
-
-all_ruby_prepare() {
-	rm Gemfile* || die
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-	sed -i -e '/begin/,/end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/sys-uname/Manifest b/dev-ruby/sys-uname/Manifest
index a3e2398d16af..b182c952cec1 100644
--- a/dev-ruby/sys-uname/Manifest
+++ b/dev-ruby/sys-uname/Manifest
@@ -1,5 +1,3 @@
-DIST sys-uname-1.2.1.gem 29184 BLAKE2B 4166a6b8d1e87a0a78c4c6d9b542c8ad6d5c32f6f36b03be503cd6ea26b81d0a00bd81ff8a266b4f13e115629519bd67034d2cb80fad8bbc2d3e2c70a821d99f SHA512 4e7c7d5a375a61082f558115d69e74ee8a6f916cb641a8abf9e7d9a92909ca8e595f5d6659dc9cad34e8f0de4c1f7d63bfb5fe6dcf82df628c1e511987436d68
 DIST sys-uname-1.2.2.gem 29184 BLAKE2B abfc9172cde35f946d420f8737a9b60b6810e551c2c361027614cd812a50c86bf8e92446c9a113d0e7e2f6dd09c6f40ceeb5a024defc7cacbb45c53f4b761809 SHA512 97a7a8cdbbc80e9d886be92d104aca389d82a1eac61b7a0172ce8fa27dbe751b0653dc8a027610d69051a79ed1fb2c855e2ee802308a74300dcc709c9e56b9fe
-EBUILD sys-uname-1.2.1.ebuild 576 BLAKE2B 1631d6581f36cd86dd815a74cd8c3b6a6db60b03cc2cfa478358046fa8032b7acebe8c44b42c7ea6d393d61e0065d34155816a51fbdefcd5d21d4bb9df249966 SHA512 57a8a95c931ddc8bccae1ce63f994afdafc4bae48dd2fc203b0a2019f9b0a798e194f38fa289b9999aab693f97646278ec88b2e537dac5fba3bf38ea265696ee
-EBUILD sys-uname-1.2.2.ebuild 563 BLAKE2B 563f9cc7f0c9c67ecdd9da0ee49f420383929490c9cce35db72149e165d14e330828bbc39a03ffc3ae75992a9b391df9b5ac012ea843eefd396ae02bd50c48ba SHA512 f36ef606e2d892c624b6e9c566b94f2d52f4a1822977ca71c6c4e1b95f01aa20d8e389755b7cc1830c0b4eaa9439bf6fcf718a0a0f0903f281ca5441ec44422f
+EBUILD sys-uname-1.2.2.ebuild 570 BLAKE2B 56b885dd792c564920c729be6b26bf18c1766a9b745083d737ab283585d986175eb7605566f25c8123672a74892ddcd0f114de882abf24e4b2ad44e647956174 SHA512 ecf7301d9b546a26d8833c4ce06755e0af02830cf08a5adf6cabbdec4ec87930d5d319bb1512314e87587bb59ce5ef30ca0eaf1101f9faa6358d959bc35696cb
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sys-uname/sys-uname-1.2.1.ebuild b/dev-ruby/sys-uname/sys-uname-1.2.1.ebuild
deleted file mode 100644
index fbd60e6a565c..000000000000
--- a/dev-ruby/sys-uname/sys-uname-1.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.rdoc README.rdoc doc/uname.rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby interface for getting operating system information"
-HOMEPAGE="https://github.com/djberg96/sys-uname"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ffi-1.0.0"
diff --git a/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild b/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
index add34ecdc7c2..93691b3ccfee 100644
--- a/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
+++ b/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md doc/uname.rdoc"
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index e6bf9c50d00e..b61343443368 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -7,7 +7,7 @@ DIST test-unit-3.4.1.gem 122368 BLAKE2B cb1677c83d11c0edbb6ad2eedda63f777832993d
 DIST test-unit-3.4.2.gem 122368 BLAKE2B 3b308eb539915573762aeffb96b02bca3194b5c4e70d00ba4711e2ebf57215e5865f79e5246e5872f2ba813b81256deae289872b8f550ce630249dcf6ff5069a SHA512 ccf04ffbea05334f2d4ffed48db6d236c5eb85cc3d0bd79b5a195c43d218bc03b3b310835d7c23f78d2548dcfc8c4be5d1f3bf92d1aff6fd56ff3f483b2f1b0a
 DIST test-unit-3.4.4.gem 123392 BLAKE2B 7fe5fd5d17712e0b18e5757a22ca60d0504857c46d311874bb2528d6e6eedffdf4f468899cd08c3dddc4808bd41cb21d254d1467f4ccc259eba8bc2405e9cb57 SHA512 3387cc32fca94c2554fa5ed691eec1e0bdddc119ad26f19860c5533764041d17b0ae0515d0a3703f7427558e1eb0f0817c106f2de46b2ad5299ca08c2922de33
 EBUILD test-unit-3.3.3.ebuild 904 BLAKE2B 7c4251d9e4113cc1a3f90eca98cea78f8f288d107a4e6e37c567cf614fd8e21f8f20d46bde4332aa48ba33d0c401ebeeb154cda9ee657ca2ec5de9f2f9daa81b SHA512 ccb513f456f01217a88927a8532c4f0d8bf9630dabed5b0321b4b3d068902cc756dee598d5cdcb1823ee508a2a4d2e2eee028725a74b833de87ec98038f08c16
-EBUILD test-unit-3.3.9.ebuild 879 BLAKE2B 6f568245c13374637c7796361dedf7f8a9e1fd7d8bf0de345e1abb9380d2f345e82d5864062c0792e89a6fb7796c5ae423901dae9152911391fe21dfe8ed8ac9 SHA512 7129803a74a787d2b5e700970d8bbc67d9beeb987b5b9862439853f6a41bbc437f92ce19be66c073daa02cbe8f2bbadf7fac09cf643640391f0c424adccde30e
+EBUILD test-unit-3.3.9.ebuild 875 BLAKE2B 058537c3ba43bc70be921613ad746bab15e18392f6f0c160e9a43700eaba0d5cd7ecfc740b4dab4fe38d7eaa02a6154ba042ff1d523a241945fa8a0f3ab8b084 SHA512 c33299fc5f27d942aae0059ffb51e0c8eb8dae0fdbe8a915ea3a61977ff78261d7935e9239552680ba051e3feb441d02d982821b92275bc66cdc846051bd1d90
 EBUILD test-unit-3.4.0.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.4.1.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.4.2.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
diff --git a/dev-ruby/test-unit/test-unit-3.3.9.ebuild b/dev-ruby/test-unit/test-unit-3.3.9.ebuild
index dee9408b09af..8c795386de25 100644
--- a/dev-ruby/test-unit/test-unit-3.3.9.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.9.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
 
 LICENSE="|| ( Ruby GPL-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/tidy_table/Manifest b/dev-ruby/tidy_table/Manifest
index cb292481ce08..68d79e19ba2c 100644
--- a/dev-ruby/tidy_table/Manifest
+++ b/dev-ruby/tidy_table/Manifest
@@ -1,4 +1,3 @@
 DIST tidy_table-0.0.5.gem 7168 BLAKE2B 7c00064c266bad9db6acf5066845cc6543c2d51fb5ac85240c9ac77d15004402588b992a0e56529123a1805e6c887ba23d135e801e07fcb918411d6706e7f596 SHA512 fbe9839587c3381ebabeb874b2460767491447b54501137f464c16bd251601670a6a260881792c117ee753e5b4d428f04295df041ffee56f109a1ff772346bcf
-EBUILD tidy_table-0.0.5-r4.ebuild 611 BLAKE2B f8a35d290cf84d8cdc58ff6eeee44d55d22c4c40cce065b6ec44c5d840e660b9f74db281c63eadc91ec6af8647f6440e90c0feb6720b1e9ae0db49021ca10f92 SHA512 77a5ecd071b3e70384062d4b543e91f9064306a3114c317dd92678a31189ed55734447aa79b8b65a19efea00c27b2f7fa280176ae9ccb6fdc790c9a027a41cd9
-EBUILD tidy_table-0.0.5-r5.ebuild 751 BLAKE2B e3c4f2b55921950dc67d695c5ded8bc31e79695734b8bde323726993246c62436663195bb95ebd18d3e9154e19f728433c14413fc91853329781a99d22366a6e SHA512 315b4b08fd293b5848ccc459fb8bf5cc7166d995a0b86a618bc355636ca014fe6a869d1635161f35551a8204cf6470a16f3380107eca222544205d15f5a255ab
+EBUILD tidy_table-0.0.5-r5.ebuild 749 BLAKE2B cfc7ecafa290e8dd40f0b9ee965732565b95cf98904c1b4284cf6537bdca5c0f4889dec2d98e66863060e2638e5f9328e3945671a71410c489f89815442c44c3 SHA512 2970f3410176ef12ad73d1069a20eff0c8f52d381e0c1c84c29b522a4b149eed8140ebb5717f6b5eb2df2f940637b87554b4e407601dbcd023b12790621c363d
 MISC metadata.xml 345 BLAKE2B 3ab7b55523f2742cb7c66ba65825395616176dbc68de46e5d95e8830f34c6add52ea5f24e1b97ca5022b823b7e49985ff1eb9997209e5bee191fd1e6725aec9d SHA512 9bcbcffb393ad0e2bfc74a05ea31149e656fa947a650932b51bcef54f32ff52b576c025d073361df9ff71a5c150496cbe5d98b74b8c614466b849cf95fe7aff9
diff --git a/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild b/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild
deleted file mode 100644
index fc378a13908c..000000000000
--- a/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tool to convert an array of struct into an HTML table"
-HOMEPAGE="https://github.com/topfunky/tidy_table"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Remove reference to RSpec 1
-	sed -i -e '/spec/d' -e '1irequire "date"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/tidy_table/tidy_table-0.0.5-r5.ebuild b/dev-ruby/tidy_table/tidy_table-0.0.5-r5.ebuild
index d3ba8348cefa..ae0efecf5fb3 100644
--- a/dev-ruby/tidy_table/tidy_table-0.0.5-r5.ebuild
+++ b/dev-ruby/tidy_table/tidy_table-0.0.5-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/topfunky/tidy_table"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/trollop/Manifest b/dev-ruby/trollop/Manifest
index 22587ade51f2..1689ff244b40 100644
--- a/dev-ruby/trollop/Manifest
+++ b/dev-ruby/trollop/Manifest
@@ -1,5 +1,3 @@
-DIST trollop-2.1.3.gem 30208 BLAKE2B a5fd19679821c55459cf7792f3ec26b8580732e84107f7a3519dcbcf1729ce48567ca2d35346b3e27d3083a3b6cae160ded8c18a118cb04a7a6e60c82bd91e78 SHA512 4d172c6d75f40edb36c353d2e32afce10b012f02927772fa201256126f88c62adce39400225434a80fd678e1cad703e3d3f32cdeddd150287a44ff81a2fca819
 DIST trollop-2.9.10.gem 29696 BLAKE2B f69b1ab8ce166f9fe6198e177266ee86e38f3bed4c3a55529705aedc4518cc04a48b9bee4463887fc4ac1cd04cad98d35c298265ad1433ced11e0ff5bc1f50ce SHA512 21a0db09d480353ff846a1311b118e0b0db4ca13a559dd1749c1478eff7080dd04e5308dbf1807215eadb68e276c991970b23357e9a3497acb9f705f7f77253c
-EBUILD trollop-2.1.3.ebuild 724 BLAKE2B 86f630a652aa6cfbac5cd5e0369802fef91f4a0b2796b0c087857a8468c8bf82a8171c45043c1b6ce8ac75f03605296b611289eed1541b04b13b163e198ac379 SHA512 468deeb6528d1e5dbb3e0a53c97dfd07c51a119ce554c9fbae55c88c3437f808397fc316c49d2a3df1b313dd8d3a79c2ce863dc593815fe5fd7d6ba9f5467a42
 EBUILD trollop-2.9.10.ebuild 693 BLAKE2B e504cb2f85e6ee3fe1cf0ad7c6a97a471d9a35debbb05844b576ed44ef3c14760e796aea6e5503c957ded5e36bee227e9763b74026dd9f92a55d51e60b9cfca9 SHA512 a7f6e6c14a9127f07bca16c1cbb4ec7c4248c12cf76d5239e79985fd92e41dd139b858e5dcf98582ff1a7ef591ca3ad03d81add7042a9fea261ca6e5da8992fd
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/trollop/trollop-2.1.3.ebuild b/dev-ruby/trollop/trollop-2.1.3.ebuild
deleted file mode 100644
index 6c9feae95958..000000000000
--- a/dev-ruby/trollop/trollop-2.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="FAQ.txt History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Trollop is a commandline option parser for Ruby"
-HOMEPAGE="https://manageiq.github.io/trollop/"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/chronic )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundle/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	MUTANT=true ${RUBY} -S rake test || die "Tests failed."
-}
diff --git a/dev-ruby/ultraviolet/Manifest b/dev-ruby/ultraviolet/Manifest
index e8a09f8a6ec2..c9ea641e26b1 100644
--- a/dev-ruby/ultraviolet/Manifest
+++ b/dev-ruby/ultraviolet/Manifest
@@ -1,4 +1,3 @@
 DIST ultraviolet-1.0.1.gem 46592 BLAKE2B 2dd9b69bafdb83c321eee2c4fed9a39782959893993bdd27d3c1ab8337ac1f9a68d8cf7cddbef12404041d541d183f0bd205a4c36ee4978a2c0a631d0df3fbce SHA512 f974f95743b56d7424c8ac96867c56f4d849247ba552bd09ba8893ca6520758ff2132ac46a42f22b8547732bd148531d177a7d38522fad1dfb86d54ffbb29861
 EBUILD ultraviolet-1.0.1-r1.ebuild 657 BLAKE2B bc83e22798f9e9a94d20506823d7da13b41f4bfe1c72f691c0e2055b08e0545c46ead88c66311b2d9f9cc2f0184dd4967b243cddba8f9585f78aec3060c89a3a SHA512 a1f2b3dfcc88ac225c902d0686be4536713db156f8514d52b639c9a723f9015610bf408bd66325ac397eb6f45af95c7ff088fd44165bcfa26a699ae9fd266b8a
-EBUILD ultraviolet-1.0.1.ebuild 695 BLAKE2B 44b745ee8a8355ce7c6a7a925f664d863fd0b93bdb959fb967f39d929a66c34eda33e937a9b6d86ed258e616ffdb83e2977b7ede14e034ee994daa611fbb57b3 SHA512 b4312d8add4fa39e4250cef979e10afa1130c6acf79a8e57a36d28f61661ad4761b432d8b9a51f46499b389257e1b43c5ec92d7579bf621bae61fbc4f4ea663d
 MISC metadata.xml 345 BLAKE2B 72aef81c1274db29f1898e20cf4a298d017000f8cc2842be7066fad3600feb955faaa0a0f8361fefd931395a252ffaf43bcfc0761074a1a8ddc6ce150ca26c36 SHA512 3cf569bd61e3369a5b1ebfe5c45d01df67316bdf5aaf429514f68f89e2aa526a6bb7460a970b906c8845c3f04d25d35151d986ee72e3f9509791340576539391
diff --git a/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild b/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
deleted file mode 100644
index 202f8f346d5b..000000000000
--- a/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-RUBY_FAKEGEM_EXTRAINSTALL="render"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A syntax highlighting engine based on Textpow"
-HOMEPAGE="https://github.com/grosser/ultraviolet"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/textpow-1.3.0"
-
-all_ruby_prepare() {
-	sed -i -e '/rdoc_patter/d' Rakefile || die
-	sed -i -e '/git ls-files/d' ultraviolet.gemspec || die
-}
diff --git a/dev-ruby/unindent/Manifest b/dev-ruby/unindent/Manifest
index d35593155100..1a1c2f723ada 100644
--- a/dev-ruby/unindent/Manifest
+++ b/dev-ruby/unindent/Manifest
@@ -1,3 +1,4 @@
 DIST unindent-1.0.gem 6144 BLAKE2B 8720a1f6aca7da8cc8659f5a3943e9e56d15f9349efdd622857bbeffc39b04b61beb2b72a9cd337d516db2fbefd7aae02827b6705a81622ca5904dcdcc7575ad SHA512 1bab3352fc8da8b8a3ade8dff2f7c565e36529a79ca68c0a1ca73cdeca93fa507baa9399c6eed4fa020aa74dea6c4260a0242fa8057931a90bc172f138a5e655
+EBUILD unindent-1.0-r1.ebuild 502 BLAKE2B 4778cd88fb57a091dcbe2657173e6579af988168eb82861308040f36ca65934977d47a93cfc9999dfa1e6314e4ebad2b13c95153647def67ee87e1b725cd009c SHA512 34b014659b987bdca57e07200266503cd4ef4a9578c958ca22b3b25d86e3233bb69f7970174bcf7bc7998539453d06d1805025a0ab5cc4733822abc61c1b3bb9
 EBUILD unindent-1.0.ebuild 533 BLAKE2B ecd119a1b6dd26bde0b8b38e78a6236313027d7296ffb66355371c8d9b67b543aeebaf58e125203cf743eddd8ee196308cfc46c2698390bad280003387921e81 SHA512 05046ab219719e3cde630f2af113d9d8e8f9bd2e2b779b6f850006096b4280ef7e43aaa1f0915be9e2947da8766740ecddc0687653ffe78c9bf82b61686d254d
 MISC metadata.xml 341 BLAKE2B b95139c053f991f2430ac53d70f116c8d70757162b4bdd246283cd3e477afc58c0bb9ce2de89cdf27a7f54148f4958920b04a5066522a7f628a062a81f4bf033 SHA512 41d29de1617293949f2df18b503f931818137f002639578a75b7b6254d78f47d5b56f08ac028c37b3d399dfd8a1d63b2d3f40e22452f9a7ec8beb61c52d88e21
diff --git a/dev-ruby/unindent/unindent-1.0-r1.ebuild b/dev-ruby/unindent/unindent-1.0-r1.ebuild
new file mode 100644
index 000000000000..5c81007c698f
--- /dev/null
+++ b/dev-ruby/unindent/unindent-1.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby method to unindent strings"
+HOMEPAGE="https://github.com/mynyml/unindent"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/nanotest )"
+
+each_ruby_test() {
+	${RUBY} -I.:lib test/test_unindent.rb || die
+}
diff --git a/dev-ruby/websocket-driver/Manifest b/dev-ruby/websocket-driver/Manifest
index 9862c2f78ee5..5a893d061500 100644
--- a/dev-ruby/websocket-driver/Manifest
+++ b/dev-ruby/websocket-driver/Manifest
@@ -1,8 +1,5 @@
 DIST websocket-driver-0.6.5.tar.gz 24737 BLAKE2B 137c16a69309a1aad07fff663ff95a888a151f0fa20e78e754ae62ddfc8c2bdbfda926d7f4c53549e92646d018df7f374721e95246eb2985012e6b219970c4c6 SHA512 6915fdefac26a24e1f7d3d9a7e6bc6afc84b491150290a75a14243c233f5029d7d6e90a803b34bd6a8e8717322c6ae6fd4d3f3dad7a50c8eb18f17c3f2e9bbd0
-DIST websocket-driver-0.7.4.tar.gz 26184 BLAKE2B d28b078653fd86714a8546479c2a581cdf3d14c601b66f933da13d44d8622b88589008e1e691498d698d559b52ca920f6ece6e236836e6f401ea79d67b8b497d SHA512 a23b199d320f76ec49230932426b9e6bd2e21eccb76fa2a6ee6ae65cd954ae86b8274151a892ffe50c5d934b1f13553f733efcc497f73de65efce270f5959d03
 DIST websocket-driver-0.7.5.tar.gz 26179 BLAKE2B 8e7739d6cf48de5a2ef443f476652af74b269c075aa1e6bc13b2ac3ac17ede1699594a9380a137b307eaaed19ac2868b6a1362a66f835262f18e82f81c8e445f SHA512 538c78cd39507fb6cddeaa6196f0e2bbb89d7293f062d9b0231b6c6988a46b718c91b69a50b4cbf5b227067e6ed4ee89c61759bf340fc3e483c4af97052d42f9
 EBUILD websocket-driver-0.6.5-r1.ebuild 831 BLAKE2B 70f301dbf5789c5fb4a0ccdd5f2186a96a267a4a0b8cbfdf14d94adb51ed20e276f3a21e0f35e412111e7c766a4040ecdbbe8f97fb81abde36f033b762b1cf02 SHA512 642f7ef178dfdc5c0aa843ab669e5f083b7f5489461ea47c3d519b7f9f48bbd6a3e848a36869bfe8ebb439d58db0cc0997b3bf0a6c29880eb3dd4608d93d7d75
-EBUILD websocket-driver-0.6.5.ebuild 963 BLAKE2B 3ef1c98fee0e175e302a46841bee7b371b2e3430ea57565ae781128d2c654d64d5b08f61c4601cf5491c293efabdb4b437c89a2b09002eec7e04663c9e1bfc23 SHA512 419ee174c8e39baf21159308e94e2bce1f81772cf37c82ddedc65e12e2baee99b009911bda70719bbbc2da0ae1d58be449a3c362da50adfeff40a21355e28eeb
-EBUILD websocket-driver-0.7.4.ebuild 815 BLAKE2B a99e19ee71c87e1f3128a06887d6bf617abc4597ee1e0b68facf91a17ef32c6c3c27fb7e1439469d7d7164265a3ca7faa994514062f208ea2b180e27105b24f3 SHA512 ee4ddba5831e0f310a6f39b86ca705468984a16ef2e1a0707d5952721fb9603becc11aca1a5870a715d21d2d497165be721e774116bb4299f1f31cbba765f13d
 EBUILD websocket-driver-0.7.5.ebuild 815 BLAKE2B a99e19ee71c87e1f3128a06887d6bf617abc4597ee1e0b68facf91a17ef32c6c3c27fb7e1439469d7d7164265a3ca7faa994514062f208ea2b180e27105b24f3 SHA512 ee4ddba5831e0f310a6f39b86ca705468984a16ef2e1a0707d5952721fb9603becc11aca1a5870a715d21d2d497165be721e774116bb4299f1f31cbba765f13d
 MISC metadata.xml 352 BLAKE2B 97504816fa7ecfb7afa7a4cdc75e592d5c31b7bf46e6e7813ac374eb7ac64e34c95a6dc46f6effebce6e712fbd5e66b561cd5d74af2c000603dc4583d9eebbb7 SHA512 22d85a04b0817950a9da710f66781f849f9fbdf4f4cf0af3728abfbbff745c2040bdf0ff0362634954502f0bee00fc2107f9186928adc7936497902bd865ee21
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.6.5.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.6.5.ebuild
deleted file mode 100644
index 71ee4dc6b7a8..000000000000
--- a/dev-ruby/websocket-driver/websocket-driver-0.6.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A complete implementation of the WebSocket protocols"
-HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
-SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/websocket-driver extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/websocket-driver
-	cp ext/websocket-driver/websocket_mask.so lib/ || die
-}
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.7.4.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.7.4.ebuild
deleted file mode 100644
index fffb5983f6ca..000000000000
--- a/dev-ruby/websocket-driver/websocket-driver-0.7.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/websocket-driver/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="A complete implementation of the WebSocket protocols"
-HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
-SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 1caf74c25c7d..9aeaaf338c1f 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,5 +1,5 @@
 DIST yard-0.9.20-git.tgz 921130 BLAKE2B 37b1b2524147a1a8cb36c3835cce4e7666e2c8d3d5c187eb402000fb251df64111c4f104957ac9d28bd0e8d9328eb1d97571337ae54479626dcaab3cf07625a6 SHA512 b7e035a3598c8ef32fcbaae57254c0fb0cba875606b434571da2ef754f3171b5c42a4b3a45bd4bf41bce368f6fb7e448567f601a9cab5fbdae695bbec1b73608
 DIST yard-0.9.26-git.tgz 930901 BLAKE2B 19baaefc54269bbc7eee053b42f2be85644a062cbf55b0fafb63748876aad3a3143767855f4ee7b10a1ae814110a6cf63c01e4055e054aeb31bf8512e793d80d SHA512 0f70a089d5e5ba33e326b0ae0cc84a2cacfc5a3f3080545d5fc5bb324dedbbbf65116cc9412b3496c09b2b6c15514e854a741a1fd7e2ae782804d6e4ac28fcd9
 EBUILD yard-0.9.20.ebuild 1766 BLAKE2B c8b561e62e689e9dd828cbbd4674a317ce50dddbfd63a82766eabd315ed4a1c8c7ab80f6a84ef77dd2181c164c9419d62ec491a94dedb7eaa6a4a66bc0a25e8b SHA512 9554cd54d05877dd5e3197127e463c01dd01f578a5d92249d2adaf27bba34a8627075a7ed3af229ab28c473b5144959b519d2006dfc034318d00d2e28e73b37e
-EBUILD yard-0.9.26.ebuild 2053 BLAKE2B 5e0ff76cf08b10fdc85b735ebbcf3508c0ee948db891e3869f66d367d9a2cb68e57f4fd7d0126f7599c50c9c1fe6faabe8eeb2e51f836db6798a18b04b6643d9 SHA512 915cdf0d5d80aa400e54d7eab56c985a51a13aa415699560dba9524acf9b4a2dd9d0edb8b2f0af2ca6442a6bd405b4c681e03b2bb28150d27900138323444dbd
+EBUILD yard-0.9.26.ebuild 2052 BLAKE2B d30b5c7a6d74d5241aea8fbd3d6a76c7f5366c30a2b752feaf89ecee93d9291489b26ed86436b868305edd768c19cee655f3222005a182715fe63aaf488e6b14 SHA512 b25e75ec195cc983610038bd7230313c984b473b2a5de05a787af36567ad44cf819a15bf46b5cef911d46ae305a8ae6c53d05e09faeb0863f091e2439a525da4
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.26.ebuild b/dev-ruby/yard/yard-0.9.26.ebuild
index b3a0d0931abe..2bceb2a0fe8f 100644
--- a/dev-ruby/yard/yard-0.9.26.ebuild
+++ b/dev-ruby/yard/yard-0.9.26.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 43f4471c58a1..a371861e690c 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 49eff3c3333e..ac1988eeada9 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -22,6 +22,6 @@ DIST guile-3.0.7.tar.gz 21878396 BLAKE2B 4fae35e21e7f7b47ae9b4cdbafd3b2f660ec484
 EBUILD guile-1.8.8-r3.ebuild 3131 BLAKE2B 0da1627c6e5e8d3106911e19e1777b2fb2be2a5c684dbc71cb8cd9b4e8992b00ca2a101e933b226f0ae847a1e81453e91a5e0b87a4c4036af5fd554475b83b08 SHA512 5e3d788486e7be9d637dfdc669b4599f2c3a605b28802dceb82b4d8a414d4631a538775085b696725b03f3929fc646c0168f357b2cf76cde94da3a96d77b2410
 EBUILD guile-2.0.14-r4.ebuild 2222 BLAKE2B 78995d180b00fde3caa157ef93310964281dce34044f3b09f01fe4c2cdebbdbc5d648cdfc02ec5b4a0ff026ea422f7b8831bb935ffa6c2d353f33304bd5ed1b6 SHA512 73b9e384f5338325631aaef90f320ddd4ae1031ad41df15b570110bde955e34d27f9d6b5dd7af17599818c8800aa6686b37bac2d7598ef5e2756e1680f27aa58
 EBUILD guile-2.2.6.ebuild 1953 BLAKE2B 99ae78d4ed8c6a0a05b709df1237ca9b6bbca61df809c1f4cadd06147207e1abb90f0ef82ccf16c8e6aad4e653f0778f2c54eb965525d543139ba668341ce01b SHA512 ee2877ec48fb3e4f9e81859add46d4e0817627532b183faeb5f81cfd9b0a891084d5ee8e2c21256425c60f5c8166b64b910dceda0506e2fc14e8328f25ba01e6
-EBUILD guile-2.2.7-r1.ebuild 2017 BLAKE2B ea369c1323af47a36e4a701e99ccde2408cd27ccadd032165799fac280ecf8258e024518283dd57e6591ee1cb6862a9141f710eea7ea7fe2233f43c83b5a584d SHA512 0d5af790172fc3859f65d56b8a3a21739805f6f3f14719b9952d5747e08bfefa14514f3e3bcb6959a222b2f81cf3d5aab94d061a2dc09df547281f4005049288
+EBUILD guile-2.2.7-r1.ebuild 2016 BLAKE2B e8ac5c088e46c582c21014e7f3b1b290cdcd1e8d740ab91485d0231eeec426b28265efdf43f713ae4ff0ce43d95be432fc88ec03b08d7513e1d3f9dea9ebb99f SHA512 9376a9f2e2d0bcb718368d65ee6783067c5c4cc3658059e231321c17fa2a6d1a0f62c16af692ad9fd5aa0d36f332106c739ccd1453a2e90aeff8d84da9977059
 EBUILD guile-3.0.7.ebuild 1958 BLAKE2B 65898252823811c21d592d7adac205b8056e41658379a01e38dc39c1d9ee4c3d9862295db4e2c752bd53bba17b7f97f37fe92aa3867c51134e42fda3a4b60fd9 SHA512 b5f968df80cf50b92f3b18bf8ae5d28adfc646230d80f585752137836f7d17252b2180095d1e451e5decf36da1f96367970718806766c473cb04836161c9e119
 MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/guile-2.2.7-r1.ebuild b/dev-scheme/guile/guile-2.2.7-r1.ebuild
index cbe66c809377..78619a6cc767 100644
--- a/dev-scheme/guile/guile-2.2.7-r1.ebuild
+++ b/dev-scheme/guile/guile-2.2.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 REQUIRED_USE="regex" # workaround for bug 596322
 RESTRICT="strip"
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 3921265fe161..87758055f1fb 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/hevea/Manifest b/dev-tex/hevea/Manifest
index e68d07691705..055a757882d7 100644
--- a/dev-tex/hevea/Manifest
+++ b/dev-tex/hevea/Manifest
@@ -1,3 +1,3 @@
 DIST hevea-2.35.tar.gz 1006773 BLAKE2B 80a8f80955a4eee641c53784cbe4543072062d0bf4d757fe0c8270d6370d54495eeab3a9279bd992dc45b80b23de0438ee4fe6fa932981c777b25782c42ca4a8 SHA512 dc1a5179489626176b1fcae47a9c7eb4cf9c1c6127c749cb938808697ccd6179277089fb20f4d5da7b82056d15b1d64acd9ba9884d1950a74d98c98864b4180a
-EBUILD hevea-2.35-r1.ebuild 1591 BLAKE2B 6b81114c609d4a63e24c825ee60bf7deaacca9a66571799b32bbbc25c381cac26a4f937b309199a706b4db65e4ad1febf485555e02d4be190169859682261c9e SHA512 80294dbdb5fbb263b6772f9ef3d52e9921466f1b7749a191dfc62b42b18d29f186740eb33c8a61038a743d5f9a4b3e5b73185ae9a95290b364d838eb1aa6b314
+EBUILD hevea-2.35-r1.ebuild 1533 BLAKE2B d8fe1a536eb2ee67596ca594a30a9bcc3b97bbdf5fba12f41c216264f0d70a1c008a53d81626dd4fdcd067fbe76a722d0d2168c454883cae8445f7e791c6646c SHA512 663f5a7966856a087206dec376f05e79921ebdcff12a7440ed745ac95fa02e7ba13ae8fcc47feeeadb8c8d6d4bd8c39a449b55d7cd90a15706fe0003bc7c3f0b
 MISC metadata.xml 328 BLAKE2B e975d349093a2f893f0af0fc0dee56ec632e0beec6b0faf037b42ccbb21c7be7b530a6d8bdcb07d90c432f5f4f59eda56afcfccf7b54bab65b5c0d311aa658de SHA512 eac0fd6c81b46dd79a5b56e31103a4ba20ae40ac06a2941a5f11d8543c2358782882172e3fda1e2713846470f5bb1f5ed69b5bded0a60dde235a82158b399f83
diff --git a/dev-tex/hevea/hevea-2.35-r1.ebuild b/dev-tex/hevea/hevea-2.35-r1.ebuild
index 959e1a3b2be0..c28376ef9d8e 100644
--- a/dev-tex/hevea/hevea-2.35-r1.ebuild
+++ b/dev-tex/hevea/hevea-2.35-r1.ebuild
@@ -30,20 +30,20 @@ QA_FLAGS_IGNORED=(
 src_compile() {
 	rm -f config.sh || die
 
-	emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
+	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
 
 	if use ocamlopt; then
-		emake PREFIX="${EPREFIX}"/usr
+		emake PREFIX=/usr
 	else
-		emake PREFIX="${EPREFIX}"/usr TARGET=byte
+		emake PREFIX=/usr TARGET=byte
 	fi
 }
 
 src_install() {
 	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+		emake DESTDIR="${ED}" PREFIX=/usr install
 	else
-		emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr TARGET=byte install
+		emake DESTDIR="${ED}" PREFIX=/usr TARGET=byte install
 	fi
 
 	dodoc README CHANGES
diff --git a/dev-tex/pgf/Manifest b/dev-tex/pgf/Manifest
index 063df1ef6b54..ba47513492fd 100644
--- a/dev-tex/pgf/Manifest
+++ b/dev-tex/pgf/Manifest
@@ -5,5 +5,5 @@ DIST pgf-3.1.5b-pgfmanual.pdf 10531853 BLAKE2B 5bae5c0fa8a5427e93a779fecf76483ae
 DIST pgf-3.1.5b-revisioned.xz 244 BLAKE2B 7072ba9a8f22bc26fda64dcdb9a272ed71a718d0c99b5ee53acdf14e472bc7bc220ffc3a7d95bbef221f44bad5f136f8247d69dcd8b22f3d6215fd9c59ea3b67 SHA512 09803852bea5768186fbee86390249a046a9c9e9b60624d02de7e8ea34789e3640ba762b17dd717fc751d869ca3b30cc66e7c4237746ddc1390c65e70ab97302
 DIST pgf-3.1.5b.tar.gz 2597080 BLAKE2B 33b2ec65202d65a839db50ec084e0708d3f3b413e7bf1d09cf78d39bc2da1390b06a05f2e386de5f7a94c60634bf1e99354851245152c57bda67ecf20a980318 SHA512 a7473526746e8ba2485ece61f4b5dafb78d1714ba616fb7707ea22451f5b64c307474988ab6914a98e94773b7dc07492325c3e11037f3db2bf11f32396b8dc40
 EBUILD pgf-3.1.4b-r2.ebuild 1375 BLAKE2B ceb94a8679fe2ed0f348ace4d53ce0a447aa964838b29f523d0ac3472d7c1a4ba3011a33453cfd53fce17945aa4277b30e711a33261a559e17566842f79280fd SHA512 c2fb86dc65026b0fe4dcff8691b92a5a707a782ef54041ec9643f73c402ce15fc3225c270dfda43a9889171bca9aa57cd83b3ce6419eb6ba577cd29369e8ae5c
-EBUILD pgf-3.1.5b.ebuild 1375 BLAKE2B ceb94a8679fe2ed0f348ace4d53ce0a447aa964838b29f523d0ac3472d7c1a4ba3011a33453cfd53fce17945aa4277b30e711a33261a559e17566842f79280fd SHA512 c2fb86dc65026b0fe4dcff8691b92a5a707a782ef54041ec9643f73c402ce15fc3225c270dfda43a9889171bca9aa57cd83b3ce6419eb6ba577cd29369e8ae5c
+EBUILD pgf-3.1.5b.ebuild 1382 BLAKE2B 773fa8891cfbcd9428833f8631e4121f2ab4056c3008105edaba03302af78e23f254719efc3946046db16a0b2d481c074c110f55bb9b31219c08ed6be4e13e53 SHA512 14fc6a490e13509b39d67c66eb67a80946dd3df0aea8bf41f3e2d1ff4751fc03afe042be3c4623bc3ac569728450549e0f1d55d91104e523e0d9fb0ebad26f12
 MISC metadata.xml 322 BLAKE2B 1c28b0fcafac554548ea1862a338974f28c5d6b62745847627ffdba18494551b1fbc596c2e155787e5fc0b3410814a284f1792ee8fbb241cbae774c140a1d00a SHA512 09860d1821637bfc17aef0aae7b14913af3b5171c95a3a9edf7ab00a3b006e5335cd1d7770953a3d4956f7b876cd990affbad468b0a24d9290c69b5e1ef95ae4
diff --git a/dev-tex/pgf/pgf-3.1.5b.ebuild b/dev-tex/pgf/pgf-3.1.5b.ebuild
index 74694bbb1382..496597a53efc 100644
--- a/dev-tex/pgf/pgf-3.1.5b.ebuild
+++ b/dev-tex/pgf/pgf-3.1.5b.ebuild
@@ -13,7 +13,7 @@ SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 RDEPEND="dev-texlive/texlive-latexrecommended"
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index e414b0e2f16a..33d2e41b49da 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-bibtexextra/Manifest b/dev-texlive/texlive-bibtexextra/Manifest
index 7c29b660059b..6582ef9a585f 100644
--- a/dev-texlive/texlive-bibtexextra/Manifest
+++ b/dev-texlive/texlive-bibtexextra/Manifest
@@ -325,5 +325,5 @@ DIST tl-xcite.doc-2021.tar.xz 159256 BLAKE2B 1ec3175557d766bce16dc5ecc15f93d15ee
 DIST tl-xcite.source-2021.tar.xz 1664 BLAKE2B 350296de930545fb1ac5f7e007655e0b0fd65caf2024df4f8157bae10615383544fa4f6a0c39aa44a3165bf6c680517fc9a0981adde42377ffbe8db3f73ccbe5 SHA512 0f6d0e7206b59acd468dbd77ef3358d2865f48e2d59ccae2ec185759c137b9db99bf417acf71ec40cbafbf2569cd9b4a74a97b7a3959f51f1703af9a026486e4
 DIST tl-zootaxa-bst-2021.tar.xz 6228 BLAKE2B 796c41db57159702436e8dcc779774378c667090dd5900217b570f9a751a63d148b01c7c0a82858ef14bd969a0486e99c42ba7d8510105ef40f597e0a48a2429 SHA512 80816556a2e23cfd8345b7d22224142a5448105ccc5c1143f33c4560a4e4ab432115c2fc47c5d4c6ba599031f4c36b481465a5fa7b32afde888beac69a6e6c62
 DIST tl-zootaxa-bst.doc-2021.tar.xz 135268 BLAKE2B 46f7ef7a4a9d5c58be0b4b891329ff2e0c6b19fb3a50cafcbe7dd1412b6b14ca6ea4aa18f92d9f467b529b0459a150e3758a8097f5120f0ad7c7820e4e7fdcf0 SHA512 f843aa27ab0c2139e1051aefaa9b667f2de489cc13578200ce7db2bdfc2397888856c6cbe68b6fa201e0cb269bb95818cb31f1b03622c49ebdced23fa5960d65
-EBUILD texlive-bibtexextra-2021.ebuild 5891 BLAKE2B adae5b575533cc93fe489911ff087cec2d45fb868cc3a88efb8fdeed970efa7f69ac594ed6542d514f7c7508c404633652d7417ec706c59f5d02e5f34945e9b3 SHA512 7d9ef6d6c94c808ecbb59f9954cd3c0cd46d81a3419500419cc529af79844df3d81ec0dccaf3d666ae955f66bb593b01a9ffc5cbe5b0cbd3ec81a36dfc31fd12
+EBUILD texlive-bibtexextra-2021.ebuild 5898 BLAKE2B 0618628e877644d8b3063d0a90261630759bf1825b3ca1e0fc9ddc44ee7a4825da487cc1ee0c77e4ab248c7d94c92a2ca3c8591f7810460d4cfedbcbd5b52260 SHA512 b1a34001a4786f4db2990df0fbc188a8930da16c59df520abd287628fdf097a519914c668741ccd4be6b67fe75aeb8aec0d74f627c8fe4ed560859b40c27cafa
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2021.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2021.ebuild
index a865f4d6731a..3bdeb5f8514e 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2021.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
 
 LICENSE=" Artistic-2 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021
 >=dev-texlive/texlive-latex-2019
diff --git a/dev-texlive/texlive-fontsextra/Manifest b/dev-texlive/texlive-fontsextra/Manifest
index b484e57c9b37..f1b6248fd027 100644
--- a/dev-texlive/texlive-fontsextra/Manifest
+++ b/dev-texlive/texlive-fontsextra/Manifest
@@ -725,5 +725,5 @@ DIST tl-yinit-otf-2021.tar.xz 253664 BLAKE2B 5786f261f4ca61103ad6c6a815b5535f33b
 DIST tl-yinit-otf.doc-2021.tar.xz 604 BLAKE2B b1088af0d914050aab2b415d4182c19c23736180279e15185f88c07438c125100f5deb30929375e8bedecdb0ace04b53228218c0c9a02d084bbf54e1ecc70423 SHA512 6c73466c1e4ce1f7aec1b30980e5c44ca4917e161236fad7a0816bc93e921525b90f62abd8d41d3b767d8a6eda62a34534d7129d1fc490fda430345f8a2b3ce7
 DIST tl-zlmtt-2021.tar.xz 3072 BLAKE2B ed536eecad020104ce124f74966fa056bba0d9f6c67c0d509e1f5754993c7890e48f311ebdb48126eb7e1eab538d2931c6293cc13b462ebf4cf457cd4d0d93ae SHA512 b60e880508e08fc0a3f265b7d85c7ae8667c0a16264148a2944184a598f690f337149348157dc7b7b11f1cac59d44117425b50a26bbdaa0fbf1dcebb023093e6
 DIST tl-zlmtt.doc-2021.tar.xz 45412 BLAKE2B 73d94d5783ac247673d740a711325b9c381259331a0f94d239342b7ba2ae77b352565a274e8b9db49c37b1d670b2ad264e5fb13181f364b41f2607b314025ead SHA512 22e301f72e0b62078d7b6fe7d7740e0477d9b18beb59ab55b81dd65c50cb250ae711886f01944cdfd25f82d0dd2089c41e662cb2f16eaa0252d70c1006eed8d8
-EBUILD texlive-fontsextra-2021.ebuild 9180 BLAKE2B 9674eaa56007f4ebe3220ae8489cd8720ae564e594d4c88cbc246b5ddfb2b9a3d0b430aac316629ec68841fc9876715db2db27e42d2ed2eeef8f61c029ed7852 SHA512 f33de2fbbc772c451b5a082800fc940ec89ab576eaa517e1c45649e8feb1ef3080d91d13b1a8cb7b6171009ff612d30c5df2e2556ef84d1459baf18cc323bf51
+EBUILD texlive-fontsextra-2021.ebuild 9187 BLAKE2B 240838792128a889172a476f3351c8ea88b1442a591afd41e06a82eb10f09c8a86ee1c1df00cccc1daece4d549435c4df51b600f72ff05572530e9c3c91daad4 SHA512 de3a54abeea4dda120f6092963d9cd1161dfe30c26446f28121609c42b3290ee8564edbfdf1b354136ceb2c385842b5a0f0850ed847fa2567e7408334802aaf3
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2021.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2021.ebuild
index 93ccd6c41bf4..19e99da17621 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2021.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional fonts"
 
 LICENSE=" Apache-2.0 BSD CC-BY-SA-4.0 GPL-1 GPL-2 LPPL-1.3 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 "
diff --git a/dev-texlive/texlive-latexextra/Manifest b/dev-texlive/texlive-latexextra/Manifest
index c634e63c6116..321c3e0f7e42 100644
--- a/dev-texlive/texlive-latexextra/Manifest
+++ b/dev-texlive/texlive-latexextra/Manifest
@@ -3512,5 +3512,5 @@ DIST tl-zwgetfdate-2021.tar.xz 1384 BLAKE2B 66eb7b908d42263478e92ba65da89482110d
 DIST tl-zwgetfdate.doc-2021.tar.xz 246032 BLAKE2B bcd8426a8fbc14f895243e70ae9b570d03a2854f68222cfd52f01d2d063136ff40a847343a8d932db2ebb0ce64f018ff2d82060e747f4bfa4d4393faacf9f7b6 SHA512 7ab61dc4252ef7f60d1d5be8d4415bcaeaed194384a1da14a3400617b36c6efae3679dbbd6c8d64b8cc9f9947babe88c064d637379f663408cbe63ca42334bfb
 DIST tl-zwpagelayout-2021.tar.xz 8880 BLAKE2B 566315ec2e12e47b766a77ec8c98259cfbb3f717493704050ee76bfcb6ebb0756590632ee5ef1b4446b1b89cf00ebaef8a38bb053151398be8704b601d706542 SHA512 b960d63e610cf28ff74d7ade9c297d1c6d23a801eaea2b4f9fde71a3b77defe43ea5625c098ded915b8c011cc0041177d3e4c3fb28359b522af63214accd362f
 DIST tl-zwpagelayout.doc-2021.tar.xz 635808 BLAKE2B 5827aeab15882c2c20d065595aedb248dbece1f717898c23776e17482074a292e8f5a8de9741634eed931205cb18d9d50fa4490759a559d1309f4f213046dee6 SHA512 16bf8b249fbc857bfef787862b1d8e0e0ff60d11e2b80377ad85d7db014ece77ecdbca91829b4dd8f92c811712be39e9ba30058b8c7e61805552f7f6b13fc817
-EBUILD texlive-latexextra-2021.ebuild 46764 BLAKE2B 53a5769329060d921e7843029857731b8281fd48df536e71e90bed77d8205ab984f5ce3e9b4214089df35ec084fbc3c0d69f35e58d8c61642b72af483f91b8d1 SHA512 1d90ba064b88a28c2ec49b96fa4903f312a67b906ab2c97f17c7709a5714acbf7219fcc333b9586c474cf60e3b61dfa784a6f8e38568af42403e0af1232a0a7d
+EBUILD texlive-latexextra-2021.ebuild 46771 BLAKE2B 58853c59aa8f8e6f9b5217aa54c38ef48f6123a339f4ad8cd96e3aa5631e63887912719da0e94ed0aea774cb6580b1535cf7ca0d7b0338a70a7a101b7ec52bf9 SHA512 3600bd53192479f5eccbbc73113440401c57bb64ea0a36cc3fe9f24d51c39ce986f0840612efc56e21d4e6f7bcc4ab894461e29cb5fb223c324978d9e8c3bacf
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2021.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2021.ebuild
index dbcf962a794a..06f47114a9cf 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2021.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX additional packages"
 
 LICENSE=" Apache-2.0 Artistic BSD GPL-2 CC0-1.0 "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latexrecommended-2021
 >=dev-texlive/texlive-pictures-2021
diff --git a/dev-texlive/texlive-pictures/Manifest b/dev-texlive/texlive-pictures/Manifest
index a031af067e3e..200be0eac5ac 100644
--- a/dev-texlive/texlive-pictures/Manifest
+++ b/dev-texlive/texlive-pictures/Manifest
@@ -479,5 +479,5 @@ DIST tl-xpicture.doc-2021.tar.xz 1297960 BLAKE2B 8050df16058206e174fc31dbba5bbc0
 DIST tl-xpicture.source-2021.tar.xz 24428 BLAKE2B 5368f4004b717752dfbd3aa3a13eddfcba64b95976e03aa7ddcd8df62f8de3021e8f61ea713f6b4adc04d8c327979bab006ef63211400a23147df5568b0b68cd SHA512 e49b8512ef83ec38f20dafa1e5f191cfd4c2bbcc62016f209be06f969cccdf3cec9545a24756710c767946f8c532074d53de8a6bacd6c565fdf49c579b0cb6c7
 DIST tl-xypic-2021.tar.xz 709808 BLAKE2B 7192d7d06eb8fec456213d8124465258e325c86bb3ef7e6b898eba975f5e12857ee7f7f1e4c551b7caa7d0769862bddd3ac6b83fde7d2eaf32d9722c4f47ed3e SHA512 5bf1323499bd801e2d5e9ca2eaaf3d7726ed6b8063dee18180eec775ea4d2f86cca8bcae262375455af64ae00951a41b34386fd90666a2a89114a2fcf23ccb7f
 DIST tl-xypic.doc-2021.tar.xz 3923196 BLAKE2B 3a1598c0f34833f8336a9301102b259b8ccf293b1866126d67c812e933c3eddb4489dd733aa47e0b8b4a79fe0965a06a981c0d4420dfd8beac148edc581ac89e SHA512 cee264a3a8ee8f599b2310b4c9b722835a61fe8455c3f873ba91ad22ac7890cff8a1ef25f3d0b80aedd6420f31742f4e533fe20fc81dc83e4cc018684180c7ff
-EBUILD texlive-pictures-2021.ebuild 7007 BLAKE2B 093cce271167a066ab8f86516db12ea983c9c063eecfc7cf7074646dbfe5471964a4935399faa8d126608d17028c8fb84ecce5e4162d4d1338e198da1ddfb9a7 SHA512 8150346715f4257a38c1021d810040acb3ce8028808241db0ed7367ebcac9becaa3f4918da58ee0a24b89547cd1fd979775b680ea0e4a7b30addf11c96e5d01d
+EBUILD texlive-pictures-2021.ebuild 7014 BLAKE2B 35426620269689c4510434e85fe9daaa48aa9b913a384f0d024daa6d0626a6f4e1bdd3bbfb5f9c349712c3c5a5ee3cc3b4afbecf9afcdaa31c115d8ff0335907 SHA512 5f8eab2e7f3f08d8717e35dc2a8bb73f084e28a11531000f6be81806411ef443d1b6d8b0a24e53382315fbd43aa0b773a02c9ab4642c62ce1e64fd2321d4ca47
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2021.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2021.ebuild
index 7e1737cdc9a8..bf0b726eb99f 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2021.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics, pictures, diagrams"
 
 LICENSE=" Apache-2.0 BSD-2 GPL-2 CC0-1.0 "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-tex/pgf-3.0.1
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c332f07fdbcf..2128ee784506 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 7bbf7839d07f..41232a684871 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,6 +1,7 @@
 AUX android-tools-8.1.0_p1-build.patch 545 BLAKE2B 27b2adf298df89972eac73349118378c5210e9a1d4177292eff44a587627a9f16c8ad0eaca075b4f924e4e7733f73afc954ee10eeed3d465262102bbd012f313 SHA512 67d4f7a772ae48d23f253a385575203ff50d2559ba784832b177bbd9adbda614a7f868a3362e564af98ca840297213446a0c808b380e0ff7cce4cca78437f623
 AUX android-tools-9.0.0-limits-gcc11.patch 323 BLAKE2B a431febfcf8ffaa7a6f61c1c4b8bdf3dc9928d72350134b3b6046d150a4489fd5a2ba1ea35e76f549f04796110cfb1d6270cc83bb1614d3d5c3bb1550d912d3b SHA512 28ff8b1bd13b6d0410c6e8a338fdeb9feeeae7c2d1411967f81f1f73534a8a13d00378fbfad310c0abb589337d7fc4d5d62daa70a4d5a729502f40151c9b8148
 AUX make-tarballs.sh 3176 BLAKE2B 7438c5dc63c355f1789309b5e825373396788808223f64718da227066a3b870fdb0fdcc827d0dbefd56d8d72fa6740a8b8c64e75b58dcda1a79eddebb064f001 SHA512 aebcc6e6c336932b4c9770ff21bb2ee3beff6947a04e88904b6ac1d1475c0c1e0eb5ccd774d9cc07aef6a9f849bd8dcf5b344012cec9c9b595d1aff916fc30c3
+DIST android-tools-31.0.0p1.tar.xz 25135336 BLAKE2B abef4fa611541370d6c745c3f6df8f0326074ef23d4e656ab19443484b5459531fab0544936177397dece12b79ff37189003e818e49bfc4bb3d47e98955b917f SHA512 40bded59614a6d0543e5011038b7f1c6abcb64f0daa71a13175ecb75fe42cb9985ed3a6301d73ee8d4ea20e2c98e3ed8130824ee74dcebe75bc0d7f3052c9d3b
 DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
 DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
 DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943
@@ -10,6 +11,11 @@ DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646a
 DIST android-tools-9.0.0_r3-f2fs-tools.tar.xz 212092 BLAKE2B 32775e5b049bd2ff2ce7c9ea3362a602dcda6328e39036902020bd372a812898d84912f686cf347b225af630c2dea81ce30b601ac968b1168e2851b94ac2da2e SHA512 4fac8f18533c5c2270aed6e60b21721c643a44a27b37482ff8fd8fa4d7c875eb8a626d544ec4e6efb89c7408ae97e66ffd123588e90b98312e5291575ca8baa6
 DIST android-tools-9.0.0_r3-selinux.tar.xz 3202332 BLAKE2B 60a884eb1bd34fe5796f8fb33e5aefd7f9ffc85ac91784e0a8f0ca663010cf2222c80f4c419019b5817f9cbd8037ab78914e42417193e1b802a2682bb82c0097 SHA512 f0a77dc0ac91d434573370110c70529caabfd5f036c02ae5f1a4b2097e48324198d03ecdc92a622e1590012dd3f20f103384fed468f5e27aebcaf9315bb87078
 DIST android-tools-9.0.0_r3.ninja.xz 4244 BLAKE2B 14cea7523f22a7f4e02e93c32e4d4684e057abbe8e2b537b7e942cc27c13ea2aa13bcdb5c3ccafc261b8d7fc4b4cd4b9394e0970734b36111ccffbacecc5cfb9 SHA512 46956a608d6a9b93f1a035d6b0e153c476b55d4f8a2db4915b18ac9904a6d07befcbceb8e2e50054e7dbe2970be8539243134cd9722d2f2ec8a36a3153e03c56
+DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91a0ca037951bc9c5a3e790b3b2151716b234c2943301ecef4ed248914235736ddd949f772311bf823e9b3b3f1980b7a5c4b72e5bcd47 SHA512 747728723941091caa17c66e68e88d2145a2ff037e6f5724f89f680d2ce6f4031efebcda7dbcc5b459ca4f5f9ddbf4ba04b0451b9939d19eaf2fa9d9ab727284
+DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c
+DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
+DIST android-tools-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
 DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a
+EBUILD android-tools-31.0.0_p1.ebuild 3448 BLAKE2B 4fb9987fecefa86e9a2d55dd37c29d0684122f03419cf29630fc4a05d0012a1e66beffa5bc1529224bf46e7431ee3dcc84d27d1c241883948bf0f77d4f223928 SHA512 f0a32bb626d224bfb4729333ce63fd45bbbc4f39053aed2494b36022850673e32724e548353b67391c4101a4b6e186f5d8638ecb6d496bd869674a47761d031d
 EBUILD android-tools-9.0.0_p3-r1.ebuild 5135 BLAKE2B a11fd1cf1bb6c2455594dde183402c713597ff31dcf63b4216e9793035ab8546d0f34e2e82033da8f441ddd8f50ab52d793186674e96ed922b3dc86132db4b7f SHA512 19ade071b5e6c61b57ab2ff73a63fad78bd2494e9b0595b21712324fbdb67fc9e4410001fdb0d2ec0d912775aabb1e29d42994191f413ba35b4100d267f6cf2a
 MISC metadata.xml 714 BLAKE2B 2ec2b24289241323b1844412e6e0d1edf642dc3391171b474848ea376c51d420c98a4a0c094afad2dc1c7cf55b0efb744ca6a92beeed770d015a6380b07b85b0 SHA512 720b38485a7c248e6a9d43a7056e33a384fe7e295fc843c69e59d48350bb10d7d4446e6cc52b7c87e2b0322733553e16c9dda4e37104753d5aaceec5adf859bd
diff --git a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild b/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
new file mode 100644
index 000000000000..cd63e3a63f4a
--- /dev/null
+++ b/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://github.com/mid-kid/android-tools/commit/32d76cdbeb8a4fc2bb5fe22f496a9b82b68305a3.patch -> ${PN}-no-gtest.patch
+	https://github.com/mid-kid/android-tools/commit/9806fe4b730e15027ace235c62e166ae6148df56.patch -> ${PN}-fix-gcc11.patch
+	https://github.com/mid-kid/android-tools/commit/557182ba3f912327e747c3c3638d6ee7c529fb96.patch -> ${PN}-dont-install-license.patch
+	https://github.com/mid-kid/android-tools/commit/5971ec8ebab527fa17c91eaebe012d2a89a838db.patch -> ${PN}-install-e2fsdroid-ext2simg.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-no-gtest.patch"
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}"
+	eapply "${DISTDIR}/${PN}-fix-gcc11.patch"
+	cd "${S}/vendor/boringssl" || die
+	eapply "${S}/patches/boringssl/0001-Fix-mismatch-between-header-and-implementation-of-bn_sqr_comba8.patch"
+	eapply "${S}/patches/boringssl/0002-Use-an-unsized-helper-for-truncated-SHA-512-variants.patch"
+	eapply "${S}/patches/boringssl/0003-Fix-unnecessarily-direction-specific-tests-in-cipher_tests.txt.patch"
+	eapply "${S}/patches/boringssl/0004-Test-empty-EVP_CIPHER-inputs-and-fix-exact-memcpy-overlap.patch"
+	eapply "${S}/patches/boringssl/0005-Make-words-in-crypto-fipsmodule-modes-actually-words.patch"
+	eapply "${S}/patches/boringssl/0006-Move-load-store-helpers-to-crypto-internal.h.patch"
+	eapply "${S}/patches/boringssl/0007-Fold-ripemd-internal.h-into-ripemd.c.patch"
+	eapply "${S}/patches/boringssl/0008-Pull-HASH_TRANSFORM-out-of-md32_common.h.patch"
+	eapply "${S}/patches/boringssl/0009-Make-md32_common.h-single-included-and-use-an-unsized-helper-for-SHA-256.patch"
+	eapply "${S}/patches/boringssl/0010-Fix-array-parametes-warnings.patch"
+	cd "${S}"
+	eapply "${DISTDIR}/${PN}-dont-install-license.patch"
+	eapply "${DISTDIR}/${PN}-install-e2fsdroid-ext2simg.patch"
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 46ecd1a4262c..de6b055cee18 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,5 @@
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
 DIST bear-3.0.13.tar.gz 120488 BLAKE2B 9159858110afc45f4888a294325be8609bdcb78a2421dbb8ae4b5109cbea80a06d907e961c398cf011025d93d8d1cceec640ce12d613fd80d38d8f06532305db SHA512 1c515d5941870b9bc76fa85d02229ace85653c6f985e00a8fa9e2f17ba9079d162d654a17024394819a7ae203167253641a3d7c17c490e49e30fa92d434e6a6e
 EBUILD bear-2.4.4.ebuild 1638 BLAKE2B 26435a94e41a295c629ca64a62f726a1ec58be5e85bcfbc312a2f6cd75d3232aae1e6854ad3415e99dfc369ce0e4a1ed0ff9e1b413332d24102015a2d1592d24 SHA512 c7d5cd603d219d8a1f764c728fdfb476b79b500b3db6c5513bb91397f88d4b5f46d4b16903834b93fff38f1fad243bca7c0c10d8893f2ce6238ac24847402e94
-EBUILD bear-3.0.13.ebuild 2094 BLAKE2B e32af6d46e56f141f388bb3bda434260384cb546348f3ef71a68ba74f7b0eed62bf42038446c4953f37d1bbb7b859a864623798ffd737ba0466c5b6f6ab7c8d4 SHA512 9bcbf26ce6285b39caa96dd1dc50dcfa0b0c8aea30949127ea9a97b7be197c0dcaea77b04b745ab6b31878bad988e613431d5593aa9342a5c5cb24c827210fe3
+EBUILD bear-3.0.13.ebuild 2095 BLAKE2B 515d7147414212b1edba08ef6a63c58f2e85de1908103b4308d6eaa13ca23c4e058025181f3a5ee0fa0c25712950f6130513d47bd073abbfd03343903eac8985 SHA512 480fa8af0fde9f09bb70a14021fad6d0766c9831590c2c46db6e6a1331f3d24dc0b3a6202051fe9975567047c86dddc2f89e3324113586c6c84042659d69b81e
 MISC metadata.xml 914 BLAKE2B 791cac2c9a3850bc49848ec8f6ff889a21802ddce6937783afccdda45045b3861f0c79e44028ea6df18f046c5fc1b6ad89ac1a940afc9e4d6607507a12933382 SHA512 a7b29ce47f3c9d91f2ba5d1abf5975d64a9229619737b75d38d54b3bde860a47a859e6de7a959ad67cba21b2a0ced8a9fbaf508c02cace63c4090afbac2005ba
diff --git a/dev-util/bear/bear-3.0.13.ebuild b/dev-util/bear/bear-3.0.13.ebuild
index 97791cb96b0b..ce27dec8b196 100644
--- a/dev-util/bear/bear-3.0.13.ebuild
+++ b/dev-util/bear/bear-3.0.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index f65e842de3c2..8040d2026fec 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -2,9 +2,9 @@ AUX bpftrace-0.10.0-dont-compress-man.patch 722 BLAKE2B 583969e9f4457a49f17f33d9
 AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4b5ae28626f6905c45f6510f84b7c6f28aa3b5174f1f48a30763990b2a3cc50c6336249fe1dc4cf31656871a8adce43c8d7 SHA512 332e6cc4d1c21e917451c9aa6028b082f53dde8221419ba45ad7ae6321e444b3f67ec8366cbd56638d8f8b68a3be06af892eba765c810744951af1de9b994113
 AUX bpftrace-0.12.0-fuzzing-build.patch 491 BLAKE2B 6fcc78660f69742247bedded028a4c18f933f32c424bb5d11976ff5ddbe16587948e6c75303e75daad440f2cd578fb1a4c3682ca34657a3d2b83a0f67843f994 SHA512 ab9f0b8115ac17130841e7d9b1ad59e5f2a6836acd48ab1d5c3fec45ce75a7833d033a37cb1ddcdd72cd794c202cdaeb287689f67bbb2a9baccb8628c3ff2a59
 AUX bpftrace-0.12.0-install-libs.patch 6364 BLAKE2B e4b59b882c04f58c711f61653f2cb5f28a99f06891d979372e854bae1f125dba43bb64a65a14bd8e85ac97ae8b3e933ab1cc61a2ff9253113428394fbbebe599 SHA512 d9efc5bc544cb97eda647c84ee917851d3c63ff9648b2d026a8e699d5b0d3755f06983984c793cbf2efe865f15588d7d1e414e7b16026067aa5bc5dafb05c456
-AUX bpftrace-0.13.0-install-libs.patch 5639 BLAKE2B 985ac0627c802d2a6207e02913dac49ab75615313fd76150984074f17aa69d97387c6e492d1d15d55e1556abeff6d35cf1856a5326065ec0207a5a4c6377c170 SHA512 a0df14dc129ec066636036859dd5b06a5258aa760698383f9ebb6242f25b1d588c49f00a291d6f4e9900a7c8eb17b5df664416f666fbce543d739008ac815181
+AUX bpftrace-0.13.0-install-libs.patch 5716 BLAKE2B a50df0b1aa633aeea97af0c9db22729ef81af11722340bd8f10e3d66082e5ff002f2c73712667ba918cbcc51d194980dbf5ad95381102cecd218afa4a394bf31 SHA512 437af44d5953c1510e56aed3ee39c12ff2e06adb3c4fb16e335c4de1ba8dc2aff1f6fdf92cf2e1873ada4574b460b3d7788e5b52f9422c7bf66dfb92375dc7e0
 DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B 3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993 SHA512 a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345
 DIST bpftrace-0.13.0.tar.gz 952412 BLAKE2B 8e3f6f28b0c652e2257e1a970b80b87ba5ac5e94dc26719bffe16a0bbff48efc2b9ab5bc03e5fe4b764f5c9c3df16039d931f1f13c1f14327880838a373edacc SHA512 16b3f11c365cc7e306045a5cb6bcf6c66b92d746884f6587ce7cc4c76841b284757bff7b38b9838eb3db129e996e4f1b13afec34da57981362dadef8460816d0
 EBUILD bpftrace-0.12.1-r1.ebuild 1717 BLAKE2B b2e89c2456ab0dbdc38ce8fead1297cc4241a1f454fcc8d93fda913468b01f8f398155918089c5b2f7a91b8fde1d06e3c96ca126e4694d433b5624a62655aaef SHA512 9a28f395f250d80c001f34935e75667d39d2a80f07e4c4c37d9acb61707c5856bca560c70e1f5130a0c23aa2242b1ea3a6d2d8cf2f59418271bdccbcc69227ed
-EBUILD bpftrace-0.13.0.ebuild 1717 BLAKE2B 983e2a0bab14db717143b9f3a43a0ed1f4424ad98cb77967f16d9dd97b968f4b4e4de98c41e5b9d33bef6f44ad52ce3ad004382471912b624950c871af38a750 SHA512 a2a27e804e0f851324ffcdb430f7278907fdac3056f186eb54ca8a1586991ba9fe52dd0c9b173b6b193ea2f6a2eb383f8af269b586c3b66eeda8a42cb905d5b4
+EBUILD bpftrace-0.13.0-r1.ebuild 1717 BLAKE2B 983e2a0bab14db717143b9f3a43a0ed1f4424ad98cb77967f16d9dd97b968f4b4e4de98c41e5b9d33bef6f44ad52ce3ad004382471912b624950c871af38a750 SHA512 a2a27e804e0f851324ffcdb430f7278907fdac3056f186eb54ca8a1586991ba9fe52dd0c9b173b6b193ea2f6a2eb383f8af269b586c3b66eeda8a42cb905d5b4
 MISC metadata.xml 384 BLAKE2B f15afc660256a07333c80974b7860af277b8e8d56a33c3d60e121399fe3e99f8260353bbcf44f53179829cdf8aeff1373c7ae6c8cbcfc1d4699046c6814ed10b SHA512 803c1e1c3f7e3a3a0e0e3510049385f81685fdcd4c5b6fcdf4244f476bd42861727389759a3de66493ad4d3f1c902b04a23406f119794995394858ff16983fa8
diff --git a/dev-util/bpftrace/bpftrace-0.13.0.ebuild b/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild
index 3437f2e80ce1..3437f2e80ce1 100644
--- a/dev-util/bpftrace/bpftrace-0.13.0.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild
diff --git a/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
index 03fd2d13e602..fb75f9db1ba3 100644
--- a/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
@@ -52,10 +52,10 @@ index 0361cdaa..f9c536a3 100644
  if (LIBBPF_BTF_DUMP_FOUND)
    target_include_directories(libbpftrace PUBLIC ${LIBBPF_INCLUDE_DIRS})
 diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index 76bb217e..6d243a7e 100644
+index 76bb217e..4ad0f626 100644
 --- a/src/arch/CMakeLists.txt
 +++ b/src/arch/CMakeLists.txt
-@@ -1,15 +1,15 @@
+@@ -1,15 +1,17 @@
  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
 -    add_library(arch aarch64.cpp)
 +    add_library(bpftracearch aarch64.cpp)
@@ -76,6 +76,8 @@ index 76bb217e..6d243a7e 100644
  else()
    message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
  endif()
++
++install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
 index 5234388c..8b40faaa 100644
 --- a/src/ast/CMakeLists.txt
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index afbb1cf5443f..0e10154658cf 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -19,10 +19,10 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
 DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
 DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
-DIST cmake-3.21.0-rc3.tar.gz 9617649 BLAKE2B 85c5e6fe579d34d64a0f23ee6a5006a71f243738d4c167cd20374e2317b09bc49eede25ba64b3fb27cf43a90a6f8be2072a60920985d113c55176e0cf7c5476b SHA512 fb0d3eadde91acafeb446e12aebd9228be2ebae978d0e33cf417fdd00ed7361a99b7397568a3b12c0fdf06122ae556592eecbdfef6fc540db45ccf4974011844
+DIST cmake-3.21.0.tar.gz 9617926 BLAKE2B 70a67bc6916ea566f8ae9b48d1e6882ff834dee796f67aa01ea2a6c95ecdeaef8b6e7fe95410f8f1206a92e05bcc659d90bde5254dfb107020e52d9e938f3e8c SHA512 b635c50db0d3a18392a84b24f14017bb625708bcc6f6ba2d749a5c37d45f5e0565e415a802d129090a18e0747f80f2640747650d28fa0b3069d28e3e6a735ebc
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.18.5.ebuild 6070 BLAKE2B 24ab19a092db23bbcbf3d8f1a87e21cc8f17575e8eff885efa81c3fb0161204f8f821bda04ac819fbad5f73936db8b2bff38b688252a9bcab30a7df002adfc71 SHA512 59b479102626d771fbf66f1dccc011e33ca5e3d77bc37f291c6e28fbdf998b7b5853da56875345807714b85a1e95c7b41fe2f5e98f6486191b1c80d6962697c8
 EBUILD cmake-3.19.7.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
 EBUILD cmake-3.20.5.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
-EBUILD cmake-3.21.0_rc3.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
+EBUILD cmake-3.21.0.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.21.0_rc3.ebuild b/dev-util/cmake/cmake-3.21.0.ebuild
index b1cc1455ac6c..b1cc1455ac6c 100644
--- a/dev-util/cmake/cmake-3.21.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.21.0.ebuild
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 7c2ec85efe19..3f2b2c47951f 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,3 +1,7 @@
+DIST cucumber-core-10.0.0.tar.gz 47173 BLAKE2B 3ce81c4ae9de1dafe444fcae4b2609b786e34d8efdf16e02c05ceaf7f077c13289bea23f6fc22616cb8ce16598ffd3f07cbc51751b3151455d65ecf396ac0e92 SHA512 7ed559ae5e9071f1697da74aa067fcbc42858d51c9d470280c0695df0ab0836b069be2e1ae8948ff01a674ca45be7eb2ac63c37d666d40c7ac333a0a5315c65a
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
-EBUILD cucumber-core-3.2.1.ebuild 995 BLAKE2B beb61a287c839d2d3e61279c12989ef96f11d3f336b86ac072223268b685203afd7e1a06dc8e9e5362beca308c7b9d2c50fc1d6bb283f0c94b8debcc753056ec SHA512 9964881d1e0a7bc322c902d3c7c4b5c53808506c8ec2b3b9585c69fad3c139d685954c76c4a58a86b29f8085092ef0dd8ea971381b48aea932aed6b3bb9dbaf7
+DIST cucumber-core-9.0.1.tar.gz 47009 BLAKE2B 2c78956643dfb08319732af24c08d5df811574891b582ba7ab51281c9a5299a3063c6c607af5cd9659aa0e160c0f3cab1d54b9cbd57d3dbf2768e97bb8f79e8e SHA512 0ac61797cda1d62d2b452d3d843be855f84b12fc9c435e8b5261700a981d94c9c88e36e309d8c2dc637ff195032768d363ffd9e7424c842d5b0ba98c3c678752
+EBUILD cucumber-core-10.0.0.ebuild 937 BLAKE2B 03ed124e774bbccac900eeb53342b7485613d325ff3719e8d1bbd9d6e935ce7444cb8548626fc959509aaed2304942552f5aec2c9b21ff40f12dec388cf13d57 SHA512 576f76e49e010f70a546d1a3e866f762c469e983d4517d228619498ac02d92b543a8c5e6e8b2c4adfe727786ec048df9b75fed86d43a2295285e97bbdf0e5406
+EBUILD cucumber-core-3.2.1.ebuild 1063 BLAKE2B 115e5a34df2654655c4c4d4eaafa34bbec22b277a35f484370f73e9987bc3be3809ecd61cd352a76a28b09a9afb929cfc034f82617aaf58bde424a7be07be9fb SHA512 4d0273470f96259204c7f909ddf29704c46adb498524304e4bd19f69505a5c0a78be29ebc32269fbcefce56f69c3ad27ef83df02b00aed40b8095e4b927b6d4b
+EBUILD cucumber-core-9.0.1.ebuild 1078 BLAKE2B 50ab41b1ab6d16d95878bcec0d268490c891daa5c8640f97006f0811e772270054ffaa45e01a07b81eb681b2d1821cfe9a051fd0e9cf9dc8ce4d27f74cad36fc SHA512 994e5aeafc446eb5c9640b56677db9fc024b803a45b7827e6c26c42c0d329de5abd49839fc75e09781327b825c4effc08c129d00314bf0beb3a51cb3c6d3eb27
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-10.0.0.ebuild b/dev-util/cucumber-core/cucumber-core-10.0.0.ebuild
new file mode 100644
index 000000000000..866432367d74
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-10.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-core-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/unindent-1.0
+	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-gherkin-20.0.0:20
+	>=dev-util/cucumber-messages-17.0.0:17
+	>=dev-util/cucumber-tag-expressions-3.0.1:3
+"
+
+all_ruby_prepare() {
+	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
+	rm -f spec/readme_spec.rb || die
+}
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
index 8be0d4dfaf35..4cd3f8a785ea 100644
--- a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
@@ -36,4 +36,6 @@ ruby_add_rdepend "
 all_ruby_prepare() {
 	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
 	rm -f spec/readme_spec.rb || die
+
+	sed -i -e '1igem "gherkin"' $(find spec -name "*_spec.rb") || die
 }
diff --git a/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild b/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
new file mode 100644
index 000000000000..d8262286e453
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-core-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/unindent-1.0
+	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-gherkin-18.1.0:18
+	>=dev-util/cucumber-tag-expressions-3.0.1:3
+	>=dev-util/cucumber-messages-15.0.0:15
+"
+
+all_ruby_prepare() {
+	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
+	rm -f spec/readme_spec.rb || die
+
+	# Ensure the correct version of cucumber-messages is used
+	sed -i -e '1igem "cucumber-messages", "~> 15.0"' $(find spec -name '*_spec.rb') || die
+}
diff --git a/dev-util/cucumber-create-meta/Manifest b/dev-util/cucumber-create-meta/Manifest
new file mode 100644
index 000000000000..6e147b6c4f18
--- /dev/null
+++ b/dev-util/cucumber-create-meta/Manifest
@@ -0,0 +1,3 @@
+DIST cucumber-create-meta-4.0.0.gem 8192 BLAKE2B 4809b0f9ec7f922af374ac46bd9d0cb9797f48738596f00c08bf3d861a19141160032421715d4d141b1b1854e77f3798d09308f626188c3ef6b30a491fadcd29 SHA512 0103b8277741d4eb2e590e1d7f9231187482d32f9a2c19c837baab759b3c48c11a39ac7af686d56fefb7b79120110e930c9af25fb895294529a3b5b0612a5b63
+EBUILD cucumber-create-meta-4.0.0.ebuild 541 BLAKE2B 30663bf142ff28bed66fa9aa2af38a49212346bd33ba8e71e622434cb7dc08d3cd53298cf227464b3864d0af66455ab755badc4b807d589a6724677f49680d02 SHA512 b15ffc99ab68640015465868012d0426eadeab527f646a0708d8ef417b827fc51d5c8bcef4fe0244d15901b5dc341bbf0bec634cbf7f4264af32dc57ed43f0fa
+MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-create-meta/cucumber-create-meta-4.0.0.ebuild b/dev-util/cucumber-create-meta/cucumber-create-meta-4.0.0.ebuild
new file mode 100644
index 000000000000..afd973929fda
--- /dev/null
+++ b/dev-util/cucumber-create-meta/cucumber-create-meta-4.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTML formatter for Cucumber"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-messages-15.0.0:15
+	>=dev-ruby/sys-uname-1.2.2:1
+"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "cucumber-messages", "~>15.0"' spec/cucumber/create_meta_spec.rb || die
+}
diff --git a/dev-util/cucumber-create-meta/metadata.xml b/dev-util/cucumber-create-meta/metadata.xml
new file mode 100644
index 000000000000..06c13e2d2e33
--- /dev/null
+++ b/dev-util/cucumber-create-meta/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aslakhellesoy/cucumber</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index ac543638e669..29e9af12a201 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -1,7 +1,5 @@
-DIST cucumber-cucumber-expressions-10.2.0.gem 22528 BLAKE2B beff2fb2229154f8bec7942be4679b876243f65621747482669041aafed099e27ca78f2696d67a39b0b05b3139a6eb1b0bc8da4a045724892a9e0656ee98dcc8 SHA512 9996bc084d10a56f7efe70220b4a0496fb540e4f288c1819be458d6e9e58443749dfb5e1ba6c6bfd36a95a8de51067cf27285ad175ebc9e0404233fdd4bfdba2
-DIST cucumber-cucumber-expressions-10.2.1.gem 23040 BLAKE2B 590f54eff3054a9d0e7e80732912b41fd314041578c0f4758a6fb0e175b7177f849dfdcd2eb32be5ab9ca4fbb282121c5ef0e2b18a0e66f287ade71acaff9cd3 SHA512 6f3ce32b70150d029febfa97d5bea5acbe7a59e588fa1f0b9961c6c64ca667a53514e2eaa6bf1160de916cc094f82aa341b03273f05fc54019bdb4e0940a3d02
 DIST cucumber-cucumber-expressions-10.3.0.gem 23552 BLAKE2B 6aab081690081e991a1c1dfdaac93e114165dc1b2a39a1825e6424304765c96836cec9dcb8635e9f97ef0c07a6b58cfe7fc587c651dc73bab0670f4230828640 SHA512 d560c62f625f6b284a94974cef5227a3623fead9c8c4f45ea9fed2300b37c405ba69161d6c6f5e159b2a36be5eeb05b122789cafcafec0dc84efbb366bd0166f
-EBUILD cucumber-cucumber-expressions-10.2.0.ebuild 482 BLAKE2B 38b52c2ab5403e58f9b53d7922ec0e4b5013436490ff84bf424709f497f98fa8b916b194fb3ac0a070cca1e17ad2d6d10f4623b4d000e863e1849268bf190ccf SHA512 8d1885a702f9536a3f0c25977f7d34ca22285e849f5a2d34ae1704fab8b8c8b430065386ebc6778bb3b82c73574cfaad49198ea3d746f708b3426f67b7e5f3f6
-EBUILD cucumber-cucumber-expressions-10.2.1.ebuild 475 BLAKE2B 200a330f113a55b51d98ad04636633b38a369ad76fdd2b20d11fc609b904f40a3bb6ffc107877ec670843aebc9e5f065574916a6d5374754e480a9cff84097df SHA512 fbcc950bcb316eecfffbcdd4addc9a64a7c3c280bab6eb56bae67e5a6ba0973ccef92beeba9653c7310de441488776ef70fbd87852e4dba88c5ca663ec3f6ae1
+DIST cucumber-cucumber-expressions-12.1.1.gem 32768 BLAKE2B 3b885771889349b84ab4a83537d720eef63c44297217a5b06ec78a9759d5617437ee7e1dc98d7dc692a3afbcfbbf1c315b76f2685577e861214b8ca943e6eb00 SHA512 6d931a589e4959d6e2647a3ae2a16fdc57e6de04d3e875277da55a60278548cb789d00216c2cb1374c56bcdc58d2e39228dc03f047d1a3a12774c8c03429c149
 EBUILD cucumber-cucumber-expressions-10.3.0.ebuild 475 BLAKE2B 200a330f113a55b51d98ad04636633b38a369ad76fdd2b20d11fc609b904f40a3bb6ffc107877ec670843aebc9e5f065574916a6d5374754e480a9cff84097df SHA512 fbcc950bcb316eecfffbcdd4addc9a64a7c3c280bab6eb56bae67e5a6ba0973ccef92beeba9653c7310de441488776ef70fbd87852e4dba88c5ca663ec3f6ae1
+EBUILD cucumber-cucumber-expressions-12.1.1.ebuild 475 BLAKE2B e26e384fe5073ccd078edd56cf23b98e6c3851e68ceb5c3be2e73e021b9022c4c161185194266fcef04cbc418ae392166a1ebf1df82a3dcb8f0306434f25e4d9 SHA512 dcb76c3fbd0997da31866e596ab9206ad4b8ab59175d20809e029de349935ceec01bf9c4d41213b6be08405e0bcc118b13e14cf885d508e6404a660033ab6265
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.0.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.0.ebuild
deleted file mode 100644
index 7be1d2114642..000000000000
--- a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.1.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.1.ebuild
deleted file mode 100644
index 10db2f04fa4f..000000000000
--- a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild
new file mode 100644
index 000000000000..1f98b61518ed
--- /dev/null
+++ b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a simpler alternative to Regular Expressions"
+HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-gherkin/Manifest b/dev-util/cucumber-gherkin/Manifest
new file mode 100644
index 000000000000..f15146c14c74
--- /dev/null
+++ b/dev-util/cucumber-gherkin/Manifest
@@ -0,0 +1,5 @@
+DIST cucumber-gherkin-18.1.1.tar.gz 12436812 BLAKE2B 5434d3133f35156d131283dff7cbdebb6523911ffca481ec61b6cb7fc41288e8deaa9afadfb4f34afc57729e92212c513fa203b279a54e5f09a389fe9bdef1dd SHA512 c6f329ea2f46e224b802a1a4062b8d66314c2ee124fd261cfeed390775acf184e1098879c17cae4838ef361ffcd0cf43b1eb77978da7376a87afc09576d25085
+DIST cucumber-gherkin-20.0.0.tar.gz 9238574 BLAKE2B 40dd7f31e234740528301ed20be59c6b550e256fdfc21b50883c7d6acf9aca75f61c6f87c86f6ab72ef8e6f9672814dd23ce2ba093bb0fe9a447027c2469ab6f SHA512 25a3180482166a1e6e7d63946b2ed8618558b62c5506c366c5a18b59064259473ea34b3169b666a366a271ddab08bc235a16bdedd34e184157cbd6f12068b1cb
+EBUILD cucumber-gherkin-18.1.1.ebuild 932 BLAKE2B 0e2f1fdc98a4145a594de994c1bda515cf38803b242ad41457e18ebaed620727bc62a2cd57f34ef6201970a2568d836a00c4235c5ce08454723966b746b6f3e8 SHA512 6eb87604c3953f1a422ed035796639ba91a2d8aebfa666bc82bda0646a26929cd6d2bc5dafbd3c0f10bf9c207ab6489f1374563b77d94f65de834295da790023
+EBUILD cucumber-gherkin-20.0.0.ebuild 741 BLAKE2B d8afd727a9ae4f2b5ecf8fed65fa63cdb963b615e3c2093a1b1c6b44766d2add104984599ce79ade9c99e42a165f6afd7ea4c7d9acc3c4d242acff05d4ee7a04 SHA512 6cc882826dd95d6e83fd9a78fcb4094d9689494f6c0471ee610fa43a40159f15f75383be959d621a212e8f44c0421c596299e291adb52071a0b3976a83461ed5
+MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild
new file mode 100644
index 000000000000..d4c99398b0f7
--- /dev/null
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+# Don't install support scripts to avoid slot collisions.
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-gherkin.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast Gherkin lexer and parser"
+HOMEPAGE="https://github.com/cucumber/gherkin"
+SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend ">=dev-util/cucumber-messages-15.0.0:15"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "cucumber-messages", "~> 15.0"' spec/gherkin/*_spec.rb spec/gherkin/*/*_spec.rb || die
+	sed -i -e '5igem "cucumber-messages", "~> 15.0"' bin/gherkin || die
+}
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.0.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.0.ebuild
new file mode 100644
index 000000000000..87a56e48a94d
--- /dev/null
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+# Don't install support scripts to avoid slot collisions.
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-gherkin.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast Gherkin lexer and parser"
+HOMEPAGE="https://github.com/cucumber/gherkin"
+SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend ">=dev-util/cucumber-messages-17.0.0:17"
diff --git a/dev-util/cucumber-gherkin/metadata.xml b/dev-util/cucumber-gherkin/metadata.xml
new file mode 100644
index 000000000000..06c13e2d2e33
--- /dev/null
+++ b/dev-util/cucumber-gherkin/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aslakhellesoy/cucumber</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
new file mode 100644
index 000000000000..3f296299d51d
--- /dev/null
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -0,0 +1,3 @@
+DIST cucumber-html-formatter-13.0.0.gem 436224 BLAKE2B ce3f58995560f6d78e855e95af83128e426817c749f64de8c8b2c475893a0da02ee72ea00ccf2d5d5745d94f93924ef52e9a1c01bebaca9cde889cba49f32270 SHA512 687ccb9245213ff9e59b85cf729fad05de385c94a31ae70cb770ba515c57309107fea16756853d93b1af39c68c3f936f7975540070b4b45bbdd79baf94513dc4
+EBUILD cucumber-html-formatter-13.0.0-r1.ebuild 541 BLAKE2B 024d0d68440f966a86fceb1a6a5dd095b0e92f8ae52d7b8dcddde9f7d9f33e9f04a27d4015fc1f5d69e1ecae041b2c0aef4bb216bf022d00fe6fa7765182a325 SHA512 73dab6b1483dc1a91e1ab41c75095ef6f1b1af0c7694612acc090251670fa1122d3bbe399e90b4c36f751e10092f83bf544504e7966835a2ae33594ce65ec298
+MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r1.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r1.ebuild
new file mode 100644
index 000000000000..b03fad428dd4
--- /dev/null
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTML formatter for Cucumber"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-messages-15.0.0:15
+"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "cucumber-messages", "~>15.0"' spec/html_formatter_spec.rb || die
+}
diff --git a/dev-util/cucumber-html-formatter/metadata.xml b/dev-util/cucumber-html-formatter/metadata.xml
new file mode 100644
index 000000000000..06c13e2d2e33
--- /dev/null
+++ b/dev-util/cucumber-html-formatter/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aslakhellesoy/cucumber</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index b7ca0f68589c..78ea8d4600ea 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -1,9 +1,9 @@
-DIST cucumber-messages-13.1.0.gem 10752 BLAKE2B 53ee61ab3ebb9f746701d583abbc78b31f929dabe848b88288888df891c0c8a9c2fe1ca416de5cf84cd47bdcb5b7d821a1ddf77ac2e5684b5315fdcdd104dc6b SHA512 cbb7ef75f8ef33dcb6230b62408f4c53ddc490029d271de54c753205aac761b4f47fec72d1d579be9c804c1dd512f3a9359f84b2a633d9bec211bba81b39a9e1
-DIST cucumber-messages-13.2.0.gem 10752 BLAKE2B babc649d1ba76819b9d6dade7eb926a0a220da02efdcc6438077c03ae1ebdccb29f2dd7d806fe950c47a796fa0b254760db0cdd4e1ff4d489e750f861156c2fd SHA512 0ad0fd6bcca7965129c70996a35e65fe7cad23b767273c1eb1851fee5c83e26ecdc5e1d5bc63a85950d0248682f45bdcd373da562e4e3fd541e633890216edab
 DIST cucumber-messages-13.2.1.gem 11264 BLAKE2B ed5fdd87a5e9bbeaee2bf39779f24841ea9a40568d6b3d9a7a7146f7d25efb92b3a8700f8573bd5f11f26958b4d6d7975b332fb7499c40220ac6e87a3f434d72 SHA512 449e01ee0704513e430d8f4c33cb7e363b7f15d70e7a6525adc703beaabd6a207a35bac16384577d0d0534c1c33f08ebfc8bead121c196b2bbc709a7d0ec210a
 DIST cucumber-messages-14.0.1.gem 11264 BLAKE2B aff0eac711df831708126bedccec15f945933df9345924a27398508194849a4a9a0155d20249dbdf2ddc68886affd22f8cc450f87696f4f81049219a7212e107 SHA512 fee0fe8fb0efb3b1bf4b9f2f56e3e2f305ff727767500fa869198b668bcb63e8af80898afc106242724c5aa1c94ff5511be7c3ce0e433be9be03dd66d8e2e09d
-EBUILD cucumber-messages-13.1.0.ebuild 498 BLAKE2B ea638bd90fb55c53d93616b7e5f5d6bcf447d0d47771006e58ba906d3af66319b11c746305f822a7c13c78d2deae663b9c284e48d60ecef65a6b159bd19a1085 SHA512 b125defb262a718a774d9a166836858cdefa9275b7facb079e6e0f62814a2c5f6c49ffc81e52293cb2d65b2692a2a7d285124a63c5152d6d9626ba0a166eb71f
-EBUILD cucumber-messages-13.2.0.ebuild 535 BLAKE2B b1b7bfeb3f57a58dc01305daa4d3f685e1bc3e82a2b1bcbc68a91b6b65e9701ed94c35eb214ba62740d61f926b223c8c6c3d53354b8d2892cab2bab25bfcd41b SHA512 72d0822f3abd401962b09d0af5fe453e48bae0603298e3662954f6622e4013086869f917d14bdc3e9fff46669f8e80656efa24580766ed396baa8fbe001609ea
+DIST cucumber-messages-15.0.0.gem 11264 BLAKE2B 41586a540fd4b092a25b3516419e912900f229f43ba3f8699733bdb67a2783d4e83c50df3b0605abb511894c6a466aa7cae7ee82bae8f48a2cab878349a54a63 SHA512 906a09517dfa6b44519b24ad9dbe5092d1ee24f0fa0e08291206f9b81e1611d988074b063f493ddc2034e05429b7c218380fe0412184c07ba8b2f7af2e3c9ead
+DIST cucumber-messages-17.0.0.gem 21504 BLAKE2B 3dbe6a8f2e486c790c05bb77105fc5ff9ec0acd5074df5a5fe4048a8ace5ce58267992fabfb58e1ed3881d510e18605d0a3fde69d5335f2f3fe47bba429d367f SHA512 fefd84e07ef8cc9e301ac299e969643b8977cf9ad8f9990401df8c71e4c35e7435a815a5922166f52c49052345451c06df6bafce3c139f28287172594bdc9e85
 EBUILD cucumber-messages-13.2.1.ebuild 535 BLAKE2B 57f655316794694d9dacfa77c5fe4f5297c78c9206cd618b859805cd8f7963161880014b66d663a80c093f2a9f3f393056e5b3f82d46aede1ce1d4896e662832 SHA512 018db7289a6caf01688ca1677b92ed96b9ad97922af6f9e18c06d9c3f10e5ae7058c5e41f4b955af13114e67a7627dab513e10acc86e43aa6d1bee830f2182ca
 EBUILD cucumber-messages-14.0.1.ebuild 535 BLAKE2B 57f655316794694d9dacfa77c5fe4f5297c78c9206cd618b859805cd8f7963161880014b66d663a80c093f2a9f3f393056e5b3f82d46aede1ce1d4896e662832 SHA512 018db7289a6caf01688ca1677b92ed96b9ad97922af6f9e18c06d9c3f10e5ae7058c5e41f4b955af13114e67a7627dab513e10acc86e43aa6d1bee830f2182ca
+EBUILD cucumber-messages-15.0.0.ebuild 528 BLAKE2B 3cd6cfe40ecb735331089899a385c7ab48cd6fbcf0b0dfe105eca0b896117d69a30ad311d146b2c37bd82513a6ebfc6f2a928ae3f8e95666e92d8e967f9d9a74 SHA512 ed69d1139def2bb722437158e4c6ca4b2885f94023d5b4fcbe273218dc2a60c7fbfcd53ab42946572215c4898511ffc4c6f8a747a9991fe8293ff7559f40a1dc
+EBUILD cucumber-messages-17.0.0.ebuild 477 BLAKE2B 7bbab777d90e354ee290e6b9c2be7dd28b7c8dc0f1cb8d279e998973458d437eb3bf5ad29e63991691077daa26de1a7ec83dfdb3b3779fd099a9746572c43f28 SHA512 04e4e6e64114b9fb03f4f303086ac273817c2e44594fa8d79e91cb8d65441219441e543a9ef0dfdd6eda5fcaff3db378ecffc5ccb7db7c3cfa3f8610f048ac9e
 MISC metadata.xml 313 BLAKE2B 8043a2240cf0e24b0307a6f068bd8bcccc65471d59ac643f3c654227695ec7a2392a6c1ed9ce4c0ca7cdd926a26be275b248626509c79aeaad48930e00f00c62 SHA512 949342e57dd6165f4402bd068865400a7affcc6e7f73adac6f8e121caf1ef9564bc95b61fa9bd7f80d9ca8597e5b5e0f3200a210d496577d4ec2fa881fbc23bb
diff --git a/dev-util/cucumber-messages/cucumber-messages-13.1.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-13.1.0.ebuild
deleted file mode 100644
index 3a73f5abb188..000000000000
--- a/dev-util/cucumber-messages/cucumber-messages-13.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
-HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-
-ruby_add_rdepend ">=dev-util/protobuf-cucumber-3.10.8:3"
diff --git a/dev-util/cucumber-messages/cucumber-messages-13.2.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-13.2.0.ebuild
deleted file mode 100644
index 6bff67f90b06..000000000000
--- a/dev-util/cucumber-messages/cucumber-messages-13.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
-HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-
-ruby_add_rdepend ">=dev-util/protobuf-cucumber-3.10.8:3"
diff --git a/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild
new file mode 100644
index 000000000000..988672a8a0bc
--- /dev/null
+++ b/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
+HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+
+ruby_add_rdepend ">=dev-util/protobuf-cucumber-3.10.8:3"
diff --git a/dev-util/cucumber-messages/cucumber-messages-17.0.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-17.0.0.ebuild
new file mode 100644
index 000000000000..ed9ef8e16930
--- /dev/null
+++ b/dev-util/cucumber-messages/cucumber-messages-17.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
+HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index df09bcc3c724..e5f54ee237ef 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,5 +1,7 @@
 DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439
 DIST cucumber-rails-2.2.0.gem 136704 BLAKE2B 660037bb5938ad01aa0b1188e5e48522f9932662d6578f1c0a107cdacbd5cf8527e48b6ddb2c91d975577a71db0259a7250d762004ef0a49ebc063f45103aab0 SHA512 ca8a0ce9c9cdb1306b6a5f8e3d9ba68a2beb3d0a35a58fd6c51ba3ce76e2104045b2768054d27bb4bfcd437534aeb6d39fa2be87396f3a4084c0044201e96252
+DIST cucumber-rails-2.3.0.tar.gz 39492 BLAKE2B 73c45db7b3b445804b29814fa7add1ee5d66ea75bf3bd7b19456cef38340adc37f6129911a49d7e9996bf20299e31511e51758e18d9f8ffdb53fa9ea320aad42 SHA512 fee78784bd21084271c611073bce8b399783a2ce1900bf12a27cd8b70edbedc525b501d5d71856ad42f19174664d95d97bd4adf75b1791af60bc237a9f16e00d
 EBUILD cucumber-rails-1.8.0.ebuild 1184 BLAKE2B 4e2c858cfbb65f591442aefb56f6c50916c58adec4a40394a578f4cbc09dc5a2770a7d2da02d2897bf052957395b51157c77319370e882e2c55c406bcb871c05 SHA512 72d72915af22e3ed24e9a9e1965cad8f5a37c1748302787b7ba665f6dcf1834e19fbabdfc7257fa338b2db777ed8b1d0d1355d2377c33b2ac07a4d9666bc0ca9
 EBUILD cucumber-rails-2.2.0.ebuild 1196 BLAKE2B 204bff27ac75def4b5e88ccfb332b824d8cceec2672f4a2b298c9afc4c32c5c176fd03534fbd6136c9f6d9356a2692ad4a6b1dbf43444334735e3f5e28a714f2 SHA512 70a349b9c1e0b6417fc9e7625ae09f670220bef05f7a8a5c820637ff2cae11b0a5918bee4baa29b1a2e701d6f37d4b2844fabb497a2003abda5857dfafcbdbc9
+EBUILD cucumber-rails-2.3.0.ebuild 1306 BLAKE2B e38089ec8e150c8af7418c5fe67310f6be53f84c9a19859683cd14fe8a12147277792a10159b1f56f86a22970a47fdd779e381318a757292c6bd6851832a24d2 SHA512 786cf0c4ee54ed2d560b7f7d1356b1976e2e093dede1f7aeaf7830f2526429faec7ec5ec284a821e9de980c0aada270883d973add3ddd75729e51a8030844936
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.3.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.3.0.ebuild
new file mode 100644
index 000000000000..a0c8d4909ba3
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-2.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+# There are also cucumber features. They require a Rails project with
+# factory girl which we don't have packaged yet.
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios for Rails"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+# Restrict tests since Appraisal is now mandatory to manage different
+# rails versions, even for the specs.
+RESTRICT="test"
+#ruby_add_bdepend "
+#	test? (
+#		>=dev-ruby/ammeter-0.2.2
+#		>=dev-ruby/rspec-rails-2.7.0:2
+#	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/capybara-2.18:* <dev-ruby/capybara-4:*
+	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-7
+	>=dev-ruby/mime-types-3.2:3
+	>=dev-ruby/nokogiri-1.8
+	>=dev-ruby/rails-5.0:* <dev-ruby/rails-7:*
+"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/files/ s:^:#:' -e '/cucumber/ s/< 6/< 7/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/cucumber-tag-expressions/Manifest b/dev-util/cucumber-tag-expressions/Manifest
index 09428c830cb6..4d1ae0879a6d 100644
--- a/dev-util/cucumber-tag-expressions/Manifest
+++ b/dev-util/cucumber-tag-expressions/Manifest
@@ -1,3 +1,5 @@
 DIST cucumber-tag-expressions-2.0.4.gem 8192 BLAKE2B 1ca07c8b1c018aa0011e6b31fd2b1a6085f5de9aa5a9abd4cfcc2bf0feb9fd3018a1fd07b7a3026e62b32aa629718ca1acb7c4b2e9d19a118ed500e2d60d0c87 SHA512 d52d07f4415c69db54e3d37e5627e8587386aa777e1816b8c8d6dd284388a5ebfe48f7ab3c8f8ff3f4c3e6b3dfa6a1136460f501504b1dc71554f2878e81756e
+DIST cucumber-tag-expressions-3.0.1.gem 7680 BLAKE2B 83d89259c5451886e9d699a3a7bfe4b0d09ae6164fe2b3d271e62cc8185876cdd1173cf1223b8eb07f898ae43bd599efddc7e589eb353342548b376ed7aa670c SHA512 699cac80ec0fa41d55f5600e84772d471e9268cc46382813ccdf1aae99f2d50c9e89b7b60baf79c9dc9d5d17189056212726aeb7dec3a4e18c2e982191078fb5
 EBUILD cucumber-tag-expressions-2.0.4.ebuild 452 BLAKE2B c21f86fd0f1e0c35351b990fd600390d4426d0b990ba7c622d152a8b6e3c55db280e6f9e8029b17c4e227c353c7b71240ccca3c4fcb6cb0ba68fd693017c1774 SHA512 5c46a1ff034dba684cb496008345dcc1e70bafc8a9e83f08951a69437f21aadc6474206c67c4a39658fabd250f3cd9dc540f4a5c9a5ac8d866a6cb4eac957814
+EBUILD cucumber-tag-expressions-3.0.1.ebuild 445 BLAKE2B 61f06f123d909f4088c3e8805a6a8a2b3bcbfe0f55eeb485d44b644a57dd1203a02ebe0b246f7e1cd102668bcc6c13137d4c8a6e9e2a7cea3fa6d49f55449319 SHA512 4a408941211647ba21c9ae2a899272abb2923b6ea48dd5fcc0da8020a6c7f8fe3aafc73af949ef4fc909e4329945ef9ad9ec2c80b86d10d3e6564df168f05f2b
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild
new file mode 100644
index 000000000000..aefdf429cfd3
--- /dev/null
+++ b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber tag expressions for ruby"
+HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index c7bf6e510c49..1acfc5bc2ba5 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,3 +1,5 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
+DIST cucumber-wire-5.0.1.gem 12288 BLAKE2B cbbf593d43cbbc003ea247d41db2cebaed14d232ae2bc52eebe34c8316c58b679be7c6802c7ffae7dd3e8c14d367803e3baba7b2f79326434821693e71fbd9f5 SHA512 deda0bb93b51b9d27074242bd0c371b7465c06e302d2aa608201898a1eb3b1736c9955baa9360f047a29793871fedc9feb25bf3430020e5b1f5630a2c982da73
 EBUILD cucumber-wire-0.0.1-r1.ebuild 520 BLAKE2B 2a05625d160dca569f254cc0f0b78f26aff853f86bb5df8ced10f81ae09b41d5b906d0956dfc160b6564d3f805266cebc0e16185ab844ee4e8f8f545ba225e41 SHA512 49d1079ec8ae4ea16a47d509424ed299b0d1467c6ab4bc22811093f8982c7cb1d7877e951e61320e70c29ed76d8c3b3135d4ee2f655ca8ed12cb2b9c05136990
+EBUILD cucumber-wire-5.0.1.ebuild 545 BLAKE2B cf736af79b86709b0ec8e20c6f970d58cd404b5d6338217ce0e5539685d3b24aaa71305b1174130af76220ea2a80a903c3d803daa7018a84efd14075e3bd636a SHA512 bd100fe755465ab147c66c361bfd8bb2818d59d4473c94f94b1f3e7f35eeec5edf3ae7564a5078ccd8579844ac7ce6861b6c32ce72e734483885dddcc9927376
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild
new file mode 100644
index 000000000000..b8f4650a7144
--- /dev/null
+++ b/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-core-9.0.1:9
+	>=dev-util/cucumber-cucumber-expressions-12.1.1:12
+	>=dev-util/cucumber-messages-15.0.0:15
+"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 0b2bc1bdf04b..db9b2deec57d 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,5 +1,5 @@
-DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
 DIST cucumber-3.2.0.tar.gz 271886 BLAKE2B 0945336e2a4d14c21d22b3af18fb140663fa0c5acd7d29540cb6755fcc50b020640ffc573f4d4ed17af2758df3df410f93cf5067b736cb8005d9a6ae7fa4d397 SHA512 927ca314c56f83e270284921131ec62aa05053d29a77b230799bd1949751f64c964c0f87525c776d7fe260506ddb632b5cc8939df841d131f6a0af8a82110441
-EBUILD cucumber-3.1.2.ebuild 2750 BLAKE2B a2098d1c0860e45a13a27badd5485ad0a2cc4743cae3585cc3832b6f8a04b82ac335a8853667384848ded290f74677548957e2b51198391f23a56ed1333a1bdc SHA512 5a851d7d42761cee2c48149c8fc65c2daddec95fc3a9940cd1661cf830248e450a903f4d9978900b82c750ce2bf63e24585e64f9e302133a523bad560a28a52a
-EBUILD cucumber-3.2.0.ebuild 2865 BLAKE2B 9c2d2d01edfff03b79c3b602faaf95ff6ffd8877b51691b1dfa66db409ddafc1de227d6517a6aeba9feea2e18c1cdb81860f28ab659faa12029350d0df67e61d SHA512 e3ccf6f584b8ecc7936feefc24684e7eda0510f1601d42b00b65318a50b32e9bcdb98de9c722dc05e5af5f859d2e4be354ff114901a93e49409e964b44424be5
+DIST cucumber-6.1.0.tar.gz 250437 BLAKE2B 64b2adfe5b9b78e70bdf6eea5bad4fe96b5598b686e27aee8635c84070c2e20bd8051217db9c79c9f0de62b6a8eed85c327f2adb9965d39f58f74359b935c013 SHA512 45b455f1c1728463a3e0dd9061d30e6438710e137e923d56cee90be4aac4b9f940a79aac60eca8cee3c4800831e7f57c1893276449e18a9f58c3f3664d810b08
+EBUILD cucumber-3.2.0.ebuild 2864 BLAKE2B ba02dcb6f95ec1f5bea0ead4f3751e5ef8239886639225bc8d7bf473a157f623edfab6562f8c59691d5fc2f301fd68178824968f66f514d57d1334c194e8268a SHA512 d95106aeb1be4f9e5e790f317571ad74a96a0a7ac6d3317ffb30485a99e0cbcdc28639e8cfdaf4586f09f2be7609d4d6855014bd6344234594c749bdf61966ce
+EBUILD cucumber-6.1.0.ebuild 2535 BLAKE2B cdb3792a43b3eb58bc23a142efd3a690d5bf0304fabf5872bcfb463dcf7cbbf42dc2d86057ad718a2339be20b96bfa87ff7a3c56529155508ff6bdacb8fa68c7 SHA512 d0ebc9cf6709217d995e141586bdebab08443d9c4155663def623dc5946229f469b21be942b76ce885b2c6d6fb16333d3caf0ce6e0aa11c7d7ae04461d564eb9
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
deleted file mode 100644
index bffd18f6ac02..000000000000
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		dev-ruby/json
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.2
-	>=dev-util/cucumber-expressions-6.0.1:6.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.3:0
-	>=dev-ruby/gherkin-5.1.0:5
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' \
-		-e '/nokogiri/ s/1.8.1/1.8/' \
-		-e "/json/ s/, '~> 1.8.6'//" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-3.2.0.ebuild b/dev-util/cucumber/cucumber-3.2.0.ebuild
index 6899c1c9f403..0fd14e28e954 100644
--- a/dev-util/cucumber/cucumber-3.2.0.ebuild
+++ b/dev-util/cucumber/cucumber-3.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cucumber/cucumber-6.1.0.ebuild b/dev-util/cucumber/cucumber-6.1.0.ebuild
new file mode 100644
index 000000000000..9901e0aa83cf
--- /dev/null
+++ b/dev-util/cucumber/cucumber-6.1.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP="cucumber"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		dev-ruby/rspec:3
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		dev-ruby/json
+		>=dev-util/cucumber-3
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-3.2.4:3.2
+	>=dev-util/cucumber-core-9.0.1:9
+	dev-util/cucumber-create-meta:4
+	>=dev-util/cucumber-cucumber-expressions-12.1.1:12
+	>=dev-util/cucumber-gherkin-18.1.0:18
+	>=dev-util/cucumber-html-formatter-13.0.0:13
+	>=dev-util/cucumber-messages-15.0.0:15
+	>=dev-util/cucumber-wire-5.0.1:5
+	>=dev-ruby/diff-lcs-1.4.4:0
+	>=dev-ruby/mime-types-3.3.1:3
+	>=dev-ruby/multi_test-0.1.2:0
+	>=dev-ruby/sys-uname-1.2.2:1
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' \
+		-e '/nokogiri/ s/1.8.1/1.8/' \
+		-e "/json/ s/, '~> 1.8.6'//" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on unpackaged packages
+	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
+
+	# Avoid specs failing due to differing deprecation message
+	rm -f spec/cucumber/deprecate_spec.rb || die
+
+	# Avoid failing features on new delegate and forwardable behavior in ruby
+#	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
+
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
+
+	rm -f Gemfile.lock || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 2ece204ea9db..2d87ddfe6de4 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,5 @@
 DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
+DIST diffoscope-178.tar.gz 1600094 BLAKE2B b40e45748be56e49736a826decfb3a8c3ebd91983755719f2665733ceb6ec4e860265c33b5a3c15bc501abe4efdbecbdf177431bbbc79f1ad758c7deef83e1ae SHA512 706c95f5c04cfe081fed7e3e5ed73579949c948b15eaf0f984fc7d406b74007859f7946c44e4ca13e1210b105ed65ea68fd1f03452a50f161ed27f996f4f2540
 EBUILD diffoscope-177-r1.ebuild 3327 BLAKE2B 5a02d7069b31bd8db1f2f590c9825da2acfe7ce7c37e49a184f1add658ad415c4c008e959926ea470d4e0f1f3247e8ffe0613148e292c345eceba1bcb53d7082 SHA512 d1cdef68e7565fd3635d3cacf2c5617acf66dd1e7fb53c3fd72fd0bd7c9d6b48f167c83d385fcb3f38c0efd5a60b053a1fc3dc91b0876a3f6065cb168f416053
+EBUILD diffoscope-178.ebuild 3328 BLAKE2B 7711971921a72b58027c472d38f78cfcc3e493ec5c7ce6de6fd75d8194c3858a496b647e77d8b8e89cba86177c006619e9a9b66501aa14cf7c02533a54672821 SHA512 d7f3ec25d7831bf5cb38c4fdee047e246965dbbe135509c932af77edbaab29384342cd6ff2f7efb1f0aa176d6cde6f752696a60d420bfa70e03cbaab6c7f468d
 MISC metadata.xml 2077 BLAKE2B 2f4d188accf1f75c139a388f564ef5130ea8e74e403072871e4b73b848eaf405076bae7190565f374c193cb4f3fd0be16e3c781ac73df1d1cfb36101142b59eb SHA512 683e181724871d636610c7cfa93c714ceddba7e95b80fda8837e04b396f63049307b23b0471cfc19c46de5bd8b6f7bc868412f8f1c817933ac9507e7280b2272
diff --git a/dev-util/diffoscope/diffoscope-178.ebuild b/dev-util/diffoscope/diffoscope-178.ebuild
new file mode 100644
index 000000000000..b89f0d3a344a
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-178.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+
+RESTRICT="!test? ( test )"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-text/docx2txt
+		media-libs/libcaca
+	)
+"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local exclude=(
+		# test seems to use different tarball
+		tests/test_presenters.py::test_text_proper_indentation
+
+		# needs triage
+		tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+
+		# needs triage
+		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+
+		# img2txt based failures, bug #797688
+		tests/comparators/test_ico_image.py::test_diff
+		tests/comparators/test_ico_image.py::test_diff_meta
+		tests/comparators/test_ico_image.py::test_diff_meta2
+		tests/comparators/test_ico_image.py::test_has_visuals
+		tests/comparators/test_jpeg_image.py::test_diff
+		tests/comparators/test_jpeg_image.py::test_compare_non_existing
+		tests/comparators/test_jpeg_image.py::test_diff_meta
+		tests/comparators/test_jpeg_image.py::test_has_visuals
+
+		# docx2txt based falures, bug #797688
+		tests/comparators/test_docx.py::test_diff
+	)
+	epytest ${exclude[@]/#/--deselect }
+}
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index 194a8890955e..20444d8fcf09 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -1,7 +1,7 @@
 DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
-DIST ansi_colours-1.0.3.crate 10419 BLAKE2B e140d65a40228e2df42f2d8d5d5ae6809e1e30afa007d97d07ed14ed6f8f4535c0adbb497cd417c5ef6528e5a60a997d4ede66709581a653c5e3dff83bda9ea5 SHA512 98ca71c01e3c5b86022430823066b68621904398f69bb7a3d13dd2b999b343a72151568d837cb0d811826204e538a34ff88590cb72f7da5d2bb2a365a264bca2
+DIST ansi_colours-1.0.4.crate 10525 BLAKE2B f71ef0dc730cb35e634623cbf6888abb72519fa53b40aba49ad1151a37d98bf3ff93652ad67d276243c7ef9435a19b839a43a4122e451a2defc96231fba145e9 SHA512 36eef5c4c84f7f8bf3adb65eca5d7d2da48190c127cd76b78b7bb035cf98afbf2534b82bb293cc1e472eaeb08d541fe28a87b99ebd53dbae8a50026898b043b3
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
@@ -11,6 +11,7 @@ DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7d
 DIST bincode-1.3.1.crate 26121 BLAKE2B 7bccc02071a11944e787fdb4c86b082827834df31f3fb751ed32720d4c44e4a26977838e311580ed330d9f6bc5ad76632e0af5530a3f8781ee739d9dc1ff218b SHA512 75e62caef54a58ea5d24acbdef70b55893b11706400ad423919084a4723f5ea60e337447221171c4cd86d764db1f9f767c303b4cf5cd8f27318519db77fb82b4
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST box_drawing-0.1.2.crate 2819 BLAKE2B 968243dc8cc4c999d87b1ecf45314e9ed5fd81c8403b181f6452889df92edcc407e98774592a4072c1b3a0f551ae99913cbc01bf97bec69dccc7e2b7fba14200 SHA512 fba2720279dbfd56a14371951b854aa0a30fb4caeb5b95703ec6721d681dfe97a37b21b069e6264565510fa3f3d0716dba99d8b3021bec76410c823ef262e746
+DIST bstr-0.2.15.crate 344206 BLAKE2B 3a4f24d2a039f7aeee3b6fcbfcc2fa72f1ef8a06ff8bc039af055739436655851565a57e5a4f86a7984b00ee7598c1fbdf26f3302929f91d7efb1327fd36eb57 SHA512 6e464ca1aec722a283759ff6978bab1769dfc8d61aa683f8e4c59bd69c7be2fe86c5470f4c54457871c6640e2d50b6b882747ec567098eb78e62f7cb07cb93a2
 DIST bytelines-2.2.2.crate 4218 BLAKE2B 48523123ac1b5b643666ccd466a9fb48c4aff77bd13b198b24d0e1092dd971bf5ba804d97a83a38a8b99ecab94b51e837cb4850d5b0789f4d2f0115159c4176d SHA512 0d768b579993c0d72914affe36d61632e0c39310094b4d3dde29e69039249c9bb88af18e8f8033c377b05938c50e43ebd29114d2c664b2c904be27c61b1b8dad
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
@@ -30,9 +31,11 @@ DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca
 DIST form_urlencoded-1.0.0.crate 8412 BLAKE2B d65250a1d56cee26befb8733733ab67ffba9b9826755194158f336a22e792d38320292548ec73cedf18a56a806707334eb75833e54bb811c56a2ccfee05aa731 SHA512 193b8630b2790931c1ade898187637b2efdfed60b2c98a2dec6658380433fb7711fc2d8196834c19eecddd219ca7383e4a4946bef25c664bf4dc010388b60605
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST git-delta-0.7.1.tar.gz 1064009 BLAKE2B 3932d4adb5f696b92bf9d8987d90b2521401211944f9a8c0e5587e5dbcdf9ba93406547dee42885ca248687209c56d59e0f079f9e583f9b70104c09a306516a3 SHA512 cac2fdb9460ee49e8855a99ba2d9625205f050ef6be286c5ab55950aa256243ee5f367b8c2a333759a6a0399c89edb33ec97014296403a9ca4ab9b3d9704530d
-DIST git-delta-0.8.2.tar.gz 1068616 BLAKE2B 86d60df2bd5a42969a44dd7239ab6a6502030ab10fa7dab18ff91192843d3817b2af475765691bfae43897e9111446ba49242de48f2bcafb69df6fb569f226c0 SHA512 8e6b838477468612c12105d798f5401e3f4119f049ce721c69d3aa595ffcad2991ee8c9a609bd3eb6154806f8418e39a1b515f9c179e42608080416e1efd3e74
+DIST git-delta-0.8.3.tar.gz 1069452 BLAKE2B a27fe07538acfd6346bc12f2e4ad03396737e268ce4653b25c908fbcc7bb47fe2ed76550dc431ab80bf9ab86746d4cd9b551ea68a47e603ae9fe99aa935df7bf SHA512 8cda4255c878be8dc4dc841dc1778f992c7b01c7a56965babfff9cd0dd085b751e79ffb87450d50d78fd094f2ab851f468c0e88ca4e2f0becf6ebbc122ce602d
 DIST git2-0.13.17.crate 181726 BLAKE2B be159d2f3602a65b133d6bdb3d949a48b34029b7a491961469d7a5a6dd8d471b0460ea53e802f69a216ed6111d0329e8a8ee29024af3753a185258f1268b5ead SHA512 5d95ff8d5c62df55b9995f2319dc350dfc9c44b90bb594f6b90df4985f8ebed50211e380885826251aa4e86eef1cfac99f648fba5f91cd4b725b0d05b3800fc9
 DIST git2-0.13.20.crate 190365 BLAKE2B c4f3420f19cdfb420576bc8c38dc45d1c7f3b74b5a2d23c85154dec35916d3d588c86aaa50eca52b427e5d044a07ede7cd1445ef1ba53ce08c70ff39f7ac56bc SHA512 2c0a9cf3391f4ea5eaa48c8fcc08a1cf27b877cc4960332bfdbb95620f9b161f720c35f87bf98e3771749a01444bf8e2337e6d8fc1a34962d4b041473115293f
+DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
+DIST grep-cli-0.1.6.crate 18949 BLAKE2B fe0c1c615cd2b1dbb8b7ad3980292308d9f06390ead08f42719b835805efed8a8243a7ab9e5bbf3cc6aa5c2890aa2bd53366a0bf65d66c19ec706f76beb58cbc SHA512 ffacb90586bb28afc3ab2a780be10c78f32b83c5ef5b28c7729ed61353ff5197bdafa485e87371d5ea10198bc9c28c46a22172a9fdb0adad0119274c503214ab
 DIST hashbrown-0.8.2.crate 75830 BLAKE2B 9b08d98fd06e0cdf1dda7a86b8e2c6b1463d28eaf108c38c7c8fce1364ff1d752b044a46d0081b2348c6eecf0bf3e935e85a2d88c67b144e86734bf85a8e13ef SHA512 a6c5e5ae29d3068d54799efbf79b40ae95c2ab64807fe61ad44a49cd90c72b44f1e72340f5d6e2af1f9bb2684675dd86fb74eda03cfbf3a49d3dcf5080867a02
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
@@ -70,6 +73,7 @@ DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f91
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
 DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
 DIST regex-1.4.6.crate 242248 BLAKE2B 4e54699a290fe8952f718709292c726167fa5064407dba2f9e8ed7ba98aee9333bb1ee807c104916b33cbb27eacc6e36b673a23ad0e5af8aefc189b4a5993ea0 SHA512 e789ee66bc37d44efbf9e9c210c3ddc371d9483d6f96d7367b861ee0e0abb5c8abf6ebcad9d3c3fb97f772a5ca91184ca6d36a1a78dd51b43f3279e4048c299c
+DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
@@ -80,9 +84,12 @@ DIST serde_json-1.0.61.crate 114887 BLAKE2B a06e2b3572b01b57d39a7df4d4c333408594
 DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
+DIST structopt-0.3.22.crate 51665 BLAKE2B 310597cd82596b8a63501d122b20d845d5f9bdef0f3babcc53e9e6f93f9cc11f2aa4702bf2c20cb0b2105b4cda4ca0dcaf79c67454261424c3e5d90da4261a48 SHA512 fcd37107dc6cff85e30345c816ec6ef9bca57f05e9b67d8dce196a94fa18d79d33e953036b394521e76534fd5cc9e4fbbe14588d7cd4ccb01076f4c8ae8f5739
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
+DIST structopt-derive-0.4.15.crate 20861 BLAKE2B 3c97e31f8f3c549af548a3c75eef06b50039e513171251162af08eb7a70d900e0fc533d5bc711fed489252e5102e5245d343197eb03161c2d03e4464c6319fed SHA512 a241cd02ee91195548759e6143f4c08eac70466d6e13fc5af59a09c15dec27816cfb766c7f2024d4a678a1a1fc8fe5d78b858b3ac0f53fda914ec9ec1d8abc8d
 DIST syn-1.0.57.crate 229228 BLAKE2B c1f4e6a38ce706f86d8f075409fb341ed9a46aeb8d0f4534fceb2aa2fd717063667bc89361b2d95916c0dcb036d5450d94c23139d110afdacabe91c0a5f988cb SHA512 2e7f318f15c57d518df8e2875545f92faa8171c37f1ac15be189bd58e9a178978e3734417ba99030c62fb84e55e4300fc477d0422fac60a7ee8b759cdd1e56a6
 DIST syntect-4.5.0.crate 752883 BLAKE2B 9c9ff2cc63ea421c0b8928a0578b278883d0a86be7f7c256820120a858f8c02b1d292e2474e5f2b63486e45cf5387e1a8ba4db2a5c9e7a2b0cf4eb687b42ffad SHA512 17653ae9baa4da049c899820f6033b3e7d71b96ab70b9c12e57a1ab305d155b12acec470167be2a0a37ea9c89ec4d19850f72d456e6857a7cf4dee65fc288273
+DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST terminal_size-0.1.15.crate 8795 BLAKE2B 2e7590a524bd8e439d385f925c3d5a3aadea20bb24b7fb5c52dedc4dccdd67f986b304208dc6d9cecf0e4b2c449dd980613b4e381603cad74fd9038420b289e2 SHA512 cf1612f46c8502e079b87a240ddecdc02be8481cb7b78115ba1550a9a732103bc19de11f46160dbc5af06f8576d3dc780ed0b199b7f24c92fc0734e0d07e484e
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST tinyvec-1.1.0.crate 39037 BLAKE2B 8033a336c2c346df70d5c6161233043a7e196a2994b62c15aa022b7053f7aee686092fc7e2db551cd1a09ee5e4a038e777120c5c33c891bb47b71c78cac60e92 SHA512 29830cec393506651b20d045c584e3df5ce5f13fdf70e866d4d6b7e97fe4f6b07ccf2a2c64ced5b092d5d963af74f826930d96d817db90bc0e4ad112a399926e
@@ -90,6 +97,7 @@ DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f14
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.16.crate 92805 BLAKE2B 556b0b95b6d21f95ad99181e999d2f2a1291951db14e95cdaa4596b159323e999a135380ca0f795c996f97ffaa0c25465bfe5884bebc8903130bfd7437d4b86a SHA512 c1f83a79b0fffd2f0e1b8a579ae4e5021c4cffd74c259d065919b937bdd78b9ef83650cfd777010e7008ceb51e072777b195dd2483e1a85798a98b72f8648ead
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
+DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST url-2.2.0.crate 42787 BLAKE2B 115380294b06c833fe183423b26f32b7a0cb3eb7bbb53380c41b32c031d6d34ed55f11153d5ed8f3e82effc13b9571f3b27d9889fe61cf63a68ea3767ef63cc8 SHA512 5474daa20242552fc76f8e21a28f8880c011627773fed74061fdf15afd5a33cc1b09baf6583112126a1b8287ad71a22055d2bbf78a73a0d82a115db1334d05ee
@@ -110,5 +118,5 @@ DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD git-delta-0.7.1.ebuild 2847 BLAKE2B 1e62f229f558f87e230a77b58b40cca91f6e2419ec4f916fe1ac8d423062248208faa77650228771ff764668220dc0fa1906ca7f9801414dbaaf3cfa7b20e1c8 SHA512 0279c92aaa7590eb53eaf91bc12f0064261724e8090ffed92d0749113f1cd7e5bc432e1cbe576ed511ab76e4e6a80715d71f2b48e0c2759885d542c2ccdcd8b2
-EBUILD git-delta-0.8.2.ebuild 2985 BLAKE2B f2237eb6c802711488e158fba2da1aa6750247e9c343883cb51002757d3983fb8649ccf5b1e8438f64a351b70d364245bb799ba12731020a5273e29b931a9bb8 SHA512 b784bab0962f12c082c51ba4fe2361859eda429d8e90cb2338d10de7b69d8c3768002bb5710be6ced194edcdc7ddd3b2e53d0a4a24f31734a00c56316436a9e5
+EBUILD git-delta-0.8.3.ebuild 2961 BLAKE2B 50bd5ca27791a731f5cd4a49e288c0f6829caf6f9d725b613fdc5a52f3e40697194beb2f8157a2a7d6f1852efd3f08c8d25740f9e81f67f0296787d4dc9df449 SHA512 bc052ef04f5d08a11cfb4022ac4560cff4d5113851da431265343b0f1d4cad29415db699a335199ddb14ea08303bcd8996716ec0fbd90c201d2b55684ad0853c
 MISC metadata.xml 330 BLAKE2B f09602a10d43f553a7dc36968f26f5f4a79d12aab213ea51b1b2e76eb2f5ba8b698147a9ab3db7b088ca42008045f1dd1a5447fe5d7d2ce46a61d1438c202185 SHA512 ca570caf0648315637beede9dfd9c124b7b313448f2929a86262b7fec90280bdf105b22ca112f7ddb2fe16ee4c6f242e7524041c14a692aa9155ad4ae432207b
diff --git a/dev-util/git-delta/git-delta-0.8.2.ebuild b/dev-util/git-delta/git-delta-0.8.2.ebuild
deleted file mode 100644
index 1747c0352085..000000000000
--- a/dev-util/git-delta/git-delta-0.8.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-	adler-0.2.3
-	aho-corasick-0.7.15
-	ansi_colours-1.0.3
-	ansi_term-0.11.0
-	ansi_term-0.12.1
-	arrayvec-0.5.2
-	atty-0.2.14
-	autocfg-1.0.1
-	base64-0.13.0
-	bincode-1.3.1
-	bitflags-1.2.1
-	box_drawing-0.1.2
-	bytelines-2.2.2
-	byteorder-1.3.4
-	cc-1.0.66
-	cfg-if-0.1.10
-	cfg-if-1.0.0
-	chrono-0.4.19
-	clap-2.33.3
-	console-0.14.1
-	crc32fast-1.2.1
-	dirs-next-2.0.0
-	dirs-sys-next-0.1.1
-	either-1.6.1
-	encode_unicode-0.3.6
-	error-chain-0.12.4
-	flate2-1.0.19
-	fnv-1.0.7
-	form_urlencoded-1.0.0
-	getrandom-0.1.16
-	git2-0.13.20
-	hashbrown-0.8.2
-	heck-0.3.2
-	hermit-abi-0.1.17
-	idna-0.2.0
-	indexmap-1.5.2
-	itertools-0.10.1
-	itoa-0.4.7
-	jobserver-0.1.21
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	libc-0.2.81
-	libgit2-sys-0.12.21+1.1.0
-	libz-sys-1.1.2
-	line-wrap-0.1.1
-	linked-hash-map-0.5.3
-	log-0.4.11
-	matches-0.1.8
-	memchr-2.3.4
-	miniz_oxide-0.4.3
-	num-integer-0.1.44
-	num-traits-0.2.14
-	onig-6.1.1
-	onig_sys-69.6.0
-	pathdiff-0.2.0
-	percent-encoding-2.1.0
-	pkg-config-0.3.19
-	plist-1.0.1
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.24
-	quote-1.0.8
-	redox_syscall-0.1.57
-	redox_users-0.3.5
-	regex-1.4.6
-	regex-syntax-0.6.22
-	ryu-1.0.5
-	safemem-0.3.3
-	same-file-1.0.6
-	serde-1.0.118
-	serde_derive-1.0.118
-	serde_json-1.0.61
-	shell-words-1.0.0
-	strsim-0.8.0
-	structopt-0.3.21
-	structopt-derive-0.4.14
-	syn-1.0.57
-	syntect-4.5.0
-	terminal_size-0.1.15
-	textwrap-0.11.0
-	tinyvec-1.1.0
-	tinyvec_macros-0.1.0
-	unicode-bidi-0.3.4
-	unicode-normalization-0.1.16
-	unicode-segmentation-1.7.1
-	unicode-width-0.1.8
-	unicode-xid-0.2.1
-	url-2.2.0
-	utf8parse-0.2.0
-	vcpkg-0.2.11
-	vec_map-0.8.2
-	version_check-0.9.2
-	vte-0.10.1
-	vte_generate_state_changes-0.1.1
-	walkdir-2.3.1
-	wasi-0.9.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	xdg-2.2.0
-	xml-rs-0.8.3
-	yaml-rust-0.4.5
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A syntax-highlighting pager for git"
-HOMEPAGE="https://github.com/dandavison/delta"
-SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-S="${WORKDIR}/${P/git-/}"
-
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	dev-libs/libgit2:=
-	dev-libs/oniguruma:=
-"
-RDEPEND="
-	${DEPEND}
-	!app-text/delta
-"
-
-QA_FLAGS_IGNORED="/usr/bin/delta"
-
-src_configure() {
-	# Some crates will auto-build and statically link C libraries(!)
-	# Tracker bug #709568
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	# No man page (yet?)
-
-	# Completions
-	newbashcomp "${S}/etc/completion/completion.bash" delta
-
-	insinto /usr/share/zsh/site-functions
-	newins "${S}/etc/completion/completion.zsh" _delta
-}
diff --git a/dev-util/git-delta/git-delta-0.8.3.ebuild b/dev-util/git-delta/git-delta-0.8.3.ebuild
new file mode 100644
index 000000000000..022dc8536214
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.8.3.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler-0.2.3
+aho-corasick-0.7.15
+ansi_colours-1.0.4
+ansi_term-0.11.0
+ansi_term-0.12.1
+arrayvec-0.5.2
+atty-0.2.14
+autocfg-1.0.1
+base64-0.13.0
+bincode-1.3.1
+bitflags-1.2.1
+box_drawing-0.1.2
+bstr-0.2.15
+bytelines-2.2.2
+byteorder-1.3.4
+cc-1.0.66
+cfg-if-0.1.10
+cfg-if-1.0.0
+chrono-0.4.19
+clap-2.33.3
+console-0.14.1
+crc32fast-1.2.1
+dirs-next-2.0.0
+dirs-sys-next-0.1.1
+either-1.6.1
+encode_unicode-0.3.6
+error-chain-0.12.4
+flate2-1.0.19
+fnv-1.0.7
+form_urlencoded-1.0.0
+getrandom-0.1.16
+git2-0.13.20
+globset-0.4.8
+grep-cli-0.1.6
+hashbrown-0.8.2
+heck-0.3.2
+hermit-abi-0.1.17
+idna-0.2.0
+indexmap-1.5.2
+itertools-0.10.1
+itoa-0.4.7
+jobserver-0.1.21
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.81
+libgit2-sys-0.12.21+1.1.0
+libz-sys-1.1.2
+line-wrap-0.1.1
+linked-hash-map-0.5.3
+log-0.4.11
+matches-0.1.8
+memchr-2.3.4
+miniz_oxide-0.4.3
+num-integer-0.1.44
+num-traits-0.2.14
+onig-6.1.1
+onig_sys-69.6.0
+pathdiff-0.2.0
+percent-encoding-2.1.0
+pkg-config-0.3.19
+plist-1.0.1
+proc-macro2-1.0.24
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+quote-1.0.8
+redox_syscall-0.1.57
+redox_users-0.3.5
+regex-1.4.6
+regex-automata-0.1.10
+regex-syntax-0.6.22
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+serde-1.0.118
+serde_derive-1.0.118
+serde_json-1.0.61
+shell-words-1.0.0
+strsim-0.8.0
+structopt-0.3.22
+structopt-derive-0.4.15
+syn-1.0.57
+syntect-4.5.0
+termcolor-1.1.2
+terminal_size-0.1.15
+textwrap-0.11.0
+tinyvec-1.1.0
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.16
+unicode-segmentation-1.8.0
+unicode-width-0.1.8
+unicode-xid-0.2.1
+url-2.2.0
+utf8parse-0.2.0
+vcpkg-0.2.11
+vec_map-0.8.2
+version_check-0.9.2
+vte-0.10.1
+vte_generate_state_changes-0.1.1
+walkdir-2.3.1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+xdg-2.2.0
+xml-rs-0.8.3
+yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta"
+SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/${P/git-/}"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/libgit2:=
+	dev-libs/oniguruma:=
+"
+RDEPEND="
+	${DEPEND}
+	!app-text/delta
+"
+
+QA_FLAGS_IGNORED="/usr/bin/delta"
+
+src_configure() {
+	# Some crates will auto-build and statically link C libraries(!)
+	# Tracker bug #709568
+	export RUSTONIG_SYSTEM_LIBONIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+	cargo_src_install
+
+	# No man page (yet?)
+
+	# Completions
+	newbashcomp "${S}/etc/completion/completion.bash" delta
+
+	insinto /usr/share/zsh/site-functions
+	newins "${S}/etc/completion/completion.zsh" _delta
+}
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
index 289a4217e6f4..9813f1e7d7b7 100644
--- a/dev-util/gnome-devel-docs/Manifest
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-devel-docs-40.0.tar.xz 10756744 BLAKE2B 565a6340191f7f3f1d8e396bd0109d9d82792829dbdfc1d155115acfe6453b239e095e3c6f763a0b94119d173e1063ecc48296760cd9a39a3f29356de4faf6cf SHA512 c7068cfe712c94b01d0387bd66f64a295096223f0ee1c49cb06d0d4d2c1651da7df1f152164e289cafae5fa53963a9b4e2afd616d1995475a8b2c437fd8c2903
+DIST gnome-devel-docs-40.3.tar.xz 10790760 BLAKE2B 2d7804115ac03fc4c3f46127c2d80bffc8281616d158ea12006d5ba8123f3e52111049f5dc0e235ae2c7709bbdea592100b82630ed5153a44f44ede31da4283f SHA512 c80abbd6e8e06219e9bb4563ea7b42fc8edd03d51be1fa075d217f285e0eff8344bc411f26f7a68c338cf1ebcc1bc05ffc24c6b3dd7d6ad2bf98fa83e3b7ef20
 EBUILD gnome-devel-docs-40.0.ebuild 638 BLAKE2B 9e6642afa1276c9a03efad81d85d8ce8bd9d1c24dc88678783eba4f04bd5572abce1e7192bcfcca5e53bd755dba6a298d0b1f9357de73671b56b3a4f9b66a687 SHA512 ba8723fbb6ee8bef61fd7eca8ba17f83d69a520265de2b1fbdb0023964b9e01e7a9704b316bf9e9ccae981f1152fe852148436050223142b215d620c77e4ba9a
+EBUILD gnome-devel-docs-40.3.ebuild 640 BLAKE2B b2c1be0335dc6568b9e886682dc20aa74e07fd02cd30b325e0d83b539982a3d8226217007db2e2bc7daddf25fa1cd8889ac4efadbda67bb6725cb57dd32361c8 SHA512 27e85eaffbf603d795859f6e602551b463340858a1145b2394317747cb535c95aba1531ba4ab2137473ce03aa26541305d6ac176a6253100ebcaab63c7d515e5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-40.3.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-40.3.ebuild
new file mode 100644
index 000000000000..2ff8d4654ff2
--- /dev/null
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-40.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2
+
+DESCRIPTION="Documentation for developing for the GNOME desktop environment"
+HOMEPAGE="https://developer.gnome.org/"
+
+LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	# Wants to build demo samples
+	gnome2_src_configure ac_cv_path_CC=""
+}
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 70049ebb065f..553dc4cf716b 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -15,6 +15,6 @@ AUX ltrace-0.7.3-tuple-tests.patch 460 BLAKE2B f8beacb8468f7842603e6abd1aeace86a
 DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d9869e51bf11288185da46f7a77a0aaffb41af75f84baa7d094f9f752071c9e8f53c565982a955e3250a7fc721c529b20 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b
 DIST ltrace_0.7.3-6.1.debian.tar.xz 11404 BLAKE2B d38ce51dfcbf809d7622029fb6dd0acd61c8d8213be0bf2625fd746adbe6dd6830faf208b7e864c1185013d7d5e17f3e10e8a8fb45f8e0a4bc9859fde96a55d7 SHA512 c0753935d74be530886ce5202429cabbbe73814c9ac120eaf90a1c4e03dfd4de5381e3e85a27fbbbce694b23cd72a273199575419446b6159b0925d85e1938ab
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.3.6.1.ebuild 2071 BLAKE2B c2ce6a6f96bddb7c888f53b1487ed5ef16d56858c328d27536d55189e5d358652572a1817f55f87bc6b0c89f53083dc3b43a5b4591833de1101be8eedbbb71c4 SHA512 9b44939be42c26e86c61ccfbfffd6c9bc749b90d9c4fd14bdd5caa4991839ea12221ea63bdf764ffdd760168cfbfb4809691775aba596075b5d5d7afb1e99ee2
-EBUILD ltrace-0.7.3_p4-r1.ebuild 2059 BLAKE2B 18f68766243bb36ac07581b4b8acb2bb981d157c0b7767e897598b0b1ceae3fe52b90fb2b702d669b704259db00cee1f30a9883e3bf399fc7a1fb88e1cc9d217 SHA512 8c85708282e7e5fb1f9f3226fb1e074e63579a17addd15b7f93c3f2f5471814284c8ac2d869dd699b438aac0ad082ab7aaa6ef175d336230791c2288a3adc932
+EBUILD ltrace-0.7.3.6.1.ebuild 2335 BLAKE2B 630af26df647d563d3770c1ac1b21e7af6a08878a501aebc34854b0f428c8d44cff0d9d07375c99d447127f0c5377554fb7a404e74bb50c1baeb33c1a7588445 SHA512 483b5a55d863340b839b18ee41be297fc1fc93f1782c81dfc654d99e4abb8989ff00014fea0fdf250ca944428c8bf4d530849dde038ed5f12d7f154b0d93a305
+EBUILD ltrace-0.7.3_p4-r1.ebuild 2323 BLAKE2B 180660c4efcfc0f98f6633a5b1f0f4006a1bc64afc7e08c64d89ef199aa29f941d59a3aab2bcd2dc19c4e966bda6a3815abe192c02ceeffd929bacb9ebe0fe8d SHA512 db05cf5430423aeabb10665cb0f30ee060718970c7c42b9e769285a1e5bd271ac6f1b6102550790d57a42c4a367ccf2991c6b4620e1ef9b8d0efef8fa67b752f
 MISC metadata.xml 351 BLAKE2B 10ba0f4d5e3d25ad4600055231bbe91e49f92c51b146e767f2ec961802f6c1bc9f2f40e537c231b71dd2c93a378b2c4768a7df5f91c385c81f83613377a66c6a SHA512 53e7ecf115629b97964a6df1dbf49c396bd288982cec22ab6abfd6841a94e6695fb863a813286ffa24e04e3d8c5591e656aca7285d9b170e7f87c90cc6ad99c3
diff --git a/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild b/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
index 9fd7b01b8545..9bb71a617185 100644
--- a/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
@@ -71,6 +71,10 @@ src_configure() {
 }
 
 src_test() {
+	# On kernels with Yama enabled this will not run, even without sandbox,
+	# unless /proc/sys/kernel/yama/ptrace_scope == 0. Just don't bother.
+	# Note: we only delete it here in order to avoid Makefile.am patching.
+	rm -f testsuite/ltrace.minor/attach-process.exp
 	# sandbox redirects vfork() to fork(): bug # 774054
 	# Let's avoid sandbox entirely.
 	SANDBOX_ON=0 LD_PRELOAD= emake check
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
index beb325aa49c3..3b6aafcb34d6 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -70,6 +70,10 @@ src_configure() {
 }
 
 src_test() {
+	# On kernels with Yama enabled this will not run, even without sandbox,
+	# unless /proc/sys/kernel/yama/ptrace_scope == 0. Just don't bother.
+	# Note: we only delete it here in order to avoid Makefile.am patching.
+	rm -f testsuite/ltrace.minor/attach-process.exp
 	# sandbox redirects vfork() to fork(): bug # 774054
 	# Let's avoid sandbox entirely.
 	SANDBOX_ON=0 LD_PRELOAD= emake check
diff --git a/dev-util/mage/Manifest b/dev-util/mage/Manifest
new file mode 100644
index 000000000000..ecd28ba2f5a3
--- /dev/null
+++ b/dev-util/mage/Manifest
@@ -0,0 +1,3 @@
+DIST mage-1.11.0.tar.gz 8795144 BLAKE2B 20e0934cc8a4cdf91586d4883c69e2040a6b67e440429bbbb23e4d35ca5a6d33bf34d0e9419f35e5bf273074cf9577a2ba61251b91d3cea619fba6c4cbe13007 SHA512 dd4e0764f6567250a70461f7b040cc5725f59a4b375aa85f1b4f0a8a9c1738ec4fc5f1a078349f34e655229397b0431c88ecd54603c281440a23a81e949cf9a4
+EBUILD mage-1.11.0.ebuild 443 BLAKE2B d910d404ecc79a8973b5fc1ab873e317508f0d5f97000126f2af349fadbf422f08fe393ea8428a6c84c235a437027c37e253e8d905bfdedb5183fcd71b31ef86 SHA512 e1e69b3f109fc7f5d8f5231fbbb11238acbbfd2af174e1f04d67cd120e625e922106dce0dc75f02d0ecb3bc89f68aff1183ead24465a602bd0545ad91e721b80
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-util/mage/mage-1.11.0.ebuild b/dev-util/mage/mage-1.11.0.ebuild
new file mode 100644
index 000000000000..b589b5b0780b
--- /dev/null
+++ b/dev-util/mage/mage-1.11.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="make/rake like tool using go"
+HOMEPAGE="https://magefile.org"
+SRC_URI="https://github.com/magefile/mage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	GOBIN="${S}/bin" go run bootstrap.go || die "build failed"
+}
+
+src_install() {
+dobin bin/mage
+}
diff --git a/dev-util/mage/metadata.xml b/dev-util/mage/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/dev-util/mage/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index e3485934a6bc..c261486119d6 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -2,6 +2,6 @@ DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
 EBUILD nvidia-cuda-sdk-10.2.89-r1.ebuild 3873 BLAKE2B 6af411229608873efcb1cab6b1883f3727b304708fdbc3bf959b307198e33f5c6c3d94b86d51fb1cb4fca5c32858e7efba3cc0a57623c8c6491ebdfa4df89dde SHA512 930fb95d6c805322ac76644846fda59aecb2ac1852686ecdd17f66d0002a42c62f20a0df30d2502d3dce7ca80ed48fe1b59185df0926b12e2ab80269c00dd681
-EBUILD nvidia-cuda-sdk-8.0.61-r1.ebuild 3825 BLAKE2B e247d6004022d6471a179ff32d1ec9ff10f0ac7b2b30b9c4ab492aa856cef29dcd104058bf48ef3351ce24d048a86017e015a1910dc183b23a46632ab4bee051 SHA512 f84a316d4cd7cd7eafe7ef313f91459b6c5940e16cc0db9ce2b431dc956d405815076c468c070481be7d6b45843a641976877cadc45c69e2b012475bb9d1276f
-EBUILD nvidia-cuda-sdk-9.2.88-r1.ebuild 3813 BLAKE2B 985ae7683e20f6e8b6b6023a8a05a5d3639899cddca2a75136edc023787612743578ca4e9ecc5f6b2b56a72b0b922d2091685ee7942eb268974f20d7c15878cf SHA512 8e60193e9d714e0e6c9cb8ac7545564191d2edd7cd35e896a2bddbd7aaad8a8d34bbf63d765fd7ddb6b284f91602327b67ec77e3c543ced3b1f09b1d5de14cce
+EBUILD nvidia-cuda-sdk-8.0.61-r1.ebuild 3696 BLAKE2B b58ad0be79f5c004a7782922256e28294078aacb7fd9f1b00b9a8d0188cafe99e786cca7851d4300390ebe49ee64e3947db8b559e4d6c61ff2b7ac084879761b SHA512 110e56b00e0fa984025d2e7f6c544ec2dde9f2c7de07d77291306b1b581c0025dd3dd1b537720f4ec52bdef1a3c059a070299b7a9a65ba4292f37a7d73477055
+EBUILD nvidia-cuda-sdk-9.2.88-r1.ebuild 3691 BLAKE2B 6b8a1e56d5c590a885255501938ee50a7e66cbb1573c33cff126b43be6cc9ca92d96d97c378ec4dfb4b3c1cc9e4b516a720d5d0e6f62bc5211ec4c50008e2399 SHA512 3996f0fe8736c586e034052228771fdf013733b4a9c76e756a16817600bee89dcf0c573f5087fbee35f4a5dde02708708edd95f7a1a23402c6d5fb54600b870b
 MISC metadata.xml 366 BLAKE2B 379204c3535fb9e98e2026ae695a62618006c42a590b13803db1990c07119a3a40e7bb4474c73f3717340987fc3ed2829dc9d6b0774103a2b4f6c0726bdf58d2 SHA512 174f0718320ba2b8c7b427d43ed2b35f781313cc97397958c5c4c49163ef6d02eae5658071238d764392905c403d13094c898f95f22e1a0360a24ae2a7d08459
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild
index 2ff4e6cb0a85..aae721c174c0 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cuda epatch flag-o-matic portability toolchain-funcs unpacker versionator
+inherit cuda flag-o-matic portability toolchain-funcs unpacker
 
-MYD=$(get_version_component_range 1-2)
+MYD=$(ver_cut 1-2 ${PV})
 DRIVER_PV="375.26"
 
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
@@ -25,11 +25,9 @@ RDEPEND="
 		media-libs/glew:0=
 		>=x11-drivers/nvidia-drivers-375.26[uvm(+)]
 		mpi? ( virtual/mpi )
-		)"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 RESTRICT="test"
 
@@ -49,15 +47,10 @@ src_unpack() {
 	unpacker run_files/cuda-samples*run
 }
 
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
 src_prepare() {
+	cuda_src_prepare
+
 	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
 
 	local file
 	while IFS="" read -d $'\0' -r file; do
@@ -113,12 +106,12 @@ src_install() {
 	if use doc; then
 		ebegin "Installing docs ..."
 			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
+				treecopy "${f}" "${ED}"/usr/share/doc/${PF}/
 			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
 
 			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED%/}}"
-			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
+				docompress -x "${f#${ED}}"
+			done < <(find "${ED}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
 		eend
 	fi
 
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild
index 45e4d209861e..60b72621e478 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cuda flag-o-matic portability toolchain-funcs unpacker versionator
+inherit cuda flag-o-matic portability toolchain-funcs unpacker
 
-MYD=$(get_version_component_range 1-2)
+MYD=$(ver_cut 1-2 ${PV})
 DRIVER_PV="396.26"
 
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
@@ -25,11 +25,9 @@ RDEPEND="
 		media-libs/glew:0=
 		>=x11-drivers/nvidia-drivers-396.24[uvm(+)]
 		mpi? ( virtual/mpi )
-		)"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 RESTRICT="test"
 
@@ -49,15 +47,10 @@ src_unpack() {
 	unpacker run_files/cuda-samples*run
 }
 
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
 src_prepare() {
+	cuda_src_prepare
+
 	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
 
 	local file
 	while IFS="" read -d $'\0' -r file; do
@@ -113,12 +106,12 @@ src_install() {
 	if use doc; then
 		ebegin "Installing docs ..."
 			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
+				treecopy "${f}" "${ED}"/usr/share/doc/${PF}/
 			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
 
 			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED%/}}"
-			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
+				docompress -x "${f#${ED}}"
+			done < <(find "${ED}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
 		eend
 	fi
 
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 39a695255388..cdde6d2169b4 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -8,12 +8,12 @@ DIST cuda_11.3.0_465.19.01_linux.run 3029622552 BLAKE2B ca64af09dc68b085a589b575
 DIST cuda_11.3.1_465.19.01_linux.run 3158494112 BLAKE2B 0316c6a9bf062f2503c94604b51dea9a8d19c516e304e43ccdbc79f305a242664b7f029f7b7086edd7adc37d92a3bae074f005b3be412e1361917794cb824686 SHA512 e2db8b4dcb5f6aee2c3e8a8a6848186cdcdd7cd9d5f4bfd069bd3dc2ea500797c66a4592f0e28dcbee6c3611d1f88b6fda6afcd734aa9ef45f4aa17a1527aedb
 DIST cuda_11.4.0_470.42.01_linux.run 3773273383 BLAKE2B 2e466728b6ca9d17dc3caadce13b58c8ba1464c2adeb09739f428aea96f5794c87bf84ca2b81c1019d45223ff5e519503d798032a800a370c7e41517d790f5c4 SHA512 17165102e7f64da77588fd47feeee5ce3f3151a2b482bdc005427ad77ada5d0ff5a51dcd40a27a467cd5988968469476ba90b0191aed993806d284833a08ccb1
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
-EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3989 BLAKE2B f965c3c19e7b52156d2daf3473fe563da7bf7b77516a7291735d37dc30f61bb3c6502a9d2807b7f33140e59eae2b8991e5c6881f3b4c6fa462e5093968b75c27 SHA512 611397a2c371a7aedb452d12e2acfa02dc06752b2558eedb12be852788c8050b77883a06c32b3eff131ac54a517a2c852500aa65deeaa0947a0e91f42b50954d
-EBUILD nvidia-cuda-toolkit-11.1.1-r2.ebuild 6302 BLAKE2B 7227d9bd6cfd0232067c035d8c98f6fe2153a53db4e9a82f3a4990ed07dea8c1de129016d29de1adf0bbfe292aafe406ae0b3d4504de2ccfba00426ba5edf049 SHA512 1242e6fe1647f83a9f8c76f58f71ce1b2f0f397fefe752fb6b978152c5d798f444c2cddd333adcd768172f44bc33a684abed176e2517351d71dd427e45b218fb
-EBUILD nvidia-cuda-toolkit-11.2.0-r3.ebuild 7301 BLAKE2B 5d52c2bffc7edba866bd76470ff0663018f22a0d276f8d1ab3022ae858ffb3c68f3746e5da830f2a6149810199f76b3ba349e3d83111b5cf2fca50d8245adbb1 SHA512 d418963abcb41ab8878cdd708bf4164d58fa4a3b54bfa7e9058a8786a5a85ae30afee2e893f1f174b5ac384b242512a294cb86f020f2b03adaca949270a11013
-EBUILD nvidia-cuda-toolkit-11.2.2.ebuild 7183 BLAKE2B 7f0680251da83372ded40804a0f59550c11fd69b2f3d97e16345c2323a8f460fe269830364b25c7894634015c7d5caad28c155a5102b03885066efda2a5b0181 SHA512 95e2644ddbf9985cd507cb3f2caf882f14a87517b62c1e5c6f1e55a3410f8144542df071a0e8851e5e716c6ffd14b67518417e7a64adff6eba35435479a31158
-EBUILD nvidia-cuda-toolkit-11.3.0-r1.ebuild 7190 BLAKE2B 74f757360a13cad90881da62e92de13a456a502d20fa967f8e45bd2dc2d20c61cfdf51b586a6e675832737a57cfb1140d269968c2912d6d2b49e15a772628c21 SHA512 78403780993009a26f84939310fe365d790d86d4fcfdf4640d452e18c9cc312a652771c61c9e83db61e1bd1c413311820fd3a02d59a4d4343d87413379c3686d
-EBUILD nvidia-cuda-toolkit-11.3.1.ebuild 7185 BLAKE2B f224322f449159d66795e97b048b124dbe89636e6f6cacb920418dd40b49425c240ad6d95a5ebe0f64bf5d8e6c5ebd059a6470872e46f64eef89dfb4ccf2eaa5 SHA512 221ec1d80ae94897ec1b207c86c555dfe859c046130dac760f2d10d535e8e038baaa99474fc9f78e08547ea18d2dae680bd4a8cbe459712ea0fa9f95faa585d8
-EBUILD nvidia-cuda-toolkit-11.4.0.ebuild 7185 BLAKE2B 45d2bc89053bebc9b867a6cd83805084fa92d54526b9e581ef668335b754f8e310e7f0538da24ac22498a2f469ff0e702864606d3458c5c4d9ccbff3bc27ad80 SHA512 cc4cb58093f4b237f1d2283d9ccc95cf7167fbf757e01f97fef0413503184100acea197e281f9a09e18ebe78c2dcfa0483596310b4aa1c11cfc75a9db1fc9169
-EBUILD nvidia-cuda-toolkit-9.2.88-r1.ebuild 3423 BLAKE2B 3b54cc972086d15b32a839afb562accb5067be1d9c9a3438455e0d1748169ff9cd6c433510054b8cfc3c0cc95d9133dc4b84d3c18acf27b0841692e61c41de6a SHA512 db45c42e5f1b6b48ea4e77c52e7519e2a3c4de82a3439b4e69414fb85f8ae2973d0158d4c04dbbd4b803bcff026bb80fcd367a9005c6644609ae7cc09eaa26a5
+EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3925 BLAKE2B 5b193f9ba23ffe42a4a23a5e4dc0b526246286fa27c14b7d1bf41e50e24ab46c619f73e371bc1c0034ecd549839631c9f184b2ece8499150e9fa6350ed137add SHA512 30b1a97475666e9e19a1390ebac946d9c1c1b8c61fd35a44239ed751b53943eb66b4002e3b17bf9dff33d45a730db7b1b7c4d0a57cc09bac38609822eebe9fa6
+EBUILD nvidia-cuda-toolkit-11.1.1-r2.ebuild 6238 BLAKE2B f658446f6f597fabcf7314ecd1f468ba9823047ea2344f6505672af159377902389ad430d80cc3a4bcfbfb7731824b2ecd9a7d7e5558a00dabe7a01984aae99c SHA512 d84f04a2995c7baeffa2ffae64e907af1476835c0cfc07b869d1736a7dd168d70cf49a1be139990e17d42b4ee60fc0770480f2a9d6d2bfc4d20b23c483f64c14
+EBUILD nvidia-cuda-toolkit-11.2.0-r3.ebuild 7237 BLAKE2B d9e22b5cb70aa5306ecb5c70692b47180275172353305e6515baec6c958296429401db81ab76d35957421e1edfece4ed51c93dc7751e94a3c763cb19d92a952b SHA512 c97785b209842e30c793281d20464451c1422f058ee03dddc6f3e9e749a18d9e00ac4a8f6217f2a470ed35da20bb9993fb9122e354c94ab0b090452e673fed01
+EBUILD nvidia-cuda-toolkit-11.2.2.ebuild 7119 BLAKE2B cb904f01e369415a5386873c6da3d4d89dbad96e998c47190fc5f6eef2261df4d7bc96c508eb19031fc15a6dd7fd5340bfeb544f79f4fa1b7fdcb7109c1f764d SHA512 366005e64ce6ab58d61956a341dbf654df9876003581ef500dafb3e35c7a86af120267390365de55c91927bcb4edea08722708385be32fce0bad34cd7cc7b070
+EBUILD nvidia-cuda-toolkit-11.3.0-r1.ebuild 7126 BLAKE2B 1417c62e28d49a822e0cbbc66180fde635d7afbb84aadd082f940fc32abd99eb48986f69f790bf050e4a2ffb1b4e0cdb67b31aa49cd52ca03b4bdcbb05a2c6ea SHA512 0fb0ffd74ee3c975dba827cb113b3793e99c6a9c11f439abcdd8ffdac95f0c7ad60910926b0e1cad540fec1dacc0a1791c6a2fe9018d6b0c2a7892dea647d366
+EBUILD nvidia-cuda-toolkit-11.3.1.ebuild 7121 BLAKE2B 4e1a8edfedd8972445ec7eb413b86707f6accc3acfdda75620a4e14a36376205843cc73872b8e35845e6526cb147e64132d7c4cdc29e3ae218b559e67c3fda39 SHA512 46b28a75e4adea42d6ef06065a38aa13c4bb0acd1ff924b0e81ddf2f8b437b1e18bef85b81d3c40cb58e05934fa645ec08dbea5c2972d09bb0998f0c7a36eb4b
+EBUILD nvidia-cuda-toolkit-11.4.0.ebuild 7121 BLAKE2B 0db4166fc71c33c2bdf52c56e3ba17d502dbd20fbebb6ac65ba5887cefac8504e9af40584e3cd354fd25ee4f4c49eb39c87f04df418e2aabbda7838c937c3931 SHA512 99eea9176c4b611fa769c7be7da58afbad579eb2c732490136bd218d5aea73217fd4b4bb0259d00eb150617fbf6d4c76433cf528c6f7ea1381a1ee30227376a1
+EBUILD nvidia-cuda-toolkit-9.2.88-r1.ebuild 3340 BLAKE2B d7d1519306fe876262beef0f711c596db067cfb50c7352157d6067dbda117c04f96bd0d6822d80c025c37a25f0d5cfa43cda9d776bef94d0206d0a07dd6279f4 SHA512 1533d650246c23e44f7392f17e0edcbc1cfb9ab3b7c9afc166ab8674410fed1f766b994956e3de914e726edd8b767372e62ba497fcc8935701b80e292c728317
 MISC metadata.xml 724 BLAKE2B fd9e30ae430f56599bab7004b9cd46a79bd9b94e75b0a4574ae393d8979b5e40862bf30d110d5d47186d74e629f035f854cea720d8393709d95a9c14b1185a26 SHA512 3a77849ec1bf2e61da35ffd76c20464b5de745c73abd14ffcb7e7d3b2f52e7d114c7d4630292ea219a23e327f1b6a0a8ec488a8cbdaf763a73554f17f50c2f7f
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
index 21d2753a4f4b..9c782027dba0 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 MYD=$(ver_cut 1-2 ${PV})
 DRIVER_PV="440.33.01"
@@ -43,7 +43,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild
index 771a4554268e..c1df314703ce 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="455.32.00"
 
@@ -38,7 +38,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild
index 410206bcc48f..4e8988a19e88 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="460.27.04"
 
@@ -39,7 +39,6 @@ CHECKREQS_DISK_BUILD="6800M"
 PATCHES=( "${FILESDIR}"/${P}-nsight-systems-launcher.patch )
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild
index 401b2e52d4de..a4f5c24e3b10 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="460.32.03"
 
@@ -37,7 +37,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.0-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.0-r1.ebuild
index 426f5d471b96..3f17f8437a86 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.0-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="465.19.01"
 
@@ -37,7 +37,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild
index 60cb5fa59a90..73058bb4b3cc 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="465.19.01"
 
@@ -36,7 +36,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.0.ebuild
index 831e95860868..dc91226db343 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.0.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="470.42.01"
 
@@ -36,7 +36,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild
index 2a53f8cd920d..1fc2740c1227 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit check-reqs cuda eutils toolchain-funcs unpacker versionator
+inherit check-reqs toolchain-funcs unpacker
 
-MYD=$(get_version_component_range 1-2)
+MYD=$(ver_cut 1-2 ${PV})
 DRIVER_PV="396.26"
 
 DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
@@ -18,8 +18,8 @@ KEYWORDS="-* ~amd64 ~amd64-linux"
 IUSE="debugger doc eclipse profiler"
 RESTRICT="bindist mirror"
 
-DEPEND=""
-RDEPEND="${DEPEND}
+BDEPEND=""
+RDEPEND="
 	<sys-devel/gcc-8[cxx]
 	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
 	debugger? (
@@ -36,7 +36,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="3500M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
@@ -97,7 +96,7 @@ src_install() {
 	done
 
 	dodir ${cudadir}
-	mv * "${ED%/}${cudadir}" || die
+	mv * "${ED}${cudadir}" || die
 
 	cat > "${T}"/99cuda <<- EOF || die
 		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
@@ -114,15 +113,19 @@ src_install() {
 
 pkg_postinst_check() {
 	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b="${a[${#a[@]}-1]}"
+	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	b="0.0"
+	for v in $a; do
+		if ver_test "${v}" -gt "${b}"; then
+			b="${v}"
+		fi
+	done
 
 	# if gcc and if not gcc-version is at least greatest supported
 	if tc-is-gcc && \
-		! version_is_at_least gcc-version ${b}; then
+		ver_test $(gcc-version) -gt ${b}; then
 			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "gcc > ${b} will not work with CUDA"
 			ewarn "Make sure you set an earlier version of gcc with gcc-config"
 			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
 			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 616b7d080b5c..51177f6b537e 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2021.1.2.tar.gz 466806126 BLAKE2B 403cc5949ccb0e5f7d39d55b91d962889e35342715501466c007a5b3b044cbe33260de99e7d299f35a6e789c6f7e5726bc7106bc206d4e4890f8948eab7a15a2 SHA512 180d813d1162456312eb4482f414443350d784effab56cc53f2f6c2c79931f9af597849ec395089d8fc1ca2b87015722fad3cc43e03bfb4418e2c926b5af0107
-EBUILD pycharm-community-2021.1.2.ebuild 1219 BLAKE2B de6552d1e569adeb315d9c4ee969d0d4623c464c308ed2dd6b5aeb9bdfe634543c30a7876ec053cef63333d8ea3b1148f15faeb5c5552debd7e58743c9c84856 SHA512 e9e2c6e790a66dbc9d382a5f0288c32ce70f746cae1327a60247f5686f553cf1072aa4be991bc97f17534aaaca45ffb78d791b7eac7b68553c58d87e1847a10f
+EBUILD pycharm-community-2021.1.2-r1.ebuild 3198 BLAKE2B 94d0ce4a952f182fcca3d10ab2f405d9fec7dbfa10638e5bf73f870300cb4b172fe6c1717ebf2dbeb3a731900ac981c87ebc327d6108b2917498e1a26f0ba607 SHA512 6fa94b51a29292e428850e99ae95776339a49afa4d8840d2f5b876546e797755c09778e60387fba9442f4a4b19ac6c8caaaca44d94cee59413231e4eb8042db9
 MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-community/pycharm-community-2021.1.2-r1.ebuild b/dev-util/pycharm-community/pycharm-community-2021.1.2-r1.ebuild
new file mode 100644
index 000000000000..c9c849340bf5
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2021.1.2-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop readme.gentoo-r1 wrapper xdg-utils
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+bundled-jdk"
+
+BDEPEND="dev-util/patchelf"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+	app-arch/brotli
+	app-arch/zstd
+	app-crypt/p11-kit
+	dev-libs/fribidi
+	dev-libs/glib
+	dev-libs/json-c
+	dev-libs/libbsd
+	dev-libs/libdbusmenu
+	dev-libs/nss
+	dev-python/pip
+	media-fonts/dejavu
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2=
+	media-libs/harfbuzz
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	net-libs/gnutls
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/jpeg:0=
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+RESTRICT="mirror"
+
+QA_PREBUILT="opt/${P}/*"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -vf "${S}"/help/ReferenceCardForMac.pdf || die
+
+	rm -vf "${S}"/bin/fsnotifier || die
+	rm -vf "${S}"/bin/phpstorm.vmoptions || die
+
+	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.so || die
+	rm -vf "${S}"/plugins/performanceTesting/bin/*.dll || die
+	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.dylib || die
+	rm -vrf "${S}"/lib/pty4j-native/linux/{aarch64,mips64el,ppc64le,x86} || die
+	rm -vf "${S}"/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo" bin/idea.properties
+
+	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
+	do
+		if [[ -f "${file}" ]]; then
+			patchelf --set-rpath '$ORIGIN' ${file} || die
+		fi
+	done
+}
+
+src_install() {
+	local DIR="/opt/${PN}"
+	local JRE_DIR="jbr"
+
+	insinto ${DIR}
+	doins -r *
+
+	if ! use bundled-jdk; then
+		rm -r "${JRE_DIR}" || die
+	fi
+
+	fperms 755 "${DIR}"/bin/{format.sh,fsnotifier64,inspect.sh,ltedit.sh,pycharm.sh,printenv.py,restart.py}
+
+	fperms 755 "${DIR}"/"${JRE_DIR}"/bin/{jaotc,java,javac,jcmd,jdb,jfr,jhsdb,jjs,jmap,jps,jrunscript,jstack,jstat,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+	fperms 755 "${DIR}"/"${JRE_DIR}"/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+
+	make_wrapper "${PN}" "${DIR}/bin/pycharm.sh"
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir /etc/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/pycharm-community/pycharm-community-2021.1.2.ebuild b/dev-util/pycharm-community/pycharm-community-2021.1.2.ebuild
deleted file mode 100644
index 6954ddae2fa5..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2021.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+bundled-jdk"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-community/}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	if use bundled-jdk; then
-		fperms -R a+x /opt/pycharm-community/jbr/bin/
-	else
-		rm -r "${D}"/opt/pycharm-community/jbr/ || die
-	fi
-
-	local rub
-
-	for rub in aarch64 mips64el ppc64le; do
-		rm -r "${D}"/opt/pycharm-community/lib/pty4j-native/linux/${rub} || die
-	done
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 1b26fab1fca4..8ac344f6022d 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-professional-2021.1.2.tar.gz 580807899 BLAKE2B ba21f9ba000c34f3073b778b7314c727e5204de480afd34fd79e97aca2da673252324897d3f40bda998e8d6ad2645c173f9c0abfbaf745de2c58782faa18c29d SHA512 c76c3113c620084cb6a3a647998cde61b3a6b2e9ff05870469f3f980295d5853911521095e26fae365cd94d2f6843866ced39db5e510bef3495931c60094f49c
-EBUILD pycharm-professional-2021.1.2.ebuild 1298 BLAKE2B ad0dd142c421841b3a99df25810b0744379818a5bff06ce0a11347cad0ac5b3960c0ac9cfec8c268972e08f7a926c2578bd5035ac3fc596adafd5fe46a8b71b7 SHA512 3b3920495391375f13f48a08c70b0907a063e629f5fee01f03eec5e7cfbe0450d31747ed421ed41b8a12b9a6e12c61196379473654295c343510676e83e28d25
+EBUILD pycharm-professional-2021.1.2-r1.ebuild 3268 BLAKE2B 6faa46fe37be0396878a12d2fdc26ac332d6dbf75ba108b0aa81880af6bc316003b89afba7b67bdbfcb9947454f68cff6fd305d1075d350259206460b6b8830d SHA512 8694257403d8db978feec69b73546c59bc90db1c618ab10eaa1df56223f8e0d9cc07f15f05851e8781150c9cf1735917a592da6053208f77482e47aa1c238882
 MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild
new file mode 100644
index 000000000000..e720741472c2
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop readme.gentoo-r1 wrapper xdg-utils
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+bundled-jdk"
+
+BDEPEND="dev-util/patchelf"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+	app-arch/brotli
+	app-arch/zstd
+	app-crypt/p11-kit
+	dev-libs/fribidi
+	dev-libs/glib
+	dev-libs/json-c
+	dev-libs/libbsd
+	dev-libs/libdbusmenu
+	dev-libs/nss
+	dev-python/pip
+	media-fonts/dejavu
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2=
+	media-libs/harfbuzz
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	net-libs/gnutls
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/jpeg:0=
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+RESTRICT="mirror"
+
+QA_PREBUILT="opt/${P}/*"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -vf "${S}"/help/ReferenceCardForMac.pdf || die
+
+	rm -vf "${S}"/bin/fsnotifier || die
+	rm -vf "${S}"/bin/phpstorm.vmoptions || die
+
+	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.so || die
+	rm -vf "${S}"/plugins/performanceTesting/bin/*.dll || die
+	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.dylib || die
+	rm -vrf "${S}"/lib/pty4j-native/linux/{aarch64,mips64el,ppc64le,x86} || die
+	rm -vf "${S}"/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo" bin/idea.properties
+
+	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
+	do
+		if [[ -f "${file}" ]]; then
+			patchelf --set-rpath '$ORIGIN' ${file} || die
+		fi
+	done
+}
+
+src_install() {
+	local DIR="/opt/${PN}"
+	local JRE_DIR="jbr"
+
+	insinto ${DIR}
+	doins -r *
+
+	if ! use bundled-jdk; then
+		rm -r "${JRE_DIR}" || die
+	fi
+
+	fperms 755 "${DIR}"/bin/{format.sh,fsnotifier64,inspect.sh,ltedit.sh,pycharm.sh,printenv.py,restart.py}
+
+	fperms 755 "${DIR}"/"${JRE_DIR}"/bin/{jaotc,java,javac,jcmd,jdb,jfr,jhsdb,jjs,jmap,jps,jrunscript,jstack,jstat,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+	fperms 755 "${DIR}"/"${JRE_DIR}"/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+
+	make_wrapper "${PN}" "${DIR}/bin/pycharm.sh"
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir /etc/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.1.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.1.2.ebuild
deleted file mode 100644
index 3f340f7deba3..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2021.1.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+bundled-jdk"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	if use bundled-jdk; then
-		fperms -R a+x /opt/pycharm-professional/jbr/bin/
-	else
-		rm -r "${D}"/opt/pycharm-professional/jbr/ || die
-	fi
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	local rub
-
-	for rub in aarch64 mips64el ppc64le; do
-		rm -r "${D}"/opt/pycharm-professional/lib/pty4j-native/linux/${rub} || die
-	done
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 6172604e44d5..849de712a92d 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
-AUX rt-tests-1.10-musl.patch 10825 BLAKE2B 64195bfd2ca512721701613a1aa881e3d17290d75bc3ec991bdc8c7092b8cc9ba055fe86a5390350158c7b3a442bcd35f07a3eeb148fe6c701a4ada7840934cf SHA512 3a5c47315e3630c38600d359af4f4b9ef572c7db7ae550fa57512b72f50bb5d762933aba3594876b66ba37d85dfecc3ffd6c0172c951f8c48d4ff37620cee674
-DIST rt-tests-1.10.tar.xz 112300 BLAKE2B b38a7357b1402de94661014e71ed9fc48d9dde6cabbe72ed4031841b57f7fb76a01dda03c7888f11d8e5e9c11cda8281dae1b437f0d1ff971d2941547f659103 SHA512 9512419b364746ad490894c7184a391f0e8d571477ad636abff8ed473151c6f2c263475ca4aa7d498e81c18e17e42ae82260693b90bce4ef9889e0eaf0b77b58
-EBUILD rt-tests-1.10.ebuild 903 BLAKE2B c989e36ce497c25a3354344c5f62638a0d1791087414884636bf0bb596451b4702773ab198e3257d0bf3961cbeb80168a53f0af3f51ee998558ae74dda5b9a7c SHA512 99d386c80e8e9a8d51f2e467361fdbce6f54c2fad1a6b4cd956c6ff9515081809265595a9603b62dc82e786eea8590a29091b4d145b1429554e337347b71574c
+AUX rt-tests-2.1-musl.patch 9594 BLAKE2B bd05ee635f1213d202428260d5026e34bce319666f64ddd199efa981ab13e5d1eaff67eabeb435a9479970b27de52e77fed2ce2377b03675d629f4a6dcf40cb8 SHA512 0ad7dd21a9821567d9ea2a52582b54c1697c842b08eeb8f627410d24fc2e812e04e642a7355ba9a907720cecbdbc0d973e711f315b0e185a8f1046c448d067b1
+DIST rt-tests-2.1.tar.xz 114892 BLAKE2B 25a382c898ffdbbe7b6c3f69f440b87ca6b88cc634aae06a3e02154954b8b50da46e2f2b3291d7473bb0ae533f5a90a7769433650bab3f7c229a5d3022e32b50 SHA512 7abab6c1191247ac44f4e5193752474756d82fdf1d8a3b69c92c8d37bd4fe8458444d2165894fc8483590809ff5b4f1c755d66afb296e72041f9efbedd048d0d
+EBUILD rt-tests-2.1.ebuild 904 BLAKE2B 0979405e05778f450e9a3fd18fd942fb9be2753b58612fc81cfd5b516e7527bfa7ada38b7b444747fda618a9d69df26bb2c665f5420d64c0afec3b20bf6b488a SHA512 481b95eb148a0abb46893a4f97022e289c408a42c1b8a48f950555ff143f697a7118cde872d85a841212f7641671f8ed6b2e036c645cc959c02aa4db68cac350
 MISC metadata.xml 748 BLAKE2B 6603446c7aa66d6586f9e8dfa53c6338f9287c3ecf6768b67554832fa45ab38f488dc54d077947e46973c251d454320adf8788ebd8b797055604b26c878a428e SHA512 c2c39041a28bfc866667589c67f8c3a8b044489fe4b10b247ee770f41b84fa75b1d55eaf70d94e0e43d27e82774aff982c4fe72555933baaedcb208b01d17cdd
diff --git a/dev-util/rt-tests/files/rt-tests-1.10-musl.patch b/dev-util/rt-tests/files/rt-tests-1.10-musl.patch
deleted file mode 100644
index 2dc17d504922..000000000000
--- a/dev-util/rt-tests/files/rt-tests-1.10-musl.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-From 0b7a1e0d3463aa8aa4b7dcad0ec154e658d68036 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Wed, 1 Apr 2020 20:15:24 +0200
-Subject: [PATCH] all: Fix musl build
-
-There are a few problems:
-
- * pi stress:  pthread_attr_setaffinity_np() is not supported
- * cyclictest: SIGEV_THREAD_ID is not supported
- * hackbench:  Fix include
- * all:        Fix sched_* calls
-
-With these changes applied, the rt-tests seem to run fine.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- Makefile                              |  5 --
- src/backfire/sendme.c                 |  1 +
- src/cyclictest/cyclictest.c           | 70 ++++-----------------------
- src/hackbench/hackbench.c             |  4 +-
- src/include/musl.h                    | 28 +++++++++++
- src/lib/rt-utils.c                    |  1 +
- src/pi_tests/classic_pi.c             |  2 +
- src/pi_tests/tst-mutexpi10.c          |  2 +
- src/pmqtest/pmqtest.c                 |  1 +
- src/ptsematest/ptsematest.c           |  1 +
- src/rt-migrate-test/rt-migrate-test.c |  1 +
- src/sched_deadline/cyclicdeadline.c   |  2 +
- 12 files changed, 51 insertions(+), 67 deletions(-)
- create mode 100644 src/include/musl.h
-
-diff --git a/Makefile b/Makefile
-index 636f1914a777..01732ee2647f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -7,7 +7,6 @@ OBJDIR = bld
- sources = cyclictest.c \
- 	  hackbench.c \
- 	  pip_stress.c \
--	  pi_stress.c \
- 	  pmqtest.c \
- 	  ptsematest.c \
- 	  rt-migrate-test.c \
-@@ -42,7 +41,6 @@ ifeq (${PYLIB},)
- endif
- 
- MANPAGES = src/cyclictest/cyclictest.8 \
--	   src/pi_tests/pi_stress.8 \
- 	   src/ptsematest/ptsematest.8 \
- 	   src/rt-migrate-test/rt-migrate-test.8 \
- 	   src/sigwaittest/sigwaittest.8 \
-@@ -130,9 +128,6 @@ deadline_test: $(OBJDIR)/deadline_test.o $(OBJDIR)/librttest.a
- signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a $(OBJDIR)/librttestnuma.a
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(RTTESTNUMA)
- 
--pi_stress: $(OBJDIR)/pi_stress.o $(OBJDIR)/librttest.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
--
- hwlatdetect:  src/hwlatdetect/hwlatdetect.py
- 	chmod +x src/hwlatdetect/hwlatdetect.py
- 	ln -s src/hwlatdetect/hwlatdetect.py hwlatdetect
-diff --git a/src/backfire/sendme.c b/src/backfire/sendme.c
-index d963723b1c93..b355bbbcfece 100644
---- a/src/backfire/sendme.c
-+++ b/src/backfire/sendme.c
-@@ -31,6 +31,7 @@
- #include <errno.h>
- #include "rt-utils.h"
- #include "rt-get_cpu.h"
-+#include "musl.h"
- 
- #include <utmpx.h>
- #include <sys/types.h>
-diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
-index f38c453f1975..b6b91218f756 100644
---- a/src/cyclictest/cyclictest.c
-+++ b/src/cyclictest/cyclictest.c
-@@ -37,6 +37,7 @@
- 
- #include "rt-utils.h"
- #include "rt-numa.h"
-+#include "musl.h"
- 
- #include <bionic.h>
- 
-@@ -500,12 +501,8 @@ static void *timerthread(void *param)
- {
- 	struct thread_param *par = param;
- 	struct sched_param schedp;
--	struct sigevent sigev;
- 	sigset_t sigset;
--	timer_t timer;
- 	struct timespec now, next, interval, stop;
--	struct itimerval itimer;
--	struct itimerspec tspec;
- 	struct thread_stat *stat = par->stats;
- 	int stopped = 0;
- 	cpu_set_t mask;
-@@ -536,14 +533,6 @@ static void *timerthread(void *param)
- 	sigaddset(&sigset, par->signal);
- 	sigprocmask(SIG_BLOCK, &sigset, NULL);
- 
--	if (par->mode == MODE_CYCLIC) {
--		sigev.sigev_notify = SIGEV_THREAD_ID | SIGEV_SIGNAL;
--		sigev.sigev_signo = par->signal;
--		sigev.sigev_notify_thread_id = stat->tid;
--		timer_create(par->clock, &sigev, &timer);
--		tspec.it_interval = interval;
--	}
--
- 	memset(&schedp, 0, sizeof(schedp));
- 	schedp.sched_priority = par->prio;
- 	if (setscheduler(0, par->policy, &schedp))
-@@ -598,20 +587,6 @@ static void *timerthread(void *param)
- 		stop = now;
- 		stop.tv_sec += duration;
- 	}
--	if (par->mode == MODE_CYCLIC) {
--		if (par->timermode == TIMER_ABSTIME)
--			tspec.it_value = next;
--		else
--			tspec.it_value = interval;
--		timer_settime(timer, par->timermode, &tspec, NULL);
--	}
--
--	if (par->mode == MODE_SYS_ITIMER) {
--		itimer.it_interval.tv_sec = interval.tv_sec;
--		itimer.it_interval.tv_usec = interval.tv_nsec / 1000;
--		itimer.it_value = itimer.it_interval;
--		setitimer(ITIMER_REAL, &itimer, NULL);
--	}
- 
- 	stat->threadstarted++;
- 
-@@ -619,16 +594,10 @@ static void *timerthread(void *param)
- 
- 		uint64_t diff;
- 		unsigned long diff_smi = 0;
--		int sigs, ret;
-+		int ret;
- 
- 		/* Wait for next period */
- 		switch (par->mode) {
--		case MODE_CYCLIC:
--		case MODE_SYS_ITIMER:
--			if (sigwait(&sigset, &sigs) < 0)
--				goto out;
--			break;
--
- 		case MODE_CLOCK_NANOSLEEP:
- 			if (par->timermode == TIMER_ABSTIME) {
- 				ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
-@@ -749,11 +718,6 @@ static void *timerthread(void *param)
- 
- 		next.tv_sec += interval.tv_sec;
- 		next.tv_nsec += interval.tv_nsec;
--		if (par->mode == MODE_CYCLIC) {
--			int overrun_count = timer_getoverrun(timer);
--			next.tv_sec += overrun_count * interval.tv_sec;
--			next.tv_nsec += overrun_count * interval.tv_nsec;
--		}
- 		tsnorm(&next);
- 
- 		while (tsgreater(&now, &next)) {
-@@ -778,17 +742,6 @@ out:
- 		pthread_mutex_unlock(&refresh_on_max_lock);
- 	}
- 
--	if (par->mode == MODE_CYCLIC)
--		timer_delete(timer);
--
--	if (par->mode == MODE_SYS_ITIMER) {
--		itimer.it_value.tv_sec = 0;
--		itimer.it_value.tv_usec = 0;
--		itimer.it_interval.tv_sec = 0;
--		itimer.it_interval.tv_usec = 0;
--		setitimer(ITIMER_REAL, &itimer, NULL);
--	}
--
- 	/* close msr file */
- 	if (smi)
- 		close(par->msr_fd);
-@@ -1159,7 +1112,8 @@ static void process_options(int argc, char *argv[], int max_cpus)
- 		case OPT_VERBOSE: verbose = 1; break;
- 		case 'x':
- 		case OPT_POSIX_TIMERS:
--			use_nanosleep = MODE_CYCLIC; break;
-+			fatal("--posix_timers is not available on your libc\n");
-+			break;
- 		case '?':
- 		case OPT_HELP:
- 			display_help(0); break;
-@@ -1192,13 +1146,6 @@ static void process_options(int argc, char *argv[], int max_cpus)
- 		}
- 	}
- 
--	if ((use_system == MODE_SYS_OFFSET) && (use_nanosleep == MODE_CYCLIC)) {
--		warn("The system option requires clock_nanosleep\n");
--		warn("and is not compatible with posix_timers\n");
--		warn("Using clock_nanosleep\n");
--		use_nanosleep = MODE_CLOCK_NANOSLEEP;
--	}
--
- 	/* if smp wasn't requested, test for numa automatically */
- 	if (!smp) {
- 		if (numa_initialize())
-@@ -1881,7 +1828,6 @@ int main(int argc, char **argv)
- 
- 	}
- 
--
- 	mode = use_nanosleep + use_system;
- 
- 	sigemptyset(&sigset);
-@@ -1931,16 +1877,18 @@ int main(int argc, char **argv)
- 			void *stack;
- 			void *currstk;
- 			size_t stksize;
-+			int err;
- 
- 			/* find the memory node associated with the cpu i */
- 			node = rt_numa_numa_node_of_cpu(cpu);
- 
--			/* get the stack size set for this thread */
--			if (pthread_attr_getstack(&attr, &currstk, &stksize))
-+			/* get the stack size set for for this thread */
-+			err = pthread_attr_getstack(&attr, &currstk, &stksize);
-+			if (err != EINVAL)
- 				fatal("failed to get stack size for thread %d\n", i);
- 
- 			/* if the stack size is zero, set a default */
--			if (stksize == 0)
-+			if (err == EINVAL || stksize == 0)
- 				stksize = PTHREAD_STACK_MIN * 2;
- 
- 			/*  allocate memory for a stack on appropriate node */
-diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
-index 268c23233004..bbbb29a3a430 100644
---- a/src/hackbench/hackbench.c
-+++ b/src/hackbench/hackbench.c
-@@ -24,13 +24,15 @@
- #include <sys/socket.h>
- #include <sys/wait.h>
- #include <sys/time.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <limits.h>
- #include <getopt.h>
- #include <signal.h>
- #include <setjmp.h>
- #include <sched.h>
- 
-+#include "musl.h"
-+
- static unsigned int datasize = 100;
- static unsigned int loops = 100;
- static unsigned int num_groups = 10;
-diff --git a/src/include/musl.h b/src/include/musl.h
-new file mode 100644
-index 000000000000..ea5075e768c8
---- /dev/null
-+++ b/src/include/musl.h
-@@ -0,0 +1,28 @@
-+/*
-+ * Copyright (C) 2020 Kurt Kanzenbach <kurt@kmk-computers.de>
-+ * Time-stamp: <2020-04-04 10:54:01 kurt>
-+ */
-+
-+#ifndef _MUSL_H_
-+#define _MUSL_H_
-+
-+#include <unistd.h>
-+#include <sys/syscall.h>
-+
-+/*
-+ * Musl someshow defines sched_* to ENOSYS which is not correct ...
-+ * See commit 1e21e78bf7a5 ("add support for thread scheduling (POSIX TPS option)")
-+ *
-+ * Workaround: define them to syscall(...)
-+ */
-+
-+#define sched_getparam(pid, param)		\
-+	syscall(SYS_sched_getparam, pid, param)
-+#define sched_setparam(pid, param)		\
-+	syscall(SYS_sched_setparam, pid, param)
-+#define sched_getscheduler(pid)			\
-+	syscall(SYS_sched_getscheduler, pid)
-+#define sched_setscheduler(pid, policy, param)			\
-+	syscall(SYS_sched_setscheduler, pid, policy, param)
-+
-+#endif /* _MUSL_H_ */
-diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c
-index 2d68d62cd875..529d427c8084 100644
---- a/src/lib/rt-utils.c
-+++ b/src/lib/rt-utils.c
-@@ -23,6 +23,7 @@
- #include "rt-utils.h"
- #include "rt-sched.h"
- #include "error.h"
-+#include "musl.h"
- 
- #define  TRACEBUFSIZ  1024
- 
-diff --git a/src/pi_tests/classic_pi.c b/src/pi_tests/classic_pi.c
-index 64af8890276f..bb088d3973b2 100644
---- a/src/pi_tests/classic_pi.c
-+++ b/src/pi_tests/classic_pi.c
-@@ -34,6 +34,8 @@
- #include <signal.h>
- #include <getopt.h>
- 
-+#include "musl.h"
-+
- /* test timeout */
- #define TIMEOUT 2
- 
-diff --git a/src/pi_tests/tst-mutexpi10.c b/src/pi_tests/tst-mutexpi10.c
-index 97a345edd26e..1028d344edff 100644
---- a/src/pi_tests/tst-mutexpi10.c
-+++ b/src/pi_tests/tst-mutexpi10.c
-@@ -35,6 +35,8 @@
- #include <string.h>
- #include <signal.h>
- 
-+#include "musl.h"
-+
- /* test timeout */
- #define TIMEOUT 2
- 
-diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c
-index 5f7a24d55db6..555679cf36ef 100644
---- a/src/pmqtest/pmqtest.c
-+++ b/src/pmqtest/pmqtest.c
-@@ -24,6 +24,7 @@
- #include "rt-utils.h"
- #include "rt-get_cpu.h"
- #include "error.h"
-+#include "musl.h"
- 
- #include <pthread.h>
- 
-diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
-index 2e392299fdc4..b45d35755865 100644
---- a/src/ptsematest/ptsematest.c
-+++ b/src/ptsematest/ptsematest.c
-@@ -22,6 +22,7 @@
- #include "rt-utils.h"
- #include "rt-get_cpu.h"
- #include "error.h"
-+#include "musl.h"
- 
- #include <pthread.h>
- 
-diff --git a/src/rt-migrate-test/rt-migrate-test.c b/src/rt-migrate-test/rt-migrate-test.c
-index 9bf716c9178c..f51d388d9150 100644
---- a/src/rt-migrate-test/rt-migrate-test.c
-+++ b/src/rt-migrate-test/rt-migrate-test.c
-@@ -25,6 +25,7 @@
- #include <sched.h>
- #include <pthread.h>
- #include "rt-utils.h"
-+#include "musl.h"
- 
- int nr_tasks;
- int lfd;
-diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
-index 98eb367248ac..45b27f72a5a7 100644
---- a/src/sched_deadline/cyclicdeadline.c
-+++ b/src/sched_deadline/cyclicdeadline.c
-@@ -34,6 +34,8 @@
- #include <rt-sched.h>
- #include <error.h>
- 
-+#include "musl.h"
-+
- #define _STR(x) #x
- #define STR(x) _STR(x)
- #ifndef MAXPATH
--- 
-2.26.2
-
diff --git a/dev-util/rt-tests/files/rt-tests-2.1-musl.patch b/dev-util/rt-tests/files/rt-tests-2.1-musl.patch
new file mode 100644
index 000000000000..caa8d415aad5
--- /dev/null
+++ b/dev-util/rt-tests/files/rt-tests-2.1-musl.patch
@@ -0,0 +1,352 @@
+From 0b7a1e0d3463aa8aa4b7dcad0ec154e658d68036 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Wed, 1 Apr 2020 20:15:24 +0200
+Subject: [PATCH] all: Fix musl build
+
+There are a few problems:
+
+ * pi stress:  pthread_attr_setaffinity_np() is not supported
+ * cyclictest: SIGEV_THREAD_ID is not supported
+ * hackbench:  Fix include
+ * all:        Fix sched_* calls
+
+With these changes applied, the rt-tests seem to run fine.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ Makefile                              |    5 --
+ src/backfire/sendme.c                 |    1 
+ src/cyclictest/cyclictest.c           |   70 ++++------------------------------
+ src/hackbench/hackbench.c             |    4 +
+ src/include/musl.h                    |   28 +++++++++++++
+ src/lib/rt-utils.c                    |    1 
+ src/pi_tests/classic_pi.c             |    2 
+ src/pi_tests/tst-mutexpi10.c          |    2 
+ src/pmqtest/pmqtest.c                 |    1 
+ src/ptsematest/ptsematest.c           |    1 
+ src/rt-migrate-test/rt-migrate-test.c |    1 
+ src/sched_deadline/cyclicdeadline.c   |    1 
+ 12 files changed, 50 insertions(+), 67 deletions(-)
+ create mode 100644 src/include/musl.h
+
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,6 @@ OBJDIR = bld
+ sources = cyclictest.c \
+ 	  hackbench.c \
+ 	  pip_stress.c \
+-	  pi_stress.c \
+ 	  pmqtest.c \
+ 	  ptsematest.c \
+ 	  rt-migrate-test.c \
+@@ -42,7 +41,6 @@ ifeq (${PYLIB},)
+ endif
+ 
+ MANPAGES = src/cyclictest/cyclictest.8 \
+-	   src/pi_tests/pi_stress.8 \
+ 	   src/ptsematest/ptsematest.8 \
+ 	   src/rt-migrate-test/rt-migrate-test.8 \
+ 	   src/sigwaittest/sigwaittest.8 \
+@@ -130,9 +128,6 @@ deadline_test: $(OBJDIR)/deadline_test.o
+ signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a $(OBJDIR)/librttestnuma.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(RTTESTNUMA)
+ 
+-pi_stress: $(OBJDIR)/pi_stress.o $(OBJDIR)/librttest.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
+-
+ hwlatdetect:  src/hwlatdetect/hwlatdetect.py
+ 	chmod +x src/hwlatdetect/hwlatdetect.py
+ 	ln -s src/hwlatdetect/hwlatdetect.py hwlatdetect
+--- a/src/backfire/sendme.c
++++ b/src/backfire/sendme.c
+@@ -29,6 +29,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <errno.h>
++#include "musl.h"
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+ 
+--- a/src/cyclictest/cyclictest.c
++++ b/src/cyclictest/cyclictest.c
+@@ -33,6 +33,7 @@
+ #include <sys/utsname.h>
+ #include <sys/mman.h>
+ #include <sys/syscall.h>
++#include "musl.h"
+ #include "rt_numa.h"
+ 
+ #include "rt-utils.h"
+@@ -502,12 +503,8 @@ static void *timerthread(void *param)
+ {
+ 	struct thread_param *par = param;
+ 	struct sched_param schedp;
+-	struct sigevent sigev;
+ 	sigset_t sigset;
+-	timer_t timer;
+ 	struct timespec now, next, interval, stop;
+-	struct itimerval itimer;
+-	struct itimerspec tspec;
+ 	struct thread_stat *stat = par->stats;
+ 	int stopped = 0;
+ 	cpu_set_t mask;
+@@ -538,14 +535,6 @@ static void *timerthread(void *param)
+ 	sigaddset(&sigset, par->signal);
+ 	sigprocmask(SIG_BLOCK, &sigset, NULL);
+ 
+-	if (par->mode == MODE_CYCLIC) {
+-		sigev.sigev_notify = SIGEV_THREAD_ID | SIGEV_SIGNAL;
+-		sigev.sigev_signo = par->signal;
+-		sigev.sigev_notify_thread_id = stat->tid;
+-		timer_create(par->clock, &sigev, &timer);
+-		tspec.it_interval = interval;
+-	}
+-
+ 	memset(&schedp, 0, sizeof(schedp));
+ 	schedp.sched_priority = par->prio;
+ 	if (setscheduler(0, par->policy, &schedp))
+@@ -600,20 +589,6 @@ static void *timerthread(void *param)
+ 		stop = now;
+ 		stop.tv_sec += duration;
+ 	}
+-	if (par->mode == MODE_CYCLIC) {
+-		if (par->timermode == TIMER_ABSTIME)
+-			tspec.it_value = next;
+-		else
+-			tspec.it_value = interval;
+-		timer_settime(timer, par->timermode, &tspec, NULL);
+-	}
+-
+-	if (par->mode == MODE_SYS_ITIMER) {
+-		itimer.it_interval.tv_sec = interval.tv_sec;
+-		itimer.it_interval.tv_usec = interval.tv_nsec / 1000;
+-		itimer.it_value = itimer.it_interval;
+-		setitimer(ITIMER_REAL, &itimer, NULL);
+-	}
+ 
+ 	stat->threadstarted++;
+ 
+@@ -621,16 +596,10 @@ static void *timerthread(void *param)
+ 
+ 		uint64_t diff;
+ 		unsigned long diff_smi = 0;
+-		int sigs, ret;
++		int ret;
+ 
+ 		/* Wait for next period */
+ 		switch (par->mode) {
+-		case MODE_CYCLIC:
+-		case MODE_SYS_ITIMER:
+-			if (sigwait(&sigset, &sigs) < 0)
+-				goto out;
+-			break;
+-
+ 		case MODE_CLOCK_NANOSLEEP:
+ 			if (par->timermode == TIMER_ABSTIME) {
+ 				ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
+@@ -751,11 +720,6 @@ static void *timerthread(void *param)
+ 
+ 		next.tv_sec += interval.tv_sec;
+ 		next.tv_nsec += interval.tv_nsec;
+-		if (par->mode == MODE_CYCLIC) {
+-			int overrun_count = timer_getoverrun(timer);
+-			next.tv_sec += overrun_count * interval.tv_sec;
+-			next.tv_nsec += overrun_count * interval.tv_nsec;
+-		}
+ 		tsnorm(&next);
+ 
+ 		while (tsgreater(&now, &next)) {
+@@ -780,17 +744,6 @@ out:
+ 		pthread_mutex_unlock(&refresh_on_max_lock);
+ 	}
+ 
+-	if (par->mode == MODE_CYCLIC)
+-		timer_delete(timer);
+-
+-	if (par->mode == MODE_SYS_ITIMER) {
+-		itimer.it_value.tv_sec = 0;
+-		itimer.it_value.tv_usec = 0;
+-		itimer.it_interval.tv_sec = 0;
+-		itimer.it_interval.tv_usec = 0;
+-		setitimer(ITIMER_REAL, &itimer, NULL);
+-	}
+-
+ 	/* close msr file */
+ 	if (smi)
+ 		close(par->msr_fd);
+@@ -1174,7 +1127,8 @@ static void process_options(int argc, ch
+ 		case OPT_VERBOSE: verbose = 1; break;
+ 		case 'x':
+ 		case OPT_POSIX_TIMERS:
+-			use_nanosleep = MODE_CYCLIC; break;
++			fatal("--posix_timers is not available on your libc\n");
++			break;
+ 		case '?':
+ 		case OPT_HELP:
+ 			display_help(0); break;
+@@ -1207,13 +1161,6 @@ static void process_options(int argc, ch
+ 		}
+ 	}
+ 
+-	if ((use_system == MODE_SYS_OFFSET) && (use_nanosleep == MODE_CYCLIC)) {
+-		warn("The system option requires clock_nanosleep\n");
+-		warn("and is not compatible with posix_timers\n");
+-		warn("Using clock_nanosleep\n");
+-		use_nanosleep = MODE_CLOCK_NANOSLEEP;
+-	}
+-
+ 	/* if smp wasn't requested, test for numa automatically */
+ 	if (!smp) {
+ 		numa = numa_initialize();
+@@ -1943,7 +1890,6 @@ int main(int argc, char **argv)
+ 
+ 	}
+ 
+-
+ 	mode = use_nanosleep + use_system;
+ 
+ 	sigemptyset(&sigset);
+@@ -1993,16 +1939,18 @@ int main(int argc, char **argv)
+ 			void *stack;
+ 			void *currstk;
+ 			size_t stksize;
++			int err;
+ 
+ 			/* find the memory node associated with the cpu i */
+ 			node = rt_numa_numa_node_of_cpu(cpu);
+ 
+-			/* get the stack size set for this thread */
+-			if (pthread_attr_getstack(&attr, &currstk, &stksize))
++			/* get the stack size set for for this thread */
++			err = pthread_attr_getstack(&attr, &currstk, &stksize);
++			if (err != EINVAL)
+ 				fatal("failed to get stack size for thread %d\n", i);
+ 
+ 			/* if the stack size is zero, set a default */
+-			if (stksize == 0)
++			if (err == EINVAL || stksize == 0)
+ 				stksize = PTHREAD_STACK_MIN * 2;
+ 
+ 			/*  allocate memory for a stack on appropriate node */
+--- a/src/hackbench/hackbench.c
++++ b/src/hackbench/hackbench.c
+@@ -24,13 +24,15 @@
+ #include <sys/socket.h>
+ #include <sys/wait.h>
+ #include <sys/time.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <limits.h>
+ #include <getopt.h>
+ #include <signal.h>
+ #include <setjmp.h>
+ #include <sched.h>
+ 
++#include "musl.h"
++
+ static unsigned int datasize = 100;
+ static unsigned int loops = 100;
+ static unsigned int num_groups = 10;
+--- /dev/null
++++ b/src/include/musl.h
+@@ -0,0 +1,28 @@
++/*
++ * Copyright (C) 2020 Kurt Kanzenbach <kurt@kmk-computers.de>
++ * Time-stamp: <2020-04-04 10:54:01 kurt>
++ */
++
++#ifndef _MUSL_H_
++#define _MUSL_H_
++
++#include <unistd.h>
++#include <sys/syscall.h>
++
++/*
++ * Musl someshow defines sched_* to ENOSYS which is not correct ...
++ * See commit 1e21e78bf7a5 ("add support for thread scheduling (POSIX TPS option)")
++ *
++ * Workaround: define them to syscall(...)
++ */
++
++#define sched_getparam(pid, param)		\
++	syscall(SYS_sched_getparam, pid, param)
++#define sched_setparam(pid, param)		\
++	syscall(SYS_sched_setparam, pid, param)
++#define sched_getscheduler(pid)			\
++	syscall(SYS_sched_getscheduler, pid)
++#define sched_setscheduler(pid, policy, param)			\
++	syscall(SYS_sched_setscheduler, pid, policy, param)
++
++#endif /* _MUSL_H_ */
+--- a/src/lib/rt-utils.c
++++ b/src/lib/rt-utils.c
+@@ -24,6 +24,7 @@
+ #include <time.h>
+ #include <sys/time.h>
+ 
++#include "musl.h"
+ #include "rt-utils.h"
+ #include "rt-sched.h"
+ #include "rt-error.h"
+--- a/src/pi_tests/classic_pi.c
++++ b/src/pi_tests/classic_pi.c
+@@ -34,6 +34,8 @@
+ #include <signal.h>
+ #include <getopt.h>
+ 
++#include "musl.h"
++
+ /* test timeout */
+ #define TIMEOUT 2
+ 
+--- a/src/pi_tests/tst-mutexpi10.c
++++ b/src/pi_tests/tst-mutexpi10.c
+@@ -35,6 +35,8 @@
+ #include <string.h>
+ #include <signal.h>
+ 
++#include "musl.h"
++
+ /* test timeout */
+ #define TIMEOUT 2
+ 
+--- a/src/pmqtest/pmqtest.c
++++ b/src/pmqtest/pmqtest.c
+@@ -24,6 +24,7 @@
+ #include <pthread.h>
+ #include <inttypes.h>
+ 
++#include "musl.h"
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+ #include "rt-error.h"
+--- a/src/ptsematest/ptsematest.c
++++ b/src/ptsematest/ptsematest.c
+@@ -22,6 +22,7 @@
+ #include <pthread.h>
+ #include <inttypes.h>
+ 
++#include "musl.h"
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+ #include "rt-error.h"
+--- a/src/rt-migrate-test/rt-migrate-test.c
++++ b/src/rt-migrate-test/rt-migrate-test.c
+@@ -27,6 +27,7 @@
+ 
+ #include <linux/unistd.h>
+ 
++#include "musl.h"
+ #include "rt-utils.h"
+ 
+ int nr_tasks;
+--- a/src/sched_deadline/cyclicdeadline.c
++++ b/src/sched_deadline/cyclicdeadline.c
+@@ -30,6 +30,7 @@
+ #include <linux/unistd.h>
+ #include <linux/magic.h>
+ 
++#include "musl.h"
+ #include "rt-utils.h"
+ #include "rt-sched.h"
+ #include "rt-error.h"
diff --git a/dev-util/rt-tests/rt-tests-1.10.ebuild b/dev-util/rt-tests/rt-tests-1.10.ebuild
deleted file mode 100644
index 22e1c39323e2..000000000000
--- a/dev-util/rt-tests/rt-tests-1.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="A collection of latency testing tools for the linux(-rt) kernel"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/"
-SRC_URI="
-	https://kernel.org/pub/linux/utils/rt-tests/${P}.tar.xz
-	https://kernel.org/pub/linux/utils/rt-tests/older/${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	sys-process/numactl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	use elibc_musl && eapply "${FILESDIR}/${P}-musl.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake prefix=/usr DESTDIR="${ED}" install
-	python_fix_shebang "${ED}"
-	python_optimize
-}
diff --git a/dev-util/rt-tests/rt-tests-2.1.ebuild b/dev-util/rt-tests/rt-tests-2.1.ebuild
new file mode 100644
index 000000000000..8f2df0599b23
--- /dev/null
+++ b/dev-util/rt-tests/rt-tests-2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="A collection of latency testing tools for the linux(-rt) kernel"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/"
+SRC_URI="
+	https://kernel.org/pub/linux/utils/rt-tests/${P}.tar.xz
+	https://kernel.org/pub/linux/utils/rt-tests/older/${P}.tar.xz"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	sys-process/numactl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	use elibc_musl && eapply "${FILESDIR}/${P}-musl.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake prefix=/usr DESTDIR="${ED}" install
+	python_fix_shebang "${ED}"
+	python_optimize
+}
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 8d098dd1c5d9..2fc02e182a12 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,7 +1,4 @@
-DIST crystal-molinillo-0.1.0.tar.gz 23932 BLAKE2B c9bcd707a3208f5d80e6e3030523d50f86cb5977799de8ea6035d014094e3c2fff9bb189fa98f566e72e1e7ad161e47e44c89d9b264d47f109b2e891ecb469e5 SHA512 8d74d95896cd7ff510c87e2ffba6ae5f04ceeddde574930ee609851312b65d713a315cc24f9aa3fab02f9447ccb25ef2dd2e8179640b8c5cfb3d7d6b52d1ded5
 DIST crystal-molinillo-0.2.0.tar.gz 23959 BLAKE2B 257dcca66583db87a802b27b1f100e226eb0b6ac53708d110040d7b5560f429a82f11595e303af4922f22917d922d60ea380fb395d254dc3b3ce24f4183395b6 SHA512 7c00a6a3ee4864b712ad8b703557f10498ba0b25491a55ae2f6c02d574034ec5bf8b87df777c3d34eb9cc4c87eebdcf6567c153e9edf3bc3c1b9ac4306ce3dc2
-DIST shards-0.14.1.tar.gz 61664 BLAKE2B 35f5626096266a86561f9b8613cfdb5f628e2ce247eb511dc0896c600619dcc7660b5b2b473fa0d9cec07010a5e13b8614fa63475acffe17a79cab8503cc6485 SHA512 be51e6d5459f0537681bea9b5c7ff048c33cd67fbb9effa20e6af8ac31f8ee0534f2012ed03712b5204451e7a48b932b0c44011dd39a7b47f81c85587579fcdf
 DIST shards-0.15.0.tar.gz 62648 BLAKE2B bd36733e4a98fcc4a02038745ac2b838c61109edc593a333ebb35474d5a7ecb2767c8c1a54f7116c76e83fceb59d151813d3dd23e8afc37c29f00e6b879daf3c SHA512 cbd428627c08658213494215db78c94513482aaa54038c159e8fea4819291552eda8a8f6decf5cf90134c89e98ad7fdaee5f666f02df054fb44c703179f428ca
-EBUILD shards-0.14.1.ebuild 1054 BLAKE2B a0df5a35bc945b59d7200469f771309a1bd046b21ba684c6b61955fe10b84e1df6eb36ba96366164591a328e6a82b0678af26e18d7f0ff4381a0d57b140cc087 SHA512 734b4b5bff2e1c8c7a2de794a14812f2d5887db86c8461c235e83996b66b721736f8517522661bd083f0b01fc6081216ca875895a45c66fa9d2705c3331c495a
 EBUILD shards-0.15.0.ebuild 1054 BLAKE2B 142d0f7d1ffc9a778a5489a356bc7ceb30766999c66001a1bf95bc30a1f727edcd002ab9d03aa8afe78a9530faa02fc04ddcf3f85dad5389382f58c78b5c5680 SHA512 cbf2761c1c58479beecf65477d547c71a0426318b9c3d7829ac3a4f1487b1994bf77f48ab72730a315f936a35b1a692af71c5b64688811a5a2b9c07a473b934f
 MISC metadata.xml 333 BLAKE2B 5aaa8a509bd10e9a7e109960503d257388133ade4ec87394855e78b8e19b7bde217cc129ac30ca61c7ec7d893216a3843b4319dc0509caea1eb60dd5beab54c6 SHA512 982fbd4d41b30594cec235354f7d8fe091f3c183ba49bfc28497fd00f94055a06ac2d72e8160fd906d79f853d864b6d00d298fc00bcc0ece5c69085912ae9a33
diff --git a/dev-util/shards/shards-0.14.1.ebuild b/dev-util/shards/shards-0.14.1.ebuild
deleted file mode 100644
index ed35979dd3c2..000000000000
--- a/dev-util/shards/shards-0.14.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs
-
-CRYSTAL_MOLINILLO_PV=0.1.0
-CRYSTAL_MOLINILLO_P=crystal-molinillo-${CRYSTAL_MOLINILLO_PV}
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="
-	https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/crystal-lang/crystal-molinillo/archive/v${CRYSTAL_MOLINILLO_PV}.tar.gz -> ${CRYSTAL_MOLINILLO_P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT=test # missing files in tarball
-
-src_prepare() {
-	default
-
-	# bundle crystal-molinillo to bootstrap 'shards'
-	mkdir -p lib || die
-	ln -s ../../${CRYSTAL_MOLINILLO_P} lib/molinillo || die
-
-	tc-export CC
-}
-
-src_compile() {
-	emake release=1 FLAGS="--link-flags=\"${LDFLAGS}\" --verbose --threads $(makeopts_jobs)"
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index b3b3a19b7ff1..f3a1ad5ed8d9 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -3,8 +3,10 @@ DIST spirv-llvm-translator-10.0.0.tar.gz 535828 BLAKE2B 0bce2f663b2f70a2db2b1ef0
 DIST spirv-llvm-translator-10.0.0_p20200909.tar.gz 599696 BLAKE2B 9407d0b3ea9f812a06d08b8fec6cecd73fcab5ebd8aaf10c38c7693207f161b4f1eb822e60b42521e3879cd34b95da7d37cec71fb891f8df13dc60783e655c49 SHA512 fe3e4a00d1ae3fd2324379bb92244399b18a4a31b1a2ec6b9bc60eec471a8ce2da7fbe2ea5a0d247590dd7ffb6e620072197a36631f384357e808fc9b96192f5
 DIST spirv-llvm-translator-11.0.0.tar.gz 665804 BLAKE2B 826d13107efc28fc72e90761e3f4d5b718d4dda9376ce45a7db7a71494adfd293387ebd1fe473d177fb249ef7aca5b10394e200bf60b5de700ba6699e4199ce6 SHA512 e0f4c2f41d686cb574e1fc56fdebbbf4b40602219a9f941fab4c44cc86347e6f651d2fde2ea0fba81c871826f1e8ee92f07bdac5a7532f66fca25b9ed8354b05
 DIST spirv-llvm-translator-11.1.0_pre20210212.tar.gz 702962 BLAKE2B 0c46b898e2d6c293b1db7b4aa65af7830869329cebc35e930b73f98dc038ae50d6adbdd9c6951e2ad427982d2a565c0925ecd056105cc37222b0d8ce7eb2e43b SHA512 3b8503be3ad65422f59ddbfd715a913dd6dab9416a14aea9e6a6793b2c959edaaab5433a3e253ee84c0b3644024a1f8a6b563af65e7aaad209c5f51e524cc96b
+DIST spirv-llvm-translator-12.0.0.tar.gz 1378222 BLAKE2B 059409364403316f84521e231bc14cade2875c2b914acea95619b0920ae4f13babb26411b20fead1d7a028320fa3aea637d087d869759cb23e3266753b5b2f46 SHA512 c23ef81802d2bf743564762815d7375a804bdf8029efd7430faea0b48b5e30a9778c1175f52309b522a07aadf8ff77461b912c1fb3b95af9b09273a483eac82a
 EBUILD spirv-llvm-translator-10.0.0.ebuild 1266 BLAKE2B be273ccb5a212aae3dbed3bff6b31001e106aefe6cf829b82c2705f462b3d758d6170174c6644ce6bcb1240772a49fd59ed92701366fe98684dc68b51ca4a086 SHA512 dadf2527303877c0fe74e8535b49699a6531c496df7220d887dd6a033faf641eedfff5ce31555f5a56523497e9493e8721d2c2aec1f069b4a1f01d2c1632fa79
 EBUILD spirv-llvm-translator-10.0.0_p20200909.ebuild 1555 BLAKE2B 12befee30e2c709c9e709195bb37d9149542ea0abcea4b2fe94a6174c5262a991ca80bc74cd32437b410b0afb43adb7a7e69cd5bb623c2599863c282c03821d0 SHA512 f5a0144d7ecdbd13e263e972774ddf0b08de7ebe4e8cbd450a6c58d1f535b725556f323018433838d4df15620fbc458461f2edab76c605344be5380605e91f2b
 EBUILD spirv-llvm-translator-11.0.0.ebuild 1555 BLAKE2B e2140c932905dfe3f53507cdfca04572fcf9c68a7c16e3f09de02426e9b1af71ff1056e5a9aca39d248653a4561ed686eecd76f7f9d2e5b3082ef7c9f3d6ea57 SHA512 0650a432c75a86437bb94ce30ba569bf5c39117e3eff5efca26e3bef9bc1047f20c3209f4b0347bd734e49c32fbec5531fa27e0b141f6e752b593a130169cb6b
 EBUILD spirv-llvm-translator-11.1.0_pre20210212.ebuild 1555 BLAKE2B 03064f9e4cc3acd127f98ff1485e73db3cbab63781e24a447b829990418e7dae05ced9b3af77ca7f73613e3b5d04fa91e14a94a06809abeed596d5b4f476bd1d SHA512 cf57d2357b1b1b5ac35326648b9dddf179f9a8a0cab92f8271fc809179e4cf4d01af7b17f53841fcd29c5b498ae00d725dde558fef6ca89cbeb6d59810036a13
+EBUILD spirv-llvm-translator-12.0.0.ebuild 1201 BLAKE2B 5a00881cf52746076ea38fd9de26e708964d20fdb3b4b730d33a8de722fdfdd18ca5ce10745291bad84c92fc731e38e032e24dfed3fd2e838fbdbcff71e1aa26 SHA512 a66d4f4852df959297d92b12398c84c2c902aba50697396cb41d0d14277f95d681fe9627cf1e2274df6e98e02ddd3f149922c20acbd179ec81fedb190d572622
 MISC metadata.xml 363 BLAKE2B 8dcf09b8fc5a238a4c4c841973d13f9046440c08ea0eb5240616836e5891ad49fea580c72d83f52eba6f11781a177245a62fe2746cf0e2404c3ce843136a9588 SHA512 721f1801ac362a45601b9928280210c68cd971dedfb2a2851c97f6899ad9fad68929760e7b5692c9fbf97a66a35619ec8e9d3fda2adb051c76c0d6c77d72d0b3
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild
new file mode 100644
index 000000000000..3d216931574a
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic llvm
+
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="12"
+KEYWORDS="~amd64"
+IUSE="test +tools"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="sys-devel/clang:12=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+BDEPEND="test? ( dev-python/lit )"
+
+REQUIRED_USE="test? ( tools )"
+
+LLVM_MAX_SLOT=12
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
+		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# Some tests fail on amd64 when ABI==x86
+	if multilib_is_native_abi; then
+		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
+	fi
+}
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index c1053dbdddaa..31350e2a6a20 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -8,6 +8,6 @@ EBUILD stripe-mock-0.103.0.ebuild 582 BLAKE2B 3e5f302fe8efdfa19c81b51aa1f733c869
 EBUILD stripe-mock-0.104.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 EBUILD stripe-mock-0.105.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 EBUILD stripe-mock-0.106.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
-EBUILD stripe-mock-0.107.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
+EBUILD stripe-mock-0.107.0.ebuild 582 BLAKE2B 3e5f302fe8efdfa19c81b51aa1f733c8695650a2ab7982ac737f67bf0005c4d94ecbe47c59c41ee81377d9e02671119e19e084ff37be10a555ea031d1951f6f8 SHA512 25771845d4987ba1fd2e4f49ec69825c59a36d0ad967ef258b149de7f53edc7ef7cd3198095b2684e7364e0f46d8a62beb653e6b088f14184ee5a6efed72d53c
 EBUILD stripe-mock-0.109.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 MISC metadata.xml 642 BLAKE2B f8a0cc39447fa2a3bb6b5f488214dc6603b0b34d8e07ce087a215b333054041d84734bedca17eee874858a4fe0a7c7e0a3048a67f183d6a3ca1546c0a284fe9a SHA512 b4a32de284bf118140ca530c9705aec3ac413eb20657f6111f94865fa6456ed95cb6150f9e8a3f8fb232db1e9afe3ac4267d06c210e2fa7aa53c1e657ab531f0
diff --git a/dev-util/stripe-mock/stripe-mock-0.107.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.107.0.ebuild
index 05a7220e34b0..07a1e00de87f 100644
--- a/dev-util/stripe-mock/stripe-mock-0.107.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.107.0.ebuild
@@ -10,7 +10,7 @@ inherit golang-build golang-vcs-snapshot
 DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
 HOMEPAGE="https://github.com/stripe/stripe-mock"
 SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 LICENSE="MIT ISC BSD-2"
 SLOT="0"
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 1c14b729b0a4..6674e6382dc9 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,12 +1,7 @@
 AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45e0e4ff4049d6b8d6cf44375f88c752a0130e4229a5ccf83a414db8f91504f4ef828d3a7d3d94a5eee78a9e90f SHA512 a9f068dafc2fb4c96696d8cfe1501fc3610f4ab0aaea9a20ffc5f57cda09561f9712896616c548661bbbc5c10dfe275d218c7b232645a5240507c80bec1850cd
-AUX systemtap-4.0-AR.patch 193 BLAKE2B 270a00dcba6cc982fb60075e00bbc3f7d6e23b77f8b595f4f84eae25519452d53a355571f0ce0515c187591796e245b9e683458842c0e9eac06e205b0f3cb3f5 SHA512 b59a56cf64ade81df11b629f9f1eeba8d8aedb5e3984bd0c8b8217ca76cbbb5aaba2120b8ee3ab83c300cbdc674e5c6e7999537371cd76794a2ace65a7a8b19e
-AUX systemtap-4.0-configure.ac-non-posix-test.patch 10038 BLAKE2B ce0bf23977dd5e6e653cfbd67aa16485c0afcd2b30c637d050212441cb4a09c963b66c885ecf03ceeb376ee6d3120c0a225345178a012faabfe97666afd08d3b SHA512 a645c7b8d3be0a8ff60e32737d7ff31085e8f96f1dac87a85e79066f18a80dcbfb69487f5b619b81ab2031d09b01fdf559ecd7385dd1963f4603fc238c77ea4d
 AUX systemtap-4.4-configure.ac-non-posix-test.patch 9435 BLAKE2B df56bc874cc14afce539ad5f52f040abfb44d96401c809aa10ca925a20a9ee158aa809c79561e27dbf33aedcb8d383bc567d45b706e6e0aea101c314cd880b7e SHA512 22dc30701e1bfea872e0fdb1937ac0f43fbe72510c8322579e98b5ad75f37b6c1289718ad1786879d16890bd27ec4f051a27261d33421a7e9f0dc79ae0fba9f1
-DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
 DIST systemtap-4.5.tar.gz 5549909 BLAKE2B 3c180a49c81070cb374ae23f95f1e90cc3cf2550170363793f46584b201c2284b2ee639f395d73ed6c5b44160825b3cf128bd360b81bc243e71c98e71d779f48 SHA512 8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3
-EBUILD systemtap-4.0-r1.ebuild 2857 BLAKE2B 31699592b9c51385e003e417b0a727dc4a788855598e4149e549e57db23775f098e19a13e7220d8c916f7361eeea2778aed3ded06e45ee5a062453dc79ec036a SHA512 3949fdfe48278191411116920559c838a00c29ea32f135a59c2b0d5e33fabdcf623eb9ceb88ccd8bf1158290332fd7bf9c98c72594e13666904d2d9822ff505e
-EBUILD systemtap-4.0-r2.ebuild 2926 BLAKE2B 7de3ae27e0e904f805f80138bcf67a366094a091de2bc4e432cf8fce6a091853fc9e972478b0f04babd6ab51f413e9fe96b41ea98fa9d17061fb71db1af4ec83 SHA512 959dba0ef465ed1ab64274c892dbfc6ed50abc3804cae620731c9f5907c35e1d8be269d557575681a069fdb4067f38e537d565d3dee8144010bdbe30c0c8522c
-EBUILD systemtap-4.4.ebuild 2890 BLAKE2B 8e4ebb01045e871149896328a227912d8e2d68ef6af99ed19d0082579f94a81d1dc4496af2e919a3d6bf7d23a3ce60ab4a5a0b8076afcaac276af546715df774 SHA512 3dfe6e6f5b376f7c3e9d327f6be448b78be75ff347dfa8124a6ff8d2d6dd0e3b414a570b3f0b6ab9a8c860aa0ea65de733dfdbc0bda1d7c9dd784e1d1e42775a
+EBUILD systemtap-4.4.ebuild 2885 BLAKE2B 04f70fad16bf1f3fce92e19101301695d458fd3aee80df40527eed5eda260fe0a294c282ae9d8406143d2aafd031bdb3b9d387efda674c760ba250b29d6a9639 SHA512 ba502e7d961c53ce0c2f3a1de9c1fe4791e38fb3fc8769dc22c5e98b3a7403b465c5ad53edbe642b6b7df519064ab0a437a2201edddd22a0888900eafcc1b2cc
 EBUILD systemtap-4.5.ebuild 2814 BLAKE2B 87e36a708642922311fd473e6bab8e63ae557b92dc21ee0697c913277caec30c9cac05a50b210aa98a8f536ad8c24916b536f103431d63d50f8ea85e536b8efb SHA512 902ae8baea053c0c9cb793a8268d97037dd07ce58679c1cda8c2c20e416ac1e002ca215c3780ed230639f16f38153d7334ce2660ebe039039f586c4c7ebf0697
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/files/systemtap-4.0-AR.patch b/dev-util/systemtap/files/systemtap-4.0-AR.patch
deleted file mode 100644
index fa5334e6fcf0..000000000000
--- a/dev-util/systemtap/files/systemtap-4.0-AR.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/720710
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,6 +22,7 @@ AC_PROG_LN_S
- AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_CPP
-+AM_PROG_AR
- AM_PROG_CC_C_O
- AC_PROG_RANLIB
- AC_OBJEXT
diff --git a/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch b/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch
deleted file mode 100644
index d429ab197ddd..000000000000
--- a/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch
+++ /dev/null
@@ -1,214 +0,0 @@
- configure.ac | 62 ++++++++++++++++++++++++++++++------------------------------
- 1 file changed, 31 insertions(+), 31 deletions(-)
-
-diff --git i/configure.ac w/configure.ac
-index caa62ee28..19db3fb21 100644
---- i/configure.ac
-+++ w/configure.ac
-@@ -225,7 +225,7 @@ dnl fi
- # Compiling without fPIE by default (see PR 9922)
- AC_ARG_ENABLE([pie],
-   [AS_HELP_STRING([--enable-pie], [enable position-independent-executable])])
--AS_IF([test "x$enable_pie" == xyes],[
-+AS_IF([test "x$enable_pie" = xyes],[
-    PIECFLAGS='-fPIE'
-    PIECXXFLAGS='-fPIE'
-    PIELDFLAGS='-pie -Wl,-z,relro -Wl,-z,now'
-@@ -271,7 +271,7 @@ AC_ARG_ENABLE([translator],
-   AS_HELP_STRING([--disable-translator], [build only runtime utilities]),
-   [],
-   [enable_translator="yes"])
--AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" == "yes"])
-+AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" = "yes"])
- 
- dnl Handle the option to build the crash extension
- AC_ARG_ENABLE([crash],
-@@ -312,25 +312,25 @@ AC_CHECK_PROG(have_latex, latex, yes, no)
- AC_CHECK_PROG(have_dvips, dvips, yes, no)
- AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
- if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
--   if test "$enable_docs" == "yes"; then
-+   if test "$enable_docs" = "yes"; then
-       AC_MSG_ERROR([cannot find all tools for building documentation])
-    fi
--  if test "$enable_docs" == "check"; then
-+  if test "$enable_docs" = "check"; then
-     AC_MSG_WARN([will not build documentation, cannot find all tools])
-   fi
- fi
--if test "$enable_docs" == "prebuilt"; then
-+if test "$enable_docs" = "prebuilt"; then
-   AC_MSG_NOTICE([will only install prebuilt documentation])
- fi
--if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
-+if test "x${have_latex}${have_dvips}${have_ps2pdf}" = "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
-    building_docs="yes"
-    installing_prebuilt_docs="yes"
- fi
--if test "$enable_docs" == "no"; then
-+if test "$enable_docs" = "no"; then
-    installing_prebuilt_docs="no"
- fi
--AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
--AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" == "yes"])
-+AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" = "yes"])
-+AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" = "yes"])
- 
- 
- dnl Handle the option to build the reference documentation
-@@ -340,17 +340,17 @@ AC_ARG_ENABLE([refdocs],
-     [enable building reference documentation (default on if other documentation built).]),
-   [enable_refdocs=$enableval],
-   [enable_refdocs="check"])
--if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then
-+if test "$building_docs" = "no" -a "$enable_refdocs" = "yes" ; then
-    AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
- fi
--if test "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
-+if test "$enable_refdocs" != "no" -a "${building_docs}" = "yes"; then
-    building_refdocs="yes"
- fi
--AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
-+AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" = "yes"])
- 
- AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
- AC_CHECK_PROG(have_fop, fop, yes, no)
--if test "x${have_fop}" == "xyes"; then
-+if test "x${have_fop}" = "xyes"; then
-    # Due to rhbz505364 / 830266, we must actually test-run fop, not just
-    # hope that it works.
-    AC_MSG_CHECKING([to see if xmlto --with-fop actually works])
-@@ -362,8 +362,8 @@ if test "x${have_fop}" == "xyes"; then
-    fi
-    rm -f dummy-tapsets.pdf
- fi
--AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" == "yes"])
--AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" == "yes"])
-+AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = "yes"])
-+AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = "yes"])
- 
- dnl Handle the option to build the html documentation
- building_htmldocs="no"
-@@ -372,11 +372,11 @@ AC_ARG_ENABLE([htmldocs],
-     [enable building html documentation (default off).]),
-     [building_htmldocs=$enableval],
-     [building_htmldocs="no"])
--if test "$have_xmlto" == "no" -a "$building_htmldocs" == "yes"; then
-+if test "$have_xmlto" = "no" -a "$building_htmldocs" = "yes"; then
-    AC_MSG_ERROR([xmlto required for building html documentation])
- fi
- 
--AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" == "yes"])
-+AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" = "yes"])
- 
- dnl There is a strange bug in older versions of xmlto when generating pdf.
- dnl https://bugzilla.redhat.com/show_bug.cgi?id=526273
-@@ -396,10 +396,10 @@ cat > conftest.xml << 'EOF'
-    </book>
- EOF
- 
--if test "x${have_xmlto}" == "xyes"; then
-+if test "x${have_xmlto}" = "xyes"; then
- AC_MSG_CHECKING([for xmlto --stringparam support])
-    xmlto --stringparam man.authors.section.enabled=0 html-nochunks conftest.xml >/dev/null 2>&1
--   if test $? == 0; then
-+   if test $? = 0; then
-       have_xmlto_stringparam="yes"
-       AC_MSG_RESULT([yes])
-    else
-@@ -407,7 +407,7 @@ AC_MSG_CHECKING([for xmlto --stringparam support])
-    fi
-    rm -f conftest.html
- fi
--AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" == "yes"])
-+AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" = "yes"])
- 
- rm -f conftest.xml
- 
-@@ -473,7 +473,7 @@ dnl See if we have enough libraries and tools to build the compile server
-     AC_MSG_WARN([will not build systemtap compile server, cannot find nss headers])
-   fi		       
- fi
--AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" == "yes" -a "$enable_server" != "no"])
-+AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" = "yes" -a "$enable_server" != "no"])
- 
- if test "${have_nss}" != "yes"; then
-   AC_MSG_WARN([compile-server client functionality will be disabled, cannot find nss development files])
-@@ -514,10 +514,10 @@ if test "$with_rpm" != "no"; then
-                     AC_DEFINE([HAVE_LIBRPMIO],[1],[have librpmio])
-                     stap_LIBS="$stap_LIBS -lc -lrpmio"
-                     have_librpmio="yes"], [have_librpmio="no"])
--  if test "x$have_librpm" != "xyes" -a "$with_rpm" == "yes"; then
-+  if test "x$have_librpm" != "xyes" -a "$with_rpm" = "yes"; then
-      AC_MSG_ERROR([cannot find librpm])
-   fi
--  if test "x$have_librpmio" != "xyes" -a "$with_rpm" == "yes"; then
-+  if test "x$have_librpmio" != "xyes" -a "$with_rpm" = "yes"; then
-      AC_MSG_WARN([cannot find librpmio])
-   fi
- fi
-@@ -554,7 +554,7 @@ else
- 	    [Define if you have the readline library (-lreadline).])
- fi
- AC_SUBST([READLINE_LIBS])
--AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" == "yes"])
-+AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" = "yes"])
- 
- dnl End of readline checks: restore LIBS
- LIBS=$LIBS_no_readline
-@@ -710,7 +710,7 @@ dnl See if we have enough libraries and tools to build the virt server
-     AC_MSG_WARN([will not build systemtap virt support, cannot find xml2 headers])
-   fi		       
- fi
--AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"])
-+AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" = "yes" -a "${have_libxml2}" = "yes" -a "$enable_virt" != "no"])
- 
- dnl Handle the option to build python2 probe support
- AC_ARG_WITH([python2-probes],
-@@ -750,7 +750,7 @@ have_python3_support=no
- AS_IF([test "x$with_python3_probes" != "xno"],
-   [dnl First, check to make sure we have the 'python3-config' script.
-    pathless_python3=$(basename "$PYTHON3")
--   if test "x${pathless_python3}" == "x"; then
-+   if test "x${pathless_python3}" = "x"; then
- 	pathless_python3="python3"   
-    fi
-    AC_PATH_PROG([PYTHON3_CONFIG], [${pathless_python3}-config], [no])
-@@ -785,8 +785,8 @@ AM_CONDITIONAL([HAVE_PYTHON_PROBES],
- dnl Check for presence of json-c and ncurses for use in monitor mode
- PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
- PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
--AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"])
--if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
-+AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" = "yes" -a "${have_ncurses}" = "yes"])
-+if test "${have_jsonc}" = "yes" -a "${have_ncurses}" = yes; then
-   AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
- fi
- 
-@@ -823,7 +823,7 @@ AS_IF([test "x$with_bpf" != "xno"], [
-                [],
-                [#include <linux/bpf.h>])
-     ])
--AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" == "xyes"])
-+AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" = "xyes"])
- AC_CONFIG_FILES([includes/sys/sdt-config.h po/Makefile.in])
- 
- if test $build_elfutils = yes -a $enable_translator = yes; then
-@@ -965,7 +965,7 @@ AS_IF([test "x$enable_http" = "xyes"],
-    dnl If we have all of the libraries, the json-c and nss libraries,
-    dnl and full C++11 support, we could build the httpd web
-    dnl compilation service.
--   AS_IF([test "x$have_libmicrohttpd" == "xtrue" -a "x$have_libuuid" == "xtrue" -a "x$have_libcurl" == "xtrue" -a "x$have_jsonc" == "xyes" -a "x$have_nss" == "xyes" -a "x$have_openssl" == "xyes" -a "x$have_cxx0x" == "xno"], [have_http_support=yes])])
-+   AS_IF([test "x$have_libmicrohttpd" = "xtrue" -a "x$have_libuuid" = "xtrue" -a "x$have_libcurl" = "xtrue" -a "x$have_jsonc" = "xyes" -a "x$have_nss" = "xyes" -a "x$have_openssl" = "xyes" -a "x$have_cxx0x" = "xno"], [have_http_support=yes])])
- 
- AS_IF([test "x$have_http_support" = "xyes"],
-   [AC_DEFINE([HAVE_HTTP_SUPPORT], [1],
-@@ -1010,7 +1010,7 @@ initscript/99stap/module-setup.sh \
- initscript/99stap/install \
- initscript/99stap/check ])
- AC_CONFIG_SUBDIRS(testsuite)
--if test $enable_translator == "yes"; then
-+if test $enable_translator = "yes"; then
- 	AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
- fi
- AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
deleted file mode 100644
index b3029b7de5ec..000000000000
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit linux-info autotools python-single-r1 user
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="libvirt selinux sqlite +ssl test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	dev-libs/json-c:=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	${PYTHON_DEPS}
-	libvirt? ( >=app-emulation/libvirt-1.0.2 )
-	selinux? ( sys-libs/libselinux )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/nspr
-		dev-libs/nss
-	)
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
-	app-arch/cpio
-	app-text/xmlto
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=sys-devel/gettext-0.18.2
-	libvirt? ( dev-libs/libxml2 )
-"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-ia64.patch
-	"${FILESDIR}"/${PN}-4.0-AR.patch
-)
-
-pkg_setup() {
-	enewgroup stapusr 156
-	enewgroup stapsys 157
-	enewgroup stapdev 158
-
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		stapbpf/Makefile.am \
-		stapdyn/Makefile.am \
-		staprun/Makefile.am \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-docs
-		--disable-grapher
-		--disable-refdocs
-		--disable-server
-		--enable-pie
-		--with-python3
-		--without-java
-		--without-openssl
-		--without-python2-probes
-		--without-rpm
-		$(use_enable libvirt virt)
-		$(use_enable sqlite)
-		$(use_with zeroconf avahi)
-		$(use_with ssl nss)
-		$(use_with selinux)
-	)
-	PYTHON3="${PYTHON}" \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-}
diff --git a/dev-util/systemtap/systemtap-4.0-r2.ebuild b/dev-util/systemtap/systemtap-4.0-r2.ebuild
deleted file mode 100644
index cb49b3599c90..000000000000
--- a/dev-util/systemtap/systemtap-4.0-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit linux-info autotools python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="libvirt selinux sqlite +ssl test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	dev-libs/json-c:=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	${PYTHON_DEPS}
-	libvirt? ( >=app-emulation/libvirt-1.0.2 )
-	selinux? ( sys-libs/libselinux )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/nspr
-		dev-libs/nss
-	)
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
-	app-arch/cpio
-	app-text/xmlto
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=sys-devel/gettext-0.18.2
-	libvirt? ( dev-libs/libxml2 )
-"
-RDEPEND="${RDEPEND}
-	acct-group/stapdev
-	acct-group/stapsys
-	acct-group/stapusr
-"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-ia64.patch
-	"${FILESDIR}"/${PN}-4.0-AR.patch
-	"${FILESDIR}"/${P}-configure.ac-non-posix-test.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		stapbpf/Makefile.am \
-		stapdyn/Makefile.am \
-		staprun/Makefile.am \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-docs
-		--disable-grapher
-		--disable-refdocs
-		--disable-server
-		--enable-pie
-		--with-python3
-		--without-java
-		--without-openssl
-		--without-python2-probes
-		--without-rpm
-		$(use_enable libvirt virt)
-		$(use_enable sqlite)
-		$(use_with zeroconf avahi)
-		$(use_with ssl nss)
-		$(use_with selinux)
-	)
-	PYTHON3="${PYTHON}" \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-}
diff --git a/dev-util/systemtap/systemtap-4.4.ebuild b/dev-util/systemtap/systemtap-4.4.ebuild
index b04afd5d75e2..c1a4ae7b4a74 100644
--- a/dev-util/systemtap/systemtap-4.4.ebuild
+++ b/dev-util/systemtap/systemtap-4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index 80e5b50d88bc..966a9b70372c 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,6 +1,6 @@
 DIST uncrustify-0.71.0.tar.gz 1704631 BLAKE2B 3dc9122647e2c173a776c4ad24c93d7b88fdd00c6c4f3070e68fd7a272218335063d8563446a3c8e72ff68e41d00a265aca76682a8cea201a33230377d7e425a SHA512 220ecbebb1c1d6abadb96c339e4ca9b264a04fa08bc83e9b0fabba5fae425efd1911d175d18b635521614ec9c33aa389fadaeec62ebf28a5d71e595900a92181
 DIST uncrustify-0.72.0.tar.gz 1530850 BLAKE2B 59b3ff4b47fee1f2a303e237d46b5fb656041e4d397aa97862cc7aebb6a5e705d036889a7b492bbe4393537ff52cf78af46bbe513e71aef19fca1388e3ffa79b SHA512 bfcbdf0d8198e1dd91f1c8283441a56669610a84d55a17cdd504571da09b26fef026fd3f753acd9950e498f574e6771a206c72b76ffdea97747b7a4fdb481862
-EBUILD uncrustify-0.71.0.ebuild 689 BLAKE2B f8737d9a19f72af53623f0c2d3ec8ae339d680ca7803723b27b5c4c1597965b364512762a1974de1dd61d4e165dc13db59b6acb2a8ed4b3f1c7037cd9b7e9d9e SHA512 7854e593d63f801f852bdd1dae0a019a531f050565546773a5411ffd692a04239b3c0dcbbd7c0df6819927004182ffb6ba2eb2c74cedef05626804413d7172ee
-EBUILD uncrustify-0.72.0.ebuild 683 BLAKE2B d2b05dc44f5d4a3ca1c4c8054eec7ea949d7a61d5be666a8cc9a6ca64afe23f0a817eeed70b1ed9c9707806a3789e289072a3eb7c579bf86e42f1c6db4729a6d SHA512 1daf07ed56b53e815ef65de329d6556d56ca89e6097ea2396da658909ad335f515d39f07bde45e65106d154f3866eff90d675c0ab89ed0890b15557f728da92d
-EBUILD uncrustify-9999.ebuild 691 BLAKE2B 7b431daaabefe235b668dd31fdca31a154471ea72c1ea117447bbee977e3ba44340ccb710a384b56a7950b820876da9e571a773cd0305e337218ff366d3ca1e6 SHA512 4d87767e18ce9366b7415e391c47d09e434b505ed6f9ec5c4f33643b0fe36e6a7712b3cadb89f15160c00d9dccbba077349fb3ef08eea13994b811a59fe103d2
+EBUILD uncrustify-0.71.0.ebuild 744 BLAKE2B 6d466a70bd6ea03c84f7f4dc65f54a9a97b675b80ed02c71992e56e71916bfd361b9425a55b220cf855ac4aa82ac31d7e3817d42a19896c5e5e99322d8ffe805 SHA512 c4530d02300987cf93c7b6863d38826ae967ca470ab324b9d2e3d4ee54e73ee57c4f3cda7380ac2a2fbfde1fb759e6a6c429d01f2cf6ba53d2e5971b8658508a
+EBUILD uncrustify-0.72.0.ebuild 738 BLAKE2B 142ca979491bcc2a2d0270f25c09e74ea16e15693b07fedfc45d03d81c1c7bd86d3db4c4459e4f45e0abe1b60817c83e8c3e7296769908603d9dddda5a28958f SHA512 b6fb4c58b692f7422876cd2f7d82565ba77b8accc1135d4e0b54a41a48c8e95fc7260ece72b2387325cb93f3c80b07ea71967596856bd0f40b20256a5c028989
+EBUILD uncrustify-9999.ebuild 746 BLAKE2B 796109c0f430214b76778254cc66e0291a973711562e4670d22dfdc500416812db05ebd5270363601814d8093b2bba7910dc28b6b56834744eece42db58c28c3 SHA512 a6c72f62101f760cfd496656544c8772045047fec2c17a3345c60abd77cf21a32db0fbfd9cb4c837d86f8acae4ef87f8299bb8a4bda24b1601335ae56536a068
 MISC metadata.xml 499 BLAKE2B 835eb2ba7d168187f396d660d70a5eff9d8ee5c6cf90313eb8d5fe08bba7246eaaefbef28e88655553a4af18d49efc379bfd5ebeb4f15b9fc0e833a272dc24bc SHA512 2fa746b88bd158f9d7cec94c1e6bccf2d0bf3c6154c9a8fcb49faaeab7a39644b2994f0e4f979b3230f98955e82537f6761c93c46ca013b1edee8a6b13bda840
diff --git a/dev-util/uncrustify/uncrustify-0.71.0.ebuild b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
index 2e266f8783d9..5bd13fa54668 100644
--- a/dev-util/uncrustify/uncrustify-0.71.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
@@ -26,4 +26,8 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( ${PYTHON_DEPS} )"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
diff --git a/dev-util/uncrustify/uncrustify-0.72.0.ebuild b/dev-util/uncrustify/uncrustify-0.72.0.ebuild
index 573dbcd833df..9e76b92aa679 100644
--- a/dev-util/uncrustify/uncrustify-0.72.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.72.0.ebuild
@@ -24,4 +24,8 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( ${PYTHON_DEPS} )"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
index 8f51f156ef9d..d078b64fab35 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild
@@ -26,4 +26,8 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( ${PYTHON_DEPS} )"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
diff --git a/dev-util/vbindiff/Manifest b/dev-util/vbindiff/Manifest
index ff6a6880ae31..cb936286da37 100644
--- a/dev-util/vbindiff/Manifest
+++ b/dev-util/vbindiff/Manifest
@@ -1,3 +1,4 @@
 DIST vbindiff-3.0_beta5.tar.gz 134192 BLAKE2B 9a7437833fef8db4316fd2c67a781868f6aead5ae47c7abc05683545bb3990950a465b1665ff5bc2e7d298465b3b1a427d6d67b43f59bd7dfb112143c9b52d2f SHA512 e6abd5cb93beffa3bc55455dbfbc98f0effc2a6667c8b9c721792c4a274dfe6f35ef121d27506fc9c951a1decb0e69886775fcf092a5f47fda82ed75ef760a74
+EBUILD vbindiff-3.0_beta5-r1.ebuild 401 BLAKE2B 38e7c29f7596a430c21c36ad43fdd9560e53fc4909c1244219b8bae8d7ab6f7bccce502775e592bf1c264f6ca00068599158a02cb3a65e23933d8c39c4fd75a7 SHA512 34d678418a60d7fafcc35ac7799c936462e506ec9cbbfcf14859eda9f9b2e05099aac45828b3cf7bab93430d0083e2374b09057030329288e009a8e5343d8d70
 EBUILD vbindiff-3.0_beta5.ebuild 399 BLAKE2B 2589d4256b28d30778a743235e78cdc2dedf5356d59b1df362befeedcb0a450caeb7886458b1203843112cd3f57b790d93e549b223fed8369bb6aff2ea061492 SHA512 a0e0961d4e7ab4bb9b9819c5af2b45423b60039559646d1e610ff75f44aa19ce3933982e0bc48b0f9d8097dc899f64f0d489593af491d5b9895c38abc3bd60df
 MISC metadata.xml 331 BLAKE2B 62db8c95752ea477fec8b7a7bb76c5cd7c6075f8d2618c476f8da83917cd893e6878ed63bc5f8ef039d7c32fd3e1dc8cf9418a454b94adfd889d7445198de023 SHA512 99149387b18568a36c5057f0b19d1a467632ffac30cd1917688ff1d590f673ba700e16ab42d3b5b2a214f5f933b4ff0c666bbcd7d2675608ca9368f334a9904e
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta5-r1.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta5-r1.ebuild
new file mode 100644
index 000000000000..1057d7970744
--- /dev/null
+++ b/dev-util/vbindiff/vbindiff-3.0_beta5-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Visual binary diff utility"
+HOMEPAGE="https://www.cjmweb.net/vbindiff/"
+SRC_URI="https://github.com/mrdudz/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index f7c47616303a..05c3022dd972 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -3,8 +3,6 @@ AUX xdelta-1.1.4-m4.patch 458 BLAKE2B 802797681fcee8a7f07babe3e4598677704ca43548
 AUX xdelta-1.1.4-pkgconfig.patch 2551 BLAKE2B 606dd386fbfb768c931e2c08b5508f6bc3dfe96d61c3cf62b57c85f0b697612473355775008ac224192e6800a3cff447357a1e24961f86b5615f8c7cb4cc5c0f SHA512 08428227f9aa15e373f2fc81a097e3aad7df2d53d65172da9d1da3c81c52b9d646ad8d1f0f69533e4486cf72e4cf8ec106e948dc0c9a1cd1aad8732ceb4aeeb5
 DIST xdelta-1.1.4.tar.gz 423529 BLAKE2B b565f82ba0504118b74127096939e5699ea312be5c6c8a345abfcf0fb01b45e759abe595b33619b2714671e2f0307d603366a1f7a6b1fb5a786378716a51df6b SHA512 eef45f7977e9a7f490b881f33ab8a948cc5eff9300ea850cc30062905c8e883c104961f075f56f7ce8e385142c35de168aef1e0b8169bda66786ea4bee33168b
 DIST xdelta3-3.0.11.tar.gz 683605 BLAKE2B bc33c9d6a3bb21bc52d72bba54f5e2b1058ea8d7cd7474aaf6dbdc27e165e0fbea644c584402f5bbc8ace7cd6a3aefae18588a659418f93eb041168545363bf4 SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52
-DIST xdelta3-3.1.0.tar.gz 727607 BLAKE2B 1dd7846dad0414071a8af172fc3b73a0321fc9c841786563fe92ebe5c53d80d3eb07cc553cb5a9813432d9df5aae51d5b4a4c32a8c06a34dace5868297b5a68b SHA512 848c90a28018ec3c541ec43be59ea90328142c4705d3b59907fd89e8f6ac2758e288b1a1112fea601884c50ef7f6cf2c1634f539a76bea65a2741d3bb0e9b990
 EBUILD xdelta-1.1.4-r3.ebuild 834 BLAKE2B b99098382f637fb93858ea8573b3a0c2b9a2a0034143da1b84b1651a148424ec2fd41e5d4e81064da1e3c3912579e6401fd2f29156bcff9e7fef628ef70a9453 SHA512 5ef14b5cc39e01e62263c23be30ef6b4f591f238f717c50aefd39b02db466bfa20c06fb8cbd2e9347d64cc807ac40c690f7c84a2b037100322b6c7c4d42a183d
 EBUILD xdelta-3.0.11.ebuild 847 BLAKE2B 7dc296de2e2bddc200f6574c81d08468f39cb185a17c7eb6e7b060b9cb48b3d7d529b339f83c42d4deaf836be2dbb7c0caf96b02e33567059d6ef62883ccec67 SHA512 3652fc8f00fb3d698b4c709aa2a7fbe3316ca10c960ede1a7ed08431b4a09f7ccab0215a6f8d9d4f827e205e555c46140d545fecbf5655c46b49d1e0f3b74eef
-EBUILD xdelta-3.1.0.ebuild 1184 BLAKE2B 2141d2fa85508f01e688316511cc0843673e83e17d38349100c0771817dfc8935504bcfa6d0fa03909801f5a6037eb86a5ced526a7ed362570557bc3c25b4fa6 SHA512 255e75889a2321b8cd1b6af155bd15f56b0ac3a44e60b48a4aa1df1c925cf0f44f4b7a2891d156b13826ffaab0ee1b553b24bb61b563a4a5509830e3c49ec32d
 MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
deleted file mode 100644
index e048b45d941b..000000000000
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2002-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools python-any-r1
-
-MY_P=xdelta3-${PV}
-
-DESCRIPTION="Computes changes between binary or text files and creates deltas"
-HOMEPAGE="http://xdelta.org/"
-SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-arch/xz-utils"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-
-	# huh
-	2to3 -w -n --no-diffs testing/*.py || die
-	sed -i -e '/python/s:2.6:2:' testing/xdelta3-regtest.py || die
-	sed -i -e '/python/s:2.7:2:' testing/xdelta3-test.py || die
-
-	# only build tests when required
-	sed -i -e '/xdelta3regtest/s:noinst_P:check_P:' Makefile.am || die
-	eautoreconf
-}
-
-src_test() {
-	default
-	./xdelta3regtest || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc draft-korn-vcdiff.txt README.md
-	use examples && dodoc -r examples
-}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 5f795794fdf4..c60518e31845 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index aaa15ce0cdbe..107488ea13a6 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,10 +1,4 @@
 AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f134553c5b6d7b3b685959baa531071923f0611fb22ce5945ab2ecbd4d1bae3c6234c557ac2edc872363cf05a3045bf70bebe1a1b SHA512 ccc3f6cf55902748bf8a27ea1c7c1733a2e33a45b297a7f9f732dc772e021e461052e30f841c7fa83c6303e6c7d8f8aac96f248c909d824237edb17335cb3e2f
-DIST fossil-src-2.12.1.tar.gz 6011181 BLAKE2B f9437c4fb20314706bbbec70efbb6a53e2ac7760986baf88ea72505f03877a5d1069d0d2828aa2bfefac96c1358e4c8f824405d61fd24d490442fa8b768711e9 SHA512 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee
-DIST fossil-src-2.13.tar.gz 6121223 BLAKE2B 41bb83b40faf05d38ccbcc13bde858ee31ab0182193631d738a6e287414b2a93bc49bfa5ed0a16aabbc26190c1a3cd993ce9f1706ecd05b214461313b13c1086 SHA512 bd756aaac2f39005b690230c5a4ef4d618a3200a8eb499aa964285050c247edfb0abfa5db5522269e0a5ee2737c71393a523dc2d7e37eae076364185137964f8
-DIST fossil-src-2.14.tar.gz 6207277 BLAKE2B 9a70a49e83e16414150e777289543a984c6b77c4c2ea245ed3187b393a80f6926c80bada31081735d09a9d0febf430587c120e16d60ddbf96d1116c9da6cf008 SHA512 f95291886484c9fb98224c17e07c9c2ada3d79974359234f1cc6a8fce603e45bf980ffe4f43a473d74d190b6975fff66e8d35ca680747385e72981caabfd6b10
 DIST fossil-src-2.16.tar.gz 6275775 BLAKE2B 504f828f121385ec73311b340e0abfdba7da6a8571adb390c55c75fea0ef027366fb914c12552e177988bedbb735a3148d87ebdb23ffc2ce4b7bef8ef603692a SHA512 0569640a3b509c592f812a42526eec88ead034ba0ba3de93da62cfb1caa751954ae185eaa3398d411a02ee2a858ecae6cdf4e47199847527f7524fc9798a4b12
-EBUILD fossil-2.12.1-r1.ebuild 1770 BLAKE2B 0f40b5192c52a571dd9068635724699b260d06aa24f28e2d54e94f5ad23f206f71788577a9faaae69f40c52be693d9cb639b133cbdeba67888a84bde64975f58 SHA512 f123482c63264d7c7e88f4fcbfce8f611d4d6d3c5af05abed709356499ba4da9ac3143ca602e12a545ca5cd6efe908829b053bf67541a1a7b8f797f97bfdc675
-EBUILD fossil-2.13-r1.ebuild 1817 BLAKE2B 2a8e9c15e79fa1f61e40f33eecc2ef2b67e8b7617a7243c612a4c2707ad07dd987f86ff39249f4245697b41c67afdec1a57d3d916726b530287edf5de7883369 SHA512 802c9b28a0a66bca35dfefac6225c7d87354dcb5a270fcbf977364f15f3a07b69800bb33a9f2119012b1fea3db3204e6ebf5e0f568ba8a1e73e9cc76ec93470b
-EBUILD fossil-2.14-r1.ebuild 1775 BLAKE2B 50bc7dc2a8e533732a572f8b08c1dae70490e8625d1df3cb07a4386a9e36c4355239848ca9951ef1dccfd4630e670afb93438e8dcfa80712d8feedbc541cd052 SHA512 2a471704b102b8a9f585d25d6a7724db48862e6347600d18adc3e81ec004ed93b0adf8ca82df99e8efefa992fd47bde6528b92071ffa13ffde04f22eeb53a828
-EBUILD fossil-2.16-r1.ebuild 1892 BLAKE2B f80cf6a20ed5b7bf78bdfa3a7c72de949e7423701f1d6012b750be83360af7c2df04ede9f47158041c3d1f7862f53582833495b7167ff337deeafa103136c560 SHA512 2195e292cd1e0d060b203f8f4efad086f6c7495f1403652cbb1c888f02ad0fd47564e5685503865f4ce2d55351b510afedfc98f7353ab08bbb74dbd5b741dc20
+EBUILD fossil-2.16-r1.ebuild 1891 BLAKE2B a14d37b8d26d8078112c7e60ecb7d6f3e45becfb5e0894e0955dfacc5281aba4ba480678d99bb6a57b356ca355f37f5d3e7e8ccca5a725915b08d2923b93a919 SHA512 96e2c2f724f6a4149c279f3caf61ba8defa4a56b6a8e471d9119a7ba46fcfa35c597fd58193af6cedbfad34ea676230650e77b977bcc268a9cc6d85cf4a924c4
 MISC metadata.xml 949 BLAKE2B 66f47f3ef7e50cb1df12246aa7b673a5900c27e89ecc52b3cbd1a1b8b3dc6ef0b5408a61840df02c75ccfcc80b784f921ab1e2f59e3a10c36406f1d07449de90 SHA512 90326d1694a4204dea726ae5f67e8404325719271b4ad06837d45f35fa7c536310bc7248b20c80f50e38aceed7daf997e2f88041008db666ad273cb46e0c14d0
diff --git a/dev-vcs/fossil/fossil-2.12.1-r1.ebuild b/dev-vcs/fossil/fossil-2.12.1-r1.ebuild
deleted file mode 100644
index 3d9163f4b783..000000000000
--- a/dev-vcs/fossil/fossil-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="https://www.fossil-scm.org/"
-SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
-	  tcl-private-stubs th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-RDEPEND="
-	sys-libs/zlib
-	|| (
-		sys-libs/readline:0
-		dev-libs/libedit
-	)
-	system-sqlite? ( >=dev-db/sqlite-3.33.0:3 )
-	ssl? ( dev-libs/openssl:0= )
-	tcl? ( dev-lang/tcl:0= )
-"
-
-# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
-DEPEND="${RDEPEND}
-	!tcl? (
-		|| (
-			dev-lang/tcl:*
-			dev-lang/jimtcl:*
-		)
-	)
-"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
-PATCHES=( "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch )
-
-src_configure() {
-	# this is not an autotools situation so don't make it seem like one
-	# --with-tcl: works
-	# --without-tcl: dies
-	local myconf="--with-openssl=$(usex ssl auto none)"
-	use debug         && myconf+=' --fossil-debug'
-	use json          && myconf+=' --json'
-	use system-sqlite && myconf+=' --disable-internal-sqlite'
-	use static        && myconf+=' --static'
-	use tcl           && myconf+=' --with-tcl=1'
-	use fusefs        || myconf+=' --disable-fusefs'
-
-	local u useflags
-	useflags=( miniz tcl-stubs tcl-private-stubs th1-docs th1-hooks )
-	for u in ${useflags[@]} ; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	tc-export CC CXX
-	CC_FOR_BUILD=${CC} ./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.13-r1.ebuild b/dev-vcs/fossil/fossil-2.13-r1.ebuild
deleted file mode 100644
index 066d71ae1dfa..000000000000
--- a/dev-vcs/fossil/fossil-2.13-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="https://www.fossil-scm.org/"
-SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
-		  tcl-private-stubs th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-RDEPEND="
-		sys-libs/zlib
-		|| (
-				sys-libs/readline:0
-				dev-libs/libedit
-		)
-		system-sqlite? ( >=dev-db/sqlite-3.34.0:3 )
-		ssl? ( dev-libs/openssl:0= )
-		tcl? ( dev-lang/tcl:0= )
-"
-
-# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
-DEPEND="${RDEPEND}
-		!tcl? (
-				|| (
-						dev-lang/tcl:*
-						dev-lang/jimtcl:*
-				)
-		)
-"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
-PATCHES=( "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch )
-
-src_configure() {
-		# this is not an autotools situation so don't make it seem like one
-		# --with-tcl: works
-		# --without-tcl: dies
-		local myconf="--with-openssl=$(usex ssl auto none)"
-		use debug         && myconf+=' --fossil-debug'
-		use json          && myconf+=' --json'
-		use system-sqlite && myconf+=' --disable-internal-sqlite'
-		use static        && myconf+=' --static'
-		use tcl           && myconf+=' --with-tcl=1'
-		use fusefs        || myconf+=' --disable-fusefs'
-
-		local u useflags
-		useflags=( miniz tcl-stubs tcl-private-stubs th1-docs th1-hooks )
-		for u in ${useflags[@]} ; do
-				use ${u} &&  myconf+=" --with-${u}"
-		done
-
-		tc-export CC CXX
-		CC_FOR_BUILD=${CC} ./configure ${myconf} || die
-}
-
-src_install() {
-		dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.14-r1.ebuild b/dev-vcs/fossil/fossil-2.14-r1.ebuild
deleted file mode 100644
index aafaae29c2d2..000000000000
--- a/dev-vcs/fossil/fossil-2.14-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="https://www.fossil-scm.org/"
-SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
-	  tcl-private-stubs th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-RDEPEND="
-	sys-libs/zlib
-	|| (
-		sys-libs/readline:0
-		dev-libs/libedit
-	)
-	system-sqlite? ( >=dev-db/sqlite-3.34.0:3 )
-	ssl? ( dev-libs/openssl:0= )
-	tcl? ( dev-lang/tcl:0= )
-"
-
-# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
-DEPEND="${RDEPEND}
-	!tcl? (
-		|| (
-			dev-lang/tcl:*
-			dev-lang/jimtcl:*
-		)
-	)
-"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
-PATCHES=( "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch )
-
-src_configure() {
-	# this is not an autotools situation so don't make it seem like one
-	# --with-tcl: works
-	# --without-tcl: dies
-	local myconf="--with-openssl=$(usex ssl auto none)"
-	use debug         && myconf+=' --fossil-debug'
-	use json          && myconf+=' --json'
-	use system-sqlite && myconf+=' --disable-internal-sqlite'
-	use static        && myconf+=' --static'
-	use tcl           && myconf+=' --with-tcl=1'
-	use fusefs        || myconf+=' --disable-fusefs'
-
-	local u useflags
-	useflags=( miniz tcl-stubs tcl-private-stubs th1-docs th1-hooks )
-	for u in ${useflags[@]} ; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	tc-export CC CXX
-	CC_FOR_BUILD=${CC} ./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.16-r1.ebuild b/dev-vcs/fossil/fossil-2.16-r1.ebuild
index 73ab8971fdbf..a750a2526ae7 100644
--- a/dev-vcs/fossil/fossil-2.16-r1.ebuild
+++ b/dev-vcs/fossil/fossil-2.16-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fossil-scm.org/home/tarball/${MY_TAG}/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
 	  tcl-private-stubs th1-docs th1-hooks"
 
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 63a5c05253cb..77b010d592ca 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,5 +1,5 @@
 DIST gitolite-gentoo-2.3.1.tar.bz2 198849 BLAKE2B 88268e4588003cb1b8b4e340fd858a2be65b8156f3ff5033cf7f8c988d8373c4dc7c41b0d589126e143e8eaa19071fda87532f9052c06f7952f5f3ef549e486a SHA512 994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
-EBUILD gitolite-gentoo-2.3.1-r2.ebuild 1643 BLAKE2B b9b1e6fcef1176889f5d9f1d87e1c43f437f37225b506122f4b950fd82fb8a8604479ad015c6e2167e96d3cdea22146f5fbc750983eaa6d7690c777c5001a1b9 SHA512 ce26427f097f4ef1b9fb5dfe583b29dfda3d60ef7a19737e7929a31eb2d079f0da759a3bff7b54edafb8958b15a11a51c28ab59b56de0b984b46ab4a5ebd8bdf
+EBUILD gitolite-gentoo-2.3.1-r2.ebuild 1653 BLAKE2B 7af6010dcf5b536224c5e57755f454a931e8a4061aad2f7dddbe86891618c60bbe0c40fd579bc1527fe99799eac1d7f73f31eb9ac4dc1f7376fd5218c676eadb SHA512 dc8a8874d218fb56ce4666118e421d24ddf323bbb12541be79cc0d29481222155797fe1dc3d4fa69ace0a37e1e58cf2d17d51aad42de094579fc8d2efe55af74
 EBUILD gitolite-gentoo-3.6.6.1-r2.ebuild 2701 BLAKE2B 2bfb51ea9f5990d14fd579b01f163819fbd1a1af5ab91a995a2549ae3c767b801f42709362805d7ebca28675beb9c1d315bb945706f5a6e97594314bad977cf4 SHA512 7bf3985927ebd2fa091bdc0939a94ff807fb36a1d01786a84b1924f633fb9fbfd2dd836d502f57987fb6a1f3da9432c1d954a8551426124524a5ebb704b7d0ab
 MISC metadata.xml 478 BLAKE2B c178da3340159b14dc13fed855672892da98d2bd1ded28759120d60c93823b48e3887f59991776b1b68ab3941124e98b1b224f64544bbae9ea363e4c91266a2e SHA512 c014b88113a5769aa13b2d898afef78df07a642c4ccc964ae62bb64f07d3dac3c6e81df0defd873bc85be4434714abfeac160be0b4b1e9b77510f6cb5ad54810
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
index d86d7ba52941..05571da3b29d 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
@@ -29,6 +29,8 @@ RDEPEND="
 	vim-syntax? ( app-vim/gitolite-syntax )"
 
 src_prepare() {
+	default
+
 	rm Makefile doc/COPYING || die
 	rm -rf contrib/{gitweb,vim} || die
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 123917ac0064..a93a9008da6a 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,5 +1,6 @@
 AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb5a867cfcc2c2301dcadd01c54745fca3504460c13546f6947677764c87a2e3f30c1949baa4da4c4fe402c SHA512 2efb67d5f595842ccdb9b9ea0c6b6fbc3a28a77955d7255817309486fac19e7550ee0a545d5824e3f9acaf586d93533e90ccd05e15d76884d6493f50fb390a44
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
+AUX mercurial-5.8.1-testing-timeout.patch 494 BLAKE2B 010ab51a2bf4963ab8340052c5becee5a4ace471755b97e8d9409a9697a6697ac87bb2a5fc7556948a68f81bd3a78d17a7ec7523a70ca79848b5c175ff4f3515 SHA512 d4a8f05ebc2f8f44f9646fbaebee4f522cd271dcb4f72681fcb53df58b09fd031643dd5644aff80bda0480aaa21daf333245cb5d83d71941fa74d81858f8da33
 DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
@@ -118,7 +119,7 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST zstd-0.5.3+zstd.1.4.5.crate 26013 BLAKE2B 033e839622b8403268a1a98c2f525b4f6dc624378e64fd644e09cd1b11a8751c1097f134a5f40793a8a6b57635ad28ba3534dfc48e7ec818873dd4819311c80b SHA512 cb6d2adbb3d400ffec19ce7c942b47a0e5826ed62bb8de195b0e8817b4a1e00c1569a080457452180cf869b7bd99fdb150e4a981a992f977b2dbd03eb5a073ff
 DIST zstd-safe-2.0.5+zstd.1.4.5.crate 9002 BLAKE2B bf92884b629d5685dd563e481e63c67dd4c6aff52a402e0ec4f675cb40dad1f9e5ab675b45d4f326bfd0f75a22673ad8538b2924c4bb6220cb1fe23fce2262fe SHA512 cb4b33059da628e103a0fc9a83217fe96f5201cc9db0572b3c2d102b181dc29c346aea12ddec902ecf36886fcb6a2177155791d00ee2fbb267ddf84a48d3c2c6
 DIST zstd-sys-1.4.17+zstd.1.4.5.crate 2046794 BLAKE2B 40584094797d4cc479cff9d1b89abd1f7e800f774725dc03c531b67078027d5b82464984d4e2a76cabcd9d336234d245f93692d0111e2469ef21ca1ea6260d77 SHA512 89439b20e4e0bce6455d982fb7467c45436ee68572395db662d056eb2e09e95ad600947bf11c27ba60b161c2e2511e04cac8dcfacc5f85fcf9222d4a206bdc30
-EBUILD mercurial-5.8.1.ebuild 6731 BLAKE2B 0a1bb8b78ec431b22cd80c86135de8283f7d6916772286092b909ad811eba8f5cb95cc770b67c29fe8a052be1645eab6f80bb96c665c30a02bde52c2a4adc364 SHA512 f2aa230069cb30c1bb27523220df074c3449050d44001a4c9fd98fdc2b2f9be86a8e4bdec90d4bd9bfdc791e1738c7399db61bd5e0c2b7dc314730ce44996717
+EBUILD mercurial-5.8.1.ebuild 6539 BLAKE2B ef357b3e9436bd096323853c7006c0c07e1173c91b80519cc89e2f9046eb3760c0124f6406c8c5c8b5a5f032c5a1f202c3213bd3d79d28cbb9c96b1988874c42 SHA512 c960787e85e1788c7626b12763688ce420898c6fd8942dbd0efa9be3f40b9d742c47f51d29f729c38775bef4f7e888f84fb18704c7c4ccecdda74c90f5761bd0
 EBUILD mercurial-5.8.ebuild 6725 BLAKE2B 58728901788b4055ca9283ecdad0bb1225baa98ae814c5807ed3bd2fb77100f2ba2e6678630bbc4736e9522254bd3098bcce5f0aa764d35f7187ed65fd958171 SHA512 570f8c6b535bc7d8d68da878f179388c15a75a6edb37ef4e0de0e78ef7ceaf32452ea603624ad980fb0f9bbbb32cc610f0e84897927ccc3351345ecc0961a67d
 EBUILD mercurial-9999.ebuild 4433 BLAKE2B 0fdd9ea821d61deb3e7edc2c14f5406f9d407220c20b40199d4fc82f6a02bbefda3b90427d1e1bd4e2a7143a73ce95162b63f5b4bb0a9730f34316f4688b27e7 SHA512 690cca0e6d2da5e453c5d4507e0861eaff27b2abb995f332dd3f5dff8e11d7be07c6e1ec2fdfef0425de6259a4262f5e650486498a73c1d619a9ff573ee7dfe2
 MISC metadata.xml 531 BLAKE2B a9536112ae921c160f7ac8535c50cb25743fa72bfa92529874eb5888c7d968d68080e4516c531143870cefdc7d78efa7e816b042c540bd0c7785a34dfcc133f9 SHA512 ee4dae2ce506e6c5968f1d917e43839366eefec2ba7ad3119b8a61ee527449fbeb87b51bea2b826ef184bfa322825b4e8bf7693d26d063e117773ac9d15fbc08
diff --git a/dev-vcs/mercurial/files/mercurial-5.8.1-testing-timeout.patch b/dev-vcs/mercurial/files/mercurial-5.8.1-testing-timeout.patch
new file mode 100644
index 000000000000..5c68835ccf75
--- /dev/null
+++ b/dev-vcs/mercurial/files/mercurial-5.8.1-testing-timeout.patch
@@ -0,0 +1,12 @@
+diff --git a/mercurial/testing/__init__.py b/mercurial/testing/__init__.py
+--- a/mercurial/testing/__init__.py
++++ b/mercurial/testing/__init__.py
+@@ -25,7 +25,7 @@ def wait_file(path, timeout=10):
+     timeout *= _timeout_factor()
+     start = time.time()
+     while not os.path.exists(path):
+-        if time.time() - start > timeout:
++        if timeout and time.time() - start > timeout:
+             raise RuntimeError(b"timed out waiting for file: %s" % path)
+         time.sleep(0.01)
+ 
diff --git a/dev-vcs/mercurial/mercurial-5.8.1.ebuild b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
index 9405990cae35..ec426005148e 100644
--- a/dev-vcs/mercurial/mercurial-5.8.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
@@ -127,7 +127,7 @@ zstd-safe-2.0.5+zstd.1.4.5
 zstd-sys-1.4.17+zstd.1.4.5
 "
 
-inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic
+inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="https://www.mercurial-scm.org/"
@@ -143,7 +143,6 @@ IUSE="+chg emacs gpg test tk rust"
 BDEPEND="rust? ( ${RUST_DEPEND} )"
 RDEPEND="
 	app-misc/ca-certificates
-	dev-python/zstandard[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )"
 
@@ -153,10 +152,11 @@ DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 		dev-python/pygments[${PYTHON_USEDEP}]
 		)"
 
-SITEFILE="70${PN}-gentoo.el"
+PATCHES=(
+	"${FILESDIR}"/${P}-testing-timeout.patch
+)
 
-# Too many tests fail #608720
-RESTRICT="test"
+SITEFILE="70${PN}-gentoo.el"
 
 src_unpack() {
 	default_src_unpack
@@ -171,10 +171,6 @@ python_prepare_all() {
 	# certain cases), bug #362891
 	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
 	sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
-	# Use absolute import for zstd
-	sed -i -e 's/from \.* import zstd/import zstandard as zstd/' \
-		mercurial/utils/compression.py \
-		mercurial/wireprotoframing.py || die
 
 	distutils-r1_python_prepare_all
 }
@@ -182,7 +178,7 @@ python_prepare_all() {
 src_compile() {
 	if use rust; then
 		pushd rust/hg-cpython || die
-		cargo_src_compile --no-default-features --features python3
+		cargo_src_compile --no-default-features --features python3 --jobs $(makeopts_jobs)
 		popd
 	fi
 	distutils-r1_src_compile
@@ -194,7 +190,7 @@ python_compile() {
 	if use rust; then
 		local -x HGWITHRUSTEXT="cpython"
 	fi
-	distutils-r1_python_compile build_ext --no-zstd
+	distutils-r1_python_compile build_ext
 }
 
 python_compile_all() {
@@ -216,7 +212,7 @@ python_install() {
 	if use rust; then
 		local -x HGWITHRUSTEXT="cpython"
 	fi
-	distutils-r1_python_install build_ext --no-zstd
+	distutils-r1_python_install build_ext
 }
 
 python_install_all() {
@@ -270,6 +266,7 @@ src_test() {
 	rm -f test-convert-mtn*		# monotone
 	rm -f test-convert-tla*		# GNU Arch tla
 	rm -f test-largefiles*		# tends to time out
+	rm -f test-https*			# requires to support tls1.0
 	if [[ ${EUID} -eq 0 ]]; then
 		einfo "Removing tests which require user privileges to succeed"
 		rm -f test-convert*
@@ -287,12 +284,11 @@ src_test() {
 python_test() {
 	local TEST_DIR
 
-	rm -rf "${TMPDIR}"/test
 	distutils_install_for_testing
 	cd tests || die
-	"${PYTHON}" run-tests.py --verbose \
-		--tmpdir="${TMPDIR}"/test \
-		--with-hg="${TEST_DIR}"/scripts/hg \
+	"${PYTHON}" run-tests.py \
+		--jobs $(makeopts_jobs) \
+		--timeout 0 \
 		|| die "Tests fail with ${EPYTHON}"
 }
 
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index bd222953c09f..b35588b17c9b 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,3 +1,3 @@
 DIST pre-commit-2.13.0.tar.gz 252631 BLAKE2B 7e6b3af46dfaf9928d2cb2aa6cad05423bf6e417e2324af71b241e1aaa2eec6fcb271869f98c040cd4fb8c608a1fabd244c8286864f469a06c44684cd2bf33eb SHA512 5dfc297b3f900afef8f1c355b38ce086af7c836d1e577af8ec95ffb30e82df8b866131da4ff12933339bda63e4a90833c3852265d4f2d4a59bf92bce2b972a5e
-EBUILD pre-commit-2.13.0.ebuild 2072 BLAKE2B 9ee972af0cff9c270309c02716afa63a74605b99d4b95d02a1f715f66a4a615bd489cd0b99245f288e0a6574d948d3a57114a25ef182964721f3060193c53bda SHA512 ea0583b7859da28373fe2d8f8496e06892d21d96a5e79cb6d8a7ddc5cd9c87edb1be50f21d610c6ecf7ad2f251a6b9c7bf9ca7c77830021788ad859aada5b3d7
+EBUILD pre-commit-2.13.0.ebuild 2077 BLAKE2B 11a58eec400e895c2b60127cf0cf4936a2de657aae2e62dc01f08681283cb097cd96eb33f37f8330c0bf31770c58fc6c4d40e9d4ca0859f8846f6c82767959d0 SHA512 a184abd542939cde972cc97e94291fd6974000e66078b119310260baa4c61178797ce6e73118cdf9c4f20d269cd88061441a35b3c2900400f1d493eb3e0fc0fe
 MISC metadata.xml 379 BLAKE2B 6224574b28f758241c6ad965ad59a423db76bd21c64c3577691104a8f45a4ee9b570f9cf1557f2ce17f00bf496b9eeb83741679dc0d6e1bb23c421f90fe9070f SHA512 f14032e386c2bb591390034086c7d4a2e8ce9aacc536574c517dff4691aa8c39bc966307ee91a5f76708f14601312fd16528a676e1918d82b2761185bc27df9f
diff --git a/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild b/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild
index 802f0287c55a..aa881ca83b3e 100644
--- a/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild
+++ b/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa"
+KEYWORDS="amd64 ~hppa ~ppc"
 
 # TODO: figure out why these tests - all of which invoke git - fail:
 #  - tests/main_test.py::test_all_cmds[autoupdate,hook-impl,install,install-hooks,migrate-config,run,uninstall],
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 98d947e1c229..d80441ecb2ff 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,5 +1,3 @@
-DIST stgit-1.0.tar.gz 302201 BLAKE2B 2be1eb648edbefed6270e8f52039afd5d6d4140e8e16656a9f28f6b168eb5ce02c814a3e2b91bc628a80de1e15f0491b82af18fc2cad4e556bcd23ef247fe082 SHA512 e33db953d810f024ee2159ea5bb1b1367a5c673d78d789e8b20ad1d773dccaaf0fe4ccb713b8de082d4a79a3f51d421a2d3d88be24f2e0e770e070e640744894
 DIST stgit-1.1.tar.gz 313862 BLAKE2B 2d15ba7c2f55ff1211f0d9a3002878102f5023e897d0830daa688a2af8c6a386ec0cf076c728b6f45650ee3382379a32fb4efb25d0da3b28302f158dfca6ef62 SHA512 917c645f219b2725d1e88186674a6184c96f1457d5c7722b4da17931d963f0fe0c675cdaaca435ba7405ba498d6db9a01c9f554d1aa3093cc3205d224d9d9759
-EBUILD stgit-1.0.ebuild 1833 BLAKE2B c48cc767a018f9cddd4f22352ae99119b6ad1700ba35e659e3ebf36cc274c80e01f349333d8293c706c84399211c57cbc3b6c4c258530204f677f6326858fbf4 SHA512 d03f5a3d4294363daf91779b86ece5e6d49d122ae0283b25bce55f156929e7a12f29d8f6e76accd946592e5c66d01513e096d6422b4022995f830290c5e974a8
 EBUILD stgit-1.1.ebuild 1833 BLAKE2B c48cc767a018f9cddd4f22352ae99119b6ad1700ba35e659e3ebf36cc274c80e01f349333d8293c706c84399211c57cbc3b6c4c258530204f677f6326858fbf4 SHA512 d03f5a3d4294363daf91779b86ece5e6d49d122ae0283b25bce55f156929e7a12f29d8f6e76accd946592e5c66d01513e096d6422b4022995f830290c5e974a8
 MISC metadata.xml 346 BLAKE2B 7407539392698e06f225fa923759d1511ca2ce2ef3d99abe4253bfcf1776d28623ba24edf140a71bdf6637925bcdd8cc69e0e8e6aeee6a67ff6850b1de623d65 SHA512 22f829c87ae9f67118209cbd3499aea4e830f7737825f26d686bbcf32f29a7de553a8c0da73d09617ceac3fd197f96df4f4dc44b7cafffde933dfb92757aea6a
diff --git a/dev-vcs/stgit/stgit-1.0.ebuild b/dev-vcs/stgit/stgit-1.0.ebuild
deleted file mode 100644
index 0daa07cbdef7..000000000000
--- a/dev-vcs/stgit/stgit-1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="https://stacked-git.github.io"
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=">=dev-vcs/git-1.6.3.3"
-
-# NOTE: It seems to be quite important which asciidoc version to use.
-# So keep an eye on it for the future.
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)"
-
-pkg_setup() {
-	if ! use doc; then
-		echo
-		ewarn "Manpages will not be built and installed."
-		ewarn "Enable the 'doc' useflag, if you want them."
-		echo
-	fi
-}
-
-python_prepare_all() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && \
-		eapply "${WORKDIR}"/patches-upstream
-
-	# this will be a noop, as we are working with a tarball,
-	# but throws git errors --> just get rid of it
-	echo "version=\"${PV}\"" > "${S}"/stgit/builtin_version.py
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# bug 526468
-	if use doc; then
-		emake htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			doc
-	fi
-}
-
-src_install() {
-	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			install-doc install-html
-	fi
-
-	distutils-r1_src_install
-
-	newbashcomp completion/stgit.bash 'stg'
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 27f4f22088b7..4da1fdc826bb 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
index 80f2d5fcd32a..f0451b773a93 100644
--- a/eclass/bash-completion-r1.eclass
+++ b/eclass/bash-completion-r1.eclass
@@ -4,12 +4,12 @@
 # @ECLASS: bash-completion-r1.eclass
 # @MAINTAINER:
 # mgorny@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: A few quick functions to install bash-completion files
 # @EXAMPLE:
 #
 # @CODE
-# EAPI=5
+# EAPI=8
 #
 # src_configure() {
 # 	econf \
@@ -23,11 +23,14 @@
 # }
 # @CODE
 
+if [[ ! ${_BASH_COMPLETION_R1_ECLASS} ]]; then
+_BASH_COMPLETION_R1_ECLASS=1
+
 inherit toolchain-funcs
 
-case ${EAPI:-0} in
-	0|1|2|3|4|5|6|7) ;;
-	*) die "EAPI ${EAPI} unsupported (yet)."
+case ${EAPI} in
+	5|6|7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # @FUNCTION: _bash-completion-r1_get_bashdir
@@ -136,3 +139,5 @@ bashcomp_alias() {
 			|| return
 	done
 }
+
+fi
diff --git a/eclass/cannadic.eclass b/eclass/cannadic.eclass
deleted file mode 100644
index ac56ef2849ca..000000000000
--- a/eclass/cannadic.eclass
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# No consumers left. Removal in 30 days.
-
-# @ECLASS: cannadic.eclass
-# @MAINTAINER:
-# cjk@gentoo.org
-# @AUTHOR:
-# Mamoru KOMACHI <usata@gentoo.org>
-# @SUPPORTED_EAPIS: 7
-# @BLURB: Function for Canna compatible dictionaries
-# @DESCRIPTION:
-# The cannadic eclass is used for installation and setup of Canna
-# compatible dictionaries.
-
-case ${EAPI} in
-	7) ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
-
-if [[ -z ${_CANNADIC_ECLASS} ]]; then
-_CANNADIC_ECLASS=1
-
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-# You don't need to modify these
-readonly _CANNADIC_CANNA_DIR="/var/lib/canna/dic/canna"
-readonly _CANNADIC_DICS_DIR="/var/lib/canna/dic/dics.d"
-
-# @FUNCTION: cannadic-install
-# @DESCRIPTION:
-# Installs dictionaries to ${EPREFIX}/var/lib/canna/dic/canna
-cannadic-install() {
-	insinto ${_CANNADIC_CANNA_DIR}
-	insopts -m 0664 -o bin -g bin
-	doins "${@}"
-}
-
-# @FUNCTION: dicsdir-install
-# @DESCRIPTION:
-# Installs dics.dir from ${DICSDIRFILE}
-dicsdir-install() {
-	insinto ${_CANNADIC_DICS_DIR}
-	doins ${DICSDIRFILE}
-}
-
-# @FUNCTION: cannadic_src_install
-# @DESCRIPTION:
-# Installs all dictionaries under ${WORKDIR}
-# plus dics.dir and docs
-cannadic_src_install() {
-	keepdir ${_CANNADIC_CANNA_DIR}
-	fowners bin:bin ${_CANNADIC_CANNA_DIR}
-	fperms 0775 ${_CANNADIC_CANNA_DIR}
-
-	local f
-	for f in *.c[btl]d *.t; do
-		if [[ -s ${f} ]]; then
-			cannadic-install "${f}"
-		fi
-	done 2> /dev/null
-
-	dicsdir-install
-
-	einstalldocs
-}
-
-# @FUNCTION: update-cannadic-dir
-# @DESCRIPTION:
-# Updates dics.dir for Canna Server, script for this part taken from Debian GNU/Linux
-#
-#  compiles dics.dir files for Canna Server
-#  Copyright 2001 ISHIKAWA Mutsumi
-#  Licensed under the GNU General Public License, version 2.  See the file
-#  /usr/portage/license/GPL-2 or <http://www.gnu.org/copyleft/gpl.txt>.
-update-cannadic-dir() {
-	einfo
-	einfo "Updating dics.dir for Canna ..."
-	einfo
-
-	# write new dics.dir file in case we are interrupted
-	cat <<-EOF > "${EROOT}${_CANNADIC_CANNA_DIR}"/dics.dir.update-new || die
-		# dics.dir -- automatically generated file by Portage.
-		# DO NOT EDIT BY HAND.
-	EOF
-
-	local f
-	for f in "${EROOT}${_CANNADIC_DICS_DIR}"/*.dics.dir; do
-		echo "# ${f}" >> "${EROOT}${_CANNADIC_CANNA_DIR}"/dics.dir.update-new || die
-		cat "${f}" >> "${EROOT}${_CANNADIC_CANNA_DIR}"/dics.dir.update-new || die
-		einfo "Added ${f}."
-	done
-
-	mv "${EROOT}${_CANNADIC_CANNA_DIR}"/dics.dir.update-new \
-		"${EROOT}${_CANNADIC_CANNA_DIR}"/dics.dir || die
-
-	einfo
-	einfo "Done."
-	einfo
-}
-
-# @FUNCTION: cannadic_pkg_postinst
-# @DESCRIPTION:
-# Updates dics.dir and print out notice after install
-cannadic_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	update-cannadic-dir
-
-	einfo "Please restart cannaserver for changes to propagate."
-	einfo "You need to modify your config file (~/.canna) to enable dictionaries."
-
-	if [[ -n ${CANNADICS} ]]; then
-		einfo "e.g) add"
-		einfo
-		einfo "  $(IFS=' ' ; echo ${CANNADICS[*]})"
-		einfo
-		einfo "to section use-dictionary()."
-		einfo "For details, see documents under ${EROOT}/usr/share/doc/${PF}."
-	fi
-
-	einfo "If you do not have ~/.canna, you can find sample files in ${EROOT}/usr/share/canna."
-	ewarn "If you are upgrading from existing dictionary, you may need to recreate"
-	ewarn "user dictionary if you have one."
-}
-
-# @FUNCTION: cannadic_pkg_postrm
-# @DESCRIPTION:
-# Updates dics.dir and print out notice after uninstall
-cannadic_pkg_postrm() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	update-cannadic-dir
-
-	einfo "Please restart cannaserver for changes to propagate."
-	einfo "and modify your config file (~/.canna) to disable dictionary."
-
-	if [[ -n ${CANNADICS} ]]; then
-		einfo "e.g) delete"
-		einfo
-		einfo "  $(IFS=' ' ; echo ${CANNADICS[*]})"
-		einfo
-		einfo "from section use-dictionary()."
-	fi
-
-	einfo
-}
-
-fi
diff --git a/eclass/cuda.eclass b/eclass/cuda.eclass
index b1da77c69dda..08d2302d55b9 100644
--- a/eclass/cuda.eclass
+++ b/eclass/cuda.eclass
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 case "${EAPI:-0}" in
-	0|1|2|3|4)
+	[0-6])
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	5|6|7)
+	7|8)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -15,7 +15,7 @@ esac
 # @ECLASS: cuda.eclass
 # @MAINTAINER:
 # Gentoo Science Project <sci@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Common functions for cuda packages
 # @DESCRIPTION:
 # This eclass contains functions to be used with cuda package. Currently it is
diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index 0bb00f475a21..9d0c71703e49 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author Justin Lecher <jlec@gentoo.org>
 # Test functions provided by Sebastien Fabbro and Kacper Kowalik
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: Simplify fortran compiler management
 # @DESCRIPTION:
 # If you need a fortran compiler, then you should be inheriting this eclass.
@@ -31,7 +31,7 @@ inherit toolchain-funcs
 case ${EAPI:-0} in
 	# not used in the eclass, but left for backward compatibility with legacy users
 	5|6) inherit eutils ;;
-	7) ;;
+	7|8) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass
index 1d90c7fc383e..303cf32d7ef5 100644
--- a/eclass/ghc-package.eclass
+++ b/eclass/ghc-package.eclass
@@ -4,9 +4,9 @@
 # @ECLASS: ghc-package.eclass
 # @MAINTAINER:
 # "Gentoo's Haskell Language team" <haskell@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
 # @AUTHOR:
 # Original Author: Andres Loeh <kosmikus@gentoo.org>
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: This eclass helps with the Glasgow Haskell Compiler's package configuration utility.
 # @DESCRIPTION:
 # Helper eclass to handle ghc installation/upgrade/deinstallation process.
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 0e41325b3061..9587c33a12b6 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -4,10 +4,10 @@
 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
 # Haskell herd <haskell@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
 # @AUTHOR:
 # Original author: Andres Loeh <kosmikus@gentoo.org>
 # Original author: Duncan Coutts <dcoutts@gentoo.org>
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: for packages that make use of the Haskell Common Architecture for Building Applications and Libraries (cabal)
 # @DESCRIPTION:
 # Basic instructions:
diff --git a/eclass/l10n.eclass b/eclass/l10n.eclass
index 8be84024d53c..487c7a30a055 100644
--- a/eclass/l10n.eclass
+++ b/eclass/l10n.eclass
@@ -1,7 +1,6 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# @ECLASS: l10n.eclass
 # @DEAD
 # Use plocale.eclass as drop-in replacement.
 # Functions should be replaced as follows:
@@ -14,6 +13,7 @@
 # the name of this eclass has caused some confusion, because it operates
 # on LINGUAS and is unrelated to L10N.
 #
+# @ECLASS: l10n.eclass
 # @MAINTAINER:
 # Ulrich Müller <ulm@gentoo.org>
 # @AUTHOR:
diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass
index 9c4903d24b61..f48dcdafe015 100644
--- a/eclass/pax-utils.eclass
+++ b/eclass/pax-utils.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Kevin F. Quinn <kevquinn@gentoo.org>
 # Author: Anthony G. Basile <blueness@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: functions to provide PaX markings for hardened kernels
 # @DESCRIPTION:
 #
@@ -22,7 +22,7 @@
 # to contain either "PT", "XT" or "none".  The default is none
 
 case ${EAPI:-0} in
-	[567]) ;;
+	5|6|7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index c07d483fd1f0..57a2c95dd10a 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -2,14 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
 
 DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="https://gcc.gnu.org/"
 
-# TODO: Please audit this inherit list on future EAPI bumps and ideally
-# conditonalise them where possible.
-inherit eutils flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix
+inherit flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix
 
 tc_is_live() {
 	[[ ${PV} == *9999* ]]
@@ -29,11 +27,11 @@ fi
 
 FEATURES=${FEATURES/multilib-strict/}
 
-case ${EAPI:-0} in
-	0|1|2|3|4*) die "Need to upgrade to at least EAPI=5" ;;
-	5*|6) inherit eapi7-ver ;;
-	7) ;;
-	*) die "I don't speak EAPI ${EAPI}." ;;
+case ${EAPI} in
+	5|6) inherit eapi7-ver eutils ;;
+	7) inherit eutils ;;
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \
@@ -99,6 +97,11 @@ elif [[ ${GCC_PV} == *_rc* ]] ; then
 	SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc}
 fi
 
+# Require minimum gcc version to simplify assumptions.
+# Normally we would require gcc-6+ (based on sys-devel/gcc)
+# but we still have sys-devel/gcc-apple-4.2.1_p5666.
+tc_version_is_at_least 4.2.1 || die "${ECLASS}: ${GCC_RELEASE_VER} is too old."
+
 PREFIX=${TOOLCHAIN_PREFIX:-${EPREFIX}/usr}
 
 LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
@@ -124,9 +127,9 @@ IUSE="test vanilla +nls"
 RESTRICT="!test? ( test )"
 
 tc_supports_dostrip() {
-	case ${EAPI:-0} in
-		5*|6) return 1 ;;
-		7) return 0 ;;
+	case ${EAPI} in
+		5|6) return 1 ;;
+		7|8) return 0 ;;
 		*) die "Update apply_patches() for ${EAPI}." ;;
 	esac
 }
@@ -140,24 +143,16 @@ tc_has_feature() {
 }
 
 if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
-	# --enable-altivec was dropped before gcc-4. We don't set it.
-	# We drop USE=altivec for newer gccs only to avoid rebuilds
-	# for most stable users. Once gcc-10 is stable we can drop it.
-	if ! tc_version_is_at_least 10; then
-		IUSE+=" altivec"
-	fi
 	IUSE+=" debug +cxx +nptl" TC_FEATURES+=(nptl)
 	[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
 	[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
-	# fortran support appeared in 4.1, but 4.1 needs outdated mpfr
-	tc_version_is_at_least 4.2 && IUSE+=" +fortran" TC_FEATURES+=(fortran)
-	tc_version_is_at_least 3 && IUSE+=" doc hardened multilib objc"
+	IUSE+=" +fortran" TC_FEATURES+=(fortran)
+	IUSE+=" doc hardened multilib objc"
 	tc_version_is_between 3 7 && IUSE+=" awt gcj" TC_FEATURES+=(gcj)
-	tc_version_is_at_least 3.3 && IUSE+=" pgo"
-	tc_version_is_at_least 4.0 &&
-		IUSE+=" objc-gc" TC_FEATURES+=(objc-gc)
-	tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
-	tc_version_is_at_least 4.2 && IUSE+=" +openmp"
+	IUSE+=" pgo"
+	IUSE+=" objc-gc" TC_FEATURES+=(objc-gc)
+	IUSE+=" libssp objc++"
+	IUSE+=" +openmp"
 	tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
 	tc_version_is_at_least 4.7 && IUSE+=" go"
 	# sanitizer support appeared in gcc-4.8, but <gcc-5 does not
@@ -173,15 +168,7 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
 		IUSE+=" graphite" TC_FEATURES+=(graphite)
 	tc_version_is_between 4.9 8 && IUSE+=" cilk"
 	tc_version_is_at_least 4.9 && IUSE+=" ada"
-
-	# Don't enable USE=vtv starting from gcc-10. Once gcc-10
-	# stable everywhere disable by default on older versions
-	# as well.
-	if tc_version_is_at_least 10; then
-		IUSE+=" vtv"
-	elif tc_version_is_at_least 4.9; then
-		IUSE+=" +vtv"
-	fi
+	tc_version_is_at_least 4.9 && IUSE+=" vtv"
 	tc_version_is_at_least 5.0 && IUSE+=" jit"
 	tc_version_is_between 5.0 9 && IUSE+=" mpx"
 	tc_version_is_at_least 6.0 && IUSE+=" +pie +ssp +pch"
@@ -206,17 +193,15 @@ fi
 #---->> DEPEND <<----
 
 RDEPEND="sys-libs/zlib
-	nls? ( virtual/libintl )"
-
-tc_version_is_at_least 3 && RDEPEND+=" virtual/libiconv"
-
-if tc_version_is_at_least 4 ; then
-	GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0="
-	if tc_version_is_at_least 4.3 ; then
-		RDEPEND+=" ${GMP_MPFR_DEPS}"
-	elif tc_has_feature fortran ; then
-		RDEPEND+=" fortran? ( ${GMP_MPFR_DEPS} )"
-	fi
+	virtual/libiconv
+	nls? ( virtual/libintl )
+"
+
+GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0="
+if tc_version_is_at_least 4.3 ; then
+	RDEPEND+=" ${GMP_MPFR_DEPS}"
+elif tc_has_feature fortran ; then
+	RDEPEND+=" fortran? ( ${GMP_MPFR_DEPS} )"
 fi
 
 tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1:0="
@@ -242,18 +227,22 @@ BDEPEND="
 DEPEND="${RDEPEND}"
 
 if tc_has_feature gcj ; then
-	GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
-	GCJ_GTK_DEPS="
-		x11-base/xorg-proto
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libXtst
-		=x11-libs/gtk+-2*
-		virtual/pkgconfig
+	DEPEND+="
+		gcj? (
+			awt? (
+				x11-base/xorg-proto
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				=x11-libs/gtk+-2*
+				x11-libs/pango
+				virtual/pkgconfig
+			)
+			>=media-libs/libart_lgpl-2.1
+			app-arch/zip
+			app-arch/unzip
+		)
 	"
-	tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"
-	tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"
-	DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
 fi
 
 if tc_has_feature systemtap ; then
@@ -269,8 +258,8 @@ if tc_has_feature valgrind; then
 	BDEPEND+=" valgrind? ( dev-util/valgrind )"
 fi
 
-case ${EAPI:-0} in
-	5*|6) DEPEND+=" ${BDEPEND}" ;;
+case ${EAPI} in
+	5|6) DEPEND+=" ${BDEPEND}" ;;
 esac
 
 PDEPEND=">=sys-devel/gcc-config-2.3"
@@ -449,11 +438,11 @@ tc_apply_patches() {
 
 	einfo "$1"; shift
 
-	case ${EAPI:-0} in
+	case ${EAPI} in
 		# Note: even for EAPI=6 we used 'epatch' semantics. To avoid
 		# breaking existing ebuilds use 'eapply' only in EAPI=7 or later.
-		5*|6) epatch "$@" ;;
-		7) eapply "$@" ;;
+		5|6) epatch "$@" ;;
+		7|8) eapply "$@" ;;
 		*) die "Update apply_patches() for ${EAPI}." ;;
 	esac
 }
@@ -470,9 +459,9 @@ toolchain_src_prepare() {
 		BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, commit ${EGIT_VERSION}"
 	fi
 
-	case ${EAPI:-0} in
-		5*) epatch_user;;
-		6|7) eapply_user ;;
+	case ${EAPI} in
+		5) epatch_user;;
+		6|7|8) eapply_user ;;
 		*) die "Update toolchain_src_prepare() for ${EAPI}." ;;
 	esac
 
@@ -530,9 +519,7 @@ toolchain_src_prepare() {
 	sed -i 's|A-Za-z0-9|[:alnum:]|g' "${S}"/gcc/*.awk #215828
 
 	# Prevent new texinfo from breaking old versions (see #198182, #464008)
-	if tc_version_is_at_least 4.1; then
-		tc_apply_patches "Remove texinfo (bug #198182, bug #464008)" "${FILESDIR}"/gcc-configure-texinfo.patch
-	fi
+	tc_apply_patches "Remove texinfo (bug #198182, bug #464008)" "${FILESDIR}"/gcc-configure-texinfo.patch
 
 	# >=gcc-4
 	if [[ -x contrib/gcc_update ]] ; then
@@ -785,9 +772,7 @@ toolchain_src_configure() {
 	is_jit && GCC_LANG+=",jit"
 	if is_objc || is_objcxx ; then
 		GCC_LANG+=",objc"
-		if tc_version_is_at_least 4 ; then
-			use objc-gc && confgcc+=( --enable-objc-gc )
-		fi
+		use objc-gc && confgcc+=( --enable-objc-gc )
 		is_objcxx && GCC_LANG+=",obj-c++"
 	fi
 
@@ -817,11 +802,11 @@ toolchain_src_configure() {
 		confgcc+=( --disable-nls )
 	fi
 
-	tc_version_is_at_least 3.4 || confgcc+=( --disable-libunwind-exceptions )
+	confgcc+=( --disable-libunwind-exceptions )
 
 	# Use the default ("release") checking because upstream usually neglects
 	# to test "disabled" so it has a history of breaking. bug #317217
-	if tc_version_is_at_least 3.4 && in_iuse debug ; then
+	if in_iuse debug ; then
 		# The "release" keyword is new to 4.0. bug #551636
 		local off=$(tc_version_is_at_least 4.0 && echo release || echo no)
 		confgcc+=( --enable-checking="${GCC_CHECKS_LIST:-$(usex debug yes ${off})}" )
@@ -946,7 +931,7 @@ toolchain_src_configure() {
 			fi
 		fi
 
-		tc_version_is_at_least 4.2 && confgcc+=( --disable-bootstrap )
+		confgcc+=( --disable-bootstrap )
 	else
 		if tc-is-static-only ; then
 			confgcc+=( --disable-shared )
@@ -971,10 +956,6 @@ toolchain_src_configure() {
 				$(use_enable nptl tls)
 			)
 		fi
-		tc_version_is_between 3.3 3.4 && confgcc+=( --enable-sjlj-exceptions )
-		if tc_version_is_between 3.4 4.3 ; then
-			confgcc+=( --enable-clocale=uclibc )
-		fi
 		;;
 	*-elf|*-eabi)
 		confgcc+=( --with-newlib )
@@ -1096,7 +1077,7 @@ toolchain_src_configure() {
 	# be small, and should simplify building of 64bit kernels in a 32bit
 	# userland by not needing sys-devel/kgcc64.  #349405
 	case $(tc-arch) in
-	ppc|ppc64) tc_version_is_at_least 3.4 && confgcc+=( --enable-targets=all ) ;;
+	ppc|ppc64) confgcc+=( --enable-targets=all ) ;;
 	sparc)     tc_version_is_at_least 4.4 && confgcc+=( --enable-targets=all ) ;;
 	amd64|x86) tc_version_is_at_least 4.3 && confgcc+=( --enable-targets=all ) ;;
 	esac
@@ -1119,44 +1100,40 @@ toolchain_src_configure() {
 		fi
 	fi
 
-	if tc_version_is_at_least 4.2 ; then
-		if in_iuse openmp ; then
-			# Make sure target has pthreads support. #326757 #335883
-			# There shouldn't be a chicken & egg problem here as openmp won't
-			# build without a C library, and you can't build that w/out
-			# already having a compiler ...
-			if ! is_crosscompile || \
-			   $(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
-			then
-				confgcc+=( $(use_enable openmp libgomp) )
-			else
-				# Force disable as the configure script can be dumb #359855
-				confgcc+=( --disable-libgomp )
-			fi
+	if in_iuse openmp ; then
+		# Make sure target has pthreads support. #326757 #335883
+		# There shouldn't be a chicken & egg problem here as openmp won't
+		# build without a C library, and you can't build that w/out
+		# already having a compiler ...
+		if ! is_crosscompile || \
+		   $(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
+		then
+			confgcc+=( $(use_enable openmp libgomp) )
 		else
-			# For gcc variants where we don't want openmp (e.g. kgcc)
+			# Force disable as the configure script can be dumb #359855
 			confgcc+=( --disable-libgomp )
 		fi
+	else
+		# For gcc variants where we don't want openmp (e.g. kgcc)
+		confgcc+=( --disable-libgomp )
 	fi
 
-	if tc_version_is_at_least 4.0 ; then
-		if _tc_use_if_iuse libssp ; then
-			confgcc+=( --enable-libssp )
+	if _tc_use_if_iuse libssp ; then
+		confgcc+=( --enable-libssp )
+	else
+		if hardened_gcc_is_stable ssp; then
+			export gcc_cv_libc_provides_ssp=yes
+		fi
+		if _tc_use_if_iuse ssp; then
+			# On some targets USE="ssp -libssp" is an invalid
+			# configuration as target libc does not provide
+			# stack_chk_* functions. Do not disable libssp there.
+			case ${CTARGET} in
+				mingw*|*-mingw*) ewarn "Not disabling libssp" ;;
+				*) confgcc+=( --disable-libssp ) ;;
+			esac
 		else
-			if hardened_gcc_is_stable ssp; then
-				export gcc_cv_libc_provides_ssp=yes
-			fi
-			if _tc_use_if_iuse ssp; then
-				# On some targets USE="ssp -libssp" is an invalid
-				# configuration as target libc does not provide
-				# stack_chk_* functions. Do not disable libssp there.
-				case ${CTARGET} in
-					mingw*|*-mingw*) ewarn "Not disabling libssp" ;;
-					*) confgcc+=( --disable-libssp ) ;;
-				esac
-			else
-				confgcc+=( --disable-libssp )
-			fi
+			confgcc+=( --disable-libssp )
 		fi
 	fi
 
@@ -1285,20 +1262,9 @@ downgrade_arch_flags() {
 	myarch=$(get-flag march)
 	mytune=$(get-flag mtune)
 
-	# If -march=native isn't supported we have to tease out the actual arch
-	if [[ ${myarch} == native || ${mytune} == native ]] ; then
-		if ! tc_version_is_at_least 4.2 ${bver}; then
-			arch=$($(tc-getCC) -march=native -v -E -P - </dev/null 2>&1 \
-				| sed -rn "/cc1.*-march/s:.*-march=([^ ']*).*:\1:p")
-			replace-cpu-flags native ${arch}
-		fi
-	fi
-
 	# Handle special -mtune flags
 	[[ ${mytune} == intel ]] && ! tc_version_is_at_least 4.9 ${bver} && replace-cpu-flags intel generic
-	[[ ${mytune} == generic ]] && ! tc_version_is_at_least 4.2 ${bver} && filter-flags '-mtune=*'
 	[[ ${mytune} == x86-64 ]] && filter-flags '-mtune=*'
-	tc_version_is_at_least 3.4 ${bver} || filter-flags '-mtune=*'
 
 	# "added" "arch" "replacement"
 	local archlist=(
@@ -1330,14 +1296,6 @@ downgrade_arch_flags() {
 		4.3 geode k6-2 # gcc.gnu.org/PR41989#c22
 		4.3 k8-sse3 k8
 		4.3 opteron-sse3 k8
-		3.4 athlon-fx x86-64
-		3.4 athlon64 x86-64
-		3.4 c3-2 c3
-		3.4 k8 x86-64
-		3.4 opteron x86-64
-		3.4 pentium-m pentium3
-		3.4 pentium3m pentium3
-		3.4 pentium4m pentium4
 	)
 
 	for ((i = 0; i < ${#archlist[@]}; i += 3)) ; do
@@ -1423,25 +1381,6 @@ gcc_do_filter_flags() {
 	filter-flags -frecord-gcc-switches # 490738
 	filter-flags -mno-rtm -mno-htm # 506202
 
-	if tc_version_is_between 3.2 3.4 ; then
-		# XXX: this is so outdated it's barely useful, but it don't hurt...
-		replace-cpu-flags G3 750
-		replace-cpu-flags G4 7400
-		replace-cpu-flags G5 7400
-
-		# XXX: should add a sed or something to query all supported flags
-		#      from the gcc source and trim everything else ...
-		filter-flags -f{no-,}unit-at-a-time -f{no-,}web -mno-tls-direct-seg-refs
-		filter-flags -f{no-,}stack-protector{,-all}
-		filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
-		# and warning options
-		filter-flags -Wextra -Wstack-protector
-	fi
-	if ! tc_version_is_at_least 4.1 ; then
-		filter-flags -fdiagnostics-show-option
-		filter-flags -Wstack-protector
-	fi
-
 	if tc_version_is_between 6 8 ; then
 		# -mstackrealign triggers crashes in exception throwing
 		# at least on ada: bug #688580
@@ -1449,35 +1388,33 @@ gcc_do_filter_flags() {
 		filter-flags -mstackrealign
 	fi
 
-	if tc_version_is_at_least 3.4 ; then
-		case $(tc-arch) in
-			amd64|x86)
-				filter-flags '-mcpu=*'
+	case $(tc-arch) in
+		amd64|x86)
+			filter-flags '-mcpu=*'
 
-				tc_version_is_between 4.4 4.5 && append-flags -mno-avx # 357287
+			tc_version_is_between 4.4 4.5 && append-flags -mno-avx # 357287
 
-				if tc_version_is_between 4.6 4.7 ; then
-					# https://bugs.gentoo.org/411333
-					# https://bugs.gentoo.org/466454
-					replace-cpu-flags c3-2 pentium2 pentium3 pentium3m pentium-m i686
-				fi
-				;;
-			alpha)
-				# https://bugs.gentoo.org/454426
-				append-ldflags -Wl,--no-relax
-				;;
-			sparc)
-				# temporary workaround for random ICEs reproduced by multiple users
-				# https://bugs.gentoo.org/457062
-				tc_version_is_between 4.6 4.8 && MAKEOPTS+=" -j1"
-				;;
-			*-macos)
-				# http://gcc.gnu.org/PR25127
-				tc_version_is_between 4.0 4.2 && \
-					filter-flags '-mcpu=*' '-march=*' '-mtune=*'
-				;;
-		esac
-	fi
+			if tc_version_is_between 4.6 4.7 ; then
+				# https://bugs.gentoo.org/411333
+				# https://bugs.gentoo.org/466454
+				replace-cpu-flags c3-2 pentium2 pentium3 pentium3m pentium-m i686
+			fi
+			;;
+		alpha)
+			# https://bugs.gentoo.org/454426
+			append-ldflags -Wl,--no-relax
+			;;
+		sparc)
+			# temporary workaround for random ICEs reproduced by multiple users
+			# https://bugs.gentoo.org/457062
+			tc_version_is_between 4.6 4.8 && MAKEOPTS+=" -j1"
+			;;
+		*-macos)
+			# http://gcc.gnu.org/PR25127
+			tc_version_is_between 4.0 4.2 && \
+				filter-flags '-mcpu=*' '-march=*' '-mtune=*'
+			;;
+	esac
 
 	strip-unsupported-flags
 
@@ -1592,7 +1529,7 @@ gcc_do_make() {
 		# resulting binaries natively ^^;
 		GCC_MAKE_TARGET=${GCC_MAKE_TARGET-all}
 	else
-		if tc_version_is_at_least 3.3 && _tc_use_if_iuse pgo; then
+		if _tc_use_if_iuse pgo; then
 			GCC_MAKE_TARGET=${GCC_MAKE_TARGET-profiledbootstrap}
 		else
 			GCC_MAKE_TARGET=${GCC_MAKE_TARGET-bootstrap-lean}
@@ -1651,7 +1588,7 @@ gcc_do_make() {
 			if tc_version_is_at_least 4.3 ; then
 				cd "${CTARGET}"/libstdc++-v3/doc
 				emake doc-man-doxygen || ewarn "failed to make docs"
-			elif tc_version_is_at_least 3.0 ; then
+			else
 				cd "${CTARGET}"/libstdc++-v3
 				emake doxygen-man || ewarn "failed to make docs"
 			fi
@@ -1798,11 +1735,9 @@ toolchain_src_install() {
 		rm -rf "${ED}"/usr/share/{man,info}
 		rm -rf "${D}"${DATAPATH}/{man,info}
 	else
-		if tc_version_is_at_least 3.0 ; then
-			local cxx_mandir=$(find "${WORKDIR}/build/${CTARGET}/libstdc++-v3" -name man)
-			if [[ -d ${cxx_mandir} ]] ; then
-				cp -r "${cxx_mandir}"/man? "${D}${DATAPATH}"/man/
-			fi
+		local cxx_mandir=$(find "${WORKDIR}/build/${CTARGET}/libstdc++-v3" -name man)
+		if [[ -d ${cxx_mandir} ]] ; then
+			cp -r "${cxx_mandir}"/man? "${D}${DATAPATH}"/man/
 		fi
 	fi
 
@@ -1894,9 +1829,6 @@ toolchain_src_install() {
 # when installing gcc, it dumps internal libraries into /usr/lib
 # instead of the private gcc lib path
 gcc_movelibs() {
-	# older versions of gcc did not support --print-multi-os-directory
-	tc_version_is_at_least 3.2 || return 0
-
 	# For non-target libs which are for CHOST and not CTARGET, we want to
 	# move them to the compiler-specific CHOST internal dir.  This is stuff
 	# that you want to link against when building tools rather than building
@@ -2011,21 +1943,16 @@ create_gcc_env_entry() {
 	# workaround for libtool being stupid and using .la's from
 	# conflicting ABIs by using the first one in the search path
 	local ldpaths mosdirs
-	if tc_version_is_at_least 3.2 ; then
-		local mdir mosdir abi ldpath
-		for abi in $(get_all_abis TARGET) ; do
-			mdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
-			ldpath=${LIBPATH}
-			[[ ${mdir} != "." ]] && ldpath+="/${mdir}"
-			ldpaths="${ldpath}${ldpaths:+:${ldpaths}}"
-
-			mosdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) -print-multi-os-directory)
-			mosdirs="${mosdir}${mosdirs:+:${mosdirs}}"
-		done
-	else
-		# Older gcc's didn't do multilib, so logic is simple.
-		ldpaths=${LIBPATH}
-	fi
+	local mdir mosdir abi ldpath
+	for abi in $(get_all_abis TARGET) ; do
+		mdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
+		ldpath=${LIBPATH}
+		[[ ${mdir} != "." ]] && ldpath+="/${mdir}"
+		ldpaths="${ldpath}${ldpaths:+:${ldpaths}}"
+
+		mosdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) -print-multi-os-directory)
+		mosdirs="${mosdir}${mosdirs:+:${mosdirs}}"
+	done
 
 	cat <<-EOF > ${gcc_envd_file}
 	GCC_PATH="${BINPATH}"
@@ -2297,7 +2224,6 @@ is_jit() {
 }
 
 is_multilib() {
-	tc_version_is_at_least 3 || return 1
 	_tc_use_if_iuse multilib
 }
 
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 99dcd1700467..b62ed113d579 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/minecraft-launcher/Manifest b/games-action/minecraft-launcher/Manifest
index 70d8c8c95e8c..f57b9c76a066 100644
--- a/games-action/minecraft-launcher/Manifest
+++ b/games-action/minecraft-launcher/Manifest
@@ -2,5 +2,5 @@ DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493
 DIST minecraft-launcher-928.tar.gz 547096 BLAKE2B 8a47c62b5aa313a476cb6fb95e2993f609d3d1adde67802f3ef95df6385938dca424a3037ddb3303615323d10d0cd395807182ac75bae839502f13eb3faf2287 SHA512 57deacc588e8d90c90259841045a3df3b2b4861cb2d95b38e417daa34eee6aad4eebb601c2160627d5d5cd34f309aed854fb78872379cecfc8b976f3e14c8f91
 DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
 EBUILD minecraft-launcher-1.6.93.ebuild 917 BLAKE2B 2d9bdc8209022a0bf140dd38cc0c7afbe063596d9d62f17207f37fce79d3ac8ebf5b30ddec9f7f98695bfe8376d5ba9e21b9522b26e8b19647d30e11c1c55e99 SHA512 c219bdc9fa912a9ddf30da207dd9fcdd998a0c16fe93d88a759298a5541693246fd8ebfd6a34c52d5a88b98b84abc1ec1ff2e53284888579c192ed8ff41f03dc
-EBUILD minecraft-launcher-928.ebuild 1171 BLAKE2B 3d2a83aa30e65692f8c9d091462aa416577c70dc6ada53bb02a5a85420a3f5d65d44e0fa58acf43568883b96e4f9567b5de197505923ea309f1f56b06085b3bf SHA512 fc5809d1f10b44663ba416a2aa1cc6ec60a450a366cbf175c2dca969df753ab2a40e9f1157f201da6ae38bd49857bbba0fbe977d03a66f5b1fa4568fbcd888a9
+EBUILD minecraft-launcher-928-r1.ebuild 1192 BLAKE2B 73f99c59a87601fff3df96dd40f4a2b35304aaa385fd3abbd595fea215df4c4514e7226f2c4a1daabff7b547498d3389a6dd4d558ef501b5e89204e4630fd279 SHA512 49884aef0581d306ab3ba474f1a08aaf996a693d316e7dc1514ee132fd52d75eab2dfdbe9828abf668079b5c7b24d1f689aa446a73c740b2da656830d0bacb80
 MISC metadata.xml 258 BLAKE2B cd6fd4c07f3e7f2e0f007951caac5ebe7d7ccf088d769ce2cd6e38172134c2f898145c77fa9d1efb9288e08b23a189be8dd87708400cbd8e5f926c54a17d756d SHA512 d6e8fa223415d98a85a3be244ce19417ffa534e92ddceab73aa0f6c7c4d329c80db74c918121ff274e7f86e9f26246584a688aefe0e3e6142ca84d20572b127b
diff --git a/games-action/minecraft-launcher/minecraft-launcher-928-r1.ebuild b/games-action/minecraft-launcher/minecraft-launcher-928-r1.ebuild
new file mode 100644
index 000000000000..95e87d44c224
--- /dev/null
+++ b/games-action/minecraft-launcher/minecraft-launcher-928-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${PV}.tar.gz -> ${P}.tar.gz
+	https://launcher.mojang.com/download/minecraft-launcher.svg"
+
+KEYWORDS="-* ~amd64"
+LICENSE="Mojang"
+SLOT="0"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.24.32-r1[X(+)]
+	app-crypt/libsecret
+	dev-libs/nss
+	dev-libs/libbsd
+	dev-libs/libffi
+	dev-libs/libpcre
+	media-libs/alsa-lib
+	media-libs/openal
+	net-libs/gnutls[idn]
+	net-print/cups
+	sys-apps/dbus
+	virtual/jre:1.8
+	virtual/opengl
+	x11-apps/xrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+"
+
+S="${WORKDIR}/${PN}"
+
+QA_PREBUILT="
+	/usr/bin/minecraft-launcher
+"
+
+src_install() {
+	dobin minecraft-launcher
+
+	doicon -s scalable "${DISTDIR}/${PN}.svg"
+	make_desktop_entry ${PN} "Minecraft" ${PN} Game
+}
diff --git a/games-action/minecraft-launcher/minecraft-launcher-928.ebuild b/games-action/minecraft-launcher/minecraft-launcher-928.ebuild
deleted file mode 100644
index 847536eabe27..000000000000
--- a/games-action/minecraft-launcher/minecraft-launcher-928.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${PV}.tar.gz -> ${P}.tar.gz
-	https://launcher.mojang.com/download/minecraft-launcher.svg"
-
-KEYWORDS="-* ~amd64"
-LICENSE="Mojang"
-SLOT="0"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.24.32-r1[X(+)]
-	dev-libs/nss
-	dev-libs/libbsd
-	dev-libs/libffi
-	dev-libs/libpcre
-	media-libs/alsa-lib
-	media-libs/openal
-	net-libs/gnutls[idn]
-	net-print/cups
-	sys-apps/dbus
-	virtual/jre:1.8
-	virtual/opengl
-	x11-apps/xrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-"
-
-S="${WORKDIR}/${PN}"
-
-QA_PREBUILT="
-	/usr/bin/minecraft-launcher
-"
-
-src_install() {
-	dobin minecraft-launcher
-
-	doicon -s scalable "${DISTDIR}/${PN}.svg"
-	make_desktop_entry ${PN} "Minecraft" ${PN} Game
-}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 8588d16d2a72..59f704b08df4 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/gnuchess/Manifest b/games-board/gnuchess/Manifest
index 2cd78243d2f8..28b4b4102bc2 100644
--- a/games-board/gnuchess/Manifest
+++ b/games-board/gnuchess/Manifest
@@ -1,4 +1,6 @@
 AUX gnuchess-6.2.8-cve-2021-30184.patch 1949 BLAKE2B e40c05ab4e2d459685ffdd6ad0d22382489bc26154c234da058e78f9fd3cbe9babfebab22e8b1525abf5dc50283db0b1868c82587cb9f04da0f4d14b113561ce SHA512 e44f53f8e25e86f20399e57d79d1d6835eabd69c34d89ba165e78d357471e2b82da5a48b184c8820c8340ddc55e3bd4097fdee737d62cbb73ffbc3870f94dc40
 DIST gnuchess-6.2.8.tar.gz 804080 BLAKE2B 7079c07ae7cd2f225c428a7bf14d53eec394382508544994918b87db35d5cbdeb9cf42a11f5bc2f9c0c7b778384d6cdb9aad4490bc9cfd40a513fc2e36cbdd67 SHA512 9146ee727c1eb8002eb3b1e762d71876b512eff0799eafec7019d5312766fe2bd6655c622e66f86e92f80d2f3666e48158a1245b42c30bd3221a8b379689ecdd
+DIST gnuchess-6.2.9.tar.gz 802697 BLAKE2B e450e1d77f3158f2a063a7fc80985ad6d59f26a17a86aa9d18d86f32ee1c01fba100e59b02ea65276a1ee480ed050fbafd68635d40bae75205763fd34bfd608a SHA512 7e2ec9e14ab331ffaab2dd60da81b64b5c5a07cf14f9139d67c77886038512d15511939b8e683675ea6611e24ff2c38212a7f288540448c9225c263435f71963
 EBUILD gnuchess-6.2.8-r1.ebuild 449 BLAKE2B c63faba0c5f0cc3d413c3081f106e34bfff10149098b2dfe6b4354e06c4ef6cb7c4d7c6b8ea7ca9b3a8504974f0e6b4bf47c7b79ef4aaf9c9c8ff95e5c7d93c6 SHA512 1151666bea8557c12304a39dcd44b617a3c0d73aa3cec0fc29bc8ad61ad37d7fc0b974e45991fe099c20dfc73e4894b07e2746e067a24a63343b28e5278d66aa
+EBUILD gnuchess-6.2.9.ebuild 385 BLAKE2B e1afa7629659877190c8a0b1e06abe8b79eb85a9f9c510128298258bf65ed92e9f37010cc06934a4716a5fff24e977defdaf1385012f7a38a570cf07f1fac1bd SHA512 97639646920219246b1e733ea9930af989054267a3ef15c81ff2237419701bc1845e7ac118b479c8c38a80261b434a3a0b40bab6037a68df18cdba3da115727f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnuchess/gnuchess-6.2.9.ebuild b/games-board/gnuchess/gnuchess-6.2.9.ebuild
new file mode 100644
index 000000000000..3d7f17e471b5
--- /dev/null
+++ b/games-board/gnuchess/gnuchess-6.2.9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Console based chess interface"
+HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
+SRC_URI="mirror://gnu/chess/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+src_configure() {
+	# bug #491088
+	econf --without-readline
+}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 4a72b3b90d93..738b27523cd3 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index d0ddff80cc51..31a109882c21 100644
--- a/games-emulation/stella/Manifest
+++ b/games-emulation/stella/Manifest
@@ -1,5 +1,3 @@
-DIST stella-6.5.2-src.tar.xz 6220652 BLAKE2B 8bb51ff15b28436eb83b918ca6123956482e4342c4f9560dcea608a856899a65176c9012146d1a2affe22ee0a589e945424e897853890e23ff503d97b893e32f SHA512 dc7685fd166fad578bce62c961419755db7c4b8ac6e6e2e10f0edfa3b0f63bf43d64119483cc47fc86dfe95e09bc800c27392239aeb68a2ccf37d0f224d6493c
 DIST stella-6.5.3-src.tar.xz 6221588 BLAKE2B 1cee75cd27c14db5a2eaf3a6d88af5b3d081c2577afd4b46b27ef33dd11d676cd5fe981d8ae918373b16d7f50e0151a9e0fc00765fb39370ea50f8322a90b963 SHA512 67fe45c0be510494e4c3ead91ee5f7c9a8ba7059b76beb15e794ef49144c8f0fb57d7c7476f4f299e573e37ea1c41f2fb094ca10974f3bcda797fc69c9bd2986
-EBUILD stella-6.5.2.ebuild 1359 BLAKE2B b3eb5d424060af0ab7aefe4d6cf2c7762bc61b3c304cd288d4206364c144e6cd08f03bb000c97f0844f590ad8ce142717c95aa6c868d145b1bc5985c93944150 SHA512 d80e24ded2edac83a45e0acd21529e2b5337c6ee73e435ef46a3747a13010e3eb01beb328d86821a1bc6f61875f014b82dfac3c9d77dc6cf219a8667ef5e7b3f
 EBUILD stella-6.5.3.ebuild 1181 BLAKE2B af98eb95d88bfd591afba8d05b2da853a053f2b1627a9d3325c3e6211e1eaa043a4793f46d7f8c75957768529b13f6d957eab08c1020140a2980c9d466ff5695 SHA512 5e590e83b530038a79fee476ec4fab0373d3ca725431586e443f9ff426cb29c0a01c42841b347a4c608d669710e60fda748a4a8336fe367d551b22f0f3b73daf
 MISC metadata.xml 386 BLAKE2B 23b063450bf4b6915ed443ff8e9cc0c24858144c867085a6416f73b2299026ab85d4b07f18bbd54db37ce420803eb81561e87323e5eee0cdb99652de2c15d153 SHA512 6d69c2c3b88a206faaf9d80c1c1d8de01d1865bf800e4d4b7997dae4641f99665c0692251cf3d045e766be045069548e42cdb3303cb698f093501f2e79124fa1
diff --git a/games-emulation/stella/stella-6.5.2.ebuild b/games-emulation/stella/stella-6.5.2.ebuild
deleted file mode 100644
index ae5e9b2d43b4..000000000000
--- a/games-emulation/stella/stella-6.5.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop gnome2-utils toolchain-funcs
-
-DESCRIPTION="Multi-platform Atari 2600 VCS Emulator"
-HOMEPAGE="https://stella-emu.github.io"
-SRC_URI="https://github.com/stella-emu/${PN}/releases/download/${PV}/${P}-src.tar.xz"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="joystick"
-
-RDEPEND="
-	media-libs/libsdl2[joystick?,opengl,video]
-	media-libs/libpng:0=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( Announce.txt Changes.txt Copyright.txt README-SDL.txt Readme.txt Todo.txt )
-HTML_DOCS=( docs/. )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/INSTALL/s/-s //' \
-		-e '/STRIP/d' \
-		-e "/icons/d" \
-		-e '/INSTALL.*DOCDIR/d' \
-		-e '/INSTALL.*\/applications/d' \
-		-e '/CXXFLAGS+=/s/-fomit-frame-pointer//' \
-		Makefile || die
-}
-
-src_configure() {
-	# not an autoconf script
-	CXX="$(tc-getCXX)" ./configure \
-		--prefix="/usr" \
-		--bindir="/usr/bin" \
-		--docdir="/usr/share/doc/${PF}" \
-		--datadir="/usr/share" \
-		$(use_enable joystick) \
-		|| die
-}
-
-src_install() {
-	default
-
-	local i
-	for i in 16 22 24 32 48 64 128 ; do
-		newicon -s ${i} src/common/stella-${i}x${i}.png stella.png
-	done
-
-	domenu src/unix/stella.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index fcc1f3d8be3c..7e8283aafe2f 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 9f8eeaac40e2..a6c70f40083e 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -9,5 +9,5 @@ AUX openmw-0.47.0-mygui-license.patch 728 BLAKE2B 036156d52e609fcbce3b219174e9de
 DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
 DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
 EBUILD openmw-0.46.0-r2.ebuild 4282 BLAKE2B 78ebe705fe5e2365b3a2e0684d7e8bffd4ea6c94e0890d4e67377d5b6b03dd6c86c13861106c660cc65c39691d4c4df1f09d016fcf5f5eafa65c0d1412b14d61 SHA512 0c77d328ff9398cb7fe361c5ce19653905adf41030e7f041be9a9948b4c88c1a3e84b0283e32afb960c8f30cd55d2019b128c2fb1ab9887ad678b072865dc969
-EBUILD openmw-9999.ebuild 3727 BLAKE2B 554dc7681cf47861b0e970387391ebb5f4f4a843cc73b6a8795c83bdd4a71133ca86b6b99dce2ff1972fc464d039183a3f46e9f34a59e13c101e93b78ae2a21f SHA512 a0030693c3b0f237a470da259ecf705101b2c217aeaa551ee0234d95b45f941eb388993681b4254fcb8f1d85c20df5292d541fd34569bcdf07defc9197f93e19
+EBUILD openmw-9999.ebuild 4172 BLAKE2B 2f19592efdea0f822a71b80b289b5e75e6b6eb8bfbf87c56967a3638362a519bf7696ba4a10e47c770e51769cc164255caba3d23f912abcbb386d977ba44fab0 SHA512 e51ce2640fb002ac389f2673e6d2f91b316a5965f8a8f2802910d1d9a3ced64ff94fb35eaa4995b6b3a0c6e89433214b4be39eb3205f3f4f43c5beb6749444b9
 MISC metadata.xml 1453 BLAKE2B b8731f5073cc74dbe2b17b776227e19c226a9bc3087996263d689771f8bcb8ceed06ef81b3a28dc693532f36e57a028fae2adc18b32dcf22bb6115f686643e63 SHA512 ead1390d762da49cb57fc978a59cde9ba1c77fb4a539c69250c98adf2ea836e1b231a939a4e0b1a88b7cbe804ebc7973a91e85f14cb701a97c983728b4bf8b0a
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 9b13f4d95f9d..82aa73331fdf 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic xdg-utils readme.gentoo-r1
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+inherit cmake flag-o-matic lua-single xdg-utils readme.gentoo-r1
 
 DESCRIPTION="Open source reimplementation of TES III: Morrowind"
 HOMEPAGE="https://openmw.org/ https://gitlab.com/OpenMW/openmw"
@@ -20,12 +21,13 @@ fi
 LICENSE="GPL-3 MIT BitstreamVera ZLIB"
 SLOT="0"
 IUSE="doc devtools +osg-fork test +qt5"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 # FIXME: Unbundle dev-games/openscenegraph-qt in extern/osgQt directory,
 # used when BUILD_OPENCS flag is enabled. See bug #676266.
 
-RDEPEND="
+RDEPEND="${LUA_DEPS}
 	app-arch/lz4
 	dev-games/mygui
 	dev-games/recastnavigation
@@ -48,7 +50,9 @@ RDEPEND="
 	)
 "
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-cpp/sol2
+"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -70,6 +74,7 @@ src_prepare() {
 
 	# Use the system tinyxml headers
 	rm -v extern/oics/tiny{str,xml}* || die
+	rm -rv extern/sol3.2.2 || die
 }
 
 src_configure() {
@@ -96,6 +101,20 @@ src_configure() {
 		-DBULLET_USE_DOUBLES=ON
 	)
 
+	if [[ ${ELUA} == luajit ]]; then
+		mycmakeargs+=(
+			-DUSE_LUAJIT=ON
+		)
+	else
+		mycmakeargs+=(
+			-DUSE_LUAJIT=OFF
+			-DLua_FIND_VERSION_MAJOR=$(ver_cut 1 $(lua_get_version))
+			-DLua_FIND_VERSION_MINOR=$(ver_cut 2 $(lua_get_version))
+			-DLua_FIND_VERSION_COUNT=2
+			-DLua_FIND_VERSION_EXACT=ON
+		)
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index fde4b2bff29e..8677ba7d6442 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -2,7 +2,11 @@ AUX stratagus-2.3.0-doc.patch 378 BLAKE2B 673afcbcf6131a49d03b683db2b430795b3022
 DIST stratagus-2.4.3.tar.gz 1123537 BLAKE2B 90e40b2b277b5c52977f3c0ae2ae8f2e65d940d765e2ca4f7def4f8cf903399350f5e46f6dc6fbc38f3a53c7ca9ecaf5cf38025ec69154972869f28da37865d4 SHA512 16271c4fed3fb75fb8fb08e363e72713ede7979ea7e25b7c83db2fa9a0688fb7927cad3379e3b23e172c409cf0f6db18f7c6557d19a693c9a7f24109b56d2a56
 DIST stratagus-3.0.0.tar.gz 1149659 BLAKE2B 62a14bdc84462f22867b836b9a83f58ba31c7793c20f25cd8a0ca58adf7e5a38ee4559e96dddf8eb61dd1572dac55e08b16c95f8b7590644da0d0ffd040e0360 SHA512 baef3636471134c53ae0a60471f217daf694c20f439db125cf31cc33a510be456486aa905950aec15f28acada1af39a245e97fc85045d849b10532939a8f3a83
 DIST stratagus-3.1.0.tar.gz 1188722 BLAKE2B 7eefd0d1c2ab35e657d8dc3c90c279deab073588c7a5830e317b99d72518b3d9b1260b56952e1deeadccc79334442441896c0d9520891a5eeea75da52871a4b2 SHA512 41f4dc6e6232cdd31258b7c402c64d3604c77b07bd46f29474a4b4979cd30dec809faeb5f0034521e26442c4afefba3076154a632bd445f57e04801b4199573b
+DIST stratagus-3.1.1.tar.gz 1189631 BLAKE2B dd81b354d90cd3483674d0b9728abf9a7c6b8e2c2ab49683d8da37a80dca26eafe3bfed022b3917ab7f6f1d09c68724def5a8d107dd735dbab58cc72b224fbd3 SHA512 b5c5e3d767cd96be0fcc13476452e76ea106ddf870117f0e0b97113455c8a54a6547065b242d9a255d87c59ee755e604489e68a5ecc2e5275b32b7b5b5cfae6b
+DIST stratagus-3.1.2.tar.gz 1190124 BLAKE2B 35e9b8d33a0b6926ba7a450b893679d323dca9507b9fe2cd27ec8ee5c80deeecf8e35fd8b92eed86f308b5a8abd017d6306a08b4268c06de3c3d0fac7b74eba1 SHA512 c12012b08b04a419b0d3d35860b22fa426e06181d6ecd2998b11419227f3c226a6d584a5c3443939dfe63e0cc657eaad914f04810431bc72b7697cf8f4465b18
 EBUILD stratagus-2.4.3-r100.ebuild 1585 BLAKE2B 207b0a52a39c7704491a8e64181336401e5594f1103e6d14933df721f08f34755e066199033c9a13eba77237de8892e6964790b974622fa31c6a8c130f7a0c75 SHA512 873a5079b9783abf710df210876048f6928f06e1963cb75ed13bc7cf549b9d97fb10a0f04bbf3afde13209777013efef35225a3349e69437f8f3eeb14b8cd3ee
 EBUILD stratagus-3.0.0-r100.ebuild 1567 BLAKE2B f7cfe263858a99bb53a45cf07a57f50fe892dfb2a6aa91f88bf869fe7ff4ee10d83570470acea132f568af8de54bb2168c81de36136522c8e3e605f3972dd54d SHA512 44d075c38ebd05c4f80bc817307645e3d46477742ba3f0142a4fd48558b50fec7fa7eb9a7a17eaf4199317949f5c98f3509496569865fcae0f61a89782383dbb
 EBUILD stratagus-3.1.0.ebuild 1565 BLAKE2B 8e3342dd6cd442acb685693f7baf2dfa21b5d499fcef264c37ee753e2c8da6a1d3481fc3d5f229b9498b7545408ceffd62d2aac8b043b902b73700f21e77d304 SHA512 28bff87b1b29f291a7d29e16382acdc49b7b1a12102c363e8ae79a3125d5c7db459602f3ccbde6f690db5e3ae14373798840ceafa5291ddc165c0fa4482ebee8
+EBUILD stratagus-3.1.1.ebuild 1565 BLAKE2B 8e3342dd6cd442acb685693f7baf2dfa21b5d499fcef264c37ee753e2c8da6a1d3481fc3d5f229b9498b7545408ceffd62d2aac8b043b902b73700f21e77d304 SHA512 28bff87b1b29f291a7d29e16382acdc49b7b1a12102c363e8ae79a3125d5c7db459602f3ccbde6f690db5e3ae14373798840ceafa5291ddc165c0fa4482ebee8
+EBUILD stratagus-3.1.2.ebuild 1565 BLAKE2B 8e3342dd6cd442acb685693f7baf2dfa21b5d499fcef264c37ee753e2c8da6a1d3481fc3d5f229b9498b7545408ceffd62d2aac8b043b902b73700f21e77d304 SHA512 28bff87b1b29f291a7d29e16382acdc49b7b1a12102c363e8ae79a3125d5c7db459602f3ccbde6f690db5e3ae14373798840ceafa5291ddc165c0fa4482ebee8
 MISC metadata.xml 526 BLAKE2B ae5eabae36efabcfa6af79a4ec6be482532af44eddb2725b5405a013dbc12171440c8790cae30c5e21dce0eaa605bfd0273c6f7e985149b9b0b5c6a9e86a2dc2 SHA512 b1ec75815ac742ab9c9a69ffc83bf191de9ba5c6b461a1094d6827e90d104e9db63a92f2094e93cd235265ffb8e4c690f51cd5729b86bfe74a8f30af069444e6
diff --git a/games-engines/stratagus/stratagus-3.1.1.ebuild b/games-engines/stratagus/stratagus-3.1.1.ebuild
new file mode 100644
index 000000000000..b457463d8b3d
--- /dev/null
+++ b/games-engines/stratagus/stratagus-3.1.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+inherit cmake lua-single optfeature
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="
+	https://stratagus.com/stratagus.html
+	https://github.com/Wargus/stratagus"
+SRC_URI="https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc mng theora vorbis"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	theora? ( vorbis )"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	dev-lua/toluapp[${LUA_SINGLE_USEDEP}]
+	media-libs/libpng:0
+	x11-libs/libX11
+	media-libs/libsdl2[sound,opengl,video]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-image[png]
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	mng? ( media-libs/libmng )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		theora? ( media-libs/libtheora )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.3.0-doc.patch
+)
+
+src_prepare() {
+	sed -i -e 's:-Werror::' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# there are in-source switches
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		-DGAMEDIR="/usr/bin"
+		-DDOCDIR="/usr/share/doc/${PF}"
+		-DWITH_BZIP2=$(usex bzip2)
+		-DWITH_MNG=$(usex mng)
+		-DWITH_OGGVORBIS=$(usex vorbis)
+		-DWITH_THEORA=$(usex theora)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_DEV=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "MIDI music support" "media-libs/sdl2-mixer[midi]"
+}
diff --git a/games-engines/stratagus/stratagus-3.1.2.ebuild b/games-engines/stratagus/stratagus-3.1.2.ebuild
new file mode 100644
index 000000000000..b457463d8b3d
--- /dev/null
+++ b/games-engines/stratagus/stratagus-3.1.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+inherit cmake lua-single optfeature
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="
+	https://stratagus.com/stratagus.html
+	https://github.com/Wargus/stratagus"
+SRC_URI="https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc mng theora vorbis"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	theora? ( vorbis )"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	dev-lua/toluapp[${LUA_SINGLE_USEDEP}]
+	media-libs/libpng:0
+	x11-libs/libX11
+	media-libs/libsdl2[sound,opengl,video]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-image[png]
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	mng? ( media-libs/libmng )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		theora? ( media-libs/libtheora )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.3.0-doc.patch
+)
+
+src_prepare() {
+	sed -i -e 's:-Werror::' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# there are in-source switches
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		-DGAMEDIR="/usr/bin"
+		-DDOCDIR="/usr/share/doc/${PF}"
+		-DWITH_BZIP2=$(usex bzip2)
+		-DWITH_MNG=$(usex mng)
+		-DWITH_OGGVORBIS=$(usex vorbis)
+		-DWITH_THEORA=$(usex theora)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_DEV=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "MIDI music support" "media-libs/sdl2-mixer[midi]"
+}
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index e63924f6e8d8..5b9d2c92127f 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/gmult/Manifest b/games-kids/gmult/Manifest
index 630188f3bca6..b8966d0ab5b9 100644
--- a/games-kids/gmult/Manifest
+++ b/games-kids/gmult/Manifest
@@ -1,5 +1,3 @@
-DIST gmult-8.0.tar.bz2 222981 BLAKE2B 0b70c05844f0b0db7fec77e334406dab557898240b05d2990b10e2ef398a26a2d4ad65086c635798abb66a8daefe591e908d7374840ff0886a16908e98f21564 SHA512 40c29a998d50491de8c14f7e71ad298fb69e0dc6f1f04b1f9bf35f9f72010eb085a9bc7a9efa1f3c339ea44fdeb9eec4d4f82017442c57ebc28f992bc703252f
 DIST gmult-9.0.tar.xz 47936 BLAKE2B ae0ebbebbdd949f7e990c6209c2ff695d34cf8e06a1e43fca137d9417b387fa58b1021f3bea5adace1832a39f60c5f2f77864ace888e4f1e70bed722951fd00e SHA512 b087406b1ea3743bc2ab292b9590a1d58451ca593d719b3539f22956304cd1004feed0fbf68c6a1bd0439f476c83f72287720d8937646ab214e6e50a4b04a27a
-EBUILD gmult-8.0-r1.ebuild 731 BLAKE2B 4b83df6a9ceaa4065417328cdc25cfba492075c136b850513298230c3313a9b1c14b21bdd70a2f75106fb5926c2d0497d760c439560e023d15362d501ca0e151 SHA512 700c830965478e2ea477d720f3a838f3f4fe486c607e58ca2ed0fbe3f002d848e6fb0af340c5d33a02a97c57a38831d772487cbf37410e6513ea6232005031d8
 EBUILD gmult-9.0.ebuild 627 BLAKE2B 14cacd51b997c30c071c5b6af33e543485d02447888008443f786d97adfa70287b0f69b9e4fcb4aad5b1c29c69beec2e6e4f6069643718f0cf7ea0e0ed14e1f2 SHA512 119c203864044e76d43b29489bd6467005355b905cfd0178685300de7d0aba1164873461d657ad33ebcd46517fe131c4930114c30cebfb1e25f45278b4b11d60
 MISC metadata.xml 326 BLAKE2B f9162abedf00b10abf4c94c73c47af36166cfcad2758e142e7bb8c12f42b59c9cc2b1565585fe59bab2c608c5f42e9d21548c1f1e4006946a9dbf287ed11e57c SHA512 f1271501c503fe7d64e69cd7729804fa3b4c0817e2cedd3b3696b919c5c67ae57917a66a326dc7501c5ced7d2e8e8c3cf40eec1a2545cb00a9226bca9ea3a5e8
diff --git a/games-kids/gmult/gmult-8.0-r1.ebuild b/games-kids/gmult/gmult-8.0-r1.ebuild
deleted file mode 100644
index 3e67c28d08be..000000000000
--- a/games-kids/gmult/gmult-8.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils flag-o-matic
-
-DESCRIPTION="Multiplication Puzzle emulates the multiplication game found in Emacs"
-HOMEPAGE="http://www.mterry.name/gmult/"
-SRC_URI="https://launchpad.net/gmult/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:3
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	append-libs -lm
-	econf # \
-		#--bindir="${GAMES_BINDIR}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 1ac77199ed6f..775d0d99b0e4 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index f04c1688b795..2227c5795096 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -9,5 +9,5 @@ DIST bsd-games-3.1.tar.gz 267636 BLAKE2B 116b340e383430fc56e9d2379a398494b43664a
 DIST bsdgames_2.17-28.debian.tar.xz 58464 BLAKE2B 3f5a70322341b153a8b3cb8df81fea1e773971d0f3b79ba8fb0c0877e95c61c8e8689952333f8ac4263948d781c2dc64c8178f9dac6a1c09ae702f91794b9583 SHA512 7e2db9f830c0657f3fcd1371635bda4a87e7a68180e486e44752904740c0710c02271522ff2d4b606542b3c502dd28795fcecf883360c3ac5bea78c148281f6a
 DIST bsdgames_2.17.orig.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
 EBUILD bsd-games-2.17_p28-r2.ebuild 4692 BLAKE2B 870cb4508d184ede3772dbe890fc146ef0c92d84f7e5db563f52b8087b5caac4c0b0dbf91e6fcc1d910e921624000aad06b3080f5c8026d628d15985cba971f1 SHA512 23d1e06cb44a363e2865563d40b795383e4e824c63e861cd0ac0361c4a0f4f125c3122d2ec1e76dc50bc524b735b8bbfde8f49fae4a37476bcfd70f6af2114d5
-EBUILD bsd-games-3.1-r1.ebuild 4614 BLAKE2B 95d35d5e89f0e65d6a3330f8f5654d5a9f04fdf990c02087630c089a7d4e16778e649724447655773d6f21136db226e407d4a4be152b5349041a602d0d8b44b0 SHA512 1384ac7e380994e0429c12ef17ff5f0ab56a6ad62edb5c7a85a90a9f0e9e42526f1616e3438496bc3d63130ff34b71fbbab289178c8d9ef7373ba20351ee8f41
+EBUILD bsd-games-3.1-r1.ebuild 4619 BLAKE2B d0fbf990fa2e84e5479cfb2d8d22611d80847dc4332ec70129ed74766a09e277be032de7668fb5828fb809998ef5e342cdec064f7f16a4838ed3cd74f617b7f0 SHA512 235982a985790a871eb8d54cb0f7e27acba58fe7d548c75c9fe5458a2f337e3ae355096bfe0ccf12f9e588fb1fd762de07526b387f5135d1eecee316345d6349
 MISC metadata.xml 326 BLAKE2B 264f08d8e1036db642114667e4dd07d5b4212b85c0254c55e2a0ec541b408f7129322dc133cc0bd875714e1535699d067fe0b625048b14ba002744e7269c4b6d SHA512 6e4e98607587faadf0aae1ba28287c2e694ef629b6ce915db751427f8f46c425e7aa120ef5fc978b2a0e4d4e33ad1cb0b0e136b0a0641c555f6471a8c286ccf5
diff --git a/games-misc/bsd-games/bsd-games-3.1-r1.ebuild b/games-misc/bsd-games/bsd-games-3.1-r1.ebuild
index dba41d2b82ae..68e5a80674f7 100644
--- a/games-misc/bsd-games/bsd-games-3.1-r1.ebuild
+++ b/games-misc/bsd-games/bsd-games-3.1-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 # Subslot indicates the fork / new version
 # 3 doesn't include the same games as the classic variant, etc
 SLOT="0/3"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 # 'check' target doesn't exist, nor do any actual tests
 # bug #779649
diff --git a/games-mud/Manifest.gz b/games-mud/Manifest.gz
index 2bbb5185e137..ff26443bb226 100644
--- a/games-mud/Manifest.gz
+++ b/games-mud/Manifest.gz
diff --git a/games-mud/tkmoo/Manifest b/games-mud/tkmoo/Manifest
index ea1f303c8d33..e9d9f473ba15 100644
--- a/games-mud/tkmoo/Manifest
+++ b/games-mud/tkmoo/Manifest
@@ -1,5 +1,5 @@
 AUX 0.3.32-Makefile-noclean.patch 445 BLAKE2B d0bd081129ebf2453118215eb48cebc918484ed948cd6bec22fe20bb81140de8a4d642ee6583d496eb359f63d9cfbe8cad066a3fd299ccf47470836ef131f5f5 SHA512 0bbba363d579527b1cca8fa5c953b9724ea939b416c3681b582959f64f36e8d311e17325bc5ca21cccc02e6209ba7f3687cc26fd3b9abe390e8dfbaee9082e53
 AUX 0.3.32-keys-workaround.patch 377 BLAKE2B 568b5d06b953ab5268174dcef0a903ec33547bfb09b3da718ead97ce889025d62c8e3dc04a1135b6f4ef7c31c3c2f0e85542c8cacbb753ea7cc20a4d0e6dfa1f SHA512 2d454f251f817267482597376e4f65972d766ed8ec90ecf79c085e431c82febf27d8c286bc40c3334d1b7f248258fa6c6ca601425d6767d3d6eab93a30590a02
 DIST tkMOO-light-0.3.32.tar.gz 95332 BLAKE2B 44fd5c1476527c3b1c18e44df71b49007caeb78e1ca788c718a532c716746a9b8df3f42d616bc0384bff167a484c8585a0fe13f607810c74006810635ed1ae6c SHA512 59543692900613eae77b73f5f88a2380a77d1be38d486dc0461d0990ccb941497dd0d35aa109a5697dba3b92157d9943b540a73fe4fc0d519e144f65620443d2
-EBUILD tkmoo-0.3.32-r1.ebuild 952 BLAKE2B bbceaeff20b11c7fda1373783453188f3dc9f17ede4e1c45c2fe946c1b1a219eda89ff4d444669927b20cc17b843476d9472de017d86611524f652503808eed6 SHA512 27eae2fed3d067665079a81462a54a075920e1193060d13324eee252a9c992474af084c4d1394eb2048935764763347bb382496ac1ad164f0b0c73b844a4c947
+EBUILD tkmoo-0.3.32-r1.ebuild 992 BLAKE2B 60af3327be051e480b8fd231c78ad715ec4bca2022f368fd4b4b1bf081f4f145ff4676f0a2eb12893a4d8b83aa4183b193b871889118638d5ec7a8525cf5ad34 SHA512 aa560963a295d20e3add94a983fd697b55589a84e6f3d1c76e0a7eab144d324a4d95042723200359103eb3a605d2eefccbeeb01fd1eaf62f6e95af27ec2f5be8
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-mud/tkmoo/tkmoo-0.3.32-r1.ebuild b/games-mud/tkmoo/tkmoo-0.3.32-r1.ebuild
index 557406e7a29f..6da608115ae7 100644
--- a/games-mud/tkmoo/tkmoo-0.3.32-r1.ebuild
+++ b/games-mud/tkmoo/tkmoo-0.3.32-r1.ebuild
@@ -1,45 +1,49 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop
+
+MY_P="tkMOO-light-${PV}"
 
-MY_PN=${PN/moo/MOO-light}
-MY_P=${P/moo/MOO-light}
 DESCRIPTION="MOO Client written in Tcl/Tk"
 HOMEPAGE="http://www.awns.com/tkMOO-light/"
 SRC_URI="http://www.awns.com/tkMOO-light/Source/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="tkMOO"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
-	>=dev-lang/tcl-8.3.3:0=
-	>=dev-lang/tk-8.3.3:0="
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
+	dev-lang/tcl
+	dev-lang/tk
+"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-Makefile-noclean.patch"
-		"${FILESDIR}/${PV}-keys-workaround.patch"
+	"${FILESDIR}/${PV}-keys-workaround.patch"
 )
 
 src_compile() {
-	emake \
-		WISH="$(type -P wish)" \
-		TKMOO_LIB_DIR="/usr/$(get_libdir)/${MY_PN}" \
-		TKMOO_BIN_DIR=/usr/bin
+	local myemakeargs=(
+		WISH="$(type -P wish)"
+		TKMOO_LIB_DIR="${EPREFIX}/usr/share/${PN}"
+		TKMOO_BIN_DIR="${EPREFIX}/usr/bin"
+	)
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
-	emake \
-		TKMOO_LIB_DIR="${D}/usr/$(get_libdir)/${MY_PN}" \
-		TKMOO_BIN_DIR="${D}/usr/bin" \
-		install
+	local emakeargs=(
+		TKMOO_LIB_DIR="${ED}/usr/share/${PN}"
+		TKMOO_BIN_DIR="${ED}/usr/bin"
+	)
+	emake "${emakeargs[@]}" install
+
 	dodoc README dot.tkmoolightrc bugsmail.txt
 	dosym tkMOO-lite /usr/bin/tkmoo
-	make_desktop_entry tkmoo "tkMOO"
+	make_desktop_entry tkmoo "tkMOO" applications-games
 }
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index e3416c0de4cb..a7f2b852f3de 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/cuyo/Manifest b/games-puzzle/cuyo/Manifest
index 0e8324bf300b..80b0c975c001 100644
--- a/games-puzzle/cuyo/Manifest
+++ b/games-puzzle/cuyo/Manifest
@@ -1,6 +1,4 @@
-AUX cuyo-2.1.1-gcc44.patch 161 BLAKE2B f6b288dfdf81ac39d0c58e144e36ed554bbec67c5533eb57ae9458fc73f0ca2348b3a3d65170a9c62ff5c8734b61b8e90d631a3044b171981feb27c42a04fc90 SHA512 461bd27073288eb5327770d18ce5a10a38a4e6ceb3c6f5e39a50a47bc3f6f5c8a06f9ac13d80bfbbeae1a0f45dd62ee0fa084dd832eb2d1313096f3d8e5c3149
 AUX cuyo-2.1.1-gcc6.patch 1024 BLAKE2B 12331f090b146d9f26b1a1300830153a599354c302cbe6d400eb3b39b403071853fcdc0a9559da23a0167d863794499e97f9a1f409333b722d9b95cfa9492e3c SHA512 ae8733da8afceee4e54ac8cac5a11d20a1adce494d76cdfaa821ffeba64886d9b0c9680fdab013c67e641bac9c96ba3dc23d1ecb86d1b59ca3f354692d218d2c
-AUX cuyo-2.1.1-gentoo.patch 851 BLAKE2B 70c082a9e19ca1a093810c810825986390abe5a0b0c671eb97dd95e731ee529a9aea1491f3c59651648ad0e9c451ecb269a66d0b17b4f0b237b961e47117e9a7 SHA512 c96c855c4650f50d6ed1c38d7105047f386c1828592389ce482cecefeb46bae224ee46f6f07dc63bbed67d81e4beadd5868962ad52dcca8fd9f99f3ea0899f8a
 DIST cuyo-2.~-1.1.tar.gz 3005426 BLAKE2B af83365568b16d230b8f253589c0300e1ba29471c8a406bd161da20b8282da4ca845aa1a06b8c5b2bf076828a71e0add9c317b710c476f56540a29f87dc53194 SHA512 a29c6ffc7e63b74dd93e8aeeace78bdbc50398771922aaf06a43256c883f9eff23e10fa91e4964b716cd209551cef771cf00108fb7977ce13a463da542322787
-EBUILD cuyo-2.1.1-r1.ebuild 939 BLAKE2B f0a4e0ace2567214dc54a515f9201b1d1eacb04d9c515f6d6b3f685d29232ded99af8c3bd230b3693de4c2ae1fd5a7a9fe6550e467fb9d775588b6d8b2e016b1 SHA512 c006a34ef2753b956413b1b8731167ead40f28eee08c5abd6f2e8cea9ed0422a731e33859946bea309acbd2cd6ed5013b94d57122473d40c20611a9ec0c4b5f6
-MISC metadata.xml 324 BLAKE2B 2d20b6235b6445d30b7da2729b4e3367456ebd9ea2b4ce290044e1202714ed0b460151e02af09648fe23e8095ee8aacac77923d232be8d8e0656f35e6f54387b SHA512 3392ab16d9e90d0dd6dba06994ba2096940075961de7e6fed43d70946e82916af7b40e95bd27e25d5eba9d9eb46afe61fe4200147385cc93211ab14c0e6b13ce
+EBUILD cuyo-2.1.1-r2.ebuild 743 BLAKE2B ee205185322b18623ca9fe509bef841b4dd84cacffbf6f35fe872e1fab0fcff9698915df8292ed8da4aa2b0c4f30db4653fe03c437d67322fbc9f230aff6eebe SHA512 c38ec714675a76f21c76276d56c95efbcbdc1798f0e1873966c11fef58b5df921ee23f7a833ce06921df3ce89e1bd470d82e68d653f263e5b0fe3a5e8a21ea23
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild
deleted file mode 100644
index c614a3ea2aa4..000000000000
--- a/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2-utils versionator
-
-MY_P="${PN}-$(get_version_component_range 1).~-$(get_version_component_range 2-3)"
-DESCRIPTION="highly addictive and remotely related to tetris"
-HOMEPAGE="https://www.karimmi.de/cuyo/"
-SRC_URI="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+music"
-
-DEPEND="sys-libs/zlib
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer
-	music? ( media-libs/sdl-mixer[mod] )
-	media-libs/sdl-image
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/cuyo/cuyo-2.1.1-r2.ebuild b/games-puzzle/cuyo/cuyo-2.1.1-r2.ebuild
new file mode 100644
index 000000000000..1b3790d034ef
--- /dev/null
+++ b/games-puzzle/cuyo/cuyo-2.1.1-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+# This version (2.~-1.1) should've been 2_pre11 or so, i.e. >=2.0.0 is newer.
+# Optimally need upstream to release >=2.1.2, or will need own custom version.
+MY_P="${PN}-$(ver_cut 1).~-$(ver_cut 2-3)"
+
+DESCRIPTION="Highly addictive and remotely related to tetris"
+HOMEPAGE="https://www.karimmi.de/cuyo/"
+SRC_URI="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image
+	media-libs/sdl-mixer[mod]
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc6.patch
+)
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
deleted file mode 100644
index 9ad50b067fb5..000000000000
--- a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cuyo-2.~-1.1.orig/src/stringzeug.h
-+++ cuyo-2.~-1.1/src/stringzeug.h
-@@ -20,7 +20,7 @@
- 
- #include <config.h>
- #include <string>
--
-+#include <stdio.h>
- 
- 
- 
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
deleted file mode 100644
index 78bafe2ded47..000000000000
--- a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- cuyo-2.~-1.1.orig/icons/Makefile.am
-+++ cuyo-2.~-1.1/icons/Makefile.am
-@@ -1,4 +1,4 @@
--desktopdir = $(datadir)/applications
-+desktopdir = /usr/share/applications
- desktop_DATA = cuyo.desktop
- 
- 
-@@ -25,7 +25,7 @@
- # Das vorige war falsch: die png sollen alle cuyo.png heissen
- # und nicht cuyo-xxxx.png. Deshalb nachfolgend neue Version:
- 
--iconsdir = $(datadir)/icons/hicolor
-+iconsdir = /usr/share/icons/hicolor
- icons_DATA = cuyo-32x32.png cuyo-64x64.png
- 
- install-iconsDATA:
---- cuyo-2.~-1.1.orig/icons/cuyo.desktop
-+++ cuyo-2.~-1.1/icons/cuyo.desktop
-@@ -3,9 +3,8 @@
- Icon=cuyo
- Type=Application
- Terminal=false
--MimeType=application/x-executable
-+MimeType=application/x-executable;
- Categories=Game;BlocksGame;
--Encoding=UTF-8
- Comment=A tetris like game with many levels
- Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln
- Exec=cuyo
diff --git a/games-puzzle/cuyo/metadata.xml b/games-puzzle/cuyo/metadata.xml
index 1329ada5712f..26079e608bed 100644
--- a/games-puzzle/cuyo/metadata.xml
+++ b/games-puzzle/cuyo/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="music">Enable playing of background music</flag>
-</use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/gfifteen/Manifest b/games-puzzle/gfifteen/Manifest
index 39ef45aa8121..6939d734e940 100644
--- a/games-puzzle/gfifteen/Manifest
+++ b/games-puzzle/gfifteen/Manifest
@@ -1,3 +1,3 @@
 DIST gfifteen-1.0.3.tar.gz 525454 BLAKE2B 253f74439d491b8ff30697c755dd8e04203a9282de0640603ae4e90fc37f3965ca7f1a02dc1263a71f5b00a18ccf42e7ac371cd20c5bc518fe9b12361fc80818 SHA512 a3699a2484ec3334ec9489c6ae6d8b332e41a769c72ea2971684197f8eb9e6c30431232f3423aaa85ded0fa57410929d432b2efe4370409bdcc63f2fb0b31ae4
-EBUILD gfifteen-1.0.3-r1.ebuild 866 BLAKE2B 5f7df7a00769db391a9b2f678b0744efcfc79db8e20d55e8f81a9f67ceadd166402c61ce4d9aade6cbc57afe5f1988f8a5b930cb59f061b278f748f98130c9a1 SHA512 65147433ed36d9c67a979270adc0b371898b217681830173956d82de847e103c87f4eaa61d62d07f43be0520b6a6b131fe8c61b26aa79fd5666385a7d813a176
+EBUILD gfifteen-1.0.3-r2.ebuild 705 BLAKE2B 2373f9cc3a93c7db2b3b791ca47330539078098c4552e9effc194279155e5a388cc8a2cf960c6c6e442f2a398f07717a49c02628575882e2c65c79bc53badac0 SHA512 91590b2462c9ec5e12086da69251c204c0579e79f6a57778c34ebd731de096529e1ab524677529a972e0aa992d46f82e248d8f9ff652309583cc455b5be128af
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
deleted file mode 100644
index 863fc84ff7f1..000000000000
--- a/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="Graphical implementation of the sliding puzzle game fifteen"
-HOMEPAGE="https://frigidcode.com/code/gfifteen/"
-SRC_URI="https://frigidcode.com/code/gfifteen/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	# make it compile against newer gtk+:3 (bug #536994)
-	sed -i \
-		-e 's/-DGTK_DISABLE_DEPRECATED=1 //' \
-		Makefile.in || die
-}
-
-src_configure() {
-	econf --disable-assembly
-}
-
-src_install() {
-	default
-	doicon -s scalable ${PN}.svg
-	domenu gfifteen.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3-r2.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..d5c8a0497046
--- /dev/null
+++ b/games-puzzle/gfifteen/gfifteen-1.0.3-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Graphical implementation of the sliding puzzle game fifteen"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# allow using newer gtk+:3 (bug #536994)
+	sed -i 's/-DGTK_DISABLE_DEPRECATED=1 //' Makefile.in || die
+}
+
+src_configure() {
+	econf --disable-assembly
+}
+
+src_install() {
+	default
+
+	doicon ${PN}.svg
+	domenu gfifteen.desktop
+}
diff --git a/games-puzzle/lmarbles/Manifest b/games-puzzle/lmarbles/Manifest
index 6322c047f852..3a8cf5347539 100644
--- a/games-puzzle/lmarbles/Manifest
+++ b/games-puzzle/lmarbles/Manifest
@@ -1,3 +1,4 @@
 DIST lmarbles-1.0.8.tar.gz 914238 BLAKE2B 263f069cdd82d300bd5185152158912a3972bd38b9baf254fe89ba5afced151edbc95c199acb43c2db00c805cbcaf2b0d6a13f4ac5f2a91580b70f3aabd4cb6f SHA512 d765b669a1b0039a0af8b28ede8209e9736c2f967b21d9f8372d1fc5475d49a766bef297615bff090532ade41fe44e084a458227b443566a54afebc3e989b57a
-EBUILD lmarbles-1.0.8-r1.ebuild 589 BLAKE2B b4f0fbf0aa4d778e05352f1d9f5a37d0a8e914a2af18819f5a445c59243ca0fe0cc19a61ad13c18654dd4c7c0bcd7ceef8ebe99471c292d78d55dda71c6a9503 SHA512 f3efb10c8c5f95784631146a87b7edd04ab4d4aad1b0189bf08778cd600c57e9e662dea0de1b987b19f9a89a5ff7f80fb9fa857a830e4fe49b0d235466058efc
+DIST lmarbles.png 3300 BLAKE2B fb18495174da23370ea85e053b298c0c0d0f682aea9e2c76c60a9b58964d4e365a00c700388f6a59f12e664b5e58646ad7661001372efb37e32c35e0240858df SHA512 722c9d3149a97320d8cf43f4d02c2b7c3a78e7fef945037bd712108ed66d31e012f2f6d3ecad1b572279592ed106e1f028a7f5045793c1bdd4f8b5e5f554063d
+EBUILD lmarbles-1.0.8-r2.ebuild 985 BLAKE2B c318b8fcdd50c938b2729fb85ad3982aa026c19b6e8c427ef583dfaad3b03be6b75dea0fb248ae92f3da2333976447930d55647c0cc292543e86363e6f88a40b SHA512 6395cca97f2e6c8883a121044c585f90d932304faabfe6f4e0abac6b17882d18768198c0ef014444bf7aada86203227c6dc6e051cd16684485618020304c48de
 MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild
deleted file mode 100644
index e92811a4437c..000000000000
--- a/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="puzzle game inspired by Atomix and written in SDL"
-HOMEPAGE="http://lgames.sourceforge.net/LMarbles/"
-SRC_URI="https://download.sourceforge.net/lgames/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	acct-group/gamestat
-	media-libs/libsdl[video]
-	media-libs/sdl-mixer
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	default
-	dodoc src/manual/*
-
-	fperms 660 /var/lib/lmarbles.prfs
-	fowners root:gamestat /var/lib/lmarbles.prfs
-}
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8-r2.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8-r2.ebuild
new file mode 100644
index 000000000000..0e294386e905
--- /dev/null
+++ b/games-puzzle/lmarbles/lmarbles-1.0.8-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Puzzle game inspired by Atomix and written in SDL"
+HOMEPAGE="http://lgames.sourceforge.net/LMarbles/"
+SRC_URI="
+	https://download.sourceforge.net/lgames/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( src/manual/. )
+
+src_configure() {
+	econf --localstatedir="${EPREFIX}"/var/games
+}
+
+src_install() {
+	default
+
+	fowners :gamestat /usr/bin/${PN} /var/games/lmarbles.prfs
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/lmarbles.prfs
+
+	# gif format is not valid for XDG icons, and .desktop hardcodes icon path
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} LMarbles
+	rm "${ED}"/usr/share/{applications/${PN}.desktop,icons/lmarbles48.gif} || die
+}
diff --git a/games-puzzle/neverball/Manifest b/games-puzzle/neverball/Manifest
index b37763b18d21..d704fe965bd3 100644
--- a/games-puzzle/neverball/Manifest
+++ b/games-puzzle/neverball/Manifest
@@ -1,4 +1,4 @@
 AUX neverball-1.6.0-gcc-10.patch 1174 BLAKE2B 21c1c9ef20bea6a4912b6195ec470342a64ee0105748bffefefac49f3cc53ea21555f234c944b9ac6c3a484402cb41bb777f932f6809731d2b5407dab8b2dbf4 SHA512 b48a657ab19b3249bbc5ee556ade4b2539cacab116f2e315f53b7aba1d0d13cace4483263e0b9ccafeee03fa78190cb9ea421349f89a6ddbb58cb95b193b14f2
 DIST neverball-1.6.0.tar.gz 37772911 BLAKE2B c9ebf9b5e87665055d3c09b93ffa71d8bf9b953b8a4b9ab7a0e7667c5521c94c80fa66c8df496066434b25319f7d22498ad19fa52e5ffee71ff4ee25188e3c41 SHA512 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787
-EBUILD neverball-1.6.0-r1.ebuild 2034 BLAKE2B 76e6fa7b897223befeb518fd0bede2d5a266a67e815a3957b47657c1385bafd65319f5743d0512c6892bb987958a23941b8ac9d60f995992a52d31848400bca4 SHA512 259fd9d22fa30802aece13358234a69c752beadb457f6e3e8f23e7265b37894411cfc55495cabb5af676386f69372758f8f3b9eec5f2c06f1ab0f7fac49d4bc9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+EBUILD neverball-1.6.0-r1.ebuild 1872 BLAKE2B 1cc42ca4080966a2f51a13b6ba1e6f565f94e4e783f9413281279a95ddd1db0d10f57557f96661b1f92f2e583d710fd0fd6b11069094277d7587a8be0929525a SHA512 4feb3f4ac777c0a78200304387d1379f518388b275bd135685dc2c99c5dcb43d6de16b66395540372fdd64dcd6a29a5ff2c745f877b1dc91225964cf877a5e45
+MISC metadata.xml 337 BLAKE2B af32f5331f54316c7b35106589f3db6fd2c27eeda0fc741e1e9411c89711d9103fd491dff9ba28cdbda8f32f29a48a716aa5eb4c02c652faf32b43472a1a7673 SHA512 06c1c87117d2787ea80fbe0e574ce9398e586c1fbf8b581ee8851601f4c79a2a38961de51c9eec1781db43c2aefa3ca5ef28a5ffc9d1fed81aecfd65cebad73c
diff --git a/games-puzzle/neverball/metadata.xml b/games-puzzle/neverball/metadata.xml
index 78274e0fa550..57ab140de1ae 100644
--- a/games-puzzle/neverball/metadata.xml
+++ b/games-puzzle/neverball/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Neverball/neverball</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-puzzle/neverball/neverball-1.6.0-r1.ebuild b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
index de40b601028e..abb40a2d14ca 100644
--- a/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
+++ b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop gnome2-utils
+EAPI=7
+
+inherit desktop eapi8-dosym toolchain-funcs xdg
 
 DESCRIPTION="Clone of Super Monkey Ball using SDL/OpenGL"
 HOMEPAGE="https://neverball.org"
@@ -12,87 +13,72 @@ LICENSE="GPL-2+ IJG"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
-RESTRICT="test"
+RESTRICT="test" # not a test suite, only starts ./neverball
 
-RDEPEND="
-	media-libs/libsdl2[sound,joystick,opengl,video]
-	media-libs/sdl2-ttf
-	media-libs/libpng:0=
-	virtual/jpeg:0
+DEPEND="
+	dev-games/physfs
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,opengl,sound,video]
 	media-libs/libvorbis
+	media-libs/sdl2-ttf
+	virtual/jpeg
 	virtual/opengl
-	dev-games/physfs
+	nls? ( virtual/libintl )"
+RDEPEND="
+	${DEPEND}
 	media-fonts/dejavu
-	media-fonts/wqy-microhei
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
+	media-fonts/wqy-microhei"
+BDEPEND="nls? ( sys-devel/gettext )"
 
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
 
 src_prepare() {
 	default
-	sed -i \
-		-e 's:mapc:neverball-mapc:g' \
-		-e 's:MAPC:NEVERBALL-MAPC:g' \
-		-e '1 s/ 1 / 6 /' \
-		dist/mapc.1 || die
-	sed -i \
-		-e '/CFLAGS.*O2/s:-O2:$(E_CFLAGS):' \
-		-e '/CXXFLAGS.*O2/s:-O2:$(E_CXXFLAGS):' \
-		-e "/^MAPC_TARG/s/mapc/${PN}-mapc/" \
-		Makefile || die
+
+	# adjust man page for namespaced mapc executable (bug #50538)
+	sed -i "s/mapc/${PN}-mapc/;s/MAPC/${PN^^}-MAPC/;1s/1/6/" dist/mapc.1 || die
 }
 
 src_compile() {
-	emake \
-		ENABLE_NLS=$(use nls && echo 1 || echo 0) \
-		E_CFLAGS="${CFLAGS}" \
-		E_CXXFLAGS="${CXXFLAGS}" \
-		LOCALEDIR=/usr/share/locale \
-		DATADIR="/usr/share/${PN}"
+	tc-export CC CXX
+
+	local emakeargs=(
+		DATADIR="${EPREFIX}"/usr/share/${PN}
+		LOCALEDIR="${EPREFIX}"/usr/share/locale
+		ENABLE_NLS=$(usex nls 1 0)
+		CFLAGS="${CFLAGS}"
+		CPPFLAGS="${CPPFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+	)
+	emake "${emakeargs[@]}"
 }
 
 src_install() {
-	local font
-
-	dobin ${PN}-mapc neverball neverputt
-	insinto "/usr/share/${PN}"
-	doins -r data/*
-	for font in DejaVuSans-Bold.ttf wqy-microhei.ttc; do
-		rm -f "${ED}/usr/share/${PN}"/ttf/${font}
-		dosym /usr/share/fonts/*/${font} \
-			"/usr/share/${PN}"/ttf/${font}
-	done
-	if [[ -d locale ]] ; then
-		insinto /usr/share
-		doins -r locale
-	fi
-	dodoc doc/{authors.txt,manual.txt,release-notes.md} README.md
+	dobin neverball neverputt
+	newbin mapc ${PN}-mapc
+
+	doman dist/{neverball,neverputt}.6
+	newman dist/mapc.1 neverball-mapc.6
 
-	local res name
+	insinto /usr/share/${PN}
+	doins -r data/.
+
+	# unbundle fonts
+	dosym8 -r /usr/share/{fonts/dejavu,${PN}/ttf}/DejaVuSans-Bold.ttf
+	dosym8 -r /usr/share/{fonts/wqy-microhei,${PN}/ttf}/wqy-microhei.ttc
+
+	insinto /usr/share
+	[[ -d locale ]] && doins -r locale
+
+	dodoc README.md doc/{authors.txt,manual.txt,release-notes.md}
+
+	local name res
 	for name in ball putt; do
 		for res in 16 32 64 128 256; do
 			newicon -s ${res} dist/never${name}_${res}.png never${name}.png
 		done
 	done
-
-	doman dist/*.6
-	newman dist/mapc.1 neverball-mapc.6
-	make_desktop_entry neverball Neverball
-	make_desktop_entry neverputt Neverputt neverputt
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	domenu dist/{neverball,neverputt}.desktop
 }
diff --git a/games-puzzle/nightsky/Manifest b/games-puzzle/nightsky/Manifest
index f8ff58f9a497..48a6c5503e4a 100644
--- a/games-puzzle/nightsky/Manifest
+++ b/games-puzzle/nightsky/Manifest
@@ -1,4 +1,4 @@
 AUX nightsky-wrapper 540 BLAKE2B 19eb62deb97cc4383e5b33920446278d369ec0c725dfa2a33709d7112cea8f97816724ee5976f7638b7610d110a4c3ff744ed23d248116c52113da141634e17d SHA512 6ecb52d390757bb6b1ffcd7b06c1a154d5a3253822e989d7b9276ede8627d241b203afb88afff731f33967a3e380d1fcaf3feeef61713485848f654df3855248
 DIST nightskyhd-linux-1324519044.tar.gz 123971537 BLAKE2B 52aafe22177ff3266bcff10a9de0b6a120f92c9dda0176a17c71140436b7ba6c13cab1775dd2406f8560ff0f8bfc2c4a38de4be40ef195535d9636edfb6005ba SHA512 a1d4ec588fa67c3dfbefe563d37df7bd93ce6a7580e7fcedda6567f6f05f362fc478fbd6ac921854fa5fe26270a037c49f9bce2df5527a6490ff0984b9bb671e
-EBUILD nightsky-20111222-r1.ebuild 1808 BLAKE2B 7b3ebb26f4a009915a5c84cb9bf7cdfc49be9551d1dd99f35561049cf1f463cf25952f2d22b9463ea5d7c43c41e419930b0041c4ca1ff4db85545a51d6b752a5 SHA512 1951dfe40296e805bea858af9a117a9bc82b95e06483f0084cd64d7357b0cd6a02c181a28b46f047b68c552fc7bc5d3614ad59bad08e6b46ff97e6aa6fbe8852
+EBUILD nightsky-20111222-r1.ebuild 1658 BLAKE2B 2a7d2a745f1b7c2508e1d6358b84cdee1e8703c232699dbbcca232fc671891c7d4628a2dac230e81d27a196693f0890fc794d26a90068c1dd28fdff9ee36ff94 SHA512 1cf3bb313f4416721911ce359e7cd268c30f915ded68d763cd162fadd47de71190a652ed05d230be31e80ca36740ab4e659ef60614e779b7f0d4bb6bf3e846f2
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-puzzle/nightsky/nightsky-20111222-r1.ebuild b/games-puzzle/nightsky/nightsky-20111222-r1.ebuild
index f74d7895b84c..a28bb13ec292 100644
--- a/games-puzzle/nightsky/nightsky-20111222-r1.ebuild
+++ b/games-puzzle/nightsky/nightsky-20111222-r1.ebuild
@@ -1,28 +1,25 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop gnome2-utils
+inherit desktop
 
 DESCRIPTION="Puzzle game that puts you inside and ambient and mysterious universe"
 HOMEPAGE="http://www.nicalis.com/nightsky/"
 SRC_URI="nightskyhd-linux-1324519044.tar.gz"
-S="${WORKDIR}"/NightSky
+S="${WORKDIR}/NightSky"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
+RESTRICT="bindist fetch"
 
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=opt/${PN}
 QA_PREBUILT="
-	${MYGAMEDIR#/}/NightSky*
-	${MYGAMEDIR#/}/lib/*
-	${MYGAMEDIR#/}/lib64/*
-"
+	opt/${PN}/NightSky*
+	opt/${PN}/lib/*
+	opt/${PN}/lib64/*"
 
 RDEPEND="
 	virtual/glu
@@ -50,8 +47,8 @@ src_prepare() {
 	default
 
 	einfo "Removing ${ARCH} unrelated files..."
-	rm -v NightSkyHD$(usex amd64 "" "_64") || die
-	rm -rv lib$(usex amd64 "" "64") || die
+	rm -v NightSkyHD$(usev !amd64 _64) || die
+	rm -rv lib$(usev !amd64 64) || die
 
 	if ! use bundled-libs ; then
 		einfo "Removing bundled libs..."
@@ -61,35 +58,24 @@ src_prepare() {
 	# empty dir, we create symlink here later
 	rm -r Settings || die
 
-	sed \
-		-e "s#@GAMES_PREFIX_OPT@#/opt#" \
+	sed "s|@GAMES_PREFIX_OPT@|${EPREFIX}/opt|" \
 		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
 }
 
 src_install() {
 	dobin "${T}"/${PN}
 
-	insinto "${MYGAMEDIR}"
-	doins -r *
-
-	newicon -s 128 "World/The Void/Physical"/Circle72.png ${PN}.png
-	make_desktop_entry ${PN}
+	insinto /opt/${PN}
+	doins -r .
 
-	fperms +x "${MYGAMEDIR}"/NightSkyHD$(usex amd64 "_64" "")
-}
+	newicon "World/The Void/Physical"/Circle72.png ${PN}.png
+	make_desktop_entry ${PN} "NightSky HD"
 
-pkg_preinst() {
-	gnome2_icon_savelist
+	fperms +x /opt/${PN}/NightSkyHD$(usev amd64 _64)
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-
-	echo
-	elog "Saves and Settings are in ~/.nightsky/Settings"
-	echo
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Saves and Settings are in ~/.nightsky/Settings"
+	fi
 }
diff --git a/games-puzzle/numptyphysics/Manifest b/games-puzzle/numptyphysics/Manifest
index 0c3bd7a619ac..2f435d24e6ec 100644
--- a/games-puzzle/numptyphysics/Manifest
+++ b/games-puzzle/numptyphysics/Manifest
@@ -1,26 +1,6 @@
-AUX numptyphysics-0.3.5-gentoo.patch 365 BLAKE2B 1281844bb72c77ddadc9b42f46cb444da4153bab872973ecc845e77bc065d49b7be9024c0b9aaee458cc3cb1a63d6089e7f86552308c6ec5d9c1f0d74e422297 SHA512 7554f725d18d5a800ac47d6c51c585ee05554d32df31be2c911de51c9146059c9090e2de95cc4ebb2a76c24a745c1858e5716485f4a3f7dd97bd76c70164ee34
-DIST butelo.npz 7209 BLAKE2B bfcc1e56d0bde0762db0253ea85d669cbd06295f037357e21d6b192710db36b767cc7932030f37ab18f60d35c1232d32c0c8f2af7a06f5911764acdfa14fc0a7 SHA512 a1f6ce15c0a921969a0e6c96d2e354aa666e760275a86d45b85db833731273e16ac9cdb4975beca71c1abcfe5dd64a0181f74bbc3e3aba1c2bb541c3bbe80090
-DIST catalyst.npz 8778 BLAKE2B e36c1651306af2cf2f43d300f674a665fd13aace71244173537165ddf5cb91bb150fb4370d15ecea28f83a79678626e501874efad30be59928a214781a76080d SHA512 ad2c02721e1b2ded3621a5a5217f78ed1022a86472f4de030c9b3d258f0b7b580e953fc2d017519477cea4df1b482e61fca565a3d98d511e894805e6683e6830
-DIST christeck.npz 4868 BLAKE2B c3a3a9416bea3160cdd16a5184b1923e3daedf369f973d0160b4683ab9c41b297ffea6a1fed025c3e296eb620d99fc30eef8f3978d385dcad2f8647ead9e2036 SHA512 562ed1fe6caa026dcc897aa914c5cad648aa191127714c888f5d1fbf82bbac15477928e49e02a5ab8940a84a085afb6e282e04ac1478a0ace5449541137f89fc
-DIST dneary.npz 5041 BLAKE2B 6ee77c20808d4d4bef812ff5396ae33d4247978fbe1fdd19003ad5432929a94eafbe5ce987036f2d6723daf18cee5b109180785014ea88c9889ee46e99847b24 SHA512 94bf7238bda8c9ba4133bd4bb8f6c978bb06f42432a6854ba570466d3a4b780a737a2138702072fbb9d6b913307a52734b3747a255d3f611df8e8753751d1c55
-DIST gnuton.npz 3734 BLAKE2B cd3de0fa77202c275a0dcadc41e7d87ae412e7b24e9b4f74987f95fbfe053859d1eec322b219c31ce2998125b8a919bc33d01fdcdce8cdf82944f8268db61207 SHA512 f3c910ac426b8044400ff882c0f8e193a19d35d1de2f6a8b5729acb9cc2fe383b116f79854897d3162c9ce223df92c76981a676ffc83268716fb20d8fecca13c
-DIST gudger.npz 7101 BLAKE2B db05d8c733e247302dbc69811a4fa7f01981b3b8fa09259e4df8bb659a2417854ca96194accb9db8211ff4a1694c01b59db9f9b15bd66483c099ef40e6ed8c0c SHA512 507536e83ef99a135d187b54369e12ea585a0aaa354ee4e8cf50540ffcd9b12798f11807940ee487d759617379794d447ab06bc185cb1021d06cca51908f35aa
-DIST guile.npz 27182 BLAKE2B e1e679f7f1169c5fd018ca45a7abade20953fbc85b450a6bde288845ba9e015535b8c78e8ea4d15a82f7f814d67759a72f3367ee441a87349de9cb946140ddcd SHA512 62a98d028335ce0a2a78cec86ef0e9164d10d057f0d99e5c27352f604ca06c6f0634617517ffb5d4c2609859f4316367ce805669d70002058168d332dee2f81e
-DIST hurd.npz 7819 BLAKE2B 3c0154a3ac261bd813a355b02045f7bad497ec6839810bd66d834c1024a7639bdcf424f2eadea3f0ac9b37adc00e0d62075306bd7e4e90e4d264241d8b07c9be SHA512 5a7ce05af8c0cb8b63296a19827286bee46e41c876817cd4a190f8294be8c3c53fdfab63908c9d64b93c9e104d9b36f812fc3c3e05e47dcfdb7a47f9c0a15dab
-DIST ioan.npz 8672 BLAKE2B eff0e2affc5902817da94b2ea813968c093c0fc77943ad7220a2c96f77aea96bb4019cdd345d37d0a453970e0b4c388c668e4870743612473aa1d4b0b1b442d6 SHA512 aeb707ffa3a7fc64d1a401a9f1f2c59b5d031c4443e6b679cf534be0824493f54dc20e1ceb127352e7847ac403dc1971470b52369b0bb0933f0c8ade299961d4
-DIST jhoff80.npz 4612 BLAKE2B 167174fe7e7ed9a765964a4325ac7478d1f60b7e5ea22c55b082582c68395d7c7634fbcd2e7246f7dca35d34c836da781b539300dc5e131c7ca42179eea449d4 SHA512 4d060a35f18204509726db2f1cdfd8a69444bf10e784fcc32ce54a76aa541628903e5ce70d65a64b3ea079095cdc979475ff553e428bb321640d7a87e60f6384
-DIST leonet.npz 4885 BLAKE2B 94355b22e995ba91c2c57afa6572d5a669f600d7a21b890a11150c88145727914595d39fb2ee2a8c1d3f21320ed69b06991bf7db521ff68984fae04600b18487 SHA512 789cdde6313b7cc9e8616c7969d86ed44866baa9ae88befa605d7066ca8134f167aac9490afa3918305929dbbc0acaf46708e02be4353f98ebeb3dbe3b0eefa1
-DIST melvin.npz 18147 BLAKE2B 285580aa6561e4842aee385f349c77fc8bc05ffb645f623a3fd586ad9737e6248c6a742835c2d17eca4a467f3933b16fc9278315f4d04e98f07b0532762016bf SHA512 391a82b4c42cd2597dd06b299f15cf41302ec593658929d320b66caa69cd73e7cbe3128a18c811017c3b73c435a6f42b763c6e531c8fd193715bc41f85a6b5c2
-DIST noodleman.npz 46574 BLAKE2B 408ec52adc0b65965858e54c9b281e418cdfce46fd125d30736719fd181fc0a2543f5bb486868b949db740c4a08d07b3f8abf7f3525daff2348e2eb0d24d7080 SHA512 a088c2c86303985e7d8beec34809f09fcf8e510f7c2af2530620774d1f6579ac1e5ac73989b8e423079c1171a79c92a0cb6e6e01dca950fc519007c91b86ea82
-DIST numptyphysics-0.3.5.tar.gz 1647220 BLAKE2B 90a82f05b7a725a88ddf40b7369341319ce999f6a167a1c817e53614a9cc57bbd15d4ea6a251e5d389c4e9516d319ccee046bbb5a78606be4263ffd5223372e6 SHA512 d80eb929fc5af7b4a241169e833858f1436ec86818f6c6d8d9280254a4c5f113ec9123adda319b22410a4ac259732e95ca1af057b542bc3e9d6b784668435fd0
-DIST papky.npz 2075 BLAKE2B f638dfae861027a7c89fdfdb305b273cc07aef26ae16e1e2b11bac467d0b13a663d700ca0c6aa1c3630c0b20eb453c27c87b700182e701754f25b0be3b3c16e5 SHA512 69733167ef00f64c19e4f8805e1a881332698e26950f996fc5d41e9e5580f5578b2b9d3f9781bacc9293519e139b7d531891b91f36c45031ac06da6e8e78fbfa
-DIST perli.npz 15452 BLAKE2B 9c57af22a31eead27a3e48605c362a4018a3bc9e6227ac1e9e813a9ca2f8c3e2f771d6bbfc7fe1f7415989a14852105802ea054d12ddb5c6ce2697b47dadec03 SHA512 cee513ed0e728334f0e60571e38dc68e476681bad8a22497ac01f790c6975bbffba727ede054bfc6f594f289c9bf6346c3e9b3537145707c3ed6f4d6c21136c8
-DIST qole.npz 6533 BLAKE2B 35b24ea2a5462c079099ed511abbca8abf6e7362646574726027187166cac817509ff6c1bce3ef0e57d5e086adf9585edf9e00421a0a4954e755a8b056f718da SHA512 dc624c5ffdcb0f9f18c20db7a08d7e9d9d4fa5314e3fabfa730e21bb0a27d4b415432ec66eab64d8252c7fe4793a2cff231e856ca06d85c61558a867bf2fb03b
-DIST siminz.npz 187396 BLAKE2B b7374c44aecf78ed6bf5347ff76b4cab142e2375504e48d86ebee4d6c193ebd46c337027d845a596048385c1d66edf2484e496cc6363f966275c267957dccdb9 SHA512 cedf3d90bc93adb2dac45ea69a8f87965002810527ce35122c5b1bcf1bf07fa1de9230f33bb84e542eeb0b4235216eb633d8a79cef1db34e24f8fff25f846758
-DIST szymanowski.npz 2577 BLAKE2B 827b5e15d6c1d6003d311cdf58b02b70a0986ab3232d196089f9838049cec4da1441f5e6fec2ea357820aa5e666124008b4c369f0102660c707aefb32ba9014a SHA512 b87be9d66cb3025a6168855fa473377609268c7d5fd6dbe53df7fc6156bc58dbb2d35c7e7a5d6caf88bbd92eb08ae2ac5b5d06dce6da9858e1ff1fa3553d3228
-DIST therealbubba.npz 6684 BLAKE2B debdb3a6788425726101a5368d27ade150edd1c0badcbf19903c6e9ae688adfce51c17ce276dd7c477d4d816526fe33541b34d0398563bfd0be6da5ded928c0a SHA512 c71a84345f0c6e0cde87e76b3084d89b2222d33b512458efd98d91c099b54e817b8421ea70001de6e5556c0e28be1c9fc1c19ad1411dd1b2bf194f987cdbdec6
-DIST werre.npz 7739 BLAKE2B 09f6ebfa4ffb3cc39149b39ce70940ba0437fbfd8e6ec1c905096c0d8093874d4caa7bde92b90ab4100472339b068218f75d1b64425d06f6910d1f32c39e0f90 SHA512 1caac7964cc51c6300648fa6be21f7ac3c0d585288ea2e18e725f5575a732b461b77bfd0ddf3118f5d4c922f16a30466e168bb38e81498291214597fd4442bcd
-DIST zeez.npz 8633 BLAKE2B 758382345615f942a095399e15faf8ed98e467e4454e0cc156b55d38f1cf994a23cf4bbe7895b3a276da7516758ea7bc0e7983595f77a784eca078b347590b36 SHA512 8f1945d79dc43e0bc6e2b814640d1587fc38bf8ca19f6b949821d3095eb22e9837a3f82433e452ce851b97e29d90440045866dfc6a28f9f5b31ffcf35f467e41
-EBUILD numptyphysics-0.3.5.ebuild 2296 BLAKE2B edaab618325ae81d97dac53e662acdc165dbb88121f5c23013ba308b0dba76451a7fc994d6a409374c26db820849e899bde332aa15b812d14ae73bb6a4506e4d SHA512 a66230e1c25bc2d6c84b4b8c00625c718e4f2b38d97b13cc349dad45ce9a64912efae53eb975ab04182329842698846be7cb8671ac50289c4e9c361a0ed948d2
-EBUILD numptyphysics-9999.ebuild 2263 BLAKE2B 89b943d77c93c4208dc4adc16a6feae0a317dd7dadc26aaecc40a45ed36da94ab73b13800c7795a049a34d32b3df04f1d6b57ea519d23bf2d76ed6d3ceff7284 SHA512 98f0af5e679eb7d295f22d40cf010dc64e4e5e4a7651edb5b3b976443d92730a4bc15d07bd8db0630a6f73f702cea804063e9fa56dbd75fcc7f88c0cb4511319
-MISC metadata.xml 339 BLAKE2B 9e41c9460f243a37e945b14949cd7b4d46cde5ac5df468fddb8d3752d47cc19583d1a63d8b6287952f15bdf4cdc24e8bebb328ff0f37b895719f27805dc2d470 SHA512 a007e8ee484f70548c0348d35bf1c616da363968370ccdf30693eacef552d552e7b839e8d32d81aec1c452aeb184f3cc2af79992c2f0cd73c1fdcc010f13d29f
+AUX numptyphysics-0.3.8-empty-tr.patch 416 BLAKE2B 01248bb0b2dffcb230d4e83ffb6eeb1374c152051dc611ee390a2b7e8b61b7869494fe1b2fa7d2707696b6feaf8082ca00d517680565a538a438c2a0359af01e SHA512 6970c8fc464c83fb9a2601778b6d06bda1783f8fb2ea28c6ebc3c997dabcd2ece19fbbc6ef851f9c904c7f117ac55166e102ef66f736006091a50a71b8bfc9e6
+AUX numptyphysics-0.3.8-respect-flags.patch 1113 BLAKE2B 143d7ae1d83b556b1dbd2ec2385fa696578f25395d790163c1beeb5600260c842e01db88e2a1f9ccc1523328ecae520f4df5bb7c3ff6581f7f63ddb84638f884 SHA512 2d5e5997f1e52c9fe6b73e6889e8068791d918d20d9a1c6db127793ef3d0e718625b334ec4afdf700e91577c9e979ec60ed6e7874b53064fe51159646092200c
+DIST numptyphysics-0.3.8.tar.gz 1647661 BLAKE2B 07cd5fa77e48517bf7cd2b11d8bcd4a0878cf02860f4165d29a562191e529babcf9637b293d3670bd37f8dfb9db4423546f6eede405fa0ecf97187e0f408dbae SHA512 6f5c7783e9e09efda19ff00d369dca76e0dc8f574b1e8c9268459accf83e48a29f7caec7a4ec3a28da4fac3007d2137f0bf5426494118927cd7b944646c7c24e
+EBUILD numptyphysics-0.3.8.ebuild 867 BLAKE2B 2b7e54d4563c26fde932843b753018a44f3ba846bc572117052007642038e0f7d438ac93ec5efcd60c6a4861b620423eb37068d2a6df7c4cb412d3b137266114 SHA512 3968e341c7e1a5dfe385db9bd1ad35174b09f7b6767e01280cf3f944bbbe075b9ab92b05d2944c10efa06913c0c2f64ef25382b776847f02ece622cdd8f021bb
+EBUILD numptyphysics-9999.ebuild 881 BLAKE2B 0462044fbb3aadb9e004f69175c096eee05edaba49c6f6c2fd624bd67bfafd98b8380eab2b415a06b6cbd9de02b09a85f71222ed2a5f32391993e393ec4387ba SHA512 66a5edca4444c3da2f4849cebbe61d20d93ad04a74a54658b54e872a313382382e0bf33d52776e304ace4c9db1645b28ae5cdb3855b24bab8040a0797957486f
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
deleted file mode 100644
index 9a739ed5227c..000000000000
--- a/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/makefile b/makefile
-index 8125a48..0ee4942 100644
---- a/makefile
-+++ b/makefile
-@@ -37,7 +37,7 @@ $(OBJECTS): $(GENERATED_HEADERS)
- 
- $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
- 	$(SILENTMSG) "\tLD\t$@\n"
--	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
-+	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
- 
- clean: $(ADDITIONAL_CLEAN_TARGETS)
- 	$(SILENTMSG) "\tCLEAN\n"
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-empty-tr.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-empty-tr.patch
new file mode 100644
index 000000000000..847092190d35
--- /dev/null
+++ b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-empty-tr.patch
@@ -0,0 +1,10 @@
+On unrecognized LC_MESSAGES (e.g. C.utf8) the .empty() check
+fails and loads empty translations leading to constant:
+[ 1536ms] [I18n.cpp:34 WARNING] Untranslated: 'Gameplay paused'
+--- a/src/Os.cpp
++++ b/src/Os.cpp
+@@ -279,3 +279,3 @@
+         auto fn = thp::format("i18n/%s", lang);
+-        if (!Config::readFile(fn).empty()) {
++        if (!access(Config::findFile(fn).c_str(),F_OK)) {
+             Tr::load(fn);
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-respect-flags.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-respect-flags.patch
new file mode 100644
index 000000000000..09b54e6ac739
--- /dev/null
+++ b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-respect-flags.patch
@@ -0,0 +1,30 @@
+diff '--color=auto' -NarU 2 a/external/Box2D/Source/Makefile b/external/Box2D/Source/Makefile
+--- a/external/Box2D/Source/Makefile	2021-06-18 07:19:06.000000000 -0400
++++ b/external/Box2D/Source/Makefile	2021-07-16 17:01:57.254825075 -0400
+@@ -7,5 +7,5 @@
+ endif

+ 

+-CXXFLAGS=	-g -O2

++CXXFLAGS ?=	-g -O2

+ 

+ SOURCES = \

+diff '--color=auto' -NarU 2 a/makefile b/makefile
+--- a/makefile	2021-06-18 07:19:06.000000000 -0400
++++ b/makefile	2021-07-16 17:00:51.421009113 -0400
+@@ -38,5 +38,5 @@
+ $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
+ 	$(SILENTMSG) "\tLD\t$@\n"
+-	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
++	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
+ 
+ clean: $(ADDITIONAL_CLEAN_TARGETS)
+diff '--color=auto' -NarU 2 a/mk/pkgs.mk b/mk/pkgs.mk
+--- a/mk/pkgs.mk	2021-06-18 07:19:06.000000000 -0400
++++ b/mk/pkgs.mk	2021-07-16 17:10:28.636268435 -0400
+@@ -1,4 +1,4 @@
+ ifneq ($(PKGS),)
+-CXXFLAGS += $(shell $(CROSS_COMPILE)pkg-config --cflags $(PKGS))
+-LIBS += $(shell $(CROSS_COMPILE)pkg-config --libs $(PKGS))
++CXXFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKGS))
++LIBS += $(shell $(PKG_CONFIG) --libs $(PKGS))
+ endif
diff --git a/games-puzzle/numptyphysics/metadata.xml b/games-puzzle/numptyphysics/metadata.xml
index dc8c227d5260..26079e608bed 100644
--- a/games-puzzle/numptyphysics/metadata.xml
+++ b/games-puzzle/numptyphysics/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="user-levels">Install some fun user-created levels</flag>
-	</use>
 </pkgmetadata>
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild b/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild
deleted file mode 100644
index aed95f6655cd..000000000000
--- a/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils toolchain-funcs
-
-DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
-HOMEPAGE="https://github.com/thp/numptyphysics"
-
-# This is only the SRC_URI for the user levels. The code is in git repo.
-SRC_URI="user-levels? (
-	https://github.com/thp/numptyphysics/archive/${PV}.tar.gz -> ${P}.tar.gz
-	http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
-	http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz
-	http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz
-	http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz
-	http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz
-	http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz
-	http://numptyphysics.garage.maemo.org/levels/guile/guile.npz
-	http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz
-	http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz
-	http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz
-	http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz
-	http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz
-	http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz
-	http://numptyphysics.garage.maemo.org/levels/papky/papky.npz
-	http://numptyphysics.garage.maemo.org/levels/perli/perli.npz
-	http://numptyphysics.garage.maemo.org/levels/qole/qole.npz
-	http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz
-	http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz
-	http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz
-	http://numptyphysics.garage.maemo.org/levels/werre/werre.npz
-	http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
-)"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+user-levels"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libsdl2[opengl,video]
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-ttf
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.5-gentoo.patch
-)
-
-src_compile() {
-	tc-export CC CXX
-	emake
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.3.8.ebuild b/games-puzzle/numptyphysics/numptyphysics-0.3.8.ebuild
new file mode 100644
index 000000000000..9ff5318033cc
--- /dev/null
+++ b/games-puzzle/numptyphysics/numptyphysics-0.3.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg
+
+DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
+HOMEPAGE="https://github.com/thp/numptyphysics"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thp/numptyphysics.git"
+else
+	SRC_URI="https://github.com/thp/numptyphysics/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD GPL-3+ ZLIB"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libsdl2[opengl,video]
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-ttf
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-empty-tr.patch
+	"${FILESDIR}"/${P}-respect-flags.patch
+)
+
+src_compile() {
+	tc-export AR CC CXX PKG_CONFIG RANLIB
+
+	emake V=1
+}
diff --git a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
index e9ab6b1a7e7d..738b4f617637 100644
--- a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
+++ b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
@@ -3,67 +3,38 @@
 
 EAPI=7
 
-inherit git-r3 gnome2-utils toolchain-funcs
+inherit toolchain-funcs xdg
 
 DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
 HOMEPAGE="https://github.com/thp/numptyphysics"
-EGIT_REPO_URI="https://github.com/thp/numptyphysics"
-# This is only the SRC_URI for the user levels. The code is in git repo.
-SRC_URI="user-levels? (
-	http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
-	http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz
-	http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz
-	http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz
-	http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz
-	http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz
-	http://numptyphysics.garage.maemo.org/levels/guile/guile.npz
-	http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz
-	http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz
-	http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz
-	http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz
-	http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz
-	http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz
-	http://numptyphysics.garage.maemo.org/levels/papky/papky.npz
-	http://numptyphysics.garage.maemo.org/levels/perli/perli.npz
-	http://numptyphysics.garage.maemo.org/levels/qole/qole.npz
-	http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz
-	http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz
-	http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz
-	http://numptyphysics.garage.maemo.org/levels/werre/werre.npz
-	http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
-)"
 
-LICENSE="GPL-3+"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thp/numptyphysics.git"
+else
+	SRC_URI="https://github.com/thp/numptyphysics/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD GPL-3+ ZLIB"
 SLOT="0"
-IUSE="+user-levels"
 
 RDEPEND="
 	dev-libs/glib:2
 	media-libs/libsdl2[opengl,video]
 	media-libs/sdl2-image[png]
 	media-libs/sdl2-ttf
-	virtual/opengl
-"
+	virtual/opengl"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.5-gentoo.patch
+	"${FILESDIR}"/${PN}-0.3.8-empty-tr.patch
+	"${FILESDIR}"/${PN}-0.3.8-respect-flags.patch
 )
 
 src_compile() {
-	tc-export CC CXX
-	emake
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
+	tc-export AR CC CXX PKG_CONFIG RANLIB
 
-pkg_postrm() {
-	gnome2_icon_cache_update
+	emake V=1
 }
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
index 8d5f48efe9d4..01792c835847 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -1,5 +1,4 @@
-AUX picpuz-2.5-build.patch 5466 BLAKE2B c99edcd74cfdd606f10b8b579ab9daf718e43618a331251c5fbecd0e4166cc959e4eead0bc6a292c875b73126cb4602cf5f23fec75bdcbfe4c61d3d44cc00f8d SHA512 5029124dfc9ed9a338cbe8899831dff38bea28b44cee612bfc95cd1ea434a4f942d53a832a4769229e7f31244a278d6ceae27e499108d4fe3b9e7c7e3a518622
-AUX picpuz-2.5-pthread-underlinking.patch 785 BLAKE2B 6b25d10b1c545a96965667032fa0c39b892b634e069d13079c8993f3b0a3ba1e7d0c7ccf74ac40dd10aa3663f2d06fe017d8f6b7cb3241d5d7b16a0244699999 SHA512 d2dfc2c44599bd125124709f6ecbc24b02c24cf8d3129a54d5f4ad434044689953606e062c784ba8200f40bec3175d8fa8f4d1e3643a925884374ccca394c424
+AUX picpuz-2.5-docdir.patch 222 BLAKE2B 8cfb90707508dd9af8186ba42033948d64829eb7336d90856ef7c61bfe5bb71d73faa39a36be181cebfa3295bdc02560be880410827498eb1fe5ee9c7422df2e SHA512 6eba6a2c251191d69325660e2e40e6ed89aad928f317faf9e131430098bb49987129fda3b5d8e0a1d2e24f68705f4ec6af238049d7c6fab26beef1210b636984
 DIST picpuz-2.5.tar.gz 267452 BLAKE2B c99126cb38611ad2e7013f0108631d6d5c7a51add0927be3fe45c6225a03db655770b05cc47626d5fe80680530527dcd5acc39495be7666fe9ec6959a2e5f0ca SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386
-EBUILD picpuz-2.5-r1.ebuild 1081 BLAKE2B 198d039674871dcbb37bdf217b9b3a45711d29b169c7de3667c561a09a141505b90f151ec53b16c47104beededba8b53da85056402f09195e86b0f0e28df1754 SHA512 aeb931c5a26d595cb475af3293cd4651e869ddf6e65982a6a840e32de23a9359a1985363be1fa8fce28ef87da4f6ea01851c3661ef7f074a7f0df047a2d256c0
+EBUILD picpuz-2.5-r1.ebuild 1003 BLAKE2B 60199194c8b817bcf38b0717ee07f90e9baa7bfc65d6433b3b46fd7bb5b3b429186df18f5c7c3b26191d64e4cde84434e86f7874e3307d38561fcb1d32d55143 SHA512 cf10163d9da81e5b3443719cc38dc1e93e94fcd60d0557fcf35bbfe617292f1b1a58c2a29dc4f1c4a95870382e8d1b8d7436e51bc2a7877541c2b0873e249b40
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
deleted file mode 100644
index 6ca26e178bbf..000000000000
--- a/games-puzzle/picpuz/files/picpuz-2.5-build.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Jul 21 17:03:11 UTC 2012
-
---- a/Makefile
-+++ b/Makefile
-@@ -11,24 +11,26 @@
- 
- # target install directories
- BINDIR = $(PREFIX)/bin
--SHAREDIR = $(PREFIX)/share/$(PROGRAM)
--ICONDIR = $(SHAREDIR)/icons
--LOCALESDIR = $(SHAREDIR)/locales
-+DATADIR = $(PREFIX)/share/$(PROGRAM)
-+ICONDIR = $(DATADIR)/icons
-+LOCALESDIR = $(DATADIR)/locales
- DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
- MANDIR = $(PREFIX)/share/man/man1
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
- 
--CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
-+CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
- LIBS = `pkg-config --libs gtk+-3.0`
- 
- $(PROGRAM): $(PROGRAM).o zfuncs.o
--	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
-+	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
- 
- $(PROGRAM).o: $(SOURCE)
--	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)
-+	$(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
-+		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
- 
- zfuncs.o: zfuncs.cc
--	$(CXX) $(CFLAGS) zfuncs.cc -D PREFIX=\"$(PREFIX)\"
-+	$(CXX) $(CXXFLAGS) zfuncs.cc \
-+		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
- 
- install: $(PROGRAM)
- 	mkdir -p  $(DESTDIR)$(BINDIR)
-@@ -52,7 +54,7 @@
- 
- uninstall:
- 	rm -f  $(DESTDIR)$(BINDIR)/$(PROGRAM)
--	rm -R -f  $(DESTDIR)$(SHAREDIR)
-+	rm -R -f  $(DESTDIR)$(DATADIR)
- 	rm -R -f  $(DESTDIR)$(DOCDIR)
- 	rm -f  $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz
- 	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
---- a/zfuncs.cc
-+++ b/zfuncs.cc
-@@ -3111,7 +3111,6 @@
-          /prefix/share/appname/locales/         translations: appname-de.po  etc.
-          /home/user/.appname/                   parameters etc. are copied here
- 
--   zprefix        install location              has /bin and /share subtrees
-    zdatadir       installed data files          .desktop, parameters, etc.
-    zdocdir        user documentation            README, changelog, user guide
-    zicondir       icons                         icon files .png
-@@ -3123,7 +3122,7 @@
- namespace zfuncs
- {
-    char        zappname[20];
--   char        zprefix[200], zdatadir[200], zdocdir[200];                  //  app directories
-+   char        zdatadir[200], zdocdir[200];                                //  app directories
-    char        zicondir[200], zlocalesdir[200], zuserdir[200];
-    char        zlang[8] = "en";                                            //  "lc" or "lc_RC"
-    char        JPGquality[4] = "85";                                       //  JPG file save quality
-@@ -3132,7 +3131,6 @@
-    pthread_t   tid_main = 0;                                               //  main thread ID               v.4.8
- }
- 
--cchar * get_zprefix() { return zfuncs::zprefix; }                          //  /usr or /home/<userid>
- cchar * get_zuserdir() { return zfuncs::zuserdir; }                        //  /home/user/.appname
- cchar * get_zdatadir() { return zfuncs::zdatadir; }                        //  parameters, icons
- cchar * get_zdocdir()  { return zfuncs::zdocdir;  }                        //  documentation files
-@@ -3156,19 +3154,15 @@
-    
-    catch_signals();                                                        //  catch segfault, do backtrace
-    
--   strcpy(zappname,appname);                                               //  save app name
--   
--   #ifndef PREFIX                                                          //  install location                v.4.7
--      #define PREFIX "/usr"
--   #endif
--   
--   strncpy0(work,PREFIX,199);                                              //  /usr or /home/<userid>          v.4.6
--   strcpy(zprefix,work);                                                   //  /prefix
--   strncatv(zdatadir,199,work,"/share/",zappname,"/data",null);            //  /prefix/share/appname/data
--   strncatv(zicondir,199,work,"/share/",zappname,"/icons",null);           //  /prefix/share/appname/icons
--   strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /prefix/share/appname/locales
--   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /prefix/share/doc/appname
--   
-+   strcpy(zappname,appname);
-+
-+   strcpy(zdatadir,DATADIR);                                               //  macros from build script
-+   strcpy(zdocdir,DOCDIR);
-+   strcpy(zicondir,zdatadir);
-+   strcat(zicondir,"/icons");
-+   strcpy(zlocalesdir,zdatadir);
-+   strcat(zlocalesdir,"/locales");
-+
-    snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname);                //  /home/user/.appname/            v.4.3
-    err = stat(zuserdir,&statdat);                                          //  does it exist already?
-    if (err) {
-@@ -3366,9 +3360,9 @@
-    fputs(work,fid);
-    fputs("Type=Application\n",fid);                                        //  Type=Application
-    fputs("Terminal=false\n",fid);                                          //  Terminal=false
--   snprintf(work,199,"Exec=%s/bin/%s\n",zprefix,command);                  //  Exec=/usr/bin/appname -options
-+   snprintf(work,199,"Exec=%s/%s\n",BINDIR,zappname);                  //  Exec=/usr/bin/appname -options
-    fputs(work,fid);
--   snprintf(work,199,"Icon=%s/%s.png\n",zicondir,appname);                 //  Icon=/usr/share/appname/icons/appname.png
-+   snprintf(work,199,"Icon=%s/icons/%s.png\n",DATADIR,zappname);                 //  Icon=/usr/share/appname/icons/appname.png
-    fputs(work,fid);
-    fclose(fid);
- 
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch b/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch
new file mode 100644
index 000000000000..d627d826e56e
--- /dev/null
+++ b/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch
@@ -0,0 +1,7 @@
+Simplify opening the html guide with right path.
+--- a/zfuncs.cc
++++ b/zfuncs.cc
+@@ -3222,2 +3222,3 @@
+    using namespace zfuncs;
++   showz_html("file://" PREFIX "/share/doc/" DOCDIR "/html/userguide-en.html"); return;
+ 
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
deleted file mode 100644
index f11f95cbf72b..000000000000
--- a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix underlinking on recent binutils:
-
-> x86_64-pc-linux-gnu-g++ -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu picpuz.o zfuncs.o `pkg-config --libs gtk+-3.0` -o picpuz
-> /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../x86_64-pc-linux-gnu/bin/ld: zfuncs.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5'
-> /lib64/libpthread.so.0: error adding symbols: DSO missing from command line
---- a/Makefile
-+++ b/Makefile
-@@ -19,7 +19,7 @@ MANDIR = $(PREFIX)/share/man/man1
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
- 
- CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
--LIBS = `pkg-config --libs gtk+-3.0`
-+LIBS = -pthread `${PKG_CONFIG} --libs gtk+-3.0`
- 
- $(PROGRAM): $(PROGRAM).o zfuncs.o
- 	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
diff --git a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
index 2b1863eb8bbe..92a9c069b79a 100644
--- a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
+++ b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
@@ -1,60 +1,48 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit desktop gnome2-utils toolchain-funcs
+inherit desktop flag-o-matic toolchain-funcs
 
-DESCRIPTION="A jigsaw puzzle program"
-HOMEPAGE="http://kornelix.squarespace.com/picpuz/"
-SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
+DESCRIPTION="Jigsaw puzzle program"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-pthread-underlinking.patch
+	"${FILESDIR}"/${P}-docdir.patch
 )
 
 src_compile() {
-	tc-export CXX PKG_CONFIG
+	tc-export CXX
 
-	emake \
-		BINDIR="/usr/bin" \
-		DATADIR=/usr/share/${PN} \
-		DOCDIR=/usr/share/doc/${PF}/html
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-3.0) -DDOCDIR="'\"${PF}\"'"
+	append-ldflags -pthread
+	append-libs $($(tc-getPKG_CONFIG) --libs gtk+-3.0)
+
+	emake PREFIX="${EPREFIX}/usr" CFLAGS="${CXXFLAGS} ${CPPFLAGS} -c" LIBS="${LIBS}"
 }
 
 src_install() {
 	dobin ${PN}
+	newman doc/${PN}.man ${PN}.1
 
 	insinto /usr/share/${PN}
 	doins -r icons locales
 
-	doicon -s 48 icons/${PN}.png
-	make_desktop_entry ${PN} Picpuz
-
-	HTML_DOCS="doc/userguide-en.html doc/images" einstalldocs
+	dodoc doc/{README,changelog,translations}
 
-	dodoc doc/{changelog,README,translations}
-	newman doc/${PN}.man ${PN}.1
-}
+	docinto html
+	dodoc -r doc/{images,userguide-en.html}
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	doicon icons/${PN}.png
+	make_desktop_entry ${PN} Picpuz
 }
diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest
index dbc9cc26265d..c28459d74b24 100644
--- a/games-puzzle/xlogical/Manifest
+++ b/games-puzzle/xlogical/Manifest
@@ -1,6 +1,6 @@
-AUX xlogical-1.0.7-gcc41.patch 833 BLAKE2B 6a43b04affe9cc4cd9456d52b369636b68276e86a31644edec85aefb2771d6fed90108da86f2f9759329c77a53e2176979fad353c929ad7f99e30bfa5ba10f27 SHA512 aeb239382a019a7fd186030543231c29b260af3faeeda67da72a56b8a778ba5f70b16b6e1dbd3c04c1251816b91aae9c23d39dc877fd63e7ae7032431c02533d
-AUX xlogical-1.0.7-gcc43.patch 935 BLAKE2B cea7455abc9c6c953c179984b43b124157320c7dc3e5b891940811bc5b3732acb592b914e64bedb2a93f8bce73f381cfecd8eb927bf2b88d18ea2dc698085fa2 SHA512 4a1c4e259cc798a5debe917ea4981f36f04d073ce33ed317008318a891fa5d68938e4b63e8c3166f31132251f2ed2696e46eb0799afbd808eace68c2895c0f96
-DIST xlogical-1.0-7.tar.bz2 1853575 BLAKE2B 6f78f92a14313cf65f171b99c28a4377f7685bf73705a91b92fcf370ad1f3555b7aefe99e6004aa32c62cf8b71f2d754d64acadf3bda345cc8cf3e3f91647d02 SHA512 b47aadff91a7d3057fe8657bdda5c16a910f84f6d324bee82f1beba55de7faf6a599231c8d53ed68cc30f9edfe18f57f31dfc9fe06b8e03fa6120905f37c290d
-DIST xlogical_gfx.zip 347801 BLAKE2B b9c2f963e8ddc5af9fcd7adac691a71c6ee12bc3b3164ce243d076f85c36044b4aa523d27c5dd1480388ff97356ddabd3c7f2c4d223aeeff1a8660fc7c595995 SHA512 14322ae1c8fb7f50513ef47e05372c5dc1ec1b658b33c53477e6b05bbee1de0250b21127891f205d16adc386e7ce37c4b834a62794ee105754b97e49eb5d2a42
-EBUILD xlogical-1.0.7-r1.ebuild 1644 BLAKE2B 8e43a6cea8ade6ade4ee77a612e9df5c88856e69a4861833dad50ce9c1c3f0283841be9e3a83b711101aed79c2ed17805f9cb1d0561f572105dee460767cf6f5 SHA512 9b9e27d903513c632542dd5dffd8bfc416ea319688999b7f47a8a571be7363e375737b79cdcd618bcaca1c46a9c247c4b1b898632b28b499f2c3d312880b030e
-MISC metadata.xml 554 BLAKE2B f7cc61f4cc79271b95e37334918f71934f91954f5a70d1601e817f6f134cd36117ed155b91a7929da537fcb7d423a627c1990c3c57f92a60fcbd6b3668329b8a SHA512 538cff1d408baf95b2d172490a3a038a8fd79edef5b8c1b64e3c495307b632870548dc0f33b6ed6bc77599d20e883a73a2c2d658b6ca85e131e404bc72e018ee
+AUX xlogical-1.0.8-gcc11.patch 270 BLAKE2B 05fce1cafbe6725fe0c17031dc07656047952c78062601130059f7b7ed47afd44ee959d5ba53feba215b6ad41feaed9c6cb865b89512994ce2d7471001e61375 SHA512 b4c0c3b8ae5032af69a0b6864d34393be4e948f797bed057635efc938d1187c0a927d968c428b820602bb1d5698708f4c12da039f78327b585d35059d1e88a5b
+AUX xlogical-1.0.8-gcc4.3.patch 628 BLAKE2B 283c6bc0ec032d4dddee928e41c9dd894e9ed96fb53aa653d1985ae7c654020e1fe510749444cb865ccd289813ee19bd03d555ecf4f2d081a038c5a329f6a2d0 SHA512 dab1685a0abfda4e17534327d46f89372132b4dc7be87873b23a9bfa41ebbab4868c46dff574deee6c5895722c05b6019547825b33ef76ccdc7dcd404c03e925
+DIST xlogical-1.0-8.tar.bz2 1789699 BLAKE2B 5d33cc7345c43a21bea8e899e36c87ccf57752f8b96aaa52b61a9042f6531adf6944dff9e57684a86a0f759a8e4e24253618fc2c2e3cdd3c70d20a9cb0a27398 SHA512 3cbba38c430b1f2a6786d1d6893249812e75941fd7ab336ca5d111ec526ef61bb7e09d5365dbcaae23f32a336d8ab840c0e343656054d252043c6c7962b39d18
+DIST xlogical.png 4477 BLAKE2B 276abddabc3b26c7b9a3322e34079073a517ae1c7477307ff3429739eb3a88f9cc23dc0e3c637cf0a7aed13c9cf5cf12b40cb8858eaa0c67246d5d1bf746dedf SHA512 761953cc61bf1cea1b0d306006b71cabee800c6ea74aae4ed31f2fcf2e5cb9fa672c6c226c5444ab6b0af858a54522dafe0a1eb0351bb0c9f359fa447d0fbfa0
+EBUILD xlogical-1.0.8.ebuild 1293 BLAKE2B 8c6542f285e8001cc21a4ced370e4e77d7f98cdd57e7bc444d8073a475e70f278877b986f24151a6f43289fae12039b0838745032644846e0b9fe00747d827e3 SHA512 9c710905c63dcddab00947dd4025feebf4bce4c7fa87bb49a21f602baf0ae45a71eb978a76a0b843227f2a6c45445cf93a18bb96957e4fe3ed62e382caf3a40c
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
deleted file mode 100644
index 5c77527dc598..000000000000
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/properties.h
-+++ b/properties.h
-@@ -33,9 +33,7 @@
- #include <map>
- #include <string>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- #include "defs.h"
- 
---- a/anim.h
-+++ b/anim.h
-@@ -27,9 +27,7 @@
- // Language Includes
- #include <list>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- // Application Includes
- #include "graph.h"
---- a/exception.h
-+++ b/exception.h
-@@ -27,10 +27,9 @@
- 
- // Language Includes
- #include <string>
-+#include <iostream>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- #define CatchEx(aEx)		catch( CXLException aEx )
- #define ThrowEx(aError)		throw CXLException(aError,__FILE__,__LINE__)
---- a/gamelogic.cpp
-+++ b/gamelogic.cpp
-@@ -154,7 +154,7 @@
- 		levelFile = NULL;
- 	}
- 
--	currentMap = NULL;
-+	currentMap = gameLevels.begin();
- 
- 	playerName = new char[32+1];
- 	strcpy( playerName, "nobody" );
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
deleted file mode 100644
index 594298c93d44..000000000000
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/gamelogic.cpp
-+++ b/gamelogic.cpp
-@@ -25,6 +25,7 @@
- #include<fstream>
- #include<cstdio>
- #include<cctype>
-+#include <cstdlib>
- 
- #ifndef WIN32
- #include<unistd.h>
---- a/levelmap.cpp
-+++ b/levelmap.cpp
-@@ -21,6 +21,7 @@
- ////////////////////////////////////////////////////////////////////////

- 

- // Language Includes

-+#include <cstdlib>
- #include <cstdio>

- #include <cctype>

- #include <cstring>

---- a/mapedit.cpp
-+++ b/mapedit.cpp
-@@ -26,6 +26,8 @@
- #include<cstdio>

- #include<list>

- #include<vector>

-+#include <cstdlib>
-+#include <cstring>
- 

- #ifndef WIN32

- #include<unistd.h>

---- a/modlist.cpp
-+++ b/modlist.cpp
-@@ -22,6 +22,7 @@
- 

- #include <iostream>

- #include <fstream>

-+#include <cstdlib>

- 

- #ifdef WIN32

- #include <afxwin.h>

---- a/tile_spinner.cpp
-+++ b/tile_spinner.cpp
-@@ -24,6 +24,7 @@
- 
- 
- // Application Includes
-+#include <cstdlib>
- #include "audio.h"
- #include "properties.h"
- #include "defs.h"
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch
new file mode 100644
index 000000000000..f225d41fea0e
--- /dev/null
+++ b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch
@@ -0,0 +1,12 @@
+--- a/sdl_audio.cpp
++++ b/sdl_audio.cpp
+@@ -60,3 +60,3 @@
+ 

+-	for( end=aPath+len; end >= 0; end-=1 )

++	for( end=aPath+len; end >= aPath; end-=1 )

+ 	{

+@@ -64,3 +64,3 @@
+ 	}

+-	for( start=end; start >= 0; start-=1 )

++	for( start=end; start >= aPath; start-=1 )

+ 	{

diff --git a/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch
new file mode 100644
index 000000000000..967754265f46
--- /dev/null
+++ b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch
@@ -0,0 +1,36 @@
+--- a/gamelogic.cpp
++++ b/gamelogic.cpp
+@@ -27,2 +27,3 @@
+ #include<cctype>
++#include<cstdlib>
+ 
+@@ -156,3 +157,3 @@
+ 
+-	currentMap = NULL;
++	currentMap = (list< class Clevel_map *>::iterator)NULL;
+ 
+--- a/levelmap.cpp
++++ b/levelmap.cpp
+@@ -28,2 +28,3 @@
+ #include <iostream>

++#include <cstdlib>

+ 

+--- a/mapedit.cpp
++++ b/mapedit.cpp
+@@ -28,2 +28,4 @@
+ #include<vector>

++#include<cstring>

++#include<cstdlib>

+ 

+--- a/modlist.cpp
++++ b/modlist.cpp
+@@ -24,2 +24,3 @@
+ #include <fstream>

++#include <cstdlib>

+ 

+--- a/tile_spinner.cpp
++++ b/tile_spinner.cpp
+@@ -25,2 +25,3 @@
+ 
++#include <cstdlib>
+ // Application Includes
diff --git a/games-puzzle/xlogical/metadata.xml b/games-puzzle/xlogical/metadata.xml
index e2b7cea129a5..26079e608bed 100644
--- a/games-puzzle/xlogical/metadata.xml
+++ b/games-puzzle/xlogical/metadata.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-<longdescription lang="en">
-XLogical is a puzzle game based on the Logical! game that was originally
-released by Rainbow Arts on the Commodore Amiga computer.
-</longdescription>
-  <use>
-    <flag name="alt_gfx">Use alternate graphics which are closer to the original Amiga version</flag>
-  </use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild b/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild
deleted file mode 100644
index 835489919edc..000000000000
--- a/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop edos2unix
-
-MY_PV=$(ver_rs 2 '-')
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="SDL logical clone"
-HOMEPAGE="https://changeling.ixionstudios.com/xlogical/"
-SRC_URI="https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
-	alt_gfx? ( https://changeling.ixionstudios.com/xlogical/downloads/${PN}_gfx.zip )"
-S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alt_gfx"
-
-DEPEND="
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-image[jpeg]
-	media-libs/sdl-mixer[mod]
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-BDEPEND="alt_gfx? ( app-arch/unzip )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc41.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-)
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-
-	if use alt_gfx ; then
-		cd "${S}"/images || die
-		unpack xlogical_gfx.zip
-	fi
-}
-
-src_prepare() {
-	sed -i '/^CXXFLAGS/d' Makefile.am || die
-
-	edos2unix properties.h anim.h exception.h
-
-	default
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# localstatedir is only used for the score file
-	# NOTE: Check on bumps!
-	econf --localstatedir="/var/games"
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto /usr/share/${PN}
-	doins -r ${PN}.{properties,levels} music sound images
-	find "${ED}" -name "Makefile*" -exec rm -f '{}' + || die
-
-	insinto /var/games/${PN}
-	doins ${PN}.scores
-
-	fowners root:gamestat /var/games/${PN}/${PN}.scores
-	fperms 660 /var/games/${PN}/${PN}.scores
-	fperms g+s /usr/bin/${PN}
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	make_desktop_entry ${PN} "Xlogical"
-}
diff --git a/games-puzzle/xlogical/xlogical-1.0.8.ebuild b/games-puzzle/xlogical/xlogical-1.0.8.ebuild
new file mode 100644
index 000000000000..d0cd804016ba
--- /dev/null
+++ b/games-puzzle/xlogical/xlogical-1.0.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+MY_P="${PN}-$(ver_rs 2 -)"
+
+DESCRIPTION="Puzzle game based on the Logical! game released on the Commodore Amiga"
+HOMEPAGE="https://changeling.ixionstudios.com/xlogical/"
+SRC_URI="
+	https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg]
+	media-libs/sdl-mixer[mod]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc4.3.patch
+	"${FILESDIR}"/${P}-gcc11.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "/^CXXFLAGS/d" \
+		-e "s|@localstatedir@/xlogical|${EPREFIX}/var/games|" \
+		-i Makefile.am || die
+
+	eautoreconf
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r ${PN}.{properties,levels} images music sound
+	find "${ED}" -name "Makefile*" -delete || die
+
+	insinto /var/games
+	doins ${PN}.scores
+
+	fowners :gamestat /usr/bin/${PN} /var/games/${PN}.scores
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/${PN}.scores
+
+	einstalldocs
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} "XLogical"
+}
diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest
index 4177bee11980..9ed783866c6a 100644
--- a/games-puzzle/xye/Manifest
+++ b/games-puzzle/xye/Manifest
@@ -1,6 +1,6 @@
 AUX xye-0.12.2-fix-buildsystem.patch 1020 BLAKE2B 6408b6df99db5ca103183a7cee8905f7cc1c851d7e2f00e60334b806517841eab0896028e0a178fcfdf42e0bd672a8594c47caae2ac629d915ceff9af883dab6 SHA512 d4b08db4eb5ee4b3e1e98e9faeda87aafe17ae444cb0a8400c9206c2871b56801040bddeffb13dfed0170094d48ffac593209b2ad69896f8993521d0b0929cf1
 AUX xye-0.12.2-fix-c++14.patch 502 BLAKE2B e3116515757af9e84d5bac340947df1e88e768058a3dfb65e0894388ad8e0fa98f63e6c16314e35b288fff8639d8f46972999c031e077d3417218c09bc9c00a7 SHA512 c9dcc309b5e451f1608174de4f6016d006879d2267627eebe8ff524af293137af90f4761c8eacbc5ebd9ee633cc7d087e23eb3e7c4970f5484e065dfa8dff3af
-AUX xye-0.12.2-fix-desktop-file.patch 414 BLAKE2B 3d4f87e6db2144407eaf5161d73184d23eabd4742dbc1f68e59d8932257491eb429d68d12d910ee311fdbafecd4c118a6ad9f9b3b225157384035868ced3ee48 SHA512 c798ed5da4e45b0a8d5aaa4dd77fe09d9cb08837a33b44a5c69f89e4d2456fb5964c4fc5646a83fd6166d315200924944ab6dd7eea3f983e4be403a8f14f8c9e
+AUX xye-0.12.2-fix-desktop-file.patch 424 BLAKE2B 9ab00bc1e2bc706556cb070e63e0c43090521ac8146bd5377834491c0b3c18374a21013a020a8664c46cd25fa48247e5d501a532ebb91d812a707c7fd9b1b0b1 SHA512 e94792912c0997226f2099057e5ad08fd0fbbd3bcb6a164ed0cab05c8d86337b381aac614dbfff6c36c0ca82af75011d8325ef63d343e6bb03fd7dfa8ee0f1fd
 DIST xye-0.12.2.tar.gz 2860290 BLAKE2B 426cd4afb84c0de8bdbafe9b63d0da2f686593449b4577ae0eb77e38364bcac166cb9bf4a3a41f7d15a0a1745bc9574f959e0429998c00ad78a6fe40c49093f1 SHA512 a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa
-EBUILD xye-0.12.2.ebuild 933 BLAKE2B b1057bf7efbf494560e061c1ff8c6340b6911405eedeee52cc6c238b06c59430bf1656c6f1ae022a60aa580af00a52e1061e732c3591c799ac22c922b0edce41 SHA512 c22d78ace9f2da94a7ca966b7b3b9579860b2e48f46d5c85ff787d10d1a7e773c9388453cbb56739692e824284e50ce5d77bae680ad6bb545ab06b5f2751af77
+EBUILD xye-0.12.2.ebuild 869 BLAKE2B d9411d4198db6f80168bbe7486e0586bb91f26d3c6d089e68e70f0dadce67348d9f059d56354ce551cf709e3e605c456ef13a16e192617fa365c1e40376d7479 SHA512 9bfa0eb75547299c53665ae0f29e33bde636f053e58a029427ba1defec2e557dc5012fca66e557bb76766d5651a09c5d09c2fa278e5b9c3067b7bd1145828fe1
 MISC metadata.xml 326 BLAKE2B 8f368cb2e89ca46600917931c95285943f8ededa8a3c1c6fe1602a11c68a00f53429be467d28a49cf9a0989cb6b6f0cfa70ded461f2b6f9adeb86e8c05a49e52 SHA512 05084d9dcce50a1d4302a83cb89abd67519143384ff6c1ca3f84e10db468483cf90e4d10c240dc58f47b10df747725c86514db303efaeca048d44a3085bb7fe6
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
index 99558ef28732..1f51bfb41336 100644
--- a/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
@@ -7,7 +7,7 @@ Fix .desktop file to comply with FDO specifications.
  Exec=xye
  Type=Application
 -Categories=Application;Game;PuzzleGame
-+Categories=Game
++Categories=Game;LogicGame
  Name=Xye
  GenericName=Xye
  Comment=Solve puzzles and action challenges in order to get all the gems in the room.
diff --git a/games-puzzle/xye/xye-0.12.2.ebuild b/games-puzzle/xye/xye-0.12.2.ebuild
index dd5d31b2b2a0..1dec87af8d3b 100644
--- a/games-puzzle/xye/xye-0.12.2.ebuild
+++ b/games-puzzle/xye/xye-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools xdg
+inherit autotools eapi8-dosym xdg
 
 DESCRIPTION="Free version of the classic game Kye"
 HOMEPAGE="http://xye.sourceforge.net/"
@@ -12,23 +12,23 @@ SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-fonts/dejavu
 	media-libs/libsdl[video]
-	media-libs/sdl-ttf
-	media-libs/sdl-image[png]"
+	media-libs/sdl-image[png]
+	media-libs/sdl-ttf"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.2-fix-buildsystem.patch
-	"${FILESDIR}"/${PN}-0.12.2-fix-c++14.patch
-	"${FILESDIR}"/${PN}-0.12.2-fix-desktop-file.patch
+	"${FILESDIR}"/${P}-fix-buildsystem.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
+	"${FILESDIR}"/${P}-fix-desktop-file.patch
 )
 
 src_prepare() {
 	default
+
 	mv configure.{in,ac} || die
 	eautoreconf
 }
@@ -37,6 +37,6 @@ src_install() {
 	default
 
 	# create symlinks for previously bundled fonts
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/res/DejaVuSans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/res/DejaVuSans-Bold.ttf
+	dosym8 -r /usr/share/{fonts/dejavu,${PN}/res}/DejaVuSans.ttf
+	dosym8 -r /usr/share/{fonts/dejavu,${PN}/res}/DejaVuSans-Bold.ttf
 }
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 2acbfd359f33..965dae04165b 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 466b9a136914..5b2436edc106 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,7 +1,7 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r2 2026 BLAKE2B ed212537e0a0d1a5e714aa0f4e72915ba3142580a1c1e46f9f88d06b8d8176de0bd5ab5134e915537583d20e4e3dbfba9e10ab1281bd84b8361f6ca01d1eab81 SHA512 8a6ab7277604cdc4677fde5d745e0c02a557538a4d73adc44873f49a01715eb878b48a56e51b6019aa814325543b509f8403cf351570d1b35ef1e07e98828c9c
 DIST bedrock-server-1.16.220.02.zip 54271561 BLAKE2B 41d1a082299220952960231bf40601043d81129bc168aec75c73eeb14707ae5c7d94498cbdf49a2bac73c700d06bd80c1e5245e49958702e8651239eb0f20f56 SHA512 caee2c9932157f2dd68fb8cd72a1442c95b36ad333762b84979ac8625a758a6c78d776787ac67a0b479c0918d008d288cfaee32a5a2ba426448f4cd4c64ed3a0
-DIST bedrock-server-1.17.1.01.zip 29789544 BLAKE2B 3d5f192777f4a0508f29271bd81c1ece9af32257168313d2d8b0a214db2233b0be21b4ec20538e4f8650a781688f32ab6dc604cf1a7c2915ef1b9c4dea8eec61 SHA512 6f32847ea6d0cb7d109a2fa2c7ab98049948a2f974d9ad00e45e2cad040e9787f2aff819a2922accad18d5d55b189ceefa82da144d9adb830a16112a78c28971
+DIST bedrock-server-1.17.10.04.zip 60012827 BLAKE2B 09e42d79f693525857a4bbe4aa51d2df0a467490cef21dbb8fb02ec79bf7346700eb80ef438b48bd29232000b439e9d84c06c8fb2da168483922cb294e428838 SHA512 102fa38e64dfbd97cbe151fcf5b9d2b1087f8cc4373e72da46f2b8d34d1926e7b0dfe5075834e317474087ef05187feb065e6c02262ea4b6710e4d584b2d5567
 EBUILD bedrock-server-1.16.220.02.ebuild 1106 BLAKE2B 822c69b602af4e9a4cde85ec38b4d72f37d0b098f028c57ea98ae526bc39f90113222fc9b822d8a6be6253f72c76b7660404fccf1d3ce0f23a4e18a15a5ef668 SHA512 c9931f05dff80337f5a17e0d8f47cb8a0b87dcc64f86b6e4c71b4cb04cd89234fd3ffa8b532b0815c066b6cdc769040ef2c6ac2372e86b6f8c78660d16b8a361
-EBUILD bedrock-server-1.17.1.01.ebuild 1107 BLAKE2B 48d4027f69f5fc30399321fd1da6a2f5242261ab0b8a93c353010d070bea23f13d49990e7b3d5d782a991f70b8fa3e67026bd4429ee69ed6879e1cceccbd0a89 SHA512 54463078e9018f69c99a6db453f20cc6ba6bf9b2bdea3fcdf01565e5db6efea22a105b565e1d3f3359d491e82f63f0fb79b933305125930a9a4eb4ab9e72634d
+EBUILD bedrock-server-1.17.10.04.ebuild 1107 BLAKE2B 48d4027f69f5fc30399321fd1da6a2f5242261ab0b8a93c353010d070bea23f13d49990e7b3d5d782a991f70b8fa3e67026bd4429ee69ed6879e1cceccbd0a89 SHA512 54463078e9018f69c99a6db453f20cc6ba6bf9b2bdea3fcdf01565e5db6efea22a105b565e1d3f3359d491e82f63f0fb79b933305125930a9a4eb4ab9e72634d
 MISC metadata.xml 675 BLAKE2B 3ec51700c778a9fc9aaf65c9d1a3eac6f55a7db55a24a63c6c1e3890a0e84ab0cf85eadb9b6044529841d87570a47e8674dfe94405587ee2a54f496aedbde374 SHA512 4c1236b575d84e2cb657477c446b0a09e150e19db654acc24ff5fa9e6ad5953c5b14901192845714476c8a3c894e6a32f570c17aedd68e244bd4d93d13fd92b5
diff --git a/games-server/bedrock-server/bedrock-server-1.17.1.01.ebuild b/games-server/bedrock-server/bedrock-server-1.17.10.04.ebuild
index 8b3bf146f776..8b3bf146f776 100644
--- a/games-server/bedrock-server/bedrock-server-1.17.1.01.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.17.10.04.ebuild
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 86eb434d31ff..d1ef6e54c93b 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -3,7 +3,7 @@ AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a8
 AUX minecraft-server.initd-r4 1996 BLAKE2B 34c4d6e41135224cf1b4bf96d93059897448a8646cb659ef63eb57cc45fbf9b766db5dce80aaad22062d4232eab1a55e2d6b2938aac0dae0fe6d8c897acc0b0f SHA512 fdc4cbc89852e2538f332911acec281e83f185534a996a83c5eb2094be7245a892b7a8139fb77a50b49abaf8e311bf629a21fee0f85906ecd87abce865740ae0
 AUX minecraft-server.service 530 BLAKE2B 37b68213b4f15199ef999aff45b0ff0b2b12c8485c75871fbd034b167c440640ad4542daaf73c99fa63152d7fcf086d26f7241622f186ed48a59fafce8f72671 SHA512 b33926d866ad73d108bf6cabb9981fc072ae899ac4284c7e3219a08f3d2cd01197f2325b7051b071cee6c238ea8f9fd37b3eba956367504079de1a2bc8b047de
 DIST minecraft-server-1.16.5.jar 37962360 BLAKE2B 355715b809c09581e457f54618bd6ddab91b1c488d709d402fa6690d32244298d44191d439b8d9f27f4853f7e7658bfa2db88b61697a1caeb66da76ab211d9f8 SHA512 8321c50d788c6a3a3e8b2146bf1b20f6a3da87dd21ec4bd1fda0031d26f728d64e56a6a230ba5d857f4d500d7ba281eb4e3c28b6715f29d8dcba79d8c0ddf03f
-DIST minecraft-server-1.17.jar 43621201 BLAKE2B f92b43e33e17e0cdada880e969ff05cdf79af7ff96c2e8043010bfff303ffad702fa9aa3cd8247e6092e64f4ba87562c458d95e38b26f7e52306fefbe5b2c30b SHA512 d8c7658f2fedeb0ce60be24935e5543135200feae53bcaec510fcb86b93a18ac3464527a4d657c886f5ecaca89f1a7701cb03d6656efcb5c19e2156e59feef5a
+DIST minecraft-server-1.17.1.jar 43626592 BLAKE2B f926c01890faf6904eb38ea14f1affddd32dbe992c4df9d125507325fa11ec98eeaa63622387a3608d89bbf2602a447efc8560a49b24ba517ed55bf2fd18fac9 SHA512 fe6e48e2cee38224d2c88f04c19afca9c21fddbe6077b5538e0a0581c2f6c4478ec99bc369bec5131d709b89273dbd769659f149163f0c284b518a38e58a5bcc
 EBUILD minecraft-server-1.16.5.ebuild 1196 BLAKE2B 44fd7ba3a5759606edfe7b472c32022530ad9e239cac79ad59adee6f6a59d909c8427cebef92d298e1ef503cca91f3042dbae4780d7cb1b7ff48a7f11887ce8b SHA512 71b5e27befa92108920bb7bed5148367a90126a1992bcfd73a01d47270572230668cc9948b550c7176e3fdf6963ecaffeaf58fdb399e2149c265416a708eea80
-EBUILD minecraft-server-1.17.ebuild 1198 BLAKE2B c89655b01c9c14817b929ecbef52a1f052af290265fc28b2a2e71f11b2fdf2b5e51184f29adef77f8a59e5371d07e47dc4ddd878f26e651af4968a41fc197593 SHA512 565f3f2f60625e2e73367624b79ab7ffa9d5e6274532691b17556dc17e5ec9e3abe298273614cbf99fa289e1c97f09e28be6f4a83affbb0a890143ef3c7b063d
+EBUILD minecraft-server-1.17.1.ebuild 1198 BLAKE2B cd9d4f424688f6e267c4a043df6440779b8fe52d0250f1de2801503b52c9b848d693cfbe756a032e4a923f4cd79df1f9560869fc4d3d362f3e2a54e9894a7d54 SHA512 375f89286e874f02f09c1378f576e4db40ee479f410a440cecdb9e7a99c06fec9bf11642fe62fdcdf9a9915863bac37008d8500eea2046a6a83f2f399bc2ca27
 MISC metadata.xml 934 BLAKE2B 96dae32908e92724e43b4fe1c75e8e861be515567de1866e7fb67c66aad9869ac8094c2537c0b852fe937b64e1a8f5276532c9377fe96401328aa2b70adbe462 SHA512 1930ef90ba19556269a83c934252712bedd92eb218f0773d9656a81bc447c88837dfa2a931da0f660c343fa85cb259e6997485e7e28810b0ece034481c99a784
diff --git a/games-server/minecraft-server/minecraft-server-1.17.1.ebuild b/games-server/minecraft-server/minecraft-server-1.17.1.ebuild
new file mode 100644
index 000000000000..3d1fcc0bad1e
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.17.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="a16d67e5807f57fc4e550299cf20226194497dc2"
+README_GENTOO_SUFFIX="-r1"
+
+inherit readme.gentoo-r1 java-pkg-2 systemd
+
+DESCRIPTION="The official server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	acct-group/minecraft
+	acct-user/minecraft
+	app-misc/dtach
+	|| (
+		>=virtual/jre-1.8
+		>=virtual/jdk-1.8
+	)
+"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
+	java-pkg_dolauncher minecraft-server --jar minecraft-server.jar --java_args "\${JAVA_OPTS}"
+
+	newinitd "${FILESDIR}"/minecraft-server.initd-r4 minecraft-server
+	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
+	systemd_newunit "${FILESDIR}"/minecraft-server.service minecraft-server@.service
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/games-server/minecraft-server/minecraft-server-1.17.ebuild b/games-server/minecraft-server/minecraft-server-1.17.ebuild
deleted file mode 100644
index 4eb5c360d41f..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.17.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2 systemd
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		>=virtual/jre-1.8
-		>=virtual/jdk-1.8
-	)
-"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-	java-pkg_dolauncher minecraft-server --jar minecraft-server.jar --java_args "\${JAVA_OPTS}"
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r4 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
-	systemd_newunit "${FILESDIR}"/minecraft-server.service minecraft-server@.service
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 2e8ec45808db..8a43ffd62464 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/war1gus/Manifest b/games-strategy/war1gus/Manifest
index 2448abbf46c8..a5cecfa3071f 100644
--- a/games-strategy/war1gus/Manifest
+++ b/games-strategy/war1gus/Manifest
@@ -1,7 +1,11 @@
 DIST war1gus-2.4.3.tar.gz 436938 BLAKE2B 662c3e2d16d4ca3225a50ec28ff6ae11f9c309a02c1b71e26a28155012395091dec7833a4f32a0ee6c19119a9c0aa2aa96cb465b06937da8efdd54b040189778 SHA512 909dc3375a00a4ff05eb287e6a1e3414b084f51cda37fe73ab4d728eb2d13e3e0e8612700a90e000d67a9ddffb115fe41554a4ad9db9f68e0b62cdbc0d025ae0
 DIST war1gus-3.0.0.tar.gz 446245 BLAKE2B f58d8fe8248cc7cc661a5c2dabef9b13410eb3530bb045c03c54abeea8028e26ada3bd98d50680165b3ce35b17a08acba2b953b8c896de990cdbb3acf59cd4ae SHA512 fad712945e939fededf202181523b34945ba58ded5b5ea8089709860b63ad9c9766eb926293e5195c14f0dc3b8531ac0ae4654ab6b6718068648f9efc0fb817c
 DIST war1gus-3.1.0.tar.gz 395576 BLAKE2B 3fe8341bac0811c86e8240a07500dc42972a275e6a0e3b1543246afa8e5ba86c7a56a3b49e1c7e7321067a5a66eeb5fe69b529650edfdcc14407d1062e47b1a9 SHA512 68a5f100f5973ab2666f4cd486914531587a27e13c2aef0d11b08c459bd43d5257a423a1648c86ace58b27b048eeca24afb23d09c07a6a32d32845bc49701a33
+DIST war1gus-3.1.1.tar.gz 395477 BLAKE2B 5e304e8e2982e971c479d41b52958bc143518008d3452903f4a4c2d40cf3ea355ac7391d5da3ff2fa3c27d89a45270e64ddb7ee161e4531df54866f3a498dc0b SHA512 3657a2ea21d01559edcc44cecd0090df058f90d1f783b3e5a885f41fc8f4104a5063db50d0c6d3055d1181330486c54d7d3cfc6c3a795a82bcc25dcf67cc3fb5
+DIST war1gus-3.1.2.tar.gz 397685 BLAKE2B fabcd74d0f8622eed5f7b1c77dcbee8bee0e47bf51c5873d2565cfe200e2e21f5bbb54699cc2afd9b457e998f88b259494a3ee7394f912d6ef159f69ba8777a5 SHA512 64a6c03645cb8f0b4b8fe963e554842988efa74273a58213f047eecd322dfc77d5b4951dd4f0cb5dbd27e0c0f83d825e7fc7fd0102b83c4dbc90bee65c3d8ba1
 EBUILD war1gus-2.4.3.ebuild 1496 BLAKE2B 88682061cccc413ed62d0916738dd40eb53f2635e58bddc11b40fdc621598a40017e64e17106a48b2188076009f57db216dbfec47c85f299568906890376503f SHA512 b7126069f9e42f13618552546d5bc9c6a407acef835271d9c3bc6842670b9ef856e87b9a2988f3aa9c0d8184a336773c1adcc097d9f3c3ffc31787cd628b9419
 EBUILD war1gus-3.0.0.ebuild 1496 BLAKE2B 88682061cccc413ed62d0916738dd40eb53f2635e58bddc11b40fdc621598a40017e64e17106a48b2188076009f57db216dbfec47c85f299568906890376503f SHA512 b7126069f9e42f13618552546d5bc9c6a407acef835271d9c3bc6842670b9ef856e87b9a2988f3aa9c0d8184a336773c1adcc097d9f3c3ffc31787cd628b9419
 EBUILD war1gus-3.1.0.ebuild 1495 BLAKE2B 10ab67d560010d6147c6e282fa338175cfac6a0123b0615cad5fc1fe8ae09247a9fa784d23ddf043bf595b4583a42ff0e182a338aa80dc43eac589d5aad2c583 SHA512 c8780c26dee696a286fb5370b53a92b90634442f2e9b4554189ab986e9e24fb98bd632a124fd702070e20f448499bbf7a624ad7e32192e06fd2d696e2015fb69
+EBUILD war1gus-3.1.1.ebuild 1495 BLAKE2B 10ab67d560010d6147c6e282fa338175cfac6a0123b0615cad5fc1fe8ae09247a9fa784d23ddf043bf595b4583a42ff0e182a338aa80dc43eac589d5aad2c583 SHA512 c8780c26dee696a286fb5370b53a92b90634442f2e9b4554189ab986e9e24fb98bd632a124fd702070e20f448499bbf7a624ad7e32192e06fd2d696e2015fb69
+EBUILD war1gus-3.1.2.ebuild 1495 BLAKE2B 10ab67d560010d6147c6e282fa338175cfac6a0123b0615cad5fc1fe8ae09247a9fa784d23ddf043bf595b4583a42ff0e182a338aa80dc43eac589d5aad2c583 SHA512 c8780c26dee696a286fb5370b53a92b90634442f2e9b4554189ab986e9e24fb98bd632a124fd702070e20f448499bbf7a624ad7e32192e06fd2d696e2015fb69
 MISC metadata.xml 326 BLAKE2B ee56deed66d8e6505929adafa4fd6d41ec36f71f6289134bac4c7e9efdfefd4dd8243a793ee16bbceda788759cad4827f6fcb7428b80cc93838a9b5d2a063395 SHA512 f3097f181d9ffd627b29eb7fb6df021323067955dd0610d4497bf23e49812322339a0379424bc257caddeb86b13f98d9cd52ab09c36987070006892b36aa8567
diff --git a/games-strategy/war1gus/war1gus-3.1.1.ebuild b/games-strategy/war1gus/war1gus-3.1.1.ebuild
new file mode 100644
index 000000000000..ae327b99a8cd
--- /dev/null
+++ b/games-strategy/war1gus/war1gus-3.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft: Orcs & Humans for the Stratagus game engine"
+HOMEPAGE="
+	https://stratagus.com/war1gus.html
+	https://github.com/Wargus/war1gus"
+SRC_URI="https://github.com/Wargus/war1gus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/war1gus"
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "War1gus requires the data from the original game to run.  The game"
+	elog "will ask you for the location of the game data and extract/convert"
+	elog "it automatically on the first run."
+
+	if ! has_version media-video/ffmpeg ||
+		! has_version media-sound/timidity++
+	then
+		elog
+		elog "If you did not convert the game data yet, you may want to install"
+		elog "the following optional dependencies:"
+		elog
+		elog "media-video/ffmpeg -- to convert game videos"
+		elog "media-sound/timidity++ -- to convert game music"
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/war1gus/war1gus-3.1.2.ebuild b/games-strategy/war1gus/war1gus-3.1.2.ebuild
new file mode 100644
index 000000000000..ae327b99a8cd
--- /dev/null
+++ b/games-strategy/war1gus/war1gus-3.1.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft: Orcs & Humans for the Stratagus game engine"
+HOMEPAGE="
+	https://stratagus.com/war1gus.html
+	https://github.com/Wargus/war1gus"
+SRC_URI="https://github.com/Wargus/war1gus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/war1gus"
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "War1gus requires the data from the original game to run.  The game"
+	elog "will ask you for the location of the game data and extract/convert"
+	elog "it automatically on the first run."
+
+	if ! has_version media-video/ffmpeg ||
+		! has_version media-sound/timidity++
+	then
+		elog
+		elog "If you did not convert the game data yet, you may want to install"
+		elog "the following optional dependencies:"
+		elog
+		elog "media-video/ffmpeg -- to convert game videos"
+		elog "media-sound/timidity++ -- to convert game music"
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
index aa542792340d..faf59e290efe 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,7 +1,11 @@
 DIST wargus-2.4.3.tar.gz 46635465 BLAKE2B be559e6efdba7542e9ed65f4ece5419b781b61d7d6d43b40418ca8dffc446fa7478f608d7f24696281c7acbda4dc5bf8d808feeb3376ae3e8a04b3372d18ace1 SHA512 0c9eca898146c44e211e0da7061cb605eb04ab113fd9ad0c51f9b92df8724a5b28aea9b7cf9bfadd44f0183f8b5c519d7da0050b260624f4f7da4b9f8aee458c
 DIST wargus-3.0.0.tar.gz 4890178 BLAKE2B 7ab4a4b5e8171b2297e17f0338a5fd674cff7beb3457e33c7938c12f9a262d81b9faf2db6ae00fdbbef440624880c37bfe61c2b9957e943cf13d364544f58a65 SHA512 70bf6a5a3d489c9d88bf28e65eea85936ac42850b9c8f27c5cb4a7ba8ff28c609274235c735abb4de92e5c63113d4850adc1da313ff39cbdee797de6b9e1cc43
 DIST wargus-3.1.0.tar.gz 4977868 BLAKE2B 063d47f53b58360c3ccc1aea301f4731a0108a52867b529a1f3935e500e569c11775074241ed8acd58ee7b33064831abebee693a9720927a1432c3f4ed9b17dc SHA512 9e4c3ed955cbf0ff38fd8a847a9590fb3588923b88065a8eb3d2e82fa20b10cd00d507b74c5440486237eb20b71435f72c219efdf288eb67fca594050622f169
+DIST wargus-3.1.1.tar.gz 4982124 BLAKE2B 1dd583c46f841c03d0e859e3c79da72da5866c5f6c67d1e23bf186935f2ae8d539e6dec36bb7c41b6f74af3a4f93c308489c802890c982a13aa68ba2cfbc4626 SHA512 8ec6a3dd11db9cb5984c9d61882beac0851f744203f9d90f23783b8a6b7f2728a180d7354c2e85d7ec8105c731a3e6996f5a688ce6bf5fa9437040c09cea6a59
+DIST wargus-3.1.2.tar.gz 4981468 BLAKE2B 76e925a6cd469a583adffe67f53a407f919b93c6700aeaa182db05b07691d64e6040d6f9f80461b14b81b412882bb58b976253b382d9e4aced7d1429c28832d2 SHA512 6925eab28b63222c4957b40c7b9a57ca231a18a7b36509c90f72d563a43a2ac4bd82bda3ca02e68099045fcddf10dd36c5a93c6f114f7bdcfb67afa7c7471b1e
 EBUILD wargus-2.4.3.ebuild 1933 BLAKE2B 1570688d37ca291df56f903b130957f8e898b8b3c618863743bdf24f3c8a4ea2ce6d3850bd3d746947efcef7f0bead9849a23f72124b87d12e323ecd4bad0e7c SHA512 eda886eae8fdd69c877d3b2f9c175eedb899a2d79b0d67c3006b69f15800679297c0397a861a86749187cd62f4423f4cffa1969ff7c10ae4583ca7ad2a800a1c
 EBUILD wargus-3.0.0-r1.ebuild 1939 BLAKE2B b8272a50ba893a4c39ab03374af5ab4e7b3da5cfa5643be31e7c6f38ed85baec5d96b4e6bdeb313481711fd2f355240ad2c5e2044df4b903cbf2ea960ff16673 SHA512 c3cd057699fd4b42111eef93e6143f554c695ead5ceaf4801b6420fc581004b61f0f6b9dae3603ed4245dba14d94075d6fd38ae9a975007883eb15611560c640
 EBUILD wargus-3.1.0.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
+EBUILD wargus-3.1.1.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
+EBUILD wargus-3.1.2.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
 MISC metadata.xml 535 BLAKE2B 1c618d85c92a9daa24009d320dbc05c83d78ffb58a343e88e5df9cbf0a8097051ebb10021200ebe7f2ba5679274d316a98d7cc0171224f371dffe35cee29fa85 SHA512 d369b2201b6461b4709d54817f0b99982260362e3c54e99e93aaeec614843aa14d1fb0d4c24c7c5b5825e05c2e2bd52971f7a6395995aee3f33d9872f9ad2215
diff --git a/games-strategy/wargus/wargus-3.1.1.ebuild b/games-strategy/wargus/wargus-3.1.1.ebuild
new file mode 100644
index 000000000000..05c144af13dd
--- /dev/null
+++ b/games-strategy/wargus/wargus-3.1.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft II for the Stratagus game engine"
+HOMEPAGE="
+	https://stratagus.com/
+	https://github.com/Wargus/wargus"
+SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bne"
+
+RDEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	bne? ( app-arch/stormlib:= )
+	!games-strategy/wargus-data"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if has_version games-strategy/wargus-data; then
+		ewarn "The system-wide install of game data via games-strategy/wargus-data"
+		ewarn "no longer works.  The old data will be uninstalled after merging"
+		ewarn "this version of Wargus.  If you would like to preserve it, please"
+		ewarn "abort the process and back /usr/share/stratagus/wargus up."
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+		-DWITH_STORMLIB=$(usex bne)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "Wargus requires the data from the original game to run.  The game"
+	elog "will ask you for the location of the game data and extract/convert"
+	elog "it automatically on the first run."
+
+	if ! has_version media-video/ffmpeg ||
+		! has_version media-sound/cdparanoia
+	then
+		elog
+		elog "If you did not convert the game data yet, you may want to install"
+		elog "the following optional dependencies:"
+		elog
+		elog "media-video/ffmpeg -- to convert game videos"
+		elog "media-sound/cdparanoia -- to rip game music from the CD"
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/wargus/wargus-3.1.2.ebuild b/games-strategy/wargus/wargus-3.1.2.ebuild
new file mode 100644
index 000000000000..05c144af13dd
--- /dev/null
+++ b/games-strategy/wargus/wargus-3.1.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft II for the Stratagus game engine"
+HOMEPAGE="
+	https://stratagus.com/
+	https://github.com/Wargus/wargus"
+SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bne"
+
+RDEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	bne? ( app-arch/stormlib:= )
+	!games-strategy/wargus-data"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if has_version games-strategy/wargus-data; then
+		ewarn "The system-wide install of game data via games-strategy/wargus-data"
+		ewarn "no longer works.  The old data will be uninstalled after merging"
+		ewarn "this version of Wargus.  If you would like to preserve it, please"
+		ewarn "abort the process and back /usr/share/stratagus/wargus up."
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+		-DWITH_STORMLIB=$(usex bne)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "Wargus requires the data from the original game to run.  The game"
+	elog "will ask you for the location of the game data and extract/convert"
+	elog "it automatically on the first run."
+
+	if ! has_version media-video/ffmpeg ||
+		! has_version media-sound/cdparanoia
+	then
+		elog
+		elog "If you did not convert the game data yet, you may want to install"
+		elog "the following optional dependencies:"
+		elog
+		elog "media-video/ffmpeg -- to convert game videos"
+		elog "media-sound/cdparanoia -- to rip game music from the CD"
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 81c6e755dd11..8f3e6df8dd2e 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 67a3a32b3385..781d61d0972a 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,4 +1,4 @@
 DIST gnome-control-center-40.0-patchset-2.tar.xz 7396 BLAKE2B 9d3c0461c065cbf0f2051847e516066a38ebffc0972f12060fc41a7d283dd0eecd1a3e581518e13c1dcd545d600e7a2bece5d33d10e8c50adcb2b05f9558e8d0 SHA512 3a93c0c2f0f2bc422e6992c259334d9a90678151882e2df3035e4c233fa8e6c557073cc6679044b27bbfaafaa06d59b76724154dcd63612724e1e89817c99a36
 DIST gnome-control-center-40.0.tar.xz 6463616 BLAKE2B 7c79b79a0cb9bb847cdeb31613e9520b446f7720031fc7cda927a82b6e0acc6af03a047fe296a45f6e171c4ab1659b4ed5c6d07f83c9ffa554b1bdcce6fa26fe SHA512 26980cd18c414b12d2bf7e61be200e02302e170d53aba4f064154eda4c006648160919b6d4c9d168d8c5a461c05dc6593a52066b144af577c6aac420b9723cb9
-EBUILD gnome-control-center-40.0.ebuild 6224 BLAKE2B 65f353674dfa9c3c3f44733fee69182ac27de6c98bd12ef3b3858e86e8eafc4922d696ae629b42edb3f256ac17849d123faa93b4d4f4b8e5820d17283359e9b1 SHA512 0b57e5852eaf2abaa183904a1b613295b91b190d124c4be2b69cf7b7700dd53889a6dc45e469c052ecda5dd46ac2d59233d8f45c55d7c5100349008e38b85b01
+EBUILD gnome-control-center-40.0.ebuild 6296 BLAKE2B 8cbf7db0bc85ba946f2b35bb94abfdfdf0d8548bb8d1a6b7313a5ec4f5dd1115b8cd58f8f6e54ac30c1c8d1735b3d257182cdb5bb71223924bc0bb5fbc78e4a5 SHA512 3265cff85cf666b446d00bb0558d94e8ab737461e7831bd358234930117c2ddf2695dc3de3904cbf7e5a8b956ce180497d2e54ceb64475c94407d428781a72d8
 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
diff --git a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
index 72edc90cc8d2..7727243b85ae 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
@@ -20,6 +20,9 @@ REQUIRED_USE="
 " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
 KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 
+# meson.build depends on python unconditionally
+BDEPEND="${PYTHON_DEPS}"
+
 # kerberos unfortunately means mit-krb5; build fails with heimdal
 # display panel requires colord and gnome-settings-daemon[colord]
 # wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
@@ -127,11 +130,12 @@ PATCHES=(
 )
 
 python_check_deps() {
-	use test && has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+	use test || return 0
+	has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index d65f0a378a34..4d953eaa3a0c 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -7,8 +7,10 @@ DIST gnome-shell-3.36.7.tar.xz 1777236 BLAKE2B 4dd3b98e8a2ffa711bffe0b3b78708c85
 DIST gnome-shell-40.1-r1-patchset.tar.xz 4328 BLAKE2B f26eec7cb7ab5e30b574a77cb3a6ccd251da6b33d540d05bc06c5547000631f751f9d35699d0d74ffab8e2ceafa5a66fac3067a0d511ec8e9292ced1bf626d66 SHA512 e5ce08f1fb986c5a8262651449d9444084e5968af02eaed5259d7c4600735e4a41bf8938600c70a000d1298d6a1f7c689bb08bf4943f91c5affd7f2c0ea7f227
 DIST gnome-shell-40.1.tar.xz 1876776 BLAKE2B 9facbf60759faf4d598cf423147d6385e50a324e75b0ce4e540b4b0c6e51c2ad611f70ac8e0f19d25f47d0ee250504fe7fb430d6f50aacb9ef758648ca7a2e78 SHA512 48b2800ef500b5a5102c974d8ab718946406653803942b063100c813bd4bda9ae3e1b3492872fd8158c0e44c95f6582174101fb852613ff047602efed83b6d37
 DIST gnome-shell-40.2.tar.xz 1869600 BLAKE2B 6081930c4fe564980659bfeb7f7f59c5b95ce56e158096f14d8f85b28f4b45b1697eebdd88f7daf331aa1f7d087ec3dab55543d9a82d9d26bc5d8aee7e7c0085 SHA512 0df0a68a0e2440f73dfc147045ac2f003e5f133950cdbec7fb07b92e71aa53e2e4f3ce75510552f1043404850623fc84c08aad215b39ce9d33862994ae35ba87
+DIST gnome-shell-40.3.tar.xz 1869724 BLAKE2B b6a663c97f5ad9239e608e16805074f9695f90b110514d202cc799818321d258417ce4e7841fa3256ae664e2bcba12201ac035737720a37f4eb3e84a26418ad9 SHA512 05d47e1b0f8ec27f0ae7564476012f21dcb2ec8e6da61a589b7fe17df1a23035cb6e261805250a410737502b9bdbb25f56432a618de88881d7e15b6432e52770
 EBUILD gnome-shell-3.36.7.ebuild 6667 BLAKE2B 6d2fe47bf102ba967ba1bcd5490f673033882e067ee6fda7ffc1c6482b5e6359f53af3337263c506d0e3e5270abb92306f5391cce713c10abaa0c09099a06899 SHA512 6e613f41d24bd0152ba4582b87afabd6ac17060d7c13462b975ff6ae8d8dab39a8c8e76a8740d0d02568f47b431360814328780f8e10937c2ce3180c446fde12
 EBUILD gnome-shell-40.1-r1.ebuild 6462 BLAKE2B 7c32acf7482861d1026407bc82bae01ade35353f98299390b9db281a41600237a3e9cbde15c1c026fb3fdd687be22c671e88ecf51d147df0a9e128582ad9ac08 SHA512 442a5f7c6c7e056c2ea692c52bdf03be7f0993398c0ee0877a3ed3e685a469a9d01a621543ac5e2d9088deb89cd29fa1c8444b4d013ea0d15bed494e2b62817d
 EBUILD gnome-shell-40.1.ebuild 6367 BLAKE2B e91e22d2a5ba92f9c551ef4515f932a3cd3c5177a27c29e89b7d2313b755d76500f500180729d65d68e2e7305fb2a23b5c30257af90806535834e907eeab0b51 SHA512 60241a97c58beb62036e4bbc6ef0c46d5c89648b24f4263f98b85f8293589029f95c02b2bfc9a3deece166d167676aa61c42a8ea91b9f8706044fa14bc1a8993
 EBUILD gnome-shell-40.2.ebuild 6367 BLAKE2B e91e22d2a5ba92f9c551ef4515f932a3cd3c5177a27c29e89b7d2313b755d76500f500180729d65d68e2e7305fb2a23b5c30257af90806535834e907eeab0b51 SHA512 60241a97c58beb62036e4bbc6ef0c46d5c89648b24f4263f98b85f8293589029f95c02b2bfc9a3deece166d167676aa61c42a8ea91b9f8706044fa14bc1a8993
+EBUILD gnome-shell-40.3.ebuild 6370 BLAKE2B 457751fa5beb2b19892a609bcde292230c6ffa7eb93532d96069c9d4fa44f4014ac4db9bf304b34718e8fdbde8f1ff2678019f1a2527fc70a4c16b56d8ceb3eb SHA512 bfdf91c88d29489ed5f1e391c846c6b8371abf265c3f0af5f80d5b173b4296de990c2e5d6de09fc1d6b937ef988f9e8df69a79c00bd87100ca66d635b933e5d3
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-40.3.ebuild b/gnome-base/gnome-shell/gnome-shell-40.3.ebuild
new file mode 100644
index 000000000000..96fa03cf83f6
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-40.3.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+	>=gnome-extra/evolution-data-server-3.33.1:=
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=dev-libs/glib-2.57.2:2
+	>=dev-libs/gobject-introspection-1.49.1:=
+	>=dev-libs/gjs-1.65.1
+	>=x11-libs/gtk+-3.15.0:3[introspection]
+	>=x11-wm/mutter-40.0:0/8[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.33.1
+	>=x11-libs/startup-notification-0.11
+	>=app-i18n/ibus-1.5.2
+	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+	>=media-libs/gstreamer-0.11.92:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-video/pipewire-0.3.0:0/0.3
+	networkmanager? (
+		>=net-misc/networkmanager-1.10.4:=[introspection]
+		net-libs/libnma[introspection]
+		>=app-crypt/libsecret-0.18
+		dev-libs/dbus-glib )
+	systemd? ( >=sys-apps/systemd-242
+		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+	elogind? ( >=sys-auth/elogind-237 )
+
+	app-arch/gnome-autoar
+	dev-libs/json-glib
+
+	>=app-accessibility/at-spi2-atk-2.5.3
+	x11-libs/gdk-pixbuf:2[introspection]
+	dev-libs/libxml2:2
+	x11-libs/libX11
+
+	>=media-sound/pulseaudio-2[glib]
+	>=dev-libs/atk-2[introspection]
+	dev-libs/libical:=
+	>=x11-libs/libXfixes-5.0
+
+	gui-libs/gtk:4[introspection]
+
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/mesa[X(+)]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Introspection stuff needed via imports.gi.*
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. logind interface needed for suspending support
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
+# 8. IBus is needed for nls integration
+# 9. Optional telepathy chat integration
+# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	app-accessibility/at-spi2-core:2[introspection]
+	app-misc/geoclue[introspection]
+	>=dev-libs/libgweather-3.26:2[introspection]
+	>=sys-power/upower-0.99:=[introspection]
+	x11-libs/pango[introspection]
+	gnome-base/librsvg:2[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-3.8.3
+
+	x11-misc/xdg-utils
+
+	>=x11-themes/adwaita-icon-theme-3.26
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+	telepathy? (
+		>=net-im/telepathy-logger-0.2.4[introspection]
+		>=net-libs/telepathy-glib-0.19[introspection] )
+	media-fonts/cantarell
+
+	sys-apps/xdg-desktop-portal-gtk
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection(+)]
+	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+	browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+BDEPEND="
+	dev-lang/sassc
+	dev-libs/libxslt
+	app-text/asciidoc
+	>=dev-util/gdbus-codegen-2.45.3
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.17
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	"${FILESDIR}"/40.0-optional-bluetooth.patch
+	# Change favorites defaults, bug #479918
+	"${FILESDIR}"/40.0-defaults.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# Hack in correct python shebang
+	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		-Dextensions_tool=true
+		-Dextensions_app=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+		$(meson_use networkmanager)
+		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
+		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version "media-libs/mesa[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa if you do not have hardware 3D setup."
+	fi
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=563084
+	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
+	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+		ewarn "otherwise Gnome will fail to start"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index cf4d521f0db9..06524c109043 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index d4d9ca6de5d5..a3019e639604 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,6 +1,6 @@
 AUX cinnamon-control-center-4.8.2-build-fix.patch 1246 BLAKE2B c4e39834c7079573a363c9aa822a84839fdac5de2b9299545fafde9ed718e082ca3d37be63aa514fa43e60b33774d1cd1759202af6ade62b385c00a84cfb3e5a SHA512 3e3deadd7972ba4a642a8b69a809785ae34ff30cec1174e9d2a4ee8f9a27881e22629ae5b17dec92ba78c995bb012d1925d2a53d6acd89a155f17b3a74581df9
 DIST cinnamon-control-center-4.8.2.tar.gz 3865765 BLAKE2B 8e36888aec00252842bcdb3f29dd0728833c597260fdb6b2b160db455e900686086b1b04b393d58ec358f44aa64c14341e49738de7a85002a5e5d695974c578a SHA512 c64e554488b401291daf125cc5627201cac58d5e6efab697d0b9cac64b666a7d2a7e27f459bb560918876cc8cf5e3720c11a59cee70401e50682a4b82a20f1b5
-DIST cinnamon-control-center-5.0.1.tar.gz 3866795 BLAKE2B f9c88aa3ad585f9fd867055b247d3cbc7442fb1b4e205dbac7de889e8dd6faa3c2cdee9a6f98b877054ace9d3ff5694e469df3ca35481bd768e019bf6c611541 SHA512 3b3d64cf68ddc831a025e3f111ba5a58536ee6900a61a7bc86847b094f6d73292d56b98f6d94f1b2a03a25d820022383b4860f91d1ccd3f7e5327399da4b82cd
+DIST cinnamon-control-center-5.0.2.tar.gz 3866962 BLAKE2B d292d610516647e149198cbfce652bfd094338612ef6b4765fcb80bd1fe15f2d643bbaa5343f1d79d57f3327c87a3256cfc3900493daf6f80569b1a0bacd821a SHA512 f47b88005ba1d7359ab99d80e99d2c42a93561ecddd98014f91674a5ae806b991169c88f3af6c8c187df23ebb8a9e12bbae5eefbfeaf2f3d087981192448c3c2
 EBUILD cinnamon-control-center-4.8.2.ebuild 2152 BLAKE2B d052a536b7af3cb8452c98d3c3273091335faf5d3106985c2ee2e8f2214a082fe7c487620467d35ec5c3f39e1f6cbbce67604ccf108312a95e8c1e89848ad02d SHA512 b4d36b1b3a76c6122d2bd041d871adfc637a1fc922a3d52816a83788291422515bc0a1571e164a22784c18190687343c964bd5440463cc70bcae335cf8241900
-EBUILD cinnamon-control-center-5.0.1.ebuild 2381 BLAKE2B d2be6a762c12c73fae2c1c1daba3ffa0d6e5583d305d306b21910681c1cd6402a1a346247c6495f6fca2ea8eb247a9e0b4444cb48e33a40b662ff1644b4e4f8f SHA512 7bdf8e0deec0cbcdb98f4233dbcda22c001ff45fd4146d87609fc7b0d55be5220ac78a5381563e22fd4eed817ab7fda2a15ab38b73f6e525ac1b4d45e714996a
+EBUILD cinnamon-control-center-5.0.2.ebuild 2381 BLAKE2B d2be6a762c12c73fae2c1c1daba3ffa0d6e5583d305d306b21910681c1cd6402a1a346247c6495f6fca2ea8eb247a9e0b4444cb48e33a40b662ff1644b4e4f8f SHA512 7bdf8e0deec0cbcdb98f4233dbcda22c001ff45fd4146d87609fc7b0d55be5220ac78a5381563e22fd4eed817ab7fda2a15ab38b73f6e525ac1b4d45e714996a
 MISC metadata.xml 761 BLAKE2B 42172f2c3b7152b342295687f5d0e1b34e3a4caf367a0766a6c4c263b85ac4c411ed6c0283b58a3d110bc35205ec5d0f99bf21eb980bcf06c0f5aca167d24134 SHA512 f99fda20543f6fcc7ffe1ba8105084ac30e4b3caa29ccee52f9e8d3dba10f2861f3b35e72c25683a31924e455e024d5c78bff0fa24a27854eb27ac68bc4bac91
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.2.ebuild
index 26539402f249..26539402f249 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.2.ebuild
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index cda62bc14952..c881a110a7ac 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-screensaver-4.8.1.tar.gz 141996 BLAKE2B 73a61e28210efc58a205357abd7b1ca5efce85c542a14ba0de1688ca3c6c86cc81cf02b7eee7d7a13d015d43b6084a0e5a5a0f417a3be77771ff969381c24726 SHA512 5f165cddf5cd3f079192179f2308e015d7d70ce52f5214a56f8fc4318fdc6d6fc2b522b1c8eca31b4799074e58bd93bdce282d9774d1a552616c9ae1a0b46cae
-DIST cinnamon-screensaver-5.0.5.tar.gz 154090 BLAKE2B 5bfe290547fe1bb8cd67cd99781b6ab59e7c146fd9775e4b73544a697e3f56793a998dcd55124df2df568877a3abcb1938ab9a695325562f286e6c03b44f8789 SHA512 18cf174c372f2082b3984fab2fc6e18a41f0f508230fdf91e54b8d0d3c7cf1de1009327716eacf33a7975e0983882abb41944b1470b54f1bd77b7ced8570bea1
+DIST cinnamon-screensaver-5.0.6.tar.gz 154189 BLAKE2B b7bb32c3986f662e8ff9ff857ef8c8f2fb1945abbf6af39b6dd9e4f915dfb47be5b177d474a8199e07d31c8394d6fc1dcf3087cf30a9196d85380e195b8ee0ef SHA512 fce753d4805ad8e0e6767238b5b24b741a8e6b974fb0739cbe76105dfcd33621330257cdbfc34d5a33256659f5b2f9ef457cca9351ff6f73802fbffd6c0828b6
 EBUILD cinnamon-screensaver-4.8.1.ebuild 1627 BLAKE2B 7c70e371cda0b6de480e1f16ca781dd4b0df12ee6662e0b7ff59cd3aeba7ba225ebbd66c68ef3f12423ae5443dec4a565ccf989dfb1f6d66f97effb5c33d6de3 SHA512 974d19a75d0040350abb5584ec3a3d7cf28887d9711aaa8d5022b4acea68ec72a848633f353054fe34f2b32dccb8a27cdf93446e17cf8ce5c4497ae0a27d0a32
-EBUILD cinnamon-screensaver-5.0.5.ebuild 1637 BLAKE2B 51c491398aa684ce26e9c23bfc355016d7091f34a5525bc60cc0ec02a3fa5f0c3214649d8dd8ab65457504c0447a59f0e9fff5d49a9389457d66f432ea333da7 SHA512 fc0abc121eacd96015d922b64ddf1d0985783035d888519b6a76d730ceddbbb01d1ba1261db2bdd6c33d635f4f56d54c8234ac6c4137cab611cf2f809c2dafc7
+EBUILD cinnamon-screensaver-5.0.6.ebuild 1637 BLAKE2B 51c491398aa684ce26e9c23bfc355016d7091f34a5525bc60cc0ec02a3fa5f0c3214649d8dd8ab65457504c0447a59f0e9fff5d49a9389457d66f432ea333da7 SHA512 fc0abc121eacd96015d922b64ddf1d0985783035d888519b6a76d730ceddbbb01d1ba1261db2bdd6c33d635f4f56d54c8234ac6c4137cab611cf2f809c2dafc7
 MISC metadata.xml 499 BLAKE2B cdc003bc99ca0cc2d1aac9255edc856e0a0856377957340cfb2654f6e40db406169a95789ffd1c8bbc3b91cc6ad1cabacfc880f8ae70244587bddf697c0cf1da SHA512 ade4955b678ef51cad43c4809c7165fdd084a18cd89f977e0f4daf8234ddab3fdec289ad43c60ca2f85251dbc7da368113294d8f0f955b92809ef373c13a8584
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.5.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.6.ebuild
index c0d4a43f7ae8..c0d4a43f7ae8 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.5.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.6.ebuild
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 97fe52b64989..bcb6ee94d7c6 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,6 +1,6 @@
 AUX cinnamon-settings-daemon-4.8.5-build-fixes.patch 4529 BLAKE2B 9e28834a8d2d091c816a74e6bc1c50260210e726251dad5ec310f68f450ccd5ec39057c15139218b65afef6e130efc8610b897f0720043a42cdc5702758458f7 SHA512 4f9fee4ec02b11789f387405f0b75f9eabdcc72d78e109b4015fe13575967ad7610a6ad208d8ee31e5b68531e6769d2a07ddc6a9b82db71bf03d7c70920b00a8
 DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
-DIST cinnamon-settings-daemon-5.0.2.tar.gz 662807 BLAKE2B 3e467089b8cdc6bdf296c43e138cc71c316b71dc8a39c9ba78767624a6606db9cc1e9c14c1f12ffc7dbe98a0d9ccabacc5660a1b0a75cebe9ac429eef74f1c5b SHA512 6e68f7c9fd848a3c8fc39341523d5900b2ea72b341fedc6153cf3700e9d29c188e57dce4dd19c6d2eb18edad23dfaf66e29ed659c6f969b9721e2277f95cdf7b
+DIST cinnamon-settings-daemon-5.0.3.tar.gz 663648 BLAKE2B 78067cc11b0a8e77f8bc0a0a942430dbee31e9b8f1a857b9f10b7c16982c0d5e64267e91d35bbd1d66391d328e35efc536d953eee00b2b4b3c6d8c6c28052601 SHA512 ab44c5c157d5a37b35a88f89ba76254ade3f7dfdfaaa7ea7a09aabb49dce3c8f7d789d5d136b2a629c37483d2098ec957bfd07f930d786475ac1bf3973f4d56f
 EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2348 BLAKE2B c463d0b1b7c5304f4c8a485cfa30b9dc1d50057edc9b909ba339f988d760ede512896604be52c2ad9871bd1e2cdc13b731021c7847d1201b98f6ac0b35f9352a SHA512 6fa3c7aa4b52e67eb94cab700c78c110205f846858771afdb4ef4f05b8b0452a7540f3647a99da03ee5423337909926188ebf5c2e6ae2b7968cb3b5e94c7df5d
-EBUILD cinnamon-settings-daemon-5.0.2.ebuild 2171 BLAKE2B 221635ba6ec02c68a0014dc63bdc47e75deb739a53f164152c3fd9c4470887ec7597d5fc06b95c5858a7a7ec1a8522011cac0206a4e3dd9b0067c0afe9296671 SHA512 dfa4d2689f60e09227155b5738b08eea15e522a6a2ba63b37d36880d04fadb5003938c25179935ee12bf17b68ab3f73b75754abf05c76abdffd5f9b9b83d1f15
+EBUILD cinnamon-settings-daemon-5.0.3.ebuild 2171 BLAKE2B 221635ba6ec02c68a0014dc63bdc47e75deb739a53f164152c3fd9c4470887ec7597d5fc06b95c5858a7a7ec1a8522011cac0206a4e3dd9b0067c0afe9296671 SHA512 dfa4d2689f60e09227155b5738b08eea15e522a6a2ba63b37d36880d04fadb5003938c25179935ee12bf17b68ab3f73b75754abf05c76abdffd5f9b9b83d1f15
 MISC metadata.xml 503 BLAKE2B 140d4e0ca8fc8c1706d856b305a12b9cf26d7efb2f7fa3292423e3617e109c42ddbf7b651923b5f84a1f56422a0b2e780ddce2573b5db2bd3f91a81ccd139c44 SHA512 0caf37ce7de312218834db1ee57f9a5e860eb34d32fd80cd96407b0f28b678c70de171a491695b32c47fd54cd1058a145e40bc64ecb3b51d47718f2215af1ed6
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.3.ebuild
index 6e71b246e5ee..6e71b246e5ee 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.2.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.3.ebuild
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 3876046c94cb..5456de58359c 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-translations-4.8.3.tar.gz 12010514 BLAKE2B a1635f08376ff85a082078e3da64d0f5159d818ba1c57ae79439168553dd8c7e80e2d1aed93361c9df164d790f8be41059e7227c76ebee2285ea53a10df4f9ae SHA512 e7e674be8c542bb34cab9e191f4124b17d0fd932315838be241a7e0fea82aaa72f35e3ecf2d01972def7bd8c4b7a697107a6a14a64ab26c0d1cea4692cf62ff1
-DIST cinnamon-translations-5.0.1.tar.gz 12201535 BLAKE2B 13455216b988a9901e51dca02977c8520225d4b24633557b28c72c97a9d2222ee08d4d311dc8baee64af12a6e778b49e67a43222fce142b0dc53f2239a07f1ba SHA512 3c33d4799ffb44a04d639e82253bbf6968551a8b06b94807d2a8b1b2ea4e982f8d61664bf815fff571a94ed44c60c6d98344604d168e6a602df58306a3e3bf81
+DIST cinnamon-translations-5.0.2.tar.gz 12241648 BLAKE2B ee2049154d378c4a48567593aa45277bae09101b1f0ef1916bab6ac5bafd7f7741ece4450398e784958aff8249d8da5b4277e19bf366da3064793bbd924e788a SHA512 97f119db2ee8f4b1c2327e4f2d0c56357cdd7fe2c53df380d6e48af715a56cc2326aecce9d5f5f3292854b0087bd139552d50e1f84938dcd838964bcf84a6cb4
 EBUILD cinnamon-translations-4.8.3.ebuild 1328 BLAKE2B ea49f6317fc3b79941ec10b429e409f1610678618f8214aafae7603266c5f45060d4bd9ff1d6fe78c1a79e7486384651a19e5433da323cb86fe40a7c3a86b4db SHA512 79f14733848351b0d7408e471753f61c2747b40ff56daffaa7e50961b74810e1b14bfead230549c99007088a48096df4088f100683d1024ecff9e13106769771
-EBUILD cinnamon-translations-5.0.1.ebuild 1337 BLAKE2B 2fb262abdcca614f18961a94006812d6a5eb11bf97a0525c01e47c7bff65541d1f9d5195d3a062c544fa34204d1f80428dfa3055bdf565353ccf17b7281859ee SHA512 cba5f4d502249d460075771738c2249c1461644644f85cd058c3e14ef9987f4ddf71ee93424d72e1f119b9a45743453a18232f8eff595174169b2c87afb8714b
+EBUILD cinnamon-translations-5.0.2.ebuild 1350 BLAKE2B 94f4925b5042c4a5217426e4ca6c8124ec7c47151ae035a3866c857564a5220d252637b01b16249485f6fc4c030c65ddd229477ad99cb29ca3a11e3b95814c0e SHA512 ae6b4ebe8c1d085b6325c83e40fafc2b29e10d28da1ef4c0634f45f5315688151aa02d5b1ebb65f45d81ca0caff0d27abc279e704719e8c992131559b349f7cb
 MISC metadata.xml 500 BLAKE2B b320afe0e72c5d2664e88acd7e4c532ebbe99def2a7bb47c0178c51c41c45f063fee9ffdaffcdfd2e5a0fd4bd4c73bdb924a131b0cb82c77d31442dea30860f3 SHA512 2cd989b1db3b951b3927679591b7f42e0527daaf979fd93175c4cb5ba95fde556aafbdaebc9265cbde6df239253e2c64462aa3fe89e0451653052b5245dba4a4
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.1.ebuild
deleted file mode 100644
index bcea7f9c6c14..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="af am an ar ary as ast az be be@latin ber bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB en_IE en_NZ en_ZA eo es es_AR et eu fa fi fil fo fr fr_CA frp fur fy ga gd gl gu ha he hi hr hu hy ia id ie ig is it ja jv ka kab kk km kn ko ksw ku ky la li lo lt lv mai mg mi mk ml mn mo mr ms my nap nb nds ne nl nn no nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw szl ta te tg th tk tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi yo zgh zh_CN zh_HK zh_TW zu"
-
-inherit plocale
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="sys-devel/gettext"
-
-src_configure() { :; }
-
-src_install() {
-	# Cannot run before since locales are not in the expected place for this to work
-	plocale_find_changes "${S}"/usr/share/locale "" ""
-
-	install_locale() {
-		insinto /usr/share/locale
-		doins -r usr/share/locale/${1}
-	}
-	plocale_for_each_locale install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.2.ebuild
new file mode 100644
index 000000000000..b31f71f1f30e
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="af am an ar ary as ast az be be@latin ber bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB en_IE en_NZ en_ZA eo es es_AR et eu fa fi fil fo fr fr_CA frp fur fy ga gd gl gu ha he hi hr hu hy ia id ie ig is it ja jv ka kab kk km kn ko ksw ku ky la li lo lt lv mai mg mi mk ml mn mo mr ms my nap nb nds ne nl nn no nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavian sr@ijekavianlatin sr@latin sv sw szl ta te tg th tk tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi yo zgh zh_CN zh_HK zh_TW zu"
+
+inherit plocale
+
+DESCRIPTION="Translation data for Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations"
+SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="sys-devel/gettext"
+
+src_configure() { :; }
+
+src_install() {
+	# Cannot run before since locales are not in the expected place for this to work
+	plocale_find_changes "${S}"/usr/share/locale "" ""
+
+	install_locale() {
+		insinto /usr/share/locale
+		doins -r usr/share/locale/${1}
+	}
+	plocale_for_each_locale install_locale
+}
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 3fab4747190b..9ed1f7170f59 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -3,7 +3,7 @@ AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03
 AUX cinnamon-4.8.6-build-fixes.patch 981 BLAKE2B 735028024dfe3b0d280875411d03a2a005efb6344650e2278778621e655818c074c894f0988c1f5974ee73e341f8a4304c9834e205701fb2fe0646fbf9b7c9a4 SHA512 6a9de0e477bec8cdddf302c0878dd213f02047a71cdd6b6090cf8ed6616d185880fa18033c24c13bed6e0e651224ddd9c779320c3f441398d6c36b2741a6bd4d
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
-DIST cinnamon-5.0.2.tar.gz 2395838 BLAKE2B fe7962f4d6481a1584700b3ad5495d2cdc79c4f61aa01b7e330929ff83150ca9a024a00bece4df0fbd18dc68df164c5c27024320c8e46041ae1eaa7c36c8c620 SHA512 f75e9f8382b27b0b29d37274b8687f861c6b46a46b378ee297024069ad70e0e5b48089cd724210148d657d25bcce5d3f18b6ba4826b8ff582c0c1afb5fef9578
+DIST cinnamon-5.0.4.tar.gz 2397469 BLAKE2B d71d5c0a1d6386f77951629491fbc14f1c6e139b2a1f7ed87684ed3588897deecfe0158478ca52af18b18da250e8415822f56ce3ca758053a4b373b691627c6b SHA512 ac3eb6384fcbacab77a8a7bff1f28572df4ee62d3e9f0e0d02f9406ef690b3093355652201194d4c324bc13b6f806d27715434701a57c3b7544ad715aee27ad1
 EBUILD cinnamon-4.8.6.ebuild 5028 BLAKE2B 3afddcd102ded05641665b6b0ba2571119296a4d58aba59bea55824fcbf3e0eef53f84e0a3ed88d168ad4cb06b9169771819d75d46270a01503e0c0aed84ffc2 SHA512 398060a0c4e903a8ebccfc7995ac823f14518fcedf81a1ab771996e7e9314accadb84def76b557d72aaf56c4f43dbd4ca8c09fe1111526f0eb5b8c0c93cca2af
-EBUILD cinnamon-5.0.2.ebuild 5001 BLAKE2B c17c9256615cfec063ffb525f253bb9f8661df31076a174bb8b2a3c22699304155bb37eced47d4a7b1d3ba7709e1040da5cb0c3521c8443f6fbb448c106169aa SHA512 5d5bd3ff9a7d7285b580eaed307d436e24339879688f0e327bf475d6afce51da6732eab175d9b0227d359488c4e28e2a0675163142520d1fe7d60f67791c0842
+EBUILD cinnamon-5.0.4.ebuild 5042 BLAKE2B 68b000501ff91f7653413b8e881464d1daeaca7b75547f4bd29bb31a70664c44403cf3153abd39ce22d17b04f8900da22ed138d018ece3d1fcf7960230892646 SHA512 ff516335673112f848b4fd04c4c60d11c9deb705c8bfeca6dd45b9219fca9880ab9b9a590dcb43fdb4b7c11bb6fbc176a233afda4640c18b5848d6f86a4d7d91
 MISC metadata.xml 487 BLAKE2B ec4d9655fccd9121ddb07b22cbc1ad94ceaf48c1994b1e27f6b0e1d5866b70d9b058af3c36c20a3856770428b6c17c6f97973be2a2040dba63fb45406ede2f2c SHA512 f6d2d4bada61a51e2af982dea1d908d31eec02f794cd72cdb80935320c17b1c25dd91a80c8b28f1d4b7c92bf40e4ab958ec394d3fec6ea90d602d6df485cc3c0
diff --git a/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild
deleted file mode 100644
index f8888fcdd160..000000000000
--- a/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+gstreamer gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-	>=gnome-extra/cinnamon-menus-5.0
-	>=gnome-extra/cjs-5.0[cairo]
-	net-libs/libsoup:2.4[introspection]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=x11-wm/muffin-5.0[introspection]
-
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-5.0[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.0
-	>=gnome-extra/cinnamon-session-5.0
-	>=gnome-extra/cinnamon-settings-daemon-5.0
-	>=gnome-extra/nemo-5.0
-	gnome-extra/polkit-gnome
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-power/upower[introspection]
-	>=x11-libs/xapps-2.2.0[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.0
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	python_domodule files/usr/lib/python3/dist-packages/cinnamon
-	rm -rf files/usr/lib/python3 || die
-
-	meson_src_install
-
-	python_optimize "${ED}"/usr/share/cinnamon/
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}"/usr/bin/cinnamon
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-		   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-			ewarn "To make use of Cinnamon's built-in screen recording utility,"
-			ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-			ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-			ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-		fi
-	else
-		ewarn "Cinnamon's built-in screen recording utility is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild
new file mode 100644
index 000000000000..521a040ceb66
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+
+inherit meson gnome2-utils pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+gstreamer gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-5.0:0=
+	>=gnome-extra/cinnamon-menus-5.0
+	>=gnome-extra/cjs-5.0[cairo]
+	net-libs/libsoup:2.4[introspection]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	>=x11-wm/muffin-5.0[introspection]
+
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/pypam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		>=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-5.0[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.0
+	>=gnome-extra/cinnamon-session-5.0
+	>=gnome-extra/cinnamon-settings-daemon-5.0
+	>=gnome-extra/nemo-5.0
+	gnome-extra/polkit-gnome
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-power/upower[introspection]
+	>=x11-libs/xapps-2.2.0[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-5.0
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add polkit agent to required components
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize "${D}$(python_get_sitedir)"
+	python_optimize "${ED}"/usr/share/cinnamon/
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}"/usr/bin/cinnamon
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use gstreamer; then
+		if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+		   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+			ewarn "To make use of Cinnamon's built-in screen recording utility,"
+			ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+			ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+			ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+		fi
+	else
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 5eec47778c7b..c3bbe99f63e3 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,5 +1,10 @@
+AUX 40.3-drive-menu-hide-items.patch 1756 BLAKE2B 9eba68c0d09b066ea3f06a59a15df2ea310ce0f4168b6851e0bfd51784e124bdaac40078ba0d7be24f7515dcb09a1ca93eb994fb8f668382e5b27c63d094c0b8 SHA512 39694a61045baf0c1675db62cd2cfa4900c45a6fae483353e519c4b1098d5f9f8292ee1cadcaf9db5d884c42d939b5971bfcb32bc1feed3c5bc9ef40bcf3b1a4
+AUX 40.3-drive-menu-indicator-visibility.patch 1132 BLAKE2B 2b8580182ace34e99fece58e20fc4b01bf08b988592743c7e4c844cc4713cee3df7dfafe8d6ab2bd318d453b039dfeec04511ad81ab1533cd4c8cdae8c6581ec SHA512 fb74eb7796a06e5bbd103d7c0806845364fc35da6b933af287b68efeaec1e5f73699d98f38fca764aab9f44eb23e7e4365dc0f1e1e8514d9d5bbb709a110c478
 DIST gnome-shell-extensions-40.1.tar.xz 218084 BLAKE2B 0f54dc53ce279af424658d540961bda698c4d6c2968bf778e626a91c7da47b8f56bd4b1dd874956dce9fbb0d1719bd64b8cf8883788d625049aa14dcc02ff313 SHA512 e537312c0790b6e54b3eebb0df189f65f093e81ec7cf1cde886df747188765775fc4616e98bff0157b543bac26c51a5c7006f1505f4554fea00972f790e781f1
 DIST gnome-shell-extensions-40.2.tar.xz 218032 BLAKE2B f4b8daf2fcd62eaef0ad0960c930fc9368bd426b867a31351b39a2a628dfe9c0631419a5f067b4ac1eb03d2df931ba3a8ea99d4e72043459463b86eb00f6787b SHA512 f02a02a8410e77e8c8b0a764bb7949727974e9a4c0125ac2b6e68c1b20b663ef2de82ddaaed882dd5ffb3a6fd9898b372b6201d53da33f11677c32e82272d2aa
+DIST gnome-shell-extensions-40.3.tar.xz 218108 BLAKE2B 33174ef4c80caf375d48f11b7678ec78bfbe60a9d4456e21856b09a0a83e99ee7b68598c719a6913a29d9686317015fbc8d8bfae856e433414889e59e82e5ca3 SHA512 3773b0a5ec81b6663a3b2c5f5d1f8e7619fdba49ce67b25ee0f5555d17ea7c9740c3698b7a4e4f7fa78241c8738663c602cb5ed1ff9874b8ad2321fec0dbc737
 EBUILD gnome-shell-extensions-40.1.ebuild 1747 BLAKE2B dea69b28f618b887447800e85a3f06b775fe0b73842ab6c258c5f7df4a5f6a66b47b2338380a583bc3559e6e8ecc1fb7000a617609361b06d958770b6362f6bd SHA512 e4ea0fa97656ab0150d7895ea9c258d0ff4c26634abbf92c00f13298550b75619e215139992c495dd53d01da74a5328dbfe8cf01d478e9af54d5393e84e6ab69
 EBUILD gnome-shell-extensions-40.2.ebuild 1747 BLAKE2B dea69b28f618b887447800e85a3f06b775fe0b73842ab6c258c5f7df4a5f6a66b47b2338380a583bc3559e6e8ecc1fb7000a617609361b06d958770b6362f6bd SHA512 e4ea0fa97656ab0150d7895ea9c258d0ff4c26634abbf92c00f13298550b75619e215139992c495dd53d01da74a5328dbfe8cf01d478e9af54d5393e84e6ab69
+EBUILD gnome-shell-extensions-40.3-r1.ebuild 1870 BLAKE2B 44a78c5e700d42b694cfc41271df3e958981e11813fb5297c74fda52ec696ee8ff17056d14e4d9e63e61d0cd964b1f8968704254c604f909b77006234be20027 SHA512 75c36a7415a181ea0ab876e64b21688a8580911dda8818124f74db8821b257e6f8715067008c74328263cb4dee37835c7bd6c5d1c3f69198395be08a432f88ef
+EBUILD gnome-shell-extensions-40.3.ebuild 1749 BLAKE2B b390d4f85164e8329c4f1693747df7ec0e0fb052dfc594e37332019f139f952a82ea7024e7004568ddf9821c1f8ea9ff9c604e024255c93c77ba1b37f5524924 SHA512 e5539db5696a3caf24a980eaf1141a402f2e19d45ab186e47e45083ee195c135779c072de3f4ed0f0165f5b732e330c20e138ae98b67dd9fc20cd2fc23765662
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch
new file mode 100644
index 000000000000..c69dd5fd3577
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch
@@ -0,0 +1,43 @@
+From d421bbfa609426032f07f27934eefb214d59012f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Tue, 13 Jul 2021 11:54:21 +0200
+Subject: [PATCH] drive-menu: Hide items initially
+
+Now that the check for network mounts is non-blocking, the initial
+sync doesn't take effect immediately. We don't want hidden items
+to briefly flash the indicator, so create them initially hidden.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/176>
+---
+ extensions/drive-menu/extension.js | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
+index 6c6fd76..f60dab7 100644
+--- a/extensions/drive-menu/extension.js
++++ b/extensions/drive-menu/extension.js
+@@ -41,6 +41,8 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
+         ejectButton.connect('clicked', this._eject.bind(this));
+         this.add(ejectButton);
+ 
++        this.hide();
++
+         this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
+         this._syncVisibility();
+     }
+@@ -155,10 +157,8 @@ class DriveMenu extends PanelMenu.Button {
+         this.add_child(icon);
+ 
+         this._monitor = Gio.VolumeMonitor.get();
+-        this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
+-            this._addMount(mount);
+-            this._updateMenuVisibility();
+-        });
++        this._addedId = this._monitor.connect('mount-added',
++            (monitor, mount) => this._addMount(mount));
+         this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
+             this._removeMount(mount);
+             this._updateMenuVisibility();
+-- 
+GitLab
+
diff --git a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch
new file mode 100644
index 000000000000..f76335d4596e
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch
@@ -0,0 +1,32 @@
+From 3539ce113907ffda813e1a990891b0911c9702ef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Tue, 13 Jul 2021 11:40:31 +0200
+Subject: [PATCH] drive-menu: Fix indicator visibility
+
+Commit 519269be9d made the check for network mounts non-blocking, and
+we now update the indicator's visibility before a newly-added network
+mount is hidden.
+
+Address this by monitoring the item itself for visibility changes.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/176>
+---
+ extensions/drive-menu/extension.js | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
+index 3fac236..6c6fd76 100644
+--- a/extensions/drive-menu/extension.js
++++ b/extensions/drive-menu/extension.js
+@@ -189,6 +189,8 @@ class DriveMenu extends PanelMenu.Button {
+         let item = new MountMenuItem(mount);
+         this._mounts.unshift(item);
+         this.menu.addMenuItem(item, 0);
++
++        item.connect('notify::visible', () => this._updateMenuVisibility());
+     }
+ 
+     _removeMount(mount) {
+-- 
+GitLab
+
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild
new file mode 100644
index 000000000000..f879892a324f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org readme.gentoo-r1 meson xdg
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	=gnome-base/gnome-shell-$(ver_cut 1-2)*
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/adwaita-icon-theme
+	>=x11-wm/mutter-3.32[introspection]
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweaks GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+PATCHES=(
+	"${FILESDIR}/${PV}-drive-menu-indicator-visibility.patch"
+	"${FILESDIR}/${PV}-drive-menu-hide-items.patch"
+)
+
+src_configure() {
+	meson_src_configure \
+		-Dextension_set=all \
+		-Dclassic_mode=true
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3.ebuild
new file mode 100644
index 000000000000..f5bc021adcaa
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org readme.gentoo-r1 meson xdg
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	=gnome-base/gnome-shell-$(ver_cut 1-2)*
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/adwaita-icon-theme
+	>=x11-wm/mutter-3.32[introspection]
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweaks GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+src_configure() {
+	meson_src_configure \
+		-Dextension_set=all \
+		-Dclassic_mode=true
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 1fa252b8784c..7ef1a3b90602 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-user-docs-40.1.tar.xz 9264892 BLAKE2B 3c27662d516839d411444b811d2c60da51b055a7200958ee50908092bd135e182c2b359f47b711b276a6a9b6b029b767b23bd88fecc32f2c80fa2652ace40184 SHA512 a5ebd9bfbdf13c6922db2035c740f729dc89a2dfa991e74cb835d1c8e28ec4d0d08aaf7388d00d6df83f53a6261bebc1ea32e5b57287c13b2237221a56a34332
+DIST gnome-user-docs-40.3.tar.xz 9141728 BLAKE2B 9634dfa526d7e781400563e0800f25fc8aa520d97fe0e02f3a06a1f82bb0019ff28e9bf0c8a2698c7d081d7b54a1d53be4475db6615d40c3407b632252cc8aae SHA512 e96f4535761c902999b210060f9bbf19384151752315abc7cf20f8b0ef1f599fe132f398db61318ea24eab8e3dc65812fc05a5ed549e4cedabaf809af39f515b
 EBUILD gnome-user-docs-40.1.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24
+EBUILD gnome-user-docs-40.3.ebuild 938 BLAKE2B 399a4f043a4a19513de8674eb2ff7715d05b99ec703800b5bf92f7cd8320065df980bf63bd7d426621e7f36b7718210419cf98633397ea11ea33910da65d10c8 SHA512 6fdf644c671bdd9c51836670e6029021060b3f45af749abb5d641d8c3ef201c0e9d57a69cc87e75bc94081a735689c7f725b55398147fba1c6d5e39a113a70f7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-40.3.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-40.3.ebuild
new file mode 100644
index 000000000000..aef106ecb64f
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-40.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+BDEPEND="test? ( dev-libs/libxml2 )"
+# eautoreconf requires:
+#	app-text/yelp-tools
+# rebuilding translations requires:
+#	app-text/yelp-tools
+#	dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip
+	!test? ( test )"
+
+src_configure() {
+	# itstool is only needed for rebuilding translations
+	# xmllint is only needed for tests
+	gnome2_src_configure \
+		$(usex test "" XMLLINT=$(type -P true)) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+	# which can take > 2 hours on a Core i7.
+	return
+}
diff --git a/gnome-extra/nemo-fileroller/Manifest b/gnome-extra/nemo-fileroller/Manifest
index e5dcdec2a218..c8ab9cc27977 100644
--- a/gnome-extra/nemo-fileroller/Manifest
+++ b/gnome-extra/nemo-fileroller/Manifest
@@ -1,3 +1,4 @@
+AUX nemo-fileroller-5.0.1.patch 601 BLAKE2B 2289ab468b6cec08c4ec71bf7e7d8165b8e6420c1e787a9b227204c6333b9bdbe06b595d3227d2ab1b142516f177547a5f2ca4bb30b71df9adc59ce2d8dda421 SHA512 0f43d2de1527110c3f0dabcb5d589aacf23422ee205238d1e117958918c76abedc4c701435d20b78766a8311ce1cbe026ccc1b0fea94e48c0c11272f92e9ec9c
 DIST nemo-extensions-5.0.0.tar.gz 533061 BLAKE2B 4ff38064eb839cc13fd1a3610c3a8fda3e79447fc1e7355ba4fa7e13747b45a65ac9e572e02e4c5f4230f3bc089aa98339ef3bb4308a1fe145efede07cfaf587 SHA512 bd52404831960de820b4232b3a01c618e35e9be23dc2877f6c0e9462e377e2e72b5a0e61010f8767548cb6c8f2bbb3b555944f84741678720fb5ee1ae17202f7
-EBUILD nemo-fileroller-5.0.0.ebuild 583 BLAKE2B 1fe17adbdd20bc85cba10ec85fffc6b4bcce2e3919f84207e36f06606bddb54bb4b32a373fa294e8ed4b255f3ce1bbff268e3b9c0119bee1933c9afa5946c9ac SHA512 59326255267514e761438792ab83ccc6ab2fa0f610c950022d49c83cddcdea517ad8ae757de50d3471ecba7e8c3dd61b84ba7099bf801f90b569d6978f8212b4
+EBUILD nemo-fileroller-5.0.1.ebuild 686 BLAKE2B 48d6fdc0a1777b0032f1a579e4cfa024705babe8d04b5ce5892a0de2b75756245c534eb25680151605fc7522a6e9058b608c736b3a2c22c12c82bc5a88b4f4d6 SHA512 1cd8d21b0563a16620cadd251c73554ced6a77fcf3e9899f1ace9fea4061fc26750448d27533a93e2d6ec10d45dc4ac2785123c0193f540260bfc94ade10a523
 MISC metadata.xml 494 BLAKE2B c443c19a81f43a587e71eedce5c4d93b2a456f1ad4456b705f0755fce6180f63ff7e481a73c48468a446d425085c864f59a4fa2d8b4e8c368f368432693f8ba0 SHA512 596634a2a633ee6a2ad503421abd959205dad68505b286f9c7fd9972941f9a342fd67bc35fcbad0ce1b878b5e9b920569c70d5480c544cb33d5ce52b5edfd0cf
diff --git a/gnome-extra/nemo-fileroller/files/nemo-fileroller-5.0.1.patch b/gnome-extra/nemo-fileroller/files/nemo-fileroller-5.0.1.patch
new file mode 100644
index 000000000000..814a076b5499
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/files/nemo-fileroller-5.0.1.patch
@@ -0,0 +1,26 @@
+--- a/src/fileroller-module.c
++++ b/src/fileroller-module.c
+@@ -31,10 +31,10 @@
+ void
+ nemo_module_initialize (GTypeModule*module)
+ {
+-	nemo_fr_register_type (module);
++    bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
++    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 
+-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++	nemo_fr_register_type (module);
+ }
+ 
+ 
+--- a/meson.build
++++ b/meson.build
+@@ -1,6 +1,6 @@
+ project('nemo-fileroller',
+     'c',
+-    version: '5.0.0',
++    version: '5.0.1',
+     meson_version: '>=0.49.0'
+ )
+ 
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.0.ebuild
deleted file mode 100644
index 7688c682faf5..000000000000
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Nemo file-roller integration"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo-extensions"
-SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz -> nemo-extensions-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.14.0
-	>=gnome-extra/nemo-2.0.0
-"
-RDEPEND="
-	${DEPEND}
-	app-arch/file-roller
-"
-
-S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.1.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.1.ebuild
new file mode 100644
index 000000000000..ba71f8795d07
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Nemo file-roller integration"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo-extensions"
+SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/5.0.0.tar.gz -> nemo-extensions-5.0.0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.14.0
+	>=gnome-extra/nemo-2.0.0
+"
+RDEPEND="
+	${DEPEND}
+	app-arch/file-roller
+"
+
+PATCHES=(
+	# Minor versions aren't tagged at the repository level.
+	"${FILESDIR}/${PN}-5.0.1.patch"
+)
+
+S="${WORKDIR}/nemo-extensions-5.0.0/${PN}"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index fbd7c33a194e..806b1f9048cc 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,6 +1,7 @@
 AUX nemo-4.6-captions-fix.patch 1113 BLAKE2B 1b6abccebfcf3719559cdf7c077e71c1b20b53fad0538d15012cbf026933ad1708394d709b39b9109c6f6d880a4bcc54d528b840cfc46f05bb46515796a159c8 SHA512 444f4274af3d332efb0c3764beed5027114415dc5a6a79c644a51b440bd476c876a9efa35e9563a5848750949845d481e99e268a564bfc305d6700d454ce7fbe
+AUX nemo-5.0.3-use-detex.patch 252 BLAKE2B 24c27845065f64a58411a8d719fbc1ca41362001f08d469bc336f55601e49358c02ba3aba423c521a261955a5da9832d8ae2df49f3d372270e63256a45fafcda SHA512 142bd88c7843fa40fb30cab01f8f7dd23b2b5c338eae2ac5971c7e392f9f24a8a820ef4b17b1c4afea729cc85a66cb7ddb06ecd417ff6ad494118fe8d88f1498
 DIST nemo-4.8.4.tar.gz 1464683 BLAKE2B 10945a385defdf1bdc7fac9432306e31476ec015489a5150a5b4f9d5f31977b93da6e92241ce153cd5435c789c7a6ce16d2a86002758f26fc587a33dc5343e63 SHA512 b63ee2bd85f67e7d18271032ac3d95c7446b5110b71a3236f7e8c4ccb31e2baf11912060dde36f12ed4b90491c3bb1215a0de38c419130d692c775031cc0e11e
-DIST nemo-5.0.1.tar.gz 1483815 BLAKE2B b846ec184ce1b516071cf11c88630dfbb78fbe8f29259564fd2928b71f951073cfdbd7199837ff9399ca96e211812e6a5921c41c384bf08c647f612b5de30cfb SHA512 79aeec70b7d167a9b418585af5562dfc3e197708510a8acbb20ef028d0738889a369878c4f8d1daf0f392e419494b327176e5048b16c51d39f832696365edb9b
+DIST nemo-5.0.3.tar.gz 1486979 BLAKE2B 10a08aead870cc4d3b4600478038829bc55c5a3f934ac401e2471d2a5abb085439518eb869e3f35d67c58a669cce968438f4b604e90b48344e275d05b1792177 SHA512 f2f2c01338afe5ac50cc2babff323b2920c347d7b9c4d56bec005e90b517464d59f63ae0c4ce69ceab8689f6e762c20f6bd04ead4879b42c686270b82b2bb8d2
 EBUILD nemo-4.8.4-r1.ebuild 2143 BLAKE2B cb5a7f52f156f396fede37d330153257c3f577fb4f21395d1025e02ec092a8eadd96fb9cb3d1730603f5d0e4490e5a6c81636414cec465b760f0548047b4cf4a SHA512 6ccd7e6d7b9fd97cca59bdb39dced70ac7f38982b58cb1c2818dc67eb099019513f5131f0be0dca8d58784020c94eff580a37d6fbe0bd7ee1d89763d0ba47256
-EBUILD nemo-5.0.1.ebuild 2557 BLAKE2B 7749c3d5ec32e110bb59e1175c7d146476be168eeefbc843ac7d562e0df8ef668c72f7dd3069009009e5ad95af2baa3b7d312414839f92fa658286c43ad994f7 SHA512 c1ec4367e0c347d033b759e28a6aeb491c9dc634476519d77e89292f421972c00aff793d8f07ea36e877c85f6263ab74e3af770035b910056172ec99f4caa71d
+EBUILD nemo-5.0.3.ebuild 2828 BLAKE2B ebd35692cda1cf3b48213a8705b94cbdf25ff24a56e86b52d091437483c3ef3b2a34b48d314336cba213b62a3b90abb9e28b45b5761430e077fb6fac7c7b84d3 SHA512 5dfede6673d1afdaed30306ddb02329045ad9dc087c59e7f0046ff496f05ae40159027bf8393903a96530a935a2f24b68a44ff3c885da2f07c3ac64bef8f2b00
 MISC metadata.xml 579 BLAKE2B 14aee20b1ce0a9a689d0f512aa6e5895f768dbdfc4406cb9260f577fb0ab53639203c5b67e1a9a99b172e2dcb552a82e5f8b1364331969660fba2738f42df2f1 SHA512 8d9ba304e86d06573a5c8c2708f3f990a2869efb118f02a6ea4230a7c6e9b1aae99274869af2518010cd63f09e0c1c3380a3d34ad806e8ac3661464742ba5779
diff --git a/gnome-extra/nemo/files/nemo-5.0.3-use-detex.patch b/gnome-extra/nemo/files/nemo-5.0.3-use-detex.patch
new file mode 100644
index 000000000000..ddcdee0a7a02
--- /dev/null
+++ b/gnome-extra/nemo/files/nemo-5.0.3-use-detex.patch
@@ -0,0 +1,10 @@
+--- a/search-helpers/third-party/untex.nemo_search_helper
++++ b/search-helpers/third-party/untex.nemo_search_helper
+@@ -1,5 +1,5 @@
+ [Nemo Search Helper]
+-TryExec=untex;
+-Exec=untex %s
++TryExec=detex;
++Exec=detex %s
+ MimeType=text/x-tex;
+ Priority=100
diff --git a/gnome-extra/nemo/nemo-5.0.1.ebuild b/gnome-extra/nemo/nemo-5.0.1.ebuild
deleted file mode 100644
index 983777cfd8bd..000000000000
--- a/gnome-extra/nemo/nemo-5.0.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc exif +nls selinux test tracker xmp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# https://github.com/linuxmint/nemo/issues/2501
-RESTRICT="test"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.45.7:2[dbus]
-	>=dev-libs/gobject-introspection-0.9.12:=
-	>=dev-libs/libxml2-2.7.8:2
-	gnome-base/dconf:0=
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-	gnome-extra/libgsf
-	>=x11-libs/gtk+-3.10.0:3[introspection]
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.40.0
-	>=x11-libs/xapps-2.2.0
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	selinux? ( sys-libs/libselinux )
-	tracker? ( >=app-misc/tracker-2.0:0= )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	x11-themes/adwaita-icon-theme
-
-	nls? ( >=gnome-extra/cinnamon-translations-5.0 )
-"
-PDEPEND="
-	>=gnome-base/gvfs-0.1.2
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	>=dev-util/gdbus-codegen-2.31.0
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( dev-util/gtk-doc )
-"
-
-DISABLE_AUTOFORMATTING="yes"
-FORCE_PRINT_ELOG="yes"
-DOC_CONTENTS="
-${PN} search capabilities can be extended through external
-helpers. Install any of the following packages to make
-their associated file types searchable.
-
-Image metadata     - media-gfx/exif
-MP3 tags           - media-sound/id3
-OpenDocument files - app-text/odt2txt or app-office/unoconv
-PDF                - app-text/poppler[utils]
-PostScript         - app-text/ghostscript-gpl
-"
-
-src_prepare() {
-	default
-	python_fix_shebang files/usr/share/nemo/actions install-scripts
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif)
-		$(meson_use tracker)
-		$(meson_use xmp)
-		$(meson_use selinux)
-		$(meson_use doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/nemo/nemo-5.0.3.ebuild b/gnome-extra/nemo/nemo-5.0.3.ebuild
new file mode 100644
index 000000000000..c4d2e7c96806
--- /dev/null
+++ b/gnome-extra/nemo/nemo-5.0.3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc exif +nls selinux test tracker xmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# https://github.com/linuxmint/nemo/issues/2501
+RESTRICT="test"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.45.7:2[dbus]
+	>=dev-libs/gobject-introspection-0.9.12:=
+	>=dev-libs/libxml2-2.7.8:2
+	gnome-base/dconf:0=
+	>=gnome-extra/cinnamon-desktop-5.0:0=
+	gnome-extra/libgsf
+	>=x11-libs/gtk+-3.10.0:3[introspection]
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.40.0
+	>=x11-libs/xapps-2.2.0
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	selinux? ( sys-libs/libselinux )
+	tracker? ( >=app-misc/tracker-2.0:0= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	x11-themes/adwaita-icon-theme
+
+	nls? ( >=gnome-extra/cinnamon-translations-5.0 )
+"
+PDEPEND="
+	>=gnome-base/gvfs-0.1.2
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.31.0
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Undo the switch to untex as it's not packaged.
+	"${FILESDIR}/${PN}-5.0.3-use-detex.patch"
+)
+
+DISABLE_AUTOFORMATTING="yes"
+FORCE_PRINT_ELOG="yes"
+DOC_CONTENTS="
+${PN} search capabilities can be extended through external
+helpers. Install any of the following packages to make
+their associated file types searchable.
+
+Image metadata           - media-gfx/exif
+MP3 tags                 - media-sound/id3
+Microsoft Office .doc    - app-text/catdoc
+Microsoft Office .xls    - dev-libs/libxls
+OpenDocument/LibreOffice - app-text/odt2txt or app-office/unoconv
+PDF                      - app-text/poppler[utils]
+PostScript               - app-text/ghostscript-gpl
+TeX                      - app-text/texlive-core
+"
+
+src_prepare() {
+	default
+	python_fix_shebang files/usr/share/nemo/actions install-scripts
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif)
+		$(meson_use tracker)
+		$(meson_use xmp)
+		$(meson_use selinux)
+		$(meson_use doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 24e59829bfad..e5cd5a5c7c25 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 6169c1928d5a..3fb03bf50c4b 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,6 +1,7 @@
+AUX waybar-0.9.7-libfmt-8.patch 1141 BLAKE2B 0be30ec869c1893078eaed0d57e80da8ddfb7b6e1b7658b52f588ebb44aa3b981e570dabb0f4595e3a4df3daeb069ec7f12f8b1406ae17edf75e560b480f299a SHA512 ffa892473cd20d1f8456f82b4df20d1d3d9084c2d5c537d8384ab9372bd7bf099c4243b25b8e19e04f564a5676fad5f7b7451cd281014b754d31529c3072b3b7
 DIST waybar-0.9.5.tar.gz 146094 BLAKE2B cd46e308d282df5ba6ce34417c0fe5468c188acb3c0f9bf5b2d4dd4c2c80547cab65172b4f4162c2dde0b78f68d15c8b79be74113cacd2610fd2a48299e14013 SHA512 0bbb9e898e205728fc564389927fec661a8dd6a9995a6c5d318f930f4527d6afd0be11a6b71dfa9aafb05c982e0f131e51eb0eec9a3e92c28f5cb04ff780fa8b
 DIST waybar-0.9.7.tar.gz 150768 BLAKE2B 41dbcac30ffc42e04d565a590c1bce086271938936a05599bca6b74bac3fb2a8d1a4a4ddc5bec079dea6963eef8722c2c87a99c066de495caa163b1103a08095 SHA512 731b686235b1f0f94ce263e7ffa854f980fb8fccf30a0bd89e7aa0e1ca2c3fabd6d0df837bace6d6915d7a633500ed1f0497d012e082ca99fb32a78142b99279
-EBUILD waybar-0.9.5-r1.ebuild 1514 BLAKE2B 85f7e0da291abfe35793f3b7a8e2ae1278c1e333f763b59c6d0f3c503683cf706f814cc07697082198dc2296b2280f29ba17b78b73fa5b262b77d26d12599601 SHA512 74452b41856774a0bc86839ccfec4e1f07346dfaa0eaad1f2c34fed4f5d60bf2b3beb2d71fba8325c5934cf3ffc3aab24910331f0d408925ccc84b36d4b4a523
-EBUILD waybar-0.9.7-r1.ebuild 1514 BLAKE2B 85f7e0da291abfe35793f3b7a8e2ae1278c1e333f763b59c6d0f3c503683cf706f814cc07697082198dc2296b2280f29ba17b78b73fa5b262b77d26d12599601 SHA512 74452b41856774a0bc86839ccfec4e1f07346dfaa0eaad1f2c34fed4f5d60bf2b3beb2d71fba8325c5934cf3ffc3aab24910331f0d408925ccc84b36d4b4a523
+EBUILD waybar-0.9.5-r1.ebuild 1569 BLAKE2B 18ffdcdac39f0e1aa26b64bf05862531c560afbc6373d45ae64663023f91daa48b90663e6938274e55bc3c4b98fbb257b1c3c1eaaed4664d05d95b6e50c9f6cb SHA512 05798491284e0ac6dd18feccc226385c732a646eb436b685cb5e9dc3b25b1a966fffa0dad30773ab60005088d3b635182d0a3541075eb8c80e09e83665db1792
+EBUILD waybar-0.9.7-r1.ebuild 1562 BLAKE2B 6b34b81169cac84b943a62d7ab36aecb40a1ce286a39ae94732bb5a4b467c5849307e4684efdc02409fe3ea476e611fa1f0699d6f1dedde7509ce40a63c47295 SHA512 0df2679ab7bb90e448a4d471d4c4455abcbc67e97055dd9e2da9b971b8bdb4696adb866142edb1eb4a687de622bca867a3244b99c96bb5d83be0cca143c7af4a
 EBUILD waybar-9999.ebuild 1486 BLAKE2B b81b7d2c46f9713bbea12d8b3dc29d6e522c8c1bdb697fafa5a848b5589bce945264a5fcb4052761f5640580a4c0674f53d3d1cea9c0d98639332d1377119ffa SHA512 0807d6f355a104cfa5f764c5d21dfa6ef011d73a62e740f405f4a31e63f98d29925ba7935d55ba16912248e0f909323077121b4cdb920d8069f7c8ceb770b4ad
 MISC metadata.xml 1028 BLAKE2B 83224cb07773a149b3df13204dfef980b423d42cfe017733b7e9710a357d949397d8b657958e7dd15d8ec610332dbcdf67a8de34b25be6caf974e0b373946e25 SHA512 2e53d76855c8ad8e8b73426a455482e622a768b4d757022a4c61d989b0275b3aae02ce7df1bd7c386a29984e2b086e07c836b981c5051db06be3f24daf774b33
diff --git a/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch b/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch
new file mode 100644
index 000000000000..8ffc8a42a9f1
--- /dev/null
+++ b/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/797649
+https://github.com/Alexays/Waybar/pull/1144
+
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+--- a/include/util/format.hpp
++++ b/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+--- a/src/modules/clock.cpp
++++ b/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/gui-apps/waybar/waybar-0.9.5-r1.ebuild b/gui-apps/waybar/waybar-0.9.5-r1.ebuild
index 3247d86629bc..9bc5d7b989d9 100644
--- a/gui-apps/waybar/waybar-0.9.5-r1.ebuild
+++ b/gui-apps/waybar/waybar-0.9.5-r1.ebuild
@@ -50,6 +50,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.7-libfmt-8.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature mpd)
diff --git a/gui-apps/waybar/waybar-0.9.7-r1.ebuild b/gui-apps/waybar/waybar-0.9.7-r1.ebuild
index 3247d86629bc..aeaa8117b737 100644
--- a/gui-apps/waybar/waybar-0.9.7-r1.ebuild
+++ b/gui-apps/waybar/waybar-0.9.7-r1.ebuild
@@ -50,6 +50,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-libfmt-8.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature mpd)
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 52f9b3bf9920..cac835c5f637 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 0cde9812b4de..c4894c34831a 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,7 +1,5 @@
 DIST akonadi-calendar-20.12.3.tar.xz 342788 BLAKE2B feb4f73e862279dcabb7800f6152748b440f9a284a683fc62eb4187d4e7abf930c88d2af0c32f59b227a88563841557315eb0ddf79f0d130345ee51f178f6055 SHA512 739a7896d457283f92f94e022139edfc22e80383724818bdc457128d1c952f4024ec5e3c91a444c48977d1c8932c60f5b90bda7dd4dddc82fce7ede5bb04c89b
-DIST akonadi-calendar-21.04.2.tar.xz 353680 BLAKE2B d9ec98ff44b3f6f17cf8c2dee9afb166e2d40f50104f6146cc2f0139c5414245aedc08f388ef4c7c94743be9fcf4cfc9c807d63280356bf44f37512b775616d9 SHA512 96206ab71056a143ba827b0d6d855616c1d44276cd7cb918cbadc44c6b29d58143f928321f832a7b04b70321ddf7b8c50b57b7321cc6a4df4e71fefdce630622
 DIST akonadi-calendar-21.04.3.tar.xz 353884 BLAKE2B be9dca3e2e4920d1e3fe253dfe986035618cd5d0a28150b757044a5e336549a3c8283142ebda3b4d4688a5a27bc7d14b871ddbb9170f65c47aa330ac704424f1 SHA512 220f5ef5d403d3b1f59faf7f57bbd33670e9bd909896ac786618563c8fc67856727f4587039b1666f1f5b1d4bbce93357d474e865b29ac629b21fb59f023801c
 EBUILD akonadi-calendar-20.12.3.ebuild 1192 BLAKE2B 0c2d06768ec8b1bdd6064497e207dbde6e764beb953522e0813572d35c1e310daef1aea48e3551c977e4f10ed2de434a26ddd060de6046a8daa946a8b67b9a84 SHA512 10690eb300a6a1eabd165043fc982efa2a017bcff1a36d16471a21b822533771e0d91d355d55ce3ae93c88a26d563f3b292a12bfa852ac6eb6cc37077e5ace8f
-EBUILD akonadi-calendar-21.04.2.ebuild 1195 BLAKE2B 0b70b97f73173205153c03d6a5407dcd6feba99b02d60b6ffca56cd9c9ec62fe1910836849775fdfec470ac68ec8d7ddafaf280a6bc6bf638c7c438a30c6fa3a SHA512 941fe3e84d8dcd3c87ce8f49b7184a90bdfeeeb29ff07131c82b993bc614e371ee93e31d37b81ef780e069554ecbfa8e6546740a83f73bcc72017154f48d5386
 EBUILD akonadi-calendar-21.04.3.ebuild 1195 BLAKE2B 0b70b97f73173205153c03d6a5407dcd6feba99b02d60b6ffca56cd9c9ec62fe1910836849775fdfec470ac68ec8d7ddafaf280a6bc6bf638c7c438a30c6fa3a SHA512 941fe3e84d8dcd3c87ce8f49b7184a90bdfeeeb29ff07131c82b993bc614e371ee93e31d37b81ef780e069554ecbfa8e6546740a83f73bcc72017154f48d5386
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-21.04.2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-21.04.2.ebuild
deleted file mode 100644
index 3b14acc43691..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-21.04.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index a32d99b41e38..13006e90c510 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,7 +1,5 @@
 DIST akonadi-contacts-20.12.3.tar.xz 414416 BLAKE2B d7898bdf6e5a89c9fc0f27dde4414f4c132131e6a8ccfb8c5fa6405fee972df01ee2ac160f5aa4083d82032851e8a111ea8089bd3e69102e275c06830d9405e3 SHA512 41f201d7e37e7570667f4ef6fa61972622301a11b1952a3558491b9263fa8890fa468e55048353ccbe8b4b12339c36352a5f2630dea36e083e932e9b8c045d6a
-DIST akonadi-contacts-21.04.2.tar.xz 424008 BLAKE2B 0c033c344ddc4b88d7ca2c03b5275e3008fc542065f934cf3911afab5941a4dcf93db88990b4e7a7633a4c755b98ce7542b9be032fd65ee5405a8f243f049d0b SHA512 77672233f5554186654f5cc02dc561f93adfddacbed253d337d2924a34fd73ab44e27fabfe740d6bee49511845655ac05d916708286f91d507851e71502f5670
 DIST akonadi-contacts-21.04.3.tar.xz 424004 BLAKE2B 2eb168269c287e15cdd6f8c85669eb7f689b183d058b55330fe96f1b5595d7084eb2712ba61b0401515eb49a00c268c7308dca6aaaf5469a5a55c5597c293de1 SHA512 11e9d2122fbd8c870bddae42b63f00a16b755c8aabb0f5f88066179d99b721bbbed93dceb9242a36e6aa222a2eee13bbd88235eedf0899c2d2a85aacf0c00ea2
 EBUILD akonadi-contacts-20.12.3.ebuild 1248 BLAKE2B c754ac64599dbc6aa85c11a7ea6f71b1c47f2e1b6a1a98f67c4d50d1f361ea72ad63addcdde009d48319f82f374ef1dbeec3cdee228ce65098068ebce8fbeb21 SHA512 e785fe326869bcee0a69f8c1754f7d954cbe2a2d0553845e9da275cba4132a10926fc0625be3549c432ea7dfa21e8047cb468b29f030745fd86d58bfc7dfb6e7
-EBUILD akonadi-contacts-21.04.2.ebuild 1251 BLAKE2B 3167ede8150c9cbc5c7163452b3a7a735e82369a497c72e428befd8327df75aaa92f957e25aab0660163e0b7663f28c2f2532cb36edb516af925349e52e89b9e SHA512 60833c003e613daaadb76c3a67a8d9c6dc22ad68a39d205335e1c9cb954fd4aa78eb97cbe8904605d701db338a99893a17529bf59a94220338baedfd158d907f
 EBUILD akonadi-contacts-21.04.3.ebuild 1251 BLAKE2B 3167ede8150c9cbc5c7163452b3a7a735e82369a497c72e428befd8327df75aaa92f957e25aab0660163e0b7663f28c2f2532cb36edb516af925349e52e89b9e SHA512 60833c003e613daaadb76c3a67a8d9c6dc22ad68a39d205335e1c9cb954fd4aa78eb97cbe8904605d701db338a99893a17529bf59a94220338baedfd158d907f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-21.04.2.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-21.04.2.ebuild
deleted file mode 100644
index 23974b87bba9..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-21.04.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi contact integration"
-
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index fe9c9b7a887c..a4144959a0bc 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,7 +1,5 @@
 DIST akonadi-import-wizard-20.12.3.tar.xz 506664 BLAKE2B ad2a4a1e0b97ac154b05b2a44a6c4462f3a3fb8414349b681fb58d8ad2531cada7d4d534a3d4438b5ddebd044c9294afbcf0822aeb0f32518756220defd33600 SHA512 8b35a37617347c39ef4c76eaec8e3a982d985e6bd41b6219ab353542a82168b6bb46f01fb383bf02ef2819c51a60b86b837e126a23415a8bbb025b27bfabef2d
-DIST akonadi-import-wizard-21.04.2.tar.xz 512472 BLAKE2B bb545a701cde811b15711bd84e6ed7b3d785d219e13232be22180f6574ebaff9aa9a851f214478d3bd36824a31a7f91fd8246370bb3d5d8bb755bfd055e96b62 SHA512 0ae432ee81b48a3d8e6d4d651ecb990b59f880893c14c7352bad960adc8e2e9fc3eb17edee0dba0702781f44e2eb2e0e9dbc396874349a13ceb5ad877bb9294c
 DIST akonadi-import-wizard-21.04.3.tar.xz 512432 BLAKE2B 106d257fa4b8de5e77bb3587897b233d85d251394a583daadfa63d68d06b0aa3abe8b87bdc0105c09a45d269158830b6e9a26a93d61dd4025aea1245996d7a5e SHA512 9ce6034d96dffd6cc37b80419faf5eea5687ca768193210c5d13ae1d3acae2336c6cea9fb81489a799f79c9c38f2a4d335769f78bad20252ce75bbb8b6bdc749
 EBUILD akonadi-import-wizard-20.12.3.ebuild 1232 BLAKE2B c590de3398d4c23cf84d5194643d0952f53e11079c47056bb065c02616455047f0a565774e12635ea86e2d2023762dbbf6af329dc4c4d0a790438938675e8352 SHA512 0a450c695316c029bd27f4d50e306bcb17a41d79e8cb754fea8c136fe7c0b281879580ba58aa866f9ea6177f18ae00e4c0c54e3916d948f6e3b035c4f3ae6bff
-EBUILD akonadi-import-wizard-21.04.2.ebuild 1221 BLAKE2B d6f16a04ab008b6c9fd16cf9fbeac8a456086a4c099a5d7fca6c8209b02d269688e45b6ada39d16dd72a531ad539e37d68e6bee61789d53f692ed58a9bc8922b SHA512 892d9ee0e6851e870a4649ca55c837594272e3e3f6fb74bc68e1150258f826338e42edca9ce0b2651b7791861523982001c75abc82f6440accdc61dd32cd29ba
 EBUILD akonadi-import-wizard-21.04.3.ebuild 1221 BLAKE2B d6f16a04ab008b6c9fd16cf9fbeac8a456086a4c099a5d7fca6c8209b02d269688e45b6ada39d16dd72a531ad539e37d68e6bee61789d53f692ed58a9bc8922b SHA512 892d9ee0e6851e870a4649ca55c837594272e3e3f6fb74bc68e1150258f826338e42edca9ce0b2651b7791861523982001c75abc82f6440accdc61dd32cd29ba
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.2.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.2.ebuild
deleted file mode 100644
index 7eb969d1159c..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index ca7b1d48d1a8..9fae12da8732 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,7 +1,5 @@
 DIST akonadi-mime-20.12.3.tar.xz 136144 BLAKE2B 4d5421e159e45d41d4fe842be7a019d7df4b273b00082a5747b2759db3851a66224a8d2449caaa9228a402e43fee784ddb84ddcc1ab66df737f9c615582a2852 SHA512 9ca435850f4c65ea285b0663d2b2f490ad79e7d238ec3161a1c60e58b0b897c98f0770e20ebc050c68827b129f10af173cf77ae3ec98fca684ef69839df53a93
-DIST akonadi-mime-21.04.2.tar.xz 142248 BLAKE2B 6d82b9191c7b313f06859f085406c48ca1ecb9646a125ad9620f88c22c3e2c3587429f64b02fb9da22b3c79f8ff04d4372929787c26cbf8a5b37bccdfd1e1623 SHA512 01f0724102062b3fd96702ff2399452141c7d8cc1d0a0e31f2793bea29094433436197404fdc4fe8707b1fcb6c00772c7ee99531d82bc1edb94a57860bc9ff5f
 DIST akonadi-mime-21.04.3.tar.xz 142216 BLAKE2B 34cee8faa5f32fd0fefabca22de88117a3db9ad625d4abc64f55ede8762ffde982f15e95c4f20702122731d86bc1057c80cfc172591607fdc54d86e2207c3754 SHA512 c665a2b64275798b4732aec651cab1395feb8cfa8c961498065cfe55aa1c937c3fd47912439fbd150cb902c12ca5023dfcf43018b8a394280b50716b5d735a8b
 EBUILD akonadi-mime-20.12.3.ebuild 884 BLAKE2B e3624d8fc1fc10c5caa2ca4a34beac1e15487ec1af17edca91222068dd47576c08e99221e6b14c51b7a823e2d1d06e2060510683917d6a862d5ffdb1bb0ec88e SHA512 441ac88e6424ba6f40043b6b00f5bec28e5d06b2f9aa043e55aaec8855d3786b607d5715503f5e20640d1b2301f308e9ada2f8659b8926d7ad239454a693faf6
-EBUILD akonadi-mime-21.04.2.ebuild 887 BLAKE2B 7c49d7e30d1df6dfa9169eca31707acadc3368ffd96e45880f4fc51692a57f91c9fc582aa72b9696776c1b2b6d7358e87482280677d493eceafb8fe2e65c7708 SHA512 bfd079f171b418a5de894db8b5527124547ac528232bbbd2cd199e1a783ad74a11a7716c7ec8a280fd7c5f45174b5cc31affe78e6319d720568b6db3876cd275
 EBUILD akonadi-mime-21.04.3.ebuild 887 BLAKE2B 7c49d7e30d1df6dfa9169eca31707acadc3368ffd96e45880f4fc51692a57f91c9fc582aa72b9696776c1b2b6d7358e87482280677d493eceafb8fe2e65c7708 SHA512 bfd079f171b418a5de894db8b5527124547ac528232bbbd2cd199e1a783ad74a11a7716c7ec8a280fd7c5f45174b5cc31affe78e6319d720568b6db3876cd275
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-21.04.2.ebuild b/kde-apps/akonadi-mime/akonadi-mime-21.04.2.ebuild
deleted file mode 100644
index 37483e3d8f20..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi mime types"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 7a1a802de6cf..4ca14be64e41 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,7 +1,5 @@
 DIST akonadi-notes-20.12.3.tar.xz 22876 BLAKE2B 5e3dece4f5b98a22a93a12c3884a5db70d605f1ab0042644542f25e562dffebfae816ce1b44c737f0a6dc320cf8a4ccc2e79f891b691aa95c82fa26e334a8f75 SHA512 100d26caa3e8ace0d58c58ba58a71f301d9979c86dcd993e43d6bac63ccded76e063d942f86533ea4da20d6657eb9992321c83ec73ed0f5817aff6ce6c90d812
-DIST akonadi-notes-21.04.2.tar.xz 27016 BLAKE2B 18696597e877d853483fe76a5c39c569e947874849c9176e6ba643da94f9102657a0c6100bfc0470248ab6acb862c9bd737cd4c1f9aa219910ff2e50302c1156 SHA512 e773ac40d3458281b8353d8146d370dafc78ca2719ff913cc633235596fbee7e881b734c8c2f55753bc9066f4ffb6440e58d112f6241d3d8335ee35fba7531ca
 DIST akonadi-notes-21.04.3.tar.xz 26976 BLAKE2B 9bf5ce4d5373b0f1250cfe31ff10ea19db8dd25794ca68957816d9f826a0b1be3f44fd89898b9c347de5da4b07210e949b1203498c35574fabb759a7e5ef22c8 SHA512 2432077d1336a432cc77b553c9e1b0446a2d99a31f588ea865c3a242419dccf9a3a23086ee5ecb91380a8d55aeb9041f6428c903f06bc472e9997a7310abd82c
 EBUILD akonadi-notes-20.12.3.ebuild 468 BLAKE2B 111837329a0247ea9dc34b70577b1d3386ae6eb72cc44a0a4b159ee729f39f837eabe95b3face9488eb0f7bd4fb87af5ff3e0132b35420d8ce1eabb0344b62cd SHA512 2b6e7fa79282cd1d5e40831eb2d12cf3bbc0f726d3521f045c7c277eaeb2cf0f2c42bc8bca1100925413a6939c24d56fe5c9a083bf339924f0caaf5f8e37588f
-EBUILD akonadi-notes-21.04.2.ebuild 471 BLAKE2B 004abc42d1504de04c74e01d6e8ec71faea80975b15e4a1f391623490b0841d47f7fcc15586bd29a7a70be919c3463d54043cee53adbbcdeae02b73908ee7217 SHA512 2e3f775250ef9cc28c8a59d15cf7c37682b311089edb23d5ee3ba73f552cda21ac4cfcc7896b13e0a7c4fc6273cc9a3291321ace605221753bd2b5e737681833
 EBUILD akonadi-notes-21.04.3.ebuild 471 BLAKE2B 004abc42d1504de04c74e01d6e8ec71faea80975b15e4a1f391623490b0841d47f7fcc15586bd29a7a70be919c3463d54043cee53adbbcdeae02b73908ee7217 SHA512 2e3f775250ef9cc28c8a59d15cf7c37682b311089edb23d5ee3ba73f552cda21ac4cfcc7896b13e0a7c4fc6273cc9a3291321ace605221753bd2b5e737681833
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-21.04.2.ebuild b/kde-apps/akonadi-notes/akonadi-notes-21.04.2.ebuild
deleted file mode 100644
index 2131768ae4e5..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-21.04.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi notes integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 9c8f738ee88b..55cf55088a06 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,7 +1,5 @@
 DIST akonadi-search-20.12.3.tar.xz 93984 BLAKE2B 6a360f1acf51ac6647033278d14494ed83b11d227a84ccbe83d98bef2ec59067f71402702f6a6305e267a906ba2702449dbe2c7623e7d40ac58131af34ae570e SHA512 8942788fa0f5034661abd164136b33228ae71e2d305ad8dcbeb97737bfd9ea8d305d7ba6254ecccb160ac41047b3bcfd29e9ee17bb27a290e2e2e2033c09bc08
-DIST akonadi-search-21.04.2.tar.xz 98184 BLAKE2B 9a899f27882643a41d9564130deaeb2f38d7d6054902ebeea3b498fae019651c7f6a1c77529721720c362966b4a5462fb025dcfdd8fd4540ffff01a6a9bc2cad SHA512 b71964c0fc5e321c5818e25e4e8c0d62006c379b5a07057a01c0a1b1a2e4f73038e8950a0bbab77ceec239dd6aa7d3d9dbb58b0b133dd6d95137a27ccfdfa235
 DIST akonadi-search-21.04.3.tar.xz 98676 BLAKE2B 7d42c5e1a4c141ced81cc0ac7f3f8b941d6f7f03b358eb3e027eab12ddb65825d335a2e59ea5c956e6c8a4276e14cd90cb616e3a523ce4d708615da39d3df104 SHA512 cfeb929b4716a2a96e284dfec31688ec80b264a422cb2713fa20a8266452351f8d094f0dfd08c8687115c4862481901e183258e269a5ef2421a3736f89a677de
 EBUILD akonadi-search-20.12.3.ebuild 1301 BLAKE2B 85e1806f1e1d7f12404d315de50a0c74a4deb716c4d6aec4ce917fe902014a7506d5c35b8c942fb2a4122815b945194eace519bf40339d5a081802c9ec428c90 SHA512 e63b03fc6aceb77ff80c556bf01ba6d6d59248a68580c2c28225148ab5ad10d539746056a36f17892eb18871a53ba09d0d225ade082f3c81f68b1d2c87569f5c
-EBUILD akonadi-search-21.04.2.ebuild 1304 BLAKE2B 20a371855f158c90e8143675af67b286cf77ce3165af3ecb731e03482ed74ae5ac6f76b970386768ee055843ac4ccb1b4b7e4ad81e8410e867c1d06cb62e30b6 SHA512 8221ce7d4ebc2fcd959ab529d2fbbc6ad84fbc9fc22ef3d73a3a24fa6f5405bb71223bc8d919960254a4ee8b71a67c09218212ac2286703d309d1064be07f9cf
 EBUILD akonadi-search-21.04.3.ebuild 1304 BLAKE2B 20a371855f158c90e8143675af67b286cf77ce3165af3ecb731e03482ed74ae5ac6f76b970386768ee055843ac4ccb1b4b7e4ad81e8410e867c1d06cb62e30b6 SHA512 8221ce7d4ebc2fcd959ab529d2fbbc6ad84fbc9fc22ef3d73a3a24fa6f5405bb71223bc8d919960254a4ee8b71a67c09218212ac2286703d309d1064be07f9cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-21.04.2.ebuild b/kde-apps/akonadi-search/akonadi-search-21.04.2.ebuild
deleted file mode 100644
index 82ff1bfde225..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-21.04.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test" # perpetually broken, bug 662378
-
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-RDEPEND="
-	>=dev-libs/xapian-1.3:=[chert(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
-"
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 43f5d000abdb..7865122c8114 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -2,9 +2,7 @@ AUX README.gentoo 1607 BLAKE2B c5f6ae8c403ff0306e7c83f54d7b0bea5ae273e090d9ba1cb
 AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623
 AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19edf9d8a1139508b9fe3cd1f81a1e6a1ca7723def4ed81fb9bdc75822b00835ad65333bb1dc44a552d33f09bfd331a4ddb8e23d13 SHA512 acb0432f98a96d5af609d43dc5aa25d3d5d0668c9493c62b2339add0f3ef78d54449137884eafc0201b9f0f4de4543a584ef6cd746cd3634d1a84169cd0e4219
 DIST akonadi-20.12.3.tar.xz 1593588 BLAKE2B 783b75a21cf1b1771a5ed25fb25d395af374e249e43ae15f725e92921ef7afdf312cf39c60457a61ba549ba90fc3aebc8ef0b53b666ad1a89ce0cf58c43748b6 SHA512 516f240349b4a680ee8ab1986b8f3d018e9e54a8802aed404b3deb08491edd67413cc4bbb43aedc583f7110812b6bf41277f83908f54221cf21efb3b7f6e32df
-DIST akonadi-21.04.2.tar.xz 1610288 BLAKE2B f82b788af4ae7b5c238fa74de071918a3725e680b50ac05059109b6f7739f0ed34f2c98846045baf8ee2ad3b77a46e26f4575acbca74c10ee3c0e677572c3a0c SHA512 24a0105eb8db251f1bb7a2701593f36ae8a02d854d5bc8595a90374b804c7552eee4324729297bf8c6eee0be8ae72b50124f5da063ae334b6c76f6d522b3e824
 DIST akonadi-21.04.3.tar.xz 1610436 BLAKE2B 28bd02fd19c88c20dace16df8e738a35c7f02b45a216fc93589c1772f9862f175ea86f734bd28dd22c3261c3a8a09f45f194b2e925a3ed2745f402c891b39e5c SHA512 4da83167904ba21305963ba204fd23e42d7a9ae8bb7c1538dc694cccdeeb2bfd4f76bb558e8033d8b100800755308d6e8d6f5bbccd8a4cc5eab6f85484244044
 EBUILD akonadi-20.12.3.ebuild 3444 BLAKE2B 149f5e1df84514187600dcba980905b0e3a81ea1d169e15e0faf5c3a89c96979f35561fd050852314185bcf9e0d8b2396f1815c7280e62e2890d1c270f149a27 SHA512 16ebc6189f20119203af2e26c164324f5d82d7ca3d276e576a0aff2a07004ebbad400b8c99087f96cf6e451fdb849cf7f6c2d161f85a8b62c9839daf945ee3df
-EBUILD akonadi-21.04.2.ebuild 3448 BLAKE2B 923417260107f35463dccf16a7045ef952d4dbeb6766fa9a3a1fdd28230ac83959a7e08340cb9b9e59252e6b4e3e0e3e046a3055568a9cd48d9776d492d7bd0a SHA512 fabaac9fea2a96546e6b44103bec66f5e4b40dcb236919177bc1c02289a516b5efccd7dfe10d83443f73d704563f21f00ab4b080f4c4edf0b1bb93b5da58505c
 EBUILD akonadi-21.04.3.ebuild 3448 BLAKE2B 923417260107f35463dccf16a7045ef952d4dbeb6766fa9a3a1fdd28230ac83959a7e08340cb9b9e59252e6b4e3e0e3e046a3055568a9cd48d9776d492d7bd0a SHA512 fabaac9fea2a96546e6b44103bec66f5e4b40dcb236919177bc1c02289a516b5efccd7dfe10d83443f73d704563f21f00ab4b080f4c4edf0b1bb93b5da58505c
 MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e
diff --git a/kde-apps/akonadi/akonadi-21.04.2.ebuild b/kde-apps/akonadi/akonadi-21.04.2.ebuild
deleted file mode 100644
index 7e807c4a6a14..000000000000
--- a/kde-apps/akonadi/akonadi-21.04.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org readme.gentoo-r1
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	app-arch/xz-utils
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-20.08.3:5
-		net-libs/accounts-qt
-	)
-	sqlite? (
-		dev-db/sqlite:3
-		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
-	)
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-21.03.80-mysql56-crash.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE3"
-	use postgres && DRIVER="QPSQL"
-	use mysql && DRIVER="QMYSQL"
-
-	if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version "dev-db/mariadb"; then
-		ewarn
-		ewarn "Attention: Make sure to read README.gentoo after install."
-		ewarn
-	fi
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to"
-		ewarn "either MariaDB/MySQL or PostgreSQL in your user configuration."
-		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
-	fi
-
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake_use_find_package xml LibXml2)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	ecm_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are:"
-	use mysql && elog "  QMYSQL"
-	use postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE3"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	use mysql && elog
-	use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
-}
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 78891e6738af..0be904aa003b 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,7 +1,5 @@
 DIST akonadiconsole-20.12.3.tar.xz 198064 BLAKE2B 84d20b4e1b9194d7936848d9096f84da37419cb38384637c01adfecd9ccf800108e3c7465954f0c3e043746bd2da4047af829411e970bfebdf45950832e74d55 SHA512 6a24e4ea642621472f28d9ead78247830393ce2b917a0f8386890c2a61de4a95250e9cf0823a58a53501955e250860c55c0b536486ffd2b9d71b2347f47d2e82
-DIST akonadiconsole-21.04.2.tar.xz 201764 BLAKE2B 40aac167dc162855d71500fd8375748f271e431f33c20d68ca4a121297aaef3fe5235448211eb1d96049b361db2c29551c3bbfe198f0e63bd7e696abce62da79 SHA512 7202a6dd2999ba1a3bdee46b552958b53964ba55cec84425293acad74473ab2dad048e25338aabad7efb6d75ec627a242942fa396bc6d5c3311c6a4e9143f3ac
 DIST akonadiconsole-21.04.3.tar.xz 201740 BLAKE2B 89964b6592a155b80357299842aed95e7c1bc371734b408811f1345381e360a3c278f46f42806306182ad2becd8007962c54de5a928847744ddf82bb57c52d47 SHA512 d2a1daf6feba0154dedbdfebdfb1a5744e523a44d35ca38f46567c7cb50683ac83c604057230957be9d735ec5790e2a28abb2bbf1947156c7dd3104b9a2bafe4
 EBUILD akonadiconsole-20.12.3.ebuild 1481 BLAKE2B 70365c62cba2bd3bf2b3c6c6a0d18af426004bdef57962acdc727fe38152865792b89386ae2e15df95d8126ff91353bb672d74f3a4be47a9a35b86a63216fdaa SHA512 b87cf2d33cdcaf8634f7ee0c808657d9f39f246e95947750aadc8286a1e021e2269df0f7c7649cfaef32e056f5b9c53380e7cbd68c4906c29bd72b2cc4c80390
-EBUILD akonadiconsole-21.04.2.ebuild 1484 BLAKE2B 373f9525eafbb30290121ca22df0c63141a607e9b4d363bf98174d8884039d07fb8e2273fb3317a1afff5086f9a8e18b0f1e5bdcc361d04e50ba81a1f3ab00ce SHA512 e0bafad9142aa30c05f8916b7878ba93f52eda19df7fd6cd5c8212bd4939e2e3cb56a237639f53c77a4ea1a35a297376a1b3504d6a941cf63c78b03d2173f424
 EBUILD akonadiconsole-21.04.3.ebuild 1484 BLAKE2B 373f9525eafbb30290121ca22df0c63141a607e9b4d363bf98174d8884039d07fb8e2273fb3317a1afff5086f9a8e18b0f1e5bdcc361d04e50ba81a1f3ab00ce SHA512 e0bafad9142aa30c05f8916b7878ba93f52eda19df7fd6cd5c8212bd4939e2e3cb56a237639f53c77a4ea1a35a297376a1b3504d6a941cf63c78b03d2173f424
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-21.04.2.ebuild b/kde-apps/akonadiconsole/akonadiconsole-21.04.2.ebuild
deleted file mode 100644
index a0e66c6a00f1..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-21.04.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
-
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/xapian:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index aa38dabf82dd..9c631c0662bd 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,8 +1,6 @@
 AUX akregator-21.04.0-fix-dependencies.patch 1061 BLAKE2B eaec25b98a2f4aadb4547a50c1d732c015a6775aa435a0ff866289e794eba9cd927a8b510f034463a11610332d73a96a768a8fa90686c2ccae0851d8ead853db SHA512 1e1cae77456104dd127076439f857e26950ec672ee22ddb37b6218eece56ebbddf37d93fede886ecce606717260df7066db2ad1603483a69017bca1bb35bd3dd
 DIST akregator-20.12.3.tar.xz 2206188 BLAKE2B b1bb959de8d792057b6542a9f059687121fc3cfcffa36e519ebbb10940f1a0d002d9d3c0784e0c1f0163ebaf7442fea19985fe434a728c060e254fbbc8369624 SHA512 f223c45fb63a844a1f662c3a77a1f6d23a9b0f8de738fd3a0a88379a82c1be4343536f6ae11856839b03406181ed1bc42cee8ab2cb1ff2515a74a2adb2327ad7
-DIST akregator-21.04.2.tar.xz 2250484 BLAKE2B c51c05eee6997727d21825027950dc6e8b4315af51acab83e0ab53329b5ef0dfae2275dbe35fa50692ec4de48c51fa20a080fc6b1df441b425300c10172fa4f8 SHA512 0b851c22ae249c0b37464ba2a2e05f2f96ef448b13af21c0da5dbe40bd9e2f2b2ced1a7e7c108ec9fe2430ba41355c4eef61f4624e86fd40d2d39f02179eae3b
 DIST akregator-21.04.3.tar.xz 2250844 BLAKE2B 25b3e5d2699509d2bc4ce141065eca1da6974314473497c104f75a5054a195106750d084eae9dd11e4f5619d056da0a6b7d86fa7aaec56ca424d566b3fc9edb6 SHA512 cf431b849e31d01976414f89a887f4de46b22607cfbf4332f272ac15cc0d8334df6adbf03c7a3106b560dc01b58522966906bc828333d25cd872d8e7a6cbf396
 EBUILD akregator-20.12.3.ebuild 1802 BLAKE2B f207d7464a271d66f2762c45d91cb4afd541898da1e4e31e7db870fa2543db3bc75dd05e6fa8b494818e5d9c7e27fb3388db0592dc383b8fb625d1134462c6fe SHA512 cdf959861b19a7bfc091927afbda3e5c8a519ec5d876eefbc03464952e9bc5c6e988626a2d0ab2b02fae5ecfc0262d921b9e306b06050ab8eaf186e708df4aca
-EBUILD akregator-21.04.2.ebuild 1805 BLAKE2B 5c94937e76c374834bee70bae4e167e5f9ed80eca3b54f17672e1e1b1577536c3e412c7b57a078fa15f9c68e68c993587c3cfbe8e4353d68b1e1dc65dcd041ca SHA512 80b7b5abe03fba6f3b1ae81f3772e69b0965f1b457e87b36e3ebba8ca56ccc5c18e4e11c8a2ec30b0597a91d0c9e159ccf900d39e6f85e1037e4556b875ee732
 EBUILD akregator-21.04.3.ebuild 1805 BLAKE2B 5c94937e76c374834bee70bae4e167e5f9ed80eca3b54f17672e1e1b1577536c3e412c7b57a078fa15f9c68e68c993587c3cfbe8e4353d68b1e1dc65dcd041ca SHA512 80b7b5abe03fba6f3b1ae81f3772e69b0965f1b457e87b36e3ebba8ca56ccc5c18e4e11c8a2ec30b0597a91d0c9e159ccf900d39e6f85e1037e4556b875ee732
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-21.04.2.ebuild b/kde-apps/akregator/akregator-21.04.2.ebuild
deleted file mode 100644
index 6b59cc52f087..000000000000
--- a/kde-apps/akregator/akregator-21.04.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://apps.kde.org/akregator/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syndication-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/grantlee:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-21.04.0-fix-dependencies.patch" ) # bug 783921
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index 5247a1acc523..073e9ab6f32c 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,7 +1,5 @@
 DIST analitza-20.12.3.tar.xz 341640 BLAKE2B 0efcf1596f78413523375ec5dbc3ce9007c36ad71173d03f5c9de7de5add8353c856b27c0d18d2243969d4c147664844a39023eee8df32792c6e8e8ab7aaf1db SHA512 2357c5395bcdf66b1a54de7404441ef6966ef6b2a6c2c9a6cc31d5104a126acdd09f7aeb3f4d605591c0e2753a32967eafbccb48e188c96318126ed6657b0d01
-DIST analitza-21.04.2.tar.xz 346032 BLAKE2B ece76aa5ab8dfbaca7d1bb0dcffe0a737c9a83bf49f729d0818d5409c20209b17b44a9509a57e72265ad38fef292117f0a503c02e4af634657e7e3f1ad86ebd2 SHA512 978a3b642f9192792f97bf88732c0184c2dcc8ab980fa976a59bb01483d1f8cd3411d0019e33f5b429d1e4af254517220243c51319e53225b0f8dda12cb3d1dd
 DIST analitza-21.04.3.tar.xz 346104 BLAKE2B 4187d20ae90dd7e2e326af2cb3ae7e0d2fc2d07feba2565bce63be089115f6e2b898fce316aa1ee7ecafed8b1d2da1c9277217481510d907186d2cbc5f9e23a7 SHA512 d97139f9868e8ad19d8560bcc403fa9a45761581c1f048de113523a157d15b201288bf87c79d634ed408660ceb6f31e0514e1e09c73f5c95e0cda3c659bbe211
 EBUILD analitza-20.12.3.ebuild 913 BLAKE2B c458cf7ca5ed9a9283efaea699c7be1eea149280b95734f1f556b8435154377e67bbcde441082d6edbbf5b91153583f7c0cf4cab3e1b19a4617fc4a2162a35fd SHA512 b108b40cfedce4b6c7de394a43a6f342526e855447aa42cabfb2c133b72760cc41763b9ddfbea71aede71a6e3098393637d6d12d20209405b193ba67022344d6
-EBUILD analitza-21.04.2.ebuild 916 BLAKE2B 1ec4d19088961208ba62a7db4cfbe0368f79ad239226a62eb33884bc8e1daeb75264396539ee35046eaceb3dd450831d0d63d1cfc111dcfc90c0803e541769a1 SHA512 775a5e64f37d04503c5b9181f843429f95c90c20ea41e4a4be963e9216ca66e2c3f32afcb64935560e462bb9f03dc9d62fcc812ff756cfba42f479709befb7e1
 EBUILD analitza-21.04.3.ebuild 916 BLAKE2B 1ec4d19088961208ba62a7db4cfbe0368f79ad239226a62eb33884bc8e1daeb75264396539ee35046eaceb3dd450831d0d63d1cfc111dcfc90c0803e541769a1 SHA512 775a5e64f37d04503c5b9181f843429f95c90c20ea41e4a4be963e9216ca66e2c3f32afcb64935560e462bb9f03dc9d62fcc812ff756cfba42f479709befb7e1
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-21.04.2.ebuild b/kde-apps/analitza/analitza-21.04.2.ebuild
deleted file mode 100644
index aa7c43b7fda8..000000000000
--- a/kde-apps/analitza/analitza-21.04.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE library for mathematical features"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="eigen nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	eigen? ( dev-cpp/eigen:3 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use test; then
-		sed -i \
-			-e "/add_subdirectory(examples)/ s/^/#DONT/" \
-			analitzaplot/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package eigen Eigen3)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 2133b872d066..83f224861804 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,7 +1,5 @@
 DIST ark-20.12.3.tar.xz 2717324 BLAKE2B 120dd525b1f6a4230dcb6307b86ff866161ba9da8a47d7a13852ebe028d0efc936b1aaaa69160329fff82d26fcb2aa4d198d09c4d1407774c1184aa7c4aaecdf SHA512 c6f3da5f3c24ad274891af99dd118d0c852382ce632abbc1273a5b6e216ecb53ef466d49d2279d3e6f0e1b088975584eadb2d2182d3819b888047c0a59ba0a7a
-DIST ark-21.04.2.tar.xz 2757376 BLAKE2B f6b38067092382c214a25afdc1bf1beb66c6d9327b76b9e3dbd4ad9b957483c37556f1e1a0941634f0f2e6f49847b700ab12aa09b5dca9694eecea414e98cae1 SHA512 dcdb47508c5089a7377687721840ca7c7079d331b98923141bf4d01a2279cc221014dffc394ca1b6359df963ada85cf4abb258cfe0dc6bd80292dbeb4a119a9f
 DIST ark-21.04.3.tar.xz 2757408 BLAKE2B edc2c874addb49c56f24c0f506d2c39ccd912887f1f30cb3e6eca49749beb22a99ba42c43ed3ce81d94a0b4fe2dc86e842c35ae71ef35d3e68e97d6e8d00d1b7 SHA512 dd68e113d770b5f871b5fc9b9adc136af4fce814f04ee14c18ad16e17ce4c740aafc6a4fd867878142a500590e074d0068ab6cc1ac87d4f8178ec0d4e1f763a4
 EBUILD ark-20.12.3.ebuild 1950 BLAKE2B 86cf329bb2b3e40049616b487b2012889c4f980bd35e069f29d1df30fcfbf8df4167c8bdefa6074ebb1bd6908e9a58ceeaeb44e7b74d568a3a0f44467c517468 SHA512 6ddc1098c27ef28838f5cedb75e77cfd0f54801e7eff35b62857d26fdc6ed209d6a69e082189a94fb972fe7dd33a70ba5bcad9d3c77e54cacce4dd6effee15ee
-EBUILD ark-21.04.2.ebuild 1953 BLAKE2B 96e7ca6c7952643f01a320fa99755a9b2ad14c021b63deab62d77c342078b98ff6054cb08af7e35f98c962c254db427889bb946925b1f7d068da477a50957d2a SHA512 73137e40cd766699e973c6681721bc54cfc3001e78cceeacba378a4100704c5368f4f195aabe6ffe97ff50346699600666eb7d2c168a8b50def05f525d8c8335
 EBUILD ark-21.04.3.ebuild 1953 BLAKE2B 96e7ca6c7952643f01a320fa99755a9b2ad14c021b63deab62d77c342078b98ff6054cb08af7e35f98c962c254db427889bb946925b1f7d068da477a50957d2a SHA512 73137e40cd766699e973c6681721bc54cfc3001e78cceeacba378a4100704c5368f4f195aabe6ffe97ff50346699600666eb7d2c168a8b50def05f525d8c8335
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-21.04.2.ebuild b/kde-apps/ark/ark-21.04.2.ebuild
deleted file mode 100644
index 06239e1497be..000000000000
--- a/kde-apps/ark/ark-21.04.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="File archiver by KDE"
-HOMEPAGE="https://apps.kde.org/ark/ https://utils.kde.org/projects/ark/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="zip"
-
-BDEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	app-arch/libarchive:=[bzip2,lzma,zlib]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	sys-libs/zlib
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package zip LibZip)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		-E "(plugins-clirartest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "rar archive creation/extraction" app-arch/rar
-		optfeature "rar archive extraction only" app-arch/unar app-arch/unrar
-		optfeature "7-Zip archive support" app-arch/p7zip
-		optfeature "lrz archive support" app-arch/lrzip
-		optfeature "markdown support in text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 6bef16279b63..fac3c83e5e39 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,7 +1,5 @@
 DIST artikulate-20.12.3.tar.xz 1085400 BLAKE2B e482a4cb9e4414737bb60b12ba6fec542a804f885f8723b2e8a01a7ceccb09aead993ee7f98358e02e1d9401ddda2348bc6ba18d95f9566c4af1e16c2ee47edb SHA512 34fec06e45120745c668e58ce691c68c28c56e8528a163c6fa330419018cef258a5ce7a33d2e2cdba991e256a50c2523460ca5224180b37e8764559a229ac3a6
-DIST artikulate-21.04.2.tar.xz 1090528 BLAKE2B c3691ce7ddc60b7edfe4a719dc2a4bf8f45d4d55af54c26064bcf33c6c0fbc529728d4ab8a6c3f8c44de4cd257abd58a904fcb0fc566ea62ab181c084ee6aa37 SHA512 2e0998b82092125c17316d30800dd63e638182138a0d8feb63c44da462828f90e281e4c23b2f8fc98f0f86f06326a0554857180734e91d3737a648bd1430693d
 DIST artikulate-21.04.3.tar.xz 1090580 BLAKE2B 974f3eb1cdf8dea80d967cc7311438e0b95688f19240e0c7e7472bce3d9f4c5a6f036c16774ef1709d05f0217918760b696390b7f21bc9b25a403c3326bd6aa0 SHA512 08ce1529011ec0a7baf6417f4839093efac80f79919213e5f85bf0de8575f28966cff0ce24735e07ea3bd0684eacd05a98cd1903b4f46156ee70dda446f1ffa9
 EBUILD artikulate-20.12.3.ebuild 1080 BLAKE2B 133ff3e3ca96b49540a8e1ef6cdca0742e3606d1994b8a7bcab1e87987848037d25a63ba31dc17bcfbcec4baf5ba5a3ac2797af78110bfc93fd28ad4b82ce96d SHA512 358b7f6bc6e11b88c78a6d197aad5f586898223424e7913d26d4d1c4f0468f3300f62a2e5020096c2b9108eade1007af73002342c7a8e834750a98d23b8eb3db
-EBUILD artikulate-21.04.2.ebuild 1083 BLAKE2B 29e59a54b6a5b2ad76603d1834e91a4d85b93cb383784b3f8bf9f633fe6b393b53c7ea8e77dc8d4fa15519686e2fb737074213cbbcdb7a7d376136278b06428a SHA512 0bc6bfed98e3401451d285796358f08fa9eadba49e1a5587d8fa1b1455a6bf75d19d25c3ca44d65a831f877502438e2f844d6937d4534f3ca5c7123c499f98f4
 EBUILD artikulate-21.04.3.ebuild 1083 BLAKE2B 29e59a54b6a5b2ad76603d1834e91a4d85b93cb383784b3f8bf9f633fe6b393b53c7ea8e77dc8d4fa15519686e2fb737074213cbbcdb7a7d376136278b06428a SHA512 0bc6bfed98e3401451d285796358f08fa9eadba49e1a5587d8fa1b1455a6bf75d19d25c3ca44d65a831f877502438e2f844d6937d4534f3ca5c7123c499f98f4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/artikulate/artikulate-21.04.2.ebuild b/kde-apps/artikulate/artikulate-21.04.2.ebuild
deleted file mode 100644
index 67d5b6648309..000000000000
--- a/kde-apps/artikulate/artikulate-21.04.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Language learning application that helps improving pronunciation skills"
-HOMEPAGE="https://apps.kde.org/artikulate/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GSTREAMER_PLUGIN=OFF
-		-DBUILD_QTMULTIMEDIA_PLUGIN=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index ac177c87068c..8bfebc7f8edc 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,8 +1,6 @@
 AUX audiocd-kio-19.04.0-handbook.patch 717 BLAKE2B 997c82779a9598d0ffbb0605ca7b9f71ed62298ea3f3acb2ec88ee99417dac84fd8e6ffa0036d036346bf28612c6bb4323ce2e4f62316c4d321201d00462e665 SHA512 7601c79145be90cc9a49eec28b8ff63e275212d76d4faba779a1cda53c45ad863cd638de64d522c099a2c8858275c92058928a6f4396951aaf370277189e72ba
 DIST audiocd-kio-20.12.3.tar.xz 500672 BLAKE2B 44cd5c3f0670f4336352126fa569c5ee53182efca435d6d308b00a50021190b9627f1bc8ac4b64faa1f25fc3f9aa2f9b91a611c1333f9e8341c6a9ba6fa4156e SHA512 0b5d343f802cee3435fa1aadf39ddba3afa6ec70569bab00da0e0cbda4360618e5384042c913a4e54017f82f27f3f202a509d933762d1b7ef4884d2ba70556bc
-DIST audiocd-kio-21.04.2.tar.xz 517752 BLAKE2B 41b4b8b7df767dfb02f883a33d103e3f0fa293d73112c2c76c22e845a7352a6cbc0dfd4d4946243a3d1f159a878918116cfd543fa1748e30702c25e0eb7031bf SHA512 3135d4787e77d45f33f5edd3398570569c40b5aebd89d7beb04c772b153ff4ef6026218e425fbd511cb51b98eab2d25ec3a8bf622111a51173b37ddca781674d
 DIST audiocd-kio-21.04.3.tar.xz 517876 BLAKE2B 6e6727c4fa02189184bf0702c92860bfb1a4daa5511a15b279af9101ade0eb0740c8364bca486ae2e317c87e9861b85948bd3ecf70dcb4a213811de1b65b0ed2 SHA512 05c824efdd308070a113ec81b1bb8ff3dea1399c2e9228e7d239ade670bc9e6934cee9abc21deaffa01720d0563a116de786320db19c543c06be675be96d8512
 EBUILD audiocd-kio-20.12.3.ebuild 1082 BLAKE2B 2e96da3421b53f2b2c905dfdd7996b24458c81377cad88e20784d20cb7f7c17f0a1e99f0e9554cc078b7830f1fe81647a14bdd687a9a493094cbd4cb4c00e50d SHA512 f665506398264e550c8022b12b8fbad2054688011b15fdd902f3929ca0aad76f3bb238fbdd991866c20699f7170593d99cbd03e15038dacded8d34029fd7c00e
-EBUILD audiocd-kio-21.04.2.ebuild 1085 BLAKE2B b87b785a67ce6a1a6ec388f83f69d9498c0d7a1db3fe295ccd3b32dc465cedc6428deb88c28658283339ab3d02a79d48644e28a1e9e1b31d1e2d9cd698cfcd5d SHA512 7bf729e0364b9e5ed32eed37c9e833316fc99b814154b01e743f3c0e6c2ac054c13095a8b860c4a55b54a31067ac7418476dea42fb55fc7123352f94bf7a79c6
 EBUILD audiocd-kio-21.04.3.ebuild 1085 BLAKE2B b87b785a67ce6a1a6ec388f83f69d9498c0d7a1db3fe295ccd3b32dc465cedc6428deb88c28658283339ab3d02a79d48644e28a1e9e1b31d1e2d9cd698cfcd5d SHA512 7bf729e0364b9e5ed32eed37c9e833316fc99b814154b01e743f3c0e6c2ac054c13095a8b860c4a55b54a31067ac7418476dea42fb55fc7123352f94bf7a79c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-21.04.2.ebuild b/kde-apps/audiocd-kio/audiocd-kio-21.04.2.ebuild
deleted file mode 100644
index af5c2a65eb01..000000000000
--- a/kde-apps/audiocd-kio/audiocd-kio-21.04.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="kioslave for accessing audio CDs"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="flac vorbis"
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkcddb-${PVCUT}:5
-	>=kde-apps/libkcompactdisc-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	media-sound/cdparanoia
-	flac? ( >=media-libs/flac-1.1.2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-19.04.0-handbook.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package flac FLAC)
-		$(cmake_use_find_package vorbis OggVorbis)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index a3a762f41185..133a0a1d4c26 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,7 +1,5 @@
 DIST baloo-widgets-20.12.3.tar.xz 261628 BLAKE2B 95bfc55b901dca67795572e4bd77c5822f1bdfd87c9b24526a1275e556c5ae612d54cead1f6f0d20bb519f39304cfb3d9cb6a59369624a215724178320d0ffc7 SHA512 dc00b8196cb0128c69188981b691b17ef242dc150b38322fa7094b400393cd4b592be472c1c17991fd85f8d606f4138936d225a02568b24ee28440ecdba37650
-DIST baloo-widgets-21.04.2.tar.xz 262684 BLAKE2B 852f9e0b35689ba78f288efcae08b087df9670c5cacfc11a4d863ce4975923f07e080089527125ba0e878b7d0a0cf3d89bd96ae7c1c7a139b7415f3e103ab86d SHA512 94a4e8b35f94a47a18fd3682010a75ee56ee393e0041725c7de2cc8245b7899aa32c7f0d7513116cb030308e9fad36c8d7ebb3760201c6414a3ae52ef71da09a
 DIST baloo-widgets-21.04.3.tar.xz 262660 BLAKE2B a8ed3204f80d5c98dc9081dbfc434b855dd193f7c192cf96820d21fd5677848e5b5da51c158cb90549fb498ef7e2d8147d2ec3f20902c0ed25eca360b2c5016b SHA512 89f83b02052d61079ef4b7bc879e1e6deb0f4ffec90905f40cbc0f8647437852a679bf606f1368d68d9d5fff4532e0d3be8ec48ee1f1431a3ed9a03e1e541d5f
 EBUILD baloo-widgets-20.12.3.ebuild 704 BLAKE2B f0f4d61e4937ee0488899d3ca05700c1052dfc475410f24b8d821c324454196124e3868bc21a22435cec574e7495fb708fc60ad23f9431cfff886332761f0e0f SHA512 76d8d06232f7b5919a1a68bf944fcdc9896cbd5f74f3d890624177456d3bdf793879d6a5f50b66f216ed548a5d1ba78bdb99fc7b879ba2acc000f6d88d2b7ff9
-EBUILD baloo-widgets-21.04.2.ebuild 707 BLAKE2B 6d8547ba0f5e07a9be6b6bc461643eabe8d4108d0fc4e108517176dc6a77ec3c5ee7f2fac6814847fffa7c22e085f0aeec57ed704c818085cd1faad2ea29231d SHA512 1335a37eca3bd5acfd901725b1420496b75d7995ce268b83d00125bf73203803c394eb04268ea04130a33eacf63531c805da9468287a6b3df09945b3337d8760
 EBUILD baloo-widgets-21.04.3.ebuild 707 BLAKE2B 6d8547ba0f5e07a9be6b6bc461643eabe8d4108d0fc4e108517176dc6a77ec3c5ee7f2fac6814847fffa7c22e085f0aeec57ed704c818085cd1faad2ea29231d SHA512 1335a37eca3bd5acfd901725b1420496b75d7995ce268b83d00125bf73203803c394eb04268ea04130a33eacf63531c805da9468287a6b3df09945b3337d8760
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-21.04.2.ebuild b/kde-apps/baloo-widgets/baloo-widgets-21.04.2.ebuild
deleted file mode 100644
index 4d5d9a6075bf..000000000000
--- a/kde-apps/baloo-widgets/baloo-widgets-21.04.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Widget library for baloo"
-
-LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/baloo-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index ca46382dd7be..652191eeed08 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,7 +1,5 @@
 DIST blinken-20.12.3.tar.xz 2537996 BLAKE2B e45062261af09bcb568ae04e99bd6c1070ce6aeee92ddd4f78cbd27399a4635b0d43a6e53b52c3c03ea54e25316334d9b7589716be4be137941ea3d73cc6fe18 SHA512 0c78fdddb9772f003e73ef12cd09557fa0af469ecdbbbefe1b6c01e236f6d882b93182bdd99427d430eb680a0cfb2346a36df54f626cab568bb86d60e1fe3a84
-DIST blinken-21.04.2.tar.xz 2712672 BLAKE2B 3cc1c6350d07344d7d447e8d4833f243cbc36a6db417a467c8055c1398e5601feca1b8051dd1b85f97801209eb543bcc6b1758fad80a6d85aa3ab2db5e4c026d SHA512 d5b94a9a1f818a890364836509d48dc1880b2935c0a09d5e2ac6f31ba6b6f194dd737da0a2c7e4bd264a01162ac6b720e305de7dc8ea50656aa39af7ea6d8bd6
 DIST blinken-21.04.3.tar.xz 2713184 BLAKE2B 81fc786d91c752780ef1855881e4a7f50a5ffba5492ad6fcf35673fa8a046035d798f42352161761e228b50870dc61f7206893511d1b30bc4c781f190765a14c SHA512 245944eb06df94f2df53596f7947fb5eaf8c543062234ab5e8dee61114523e9a40c0c85854509f7e48c0bcdf01ca632925f75a6d69a0870563d1c1869523dd06
 EBUILD blinken-20.12.3.ebuild 896 BLAKE2B 04b5358a6750bd32af51fbd97308565237fa5f4dd3db12d94313d72240c80bbc47b342a774331eca9fc9d426c70d86c648a515c16af86be0e24b45f8c58ea04a SHA512 060d916f45b76999e7d9e1541c06d7e348d4e7a48a000e4c4baf4cd588a0798815b445d01f96258cebb1be0a1499c7372706dd88169e1b0505202b4599c0b80c
-EBUILD blinken-21.04.2.ebuild 899 BLAKE2B df9c3dccf4cffeb20d3843c754759034e460a37d14d19bb320cf91e6aa81026eff55e967e46f908cfbd4358857ce017a49129d5e8e4250296381a85a967dd337 SHA512 a6f0bff93a31fda3a16f06526c1233631779f5b8ec35ea9b176eccf0ed60f34a9119691f2982db1d0e10e4674a9cda537476cd2a4def82c0fa2c8548b262e872
 EBUILD blinken-21.04.3.ebuild 899 BLAKE2B df9c3dccf4cffeb20d3843c754759034e460a37d14d19bb320cf91e6aa81026eff55e967e46f908cfbd4358857ce017a49129d5e8e4250296381a85a967dd337 SHA512 a6f0bff93a31fda3a16f06526c1233631779f5b8ec35ea9b176eccf0ed60f34a9119691f2982db1d0e10e4674a9cda537476cd2a4def82c0fa2c8548b262e872
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-21.04.2.ebuild b/kde-apps/blinken/blinken-21.04.2.ebuild
deleted file mode 100644
index 42de31323cfe..000000000000
--- a/kde-apps/blinken/blinken-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Memory enhancement game based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/blinken/ https://edu.kde.org/blinken/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	ecm_src_install
-	rm "${ED}"/usr/share/${PN}/README.packagers || die
-}
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 8e7da579101e..a5602ea36ee6 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,7 +1,5 @@
 DIST bomber-20.12.3.tar.xz 825104 BLAKE2B 1f252e8edc3f3e0a033efc8dece86c62227508379ab5766f1165f6313be5a7008a90d10491a9ba97f4e7ec96751b66769c6fcaf03b0ed766536d00fda2e06d8d SHA512 4a40b968507ee3c0b9db4fd0adb87a734a11e170599513fc2bccf4086047eb9991ca566109f82b7b147cb551efe50e9ecb95d9a3a8b723a8c2c7823cebbde50c
-DIST bomber-21.04.2.tar.xz 828772 BLAKE2B ccbfe2f61f12ac759f1aa4f8302831c3088bafb95c5b8d906fa627413ec7e16f56eff9a85417835371ad17bae0c9400fdc7ac5f3bb3230613924b5ed24d55fec SHA512 7ffe8a7cc01beba674cfaf06693b211dd6548cee71360ed5b04edad4b8976e5c749a0b555d98197e2d1cf7668bd5c1f14ce21bdc422325e6759a9a1a70f8110b
 DIST bomber-21.04.3.tar.xz 828452 BLAKE2B f7fbd659a6e8560d2af3a34c39562a63d9e61d7f4211701e74daa15be42c9a07c7fbd1cd4e57bdaaa1409dd90aa937913b0b0b5ee355cbcd1b49ab46fd8e5898 SHA512 3d03b2a5cad86862e694195cb02b93392f7fc6c750fd8c90d6d137277cb35b081aac2a9c3900ff6703a5e99c9184f121a415a734f356cd6272f7ff066d54becb
 EBUILD bomber-20.12.3.ebuild 837 BLAKE2B 0f6c139a5e9c26ac94e2592f95a6af9b74528b655dcaba6d327eee26549f85cdc71667007a06ff40b2e1575a82897c439496bbb93fffbbe037913695757b1538 SHA512 77b42a2b9f84bf182d15929c34c4bcd26126cc41b1daa3fc390c21b77ad935857a86d59f497649fb8f57eee17da5ec0316aa9ca812637a1545596298acdbfa4b
-EBUILD bomber-21.04.2.ebuild 840 BLAKE2B 9f39877c192b2b232be236a309c1364480f7f053ead48b570f2a9c4988bd62b99cbd9b269d5c8d65d2b32f0d41868b1c8f5cc9b35217290a2fd3e33187a8d415 SHA512 3c2089c3c7d650ea6df541937c66b8c4c0f00bf40ffa7a2f8cfc4638ae211f47e1adc1fabee9a8e2968886c7ba7dba2d02c5490680437e8eaf7da7d69bf799ce
 EBUILD bomber-21.04.3.ebuild 840 BLAKE2B 9f39877c192b2b232be236a309c1364480f7f053ead48b570f2a9c4988bd62b99cbd9b269d5c8d65d2b32f0d41868b1c8f5cc9b35217290a2fd3e33187a8d415 SHA512 3c2089c3c7d650ea6df541937c66b8c4c0f00bf40ffa7a2f8cfc4638ae211f47e1adc1fabee9a8e2968886c7ba7dba2d02c5490680437e8eaf7da7d69bf799ce
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-21.04.2.ebuild b/kde-apps/bomber/bomber-21.04.2.ebuild
deleted file mode 100644
index 3ebb460d76c9..000000000000
--- a/kde-apps/bomber/bomber-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Single player arcade bombing game"
-HOMEPAGE="https://apps.kde.org/bomber/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	!games-action/xbomber
-"
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index d45c7db7c7cc..337e81e742ff 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,7 +1,5 @@
 DIST bovo-20.12.3.tar.xz 205792 BLAKE2B 53589575bf462c3ea9c73e0b85fe3af0b60996dcc39ef90e53bc6704d4d927f3b883373b16897ffe77e959f4ef003eebcb5a597b01966cda0ac0a119087dc28a SHA512 3da7166ea79a597eb8efa092fdcaf85a89f32d2fd8cd9113d33741701c259d2267ace1f050ba87f5ed035cd451aa44fc77cb687a3321fa26a48adf118c4fe2ee
-DIST bovo-21.04.2.tar.xz 207140 BLAKE2B a4e9f306cccbdd4f49db8504b9a1e48984cdca92b0e6335563b17c31a2fe0c06928e0c3be38773be02b4a2ea428af92287443daee2282feb1eaac268f3f9b062 SHA512 764528acfb921935ab67e2b7db0fa3c1de3e48fc7855d4d3b8ccdfc90e1e77eac3c6e27fd3638ad3f4bd78f2c34651c06a40d2df83a1e53a24d94a8185cd4a60
 DIST bovo-21.04.3.tar.xz 207032 BLAKE2B ddf93f0987acfde679a5ff50f854ab36c9ce7e8405d0f3d188dd89482ab476bd93e889bdc7cf2bc39e4f05829c13e02df41fc81d5bf6d68e4baf362d2e065358 SHA512 13c7c3bcf275f1f4ccfd4754844b4ab08618ed80a5ba0681bdc62aadb1a7e8a4275c56c5967394d553890c384198d2bfa49dc66200642ea9e5608bff64006691
 EBUILD bovo-20.12.3.ebuild 850 BLAKE2B f56d288fed804eea909c138e6544faf71b253e09c28e5b5dfbf0b6e44fbd063d2193b722885d4c13e1c99571e180456770b857d21838c0c39a818d2fc5313027 SHA512 f538b5cbb4d2054254f109d0f766fcb261de341d9904c18401a0492c76b5f78fff109c96c94e5ee7e3135ba8ce450864a0783e6079892101f3c46583e717e430
-EBUILD bovo-21.04.2.ebuild 853 BLAKE2B 035cd4101b9ca78ee6b5d93e40b581fc1b5629ec56b0df2633060c4e2b56d8494a2d77a37ec4936dd02996964c1c63be414eff1976fd32c45fc79f872b20a7d1 SHA512 33f7721a6bcd246038ebca7e05bd2cb8b6e86926fef5705d6af75035b259214f2371eb85690c950a2205249072b8b9f48ed9b94f864ae2563eec667e79ac8247
 EBUILD bovo-21.04.3.ebuild 853 BLAKE2B 035cd4101b9ca78ee6b5d93e40b581fc1b5629ec56b0df2633060c4e2b56d8494a2d77a37ec4936dd02996964c1c63be414eff1976fd32c45fc79f872b20a7d1 SHA512 33f7721a6bcd246038ebca7e05bd2cb8b6e86926fef5705d6af75035b259214f2371eb85690c950a2205249072b8b9f48ed9b94f864ae2563eec667e79ac8247
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-21.04.2.ebuild b/kde-apps/bovo/bovo-21.04.2.ebuild
deleted file mode 100644
index 5e0741ed3a19..000000000000
--- a/kde-apps/bovo/bovo-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Five-in-a-row Board Game"
-HOMEPAGE="https://apps.kde.org/bovo/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index fa2ca731c209..b1440cf2e30b 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,7 +1,5 @@
 DIST akonadi-calendar-tools-20.12.3.tar.xz 224860 BLAKE2B 0f03e653c6cde40a1288fe24d92d612e238768fe38f9c10e7ddf0a20c18cdc8ce44c85e416a0535bf45a8730dee33358a8027a2c7a67442e98d65066de5c3109 SHA512 5890454e49f4cfb04e3edb4895eb4f4f7abfba691185ccc9b9b3c3efc3d675cfe8c7b493b3378143d5da552ff784a391fd194c7107e4ddd11434aa3c130e5d56
-DIST akonadi-calendar-tools-21.04.2.tar.xz 236940 BLAKE2B ee710eaf667aa6b925318ff317f6814e0914b528dee77a6614384a2a4f4f44c5282fb7be7d8a83005518861fe7f6ca0f0e03dd350ecdbdaee7271653ac7661bf SHA512 e8114c0f5b808e212584527cb0cc7a6129f24a65c2f895bf9f296adeb27017712a78e9613f89aebcd0d07b8a76359f01908ffd637248a00a9330256dcfba93a7
 DIST akonadi-calendar-tools-21.04.3.tar.xz 236956 BLAKE2B 96ff649f343c240dff36c80dcf538a2d8f6dcdca678ca8b24a13e1fcd95f513ba1066ceabf8aefe9b5ed00059b797e1944155e8ff4123c29a5d92d681409ce49 SHA512 c2c7d856aa3805b44beac964212fe20a8c63f0e2950e9111d93270a05e48b37ac39339b94067bc3558d2651d5617c82d34433f0741722fbd16b8661e1f02ef3e
 EBUILD calendarjanitor-20.12.3.ebuild 1085 BLAKE2B 1cbd02f4d8eb4ab4468b3650c845cd5c35a56677fd8ff4b01d011bf6847bdb04c9009c53300f6293b28759ffc066ab74080bf98b6f6793d7138321949c7af69a SHA512 53157f89ab676ad494354aa5d2aa9be60492ef4ae3f4d2b424cd9d66969cc3dc53ac399bf0a79990771de73f014387a94b8ef74af6c004546bcad456b593f158
-EBUILD calendarjanitor-21.04.2.ebuild 1088 BLAKE2B 3afa1cd1f78c193905bbb8161bf6c2a18c534aee0b89770037a897e3463bdfb9ae733c178c6fc3d94960884cd53ead00c58d8fdb4d74832f01fbda702301e61c SHA512 f0b89223972c60abccb41c596afa3f7f0dd176a683d1210cde76264fc97b8d5a56b4fb9874a21b532c753ac8f8597bd838f3d08bc19d6523e1a02c88dbbc3f05
 EBUILD calendarjanitor-21.04.3.ebuild 1088 BLAKE2B 3afa1cd1f78c193905bbb8161bf6c2a18c534aee0b89770037a897e3463bdfb9ae733c178c6fc3d94960884cd53ead00c58d8fdb4d74832f01fbda702301e61c SHA512 f0b89223972c60abccb41c596afa3f7f0dd176a683d1210cde76264fc97b8d5a56b4fb9874a21b532c753ac8f8597bd838f3d08bc19d6523e1a02c88dbbc3f05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-21.04.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-21.04.2.ebuild
deleted file mode 100644
index 27ee1f1d5ada..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-21.04.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="false"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
-	# delete colliding konsolekalendar translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/konsolekalendar.po || die
-		rm -rf po/*/docs/konsolekalendar || die
-	fi
-}
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 12a5a2ee01f5..ac4078f5dad9 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,7 +1,5 @@
 DIST calendarsupport-20.12.3.tar.xz 666200 BLAKE2B 9ba81d61384fb1f5f88c7166f54bb68989657416432948a5709451bc3387102c2b54e99465f15b7e1dcaf46a917a2e211a8fdfc2ad1be09f651a899a593d11a3 SHA512 cfb2c1faabdeae1aee13d1f0a6e3b960b68e835e5f96dc86acb9af7c84d57516b3e7ab131e9f0dda12db41e26aabe65f02c4326c989ed2f54620325e6b11196e
-DIST calendarsupport-21.04.2.tar.xz 755412 BLAKE2B 38842452503d7c9aa72fd1f05e20feb1e800f5feb1a4b290c23deaa7ea22ddb8d92fa84f77ac1e37bab4a5fe7976d5cd8fa3bc3cd926922ef70a47c0775e2cdb SHA512 3703dfc4067ee3395a5536db71ca82afd1a9a7a2ec19f649ed28d4b5160e860f7086ff8816f6dc2c7c6bdc4f26b65f60eb802eccf5f06168fbffd47bed4c0b50
 DIST calendarsupport-21.04.3.tar.xz 755748 BLAKE2B ca30c2f2a991c3fe4989220d59c9eb2913169c0dffd5fde1c009bb771882c2440a76b868c907ed41f6a7a01be07e79041d813da6d12275a7ea34591cc5654c78 SHA512 10ed1bfc953483b0af1cb6e8cb5d35659b0400cb5e61723fdc8a22eba7c5205c8c944fb2c3ba7b07907dd673111cc7bb12db2ac3e04f3bc27c824cdfde401cd2
 EBUILD calendarsupport-20.12.3.ebuild 1261 BLAKE2B 49c14bef54245e290d04dae12690dd1cc97aaa95da9fa9465a2e47ed2a0c07541378fb7b6e41b1df356e621a312801c3b902fb4054d2d5bd7dca36fb269f7c1c SHA512 3d0dc16fc5ad074a75837c09585d5de6ae8e78195e0cc75b6dbde463ab7b31c6d4a56176901155086e4b8f742989eba3ec1c6f724f6ae4f3fd07ea97fdb1eb0b
-EBUILD calendarsupport-21.04.2.ebuild 1264 BLAKE2B 73881dd7e173083e7100f8a4bd4d0f47f1feba220a4de4bd6d2170da3399bd12c021a416083d8557eed1cf74c948380fc07be8b9d73d66008e8f8f4f5188f353 SHA512 8866d6b361ccb785dd9dcb4cfee558627fec3fed96d4cf53220ae263d617727612436da37a490d7e9e976c222f27448743d5ce608a223ced9058d42dc62e7eda
 EBUILD calendarsupport-21.04.3.ebuild 1264 BLAKE2B 73881dd7e173083e7100f8a4bd4d0f47f1feba220a4de4bd6d2170da3399bd12c021a416083d8557eed1cf74c948380fc07be8b9d73d66008e8f8f4f5188f353 SHA512 8866d6b361ccb785dd9dcb4cfee558627fec3fed96d4cf53220ae263d617727612436da37a490d7e9e976c222f27448743d5ce608a223ced9058d42dc62e7eda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-21.04.2.ebuild b/kde-apps/calendarsupport/calendarsupport-21.04.2.ebuild
deleted file mode 100644
index 5349cf98524d..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-21.04.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-KFMIN=5.80.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Calendar support library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libical
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 4ea421410907..ff126faf0d23 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,7 +1,5 @@
 DIST cantor-20.12.3.tar.xz 9128948 BLAKE2B 9cc4c6b28ea1f9946ad6d4eeac98b5c47b17b16efc434f355ba2a0f71b23afd4a58ab31df12a881e2a35e836901075d197ad9550409a97f025efdbd21ac919de SHA512 35461a47c9ce4aa4de8ca8496ca33c42691db6be927f30018e174f3234a485c436cca90b6362c8ba325f8bc220a09079069278bdfd08f4510dd7d12ee1a39ed7
-DIST cantor-21.04.2.tar.xz 9145956 BLAKE2B 5701d6ee95a3e68fe479b7c9b473e61830114be984b9ef89f2b52a79f41581e86a9cc4a7eb2537862ba669020cce8f19d51054f6a2dcec30a98b84ed4b64215d SHA512 4847dda3a102daff1211f1c0b65a2c77fe3e65c49f0f6a64630574dbca869dd37526cf5e94aa80cc46cfacd01bbfd0926f9f928218e30e0f8f0325db46dea8be
 DIST cantor-21.04.3.tar.xz 9146060 BLAKE2B da7e55a84df1bf8beb436ecb6b95c0289be1690f7662a6fdd398ff1895c814210f665640b5f617673ab4d557cc9d76016105f99c2431e181db3af14b6905d810 SHA512 9010bb70458296b2a29116e16d8be935d4d1cfe5a6b0554aa24247e3bd76cb97b27a2ffa70608402df588307d5f8c4605ad58ae2ac1d936620cfb2a53d00fadc
 EBUILD cantor-20.12.3.ebuild 3067 BLAKE2B c43df7b68d13b1060adc5bff1bc776edd3a5ef74db98ed52b2a4473498dcd95374251b11658f9a520fb3d7921030a1cb696c2b107505aec7fbf70a02c77a7d23 SHA512 17322f3d03b92d722b445cbad971680a0351d7ee1f54a1671813c4b4a3f416a9c1f00bc344a0da1689e3680320ad5596c085fe23deb76ddd4e919d5e1061ca93
-EBUILD cantor-21.04.2.ebuild 3070 BLAKE2B 8c6632b06a8af1603e1ae68ba8138a20c833e85cdc888f6adea3325f24d8fb8d02adb5d9dfb6a843dc8c6e3e434c9767ae85bc3b776c751b31e2e079f45cde1d SHA512 4ae2dfc3d6f4de7e3b3c1231a43fff6b88ae5b6fabf64bf729b8b9734a34b138b5477c97186d791028b498c62c710125d49f6d5afd6d7d6660af532ac4ac5b1c
 EBUILD cantor-21.04.3.ebuild 3068 BLAKE2B 638742756fb30ed4549eed5c277d9ed8f4848382752406f44a9adc7554b30cff25eafad2a189e64dfcda4f4515673f41e143afe9edaba2f0d928d549a3473a8b SHA512 a18b23817afea545ada278ea4cabd8709f194f54a25de1b4b0c70688ab232db5ed0e0b9b280425f9cb331650eaafea3fa1e478e36d0b68c03b7b9610af3bd7bd
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-21.04.2.ebuild b/kde-apps/cantor/cantor-21.04.2.ebuild
deleted file mode 100644
index b63255b7bec2..000000000000
--- a/kde-apps/cantor/cantor-21.04.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org lua-single optfeature python-single-r1
-
-DESCRIPTION="Interface for doing mathematics and scientific computing"
-HOMEPAGE="https://apps.kde.org/cantor/ https://edu.kde.org/cantor/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+analitza julia lua postscript python qalculate R"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO Add Sage Mathematics Software backend (https://www.sagemath.org)
-DEPEND="
-	app-text/poppler[qt5]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	analitza? ( >=kde-apps/analitza-${PVCUT}:5 )
-	julia? ( dev-lang/julia )
-	lua? ( ${LUA_DEPS} )
-	qalculate? (
-		sci-libs/cln
-		sci-libs/libqalculate:=
-	)
-	postscript? ( app-text/libspectre )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-qt/qtdbus-${QTMIN}:5
-	)
-	R? ( dev-lang/R )
-"
-RDEPEND="${DEPEND}
-	!analitza? ( !julia? ( !lua? ( !python? ( !qalculate? ( !R? (
-		|| (
-			sci-mathematics/maxima
-			sci-mathematics/octave
-		)
-	) ) ) ) ) )
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	use julia && addpredict /proc/self/mem # bug 602894
-
-	local mycmakeargs=(
-		$(cmake_use_find_package analitza Analitza5)
-		$(cmake_use_find_package julia Julia)
-		$(cmake_use_find_package lua LuaJIT)
-		-DUSE_LIBSPECTRE=$(usex postscript)
-		$(cmake_use_find_package python Python3)
-		$(cmake_use_find_package qalculate Qalculate)
-		$(cmake_use_find_package R R)
-	)
-	use lua && mycmakeargs+=(
-		-DLUAJIT_INCLUDEDIR="${EPREFIX}/$(lua_get_include_dir)"
-		-DLUAJIT_LIBDIR="${EPREFIX}/$(lua_get_cmod_dir)"
-	)
-	use python && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Maxima backend" sci-mathematics/maxima
-		optfeature "Octave backend" sci-mathematics/octave
-		optfeature "LaTeX support" virtual/latex-base
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index d13c44bfd576..ed30e5645f10 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,7 +1,5 @@
 DIST cervisia-20.12.3.tar.xz 1888284 BLAKE2B 2e49250c45ae8f734f94f726fe6b1a133392fc89080fe2b4d7ec74eed728da0755666a074f12d06eb67b9a959de8d2dd934c143c74491c1facffd12a980dda14 SHA512 461f856f6fc5a9381b981c82aea70c005fa0da424a5658a706b9b6f6c90749cef85c3e3692df38210c891db57ca42b214abba29fc22494a359d32ba4fc017113
-DIST cervisia-21.04.2.tar.xz 1911228 BLAKE2B 147fc809b2a9a257cc40626391f3c62b3ce1ca75fdcbca1ce2e4e9b4f836bc2b4834c7ce75010cacb24842d8030d4c31813449f78fa9ef4c5e226f1f238d0e62 SHA512 ed865e3e3682aa312730ebc5cb5d5a817f4ebfca808aa1b7bd342bbfdf533e86069284fcc304c8256ec8fa3ee924e96eb72fef02c860af41f7b79eb8a447b4f1
 DIST cervisia-21.04.3.tar.xz 1911316 BLAKE2B 90400c96735ad0796e3e4a3407d303d1a3e55f05b4b999c23e042868d0f5be73f23f56e97df199b1d58fb359b787eebe79b236bd13bb8d17320495c1780141e7 SHA512 bc1e39adb48f24c4ea687871109a5c6eea8c389de4599a12e3489b523081656414a4f8cab42e1f0e077542c1fabc7663d7105c655f9aa1c50bfed55471a57b68
 EBUILD cervisia-20.12.3.ebuild 1060 BLAKE2B 30a923c102d00f3286169ac2ae57ab2780884c31c7c3d0f1a3db5249405fdb0df74b9dbcc500456a33d98a15d301ff35ada19a4db5216a1591e54093db7c7591 SHA512 acb30540e31a8777febd5b552c6d46300e870d044f9440d3257cd161458610513c229d103c9bff273f1e7124a962ebed150f636ae67ea659e9f0656e1415f959
-EBUILD cervisia-21.04.2.ebuild 1063 BLAKE2B 1899ec72dd2d955510249976ed4ac00a3c58bd2e4dbc8d16bf1816c3b627fe19ab767e1c12e0dc65ad9d41a2d15a44b3592101f4de35a03dbc7d72ee67aa66b7 SHA512 f71496e161d9e5892524a76e8d8eca7154b4c6d63f4765e8dcb0d28a70744faf7db70e48e881241019cf6348738879a0ca793544cf3176aede926e4a64c33ef3
-EBUILD cervisia-21.04.3.ebuild 1063 BLAKE2B 1899ec72dd2d955510249976ed4ac00a3c58bd2e4dbc8d16bf1816c3b627fe19ab767e1c12e0dc65ad9d41a2d15a44b3592101f4de35a03dbc7d72ee67aa66b7 SHA512 f71496e161d9e5892524a76e8d8eca7154b4c6d63f4765e8dcb0d28a70744faf7db70e48e881241019cf6348738879a0ca793544cf3176aede926e4a64c33ef3
+EBUILD cervisia-21.04.3-r1.ebuild 1098 BLAKE2B 05a632e6a1094cc03ddab2d3f01c05e0361f2cb955e4865a0c377f52737f916211d909f310684e96d444720d2b7ad5f9990b7a37f107184e34adab631830868d SHA512 1dfb6cb302f25132d6693fa1f642761d59beef6677099f1ce758adaec0b260ae96d2016aeed58cfe00795315b11372d46521e9f25a385ee82dea67a436a4b9dc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-21.04.2.ebuild b/kde-apps/cervisia/cervisia-21.04.2.ebuild
deleted file mode 100644
index 7d5dea567f1a..000000000000
--- a/kde-apps/cervisia/cervisia-21.04.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="CVS frontend by KDE"
-HOMEPAGE="https://apps.kde.org/cervisia/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/cvs
-"
diff --git a/kde-apps/cervisia/cervisia-21.04.3-r1.ebuild b/kde-apps/cervisia/cervisia-21.04.3-r1.ebuild
new file mode 100644
index 000000000000..4566fb62dcca
--- /dev/null
+++ b/kde-apps/cervisia/cervisia-21.04.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="CVS frontend by KDE"
+HOMEPAGE="https://apps.kde.org/cervisia/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	dev-vcs/cvs
+"
diff --git a/kde-apps/cervisia/cervisia-21.04.3.ebuild b/kde-apps/cervisia/cervisia-21.04.3.ebuild
deleted file mode 100644
index 7d5dea567f1a..000000000000
--- a/kde-apps/cervisia/cervisia-21.04.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="CVS frontend by KDE"
-HOMEPAGE="https://apps.kde.org/cervisia/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/cvs
-"
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index 694629ddf366..a41591f4635a 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,7 +1,5 @@
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
-DIST dolphin-plugins-21.04.2.tar.xz 253184 BLAKE2B 2ca0bdbdd1e658bd54a95790d722e23817aca2af1bff16b5056686e58b5ce60aeaecba05ec3a2faf69ccf4d1c4dd7ee91f59cec37da3693917ed9144c4e48ae2 SHA512 379e87f0ee28dd414c1ffe1f2e7775681cf639cda72a6357c357f2a7a30aefee77cfc8b52cb4030ff68555a38d0abf428ac155cbd2d3263ac55b4f41b9ae1fda
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 EBUILD dolphin-plugins-dropbox-20.12.3.ebuild 1409 BLAKE2B 804b102e29886168a7f91ccc83851b79fd95110b146ce3c53f15a29857a790075535a8286ea20f59bdebaa3eb6cacae32238f3423dee5af8d25b72aacda4683c SHA512 608ac8ef11c8b58226f3d0b49992eff952b7b9c358bb3e2d632347ccfe382390c844f096262291e172f06c2b8142a616a5e4c1234e6d780e463f38fd40b28e27
-EBUILD dolphin-plugins-dropbox-21.04.2.ebuild 1411 BLAKE2B 6676adfc9d52a74cd615eefadee0bcf9b437274a12185bec82a4240e8897d479386215a8c2bb4c830e5887d5c0323381fc5597bb12a05577b2cbc5dac267c2af SHA512 b6885d1c7d9e95bbd6d39b22e943f92be98522045fd101fce220b59cd556fab28b2a1ee53e3dd80cef666a18ad48d7bd99bb2fe48a64647ce9c15070b49cbd94
 EBUILD dolphin-plugins-dropbox-21.04.3.ebuild 1411 BLAKE2B 6676adfc9d52a74cd615eefadee0bcf9b437274a12185bec82a4240e8897d479386215a8c2bb4c830e5887d5c0323381fc5597bb12a05577b2cbc5dac267c2af SHA512 b6885d1c7d9e95bbd6d39b22e943f92be98522045fd101fce220b59cd556fab28b2a1ee53e3dd80cef666a18ad48d7bd99bb2fe48a64647ce9c15070b49cbd94
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.04.2.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.04.2.ebuild
deleted file mode 100644
index 1ae3454402f8..000000000000
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.04.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="dropbox"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Dropbox service integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	net-misc/dropbox-cli
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# solid, qtdbus only required by mountiso
-	ecm_punt_bogus_dep Qt5 DBus
-	ecm_punt_bogus_dep KF5 Solid
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index bedce0d2c7d5..0eb982b1407a 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,7 +1,5 @@
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
-DIST dolphin-plugins-21.04.2.tar.xz 253184 BLAKE2B 2ca0bdbdd1e658bd54a95790d722e23817aca2af1bff16b5056686e58b5ce60aeaecba05ec3a2faf69ccf4d1c4dd7ee91f59cec37da3693917ed9144c4e48ae2 SHA512 379e87f0ee28dd414c1ffe1f2e7775681cf639cda72a6357c357f2a7a30aefee77cfc8b52cb4030ff68555a38d0abf428ac155cbd2d3263ac55b4f41b9ae1fda
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 EBUILD dolphin-plugins-git-20.12.3.ebuild 1521 BLAKE2B f88c2f3a0ee5beea3eb69ddebc7bb58938bef25ceb65d2b532425797d971fe1ab97a47a3c91fc06c928bb1e4125725210424699e1fe57333fbffc46135daebdb SHA512 866d2e57f1700b5935e8d3433fca4e4ffa62c5aeb7251bcb30f55f0c0094a56464b600d6e097b07b18aa63dd6284566af4f895edc168e1ef76af93dbe6fb3598
-EBUILD dolphin-plugins-git-21.04.2.ebuild 1524 BLAKE2B 3a7306f21835e736298dfd85fa5023b5fd662f2eed7e8d783e536b0a861d8f37933a90324ae643f9275b787e47ca7e35c9533282e615fb3e9fae745bfd271ae9 SHA512 a1f032f7a16dda3f5248ac41a38ac86da20282bba8e0a3fde227c5d2d71536b2da7fb48b1223afde0d5bf0729f076f618af0408e916a708da4787e0f7dff50d7
 EBUILD dolphin-plugins-git-21.04.3.ebuild 1524 BLAKE2B 3a7306f21835e736298dfd85fa5023b5fd662f2eed7e8d783e536b0a861d8f37933a90324ae643f9275b787e47ca7e35c9533282e615fb3e9fae745bfd271ae9 SHA512 a1f032f7a16dda3f5248ac41a38ac86da20282bba8e0a3fde227c5d2d71536b2da7fb48b1223afde0d5bf0729f076f618af0408e916a708da4787e0f7dff50d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.04.2.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.04.2.ebuild
deleted file mode 100644
index eaefe503539a..000000000000
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.04.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="git"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Git integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/git
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# solid, qtdbus only required by mountiso
-	ecm_punt_bogus_dep Qt5 DBus
-	ecm_punt_bogus_dep KF5 Solid
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_bogus_dep Qt5 Network
-	ecm_punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index da49b0335376..de33f53bcd5d 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,7 +1,5 @@
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
-DIST dolphin-plugins-21.04.2.tar.xz 253184 BLAKE2B 2ca0bdbdd1e658bd54a95790d722e23817aca2af1bff16b5056686e58b5ce60aeaecba05ec3a2faf69ccf4d1c4dd7ee91f59cec37da3693917ed9144c4e48ae2 SHA512 379e87f0ee28dd414c1ffe1f2e7775681cf639cda72a6357c357f2a7a30aefee77cfc8b52cb4030ff68555a38d0abf428ac155cbd2d3263ac55b4f41b9ae1fda
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 EBUILD dolphin-plugins-mercurial-20.12.3.ebuild 1649 BLAKE2B c72dd3eb0a917486573da106197018e5ac67acac126eea5902e8287486cd4d5560fca52ac557ea03b3dd1c027d72c10463e3cbb442a1efde8b2e7b8aa0d04fdb SHA512 bfacfc143eaff23b5f7bbf9ba3eef6db3cb7d66ce7f4e7eb023bab06b9c6e2b59dcdf3700a76526267cc9d59646b7efa6e81d69d5487369dffb5e227689a72b3
-EBUILD dolphin-plugins-mercurial-21.04.2.ebuild 1652 BLAKE2B f5c0ed8363184ffaa7dd979c0eed821c4173c873dd905ba11b9e213271b325749cd65ba23a164989581e7f024ebedba7fa7e63199ff03fade6530aaa4fd3e8fb SHA512 a6b9e98956f172b9c44a1d59e44acbbbc00161e602ba0dc2ca82f46f35cd9e6c3d6c0e8dca857346b07c66b1bc6c27f9074e21d7e8e62d3a4aecd437761b4a99
 EBUILD dolphin-plugins-mercurial-21.04.3.ebuild 1652 BLAKE2B f5c0ed8363184ffaa7dd979c0eed821c4173c873dd905ba11b9e213271b325749cd65ba23a164989581e7f024ebedba7fa7e63199ff03fade6530aaa4fd3e8fb SHA512 a6b9e98956f172b9c44a1d59e44acbbbc00161e602ba0dc2ca82f46f35cd9e6c3d6c0e8dca857346b07c66b1bc6c27f9074e21d7e8e62d3a4aecd437761b4a99
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.04.2.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.04.2.ebuild
deleted file mode 100644
index d900060660ae..000000000000
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.04.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="hg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Mercurial integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/mercurial
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# solid, qtdbus only required by mountiso
-	ecm_punt_bogus_dep Qt5 DBus
-	ecm_punt_bogus_dep KF5 Solid
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_bogus_dep Qt5 Network
-	ecm_punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index fb79003b2e61..3130fa7fcc63 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,7 +1,5 @@
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
-DIST dolphin-plugins-21.04.2.tar.xz 253184 BLAKE2B 2ca0bdbdd1e658bd54a95790d722e23817aca2af1bff16b5056686e58b5ce60aeaecba05ec3a2faf69ccf4d1c4dd7ee91f59cec37da3693917ed9144c4e48ae2 SHA512 379e87f0ee28dd414c1ffe1f2e7775681cf639cda72a6357c357f2a7a30aefee77cfc8b52cb4030ff68555a38d0abf428ac155cbd2d3263ac55b4f41b9ae1fda
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 EBUILD dolphin-plugins-subversion-20.12.3.ebuild 1481 BLAKE2B 9c5c537f7051a415b1dcb56405cf37e022d37058e42bcaf0bd53978acd93e47b8d80945253a245d9cafc594cf80508f96cc7d37240a59ee3cc1bf195f9782dad SHA512 1f37aa9ccb88974b9602c11668701c72586a54055c7ab5ff9a4b3194ff4d8f81124d5a4f7b7c486ae7c5dfbe2f94cf325750cfdddda87f70f0e58ec2cc3b501e
-EBUILD dolphin-plugins-subversion-21.04.2.ebuild 1484 BLAKE2B 29a5761c417d23ece12a145c3518c828e8d4e4870099a2ee1a399bcb2f2b1ab595478b5beab36a6374f0315ea71fd52e8fe7fa298c28735f91366b40a6e8b658 SHA512 73ffb058c5889f2e9651a0f4408fceec43100d60bf7e545fb010ac8cf318e539bb835faaa41d3b19c465b43d550945a52cd2987ef35dab8da992ecc8b3cb4aa3
 EBUILD dolphin-plugins-subversion-21.04.3.ebuild 1484 BLAKE2B 29a5761c417d23ece12a145c3518c828e8d4e4870099a2ee1a399bcb2f2b1ab595478b5beab36a6374f0315ea71fd52e8fe7fa298c28735f91366b40a6e8b658 SHA512 73ffb058c5889f2e9651a0f4408fceec43100d60bf7e545fb010ac8cf318e539bb835faaa41d3b19c465b43d550945a52cd2987ef35dab8da992ecc8b3cb4aa3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.04.2.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.04.2.ebuild
deleted file mode 100644
index 1a505cc51305..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.04.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="svn"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Subversion integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/subversion
-	>=kde-apps/kompare-${PVCUT}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# solid, qtdbus only required by mountiso
-	ecm_punt_bogus_dep Qt5 DBus
-	ecm_punt_bogus_dep KF5 Solid
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_bogus_dep Qt5 Network
-	ecm_punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_mountiso=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 5ddd3bafb672..1fca4b4f26d4 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,9 +1,7 @@
 AUX dolphin-20.12.3-fix-session-restore-w-o-tabs.patch 2643 BLAKE2B 07856c16e9e68739a8b9feec46e1fe16272eddf49b45a88c7030d2439cb90345dc902ea5d11e08f0565c0a45fde3c2efe912d8225547e679dd7ae5d0e3b38e18 SHA512 182fd1e6e87a7a25326123be17015174e84124b042056ea72353c7f051de7ecc550b8284885ce3cb92b2a9e88b81cd6e40426369acdeb33995c9fdc3534c9efc
 AUX dolphin-21.04.1-fix-no-semantic-desktop.patch 1331 BLAKE2B 83c51b160f7813144b9b91c3c6919386c67bb43e84ff4e4feaa0d53c2c2e6cae7416969efa3133f2fab50cdf0f256dfd4c4f643c1183c67727be5028ae2d57d9 SHA512 b921ffda896249abbfd06012a4e2f94f487c4bd459a85fc40616a4d2a99881cd856182a79ded81884fd4082cc33fda7d5918b5b4b36c281673d6dcdf10932934
 DIST dolphin-20.12.3.tar.xz 5134660 BLAKE2B 3ad3e7c16d0c4203e189bdf035028777115971091bc3c45a3e88231f9715c9439f44c67b2bf2d9d4680a07d222c0c14858028d54499fbe8cf006e3eae63a9193 SHA512 fb57121875fb6b3db9b3071590ea2b6fe7db1d22238af758591835946ac297d7a1734646385a2f6b7ade41de7dcfdf8f6b5e7dccf335a3cf558259d017e44a11
-DIST dolphin-21.04.2.tar.xz 5229140 BLAKE2B 5b7613880a68779aed699725d2a0c4c909dd6a3a6b695f3cb90fde93a2139505e0c0eb6ac5d0cbfe2fddf89d887edb71fea11aa537594c2b889647a7ca434678 SHA512 360b30f39181ce2c4c6fbd92c678425bbb2887dde2351e567951283351dbfa6c37d0a2c31fae9ab68f8cac3f1bd8625257b791071d98110591c388935c3601fe
 DIST dolphin-21.04.3.tar.xz 5228312 BLAKE2B cdfbde0789b5c2dfc31d61e8c37b47e82a31877da9437770c463149b33ee46d4b5b1866aa38b1991f12e878ea27f4424c6b162113d87a865e0bcd815941abd4e SHA512 bb7d2f342aecae3b424aef93591124a5ca041e5e75909ed43c6202bc7cf7ab0e34a883050194b6e71f71425b2116ee579e67016205a648de6d5e5b0d01bf3ea8
 EBUILD dolphin-20.12.3-r1.ebuild 3366 BLAKE2B d7fc3fbb64642f656ea3e236511b622e8063bc86686c723e4f7c6e8c89b52b4653b8f02ba40d831ecfacf539280a93c18194497f99b5cf32bad70901e717ab9b SHA512 a9925a664fec0e061d3f37c3776309ba9a20c5f08d140d86ee648edad9d0aaf9742f1b81f4322de563d7dafd1c6fbf3d01e2c8b2924f3bc4474893b6da73dc93
-EBUILD dolphin-21.04.2.ebuild 3138 BLAKE2B fe35f63099ce1e942a8ea05afc66273af1a75b38705e85adf2827b97b4875447d43627505b09df07a5c0d57c7d0586be76a43e929a2922eab8f9435b39606321 SHA512 90fa3c53345d6211539154d1ec5f14697bd95907772f37b4b02f1d2749fd3d396558feac55e0e66f7b737223e0d4a003f866c46d98a2c35eacb472089c4358f3
 EBUILD dolphin-21.04.3.ebuild 3138 BLAKE2B fe35f63099ce1e942a8ea05afc66273af1a75b38705e85adf2827b97b4875447d43627505b09df07a5c0d57c7d0586be76a43e929a2922eab8f9435b39606321 SHA512 90fa3c53345d6211539154d1ec5f14697bd95907772f37b4b02f1d2749fd3d396558feac55e0e66f7b737223e0d4a003f866c46d98a2c35eacb472089c4358f3
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-21.04.2.ebuild b/kde-apps/dolphin/dolphin-21.04.2.ebuild
deleted file mode 100644
index a064de084fd2..000000000000
--- a/kde-apps/dolphin/dolphin-21.04.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities semantic-desktop telemetry"
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5=
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	semantic-desktop? (
-		>=kde-apps/baloo-widgets-${PVCUT}:5
-		>=kde-frameworks/baloo-${KFMIN}:5
-		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	)
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kio-extras-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# servicemenuinstaller requires ruby, no thanks
-		# dolphinmainwindowtest, kitemlistcontrollertest, kfileitemlistviewtest, kfileitemmodeltest hang forever
-		# placesitemmodeltest requires DBus
-		-E "(servicemenuinstaller|dolphinmainwindowtest|kfileitemlistviewtest|kfileitemmodeltest|kitemlistcontrollertest|placesitemmodeltest)"
-	)
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "compress/extract and other actions" kde-apps/ark:${SLOT}
-		optfeature "crypto actions" kde-apps/kleopatra:${SLOT}
-		optfeature "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT}
-		optfeature "graphics file thumbnails" kde-apps/thumbnailers:${SLOT}
-		optfeature "'Share' context menu actions" kde-frameworks/purpose:${SLOT}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 8279884a8853..9267716897b0 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,7 +1,5 @@
 DIST dragon-20.12.3.tar.xz 1656596 BLAKE2B a06979932943221fe99f2fb9e2815b87b94d9cb6aa9c591950b3cda2736cc855a00af943f4e76cef2c00a7cb9c40763023595580d53e94551439a2aa5ec5bc52 SHA512 af05801abdf24670286fcfdade58c600b1f0ae4a0316cc95cb8020deafbba7a5b5832e9907b7cc78569d5074d855a348e9aac325305ccb5afd7fdeb0d1e62527
-DIST dragon-21.04.2.tar.xz 1665828 BLAKE2B fbc0e7657f0b99f59f775c93fed8cc8112344d2183d6453b3a3808f74341ef527a859dcbb77052ad0132c52ae94cd8742dbf19c25b22dbff09cced386462d344 SHA512 bec1a11f9d806a8a56fcf3e168775d20140eaf8d1742bf2594dd6bb53d7c7994e6b620e12ee5289d37f7371d704d576cfedc4feed322756c981d1966e848ca0b
 DIST dragon-21.04.3.tar.xz 1665740 BLAKE2B c19be546a60b22e54e8d7734d9bd2b704e6540b520882e48bf90c7b470ba11059b9b8a24ac0627bd550c3971f409d1e8b9adeebf2d870cab376a663fc2ecb19e SHA512 b3d55168fae08617f2733407f199e1389eb088a6f82d6d3acae52c434a2f9d100fc8a183d76654ce305eb95991f2b82d01eb0f76a443bac59ddfd0133b14389c
 EBUILD dragon-20.12.3.ebuild 1141 BLAKE2B 1becbbaebd43ec7858753d94880fe81874a6616083e6979e8bea44e78f571d0929dc67038cbde3a8207f138aa2b4a4f5cb60740f6f2296b0f73b6b3ca2b58e63 SHA512 d35543317c78e072c956205a8e1a0ebbb251f490a1890219921c2b2ef144bc954fb62e4811d325904e4756327e26c0b1f01bba06993d5c34215b6ee57e205827
-EBUILD dragon-21.04.2.ebuild 1144 BLAKE2B 43876ea62cc8a97fe26bfe5d59f0240ab14ac42c1552fb67ca166edd33ffda162018a6fdcf0e008c545818fb2ded1b44a17f1d9ba5cdafea7738b3a3dd798d1a SHA512 2185c54423384f513cf7a4b8cccef6aeef72220b7b24314222a9fb4abb245a2c8b0d8d48fa219f7e5e9814b0dafdce53fb8e2889a3d72ca0d6be9884468fde4d
 EBUILD dragon-21.04.3.ebuild 1144 BLAKE2B 43876ea62cc8a97fe26bfe5d59f0240ab14ac42c1552fb67ca166edd33ffda162018a6fdcf0e008c545818fb2ded1b44a17f1d9ba5cdafea7738b3a3dd798d1a SHA512 2185c54423384f513cf7a4b8cccef6aeef72220b7b24314222a9fb4abb245a2c8b0d8d48fa219f7e5e9814b0dafdce53fb8e2889a3d72ca0d6be9884468fde4d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-21.04.2.ebuild b/kde-apps/dragon/dragon-21.04.2.ebuild
deleted file mode 100644
index 1cb7a8027540..000000000000
--- a/kde-apps/dragon/dragon-21.04.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Simple video player"
-HOMEPAGE="https://apps.kde.org/dragonplayer/"
-
-LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 1db39d1bfd17..43202a9e8f66 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,7 +1,5 @@
 DIST eventviews-20.12.3.tar.xz 444100 BLAKE2B 9afa966f56b364ca047ec6e13368f833bc91fdd733c376a1d690c2a90c59248385c782542a8e3c66ebd1bc89485149bc32b5c433584e1a686358f30eff0c240a SHA512 a9f69fceffe8772cd059e5407660ef040bd9e4a4d8bff8ef4b4be3e18df989b74e4bb8c66b5d42251c89aeac9b1602fed08e75380e332182160c0a00c9a334cc
-DIST eventviews-21.04.2.tar.xz 447368 BLAKE2B 2404e1788905c976d28c69042e59ac00d9b5dc44f47bfee73821c3baa6b251f375250ed9fe7a674781b87e2d4e0a164320fb36d332150e1b98e1829577f0c5eb SHA512 832ba769ac63df79fd3a7c52a524990d7142acbd9b57eaaddddac10e2146fd4883e24b0832eda93b530dbc1492a0ee4ccc36b868ca432d028f4243ae5bdf05ee
 DIST eventviews-21.04.3.tar.xz 452428 BLAKE2B 3d82e1596a25b024e9583eb9d0294e2e9f931d531d0163ee4d77f42d1ac1df30703ef1636028d06b3cf15c3bcca2aa901ff2e24c9c7ea86c3228d85ccc5b70ef SHA512 f8c7d9cb2993163ebaf2707b35afb346900405464666b71835a4b365377a4353a3b53af0301f870aa2529b071be0a46a748abc18db84b46cf3b5027882e08a36
 EBUILD eventviews-20.12.3.ebuild 1201 BLAKE2B 2dc6e8e2bc71d77e9d1dbc096355b7159870259968fa2418d8cb0561f6734e3449c1272be3ea4f86997760afaa3c5e567339b241f3f503610e0f61a6aef60dae SHA512 71a3c5a21e4c490516495155e1f166b1607795d1ab0baafcc8015daa5b8ab2170163b6bd7e71cb0085a6d884a742fb9c7f66805d2047633ce7d1fde976657ab2
-EBUILD eventviews-21.04.2.ebuild 1204 BLAKE2B e1db9d70db8ad51d380d1c78defb013362f45d7a4f369b43c784f8c6bb1b2d1804735547bbe22091106d729c1028ba135d2867e9cd0a4c7ad31174a7a274b878 SHA512 a2c34ebb754bf47df8e4a38373168a6d3210a1e38cd7b56fecdc1657c728ee21623948a9caae1347cc3657d83977d95542d80e4cad066980d297d4a584d4687c
 EBUILD eventviews-21.04.3.ebuild 1204 BLAKE2B e1db9d70db8ad51d380d1c78defb013362f45d7a4f369b43c784f8c6bb1b2d1804735547bbe22091106d729c1028ba135d2867e9cd0a4c7ad31174a7a274b878 SHA512 a2c34ebb754bf47df8e4a38373168a6d3210a1e38cd7b56fecdc1657c728ee21623948a9caae1347cc3657d83977d95542d80e4cad066980d297d4a584d4687c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-21.04.2.ebuild b/kde-apps/eventviews/eventviews-21.04.2.ebuild
deleted file mode 100644
index df1e1307e4ff..000000000000
--- a/kde-apps/eventviews/eventviews-21.04.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/kdiagram:5
-	dev-libs/libical
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 831f6af1407e..e4408b02b86c 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,7 +1,5 @@
 DIST ffmpegthumbs-20.12.3.tar.xz 34088 BLAKE2B cbabaff6409d7349939c8b9d63ca3b38490b5d851032e3aa3d4663bae25202c7361e1fb9cff9863b8073a6f91082f93d4fee4dc696a8f762c813eed1e8d2c28f SHA512 d81f89fa3c26982d9f7e84f76b2deb562308467376b5f01af9acda1bc2d62e21cc3054afe5bcbad5d098e3ecf79d9e9b0adee7e719127aaab228ee8efa190aad
-DIST ffmpegthumbs-21.04.2.tar.xz 33640 BLAKE2B cbd0b52cce98a27e6a7826c47de705453eb1f4b9b92da850675e5131d60e297da2aa4ffae8f3cadf472c8015cc4dd7939bfc079933b8e5a16c0448337a1358a0 SHA512 c645d5277ed31ca105b1f0115602a7e5c026669f252f1bc6bedc6d0b0343a15f87857d16505b3de92b38b2c4747d0bf72efe554e0baae1db91523a73a6da96d2
 DIST ffmpegthumbs-21.04.3.tar.xz 33620 BLAKE2B a20fc3791c5a85fabc6019b5467ff105a1de84d32a17337b6b956e4259175ce06c8f0f6782def58bc76acdbfe1130650369a61b51dc1e7064b5b3122bac40690 SHA512 a52ae4b51611dec6822c9817e90f62379ee0a7bde1c00733dc49533b0a189e95efe82a8316d098419435d4b3d8ace92c33f4cd19923cb1e136f9137789eba29e
 EBUILD ffmpegthumbs-20.12.3.ebuild 560 BLAKE2B 42c16e6b703d5135ecc12b4269e56794a0efc1cee31ad520705140ae3a4ab6196e25e36c0be9562f9bd00eefa0a876a38ab3859c541a7c450bba011b5e2ce23a SHA512 16378de64a32da30498a3e9e4a2e362221ac887a208537cca1f3cd7f217b66873d002e8150bc666237838c65329a30814c507e9a31d82794ee690481d5708a9d
-EBUILD ffmpegthumbs-21.04.2.ebuild 563 BLAKE2B 7489fbb26915c38e11f285dbe08da67f5a006b022e08e9deec87bbb58d5cb2cea532216c16ade3ac6eca249d777dd2e6874b44749108ee2177c3a739236f6c9a SHA512 62b32648302c31f3409aaec3978911158d4d66034a910fa7f743ede79a789fd3a0b7901b5bf40a247145af452d3ca6ce63dfa053dd467cf38f77063b138e3ed2
 EBUILD ffmpegthumbs-21.04.3.ebuild 563 BLAKE2B 7489fbb26915c38e11f285dbe08da67f5a006b022e08e9deec87bbb58d5cb2cea532216c16ade3ac6eca249d777dd2e6874b44749108ee2177c3a739236f6c9a SHA512 62b32648302c31f3409aaec3978911158d4d66034a910fa7f743ede79a789fd3a0b7901b5bf40a247145af452d3ca6ce63dfa053dd467cf38f77063b138e3ed2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.04.2.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.04.2.ebuild
deleted file mode 100644
index 416a9c63a2e1..000000000000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.04.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="FFmpeg based thumbnail generator for video files"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	media-libs/taglib
-	media-video/ffmpeg:0=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 353704e20231..6551b2bc57af 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,7 +1,5 @@
 DIST filelight-20.12.3.tar.xz 671244 BLAKE2B 0de8b3fddba934d1d6cbd014fa7185f16e0736cf1623cda4efba938a958f5134d71f24ee37d4f9753e5c1edf3e5025b0fbc326f55d1e4922ec5b1a0a7d4a58de SHA512 3a30181a95deb4eb8f9f5cc435658bfa9f5d6406a4756d80535de6783c5ab86c31f874cfa86f56b9a687a72b249d73fcdaa7066e99a548301f648b0abe5b2bb9
-DIST filelight-21.04.2.tar.xz 680824 BLAKE2B c9afbd3943cc215b80c5aa6185fc08f94f51b52b12cdf7989d7a1d29fe744ba5b210aee769b44dff8b55e857255b6b73a965f44d6a2d6818ef58a68f26116cc2 SHA512 0d33ddcadad051e7712d287614cabfe37f2c1a81bdada410bd2b1048a04d37827464ecb3bd86d1822821656245882b5b6f84e2ca770d620594ad56504cb2cdda
 DIST filelight-21.04.3.tar.xz 680804 BLAKE2B 5d90c567752923d89f0a896cd9180e19e834674c0f10471ca301cb004b1cb56aa9946799a34000f94834fae7091ee58aac871c336fbca8e36d81015051eb86d6 SHA512 7f239b0bbef95a111407d85cd7da6f9523a3b12e8ab13a29b4a7f661315e47866bf04a9863464124edd14f4e35b4d45e23cfafe059bd325b7f9f6ed3fc416a7d
 EBUILD filelight-20.12.3.ebuild 930 BLAKE2B 3573a6717f2fac50647d338d461f0529f2534689eae31ca16339034a40d1f5af1f050639564f2975e98e0df90837ee31f9cd229c8a8f79dcd86703391d31fc65 SHA512 ac00cd28b4241d539de64d002e8acd7bb5f77be7215b9d28f338c8c8e3d88a0d181dc30c5980ff127e392c0b67cc425d890dcbbb10acd44eabc7a0ce2809c441
-EBUILD filelight-21.04.2.ebuild 933 BLAKE2B cd7de2b9f41ed8cfdc11bbf7e5000e578b5018d73dc3cfe173b792639ce14288f751dd9e9f289caf0d2883ce9591ee3041f286f15e6226383a4d3edc904a1fba SHA512 e16fd68037480a349706a100f587e6a9300eb0f08e97e05cc760d50a36139eb4c21487c908d748ff0555bacc5361072199f1693aef75aa1d19e5756ac4e8d542
 EBUILD filelight-21.04.3.ebuild 933 BLAKE2B cd7de2b9f41ed8cfdc11bbf7e5000e578b5018d73dc3cfe173b792639ce14288f751dd9e9f289caf0d2883ce9591ee3041f286f15e6226383a4d3edc904a1fba SHA512 e16fd68037480a349706a100f587e6a9300eb0f08e97e05cc760d50a36139eb4c21487c908d748ff0555bacc5361072199f1693aef75aa1d19e5756ac4e8d542
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-21.04.2.ebuild b/kde-apps/filelight/filelight-21.04.2.ebuild
deleted file mode 100644
index 9a68ac6da41b..000000000000
--- a/kde-apps/filelight/filelight-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
-HOMEPAGE="https://apps.kde.org/filelight/
-https://utils.kde.org/projects/filelight/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index a3e9f8c04672..dcf55a49d661 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,7 +1,5 @@
 DIST granatier-20.12.3.tar.xz 1951672 BLAKE2B ed49b7a3d843eddc721cc826db3e59a428b4c80b56a9c4c5bb9217ee8079737fddde61caf4b360862c89aae7ccc0da8501520b3197308319a77f3a3f7e802b39 SHA512 91b577c2b6e87e4e5376e139d6161d03c9f9f7e835446f11b02541d04e2bb1a0f8f5f6f0ae2f10c1d83ec0ce74046d3d926f29c2d051e68a2c83abf61730ee93
-DIST granatier-21.04.2.tar.xz 1952792 BLAKE2B aea8138cb03c9cf76d9f03be99606d6dadf3f67cd19a58d5b3e5a3852e13176b4906585cdfaaa4057f0ab27172cda329fe0e398b94fb367eaa864828e2b1dd6f SHA512 4cbd2661740f69c89848540831171421dddf31e93e3bf12ccdd4d6e25343eeb32a7b617eb72baf9bdff3afda8243196c0a1b972dd61a824ad4e007d66ba0990f
 DIST granatier-21.04.3.tar.xz 1953060 BLAKE2B 0367f09e7189a690cef2c37a30f0623b826f1b25c4e6bfdc645ee35c4f83d40d7e6af91d1baaacc25c1c894d0f957e561024f2ae81153935869a1d3f66a32f58 SHA512 06dad7fed7c0f51fc9c9263eb6cf9b80aadcef9850596cbddad31c4f769b09dabdc4789a6ca6c6805e9dbb35ab1fb23e165a4902f0b4fa2c8ef11efcd25325d5
 EBUILD granatier-20.12.3.ebuild 894 BLAKE2B 44934f80488c8f081398241e886e121604b04f7382d0cf91535b36b3ffb0fe7b8a4eb6db013db9627b652455173c5d0ec29a54963bdb6598b492107474afeb34 SHA512 329503ccd0fd8250614d0b2b2f4605b3c06d3c7d9645472d2f4de227fab7b60c2421ffdd0fcb5e8d83ef26e24e882a869b854f12602aaa802c286d5cd31be3e8
-EBUILD granatier-21.04.2.ebuild 858 BLAKE2B 977bcc02e45a98d8a69f36c4a6ab73482bac66c1d3867f24263ec4e95f949740872e39430814216eb56ac2cc7facc9332e4fc8c4672fb65b7c5cefba54593939 SHA512 3f49e974c4696381d788d6ec46aa5dcfea99a9f2092af5794daa3a3be1ae2190df4b8d31d46610bf3e93f31c604fd617327d2d24f8b8e92cf0913e66bc3c5804
 EBUILD granatier-21.04.3.ebuild 858 BLAKE2B 977bcc02e45a98d8a69f36c4a6ab73482bac66c1d3867f24263ec4e95f949740872e39430814216eb56ac2cc7facc9332e4fc8c4672fb65b7c5cefba54593939 SHA512 3f49e974c4696381d788d6ec46aa5dcfea99a9f2092af5794daa3a3be1ae2190df4b8d31d46610bf3e93f31c604fd617327d2d24f8b8e92cf0913e66bc3c5804
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-21.04.2.ebuild b/kde-apps/granatier/granatier-21.04.2.ebuild
deleted file mode 100644
index 6000f5d8f10d..000000000000
--- a/kde-apps/granatier/granatier-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Bomberman game"
-HOMEPAGE="https://apps.kde.org/granatier/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 425294fd0ec2..72f117e0949f 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,7 +1,5 @@
 DIST grantlee-editor-20.12.3.tar.xz 107424 BLAKE2B ba967fa5f5e5b7415f696a3e2e9874625abddebeb135fec2aa510a8c7241434ebde6f42357ec961cf70fc7deabebf0316e8755de942c2b6b17d3be9392893b3b SHA512 7e601b8f180e502f639ee6fc62fea45c383602a8d9732034ffb5a14d27bf4ec47fe5115e09eb8bca6ba039fa703765fe57aab9b5221c70e05deac2438dcf2fbb
-DIST grantlee-editor-21.04.2.tar.xz 111712 BLAKE2B 3ca93ebd713cf495ee7cb153123e4679a41d300a5e8ffa0ae1c031a0a545da6da70d08a93e26d736567dce10de0b0002eb15ebe0cae6d0e025536d7af8acc0ee SHA512 83f425f05c5ef3b08fc4646f3f22e68a0733744e2d2cd3690796e7c98f9d1906f0d591b889ca31ba747c5cbbf4e72b6798289c8cd5eb1563f9534eb0735936bd
 DIST grantlee-editor-21.04.3.tar.xz 111744 BLAKE2B 53563fc1b03b5f984d9d6c595cfbbb906928bea00a91729025e2e39980d565a25a05b60e122a171e20fa391c98db008b8cf0212a8116cfde736d8b87548b6a0d SHA512 4e1b0a74b4115f3f4bbebdae82dedb21ac8093f7d327c77d45b3b8794d74a17562f288f022cbb11bb790a3acf4e700f9f30d7f637813bc56ac02353c0755b20b
 EBUILD grantlee-editor-20.12.3.ebuild 1264 BLAKE2B 053c90baef7fdc08a99665784258fcfc88d97d67670cb20246399881e50c65ed63fd0501cfd0ef5c553fde801bebd117c0bac8ff28dae6242cc630179c27021a SHA512 fd65644ad30a59d3794ee670d548d024204bed1873421589b52d8a4586839fda1445fb0fe530daa69def553014ef3527a2d5a326830c9d103eadaba7752cf6e9
-EBUILD grantlee-editor-21.04.2.ebuild 1230 BLAKE2B bfc0be8563290b4509b2da89f01bf1e8763835aaaf5feea618733e3c505fdae2d0bcc30713b2fe6c18261749b673d9425a81b91b7b47aa73bde57960431e7d19 SHA512 b95a3e1bd55389e234e944fb4a0b3f6c772ac4ea9e40e85ef36e75d5e2533e68e180eb2ffc9330b891e8ca728a2518bf412782fa2eb1c9228bd7eee8aa807510
 EBUILD grantlee-editor-21.04.3.ebuild 1230 BLAKE2B bfc0be8563290b4509b2da89f01bf1e8763835aaaf5feea618733e3c505fdae2d0bcc30713b2fe6c18261749b673d9425a81b91b7b47aa73bde57960431e7d19 SHA512 b95a3e1bd55389e234e944fb4a0b3f6c772ac4ea9e40e85ef36e75d5e2533e68e180eb2ffc9330b891e8ca728a2518bf412782fa2eb1c9228bd7eee8aa807510
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-21.04.2.ebuild b/kde-apps/grantlee-editor/grantlee-editor-21.04.2.ebuild
deleted file mode 100644
index 7a74222088e2..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-21.04.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index acc5c7ad5687..00b4eb9c24de 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,7 +1,5 @@
 DIST grantleetheme-20.12.3.tar.xz 56540 BLAKE2B fc65cd63ef8c2a2f5e003f6e8eaab67a3c1a2c1ee1ef4b1a17afede8afcc5ab4c00302ecadd16e24d34ec4c5ff3f60d6e05dfd42b56bb7710c595678db0f99b1 SHA512 8daa07c7903dbff3b2435c35f31e8ff0fc7b7d29ca6f8f05473ef09331c0fc14bb18f419c575c2f4f4778fb6847f5f202b2a30d6e2d699bc57711ee8028f3ac1
-DIST grantleetheme-21.04.2.tar.xz 60584 BLAKE2B 37e722a0cde6347b5f5f529fd14637e0a5345df08969f5080a1d53fc184b204cbd3873f3a874d5269d93c1936d04f518f4d33863d27490acfaf76473f8fc396e SHA512 6eeaeea39fbad39c2dfcece335472bfe907a3e6d987d9aaaf22f9b4293bd22094ade96fa86142f36c2efacac128ca48cff640c2d2675bcffae779cde2a9d6e56
 DIST grantleetheme-21.04.3.tar.xz 60808 BLAKE2B 4106d32b9374019a84fa802bb016813f6c1b5b9e07fb6d4d10dcbbc0dbd088dade489c1415e80011e5c72da55c74d3d116b05c4924e48a2f1b93f2978bd76343 SHA512 040c539212ee5247953045343a128f636aaf2c0fc0d8af1b7b3d8c1aeae9378af41f00ff7eb55cec07b92a806efa4b5b219beb9215280b6dac235cb95b9f7cd9
 EBUILD grantleetheme-20.12.3.ebuild 825 BLAKE2B 26c6a21af3b67b6175d7f6f439f0cb4ec94b37b88ec731d75c0ab7b892a7d124b46d785f501fdf4df6f8f70508269daa9e4215c2a97079efde7017bd39cab178 SHA512 bb9aabd48ebaf27996308bbf319a19268bb239bc5f565379ae1d378ec8036440c3e0321360f2d8122d7470b448d5fc87d612a3c9a704e0171dbca62de1138b5d
-EBUILD grantleetheme-21.04.2.ebuild 828 BLAKE2B c1b46e7887ffc4fa2520847ca11ba037ad416c4de8271570172202d64fc22e2c79ce79af48186d9a1cc82fa9fdbf7c31b01c3b785eee29724c274d1e2bb8170a SHA512 c279f8f418b27238538e728a3c4d88f6e31a10fefcf87581d86f9fc59ac0025a13cc240cfb40d044841b9f2d102b888070e067c1882656f106baf96a8e447d64
 EBUILD grantleetheme-21.04.3.ebuild 828 BLAKE2B c1b46e7887ffc4fa2520847ca11ba037ad416c4de8271570172202d64fc22e2c79ce79af48186d9a1cc82fa9fdbf7c31b01c3b785eee29724c274d1e2bb8170a SHA512 c279f8f418b27238538e728a3c4d88f6e31a10fefcf87581d86f9fc59ac0025a13cc240cfb40d044841b9f2d102b888070e067c1882656f106baf96a8e447d64
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-21.04.2.ebuild b/kde-apps/grantleetheme/grantleetheme-21.04.2.ebuild
deleted file mode 100644
index 52f8ed090e61..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for Grantlee plugins"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index d6613f237366..46522428497a 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,7 +1,5 @@
 DIST gwenview-20.12.3.tar.xz 6753636 BLAKE2B ebf4cb69941875f9f2cda8816ff16953fd82a8a434efb18dab60c4ce53e1cd4e76ae8d51ef619b39f18fde82a2fb0943b2a24465513fe85cdb774d411e389c38 SHA512 4a2973029d7bb2e8883cebb8b031fa60068b3a258eceb165a8ba2dcfe52d63fa3c505772a895d72aae93bf88b024fbbb2189e9f1b982ecd94a3629f67d15eb2b
-DIST gwenview-21.04.2.tar.xz 6772300 BLAKE2B 3e5dc1b607da5f83c96f6cdb2bb7fe2d6bc83de77074b27a2312f072212123e67996e8a7c10608e1499a5d23105aa1b459c18ad2663e8938b377be1748916b6a SHA512 830c02d5f140749a63bb12b3e59ab4e6f8173d3a74e9429bc2fd33b98468badc8f0f213b9c7d9567589aa32505701cab7b17afffe32e28ab2577684f9bdb3abc
 DIST gwenview-21.04.3.tar.xz 6772236 BLAKE2B 83310fd6f290b4980dac774fe46ac8455b0cfde1987ffd76a43f313e8a185381b1eb10186fcecb1a198fa0872266f28aa3d1803a8ee92c0910b488392db12c6e SHA512 83caa2da3afe552a5c48955136a54e5c53b2ffd83ee68fd5f7caee849d9d7547a566941c41f7b13973e8f292a31ad9ad9d9ccdea7f44b76cab8b2f97efe160d1
 EBUILD gwenview-20.12.3.ebuild 2930 BLAKE2B 075a83c1f531a41709f01a9fac06ad598ebd43973bc19aff92de1406235d3d7e88cb57bd8fdc374d5f53dd01eb804c722c7a6d7e7b460b4a148c553d3fd93af4 SHA512 f36edf196b22d88c1159325223c6ec28c00628c37870200a7c5fbb464566542fd03fe67acbec2cfa97df344d35f25211794a3166077b0c817a03349af62c1847
-EBUILD gwenview-21.04.2.ebuild 2903 BLAKE2B e77f76106d59eccb99301e1569d5ed4055d52ad52386bf17d215b752dcb8c247feca5ad17f47886f8ab410dde45ef3fd3de4c88851b3481116509ed3ac0aa9c7 SHA512 41c4b42530ea8be4434c8eb2daa807c5a19b5e7e56beea4ac744fb628371ebd0c17a024fbc3fc0a79eaf817406825913111481e8a8e9d51049f6df626ef2ef78
 EBUILD gwenview-21.04.3.ebuild 2903 BLAKE2B e77f76106d59eccb99301e1569d5ed4055d52ad52386bf17d215b752dcb8c247feca5ad17f47886f8ab410dde45ef3fd3de4c88851b3481116509ed3ac0aa9c7 SHA512 41c4b42530ea8be4434c8eb2daa807c5a19b5e7e56beea4ac744fb628371ebd0c17a024fbc3fc0a79eaf817406825913111481e8a8e9d51049f6df626ef2ef78
 MISC metadata.xml 708 BLAKE2B cde335a32954748c28475a1620aac2e6733490fd8e6126f8963c6b5b0b6e8e87065dbab17e1723945e8f5646815acdf9fdfbf89c4dc57639663567fdcab0b5c9 SHA512 b8fffc87db328df9c5dafb6d72b954ce052678810375278adb390c832bec11f419000fcdd08bd73b9dbcc3e475b7e7b927663c9886b6eb92b7caca7e311015e6
diff --git a/kde-apps/gwenview/gwenview-21.04.2.ebuild b/kde-apps/gwenview/gwenview-21.04.2.ebuild
deleted file mode 100644
index 95963ca06d68..000000000000
--- a/kde-apps/gwenview/gwenview-21.04.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities fits kipi +mpris raw semantic-desktop share X"
-
-# requires running environment
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	>=media-libs/phonon-4.11.0
-	media-libs/tiff
-	virtual/jpeg:0
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	fits? ( sci-libs/cfitsio )
-	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
-	mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
-	semantic-desktop? (
-		>=kde-frameworks/baloo-${KFMIN}:5
-		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	)
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtimageformats-${QTMIN}:5
-	>=kde-frameworks/kimageformats-${KFMIN}:5
-	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use mpris; then
-		# FIXME: upstream a better solution
-		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package fits CFitsio)
-		$(cmake_use_find_package kipi KF5Kipi)
-		$(cmake_use_find_package raw KF5KDcraw)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package X X11)
-	)
-
-	if use semantic-desktop; then
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
-	else
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
-	fi
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "SVG support" kde-apps/svgpart:${SLOT}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index ccd269eea71f..68d19092b25f 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,7 +1,5 @@
 DIST incidenceeditor-20.12.3.tar.xz 546308 BLAKE2B 8156fc4bf9a5fb06d755c89debc55c8f765d3d76f9a33b03bad94df8d8dc1617be79e584e6cf6728577c66fdb4db5a627570545d06d0d673615b1d4795c759cc SHA512 cd344322ae026c9782fdd2756c5206b89bb8dc475f38addfc58b3622ea4ab8106287d32b0105506c0b4491c2575b227ea52570c486a29e019b7495f41ba5aa90
-DIST incidenceeditor-21.04.2.tar.xz 539832 BLAKE2B c7d4eb740e720acab9bce5c327b3af2bb5b5a40209408398b4fd92100e6b2e595ee71c464cfbc7d2a02ad42d368f8e6a0c57e4e891bb067a1ff9bfd4690cb002 SHA512 c67fbd9ae14256f1779c95be4d6479ded17fb4cbed8462c606f584e6eae091a247a8faf73cda4f2166e61ef2a2de3a65c02b47cd2c2a3947e581da5e8036064b
 DIST incidenceeditor-21.04.3.tar.xz 540124 BLAKE2B 044d0ece5f9ac83ecf0dc1c4cb08afc46ed6473b4fa88303f80cf8446a04608cf262f88b2b70160954607672e1ef3e2edb8d29c0b93d2f95e4a3c83f4063fd9c SHA512 65dc9257d0d6c238093b59cdaf76512938aa2aaf795e0a8e17c1c64afd75ccbb37941178a9295fcf240791e8daa9ca187184dcfd68294bd553d4ed5b9a9202ff
 EBUILD incidenceeditor-20.12.3.ebuild 1878 BLAKE2B 3e8ef837ff891798e1d0bf5688d3d7d53836a5bd366f1136b782aa0f48dbe6627f507e1973aea214b5442a90108bb3e9c137b41907a593ab3f25cd535e5989b5 SHA512 c2decbf0782791fdd58622bc0a965ae5b192bbd943f5a608ed988a9391edc82ddb72b15dd9f2acf1f0d73752d722a2b87ee10dc3e663390ab445dcd91e259291
-EBUILD incidenceeditor-21.04.2.ebuild 1881 BLAKE2B de1b1848a7685ee92aed0a7a184051a280721326ca6951f2a3d15a7964c238beb3d807a0e03669d10d71e9b21186d2fa1d7093f2afe5023532725cde1e20edef SHA512 7f0895bbde0756fec1e81389c8005f593c6b68419a296a7ab81a89ddd847a391a3ee1135fea50cbaf3b9888bd7af70accd7f2bbb9a688b8172cafc7f1a75807d
 EBUILD incidenceeditor-21.04.3.ebuild 1881 BLAKE2B de1b1848a7685ee92aed0a7a184051a280721326ca6951f2a3d15a7964c238beb3d807a0e03669d10d71e9b21186d2fa1d7093f2afe5023532725cde1e20edef SHA512 7f0895bbde0756fec1e81389c8005f593c6b68419a296a7ab81a89ddd847a391a3ee1135fea50cbaf3b9888bd7af70accd7f2bbb9a688b8172cafc7f1a75807d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-21.04.2.ebuild b/kde-apps/incidenceeditor/incidenceeditor-21.04.2.ebuild
deleted file mode 100644
index aab7cb64bd6d..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-21.04.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Incidence editor for korganizer"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/kdiagram:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[postgres,sqlite] )
-"
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-
-src_test() {
-	# Paths exceed unix domain socket limit, bug 770775
-	local myctestargs=(
-		-E "(akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 8c73bd5d9b24..8eabc479d8ea 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,8 +1,6 @@
 AUX juk-21.04.0-missing-link.patch 821 BLAKE2B 2bc4ef72c25068a92bbc92c5c8dfa684e24c1eb83e4c6dfe574f8e968efa81ee9895759e64d1af4ae34eba7522c2fbee32800d02cc827a385db939c4837c30ab SHA512 d59aadb96449b3d531db5cf059d6c7d0dea6da73dfdaf6485e7d142039b3357f1efe7213356cd9035f34ccf26a221d28562633542cc56a79eb4b413c230152d5
 DIST juk-20.12.3.tar.xz 1997996 BLAKE2B 857defce1e5d089d711f7f70ca0077beec0267d576cb262536b79089622b32e53700d2c031430cdb63d7bf2a5c9eb8a67d5fc0aac64c0ccf2557835b15174f61 SHA512 3eca02446be784cc8d3dd68e7da146dfbe5ab7296d27ba78d0f15ce34b87183692d91ef01126aa97a9bc95a558e9af6b6bef47c0ba0a2f25fbeacda79285edc1
-DIST juk-21.04.2.tar.xz 2010700 BLAKE2B 54e5664c8960d290bc0f0d14dd5f37905b4580da71a2fb6d27e5f92c2e6d68fa4e7d6d67c134be44e64197b607dcd67b00fbc47ffc88ae1a27256175a58e03e7 SHA512 8dc0b1d169570dfdb461d0ddf108e33424215643a2c3c18e0489f9066907f4b49497e8817235c322caf336d48e16b68a07e831d4ed2fb2893f25aeb9c9bef9fe
 DIST juk-21.04.3.tar.xz 2010508 BLAKE2B 63251dc3bb0c5363868e789b1d5017e55067b2114e16cfbf25b89ef751ecccef12cfc59acb4ba1f14b9d5e12762c0a65eb3cb6fc8034fc82eec214cbc8bd10a5 SHA512 ef0f1b72d03fcbe6dc5a92bcebbe34687a4cfbecc4f3209a5d57a032fecbcff18914c6a7ac710f9e6897ff3188fff193e276bacb873378d867b130c48ebc81eb
 EBUILD juk-20.12.3.ebuild 1383 BLAKE2B 7dc54ff15eb36854852843bf26ecc1f1cf3f930e6dc299f838a624347df4af04e4ed83c0c56620d58bf5b7acd680db71c6dd348f1c9a0ac63a412fad5c8d6883 SHA512 9b11b7ebfd23fb86c2eb282869c3319f53e737f45995fd1f5371556ba318c4c6fd7ec7317be47a3089e4a75b1016efea5e6a2eb18152ee115ef64f9ccc3facaa
-EBUILD juk-21.04.2.ebuild 1313 BLAKE2B 7598204cdc278a1d2ffd42275bebcfc3f2eea825063eb6b78b40090341e26fa677babe9a581c349c34e3f683bb485986188d49cb0cec173edf7f122171486973 SHA512 7ff880e075b302e7d1c22806bd3d399079bd7bbfb726c9e5df305c535a098a6e6a76cec2549c97d081a0e8a01abe95851ddf0d2bf4e69e381a1f4ddf951b6477
 EBUILD juk-21.04.3.ebuild 1313 BLAKE2B 7598204cdc278a1d2ffd42275bebcfc3f2eea825063eb6b78b40090341e26fa677babe9a581c349c34e3f683bb485986188d49cb0cec173edf7f122171486973 SHA512 7ff880e075b302e7d1c22806bd3d399079bd7bbfb726c9e5df305c535a098a6e6a76cec2549c97d081a0e8a01abe95851ddf0d2bf4e69e381a1f4ddf951b6477
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-21.04.2.ebuild b/kde-apps/juk/juk-21.04.2.ebuild
deleted file mode 100644
index d0a46342a44c..000000000000
--- a/kde-apps/juk/juk-21.04.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Jukebox and music manager by KDE"
-HOMEPAGE="https://apps.kde.org/juk/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	>=media-libs/taglib-1.6
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 21fd01e411e9..d5d1748120fe 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,7 +1,5 @@
 DIST k3b-20.12.3.tar.xz 10688136 BLAKE2B aa2e8de78b98e33888f47454ca5b2edfb195915c000c5a6f94f6cf0bd89575d22b7c4efde1e307a91b61bab1087b2e5fa665bf2abcb28de178f236df1ec37758 SHA512 e0c85d4faa6749d271d92a945e54c68876582b7d5c5719682950ca9305b75d0a46226f080e9c0bac300e63e32387ebb034d48f6ddc3b2d1a4fa2487db53f4039
-DIST k3b-21.04.2.tar.xz 10743652 BLAKE2B 3cb79fbfae64bd87b0072363d8bc9ff18d799ac6771b9d788c0cd6744f1439663e0050bc7e623c0656aa0802b28b104ace50842270c41f124fa28051c66f942f SHA512 b73ad34d0af94ace44ac36eafc0beb3b0f19683f26900b752069b6b419f5fac4a3b64d3e5a30937434982d3d09156fb43a5fa8f353a09f8c275cf0d2f9415fb5
 DIST k3b-21.04.3.tar.xz 10743696 BLAKE2B 22b58150fda55a0da3c20cd7ce85a3460f5aa195e7198e8ecc916dd3457718136648717fe2e80e37abae1d2b9456105fd1387df4afb112c8683c411304917ef0 SHA512 2bc61ebc26c73513d25a7b54e43781e5cccf2a140a74ffeef0e37a9c3a1bc823066b65c14c902bc3de8fa0b83fe620be4cfce48c880ddb271b8e399d659f4e9e
 EBUILD k3b-20.12.3.ebuild 3436 BLAKE2B 5e88c17153835fbc85e26b7f3f1d7ddb62eba8c3071209b59dd4d69cadddec159620683e0e7db5dd4ae0618e918f772920b972deef0f91faff5e4fac396392f1 SHA512 b060b77b6e28e997a4f0c2925e3a733723daf2403675aa152ef15ae243b569ce82c825d45e2cb59c2f02db94c707f60535fdaa3ed9accb09d437470a25d4c114
-EBUILD k3b-21.04.2.ebuild 3439 BLAKE2B aed9aa085f09cb6d1c95dce596ea768c4013b71962007292c9fa4852088cc3904508ba94f8268ff998b6e9d0804d2a26e5de171a96a54a77b3128c5972db5f23 SHA512 67d5e32f502a1f958c44772719c9c49cafcd35f42aa0b9f6bdf6ea30defd7acdfd0c5aacd46f382c1a14190902de8a8987dd1478eba55c8be7307f1e799647fd
 EBUILD k3b-21.04.3.ebuild 3439 BLAKE2B aed9aa085f09cb6d1c95dce596ea768c4013b71962007292c9fa4852088cc3904508ba94f8268ff998b6e9d0804d2a26e5de171a96a54a77b3128c5972db5f23 SHA512 67d5e32f502a1f958c44772719c9c49cafcd35f42aa0b9f6bdf6ea30defd7acdfd0c5aacd46f382c1a14190902de8a8987dd1478eba55c8be7307f1e799647fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/k3b/k3b-21.04.2.ebuild b/kde-apps/k3b/k3b-21.04.2.ebuild
deleted file mode 100644
index 39162900885f..000000000000
--- a/kde-apps/k3b/k3b-21.04.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
-
-REQUIRED_USE="
-	flac? ( taglib )
-	mp3? ( encode taglib )
-	sox? ( encode taglib )
-"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkcddb-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib?]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread:= )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( >=media-libs/flac-1.2[cxx] )
-	mp3? ( media-sound/lame )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	sndfile? ( media-libs/libsndfile )
-	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${DEPEND}
-	app-cdr/cdrdao
-	app-cdr/cdrtools
-	dev-libs/libburn
-	media-sound/cdparanoia
-	dvd? (
-		>=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] )
-	)
-	sox? ( media-sound/sox )
-	vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		-DK3B_ENABLE_MUSICBRAINZ=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		-DK3B_DEBUG=$(usex debug)
-		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
-		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
-		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
-		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
-		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
-		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
-		-DK3B_ENABLE_TAGLIB=$(usex taglib)
-		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
-		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	echo
-	elog "If you get warnings on start-up, uncheck the \"Check system"
-	elog "configuration\" option in the \"Misc\" settings window."
-	echo
-
-	local group=cdrom
-	use kernel_linux || group=operator
-	elog "Make sure you have proper read/write permissions on optical device(s)."
-	elog "Usually, it is sufficient to be in the ${group} group."
-	echo
-}
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index ebc964048883..852b1eff73ee 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,7 +1,5 @@
 DIST kaccounts-integration-20.12.3.tar.xz 84376 BLAKE2B 55f03614f86f2fa60b5b6475092ecf8f923e5e5c9ca2e057d2488abda250861fc1eb7a5c0141006da8a4a1747efe6a897bfbfc45740baea72c51a898783de34b SHA512 e9089f5d99d665a0568e43d66837faa5e994d2d93a3699057e6b86ff3bd65bddc448dd36afb49642ff80e150a922b4f110541f7834d04b52e9059fbff7795a88
-DIST kaccounts-integration-21.04.2.tar.xz 85216 BLAKE2B e39c74b9559e0cadfc8abb00d54a7bc4d738e236c57c7176815329eb482caa2445b2b2f4c8c413b283cc04b6fde3ae0d792bad502097cae497a27c04d0281ae3 SHA512 d93a3c8a9e93e7cf2d1247c11947818d61a4cb66900a8fe2e04c2d944ffba18501adf3128fff0ebdc0f04958c5c95bcc211cfbd7820ad43cfb4b9bc605ae2008
 DIST kaccounts-integration-21.04.3.tar.xz 85184 BLAKE2B 4672f9b8e0d9f376d0d602a443aa6b60da93bde3427d33d2b7380f48978ea6a65c032f0e65483d1a715ffd422dac92840cc2e0186fff2eabc40da1d8e9995a2e SHA512 0552ab2da16b8ab85632f458827a1c16dc0b7e4a4d3b97266249430595abe11f0b76dc2dd7f59dc7796e795855bce122915733b692d9270b6da8b6cabc2c2ae8
 EBUILD kaccounts-integration-20.12.3.ebuild 1196 BLAKE2B d52c3fd612e77097761e849fec0713635aa42d1b51cdcb2522b331dba8d1c4df2ff337874de35dde290a979cbec4f54d6f1b96b62467f1d223a7b4f133e33dd1 SHA512 df7f571320e46516735f230dd2b7b6ded2e74b92d4e2f1a99f8decdea40d10b20189329201a1339afadff31a76bef775806b745db7b1db3420a6ff5fe5ef33e3
-EBUILD kaccounts-integration-21.04.2.ebuild 1199 BLAKE2B 1e5dc6b2ba07e044031e63260908a10c45610e3b7ca5bc43858c2380efb17a339e93f6609081ed5ae8708acca8c8e769395829643e8742ed867d3e3ca1b9a1e1 SHA512 b9bc6d9bea82c9d733e8e6d0d057b65c0998cc056d44aae0cac79f32a095201fb0490851ff2e888fb0bd80de55ebae4c1caa85a5af1bbfa28818057cac448704
 EBUILD kaccounts-integration-21.04.3.ebuild 1199 BLAKE2B 1e5dc6b2ba07e044031e63260908a10c45610e3b7ca5bc43858c2380efb17a339e93f6609081ed5ae8708acca8c8e769395829643e8742ed867d3e3ca1b9a1e1 SHA512 b9bc6d9bea82c9d733e8e6d0d057b65c0998cc056d44aae0cac79f32a095201fb0490851ff2e888fb0bd80de55ebae4c1caa85a5af1bbfa28818057cac448704
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-21.04.2.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-21.04.2.ebuild
deleted file mode 100644
index e6a71ffbc9cb..000000000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-21.04.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.15.2
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org
-
-DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	net-libs/accounts-qt
-	>=net-libs/libaccounts-glib-1.21:=
-	net-libs/signond
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-"
-
-# bug #549444
-RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index ee4ff29b0bf7..ec2a374537a2 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,8 +1,6 @@
 AUX kaccounts-providers-20.12.3-qtwebengine-optional.patch 2822 BLAKE2B c303be4a5291ab18945e73a83167fb563daef52aebe68c3ec94f98327f01d3fbdcae1390cf51a1334c950d7f04cc7d8de17dac388340d15c773ed2a9d1275c91 SHA512 50dee13af1c01df73bea1d7f3f36588f415c959e1d7bcd84d73f17c88808df9b0fcd434b5a9a0281c9dbfaab416e852627f68a4bfeef41451c2a1d4560a10d0a
 DIST kaccounts-providers-20.12.3.tar.xz 61612 BLAKE2B 89861cc15a73f7003900b8ee540c904a0e426ed254c802a4116e5a9861f4483daecd00dafbc4f28eca7edc97f52af58d3c5503396e8d3168575e5f654129fd1d SHA512 9ad534fd4e4bfd4992265fb2722b09eb09fc3f4a880751a44b5f29da7250d2827dc1bf62a7df04449064d63d2b0b30ce4038f0920f9a6838f8f4876bf680b2c2
-DIST kaccounts-providers-21.04.2.tar.xz 62908 BLAKE2B 6671a20a1a5ef52f4f76ad6fa8cfd19edbe43f2619c3a56ef5fca07b42a4ecc270fab36fbe30fb65990352de1f44036370db88342b887c5e2e1a77d2afa4ea1f SHA512 1401a177ec36d6e451835cefd221d6d7c7bd868436a22d7326fe2acf31364e7b056fb772dee50f1ab85346612146ee6999642a289e7f6cb477c09ae0aa032443
 DIST kaccounts-providers-21.04.3.tar.xz 62920 BLAKE2B 6f399fe0bc8127f085e8e8b3071b048f5c9dc52b6cb81d5ecf8e7383ef120b9954fe616f55564b06d7c189301bf9d7874338f6f2fad8274254c71a410a5838a0 SHA512 429bbe610c2613da430b3a641e374eb98d81f874c63a508a30f7acda2774a0dc31bf5fbf26a142dee15f4ec8556ecb2a28d78d67b6378177ec00d68204512055
 EBUILD kaccounts-providers-20.12.3-r1.ebuild 1006 BLAKE2B cf5d7c5018dada508ce84f2bff23e55d8d8a945be882102e417a7e50e45c297c3a2a22f1864a3176dcfcb8a024e99e419edbad15d64f5a08322fb0f8fe9a82be SHA512 905a180bea05586009022dcc2d4e2d3283f9b144fcf91fc21ca70b68fa1e96845177726d5c51f458cad57f6311cd1235d43b1840572ba0124acd0bf98f3e674e
-EBUILD kaccounts-providers-21.04.2.ebuild 1018 BLAKE2B e99dab445005c70ad998554680b021f5986f58ff104474bb6b8406e6b857699fc3e1ec26e473ede90c0170d6b28ec4a662dc2a26bfdff69bcffb6e19185621d3 SHA512 84c1d27d55701b3fa9c8ffbe70f2bdf45d58992155b88efac6034beebbcd135ce63170ca8557f7ae94b839cc913b4904bc8892f436fae3926e1ffbf5d52a532f
 EBUILD kaccounts-providers-21.04.3.ebuild 1018 BLAKE2B e99dab445005c70ad998554680b021f5986f58ff104474bb6b8406e6b857699fc3e1ec26e473ede90c0170d6b28ec4a662dc2a26bfdff69bcffb6e19185621d3 SHA512 84c1d27d55701b3fa9c8ffbe70f2bdf45d58992155b88efac6034beebbcd135ce63170ca8557f7ae94b839cc913b4904bc8892f436fae3926e1ffbf5d52a532f
 MISC metadata.xml 366 BLAKE2B 7d04e3030abdea6593027fcdbbb1825369569be3de6312d1b66ca699d0c0817a3ef1bb8b685480a28b703cd6f20698174aaaaca42c886807cbd6dc50aeb3d32a SHA512 18a7a40fae8cd9bd9932a754033e80a8a4a67423964c8bc72c2ced8f9f85ce15843ebfbb2c6850a04965c39e2067d2f52323395d2668d1dba7e32b4fcbf86c2c
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-21.04.2.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-21.04.2.ebuild
deleted file mode 100644
index 0121ca06ed2e..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-21.04.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE accounts providers"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+webengine"
-
-BDEPEND="
-	dev-util/intltool
-"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kaccounts-integration-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	net-libs/signon-oauth2
-	net-libs/signon-ui
-"
-
-PATCHES=( "${FILESDIR}/${PN}-20.12.3-qtwebengine-optional.patch" ) # bug 753274
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package webengine Qt5WebEngine)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 242ba8375717..697ee0bf3ddd 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,7 +1,5 @@
 DIST kaddressbook-20.12.3.tar.xz 3263556 BLAKE2B 711a518d90d207473b4125c74e3a04d34773feef500ea5635247eeafb8050b870e85cc19ebfd18147e4b4318d6052361cef4bfe1afa54a77fb2a3c63ac48673b SHA512 6f8b069222734fd3d42078d1bb2401db8dc4d8697c0383e49c47479b559fd7776b0ae7f7f757e2e767c2a173b1738c7ba8adda928481ac947dbfd404fdaa0434
-DIST kaddressbook-21.04.2.tar.xz 3329636 BLAKE2B 77962247fa5046a7e62d4ef159fe341ada5c83a04edda4683b44f3a30e6dc8775968cc78e5bcc80b70682d5099e32e3ace4254c4607543d77e2adb1321b4e79b SHA512 dd0e751ea38dec7e0b88af5a72a39df9ce2c7a35f9600f98154628ac5796fe0fe9056a195bc079efd16159fd5504c2cfd39de83d61f7a96b8ca9ba1642b20a5c
 DIST kaddressbook-21.04.3.tar.xz 3329648 BLAKE2B 44b489a613efcedd9e0cbd4c23f3a1b69a5b5e144ecdb9cb485015a441cb18945965a4cb6ad15ca4bc195ef0359b08f97304cd130cfd388440aa4eca801e67d0 SHA512 8325642b057df2489bde527be71691ce54668e13a3e815727c77051f6e7d1b76e7a4195b6f363c78d7fe6bd4f67af61364810b2fe4cfae62988d383f86fc7a5d
 EBUILD kaddressbook-20.12.3.ebuild 2008 BLAKE2B 4a91e3fe3fede6ff383df16e7e5b645b50ae4e116e8b5e7dcec683ce7079e7172183af9a8ce25b5b9561e2c822916a954754dad9ff8fb224d8408148d7334bab SHA512 84eadec047461154bf6a8da3baeae23e80d3a9abb393b61e53102d4f6f81a1d9463f885521e92f6e6eaea940cdd1fce6b9e5269e7076ffce4a368b1f9e3aaa8d
-EBUILD kaddressbook-21.04.2.ebuild 2011 BLAKE2B 8c79ea2c25df9dc271c6d2a7e04a366cdf1d89237bd8f5c70dd71af02b686030f21afdf3729b73dcbb887c6976f0d696650b09459c634f472041085abd2d1495 SHA512 4f569de545aba4bdfc19daa35c18942d91f743573c8e08c1426a9ce5d0058ce182c4aa5376d2b5d05696abafc49c57940a3732289316e1e4194d0171eaf68ad6
 EBUILD kaddressbook-21.04.3.ebuild 2011 BLAKE2B 8c79ea2c25df9dc271c6d2a7e04a366cdf1d89237bd8f5c70dd71af02b686030f21afdf3729b73dcbb887c6976f0d696650b09459c634f472041085abd2d1495 SHA512 4f569de545aba4bdfc19daa35c18942d91f743573c8e08c1426a9ce5d0058ce182c4aa5376d2b5d05696abafc49c57940a3732289316e1e4194d0171eaf68ad6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-21.04.2.ebuild b/kde-apps/kaddressbook/kaddressbook-21.04.2.ebuild
deleted file mode 100644
index f582c173a38e..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-21.04.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kaddressbook/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 1259187c0e96..fd0810089391 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,7 +1,5 @@
 DIST kajongg-20.12.3.tar.xz 4471984 BLAKE2B 0101613bada0322e27640135fe103980b5436c34593d2214093adeb8426fbc95a1b7258f027229488daf378a84f44f232ea8ebfb54f39b97b397b06093a85a53 SHA512 6821c06c1eb7aa9f55872234289de9ffe503dbe6183bb208aee104769fe8fa1af4cc2e34448f5902046c576e0823c1724f215a0bc9a3f60ef25b59b81d85ffa6
-DIST kajongg-21.04.2.tar.xz 4473080 BLAKE2B 2b8c5bc5da0eebc20ce8bbd7641f3ad5749fa08e6c37599a334cbdabfa6364aac96965a8c28f60617f6c00257e3ae7ad21dec84dbfa2177eb1b1d985919e40da SHA512 c762280dcd018a07b1bbc378e6e7e5d288df748d2cb4844d0ffea2ff59a1f40da7ca18caeeee81f60413621b8047b2b1704dcf76e7227b06c6dae79360365671
 DIST kajongg-21.04.3.tar.xz 4473068 BLAKE2B 240ab96013f0a0eff469c2fff6a80f852010563390cfac1ebc9c80f450d63169fd7e7b59ac9147fb67cb2839ee31caac2887c31c584e0ab7fb8c69bacc9c44ba SHA512 1eec0c3dc0f0bbdd8f10afe0d701eb83a6cc8ae4116776f123319b0949cace331476196d80fbd1b81aeee8757644787b3e842386472350486358774fa6358178
 EBUILD kajongg-20.12.3.ebuild 1021 BLAKE2B f908e1e8b1552a408975c1a5b48a64bc45382740ffc3515767cc854d86bf76c7a81867341cbd35ef22bf44e6fee60138c2a54f0e99bdd3ca0e0165f51bf07e1b SHA512 3ac964c788d3252aef70441b873df37d96b59c9b71ac2b4d94570ebb572b83a237cb38c187766e30a121281f65831c6015d3d7a26fe61219ea7fba7a5141eeab
-EBUILD kajongg-21.04.2.ebuild 1024 BLAKE2B b4dbccd34894367f65c6c045dfe5edc25f401e9c425fade9a9ff3936e78935bedb0678e30fa09267fbda584297d331d0fbd5c89a570ffa531961a3be8311c8d3 SHA512 847b4705813030fc6970b185ca647023c47327549a82b6456620490fb2366912719d00839d5209fa23e30cfb204dca3d817ef55a1d6be6e6b4fa4cee6e9e379f
 EBUILD kajongg-21.04.3.ebuild 1022 BLAKE2B ee9bbabb985d7206e232e86b4127a1c40fb07cb6aea6b2f8c4e688677a9616515193320fa71aeeb8da46174d48c5430970c1bed90542d2661938ecf7d59d42c5 SHA512 20b8c92566a5b3351d36e29a45180ea20f0fc814effcbc7a4e28a90108382dd467a6dbc0f7843fe2cea22dcb7d7576a51d108b1288635eb480d53bb925a560cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-21.04.2.ebuild b/kde-apps/kajongg/kajongg-21.04.2.ebuild
deleted file mode 100644
index 4271cbed6e78..000000000000
--- a/kde-apps/kajongg/kajongg-21.04.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8,9} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="Classical Mah Jongg for four players"
-HOMEPAGE="https://apps.kde.org/kajongg/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-db/sqlite:3
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
-	')
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/libkmahjongg-${PVCUT}:5
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang src
-	ecm_src_prepare
-}
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 34e827b082e2..3d22c4bb8098 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,7 +1,5 @@
 DIST kalarm-20.12.3.tar.xz 2110400 BLAKE2B e87af2d4ba02f5aede932894811d3b46a316a40625886f52ac98187a48b637bcb10d7b31f35734627a5379d993930b8d9b4e5abd4e07c4e63d80b2a4da350991 SHA512 c0e335e766349f0474a982325db6d8c6e4fc611a5a2e925a0dd4a108be6d4edb25493e88d08ab26cdc9167546cf1810c5898d036f6f9be32f491ff1662becfd1
-DIST kalarm-21.04.2.tar.xz 2137496 BLAKE2B c7ea3d0efe8e48903c9427a9c778d207d2c60eaa95a492b1a17b4fa9527a4abff57f3a63ad989d82a97d28e748b1525b7ee6fd8029bd3c6dc9b395cd0bc499d1 SHA512 b74173aca2217054b7f5c75323ef6ca42567c8c7227c51482cef6583e3616f1343f9689b389ed0418eeac0ce1f75741d75a46fdb2b4acaeb41811fdd64822d22
 DIST kalarm-21.04.3.tar.xz 2137400 BLAKE2B f5ecec13b3a0b7895cb1f815cb8d6dec828574e890ab26a2dc9410ce1fca63dd46a7dda9e6ddb8b690cfe7563b517b5673553a28c91c44f3d3755f30d712be75 SHA512 19a9bb6e185b86fe4710d04a8dc4985b8d0c0e49cc53c5fde24e23e4c0cfa4587aea4400957190606122db1363be7a705c5ca0a716631b0eb3a496b82b550f42
 EBUILD kalarm-20.12.3.ebuild 2449 BLAKE2B 1eafe17835380b1547e1b00b18586cbe1d3f5f42209198ea43965b77946efc42240b78f4954d17d586374b591d3dced35e56bda31ad551d07b17421a13c1edad SHA512 ea61d88fd37b70fdcf57addce83cda853162f5253312672de71b573a7205111dd2da9f5cee102e5134ecf8d095900e3296e12382809c267d70efcebe07b64dfd
-EBUILD kalarm-21.04.2.ebuild 2415 BLAKE2B c419ba4f8b39c81817661b743e35ca91b039a482d75d61406b7c62fa1c98c65699aacd8d6656d9472b2b28626977194fecdabcfb8266c46edc3b3d0f576320bf SHA512 799ab479df2fae4daf2d2cec25e56bebf088eca8bf80e88b67446c3acc1cdb9476e1c70314981ac94aea584ff78c8cf670014fad9ac35db53ccb45777f97e0f0
 EBUILD kalarm-21.04.3.ebuild 2415 BLAKE2B c419ba4f8b39c81817661b743e35ca91b039a482d75d61406b7c62fa1c98c65699aacd8d6656d9472b2b28626977194fecdabcfb8266c46edc3b3d0f576320bf SHA512 799ab479df2fae4daf2d2cec25e56bebf088eca8bf80e88b67446c3acc1cdb9476e1c70314981ac94aea584ff78c8cf670014fad9ac35db53ccb45777f97e0f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-21.04.2.ebuild b/kde-apps/kalarm/kalarm-21.04.2.ebuild
deleted file mode 100644
index a37f2a450609..000000000000
--- a/kde-apps/kalarm/kalarm-21.04.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-BDEPEND="dev-libs/libxslt"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index eba375f25fd1..4172effc82a2 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,7 +1,5 @@
 DIST kalarmcal-20.12.3.tar.xz 576680 BLAKE2B 7ddc5fe35c68ca4601dd361a26d7b324b467353d56757712d909a8f8c424711a7189abfb15e9565a2adcde08fa9aadb6ecb59016d1c65d2ba9e98f3fbc19951f SHA512 97391ff398c404051ab2001811cdf317720e8d68100d6e654b8ff416c2f4d49cff8ef3ef65c5476e4990749ab92356c767310637d876e1a0cadc6bcd923f33b4
-DIST kalarmcal-21.04.2.tar.xz 629196 BLAKE2B c712172262fcf0028224b1bc6c0d9da0d94e7871b495549095dab671b0ca239c6f280c3d23e1040a3626aa30bd3a09642a9e94d76b8aa2290da3f9c9aa862ffc SHA512 e084dee560dc75782d4e1914d15cadea21d37de00cfb094a10875c0fc5f22d11281c1e57a6549d3bdf7b6c1f4bd66a7208d95c22025be322266d20402d0a7585
 DIST kalarmcal-21.04.3.tar.xz 629092 BLAKE2B 7e3e8ef9f123943ec1b8ec1a48d9f141495ed95a338fc528cf0cf9dd634b58a1c3ead0df1a04e8cad26883f8ca70dff3ef27fd3dd80ede5cb525afe862358451 SHA512 3db4c4d3e8e1d3b552f5f094a87d0b283e85328990f992783e93384a02cf2247a8042c8447500e1e238feb32b405f977a0bdcb5aebbd9860ea47872e9ee458a6
 EBUILD kalarmcal-20.12.3.ebuild 766 BLAKE2B 94e92106e1dc6638bdf94bac4f559fdae7bfb7ad2315c84018e7722f777978b32ea33785cbc8a8be8be70c510e80fb17a39f1eabb7ba071f548acb417d52fff6 SHA512 648ff277149868b9adb515eb9327d5794ae59c23cccd48a02305e09138cd3ce7b309399d65f36c1927038bc75d0c23df69ddf54cd33b8a44c8dbc7d0900f39d9
-EBUILD kalarmcal-21.04.2.ebuild 769 BLAKE2B 248699e95012deb3747400d5b6ca60d5faf9e4ca866dce1d23f1e3b4bde084629fb27e20229ff3ba468f92d57a80da436e420840d3a32d71426cb87100a1a839 SHA512 301693d3909986e774bc686b0505439b4d296a955efbecacc00700a1b5c7c0510b0919f2535970f1bc010d451ceed913f275f122890ba1ba9c846792e9bf287e
 EBUILD kalarmcal-21.04.3.ebuild 769 BLAKE2B 248699e95012deb3747400d5b6ca60d5faf9e4ca866dce1d23f1e3b4bde084629fb27e20229ff3ba468f92d57a80da436e420840d3a32d71426cb87100a1a839 SHA512 301693d3909986e774bc686b0505439b4d296a955efbecacc00700a1b5c7c0510b0919f2535970f1bc010d451ceed913f275f122890ba1ba9c846792e9bf287e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-21.04.2.ebuild b/kde-apps/kalarmcal/kalarmcal-21.04.2.ebuild
deleted file mode 100644
index 676913358689..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-
-src_test() {
-	LC_TIME="C" ecm_src_test #bug 665626
-}
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 6670d11a3d6c..dd9667c7fb23 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,7 +1,5 @@
 DIST kalgebra-20.12.3.tar.xz 1024612 BLAKE2B 0a3a5ce9b91dea0997f7ce8ceb7cfd28d8b5267fce8ea2e321c50b67b66d3230191502058506071621b2c574491256b8824d53986182e67982f4221919a61537 SHA512 75cc1a85253103768486de84526fb3902fe8a269320af0259bdb0c2dc732062a2928b05c8871a74dc0d0563db57fa5d0304e7c0702c928b29d6a40c99a3b9d30
-DIST kalgebra-21.04.2.tar.xz 1025344 BLAKE2B 079fa897647ac345f6264b265b08487bc66ffd450a3e983208ba589b3105333fe9060c03f19b03c14817c1b4001236b93211817b56f7b3b9641040e786e176c2 SHA512 cdaf4b5b5ca7c721afb32f9fd18c101ccdaaa4c57c72faa117fa418aac1cc9a3bb689cbac981d58cf757e75c11d07c02ef0bf9576dc6792ceccd17ef691689a1
 DIST kalgebra-21.04.3.tar.xz 1025464 BLAKE2B 69169eede2ea15f9fe5b48f909d42bbb75aab2f6d3086c3dc1dc9b28358cbe18bbf898b09501465c8a0df26b704eb0dccff590e40f895ba8020b5efa739c677a SHA512 1b849712c003219ef037c4d17d7ade635460438ec8fa9e192f1c9c084e227501efa00c0b55a57b240018edb089d30279384de860e6ad2fe9956b8b99bb2ff552
 EBUILD kalgebra-20.12.3.ebuild 1137 BLAKE2B d268b23235590eb00368aa42535cc5f4fec9457cf9ec1422a8250752c52c530365f8b3822fe051e78a60137ad8cfea6d8d3d3d74b485f74a44b79670aac645c7 SHA512 dc467b991adc671a1c5569f6858ccb6c054f409f1d891e9a9cdc74c86479f6d3d1da3fe850f0af191260900c2df8a79d0e769ad127239cc5f8c0b9c39c34d3e8
-EBUILD kalgebra-21.04.2.ebuild 1178 BLAKE2B ffc5c544c2b17f95fc37a2b4c056b2c1cee9de835ec89f0ddeb509e55e12fe169f0c32bbb3240aec8a54d4face527e095fe5330d8dcf928f4939cbcca7b5621d SHA512 ccdb796ddef54795766e1309781a70482dc18b5853406e3ade1dab03f3774bdd61f10bb5005ae7aefcefac62164e2710bd375343c8725162b295c6ca87e9b161
 EBUILD kalgebra-21.04.3.ebuild 1178 BLAKE2B ffc5c544c2b17f95fc37a2b4c056b2c1cee9de835ec89f0ddeb509e55e12fe169f0c32bbb3240aec8a54d4face527e095fe5330d8dcf928f4939cbcca7b5621d SHA512 ccdb796ddef54795766e1309781a70482dc18b5853406e3ade1dab03f3774bdd61f10bb5005ae7aefcefac62164e2710bd375343c8725162b295c6ca87e9b161
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-21.04.2.ebuild b/kde-apps/kalgebra/kalgebra-21.04.2.ebuild
deleted file mode 100644
index ac61bd5bc1d1..000000000000
--- a/kde-apps/kalgebra/kalgebra-21.04.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="MathML-based 2D and 3D graph calculator by KDE"
-HOMEPAGE="https://apps.kde.org/kalgebra/ https://edu.kde.org/kalgebra/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="readline"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/analitza-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package readline Readline)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 3615d12434dc..881b36fb4dc1 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,8 +1,6 @@
 AUX kalzium-21.03.90-cmake.patch 815 BLAKE2B ba13821a0d50f1120e37d73b30d13b7597a67342b74c710155429b3880bddaafcef665f44acbc93d63dc7ed894b5b906a906bfef7a0a587554cea278c4c41553 SHA512 3b188578152cc399b13062afceb6e5a0e006f5e42810c09dec45ee7d8388a4177a98a076fe7789d1aeba49236e70f861f6a9af6907a5c06db3405db383cf83c9
 DIST kalzium-20.12.3.tar.xz 24521912 BLAKE2B 23b1f1aa9948428789e46469c19e6bb9ebfa9841db29b4f8b89254e6cf973b213d49e9abda07fc9ee34a7a661d4ee2849491e0e6ade1e3fc0e544f7ba477e45b SHA512 09e3d588dd0ebcdac0b7c473f5bf7f240516a12797240a36efb1e764968c3953373c04e589ee84ff92b23df97e8d367a155b980175dc8ad01a2551a9d5d1f046
-DIST kalzium-21.04.2.tar.xz 24589564 BLAKE2B e76d609ae223af28098457197ded3695926964875374fead4f548f3ea525cac45de2f69fb20ca4630ab66dd46a6fd58162f24faf1496c492512298b17786e682 SHA512 c1b2b7c0c2ab0bfa3c9c154664eaf6a4f555ee37d4bf0f1fa946c5f6b262315e8100f814c8c88d79bf2a90dd5efbd61b8d641eb2f242ad95110e96d32e79860f
 DIST kalzium-21.04.3.tar.xz 24590252 BLAKE2B 8418e1f7fd298b9a7ee04765bdbe3bcbde94acd09ad02d9befdd88b72139f08028fd996d9048323b2c34b3e9f6519c33d209fc186e097c427eab5124565eda47 SHA512 8c19954fc1fbe70b866769d89ec7cf85afeb71a1c0bd67783808fed59375acbd7f86484b36aa0e724450e4307cfece86846023dac77a24fa82df229007244a35
 EBUILD kalzium-20.12.3.ebuild 1706 BLAKE2B 0f718c344f937f047e0d1fd9af9e0a3a8af1089571ec687a4ce7e9acdb8c318c247cdb3a41555111f184d29fef3688696abaa49dbd42178afdc53636b01a2b83 SHA512 d93defafc6d9b6d40b38c1a57d99e7a494585623c4bb6440d8b0237dce18b4d07a8d489220ed08d6d8edb109d4bfb2adb11b231b3d266b87a606321eb3389847
-EBUILD kalzium-21.04.2.ebuild 1836 BLAKE2B a3387469010bd7b99a1d41e0bf58b3560380ddee7cbb02470546f925a022f85e163f7a1dddd05e0d0ddfb6c5af170d9971265e12580d7f5b5eecb3f290464a7c SHA512 27d8b2e2b0050b3018d4c613c7374665da6fba5602b270c2880c305a46af5cffaaa2e44e3809e7a9e24368cf0852fecb29cc1d395faec265c13f9e111d859152
 EBUILD kalzium-21.04.3.ebuild 1836 BLAKE2B a3387469010bd7b99a1d41e0bf58b3560380ddee7cbb02470546f925a022f85e163f7a1dddd05e0d0ddfb6c5af170d9971265e12580d7f5b5eecb3f290464a7c SHA512 27d8b2e2b0050b3018d4c613c7374665da6fba5602b270c2880c305a46af5cffaaa2e44e3809e7a9e24368cf0852fecb29cc1d395faec265c13f9e111d859152
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-21.04.2.ebuild b/kde-apps/kalzium/kalzium-21.04.2.ebuild
deleted file mode 100644
index e4f90b8b9afa..000000000000
--- a/kde-apps/kalzium/kalzium-21.04.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org flag-o-matic
-
-DESCRIPTION="Periodic table of the elements"
-HOMEPAGE="https://apps.kde.org/kalzium/ https://edu.kde.org/kalzium/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="editor solver"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kplotting-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	editor? (
-		dev-cpp/eigen:3
-		>=dev-qt/qtopengl-${QTMIN}:5
-		>=kde-frameworks/knewstuff-${KFMIN}:5
-		sci-chemistry/openbabel:=
-		>=sci-libs/avogadrolibs-1.93[qt5]
-	)
-	solver? ( dev-ml/facile[ocamlopt] )
-"
-RDEPEND="${DEPEND}
-	sci-chemistry/chemical-mime-data
-"
-
-PATCHES=( "${FILESDIR}/${PN}-21.03.90-cmake.patch" )
-
-src_configure() {
-	# Fix missing finite()
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON # TODO: not packaged yet
-		$(cmake_use_find_package editor Eigen3)
-		$(cmake_use_find_package editor AvogadroLibs)
-		$(cmake_use_find_package editor OpenBabel2)
-		$(cmake_use_find_package solver OCaml)
-		$(cmake_use_find_package solver Libfacile)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index 88160cdcfd42..b5b2b23bc7b5 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,7 +1,5 @@
 DIST kamera-20.12.3.tar.xz 108696 BLAKE2B f449aa46ca076d03db9bdd60147702cd56ca3a0d47f9ef510198ea6f87d33ed04a6cd473d29e6060c3b34904239a189fedc12bc51322651e6e022e5f3c7c3ba4 SHA512 7abe0ae6e85e270084e608b85fa5982c3b67ebf16a81b9ed3e9690dbf860abbbc8ca1feb885e3cd7dd93faa91622757c16848a26baa4f68f128cc119fe91bd2c
-DIST kamera-21.04.2.tar.xz 115600 BLAKE2B d9edccfb4422c79f692d91e561c422d6200c9039e58e0bf32a1f9aa8e1c5ac8ac13dad3e238de1123aa21a16c587ae7e2aa3486adb54fe5db598dc590b63d47a SHA512 9a83e59cbfdc9a43ec42d1223a7bc1f41872a91e8597a6b65e4e0d11cc7ebadbc00fad143e6cd1e63bd9b0132fb172a30f1c2c96f0d405970c46cc3d9ce7ac57
 DIST kamera-21.04.3.tar.xz 115580 BLAKE2B a7af7c27837ac26c2dd461783f85b895a34f0305f30565f00dfc131ac0ebbb57ab9ab6885cb49b1905630cc5ee9090584721c7a1590b7ac46cf28cc6ebbdc955 SHA512 629f1de8cd94900b8ac247f63a91634613e6f8d3b3889cb289e2f7d926cc58f9eeb0d3b0466d0d963798ea604538485c7409d74dd957398bdc47031e597509f4
 EBUILD kamera-20.12.3.ebuild 790 BLAKE2B 3c3e2baf091d308fd8be718a56073c19b419fa8c0d8debf1517ca5b28c499ada65b0e66bbbd6437d16a45db1c0945e019fb70a1de2ea925c41aaef5045301134 SHA512 e8e213ae7bf936dd19c946a45a17d847b8b7a0aeb9692195a96c45b0634cf2190fadf50e5f237bb6b0a926ae342c859c365cf26aa07e2501ddc4475414e22b06
-EBUILD kamera-21.04.2.ebuild 793 BLAKE2B 88758323b076d36edc706b0140d61111a06858e2791a9ca9fe60e36294313c27a51373e37367631005f9ed3d2fa1bdcc7a747e9a49b5b5769b77ac5daf69d219 SHA512 ec906c8b3c7156aa2521d0d8f4063cda4a3385e65ce169808f1b918c12179dd4134c2916847a2603dd8c73837d513bf064b03ea845e50c833167ef620dc88a03
 EBUILD kamera-21.04.3.ebuild 793 BLAKE2B 88758323b076d36edc706b0140d61111a06858e2791a9ca9fe60e36294313c27a51373e37367631005f9ed3d2fa1bdcc7a747e9a49b5b5769b77ac5daf69d219 SHA512 ec906c8b3c7156aa2521d0d8f4063cda4a3385e65ce169808f1b918c12179dd4134c2916847a2603dd8c73837d513bf064b03ea845e50c833167ef620dc88a03
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-21.04.2.ebuild b/kde-apps/kamera/kamera-21.04.2.ebuild
deleted file mode 100644
index ef5544de67f8..000000000000
--- a/kde-apps/kamera/kamera-21.04.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma integration for gphoto2 cameras"
-HOMEPAGE="https://apps.kde.org/kamera/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	media-libs/libgphoto2:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index 2a8b044cdf98..ac2cc063944e 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,7 +1,5 @@
 DIST kamoso-20.12.3.tar.xz 211540 BLAKE2B 2f4b9c8ed3a5f6110769ad30fbb380cafde4381802cd38678f70896d2c1f23902577442cb018c06d15e215dcdbec0b62e2a785ac2bcd1f72dc14d1a29f5ab0cf SHA512 9542452b52c7fb574ca00ce32b2fb836f3da211702ec2cea7c2f7cf735cf0eef7f5f80528e0312bff54c88c9e11bf52d73a54c14b933768a2394a2cc756b496b
-DIST kamoso-21.04.2.tar.xz 212056 BLAKE2B d3ebd60698682b01955ff10917083c08cae0cd3adf3199092b82602acd84e1896474f91cb70944f0f85dfe00c38fe7b56d4e2ea5af632ac640116fedeb59fe54 SHA512 4fd2942645bf43a5fb22c6c91020f80fb42154f395960fcc2ea08ec77b5cbf79882f8d1ae5ce9ee9f064cc5c1645ee83625703b57fb3a78609922c7607e634a0
 DIST kamoso-21.04.3.tar.xz 212040 BLAKE2B ca11ae524f736af7591dbf6c54116f55ba12f0ab5fd80591a0c7b4461ffd979ca93afd9c1619d173868f0ec1a30e84389b252527370d68719f29d9b3d4dc56be SHA512 e15e703e0e3f189cf065e1709914416a0a1e51f58e512fdc816e06ec9af58c84711b33eda17883ce30074da4b5dd4b924ad402b07899ddf2491b4363bcc8ea9d
 EBUILD kamoso-20.12.3.ebuild 1090 BLAKE2B 5ba13b799a522fd3c8059bd0082eb63418e52a0443a29bd149d807db1a3b97476c949110419a0518a76a3d2306f29ae2adbe66ba8a131aac1d1a6fc0b22bca9c SHA512 0b033ac8e8eecb80275b4eee3b2444f57e5266cf7efd8d56cf916af63b68807b5985a7361d7775d32108a6b559b2bdca0b3019d4bb835a1a18000ec0d29c69ff
-EBUILD kamoso-21.04.2.ebuild 1093 BLAKE2B ac91f593b51d16008e20705650d54dddf148955879e6a577bf3cb6ee752af15de84c076ca26441fb45721b6ba35c2a4435021e8002c18be1ac8c4ef7a1633ea9 SHA512 0dd19cc669c36079dd0dbb9dd887ecf3eb872a5e14dddfc210881665c1090df15ea1367a135874362581892c8cfb25a4f3aa63f7806b7333886cceb251952ee1
 EBUILD kamoso-21.04.3.ebuild 1093 BLAKE2B ac91f593b51d16008e20705650d54dddf148955879e6a577bf3cb6ee752af15de84c076ca26441fb45721b6ba35c2a4435021e8002c18be1ac8c4ef7a1633ea9 SHA512 0dd19cc669c36079dd0dbb9dd887ecf3eb872a5e14dddfc210881665c1090df15ea1367a135874362581892c8cfb25a4f3aa63f7806b7333886cceb251952ee1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-21.04.2.ebuild b/kde-apps/kamoso/kamoso-21.04.2.ebuild
deleted file mode 100644
index 45be9ffaa760..000000000000
--- a/kde-apps/kamoso/kamoso-21.04.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
-HOMEPAGE="https://apps.kde.org/kamoso/ https://userbase.kde.org/Kamoso"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	media-libs/gst-plugins-base:1.0
-	virtual/opengl
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	media-plugins/gst-plugins-jpeg:1.0
-	media-plugins/gst-plugins-libpng:1.0
-	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
-"
-
-RESTRICT+=" test" # bug 653674
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index b096f2d46ebe..bc092f0ddd24 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,7 +1,5 @@
 DIST kanagram-20.12.3.tar.xz 8028804 BLAKE2B 980219011d912a3acca1356edc6d8cfea3d17967eeb9c5272c70da7896ee011cbd98e82a537b98d1f4d4eca121096aafa2178ee217ab5b594e9f6c042aa1a4c5 SHA512 2e101bc3430ab563c4b7c7f68d60560c60484c11c9e3243d6b7ca872fd4042e339165fcc8533a755c0c161098bef8a66c15afbae88a375a73f62293bddc54c26
-DIST kanagram-21.04.2.tar.xz 8039496 BLAKE2B 35d60ac098bcd0899a7b04d782a058b1d71343d29d8e4deb04e23cf4e30416b271a99a2b250879787e025245377f0196409913c8452870f2326fbeef243dda6b SHA512 f9cc98f7d8604faf994a35ad7dc37952c4f6856fac2ca793a569463c3aae06ecb396fa2933e422753a97873237374c7738be3976ba462001622031be4415772a
 DIST kanagram-21.04.3.tar.xz 8039740 BLAKE2B be7b164348037e961f9780456eeffa1afbb12b526bce7aa947d41f6516dc1c31b38f5818b199b2f8a9703075123a752aad95cb01be297dab6bf6f31a91d654af SHA512 33f0d4f1f2521b057674cc1a870c014716f1acd60bbca5d0b8afdcd1353bb46af468bda307e3c6a0a8e0945997c2349c3e95408dfbae9176e87d626056b03929
 EBUILD kanagram-20.12.3.ebuild 1223 BLAKE2B 61c1c1fa0a7663ae5aaa66efde1ee0c39bec3a63b8577bc6518bc7c9e5721e0138bf47c8d5439fea5ee597dfb3026bba2b104808762e2f093346d55a07124ff8 SHA512 953a4128f73c177f3991ceadb857de3959d7bdeb8d2a31ac822708f648348e8c5b077cd30ea75096e3b8b858de763dd324bb279f5848fba88db44b5b6c806281
-EBUILD kanagram-21.04.2.ebuild 1226 BLAKE2B 16a0ab6a39da693703a474c22f1ff5f0145f77ff6b922f9316118f57f77425216aac88b2c6aee8584ed7bc97de84b2fdab3f480f84bbca28018ba083a0561473 SHA512 74bb2e3f791c5418c8fae0355ad1e00629af04cee8f78f828352b99981dfe94bbc94683fd8d13a21914b63fb0db0cbf73766792084b4d56d00004cfece15209b
 EBUILD kanagram-21.04.3.ebuild 1226 BLAKE2B 16a0ab6a39da693703a474c22f1ff5f0145f77ff6b922f9316118f57f77425216aac88b2c6aee8584ed7bc97de84b2fdab3f480f84bbca28018ba083a0561473 SHA512 74bb2e3f791c5418c8fae0355ad1e00629af04cee8f78f828352b99981dfe94bbc94683fd8d13a21914b63fb0db0cbf73766792084b4d56d00004cfece15209b
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-21.04.2.ebuild b/kde-apps/kanagram/kanagram-21.04.2.ebuild
deleted file mode 100644
index a8b6fe80dfd3..000000000000
--- a/kde-apps/kanagram/kanagram-21.04.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://apps.kde.org/kanagram/ https://edu.kde.org/kanagram/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkeduvocdocument-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=kde-apps/kdeedu-data-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index 0b5f9f6d6c9d..8c60a72e7b6f 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,7 +1,5 @@
 DIST kapman-20.12.3.tar.xz 2531568 BLAKE2B 9f853146aebf46ecfab0f518d0078385e6233512a221f42cddeb45f903e1cb82f2d8beac9f122ac0ecbf522243720c1f0dcc694b47bceb4b50c044dbfffb3c2f SHA512 cbfd2424a714695b643103300d693de987fb2b893910a9028806b8e18bf2b8841610fe816344821dc9847796af201d6732c86ae0add53e32fab0ade5bfe1be5f
-DIST kapman-21.04.2.tar.xz 2531824 BLAKE2B 597ec4b1e70c578fcb905c0a22c922d0371c6d84aae8011e7a0a8fa48ecab0a2b70fe49b24cd29476cbddf086155725adbedb43cb03a2e9dc985bf16b5cb939b SHA512 beb59663f876989d9e979ebc2ffea99f741066d72f45fcccda56ae1bd71705ed14abc05e254d9bfb7121807ee4a9e42e8f1b0163c6ed827e91d8357f740636b8
 DIST kapman-21.04.3.tar.xz 2531848 BLAKE2B 99f99f1af115ffa947d36e6f6120b904d11b4194639b1ad0302b85216b4edc5748b81f67ac5ea7e8805fbec824bd4845f059819a0925d57abc3253cb4c8252a9 SHA512 1925b9d05a29e59b4dfec7d8dcaa57fccafcb7e7cd11667bdecc0490ae8c95d2f9b2b2099905343fd6e7b0fb77f17352654116e9952d8d20d1d2b805f7c86858
 EBUILD kapman-20.12.3.ebuild 854 BLAKE2B ecfe6c95cf5d64be99f92b21a7083b00f26ba01bf3e955402de23e5966d7dc128c6ee72b5320946ea517cf63796790d8c6333c4ba6ae9a7f5e3ec58ea14f306b SHA512 a94db20cf5d13e060640102ba2c6c5a0076d7cd21eef5ac5039015853e53801c26da70d02fb4c6615c2d616504ffd3d48b519a626797ab0e5c70e134cd0e39f8
-EBUILD kapman-21.04.2.ebuild 857 BLAKE2B c62a732711235532cb53e37457652879debc8be30dbeeac09f55ff690def856b02804000cc4dbc1892dd5b17ecaf36997129d26d2fe4f871c71f581cdef9db7e SHA512 e1dd85352bc9c1807f5201cae902b1ddc9ef0a0671968f0617f60f3a5a6dff997155843e366a74a87027a2203e6b2ff99f0d6d856f07c6eefe3eb43b6ee5cf56
 EBUILD kapman-21.04.3.ebuild 857 BLAKE2B c62a732711235532cb53e37457652879debc8be30dbeeac09f55ff690def856b02804000cc4dbc1892dd5b17ecaf36997129d26d2fe4f871c71f581cdef9db7e SHA512 e1dd85352bc9c1807f5201cae902b1ddc9ef0a0671968f0617f60f3a5a6dff997155843e366a74a87027a2203e6b2ff99f0d6d856f07c6eefe3eb43b6ee5cf56
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-21.04.2.ebuild b/kde-apps/kapman/kapman-21.04.2.ebuild
deleted file mode 100644
index cdbcbe6c8420..000000000000
--- a/kde-apps/kapman/kapman-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Pac-Man clone by KDE"
-HOMEPAGE="https://apps.kde.org/kapman/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index d57390a396f2..0aa6dfeda005 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,7 +1,5 @@
 DIST kapptemplate-20.12.3.tar.xz 336772 BLAKE2B d0bd72275519d54c60a1b77f9e65dd9dd692475fd431b84440af11ad06c32683c2fb298315ff687a2286a8d23a601e4df554bd9350e16f11aae379de2100720c SHA512 a767c905b5a517c76940fef529a3add8f839c30bf80e36e3ff4a9319265c20686fa26d0b74fdf85cbd4b530931dce19191a267f0aa3fd426a62dacca9404716b
-DIST kapptemplate-21.04.2.tar.xz 334084 BLAKE2B 0919a52e19c8c4d65a08220043f933d3a9b31f574dce5fdf51ee923eb540111d4aa95994cd9efa764eaf1ef4d74c61e706394539e6b8a8a99039a63b2d3d2f66 SHA512 fde5110764001095b67f8152fd8efc1a649c423e1714b3dc1bf6495b019b82cd75af34eaec651b2aeeba1a90713f0e8a59997f0c97bd45224b05a0372cf1065a
 DIST kapptemplate-21.04.3.tar.xz 334000 BLAKE2B dee8618b3e4e6968c1f1a243355a3f20abd82d20d31b0b9750b0515535dbcdf3823d32332febac00989efc27a27290d5dc235f67c36662287a3ed1d157a17377 SHA512 15a5a8b143ac58300f9f01ca0c37889ab6498b214fdd77c8aa50743015e6ce40f93578b0eb1cbef39fed8505851db2a170eb8f3850a126a2c38a8e4f49984ad2
 EBUILD kapptemplate-20.12.3.ebuild 827 BLAKE2B 8f1b9c8c803f481caaa5d33b81ee8e57c8e3feaa810f987e88e6f594a069751ec258f8e76c2e464f88e5e6fad2d6fa39526e5222e6a89a7b048693e309d9b347 SHA512 dce171bdaa885ad82308de003b0163012a8964408e906ad2de48562fb7b31a6bb0be05c134462313070735ee0a19811b7cb6888a1a69e8a3943fd9109d8f7264
-EBUILD kapptemplate-21.04.2.ebuild 830 BLAKE2B 36c6d21d62f95cd546fdaa0ce7aa4c953d483021f712fd15da3e5887a6d19c28fdbdc713ade01d6c5e408eddb2ba16346775c46e88c51c0958e1fe9d3ee0164d SHA512 d77a69b7951f92e38db619592b6806826e35529c59d643287540b8a81b60944874f087f570dec8afc9d4e0fc8723d62f1472cc2119c7cae2d9a2dd16d6565502
 EBUILD kapptemplate-21.04.3.ebuild 830 BLAKE2B 36c6d21d62f95cd546fdaa0ce7aa4c953d483021f712fd15da3e5887a6d19c28fdbdc713ade01d6c5e408eddb2ba16346775c46e88c51c0958e1fe9d3ee0164d SHA512 d77a69b7951f92e38db619592b6806826e35529c59d643287540b8a81b60944874f087f570dec8afc9d4e0fc8723d62f1472cc2119c7cae2d9a2dd16d6565502
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-21.04.2.ebuild b/kde-apps/kapptemplate/kapptemplate-21.04.2.ebuild
deleted file mode 100644
index 537b49dcfb08..000000000000
--- a/kde-apps/kapptemplate/kapptemplate-21.04.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Shell script to create the necessary framework to develop KDE applications"
-HOMEPAGE="https://apps.kde.org/kapptemplate/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index c007f8f120a5..ecd2dc27143a 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,9 +1,7 @@
 AUX kate-20.08.3-fix-filetree_model_test.patch 909 BLAKE2B ffa7ea62388751d4d173aaab2b27372fd0e7ded38a7612ff8644906e12c4ae52bf27df22188bf0229b06ee7de08e3ead278e17631a79623350621ca61b4e2a06 SHA512 4d4388bf0cab7db1979f174ba79d5736843a5584e6e6d85cc0751fa8a6e43d8a1baeebe3c3ed463c3ec376a7df7fef79d4e28a1835604cd4120ae576d8f8fd39
 AUX kate-21.04.0-implicit-dep.patch 2160 BLAKE2B e184cbf456f45e15904e17213813c935b548d1fba6cff98b162dcc4619d0ba166ae1db0c726a637c2b41bd95ebfe75d114259b5d7bcceccdf09141532e893d78 SHA512 23d56228dfdbcb419ec6ecc3353659efdc604f0786ce0ddff6dddb63a990a7086a7d6d777e038567fdbf049c14013d77fdd99f1b01022627a235ce597ca05140
 DIST kate-20.12.3.tar.xz 5949012 BLAKE2B e35c4da5426772286abe54156babc0de09fbdf8fb5c7505714637ad427e3a694fd541ca7b17e99ebab22f9a19f2a8893d34098cb625fd0e1c0f0b6b920acd62f SHA512 545ec2a48ea6ec737011602b20ac2f60a0f9db0a5e55e0b232f9fd7c10b7e3f54d2a346be7e6341537758a3f8f94868c4083a6d2d10b572568f5c56c9d3aee9c
-DIST kate-21.04.2.tar.xz 7276296 BLAKE2B f34215085b78a69f6f3842e5489d71ca2f78c208aee0c127d612da2b115d449af6718469de0d957409e4054ece0eb578415b52a62a3a4ee6a6bdc6d88740ac2d SHA512 dbd81048d1fead6856b34c198d1e38f194498e1b2d252a7d6e14321b71151b6d2ec7b536237dc0d538d3eba624f72357ae5f7ea2525b53614d0067f1408a38aa
 DIST kate-21.04.3.tar.xz 7283360 BLAKE2B 9520b6cffb284581aaa9bf70daad08fe5ab4570d433ea785a24d0c9122470c9d9d362026c3ea430924c453828001455a377e05537a83a2a81814df4de5e3cf72 SHA512 51c4023f3915edd348c1aa7ce448475f39c3401649510f89c7e17f9943739b67b09330e52b912794b31d4bbab1f94ed322f96bb45d450f016f84efa010d694bf
 EBUILD kate-20.12.3-r1.ebuild 3225 BLAKE2B f4daee96e9978f4abcee811be4d81c15286d932a34546a81ad5798d8dff97fbf79a32ffe425b64a92fffce7a50c5090113bc396bd16bb1483c63322a99be900b SHA512 b312987952acc72bfbb482d9a96b268e341da40d62602cf18cf77be98375984ec7d1827635d1c92bce984cc8a688182ce37d965e0a3b1344150a3482209b9813
-EBUILD kate-21.04.2.ebuild 3169 BLAKE2B 2c79b353e83b2e03a74ffe3488d9782d1d254eb4f6f730e8c6fc0a6e22d088d1017ad958c6235ba45dba0aa1e6b83d927d4d00d46d6f05130ed4a3bdab63fedf SHA512 74221844e82996cda415b7f418e7b0e91bebcf9aae9911128e7625ab162e76c1957ae9b775d10bb5dd67be9ec0922079357a1b6077660f09f2ddc998f0a767bb
 EBUILD kate-21.04.3.ebuild 3169 BLAKE2B 2c79b353e83b2e03a74ffe3488d9782d1d254eb4f6f730e8c6fc0a6e22d088d1017ad958c6235ba45dba0aa1e6b83d927d4d00d46d6f05130ed4a3bdab63fedf SHA512 74221844e82996cda415b7f418e7b0e91bebcf9aae9911128e7625ab162e76c1957ae9b775d10bb5dd67be9ec0922079357a1b6077660f09f2ddc998f0a767bb
 MISC metadata.xml 862 BLAKE2B 9b27a2dc759d83a85b1be9a5afc2dedc77caab98255575d493f4af6961d9b5bb19699eb69858082e1bc05dd8ff14f5c0c9212e5e146ff13ec1a3685008fd837d SHA512 d1a90d55277f25dbbad445d8d591da5fa5ddf3bb65aa0ae2d70ba6626abe7deebb56cbcb8a3718c43ad136da2de1b06a017c9740493504b446f33fbeac2734a7
diff --git a/kde-apps/kate/kate-21.04.2.ebuild b/kde-apps/kate/kate-21.04.2.ebuild
deleted file mode 100644
index 569ea5c2b085..000000000000
--- a/kde-apps/kate/kate-21.04.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
-HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
-
-# only addons/externaltools depends on kiconthemes, too small for USE
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:5 )
-	lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:5 )
-	plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
-	projects? (
-		>=kde-frameworks/knewstuff-${KFMIN}:5
-		>=kde-frameworks/threadweaver-${KFMIN}:5
-	)
-	snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:5 )
-	sql? (
-		>=dev-qt/qtsql-${QTMIN}:5
-		>=kde-frameworks/kwallet-${KFMIN}:5
-	)
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# bug 785412, master/21.08
-	"${FILESDIR}/${PN}-21.04.0-implicit-dep.patch"
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	# delete colliding kwrite translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kwrite || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		-DBUILD_filebrowser=$(usex filebrowser)
-		-DBUILD_lspclient=$(usex lspclient)
-		-DBUILD_sessionapplet=$(usex plasma)
-		-DBUILD_project=$(usex projects)
-		-DBUILD_snippets=$(usex snippets)
-		-DBUILD_katesql=$(usex sql)
-		-DBUILD_kwrite=FALSE
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# tests hang
-	local myctestargs=(
-		-E "(session_manager_test|sessions_action_test)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Markdown text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
-		optfeature "DOT graph file previews" media-gfx/kgraphviewer
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 13f1abec0750..ba36ecb6f392 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,7 +1,5 @@
 DIST katomic-20.12.3.tar.xz 1429264 BLAKE2B 44fc6055ac792f4e7c0c6c8844f38fc5fadbdf3509a80e0f280149906899b32e774efd40cefe3d0df273a98be53b4392ba1daf06a6e6991ba47eb21709efd2d9 SHA512 3b738b702ae41ab3044da158c38ec267d6cf71f73a49973c4f7d31ef0c31c87d38927dbcd6f8a4aae0b723cd969394d6ea61aa5717b3fc50285ee84d56ca26db
-DIST katomic-21.04.2.tar.xz 1433752 BLAKE2B 99b29717eadf28fbb9e447efa5081f11eb1804658b48dbeb488e14af07620bbd2474645e973227d7e0c3b3d76e7410e304c64fd7e3817cb059cb1e3a0ea76761 SHA512 44c222653d29c18a96c45afaa955b9a07d4dfe80b0e5b6cbfd933fe88090e00622a8804c2fb00f769d846fd1c0301afcc06383e68d0456e5a27ea88047623ba9
 DIST katomic-21.04.3.tar.xz 1433720 BLAKE2B 36377b88d1630fa278a47e2096cdf42d41dc78ae98dd3b35909ceb7db244f51c24c76b88725bcd9c7ec2a0f69f7f45b3776c2a721b28cf1da1145686a8995a86 SHA512 04ffa027e189b5ec10f538dfa4b51ffa2a124b0f5262c1563fd606deeba981f91b7209e89c4ac09de7371870befd56f2a1ae4f6cb656162a7c70f4e2f244de0c
 EBUILD katomic-20.12.3.ebuild 869 BLAKE2B be8a8f6c041b57a7b25d5f162fe4a6f553304b5a6dd853fec40228c3ddd1eee6e5bdca067bac43b043a3254054f6d3fee738b1113ecfc9ee6524c03ca7b9c8cc SHA512 cd9a08f6eca140b3d9b5d2907c3f6579dcd3b1622b9aeb3b602b72dc50a8117db88536c4a91b4bcf4cb95c5da78d4dd91fd6159842c94a8c48fc7b787fb2c30a
-EBUILD katomic-21.04.2.ebuild 872 BLAKE2B 5fb66d7abb20eda2aba419ce0c7fb93f917f4beba619f691d044dabdaf64be0da11eb5bb743a7e78a69d3646a17b7d4941ddb712ce2b05489bd51e7f263a7838 SHA512 8f5b0a0fdde1ef9aca6d97aec2227d352fe3bea63723c895390d1a5fee4c21ac83c2fbfe7934a915fd15e3d887e8f0d9d4d3d2639831ec2c3687dfc0c8a7573f
 EBUILD katomic-21.04.3.ebuild 872 BLAKE2B 5fb66d7abb20eda2aba419ce0c7fb93f917f4beba619f691d044dabdaf64be0da11eb5bb743a7e78a69d3646a17b7d4941ddb712ce2b05489bd51e7f263a7838 SHA512 8f5b0a0fdde1ef9aca6d97aec2227d352fe3bea63723c895390d1a5fee4c21ac83c2fbfe7934a915fd15e3d887e8f0d9d4d3d2639831ec2c3687dfc0c8a7573f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-21.04.2.ebuild b/kde-apps/katomic/katomic-21.04.2.ebuild
deleted file mode 100644
index f4b70cf6760a..000000000000
--- a/kde-apps/katomic/katomic-21.04.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-HOMEPAGE="https://apps.kde.org/katomic/ https://games.kde.org/games/katomic/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index 088a0fa6b185..b5d77253e237 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,7 +1,5 @@
 DIST kbackup-20.12.3.tar.xz 380824 BLAKE2B 2a24a4b44ae7759e82d61497f38420c478a811ce0e6c49b0c217eb389c66e2c4c9c0c8b572f36b07c766d2a627294fe8bcef0a7869eee137a9378c1dceeae469 SHA512 5fab293909eca6b43ed6f29f0c62b81d6ec175f9a002a09bdae960bb933f370533a0709dfce5625865360b6e5b4a85aadc8bfb48f5ae9ca2dcf3f38981aeac37
-DIST kbackup-21.04.2.tar.xz 383648 BLAKE2B b4db41b8fb54b2f56c7988a82861dc5b3600d1edb07e580e1d6ba808d5194942d522de82dbeb58ceaad4917d512cdb5951335c414649cb45a31ee8f1bdc800ca SHA512 1da85cd24d5db7b0328acf694479b654294fcc7591b50431777e2f629071b72bded164dc3dfe040a8e3f7bed77ab55bd12ab3bdaac88ea4ff0a058d570abdc1c
 DIST kbackup-21.04.3.tar.xz 383704 BLAKE2B 15dc6890fa5fdcc9400906eeacc3abe43e15c2293c0dbcd0b94ee74cfd93a0befaf699f3a66688c324fa0a865d377a261314a31653d3272904e9628a203089c2 SHA512 749c7611806ec78542cf1f6b56229121d584ef492646fce7a3d50b85024520701e9b61a08b56b3979326bfe823130665552d79ef01dc3c2b95138a6fdb49e8dd
 EBUILD kbackup-20.12.3.ebuild 930 BLAKE2B ec52774e34acbb7726428bc4c7f104fdda5d0a71a6c7a1bbd91cb570e928723dca0eaed269fd1779b468e2346bf7d6b54990c183942fccf95ddda1c5f9aeeeed SHA512 6e6166bb2c7b114b47eaffbd1bb9e82910c0edd7c5338b3e52b790026c5a34670296e553f0e5be97a3e7fe7e5980396482c87f7daf47af75f90f9e7e5a5baae4
-EBUILD kbackup-21.04.2.ebuild 933 BLAKE2B 93c871030579f4b7e3f24fca9c1a94c2e4707f4c0b2e6700ce6ceda81d7e17b5ae0df7fed2090a78d671a7ee4f365509c67696c8e4e8808c5cd72582ac5103cd SHA512 63fbea985418150594fefe6419f9a07fd6f3e8d389d7e924bc5f0df188f4c75362311fc5c4c470cf32c882d4e598451c52825ec091ec4d805d67465219622737
 EBUILD kbackup-21.04.3.ebuild 933 BLAKE2B 93c871030579f4b7e3f24fca9c1a94c2e4707f4c0b2e6700ce6ceda81d7e17b5ae0df7fed2090a78d671a7ee4f365509c67696c8e4e8808c5cd72582ac5103cd SHA512 63fbea985418150594fefe6419f9a07fd6f3e8d389d7e924bc5f0df188f4c75362311fc5c4c470cf32c882d4e598451c52825ec091ec4d805d67465219622737
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-21.04.2.ebuild b/kde-apps/kbackup/kbackup-21.04.2.ebuild
deleted file mode 100644
index d256a27a62e3..000000000000
--- a/kde-apps/kbackup/kbackup-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Program that lets you back up any directories or files"
-HOMEPAGE="https://apps.kde.org/kbackup/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index e35dca1c2c12..de5af4dd3775 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,7 +1,5 @@
 DIST kblackbox-20.12.3.tar.xz 450304 BLAKE2B 9ff8a31b61815ad05ac57834d035aa229d7ecd489a1c78c682940ac9169062a0312af848ff03baf9d52a7ba9499b86f88fd2ed70c69f76079d0aa023aef21e19 SHA512 5e641009fa3482e8e1dac73b01224a66a6ce14c1a4180d011d08b812815919a74c9c9285a5a7aa49ea2567ac744475327eef3311fae505e4cd52400b998b6310
-DIST kblackbox-21.04.2.tar.xz 455120 BLAKE2B 7bb81d2b329a6e2b5a573e0009163de8119552d48441d3ba9ae3bfd4abc3fa6432c5ca142d87209f153874da88788fea3420120f7e2463701c27e5dde215905b SHA512 9b1a24c24339c5429019ef77bde0c19bb86a59e41a19d22847252ee36a85a8ba81378284aeaff6af91d855041d3f1f4bbf1b60526e1c8438eafd8bcb5515bd0c
 DIST kblackbox-21.04.3.tar.xz 455152 BLAKE2B 0d6238f22a8d28d7e28418f43ce7b0f860cecdcd969e093e1bcc391322e526996fb291d6e1a9bdf91d2a5ccfdcfc8af8709982392c0efcf87f14e5f6f4c37df6 SHA512 b42076c4dc5a5191c8bd4d6584e70361aab6d32e98742a971311f58c6a302dcfa0b706bad5f62cb5751e7a58e60d6788cebebeef7912fe4878d165d758f03b0e
 EBUILD kblackbox-20.12.3.ebuild 991 BLAKE2B 14c9657d30af060d699fcc5b4f8f5eb5e9dac1dd2e6b863afcb346f42865b9dd1a9168754bd5ec9c32b5c2625b60bda8152c9b72d54b9b098313f39c7a5dab59 SHA512 2b24ce9b5f7ebe2b9ff3bdd5d31a4ed5f98fc885cb1ab8c5939700cebfcf728c885e94be207c66ed21aba60e7baee7565127657f16f6c36dc42b983dfee365e7
-EBUILD kblackbox-21.04.2.ebuild 994 BLAKE2B 7a54d7fa179474333b2a2fdb05f275d41e1c7cef2402a4c9677447e83d9ade0e067b80e9d156ccdf9f3630afe55434d70f8abd3c6e3da52c0cc2f48a24d8929c SHA512 cfe6e202c8334af38c07b78f2313c33289f1958557c8c54d3b986c538b41e5edf46d1e0d9093794b9737fbcdf043bccb188301faa97fd32386500b8449eaf68a
 EBUILD kblackbox-21.04.3.ebuild 994 BLAKE2B 7a54d7fa179474333b2a2fdb05f275d41e1c7cef2402a4c9677447e83d9ade0e067b80e9d156ccdf9f3630afe55434d70f8abd3c6e3da52c0cc2f48a24d8929c SHA512 cfe6e202c8334af38c07b78f2313c33289f1958557c8c54d3b986c538b41e5edf46d1e0d9093794b9737fbcdf043bccb188301faa97fd32386500b8449eaf68a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-21.04.2.ebuild b/kde-apps/kblackbox/kblackbox-21.04.2.ebuild
deleted file mode 100644
index 2ff69f8fe1f2..000000000000
--- a/kde-apps/kblackbox/kblackbox-21.04.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Game of hide and seek played on a grid of boxes"
-HOMEPAGE="https://apps.kde.org/kblackbox/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index 1e83a790cb7d..428a7461981c 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,7 +1,5 @@
 DIST kblocks-20.12.3.tar.xz 1908420 BLAKE2B f4b5489b1fba530bba81ac446af949fba242812c5dd1b9dbe24c25f237bccddb858c30c882e5d8659685b3a1745af7f97d24b7014abb34dbdfcc7649310d2096 SHA512 ba5164af1bae348780b4ac284be0a696521671d258a26d0e2d7e401b995077d7b4c01fa0c3df4dbffdd6f79c617907e41b452b067d6d8861ffcbe5b68d5a2690
-DIST kblocks-21.04.2.tar.xz 1911688 BLAKE2B 886634d1dde5b93e9a245ca0ed6494f823718e17dbca01f78469b8e958be449feafc27dcf6e43e00acbd0c4894202c51b40c8f94f3c4b8a594d37c982b897146 SHA512 ea9e2c9bd86ca275d7e67cdd8a073acf07805dc0a401b49caa78c41ccdeaae3c48f13b688d9f3a4d674829e1852eea5dbbe18d29abe6d9d96d297da02207cee4
 DIST kblocks-21.04.3.tar.xz 1912336 BLAKE2B 645d5bb20db8417631acf57f83fc57acb38a089a9033deb852aaa9d06dcf52426d8bb576f4360fb8b47f393f3c90ccb944092e0ba732e97cec5513691c7aee94 SHA512 3356063a7d7b20363482e51c0c174a40bb3b799df62593fa4c2564299b649faa008f1ea4b5e2f0c60d46055ea2e77daafe5e7c7ad83b46cbbd0285851e27ce3c
 EBUILD kblocks-20.12.3.ebuild 832 BLAKE2B da17ee1f307d8cf69b9b951d13dfd8337f63462cc673d48ee63f428bb6e387c51a06b0b0b703108920fa3313cfaa968283d042f750d67a56fadcab0484d016eb SHA512 a2d3f86d8ddce75c9cd5b90d5dad5b4b932cbd85e4e15048bdb1ae4f3ccdf9c56964b9a69a7b6b4d3e8fa15c5be9fe9b4c40fb3c29288e3b5dafb3eb2305aa31
-EBUILD kblocks-21.04.2.ebuild 860 BLAKE2B bcb40638643d7dbf49e3c040dbe1b048d6275cfcdfe3ef27606d5a40a054d9bfcd0c9a9686c7cb64bb9c5bc32e9a8776245a3fe4fcc73c3960ba4d1ceb880598 SHA512 e50807d515cb1e938a8fe183ee8bd0e69c630eed4f6946415f3a601117f397ef1b1902ecf80bb9b1b9e6b3665ae11abd071093d8d60a24c233b6a6531a652e18
 EBUILD kblocks-21.04.3.ebuild 860 BLAKE2B bcb40638643d7dbf49e3c040dbe1b048d6275cfcdfe3ef27606d5a40a054d9bfcd0c9a9686c7cb64bb9c5bc32e9a8776245a3fe4fcc73c3960ba4d1ceb880598 SHA512 e50807d515cb1e938a8fe183ee8bd0e69c630eed4f6946415f3a601117f397ef1b1902ecf80bb9b1b9e6b3665ae11abd071093d8d60a24c233b6a6531a652e18
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-21.04.2.ebuild b/kde-apps/kblocks/kblocks-21.04.2.ebuild
deleted file mode 100644
index f608ae6d4146..000000000000
--- a/kde-apps/kblocks/kblocks-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Single-player Tetris-like KDE game"
-HOMEPAGE="https://apps.kde.org/kblocks/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index dbf1602a9497..ffced1b6eb5b 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,7 +1,5 @@
 DIST kbounce-20.12.3.tar.xz 3443204 BLAKE2B 97cd3d386cc37a60e68cf0f19842abb74df16e1784436299134f7a7473a20f5ace66742351696fb9ef4f8e0a86ebb861668e80df971b81c60d0bd64afa7adb0f SHA512 d1137116ba98a96b129d21fca8f087c87df338ef081dea0b6bcab6b026eb341ad9ef4e9c0858d95a7268e5585aac68336b58bc132acc14148a0f91646637a22c
-DIST kbounce-21.04.2.tar.xz 3447784 BLAKE2B 4c36d6f35d958da895f942b514f1db3bcafcb0010e223cabc4626a7108620206878fb0f049b2c6e208b84dd2fdbfdec15a8c277552ae3026bed80714bb8528cc SHA512 d8a4fff558f41e3263c4c96377829ab403c64dd7d63c0a8ffc0a9a3d4717be66dc6c28f8b2943ef2db8e382a9c5dd6f8e5975ea8feee7a4c0c7cd7b7078a0d0f
 DIST kbounce-21.04.3.tar.xz 3447648 BLAKE2B f06cd15abb43f0f95395774ee65992b2d93c861e4e4784f322044cb0e341c1d4fabecfe69d8f4fce6fb4544843df9f2710595a16c3f47a04df0dc9289c7ac4bd SHA512 abd045e3af6e6b65d125e863b9d8814b30a0a0e99137820b5dbc334ff172479c0d67a023bd97c323d2764ebaaa0ebcc6e3d4f8e0b2d4c0f29dbbc85b95b2a3e0
 EBUILD kbounce-20.12.3.ebuild 966 BLAKE2B ec915ad8c6d7915f652f573cfae45c8ea5d4e9b9d86e5ceeeaf43287ab96ee2ba022bcf372208693cf98f1e69a6cd9937d588e6eacee916c84021a2c41e5b8eb SHA512 df5ebdc15b79a667caaf9db38343e0158616346456aad53d4020dcee050f30707d1ebd8766df9280832d6f6ba7b8321000cd4c61ac1d0eecb679c4d6e1e1417d
-EBUILD kbounce-21.04.2.ebuild 969 BLAKE2B 9fa97ca496bee483b0af5fef085d31d31ee80271b397150ebf0c243bfce7a03c860e864f68e3799851d2bfa5db1e4c400565d677a4dab108558ee2aeb4abefa6 SHA512 a87d1cda309879773f518a78e945201e3ed38377afc953ff77a667cc943f587f94309e96678e6cd2be814d464887077179ce7003fd3aeae5b10b0121f39ad398
 EBUILD kbounce-21.04.3.ebuild 969 BLAKE2B 9fa97ca496bee483b0af5fef085d31d31ee80271b397150ebf0c243bfce7a03c860e864f68e3799851d2bfa5db1e4c400565d677a4dab108558ee2aeb4abefa6 SHA512 a87d1cda309879773f518a78e945201e3ed38377afc953ff77a667cc943f587f94309e96678e6cd2be814d464887077179ce7003fd3aeae5b10b0121f39ad398
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-21.04.2.ebuild b/kde-apps/kbounce/kbounce-21.04.2.ebuild
deleted file mode 100644
index 83997e7d87ae..000000000000
--- a/kde-apps/kbounce/kbounce-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Bounce Ball Game"
-HOMEPAGE="https://apps.kde.org/kbounce/ https://games.kde.org/games/kbounce/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index dcd53cca4604..52d587d01cb5 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,7 +1,5 @@
 DIST kbreakout-20.12.3.tar.xz 2284120 BLAKE2B 48f81ade530cf2d601d960030cb5eaca12af38345d736225b8ea65874fe08632a86fd3ff57147eaeb56d1d7c4bf31a93403904f65846d3140fee599fc81aaa79 SHA512 e74d6ecd602d210ca40f4192c00984eea9bc96c18dc2b72194449e578a5656f81c18680bacb444d707d301cdcf06c47b8651117a05b0ff2888117fea994958fe
-DIST kbreakout-21.04.2.tar.xz 2284084 BLAKE2B 5f1b64e21ba929f78ebc16012d75b9e6c7ea597a56a02bf888e3df0e1f81ae1590cb4c952ed7e40b968ce5d79171235027320e497d135177cac93659c98f814b SHA512 aa883691424b8d638190ed9410316a0f36c181af20434864c8efca3051178bb0f4260a84951d6f1c104a126be60b662e869720ff9c038a4f22e086642f7e0f2f
 DIST kbreakout-21.04.3.tar.xz 2282256 BLAKE2B 09c585e91a1323fdbb0abdba61b3cd38df565b05ad185ad39b41eb79f527b250e36eb41400aa113c09f392434db6a4c2e0cc91bf16c639210facb0e0c7576727 SHA512 0f72faaf376a239c5d107dd4b45c0d0bff9a8710fca018e1ed0e519b087570c5b3679c00556b2a21feddcba8b3a182d2209b42fc8b3ff5785e0dff863b53942a
 EBUILD kbreakout-20.12.3.ebuild 909 BLAKE2B d71f687b32bbf7219d27aac7f44c1bf3a3605046fee01f2f3a860bceb08bbf4a1133573b3501f6d1f2c683cea22b1fa8ad4bb58f78f6c4c4ff2c5b77c8787f5a SHA512 68f793767106b9dcc467e78e013eabc3102ffa283f19896468325ec965a4cc6ecda79fcc0b32756567deae22a590cac98c3a74dfbb12ad46d759351248c764ce
-EBUILD kbreakout-21.04.2.ebuild 912 BLAKE2B 0d18c3a31a3c86300ee31502f13ce879d7bea19cd2acf4fff8949f42014a1310f9a7d82db284560a894fb3667d778f9b94c2ed00f9b849556f817f872e95e9e7 SHA512 fdb1084c7ba43e7da55e8badd17dab4c3547f5ca7fa0dcd5e9ab5b43b991d1402cfb4537fe7f30527a006499aed974ebb07021b504970fbe58204281fffaf961
 EBUILD kbreakout-21.04.3.ebuild 912 BLAKE2B 0d18c3a31a3c86300ee31502f13ce879d7bea19cd2acf4fff8949f42014a1310f9a7d82db284560a894fb3667d778f9b94c2ed00f9b849556f817f872e95e9e7 SHA512 fdb1084c7ba43e7da55e8badd17dab4c3547f5ca7fa0dcd5e9ab5b43b991d1402cfb4537fe7f30527a006499aed974ebb07021b504970fbe58204281fffaf961
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-21.04.2.ebuild b/kde-apps/kbreakout/kbreakout-21.04.2.ebuild
deleted file mode 100644
index d73a58e74f93..000000000000
--- a/kde-apps/kbreakout/kbreakout-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Breakout-like game by KDE"
-HOMEPAGE="https://apps.kde.org/kbreakout/
-https://games.kde.org/games/kbreakout/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index fb6ba7c732e5..7a87cd4d318f 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,7 +1,5 @@
 DIST kbruch-20.12.3.tar.xz 5614940 BLAKE2B aedcf2426709cc26a992686ec5d561ab7808230d4c58323117d31901873026f101268b2df136390406e43551c61a6117714a8932ab10264b6e5d1d22a4d65d21 SHA512 c0c72e9eef3da49328b201e36160d0ff6e92e011c8be5ff3d82db67a2c598e53a1ed4d95949ae0734bedaa3bf3b49af5722eb184fcb2578a813af5f159797dae
-DIST kbruch-21.04.2.tar.xz 5627676 BLAKE2B 47b48c1a2191cf6a626a75dad3b88e9ee58b49cd2056e6d57a76a543791a221b31022b26df278d7b115ed38dff939884ee546ba5cd08c5f0354ee71dcfb57300 SHA512 5cb6d852b7bcec4df1a12b10d8f744030615704e02711d20548888171588e1fb7d2e523993427a4bcb4a98729fdcbadeba810c8c7f140caf6402265e8656ce63
 DIST kbruch-21.04.3.tar.xz 5627384 BLAKE2B 1c87c0efcdadca11e7e56e7b4dd6d5c43fa8fd98ff70e5b8076a32f8d5e4e595d1d966c1303ec91d427f1286e4dbb65b17911db4dcdf96be7caa7548c7d6ca49 SHA512 9e7b9ed8314554f6decf184606d334de87f472532ec7e44d296316884f112382b1f7eb49de275c83dab51048d7211f337b0718cea91fda5df6a1f43aaf0ab09d
 EBUILD kbruch-20.12.3.ebuild 734 BLAKE2B 52c1837552a5ea2b06108340b6101f085c113264a13fddaf01201b13a527d0d4f84d7a45c3a58a91babc33130a9ce673258f2345de169e4f2a9a68be137d9d53 SHA512 81125f13d55da7dc89b49032796700ef0005bb52d63bd985f4612424f94091636dd747962ade1de707d31ffbb274fc00daf2393cfe4626c321cd896d2bea8384
-EBUILD kbruch-21.04.2.ebuild 737 BLAKE2B 82e827df5f0dec235ee82deaaec31837f4bb046d9a963f7dc89a289b4f0b57f7d7fc1da5bbc1e3cf1098d9281fcebd3d0b6d3b59a86e55e870a5cae0340c2505 SHA512 91cac9eb13c23c6a70485824e110ab1b379efae719c2cd31c4a511404347108cbd4c82a98eddd08e8746c9c8b3676ce5c77b109a2ae3d3ae98f96268721a7d67
 EBUILD kbruch-21.04.3.ebuild 737 BLAKE2B 82e827df5f0dec235ee82deaaec31837f4bb046d9a963f7dc89a289b4f0b57f7d7fc1da5bbc1e3cf1098d9281fcebd3d0b6d3b59a86e55e870a5cae0340c2505 SHA512 91cac9eb13c23c6a70485824e110ab1b379efae719c2cd31c4a511404347108cbd4c82a98eddd08e8746c9c8b3676ce5c77b109a2ae3d3ae98f96268721a7d67
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-21.04.2.ebuild b/kde-apps/kbruch/kbruch-21.04.2.ebuild
deleted file mode 100644
index 6520c2c23897..000000000000
--- a/kde-apps/kbruch/kbruch-21.04.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Educational application to learn calculating with fractions"
-HOMEPAGE="https://apps.kde.org/kbruch/ https://edu.kde.org/kbruch/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 4902144cf6cf..6862a704114f 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,7 +1,5 @@
 DIST kcachegrind-20.12.3.tar.xz 818260 BLAKE2B d3dfd5255cfcd8cf9297992d372121683441e0254308de61cdee89b70266c32393da75d065331675f14242d6df450f58174c55d0e6f310487f49eb23d9c33227 SHA512 6c2f3a70becf81736e481595676550ffa12426399e856bf6a33f033fb009b86ae55cac8f60b0fe8f499400e5d19d6fc316a191f47d11c40962c8206da7ffdd9d
-DIST kcachegrind-21.04.2.tar.xz 853984 BLAKE2B 17d81fd6a3011a96c7badcc80ac0228ae6f9f2f159b926a410a0668308fd9e650da48e0c146a5a2425ea191432d3760c1dcb3f44d94d18d72e5a790208015cc1 SHA512 e7bcbfbb1c714932095f3fea19504b9576ae06828e6fcc22a56c3277d7e9152c91901346ed885403d3b45c644af71f4c3317befb7bfd8037ecfe00f5495913bd
 DIST kcachegrind-21.04.3.tar.xz 854044 BLAKE2B 5453bf99c11740f6cfe90f4c0051613aebf1fff832b492800ef9c2e21fefd86c8a8becd2e91d2e82a3a56e1e88450b5f9498dd85c73ceed53d49de00efc9ad95 SHA512 b2823ef28686e4e3f25a0b45d163be55899297ec3115a6c984e361c859eb94d537102add9f630abe5182eec097747355cdf259b7eb1ab9de644414cf7dad92c1
 EBUILD kcachegrind-20.12.3.ebuild 975 BLAKE2B ae63ae164bc0d3d7ff3d42c85e89ba45e87e708a98c34b3b21614ef993c3003427daa2f0e6ed6fd77c4ace4e7c9943c07ad6ff480937ca7734cfff7e1caa401c SHA512 08ea99fe5d6efb98f6d533040f79116ad92304564f5f4d151a2f39e523b8db1a56afde64fa90ef17c8debb44668247f6f876a3e86f26f11433dc9c226d590a48
-EBUILD kcachegrind-21.04.2.ebuild 978 BLAKE2B c411e783b4f6f8113b478d604390f30a614a20de7ff310872e6fc3c04c6524b04e875e8a1313f80df631afac535384486f5ccf6c64f964b112f5093599e747f2 SHA512 97751d0cd2b136219e79bdb2975188b405dd9061542bdd7a56535f3063a4126792854b5ce0e830dd773b8c91b98f19373ffce01790ace6c0c03920c7f98ce42e
 EBUILD kcachegrind-21.04.3.ebuild 978 BLAKE2B c411e783b4f6f8113b478d604390f30a614a20de7ff310872e6fc3c04c6524b04e875e8a1313f80df631afac535384486f5ccf6c64f964b112f5093599e747f2 SHA512 97751d0cd2b136219e79bdb2975188b405dd9061542bdd7a56535f3063a4126792854b5ce0e830dd773b8c91b98f19373ffce01790ace6c0c03920c7f98ce42e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-21.04.2.ebuild b/kde-apps/kcachegrind/kcachegrind-21.04.2.ebuild
deleted file mode 100644
index f07bcd2cfe7e..000000000000
--- a/kde-apps/kcachegrind/kcachegrind-21.04.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Frontend for Cachegrind by KDE"
-HOMEPAGE="https://apps.kde.org/kcachegrind/
-https://kcachegrind.github.io/html/Home.html"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	media-gfx/graphviz
-"
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 2370cd8f10b5..cfb7a9e4fea0 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,7 +1,5 @@
 DIST kcalc-20.12.3.tar.xz 380676 BLAKE2B 00a091b778d510112e9ad0ce72f103b039f5bd28cfceb68481f20fc5f9d810a8d0ddf0503db532893ae0eba32387b0e844fedb3b48b4ba5ac399f76b9d044512 SHA512 033b57ed3432f09974185a8b237a6e675a5603328be5fe9391a00039a22784e7f5757cf64a65f0cec0eaa878004670447036e54fed25e120558f4bfdeccdb4df
-DIST kcalc-21.04.2.tar.xz 372028 BLAKE2B 21143674005bb54138526568301756ffa744416705da612dac1687417863f1ce8a66a9c24eb836b5fd6f7c1d099fc0bd147e3e195b59f86e54a1cb89f59032e4 SHA512 c07d09d155d90d1081f09518955f10a0db80539072895b2f1f92ad60126b21f8ac2d4bb197329bb9c4b030a56a60ab91df9b7405daa3e17d2c8ef9abbf4a9f0b
 DIST kcalc-21.04.3.tar.xz 372240 BLAKE2B c7fc9a7bc0092dfbd2177bac52599ec01bbed56a6e428528ccfee0c5ecd6a6bd83e1d18496c96fd79a6e10d5a449186353fcea71aa900c6d97be475588da8d46 SHA512 5a5cf142d2a54a4a587a19fae65b93e08e356d352c0dee477e9258a730b659baeca956b47d59001822f0ef3bb3ff3e127135f61ee0a1b9edabb07fc2457f5f3f
 EBUILD kcalc-20.12.3.ebuild 969 BLAKE2B fca36678a6dcffce65540ea39cbde6368c9f54e472f463a8259d964054c61bc2c929cb3d25ad14bca611b512ee4ba8619115b0d32d739717c3bb32d44a4f9749 SHA512 c08ac62a48a6562b78f715ee0e48e67c9e85b7ea8543118b8227ec1994b3743ae843a0d7cfb327b0d22d2355b69f55bc131e891cfddb4b9267b8fa7599fa0941
-EBUILD kcalc-21.04.2.ebuild 972 BLAKE2B d11c46426700197dfeb7b244384205515d9186dc2049bee5e37ec6e2827ba6a4863b1cd9e428391b8b6b97a6af6d27fc8fcf92e51d884ac0b98907e0fbe82a28 SHA512 fa872d0eed1447b3a3aa1ff308cf1700f110b1a47beb9f177c056cf84847e7b5674b30e19a18422ea62eed3de7088185bf4482ca5c8471fb62f6c5d3b6eac241
 EBUILD kcalc-21.04.3.ebuild 972 BLAKE2B d11c46426700197dfeb7b244384205515d9186dc2049bee5e37ec6e2827ba6a4863b1cd9e428391b8b6b97a6af6d27fc8fcf92e51d884ac0b98907e0fbe82a28 SHA512 fa872d0eed1447b3a3aa1ff308cf1700f110b1a47beb9f177c056cf84847e7b5674b30e19a18422ea62eed3de7088185bf4482ca5c8471fb62f6c5d3b6eac241
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-21.04.2.ebuild b/kde-apps/kcalc/kcalc-21.04.2.ebuild
deleted file mode 100644
index 4aa7ddaa8a06..000000000000
--- a/kde-apps/kcalc/kcalc-21.04.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE calculator"
-HOMEPAGE="https://apps.kde.org/kcalc/ https://utils.kde.org/projects/kcalc/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 452f4e5d3cd9..a160acc1956c 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,7 +1,5 @@
 DIST kcalutils-20.12.3.tar.xz 324512 BLAKE2B 0e475570d34302c6008c597be9fe57cc09c2aad52983dcd0648926492a4b57c93db69b8c34ea08efda808efbac238e0db01502f57bf3cf8f0b4b3292a260f4d8 SHA512 a25d85dcc2e7ece08e9b1e4299954977150ea0e4422f1e9062a86a4829f59a356417bc6cea3f242310e7645f88bd66f8335a8b07b839ef58df1c00abf26558df
-DIST kcalutils-21.04.2.tar.xz 334164 BLAKE2B 4b199578f71e0c953b940ea8a74e9d7e34fad8ab39c88dfa8c6e165b6b958333dfcc2707eaca31e59381d3128a818d33d3185810528480f4486b55c40fffab2e SHA512 0afcb93f02dc8af825ee0ca8b341f7c3932c43ddc20927061d71adbde627752db1f6b996f6db9869c8ba30d11755c81e97195e5d00051d12c30203e6b65b8180
 DIST kcalutils-21.04.3.tar.xz 334160 BLAKE2B 76d4c74d0374a1d4d82385a433d246d935bd25b83e142984383f402290bfc026782ead1d2e353e85e0fe55c7967cda7a80397240ce5960d138d806764b41f0af SHA512 0f0cd2112fd014cf824b0c419d952c7e6b41910307d0f6abf9c121029e6754b903b773f92a5d3405344ad58d9fc1fa7fcddcbf4b58aa02e07797b2ee1726aecd
 EBUILD kcalutils-20.12.3.ebuild 974 BLAKE2B f39b69e05d6b2c399d9f0a0a1c85280d3e23784b6a3ef909d5568fa428f2eec49d9d5da70e04144e7caa803b3b9c4ff4830c92eb5d54621e11d6e84eb2fd86e7 SHA512 6da0290904f155230a72bc2dc1dfd4c566428c3e25dc153e58a73e7833462492f91a7fd6e3a80fc1a8abe423c86bad2f3fd69aef7bbe2965c734e9b291aa892e
-EBUILD kcalutils-21.04.2.ebuild 977 BLAKE2B 17f849ce2c0ad9cdf9f26ac01c42a360c4427a1bf7865ccbadf70927fe4dab348cf653f0f7ec2a7351bab84dc197c7be5d74fa71e4db57caa324d774572625bd SHA512 a45fc32369d8ee966912bc6a9ca597fe237abd62b5aba8c0a7113be6b487ad9c4da469b364d4631e7d53c9c553650502ac4b468afb4e788b840a309ea74e6b53
 EBUILD kcalutils-21.04.3.ebuild 977 BLAKE2B 17f849ce2c0ad9cdf9f26ac01c42a360c4427a1bf7865ccbadf70927fe4dab348cf653f0f7ec2a7351bab84dc197c7be5d74fa71e4db57caa324d774572625bd SHA512 a45fc32369d8ee966912bc6a9ca597fe237abd62b5aba8c0a7113be6b487ad9c4da469b364d4631e7d53c9c553650502ac4b468afb4e788b840a309ea74e6b53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-21.04.2.ebuild b/kde-apps/kcalutils/kcalutils-21.04.2.ebuild
deleted file mode 100644
index 5a4d4b3ad75b..000000000000
--- a/kde-apps/kcalutils/kcalutils-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bugs 653616, 711666
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 01809660c75d..5e0b263d08c4 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,7 +1,5 @@
 DIST kcharselect-20.12.3.tar.xz 366696 BLAKE2B 8154d34a4ca06cfc264542e95bd3b5f379fc9cfbc07acc3a4f9a05002ccd7923285ffe51fd5d1d1089cc75e212ea316ecbb4779a140d2d3e2622f706a16df04e SHA512 327eb664516645df72b671fc6a77c70435e5515506a661a40945a760f9b46f027303f97069e04f1695bd4a79009949fdfda70b213edc2415444a7ca0d05912f2
-DIST kcharselect-21.04.2.tar.xz 368480 BLAKE2B 6f9d0ee6e3230a9dd0e4097b386802ef2200b1731b6f028039a6e4ca74e71b3b6540e5c9ee31daf1bd461ac7f6fd50526ea1728fa020b09835b83013758d55f4 SHA512 fc8bd4c72c1ca1b4442e7f2e00fd2a0471b85703da33d60ab4e13b6d09ec9bda6dd332f0085b37bc405aad814020a2ea193649bfcf9dc0aa81e38fbbcc518bfb
 DIST kcharselect-21.04.3.tar.xz 368456 BLAKE2B 4a3126a3e5a1383fc2c247fb6b308cbb1e1182d28f01951b60c2e6a03de3ef53fde8c4da4d057b77bb356bbd8af567bfe7706c8ad9e3869fd0618c74cfd2876d SHA512 fbd94b178133cf66fd57894147cd13a3cb48d1894c65330f94c661d52c51444b19f4e24d7649f484763ba5428105eacc7f83d48b56fe18d04ad26fcc0448e219
 EBUILD kcharselect-20.12.3.ebuild 774 BLAKE2B 773c4db71b593a78e27891d8e3449b29d1a6bca7bbedaf3cab54cffe4877a2e84d33bae1be94f71ff0fd4acc33637af71b0d66df307d9e57e01b0c0941199191 SHA512 07608f78d356dbfd1e191266772058fbc5f81a7b533ca5b7e7911a2cde953817da264bdde93a7e97fd5a79976b35e5f1f244b3f5c6f49e8580333c004a15f990
-EBUILD kcharselect-21.04.2.ebuild 777 BLAKE2B 66d0e0add6d0a72e8f9c6928865a5822d8c7ad6b2b56d546b66649601c46da33ac4836262a27d215ca37013b3636f57895059ce3d7418d2f011e1ede5dc2a558 SHA512 1abe5f41eacb1b08b2fda47b13f7a7bfc98a5e2ec49d4b3006d56705141045f062c574b261a22cb39dcffe7ac526b197ebaf9126d6f2bb86deea2c5d9875272c
 EBUILD kcharselect-21.04.3.ebuild 777 BLAKE2B 66d0e0add6d0a72e8f9c6928865a5822d8c7ad6b2b56d546b66649601c46da33ac4836262a27d215ca37013b3636f57895059ce3d7418d2f011e1ede5dc2a558 SHA512 1abe5f41eacb1b08b2fda47b13f7a7bfc98a5e2ec49d4b3006d56705141045f062c574b261a22cb39dcffe7ac526b197ebaf9126d6f2bb86deea2c5d9875272c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-21.04.2.ebuild b/kde-apps/kcharselect/kcharselect-21.04.2.ebuild
deleted file mode 100644
index 4afda42522b9..000000000000
--- a/kde-apps/kcharselect/kcharselect-21.04.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE character selection utility"
-HOMEPAGE="https://apps.kde.org/kcharselect/
-https://utils.kde.org/projects/kcharselect/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index 56557e74b943..cd1caa59f75e 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,7 +1,5 @@
 DIST kcolorchooser-20.12.3.tar.xz 27660 BLAKE2B 96789e1b1ed6cf3efbf03e53cfbe34c25bef070277ce9e4ea7e63952c7280d961d4f5a74009e103f6b570f964e5f3fe1270ec619c857fc87ed15dd4e9c412abb SHA512 0447b447ef7eab1bfa4a13d1e2767e636602180703c994cbfefe490fb7b18478e4d80ab86e52b88f67ab8bc4a327e3855fadf60f56af0816713703cce4b078fb
-DIST kcolorchooser-21.04.2.tar.xz 28468 BLAKE2B 141e5dd1fcd5bcd4649c38c566c4516290061eb3c484c4c8b4f5ee5db17246cac9d190c4a192b8f7f840d4802131fe1c5c7ddbc274e7b931f561eb6c9ba58265 SHA512 d967bf7409099c6c6be186463bce8f2f02780d63c9b56b1b50d7c7996094e61fa92071d2afd14684db450e9f7f79e3e208837c4d1060d0f19dd44ace5eecd44b
 DIST kcolorchooser-21.04.3.tar.xz 28776 BLAKE2B 26186c4fc2f3af8f68916871e58235a3abde288de200cfd0e8802bfa7ebeffdf9f74e25415272bf88e54aea559527c03c6f2cb9ff1bfa9302ed04ea136322717 SHA512 3d56a4640e3c5dbfd1870b5cdcd16794ae3a4d0553af69f79ff8d3a2c205512cde388cff9db5006152fe579c43aa25a7fc51eccc7aa0794f8ff45c95fd94c208
 EBUILD kcolorchooser-20.12.3.ebuild 516 BLAKE2B 4c2fcfc4d8034cb2cb1d26ccb7bbdd2a1bc28f31c1eb081730b8ffb5211c29f7a3daa7174d09b9bea50b7a392f46c2dde56f6f7ad4ada04a62fd15d464c8204a SHA512 a5199a9feaea78e5186bc9ab772f64e031fe584d399bde33e4f825337776e8bdd8c4ce9d54c69d867775ba28a2c1eb0b87b5e0b65399300981856b2d501d4616
-EBUILD kcolorchooser-21.04.2.ebuild 519 BLAKE2B f3977190a22b615c6dcdc5353ec17a9def08f93faabf793c6d94e5a3a2f764bcd1692c9134012614ab39ce997ca6d6a0b3bc5d2c1ac74e531bce78b89113c9aa SHA512 d9710bf66b3f97c72928e5358b7dfb7ae7abb827ca88ac27948e75ec7be1e765ef72fda8068a1db347fb98ade9293d32b474dce201307479402a69ade31a13b8
 EBUILD kcolorchooser-21.04.3.ebuild 519 BLAKE2B f3977190a22b615c6dcdc5353ec17a9def08f93faabf793c6d94e5a3a2f764bcd1692c9134012614ab39ce997ca6d6a0b3bc5d2c1ac74e531bce78b89113c9aa SHA512 d9710bf66b3f97c72928e5358b7dfb7ae7abb827ca88ac27948e75ec7be1e765ef72fda8068a1db347fb98ade9293d32b474dce201307479402a69ade31a13b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-21.04.2.ebuild b/kde-apps/kcolorchooser/kcolorchooser-21.04.2.ebuild
deleted file mode 100644
index a73fd4722fea..000000000000
--- a/kde-apps/kcolorchooser/kcolorchooser-21.04.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE color selector/editor"
-HOMEPAGE="https://apps.kde.org/kcolorchooser/"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index c2cae05b1341..336c3a816ffe 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,7 +1,5 @@
 DIST kcron-20.12.3.tar.xz 899000 BLAKE2B a1bd50d43a885974c76755ea357487dd16d964ff888867ab7325780ad930d9d99f4dd2f609ca14fe7356e71e6d9489cf86349044d312cedaf59f45e22f29c2f0 SHA512 e1571c113d8bf869e0fac0a3811625e35896bd3e64aa711541ecd59d145d2e051ccf563e00f0412f5813c1024b292c7a571111d89f0cb3fbc8fcbe4ef95b9b8c
-DIST kcron-21.04.2.tar.xz 911756 BLAKE2B e59ceeff1494026c5d632d46d92031bbbfd31804435ce908237008762001d5afb441f8a87bcbf7d91bdbae22f29a1785032a3d231437392e0a436cec30fcaff0 SHA512 b191c97c9ee27898660e6d42c7e3513cf5cd4170881e7fd1260f3d16dcfc916520cd689da0fd1fc5ecd8a7547de66b2440014dce0b85bd873d18ad031aa0a35d
 DIST kcron-21.04.3.tar.xz 911684 BLAKE2B ceea13bd5766e361f43bf95a39d692bb91378dca222f532a85cb8c558fdf5d128fbd132961adc3182eb01935e34b771714619fe830022cb6f0531c82d73a2743 SHA512 1c5645bdda1ef79dcaeb06ee66c5faa8f02fcd7e94e006b88ad2fd435b28ed974a402a6b5ae3b94a729f738de1a2bc4766c48d2295d4d0e442d211c3849be7df
 EBUILD kcron-20.12.3.ebuild 722 BLAKE2B af5dc98c0a3c6e074be6cbb4e0dde730d0a8cff8888e617076368a421b1f1017ae8bb0a415fafd0880d957017d200b2a2ae62fa0112937316142cc2ad21e7a6f SHA512 1ecf63b31209defef7005ac3f66c1a423ad6ed54aa97ad65be9fd1787ea9630d1597730dc82cc84f2436c2a59bb5600a61558bba6efa35d1d0cfdfe6e161564c
-EBUILD kcron-21.04.2.ebuild 725 BLAKE2B e1be14c9bb646cfd4f865bd625313085b30d07133f060ebed409e98157d516ce87ccdc9f276d0339fe8c7b73a803955a45b65543b5194425d9b99470b50cb919 SHA512 e2563c58e36aed626ce47bf7119b71b60f05f59ec6744904cfbddef083c1b7aa66b049ca3ff9d8ccbf854c56fccfdb028af4ff999b8a34d2f642e071145540e9
 EBUILD kcron-21.04.3.ebuild 725 BLAKE2B e1be14c9bb646cfd4f865bd625313085b30d07133f060ebed409e98157d516ce87ccdc9f276d0339fe8c7b73a803955a45b65543b5194425d9b99470b50cb919 SHA512 e2563c58e36aed626ce47bf7119b71b60f05f59ec6744904cfbddef083c1b7aa66b049ca3ff9d8ccbf854c56fccfdb028af4ff999b8a34d2f642e071145540e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-21.04.2.ebuild b/kde-apps/kcron/kcron-21.04.2.ebuild
deleted file mode 100644
index 6386c23acf14..000000000000
--- a/kde-apps/kcron/kcron-21.04.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Task Scheduler"
-HOMEPAGE="https://apps.kde.org/kcron/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	virtual/cron
-"
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index e0739988e9d2..391a93fff84b 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kde-apps-meta-20.12.3.ebuild 950 BLAKE2B f72c901956e376de586e5d0229babcb6b1bd229a13a354a0bdb04fb198afdb685d8de5dc129d9fb74fa959e3a0ae86d3ce5401a468dcfca284d5a5ccad6070e5 SHA512 42720bb05eebb2dcedf71aaf50cf479047075298e606039acad28ba918062dee750f2aa953764d6d1a99dc088258580b3f1f2f2ca683ef2673344c81a981062b
-EBUILD kde-apps-meta-21.04.2.ebuild 953 BLAKE2B 8a0cf50f89756dfc8cf4b334fa9309d001c50acbb9b0813af2524cdb1f52a06345e849d674f00996f3da96712b094a56fe70dc73dd8e0e2c4c5a1fd97424e4db SHA512 6b0d91ea6325a1d5bf4370a7d92d82bd5c37716608c64cb4281aab9d14a1f8e38384bd411965b65ea9fb2932b5de0d730b66b65e7e3988b34a4459b2b6be7c41
 EBUILD kde-apps-meta-21.04.3.ebuild 953 BLAKE2B 8a0cf50f89756dfc8cf4b334fa9309d001c50acbb9b0813af2524cdb1f52a06345e849d674f00996f3da96712b094a56fe70dc73dd8e0e2c4c5a1fd97424e4db SHA512 6b0d91ea6325a1d5bf4370a7d92d82bd5c37716608c64cb4281aab9d14a1f8e38384bd411965b65ea9fb2932b5de0d730b66b65e7e3988b34a4459b2b6be7c41
 MISC metadata.xml 1049 BLAKE2B 778017619970b4273fe80289685d475957f475d667835e05c90b7e39066e1bc33e2bb30d44d24d22adb0f15ff23fcb30fe9be96870192c66ff2c110826d3c697 SHA512 9841707a510b2b7a948fe4e06ecb79aec4650d9f40a4a4acbbcaf1e5500d5ec7767496bd7d1daf194a66a919284dc1c04c8fed73e81d1cacac4b1aee3839c77c
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-21.04.2.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-21.04.2.ebuild
deleted file mode 100644
index 324d66357462..000000000000
--- a/kde-apps/kde-apps-meta/kde-apps-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Meta package for the KDE Release Service collection"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="accessibility +admin +education +games +graphics +multimedia +network pim sdk +utils"
-
-RDEPEND="
-	>=kde-apps/kdecore-meta-${PV}:${SLOT}
-	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
-	admin? ( >=kde-apps/kdeadmin-meta-${PV}:${SLOT} )
-	education? ( >=kde-apps/kdeedu-meta-${PV}:${SLOT} )
-	games? ( >=kde-apps/kdegames-meta-${PV}:${SLOT} )
-	graphics? ( >=kde-apps/kdegraphics-meta-${PV}:${SLOT} )
-	multimedia? ( >=kde-apps/kdemultimedia-meta-${PV}:${SLOT} )
-	network? ( >=kde-apps/kdenetwork-meta-${PV}:${SLOT} )
-	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
-	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
-	utils? ( >=kde-apps/kdeutils-meta-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index a2d17bbfbedf..419791d30530 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,7 +1,5 @@
 DIST kde-dev-scripts-20.12.3.tar.xz 366516 BLAKE2B e828220505de0287bfaa16f690a75a2f12fa2d6f7615aa61da123c9a2dd6473340cb17cb491541d37e1ee41688c10af2b0609a9d65f1a8f38b9cd0fb5d44edfa SHA512 5f6df12e9a43fe0721a9e21f152a25406ed03d7dcac45f06990667b54e13227744dacad2e7092b3c12655159e4c36aad1ebc908978117d8ac22db6f52486b59c
-DIST kde-dev-scripts-21.04.2.tar.xz 366320 BLAKE2B 4242159a3b1f165dfe7e11622e2e58d8d7b519069863175fcf46f19b863b368fa651f803be4a0f107ebb43b022b1fc468c4e529ec5e6d32ac720bf1a6f4e12d4 SHA512 7643aa5c0413d840a932fbd507d6d64fc2fb6da06ca1285d51fcce6869cf0c18f38a108589dd4c21e84ee42384ee9d1a5336626f461ce152328361247da4b53e
 DIST kde-dev-scripts-21.04.3.tar.xz 366364 BLAKE2B 27726f6fbc727d2f42fa5ad7f3c6bc7eebcdc0db825c7a0723b00082eb3d6a153f1d894393268a90392d8edc6afd80e86cd8e802480a5828b95ca53528a4a704 SHA512 dd35c0b79b7ab6f4dff36b91281a3e4dcd4b5d27d1de5b33d3c4db995dbc909a6d70897f2460659efab74097b95e3ebb1c2c0f08ece07a6fdc5bdba87fdef93f
 EBUILD kde-dev-scripts-20.12.3.ebuild 633 BLAKE2B 0bae83d8f8f1c9b9d8e02a6f38acca0e16e76d55334bed2d0e9e5369ec88fdb794955401c7956eaadd4fe45bb62c4c57020b66a04513533e35b13025e3d7e3d6 SHA512 5d47d0195d41d49e048375fe748399552a74d509521aaaa94c14793c7affbe7ba878c4083b79aeba2a4bdc734fd09f45a8576af0fa8990ae4c02c4d758285670
-EBUILD kde-dev-scripts-21.04.2.ebuild 636 BLAKE2B 968cc7720e01bc48e83ce2e6c582d9a34b2da76b12ab3ae94c536848cd1bb83d8ce9bb1800eb0efbf2858f9fc629875542d26e2bb2eed37829abd3c996c3b0e8 SHA512 ac0a2de5b3cc66d28569a63d70c54f2448e64805f1558708035e866b1ec2794fbd8e8b53c72833b2f7edb2b1094f2323eeff5909d8d0b5185b83e716ae3628aa
 EBUILD kde-dev-scripts-21.04.3.ebuild 636 BLAKE2B 968cc7720e01bc48e83ce2e6c582d9a34b2da76b12ab3ae94c536848cd1bb83d8ce9bb1800eb0efbf2858f9fc629875542d26e2bb2eed37829abd3c996c3b0e8 SHA512 ac0a2de5b3cc66d28569a63d70c54f2448e64805f1558708035e866b1ec2794fbd8e8b53c72833b2f7edb2b1094f2323eeff5909d8d0b5185b83e716ae3628aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-21.04.2.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-21.04.2.ebuild
deleted file mode 100644
index 8b412e9ee4db..000000000000
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-21.04.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="true"
-KFMIN=5.80.0
-inherit ecm kde.org
-
-DESCRIPTION="KDE Development Scripts"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# kdelibs4support - required for kdex.dtd
-# kdoctools - to use ECM instead of kdelibs4
-DEPEND="
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kdoctools-${KFMIN}:5
-"
-RDEPEND="
-	app-arch/advancecomp
-	media-gfx/optipng
-	dev-perl/XML-DOM
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# bug 275069
-	sed -e 's:colorsvn::' -i CMakeLists.txt || die
-}
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index b62051dd8f74..7da8e0d40ca8 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,7 +1,5 @@
 DIST kde-dev-utils-20.12.3.tar.xz 65832 BLAKE2B c83634cbbddd63b732d327ea316ef067840b70451e7f4eb9cc1f3d003fe4a61c8d2fbac0b5ccc0e1be535d7a31876455d98701f4d7c239393f021850abb38245 SHA512 72f5eccb3a67c4ac1a1bf9a8b81879a622dcae23b23df9caafa90f13f16de449a6c4750b0de55d99146a823716cf3c8845d1547360824c51d3b94882ca83cb7c
-DIST kde-dev-utils-21.04.2.tar.xz 68056 BLAKE2B b4dcfb555f201c7484b0de216450705dbf57498e346e4987ff061a09cb4c72c3fbd315115c2f95c7860a9a26ef14c369fe3f492bcdda097e6a3089443d493603 SHA512 dfa5e9278d4a2bf361ace702e9de15641d15b9a1d5dfcc6f006163d4b393892e00d7fbb0e170dcae9954f3357a182d3c8818e6f4073ff8a426cda0caf71968ad
 DIST kde-dev-utils-21.04.3.tar.xz 68048 BLAKE2B f8b2775d21f227b5c2c48e8fdb38a1e78064dfc4237ed2dab72fb9a7c29a073d34db61ac74c82617f5b9ae08ee4b7aa6b763b2183ecb5d95015a4f6989700e76 SHA512 5cc7fdf44779852bed67d7321d6a4918dd1973dd9868fe1c4cf0c275a0ae06c21fa388f027a0b15b0839be1c9d482f78db06c96285366a0530f58901353572c6
 EBUILD kde-dev-utils-20.12.3.ebuild 730 BLAKE2B 8d6c16f6c804811a47f48b1e6c27cee16017de2ed82f8b3139d7222c3b7c4dd461817550d907eaa6aeb4c83f9aa3cd454dedaf362d2c462f4b7fc3acd80000fe SHA512 75e004001767a593c7a936e6204e3f3791b87daeb1190d7106fe102fb15081a36d8221d86d41d751a24c622dee0c19d2c7c2c39aee1f85a5d1fbab22c45e2318
-EBUILD kde-dev-utils-21.04.2.ebuild 733 BLAKE2B 788fecfa92193d57a9937f3251ca8917e51ee377c8dad2a7058c1ee84c1195fd905717dab7bcaf40e6e34841b425843c175d547030348baea63a30be93c21f82 SHA512 877db72915a7cc75c9abbb30005125b635bda8251ad60ce93e964644662666149561114fd66e592dca9fdccbba4fcf7a3d7766eae33626d97d1b1a35e732fdcd
 EBUILD kde-dev-utils-21.04.3.ebuild 733 BLAKE2B 788fecfa92193d57a9937f3251ca8917e51ee377c8dad2a7058c1ee84c1195fd905717dab7bcaf40e6e34841b425843c175d547030348baea63a30be93c21f82 SHA512 877db72915a7cc75c9abbb30005125b635bda8251ad60ce93e964644662666149561114fd66e592dca9fdccbba4fcf7a3d7766eae33626d97d1b1a35e732fdcd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-21.04.2.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-21.04.2.ebuild
deleted file mode 100644
index 7c582a443f0c..000000000000
--- a/kde-apps/kde-dev-utils/kde-dev-utils-21.04.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Development Utilities"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index 8c2506bbe8f7..a8cd99d79232 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kdeaccessibility-meta-20.12.3.ebuild 458 BLAKE2B d406ec105431b43460050a5ded74658ec77b0fa3ecdfb5dcc8555f82ad0c064a457180f66fffee415ae5eecfab1bdf0501134998b33ec57dc2ba8eb03e090e1b SHA512 f87d0076f181a680f054b2cb05ef311eb4b3dc32643a7963bc81d3b6b848dea1678dc0d91446500c7090edbba5f5542115c17631351737ecf5262c707c8ac4e9
-EBUILD kdeaccessibility-meta-21.04.2.ebuild 461 BLAKE2B 73efa1a252279d36b84dab3115f048dd766a29245a695c5d86197b8ef3f5e99ecfa452631d004fc16b80fdcdefa5fc40ec29276f634258917173876169a4297a SHA512 0696d12c5d9674949eab271b65eb310dabf7d135c0541e38fc022ff6da160fea6b4638c38d050c32649902028e52b064b14e6935095bf4e0709ecaecc737d51b
 EBUILD kdeaccessibility-meta-21.04.3.ebuild 461 BLAKE2B 73efa1a252279d36b84dab3115f048dd766a29245a695c5d86197b8ef3f5e99ecfa452631d004fc16b80fdcdefa5fc40ec29276f634258917173876169a4297a SHA512 0696d12c5d9674949eab271b65eb310dabf7d135c0541e38fc022ff6da160fea6b4638c38d050c32649902028e52b064b14e6935095bf4e0709ecaecc737d51b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.04.2.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.04.2.ebuild
deleted file mode 100644
index e4b3bccf62b5..000000000000
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/kontrast-${PV}:${SLOT}
-	>=kde-apps/kmag-${PV}:${SLOT}
-	>=kde-apps/kmousetool-${PV}:${SLOT}
-	>=kde-apps/kmouth-${PV}:${SLOT}
-"
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 1b358b93bc09..da7aa0c649d6 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kdeadmin-meta-20.12.3.ebuild 405 BLAKE2B c82262c889d94bdcad917f43d818a389607beedb3be7f0eea60dd645ad4e0230967e3edacbfd9655284ed19583a04149b82ad13aa99aeb24a51d0c30f68a3893 SHA512 d03f901b4d8a2b41aa6a758cad59d04a59886e960e495700ae4cb223df2404d09e6fa6f3934f80b52a90c5148ad7dac1953709757eb73d59da7f942f7ca44c57
-EBUILD kdeadmin-meta-21.04.2.ebuild 408 BLAKE2B 7e6d63185c5ea38506d9753a007bdd15634a9558eab09b6847e778fc5017662c8e91c84a83046bc87c13d66b493f7877e465a397e99505ad1955a56fc644265a SHA512 841b134f2be517b0dc47681a4ee2cbe31bdaf01d4b9d143327a5477f708b33837382b027721b95a0a687ae62c04d9f588d5c5eacab38f8195be4986b63939dca
 EBUILD kdeadmin-meta-21.04.3.ebuild 408 BLAKE2B 7e6d63185c5ea38506d9753a007bdd15634a9558eab09b6847e778fc5017662c8e91c84a83046bc87c13d66b493f7877e465a397e99505ad1955a56fc644265a SHA512 841b134f2be517b0dc47681a4ee2cbe31bdaf01d4b9d143327a5477f708b33837382b027721b95a0a687ae62c04d9f588d5c5eacab38f8195be4986b63939dca
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-21.04.2.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-21.04.2.ebuild
deleted file mode 100644
index d7737ca1704f..000000000000
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+cron"
-
-RDEPEND="
-	>=kde-apps/ksystemlog-${PV}:${SLOT}
-	cron? ( >=kde-apps/kcron-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index 7f47b9744a55..a67ca68b65f8 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,7 +1,5 @@
 DIST kdebugsettings-20.12.3.tar.xz 68344 BLAKE2B 75fcdd7e9fa8374cf7540e0aa229f641f0eaefcab706840ab8bce6027b430f3d194f723517f24f84389bb1b9480f663d3a6302bf54bd3e2269e21bbb515ffffd SHA512 ce03f09aa75a2691a0752dd2fcfbd4f359584b97e18f6b19cc571985d4b6e552a925c6d3c5e16e32e6894f2e7f09a9923a81bb98347255bb9b9bbab951de3fd5
-DIST kdebugsettings-21.04.2.tar.xz 87892 BLAKE2B 53c30c1a309f651db5639959e868f7fd2b8b356a38e6d50f723fe44c7576fefebb8ad688e600d7211387ca70c2688a119465f572832ef6e35c9cd14578395583 SHA512 04e243c7c86e5230d6017907590801322176f4b1443c8d3e899441f2c4b0287c2ebaaabdcf7386638221b300c57471c3c907180a23009dac9e01973a854980f0
 DIST kdebugsettings-21.04.3.tar.xz 88104 BLAKE2B 86acbab14797946f6561e3b08e8880f51d78201cc4fec6e71c6f47a01da149eced6a73ce9e5f2fc5c5278e74975636f6476fef46fbc5a9194b396362600bf77d SHA512 371f07e896381a21233c4967c9b0f9b7380356edbfceb491017ddc7d985de4c8e685e508762abdaa394adf3796ca734af047411da276bc578f0512b4b633c5d8
 EBUILD kdebugsettings-20.12.3.ebuild 780 BLAKE2B 7ab44898901490eea930775bf27f38eb6d68927a1592ce2df02ad33490f9115a38139d341093ffdc35abdf049c82a67ccc92d3f286887b336884fb52841a60f1 SHA512 f1cc9bbb449a780173dea7266c75fabb3e9b175805526491634046a2ec69e2d2f4f8a64812ed3d451e0e0418fec75fafb69b34900463b57365954146aed0631c
-EBUILD kdebugsettings-21.04.2.ebuild 783 BLAKE2B bbb3ebf634d205b72da62b4224c6de9f2bb087288df1518fa6bdbe082d8e3820fd6cfb759c1ca0b02a9af2408fdf14d825759221e222cc82d19b3886961d8af7 SHA512 51489a9b80e0f160084c4b434dd25788778f17d518825eff8399ad93e4956f1a5fbe34605bddfe8b831dfd0d15fb4fb24525d598092f246e663236c43b2f05d0
 EBUILD kdebugsettings-21.04.3.ebuild 783 BLAKE2B bbb3ebf634d205b72da62b4224c6de9f2bb087288df1518fa6bdbe082d8e3820fd6cfb759c1ca0b02a9af2408fdf14d825759221e222cc82d19b3886961d8af7 SHA512 51489a9b80e0f160084c4b434dd25788778f17d518825eff8399ad93e4956f1a5fbe34605bddfe8b831dfd0d15fb4fb24525d598092f246e663236c43b2f05d0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-21.04.2.ebuild b/kde-apps/kdebugsettings/kdebugsettings-21.04.2.ebuild
deleted file mode 100644
index 36422bfc1777..000000000000
--- a/kde-apps/kdebugsettings/kdebugsettings-21.04.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Application to enable/disable qCDebug"
-HOMEPAGE="https://apps.kde.org/kdebugsettings/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index ee6155e438db..2617d37e6f0d 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kdecore-meta-20.12.3.ebuild 885 BLAKE2B f5573ad359941896a2bd7fbbfffdae42c0db84d8b737268d9e67454f90b1c3d8acc0dcbe2fa095142fc8827ca7f50f8fea5d91dae0077a61d9f76db14684e35b SHA512 ef662757048eaf848da0e67a2229256bb0aa25d20fb060d7edd7e9a0ae61114d697718778d4838d242489f8ca5556fb27382bbacfd7321cd64db674ff7d9c8d5
-EBUILD kdecore-meta-21.04.2.ebuild 888 BLAKE2B cf4ef2a172d734886eb292b865505da063d0eb90046ef44ce745c2e00f57b02dc6370c4b4537c57141ddc7db4a2c35a5ba22352f1de7a020f42cb379bbdc636c SHA512 8baecab0300fff55904271055df814cc1c56970f21a5a1a7bfca83fb7f03fd871069b08d078f80fabf2fa19f1b210b6e9b448b4f00181d0be8db48befbf11e01
 EBUILD kdecore-meta-21.04.3.ebuild 888 BLAKE2B cf4ef2a172d734886eb292b865505da063d0eb90046ef44ce745c2e00f57b02dc6370c4b4537c57141ddc7db4a2c35a5ba22352f1de7a020f42cb379bbdc636c SHA512 8baecab0300fff55904271055df814cc1c56970f21a5a1a7bfca83fb7f03fd871069b08d078f80fabf2fa19f1b210b6e9b448b4f00181d0be8db48befbf11e01
 MISC metadata.xml 682 BLAKE2B f02620682a0f1f2b1e8a7621ce9fca0f0bec646787a8e2b00b0d7b4b0b2236d07429fb31bab4935f0ad7f969857ccfae49f8c4ca8849c9b733583ce0e41533c1 SHA512 414e4d9cd87a259c5ce473d33e9f55c6aa54428f2024925f6bf49e68df2d458d45e42f865cc8a5ba97eca04ab85c035c253ab98503c5c3855e199b7b97043098
diff --git a/kde-apps/kdecore-meta/kdecore-meta-21.04.2.ebuild b/kde-apps/kdecore-meta/kdecore-meta-21.04.2.ebuild
deleted file mode 100644
index 747f60dace4a..000000000000
--- a/kde-apps/kdecore-meta/kdecore-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdecore - merge this to pull in the most basic applications"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+handbook +share +thumbnail +webengine"
-
-RDEPEND="
-	>=kde-apps/dolphin-${PV}:${SLOT}
-	>=kde-apps/kdialog-${PV}:${SLOT}
-	>=kde-apps/keditbookmarks-${PV}:${SLOT}
-	>=kde-apps/kfind-${PV}:${SLOT}
-	>=kde-apps/konsole-${PV}:${SLOT}
-	>=kde-apps/kwrite-${PV}:${SLOT}
-	handbook? ( >=kde-apps/khelpcenter-${PV}:${SLOT} )
-	webengine? ( || (
-		www-client/falkon
-		>=kde-apps/konqueror-${PV}:${SLOT}
-	) )
-"
-# Optional runtime deps: kde-apps/dolphin
-RDEPEND="${RDEPEND}
-	share? ( kde-frameworks/purpose:${SLOT} )
-	thumbnail? (
-		>=kde-apps/ffmpegthumbs-${PV}:${SLOT}
-		>=kde-apps/thumbnailers-${PV}:${SLOT}
-	)
-"
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 031c0851343c..726dc0a65124 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,7 +1,5 @@
 DIST kdeedu-data-20.12.3.tar.xz 335416 BLAKE2B 2ffc9a521836b2a24bba19bbfd8ce6a70dec164c90d4d57d893ff4ce9111de13e24272df555db0dee84898159a38be5f819acf5bb9c7100c3c3e622b3aec0812 SHA512 f01ff9489e7548ef13ff0d4120e6d2cf77c5e41c26f0a74fa7979dde96cb89e1b08957017e54ae3df60bc440eae2abd653dd16d87d340f58ec17a9d84141286f
-DIST kdeedu-data-21.04.2.tar.xz 335672 BLAKE2B 217fb3fe79f7097095fda6dcf7877834e56100b7ff5f31a40f40f8123e30d1d8b6093559fb952bce6515836b364f47399a41fd5c19ec7e1a55ce086df436351d SHA512 d466274dc5cca87befde1329136b0742bd41043869abe19648875e986772ca30f3271a6cf3aafcfda1d46c94886c1f5a7b3515cd0551af01d23eea2e284bc124
 DIST kdeedu-data-21.04.3.tar.xz 335780 BLAKE2B b6ed4e4c221df442154121a87f3208f46050bc9d3013916f4cb6a2b17cb176a6ab607e5558c0375e55877ad653087772d7c9ba6f92dd44901223c75e085a54ec SHA512 987c5d65be467837e458d5d74540ff6ec2d6a47f59043d7a41517642deda5c4645b76ae9cbf8d5f299841b13e4034aedf9ef9afe30b2453e782a6056656885fc
 EBUILD kdeedu-data-20.12.3.ebuild 345 BLAKE2B 316a4a729327f22630b07b69ea3fdcbfd79d379ac7b839572c3c2b9c51b578c61c2fc42dab521cae492a3fbdb7f3968c75a745174a7c54505ca10209093f6165 SHA512 abb4b66376f439d879d02a6b9b19b84a800b8c9e4c866730d7c325d8ba4f124b4068ad7e1df0ae432a24686b9e6defad3d16e004e65a60ec04cd0c17b92ea3af
-EBUILD kdeedu-data-21.04.2.ebuild 348 BLAKE2B 98e4d9d43e40d8ca48072c822e65156a8dd110c1dac602c5024685535bcfc427b9147e801e36a8d4965d5455dd240ab7f61d85a3271f9e939509f253075b49f9 SHA512 8eab227be35d22b6c0ed0b9e5702adcafbec44ba5235cae39bd41449c49e15007b3e33b4008d2dcefca6faeb5dd029853c6534679ae4e906fc1125ff83fa4e70
 EBUILD kdeedu-data-21.04.3.ebuild 348 BLAKE2B 98e4d9d43e40d8ca48072c822e65156a8dd110c1dac602c5024685535bcfc427b9147e801e36a8d4965d5455dd240ab7f61d85a3271f9e939509f253075b49f9 SHA512 8eab227be35d22b6c0ed0b9e5702adcafbec44ba5235cae39bd41449c49e15007b3e33b4008d2dcefca6faeb5dd029853c6534679ae4e906fc1125ff83fa4e70
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-21.04.2.ebuild b/kde-apps/kdeedu-data/kdeedu-data-21.04.2.ebuild
deleted file mode 100644
index f4a76399035f..000000000000
--- a/kde-apps/kdeedu-data/kdeedu-data-21.04.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde.org cmake
-
-DESCRIPTION="Shared icons, artwork and data files for educational applications"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/qtcore:5
-	kde-frameworks/extra-cmake-modules:5
-"
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index 5c3006f0b6d7..8a6cb65fbb27 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kdeedu-meta-20.12.3.ebuild 1206 BLAKE2B e2f473e86877baf0ca717580f22a8a5e8049e3642fcdf761c7082388934e4858c531745ec7f81874c3238fbc968db5cddcafaeaafd5c5bc3c624a71a62cd6232 SHA512 510a5f40b16442a91cd7fb7f0bcfb62ec8e90b070e9f6dc4339fe86351feeadd205de4727c740b67dd69004d145f4192844917af682400596c569e68082bfe45
-EBUILD kdeedu-meta-21.04.2.ebuild 1209 BLAKE2B 8a3708473ac97cbb04bcac1152dbaccfe3cd44ced40ebcb7869ad99095e450e0c7ca92a8909b8253f5fda09d0a854d8e0bff021337e8cd63de78dfc741192e19 SHA512 b7b7abd5c312ad8600d716546574c8eec76df00dfceb945bc5f517e1e6225f6350b59a9802f5ec0ebbcfd7b461869b604608013d9c72c782ef4eb3c45095755a
 EBUILD kdeedu-meta-21.04.3.ebuild 1209 BLAKE2B 8a3708473ac97cbb04bcac1152dbaccfe3cd44ced40ebcb7869ad99095e450e0c7ca92a8909b8253f5fda09d0a854d8e0bff021337e8cd63de78dfc741192e19 SHA512 b7b7abd5c312ad8600d716546574c8eec76df00dfceb945bc5f517e1e6225f6350b59a9802f5ec0ebbcfd7b461869b604608013d9c72c782ef4eb3c45095755a
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-21.04.2.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-21.04.2.ebuild
deleted file mode 100644
index 059d5892394e..000000000000
--- a/kde-apps/kdeedu-meta/kdeedu-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
-HOMEPAGE="https://edu.kde.org"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+webengine"
-
-RDEPEND="
-	>=kde-apps/analitza-${PV}:${SLOT}
-	>=kde-apps/artikulate-${PV}:${SLOT}
-	>=kde-apps/blinken-${PV}:${SLOT}
-	>=kde-apps/cantor-${PV}:${SLOT}
-	>=kde-apps/kalzium-${PV}:${SLOT}
-	>=kde-apps/kanagram-${PV}:${SLOT}
-	>=kde-apps/kbruch-${PV}:${SLOT}
-	>=kde-apps/kdeedu-data-${PV}:${SLOT}
-	>=kde-apps/kgeography-${PV}:${SLOT}
-	>=kde-apps/khangman-${PV}:${SLOT}
-	>=kde-apps/kig-${PV}:${SLOT}
-	>=kde-apps/kiten-${PV}:${SLOT}
-	>=kde-apps/klettres-${PV}:${SLOT}
-	>=kde-apps/kmplot-${PV}:${SLOT}
-	>=kde-apps/kqtquickcharts-${PV}:${SLOT}
-	>=kde-apps/ktouch-${PV}:${SLOT}
-	>=kde-apps/kturtle-${PV}:${SLOT}
-	>=kde-apps/kwordquiz-${PV}:${SLOT}
-	>=kde-apps/libkeduvocdocument-${PV}:${SLOT}
-	>=kde-apps/marble-${PV}:${SLOT}
-	>=kde-apps/minuet-${PV}:${SLOT}
-	>=kde-apps/rocs-${PV}:${SLOT}
-	>=kde-apps/step-${PV}:${SLOT}
-	webengine? (
-		>=kde-apps/kalgebra-${PV}:${SLOT}
-		>=kde-apps/parley-${PV}:${SLOT}
-	)
-"
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index 2fcff7dd33da..3ed79671c212 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kdegames-meta-20.12.3.ebuild 1804 BLAKE2B 1ea9c4228ab62ffcfcd645f55df6d5db7005078139d80c8ee75f5e20b0fef76bb0eefdeb09deae26fd3fdcf7decf33f262eb91d7d9e868055023c4ca55b71680 SHA512 b9be0ccdd464fc18681a1838fc90ed55c2309f06cdc45a898ceef0defd42f528dfda22842fd819d2d643966b757b25af05b596fd9fe5ece840e638bd6c7e6570
-EBUILD kdegames-meta-21.04.2.ebuild 1807 BLAKE2B ec4e9a72dcdba2cc25454e204c895a7a8d1a4346fd6a35c19ef57a2e96014f3e202ab386bd4ff35cbf6810849f2dca7a0a8fff68062a2b67b44b4934f721be4c SHA512 3d75ceb95e489c181cfebcb7aceea3eb99cb85923827b3b39c30c004f409480f791c0aa6e42b66cd85ffad749c91c2ab8eed65343d5d77c0bc72d8a1c9860896
 EBUILD kdegames-meta-21.04.3.ebuild 1807 BLAKE2B ec4e9a72dcdba2cc25454e204c895a7a8d1a4346fd6a35c19ef57a2e96014f3e202ab386bd4ff35cbf6810849f2dca7a0a8fff68062a2b67b44b4934f721be4c SHA512 3d75ceb95e489c181cfebcb7aceea3eb99cb85923827b3b39c30c004f409480f791c0aa6e42b66cd85ffad749c91c2ab8eed65343d5d77c0bc72d8a1c9860896
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-21.04.2.ebuild b/kde-apps/kdegames-meta/kdegames-meta-21.04.2.ebuild
deleted file mode 100644
index 9c1bd5691767..000000000000
--- a/kde-apps/kdegames-meta/kdegames-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
-HOMEPAGE="https://games.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="opengl python"
-
-RDEPEND="
-	>=kde-apps/bomber-${PV}:${SLOT}
-	>=kde-apps/bovo-${PV}:${SLOT}
-	>=kde-apps/granatier-${PV}:${SLOT}
-	>=kde-apps/kapman-${PV}:${SLOT}
-	>=kde-apps/katomic-${PV}:${SLOT}
-	>=kde-apps/kblackbox-${PV}:${SLOT}
-	>=kde-apps/kblocks-${PV}:${SLOT}
-	>=kde-apps/kbounce-${PV}:${SLOT}
-	>=kde-apps/kbreakout-${PV}:${SLOT}
-	>=kde-apps/kdiamond-${PV}:${SLOT}
-	>=kde-apps/kfourinline-${PV}:${SLOT}
-	>=kde-apps/kgoldrunner-${PV}:${SLOT}
-	>=kde-apps/kigo-${PV}:${SLOT}
-	>=kde-apps/killbots-${PV}:${SLOT}
-	>=kde-apps/kiriki-${PV}:${SLOT}
-	>=kde-apps/kjumpingcube-${PV}:${SLOT}
-	>=kde-apps/klickety-${PV}:${SLOT}
-	>=kde-apps/klines-${PV}:${SLOT}
-	>=kde-apps/kmahjongg-${PV}:${SLOT}
-	>=kde-apps/kmines-${PV}:${SLOT}
-	>=kde-apps/knavalbattle-${PV}:${SLOT}
-	>=kde-apps/knetwalk-${PV}:${SLOT}
-	>=kde-apps/knights-${PV}:${SLOT}
-	>=kde-apps/kolf-${PV}:${SLOT}
-	>=kde-apps/kollision-${PV}:${SLOT}
-	>=kde-apps/konquest-${PV}:${SLOT}
-	>=kde-apps/kpat-${PV}:${SLOT}
-	>=kde-apps/kreversi-${PV}:${SLOT}
-	>=kde-apps/kshisen-${PV}:${SLOT}
-	>=kde-apps/ksirk-${PV}:${SLOT}
-	>=kde-apps/ksnakeduel-${PV}:${SLOT}
-	>=kde-apps/kspaceduel-${PV}:${SLOT}
-	>=kde-apps/ksquares-${PV}:${SLOT}
-	>=kde-apps/ktuberling-${PV}:${SLOT}
-	>=kde-apps/libkdegames-${PV}:${SLOT}
-	>=kde-apps/libkmahjongg-${PV}:${SLOT}
-	>=kde-apps/lskat-${PV}:${SLOT}
-	>=kde-apps/palapeli-${PV}:${SLOT}
-	>=kde-apps/picmi-${PV}:${SLOT}
-	opengl? (
-		>=kde-apps/ksudoku-${PV}:${SLOT}
-		>=kde-apps/kubrick-${PV}:${SLOT}
-	)
-	python? ( >=kde-apps/kajongg-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index 17a1e43fa94a..57670b8c41e5 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kdegraphics-meta-20.12.3.ebuild 895 BLAKE2B 62dda55d2fe8e64f0d17f1284e8a69bc9c07c9912e8c0c8c76ae4d61521f5e73d4c8f8cd3d58e7a88cb8c6eab32ad71778e5c1810f364fdd7662908291648eea SHA512 91c6b1f82f61d82dc3986fc6acd6619a5aaf060d1615c419f255064585a6d3b101abe0329f1d40dec8692210d55d1b5e588ee5f9060d4bc80a834da143e5bbd9
-EBUILD kdegraphics-meta-21.04.2.ebuild 898 BLAKE2B 1dd93908c60c42bd3256ec624ce7ea3bbfbc8baddb8c258b7c3d245889f3edb0edf9ab06224cd3fe63ad9da28046278d310ed2d79dc287244aabf657624cb3a0 SHA512 c1353fa8c0cde0c3bac92d4a65d5d006d327a1d2a7b2290c01a9c04f5c6d9ff7ed5aa09d1005fb60938c4b2074a68d06425da6026f5af8304761370b2e036b32
 EBUILD kdegraphics-meta-21.04.3.ebuild 898 BLAKE2B 1dd93908c60c42bd3256ec624ce7ea3bbfbc8baddb8c258b7c3d245889f3edb0edf9ab06224cd3fe63ad9da28046278d310ed2d79dc287244aabf657624cb3a0 SHA512 c1353fa8c0cde0c3bac92d4a65d5d006d327a1d2a7b2290c01a9c04f5c6d9ff7ed5aa09d1005fb60938c4b2074a68d06425da6026f5af8304761370b2e036b32
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-21.04.2.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-21.04.2.ebuild
deleted file mode 100644
index 0804f556c991..000000000000
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-HOMEPAGE="https://apps.kde.org/graphics/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="scanner"
-
-RDEPEND="
-	>=kde-apps/gwenview-${PV}:${SLOT}
-	>=kde-apps/kamera-${PV}:${SLOT}
-	>=kde-apps/kcolorchooser-${PV}:${SLOT}
-	>=kde-apps/kdegraphics-mobipocket-${PV}:${SLOT}
-	>=kde-apps/kipi-plugins-${PV}:${SLOT}
-	>=kde-apps/kolourpaint-${PV}:${SLOT}
-	>=kde-apps/kruler-${PV}:${SLOT}
-	>=kde-apps/libkdcraw-${PV}:${SLOT}
-	>=kde-apps/libkexiv2-${PV}:${SLOT}
-	>=kde-apps/libkipi-${PV}:${SLOT}
-	>=kde-apps/okular-${PV}:${SLOT}
-	>=kde-apps/spectacle-${PV}:${SLOT}
-	>=kde-apps/svgpart-${PV}:${SLOT}
-	>=kde-apps/thumbnailers-${PV}:${SLOT}
-	scanner? ( >=kde-apps/libksane-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 0ac01495f970..afa25bf54734 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,7 +1,5 @@
 DIST kdegraphics-mobipocket-20.12.3.tar.xz 17056 BLAKE2B 9d04abfe25535c237db8acdb9e64d093a3da3fd87ad7940e1913b38a53fb59a449001a3b05a9a9ee352bb77af4aabe83511d7433ca0b9a57e3589ecc243b14fd SHA512 53367ccebe087186a30959852daaa0168f0e4c65f11ec9e074dd2f52c37569258b304a3ee5159770d5d2571d5aea98be6e113d9112ed249d5c948f2f00d92e8d
-DIST kdegraphics-mobipocket-21.04.2.tar.xz 17096 BLAKE2B 3731a6bc72843463247300533b55a75462c28c5261eefedcaa43835fa19c69516e2e55beb2f65b2678036f6688458f7139e47c71ecba55b6f089d639a9f3ac06 SHA512 8d4ca159bba84bc9d619675634deb916bd3bfc34f0c7f3eafc29c4651573b3d90db09147c8b84af2019226fd00a78ca1e9d7f418838f0e9c41ec7e377f3c5683
 DIST kdegraphics-mobipocket-21.04.3.tar.xz 17092 BLAKE2B ff2f227b31e2fa491b61f85fe38b2a9017c59cca9a649e79dc15ffb0cc7168aed77f4adde4d6621a796f2a00ed189cf1d0385131ddb8bd9a043f45ba9d84f8e0 SHA512 112b7b176ebf2631dbec5b621b34a1df7eff1ad0836ad4349039a539684aa7a7496ded50fd5d15fd3b3c6807bf2c3a6b9ad7483b2ab8758e72f4cd0bb6488224
 EBUILD kdegraphics-mobipocket-20.12.3.ebuild 516 BLAKE2B 8a65a5496de35ffb8ba9de3f4068977a76059c1af287ae3e2f1f0cde28675e4013b6e7d15511f67a13b3fe6871b6f915a3185f5b22a201b93e8bb289a3a8521f SHA512 43f0c4220195563b5593662b1d7761166443c15846c62839f0cbbffced0e4dc7ce3a4f3baa91d1dc58b8a6b3d02fae6fe1807c2968de0d90ad6c4aeb9c52f8e5
-EBUILD kdegraphics-mobipocket-21.04.2.ebuild 519 BLAKE2B da2bb330bd0c51594f7ac1a430690eda09d5edbf5b82cd60d10479e6b3bf1c5b7833b1d5a1302e60f1b17b31d6b26578155e0bbc8034387823575a9ff2a3f284 SHA512 8200a3960c34aa5380309765095a9a9241b9414e1b7b03d189d74166ca3dfeb29d16e07fb18136d93a1fcb40c54f17d42a2209f9989fb65e56122bbd929cd8f3
 EBUILD kdegraphics-mobipocket-21.04.3.ebuild 519 BLAKE2B da2bb330bd0c51594f7ac1a430690eda09d5edbf5b82cd60d10479e6b3bf1c5b7833b1d5a1302e60f1b17b31d6b26578155e0bbc8034387823575a9ff2a3f284 SHA512 8200a3960c34aa5380309765095a9a9241b9414e1b7b03d189d74166ca3dfeb29d16e07fb18136d93a1fcb40c54f17d42a2209f9989fb65e56122bbd929cd8f3
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.04.2.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.04.2.ebuild
deleted file mode 100644
index bf1ea99cb9ee..000000000000
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.04.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library to support mobipocket ebooks"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+thumbnail"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	thumbnail? ( >=kde-frameworks/kio-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_thumbnailers=$(usex thumbnail)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index a275dbd3c92d..ebccdb88d761 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kdemultimedia-meta-20.12.3.ebuild 840 BLAKE2B f860ebecc10901d6701e725d8b1e0565c6073d00919f5c1c7f09744e5ec99c28808fd9c47859405b3684820b0b0e3b5c5ccaf5b496a7be9c59f644bbd2aa5e30 SHA512 bb02d01fcd859173eb0819e39f1e252888bd58d6dd320616d5eafbbaaf5205e0cb9d4afc5eb532b4f937040645363f0a3047be502f09787f7585a12e1749ad7b
-EBUILD kdemultimedia-meta-21.04.2.ebuild 843 BLAKE2B 18b352b96bf43e834065d3eac9507d27ffe845af031c49de17996c4fc745530392ee8a015aac510072b3441e4f69e7f45c257b6e54fb49391e25175c031af157 SHA512 4b9135b2a26cb2bf21dc9e94dccf8471dc20dd6efe4d9a77a8a3d8dca4e7685886f635812bc62f54df3c5b4961412e7d5ffe5ff9edf6dd4e487598d7ade118d6
 EBUILD kdemultimedia-meta-21.04.3.ebuild 843 BLAKE2B 18b352b96bf43e834065d3eac9507d27ffe845af031c49de17996c4fc745530392ee8a015aac510072b3441e4f69e7f45c257b6e54fb49391e25175c031af157 SHA512 4b9135b2a26cb2bf21dc9e94dccf8471dc20dd6efe4d9a77a8a3d8dca4e7685886f635812bc62f54df3c5b4961412e7d5ffe5ff9edf6dd4e487598d7ade118d6
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.04.2.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.04.2.ebuild
deleted file mode 100644
index b2a8896e78f3..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="https://apps.kde.org/multimedia/ https://multimedia.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+cdrom +ffmpeg gstreamer"
-
-RDEPEND="
-	>=kde-apps/dragon-${PV}:${SLOT}
-	>=kde-apps/juk-${PV}:${SLOT}
-	>=kde-apps/kdenlive-${PV}:${SLOT}
-	>=kde-apps/kmix-${PV}:${SLOT}
-	>=kde-apps/kwave-${PV}:${SLOT}
-	>=media-sound/elisa-${PV}:${SLOT}
-	cdrom? (
-		>=kde-apps/audiocd-kio-${PV}:${SLOT}
-		>=kde-apps/k3b-${PV}:${SLOT}
-		>=kde-apps/libkcddb-${PV}:${SLOT}
-		>=kde-apps/libkcompactdisc-${PV}:${SLOT}
-	)
-	ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:${SLOT} )
-	gstreamer? ( >=kde-apps/kamoso-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index ec44a021a6ff..31367d72fb68 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,7 +1,5 @@
 DIST kdenetwork-filesharing-20.12.3.tar.xz 346716 BLAKE2B 8b80132ad55d26ecd9ffffaf11198ea58f284a9118289e4d22b7a74785b6617956fa0116f55304b0623a035e43d1aa3c9b220f564c5eba0d7ee7e656671a797c SHA512 ef635f83e9f4607bf1f0458761dbe918112ad2cee6c798f40c3666836dfa9fec2a6a4d6fa9237ab7694257675f1ab6c09f64a8636f18bc7560a4c4bcc0bee364
-DIST kdenetwork-filesharing-21.04.2.tar.xz 376784 BLAKE2B 8132f80045201d71ca34c6a227a2c465fd6a17db73669cfd1fe3f189aa6947b567f63431bb0fe8788265ef81524f11068447ba46686318d439dd31ce64951914 SHA512 e1f53c29e1565a268e80055b7dd55bc8d548c0f5c17edd748f68eed378bc081a16cd93d2e54578353193a5d340ed2b69d19dc5f3103aa3398ebd081ec8624ca5
 DIST kdenetwork-filesharing-21.04.3.tar.xz 378280 BLAKE2B 345ef38b120de2f1ca6dd256d579995a60c4e5d41b2b2e53aa6de1c051c1deec251cd3943770640445b7c3074105a4584d8144b864bc2c9544ed55a638f4edf3 SHA512 7b8b0d0118829d64d46acfea666a4c274d5c6e7f825624cf02cf7e74558af1f2f2d152cca676ce0da56ed01cb74511c1b20c3940118f2dda129b40551e2ce4c7
 EBUILD kdenetwork-filesharing-20.12.3.ebuild 922 BLAKE2B 6756ec343db59692c020e22e16898e5f53e3991ad4a9257f2cf4d80b796d1f4f3ded1ab0742e36ef71168a48975fcadc5c2ebaf59dbad266c5f109825eae4607 SHA512 70d6fdb1e174ef2bca4678adf42c2597bf69d5da36b4a3f007d05b49e73d740d52aa0cbdfc2c6beb0d145782b038340b0f84ae9e50e1c71193ca8e654a6e7b2f
-EBUILD kdenetwork-filesharing-21.04.2.ebuild 925 BLAKE2B 897cd62920d15bed19d8d3f004ab35d39b6d48a949de9cbb029508ee593e6a659ca48b0da6e2daaaa9c82f5645e68af2f7ffba7df66be06bb2a018060a49ad5b SHA512 bfc24780a736ac433192e0ac43bf659a97c4ba492627bfea5b815384cba86b776a70b34c6a0c8a2882602830652868e08feef3802dfe41817961de55bdbc0035
 EBUILD kdenetwork-filesharing-21.04.3.ebuild 925 BLAKE2B 897cd62920d15bed19d8d3f004ab35d39b6d48a949de9cbb029508ee593e6a659ca48b0da6e2daaaa9c82f5645e68af2f7ffba7df66be06bb2a018060a49ad5b SHA512 bfc24780a736ac433192e0ac43bf659a97c4ba492627bfea5b815384cba86b776a70b34c6a0c8a2882602830652868e08feef3802dfe41817961de55bdbc0035
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.04.2.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.04.2.ebuild
deleted file mode 100644
index 6327af36a60c..000000000000
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.04.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Samba filesharing plugin for file properties"
-HOMEPAGE="https://apps.kde.org/kdenetwork_filesharing/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	net-fs/samba
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index abe5508eda58..e5762bd394d7 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kdenetwork-meta-20.12.3-r1.ebuild 904 BLAKE2B 710ff9e513a359de7038a3c7fd84e09fdaba495176a712d483340dc9fa71c1bb72225433e1ea175d7fde5adf93245f6d9afa5ee327d4443aaba9cf413971aec7 SHA512 fc26677b0372968f53020895ad27918d449f18364e8d48d1f94dcda75441ad4a472facdef4386235d28910de7dc821fc6736b2d5e9a10a82178af97d0e90b9d4
-EBUILD kdenetwork-meta-21.04.2.ebuild 907 BLAKE2B c1a475908aa2dcddda8c0b71437835a0d3ea93f749a679e566f35ca7174132c9057d03ce0024ea1179bc20734103f62f24c78a989c0c9be6d4b166c694df0bb2 SHA512 5da145066920161170b9bbccd241a35654f0dd4d3c9bb28a6408ae4712c5190d9d1828b7d45d802216dec1b88c95385558efea6c2437ce31e023d1ba15242ff8
 EBUILD kdenetwork-meta-21.04.3.ebuild 907 BLAKE2B c1a475908aa2dcddda8c0b71437835a0d3ea93f749a679e566f35ca7174132c9057d03ce0024ea1179bc20734103f62f24c78a989c0c9be6d4b166c694df0bb2 SHA512 5da145066920161170b9bbccd241a35654f0dd4d3c9bb28a6408ae4712c5190d9d1828b7d45d802216dec1b88c95385558efea6c2437ce31e023d1ba15242ff8
 MISC metadata.xml 766 BLAKE2B 07e98c3de6c7176a687ca99c8fb0ac74a5128865a1b3abd4774aa11b8884274115f38ddad5da11ac5e84071bf5b9a8987a37a4202c397838eec38c0aa637530b SHA512 36c978d73c8564969fbc234ca7763256cd89069d907a7d1ce5db87681eeaa3a691a3634afd8ffad78adcb3f6d4bad5f71b6a7cb4badbe2f67357cdace976e357
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-21.04.2.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-21.04.2.ebuild
deleted file mode 100644
index 8831a2f47923..000000000000
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+bittorrent dropbox samba +webengine"
-
-RDEPEND="
-	>=kde-apps/kget-${PV}:${SLOT}
-	>=kde-apps/kopete-${PV}:${SLOT}
-	>=kde-apps/krdc-${PV}:${SLOT}
-	>=kde-apps/krfb-${PV}:${SLOT}
-	>=kde-apps/zeroconf-ioslave-${PV}:${SLOT}
-	>=kde-misc/kdeconnect-${PV}:${SLOT}
-	>=kde-misc/kio-gdrive-${PV}:${SLOT}
-	>=net-irc/konversation-${PV}:${SLOT}
-	bittorrent? (
-		>=net-libs/libktorrent-${PV}:${SLOT}
-		>=net-p2p/ktorrent-${PV}:${SLOT}
-	)
-	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:${SLOT} )
-	samba? ( >=kde-apps/kdenetwork-filesharing-${PV}:${SLOT} )
-	webengine? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index af04e5c7ce12..bdac7c75d1f7 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,7 +1,5 @@
 DIST kdenlive-20.12.3.tar.xz 11514396 BLAKE2B eb789a2dcddc67a73122d3fcab06d43d72566de8aeec97dd7bc8b76918231a859e86c8859be7eaab4017c9048edaa951fd143d8e24187437252490464bef0773 SHA512 b21c9bd59171969ab84b93bab2617333160521c3b99b61a2182f9d9b5e65c3220b6dd960d71fe5eeb032733127392dafd40748b950b9973e0edfb5ae6317380a
-DIST kdenlive-21.04.2.tar.xz 11772924 BLAKE2B d6f0c02cfdad21f11669287ce7346d4355740d055a2bc351fb57caf985c8775dd9597b39e4950b7e9fafdddaa1288afc274d26ba2878ab941d07752720403977 SHA512 21fa0e01feed15716c111d8befc8fb1e197f7005e4b42201c472e4995f951335de6c5c0c8999a8a4975aa4ec27e0bdf18e6ab6a185c841ebb3f5d283c4c89032
 DIST kdenlive-21.04.3.tar.xz 11774932 BLAKE2B 7ecf010b82261696d27f1e94f80902b124474e8f3de94d13efc494eb703b073f05047ce17e45a9e161e505eceee046ff3e5ba1b11cc356c1d83a4b3a7e086ae6 SHA512 9ab5e3f93d0423a0bd746b4bc981a1b9ac14e8440b002d76e44b68597b9c8a16c1f2b498e53755fc5399795d6716addb87c75a58053f7560b108d5019282679f
 EBUILD kdenlive-20.12.3.ebuild 2609 BLAKE2B c0e1d6a000d558c613bb79bc5375f7937f25fec6528edec55ddcfd6223b020ab5d29a6fb60ee0d83baef1da57dde9a2fd90ab1bedce119f445011505502a7939 SHA512 0049ef2fc7e1ced0585a16de9a4dec01fcba55787f52dddff8260cf863e8267412870c222fadd45256e1fd1e92098fa62f51d03ca03715fc0f99374e8572ee4a
-EBUILD kdenlive-21.04.2.ebuild 2419 BLAKE2B d9606e18de98097ffed5628ed95dc89a4a41a102818e31af1644d2dc2480acb575723c60837bff8b556f46bd0619d5fb9aa1e6353a486f41c303d3efad87de76 SHA512 7f884c9f6ff2d220a3a39933465112f367cf0ee8bd0f2276198a1a752f623c47a60366936200c4e441e5e08b2b7a28d2e68021f3a4a824d1c97344c58598833b
 EBUILD kdenlive-21.04.3.ebuild 2419 BLAKE2B d9606e18de98097ffed5628ed95dc89a4a41a102818e31af1644d2dc2480acb575723c60837bff8b556f46bd0619d5fb9aa1e6353a486f41c303d3efad87de76 SHA512 7f884c9f6ff2d220a3a39933465112f367cf0ee8bd0f2276198a1a752f623c47a60366936200c4e441e5e08b2b7a28d2e68021f3a4a824d1c97344c58598833b
 MISC metadata.xml 489 BLAKE2B 51ddd82047dffa39b9fcd279857844864ae16144b31a5768384726729019541c9033f6cf2b358331f039954878cb409b4eda3dde8356ca2d3a345667cd6afe04 SHA512 855156534b3863f573fb9ccdffd144d11be83bb77c0b4e0f968a175730611bbc6b16f2a85e172076561aa02b498c975830187006a24a3095af33b6685835409f
diff --git a/kde-apps/kdenlive/kdenlive-21.04.2.ebuild b/kde-apps/kdenlive/kdenlive-21.04.2.ebuild
deleted file mode 100644
index a3aea9e415e1..000000000000
--- a/kde-apps/kdenlive/kdenlive-21.04.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://kdenlive.org/en/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="gles2-only semantic-desktop share v4l"
-
-RESTRICT+=" test" # segfaults, bug 684132
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/mlt-6.26.0[ffmpeg,frei0r,qt5,sdl,xml]
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	media-video/ffmpeg[encode,sdl,X]
-"
-BDEPEND="sys-devel/gettext"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package v4l LibV4L2)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	# Gentoo bug 603168
-	optfeature "Crop, Transform/Rotate and Shear effect" "media-libs/mlt[fftw]"
-}
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 15f0f65c404a..a6f019162849 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,7 +1,5 @@
 DIST kdepim-addons-20.12.3.tar.xz 2145600 BLAKE2B 142a519bd57a311042ecbdd1e246a6d4b8bccd64c64d1aeb13755cd5b55383b161082fdd897ccbd2cce83a5f7e9c24b2951cf25f88b2deae90ae0da5737c169d SHA512 345febeb6cd6db60f4c5e246d0a775e828310bca50288e36ba676185404ae5dfe556262a882a201e85cad851b3612a27de15e5b9d6076ee109abdb01e4909058
-DIST kdepim-addons-21.04.2.tar.xz 2270820 BLAKE2B 3b9b9a5ca8c1882f6a7d69da7db29ef9e2084594c25aa50c1058f6875e0d6a812fdcc2567102266340ef1ee366d56a8f6306fb53edf252bea76ad9698d4e964d SHA512 61ac89b12bd1b1b61d3ea617782832a5e6f0e786b118ef475d0425b044c12097638faa8c4e77d659daef41853000a6e0dcd32b4994ef4349ae7d2aff00f073bd
 DIST kdepim-addons-21.04.3.tar.xz 2271324 BLAKE2B a5cea9b75d9614dbca933fdcd8512c67ac921069cae4f128da704956bf80237309b5cacfc588ac1ba39890bee1a15903bd5773f035982342fb27af51ad0b1c45 SHA512 3813f3d9dff60158ca14f4afb8b904a5df9f1d54d180767846be2085869ceeb60ce13b6b017cc8297d8d1bdbb4d0fd7e155701c6babaa7c4c8cfb44d658864e7
 EBUILD kdepim-addons-20.12.3.ebuild 2470 BLAKE2B eedc8c5e911714df5b78a1b84729bd78d8cf485dfd0acdec865e222ea985cce63bdb9bbaa1a2f4c7024816d73fadb7e23f2364908eaf38dd73f23098d5d1eb8a SHA512 2085bbdf6c75dc4f217bffa1ed6a4f9ae7394ce89ce8b35ab892fe6993726ba8ea6944534dd9db3d976e9afb05589bb2ff035ac50012f51ee8e15dae1c84ca52
-EBUILD kdepim-addons-21.04.2.ebuild 2473 BLAKE2B f932c72e4885f32a51fd4ac6a395f2b8a99fd9eefdb7619101ca73d3a5b727b58e87c8ea6d272c5efd17b94740c347a1bd157c99d2da1abed4bae75f518e1f67 SHA512 366c31b3c302b6e3c1bbbf1ad3a087e775dc1b7381cf098588ae223108af517ba83be433751af10291ed60e24f3a01708f25e75fec56bd3d8a420433bad6b00c
 EBUILD kdepim-addons-21.04.3.ebuild 2473 BLAKE2B f932c72e4885f32a51fd4ac6a395f2b8a99fd9eefdb7619101ca73d3a5b727b58e87c8ea6d272c5efd17b94740c347a1bd157c99d2da1abed4bae75f518e1f67 SHA512 366c31b3c302b6e3c1bbbf1ad3a087e775dc1b7381cf098588ae223108af517ba83be433751af10291ed60e24f3a01708f25e75fec56bd3d8a420433bad6b00c
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-21.04.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-21.04.2.ebuild
deleted file mode 100644
index 120baae4dd03..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-21.04.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="importwizard markdown"
-
-RDEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kaddressbook-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kitinerary-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
-	markdown? ( app-text/discount )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package importwizard KPimImportWizard)
-		$(cmake_use_find_package markdown Discount)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 0c748a208c5c..f1448ecf92af 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kdepim-meta-20.12.3.ebuild 2519 BLAKE2B 2e2ca5b0939579c49ae5ad49ca02b412e875aa617b988f05157677a3c8eb850529fc567571bef6830802d76d97f3a7ea15e038be86e6ce91f3998f551590cc01 SHA512 23b624bebf33729cb83b8246acb6e33a5abb33917cc10c235aceb36b14e1fdec3fac875ecd01cf80a3f342869948d85d47234b8801bde803c6dc9469fbb76516
-EBUILD kdepim-meta-21.04.2.ebuild 2522 BLAKE2B 0797c52ac88dce9ad681c836f2551164087e275b594140ec777809be3a4a98dab14ab5ad1b269d1f9cfa2e512678c5056e7bcfbe017b8f2d468d9ba78af560c1 SHA512 53473a809bb8512d563f90d252a1c0f48bcee261f4aa158979d9f4393de212fcfdde8377f519801c62fd9c2e3d671d044bc4d9cf0b09eeed52867e20b7ec1e78
 EBUILD kdepim-meta-21.04.3.ebuild 2522 BLAKE2B 0797c52ac88dce9ad681c836f2551164087e275b594140ec777809be3a4a98dab14ab5ad1b269d1f9cfa2e512678c5056e7bcfbe017b8f2d468d9ba78af560c1 SHA512 53473a809bb8512d563f90d252a1c0f48bcee261f4aa158979d9f4393de212fcfdde8377f519801c62fd9c2e3d671d044bc4d9cf0b09eeed52867e20b7ec1e78
 MISC metadata.xml 650 BLAKE2B 27e2fa91fe17cd24da17294c2c8a54cd4eee5342c07d8a1a7ad1515d9c52bfe47fe938f3c96e4e2d1ae9b99e2100de9252e180d55458a46aaab03d46725ab9a0 SHA512 dff51eb660ecab8f80e9d865f9e2a9ce5ace1cea6ff322cd2b71af2e3ce83e45d0ea3fbd499a37413bd9572853b90fe860a040d3e3828836ecf842872a4eed88
diff --git a/kde-apps/kdepim-meta/kdepim-meta-21.04.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-21.04.2.ebuild
deleted file mode 100644
index 27d8eaa3ad65..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="bogofilter clamav spamassassin"
-
-RDEPEND="
-	>=kde-apps/akonadi-${PV}:${SLOT}
-	>=kde-apps/akonadiconsole-${PV}:${SLOT}
-	>=kde-apps/akonadi-calendar-${PV}:${SLOT}
-	>=kde-apps/akonadi-contacts-${PV}:${SLOT}
-	>=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
-	>=kde-apps/akonadi-mime-${PV}:${SLOT}
-	>=kde-apps/akonadi-notes-${PV}:${SLOT}
-	>=kde-apps/akonadi-search-${PV}:${SLOT}
-	>=kde-apps/akregator-${PV}:${SLOT}
-	>=kde-apps/calendarjanitor-${PV}:${SLOT}
-	>=kde-apps/calendarsupport-${PV}:${SLOT}
-	>=kde-apps/eventviews-${PV}:${SLOT}
-	>=kde-apps/grantlee-editor-${PV}:${SLOT}
-	>=kde-apps/grantleetheme-${PV}:${SLOT}
-	>=kde-apps/incidenceeditor-${PV}:${SLOT}
-	>=kde-apps/kaddressbook-${PV}:${SLOT}
-	>=kde-apps/kalarm-${PV}:${SLOT}
-	>=kde-apps/kalarmcal-${PV}:${SLOT}
-	>=kde-apps/kcalutils-${PV}:${SLOT}
-	>=kde-apps/kdepim-addons-${PV}:${SLOT}
-	>=kde-apps/kdepim-runtime-${PV}:${SLOT}
-	>=kde-apps/kidentitymanagement-${PV}:${SLOT}
-	>=kde-apps/kimap-${PV}:${SLOT}
-	>=kde-apps/kitinerary-${PV}:${SLOT}
-	>=kde-apps/kldap-${PV}:${SLOT}
-	>=kde-apps/kleopatra-${PV}:${SLOT}
-	>=kde-apps/kmail-${PV}:${SLOT}
-	>=kde-apps/kmail-account-wizard-${PV}:${SLOT}
-	>=kde-apps/kmailtransport-${PV}:${SLOT}
-	>=kde-apps/kmbox-${PV}:${SLOT}
-	>=kde-apps/kmime-${PV}:${SLOT}
-	>=kde-apps/knotes-${PV}:${SLOT}
-	>=kde-apps/konsolekalendar-${PV}:${SLOT}
-	>=kde-apps/kontact-${PV}:${SLOT}
-	>=kde-apps/kontactinterface-${PV}:${SLOT}
-	>=kde-apps/korganizer-${PV}:${SLOT}
-	>=kde-apps/kpimtextedit-${PV}:${SLOT}
-	>=kde-apps/kpkpass-${PV}:${SLOT}
-	>=kde-apps/ksmtp-${PV}:${SLOT}
-	>=kde-apps/libgravatar-${PV}:${SLOT}
-	>=kde-apps/libkdepim-${PV}:${SLOT}
-	>=kde-apps/libkgapi-${PV}:${SLOT}
-	>=kde-apps/libkleo-${PV}:${SLOT}
-	>=kde-apps/libksieve-${PV}:${SLOT}
-	>=kde-apps/libktnef-${PV}:${SLOT}
-	>=kde-apps/mailcommon-${PV}:${SLOT}
-	>=kde-apps/mailimporter-${PV}:${SLOT}
-	>=kde-apps/mbox-importer-${PV}:${SLOT}
-	>=kde-apps/messagelib-${PV}:${SLOT}
-	>=kde-apps/pim-data-exporter-${PV}:${SLOT}
-	>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
-	>=kde-apps/pimcommon-${PV}:${SLOT}
-"
-# Optional runtime dependencies: kde-apps/kmail
-RDEPEND="${RDEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	clamav? ( app-antivirus/clamav )
-	spamassassin? ( mail-filter/spamassassin )
-"
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 58f85728734b..61d6f305aed5 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,7 +1,5 @@
 DIST kdepim-runtime-20.12.3.tar.xz 1801580 BLAKE2B 491684ee067d43f0b7f74ee3773401bd633a4708586b6054657c267a1b44cfbe0c2b8ffd9bd8ef54ff1196989c2bc4461352315ea8b1ca32bca85aa9cc345b24 SHA512 5dcc122c80575b6ebd7e220d72f71c58fa96fb894c7419ed5f3549eca6c5d3702d20f826baf1b2f7a0e8b80ce03afa5ede26cb558b9d01e38edf38976ab9b12a
-DIST kdepim-runtime-21.04.2.tar.xz 1821480 BLAKE2B c0ee3f9c19d067971728ccdd294f4c749b1debeac26fe30520dd119e7c5b8814b271ad3cbbc8e283fac5e7202d961ca02b009ec92de061eef79d5794b99fbaff SHA512 6476166ef0a60f7fbb3d9ba0253862f7163c4a86875ea5e15e87893b2e382a6a7011d57f8d6a93dad45b46bcd575ac2cac18e7fa2d7f41447ab788f316520ca8
 DIST kdepim-runtime-21.04.3.tar.xz 1822120 BLAKE2B 6eb8ec1d5feb136b31c8122db28e586cca6fee2ae29aa89ee9d7050fdb8088178b262935b80e2f213f6f96594a3a83d48df4670700e0acb20306845fad33cd36 SHA512 1830cde921bf6f0e7a772c60a8bf30db1333f9172596843b89c5333ee7a289aec0670849b88adfce4a451ac46c4f5e43dac715d4e42e4df36cb1b5ca711b0afd
 EBUILD kdepim-runtime-20.12.3.ebuild 2517 BLAKE2B 48d1dc27aade780b9418e8ff7b056275b65661d00ed2c218424ad8aea5f1469f4910b7982e1b03f2ff4d5d8180d84f73553f5e8bef478c59deac4aafa1497863 SHA512 e1b1a7249c2741224d4b798caee5cdef3daaab23abc9ab3a925223edcffd1c28aefc3e564b1707e0b2f697c0272fd60214494ceb13b858f286a4d22c081fd8e5
-EBUILD kdepim-runtime-21.04.2.ebuild 2503 BLAKE2B 8fa54e9c490356743fc71b4239030efde9c721c1203089c3837070a0419785deca9ec6d6faf29f5e6b8191da47d9b7317acd686726cb52bcd5551e12ea792d81 SHA512 c3f072612b2b49b6b2029e5a738a6d43a11dd61de9f800ae23b627e54e51dccbfc5d64e1b09c85029104d115928b9f3806952f796b4263e2306eb174d12724bd
 EBUILD kdepim-runtime-21.04.3.ebuild 2503 BLAKE2B 8fa54e9c490356743fc71b4239030efde9c721c1203089c3837070a0419785deca9ec6d6faf29f5e6b8191da47d9b7317acd686726cb52bcd5551e12ea792d81 SHA512 c3f072612b2b49b6b2029e5a738a6d43a11dd61de9f800ae23b627e54e51dccbfc5d64e1b09c85029104d115928b9f3806952f796b4263e2306eb174d12724bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.04.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.04.2.ebuild
deleted file mode 100644
index 00361b766a99..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-21.04.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test"
-
-# TODO kolab
-RDEPEND="
-	>=app-crypt/qca-2.3.0:2
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdav-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
-"
-BDEPEND="dev-libs/libxslt"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 3ae1dd762e80..ff5b8d68a0d1 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,7 +1,5 @@
 DIST kdesdk-kioslaves-20.12.3.tar.xz 37468 BLAKE2B 5e42378da8ebc64cde7684626519d77c0b788731b156febed47a89dad30fcc0dd94a772b5539c54b74b44d1006b69786490aee1f67f830b5668d10aa1722428a SHA512 8a37af8b86d3a716e2003d17d79fa018d87639b9379bf76b87184e1cb772afa7370b02e17541f3e895cbc7b2df76df85caaa9c697d46c5c7d3fb8677872a83ad
-DIST kdesdk-kioslaves-21.04.2.tar.xz 37692 BLAKE2B 92eb0b98d45f6d528b377ab59fb0f6808179702d9e925b747311be391236fefaccfe1792ab0300682a253bb4ef838543ac3572fc6cb0c73e67206f3e608516db SHA512 e1966930a2601cdb68257309cfd99a6f51f6f3c744905c5b5df4377394bc81345f25a874132c14b28059e97dfd8f1314c3711466cabaa57af7ee8c5e18b78ac1
 DIST kdesdk-kioslaves-21.04.3.tar.xz 38424 BLAKE2B 02e24505e22e8e5cbe965302ba51ea3d174f1220b5d779416f267dbebd2c2b0207dc06fd0602669845d803d657c985b8662ba67dab4e434599fe7c2b61525058 SHA512 f0e6354b1bf5fa0dc851e7a90b71a548790903484dcbb7b31b419d33e203ba7f6e8a632ba96c3131a4996b0553bce66d5ba945ade6820c78d7ae6a7495460a3f
 EBUILD kdesdk-kioslaves-20.12.3.ebuild 422 BLAKE2B 3ba00b60e1463fb7ec78fc293f2129560ad51e92eeecdbd0e61d210531b3ee5d84f27a096b25228f82dc77c05d9a6c77773d179457e52026158354357353555b SHA512 1bbd3098ea48782c60173d71280d9f0889d2ae89de9bd7d61f605a865c82a68ab92bb2b8d0fae1a64e866fd0434c7260f6242997b759ba58e050050486d3ea31
-EBUILD kdesdk-kioslaves-21.04.2.ebuild 425 BLAKE2B 5d4b642419486340649a21e8d5af885d6143876cbb367d1da8c0e284ed17da3ac6b92deed1ecb52e5112bc1edef077963a5f2fa727d1a6a078947db16ca4b80c SHA512 785510e559f1a8c33cd081d0524cac9c7f82ce3b5ac0f4fad1af79afd41a4ec0889284717bd52cb71435c16fda6e53bab75eb02ab6533ed4929d7c5bb586ea09
 EBUILD kdesdk-kioslaves-21.04.3.ebuild 425 BLAKE2B 5d4b642419486340649a21e8d5af885d6143876cbb367d1da8c0e284ed17da3ac6b92deed1ecb52e5112bc1edef077963a5f2fa727d1a6a078947db16ca4b80c SHA512 785510e559f1a8c33cd081d0524cac9c7f82ce3b5ac0f4fad1af79afd41a4ec0889284717bd52cb71435c16fda6e53bab75eb02ab6533ed4929d7c5bb586ea09
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.04.2.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.04.2.ebuild
deleted file mode 100644
index e10275243a45..000000000000
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.04.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-inherit ecm kde.org
-
-DESCRIPTION="kioslaves from kdesdk package"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/perl
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index aca36a6f6e55..b7f9e35713d8 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kdesdk-meta-20.12.3.ebuild 1080 BLAKE2B e120cd648304038f1cf119bad0702528f083450e5f0a932fafe340e7f70a61ad64a56b4ed266d713578fc46038ef20c17692a15b678488fc11c60c898281a9df SHA512 56f8338b8724ca941903c306a21f1034789dc9aab8630de4c2d95578d01a6e1a08c24f1a60aa0cd555f0481072a4ae51c2d056185c62de9e1475b8ca9d400cc6
-EBUILD kdesdk-meta-21.04.2.ebuild 1083 BLAKE2B 9fa38dfb1a59683c4e91ddd6bec0a29b25fd77ee70d4549b080bbe387dfa41ea54930d5c71295fc639bccbfa4177e52cf38a8777d6bb7c448ecfb39449b8e140 SHA512 2495443297433e88ef0366db256c6a76497c8a95de8f3448cdcfe631f4e3e101984281b05da3d8725277a42289ed31345e32fe72f63b62b7bd81cb8667eccfce
 EBUILD kdesdk-meta-21.04.3.ebuild 1083 BLAKE2B 9fa38dfb1a59683c4e91ddd6bec0a29b25fd77ee70d4549b080bbe387dfa41ea54930d5c71295fc639bccbfa4177e52cf38a8777d6bb7c448ecfb39449b8e140 SHA512 2495443297433e88ef0366db256c6a76497c8a95de8f3448cdcfe631f4e3e101984281b05da3d8725277a42289ed31345e32fe72f63b62b7bd81cb8667eccfce
 MISC metadata.xml 694 BLAKE2B cfb8ab0250e68d767f4d361aff6b3d0341806601ef93012289646091e5eba7495ae07ca0eaa9363d5adc65b6f411cd0cd1ef7a092d02360ebd11e43f86905b75 SHA512 f6db059c65c8dee729f25700da4e9aa24384291bea6a28d546726e46ce6f7f64ee66daf872cd2358525bb8739b3fe18166d2e04142c0539e874f44dcd80b5c72
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-21.04.2.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-21.04.2.ebuild
deleted file mode 100644
index c408838c9a98..000000000000
--- a/kde-apps/kdesdk-meta/kdesdk-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
-HOMEPAGE="https://apps.kde.org/development/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="cvs git mercurial python ruby subversion"
-
-RDEPEND="
-	>=kde-apps/kapptemplate-${PV}:${SLOT}
-	>=kde-apps/kcachegrind-${PV}:${SLOT}
-	>=kde-apps/kde-dev-scripts-${PV}:${SLOT}
-	>=kde-apps/kde-dev-utils-${PV}:${SLOT}
-	>=kde-apps/kdesdk-kioslaves-${PV}:${SLOT}
-	>=kde-apps/kdesdk-thumbnailers-${PV}:${SLOT}
-	>=kde-apps/kompare-${PV}:${SLOT}
-	>=kde-apps/libkomparediff2-${PV}:${SLOT}
-	>=kde-apps/poxml-${PV}:${SLOT}
-	>=kde-apps/umbrello-${PV}:${SLOT}
-	cvs? ( >=kde-apps/cervisia-${PV}:${SLOT} )
-	git? ( >=kde-apps/dolphin-plugins-git-${PV}:${SLOT} )
-	mercurial? ( >=kde-apps/dolphin-plugins-mercurial-${PV}:${SLOT} )
-	python? ( >=kde-apps/lokalize-${PV}:${SLOT} )
-	ruby? ( >=kde-apps/kross-interpreters-${PV}:${SLOT} )
-	subversion? ( >=kde-apps/dolphin-plugins-subversion-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 1e73ff2a27f9..b89be9bc41a8 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,7 +1,5 @@
 DIST kdesdk-thumbnailers-20.12.3.tar.xz 17816 BLAKE2B e5278cb5403f714e0853eeeddd968b618398107b79cff7d79a998b43e9479f94a7d98a84fc7ac8c546c5d4860270f1cbc43375537346266b07b9ce925091f749 SHA512 35c6af3e0770d45e357e33d3a7159b3be8c09f50a1a57f15fa4cc5e5bfcfa5f6767a890bcc268133975d48e839844aa968300062c54d338ef90298c928884313
-DIST kdesdk-thumbnailers-21.04.2.tar.xz 17848 BLAKE2B cabd84fcf180db163de6262844c3e7ff3b09d3c959540d4b00c1dab60064246e03bab3347ae90c7990d13974eee25159df5b5113f2c664785a18b7de7a3a628d SHA512 25a4372f98f19ca8c4482ba47f8ad80cdb0e4ec87a20ad5c46892b5bc69c9822399d270f681a2eb21041728a1a6d378b129f473326d0b2c0bb5e3227f18a7ba3
 DIST kdesdk-thumbnailers-21.04.3.tar.xz 17872 BLAKE2B 88b7a166855708e0ca70460d4c2886cb2f8dadf3d4bbd7caa7947987764a5830e43aa473c43d7a540efa10eb1ef8600e034178d53902e68437c72199118ce130 SHA512 bb23b8ba412919e926d07bb3ad0546d8b9828617de01e1922c694e1886f9cc7ace096367beaca1487c1f91b178ab2503955d985debbd98c0fa388fe29326789e
 EBUILD kdesdk-thumbnailers-20.12.3.ebuild 540 BLAKE2B 2a2e155a913c9195d62687e3f0043fad52fbb20ce65b501807fd8d2c34cfcb5a76a9b11d5c3ccbed161e136155e48c8b134ce1a1efaec3affabe6bf35d0464e8 SHA512 74cbb53c8e5fd6213e1e86ced6ae59463925fcc7be215d294619f9240e3f5ffeea25f59146ed930e36e610ddf46e9f6788e0334c36dc7d6b5d00dc3434f829a1
-EBUILD kdesdk-thumbnailers-21.04.2.ebuild 543 BLAKE2B fc671853af627ff184f7438149ed81f063fd1b8b7715e52d266016b0dd617ee868219a23576ca21dadb57034f0a4a1b34d814c4f77a43fd5c2ed29b7cd298c76 SHA512 ac913139d24a0eb9576b83e493bd54270294620e4f5b70ae5c31e0dd4d75ea4a77a1196859fd91c929698e71df7e686f91bf4d745ec666b424bb729ba508669d
 EBUILD kdesdk-thumbnailers-21.04.3.ebuild 543 BLAKE2B fc671853af627ff184f7438149ed81f063fd1b8b7715e52d266016b0dd617ee868219a23576ca21dadb57034f0a4a1b34d814c4f77a43fd5c2ed29b7cd298c76 SHA512 ac913139d24a0eb9576b83e493bd54270294620e4f5b70ae5c31e0dd4d75ea4a77a1196859fd91c929698e71df7e686f91bf4d745ec666b424bb729ba508669d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.04.2.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.04.2.ebuild
deleted file mode 100644
index 8e31812f6e50..000000000000
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.04.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Thumbnail generator for PO files"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index edd59e5b7cc4..36a979bbf931 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD kdeutils-meta-20.12.3.ebuild 1367 BLAKE2B d24d95bdfb41526dd290b8a629333203fd0eebfe80bef4b78a920415b630c525c4f1ae8ddfe278f6c915af776f58f6fe515afe9513be8ba4a9ba94774dd8437e SHA512 5b5649e9fe80f71aac7b569cc9f25bec7c71f850205dc4205daa54a66dfdfd67d13de88437e71c78f76e4a909d786c78825e202a7fe139dc6be31035f274d3a7
-EBUILD kdeutils-meta-21.04.2.ebuild 1370 BLAKE2B 74f89a387e7f5c5f9581ddd6efa9f835f63f4289c2fb707a69e7f4333595377782f56bc146bb1c3e354e84a067d25beade0e6b472552153e7918a43cb018c1e0 SHA512 d99ecbc78385b907e3ca643fdaaab7fb2be78e8bd05664238301c1c92fd2e49771774c9c4ed36625848f6cae7e267e1c1bcffef4edf654764559f12bb81a7e45
 EBUILD kdeutils-meta-21.04.3.ebuild 1370 BLAKE2B 74f89a387e7f5c5f9581ddd6efa9f835f63f4289c2fb707a69e7f4333595377782f56bc146bb1c3e354e84a067d25beade0e6b472552153e7918a43cb018c1e0 SHA512 d99ecbc78385b907e3ca643fdaaab7fb2be78e8bd05664238301c1c92fd2e49771774c9c4ed36625848f6cae7e267e1c1bcffef4edf654764559f12bb81a7e45
 MISC metadata.xml 1004 BLAKE2B f2fed1a10b7eb10ba9016b72fe9c4863e853882e6f66790ffe70e21aace4e10b0fc5c699559934121b071c2e260a83b19d50b5d14adc53dff25d933ea0e8eae6 SHA512 d8f248c827327c4c855cc1ba7c6c9d31578b4a89ecca6dbc0ffde3f2b73b10f66d9923a907dde88481ee933a6047fb18089341ef49b8146836a00cb341a23f7a
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-21.04.2.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-21.04.2.ebuild
deleted file mode 100644
index 1291591b4ce3..000000000000
--- a/kde-apps/kdeutils-meta/kdeutils-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-HOMEPAGE="https://apps.kde.org/utilities/ https://utils.kde.org"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="7zip cups floppy gpg lrz rar +webengine"
-
-RDEPEND="
-	>=app-cdr/dolphin-plugins-mountiso-${PV}:${SLOT}
-	>=kde-apps/ark-${PV}:${SLOT}
-	>=kde-apps/filelight-${PV}:${SLOT}
-	>=kde-apps/kate-${PV}:${SLOT}
-	>=kde-apps/kbackup-${PV}:${SLOT}
-	>=kde-apps/kcalc-${PV}:${SLOT}
-	>=kde-apps/kcharselect-${PV}:${SLOT}
-	>=kde-apps/kdebugsettings-${PV}:${SLOT}
-	>=kde-apps/kdf-${PV}:${SLOT}
-	>=kde-apps/kteatime-${PV}:${SLOT}
-	>=kde-apps/ktimer-${PV}:${SLOT}
-	>=kde-apps/kwalletmanager-${PV}:${SLOT}
-	>=kde-apps/sweeper-${PV}:${SLOT}
-	>=kde-apps/yakuake-${PV}:${SLOT}
-	>=kde-misc/markdownpart-${PV}:${SLOT}
-	>=sys-block/partitionmanager-${PV}:${SLOT}
-	>=sys-libs/kpmcore-${PV}:${SLOT}
-	cups? ( >=kde-apps/print-manager-${PV}:${SLOT} )
-	floppy? ( >=kde-apps/kfloppy-${PV}:${SLOT} )
-	gpg? ( >=kde-apps/kgpg-${PV}:${SLOT} )
-	webengine? ( >=kde-apps/kimagemapeditor-${PV}:${SLOT} )
-"
-# Optional runtime deps: kde-apps/ark
-RDEPEND="${RDEPEND}
-	7zip? ( app-arch/p7zip )
-	lrz? ( app-arch/lrzip )
-	rar? ( || (
-		app-arch/rar
-		app-arch/unrar
-		app-arch/unar
-	) )
-"
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 07784951e8ec..3c0259789928 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,7 +1,5 @@
 DIST kdf-20.12.3.tar.xz 467360 BLAKE2B fabff3ee3f7f2f33ba0667f61ec42cd7e4655b82c620afe655ecef2d3ba4329d2670f80dd97e214bb52b93d1e0c0355d5cb0932ab013c096492ff0e74762d9de SHA512 9b799221e9eaefc57f602c927a08c391792ac919e9d100508ec55ff63be2218048a19496157045f6376629625cf4398ca3efd74ec52f815b2400e63995e0c714
-DIST kdf-21.04.2.tar.xz 472396 BLAKE2B 61c49290d58bbb949b63a20c439cccc22b99937da4d2ae573af60cc31ea1c6e15b0d816e73eb9f63594b555d597e53c940f98bf85b9cc26010db2c5ac6b04fe7 SHA512 af0f66fcacc46feb4af17fbaf537f652db7a88c6c3896162cfd71dead1f8cf6dc93a31d2bab632cd4cb89a94712f456f8372d3b59a4e9882e2fa915dc1d9fd17
 DIST kdf-21.04.3.tar.xz 472424 BLAKE2B a11b644ed4b4cd3ce841412d0b1d65eb2d5a863936b0b7d6cecb42beb1d1e2db2dbbe7d029a75cd72b81451040471b74cf526c4c657668a75b78f5bb28d2fa23 SHA512 985ec37fade53297e8bbe03aae78a560ec1f69e0c1b093c431e249de340e14e0f372bfe51d15dfdb4c7e0f4fadf3e81aa0b53a6649ce5ce891a837f96fe9e755
 EBUILD kdf-20.12.3.ebuild 911 BLAKE2B 12b3e4a4ba13e5c24509d0f559e5bf7f8f469576055603e5e9b87d7a24eaffd627be7dd8ea8fa4348f7cc524d4e55279abc571d6f02066dba9e2f4180f43e312 SHA512 d4bad9bc1b20ed8d213e7ad72fc64350f45919be64dbb28224ce72f533bcc90b469fc4ef432215340dbfc42970c02d090baead25273a844ea3522b1c8d1c8542
-EBUILD kdf-21.04.2.ebuild 914 BLAKE2B 7c5c0d76e1d54f263d600447bbc9ed6995f7254088af2909d1629f0ac55679d60c519b91e023d5e44e81c5078e4133ec429f452720b1f0c7123d8e21fa69c804 SHA512 47ea3d55aa9634f626fc3ac1acade348b92789d53553ffce710d0eebae201c36502a21ab1b006120dedd0bed0f2f70f3d6a7f417269411f5da1c899e95fe3fd7
 EBUILD kdf-21.04.3.ebuild 914 BLAKE2B 7c5c0d76e1d54f263d600447bbc9ed6995f7254088af2909d1629f0ac55679d60c519b91e023d5e44e81c5078e4133ec429f452720b1f0c7123d8e21fa69c804 SHA512 47ea3d55aa9634f626fc3ac1acade348b92789d53553ffce710d0eebae201c36502a21ab1b006120dedd0bed0f2f70f3d6a7f417269411f5da1c899e95fe3fd7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-21.04.2.ebuild b/kde-apps/kdf/kdf-21.04.2.ebuild
deleted file mode 100644
index 12e906303829..000000000000
--- a/kde-apps/kdf/kdf-21.04.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE free disk space utility"
-HOMEPAGE="https://apps.kde.org/kdf/ https://utils.kde.org/projects/kdf/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index b7156ab7eadc..33b4cb952277 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,7 +1,5 @@
 DIST kdialog-20.12.3.tar.xz 108492 BLAKE2B 882cac8b2318fb879737085d3ccc59b121117a4ffca82326d89ed4aad9c66f9c32772da9a723dd6d17d31a400dd11a32d6c9cc4e894d35a16e6eea2a09be6f18 SHA512 09794892b150b8e9637f74971432c231c8abe9f2355b2c0c0ddd2527b5512d024a81f2d3dbab4dfd381495f729d4cb474caa46cfa8784f396abe223f989e243b
-DIST kdialog-21.04.2.tar.xz 114132 BLAKE2B 20100272ce8c9b9e26629f23dcf91f56d6b11a5af5dd9f5061d3b298b6f596bb13f59d53cb10d036aab70085213cc7d5f58c42b3d30d4523cef04b17ce6fbf9a SHA512 1b3a2565a05501bfc335255c505cadd97921b38429c5e160c9495262d812aea3f725e8dfdbad76e9c1d5488e0eb5b2730eb0db1247bc71b8105d86786b14d9a1
 DIST kdialog-21.04.3.tar.xz 114572 BLAKE2B c983944e77e92b6a2f4794294533e8276460fd229b64321fed49b45e69622eb2f11c5eb2a212e6882dd72ea656a476f37573c31e146843298b485bcd36beee50 SHA512 019dd95dd56881eb84f3187fe623e55df947f2ec61eccd57bf2731001f7e7594234b2a800cbc09526bafafc8b2fa78c29a445b578e52c7405936f2eb1bc4dfb2
 EBUILD kdialog-20.12.3.ebuild 1036 BLAKE2B 5ab55aec09e5eb85bebf2f989b40f18a65c67c10a45d3b37cec32a75e86a90178cb96bc0563350ed94e7a35428f0f8fcca96b935f4f9dd0aa273a0b64dea7b77 SHA512 dfc2be8db024b6301a127c25683a76ade646db40f3ed20f215d4ed866719478cba6af111136bcb41b9fcc6dd5d5ca0ff7a62bf5a7f58b8eaa015835fae3a34f9
-EBUILD kdialog-21.04.2.ebuild 1039 BLAKE2B 328f1730311da65343889dc1fa8196cd4646c6968a729a79fd9be995b6e9824a1b0fbe67a34bc908ef2ca69c809db41bace8fdb25451bfd6f4b6981de1e611aa SHA512 1b7ae3225fbb35d106c0661d4c856bc5992cd894e785706da1a8229231004c23d8dee871d60af8efb0d81ab1acf0a91d9d92b7c344c6a82e2881e66358205276
 EBUILD kdialog-21.04.3.ebuild 1039 BLAKE2B 328f1730311da65343889dc1fa8196cd4646c6968a729a79fd9be995b6e9824a1b0fbe67a34bc908ef2ca69c809db41bace8fdb25451bfd6f4b6981de1e611aa SHA512 1b7ae3225fbb35d106c0661d4c856bc5992cd894e785706da1a8229231004c23d8dee871d60af8efb0d81ab1acf0a91d9d92b7c344c6a82e2881e66358205276
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-21.04.2.ebuild b/kde-apps/kdialog/kdialog-21.04.2.ebuild
deleted file mode 100644
index 036e456878cc..000000000000
--- a/kde-apps/kdialog/kdialog-21.04.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-HOMEPAGE="https://apps.kde.org/kdialog/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 656946ba1c56..d82cc85e8a19 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,7 +1,5 @@
 DIST kdiamond-20.12.3.tar.xz 4698168 BLAKE2B 8aa5330c4ff34828dbd044abdebe1b186a5525d83adfbbb9bdbc72abba6a782d634ef43cf603997a7458f252ac9d236115245420bf8a8b152b8c70ec89d55e88 SHA512 f7eb5dbdeb709290a2cdb46b03f829ac111ea629dc49d81d61ce0f32eeaf0f23fcf234cd20d44a54013e93dc42e867b0dd802d54ec624d3ab4b5b9c1e8ce8c75
-DIST kdiamond-21.04.2.tar.xz 4697848 BLAKE2B b433c02e17fd3788aa752b0e1eb9a47c1309674341f1d59be875eb4bf9877b7f1e33612786b9b0ea6cb42e9e9a86706a4face2222fad42e539df898f3dabd566 SHA512 3a6f61c3538e68a70c37cca96fe9112c4be36cf1640e39f31bf0c84a5d9efe904a05669440448431a4fa91bf67ba1a0d415f2862f347ab24a37f83183c116889
 DIST kdiamond-21.04.3.tar.xz 4697872 BLAKE2B c7950cba2906649988fbad4dc34b670a39aba9dcd49f4087c9df41c7f85adec9ae5a44e82541d442a843765d312920f2119e45ae8be1000af1e63691158c227b SHA512 a4d3d308ba6529b3bad47cd9d4c916c0d4960e963d7fd9aaee95fdf2884fbcec7e5cb3c9c003b65e2441a8d5190efd05cdb6bae846efa9a4cf355fdd3de941df
 EBUILD kdiamond-20.12.3.ebuild 940 BLAKE2B f1f8b02f7179f9edf08706cdd31c1da9ac7ab672c766c6960f5a056c6e7eff7b309779d092076ac4794ed7b788e590551ef0efb0f3c13e93e73ee0835347c8b8 SHA512 f1d011ac5afcaf764c0937506faf379f8482b060a04e4a07f2f96f749f957de85a0231f9488bad36e8c49eb1a3b29aad53fcb01d383d5691cb5b02b9cf1d79c9
-EBUILD kdiamond-21.04.2.ebuild 943 BLAKE2B 2a2524c6f8ce4086f737c4db6a1eff6b6bdb3269d1867804ca58ff86805f33b2366fdef77497725ad231d7bc86f63ee4aa87b483500e9e02c53bc2049b324b92 SHA512 c661fa267f0f7fdd6f2b50eb1de58845b6d8e0daf2f68f7a7a340bbc914793a5c221af17697943be7448489a74ad3db63d9ab95a838749c089a14225ed23517e
 EBUILD kdiamond-21.04.3.ebuild 943 BLAKE2B 2a2524c6f8ce4086f737c4db6a1eff6b6bdb3269d1867804ca58ff86805f33b2366fdef77497725ad231d7bc86f63ee4aa87b483500e9e02c53bc2049b324b92 SHA512 c661fa267f0f7fdd6f2b50eb1de58845b6d8e0daf2f68f7a7a340bbc914793a5c221af17697943be7448489a74ad3db63d9ab95a838749c089a14225ed23517e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-21.04.2.ebuild b/kde-apps/kdiamond/kdiamond-21.04.2.ebuild
deleted file mode 100644
index aa313f95f419..000000000000
--- a/kde-apps/kdiamond/kdiamond-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Single player three-in-a-row game"
-HOMEPAGE="https://apps.kde.org/kdiamond/
-https://games.kde.org/games/kdiamond/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 1d3737c718c0..200e850b6ef3 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,7 +1,5 @@
 DIST keditbookmarks-20.12.3.tar.xz 191892 BLAKE2B f72d2429258d8d3f912c74a0a972a4c07131f021bc7f1d5052e5347cc2bac2910f6827b014c18ea829f5adb4ca36e42cc9fe30c77df6e7b7ed6506cc068909ac SHA512 6b8341f94e1d170994100e0fd06f0cf7bac7e5b1ad31f595f74b3bff980e0b7ac286f985b7d4bf83bd6f29a4540d89b2d964cabc46dd95769e8e823536f873f7
-DIST keditbookmarks-21.04.2.tar.xz 200700 BLAKE2B 06ce0a9716eaefe033db1b5f156718acfc43c39885b6f7f7964dfa209d07148b5ff5529bad9d061a3367893a43fbb8da2dd1528a870a1eb81699b14935861aab SHA512 8240935875c5a9e7ffa76a52bf7ad223f045a248ff7c4be2d7e1aaabb560b33d5bbbab6a8149df0a8cb0ebea8c998b3fb9fbc01783fc2befb56015b88b95a2b6
 DIST keditbookmarks-21.04.3.tar.xz 200720 BLAKE2B a8e5ba51e7c602a3792f13a999e353875577553a3844f3871cb40f89f0c0b35d3d32bc84b9b1bfbbf16743d32ce05cb50a87ddcbcab6bf7b6e24e5d597a259bf SHA512 1467e909cabeec95e235317333b601731daf44866df4106e06dca02c41b647527552e7307bd8ec0762fc2cf31d21a40dd7592ce9f64f8628cd89a886ee292b13
 EBUILD keditbookmarks-20.12.3.ebuild 1161 BLAKE2B 9350a787363d93ce2cf7981608decbd5d2b99ad02d83eebb9b473db4e26751efe7c6cebf717d0a378b1d6541e6eb3239abe4b71949db83e1d89f24426ad4615b SHA512 698dd495dcdba0c26d46f2acbd783fc317a9fcfd9f283784e90c0ca63a92249250a860b854a87fa84124b615f192aed91195d6892571590b7082127c1d702d36
-EBUILD keditbookmarks-21.04.2.ebuild 1165 BLAKE2B 3a3cb0b5b25108a2d7f5057ee515da352830ea6896017ac6a4ce64a64c94656df6e6a49ae5dd278da3a141cd388ac3daae948afd822cb58cda6813de823b75d7 SHA512 055456db8eda052647a65aa446f9695512431ba293e1441eea752e8a74930481e129ff321ee48ee6c68a821e1b88813b5217db4696078cfd6b816e59f3aca62d
 EBUILD keditbookmarks-21.04.3.ebuild 1165 BLAKE2B 3a3cb0b5b25108a2d7f5057ee515da352830ea6896017ac6a4ce64a64c94656df6e6a49ae5dd278da3a141cd388ac3daae948afd822cb58cda6813de823b75d7 SHA512 055456db8eda052647a65aa446f9695512431ba293e1441eea752e8a74930481e129ff321ee48ee6c68a821e1b88813b5217db4696078cfd6b816e59f3aca62d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/keditbookmarks/keditbookmarks-21.04.2.ebuild b/kde-apps/keditbookmarks/keditbookmarks-21.04.2.ebuild
deleted file mode 100644
index d3d7f8341b42..000000000000
--- a/kde-apps/keditbookmarks/keditbookmarks-21.04.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Bookmarks editor based on KDE Frameworks"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+man"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use man ; then
-		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
-	fi
-}
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 1b8bd2d5ecb5..90a77c61f036 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,7 +1,6 @@
+AUX kfind-21.04.3-unused-dep.patch 9231 BLAKE2B 35c67d692f8920008758bf0b4a586c2cc711f8a819a7aea4f06e70cf7f4671ec7898701dc9dfeb6cbd84e0187ab05f4b9d77d38a2986d6474b2d44330e116a10 SHA512 5d80bd47d116199ab8138fcd53cbbc2f1ff992c6017d3e8d2c10696c7b4ad5db4a4a6b72984665309086bde791284725e8d44039838f57bd334c42208077d20e
 DIST kfind-20.12.3.tar.xz 278656 BLAKE2B d117d3eefa73d6e716818861c68b928e255a44e594d0da5ff8d05d5cb7509fbe2b6c26558fbe4dc13afa0f05a54f69802de454ebb8e902264413af7037c5b803 SHA512 e66ef911138c844ddad606b31c9075b8b0d3984315e52f95beb6f3035d8ddbf16a40bc1390d4d7ef1e93eaf27aeb4d1b1566db3db0d1b26691c8dea443b0eca9
-DIST kfind-21.04.2.tar.xz 284348 BLAKE2B 017d47e8f2e973fce52642e5846a43f8e969c943740feaca068f0222adff13ab36f580064826eaa4977424093ba7cd8ff24d0d04302a826add878dd3310c24f2 SHA512 cf570904e2b93cd138594b07d60f85f83ac1d3d921522e909146fd03115211c2d6200bfd5f146a44dbca55e8b1232c44df0273d23b20b237454a7a036bfa5bbc
 DIST kfind-21.04.3.tar.xz 284312 BLAKE2B dedca9757ccde97cc3446c73fa0acbf53303edd2f03be0ef236d12c833a10eb0a19bf138d209e85a8d1c50872bfb848758114f73f5da2e613c38b60a776ec1f5 SHA512 bfb985228e7fd96f6c88dff8792e64a1ccf9e999155acfce76de6cb434b02aab92bcb4c8473399a9de59049138809149f33b423bc46d47abc8b7ea4966bfd61c
 EBUILD kfind-20.12.3.ebuild 966 BLAKE2B 15bbf8cf4df3354d6088b90c11dbf19f38b13f755e9908ba351bb90e173814db02fc7b97bf4a5e6c90fa80682ab749774f9d4ad5075d20c00ce6e1f647e98bc7 SHA512 58a8a656963a400bcd6c6920024e0d69f73a0b98e284c9cc7a9e61605c40a6a6de799bdfe7c928045fab66017a27b078b3d9cb0abad0e47b3091999c9f45be1d
-EBUILD kfind-21.04.2.ebuild 969 BLAKE2B 3cb57be3e181ce32063d08c765dfad77a1672b324a99b8f127b722c8f399fdaf17bbe6fb36b9a19982a4244ccd77d1d192954596bd77498481cede33e631c2fc SHA512 736a06e060a750fd0abd8e36fb2c85c255560eeb69949763c495962f1ea8291f80c9979318858722237113625a3761b0c26b51979ab110ae48c755da0918e106
-EBUILD kfind-21.04.3.ebuild 969 BLAKE2B 3cb57be3e181ce32063d08c765dfad77a1672b324a99b8f127b722c8f399fdaf17bbe6fb36b9a19982a4244ccd77d1d192954596bd77498481cede33e631c2fc SHA512 736a06e060a750fd0abd8e36fb2c85c255560eeb69949763c495962f1ea8291f80c9979318858722237113625a3761b0c26b51979ab110ae48c755da0918e106
+EBUILD kfind-21.04.3-r1.ebuild 1018 BLAKE2B f82afb0eff4a459cccd210a76b7d4cd94b07c819f0a61333f6087902abc23d209761ac0cc3d1ee7545b205b44ed77390e16e4df20a1a8081c88bb5adfc54b24c SHA512 2e2e756768a92b60a7ce40f39f20ac9fb4e3c4c9ab59931364e167238857906055d65e43cdf5b2725e0b5480c7895bbf878fe1f747cdcd69c7f8d75b0ae8794c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch b/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch
new file mode 100644
index 000000000000..f348bf39b5d6
--- /dev/null
+++ b/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch
@@ -0,0 +1,272 @@
+From b23e8823d7c950b43259b8750f0d14c19fa5f31c Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Sat, 22 May 2021 07:15:04 +0200
+Subject: [PATCH] Clean up defunct KRegExpEditorInterface code
+
+This code is deprecated, defunct and partly commented out for years.
+---
+ CMakeLists.txt     |  1 -
+ src/CMakeLists.txt |  1 -
+ src/kftabdlg.cpp   | 48 +---------------------------------------------
+ src/kftabdlg.h     |  4 ----
+ src/kquery.cpp     | 31 +++++++-----------------------
+ src/kquery.h       |  3 +--
+ 6 files changed, 9 insertions(+), 79 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4587dd278..1c867f5b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,7 +38,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     FileMetaData
+     I18n
+     KIO
+-    TextWidgets
+     WidgetsAddons
+ )
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 97d81a963..d24b5f4b0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -22,7 +22,6 @@ KF5::CoreAddons
+ KF5::FileMetaData
+ KF5::I18n
+ KF5::KIOWidgets
+-KF5::TextWidgets
+ KF5::WidgetsAddons
+ KF5::XmlGui
+ )
+diff --git a/src/kftabdlg.cpp b/src/kftabdlg.cpp
+index ddb9c7be0..f2c6cbf7a 100644
+--- a/src/kftabdlg.cpp
++++ b/src/kftabdlg.cpp
+@@ -29,8 +29,6 @@
+ #include <KLineEdit>
+ #include <KLocalizedString>
+ #include <KMessageBox>
+-#include <KRegExpEditorInterface>
+-#include <KServiceTypeTrader>
+ #include <KSharedConfig>
+ #include <KShell>
+ #include <KUrlComboBox>
+@@ -55,7 +53,6 @@ struct MimeTypes
+ 
+ KfindTabWidget::KfindTabWidget(QWidget *parent)
+     : QTabWidget(parent)
+-    , regExpDialog(nullptr)
+ {
+     // This validator will be used for all numeric edit fields
+     //KDigitValidator *digitV = new KDigitValidator(this);
+@@ -307,7 +304,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
+ 
+     caseContextCb = new QCheckBox(i18n("Case s&ensitive"), pages[2]);
+     binaryContextCb = new QCheckBox(i18n("Include &binary files"), pages[2]);
+-    regexpContentCb = new QCheckBox(i18n("Regular e&xpression"), pages[2]);
+ 
+     const QString binaryTooltip
+         = i18n("<qt>This lets you search in any type of file, "
+@@ -315,13 +311,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
+                "program files and images).</qt>");
+     binaryContextCb->setToolTip(binaryTooltip);
+ 
+-    QPushButton *editRegExp = nullptr;
+-    if (!KServiceTypeTrader::self()->query(QStringLiteral("KRegExpEditor/KRegExpEditor")).isEmpty()) {
+-        // The editor is available, so lets use it.
+-        editRegExp = new QPushButton(i18n("&Edit..."), pages[2]);
+-        editRegExp->setObjectName(QStringLiteral("editRegExp"));
+-    }
+-
+     metainfokeyEdit = new KLineEdit(pages[2]);
+     metainfoEdit = new KLineEdit(pages[2]);
+     QLabel *textMetaInfo = new QLabel(i18nc("as in search for", "fo&r:"), pages[2]);
+@@ -387,15 +376,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
+         watcher->deleteLater();
+     });
+ 
+-    if (editRegExp) {
+-        // The editor was available, so lets use it.
+-        connect(regexpContentCb, &QCheckBox::toggled, editRegExp, &QPushButton::setEnabled);
+-        editRegExp->setEnabled(false);
+-        connect(editRegExp, &QPushButton::clicked, this, &KfindTabWidget::slotEditRegExp);
+-    } else {
+-        regexpContentCb->hide();
+-    }
+-
+     // Layout
+     tmp = sizeEdit->fontMetrics().boundingRect(QStringLiteral(" 00000 ")).width();
+     sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height());
+@@ -405,7 +385,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
+     grid2->addWidget(textL, 1, 0);
+     grid2->addWidget(typeBox, 0, 1, 1, 3);
+     grid2->addWidget(textEdit, 1, 1, 1, 3);
+-    grid2->addWidget(regexpContentCb, 2, 2);
+     grid2->addWidget(caseContextCb, 2, 1);
+     grid2->addWidget(binaryContextCb, 3, 1);
+ 
+@@ -416,11 +395,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
+ 
+     metainfokeyEdit->setText(QStringLiteral("*"));
+ 
+-    if (editRegExp) {
+-        // The editor was available, so lets use it.
+-        grid2->addWidget(editRegExp, 2, 3);
+-    }
+-
+     addTab(pages[0], i18n("Name/&Location"));
+     addTab(pages[2], i18nc("tab name: search by contents", "C&ontents"));
+     addTab(pages[1], i18n("&Properties"));
+@@ -532,25 +506,6 @@ void KfindTabWidget::loadHistory()
+     }
+ }
+ 
+-void KfindTabWidget::slotEditRegExp()
+-{
+-#if 0
+-    if (!regExpDialog) {
+-        regExpDialog = KServiceTypeTrader::createInstanceFromQuery<QDialog>(QStringLiteral("KRegExpEditor/KRegExpEditor"), QString(), this);
+-    }
+-
+-    KRegExpEditorInterface *iface = qobject_cast<KRegExpEditorInterface *>(regExpDialog);
+-    if (!iface) {
+-        return;
+-    }
+-
+-    iface->setRegExp(textEdit->text());
+-    if (regExpDialog->exec()) {
+-        textEdit->setText(iface->regExp());
+-    }
+-#endif
+-}
+-
+ void KfindTabWidget::setFocus()
+ {
+     nameBox->setFocus();
+@@ -771,8 +726,7 @@ void KfindTabWidget::setQuery(KQuery *query)
+ 
+     query->setShowHiddenFiles(hiddenFilesCb->isChecked());
+ 
+-    query->setContext(textEdit->text(), caseContextCb->isChecked(),
+-                      binaryContextCb->isChecked(), regexpContentCb->isChecked());
++    query->setContext(textEdit->text(), caseContextCb->isChecked(), binaryContextCb->isChecked());
+ }
+ 
+ void KfindTabWidget::getDirectory()
+diff --git a/src/kftabdlg.h b/src/kftabdlg.h
+index e2a4912d6..336835a06 100644
+--- a/src/kftabdlg.h
++++ b/src/kftabdlg.h
+@@ -23,7 +23,6 @@ class QString;
+ class QDate;
+ class QRegExp;
+ class KDateComboBox;
+-class QDialog;
+ class KComboBox;
+ class QSpinBox;
+ class QLabel;
+@@ -60,7 +59,6 @@ private Q_SLOTS:
+     void getDirectory();
+     void fixLayout();
+     void slotSizeBoxChanged(int);
+-    void slotEditRegExp();
+ 
+ Q_SIGNALS:
+     void startSearch();
+@@ -112,8 +110,6 @@ private:
+     QSpinBox *sizeEdit;
+     QCheckBox *caseContextCb;
+     QCheckBox *binaryContextCb;
+-    QCheckBox *regexpContentCb;
+-    QDialog *regExpDialog;
+ 
+     QUrl m_url;
+ 
+diff --git a/src/kquery.cpp b/src/kquery.cpp
+index 91e45ed07..c6c7327bf 100644
+--- a/src/kquery.cpp
++++ b/src/kquery.cpp
+@@ -35,7 +35,6 @@ KQuery::KQuery(QObject *parent)
+     , m_recursive(false)
+     , m_casesensitive(false)
+     , m_search_binary(false)
+-    , m_regexpForContent(false)
+     , m_useLocate(false)
+     , m_showHiddenFiles(false)
+     , job(nullptr)
+@@ -458,19 +457,11 @@ void KQuery::processQuery(const KFileItem &file)
+                 str.remove(xmlTags);
+             }
+ 
+-            if (m_regexpForContent) {
+-                if (m_regexp.indexIn(str) >= 0) {
+-                    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
+-                    found = true;
+-                    break;
+-                }
+-            } else {
+-                if (str.indexOf(m_context, 0, m_casesensitive ? Qt::CaseSensitive : Qt::CaseInsensitive) != -1) {
+-                    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
+-                    found = true;
+-                    break;
+-                }
+-            }
++	if (str.indexOf(m_context, 0, m_casesensitive ? Qt::CaseSensitive : Qt::CaseInsensitive) != -1) {
++	    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
++	    found = true;
++	    break;
++	}
+             qApp->processEvents();
+         }
+ 
+@@ -484,25 +475,17 @@ void KQuery::processQuery(const KFileItem &file)
+     m_foundFilesList.append(QPair<KFileItem, QString>(file, matchingLine));
+ }
+ 
+-void KQuery::setContext(const QString &context, bool casesensitive, bool search_binary, bool useRegexp)
++void KQuery::setContext(const QString &context, bool casesensitive, bool search_binary)
+ {
+     m_context = context;
+     m_casesensitive = casesensitive;
+     m_search_binary = search_binary;
+-    m_regexpForContent = useRegexp;
+-    if (!m_regexpForContent) {
+-        m_regexp.setPatternSyntax(QRegExp::Wildcard);
+-    } else {
+-        m_regexp.setPatternSyntax(QRegExp::RegExp);
+-    }
++    m_regexp.setPatternSyntax(QRegExp::Wildcard);
+     if (casesensitive) {
+         m_regexp.setCaseSensitivity(Qt::CaseSensitive);
+     } else {
+         m_regexp.setCaseSensitivity(Qt::CaseInsensitive);
+     }
+-    if (m_regexpForContent) {
+-        m_regexp.setPattern(m_context);
+-    }
+ }
+ 
+ void KQuery::setMetaInfo(const QString &metainfo, const QString &metainfokey)
+diff --git a/src/kquery.h b/src/kquery.h
+index 285b37214..2e581765c 100644
+--- a/src/kquery.h
++++ b/src/kquery.h
+@@ -38,7 +38,7 @@ public:
+     void setPath(const QUrl &url);
+     void setFileType(int filetype);
+     void setMimeType(const QStringList &mimetype);
+-    void setContext(const QString &context, bool casesensitive, bool search_binary, bool useRegexp);
++    void setContext(const QString &context, bool casesensitive, bool search_binary);
+     void setUsername(const QString &username);
+     void setGroupname(const QString &groupname);
+     void setMetaInfo(const QString &metainfo, const QString &metainfokey);
+@@ -93,7 +93,6 @@ private:
+     QString m_metainfokey;
+     bool m_casesensitive;
+     bool m_search_binary;
+-    bool m_regexpForContent;
+     bool m_useLocate;
+     bool m_showHiddenFiles;
+     QByteArray bufferLocate;
+-- 
+GitLab
+
diff --git a/kde-apps/kfind/kfind-21.04.2.ebuild b/kde-apps/kfind/kfind-21.04.2.ebuild
deleted file mode 100644
index d5983326c0e5..000000000000
--- a/kde-apps/kfind/kfind-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="File finder utility based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kfind/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
diff --git a/kde-apps/kfind/kfind-21.04.3-r1.ebuild b/kde-apps/kfind/kfind-21.04.3-r1.ebuild
new file mode 100644
index 000000000000..96d049f4505a
--- /dev/null
+++ b/kde-apps/kfind/kfind-21.04.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="File finder utility based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kfind/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
diff --git a/kde-apps/kfind/kfind-21.04.3.ebuild b/kde-apps/kfind/kfind-21.04.3.ebuild
deleted file mode 100644
index d5983326c0e5..000000000000
--- a/kde-apps/kfind/kfind-21.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="File finder utility based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kfind/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 15312a50e9e8..7d23ba9bc39b 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,7 +1,5 @@
 DIST kfloppy-20.12.3.tar.xz 204260 BLAKE2B f66f9cc1ac3cc6ad6ad01658d3599671608416aafbc8d57bfc1b12a5728584db215557cda3c5b798fcb10484b384fdf013823b68a5b715bfd2814f41b6905c89 SHA512 5220a465fbcb9feeed5f572d26ae4c2cf4eaf2aad68d66e102e3b6d24521d6997582bcb27484c39bb257ffdb19b93239dfe791890edec94af68879e8e10179c6
-DIST kfloppy-21.04.2.tar.xz 210700 BLAKE2B c88158d766411e46eb06bfdac378232f74378ebe0348be8e1816643f77724ccad99f5b202a7ef009d771a347f941377d9918936cfa48814e780aa029570ed263 SHA512 2dcd57c2a5fc0af03e5d58344c46dda1e852070772c76cffae429e021bf7200b479ff3048e18eac8871821f094736a125bc3970849b49ebffcb1994405f57e0c
 DIST kfloppy-21.04.3.tar.xz 210652 BLAKE2B 0523382affe56fc7fa114222a4594d819fe613b7c80d0a6b80abc8ebe4c961dee830363cd9a6d20f32a435fd4e507d57936a5653338749a8f588771dcbb7a9f0 SHA512 daba93610e07a49487d1570b270846a942a4ddda363aa12ef93697816f08e8a60d66830cc8b520a86d27d45a8e8a951422c099dd6454cabacad305b5cc2664c3
 EBUILD kfloppy-20.12.3.ebuild 871 BLAKE2B dc3d97426d7d92ed821a7ea648eca1b4de1da3aee6fca31fad0c849538acaefeffbf9c1afc14e6a7aba896499f32c01170ada8e18a39210a815a41e298e1a240 SHA512 6af9268f63ee83062f0f802b964fe11d2e79028c79130b17ba278ec2e64c60060236b257b4df134faacfdd4187182e6a618105dc0035548b6f9bed9954964f6e
-EBUILD kfloppy-21.04.2.ebuild 874 BLAKE2B 08f7406fa64ac14a484209f1471ed842142458bfcb707f22483453268c9eecb11df37ca2d367b9f95cc998c2cbb6697efb1d2e63166bfef8a5e2f08c499a165a SHA512 6a21de542f940d1677eecf251b0efdea7eb3a28eebc853e828311d52255bed5d0d66c8326c47c69f77aa2d33ef334ff930a73d5edb74b831298590b2fb5ae7bf
 EBUILD kfloppy-21.04.3.ebuild 874 BLAKE2B 08f7406fa64ac14a484209f1471ed842142458bfcb707f22483453268c9eecb11df37ca2d367b9f95cc998c2cbb6697efb1d2e63166bfef8a5e2f08c499a165a SHA512 6a21de542f940d1677eecf251b0efdea7eb3a28eebc853e828311d52255bed5d0d66c8326c47c69f77aa2d33ef334ff930a73d5edb74b831298590b2fb5ae7bf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-21.04.2.ebuild b/kde-apps/kfloppy/kfloppy-21.04.2.ebuild
deleted file mode 100644
index 78c99e35cadd..000000000000
--- a/kde-apps/kfloppy/kfloppy-21.04.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
-HOMEPAGE="https://apps.kde.org/kfloppy/
-https://utils.kde.org/projects/kfloppy/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index 8c1e31743fb0..5ddc1dab2984 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,7 +1,5 @@
 DIST kfourinline-20.12.3.tar.xz 643812 BLAKE2B e26183d894b4f89c5edd2aff739d9c9c1c16ab0a45fd29070cbe9d0eeae8dbb062e95e6e92a74123fe582b4a62bb558a97d18d1940ae7d8edeff3a6b6d4addb5 SHA512 76792c00f6a2a0a5cd43d4441da5723b4c1ec79021d8fcdd66857ac222b25a80978014eb5878f05d4c091443a664d20fc5a2f25af8ec65f815d7a501775d3f83
-DIST kfourinline-21.04.2.tar.xz 650616 BLAKE2B 915cd3aed836ce30fcece241b88c50c841e41134ec2cd014cb9e6459541b9d9fdc46888d7595755a22bd2f4266f859001e7701bc0fef35f8632441d45ac5a657 SHA512 f60eefad7fd25007c01673189326c6d10409e35b6fb26b3e71e06f5bf735b6592a77290715e7568ced18b1bc33f126a8d95856b8b677ba35aff37a3b6d00b10e
 DIST kfourinline-21.04.3.tar.xz 650648 BLAKE2B 1c1c43fa677a3c3ad4a84d877ea9a3f3db8f978104dcf696ecafcf80696f0835a8f40e41db8e7c1c650d0d1c3933e05d17c823153344cbd57dab8e14471934bf SHA512 29460df6c7f0529d4b82a1e30256bb5629bbeacabaa78b843837f6b4c084f07a9748ca8dd41e2a41acb3a5f81662ef224f0ed508714f9f4e53ca33bab64099fe
 EBUILD kfourinline-20.12.3.ebuild 870 BLAKE2B 2625ccd1fb472b569746b917c4a9e70a079e538752ab7528e290b00c2280662c3926a23e6f073917f3635c321852e3189207555d1f361b8e6ebbfea74883c804 SHA512 4a6519f7b9b508585de91fa0b940c089e1d1a1539763f895bbd40d73b1c518e35e4d5d463b0050b0e85c73a5c7ad3c0c5ff3fee40d236622321580fed6cd9bc9
-EBUILD kfourinline-21.04.2.ebuild 873 BLAKE2B 6b16391e03bc607470b0bfda433acbb3373d2247f4a477dad752f1fc1c610a83f58d7b7fe17de8667c584f9b75ead86a6adb39038173c3cbfa472903b12a85bc SHA512 a413ec6bcbbe2ee22c8cd5563ae7bdb700914ab81f74e654d9bbc9571bd295f48f19760617a03b123bde1941e808c6fcccfcb992b70c51276ac112f5e29a86d1
 EBUILD kfourinline-21.04.3.ebuild 873 BLAKE2B 6b16391e03bc607470b0bfda433acbb3373d2247f4a477dad752f1fc1c610a83f58d7b7fe17de8667c584f9b75ead86a6adb39038173c3cbfa472903b12a85bc SHA512 a413ec6bcbbe2ee22c8cd5563ae7bdb700914ab81f74e654d9bbc9571bd295f48f19760617a03b123bde1941e808c6fcccfcb992b70c51276ac112f5e29a86d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-21.04.2.ebuild b/kde-apps/kfourinline/kfourinline-21.04.2.ebuild
deleted file mode 100644
index 31e97beea496..000000000000
--- a/kde-apps/kfourinline/kfourinline-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE four-in-a-row game"
-HOMEPAGE="https://apps.kde.org/kfourinline/
-https://games.kde.org/games/kfourinline/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index 1928ac978ab5..dfb86d3b90a3 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,7 +1,5 @@
 DIST kgeography-20.12.3.tar.xz 10764016 BLAKE2B fb24cbe5ca7b3c8febe8da4bfe9649d5d05462f2a6aeef8e4a99458f6433c66a1003506a6837fe83c2911794687be73993a91511f4f1e20b28e87c42de8c0a9e SHA512 b77f334c063364608875f783795b362aefd0360af1e06f6a3a2eb8047ab3f84a6853bde23e76e38f3f4ca5c348d358551af79fb8290e26d9d6615752df9746ab
-DIST kgeography-21.04.2.tar.xz 10995324 BLAKE2B fb758698cd6a8aa124e33bbdd08c26c3e5923cf71a685573765e12720173ddc4b5ffc7e1cb802048d4303e18eae59000d06295bec98cd647a69bae3a428e9a47 SHA512 2cbc9f118aa798b44a49db638368969044612a0101baee50c379717dc693194f26e05a8afc986115d776944dac9491f3fb7bae91bb935ca96807d0e1ec18518f
 DIST kgeography-21.04.3.tar.xz 11001764 BLAKE2B d8836df12e469c5e3ffe8ce32956eb17bb51d4f6d0d9df4173e944edc7c0d1e0ce41b8ac67d5a0675d8b3244aab063adf91a193b8a27be909a2201215fbc811d SHA512 92be1d653d4b7019bff9018cc9bfe4550326ff4aebf1d63d5b5752cc6b0169d34a8613837ed7e8c27dca827cfa27ae1035de96a2dd1cf0346a3bd2aa4f0126f3
 EBUILD kgeography-20.12.3.ebuild 818 BLAKE2B 6af3646057ef853e652f0f3fa5ae5c083147f1887715bd2c27f1defa2ee098464401c49c48ad27f2b380130621a54f1100d4a1e2fb2d433c31353cf4b10ff573 SHA512 cc5f6449cd96bfebdb19434e92f07a32d89b226207f13ba32c435e6fe1ec907e763087ea051c4959b0551e1af28b71248a0b40c1af79da6f718284b6d1066e14
-EBUILD kgeography-21.04.2.ebuild 821 BLAKE2B 828a1098052d0a6c2d18d12a9ee7c88ba28e74e464fc1a9c7f61eb12efef018fdc4c91a013982b7960a5ca8e42419e459110fc624fc3058c35720869b8cf72db SHA512 8adeab11385f0c5e4287a23be36445efc74c20cacdcdacb2ebb57ce512b8aa74bbf8ba502d12041525a03227d78c444d02451ef522d92a4700921eee712316fa
 EBUILD kgeography-21.04.3.ebuild 821 BLAKE2B 828a1098052d0a6c2d18d12a9ee7c88ba28e74e464fc1a9c7f61eb12efef018fdc4c91a013982b7960a5ca8e42419e459110fc624fc3058c35720869b8cf72db SHA512 8adeab11385f0c5e4287a23be36445efc74c20cacdcdacb2ebb57ce512b8aa74bbf8ba502d12041525a03227d78c444d02451ef522d92a4700921eee712316fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-21.04.2.ebuild b/kde-apps/kgeography/kgeography-21.04.2.ebuild
deleted file mode 100644
index 60203484a043..000000000000
--- a/kde-apps/kgeography/kgeography-21.04.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Geography learning tool"
-HOMEPAGE="https://apps.kde.org/kgeography/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 47f8f635916c..e4db474269ef 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,7 +1,5 @@
 DIST kget-20.12.3.tar.xz 5583636 BLAKE2B 174f46a833a5b7d4daae1ef81a6e5c695f97f0855dffebd21c882cd6d43a8725648a0d32cb3a5669ceeae75142cd45822f736ad778ad1b0c07a28daa551a18ec SHA512 f662fcf4915c72a19becd368ef1f069aab14b7a257c810c8290d5ca942446545265c54826588e8a157b009e35a1ea0b21e611085fa2b35976059cf7c19bb1549
-DIST kget-21.04.2.tar.xz 5636068 BLAKE2B 4160da35fe80226c5390bffb6371ccf95f2857f68e2034bf4f2196de2370cf847b656892c2f7deaa9c0d04102699432f0fae7fb4a6495d79b110f999c6b8e003 SHA512 ad65e72cd9f1f227cc84a05a698deaf1d376dba0e4370da0c129694bd2841d6fe3a6867603d56980deaafcd4b4f23a37b5129b1f7d1fe1e5799aabc1a85979eb
 DIST kget-21.04.3.tar.xz 5636204 BLAKE2B d0f5576ab4dd755825f4482de1ce3362197f24181e1e8c922acf039c6b72eb65f205658e34320645cc8a2f40e8e4f19cad09202bbdb478ffeb38ebbacc1c2a28 SHA512 58d2a18d7f918ac161cd19438a4aeeec86e0df85245903cc00fac1cdebe2dca6bf471d12f54301ff9b60899471726c3e410b870ef3aa251f3994e3ee1fb6d30d
 EBUILD kget-20.12.3.ebuild 2153 BLAKE2B 180adcad74dc9545fa1197a29c8c9f1318eb79bba78756d3d0bd49187e53171be0f495216b1c2bbb52c58271eec592da3471b328c6ce6db116e94c538581d251 SHA512 558f009b54b682bc801abd13694282dda41aaf6464c772aca64c474614797ec7dcec876c032534cfec427ab5f8168ff00f8174bce87f26ddd5e347604dba1cba
-EBUILD kget-21.04.2.ebuild 2156 BLAKE2B 70dcb63e4861c9ac40fa97fa2a39f25818a4de8c21914016f0babbbec95ed7b663e95b58e4176cf55aec4983ab813c3e8b66db87978c6a56bc92507c76041111 SHA512 61f6f912564273b629f851312eea279f7e4c077a4804715e07135943481702df31248019cf99d83eaa34aee3e98561ab8e4494d6e56d6a1bf4a482f060b4d37d
 EBUILD kget-21.04.3.ebuild 2156 BLAKE2B 70dcb63e4861c9ac40fa97fa2a39f25818a4de8c21914016f0babbbec95ed7b663e95b58e4176cf55aec4983ab813c3e8b66db87978c6a56bc92507c76041111 SHA512 61f6f912564273b629f851312eea279f7e4c077a4804715e07135943481702df31248019cf99d83eaa34aee3e98561ab8e4494d6e56d6a1bf4a482f060b4d37d
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-21.04.2.ebuild b/kde-apps/kget/kget-21.04.2.ebuild
deleted file mode 100644
index a0ffcb8cf8bc..000000000000
--- a/kde-apps/kget/kget-21.04.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Advanced download manager by KDE"
-HOMEPAGE="https://apps.kde.org/kget/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="bittorrent gpg kde mms sqlite"
-
-RDEPEND="
-	>=app-crypt/qca-2.3.0:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	bittorrent? ( net-libs/libktorrent:5 )
-	gpg? ( app-crypt/gpgme[qt5] )
-	kde? ( kde-plasma/libkworkspace:5 )
-	mms? ( media-libs/libmms )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package bittorrent KF5Torrent)
-		$(cmake_use_find_package gpg Gpgmepp)
-		$(cmake_use_find_package kde LibKWorkspace)
-		$(cmake_use_find_package mms LibMms)
-		$(cmake_use_find_package sqlite Sqlite)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 756817: schedulertest fails, see also upstream commit 45735cfa
-	# filedeletertest hangs.
-	local myctestargs=(
-		-E "(schedulertest|filedeletertest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index eebf2dfd24d2..f0d3ad2647db 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,7 +1,5 @@
 DIST kgoldrunner-20.12.3.tar.xz 4444752 BLAKE2B 302a55ce876fde2e8fc5795dad016a86d91464bef5b9dca3b96357dde37581d2dacdc87d028baf712345027e1ec2ae0757e0a47e0d785f14e85ef3240cf931bd SHA512 0cc72a33d0dee5368c034e7f8f5928531e785abd1a62ade58c24e0975af3ac6ec7e5bf89f07f52be720ce5cd8e5f0d6d4fdd4fa02a5bc8d46ecc5175ad419a4b
-DIST kgoldrunner-21.04.2.tar.xz 4488296 BLAKE2B fcb0f5164ad327f692d774a281c5a113e1aa7c11a718e784bf287eebad82afc9a13dbe8c3b04b11eb62fe5148d57087560431ffead024c19ccf8869922642227 SHA512 5d3e976ab64d7d5b017d44fd8529433bc319e38232b8b5b2dae5af7115693d1230fca7bac47e5828a2388f75343b735efa2cc644d95daa2ef17168ccad98bc63
 DIST kgoldrunner-21.04.3.tar.xz 4488216 BLAKE2B 1ef7a78897181046fc7950c7e36f6e1791414299e7013b43480bc90a119eebff04f76d32543e2d903e1258a61cfe0770f06411ec842a4bc0c8e559e5dbb6219e SHA512 5a4dc8d12755cb7401b9d4588177dec5e8b21ebcff68857e4064c287571255e5e67af8b4996b7c81ab96cd56cb30d6ca25d36265c5c8fe6cd89724865251cdbc
 EBUILD kgoldrunner-20.12.3.ebuild 996 BLAKE2B b783219ba728f18bd6fc0e8114bd3d274cc2952631a0afd39d4b7776a93d2ad0f4cbafdc89bdc8326d8547c2602f4c38a195dd75506906b7fa154bc36a5f177f SHA512 164925573dd3cf4e474297197add0cd9a64ec119678e843d70af8c64cc127c5417c20d823d4264fcd09ef249b6cc4143e0d79642f2083890a14aa6bdff42ae59
-EBUILD kgoldrunner-21.04.2.ebuild 999 BLAKE2B ebdbb8b0a7f0f097c72b24dc818cb3d60fbda004c2e24fe2f20a8aafa999273e6d2265197d2eea8c86a9f46c3b738fd37a7efff09b177f670726dfb4ba37805f SHA512 53a48e04784e70fe8f29ea008c9e28fcf27fd25343e928e3ece330597331b0f2b951a9434eb1e2879abb64bb3c2a0f0d45eea827e08c9a9da73fb2ee8df344fe
 EBUILD kgoldrunner-21.04.3.ebuild 999 BLAKE2B ebdbb8b0a7f0f097c72b24dc818cb3d60fbda004c2e24fe2f20a8aafa999273e6d2265197d2eea8c86a9f46c3b738fd37a7efff09b177f670726dfb4ba37805f SHA512 53a48e04784e70fe8f29ea008c9e28fcf27fd25343e928e3ece330597331b0f2b951a9434eb1e2879abb64bb3c2a0f0d45eea827e08c9a9da73fb2ee8df344fe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-21.04.2.ebuild b/kde-apps/kgoldrunner/kgoldrunner-21.04.2.ebuild
deleted file mode 100644
index 0f68f5ea1e70..000000000000
--- a/kde-apps/kgoldrunner/kgoldrunner-21.04.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Game of action and puzzle solving by KDE"
-HOMEPAGE="https://apps.kde.org/kgoldrunner/
-https://games.kde.org/games/kgoldrunner/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 35f5aedab75e..4cdd35de3393 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,7 +1,5 @@
 DIST kgpg-20.12.3.tar.xz 2892236 BLAKE2B d953c76dcbff262827728088a6f4ed0dc2d94b0436cd3ca2fe6adcb2be066217a93226c187d3239c456a1dec8ebe1558606ed85f206ccd1d84d89ac03775876d SHA512 0816b1a2cf5d1bdc3d01230da57c84b357f8b7b5fd5a1afcab0ae47c257ef3ed3f4be6934db48896905437d9e3276c91c441da7139502c511582eba4bc6cb338
-DIST kgpg-21.04.2.tar.xz 2937432 BLAKE2B 2365f7d3742089047b03502b14d1c9a67cc00529c8d77dabed143772da7ea06c5f643aeeee690e43024e28b6f5886f6f577bc18fceca6f02c1c78230eaa510d9 SHA512 e2c26bc093cafdc41d77beacb161f1695d9d7326f0156f15862dbccc81492bb0976febc898a45bc41f9f438538ee24d517ad250851271740bb9e90c420359499
 DIST kgpg-21.04.3.tar.xz 2937292 BLAKE2B e1362b6dc04d907b6071e5253cc9349b8ae169d138d81ff022e1de17db122f53cb6089aa5e8b6b004a6b677982462248b9250dbe34e0a0d3cb9312f61907814b SHA512 ec59b8c4286e3fc48f4dffa585fc2fcb03c41d0aeaea1da7a861c70b181d84e33c4df0fb5862a2cbf377dac4d9eb6d8b58e817210f663d57e2c704e39dabb65a
 EBUILD kgpg-20.12.3.ebuild 1465 BLAKE2B 0e46ecedba5c3dbc9edde9367b9a311f88b96a35cf8426db94ba26e0645ead331f8d4cb1cd1949ec8f83834264c02a00353aedfd3b76b41e09f30faa1216af0b SHA512 29a39f506fc7e91e27d29ade650f98a0800a8bd7e3b5e680a58628f5594aef1802c2f1c65ec89bf4044ffd8f29943e62c9b7e56f331ac5b7794af3c4046ed0de
-EBUILD kgpg-21.04.2.ebuild 1468 BLAKE2B 38fc5fb9d4170cc19ed2abfe91e01e92e4c1c740be90b9f9f45400e812973157e9fe32cbcf230f7f8108d359f701442e15fd1c07314a3619da558f947a634aea SHA512 897e5f6c4904c39983716b822f30298da73c2d165c995f75da7766fb65a453140b04cb73d879f57669ecfcc65c31df9fa15b785dae6436256b77872c5fff6134
 EBUILD kgpg-21.04.3.ebuild 1468 BLAKE2B 38fc5fb9d4170cc19ed2abfe91e01e92e4c1c740be90b9f9f45400e812973157e9fe32cbcf230f7f8108d359f701442e15fd1c07314a3619da558f947a634aea SHA512 897e5f6c4904c39983716b822f30298da73c2d165c995f75da7766fb65a453140b04cb73d879f57669ecfcc65c31df9fa15b785dae6436256b77872c5fff6134
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-21.04.2.ebuild b/kde-apps/kgpg/kgpg-21.04.2.ebuild
deleted file mode 100644
index 4d6c6c0d415e..000000000000
--- a/kde-apps/kgpg/kgpg-21.04.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="gpg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
-HOMEPAGE="https://apps.kde.org/kgpg/ https://utils.kde.org/projects/kgpg/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	app-crypt/gpgme
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/gnupg
-"
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 80f93206579f..c8be7d44d671 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,7 +1,5 @@
 DIST khangman-20.12.3.tar.xz 7400372 BLAKE2B d35d57b5a0af7d21b2c81b0ff0beb10eaea6c320190ee9c0b91376d2718db775b52f70f6f8c3ace0ce13821a2afec8dde047f2a53cb519b7e44db5cf727a922b SHA512 6b421298762a5b1f0747e41946d10f35b576b37d2dd865f45b6b35fc402a44f6845714788607e96bbad657d3f2da147f6661f0e53ed04857bc4a0a3d0ea2a2fd
-DIST khangman-21.04.2.tar.xz 7422820 BLAKE2B 83b27597f6c92b036f3a02f09dce971d90fcab7f9a6e0e1b2078c8098485c8bdaf6df459fba003f23aafd5b45e007b64e3e117318aca6df86a2724a46a012290 SHA512 a53b327c4391d09700347290ac43610aefc9aa2908abd4eb3e79c335d1407cc41367e3f781284444a6d7de6c1f09f6f35895ff897e48b5e394f28eecfb9824c1
 DIST khangman-21.04.3.tar.xz 7429172 BLAKE2B a32054dd415282f8ebdbe79ff4014f894db5de4f9a5e5ead3618dbaea98066fff8c052ec275e15e2f8d6e3a091a273dd017ec66206a27606d67cc605c2136f4b SHA512 9b5f719d1740484fcb30492f03c6e88f0306932bcd581425f6c6cf8d85868fe11dfd7b5fbd1bef5cc81c113d8e209961df0147f4d440ed6f6106ff1b215532e4
 EBUILD khangman-20.12.3.ebuild 1195 BLAKE2B 8ec3ecade993b6a3c424e75df5e5809a34c113a6af1fbaffe9cfb8ef8714908fef59154f650d482d5b99a7e20fc6ce66c7ed345a2dca638c820c0daa11c4c3f2 SHA512 c7460edd4f18c50bf36cef37c9600c36a697615512b12836232c530d50a8829d3bbe383e66a65c7a444d23057f3246548deef1020f2186d0d68a4316869aeb5d
-EBUILD khangman-21.04.2.ebuild 1198 BLAKE2B 5e2aefe6accf45991cf61adc535ada87728612e6cb80a67d6c7fe9d57014aafcd26c2ffcd81e0ae927eba3c7a39413fb73e9ca10ae00d0301e1aa8e184f92d7e SHA512 c69d28e15ab12986a729332538b5e632b2b193077221095f3eca814d2e323150f6eb2433c90cb60f6f14e6a6568aad47f705ff3818822bcb8a6dfca5361c79f0
 EBUILD khangman-21.04.3.ebuild 1198 BLAKE2B 5e2aefe6accf45991cf61adc535ada87728612e6cb80a67d6c7fe9d57014aafcd26c2ffcd81e0ae927eba3c7a39413fb73e9ca10ae00d0301e1aa8e184f92d7e SHA512 c69d28e15ab12986a729332538b5e632b2b193077221095f3eca814d2e323150f6eb2433c90cb60f6f14e6a6568aad47f705ff3818822bcb8a6dfca5361c79f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-21.04.2.ebuild b/kde-apps/khangman/khangman-21.04.2.ebuild
deleted file mode 100644
index 75f74fe39486..000000000000
--- a/kde-apps/khangman/khangman-21.04.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Classical hangman game by KDE"
-HOMEPAGE="https://apps.kde.org/khangman/ https://edu.kde.org/khangman/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkeduvocdocument-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=kde-apps/kdeedu-data-${PVCUT}:5
-"
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index baf9765d6ecc..70a9e6a77bd6 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,7 +1,5 @@
 DIST khelpcenter-20.12.3.tar.xz 4250480 BLAKE2B 08a31566902cfce5d91ac25e6cb6fd04f33c1f3f131839e5dfe15e6681144de7ee464564fb77910edf7b987069af22b0e057e5faa64c7e899f0520ca8b74daaf SHA512 6047f7dd135a5ae8b25494d48ef36c245f9c7055eff294e5c29087d4395df656a6b4d5c6f1099cb99257628ac4362b31bb8c4278be46ebae2ae5c01261b566e0
-DIST khelpcenter-21.04.2.tar.xz 4279204 BLAKE2B 1a02fd128afa1bf6684cd86f007ec0ee53bd65ca6709240830d097e892cef4e0bb3d8caf2d9381026e36ec73dd646dc0e334770ced90b034acd5e7658a3d7d6c SHA512 fe78b6e98f58109bbb5d8999fec9087ca05b5e10d2af08877f411a493ed031a75b5aa1827363d940f162c8153588ef3c4c00c1d46f9ae5c33dd334bcdc086d52
 DIST khelpcenter-21.04.3.tar.xz 4279056 BLAKE2B fbeda2c982f7aadd280278a199ed4954199b193fe80e5c7fc88409c61d09f4c59a28a5df386abb1f33c357b59f86dd2019d533b197e864a117ec26e2850cfa83 SHA512 59d3b701074dd5ac4c75df6666a850ebbb694b6f4f8501fe70606eec49d2c89a3dcbbac2ca35964a2f830bdb8df430e00b360bfa76f9d467fca4e6fc41cf3844
 EBUILD khelpcenter-20.12.3.ebuild 1486 BLAKE2B b22056c5a661d42373ae9b330d86ee990b7e02204edc7db239a543f62773af4ad40ea03c31a2689040ed85fae23df298c40cd6fc916eec1508cbb16bda9339ad SHA512 3af17e4efa8582404231639f402efd6309257a6d11e97b3ccdbe64fe451ed08b8fee2e504d6198f66373760f1b324703f7a944ccdc2acfa8a990198b657f8cb3
-EBUILD khelpcenter-21.04.2.ebuild 1489 BLAKE2B 06fc913039db609e17650b24a4aad163501a4778169f42772a3fc9a342ca541b33e176caf9c0dc033087a68d88fd2149bfd825cd4344f5e92541d36f3a23db47 SHA512 faa6752daf90deab7a82abb242042931f833233045554b429372a6ad294b19b706df75af124cb44f99a643cd7b78c038e3620730e94feaca4a32d78cf2677bd2
 EBUILD khelpcenter-21.04.3.ebuild 1489 BLAKE2B 06fc913039db609e17650b24a4aad163501a4778169f42772a3fc9a342ca541b33e176caf9c0dc033087a68d88fd2149bfd825cd4344f5e92541d36f3a23db47 SHA512 faa6752daf90deab7a82abb242042931f833233045554b429372a6ad294b19b706df75af124cb44f99a643cd7b78c038e3620730e94feaca4a32d78cf2677bd2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-21.04.2.ebuild b/kde-apps/khelpcenter/khelpcenter-21.04.2.ebuild
deleted file mode 100644
index 5f4b4f64f406..000000000000
--- a/kde-apps/khelpcenter/khelpcenter-21.04.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Application to read documentation for KDE Plasma, Applications, Utilities"
-HOMEPAGE="https://apps.kde.org/help/ https://userbase.kde.org/KHelpCenter"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/grantlee:5
-	dev-libs/libxml2
-	dev-libs/xapian:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdoctools-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	sed -e "/^install.*kde4\/services/s/^/#DONT/" -i CMakeLists.txt || die
-}
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index ac92167343a3..2a7873e02d6c 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,7 +1,5 @@
 DIST kidentitymanagement-20.12.3.tar.xz 152000 BLAKE2B 1b54c296951be13cadb5db42959ead0e7ac79c9e5a7af8b8ecb5e74355513a8e294158facea289277c998da9de285521f812e5b77249b2e2b7a57b91800d20ed SHA512 24ea71f45bb1dc0efcd9acc03f4a05c4558a77a24689dfc70a3dfecb8a697c7282e05e3d212466961e37661c2c8522606f909df0b750e3b203e3843ea3729e02
-DIST kidentitymanagement-21.04.2.tar.xz 156452 BLAKE2B ecb7ec100c4e7ae309c746b62f002ae7406d96f33e386264547968a2a457f58088e0a14877618b8606bc9d05577da6a6be81dfac1fda3d690387e28b7dcad432 SHA512 91b35bf04d9ba87cf57b73345ef072d5bcaab056fcc39eb28f0bd66eb84795d80e7abf9fd97ec545bb56d53e773476f4ca31ea7f3bb930888bc7cf1f8dac3628
 DIST kidentitymanagement-21.04.3.tar.xz 157172 BLAKE2B 6c38baa3813b478a9db56f0f3dd7482539c6126131dc9788e22d583ef4071b4a427bb2cab9fe10e35b27752f8bbd31ed1727c90dfa72e1a13c623991248db8a6 SHA512 f1f8b2bf314165fad19d6cca60e2df265cccb8839de7d1ece4f6ac9567117cee72b4496fdadb6280f26d402a09a9bc8600c49fe4eeb4ffb91536cf0a83e8430c
 EBUILD kidentitymanagement-20.12.3.ebuild 858 BLAKE2B f24dbd50534c999516117207bc085ff97b725385557c75c7961fd7c14f160a73e627b42fe2bf64e76bb4d97f9ada7b2de6972577e0b085c9e6e1aa0470bcab94 SHA512 2ffaf54919072688e47a2d23f8a6d565a7470ae57e9c52c89ed299d2c319bd14cf4474c7cae8fea227cd02e799ed8493796d61627c5b0af3e67d2e27f2a52441
-EBUILD kidentitymanagement-21.04.2.ebuild 861 BLAKE2B 62236dcc4feaeeaf1615e905b2236d714fa7bd7c4eb1d899a9f41bdd03407cbd2eaa2f8b66884f64a059ff0852d5dff06da25a56463f9ea011ff5b4f6bc082b7 SHA512 53d0c93dc7af60d89084152134908deec0a31a7ae33c580a6801b1da9f1cb1f4f2f186754a6a83c89284e8bd1d923ee8207b9820814847ce01bfc6fbb3f6e683
 EBUILD kidentitymanagement-21.04.3.ebuild 861 BLAKE2B 62236dcc4feaeeaf1615e905b2236d714fa7bd7c4eb1d899a9f41bdd03407cbd2eaa2f8b66884f64a059ff0852d5dff06da25a56463f9ea011ff5b4f6bc082b7 SHA512 53d0c93dc7af60d89084152134908deec0a31a7ae33c580a6801b1da9f1cb1f4f2f186754a6a83c89284e8bd1d923ee8207b9820814847ce01bfc6fbb3f6e683
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-21.04.2.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-21.04.2.ebuild
deleted file mode 100644
index 05dee7a30e5b..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for managing identitites"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 658a6746cdda..c1a0d4ade0f7 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,8 +1,6 @@
 AUX kig-20.08.70-cmake-boostpython.patch 2660 BLAKE2B 51c473dd8733f44214571772b2249abe730087648d962ebab12faacaebaa2e1bb0788220faf2a03b110477a1112fce771d1b269d03e3a05670a35ffe02c82c86 SHA512 0abd06e611f90a8f73ecf5599377df45ae350c4352ff5c0cac47918d4938142bce9677a0430aa3aaf8d6f0edd5241f4751fc2187410b7287dd399caef6c8e7ec
 DIST kig-20.12.3.tar.xz 3122112 BLAKE2B cff7502feada09f674f055c209840e0e665765aa2d744260e629a58f7fde2af442c136370b173d3fd9adbd332e4d70d55aa794bb036f6c7bbdf42e4abc7db547 SHA512 4de18bf47d532c623aa877e2d52ef3e78f9fe715b96a110eb654aca578fb1addb5aa7d8f9e8e0f54f0549954018e3d7f829f07cb41bf587da115f1a2923e5428
-DIST kig-21.04.2.tar.xz 3166704 BLAKE2B 9b9bad6e5d12b1750db588e7e5a72d270e8afb3d7a4b10c29e44f63e6584d3690cd937af40c4df014de4afed3ce8a97c06abe8bd75e2cf39ef5cf893d7cffb66 SHA512 7d94eaa2b33815d7a14e7e6ac789d149c8d572fba82b227343f43c1d9e82f4f8fdac28a2dd6330930c1bbb385dd8e177986ad234f398cfa5d3480ad851fffb6c
 DIST kig-21.04.3.tar.xz 3166572 BLAKE2B bbd64b51cc768de9baeebb3b66906d8e0d8ff133a63ddfe19a9e360e34d6c10b9e08a55ca8aca88c7e723a7af29d5882d214e72db1c7292364631817e6ccc399 SHA512 f82695722fb66a707abaf120b56e0f0977a63065a21849e72f178ee0eb653b73bd5ceb651a92085a34ad7d1c98da08611138a7d52b491c7caa9cbca47b7ff19e
 EBUILD kig-20.12.3.ebuild 1746 BLAKE2B a1862baf444f373d3152ca47bb4889d325f2fd980af516a7c7f39106b51e7d7b2519af8d7ea866e57a058ffb27a1930e9374e23eb4a0ef8420c384eb379ea105 SHA512 a87a49e4b976699cb75a09f7a85dd85306232cf0a61198fce03a37e7ab1dbd6e112f828f42f3ade135bd99c1405d43f53eb39d394383bff7c60f55baede2d395
-EBUILD kig-21.04.2.ebuild 1749 BLAKE2B 7fbcfc3e247c72ef9caa1c61d3a11ed1dd1b66e284d6be584d2ea98527cd164151569badbc6559fa84113f0e0aaa943b66ac57683c51151bb0fbf1d68f80706a SHA512 999e1f8ebb84a05bfdc6bf0dff1ef8e8e60827b9f54fd46d47e615be02ad4dd9fc771a2fc4659d71ebef72a81b2dc80dc2d81e61ed78e62dd6f3b323d080db2b
 EBUILD kig-21.04.3.ebuild 1747 BLAKE2B b1198b2b9c05a1ef6f91039d719eb20aa39b218a4df1e64e3584c54d7c02e67759230addc4db63fe9d1371295da5a051e39ef6d9c3aa0611051cb678e337f9d2 SHA512 8d6ef43f079f92f06d3cded5eecfd4c26c63a262393a363289399a4146a30a0ebb1f8935293a0f9f79043f647d25c486b8624a9bec75114490fdaa354a02fcaf
 MISC metadata.xml 417 BLAKE2B e9b8762ae43f4e8e449b2a649d89d6e909bd34529bffaf6b0c4683a927b5b89486e7b94de5a34bebe5ceb580289b0ffbead4d3f8db19d0c79f95a93126b17f51 SHA512 9a87c6e27600a5bad58df8fc2de4696a6e2a81e1474cae08201e4861d7961537eba510463e3522ff0bf7a1bcdb77aa84804f0fb956e0d0cf096ffd8f523f1ace
diff --git a/kde-apps/kig/kig-21.04.2.ebuild b/kde-apps/kig/kig-21.04.2.ebuild
deleted file mode 100644
index fb517874a782..000000000000
--- a/kde-apps/kig/kig-21.04.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://apps.kde.org/kig/ https://edu.kde.org/kig/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
-	scripting? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-20.08.70-cmake-boostpython.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
-		$(cmake_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake_use_find_package scripting Boost)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index e7f0a6a6c0e0..ad92fc262b3c 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,7 +1,5 @@
 DIST kigo-20.12.3.tar.xz 5234272 BLAKE2B 394f8dc485e4c544a2649673071c92188491a538920cf8e60df74e936f0cef2f5b1f9292736be3ca97f48609c61ac83dcc7a625c41d74e44f5e23a4f659d3e26 SHA512 6576abeafbd67bddbcb4466a4b1079c2cf709b21921f906270d637b4bc2364fab62030c4b12848dd7212910537d2581d2cde588f242286aca5b2039d684df69e
-DIST kigo-21.04.2.tar.xz 5245128 BLAKE2B 480c5780edac1b3cccc574fd1af30bfc4375bcc156c025450e9c87a1424d03fbeeb7ea78e1d3053a08db7c9c02c68b34e280e6d69859c0e5b24223c467800e5f SHA512 a93e0a749ec44f5514f1754da624c9d9686ef4d03eca591a2bad1d4dca4d3ee951a9793ab9e77277c2b35e2500c3b536dbbf98069a33f339f3364e5d9389fb42
 DIST kigo-21.04.3.tar.xz 5245744 BLAKE2B 550c51ae8a798c16f04fa15c8bf2e80f061d1f405ea81338ddb53252ec875bb88182bc6e6bce574c33af2450ea4907c409974d4668abb753e6ae388daf4ffc64 SHA512 2e92750125ad644c52f0427d4c39d8ae4e0c0e70588e686551181bdf41002bfa4fb9529c99e717f7a96adb610408d27d946547b98f3715a325ce68c0d4f9d302
 EBUILD kigo-20.12.3.ebuild 994 BLAKE2B b5a6da337b2572aa7ff1de949958e1004a2ec2556d8503904bcf860cfb0d72c2f0a8d9530c9f81eeada2dce0f96c808c7dd8736be9c89ff25b7f7cb26bc317e8 SHA512 0e94d67bf934450545f2864bb3ef77655a68247b6f71dfc6fb874133fa4d49b9dad6553cd770f5a2281545564d7973b32579366cd0f938ffdf7332e62a386f8a
-EBUILD kigo-21.04.2.ebuild 997 BLAKE2B 25b83a0437e360605de555297331f55fba8d1e816b420522fd54e6cfb8ce766211fe4422b10fcd0f465d9b3eb960638042d63729e20b7c51bdf90cb52664fb57 SHA512 da461cccbf9266528cb4b078f2a9fa373e2333ec12a3a536593185a3552683b70a55a56540ccf15a59c30cc3e0a4ebd0606f15d911266c205af4d5a8036693c6
 EBUILD kigo-21.04.3.ebuild 997 BLAKE2B 25b83a0437e360605de555297331f55fba8d1e816b420522fd54e6cfb8ce766211fe4422b10fcd0f465d9b3eb960638042d63729e20b7c51bdf90cb52664fb57 SHA512 da461cccbf9266528cb4b078f2a9fa373e2333ec12a3a536593185a3552683b70a55a56540ccf15a59c30cc3e0a4ebd0606f15d911266c205af4d5a8036693c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-21.04.2.ebuild b/kde-apps/kigo/kigo-21.04.2.ebuild
deleted file mode 100644
index 6d66cd54105c..000000000000
--- a/kde-apps/kigo/kigo-21.04.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Go game by KDE"
-HOMEPAGE="https://apps.kde.org/kigo/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	games-board/gnugo
-"
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 2a816c88f408..8bcb1bf9da73 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,7 +1,5 @@
 DIST killbots-20.12.3.tar.xz 1186532 BLAKE2B f2ac6281f3c4d10faaad0a9d3e4a2462a431e9275c0ab6d9e42ebdbf6dce4a393be4b5b61dca8e8745bbc69845c9afc4fdb9d2e7da27fbeab413bc00b00c9484 SHA512 247d4325d705e527ca3934d35d0f939415a05c4f37d7b7b53b43cdb9bf28c3b59b87f60070eeacd24bac9ce22888042081a9503c2c1ce65db8bd4495df7f8504
-DIST killbots-21.04.2.tar.xz 1186296 BLAKE2B db66489fb48042d9db126d426a40056f926b2a46f6e6e7036e5de998c9890eb06c9624d8decbedcbe85df94b9d5e2ffedee05d049bef101343fe1f832352f8fe SHA512 ed795c79902ffbe7c9335b45ee93422790b3b6edfa1a7424c2271a741be6fcc8f3e98ab066bbed2372df1110d52c47bde387010dad69efe94878651c89b7479a
 DIST killbots-21.04.3.tar.xz 1186432 BLAKE2B a9d958148135d2b6d6fffb4979aab47f6efc6da0ebdaf4abb81d628ee2284e2f5e5b2e1055cfda149192721794e6f1bf6efb8baac9645f7b2d45982f3195f379 SHA512 01b57889dd9bc3ffd6d193206f87fa7fd69078fdae217c3f6bc7eee8e415525383b1c794d56992750bb0a74227a6fc4ee4297abdbffb14954d8bdb4236447fd0
 EBUILD killbots-20.12.3.ebuild 863 BLAKE2B d00fcd882974cd7bfec593eb8af39487a8a478bc33ed3ac7bb7cc04da67b8fa736317699e08201fd68f6cb90d392d90d36149c8cc10de0e64a905ccd460f959d SHA512 68929f05998e7d5dcb490d832526384610d52219b7bf4b85b0c9ab553539939086c2c1f3a6f7fb966982627dd76cfcc9fb72cc63c342b974f39edccc1d249ef7
-EBUILD killbots-21.04.2.ebuild 866 BLAKE2B 32cb1ef152a43b3874a6e789d01a871701234bd24d73556c070fd78e025abd65b09b1bddd076b3117e2a0252dc2d5f07ec5b980eaaace7d852450fe4ea89eade SHA512 d0bdbbf30b1de2a31ebcd4d610a8323516731ee934297955f450fef90200b284c528cb5daa3616f716bd5b7b8aadf09b52f3810f3ac892c43af00f0a088acd3b
 EBUILD killbots-21.04.3.ebuild 866 BLAKE2B 32cb1ef152a43b3874a6e789d01a871701234bd24d73556c070fd78e025abd65b09b1bddd076b3117e2a0252dc2d5f07ec5b980eaaace7d852450fe4ea89eade SHA512 d0bdbbf30b1de2a31ebcd4d610a8323516731ee934297955f450fef90200b284c528cb5daa3616f716bd5b7b8aadf09b52f3810f3ac892c43af00f0a088acd3b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-21.04.2.ebuild b/kde-apps/killbots/killbots-21.04.2.ebuild
deleted file mode 100644
index 88211b1dad9f..000000000000
--- a/kde-apps/killbots/killbots-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Kill the bots or they kill you!"
-HOMEPAGE="https://apps.kde.org/killbots/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index d667de9fb28c..cc940bf1c7e7 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,7 +1,5 @@
 DIST kimagemapeditor-20.12.3.tar.xz 1079008 BLAKE2B 7490e8e548b2d2d0f22f45f2c3a61bb8b75e53e2ffdd920e3dad8fcc609989c35ef134ba3251f7f0104ccd9e2c29658f521955a08bd93149986d820e62f068db SHA512 5bc03c0c4aecdb18582fbbf3e1365b3bfce9eca171d5769a5f39234643903dbf4724a9725d95dfaca6a01a03ebaa2c9646597de3d7b4032cf4037e8b993d32f6
-DIST kimagemapeditor-21.04.2.tar.xz 1088556 BLAKE2B f2a019b38eed663fe27853fa726d397fae577167c63812fdb7684b7f36cdd877b4ea87571b023b5763212178869e133190e13ccb635df628b8f7cde08adae68c SHA512 a2a36953577b268e93fa16f79f48560c90a35282effd46c0684a3bbbc3bc66034ddf61e65995f5830b7f6695a680e7e6a39e5f37ab7f652b82b36d58f9ceb36a
 DIST kimagemapeditor-21.04.3.tar.xz 1088644 BLAKE2B 489db08c580c85f912c1674aa7f56cd6c1b2b309ced1c32a9cc713615a7ffa15f26af87dfc473a42cea1acd2db13a1b35197b840972228b78c8449485362c9dc SHA512 8dd80e4df949a8716f000edb2b8932de36913b9d577babf6e19a5de9f67e30509461847bbbd4fa571998510e6b4857dfc30ae92e49ea3924b5e7759917186b27
 EBUILD kimagemapeditor-20.12.3.ebuild 927 BLAKE2B 2dea86b9fdc57bb03a99be4a8aa9d2b8eda2ce5b4a927faeb75031ec1951ed6db7ae7a904d6a390c9ed2385f61c81e29453018948ff78309b6408ae718e62608 SHA512 d6dc6baa5718bedb6255eba4fd3e3c916af937f070705d46b5ae0e0d5842eba239f14913d73de6675fb5798e9ed36a1848ea1f0494a0129e4877ff1474bb3d6d
-EBUILD kimagemapeditor-21.04.2.ebuild 930 BLAKE2B a6767e7493ecab026a28230f4f0360b5ab25fb26ebe97a0dd7977aa6b62408e110bc26140bbeb301b35b62ac89c7bae241a9fd5e17c4b7c569eddc20bcd92171 SHA512 40e6ec29a32d28c79890551c06966ea9f17858382f1381cbe1c3a071f9c82f8f237730064b34bcacb447455c0b4115334304a6b960689257add92df8101f6447
 EBUILD kimagemapeditor-21.04.3.ebuild 930 BLAKE2B a6767e7493ecab026a28230f4f0360b5ab25fb26ebe97a0dd7977aa6b62408e110bc26140bbeb301b35b62ac89c7bae241a9fd5e17c4b7c569eddc20bcd92171 SHA512 40e6ec29a32d28c79890551c06966ea9f17858382f1381cbe1c3a071f9c82f8f237730064b34bcacb447455c0b4115334304a6b960689257add92df8101f6447
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-21.04.2.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-21.04.2.ebuild
deleted file mode 100644
index 3618a35ed7e7..000000000000
--- a/kde-apps/kimagemapeditor/kimagemapeditor-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Generator of HTML image maps"
-HOMEPAGE="https://apps.kde.org/kimagemapeditor/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 4deacf60d58e..ffb5a7e3113b 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,7 +1,5 @@
 DIST kimap-20.12.3.tar.xz 124676 BLAKE2B 3557b87d9afd1738a32fb7f62dbf11012a5043bba923fd712721c266add76d6cfed7da75a4ddcd68bcaf99839eed6b88c78930ca4e1319e278b501b5cbcc4615 SHA512 dc64e972c7955e64e5aea1b141d2c48b76e2074946c4048eada4c647f0089fb051bfd505578461fbf0cf7925b334c49c8de3abb898fc7ad97401276d4a16c5c3
-DIST kimap-21.04.2.tar.xz 128572 BLAKE2B fdaf57cceaec9ad07d933664cf29590f12dab96a4aed3b24ca4abd4d7389bbb19492b96bccc988cf9737e1df3963754cb22c20e1b8fd7a1defd45b5445cb4434 SHA512 de193143bb668ebad18d91fe61e2dfa0dca8dcec88eb9d718160a2b108ccd70089831dfbba72c3e5a2d8241fc01e7f9db07135b2a8b44623df69b580a58ce23e
 DIST kimap-21.04.3.tar.xz 128564 BLAKE2B 11b775fbb697989e27e1b3c2c41520b8be0745730f3d6a9ee2d5e3cc6f12734a3f527600dc376c26b00719981ef8c8fb37559432662cc5a192541a5fcbe486db SHA512 4b8cb4d2268c7e03dd8aaa1ecd6ce45f3c2a4ec2594585238102d0933d2540805f0ede1763f5e68ee156498870b402af3556e7b5509a406651dda674ad7aeebe
 EBUILD kimap-20.12.3.ebuild 850 BLAKE2B 8cebcfec989d3bb53396234813daff6341744887fc0467d16b38c17cd81d700cd06092b8d4d205b6c2bed2ac323894ae474bce8878add2afa3bd2d49be01e923 SHA512 5e4d2a23d4f676163d16a325137580eab6ca162b7c1418dc5e8e92f7719c54fb6f13d383310e74094e9f6a2d6936b5e722673dfefd9f754cf1dd12c8b195fcc1
-EBUILD kimap-21.04.2.ebuild 853 BLAKE2B 6355d89af4902316dd382ed9835f6182710631c4bbdb522769fdf562a84e1a2bc2a4eac19e063cfa6c14317662f97075f639141b6121826b6b1795e52f32f508 SHA512 a4402e8cbb4bbdcd8faeb07a047c2e4f05e53841467d7157163aa91d9cb84408563b2a993dcc52f1c9f4ad3b7d55978013bb185c2e0d8deb858b4451471452a1
 EBUILD kimap-21.04.3.ebuild 853 BLAKE2B 6355d89af4902316dd382ed9835f6182710631c4bbdb522769fdf562a84e1a2bc2a4eac19e063cfa6c14317662f97075f639141b6121826b6b1795e52f32f508 SHA512 a4402e8cbb4bbdcd8faeb07a047c2e4f05e53841467d7157163aa91d9cb84408563b2a993dcc52f1c9f4ad3b7d55978013bb185c2e0d8deb858b4451471452a1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-21.04.2.ebuild b/kde-apps/kimap/kimap-21.04.2.ebuild
deleted file mode 100644
index 01b0dc112581..000000000000
--- a/kde-apps/kimap/kimap-21.04.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with IMAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-# TODO: Convince upstream not to install stuff with tests
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
-"
-
-src_test() {
-	# tests cannot be run in parallel #605586
-	local myctestargs=(
-		-j1
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index aa0b19966b57..989c8cb2fb9a 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,8 +1,6 @@
 AUX kio-extras-20.12.3-thumbnail-check-shm-size.patch 1945 BLAKE2B 07318d918a264d62023d7058e718b2a30ec3e8f937a2f7b278ca1c0200485b843249ea0a26eed8f785a544bed5a021e3c5fbaa72030dc65dadcd0cd5b9bc2de6 SHA512 dc7183cfda0fbad5e3d9ddd5a1535e261f8137b313e8485badac4c5a3b1a4af20b7b6b468f0d5864045bc753b171f899a8c70c2b20dad25655dee6c19c34a785
 DIST kio-extras-20.12.3.tar.xz 636012 BLAKE2B c5145871443ab7bfb562ac935462eb5dfdeb7caab63c123c53a929af9d41f3780bf03ac9f16153434854f785122455e1767573ce84b88bef196a01c62fc2e609 SHA512 a419f7fa92ff876802e8b53eef9b5756108dd3f30fee4f1e1d25f4c8f4468181b9565a92ec07c832aa175368763adcd512f7732666f09a4e534e8d1af6abd13e
-DIST kio-extras-21.04.2.tar.xz 663336 BLAKE2B 5e3ed81498f13218bc8b266d8f6c42a6d44e063ea5f5e2d36cc2506932ae7382e3ce9cb07715e327c397a8b2302bcd4583d316e41057f48a74255c883c462c8b SHA512 ae7b62881e3d3948eb798660f0f922b28a4f9642c9a94883704f8cec0657e64c03f61e2b26d795dfebdac505a0be0921fd308801fd8ca7a7bdf12d2b51f603e5
 DIST kio-extras-21.04.3.tar.xz 663328 BLAKE2B a509513732dbacc2f63a162cef49f297b5ee83a1d4bcd436aee474571d4aad8ff5b34710ca23d590b87c9cef8b58add2be507692648e61abc197befc478effb7 SHA512 98cdf33a73b9321c127cb3174f5ffc243e51222c2c4572afc7b51a949a41c85e8758aafaca5db613b11109af693eb6de061d78bcf1138c12fbaebf3b5dc82da9
 EBUILD kio-extras-20.12.3-r1.ebuild 2701 BLAKE2B f9e5ac55c51b8d9e8c098efdd379c3f9501ccbe7b752be1ed3b152d7c31c7dec239374e43747a20b8662ae3523ff5d75e24cbe859bb9c4fee9f46712843258b1 SHA512 c13f91a704042b8c81a749793667a0317986a6412d04135d7aa4a29845169cd92f407c72d06305f67341d7ed1c6dd609ae9b7b37b6a2ead23b18338b5deae349
-EBUILD kio-extras-21.04.2.ebuild 2629 BLAKE2B 9599d3e762359009391473fd1cb0efbe79bd24d6d27ec806bbff22b694ea596e4759d7806ec1af89a0f0f0fbdcde8782f2b99571775060548fa808498dccf47c SHA512 829a956e00bc311eed29ac9471ed4f15350f44806af9d5d724d21d3206825aa94bac2e3353d5092cbe169875c9d448e21c5439f396b6b0f0bc597922ad2d3f22
-EBUILD kio-extras-21.04.3.ebuild 2629 BLAKE2B 9599d3e762359009391473fd1cb0efbe79bd24d6d27ec806bbff22b694ea596e4759d7806ec1af89a0f0f0fbdcde8782f2b99571775060548fa808498dccf47c SHA512 829a956e00bc311eed29ac9471ed4f15350f44806af9d5d724d21d3206825aa94bac2e3353d5092cbe169875c9d448e21c5439f396b6b0f0bc597922ad2d3f22
+EBUILD kio-extras-21.04.3-r1.ebuild 2705 BLAKE2B 42513cbd2258384d256b28afb844962c656a72684bd8a8713e663df87d3bdaded01e61c3bb6f5c3047382e00707816382f7988e6142a99f6b7f6c0186ecc5a8c SHA512 714c8e1cd5b2ca53d1c57f1a66d875456390590aca8937411caa6815766ff8f26fea5c40967178501ee07800a6fbd366057f3f4dc3daceb11d23784cb8d3085b
 MISC metadata.xml 840 BLAKE2B cba33bb5b6c15b2cd116fdf241f91adf13b96d7402bb863cbfa6a8fbb8a5c7524c5704c4ccc3eb1350262eb55ce5d3130e5f0fda078c66ef597bbed0425b8b7e SHA512 678501971728b966bcc286242477f6bab4be9244a9cdad765be5d50c43c1c5fd08102c03bc4b5e9a2d46c5e92d594b95609da26d47b2a923339fa7e1d500f7c2
diff --git a/kde-apps/kio-extras/kio-extras-21.04.2.ebuild b/kde-apps/kio-extras/kio-extras-21.04.2.ebuild
deleted file mode 100644
index 7a33fe927ad5..000000000000
--- a/kde-apps/kio-extras/kio-extras-21.04.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://invent.kde.org/network/kio-extras"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
-
-# requires running Plasma environment
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	activities? (
-		>=dev-qt/qtsql-${QTMIN}:5
-		>=kde-frameworks/kactivities-${KFMIN}:5
-		>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	)
-	mtp? ( >=media-libs/libmtp-1.1.16:= )
-	nfs? ( net-libs/libtirpc:= )
-	openexr? ( media-libs/openexr:= )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-	samba? (
-		net-fs/samba[client]
-		net-libs/kdsoap:=
-		net-libs/kdsoap-ws-discovery-client
-	)
-	sftp? ( net-libs/libssh:=[sftp] )
-	taglib? ( >=media-libs/taglib-1.11.1 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kded-${KFMIN}:5
-"
-BDEPEND="man? ( dev-util/gperf )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package activities KF5ActivitiesStats)
-		$(cmake_use_find_package activities Qt5Sql)
-		$(cmake_use_find_package man Gperf)
-		$(cmake_use_find_package mtp Mtp)
-		$(cmake_use_find_package nfs TIRPC)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		$(cmake_use_find_package samba Samba)
-		$(cmake_use_find_package sftp libssh)
-		$(cmake_use_find_package taglib Taglib)
-		$(cmake_use_find_package X X11)
-	)
-	use samba && mycmakeargs+=(
-		-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kio-extras/kio-extras-21.04.3-r1.ebuild b/kde-apps/kio-extras/kio-extras-21.04.3-r1.ebuild
new file mode 100644
index 000000000000..b91c9b44d8a4
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-21.04.3-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://invent.kde.org/network/kio-extras"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
+
+# requires running Plasma environment
+RESTRICT+=" test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	activities? (
+		>=dev-qt/qtsql-${QTMIN}:5
+		>=kde-frameworks/kactivities-${KFMIN}:5
+		>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	)
+	mtp? ( >=media-libs/libmtp-1.1.16:= )
+	nfs? ( net-libs/libtirpc:= )
+	openexr? ( media-libs/openexr:= )
+	phonon? ( >=media-libs/phonon-4.11.0 )
+	samba? (
+		net-fs/samba[client]
+		net-libs/kdsoap:=
+		net-libs/kdsoap-ws-discovery-client
+	)
+	sftp? ( net-libs/libssh:=[sftp] )
+	taglib? ( >=media-libs/taglib-1.11.1 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kded-${KFMIN}:5
+"
+BDEPEND="man? ( dev-util/gperf )"
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_comment_add_subdirectory network
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package activities KF5ActivitiesStats)
+		$(cmake_use_find_package activities Qt5Sql)
+		$(cmake_use_find_package man Gperf)
+		$(cmake_use_find_package mtp Mtp)
+		$(cmake_use_find_package nfs TIRPC)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		$(cmake_use_find_package samba Samba)
+		$(cmake_use_find_package sftp libssh)
+		$(cmake_use_find_package taglib Taglib)
+		$(cmake_use_find_package X X11)
+	)
+	use samba && mycmakeargs+=(
+		-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kio-extras/kio-extras-21.04.3.ebuild b/kde-apps/kio-extras/kio-extras-21.04.3.ebuild
deleted file mode 100644
index 7a33fe927ad5..000000000000
--- a/kde-apps/kio-extras/kio-extras-21.04.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://invent.kde.org/network/kio-extras"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
-
-# requires running Plasma environment
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	activities? (
-		>=dev-qt/qtsql-${QTMIN}:5
-		>=kde-frameworks/kactivities-${KFMIN}:5
-		>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	)
-	mtp? ( >=media-libs/libmtp-1.1.16:= )
-	nfs? ( net-libs/libtirpc:= )
-	openexr? ( media-libs/openexr:= )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-	samba? (
-		net-fs/samba[client]
-		net-libs/kdsoap:=
-		net-libs/kdsoap-ws-discovery-client
-	)
-	sftp? ( net-libs/libssh:=[sftp] )
-	taglib? ( >=media-libs/taglib-1.11.1 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kded-${KFMIN}:5
-"
-BDEPEND="man? ( dev-util/gperf )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package activities KF5ActivitiesStats)
-		$(cmake_use_find_package activities Qt5Sql)
-		$(cmake_use_find_package man Gperf)
-		$(cmake_use_find_package mtp Mtp)
-		$(cmake_use_find_package nfs TIRPC)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		$(cmake_use_find_package samba Samba)
-		$(cmake_use_find_package sftp libssh)
-		$(cmake_use_find_package taglib Taglib)
-		$(cmake_use_find_package X X11)
-	)
-	use samba && mycmakeargs+=(
-		-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kipi-plugins/Manifest b/kde-apps/kipi-plugins/Manifest
index 708cedfde22a..7bf51f23028c 100644
--- a/kde-apps/kipi-plugins/Manifest
+++ b/kde-apps/kipi-plugins/Manifest
@@ -1,7 +1,5 @@
 DIST kipi-plugins-20.12.3.tar.xz 1644852 BLAKE2B 5b2e298b34d12508910ff005f525cd457c2865a553f07089df33144eb8f3acf06bee9b761e388ac1474929bc4df558ef772981b1345e40fc3de6df90ac5e4be5 SHA512 8e5cf2ea81facc7ab5eed509be71b0dc57e93ce06237c805211493e345805f82b3aa3f8994d0def3b81dec97261409acb9bc51616b85eebf10a98c43369b4992
-DIST kipi-plugins-21.04.2.tar.xz 1654380 BLAKE2B 874bf8bdcf54d6daa6bec268f78e9c7da4aaa34f20577f4c61bb1dd25edeb64951b62ec9a28cc10a24714e99fcf722483fdd5a911cd989aa0e18d903d0278dad SHA512 08a96b974940d373a8aaff9a03afd47f53bdec6cdafb4fcf5dec1fa8a4658415f30acba19982122666c6873ce7f164b00bb473e093fe5151f74942291a6395be
 DIST kipi-plugins-21.04.3.tar.xz 1654288 BLAKE2B 32660d84e939f54ff95a9076d2d92fef2d2896139e37b52ab4cd6f78dfb7aa3ab786d20f17494c6d0aa7751cf96a3ba7c3af085ca2a72da5e547e41f404e228d SHA512 b845c94415409f21cbc95d6d4f16a8a628e8ae217c180148d8e0a259a8f15f00b7cffbb6bf75be8c35efe180049feac46f0a2549cc89a263f1037bbd0866f675
 EBUILD kipi-plugins-20.12.3.ebuild 1475 BLAKE2B 3042d038c11b4524cc55cae7634c9b385423a3662fdf8ea09502f6839ff64b0f200a1c19e65be3cec0e0d9a01b03115a0c71bd0f49da2bfe9871fef60a766eb5 SHA512 b9cc12a574d3499eba8bb6d634c69a21db27bda0238d1d5776c93179fd997e775947319de61aac578b0e51ff71e893ae96f5f8491ce32f04ee93c4e2fbee2f78
-EBUILD kipi-plugins-21.04.2.ebuild 1478 BLAKE2B f2c0098e2591e9407e2d26bcbd653b8accf62156b9a16101664fac96fdabb313464c390cdcfca90ce850568fa656ae2f7d79b56d8d109a8f25a0d43ddcff1342 SHA512 e3f3331fcb6d3b6c535a47e3a6fa11bc15c8be4841b87531b5fddb7fdb5ae3215b72c945c459bb8fe8a8042d179874cb26cc9e6d9c5ff44f4d9a76758884bdc6
-EBUILD kipi-plugins-21.04.3.ebuild 1478 BLAKE2B f2c0098e2591e9407e2d26bcbd653b8accf62156b9a16101664fac96fdabb313464c390cdcfca90ce850568fa656ae2f7d79b56d8d109a8f25a0d43ddcff1342 SHA512 e3f3331fcb6d3b6c535a47e3a6fa11bc15c8be4841b87531b5fddb7fdb5ae3215b72c945c459bb8fe8a8042d179874cb26cc9e6d9c5ff44f4d9a76758884bdc6
+EBUILD kipi-plugins-21.04.3-r1.ebuild 1349 BLAKE2B e07661b5bdd6422c2bf914e0de0148aa5f3b4af9321104784c106becb59e4d3378c56502eac1db49ba8498b9bafd229c743dc7631e8b789d924f6b2e50e378e2 SHA512 ac1573226acc6365045a4f4c53aae41a453f37996c1a0efb31868a7f491a77ce1fcf64fdb78f4dbca1a992e45c9515f0f762ee552f0481a1be17ad389c57ad57
 MISC metadata.xml 625 BLAKE2B cd63f210400e6238f574fbae4a33d2b299aa3c46c9264e21521255a3af9918805ba8905156629a676e3375009c873208a843a0d82f8a260689ef854321d55cdf SHA512 4f61eb0e78808875c77cbafd1c95fa7c8fde0e6b05b539308d5130f5ed5b7116ce54e1444e30c88ae3d295185442c99fa1f0db03b533aac15efeb06613b91f79
diff --git a/kde-apps/kipi-plugins/kipi-plugins-21.04.2.ebuild b/kde-apps/kipi-plugins/kipi-plugins-21.04.2.ebuild
deleted file mode 100644
index eb847bcd97ec..000000000000
--- a/kde-apps/kipi-plugins/kipi-plugins-21.04.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="https://userbase.kde.org/KIPI https://invent.kde.org/graphics/kipi-plugins"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="flashexport mediawiki +remotestorage"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-apps/libkipi-${PVCUT}:5=
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	flashexport? ( >=kde-frameworks/karchive-${KFMIN}:5 )
-	mediawiki? ( net-libs/libmediawiki:5 )
-	remotestorage? ( >=kde-frameworks/kio-${KFMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Vkontakte=ON
-		$(cmake_use_find_package flashexport KF5Archive)
-		$(cmake_use_find_package mediawiki KF5MediaWiki)
-		$(cmake_use_find_package remotestorage KF5KIO)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kipi-plugins/kipi-plugins-21.04.3-r1.ebuild b/kde-apps/kipi-plugins/kipi-plugins-21.04.3-r1.ebuild
new file mode 100644
index 000000000000..1d4039b5fde9
--- /dev/null
+++ b/kde-apps/kipi-plugins/kipi-plugins-21.04.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
+HOMEPAGE="https://apps.kde.org/kipi_plugins/ https://userbase.kde.org/KIPI"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="mediawiki +remotestorage"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-apps/libkipi-${PVCUT}:5=
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	mediawiki? ( net-libs/libmediawiki:5 )
+	remotestorage? ( >=kde-frameworks/kio-${KFMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Vkontakte=ON
+		$(cmake_use_find_package mediawiki KF5MediaWiki)
+		$(cmake_use_find_package remotestorage KF5KIO)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kipi-plugins/kipi-plugins-21.04.3.ebuild b/kde-apps/kipi-plugins/kipi-plugins-21.04.3.ebuild
deleted file mode 100644
index eb847bcd97ec..000000000000
--- a/kde-apps/kipi-plugins/kipi-plugins-21.04.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="https://userbase.kde.org/KIPI https://invent.kde.org/graphics/kipi-plugins"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="flashexport mediawiki +remotestorage"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-apps/libkipi-${PVCUT}:5=
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	flashexport? ( >=kde-frameworks/karchive-${KFMIN}:5 )
-	mediawiki? ( net-libs/libmediawiki:5 )
-	remotestorage? ( >=kde-frameworks/kio-${KFMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Vkontakte=ON
-		$(cmake_use_find_package flashexport KF5Archive)
-		$(cmake_use_find_package mediawiki KF5MediaWiki)
-		$(cmake_use_find_package remotestorage KF5KIO)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index b1cda22d4bae..081dfc6c1b1d 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,7 +1,5 @@
 DIST kiriki-20.12.3.tar.xz 378704 BLAKE2B d58599bd2b25346bf58033139299da3d7ab9fef6a6e43a7422873b266ed0f8464d3bcfd31e59c2ce0790422b8cd5427d78d0210fda376eab0b7ec8af9bc26715 SHA512 52615d3de4ba76e3e80450c8ae90dafb9fbd123954c9e703d44167be78ef4b3ce85fc51fe90a811621e5a8beb79ddc95499ce0b5d91003e9726705f9e4a0f9b5
-DIST kiriki-21.04.2.tar.xz 379668 BLAKE2B 7beae0d052197e1e8f071f63d1d16a010373f87a2742a28ce10b662098c336ec7f4f6858b017ddf1c1e9956e25b55f47e1b4feb2011974714100a74dd55cbf02 SHA512 b5c10f76a528f673782196e4b4acc7b9a8364b0858a777abbf194412841cf8aa8bd9e8e88054e27f2317962c339b4104835c905c49ff1df4ca0eb0ae3d447347
 DIST kiriki-21.04.3.tar.xz 379640 BLAKE2B 26f1afe922c5602cc79d55653bf98fbfee03e579d51d6a0b25944f671ea1beeb38b4c8cef1fb0ca3789e234f1d707ecebc8a2775ed979ef93aaf9fe7457c62da SHA512 92e29859d6037b30605a3da54ee2e780c81c5515f28e0a03270812eda6597181ab5e413e02c1b0bb4710e9a4c3404cf7fa3c87cb991841b0baf991345556fb4f
 EBUILD kiriki-20.12.3.ebuild 923 BLAKE2B 27ae1ba51dd047db8ccbd83a044a6ee010f9b68ebd5970017063721decf5bd5322463a6ef9a05c64620b9363d0514cd31cb3278d3757aa5e22841b0c8bb02559 SHA512 2f4837e03717fb07e8f08765977b41d00a34feed02454e19a08f7f2c307c31395417091e786b282d40adbfc6325f4390f3d1c11cd409b958a2e0bd1f90135c13
-EBUILD kiriki-21.04.2.ebuild 926 BLAKE2B 9b60428d89c20fa1a948af944776fe671724092a671cda9e92d6b0a6031e12b3ad5bb54561740bcdcddb350cf4afdec962fdb76fe9d20d422b80d9a97ab65254 SHA512 ef28f718afdb81e5fa218c6c39423fa5cd6d8baf8994f3cfba5bc7f3d4cb4a120eb1d939eea95979d9ecd2b7b092b58349dd2e95664d6dd64f8f0db911470bfb
 EBUILD kiriki-21.04.3.ebuild 926 BLAKE2B 9b60428d89c20fa1a948af944776fe671724092a671cda9e92d6b0a6031e12b3ad5bb54561740bcdcddb350cf4afdec962fdb76fe9d20d422b80d9a97ab65254 SHA512 ef28f718afdb81e5fa218c6c39423fa5cd6d8baf8994f3cfba5bc7f3d4cb4a120eb1d939eea95979d9ecd2b7b092b58349dd2e95664d6dd64f8f0db911470bfb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-21.04.2.ebuild b/kde-apps/kiriki/kiriki-21.04.2.ebuild
deleted file mode 100644
index 77c260b9e7e5..000000000000
--- a/kde-apps/kiriki/kiriki-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="An addictive and fun dice game"
-HOMEPAGE="https://apps.kde.org/kiriki/
-https://games.kde.org/games/kiriki/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index 855ad8d5d2bc..0bcb29cda6b0 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,7 +1,5 @@
 DIST kiten-20.12.3.tar.xz 11298492 BLAKE2B 04cb5f59e13abd4da7083ad609268f20f49dec40185c7188c85f7a01c1e9328ec45ddb7961a17c33ead52fdf4782640526102322199895ebada66714ca670e1d SHA512 f9801aa1bb8eb5a7021f6ee8a5daff3a4b3cfa9e36166e4a4b4ab5407ed7557b3a75fc1cba4e79f80fb1b0f93633f1066116129f2250adcd9756b98745fd9209
-DIST kiten-21.04.2.tar.xz 11312352 BLAKE2B 6d54b365517b6074c75c582369aee05db02ba42afef6f5bc98a826c5f48306f99d01884aa9f8ca26837d073ab55e7547a5e1bc49b284efac1a46ebd31a9f1b03 SHA512 3d5b99468b83c42edd2a7cdb46dcd8fe9f69e00efede6ee130ea96620c6175998e6d255b4e42edacf9137b491b2403a1b1824bade70917b951c2063c19291248
 DIST kiten-21.04.3.tar.xz 11312220 BLAKE2B 4d1a781a37cae93f088c49b4a5a996921b9c742feac8e4ea6761c544880243462d1b7d9db076a7ea62ac9dba556bf7a42d7aa92ac295b42e8955a37d987e1195 SHA512 22ae9b0ead5f6a8c30cff5fd5d29c7273c5e0844d0494b136d82245dc60d0d4635f9a83b61b94136554f545a7c3ddd51342c4072def2ba8050ef7a73f60da695
 EBUILD kiten-20.12.3.ebuild 1076 BLAKE2B c5ef0f44efb6574e728ba6c3dc4ef25c61c7327acdc83e7acb209564d4f6fecdbdc69e5b3dab0f052a5e67c30443fab643fe48829320824671df004f62d9a3bd SHA512 16b06fef12f5650fbbc4729b3ed241dd8bf0e2aaa0edc82625c07db778776a50ab24c9fb45fa1944af7b7c51fa4d2d398bb92b73259bc2290d3aedbd215dee54
-EBUILD kiten-21.04.2.ebuild 1079 BLAKE2B 93903c4ac9aa903b91367d47acdd1fbce98196d083fd12deb6bc4a1fcbee83d8d0c22f287f5b49fa834f6559932b8935b4b8a68eb9f211dd66f699a63677c142 SHA512 027084dd07432174845cd2191cb2004f6eb3b1e9d55f1f36989f922be79b263c10508567d0047812b023a2923c6c3fc891b79bbd1489ff009b41bf58421baad4
 EBUILD kiten-21.04.3.ebuild 1079 BLAKE2B 93903c4ac9aa903b91367d47acdd1fbce98196d083fd12deb6bc4a1fcbee83d8d0c22f287f5b49fa834f6559932b8935b4b8a68eb9f211dd66f699a63677c142 SHA512 027084dd07432174845cd2191cb2004f6eb3b1e9d55f1f36989f922be79b263c10508567d0047812b023a2923c6c3fc891b79bbd1489ff009b41bf58421baad4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-21.04.2.ebuild b/kde-apps/kiten/kiten-21.04.2.ebuild
deleted file mode 100644
index be5837519e9d..000000000000
--- a/kde-apps/kiten/kiten-21.04.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Japanese dictionary and reference"
-HOMEPAGE="https://apps.kde.org/kiten/ https://edu.kde.org/kiten/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	media-fonts/kanjistrokeorders
-"
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_comment_add_subdirectory data/font
-}
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index f4987a05294d..e7bd810d5482 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,7 +1,5 @@
 DIST kitinerary-20.12.3.tar.xz 1808996 BLAKE2B e1aca401696ce7aa01bff4c7d38eedd7af90b6ff4cf6246a22084bee64d130ed099b9dea98512df347c7516a55f78ef1a97795124f71f1944a87e30365ab7c8c SHA512 9216dde20f1941b933327fc37382af620e29c660d6ffebe84b0087c660df75b030056f4142a75afa857e339fa7d56ab146d6905065f341894ccd07c2e295e541
-DIST kitinerary-21.04.2.tar.xz 1823552 BLAKE2B 4b7f0889f51d4d758a3aee19d74b7ac30bc4a8defb99c8298bd7794e5446e5a46edd66e26ad4f8c5d0ee9dcd578501a87ac372248aaa33e81163723f0831430f SHA512 6c8700b929bde96b49ce8e137609c310207d1dd10387ff1c8daa29ec861e24e5664f97a833ea17031f94a99f826794e8ac7098deca36761439a645716b187b9a
 DIST kitinerary-21.04.3.tar.xz 1823296 BLAKE2B 0c572472cbec27b0fa72042114c231a5e014008c1e51be1882ab68596e6260421b2831a169b592a998e9130ed0afe337de3cecfc42723fc531ba8d3223c0b430 SHA512 9fd0270c7c4f423e90aa103e2347e0a5caa2d60ee06c86ef245a83adf58ea22259d683472af5416c10e67245d65b845abedcd1e807c9981349adf5bb0df6a10c
 EBUILD kitinerary-20.12.3.ebuild 1006 BLAKE2B a1fcfa474565517c27444a64c7cd8ed1b37965c508b8e197336eed790b2b19a1456e4f7a7d0990e7165b95184f62605a609c795cadbe490da93bd492957a7343 SHA512 ac0e9681bb4faa0326c4176906560be274d6f5cd8d05e8b52221660f7d8b50457be3af98a8a9e67906678551f873f4cd7a836bdfc0e815d747a6d24d07b2823b
-EBUILD kitinerary-21.04.2.ebuild 1009 BLAKE2B 80c440d5092af7a12222586078665043eeebd06bb33188c174e0d223c955bcf8d24027a861f60e5db6905503cc158d816ac66d86fce7e202b9dd2152566072c3 SHA512 5efa7854554540e3030078f168371e940457e8214549d8942f7e5754ce6b9601f33697c843b76b8a90e2890cfe072b933395c7ae2245ce449c9b149a51758235
 EBUILD kitinerary-21.04.3.ebuild 1009 BLAKE2B 80c440d5092af7a12222586078665043eeebd06bb33188c174e0d223c955bcf8d24027a861f60e5db6905503cc158d816ac66d86fce7e202b9dd2152566072c3 SHA512 5efa7854554540e3030078f168371e940457e8214549d8942f7e5754ce6b9601f33697c843b76b8a90e2890cfe072b933395c7ae2245ce449c9b149a51758235
 MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/kitinerary-21.04.2.ebuild b/kde-apps/kitinerary/kitinerary-21.04.2.ebuild
deleted file mode 100644
index daaf523b6336..000000000000
--- a/kde-apps/kitinerary/kitinerary-21.04.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+barcode pdf"
-
-REQUIRED_USE="test? ( pdf )"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-	barcode? ( >=media-libs/zxing-cpp-1.1.0 )
-	pdf? ( app-text/poppler:=[qt5] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package barcode ZXing)
-		$(cmake_use_find_package pdf Poppler)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 8dd6803a5bf6..56092ee1d2d5 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,7 +1,5 @@
 DIST kjumpingcube-20.12.3.tar.xz 290892 BLAKE2B b0fe75d866889a9259daa4fa3c500eef1c93d077e0a6247a3bf7b1718435b721f4558ffd042ee7b2e6eb218ea888d5ee42dc30b2fb98ab7d910c1a0b65869fd1 SHA512 c4df393cf74c18b090d0cf97c04ab28579f75dc2f140921634a6250952747db0bec415a7516031eeda7ce731e15188062a57d652d0b5533193adfcdab48edc9b
-DIST kjumpingcube-21.04.2.tar.xz 295448 BLAKE2B b2f382f32d965eff2d6796e5291baa8ee7ee9e46d4dc3154e6fb0af094cb3d2801e969f1464c373735e5f38f6f039defdba71c0699b0492c8ec2b99fd8db56d9 SHA512 2974911f89f573c6704d35bfe03482478a62e0306bebcc9a47e882d42b01c66697b0d734073ad4f52477d5738c3e1d660889666e35832e8ad7a5a5febd6a58d9
 DIST kjumpingcube-21.04.3.tar.xz 295460 BLAKE2B 7ea47f5899c5f0bb9775edc9166b8194cc9434ad54529fef362c1324dbfb6f6cfdd5b43813484aa93782d2b19d9d3ea94a819d498a08bfecada0cdcbded46ce1 SHA512 5f82f9debad4b0136166a8427b3c58ca39658f194edbdcccadb47c848082e5c7364fc5f80a93628ec30f4cdaa2c127dc3ce5023bbb3aab9f3314972d7cb68588
 EBUILD kjumpingcube-20.12.3.ebuild 913 BLAKE2B 1e1e32d6bac666ae4ab95d0dd355fcda74562afb53ee4a2becea311defc260c6d1fdcf08829a4c5590b113b3cb60a814ce944934ef5cb7c364093c4da21e514d SHA512 2c729c96c84d5602d3eb428c4c8bb5afde2242d412751a69631eaa159fcc40ce121d4b3b6ba48c29bf02a10668a8d535e313fad3afc5053b856e90a405cd0cd6
-EBUILD kjumpingcube-21.04.2.ebuild 916 BLAKE2B 249b8f81a705c484f207ea28ef5afbd07d70d94c73a0be1b1d757e7fa51ce1dfaca1d27485b4a496ca1af5f5791594a815440f4408df3d04e567168216cf88d9 SHA512 bcae4bc3c4a366bf9944b048e46d793edd7b6956c1ebacd0fd1edc1ceead683212c99d51c3157a87d5981c542993c518d810d5e6eff66e42e189c0e95bad3ec6
 EBUILD kjumpingcube-21.04.3.ebuild 916 BLAKE2B 249b8f81a705c484f207ea28ef5afbd07d70d94c73a0be1b1d757e7fa51ce1dfaca1d27485b4a496ca1af5f5791594a815440f4408df3d04e567168216cf88d9 SHA512 bcae4bc3c4a366bf9944b048e46d793edd7b6956c1ebacd0fd1edc1ceead683212c99d51c3157a87d5981c542993c518d810d5e6eff66e42e189c0e95bad3ec6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-21.04.2.ebuild b/kde-apps/kjumpingcube/kjumpingcube-21.04.2.ebuild
deleted file mode 100644
index a9e7e4ba3804..000000000000
--- a/kde-apps/kjumpingcube/kjumpingcube-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Tactical one or two player game"
-HOMEPAGE="https://apps.kde.org/kjumpingcube/
-https://games.kde.org/games/kjumpingcube/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 57f1fdc725c8..f79b76857d7c 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,7 +1,5 @@
 DIST kldap-20.12.3.tar.xz 164652 BLAKE2B 35c8f03a96616b125f7df264ad060753ae306b2503c350a90efe37884ae661f786b3e5a98078eec1fa9169872ea688faebb3b6847bc992499e5c57181e63491c SHA512 d1220afdd157de224fd65306f1b77f80c1adbe195307bea51c6de5234e9a94122b2c24d38e050ad5dd1a9597b5f7f0f65ea5de73a38c4a309d5692691ed09d54
-DIST kldap-21.04.2.tar.xz 172952 BLAKE2B 49866eb9a26ed68e13978f137932d73fffd3589bd17d240ff45dc657c4c8a50aec64756c1999a37faf96134b00fb5bcac0ccf8fbdcea8ba1ad363dee8e4d474c SHA512 fda0c08919aa57cde5789eb348df3982ff48b0691618f63ddbefffc3228edc1c64a24593c033787e36bac81cb99d400e1408bba3c5ee3e444fde4102315fbcdf
 DIST kldap-21.04.3.tar.xz 172864 BLAKE2B 50ebba423914a59fb48535890d58196fd12a15a7c7022a4f8465e1964d79c16d217ceb36808502764171fd2f9827bd0a841d0acb3f4589520df4bb4d83c8547c SHA512 01e9a36e212d912f86c43c1a6af9b56f48c5ae041b17e282bd2b3d913257a757e6b43bda756507fe50068b3ded17506e3427df0bed2a9114d327fb808dca3e15
 EBUILD kldap-20.12.3.ebuild 663 BLAKE2B 388c2498b74bf8094d3ddfd4c77c6d2aa74100666869d6d1a88a7c79a421f090039d1290a3d737163bde4563ae51967e851dff1ef6d556b4633db6e7d4ddc758 SHA512 16cd24268b8c058a4eb1c9899d19ec60492b03f5e5f195d0efb97337488b57da340d426c7dea38a9effef7c59bb2e51fe68b7aa67355c6eb6ed3274e63420984
-EBUILD kldap-21.04.2.ebuild 652 BLAKE2B 6f6d34813c3da5edf3393154afda644830023fed4f1712f27e2db94673b53724f0dbed7c1df1e30ae60d5cb16ec99cb47c55e11ac19caff7798c710329705555 SHA512 23bae1ce2d1568036847e2b52b8db8ce4e9bedde5e2eab0d02124a486aa6264f297e25a247a4c1dfdfdfec1aa3bd9856dadd41a0883e702a2e42c413c5628db1
 EBUILD kldap-21.04.3.ebuild 652 BLAKE2B 6f6d34813c3da5edf3393154afda644830023fed4f1712f27e2db94673b53724f0dbed7c1df1e30ae60d5cb16ec99cb47c55e11ac19caff7798c710329705555 SHA512 23bae1ce2d1568036847e2b52b8db8ce4e9bedde5e2eab0d02124a486aa6264f297e25a247a4c1dfdfdfec1aa3bd9856dadd41a0883e702a2e42c413c5628db1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-21.04.2.ebuild b/kde-apps/kldap/kldap-21.04.2.ebuild
deleted file mode 100644
index d144da6de3f9..000000000000
--- a/kde-apps/kldap/kldap-21.04.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with LDAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	net-nds/openldap
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 4ca1d9075bb7..6cf171b7313b 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,7 +1,5 @@
 DIST kleopatra-20.12.3.tar.xz 2001196 BLAKE2B 2bab317762becfff6f44d8fecd1ae25a9425c30b492ad201cf51e249d26bfc145bdb0dc06bb52b6511e131ffe9f26b9b1628b6915dd415d223786e950c533ee4 SHA512 8f27930714988d53622c0d8e5e5e3cd82e58eaf6582ed150f4a7326f61837c44fbb6dee2881934bdea1a0d8976b7173ef5d580154ccfeb84e75e3b0c38019433
-DIST kleopatra-21.04.2.tar.xz 2115416 BLAKE2B 0827420f2347ac72a09aaf0631c7975ca0bbf29cc3d9b0ec47daef262610e8b5f1dd052a06f2851e59014a5a61fa12575a88942339b72d03c8045c9c5a2b45db SHA512 405a17a7e82c02944bd6ad96b4a941e9b890305769ccedb8442bfdce3116945170dee0c18f89237b4f70eec7dc547ab6be8d88a5a6bed5223a0d6cb0a21f15f6
 DIST kleopatra-21.04.3.tar.xz 2119036 BLAKE2B b4690d2760ab814e36a80ef36a0584fde1c2edd97e1dea1f939ac7d3cddd4c8b7b9210f0ba58d83cd680a080131c6d61cad2bdc5eb66bbeee3aa365b6a547d37 SHA512 4cc6298b992d1c917226caba4f3e6592cabd33eaf9164e94fb58ecdc6c939417fcf88e018b0867e6d5baa8eddc5de6b64d9a7bb137ad641085ddf8b8511bb5d3
 EBUILD kleopatra-20.12.3.ebuild 1473 BLAKE2B e149567fd9b5a27042ccd9fee14f7cb5a9e6ce6f02966efda6b7c5ee3ed73cb2ad2f375adbecb089e95bf160ee038eebf96d2e2a2fe22616f445a672176dd896 SHA512 a8bc8ab9e5e4205e700da23eb2d3c55d71e1c3fca14c14778e8464afd7528ce4e1121db5b4068a55d07218a19bae97130df9354824e9c9eabe6d623be515bd09
-EBUILD kleopatra-21.04.2.ebuild 1476 BLAKE2B e2205932a9bbc88339714410bdb1dd9fcf9dce517158ececaf7f1b21e435d788eb2f2dd02b70b9bb68c735ea16e8da5b7ca21a1e1772bd2d847d4237cb8d458a SHA512 8600ba96153d73839f6cb38d875e4b92142f667a0129390274c559820537527ffaea85c14101e57ca2d2c66fc85715290d63baa51f31aec30005d2f95e3151be
 EBUILD kleopatra-21.04.3.ebuild 1476 BLAKE2B e2205932a9bbc88339714410bdb1dd9fcf9dce517158ececaf7f1b21e435d788eb2f2dd02b70b9bb68c735ea16e8da5b7ca21a1e1772bd2d847d4237cb8d458a SHA512 8600ba96153d73839f6cb38d875e4b92142f667a0129390274c559820537527ffaea85c14101e57ca2d2c66fc85715290d63baa51f31aec30005d2f95e3151be
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-21.04.2.ebuild b/kde-apps/kleopatra/kleopatra-21.04.2.ebuild
deleted file mode 100644
index 67ffb80aa5c3..000000000000
--- a/kde-apps/kleopatra/kleopatra-21.04.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://apps.kde.org/kleopatra/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/gpgme-1.13.1[cxx,qt5]
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
-
-# tests completely broken, bug #641720
-RESTRICT+=" test"
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index ccfd91ac5e91..ed7b7472b5d9 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,7 +1,5 @@
 DIST klettres-20.12.3.tar.xz 47059092 BLAKE2B f4f55c6e9f3895042f6bff7aaf5d764d902ac4c35018b8ff277dfb1d01e1dd541ad03fa3a208b7ef74479da6dc8912e4497aaa3e29daf69e10a94462b4dc7381 SHA512 89e3b72f07f3594b83909e0cfb719a074d999a4ffc253d340d018ab3523293b41605d66fa3f0474974d9a9f0aab57c7bd443cbf58968495ccb69598e6f0da094
-DIST klettres-21.04.2.tar.xz 47136704 BLAKE2B 4873b660948bcd81c5a9a6eef39cd5c0945f6f782ac70cfa2baa5a58ea57ffb5c4efbf5d0949f0a0b6919beb16e658a5200b8901ab9ca99b85332d898dd55809 SHA512 2cdf453587c1233fa814a3bf11ace3844c7942df31720734da56a5a6c0250a5a7cf08635bd04bd17c7ce49cba8c918802717e283fea63483f9fbbb2be9c2d7ac
 DIST klettres-21.04.3.tar.xz 47137188 BLAKE2B f62f524b5987428bbf1d65fb73c57150749e3f5ff629f1f9a80002c6e67a82e48e8af5a5fc3c0b599fbfc9b821a5c5eeabd9b27381d7be71fabc78f5c00be3be SHA512 33cf32acf0be7e62429e36f12bb84e04b67770bc07a238de8959c719c0fd6aba9515c56eada2e6004144e2311ad3f899040f8775d494c6434fea9482cada104d
 EBUILD klettres-20.12.3.ebuild 865 BLAKE2B e7b897204cef064638f7a74a8081a089a42938fe86f76f43235dd49a30bfee444704c6b6514da385bfd151ad559dde7d92bfd4461d2b3241e6f2fa4ed2c67d7b SHA512 1694523d5af22da7e8ff2b007a848978bc802242638013689abe5c2748051e4489cdae94cd2eba3f120f50948223e2de2db60bb1979d8840ac278a7738ba9ca6
-EBUILD klettres-21.04.2.ebuild 868 BLAKE2B e1a5a19203b85f1cd5320ca80d4e7a332cb942d30302b80d9b0d5efe1635bf54b67f4ce0d4cfd460d3a30a32fd4d404b4d160215bd71f0a2145fd447be8dbad5 SHA512 ea7a38791eba126c9f79264e34b0ea72dba9a3f936964bb5fd0bf5fa9ef4d78ef1890e46987983b6596e88bf1df234e2179863279d43e51344e2148a224f7f3e
 EBUILD klettres-21.04.3.ebuild 868 BLAKE2B e1a5a19203b85f1cd5320ca80d4e7a332cb942d30302b80d9b0d5efe1635bf54b67f4ce0d4cfd460d3a30a32fd4d404b4d160215bd71f0a2145fd447be8dbad5 SHA512 ea7a38791eba126c9f79264e34b0ea72dba9a3f936964bb5fd0bf5fa9ef4d78ef1890e46987983b6596e88bf1df234e2179863279d43e51344e2148a224f7f3e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-21.04.2.ebuild b/kde-apps/klettres/klettres-21.04.2.ebuild
deleted file mode 100644
index 8b45e2297579..000000000000
--- a/kde-apps/klettres/klettres-21.04.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Alphabet learning application"
-HOMEPAGE="https://apps.kde.org/klettres/ https://edu.kde.org/klettres/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 45f634e5e6e7..9ac4fff343d0 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,7 +1,5 @@
 DIST klickety-20.12.3.tar.xz 1394852 BLAKE2B 47dd866e470b8041d2c41b7bf7052661fa4bf5beaf17c932497b2c231446fbd72799a7157cea21f38427d40f03b4c8ef3276bffa1d8967c3c12e81aea53d7ce8 SHA512 6fd26ee6d83e70f01911c31b17fbf398f718a54d26997174792c75884d0cd97f935caf7b25730ef1a9f6f1bc6daa78396449c19412c07936e630b5a7d42bf9f5
-DIST klickety-21.04.2.tar.xz 1394216 BLAKE2B df80b0c54b3c71d79459c676699732d735ce81a832e228a0e9ba1436468368895da912acf6fc3f939a4d3e7dd881444036bb37dd930d5c5f200a2b07fa2d2713 SHA512 ba219fd093849cc594e999bdf077904fd1144e57ac640c6eba60c85e92da5b86b914418344d532ed6552ff6c0938402f46d0da3d9630850d7951c182c6ca032a
 DIST klickety-21.04.3.tar.xz 1394232 BLAKE2B 6f8b255261734bbcf3d5958309239b083ba5751eaf75579ba1f350ae913a7c30c3d3681d9ef7c7529a49fcd6922ca2604fe8ed5bbc36276e3ed260165dc0f592 SHA512 115d6aa0ffeb0d606c746f5cd9e4f455335c12250663a034efd00fa4d08abca547ba4de355bc79f70bc7accf8648d5c155cfeac4ae0c50e6d338118125b55422
 EBUILD klickety-20.12.3.ebuild 1013 BLAKE2B 5143410baa8028d924abd360b6abb4d5140238654bee85fdc16a6581249183a0d6dcb314d348f161e15b5255f68099dd4c37f23f92323c2f5810da7dcc926590 SHA512 1741353ccdad251a522a900e098920221dc39e3a84eadae81735f0f7ab3fde754f139d5ffeb2bd1e071981198de38f3b1ebb07e37cd0b292d7ddb784af68550c
-EBUILD klickety-21.04.2.ebuild 1016 BLAKE2B 8ff8453446a6a08a47c357c4d4ba076b8798848e1d63e998c470687fda444080a5cf96f2e63ac23c129fee36618ed4ea7b410550cfa89294fc48abd9f23095af SHA512 884c17a42da5a8e0b69e4580eb079af6b99d7145fd6dd28941c0e2eabd33f228ee3cd402f5ec56e58119aa2e3108b6143ae7cadd8d95ec374356a7b9858a216b
 EBUILD klickety-21.04.3.ebuild 1016 BLAKE2B 8ff8453446a6a08a47c357c4d4ba076b8798848e1d63e998c470687fda444080a5cf96f2e63ac23c129fee36618ed4ea7b410550cfa89294fc48abd9f23095af SHA512 884c17a42da5a8e0b69e4580eb079af6b99d7145fd6dd28941c0e2eabd33f228ee3cd402f5ec56e58119aa2e3108b6143ae7cadd8d95ec374356a7b9858a216b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-21.04.2.ebuild b/kde-apps/klickety/klickety-21.04.2.ebuild
deleted file mode 100644
index 540445ffa5a5..000000000000
--- a/kde-apps/klickety/klickety-21.04.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="An adaptation of the Clickomania game"
-HOMEPAGE="https://apps.kde.org/klickety/
-https://games.kde.org/games/klickety/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 9ff77a3ad30c..c6f265fbd77a 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,7 +1,5 @@
 DIST klines-20.12.3.tar.xz 1790320 BLAKE2B 78ed389575599fbdbc94bd2ede84e09108f4a98b7df94fcbb8aac7d4031bda5c5b5b247da2ed1dadc8c91018d3dfbccebe8465c6927701e9de0cfbd298d5aff3 SHA512 8e580603b78e405c52dea0d7c9c122d47018898d6c6a9999f1945c43c2afbb97e38fdcf35d5782ed38549843d1fff9f00b1bed62e4fad529a9cb55aa64d2b83a
-DIST klines-21.04.2.tar.xz 1794380 BLAKE2B a9824d7c47621a32d0ce5132fb25dd6708309a6f1bc254bdf386b900ebbc10c7a6dc9c6e644b0fa0756318ef1af6ce021791cbe697335160f6d04031ce54368a SHA512 7ec47012dcff85dba3c9bdb77d93dcbe31821ab12cec73694f5a7800e62c5e6df18ead3afc4fe141ceb3527e92ecfc19b5095f32aaadf04fa8bea474616ca40f
 DIST klines-21.04.3.tar.xz 1794180 BLAKE2B 848edaade703f411936ce644b29790a3f9ee6b19f36c676855d3f0d78e15b3fcff06bb51a6cb2e6d055eb585373d6e511113bd6b7c002cada5dd1c392e877080 SHA512 1d7d04c1e11b3e33a95749ec8516459bd6c6399e6d08f1065aaf50499b8a778256c826ea9c8107c264acc08622834aaf65d817e90ca12d3fd4b4cb033c2e4b0b
 EBUILD klines-20.12.3.ebuild 917 BLAKE2B a76ed337bba04cffe5fd8614696c75d75789317106c7181eb49373e87e75e4e205f161cb610370fbf91fb1d4768b51a9ff11ce23b9297afd065277845474f6cb SHA512 5fdc4ed805775ff19fc97d26ac3613e72bd71083fb6d59c7fe4e909396b984caa367b821764cd315d750ef832329ddde28d6665f27893a64cda061061c8e4e95
-EBUILD klines-21.04.2.ebuild 920 BLAKE2B 6aa316cddc814ae04926fedda7ae5778238963f318a059723b8b13dd1ac40db5504f865c04e8181e9556de84d2f98464b2caca8428eb8983185eab259f760bdc SHA512 2edb994a038e332f3c6350573c081abbd7607eeca62236680118454f4acae3ddee6b26d88652b19bbbdef3b8bc42aa2628c87fcc419cb71c8055974e158711e1
 EBUILD klines-21.04.3.ebuild 920 BLAKE2B 6aa316cddc814ae04926fedda7ae5778238963f318a059723b8b13dd1ac40db5504f865c04e8181e9556de84d2f98464b2caca8428eb8983185eab259f760bdc SHA512 2edb994a038e332f3c6350573c081abbd7607eeca62236680118454f4acae3ddee6b26d88652b19bbbdef3b8bc42aa2628c87fcc419cb71c8055974e158711e1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-21.04.2.ebuild b/kde-apps/klines/klines-21.04.2.ebuild
deleted file mode 100644
index ac465596b431..000000000000
--- a/kde-apps/klines/klines-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="A little KDE game about balls and how to get rid of them"
-HOMEPAGE="https://apps.kde.org/klines/ https://games.kde.org/games/klines/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 787a5155db89..f97e56ed1b7c 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,7 +1,5 @@
 DIST kmag-20.12.3.tar.xz 700412 BLAKE2B d4abdc75fc6960fc9e6a6b2ab1f8ca35c6a1aec204e774e6a1610423758ab3f89066b30e6c811d374a89a671b8a6ee852703972f12e295e9adb5aadc7e80ac86 SHA512 6c80bbb0ef4e54ad9f4cd6275da7cdfb878d93f8826e78ea68d1330ca75e438474b0f288a676f544feac144a8190fcace37e53f94752ab40fdf93373c1aa1be0
-DIST kmag-21.04.2.tar.xz 705540 BLAKE2B 49a16a98df418acfc5696e2223c95deea2c96848700c17ca40cce1befc05f257385f4da83f429e477286f2857133f81fa39d48b943f2bbd170827dde1ea95a23 SHA512 d86381824e1023714b31a3e1f4f295eb4d63d2d9ad8608c4d65bfcff83fa9bb3a120a6c78b66ec3d788caeb96db95e0786c2dd5c32bd1f4d5c70e296cb9abc3a
 DIST kmag-21.04.3.tar.xz 705548 BLAKE2B 0a2c353317189e41e09d40ea091e6f075a6145a7090ca3da8bda379ef75ec9905aff7f0f7c146fd1650662b95e686de58935293c8f7bbc09adbd31554219910b SHA512 b8893a9ebae7c0c2f15b27e0219f51992a3670783c5d84caf9b371b72cf0ec8d80580e067d2dd0d1b6ed86b80d71cb5eb383cd45f31dbd27809e6d73fa5668fa
 EBUILD kmag-20.12.3.ebuild 938 BLAKE2B b517195e4d06c555550f2cfbaf6ddebb57532d13fd70db179ad5788b065257140d84b616147c4a68228c94edc26655a40f4e7172aff047de3fb2f05b7d366afa SHA512 5ee83fc4fe508916cc5348797d81e8a69cf001f65691d751986514d632c350e0d4a0cd216fd5b8f7176c5cb49328e08885b49d866fa88fad964ad7910ef4958b
-EBUILD kmag-21.04.2.ebuild 941 BLAKE2B cfd2b527435bdb758f474d7b42011f5e5123f6bb577eefaa3314624c1dc629b732d30d5c185ca731e5b04e8ab0423ddbc79ec09ad7f07b9ea52f5a7434b6b162 SHA512 7e166e6eb11a7a27207774800d726da937a008570b437c19732962782cc9f2a435b88b3134b461a729b634077bbd5fbb1227a5ff158129a885e82fab860d839a
 EBUILD kmag-21.04.3.ebuild 941 BLAKE2B cfd2b527435bdb758f474d7b42011f5e5123f6bb577eefaa3314624c1dc629b732d30d5c185ca731e5b04e8ab0423ddbc79ec09ad7f07b9ea52f5a7434b6b162 SHA512 7e166e6eb11a7a27207774800d726da937a008570b437c19732962782cc9f2a435b88b3134b461a729b634077bbd5fbb1227a5ff158129a885e82fab860d839a
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-21.04.2.ebuild b/kde-apps/kmag/kmag-21.04.2.ebuild
deleted file mode 100644
index 0471ee4b760c..000000000000
--- a/kde-apps/kmag/kmag-21.04.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE screen magnifier"
-HOMEPAGE="https://apps.kde.org/kmag/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="keyboardfocus"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package keyboardfocus QAccessibilityClient)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 02dd30cc131c..43ced7996c87 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,7 +1,5 @@
 DIST kmahjongg-20.12.3.tar.xz 3435208 BLAKE2B d8df800bbf58181592f4db16b97bae69811570aef89a922cd097a297556d1aa0493f5e422b243314d292bf41e2b224e531def326a51e7d8546628c2b8915bacc SHA512 f9c021e00f2c1a0be6acc589eb3cc6eed6541864d30e46a39d96a4b08f04ea497d1a2d3eec6706f66d0e3539ee571663415e12d666a972b21a412a061f3ce703
-DIST kmahjongg-21.04.2.tar.xz 3440588 BLAKE2B 2df48eae02126d4801570363143998693d1d414a7c83a3a7293843bcf10bd0f4867105de070901b43d3ff3b37bf408811ce812a96686bc54f8dcf5292a24cb97 SHA512 7c21cd5adf6f3bc8b0c483d9108e638daf7e261ddca35cf2ebb1efe32e69139ffccb7dbc38d8f378b3f78149f47dd09bfec5a0480a27be0d3814106c4e8021ea
 DIST kmahjongg-21.04.3.tar.xz 3440632 BLAKE2B dd700d9bd0d3a7e1211df6abb63d829058e52e88c0f965048511abf16fa1820606d42c7dc9be9cf8a4fe1426bba3db79c007a284b5aa393d9a5003289f5a493d SHA512 bb485cf00db8fe910dcc8784949b2320d58b0d6ef0f9c22f4367d15959369172bdbfadfcb869b2fa62815004d5da9acb97fe661c39af697fb5b12b90c0ebe41f
 EBUILD kmahjongg-20.12.3.ebuild 1077 BLAKE2B 96b95a9f4467ff7af19554ad30a5f18149e14adfd0b0107e0802e83e0def7d3a01b3591cd3f56201977a220fbb678265748767bcd455b60620435e71946a128c SHA512 51b299001b30cc80836f184b0bbf6f4bdbbefb430a9caf913b6f65153e17a6566301efd482f5f923480f2487cd399772078d3ba169318b52b31a91753eb32497
-EBUILD kmahjongg-21.04.2.ebuild 1080 BLAKE2B fe929fb204cd35962140cbd24ce830eba22e9910275521770edc112ae2c6ae2b671bd3b3ef780a894888dd326485417b92a43d92ef3be1918982f848049eff5e SHA512 b3ad84a6ce187c3955357de51b4742493894b3b5570a292702395de944cc250b0e51bbf6f71aaf795107c37547a5096d228b4742de9043eaa93822bc0d3769fb
 EBUILD kmahjongg-21.04.3.ebuild 1080 BLAKE2B fe929fb204cd35962140cbd24ce830eba22e9910275521770edc112ae2c6ae2b671bd3b3ef780a894888dd326485417b92a43d92ef3be1918982f848049eff5e SHA512 b3ad84a6ce187c3955357de51b4742493894b3b5570a292702395de944cc250b0e51bbf6f71aaf795107c37547a5096d228b4742de9043eaa93822bc0d3769fb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-21.04.2.ebuild b/kde-apps/kmahjongg/kmahjongg-21.04.2.ebuild
deleted file mode 100644
index 9c53086021b5..000000000000
--- a/kde-apps/kmahjongg/kmahjongg-21.04.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="A tile matching game for one or two players"
-HOMEPAGE="https://apps.kde.org/kmahjongg/
-https://games.kde.org/games/kmahjongg/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-apps/libkmahjongg-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 64630b5fc907..2032c52360a6 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,7 +1,5 @@
 DIST kmail-account-wizard-20.12.3.tar.xz 160704 BLAKE2B 2cd23f83f6200027953a78eb1a108ac20f406881d72bf6969b58c4f4176cbca5a7618b490f32ad1ec0c9c89499f296d411bc45fb8dff3a86353f40bb3ab00e64 SHA512 08508bd5e28ee20953dac413f56a62cef49b4d5d8ce5c14cb8482feb9b5c9f2abd65473923b5035977112bfce320b1da466d98bb64f931dbb435406327b57ed5
-DIST kmail-account-wizard-21.04.2.tar.xz 166504 BLAKE2B d86d4d66f3383c5fd560a3d269958e61476b64845e79593f332a47b80a4096fc1109188a8e7388cafed78e9d6e852826e23467f04e2ff19353f7ffc5c69d3911 SHA512 8cd314732168515ddad2ba90530e83c37b7bf2fec371c06c576c852f19588855f28a633f13ba11970c568315432cc4d30153ccd0856f234b20ef02cb9a72f792
 DIST kmail-account-wizard-21.04.3.tar.xz 166524 BLAKE2B e57c7dc5d649d491b7d4105e32bcc90f8db3cbd1c011c639a044c6de512c2618b03a4567251f308a237eed15cfc70c2a6fa639da1605730df7bbe30fac49e153 SHA512 075131a68dd02d61311107a8e3050044e095188b52915f493a2038fa384855de22823aca284f3aa856b388bf1acc03df2fcc3e4700581656925c2f079aaf3bc6
 EBUILD kmail-account-wizard-20.12.3.ebuild 1586 BLAKE2B 6447853c5087029c32f02f9e64fc8f48851c46e11038b41b8a54b0cfae076e67d8c7431f41ab606fb788aa1995911492339cfccf1bcb01b3553066a0ba181452 SHA512 207a5895a033c0616d6be993a45d460e1ff2cee466792d63a2edca4bb4920f5fbe81bfec6bfde8a08bf1d0d4924e9d21342668271bf153779827a7882bfa2075
-EBUILD kmail-account-wizard-21.04.2.ebuild 1612 BLAKE2B 9a48615732cd59aa1c11ed3ec99bc82b9e5e6bfd31e6bdaa31c6aedaedaa43006863e4f700c3a42fc3a95627e8d7612cd186651b4d6e2a9560146bd8286032a4 SHA512 f16c284f08179f67215d9707a4e93c46f06732c9b6d9b2bd93c2605c09884be500a8a87c3a6ee8effaa2bb74de5cae73f60f81337f98cde7b8c50bc91c981223
 EBUILD kmail-account-wizard-21.04.3.ebuild 1612 BLAKE2B 9a48615732cd59aa1c11ed3ec99bc82b9e5e6bfd31e6bdaa31c6aedaedaa43006863e4f700c3a42fc3a95627e8d7612cd186651b4d6e2a9560146bd8286032a4 SHA512 f16c284f08179f67215d9707a4e93c46f06732c9b6d9b2bd93c2605c09884be500a8a87c3a6ee8effaa2bb74de5cae73f60f81337f98cde7b8c50bc91c981223
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.2.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.2.ebuild
deleted file mode 100644
index 90a11b294b98..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index a8337ad675f4..7c44b8398c96 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,7 +1,5 @@
 DIST kmail-20.12.3.tar.xz 4671256 BLAKE2B a6cc830c5fb0f3612c990462fb8dff0fdb33ef81a7909f47c4165da2c4d8b2e4dbc9ccd06f2d8511fb0e3248aad14877bb7c78abf82d792308939b330c35c2a9 SHA512 ddb05673fb8d8a11a4aaf8b8cb5cc7fcdc74d2ab26482ebd61f426d12d5247518f3a4fedd74d78812bbacdeca83cc24db9b749efd40bf8caece4bcb2f77902c8
-DIST kmail-21.04.2.tar.xz 6485752 BLAKE2B 6a3539ad6ee4ecf330bdf65bc78ee255877854805ced6e1c724c9947dd6f89ef69281692cdf6554e30a3e1c5fcaa998a480a38b8531b28f50f9ed25333922002 SHA512 ae98ba5391f6ffa3d117512ae3f170ca3b29ffd062ed76a8d1fb1f4a92fc70f9eba55a372e38a7539b1ce4e59c312b76242b4387dafe05b0e5ce06090c4014d8
 DIST kmail-21.04.3.tar.xz 6485408 BLAKE2B f2c1a1de707dbd9c8c2d2567670d9abec49378d847128ca1465e251ffb5e25a5a054247586ad33037925dfaf9ea014db01b7a1b1baa6b35fd689e7fdd0b888fa SHA512 348d67ad825b4e2a4066736a58b71301353258be5cee1c2252ce0789866f294e4145c4556f79f918c47ffea015e4cbed42270964b7cd1002feafd54fed8a9895
 EBUILD kmail-20.12.3.ebuild 3396 BLAKE2B 02c449cc99acffc1804b02cb5fad19781d0a59233083662b3acb11308c0c6a6216e6bdcfe40811511aa039a6ef5ee29105db14f2d70ee149630aa4ade3d55567 SHA512 7b7eead522ffbadcd4112607a49f058fdc8d8f592b162ef77ac1d3ea0b8223815e55c5766b47c0850fd1270764b87d2080f1d351f4dcb30b58791205d3d64393
-EBUILD kmail-21.04.2.ebuild 3406 BLAKE2B 1c592fb6e2c077c9feff98c032cc21533d65becaad5eadf521ef8eacdde9931a7e1b21e4fadd312f4df3a54c2deed759635145bf6926642b3de0bd84ec8e9894 SHA512 e1c182e923bcf25244be4f9c840171840f3c29d27a57b0e073467f5190bea6c19ff9a684a802cee7a854b210b3c4bcd07872e1330dfd7c7259a6072262ba728d
 EBUILD kmail-21.04.3.ebuild 3406 BLAKE2B 1c592fb6e2c077c9feff98c032cc21533d65becaad5eadf521ef8eacdde9931a7e1b21e4fadd312f4df3a54c2deed759635145bf6926642b3de0bd84ec8e9894 SHA512 e1c182e923bcf25244be4f9c840171840f3c29d27a57b0e073467f5190bea6c19ff9a684a802cee7a854b210b3c4bcd07872e1330dfd7c7259a6072262ba728d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-21.04.2.ebuild b/kde-apps/kmail/kmail-21.04.2.ebuild
deleted file mode 100644
index d121d8cc0e16..000000000000
--- a/kde-apps/kmail/kmail-21.04.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
-HOMEPAGE="https://apps.kde.org/kmail2/
-https://kontact.kde.org/components/kmail.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="pch telemetry"
-
-RESTRICT+=" test" # bug 616878
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-	>=kde-apps/kmail-account-wizard-${PVCUT}:5
-"
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_PRECOMPILED_HEADERS=$(usex pch)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "virus detection" app-antivirus/clamav
-		optfeature "spam filtering" mail-filter/bogofilter mail-filter/spamassassin
-		optfeature "fancy e-mail headers and useful plugins" kde-apps/kdepim-addons:${SLOT}
-		optfeature "crypto config and certificate details GUI" kde-apps/kleopatra:${SLOT}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index ebb1f3de8ed2..96d162bfd0e0 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,7 +1,5 @@
 DIST kmailtransport-20.12.3.tar.xz 168148 BLAKE2B e3a5c99810fefc41088f8934e1a651b615281fda2bc1ff3eee2fef08d53871d99a752a9e773312ecc4b2b3beb3f6996e71c90d23164af44247708ab70c27aeba SHA512 7f270ee8d6695dac72611ff3f092a84ebd36bc8b4e373e04f8e80bce04080fec9f8f4eb0d88e968a641b62f7b860a7758b168ad992d5b849f6c18334a3e716a7
-DIST kmailtransport-21.04.2.tar.xz 174076 BLAKE2B 9284b809649cbfb530c6af93b4f8593f1bd819365f6b42a011e18d71f03256b6daf92cc4668391c9b654ca7e427ee6b1f8b5ed8a1e4581494072358f11acbf4b SHA512 c2d2cf91d1405a9f2669002688dfcc04ab0006eb75b6e77f9f6826078386f13c477358df2d289aa55eb7cdc0d6f164499c9b2b97e91430368da482a00d0e8268
 DIST kmailtransport-21.04.3.tar.xz 174100 BLAKE2B e356305570376df2c147e7c2e768f427237c05b56f2325d89774a067620c9d5162dfddeb7d50f7c5cb84b7270d338016967541c2fc67a52d06716cbc990a1228 SHA512 aa4afb187969faee3b6fc5567595232ac5aa74aebfa2e407e0ad10245f4bb26da4fb8beae17b2a2a3d3d8b676198e1eedc694f4ba669927b3a6eb50be6703c30
 EBUILD kmailtransport-20.12.3.ebuild 1035 BLAKE2B fc9b58af02bf40342b2c0f3a37d3ad1af3089fe680b6e6380d04cb5e7faeca8f3c3b49c374dc1c3182e171bb213b9ead8551cd383798322741d5ac1ae6da2e0c SHA512 13261b79e4af534f8997c411d835df4ec6a7810dcecd4f5d05352e7633d25618b249a30dd199af343faa5be4485793ff18c0d69caf1a990562cc184ba2bc5087
-EBUILD kmailtransport-21.04.2.ebuild 1157 BLAKE2B 7ba5ffccbafba87132e1121fbbc60b5b13cf6181f8adf62eb6e45c0df53ad9d84da0c3e369970c48c53ef0a05bec2e8716f163c9b60aa267fd45c716c452e386 SHA512 9f0e0b5829e43c7dde0a537ca6eebadc40b3955e850ca626704320e02a66780cd4f02939d1fb263e8be6e9defcf0c603c5c581369d7110262404c964a6bf3dd4
 EBUILD kmailtransport-21.04.3.ebuild 1157 BLAKE2B 7ba5ffccbafba87132e1121fbbc60b5b13cf6181f8adf62eb6e45c0df53ad9d84da0c3e369970c48c53ef0a05bec2e8716f163c9b60aa267fd45c716c452e386 SHA512 9f0e0b5829e43c7dde0a537ca6eebadc40b3955e850ca626704320e02a66780cd4f02939d1fb263e8be6e9defcf0c603c5c581369d7110262404c964a6bf3dd4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-21.04.2.ebuild b/kde-apps/kmailtransport/kmailtransport-21.04.2.ebuild
deleted file mode 100644
index 2a0f914c9436..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-21.04.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Mail transport service"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test"
-
-RDEPEND="
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/ksmtp-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep KF5 Service # fixed in 21.08/git master
-}
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index cb828d0673b2..773caa269b0e 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,7 +1,5 @@
 DIST kmbox-20.12.3.tar.xz 24792 BLAKE2B aa1607ebb99149450ee7fd17f87b8083e0567d61a96de0b378bd55f309f49e6b69812bcc395f2f9886dfec7d4267621ed2ffc985397f9937a05606e308209811 SHA512 6df398ec30bb0d892ef6f29586de345400bfa8bad4f5888d1aa2ce9b71c99e59dc96778bfbf4d08085aabaf32f0c8cd374afabe079b9956a13134c69b49d1fd1
-DIST kmbox-21.04.2.tar.xz 28472 BLAKE2B 68ad17be9bc0c1d26d162fb824b0ae18536e62cd2135fbce51b83d87ef2298ce258df620c80e0750027549472f21ab02216910d546801f3b0fc68f5b05a19ab5 SHA512 07a5d0a176f8387673e423dfc4b1f40c938ccb3be8cc192f76b6105a739f75bd43fc7f5367df07a4b206434b68b1f258eda030b1176fed856d161a3ddefcbba9
 DIST kmbox-21.04.3.tar.xz 28472 BLAKE2B 6c00164df8631306af367a508bb42881cd62c0b94fb4634989c585159e9f2e947ac36052302b8a1f145f131573e206ba2d1dc018a2db1137c42fa15b88d2a4c1 SHA512 272a0bcd99ce38ca57a0f33a0faaa691f05632ff00e6df04be2890b2352af12d7a6c81bb678d37d2cefd84ebd51b6ba1f247f337f764000eca98958b709f202c
 EBUILD kmbox-20.12.3.ebuild 360 BLAKE2B 4c2888b908bb267a9d28ba6cd701e4a6d8f8c3c46bd7890bbc5ec006d59ce451d125f1f60efc548c6ae7b5ca789c06b918aec8177f18d1b65b392fc2e39646aa SHA512 131268e0cb8d89323fe3b10dec5594ef60436bb1b3e65fd929f87fa92a58c007b3c8a92827dfa96605b3b690c0b772cd0f3c97ec504732fd8296d45084ea1733
-EBUILD kmbox-21.04.2.ebuild 363 BLAKE2B 79da5c18e82ab856ef60a7da3bd1d6f850d8be3753ab2379b9cb8440405e57ca33061dd95e9acafd92a9c69cf4c9636c1b73a9c65285ad4b9e33169a2efebdac SHA512 7d77f92a817dc6769d49b268571baa61af39b0788a9c0847d4a2d3ef014b66bd7e181f0137ffea35e74e9e5488ae1b9bcaa89e02b4d02526861ae018769696c7
 EBUILD kmbox-21.04.3.ebuild 363 BLAKE2B 79da5c18e82ab856ef60a7da3bd1d6f850d8be3753ab2379b9cb8440405e57ca33061dd95e9acafd92a9c69cf4c9636c1b73a9c65285ad4b9e33169a2efebdac SHA512 7d77f92a817dc6769d49b268571baa61af39b0788a9c0847d4a2d3ef014b66bd7e181f0137ffea35e74e9e5488ae1b9bcaa89e02b4d02526861ae018769696c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-21.04.2.ebuild b/kde-apps/kmbox/kmbox-21.04.2.ebuild
deleted file mode 100644
index 60d5ff84f72b..000000000000
--- a/kde-apps/kmbox/kmbox-21.04.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org
-
-DESCRIPTION="Library for accessing MBox format mail storages"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=kde-apps/kmime-${PVCUT}:5"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 28a456f73100..f906af4b1583 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,7 +1,5 @@
 DIST kmime-20.12.3.tar.xz 150872 BLAKE2B 8e9339304d2fe7bcdca5fcef459c253d91ea15206554e04e01f7a9a12e798370f468f72422179b83afc64f97e74acb55df8f5434e5d13f3e16e7dbd6006138e4 SHA512 8c472b64ec4633a31a53dc35f6609802cc9d15ebe035c64b162a0a1839d4ecc6a7252be380d5125039cea5b10ffaac67f30e2d1a35c005b81f57505505a00cea
-DIST kmime-21.04.2.tar.xz 154852 BLAKE2B e332059b1c5a741313656c355a2229d310200e25c0890285b37f0f8b210a17cdaf07948ffd3534be9c812d8030d8384fda4ab883547d57e52a1c02ba7d459af5 SHA512 14e59ed8bcabf9f84e362b3d7c78b1a893fc272f61abd8a4842f8bb3f7201bd556937fa16e6fab0c429248c883acfc60d9861e49a5f5f69d17c70e68fdc4cdca
 DIST kmime-21.04.3.tar.xz 155264 BLAKE2B ae0d257a7d0ad2f1aaa0f76e5f09af2b7e80d6263ead74db026fd6b5bce3c62c8474d3a2a91a8e1e57230c88b62c6f6d521bc142dfe5e562f1db539f3f2f7cec SHA512 4b563a50ef19434310bf717cf585423ca2324432d388ace49df43e24e70158e4b9280084a7bcc2cbcf21fea6a7b11df4789cfbd99bb9dcb559a38ea7cb60d6c8
 EBUILD kmime-20.12.3.ebuild 407 BLAKE2B c730aceb1d5852a8c93d916975ac08d5338ed213532d89ead9ad3249cbee78119bef13115426a54feb2c972f442e0e36c593983ec055ed711f6329ab6eb409c2 SHA512 8a05e1e6247e92f9d24e23fedb93ab7b6333f529ab7c27fda2948852ab3fc139a42d390be12e9b097c7461a18a50506d6570050d5476a4f799f6a82992cc2f7f
-EBUILD kmime-21.04.2.ebuild 410 BLAKE2B 8aa0c4026bf18fb0a6d073a335acf7458557ab8bb00665fb5559a5c18ddeaa4767663874d2c28cb9ec162eeaf74151923acadf6f7615efa5ad57dc01bc930268 SHA512 8b6fb0cbea44c65096d60c1c99c0fa3485f6730cbdd15d97b9bcb194d7b43375a230cc5cf4fe410e17126aac7f084c43813974f3dbb636132bbf10adedfd3333
 EBUILD kmime-21.04.3.ebuild 410 BLAKE2B 8aa0c4026bf18fb0a6d073a335acf7458557ab8bb00665fb5559a5c18ddeaa4767663874d2c28cb9ec162eeaf74151923acadf6f7615efa5ad57dc01bc930268 SHA512 8b6fb0cbea44c65096d60c1c99c0fa3485f6730cbdd15d97b9bcb194d7b43375a230cc5cf4fe410e17126aac7f084c43813974f3dbb636132bbf10adedfd3333
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-21.04.2.ebuild b/kde-apps/kmime/kmime-21.04.2.ebuild
deleted file mode 100644
index b7f50be49663..000000000000
--- a/kde-apps/kmime/kmime-21.04.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.80.0
-inherit ecm kde.org
-
-DESCRIPTION="Libary for handling mail messages and newsgroup articles"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index e715138c33c3..59f054f68378 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,7 +1,5 @@
 DIST kmines-20.12.3.tar.xz 959492 BLAKE2B 6b155ddd86c7ea27c37b2e3acf0bb6b3ae176a14325545a82da5abe380605082dd7576e88b74ff6eb928b76434c10f43c857c7a722a0d48a44fb86f356293099 SHA512 ba714171e9b58a4c997e98c35463dbc679673990d2ec8769b8007cea1164d512273e3d40ef94484c3034be935d5406ab386bb70e4e5739727a615d8c0f9cc22d
-DIST kmines-21.04.2.tar.xz 965432 BLAKE2B 09fbacc3442603adf063ec6585c8e30afce24032298485fecf95909e42d9d6efaf28fb2d8a13395c51ef0a5d419e0a45349b37ac30afa787f851c286303f9f5b SHA512 f91e9f5fb495158ca5e6483590b74ce738cb2bd776c707548a0139f36248ef6802754c629bcf5bd6bb0edeb1a40904718a9d32fcd46c9e21f4d514842247c78d
 DIST kmines-21.04.3.tar.xz 965464 BLAKE2B 6a059e71bba7b76dcb8904a0264037fa9d15c5892724878b6200077af096087b31429a91a4e3bb3c4f709691fbeb9e3513f95a0a9092f45f0c669dce26271353 SHA512 25c73e9a578746e3f449bde1b77479713e7bb4a52845d975962e7c1a4d4929f1a97a0be5f6140c701e06749794564a1076d81e291a7536f91880e7cd6088a45b
 EBUILD kmines-20.12.3.ebuild 910 BLAKE2B 7175e6b495b0af5831b5ee43a073271558eb67fb27bbcbe6a6fd5ed3314a7b2b949bc44657fd7e0193387ad3b65acb9dd81a1016dd5a50f57607181a850c3ee0 SHA512 848553a9a142e7b7bf51d8d9534b2360bb3df95eef11d4daae9da6e976f78e4c528c8a309d48153b12b53e8f14d8459e6da5cd8094e88b00ee159593eb44381d
-EBUILD kmines-21.04.2.ebuild 913 BLAKE2B b92ee9655adce59128692da0ed7261f342e1ad99ea4311d7325a2ba233fe456d4ce5fa01597d6a455a95bde0c33efde4425e8e186a45853fd472b73292a7fe58 SHA512 800ee7d47537c7f9ba837845ab6a61c7e43a4b99c2ba90968adc0ca09c0c8f9a15621e34bea60b17188bc1b26e93cedd9f98294077f5a37900dade6b036b30a1
 EBUILD kmines-21.04.3.ebuild 913 BLAKE2B b92ee9655adce59128692da0ed7261f342e1ad99ea4311d7325a2ba233fe456d4ce5fa01597d6a455a95bde0c33efde4425e8e186a45853fd472b73292a7fe58 SHA512 800ee7d47537c7f9ba837845ab6a61c7e43a4b99c2ba90968adc0ca09c0c8f9a15621e34bea60b17188bc1b26e93cedd9f98294077f5a37900dade6b036b30a1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-21.04.2.ebuild b/kde-apps/kmines/kmines-21.04.2.ebuild
deleted file mode 100644
index 93a89258f6ed..000000000000
--- a/kde-apps/kmines/kmines-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Classic mine sweeper game"
-HOMEPAGE="https://apps.kde.org/kmines/
-https://games.kde.org/games/kmines/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index f21cb318904e..153a38304a1a 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,7 +1,5 @@
 DIST kmix-20.12.3.tar.xz 1150476 BLAKE2B 1c5bd4f3ecaa1a58b2ee43c31993e1bfd02d69c6f1173a79e3ccec8cd9a215a7f0524d7c5c5e78b4dc692cfa27dd7b4e458a687515c210058770d8aae4b75ebd SHA512 cd261b9b42e81187136366a8cfcce7296d576553e8ec541785b5d53f9529cfd570af43c952dc0c36a5d3ad22abc56b02dbe040b7aebf5e9353b0ea3e670a6480
-DIST kmix-21.04.2.tar.xz 1161936 BLAKE2B 94df8e7826e589b2b76f90ec2687ced89b8e4a82d81cab2c1040578b6b6f2b6b8b716ee2ad496a6d451433f49a76b519c055bd29d19cd40a6aafda878aacc161 SHA512 4d351ed49e55214258e1116bfc26f33da71796576215fa0c1a51947e925381e528b986af808cc2458547dc2858251b94d0a0206686379126ae6e7a5d2e4c964b
 DIST kmix-21.04.3.tar.xz 1161920 BLAKE2B 2b59ed9ae41daedf1a3e581e98bee02cda4b6499cbbdeca3431f68e79119b6cfe88686a02af06009e24ad1894c9e49aca00415b5beee784211c6caa45b106971 SHA512 9577c5e9de3dc34e9301d52ec1ec436fdf4856d89fbb5ba735f83d3ea2af57ef308884ba5e18e7b989b503e3f73bb87428d9873d9034778d6d7fcbf47750b8e6
 EBUILD kmix-20.12.3.ebuild 1434 BLAKE2B 9bd7d90c1831791abfeef3c2f645d3252606a468103e77d44fe1df1ef4faa4a59b194979f8d089cb4d08d99077b32e732a5dc8f7f6b3f7a444996f0bce051eb0 SHA512 352fb8fd08095a38be04f2e838e3697f670d43a7b9455c6a8b8ddbe90bbe65d1ab66cc5590ed1cfb4134865a143d65ebeac06464f72ec509a7fadd590847cf2f
-EBUILD kmix-21.04.2.ebuild 1428 BLAKE2B c0b8def181fb0918dc2925ad80dc64c429089fc157a3419f63f3c329cf367337f3150c861e0c5681928c616a63bb2649050c09ba16ff02888a5701d1c12e9829 SHA512 ea4e31a16768b6ae9370eae8d7ffecaf77e058c8b7ae3ef4c7bdd4b06d1c1f56ea832b9bc183391a1967bc3847f650e68e6d92dd269717273dc888582640c126
 EBUILD kmix-21.04.3.ebuild 1428 BLAKE2B c0b8def181fb0918dc2925ad80dc64c429089fc157a3419f63f3c329cf367337f3150c861e0c5681928c616a63bb2649050c09ba16ff02888a5701d1c12e9829 SHA512 ea4e31a16768b6ae9370eae8d7ffecaf77e058c8b7ae3ef4c7bdd4b06d1c1f56ea832b9bc183391a1967bc3847f650e68e6d92dd269717273dc888582640c126
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-21.04.2.ebuild b/kde-apps/kmix/kmix-21.04.2.ebuild
deleted file mode 100644
index 617eaaab9f69..000000000000
--- a/kde-apps/kmix/kmix-21.04.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="false"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Volume control gui based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kmix/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="alsa plasma pulseaudio"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
-	pulseaudio? (
-		media-libs/libcanberra
-		>=media-sound/pulseaudio-0.9.12
-	)
-"
-RDEPEND="${DEPEND}
-	kde-plasma/kde-cli-tools:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-		-DBUILD_DATAENGINE=$(usex plasma)
-		$(cmake_use_find_package pulseaudio Canberra)
-		$(cmake_use_find_package pulseaudio PulseAudio)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index 3adf953d26ff..e54cc35afc2f 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,7 +1,5 @@
 DIST kmousetool-20.12.3.tar.xz 116760 BLAKE2B af0cade62b7409719274b377c62e33504927597d4204434a4e02e7665260cfbeeb40ea0cf7177dbb513804c1f3cce520bfa2977c2025fcd237dd659728df285a SHA512 8b0d7a4c9a83a4b4c0fdc97016356f1aca195c6728802b182491421a71fb9dedf41bf4f8e5c4e0f2042cd46d972fa07492911844251117fc821a37ad03663c1d
-DIST kmousetool-21.04.2.tar.xz 120808 BLAKE2B 06206db3ed2ec05f28834fd12f5ddd87fbb2344f3baf74b19553753659cb491df7bfd67b400fb050d98992b7eb540c1e53193abc420f303a0567d1dd09e6195a SHA512 8cec6b656b5cafd53e240fbf946df5cb1666549ed571492b050c055a68f7bb1b9f08f652bb545c63f653ab8317531a15271110f7069cbbe4426d907e1fd3aa4c
 DIST kmousetool-21.04.3.tar.xz 120804 BLAKE2B e66aa46e1681aa234fa7be0a754fb90e48f678570598d09c7d58fdea9db0abbca199a25478c59f88a772c1de9a97cb3da33981bc6ac6e1bcce1469f494712808 SHA512 4c9f4530f61950fe0bc94dc20baa3d9d958c677139f3b8d06248fd071ccc1d9b2dcf1de69bf2a434c4ae634f46062c77c5041407afe929dbdda9fbe3e11de42d
 EBUILD kmousetool-20.12.3.ebuild 857 BLAKE2B 51eb5788b301197588317f8dc1ec9046e16de6317e1d1c70dee5f8ca83f540c084cee9dadb3d18918e901f4fa9a1a4562359c661541f4d12afc5d1f5efc6004a SHA512 45190dffdbd1fa9d11473ae0a31555628eea106e0990c53af076f96836425065165c995405aaf2d843eb9b668ee2bae7d0d7d80a63671b65fa8df482f380a5b2
-EBUILD kmousetool-21.04.2.ebuild 860 BLAKE2B 4a187e7a4e8505621f6d109830ffdb684386874d7ff95f115ff67163a8aa3cd7e367c3864f5f427c1b460ef6db34b4ecebab3676407c887e5d48114a69f9284d SHA512 c8fed262185370ee40ee025d3e3d2714287f0c723a39df40312152685aee0ddacab313733b5ff8f08334dd2daac5bcf3bdd4b0dc922f5ca6464accc74cd5d01e
 EBUILD kmousetool-21.04.3.ebuild 860 BLAKE2B 4a187e7a4e8505621f6d109830ffdb684386874d7ff95f115ff67163a8aa3cd7e367c3864f5f427c1b460ef6db34b4ecebab3676407c887e5d48114a69f9284d SHA512 c8fed262185370ee40ee025d3e3d2714287f0c723a39df40312152685aee0ddacab313733b5ff8f08334dd2daac5bcf3bdd4b0dc922f5ca6464accc74cd5d01e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-21.04.2.ebuild b/kde-apps/kmousetool/kmousetool-21.04.2.ebuild
deleted file mode 100644
index 6656a8d09abd..000000000000
--- a/kde-apps/kmousetool/kmousetool-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE program that clicks the mouse for you"
-HOMEPAGE="https://apps.kde.org/kmousetool/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXext
-	x11-libs/libXt
-"
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index a66f1aa90b22..9623d3f5815e 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,7 +1,5 @@
 DIST kmouth-20.12.3.tar.xz 2086596 BLAKE2B b74a6bf5d09fe4257ca29dce765e5d8e0976fff225ddf7d34df029e8b834bfb550c215d8bad3aae633f8c8b0c50b1c866ec54f81a4b1211c439984d49a82b035 SHA512 2e9966dc0aee562bca227570b2f27789f1b15b41bec581f4fff99de43b9dc01ba088d9dd54968c9b4331c0977de67f8328eb40651ab02262db2ec61022a170b4
-DIST kmouth-21.04.2.tar.xz 2099896 BLAKE2B e7a001c0acf5a030192c4643bfefb3ca3cf3f4c9974248d0ed5f7abcd2a496d0c80a1bf51d9d4df27d889f5e6c368fcf2a88f712f18966aab47e3967a5b5eda6 SHA512 f08d0e3937de6c925a306c17f0467efaf320d02add683d2e89957fb2efaa03b1d22067c5de49a8b1c53eee3f8dc4d9c1cc87875beef2022e4ead297c061a48e7
 DIST kmouth-21.04.3.tar.xz 2100112 BLAKE2B a1ec149775757575e571737add5e74e2a4ccb72de419a27a3936f783b6f442c5b99c2b02fd90677e20156e7ba319aa76d1842acbfca8f7f9f560ed130e0ad217 SHA512 f4d807ea015ed03240acd2a031ecfaec613c74f6f0939bac74c8b48ccc82ff5f6a7ce0be6789bd8dc30cec8a6958b1b7cc1f7a6aece4910d394f6eb8b36313c3
 EBUILD kmouth-20.12.3.ebuild 886 BLAKE2B ec900c70f61417f43fddc1f67cadf62dfa22b7e72dd761f5dca814cf0cbdb8098e837ffa851d6e819d8e16c06e9af857c311026349df2b17e8b9a0f085969564 SHA512 f16beee087e7b2c0c453df928a3a8b3c168ab8b2ea0ea6529a8ca73ed3a586736a1d34e7a63d029d7d06c15647a52e9a3a781b43cf53fc7d982198f5719f18ff
-EBUILD kmouth-21.04.2.ebuild 889 BLAKE2B eb1ff86f2c8a6eceda8dcc512145949d16113c85b543d262668f3e027b7003a2a7dee3c568cbbbd8e5307e384109ffaefcde19a59536ad5d38516e5b0b6d3f6f SHA512 96fe780fff9ab1be854e1898bbf6359901c0086f7149544ad81d25928bc7625b7b88983b899641e83dd96f63dbbfd0a2de4f57186c80a89600cd0bcc4ed1b4a9
 EBUILD kmouth-21.04.3.ebuild 889 BLAKE2B eb1ff86f2c8a6eceda8dcc512145949d16113c85b543d262668f3e027b7003a2a7dee3c568cbbbd8e5307e384109ffaefcde19a59536ad5d38516e5b0b6d3f6f SHA512 96fe780fff9ab1be854e1898bbf6359901c0086f7149544ad81d25928bc7625b7b88983b899641e83dd96f63dbbfd0a2de4f57186c80a89600cd0bcc4ed1b4a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-21.04.2.ebuild b/kde-apps/kmouth/kmouth-21.04.2.ebuild
deleted file mode 100644
index b841f6b80afb..000000000000
--- a/kde-apps/kmouth/kmouth-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Text-to-speech synthesizer front end"
-HOMEPAGE="https://apps.kde.org/kmouth/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index fcb90d746042..ef0aa3da2ccc 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,7 +1,5 @@
 DIST kmplot-20.12.3.tar.xz 3055808 BLAKE2B ac61b5ef1d14696e3d0cd328a2212d03faa7e4ecbe2e6376d286c797e7b3e5a0bae4f9852268168438492108e273ac92f0423b96a70428598629aeb64942de7d SHA512 438ef6cb8c76ab943d517fb177bed8d28874a6a1696fffa8b15f8dc9992c61279ebfa583f3fdc20d4b1bd48ba120f0ba9800e693a58319feb5dce154d950b3bd
-DIST kmplot-21.04.2.tar.xz 3044044 BLAKE2B 7f77b40003003fbb96b879f6594de0da4f521496e553693708c57b4471261000b8e891fb6e7cd236090e5d49e59c47ce02b202effc2a898eb6e4f36be33c21ad SHA512 63242526b0faa0804b97a0ed1e548d81f5e25566e6e3d652a43524a4cece209c6db8d32656ee141e60691bf4ea6dbf9b5177d327b3f5e3e5bbf9868d94b8ad07
 DIST kmplot-21.04.3.tar.xz 3043960 BLAKE2B 2123ec11b1ef05bc9d744f37095a7df4d5171cf87609eac45e405b7b11323c7ca4788b19ea092a15042250a35e01ec877b26ba06091886674585395d31590252 SHA512 80ceb936b6cb41ff3976fd7b4859ff9e54d0ab24a6d8d90690751b114749d55b70e2e1c07a7440addf8bc88c6a9fbc42d8cbab9aff49b70e808edeceaa8ee8f4
 EBUILD kmplot-20.12.3.ebuild 1055 BLAKE2B 482264f934aa713150601dc75d172a6b489f40250be25bf6437e04c06649b56c09452d0bd055ffde78f0ad0d36510f89f975d54209f0006d5fa5febf3916198e SHA512 0b8f6bba82e275280db58a8e9972db2c2fdfc17cb04cc7246d1bb1a7bd0378b3d2b9a406d2d5d28a5f44a555c5e989b650ea892a7ecec61da2d95f2130df4a4a
-EBUILD kmplot-21.04.2.ebuild 1058 BLAKE2B f490b6ddf3234e1911c9d8102245081c2f1c5d558009c39c25dc02bdbdf7b618755b2072eccb1656f684c1d359a28c654b11cbcb99ebe69d205e09b1d9a4bf6c SHA512 4a1c5ee8248d3edb96e858c84ae7f6feb048cb3d891802bbeb7e350d222de098ba7bf2be4a713e2e915ea948368a98d6caadfb03b65cc13b1dfabd2764ae1f96
 EBUILD kmplot-21.04.3.ebuild 1058 BLAKE2B f490b6ddf3234e1911c9d8102245081c2f1c5d558009c39c25dc02bdbdf7b618755b2072eccb1656f684c1d359a28c654b11cbcb99ebe69d205e09b1d9a4bf6c SHA512 4a1c5ee8248d3edb96e858c84ae7f6feb048cb3d891802bbeb7e350d222de098ba7bf2be4a713e2e915ea948368a98d6caadfb03b65cc13b1dfabd2764ae1f96
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-21.04.2.ebuild b/kde-apps/kmplot/kmplot-21.04.2.ebuild
deleted file mode 100644
index 5c724c5ff1a4..000000000000
--- a/kde-apps/kmplot/kmplot-21.04.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Mathematical function plotter"
-HOMEPAGE="https://apps.kde.org/kmplot/ https://edu.kde.org/kmplot/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 6372f3eced5b..2d0cabd35c28 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,7 +1,5 @@
 DIST knavalbattle-20.12.3.tar.xz 1290248 BLAKE2B 5180a33e3bef947122a5ce26935f2e87c52b5882408e270531e148e72f7c389e86f34c810909b4387b7655d3eeee01ae46a196ac4c43c640ee24b62dad3d0bf2 SHA512 015414551b0b365234243b8dc1b250513aede658d62908fe85b6d370dd471d10bc65e79c5f31ff1d03f9e05d6ea2387c116d1808df106097ab0bc21eaeb8cac8
-DIST knavalbattle-21.04.2.tar.xz 1376040 BLAKE2B 4260bcb836f998a3be2bb63813f6b5f0528c166f4e72a63695509556648a2721079245d4df2c27a9a5992c714376028ad3bab7794f76090e1ada061f220f35d5 SHA512 5ead7dc1f509f062e66c0ccb5bb70814784016bcca90068358175c4d1cbd3838760d96c3dcc6ed097e363b584c35f0f010e610c4dfd13c252868a77dff3dc759
 DIST knavalbattle-21.04.3.tar.xz 1376012 BLAKE2B 9c03729c90e9a77bb53ffbca8709d8d61f92675c76134410da12301de8adc50df604e7846f524b7d3e9477572d2001a1cded0b9d15f5e9c56658e68dbfdad5c4 SHA512 db33484ea656badda4bd95e3f47618c50e5a6e4cb91433f9958024f8f6b3bfb874133096f68dc7d060aa7a56a6d5dab495ffbf4903038d737e5c8a8fd565b7e3
 EBUILD knavalbattle-20.12.3.ebuild 1028 BLAKE2B 1fdc2fd021731cebcae3ccdaa1ffefee012a348e9599298173974758b9ca2be7f1f4b5979999eaf0a83e80071f14da9d0c1374192f7765bee6a08b0b6a2c4f2e SHA512 2dfed8b2e41dcbb07bf5661a40059341822a42e640548c1d9281ed057887d4c3e615f0862444f80972d43cf6566a16e52bdc1921691b95a95e38e9efd48d39de
-EBUILD knavalbattle-21.04.2.ebuild 1031 BLAKE2B 290b150d71fbd538ed746696529bd5a88e719470c0340c8d29b7940979a3cf2df18ee54d56595fb5d817aca080baa12f3bd182e9f4ce70e52b17f852a39cffaf SHA512 6051826f22c7d91c26bcbe9859ff1cd19f97c5be9a5b0bf221f2af1c6c8ec68ac84b3cf1713e2e01e98a2862137d7766ae66ac32b96ff40099bd305a9bc5b19d
 EBUILD knavalbattle-21.04.3.ebuild 1031 BLAKE2B 290b150d71fbd538ed746696529bd5a88e719470c0340c8d29b7940979a3cf2df18ee54d56595fb5d817aca080baa12f3bd182e9f4ce70e52b17f852a39cffaf SHA512 6051826f22c7d91c26bcbe9859ff1cd19f97c5be9a5b0bf221f2af1c6c8ec68ac84b3cf1713e2e01e98a2862137d7766ae66ac32b96ff40099bd305a9bc5b19d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-21.04.2.ebuild b/kde-apps/knavalbattle/knavalbattle-21.04.2.ebuild
deleted file mode 100644
index e5c22c10849a..000000000000
--- a/kde-apps/knavalbattle/knavalbattle-21.04.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Battleship clone by KDE"
-HOMEPAGE="https://apps.kde.org/knavalbattle/
-https://games.kde.org/games/kbattleship/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 57958281a11d..942bc92a837c 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,7 +1,5 @@
 DIST knetwalk-20.12.3.tar.xz 1267580 BLAKE2B 1ebb98fae97a56cd77633055d24c71a1395f58629f3ff0762d273f24307e62265f363280646ca2aac784b5f1f9f099e90761dc02d93e402703b5e64fdb9dd0ec SHA512 510ca6b0a7de58cbcd2e51cc3ec12c3ceac13e7cf03d1f1f0399a3d91b92deac4ebdba1528a62a0d7401b2bd60b2eae2b540727209d3bfed868d11a2ca1201c9
-DIST knetwalk-21.04.2.tar.xz 1270888 BLAKE2B 48ae951d647ce7113915b2ba0bc5ccd7f815b47277007f2944b4299149265ede3e2e29057b1df7ec65a13fa80213a7857c095fcc91e3e9ca4fc67885bc5c5d93 SHA512 f215b2eda705a995107aad5e367bd25b095515d4ccd97bb10f86fa124344ee168a2fe302055c65549b0d5f671257aa705c4353c78e757a47ad08b32c99311378
 DIST knetwalk-21.04.3.tar.xz 1270964 BLAKE2B 19b54421be0f7bb7a812518f8794d1500fa8ba7c9718858b9db265dbd09e26c619d026e72fbf2a3597bd490e2395e954c00bf61d4766f89a219f2ae125b862f9 SHA512 40ed5e31d458f1243ac19215fd2b22d87a811ace7e9cf8dd443efa334225e2a12a54865d3fc6173f4879a58520b9d486d50eacb1b86c2c66898659ec46159791
 EBUILD knetwalk-20.12.3.ebuild 1007 BLAKE2B 754d99f81b7f9e69eb4c8fec2c710af8e822d18690714e2cb2143c5891dfc9d8e12916755196d74b50c73ee3c477c6d4287267cd900f479733d37eec8f897e94 SHA512 b50ada76a71f5c288ddd714c17326e86edcb3d4bd1cc38c933a0c5a7c0239aa4b00d7df50b1d7f8aa98aad51854e689b0beb2310a37b972d444d802c12f54c4b
-EBUILD knetwalk-21.04.2.ebuild 1010 BLAKE2B ea086889ab659105c511d75878fd747757e9d7ac741a80dde9bd054050e73a83623ecee65cfc2b00250b2a3f4c440e9d4933c8a991e8c3afe6e23ee5f5579ba0 SHA512 2e0f195cfe4223e0c732844c58ba14522a1577b5a657621ca73cf59a00dc198cb575526685842449f20ea72bd77f050ad4b4b27ea9b73d985f7ff8c069909ea1
 EBUILD knetwalk-21.04.3.ebuild 1010 BLAKE2B ea086889ab659105c511d75878fd747757e9d7ac741a80dde9bd054050e73a83623ecee65cfc2b00250b2a3f4c440e9d4933c8a991e8c3afe6e23ee5f5579ba0 SHA512 2e0f195cfe4223e0c732844c58ba14522a1577b5a657621ca73cf59a00dc198cb575526685842449f20ea72bd77f050ad4b4b27ea9b73d985f7ff8c069909ea1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-21.04.2.ebuild b/kde-apps/knetwalk/knetwalk-21.04.2.ebuild
deleted file mode 100644
index 9eda90ba9cab..000000000000
--- a/kde-apps/knetwalk/knetwalk-21.04.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
-HOMEPAGE="https://apps.kde.org/knetwalk/
-https://games.kde.org/games/knetwalk/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/knights/Manifest b/kde-apps/knights/Manifest
index 7bf32cdc549f..6e578d17d67f 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,7 +1,5 @@
 DIST knights-20.12.3.tar.xz 3535008 BLAKE2B 662a432ca348246efbd286f4c033cfa9202fd0df6c4fc05042ae8296afff74f0e87eef39949839d981924e145e4a307cec5558f88bc9f5c4ad953f1b58ad616d SHA512 d2db270091dec8079976e2c31b11ebb9eaa113d734528f2d8fea0aa58ff0efd467ec8e67d528bb32ea038fcc1429cbff15c8193bbcfd493e3d5725609ce5d4f6
-DIST knights-21.04.2.tar.xz 3536428 BLAKE2B b7c8032dee17a711a49e3e3d67e37cea902fc49f07adec3dc636f5285ad082ff69868f74667a6a63ad4b858681a9e1bbff76cba792d728bd74c38013c0715629 SHA512 fd0a05460a39d1d3df8825c3acf044ef4835bf88b9be240d49f369c4e3bd97577365012d2f28d9ddd72680d5daf3439525c0b965cbdc086226f31498de123031
 DIST knights-21.04.3.tar.xz 3536384 BLAKE2B 1d0aaa50d0b1cce7968db0bdafb8529f19b172742a316c6ec3a1074009c018677509300c54b092fa4a2005d57b4319185edf25c7edc082bab3267b5a88639fe8 SHA512 1f9136e85730cae9085b152b720475dd64dd53cec98f9d20eb67f1b68aea851b86c6781f87127bbc0ff3f385db907bd1566534bc05f3013317f33ea0b35b438b
 EBUILD knights-20.12.3.ebuild 1446 BLAKE2B fc2e0b62276aa650e792c22858249a30a95034ce442c3c02dbf867cdca609e4aabc0111c7429d8e5878017fe06affd68671312d9e752a3b952eae3c5cc9a94a1 SHA512 0daacacef24f154cd7fa9ebfa751ba2ebfaf131f479f8f117b40b29cced0b6f2fd49fbc1026b9ef82cef9eb2765ba50c659d980d5bb3ad74b8b507d3300d1aea
-EBUILD knights-21.04.2.ebuild 1449 BLAKE2B ec3f49f15df0a23d9c0529afaad51c148585e273f3348c62c703aac751db82a07b6349f3c0b2e5e3707507f81672c9eb2c23a79faa82255ae9340069db483cb1 SHA512 81848d23b273a7f159d2abe6c595b8be1bc904f9610bca68e3b4177874356a6006c06e5dd8d751a55ca4779626a8dc8b09c9ff493cde817a9698869252e1fef6
 EBUILD knights-21.04.3.ebuild 1449 BLAKE2B ec3f49f15df0a23d9c0529afaad51c148585e273f3348c62c703aac751db82a07b6349f3c0b2e5e3707507f81672c9eb2c23a79faa82255ae9340069db483cb1 SHA512 81848d23b273a7f159d2abe6c595b8be1bc904f9610bca68e3b4177874356a6006c06e5dd8d751a55ca4779626a8dc8b09c9ff493cde817a9698869252e1fef6
 MISC metadata.xml 437 BLAKE2B 9c89e54279e181045c5bfdd8cf6586306d84fc37e5f087ba3f3e2db62430ee6654cdc0181c3690105a6ecb33ad584f827e96585314a25e0b5016b1ed51d43885 SHA512 89b588c23e621805fab8a15724dc03ae8eeed23957fe19415c9846ad027ac80a1cebfaafaea0e6fbf2a27c785c4e6dfb81892bcdee1b40ac6af7cb5f8350e0d5
diff --git a/kde-apps/knights/knights-21.04.2.ebuild b/kde-apps/knights/knights-21.04.2.ebuild
deleted file mode 100644
index ea821a2a28df..000000000000
--- a/kde-apps/knights/knights-21.04.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Simple chess board based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/knights/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kplotting-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	|| (
-		games-board/gnuchess
-		games-board/crafty
-		games-board/stockfish
-		games-board/sjeng
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index e0748ca2c07f..b51a1dc9b7fa 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,7 +1,5 @@
 DIST knotes-20.12.3.tar.xz 329536 BLAKE2B db0c7e87a7f9295bad77877fb1d6b8c0cf80f27fd55d4560ccd18149a903b9adc02a66ff92604e829b53144d196ba5e93f0ca3bfbec2c20e8c08d3543115d80a SHA512 077cee2df4165c619a12ab05f2d6289e750a54606a62d09dc2747a45a97e336acdc908e84b81968b983963c712b3597e5da3a9c60a26cab488912a5420dede14
-DIST knotes-21.04.2.tar.xz 343544 BLAKE2B 90424c27186523cfb1fc9fe2560097f83851ad7f5e83f864776cac985c3701741bdd6edde79e22a55f79d0ce39ef2be9ea8c5f0e35c1b3ed26b77514cb158b02 SHA512 10e8d2405b33158294376230ae99ee0725fbeed1220ea936b58a4343a317a53ee07bb162a560b40c0a651d8e903dec346a8e68e1046f79f059bc159bda0763c0
 DIST knotes-21.04.3.tar.xz 343488 BLAKE2B 3d4abcc0d9e13da80e3b438fcd7f7744ea2c60ed464353dd297c3d2df60979e9f4ef839b433e94b1d9e743e53151324ef10cf79d6dc23db4ad4969c2a2118ca2 SHA512 e01a26ef6352466226e944cc502f54889999417e1b6f1f0195643222ff8aee067d59aea44f2593a2290dc8f6ca7bcb526c372730a6c257405dd86eef7931d15e
 EBUILD knotes-20.12.3.ebuild 2139 BLAKE2B fd87be095de1faa787653a578e32e702070d6293da7591e26b7d999ebf801ac5dbc6872b2f06175c1abaafc6bff44f3c19a4ab616c3942eea2d49db2c2bb8a35 SHA512 5ff757abe3c9d8d9b4346f1ab7a279492991f625a654532838dfbf79c0fdea9270e3e6cd0a24fab88eaa7a3a5941d17c687a1bdfa0e5d31fa783fcad3f3650ea
-EBUILD knotes-21.04.2.ebuild 2142 BLAKE2B 0c99f1b963180632931094574733aada6b40784f6c2f3ca29011dfa1e2d30ed5e0ebf4db411acb2fa255c89d7aec6f17a6f88b0fc6b0c6988b7f8e909e5f00c7 SHA512 5f922a91c8c51c414ed2d7cfafebe8e3ec0737bca4fc532758abe6b9fa5458138a6526e9e49a906054d5a2f232d8901cec8c3fd0b241d10ca4ecaaaef6ee8776
 EBUILD knotes-21.04.3.ebuild 2142 BLAKE2B 0c99f1b963180632931094574733aada6b40784f6c2f3ca29011dfa1e2d30ed5e0ebf4db411acb2fa255c89d7aec6f17a6f88b0fc6b0c6988b7f8e909e5f00c7 SHA512 5f922a91c8c51c414ed2d7cfafebe8e3ec0737bca4fc532758abe6b9fa5458138a6526e9e49a906054d5a2f232d8901cec8c3fd0b241d10ca4ecaaaef6ee8776
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-21.04.2.ebuild b/kde-apps/knotes/knotes-21.04.2.ebuild
deleted file mode 100644
index 3619bdb1fa86..000000000000
--- a/kde-apps/knotes/knotes-21.04.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://apps.kde.org/knotes/
-https://kontact.kde.org/components/knotes.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-# 	local mycmakeargs=(
-# 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake_use_find_package X Qt5X11Extras)
-# 		$(cmake_use_find_package X X11)
-# 	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index 9803de9526cf..3c5abd03e0e7 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,7 +1,5 @@
 DIST kolf-20.12.3.tar.xz 1029796 BLAKE2B 8627a1be35d72670dce3ca3727ea7768f9f9225962aac9b22f3beb97e2cebd89a3c5fa909d4284a9815b561026f76642346b7addc6c390b8f6c0e124762575ca SHA512 63f78174da9aa76bed51128b44900e52b314daf2caaf22e1f7bf2233b58e999a34e508354c46b20b26ba95908eb690d3cbe20a425ad6e2661a8ee5fd373acb63
-DIST kolf-21.04.2.tar.xz 1041208 BLAKE2B 4933972e6bd3a0120dc9318dc2cbe053dd7008e08fad3169f439896ec09074036b4e073b6e6466a7cc2d4fad36a58219b2a52c0f40117b146eb0fbd044b72ab0 SHA512 ece0562433b19a7f5c398b549e1724d9672a53721b8434891dc18935d409026bfd56b36e021cfa738e1c65f2e7e45b98e33b4a4ffd553640fe203c16e7e04763
 DIST kolf-21.04.3.tar.xz 1040508 BLAKE2B bf79a31795d26bf3ae5c5a8082d0ecb6901aa74f517df68bfcc1e14dbe8184fb8a2b1dd0122562f9c36bc61a8bad8207a9cf16a80ab46d67ebf42206a955d575 SHA512 cc242339776a2d891a0dba5ff1e92226d2db425251ce3643fca146fb20e17ab124ef9f04bef4c3c21f2fe547cef32fc2c10915acfff0eb4c1c21cd237032370d
 EBUILD kolf-20.12.3.ebuild 983 BLAKE2B eba4678c495d360167234a2123c579bc9aeaaef7b0500463631adb966f842e46b3967e2940d6dc7df69aaeac578348f5a2368792887269de1e14230250bc5b78 SHA512 08578d79134932dca01327eff7078b79759cc6a3ed652eeb6be3ea5ae9477e2dec1a5cd99084ca538deeaaa9454834792d20b061b0e36a8a5172d8a9c4c5775b
-EBUILD kolf-21.04.2.ebuild 986 BLAKE2B b617a152628173e5d59b7cbd70c8332069c6ac4063bbece95e6d34284b3fd0b75aba6ef66179fab672675b3afce595c516a77cc9d3bf21fa6ba7155507fe68c2 SHA512 33dafd45d9f082f259dd6f1da41f5d4a0546658d1ff8ae4954ff3c65014ba0567dbc659e7bc0b320b7458cdd3ee0e5be585cff147d55a794903dc21a7ebb6677
 EBUILD kolf-21.04.3.ebuild 986 BLAKE2B b617a152628173e5d59b7cbd70c8332069c6ac4063bbece95e6d34284b3fd0b75aba6ef66179fab672675b3afce595c516a77cc9d3bf21fa6ba7155507fe68c2 SHA512 33dafd45d9f082f259dd6f1da41f5d4a0546658d1ff8ae4954ff3c65014ba0567dbc659e7bc0b320b7458cdd3ee0e5be585cff147d55a794903dc21a7ebb6677
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-21.04.2.ebuild b/kde-apps/kolf/kolf-21.04.2.ebuild
deleted file mode 100644
index ffca7f4a57f8..000000000000
--- a/kde-apps/kolf/kolf-21.04.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Minigolf game by KDE"
-HOMEPAGE="https://apps.kde.org/kolf/
-https://games.kde.org/games/kolf/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 0fcb73407a84..c8768d62b276 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,7 +1,5 @@
 DIST kollision-20.12.3.tar.xz 290660 BLAKE2B 4848aa71659269218966bfae9dadfb3a20ad7ba48f6908cfcddb3ac39234f2d55688e1039eb8833c138f37c32f8184af05dd7aefe7d7213611948bd276c1f8af SHA512 e1c019efd9fbc99abd67fb70d81ef12f2846e6d7c2e2c8283a78bce7e96ca9b70ff430fb9556a7a7c26ad8fffffe8989311df1285a34b39c74a394112aec8fe4
-DIST kollision-21.04.2.tar.xz 290652 BLAKE2B 1ed275c5b7717c65fe80c9223ba1093188b741b4f474ce5249cb66b1cd0c04aea109ed1d59fb54ba6f9d1530ea1b6e631854a3491189b2c6f4e51d22f595ff53 SHA512 971f87aa7e558e3e7f46a99c8189c6098d1f334cacca9a90e55d4d857390c7fabda31eb8b0f0cd1b9df7c16ccea59a327ceceff634aecc09b8a930c5b25c1b9d
 DIST kollision-21.04.3.tar.xz 290640 BLAKE2B 4cd2ef55162967ad959e62f04f52ee0c22fec7419874912c49a1fa612b7b48edfb195973c8d06ab820732e18af589f57c0d5e48be9f606192c2bd4ca48b49d7e SHA512 cf7296b0bc725c5fed42b34ce7ac3a5abd5a5c00d18b2f5e4756eeba9ff229850f4d6559f32289a05a661084babf29e4404ab62708c24d5be5e7b32419ea5530
 EBUILD kollision-20.12.3.ebuild 802 BLAKE2B c60d65d77aac17f1b2aabc7646f8ccf23a1f70569ae397bd7c3a2e54f72cbfb555eb3cfddd9efe6c3055d16001fa8475dcf00d8a3a1e2afa647f58db469ef931 SHA512 a6e590c0a1fae6141158eb9f0504220c30539f9ddfc1ab105c779910294aa190f3dffaa77abf4de8e9ad879ae44f28c49cc7be0795a3be4547f6661cf6a3668c
-EBUILD kollision-21.04.2.ebuild 805 BLAKE2B b8ccb3541426f20880ff23590b625ce116455b09d019ea4ff991be71e91dc9034b7d0a161a614c5c1ed3a9c4bfca2f407a64334d6dc62a525ddadd20f0ad13b6 SHA512 07a8052b71ca0ac02ccb559b2768ec8b63e14c6f397c4080bd18c3721a39b2232689a9dea5d7e7760e9ce8f6976fa5969113f1affcb1bcc662077b0aad2a762a
 EBUILD kollision-21.04.3.ebuild 805 BLAKE2B b8ccb3541426f20880ff23590b625ce116455b09d019ea4ff991be71e91dc9034b7d0a161a614c5c1ed3a9c4bfca2f407a64334d6dc62a525ddadd20f0ad13b6 SHA512 07a8052b71ca0ac02ccb559b2768ec8b63e14c6f397c4080bd18c3721a39b2232689a9dea5d7e7760e9ce8f6976fa5969113f1affcb1bcc662077b0aad2a762a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-21.04.2.ebuild b/kde-apps/kollision/kollision-21.04.2.ebuild
deleted file mode 100644
index 5a57360d5d8a..000000000000
--- a/kde-apps/kollision/kollision-21.04.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Simple ball dodging game"
-HOMEPAGE="https://apps.kde.org/kollision/
-https://games.kde.org/games/kollision/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 1e69839732ef..01cfb5d31008 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,7 +1,5 @@
 DIST kolourpaint-20.12.3.tar.xz 5686472 BLAKE2B ea2def24c9b10f0513786022ce9b4b5a804777551e94591ed6a2e5048c4e3e6f8ca30523a63b5013ea20c2f6163637a2002206f39d6c20900ed2ffe68a59948a SHA512 03a2312932fbbb0a22bc2291b12af639c4cf2895068d25efed4f2307fcc124ce6d22f5580eb3ddcb4501c18dbfbf4c88572cce106c9795196afc117099157fc5
-DIST kolourpaint-21.04.2.tar.xz 5714904 BLAKE2B e0e2fd3d201f9aec654a4b6928ac1a2ba996a66575f0831f69c4c76aa7b90b902725ffe83910afb9e9b2ad7d2d8dc3e73b1d1bc82ba4cd029e46c733913f4b2a SHA512 ac44356f6fac74dcc5907105d639f9a28a431a09139f4b06b39f2e4d73088923ebf14f50ea00defec23d14606d78a0101c58182a3452ca3d7268a76d7c8169e8
 DIST kolourpaint-21.04.3.tar.xz 5714920 BLAKE2B e8fb4d34ab677eb1dab5c8fd80a7930a30f42aea79626daa67abea9fa4fa688ad5ac60c5e2cb31c25942a695a8848827b73efb7ed0089f10acaffd6986f355d3 SHA512 9ab0242752bc051d12413772c2d4a0a38525c5b98283c58ea64802b649c6887ddd865dfc9a19abf93871d08d0017c7dd1daa1c555741e61b777340e6415cfe81
 EBUILD kolourpaint-20.12.3.ebuild 1143 BLAKE2B e517238229d8817252fce0b1d8a835fd702fa6a9358d807d8ad6ad982ea3c63d8255c65ccc787aae969c78d0c5656c5f4ce9c9fe8e2b4735b0e0b947c4b21aa5 SHA512 04dd072f8ecd9b0c7c13cf9a15637fea3ee47734425859538d604823872750f1f0b483776c825acfe0dfef9dad0de4f2ad432d1b76b9ecaee13ee2ec0c68eb7f
-EBUILD kolourpaint-21.04.2.ebuild 1146 BLAKE2B fc0126f06d107338845bd8dfd7e7180c9f0ec7af216cb416f93ea0e483f9bcef39148d353673a8c8b9f21270fc2bae5aa5521ed963742da51b02168efce8e6a5 SHA512 48cd6891777744e85302ae35faf591b78433918a734b132500dc83ec2d6c5fa93eb51d778b3b873fc76a4027069bcb94a6231ad8cc07b4297ef271fbef83810e
 EBUILD kolourpaint-21.04.3.ebuild 1146 BLAKE2B fc0126f06d107338845bd8dfd7e7180c9f0ec7af216cb416f93ea0e483f9bcef39148d353673a8c8b9f21270fc2bae5aa5521ed963742da51b02168efce8e6a5 SHA512 48cd6891777744e85302ae35faf591b78433918a734b132500dc83ec2d6c5fa93eb51d778b3b873fc76a4027069bcb94a6231ad8cc07b4297ef271fbef83810e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-21.04.2.ebuild b/kde-apps/kolourpaint/kolourpaint-21.04.2.ebuild
deleted file mode 100644
index 0c20e900796e..000000000000
--- a/kde-apps/kolourpaint/kolourpaint-21.04.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Paint Program by KDE"
-HOMEPAGE="https://apps.kde.org/kolourpaint/"
-
-LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="scanner"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	scanner? ( >=kde-apps/libksane-${PVCUT}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package scanner KF5Sane)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 9c29941345d7..50f303d2fa9f 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,7 +1,5 @@
 DIST kompare-20.12.3.tar.xz 929648 BLAKE2B 14c2dbf52dc4075d4a57a39ab1f2c56b18d155abd24eb14f685fb2db365c1e2230287c8eebfb681f23b1700eee214a4dbef3f760283e2c096ce4a77454817f87 SHA512 0da525fd73629d3d092b0a61c8cae610989981ed3cf6ec5d47b94ee1a3a443ac37ec18e8c56f1888b03a480fe6a127e9711bf0f5a983febed3126dcd8787386d
-DIST kompare-21.04.2.tar.xz 942848 BLAKE2B 0ffb8b6c2f5153e685821e100e90059c116acb12224ee872e909cb9b886ead04fbb495ed277185b3dffef61a48b5de3611af3a3d6cbcd376a2302f74fbc46bb0 SHA512 feb99680d4d4c602bd706777dc9d9a8f85edd67d1e35a87319635265a3d4a5e7793fcfb16c36bc7fa936a352dd49f40fd690ef1acff884415e0c139bdabf3471
 DIST kompare-21.04.3.tar.xz 950868 BLAKE2B dec23547a505ca487e55ccb1f2fc7c91b95f43d8d5c20c77a692b1c685d3e86d5bf7f2666c64967ff9f89278a935a6da3a90a7de1f922248e1f089c03a676755 SHA512 762a2017f942933fb25a264a9291e455b3de24aa4879b4600096c80ddbdb75b0423596ad7ddc10c0d60df337c4bf18b9bbe3818a5c66997672f8b21fd353e44c
 EBUILD kompare-20.12.3.ebuild 1099 BLAKE2B 73c77d6f6bc07df2be4fddfc2eef3bea31306cf6c9a16564ac91d9a8eee0e3ead449265afcd5ce6ea6a7a363d938a28a0a006c7d79e8d778f8789aad4a406966 SHA512 648e54a3f136b7fe8627fa9a94aebb95033beb4345c550e49b21082c65d11c75722086e5562a5ad59c7d43c0eaf55f36159458dc4f99aa0e8efaf432302138c9
-EBUILD kompare-21.04.2.ebuild 1102 BLAKE2B e8a3834b23d66c9b0b73fb339edd1bfd2300a55360f6db4ca7bb5a074346d8ac3067c5a41baa0aa436ab555ae4dda5b051d5e6429332242bac0b10395d91163b SHA512 d6583a2431e77b2d903d44cc422abe4a8f11d4b3aa1c4d1e3e6ed8a008e489930f0b07aa22baf63ffd49255d5bdb506f07b21535f341ce6c9c95cd84babf4363
 EBUILD kompare-21.04.3.ebuild 1102 BLAKE2B e8a3834b23d66c9b0b73fb339edd1bfd2300a55360f6db4ca7bb5a074346d8ac3067c5a41baa0aa436ab555ae4dda5b051d5e6429332242bac0b10395d91163b SHA512 d6583a2431e77b2d903d44cc422abe4a8f11d4b3aa1c4d1e3e6ed8a008e489930f0b07aa22baf63ffd49255d5bdb506f07b21535f341ce6c9c95cd84babf4363
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-21.04.2.ebuild b/kde-apps/kompare/kompare-21.04.2.ebuild
deleted file mode 100644
index 82c0eb605451..000000000000
--- a/kde-apps/kompare/kompare-21.04.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="A program to view the differences between files"
-HOMEPAGE="https://apps.kde.org/kompare/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkomparediff2-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index d0d01f4058ff..cfd3145200a7 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,8 +1,6 @@
 AUX konqueror-20.12.3-use-new-QComboBox-signal.patch 3328 BLAKE2B 3e4ed3fab89a3a707a302a1142c96042bcd694385fe36f89cb89da8860000ff958d81ff0d25c9931c7979e90bb33a5a3a00455c2e3b877ec145000dffaf73e19 SHA512 3c6f30af0ac0a9b0a7e5d46c3c30e95f08d217e81acacd267d91ab17a09d8b2b48ab0eb774097dd3dd5a64e553b2ae7f582693fbb73599ee12f3790650da2918
 DIST konqueror-20.12.3.tar.xz 7241896 BLAKE2B 0fd3e4fffe57cbd56bd953901617fee15d264ba4d4c709d2866ee01516cb00d15a2888e8e174592245a35f58fa5c4b7c10391c450506a23a4851e72dd2a3c4fc SHA512 38008dbecd9a22ff9658cb6b72092245b408288388b4c3f8077cc958d0a1dd5be62f24e05f3802eb5aed718ea7d5f902e3c6e15a52846661e3ffdd41c0fc7370
-DIST konqueror-21.04.2.tar.xz 7410200 BLAKE2B ec3b244a216bf3581ee9a174df0e001062a787ee8ba38fe6f90fb74ed435b3d26628ba304275a6e9f4389dd8b4822a0e24df748574199ed1ecc9b40bd9ad2b23 SHA512 4042484e0e6b5e0fc16cb1676e4fd0752f6a01a3762ba7f30ea5bb7590a68b20b40e2d4b1fc633ceef8d51c6201bc513a6d0f74b3e8b4228e493a8bc1f29e78b
 DIST konqueror-21.04.3.tar.xz 7410612 BLAKE2B 0640bd4d7c8cc877e511652e4ab35885fee88a1558d1c9d4f7692b64c4f6929876f437a7dab5da457ff76aca11774c9d60952243548e90f43307ef19353da03b SHA512 60a396633ba87605225e2e791d8b8a429ddd8081fc0db45227d31a550b00fb2197735f110eb0d9ea48199dcbb19525890d04470beb20c1a49bfc3fb545125104
 EBUILD konqueror-20.12.3-r1.ebuild 2526 BLAKE2B ec322c053681a3c83e14ca7f8537fa5f6548cff4f2240778a2ae9d3dc1aa84468dde2c06b5d3b3eb7af7f3616e53fd2652cc266c7cbe9f0117a36c896dc1c05d SHA512 dd4320a4b8d74d0473b614533d64b7f1c78dab9cddf9fc8b385e3e00d23f844dc5426af026085091ca84f1e2d407afe5253e428c9e5da65acd07d7f99189bfdd
-EBUILD konqueror-21.04.2.ebuild 2449 BLAKE2B bae852f2debc23fab2a84f6f6d2ae141aa144e8a85155fe7d5962ab6c9b7f94fad84f26b37c087c5c8772f7940f4dc9c4325711664dc4d9ff786cf0586d4b95e SHA512 7a0cee39f999ae616b5293e6794fe2e88da695a8d738dc24a876c461f070daf3308485cd66fb97a46c0e22110f4620b1ed31db7c0a02ed328e0e5b69d392ba74
 EBUILD konqueror-21.04.3.ebuild 2449 BLAKE2B bae852f2debc23fab2a84f6f6d2ae141aa144e8a85155fe7d5962ab6c9b7f94fad84f26b37c087c5c8772f7940f4dc9c4325711664dc4d9ff786cf0586d4b95e SHA512 7a0cee39f999ae616b5293e6794fe2e88da695a8d738dc24a876c461f070daf3308485cd66fb97a46c0e22110f4620b1ed31db7c0a02ed328e0e5b69d392ba74
 MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
diff --git a/kde-apps/konqueror/konqueror-21.04.2.ebuild b/kde-apps/konqueror/konqueror-21.04.2.ebuild
deleted file mode 100644
index 01cc100cb5a4..000000000000
--- a/kde-apps/konqueror/konqueror-21.04.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic ecm kde.org optfeature
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/konqueror/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="activities speech X"
-
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	sys-libs/zlib
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/kfind:5
-	kde-plasma/kde-cli-tools:5
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	ecm_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package X X11)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
-		optfeature "filemanager component" kde-apps/dolphin:${SLOT}
-		optfeature "SVG support" kde-apps/svg:${SLOT}
-		optfeature "Java support on webpages" virtual/jre
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 7467c04e631e..24452522d19f 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,7 +1,5 @@
 DIST konquest-20.12.3.tar.xz 666152 BLAKE2B 4e376170a0284c791a14ac14c369056515449fe3a7bd041e07fc4838f5ffe59caca54749fc38925931e47ebd172e14285bae5b0368762b81ccf9598bbfea43fc SHA512 331571276a7318bc5ed04f0860d2918d5c9b0461bef66ba8185d1be2a09e3606e02bcf46479ba24e3cabf35c834c687fb195d4d347b90b5f72903395aedce113
-DIST konquest-21.04.2.tar.xz 671720 BLAKE2B b2ff2927d6a30c1ce613613ce7299e86ee7d2f8874c28518773c2970a427dd13a3ac5ede2262916fa7302a83d5de0132c2a9158fecb8f0f8a7bc236a4542a710 SHA512 efbeecc0fb2ffc9bddd14300f14de9f72d2c2d4022bcdf9e2fd2af410682e7f33f80481ee91515828de29fa0c56f7dfb868d8fe5463f5c8123af8c212dce9b97
 DIST konquest-21.04.3.tar.xz 671704 BLAKE2B e4ab1c0685063a8028a9d62e3bac65b80865e6a404150886b8d2f7eebad0b929a4168fb925bc71bf14d12361e8741de28b632330ba128e8eff0126d43202a385 SHA512 27221b09a8f5f57c481d95fbda90550998bf1dd8d94283f576403b438cb094ed4984893541fa2d252a2b9eb05177eaf292339f8f812867a1879d3b9036d62bba
 EBUILD konquest-20.12.3.ebuild 896 BLAKE2B 123b6dc1df6e3ec86e5cc53a6077ed6de46d9cbf2c17fbf6a5606ce3611ff52116cb2ea0aae08dbb2b1f96791babd5afeb228d10e241add8273c9572c71703a7 SHA512 476240c30edfdcf8e7b62d669049bc864fb4cbbcf545c19740e07dd49c6214a65974619421b9f1f095c6f6c40570b482f9ff793bb7dec89dc80f05a1533047cc
-EBUILD konquest-21.04.2.ebuild 899 BLAKE2B 497f1c10ac54e03831dff0e9fdefe21588548dbe69c7ba5fbd43f7a08d6e8fc98f310409deadbf1b9c23ef4f67858791a9ab5301d2d00051d4f4712c276d08bb SHA512 8a7b819e4f697bd22b50fd86ef17ff7d670384ace1014082a709af5d614dc9fd2bfd9ecfb8652c1a813ad27a45abfb9aa7325b31888c2120ff9b15b0c737f7f6
 EBUILD konquest-21.04.3.ebuild 899 BLAKE2B 497f1c10ac54e03831dff0e9fdefe21588548dbe69c7ba5fbd43f7a08d6e8fc98f310409deadbf1b9c23ef4f67858791a9ab5301d2d00051d4f4712c276d08bb SHA512 8a7b819e4f697bd22b50fd86ef17ff7d670384ace1014082a709af5d614dc9fd2bfd9ecfb8652c1a813ad27a45abfb9aa7325b31888c2120ff9b15b0c737f7f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-21.04.2.ebuild b/kde-apps/konquest/konquest-21.04.2.ebuild
deleted file mode 100644
index 19eb18754098..000000000000
--- a/kde-apps/konquest/konquest-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Galactic Strategy KDE Game"
-HOMEPAGE="https://apps.kde.org/konquest/
-https://games.kde.org/games/konquest/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 3272855e3c42..6e2e581724a7 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,7 +1,5 @@
 DIST konsole-20.12.3.tar.xz 1250536 BLAKE2B 83d4af770e42feb9fe96dcebc2cddc6889d98a7d6ce637fde6f8665ce845430e2118b3fcb34ca6448025a397826f14804442a590f1ff4ca62383768af7007a30 SHA512 a48eaa0080b26369f5f163f3ae345bca7f35aa06d581ecc0bbeca54fee2e9b900a4b648f940a67f506ecb00dba971220f1c1c7a699efcbb6e27ee0932c27e37a
-DIST konsole-21.04.2.tar.xz 1336232 BLAKE2B 447faf0bd386e0546280ee03ad2d5caeb1443550fb6c84257590e8bdefa93d7556cefd659842340de8ef447bd74a897a1183dd9e04ed3a6ed665561296bf3db0 SHA512 3845177f8fc3e7948e13812d6c14b1bc0964156b8dda9656b6a6929c40e2c45c7025ec3a8d6922500a5a9981cbfc550afd1827fa64c289d6d2591713ca1f721e
 DIST konsole-21.04.3.tar.xz 1336960 BLAKE2B 2cbcdb3edaae0fec913d82dd0eb2ca80aca70e2b9d749ae1c22512946df8bf5e99aa8444996e41b7bc162727119c8f9216b28b5b15051dd0c6a89221fcbbd355 SHA512 490271a51304d5a64111f6ae74422a6b3143a5349359e55af0845c04a6e6d405fadd1f300dc4d866b7730c0cb852bebfddbb33b0ca9e68d22f264e379d1868e8
 EBUILD konsole-20.12.3.ebuild 1766 BLAKE2B 88c9959d519e25f987e7caa8dbb9a2369110eb852c59ab418c165bf5c46129c85841d0633331cf99c41dec20fabc0f87673fe9a5639d08c7572a46472b6a4e04 SHA512 7c79943e58bd422df01fbf26b1a2ed5f863a64bd4f038402fdad75a9e815d4ff0841b87be08272fc190ecee0b7d729308ce08fd1516a214c6f8eaa96e7bb06dd
-EBUILD konsole-21.04.2.ebuild 1799 BLAKE2B 5aa2860b516faa9e27b1f29173a906eeb5ee86e3be9ba96d10efb32a35ea834fa6fcb5acfbfe5d4715b4d3ee94a11aaa404325d2b451ca8d8821879005568de0 SHA512 e0a682683b6150f351bf4b2841ea110bb83d11e1629b33a07d9fbef88498c81b16df607d77ab2be7468b200cce630abed61691b6b12e3b999657f318442aa0c9
 EBUILD konsole-21.04.3.ebuild 1799 BLAKE2B 5aa2860b516faa9e27b1f29173a906eeb5ee86e3be9ba96d10efb32a35ea834fa6fcb5acfbfe5d4715b4d3ee94a11aaa404325d2b451ca8d8821879005568de0 SHA512 e0a682683b6150f351bf4b2841ea110bb83d11e1629b33a07d9fbef88498c81b16df607d77ab2be7468b200cce630abed61691b6b12e3b999657f318442aa0c9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-21.04.2.ebuild b/kde-apps/konsole/konsole-21.04.2.ebuild
deleted file mode 100644
index 11c37b893583..000000000000
--- a/kde-apps/konsole/konsole-21.04.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep KF5 Completion
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# drkonqi process interferes. bug 702690
-	local myctestargs=(
-		-E "(DBusTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 0c541a8de2eb..d190e58c354b 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,7 +1,5 @@
 DIST akonadi-calendar-tools-20.12.3.tar.xz 224860 BLAKE2B 0f03e653c6cde40a1288fe24d92d612e238768fe38f9c10e7ddf0a20c18cdc8ce44c85e416a0535bf45a8730dee33358a8027a2c7a67442e98d65066de5c3109 SHA512 5890454e49f4cfb04e3edb4895eb4f4f7abfba691185ccc9b9b3c3efc3d675cfe8c7b493b3378143d5da552ff784a391fd194c7107e4ddd11434aa3c130e5d56
-DIST akonadi-calendar-tools-21.04.2.tar.xz 236940 BLAKE2B ee710eaf667aa6b925318ff317f6814e0914b528dee77a6614384a2a4f4f44c5282fb7be7d8a83005518861fe7f6ca0f0e03dd350ecdbdaee7271653ac7661bf SHA512 e8114c0f5b808e212584527cb0cc7a6129f24a65c2f895bf9f296adeb27017712a78e9613f89aebcd0d07b8a76359f01908ffd637248a00a9330256dcfba93a7
 DIST akonadi-calendar-tools-21.04.3.tar.xz 236956 BLAKE2B 96ff649f343c240dff36c80dcf538a2d8f6dcdca678ca8b24a13e1fcd95f513ba1066ceabf8aefe9b5ed00059b797e1944155e8ff4123c29a5d92d681409ce49 SHA512 c2c7d856aa3805b44beac964212fe20a8c63f0e2950e9111d93270a05e48b37ac39339b94067bc3558d2651d5617c82d34433f0741722fbd16b8661e1f02ef3e
 EBUILD konsolekalendar-20.12.3.ebuild 988 BLAKE2B 54dcb262eecb185862eb4d649f8769c3876c5ac22f1dd34e660475ee9aa2db549811fe85c0d1d576a51a10710a1d21537c37ed5c2450ecd2da8e124017486664 SHA512 48e91613ddab34df79224278efe0ae758d8c1b53b94d7565e8d44687471f31e26f98405c4000b2da76e247a0dd892d83fe7e348249ea6395cabe82d81acb38c1
-EBUILD konsolekalendar-21.04.2.ebuild 991 BLAKE2B 27495fbfdfca956a8e625e8ab94a9506a03635d4efe3bcf01deeb1727e5bc4112f2348b7428449a73cadeaff682e2b7e883f15bb1688d0ee3e4a79abb7ffc8a2 SHA512 d2b66906f9b578f6c4b261eae849642215e377bb24649c717e2aa3c18c2925c459296e5cffca5825b816d40d84bf7762f68da9249fed9051a3f5ce2643ad98b9
 EBUILD konsolekalendar-21.04.3.ebuild 991 BLAKE2B 27495fbfdfca956a8e625e8ab94a9506a03635d4efe3bcf01deeb1727e5bc4112f2348b7428449a73cadeaff682e2b7e883f15bb1688d0ee3e4a79abb7ffc8a2 SHA512 d2b66906f9b578f6c4b261eae849642215e377bb24649c717e2aa3c18c2925c459296e5cffca5825b816d40d84bf7762f68da9249fed9051a3f5ce2643ad98b9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-21.04.2.ebuild b/kde-apps/konsolekalendar/konsolekalendar-21.04.2.ebuild
deleted file mode 100644
index 706a5c6fb40d..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-21.04.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-inherit ecm kde.org
-
-DESCRIPTION="Command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# delete colliding calendarjanitor translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/calendarjanitor.po || die
-	fi
-
-	cmake_comment_add_subdirectory calendarjanitor
-}
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 427fe0b385e4..5af0e501e054 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,7 +1,5 @@
 DIST kontact-20.12.3.tar.xz 791076 BLAKE2B 1f0e9fe2abb9486049a9aaac9d0c70d51e10a80e32e2be2ef5ca42d3a97c1e63c4d57a28e167e4452577d088ad99e86cb0c20ce93eaae06afd6c7b40721ab489 SHA512 a957917a175b2fbf33bd15788e1c9e93520e13fc7f9204b91d317e9c99ef03a76bfa71a5e1651b24f24d3cf8ac663e74b964362f65515073170d55ac335eb23a
-DIST kontact-21.04.2.tar.xz 809932 BLAKE2B d47c9b84995a7477d02fd32d782bca80dff73f8b0d66edde81fb848e8802609c80de4f76a31b327e5f27b96418f339e4c2a58ebaaa0dd86ad71f1718c271262e SHA512 214937c5f7f19b06ca96fcecfd8261457387c7c0e18c97de409af65b8bbcaa67758029496c4a2cb55bef74c247f8b215f40f78ba01c76b049a200e1e9a1d55cb
 DIST kontact-21.04.3.tar.xz 810052 BLAKE2B 4eb66bfa6dd21ad0158d87d9165e65355167727b6194acd929ac76413d7607ad39fc887729f34856cef8caa2bf674d9b70eab7acf1ad34e140be41e6ab0775d0 SHA512 18b489ddf4c79414eaee8a5b2a3f7c3739999f97138ac9900c095dd35571ced70fa4aa3d197057d74b2591e1b8a08b84e553bbca3b223015642e4bb48eb9dce0
 EBUILD kontact-20.12.3.ebuild 1444 BLAKE2B 397946ab46b8ddacf28fd9e548ded90aa5c3fa19f1371326fb6c1ca8ef9e58788300995a8768a94df0e37219f89b286a1c2ec59dcb73d5ffb89216376fae82dd SHA512 2c08284d1b226ae6c7cdd0c4c11344f204954dce164d794b9f47a60750d44bc73879695e0a849f81a13d68186ea9e93f731b7ebf97131b1eced0f9ea6bd97464
-EBUILD kontact-21.04.2.ebuild 1447 BLAKE2B 5847cec289fb570b3d691aa2b232fa3c48e862bd05879c44190c85b4a5434a3e2056ef4cb01b16f8a08854a73bff9d00b40fe17a22d2d58c1f2980c67db22c31 SHA512 7d4c468bd17651bf6fc4af4ccee114f56f3c4b97293c39a03ce4d9242e21d2e39dfbf42b51f777ff77a9cc6a3d11017b1f198db3c7058cecf48c8f8311d806c5
 EBUILD kontact-21.04.3.ebuild 1447 BLAKE2B 5847cec289fb570b3d691aa2b232fa3c48e862bd05879c44190c85b4a5434a3e2056ef4cb01b16f8a08854a73bff9d00b40fe17a22d2d58c1f2980c67db22c31 SHA512 7d4c468bd17651bf6fc4af4ccee114f56f3c4b97293c39a03ce4d9242e21d2e39dfbf42b51f777ff77a9cc6a3d11017b1f198db3c7058cecf48c8f8311d806c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-21.04.2.ebuild b/kde-apps/kontact/kontact-21.04.2.ebuild
deleted file mode 100644
index 7e0af0e3d369..000000000000
--- a/kde-apps/kontact/kontact-21.04.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/kontact/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 0f0969846e00..a8a281a0f0d3 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,7 +1,5 @@
 DIST kontactinterface-20.12.3.tar.xz 36056 BLAKE2B 0e8c31f1c7a0efca3f8e77b1cc577098aaf64ef21e50eca96dd292347ec9dc5eb2306313b30a8d210dbac4dcc29a32366c8259da1d985fc94dcf5a084f154724 SHA512 619b68a856e14795241e814cd148660477c320a10ee26f198aff83f0828861b718dec542cc28c161de0a771c5b36c4241585d2e67c17959ad04def346438b71b
-DIST kontactinterface-21.04.2.tar.xz 40140 BLAKE2B 7dfa9f1591b79b14a19fc2edfa8dc153502f09631ae2f05d3091484fb718ae5cdf04ec666488244dbbb35978beb18dacc59842fb39b2ab3b61eb6501d984fce7 SHA512 20b16217fdb6fa8f4bc64f3c59141346e36ff71da56cea0355899931b39e67ccb69da83327d6fbbf5fed4cc9c9c616f98399a35b663b39b3ec318fefff26b0c8
 DIST kontactinterface-21.04.3.tar.xz 40136 BLAKE2B 8d2775ca21d400009844772134d059b50d28a3797f373aaf392fc0d127e88e9d1cb97e3601978ca1faf0eb66de12c44906e986f6d652542b287e7340715ac516 SHA512 e01fce2675cce7885f9167aab9fc4ae6d167e8c58aa6e4cb8fe9f714f35f02ee81700d5b86663f28fb9db802d877d2aac546e25ab9d23358a5e6c8ba3bf1f18d
 EBUILD kontactinterface-20.12.3.ebuild 711 BLAKE2B f04847cf4d4c9a276c73cd02e455b66c9f201680afd9139bc86bcdd2303f0af9ff77bcb1dfe8faf09ad526bad33b178882fe47e1b00501a5a28aaf210386173d SHA512 5afc7c99e78f422ad273ca56b07502f0cad91f92164751b928c8fa0b7bc1f5e4936fa27f6b378e2a78e4bd2f5388d8a3c0be6888771684c5f08839492e79f8df
-EBUILD kontactinterface-21.04.2.ebuild 714 BLAKE2B dd88ac0db1c0f5b7acc23c14c5f19e2a8c95a631f1f8cd31454cd8b6b052067517579bcba0e740cd3e47953177601809c4ffcb42ca11d27393961ca2cc7333fa SHA512 fe2878841663a10dd8b2facfc2d90b2334ebe371a0033ae08345dfc919bb2cb6b05165ccdc1fd8bf52943d2e1d95d7972c32308db9061e4c8bd26c9094cdbe55
 EBUILD kontactinterface-21.04.3.ebuild 714 BLAKE2B dd88ac0db1c0f5b7acc23c14c5f19e2a8c95a631f1f8cd31454cd8b6b052067517579bcba0e740cd3e47953177601809c4ffcb42ca11d27393961ca2cc7333fa SHA512 fe2878841663a10dd8b2facfc2d90b2334ebe371a0033ae08345dfc919bb2cb6b05165ccdc1fd8bf52943d2e1d95d7972c32308db9061e4c8bd26c9094cdbe55
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-21.04.2.ebuild b/kde-apps/kontactinterface/kontactinterface-21.04.2.ebuild
deleted file mode 100644
index 16443cfc72a7..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-21.04.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for embedding KParts in a Kontact component"
-HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index 4d995777f5e8..0bbef02e7d79 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,7 +1,5 @@
 DIST kopete-20.12.3.tar.xz 9380060 BLAKE2B c9d1f648a924920984f9ddfd8e5d174f034d3621ecd0468debd3689ae3261da32de2beb297513064bbe23477dc4d395371e02761c287302854f582096eaa2984 SHA512 0948547b0e67e67bce1165beb8099ba4c57e3803dfcb37fd6d547e132a449a484bf523f3312aca8cb4477cae8e8c984859313bf0b72bd70799d46e40e510c9fd
-DIST kopete-21.04.2.tar.xz 9664248 BLAKE2B 2ff84e5e856ab213d005399967312c90b88511771c5d4f6b6f9884464dd3e6d25b50dcc04cb0d789fd1b01d334ea432537cb753e97b46ad7bc99f09cf31ab052 SHA512 f6bb672402c70341e6de3132e72018f62b0a49539527e0cd0239ad08e38d8b26db7358ea89c83c148225055128679c4c07a693c25c2bab746543137c68486b5c
 DIST kopete-21.04.3.tar.xz 9663696 BLAKE2B e76dc4c38ceebd7433eb75d1c04a0d137dd7e38f1ceda36446d07d6585bed11af07106670b53df9f7bb01454d1da967498000b997d9529c72b3be8320ac79780 SHA512 fa6ec2a8f40278061d3d07aa5bd82b6c36ca302bdf30b27cfb3271c66a27422f0df964b3e15e72ba8c7699a1459ee7ae23d8f0193d1cd395ff6ea27aeeb08656
 EBUILD kopete-20.12.3.ebuild 4595 BLAKE2B 79f7265ab6b3f82f7a6ecd8bc39d6c2e81a213aac9a886ca30e54a19d46c70573fdd494c4383fe094e4af9525b5bb3b405ee5690dd332e8f6fa27ea954fca555 SHA512 f4f6676fdf9f55aecf7e5c6ef0010f386aa3ef224ffad1e9f482432f8a67737bc64d8e98a17e2075b10bff4970739fef87eae0eab9fd39f081f94f6410891885
-EBUILD kopete-21.04.2.ebuild 4385 BLAKE2B 55f9686ddbbf216863be5119e6c59de0e7a27c3673f53ac4b530f24c991c71e1e71f3e5008197f02b89ca722784e5822f24f92468515480744afc281960a2f50 SHA512 740ef4021dc158994f2855170e877714f7eb31335efe6a97b660cc1f8c47e3948cc4bbca5e40232778072aff11ea0278452e7736c0cbe8221694afe6eb022a0b
 EBUILD kopete-21.04.3.ebuild 4385 BLAKE2B 55f9686ddbbf216863be5119e6c59de0e7a27c3673f53ac4b530f24c991c71e1e71f3e5008197f02b89ca722784e5822f24f92468515480744afc281960a2f50 SHA512 740ef4021dc158994f2855170e877714f7eb31335efe6a97b660cc1f8c47e3948cc4bbca5e40232778072aff11ea0278452e7736c0cbe8221694afe6eb022a0b
 MISC metadata.xml 2102 BLAKE2B 8d82dc772819389b671c1661ad0be0f97703668a6a940c2e142163f4f6e06c110e6d6146144d12ef04b37fb6eb06c57d0bdb766f2c8155848174529111933f2a SHA512 5ca6a22e974c0cb1a24d0dba5ae3f5ff2a860354d653b800655640679c179b90331f436b4ab62338e22e01e145b7c7df2cb9bba82ad8d02436dbbd044d1bfef8
diff --git a/kde-apps/kopete/kopete-21.04.2.ebuild b/kde-apps/kopete/kopete-21.04.2.ebuild
deleted file mode 100644
index 94e44086b9f4..000000000000
--- a/kde-apps/kopete/kopete-21.04.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kopete/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="ssl v4l"
-
-# Available plugins
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
-otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
-
-# Available protocols
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
-#	meanwhile: net-libs/meanwhile
-#	oscar: NO DEPS
-#	telepathy: net-libs/decibel
-#	testbed: NO DEPS
-#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
-
-# disabled protocols
-#	irc: NO DEPS
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	qq: NO DEPS
-#	telepathy: net-libs/decibel
-#	skype, sms (until fixed)
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMON_DEPEND="
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( >=app-crypt/qca-2.3.0:2 )
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		>=app-crypt/qca-2.3.0:2
-		net-dns/libidn:0=
-		sys-libs/zlib
-	)
-	zeroconf? (
-		>=kde-apps/kidentitymanagement-${PVCUT}:5
-		>=kde-frameworks/kdnssd-${KFMIN}:5
-	)
-"
-#	jingle? (
-#		dev-libs/expat
-#		dev-libs/openssl:0=
-#		>=media-libs/mediastreamer-2.3.0
-#		media-libs/speex
-#		net-libs/libsrtp:0=
-#		net-libs/ortp:=
-#	)
-RDEPEND="${COMMON_DEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( >=app-crypt/qca-2.3.0:2[ssl] )
-	xmpp? ( >=app-crypt/qca-2.3.0:2[ssl?] )
-"
-#	sms? ( app-mobilephone/smssend )
-#	winpopup? ( net-fs/samba )
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-#	jingle? ( dev-libs/jsoncpp )
-
-# tests hang, last checked for 4.2.96
-RESTRICT+=" test"
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DWITH_qq=OFF
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-#		$(cmake_use_find_package jingle LiboRTP)
-#		$(cmake_use_find_package jingle Mediastreamer)
-#		$(cmake_use_find_package jingle Speex)
-
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			jingle) x2=libjingle ;;
-			xmpp) x2=jabber ;;
-			zeroconf) x2=bonjour ;;
-			*) x2=${x/+/} ;;
-		esac
-		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
-	done
-
-	# disable until fixed:
-	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	ecm_src_configure
-}
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index bf241ddd1ea1..5807fb088b4b 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,7 +1,5 @@
 DIST korganizer-20.12.3.tar.xz 2246496 BLAKE2B 7235c2cfaecd2368ce555c24d3742c8ea406b94bd53e642791d4ff7121bf0d1156e581f186d57daa11c40d4d3357ef7c44d1aaa3d9535ca33f9289df04f821d8 SHA512 3b8b7026704acb1afcdf83d3a0c8e0ea01ae4a2ed6f3667a7e2fc504cc2189395b6967b7b7ae36dcd0b92ab88451c6ad5e786a9b5f5cdee594cc03a9a328f974
-DIST korganizer-21.04.2.tar.xz 2408340 BLAKE2B 6a87fd8ea59573ed0dfcaddfc507fbfb93d53882c7051b821c1b0e31f61bb5aed80331d5656cb2ed6459e3722378d0f1e3463135a2bf9e26ab456e4ed1f9c994 SHA512 ebdfa856d0ac5bf1d3bbb6dddd51646c44b1a4295d4fe9fef671040e4432b813a0fbf555f9a3c936da50aabae8ce5f28ba1e93535f1306ccb49279798821986c
 DIST korganizer-21.04.3.tar.xz 2408368 BLAKE2B 084c118b0502f7aee7cc6b016eabf0410974c31ce2b79ad36611896b1de6c850bf57fe55f4a323e7d672c3166f639be4e9b4e5eea3eea153bb672c297d0bc25e SHA512 fc57dc668bd2aa96c4b2668f7d4a232ef277601c5ce54f452fbb0174cb099dfe75b0416b9728bbaf030c72f588446fbc98901879631804861936ede1e8edbbad
 EBUILD korganizer-20.12.3.ebuild 2795 BLAKE2B 9424f987b77672ae121f68120e34198be2d667e92448cd79b3cc4ffcd223bc79ef0d772fe445cff5fd8ffabd79fe539465a62e798e1a5e6246a9a6507763720c SHA512 a3dae6b9da132fcb29c6f92dbdd03a532f6984670e90dfc3f04a0df2d69e408a7ce35fe2438dcbfee5b1e5aaad48c2211cb7912ffb5e3ceb23cb1b851d76d9ff
-EBUILD korganizer-21.04.2.ebuild 2798 BLAKE2B 5f9b6429ef0da83f44628d9a86f6a0e7699f8074df167e33bbefd56d58dfc7b79fa40695b5bb9cfb0ce3caa7053f8a27e55d745a3b9db32391886ef9fcbde68e SHA512 dbef68574941f04da1607fe686e5a4a440aef7668bbc28e2779ccd98deed93c5f4c53ac433cc4960174594b74421195bc05d27d0572b9eb431ed3aa9203d76e9
 EBUILD korganizer-21.04.3.ebuild 2798 BLAKE2B 5f9b6429ef0da83f44628d9a86f6a0e7699f8074df167e33bbefd56d58dfc7b79fa40695b5bb9cfb0ce3caa7053f8a27e55d745a3b9db32391886ef9fcbde68e SHA512 dbef68574941f04da1607fe686e5a4a440aef7668bbc28e2779ccd98deed93c5f4c53ac433cc4960174594b74421195bc05d27d0572b9eb431ed3aa9203d76e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-21.04.2.ebuild b/kde-apps/korganizer/korganizer-21.04.2.ebuild
deleted file mode 100644
index 909d2701781d..000000000000
--- a/kde-apps/korganizer/korganizer-21.04.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://apps.kde.org/korganizer/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="telemetry X"
-
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	telemetry? ( dev-libs/kuserfeedback:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 7cbf6e782bff..aec166e4e6f3 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,7 +1,5 @@
 DIST kpat-20.12.3.tar.xz 3584892 BLAKE2B 89f8c74adc23a7b11ae34a790caad61f12939d2dcefbb7e9d7ebc162e8331e78082e2809171704647c0bf7739e8623f7f2b2e3f61cb13a745787da91aeade85b SHA512 d299fa951e171aeb45ca2b543e2eeabbd8451311446e685573c8306f5e8a34c0caba7017f2523c7286106a48f51f9f19f3723d71a2df8a19d9d51c21cfdaf23a
-DIST kpat-21.04.2.tar.xz 3657204 BLAKE2B 8c3ccbbbc2357d183000a47046ef82c3dab21318cdbe65b8f81ab88d8a877a3fde6e981df1a0038ef3a147ef47f2529af108fd7a03104773dfe08563d722d954 SHA512 cfcb71e5c2d3bfa6df8103426a79be67513355082fe77037963d0367199929ef88673415705dc84b7298e0b5dd56349de0e59ec9d1e3e616498b9df8534a1828
 DIST kpat-21.04.3.tar.xz 3657800 BLAKE2B a5481118c0080af0d0a68b280597f847550e736d6551737d300cda235c7035f669de6f4d2a570c623fcd9d32a6e8e36ec435297c2d0ed6c14ff15ceb1264dc7f SHA512 1e2f8eae3cac9877f9cd495c9b430070148188f99a759c0e4d22c900c822f944052bdbc7e5c7e86ce278afbf6351e2af100aa3482518c79e6d993f3954de375c
 EBUILD kpat-20.12.3.ebuild 1246 BLAKE2B bb01c645349f074182c69cd5984c6d29f4da94fbc252a88865832ab3dd95d79806d01ba6e29ceda5dfbf0680493ce5ff9cc481dfb8bf70c6c913e9f0835c43f7 SHA512 98bd6814aa2ff0521361df0ec56cc9ad83c2328bf56871f473098b3272cc86f4e26d143991c9d8132cdd9f85b71f270b192b6d2e523b75a4a299e5fe16579d15
-EBUILD kpat-21.04.2.ebuild 1249 BLAKE2B 89a44b2a222eda4dd4c2142de89952a04b6bf6726e1137db00c2297d598a60d1ac34535f22f0a53f6c5be2175e3a8e00b229c9cb15f3860d06e0ab3b60278d27 SHA512 0fd04c2b57d631233c4302c0724098192b13209c29d0416bbd8441c750bb1333ca83b5641e789e709c7ef475bd13d28b6c4dcaf9ad14110a1c633a86506b6be5
 EBUILD kpat-21.04.3.ebuild 1249 BLAKE2B 89a44b2a222eda4dd4c2142de89952a04b6bf6726e1137db00c2297d598a60d1ac34535f22f0a53f6c5be2175e3a8e00b229c9cb15f3860d06e0ab3b60278d27 SHA512 0fd04c2b57d631233c4302c0724098192b13209c29d0416bbd8441c750bb1333ca83b5641e789e709c7ef475bd13d28b6c4dcaf9ad14110a1c633a86506b6be5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-21.04.2.ebuild b/kde-apps/kpat/kpat-21.04.2.ebuild
deleted file mode 100644
index 84444bd389fd..000000000000
--- a/kde-apps/kpat/kpat-21.04.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE patience game"
-HOMEPAGE="https://apps.kde.org/kpat/
-https://games.kde.org/games/kpat/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-games/freecell-solver
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_BH_SOLVER=OFF # bug 733502, requires unpackaged dependency
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 31cd967cf1ea..1483cf87d4a9 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,7 +1,5 @@
 DIST kpimtextedit-20.12.3.tar.xz 201292 BLAKE2B ec0e0e1b22f2f061ce7bb21dd26ba7015cb85f1cee39af8d4ebc62bcb92a06ece7a803c4a865b3fba0b0f9b501c274651e53ef2b63d83dfff0835886cf68cb29 SHA512 8a62f79e909d4d434766151b5a53f024252fd6feca94bead809ed5f2a5b81a544563bff15afdcc3c9b280ba51e7f96bd643b490d88c0e28dd7fa378168cb1469
-DIST kpimtextedit-21.04.2.tar.xz 206064 BLAKE2B bf327425d98e9435c8adcb4e53892a63ea9e7395d93c5d6d74f2fbb2b0259f7754f3ea43f6c6ec65bd1b6c68aec9e28f60fab1bbe40947fda8df0a2894b58b6f SHA512 a7c5a6c21046be9fb9407f385c7082d3418be7f19511d5e5dc35fbbe76d08573d3e6533399566e204bb91af1bfc5cd51ae7de8fa6ce73ba8231450babbb8649d
 DIST kpimtextedit-21.04.3.tar.xz 206168 BLAKE2B 4fbe9798841d7f3bca7dd9dc9869b6ad464e1582fc0275f95985dc83b244463e9c773e1fe4bc913f748559d503b9e848413a30565d7dbcba590fbb81166d7fb2 SHA512 ebf436506faaa5cfb9f0eb5d3b18ea8d7bdb525e3a2bd0bba1e89ba81fdaf546cd8e92af1e012c549b2724efc7f350db44de946cff8d11775ebfedcae8dcd428
 EBUILD kpimtextedit-20.12.3.ebuild 1023 BLAKE2B 1ee0d8f23b0957a3add29afcb5ce9d77ae15f2bcdbca5ee0233c67d2861935e1bbfb35147b8f92f9f8105f937cbcf212d255c2eedda08db35790038fc447d2c8 SHA512 f4e16496e37087fea8b7819af5a5f13f551bcde337dfbab1c8be3b157aadf5511a5da7d3ead9846c56d2d6f9b71eda01de2fa1c5971ed33ab5bb9d56683c7021
-EBUILD kpimtextedit-21.04.2.ebuild 989 BLAKE2B 79772323ec3512f0f417143e8f6b1d4ef82247b808763ebd2d48fa5163d3239064e0974cc2e5f8145f68416a4e4e6a5cd6a541ad78398ae8d5fe0592badbe164 SHA512 b63fc2d79065cff544fd5b388f751714dd4a8e2d28cd7952df6924cb825bbd2760aecc2deef705ddf450dc0f289a2164e7d37f30b042feffe605984398f5d9fb
 EBUILD kpimtextedit-21.04.3.ebuild 989 BLAKE2B 79772323ec3512f0f417143e8f6b1d4ef82247b808763ebd2d48fa5163d3239064e0974cc2e5f8145f68416a4e4e6a5cd6a541ad78398ae8d5fe0592badbe164 SHA512 b63fc2d79065cff544fd5b388f751714dd4a8e2d28cd7952df6924cb825bbd2760aecc2deef705ddf450dc0f289a2164e7d37f30b042feffe605984398f5d9fb
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/kpimtextedit/kpimtextedit-21.04.2.ebuild b/kde-apps/kpimtextedit/kpimtextedit-21.04.2.ebuild
deleted file mode 100644
index 2b835be9ecbf..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-21.04.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Extended text editor for PIM applications"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
-"
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index e289539db2bd..df93843cb4d8 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,7 +1,5 @@
 DIST kpkpass-20.12.3.tar.xz 23448 BLAKE2B bbc558cf7429e171bb60cc754aba324f9efa43749c0f03a8f00aac78eab1a1f05d03782098c17531edbc7ca6db9ab1545bbccd739178230c35e4db0019a2747d SHA512 3a2b1e82e0078a99ff171502d38195e8366b665db3d927c385319a5faf5f1c3bf5d2dee9c8791acdf73e06a52a06e59a2e1d9deacadde767271f6cd37f6c00bd
-DIST kpkpass-21.04.2.tar.xz 27360 BLAKE2B 565b65c1e7e23ffbe3461d459a3c0fa748a8329b0d2a0e187efd83074648fb9d144cfc380ddac872852c77656d00d5ac7e70ab410976c8857b940663e779f918 SHA512 d41213b8339b500a185656250465a2fbcc1929cc0cc79b9004cd19e9b6f6c62c34692422b735ddac5214c387114628396fa60741ce0b9512eaa74cf0c2cb2ea5
 DIST kpkpass-21.04.3.tar.xz 27364 BLAKE2B 2563eb0d375e593f659214bb3aa3993c4eb7f8186d9437ab8b4f57f3e119c0bffed42f0c758517f47c9533771e9fcd26bc1fe2bfbf9594b424bda6a193b5cdc6 SHA512 c5bd2621dfee0e518e46fb7f0fff61594cabaa6ab5b3c58c682478f99ff85028729bdf03cfe41e0073d86b5fc841a10156d9817cf26b86dcc6ee7dcaa8547e71
 EBUILD kpkpass-20.12.3.ebuild 470 BLAKE2B 7b0fbfb19ea094629bb5bea278e12ab46269b6b504ca2bf0261f4b0bbc06169e956d42cb9976a96137183b3352d93f6bc0bb473e4e8333cfc0f235d1a438fe8a SHA512 367badf9f45c8d1639d45d0f3b6a62ea3c6bac4f4c2f5b8f38d32f1e885ba3b36fee3674887aeaf61a86ea3d4d7123bec18d0c971e88cf1acc24a08406e98005
-EBUILD kpkpass-21.04.2.ebuild 473 BLAKE2B 4a7030aa4533e5cfd95d7f966e173e4aae2a68bcce5341c018460b05ad0b49997f6f0839098afe672368b116972dcd80e7d412ee2544d0bbf3a4a989ecb93209 SHA512 4bdf4c0d872bc74f1d23054a739b81ef98ffd026be99e35741b9d2210942d2d8119f996163cabbc6a865f1392bdb1c94a32b9f525ab293d8b69c1e22ec4d47cb
 EBUILD kpkpass-21.04.3.ebuild 473 BLAKE2B 4a7030aa4533e5cfd95d7f966e173e4aae2a68bcce5341c018460b05ad0b49997f6f0839098afe672368b116972dcd80e7d412ee2544d0bbf3a4a989ecb93209 SHA512 4bdf4c0d872bc74f1d23054a739b81ef98ffd026be99e35741b9d2210942d2d8119f996163cabbc6a865f1392bdb1c94a32b9f525ab293d8b69c1e22ec4d47cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpkpass/kpkpass-21.04.2.ebuild b/kde-apps/kpkpass/kpkpass-21.04.2.ebuild
deleted file mode 100644
index d7c9e1b7b537..000000000000
--- a/kde-apps/kpkpass/kpkpass-21.04.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library to deal with Apple Wallet pass files"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index f8d1f8aabfe4..f4d4ccf14282 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,7 +1,5 @@
 DIST kqtquickcharts-20.12.3.tar.xz 30080 BLAKE2B b3ea86c409806c8024fb27beb6aaf3d2760ab02d3e449bcb8d0ec45f473020606dc3f9e38b22e8e36ee2e0e617d178e7f69a95dc168348c2ff7a62c3be17ab4a SHA512 e3b02ac20b20c9c2d85f3006efb654af42154baf2d215373296bac1377aee889350cdcc2c6d0642d419285433352923fc280e72d6375127d3646d681ae3276cf
-DIST kqtquickcharts-21.04.2.tar.xz 29932 BLAKE2B 4d4c268221dedad53cb4a2add0b5e2e9e6cfa868ea481f392379ac83a0ae930653fccae009cf427461cbe849f76c05ebb026ff18ad8446f0b95108f82b750d96 SHA512 6113d97b1bf977c38ab48a7f7c736321651e96dbc8377d85416ed69aa87327a9b570641fc4720ccb3eafb329e1cb91c53a9b4591536fe2953a89182d6d8eb992
 DIST kqtquickcharts-21.04.3.tar.xz 29932 BLAKE2B 6fa241f9371341d62d7bf739e6e27c8568e425482ab5b71247784e368a4f98c67fd915aa38bda3551f11b2fff778797f3b1ee7e130ff49d374659c4feba82bf1 SHA512 5e6115cfb12aa1d1d376467b168ea171e4254dc66125e33c248e2bd7edcbe1a2d942190c800d8659c292cf07f7e824ff57569fc6e8e685c10eedb125f87b1bf9
 EBUILD kqtquickcharts-20.12.3.ebuild 383 BLAKE2B 31a11a843ae6e87a5ec739efb0de0d319b67fde33781a981dcfbde59643cdc7ddd92c4bacea531f7d93ee477f30edcadf8098a1e228015f7f6e9256fb61c1009 SHA512 b70044f5f988742e3770929fea6e4eb32629d4bbb12d4efd0c86dee187e2f3d457d58d4964e1d7731c5f24ccf4536f2e77d9e75fc1198364efdb1ecb8e837beb
-EBUILD kqtquickcharts-21.04.2.ebuild 386 BLAKE2B f582910247b3b26af8122ab57d8559846976924e2343bb0d1c9b5a3749f1d623e67d085e36f461feb0092a12dff1285e84d959ae5d4c3eeece9c987f32ff138e SHA512 1b18b7b4fb6d0b4bac6d687c4e74e79fa777173e84504976f782e9ffa5c38fd327d47c6ea77eef80c8fa0d8849314bc6fd7f2165be05977dd29c7dfe2c55a7d1
 EBUILD kqtquickcharts-21.04.3.ebuild 386 BLAKE2B f582910247b3b26af8122ab57d8559846976924e2343bb0d1c9b5a3749f1d623e67d085e36f461feb0092a12dff1285e84d959ae5d4c3eeece9c987f32ff138e SHA512 1b18b7b4fb6d0b4bac6d687c4e74e79fa777173e84504976f782e9ffa5c38fd327d47c6ea77eef80c8fa0d8849314bc6fd7f2165be05977dd29c7dfe2c55a7d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-21.04.2.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-21.04.2.ebuild
deleted file mode 100644
index 85d519acf2d0..000000000000
--- a/kde-apps/kqtquickcharts/kqtquickcharts-21.04.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index 5d346d69bccc..5ed44ef3593a 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,7 +1,5 @@
 DIST krdc-20.12.3.tar.xz 1564652 BLAKE2B a98c021fcaff3b654a2da6c8c80eae0b6876273085aa78e774bf9470d3608a55f6cb7c5b841c49aa4080bb5aa2769fcb7cf80d396546b5191aa91a2c276d79be SHA512 bdf9fd7fd0be6925e6a547d2473ec78d073cfd252595996715f1216d1ff86a2792c995e708aecc4d9273dd605463bd769edffaf6543d0dffc0af910174789e4f
-DIST krdc-21.04.2.tar.xz 1584720 BLAKE2B 23f4e2449fe90a54d12942ebfc8e282a1c904cd791819c1438831528a71d8419f2a5620a96525f2952a0c1dcd5f3ade1db9a8d07b29ac66f4eff4e13f157b2f8 SHA512 b2c0fd0aa3c0c4b77a4f7ddae04f9e06f50edc6e18612bb26f62652d0e3cb9b5fd8320dc7aa3faecd7794b9c3fa99d537eb9027818161aae7d71c8d5903b0225
 DIST krdc-21.04.3.tar.xz 1585088 BLAKE2B b155432330257a79ad8e334eb9d9a5a23841c5e2284c379a0cfc7aab10648125a7161c63378b5430ae4f4f24f57e6b8ee6c4b4132e8fd02ec0e89abebc4544cc SHA512 f58c53a9bc851b27a2eaea9ca3119ffc87eaa832af52dd47539308d56ee853343ad4e8e33eb0a955c0d813a582725c8a00a9a35e2eca1626208ded241934a17a
 EBUILD krdc-20.12.3.ebuild 1398 BLAKE2B 2db31f2efd8e6fab7a040eadcd6a0a049a2a55d7bb496b367087238b5d6b65703da2385ada52f5f95b4d9570a8f9e4cf6cf13ac009c7abac3266f05c4587cd62 SHA512 78611a44bd0973ed79579c60d12bf4421afaa30cd8d39683ec89957b9c6d50cd4992d853b10f4c9e70cbf971f57b8a28a0ade9d4519d739a2ecc10da0c451fa1
-EBUILD krdc-21.04.2.ebuild 1401 BLAKE2B 4d321534f277d658b4109bad9ce0212ee82b35c7b8571718d48c1ae3c8a6b3cc10cd0e315cad7516914fc46dc369f1788e68fb8b1584e1a7d79f39b85219e118 SHA512 af544cb6ebcb80d81928aa44709720683c64c66e5c0fac9aca1bc4aa8954d8ca7784b4553f26cb4e72e97227507a90ec2b09e68542674d02a2e0fe4a975a30d8
 EBUILD krdc-21.04.3.ebuild 1401 BLAKE2B 4d321534f277d658b4109bad9ce0212ee82b35c7b8571718d48c1ae3c8a6b3cc10cd0e315cad7516914fc46dc369f1788e68fb8b1584e1a7d79f39b85219e118 SHA512 af544cb6ebcb80d81928aa44709720683c64c66e5c0fac9aca1bc4aa8954d8ca7784b4553f26cb4e72e97227507a90ec2b09e68542674d02a2e0fe4a975a30d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-21.04.2.ebuild b/kde-apps/krdc/krdc-21.04.2.ebuild
deleted file mode 100644
index 092baba543cc..000000000000
--- a/kde-apps/krdc/krdc-21.04.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Remote desktop connection (RDP and VNC) client"
-HOMEPAGE="https://apps.kde.org/krdc/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+rdp +vnc"
-
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	vnc? ( >=net-libs/libvncserver-0.9 )
-"
-RDEPEND="${DEPEND}
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package vnc LibVNCServer)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index bf812713b683..595a94efab5a 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,7 +1,5 @@
 DIST kreversi-20.12.3.tar.xz 953588 BLAKE2B 6147c4e529ea3be0f678b24767c8d2c29b4db4c711923f350f8c31e2251b0359e4a9e311f7e48c05a4e549f6256027f84b791675bf3f638f72199480730101c8 SHA512 300704489db887d3738491a7dc0b62bf6d7056c803c778ea48bbb086c71b4c57a46517fe4350379982c2b6effd8fa8bfe109e506957905f168c341eb51e0dcd2
-DIST kreversi-21.04.2.tar.xz 961792 BLAKE2B 09080042d4265695cd4f87c6a5e9e42f7b75d4695fc5933d63ee42da4528e879ea27e16d63fc246f6413a8088b6df6b602d600a122d15748189e13a7391e2eaa SHA512 1fc805bfa6e3723d1395cfd42b9ea5a02e1a39d0b7f18af3c9fd107e24cf1c00e0c0a147099e0c5c343bed84f2c235bd3fca4251a12c60542eec9e7f46a759b7
 DIST kreversi-21.04.3.tar.xz 961740 BLAKE2B 45f882d1ad08d6fa6d14f5c32bad438604855a1349afca84206ba1203949b3d8c112d1930007a3b3e4ca4d61929ea48cf8649d4300476679d6da17934226d064 SHA512 805d45bc80e7a534f255d2aaac77da3e3b521711eed7a8e04b494e81b6b255247b1d2b28ff5eda5defcbb40b98c668e8b47845d7eaaf16ea0f7e8293169e310e
 EBUILD kreversi-20.12.3.ebuild 1069 BLAKE2B 845e757015e5831f521a844a684bfc9deb1ec41aca661e31a971511dc3155634abc86e4dfb6154639d6cf6edbdc3e03b9a29060711cf8f171f9e67a819031a5c SHA512 7699d6ec09a8d80e1f27a7a20d4859eed32b2eaaeae19e172651af42c3c49f7fe6d81c49110b29b9cfed00538215fc6b0f40cf1df31e9ca86a87da9999a1e45e
-EBUILD kreversi-21.04.2.ebuild 1072 BLAKE2B ef525b19673c9316b9e6455601f433d09e89464cb0fd72ba68ad406cdaf335845fb86e17d1935050dc436f610f0bd19b06d03754b01fe54dec5e879b81545391 SHA512 05349b2c28f9726ecd1814d269c0cb9bfdc0cb99fb3e99cbd29121a2100c33b126fc8e3ede606461deeed9d39966e3c0276f7d10d38bd4620fcb46a8d80d80c8
 EBUILD kreversi-21.04.3.ebuild 1072 BLAKE2B ef525b19673c9316b9e6455601f433d09e89464cb0fd72ba68ad406cdaf335845fb86e17d1935050dc436f610f0bd19b06d03754b01fe54dec5e879b81545391 SHA512 05349b2c28f9726ecd1814d269c0cb9bfdc0cb99fb3e99cbd29121a2100c33b126fc8e3ede606461deeed9d39966e3c0276f7d10d38bd4620fcb46a8d80d80c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-21.04.2.ebuild b/kde-apps/kreversi/kreversi-21.04.2.ebuild
deleted file mode 100644
index 89c698d88fea..000000000000
--- a/kde-apps/kreversi/kreversi-21.04.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Board game by KDE"
-HOMEPAGE="https://apps.kde.org/kreversi/
-https://games.kde.org/games/kreversi/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 12f43bb8a116..9233b4f6d3a6 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,7 +1,5 @@
 DIST krfb-20.12.3.tar.xz 1280912 BLAKE2B ddb95577a65c5b8071a6caf8537c8e2986b36582d8c9ac369d3f514f62484392dd612f38c1e23866f38ff2d040d4150952419788dbed731f4b617518e9abca2e SHA512 f66948288fbf78adf893c9c53c76acd6eb36e805d6603d912e4cd5d7ecd6fd7dedfa421a072aff989b51b312041793b4a6c3d2a16dbef50a9a1f7014c558b5ab
-DIST krfb-21.04.2.tar.xz 1293092 BLAKE2B 83d1487e66219378c7c9c505e6ea155f29ce5d6010da423fdaca69605583a5ec43e70e9f38b76b8e3f4af331084fd46f986cf57674df99d2c0830c2d8579bfbe SHA512 af9b86b3eba89b6856cfc77bd9a9252c78496370fba83f118c0614ef57022e00550c680f5ab8383c927e6151039e17f40e1770970791ed28a6c5339d22f39342
 DIST krfb-21.04.3.tar.xz 1293036 BLAKE2B 351693552e19b0e173c2d7d3fa208866a6650df1ce110ead4aa505848d3ce917b9f504932f10b2a6e7e0d31710ee5b41f97887ca2e6edd5bd845759c495d991d SHA512 3066fa25a405195922d962d0906d48e69bbc93d1a17d6f84b2c0a584b48d3758ec39d9e302debdee936c81998a81a75fff9faf1ee823b9a39169dcd7cd51a6ed
 EBUILD krfb-20.12.3.ebuild 1385 BLAKE2B db4b7a89e66d9969901b91cdad5c4b877f30d47d8d5f73d7fca61ef6e52bfec7a833afce823d3d3090e2fe0f47b4cf75cbf1ac08869cc2bebc313cb0423ae515 SHA512 313446f0f23a5134ae9991826530f1e5863237a20e1220d2dd60b4ee985c65e262ded54dd5fc523f01bc4c4933b80844b8c7025b3553752d5ad3aafff784a6c5
-EBUILD krfb-21.04.2.ebuild 1388 BLAKE2B a761805446ec4f1ec3c52352c64fddbf0563de0123c18148dbd9b44afb7bc47e47b18920124cb26a22478796e8f3df574c762bd89c0ca062860fa1ddc1090f32 SHA512 2b739c8b950c0767bf1193a1370435104ee3561eb0c55f1e9a817d082a03397bc6364aa2e10de17fa6ef27cd087fda20cf8b9fd6f77a2da3ee0c8b952ed3e50c
 EBUILD krfb-21.04.3.ebuild 1388 BLAKE2B a761805446ec4f1ec3c52352c64fddbf0563de0123c18148dbd9b44afb7bc47e47b18920124cb26a22478796e8f3df574c762bd89c0ca062860fa1ddc1090f32 SHA512 2b739c8b950c0767bf1193a1370435104ee3561eb0c55f1e9a817d082a03397bc6364aa2e10de17fa6ef27cd087fda20cf8b9fd6f77a2da3ee0c8b952ed3e50c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-21.04.2.ebuild b/kde-apps/krfb/krfb-21.04.2.ebuild
deleted file mode 100644
index 100e5beb39f5..000000000000
--- a/kde-apps/krfb/krfb-21.04.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="VNC-compatible server to share Plasma desktops"
-HOMEPAGE="https://apps.kde.org/krfb/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="wayland"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=net-libs/libvncserver-0.9.9
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-	wayland? ( media-video/pipewire:= )
-"
-RDEPEND="${DEPEND}
-	wayland? ( sys-apps/xdg-desktop-portal[screencast] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland PipeWire)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 103d1c566958..2a8706922a11 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,7 +1,5 @@
 DIST kross-interpreters-20.12.3.tar.xz 151292 BLAKE2B 71fe7ac36c989a24a1a8121b41ed46406aa95792a92f2fa6b91a837d4b81c5c6ddbc1e47218660d914282dce7828ea3ad37539614b69df2c8ab1865c467934cf SHA512 5b2017c32779315cb3b726d36ee508d3fb56e4ad69e7ff675388f5d9819eb255afde74810796b8493df06c7073e5d284ba58776567449d323e3e5bd2af42f215
-DIST kross-interpreters-21.04.2.tar.xz 151620 BLAKE2B 336c751b8f2ec08e9d59d28f0bd289b061b0abfe5986c96c9ae8f6696a191ac6a13e0941502f3f2af86e6c8b1707b4b539668d4f6c4adba04ef23585903692f7 SHA512 03739d3470bb24a46dfd16da7aa42fb69056f8d1a122d978c6ee33169d80f2fa20d6f1304aa7b41597733acdeaf2032b29f9773fb8552835ff2bf9ebcc55e02d
 DIST kross-interpreters-21.04.3.tar.xz 151580 BLAKE2B cb73044d83e31ed9937605263815d328a6bb86e7a72224dd9bf64a6491ed001ae9bc87aa079c0ed1f4836695ac8100fa7ee97f879948e90957a602dea684703c SHA512 cf289e923b0c212e0a6c973795c6afa264d0fcf1b126debf6fa738ab326e0e7ee50a487ecdf59155214ea075777e6fb905621f7784e1e3e61132e8856050a462
 EBUILD kross-interpreters-20.12.3.ebuild 611 BLAKE2B 8fe0e2794553110b548eb89a4b984d5c7d58b2d3b9d1441d6a56b395b8a9e39bcc95d906c5eea258509e24e518d6efae21bae4d448fd54305d82e56e11e48563 SHA512 b8d6231beee10eabfd83c3646d3776e0ab0cf2efdfede1d8d77668e3c6e97ea9edaa932fb553c9cf873fda70393a63d9fc15b62d2925b716c3d3842c757331d9
-EBUILD kross-interpreters-21.04.2.ebuild 614 BLAKE2B ac1de5cc190a9f3ad9ffd4b9db07b107a6a6d5a31c1dc451d8da2ef835b79147e4c1859fb6f9bcbd9af09390f36cd52e9613c357b2ece5ff21627fd80241a6a3 SHA512 2e4596291a6e9f8da9d64bdcae0032cb0ff25b43af7d3589200f4a1849588fdcdba13a05dbd87afc79bb5c117b4a79587ecd3aebb34d1639bb406221a75a28e4
 EBUILD kross-interpreters-21.04.3.ebuild 614 BLAKE2B ac1de5cc190a9f3ad9ffd4b9db07b107a6a6d5a31c1dc451d8da2ef835b79147e4c1859fb6f9bcbd9af09390f36cd52e9613c357b2ece5ff21627fd80241a6a3 SHA512 2e4596291a6e9f8da9d64bdcae0032cb0ff25b43af7d3589200f4a1849588fdcdba13a05dbd87afc79bb5c117b4a79587ecd3aebb34d1639bb406221a75a28e4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-21.04.2.ebuild b/kde-apps/kross-interpreters/kross-interpreters-21.04.2.ebuild
deleted file mode 100644
index d0aaf1cc3b66..000000000000
--- a/kde-apps/kross-interpreters/kross-interpreters-21.04.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org ruby-single
-
-DESCRIPTION="Kross interpreter plugins for programming languages"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	${RUBY_DEPS}
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
-		-DBUILD_ruby=ON
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 9f71e2ea6968..65e130a26b27 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,7 +1,5 @@
 DIST kruler-20.12.3.tar.xz 272396 BLAKE2B cc0c6cbcfe1ae2d4445175ee5019800e9ee9f1e1db1c8fe91ed7e7a6e0be8167663ca8a18662c1d36532567eaa87f0a77f4f0163d274828f552d962985b9cdf1 SHA512 2facf88204295321235b65975a1147b1e8e1d1f1ab9219bea635807bd9e6d3d060adc5a0e44d074132aea4a39cd0aeb4647b4f19692950484bd2b3516ca57b01
-DIST kruler-21.04.2.tar.xz 275976 BLAKE2B 0dbd8c33d65e7a89ce10a8802192ffd93bdfb371180aab5569bba3bdc4a1ad2436c58c2f34aced9006f8b0332985c39664bbfa53e16844c13cfe3fd21d70b0e1 SHA512 a40a5ad73a1dff76278a22351432b245526d150102d56496e373f04b2e8e28f9c366102ed2953467b8e7af1687cd8c1ed0227016d252e94f71516fb8acd565b9
 DIST kruler-21.04.3.tar.xz 275880 BLAKE2B f12f45353cb7fa9fc0253b94dcc302578c94d1fe2faa91451d13b065e6172e5a1065dd25492474383cd1666581f7126e9d2a8a28990a5b5d5889e21a111dd3a1 SHA512 e5ee427bcc1de89115eb7f8492c0da7c5d2dc0939b619f344c81ce79119ace6520565312321f48e584db5142dc5c7cb3d5ad05b1606ba060d76a54202c395360
 EBUILD kruler-20.12.3.ebuild 934 BLAKE2B b746823667fbea97e1be16339e801b61c46657cf6c1076c2169a72f752adf9bf72c35587429341ac87426db2d2438e93124ce78f82040cf8b589b1a5d82e6151 SHA512 ebae2436cca2c94e6d4a7cfc3fcc41934d4a4b2118e0ed587833ec5736d2b61664ee9c1301c64a5f7d3a5bb8e56de3653a3ab995c4ab28d85ad01c03164aa966
-EBUILD kruler-21.04.2.ebuild 937 BLAKE2B 696d4c90b61b38bcf9fd6c3f26b857ce794ee00f92d3a75e852ea1f100098a775ebdf2d7251970d424f242ff641601695ed67aec9d0cf9993638663f74d44f78 SHA512 f9beb4aa1dc9213e917873bcd8cf9f146570d65861e9ede21817ae02e788a236923a5780dc4f30da7da5b4eb41be68323ebc6035ed21b0136ba58c99697c7bd9
 EBUILD kruler-21.04.3.ebuild 937 BLAKE2B 696d4c90b61b38bcf9fd6c3f26b857ce794ee00f92d3a75e852ea1f100098a775ebdf2d7251970d424f242ff641601695ed67aec9d0cf9993638663f74d44f78 SHA512 f9beb4aa1dc9213e917873bcd8cf9f146570d65861e9ede21817ae02e788a236923a5780dc4f30da7da5b4eb41be68323ebc6035ed21b0136ba58c99697c7bd9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-21.04.2.ebuild b/kde-apps/kruler/kruler-21.04.2.ebuild
deleted file mode 100644
index 2242fc75010d..000000000000
--- a/kde-apps/kruler/kruler-21.04.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Screen ruler for Plasma"
-HOMEPAGE="https://apps.kde.org/kruler/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 38caa2a5191d..47cfca63dadf 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,7 +1,5 @@
 DIST kshisen-20.12.3.tar.xz 827336 BLAKE2B 1f587496f98b1989985b9c7c48c21b1738dc1258768bdbd0ef89296540243a6882f5ca59ed3062c637742d522f278535975140e9e2d367a543085924df0d7475 SHA512 32cf664a6c4c5bf20abf9d025398d45a4e37eb3693df337677ae23dc92f508862332f992c2d4a318af42fcc12abc4dcf2068c44633135ef66a7683cecbfe1581
-DIST kshisen-21.04.2.tar.xz 831532 BLAKE2B 94a088442d65c259991a98ebfce6d91483d4151ac58554450d6246e0eedfa860cb8dd496927aea01887b2b79d4a790895330749a63967a64f69161d2eba140eb SHA512 381087e4c5629679ba71d3e3cce2389d49a4fa5729c23ce7686a31e9c81da157ff02a5ae78517fa56686bbfc6fb7309797ef03d09c00c2d6b79529bb6fd82a14
 DIST kshisen-21.04.3.tar.xz 831604 BLAKE2B 3e0adbe0459259feb4ee626a3118019dc44248e66c5650851eb0f88071b846c1881088ba56aaaaddf537f014c4120ef4c45fcc54a150ce1776ff304cd852712d SHA512 e161efb845bed0b63b6ddd8ff1c1f9f8ed8518ff2caf9ff9aa9030fcc207494a167ce5b369c9f8ad0dc57de987363c59687c9bb9bc27923247e595ee60f5762b
 EBUILD kshisen-20.12.3.ebuild 947 BLAKE2B d2cafd30ce3e51056f3482c805b218826e56d5f15249868e2a37110c2ecdf103e5c3ab478b9af9068fd8e9962314d07e294381e4d4d3baf0bcf1659a11e379a2 SHA512 0d02ff8da6af9e0353d38c42875f011a2ef35c3a8d6d7e980b2775c7bed258f9b6a6decadb9eeb7ba447b36b6f343923358cf36a7de35d6715dd6b6e05d83750
-EBUILD kshisen-21.04.2.ebuild 950 BLAKE2B 933ff90010856f16985b7cd68868110c7cadbbae62a1f58a00ad5872d06b41446be9e9c1184d74fa819386624dec1607e2125ffd42b5b40d2c732290d31f663f SHA512 8d8b4677dce56b5dd11d5f11166ddb66564b5ea8527df3da9cc774008bbc3566de0cb4a95de089af077b8cab00bf581232b59b27f3a3ae8effe0b852ca4168b4
 EBUILD kshisen-21.04.3.ebuild 950 BLAKE2B 933ff90010856f16985b7cd68868110c7cadbbae62a1f58a00ad5872d06b41446be9e9c1184d74fa819386624dec1607e2125ffd42b5b40d2c732290d31f663f SHA512 8d8b4677dce56b5dd11d5f11166ddb66564b5ea8527df3da9cc774008bbc3566de0cb4a95de089af077b8cab00bf581232b59b27f3a3ae8effe0b852ca4168b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-21.04.2.ebuild b/kde-apps/kshisen/kshisen-21.04.2.ebuild
deleted file mode 100644
index 30d59d170e5d..000000000000
--- a/kde-apps/kshisen/kshisen-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Solitaire-like game played using the standard set of Mahjong tiles"
-HOMEPAGE="https://apps.kde.org/kshisen/
-https://games.kde.org/games/kshisen/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-apps/libkmahjongg-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index e63a16249d71..b6bd65715f4f 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,7 +1,5 @@
 DIST ksirk-20.12.3.tar.xz 6993564 BLAKE2B d20e6828af332a1decd1bd79c4277cf5e05ffa75facad0350c03420f0bc0dcea7226ca1fc47b29e3be0915fcef68c8cb67b5e72c183e8081f7a5d53879c89dea SHA512 f45d4ba82435f9e76349ca1f6218e3d1cc6e1d3025f86db4bfe0ee724129ad96bd71e9b0b6d21bf60a5e19f460e1b9b7c9a3d7c6c0f229e9d5cf4600bff18672
-DIST ksirk-21.04.2.tar.xz 6997336 BLAKE2B 232d893ec93daf53ee6dc37a215e7576369f90e3c1acd9a04dea1083fcc971c42f55bd59768431630b9196a317537832fcf48d8e6a074da6811fe2a520d2944b SHA512 46c0528edfbe1157911253888d61c40ff033b2a6adaed196bad2a17f567756db7f181138bac4c428905a5859aa46d25c89cc4996072b00d3026ea4806add7dca
 DIST ksirk-21.04.3.tar.xz 6997516 BLAKE2B 9659a07afd5d10efc61a7e26dfc6f9eefda7bab18a7384f34edcf07e55b5cb446a11bc550e64a4238ee3cade78f492f400d90c9be08ab8bd4eaa6ff596155ea1 SHA512 7936f9d6a633bc86666e04a4b971f5203acfb6f7db0a01419fd4ef064d16cce6bbd39d6278d1ab908eb1161269bef6c6e604e854573beecda45e1014905149a3
 EBUILD ksirk-20.12.3.ebuild 1103 BLAKE2B ecaefc5546b7c1540b713d677c598cea240c55a6aff4ad2235fb30b29486814bc236763ee4dc1f34ce9c325c707e3b6cd522ed6b0c01f29d989649c34a0fe580 SHA512 d4b7bb816ee2654118eabffbd7a58b8d521486e2b8b1cd2f1c01f61ec3fd8fb36f16f6b3552472ac7646b7bdac310b6e1d8e912eca8bf3f156534c8133380167
-EBUILD ksirk-21.04.2.ebuild 1106 BLAKE2B e9347232e3823cc2b5df175f5a9cb130967d5b609ee25b1f4f4c22b09195ce25f17d1ce95fcb436525c668a7397a021e0bc986465e4ecfab5379006875686451 SHA512 d85d2b083f7d30127f6127f8e550fb62f7602561da048f144f906fabb444b589a04e927423a17191d320489dd9a94449f3294b8f9601483c7d66fa3ca268cd13
 EBUILD ksirk-21.04.3.ebuild 1106 BLAKE2B e9347232e3823cc2b5df175f5a9cb130967d5b609ee25b1f4f4c22b09195ce25f17d1ce95fcb436525c668a7397a021e0bc986465e4ecfab5379006875686451 SHA512 d85d2b083f7d30127f6127f8e550fb62f7602561da048f144f906fabb444b589a04e927423a17191d320489dd9a94449f3294b8f9601483c7d66fa3ca268cd13
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-21.04.2.ebuild b/kde-apps/ksirk/ksirk-21.04.2.ebuild
deleted file mode 100644
index 391cdbcc0330..000000000000
--- a/kde-apps/ksirk/ksirk-21.04.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Port of the board game risk"
-HOMEPAGE="https://apps.kde.org/ksirk/
-https://games.kde.org/games/ksirk/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/qca-2.3.0:2
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 47ec285732f7..2abfcc3ce99d 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,7 +1,5 @@
 DIST ksmtp-20.12.3.tar.xz 43124 BLAKE2B d4c6e1a50a98ebbd1387f98b0c5b6d4397af533898093cf5a5bb1718ae8d575e2c78c1a7de52d64b019ff4a831bb3d2c82c2ccd8529dac256d564c124e6ecdfe SHA512 813b742471f35a9ceb851e3b4fecdce578532b0754b45afd9e1ba1cd1c33b5ad06f40399488f65a9753af61af674c3c6ce9956307b61be5f2661ddabb53937fb
-DIST ksmtp-21.04.2.tar.xz 47092 BLAKE2B e71b05ca3cdc4a6c477a9c52e3258dbafdf895fc9009275dba4bd5ac68dab889b7efa49d8edc8cd365c95d15755e8096a0b55ba4d3ccdff55315e3ead6033a1a SHA512 f7f13b5d412c42b07e0ab00373fbeee192f9fb23d5a8754ebe1125c02d24b48d4fd476286e437b200391fa275b6068f462f542b37dad0e682817bdffe611ff18
 DIST ksmtp-21.04.3.tar.xz 47680 BLAKE2B b1cea8d68e19c2512a7045231cd76b269f1b006278867770a1877a2707d01f06dbc5d5bced386baa412ad62ea49507b6245e2722cc5510a9450dc94049bc28d9 SHA512 b29e18e6b6b489e60fc100b8570ccc056babc2e6863e47d1f811e99bac1423b269939189763fd46b55ff8e8c31c9b219c30850e284de629a5b3bd6e61f3f9805
 EBUILD ksmtp-20.12.3.ebuild 602 BLAKE2B 1b7bc60db3ff905f7ef2db18dc0660ad4cd00b9314f527b6c20fb2c62c62e8bb344da5ab59e9ed48672bb8a41f6e709bf4dba2cd227a9a4042142890284bf6cc SHA512 5a6c566bb18c06d9650f12b1efc505688cc69a39bd1925fc634e916bbb99f9f347874a51f1158930d86a0fdb99ea668241537149f1752e1b4d374412ff9be3a6
-EBUILD ksmtp-21.04.2.ebuild 605 BLAKE2B cf4e7ce42eb4f0db5187aa7e55c82c3b5d1404b5230df9046c167a9dac70a9ddc312bd846473c8810d9920a97f941edd58b94a288f03f741504bc993ae490dc5 SHA512 849c0199daf584b98bd20a2098aaeb7c2c1393d19214ff8c75c1d71a0eb1d903511886f397b3a0b59fd200c025a685affcc7ce883100a5f8aa522b2c128d52aa
 EBUILD ksmtp-21.04.3.ebuild 605 BLAKE2B cf4e7ce42eb4f0db5187aa7e55c82c3b5d1404b5230df9046c167a9dac70a9ddc312bd846473c8810d9920a97f941edd58b94a288f03f741504bc993ae490dc5 SHA512 849c0199daf584b98bd20a2098aaeb7c2c1393d19214ff8c75c1d71a0eb1d903511886f397b3a0b59fd200c025a685affcc7ce883100a5f8aa522b2c128d52aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-21.04.2.ebuild b/kde-apps/ksmtp/ksmtp-21.04.2.ebuild
deleted file mode 100644
index d52f49c95d86..000000000000
--- a/kde-apps/ksmtp/ksmtp-21.04.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Job-based library to send email through an SMTP server"
-HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index c148b9aa412e..365c1234e3ff 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,7 +1,5 @@
 DIST ksnakeduel-20.12.3.tar.xz 544212 BLAKE2B abcb3622d923aab7bfb53940e1679b143f1a9c5bbada1cbec1bc87f4acb6169e1e1767d09e49d9590deebfe8911909ffea8f192bedbad320cd06aa06abd0a411 SHA512 6915dbb658b85bcc647a70ee45a99bb07437424966256cac4efdb2d3dbee625a832f0ebeae1ee6f6138356d1c0baca42cca7fa2a80c668686480634fb350b5cf
-DIST ksnakeduel-21.04.2.tar.xz 544124 BLAKE2B c48a8f5ac77d838d9958ca5dabe209beea6bb29cdb68706e7e3de0da57bae3008b7b9d83affef28cca7eb9b6626971cce5ec6604797986ada03ab15508adbaef SHA512 4152116fd7d829f66f6040ed3180af2c0677acd51cf90e8c784af6c72ea3342bf245d8ee8e0b9c1e5a3ab83527dd40a8c711deb054881ceb166a257de0ecb74a
 DIST ksnakeduel-21.04.3.tar.xz 544476 BLAKE2B b4983ae31c9c2fe2ebf61e9f4f5257dc47903401751f47c2175b0eb208e93932acc0c0a5121adf8de87acde90085130553a3fb718cf99495a7720b1eb811d84d SHA512 b5128f729ec5a46f808b6e623df7bfe59a988d8843cefdb0349b59578a256fef48211a4733b8fae3e9beb418a4e1227a49940b185db89a80488fe8f86066c831
 EBUILD ksnakeduel-20.12.3.ebuild 932 BLAKE2B 1527b5f6b20bf3c72d553684a24891261a126164a72cbc60aed9581a7547e2e03c5a7c44bcbd18d11af57f9fce5fd0325fcb92583a0cfcbc17c6993e8a9f3b3a SHA512 fd0ae7a1ac34261efd9e42828063fcbb55d512d92ff3ca9ca05cd1eec88335aa7910a539b81ed41cc7b8499d0bfd6acfa6495be56327146ac770e79dc627cefe
-EBUILD ksnakeduel-21.04.2.ebuild 935 BLAKE2B 617182ccb47d4f8bf3bc74e7bda58081c3a3ddddff25d99259ed1ceaed0abd45e830084f274c2d0a1f85fbc9519f5b3174c41d91237f2f758253e576729c2b04 SHA512 ac3af5bc7acfd8daba1dbd53e8a9403b258b529e012f8a6eb480ebfe1cf2f6063f85af92557c482f07eeb9b84bc65309b6ea2d0a323e11a1b117095d47c21232
 EBUILD ksnakeduel-21.04.3.ebuild 935 BLAKE2B 617182ccb47d4f8bf3bc74e7bda58081c3a3ddddff25d99259ed1ceaed0abd45e830084f274c2d0a1f85fbc9519f5b3174c41d91237f2f758253e576729c2b04 SHA512 ac3af5bc7acfd8daba1dbd53e8a9403b258b529e012f8a6eb480ebfe1cf2f6063f85af92557c482f07eeb9b84bc65309b6ea2d0a323e11a1b117095d47c21232
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-21.04.2.ebuild b/kde-apps/ksnakeduel/ksnakeduel-21.04.2.ebuild
deleted file mode 100644
index cb5e496cd0ec..000000000000
--- a/kde-apps/ksnakeduel/ksnakeduel-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Tron game"
-HOMEPAGE="https://apps.kde.org/ksnakeduel/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index c17b62b8ac41..bd6fd4440e8d 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,7 +1,5 @@
 DIST kspaceduel-20.12.3.tar.xz 618104 BLAKE2B bd4f091b37751e74e589b98350ebb6d35f2da8223075b0808ba28f49178bf59b5e521224ebd1fdead79129c4c5b70c64a242191eeefed68615c6e9c70f6ab8b6 SHA512 87c42bba9bc7c677e72ec62ad1255723ccca9b1acd6c840e83ed355ace40c95e605fedda6279b9946088fe94d0727760ee29b810e6fc9c0c353d2f357e453f3d
-DIST kspaceduel-21.04.2.tar.xz 621784 BLAKE2B 672d0c2c2d9ce490f7a12568281c5c166674313a20f9c96121a9f0c76e2d041b525db9d3619dc955d14b4ea7628447a67d10c319aaeadc669449e52b56e85051 SHA512 94d01ed4f51528241a27128063d9f1c44230c25a3fd08c68305c9472b7e62ac8c99b2fbfd7d1102da226f3e3c48b638cf3056a8df11b99e0794d39f1187e865a
 DIST kspaceduel-21.04.3.tar.xz 621660 BLAKE2B 989b63bab8eef5cfd72ba7f4d4c53f45896e85bf8fce82236383152009986a5bc0291f08cba1f0bdfdf982322f70a027a75b0c2902260717a316656afa823f64 SHA512 8288da4071439a22613f20877175c11042e5b0d589f08a0f0edf881ca8256b8ec2a3abce5822180af96f8d2ad25ca7119c4a658783ee70b37ccf1944b6ede86a
 EBUILD kspaceduel-20.12.3.ebuild 851 BLAKE2B 1a93333358f45b5a5ff89830d294ce3d473d95f807eb597b4d183181eb5e60bdb6d161e4ac9a45a5aa3c8d8f09718e903edfbbe499d8a6d058af2f95f58851ac SHA512 10e5eff63e811ec4f7e5d7b5c61270f5f7590237b3cbc7dbd207e963c0f30724f755367cc6bd50f8334808caa18bfaa3de03e6ccb4958c0b074dee54fffb621f
-EBUILD kspaceduel-21.04.2.ebuild 854 BLAKE2B d4f27aee717856fc12e308f521c0ff8cddd4bcf297d542c25518b6076e2320da38ab72cf529ec335e280d90f7518eb6ed1877fd37566c44d0bc4d7975c5eafe9 SHA512 5f9761020c03a2e7456ac5acf9093f06ca6ce9cfbfd4e1557ee5c861c09d1c4621d9eb6f008ebaebfd1a4e3e9b90b9f5108621d5ff1c998e15cac8c85cccc969
 EBUILD kspaceduel-21.04.3.ebuild 854 BLAKE2B d4f27aee717856fc12e308f521c0ff8cddd4bcf297d542c25518b6076e2320da38ab72cf529ec335e280d90f7518eb6ed1877fd37566c44d0bc4d7975c5eafe9 SHA512 5f9761020c03a2e7456ac5acf9093f06ca6ce9cfbfd4e1557ee5c861c09d1c4621d9eb6f008ebaebfd1a4e3e9b90b9f5108621d5ff1c998e15cac8c85cccc969
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-21.04.2.ebuild b/kde-apps/kspaceduel/kspaceduel-21.04.2.ebuild
deleted file mode 100644
index 2482cfb4d16c..000000000000
--- a/kde-apps/kspaceduel/kspaceduel-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Space Game by KDE"
-HOMEPAGE="https://apps.kde.org/kspaceduel/
-https://games.kde.org/games/kspaceduel/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index 794b2ad2eb40..d211d8896047 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,7 +1,5 @@
 DIST ksquares-20.12.3.tar.xz 266692 BLAKE2B c2db15eecdf68d41c9c31f67240326e7a165e122826d67e8c4b412254bb06402b2c46c5dd812699a36586417c7157fc2ef34a7a10d1fcc1fd25f16a73168dbc6 SHA512 a2b89b21e463bebd1951cf13502640fcd35967a74526bded57883a64ee408fb2eddfe47ae6bcb171c7f4f1d8dc7adc6d81dfc94de99eed7e3cb3e0b5612d23c9
-DIST ksquares-21.04.2.tar.xz 267444 BLAKE2B 5c15e94ad99a11a3ffa2c725bd7f54282ffc1f341f5d730728f3134062023f81b37ed047a5b3c662313f31700bde03bf06889533ea4b68e58173b9cd12028d26 SHA512 7b3b0187d77aebc93e89a53c18e52fd0c85f0b735c7da257e16d0896ac5d459320bb08b48c2f874c9d2da95e2d523354a6c3387972dafe0ad9a8e0fd146e670a
 DIST ksquares-21.04.3.tar.xz 267464 BLAKE2B 025e5de4458a2e4ca6923148edaf0e7f12df9151cb59a1ffafff90e584f814dc828a43583940b42510dcd590a0ea8a30149a5c6af6feee3a5fe537bcf7c3b4a1 SHA512 14fb00ca7ad528d60a07415eb096f4e6dc9c06e6c1bdc2b358781a0f8be7339c6321c1245b829f9f81d0776d6ec60e93c5df3ca3445bb1566d5e39aaf1cf8e77
 EBUILD ksquares-20.12.3.ebuild 890 BLAKE2B e311c4e8be56083fc3267b43a5c7c3e3cd6d6de362e4c690a366d211b802a0caf96b51991d6b80d5c346ddcab05e5dc2b6b45fac8ae3a3d32bf52e6c2350dc10 SHA512 b16a8edd14d49ff923b5f4aad84c33924739252c5dcd142c2ca9f326c12fe83f46549195e95253b8aa77e3225d86a30cc5b812f2d07927ac2474e0b1546de99e
-EBUILD ksquares-21.04.2.ebuild 893 BLAKE2B b1587c4d3899dc5bc594ec6b65d189905c910193353624194d08327f236ac1fb125a096886c57349c4be0cef5353798857bb334c87163ab2234261801230993f SHA512 a11471872389291c19e46128f7fd9590b224a60845c899789c75410517471e8097abda5faa62b6a4fdf727d9fb5182db69394202af48548e8c7d45e0287e4258
 EBUILD ksquares-21.04.3.ebuild 893 BLAKE2B b1587c4d3899dc5bc594ec6b65d189905c910193353624194d08327f236ac1fb125a096886c57349c4be0cef5353798857bb334c87163ab2234261801230993f SHA512 a11471872389291c19e46128f7fd9590b224a60845c899789c75410517471e8097abda5faa62b6a4fdf727d9fb5182db69394202af48548e8c7d45e0287e4258
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-21.04.2.ebuild b/kde-apps/ksquares/ksquares-21.04.2.ebuild
deleted file mode 100644
index 848f85e5131d..000000000000
--- a/kde-apps/ksquares/ksquares-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE clone of the game squares"
-HOMEPAGE="https://apps.kde.org/ksquares/
-https://games.kde.org/games/ksquares/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index d76a053667df..fc371693c21e 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,7 +1,5 @@
 DIST ksudoku-20.12.3.tar.xz 1676484 BLAKE2B 1c105623303cb7f6ddbc5f4edf080eccb961c2563973237a79a23fc9dc54f74eba27f43ca75698c87697435c09aab52ae8b00d8f52ebc75223db5971953da030 SHA512 3ee16844478ea8e70b606eda689279ae428423ffc758ea6876fb78ee3ad43795a44345c1314f0db0cbe8f98029f48bfeed9dbba1548d3160bf9f34e294e8c550
-DIST ksudoku-21.04.2.tar.xz 1679332 BLAKE2B 899e40ba0fdee0bf2529a9b941024060bc3c7bd6bf35479ba3039b50a46c4a95ffd51cbaeb752fa66864456f58e72d559edb306983b3361bef8b59a425001111 SHA512 6b19a62c826a8e91e6ee71d14199494b94a99be40cf11d8af412aa3f79fb300a80ead1e3e19a0a4106a7a2f91547fc49492e18e369642aeb4549e9c687a08337
 DIST ksudoku-21.04.3.tar.xz 1679420 BLAKE2B 2cbafa922d9eca71fbea9225b27e23a40317e97e02200380042152ac399aef65a5b3bd1ae031398a425f690f1a3a4115e232aefbb52247143fa4f5e9a4e3126f SHA512 0a1867e11a4210d1e7e49c532b7422bf4f0124b712ae9264ce4bca8c03e511c6c331da79a2947b8302a76ebb181fd3d1068166c907a44f57989b314eaebd6eb1
 EBUILD ksudoku-20.12.3.ebuild 1318 BLAKE2B 78196dc06ecaf49ed44a1562b9d8015e37a501be69e30ab22521e8fa343b358da7cf08ed0d8e1f5073a20bd0c5a8a1ec7693325366f8d9639dfa5e9e2b53ffdf SHA512 746e44d825b72fb8a32fe68d14c3bde4e2cfe9cfe569a14c61c3457643c14dea37c882b5a473b561b3aa401328dc14ea742b7802b5dd713c653dc522d2cb7e22
-EBUILD ksudoku-21.04.2.ebuild 1321 BLAKE2B f9736c2cbc66d80dbabe7bdfe66bc25dc00bc4f319f50ea6fa8eab67c2aaf8f0d7969d4aa4ee0571a1e56af141b9c9e296db7d2fe23f9b341d3d1e5311c90672 SHA512 8f3dc0af61cb38bd75df2da43b4bf43ef171ea5f71d2c5cdc3bba537dd045a0f83263860ed12cc0d68c5b2bc5c481f52d95874b812a6da181f913bdf92979200
 EBUILD ksudoku-21.04.3.ebuild 1321 BLAKE2B f9736c2cbc66d80dbabe7bdfe66bc25dc00bc4f319f50ea6fa8eab67c2aaf8f0d7969d4aa4ee0571a1e56af141b9c9e296db7d2fe23f9b341d3d1e5311c90672 SHA512 8f3dc0af61cb38bd75df2da43b4bf43ef171ea5f71d2c5cdc3bba537dd045a0f83263860ed12cc0d68c5b2bc5c481f52d95874b812a6da181f913bdf92979200
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-21.04.2.ebuild b/kde-apps/ksudoku/ksudoku-21.04.2.ebuild
deleted file mode 100644
index ccfbdf1c2936..000000000000
--- a/kde-apps/ksudoku/ksudoku-21.04.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Logic-based symbol placement puzzle by KDE"
-HOMEPAGE="https://apps.kde.org/ksudoku/
-https://games.kde.org/games/ksudoku/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="opengl"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	opengl? (
-		>=dev-qt/qtopengl-${QTMIN}:5
-		virtual/glu
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package opengl Qt5OpenGL)
-		$(cmake_use_find_package opengl OpenGL)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 5910276c7c4a..1efe8c255850 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,7 +1,5 @@
 DIST ksystemlog-20.12.3.tar.xz 1938596 BLAKE2B 9d3e36fa65e73b370cc174b7b1c47946b567d9f7350a03929d458f32845cc270fa8010b5ecc9b1781a4d394b2b88c32468fd6b460bc95f1dd93e69daa348d6bb SHA512 a7b7d5bdeb7c118469888adcf5c0856758e0a0802d76f6bc8b3afafa7df2de7df7810f0ba73d8867b4bd55003b6c042a6b76e3292f28f1387247fd5e6adc5faa
-DIST ksystemlog-21.04.2.tar.xz 1957732 BLAKE2B 41b04e28c46a01c021106ee0dbb63c272911ad3ab8114dbb62c0007ad1c18eb3a2aac09c2d38d966bc13fb3b6e983a4107ae49129a348230ef816d6662a5d7fb SHA512 dc6cad46e7a074500c4d40a62ef76fc96f0097c23e2bd508a3acf285856e9fc4d48e72df28f774db195d9dc833ca8949c3efa037241dd9413053916f7f26af2f
 DIST ksystemlog-21.04.3.tar.xz 1958088 BLAKE2B 67a9be05e3525ca65be0eb10cd4bb1e1992eda8f55b487f64ef43691848c6a20ceb32be9585992dacea7cf41b8ef7c46d9ab25bcb20503e49c68eabf4d4f68c0 SHA512 c0af661b2898fbcb4cb81b46906bd09df86bebf3759a493d435b489500ee65b035207339340beec372e416485389ee093fd9187ab9c5f35cc71e1d94f31add2b
 EBUILD ksystemlog-20.12.3.ebuild 1566 BLAKE2B ec9c1c6dcf58e874fd876a26f090095f54798c8d2bbc26922d8774b370d671955637845c7f964aaf192973c49319cbad2a261ddea9c4eeaa86a90a622cbe3717 SHA512 2cee2eb805605d87ab7d13c6fb508e76fae3dca724fd9ca6f6349ef4ebe54daee1f4f5c57f2f18b2dd64f0fa16238ad139c120191f80b5a27c8ea0f5edfa9ce7
-EBUILD ksystemlog-21.04.2.ebuild 1605 BLAKE2B 0e91bfff757f9d5d2f9fdb4a8424b4575c626b56a1ba68471e133485b0a47e130577bc56f7ed1048797acdf7023622b847504436d7ebf3c97c44d33de835eebd SHA512 d87377239733a5533bacba6b349b9a9c217213921fa5bb24eae86b165b6d1293f5c8d903abce6791ff92491cc01a02cd0669b3871741052770ef83cb38b2a825
 EBUILD ksystemlog-21.04.3.ebuild 1605 BLAKE2B 0e91bfff757f9d5d2f9fdb4a8424b4575c626b56a1ba68471e133485b0a47e130577bc56f7ed1048797acdf7023622b847504436d7ebf3c97c44d33de835eebd SHA512 d87377239733a5533bacba6b349b9a9c217213921fa5bb24eae86b165b6d1293f5c8d903abce6791ff92491cc01a02cd0669b3871741052770ef83cb38b2a825
 MISC metadata.xml 357 BLAKE2B 2004a9f41fec27cb3e4f75c4248fbc4b46a4ab7c52f2d23fbcaa3085e1580b0dfe9ad9980c2b7af0670a7b56860111235fbc21298a2647d5bafa0d2be0bf95c0 SHA512 ba2d8f62d75eee5e8edf3368ad54c0d4b347b92279c2de5a4d326536bf670c82e419490a3972731b698bff84ff10908c939ba7a416f4ce4de335eb914df4a701
diff --git a/kde-apps/ksystemlog/ksystemlog-21.04.2.ebuild b/kde-apps/ksystemlog/ksystemlog-21.04.2.ebuild
deleted file mode 100644
index 39ce902065ce..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-21.04.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="System log viewer by KDE"
-HOMEPAGE="https://apps.kde.org/ksystemlog/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="audit kdesu systemd"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	audit? ( sys-process/audit )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-	kdesu? ( kde-plasma/kde-cli-tools[kdesu] )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use kdesu; then
-		sed -e "/^X-KDE-SubstituteUID/s:true:false:" \
-			-i src/org.kde.ksystemlog.desktop || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package systemd Journald)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	use kdesu || elog "Will show only user readable logs without USE=kdesu (only in X)."
-	use kdesu && elog "Cannot be launched from application menu in Wayland with USE=kdesu."
-}
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 1443c3f95665..fe2f31fa84fa 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,7 +1,5 @@
 DIST kteatime-20.12.3.tar.xz 294280 BLAKE2B 541c8ac13046080fff0c729b3ecace678d5a6d185c64473af35e61f6296886410bca2e591f8816f49f25b3fe7d4dcd396b1ff9d50eccf54be29535217c57b990 SHA512 98d6e376b4ffd156ff0b88d1b1f5574361cb9f92ce4365df62adc408a85c38aa965455db5088a86505a7139af690e9a3fcab4d06d5827470f28ce05e1da82eeb
-DIST kteatime-21.04.2.tar.xz 298396 BLAKE2B abc2e5c8c3c00b8988b0def0c65074f1588e3b54549b2dcf070d6c179bc1bee44d3adf8dcecb338537511f1f4a2c05b55e57b03adc30322916c3063941836ca3 SHA512 b6815bc449b10f32fdfca4bfe0b8231807b83c9d8097e5e98d7c713fb7cc1b639ed6a5091a44ae99798ef5c64fc24ce35730e563cae5eeb735cd8da8080f9309
 DIST kteatime-21.04.3.tar.xz 298404 BLAKE2B e5be1c1a3988947c7b5cc00b48cec815605e922092374ff1ca0ece66ff10847e5fd95d0148608ace48259a79da3edc5152c0feb218656f39945c9ff02840810d SHA512 68775870910e90d9c462fec3b10c79d5396ab0710296ea55651534a3f3f224463f29a2e7a61841c2dca20d2f778b178148acf12d30b762bd362a37a6c6a3eb36
 EBUILD kteatime-20.12.3.ebuild 856 BLAKE2B 2f219de94a43ae72fc266a575d7883fc890d58c3e7a1ea13d3751cc741008c6723bb683ed18cf13ffb8dc70648f94db4ef355090a0a5f4aebe18c5904e7348f7 SHA512 808f8d99f3a1a44d7b98ddfcad9e0e15804b68df356c891a6a12e04c63cc206d1e50811b85ff458640ab6a84548847a62490af8d326f36cc268b53f352517662
-EBUILD kteatime-21.04.2.ebuild 859 BLAKE2B 5eaae8e55b208c79924a6e7bce9e5b123c8950ad7040ca64d7539656f003489f633a23d8679417475c58209eaaec9cd7f4e406288d2a34e22ca4eee3bb8c8eb5 SHA512 ae9ebb6ba5bb27b0fe80dd4fa624b547f3d7dee7fa0bd14866004ce78e37fc4fe7ac00c770342ce4626d5ed3bc60c4b173c987ffc3705fea0dd6456e273177a5
 EBUILD kteatime-21.04.3.ebuild 859 BLAKE2B 5eaae8e55b208c79924a6e7bce9e5b123c8950ad7040ca64d7539656f003489f633a23d8679417475c58209eaaec9cd7f4e406288d2a34e22ca4eee3bb8c8eb5 SHA512 ae9ebb6ba5bb27b0fe80dd4fa624b547f3d7dee7fa0bd14866004ce78e37fc4fe7ac00c770342ce4626d5ed3bc60c4b173c987ffc3705fea0dd6456e273177a5
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-21.04.2.ebuild b/kde-apps/kteatime/kteatime-21.04.2.ebuild
deleted file mode 100644
index 60290ffa2999..000000000000
--- a/kde-apps/kteatime/kteatime-21.04.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE timer for making a fine cup of tea"
-HOMEPAGE="https://apps.kde.org/kteatime/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index ae26dd116240..4661a4218287 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,7 +1,5 @@
 DIST ktimer-20.12.3.tar.xz 386444 BLAKE2B c1feaa5a4a2aa8b13c24d1328985dbdf8b3903fea3ee571da4832c2dddfa6f87222f42851077c41fb7c9d77bcecc7ebe62c2f9d3eb7ed7426c893a00b16ede82 SHA512 3c278640bf5ce1340941f957ae7ab9050a9ba7b93a25ac9111f73cc01bec49b49a872363a6ceab03d0e893c65ad8228309903fbb993baead896a81ec389ed93b
-DIST ktimer-21.04.2.tar.xz 388028 BLAKE2B 8d80c946746e85c9080c8da5e9dbefe98b4b332e29adc0a3b012fc62055ec5d81400692b0d900b1a7a15a388305f872aa0de85aece177088a57838a8e9836780 SHA512 5d7f4d5183d8f200101115c06fc11ec10ebdf138330c413c536018c0f6a2137bcb0a5f3fcd8eaf162c741959988b92b1c270dfe9c3cd3ca755cbbce0c30c978d
 DIST ktimer-21.04.3.tar.xz 388044 BLAKE2B fdcb2780a8ecbe654c7438aa909c4d14ae338f04f3c314e5633c3b61e2838ee9dfcedc03a194d02696c8a7d2c370c8434c566dc648ed27099c446b6917a8cd83 SHA512 3cf8a0387174202ffaab9e901cc4e6bf851403b21d8b34df6b437f13d310a7bd657438fb1c10eb0b238d3d6407334987db4b94433d27187d1cfaacf23c09bc2d
 EBUILD ktimer-20.12.3.ebuild 821 BLAKE2B 7100fbfded4263204795eb7b04a6611893638771d503b958b68dfbfa5160af0329c988630f040c98bf140fe5c810836e298f9adbbead47edccfd2657b4ba9ac2 SHA512 f76f258af2d2cfd73f5c0bfe9aa3944639bbbbaf19938095014a464fd5fc094c5ff35daf37f46e965d0fac2b44c455ce4cf153ccbf9a4383ac9d87d5a3779c75
-EBUILD ktimer-21.04.2.ebuild 824 BLAKE2B fc29b58b7c1b32d6fc84974d05fd952cfcdb0cddec963eda2b5071d6166b8888cf6fa5dc372a668c39b1fb1d3c3445ebe468794a142efa929acbb6f961e2d670 SHA512 012bf7fb22a51ad81be7974bd4b87aa9fc6140710d0f2099a2c14e1d47cc451096bf67990a29892d4145b93c6e87d7a16e581c2b88538cc410ace3ce85513230
 EBUILD ktimer-21.04.3.ebuild 824 BLAKE2B fc29b58b7c1b32d6fc84974d05fd952cfcdb0cddec963eda2b5071d6166b8888cf6fa5dc372a668c39b1fb1d3c3445ebe468794a142efa929acbb6f961e2d670 SHA512 012bf7fb22a51ad81be7974bd4b87aa9fc6140710d0f2099a2c14e1d47cc451096bf67990a29892d4145b93c6e87d7a16e581c2b88538cc410ace3ce85513230
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-21.04.2.ebuild b/kde-apps/ktimer/ktimer-21.04.2.ebuild
deleted file mode 100644
index c724a7791370..000000000000
--- a/kde-apps/ktimer/ktimer-21.04.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Little tool to execute programs after some time"
-HOMEPAGE="https://apps.kde.org/ktimer/
-https://utils.kde.org/projects/ktimer/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 7be3a3769904..79521e57657c 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,7 +1,5 @@
 DIST ktouch-20.12.3.tar.xz 4942444 BLAKE2B ee1d5c0fe9836d6725eab0ac73d242b2340616f8c2247b841c0cc2bc9ffab58cc848b668c3600f97d57cf3f7efd83761cb529961e8d35f3d86ee6a54236e5040 SHA512 33041f31a910182969f20c98e33393cb53142e0ae69fb5717d1d235a3006ee931734a50a77f9d0336b801984ae0ba3e7295f46de82ffda90fa3003a0634ba968
-DIST ktouch-21.04.2.tar.xz 4961916 BLAKE2B c86208dca19ab095e118ffd5dae1572275b1afe3e47a6cdeb83efff56b5b7ec2d6a7e81035fb67e7cb0b85af41308bfb1bf86554a6386cffc388e77d692d729c SHA512 a56d8b05aec8e38ca9b7d3f3dea48106f956d9a9eace353bf6dc491ab3d50398aa5815f7447d7647105179158983a7aacd22819aab347ad1bc5ea643ebaf8e45
 DIST ktouch-21.04.3.tar.xz 4963192 BLAKE2B b17d75adef8d30bb0f1a27138e1397ee041bcea3ec046b9887e4f5333f75459ad578dc0b6f6a81f42e6c3f36c0d907d5c6cc4ef7148e3287df33c7c2b80d9432 SHA512 5d5cf00581518315736e5f52040f8487731e2899438ed5e78356755d22dfcbf890889a4510922cffa6e2b8460c4d092f86583060195eaf6214fcdc830da2bb97
 EBUILD ktouch-20.12.3.ebuild 1589 BLAKE2B 6d348b5a103ba6184eb7da4229c63a219ead306fddba9542b58761f78799102eedd077f7163d6e7c0ae6b908ce80224b7282363be620593625d698c37e19c2b7 SHA512 2efa0694de896f848e06a9367597cb4677279d52f48861120069253d8b48d8060107b3481928915e1b0e786dcb01b9be73e6cb6be8e45df5175c81ffb8052faf
-EBUILD ktouch-21.04.2.ebuild 1592 BLAKE2B 6a0fa2627074dc59489acb60f221fed916c9d7f4bcab5b7d3f387081c99df3deb2f14ddaed64f45f53dbec847fe9b5322873b37324efc23a3f6d95aef0a5369e SHA512 80db3b7635b59b3d2a4fad750a05749465611d673d77804c1b028b0a3803f21fd020d868f447e0c2c795be680f66c091d4cbe526bf4a3ebb695e8e85fa29ebe5
 EBUILD ktouch-21.04.3.ebuild 1592 BLAKE2B 6a0fa2627074dc59489acb60f221fed916c9d7f4bcab5b7d3f387081c99df3deb2f14ddaed64f45f53dbec847fe9b5322873b37324efc23a3f6d95aef0a5369e SHA512 80db3b7635b59b3d2a4fad750a05749465611d673d77804c1b028b0a3803f21fd020d868f447e0c2c795be680f66c091d4cbe526bf4a3ebb695e8e85fa29ebe5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-21.04.2.ebuild b/kde-apps/ktouch/ktouch-21.04.2.ebuild
deleted file mode 100644
index 2896b4f0c095..000000000000
--- a/kde-apps/ktouch/ktouch-21.04.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Program that helps to learn and practice touch typing"
-HOMEPAGE="https://apps.kde.org/ktouch/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb[xkb]
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=kde-apps/kqtquickcharts-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCOMPILE_QML=OFF
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index a90336cea3f7..922959b42117 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,7 +1,5 @@
 DIST ktp-accounts-kcm-20.12.3.tar.xz 262196 BLAKE2B 6e2d421babf2c3210ff17944e365c40cd02210cca4c9032fcc10d8664cbab27b759332576cb1dd157fb6543beb01339f765ebb96708d2fa368f7051901d8282f SHA512 97bcc25bea0b680b25b8874fb66eb916dbde8ea4d8e16159cf8ed80f715245863d62cedd73f6969369d70efa8c0635ad7b72945e4e1fae1bea746b6410d63c4c
-DIST ktp-accounts-kcm-21.04.2.tar.xz 266036 BLAKE2B c9eaa1fea3ad3b4400c5fd51cdfc4bf736712a5a1cefc714c34457655a5f99a9178eb7dd63a40bdf3d5ada065955c3d8c7b94e864073ce8747627e6b3ff55255 SHA512 521748e28b043c0c29617fbf810d5475119d98909e672931b1ca0821bd3daee62f3cbb3c948d043c508b28d47d031683f57d4a0ed871debca0368344923c62e6
 DIST ktp-accounts-kcm-21.04.3.tar.xz 266056 BLAKE2B f52493a6f2787d031d27ebe1f30bafa714d2fc086ec456e0566724b0ff012a481c295efa4d2fb906fe975a501f1a151247d66cc4f225c5e01351044f8e788ad0 SHA512 a69a19054e8f709d2728cc89ccb7e4dbb0ff1dd3dab76470945479aa405f3cc22991dd1d5ea95cee0eed6ad7e1fcda097b9f9225155c32fcba9ed9bad00058f3
 EBUILD ktp-accounts-kcm-20.12.3.ebuild 1598 BLAKE2B 2916a451ca4b3f4a2ad3043d09e7dae9745d182bae8c4736caab80db4541cbb029e38bcdc759d668b5db0a37cdb219f9d5b46aebd897116ec84fb12895adca03 SHA512 4437d0c018c29755e17fe0cbee7e45322d0a9e7a712ef1c5136f895bf712ad1b87c1e7f1117c48874242ee9e7c766e537bf13f7de7f022166148a9f51e3ab31f
-EBUILD ktp-accounts-kcm-21.04.2.ebuild 1601 BLAKE2B 40943f36ffb53734be9917da9a4dc74e438820a91bdf27decffed86ca7abf5f3116bf37de4ed331a5bf64077a93e10626ff33a91c42772369bff6bdabb09a363 SHA512 462b5d632a1a902638467e9a7b2cc5f90228775ee1af2baaec359edb568ae65f0e111749235c11b1515b9048cf4d8920ad3cfab87ea1e1b4b919c11d6c8538d8
 EBUILD ktp-accounts-kcm-21.04.3.ebuild 1601 BLAKE2B 40943f36ffb53734be9917da9a4dc74e438820a91bdf27decffed86ca7abf5f3116bf37de4ed331a5bf64077a93e10626ff33a91c42772369bff6bdabb09a363 SHA512 462b5d632a1a902638467e9a7b2cc5f90228775ee1af2baaec359edb568ae65f0e111749235c11b1515b9048cf4d8920ad3cfab87ea1e1b4b919c11d6c8538d8
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.04.2.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.04.2.ebuild
deleted file mode 100644
index e6b034a0a4a0..000000000000
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.04.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy account management kcm"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="experimental"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kaccounts-integration-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	net-libs/accounts-qt
-	net-libs/signond
-	>=net-libs/telepathy-qt-0.9.8
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	net-libs/libaccounts-glib
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kaccounts-providers-${PVCUT}:5
-	net-im/telepathy-connection-managers
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DISABLED_PROVIDERS=$(usex experimental)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if use experimental; then
-		ewarn "Experimental providers are enabled."
-		ewarn "Most of them aren't integrated nicely and may require additional steps for account creation."
-		ewarn "Use at your own risk!"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index 3dc4b078bac9..3819356220d7 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,7 +1,5 @@
 DIST ktp-approver-20.12.3.tar.xz 37304 BLAKE2B 7ec4406f026fdd8c8b9d49a21449309af8675605a88d057144941475373206fbcfe0e7349fadf760aba45b7fb75bdcc895a395735e587f2145e0cc17db4f66ed SHA512 0f7c578a69ff8820cc1447ea311842385c1678561b4881bd3bcc2dc988fe12a812d499d0714b123599906e3b75d5eac4f2102ddf309b037b5614935bc41ea0f1
-DIST ktp-approver-21.04.2.tar.xz 37476 BLAKE2B 8b7aa8a7f61b07cc1498babe4f1141bf3a040c2d05528bd1ad18d83261bd7ae38cb1ba19a14dcfe944916eefceb1b69fdb6a66869ff965e26787ba9021f8d837 SHA512 354ad8161a8661fe64bd5a986a1d41d0f6cf77b66bea28528a9e426836ac82a67ea1a79804d9803020bf70e8b47f1a9fd6b44432da2bd27c88b9bb8bf90cc627
 DIST ktp-approver-21.04.3.tar.xz 38120 BLAKE2B 7ccb94e36f4b41f33da7744a2a468cf608bfc107d7e62fcb605b7d4afdf0578e1d3f6bc08e60ed996b56d71014f778384dc2a9a73a306cc0c723545667588e13 SHA512 44f13cc1b323f84848669f89e54bb3fb2439925a5cc7ad7523b0ed22d0bf323eae47a94f098465f4efc9ff0ee16f555fd4ad5f4af38583d7fac6cb88c0eb0f2c
 EBUILD ktp-approver-20.12.3.ebuild 761 BLAKE2B 10a415be8c5ba6037e47f49d4ad99c5ac882e089ceaec50d49c76b54475f00b46529c0886d17c4d852883c06a96ac8ccdc273750e2c4459cb788105c4b189564 SHA512 847b8e724d7f5a115da598a523fddfc1b1381e4e8290ada33ebf5009be7c448244437c1c13dd9890029695591233422b9b30b9c50efcd0e755563a6b290c79bc
-EBUILD ktp-approver-21.04.2.ebuild 764 BLAKE2B 09391e9cfe1d3cef204e2a30b5d134abaaa6e6bc5ae80e1c6f6de6b0452c7e851f70558d1dbdefb07f9150f591dcc63ad4aeba39d4409cd81c9008215f46f6e2 SHA512 bc508058e3a89030de9437e7c6ffd56f3f5d65066f0498ff0c0d59699c10bdc2d36596d73a4be9040a64e184368aaca4a3d04735e03f66ef90353ee2c26dea98
 EBUILD ktp-approver-21.04.3.ebuild 764 BLAKE2B 09391e9cfe1d3cef204e2a30b5d134abaaa6e6bc5ae80e1c6f6de6b0452c7e851f70558d1dbdefb07f9150f591dcc63ad4aeba39d4409cd81c9008215f46f6e2 SHA512 bc508058e3a89030de9437e7c6ffd56f3f5d65066f0498ff0c0d59699c10bdc2d36596d73a4be9040a64e184368aaca4a3d04735e03f66ef90353ee2c26dea98
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-21.04.2.ebuild b/kde-apps/ktp-approver/ktp-approver-21.04.2.ebuild
deleted file mode 100644
index e9de69ff368e..000000000000
--- a/kde-apps/ktp-approver/ktp-approver-21.04.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy notification handler"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=net-libs/telepathy-qt-0.9.8
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/ktp-contact-list-${PVCUT}:5
-"
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index 793c82d0893d..db4e35e25f5c 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,7 +1,5 @@
 DIST ktp-auth-handler-20.12.3.tar.xz 46328 BLAKE2B b34383d810f38bd428f604160cbefdf1bb809c955e6333d9e3c01329e628dcc70dde1215fa3217c7da83ee57238f400e9b28433cef44fe5a98289b29bd755abd SHA512 226f101d6d947d5d29e749336c9f5ed084ea416a534eaefcda4df888960eed1841189317e93c8b2ec05558a68a57be75f6afd31256bea97ddbf8257d542f68d9
-DIST ktp-auth-handler-21.04.2.tar.xz 47232 BLAKE2B 0a18d8c54b0751cca2e846c9ff09a82b3d0e4cac86dc0f1363efb9f0b22346cae0dc0faabebf60ec59aa6b4a6a667d03180704ff4a3337cbf566ec5310b8efcb SHA512 e4c323609abfae0264872d5a34c4bc89ba87c63e588bebf0532ed936d70b23ada258a56e01d436d5d0376811f95dd01f38b08109a36972284c8ba13545647df6
 DIST ktp-auth-handler-21.04.3.tar.xz 47824 BLAKE2B 21446323d72ed739c900a59a9137276ae5649615e3d5098a7ea7752296d362d41586e72ba3de80f581569d8b227c838710af266d9bf88404e337311c0120a68d SHA512 45fed49e564a98d6630bdb5aa13e0bbb641965241b0936c22b8ab9f7f5696a377a5217fdef3079f70008f4932ea0b00c8f857ab2d3727892ed180f7b24a1da08
 EBUILD ktp-auth-handler-20.12.3.ebuild 929 BLAKE2B 8ce4fa3c6217a8dd560182d9ca0c9ce4d2552fa800876759ce449e3e364a8892755de73dcaf2d8706d98a7e8070a38e7f0e201524741b7da06e5cfab02db4769 SHA512 c162a9bca3a88e3dce1b92ef6440f5a4d4564de0b9cb56837503711b23f9611d9cd07d2031c6cf513cdf6d1a9033fe8573c8034411cd1e18248ae488caa196a3
-EBUILD ktp-auth-handler-21.04.2.ebuild 932 BLAKE2B dae10210ba2ed97986057d97dc2ef987361e44ec2d569a69a2f9c2e4ea542cea6a9e369a589840510379e7f20ac8d4c3de9ef4de70be42571c2526d78301bdb9 SHA512 27a1f26a636b91c6c8183d55fc2f43b1ca103de10448e9471db3efe6b2cef85435970239e0585272268ef871ca543e9d8379030c84de108752d8757ad4b2b3db
 EBUILD ktp-auth-handler-21.04.3.ebuild 932 BLAKE2B dae10210ba2ed97986057d97dc2ef987361e44ec2d569a69a2f9c2e4ea542cea6a9e369a589840510379e7f20ac8d4c3de9ef4de70be42571c2526d78301bdb9 SHA512 27a1f26a636b91c6c8183d55fc2f43b1ca103de10448e9471db3efe6b2cef85435970239e0585272268ef871ca543e9d8379030c84de108752d8757ad4b2b3db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-21.04.2.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-21.04.2.ebuild
deleted file mode 100644
index bd7112963f26..000000000000
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-21.04.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy authentication handler"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/qca-2.3.0:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kaccounts-integration-${PVCUT}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	net-libs/accounts-qt
-	net-libs/signond
-	>=net-libs/telepathy-qt-0.9.8
-"
-RDEPEND="${DEPEND}
-	>=app-crypt/qca-2.3.0:2[ssl]
-"
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 9b881cc1c30c..de0ded56642b 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,7 +1,5 @@
 DIST ktp-common-internals-20.12.3.tar.xz 449572 BLAKE2B 5f7d28a9b0ff22dffe2f6670dd4a2821f0d305741e5334ef88960907e4571e1053e4b6ef5f4d897751ec6fe4e356c2a7535326e5d63a8d7e5613c003cba4d465 SHA512 217a4ec724f0a6918254637546367ecd52f5f0688bf754e582b6e8596a58a120e5e19a9933af5d0f4d4d2cac207edce4b55a602f8e3ab1493a21e071ca135b49
-DIST ktp-common-internals-21.04.2.tar.xz 450636 BLAKE2B 0cf7fe4c187b211d4395793ecba395b1ca853172fcb92bb4cb8be1c2dc743c799124633a4b8cc980d1b030ab7dbba486c2d24a45cd5b6a929c0453e42d6c85f9 SHA512 c8c27b33c089f06c17b1f63cb89008d55ee6aa128fb7add92b583c428ee74c71d7bd6028e396bce662ae4c3515e6b68670d9a579d66b56bd2097cd5cd3e97c25
 DIST ktp-common-internals-21.04.3.tar.xz 450692 BLAKE2B f4363ada9a971b3417f48e5750d02b10f57debcd653a652ecd65d646dcb40be5242b7f119beb534954e138ca3f4325fa5120f0c12c55ca39b9770da3e9aaad88 SHA512 4df1dd074f0e6330c28aedd8c9ef3ea1f17888de3f0dff63174a1221c4f08027179e282982f5e6f9e47b3e5ec34d1dc8d86a1586908267cf97dc0a51dcf9aaa4
 EBUILD ktp-common-internals-20.12.3.ebuild 1711 BLAKE2B dc4ecaf546efcc29c09a7ec060d5d2640bc3772bbc4e8a3f44ebdeb7215cf721f98e3d8127a3435d17b13a45dab422aa28198b951ac138a16bf27c30760f310a SHA512 d34105ed351cf2e698ca0767d72c7f6044c49ecac811ad2be9cff7381494aecbca6ba98f11a1bfae5f750bfd0ca2d0bfe6ce262520d2212b2ea40fa07dbcb95f
-EBUILD ktp-common-internals-21.04.2.ebuild 1714 BLAKE2B 4c71beed06c62a0c9d86967e1a686cd4d4e716ad7302595214698c16f98b26321f41c971456821469e573f78d16f737968edf90ed7728610571d4427e514d4da SHA512 ad657665ea022b339a5c9dfba754051c92fca2524f636cadcfaae129c9591e627e2223f6e711ceffddc14c6065e0ed2f596db084202b7ad7016e55edba4c5ce0
 EBUILD ktp-common-internals-21.04.3.ebuild 1714 BLAKE2B 4c71beed06c62a0c9d86967e1a686cd4d4e716ad7302595214698c16f98b26321f41c971456821469e573f78d16f737968edf90ed7728610571d4427e514d4da SHA512 ad657665ea022b339a5c9dfba754051c92fca2524f636cadcfaae129c9591e627e2223f6e711ceffddc14c6065e0ed2f596db084202b7ad7016e55edba4c5ce0
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-21.04.2.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-21.04.2.ebuild
deleted file mode 100644
index 3c5b725d5448..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-21.04.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy common library"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="otr +sso"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=net-libs/telepathy-logger-qt-17.08.0:5
-	>=net-libs/telepathy-qt-0.9.8
-	otr? (
-		dev-libs/libgcrypt:0=
-		>=net-libs/libotr-4.0.0
-	)
-	sso? (
-		>=kde-apps/kaccounts-integration-${PVCUT}:5
-		net-libs/accounts-qt
-		net-libs/telepathy-accounts-signon
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package sso KAccounts)
-		$(cmake_use_find_package sso AccountsQt5)
-		$(cmake_use_find_package otr Libgcrypt)
-		$(cmake_use_find_package otr LibOTR)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index aff8a40a3c74..85efd3a8c2de 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,7 +1,5 @@
 DIST ktp-contact-list-20.12.3.tar.xz 150320 BLAKE2B 9bd482ee79600f6dc37c224a6901ccaf8b31d924b1ff63f6a304f4b92454e12d869c271c16d003812876eccaf6f9b2d0037aae1271098ca07a3b0d5b22ae52a5 SHA512 54e946c452bf0a7f22c4b1c679d99f76024f39e13c49bd6c52365178b6a1a1df8c76d6e223e1191def79ca36140b6f5e683c35320705e4854c9c09099f8e2da0
-DIST ktp-contact-list-21.04.2.tar.xz 153092 BLAKE2B 33898eebf9eb52190fa5f72fb1100b7b5bd3616f78eb8c309959d16fe3334235216f868b47408b4874f5c43058fc4af7ae088afd147116dd4078010145c7a6a5 SHA512 34fc5b6336a5abfef791127eb3fa0805d0f6b816a4952a576ececa3ef9b843532499da8dc701ed4c702ecf25e610c81ad07fa868522313ef79e54fedaa356752
 DIST ktp-contact-list-21.04.3.tar.xz 153064 BLAKE2B 117aacd5ea9f0aa051b37b7d3d8876696dc7fc9133524c7a960623aaef54c61f8ef5b2212ff8dbca7c75fbe2a2fd9dbb0def66799827dea61cf800a3131253dc SHA512 9d010ec63e53cba531896a855ccf7f50b5717da3b69543c6afba52dfa39e7cbbae4289b05245c8cdeff86cfbbe99ef83e7892e68b321d7cf90fe71cc8bafc642
 EBUILD ktp-contact-list-20.12.3.ebuild 1183 BLAKE2B 6b5b7583564d49636db380e8e2b3cab258a208e84b1ad5a60bb5eb025e6ed5267558f9dd68eaac02e9c4de724766204881d294d3cb8d0b5bebcddb2dee724ea9 SHA512 f25ddaf9900326c0cbe6f3be9bb2f66f98f7c60a2d7a568d82dac063e398beff2835d60ff354bc2f702db954df909f497340570107013100b3374671dfd3fb59
-EBUILD ktp-contact-list-21.04.2.ebuild 1186 BLAKE2B e39e6866a14514007a1afcf828e392b44f0d4e27ee43cb85b7f96b8f51e536298558fcf4a45bd370706a0403fad4fed7cd172758691831d541d045ca59ad7321 SHA512 9653a993245873b16e0458e576b063e2ac6dcca757b2462dc0067d4a3d87d4d45fd2838ae8dddcc3661e76c8ba98be647761d5399366e6f087ec32e5ff82ce8c
 EBUILD ktp-contact-list-21.04.3.ebuild 1186 BLAKE2B e39e6866a14514007a1afcf828e392b44f0d4e27ee43cb85b7f96b8f51e536298558fcf4a45bd370706a0403fad4fed7cd172758691831d541d045ca59ad7321 SHA512 9653a993245873b16e0458e576b063e2ac6dcca757b2462dc0067d4a3d87d4d45fd2838ae8dddcc3661e76c8ba98be647761d5399366e6f087ec32e5ff82ce8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-21.04.2.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-21.04.2.ebuild
deleted file mode 100644
index 70e60446a67f..000000000000
--- a/kde-apps/ktp-contact-list/ktp-contact-list-21.04.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy contact list"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=net-libs/telepathy-qt-0.9.8
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-"
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index d14bab08efcb..ab01b5a4471a 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,7 +1,5 @@
 DIST ktp-contact-runner-20.12.3.tar.xz 43084 BLAKE2B daae9c0c2fd9898df4797ab0bd09daf903915a46a8f3d2544330f58f889a3a7d2f8582a5a500aa9baa8585c13d6e5d6ba5f024050c4a68918239ef9fb5543923 SHA512 e714c2d7f9274d1f5689f140a0609ddb5bd1e9a0d3760b3f04e656c74b97a9b32090044940a49689801a2fa749ccb33b79ba58ef413be6a7a22343432305c6c0
-DIST ktp-contact-runner-21.04.2.tar.xz 43860 BLAKE2B 3448f07ffe451c289250b43fcfd51dc88e08ea56ec4e0d68b400ef832d58202c730b618b0e0be4ec6933fbb2fd57020c7524a0c5cb57e5daa8a25154e9a8a3e1 SHA512 7fef7f1dcab5f7054417142fcaf3ca874b16d1126f347b284f78ec3c8fdfb784dff24d48a62b58a784f73c796386b93dfa0b222caab4b2047a1e112e1b98f90c
 DIST ktp-contact-runner-21.04.3.tar.xz 43852 BLAKE2B bd91afdf1d7573a6ff5f3971b6544d218ad94a3db16185fc4a7b95567682988082e680694e224fee8f4eaeb5810842c609883cb6914b5295877b1a857ce75f17 SHA512 e48bbf85ed2022f539055b8518e216cddf64fda168fae1738c963ee7fe8920835df816354fa0741fea6152a42dfff289d12b0656b7a68ebbba275d63e2ae158c
 EBUILD ktp-contact-runner-20.12.3.ebuild 675 BLAKE2B 1390d899eb948e06fde044f6f13e448ccb1f65a87701dd6a05808e63da8f4f96fa4d6e914e2c47ebf5f254220f606b899fd471201a8cf87c3b61c26b13f5a0e8 SHA512 7842edfbc83e6337071db386364e8afb86e3184aa7b760174c68a43b334fc56f46f7fc0f14280852feb21b786286fb53a7e8d3356b4d76b6527f4fc3c0e7f66b
-EBUILD ktp-contact-runner-21.04.2.ebuild 678 BLAKE2B f4db1f79809eefac306a53aa232354c196ef6f866706ec939902259cb610e591c73ccb667cc03542ec29dca6d5c5cd163cf00b6a264f7aabb51e7998044a90fa SHA512 02418b36fa500fed8cbe5392aef0c77fe2a37a948f34b01a05c940332996ac031c60ac8b4e7d7a98f612b70d9b86b37f88e922ea5572dd21777d1dd0b570dbbc
 EBUILD ktp-contact-runner-21.04.3.ebuild 678 BLAKE2B f4db1f79809eefac306a53aa232354c196ef6f866706ec939902259cb610e591c73ccb667cc03542ec29dca6d5c5cd163cf00b6a264f7aabb51e7998044a90fa SHA512 02418b36fa500fed8cbe5392aef0c77fe2a37a948f34b01a05c940332996ac031c60ac8b4e7d7a98f612b70d9b86b37f88e922ea5572dd21777d1dd0b570dbbc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-21.04.2.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-21.04.2.ebuild
deleted file mode 100644
index 3f8279df76d3..000000000000
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-21.04.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy krunner plugin"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=net-libs/telepathy-qt-0.9.8
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kservice-${KFMIN}:5
-"
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index ee1e0a18b47d..03d73f75415a 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,7 +1,5 @@
 DIST ktp-desktop-applets-20.12.3.tar.xz 43704 BLAKE2B 90d8304eb8cdd20635359b947f91774ad28668aa917571d9ca1f616b06c5a1f3d63876497b0c500e989c907b53f542114eac3926e5a19bc900eb0ab1139cb93d SHA512 ef99274d65cb0bbbe1796402230472f243f331285ee69e316394c6a37fa87939c8a803b65ec68357328f39226517103c98f270258c5c7c9d3470865ef97dc325
-DIST ktp-desktop-applets-21.04.2.tar.xz 43648 BLAKE2B 00c86ad877e702e9d035df7ff360408980549f0eb87cac06cca61e6263924b2efa8e8dbef0b26b62ad377fb1623d7e1d884236713d3dd869e3e350d2b5193a5d SHA512 8415b8a70e8f40669ab0f000837e7b7e12f49a3dd74081a186e264cfd72e1f4c4f2624f714bd695c10edcee6dcc09696b5f06adcb7997dc7f1d4481155410222
 DIST ktp-desktop-applets-21.04.3.tar.xz 44396 BLAKE2B 958cef9d866997a4313fa13e425248d511eaf2fb94043f86c1dcdcf600a5d09b6c2b8dd61bfe8e712c00ebb513961a045b3381b42ab7e8e0455550670e92134b SHA512 50802cd5176e85a440113920bb3b6103067009608ed4f0a9115647daf7297d17d37cd705c124165c3855bfc331fbc398dd07243c2e234de038a1394b7c4ac39c
 EBUILD ktp-desktop-applets-20.12.3.ebuild 615 BLAKE2B 7202371c37ac36aab9998de03a38c113531b822d63e3ccccdd29623e6e8716f21950b236574612ac0ad4448c9a607da37a9d6f46d163486cb8e60135a9fd3689 SHA512 3ac835b24e15222f2c4028ba7a680f96f893593daabf934c1455401cab8e2ace114561464fae8959c1014850fb0f3db401c90f72d43d993ec53ccf84ea53ad43
-EBUILD ktp-desktop-applets-21.04.2.ebuild 618 BLAKE2B 9390935c582a285186613a3f78e602876d7690437f163bdc0cc434b490a82628eeff4b590f5a032168a3f871d321dc284e5cb5992718660c5710b336ca457e8d SHA512 cf2d885f8d64dbe1a57f5374400a4c26d2c4f38164d4b792ac6ffe9e848da1b7c87fe964478a1251c11fe2fbd449e54f0cc55cfb67e3dfe2d442613c0d14d097
 EBUILD ktp-desktop-applets-21.04.3.ebuild 618 BLAKE2B 9390935c582a285186613a3f78e602876d7690437f163bdc0cc434b490a82628eeff4b590f5a032168a3f871d321dc284e5cb5992718660c5710b336ca457e8d SHA512 cf2d885f8d64dbe1a57f5374400a4c26d2c4f38164d4b792ac6ffe9e848da1b7c87fe964478a1251c11fe2fbd449e54f0cc55cfb67e3dfe2d442613c0d14d097
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.04.2.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.04.2.ebuild
deleted file mode 100644
index 830c362ca307..000000000000
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.04.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 77c6b3503059..a4f72cf488b7 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,7 +1,5 @@
 DIST ktp-filetransfer-handler-20.12.3.tar.xz 46208 BLAKE2B 341e042981ee093125dd31152e5f65a8f83b94dd626a8f905799e0128f5687f068f4d1e15cbd52e65b0a3b22422c78d1449f48e4b14a5f68a9290b907210fcaa SHA512 b1482eaa8e18d3a0238d3e885d3f6d3398487f772944239bc807ee0309adb4ee1bed010dafd7a9bc149eab39085e4689c6f75d97bc5ce43ad17bf1b38453091c
-DIST ktp-filetransfer-handler-21.04.2.tar.xz 46420 BLAKE2B 15e5a476523ba8adef347bbf23f7a5dc394fef0897a9f9df8d28fa3d8139fa866e01b84e0456bbf7b6310aa47d42f8fb91a7db0c068a22e635891a6507d7c88b SHA512 f3984ab92c5aaa7b79aad0fc01d896fb3162df638043b185a458226bcad706a6a01b9d0772dd0b73c41f3c0e9327fd3b6d945b9a29d5f19e2f1b651dbc797e8e
 DIST ktp-filetransfer-handler-21.04.3.tar.xz 46436 BLAKE2B 6a52d84bcc8106946cfb839dff9871a3fa6ed082046e306b3041e87a517f638400cfb71cf419568b621ee27d54bcc9f5119bf2aed4a6500c9dfac730a3cf7fc6 SHA512 40811483b2e8748f259b7612bc40e978a5de931e37c10f3e494a3c048396298be70d1d5e82e75b6c3f44bccf8d5e9738da9aea2ba3c4ff5994667c15fb02a952
 EBUILD ktp-filetransfer-handler-20.12.3.ebuild 691 BLAKE2B 99ea8fe27c2db16a888df4a2dda9873469af198a98157c664e505e172b721e3e37325032bb7f0bfb9e37b86c6f84798b2fde1f226cfbc0ea22551b8e04ddfcb7 SHA512 c816edd3d7efda2e3172e469e878f75804182636daa8ee93292186adfddac2f4c412b25324de7b325e5ea69182f2ca877f224cfe995ce51e9b51077501a46ef1
-EBUILD ktp-filetransfer-handler-21.04.2.ebuild 694 BLAKE2B ec5c88ad08577f849e766994fcceda93f47b6cf34af7016128be09195c4aad7b55143a91970501ec2405496c5554bcadecefffa754ac3ef4ef97144c19cf63ac SHA512 a22824bf6030502a73817b11fd6dcc6dbb37a16ce5238481ff61e6d86251bdf949269ed2a267f917dafb6c235db7e33dacb75445d09680c7d92e2d256988ecab
 EBUILD ktp-filetransfer-handler-21.04.3.ebuild 694 BLAKE2B ec5c88ad08577f849e766994fcceda93f47b6cf34af7016128be09195c4aad7b55143a91970501ec2405496c5554bcadecefffa754ac3ef4ef97144c19cf63ac SHA512 a22824bf6030502a73817b11fd6dcc6dbb37a16ce5238481ff61e6d86251bdf949269ed2a267f917dafb6c235db7e33dacb75445d09680c7d92e2d256988ecab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.04.2.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.04.2.ebuild
deleted file mode 100644
index e1c864299142..000000000000
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.04.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy file transfer handler"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=net-libs/telepathy-qt-0.9.8
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index f392071333be..d7e986e5752e 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,7 +1,5 @@
 DIST ktp-kded-module-20.12.3.tar.xz 98312 BLAKE2B 70951217e2881c48af5862ce876df74dcc9a4ceba519c0f88bf9ae0a99b4bf5923f9d68950a84270206988a3a19913ad69526b43a724c15c879b6c16749515c5 SHA512 17ba3d45ce0931f42de09cfa4b693e88e77ef67f08ae35faf56f5d4d7fdefe28501be554c7ea279d6b1183ecbd46a99552e7316b19e2e85a3ec5906a2c285b3d
-DIST ktp-kded-module-21.04.2.tar.xz 99168 BLAKE2B 8bb952cc0df9f36b102c210acc6a7c93a70cdc01a3212fa72348cb683dc100159e7b71e2637003fce2294441970e449e8d5db131dac61024d9d1913b8dd25b73 SHA512 d71ad0e79a203fc43995b5e5af1a7f8e77e19216f06742c65e149ff2b5f10c2cd850aebf7b4d114f2cbdf1e294acef3b172356c6c2f9387472a7713af3e6a35e
 DIST ktp-kded-module-21.04.3.tar.xz 99128 BLAKE2B 3e9bdee280cf476c81ea428c519c0183fe2a01cac7449f03d49146dd987c763bc56b5ee2a049192a733053df7b28f4bfd8af45ea38c0d7c1d7b56839491fc833 SHA512 f8ec2b4e55a7b78ae208ae9a2f8a77aa5bbec8eef52b7a7671975846858955a6ed84b3a042ad2d35e90c74c72b65ca251e7938145dc16332a8c397e0952f12f6
 EBUILD ktp-kded-module-20.12.3.ebuild 1107 BLAKE2B a6d24f1fbbf5629aca6e497c2643031d6b0f5d7b32e590298ecd031c7c948a90feeda6a430012f4c218e14064657e8730429a26e6182c807d88e571d9c946903 SHA512 00c5f481635216b5fb6262108e9c5e3a481b25f727a5d11e455b6b84d6390b3888d390e11810168b26716d92c58e2b9898db2b609120c0876b01cf2811a1b725
-EBUILD ktp-kded-module-21.04.2.ebuild 1110 BLAKE2B b6eb1a5031e6699b8142c220ad052f7e4bc16d10d3ea12e3ee8a7af2f25949a1ed6da2472b2bfd5d99b2c019c4aab1fbb173551b9d86a19e41f97e3c0acb136a SHA512 4b48405bb90d67f5d9cfe1a92981cc07266184c9c6b4532f30870217ff69598d0f430e0703ee4fcbb81b330d25f3553b894b592e15c3e3daee464aec610cab39
 EBUILD ktp-kded-module-21.04.3.ebuild 1110 BLAKE2B b6eb1a5031e6699b8142c220ad052f7e4bc16d10d3ea12e3ee8a7af2f25949a1ed6da2472b2bfd5d99b2c019c4aab1fbb173551b9d86a19e41f97e3c0acb136a SHA512 4b48405bb90d67f5d9cfe1a92981cc07266184c9c6b4532f30870217ff69598d0f430e0703ee4fcbb81b330d25f3553b894b592e15c3e3daee464aec610cab39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-21.04.2.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-21.04.2.ebuild
deleted file mode 100644
index c102eff6d523..000000000000
--- a/kde-apps/ktp-kded-module/ktp-kded-module-21.04.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy workspace integration"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=net-libs/telepathy-qt-0.9.8
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/signon-kwallet-extension-${PVCUT}:5
-"
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index afee1994cdfd..4fcd082a65d8 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,7 +1,5 @@
 DIST ktp-send-file-20.12.3.tar.xz 27816 BLAKE2B ff30f0d69d4a9c9bfcacd226c3261dfc9df7d998ab5e265eb2a6cdf183ad3c0797ad55469384df69f9c2e7b3bfabd551d3937c3cadbee90d22e670db0d20453b SHA512 4b5766f38cc4c83a61f0d7dc8acc112e844eb3159b4998bfc9deca8df7020182273e5fcaf25bd0543c451d38ab8cd9345906ac8de5e9cd2f31732f53a7152a80
-DIST ktp-send-file-21.04.2.tar.xz 28256 BLAKE2B 79da01b75840755c730691055365b7b89745d435da6172f2d2a92720ac20f9aadb637fc7e8f4024b6d4fff0a079df7f8fe4bb9e6390f95dc9b0ae30790afe8fc SHA512 f1be2fa84bdd702432e6e26a682cd1c2242915bc210b0cb89a0782c1f2afdc61eae3967bc43c47a65fc0f05e107934beb28bb6157f74f9cf7beab21d8022729f
 DIST ktp-send-file-21.04.3.tar.xz 28700 BLAKE2B 52e73baf0d7193465be660b759ac47702f167e9d94efd7604fe991f1bd87889ebfa0e940e1a6025b688c855a4b2e2174f8db2e5a07b726a50903facd4ba1a844 SHA512 538c9dce9ed232f24fdb4e20e2fda57cfe394d4d6b1c546e3b6b7cb139141c1307328b14f777e0936ed4329229639afe91786fea767fbdfc9a093ea6ff2eb577
 EBUILD ktp-send-file-20.12.3.ebuild 916 BLAKE2B 30a141ed92832c5c5fc339d13b0dc0c5886e43b02817ac0f9d4d50712cf9b76f0e9edd890585950c7436c402bc16564c87c2617d4a3e392982f5501ed12a7f94 SHA512 6fcf4157a59f8bea5ab2ed4272e1f0117f9d34207e496094ddb5be5ecf9baffc6b1e161ae5438dfe5ab8ee50c90343030ba2c9fea9939feb7764841ddbade545
-EBUILD ktp-send-file-21.04.2.ebuild 878 BLAKE2B fc1cd65d8139debd4a59b20132294019a6957bd8d527a3d3d6a307f37e26efc1911f8bea81fb72bad6b20eca8eced4d0b9d476b3c479f4817decfb82d9dce098 SHA512 b10859af0f4ac7b6249532d5fcf2b6e8c0150a738dd5f46d2eea3c1d6b72823522018f2506de6c81bfc9ee38caf227d2443e1d4f5abb9d8115978d2397911655
 EBUILD ktp-send-file-21.04.3.ebuild 878 BLAKE2B fc1cd65d8139debd4a59b20132294019a6957bd8d527a3d3d6a307f37e26efc1911f8bea81fb72bad6b20eca8eced4d0b9d476b3c479f4817decfb82d9dce098 SHA512 b10859af0f4ac7b6249532d5fcf2b6e8c0150a738dd5f46d2eea3c1d6b72823522018f2506de6c81bfc9ee38caf227d2443e1d4f5abb9d8115978d2397911655
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-21.04.2.ebuild b/kde-apps/ktp-send-file/ktp-send-file-21.04.2.ebuild
deleted file mode 100644
index 3c267bc7e3a2..000000000000
--- a/kde-apps/ktp-send-file/ktp-send-file-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=net-libs/telepathy-qt-0.9.8
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/ktp-contact-list-${PVCUT}:5
-	>=kde-apps/ktp-filetransfer-handler-${PVCUT}:5
-"
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index d46b0f3c9ba7..e04e6f304a4f 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,7 +1,5 @@
 DIST ktp-text-ui-20.12.3.tar.xz 471704 BLAKE2B b8245e4e791c8ec6eec832bd2f14fe499a5654cf14dd373d2428b168b75caa1cc6e83fa3199e03a23bc65f47fa34eeda5d419dc69c58c0e3a88def0b27d80e8b SHA512 0c2efcfc3497f2ec7f44389d5a10eb601b6fb2616d068ae6e4d99483a34de4f2537fed77ff0c7934561e980267e511213cca30d2bf2da1fb507b4789db944f5a
-DIST ktp-text-ui-21.04.2.tar.xz 474732 BLAKE2B e16b948cf820db1e935126c0dc345134eadc7535f42edd121973ad8ed04142a91b4c8a16e80cdf1a5e657e3fb48a4823244e893ac242c297f2f91bc69e5e8c2e SHA512 3caa08363cfd735bc357c019bd31eaad8c9be63206ec8568d9c83ae1de96d2229b79535aa7db5acf3123ae5eeb246fab5dffacb4770e676e2f9f8614cf168e5a
 DIST ktp-text-ui-21.04.3.tar.xz 474640 BLAKE2B c69dace833198c3295bda2fb5fd3435b0531c87b4f5ffcb6076bb1fac2b3cff1bfb49be7f0206a7c858011b740509c045faeb3970d4fc9f615982a8a405398e9 SHA512 64b837b0f65d314d1e8bf9b471a53692a020c33eb0a70c3504d54a560a41a2f30e0cbb30c2ef8ccad75fce614604959f2aaadd6a02a8c09853842d083ba76641
 EBUILD ktp-text-ui-20.12.3.ebuild 1637 BLAKE2B ab10d20f42e8003945c7d82f67b31c7d5e263ec36f76d7822c6a4cdc5f0bad6826348b5a3e55589160db1fea2b67654b6f2e6eb4d217e3c9ae65f8ca7edcc8df SHA512 41dd2fe72ed72f7469ece1294ee48cce4e2f811e21eaec91caa3a752fc3e6420b7746d435921b1484ee848db3aa964ee2d7f663131f71598218fade4089f23c9
-EBUILD ktp-text-ui-21.04.2.ebuild 1640 BLAKE2B ef0fb88389a967d1637e3323603e02295881be7b173cbba2514fd4659fd55a18c9f0cb2f961971181ef620f087e7a2f36dc377d60f4e22afc12080bbe9e4f3c6 SHA512 aba1a587973f8dd14f3468b8f14bc39521c152dcec80e7cc31e87b7c3cef281093aabdb37880297c029bd8ddff0283f2e63a72f844c07804ff592ae3dead61c7
 EBUILD ktp-text-ui-21.04.3.ebuild 1640 BLAKE2B ef0fb88389a967d1637e3323603e02295881be7b173cbba2514fd4659fd55a18c9f0cb2f961971181ef620f087e7a2f36dc377d60f4e22afc12080bbe9e4f3c6 SHA512 aba1a587973f8dd14f3468b8f14bc39521c152dcec80e7cc31e87b7c3cef281093aabdb37880297c029bd8ddff0283f2e63a72f844c07804ff592ae3dead61c7
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-21.04.2.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-21.04.2.ebuild
deleted file mode 100644
index 7616abaa249a..000000000000
--- a/kde-apps/ktp-text-ui/ktp-text-ui-21.04.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy text chat window"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5[otr]
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=net-libs/telepathy-qt-0.9.8
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/ktp-contact-list-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 983b7c94f6b2..53a68b668c1e 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,7 +1,5 @@
 DIST ktuberling-20.12.3.tar.xz 70712392 BLAKE2B 048618e1acf907ef74787d4ab88edde2badd5f2513ad65829a527e1bda966818b9d74003d91d7dfe57f6ce23b97370f1f87af37e7338c99f9dec187bf9667e15 SHA512 ea6d1dd04f53cdb4bde868ae478b7368e1c1147a73d7e5179133ad47ad2bc9a823d61c11bfd5cd922c26fd169a2ea4c43e4f9fb86e13a6e12f4a92f4974cd8b0
-DIST ktuberling-21.04.2.tar.xz 70756376 BLAKE2B 19e89746afbb8f97a14b383d13c340d6acbb5e0467f5002fcb59237cb130c220ba10c55db8c119079a68e9d7395a2e641ce11fc5a0d687af0f465da03a47ed0b SHA512 f086cff5a0af6f30e24cf3f965d9e1ab75a931c80d52d0373aec9d836b0d5bad69cf2bb0f860016bb782314e2b7a813e7caa7a2f8d2b004c3fa28e5b6685be0e
 DIST ktuberling-21.04.3.tar.xz 70755172 BLAKE2B d7820b53e29d645a1149277ae8db6bf86dd0fce6746cda44593fb4f3de5dec9484e588af5753b977dd6d45ce794e3ed5461c3c1ac0bb5a93e5ea3111db7377fc SHA512 3d3ed7a102110207898d3fffbf127cda8be9c2c112692e037c6c067cb517699a8a60ab6044926a976876c6051ff5933481435d45088134abc7b8ff7ec44a7acb
 EBUILD ktuberling-20.12.3.ebuild 1104 BLAKE2B bde732ec4d8ec52cc6904877c71be6f1ab6d6c7f736e44671d0a1d0789c81b6d9bd9a585c779af0f7e6fc67b13bc5bf613646512b3bf792e68fcc7caa1a0190b SHA512 be0c8914b66774d207a11caa4b13990aa728aab24ab43a7bf3b567e00ce68564cd63f2157c172197482ebad9d4b8593444ff800b00a0dee79af17a1ba76cf73f
-EBUILD ktuberling-21.04.2.ebuild 1107 BLAKE2B d2e3cec28692e8938d751409281ba185ff1151313e1fea7b16372ee6c21872f1f74b0ed6fa247e68273ec112dd97d1a3c7059575324ad86936339110446d9ad0 SHA512 4add5fc98f444bf8b371d0e5141ce21a62a04cd99c31cb3963681cf0b5da9b589bd3b6b7435ea514ff6acefa48ecc15ed5060ab8988ecd44cc0cacad8a8fcbc3
 EBUILD ktuberling-21.04.3.ebuild 1107 BLAKE2B d2e3cec28692e8938d751409281ba185ff1151313e1fea7b16372ee6c21872f1f74b0ed6fa247e68273ec112dd97d1a3c7059575324ad86936339110446d9ad0 SHA512 4add5fc98f444bf8b371d0e5141ce21a62a04cd99c31cb3963681cf0b5da9b589bd3b6b7435ea514ff6acefa48ecc15ed5060ab8988ecd44cc0cacad8a8fcbc3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-21.04.2.ebuild b/kde-apps/ktuberling/ktuberling-21.04.2.ebuild
deleted file mode 100644
index cfc746da64f8..000000000000
--- a/kde-apps/ktuberling/ktuberling-21.04.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Potato game for kids by KDE"
-HOMEPAGE="https://apps.kde.org/ktuberling/
-https://games.kde.org/games/ktuberling/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 7a7c877c7a7e..3f1f785d7056 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,7 +1,5 @@
 DIST kturtle-20.12.3.tar.xz 1837380 BLAKE2B 6e69a7b42b32e3e81369ad94b3bec0968f588c31c23753466bfff9e54a700c0523d144a4a0bd161f2bf7cb61aa8ad996e00e2d7306bc8f06937ebd34251afd8f SHA512 a24ed68ca908693b76cfac731c39fc51579c3a26eddb08800ec8064091c7a00b5964078546754524d739d89ebcb11966d1246bd0044aef0b6167fc3094c57570
-DIST kturtle-21.04.2.tar.xz 1858020 BLAKE2B 211a2380998b98709142b0d2311f8fc11044d47e1d80892af9d2968ef8fad29bf60d446067fd6140fb094d6f7804f49d9cfb9329c39d9ff7bfbb81497bb74ba6 SHA512 c14f8de4bbefec14c8c5aa107141fc5b6ffeece503938ebb318623190752848cb2461dea80df996a840e380def3a3b70d86e82e592ace36d16c044c6762cda97
 DIST kturtle-21.04.3.tar.xz 1970952 BLAKE2B 88bb4425fd7d798c9d7d069b61a241adba9bce457f2e3bc804c12572637087feb6cc221c628a4d60c97ea3d292c242bc3339c033217dd14e41f1f6a0ed39b3a2 SHA512 7c7b4ff311a694ebfd29de55f7b74767daac7edd228612496356823a81e9836db6094d1802c3c7ed39540db645901bf3e0ff607d246c9f38b3501ccdeca0b012
 EBUILD kturtle-20.12.3.ebuild 989 BLAKE2B 583576649b922abb9c669157179dc85ca169c8e9bc2dbec2efe91e26cebd60769c30b6c44bc20c3cb36645e0770a4d9f0fa5ef6865bb2bd8ef89c2fd4b6dd3c8 SHA512 c7690ef156205abd2191bb24841bc53f4352fcd872f720c7fe42988b8e4488882fb22f5ab231e38971dbfdd5960decfa8225b819bfbf2eae1d61be89f9e723e9
-EBUILD kturtle-21.04.2.ebuild 992 BLAKE2B 3d48e6580ebe4893218ea6ddbec3312f5c4801cc5ac66ff85f69209969a1190f90aa0f8b9f4bf63671a88d43758af936c6acd24983266fd2319b38c869aeb6e3 SHA512 d0f5c3b956e77c7283356b3a98c6e74f8ab9a8b52890e130a423cb2092fdc4cd7c2398600dac1fb742a2980b4404a1556cade836c9923bc0300ac7029d1309dc
-EBUILD kturtle-21.04.3.ebuild 992 BLAKE2B 3d48e6580ebe4893218ea6ddbec3312f5c4801cc5ac66ff85f69209969a1190f90aa0f8b9f4bf63671a88d43758af936c6acd24983266fd2319b38c869aeb6e3 SHA512 d0f5c3b956e77c7283356b3a98c6e74f8ab9a8b52890e130a423cb2092fdc4cd7c2398600dac1fb742a2980b4404a1556cade836c9923bc0300ac7029d1309dc
+EBUILD kturtle-21.04.3.ebuild 1089 BLAKE2B c3410fba7d402e3047e1b55da182963295905986f0f5e32d1538da848b71c350cd5f4bcc52dc310a8fbca83da13142a0a5a5a645bc34aee634ac42039d0c3019 SHA512 2a24adace5031d9d41d13724433094b017dc9a63d346226ee395c608d6e8d2595eed33ade9e7107664904138cde76d6246398e3b403d06313e3943b0ffb95e72
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-21.04.2.ebuild b/kde-apps/kturtle/kturtle-21.04.2.ebuild
deleted file mode 100644
index 4e62a0f78b2b..000000000000
--- a/kde-apps/kturtle/kturtle-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Educational programming environment using the Logo programming language"
-HOMEPAGE="https://apps.kde.org/kturtle/ https://edu.kde.org/kturtle/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/kturtle-21.04.3.ebuild b/kde-apps/kturtle/kturtle-21.04.3.ebuild
index 4e62a0f78b2b..57c1c905ec1b 100644
--- a/kde-apps/kturtle/kturtle-21.04.3.ebuild
+++ b/kde-apps/kturtle/kturtle-21.04.3.ebuild
@@ -34,3 +34,8 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -r po/sq/docs || die # broken with <KF-5.84, bug #801919
+	ecm_src_prepare
+}
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index 8e6b4584404c..1b985afcc7a1 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,7 +1,5 @@
 DIST kubrick-20.12.3.tar.xz 339644 BLAKE2B 7b4a0eb179273765c3532540ff088bc698e9a01ee1384697a0ba40a27c10c1f5e0f36617b48470b2a1af7ea41ef1d781cb2f480921ef9beeeb183c9c8d7f5f2a SHA512 bd0e22fcc299c065d64ec697a248cdefd57dac0e0c2487f5cdbd15c952a87b0873df588fcc7023a68c8f839199d00582fc39621e91746093ea409a83402bb7bc
-DIST kubrick-21.04.2.tar.xz 343244 BLAKE2B 7823448ea4f1e8f1285222129e501c4701ca44c9b5ea273a447b7d3d37971d87040216b6c9e31eca2823061c23b5afe22ff2c6ffcf406bb247aa86057be6d00f SHA512 6e1f17ad2b1a7ffdbdfd7c3a73b94fa39821e2d09f91773c2d1681d06b92f5bddecffb2e06bfa92797a4eff53579748171ca92c70d15c60b0ae27dd484f5cad0
 DIST kubrick-21.04.3.tar.xz 343208 BLAKE2B 98738b63589ec7e79849b4d9fd4958eba8f8fd25a2820948caa95304777d0fb784d5e82cc6c02fcbec7c1c8f1289a9cab05e5627edbf209c8b2497498d0280ce SHA512 98f18557b86768e970ece7d6e2cc0b52e7cbc35cda4ffd20c4bd217897abf9345033fb97239bec02b4a73c725d6889bd0b1c0206e1a802a36fc60da5b2d2dcc5
 EBUILD kubrick-20.12.3.ebuild 874 BLAKE2B 8f6a7cca546144f8efa2ee10e7a8472d4ee5fdea70954f7d11185fe45ef2b89effb370df3cc13811e538a56d8c93b778b393e1eb5c0dbb5d35f3cacd57ac3bec SHA512 55d6dc787af66f7cebc1af75e77f451bc2af281f8d868f4037bde6cdca017ab8d3ab8db1b7c6330615ba6c95a808e2f3a64121bc03beaff188e31d8f38692193
-EBUILD kubrick-21.04.2.ebuild 877 BLAKE2B 1eedfbf12159c07e3aaeab89b951ceb2f05e277b9f8d9c69573719cd0a0cb5a1604ec63a17f57ecc977f5a9b72106d4b1e25014d02c871b7607006c0a67614f1 SHA512 047f21e81c0fb3597ffc49bff1965ab64b62dcad8221bf3c56f2a0b4a9e816798be8f339238ae4de475d25490947742cfe0763bb97c012d08e6b891d652b6fa4
 EBUILD kubrick-21.04.3.ebuild 877 BLAKE2B 1eedfbf12159c07e3aaeab89b951ceb2f05e277b9f8d9c69573719cd0a0cb5a1604ec63a17f57ecc977f5a9b72106d4b1e25014d02c871b7607006c0a67614f1 SHA512 047f21e81c0fb3597ffc49bff1965ab64b62dcad8221bf3c56f2a0b4a9e816798be8f339238ae4de475d25490947742cfe0763bb97c012d08e6b891d652b6fa4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-21.04.2.ebuild b/kde-apps/kubrick/kubrick-21.04.2.ebuild
deleted file mode 100644
index 7f1c7ec58572..000000000000
--- a/kde-apps/kubrick/kubrick-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
-HOMEPAGE="https://apps.kde.org/kubrick/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtopengl-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	virtual/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index c68c8a30558b..b4462239fec0 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,7 +1,5 @@
 DIST kwalletmanager-20.12.3.tar.xz 773840 BLAKE2B d5d9ef32a2033d2bef90452eb77e578dcf3c094777f71bbcdba459cc21f746fe23fd7e5ca03c87755fa5505c3ebd943ac58c89472d903ff046ba786f0e4db4ab SHA512 6cc9cb53813b4dc0e5c7c74a3130fee51dd85c4de9f78e4d3c64d40c4b2ed2b134a24f5fe10d67996077f57c4032a8cf2481e418238c5e5ff73c9f0d9657a6a3
-DIST kwalletmanager-21.04.2.tar.xz 796180 BLAKE2B 33d23702726933d30fa5e4611836afc2a7811bdc07215a20d475dcf4baf9a833e53fc460097954a1439ea39f462dee2cfd1fd3e990ebb6d8b878798de1bdb7cd SHA512 3acd100e2e85bc97452750fabd85ee7cf04d0686d3c44480c1d6618518b26c0086f673255e21b9d69c43d46fa8541d8925e92d1220cd11e6a67fdce27f3df18f
 DIST kwalletmanager-21.04.3.tar.xz 796240 BLAKE2B 65188c28aa97ed7384db63dcd3ca2caf5be143f5b949ec62196dc7fb2c96aadaded2c9333be4f961351cfe33492f341ab9e50c6ace55d0e2e9bad7984fded39b SHA512 89bedce351f0c27c7a0452d087fd0633c40ca82d3fc162bdff06c6ee5eb95b66305aa85b9e4c37c6f01ff54b45c575f6af5d5cf9a6ec7e8836198a9e928203a1
 EBUILD kwalletmanager-20.12.3.ebuild 1408 BLAKE2B 4d3f60ff66d4605b846b680990bcbcf5fdf0363e054d3c54dcf9851a4f8eaaf070e2cee4319fb996acea61d9fb95fa0b02fed1ed61f32e66350c320a5e09f0a6 SHA512 8f3cd0cc32b478aab94489ed655fc6d97321605f15c928964c1c556e4a7f7445f49d41e6a23a09d8b81012264c32120ef3526b8c89badb5be95f3b29e6dabe7b
-EBUILD kwalletmanager-21.04.2.ebuild 1411 BLAKE2B 2d577ead9c2ae7c3ed2871af28b62457b6121f6fc8028c8789c10dd1283b3efbe50f44a5e41238f4f628626a6d48309e045bbbb3fa2babf827a4762a3cd245a8 SHA512 43b0ae547fbbe27916142e614c54ef1c2f53f0aab3a39bce6ad74ce0681e82ff04ee24fc9191d12b6787605e5a8d567b78d586dc4dce4aaebdb9c904588e4770
 EBUILD kwalletmanager-21.04.3.ebuild 1411 BLAKE2B 2d577ead9c2ae7c3ed2871af28b62457b6121f6fc8028c8789c10dd1283b3efbe50f44a5e41238f4f628626a6d48309e045bbbb3fa2babf827a4762a3cd245a8 SHA512 43b0ae547fbbe27916142e614c54ef1c2f53f0aab3a39bce6ad74ce0681e82ff04ee24fc9191d12b6787605e5a8d567b78d586dc4dce4aaebdb9c904588e4770
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-21.04.2.ebuild b/kde-apps/kwalletmanager/kwalletmanager-21.04.2.ebuild
deleted file mode 100644
index 808a653fe3dc..000000000000
--- a/kde-apps/kwalletmanager/kwalletmanager-21.04.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Tool to manage the passwords on your system using KDE Wallet"
-HOMEAGE="https://apps.kde.org/kwalletmanager5/
-https://utils.kde.org/projects/kwalletmanager/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index c4d0f06b724b..99bc81f8e805 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,8 +1,5 @@
-AUX kwave-21.04.1-gcc11.patch 312 BLAKE2B ae7052a5f7aa55863483bb224b931a6e2407a6ce520a3ee8733a5ccc601a25d858bbd7a2b6b76e7a9dfc10869fc06c9ff7034891bb5011521c9e8f22bd407c2c SHA512 dc5bce814eb07676c1d6b581be3e0c0c96b6b364a1e847a4f44ab6e22894927c4e9c81ef9d035557712bfc50407604c4e4dcf87334d8c53189f822abb01bdaa2
 DIST kwave-20.12.3.tar.xz 6911104 BLAKE2B 17cc2c5a1b14b8c46548fc3d8c65a37c5f42f49a6656f54cef4549d5b8fbda08f3e491a11a5c46e328c3abc6fbcb4e09dc45529fe14e7a78ab031b1d0937cbdf SHA512 9854836fc328dfded8494c03137d940c8ecfc0409e0f8ea85b34d51fb1f7d077c3f3e9e8e439acdf9da66037de0da65dabe8db7422b5bccbadcbaff599e9893a
-DIST kwave-21.04.2.tar.xz 6898836 BLAKE2B 7917baecb9653350df71cf70eb68c26951b8ae5afa4661ae7879f3436f5301aab3fb8b1c2f203157b1c5c0bfac315d629d31d894dd8b9d93228a4e1be94e33df SHA512 4508f4dc30b8fd0e115e4d36d9b0cc00552893666c850020827c6ff36aab41e31d0064a2dd57656b4193f8a3eb71b9c95a8eeff59e7c1424ff43c8fde8b09942
 DIST kwave-21.04.3.tar.xz 6899140 BLAKE2B 963b2da276e9c897f6b431a665f880a6346dd9298e6f818b291a6a51c17b015ef3c3e1928caa4ec57d9780c982e58107966d39b618d40c2c75a3263c2e74bc9c SHA512 08a648e75ca3a331025ad84f02be7c04b6ec9e68ba251436fa923add35bb3132765519b9bc9fda44b01a45d8b3a9b85f12ac3eb267a8313593d360eb08161f6b
 EBUILD kwave-20.12.3.ebuild 2074 BLAKE2B b3aff4f79c72766cbe6cac9366fcc09693f15a71e6e5fe4e366e13b406d7460b9ac588c3ea6338b9581d4239a59727a0159e752bc4faf273e7a89e322dab5a15 SHA512 bb4758283da0caf87f0be431cfd628bac64418be1744ee655d593c3d8f3217888d009aafc2b9b92f6dd60532087b6bbc9915b04785afefeac5b8a0ea4107e270
-EBUILD kwave-21.04.2.ebuild 2168 BLAKE2B 1264b6693816ae7955d68980949e5f9e77da5bda59adc17a2a918e5ba8f79a344f82ea2edc42d3839ea29b90fec8e970c40b4da89e930ad80da7390c5dfa47b3 SHA512 e61ec2c4d4f6323c8fa596dc8c511a8422f6e904a20062f6195828eb81b834e3fde8fa6e6782f38b42d1d6900457e8a9ecbdbe1686ecc98e26fc9cb3be9cd4fd
 EBUILD kwave-21.04.3.ebuild 2077 BLAKE2B e9aacdab3b5472d395b17c111c5dcdfac9226a8281d084419a0fba65085ba5568f170f7ad3416247163f5edb32234eecb23836b34d008a6eb876a4b03bab6dd1 SHA512 3ba891098ac4b0a67041a706f658deeb5292247acfc5e6095040401d8c42db263a138960ea26a1b7300748cb023b4a4213a8c99b2aa0b82501a8656d9b41c4f3
 MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/files/kwave-21.04.1-gcc11.patch b/kde-apps/kwave/files/kwave-21.04.1-gcc11.patch
deleted file mode 100644
index cc2e8218cf1b..000000000000
--- a/kde-apps/kwave/files/kwave-21.04.1-gcc11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/plugins/codec_wav/WavDecoder.cpp b/plugins/codec_wav/WavDecoder.cpp
-index 9430404..2390c08 100644
---- a/plugins/codec_wav/WavDecoder.cpp
-+++ b/plugins/codec_wav/WavDecoder.cpp
-@@ -18,6 +18,7 @@
- #include "config.h"
- #include <stdlib.h>
- #include <new>
-+#include <limits>
- 
- #include <audiofile.h>
- 
diff --git a/kde-apps/kwave/kwave-21.04.2.ebuild b/kde-apps/kwave/kwave-21.04.2.ebuild
deleted file mode 100644
index 8bbe19195fac..000000000000
--- a/kde-apps/kwave/kwave-21.04.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
-HOMEPAGE="https://apps.kde.org/kwave/"
-
-LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
-
-BDEPEND="
-	sys-devel/gettext
-	handbook? ( || (
-		gnome-base/librsvg
-		virtual/imagemagick-tools[png,svg]
-	) )
-"
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-libs/audiofile:=
-	>=sci-libs/fftw-3
-	media-libs/libsamplerate
-	alsa? ( media-libs/alsa-lib )
-	flac? ( media-libs/flac )
-	mp3? (
-		media-libs/id3lib
-		media-libs/libmad
-		|| (
-			media-sound/lame
-			media-sound/toolame
-			media-sound/twolame
-		)
-	)
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	opus? (
-		media-libs/libogg
-		media-libs/opus
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-DOCS=( AUTHORS CHANGES LICENSES README TODO )
-
-PATCHES=( "${FILESDIR}/${PN}-21.04.1-gcc11.patch" ) # bug 790158, KDE-bug 437432; pending
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEBUG=$(usex debug)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_DOC=$(usex handbook)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_MP3=$(usex mp3)
-		-DWITH_OGG_VORBIS=$(usex vorbis)
-		-DWITH_OGG_OPUS=$(usex opus)
-		-DWITH_OSS=$(usex oss)
-		-DWITH_PULSEAUDIO=$(usex pulseaudio)
-		-DWITH_QT_AUDIO=$(usex qtmedia)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index ab575b7e6a55..7800f4485a31 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,7 +1,5 @@
 DIST kwordquiz-20.12.3.tar.xz 4187776 BLAKE2B ac3fa74db64f93338ba77064e8223bd3272198d94440569b91f4250f302dff49a9088e70e6d9f7a0281be8c79f467f9c12ac2241a81a2b661f4706a3a43eee45 SHA512 2192c8e0b9bdd9d26ed5b0596baa208450bf31b89855c106c125b63465ec505e61e180bc05d60c36809ac93cc31cc9ef814e3636d8a7833909332755aced3872
-DIST kwordquiz-21.04.2.tar.xz 4208080 BLAKE2B d8bf2704a24ad21fefc66937d152c6c08fda819a7ccec71d1714a6709054c8d635b13def06f49ab9294c4c65966fd6c0e8e924ad2d5ad8310dc50b3a84af9409 SHA512 e02f8d79143f96c574b03f1665bce93fafe34b474fea977f25eb14ce90e596027481bf9cbf401f98397fcb5ae7bbbdba35c9b4774be33b025d0e7958978cf3fa
 DIST kwordquiz-21.04.3.tar.xz 4208304 BLAKE2B bf226afa6a145a438609de132aec7e4593e203f66b2f94bdb34f9eaa15d35ed7d60e73dc932e28cc704986b1ccbaeb65b0c00e2fe0699a9ed3b039d7d43b16c8 SHA512 5b52aa118b80f846ef4b61b43468438d0597e551a130ab9e2eb8d93a997eb59a3d5c694ccb2e77dc8c6372e3f81561c0e630a9e659bc1c561e448abeeeb46e21
 EBUILD kwordquiz-20.12.3.ebuild 1169 BLAKE2B db1aeefaa302d0752042049bc842010290c954b8828c222935c0b1b3e2492ea2b7f0b512a2b833772edf56597e6450acb31aebecaaad42b34470c0f6146caa3b SHA512 5a0cc86734119c1e5d54830119f75f029d0adf51774ec9c5f1014a9b27d35652dce3e06eb150cf6a086f445604b53fb0af6381ea4695200c07bdae6c04c7b078
-EBUILD kwordquiz-21.04.2.ebuild 1172 BLAKE2B 181698ac88c3aac1f9dee24b606a37a3ab5b412aa47173b9a6d469607972a4a96f5def20e15e38d72e4a42d5420b779cdbefc91dfcc7cab639df1482947be2f1 SHA512 af30946b6a7d6136b95045b76540d6132f94ccf350730a3247504898f25d526c5fe65df2946e18072e149c89975bdead749a9ef955c0049b52405fbf02c982f7
 EBUILD kwordquiz-21.04.3.ebuild 1172 BLAKE2B 181698ac88c3aac1f9dee24b606a37a3ab5b412aa47173b9a6d469607972a4a96f5def20e15e38d72e4a42d5420b779cdbefc91dfcc7cab639df1482947be2f1 SHA512 af30946b6a7d6136b95045b76540d6132f94ccf350730a3247504898f25d526c5fe65df2946e18072e149c89975bdead749a9ef955c0049b52405fbf02c982f7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-21.04.2.ebuild b/kde-apps/kwordquiz/kwordquiz-21.04.2.ebuild
deleted file mode 100644
index 73e073bb80cd..000000000000
--- a/kde-apps/kwordquiz/kwordquiz-21.04.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Powerful flashcard and vocabulary learning program"
-HOMEPAGE="https://apps.kde.org/kwordquiz/ https://edu.kde.org/kwordquiz/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkeduvocdocument-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-"
-RDEPEND=${DEPEND}
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index e1823fa966a9..6f746b953e04 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,7 +1,5 @@
 DIST kate-20.12.3.tar.xz 5949012 BLAKE2B e35c4da5426772286abe54156babc0de09fbdf8fb5c7505714637ad427e3a694fd541ca7b17e99ebab22f9a19f2a8893d34098cb625fd0e1c0f0b6b920acd62f SHA512 545ec2a48ea6ec737011602b20ac2f60a0f9db0a5e55e0b232f9fd7c10b7e3f54d2a346be7e6341537758a3f8f94868c4083a6d2d10b572568f5c56c9d3aee9c
-DIST kate-21.04.2.tar.xz 7276296 BLAKE2B f34215085b78a69f6f3842e5489d71ca2f78c208aee0c127d612da2b115d449af6718469de0d957409e4054ece0eb578415b52a62a3a4ee6a6bdc6d88740ac2d SHA512 dbd81048d1fead6856b34c198d1e38f194498e1b2d252a7d6e14321b71151b6d2ec7b536237dc0d538d3eba624f72357ae5f7ea2525b53614d0067f1408a38aa
 DIST kate-21.04.3.tar.xz 7283360 BLAKE2B 9520b6cffb284581aaa9bf70daad08fe5ab4570d433ea785a24d0c9122470c9d9d362026c3ea430924c453828001455a377e05537a83a2a81814df4de5e3cf72 SHA512 51c4023f3915edd348c1aa7ce448475f39c3401649510f89c7e17f9943739b67b09330e52b912794b31d4bbab1f94ed322f96bb45d450f016f84efa010d694bf
 EBUILD kwrite-20.12.3.ebuild 1450 BLAKE2B 9ac559c84eaa5c1fe60565f2b8505956241bcbb50ee563ef22daa2645f9a5a737f02926e510024237850f98fc406d192b913c408ceeade36945af65a25137815 SHA512 5c1aeae80a5c5ab98191072a68bcb2fcad34b58a1abf8c99358140b6582c69d2b5a2081f144edcd10790442c7d62b5f03caec8e88a1beffcb5b8eb31b54ceb5b
-EBUILD kwrite-21.04.2.ebuild 1453 BLAKE2B 3bae64c299103c9e959e5a0b14eced478e3e99916edac58d0377f1564aae451152bb183e1d75df0c26faca6058169d6fe8b405d645455fe3af9c89e26b714541 SHA512 e5a13c77c69d31faafa7fe39b90412a41f2c3ed6b3a4a6aa3f6c1456917b966d50415cce5be1c6406357330df679bf5811026af82dd2725f33b0a885eaff245b
 EBUILD kwrite-21.04.3.ebuild 1453 BLAKE2B 3bae64c299103c9e959e5a0b14eced478e3e99916edac58d0377f1564aae451152bb183e1d75df0c26faca6058169d6fe8b405d645455fe3af9c89e26b714541 SHA512 e5a13c77c69d31faafa7fe39b90412a41f2c3ed6b3a4a6aa3f6c1456917b966d50415cce5be1c6406357330df679bf5811026af82dd2725f33b0a885eaff245b
 MISC metadata.xml 372 BLAKE2B 80ff693fe7c7c67aee3a23b6a658a150e33589f9a42df15e7d1956290947555993789ee023345b585fecda3ae828b9d99107aa72b15a6dbaeaa806d0bc2fc2f0 SHA512 3c9a012ef2f6e23889c5c73b3c418e9e60439ea3e3a58995eb8a8b730bfafa5659c7cdb848d0b340f1456828105d92e85c9cdcf55faf22ac676d2d377a004093
diff --git a/kde-apps/kwrite/kwrite-21.04.2.ebuild b/kde-apps/kwrite/kwrite-21.04.2.ebuild
deleted file mode 100644
index 1280b814fa41..000000000000
--- a/kde-apps/kwrite/kwrite-21.04.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="kate"
-ECM_HANDBOOK="optional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Simple text editor based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kwrite/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-	# delete colliding kate translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kate* || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		-DBUILD_addons=FALSE
-		-DBUILD_kate=FALSE
-	)
-	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 8628985bde37..b45ed8c51f8c 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,7 +1,5 @@
 DIST libgravatar-20.12.3.tar.xz 31160 BLAKE2B 449a467ccadb3cc01a6ff03ed621e78f7f63f690605205f45677b4907261829221a20b89f8e7eb8ffe05d5ef02d79ccdae9bb8f6e54d8d4835030442601b57f4 SHA512 920e4db3c9c2813cb02b8324772494b600865372ae6fa4ab7e883e013c837c04ce55b2b8cff74e00d89f7afd3eb7120e10e80640a139d06d05d0646be0fd6ee0
-DIST libgravatar-21.04.2.tar.xz 35312 BLAKE2B 8e27e1352d8b4a1d25e13747b826bb57d39197696457d1e179d52b5c5b18387777e648b5564ad3bf65539461d59564db31bc88f34670ff618e209e0d7c92dbb9 SHA512 cf61dc56c835e5857ceef11a1e7d311abd56aea95db0ad34e0ba1f408346ef7e9ab2341ed15935724cfbcb9442f3179ab9470f537a2d80b4e172ca5ad6a892fd
 DIST libgravatar-21.04.3.tar.xz 35628 BLAKE2B dee2ac47ada9f791925eb98385ef3d85dbe55f694454aa093572cf8d882efe8f70166f5bb04a70d0c3a5a3861b030a9022f2a07e71300c8deed67f9b55bf2405 SHA512 3477d1884915c0c157e565474d1c61a7ab5bcd3a589c94312e389b3ccb780888aa404d5bf76c6eb9363f1ee30f0f77f748aa0b5a8c835214134675a176daa028
 EBUILD libgravatar-20.12.3.ebuild 822 BLAKE2B 2bffca71e80b8f1b8551ed7466585b2057828a74b4246a9a99b5c466eff2d88829fc2d8c6d28f7c78cd57dfec0d707f7aa1b6a067ba721ccc7ff9a2cc3b59262 SHA512 d23f43dc6d8761a05cb5de7f87c187ab8a470d464f458b1ce02751e0b995b0a4f02452b054357868d97f9411862e0928ed68e082459775d3717d525dcadf34d3
-EBUILD libgravatar-21.04.2.ebuild 825 BLAKE2B fe5ba2687cf76ce3fc75ca620fad56850e8d6dd4505e7fa476237c8f4958891f6c140ef86a94f1506d09682088938cc1120e922e428db7fc208c418de739b3d6 SHA512 84d5348f119b538bd2f6d446d129272e581bb028e4129efc6069e9733a4fdaa2cdf8eb0db2c1fb9c869b40ec99d665ad48175f016fcadf40a1ea734034b6d1ff
 EBUILD libgravatar-21.04.3.ebuild 825 BLAKE2B fe5ba2687cf76ce3fc75ca620fad56850e8d6dd4505e7fa476237c8f4958891f6c140ef86a94f1506d09682088938cc1120e922e428db7fc208c418de739b3d6 SHA512 84d5348f119b538bd2f6d446d129272e581bb028e4129efc6069e9733a4fdaa2cdf8eb0db2c1fb9c869b40ec99d665ad48175f016fcadf40a1ea734034b6d1ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-21.04.2.ebuild b/kde-apps/libgravatar/libgravatar-21.04.2.ebuild
deleted file mode 100644
index 6f566c67bfef..000000000000
--- a/kde-apps/libgravatar/libgravatar-21.04.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for gravatar integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 624584 - needs internet connection
-	local myctestargs=(
-		-E "(gravatar-gravatarresolvurljobtest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 16c23401605f..3949feef37ca 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,8 +1,6 @@
 AUX libkcddb-20.12.1-unused-dep.patch 1684 BLAKE2B 6089b00f04b370ff3a23b7604da284b5128aba90e959d8350003ad5945b111a3dc2804ff52d6170c69304f72e4aabe74bfbd2a639c71f328b0e8929dd712f095 SHA512 46aa91b2abbd47b1e49f1c51878437c16e6fe8ddadb19d257c7cdf5881f36f18ccaaca5165e9a818729aadde1fb3bf0577bad885a2a3f5967d02db7940740c04
 DIST libkcddb-20.12.3.tar.xz 425180 BLAKE2B 5dd7c8c75c505d3eebe4ec0bac3a342779fe4af3db56b7f87cb4ed5b0f8d55d8aafa5b0911f415b2d871df4a6d9b276112853fdde0bed4538893f84eac58ed89 SHA512 7659ccb25555a3c9ae496f7ed695a69bd6ac7df1002c94379f5e637a85673ca1194311b8aa04c2b53a2d3b9f41013e38ecd33403ba5fe66c1afc473cefe08af1
-DIST libkcddb-21.04.2.tar.xz 430124 BLAKE2B 84d8d591b4976ae975bbc55f4fcd45427791680a362c9bd768dca46765fdc33f28e95c5675a3bb332ce84845cb8507b07f78dc74573eae7234334fa34929c651 SHA512 7e852b94f4007ef7b2dec6b8cb73d39899d529e6ed136c0014764157b699435ea53aae0e9c1d5caf3125d42062f9d6d892a090249e28912e8240bd5e288ce0f8
 DIST libkcddb-21.04.3.tar.xz 430108 BLAKE2B 414d6d6fd117aa5e6dceae349280a7920dea4fbcc14d79e01da1849a8da7c2e256cb8aa7eeb19bc5c545ce65ec8f7b3081bc420e9a15ba0ee8775f32ca8b6f70 SHA512 48df1dafd22fc323ab546f927e8a6f4059fdcd2ede5bfceb4b67014ce3d526a9f07a16cc66593c58575196a34a1d68a22882bcc391823ec4deb61af3fe09cd80
 EBUILD libkcddb-20.12.3.ebuild 1129 BLAKE2B 9ef03539de766ab9b235d2a7a41084c5e2b560218a6b61e44a4af5ad250f65ee50f2afb32fb47b8dc17f5e8fc82fbb48ef3228a921ebb7289b2d9560abcb1c61 SHA512 7165f458cfbb4f7b5d892623861685c098b20b32ea8407fe9225e53dbafa437f2f510792d55f21ae50713ebbdd19baa56580b3addbaa7a551905bae8c1615e56
-EBUILD libkcddb-21.04.2.ebuild 1074 BLAKE2B 79122a90899ea433bb5ff82890e19e41cf90c19286dc7d1d5b3e15a34b44f42d1793d8ade0535592ab5fd4c48c79286eada96e8ba8b31ce9766dda8fb76629dd SHA512 ea311defa60d5b36b0597a318ee0b1116ce1af89335107f86f9c9182c9ae22e2afcc06ce5993505a3f9e5b945190ebe20d64d35de4ba320d5b7a325fc45859d6
 EBUILD libkcddb-21.04.3.ebuild 1074 BLAKE2B 79122a90899ea433bb5ff82890e19e41cf90c19286dc7d1d5b3e15a34b44f42d1793d8ade0535592ab5fd4c48c79286eada96e8ba8b31ce9766dda8fb76629dd SHA512 ea311defa60d5b36b0597a318ee0b1116ce1af89335107f86f9c9182c9ae22e2afcc06ce5993505a3f9e5b945190ebe20d64d35de4ba320d5b7a325fc45859d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-21.04.2.ebuild b/kde-apps/libkcddb/libkcddb-21.04.2.ebuild
deleted file mode 100644
index b014baa69231..000000000000
--- a/kde-apps/libkcddb/libkcddb-21.04.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE library for CDDB"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="musicbrainz"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package musicbrainz MusicBrainz5)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 7e906650be64..c331bc80c33c 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,7 +1,5 @@
 DIST libkcompactdisc-20.12.3.tar.xz 96728 BLAKE2B 2194d8bac9dd07283a6defcc32dcf53ce3a081bd04d8f9e1c174d96cff813519b99e760ae6393bfe1d30b943250b931f1b761c37983bb21a97b47741a8aa5323 SHA512 cc586d297970304bd845ac8948912753e22d9de8a22e039c6f0a25083c8601bfd21ff831d863786f6db58c990a75f942fc3ce3d3c49bdb55e9a47a2dfaa6192c
-DIST libkcompactdisc-21.04.2.tar.xz 97180 BLAKE2B 5d7529336ff3628c481510e8045a6a2f3c2f59a8f2a82be7f4b21fd14b2ca8f07a08af49146d4ec39058167de264ebf78302e18bb0493bae5defade4cfd24b35 SHA512 43d31ac7fed075fd17ae37d4f23d4a3e64f93180d9716fd8f1ffa7c4356ae2f42e8f50bf573fe1017750f3bcdbd3b5e8b2087bfa61c29611a4365e5fd958596f
 DIST libkcompactdisc-21.04.3.tar.xz 97152 BLAKE2B b91e174c465c4492afa703b7fd2f33d31e175690fe9565f845dc2cbe6888c0b5c326d1056b16cd25944af00138094cfd298f5a49e61aee7b93d4d210cec44ed0 SHA512 d41c7782740255ab5e641f22abc3b821506a0999be023cdfbe02faf081227255a4a53c6776463d8f912e268e8dd09a0c99dad20c842a8550085c499fd65caa9c
 EBUILD libkcompactdisc-20.12.3.ebuild 637 BLAKE2B 2b9d6632251a8b3e5ffa438ee206003d4f27661d69ec002ad5f47fb110170419b7fadafc17da866cead42512a7ec59c07d5323e4394ccc6fa0fab954f1762bb2 SHA512 737bcda4b8622cba9b740ddc74ec8a08fcd827002156a80bf88ecee98cd427b2ad9b079c6dc2706d309d453526b812ac57af22dfa75be0bad0931cecb92b4957
-EBUILD libkcompactdisc-21.04.2.ebuild 599 BLAKE2B 812033d1cf320bcc516258c635d26851c83849476a203213b20124cd0d364e9e3ac3fc010ca9cce6a42b1b5821d9c606f3d42be2dedf405bde59150471e7754f SHA512 68baccc39571db5c4b0d59de5ec0dfd900d3d45accc9d4dd371a70ad925277855b5d2d22d9339e6f5c5f0b274b00b46ed357229dcfd39984f8d18af563fd98e9
 EBUILD libkcompactdisc-21.04.3.ebuild 599 BLAKE2B 812033d1cf320bcc516258c635d26851c83849476a203213b20124cd0d364e9e3ac3fc010ca9cce6a42b1b5821d9c606f3d42be2dedf405bde59150471e7754f SHA512 68baccc39571db5c4b0d59de5ec0dfd900d3d45accc9d4dd371a70ad925277855b5d2d22d9339e6f5c5f0b274b00b46ed357229dcfd39984f8d18af563fd98e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-21.04.2.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-21.04.2.ebuild
deleted file mode 100644
index 3bc6c48ff948..000000000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-21.04.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for playing & ripping CDs"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="alsa"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index 2a156cee5098..bfa972c15f71 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,7 +1,5 @@
 DIST libkdcraw-20.12.3.tar.xz 41956 BLAKE2B a8923c7430bfc0d309abaf3381edb55905921c205e3dcb736b56d7ef54f9249d8bff49b3724fe3a4ca51863ae257ffd6541a3cae1712b59bc887c8cb8aebdb69 SHA512 a1b89a1c4732958c4432830e5b0ff10cf447c702740d43d70a0530e04d5ca8efc3638a41dc74d7280357af867a0443e35c0ab758e1ed6fee22695aa4551ea039
-DIST libkdcraw-21.04.2.tar.xz 37188 BLAKE2B 186dd921f036dd377d79a558233ffe0ec9ea425f65a47eb0277a07b4683c8461376a98c1a23b08d607707bd29f587e202354436837d935e3e7d6c853aa6fbfeb SHA512 b4e3e06ab9e3f4384d271568155e0fda15921ac0916d77a5b0327b1a9f456877f50c2284be39c5b6b0f7d6282bf05feddca4f9b91e60c627c551e53ca9cfff47
 DIST libkdcraw-21.04.3.tar.xz 37196 BLAKE2B 22ba77fcd4c2e645bbcf9271f63271be34fc33b6e35210dce5532be32ce59789b31b171dd56a2b0ede86ea783265a9cc273cc76c5beb1a4a473a863536f21824 SHA512 a319fa7cb1b06054bd43201faddc251f9a35bc0c10d71c06c0e1dea8db90847c68ec20653373e69df9c2fde7f899d0ad62ef3635ded3aba8bb379594862fc611
 EBUILD libkdcraw-20.12.3.ebuild 358 BLAKE2B 5c10569ee6c391389ed343beb5d26c64ffefb91eee8970f75d2469e247b7dbfd4075279b9d828d0057078680d8f0d6a0f46e3e3fb0719825b81eebf3a2b7ec3c SHA512 1e09358a49a44381be56393567f13c3e3263442c3db985c27ea4df851c4cff3839965571c965cd1d7d54e142ea691c458f37f8a80db183f4cdeaa707cde0da47
-EBUILD libkdcraw-21.04.2.ebuild 361 BLAKE2B d6a5712461a844854768149e6e83e231e9e36e6a0b624721d89c1862de0a1ec2ad3bd3654ad2879fc7d536f17965b610561d8b595f6009c885416699c60cd2a0 SHA512 ddcdd22116999a5328f2f51af1149981229a2d91b390af96c4db6aafbb5c8ada9c699110b98b7a81bb3209fc92b2718154857e305961363ac7486e0a07ca5de9
 EBUILD libkdcraw-21.04.3.ebuild 361 BLAKE2B d6a5712461a844854768149e6e83e231e9e36e6a0b624721d89c1862de0a1ec2ad3bd3654ad2879fc7d536f17965b610561d8b595f6009c885416699c60cd2a0 SHA512 ddcdd22116999a5328f2f51af1149981229a2d91b390af96c4db6aafbb5c8ada9c699110b98b7a81bb3209fc92b2718154857e305961363ac7486e0a07ca5de9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-21.04.2.ebuild b/kde-apps/libkdcraw/libkdcraw-21.04.2.ebuild
deleted file mode 100644
index 0a3e859dbc8a..000000000000
--- a/kde-apps/libkdcraw/libkdcraw-21.04.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Digital camera raw image library wrapper"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=media-libs/libraw-0.16:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index bc16755f4671..1e3d58ba966e 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,7 +1,5 @@
 DIST libkdegames-20.12.3.tar.xz 6389576 BLAKE2B 9d7be68bc6509b99abc5b4a2b06edfaf89737fc589c5503f255560b9cbbf8c00862fdd10bc1d3cb557644b52a0b251ddab81a3104b996e092a2656f171f115fe SHA512 a9b02c395b8e025f68b43f7bb5219cc3407ce6bbf9342c1542c53bf80881354f5410820f3f97dc496cdbc7dbbfd8c72e15b0fd07ea504235f40c9e3cd4123756
-DIST libkdegames-21.04.2.tar.xz 6404416 BLAKE2B 8e5e28568eb8cdfeecb5d78c27de21afc980e4a33f9dadcebb5c5280aef9f739156a5209eb65ee979be14678486ca68962217c0cababd7c5e05afb9741384ef4 SHA512 1a5d355de935d7be983efdeb8474df2adb6d3c0a51344b4ee6f726e378b3e73d4b0ac4392bc6f17ca3ed5574f8c3182fc071afd483ba489a61b13875a9eb8557
 DIST libkdegames-21.04.3.tar.xz 6403228 BLAKE2B b6b14dfcfee44ad65a58c1ab5bcd975289b86bc8dc7e5cb7867f5d0c0b8e508b620a568840dc2548b65c33c2e81b76a32ff3e411ffa669ac6bd9cdd79c2aadce SHA512 f50b20e9c62f80ab76e87ade191ab45da06fe4113fd2f6a431b926a7d6d0fd6f111258ceeb793dd2f6831f88f2ed436355911d7ed6ce6935d2de65f56cb82111
 EBUILD libkdegames-20.12.3.ebuild 1470 BLAKE2B 0b82045f8fd46874203a5017798bdacbdb43c8b0035b7e46bbf6001c43d277fefe2f6551688a3e72da2683f44e1c27d1eff75fdc02673893758178a589647b84 SHA512 edfbb4550e1b6d4173307e8425df5285e733e901e4a4dd13838479a09837192b3324f698f56630dec7f35bc65078e0621ca4a8013b2c01f6c63f8afc319b5301
-EBUILD libkdegames-21.04.2.ebuild 1473 BLAKE2B 887478cc6bceede1de0a587ffca30cdc5a9e88496a06b71f815411cc3a8b167cfd2b40c84429f055f8311acac048cae2e854c7d1a1441ecc9ba089e8f2d3da67 SHA512 dab8a4eeec25e692286306ce385ea6bd2de2588ed2fd090d6b22212221e9659e19a9d1152e58df14e2f78a689780e53fda81bf43da07eac55ba6f82778bc0b79
 EBUILD libkdegames-21.04.3.ebuild 1473 BLAKE2B 887478cc6bceede1de0a587ffca30cdc5a9e88496a06b71f815411cc3a8b167cfd2b40c84429f055f8311acac048cae2e854c7d1a1441ecc9ba089e8f2d3da67 SHA512 dab8a4eeec25e692286306ce385ea6bd2de2588ed2fd090d6b22212221e9659e19a9d1152e58df14e2f78a689780e53fda81bf43da07eac55ba6f82778bc0b79
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-21.04.2.ebuild b/kde-apps/libkdegames/libkdegames-21.04.2.ebuild
deleted file mode 100644
index f654013665a9..000000000000
--- a/kde-apps/libkdegames/libkdegames-21.04.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Base library common to many KDE games"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 7d2cad5aadf3..586186eb1fbe 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,8 +1,6 @@
 AUX libkdepim-20.12.1-unused-dep.patch 1208 BLAKE2B bf799fc0c6fae2c87761a02a3c3fcd0829901bd264aa818e2b0921d7f1f7ddb3ec687daa93941acb9ee0a2019495455e150fd8e3b32daf2086af10e0c3d0e393 SHA512 55cceb528bef90c9f5352c1e2f8a04e5a2cf2652e6cc36240498fb899829c4b212f8768c5f451e1f342348f360ae4ef3018eb3ef637521760dce4fbe4ca6e645
 DIST libkdepim-20.12.3.tar.xz 238528 BLAKE2B 4187e09fd31348d4c0d8feffa72e394d7777af6897cf80605cea7d3672acaf651fd0646378c9b9c87469a66cfb9475ef2a06f5395e28a9cc5a0e2a9697f97b06 SHA512 9d491c72cc5ab5745380b3381b50a7d2e94dc6c5b8d52fa36f26d8ba7666635a97b412294211f7dc032d5aba5bb4ce97d499e22218f11cd6f723d051e452fd74
-DIST libkdepim-21.04.2.tar.xz 253868 BLAKE2B 36ed8d0359f398f2100af438de20ada55a8029b52aadf373190cdd7d82116650ae1f83dd232d675a451d0d96b7a634247db93003bac3d37acd8ca81cdc1e9fcf SHA512 6053fd66f36003f6fd8a6c65539f96588a0c58e02d756bc5ee9c3aebeaef4f177d6c8704bd21062f02f5e8e6e70bcd7c203c1ecebbc516eab24e4281dfe4b651
 DIST libkdepim-21.04.3.tar.xz 253924 BLAKE2B 13324c2e931d81ccf8a4970551f636654c9ebbadff353ea33c5308c61838d6575cf5924a693f65c984bdad66c4d78fd6e73e1ec5100665f5b5e565843f090848 SHA512 79cfe0aa5095246d407d697e05916878a74cc021368f4385ecbd4c92dc87a43b8b001ace84b3f40752d549de1940f65acfe709da4171e2a3a21a9c335c090bac
 EBUILD libkdepim-20.12.3.ebuild 901 BLAKE2B 1668c8e957ea6ef12a6dfb96b8db7d21fd0ee8910334c06f2610dcb09f6a72473ffe422ace04d8b413929a6e2525adf0617bdc05e853ab10ac87e87280623167 SHA512 9bc5216a70ed4309a47cb4e8a31e8423449312ab26fab8e80e0b48021c5af02ec6a26fbc61110dc01804bf8718dbab4ffd1d948fb1ac3384e6abb33a5ddf2564
-EBUILD libkdepim-21.04.2.ebuild 846 BLAKE2B 3c7624d98703c106b33a6dde17c0ccf0200945f7ae057cebfb291315373f234c6c7abdd2ace6112f10ce5b24775c527e97d455a649902e0ce2183b5b0c816f3a SHA512 5bc2b75f21b0d8519f6f3230aaf90667a5cc4e594ec1958ce22562725a8530f4f506167b026335d4490db3feea29a137a3ee42c5ce7fdc6c05d78fb15ffea3a4
 EBUILD libkdepim-21.04.3.ebuild 846 BLAKE2B 3c7624d98703c106b33a6dde17c0ccf0200945f7ae057cebfb291315373f234c6c7abdd2ace6112f10ce5b24775c527e97d455a649902e0ce2183b5b0c816f3a SHA512 5bc2b75f21b0d8519f6f3230aaf90667a5cc4e594ec1958ce22562725a8530f4f506167b026335d4490db3feea29a137a3ee42c5ce7fdc6c05d78fb15ffea3a4
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-21.04.2.ebuild b/kde-apps/libkdepim/libkdepim-21.04.2.ebuild
deleted file mode 100644
index 9bd22162aeee..000000000000
--- a/kde-apps/libkdepim/libkdepim-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index 2ffc7295c806..66a45f8a67a3 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,7 +1,5 @@
 DIST libkeduvocdocument-20.12.3.tar.xz 211096 BLAKE2B 64b89f8f1741632d96bb6455133c2c513a46a1870f5feb6679a22e37a7f760133320f074d5916a17f2bec31faff42908ae5df5ae5ff393540a47c8b512c399c2 SHA512 6ae7dfe1e22c0d412efe3c2d10f879b2fa9f853c4f9bcc41a86f4ad0d6031a8be57423cfb7b8badd666cff7666cfff535017882231d589e00d1ceddca6c59684
-DIST libkeduvocdocument-21.04.2.tar.xz 217396 BLAKE2B 6ee9af98cced5583f26af4da7e8385d8606b9b7d857acf7c87ffea322be2c58c57d53fe8a3a1b2f720b1330ec33f186b97d322b1f5e7a424db6f79f16ff85874 SHA512 bb6738a88fd105c013e799b8e9501a10d0f1963a39153b7e2b8975bb9d29e6d1a3153689df84967c8ab283c9ecdf370c0d341da949f843fa28e0578c851f0a14
 DIST libkeduvocdocument-21.04.3.tar.xz 217404 BLAKE2B 5751b9c6ed0cb7242d4a3494b3746c5c02bbafa5c63338c7ff6395e58d8eae5035687b3690e28ff34b9642c43280229c0012f24c5a60a3799d4770e1dff45bcb SHA512 24362a485cbd4348a40b2d96c51756ce7f962ab7e3c156d68fe1026f83e70a23f6c52907fc10a4bd74d4eac0ff7f2a9163bc03139d820a61c142e40855ff31b3
 EBUILD libkeduvocdocument-20.12.3.ebuild 505 BLAKE2B 99872f55f95ba8cace7444ba387e4785e3edb0fd4a82289e512522a13bc142c873e5a3bfe6a34b17adfe3a10546ff1727634d11a0b9afc1a4a92d442c386eb92 SHA512 bd8b6d8f9cf32a745e231b4d4d0c64bf08a59e7890384e278728c7eadc0fc1ac5d5f32073dbd4dc6bbdb759811fecafd9c50d25244ae818f8fd340a9cc2a977d
-EBUILD libkeduvocdocument-21.04.2.ebuild 508 BLAKE2B 9500bb0eb0c0f13eac498090e0582d5f3f685d3410550a7e0f5881f9159bf822c16a23e82028313349a7e5dfdd652c522473778cfedf829347111da278dc163a SHA512 6e140c6197c26cb3049b33f2c7c97bad4644af840bbac8a99bc7e1152eefb7010395b32878d8f79a3c367549e485b14318b319034bdc02d6f2d208bf0b6fd3e0
 EBUILD libkeduvocdocument-21.04.3.ebuild 508 BLAKE2B 9500bb0eb0c0f13eac498090e0582d5f3f685d3410550a7e0f5881f9159bf822c16a23e82028313349a7e5dfdd652c522473778cfedf829347111da278dc163a SHA512 6e140c6197c26cb3049b33f2c7c97bad4644af840bbac8a99bc7e1152eefb7010395b32878d8f79a3c367549e485b14318b319034bdc02d6f2d208bf0b6fd3e0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-21.04.2.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-21.04.2.ebuild
deleted file mode 100644
index f231af33dda1..000000000000
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-21.04.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for reading/writing KVTML"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 8d48709a6dfd..6b8da12dce86 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,7 +1,5 @@
 DIST libkexiv2-20.12.3.tar.xz 64724 BLAKE2B 1534d240592d3ef545e48c4d1f00acb40a556966dedfbade2a683d2b4f53a1d7b943cf623b64746c90fedd36bc8f650e0c80f2427d44fc68d57fcc4dd1884069 SHA512 35fc12b5f1dbe8aa533370627529eb46aec05085c71cd5dc2858fa9b52413afd5d706c099ec2e74e7827bd7f5fdfda323e1475b599ab67fe78a4a5831240e217
-DIST libkexiv2-21.04.2.tar.xz 60268 BLAKE2B 57b2c80b3d7484c1030f2a267353383b084346cbd07f4c2f87a0e73efce4719efec5e2537e44a3ca63e9244632682e30b32ff90e5cde4ba278dee6481325d386 SHA512 4f17360723169974e93e176e9576afc9ad2ded93e289a764c286b86e0a75cb08670d7afee107c1562c7e3435f86e6de2f258562db9f84b84c0cc1606b5ce7c42
 DIST libkexiv2-21.04.3.tar.xz 60268 BLAKE2B 1f6210e20a701d87250b465658360cd5fadbda006b9604844c5af76b841a2b25618712c66d934d964695cc83952c346a4f9c2439a976ef03b1c7767ae3945a45 SHA512 0295c1b88744f350846ded713943733de6a0e1d4b2d92a09e1a44af57bb94a62e63420b9c911dcf0e3ca89e7df22a3424981ee38d8f4a299cdd437ea3f12bf6c
 EBUILD libkexiv2-20.12.3.ebuild 354 BLAKE2B 58e5e1fd50812ee00c510086a5d6cbdb6ed59b72b7ba62b18740528225fbb4dd0de719e0d0d28949f6b9c8def55b2472c78d27c01f452fa956125ba4faa6475c SHA512 ab11ef2335831ee5d900e9325ca9221b506e1785dbcf5b72851d069983ff67cae4f301e6dc56bf2c18c227a97543089f8262bd02ad249fe9b8498dd54b8ea52b
-EBUILD libkexiv2-21.04.2.ebuild 357 BLAKE2B 1e0eca09926de3a29ddcebce0415932861933095171666626addda7fbe327fcdbbc0b77b1defe833db88d122209aaedb4adf5dbf578432a76dda83ce7585c3ba SHA512 9788378312a7335e69df548700ff41fce5d8c64e05e05e8562874e6c8f2902546317dfdc3f13c0ded7bb9a3358c6b017c16b94202b0352e4480f7a2af10faf0f
 EBUILD libkexiv2-21.04.3.ebuild 357 BLAKE2B 1e0eca09926de3a29ddcebce0415932861933095171666626addda7fbe327fcdbbc0b77b1defe833db88d122209aaedb4adf5dbf578432a76dda83ce7585c3ba SHA512 9788378312a7335e69df548700ff41fce5d8c64e05e05e8562874e6c8f2902546317dfdc3f13c0ded7bb9a3358c6b017c16b94202b0352e4480f7a2af10faf0f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-21.04.2.ebuild b/kde-apps/libkexiv2/libkexiv2-21.04.2.ebuild
deleted file mode 100644
index a816779c1252..000000000000
--- a/kde-apps/libkexiv2/libkexiv2-21.04.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Wrapper around exiv2 library"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+xmp"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=media-gfx/exiv2-0.25:=[xmp=]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index d61d01acb16b..078e042d0f7f 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,7 +1,5 @@
 DIST libkgapi-20.12.3.tar.xz 246100 BLAKE2B 8032ac37f983c14e16c37279bbe14718cbf3ff5123db01dcaaeef2fc5b67454ea638df44b668f92f9c00a3ee8578d9b5dcaa00604ecca32b0b5ce14d8a81015a SHA512 5376773bdaad0970abc1a9fd43fc904eaf39601c56fc626f2d08fed5b2b48ee0df79c18a33d9426913efde048642b4ced59a29cb5532a0e4661e565beb30283d
-DIST libkgapi-21.04.2.tar.xz 249556 BLAKE2B 2ef2e093792421db870c9da0c2b49a892ef77aa74e4babcfabe4ac098df1107da09e22c52a5fb5722522b22e80f3a1ccaea9f0da558d03219112ad54c758e7a1 SHA512 64c565288ceaeb5eb1039b28cbecf25f68aed9f562ed37e874194bdea899944eaba1603a977ff5ab07c3ca01c178dcb1abadf5172989a694b762e639f49ce428
 DIST libkgapi-21.04.3.tar.xz 249512 BLAKE2B 06a43e967073057914a7a5d679b2c3c3bb3fd9171a49f773ba3b4d75a71807869766f5aeb6003d1d797f22fd0c0b7be4dcd95f580228d6909f05158206706d4f SHA512 24653e1fa0b5c31378d69a5a3e59d83c82d4e3d12469a062318a4140474a555a71b873291edf6313acf995cadf46ad2581cb8017abd2223b125d31c9a124bf8f
 EBUILD libkgapi-20.12.3.ebuild 760 BLAKE2B 9d3b7ba26dec2806dfbbc083eb5ef4924b900aac5d25b9b297bf96b121f6d0f3065cebe1e5fa93e6912cc9d474145a4aa97559ed066020b6a58f02ba320a5f06 SHA512 f2e578e67177d5fee67e91a762c8edb318f7784a525454e4f365c54a19fa27f325a13345e1e4c2b22f034facbdfd39fac63d42d07bf9c69ab6f5324cc5162497
-EBUILD libkgapi-21.04.2.ebuild 763 BLAKE2B 54da50c1037dda477ed5ffcc4d7e5ec92773e5646851a17bb9c6e320676d3556651c1559d855513fa902807693383c35b9c73244d38d36e1c4c763ee8dcfb356 SHA512 613dd0c36357fcf9992a9ce359c5ca2f10908e46e3eb6b8395b832d01a82c9cd0d60bcd8343696f0b5dd1198f75e8d50cce9e6dde28f97bf8cee3800bf756a91
 EBUILD libkgapi-21.04.3.ebuild 763 BLAKE2B 54da50c1037dda477ed5ffcc4d7e5ec92773e5646851a17bb9c6e320676d3556651c1559d855513fa902807693383c35b9c73244d38d36e1c4c763ee8dcfb356 SHA512 613dd0c36357fcf9992a9ce359c5ca2f10908e46e3eb6b8395b832d01a82c9cd0d60bcd8343696f0b5dd1198f75e8d50cce9e6dde28f97bf8cee3800bf756a91
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-21.04.2.ebuild b/kde-apps/libkgapi/libkgapi-21.04.2.ebuild
deleted file mode 100644
index f5c38dfc608c..000000000000
--- a/kde-apps/libkgapi/libkgapi-21.04.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	dev-libs/cyrus-sasl:2
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 0d67031dfa5c..e7a2a53c5b75 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,7 +1,5 @@
 DIST libkipi-20.12.3.tar.xz 103628 BLAKE2B 72861287160fab80538784cc1ced1ce90a5907776aee917723d38565a3101d2480db7894f884b2d69372a985a14c72681c5659bdeb61909850feb91dc673963d SHA512 fde2b5026423b39a55e182a85ac0f1c8ab187ee24a68bd5840f1acb9ce16cb6b8fd633572f017b2f8416db598679f0b2022338a91c3a027f918fd59928f55368
-DIST libkipi-21.04.2.tar.xz 103424 BLAKE2B 1a1ce5368339fea329f74e8b344b9f53634fb9e1bbda2e3a6e9f3a31ce9e15eaee09dd2065ab9fea1d626ad2d78a1912669127afa9511010d499a722933ca078 SHA512 9cfebd6e911bcf3cba853e869ea778253a4c48c9814227f103276eca2c983a4a40ea937f9e4b31ddabd0ccfd59a3181fe2602a65554458eb5e157de4929df979
 DIST libkipi-21.04.3.tar.xz 103416 BLAKE2B 9459a2d9d2054ca53e2ff224334c4eedc5601b23c84b150a6dff6e4f88b25285315eeb9a2cc1d4e844c95d545368e2e98ba10d9f614ada9b4f206fe9e3abcf66 SHA512 5f94cf57da4578d2be02947b7e67d7e8b580757d78ce7de5fc08698c9a8dda2879af3486d0f40504a25b40b51bf18658f39b3ff38e4ebff33aaa18a249983a71
 EBUILD libkipi-20.12.3.ebuild 569 BLAKE2B aaa6a7c01a40ceb33e41bf7997c6d9bd153489947bd0625de2d12ebd712eff2b55d3375de815bb1b19b7db9bd0143ff5097102a4320f51667d978af979bd664c SHA512 9183639803c519e77117224655dcc4538b515c90ad4aaf6f1f2b715efd57424516f022d212451e90842606ad54f2c89a3c9445b085f7087bcdefe5cecb3028ad
-EBUILD libkipi-21.04.2.ebuild 572 BLAKE2B 37680df8559dc294621feac1f0cb3563582cec63828c4a5462fb827e2e83495ce139e3ff83868339457eecdb7697207cde767f2a8b3cae35092f0a72af7e9ad5 SHA512 6b8f29dd196104bfe35591bd95192e7a20e764098e76da0e566a787c96d3545cb6b3984edda44c15039e54873960cdcb5520f10f01065714b7d020fdf7dc4753
 EBUILD libkipi-21.04.3.ebuild 572 BLAKE2B 37680df8559dc294621feac1f0cb3563582cec63828c4a5462fb827e2e83495ce139e3ff83868339457eecdb7697207cde767f2a8b3cae35092f0a72af7e9ad5 SHA512 6b8f29dd196104bfe35591bd95192e7a20e764098e76da0e566a787c96d3545cb6b3984edda44c15039e54873960cdcb5520f10f01065714b7d020fdf7dc4753
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-21.04.2.ebuild b/kde-apps/libkipi/libkipi-21.04.2.ebuild
deleted file mode 100644
index 07e21570c664..000000000000
--- a/kde-apps/libkipi/libkipi-21.04.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="A library for image plugins accross KDE applications"
-
-LICENSE="GPL-2+"
-SLOT="5/32"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 1832bc20d414..fe0d03abc104 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,7 +1,5 @@
 DIST libkleo-20.12.3.tar.xz 358540 BLAKE2B 393da453f558670d448304f79f381ff948664422bfc49f89e706fe4e70b0b2ebc46eeb3b5039718c1822e0815d0fc08628ec50327d3e408077351d8f675f8a43 SHA512 006b6074f6e77fff1e95be7ea209042306b5dfbea6e99ee0502e78cf37709e1d8e4e02deb3011a434712dd98d62b2f1fdb5bf9140913def8075ca45e67e45623
-DIST libkleo-21.04.2.tar.xz 384148 BLAKE2B 318d9908c65c6ac5da4fed8098a69026b9b0d86ba36fc4aaaffa43220b8eaf753bbe9b12d573c932051374274f6e19d68935e5ab19cd5c687ab6d42e9ac31001 SHA512 3f4d54f3f5bd109337b2687ebdfdcf0c81e37bf189eec5b5b9c32dc1670dceb5cd2f78f362a2efc3be0f81b3fc086cf72d0cef7eb413a7984b240563637f1636
 DIST libkleo-21.04.3.tar.xz 384252 BLAKE2B 7ce806619ca1f83f3fda727d219e58d34234afadbca38ad8540c0fc298632202627167a6feb446f0e658428f3db3a914e92f05500f9593a4c8a6cd5f802e94a6 SHA512 3f302d11ff884901c880d9732a06128ddd22cf525b0ce9f3a3da179cd9543b8b3878fb508863fb4aa80f8591120485da08e5b55f7de4da9faa0ea50ba7d1628e
 EBUILD libkleo-20.12.3.ebuild 960 BLAKE2B e712e645d3daeaff62bba6ae1f933c4fc0dcb18cde123379e16bb0dbd79a11b21a266b3ce0f54208416b846762917bc2315c16bafd798565560695354a4ccb53 SHA512 aa13eb3f1e40d070e447324a17052a6051ecd5576234dcbac90a85ebc6cd2200fdd686ca525b7245aae793987f95b5e6af15a193e6629c1a7f6ac02c75c4dddb
-EBUILD libkleo-21.04.2.ebuild 963 BLAKE2B d7160023edb697767c5f8e6e5475431cfd17664747e45a9ce59f16a591b0d580accdc582dd757e3bc5f8b9c250576da622a6aea5859ea8b15ebf49af1ceb3fe2 SHA512 53e591f4714fdd2fcc9f01227096de735052255da3d39f54a5c73dffe37b792f2fbab223811eaaaf033c5318c4b10ec8489c5a35f0e9c290685d26789d201034
 EBUILD libkleo-21.04.3.ebuild 963 BLAKE2B d7160023edb697767c5f8e6e5475431cfd17664747e45a9ce59f16a591b0d580accdc582dd757e3bc5f8b9c250576da622a6aea5859ea8b15ebf49af1ceb3fe2 SHA512 53e591f4714fdd2fcc9f01227096de735052255da3d39f54a5c73dffe37b792f2fbab223811eaaaf033c5318c4b10ec8489c5a35f0e9c290685d26789d201034
 MISC metadata.xml 368 BLAKE2B 971372ca098974cb69299f52e0b44e479517a0fb2f70b6c23fe762d93675674d62e46d5d4faea403edba12828ffc0c32fa274d287d1c71ff499df69d2e52a2d3 SHA512 dbef1e7970af1f4cc05ea180f5beecab9288d5502c365d2dcbdc418a67868baa9245bae8ae0c9d637ddcb3f88a03061285fe144a3a117c722654045fd7a4a58d
diff --git a/kde-apps/libkleo/libkleo-21.04.2.ebuild b/kde-apps/libkleo/libkleo-21.04.2.ebuild
deleted file mode 100644
index 46f818e5afda..000000000000
--- a/kde-apps/libkleo/libkleo-21.04.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for encryption handling"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+fancyviewer"
-
-RDEPEND="
-	>=app-crypt/gpgme-1.13.1[cxx,qt5]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index d9a029e796dd..e7fab06dc6ca 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,7 +1,5 @@
 DIST libkmahjongg-20.12.3.tar.xz 1691308 BLAKE2B 0d845abaf8878a09ecd00f2cef0a89861f3bbf09f4ad793fb1316c8bbe570ac23ced668e3b8ff1a0c0f5a39cd3146e15c64e4539e85d55bc1638c9ca914c741e SHA512 c4e35ec5f60ab6c401ba278e69ff2d46ccf16fd6a5f88b1dd1fa4914c030c52c7a055e473a9fb14e87ce0ca9ba36d2229ff57fe985bb9fdff29285d43e98df0e
-DIST libkmahjongg-21.04.2.tar.xz 1680868 BLAKE2B a5dd118a5f6ff13716ca9aff92ec196dd120af28874d0430d4a67ebf2df2a6a5ab958ee9f5bb0936725d9d2791a4505650f6d35b4fbf671d177bdae4ce7fd355 SHA512 a338489b691cb23a6c0760fc1e0541b6ad1fa9e7edf19cbbc442bd68b2736d2b6e0bc6f6e9ba730c308c9dd75343f7493c5774a0ac27375e2164c3045534e5bc
 DIST libkmahjongg-21.04.3.tar.xz 1682112 BLAKE2B 284c3595edbd06bbb693d3cce2b068d8e722df348c83e423d599dcb1df2b057b2d47f0720ba9bab1a4388f966ab8ada77d820f5406971be51f10a565ad7a3810 SHA512 30b8a488f2dc50538ce0177807d5982826be121cf36fb5134bd94e9df66babdeb532f80a50abf2caa250252531fe3877c599f28c660c6fd674a8cecf655971ba
 EBUILD libkmahjongg-20.12.3.ebuild 652 BLAKE2B afea68c16ce20b31b5253d6b2b6d6e09089fb9164facc9337fcc2e84e587520563ea0782243ad753304f0c8ce6142a74f6d056f24234a49346eaf473207c9827 SHA512 b3ac9074e836ea56aa6fcd5a9b858d0f68b378b00c66ab0cd6de165953f900c41d7f759cfdc23680b4d1c34241f974bd4ac0807e8768cee37d580d2a2d8b41fb
-EBUILD libkmahjongg-21.04.2.ebuild 655 BLAKE2B b03ede3faf8a019b812a0189d16ba9e835fda57ed9b5281f43a887d97acd968fbaeeff27f8fa8fd233eab7098227892a8d99f515e6f079de3ccc08eb259b915d SHA512 68fbfb2a5acb3ed6862164277684263c8154cb29fa5db7ac181159ae5cb233edc12f2496e58e4a60f41957fb72cfab83775e9b97621e90b0bd392d24d9dc8df0
 EBUILD libkmahjongg-21.04.3.ebuild 655 BLAKE2B b03ede3faf8a019b812a0189d16ba9e835fda57ed9b5281f43a887d97acd968fbaeeff27f8fa8fd233eab7098227892a8d99f515e6f079de3ccc08eb259b915d SHA512 68fbfb2a5acb3ed6862164277684263c8154cb29fa5db7ac181159ae5cb233edc12f2496e58e4a60f41957fb72cfab83775e9b97621e90b0bd392d24d9dc8df0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-21.04.2.ebuild b/kde-apps/libkmahjongg/libkmahjongg-21.04.2.ebuild
deleted file mode 100644
index 40d7c1e58a09..000000000000
--- a/kde-apps/libkmahjongg/libkmahjongg-21.04.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index 0f9edb510229..80ff2fc44896 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,7 +1,5 @@
 DIST libkomparediff2-20.12.3.tar.xz 159344 BLAKE2B 47c64009b1e401cb762e249468934a49be28663041bd6d37fab1db11224aeeb82e09581b53d819677808bfc7957c783c120b59998041c61397e3346b283f5d85 SHA512 5b790d2c0ce5a73f3b87711df7ee501122e5672f4985487436968791e6bcc8a771093e755c7cb58fb4e589e50422be9b404438ab706c60e5bd88edddfa289618
-DIST libkomparediff2-21.04.2.tar.xz 172136 BLAKE2B fcc99e9cfe8022d5577afe01c32739c0a608c7eea62c94683269776d6fbd78c5d4d662773a9b827532c6b3e22444602f7e3d81e569eb4f4cc95523a9f69fbb9e SHA512 f50a86af2824cd267b3b1dbc31bed3465acfa8c19cab34af60596bbc11c5f702243e6a0c251ed809fea0b4ad0680bb0e7a7b86642370398cbc7487d5f59a52f9
 DIST libkomparediff2-21.04.3.tar.xz 172344 BLAKE2B 91fb20a0dbb69b3468092fc04026edbe86e0cad1c921638b6cbb2a05696c1fbf79e9b91844e492a7b2d14b3451f569ed39fbcbf5b6725fd0af7fbd0c647995a8 SHA512 51b7f092c154ee557a512045a43fa83229da5586911ee5c6cafbcb679a69d74d2fd76079ae91145465e6ed52559cfc70a22cfde0043db4a14f890d8a2818dc7d
 EBUILD libkomparediff2-20.12.3.ebuild 660 BLAKE2B 650e1ce37f9ef64f19f017120d5f75857e459fe2b6ee7d2183b4f5fdf1a0f55a864abd81a21d7bc06b51f0b89469509a0a2d68d19e3d32d3ac56ea7a3617f242 SHA512 48d4075753d4065bc5727f774ba424c771abae636c9f6f8cd881ad83c9d2a89be3997e538016f15569b5ca1449fd67c46ced07e390d1bd294cdb13592eda23b4
-EBUILD libkomparediff2-21.04.2.ebuild 663 BLAKE2B 9bf3a3db9625e9501e2243e20d8a661a0bcbb020d92968db3bd88a8dcbc846a2355718449ce87b180854981c21d85f97d2b207aa495b9c47e193b2c53bd4c618 SHA512 bccb72d519b6cca731b992a0248aa925f31521533ae50bf6edeecd8fd73576cfc255d80713b08dbc546608bc3767ba36679e34ed557a16655a4bd0e2e4b742ea
 EBUILD libkomparediff2-21.04.3.ebuild 663 BLAKE2B 9bf3a3db9625e9501e2243e20d8a661a0bcbb020d92968db3bd88a8dcbc846a2355718449ce87b180854981c21d85f97d2b207aa495b9c47e193b2c53bd4c618 SHA512 bccb72d519b6cca731b992a0248aa925f31521533ae50bf6edeecd8fd73576cfc255d80713b08dbc546608bc3767ba36679e34ed557a16655a4bd0e2e4b742ea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-21.04.2.ebuild b/kde-apps/libkomparediff2/libkomparediff2-21.04.2.ebuild
deleted file mode 100644
index d77d042bdaaa..000000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-21.04.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE library to compare files and strings"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index df21b04b847c..892004b61b71 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,7 +1,5 @@
 DIST libksane-20.12.3.tar.xz 145464 BLAKE2B ba3cd3dc9120e16b340be16ef9657375ea8ee0e6957b8e4bec0fbc6d137a05f384e7f82148d410aa55604258e6b533018893610c9db4d3d98beb4909ba48b292 SHA512 c0fa893cd8e18bfb9c9372b43378a4cf384984359f92c5a433e0ab78c56c17a7a68927e0492155ed376e82e52127ee8cf077bb36a7feb5473aefbeb2dc62f9f0
-DIST libksane-21.04.2.tar.xz 145380 BLAKE2B 53bc98c4d9f13a99a65bd9cd3f54921f8596435d1ec01662611938efd1c2beba4dd01ec941fb46f8286aa0729ef770534b922b428a2889907a3f61896e14f824 SHA512 d6bcbd6229c0a2288acf1e1fb5455dfdebb8a1f0253bdf8fcc0d349ba6599173156d3f14f259ce99d0088f2f2e51eb251dbb2b920252bf56eb73920db7df3489
 DIST libksane-21.04.3.tar.xz 145304 BLAKE2B 0b6a44aa21591051395a135c37e7635fa54eeb65bb7aee6757db0978da10ceeedc71c6eee0ed881deaa34f01a2c123488ae15f1e528873d086cb0c0183ce6845 SHA512 33676207ceedd6e855c797cb8f2fe35ac920869f4a9e8a76ce4a278f24db32e3c7481071d09ca535c5ddf9641d20a04d8a1899521985c6d25b30b78b7d9c0923
 EBUILD libksane-20.12.3.ebuild 709 BLAKE2B e53b47361df067940dfb8c4a2b038ea0abff201c81d86b915986bf89394a7ee06b3cfd650e294f08d64bfcee104734c53574fd7d8b481255f6339ab525f2d5aa SHA512 f7209bfce602f6947b978626c1e5cd90583ac645e2f5a6dcbe52c3c5f372deb2eca6a4407f50e2abb8468ccb8dfd61cb4c92cc978bfe73c537695829b227b776
-EBUILD libksane-21.04.2.ebuild 712 BLAKE2B 675ca910123c9b1fc7397f97a9702afc1734d27eda18f1dd3f41a032d71903fc031c389a8d4e7068b2b1a1b76ca9301c08fdfb767e474b608b07899786e7107a SHA512 696a94e7c7d8dc1d1b2488eea41ebbc38568bd747466a69b8b27d6a753446b51617b1f8f8b08a315fc2b2a24739163a972b92726a76fb17b380924214e21ec81
 EBUILD libksane-21.04.3.ebuild 712 BLAKE2B 675ca910123c9b1fc7397f97a9702afc1734d27eda18f1dd3f41a032d71903fc031c389a8d4e7068b2b1a1b76ca9301c08fdfb767e474b608b07899786e7107a SHA512 696a94e7c7d8dc1d1b2488eea41ebbc38568bd747466a69b8b27d6a753446b51617b1f8f8b08a315fc2b2a24739163a972b92726a76fb17b380924214e21ec81
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-21.04.2.ebuild b/kde-apps/libksane/libksane-21.04.2.ebuild
deleted file mode 100644
index 9fcf807b7f3e..000000000000
--- a/kde-apps/libksane/libksane-21.04.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="SANE Library interface based on KDE Frameworks"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="kwallet"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	media-gfx/sane-backends
-	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kwallet KF5Wallet)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 6c714467a84d..e44affff3cc5 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,7 +1,5 @@
 DIST libksieve-20.12.3.tar.xz 558368 BLAKE2B 8bec3f84661050bbe67ced76e3cc40d0fd9e05516042c31d3985f8805c2e38f9525bafec684baa6fcd4fc4bed9e56ed012a85968facee49622dabef7d5d7e4e7 SHA512 0782de6b15000e97194c111e6b692721eb89e0414b4e854f8ad9bf989ad03b6792b4ae9af39549521db2f4d4c69ee07508c283f666c74d64ab5a7c51eea3091a
-DIST libksieve-21.04.2.tar.xz 572868 BLAKE2B 4cc54a0ce217c19a99645ca7ed64192f9e19436f11635dd628b71e8f8278cfc2ff935ef4ded494c0b9b69cfecad36436a37733cacfdf9d987c5c15dbac4f4a76 SHA512 d778da3eb9f723d415ea63573345db7ef10a4c7bcb017ea40f0cdc3f83b510d184e963f47ab1befaf776ccd5e4d9a2211572a69351d6c6b79030b0e57df610c0
 DIST libksieve-21.04.3.tar.xz 572768 BLAKE2B 1c27c5187a443d1f27301e677a8832a0999d16faeeca84960c4f7188cb7964f4153a6c90b226f69306a3e723c01c7c6eafede7377b17335f142f02b87c9bada6 SHA512 e4780a17b47fb17a338320a6ab7edf078cf0cfb21709e5ca7c32fe78048ee0dde588039e8fb1dc93f97170d14f7ddafcc3eb50fc59300240773d567ce2390bb0
 EBUILD libksieve-20.12.3.ebuild 1406 BLAKE2B 1aaf734485b7847fcb0082a7fd20cd8fcaa4bd74818e383c602b175b3dfaf60989503e47b846d1eca245895397ac9b4bbcf218cc76ec480bb8ea5f8aa1700230 SHA512 eb534ecbf15581046eb789e8a1c00d05efb639e797712ee82031b166bc8c065ca62eff92e794f90e3e14d4a2ec4d3d8aa0db4397437c5330cd8efb05123422e3
-EBUILD libksieve-21.04.2.ebuild 1409 BLAKE2B 4a1a5582cc1a832df6c8c97fcb3da1cd9f3a98777c5a0f289cfa2ce1a612e3b614b118292e429ef5a61df31494274ccc0cec369cb719673ae687a399226eaaca SHA512 c78c1391716db1f66a9a2b3d173a00ccc7db090f2865490279b6e6f81db8511f1efc0406896778602d420684ad6f1ce15994a6e5d3e82c5881fbd6bbd38245b2
 EBUILD libksieve-21.04.3.ebuild 1409 BLAKE2B 4a1a5582cc1a832df6c8c97fcb3da1cd9f3a98777c5a0f289cfa2ce1a612e3b614b118292e429ef5a61df31494274ccc0cec369cb719673ae687a399226eaaca SHA512 c78c1391716db1f66a9a2b3d173a00ccc7db090f2865490279b6e6f81db8511f1efc0406896778602d420684ad6f1ce15994a6e5d3e82c5881fbd6bbd38245b2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-21.04.2.ebuild b/kde-apps/libksieve/libksieve-21.04.2.ebuild
deleted file mode 100644
index b74bf26bb410..000000000000
--- a/kde-apps/libksieve/libksieve-21.04.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_run_in kioslave cmake_comment_add_subdirectory doc
-}
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 23c15be212a6..ac6b676bb9be 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,7 +1,5 @@
 DIST ktnef-20.12.3.tar.xz 299852 BLAKE2B 3ca027e7a7156215b4399f4e0e41c725c481802ecaa980b801e619447c59820b5d15f950bf6c4478daf1f5e389f1956d60a6b475695ebea05e9af86e1d3be61b SHA512 b6173d2db8e76060c470bd1cf4679d1763d586dad5d84de88a64b744c499901322f09548efa6cafd857680a491d18a83912c80da3ebc1d349a683793368418ec
-DIST ktnef-21.04.2.tar.xz 306360 BLAKE2B e94796e1a27d40860cd0c24f9abb99b7e770af2eea58862f40d7f7e89986804751f67eec7d3707935209c9f5b90c1b28c625024c3a348d69782d622a419c3282 SHA512 4caa7ca2f499b59030f80d225797afe10db30f8d73322a29ba793afc406c8a33fbca49ddfa1feea454898286b52f1fdc43cb92d89cb597d8c55ce9bc90203e69
 DIST ktnef-21.04.3.tar.xz 306380 BLAKE2B 5749d419c1c765f6a47903cec11df336797c1b20c22b72649d3814975cf2c79567eef891223679f8c20ec8b58b652416f544b246f607d87e3396d46f704c229d SHA512 e2d13dcf5ec40f777b88a662c85cccccbebb7a7fe24c980d4faa2ff4e1a9a1129dd59b6e05b2564c6884552541a53f4a3de5456ed1c51574753c2306c70daa60
 EBUILD libktnef-20.12.3.ebuild 545 BLAKE2B 899c524c366a750f1cbd1d1c0437919bc126d2fb7f320537030d45fa128245f9a81b54108647a2c7f7d38d530e3198d401b529b1828020e35f1295905b86eb74 SHA512 d21804eaffabc888b4add33d9ae58bcccd079f7b4ffb91ad6ba06a84baf33f0f6ede16d7482b5af8e9d72d72a2f0cf8bfa09d3daaafabdbbb24d45f2840206d9
-EBUILD libktnef-21.04.2.ebuild 548 BLAKE2B 008f3cf53f7aecaa9624d1bda5b12c756c0604c5f7cf4c97fb046ba51ef4d9bd84e5a92e898794da2839dc5b9f0f2493ad50ad2f7fa5454ade3a8d144f80f49f SHA512 1a49b1c76f543a18882bc835af2a596f834f8d4939f4b2e5498b26922983eca1a423b2737aa12cf6ed84e1b43e9de6405073cadb1d3c0d096125d661e22bb18f
 EBUILD libktnef-21.04.3.ebuild 548 BLAKE2B 008f3cf53f7aecaa9624d1bda5b12c756c0604c5f7cf4c97fb046ba51ef4d9bd84e5a92e898794da2839dc5b9f0f2493ad50ad2f7fa5454ade3a8d144f80f49f SHA512 1a49b1c76f543a18882bc835af2a596f834f8d4939f4b2e5498b26922983eca1a423b2737aa12cf6ed84e1b43e9de6405073cadb1d3c0d096125d661e22bb18f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-21.04.2.ebuild b/kde-apps/libktnef/libktnef-21.04.2.ebuild
deleted file mode 100644
index 2917e8f138b9..000000000000
--- a/kde-apps/libktnef/libktnef-21.04.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_ORG_NAME="ktnef"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for handling TNEF data"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index c7684c389b5f..a8e12676562f 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,7 +1,6 @@
+AUX lokalize-21.04.3-unused-dep.patch 847 BLAKE2B aaa6d5deb07d844f0c25a5d42f8fb3e41bb7ed41d2f7a56154b9218c2265f21d9e169349898278d403fffd91ff9db637b6585ec55524e1c178620d71bf1d9374 SHA512 0c5191a95c333b5232d69a3c3d7b204a6f87fcb4b8a111241ca5f24c8533108a64657759626cf2be5fc70c357ed61f65bb8893dd9a929f455c6597381730f318
 DIST lokalize-20.12.3.tar.xz 1995860 BLAKE2B 1d53d6e99936d284567f48439fc84a95edcc8c971f4732711ea5c45f39bc4a698ba5f7883ad0411e1e069a08d35630f37957e92e1ba11aedc7fb643b4c217102 SHA512 dd12526cbade8a71d0c0a395ebaba50b00a5357c3cdc68779520da1aec7a0dc2d87f29504f45315ccf5108346b60ab0df235a80c000ece9d9f5d434b91829cdf
-DIST lokalize-21.04.2.tar.xz 2023088 BLAKE2B a083f829bb6e3e9ebc233d457a9f28ed8b6d8d51faefc7f7d0ba6818f90d2e396aa761afa739997599404d76c83fe81cb0b79359f484947dfd65409fdce21c7c SHA512 c88e547f0d1e9fe40b885adb453e3bf3efdf72f018cd5b1cad60bdd5323434805b59d8d1c5a32d6f60eae7809841aa45756cf5da89ac3241ea9d3b5536b4c202
 DIST lokalize-21.04.3.tar.xz 2023364 BLAKE2B 8b8790e72e1b4a6e7389adf9577ed1d392693ec14072d314d8c3d0e269a6d40c11acf22537bc328831de9a8e28a6b948fc02ac4956a325b887172e78fa56f9bd SHA512 b336fe464c123b60e4de4ba8bda0f34e2ba5eaf7708879179b9671bc33d8b031f81d595d089c24b4275ea56032e9867653cd98bf21c3d0c3db125564c057e21d
 EBUILD lokalize-20.12.3.ebuild 1973 BLAKE2B 5ae0cbdab456cb1bfb50d5ac3ef3c88d0dcd6d4662fc2a8671f92fd4aa7b4f96c2cab5a016c9548be652da76e38678409830c9a82e898ab8ff272c3ea13d34a8 SHA512 dc59c0bc4fa7f01c2996fd1f907a92afcf8f32dd4d6b5dd55cd6f328f1088f658321798e35ef5403a7b188fcc00c242f96c73f7228ae0b4b2e2351c28d3ea146
-EBUILD lokalize-21.04.2.ebuild 1976 BLAKE2B 73fee3d7c4c2d08110c742e6ef7eed91b7f152e3e439ffb5518538b6d387a27a7656aef7cf8117379dc1ba2271e0a2673cb1ea1b62e98e4be94f5979fcedc372 SHA512 792e2549a4895dd1d903fcacf3037991031cf59db2e7d1ed00fec1d784d190aee5552932e10e9bdeab793a78acfde1db8aee4f863bdc37439627f84030978aa0
-EBUILD lokalize-21.04.3.ebuild 1974 BLAKE2B 2c8834df50417da8d3502558a7d13021fb4e10605eec5debcee71a7694ef6ace6e32eda865a32dc754715251153e94a176873ceea8bf5202f419393cde4333ca SHA512 d8f0000484f4f4809e5437e51dad1a6c49ac915730a05f1de8ebb9b9c7198131d7e78f6212873a47e8c67311ea7e85deccadd8fe567cd6a0abbcd53fefd8e00d
+EBUILD lokalize-21.04.3-r1.ebuild 1993 BLAKE2B 7005ed74730cbe5e4e56247a576d62d111141fdacd0df4c428fcc1128ec009165c6ec8864c46fc3b9603cb266db27064a2263372e85770e33e9207b11525b9a6 SHA512 7fb06b76982bb4dfec2f1c96e582ebea82a350d3e47c79fec9b40446cf8782f5cc162021616fa7513b0bd362b11c97c7c11de9ff6aa8afea9172590a41341b25
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/files/lokalize-21.04.3-unused-dep.patch b/kde-apps/lokalize/files/lokalize-21.04.3-unused-dep.patch
new file mode 100644
index 000000000000..efb230d3a650
--- /dev/null
+++ b/kde-apps/lokalize/files/lokalize-21.04.3-unused-dep.patch
@@ -0,0 +1,25 @@
+From 07fa320da849f9f283ffd707d684e29f1d807405 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Sun, 6 Jun 2021 22:29:57 +0200
+Subject: [PATCH] Remove unneeded Qt5::Script find_package call
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1e95619..10bfd6d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,7 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
+ include(ECMAddAppIcon)
+ include(ECMQtDeclareLoggingCategory)
+ 
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Sql)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Sql)
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED I18n KIO XmlGui Notifications Config CoreAddons DocTools Kross Sonnet DBusAddons Crash)
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/lokalize/lokalize-21.04.2.ebuild b/kde-apps/lokalize/lokalize-21.04.2.ebuild
deleted file mode 100644
index e21c623158ae..000000000000
--- a/kde-apps/lokalize/lokalize-21.04.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit python-single-r1 ecm kde.org optfeature
-
-DESCRIPTION="Localization tool for KDE software and other free and open source software"
-HOMEPAGE="https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT+=" test" # tests are broken, bug 739734
-
-DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.2.8:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
-	')
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_install() {
-	ecm_src_install
-	rm "${ED}"/usr/share/lokalize/scripts/msgmerge.{py,rc} || die
-	python_fix_shebang "${ED}"/usr/share/${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "autofetch kde.org translations in new project wizard" dev-vcs/subversion
-		optfeature "spell and grammar checking" app-text/languagetool
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild b/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild
new file mode 100644
index 000000000000..a93b5b86e594
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{8,9} )
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit python-single-r1 ecm kde.org optfeature
+
+DESCRIPTION="Localization tool for KDE software and other free and open source software"
+HOMEPAGE="https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT+=" test" # tests are broken, bug 739734
+
+DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.2.8:=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_install() {
+	ecm_src_install
+	rm "${ED}"/usr/share/lokalize/scripts/msgmerge.{py,rc} || die
+	python_fix_shebang "${ED}"/usr/share/${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "autofetch kde.org translations in new project wizard" dev-vcs/subversion
+		optfeature "spell and grammar checking" app-text/languagetool
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/lokalize/lokalize-21.04.3.ebuild b/kde-apps/lokalize/lokalize-21.04.3.ebuild
deleted file mode 100644
index 8ee2f89e4300..000000000000
--- a/kde-apps/lokalize/lokalize-21.04.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{8,9} )
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit python-single-r1 ecm kde.org optfeature
-
-DESCRIPTION="Localization tool for KDE software and other free and open source software"
-HOMEPAGE="https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT+=" test" # tests are broken, bug 739734
-
-DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.2.8:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
-	')
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_install() {
-	ecm_src_install
-	rm "${ED}"/usr/share/lokalize/scripts/msgmerge.{py,rc} || die
-	python_fix_shebang "${ED}"/usr/share/${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "autofetch kde.org translations in new project wizard" dev-vcs/subversion
-		optfeature "spell and grammar checking" app-text/languagetool
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index 1a8da9b37078..8e83900b8bda 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,7 +1,5 @@
 DIST lskat-20.12.3.tar.xz 1225308 BLAKE2B 5648d5a4a9c6d34c03c19b2eebd36b62c659b3606c15a04d5dcfdd37dfd6d9f86ecc707c4a86cf1cc15ae29aa2795f8c9dab605c346ca153e3d4c207417a27a0 SHA512 8e06137de8ad315cd0c885c382de0e7f85d76ace3d99a110e7d3f17e9a03011ebfe392c6236a9ca8523079d635421d4fc9fa1bcc0865807fad8a65b1d8093759
-DIST lskat-21.04.2.tar.xz 1229356 BLAKE2B 8f2491a35c058db88544a4b9d6d2b7aeb279ae7661dee94c7b7e7cad6c37b9f0879850ea557d89c01f8844808da37380111e941ea5cf39ec2ee9302b044bf192 SHA512 97074d785a03ef1dd7fbf670d763d8d2d07fc80b1da6dde918d312c0f98f55956ba6a45e2e54c47125fe4bdcf2d9d7ba7fe00921858b50cdb723fbc8e6745ced
 DIST lskat-21.04.3.tar.xz 1229296 BLAKE2B f274535cf19d9238fcb751e72a0162c81a888381957c25181cef15bfb7c17345c262a7ebb051dafa4a05e4c9523f7a6a73ebd8c022adce35a058fa825f55e203 SHA512 d15a94b083d553ffc1f87eca582ededa76d5bc0c8ca5e2cc730c912271e384a3a7a361a3a260a782583e69f835b00c93446cc21c28254339851d57e77b0be7c7
 EBUILD lskat-20.12.3.ebuild 839 BLAKE2B 19d0071774f66dcaf60c7a7f81a98c873f8a5a8b12dcf3416d6664018942e633f6e1d151146221297af77103122534cc5c1f65770cc2076876dfad9be93b7ce4 SHA512 a17bbfa371109f50ff3d00394e6ee424d370784746944dff99dc7ce815660e2ad48fe3e7d72ac4dc8ef5c0f52a8e89165363df0ebbfd62d546177791758d8016
-EBUILD lskat-21.04.2.ebuild 842 BLAKE2B a43ba6362cf1fab4b2a26a463d39cfe07276c9810b0299b1a53048fcacecd8dea69459f6e8ac53bc7798d699a1fba98ca33a7e39969cdc3a951ff5ab47d70188 SHA512 90cad918a1a074068f7ef2adfe29c7e7bccb2ad04309789ac625c9837b24f46c025417214732d14967a0194d8c0af774f700bf339926dc7f10fd635b03dbc960
 EBUILD lskat-21.04.3.ebuild 842 BLAKE2B a43ba6362cf1fab4b2a26a463d39cfe07276c9810b0299b1a53048fcacecd8dea69459f6e8ac53bc7798d699a1fba98ca33a7e39969cdc3a951ff5ab47d70188 SHA512 90cad918a1a074068f7ef2adfe29c7e7bccb2ad04309789ac625c9837b24f46c025417214732d14967a0194d8c0af774f700bf339926dc7f10fd635b03dbc960
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-21.04.2.ebuild b/kde-apps/lskat/lskat-21.04.2.ebuild
deleted file mode 100644
index c58afc1e275f..000000000000
--- a/kde-apps/lskat/lskat-21.04.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Skat game by KDE"
-HOMEPAGE="https://apps.kde.org/lskat/
-https://games.kde.org/games/lskat/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 4da266a027f0..8a8d70246c90 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,7 +1,5 @@
 DIST mailcommon-20.12.3.tar.xz 723876 BLAKE2B b2c2ea308d5861af066d0d00e46ca50981b2d572e89be48c50b953bbe6009ca1c107f25211d40c843060006a0651eeb443516cb3c2c4eacb17514cb617892d64 SHA512 348c8ed4db7e4db234adbb1eeadccb2cbc85e59d47fca607b834ead5b6f65a0c62b9c1396bd34ee4eae91cdb95b5fc52b9caedf3b23d5ffbd9efbafd6e56ed32
-DIST mailcommon-21.04.2.tar.xz 730564 BLAKE2B 12b1bdb446bb34d859fff6daebfd3884c756684719282b0b3a68a284f0ecb72b468d2ce5e554d97b260c08ae222ff31693dbae9bceb8e5d71c17577007337911 SHA512 8893ae526f0f709e8a517cfdc69547bf2c08d98d3e8283004b2017e42b0d259f1d01ab179ac3e06dd6feab04df36ed943a5d454ba7371152a46326c1a8d8e9a3
 DIST mailcommon-21.04.3.tar.xz 730556 BLAKE2B 12a4ff5b41258c852fa6f6842b58b083b9cfa689b358cb3cf8c39424b0937f78797ff102ee06699106e883ac770d012babd0f8783def087949d8a2876416557a SHA512 4d64a0eaa7668a17487edbc1d5b92c82e73e0b84bc424a43666268fbbbfb62822c9f01ac7a3ac1ceb2a16887431c4c1f94633ca740a87eb20d37601b8201e0cd
 EBUILD mailcommon-20.12.3.ebuild 1759 BLAKE2B 4764c15c24799ef9c0b56a7b57a8ef9f3d7fe6024ae83911bdc15b78ba37207d8f3b1fe13f63ca8ee215e25583584729dcad813dd4408b64406640d2e332f8bd SHA512 4316da53ffaf88ab8be02a98bdfbe48007da715487a6aa927b61531d6232a64352dd40f660df0e564c45439455290f2a85a06a5dda85002f109ef9c1e4300fc0
-EBUILD mailcommon-21.04.2.ebuild 1722 BLAKE2B 681f51a14680d0d7e09083c220c2ad4603d2b549eac9cf6af09fcbf7787a44d89e2668f1cb399c8e90d21f5eab45a75bd2e6d5b697b06c05aa241f858b754106 SHA512 caa9ff948dfd56fb9fb814a3fbcc16591f9350eae82e536b5622974aeac6d9434fe59fe59aa39f32429f0150e836c0263a54ccfc8bc4290bfce4de827e94436e
 EBUILD mailcommon-21.04.3.ebuild 1722 BLAKE2B 681f51a14680d0d7e09083c220c2ad4603d2b549eac9cf6af09fcbf7787a44d89e2668f1cb399c8e90d21f5eab45a75bd2e6d5b697b06c05aa241f858b754106 SHA512 caa9ff948dfd56fb9fb814a3fbcc16591f9350eae82e536b5622974aeac6d9434fe59fe59aa39f32429f0150e836c0263a54ccfc8bc4290bfce4de827e94436e
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-21.04.2.ebuild b/kde-apps/mailcommon/mailcommon-21.04.2.ebuild
deleted file mode 100644
index c8241fff27a0..000000000000
--- a/kde-apps/mailcommon/mailcommon-21.04.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common mail library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-libs/libxslt"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 5a9edf89551a..939fc01c575a 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,7 +1,5 @@
 DIST mailimporter-20.12.3.tar.xz 548588 BLAKE2B 1bde81c122b311ea5859b21e0f2ab8f2020db6325c5ce904260764999781c3cdc404759cd25b92dfc28ccfa9b21d33fe49da1945ec1fdcf5b09fce5e0fcf9a6b SHA512 2952c7f7bba61dc7e36bc877516aa6d46c5ec75b998f2f080a5d40d7f95ee553c97b8cc950a36b03929a57063b7c9899dc997e3397fd574c0278b01ffe2b4994
-DIST mailimporter-21.04.2.tar.xz 559440 BLAKE2B ffd73189cafe678e993e9b198378ae24e51552168e2e2d7e7f48e44caa8e7d8ea86732b848de65db32a1c6821ddc30cde840a700e21ddb6ef1d1bf8706f529fa SHA512 1ee3c91e7c09c445915399db4c5424608f7415769eed8d7abce7a16c4d7eeeaf76cd0267ea97b8887cb7192b476cc07f3a3888fa8532c2a37b9452ef180032a6
 DIST mailimporter-21.04.3.tar.xz 559468 BLAKE2B 97bfc4b8b3518131575e83e2a6dbdcbee49eb0bf178e03891be0aea4775c0331540970a1ea15cdf273112a3493b31ba47748d18c19002e4c91c4cd0f27e4acd2 SHA512 a90350b3c88fe7153b6b3058cbbb10dd4ed3667d1d36f9f57c7534da16f788e63e568e7c0400dd71d68e6641a189b939ea408145043025e2bd2e5e65aacb8e71
 EBUILD mailimporter-20.12.3.ebuild 789 BLAKE2B 243ba38c8341e5afa99a02ba62c3379077cfb7e1e369aa938ed2b36b504189f47f5c970cd10ec161e2544455a137314450fb07abccaba44fe2b47ca254dc0e21 SHA512 8d7680e0e006de44140e7f5305428bc9787d6acc243d43742980c5ceedf3557401de29cb4361c8e90b8732145737cc2390fa0f0de2511c4c1b9d319fcd8a0cfb
-EBUILD mailimporter-21.04.2.ebuild 792 BLAKE2B b926110b90ca3e690152e87eacee41f1d931eff8511efd3bb1b3ea97ef758b2886c6658c6f09746f1e27ad08b982b2bb8b8fafbda86180fa5a16283e2d8eed09 SHA512 ee4ea1df369cf16d2276ec0f5d034b8204ab95dab33cd25097fbd8e118a70f8b2ed700dec04ab98b452551931906a2c92555209d240cc74c3dab7df890920b89
 EBUILD mailimporter-21.04.3.ebuild 792 BLAKE2B b926110b90ca3e690152e87eacee41f1d931eff8511efd3bb1b3ea97ef758b2886c6658c6f09746f1e27ad08b982b2bb8b8fafbda86180fa5a16283e2d8eed09 SHA512 ee4ea1df369cf16d2276ec0f5d034b8204ab95dab33cd25097fbd8e118a70f8b2ed700dec04ab98b452551931906a2c92555209d240cc74c3dab7df890920b89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-21.04.2.ebuild b/kde-apps/mailimporter/mailimporter-21.04.2.ebuild
deleted file mode 100644
index a92dde7f6100..000000000000
--- a/kde-apps/mailimporter/mailimporter-21.04.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library to import mail from various sources"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 0eb46a4c723c..f05fcdba795f 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,7 +1,5 @@
 DIST marble-20.12.3.tar.xz 52242116 BLAKE2B 70d16d5d9e2e51fbdc8c9331e55ac1efa85fbb11e79443f8a977ccb804184afbed8ddcb7e7358ee41f61201036bcb9553f1f578be51401e118d928ec5bdf9263 SHA512 0dc69ce2dafac196d3b494bd29a268f879e8bd14ae916454682289822024d58e077e4972588cc6d51284459f2fc9aceacd4e1e8a8302f987556e20a7acaf172a
-DIST marble-21.04.2.tar.xz 52387888 BLAKE2B 3d7c7af476e13a5b51fd444128873bfebc5b393cd4b49f70bde5119da86da4fd0007a787c0633ea4209ac5218829c59db45014c7f36d304d03aeabc465fc6a1d SHA512 db217452192dff9d6f25ff366df50765d38dcf6115a147150e93e6c86800d60cbdb0eabf1f7597e32c4203ad261e300b5f1ae066553cdd1ba1e6e18120418bc8
 DIST marble-21.04.3.tar.xz 52386284 BLAKE2B a23a326e7c181046f03c896fb49d2d39156bce060cdf643d92e98a1d2fc44000a7e1367dbe1e00a939cf78a9d1b07d47152735f3e528126dbda85594f1e5b5b9 SHA512 db926120fd275e0803cf176137c32463de784dd54f16b1d2d7e20e6ae750e6d6b373ef2fd51d1e31a0bee219d8e7c278ede8e83bdbe753edd32d138098855b8c
 EBUILD marble-20.12.3.ebuild 2697 BLAKE2B 59bac185fead02c46f56d402b2283cb0e32afba0add2c78f9836949490093d662093c98b5b42cae28567ee2fe09a0d24a8c2e1cc928827c250b606eccd41f01e SHA512 2cb9e241a4ffb1402a6dd7a5046e2a636bc5b29489e24439c72be94e03b4959fe4482e211ecc5267a6bfab581664760132fdca544c570e67ba13da6b5f2690ce
-EBUILD marble-21.04.2.ebuild 2700 BLAKE2B e89142db07919d788491301bb8865447766583abab248af0eeb16b679351bed32b0997b9c02341f899d15bef560996e8e35a9e3a56427a9ea88acaf44bf4568f SHA512 34aed2b6f84f2be67e5f290bd4bcd4f469ec51ff509676e93f6d598801f9782c68fa66b389433dd9743e7913d5ae24c9bd04920ccfc497cc0c676ea0ec820a15
 EBUILD marble-21.04.3.ebuild 2700 BLAKE2B e89142db07919d788491301bb8865447766583abab248af0eeb16b679351bed32b0997b9c02341f899d15bef560996e8e35a9e3a56427a9ea88acaf44bf4568f SHA512 34aed2b6f84f2be67e5f290bd4bcd4f469ec51ff509676e93f6d598801f9782c68fa66b389433dd9743e7913d5ae24c9bd04920ccfc497cc0c676ea0ec820a15
 MISC metadata.xml 841 BLAKE2B 8dbc10f99d3de79755bf67d12e5ab9e18a56f4207385161754f89265a71ee9da5ec276fb3aee431a91294b917f0031c736f86668d17cd9e9e9e45352fd5f48c3 SHA512 4f1557cef7ca36f318e628a72efb68e2916608f1cda895e140d9b87253dd55402bf6ebf170daba715d3195d89b6224214e6e3b9fff9c4df707565aba13467703
diff --git a/kde-apps/marble/marble-21.04.2.ebuild b/kde-apps/marble/marble-21.04.2.ebuild
deleted file mode 100644
index 898a19e57325..000000000000
--- a/kde-apps/marble/marble-21.04.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-BDEPEND="
-	aprs? ( dev-lang/perl )
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	sys-libs/zlib
-	aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 )
-	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	designer? ( >=dev-qt/designer-${QTMIN}:5 )
-	geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
-	gps? ( sci-geosciences/gpsd )
-	kde? (
-		>=kde-frameworks/kconfig-${KFMIN}:5
-		>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-		>=kde-frameworks/kcoreaddons-${KFMIN}:5
-		>=kde-frameworks/kcrash-${KFMIN}:5
-		>=kde-frameworks/ki18n-${KFMIN}:5
-		>=kde-frameworks/kio-${KFMIN}:5
-		>=kde-frameworks/knewstuff-${KFMIN}:5
-		>=kde-frameworks/kparts-${KFMIN}:5
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-frameworks/kservice-${KFMIN}:5
-		>=kde-frameworks/kwallet-${KFMIN}:5
-	)
-	pbf? ( dev-libs/protobuf:= )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-	shapefile? ( sci-libs/shapelib:= )
-	webengine? (
-		>=dev-qt/qtwebchannel-${QTMIN}:5
-		>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	)
-"
-RDEPEND="${DEPEND}"
-
-# bug 588320
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-
-	rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
-
-	use kde && cmake_run_in src/apps cmake_comment_add_subdirectory marble-qt
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package aprs Perl)
-		$(cmake_use_find_package geolocation Qt5Positioning)
-		-DBUILD_MARBLE_TESTS=$(usex test)
-		-DWITH_DESIGNER_PLUGIN=$(usex designer)
-		-DWITH_libgps=$(usex gps)
-		-DWITH_KF5=$(usex kde)
-		$(cmake_use_find_package pbf Protobuf)
-		-DWITH_Phonon4Qt5=$(usex phonon)
-		-DWITH_libshp=$(usex shapefile)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DWITH_libwlocate=OFF
-		# bug 608890
-		-DKDE_INSTALL_CONFDIR="/etc/xdg"
-	)
-	if use kde; then
-		ecm_src_configure
-	else
-		cmake_src_configure
-	fi
-}
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 8b7671bed624..6c8b2a293868 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,7 +1,5 @@
 DIST mbox-importer-20.12.3.tar.xz 24760 BLAKE2B c02d7e11f575624c83462e746017c400f4f9378eb2b817289bb344e83a4ebc5ed2547994de0223c9f55089a6c8bd541e131dabc231bcbbc402ebdeefda75b16e SHA512 0907a158a2830eb08455270dc52ccb03c24c595435b372eae58291f36b92270ff6069391264100db13b1da8bea642858ac88b7a0540989ee6e1888ba8ddbf237
-DIST mbox-importer-21.04.2.tar.xz 28712 BLAKE2B eaa8bdd2f1c69be5d27619f89a4c7ef8a102b2a32575e042ee9310583510b919eaf4d4333e192511a7b00f92b940e83a1c5ee51fce05545effe0f293baabda16 SHA512 0b9ef0b6d16d6cfa6e68879fcb1cb40fe666bf8e3b6b84da67ae3ea06a75b321046e6035f72a7fe5bf148a1741a11f91c7f309555f7cc5705e7a343e832a3173
 DIST mbox-importer-21.04.3.tar.xz 28656 BLAKE2B 529b6d833655ee8d77b0cb080afe0191d1199abea68a2797041594c76d88df1807770ca60e7c669c441619e1c99854a615748a4082befe91969d2df5694ae3ba SHA512 6f92c052876b9bb0ac39ff1a3a3f1c96a8ef676c280cb915a0a9c472a25ff86573196b059035096bfe82d570d28483a092a8ef147099c1eaae82dacb50c45554
 EBUILD mbox-importer-20.12.3.ebuild 922 BLAKE2B 2ba955427a1761935817104b74a057310220f7bfe560ee34f30e465452bd4c08e5adcc90fde430e1cd4c7c4162bf4c477e9cfb4e269f9fbbab2e06cd6bdbd060 SHA512 c902f3abdc2a65a150a0c3d01987c37cac65df2ef37f041cfb808f91974a451a0f775a7e954c3894e942450b7b563daa8fb874f4da789cb54f7369f31e422c7f
-EBUILD mbox-importer-21.04.2.ebuild 925 BLAKE2B 5786cdcfa9787f747e1cffdf20ad5cf87894bcccee25895f3f85b8ac721735ee2cdba92e4c3ea6a717fa3cef01db129ab5dbfedce39df702f7cbf0f5ab12f5ab SHA512 a508acf3051d409be5bcc04ab8d5938a5c1c0fc17ff01b13a9e55596a66eb9246ed89a3dbce23a6499203c61e41de222b41054ae1345a200ce86eb57f9786e16
 EBUILD mbox-importer-21.04.3.ebuild 925 BLAKE2B 5786cdcfa9787f747e1cffdf20ad5cf87894bcccee25895f3f85b8ac721735ee2cdba92e4c3ea6a717fa3cef01db129ab5dbfedce39df702f7cbf0f5ab12f5ab SHA512 a508acf3051d409be5bcc04ab8d5938a5c1c0fc17ff01b13a9e55596a66eb9246ed89a3dbce23a6499203c61e41de222b41054ae1345a200ce86eb57f9786e16
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-21.04.2.ebuild b/kde-apps/mbox-importer/mbox-importer-21.04.2.ebuild
deleted file mode 100644
index 8b3a86dba250..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-21.04.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 92a1d1a1ac1d..f81da938aa0f 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,7 +1,5 @@
 DIST messagelib-20.12.3.tar.xz 10527968 BLAKE2B b7d1b33232ee5e24392f2c66b5179b7e536e5aa0bc511c81af15500666fd15ab92645733e56797741e06caf1c08ac9af2bf0951d05aff1a1b73424c09901e335 SHA512 bd7fbab82cc53d141e27e6148a9b957603beef508ed10786fe3052df94e27d23f424ea3cdf8a6c1aa412ecb999ec21c3b61705dcc29d85ece2ccfdf4c4ff159e
-DIST messagelib-21.04.2.tar.xz 10778204 BLAKE2B f64f6b278f4dc3e106527ba19df49c507c5ea752267f282cca494df9380079b449fb1cbef820ee1a2280880f8986bcc7ded631b96aec2a250d366f2fb8c09a10 SHA512 88dda73296d8457e0a0891a200edf609b0b59c1cf2418ec674ece100bd771c3df2eaf1255ef9c5df5e4cd20bf7d6eeb7be3d60245651a52b22df7bb518f2cc84
 DIST messagelib-21.04.3.tar.xz 10795852 BLAKE2B b83dcd2fa1e76058ada2cb95ed4c6fc8700be4dfdb7a75fefc7e29f1f72fcde85962b1a7aff130f894fa456b544513ea202c9f618e6293c54a45873a030d740e SHA512 5820278f486d061081590cb2742a56fc5374048b8880d921f6fb7e4f7021dc09ca1921282228560d75b90aa451a6fbffa8b1ccf6a869c17e90703e7300d8151a
 EBUILD messagelib-20.12.3.ebuild 2169 BLAKE2B aa49250a74f94c9505225ff92ba5d1334a4b1bb49db228f143138e6ecfd5210c688ae71a21d0a1179d70a63b8551bed28ad20409ee82af9fe3eed95e1283247c SHA512 73327a50f583f8a5ddd679f0b692587305225c869698f775956d62885daccbcdf5917f4358e59950b7b5146421b89e23a606731cea678782d7bc71863807cdb1
-EBUILD messagelib-21.04.2.ebuild 2172 BLAKE2B c533800778f80594ce3dfed83644039fbefa5208fea84e50e4b79ca6cb3d044c6709c29e8ecce8424b118b338bb3be0baf4d3aedaa2dfc302c263dec5fc572df SHA512 173a34b33fb98bdfc2c5150e985514954480f85cde998e879d1b23e38486e76900f3eba4c6fe545f7da4963b513b97c6c4a952353318e1957374f98961a559f2
 EBUILD messagelib-21.04.3.ebuild 2172 BLAKE2B c533800778f80594ce3dfed83644039fbefa5208fea84e50e4b79ca6cb3d044c6709c29e8ecce8424b118b338bb3be0baf4d3aedaa2dfc302c263dec5fc572df SHA512 173a34b33fb98bdfc2c5150e985514954480f85cde998e879d1b23e38486e76900f3eba4c6fe545f7da4963b513b97c6c4a952353318e1957374f98961a559f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-21.04.2.ebuild b/kde-apps/messagelib/messagelib-21.04.2.ebuild
deleted file mode 100644
index f16d4a7a38a1..000000000000
--- a/kde-apps/messagelib/messagelib-21.04.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries for messaging functions"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
-	>=app-crypt/qca-2.3.0:2
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 8d0eaaca1de7..29c054c50499 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,7 +1,5 @@
 DIST minuet-20.12.3.tar.xz 27731932 BLAKE2B c1638c069161f9ace3f4515ea5260f138b03e13f591e8e4eeaeb8c2daff5a754f3b516dc952fca74d784134940aa08dfeb55ae78620b781ee54c5fda42d83227 SHA512 17c92dd49e729f075eb37b205990c098931b2fce56b200ede20293c0df7ff833bb7492b7bf629e7de408984f7cad6986efe060a02577b11c07abde407b462a6e
-DIST minuet-21.04.2.tar.xz 27723956 BLAKE2B bbd5eb71ef06243b1af9798a23d412728da03a1db234d71c1a122391dc6adbd375f0af03e1d96bbf58644b7dbc98042a5d6ec007be15b91d2b7f9b785991bce1 SHA512 5fd29c30ce8ea3618ab43f715076c8a4fa75b3592c94a40622d35bd391b2c16284b8d47cb92b6a25d5505ce38d6b9be1fb790f6349e527ca9e9d207677f0f9b2
 DIST minuet-21.04.3.tar.xz 27726656 BLAKE2B c986771fba76acfd54095819fa817a51a69f68add00267d044d5e2a2176ffa6a0213c5541539ee46fa2905e14ee612e940b02f855bbabfb3a2b9785893e85fed SHA512 0513c9074c4505a0f83899b340dd122c7c5861325fa5e27b18ce11d1195069d0066b47861f8ab3eb540d3a5e89c6134cab9016680709c650a322ff4599bb35de
 EBUILD minuet-20.12.3.ebuild 673 BLAKE2B dd512ec6e2a26d11e4c78fa975c330b34511c449ee146c2e17b59e99e731ac936526af8e7a37190bfbb4da4ee61a9e50781291cdf8ef2554db7bda12635d6d2d SHA512 6995cce97718b2fad9fffa9cd5744946ad5d2f3b99f57f44140650acc6a76998ee962162983a4d495d835a34c0424814c613930455de8541d7f00f1624182794
-EBUILD minuet-21.04.2.ebuild 676 BLAKE2B 678f8cf452d711ddece08e1b48b407df0d551b17fc0a8ced433d2b61ae298a86afefa0005212dfa377cc86cf82cf84e5a71f9bc09b05358ce806f1de08bc74d6 SHA512 ffd6bbfabc65169a595235bfc4da5da6b01a940286da5e8a9c6600ae069ed6146d152a45c40e82c3b4cbbf40d9152ac5e5f2d020b7ead8f3b4489ee9b1c81c13
 EBUILD minuet-21.04.3.ebuild 676 BLAKE2B 678f8cf452d711ddece08e1b48b407df0d551b17fc0a8ced433d2b61ae298a86afefa0005212dfa377cc86cf82cf84e5a71f9bc09b05358ce806f1de08bc74d6 SHA512 ffd6bbfabc65169a595235bfc4da5da6b01a940286da5e8a9c6600ae069ed6146d152a45c40e82c3b4cbbf40d9152ac5e5f2d020b7ead8f3b4489ee9b1c81c13
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-21.04.2.ebuild b/kde-apps/minuet/minuet-21.04.2.ebuild
deleted file mode 100644
index aba9ebe37637..000000000000
--- a/kde-apps/minuet/minuet-21.04.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Music Education software by KDE"
-HOMEPAGE="https://minuet.kde.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	media-sound/fluidsynth:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 761c67ff9317..fb9fbde90dee 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,9 +1,8 @@
 AUX okular-20.08.2-hide-mobile-app.patch 849 BLAKE2B 73e324e61d8a39d085bff4b818845f7392cfff8e01e38624e1e3aa1c7073bc4d6adbe2fbe314a6f4a43b6559cd83c5c45589df49aab8e7e5f0c5b8cf559a47bc SHA512 8b35589046581600c67a464011e34494626f3cd0f4d08080b51ac704f2c7c3f9bacc64f5b0d2f1bcd1732c6c50b924e1dbdb9bfdf259cfc88e8f583c4f1df53b
 AUX okular-20.11.90-tests.patch 6748 BLAKE2B 309fb48b50fcd594e9827c4c9b1cbd86e3631fea791e55fbe2d3773b0c46730cd1ab1e9397197287872ad42ebe2f03eccef58cec8237f93c9da7df0c1f19364c SHA512 a0f41a9285f67a3b4878cfaa38e59074ab493e43d5ccb78d65dcb9dd94605b76c36f2345b32a66a5764e9ad564e41282a4470cfeda6af305721a198defab134e
+AUX okular-21.04.3-fix-fictionbook-support.patch 1074 BLAKE2B 16f98c1ba248ed2ba0b6829f09045dd8e3501483f3cd6f8a8911183c27da3fb5fb737838711093f85e1f7ef3d33e9a430ef600c9181a90e8526337f3d9294ce7 SHA512 e1f290553bba99773a39d52f7ed89c4193f40d9a674e78d4abd7ac29e8a8622e7ed1334aececcb1b426bf67c6b60c94405c75b6d0379eab2b97f6b2bd719641e
 DIST okular-20.12.3.tar.xz 7884780 BLAKE2B 8ff44f3f60ea6f9c8b0b2357727a56aae9cd77fd408c60cf8282b41f2e286420747c11bb669e3bf52192481ad56dc3ee9125ba2f777432b423b6217249d31c7f SHA512 f64eca81bdbd163b2780037026c330259d5dd7fed7a175b06601742bc6b98c25f26463d72764e5b77878b3c36df4f4657d4cd5349f389786a45df1a5fa9cda45
-DIST okular-21.04.2.tar.xz 8050596 BLAKE2B cd8c3c763d20900c17d9477873a78aa75a0c792318de2fdcc4387f7daf531177d63eb7a9639bf57a4a867d0da2268fab9303f43f41703bb75e1d5cbbcc432eb4 SHA512 fcee0e9711bfcbe83e71b3c50f705d6fa4f39d085b5902fc34551c4e76156a4c6585680792dca84580947a3430ce823f8e8b9c170f319c4f6f7a229040fcd1f2
 DIST okular-21.04.3.tar.xz 8052500 BLAKE2B d0bcd358f9da6c0a19c30d036e73736c06e67730d30be6fca64c33a188adbe8bc1f15efba2c62739e88fc3a4dfe4100a9c3588e077f689176f1a0a2ad2f6b59b SHA512 21f34dcef50d15a8816d3898a002133e068ba239d1730892e0d71e58e6196b493544792fa5c06de689fdf1fe7f853586578f3963a64e46a9797484f983814c22
 EBUILD okular-20.12.3.ebuild 3153 BLAKE2B fde78aeb5bd969230d787b6d325da910fe2b7c7ad403d8f084fae91674a7d0c2a4009ce4f6c56733828e8940c395fa9e0634d2f0a49bdb9974cf9eaaf0c40879 SHA512 79dd69de245670d9508a58b2ceab924b980d8218a592bdca8a7429bb557e3d4a6d01d286ec20e684f8751ceaab2c698f1d5f3273c7f81acfd5225bec921c2308
-EBUILD okular-21.04.2.ebuild 3160 BLAKE2B 3974521213d97b732b529d1b8cd944422995d6f29a18f78317b8a8070f8008a1a54cbdbbd9be1cfe5d04914e8c6aa136dbb2e63d1e580fc7223281acee714872 SHA512 5cd22c06a8c3117e6d13560573d6d1020aac2b60b9b10dbff86b71e10f97aad912bdb76432f16ffd2993633420b97ed27bdceae07fb5e8d1aaac19638ca36d27
-EBUILD okular-21.04.3.ebuild 3160 BLAKE2B 3974521213d97b732b529d1b8cd944422995d6f29a18f78317b8a8070f8008a1a54cbdbbd9be1cfe5d04914e8c6aa136dbb2e63d1e580fc7223281acee714872 SHA512 5cd22c06a8c3117e6d13560573d6d1020aac2b60b9b10dbff86b71e10f97aad912bdb76432f16ffd2993633420b97ed27bdceae07fb5e8d1aaac19638ca36d27
+EBUILD okular-21.04.3-r2.ebuild 3304 BLAKE2B 989d43c0c6be32a10237fa70e6e77424a37a82a43fd13d8a4c0ca0772a375a0d84c5985734f411dc7283cee2d3376400f3a31994c86d7d47d00a252ae9041343 SHA512 9a94017f08c5c3d4950327b3919446d0b3a93b8f234f7cf6db17361c03a0445ec2b670151a1dcbba1bd6e3ab8878555523fff8b7ba761469d8cf10985e6c42ee
 MISC metadata.xml 930 BLAKE2B db4164556c6c5f69c136f226dd436e813a8095196d468cbbbfd2052086c6d1d4b29a9908f85b49838ad44046a3446cb073a45887defdf2ff509b49c4688dac00 SHA512 570c388b5f08484354a15000a1f098ed327b5f5fb40d78801fa746d09fe28eb3b63bb3b735549ae6e6ef7abdcac94652946c45e9b26acd6bf9ebc4058d41759f
diff --git a/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
new file mode 100644
index 000000000000..061db80d2bc5
--- /dev/null
+++ b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
@@ -0,0 +1,27 @@
+From 504eec7688e7139e9d193fc2b3ddafac0f835b6f Mon Sep 17 00:00:00 2001
+From: Yaroslav Sidlovsky <zawertun@gmail.com>
+Date: Mon, 12 Jul 2021 11:06:26 +0300
+Subject: [PATCH] Fix non unique KPlugin Id for fictionbook generator
+
+BUG: 439807
+(cherry picked from commit 8dc58c7617abcacf9325e5b93a5e38149f6e2aaf)
+---
+ generators/fictionbook/libokularGenerator_fb.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json
+index 1ef01a2d5..3d499a50f 100644
+--- a/generators/fictionbook/libokularGenerator_fb.json
++++ b/generators/fictionbook/libokularGenerator_fb.json
+@@ -120,7 +120,7 @@
+         "Description[x-test]": "xxA renderer for FictionBook eBooksxx",
+         "Description[zh_CN]": "FictionBook 电�书渲染器",
+         "Description[zh_TW]": "FictionBook 電�書��器",
+-        "Id": "okular_fax",
++        "Id": "okular_fictionbook",
+         "License": "GPL",
+         "MimeTypes": [
+             "application/x-fictionbook+xml"
+-- 
+GitLab
+
diff --git a/kde-apps/okular/okular-21.04.2.ebuild b/kde-apps/okular/okular-21.04.2.ebuild
deleted file mode 100644
index 9c072d62591a..000000000000
--- a/kde-apps/okular/okular-21.04.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjs-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	media-libs/freetype
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-	chm? (
-		dev-libs/chmlib
-		dev-libs/libzip:=
-		>=kde-frameworks/khtml-${KFMIN}:5
-	)
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	image-backend? (
-		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
-		>=kde-apps/libkexiv2-${PVCUT}:5
-	)
-	markdown? ( app-text/discount )
-	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	pdf? ( app-text/poppler[nss,qt5] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
-	qml? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/kirigami-${KFMIN}:5
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138
-	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DOKULAR_UI=$(usex qml "both" "desktop")
-		$(cmake_use_find_package chm CHM)
-		$(cmake_use_find_package chm KF5KHtml)
-		$(cmake_use_find_package chm LibZip)
-		$(cmake_use_find_package djvu DjVuLibre)
-		$(cmake_use_find_package epub EPub)
-		$(cmake_use_find_package image-backend KF5KExiv2)
-		$(cmake_use_find_package markdown Discount)
-		$(cmake_use_find_package mobi QMobipocket)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package plucker JPEG)
-		$(cmake_use_find_package postscript LibSpectre)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package tiff TIFF)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/okular/okular-21.04.3-r2.ebuild b/kde-apps/okular/okular-21.04.3-r2.ebuild
new file mode 100644
index 000000000000..d0d9c84c3733
--- /dev/null
+++ b/kde-apps/okular/okular-21.04.3-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjs-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	media-libs/freetype
+	>=media-libs/phonon-4.11.0
+	sys-libs/zlib
+	chm? (
+		dev-libs/chmlib
+		dev-libs/libzip:=
+		>=kde-frameworks/khtml-${KFMIN}:5
+	)
+	djvu? ( app-text/djvu )
+	epub? ( app-text/ebook-tools )
+	image-backend? (
+		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+		>=kde-apps/libkexiv2-${PVCUT}:5
+	)
+	markdown? ( app-text/discount )
+	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
+	pdf? ( app-text/poppler[nss,qt5] )
+	plucker? ( virtual/jpeg:0 )
+	postscript? ( app-text/libspectre )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
+	qml? (
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-frameworks/kirigami-${KFMIN}:5
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138
+	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+	"${FILESDIR}/${P}-fix-fictionbook-support.patch" # KDE-bug 439807
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DOKULAR_UI=$(usex qml "both" "desktop")
+		$(cmake_use_find_package chm CHM)
+		$(cmake_use_find_package chm KF5KHtml)
+		$(cmake_use_find_package chm LibZip)
+		$(cmake_use_find_package djvu DjVuLibre)
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package image-backend KF5KExiv2)
+		$(cmake_use_find_package markdown Discount)
+		$(cmake_use_find_package mobi QMobipocket)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package plucker JPEG)
+		$(cmake_use_find_package postscript LibSpectre)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package tiff TIFF)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# mainshelltest hangs, chmgeneratortest fails, bug #603116
+	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
+	local myctestargs=(
+		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/okular/okular-21.04.3.ebuild b/kde-apps/okular/okular-21.04.3.ebuild
deleted file mode 100644
index 9c072d62591a..000000000000
--- a/kde-apps/okular/okular-21.04.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjs-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	media-libs/freetype
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-	chm? (
-		dev-libs/chmlib
-		dev-libs/libzip:=
-		>=kde-frameworks/khtml-${KFMIN}:5
-	)
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	image-backend? (
-		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
-		>=kde-apps/libkexiv2-${PVCUT}:5
-	)
-	markdown? ( app-text/discount )
-	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	pdf? ( app-text/poppler[nss,qt5] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
-	qml? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/kirigami-${KFMIN}:5
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138
-	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DOKULAR_UI=$(usex qml "both" "desktop")
-		$(cmake_use_find_package chm CHM)
-		$(cmake_use_find_package chm KF5KHtml)
-		$(cmake_use_find_package chm LibZip)
-		$(cmake_use_find_package djvu DjVuLibre)
-		$(cmake_use_find_package epub EPub)
-		$(cmake_use_find_package image-backend KF5KExiv2)
-		$(cmake_use_find_package markdown Discount)
-		$(cmake_use_find_package mobi QMobipocket)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package plucker JPEG)
-		$(cmake_use_find_package postscript LibSpectre)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package tiff TIFF)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 5568e6760900..9be39765d236 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,7 +1,5 @@
 DIST palapeli-20.12.3.tar.xz 2078720 BLAKE2B 18952513649553814abf17d45580251057dfa528c7cf142382ad6c90eba5bab9227b1cdfe7c818bdc71b93cbee3b2cb28b74cb0241d74a893feafcf3ae6b7e44 SHA512 f26efc3e724afdaba0826495cb14f8aff913dc6a6922e6a4734bf4177f572ef286a5d5c2c0926e2804a3c7429b64b07ee8b48917272af0be018f023cd7ec6a02
-DIST palapeli-21.04.2.tar.xz 2077004 BLAKE2B 590c599e51f07df7a2baff5d9155b1be03dbf98e7f8726cbe9c3125f8b71070443bdb1f6ad612e7e92e27607ea1cdf8f13424bf34162bd13c24e409184600551 SHA512 d5585fbaae57388005e7a13c0041b73d6745acb58524f356af66e96a0090602b0c5bf4efeaf1f3eaa4a1b79ac1db73a26d1d58b89a210af1e7267d2591c3cd29
 DIST palapeli-21.04.3.tar.xz 2076828 BLAKE2B f6aa798c3bfd2affa8656412fcc599ae59f1ad46334fd7bdb286ef8eec33c835c41723e448d1e98143a7ec8a8b9441b978d4d7b029d91c54be8afef4aa93eaf3 SHA512 bc2f147e0a819ee6f6c08f83522ce2a61e1fe642cfe2d93ab1831e2d9e89ba878e62912c358b3a9b4a336e5abe6cc69abfae1e872efd32392afcd41966ce42e9
 EBUILD palapeli-20.12.3.ebuild 1058 BLAKE2B 0d5dd122505a65a5db8a38b2c215866951d3b3cea2f8d4b0ac335d9a16fe61190f2991ec08cba383981710fe514e81ae1287eb3659adc3ebfdf966949e34eed3 SHA512 e0f88c99068550514c2137e1bd12be30860a0267fb1f3f44d5a82d17e61cb2258056f914ddb692a2d663da0ede12766893387ab0bc1414805d0b3bf12923e234
-EBUILD palapeli-21.04.2.ebuild 1031 BLAKE2B 022e77fbcaf38c7c293d4e275b6f69df835171e9b45d8b24eb3b8efbddedd6088b18f6e8830666f0474f97fa3e5e369f3a4060b33836b2d91d0f8fc561b23237 SHA512 d215a59dafd56042ee005b26ab8e6049a321c884ef8b2ec7a75776e474fa4366f54fff8f8f70d8c61d45036cefe635c6f6975ea6526bf2efc9d77d7d1750160e
 EBUILD palapeli-21.04.3.ebuild 1031 BLAKE2B 022e77fbcaf38c7c293d4e275b6f69df835171e9b45d8b24eb3b8efbddedd6088b18f6e8830666f0474f97fa3e5e369f3a4060b33836b2d91d0f8fc561b23237 SHA512 d215a59dafd56042ee005b26ab8e6049a321c884ef8b2ec7a75776e474fa4366f54fff8f8f70d8c61d45036cefe635c6f6975ea6526bf2efc9d77d7d1750160e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-21.04.2.ebuild b/kde-apps/palapeli/palapeli-21.04.2.ebuild
deleted file mode 100644
index ca998f92007d..000000000000
--- a/kde-apps/palapeli/palapeli-21.04.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Jigsaw puzzle game by KDE"
-HOMEPAGE="https://apps.kde.org/palapeli/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 2f54871eb85b..75628b513110 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,7 +1,5 @@
 DIST parley-20.12.3.tar.xz 8842064 BLAKE2B 178a714610b9b68c2a993937b7109e4d82bbd173f90de9b3836ce7e8620f17cb46c0964e50e47f621d867e5ca83ee6994501119d98f33af1ee279c1ae1530ec3 SHA512 60623069078a2944e7a83798293a78ed7fac7feb5f37527cb978fc4a8a63ba613737ed0d8a24972ed92393476fa9e83ec83d3c41f6d879797243d966d6784d87
-DIST parley-21.04.2.tar.xz 8890288 BLAKE2B 4259943aa583c2ecbfb47f848737aca02254587f55abbdd4b13b8172436861097e10f29adf4b70162895c75975c41691fb234655f545df5fbdfde583a68b554e SHA512 11fd1093757e8750c9ce1c04d2f95cf563b2ef313713b1e3176373e13f2c44019bdf227cdbacc564935d3cef0e98443a416521951f45cec823887af8272693a9
 DIST parley-21.04.3.tar.xz 8890316 BLAKE2B f3ca83e72e6ad616151111d2f1cb0df79c086829d6b51061d6d415d1287cb9b8bd9d045413278da4310f3c48b1fcbbb932f17a52fe134472b6a2262149244983 SHA512 18bebd246eb5a4199322e90040c53d77c31cba770abc566a63d9a26acb9e0066b5d1159156e8e0b533d6bd096be3d8806e75ae4a155b678626aa24b28d4555d1
 EBUILD parley-20.12.3.ebuild 1632 BLAKE2B 2c7a967e28e8daab02566d7ed1f4dbc7cff0b0dc703fd55584fe9a4095200edb4c85ce06199fc88aea49f2a8d5797cd7418efa73137e2b24aec1ddf40f309b72 SHA512 eee75143b9b16973ab1b56c3679862181d786e7cde3858945edcb420d6f85d96b1189e333b145c1d197a26079f03a32d9940eaa33c2e651698236e285edfc856
-EBUILD parley-21.04.2.ebuild 1635 BLAKE2B 07a8b59cff6919d0be83babb805723fece6509a2e2777c3f8fc0982dc955b368953f89e074dd2004cc92e8cbc009dd9e031a9eb8f5e6d918b02ad0ca75afdc02 SHA512 412885534b9ec160f5b8ff8e471a8409e1a05b39c57ce706a0566ed4964f403aaea2f94974669e94c214758e5d67a5c7326bb6661295f95070a6110fce38fc12
 EBUILD parley-21.04.3.ebuild 1635 BLAKE2B 07a8b59cff6919d0be83babb805723fece6509a2e2777c3f8fc0982dc955b368953f89e074dd2004cc92e8cbc009dd9e031a9eb8f5e6d918b02ad0ca75afdc02 SHA512 412885534b9ec160f5b8ff8e471a8409e1a05b39c57ce706a0566ed4964f403aaea2f94974669e94c214758e5d67a5c7326bb6661295f95070a6110fce38fc12
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-21.04.2.ebuild b/kde-apps/parley/parley-21.04.2.ebuild
deleted file mode 100644
index 96a0dbe3ae33..000000000000
--- a/kde-apps/parley/parley-21.04.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="A vocabulary trainer to help you memorize things"
-HOMEPAGE="https://apps.kde.org/parley/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=kde-apps/libkeduvocdocument-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdeedu-data-${PVCUT}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_comment_add_subdirectory plugins
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Plugins are disabled in Gentoo due to lack of Python-3 compatible"
-	elog "kross-interpreters, bug #766333."
-}
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index 48ca90a4d4a5..8cc341bd468f 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,7 +1,5 @@
 DIST picmi-20.12.3.tar.xz 1367556 BLAKE2B 258171a75184c9c6c4e8e7ad978bb5bf295e3d9ac8d111487555fbd3e01aae27b737aa74eed0b21f570b2d592a4a190d9869167eb0dca87d7f35477606d8a4db SHA512 46b269212a425a62fabe97d06f272bbc050ae7b288629ef4ad0597282a0fe8481016aeadd94e6b9971cd90317308032a6241d8f95bdb1c24a6b6601375aa64c8
-DIST picmi-21.04.2.tar.xz 1369268 BLAKE2B 397e4b4867201bc39108d6e57ca3ed31317cd7629a08888ec34d16cf213fbc8e536bb4f74956e90358d0ee43f50c25ff4849a682401040f50af3583ab6083e2d SHA512 d02b02ec7be04ac80e7400098ad29a27674d6d6419200ba205af71c7ae85da78cb01df738d3620466b1ee133fb25ffe073062f5c98e35532750659f229dc660f
 DIST picmi-21.04.3.tar.xz 1369196 BLAKE2B 294ddf72382001d4a44355225d794a24aad14bddf1f8abdbb7faff6dae54b745c2c0f3060fc6b5a7dd38cf16a2e371d5cd519d33a9daaa8b6502ae6c47389c71 SHA512 8d2a27d8a1652407750f0d74ddceb6fb3d252c29d5691dea96153ccf0e685d0c5134ed204170d77148000e6209a9251fddef02fcb5a1179b0b04e652f6c34c4a
 EBUILD picmi-20.12.3.ebuild 1056 BLAKE2B 71899361ee4b7c44f1cc99789dfa873b2948bca57c5e2e6f02e0411a5ccd59bdf3bb5e0f562a92c2f020aef13ac7d7a2dc5842455736f8fb9647f3337201135b SHA512 efec76516324b317b2cae8d2fc7f6db36f87d8b7c8978ad44d662a66f7da25a8c09987e8cb5730f2e3655d495ed22948db9b818e68bb2172778513041d72512a
-EBUILD picmi-21.04.2.ebuild 1059 BLAKE2B a287ffdc8a5472d38bf19c766fe58f3b90a9926168d69f6b629f4de4b613cf238ffe7b38272d5018388557c9a41572cac07ad2d26e121b28b3c9cf7239cf1edd SHA512 ee1fd25344efdd8952462a5375e6a729f1a79c41fa7a42bc72fc6cd2ab03e26121460b2488c0a0661cad017dbc1e6bb91f17d93f8929df223480cd4bab24874a
 EBUILD picmi-21.04.3.ebuild 1059 BLAKE2B a287ffdc8a5472d38bf19c766fe58f3b90a9926168d69f6b629f4de4b613cf238ffe7b38272d5018388557c9a41572cac07ad2d26e121b28b3c9cf7239cf1edd SHA512 ee1fd25344efdd8952462a5375e6a729f1a79c41fa7a42bc72fc6cd2ab03e26121460b2488c0a0661cad017dbc1e6bb91f17d93f8929df223480cd4bab24874a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-21.04.2.ebuild b/kde-apps/picmi/picmi-21.04.2.ebuild
deleted file mode 100644
index 9a7e95560fea..000000000000
--- a/kde-apps/picmi/picmi-21.04.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Nonogram logic game by KDE"
-HOMEPAGE="https://apps.kde.org/picmi/
-https://games.kde.org/games/picmi/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 68c0731aad51..62c637a736f6 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,7 +1,5 @@
 DIST pim-data-exporter-20.12.3.tar.xz 401632 BLAKE2B e86bfc2b2d49a5525bdc75e43d455ff40e36dabf1bc1677cdd673991613d39c19d2cd2b1aea200dc1e409b0b29c0f7b3e62a181d4fb22cc8a2719b79291659c2 SHA512 d9b96081967f6271908624b303fcb358ebabf90fad2aa731f2c0e67e421921f47dfbc054d59fbdea875c3719407a717c40fd708fe915baef179dbe22c3242129
-DIST pim-data-exporter-21.04.2.tar.xz 398668 BLAKE2B bdda10d1e6bbfc0fdd67c1f86dbf3270e2683389505f40970f46523423750f77e43beaf136e7a7a12594ac81a8761df1249ef4733808eb76e35b22f8be854972 SHA512 b378e21f2ca7fa7e4a3ab7853469c346d55d496d89f5735fdc9ae55ef39d0bc83aae75b518a12ee7f07d493672844b72838d8c1ad205bfdffbb00c0e5d1fb2d6
 DIST pim-data-exporter-21.04.3.tar.xz 398624 BLAKE2B 18c1009482a351dcbd54f0db1623642a22944edd2faa1db54621abd2910c66c1807a7e001b373829a440df398219bfe97120a27f25447f2eebe34926d7612464 SHA512 fc700846b5af72e4b20a07be106200843ab3f7f16e15012c91d2a9364b18dedf5cadf3dc36aa9f11f15b676794d61194534c1a63173b4453ad1ee98ad90f933d
 EBUILD pim-data-exporter-20.12.3.ebuild 1648 BLAKE2B 66babea1822fda3a2817bb70db60b57742e9e45c7f529e738c6b58d66f9f4f6adf5f2fe01df7ad9a394448b17f9fe8d3f4d1f98b73ed1e355201126ba8098555 SHA512 028dcb3c19feb337006dd41f6644c9245d37b84df1ced32c0d2458e23e3a20f070cca16ca01c69a0680da8c6163f026eb9bef9e8b55e6e45ece78f9df8d4899d
-EBUILD pim-data-exporter-21.04.2.ebuild 1651 BLAKE2B cae0a76ee467b2836bd07e300b7e8e1a1e6f4cbd74f2ef759f034806a570de63b15d530b36987d27625b13739b81091f9e6014b11af66d335ea67f20693235e8 SHA512 8345fb32140a8200e2226b259428fa5f37e96868dce3600ded901e1b2bf73c02f375e7e065c9656a6bd3466e2034d2e24a354421c797ee24b0194cdb3c6a6002
 EBUILD pim-data-exporter-21.04.3.ebuild 1651 BLAKE2B cae0a76ee467b2836bd07e300b7e8e1a1e6f4cbd74f2ef759f034806a570de63b15d530b36987d27625b13739b81091f9e6014b11af66d335ea67f20693235e8 SHA512 8345fb32140a8200e2226b259428fa5f37e96868dce3600ded901e1b2bf73c02f375e7e065c9656a6bd3466e2034d2e24a354421c797ee24b0194cdb3c6a6002
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-21.04.2.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-21.04.2.ebuild
deleted file mode 100644
index 10a09caad62a..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-21.04.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE="https://apps.kde.org/pimdataexporter/
-https://userbase.kde.org/KMail/Backup_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # 11 out of 21 tests fail...
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 37732c563c24..2b406fa06d57 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,7 +1,5 @@
 DIST pim-sieve-editor-20.12.3.tar.xz 455152 BLAKE2B a4a28aeaf3a1ef2b612ae69f4503d1456f44af0e005eb3b36b99e4b75e7e394ac4386915ead419646277f106b57e6f889cb3fe86c3e1e79eef3bbe0abd57b6e4 SHA512 27270916ec2c41e2222ed1f5248091b19e6569564f82ff56d75204c81a6ad1ea7c0d6dbc907e2dc4d1a02f032162ecc443915f936f1577b0245f1b40d52166e9
-DIST pim-sieve-editor-21.04.2.tar.xz 458084 BLAKE2B 7f4a9b71b067d98d92e5ea93540155f9246ad9052e2146e38da4abc24d523f931d6bfec71105136d55473aeaa1735fef674089e5e3093af1df627393b2b22216 SHA512 eaf9ad2318ea4f11be04c7482669d3057c969cd922558424cfb4ce1a3e68514bff6decede5d26c12e6370cda32f4dae180420ce794f58a4d0c488332116eb99b
 DIST pim-sieve-editor-21.04.3.tar.xz 458072 BLAKE2B cc1edb9e6720b83cb910c85e8df647cc4e1e59e20146824f57dfa37aea4e657ec4227bfdb47f58e37beb436d997f5b092aa4ae4319d22ef3e7d2d4dce572a8d8 SHA512 017f6825ae373ca8201be593f11f61ef2c26b5490776d3278ba77c61e961e25746e79a405caffef0e8c7c9218161a6b28ec09e195df1a193ae8a72c348a6ee74
 EBUILD pim-sieve-editor-20.12.3.ebuild 1460 BLAKE2B 77bcb9e6d9350c953497b38d3df53ee4b19c1b2dd8b93e80220c277ef82c5294c0e6f7b25b78d4f6614c9a180f13a8783474cd30b31fb652caa11882ff05cb43 SHA512 c706c453440dda3b286be108b1b383e624a7817cbc6e87417e50905c13fb1931702c757510c2e746148d146289e31803042e0fe1696ea96cc2cbe5954a022f96
-EBUILD pim-sieve-editor-21.04.2.ebuild 1449 BLAKE2B 85e205adcd577eaa4072d78f89b67d47548d249cb71be24d015dfe81cad7ab8b10da44520dbed63761f9d5c52f4bf37e37bc83de9415480e9505033ffc4f3a5b SHA512 b148be9a2d7a0a6cd6148225b7f1d0d7f1e9be67460bf3e7f74272ce5a2b26b3040940c89cc06296a2320892479c11be2aaaf1770c6305705f3cda55c7bf886c
 EBUILD pim-sieve-editor-21.04.3.ebuild 1449 BLAKE2B 85e205adcd577eaa4072d78f89b67d47548d249cb71be24d015dfe81cad7ab8b10da44520dbed63761f9d5c52f4bf37e37bc83de9415480e9505033ffc4f3a5b SHA512 b148be9a2d7a0a6cd6148225b7f1d0d7f1e9be67460bf3e7f74272ce5a2b26b3040940c89cc06296a2320892479c11be2aaaf1770c6305705f3cda55c7bf886c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.2.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.2.ebuild
deleted file mode 100644
index f32fa623f8b2..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for editing IMAP Sieve filters"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="telemetry"
-
-DEPEND="
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 742ee07cc987..3a575d01a76e 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,7 +1,5 @@
 DIST pimcommon-20.12.3.tar.xz 364304 BLAKE2B ce571e9b57089b34caddfab9bac4f26916238b98c2853d5b69656fb56b0fdf656f4e81e7a479571c687a25027764be854c868705ea8fc2ec0844c826cd2a22f1 SHA512 f016b68ca9f768b7e3c506034f2d9d8e13e2325aa3291ded274cb8d71abcea521051180342a9b6ee4488ad54715da729adf48c0f2ab562030622dcc64de96df0
-DIST pimcommon-21.04.2.tar.xz 369304 BLAKE2B 494946617b07d719ee18252382834d99475f551107da62de9dd89638fdf08b7121a23d53388d68fbd574b4a1150ea5e5c5074e4d799737a5f7b7de135fa19755 SHA512 d5b2ac9c062109dd7a99f14db9f47e039a29481d4aebfae62f41867da384a5d8d8945154b53e40ad20d8917178a147e274da33d838c67d85a419e4ec624adf2a
 DIST pimcommon-21.04.3.tar.xz 369372 BLAKE2B 4f378ae377b664839e7e7e6bc7d00565fb7ba24371582277575c23e989fd722945f0c78f187e7fcf931a26b417380e3244bddb682a23677f032a6f8faffaaa41 SHA512 b2ff1ff7942e49676aedfbe923e3a3bfa26e170007b58d2ee07d80da466b4d701fbf0707720cdc10304c7c41381c3503781993e83f88414546e605896817b320
 EBUILD pimcommon-20.12.3.ebuild 1724 BLAKE2B 333abe758556fc07efddbec1f3000ce1eb5ec469edf3bdd3caa37f38932c7cb363d1a1295b9e13e7174df12ec5f9f57c6ff4743fb9f5de4cecaac52251925d7f SHA512 2a3c4778bf94b3ecc75e91d0d723bd8af83f8741f97b5cf89e30e4b823b4d6ce8818aa1cceb4f786904ee861e0c5ab5dbcd94a6efcf85925b468f4ca900fe0f7
-EBUILD pimcommon-21.04.2.ebuild 1727 BLAKE2B 452e163de6dec2c93ba949aa664756614d816f262e139434275a99e5f801e453323badc68f33fd4f26ca46c4f558120a3640d31409b6f44452d7e86537a65cae SHA512 a4a811247fc02639b4d95457ca3ea5afb3ea432909d8ddc1a11fee31ae93ef7231ce08a66c139b57487968cc83acbceb36cca6180ff32adcbb84d95ae52b6b01
 EBUILD pimcommon-21.04.3.ebuild 1727 BLAKE2B 452e163de6dec2c93ba949aa664756614d816f262e139434275a99e5f801e453323badc68f33fd4f26ca46c4f558120a3640d31409b6f44452d7e86537a65cae SHA512 a4a811247fc02639b4d95457ca3ea5afb3ea432909d8ddc1a11fee31ae93ef7231ce08a66c139b57487968cc83acbceb36cca6180ff32adcbb84d95ae52b6b01
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-21.04.2.ebuild b/kde-apps/pimcommon/pimcommon-21.04.2.ebuild
deleted file mode 100644
index 2f11c0bae237..000000000000
--- a/kde-apps/pimcommon/pimcommon-21.04.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=kde-apps/kmime-${PVCUT}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/libkdepim-20.07.80:5
-"
-
-src_test() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index fe250e1f6993..5d2f35ed3e93 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD plasma-telepathy-meta-20.12.3.ebuild 919 BLAKE2B eac14f096d35e38d013f3ce0e9c22d6789ed4c9283c091d6649be5eb3c988d3a18d9e3d22ba2b2d09428092bba6dd541147a0790658be73a53a28c724e81c0e1 SHA512 16d5447f93f7be39ed619da5ac843fbb8a58b342def5cc60f225102c8d28007ef1eb57848944ab1c4a28270ec6dab8dab56b15dde16a43824b354d5eaad66a84
-EBUILD plasma-telepathy-meta-21.04.2.ebuild 922 BLAKE2B 2d73d322b061cd9b9685089340e946773ce49efcdc5e35b4c93e53a0f8d867a94f5dd5b988b141552c2213e77eabd954ac34c1a074b74135bcfce449aa39ba27 SHA512 70424b1aed5e86fa90e8f3c0b61bffbf9cc383900e4d12e3d5bb9d82f9c3d3bfd49947d04448e948a3772b4d30a4f8da2cf2cf8cc0067abeedcad3f9fdcc20ca
 EBUILD plasma-telepathy-meta-21.04.3.ebuild 922 BLAKE2B 2d73d322b061cd9b9685089340e946773ce49efcdc5e35b4c93e53a0f8d867a94f5dd5b988b141552c2213e77eabd954ac34c1a074b74135bcfce449aa39ba27 SHA512 70424b1aed5e86fa90e8f3c0b61bffbf9cc383900e4d12e3d5bb9d82f9c3d3bfd49947d04448e948a3772b4d30a4f8da2cf2cf8cc0067abeedcad3f9fdcc20ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.04.2.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.04.2.ebuild
deleted file mode 100644
index bd57c061107a..000000000000
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.04.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Plasma Telepathy client"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-apps/ktp-accounts-kcm-${PV}:${SLOT}
-	>=kde-apps/ktp-approver-${PV}:${SLOT}
-	>=kde-apps/ktp-auth-handler-${PV}:${SLOT}
-	>=kde-apps/ktp-common-internals-${PV}:${SLOT}
-	>=kde-apps/ktp-contact-list-${PV}:${SLOT}
-	>=kde-apps/ktp-contact-runner-${PV}:${SLOT}
-	>=kde-apps/ktp-desktop-applets-${PV}:${SLOT}
-	>=kde-apps/ktp-filetransfer-handler-${PV}:${SLOT}
-	>=kde-apps/ktp-kded-module-${PV}:${SLOT}
-	>=kde-apps/ktp-send-file-${PV}:${SLOT}
-	>=kde-apps/ktp-text-ui-${PV}:${SLOT}
-"
-
-pkg_postinst() {
-	elog "You can configure the accounts in Plasma System Settings"
-	elog "and then add the Instant Messaging plasma applet to access the contact list."
-}
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 29382bfd2b76..aea151883476 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,7 +1,5 @@
 DIST poxml-20.12.3.tar.xz 43224 BLAKE2B 348b9a0ac90b2865befb840453448072a78bb661bc33f1d01f593ef50c4895f58db3253a7d8f638bfdd3d23df91a2b03d531c2df3770a54303cb64fda5bd1a0c SHA512 b96c21440018d3adbad0d8acb1a054e147b167398e98238cde90a27337891fa0092304c2cbfce786ba473a7eeaec44c9010911dd55763626ecefdd7377ee9e8f
-DIST poxml-21.04.2.tar.xz 43532 BLAKE2B 126416fe720430e15cc145d1d4392bc92e56b09078cb4410f2545f2e3536449b4fbea8976c4c6899ae0d9c82466f9847b6b67f749f0009a86851b57707b2f599 SHA512 18fc332c41937b4bddd6c28b5d2b0ddaf2f2cd68d142272db6b44e869c646d566524419beac6708abac94f00a9119099c30ec764fe0290516f268088ef88beee
 DIST poxml-21.04.3.tar.xz 43540 BLAKE2B 97c42e772625c82d1d2f6f994228eb8159130875450580d8e292fedd2f1b048d8672987929c256e07b5ae3d6735f602930917993d3c21738d32936cd4c8558df SHA512 52647f1574790e7f0c444e4a0ade0789da6034db0e68f8a9b92606c8511ca06c7f317ead23b4cb72db5330cf1e41e58646b98eb2c3bec47c6b8c813c60969df8
 EBUILD poxml-20.12.3.ebuild 409 BLAKE2B e44956fb6f363ab6ee88a386442587d7f35ed73a05f280886ec45170a79b7bf3691516127a64fa72d67e3475bcea1bf9bc7f006c35150dadb037af9a52d952b1 SHA512 f29398570744814b07ac3dc9a738f2c99f937407bf53a9fcb9c215fe48ef6c11dd2959dd4b2ffcffc9f9437c668635f0a0980d011292f2f1778dfb8d204312bd
-EBUILD poxml-21.04.2.ebuild 412 BLAKE2B fdd503cedbd21e297c3d5546c446908f0cffb87a79b18686c7de816adbc6e481b6a2d47b7cb5abc6f55ca27238ed2e1277431955a00a5a92f067e19d5bcc398f SHA512 6debe28fe0121346bd8805fb66fa9bd609d22580eff4502d4903567d3338e8f2aeb56c127e7daae0d4bf81bae3ff24aeaca1d5338fe65863ec69b81abed1f3a4
 EBUILD poxml-21.04.3.ebuild 412 BLAKE2B fdd503cedbd21e297c3d5546c446908f0cffb87a79b18686c7de816adbc6e481b6a2d47b7cb5abc6f55ca27238ed2e1277431955a00a5a92f067e19d5bcc398f SHA512 6debe28fe0121346bd8805fb66fa9bd609d22580eff4502d4903567d3338e8f2aeb56c127e7daae0d4bf81bae3ff24aeaca1d5338fe65863ec69b81abed1f3a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-21.04.2.ebuild b/kde-apps/poxml/poxml-21.04.2.ebuild
deleted file mode 100644
index 75837ed709a3..000000000000
--- a/kde-apps/poxml/poxml-21.04.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtxml-${QTMIN}:5
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index c8dc2e74284e..d7e5b8110e30 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,7 +1,5 @@
 DIST print-manager-20.12.3.tar.xz 258640 BLAKE2B db91464792bcc41781a73b2ae34f6a5b2df74f525367dd7668e0ba5b9261edadd8860bb9a1db38fede2313c5e18597481574fc06bd752fe3b7a887079e7d6590 SHA512 21030ecd3951cd1889ff4eb5a4998fc12f148d481bb66b8b7808fbcc5f38b1129e41e7e6d51ddd0ed2207c255be4c483d8960e05b02aed3f7691df85a7d1ba86
-DIST print-manager-21.04.2.tar.xz 263920 BLAKE2B 83a259fd6ce5da2d5e884345e0ebaed0b0b5645617138e870c16ac02b0ccb0d00576941a3016f172c834c97131d40c1856d7850a67a60de5b7e8dcd0134f28cb SHA512 96e618fc4cf9c93f2069d6097d78a211d38ae5b5e13aede09608f58292263558ab74a8f4cae0c76dd82e077c49a1e6e35a8f1511be8bb3a0c6c9f3f0fcb990ee
 DIST print-manager-21.04.3.tar.xz 263964 BLAKE2B 9e2646b618bd4b64d811ae920880414ca11b78dcdd74a815194499929d453649bc08d0a9b3043d472cedeef10ff66acdd64f63e499c6d68ced24cfda4abcc898 SHA512 6ee679f46301213dcccc15212f78c23aff173d9fab2f26a492cc7e07e95c5f1fa98a2feea5a42d3f0460ac3b7ce8147f5624cdc36c4def74f15dd2b924f9412b
 EBUILD print-manager-20.12.3.ebuild 1823 BLAKE2B 79355eaadd1efbc9c59942d0fab690436c89bea43c3a17fa695c9eb4c2839a1e5fc5a4a627e9e5c6c88d224c9252577efbf5a10fce434534ff183dee230474a0 SHA512 060501be5ae7c08ffafece05f9f14843631e6b7af46ef46e3a5a6c976b38e67d0994a14e40a783c09a44e09727ceaafb2eceb7d07691267d67918fa727a1f8ef
-EBUILD print-manager-21.04.2.ebuild 1827 BLAKE2B 2738bb4b6b366498db523fc5fe48b338032297bdfbb5edf61e1edf03a1544bbfbff26389fe662c167267e40d743832f6f5de2a1dde20b4aeff8d9a140a748b2d SHA512 b4302e5843f8f1f1b77d7f87664689dbdb15b38f88c153356c9eb02ccb770b414f0d9ea4980d78f4ab4d14d30494621e84c180e90d93d64fcd42307d1606f895
 EBUILD print-manager-21.04.3.ebuild 1827 BLAKE2B 2738bb4b6b366498db523fc5fe48b338032297bdfbb5edf61e1edf03a1544bbfbff26389fe662c167267e40d743832f6f5de2a1dde20b4aeff8d9a140a748b2d SHA512 b4302e5843f8f1f1b77d7f87664689dbdb15b38f88c153356c9eb02ccb770b414f0d9ea4980d78f4ab4d14d30494621e84c180e90d93d64fcd42307d1606f895
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-21.04.2.ebuild b/kde-apps/print-manager/print-manager-21.04.2.ebuild
deleted file mode 100644
index abe7a41c6a5d..000000000000
--- a/kde-apps/print-manager/print-manager-21.04.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Manage print jobs and printers in Plasma"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+gtk"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	net-print/cups
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-	gtk? ( app-admin/system-config-printer )
-"
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then
-		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
-		ewarn "an important, though optional, runtime dependency:"
-		ewarn
-		ewarn "app-admin/system-config-printer"
-		ewarn
-		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
-		ewarn "and will show the following error status during runtime:"
-		ewarn
-		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
-		ewarn "was not provided by any .service files'\""
-	fi
-}
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index 2472d85c97f9..ff4cded2b8da 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,7 +1,5 @@
 DIST rocs-20.12.3.tar.xz 1492376 BLAKE2B a751c79a0766b1d0534c76b2fa635a1458796d6188162601ee0f4b586115a82760cf6adf699e4e4824e6e0a4a67fd9cdc6ec721f9373f17ff23a2b2bfa1acde6 SHA512 12bd3c8c7c7e46a9da630fe722a2ac1db58a03a8686c2d6c5a852da204d84e9ca071d2a812caeab0915214983d755175bee592c712cf2f0fcdbcf57be29cf8a3
-DIST rocs-21.04.2.tar.xz 1547680 BLAKE2B 063bd576c17f595af47b4044e5f16b157e05459f7fe3a1e1b286bcd3864633b710603c8ffc655fb18d8daccbc1f455216cf4640a3a2998a1a28dd818e291bf30 SHA512 750684b431ebcb0b5973cbe13b72f6f94ce4e54a841e6fc7974da2cff18ca97fccf3ecce101cee02e9e5ae19f662c7e9d77c501867bb67c95e8a4733ab6e4198
 DIST rocs-21.04.3.tar.xz 1547728 BLAKE2B 7088fa48653da5a5f4fc2f8dff9fc38233e15701a1139934ae06660e257a579db0c7a442305daf75129cf968a872b45a564ca563609e67ad31f6133d11b114d1 SHA512 f097157f7664a637448055a2b9142dcb4b0fada3a811f8efa1f37c3f23f486b613aac367f4248db8efc3fbe6ca8c350b5c280c3e382b8bbc331e2659a32fb1fd
 EBUILD rocs-20.12.3.ebuild 1299 BLAKE2B e2bbae71b8aebb247e0e0ab769a8eee5a20892142c22997768610bf2155681fb791c92fcf0522c84f90d919ff718b55bf8c74cc03536aefabc8fd2f44f657e35 SHA512 de9f6cce0cbac87b87cd96dbd5087ba2a54bc7cce043f9d7bd9654e38b6d193d447b51fc18a6315c7abb8f76ca8f5f349ffcdfb5562d0d242f9c245296896912
-EBUILD rocs-21.04.2.ebuild 1302 BLAKE2B f4208674671afdae1c88b24ad2e74a6ad01e47aeaf9b41cf1e4040da377e923bc1c7b0ed7b7debab1a6bd6432b7919bf290cf8df091d9d06722441b28269a750 SHA512 706a1d54ab407e010314346f841cc849bad101f2b270fab4106912229212d21c5a01481f6fa61f360582e862a58b2deb8b243f62437f3958d6678085f16914eb
 EBUILD rocs-21.04.3.ebuild 1302 BLAKE2B f4208674671afdae1c88b24ad2e74a6ad01e47aeaf9b41cf1e4040da377e923bc1c7b0ed7b7debab1a6bd6432b7919bf290cf8df091d9d06722441b28269a750 SHA512 706a1d54ab407e010314346f841cc849bad101f2b270fab4106912229212d21c5a01481f6fa61f360582e862a58b2deb8b243f62437f3958d6678085f16914eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-21.04.2.ebuild b/kde-apps/rocs/rocs-21.04.2.ebuild
deleted file mode 100644
index 0a89496dabfa..000000000000
--- a/kde-apps/rocs/rocs-21.04.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Interface to work with Graph Theory"
-HOMEPAGE="https://apps.kde.org/rocs/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.49
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-"
-
-RESTRICT+=" test"	# 1/10 tests currently fails
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index 119b438c2f36..ab89299a42dd 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,7 +1,5 @@
 DIST signon-kwallet-extension-20.12.3.tar.xz 10700 BLAKE2B 3cc19c19e472e4a14c12513bce10e79beedc8c7d9714c0dd589f7f4f6b3ebe4710a12257a646b450c217f0a25319687f3cc292bde86851c49ff9ef4b0ba53802 SHA512 ab8789755435dd7263cb780169bab0b9f562b33ecf948d46a513713c54b301584287493dff4a07f73584eb089ad498fdef62252a28154686a307b05138f5f5f3
-DIST signon-kwallet-extension-21.04.2.tar.xz 10768 BLAKE2B e4bed9bb694f4b32b712eadce6743ea482526f8933a9658473186687ec4d53874fce6816175ee95c26cb034658fa7ad066b44ea51b135a7099ead66875b06573 SHA512 459897cbcf6319fc60144088f9d5253d11c4ebd81ddba23d817833adbc03b43903fd0a6f768a3dcd81cfd6bc7a625d8559dfa05d10246d169d2aa6ea175e060b
 DIST signon-kwallet-extension-21.04.3.tar.xz 10780 BLAKE2B 1253500a0317054d2a965facf965d903e62f09eb37c7d23fdd99338d72aa03b43e321c78de47f0cf09f6fe098776b2225b21d73223f6bb5c506af058c5836135 SHA512 26ead682a111548b1f6c4cb6c9c9dbe53613bfaea81c835a3c30d1af2eee0f571f0dd179e8a837d719893f482dd22479c413e23c6f212c7615484be816224136
 EBUILD signon-kwallet-extension-20.12.3.ebuild 375 BLAKE2B b72243b6328828cf9777d5ea3af3dab651ed0f3cb8ed26b1416472f005faeb765dfc665f740518335f2e5b340132031226edaa9018622626803d5a193fb078ac SHA512 6bc5534301e8cf98a39753ccdb04fe4749f62c2596abcc39973857b48b6021c023891c83f46bad861f6f715e69bc8130eeaa7ae3e8fe1ea7c90e741603879707
-EBUILD signon-kwallet-extension-21.04.2.ebuild 378 BLAKE2B c3c6230f8f000c981947149d876ad47cc834d4c3f434e90b065ccc7aeee1cea2e85a7dce82ab4734e84ac4cb71bc0ed1be41725f77eb3498f395120a3c931635 SHA512 97e4ab04bf76fee617bea3cb75cadbbc2ae9192aed47881a3794fdd4dc389299501134e7650a060ebe8c7e149e805171e01fea18634a0726205db6dec5198fae
 EBUILD signon-kwallet-extension-21.04.3.ebuild 378 BLAKE2B c3c6230f8f000c981947149d876ad47cc834d4c3f434e90b065ccc7aeee1cea2e85a7dce82ab4734e84ac4cb71bc0ed1be41725f77eb3498f395120a3c931635 SHA512 97e4ab04bf76fee617bea3cb75cadbbc2ae9192aed47881a3794fdd4dc389299501134e7650a060ebe8c7e149e805171e01fea18634a0726205db6dec5198fae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.2.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.2.ebuild
deleted file mode 100644
index 950f53cb38db..000000000000
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-inherit ecm kde.org
-
-DESCRIPTION="KWallet extension for signond"
-HOMEPAGE="https://accounts-sso.gitlab.io/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	net-libs/signond
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 91797dcef81b..b9ce8635eee8 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,9 +1,7 @@
 AUX spectacle-20.12.3-implicit-dep.patch 1182 BLAKE2B 960532ea3a502c685904ec408c14be0b3dfe9c0a46662bcff0e2477f48965a96db66b0abfe5800adbab47fede2842eda0265a1997761abc4345abc6d4b4cc90a SHA512 b2de818b84a7cd98ad24a6fb4cd1b5712b9f0f0ca92b28cd2cfbf40f03a49e8761b81a821f13a55a8d240b9aa34fa98b13eb42a9325e350c1d8810b63ae3e122
 AUX spectacle-21.04.0-implicit-dep.patch 1179 BLAKE2B 62bd639d12a32b6faea613608160ada4854dc780b999e7b98204eea36b82f3e001097cb9c22d08056cd5765e43139daa9c02b7c74d79e745aac0d3021b5ce85b SHA512 d2257372821524a471ad75617df2f631a73f7b9a09e59adf1775d60fd0bcff393df16382a5fa9b109a7ffa8ca5684639ee565304a99b854272f8ab28570dbdaa
 DIST spectacle-20.12.3.tar.xz 1170540 BLAKE2B 865c4f7a2b8a3edf727f551c64ce35847a880023773b72531ea324addf5f0ac327261a87e35cdea6ec1f7eb4b75d2f8b86c3d1b7fc7719959623653ebe542a93 SHA512 4749916ff1557d89c3a8aeae06ce2da4e3f5bbbc3495a588209d797453b265447a857266889a81178f33b12631f6ec29be7a65a3f98f27de604c198e997795dc
-DIST spectacle-21.04.2.tar.xz 1174904 BLAKE2B 42a6c58d27f405623264704574afc1143097e76fd0c8a4379b1c78db42ba66881dd592d948f5a55803e5cf8902a137a9dad2ffecb295d21bdf55b9cc369a7b1a SHA512 0fe6ca8b820b9d63edea5a43934a49fdcb091c0f744873cb6b04bdc773f1f8b64bbdf585013b0ef048d5a3752a04978d4328909b44ee9c82206a0df39d7a014c
 DIST spectacle-21.04.3.tar.xz 1175024 BLAKE2B 00d5ca9bf905b889e1ebbd510efc7d86571533e53206c5c65130d8b018d9e1941e283b698baab497928c6e3255d067ae6b4fde279945c0d56ed7ab7e9f226e83 SHA512 86af85d322c8d1231c4c47edaf886077dcfd1b20a33d6022ef5a8a543261e3d9f8c7b33957140d32f346c3dbaa87e13c9bed25b391771185468b4994e7ca3841
 EBUILD spectacle-20.12.3-r1.ebuild 2073 BLAKE2B 505e238d82c9c7f7f771323c84125adeea52304a3a04ffc1dfe0d9a5e1e9b78e6cf75c1992c8c8f47aee1019517e61f48b2a9c2511838850a2c43ab8887e2beb SHA512 4a19ab0200c248a33142e42bc86879b9289658b6a05fe34f8eac8a4fb2a485dbfed7c625dc223a53bd3c5e6ad1e67ded49216069be27a52e57002cf917c014af
-EBUILD spectacle-21.04.2.ebuild 2083 BLAKE2B 87e4773b60f7e8711e34aeaa3b3000661658649d4bcf1c86543fcb55ec66d5d1ccbb479b911da317769f6f6b5feee660db012c8eed1bd8d02452786b9ad3984d SHA512 6d7d782a9ecbc714ad4ad361e525782762e4a2a61b495c554fc8524248346a07ae93265e3756c2e158c714b1534eca74fada0cc5362e0fcde996bb4d46473272
 EBUILD spectacle-21.04.3.ebuild 2083 BLAKE2B 87e4773b60f7e8711e34aeaa3b3000661658649d4bcf1c86543fcb55ec66d5d1ccbb479b911da317769f6f6b5feee660db012c8eed1bd8d02452786b9ad3984d SHA512 6d7d782a9ecbc714ad4ad361e525782762e4a2a61b495c554fc8524248346a07ae93265e3756c2e158c714b1534eca74fada0cc5362e0fcde996bb4d46473272
 MISC metadata.xml 558 BLAKE2B 304071c16927d1f17fb0b30c3bc71ac9cf707a9cb06816957a8382b3eaac9083d3456b142bc3e0dc745588f14641e461c20b13840258997c85b84bbdaa5659e8 SHA512 0cc62fa4faa18491636dd37eea421cfc880e8997101420e15a876e070c6c14369063f6785d1f0474b3d79fc42860455fe4ffcb90db9f7a61e0492500d19aaa44
diff --git a/kde-apps/spectacle/spectacle-21.04.2.ebuild b/kde-apps/spectacle/spectacle-21.04.2.ebuild
deleted file mode 100644
index aae20e31f195..000000000000
--- a/kde-apps/spectacle/spectacle-21.04.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Screenshot capture utility"
-HOMEPAGE="https://apps.kde.org/spectacle/"
-
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+annotate kipi share"
-
-# TODO: Qt5Svg leaking from media-libs/kimageannotator
-DEPEND="
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	annotate? ( >=media-libs/kimageannotator-0.4.1 )
-	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-21.04.0-implicit-dep.patch" ) # bug 785403
-
-src_prepare() {
-	ecm_src_prepare
-	# Unnecessary with >=media-libs/kimageannotator-0.4.0
-	sed -e "/find_package\s*(\s*X11/d" -e "/find_package\s*(\s*kColorPicker/d" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package annotate kImageAnnotator)
-		$(cmake_use_find_package kipi KF5Kipi)
-		$(cmake_use_find_package share KF5Purpose)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index c6a614fc3ea1..7efa4d42b300 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,7 +1,5 @@
 DIST step-20.12.3.tar.xz 958852 BLAKE2B c233e726bc208e4aafb38dde481d7154781894d6112c3d3133f7a4cc8280cb2d21f474a0e9cedfea7683b4f4bb25f9dbafa115def4e6dc002418edf2c4833387 SHA512 d5971012711b3e8c0e9a85844babf26db983efdfee77dc112f419979d9f8fca9374c81fc8612511928b1bc4cd7b3a385ff821739fb6e80f77c60d37194bc78a2
-DIST step-21.04.2.tar.xz 968600 BLAKE2B 19ebcd89350c2cdbfea3389822f9a86d97b6159f60d4111708bb07092acedee11a5cd29cd4a2bfca2b72766a5e06551ae72b0420f44721c7636d185592cfddd0 SHA512 cc07c7946fddaddccb7d641228892f851758816a11133463ae9c1d9ac29556e596eab198d332057a2d008da4856727b865f945e98b518fa5bbfe4b5f99ba2aa3
 DIST step-21.04.3.tar.xz 979172 BLAKE2B ab734e21dfa406be1686632f0f10376354a8a3d633a3c539b266814a5a14b9d98db7b9a11652fc9490e0a1419cd0220b066274a46ad18baed198de116925318c SHA512 273c5424321a1508a715c4553c954914dbd8b0a42b8ca0872d61ed0d272f252262f6794daa64d5764366f406678004c51cf0224541da1a813d99bd7502af1898
 EBUILD step-20.12.3.ebuild 1436 BLAKE2B b232e72e69a44419216160553f05dbeaefb02aa8097e3d883f09de32705374e95e941d060e6c8bb5bb0daf0004d6a910925f074d2a311d16327dd6b3ed262b10 SHA512 654a0f6699358f4aec3fb21285b0b96d83d2d228fa81c9dc08d2d366fb70b0e99ebf6f2f5b5429b930e918e2608a0706924f671a2a805fddc576f04f1afdbf24
-EBUILD step-21.04.2.ebuild 1439 BLAKE2B df403d0fdb1f2c7fa8dc6dc80eb70c74440c0c23075185c64bfb10ddfc8938d6b94e32cfea23e3dbeed69264f5f555caf35c4be3406f867ca32457ed507d9447 SHA512 6d3fcfc077255e2422ee5e20dbece5433e141ccdaade44cb414a76f5a1c46333605ebb57750118456c0d18019173b042586e98026bb7254d6d59c8bc41256e2e
 EBUILD step-21.04.3.ebuild 1439 BLAKE2B df403d0fdb1f2c7fa8dc6dc80eb70c74440c0c23075185c64bfb10ddfc8938d6b94e32cfea23e3dbeed69264f5f555caf35c4be3406f867ca32457ed507d9447 SHA512 6d3fcfc077255e2422ee5e20dbece5433e141ccdaade44cb414a76f5a1c46333605ebb57750118456c0d18019173b042586e98026bb7254d6d59c8bc41256e2e
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-21.04.2.ebuild b/kde-apps/step/step-21.04.2.ebuild
deleted file mode 100644
index 208718a97732..000000000000
--- a/kde-apps/step/step-21.04.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Interactive physics simulator"
-HOMEPAGE="https://apps.kde.org/step/ https://edu.kde.org/step/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+gsl nls +qalculate"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-cpp/eigen-3.2:3
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtopengl-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kplotting-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	sci-libs/cln
-	gsl? ( sci-libs/gsl:= )
-	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package qalculate Qalculate)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index a9e98bd10ad3..bf6b3aeb37a7 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,7 +1,5 @@
 DIST svgpart-20.12.3.tar.xz 23348 BLAKE2B 90603213def1786b0f75b5b987612f66c0bbdba70d931eb7b16b6fade1058e38e6df7118fb225041409751d769915c6be2ffd4089e60d040d2dcc1d6637f21c9 SHA512 4c7dfc802a4a24d376d18c749743f1e8e248dd26f7794dc482952a9fc969c7c547ddb5462ec5dfdba9229e1f56f4c0886417b3422819beb9ae911ab75d4a4558
-DIST svgpart-21.04.2.tar.xz 24576 BLAKE2B dd47bf51c7071aefd65c351ffdfe3c797369de75bd68fc476398c9bf3b2b6cc7ab65b121fca5557f1adcc5bc997be99f0a0e505f20d777a3938107c8af8ee8bc SHA512 71fa6daa8aaa062c18b036159dd779aea19638b78233588734861c8a735e77c4bbbf118d1838236bfa4172a152c2cc8a3a87ce35063738146d3664705a750c49
 DIST svgpart-21.04.3.tar.xz 24600 BLAKE2B 06216a156a15abe07303ad937418a048c3c6e4a4889878e92f2089b8c5ae7de548f900da32f783796a3d52edf3d40e4d778e3cc092bae9345a4b77e87b958332 SHA512 ca0507eb3e0b95462161cf3f883970d32ca1dc266b319e7f959db1ec06da5a593c7aa71b8185cc8af226e5e86c6c5e3238c6607048877e546cf7eadc0970743b
 EBUILD svgpart-20.12.3.ebuild 576 BLAKE2B 014c0e414a49ec0da999f78838d4b8450c2b043af0d54d625a8563f548c76ec851d12f065f32865df24e778a9b7e7ec3f0eccebd20f83a8beb6a976989d53939 SHA512 8ee555f716cb37c49368de3f1b5e95d4b5152dfd3374061ab3d10b61c82bccda15742a63893d5758a2c421ebdb642564109b12e72df8797fe10496795be5feb2
-EBUILD svgpart-21.04.2.ebuild 579 BLAKE2B ee651a3d8f9c100fce62ef48179d504bca435576561ccb96bf03d7ca140b4d5f36d27d8b3db4ce0fd47d3e68fe9319c16ba7de17ed8c00b62b1e83e8c2a0be5b SHA512 8089a946b496e6bd0b44a3aa94113fd5fe12aae6c7e294b750d8f9bf0a8c275ff6f19965647e1510d335d34a81b8828a28811cb9777aa25173bb1adb81b2c35d
 EBUILD svgpart-21.04.3.ebuild 579 BLAKE2B ee651a3d8f9c100fce62ef48179d504bca435576561ccb96bf03d7ca140b4d5f36d27d8b3db4ce0fd47d3e68fe9319c16ba7de17ed8c00b62b1e83e8c2a0be5b SHA512 8089a946b496e6bd0b44a3aa94113fd5fe12aae6c7e294b750d8f9bf0a8c275ff6f19965647e1510d335d34a81b8828a28811cb9777aa25173bb1adb81b2c35d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-21.04.2.ebuild b/kde-apps/svgpart/svgpart-21.04.2.ebuild
deleted file mode 100644
index e383e448ffbf..000000000000
--- a/kde-apps/svgpart/svgpart-21.04.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Kpart for viewing SVGs"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index ab267b6b88d8..d12bea81d2eb 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,7 +1,5 @@
 DIST sweeper-20.12.3.tar.xz 372484 BLAKE2B 18ced322ef1864c2870bd0b15bddd8eade04edfd3d8bd1b8fee43acba2ea1d1c09969907258ecbd746b2a6b48fe04f3942c5c8b944574ee366eda5ca2448f5c6 SHA512 0bcdbb48f89d6ca0b5d034c85c8e05afc79299af39363a057b107208c06ebf71f9b9adfe498af028078dfa36c9dc3229fe95b2c123b698d9c0a3e9830d825148
-DIST sweeper-21.04.2.tar.xz 376420 BLAKE2B ce1675450d549434cd94827019b1b0624e3f9ddd035b68186d0f2d3de04f42e9c2ca2f91ae8861e6bf67c15c292440706a6d6367c2d377aaf4dbb246b707b975 SHA512 9e49ec8468d9ca8871ea4b093e14e92b1ff5e5ba60a16037df7a71b62f968ccb9d2f2a63eb5e33d9ca731111f32a93f482a5a6d8a1615cd0c1da2eeddf176913
 DIST sweeper-21.04.3.tar.xz 376440 BLAKE2B c22d1caeb59126157381961a8fdaeda9504010f1c0732280d2b3a031eb35467baf961703f17e4d9c177c53cc4c52f377b06ec2d42cac2aae11a23de72251da81 SHA512 b500294b708275aa6744c4d2db6aaaf306c939de337d878d9f5a00318a7d76b3e1597b8f87402953a90a4b3188d643a53d41fd85848a4aa56336b0dd76846eb0
 EBUILD sweeper-20.12.3.ebuild 1010 BLAKE2B 6227a6792cf69e8f0d126212637b125055ebdf57a7c89d392701df1c1ec00d0a8aefc181aa58e2892c99101a42d0513db9eae4e8e3dbb80ffd0dd788183720d7 SHA512 0aecf92185cb04a469b06fb81212919a855ec7695236b50ed4df10f558f4b45b512f47756decf8ec2129b6f00ca6d4f1a64fe839623e564382fb31aa0a0cdae8
-EBUILD sweeper-21.04.2.ebuild 1013 BLAKE2B 57c63bb7873a2e51b30a1cc8778bf9b2d17d0c7984f275d81f2762ccda575aa1065f7e4ce20916004afe6960f5229d76c16d553091def9b6d1f2a871053e8d96 SHA512 593118f3cc7b353fbeaa2b31c57bf5988194c5b7a113f7745040d901b03919f11a96c4b462f95ec057cde65ff368fde2258f78088a16f742f7a16ef77fa34d6c
 EBUILD sweeper-21.04.3.ebuild 1013 BLAKE2B 57c63bb7873a2e51b30a1cc8778bf9b2d17d0c7984f275d81f2762ccda575aa1065f7e4ce20916004afe6960f5229d76c16d553091def9b6d1f2a871053e8d96 SHA512 593118f3cc7b353fbeaa2b31c57bf5988194c5b7a113f7745040d901b03919f11a96c4b462f95ec057cde65ff368fde2258f78088a16f742f7a16ef77fa34d6c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-21.04.2.ebuild b/kde-apps/sweeper/sweeper-21.04.2.ebuild
deleted file mode 100644
index 63553fafd988..000000000000
--- a/kde-apps/sweeper/sweeper-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Privacy settings widget to clean unwanted traces on the system"
-HOMEPAGE="https://apps.kde.org/sweeper/
-https://utils.kde.org/projects/sweeper/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index 2eea57d28a27..ee61fe321cf7 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,7 +1,5 @@
 DIST kdegraphics-thumbnailers-20.12.3.tar.xz 47048 BLAKE2B 3744e6f2db37ca480e2e63d9895f207c0a45219650e40f0c2748158b4ac39773f5c153163a2eb190cd818b5c77ca5f2a1414736be8b3704abdbe0efb3a1cf2dd SHA512 f6f31b3ff14f81a9b7d8e25ba7be4c6def72815cf113c0f6d78b5f9568f5fc31d707950d10ec314406bf92ab94284492277046d0d476a8a94542b76b6b0f927a
-DIST kdegraphics-thumbnailers-21.04.2.tar.xz 46940 BLAKE2B f57f77740e8ea3ad14a88b98473844ac283c1374178b8f4b7cd71e7d61b901c83a9bde55f6c9e04249363b8f725ab10999e3407adb692a3161bf7495951c9a0e SHA512 21687bd96be11e320292ed42ae14220b736cb0c16921f28cdb2d3dbf98e862a91f9456e00f8b665acda46772c325dd8b7613d6e356245d0126edaec7d4941197
 DIST kdegraphics-thumbnailers-21.04.3.tar.xz 47152 BLAKE2B 8d5b4ff3f5a2cde19df7a55dbbf118f01ced761086942c89e9833ed09c72a02faefe5314d019d52b2296fb128f38302e99f9d9ff20aad9319e19c320271b1206 SHA512 3534c79f21d7f61ddb15a59ca08c22cab335c478e00c7a1dd0190c7e0ede69abe21c0ff795f39ad6459bbbc7b7589268511d668a0be3a28c508e252bbfc26823
 EBUILD thumbnailers-20.12.3.ebuild 711 BLAKE2B f68011ed58ab43ba8b82521ded210e5878b9271266a5e7da7617a6e35556be53e137e8641893d206cf036eb974eb88d11819722317454014754d5e1bf5b8e291 SHA512 0c097fe2180a249fe1c237ee7c0b410615eabe58340c2c8cff32957458ea6e5e15aa0caf19344ba86414eba38f7d3a7ac3115c6a05eb37f5d8c32375d358a04c
-EBUILD thumbnailers-21.04.2.ebuild 714 BLAKE2B f55cd05cb4d1561a37a27bda8668aa87f240716f0e7addcc2620185b5416e14b646dd5a7cf011e64052d7fd814c14c9f2cde1d24884517828fea19d6f4b9a302 SHA512 16b0bb9596d512af230de795b3a2df6418ea84cce0ab909983163e59b1054d010c7c1f7c606ecdf9bac5c13708dfb90226b7d36c7e38bb721e7037a03b17201b
 EBUILD thumbnailers-21.04.3.ebuild 714 BLAKE2B f55cd05cb4d1561a37a27bda8668aa87f240716f0e7addcc2620185b5416e14b646dd5a7cf011e64052d7fd814c14c9f2cde1d24884517828fea19d6f4b9a302 SHA512 16b0bb9596d512af230de795b3a2df6418ea84cce0ab909983163e59b1054d010c7c1f7c606ecdf9bac5c13708dfb90226b7d36c7e38bb721e7037a03b17201b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-21.04.2.ebuild b/kde-apps/thumbnailers/thumbnailers-21.04.2.ebuild
deleted file mode 100644
index f87257dabb2f..000000000000
--- a/kde-apps/thumbnailers/thumbnailers-21.04.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="kdegraphics-thumbnailers"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="raw"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	raw? (
-		>=kde-apps/libkdcraw-${PVCUT}:5
-		>=kde-apps/libkexiv2-${PVCUT}:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package raw KF5KExiv2)
-		$(cmake_use_find_package raw KF5KDcraw)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 5079eeedaf5e..885aea411710 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,9 +1,7 @@
 AUX umbrello-20.08.3-gentoo-docbundledir.patch 1990 BLAKE2B c629fa51a4d701576e2c5bc870d8368851773687b93309a02986f2cd3140089c435a2964edafd1be930796906295bc8ef1477ba8c9837f560f986ed07ae19358 SHA512 9635b33d0aa612eebbbed37f82812b5f1ea8edcc6bfd0a8749e667cbc718d3ed56568397a6db43838a84f04085682dcd5c3a8a272b92bd9ee9a84de30a2f2d40
 AUX umbrello-20.08.3-no-qtwebkit.patch 3168 BLAKE2B f3908ac2755b70b611182b9b92bf8d08124d11bc0bc690d2c49bb40fd498ab9a0cdb55b0dbac54d0a355c322ac65ba611c48d4a11a27d498ede1f3f3f251ca43 SHA512 6437226d9d3970f6ac8e9b0a53546470e2235021a3e1d4d3339202ba1107259f26ef817760635f40a4cf3ff581f301f49a665c22ef1f070236885ef25bfb24a0
 DIST umbrello-20.12.3.tar.xz 5555804 BLAKE2B a923d4f4d952dbbfc8166b2ca2bff990a4ad8652762277c3f16d4c37ffd26c1761a3480d45640c2821b0e85633158a90d82358afedc11fae98b2d5e58d0e7f57 SHA512 619d83ffd307be57fc8f3dc935dde6bdeffc60186ab675b8f2e530bb6a125ec1e03fccc49772c6d4cc120b3280e56f28344cba2627c3b955f9cd338cd071da6a
-DIST umbrello-21.04.2.tar.xz 5644440 BLAKE2B 555bbc84e6e5416c9d3570944309012acd922cbe24d2d3c58ffa0db36bea0bfe0bf8b6992b519c22becd2f642d2f4762b7202b82ec69a3b8483af9ef64df2743 SHA512 743a09ad98a8af7082371e741ee515ea6afa46936196f2e22087172b677a068c8d92d1c71a1374f583b14f9ec7015a52422a979a56932bba7b277c987e63500f
 DIST umbrello-21.04.3.tar.xz 5650032 BLAKE2B b306695798eb2791968b9b4ad98b34825c8712800fbf2a87a2f6398768cf9bcee1e94dd1efa8d513f2cb8f07f683ee880c8e655236d88b96c3c1bcc98929af6d SHA512 f4f632bf37f4170ebf6c1d776b70b058ded1c8a1a9626adea1c9b63e7d7cf45c0afaf77c4c9bf778c601265b9d819f5a898813ac32b58bcf29d7ab94c753d73d
 EBUILD umbrello-20.12.3.ebuild 2043 BLAKE2B cf0a07b193d6bf640ed0d114fdf82dbda393ac43c07cba0f23743e1362afea682f9ad5586fdef6eff0727755a9b6441708a5fd1b5f6497c4788e91a1b6b82c45 SHA512 8f006c081a1b0a15e658ee0fc0250e47a9dad746b858c392808f0b70ab2cd532e4eb040e523aecd86dd80c5f22fb8b1efe6d25110183493248310993d1d76d65
-EBUILD umbrello-21.04.2.ebuild 1996 BLAKE2B 4dd16b6c38de8d1cbd66c596862468c2ac712bb007b17f098e23cc62113e4b3945426c75e6e130d4f2540a097be550e80337695fbe107c393a7b601e5e3b2cfc SHA512 2ca9412fb16886a17ca7890a739bde239a75251bce99a26ee7e37ddc545df30a19f0dcc2118122a2b87509563c20d30134fb8aa8eb9c824e74eba15f0b1d42da
 EBUILD umbrello-21.04.3.ebuild 1996 BLAKE2B 4dd16b6c38de8d1cbd66c596862468c2ac712bb007b17f098e23cc62113e4b3945426c75e6e130d4f2540a097be550e80337695fbe107c393a7b601e5e3b2cfc SHA512 2ca9412fb16886a17ca7890a739bde239a75251bce99a26ee7e37ddc545df30a19f0dcc2118122a2b87509563c20d30134fb8aa8eb9c824e74eba15f0b1d42da
 MISC metadata.xml 390 BLAKE2B c631566eb3c7fa8c1826b91e33c209ac431b66508b21e457166e291d15cdd6c5ca45203f148f011926625fb1a1daea875b696c2b7088b5d568e7292c63e74ac1 SHA512 cfce84a2844d675cbfd3a9546b1f95bc2aec863f2bef680d8c6fa8ef2323614d7e678e3ab411ed33d0b072e3820d44ef1e343d3570c4ebb0fd8e492dd82e4813
diff --git a/kde-apps/umbrello/umbrello-21.04.2.ebuild b/kde-apps/umbrello/umbrello-21.04.2.ebuild
deleted file mode 100644
index 6ece79a34400..000000000000
--- a/kde-apps/umbrello/umbrello-21.04.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="false" # TODO: figure out install error
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://apps.kde.org/umbrello/ https://umbrello.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="php"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	php? (
-		dev-util/kdevelop:5=
-		dev-util/kdevelop-pg-qt:5
-		dev-util/kdevelop-php:5
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.08.3-no-qtwebkit.patch
-	"${FILESDIR}"/${PN}-20.08.3-gentoo-docbundledir.patch # fix hardcoded path
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		-DBUILD_APIDOC=OFF
-		-DBUILD_KF5=ON
-		-DBUILD_PHP_IMPORT=$(usex php)
-		-DBUILD_unittests=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Clang=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_CLANG=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index df71bc4d379d..46af0cd9264e 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,7 +1,5 @@
 DIST yakuake-20.12.3.tar.xz 382104 BLAKE2B 36d10ac7193b0be54d24d1bdcb751a8c6d09efe82408ffd2a2e6acc33df11858afce9f649a270fa22bac55f34761d9bcac7eaa94b1a5394e5a461e4aead9826e SHA512 d4cd8a58744b20c5183b8683fea38d4df319864d9ced6b8c1acd1a46f1a3beae38f157562966d43ed136d23083eeffd89949c92ec3813d93b187ae61689c4781
-DIST yakuake-21.04.2.tar.xz 393032 BLAKE2B 866aa2dbfdbe7dd28e4fea985e870fa2f19f8e76b3c503b78d6357260b43ac0426777be38c343229b3f3933f0a819194bd83839dc02210cf97e6137a8956ccd3 SHA512 4b19a5c8101e897b37c8063aa17eb8e263facdc8c963bb56a5c4d7b1854f36e8d24bbbb390bed0b91b30d071f97e60c6d56dc29e3a66b6a5911da49b31fc98ee
 DIST yakuake-21.04.3.tar.xz 393052 BLAKE2B dae07678875d05e73ffb8cebd9cd09457f00a53542e001e7c6e70027824c2fde9f1f84a397546afb41a3ab1208718c426cb7c60ebb9295149b0484f326163ad4 SHA512 d4f651bfcc9db787f8b53c7237e4c19db33a7c2cd4c337ed271b639886a1453e562236be589644896de0fd82cbdc7adc41a3e16a20c8d6d7fadb4232849ef5c7
 EBUILD yakuake-20.12.3.ebuild 1543 BLAKE2B baff01e1da502db0d954b3142e1d01911f0eddc6d2b38cffa821efc8d91b74bd240c9099e4e368eec9f72f88eeb30f33fde4c4bee5e9c5979fc57a9d664b48fa SHA512 a76eb12365938c6aaa34b6453b18203e588ff6062f0ebbd5cd4edebb96f7dd5c1b4628ecede6f780482a480a349f39c503972e328526624d25eaa4acfbab1a2a
-EBUILD yakuake-21.04.2.ebuild 1546 BLAKE2B de98c4201862ccf0e7e2e83e4cb2cd574b9877c546b15ece83d47ded2d4065bb7895662225dc6173fa501084efe0d4d50f7d9867b794b50a8b1a2f8683c8ecdc SHA512 dbce16ebe4442f3fbe19289df3a9986173e3f59dde9e2d67b1988152c7a51619534d321631f5c06bbe600ef3330c4f9e0bb7f9a4f7df5f063e17ce4f27d08ddf
 EBUILD yakuake-21.04.3.ebuild 1546 BLAKE2B de98c4201862ccf0e7e2e83e4cb2cd574b9877c546b15ece83d47ded2d4065bb7895662225dc6173fa501084efe0d4d50f7d9867b794b50a8b1a2f8683c8ecdc SHA512 dbce16ebe4442f3fbe19289df3a9986173e3f59dde9e2d67b1988152c7a51619534d321631f5c06bbe600ef3330c4f9e0bb7f9a4f7df5f063e17ce4f27d08ddf
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-apps/yakuake/yakuake-21.04.2.ebuild b/kde-apps/yakuake/yakuake-21.04.2.ebuild
deleted file mode 100644
index 8a0f3c4d4fbb..000000000000
--- a/kde-apps/yakuake/yakuake-21.04.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://apps.kde.org/yakuake/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="absolute-position X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/konsole-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package absolute-position KF5Wayland)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index 112760edaa04..de62f6a016ea 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,7 +1,5 @@
 DIST zeroconf-ioslave-20.12.3.tar.xz 43424 BLAKE2B 17f3af54ac1d8214ccfdda23455ff8b559b848250b11abd1f1edb8f2e367e3f4c1fce34cfcdfe7604f8061b0e41038de5b4cde6c8815ffc363cc6ea50432e653 SHA512 ea2588ec08910364811c6aa2c7169e13fca3d822f04277d99b662d3a55476002928138c64d803e9768ddf24e8d266934e457d510f3b1628b9c2e9383646a85d8
-DIST zeroconf-ioslave-21.04.2.tar.xz 44352 BLAKE2B ca814eaae2c7ec38e6d57cd64817e2f03a76a98f6176934f5caaf3b12edcb5a43f209419713d749620803e555bd14fb06f63d3de88ac2c81830f2d0fa5a9f50f SHA512 9edfe9fa1d9b69e928f800f89d70a9adb2ad35f618f02dc98d7e45753f32252f6c29b9f82a7c7cbf606af82938ae34f9b339a242e33c937989858ec60686de7a
 DIST zeroconf-ioslave-21.04.3.tar.xz 44568 BLAKE2B be644a9eada31122efd3eec54f9140c4e526180312abc33d00099c13f21fb88572632553fafa978d59a3d6e2103b8eae9631e20debef5a33e3968201a5c990ba SHA512 b1b24cf39193102db3f521a8f5ae15e9bfb6b1a60a69da01e5434460e1597abccc55c904016a04957a72e988ee94da55bd5750a483efbc9ffac5ec0b0c66e6f8
 EBUILD zeroconf-ioslave-20.12.3.ebuild 577 BLAKE2B 6bf3c4e38d92f05b4c90fd8eea2f2256430eb743f371ef01f13c975594303a240d07b7c5ccfc2d9378338432caac4baadb63e000a88511184b760d2fb4f5293b SHA512 d7594deef186ff0933107bdbbbcbcbf18c78de1dfd315566212c3b046cd491a3a4a7d6fdacda86307796c7b2ea5169e35ab6621b7e209aad2bb99626a52b0258
-EBUILD zeroconf-ioslave-21.04.2.ebuild 580 BLAKE2B 47f5c047484d6926fa47e5d5c782044493c91a84b16bde3adf581f792284bb43086e445a10d7f532ab6fc7bae98b00537d040b53a381e5b1d17d0f1bbf5bdf60 SHA512 1e7564405286265e470d7298182a8c6e54591584ae5115d57edfee1838edeb3c576ca37de0eac1e26c1f9f2a1f71ee5d0da3883afd581cced3454dd64cd68f90
 EBUILD zeroconf-ioslave-21.04.3.ebuild 580 BLAKE2B 47f5c047484d6926fa47e5d5c782044493c91a84b16bde3adf581f792284bb43086e445a10d7f532ab6fc7bae98b00537d040b53a381e5b1d17d0f1bbf5bdf60 SHA512 1e7564405286265e470d7298182a8c6e54591584ae5115d57edfee1838edeb3c576ca37de0eac1e26c1f9f2a1f71ee5d0da3883afd581cced3454dd64cd68f90
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.2.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.2.ebuild
deleted file mode 100644
index d1a692a5b1cb..000000000000
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index f78d7700b2ce..5ac7645f137d 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 53da7c161d6e..159cd76e98e5 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,7 +1,5 @@
 DIST attica-5.82.0.tar.xz 66220 BLAKE2B 22ee6014cae294cf772eabd874fe1afb493ad1ac92a1f511cbe6912dbbc4f81a684989a285d388d6a1dc5f7180d6930e839a5ba05c1e81b306ee69e572f6fb2b SHA512 8569ec110679bc026f98cf98ef79aba44279821f10f6153f0054c7a75806921683a83317bc1873896f5bba23679eb4fbe50b50ea43b22813dd2b203e84bf44d2
-DIST attica-5.83.0.tar.xz 66196 BLAKE2B 05a5d1f9d7bf78d730491296445c7f2c28191df9a30e40bd4cd1d0875b371dfdd273fdf098472d9ac420f21e681fd446940b1a11dde33b6725217577116cc1a4 SHA512 70588a42c9e460e8174972d152f046b8720d2e75c86b7c9ee545e684af0a460f2c8648c9b736f7b88a067bfb0bdeb13c85a90bfc78aa397b364e762c1e1831ea
 DIST attica-5.84.0.tar.xz 66604 BLAKE2B 72474f0925d1f3ebde9369a59dead7406789a9631ae7bb56cc5312322da333dc5512a7da394c8f09830da3554b2754ab1658f8614aa5093e05a4f1251c60c5aa SHA512 6baf5dae5785784f7c52efec17394ae5f5ee7eac76f7d8ca76448de15e735350d43b8200ab88a4bb69d228637e0584d38c0d073e998c16a3d46e4b358e5c0c8e
 EBUILD attica-5.82.0.ebuild 467 BLAKE2B 8f78d72bc7d8287883a0a74d584cac14c342d014596086859c9bd2310ada604ce27ffd5f0cf2370d4cb683ecffd7fc100f1a8c645bdb6b72e5f56c5ef9a4be81 SHA512 501b4bca7f7b50110e25250178f9b7dc08205798eac70c8b78751bfb5915bae99dd15740e2655cc3157e9b92977a333bec517b22e8e531daaed49c180cea09fd
-EBUILD attica-5.83.0.ebuild 470 BLAKE2B a81b640ce9bbcaf07d6891bde7f4dc62ca75248c0397dbd42d1404e1403e543bc4ef92778c786186f7989ca4389acc89da6ee612eaabe82b67c2021369d5e423 SHA512 91bc31720d60f7a8c8bb952c8195638aec58a1dc475954f8e1a7706dce8b73d6f17d07c0d485ee12bfa3fb444b1e2c7fa6a5be4dd81e6f28fa2f6039a18be711
 EBUILD attica-5.84.0.ebuild 470 BLAKE2B a81b640ce9bbcaf07d6891bde7f4dc62ca75248c0397dbd42d1404e1403e543bc4ef92778c786186f7989ca4389acc89da6ee612eaabe82b67c2021369d5e423 SHA512 91bc31720d60f7a8c8bb952c8195638aec58a1dc475954f8e1a7706dce8b73d6f17d07c0d485ee12bfa3fb444b1e2c7fa6a5be4dd81e6f28fa2f6039a18be711
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/attica/attica-5.83.0.ebuild b/kde-frameworks/attica/attica-5.83.0.ebuild
deleted file mode 100644
index a05e53578cc4..000000000000
--- a/kde-frameworks/attica/attica-5.83.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing access to Open Collaboration Services"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	# requires network access, bug #661230
-	local myctestargs=(
-		-E "(providertest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index ee4944052322..8190fe39d2db 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,7 +1,5 @@
 DIST baloo-5.82.0.tar.xz 291468 BLAKE2B abf25e14f5cca320c89a909bf4fe1d483b7e4ba1b77bce8ac12152b242af28a525179605078ed11f4c4f3e5abea338dfb510992d02748bf9a746eade1d1c7160 SHA512 aed73f3c67f3c7331706fa121c0fbc062b4619adf8ebe65fdb4edbd033f6c4bdaca17f8c00fc3eb3f4159af1cd5bf89c144bbf87d87e9ef60d5b682dabe059db
-DIST baloo-5.83.0.tar.xz 280700 BLAKE2B 71d4fa0e1260317cd382639c1b7d58a296867a2c9e7462ac339f808eff0ea544334120bc355d1146076e151bd4f1a472caf172e22ec2029606c8678433c50b47 SHA512 4cc7a46d0c298455cbae37189da2b107f8d6aba4e5790d3b217251d6873bc295481b6fa7890b38c118e40705abf0611f4ec9716cc2b81eb2d397ad850c156822
 DIST baloo-5.84.0.tar.xz 280888 BLAKE2B 237af667440d9951b3f8eaa3a6cb3c7592569d14c1271d3db8c2e3f84f9fa99befeadefa5f65b43c644c19f83032cb38a5a014f15b20a43c4e4217e749bc259f SHA512 724a8eb9183548ccf99bd2a3cf6938d937731f01e72a9ea3b83e65a96be8e52c0a5690e19b95fd2f43ef1cf3404efe9d61ba0bed5439b73d50762c48156c7529
 EBUILD baloo-5.82.0.ebuild 890 BLAKE2B 62db950b70933b74eb5580d0b3ecff4f7abc9411f3c5d835ae0055ef61a2b2c9c0c26958788ee834359520c068a95d0fd2e07a824852b62798adec0028c55f2c SHA512 31f145bf2ef03289eb9c6db7109114e06a82c9f1f43e468db0f5bd1f70a6ee069ed9acda85c2ab7bc6184d701c2588310776e7e2f0e0c042aca1c58c3af4ce3c
-EBUILD baloo-5.83.0.ebuild 893 BLAKE2B 9ddc845ba9f79d9ead827ff7b10d4bdbc0ff851a05b02213b491b49af10b3c5f9af55b51b343436ad19ee81878b029d259760874dd46abc74535151cc44e8f30 SHA512 d9aa61fd813ae8ccea4a68aec037246dc6e309e869b79fb9feb3219911057dd1f65e51ec15ec6188cde5a081c1b173c05608f6d4265c0c5fbdcc6e43411b22d3
 EBUILD baloo-5.84.0.ebuild 893 BLAKE2B 9ddc845ba9f79d9ead827ff7b10d4bdbc0ff851a05b02213b491b49af10b3c5f9af55b51b343436ad19ee81878b029d259760874dd46abc74535151cc44e8f30 SHA512 d9aa61fd813ae8ccea4a68aec037246dc6e309e869b79fb9feb3219911057dd1f65e51ec15ec6188cde5a081c1b173c05608f6d4265c0c5fbdcc6e43411b22d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.83.0.ebuild b/kde-frameworks/baloo/baloo-5.83.0.ebuild
deleted file mode 100644
index 245f2f64562f..000000000000
--- a/kde-frameworks/baloo/baloo-5.83.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for searching and managing metadata"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test" # bug 624250
-
-DEPEND="
-	>=dev-db/lmdb-0.9.17
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kfilemetadata-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kidletime-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index e6578dc37e9f..9b4181b65864 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,7 +1,5 @@
 DIST bluez-qt-5.82.0.tar.xz 101788 BLAKE2B b9e67c22a8c3c6e8756fb140622d5847c52dbc536ffe4cbba6811af7a49996abb3613dc2fe481dea98c16badca9a560d9636653dd180dfea6256cb4b6e298ddf SHA512 defb301f7095730e183e63d267fa774dd6466b8d62eee2377d4f1d8a77393a848caf7f401c778b3ae7fcbaf1b0c408fff365e2a13d109120e07ddbd2735dc3e8
-DIST bluez-qt-5.83.0.tar.xz 101792 BLAKE2B e12fb7c6c9a0d2b19f42613b650ac3222766d9a36cfc4c27561382caa56ed574495b35e88b53068bbbd8786e9e06ba0717a26dad41ee7e06e6ae3284c3f5b891 SHA512 ac6c1a1973d60a707c9e05fa167c9817dee6178932f7e76534851a76e17ac023e622af923abf66a56005012b4301d2d9faadc4f9b5ca5a2ae5cae80db7784442
 DIST bluez-qt-5.84.0.tar.xz 101792 BLAKE2B 7fbfb79e4b911bb1a9591d2a450de8ec5f1e99d7697ea0be3d75708455e6be6fab41c1e20156bb2796f9ded940b79481775cef3dbf26bf23719a984efb3ed2cc SHA512 5d206e911c0d54f660ad8d5c3d7558a96080f20cd1784fd23ed1ae368e0edaa4dba423ba12ebdb157437d1f39d79e837f0f9954da73e85c08e151dcdcfba35e8
 EBUILD bluez-qt-5.82.0.ebuild 678 BLAKE2B 526dbd4248cdca726126cb5197a190be1590ba4b08cc5f519d83dca1f088cc5d152e0c2fbd5bbd68547d66e9c4dc3bc982439cc095406f79729523377a480467 SHA512 e94d087e0f794aa71a3e0b8de2c19e0c75610cffd8ce876c81fd3504944e2fe326e1511bcc45aa9bae1bacb3a778ecf4fb8d198dedb6c8d6a385928b1779a97b
-EBUILD bluez-qt-5.83.0.ebuild 681 BLAKE2B 97e954e047764ac249bb1bcef0b4f8068e8c26d08bc87a1b00e61d7e5bdd0391156b1669b9528289e66aac8774887988ee21aa72e27cb98fdc312fcac802ee41 SHA512 9b40d1adf6cfa24aa340a05c571caf41823721b35e6897f52b90b89e8979527d795db411e7cfa787a20658ce73a1918d043f5a235764f527312877f0bfe695a3
 EBUILD bluez-qt-5.84.0.ebuild 681 BLAKE2B 97e954e047764ac249bb1bcef0b4f8068e8c26d08bc87a1b00e61d7e5bdd0391156b1669b9528289e66aac8774887988ee21aa72e27cb98fdc312fcac802ee41 SHA512 9b40d1adf6cfa24aa340a05c571caf41823721b35e6897f52b90b89e8979527d795db411e7cfa787a20658ce73a1918d043f5a235764f527312877f0bfe695a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.83.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.83.0.ebuild
deleted file mode 100644
index a55ee208fcbb..000000000000
--- a/kde-frameworks/bluez-qt/bluez-qt-5.83.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org udev
-
-DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, bug 609248; managertest hangs, bug 668196
-	local myctestargs=(
-		-j1
-		-E "(managertest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 9531f98a6e05..f59fb4a641c9 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,7 +1,5 @@
 DIST breeze-icons-5.82.0.tar.xz 2035608 BLAKE2B 1646f4587b449315be5d9245f93e15915450ad07459474954b752876d3b2d6dda03aac371a80d16f98a636ee1ab8a07149cf616e9cd0b8ef66dd4c835f022beb SHA512 bec29bfc1b70f3e99dd4a622b5cf7b403517c9c5e91107b7fc3d845cef2a6413c57b0270a0510ff56a2b50a125b1bca339c85906eae7037db226cc895aac5bfa
-DIST breeze-icons-5.83.0.tar.xz 2042696 BLAKE2B 6c7ad2c52ce1f4f6f0cb1474ab6664d271dc55f4a9f05527eaf751a53e48eec581c7c81c31db60d29a204fc017304c9ac3fb2db4e5bbeac5b6ca848ee9142f4b SHA512 1b99e2dcd55f2d16039c628fd7e549df8a3bc21aa12c118f0ac1b5153f5ac53787a8600d2381b05c8f1ad2f6f3c1d9d682bfedfa9de6cc9db4e93f151fc5798c
 DIST breeze-icons-5.84.0.tar.xz 2049972 BLAKE2B b18a537a7d50bc0da49dd446588d0a7f46d8ed657581d656e56bc8bd469ff4b786b1cd9f39ba986faceab1bbad847202cb677077415d6810b52b85098ff96bfa SHA512 51cd603a220cf95cc311124fa589769aaa549364e44d1edaafa67793ee313f5ad3934b6b7941715942b29119e6d7cb7159508a16346d6b6cc54a3f397c3a1a23
 EBUILD breeze-icons-rcc-5.82.0.ebuild 913 BLAKE2B 9739ee627ca8f9101b1a5590c4b1b3a4644cfa5519cdd7c3f47255e0021b12762e3dfa4f9a8241db7a3f03d8987add2e7a56fcb1427a4e39647b48d34e709602 SHA512 cd06fb2d82b7e02af22bc568201cd00b66d61b4c96760436cdcd6f4f99267848a57ba7238bfaab9a9cd1138f112640581c4a2ec9ab0558f2508feffd97215a28
-EBUILD breeze-icons-rcc-5.83.0.ebuild 916 BLAKE2B 1a05fcce723a9e27939bd2691a9c499b10ffb348e403caca9b7a245dba356f364e8015545e15e019fb1232b1be55f065dbb1c7270174ddb79a1adc73486ab01f SHA512 6ee60fe70419caef153cb94fd594c01708922c805579d682040d2f0005a129fcc2240b095d33df6a3333c6171609652efd1da91c08d81fa81de40d23c765960a
 EBUILD breeze-icons-rcc-5.84.0.ebuild 916 BLAKE2B d850c2e0b558f9bca371808d874ad9b957361452066aa2cea3d61ef5dfceee62fe43f86472889c015b88ec1e89cfd4d57b2dd1f64d30e869b58d84088cc0af89 SHA512 bce73b8ad07251ee45fd848ea08589f86f92a7f4b5843f98602fdcad936e6328daa8f03a7d64a14780b0a7bfa44f72f30c99a132c7c6944ed0e0d5e58356c53f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.83.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.83.0.ebuild
deleted file mode 100644
index d350412d9e90..000000000000
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.83.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="breeze-icons"
-PVCUT=$(ver_cut 1-2)
-PYTHON_COMPAT=( python3_{7..10} )
-inherit cmake kde.org python-any-r1
-
-DESCRIPTION="Breeze SVG icon theme binary resource"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-	dev-qt/qtcore:5
-	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
-	test? ( app-misc/fdupes )
-"
-DEPEND="test? ( dev-qt/qttest:5 )"
-
-python_check_deps() {
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	cmake_src_prepare
-	use test || cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		-DBINARY_ICONS_RESOURCE=ON
-		-DSKIP_INSTALL_ICONS=ON
-	)
-	cmake_src_configure
-}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 0824b9eb0291..24409cd3a107 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,7 +1,5 @@
 DIST breeze-icons-5.82.0.tar.xz 2035608 BLAKE2B 1646f4587b449315be5d9245f93e15915450ad07459474954b752876d3b2d6dda03aac371a80d16f98a636ee1ab8a07149cf616e9cd0b8ef66dd4c835f022beb SHA512 bec29bfc1b70f3e99dd4a622b5cf7b403517c9c5e91107b7fc3d845cef2a6413c57b0270a0510ff56a2b50a125b1bca339c85906eae7037db226cc895aac5bfa
-DIST breeze-icons-5.83.0.tar.xz 2042696 BLAKE2B 6c7ad2c52ce1f4f6f0cb1474ab6664d271dc55f4a9f05527eaf751a53e48eec581c7c81c31db60d29a204fc017304c9ac3fb2db4e5bbeac5b6ca848ee9142f4b SHA512 1b99e2dcd55f2d16039c628fd7e549df8a3bc21aa12c118f0ac1b5153f5ac53787a8600d2381b05c8f1ad2f6f3c1d9d682bfedfa9de6cc9db4e93f151fc5798c
 DIST breeze-icons-5.84.0.tar.xz 2049972 BLAKE2B b18a537a7d50bc0da49dd446588d0a7f46d8ed657581d656e56bc8bd469ff4b786b1cd9f39ba986faceab1bbad847202cb677077415d6810b52b85098ff96bfa SHA512 51cd603a220cf95cc311124fa589769aaa549364e44d1edaafa67793ee313f5ad3934b6b7941715942b29119e6d7cb7159508a16346d6b6cc54a3f397c3a1a23
 EBUILD breeze-icons-5.82.0.ebuild 944 BLAKE2B ac823981285ea8eb82d7b2a1076067105a6dea6cdaec6fa6613dc3be8eb353a42180ad580cf9e70a64fe7fbfb59da094ab26cd4efe6ff1c45f7e4dc2647ebe5c SHA512 3b922b6249f61ede2374423cde87b6571d74ea8003e73dd280b8935a58cc23c50cf189303a8fc65ed9ba1b3d5b4f7ba78df9c05bf7fce831176c78ab8affbdb5
-EBUILD breeze-icons-5.83.0.ebuild 947 BLAKE2B cd706244c09f281d0090a2231adde4970a0ae530bdcb95590a67200ed4a41e54cabeb7f1d1fad9d8b3424f33304ce54caa5d13daf26871da343af27e11ff59b1 SHA512 28f35c9a8409a435e4694075cf3394e6e04690f1caf8ae7921733ca8f532ac0f90eba641fc9e36455287a325c8797109e4e51626e7ae7f15c8d4311cd5810872
 EBUILD breeze-icons-5.84.0.ebuild 947 BLAKE2B 0acaa38987b53ea186469736855215d3ed2b62dc2731cb46d92f8914368a368f67f06013217f140fcc716ba533e95284de5ad93487f9d716efca5b3339325849 SHA512 fe5823a692fc04f1257de43afe4d88568faa3b491bb5ae2a344ed535b8b0d909c7fd934bba115abb7cee141b538f03a762ecbd3f49baa051630be853482d06c2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.83.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.83.0.ebuild
deleted file mode 100644
index 97de983cd77a..000000000000
--- a/kde-frameworks/breeze-icons/breeze-icons-5.83.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-PYTHON_COMPAT=( python3_{7..10} )
-inherit cmake kde.org python-any-r1 xdg-utils
-
-DESCRIPTION="Breeze SVG icon theme"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT+=" !test? ( test )"
-
-DEPEND="test? ( dev-qt/qttest:5 )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-	dev-qt/qtcore:5
-	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
-	test? ( app-misc/fdupes )
-"
-
-python_check_deps() {
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	cmake_src_prepare
-	use test || cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		-DBINARY_ICONS_RESOURCE=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index e6acaa6912b4..8dacece0f1ae 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -3,9 +3,7 @@ AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa070
 AUX extra-cmake-modules-5.74.0-disable-qmlplugindump.patch 2677 BLAKE2B 7ee3d039291f65e667d83dafbedf1a7790db9c411962dca48dadf8e65d25733cf1f74b406b871986340e65ab43cea586739274d3e9e36ad00021bfa1fc6700a8 SHA512 47105664fb59b5bee31b58c034e4e83cfa93983d40d369ff82204a35195171a5fab6063f0257eead5186fadd17f87c378daacecc3c9cdb63fdfd0dbe42fe56a7
 AUX extra-cmake-modules-5.82.0-sphinx-4.patch 2959 BLAKE2B 1edd0052595551e33b231cc7cfac2a4bcd60787a1a126f5e5d2b5ab0ebe0c7f2850feb0e154ebbdc4104e917eecd342456d1f82a19c43e849757fa036e89e21c SHA512 af39e29c46ebdc22fe3c0d090b1fa5a4948909798521e773f5f35cfb793132d483f4d83126641f2fd53d193d672b2f05be90f3c503a10baf907871c9fbf8f684
 DIST extra-cmake-modules-5.82.0.tar.xz 313052 BLAKE2B 40f4a64ce1b9175137f01db9f148b21bde931934d238b3080fa8a8e6830fa556d5c0506ddd52705d3d0b1d419508663a0f96d7e9dbe565061081c48c47eabc5f SHA512 a8c8d1d15718760de42238b121ed1294d12d36f1ef25acdd2542f12a56d5091a5cc0135884b6c97e62123d64fc80e2756dccd32c88b65caaf6e86418bae4217f
-DIST extra-cmake-modules-5.83.0.tar.xz 314824 BLAKE2B 044d882e510430d0039e972ddec207945f38275ae467305ca4f37ddb8c9486d8f57f2222c7f20f23a9766f0f31dc782ad6cd95b20c5b13f1d22c766e5f8a1a0e SHA512 23085dc82dfcaa63a58a1fcc9fe03db6ce8c31dc059370464240f510de9578f617fe20297b1a8e153dd028db178a3ec7faafb8cd4edaea20913f43ce385c0ecf
 DIST extra-cmake-modules-5.84.0.tar.xz 315224 BLAKE2B 1f159ae22ccc2f5bbb144bb1e5b2e1327a583748897385b11d9e282e74849a70a66e04455077fe8ed2afc3443b07eeedd61ce66fc7e05c0df7c8bad23e8ea6b7 SHA512 442b734b000fe3916f3c1bd42849996777c8c22718350db21505dd86bfdfb3f805cb9516461c363cb1d70e5737987797fb75e59ed0197c0ea12bda897dd5d1a6
 EBUILD extra-cmake-modules-5.82.0.ebuild 2014 BLAKE2B be99e95ae4343cb94f1b7ff1805b19e52bdd122be61050de990189345dcae561b4ddd1d15e6b61aee751206bc9bf55d7635717773887e3cce551997d22046a9f SHA512 4532518bbc890485c1970436a215e4d268fec3b0d6cd251fca2a29a5b16e7b61bfa0ec07db01a85f877aa0f8c3af525ded37bccf5cdb0fce450884e9af4520b7
-EBUILD extra-cmake-modules-5.83.0.ebuild 1818 BLAKE2B a0ec69c2653ceb85f9eece8d63d36c1b365255ed4ba4038221626f2777493c0023a58304b8c458221eb8c08a164baf9fd40fad2e2720ce0bffd1260d0d189b29 SHA512 70be4940ae379b3a3a10613f029d1b3c4fe36c5fce8792e5ad5b1024b28a4263ce2d01fba37ba8459a38934f1be9c2e2febb297305d603587acf4bff0cd27e89
 EBUILD extra-cmake-modules-5.84.0.ebuild 1818 BLAKE2B 47478a0d088858c667c0d58c54ee5d12d7c30289f6dbbd30ecb92addd993c9a0c9c1bec421740b2f67a7e9386810e44483040f82d318593faa14cb91a2f49ca3 SHA512 cd3c7d7a407845f9f8397b33ad33a62ed771ea7f35ca2903c05c2eec5255189019eb95b6308367214db15440c154ff315526fed78be5f9aba2b395e717ad66af
 MISC metadata.xml 273 BLAKE2B e5a4eabc4773a11bcdf052b2ce87104bb85b0ed030475140ad0ec7fea2dcb401f539c67e1b1dc1138a5985be143947c86ff3b0b4d6881cc3a0952140ce33732e SHA512 570f3ea3dd25cac1410c3290a4003a288b9e1a0b873884fc33250dfa110cc39b61bd4db1f4d06e3b6e5f761bda8da222a4e294d12ebd8194d771ac61069ffc92
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.83.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.83.0.ebuild
deleted file mode 100644
index e57183907be3..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.83.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-QTMIN=5.15.2
-inherit cmake kde.org python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-		>=dev-qt/qthelp-${QTMIN}:5
-	)
-	test? (
-		>=dev-qt/linguist-tools-${QTMIN}:5
-		>=dev-qt/qtcore-${QTMIN}:5
-	)
-"
-RDEPEND="
-	app-arch/libarchive[bzip2]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
-	"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
-	"${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch"
-)
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# Requires PyQt5, bug #680256
-	sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
-		tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
-		-DBUILD_QTHELP_DOCS=$(usex doc)
-		-DBUILD_HTML_DOCS=$(usex doc)
-		-DBUILD_MAN_DOCS=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# ECMToolchainAndroidTest passes but then breaks src_install
-	# ECMPoQmToolsTest is broken, bug #627806
-	# KDEFetchTranslations can not possibly succeed in releases, bug #764953
-	# possible race condition with multiple jobs, bug #701854
-	local myctestargs=(
-		-j1
-		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)"
-	)
-
-	cmake_src_test
-}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 09c060244866..939e03f74e4d 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,7 +1,5 @@
 DIST frameworkintegration-5.82.0.tar.xz 1755828 BLAKE2B 18c056daf8db8e06995d3f0b6985f9aabb05e8a4e7323635faf92701f04dbf135cf63221fe739504d2ccd7718dd02a6718ab7fa7ba84b86cb37394ff878b6e3f SHA512 5865e560789c50829c5648365db58497d0da141d1699f396ca431740e6f919ef68c89e2cb98ac1f320cdb07fae098de683b17c920f79a2b459ffd874935b6e77
-DIST frameworkintegration-5.83.0.tar.xz 1755808 BLAKE2B 6ea18cc46ade635f0ab1641318fb123b510e8dce1b0482c678d94556f10438de04ab780fa857c1363b87c5e72b7005d834defa75cff7ccfa1b31e4fef0235ef8 SHA512 a95380a3f13082345223e8aee070367ace9b54e54470847afa0c9ff8894788b91b31d4988ce5a432b0020b9c22fbc90a0eca6b1a5f6867ef7156e47a8f42739c
 DIST frameworkintegration-5.84.0.tar.xz 1755824 BLAKE2B 97782740521c7d6794a5f3063c4f2bea54f25d665857f7cabe8b67eb67d46ba26f8277d630cf1af71cc07c0342a36c25ae71fa1f7b0752f62aa2607291b6f7c7 SHA512 eb226600a1c17ebb9387eb42b212b6d2397f118ce2c52ba2463e8c8acf62b39f96aafe68573b9474bf4c0a13d6542bcadcb35ff4c8880425d448838630ea179f
 EBUILD frameworkintegration-5.82.0.ebuild 991 BLAKE2B a2504a4055a05297517cb5ff6335d97d05fd77f811b49beb7e13cc917593e068ae061d17f1a3d383fe6115062622fd44bc719128ca9d2cc4808eeaea80c894d2 SHA512 0f3288378838ab2dc3c0dfe880343f132aa54f2f52a0aae6b23fa50181e609f0e381897aecf8e5b5256b9f307fbd5901f5e2f96421158f642b224c06e1731aeb
-EBUILD frameworkintegration-5.83.0.ebuild 994 BLAKE2B c5af19730aa8f772d3fd4235c1b100a0470efad3fa2514e5acb920c671d11657e226b3c7938082fa356d86fe58ca732002a13ab7ac36c7810ceb96c8d8c56119 SHA512 4bac1d77b8b1797debb25dc0e2761d1bad5d0800800024f2e89bebb55a8735a4151a2657b631d56d4e41360127cde7271ac8b9660e8018989a884303c9f73845
 EBUILD frameworkintegration-5.84.0.ebuild 994 BLAKE2B c5af19730aa8f772d3fd4235c1b100a0470efad3fa2514e5acb920c671d11657e226b3c7938082fa356d86fe58ca732002a13ab7ac36c7810ceb96c8d8c56119 SHA512 4bac1d77b8b1797debb25dc0e2761d1bad5d0800800024f2e89bebb55a8735a4151a2657b631d56d4e41360127cde7271ac8b9660e8018989a884303c9f73845
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.83.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.83.0.ebuild
deleted file mode 100644
index 8fbf5abdb53b..000000000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.83.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# requires running Plasma environment
-RESTRICT+=" test"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/knewstuff-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index f8aeabb84667..59fad9501ab4 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,7 +1,5 @@
 DIST kactivities-stats-5.82.0.tar.xz 81740 BLAKE2B e9cccc36e88a743f7a9b47c8b03ca5be980075346820be8108ca8f0f612e2468d379729be063318a1c3edf15afd3bf56b691b65ad1492e6ba07f64cfc703a02e SHA512 0dd6bed082318a40afc94f0f525cb9c8cd6f9066a4bc38389d23f3dfcc8ed46929e4150660b3c2eaa37241fdbedd10e6b4d472e8d649664dc9acf68b002f206d
-DIST kactivities-stats-5.83.0.tar.xz 81700 BLAKE2B cf498e30c67b71cbf89f9bc6bf5bbb400ea792dcb27b21389c5639047067614a7a96f6d3b1e5c11ea2b72b0904ead6b5badf92af20e3a0bf5babb0eb7c6a8db3 SHA512 d1db4c5a6d34c15cf75cf97b7860b5a8f5935f8fc22931c62a8ca2c3e3f5d9c08a47f9896d83d61e9380a0f5ee770f7922df6260a6c418db07de963de2668dc0
 DIST kactivities-stats-5.84.0.tar.xz 81692 BLAKE2B 3e1262678bd53416447496b13e2f8e00c89bd4f6318ec2e1cd1ca1e1f7baab4a5f24a6111ab2ea64d963b89acaad6ff365a0193742dba84fe22396b0b8d9abb6 SHA512 eb0c0fee91f178b656b791abcaed58fa00233590162f3e22e702d98be90091788475a788ad3ff1d4e6274e1f69f958c8f5a37f1d37c51f8b20d8157f8463f35c
 EBUILD kactivities-stats-5.82.0.ebuild 516 BLAKE2B 9687fa6ba5dd88b7ac77f8dac14a0b2df5e55c1024ce9f699e0fe56e247d12420de472d2437f4c5e5c7d80425e380ef49593f4028d57d5fd41c12538b200e2fc SHA512 44d50161ea7699159cc19d16a4b9921d01fcd144361357d6194befc45bd2a4b5aefe0eae3d47113866438fad30f58d3cad3f1c9538647d064180c2fb2b266960
-EBUILD kactivities-stats-5.83.0.ebuild 519 BLAKE2B c8a3482ac37061ff25c45000acc3e49ba1b65ff1352b642c678dd56db148c50b9cad6f586bd1c3b556dc29f4b048619e5cb512c86d7db55e143539ff360b7134 SHA512 0a62ed1b71727977dc01f40c605de404008c41e9574315c2deb7d9307809b6466fa8a24ff081090ca04f7835ccaa0cc460f16f542f4a499d1fa29751aae248bd
 EBUILD kactivities-stats-5.84.0.ebuild 519 BLAKE2B c8a3482ac37061ff25c45000acc3e49ba1b65ff1352b642c678dd56db148c50b9cad6f586bd1c3b556dc29f4b048619e5cb512c86d7db55e143539ff360b7134 SHA512 0a62ed1b71727977dc01f40c605de404008c41e9574315c2deb7d9307809b6466fa8a24ff081090ca04f7835ccaa0cc460f16f542f4a499d1fa29751aae248bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.83.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.83.0.ebuild
deleted file mode 100644
index 0888d85d34a2..000000000000
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.83.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 78f676d4d633..4884aaabe0ce 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,7 +1,5 @@
 DIST kactivities-5.82.0.tar.xz 71356 BLAKE2B c83b384f4aed32554dfd96951a9efc22cd8cd6c644a674b8d492e571ebf261201be78ac2834722f12fb43822ff17741054e7153c279a8ea7bdf6318cecef20bd SHA512 f1da5447405e53a4c7d11c0ff14ee80c725f07df929ba6b4380239675e2efef21bb2e6e0d028146ad621440b01f76314549779a3f7a79e639537fa7bb8e96729
-DIST kactivities-5.83.0.tar.xz 71340 BLAKE2B d3d7b00a567ce596ddcea8f88fe32e41ff93fe9614361ead4c011e9174acdc1e02e12d1840dfb8e511603ccbdb92220702d0326b3b3e9f91d3953ac520ca5a98 SHA512 9f2d945a1723f0f3256289cea9f4db64fb58a6df70f57eb65f40be9cfbdeb4dcecec90851d8325de313d4ce212f53781ba393301dd3803ab82ed9757ebef4f74
 DIST kactivities-5.84.0.tar.xz 71336 BLAKE2B c7fb74d6c274643c4e7e4d9f7e306c36baccabf72637f132b15457bcfcf2e218f72fcf14ba00ded7bb12323e71ffee9d9936751e4831675f19f834acca1ceec9 SHA512 b43680cccd6cb4c6d627bfd2b9cca12b1b33e743bc78c68c8251f7f6ab27d61992a378d741083dda4bff1bddbe8144b4895346162546d53a70d0b8a3fc5b7d1e
 EBUILD kactivities-5.82.0.ebuild 679 BLAKE2B e6c029912ce02949bc0a49ba1683f8657aa2c02b8fd450ed4a3f401a504351aa382c5be34a5da3d71ad706dba09f260d8535152e4d7007198899d39a347e3133 SHA512 a25f1e454e5df018b65eef4434c51fe67be4e9c37890c75ebd977dca603c8f83af42efe43397be8cc963808d875d4dc5d2f923b5ef7f9fec0e6fb3a4d0e51667
-EBUILD kactivities-5.83.0.ebuild 682 BLAKE2B 059ef1d8789f7554277bd0433932dcbba3bf94b38376d97a45c2680e5084a02643c0cab5957e465b73c8bf61b5b106f86439725c683471331645df42a14622e5 SHA512 be7ded73eb965ede309d30aa6e73b33d3eef261ffb747a13de8f1e616a66efed5842cd2be4bae5070c9435911da3d6263e5fe71e049b1597933ab49fc555304d
 EBUILD kactivities-5.84.0.ebuild 682 BLAKE2B 059ef1d8789f7554277bd0433932dcbba3bf94b38376d97a45c2680e5084a02643c0cab5957e465b73c8bf61b5b106f86439725c683471331645df42a14622e5 SHA512 be7ded73eb965ede309d30aa6e73b33d3eef261ffb747a13de8f1e616a66efed5842cd2be4bae5070c9435911da3d6263e5fe71e049b1597933ab49fc555304d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities/kactivities-5.83.0.ebuild b/kde-frameworks/kactivities/kactivities-5.83.0.ebuild
deleted file mode 100644
index 8c56185f55b6..000000000000
--- a/kde-frameworks/kactivities/kactivities-5.83.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for working with KDE activities"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-plasma/kactivitymanagerd-${PLASMA_MINIMAL}:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index bcc4d0488ff4..fbe7f8574713 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,7 +1,5 @@
 DIST kapidox-5.82.0.tar.xz 194608 BLAKE2B 3f45c5d23a3b939ba2d7249358344ce8db7458bad7017aa40ad97ce2bbf626bcbc9a3adda18b87f8f5f37e5378bb98762accb779523932e9e388aa6b8eea1f64 SHA512 4f69a497878a6a6f0271e7d073a0be80d7c43be2c90bc14accc6d861d0e569131ea9543f81949f2b54765aa2ff6c6bc0e3f6339a4dcc1f875a01adac54e547f9
-DIST kapidox-5.83.0.tar.xz 194692 BLAKE2B e7b0b2908f5bb9ab80e6a93c901a6a0cdebb5b2ecee26b33d8bc35c81a265c9f989a79e8fba132f9e24e6d5cb0ea61100aaad7e0701d59bc470d4e294e37ad02 SHA512 8cfdae155334ec60cabc984a5b597910b00cc57324afc1f4ecdd2963335324782b8e09f33a8ced0cd95746b0a764ecff13953020a3b59a8480531cfe22a6d8f8
 DIST kapidox-5.84.0.tar.xz 194776 BLAKE2B e1f804989035cf96227953a46f70c21a56ce3fa5d6449940e47b2d076836c12c9b833ae99c25b62c5e8bc31c325d69cf9872fa4a1ccd94325e309c0afdbe0670 SHA512 d292514fc11202c721134420b2d8dcc44e6e2f892245fa7e8ada8fe3fde4d1a1614f64c553d76beeaeb10b6e008d30c68b627accfd59342770a2cf0c6b32e22b
 EBUILD kapidox-5.82.0.ebuild 592 BLAKE2B 61b9609b43e761b1aef0662a7d85e651602214a4de298c3bcf724b672cbbafc8bf3f67cb8cc05935acf269c26eee6bc12ab59e48815b1517e366e4a0538d40c7 SHA512 350eae7cbac429e5de6d4fd816b2604254bc470a2795e69cfead22228dbe5647f28ecc7906543e9254f3acdc42877bbc67fee7149a248edad24127d8bb895046
-EBUILD kapidox-5.83.0.ebuild 595 BLAKE2B 4ea93dac4b18d4caf2af475a6b3642e446272230195f85efdaab6ebab779097344741960296eee6db7282c29f1081a05653f262ab02ec2b8e722c33c100840fd SHA512 19a09adc3e6936331229b04a0702501fea06c12115e61b10100befe28f30868364b00dd08a169fac1c9735b5e805d2c249c983c049c633360eba10b2d6054c9d
 EBUILD kapidox-5.84.0.ebuild 593 BLAKE2B 02119cfeb83c7567bc799571a4729a50ff7bca06a4ccd0f64cda6df5dcac58838bb2c258a49998d6fb8be54544c7c48b50d47dfcbb47a377022db3f64f29843c SHA512 d13f0572a93abdebb511b6ef96637ea69669eb88a9dfa5b987380d7b2d12aeae980bcf3cc4be41c45b8beeb9c7f733340fc28c5d1b0160a710f801ff81e62d64
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.83.0.ebuild b/kde-frameworks/kapidox/kapidox-5.83.0.ebuild
deleted file mode 100644
index b4a7e1a58e7e..000000000000
--- a/kde-frameworks/kapidox/kapidox-5.83.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL="true"
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit kde.org distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-doc/doxygen
-	$(python_gen_cond_dep '
-		dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-	')
-	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
-"
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 43420ec64d88..95c635c60664 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,7 +1,5 @@
 DIST karchive-5.82.0.tar.xz 984872 BLAKE2B 1a8e6b758479a4ff5f1be774b6deede551d9a306bf8a3fef845ff6a1532fc84d36aa9697f6de7455746410f233c70072ec49d729e20eae2baab529cc1d3ea9af SHA512 7b735b3f1c325bf8dc9044fc9644fdaa3442baeae16831ea79cf84f7da0d5cb7757e2201d8cb73f18a831c49f079b87c75c8387a53c236386e4da47437884183
-DIST karchive-5.83.0.tar.xz 984832 BLAKE2B 9ad1912e5e12c3ed8e9ab96689f6a237e4528c0a7c0f856ecb35918d0a41c6263a321257ad087b37a0c6e4a9bd1c8fe7ffe4cfb6a8d965ed18665141fbb73a4b SHA512 4be6bbc1934c5ca7b297d6a1c15832c91a7c94c21341fe349aa1c5a55dd02205184c52bec6b3562f3b71fe2ca0c9e783d94339fa86d84f611c1d937cf653f022
 DIST karchive-5.84.0.tar.xz 984864 BLAKE2B cfde6007f1e3590ee54bf1c92b7bfc92a931005d8eda819e9ded4f7df361f2084eb0b4e24dd1e75c1065aa1107bc0ce147158d35b5c8d32bd02a4858971426bb SHA512 2aad7a9920942b2a458aa5ab85c13f0671c924e99a04803eba056c339d426ed6dad1706d83c7bb8169bab69fc79d1a3ff064b6c6dfcc029d2d6b842dbd58ea86
 EBUILD karchive-5.82.0.ebuild 627 BLAKE2B 3a6b934d17a552a48aa12f75fded100ea4e69a7bed0d91a652858748addcbdca8dd2673dc15f081c08f44e6e29a93938fe765237aefffa432041682c172cf79c SHA512 33d172edd8080203e26897dfaae28f8177ae9a01a77cd1038fbaf935d05a5a5873c786b74f9e4e64acb468e0e8802617b73913c6c34b86d53e1c36c1b7d8eed7
-EBUILD karchive-5.83.0.ebuild 630 BLAKE2B fbc4fcbc6847024201657c04f1b037a67f968e42e4410585a757cf47f0144184930253f136d3c786113b63b2074917b7c0c794a5936e3434d8942ce075086a88 SHA512 a0ddfa8f3d77f4679937bb7cb5da28c16e6eb676b728764668e47297b445884b8c575f99b6c618b0aa5885de3afdc0a067a54bd34b4d8d80f36700dcc4bedbbb
 EBUILD karchive-5.84.0.ebuild 630 BLAKE2B fbc4fcbc6847024201657c04f1b037a67f968e42e4410585a757cf47f0144184930253f136d3c786113b63b2074917b7c0c794a5936e3434d8942ce075086a88 SHA512 a0ddfa8f3d77f4679937bb7cb5da28c16e6eb676b728764668e47297b445884b8c575f99b6c618b0aa5885de3afdc0a067a54bd34b4d8d80f36700dcc4bedbbb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/karchive/karchive-5.83.0.ebuild b/kde-frameworks/karchive/karchive-5.83.0.ebuild
deleted file mode 100644
index 77a707c97948..000000000000
--- a/kde-frameworks/karchive/karchive-5.83.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ecm kde.org
-
-DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+zstd"
-
-DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-libs/zlib
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="zstd? ( virtual/pkgconfig )"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# TODO: try to get a build switch upstreamed
-	if ! use zstd; then
-		sed -e "s/^pkg_check_modules.*LibZstd/#&/" -i CMakeLists.txt || die
-	fi
-}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 23d629a3a822..2d99f04ad6e1 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,7 +1,5 @@
 DIST kauth-5.82.0.tar.xz 88396 BLAKE2B 1c99917b26f9738b876385276251b7bb616a35bdc82bf581aabba693a0846b8fd615e960dc95829e6a19b158299117988aef10ba965ca16135cbd51c2f4891a5 SHA512 ff69853dbdfee9b22431ee495c07875430015ee706357acdcdfc93b3deca7a373eecf40d30977de97253f044a4dad7548b2ad55c84583b92587a77be285e3ed8
-DIST kauth-5.83.0.tar.xz 88376 BLAKE2B d7862f3abe851461448e22c5c797c78f43b1a8a55b178bec3f603326afee2f2e72a0e0a462c815f1ea1c1ba532db578c5aad198fc4f166a81987d4097b7f29be SHA512 57851b17f9fb1776c6cecb97f4f70ea31afcc8295260b677a8ae8a98fb428e2e1e5e1f8a398f7f3a02879cab8873ece5e1d8bce25a6e788efebac668a07b9140
 DIST kauth-5.84.0.tar.xz 88588 BLAKE2B 398316b036e51c9dc30f786fd309383ac87af2dd16599d4a3162ab3e5ca92a20be484f8f2b104c0638740e8868257f53d4a1837020024b849953d4be3e26d1dd SHA512 1b7d23e0afbcb2bbf918afaa2461cf0c49ae5f14cfb5243e025a4be5ea9ca4e8c10894267986ffcb3c732819d310d47c5ecd5bd1a0755bf074ad72b680d836bf
 EBUILD kauth-5.82.0.ebuild 976 BLAKE2B 67f13a3de6a40a0ba2c1d5f25a476f071d1ef405b1c621db5e82ddd33a25b02bbadcd52eeff4a5b409afaa35029d2e69b285682850d703cc63f482905de2ae02 SHA512 f1e5cd1a9ad562926cf51a288910c52133a4a0dac463a597e6d1be207518d97b8bdd6a7fd07fcdee7b8566d9b7a847a5c2a0d2ad744906846c8bec01c30d3f41
-EBUILD kauth-5.83.0.ebuild 979 BLAKE2B beefff0c49ba09f5932ae70c09f60a7d39174d08ffd08a19b1648d1d17e7581391e8ba1ee3bbb69cf7fe2ef2444816a50d2e25aea72655c3375f9094a49962c7 SHA512 0e5b71b97dd594857aba7c800accbae2bb4c14db199a5558cc64ddf502d03c44324479832a849585284691b7fb29d710af6310e938b7de318b108afdf9e4c400
 EBUILD kauth-5.84.0.ebuild 979 BLAKE2B beefff0c49ba09f5932ae70c09f60a7d39174d08ffd08a19b1648d1d17e7581391e8ba1ee3bbb69cf7fe2ef2444816a50d2e25aea72655c3375f9094a49962c7 SHA512 0e5b71b97dd594857aba7c800accbae2bb4c14db199a5558cc64ddf502d03c44324479832a849585284691b7fb29d710af6310e938b7de318b108afdf9e4c400
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kauth/kauth-5.83.0.ebuild b/kde-frameworks/kauth/kauth-5.83.0.ebuild
deleted file mode 100644
index b87b08b797b7..000000000000
--- a/kde-frameworks/kauth/kauth-5.83.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to let applications perform actions as a privileged user"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls +policykit"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	policykit? ( >=sys-auth/polkit-qt-0.113.0 )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		$(cmake_use_find_package policykit PolkitQt5-1)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# KAuthHelperTest test fails, bug 654842
-	local myctestargs=(
-		-E "(KAuthHelperTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 257d2afc61d2..626bc1eac1ce 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,7 +1,5 @@
 DIST kbookmarks-5.82.0.tar.xz 126800 BLAKE2B df1aa0b34b1fcc21a481995001ab563ebafdca67d307d1f610033aa364899bfb9dbf5a9aad4d4eea4bc5a8a4e93c5afcc45dc1efb78dbd79d7cd4125ec8749af SHA512 aa1ad09e63eee22eb5aeb094b9d2986f6a700038c790023878d7a6a6fd6e9e2f0af0092f576d1e1e6b2413219c3461f1bbe3347afb19e3be8e9a081443aa5872
-DIST kbookmarks-5.83.0.tar.xz 126732 BLAKE2B cf854cb0553068cccd2bbd845608e295dae3c79e95cd2eef1a2db9a649ffb43e7ccf08c5c7d18bd78f922497d839c4c5d1f68379524c679e04ac3602027540a7 SHA512 d6bba523fdbbaf3aa28eb06fff3a8b9282e5fb9544139351a3f4dacde063153807670a61d1b956a4d72ba049f16b3f96e8fe90d3a2572a96d7fa7ab2e747b692
 DIST kbookmarks-5.84.0.tar.xz 126780 BLAKE2B 0f520f82596a0f2c002be218c2fa222c7cc5c75256b05d6a41403af2e1628ba30a0b9603d6394097f2cf83ab92552d6fe43442f1d7d215159d083bac687233ce SHA512 33896dc0de0c976975e5982ec605d007fdcf2c813c7f4044ff403ad85b154eab00c3afb964b3e6908a4d8475208b8d604cfca598a54e2666802ecdafcc2e67fd
 EBUILD kbookmarks-5.82.0.ebuild 816 BLAKE2B a8510d3a04540677a424587a54b04a1cb7b6aa76e274be3440e4bb3db0f7f0c95cee4b007597816525a63445b94a2d969575ebe954a478f028d3d328cfdc68ce SHA512 a3f717d91be236e7cac89252af268e7ccae1e605f2d75cbc20a09e9d4aae23d9d3d98d3129ea6239a03862ae5af3353888fe82375db2bd089f50caa62151a070
-EBUILD kbookmarks-5.83.0.ebuild 819 BLAKE2B 451a47e5980134eb8197a5a70b3ae72c3968400feb280e6b6f41623a66941e3d7eaa46b6d9e0c77def8993a42300d7cd214796523decc98bf13bddcc00cc33b7 SHA512 7d2c1d054fa8de771717bac46e175dd5fa7edf67799fecc3191c334996d0c98071182c9ef63f9fc70ccdf29f39545f1e60ab2c1d3fba8275676f66b2717b6e01
 EBUILD kbookmarks-5.84.0.ebuild 819 BLAKE2B 451a47e5980134eb8197a5a70b3ae72c3968400feb280e6b6f41623a66941e3d7eaa46b6d9e0c77def8993a42300d7cd214796523decc98bf13bddcc00cc33b7 SHA512 7d2c1d054fa8de771717bac46e175dd5fa7edf67799fecc3191c334996d0c98071182c9ef63f9fc70ccdf29f39545f1e60ab2c1d3fba8275676f66b2717b6e01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.83.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.83.0.ebuild
deleted file mode 100644
index 8d622a20ed1f..000000000000
--- a/kde-frameworks/kbookmarks/kbookmarks-5.83.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
-"
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index 462099dc67ad..6d011a9026c1 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,7 +1,5 @@
 DIST kcalendarcore-5.82.0.tar.xz 254996 BLAKE2B 255728d2ce6036bbb35a2acb077a1cca23420d3d60584179a27ea2d801b9191d7696b4322fb41023420993a69dac5649f43fb4a52c708f9b48aa732719297c5a SHA512 26d76b20faebe36b9e5a9e234364fb5e8cda1c3c519ce5e3fbd0d9e36657348010dfc7ef4865fcc3326978aa88847f5d5304d3dcccbfd0d728c568b2e149214b
-DIST kcalendarcore-5.83.0.tar.xz 255776 BLAKE2B b969167a6cbfa80a8a126869b49a5fd8fbea01e4067b05eda7667e2d96d7b6cc2a16880df34749e5e1e8e62f445ac921b7f9dc6354f8e73eb8a64f626fd4fbd2 SHA512 99b77a58b0b5e3051a9a46285e1c77d66fe42aa6038ea63c956eeed017b8a39c5845bca82d71664ab4fb2b2d5034bd55ccee4a53c6ab3b965ba323d20b25305c
 DIST kcalendarcore-5.84.0.tar.xz 256408 BLAKE2B ebd48ae7a396a4528013534441516c38fb5bd4b2e6007f9eb109711ba3262c2333e7ce384b596fea380020db2c764bce9ba3fa565e11ed901e425e01c7511170 SHA512 9e01ae59b1fe8dbeccb718aec99a62de17dffb25bdb991b2a77697af4741901f2a5028fd83a7c7119f48d2c3f37a68a9ab346622f34b230b0799de4b39174065
 EBUILD kcalendarcore-5.82.0.ebuild 519 BLAKE2B 312d74f10c1b727824b483aca478d2b63c89da0f842fe5159fda852a28e2e1c441bef5f1e593d8d27fd718e9478573727132c465228ec46056474a6dd0d0949a SHA512 dadcbb83a4c6c65bccddaf5777b532e36b94d0dcab281655cbc82b8175cb443d71bce69f356d989c0266f3ccca7971ab5dd2ce9e72858d6ebfea0d6e4b452a37
-EBUILD kcalendarcore-5.83.0.ebuild 522 BLAKE2B 17416540f8b97f14cd4b753e189ec3201af9952dab59bd1f4a2d3fcd0d1c6bb78da2bc06c4507055bf4de746909f6e3b4097c0c237974d785b1e0376ec8b4155 SHA512 f06bd9859378078de5bf4280c1d4564e3e2560acc95247bcbe59d419c53bf73026eecbe33cff9166a00baceeca46ec82aff55d674d00836eb365ebe1285d29d3
 EBUILD kcalendarcore-5.84.0.ebuild 522 BLAKE2B 17416540f8b97f14cd4b753e189ec3201af9952dab59bd1f4a2d3fcd0d1c6bb78da2bc06c4507055bf4de746909f6e3b4097c0c237974d785b1e0376ec8b4155 SHA512 f06bd9859378078de5bf4280c1d4564e3e2560acc95247bcbe59d419c53bf73026eecbe33cff9166a00baceeca46ec82aff55d674d00836eb365ebe1285d29d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.83.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.83.0.ebuild
deleted file mode 100644
index ab621edd1b5b..000000000000
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.83.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for interfacing with calendars"
-LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test" # multiple tests fail or hang indefinitely
-
-BDEPEND="
-	sys-devel/bison
-"
-DEPEND="
-	>=dev-libs/libical-3.0.5:=
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kcalcore:5
-"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 708c8d146ef6..d43c3803752c 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,7 +1,5 @@
 DIST kcmutils-5.82.0.tar.xz 160816 BLAKE2B fd75c8e42c7df2c05048ece51e19d4a27358871c56b6df3c086b4ea2fd83e3be758a9e370bd9b4956da18ffe9025044bea91da3a1a3fc4a9e65894d976a3585f SHA512 709294fbbbaabf31384753651a320069e6779d101dbbec94ba09ae95146344989e854cab5fdd39510c300e026f113a156fe43d3b2fa57191851c95709a1997e4
-DIST kcmutils-5.83.0.tar.xz 160860 BLAKE2B 5116662f821d755c61a69cc15cd58d9955301d76a35244d0f0f196b7356aa533dd8dd0dc7a6582d59f4223fe01c84a3bce1b193599c805388c6b29d6fee19ef8 SHA512 fe06fc60adf2df8a39fd69409abe9db6db62dab3ef09c81259285222d79710ad393c1bacf40cb303a37bbb7d80025f16f630e23897f32d3322d4d6e80342bf65
 DIST kcmutils-5.84.0.tar.xz 162792 BLAKE2B 2236bb2194827533cfb26c520010fefefda9917758e4fae54a575027051df4bf3eb4f736b6d3c6fa26961ac846e181283d5f3faa009c982df7eaf7bafa82b4d4 SHA512 176533ba2b3039c736478ddcb2d921396ebcf0b9c5e50b70878b111de1419b64ab7ee02227052e3e5c1f71f65f41db5caacf0c12e6055e9661318820d91d3eb3
 EBUILD kcmutils-5.82.0.ebuild 942 BLAKE2B 9e675a08a2915e5dc9d7fbdeee09887976466822123502f6217f02ffbb3c3f0ce2b5eda35973665b1ec8768d5ac9c28c5b6361b67a78d5e12b8191e81fdc1ef9 SHA512 8e8d0012f1dd4a48530e5ec1e156f50535ed146cf93d2b22f2484c17b7e1c97390198e853017f548f5b0b23aabb8dbeb0d7a0f269432d6a4e8798bd2d45b3a7e
-EBUILD kcmutils-5.83.0.ebuild 945 BLAKE2B 2255da3af0b64f164110cc55a0adc987c9f20f7a342c0dddc5f74ff19d272d1dadcefc76ba14ce364e934feef86e4041c9ee631a148f760a906de031c9d7b33c SHA512 95ca781a1b06a5f2c5c59b3b25f5dbabb4100188ad5d1e3c9430dca1b84e1cdb5cbbd8896b8fcd9a12b266dbf877ad192dd75f11a42f06a44a0e470fae55772c
 EBUILD kcmutils-5.84.0.ebuild 945 BLAKE2B 2255da3af0b64f164110cc55a0adc987c9f20f7a342c0dddc5f74ff19d272d1dadcefc76ba14ce364e934feef86e4041c9ee631a148f760a906de031c9d7b33c SHA512 95ca781a1b06a5f2c5c59b3b25f5dbabb4100188ad5d1e3c9430dca1b84e1cdb5cbbd8896b8fcd9a12b266dbf877ad192dd75f11a42f06a44a0e470fae55772c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcmutils/kcmutils-5.83.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.83.0.ebuild
deleted file mode 100644
index 20ca3e07e7f9..000000000000
--- a/kde-frameworks/kcmutils/kcmutils-5.83.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to work with KDE System Settings modules"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 2110c8bc708a..e58575baec4e 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,7 +1,5 @@
 DIST kcodecs-5.82.0.tar.xz 230560 BLAKE2B 53494862c07e1df594c0c2f2e7ec295c763635c6e1203111d797195a0cd0a7d4f76d152945971051a136971c3b072744cc08b913e40534fd64d568e6748c95f9 SHA512 fd331cd1ead5dba016f1c94429bc4fbfc5268563341e93d418e856340c63fc7b7e72fb6aeac6ade0de209235c52e8d16118351825000e9d8b47491a55124ecfc
-DIST kcodecs-5.83.0.tar.xz 230508 BLAKE2B c7a0d0e511c46fd59c089dbe8f5f1b95a22fb90584f05de8b8349d8da7506ee4d9332bc8444a77f6443aa59956046a40df03e454c4703ad50aec9e1f115ddde1 SHA512 cde1aa449adaa898b8f7b93545d6df59554a261de01faaadb74f622c0043226d0f0be441246453937f78606b8dab7c598fb449720905817e7c0fb03d0f0a2a35
 DIST kcodecs-5.84.0.tar.xz 231844 BLAKE2B 9e98bbbdc7c3fc486f8f1399affc7c50bcc192806cfdfccdf6247d9710e56bcfb626e3e0c68ef8b5ab8e4007b083440ea0b24ca499b6b3623414ae2e8622562c SHA512 96b56a9388998cdffed4133a920325dd469cdd6fa14e86517886f0818f60e2a5933ab16a7bf039dc299c43a58acc3d1b7c3ef89e5d66027991a3e2262fc14ef8
 EBUILD kcodecs-5.82.0.ebuild 503 BLAKE2B e675498cfdd749b0d31f089d92b8ecafe9d150c6272aceb26659235b46902d1388bc6119920db18a75dbb9e73a6b2fe511bc7bb4afff74ce813857f2fdd14688 SHA512 d1151d164ca3229ea7efe3f8737e77b62afcec02b0bc4839c0ca81708fdaafe7634d9637ac0d1c4e58d28480fa29c799f3bef07f36adcc47574e75c3b9d3778d
-EBUILD kcodecs-5.83.0.ebuild 506 BLAKE2B d143a4d5730393f9806c190b03f2705e32d25b8c85c5ef8584f9ff6f98c6fbe2f043d25cffbefb856384601180f5bf72aa807e3e8dd765d01c1b14c180d361e1 SHA512 217540f607e4077b14cfe96046d3550b80507fec5982d05da51c6a4a9b9ef22fd9cdcccdea0c8385fb185f6ab1de1781cfa3bf922c120768e181011505bcbfc6
 EBUILD kcodecs-5.84.0.ebuild 506 BLAKE2B d143a4d5730393f9806c190b03f2705e32d25b8c85c5ef8584f9ff6f98c6fbe2f043d25cffbefb856384601180f5bf72aa807e3e8dd765d01c1b14c180d361e1 SHA512 217540f607e4077b14cfe96046d3550b80507fec5982d05da51c6a4a9b9ef22fd9cdcccdea0c8385fb185f6ab1de1781cfa3bf922c120768e181011505bcbfc6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcodecs/kcodecs-5.83.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.83.0.ebuild
deleted file mode 100644
index 151dde78056a..000000000000
--- a/kde-frameworks/kcodecs/kcodecs-5.83.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for manipulating strings using various encodings"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-util/gperf
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 546f7f78c611..9a635553d0a3 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,7 +1,5 @@
 DIST kcompletion-5.82.0.tar.xz 122088 BLAKE2B ce534393489d6ab980d3c093ef39b3d2341734e147231e6f22c5316091bafd40ef343432128926ec18e25ec8d3843018fa582bd2dc7475bb3c260e42452cc949 SHA512 19b76a46d09005ed5ab5b66ca48403f4bb0baade2b2f937ad6afdf5ef92adf7c94330502adc3aae29bb88fc5848469580319cbf4bba4bfa128537f4541fd9d24
-DIST kcompletion-5.83.0.tar.xz 122044 BLAKE2B c70270b14b94ec413d5e5a9495ebf743e6b79b1706730e0e8bf285c6dd41fdde40a3170c5ece1fb6f883e121bed88194576c2b78604a8694e1517fdb11883cab SHA512 342819c40ff559291f1ec6a1a368c418e710a02d6fea1938f14b06f52979958a0a9bcfbc3940d6f0e0b2fca01b3346f6f3b7460539a0ea50cf837b462c02db08
 DIST kcompletion-5.84.0.tar.xz 122020 BLAKE2B 9ca799bc7808c0bf56f80d9c243e6d7ac10026c17eceb5a675c21284f06c1ce6a8ccdd8bee3fddf818606ae37c41c08142bc182fbe2c741aff67a5c8d7079849 SHA512 fd30f997079d17719534969addaa96d99b21774fc1310adfb8a07720b3ddeec179a98a8bf3162d813fff46dcf429e712d6122eaca0e0afe00befe0e32da22ed0
 EBUILD kcompletion-5.82.0.ebuild 736 BLAKE2B 9d3f8e265ff6b0ebb54db1a29cb0364c5e3db88a3efc32cef097224a699cce2396f7cf6ae434ef43ba237f1ef6a4194b839518dde5bfb0e67ee3ddaf3b2828d8 SHA512 e4f6ed827d51a258fda55f3ca01fd7bbd59f014f4d67c6a436fb9191841eb09f00ed57727356b37a266020ed9dfe4bdbde96b245b787419f687208617b39996d
-EBUILD kcompletion-5.83.0.ebuild 739 BLAKE2B de81fa95342f9ec44346e644c5a28ac49a1ba4f3c985a722711448d9f7217378d6d8ec24ef7e05ab8ac362a947f20b8fe6c5e4c0c180e27e044f68d9fef1856f SHA512 5218e8ff88a5fd346e7d161951ad7525304e546b3044c810c7b12a85e3207309212bdd17dda428d15bfc154ca0707353404f8ded60218d9520ecc81450190439
 EBUILD kcompletion-5.84.0.ebuild 739 BLAKE2B de81fa95342f9ec44346e644c5a28ac49a1ba4f3c985a722711448d9f7217378d6d8ec24ef7e05ab8ac362a947f20b8fe6c5e4c0c180e27e044f68d9fef1856f SHA512 5218e8ff88a5fd346e7d161951ad7525304e546b3044c810c7b12a85e3207309212bdd17dda428d15bfc154ca0707353404f8ded60218d9520ecc81450190439
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kcompletion/kcompletion-5.83.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.83.0.ebuild
deleted file mode 100644
index a0fa08fde404..000000000000
--- a/kde-frameworks/kcompletion/kcompletion-5.83.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 1050a40f8e2e..5d71c4c03211 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,7 +1,5 @@
 DIST kconfig-5.82.0.tar.xz 268416 BLAKE2B c59d435f2e562f218b0b6080c862758c6c271aad4ae76ad000e722b7f2edd0b40cdc4e9f64d5128c6f7f2c0028fcb5d4ae35c696b511a7593651a34c4b1528a6 SHA512 8989bcd1dabc2ad795aa464a7bf7ff2e4e2a4c56a5e7828906e00852eb5fc2946e89a4fa7df691f8c5e1940d0b171c02729bdab5ce9f7d6ecc0d3d1880e2ee4a
-DIST kconfig-5.83.0.tar.xz 269404 BLAKE2B fd94285d89b2cf86479469ae7fda002c692c1eb407dc8b0e3c3c4695444be8fafff4c7bc6030c42628dc8eb3e0416edaee99ae1e701868f3c7e7363b3f93847e SHA512 11e0e283b949c636fc8050e6a94c6441ce1e19c961304f6b0c71d428662cf79f4cecfacd0fde63afa95d312c91bd420b8af958748fca7d7e4a969a5fe88e6b17
 DIST kconfig-5.84.0.tar.xz 269556 BLAKE2B 749a3dc2279df10e5e09e98d6120f6586a2c1e9de461ecf828e9b1f4399977ed972af49911b0919a6629dfb3a0917396d48ee8e90a87c9123b68452d1a703483 SHA512 2a51e5e08a863432b42807b4f0b82991328aba4bf880e570bfe5a4270aed6c017ea0a9a0277130fd07b634a2978dcdcc7a2f3958de1def4d7e02a23aa44d1fdb
 EBUILD kconfig-5.82.0.ebuild 784 BLAKE2B 4e75c1eaff14c56d5c811dc656b46a0e5132cc37fcf3e4da5cb971024cd71d1018c1d5de00008500fecb9c06c3e05e78675917a9fbcb009b894972f5b412aa4f SHA512 18fa973182ad7c6a924ce61133eae2e82be63746c87667cbc463a8e9067b3a4566a36d1828245b554073193fe2ca27cd3d560a31a5751fd42e4441e4a179f45e
-EBUILD kconfig-5.83.0.ebuild 787 BLAKE2B 3f091ffe5050a87210e3c2168ea132a496e839edd24ef175a6dcf01a63c212140728767340c8fa6c68d6d43b87f45f45bb9badbe491a77e97fa53acc0d5a97e5 SHA512 2c256ba4fbc769faf1e8afc6bf8795bfe53721c4801d1bb0bcd8e6bb13a8acbedd3c1070a385e8c327dd3d99a842d70ed03be19e69e3753a0089a0c406f8b1b7
 EBUILD kconfig-5.84.0.ebuild 787 BLAKE2B 3f091ffe5050a87210e3c2168ea132a496e839edd24ef175a6dcf01a63c212140728767340c8fa6c68d6d43b87f45f45bb9badbe491a77e97fa53acc0d5a97e5 SHA512 2c256ba4fbc769faf1e8afc6bf8795bfe53721c4801d1bb0bcd8e6bb13a8acbedd3c1070a385e8c327dd3d99a842d70ed03be19e69e3753a0089a0c406f8b1b7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kconfig/kconfig-5.83.0.ebuild b/kde-frameworks/kconfig/kconfig-5.83.0.ebuild
deleted file mode 100644
index c03101c447be..000000000000
--- a/kde-frameworks/kconfig/kconfig-5.83.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for reading and writing configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="dbus nls"
-
-# bug 560086
-RESTRICT+=" test"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		-DKCONFIG_USE_DBUS=$(usex dbus)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index fec5ca8b604c..c8dc81f43a92 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,7 +1,5 @@
 DIST kconfigwidgets-5.82.0.tar.xz 401320 BLAKE2B c117777cef4ff0627577b6b7b3fe4b18b8a0ded1b233888953f56beca6c7bf2675382e1d5f6e05e64a4eabb793dbe2e0b3f1b56296606da76a0d54e15cf2e530 SHA512 309b6e2591ae88a454bd6dee4cff5e1eca3dbb36ca4b7b02081602fbd6b4bfe06a99d2afa6eb931fa927759f2c32e315b3c548746207673751e9753de651a6cf
-DIST kconfigwidgets-5.83.0.tar.xz 408440 BLAKE2B e9c26aa21a16eff960cbba6584ced46abf67c12bc7091ff9b4515c1662fe4339e686c5f316ea7ee30655d3193a843e0610cf63fdb7658ee8089a67a5e7257106 SHA512 5db966f274cfa3ad4b7d766127ac405168643e44b52aa2931d68e8cdd5c56a1fbe898cc8a8145c4eb7981a60523ca2df5571d49b243531de3e4e6acb85a59355
 DIST kconfigwidgets-5.84.0.tar.xz 408888 BLAKE2B 5e727412027f56dee98a6d195bf239cf4da9c36951f32eb07dc3554bfa28e7d9a3441f72a5e0e33e4b1bcb11dab48358be41bb680f1698f2cf3edb81faaa79b2 SHA512 e7b5b3ba4ffd50c81b1227340811e6cc9c12e488e7f045d7caba56fc8052d6f3b24211709ae2b9a11ddf5215d3542d058d58dae0f2f6eb110e4206067653072f
 EBUILD kconfigwidgets-5.82.0.ebuild 995 BLAKE2B ddf99d30177e1647b034405da45eb35dcf2e5f2e817698486bcfa1300b8759ce50a5341e7df0de434326f81a36e457775a5edb895bdb001a9efacf4d9dbe0e28 SHA512 1fc6567450d96a4837439d4f48bef9552c7af90498f04af51a0dc26e696df2d5f81d0d0f55e805007a5d81c7356d58d0a82694a19650bcdca4f02dac21bb36eb
-EBUILD kconfigwidgets-5.83.0.ebuild 998 BLAKE2B 70de99e00521dbd866f7c4e67f1a7edf513a03b567cebd2790c6d2cf374e390eceba6b6493dce2caed87c555a1e2ebd391a280352f8961ebfac90ed26ec3c7e7 SHA512 97f1a8c0f8ce7c10ac887499a673c52032804e3787ee82c014ae4e1fb99217e30852c64144cf086e46bdd2f1e9c055eee360c76fbbfddadd98b9a6e63c99065b
 EBUILD kconfigwidgets-5.84.0.ebuild 998 BLAKE2B 70de99e00521dbd866f7c4e67f1a7edf513a03b567cebd2790c6d2cf374e390eceba6b6493dce2caed87c555a1e2ebd391a280352f8961ebfac90ed26ec3c7e7 SHA512 97f1a8c0f8ce7c10ac887499a673c52032804e3787ee82c014ae4e1fb99217e30852c64144cf086e46bdd2f1e9c055eee360c76fbbfddadd98b9a6e63c99065b
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.83.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.83.0.ebuild
deleted file mode 100644
index 704b573a1c8d..000000000000
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.83.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing an assortment of configuration-related widgets"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index dc7151b005d4..38ffe7950d76 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,7 +1,5 @@
 DIST kcontacts-5.82.0.tar.xz 543960 BLAKE2B 48deb0a593825fafbd850f0345ff052d4809970706b18355388c077cdbd0f66d63f951bc8d063df82495822a6754b02531dfc676c100217f882d29f837045a75 SHA512 05cde28d3b9c83054d004fe6fa9d439358fd95ae3b739089a08b37a3b44e1b3119242de64c5e5155bda9df9ad5736a2629385c1b1c39326fbd9e3fa6a1984e6f
-DIST kcontacts-5.83.0.tar.xz 543700 BLAKE2B 18c1662e2bdf8aa125c41043dd19858476a7f56612e226682103e038d28708a320bdd79c0f06907261f01e9e02e1ee7cff3dac38f7c17faa9b31d1d3a1483f94 SHA512 402401549854b58d4003f4d88527302d81f54a4ccf3c17016c73653b8d2a9e0418b4f863d15dff680564ab6e94fe2d869ddb235b999ab57c9ed8eb2754dd809a
 DIST kcontacts-5.84.0.tar.xz 543772 BLAKE2B 2a4efd01d377cd98bd506fa2b8918ae2ff581e31848e22e1636047fd91ed8fa1948e8a2a2a750d29851d55d649f5dd33e839ffad7ea796c07e27305a4d3c02a5 SHA512 8bc88f2ce9ebdb0c28ae47311b411de01885cd4bf29a5125818acd8c0ac0c71635eefd87ca8f0c8f873ca303268741e0fccc235e6f887b1ceee880dbca7dd2ff
 EBUILD kcontacts-5.82.0.ebuild 745 BLAKE2B 6445aa6c21ee852d9a54f33014f3e938174c7df3cc3822da5c38b3af337768b8b57644e00f735200300defd28317cb3af3cb0f0b994caf62ba1e04c14f0badee SHA512 3294c0bc9b658bc4e8b7856fb11c7fd2dab9794b81b6c6687cf77589698a20bfaf0cd7c96263e837097ca8a4e3588362e387c2d373e09cd5f9879c1a15da6da5
-EBUILD kcontacts-5.83.0.ebuild 748 BLAKE2B bceb8beeecd125dee53a4acb5bf1b90f6c0e854a56b615cae134bfed166276d024f0f44c97457b0a22c5c0360217f95d33ba2a3588018ae92907caf920c206fc SHA512 b207dc665058c7e5949b52095a6c212cec5449da9fa40065709e7537488f9f3991ae31e35d45353e2e4e3d2dea7f63f93d4df8fb313c2e2dfab15b1384f5e67b
 EBUILD kcontacts-5.84.0.ebuild 748 BLAKE2B bceb8beeecd125dee53a4acb5bf1b90f6c0e854a56b615cae134bfed166276d024f0f44c97457b0a22c5c0360217f95d33ba2a3588018ae92907caf920c206fc SHA512 b207dc665058c7e5949b52095a6c212cec5449da9fa40065709e7537488f9f3991ae31e35d45353e2e4e3d2dea7f63f93d4df8fb313c2e2dfab15b1384f5e67b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcontacts/kcontacts-5.83.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.83.0.ebuild
deleted file mode 100644
index 9c7352d00bb1..000000000000
--- a/kde-frameworks/kcontacts/kcontacts-5.83.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Address book API based on KDE Frameworks"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kcontacts:5
-	app-text/iso-codes
-"
-
-src_test() {
-	# bug #566648 (access to /dev/dri/card0 denied), bug #625988
-	local myctestargs=(
-		-E "(kcontacts-addresstest|kcontacts-picturetest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 38bf9be11f30..1d6be133cb88 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,7 +1,5 @@
 DIST kcoreaddons-5.82.0.tar.xz 414272 BLAKE2B a24534a5f3ba900c6e77afcbb6218fa02f093c58283f228f8b41272ab82eca214f2b080356facaa2a800f63ee80f048c7e20d9e22bc2d7d2604a7fe9d2c93d3b SHA512 25e320e6d9a436091491572cf8623a0abaf3abc7d5edde44403701471fc0315b6ad5d09a44b93de023298ffeb9c14366de23c08f43abc51c87c87f9258a652a7
-DIST kcoreaddons-5.83.0.tar.xz 415496 BLAKE2B 9c4d6d193aca7e6a9b0b624da0a89cd23f4abffc42e506a97660a5a26cc79e9e7a89f0b5365685f3a1e378c3cdc83c9be8d419007fcb03021b1f87374562c5a6 SHA512 d5a83df6b9570c9a58b4287bf7c0beb61b877216029237d5d1c65ebdada2c2f6e5b87c98f90dc2600b120a4f15fb19418a72ee27e9febbfb78906685ad81eb6e
 DIST kcoreaddons-5.84.0.tar.xz 419632 BLAKE2B e6c58fe326f0dfb7277d888c90eecfdaf7009f773da7afd965be2e19ec18fc1cda9f37fdbb689eb064f8b665f9db96e7748a2fc52359ec9880daf31ff20936c9 SHA512 c9818af2c58910d25b68c4e036e25469465b5fa6f34c3e7a53967b2e51c258ac446fbca22524393d09d7e93c506ac87c22864fb6806bcab53e36913c96d9383d
 EBUILD kcoreaddons-5.82.0.ebuild 994 BLAKE2B 20b7d96ee69de24e9933ea7f5be9b8a3a0a03d272812ba7d68894f06c99bc65e58f2a2269029b2dea45dc4c631f6b0abf7f731d89fb2eb1f0610b3705d1249f9 SHA512 5d4b933c79d1ef784621772a6c150d8b1adf2f8560d12c1fc654e871b2ca31348def8c51e643a367e7eb9aad7d8e6c6ecc095132f1867aee607a06b834a3270e
-EBUILD kcoreaddons-5.83.0.ebuild 997 BLAKE2B c6d9516dfda5a2d6cc3f0d6b2599f6ba548c05796fb198d0e940161aae16e9dee26e48efcf112cb1985cea74fecc9bb9eee2c23cd235e8bd67268067baef0715 SHA512 1bc0ca46c2a0c0f1ace5039c9f9360c7a970991350495f80c7efb3c57e85aff88ba6f2e5225c5756621b6661e3cdf4245df104a000161bcfc57444511c453b01
 EBUILD kcoreaddons-5.84.0.ebuild 997 BLAKE2B c6d9516dfda5a2d6cc3f0d6b2599f6ba548c05796fb198d0e940161aae16e9dee26e48efcf112cb1985cea74fecc9bb9eee2c23cd235e8bd67268067baef0715 SHA512 1bc0ca46c2a0c0f1ace5039c9f9360c7a970991350495f80c7efb3c57e85aff88ba6f2e5225c5756621b6661e3cdf4245df104a000161bcfc57444511c453b01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.83.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.83.0.ebuild
deleted file mode 100644
index 9c9ffd88ffe1..000000000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.83.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="fam nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5[icu]
-	fam? ( virtual/fam )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-D_KDE4_DEFAULT_HOME_POSTFIX=4
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		$(cmake_use_find_package fam FAM)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bugs: 619656, 632398, 647414, 665682
-	local myctestargs=(
-		-j1
-		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_mimeinfo_database_update
-}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index a473057a6f0f..9f45ba6908b0 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,7 +1,5 @@
 DIST kcrash-5.82.0.tar.xz 24696 BLAKE2B e13388661d3661216df8900875e86d7ad71352c229e9cc4be78d11469cefcecc51cc11aa95badb12e2dcba22eba22533b959ca3ab8317c205a06e3f5e906b203 SHA512 9cec96ef82f9628fbbbe0fd4e0687c094f7a1b1385e6ba6807f1dd49c9f8d19a29497b29b31bd9a86c59f498d76d54bdcbfafa86a480ccfb29dcd488eee22340
-DIST kcrash-5.83.0.tar.xz 27596 BLAKE2B c4ea3f03703acf2c22eea9349745adcd1b8879496e69aece28911562e1f57e84dda0976169cba4de7f10cd71e965945c72c5380f523a47ed2e9cd10a3e27ef0d SHA512 018347f762020de37c1f76d9ec1e2e412331681ad1f3647c242ee291a2c59e91a53dc573ff463fdfad749ec902023399f9aad29af07939b5fc17e962c39c2e64
 DIST kcrash-5.84.0.tar.xz 27596 BLAKE2B 8038d7523e7510826085e2ed63349afe7dc841510224ce6d6f0c637b78915c57266b866f3d34b11a321f9c17a3497458c9b328c9f1bda8c4bf0d52290ede2fac SHA512 be4187d745105e68d0243057831f1cd7ab9691682e6d505a30c0f69988caf0f881569b7cfdc29a01b6ed4e608080842266ae8a5d6ac58e9605f1a2a57da59463
 EBUILD kcrash-5.82.0.ebuild 703 BLAKE2B cafed6e0316a42a4d673203090624da89442e9139dca5209f7c5ea81024364ab827102635c842727479a11d5dfee5b04e2b336986f1b1c7cd71ccdeeffaeb75b SHA512 1ce9a48e80d71f4221b7b1031845191159e20022ffa48d7be3fcb77634b07bf83c143f648be98507daac0fc20d490f2b9a1ef771d326c5c35744ae33c8a2ff0d
-EBUILD kcrash-5.83.0.ebuild 706 BLAKE2B 3660fa498fa3ec8a0cd88b47a6e9b293ba73bc8ec81541d344767c8c52a9924499cceec00b6c4b031938c091342624630c288056dd870c1381aad1a837abaa8c SHA512 7ba5690eaa4a50272dd0fb32908479583b3c616bbaa2be8287a03ff8a887492b76e1c48f7f139d55887009c61c640fa6021fe9759042b5097f889fa6d40dcf0b
 EBUILD kcrash-5.84.0.ebuild 706 BLAKE2B 3660fa498fa3ec8a0cd88b47a6e9b293ba73bc8ec81541d344767c8c52a9924499cceec00b6c4b031938c091342624630c288056dd870c1381aad1a837abaa8c SHA512 7ba5690eaa4a50272dd0fb32908479583b3c616bbaa2be8287a03ff8a887492b76e1c48f7f139d55887009c61c640fa6021fe9759042b5097f889fa6d40dcf0b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcrash/kcrash-5.83.0.ebuild b/kde-frameworks/kcrash/kcrash-5.83.0.ebuild
deleted file mode 100644
index c9026f018d6a..000000000000
--- a/kde-frameworks/kcrash/kcrash-5.83.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for intercepting and handling application crashes"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index c0328eb02b6c..3573397a067c 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,7 +1,5 @@
 DIST kdav-5.82.0.tar.xz 60180 BLAKE2B f4860970f75588ea69f032912d9f105fa8f204b36a0ba48e7cf57246c48ce612d66f7f1bcf0cc773dd699e6cc475c139ed450767a79afdea92e6f4de9036419a SHA512 84882e4c4debc2cecd7c206e84b7534bd23fcbd28abf8e1438c8ed06faacdd3312e955dcb5233cb38f1cba4d4fa88cdec9f2ba0e7bc13af3bb07ac999efcfeb2
-DIST kdav-5.83.0.tar.xz 60152 BLAKE2B e9a928a895c2f7721462579be31b07f760e473b867e7939ce8a347a4736886af9fb36cd72f49fdea8866c426a450f77e67b078c175c5d44c6d07ecd30d81fe38 SHA512 ccfb3c2933cf329dc4da050dcf91893dc23337cde68e8e27083a57c2d374d44a6aa8b5432e7a2488d138566b6d74b3d2e907de281a8bd8de56573757555a3db4
 DIST kdav-5.84.0.tar.xz 61048 BLAKE2B 1625bba583046eb837aca036922e086d55cb893eaabf7a10ab21dd9efa31f37569154b1d357ec7e2d2821013d3600fe48bafc7b95ea46f3ba133bd9e39db35d4 SHA512 68109913384f5205dfda6c23f33b75217d58ba179d74c8e3d08f899bae56d72272caf83cba31bae14f454f37de8cbf8618232be70c09ce7745741df0199cce6a
 EBUILD kdav-5.82.0.ebuild 793 BLAKE2B 2e9fc6c1d995789aa2ef5fe73fb1fb6ceb27044b6a293452e760c2c75547df2b3607c8be97b9ca8243a83269f03cd3a5ae544e5a43045179337bc846b6bffe3b SHA512 f3395947d8137791fd358dd998d214f471baab7c55ae5b99a60bc0d07fbbbdbb3a8d4bf5a13a12fe6169e7b0b4d5d8020194155d3cf1b1d04522c1f7a65aeb4f
-EBUILD kdav-5.83.0.ebuild 796 BLAKE2B 593681bca49d55833957a242c3b6b95bdb5ce1ac9e5db86cd9c49b79ebb4ac17d918f3836b28127e8a92a605625cb289766cb4d5027ca2390ad3feb525cc7f51 SHA512 014521431002306a34aff85cc6381f8374016b8526c6ae1e6267bc3b3fce6290569f791338e93bca497903b94f8b9e799869dab43a7cb5ba3c984cd1131ed47d
 EBUILD kdav-5.84.0.ebuild 796 BLAKE2B 593681bca49d55833957a242c3b6b95bdb5ce1ac9e5db86cd9c49b79ebb4ac17d918f3836b28127e8a92a605625cb289766cb4d5027ca2390ad3feb525cc7f51 SHA512 014521431002306a34aff85cc6381f8374016b8526c6ae1e6267bc3b3fce6290569f791338e93bca497903b94f8b9e799869dab43a7cb5ba3c984cd1131ed47d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdav/kdav-5.83.0.ebuild b/kde-frameworks/kdav/kdav-5.83.0.ebuild
deleted file mode 100644
index 925ae2c1cb33..000000000000
--- a/kde-frameworks/kdav/kdav-5.83.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="DAV protocol implemention with KJobs"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${PVCUT}:5
-	>=kde-frameworks/ki18n-${PVCUT}:5
-	>=kde-frameworks/kio-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdav:5
-"
-
-src_test() {
-	# bug 616808 - DavItemFetchJobTest requires D-Bus
-	# bug 653602 - DavItemsListJobTest mimetypes unsupported
-	local myctestargs=(
-		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
-	)
-	ecm_src_test
-}
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 6aa90719ee8c..d00c55917edc 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,7 +1,5 @@
 DIST kdbusaddons-5.82.0.tar.xz 42792 BLAKE2B 7b20072c93b1149d31f3bbc020de124a05ae96bdd6affa6a77d46ea69f5ac1b458851f97115dbd6ce18e12773e39c240daa2035056496a431849a51a096383e9 SHA512 a0ece70b7f79a5d391244d145d8167c0bbeba5f99db48b513f187638aff6af3f150a75b84d8534ea7b381d858dd743bf73884286bb2ab951d4f6e1675d319fa4
-DIST kdbusaddons-5.83.0.tar.xz 42772 BLAKE2B e213be3b2e206b055503062617efb87c87a67e6f1b72bfd08d24664ff4123c12f9622d0fef9fc398d3bb348aa112c06ce1828151889053de683437f4f0e74f34 SHA512 61ff9b0269b35d4857d6290f09388093734efec9c9d19fdc12bb88ef5216c0d766d6b6d4be56223fe205e88e697c3e3880741ed58d1a3f689743bbe6eca17087
 DIST kdbusaddons-5.84.0.tar.xz 43152 BLAKE2B 21a0c2fc5910ca7a3e1ac403de17f36c33026ceb9ea5a9d3d2aa414dbd8ef0572988503558294ce73a5ab123230cae4f2c7fb94adc9f1671c43922a2a80b87eb SHA512 b4e60ecf2c321cae408e716f2d80c00f244aa33d68267bd89b620cd39bf014017801f365dc213654ce0f6b388828323a5e94ff2d1537bc54b89391407b0cdb71
 EBUILD kdbusaddons-5.82.0.ebuild 668 BLAKE2B 7802e88fef0b0956b3310d8087745fe6edb807ae43b39b41a95c0708902395dbd931c31d585f2ec6af0df04c775104653ffcf258a1d42aaad3b8498c6407c174 SHA512 ca8079b269c13f0db05dcd3cec53be6c0790c2c8597ea15a6ab620fd6638aca47d669b0842528e3ea7807f5f682f5d6da49b0097c3a0190267c5dbaf6e45a597
-EBUILD kdbusaddons-5.83.0.ebuild 671 BLAKE2B dd9cf4b09439608d04ab25abadb1361d43d3763d99e5c92555911ab4eb38cbf7270876e4d7ab3b1cfaa52b3676525c74e2bcb2b0b996c12fa6bd84ae6b4cf0c1 SHA512 f88d3aebc963432662d8b9a4e96136f90d29d731cd60e1a14e375d9c0d9e060413d6c0ab4d135ed9045b7e0e538a48065337c8cc97fb91a1c07eff8b1ca14113
 EBUILD kdbusaddons-5.84.0.ebuild 671 BLAKE2B dd9cf4b09439608d04ab25abadb1361d43d3763d99e5c92555911ab4eb38cbf7270876e4d7ab3b1cfaa52b3676525c74e2bcb2b0b996c12fa6bd84ae6b4cf0c1 SHA512 f88d3aebc963432662d8b9a4e96136f90d29d731cd60e1a14e375d9c0d9e060413d6c0ab4d135ed9045b7e0e538a48065337c8cc97fb91a1c07eff8b1ca14113
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.83.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.83.0.ebuild
deleted file mode 100644
index 6b5380dc9482..000000000000
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.83.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for registering services and applications per freedesktop standards"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls X"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 736e1868095a..235b1dd34f86 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,7 +1,5 @@
 DIST kdeclarative-5.82.0.tar.xz 186252 BLAKE2B e5b4c22e14cca01614d1bc5556bda00e1ffbcf2b1b1b3277d96a12b380b627a5df4151ad443b5301eeed568bbe1852ef29e3a47f2dc4bc3c037b449441cf8542 SHA512 48ea28aac41cb6d5d15488b80e5cf7abc18b774fe35d22dc14d030b22e56b3b9bd116a44a0e7c44adf9fd26d0d4cd73782a6aa187f35375ffbbbf08374cb5658
-DIST kdeclarative-5.83.0.tar.xz 186620 BLAKE2B 14c45f437c1f303a8e22785b18b1f69159ef63769a03372fdff9ac8359b7d8b231de884190cf55e31e43cbb75f22a5fb283a9767cf6a08a6ee1daf0d1d1df714 SHA512 c3ca9f3baf3f8b7d8279ad6854eac5174bb8bf2c7534c8842456717e03762c5a6e2d22d5927a6d0e89eed720437bc0165066c8c979c00d1c8c7273c1553bdd4c
 DIST kdeclarative-5.84.0.tar.xz 187128 BLAKE2B 9ab46e9e207d3e320474ad789fbd998ca213a1263bc9197bc9ca28257b93ebb82d93b088cb6eabfb791debf92aae4b2ca9d28e00dddf8ac594dc27669e9addd1 SHA512 043f2fd23d1cbb5291239cc27a018d5b99ec7bc7309490dd84daf59d3b571851e2f7d5f7fc3771654429f869f7c144fe59dfda973622eef3c91c45afd4cf113c
 EBUILD kdeclarative-5.82.0.ebuild 937 BLAKE2B ed63fa3a76fee5a004b5258c290c2565b02ebb9d95b4f23132d0517dcbd98d5bd9a6bf048b58d5ce05c5a33b3ce7674258a203650dad821d5fda65637f5a5b15 SHA512 d00ff0be2eb91e7805a1f19153c556c546babcf7bd911931ada1a7565d02659401e66c015144416a8a29739455ce2f0b5c1a085695bc4cf39eafea2932b14972
-EBUILD kdeclarative-5.83.0.ebuild 940 BLAKE2B de437d8206c35e7d03035505e761c877a7ffeeb9f355952d7652d71380b33bf2a92630ba19beaba7c9bbdf27a4e51d79e5d038315d4429bae64bb4067153966f SHA512 b9cc92e4e271ecdb81b4ec772b043f53c2cf8f38bc38e5d9c03b8750a52a780575938cc82fbe91dae41c83988e79d80903a760393270dd22969211d688614a7d
 EBUILD kdeclarative-5.84.0.ebuild 940 BLAKE2B de437d8206c35e7d03035505e761c877a7ffeeb9f355952d7652d71380b33bf2a92630ba19beaba7c9bbdf27a4e51d79e5d038315d4429bae64bb4067153966f SHA512 b9cc92e4e271ecdb81b4ec772b043f53c2cf8f38bc38e5d9c03b8750a52a780575938cc82fbe91dae41c83988e79d80903a760393270dd22969211d688614a7d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.83.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.83.0.ebuild
deleted file mode 100644
index 34815c54112f..000000000000
--- a/kde-frameworks/kdeclarative/kdeclarative-5.83.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing integration of QML and KDE work spaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	media-libs/libepoxy
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 9d560d895d0a..e4092fc7615b 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,7 +1,5 @@
 DIST kded-5.82.0.tar.xz 36964 BLAKE2B bbc92bde53caaca442808c154bf7bb88c3edca9b979c597ea08a0a0901b40d67004e2f45acec663b22e318e547c86397a99c8c895a374b73d066c2ff67b3f868 SHA512 10ef292186d652a519aae01681934f70f820ff4c480f9ed9868f7dfaf9dba016e035b565b220fb5d3ef89dae5180088ed3a93d0682c54ba27978b53df00c2755
-DIST kded-5.83.0.tar.xz 36912 BLAKE2B 900495230f92f6636dae851e487def22ae2e262e95e379fdf89b8bfd05d84d58e0905e11d32b0bb01bfbe913c75d3df3ee9f94f72ee94cb2bbd563926287fde5 SHA512 109ba59269e6c3528047dd6764699bd6f611dc51bf97e8a45ba953f3e3aa1aaa1d017197f382996f35ccd025e981b0487a5899fc327b9adbcfc6c59fb6aa3934
 DIST kded-5.84.0.tar.xz 36932 BLAKE2B 88bb0c1e7ffa832288cce7824902acb14f51fb7ca09609b1d55f602688262218241a1de75cae130fbfd7e6b7b754effbf41b056001bf63afa1fd1431ae73e1e5 SHA512 67f86d90cc87a0a4c923726d9c74d90232fd37d0975bf93eca2a6a48761569d56dd91e5b2ea8b926012e47392480679d7d82372dfaab921bfd4a92679ec173f5
 EBUILD kded-5.82.0.ebuild 835 BLAKE2B 0d655e09cb0e6c4547d5fd7b0d211791cff4829b5235d55e0d96db024ea6ed1fe183fc214fbbe5970f101c4cd151bdb0c164507d422aba83ea34b26074311b78 SHA512 e70cd69797d06fda8f88f6c42700c57b23d3e706b26f20715cd97d9c498f0b0404935a0bdc97ec34706cfdeb44a26c62b8f70462695091d4093bf26182d1e377
-EBUILD kded-5.83.0.ebuild 838 BLAKE2B 25a30c31ee7b2ffc1456db077be4399866a3d32b8ff2240523ea78358ba2e2e2f558b165fdb2ec099f634b25a8438dc4a2673f6b4ee69793c86dec2c4d9c89a0 SHA512 955b8280d99ab886cc4ca9a6aa27b33997f034b8d70441de40b393b285054d551380787ca8bec8596448053ba05fd5f7815cb07a6f173825910e0c7fe1417fde
 EBUILD kded-5.84.0.ebuild 838 BLAKE2B 25a30c31ee7b2ffc1456db077be4399866a3d32b8ff2240523ea78358ba2e2e2f558b165fdb2ec099f634b25a8438dc4a2673f6b4ee69793c86dec2c4d9c89a0 SHA512 955b8280d99ab886cc4ca9a6aa27b33997f034b8d70441de40b393b285054d551380787ca8bec8596448053ba05fd5f7815cb07a6f173825910e0c7fe1417fde
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kded/kded-5.83.0.ebuild b/kde-frameworks/kded/kded-5.83.0.ebuild
deleted file mode 100644
index 9ab73b764aaf..000000000000
--- a/kde-frameworks/kded/kded-5.83.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Central daemon of KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kinit-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 046f2be939d4..8c73215f7630 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,9 +1,7 @@
 AUX kdelibs4support-5.80.0-no-kdesignerplugin.patch 5689 BLAKE2B 74771136992074f7e39eb110d7b838ed6ff3bb34ca8b44242d57359b3efc4bebde8ae615b27df31cba42d14349697ba303b3aa20b09c1d83d044cff2cd6700f0 SHA512 2a7a1c05c6ef7f440ca84eef7b65f65f92d780fa411301e2a8554115717cbe543127e1878ae5642f07f7ddcae4a62ed075468f85e7c7cdb13992b4bada270bff
 AUX kdelibs4support-5.82.0-unused-dep.patch 1693 BLAKE2B e11fdcf22b656952871730e9144e69d9011215567dd3a6691e1f1484dedd8c314a10d01c39d2e945eb61a3ddc41a0304f89e9f6f7840fc0f9161bf0a3d4e4829 SHA512 f0b9cd6dd6f97e3d3747a1241221e01b43c31dfba7eb398c33f3515a5a8609e0c12ad2be64df89ea74b7ab95eadb0a8768cb7706b98df6201cd50294c198de8c
 DIST kdelibs4support-5.82.0.tar.xz 3553264 BLAKE2B db2db6b67e27b0b0562b88afbda739fa109faff52689d7132519b75784a5dbf95c5585bb8ba9c1e85a06553ca572dd8f6480e00a99b1ce252505fb10c6e89cf1 SHA512 0662810f884d65d33b789fbae02009e5e6c92d8df45a4355899722a96dd7402168a46998150a9ee580e5dad8873a38a829c1f73d8157cc3cbcff495cd5a875d9
-DIST kdelibs4support-5.83.0.tar.xz 3552740 BLAKE2B 337bde57e013438a8fd3c09e5255a1997b58443bfd8853aa62275e889c8a8a068630b7f954397db60cbf3c21df648173568e45a7aa1b2aa340a1e250808dde9b SHA512 5d2927c50525ce22d819013eca8a1d8e100f55f9e90eb98fbec443fa0667077b0bbf868c8ce7af97272116e1aca0dfe0e576e58e76f438c7e031fb976feb4541
 DIST kdelibs4support-5.84.0.tar.xz 3553320 BLAKE2B ba9ed75ef8a187411a72677dd57c13b8fa9db5df5f151f14cfe4bfa4a59998f3d56bf0ef9a5df0c99a2ec9670977b741ad041ec27fb02a53dcaa519c7f56caad SHA512 9c4cfd20ad16ba8bd4f8feeade4142e8126c37d5967f61672282e6f98f5cd505f2e4fec36700b15451c08549416c0bb81ce3bf450bdd25e5ef11670c093c51ff
 EBUILD kdelibs4support-5.82.0.ebuild 2485 BLAKE2B 8f115b67bc325848a02b6ffd565d602b99f0984e471290608bb5a91606d2dd023bdb92b6b1d736ea2a1c3c25968f86037be1261c70176d9b1435bca86ecc2e53 SHA512 d3e280bd5505080bdf67124ca410ccddb61d6abcbd839314525af06fbf478e9d44d7b89b89c38ecb7896eade4c028dd35fe5b645ed73efd90b9c6781ad6d387f
-EBUILD kdelibs4support-5.83.0.ebuild 2488 BLAKE2B 2b487246830473e7617a0c2a8735892f447f53da7425ac1f1957907b2885a3bb2fe7541a6a9a052b34bc36ef1f0d027c0f608c03a6e4482a324ecd89d2a76473 SHA512 e4b12fa86af0eeac4b1f05a6d54611f4870d98d373f8a7ef486233ae722944f30885c3f255bdf6b262b54e4c414c2e2b2f1954f440b3bbde92f173a523856ab3
 EBUILD kdelibs4support-5.84.0.ebuild 2488 BLAKE2B 2b487246830473e7617a0c2a8735892f447f53da7425ac1f1957907b2885a3bb2fe7541a6a9a052b34bc36ef1f0d027c0f608c03a6e4482a324ecd89d2a76473 SHA512 e4b12fa86af0eeac4b1f05a6d54611f4870d98d373f8a7ef486233ae722944f30885c3f255bdf6b262b54e4c414c2e2b2f1954f440b3bbde92f173a523856ab3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.83.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.83.0.ebuild
deleted file mode 100644
index 8cf2a1aa39dd..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.83.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="true"
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-RESTRICT+=" test"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-"
-COMMON_DEPEND="
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/openssl:0
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	>=kde-frameworks/kded-${PVCUT}:5
-	=kde-frameworks/kdoctools-${PVCUT}*:5
-	=kde-frameworks/kemoticons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kunitconversion-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	virtual/libintl
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kinit-${PVCUT}*:5
-	=kde-frameworks/kitemmodels-${PVCUT}*:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch"
-	"${FILESDIR}/${PN}-5.82.0-unused-dep.patch"
-)
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use handbook; then
-		sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 8c8da8c0eb01..423332d60718 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,7 +1,5 @@
 DIST kdesu-5.82.0.tar.xz 52236 BLAKE2B e674b6e7779cbe858828d17a8e72e14570007776461d3da99cd86adf92380fa5a95bfc394436f8e900e2fd90052b35c6a68b91c2e12e9c8cd835483c7f2b6262 SHA512 6d4cbbc783959d093f59221dc0cf7862f30444878a32475976519b443713e8ea1f154c8a62f7cf4468e807ebd983afb037211d5641335822037bad04501552ae
-DIST kdesu-5.83.0.tar.xz 52224 BLAKE2B 4eeab49ea7f481336692d1e265acb9f40f3bc6c230726d228285a226b9b0c8d307aa345d254b522e5cb3bda531455772b8f934dbcba47866f22efad7b3fa5489 SHA512 929faff4149ab4b2e707beeff433bd035d9a67a73e01bdba1f5cb706d69c0268689fc4377dc37ca5175243e5f2f0c86f9581ac419fce0bbab16f336e06787d74
 DIST kdesu-5.84.0.tar.xz 52448 BLAKE2B e100c2f306f871790e23bbe06950e41033563caeec2b4893c61c1ba6609069ad761b40d0f8f35ccd17b1fad4fa9c49cdef6b7bd895c13a302e2034ea484440e3 SHA512 ebc9ac1df994f30c6d74682dcf42b10f4f850b27e871d3b31b5bb067d906f3ab681dfd052c71d88ade873d98923e5360e8770f14d0104fde182b8eeba7084c2a
 EBUILD kdesu-5.82.0.ebuild 659 BLAKE2B 228857930114463ee93ab0d5a3d1ff704c5f67812f11a9903a0110392a15efcc405f9cc0d3f2d7c7e7c741feacd8feccf469b619630bfb2ad9ccd5269d9e54ec SHA512 f0570452a998fb6164315ae9f1ccac06af2bbc434ac2e38d6967e86090b3fce5c2715ddace47e799dcc5f694c1528b4dd7ece048136227b43f4b0c9d122b62ed
-EBUILD kdesu-5.83.0.ebuild 662 BLAKE2B 2eab4ef7a181a40dd672b6db7603608c4308acfcb317afd0ebe54954b38f589b59aee073265f914e52fa1dc0614de304d88b75e81e9188ff865e4f8578e38b0e SHA512 74effa213f71ca96300278a7589b06610cadb3533f2486aea1f342a9ac53b0db14e130e6afb49292edb977e7b0cc831be9b0814a7bf5cab63a293d0ae17a004c
 EBUILD kdesu-5.84.0.ebuild 662 BLAKE2B 2eab4ef7a181a40dd672b6db7603608c4308acfcb317afd0ebe54954b38f589b59aee073265f914e52fa1dc0614de304d88b75e81e9188ff865e4f8578e38b0e SHA512 74effa213f71ca96300278a7589b06610cadb3533f2486aea1f342a9ac53b0db14e130e6afb49292edb977e7b0cc831be9b0814a7bf5cab63a293d0ae17a004c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesu/kdesu-5.83.0.ebuild b/kde-frameworks/kdesu/kdesu-5.83.0.ebuild
deleted file mode 100644
index f80367b7e219..000000000000
--- a/kde-frameworks/kdesu/kdesu-5.83.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
-
-DESCRIPTION="Framework to handle super user actions"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kpty-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index b546d1ef3376..39d48d92d4f2 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,7 +1,5 @@
 DIST kdnssd-5.82.0.tar.xz 58296 BLAKE2B 3a7b2d48724fd9982ab74f9bbfcf48dc465082753fa1375d73fae3b53121dcc994ef45777ff01bf27b4f691c0e84d40cf7715ef5d5fc4cb511f6a6983b400cce SHA512 fb365bcf77f81f75a8a2fc62154fec9ef16df30e0efc40d89936532b197d43fe9708f889caef9297946f9c2dc4e44ecef0d8cc30f2e1a847d2b745b2b5dd0e9e
-DIST kdnssd-5.83.0.tar.xz 58264 BLAKE2B 128175f38649326ec2832647a49b35c2e4ee9d126bc6b6dfea9dd98cafd463e13f76864be73cbaeef1519752b57d8e1e728b226362a38a90e1528e77f363d022 SHA512 78db07b0744ced793c4ea374246aec6d21943145cd5a3ae63fbae978ce954aa859b96a12fd0e891b55a2b4db6e783ee3e6da99a4012cbe1bfccbb0047603b453
 DIST kdnssd-5.84.0.tar.xz 58684 BLAKE2B babeeef20edd8cdddfcf584ae508bb91a34bb9735e8784ab90f5e96c725ff91cd4ac76e1969a027cfda15a961e532970e6da57e10efee4b3d3cbee3ce197e7d4 SHA512 78997c9aa4254e41e5da14e8893f7ebbce76e52cfe913851048e110597b692fcbbfdc8bec8b9d491642c61daa5b0c583f3dcde416492b63dc22a4123e4d0756a
 EBUILD kdnssd-5.82.0.ebuild 644 BLAKE2B 427d6828558bfa5a7507855b3f5b6ac73a90ca32d1960f5bcf10b9940388ba718af99572594c705183a4d387aab5a773b431a7d9020ecc6c6c25ca61ddebb687 SHA512 ea782e6c32f494c9133cfce5dbb5361d7bfd110eb4a8e23237556e1e16f8c426c3aa99825ca9e4cec76caf842bd299ab64583db558eeffc36df19b712ee0131d
-EBUILD kdnssd-5.83.0.ebuild 647 BLAKE2B ab47ce98b067f0ebda141c82bb89e999630d9519aaaa78da05d0b72d4e2e22527caa61ba8d24d3cdea70b0ae92d3b15d71c5d0d1631fc7312b8ab1cc4638d144 SHA512 fe89ec0c6d35a178631334ee753350c83b47e42efcca1801d33709b054f659ee419e9ab749812531b67312da8f329c93333129ecca41cc954e1eaa1d53be65fa
 EBUILD kdnssd-5.84.0.ebuild 647 BLAKE2B ab47ce98b067f0ebda141c82bb89e999630d9519aaaa78da05d0b72d4e2e22527caa61ba8d24d3cdea70b0ae92d3b15d71c5d0d1631fc7312b8ab1cc4638d144 SHA512 fe89ec0c6d35a178631334ee753350c83b47e42efcca1801d33709b054f659ee419e9ab749812531b67312da8f329c93333129ecca41cc954e1eaa1d53be65fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdnssd/kdnssd-5.83.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.83.0.ebuild
deleted file mode 100644
index 57dc346bb8ab..000000000000
--- a/kde-frameworks/kdnssd/kdnssd-5.83.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for network service discovery using Zeroconf"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls zeroconf"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	zeroconf? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
-		$(cmake_use_find_package zeroconf Avahi)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index bc5b62e09553..0d78a0fbe3d2 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,8 +1,6 @@
 AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
 DIST kdoctools-5.82.0.tar.xz 437024 BLAKE2B 6e51452eef36a28af3adae497906ab02429ac57361bf598b347dca7ae0f9df33b7af0ef4c7ecaa5cde1f1021e9a44633013014d2d5a893f319bd8085b732eb65 SHA512 5255b78f1a51a9e2adeb1c6fe113c6555f50eb8af04d3d78c3942f924c071c11c1598245793c68c97eaa3bd1f299b8f9fe7f190da5b720ab7930ed53070f58d3
-DIST kdoctools-5.83.0.tar.xz 436976 BLAKE2B cdab2b1172a909f005c4d5ceb2dce778f43aa8b5ed2330b23a7410956d5a3e3ae5f7c85711823e89d26f9494aafbf398c525a1732b95b1f50c20c0dbb2ef2fab SHA512 6b70865c1b8735b4d43c58eed68a2428087b6eb2f4e4c23996d6a1607faef68f1fe897aba34513f55147dac19faa8c5f7f42989f1cec03848212d72afb4f3cb2
 DIST kdoctools-5.84.0.tar.xz 437044 BLAKE2B 6ef70322977660f68668a450d3582e84f2b216ac3a2ce0415868f002b61775c0a10c1b973e703fbcb5d2a36eba5be155d83c334c7e86e00cb0a16320ede3ca04 SHA512 6ac82dd14844e3c1857d566eb0b90bac27fc13275b9e74989da94fd844c6a2cfbd3c7604e1a71ad50cb1f8a9e4e1405c92b12a6d99b4a82b6ee10cab6341ab81
 EBUILD kdoctools-5.82.0.ebuild 869 BLAKE2B 37d94fdc143f12080efaa1fc9ed40ea16c369658742329ff3181748f709c9349befd7124db939b25eb764a7443e1aadd71cbe191e0c01ab85ca30c82999ad8d6 SHA512 b85f8267a233075dd38066ba9939ea98279b33989e8e287b08fbf260023455f8adf260cf86ca50d55955f726f334d98e812fa2b2836a4db1a2b6977a5ffa5e7a
-EBUILD kdoctools-5.83.0.ebuild 872 BLAKE2B 28ee4d24bfc73f12b48055b459f179906ccb453f18437c9eab2634fe8bf3329657bfb1f0041d08a2b80320e3bf7c5f3cd9836213e687fedc1ebb09e52ee5b17d SHA512 16b61b4e362111d915c0ea91b280fd8ab5a7abee36aa6d002f12f4a692d2ef00a2ec4936ee19780f7da9b4028953c8b56e121d8f3b672b21f5174cf1b646cb18
 EBUILD kdoctools-5.84.0.ebuild 872 BLAKE2B 28ee4d24bfc73f12b48055b459f179906ccb453f18437c9eab2634fe8bf3329657bfb1f0041d08a2b80320e3bf7c5f3cd9836213e687fedc1ebb09e52ee5b17d SHA512 16b61b4e362111d915c0ea91b280fd8ab5a7abee36aa6d002f12f4a692d2ef00a2ec4936ee19780f7da9b4028953c8b56e121d8f3b672b21f5174cf1b646cb18
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.83.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.83.0.ebuild
deleted file mode 100644
index 3b3ac23b5f35..000000000000
--- a/kde-frameworks/kdoctools/kdoctools-5.83.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
-
-DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-	nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 )
-"
-DEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	app-text/sgml-common
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	=kde-frameworks/karchive-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package nls KF5I18n)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 665622
-	local myctestargs=(
-		-E "(kdoctools_install)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index c75bae37144b..c84ca0528ee0 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,7 +1,5 @@
 DIST kemoticons-5.82.0.tar.xz 1698472 BLAKE2B fc5f8401a4b5482126a9b054f1fe6107c2da759df0a4ea960cc4a139d9ce8dcc22e6b94aff64780d7b7cf049d68b67b799011f3d999b07ce2f1e065e6d6612e3 SHA512 c3c3813613891e23db9b5605de6dcfdf3e5f973e162d27d37e907b60d49bfc3ba99743534d3749dad6a67217e44220fcf52c880563da82dc465eb10536ea40d7
-DIST kemoticons-5.83.0.tar.xz 1698340 BLAKE2B 4ee287e5a5c5ea3ec4528e6970af0c00c906be04bcc3d606d137cf764bbbdd9730af076dbbe77b68f342d0f4c35764b9ff254e896646d3c6ab28f9004d00a748 SHA512 a613359484fc72d0f38b9d3cd2163d89756f9ad259bf9d04cade6e9990964976f183b82bfc05acce6f64d0998b598b38a79cf1ad8a3b28f30ff5c23bd5960554
 DIST kemoticons-5.84.0.tar.xz 1698512 BLAKE2B e2830e894d3c097b6761f09d7a51c610dc5fd89a59de1e4a4ef1e4533edb384df1400fb97df94895ca5ece473269f3c346c1b179c6edc0978b6672431c5c7cd7 SHA512 e3019fd7565a36021d7aa6c6b904779d4f897498eb49bb3b805afcaec7c27974355e4cec2e63dcb054ca3cd828496337deff6fdeeb28e632a5f7a61ecc7dd9ff
 EBUILD kemoticons-5.82.0.ebuild 665 BLAKE2B a6ced1dc1d62fc0498b3b8eb1bfd3d4c20eb2e92ab99b50d9d7d7333bb6164fc538ef98a813bcfa052e3ec19e37712de4a8ceaad31ac9cd9134090cba0b79ea9 SHA512 4b307dd2a1e49baa683631e071e24f3c4f846a9a6e3a346354e38fb295e90652b4e390e4f9cfe8ade5932dd9e3cd7d83fb5a7f1c2d092de4858cec197563616d
-EBUILD kemoticons-5.83.0.ebuild 668 BLAKE2B d567b4b7cf7e860243cc1cf6e19532167e720f7a1927fa9492651aaa04f06e3c81cae659c6e8e5eab8a630e2ce2f09732d35120b719d9de1d8f1999e88a0eb98 SHA512 1eaa0939e21d7be266c8f4a06985d119474a5939e8201ce18d52e80fcb1409af3b5af9a5f462dd8a6148f7c45fe02120b8212931e07692703009b012dfe21204
 EBUILD kemoticons-5.84.0.ebuild 668 BLAKE2B d567b4b7cf7e860243cc1cf6e19532167e720f7a1927fa9492651aaa04f06e3c81cae659c6e8e5eab8a630e2ce2f09732d35120b719d9de1d8f1999e88a0eb98 SHA512 1eaa0939e21d7be266c8f4a06985d119474a5939e8201ce18d52e80fcb1409af3b5af9a5f462dd8a6148f7c45fe02120b8212931e07692703009b012dfe21204
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kemoticons/kemoticons-5.83.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.83.0.ebuild
deleted file mode 100644
index 6c6f658b72cf..000000000000
--- a/kde-frameworks/kemoticons/kemoticons-5.83.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for converting text emoticons to graphical representations"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# requires running kde environment
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 31d1987ff0d8..e4159a4f51ca 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,7 +1,5 @@
 DIST kfilemetadata-5.82.0.tar.xz 425540 BLAKE2B d9102aaca3c49fb81bdbef517ba1a6040d0653ce1fd517ce61854b221b8abffbc49c69ad38b98cfc47877f02d7885b9560834cc55b5e03ae2d05eaee51906a12 SHA512 7bd70ae0c2d49d2a9d312dd79dc9268862efefeb48042d0fd8a8e11daf75cc67b6dbeb28fcee7c3f87517476f6eabbd3d4e9a1c61440f62cee0ef93c165cfae5
-DIST kfilemetadata-5.83.0.tar.xz 425576 BLAKE2B 23154cc3a3d22754cf908f5b42bb2731fb1db638baec8753c5fb429ea8a8d8a9cca1474882b0ece1af75cf8b57b557c1a7ce18ecbe99a06486ea5131be9eaadf SHA512 257d4db283f8708f134c69ed835953c7b8177f18d2f8b8d682b0b51250802fbeee43d1603c3e302fb7c62e384d29ba69f6652807244a344d16fbafd50a535ff1
 DIST kfilemetadata-5.84.0.tar.xz 426308 BLAKE2B 4479d9cd0c2cb1f07040ec5541991ce56d6e8545552f2c40434a59e311557936407a9f870aca1360bd648c43b160d937b7d0a083e4cb15ac1b65ee1f987f3ee7 SHA512 cda78dc3ff73a29d5b913226e60cce87813feca53f0c8d38a4a5267e4149928cb9b5cd304022f4c2a1307ee3b0b72beb25792e3a3d2541c4843a77d45008f745
 EBUILD kfilemetadata-5.82.0.ebuild 1570 BLAKE2B a13ca1c0e412caaa88522f8d57d109e3be404b47fd3bb2095541c09db7c27bc9670722200459a5d4619c5e9d070553eb747c1cf28a1fc91f0f1f391b851c49c7 SHA512 7be89f4609812a090833a884ca467b0ac02560846bbd995bb6dbf6b8e4519172094373f96cda7285e416ac28e9b57fc797bd10224e27c21af0daff77ed340879
-EBUILD kfilemetadata-5.83.0.ebuild 1573 BLAKE2B d06543390c197db075488f1d02fc202aec4e892dabd0987e624386918fbe9794648d903769e8b60c152bbc7e1399f10a09118782a375508bfc92ad4c58b91ba4 SHA512 8107e1d5c83ef7fc1325ead6e445bf09083abfb2129ce687a893d9a0a65037fe830280b2922caf69a90e57ea0af1335ffbe4e18ed84f9411febd95fa619b319a
 EBUILD kfilemetadata-5.84.0.ebuild 1573 BLAKE2B af6db94766ab857df25e1f1070bdf5628f5e1f374b570ce85f93870fd7ad1fd62114cf9b592dbdb8c564a0a0a8522d230c4f42bd017bc49b049bf76d96ab7b91 SHA512 15ac029c8481f896fbf4bc91d57d9d0074505ca3f489e4c873ecdc1144b6408cbb956b8b0b37b17d17ce04f10249f3e291998f64e5ae9aa618e5af9f1bf78980
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.83.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.83.0.ebuild
deleted file mode 100644
index d1c43269f1fa..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.83.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature python-any-r1
-
-DESCRIPTION="Library for extracting file metadata"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
-
-RESTRICT+=" test"
-
-BDEPEND="
-	test? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2:= )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	office? ( =kde-frameworks/karchive-${PVCUT}*:5 )
-	pdf? ( app-text/poppler[qt5] )
-	taglib? ( media-libs/taglib )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-apps/attr )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package epub EPub)
-		$(cmake_use_find_package exif LibExiv2)
-		$(cmake_use_find_package ffmpeg FFmpeg)
-		$(cmake_use_find_package office KF5Archive)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package taglib Taglib)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
-	local myctestargs=( -E "(usermetadatawritertest)" )
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
-		optfeature "Microsoft Excel file indexing" dev-libs/libxls
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 52b215a993d1..a143f0848503 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,8 +1,6 @@
 AUX kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch 7552 BLAKE2B 37de1efd65119ca8df9147a5f52da98711102215a381c9bbf9c8796558ceafab8309225281ace5ec4dd59692a37e11a051f0bc1ff0755ba8a81705f7e4a634d7 SHA512 2c8e910240c3405da9bdc5962fcb3cc2db5a9b5a61f6155d8b2673ec30c957d00819f661e605fba3c2e14734e944c766376df6cb3c3e8708b62d5b64672f3007
 DIST kglobalaccel-5.82.0.tar.xz 87932 BLAKE2B feed60b09b01da373b3a6b989ca465b93a67d1ba84ce45c503805e6cb49af1b7ce99afa1921414e9a616d344f95366e0e4822b58f41ea73222dacfcc448a588c SHA512 c6f757628ca8123183b1ead08fbf326bf8b6d5b97e4dc65c33a2c158103aa7915617d423692ee417059bd08a299546b7cdd373b31dbfd80f2498193da7b5aaf7
-DIST kglobalaccel-5.83.0.tar.xz 87872 BLAKE2B 17ce1903b4e677ef3987d996ca2ec35ba789994390e3d44e474d3984653c2e679cd701fff9e50468e23666d112a08372a003b71f137fa0d46188add66764e5be SHA512 de29e653109576162be513b7de239d04a5fa06dc6c0d3cd52ddc3c12cfdb5d33d4d0e5ff8c8cc515e9366694808a6b0a19c6c63b93fc5dc1e9cbc2ccc899abd9
 DIST kglobalaccel-5.84.0.tar.xz 87848 BLAKE2B 7cf47f877da8176a37511ef1dc9e909279c3f1f91ddddbd0b0e5fa34024fe3b773838aaa1c5d396dc865cf60cc6850d5f1d8074cc80873c70c570a5a0bd9efc3 SHA512 2d9175aafdc9e3df27bab9b701ae8783f9676fd27df4f0e886e00e1bb103f5a58a79419d57e8fcb691a29397b912eebcd351cd8f3b7f704de3138e61cfc3c229
 EBUILD kglobalaccel-5.82.0-r1.ebuild 923 BLAKE2B 70334606890e0d5f0725335e7e2bf47fa7a4f4cfc726861c6f05d3d90ea957bba3556841ba9431c81ae0901598c4738be8fa8109f666c6d19ab9f458b99d5d9a SHA512 dc744dd22f8330c36bd0adee7a898c8cbd272e4c6f9f032af8cb873c518f58735af321ba097e62152908e4117f7de8c75f6b6c384bbd93183f55989512bd6605
-EBUILD kglobalaccel-5.83.0.ebuild 835 BLAKE2B 5f93998aa4ed4dd1dc96b9ad0c8f115efa8891dd68624d412987111dbf1f362638c5d7fd6f1082c5278a723f5c858864478ccca60bffe64334da0013577b6800 SHA512 a3b4887bd7292d887809cf101002da27274388e068471eba66f8e464fad18fb2512cfd00f6be713fb57e86ca4a76fa3da0e81b95de8e3a66df6f5d61358b9a49
 EBUILD kglobalaccel-5.84.0.ebuild 835 BLAKE2B 5f93998aa4ed4dd1dc96b9ad0c8f115efa8891dd68624d412987111dbf1f362638c5d7fd6f1082c5278a723f5c858864478ccca60bffe64334da0013577b6800 SHA512 a3b4887bd7292d887809cf101002da27274388e068471eba66f8e464fad18fb2512cfd00f6be713fb57e86ca4a76fa3da0e81b95de8e3a66df6f5d61358b9a49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.83.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.83.0.ebuild
deleted file mode 100644
index c07636e53c53..000000000000
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.83.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to handle global shortcuts"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
-
-src_test() {
-	XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
-}
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index d6d6bc2dd84b..8e4635199a73 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,7 +1,5 @@
 DIST kguiaddons-5.82.0.tar.xz 59020 BLAKE2B 7954f85a013b0ea5a69f524a7a8e4f715aae3a6e526c9f574e8d185bb3d840fc16a7556424c9183b51782007f39df2470d2f511ab9fb486ac61da245b7df1970 SHA512 8713b2036371240e92503e4be51bdd16a354bc08f1831fe242f64841945ce99e1c1e3a62d367f1c07c4769768d724341733c6f1360985e215bfd3a85d2574ca6
-DIST kguiaddons-5.83.0.tar.xz 59044 BLAKE2B 5e8d02dc485fbb297114ee73d736ccc990c0a577dece1af1268e32245fb283a5ffc41abcaaa338521c6f2bcd5bd772bbc7a839ce99db793a749e6e8b1d46f065 SHA512 5a8b7c4ac0a1222f7d50bf882b0646a43516bdd5a068397f3ba2dd1f40b3785aaab96cd8de5e07e5341c20fc81755a2a4368f99e267fcfd5e1326b80239ca196
 DIST kguiaddons-5.84.0.tar.xz 60652 BLAKE2B 7cd64e6c0a4aac5878204c076c50f7720175f025225436f3a67e545f7ac96004146b0280c6b483b5fcdc274a9ee939545f2058c07a59f2ef8233731aa9bc114b SHA512 7dc5d417e2b214b0d2a98b64162a570be14b74202a3aa6cd12d699c9372a9ad7e32b778f0a70266f9dee8b88cb5381aa6157d9ce6774f26e134aa6c79005bf57
 EBUILD kguiaddons-5.82.0.ebuild 716 BLAKE2B 3eed4ebb6872636ae2b7248e91d63466ad1837a4a1488fc7fb565b314955771e321e4aacb25c4542f4f62c659a4a04df6d71dbb52764e2a896e8af8f341b9847 SHA512 89a81624f19b2bef5a41123b283b91e75854ce67f43eaaa930b67aca87dd4311690c609d08519198a9456605f75fa12384e9a907a4cbe75c39a0cf6897af3594
-EBUILD kguiaddons-5.83.0.ebuild 719 BLAKE2B 4d842123e7322a20f309f0a79579e4c8dd30c0527751e5185285aafe8f2c7b2beb563d3741a9ba4857b4f1a7349f01101c45f0c47c78bcc931d023b2aca13ab4 SHA512 b50da9d4d8b9c475f5daf1cc109f14b0fc48f6b0e810856943a4e2ab0f2722eaf3f152a57a0c61e5b5e800b43a40d5fde19658e13a8af95cf07befc8e255f16c
 EBUILD kguiaddons-5.84.0.ebuild 719 BLAKE2B 4d842123e7322a20f309f0a79579e4c8dd30c0527751e5185285aafe8f2c7b2beb563d3741a9ba4857b4f1a7349f01101c45f0c47c78bcc931d023b2aca13ab4 SHA512 b50da9d4d8b9c475f5daf1cc109f14b0fc48f6b0e810856943a4e2ab0f2722eaf3f152a57a0c61e5b5e800b43a40d5fde19658e13a8af95cf07befc8e255f16c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.83.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.83.0.ebuild
deleted file mode 100644
index fbdfcada5f5d..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.83.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="wayland"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5[wayland?]
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libX11
-	wayland? (
-		dev-libs/wayland
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		-DWITH_WAYLAND=$(usex wayland)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index cf94adce4e14..f6c86b216a04 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,7 +1,5 @@
 DIST kholidays-5.82.0.tar.xz 226732 BLAKE2B 76a1f0adbe3a558b2cf6aac7782795fad869423cb42e70fe5f8dabbc1d5aa0b5a6e5036d7fd68b8bbf6fffc63e095a471a72afd9501c328f2a7878e20e53996e SHA512 902065bc4d1ea733d24adf349bc895020eb49ec1d3f98c3e8ef4a59e3d0c968e998081c7ff1a18466201372c6f51fa9ae251e747da1b959f696975c886a42306
-DIST kholidays-5.83.0.tar.xz 226768 BLAKE2B 5f621aa839c39c2c44d292cbbcb3e42559446e18e5d53813b27b6e0d8f4cc62eddfa2073bd8c27126953c793e3a18f816c552175d6a698f778fe2ef500bd54e5 SHA512 358a5847c46f05445e29822ec8b3eb58f706d81252ead440d9270de43eaeeed3075d235571f90cc9162ec509588c693d6f455b95547a26b80a4205e8b27968d6
 DIST kholidays-5.84.0.tar.xz 229300 BLAKE2B c42de513b633124311f22a0f56d180cc5b311c413df80688641b8f5adf55f05ed974fe6c8c0369959ac5c79382cdc04f418bab3675b8d90d1ccb691b931938f7 SHA512 e6c8f45de3bc76df6f66c0b4423214244361cf48bd752ae3f38e5dd3f6f7641a65311aafb4c594618fe5b763bbbf18c25787bf1a7a1e6fdbe42d70b0cc5d1f11
 EBUILD kholidays-5.82.0.ebuild 649 BLAKE2B aed1acf368fb5c61658d05f09969aa6a7febe5f63e2e5465fa3eac327dd3f3c762ea7dfd41d6fc0729b87af8dd07bd715115ab72a034b2887528fec6cda1a5e0 SHA512 3f202fcbbaae11ad03dc19da4f50353bebfcea1549bff5cf8bc7e745fbeef65f6c54a53d3ebe1689f757134720604f1113496a65f6620537de9168cb8413c54f
-EBUILD kholidays-5.83.0.ebuild 652 BLAKE2B 79235f2845ccf108cee0a6c6a3353ad41efb349b6741de44f947a03393e0c6fa8ccf562aa0bc7f0b99bcf9417b954f91ed36fd46e51f540471d2185328ec5b6b SHA512 7c79dc99c7ef1c97884773f0b8a427f2610d47f3edb808a173f46ca6bf4297fcf108251292e24f74e02746a944762e73611e57b4d9de52eab8e5ea7ceaf3aa67
 EBUILD kholidays-5.84.0.ebuild 652 BLAKE2B 79235f2845ccf108cee0a6c6a3353ad41efb349b6741de44f947a03393e0c6fa8ccf562aa0bc7f0b99bcf9417b954f91ed36fd46e51f540471d2185328ec5b6b SHA512 7c79dc99c7ef1c97884773f0b8a427f2610d47f3edb808a173f46ca6bf4297fcf108251292e24f74e02746a944762e73611e57b4d9de52eab8e5ea7ceaf3aa67
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kholidays/kholidays-5.83.0.ebuild b/kde-frameworks/kholidays/kholidays-5.83.0.ebuild
deleted file mode 100644
index fb3d3ebf8123..000000000000
--- a/kde-frameworks/kholidays/kholidays-5.83.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="true"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library to determine holidays and other special events for a geographical region"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 624214
-	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
-	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
-	ecm_src_test
-}
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 57b0dbbe8634..d88f531307d3 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,7 +1,5 @@
 DIST khtml-5.82.0.tar.xz 2093168 BLAKE2B e4cbcd5e187d8ba563090097d362ed6138575da93ce3c25796e1112b3a39c135ffd53d4dbd7302a9482069111bdc01291027a9ea6253ace972b19983db5b6386 SHA512 8aa3c615cc13deee3e4859f84636fd1cd18190b0a99849a6782b0a106a1a8808061258e055158cbd3dc15d5842ce3cc82fca8eff2fbd1634807744a0f7288cc0
-DIST khtml-5.83.0.tar.xz 2093192 BLAKE2B 52e4f919434037c6e6338c667d8f4fc648ec92bf0836adbc3582daba50c68f972928ef13ff11bfc1c316c4ab2d8de198a91460fe14a50cd359e30f1c37c602f1 SHA512 3d4d5841b4c82dd3c434d5f63b106735a1d80e10f5eac2b89c5070674bc627c50869d547112c20fcd64627b5e602e4e2932473b130a73e7df596e9400e3c1ac4
 DIST khtml-5.84.0.tar.xz 2093204 BLAKE2B a5dba85ebb522b5a995e2f23053300332abad6708576adb4338eb888ff85c8bd0cf8d2bcb779470cf7db3ed935bc6426828be7dece1fc17ee1d67919fce26877 SHA512 d70d8c95e10d817a03231396058c03f2c242deb4ec28478e6e94389e0167f38e3836500fbf58afa050d741e94f7043040550ca77bcb696b3c0c944d3c0e34017
 EBUILD khtml-5.82.0.ebuild 1753 BLAKE2B 12ec33b0e6075a9974b9f154f9f8e2f94b79a3ccb6ae59e0bacf2e589df8db6fdbec1b4c5feb757a9fc07feb08ad0982f162a8612fee04d5d8579336e722a384 SHA512 c653efc2d0c78aad650f43dc7291a3602e4ec6369bbaeee3c17a88b59e2a650a597a3af82d0c34de20123398d6975a52e51caf6aa6bc114dfe9424d49a60e603
-EBUILD khtml-5.83.0.ebuild 1756 BLAKE2B 26e5cd361a48c15782ce4f84ca380d27b3bc9dd4bc7570bf5543a4d735bd8be4c52442455bbb1a03cbba26403d5cefc6c1576926ccddee99007f3525b0e96bde SHA512 75e3adbb1f9be48803ee543007da3d4ab9cb5f02e6d3a9dc8ceac98cca3ad2c1b86a7ed3d36acef527d835089738c2a347a26ef8a55622eb5a9b9616258c7b77
 EBUILD khtml-5.84.0.ebuild 1756 BLAKE2B 26e5cd361a48c15782ce4f84ca380d27b3bc9dd4bc7570bf5543a4d735bd8be4c52442455bbb1a03cbba26403d5cefc6c1576926ccddee99007f3525b0e96bde SHA512 75e3adbb1f9be48803ee543007da3d4ab9cb5f02e6d3a9dc8ceac98cca3ad2c1b86a7ed3d36acef527d835089738c2a347a26ef8a55622eb5a9b9616258c7b77
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.83.0.ebuild b/kde-frameworks/khtml/khtml-5.83.0.ebuild
deleted file mode 100644
index 59dac9b04cbd..000000000000
--- a/kde-frameworks/khtml/khtml-5.83.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-BDEPEND="
-	dev-lang/perl
-	dev-util/gperf
-"
-RDEPEND="
-	dev-libs/openssl:0
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kjs-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwallet-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-	virtual/jpeg:0
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index fa29f5df2036..f63f0bb09f3d 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,8 +1,6 @@
 AUX ki18n-5.57.0-python.patch 512 BLAKE2B 9feb6bd88fbf7ed853be777320d5d4821320da91308866d1afa08f3e7ee1631f3f59e2b096c8aa6f2b2562ead934ab11a03633fa3b09cdccd1e292adee7adfaa SHA512 51462a06c232b9ee1eb1f0e290ba286f7f7702676e5b8c86626dfcaa0ed11b3d15744573643960ead459f9366e21d859e54e344abf7108f084e84dcf0765b596
 DIST ki18n-5.82.0.tar.xz 590552 BLAKE2B 628acb64959fa4b38ddc44c586218d1841b03dca2ed11d72ba235bd9868b50f63f95e46847783af14ff465f9f89fa8c63526631dc648b1f9baa6a02130ae9e28 SHA512 a0f84494897d5c614923581bb3df016ba8801b7404b933c7cf85b158be96baa0cc87199a4798a694654fa80ad8204085a2fb6da8e6f930156071261b213894eb
-DIST ki18n-5.83.0.tar.xz 590016 BLAKE2B f9e8bc4581bb27b87993fc302493e5d08d0956cbcc40b1be2e936e26b780fc67f141bed20d3d5cac081b2663c52f92e37b55a36624c11213e914a923561a5e93 SHA512 357be287d17b062de8748d2803fbe5cd19d96725bfdd9de02191f8d46ee59bf6c9c81da6bef8baf0dc892c6304ee2bf2d26817f4cf5e5948a1b45874dd1e8de5
 DIST ki18n-5.84.0.tar.xz 590056 BLAKE2B 50206b4a890c24a0ec6928690e51e0838b559dedc291a841682f6a80b9ef2f01760b82e422020e278b338953400947b21f5c1a3578680a24dd9a1e0ceb552a23 SHA512 eb389524041871035c166d12992f84e0d1fb34c2bf0f8faf906c469126622026e9a233b60ec841584fe694d7606246c0628146dd00ccde238c8a016c81a74273
 EBUILD ki18n-5.82.0.ebuild 830 BLAKE2B a0e385cdfa4e9f8f6b48cdc7aed245a66fa4894bd2b62790aa85c1ebd171118913ce4b019cc632c0a4d713136e9e87fa5e7526510832c75e79041b07ef8e5e33 SHA512 35c401841a829a5bd1150bf18a062562789487dbd4fc5b1ba265ab277e8ddb169a0bea96c1cb07724ff28f2fdc5ab1547c7e0e83b5f902ec5122d4d8ebe1512a
-EBUILD ki18n-5.83.0.ebuild 833 BLAKE2B f96ea5aa5a5f9081b4823a6a75e4eb688634f5fb915d37832544e6df3a15a8c92b9940d88ed912ad1bf899c87609f14ec4978180a7c9f0a8d6d8708df50780e3 SHA512 e6c0fa64d7ed3b26d13e9bd5467d53f9b82178609a3ef5c2c87797dba775068dc4265c2fc0b57a64949dbe022e3bc040874a9b65e0180e2a7b3947efad58ed67
 EBUILD ki18n-5.84.0.ebuild 833 BLAKE2B b57df0a952f6b4b390b2474a1bbec37089804b9bcda7bea4810fe480fc9eba8f7239a12bb7ef669b8f2e7e4247e88d5b22d7ed86a0dcb358f5ed1b34a2009047 SHA512 d869e6e6e8c04fc91b7955affb15a18000c313d454cf3f3cdd3f90590d9eb1d0a59839f8456775b03e3fd2f4bcaf2a5b87b9a4c3af8eefb6cc70eb217588dfe7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/ki18n/ki18n-5.83.0.ebuild b/kde-frameworks/ki18n/ki18n-5.83.0.ebuild
deleted file mode 100644
index c163b404f540..000000000000
--- a/kde-frameworks/ki18n/ki18n-5.83.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-QTMIN=5.15.2
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	sys-devel/gettext
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
-
-pkg_setup() {
-	ecm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index d5ce6bd94e6c..c0642e4653a5 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,7 +1,5 @@
 DIST kiconthemes-5.82.0.tar.xz 222884 BLAKE2B fd7404f50ec503e853d25fff6b61d55a133a26f7fec9a2a4b50da15d721ef9a2ca116b2307a6eeed7316693a68ca053f0d955d0417b19e0aa79bc6a6eaf64c25 SHA512 b323d9ef88e6659977a3a8d1a61b8bcb72c299ee16fbc42f4ac2c02f50dd03c211e9d79aff71e26ffce4a0a1d496533a5ea1d0aa07c30664f5dc78af9b105abb
-DIST kiconthemes-5.83.0.tar.xz 222880 BLAKE2B 3f28b2bd28d59161a278960a297ec895c88b9704f8490ee64fb98aba65122f793092fb93cca992c0dc71abb423920b3618c502f23e454b1213852c80d5a4cda8 SHA512 e91ed626fd1cd122208e0356ce2dcedc486e033afd5fdadcb534dda37a325babd87d67b9d12a6d6ee692b90656c3caf699a5b89df814ddf03f02d565ab52d3f4
 DIST kiconthemes-5.84.0.tar.xz 222912 BLAKE2B 8f1a01d476475346ab2dddb2ecc8755b44696f66e84e01444d976a8dfb60014f14ef4f50c4775cf4321dbd6ec3d7d3418ff0abdc003c8295029dd30d33453791 SHA512 6bf175fd39dfda5b649a2f1a27553e035e0a3c1f4962ea589eccf468d7a573491e38df99b4f6231417f23beb1d80e104cf2ffffd83427399dff1c442f59c1edc
 EBUILD kiconthemes-5.82.0.ebuild 799 BLAKE2B 3ed7ff52370ce3a320b23c240bc6e02db4916e7d8c0db81db6eca07d497238200c618fc3c03b3c9877b5a3fae2a3c8d8b70ba635f47a8bd587701488b5eb9fbc SHA512 b5e7cb72ea8ab37e90ab3e684cef4f1f5c6879b735fa1ed48aba1499e8cabf772024dbee20dae5d3440adb8608fb3e4755c8973fcdb7194485a48da442f81ea9
-EBUILD kiconthemes-5.83.0.ebuild 802 BLAKE2B 3d14d6495233562e7f6143a6ebbad297a5e9cffa63d88162e119335a050d2e4a612604aef40f058b1237150882581584061a7baee4a08297b2dc485de08890c3 SHA512 d335cfbc88316cdb24c0aef947e7be87a7f154f4b5382c632ab952873847c3f017657257623db047ba262a14088c386f35f2585ef561140a8ae82ca0edcb4498
 EBUILD kiconthemes-5.84.0.ebuild 802 BLAKE2B 3d14d6495233562e7f6143a6ebbad297a5e9cffa63d88162e119335a050d2e4a612604aef40f058b1237150882581584061a7baee4a08297b2dc485de08890c3 SHA512 d335cfbc88316cdb24c0aef947e7be87a7f154f4b5382c632ab952873847c3f017657257623db047ba262a14088c386f35f2585ef561140a8ae82ca0edcb4498
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.83.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.83.0.ebuild
deleted file mode 100644
index c189858f25fa..000000000000
--- a/kde-frameworks/kiconthemes/kiconthemes-5.83.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for icon theming and configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test" # bug 574770
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 78b143760132..d732b5070b83 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,7 +1,5 @@
 DIST kidletime-5.82.0.tar.xz 26040 BLAKE2B b5e7ee686c9ffaefc0f321bfff15f0ee633b04ba07753702d2f76ebb069704fd9c5042904e726e617754432df6caacd305b0c4095178b71077801089a76f29dc SHA512 35cb528aeaf0d28ace354eff8f65812bbc8fc7f0b8b01ac93b8317de6267d93d1e1808ddb5b136c0ec9980544f27518cea2c3c577dd8252be05b8fdecb396f39
-DIST kidletime-5.83.0.tar.xz 26124 BLAKE2B a921b13f88ba15d50e48e392c65af58055da73a0fda4b1220cebd11a811012cdaa604246497e1612ec7cf27e966566a7e4b2fffe3e51dc1f158fbaa4df167628 SHA512 e98c78f2aada9096ac1dd3dfc108b5201e22cee765301b057fce576d3b61c7fdb94c2f0fdf948468f1ee8e5a40955c6bbfe2dfe6978fa5b10dac37f8f764db32
 DIST kidletime-5.84.0.tar.xz 26116 BLAKE2B 4b0f6328d36ce0c9f81d13c507f014dba801f07b09bfed29b63f5abfd454223fdc411b56e4018d2ac24b9a1ba21395cd536d9e1f79acf559f94c4893d7033e4b SHA512 f6438322b11880d848a51f7b9ce152c0a2e3a4bb38611a8d4bc878a9f8fd685ab909c8015adac946754b9675846e4a22390c891ce808291b87fb4700cccfc683
 EBUILD kidletime-5.82.0.ebuild 855 BLAKE2B a9d7f8cd29c4ea71e71e9b74c0b51bd36da0da2123c3388c98bcb59c65c2b338e6964cc11060ba0a91ba8b6bb010b663cff76990c36b77d2dc9a649cbcde745b SHA512 afed3764af89fff78b5972eeb385faec8903068fc771c6d1f251c8ef2417e31b557d38f0be6f73710c5bf41c2fc9a9125af51c0c8dab6b530348e891454b40da
-EBUILD kidletime-5.83.0.ebuild 858 BLAKE2B 6cae8f05bcf63679df0f985946dd3bf75128f5575e3de690d20545e2af7878f1aeb0e9c2bc7b12727c1c12f6efd6def864d244f084c8c193fe611a9e4efa9ced SHA512 2b6b724ac641386cf6079b1cfaa987be92f59505408880d084c776943853734b0bac84e119d12302b2d64f5741ace87d1ab7ce3924e6f1d98dfacf8be8240aef
 EBUILD kidletime-5.84.0.ebuild 858 BLAKE2B 6cae8f05bcf63679df0f985946dd3bf75128f5575e3de690d20545e2af7878f1aeb0e9c2bc7b12727c1c12f6efd6def864d244f084c8c193fe611a9e4efa9ced SHA512 2b6b724ac641386cf6079b1cfaa987be92f59505408880d084c776943853734b0bac84e119d12302b2d64f5741ace87d1ab7ce3924e6f1d98dfacf8be8240aef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kidletime/kidletime-5.83.0.ebuild b/kde-frameworks/kidletime/kidletime-5.83.0.ebuild
deleted file mode 100644
index cd9479b80aab..000000000000
--- a/kde-frameworks/kidletime/kidletime-5.83.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for detection and notification of device idle time"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="X xscreensaver"
-
-REQUIRED_USE="xscreensaver? ( X )"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libXext
-	)
-	xscreensaver? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		x11-libs/libXScrnSaver
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use xscreensaver; then
-		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 97038f70bdc4..61d3d7b1602a 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,7 +1,5 @@
 DIST kimageformats-5.82.0.tar.xz 590128 BLAKE2B 2136a68dd1c7a9dd6c07da180d228ceafdeeb6c7bc35af66e53709c33e9bef40c4bc37a78243c29ae8041d1f92b365c809de34fa134ba66494dd50fad1f4ae81 SHA512 7f24763602a47eb580685164ae0ca2d074859eabed449c41ec28385a5cc9d2dc0ef348809e98452a320268fde37e1569e324c75b3de3908b7070a78749cdf56a
-DIST kimageformats-5.83.0.tar.xz 590672 BLAKE2B c9e3a678fc40c7bc792da6d9ccd48d32361e1cbabdd2f3008470d447f3bd53cf7fa7b1b17a8952e132bc5f5edf34c6981920ee7c9845664ba8cb3b68cba4cbca SHA512 de4867ad1c4d8c0be2b1eb80bef07e0ce154be5f70fb3dc050dfff202ba1627af991ddb4a2ec851040b3b3ae37c5980ec8b1caf588834e45899bd8a2e69b42df
 DIST kimageformats-5.84.0.tar.xz 590576 BLAKE2B 0143400e0e93ada1424778a4787073308711a3c1ee4949e725989dfc17a8cc2d5621b13f136ea0c40f3e1a2a731f3e8b8c6d58bcb0880982011c668568294a17 SHA512 b4b820465399c910530280705b650dfaffdc3c3862ca2f9630be466c3ddc78350ef1d10852cb2ec240ac798fa325249bf8cd61c54592d680f03fbf238ee63e41
 EBUILD kimageformats-5.82.0.ebuild 935 BLAKE2B fa9b82a438b5868785f25051545bdec9b67c9b547755e06b8fb7463cd5197ba5d0a4d12ef7a1d67f01870aa6ee3121dbfde2addac825cc46871c8e0750efc5a0 SHA512 dc20e7b6ce16e5cfde67bddf141571a50d9f52ad617b2b242472cf37e0717e17599e9968a166c1f12457fcba33f5c59422a47bc3933c3095c8e71b4e6e8f1821
-EBUILD kimageformats-5.83.0.ebuild 938 BLAKE2B 7df746cbb85e119c1128a6a967328c055323cdbd616c87775d36298099f38e1eda8fce8f734c350f7fb92153258539b6e801889d99d05d766ed8bcd90c77594f SHA512 7e8ec30bc0688fc8db618dcb6cf7247628b91718cbc28be7e8679f16e1fcbb090b421c77e48d9843b72301e14c10d32b9550d2976ce22194533dcff660574ff1
 EBUILD kimageformats-5.84.0.ebuild 938 BLAKE2B 7df746cbb85e119c1128a6a967328c055323cdbd616c87775d36298099f38e1eda8fce8f734c350f7fb92153258539b6e801889d99d05d766ed8bcd90c77594f SHA512 7e8ec30bc0688fc8db618dcb6cf7247628b91718cbc28be7e8679f16e1fcbb090b421c77e48d9843b72301e14c10d32b9550d2976ce22194533dcff660574ff1
 MISC metadata.xml 445 BLAKE2B 9e064019f9686ca2c961e427717c51f741a60cf1d470fa582ce9f1b9fb10146c2e4a5491b6c57de0b23d892ac8a2b0799a1afc5b9a5230d6b1722f3c4b41bd9a SHA512 18cd0bceb33980ba86628488b78b2dfab4a55f2bb05b2b7108b39339b4d9b144c2c5420cef06ec10df245cc71987b178ef72eedf32ef6fbb19013d0dbc341203
diff --git a/kde-frameworks/kimageformats/kimageformats-5.83.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.83.0.ebuild
deleted file mode 100644
index 1e0b558caa85..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.83.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="avif eps heif openexr"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	avif? ( >=media-libs/libavif-0.8.2 )
-	eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
-	heif? ( >=media-libs/libheif-1.10.0:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package avif libavif)
-		$(cmake_use_find_package eps Qt5PrintSupport)
-		-DKIMAGEFORMATS_HEIF=$(usex heif)
-		$(cmake_use_find_package openexr OpenEXR)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index a4520cb361b4..9ea599f1f238 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,7 +1,5 @@
 DIST kinit-5.82.0.tar.xz 121448 BLAKE2B 1c38e31d9ab2231a808edbb713629d91d1068263a56426303428e20b066256381030278cebc30fb45234df92bcf30fef40ad2a3a2e4066f643ce172f6c701862 SHA512 7c6dc83d1ea10a8271fe23a45a7e5bfc7e67a7f9c25914386d65157f253c98fc518aba4a4cd7d724d1684097e3e94e866e18165debe0717e7917572436fe3af2
-DIST kinit-5.83.0.tar.xz 121428 BLAKE2B 4209297abda6e7f54b0d5aee45ad8480f7c26189021f5ad09bfd2347cec5fc61570f394831f4f8162c995fab002c5c83623390489b5ca855c7e39758fda243bc SHA512 92be93fceae88a91351e59640fc410f6bacd4ee5073b4b0d2b6ae04c3af7aef8a631dcb3d83db37e822e4c66b39319cdfafd9ccfc00101a12c16d74bd6f3e442
 DIST kinit-5.84.0.tar.xz 121616 BLAKE2B 6108c9dcf5b4ed490a4675a7baf42f47b61b9fcd4420d563dffc637f1ace47dc29cb9701c271f0d0809942e4e929aa86f2e217e9acdca0a2cc680903fd420d01 SHA512 0b60d0dc81636b8f0950ce1e12223660d11999ffcf580b76aaec793b08f98c38906c8bbd891e036a3106ae23d40057ca20ca6a66b5e6f3384f688cb8b1524807
 EBUILD kinit-5.82.0.ebuild 1134 BLAKE2B 4e157916a91ed39ad8fc9bf70af2187cdd9b66fa7645cd716f2d3b68bb990b813480d3d94cf656de9ed876c447683b8b5c11755ee8aaa2c3d86932e043ee2084 SHA512 1e4fc8c805b841b5c108be00bf7c7e5526635a1fe25fdc46073dfb9b484c093414248366c96d2d18fd2d58ff389a1201c2c028034778e128307b803d50a6f27e
-EBUILD kinit-5.83.0.ebuild 1137 BLAKE2B 4c84b12d5d6366bcd58fb0479f93b944e606a802c38f2e61c23bc68752f1d7502412b908e00cf87542561c5f73142980c87ffe357b74f3a6af150c12a8821059 SHA512 dbadd05fc5380e874e19583c9192696882edb3066ee0b374813fe2ecb104908743a7b4fb55f83d14c702c1aea317f04aaa36ffe77348a0fa4813089b6983deb9
 EBUILD kinit-5.84.0.ebuild 1137 BLAKE2B 4c84b12d5d6366bcd58fb0479f93b944e606a802c38f2e61c23bc68752f1d7502412b908e00cf87542561c5f73142980c87ffe357b74f3a6af150c12a8821059 SHA512 dbadd05fc5380e874e19583c9192696882edb3066ee0b374813fe2ecb104908743a7b4fb55f83d14c702c1aea317f04aaa36ffe77348a0fa4813089b6983deb9
 MISC metadata.xml 358 BLAKE2B 2871358d649b4403a258b3941a6e20f5c464b418ffc8becdba2fbd9c7602e5c91942cd80d71c44984b03df7854b8ef2bca177f45686100b485dc0e05da143c3f SHA512 922ead94840c490bf035c540176e321228f5d047067996f01108e443a8bcaa34d9cdce9270573a2cf0eab6d9cf32ee57e91dbd4b220774e810dc3f4c4c85d891
diff --git a/kde-frameworks/kinit/kinit-5.83.0.ebuild b/kde-frameworks/kinit/kinit-5.83.0.ebuild
deleted file mode 100644
index fa069ce12404..000000000000
--- a/kde-frameworks/kinit/kinit-5.83.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+caps +man X"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	caps? ( sys-libs/libcap )
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 77e6555fa0b9..48e93d49b91a 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -6,11 +6,11 @@ AUX kio-5.82.0-MimeTypeFinderJob-memleak-4.patch 2467 BLAKE2B e32cf57531afd4532a
 AUX kio-5.82.0-fix-filenamesearch-crashes.patch 1046 BLAKE2B 3024bc3b143b1e5f261097ad47bf7c12ea54bdefba32faff9040a0128dd837453324f3b5b2cd2926b8f5ec2b899ff91daf4cbb3ae5c53cb401af88d78ff1fc01 SHA512 ae4ee91602dd0a7b54e9081db61056c775c2998542c326716fce4f8027173bb9893350a29b8d38ecb9e0a3194a314f6de97dc6a4e27a703c89cf77ee00d2f7f0
 AUX kio-5.82.0-no-cache-kcm.patch 2801 BLAKE2B 6779c2d1e77aff1e530beeb002b9aa7a993b365d8bdb22b7f77532038314cae62a237666b6d033a92f1219761f845c678b8367d86a757e5fc499165455f6345e SHA512 422ac748100d1e227ffc29da898437e4c4142b4c7f85ce46239ac6c76ae8feffe048fa1a44f3484b5859eb37baa3be96047652016c96c10b5fa2a262ce85b51a
 AUX kio-5.82.0-no-useragent-kcm.patch 3751 BLAKE2B 09ea333db392f0b35a531ff6921f4d9b0f8059ecc3bf48c8229c39815c49b4e6cbd6516fb2f99489ac468c33317260bb714915e971884d93dfa8b6284ba96039 SHA512 3641673476efab1c8e69408bc8472b1c6490209805d4039776ba397c39c98b59feed28cce9c03c55a8f87379d351cb87358773695dcdb5398aadb5cc1b89c4a4
+AUX kio-5.84.0-cxx17-std-mem_fn.patch 1191 BLAKE2B 32cda44666613cc47e8e9945350b3428f04db76353dc00daa5dcbd3af37395a4767d98bf2b9b2508aa7b3d3d2b07f911eaef8b1af2eb782bd94224a7bb31dde4 SHA512 6b078bfde67160bc44bbcb480a72b7ac61d50ae544a7f03a19efbe1a7129a49eebe2ebc57f1ecfd80b978ed25bc65d66f4a794764fa618b692071d56d65c5826
+AUX kio-5.84.0-fix-open-url-w-binary.patch 2153 BLAKE2B e6d57d77f95675a9e283c7a653575f676fc22e9e254984b2b91b46f0e14ba08bc91232a6f9bf83eb3ccab633bf97440fa06520d186eeed32a40d7b86529fe60f SHA512 3dcc1fd0c70aacd6c4417654e741e28540c6f583ed7bd21ce27c2728bf6a4a9f910d92cb6445c6c10d2f6eceff40d4a0d7b8c3ac7ac678e4299745998a0f9fd8
 AUX kio-5.84.0-fix-qtconcurrent-private-link.patch 2836 BLAKE2B 03c1b039360b7fc18101691d5fcb3464478fd9a3cb641456290e3fc3cde914669c1c47b4d0fc7c7243f3921d1e224baabeae20c70d88529226e62ca1432bac42 SHA512 17aadef9e7131391862aa7cb89de08156bebbb22de0c0b6474e9979bcbb77c1f7434a726038345705b707413a8c188bd5c7f15bdf3ae7dc31b777f4ea8bccf20
 DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc
-DIST kio-5.83.0.tar.xz 3187064 BLAKE2B 2a11566cae3bbe48d57ffc188d6ccd9b98796139fc34c6e68535e7c126e376874364f9d338ebc92f5996e9c32318ba69a2c8743b87183f775ec4c1309813c862 SHA512 0b2b9effdf8ceef148176852428256dcdfb49dcb256478f2400130b2bcf091a2a2e4f54a5baeb38c7c74b83d7560fc4e699fd3d8c476c530ae6828e0eef0bfb0
 DIST kio-5.84.0.tar.xz 3191612 BLAKE2B 1d1788f4c731d6802eff504f4cba5569847dfbd506d25685f5c9d2218a88eb8ffca3d01f9290567ef368f0104ed322586015e6536e2ef07120803a2adbba5e2d SHA512 4c041b33171014562469c8ee074f85595edd503c0cb4c66aa5a17bad24937b71094826df2f3734b3d244d93b812e933f6ddc095628f2b25d5fca34c793383af9
 EBUILD kio-5.82.0-r2.ebuild 2933 BLAKE2B 0a5403e19ca99bfd4aca781fe39db28da02d1cd83717aebed1ca51d245ac49e57ee0fa4ca60c98ee675b331ef7947a2768728dfe6e5a5bc78c27a52a0b07d58b SHA512 e7172bcc1813bca6f08486db2af8dd33a3de5ebb2dd46ccaf137c74b34a4ab74237cc1dd7a13aa732667353f70020aa1b8a6977318537a08901849edb165bea3
-EBUILD kio-5.83.0.ebuild 2535 BLAKE2B 8b33c4923592ef379ca9f77bc6ea29c3d99aab924639f2c7f48bea35210c23685fa2cbe2ab8bc99909f9491eb0978cb3ff6fcadd2a47e21b9496254168c85c2d SHA512 5973eef46e6c54fa14e222a2b642c2fc6b1929272d1b1fa7c8165a34c5c2def28dd04a7f3ab2b5a5f8a34f2bca76a52085d502f696ea2d95e6e15f47749fc872
-EBUILD kio-5.84.0.ebuild 2566 BLAKE2B 98a309499991d11c2373e97d96a842e5b7328a9403be67f7ae2781016457a750528391edda1bba3df884764902bf23e69f73543c7321bb4e35b6ce45011777e8 SHA512 e9070dd2b17d6a2cb5005f4402e9d4ded2c442f3247e27989114b916e901af02f59eb5d165ec29550b9168c64472b18f8a29a58608c482a8754972c4d1dbd692
+EBUILD kio-5.84.0-r1.ebuild 2609 BLAKE2B 6764504a38bb3224c0417df814bf3658a09170826aea67ab059345cbfb5c418625a95354b04cc67bc2e71fe96e8675f82980d7fb52c8f87264a8cefbf4ca0d1a SHA512 f3b3d2643f248756d67a6903858e3d04114aed4dbbff2fd3629afbe445d1876476e4beb2f49d8a89f38e2d39647e10fcb87ee212a387b34ee3d16266ef916960
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch b/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch
new file mode 100644
index 000000000000..26383b788a01
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch
@@ -0,0 +1,31 @@
+From 36f1814b184f4d5ac628fca5db5f6cc1440b4db7 Mon Sep 17 00:00:00 2001
+From: Jan Paul Batrina <jpmbatrina01@gmail.com>
+Date: Mon, 12 Jul 2021 22:06:19 +0800
+Subject: [PATCH] Use std::mem_fn instead of the deprecated/removed
+ std::mem_fun
+
+std::mem_fun was deprecated in C++11 and removed from
+the standard in C++17.
+
+BUG: 439780
+NO_CHANGELOG
+---
+ src/widgets/kpropertiesdialog.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
+index 3f61e8ea3..1ed8bc7d8 100644
+--- a/src/widgets/kpropertiesdialog.cpp
++++ b/src/widgets/kpropertiesdialog.cpp
+@@ -2273,7 +2273,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions()
+         d->fileSystemSupportsACLs = fileSystemSupportsACL(path);
+     }
+     if (d->fileSystemSupportsACLs) {
+-        std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fun(&QWidget::hide));
++        std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fn(&QWidget::hide));
+         extendedACLs = new KACLEditWidget(&dlg);
+         extendedACLs->setEnabled(d->canChangePermissions);
+         vbox->addWidget(extendedACLs);
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch b/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch
new file mode 100644
index 000000000000..cdccada57d97
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch
@@ -0,0 +1,53 @@
+From 8ad6921524c92a0cf1b58336b3ce29e159e83b7d Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 14 Jul 2021 17:06:59 +0100
+Subject: [PATCH] Fix selecting binaries from component chooser KCM
+
+In the kcmshell for a component chooser we use the open with dialog to
+select services for various scheme handlers.
+
+If you select a binary instead of a .desktop file a temporary .desktop
+file is created in ~/.local/share/applications
+
+This is in the format
+Exec=someBinary
+MimeType=x-scheme-handler/http
+
+When we then use this application for launching KIO::DesktopExecParser
+then (sort of correctly) determines that that the chosen service cannot
+handle the http scheme because even though it is a scheme handler it
+does not have a "%u" in the exec line.
+
+This leads to us potentially loading websites via kioclient or kio-fuse.
+
+Testing done:
+ - kcmshell5 component chooser
+ - web browser -> other -> type "/usr/bin/firefox"
+ - kde-open5 http://kde.org
+ - Previously this gave a local URL, now it is correct
+---
+ src/widgets/kopenwithdialog.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/widgets/kopenwithdialog.cpp b/src/widgets/kopenwithdialog.cpp
+index 1831878ca..31295044d 100644
+--- a/src/widgets/kopenwithdialog.cpp
++++ b/src/widgets/kopenwithdialog.cpp
+@@ -1088,6 +1088,14 @@ bool KOpenWithDialogPrivate::checkAccept()
+             KConfigGroup cg = desktopFile.desktopGroup();
+             cg.writeEntry("Type", "Application");
+             cg.writeEntry("Name", initialServiceName);
++
++            // if we select a binary for a scheme handler, then it's safe to assume it can handle URLs
++            if (qMimeType.startsWith(QLatin1String("x-scheme-handler/"))) {
++                if (!typedExec.contains(QLatin1String("%u"), Qt::CaseInsensitive) && !typedExec.contains(QLatin1String("%f"), Qt::CaseInsensitive)) {
++                    fullExec += QStringLiteral(" %u");
++                }
++            }
++
+             cg.writeEntry("Exec", fullExec);
+             cg.writeEntry("NoDisplay", true); // don't make it appear in the K menu
+             if (terminal->isChecked()) {
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.83.0.ebuild b/kde-frameworks/kio/kio-5.83.0.ebuild
deleted file mode 100644
index 154cff27d395..000000000000
--- a/kde-frameworks/kio/kio-5.83.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# tests hang
-RESTRICT+=" test"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kbookmarks-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
-	kerberos? ( virtual/krb5 )
-	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	test? ( sys-libs/zlib )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXrender
-	)
-"
-PDEPEND="
-	>=kde-frameworks/kded-${PVCUT}:5
-"
-
-PATCHES=(
-	# pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
-	"${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package acl ACL)
-		$(cmake_use_find_package handbook KF5DocTools)
-		$(cmake_use_find_package kerberos GSSAPI)
-		$(cmake_use_find_package kwallet KF5Wallet)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_desktop_database_update
-}
diff --git a/kde-frameworks/kio/kio-5.84.0-r1.ebuild b/kde-frameworks/kio/kio-5.84.0-r1.ebuild
new file mode 100644
index 000000000000..e4d40e939fa3
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.84.0-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# tests hang
+RESTRICT+=" test"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kbookmarks-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
+	kerberos? ( virtual/krb5 )
+	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sys-libs/zlib )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+	)
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-qtconcurrent-private-link.patch # bug 784971
+	"${FILESDIR}"/${P}-cxx17-std-mem_fn.patch # bug 802030
+	"${FILESDIR}"/${P}-fix-open-url-w-binary.patch # KDE-bug 439477
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package handbook KF5DocTools)
+		$(cmake_use_find_package kerberos GSSAPI)
+		$(cmake_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/kde-frameworks/kio/kio-5.84.0.ebuild b/kde-frameworks/kio/kio-5.84.0.ebuild
deleted file mode 100644
index cc327525d7b5..000000000000
--- a/kde-frameworks/kio/kio-5.84.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# tests hang
-RESTRICT+=" test"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kbookmarks-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
-	kerberos? ( virtual/krb5 )
-	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	test? ( sys-libs/zlib )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXrender
-	)
-"
-PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
-
-PATCHES=(
-	# pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
-	"${FILESDIR}"/${PN}-5.84.0-fix-qtconcurrent-private-link.patch # bug 784971
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
-		$(cmake_use_find_package acl ACL)
-		$(cmake_use_find_package handbook KF5DocTools)
-		$(cmake_use_find_package kerberos GSSAPI)
-		$(cmake_use_find_package kwallet KF5Wallet)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_desktop_database_update
-}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 567601072d07..29bc698241d4 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,7 +1,5 @@
 DIST kirigami2-5.82.0.tar.xz 315952 BLAKE2B 470199ae252029e7abf78b1d3853f72635bd0a68a306695d2ba2a88ed2114e129a1b496cbc6084da17e9d39f5bff7c44fe0a72636f22654aad582b658484aa8f SHA512 d2a72879bca7151dfe07e55089bf61c8f3157ed78357b894a7834a05c78ee790b55afc2633e491b358b8b6c86ba73a000f17c7b224c88e19711a065debf0102e
-DIST kirigami2-5.83.0.tar.xz 318804 BLAKE2B 96c7ae5336c5262854c77d0af70a1fd7bfe0e2adc8a7fbc5553c76cb51ae133de6684bbf15db895c60cb4af572ee49cbe92ab92267b9b357f6ee36c44137861b SHA512 3fa82231b918d73b6ccc46eb1bad9fec2e825d3e50e16635b51340c0305f05c133c806d735034def2c29a4ab1314039f2d13bd4888a05ec283e31d880ecd5556
 DIST kirigami2-5.84.0.tar.xz 319404 BLAKE2B a219a336842a782f1f726c256352f6484f685ef26c5d0f87851246c437d33eeb2ad2742bb672b3ef5253ea343b4cc5259740a37bb98640892483f8142ad24299 SHA512 d2694cecd6d0f2a18acd6c3e909232800f486db2a4a9d1d4fca2d9a416c3f5d163a4cb70c40809253aca037f19f0bb0cf8bdec8f7d5192137d9bbd0620a72566
 EBUILD kirigami-5.82.0.ebuild 975 BLAKE2B 14cf5456ee43bc83a9d5a3fe832f0fa1689484d635bf31c1cd43aec1164675a2ca2e005cc30007f39308691749ec132577bf3eaf55b220c0f6ee68af58cb5928 SHA512 e6ae1c47d36ec8351caed8ed168aeeeac91fcd5e2ad23ad1f197a1563c5c38bfa6b07bf3065a7b437f11ee987a9b5c81c72c4ccaf09223417cf6479783d8d515
-EBUILD kirigami-5.83.0.ebuild 978 BLAKE2B ffff2c52d3be62943ce8d85ee2edbf207ba631331ba02c87f8c037f6fd1eb0c9f989e58e1cc519e7e280afe34a37f4b917e4472eb07112bcc5fc6a1e6f4028aa SHA512 af4dcdd9cf8ef4671ffa76268deba66ff550143f20f7c7005f5c70aa4384d4adf9d8744dd7fe21176f5925b370c840d6a3c8c755d61bf2a60fcf1b7dd8995aab
 EBUILD kirigami-5.84.0.ebuild 978 BLAKE2B ffff2c52d3be62943ce8d85ee2edbf207ba631331ba02c87f8c037f6fd1eb0c9f989e58e1cc519e7e280afe34a37f4b917e4472eb07112bcc5fc6a1e6f4028aa SHA512 af4dcdd9cf8ef4671ffa76268deba66ff550143f20f7c7005f5c70aa4384d4adf9d8744dd7fe21176f5925b370c840d6a3c8c755d61bf2a60fcf1b7dd8995aab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.83.0.ebuild b/kde-frameworks/kirigami/kirigami-5.83.0.ebuild
deleted file mode 100644
index 22c5683da45e..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.83.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-KDE_ORG_NAME="${PN}2"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# requires package to already be installed
-RESTRICT+=" test"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-"
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 2f9ae067841b..479c82e58114 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,7 +1,5 @@
 DIST kitemmodels-5.82.0.tar.xz 403080 BLAKE2B 722bb9df4bc8743d1f64c99735b9b97a7326dd4fb8ed51d1e220f8b584cc211ee5f7d75c7735156e8223450acc1f78e5ef10b87f295947b7130fdd861510bf62 SHA512 a28862e46658be6d3f7b8115151088fc5febcb804e115d541a0514f12cfe0019ce4b5108643290db817a06b19e613c99ce68cbc32ee7ea90c906dcac8b392d6c
-DIST kitemmodels-5.83.0.tar.xz 403136 BLAKE2B 748c153f233929053eb5b9ec69babff6f7770c2680784bd52bd6c031887d24cb958ecfbb3920ea1ec5b47ea9b836b09c428746c805ccb02521ec5c57afeee35e SHA512 5193a29bc39067fd7ec42e1bff7f5a9f65d980272d36cd4e3d794e1a5fee63f3c226098a1d33f6db8f5a47c06dbc327d5ba2515ab3d646ff05b6310f70ec8bd0
 DIST kitemmodels-5.84.0.tar.xz 403028 BLAKE2B cf307774354c028347279eb183df59c3180395b1ef0fbd7b65c12a934f8fa1c855d05d9d7d28ed506de8f840446534ad5e162a45b3ab45010fd46e8e76f52fdb SHA512 bdf281a07558be44939a08651b272fecb18614a44ff68442195d192fa81d40c425044e626151a2fbc6c9642ea33cbef26754373cf1870c300373ec70a53dcac5
 EBUILD kitemmodels-5.82.0.ebuild 686 BLAKE2B 7a03e55fc99c72e185c9286f7fd2707b7008adb44ba6139d33cd3b0a23237f90672b3ec0b8c0e4e8e52b286ebe236d1ff31a628816efb19dcae6ac3ad91787ec SHA512 c66ab8a142495a1ddf61e67836a9a6bf31fac6557b5e39e31222a27b34ced6e9ce854b802335a0ceb982a8a2b50c5ec07e0ae0989cff6daa6ba06dd85d33c31f
-EBUILD kitemmodels-5.83.0.ebuild 689 BLAKE2B a59384e558c8c7470bfd7dfa3fc26a65174ad65860a5fdaa7ae01d67eb215381b9795129d157d35bc6c3d4106c61f8c1ee467abe00ff1194c64c132929003e38 SHA512 07584ee138c49324c2e12685fa0fe8ea810c86c9a5aed856d087f2fdacedd808c98021f1cead22fc5d4dc5efa07b8a185af3eeba315a5753a43d7bbe084c9e55
 EBUILD kitemmodels-5.84.0.ebuild 689 BLAKE2B a59384e558c8c7470bfd7dfa3fc26a65174ad65860a5fdaa7ae01d67eb215381b9795129d157d35bc6c3d4106c61f8c1ee467abe00ff1194c64c132929003e38 SHA512 07584ee138c49324c2e12685fa0fe8ea810c86c9a5aed856d087f2fdacedd808c98021f1cead22fc5d4dc5efa07b8a185af3eeba315a5753a43d7bbe084c9e55
 MISC metadata.xml 345 BLAKE2B 6ebc0f7092b99e24519fae9baf08d02fbf70a5a648e5110e2bb55fbe37156dc13250e297c6094eee7f5030297b6371af4f7642a2b95002b8f9e2241b4a1b3770 SHA512 5c37c8e0f442b14c74035c501da0b02b9c40ac09d031a098decdf463b0bd5e77c54542aadad406ed07d7860626e668882933dea7c7a9696c922bfa5e0ba4c52a
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.83.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.83.0.ebuild
deleted file mode 100644
index 94e4faaea807..000000000000
--- a/kde-frameworks/kitemmodels/kitemmodels-5.83.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="qml"
-
-RDEPEND="
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		$(cmake_use_find_package qml Qt5Qml)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	LC_NUMERIC="C" ecm_src_test # bug 708820
-}
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 2ba206dd55c4..51bf53d6c65a 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,7 +1,5 @@
 DIST kitemviews-5.82.0.tar.xz 74908 BLAKE2B 0419be4239e07260606a8592a55bb16d4477d2a4f7b53aed5c50a872c6e32c35d62a550de5664cbd332f2d3be7b7f11dc6f50d983294b50649c8d5c9704e0054 SHA512 5b2d343331a99418e3f6030d5732d998149670c7d7075de3c0c7431b1855ef75ecd192838a8d2d5d10119eb4cfc397b0bcefff48dd11974cbd332d05bbb5799b
-DIST kitemviews-5.83.0.tar.xz 74924 BLAKE2B e04816655e468d021712cc90d431239a77171f29fed785c5e060c54a6db791d24106166a00111f487d2e17910f6ff32157b2d856e4924ee35f72a2e095169e98 SHA512 3fd1d14f145ee66524766059a801d8a22d90993f9e637a3918788970787ec6ef2ccebf23958da282412756712305c20abcec9ff06926997eaa3ba900f53f3e7a
 DIST kitemviews-5.84.0.tar.xz 74896 BLAKE2B 26bea3d730dbb53bc3ab44d7d48c349f0c3d5158bd67f94ba2596d60b56e92060731830d1a2638cf6dd20ab1d131be3aa49026816cdd0bd11d5d9eab7b3dd36d SHA512 34f479ace7478dfd14914cbf4b39e3940194cb65b44427c4e62039ddd01aed2055705cdb87413a094d4c41cf86a8952380193aed34ba6520920c95969c32f5e4
 EBUILD kitemviews-5.82.0.ebuild 616 BLAKE2B 56ecba2d309de88d951f2cd390b852cb9d4dedce7990c1a80231101a7e8001674be3de1dac2e7802b16e8eb66d90afe4343c3f5527ca573a001a5aea8b35302e SHA512 a5dc98c5a5e893d0b7009046fd4e43efa9e04eccd52b7d22fe7c25a40b124777119f275fb66e2998f2a74f4a1fbce7af4b642b705c4cb0685857a96abf278a69
-EBUILD kitemviews-5.83.0.ebuild 619 BLAKE2B c0856097769aed31b0f21c47d737e7fa5d730b3664de3f86e6b0ded0e29bfe6e770853a3523cc45d86fdb5cbbd9d7a8150ff1e74da9c7b2dcb287191605f3510 SHA512 9f887ab873d9b1cd67e3478fa97563906f58b9326ba357b74d58d231de85eaaf10a3cebfda240f41722619d9c354d2c4f7ed913ccf2a28feb31ff9141b701366
 EBUILD kitemviews-5.84.0.ebuild 619 BLAKE2B c0856097769aed31b0f21c47d737e7fa5d730b3664de3f86e6b0ded0e29bfe6e770853a3523cc45d86fdb5cbbd9d7a8150ff1e74da9c7b2dcb287191605f3510 SHA512 9f887ab873d9b1cd67e3478fa97563906f58b9326ba357b74d58d231de85eaaf10a3cebfda240f41722619d9c354d2c4f7ed913ccf2a28feb31ff9141b701366
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kitemviews/kitemviews-5.83.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.83.0.ebuild
deleted file mode 100644
index b8205a752558..000000000000
--- a/kde-frameworks/kitemviews/kitemviews-5.83.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing additional widgets for item models"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 26818b9e926c..b70cb579b02e 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,7 +1,5 @@
 DIST kjobwidgets-5.82.0.tar.xz 95628 BLAKE2B dc4cc0332f54c3f44034ac0534dfb60c655e4a089cac9cba97472cb3c345bd0617b13ebe0f152ecfdcd438965088fe45cbbe8e83d2c6017c90fca0181e052e96 SHA512 9fb0d2ababee7824772748e6755641910fe0fcbf0ab91ceb5cc326af12b0b9a5d853c84ca226ca0ce476132acaaf5cacc626ffa820ed04fc1a05ea4f68f0f454
-DIST kjobwidgets-5.83.0.tar.xz 95608 BLAKE2B e516f436b27e35497be36a94e955f8a1b7548b22873ba9826dd943b28ee76c743d1a515151170bd14c5e307086b3af00ac30698917c80361aeca533017ba6372 SHA512 d96261cd53a3b27938adb3edf3c039509e3a999720be3d61067b5c7d92c85ed70068fb92da470ec3b35ef5841462a9a7ff8a3faded3ee66474968724c9a9aade
 DIST kjobwidgets-5.84.0.tar.xz 99040 BLAKE2B c622559bcc702076ada8ea95d167e1fa8178dd87d59ce26cddaac40789f1c8a003cff3c0f33d887e5c1eb8de641e3b9e969dc171cdc008dbe71a716e4b6c04dd SHA512 ba47870362028ea0dd77891d06915878605c617a285eeab06a7d9a7105b55faa078426125c2937370b54b8117a8b5e1568d84bd6512940602708696f7ca96750
 EBUILD kjobwidgets-5.82.0.ebuild 842 BLAKE2B 76e3d634c96289fddedb6507911426a7df340bda2797a2a542eaa1e1950a57495a66528ac5e0507269826766cc3bbc407a6a1f5df24d15a964aadef9b40d9558 SHA512 cb0093d89b82f258d9f5d2f1d25c1c816c92970f39e67315549ce4983150e3f488d9837b7589ddf6c52e7995e90cc9f1d44bfe689b38a79489cf5f0c86b48e5a
-EBUILD kjobwidgets-5.83.0.ebuild 845 BLAKE2B 1fb1fcf19a08ee54fdc84305036ae3c4362347be2b88f073041f27894fef0b47d1147a974944ff4ff89fad3d70d9ea4cc4431f17aa25a21e246bd5719117c1ae SHA512 773562c410ef2820d3124a3440e41e364f664a81130ad037e5135970a62f29636282e1ceba57033d34789cce23244db0a42321de12c6d59c76a3ebe73453bfee
 EBUILD kjobwidgets-5.84.0.ebuild 845 BLAKE2B 1fb1fcf19a08ee54fdc84305036ae3c4362347be2b88f073041f27894fef0b47d1147a974944ff4ff89fad3d70d9ea4cc4431f17aa25a21e246bd5719117c1ae SHA512 773562c410ef2820d3124a3440e41e364f664a81130ad037e5135970a62f29636282e1ceba57033d34789cce23244db0a42321de12c6d59c76a3ebe73453bfee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.83.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.83.0.ebuild
deleted file mode 100644
index 1dc58354abcb..000000000000
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.83.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls X"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 3fea3ae41ef0..42226e14ac4e 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,7 +1,5 @@
 DIST kjs-5.82.0.tar.xz 337880 BLAKE2B 304acd60f22c3ee3cacabe1794369540dd43473464fe42c7cb3c2e498a3ed6780eab1f75823393efbc9658a06d3b19e718e0ea3d39463acec9b778162c56d214 SHA512 9ac3f70b09d309fe11026964607aa102d1b6264ad19c8618993fc533ad13dd367772886c56da26d980cef1aa1b80d228a8822340be582cb2a150352d64efaef8
-DIST kjs-5.83.0.tar.xz 337904 BLAKE2B 64369d57cfc58a7bf2b2c908f968a9f543aa28f79d2ff6f9ab515d5e3ba3218e6c1991b84d0d785b3494efb4fca48fc920adf768c9c3e24d88c0e91f7cde9233 SHA512 e7281ca98489a2774aef9e546e4e50ade1c5887611533dda12a41f81477fec3a3d3f9a5907d8e5d91593f912fe621946272b2e78f10fc743e2077ce2fca3ea3c
 DIST kjs-5.84.0.tar.xz 337844 BLAKE2B 0deaa5035d2a8ae07fa7cbb3be502dfbae3a17bae21b12c5a5001e0c13a25b38ac51e62305e6fd12f49268bc1a0d9dbc1fd19d6507e02142c946c7dee12f93d1 SHA512 a766b6eac0c6abd69867cd137ea2c5cb87f1a93a89711d2ed3882c762425d56aea740fb6384850218806334684141f98aaf2fb54a587ccc3fce1d9fe8f865aef
 EBUILD kjs-5.82.0.ebuild 399 BLAKE2B 1eaba452d35a4287ea14bd7b23f6328f3df7f5e007726180e42a5b02b489bcce95713e38d934b9202b6fc7fd83c182b75b1b57c82782c16c83e355d2eae2634c SHA512 817cc1494caedbcf00550c5c27e614680ee0e77d7c60b2633856cf003ef84b66a4cbf769dcc032a4fd6b2a2026f0fef254d75baa6b86d8fd2133896de8b810f5
-EBUILD kjs-5.83.0.ebuild 402 BLAKE2B c47ecfc67500b2ef08bfa75b6fea9df6635133c0c5109361b6449a0e4fc264d17351a209a0ec8778e3b981609b51db0a97224619a88a2b89ebe19074cf782ca1 SHA512 c6ab116a2a4416c6cbb089e9423e6c8c9429416d21a64ad4709729c4d1c9e0231b94539c8a0ca9168f1572ab93bb0d04b78ebd27c1cdd23841a4c33b9b485bc7
 EBUILD kjs-5.84.0.ebuild 402 BLAKE2B c47ecfc67500b2ef08bfa75b6fea9df6635133c0c5109361b6449a0e4fc264d17351a209a0ec8778e3b981609b51db0a97224619a88a2b89ebe19074cf782ca1 SHA512 c6ab116a2a4416c6cbb089e9423e6c8c9429416d21a64ad4709729c4d1c9e0231b94539c8a0ca9168f1572ab93bb0d04b78ebd27c1cdd23841a4c33b9b485bc7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjs/kjs-5.83.0.ebuild b/kde-frameworks/kjs/kjs-5.83.0.ebuild
deleted file mode 100644
index 103b7d178deb..000000000000
--- a/kde-frameworks/kjs/kjs-5.83.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_QTHELP="false"
-inherit ecm kde.org
-
-DESCRIPTION="ECMAScipt compatible parser and engine"
-LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-lang/perl
-"
-DEPEND="
-	dev-libs/libpcre
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( src/README )
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index b327d6cd71aa..084f4c316640 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,7 +1,5 @@
 DIST knewstuff-5.82.0.tar.xz 1167420 BLAKE2B d35ad76c4780b79cb40b7920febfcab665bb071e26fde98710435ff7cac92454c0f07a76d7b42d2c786aa793be97ecb3f92954052a1f3e43e34d316c021d6b10 SHA512 50377c16447dac2f55e025a320c51b86142dec7109c33a9e46415c5acc4d8d234ad49f7cc25f3f29f65d37408a6a780df1dfe279b151d109d601f9504d9f7408
-DIST knewstuff-5.83.0.tar.xz 1184516 BLAKE2B 589151401d33993f2e1875a60fa85dbbee72095e24884a681fea6e15f06bdaf3ffaaab5afcd0940de76dd51ebd13f2692f53d32f42f96088b6496f4ba8c5e478 SHA512 fbeacbbdd84ee239759545ff98b74dfa4ee39123702edd41c8c226c4b1aaead7813f4fcf8897cfebc8469aa2c72d1e9d56a48555b33cf49aa68e062a21e78c6a
 DIST knewstuff-5.84.0.tar.xz 1190892 BLAKE2B 370cafbaedb1478ea8d4b476aa4c8b35383380c5b8fbd2c541895939cf25abb6cb0781787aed96def29b9dca6b71942cf77ee6cdb1bc6fb18849f4c62eec27d1 SHA512 a7c308fc0c6652ef5f66ace0afa3e4145639f5345f677ae3c927b4993edaf188092d641952f7051e44de33a2b68d587f2c7626d2802798bc8cfd191b5728c1b2
 EBUILD knewstuff-5.82.0.ebuild 1094 BLAKE2B 02f94784c66eef324537836dd38ad2009333ad5bb02ae1dba414e5c83f69c8daa18ae6a1791b045181b984303a216a48bb4eeee13729ce57c8cddb3b79ce5ce7 SHA512 fad266c06544f42f99f0d1c188de141e98a497b3e8788827655c8d52db68e847814d46d024f66e2ec5502c51ea4c560444e5e3f7327bb19eedbdf9ad44e4903d
-EBUILD knewstuff-5.83.0-r1.ebuild 1265 BLAKE2B cebd5cd86fc70e6f6d52514343a6c123932bbbc28edb077fbb1aebd4a57f77cd61fb6071f9d15c8f6af1ec70fd024cb756a58c0c738e33b6c2d7667258a85c8b SHA512 4d4b5f09d43534e0eb3a543ac17ec9dd810dc0b8ef26788f6bdac594b626e1ad906bd90c1cab430d378b64f1a4ddcd0ca86e2603b4e885f3cd6dc9edfe04d09c
 EBUILD knewstuff-5.84.0.ebuild 1265 BLAKE2B cebd5cd86fc70e6f6d52514343a6c123932bbbc28edb077fbb1aebd4a57f77cd61fb6071f9d15c8f6af1ec70fd024cb756a58c0c738e33b6c2d7667258a85c8b SHA512 4d4b5f09d43534e0eb3a543ac17ec9dd810dc0b8ef26788f6bdac594b626e1ad906bd90c1cab430d378b64f1a4ddcd0ca86e2603b4e885f3cd6dc9edfe04d09c
 MISC metadata.xml 393 BLAKE2B d620904dfdc53eb082b16f9006ba24a6f60896e7c016de27ed236a6fadad1d5f6a6df30af0fd6b0b2c82aacb136153eaa1c6ea33d012642ded4752c0f45a773b SHA512 33bea5d338e4c9f955a4b5cbc269fcdb38c4a7e43431b0f94fa776e3e506f25747d0c2e208a27324a7d1e32bbcfcd6fa9ba1fa29806a4d8095a10f3971095231
diff --git a/kde-frameworks/knewstuff/knewstuff-5.83.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.83.0-r1.ebuild
deleted file mode 100644
index 569b0c3b1604..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.83.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="opds"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/attica-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package opds KF5Syndication)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 02bba48446b5..28f4b7d27caa 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,7 +1,5 @@
 DIST knotifications-5.82.0.tar.xz 123864 BLAKE2B b798fcd8c7f493b518a2a5d405c18ae028fa187e4a744de087bc3087e2491007e93c1e814b2e0491e0d0996aa06e3fcb239b1646baa77d3a5003afe9ba33594d SHA512 5b90e641adbadfd31ee44344361d964cb35deb93cccd2de1199c633986c08ce7e8321cfb73a50d99a954c2652a9a78c9c07d0026fcea115bc5dbe4e5898aaa12
-DIST knotifications-5.83.0.tar.xz 123792 BLAKE2B 756ef9a8bee00d63e6c4073c682cd66a30146a39d004131acb812ed93f9005b0003f1feb1f17310ebf276db780f8b6889ad548d1522e6216ce67ef108a158334 SHA512 1754af5091335d8e4e860a293aa2b6fad514b24c453dee61a87e1c0427295b7874d8e98abe8cd6666a75b12d0b634132c37d4c94010f24db7f152203a32f9b30
 DIST knotifications-5.84.0.tar.xz 124308 BLAKE2B 2395a57879843b1b16dddd0bd22a8a8822a0cac513e65841475988aacb50a25ea9916a78cfb41f754faebececd57a958c11e9af234ce7aff2f7d14ed4f6e7858 SHA512 7b880c9e093725590d5ee7e8697196df575a14ebbf6d2a3b915ffbc5ac53b61969a302519e22e494b60e35a405a07640f814f8583bd845ff54c2c6c5f0474bde
 EBUILD knotifications-5.82.0.ebuild 1144 BLAKE2B b2277def6cdb291e1a6e5cfd7bb4ee7c18ac342630e843a24c6ccd4c86eac2c28816ddef3b95c93915284ac607073d2cb8427abdc33f85f4c3683888499eb70e SHA512 267fde926dee2d9c567b9ed9fb26190956e464bc2f666833926afeff89ffc4faba9cd13157d8696b4d3cf16ed595317604d42d40e923a212aedf1977ff6c0d53
-EBUILD knotifications-5.83.0.ebuild 1147 BLAKE2B 40a8aceb0128687d864d538bceb5040eec3c67ee895f5c655aed681456ae19b0df61a5fd9eca6dbfa6c5ba9ecf1af8e98e2a8dca8daa2335a566015f0b44de18 SHA512 df15ccec223d60fd79c70fb78e10c557f5842ccfa79ffb058b70c6898adb45d0bbe1859eab2e01c36848f3496e63d1aa4a86c95586640272fe423d912adb1679
 EBUILD knotifications-5.84.0.ebuild 1147 BLAKE2B 40a8aceb0128687d864d538bceb5040eec3c67ee895f5c655aed681456ae19b0df61a5fd9eca6dbfa6c5ba9ecf1af8e98e2a8dca8daa2335a566015f0b44de18 SHA512 df15ccec223d60fd79c70fb78e10c557f5842ccfa79ffb058b70c6898adb45d0bbe1859eab2e01c36848f3496e63d1aa4a86c95586640272fe423d912adb1679
 MISC metadata.xml 468 BLAKE2B 372e11b35b4abe5a1505ff086f4368f28d3aa137d38d33334404872068c2ea401e225b7c482be11a314d03e4e7b2aa440ec095d4d6ffd9a9a2ec1beb75af2c7e SHA512 70130ce812a1e3d370ac5858fb946372e93cc63a65f4ae3c34639521250949fcf6b79ce51aeee02a701edcaff36d66ad284b0880c3c15a7f33d2c4e44e6a87af
diff --git a/kde-frameworks/knotifications/knotifications-5.83.0.ebuild b/kde-frameworks/knotifications/knotifications-5.83.0.ebuild
deleted file mode 100644
index 09e8bd9e45f8..000000000000
--- a/kde-frameworks/knotifications/knotifications-5.83.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for notifying the user of an event"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="dbus nls phonon speech X"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
-	!phonon? ( media-libs/libcanberra )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package dbus dbusmenu-qt5)
-		$(cmake_use_find_package !phonon Canberra)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 6cd252ea3e08..7f58979f3943 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,7 +1,5 @@
 DIST knotifyconfig-5.82.0.tar.xz 84692 BLAKE2B 44d8cc0bb1caa2115fc54af5f8a042d29baebf4ca595576a81e01e24a2141b6077ca938a6d00252701d813f10b2aaa4ccbd9e4600ed9448e8a18a628cce84966 SHA512 d214d8019179c079a22f4076bb985f1528292c467cce36a18e2457a4051264f915f48a35ea2b508b900fded020bf20c8d3e784149e9be7993a80a027a70871e3
-DIST knotifyconfig-5.83.0.tar.xz 84520 BLAKE2B f8aecd908e15b3be381658455bda3ecbc790ef2f250cb8a9adc8557b284e00e671b582cacc32fffaefb5fbd88c32a1ec139d7591d955e9b670245cdb0516bf31 SHA512 b431ea0d9a5cf7a390cc4cc41ce413b4b8411ee77bf2789443e3113f977a7a9648af602f181a6df4d88690a2d178ac9e1085e858d1a7c95cf9e6bd4ed8aa439f
 DIST knotifyconfig-5.84.0.tar.xz 84868 BLAKE2B 441797322b59c30c0cd7aef0d8667e87b4318f2945eacef7c1dda67ed59e6cac6d208cf3ad54f2b38b81a05b6ae8cc57c2070bd3e479b0e6f7604d538fcb7c90 SHA512 cbf2d09c2e58551cfb2752d90a5280fddc821dbf49a0543e64a39f6af54d17de50a9e061d5e238ff206b525fc01ab58872ed962b248efd13eba37f9f51d13a3d
 EBUILD knotifyconfig-5.82.0.ebuild 768 BLAKE2B ee48866fcd791abee06fff79971f03aa3fbea7037b4089acf9e1bf14a2bb5954200810542665185d44ac0be686808b26ff58943cbb7dee2d3e09ceee331c567a SHA512 ffa99af357dbac4b5966320ed633b52c4ba4e5ae20ac54908f8874022a165118b2e1986a8beca775715ca4b7e3fd640d72e5bf43aabbc8c50495591f4aa553f5
-EBUILD knotifyconfig-5.83.0.ebuild 771 BLAKE2B bcbc14f8c4875da84eab6bec75bf86f886ce58274c89989c310f90bb3c249de72d7d1ac3616a5dd8f0e5309d76557e8fb8bdb0a495468622adc8c72e2cebf657 SHA512 47086a427c5c6968b07e0cb22b4a17c27860fd8228385041c9ec348b8beb3a497acdf30a311bfd8a90899d32ce07bfd28045dbf831385425a791aca4c5f4272f
 EBUILD knotifyconfig-5.84.0.ebuild 771 BLAKE2B bcbc14f8c4875da84eab6bec75bf86f886ce58274c89989c310f90bb3c249de72d7d1ac3616a5dd8f0e5309d76557e8fb8bdb0a495468622adc8c72e2cebf657 SHA512 47086a427c5c6968b07e0cb22b4a17c27860fd8228385041c9ec348b8beb3a497acdf30a311bfd8a90899d32ce07bfd28045dbf831385425a791aca4c5f4272f
 MISC metadata.xml 344 BLAKE2B c11bdb097349febc683046711b82d656d79473ecef4d5d539c71b458f4dc5e9b7f0ced04d5fd59fcdf14377a22591130c85f47a0041d2bf4096675c9c6b802fe SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.83.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.83.0.ebuild
deleted file mode 100644
index 80cca1ceeaad..000000000000
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.83.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for configuring desktop notifications"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="phonon"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	!phonon? ( media-libs/libcanberra )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !phonon Canberra)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 8d85de06207c..d971127064d5 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,7 +1,5 @@
 DIST kpackage-5.82.0.tar.xz 137892 BLAKE2B 292ffdaa8271f63b178304e85ce53f8dd35ff2f46bd5c2b9828a6610c2939918d51d02d29cd2dd799c7fd77c02c3ac23ce7015c2d41b63cc3ed23833958643c8 SHA512 9d8a168b48903d4b5c68ffa0709fd0cfea1e08376c1c0b1ef820ad13f6399a1792be724eeef18a27402f18c62494c864fe4dac17e9932a1ee3a5bb4de50f5fed
-DIST kpackage-5.83.0.tar.xz 137888 BLAKE2B 5dc44aa7eb2ec92586433e6eb0b3e8348175f378deba8395c35eb4ca8721ffc66b6961f1635b44fd2ec80542c5f2ac0c54b50567aba42c24a0b080ba5ad55272 SHA512 d18a6c54886c9865bfb93618078f8f29cd463353f9dcf63eea8b8768cfe608798336423528bbad194bc3398bc405903c14b8d7aa14bdd72c85e56d08433fe9ac
 DIST kpackage-5.84.0.tar.xz 137752 BLAKE2B ed79a20899ad26d569a3016456b4b9425f9d4cce23895af06225b940ec51acb319b5fd5b77f2f4140bd810b9f3ddb5c46ab7c0de4535c44491aea04cdfaaf295 SHA512 f3869e236d28e3a3950b36097a087ebf23feed95f0d289fc31cbb86ec50bcabbf1df41ccef5bdb15ab1bd8faeeffc87afe30a2e0d97af366bcde1e2042d10250
 EBUILD kpackage-5.82.0.ebuild 755 BLAKE2B 931b2b74ce3752e68a1fc2078ce08b873b8fe53edbe1a8617b4f97d26932978f73f0767fc4d36b6d058437437a0a7fd5e4037860cf20307a3bce94ef967b461f SHA512 a91d2a68180e48aeafebab3c9cbd108130390efade8aad7dd6872ccf0d6a474e3cdd29f55507f3a17227bafe5aa0a2183bb7e70051bc0cf3074ffa2333adb8db
-EBUILD kpackage-5.83.0.ebuild 758 BLAKE2B 7b28c138ee6d612233938964ed627e77d4ae6ee2f3a9790a2dbb40701aba1ee4b874372208df04aa059ae8a797c4d4e1694a883f9300715f7a6d268fe6e0d6a6 SHA512 695b1a661f90ebe316bdc01b1daf80bd869aa3d064f8f4a1f5838f55f6c94e21fb79d8f69fd6608bd0fdd01e373867171978601c93c81aa37896c44f9b22d8b8
 EBUILD kpackage-5.84.0.ebuild 758 BLAKE2B 7b28c138ee6d612233938964ed627e77d4ae6ee2f3a9790a2dbb40701aba1ee4b874372208df04aa059ae8a797c4d4e1694a883f9300715f7a6d268fe6e0d6a6 SHA512 695b1a661f90ebe316bdc01b1daf80bd869aa3d064f8f4a1f5838f55f6c94e21fb79d8f69fd6608bd0fdd01e373867171978601c93c81aa37896c44f9b22d8b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpackage/kpackage-5.83.0.ebuild b/kde-frameworks/kpackage/kpackage-5.83.0.ebuild
deleted file mode 100644
index aad1329598d7..000000000000
--- a/kde-frameworks/kpackage/kpackage-5.83.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework to install and load packages of non binary content"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	#bug 650214
-	local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
-	ecm_src_test
-}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 40202c3c872f..c19e04819f4f 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,7 +1,5 @@
 DIST kparts-5.82.0.tar.xz 192240 BLAKE2B d46b407479c4e3a11a91bf990da14e914008ee6cd51d9fc3f67a89a33811af6201226a1f8971129cf0d3fa5189a8bf45810c2e24bdb6cca3c261465afc0380b7 SHA512 865cb26623b8e3dbf2fff7bff7e7dd0334d5cac487635a4aa88a69fbbb1a4eda2fa67208f6cd4bd3496188af4fe256558b737604202fe30a749a06671c078eba
-DIST kparts-5.83.0.tar.xz 192332 BLAKE2B 3acf51d0d23bf17372f2c7424fede5986dfda905cdcb74858db455e7d603afe09a32500d80f7644d58f80622d18e139ebed8a69c6e2de4e7ca973630b0ea77ee SHA512 e8721393f8356a45ccb8c7b9d4157a3fda748dbf46921c8b2cbda4ce8a077ff18c434d10f5620c58725e058a7e45ee8cd59099747e7bd901e7dbabc41219c2d1
 DIST kparts-5.84.0.tar.xz 192408 BLAKE2B 6c7890a6395d0795e9dd3cc6acd5cc0a3afa14239e17a10c9f6f8b099b7bc91d24de337935fb0b96db7d2f65e1e326442511501e56f3f6125257b9c1c91b0dca SHA512 b56291d88872e237cdc52cc5e9f084619b93f6e62360be4f9c70797554aad7ac264c21fb4dde42de61244d38e733cfe26297837b9f51597cf54d165cb9603393
 EBUILD kparts-5.82.0.ebuild 837 BLAKE2B 2832ac7b369554597f57ae134ead71cbf461b1f372fa08409edac05bfd459ed1436ef60e4bb5a01a3eac063b34ffbdefcb747046b7532aebbf3c0cea17fa4bdb SHA512 299a813285bab1e3a415dfdad4ec7495f05cddea78e0619cc68ecfcee58af545a9cc202fb252de59427aba87e7f62f2abb6828ac12c36e036fe391c520ed3bdd
-EBUILD kparts-5.83.0.ebuild 840 BLAKE2B d68b1a2458d4cde6693bfa232efc0eeaa29d58e6bd9e21164b203364429c07bfa61d04c0fe81b3ca6ec67229875d6968ab1a24e8ce906af577492bb51ab18597 SHA512 74350910d8e1ddde7d58102f11371bf06e497c3d7d4261ec5d32fec78b7d640dcaccc9bbf80accbb69617767d8e8a237503aafd80b8560c947abb135808989c4
 EBUILD kparts-5.84.0.ebuild 840 BLAKE2B d68b1a2458d4cde6693bfa232efc0eeaa29d58e6bd9e21164b203364429c07bfa61d04c0fe81b3ca6ec67229875d6968ab1a24e8ce906af577492bb51ab18597 SHA512 74350910d8e1ddde7d58102f11371bf06e497c3d7d4261ec5d32fec78b7d640dcaccc9bbf80accbb69617767d8e8a237503aafd80b8560c947abb135808989c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kparts/kparts-5.83.0.ebuild b/kde-frameworks/kparts/kparts-5.83.0.ebuild
deleted file mode 100644
index e8709a311e1d..000000000000
--- a/kde-frameworks/kparts/kparts-5.83.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing elaborate user-interface components"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktextwidgets-${PVCUT}:5
-"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 597b73171280..9a6602369225 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,7 +1,5 @@
 DIST kpeople-5.82.0.tar.xz 61728 BLAKE2B 5e5abc67b4d918696ce274327b23674d018958cf9eea0e2489918c052891aacc9265172bfb18a88ebb34f6a0b653f6659ba4bf4c27548e1ccf6b99d9c63c2b49 SHA512 3437ae1685427f5b9ca98f75fa2822b68d1ce5cc902810530844e5cdc01fcf3a027d495a5457f31d8b3838622c425fd835df1b4293fdf53ebc0fc34f869bc44a
-DIST kpeople-5.83.0.tar.xz 61716 BLAKE2B 5946ed80f90b09aad745d3ffb7efdd7f4248a15be50c9ed2aa8afc009f54b5cf5565f0fbf08333edee32ffce2c64539b8bbbeb2f41e3a44d4c2698fb3fa7110a SHA512 49c9a5b6e338ffd39ea679b367151ee21f7611468dba5cf6e3ce694d5708b6f75e2b0fb789146ea30860f2ea8bfdc7a11f144a754e05e85245165daa64582d2a
 DIST kpeople-5.84.0.tar.xz 56704 BLAKE2B fa260e1d88e9e3fd6305411f7588c0c5719110c5b03ac61d2e4a4fdc7151504486043558db5f8e190bbe76fe9715c303d173bc7218052afc2395e1938db2467d SHA512 e21a2c2082afdf7436982d25c26316aa93060ff3e127d6c1bc27097b18e402658e8e548dac0c7100b077de86b8f99ff52fd5c788dea509da7c028060652736c4
 EBUILD kpeople-5.82.0.ebuild 870 BLAKE2B af799ebafddacce944132fa911ca1507f05b5da997646e7952adab6330bedaaa2282418d507fabfb5a90c25c4aa061088dc88f8fc669645855037b17de595f75 SHA512 b0520afaff6d39302e7ae7b115599532f4b669b83dcfc87e1663d4e2460f42672aa2304682335cd2146699dd6e583254a430902d628198ac5114d63320b32d07
-EBUILD kpeople-5.83.0.ebuild 873 BLAKE2B 1b5837fefb6670a84d2ff0a0db95cdbf2bdcb7cdd03509f073c0db8a2866c1959e0b92ca2fd9c9554cf5875d76aa1cf84c6e118bee94e926b4564adde50f463e SHA512 f947ade8281c73862a937d9a7cf1545cb2646d742fca46a3435e4afb2db481fcbc28e738139da6e3a0992930f2117bb8b44b49ea6b6586cfe2a89b32a031f324
 EBUILD kpeople-5.84.0.ebuild 873 BLAKE2B 1b5837fefb6670a84d2ff0a0db95cdbf2bdcb7cdd03509f073c0db8a2866c1959e0b92ca2fd9c9554cf5875d76aa1cf84c6e118bee94e926b4564adde50f463e SHA512 f947ade8281c73862a937d9a7cf1545cb2646d742fca46a3435e4afb2db481fcbc28e738139da6e3a0992930f2117bb8b44b49ea6b6586cfe2a89b32a031f324
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpeople/kpeople-5.83.0.ebuild b/kde-frameworks/kpeople/kpeople-5.83.0.ebuild
deleted file mode 100644
index e90e2cd8501a..000000000000
--- a/kde-frameworks/kpeople/kpeople-5.83.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE contact person abstraction library"
-HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# personsmodeltest segfaults, bug 668192
-	local myctestargs=(
-		-j1
-		-E "(persondatatest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 89109b42f277..bb09e6d3bce6 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,7 +1,5 @@
 DIST kplotting-5.82.0.tar.xz 31220 BLAKE2B c7eb39d8a8846c6c230a98cba83613d4468b9a62fe1014fa240fb56021d6cef0122d1bf7df5cfd727f5693f495d0942d04ca0e43bc609283a9da1ca94cb63d55 SHA512 8e33b37e61708e637d4064187ab4acf7f8dda846eaf970efc78138590c600c0a7fa320110138e396dc91c6134ce4a1675aa6d4b199a2a385596fb1185d428a75
-DIST kplotting-5.83.0.tar.xz 31188 BLAKE2B 1d0fce48f19b04a6c6f56caa419ec467360795b1f0d0786288b032530a77aac39d4d2e73cbb88c3767012ff4898aaf8ce41de6e450b5a65925520ee7eafa183e SHA512 f317316f9bb7dc68250a83d003a66e811e1f667228b2dc753f7ea501266ff43fe69dbb59d20de9d40c8fb7753a809eeabbe2c040bd565c8127ea57744f8ed0a0
 DIST kplotting-5.84.0.tar.xz 31192 BLAKE2B b8fcbb253353d5a525279a8a1bae7b8cfcd060068e9380e7404a5e139adbe6098f7d7cee297e536cd6e55766856045616ed0e3e7329a5d9c2f94d93a027af8e8 SHA512 b8f3c93375415d5b689c6871242fd323ac8854b2866c459252c5d623369ebf0c6017bfd64921f6a0c99c81c032dcfd426bf01fa7dcc2d79e6031efa1517e3c58
 EBUILD kplotting-5.82.0.ebuild 437 BLAKE2B a97e60e6e0362bd7e6b818f17cc6c760f646766e251008e241022503cf3648ca50a073a9c57e8bba3cb2ab34c8ced13590d05dbf08df45f80dd66b96b764c9d8 SHA512 58cbaa40154b01d58d88314c62eb170020c5c55163e81b330a04a2e926e4d37bc804887eef89f46ab8c73e09567e6d3b4de5a013ef6a35930790d3f79cdb02ad
-EBUILD kplotting-5.83.0.ebuild 440 BLAKE2B fc28799f842c5c68d4cadeeb01d3a4f0ff1175915f91ec2eccd7c796bac539e7becb9823b2779ff58d31a16a3d0db8eda03f6470661b29deb9284c655fc28a57 SHA512 74afec5b09559fff8dbe02f09b90c132876970b549a3aeccf336e1242f8f400f35b822b6548830a0d3567495b6c3052f045e898bc2356975ab54c901d6504170
 EBUILD kplotting-5.84.0.ebuild 440 BLAKE2B fc28799f842c5c68d4cadeeb01d3a4f0ff1175915f91ec2eccd7c796bac539e7becb9823b2779ff58d31a16a3d0db8eda03f6470661b29deb9284c655fc28a57 SHA512 74afec5b09559fff8dbe02f09b90c132876970b549a3aeccf336e1242f8f400f35b822b6548830a0d3567495b6c3052f045e898bc2356975ab54c901d6504170
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kplotting/kplotting-5.83.0.ebuild b/kde-frameworks/kplotting/kplotting-5.83.0.ebuild
deleted file mode 100644
index 71388c7ee73d..000000000000
--- a/kde-frameworks/kplotting/kplotting-5.83.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing easy data-plotting functions"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 7919a1a5af6c..cb6cf2a1b03a 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,7 +1,5 @@
 DIST kpty-5.82.0.tar.xz 56348 BLAKE2B 954dbb443c9f7eb43abb9aa414c77867dbb831b767eb2c8d985cdd4eb0dc003ab3338282bca5ce547e2b84e5a714cb27aa8771653b27111cc303bada78bebcc8 SHA512 9515443671c2030646dfa628555b3e131ad8ff018aa73fe7e0168e352968cbab6111f8e00a47cb7c26ca3807da2e502de19505d44da84750ca46a834bb7a3193
-DIST kpty-5.83.0.tar.xz 56308 BLAKE2B 8abdbc81171a861f7af9e25cc3b561b376acf0537fa31fa8392fd187bb642df44eb731decfb3ee60ee494d43392be590afc11eeb1f2e269cebc0911f12b232a6 SHA512 59529577f8d6ef858ca7e89d3176b534b622eae76dc3a19d84188a8a204ce6621c0626fbad7ad39d2845479a13ae507502a16d68bf12ad3f3351ba0a15b1e4c7
 DIST kpty-5.84.0.tar.xz 56284 BLAKE2B 20a14a95aa0b835a02d3c79cde72a0ccafed33e94c52babf985a22e561419d131641c0aa08fa99c6a5ccabd7961d4c6038dad752553b88cb290dc9fa35259bc3 SHA512 8252e3a25e9d8015563ccdc394d31e89949827fa332c2fbf95af5f86b349f1536c20835cb5859ac5e5f92d533276f7411ecf42d2b742ce92dc36e6fa2b0b726d
 EBUILD kpty-5.82.0.ebuild 550 BLAKE2B dcd8ed024d7f784859f592a6ae8d7c38246867cbd6b61e6c040e3b4bf534ad1257bae719c8a3e0b89a315b32063db38a08105c57ef9c39c87fa243416109e2ce SHA512 324d33ddfe86d1ab187fae50e22d2ac7cc7db31f7eb17b106f4b19d0e387f04ddfbfa4ff0fb0822ebfdfe4aa8284da966ceacdff3a1dc7e573e1deda5a6ac6ca
-EBUILD kpty-5.83.0.ebuild 553 BLAKE2B 4754f87aaf2ea51cd1188fe2485bac9876d6a443d634810e253493ee79bf2a7d16542d299699d9f4c9340cfcabfbb3654b818666a57ac1c389148f1683a165b5 SHA512 53bb54924e672e8f1ce763cf3fc9090296c48c7b70fc3e4b57b530d3b67beca4d0c5c32ced920df86b7aea0c0dac1ec9fca3d9303b8f7d591c45b871a99948f2
 EBUILD kpty-5.84.0.ebuild 553 BLAKE2B 4754f87aaf2ea51cd1188fe2485bac9876d6a443d634810e253493ee79bf2a7d16542d299699d9f4c9340cfcabfbb3654b818666a57ac1c389148f1683a165b5 SHA512 53bb54924e672e8f1ce763cf3fc9090296c48c7b70fc3e4b57b530d3b67beca4d0c5c32ced920df86b7aea0c0dac1ec9fca3d9303b8f7d591c45b871a99948f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpty/kpty-5.83.0.ebuild b/kde-frameworks/kpty/kpty-5.83.0.ebuild
deleted file mode 100644
index 57656f492184..000000000000
--- a/kde-frameworks/kpty/kpty-5.83.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
-
-DESCRIPTION="Framework for pseudo terminal devices and running child processes"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	sys-libs/libutempter
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index 548e2ff8c7c1..600830a8388f 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,7 +1,5 @@
 DIST kquickcharts-5.82.0.tar.xz 105832 BLAKE2B 00bd1f5ff89e11758607a9b6c2705d4c670107b18eb5ac67522b1f5a6ba5f4b5897b86582ad6ea5f2a1e9245efdf52614a6ee418ff0c2ff8a0499de5211bfe49 SHA512 978e9644d62a3bc7c9e5fddbc7ce67551941a2429804d93a5745584c28555a748f7804287162e31217082bb9e9391d2d86bb50eda209f93da15cb4b5c93ed583
-DIST kquickcharts-5.83.0.tar.xz 105896 BLAKE2B 9a00e87e93010dc3fe227ff0765f3ddd157594dc0d66b03d6dbd4ab52b034eebe009e534594619aadd0ba81d6767053e3b59a4dce632a480d64f54862c68af54 SHA512 d7f46a452936f89c5d50d3891ef5b4410a0c8e1fdea9ab9cd39398ddffb77c4a4b3eccec584153697010a0260f0f245c9af6c5eb6a188df8684c4d220092326f
 DIST kquickcharts-5.84.0.tar.xz 105904 BLAKE2B c152ce8a6006dd7b10af7480a83317ce867a0a851d5aa7bc6a1c4efc5452fa17b76087cb749f5e0413d08c5f2e0432d9753b309abc436d3ee65f70460a1ede66 SHA512 3ab10af399893e41ecf90eec24cd1135e35e850cfa14b621734018fc4bfae71bfa231d13e4296edb10809f6b10b1cd67cbaa0c3e9476e2e3ebd8a023bb85006f
 EBUILD kquickcharts-5.82.0.ebuild 798 BLAKE2B adbcc2d8f29109e0735d678252909944ab4d7fa8a978a9ccfaf490272f1b79171d2ccdbb28eaf8ae647e52de336248efd96e8d4ef312edc3f2cdabca953ce5eb SHA512 875acb51f6aefe6ea3abe0ff1a9b5a4895d80ad84bcb13084823ee4a1af2e0297f4ac2536567780bb543d809e5b7d6e2d157ceec148b13744d8154a09ae1dfe7
-EBUILD kquickcharts-5.83.0.ebuild 801 BLAKE2B 9bd352bad29b06afb8a4e130ab1269cb5272ab00ca1d4f28424000532323ad275ac47e7c4aa82e8203d05f4b690d3b75c72126f2691fb3ccf4a7642e4feae4c8 SHA512 c65d5f54705e51e5a9a692c0ed6dc32fa7cb14b314c55c807068a3761afeddfdc38b48851c35f8bcafa3c0722a0b4c39a6a7d0d9e36ea81569dcfb2449c7b076
 EBUILD kquickcharts-5.84.0.ebuild 801 BLAKE2B 9bd352bad29b06afb8a4e130ab1269cb5272ab00ca1d4f28424000532323ad275ac47e7c4aa82e8203d05f4b690d3b75c72126f2691fb3ccf4a7642e4feae4c8 SHA512 c65d5f54705e51e5a9a692c0ed6dc32fa7cb14b314c55c807068a3761afeddfdc38b48851c35f8bcafa3c0722a0b4c39a6a7d0d9e36ea81569dcfb2449c7b076
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.83.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.83.0.ebuild
deleted file mode 100644
index 6d75dca5d2aa..000000000000
--- a/kde-frameworks/kquickcharts/kquickcharts-5.83.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="QtQuick plugin providing high-performance charts"
-HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	examples? (
-		>=dev-qt/qtwidgets-${QTMIN}:5
-		=kde-frameworks/kdeclarative-${PVCUT}*:5
-		=kde-frameworks/kirigami-${PVCUT}*:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 6377bb5c4053..4819f7fac39a 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,7 +1,5 @@
 DIST kross-5.82.0.tar.xz 128940 BLAKE2B 38006266d918ea9800c91e3a5149d97850d3b7d2b3b31f272c88400b8973442db3a84f0637fda13dd4086df9b7abaf5e3443c6dcc1da31d23e5ecbec7ec55e41 SHA512 ac3b30bc49e4be321c2171dc8229df7df2f7980d4eb47af11141bf51ced4602c1ab81a8150612f02d09c33226bb98cc278451b5c1d4c10f465035f1fceb12ebe
-DIST kross-5.83.0.tar.xz 128872 BLAKE2B a6d34643dabf307274206a97247ea8e09196b761ab59e2f508dd1b8e970bb37224e2035016106c958efc5128362a32aa8ea0afbb3df47e23f2e87e2b342bbfe5 SHA512 992634ee284f16a5a8cc7380c7246e05970f147b22146a98ae7a20be534670faf798abf765671cd121a18f008eea89480c51ea0854a70144619ba41651c9fd8f
 DIST kross-5.84.0.tar.xz 128988 BLAKE2B e356a2cd22033180b9889766d7127ded9a7670bb8bea5b27f212f8dc3a3db6905a8397830d13495e5271c088596d48fb9195257d7f42e2547be11e446d484c32 SHA512 a957c01f7e9878c2d5df1630759e332666cf6d8197113609cd403aedfea62857cbb9aa8017a9dbf8a0bd395dc38ccb065e6182546fff853bda0a3a1a9775af6e
 EBUILD kross-5.82.0.ebuild 859 BLAKE2B 5d864e7393539dbc4cb95d5e5541ef1e9f951e0805f0adedb92f8b09f563190e7739ed84b3edd4b54f6471938a0ce1559cf09cbda7146c755e48c845c62bb384 SHA512 7524fb90c6b1bf7c04bc57a895ad6e808e8dda7787dad8914ae526d8442ebf45b5cb5d9d856c868d93e1b719e0141d860f8cd5fa99863f7b2dac8f842698bc2c
-EBUILD kross-5.83.0.ebuild 862 BLAKE2B 3520fbb25fea611af96ec1ff481be967cd42b336f3e9c7778535d250a00c514e254579badb9ac9cba88e6be647f5a955914a1712546fcd8aff57890111dd17ab SHA512 9a4ec2e03cff5bcbe9124a63012bbaaa5e044de36501942130419401407aaee1a43da761ac53dabefdb3f2479e19ea1a7265d93bcc08bbf30278a9fb3e51dcf2
 EBUILD kross-5.84.0.ebuild 862 BLAKE2B 3520fbb25fea611af96ec1ff481be967cd42b336f3e9c7778535d250a00c514e254579badb9ac9cba88e6be647f5a955914a1712546fcd8aff57890111dd17ab SHA512 9a4ec2e03cff5bcbe9124a63012bbaaa5e044de36501942130419401407aaee1a43da761ac53dabefdb3f2479e19ea1a7265d93bcc08bbf30278a9fb3e51dcf2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kross/kross-5.83.0.ebuild b/kde-frameworks/kross/kross-5.83.0.ebuild
deleted file mode 100644
index 91bc4177afa8..000000000000
--- a/kde-frameworks/kross/kross-5.83.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for embedding scripting into applications"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index c337b386cf1c..5a640084b02a 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,7 +1,5 @@
 DIST krunner-5.82.0.tar.xz 76916 BLAKE2B f846383458b46bf655a2a2b08fea099eff910aceac90306bea1f3af1b1370d2d59169ee4ff0e68c6ab0186c35b336b4a807f56cd8374f89b16c5319ddba459f9 SHA512 a4430196d32d850f9498027df251a65dcf3fcb161a7005926a9ec3de429bd03487e72fda342a6a588c4e5972ee55baf21e53433d68408ccab1b0b99b5c2980da
-DIST krunner-5.83.0.tar.xz 76772 BLAKE2B 29ece5c909b60d12c43e41fe953e000af5a62909fd68fdb4aa1042f9d1661f5004ddbcf9cc0c9959ee2480188207e656bd89bb1654924f49a55943eeaabdaab7 SHA512 118bd5484016f25e45c7cd491bd0b1dca78baa2784dc19ef1d8636a071cbb0780a149d627e8dfd8bd8d32e2ac85e529fa151979c2c47b864ef6956101a1d7021
 DIST krunner-5.84.0.tar.xz 76836 BLAKE2B cb5d6d3d0454b346862c0ee9bb2fa5e2b6d844fa17704a06fa80fd35027bc95652c790714a7ae181d0d6f3e17c1c5e850f864e2b07d4b9ca0283f8f4452f1f99 SHA512 a8113c35c6943bc48f8720396560bb35a17afabc18587506e552ec3ce189e5e620c5f1576dbad96f993ea9b1b1456c8e4e3d0461de2e67f80f22097eb1c72da3
 EBUILD krunner-5.82.0.ebuild 1147 BLAKE2B 5449bc1fe1bd46e405fea98ad3b3a57519fa9972e543bd71dc9019699b14d66262103f05ba9ee3f44f30437fb10bc82f8bd9bd07e3454af52c723a3947f5c2c9 SHA512 41466ea5bd1758d83f28bab1cede8318aa32310799b710ce1882f48ad37e00715a6eb8d0b1eb20ee6b04359f9c9e44de986e684440946aa66c58524a587a3f5a
-EBUILD krunner-5.83.0.ebuild 1150 BLAKE2B c5bcaa025c32f205054cb6d14da87c595ec1a26b0b381433102f65d6db9bffb5e1876727ee30b76ab2b15f00ffe55256ce1d7ba410c0287756df220d975aa0f0 SHA512 041d437a988026ea9219c8937f3b3ffb10ced7f224246fc25fc0cf0a721e90c11d12fbd97b0e24743a9d1cb24b5d3a235a8f32e699f8edaf6c29750a8d9eb8cb
 EBUILD krunner-5.84.0.ebuild 1150 BLAKE2B c5bcaa025c32f205054cb6d14da87c595ec1a26b0b381433102f65d6db9bffb5e1876727ee30b76ab2b15f00ffe55256ce1d7ba410c0287756df220d975aa0f0 SHA512 041d437a988026ea9219c8937f3b3ffb10ced7f224246fc25fc0cf0a721e90c11d12fbd97b0e24743a9d1cb24b5d3a235a8f32e699f8edaf6c29750a8d9eb8cb
 MISC metadata.xml 345 BLAKE2B 98483681a50512c1e37b502d7114c6f44e40d3c66ff33d858e4dd111cc0f6f4eef30fd51faae0b6fde2b3392ddab79a11d2eb20b904d0d309cb598c7bf6c874e SHA512 6fc972e21befa52a3fa494c63fd423def69d798b7d422bcfcbc142a1fb3f96b2e425700ada34f29cf78b69c81ebf27d51d180dad67c33aaf4942cd647d34008c
diff --git a/kde-frameworks/krunner/krunner-5.83.0.ebuild b/kde-frameworks/krunner/krunner-5.83.0.ebuild
deleted file mode 100644
index 9b94a1daf9ae..000000000000
--- a/kde-frameworks/krunner/krunner-5.83.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for providing different actions given a string query"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="activities"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/plasma-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	=kde-frameworks/threadweaver-${PVCUT}*:5
-	activities? ( =kde-frameworks/kactivities-${PVCUT}*:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# requires virtual dbus, otherwise hangs; bugs #630672, #789351
-	local myctestargs=(
-		-E "(dbusrunnertest|runnermanagersinglerunnermodetest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index c979f4d99264..ca174fbefff8 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,7 +1,5 @@
 DIST kservice-5.82.0.tar.xz 261932 BLAKE2B 42b95ecca3c5a4f14578491fb1460dbeab4b866b94ab6b26d53aadd059b9190642e5914a926d2faa559a95a50e03751c5717be813254e839a27b4310adff63fd SHA512 6294beeb19773d7b58a23f01e9c9c281c4b2cf8eade19d0de6537ea295ad595ec79a22cb1d3049cb79bfa5eb43fc1e80037227217a6dae212b9e5234b3c9aa5f
-DIST kservice-5.83.0.tar.xz 262716 BLAKE2B 04dbe1f0eb87fe0e836206ff4daf431ef13033578b6e5e166c31b0bfb0eb6bd2a487a84380eb276f1fa4b2188b1639c467ff20f6780abae2ccabc99e97337f15 SHA512 5f94470915e655fbd6b20b34d8e75382ca6930be7035f020c88fd1c198eb3d81e537048f23568f8a737356f485b16bdd244430f63306190283b0598a813ee544
 DIST kservice-5.84.0.tar.xz 263252 BLAKE2B 642d9c3d5055c872eea39deefa0af8f667597eb23ef0f8b07afea75a6b7b9f805c58c0acc8e0d064a51e3141020c058a098ee060b010ef3221c3b3eb57828ad7 SHA512 f10ca807c9012fe7e4cf33d8c3336f82691b4ecb090df3fc30daa69e99ec2ac45fb5d5197018f44f0c34e428bbc8d582a441048d74a7ecc00a0c057cd690ea00
 EBUILD kservice-5.82.0.ebuild 1044 BLAKE2B 56eb8947b452481f7b78e0a6aefb61ebcff58d9a0acbff0ea28194db5e532af87c4e356c6adf3a174c1036f78dfa92e8b0a54e0fbdcdcc7d22052d7a59173e38 SHA512 b1f6c1cff5a58fbbcd1a9091e0fc3a46df37883795c1d0e48f2b8bc8d6c9bf1669500ed99cddeb84acc1469a2efe3f6d5a8eeff391d472754b04106a6c66a790
-EBUILD kservice-5.83.0.ebuild 1047 BLAKE2B 0e3fce9ba2808178fcdb43dff85ecaf3d49af08ef1f087039398992c4ec5f6fa24d8ab9e7e65201aebfc398f988a8617e7e7aad5b1851871f4843567b7f3503c SHA512 2ba15265d9284b03f2f2e189fd6c144b568dd0eb909921d49c4922a39c952d0502fdd20c84de9c692b6eca912a42821ff862e582fcb15688f179cdaa9c152954
 EBUILD kservice-5.84.0.ebuild 1047 BLAKE2B 0e3fce9ba2808178fcdb43dff85ecaf3d49af08ef1f087039398992c4ec5f6fa24d8ab9e7e65201aebfc398f988a8617e7e7aad5b1851871f4843567b7f3503c SHA512 2ba15265d9284b03f2f2e189fd6c144b568dd0eb909921d49c4922a39c952d0502fdd20c84de9c692b6eca912a42821ff862e582fcb15688f179cdaa9c152954
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kservice/kservice-5.83.0.ebuild b/kde-frameworks/kservice/kservice-5.83.0.ebuild
deleted file mode 100644
index b70e6261a0bd..000000000000
--- a/kde-frameworks/kservice/kservice-5.83.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Advanced plugin and service introspection"
-
-LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+man"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# bug 596316
-	dosym kf5-applications.menu /etc/xdg/menus/applications.menu
-}
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 98f2b179c97f..7156b7940a8e 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,7 +1,5 @@
 DIST ktexteditor-5.82.0.tar.xz 2341712 BLAKE2B cab63977dd8d2e8e9c2b766a9b0563cc98f0b25e2f39f2b598f9b8162ce2e12a3ac41cb74cd6f9cd9509f5987d47d27c9ee3114579ce260837d84bb06b7ae683 SHA512 1459ba61ed4a4b603cd984449a217230914818e32c318a92232957cc83d5e70f2a55bf150ca946252c696e019c24dee5b852ca5046c9914f3fff1c6906487bdf
-DIST ktexteditor-5.83.0.tar.xz 2342536 BLAKE2B c2c494b1aa9a912c282b37cdcac5623076fe9ef70dd324910de3a1f966982b6cf70c37d1a140772bad35d20ae47ee6b7dbea8599ce6f733e0e263d8f98e5fc36 SHA512 e758c72bfcbfa2d082fff98b84cd8909aad035cabcb33ede539f60c858544fe271ae61cb5f2a0ed276fca1fbf50e18d6384a2cb89fa8af9f8c48bd99183c76fb
 DIST ktexteditor-5.84.0.tar.xz 2326520 BLAKE2B d235fa3fb6baacceb8d1fa06821e201c649d2d77bb36f5bd7dd7a2ed51b2285c34bd1cc4416361b4f3c453a50ce7edc1db5fd8677cb9a3f9df5b7ce1b8dc20d8 SHA512 428991b92923d402a963a3bf0a1f86a3fc02cb8b3b5a58285380ddb201e4d9b97798e834872ec27eeeaa21fef8a3f0b180b91e0d970d763fc2e290f98eb79c99
 EBUILD ktexteditor-5.82.0.ebuild 1589 BLAKE2B f0543e75d291de2b1d5eba8391fe5c1cd1a5e51172f76dd7b1605dbc1f42a16caf2d7ef4d7f7e7f89ffcb5eb006740a17447849af1417524c1495266c12be445 SHA512 a91c2874dc968fe7ac310d84294bb122cddc5b71d894fe4f58cab31c8762571c604c3944f6bd7c9e1bedb96d8538df8e8618858350046a51b34d177aed707482
-EBUILD ktexteditor-5.83.0.ebuild 1592 BLAKE2B c2b4551edc0e46384671f89b9bfae953298a13144afeed767d7df9b2150ae7654b7c05164c73dd1b1cefc3376a4c599155ca818322d3a2b07520d45c9fa84c5d SHA512 f65679b98514c6939fd78749d362620a7ec24809ee08d46ab3839cac2b351e6a4d664e4768fa8b4533a995e313b255f57c432c4f662705c3b678fc2e0e8f62d0
 EBUILD ktexteditor-5.84.0.ebuild 1592 BLAKE2B c2b4551edc0e46384671f89b9bfae953298a13144afeed767d7df9b2150ae7654b7c05164c73dd1b1cefc3376a4c599155ca818322d3a2b07520d45c9fa84c5d SHA512 f65679b98514c6939fd78749d362620a7ec24809ee08d46ab3839cac2b351e6a4d664e4768fa8b4533a995e313b255f57c432c4f662705c3b678fc2e0e8f62d0
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.83.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.83.0.ebuild
deleted file mode 100644
index 9212f04f8f4b..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.83.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing a full text editor component"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+editorconfig git"
-
-RESTRICT+=" test"
-
-BDEPEND="
-	test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	=kde-frameworks/syntax-highlighting-${PVCUT}*:5
-	editorconfig? ( app-text/editorconfig-core-c )
-	git? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package editorconfig EditorConfig)
-		$(cmake_use_find_package git LibGit2)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 5c656ab13de5..068b93183d52 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,7 +1,5 @@
 DIST ktextwidgets-5.82.0.tar.xz 326288 BLAKE2B 917b1c91a29462dce779b1ae569731ba1c9f810d01009608f71149e13523ec0f1d94582a03cd9fbdaeb159be8abc002193240bba34ee67614e9572578cfa69b9 SHA512 7156ef721c9d9eadd66aa72a2f0da4538a009e14f0058169a95c1ad1c9c19f4120975e2cefc2fb0e20e435ee46dc59cbeb83231fd29bbc7bb815aa59a929e9bb
-DIST ktextwidgets-5.83.0.tar.xz 326520 BLAKE2B 4ef22f2c5a416747926d16001b8c26c2080bb12426b54eb368497ccd363f9cc8ad2fb2e7f844f966cf17c5849afbfefbdc29b2cb0bbc94bf9f8fa84d878ee5d6 SHA512 434d6d4729343bf128497e1e678d15cdde92467f33856b31be907d76569b2f41dbe23867d12e9efe04d4557bab88f7d10364c1d431196f02bf68d613d2147fa0
 DIST ktextwidgets-5.84.0.tar.xz 326268 BLAKE2B 1ac2baf21d865d3d7bd7011b548bc3c6b38a99ba5975753380a4b174b9de638e13e5a0a4d41b2a433e22c4944a54f6e43a314aea575bb6275cbad0b98db2c39f SHA512 92d9dbede47fae6650da3150b81316c46b441d816b4cd23dec128fad32bac07c0bf2c1533c0b5ae2d2ffef469470a751bd8d943596f43950ebeeb446cf8dd49a
 EBUILD ktextwidgets-5.82.0.ebuild 955 BLAKE2B c48b371d1165a1361601045d53d71fce0f42aa3d8e60cbd504eb462950f525d1fccdf2064bd24fffe3e64304cbd6bb30e215ad7390ce60dcee9cf797bd1ac6d5 SHA512 2f4dfca698597f239aade5ef57232cbffc01ea146e39867813a1c4391ec7beec12407199250ba3257d09d2f7400da7eac5ee2d9cdbb53143fe5be25c0f0599fa
-EBUILD ktextwidgets-5.83.0.ebuild 958 BLAKE2B 7e1e90ce616ad15f6a390b581c16527489013a2815efd926aaffe4e1442d459dcc1d1d9a3b8bebfc4d55149c860ea95d4f67a4916c7ec2b87e9488de7d366729 SHA512 ca4566c88d5ee9fb20d76ed0b342de3fa8d228b0f4637d4508c96d4617857c0f21b69ced62d75cad40ed2a3973cb0e6b3ce419fcc9aecead48925e071e29ae7d
 EBUILD ktextwidgets-5.84.0.ebuild 958 BLAKE2B 7e1e90ce616ad15f6a390b581c16527489013a2815efd926aaffe4e1442d459dcc1d1d9a3b8bebfc4d55149c860ea95d4f67a4916c7ec2b87e9488de7d366729 SHA512 ca4566c88d5ee9fb20d76ed0b342de3fa8d228b0f4637d4508c96d4617857c0f21b69ced62d75cad40ed2a3973cb0e6b3ce419fcc9aecead48925e071e29ae7d
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.83.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.83.0.ebuild
deleted file mode 100644
index 0fdd8d60135b..000000000000
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.83.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 35bb51925bee..4d48c37959fd 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,7 +1,5 @@
 DIST kunitconversion-5.82.0.tar.xz 869936 BLAKE2B 7812dac12f9e854c1178ff72efd13cba0d36d55c0046898ceebb4dbbce6a8244824bf4453a240661cda83e87e60630268c723abc57d6e86b960eea8ceda83255 SHA512 735684240372b9dc7a37205af92172be164a71537b96c810bf64dd46123748901a079202aef394b2624ccfe5aff2ac69e9380e5715c57089739eb59fbd48a527
-DIST kunitconversion-5.83.0.tar.xz 869664 BLAKE2B 562f520de26187097ae04109de5cc18128bd5a4d3201ff70ef2b7ccb26944d1d73b50653b46e463b24094e9b56fb99527052ca54bba6e785c08296c965493ed5 SHA512 e15543498b7ca0df4a984c243fc3df6b5bbf57d715bd9667564669f8bd688e1d49366d59fa9df555aa07602377d5cf0b4135bdf84b059dcb651b4cde57b0654d
 DIST kunitconversion-5.84.0.tar.xz 887688 BLAKE2B 2fe75e7febb404864f18ebae306747e5df15821647ff7456b577477d82ab1b3be547bd5e6c24824fb971fde023ca3b4b79e09fe299461347101b45ffa1cdd65c SHA512 8db9ab10c1ad195e70680f5a3c8c65f261784385eb8c88e6e8f847cb204267fa735cd94482e844b4496a2c9a6b0ac65728f93e4d5caddbc0e3a4e1f116990f97
 EBUILD kunitconversion-5.82.0.ebuild 524 BLAKE2B 3f0bfebc97827dd3837e58d05f44c9b8dbe61ebfd276fa8c4c5921037016d8b6188e4d49cc3fd91ff421a0a3326650f86cd5f47a758e198fc5b0f4a52e9548b5 SHA512 c1f6d3a23f8f60c6c1df3cf609e0544f6f918abb3792578b732c3384d58fcf65c52b2aeefd1cb8d6fa1b735f1bf5ad76b2e346117b002bcbb09ae23f906720bf
-EBUILD kunitconversion-5.83.0.ebuild 527 BLAKE2B 1a014a291da9eed81208dfff2c41e57381319a12200d68096450f981756f816eadf8a6fa817f3deae1c3538fd0688522517fc63c592a2dd68d84aefbe3be242e SHA512 9218c4bf86c9f71160768a284cc0404b827a417aa258f9d688b88648ca61dcb829f6b7007e879adfbbe59dc8e42fb785b123863ca29810b5f41ef66e9dd33256
 EBUILD kunitconversion-5.84.0.ebuild 527 BLAKE2B 1a014a291da9eed81208dfff2c41e57381319a12200d68096450f981756f816eadf8a6fa817f3deae1c3538fd0688522517fc63c592a2dd68d84aefbe3be242e SHA512 9218c4bf86c9f71160768a284cc0404b827a417aa258f9d688b88648ca61dcb829f6b7007e879adfbbe59dc8e42fb785b123863ca29810b5f41ef66e9dd33256
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.83.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.83.0.ebuild
deleted file mode 100644
index 75a1cfd68b78..000000000000
--- a/kde-frameworks/kunitconversion/kunitconversion-5.83.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for converting units"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 623938 - needs internet connection
-	local myctestargs=(
-		-E "(convertertest)"
-	)
-
-	LC_NUMERIC="C" ecm_src_test # bug 694804
-}
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 7fef033ab21b..94c2961a4dfd 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,7 +1,5 @@
 DIST kwallet-5.82.0.tar.xz 300944 BLAKE2B d15119772389a2b422bdc5564d5dd14012eab47ea1767dab0f439db842debd26632a6eb764a33ceb68f0851bbd3ff8bf5101729b8fea1eba6be675608b9cd769 SHA512 b23d0d9229df9060dd71d9ac81247f70bf246f00f6bc0026074be4964532f5e0986c49414d11affbcd88d89de761486e2f3ea2fcb6d023723285e14af85a06cb
-DIST kwallet-5.83.0.tar.xz 300860 BLAKE2B 97227461b33fd5df585c86aaeb0b8f15e8666a8b9d3970375feec2b2fb4ecc9abb8a3c396904c9cd2ef5d11c5eb53bbc738c35862e5c1f5a163e86c522529684 SHA512 ed03b2f967154d6cf8174711870dd7c9e47b5bdc4da0f4f9f62ab16dac020a094794a263a46518a5ee210fcb8eae6d35bf8f1a813ec1b1c40c80732a444ba1e5
 DIST kwallet-5.84.0.tar.xz 301012 BLAKE2B ced83ea3ea33315d361c1306f24ca02e6de91ec88e883ff84293dd3a7f0ff4dcd7d608a74630467151c2c4e06a16d2f08e0a2c267d287b336ac4b5f8965de55b SHA512 5b7fc27043f624237191f61055c027c75b129ceac8780caa772610d428122af6c356c490472abcdb47448ba8d827f91ac604fe1c3f01e6856c8ea3ce85e02524
 EBUILD kwallet-5.82.0.ebuild 1377 BLAKE2B 4591ceed9c3bec2b1cc8af2b6be232388d332ea1050e02789bcdb3a6c294179a9d3c083fee5e0fa0985c9ce82774d689fcd0e5468fefbf6f7a647a43199b3cfa SHA512 50cf50205f79d0da8e700bfa942a0ae80d634e229222b328af32f59a975ea37f98b7d4432268f2fc30dd98a7d35fb5f28133803b63523cd68f9d256ec79af82b
-EBUILD kwallet-5.83.0.ebuild 1380 BLAKE2B 41aa23c1078e4ba44924770d985fc01f2e786f24ec463d5905b38f4c9ff9e7f6a504022b838bdcac5760fc49bf5c5077e5c97853358913620b3c1a5bb35fe4a0 SHA512 75043725335e63678fc28dd54d98794602e71fa7d00d788f20360dc10fa84e940a0f09f0059ed99ad8805da8e59402a20dc08d8afa04b136c86a0e45e0e49756
 EBUILD kwallet-5.84.0.ebuild 1380 BLAKE2B 41aa23c1078e4ba44924770d985fc01f2e786f24ec463d5905b38f4c9ff9e7f6a504022b838bdcac5760fc49bf5c5077e5c97853358913620b3c1a5bb35fe4a0 SHA512 75043725335e63678fc28dd54d98794602e71fa7d00d788f20360dc10fa84e940a0f09f0059ed99ad8805da8e59402a20dc08d8afa04b136c86a0e45e0e49756
 MISC metadata.xml 379 BLAKE2B 884224c9038659c39bd91c3a2a3b8707fc8ea50887fcf08c31f432a2f5d8b013bd8b466685332bfc72220aa6bae689fd4f02200b04d8d4de370c2a77aeea2ab9 SHA512 bf6ad732349402a6b60b88366e62e620fb6601c44d962a12b35125760161150e6bc53535f55ab675a0a9bc048c4bdb4ee1e8e3f6cba5e4d8ecef165c6a90c820
diff --git a/kde-frameworks/kwallet/kwallet-5.83.0.ebuild b/kde-frameworks/kwallet/kwallet-5.83.0.ebuild
deleted file mode 100644
index 6958775bab35..000000000000
--- a/kde-frameworks/kwallet/kwallet-5.83.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Framework providing desktop-wide storage for passwords"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="gpg +man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
-	dev-libs/libgcrypt:0=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package gpg Gpgmepp)
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Auto-unlocking after account login" kde-plasma/kwallet-pam
-		optfeature "KWallet management" kde-apps/kwalletmanager:5
-		elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index b09def260b26..646891229902 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,7 +1,5 @@
 DIST kwayland-5.82.0.tar.xz 346464 BLAKE2B 59b0e28b2a9984c923c211cd169b4abf9d7c969ae1de31db3e08c0bd2a127b19e652c6666b20ee49d73c9d2736929a45a2124353fd19b320be9256e2f87a6252 SHA512 80cddfdcef545315987d27167ab2ed35b76b9b02e2310913b7c27cbcf27671b1f1f66b8dbb8dee82d42bd2e4fdbd5853109783e76da7ec794f6eebfbef9cf020
-DIST kwayland-5.83.0.tar.xz 331184 BLAKE2B 0433687769ede2eabd48476f488a7812c6ac3c1193b514a37fb5d6329e40aa3ab86b961e7447b4b3532a34e6309c9c575932e1fd3519d67c44edd3c908cb7dd5 SHA512 fe8ceddc36c9c1b127bee68e49de730c759338697097fa94b75ca537adceedccd66aaf601ad9efd27d75f0e75c96b4caf725ec3825c0b8420ee9732c6d1258a3
 DIST kwayland-5.84.0.tar.xz 331172 BLAKE2B 952c7b1b183281dcd6d3bc37b28a0650636e5278a72dc1985b3e3f56fd3a97634479d99267bfac51eee3d76391f3a1301caeb2a7405a48eb4a21913a8312f5c4 SHA512 e777a1713a6b95054b1361653fb6818d6aa7a4dd1d9d75ac389d4884f812f1436937ceecbc3327296d4902a85aa54a885d92728b3573b212722204da03bf7797
 EBUILD kwayland-5.82.0.ebuild 764 BLAKE2B f5ca1ecbdbdb23975f337dd58b86b6d8740ff9453e62881ad27d3f9a3859a771c94de027ff2deb9f495cc47593887f0751b19e3ba4206753728f6b888f22ddd1 SHA512 91880d5bbde65e9875e948d8a2b5507a4cffd27f2cb9c5b995eb0f7b93d49b4bdb403a9fd632e6f57925903916a13c371afdfaa84ebd4aad26154931a8ac193f
-EBUILD kwayland-5.83.0.ebuild 767 BLAKE2B 7d53ca34089fe9a8e349e08c6e90f752b0d2246dab44305b3938cdd591e4cf40ca3f164b5c386f71466e6f2cd8d26a926671cf3f7248da09d5ea0feaeeeaf8e3 SHA512 41ce47ac50ecd676dc4edcfb65264cad5b5b90b5a1bae341b309ce5b55dd3c84a4e8800bfc1669df9e1b336bbd2e063225eb83fcad3a3608dde37fe88dec28af
 EBUILD kwayland-5.84.0.ebuild 767 BLAKE2B 7d53ca34089fe9a8e349e08c6e90f752b0d2246dab44305b3938cdd591e4cf40ca3f164b5c386f71466e6f2cd8d26a926671cf3f7248da09d5ea0feaeeeaf8e3 SHA512 41ce47ac50ecd676dc4edcfb65264cad5b5b90b5a1bae341b309ce5b55dd3c84a4e8800bfc1669df9e1b336bbd2e063225eb83fcad3a3608dde37fe88dec28af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.83.0.ebuild b/kde-frameworks/kwayland/kwayland-5.83.0.ebuild
deleted file mode 100644
index f441ff83d848..000000000000
--- a/kde-frameworks/kwayland/kwayland-5.83.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
-HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
-
-RDEPEND="
-	>=dev-libs/wayland-1.15.0
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[egl]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	media-libs/mesa[egl]
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.3.0
-	>=dev-libs/wayland-protocols-1.15
-"
-BDEPEND="
-	>=dev-util/wayland-scanner-1.19.0
-"
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index ea9fff1c5e60..7cd749d8a9b6 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,7 +1,5 @@
 DIST kwidgetsaddons-5.82.0.tar.xz 2375140 BLAKE2B 044a1af35ce5f756c49b849f0b56e024e709643967142f1d9634ccaed882e1973c5f41c2794470563cbaceae8f7b6a72fb9c89a85005dc723e09a668af0c2fa9 SHA512 6535353c931edd6b0d8bae70fb67e3f6b2bf365d143424a7df4b63de9e174e9b9da705ed17e64f497923909a9d7eba0282d934a9c7abe2b80675b3652d1bf9fd
-DIST kwidgetsaddons-5.83.0.tar.xz 2372680 BLAKE2B db455ce74b02d8e0655f64a3725d947bf063902f464becde24d39b9700d04c440bb4f40edcc6fd4dbdc334e52f1cd93714bb0983f9000b4cba4e2653dc50010e SHA512 a8360bf47b47637737524cc60c71a50d902151c08f57ee11537385d198123f58c94ecc61eccb6d376c9718d31d7575103bd3b8293dc80789ff146cffac849dda
 DIST kwidgetsaddons-5.84.0.tar.xz 2375508 BLAKE2B ba623f6fb71135685fe5d2a3ed231438e8d26fe37601009f6b50f9ec3427143517a45d14684c15ebab6639d52d4b6e6200353f736f1eeb6709f52fa5cec11973 SHA512 665c22bf744c75083c594016c938b6e0094bf3931d88d384cc917fd16f8f05bcfd3f07d213bccaa178a28b336f87f4ef9ab9a2fa05daf0ddef5fc1a188851c53
 EBUILD kwidgetsaddons-5.82.0.ebuild 751 BLAKE2B 21207bcab17507caaa5ddb02836ec6df4b31dd4e38a4460bda574e897dcf0bb7fdfc5760c6e28410defb96d0fe11a0cf123300da36c9434d2929fce5df739c1c SHA512 e031ca7dd9fc35c9dd855a6fb5da62d13da7cb170fadd36893180d49e71a382ec3c632f7d11533f84d7786f871280ea793d926b686600e170e0d9f3565b1228c
-EBUILD kwidgetsaddons-5.83.0.ebuild 754 BLAKE2B 0d060205423c532f6157a5b14fbf0fa6ebeacc3f7e2dc304b1d08785955c25657324d8fe258bc0e408525bcdf082b0939695d1b78e6ef8e9f1da447711950900 SHA512 c78faa9121e1a6348947af4a56f21c6e6e0308ff59081ee56d8f9a9afb7ad9d96527f02ffc5d3cbb9a86e3db1f1727041735c18145348299222162ddf94ce5dc
 EBUILD kwidgetsaddons-5.84.0.ebuild 754 BLAKE2B 0d060205423c532f6157a5b14fbf0fa6ebeacc3f7e2dc304b1d08785955c25657324d8fe258bc0e408525bcdf082b0939695d1b78e6ef8e9f1da447711950900 SHA512 c78faa9121e1a6348947af4a56f21c6e6e0308ff59081ee56d8f9a9afb7ad9d96527f02ffc5d3cbb9a86e3db1f1727041735c18145348299222162ddf94ce5dc
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.83.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.83.0.ebuild
deleted file mode 100644
index e5034aa3abcc..000000000000
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.83.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="An assortment of high-level widgets for common tasks"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 650216, 653186, 697866
-	local myctestargs=( -E "(kdatecomboboxtest|ksqueezedtextlabelautotest)" )
-	ecm_src_test
-}
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index aa21d47cca00..41291cf1455e 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,8 +1,6 @@
 AUX kwindowsystem-5.82.0-no-qtwidgets.patch 2499 BLAKE2B 30602fa8fec92647cf92abca73366c5343abb75f6e67e01774493217721b0369fb39cfc094a4a14457181b34aad2730a2cd4e006a5d199d04a17018b30eafe2c SHA512 0bd87cb8f922576960306f664d03b9718ee2bfaa5e386f087bd3d33c64e7d308f1c42a778811cc8903c5c3b1999d4d94c9b03c2e52ac99764ddf68e16fc8b44e
 DIST kwindowsystem-5.82.0.tar.xz 177932 BLAKE2B e3089e51821f46eb061830863bca969e5da693a815bd17db3d674912fe1c924fe2d590c982c93ec9926d381ee8488287f669745113c1a96cd5e4f3f8ac3c1297 SHA512 fd823e718e439d40e85146195d03c6868c99d62cc9495d5733157db081f29884cd9a9d11421d81c47fe4cc5661107a1b52ff55dc9e0a00565682f1d7845a2e68
-DIST kwindowsystem-5.83.0.tar.xz 178308 BLAKE2B 35d50012708038a39624793636ea447ae5697ea754fb6fcc04e40b50aec156bfdfebfcbe41f53fe8218d1f64123b6a7950baf495dfa583b9de716fff0edceb2b SHA512 b5270f9add6e4b3d1f468fa78ba6600b7c4813bd5eaece984e7d531ee261ac714039ca61d8f93ff6d3aa1dee147e3ed708c3ce153e885cc4f7b844b199620a03
 DIST kwindowsystem-5.84.0.tar.xz 178280 BLAKE2B 963b108d34999457e90cf969baca9aec9a9f7d2644c2c6acb0052df07f503466104c1bc1c94ba3a9a98e11bbbe31e8c6148e81c62139ada1a0fd0d54ba787b26 SHA512 9a849049e7480f6d3f6e1fdbfa540b6c99c9a225afff71ba31152cf4dd79b2c56eadf68b2992c3258f76568f89ab595c494d0baec4a5efff672f92983ec534bd
 EBUILD kwindowsystem-5.82.0.ebuild 922 BLAKE2B 627b7d7260383ff83a7b778599d5c6559a43232ad3d45fb4d77ad60906db764b9a8252c7672c223c06005f6b7e4ec7acef986933452ce9153980f18a4c43054a SHA512 2dc1aff1b888ba35badfce72009989dc08f82baae45294a2a6c6da830119485f786f2397e8094ff1a919876fe8a67ba10014c1e736fce023e8c2f2226b4258bb
-EBUILD kwindowsystem-5.83.0.ebuild 854 BLAKE2B 9017ffa52202ed401c659a3174af5dde6d2cc848553ee21598054627fad066de7fbaee4d05add3c58a9afa92842714a62047bbca9ef015aa62e26668377871a3 SHA512 4af72e6581f9b7178cebb492711f387f70dcb82fdef82c5a61b44f272fc908d55b906ded0659131449385c22dc64b6063c43eb6944bcecccfab5da8078ef60ad
 EBUILD kwindowsystem-5.84.0.ebuild 854 BLAKE2B 9017ffa52202ed401c659a3174af5dde6d2cc848553ee21598054627fad066de7fbaee4d05add3c58a9afa92842714a62047bbca9ef015aa62e26668377871a3 SHA512 4af72e6581f9b7178cebb492711f387f70dcb82fdef82c5a61b44f272fc908d55b906ded0659131449385c22dc64b6063c43eb6944bcecccfab5da8078ef60ad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.83.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.83.0.ebuild
deleted file mode 100644
index fc2c1177d8a4..000000000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.83.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing access to properties and features of the window manager"
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls X"
-
-RESTRICT+=" test"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-DOCS=( docs/README.kstartupinfo )
-
-src_configure() {
-	local mycmakeargs=(
-		-DKWINDOWSYSTEM_NO_WIDGETS=ON
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 04af6cba980a..9c50463d2f7b 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,7 +1,5 @@
 DIST kxmlgui-5.82.0.tar.xz 863880 BLAKE2B 045ed589d52ac901aa128d4f3e8eb2bd2f9b09ce22e6a7e28dbc34d208a6c00167c94e5514f47acce640d18f86f37adeeac79a25dc148eb58c038fddc9fcd59a SHA512 2ed59fa53876005f326e323e153d44d3144c9d49bcccf5aea68f5d743a79b505526286b6307e193878541c5cc8260220ca0a9a169b18d0b0df4720aa8541d0f4
-DIST kxmlgui-5.83.0.tar.xz 859400 BLAKE2B 0436f37180619aa9fa5f1f28ab32e06c4979e1db51a0bd94fe116021690f183d26348319aef76c9a5689ea440bbbfd7a9addc68dd520b3c66d0616679747b965 SHA512 4b19c09fda39037b6b9e07c6a20c2c558f09b7c17fd35dd8a9e9c65d727dd0535ea1e3039217deead30fbfd5282d9b3303bd6136f250f49e135f3b055c46bf98
 DIST kxmlgui-5.84.0.tar.xz 869456 BLAKE2B 2dbf8a65a3a27722a28f24f75addafb3920c004e0be070185f03b7037368f12cea39d8b404832705d6dda75267633f637d558b20604fb57e61aeb535eaa17090 SHA512 5a5df64492d0886fcd7e3e29df6dbbd493636135f6de9f88f2b62bbc99c99eca72425251ca894be1e622ef043b057f1cfcd04d6ddd916edb5536599bd1a4f339
 EBUILD kxmlgui-5.82.0.ebuild 1282 BLAKE2B b70ebf07b32922e3305161543dffa76c619b596b9a98dca886f286519561d293fc4479459934a81533779cfbb6decd6c11147e7ffde9632d9bbf8b9b6e957491 SHA512 5b0b2f1b60f784947253b08a929a155777948130082af735811c2412574e6cfc2665fca6ff3063e8805368c55494e64675ebcccbb46aaa13ff23638cbacecc4a
-EBUILD kxmlgui-5.83.0.ebuild 1177 BLAKE2B 28c69880ad6f39d3f614ffc00ca81e443d63416d81625be9e2479380cafd964945d9eece6edbd24cbb51adc5cd8971a5107605e8565b3b5112d823f94ac3d6ac SHA512 bc5827c3a9a0860de1e0a7f361b9d65242bcc63320360814fa4e05f353ac99ffe3573a3593c8f326e130270fd9091290ca023c767f3d245af64b53cb074ae674
 EBUILD kxmlgui-5.84.0.ebuild 1177 BLAKE2B 28c69880ad6f39d3f614ffc00ca81e443d63416d81625be9e2479380cafd964945d9eece6edbd24cbb51adc5cd8971a5107605e8565b3b5112d823f94ac3d6ac SHA512 bc5827c3a9a0860de1e0a7f361b9d65242bcc63320360814fa4e05f353ac99ffe3573a3593c8f326e130270fd9091290ca023c767f3d245af64b53cb074ae674
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.83.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.83.0.ebuild
deleted file mode 100644
index 735cf883479f..000000000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.83.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-LICENSE="LGPL-2+"
-IUSE=""
-
-# slot op: includes QtCore/private/qlocale_p.h
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# Files are missing; whatever. Bugs 650290, 668198
-	local myctestargs=(
-		-E "(ktoolbar_unittest|kxmlgui_unittest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index 022b4d2d1b0a..2e2f22ebff55 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,7 +1,5 @@
 DIST modemmanager-qt-5.82.0.tar.xz 112524 BLAKE2B 1569dd2defb8b99b41d3ce8c94e010a8274e04012dc72b442e13761d287a1ed6f3e281ab0f03659f1d034fe6e79c70bd6ff3c07c7a4189fbc4d154fea122a1ae SHA512 129b1618f9bb5a59c79a7a202e297c3dc6f90829c2e4841a0cd2ac15440fed19ea78ce16d2ae3b012fe02db568d337210bafcda183db9cb8a1dba0d087f16ee2
-DIST modemmanager-qt-5.83.0.tar.xz 112496 BLAKE2B 12c566286494140c0cdc50a648884802028ccad365e9f795bae20fe3275a2a8e9477043bac13635f161401d03e648a8fcc210c41ce167ad42bcc2b9d33f6e19b SHA512 f5f860ed50ce8468f046d4ffc9db5466daa601778012a9a433d5f5c3d2526aaba7e4b89a1b2476501f8efbfb5f4e8cc88007b0d328dac8f4766cd94bb616f14e
 DIST modemmanager-qt-5.84.0.tar.xz 112448 BLAKE2B 0c9677356e7ea1d1e5cb971a15e691cd28cd487d3d25d62aa60e9cf905c6b8bc005f2bed7164ca7765ba18788ad29f2173f73c8da4afd3a0828b1f07bb37cfcf SHA512 61dd3c5c0dd319fee86163e4e39356d551d49ce000c58b13e2e605be5132511c6c6464f6010ad70ab9dc3a3f28746a3d69df03746b7b9b0d170ed3bcb1b17056
 EBUILD modemmanager-qt-5.82.0.ebuild 466 BLAKE2B 26bf07c44b1d2e8d42bac5f58ad8d3257376eae6fa3d93bb87d78f8a3e2c7aafb7dc7a2ffc24c654fb4d105650847a3b4e1529cfa7ecee0c9f72185977ef5a2a SHA512 bc73ff5231ccddc78992d4d2389628fc3f50555d69694ed761cc43de87f8721f5aafb1272a00e6c74b7af4e9fff0bc969fc30f0f8f07f9f09cf418935fc0423e
-EBUILD modemmanager-qt-5.83.0.ebuild 469 BLAKE2B 222dda89dcdf348936f8e5a5acf1253f27c3e06cdd3fb2d18e9446b683c44cbffae23bc26ba68dbe60d2517784a75522b70c0834ac78075887444fe4c861442f SHA512 ab23ce00bbe30ac77765ebfe455b277ece07cbc38ee9302df39609df5ea6dfc6813b613caaba1b85433d8b1954da76b9d2424e136611835282d06f9eb8fa77d8
 EBUILD modemmanager-qt-5.84.0.ebuild 469 BLAKE2B 222dda89dcdf348936f8e5a5acf1253f27c3e06cdd3fb2d18e9446b683c44cbffae23bc26ba68dbe60d2517784a75522b70c0834ac78075887444fe4c861442f SHA512 ab23ce00bbe30ac77765ebfe455b277ece07cbc38ee9302df39609df5ea6dfc6813b613caaba1b85433d8b1954da76b9d2424e136611835282d06f9eb8fa77d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.83.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.83.0.ebuild
deleted file mode 100644
index 921f6471f11b..000000000000
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.83.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="ModemManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# requires running environment
-RESTRICT+=" test"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	net-misc/modemmanager
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 3c5365e81026..f28fd79af3e3 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,7 +1,5 @@
 DIST networkmanager-qt-5.82.0.tar.xz 195688 BLAKE2B fbda99af246ed652f39c48bed432b934ba3aeeda7c7009c238464e2f0c586a226343dac3bdc1612c970766b3801ae0e03492dad7c73325d0254437f27d428cf3 SHA512 07d3d0e5a9f526ecea5942f5d16aa97c3ee8ab3f2481cabc01a9132e85c92a3dd1a3da744accf413d8239dbca1fce3d1ae022ffafea620f9212bda2a8fce00fe
-DIST networkmanager-qt-5.83.0.tar.xz 195704 BLAKE2B 3e83c7d6dd133b6f506f9546f8b40d12d92abd7a171683cb9fc25d6ff9b6ac1822d06131aaaaacc2e9f91b974c114218251522d03da00812d989d0fe61b3e0ed SHA512 d7d0aea9c1b13ace7d651253453ce8996d26f3acc8145235f675f2b8c1f4bd21206eda03fc2975773f459cd72d8d0e1539168be79949d0a11c4b4bde64357b70
 DIST networkmanager-qt-5.84.0.tar.xz 195708 BLAKE2B e6d6e25020fa835afd89087c068d6c62c389172e7d970705430c9d0f86b53f489e6cab4d01bd9e362d2f37ba3713da25bfa25e7b00c3f1cdb9d310bf4a16739c SHA512 06a925c242d2bc0690822a792d0f346602f154193403db367059f21ce9b9c4799e4b50d0de76894152553aed3ff0c153246cf132ff383483e37794efb8b66e02
 EBUILD networkmanager-qt-5.82.0.ebuild 651 BLAKE2B db20b2cefb809e8f759a2643e15bd1e665dab4a60b3759db61a5461deb3db027cdd7c1a6566b5e7b22d0606d50503b1246a84fb1f1eed0858a0b2bd9c38b8014 SHA512 0cac1b4354ff95c8adbcbf405a88a9ecf48fe197b7558ded9a4c718c895225dc4f22a947889488f1ad18ec870b615b6091bb51f0b23e760e3283f084042245ed
-EBUILD networkmanager-qt-5.83.0.ebuild 654 BLAKE2B a01139df3b79d6c1f168326d529cd22e25688fada5fbcfe6d92f92a815c23acf4259971d19b215d464e24b7df1cdd4f4e0097ba2c71bacb1463fbfe475ce17a5 SHA512 a0c4078af169efbcd4c4175b3c6dfddb45c7918d2f0418de8a486309158c68ad2e43211beaedc944c4cc01afcabbd31b072b652436a24287417aa5b8ff8a0086
 EBUILD networkmanager-qt-5.84.0.ebuild 654 BLAKE2B a01139df3b79d6c1f168326d529cd22e25688fada5fbcfe6d92f92a815c23acf4259971d19b215d464e24b7df1cdd4f4e0097ba2c71bacb1463fbfe475ce17a5 SHA512 a0c4078af169efbcd4c4175b3c6dfddb45c7918d2f0418de8a486309158c68ad2e43211beaedc944c4cc01afcabbd31b072b652436a24287417aa5b8ff8a0086
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.83.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.83.0.ebuild
deleted file mode 100644
index 23b69f5bf65c..000000000000
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.83.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="NetworkManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="teamd"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=net-misc/networkmanager-1.4.0-r1[teamd=]
-"
-RDEPEND="${DEPEND}
-	|| (
-		>=net-misc/networkmanager-1.4.0-r1[elogind]
-		>=net-misc/networkmanager-1.4.0-r1[systemd]
-	)
-"
-
-src_test() {
-	# bug: 625276
-	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 2eda52eca2f5..71f6c2dd8b0b 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,7 +1,5 @@
 DIST oxygen-icons5-5.82.0.tar.xz 234613000 BLAKE2B 49c25988ccfa1a00a68c55a51b20d3052f1206a74f9ea12534243d106326471ce8219a7bb1c7abb30f1c8994bbd098753107570beb8e7f1f058eba91fabfb609 SHA512 b35ba0bea0fe88f8ef65b7ed7e56157ff4d34ebc516e0009a2bd9969bfe477a6150484f5a8987a9ee5866d27c21f92efd0eaf9673b537a6b92732b3af8133bb9
-DIST oxygen-icons5-5.83.0.tar.xz 236317692 BLAKE2B e6f6eff46c5d7d1535f85ad20892b02d154a81492f0279822c8730b087f54223881f7a02c3929dfcd1dbe02ced829a1b9747bec8b6394f0a817d3f5609c5d8e7 SHA512 b3fddfecc48c5871effbf07790676d8a6fc390f707584fc47ca090ee031d01df290049b3c1b6e2a168692fb2ef16f17e6d6e4d2332333a4adcfa3795b57099ad
 DIST oxygen-icons5-5.84.0.tar.xz 239717996 BLAKE2B f7fdcbbba8ea019cb84d3000f4e837094fc8a60ce5aa9690e37ed12e006fd6f9dd8226332dadf77a85ba48f00fefedce9840ef17d4b5b313c4cfb453642eff26 SHA512 b8b890152d352a9ea0efe828e66d4101be435c9efac3a677eebba4b977da2efaed4f14fdefc6443621cce5a0e7ecad59bb3d8b464f4835af30e70d72aa44c379
 EBUILD oxygen-icons-5.82.0.ebuild 688 BLAKE2B 8cb46b48972acff4ba7504e694c526c2c382546ab916d9c7dd475e8e353ab571feabc0d1629df3158f00d07da16bc8a1d8d41f14659ce69ed6e31756e977f58e SHA512 6ce6daeaa08970b337f2d514b0b472e2aeb39713b29a60d4647969972eb394bf6496d5a8b59c6784f76ec26548a7d352eadec54cd5b7d6ef6d7087979ed1f59c
-EBUILD oxygen-icons-5.83.0.ebuild 691 BLAKE2B 0ec80fdede0b27db6a87707b385a6cf12e9f44953961f39d945cf819c64be05cd8b3c57c58b88d358f27d34f9c9fb4eaaa514698567ced1c58dc77cad0acbd32 SHA512 eca98e944f5720848123c71e2825a014dcd448da03dc761689b79c46fa5ff53f462ba203d1b055cf60da5581c77ef8b5ca4cb1a595f1ec0a2d3bea3e3e26f760
 EBUILD oxygen-icons-5.84.0.ebuild 691 BLAKE2B 0ec80fdede0b27db6a87707b385a6cf12e9f44953961f39d945cf819c64be05cd8b3c57c58b88d358f27d34f9c9fb4eaaa514698567ced1c58dc77cad0acbd32 SHA512 eca98e944f5720848123c71e2825a014dcd448da03dc761689b79c46fa5ff53f462ba203d1b055cf60da5581c77ef8b5ca4cb1a595f1ec0a2d3bea3e3e26f760
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.83.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.83.0.ebuild
deleted file mode 100644
index af70e891002e..000000000000
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.83.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="oxygen-icons5"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit cmake kde.org xdg-utils
-
-DESCRIPTION="Oxygen SVG icon theme"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
-	test? ( app-misc/fdupes )
-"
-DEPEND="test? ( >=dev-qt/qttest-${QTMIN}:5 )"
-
-src_prepare() {
-	cmake_src_prepare
-	use test || cmake_comment_add_subdirectory autotests
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index a812fe50280f..b87e7c29f4bb 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,8 +1,6 @@
 DIST plasma-5.82.0-plasma-transparency.patch.xz 3552 BLAKE2B 8e9f1bc91b2d8ae623ff8f31d5de0ae812ffc1666badf388fa711887afd9479d718cd50f9bdea42d725f30fbae8d32d87cd071b30b1ba49768377a8d07e9bbc3 SHA512 3e8608f7c7d6da150a30fd48e2ac5115f95f6346056ef2f12134ba8e93617c7b067b8ccb1bab5e1586f3ef1af7f010b8ddd9fe0a9a7ee0def01bc991be8e546c
 DIST plasma-framework-5.82.0.tar.xz 3160744 BLAKE2B b0e8ebf51fa41b7ea2f3290b157d30fbf2cf2bf5fdf867c7601ece615d8f2ad93b87976f7b093bc7909e1286021db8d1ec5971cbc8b361888450a9e6a9bd64d7 SHA512 e973d1b2683a88f370587a8dba71b1f3ff8a5e23127dbe4c30161fb827b6e3c83e7eb0a6860478d160c6fa69bef9fde0f16f0a8d315672df433ac9d7157b8ea9
-DIST plasma-framework-5.83.0.tar.xz 3142628 BLAKE2B ea7d3830c0ed991df7e4bcaf4c68ea0aaec06b4f228e11d692096eac8f4bdd34f0818100f7c0ade3dd024ea74d4529b5892880b0f2bfef5a5475d70f58599205 SHA512 1311de3cd3c31aa5d3f8c5f83258e02014d2c0cc95a3b52baffb6a579311ec1d94fd5f038ab18361d761e82d40506c9b7b1b90e12494889a0b86035906d4a725
 DIST plasma-framework-5.84.0.tar.xz 3145140 BLAKE2B c5f4a9e2c0121cca55ec55ea821f16b5433039fa70f485c0e049dcf7940703a937e01dee7361ba0df50284b5693fc6661ed7c8ec4ceb5d45591d61e72cdfc4c6 SHA512 e8032f80ec91d56d0f72faca27e1878e7e2e581943746214a359faee45f85dc125b02198a1623ec8cc5a74fbcd38f93bf2faf5e17f73ab410805adbf71579577
 EBUILD plasma-5.82.0.ebuild 2030 BLAKE2B a64a05c28c10890fb3f845286362f0041de75d1f895e1166ee7f1d4ea2f84249582fb4f06c202d4493b97c05359df34c3c1a6938042c9a0ef740d96c3906d398 SHA512 1faab810a201f647dabe24e7d192b53c1b7cbde16287f35c4ccfeaada018d5c967b07589e6d82734f1f5a229d351bd19666ad16d888f34dd4c599d12e07c501a
-EBUILD plasma-5.83.0.ebuild 1873 BLAKE2B 61ec97aeabbe98de2cb75c2d4c024594663449c0ce1539f938dddf100794ae0581792e740cfee737826d7ea839b712b62bb340169b8b45d4eb8deba0950881da SHA512 9696abd6e13747f68cd9ec1c7f61839d55d36ad93d960d31da2094f5edc7dbf07107f7af8af04b16943e7f3ae7e544b7816277c2bfebade1071d8e29b8350f2c
 EBUILD plasma-5.84.0.ebuild 1873 BLAKE2B 61ec97aeabbe98de2cb75c2d4c024594663449c0ce1539f938dddf100794ae0581792e740cfee737826d7ea839b712b62bb340169b8b45d4eb8deba0950881da SHA512 9696abd6e13747f68cd9ec1c7f61839d55d36ad93d960d31da2094f5edc7dbf07107f7af8af04b16943e7f3ae7e544b7816277c2bfebade1071d8e29b8350f2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/plasma-5.83.0.ebuild b/kde-frameworks/plasma/plasma-5.83.0.ebuild
deleted file mode 100644
index 30849cdadab1..000000000000
--- a/kde-frameworks/plasma/plasma-5.83.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="gles2-only wayland X"
-
-RESTRICT+=" test"
-
-BDEPEND="
-	>=kde-frameworks/kdoctools-${PVCUT}:5
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/mesa[egl]
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 43821dd5f19e..f435357234ec 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,7 +1,5 @@
 DIST prison-5.82.0.tar.xz 41044 BLAKE2B 869d41631f1c41260144cf43d043bb868f3c9cf1443e544ad2a084852fa58d2a2b08a1abcd8182ba1bc2cadec229fd870ff10f483f3a9a92bc3e8b49c4138d87 SHA512 bfed4293bc3bc0c39d8cecf37a33693af59831ccb9aefc32ea717d363cfe6e0769f0f90296dd09ce5ea24016e25f352c0be400e9eacb80f813221ffce02bbb82
-DIST prison-5.83.0.tar.xz 41024 BLAKE2B b037c8cd2d18b6170957c7a756db58a68a30b83981014adce4b14f5979168cad97f9695dd3ad23ce84814d219263cfe91f7222f94c8f5dc3c0ccdeb107eaa537 SHA512 e41b39afff068d26f7af0c43401594ba92608074f9c67e39b3d9b2e280c32a974ef6a9a5c5bd9df36a54500603bc4982271ac8b412bec4e5a91871b0840759b5
 DIST prison-5.84.0.tar.xz 40984 BLAKE2B b870186386e4319e6b1e8fb7f8a7805b513f8d170c3e4fd1c69c288c455e9826122f15860e79b2ae88eed278b98c64b76eb813ef0dce78c901d87829626915c2 SHA512 2507c9edd20c2e6f9ea1d7b8ab64c74876dd20af29fd631420ac83ea837007db9737acccb1a127e88cdc1b728c4465bdff85ddac4087b13b08c59fa93ab57a0e
 EBUILD prison-5.82.0.ebuild 613 BLAKE2B 330030b711029903d5aa93c6a74d4c36654daacdccfa0767ef620d614880758f3bd889e238a434ae4e747c396ef3dd93a8a4baf6b8aef54b7f2c9155a6a3acd5 SHA512 5a16ae8cb5c9cf3a8e3aa98bc900a9f6405b916a8ec9fde75f04b955741967433491bcae412679659b6d08052347fb225fcc9be8b0456a9b01b2192870b9944b
-EBUILD prison-5.83.0.ebuild 616 BLAKE2B 8c622d0ae0205676ae04e35a3656e9146ce5990102815f934195baf8044d81454ec7e77694822eb5ccb7163e9b259d986eca4a824fc305580f9ace98bfa2aea9 SHA512 dc673ffe18fb826a19988e1a4f54173205442ecc12bede9c185304bc4676b5c384f159ea375dd056ecd7e52436f968b9c85a940fdccc05d61b17df23822e63ab
 EBUILD prison-5.84.0.ebuild 616 BLAKE2B 8c622d0ae0205676ae04e35a3656e9146ce5990102815f934195baf8044d81454ec7e77694822eb5ccb7163e9b259d986eca4a824fc305580f9ace98bfa2aea9 SHA512 dc673ffe18fb826a19988e1a4f54173205442ecc12bede9c185304bc4676b5c384f159ea375dd056ecd7e52436f968b9c85a940fdccc05d61b17df23822e63ab
 MISC metadata.xml 353 BLAKE2B 0131b7b94f9b9f5c0407c2b4d643f397be4308f66a6fd89260861d971c4274b82581f78e7661361cf1ce1800612d0d9fce132c2d9242356a91bdd1e03a04403c SHA512 2068fedd6ea1d72317184bc10ef48574e3795d2e03e9293d0c2bfa685308727a7cffc9429fad89e42a53bddf7e933f6c57ddba56ca00b8a8671707c1a3948473
diff --git a/kde-frameworks/prison/prison-5.83.0.ebuild b/kde-frameworks/prison/prison-5.83.0.ebuild
deleted file mode 100644
index 6e96700d651f..000000000000
--- a/kde-frameworks/prison/prison-5.83.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="QRCode and data matrix barcode library"
-HOMEPAGE="https://invent.kde.org/frameworks/prison"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="qml"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	media-gfx/qrencode:=
-	media-libs/libdmtx
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt5Quick)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index b2414c38dd75..c1581de95bee 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,7 +1,5 @@
 DIST purpose-5.82.0.tar.xz 159860 BLAKE2B f29c436239b13c5c025b990a0bdda00107f947dda44b56546049a6e1341f5ca35592c5a4626d62c9ce15b914e566b9a4c96852f0ff9b22d6a22b07b744e1e5f6 SHA512 bccb2cb1ceec619eb61d27cfd027ed20e824a2ba627120581dd928bb331cc1dfc416b5f8067aa31b2a9166dca937a180efc094107a4585e590a5bd9eceec21a5
-DIST purpose-5.83.0.tar.xz 159896 BLAKE2B db631013b796163d05935374e80829bce68b6a626570a8e5bbb805169dbf1a2a84ec95f34117db91dcf62b1d78d8a0d5162f9d34a94a03b3f333f29eb354b31f SHA512 3e7c562e5bf545fd766ab63dff6d4a91b587c83676582349a8a7a433f93898fa94ff53df57eae1746ddc5139124541d97edbcef71a28ed3215d5f0bd31f0c8ed
 DIST purpose-5.84.0.tar.xz 159972 BLAKE2B 034270e38474dbace3e556e86e1649aee590bf847b2a40fd1e82be9ef3da270f86f8e6bef3d4ffdb56bfafd719a28f316b3c3749fd1e540e5bd52e9335ba9e3b SHA512 1323ad30d7cddd04ada06c1bbee5ca8217173710d93a989b952c8ce4790aa7c6f3fbaf04b75cf56834d0e2867674c6296adeeb21c0b5c172c06eb257908000fd
 EBUILD purpose-5.82.0.ebuild 1547 BLAKE2B 017622d61514b611f11b5e9f56cd691e101c40ecdef4ada3d1f722fd9c1b9e448b4358a76255ea8de20676725f6a895f4c80850c131c800f0ad0df9dc8861666 SHA512 dee644951181affce53a9aecf5b0ec16e92bff5385923be5dac14a7f042fcda63d6b5a4b9e1923071257d2c0d57ef62865a6a27a412af74ef973c8e95b937cdb
-EBUILD purpose-5.83.0.ebuild 1550 BLAKE2B 8886702e77c8141df0d7ca03a603d29a21764dbcfbc875f437ec378d6b11130e1ee57f403d4c70dd076d0a48b50f6ab3fd8d63661a963305a142cba2fd92817c SHA512 0a5401ecdc6d55fe03c8238f3aada4a107791c365013cf7ac70d079817781bf11a8da0766626b3ac81dc1f98a3a8e1dfdada8f60e867775a40c9a441ffc73ad0
 EBUILD purpose-5.84.0.ebuild 1550 BLAKE2B 8886702e77c8141df0d7ca03a603d29a21764dbcfbc875f437ec378d6b11130e1ee57f403d4c70dd076d0a48b50f6ab3fd8d63661a963305a142cba2fd92817c SHA512 0a5401ecdc6d55fe03c8238f3aada4a107791c365013cf7ac70d079817781bf11a8da0766626b3ac81dc1f98a3a8e1dfdada8f60e867775a40c9a441ffc73ad0
 MISC metadata.xml 345 BLAKE2B 0e6eede785554aad84ff8d6703b9ab698439d7c383b26f789ea3d6234014b4e4de329159a6264eb37375581106ffa1588d508d2616aac298af08644d1ad02183 SHA512 cee07f4f8ede80430680300afba2bbbba3f38559fec0b3d0dac805beaadf9605f94d4cc23a0f213bc56f6bd48aa5f4f39f010b87453351211ef1c6d53393f26d
diff --git a/kde-frameworks/purpose/purpose-5.83.0.ebuild b/kde-frameworks/purpose/purpose-5.83.0.ebuild
deleted file mode 100644
index 0dc933045ffd..000000000000
--- a/kde-frameworks/purpose/purpose-5.83.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature xdg-utils
-
-DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="bluetooth +kaccounts"
-
-# requires running environment
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-19.04.3:5
-		net-libs/accounts-qt
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${PVCUT}:5
-	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
-	kaccounts? ( net-libs/accounts-qml )
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	use bluetooth ||
-		cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts KAccounts)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Send through KDE Connect" kde-misc/kdeconnect
-	fi
-	ecm_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 399d5fdebacb..ac17d81bf969 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,7 +1,5 @@
 DIST qqc2-desktop-style-5.82.0.tar.xz 60076 BLAKE2B 1d743ff60c5862740bd2ef9c0dcadacca3f63f239a78dbd12e459f929f323b695ddd9c03323146b7ac34772ff76f2137e8dad826e04abef6a1f4ed514163e305 SHA512 ce4db38f835971d6f63dced360db8a320e06e3a6f808bd017d56548041f6d0332b119dc0f6d4e160c7847d9d47e6818d2a867e0f243e58fd6c56843643d55a52
-DIST qqc2-desktop-style-5.83.0.tar.xz 59892 BLAKE2B 3d99eeeb5a0e8d61a85bf9c61cb7372d37bc282a8a68fa04bc77b8c206a94853c383e8fdeb100e556d3ac9f6cf6c17cd34a8bf4b61ac32ede1654cfd0d588e57 SHA512 6cc411245ed3a7b60842bd2ce94e25a4456fd13905bb7d5cdaef61e7d14ea74c1638ca03db611211fcad1353bfec191e695806ba628d029b96d19506c44e6ff1
 DIST qqc2-desktop-style-5.84.0.tar.xz 59960 BLAKE2B 6787aae84a9fd6657801ae2b90dedc8736f98b6b3fc0a769c6f269dc29f7e46dbe2f826c6a38725d3c25d3c9fb405221d1c1179e706e3efe4101d9bcebcb4bd8 SHA512 9cb24d5013dea87fe96c4de464e8c72934e578385fe371880b6e599e46b45631c677f8b98c367bc60252cfadff2142da0652010d734c4f57d7ac46599bcb029a
 EBUILD qqc2-desktop-style-5.82.0.ebuild 677 BLAKE2B b68dfd2079b33b871129b1342f269021f2eb186f685a1e3bbc75e07ff61282f4860436c83212fa9bfbb9bf1e15fb91302f46ef5652f19a874df63a742de9a26a SHA512 1d44d6e4006a469812cf5b31d3c0c06fd8851de046456a8a4db37fffd52989fb06cc8289a49a4f313b82fdf9aa6046e9b4e306f2bab92942d11026929dd5b023
-EBUILD qqc2-desktop-style-5.83.0.ebuild 680 BLAKE2B 9a6acae40e7e9fcd28267bbeb3b9c8cf903edf5848eecd60177b242f6f62dd5b9f5d0812fd86e4df35c350b154ce3002644472e81c97ac64311b1ddad8a680f1 SHA512 7d741e16d0c92702da9ea226703e8cb613bc3a6314da726e5f5a19512a3cb339b00ef459ed28f95cde2592e0341bb8edfe003d1fb9e0ab436af0d536c64145e9
 EBUILD qqc2-desktop-style-5.84.0.ebuild 680 BLAKE2B 9a6acae40e7e9fcd28267bbeb3b9c8cf903edf5848eecd60177b242f6f62dd5b9f5d0812fd86e4df35c350b154ce3002644472e81c97ac64311b1ddad8a680f1 SHA512 7d741e16d0c92702da9ea226703e8cb613bc3a6314da726e5f5a19512a3cb339b00ef459ed28f95cde2592e0341bb8edfe003d1fb9e0ab436af0d536c64145e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.83.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.83.0.ebuild
deleted file mode 100644
index ac284e1bcdf5..000000000000
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.83.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 8fc2a4e4eee0..63fcfbcf9354 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,7 +1,5 @@
 DIST solid-5.82.0.tar.xz 274184 BLAKE2B 296535424310770f3c1acb82217906c5f9ca0885202c51a6bd65e5ed4230a5f93d698a112323801f2d44fbafa637407a5e7793eb36b230e83c77059cf8317305 SHA512 ae15081a07e46590eb36f6c642adcded7bb519010f6f8bce1f38e14e97900f029a1ae0bc61d64d8a2752479ae54a9d2188e51698e0b46ebddd15bab6941ae59a
-DIST solid-5.83.0.tar.xz 274428 BLAKE2B f86d8fd9ff93e339357fa40e891bfb60d044d87151502b6558741246774dabce004aab9a1cb699390e746a042120995583272ff70a1c4b2297713b3ecd9dde9d SHA512 79850aa8195fa640caa27379aee876a0d4d5dbb8436bdecb4bdcfd3667d703195cf246013e715f1a5925b6c882635f94207feae27ba584853fb13153d3eecc0a
 DIST solid-5.84.0.tar.xz 275876 BLAKE2B beec229d68b57c450f9fa209af0038e060a1c16b7966cc3fec8ec0cf3eff9970162ea2f7febcc5dcac48ea2591d1a9ee5ec075926e3561868e48c017b216043b SHA512 2c646c1347312cb3cc716cd35b90da8057d09546c3e90cb0dab823c6cc07495efa04fe980503ed201e5cbcb763e130a8f0444b46139dbdf2e6749a445821616e
 EBUILD solid-5.82.0.ebuild 1038 BLAKE2B f7a79563a60771ce4500b61592f33ba93ba6d0dd674fc2b6dd3a00b652d135bfef91e6945179288a17ad6b4360ce6e503b334499523dcd1d68b0e88732b5b207 SHA512 7c2b0b7e7e90d38a49d7806aef5ada3875c704c5360f4e09e6a9702302260ed7a294f7d4daa93f337476dd5685a8337a8e96b35b854356159151d823ecb64fa2
-EBUILD solid-5.83.0.ebuild 1041 BLAKE2B 3e6dd5062d7173055f46d5870568b2a4298fb57c5c93504d368e27720a321146be7cdae1979d7d00ec8e5d7c6a16abce1b41b473633077fef5c7fc60d0c5bba2 SHA512 abec8fba37e6fb3b084f37a31a352bb7ee883663d7eec4d875d245659d47714950e6d92ce0d56c2d8babaa5bb5fd36b7d23f678fc31ca11f53e782aa58baf337
 EBUILD solid-5.84.0.ebuild 1063 BLAKE2B 2a7f7c9fc21fd99f3f492eed7f781dab8a409837dca3d30a0fd6781093e4b100dda63ebbe176b5642f4385d1e86a0b377b372dc081fdcd0a0fa34e07f6c8e23f SHA512 f4a4e835b8d0546276b3a9185cd77c96914a83085947ecda43fcad237e29a480da463d7ff291cf31f4d7da8ca647a4bd960172b860501f2cca11a40543b5ee19
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.83.0.ebuild b/kde-frameworks/solid/solid-5.83.0.ebuild
deleted file mode 100644
index 5648ed735799..000000000000
--- a/kde-frameworks/solid/solid-5.83.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="ios nls"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	sys-fs/udisks:2
-	virtual/libudev:=
-	ios? (
-		app-pda/libimobiledevice:=
-		app-pda/libplist:=
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package ios IMobileDevice)
-		$(cmake_use_find_package ios PList)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Media player devices support" app-misc/media-player-info
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index b5b77723e206..cb3bbe52bb83 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,7 +1,5 @@
 DIST sonnet-5.82.0.tar.xz 293844 BLAKE2B 6e2c4558957d845a281955c63de7dd87fc21634a4cb3e89af47345da070b1dc15e91c558a865e0c7ac5e2adb2454d36b6b8f2f521112b4fd07ad1b2ad02f6c04 SHA512 3bc876b1e06ba5c08c05ce74530a2584b9853e8c9742f66b19529e7f78f3aad89d3a72e0a615e912d1cfd7a24b3de3a9068d0f72dce3c51ca03b896eeedde817
-DIST sonnet-5.83.0.tar.xz 295076 BLAKE2B e5f78f873251eb9fc431196cb6a176376f1f69add3bf66b67aa56bf61026d937c017e1a7f14fa9ede921f965d4cec9c7d74f9420e7b831638725c1a2670d4a5c SHA512 6e5c2ec0b736675b4ba79297613d9229b4f26f1bede2d4a9acb1334a3df0e006c2c4b9ac516989fcd37c516d8afe822c655fd995cbd9e06d26cc1e97538e4b67
 DIST sonnet-5.84.0.tar.xz 295300 BLAKE2B bafd06d4b57841c4fa39e55235f12dbe447316f4e2af3b1b2dde3f9f6eb817a97a2298320447fbc0a2186ba50e5cd6bd62e77a5828087b65b6097961babaa7af SHA512 49021de3684d899b20b2ba8f980a701e3f467b0a9f76935fc38c347881a371bb0c51f924d44fc819f86119589df1391427365aabd92c1eebbd66f8d46bdf901d
 EBUILD sonnet-5.82.0.ebuild 961 BLAKE2B efc1e30526224c3d5e6e676a762b29dc4d8273b807f6247fc9e28f41ec74da9086b7f5afe13c82aa67773c6c59eadfdd1adcad979ec6b31d51412f34102685a3 SHA512 ecb9a097249ddb1dc9f9471f4785d06779f8e1cdb526bc97b5153c8eb735a9844cd21c6da0693b65f0784f29094b75d6b8d2585604fafa4304e0bcdefe026784
-EBUILD sonnet-5.83.0.ebuild 964 BLAKE2B fcf8b547323a663f1ac9782bd0c845899f7ccbbdccefd8198a3e9746300f719a4fd1340e3fef03e3d1ae01ce2f071062fbce6bbb04aa3d6b77eeeac99de33edb SHA512 47493e83c7aa4d9cebc2807305d95a4869303b08922d99dc96dc6cb94283b65939dffc4e4cb76df248bae00633c0c3454d05914cae5ac4cabe554642a8c8b218
 EBUILD sonnet-5.84.0.ebuild 964 BLAKE2B fcf8b547323a663f1ac9782bd0c845899f7ccbbdccefd8198a3e9746300f719a4fd1340e3fef03e3d1ae01ce2f071062fbce6bbb04aa3d6b77eeeac99de33edb SHA512 47493e83c7aa4d9cebc2807305d95a4869303b08922d99dc96dc6cb94283b65939dffc4e4cb76df248bae00633c0c3454d05914cae5ac4cabe554642a8c8b218
 MISC metadata.xml 502 BLAKE2B d76f720d075b51e7bfba2fbf3edf8715f158ff62585596233be3b6d3afb52212e15be4d3cfc4e83e68a52dfe3ac233af1cf82894ce3197016d163f3d2688e673 SHA512 5ffd2a07ba9206a3d6a88970687c3baa068af228e6025cbc662a466eafc0afb3598e390f907b8c334a418394e60f58db07431cd0a85440148f9959be6ea6e0af
diff --git a/kde-frameworks/sonnet/sonnet-5.83.0.ebuild b/kde-frameworks/sonnet/sonnet-5.83.0.ebuild
deleted file mode 100644
index c2df24e9d697..000000000000
--- a/kde-frameworks/sonnet/sonnet-5.83.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="aspell +hunspell nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package aspell ASPELL)
-		$(cmake_use_find_package hunspell HUNSPELL)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# sonnet-test_settings: bug 680032
-	# sonnet-test_autodetect: bug 779994
-	local myctestargs=(
-		-E "(sonnet-test_autodetect|sonnet-test_settings|sonnet-test_highlighter)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index b284407218d2..dd8a85cb65d4 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,7 +1,5 @@
 DIST syndication-5.82.0.tar.xz 508368 BLAKE2B 5bae3d80f818670cad1a08f3e085fff45116067f811b34390e4cb64c2f4aaf6c171abdc462e7075ce43b1208ad25cf15f088d8d06f3e922222cac94eb9108d80 SHA512 59e8f88138d6d18d7b4c4f2e5596606bdd13aa7425e55dadf24cf4a1592cda0c547b077d303dce514a0e20d5cca0740e6e6879ffda6470c0fa9302cd11eedbc0
-DIST syndication-5.83.0.tar.xz 508424 BLAKE2B dc612fcadbecfe86bdf0831ac2608fa0d2e1c3681de620be76bff39b57ccf2d8b38be40c01cc2e20f62268718acfeafde60643b7d69ba769c65caf2303ab9369 SHA512 b3048bf2ad093cfdfe22266b091582d6f14338f0d5e61ab4cc756f838b4832b2b00fb2330055a2086b5480d2c81a971cf032fa2f586c550d4f319ca9402c82e0
 DIST syndication-5.84.0.tar.xz 508232 BLAKE2B c8ee359992b8eb86790841420256805b96acdd6e2242a3502d581da78633696a12a916131372d9dfb858d45e0427b85bdeeb6fcebbd2ed32328c5a78e610956e SHA512 cdab7872f31c6d19d590c9318618f92ac5cab532944320223183fe957030745c1dc170dedbbc0dfcb33d5119974f9c8731090fbda1dce56e78e28a4fa53fbc85
 EBUILD syndication-5.82.0.ebuild 437 BLAKE2B 9be19b82c675786aa597b095b712dc714068620d98a11fe82f535609b38f09e37abda0e97ea7dad1f18ea7357e93a3f380bb423d78668b45dab84874981adea6 SHA512 72ca5be7b60370d674604cc5de99855644eb0f914be70ae71063d166882a994efe504c6d2b41d77f92c9fea502842c50648545ddc72f5ba8681042a1c55a8d7a
-EBUILD syndication-5.83.0.ebuild 445 BLAKE2B f2036d1fd1049e137d428aab71fed8c1bfc4efe4e9a0117f1492f0540ad57f16d445cd5e88eaf237ba214a6908f398fd89e41939e441a3e76c3eb59ddac413b1 SHA512 a137eea5cb138d239b28bfadf59fbd61597b3e9952b96155af008d36329921f66972a60f7e391be10b9e628358251cb1c004d0733edaccc83f0e2c7424ea7d8d
 EBUILD syndication-5.84.0.ebuild 445 BLAKE2B f2036d1fd1049e137d428aab71fed8c1bfc4efe4e9a0117f1492f0540ad57f16d445cd5e88eaf237ba214a6908f398fd89e41939e441a3e76c3eb59ddac413b1 SHA512 a137eea5cb138d239b28bfadf59fbd61597b3e9952b96155af008d36329921f66972a60f7e391be10b9e628358251cb1c004d0733edaccc83f0e2c7424ea7d8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syndication/syndication-5.83.0.ebuild b/kde-frameworks/syndication/syndication-5.83.0.ebuild
deleted file mode 100644
index 4efba838ce84..000000000000
--- a/kde-frameworks/syndication/syndication-5.83.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for parsing RSS and Atom feeds"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
-"
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index dd39f15b76c9..d5735be50764 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,7 +1,5 @@
 DIST syntax-highlighting-5.82.0.tar.xz 2290880 BLAKE2B 14a98534b4e0ec85bd3bb3603c6330f665b5d2a3958f1b9034e48fdc542aca0c0eca80a1bc5c75179c480ffb40189dd94a847093e81ab4af91442a9e323f7d32 SHA512 4487fece4b144fcdc3b03bc0c11573dcdb0bb073218f25a98a7d08fe55db0fde027f32b5614fa5083097136310cae46d7d28288f7f874eaa2fbd930af2d9fb16
-DIST syntax-highlighting-5.83.0.tar.xz 2294936 BLAKE2B 61e40ee63e6edf84e5526b70f2ad50ee5de6a2095e544932b25effe80bcd0b9671090b8e9c8ab30d5f0343cdece99565e9d6c90ba5dbca2ad107c65a202edd04 SHA512 95070d745c5592560070748e150629e2994e338876bec1b23b7af04344c9ff6bd3dd63b4a1984a5404def2d5178c711acc790dfa0065184a3b124534db17d430
 DIST syntax-highlighting-5.84.0.tar.xz 2328668 BLAKE2B e1df65b9897a391e2c0e33db7e48839a493b781d4904f16b4c6657603a79957fa21a08113afd386d036690754caf302127a721b9dfc71bd2dea36ef11564c6c1 SHA512 0eef420b8aa3917f28bfd64cbe046ebbfe34e9e537c7641666921d26931b3e5eab671b7b104857930fd35981f55bdce9d114b318b4bad2106479e1c3328b690b
 EBUILD syntax-highlighting-5.82.0.ebuild 567 BLAKE2B 8695a7114da0e9cdd60c23cb683a081db1c7ea7de45c7d859632d9d1b7add893a84b2e83811da08d7fc8fbe559031c972b67c4591cace6dcc37d3c5d5abe6e97 SHA512 467147bcdede56f1e143414be3ab96dc5de9d624399a86613dd1e9bb6e9a4e8e5f34756f38c37a9aa18ecafe540229837fbf065075bcae13cff8cab0f52bb760
-EBUILD syntax-highlighting-5.83.0.ebuild 570 BLAKE2B 93b917d3c2724c0752d897eae3159eb4af9624ad3a84281e7d5012a7c648a54e6ae376ddd1ef642696516f6a5857d70b0fb0e4b6f6fba2663f46b7b5c2f8a999 SHA512 48e5f731f0297a4e714e98cbb5e8ec8127e5efbf329659940b4167ec5d8e9446504a593e6d023c0e58d540188f3430e6f1e2e6b4b4a37b82704695e322ef412b
 EBUILD syntax-highlighting-5.84.0.ebuild 570 BLAKE2B 93b917d3c2724c0752d897eae3159eb4af9624ad3a84281e7d5012a7c648a54e6ae376ddd1ef642696516f6a5857d70b0fb0e4b6f6fba2663f46b7b5c2f8a999 SHA512 48e5f731f0297a4e714e98cbb5e8ec8127e5efbf329659940b4167ec5d8e9446504a593e6d023c0e58d540188f3430e6f1e2e6b4b4a37b82704695e322ef412b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.83.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.83.0.ebuild
deleted file mode 100644
index 02499f839b90..000000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.83.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for syntax highlighting"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-lang/perl
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	ecm_src_install
-	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
-}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 97c53b5a2a37..a32c26ae637c 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,7 +1,5 @@
 DIST threadweaver-5.82.0.tar.xz 1410496 BLAKE2B 2723b05277c1f8baa35ca0b759d21c75016a93912eb99600002cc4d5c816971fbefa41330fb1d2861d9d1a71ea9e4b8c5e938f87c5f61f450b93a18dd365b2b0 SHA512 11814680c7209ac29751e4b1411ea2d177e71306e06a9f01635f579147efa75641d6d3dfe84c0c52950069b415edb67965fc899427d69e896028510676af0e6c
-DIST threadweaver-5.83.0.tar.xz 1410052 BLAKE2B 40953c302ee57e7c714f502699883e0c5d936ad964def5fa2272fdd66b56aa903c7d810566e97664e9205c42057c72c1dde7371affca6d61f9f39ca2d1b82440 SHA512 ecd979707111b9ab86b1c6c8167e50d22ad15c2cc2979e4e0780fef10a30869e80c9757e7fa4fa13d2216dc278746bd8f56c777ef990d594cb922a1ae38abaa1
 DIST threadweaver-5.84.0.tar.xz 1410032 BLAKE2B 85ea377558844a5be967332116929d32ed26c30ac20f6adb8980d4971d7996220d60300f691249028204da5f901e0c4f229575798f17f85a78258449d3eb660c SHA512 975998c58e61b611175d0505d1396f205962f7a134d15e78d55460eb66b20b1626c2885259b567cd34fafd4fbcf6e2350a23b4071be109f8f4d07ccb73d0dfaf
 EBUILD threadweaver-5.82.0.ebuild 360 BLAKE2B 0387409754b4cd356f90a0b62c535c0a26fffa5e61498896be5f34970b57d78a61446840a3d86a755d8b3bfd8fa0a77b2eefefbd8f84fce0b9caef198bb51d66 SHA512 bcb46d5f683f5434d0b3bdf5433efaf01b644c29a6074f0fb4887d1120e0ce4a62eb3e1129d4cd5e0ff14590fcf33446b080ed3b94e0a4f0552efeb2ebc593d2
-EBUILD threadweaver-5.83.0.ebuild 363 BLAKE2B fc40631dd957eceabc7a7eb9a2b783cd2829709d72b667328e3520e64e1f947b350ba689f764a51290d677edb4c1281c07fb0c27c4906c2dbc7541029a9283cc SHA512 c3deeb22113c8129be9ee11e6e304b0b9e2da5f45bc184526655157fad03f45136df5d59baec27498bb91dbae0b6e5ba9d5855d44c992907bcc0d85c6f057440
 EBUILD threadweaver-5.84.0.ebuild 363 BLAKE2B fc40631dd957eceabc7a7eb9a2b783cd2829709d72b667328e3520e64e1f947b350ba689f764a51290d677edb4c1281c07fb0c27c4906c2dbc7541029a9283cc SHA512 c3deeb22113c8129be9ee11e6e304b0b9e2da5f45bc184526655157fad03f45136df5d59baec27498bb91dbae0b6e5ba9d5855d44c992907bcc0d85c6f057440
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.83.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.83.0.ebuild
deleted file mode 100644
index 4529902946b8..000000000000
--- a/kde-frameworks/threadweaver/threadweaver-5.83.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-src_prepare() {
-	cmake_comment_add_subdirectory benchmarks
-	ecm_src_prepare
-}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 6ba7f9a7ae5b..ad93428b6d15 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index e0d4fff3b379..a4c72fe03048 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,7 +1,5 @@
 DIST kdeconnect-kde-20.12.3.tar.xz 551780 BLAKE2B 5bffabba63f40d6e1210f393c36d82796fe216163f175a596c271b7ec713ad2369bbb777b866a151ce2d823301b36c8a5a4e3931e56e5f2403a4fb01dc1ca1a4 SHA512 ad40aba6cb879353ecc369b727ef5181aab89d6e645f7997eeb3751913c47ac2ebef82e68efc56837f154508b049bf15511717d314612440f3824d004b9e425c
-DIST kdeconnect-kde-21.04.2.tar.xz 566932 BLAKE2B 24594378319bb35d2b3da9d387163cbc98bebd092056bf7e74366fe68996d8e88c489ea9d2653d165c5f20572a750d321d71abbe0474d66e1a6427580736917a SHA512 a9bf60d58741472f508a5f16f459db2d8405e6ae7c5eb8e685746c276aa0318f2d50d17addd45004e52ef612b848c39c333e75bd07c529fdec2491a265234469
 DIST kdeconnect-kde-21.04.3.tar.xz 567512 BLAKE2B 5cfa3140b5b40ee7b9c78688b1d8289ad9d0b2bc78781883021a2678096412c8ebe1c09172d945ffd5c2111fc3573637735cc0c70512da3c62ea7a868b770415 SHA512 5f2104424c5ddf56eb27bfa0cb3425db6ceb9ecab8844fabfc263e8f0bb165b68077c302df5c06106c15b82836925a730951bada3e0ef09aee1aa99936341f07
 EBUILD kdeconnect-20.12.3.ebuild 2299 BLAKE2B bb235e13d7ea0226419daad7323e0ce1241cd7869d3e436a2f0a2e39d005d5bbecc29d67016e5d3590fcf4bed9e2595d0752953cdb5cee4468c680715e3b29cf SHA512 42398be059eef0f3c2facf8682f094502e6a61640066734d281e977cfad4d771fe08b9835643f77db89d69603421ad83571513f60a292a5ca876ce990381d513
-EBUILD kdeconnect-21.04.2.ebuild 2291 BLAKE2B 2dce23e6864431402f2165a0626c11c76ae77102435cdaa8620ded1280ff571ddf02acb5cd1fd1d3a5dcfb7f03b0362cd3593ca02685f9667007f1fa10f01908 SHA512 f4adcf237c78ce177394c6fbd5e0c12024dded2238368703db2be037a0fd726516fa3da50486f83da131dd451eee2629d89512a51bd32965c353975567ff8e15
 EBUILD kdeconnect-21.04.3.ebuild 2291 BLAKE2B 2dce23e6864431402f2165a0626c11c76ae77102435cdaa8620ded1280ff571ddf02acb5cd1fd1d3a5dcfb7f03b0362cd3593ca02685f9667007f1fa10f01908 SHA512 f4adcf237c78ce177394c6fbd5e0c12024dded2238368703db2be037a0fd726516fa3da50486f83da131dd451eee2629d89512a51bd32965c353975567ff8e15
 MISC metadata.xml 577 BLAKE2B 4a7b31db0d4e48ab09de42119a36b7733603d2b3f85f7cbf36b61713f2f87488f4fe1223d2dc2ef7460b41525eb59fe5e43196df54f8f454241e56518ad73855 SHA512 faf6e262a0f0d020bbaf4372c8f5c308de1fae0cee4f37cdf9509b585ead0706ba06109f27e691cbd0ebceadb7c352b0d335dc29e87baee13ac3dda5eca11a5c
diff --git a/kde-misc/kdeconnect/kdeconnect-21.04.2.ebuild b/kde-misc/kdeconnect/kdeconnect-21.04.2.ebuild
deleted file mode 100644
index 0b673a31fad7..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-21.04.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KDE_GEAR="true"
-KDE_ORG_NAME="${PN}-kde"
-KDE_SELINUX_MODULE="${PN}"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect.kcm/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="bluetooth pulseaudio wayland X"
-
-RESTRICT+=" test"
-
-DEPEND="
-	>=app-crypt/qca-2.3.0:2[ssl]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 )
-	X? (
-		x11-libs/libfakekey
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	pulseaudio? ( media-libs/pulseaudio-qt )
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	dev-libs/kpeoplevcard
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	net-fs/sshfs
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBLUETOOTH_ENABLED=$(usex bluetooth)
-		$(cmake_use_find_package pulseaudio KF5PulseAudioQt)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X LibFakeKey)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "The Android .apk file is available via"
-	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
-	elog "or via"
-	elog "https://f-droid.org/packages/org.kde.kdeconnect_tp/"
-}
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 49600c41b09c..152ac34a1c4d 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,7 +1,4 @@
-AUX kdiff3-1.8.3-hidpi.patch 5069 BLAKE2B 3b62e3e06a5704e1bf2b49472ffa5b4bdcc985733cf0ea3ca77e62ffd90bb9a9c17a0997a81b91c376bcd9a967ffc3458a26951f4381e8d16d0330fa62bf3ff6 SHA512 207767a8375b3ccffdfb0c222992e2556e8fd1449b2bca8f6ec771d6c83bea296973b0c76085ec4b8333527c7c9f4ddb50f6dbb016206a3bf139232d21784389
 AUX kdiff3-1.9.0-gcc11.patch 559 BLAKE2B 6596e7f41fb5dfaeac08cfe3871f67ade513a0d89ec6801af4b688107e18e6bacb5d94199187f8be9a732e6ecb4f6fe81ff8b4124a205654714da303fe5a1786 SHA512 25e88b616e706d4a6a19849647650bd4763684ca7dc518ace7aa8aebeafb49477182f1b78143ae1554e823f547a4caacb6ba08e8c4f367a7de63b518a3c84309
-DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415 SHA512 5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
 DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511 SHA512 3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8
-EBUILD kdiff3-1.8.5.ebuild 1060 BLAKE2B 90af39a2d93a2b80970e8375688b367bcfe4f1e7b9f01c8f1dd7fcc2c65f8d45a874d87bf8d5149536c2f59d50b74a123736ee47173b18d8d9e7bd01b86be3bf SHA512 c4e4f500c6016a456e89a3b2656267d56b6839ace4e4804d68af26cce6ca3a01ef88775ed1f23c7805e9fdd70414ef0afe9c7777376ac220122e757181af5c84
-EBUILD kdiff3-1.9.2.ebuild 1096 BLAKE2B f7a72ffdf88b1db717603f9d42dcd9eef7a25fd27a9bef981cb65939626ce9c7e003187a81f5557d1759a09a7bacbebf0b13d42e4cd1868eb6aa2f3f68652539 SHA512 953b23ddb8dc374a8a0cb9de36b4ec9546b0a6feb51ddb854d23268f527526804592d000dd6540ed0ab4488fe33fae46043d6b9c9fbeef0dcda3cf8ea2f430e9
+EBUILD kdiff3-1.9.2.ebuild 1119 BLAKE2B a527ffa09c821a31331814eed29199eede95e7e63d9792edf8ea728e894627ab15b16b7c580b0f50672691a209b502f54aa53ac312c510dd3383100707c7bf06 SHA512 47c7266b9be2ebeb45e0b7ca39da2617846a1fc0713f2b34efe1a872b10378df5875f0b6c28531ab744496d68b66dc5828119208bbeefb09ad78d768f685f5ae
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch b/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch
deleted file mode 100644
index 180009afe0e7..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 5dcc0673c61cc75122bf5f812a45bbb15b778218 Mon Sep 17 00:00:00 2001
-From: Alexander Volkov <avolkov@astralinux.ru>
-Date: Mon, 27 Apr 2020 15:52:18 +0300
-Subject: [PATCH] Add HiDPI support
-
-* Backported to 1.8 branch
----
- src/Overview.cpp             |  6 ++++--
- src/directorymergewindow.cpp | 15 +++++++++------
- src/main.cpp                 |  1 +
- src/mergeresultwindow.cpp    |  7 +++++--
- 4 files changed, 19 insertions(+), 10 deletions(-)
-
-diff --git a/src/Overview.cpp b/src/Overview.cpp
-index ee1d73f..ac35e7e 100644
---- a/src/Overview.cpp
-+++ b/src/Overview.cpp
-@@ -271,7 +271,8 @@ void Overview::paintEvent(QPaintEvent*)
-     int h = height() - 1;
-     int w = width();
- 
--    if(m_pixmap.size() != size())
-+    const auto dpr = devicePixelRatioF();
-+    if(m_pixmap.size() != size() * dpr)
-     {
-         if(m_pOptions->m_bWordWrap)
-         {
-@@ -287,7 +288,8 @@ void Overview::paintEvent(QPaintEvent*)
-             m_nofLines = m_pDiff3LineList->size();
-         }
- 
--        m_pixmap = QPixmap(size());
-+        m_pixmap = QPixmap(size() * dpr);
-+        m_pixmap.setDevicePixelRatio(dpr);
- 
-         QPainter p(&m_pixmap);
-         p.fillRect(rect(), m_pOptions->m_bgColor);
-diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
-index 31dbcaf..1cc62b4 100644
---- a/src/directorymergewindow.cpp
-+++ b/src/directorymergewindow.cpp
-@@ -584,7 +584,10 @@ class DirectoryMergeWindow::DirMergeItemDelegate : public QStyledItemDelegate
-             //QPixmap icon = value.value<QPixmap>(); //pixmap(column);
-             if(!icon.isNull())
-             {
--                int yOffset = (sizeHint(option, index).height() - icon.height()) / 2;
-+                const auto dpr = thePainter->device()->devicePixelRatioF();
-+                const int w = qRound(icon.width() / dpr);
-+                const int h = qRound(icon.height() / dpr);
-+                int yOffset = (sizeHint(option, index).height() - h) / 2;
-                 thePainter->drawPixmap(x + 2, y + yOffset, icon);
- 
-                 int i = index == d->m_selection1Index ? 1 : index == d->m_selection2Index ? 2 : index == d->m_selection3Index ? 3 : 0;
-@@ -593,20 +596,20 @@ class DirectoryMergeWindow::DirMergeItemDelegate : public QStyledItemDelegate
-                     Options* pOpts = d->m_pOptions;
-                     QColor c(i == 1 ? pOpts->m_colorA : i == 2 ? pOpts->m_colorB : pOpts->m_colorC);
-                     thePainter->setPen(c); // highlight() );
--                    thePainter->drawRect(x + 2, y + yOffset, icon.width(), icon.height());
-+                    thePainter->drawRect(x + 2, y + yOffset, w, h);
-                     thePainter->setPen(QPen(c, 0, Qt::DotLine));
--                    thePainter->drawRect(x + 1, y + yOffset - 1, icon.width() + 2, icon.height() + 2);
-+                    thePainter->drawRect(x + 1, y + yOffset - 1, w + 2, h + 2);
-                     thePainter->setPen(Qt::white);
-                     QString s(QChar('A' + i - 1));
- 
--                    thePainter->drawText(x + 2 + (icon.width() - Utils::getHorizontalAdvance(thePainter->fontMetrics(), s)) / 2,
--                                y + yOffset + (icon.height() + thePainter->fontMetrics().ascent()) / 2 - 1,
-+                    thePainter->drawText(x + 2 + (w - Utils::getHorizontalAdvance(thePainter->fontMetrics(), s)) / 2,
-+                                y + yOffset + (h + thePainter->fontMetrics().ascent()) / 2 - 1,
-                                 s);
-                 }
-                 else
-                 {
-                     thePainter->setPen(m_pDMW->palette().window().color());
--                    thePainter->drawRect(x + 1, y + yOffset - 1, icon.width() + 2, icon.height() + 2);
-+                    thePainter->drawRect(x + 1, y + yOffset - 1, w + 2, h + 2);
-                 }
-                 return;
-             }
-diff --git a/src/main.cpp b/src/main.cpp
-index df06eab..c62aee3 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -81,6 +81,7 @@ int main(int argc, char* argv[])
- {
-     const QLatin1String appName("kdiff3");
- 
-+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-     QApplication app(argc, argv); // KAboutData and QCommandLineParser depend on this being setup.
-     KLocalizedString::setApplicationDomain(appName.data());
- 
-diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
-index 894bc44..29d16ae 100644
---- a/src/mergeresultwindow.cpp
-+++ b/src/mergeresultwindow.cpp
-@@ -1970,8 +1970,11 @@ void MergeResultWindow::paintEvent(QPaintEvent*)
-     if(!m_bCursorUpdate) // Don't redraw everything for blinking cursor?
-     {
-         m_selection.bSelectionContainsData = false;
--        if(size() != m_pixmap.size())
--            m_pixmap = QPixmap(size());
-+        const auto dpr = devicePixelRatioF();
-+        if(size() * dpr != m_pixmap.size()) {
-+            m_pixmap = QPixmap(size() * dpr);
-+            m_pixmap.setDevicePixelRatio(dpr);
-+        }
- 
-         RLPainter p(&m_pixmap, m_pOptions->m_bRightToLeftLanguage, width(), fontWidth);
-         p.setFont(font());
--- 
-2.27.0
-
diff --git a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
deleted file mode 100644
index c9625b834e80..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/kdiff3 https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.3-hidpi.patch" )
diff --git a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
index a05eeb463c6a..82515f73d04b 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 ECM_HANDBOOK="optional"
 KFMIN=5.74.0
 QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
@@ -14,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 79742bf96dc5..2a4cf474004f 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,7 +1,5 @@
 DIST kio-gdrive-20.12.3.tar.xz 64532 BLAKE2B 8814a0b4c4eb47e69621c6a3bdf751a2491f44dd2a548b0e1ebad27f41d71955171264773eda0ebd5e76a0c5d7c138d4710d22fe69f20b35cef28209b782fec4 SHA512 d341e4af25b38859e0ec61dbdb4166982b107cf88eeb7dcc4b90cdeb2303dab6294f9aadbec3388a254352ba5bd3221bbde8f31d4b5d688aa7156f505bdff2a4
-DIST kio-gdrive-21.04.2.tar.xz 68164 BLAKE2B 853d0d12bde61e262026067a3e89d024c1d33ea60a38334f91aebb177c730358cab4f388d8d3ac5d429f17da5b56d1834c4d47a42c1dbe843f53c6c486c2bce4 SHA512 c302ddbf67b45a01aa45f1cd244c9431a40ad63942ec45dfb89ee58049b00f7608fe3b2014ee3f48b1102e9e4b8e1092c16cd5ec7b2e22338fadfe03d28d333e
 DIST kio-gdrive-21.04.3.tar.xz 68220 BLAKE2B ec8998ee779774cb2915e6021e9e5f25fb310a138c43f2aa0bb2240168086bd1a67272a9ec3d885916f5ed1f84b4f9057f8933aac85a760590b36ac108f163af SHA512 3e5ade6573375662161160b963120d4e09e315cf6318a47c0175f48353e5cfb3596e3e3ff2544817a5539a1d22f20370404ae5de1494227c77a6b565476182db
 EBUILD kio-gdrive-20.12.3.ebuild 1105 BLAKE2B a53ea18109901b805db3c2a79228543ad110e8bc58c81f36b4a9d965f1128d595bc49dc9e4214860345842e09747b81e4c1e1120604e5dafdf0036d51fdeb85d SHA512 9f79e761a312dc75dc89933fb66c3bccb2119855b4afa7a36ed04354e9ce363bcb0b00feab64e4f4988b02bc7e09fe17efb3b0784ae15815734935835de38d31
-EBUILD kio-gdrive-21.04.2.ebuild 1152 BLAKE2B d1d64acebe953500cc999ae9017783a00c038dc26411725f9dd798e8f489b37a92aaf1669b64c07cb86b23c5810dbf38ad6a8aea748e2c7edf100b015b4402e7 SHA512 2c69f3353d075c20c1ee55ae7dbbe7d4ea11e5db444f222a446a670c8686fe905fbc3f9478d09a1adf667859d6e2e1aaa83ee015b0491ce535d7036be443272b
 EBUILD kio-gdrive-21.04.3.ebuild 1152 BLAKE2B d1d64acebe953500cc999ae9017783a00c038dc26411725f9dd798e8f489b37a92aaf1669b64c07cb86b23c5810dbf38ad6a8aea748e2c7edf100b015b4402e7 SHA512 2c69f3353d075c20c1ee55ae7dbbe7d4ea11e5db444f222a446a670c8686fe905fbc3f9478d09a1adf667859d6e2e1aaa83ee015b0491ce535d7036be443272b
 MISC metadata.xml 502 BLAKE2B 95ecce641754a55e79c1f538be2456249521c93364cceaeb4f1bf294a8d8de741a01468104d3cd79f6a5e416d56501aa0dd277816f8d222dd315a8ccfc906649 SHA512 27f14ba58189b06808d64166ffb62116ae7aed51f0e893c0f103b5829f7dd17b162fe2db207f7fbefa733e8fba324fb4fa638d50ca6afe0bc0720c6b15aa3995
diff --git a/kde-misc/kio-gdrive/kio-gdrive-21.04.2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-21.04.2.ebuild
deleted file mode 100644
index 6d48209f0558..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-21.04.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KDE_GEAR="true"
-KDE_ORG_CATEGORY="network"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KIO Slave for Google Drive service"
-HOMEPAGE="https://apps.kde.org/kio_gdrive/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+kaccounts +share"
-
-BDEPEND="dev-util/intltool"
-COMMON_DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkgapi-19.08.0:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	kaccounts? ( >=kde-apps/kaccounts-integration-20.08.3:5 )
-	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	kaccounts? ( >=kde-apps/kaccounts-providers-20.08.3:5 )
-"
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts KAccounts)
-	)
-	ecm_src_configure
-}
diff --git a/kde-misc/markdownpart/Manifest b/kde-misc/markdownpart/Manifest
index 82c09fe6c6ab..38259a665004 100644
--- a/kde-misc/markdownpart/Manifest
+++ b/kde-misc/markdownpart/Manifest
@@ -1,7 +1,5 @@
 DIST markdownpart-20.12.3.tar.xz 26720 BLAKE2B f382c532c3fa88ea4a9c6f318ca1e8df1cd546a46b7f59a8b757000279cb908ba5694397be5a761ee1ee6e9db52c6e216e725d7f90dce61ffceda325abd95bdf SHA512 48f1ab4faf2ff006c98a5aefc6958fc6701abe43b95af5550ba378ea24390b3fa5a4d9b3f3a5ddc319bff1d170f8e073ee505acc8a9797df7b485d87b0efea49
-DIST markdownpart-21.04.2.tar.xz 27708 BLAKE2B 9e0d9801d90f22304bf5c6ee1f379df2b3d49e1839a781c0236bb92046b5abeecc71a46a932977f1800869d2aaccac688db89328b7ea58e7bf7609f581911d85 SHA512 2c01db03f9d475440e894827b2ae4148c90b7e9d8b57bf6eaf07ab161175de5daf7895e7909d393839fcd2ed6cd23b987d19bea9a062feea920e807d251ebcc7
 DIST markdownpart-21.04.3.tar.xz 28232 BLAKE2B 8d84bfc7a53a7b3ccdce5547f6bb19b7f0e492c4c12ca085acb9d1e4988d357dee30d963b06e7d8e5db92a4f8af0ea5310788062858f0cae76f93bda5b7c202b SHA512 c32f5b74e3dc0874a8513f3cc48a09358486f206d80c952b0ccb33ffa37ac22fafc61868d1fd643432c5a6a64c2263f426e78d5c34fb434e35b766c7cdd6fcb6
 EBUILD markdownpart-20.12.3.ebuild 715 BLAKE2B 0f4466e5008c59b61a5a204755235a98cb6b1224b25fd853d02c2a54ce224e1e6559a9c825a2afdc6499884d858dc919459fcd1b5fd05736e787a28b7afaf6a9 SHA512 2a890c407458bc20d445491bee03a697a751d515372ccdb4f0635a5d418023730fa603e9acf22a96b895e6b7c59558f747bbbb00a2ec7e5499b260b815c101e0
-EBUILD markdownpart-21.04.2.ebuild 707 BLAKE2B 46f8abdac186f974d4db1b23b37caca8a62409a77ee9db2ee5b7b8ed045cfe441acdf7437ab0f5b55846b55198b7b4a5380b14c7f0166759a0426e99892dcf2c SHA512 9045e862d978b011803d6d09d2817f892bb5e387cd33e4547e9d70a96d1470d0ceed7a63ccab8defe51e55b74f9e68a7a61695cbb763840bd487b7d8d57bd1fc
 EBUILD markdownpart-21.04.3.ebuild 707 BLAKE2B 46f8abdac186f974d4db1b23b37caca8a62409a77ee9db2ee5b7b8ed045cfe441acdf7437ab0f5b55846b55198b7b4a5380b14c7f0166759a0426e99892dcf2c SHA512 9045e862d978b011803d6d09d2817f892bb5e387cd33e4547e9d70a96d1470d0ceed7a63ccab8defe51e55b74f9e68a7a61695cbb763840bd487b7d8d57bd1fc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/markdownpart/markdownpart-21.04.2.ebuild b/kde-misc/markdownpart/markdownpart-21.04.2.ebuild
deleted file mode 100644
index 01f8b8802d15..000000000000
--- a/kde-misc/markdownpart/markdownpart-21.04.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_GEAR="true"
-KDE_ORG_CATEGORY=utilities
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Markdown viewer KParts plugin based on QTextDocument"
-HOMEPAGE="https://apps.kde.org/markdownpart/"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index c37aa0163fc0..48aa61a82d3b 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index e0abb2ee9150..aa94a83c70d2 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,8 +2,11 @@ AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
 DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
 DIST mutt-2.1.0.tar.gz 5405519 BLAKE2B cb7c08f6a27376abed26a208f7c3a756046cfdf40967dd8222aec3655e33ae85e2a450ddf98ff454601b19e6672c1168a8d19e479f15745213dc971e250de688 SHA512 b4bcbb9d02712f211e2cb1542e1e8a5e09648fc22f724ff771f1e99d2016fb258d64d3384740427c9fe731cff8817f633f0034329ad2d7dd505b0689ccc9499c
+DIST mutt-2.1.1.tar.gz 5406187 BLAKE2B c27bae8d4a050026282cd373e747d6406cbbc3c6bbc3f2463580ec76ad104629e6429d68a70f59e570c9b2d4b53c8a92d767fd53746e251a0713a920df5c29ff SHA512 8ae69353b820d97186996aec83a77722f4e0a45f881e1893ab93a2f183baf9087c0d3d7ff0d1596853617be27670cc36a2fa88b141860080e7ffd47d59ddb1a8
 DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
 DIST mutt-gentoo-2.1.0-patches-r0.tar.xz 25928 BLAKE2B 8b16e856ef4c19d5f9e10d747390f03b3b26619671999ef9a39c222496da9976fc82362f15168dc1913480dbe1ffce33847ee7df1d6f1a1df6e8fff2697f3c45 SHA512 8b95be60b8fbbe9c1faf861e483b7627ccb2e5db97c6b18c6017d5aa6bb3d49b791a5c2aa3bf1fa2f1342690f5c81a887f4fbef25fa7d649cf182187c15fa663
+DIST mutt-gentoo-2.1.1-patches-r0.tar.xz 25880 BLAKE2B 21092f17f7d4b96c9f7b50afc620995ffae0cdb382fbe73d91252105db0989bdb9208e48d031e127fce2431e637af537ab216bb4a1c6c20b402c58282ab93dd1 SHA512 69ca83a62b2b8a7461aae4f1e78cdec3b315d635716ff89f9a37db36fcf57b5323d459c9ad4885978018076118da62901a5f79ac29709e9e7dfddd2570c90c64
 EBUILD mutt-2.0.7.ebuild 7867 BLAKE2B 90a99efa6b98975bfb2b82407f51ba8187a780e780139f580d90ba8294e4defafaadb7c0b326eef89b9b3ce7e26c8c738a5b90dbcf2ac5a8b3736c8f938342c7 SHA512 48c0ed350e53959f5137ce975535bdf131801578b2c269253b470affce3f6adf2ebce823f708d05ae969055532ce06402d6f55fc2ca2e5cc8069fb5df3d100ee
 EBUILD mutt-2.1.0.ebuild 7873 BLAKE2B b6ab1e3636ecec7a053f204ecaac1760fc8cddf4e56f2f8e8f7ad036e99044e35c30c995926d8e0873c0ce99f7a660e6fcf7dcc403b5b151dc86c17ae228bed6 SHA512 0d222627a66716790c1b305675b6bcf0b756b1116825262dcb22d0fc5da1f176228f04ab110fe1d1365c974482b078aa94d8f5f0c5cb63e776faad34d86e23ee
+EBUILD mutt-2.1.1.ebuild 7873 BLAKE2B b6ab1e3636ecec7a053f204ecaac1760fc8cddf4e56f2f8e8f7ad036e99044e35c30c995926d8e0873c0ce99f7a660e6fcf7dcc403b5b151dc86c17ae228bed6 SHA512 0d222627a66716790c1b305675b6bcf0b756b1116825262dcb22d0fc5da1f176228f04ab110fe1d1365c974482b078aa94d8f5f0c5cb63e776faad34d86e23ee
 MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/mutt-2.1.1.ebuild b/mail-client/mutt/mutt-2.1.1.ebuild
new file mode 100644
index 000000000000..28cffe8c94b4
--- /dev/null
+++ b/mail-client/mutt/mutt-2.1.1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	smime-classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp ) )
+	kerberos?         ( || ( imap pop smtp ) )
+	autocrypt?        ( gpgme )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+	virtual/libiconv
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	autocrypt?     ( >=dev-db/sqlite-3 )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime-classic? ( >=dev-libs/openssl-0.9.6:0 )
+	pgp-classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset p
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			for p in "${PATCHDIR}/${patchset}"/*.patch ; do
+				eapply "${p}" || die
+			done
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
+		$(use_enable pgp-classic pgp)
+		$(use_enable smime-classic smime)
+		$(use_enable gpgme)
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--without-bundled-regex"     # use the implementation from libc
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /etc/${PN}
+	if use mbox; then
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# include attachment settings, it's mandatory and shouldn't harm
+	# when not being referenced (index_format using %X)
+	{
+		echo
+		echo "# mandatory attachments settings, not setting these is a BUG!"
+		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
+		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
+	} >> "${ED}"/etc/${PN}/Muttrc
+
+	# add setting to actually enable gpgme usage
+	if use gpgme || use autocrypt ; then
+		{
+		echo
+		echo "# this setting enables the gpgme backend (via USE=gpgme)"
+		# https is broken due to a certificate mismatch :(
+		echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
+		echo "set crypt_use_gpgme = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# similar for autocrypt
+	if use autocrypt ; then
+		{
+			echo
+			echo "# enables autocrypt (via USE=autocrypt)"
+			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
+			echo "set autocrypt = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
+
+	# nuke manpages that should be provided by an MTA, bug #177605
+	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+		|| ewarn "failed to remove files, please file a bug"
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	fi
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 81037bea58ba..803b5a288a3b 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -7,6 +7,7 @@ AUX thunderbird-wayland.sh 118 BLAKE2B 7ae701fd21972d3b67f94962441e37bdd04d6b71f
 AUX thunderbird-x11.sh 112 BLAKE2B f62f330ead8aa425d614249f7f968078def08f851d2529005cac6f0bb9257d0ffd6bc15e200b53283106a2739674c1d0cf900f6dc4270138281bcc7666b547b1 SHA512 24490cd7c9dbd4d04124f92a5cd523fc0c48cff2d7f37cb2492bb6644a986da7ff05e62beb744fff1187f991c6f3edd68474ce6cbdd8ea34479bce2c2ded4406
 AUX thunderbird.sh 3178 BLAKE2B 5219498d7dce79cff36ea440ad01dfec1c2ccf3707c4855aacbb93da8b429d5bbc109a8b593a158e6128082b7350660100c2fe3aac48c7de7e033a298dfb704a SHA512 e7963afb9fa57a33980d2a55b630736d4029fc9de2f394f498eaffb0787b5796268f06757728c3f2d93afb5494b5088b7cd923f24eac4615c57041b5799b85f6
 DIST firefox-78esr-patches-14.tar.xz 82976 BLAKE2B 08cc3618c8069f4169b7647e7eb699153d558bb89f8a4f1ed74d5ccd339f77119cd8f253df011f0c2f255ad889b65e843171d7559f469788463ca7e9aa2e96aa SHA512 1611c6f9d2c7d586e7b53810c1cfdb2682f5d289b1b019b71694b1ab2d8bbdfe827a73cfaf59f7e4808c0b90409ca4fa57e27655d8cdf0c578ffdbad33659f26
+DIST firefox-78esr-patches-15.tar.xz 65604 BLAKE2B 86e421e555ffd5f7f201d0f1a1c446c649739c67cdf8dca536efa115e09d9c357ce1551b7270c77e8bfe7dd53e0f3e6386496283879cf5e0c59b3c864951ebb3 SHA512 b229e895f083a0404cda1da0d8ae937429d5975ac52ab20e8b15611d9c737381a1076ebfa8c8a127dacac0e12a2a905ffd579facde2d80c6facc911e5739e34b
 DIST thunderbird-78.11.0-af.xpi 548343 BLAKE2B 5eb0f8bde98e845046980bfa098b9749113cd4a95cff2ebcf7d387769bf407fb4f59926fea905dc293f916a91e0e0aaf78e1f4b2aac60dc1a38684a7293bbbef SHA512 2978a9f8d81d936495207e9ecd45e67e9073037ffb9481e5dbfaa73a776a7787970bbde9ba9790c6ad53998fa391d251bc6b8eb5a3a04dd3bae791b8b426e73e
 DIST thunderbird-78.11.0-ar.xpi 648611 BLAKE2B d41906f09fb0522199e74ac0a7823f3769e23fb310c9d62a0332d288fb7cf46f7d1d97321f4cba6fe03b53c5e254e2ce27cb8606c58a9c1559b152d2be70d681 SHA512 595415279e9f14abc678d652bb58c3b7a5b4907dd979b86320aa4ea5c499bc02034c5fad4ffb388719ac8795923e9eb7936f9700b5655457cfb3942fddf6b821
 DIST thunderbird-78.11.0-ast.xpi 561258 BLAKE2B 156729fe4b59c1594c35dc4e1bf198638cf361a679a95470fe495833c518c583abfbd69f358bba04f2c58d5a0d941603c969d640f9c18a26126a78f48e9b64d1 SHA512 d5821cf2aba5c3df1dac2d4310ba77aa7b5c1a69067216404944eff8b06bfb4eab2816aafbc490cf365c90aba850e6766092d9ae96dfb74ee9bb0452b591c21c
@@ -72,5 +73,71 @@ DIST thunderbird-78.11.0-vi.xpi 674611 BLAKE2B 67834c7860979a438ed61056080b32c7b
 DIST thunderbird-78.11.0-zh-CN.xpi 687183 BLAKE2B 9a18986ed58dec976e82f533a8a08cd6f374f20f3fe016ca8dff71fc01be7de0cebeb2cc311791bd41cee66f53f8f275a16cec376efe70848cb761daebdc87db SHA512 53f81f5e5bfd20c3a6dd144d780e76016a58c0c60c034e7b7738a81d9ee6e702652ea8fb3e40861918e7606c6159ed09dd2e6ad7522a1d25f6c648fcc6c908f3
 DIST thunderbird-78.11.0-zh-TW.xpi 687626 BLAKE2B 4822fd23fc0864238bbb85742fd9f9ce6a9f13384270a738d95f33defa5b07f453cd490d9df771a8fed594007512e40bbebf3434d29dad61319b35230d0e7229 SHA512 95eaa27e5877a3203ae0976bb349b38fd3d6ec0b44e0cc333e2573877d5482897d5ad4c888d8947c6d55ab3e6c2e17c21fe69c3aff3d3c81549e8f19918c0153
 DIST thunderbird-78.11.0.source.tar.xz 352417996 BLAKE2B 8c8c972df68468a13c33526d076f40b02ef2b1568ae24a3b496cfca65647ff079c27117092c3e856f4b8ac535802619f7f01e14fd2804a37586006c4f6a12158 SHA512 c669439ae671a0a589f69902cced5685b8bab346c0ca3eeabd58d0449af338fb7a7a9189d6c2ef784f660c32278fee70766169d91293447eedef2e18a84f116a
+DIST thunderbird-78.12.0-af.xpi 548341 BLAKE2B 5dedd311ca5b467353cf5da0dd7b671eaafef8f7828abe1aa917003b38174fb6bfd6fa5efd6509ed14604477bb2e80a6691aa83ba2aed060295e51330f5d50df SHA512 ad216562bb63440c0728177f73d853994d2b395a13fcf9f7f20ddc81226b9747c407368e843d42aa60c09d1d8489aded879c4080022463346fe5b489ea1a8d3b
+DIST thunderbird-78.12.0-ar.xpi 648606 BLAKE2B dc040d99fbc37da4533c6a9a62204233544f2310b685d353ee10277410c83b37acde3aab8193475a470fe955eafb776c05ef833d7c83a111180b11f400113f6d SHA512 cee52db711b68ac973bf07678c35d6d3a130704e3206f811a1331d165c5c421f61030b589b95f412955525ae3cd9a0381a241692870db4ef6d557df9c289cad0
+DIST thunderbird-78.12.0-ast.xpi 561255 BLAKE2B 28be146998718180da9ef397f7a7ddeb7799d1906b142ab1868e2e6048d1d38a4b5a583d2f51b86d7f688e06e6c3c45593882b580ad75a4bc0637f2fe88dacd6 SHA512 794103871e796a14fa7f6d1eda7058f1d3939692ee2604c79b4af744735fafb934289e0d95abf6e62eb82e8e8836b8ed7a74253b99b2d0bc68f0a4224a31e1ef
+DIST thunderbird-78.12.0-be.xpi 666666 BLAKE2B f779ce4759ebd531f47df82e600955445d2d3bf7d17fac11d9b63ecfe257c250154d3afebf9083023f87961cf0e3748ad8457085228b83c20b546daa2b2c332a SHA512 22cc5dadcd8b874a80be261c2989aff5d414e911bac8535bec860aae622c8ebe9d21b8c376edd4d09c983893eebafa9936e581cb173f1b931d7e9948c50e4542
+DIST thunderbird-78.12.0-bg.xpi 672416 BLAKE2B ce6bb67eb105547ac37e60ab5697042a333f2f14bd752e428fc8465258500bf7464a47dceda543962b44b82b18f6f35c9f88be56acc6355da5b583f3be8d9a8a SHA512 b44a72b40ba074c9374a7c30367a980c40c01132ab435e22254668425fbb1377ac26cfdccf3432a4ee0c01c91ba5017acb85a23ff52e81aea9577fd4e99bea7d
+DIST thunderbird-78.12.0-br.xpi 604530 BLAKE2B 0216a812b9ab106a6e21b0c1b761a3e8bf592bfb8b8c5ce039d7bfadde5f235a6601a95b8e6c8e6872f374ce8133e10dcc2c1b8b1f81e2d17fe0a84d89a6f920 SHA512 9afff6959b1ab88dd09540ec9bdefbe4a34628160411086aed16f262a2e77a8788e8b23f7894f0f8996ed0438e7c70b09ff84542d297c4eb0d48a06f57626390
+DIST thunderbird-78.12.0-ca.xpi 620447 BLAKE2B 12eb06d36e05a6546e69c0a301dca782c75aa58f5d2c144b63df042f66425b0156bc506ef4015cab87bc972f0abd21cc5f61d5a1dfb6a323d25115bbb5e6ed4b SHA512 4649036ceb3993a18ee76cbdc8077026d1090632559d6028a7d3118e1f57c82741569ded816fd8cf4a9013cc9f6416f6a63fa11c89da973ebcb338e3adf40dcf
+DIST thunderbird-78.12.0-cak.xpi 635649 BLAKE2B 8c9b53c7f3770fcac2f3d96cb444e8ba1a12217c319347a92c3a748b728c817d48b165f792f0b0067856f89cd205701e44a60a02fb3324c868374f6144e944fa SHA512 bd779de2c98c8807a7dd67ad131e8c25f96aa45fe41fdb306c15dae90122ecbf37cd08a11edeffb44a6acc5c5d997f4b5b862f18fba82afa9ada711823281013
+DIST thunderbird-78.12.0-cs.xpi 635334 BLAKE2B 597e7968a0f9489a5debe06257ea3828dd056ed31b1c399b522f68c02a0228af625e2328bdb0897bec30a91385b4e0add06bd5d6ce08628a92205b749025beee SHA512 24ef2507c9088234a6fe977a676d89a96f569a0b458e01548fa408226d41b4c56acbd164c6d665817fc99ec485c0ee076ca884eb899a3e845036bf0e8ff6f974
+DIST thunderbird-78.12.0-cy.xpi 646245 BLAKE2B 76332d4b0d7a9f80aa38fb8d1de1255f0a7f487a99cf994f3fd359b857db8550424fd14049d3b8093073ad19e37767e8b5c73638b6b110d38a3aa3b930892c9b SHA512 a93a04a79ad9569f87972654edcb81afa577f1d36de7205bafcddbdce13bb4b1938021a971e898125a61c3681a833e4f19071d30f48511f9774c7e8751b4f244
+DIST thunderbird-78.12.0-da.xpi 620991 BLAKE2B d8243cc572eb7c8892f86416c01feef519d69ec99e2b77b978c4059387721dfead1a64e1acf1e4ad968b6d7ceda359707eaef68467c22957dd54b768994cefe3 SHA512 b403ee1d569fa3a421dda3fcff783ab68e60353c2f7c6e14706cea06b2eb48c6883877bef459f7526bd0ce23b12cdb3ecae244cea08d8fa7f9e58cc9eb68a027
+DIST thunderbird-78.12.0-de.xpi 665195 BLAKE2B a6b01256b21a90b8bde863bbaeea9f37ad15101bc62993e8370e5ec6ca0a3364009c1d5ab50714c6bbd20d7c5649b8061eb4d56fd916acfd6497af868f702de0 SHA512 ed7e313a627a3f7053ecdf2c7fb85ae4fd905341d425823d1ec81414bb86d1a5267e3f3b4ea553026b834bb8c360b83e5ded3fa812c84aed277c73b88b9b61b1
+DIST thunderbird-78.12.0-dsb.xpi 666771 BLAKE2B ba3ca8c76320ee207164ea1329295f558ad8704815e0e35b0941c98424771ce9a25f30086a982a65ecf48c546d20bb8a03c7f1d5a7cf9757ae1441ca38312f8f SHA512 e201ef978f79856da43ded4aa74e3fd26ecd18583b4ae07067c37b944f8eeae73a6ed202335fbe5c36d7dc3a29597d1d16ffcd8a5233cf41ba753b2b8cc6d56e
+DIST thunderbird-78.12.0-el.xpi 774462 BLAKE2B cd2558c208c766eb4b79360db74be6f809876797c59cd8440ff2ff9d5dee7a3b5bb80fd677897a6ef20d5df0362433bfbe0c20351b165697783e47b0f31f1d4f SHA512 8b3e4870af11641b00f31f0dc884b687f5da4e1bc927af1381e0a1e40d49a1c0bca7e08183c1e05c4ea2f03d988d35d626988639e93f53313e86935ebb701f59
+DIST thunderbird-78.12.0-en-CA.xpi 611766 BLAKE2B 8d55f1d412d2c4115fd8eebb262d56ea3e27558a4d842333e7953db0b522e430687e26eff9682d7ccf189063683d7fc3ff88fabbeb172a00881a7d66106cd92a SHA512 303c836c45bd78253454de8be5b3ee5b071bc590c07aeba75b922ca6340b102ef0416e13f80b00bb57c14a52797da35943fad8c8a1cc7b00b0348bdc789fb213
+DIST thunderbird-78.12.0-en-GB.xpi 611188 BLAKE2B 917f71d88149d9d3105cf420259676ea429abdbb77272101586e653f323503a5ded821e90ce4526716e3495a765ce94f6c668f1f220729e5e48ed92e1191fa01 SHA512 a160cd78c4d81efb70f1e6922b47f89c109c3e2e4d5378ce86bd84f489aa4ed259ff40ef0eb230783c22b9e29eb0ccad4bd5938cc9fe9e7b2d0e0af792b8bfe7
+DIST thunderbird-78.12.0-es-AR.xpi 657791 BLAKE2B 0975d14f7c58253305dc8a4196ba23f937869f0a3e623b3419088ac30b9533c96bf689bce1a2a2ced3b5b602cd731f05f409f9e9ec701333778725c4e8d83e21 SHA512 c6bfc35ec87f31efdf137ff914fb17f95a977cd4dff7b0255106765d2a0904c03eaef890cd1b76bc0d7a3179e62ae272ecbca13082b59bb0d53e5e4ba391be28
+DIST thunderbird-78.12.0-es-ES.xpi 569800 BLAKE2B 2b0753f93e3d78a6ad464721fa491def1d6c9e17f076d61bc138f2241ed224ee9d5fe8463329f8c6749b3ae87f7d0642d49365a8cc22404352651e4d18967c19 SHA512 1773ae3944517670de63a27f25db89d6305ea11d05ecbc09e3530566308157b9d598d341cf058180facee6e353b48b434ecc33e188e1298bd15dfa599b87e2a1
+DIST thunderbird-78.12.0-et.xpi 597732 BLAKE2B ecec79401ce9154785b10fc645537d70422f9ecda03f97aed3d620c1edb3493a8d3cd9b85c794221c074cf8be3bba8e5015c3ed869a62cb5f0d662540b9ca0c7 SHA512 3dd3aa437a74adfa85573dc55fd74de11905608bb7f685b46f9f0463313849a087924c3f465d98c48f11ede6e077778b2a1bc26f560bd88642b779ae1730c5ed
+DIST thunderbird-78.12.0-eu.xpi 632956 BLAKE2B e8859b5a902f85f55ac4ac20948e9c99648f8f674243f52ce5e9e6c262d29ae8b209b2e43de8cf09423ea19c6caa8c31ce0280a6f1f3ec52841020dc40b654e3 SHA512 17cec1af1ef047133c47fa939c0c54d977eed0f0031b760552a0d2a48744350c7e5800daa6735d3393679a99de1bb660a195fe2501befc1cabca3b857a5da9c1
+DIST thunderbird-78.12.0-fa.xpi 639749 BLAKE2B ec0703f0a439e673c071aedf0fa3701a42a18e92e4b240a961d6737f10fbfeeca4195739d897fb409ffe41c66679dacbd55ebe867289f22d187ddf703f348e51 SHA512 2a75a8a5b77c766455d7f1f7d9e2ebed77cb0f13bc4b84947fcaefa9d281235bcde5856b5e03a7b2c6ddbfe2a91ca120d103a321de74b2f9f9d27d4a6adbba9a
+DIST thunderbird-78.12.0-fi.xpi 642447 BLAKE2B a700a866f92990ba10d1f41622a615923bc946fe50d763a974e01ce18ecf9b9a7a035fc522eb18fa197ef488dd6d3dbee21fd918e310fbf3c30fc1bd8ad5edf7 SHA512 c93a2a6481a2a22bb642c37424eeddd5ba947c3071437b0f11ed8a3727442bf041b98e162f4317c342d82e809f9969756bb20d0308080903f77b9438d2175afc
+DIST thunderbird-78.12.0-fr.xpi 669495 BLAKE2B 31b6e831426bebcda4546af9497841a7785ad6d79a2e976486097e427de6a5f1f5972fc0c56f394ed848cbd79c1b851428b063742e53e85770e7c75a7f82b586 SHA512 4f83dbbcece082179fb8ddaefaeababf166c84b409766496fbe5aaedce89c0769aa7563c3c3d2f3e252f5611434265ea3a5bd892234507b341fd98050a75e45b
+DIST thunderbird-78.12.0-fy-NL.xpi 653076 BLAKE2B 371bfd285be80b7b161a1f275337242fe030842c65e2f5eddba2b7f43627d9f2e3135afcd7e622544755cc73702be3096d6dd94d26579b9efbb669fb1f5c9858 SHA512 1515ab20583c13c71abed588f6c9a6d643ac93b35b25b2f4efa18c29a9788cc19cc72c4172cd14b3181f81b436a6207fe98bd1ddb9726675ad6c3c35e65cdf8b
+DIST thunderbird-78.12.0-ga-IE.xpi 600707 BLAKE2B 1664114aeb2d970c5ab4c1ff5846cfde4e98d11c8e04c91669da50b0c91e9bc2894033c3eb37cc855055cf9771ad1c6b7c42ecb0e5237b884e5b08110468c633 SHA512 d848d9f089b2722295a72089770946e03a9ef2ba65a34f91c727ee628292e319447a0fba530ba074bc6bc5fa64ffb87eb29a973fe29adea37185939674f02ffe
+DIST thunderbird-78.12.0-gd.xpi 609378 BLAKE2B 688743f2f44f1a36aaff00099be3dda2879ec4f86f3a0b05ff69d8594b47cf8fa43503bd5035561cf5160737a4c0ae3cd3687a40a8025bc0cd2ce4cd0a05cd2c SHA512 6fdcdcffe3f8eccc77fefc2cba08a360710783528631a9740363b5100ea65358bf5909ce36fad84353361eb4931de098f944037e7462a70562bc839a44e0e9a0
+DIST thunderbird-78.12.0-gl.xpi 615717 BLAKE2B f10eabecea1977bc945208a1217915d0f8ab7924027b021bcfac903a9ccf4a9ba1e2bb725373992c7a554261696f0f166dcdbad543ea60d2bd8f34f2e34c2b0d SHA512 f22dc05c9753ecea9d7b30d6a0e8669769b7872bb7597bec02e96bbe799dbecfe564d18c819cfb8dd5f6fe8dc7a0aa9c40a5a20758ae1a19fcd54a52b23f8514
+DIST thunderbird-78.12.0-he.xpi 640492 BLAKE2B 28cce0142a41ae3360c5b33dd94b2f9ebd26751eaefc8eba5b00358118868b7a34f57aeb66757c39e3fc3c9b60c01e1f733a63ffe57510fdbda5f211ce61aa5e SHA512 f6afe9b99efba3b63a5005ea51e19c096f2f93b0052f5aefc51e1ee4b3b6c0ee6688edf3ab6775f37291fc4817d67fe739ada806e52d2a0972277c1ff73a9113
+DIST thunderbird-78.12.0-hr.xpi 629036 BLAKE2B 450f7c08f3f66285eda5db5c2cebf83d3696be337708bfb70988d4ba32860aecb197260b64644c29e0e1c3bd1ba750c64fa21e703906f3be7b13341668aa5a91 SHA512 0bc63b28632a95a02e8243746c422cc9c2a0321beb1a82fd1a739b8239b50b2f3fb53df9c413d462159b1f1fd6e168896c1d1c0f84917984c59eea4ece88aa2c
+DIST thunderbird-78.12.0-hsb.xpi 668603 BLAKE2B 966cdee5412bf6878b00dd7d60b1edcde38c833d23d8536da1ba52d96180b27d27348af29058fe31e47ebf745469efa6e220e4fe6bf0660c1042fb1a5b3355c4 SHA512 f513da01bea460b559802df74990b0e341022d21bce4faf53b6ce3df592b583ab287ffcf20165565f5b6ec3cf3e4ffb2a7c06229d619500cf0f7375f7d4b4ab0
+DIST thunderbird-78.12.0-hu.xpi 679845 BLAKE2B b7587a510259a800340a51144835c7fa0b5854288a01a05b7a16218f810e978c6ca29fe2d4793b92d6e908d335cf345f5f4f3a269140bea31f35f8ed6cac7010 SHA512 5df87277f434a0550b4fe5266970a214546e9700330cab9f4513160652eba7c6b1e9f21d4e3250259603b3aeee8fc9ab7566a91712168ea26d2e92f900b8d378
+DIST thunderbird-78.12.0-hy-AM.xpi 713331 BLAKE2B 962c0f9e291d62f4e9e03cf60f94b8859c1dbb9d6473ef5459e12dd476052776fdc77ca4130d8949f5f9ebfa23df12a21e623001de53d844a2e05224d0ec5a59 SHA512 1df267399a55de17cc460f4d68951e55f44e0a927d447beee42c1fa3ff3360662a36a31a83cfcac5bfba91c9684ab5d8e7e1bc6719e52e04633776756d600044
+DIST thunderbird-78.12.0-id.xpi 620668 BLAKE2B 7574be8c5c6bedfa399be8e7e08371148bb47e9def406f327e8642bb21dea2638aba780787ad8ae9995fd567a2677c152d76c78ffe4402b8aaa536414a85bab3 SHA512 962d7d587a0e0391b3c6547272f96bbe7af10a52d54698859344929bebe214c589894f9c1687368ce1f06e86e9589a91933f4f65aae236c54491ba5ec30e2c57
+DIST thunderbird-78.12.0-is.xpi 581642 BLAKE2B 01228339e4e597242f0f29b62dfafc3fcdae6e433619ea4e95c53bddf08633e54d4378c184b57dcf3ea879c2b850f11a0fd6977fc9f38eebe0f65e33080eb31b SHA512 b0e276be33de95eaf813c3c0eb6df7e176f562724ef62de2de3f7f7685ed0f3bd50aba163f17ef8cb907943a76aac55ea7980caed5ab6e9f7d900789e0711bb1
+DIST thunderbird-78.12.0-it.xpi 572961 BLAKE2B 0264c88e73c6a91e6d9b1b207ef09100c6bcd696e30afca33fb05fa3d953cac0f3c88af27e1c623ac662cf3a19b5f46373c38d677f239d9df90f02bfe0973845 SHA512 46e06597f04b9d9ca0788c84fd3cb7a1f30b401c4874204c6f94a546c3f7f7a98989910394a8c4683c1786f6c72a85682d97d22c9d3c07e0d703047f1091418b
+DIST thunderbird-78.12.0-ja.xpi 722455 BLAKE2B d607d69414162cebcedbcdd53d7ec3e0faeb337ee4bd6be48da2c7bd92b8512f3f129c40613b6fc2ea455613844214a13f6e299bbc5513a42b39b06c9d8b01ab SHA512 27289117e1fd59b61af5554246a6d29b0aac877052c76d824fff9bdeea47d7431fb5616b448a35ad27743638ee9afcb33577a5f1f950b8bf3b52b2092547d477
+DIST thunderbird-78.12.0-ka.xpi 717014 BLAKE2B 34726a602db60680fa01e9a0d400fbec0615ea87633b2490f39b998e8ed590a95817e8a17843a9434900ce80321629e77f2bf6d4c77f00e7b2247e5b34852b9c SHA512 b0eb79289e99412b27cd545f51487d9dd4a2529ebbce8f14bc5a1ad6c6881ab0936a255e284f5f4e2376f123432abc9df57408685b291a1b34176f5c8fa5dd7c
+DIST thunderbird-78.12.0-kab.xpi 651924 BLAKE2B f71a055abeb7cdbc6a58affa49982e281c27a24096fe5c9de1591eab38f468e073bae146634c56576c83938e09c5db3286125debe993a549041698f4beb707e6 SHA512 18d5626f23f58fc742e723ae2d279a831ffc01055df70f431307054814ac67969950a07301051df7fe02a4de87c6ebbbdd7f7b8e7ffd0705afb68de2e1d7236b
+DIST thunderbird-78.12.0-kk.xpi 720474 BLAKE2B 461d00af75417c6ac8c4c31932914a8a9acf3601aaeb786546454168a6bc2b2af57d771406dd1a9dbee5ed8b82bb6a25c38d55e7bdd3748380099ee43dcb39f4 SHA512 17fe790b34ae46832556df44acfd2cc690bdd387db9f3730b58057c2dfb4772734ec1cd65d892399e94a405f8c3badb057cf1507c08a317efe78e6bdc61244f1
+DIST thunderbird-78.12.0-ko.xpi 688205 BLAKE2B 447f5471660ccfec871eeea1fc16d38c5f227afbb88e32b674e0f2579daddb8d61ee5c35466dc05ff6b29090e8f4ce71c117adc2fac634601c41efb8fb608529 SHA512 f4b6e9e931f623d284a3282280dde329976e38fcbb718c53d6899c6b35e0746ce76cca004dc00446c4ec57782b03363225063eaf43787d8e3312a8173ef38492
+DIST thunderbird-78.12.0-lt.xpi 660288 BLAKE2B adc21d6eb5c5d2f07db06f463d7ea4d6cbe97cd9f345b9ef1b7bfa6ecb084e7182760c208f4186ec1d65773f1cd271f988da6c312a67fa729b48f50630670ce8 SHA512 0fb44f2ac7944ae633552215bb87cfe55cd9df6e08d1c512fc93df58295f5282d74f414bed612fc9dd3850b1930e478925ead44fa5af79aaad39fc645841194f
+DIST thunderbird-78.12.0-ms.xpi 572179 BLAKE2B 3529a35319af9705cb1a4d8944699eb6c572365c7da62793f676af84ef317da10165f45848e6faf91eae0cf5a90d447569b0ed2f44daed17d3636eb1f0965b81 SHA512 d78ad3ac193e319846cd9924a0abfcc5e7aae1c71f19fc554a027f14650cf86ad0169f9fe8b3876d2e812a7c169b50e6bd9d85f91202480a9d22c871ff945160
+DIST thunderbird-78.12.0-nb-NO.xpi 637230 BLAKE2B 4ba60de98b67130e293addd759d2d1684d781c39e427839ac193ff501ba749bfe6e4a7a9fac7e511e820233e0f5075ba656f70ecf1d7b49c3d1d930556e63d43 SHA512 ddb65f9094e9faa5e6924603860d490402226b70e8ec5e06bcb9db8bc93cd87a93023f8a73a0bee3744d09ca90d8459f07b968e39c5b9d8827e5b75e4f656b17
+DIST thunderbird-78.12.0-nl.xpi 644355 BLAKE2B 21c5c216720119f538bdfc1ec5b6b4712536595334c346ce46185f25781da57a1d4ac834fd1dd7f16684c8fce13ac93d49fcf5202ec5b925cb59cbbe79829b5d SHA512 bce50d2c80764775925a1723f5ce254aa432427dca54a87471bb51f95791df9a3d6e2acd0c3c1aa904cd6e1ce4f6d2179b61c1d8a9923f8e8e6fdae2c59b7f14
+DIST thunderbird-78.12.0-nn-NO.xpi 640693 BLAKE2B 1df5b57bb02ebdf671e9068209af00b26cdbfdeba121b329de1bc2ae8cca46a5b8fe180c936710f8637bdd3d96518c3fba5fc54318db691a569ea7ed6536ad92 SHA512 ffd7bbec154fe670d3f09b55bb4a2cf212d8ed01adb257e0f1359ad982ca037c0f98c688bef5e89a030feff9e1ca23983dc461b100e70daf168d39f8c835b7be
+DIST thunderbird-78.12.0-pa-IN.xpi 633222 BLAKE2B cf92020dafd2c22b63648d2a87e7b002cefc416b0c13e26886b10fdf6ef7de66e2ddcacc74f29629c1db0cccd4d65ddae9b9d114af7356fdc9ec0576bd34e9c9 SHA512 07a772c7290aa6c59aabfeb192e069d606adee16fddbaa9fe21e630ffcbba415acc0e2e291793852dc62cb577eb92ece4b4555351e6ca2ffb579d11d7ec34634
+DIST thunderbird-78.12.0-pl.xpi 637122 BLAKE2B 1781d8bebe2bd5c19bf3cb1ecf1efb9d17c9693960e97f6cb75b1c2d2ddf59162e289c75dd36ab059d4adf3aff04a5ace7e99fc10b0760da0612e7202898d3fd SHA512 c35359eefd5d72aad1a11be62dc854e6dcf5f0cee950752d5cad8a7eaf659418df0f48176af7853aa58feedbb2a59a6bd7e2ea78943489469bd648b29b665cc9
+DIST thunderbird-78.12.0-pt-BR.xpi 649416 BLAKE2B 69593472c33cf72d64067c30c04707d481bc09190a7868909da3682b21b6cd61c3f06a1ede06d01c2950e657e26b6d5b9e30c71b43dd74569f51271f7874c60d SHA512 a667144a011ef736b1d7ad5cc9264797cfa0b852cbf2838d2fa356e2e2fbfefb63c2c5a2025fa9cd3609db020ed8fc0892166ab402fe679c4bd02c0cf8fe0492
+DIST thunderbird-78.12.0-pt-PT.xpi 655499 BLAKE2B bfc46e485c058697adc9d877942e24eab9e8109db2e7b6197d7f3d2f1e9729872c51adf2163e3f85f893945410a92a62ed2bf2e252193cac70c89dc3a4cf344d SHA512 2305911c72ddd47cd66194ccf276c50f9e2906e42f753e4bd078848f491486bd897ada044020e178858077fbd7aef1c6cc07ca293ae0f1c6ae02ec9bea5f3271
+DIST thunderbird-78.12.0-rm.xpi 646533 BLAKE2B a6a229bb925f0ff12931a93cd1443b545d826d0b7328550d4da766abbf66ec4739984d3240056d8d0e84ef5233b125f66dc8d834e26aab065ab676254396f63b SHA512 8635a81e566b1c8f50a9597b71bcc7c4eaf12cc881b0154e68ff9c9f251ffa81f97a868fbd67862b6fb13c334450af8d6f3e5f32f70258aaae52a9532fa97a87
+DIST thunderbird-78.12.0-ro.xpi 662642 BLAKE2B 3843667db0240f7c8259deeda63c2541480afbef9161e5501c76b0393132e8968f500c67f8bb1adc28bea6da38a0cdb2398bca7dbd227052a6530c499815b236 SHA512 1d05e3cd478d12425b48a0fcb1e7028c86c7d54e39b8b243099a1f63345aa6a06937927f3efce45888f33022474c83a059c27365b53fed87ee4940fe2469fafd
+DIST thunderbird-78.12.0-ru.xpi 756191 BLAKE2B 1f4966a293ce01f6a1c839bc4d0d207d9ff5407526bff70e71d038daa8bc4bee816b9b85dea8e43c84997e8c91706928ae0fcbc2ecab1cbad6d565dcada35b39 SHA512 a6f1158341083b85eccc420efe10c4786d971e37c5feacec642eb6c3dfc4eccc2c072df0fd1b531684e04f07283168aca957390b6c869211a52156add7729db2
+DIST thunderbird-78.12.0-si.xpi 651100 BLAKE2B 3231b596ade2866710f39440e6a0a8c0e72294f99580ae8bdc45bcb4d78208edd36fd0878ed3b3b3479994c2040900ae660ccc801fbca562bf2c0302474b87f1 SHA512 9f1705aa2a0d806030c6a8cc94b5009e17c3c228e153e6287b1166ea5dfc02a2d92f197c90ff2ed6ffccf9d8b0311704da2e785be250a68f39576c60fe7eab00
+DIST thunderbird-78.12.0-sk.xpi 643223 BLAKE2B 2766bd8fae857dbafad30546b5f1e2606e1701b6bcb0244b564cd312b20277329830ed1596108e1ecda3c2b9e277d9f98a4e4119ce79825cecf18ad1015a654f SHA512 b8486373ab861fbbb0286568ea493a5ac7f7faadc985c7f895117c81344e6395b9a66fc896d1265fb8bf56b37563a647cbfbf7bca8977c9f9763caad8cf6b0c7
+DIST thunderbird-78.12.0-sl.xpi 632386 BLAKE2B 4fdf1191069589949559587f675ac2cd615bfe8ef3a30961d19c0e14223fa836eef861f4b59cf956c393c5b82b95cbd91511d21200934a2f8f26a18a7fa8e7d4 SHA512 b7edf395463c4cffdc9d0fb4a045de220fb785c17aee6722b980b3d9202b3ebf2616b6a1d954e8e0ea0d0bb0708e739d157986dabced74898cc6ead9c182db3c
+DIST thunderbird-78.12.0-sq.xpi 657815 BLAKE2B b20b4f52dbba8813f76041ff0716774cdc42c17e1f619a628dda2e29c0277a1a6d4a3e85d8d9991e07f0785eca58d17112c803da2d034a8d6d9d4f5b93474cc0 SHA512 22141d41c02fbffeaa77964abbcd7fa9367567f4efcc5027b5e96a04d02a0feb9085637ad3d60d0f5e49cf7ed27a0e69736374066f986e2a5389253e9d7230d6
+DIST thunderbird-78.12.0-sr.xpi 683113 BLAKE2B cb6e05a2c0bfe6de50d170a762752960f0a446c792cc62ac0f205c5338d52c46b3746247312f3d112d1542420357c3af98a4e52e0d984d4ef9383d462cf1d7cd SHA512 d263f5798939c2aa61fecbc2a174233812df81b454aae4bf08315c69afcdedc8cb878707fdb92e9e7e2f7503d41235a5b49725e8fbfe68ea9a8ef26b09bcefb5
+DIST thunderbird-78.12.0-sv-SE.xpi 648863 BLAKE2B 7efa45363c02d4205282c768368387d701d06db7a0646b03b4beeb8a269b375e20392affc99da8db3f88bb9043e37a5decea27ea2352e1e245c6d2394f04fd97 SHA512 d014d8750173f10d7f248fba3e71cff26fbd13f5c91d7b822bb1a433cb09c32806c1a1da00e779c0e34dd936f17b0f607901ff3239f258e467f6f32219d797ad
+DIST thunderbird-78.12.0-th.xpi 712037 BLAKE2B 6cbf077923f75a0367ecbff3575ba0dd3cf29ada444ab82d6505191343d18d0100dfb42f6156e757f2b22a47a1e304f25a0efbaf61a50e2311c832106f9448e8 SHA512 52298cbf4475352985014106ee67f2837d86e3ab6c5a69cc11a0179e161d4e3582040579cfb109707e7e112928e39b9762e22aa869a98edb3b59bb2eeeac68e4
+DIST thunderbird-78.12.0-tr.xpi 649073 BLAKE2B e9d78abb609d80b87361517267392ec37b1db6e90aa379fc54329363d984151c6e5c72fe635c5705cd61367ae5421e4e218145de0f48f2f0f52b7d019e6e2b08 SHA512 3fd6899edc2ad6a4be8285de0621a7a1cbbd83ee02cc40228ede1f033c9323fb0eb0e5a72520ad7d20d48202358b0b7eb0ea204f344b0544a3693190985b3031
+DIST thunderbird-78.12.0-uz.xpi 586596 BLAKE2B 0039bc81a6cdf8c88127e3a8caf3548e5c90eb33030b93c678f0c46672020b4471dc35c275f89794e138e5ed5836cb89f05e068bd218db804e3b37f445a2516b SHA512 ed28c8864a4b6f36ed704427743147ca77f4289e9f995c78011a6d80f790a2d0e09fe8b344deb1c658c322c1bea7362219e46524115f8ef11c392e1f70809f59
+DIST thunderbird-78.12.0-vi.xpi 674606 BLAKE2B b325878404c5de61418ada8c67495bbed3cd557c8ef908a39566da4464f22cb850e140728b82c9220c38294593d317165eef7e31baddaf9ccf39fb1be36461c5 SHA512 6720100635a1b91277077f527c087a7edbde5183d7a0cfee3e6ab532a6dfb830b8b5769176319acfed69a3e5b415eaacf38eaae9404bc1a35f1a1d8bb3958be8
+DIST thunderbird-78.12.0-zh-CN.xpi 687173 BLAKE2B 214cf530f6a3fb1023d3dc7bdcb7e9012351f5bc46d175af09aecb3ee6c05baef347432ed9556caf6b54ee04e61a63932a2ca3f131fef0198cddf97b566ae38d SHA512 ac826167da668b544a8606db35d5d243250137ad9badc57ce75ab8e3a5712378742c1b9aa44795e9abb9a61fa5f8176d14a8737129a6642dedcf556f1745406d
+DIST thunderbird-78.12.0-zh-TW.xpi 687621 BLAKE2B 8234a8ed471e8d5b9825afe0f11a03b74ebe17183513f56dc0e1c15d6fd6cf01da1607d844410b8c12b111ffa1a5e76572e30a6f6ea9165c88a873f7c6d1a668 SHA512 4b9cff48fd28cf1e081689e81b5dba4b03bf6f2e89557c1d386ec27172806d34c4d4630cd5322eb27e053124f4b141612f9ffb5863174ac64dddd63fb5bfa03d
+DIST thunderbird-78.12.0.source.tar.xz 355933664 BLAKE2B 466899baf4db28f7d41363ed3b3bdc93b25ec8a87cfb2a8e489ac5572f769a4b19cf3886f3a76a3c9cbce112e47a0fab711ad59505bbc01cd38daad896ae1c58 SHA512 8a9275f6a454b16215e9440d8b68926e56221dbb416f77ea0cd0a42853bdd26f35514e792564879c387271bd43d8ee966577f133f8ae7781f43e8bec9ab78696
 EBUILD thunderbird-78.11.0.ebuild 31630 BLAKE2B 53828ef48067301d4b2551109cb9ae5dcd30bf380279e02d5a9914da56117b5ffa52b973cf5653b1ec4d6ff5894a1be069549aff5d8b5bbc108555324acfbb2d SHA512 6ac404c86ed1f4ee3d33a42375261bfe03b57072a9f2ac89c4e4918a2809741d506296a5b615b4dac3fb5fd882c469f07cfb07593b9a385268d6f3c43312ee2b
+EBUILD thunderbird-78.12.0.ebuild 31632 BLAKE2B a8a315a069ef5025b7c4902199bab1a925206fa6ad7e404bbc077bfa7ff28b180b8dbd3052b4b4d06aae263501a40003f3e0d3400deed8caca132661309d5103 SHA512 4ebf79797990f5c2e21de875143254bb06867e64a932f2485d80b1e13dc7ff81f0248edfdb130f343de65e10b8c663db4941acbf1344ac608489cf2fa85e6012
 MISC metadata.xml 1740 BLAKE2B d51bd6ad55bd5a54ba77e732906443e19c639bc2f081abe48ef756514fb7bcf45946ae7898b30fb2b73cb654886cac98d107a0244707301c4b800fc2f7597f49 SHA512 d5980ffb710daf47bfdd6d46b0b74a198c2614fddf363438c75828516bb742720ac767887ee67ed7bd1e7c5c76daa0588778b5bc0dbf675ca04d7e1d19685c1e
diff --git a/mail-client/thunderbird/thunderbird-78.12.0.ebuild b/mail-client/thunderbird/thunderbird-78.12.0.ebuild
new file mode 100644
index 000000000000..d5a0e95087de
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-78.12.0.ebuild
@@ -0,0 +1,1108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-78esr-patches-15.tar.xz"
+
+LLVM_MAX_SLOT=12
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.mozilla.org/thunderbird"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free
+	hardened hwaccel jack lto +openh264 pgo pulseaudio selinux
+	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp wayland wifi"
+
+REQUIRED_USE="wifi? ( dbus )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.14.3
+	>=net-libs/nodejs-10.21.0
+	virtual/pkgconfig
+	>=virtual/rust-1.41.0
+	|| (
+		(
+			sys-devel/clang:12
+			sys-devel/llvm:12
+			clang? (
+				=sys-devel/lld-12*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)
+	amd64? ( >=dev-lang/yasm-1.1 )
+	x86? ( >=dev-lang/yasm-1.1 )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+CDEPEND="
+	>=dev-libs/nss-3.53.1
+	>=dev-libs/nspr-4.25
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.6.8:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-67.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )
+	!<x11-plugins/enigmail-2.2"
+
+DEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
+	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
+	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
+	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			# temp fix for https://bugs.gentoo.org/768543
+			# we can assume that rust 1.{49,50}.0 always uses llvm 11
+			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
+			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
+			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
+
+			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
+				local version_llvm_rust="11"
+			else
+				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+			fi
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=comm/mail
+	mozconfig_add_options_ac '' --enable-calendar
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
+
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	elif tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Build system requires xargs but is unable to find it
+	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
+	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 51ebc221ba35..31ea5d4a4ccd 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 4c8e3e08303a..b6ff95c36f18 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -2,5 +2,5 @@ AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
 DIST bogofilter-1.2.5.tar.xz 801240 BLAKE2B 90fc5f0ab258ada722ca2fb79d17279b621eb089f646eade2ab41b78c44deea7f3fd8f219053e09ce5b4c64f5fc81f43a17c20b84261b22d5529c06106e80b3c SHA512 3a7280485cfe5802dd3e9721c153f88ccf28bff7a6a24590e985e860d1f1e0ddea7bde8a8e5ad1ff643e94c9fd7b26b2a5ed5a9fb991cee3fd5b0ce67ce9abfe
 EBUILD bogofilter-1.2.4-r3.ebuild 3775 BLAKE2B ef688072e111d237d6052dd0cd1c0b313c8c646a97224e8f5a0c7775f94006828a46e15f66af446ac71da4a6d0ee90926a4dac33d647b102b598e40905fee1ac SHA512 caed65cf0d86b6bc299a57534fee24f8134678f3080a72ce996e6b3676e7d15772a6392275cdb153bdf6926345643df1e6ced6ed335446895fa77c84bba70bb0
-EBUILD bogofilter-1.2.5.ebuild 3747 BLAKE2B ead6ad64784dea07e3db6e60af953f1ebdafb7d3f4980d4c5bc3e8c619884a05a161ee62a45622350c3bcc12a3fc4171de076a502d9f0a9d2522cb5466d8c1ec SHA512 798bdc0c67077dea27e80023985a8ba0803e65bce534c9bef7d97abc84211a5bf540a41192169f10923a2f5a5b6d188b7a2646b30cf82019dcaa951adc17b4cb
+EBUILD bogofilter-1.2.5.ebuild 3734 BLAKE2B 897b4d4874e65eac748c691ff8e33f3d06dc7c2863131b097b063ccfe8ee5a2ef482ac13e0f48b2ec8b967a37dad331c956df0851bc184fd18626253e5697e1f SHA512 67d63de48374fb1b125208ea6b5ac6a29d2223b273b9467e0ff4a9e86a5287e7853e84c145695dccb1b3a298d69ba1749c3ac3e6904487b715f960e4c52814ea
 MISC metadata.xml 831 BLAKE2B 29a5717658b796c2cccd8314136429ea280806d9577f7f9be49fd2f52da21f77b8dc9c079a4d57a49c2a9447abd239c686574dfe299b3a3aed34357dba37456a SHA512 639441fd16521622e2ca72fa6c44560ee9a237395c4bc25e1013a4404d05d9d64e828a50ce7293ebb85f9dcf231fcbb57769a0260592d801cdff3af6debab4c7
diff --git a/mail-filter/bogofilter/bogofilter-1.2.5.ebuild b/mail-filter/bogofilter/bogofilter-1.2.5.ebuild
index 6b621458523e..f6824cef0e84 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.5.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for s
 HOMEPAGE="http://bogofilter.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
-LICENSE="GPL-3+ CC-BY-ND-3.0"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="berkdb sqlite tokyocabinet"
diff --git a/mail-filter/sqlgrey/Manifest b/mail-filter/sqlgrey/Manifest
index ca4949b9f9b1..7028f0905e78 100644
--- a/mail-filter/sqlgrey/Manifest
+++ b/mail-filter/sqlgrey/Manifest
@@ -1,8 +1,5 @@
-AUX sqlgrey-1.7.6-init.patch 408 BLAKE2B 09ac51cd9c16ebf21261eeae4a405042e57444a1b727dc62a10cb5a073a50e9a774dc19e26fdeed152c86d199a10d862cef224987a27fa165abba03b7c0b5821 SHA512 f22a872651e21bd45aeb22723c7d45f1c637e9227a51636655189e92f9ffa3cd2680d78d43ffc807fd85930110b5052eb74fdc07b5f32522255ae7218e29a2d3
 AUX sqlgrey-1.8.0-init-openrc.patch 284 BLAKE2B 33384a04eeca7d22a8cd7c6e95d997428be6c90a958e7598c17a29aa6c158118de25819c9e005f6fd4cbc9eb6750793c2c6c5bc3b98c75d30d77e1e3cf2e91cc SHA512 8d403977fff4afb82d32e3901da0f0791b798239e4a2bdac075adeeb9629e2cade8c9392860af91a9aa627bfdbd34fc889175c28841e3113ad7afac33689aecb
 AUX sqlgrey.service 429 BLAKE2B 330c83bbe4f4ce4aabef28d9eb3c00d9c1659ad899e1c4aa5fe82f99cf2f5e46eb5900c4a0ee0731c27184a60568af14bb78baed3b0053134b121fea0f00a070 SHA512 7e41344e3820537d73a413d728d455de58c5358922a354904cba5a870f61fecbf96f84f91dadad283d406cad05010bc3fd57644f18ba319083af92a1810d9a27
-DIST sqlgrey-1.7.6.tar.bz2 63738 BLAKE2B 7835079f3f220c2894781cb1ba8d1cac66f46e9fad7f17bfc0f1f7e2cfe1b1b05664179abacb873acf1829114093c48764c34e1a0a3128503f8e3f134dd0772d SHA512 62822d808aa5991a8d29f455be933cf782c9d5232b63bd1f357093a06982474018fb7a02dedf29274d8b7e9f12525063e6af744efceecf420cd01e74f561aa81
 DIST sqlgrey-1.8.0.tar.gz 69476 BLAKE2B f48aa9e41a988338a817026fbf022e145922db0bad9983e4d7cde7bc621560ce6189e494cfba5dd5f48ba4ff30e47686c54298f9a006b8fcc2b27444e102b0d1 SHA512 97ab057bf7111159166a6963d5948c10468731730136ddca6449d2d629f39235c09d00497a52408bb87057905c1bf43bc064571ee6302d7f1f8c6408af82d044
-EBUILD sqlgrey-1.7.6-r2.ebuild 8425 BLAKE2B 80f5698cc229439f5ae8f04ca118ef55b5b38536f28f8526c4e26f21a27993c085bed14c74ec96b8255992d68dbe2688ba35ead05d52321888a1e59219360513 SHA512 e1852b976f89d8721398dcf66224e70bac48a6bd97dd6629fc4a9b911a8c380a3c563dc1f633aafde8163b58c1e4e1cb0a8f0b29207e1016b74d1f8b73347e98
 EBUILD sqlgrey-1.8.0.ebuild 1645 BLAKE2B 85b101cfd67e073a7bdcd6912b4ea51ee82660e15fa3ed40a043506f8623a3d94e74ddbb18025ab564963ad2856eef73a7ea042754be00fea95b460690ca01a4 SHA512 f42d5ad7a647b97cbc2e3a63dd9e1ee7d033b579f58868c06281cd62076594a40ec1f7786bf2479f80bb1a347ef1b810bbfeaeb1287905e3aa1910d112aa6391
 MISC metadata.xml 495 BLAKE2B d71772d1e3521cf45d0f0596e0507b31a4a71919abfd05f113498bcb3f73f68295fad905266be85f1bb11b9f56d1de6e715332fdcdfbfdc272ea7e1b4f5e696d SHA512 c35db2f9c06d1660c4766d09abc6ab05360cafcca7f27aa8903dc788f58323ba1a47bbcf9a2b0222117a898823e46015ff7198ad9cd1532c77efe6a03d5a4239
diff --git a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch b/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
deleted file mode 100644
index 355cb4539248..000000000000
--- a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- sqlgrey-1.7.6/init/sqlgrey.gentoo.orig	2007-05-12 11:12:12.000000000 +0200
-+++ sqlgrey-1.7.6/init/sqlgrey.gentoo		2007-05-12 12:05:52.491468250 +0200
-@@ -14,13 +14,13 @@
- 	# SQLite puts files in the working directory
- 	cd ~sqlgrey
- 	sqlgrey -d
--	eend
-+	eend $?
- }
- 
- stop() {
- 	ebegin "Shutting down SQLgrey"
- 	sqlgrey -k
--	eend
-+	eend $?
- }
- 
- # hack: seems Net::Server doesn't set REUSEADDR on socket?
diff --git a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
deleted file mode 100644
index 1e7d2013e063..000000000000
--- a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="A postfix policy service implementing a grey-listing policy"
-HOMEPAGE="http://sqlgrey.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sqlgrey/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
-IUSE="mysql +postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="dev-lang/perl
-	dev-perl/DBI
-	dev-perl/Date-Calc
-	dev-perl/Net-Server
-	virtual/mailx
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-PATCHES=(
-	"${FILESDIR}/${P}-init.patch"
-)
-
-pkg_setup() {
-	enewgroup sqlgrey
-	enewuser sqlgrey -1 -1 /var/spool/sqlgrey sqlgrey
-}
-
-src_install() {
-	emake gentoo-install ROOTDIR="${D}"
-	dodoc HOWTO FAQ README README.OPTINOUT README.PERF TODO Changelog
-
-	# keeps SQLgrey data in /var/spool/sqlgrey
-	diropts -m0775 -o sqlgrey -g sqlgrey
-	keepdir /var/spool/sqlgrey
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	elog "To make use of greylisting, please update your postfix config."
-	elog
-	elog "Put something like this in /etc/postfix/main.cf:"
-	elog "    smtpd_recipient_restrictions ="
-	elog "           ..."
-	elog "           check_policy_service inet:127.0.0.1:2501"
-	elog
-	elog "Remember to restart Postfix after that change. Also remember"
-	elog "to make the daemon start durig boot:"
-	elog "  rc-update add sqlgrey default"
-	elog
-	elog
-	elog "To setup SQLgrey to run out-of-the-box on your system, run:"
-	elog "emerge --config ${PN}"
-	elog
-	ewarn "Read the documentation for more info (perldoc sqlgrey) or the"
-	ewarn "included howto /usr/share/doc/${PF}/HOWTO.gz"
-	ewarn
-	ewarn "If you are using MySQL >= 4.1 use \"latin1\" as charset for"
-	ewarn "the SQLgrey db"
-}
-
-pkg_config() {
-	# SQLgrey configuration file
-	local SQLgrey_CONFIG="/etc/sqlgrey/sqlgrey.conf"
-	local SQLgrey_DB_USER_NAME="sqlgrey"
-	local SQLgrey_DB_NAME="sqlgrey"
-
-	# Check if a password is set in sqlgrey.conf
-	local SQLgrey_CONF_PWD=""
-	if [ -f "${SQLgrey_CONFIG}" ]; then
-		if (grep -iq "^[\t ]*db_pass[\t ]*=[\t ]*.*$" ${SQLgrey_CONFIG}); then
-			# User already has a db_pass entry
-			SQLgrey_CONF_PWD="$(sed -n 's:^[\t ]*db_pass[\t ]*=[\t ]*\(.*\)[\t ]*:\1:gIp' ${SQLgrey_CONFIG})"
-		else
-			SQLgrey_CONF_PWD=""
-		fi
-	else
-		ewarn "SQLgrey configuration missing. Exiting now."
-		echo
-		exit 0
-	fi
-
-	# Check if we need SQLgrey to configure for this system or not
-	local SQLgrey_DB_HOST="localhost"
-	local SQLgrey_KEY_INPUT="l,r,x"
-	einfo "SQLgrey database backend configuration"
-	einfo "  Please select where SQLgrey database will run:"
-	einfo "    [l] Database backend runs on localhost"
-	einfo "    [r] Database backend runs on remote host"
-	einfo "    [x] Exit"
-	echo
-	einfo "  Press one of the keys [${SQLgrey_KEY_INPUT}]: "
-	while true; do
-		read -n 1 -s SQLgrey_ACCESS_TYPE
-		case "${SQLgrey_ACCESS_TYPE}" in
-			"r" | "R" )
-				SQLgrey_ACCESS_TYPE="r"
-				einfo "  remote setup"
-				read -p "     Please enter the remote hostname: " SQLgrey_DB_HOST
-				echo
-				break
-			;;
-			"l" | "L" )
-				SQLgrey_ACCESS_TYPE="l"
-				einfo "  local setup"
-				echo
-				break
-			;;
-			"x" | "X" )
-				exit 0
-			;;
-		esac
-	done
-
-	# Generate random password
-	if [[ "${SQLgrey_CONF_PWD}" == "" ]]; then
-		einfo "Generating random database user password..."
-		local SQLgrey_PWD_MATRIX="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-		local SQLgrey_DB_USER_PWD=""
-		while [ "${n:=1}" -le "16" ]; do
-			SQLgrey_DB_USER_PWD="${SQLgrey_DB_USER_PWD}${SQLgrey_PWD_MATRIX:$(($RANDOM%${#SQLgrey_PWD_MATRIX})):1}"
-			let n+=1
-		done
-	else
-		einfo "Reusing current database user password..."
-		local SQLgrey_DB_USER_PWD="${SQLgrey_CONF_PWD}"
-	fi
-	echo
-
-	# Configure the various database backends
-	local SQLgrey_KEY_INPUT=""
-	einfo "Creating SQLgrey database backend data and configuration"
-	einfo "  Please select what kind of database you like to use:"
-	if use postgres || has_version dev-perl/DBD-Pg ; then
-		einfo "    [p] PostgreSQL"
-		SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},p"
-	fi
-	if use mysql || has_version dev-perl/DBD-mysql ; then
-		einfo "    [m] MySQL"
-		SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},m"
-	fi
-	if use sqlite || has_version dev-perl/DBD-SQLite ; then
-		einfo "    [s] SQLite"
-		SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},s"
-	fi
-	einfo "    [x] Exit"
-	SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},x"
-	echo
-	einfo "  Press one of the keys [${SQLgrey_KEY_INPUT:1}]: "
-	while true; do
-		read -n 1 -s SQLgrey_DB_TYPE
-		case "${SQLgrey_DB_TYPE}" in
-			"p" | "P" )
-				SQLgrey_DB_TYPE="p"
-				einfo "  PostgreSQL database backend"
-				echo
-				break
-			;;
-			"m" | "M" )
-				SQLgrey_DB_TYPE="m"
-				einfo "  MySQL database backend"
-				echo
-				break
-			;;
-			"s" | "S" )
-				SQLgrey_DB_TYPE="s"
-				einfo "  SQLite database backend"
-				echo
-				break
-			;;
-			"x" | "X" )
-				exit 0
-			;;
-		esac
-	done
-
-	# If we don't use SQLite, the password must not be set
-	if [[ ( "${SQLgrey_DB_TYPE}" != "s" ) && ( "${SQLgrey_CONF_PWD}" != "" ) ]]; then
-		ewarn "This configuration is only for new installations. You seem to"
-		ewarn "have already a modified sqlgrey.conf"
-		ewarn "Do you want to continue?"
-		SQLgrey_KEY_INPUT="y,n"
-		einfo "   Press one of the keys [$SQLgrey_KEY_INPUT]: "
-		while true; do
-			read -n 1 -s SQLgrey_Ignore
-			case "$SQLgrey_Ignore" in
-				"y"|"Y" )
-					break
-				;;
-				"n"|"N" )
-					exit 0
-				;;
-			esac
-		done
-	fi
-
-	## Per-RDBMS configuration ##
-	# POSTGRESQL
-	if [[ "${SQLgrey_DB_TYPE}" == "p" ]] ; then
-
-		ewarn "If prompted for a password, please enter your PgSQL postgres password"
-		ewarn ""
-
-		einfo "Creating SQLgrey PostgreSQL database \"${SQLgrey_DB_NAME}\" and user \"${SQLgrey_DB_USER_NAME}\""
-		/usr/bin/psql -h ${SQLgrey_DB_HOST} -d template1 -U postgres -c "CREATE USER ${SQLgrey_DB_USER_NAME} WITH PASSWORD '${SQLgrey_DB_USER_PWD}' NOCREATEDB NOCREATEUSER; CREATE DATABASE ${SQLgrey_DB_NAME}; GRANT ALL PRIVILEGES ON DATABASE ${SQLgrey_DB_NAME} TO ${SQLgrey_DB_USER_NAME}; GRANT ALL PRIVILEGES ON SCHEMA public TO ${SQLgrey_DB_USER_NAME}; UPDATE pg_database SET datdba=(SELECT usesysid FROM pg_shadow WHERE usename='${SQLgrey_DB_USER_NAME}') WHERE datname='${SQLgrey_DB_NAME}';"
-
-		einfo "Changing SQLgrey configuration in sqlgrey.conf"
-		sed -i "s:^[# ]*\(db_type[ \t]*= \).*:\1Pg:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_user[ \t]*= \).*:\1${SQLgrey_DB_USER_NAME}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_pass[ \t]*= \).*:\1${SQLgrey_DB_USER_PWD}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_host[ \t]*= \).*:\1${SQLgrey_DB_HOST}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_name[ \t]*= \).*:\1${SQLgrey_DB_NAME}:gI" ${SQLgrey_CONFIG}
-	elif [[ "${SQLgrey_DB_TYPE}" == "m" ]] ; then
-	# MYSQL
-		ewarn "If prompted for a password, please enter your MySQL root password"
-		ewarn ""
-
-		einfo "Creating SQLgrey MySQL database \"${SQLgrey_DB_NAME}\" and user \"${SQLgrey_DB_USER_NAME}\""
-		echo -ne "     "
-		/usr/bin/mysql -u root -h ${SQLgrey_DB_HOST} -p -e "CREATE DATABASE IF NOT EXISTS ${SQLgrey_DB_NAME} CHARACTER SET latin1; GRANT ALL ON ${SQLgrey_DB_NAME}.* TO ${SQLgrey_DB_USER_NAME}@${SQLgrey_DB_HOST} IDENTIFIED BY '${SQLgrey_DB_USER_PWD}';FLUSH PRIVILEGES;" -D mysql
-		echo
-
-		einfo "Changing SQLgrey configuration in sqlgrey.conf"
-		sed -i "s:^[# ]*\(db_type[ \t]*= \).*:\1mysql:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_user[ \t]*= \).*:\1${SQLgrey_DB_USER_NAME}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_pass[ \t]*= \).*:\1${SQLgrey_DB_USER_PWD}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_host[ \t]*= \).*:\1${SQLgrey_DB_HOST}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_name[ \t]*= \).*:\1${SQLgrey_DB_NAME}:gI" ${SQLgrey_CONFIG}
-	elif [[ "${SQLgrey_DB_TYPE}" == "s" ]] ; then
-		einfo "Changing SQLgrey configuration in sqlgrey.conf"
-		sed -i "s:^[# ]*\(db_type[ \t]*= \).*:\1SQLite:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_name[ \t]*= \).*:\1${SQLgrey_DB_NAME}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_user[ \t]*=.*\)$:# \1:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_pass[ \t]*= .*\)$:# \1:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_host[ \t]*= .*\)$:# \1:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_cleandelay[ \t]*= .*\)$:# \1:gI" ${SQLgrey_CONFIG}
-	fi
-	echo
-	if [[ "${SQLgrey_DB_TYPE}" != "s" ]]; then
-		einfo "Note: the database password is stored in $SQLgrey_CONFIG"
-	fi
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index eaf5b0eb622d..3132e5a9cd14 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 8903cf05125e..38b731d76c36 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -5,5 +5,5 @@ AUX nullmailer-2.2-disable-smtp-auth-tests.patch 2383 BLAKE2B 07f2fc7517df280fac
 AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70c6aedbe0471f042c2c2e611eedf768071715b7f42a94b2b41e814a87dd87777810cbb823d20138d40f6aa3aba93ebaec89ebb6d9e2f3 SHA512 10873e538dbc89e8899047e732515d30108b25fd0ff6bb2fc695f5790a94ac32629f41c470a2fec951357169fead36ee4512f543ad0e02c52f09799334b815c7
 AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
 DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268
-EBUILD nullmailer-2.2-r2.ebuild 4274 BLAKE2B 25aadfd70f1bb616cd1d9e78c2a374982545532c42632f955fad99d3de2e0fd518900065f419e66922d787dfc5b98390e9650c10cc034ea2533ff1e33e6aac24 SHA512 35d6c711a4430424ce2a778b90455a23e3dff8b29f2e40e88cca5fc8840e0a09a404ac1bebc311816285056c91bd2655b69696c1515eb5d8d599c991c665cc74
+EBUILD nullmailer-2.2-r2.ebuild 4272 BLAKE2B 6e4f807fa141733459c4200f647d5fd070b690de23007e7e421bdf980b163c76a44fd6dad94cea5fad8bc8db40bed032fb13945563b9e1b23cba3de85a76cd27 SHA512 3b328fbdea13c38d9611b1c61ace247611da138eeb888535fe4ea3907dab55d6697a521875df09c9c810debb98883e3eaf4fdea78a10f2ffe8ff7c496836105f
 MISC metadata.xml 342 BLAKE2B ac05adbff1c06a41efb8b6c01995d7061302e3e829fa07008538aef00de9ef00e8e665a2d45e51e0886d092a9f492ac1cb194f9ab614b944147f9a8235608c71 SHA512 bde55b4d0d452321cab14b1f38dcf2f27caa6586acc1748b9be1cb6981c0e4e90e909129d3700f49a7405f8baba80c3182d6ce84c75260a87019e8be593bc091
diff --git a/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild b/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild
index 3ea8f8fe0a92..c2c537a1e4ce 100644
--- a/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~x64-cygwin"
+KEYWORDS="amd64 arm arm64 ppc x86 ~x64-cygwin"
 IUSE="ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 0da8ea8eb075..1dca4395f95b 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index e840958dfc13..a580aa442e70 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -3,5 +3,7 @@ AUX noto-emoji-20190328-use-gm.patch 1169 BLAKE2B 6659f1f80ec3f44942a7b96b23f5ae
 AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a
 AUX noto-emoji-pngquant-verbose.patch 407 BLAKE2B b737b10535b8a04ca2d17d6803fc7c6a36e733acf88a6089b56004f9d2a265851278cbb85b6a5d2c2ab18e46f12fcf84d7185e768cae2e3eafefeb3bc06869e5 SHA512 5bcb05c6b7a1e0970e1ff67707a1a5d49b22ada4ef4677d3bb9f9874e045d79f1d35419abc80b39bec81512f547360eb705dffeb421c48296a9646c618f75f61
 DIST noto-emoji-20201214.tar.gz 69885567 BLAKE2B 21d251a25740bf474e4c7e138c33d90f35cfea93ff2c72904e38a8bead0124408c67a731ed142fe96da07bbf8afb7d929293518a366157fd1393dacc560bf12b SHA512 b3ad1f31bbb48bd5de2fbddcac5c3f27891a805ae4ac8d0b69b07c1d7259c6a5317eca9ac7e3b068d24ed5d3acd3523cfb2036f2e9f08179b85fd81dd5c9b570
+DIST noto-emoji-20210715.tar.gz 166643705 BLAKE2B 355e993aee720e634d174fceb4d0d6b16ebce91cf948657428861fa63283120eef7fb706a5e6139f0ff7c13f0d72dc1c906ab30bc9b7509644ae6a56f4156e16 SHA512 2b1071c39d85f834baf4c9b6c59f9b06f1622bf972bac6087e0f44bd034025933b9a85a9a63a307f2e4b6337f8fbf7b11ba14838cd4bc13c8075b7ffae65ae78
 EBUILD noto-emoji-20201214.ebuild 2664 BLAKE2B ff8686ce532ce325ae93ecd32e8555b254e49203fc125ec515421cb2eb798547a4eddc43974109a2b9750099b0fc502ed0409a34b0149e5e5854ccb7a56f1806 SHA512 d0d59ecb4e2184b3e3fbb04a465ec7d702c9b1af26ef58d0bdf221d1b73e55dc4b16eff610e2096cce75d362bfe594f4e26f539b0dc6095523936d9932ed3f12
+EBUILD noto-emoji-20210715.ebuild 2705 BLAKE2B 43840d876a5919f58fe5d78f1ee623e7aa1d43e3a245e8557b71330f6c63ab2f30907b0df7136240e29f192ee45ebc848687fd632336e23c62254c2673477578 SHA512 18099996986aaa5d8a2c08fe5e18815129a8428d8e5db10d95db095e910415beb3ec9b42147821c590767bbd2830564dabe1b681cb4b17116e95e4fad128c74e
 MISC metadata.xml 331 BLAKE2B 66a5d106e581cd60216e1f288d6a7431610e92ae605ffecc3e97a3bb381cf1c29671610412d6c5c69970cac946c9653a91998d53785489d630cf9837e11a8d8c SHA512 746b080cb25302ab0d7130e666ce9b8e7682dee919affe70d18fe65e62bc878a6f30174844c9df8918eab14ecf22cc4450050d292747da032eca9ce83637943c
diff --git a/media-fonts/noto-emoji/noto-emoji-20210715.ebuild b/media-fonts/noto-emoji/noto-emoji-20210715.ebuild
new file mode 100644
index 000000000000..309ca420b064
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20210715.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit font python-any-r1
+
+DESCRIPTION="Google Noto Emoji fonts"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
+
+COMMIT="c05b4b47c8250ccd232780cae46d66a8179e77ab"
+SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="buildfont"
+
+BDEPEND="
+	buildfont? (
+		${PYTHON_DEPS}
+		app-arch/zopfli
+		$(python_gen_any_dep '
+			>=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}]
+			>=dev-python/nototools-0.2.13[${PYTHON_USEDEP}]
+		')
+		media-gfx/pngquant
+		x11-libs/cairo
+		|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+	)
+"
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+python_check_deps() {
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	font_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Drop font for Windows 10
+	rm fonts/NotoColorEmoji_WindowsCompatible.ttf || die
+
+	if use buildfont; then
+		# From Fedora
+		eapply "${FILESDIR}/${PN}-build-all-flags.patch"
+
+		# https://github.com/googlei18n/noto-emoji/issues/240
+		eapply "${FILESDIR}/${PN}-20180823-build-path.patch"
+
+		# Be more verbose, bug #717654
+		eapply "${FILESDIR}"/${PN}-pngquant-verbose.patch
+		sed -i -e 's:@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1:@$(ZOPFLIPNG) -y "$<" "$@":g' Makefile || die
+
+		# Based on Fedora patch to allow graphicsmagick usage
+		if has_version -b media-gfx/graphicsmagick; then
+			eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
+		fi
+	fi
+}
+
+src_compile() {
+	if ! use buildfont; then
+		einfo "Installing pre-built fonts provided by upstream."
+		einfo "They could be not fully updated or miss some items."
+		einfo "To build fonts based on latest images enable 'buildfont'"
+		einfo "USE (that will require more time and resources too)."
+	else
+		python_setup
+		einfo "Building fonts..."
+
+		# From Debian:
+		# The build requires a VIRTUAL_ENV variable and sequence check isn't working
+		VIRTUAL_ENV=true \
+		BYPASS_SEQUENCE_CHECK=true \
+		default
+	fi
+}
+
+src_install() {
+	if ! use buildfont; then
+		FONT_S="${S}/fonts"
+	else
+		mv -i fonts/NotoEmoji-Regular.ttf "${S}" || die
+		# Built font and Regular font
+		FONT_S="${S}"
+
+		# Don't lose fancy emoji icons
+		for i in 32 72 128 512; do
+			insinto "/usr/share/icons/${PN}/${i}/emotes/"
+			doins png/"${i}"/*.png
+		done
+
+		insinto /usr/share/icons/"${PN}"/scalable/emotes/
+		doins svg/*.svg
+	fi
+
+	FONT_SUFFIX="ttf"
+	font_src_install
+
+	dodoc README.md
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index da5d24e31090..240884d3d9bd 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/colorhug-client/Manifest b/media-gfx/colorhug-client/Manifest
index 18d35e4e2b95..c711537345fc 100644
--- a/media-gfx/colorhug-client/Manifest
+++ b/media-gfx/colorhug-client/Manifest
@@ -1,3 +1,3 @@
 DIST colorhug-client-0.2.8.tar.xz 886652 BLAKE2B 5a52cd3763225dd1ffc04f8ddd04c8e23b573660711b79f181f8dcf369be2f56cdea876fd37206124f8b9416c507d98493c00e3a02745795cb9eea18bd688c58 SHA512 99a012614b9364738a417e9cf8719811520f2ae2fab7dc1b1aa0ca4dfdbf3e3b2a06ed6763400a5ed34311797f14093af988dd6335d626b7e4a00c03d64c0356
-EBUILD colorhug-client-0.2.8.ebuild 1242 BLAKE2B e3d8323b2a9b62ca4cffb9c868e6fc0b9acd07e2f6f8fa6c4a906f713aa84ec7f6e6a37be4545bf3666245ece0945dc6bdaa143000e8f9961504574e252b3896 SHA512 4f3ec7b6c5a0beefef1d5f6d344ba7c9f98dad793314262f385129ba42c5103b6bbbcab7656cce129540afd0976504f3e7112886c215b308e490768db7c65832
+EBUILD colorhug-client-0.2.8.ebuild 1186 BLAKE2B b39de9823dfc622c5d132c1a2ebd596ff9acc7fdc34ceda81a80ef9c42c51d69fddd9c658706b3510dd082e294a8b330093029ca24bcc2ce285da6f9b9c1d5a4 SHA512 3e44d496112b06287225183f2221d4789c6287d177009b6b17ee8414c303218e4a391de2fd5702311bb6b90d332a86ee275b8fe68df1f0b879eedea27b728acb
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild b/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
index 4e4b403c6501..8113155736ce 100644
--- a/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
+++ b/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="no"
+EAPI=7
 
-inherit bash-completion-r1 eutils gnome2
+inherit bash-completion-r1 xdg
 
 DESCRIPTION="Client tools for the ColorHug display colorimeter"
 HOMEPAGE="http://www.hughski.com/"
@@ -13,8 +12,6 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
 # Tests need valgrind, that needs glibc with debugging symbols
 RESTRICT="test"
 
@@ -27,25 +24,24 @@ RDEPEND="
 	net-libs/libsoup:2.4
 	>=x11-libs/gtk+-3.11.2:3
 	>=x11-misc/colord-1.2.9:0=
-	>=x11-libs/colord-gtk-0.1.24
-"
-DEPEND="${RDEPEND}
+	>=x11-libs/colord-gtk-0.1.24"
+DEPEND="${RDEPEND}"
+# docbook stuff needed for man pages
+BDEPEND="
 	app-text/docbook-sgml-dtd:4.1
 	app-text/docbook-sgml-utils
 	app-text/yelp-tools
 	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-# docbook stuff needed for man pages
+	virtual/pkgconfig"
 
 src_configure() {
 	# introspection checked but not needed by anything
 	# Install completions manually to prevent dependency on bash-completion, bug #546166
-	gnome2_src_configure --disable-introspection --disable-bash-completion
+	econf --disable-introspection --disable-bash-completion
 }
 
 src_install() {
-	gnome2_src_install
+	default
 	dobashcomp data/bash/colorhug-cmd
 }
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 30b21cd42267..01f3cd6cb6dd 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -2,5 +2,5 @@ AUX converseen-0.9.9.0-appdata-path.patch 604 BLAKE2B ca524ae4a52f74b687e0e0246d
 AUX converseen-0.9.9.0-gnuinstalldirs.patch 5272 BLAKE2B b2f0faa57923c5d452e3a2ef2b397a743cc84c65d8ebee4ac415301669045190b1b3fb075ed51726e63bc016da7b32432f4b887b50dab823bab3a10bdc96fcc3 SHA512 97109e00cfdb9d1288bd04466e455a514cc7f8e3f5f40caaa819d0f886df71c259e18f66ef921ef60f7301c2ac745fb33869b1af486fd1acc2e2e7b034a2afa7
 AUX converseen-0.9.9.0-no-update.patch 540 BLAKE2B b8a7bcf561a4be48fdf9137a40c1f5b1451915a6cf4b2043f9adaf8dd1aa853b331ee1499bb34d05ae9e7da2d9f3f0515c62dca8146d4957126054557ebfcceb SHA512 b5ed008bd7a01cb99ec97faa6c9bd412009f1d438c420e201d2605c713ff57c346391d5389ed019c0538a263154d1ed36c4a581d0582d2c2eadf8dc77a67b97b
 DIST converseen-0.9.9.0.tar.gz 280547 BLAKE2B 978df93748cd5585b99f371f9538f9ae0a6fa683c9a452a8fb3eceb0c6a7b972423dbd396f8702a4db839852d39bb7c3b654603a08a5dc61481ed74c6aa3aa0b SHA512 8ec01de40fc32bc83c97b3e1d1d0400b9ae5c8c5f374dfae452a75f1bec648d6db26ea036103e15c84e4360ed83f27ce5d35a64592289de083e9701e6153ca63
-EBUILD converseen-0.9.9.0.ebuild 920 BLAKE2B 7073b3949153d19105683f128d80b5436e60ca1bf6fd1feeda01139c90393edfb5bb9fb5d619418b5150a9cc475e3e6e9fc87292ca5ae812b2a7f95e063c840e SHA512 f3653c59362910ede54693e14ca1d6d3ecbc0cca687e2dead3872bd30e25fe7196b277df2bed2998ad2aa1fe6dcd20c922bd854b0161d25e6cd4f46a57c75c7a
+EBUILD converseen-0.9.9.0.ebuild 918 BLAKE2B a9acffbb4629cd80bc519849a9b219014c2d00466f6302354aafde0a36b46613f16bf48a5830f1a180118c99353d380768303cb8fdd0b335c8a540af137a0553 SHA512 8778b312f059d35458c6c393bb4d7939dc7a66d461679a9726cfda5ec8c448bd6ac5e42e71dc3c2d85afc76c64d1c56e897773749e9c4e7eff02caca6cbf1b45
 MISC metadata.xml 252 BLAKE2B 85d312e9856476325a3b52f7e18559dc488db547c2a07da42e5e35921c22d893dd5b665fe34d18a391fc74ace49af2be8b60f59df208b83ae25a8ee1b36647dc SHA512 155ed9dbb0dd8e884779b634a9661de44f25cca743fd1b4e81164a1fa7bccf95b122f7492475a6648ac34230e1a4933d9d873204440f9d9ebce162aa0a707caa
diff --git a/media-gfx/converseen/converseen-0.9.9.0.ebuild b/media-gfx/converseen/converseen-0.9.9.0.ebuild
index 06de610772d2..56b91c7a0cc6 100644
--- a/media-gfx/converseen/converseen-0.9.9.0.ebuild
+++ b/media-gfx/converseen/converseen-0.9.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # FIXME: graphicsmagick dependency does not work properly, failures when compiling
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 9ae1c3f275eb..0f2a56351245 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -4,7 +4,8 @@ AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-3.6.0.tar.xz 4691608 BLAKE2B ecbb6b4b4aba1f499f8d459304f174f348c19304c0efb898260d3037bfb9c82ea51a92e3dd98c8b0d2dc525276a91419b41b3c610f4a18b905cda7ccd1bfc554 SHA512 8e458406c3004a52cde096039358eb044d370e8b9d5cb70a6457fc1ad165f062af073b3f0c8da92b463db5a4df37e7a4ee32eb5ce9dfbfeec3e0c13c70ec5f8a
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
+DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335
 EBUILD darktable-3.4.1.ebuild 4412 BLAKE2B 402c0e8f4cc2c299e8a2a7b425002993eda544735302c4482c4f4d9fe6b605eaa6c14671e41674c8d64312c1406ff2d59a53a762e28bcfbc40f954c12fcd34e5 SHA512 bd292ddf983f2b23e3f0140e2f7d8d0ce84ce2b1e6dd41945ff9f6657f00e583eafdd60da5e6bb34c23d1d8eaadfa279fc0b0b7a38c5e11600abc2bd189a5e11
-EBUILD darktable-3.6.0.ebuild 4411 BLAKE2B a46950b519750c9bd080f19a26bee46456146f0dce7f0b08d7fb55e78785f59f5efd30a28937d3dd3b6ec7f0363d724386f9aa14885ade31f54a395865582cd3 SHA512 2be99339f1aaa5cfb7628611e1f41536279661a88528b12d313597d3bf58fd5a6dcc7179559e452ea2011afa1d8591a914e4b7b6e612b0b7943695b2baa7687f
+EBUILD darktable-3.6.0.ebuild 4385 BLAKE2B 746a68dce4a91157795160d756c5500a64f605ae685dc04b2fef89d9c7f1d55df392cfc0cf3d6d2ed042f591e48bbee95d1a12b6105d0410f19b3aa14e19a18c SHA512 4a26fcc51008bfdb117709deff531203056fd0db5859d0bbacbd298d9a9ee17dd7f8d7541bbcdfaa1a027d766c161deb480293b6643603f526615bd53be90ea7
 EBUILD darktable-9999.ebuild 4407 BLAKE2B 41e9636ef86761982a80ddd449ee45ef28a7904f751061cafdd68b91fcac28242e581adfc3873ddb86ac534127a2b49611db3560956e4126ef574233cef34f44 SHA512 46111450051510f2de6ce1694978ab36268d9680e82de016feddd40fff0bff470ae5572415493982e6fb68ee62e63ba82655c315244b0a578144e7186e72426d
 MISC metadata.xml 1151 BLAKE2B 45fdf41338969512b2790e0dc3fb75b1633244c398c8f2eb67b9264ceba3b41c64d19713bc6727870465d03ebc37714c464a537c5ef4c7b1b7f52711a8e8c268 SHA512 784be9b2454a021f7547894cafb4e2e0fdbda8e30dbfbf78a0d234f596ab8321a5e5a0b8944af8f55d0ce7b466139837d4f0f5139152e2fc691ae528c0e3eef8
diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild b/media-gfx/darktable/darktable-3.6.0.ebuild
index 5f7bb83e38d4..f73844b3854e 100644
--- a/media-gfx/darktable/darktable-3.6.0.ebuild
+++ b/media-gfx/darktable/darktable-3.6.0.ebuild
@@ -18,12 +18,12 @@ if [[ ${PV} == *9999 ]]; then
 
 	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
 else
-	DOC_PV="3.4.0"
+	DOC_PV="3.6"
 	MY_PV="${PV/_/}"
 	MY_P="${P/_/.}"
 
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+		doc? ( https://www.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
 	KEYWORDS="~amd64 ~arm64 -x86"
 	LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 932b4e937025..52c5268d37c3 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,10 +1,6 @@
 AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184c742cd59727e3c55460713680b14b5d39ba528b7a17a87b893a9585824f1e402b5f46bbe45451dd8888b62d1752524db44 SHA512 d0f79f986b605c3f981de99c533f57a60aac47844d1434482e507a7e7e4d2be2b581419e211f034213c7c23db0e56f4fe5d789f39624a33aee283c8b8a489509
-DIST fotoxx-21.40.tar.gz 8583921 BLAKE2B 63e49768c6d5941fe4259f83aef4ce8d0e19498c1090e4eb5017337f184edb0c60939323cc6481efcf72d0544347e046c94e37619e1f466b6dde0ab0919c3792 SHA512 05db14fafd8187bcb1de1576ca445fe525e895089fe670a80f890b2c525f5424fabd751ea422a5cc266cc7e8175ecaf7800b97a5ad686ea3e4e482de78190f3b
 DIST fotoxx-21.41.tar.gz 8619224 BLAKE2B 28ec5fef8780001a023527c0859b58e1b3347b91b607269add3e0152fa6dff1347caf12f8e36a528100d5c6f538dce388bb4cbd22d03e2d15ff6904d5fdff626 SHA512 df7b3f424c9a1e2773171f9c036b30c34bd902dad41d3ce51eee5a20e86ce6afe5bcae4147baf40ea35bb9755900d9efcca20e026e12a1f540884b113011bce8
-DIST fotoxx-21.42.tar.gz 8617093 BLAKE2B bccb36c43636fe6811f5fda7df3e81a3ca8ecce0e1df6b4d3a761c31674e32796d42d5b305d391dcd1fa22fadef3224c9ec71f2bf2619091a592f5e8f0acb00a SHA512 cf5cb91cd061e18ac059b93326ff17c406d6a595c6793be55ca74f4e66dbe0172baf48910bc0813263caed9c0fd8571039131b3d5635d9451a14cdaa7efab520
 DIST fotoxx-21.44.tar.gz 8670703 BLAKE2B e3c1a0d68ab530345048833c5c33ababa1f3ef27e99379888c748297a2d69a248eb64b6881b53bcdde759f53aea75292d3c205ca11d9ed291465514bf294d323 SHA512 06446fbd0c44a632d5525acec155f8d51ee9ffd66dc9ba97a01bb30f4a8e4b9355650ea50967a537cbf077062898def227c46b07dd7d6d2c6ab8af3f4654c490
-EBUILD fotoxx-21.40.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
-EBUILD fotoxx-21.41.ebuild 2261 BLAKE2B 5d8bb0d2391b4b3e1b3390acbfb3b599f7a885d76d8ed1215485e995c9dd5af932abe57cd25de998d749ceef1d8ccb739bf01da1002bb0206638f44a456ae1bd SHA512 7afc256fc2817dbe177fc1087116121f854c4c0d030571bb330523def5198f125d8c4e938ecd4a9e4fbaae31468e301e2149873fe2c19fc14707fec76f501166
-EBUILD fotoxx-21.42.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
+EBUILD fotoxx-21.41.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
 EBUILD fotoxx-21.44.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
 MISC metadata.xml 850 BLAKE2B 463cae7d8df56ad93adaf7fbb4cf31f2838452e1349e61175c9981db4e95cc506b992cba2876885f8e949061808300752ef5806e9a096647f769bca654cca8e9 SHA512 e5c38d8602a52ae25bf90990136a98b57f69701cea70d4762f6102dc791f97b134853f7321894d1fbbbfdd353cebad7afa27cb56373f256d9497c3600d66d19e
diff --git a/media-gfx/fotoxx/fotoxx-21.40.ebuild b/media-gfx/fotoxx/fotoxx-21.40.ebuild
deleted file mode 100644
index d9e91deab328..000000000000
--- a/media-gfx/fotoxx/fotoxx-21.40.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature xdg-utils
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
-SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-# For required dependencies read doc/README, for required tools read
-# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
-# alternative to firefox and chromium-browser. `grep '"which ' * -R`
-# is helpful to report some required tools run via the shell.
-
-DEPEND="
-	media-libs/clutter
-	media-libs/clutter-gtk
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	media-libs/libchamplain[gtk]
-	virtual/jpeg
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" )
-
-DOCS=()
-HTML_DOCS=()
-
-src_prepare() {
-	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
-	default
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, copyright, license, etc. must not be compressed.
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	optfeature "HEIC file support" media-libs/libheif
-	optfeature "additional RAW file support" media-gfx/rawtherapee
-	optfeature "additional RAW file support" media-gfx/darktable
-	optfeature "video thumbnails & playback" media-video/ffmpeg
-	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
-	optfeature "additional panorama support" media-gfx/hugin
-	optfeature "WEBP file support" media-libs/libwebp
-
-	elog
-	elog "Please read the Help > User Guide for details. The source location is"
-	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
-	elog "be placed at /home/<user>/.fotoxx/userguide."
-	elog
-	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
-	elog
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-21.41.ebuild b/media-gfx/fotoxx/fotoxx-21.41.ebuild
index 1ddec16ee369..d9e91deab328 100644
--- a/media-gfx/fotoxx/fotoxx-21.41.ebuild
+++ b/media-gfx/fotoxx/fotoxx-21.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 # For required dependencies read doc/README, for required tools read
diff --git a/media-gfx/fotoxx/fotoxx-21.42.ebuild b/media-gfx/fotoxx/fotoxx-21.42.ebuild
deleted file mode 100644
index 12a78336fe75..000000000000
--- a/media-gfx/fotoxx/fotoxx-21.42.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature xdg-utils
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
-SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# For required dependencies read doc/README, for required tools read
-# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
-# alternative to firefox and chromium-browser. `grep '"which ' * -R`
-# is helpful to report some required tools run via the shell.
-
-DEPEND="
-	media-libs/clutter
-	media-libs/clutter-gtk
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	media-libs/libchamplain[gtk]
-	virtual/jpeg
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" )
-
-DOCS=()
-HTML_DOCS=()
-
-src_prepare() {
-	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
-	default
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, copyright, license, etc. must not be compressed.
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	optfeature "HEIC file support" media-libs/libheif
-	optfeature "additional RAW file support" media-gfx/rawtherapee
-	optfeature "additional RAW file support" media-gfx/darktable
-	optfeature "video thumbnails & playback" media-video/ffmpeg
-	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
-	optfeature "additional panorama support" media-gfx/hugin
-	optfeature "WEBP file support" media-libs/libwebp
-
-	elog
-	elog "Please read the Help > User Guide for details. The source location is"
-	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
-	elog "be placed at /home/<user>/.fotoxx/userguide."
-	elog
-	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
-	elog
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 8f5bdbec9d0a..e75e893dbd1a 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,4 +1,6 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
 DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730
+DIST gmic_2.9.8.tar.gz 7311372 BLAKE2B 6438198cbaefe1de712ccd85179887b858ec1f7e039a080f0070e5ed454fd52b9414ecbd7c93dce740261df501f086634ab0bd291b70bb18778979faf2331486 SHA512 588362de60d51b1814cbe08f7402b143b656712bf2b4dc33830196068d7464394fe314d1c0dcee608a7408c7b7507596e88dee588a54f0eff1cad9e826b19bb3
 EBUILD gmic-2.9.7.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142
+EBUILD gmic-2.9.8.ebuild 4262 BLAKE2B ea9fdfb207a5a28d1d04136a916d806bab9906e0d4495dd37b29ecae0296a57d5c9f2fdfd6485ac7bfda9b7d5f104b976c4fb9232910839256c3727a115532ad SHA512 2402560d48ea661dabcb9b727d3dcb6669f71fe7270bf3986db57aa5a8f51366133d3950d748e0e631dec77c346ca9057bdd8540aef93c4d5d9bf8a20fd33bbd
 MISC metadata.xml 533 BLAKE2B 29dc054d7e7f718782ad0bb914bd8ce7b2dc6519826c4fe21be1cc20c4ddd21b99355c565106123de39bec8dadb08c1ca1fcb10989cc6fe984e6a6ea7e611c5f SHA512 2eb6d59dfa0d092625b755e952dbddf6c6dda811ae19768811ea7dc8a07771cfd3e4d074e8e996ec2de5e74243721c8b82d7cb8fc86300246096e18b782b5a2c
diff --git a/media-gfx/gmic/gmic-2.9.8.ebuild b/media-gfx/gmic/gmic-2.9.8.ebuild
new file mode 100644
index 000000000000..20cad100504d
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.8.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 1b5c2b655319..6c7fa070729c 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -3,13 +3,13 @@ AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941
 AUX test-exitcode.patch 1077 BLAKE2B 7e270c939a421d8c709d7e24b9628c69ec03f72431b6d783043e904ea92bba1938207d08d9275ac1b90825149c92ed48d466fd5edc03fa694fc57465ef474db7 SHA512 703fc73ea3829a8d5c6f64d0573439570300635d3543437983359afea0522c95da6c8b0f2cba3736d0f22f939aad72b4b27c648d166feed96ec6447a68f33b75
 AUX upnpc.patch 1032 BLAKE2B ffbd89511731d5e71a9568fb9578888152af50d18e443871ffde0eb0cad65a98c7561587cc4c9b288c6de158263ef4f172477ee836ab07c4a72d419521872f20 SHA512 7dec34031545e238388134166dd11ca1bf65975caab46ea308a9e36daaf1eeda71c70d260409ed3a64f277a2d65c9f1441c5af02fefa33e263906c386482e98e
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-442.tar.gz 38818985 BLAKE2B 955f5d9969bd46184fbf5fb11b1bc17257d184acd34a9533a20bc35e20ff5cabcc3715ebbb39f42b926b8b00f570c7f483eed3b11472c78f82b9ceeafc3dc765 SHA512 5a78338426127b276b067b52f590e275e132ea2676a4933162183e183a015556351e13e55271240059a145627d8a2ce1f6fe1a07ef267580604e998328c5c4f6
-DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde50ac43010bcffe3f8f5be5e0416156523a2c3b5bcc4d739a54f3c6cf21559a2be2ba1dd6fe38131d91d00bee SHA512 d18f32c2cb05ab73dcff83d1a7bad63519b84640cce2991f00623da86197ecf72ac4f3c1e064515980a56d2c415dcb90e19edeb35646701bca0f3fc0d149be1d
 DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb7018734680e9953f20ebd56209cc1874213ecf5515835f1022bf571a99543154843f7dc2b9375116db8ba080a0 SHA512 f5bc28e43a5218fce15bc9d197ebcc1f4eb47856a741ad79f59d1da2413a3e7e220381a4d8208fe880fa507e023f9c03050e46ab5214ef310d105df0d85a9682
 DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c
-EBUILD hydrus-442.ebuild 4129 BLAKE2B 0a4a97af179a51b9b5999147a90de8bce5913c6642a28add749cbfeb2f498c41dfc6535bb8c389a7c9452d489a5f86f08da47251988279a478fc19a58479b291 SHA512 c7484f0438a60d20b2e919d5c9978e15704e3a97043313b79c25afbf6dc919d7cf9cea93f3e5a254f9bbb80bf2f8240f838607eb6507190c4a5779769e570116
-EBUILD hydrus-443.ebuild 4252 BLAKE2B bb031dd280b128b04f98aa6df27cc1a59bcdb0b51033ad00a26d8b7d8a4224522d31174c1d26bfe373c16f969657e10d84bda3d8e9bce5aaa09004bc2f39d035 SHA512 911ff6ec48800793805fab7adb765952c36ceda93f5e7cadf9ad0cff5a73d997dee28c563493823a6c543553fde3baad5617d6bf39f7d46a8441368fb3610482
+DIST hydrus-446.tar.gz 38830223 BLAKE2B 5ab44f9cfbd15eb10144135eb4cc1d8493c20f2a931db4332a61aa186fddff96cb3a3b29eb2b210f070bb4be8210d552beb2578a7287a169a7364f02363e05f4 SHA512 bdbcd1177c3bf6ee85089e1a653587bae41c524bc2313bb5d481dee074c7da1c533a91957dc3b03d1c0b515e705809887e290ac71b866a51664f2a9a34bbfb6b
+DIST hydrus-447.tar.gz 38833157 BLAKE2B 8d7cf37a1419ef40fa7816958a01421ecc335d2a8c975fcf16d3ea5dfbdb76d872e4e597bdbade28eff7727914de5de7fb6ffcc7ecc27a712410031efa8433fe SHA512 85eaab40f192f2414be828545464811af2590b55e1a2fea7bbf64f27e4bb9a8b6c6c86cb25c1f7e9f48449173f079dcd749ea25ed22559bebb11adddce62da94
 EBUILD hydrus-444.ebuild 4252 BLAKE2B bb031dd280b128b04f98aa6df27cc1a59bcdb0b51033ad00a26d8b7d8a4224522d31174c1d26bfe373c16f969657e10d84bda3d8e9bce5aaa09004bc2f39d035 SHA512 911ff6ec48800793805fab7adb765952c36ceda93f5e7cadf9ad0cff5a73d997dee28c563493823a6c543553fde3baad5617d6bf39f7d46a8441368fb3610482
 EBUILD hydrus-445.ebuild 4190 BLAKE2B 4046a68b8f099dfc101e789e5b9f1de78c092a21d3d76caa0c281a1c0d8335695075cc0e2ea383f04404cb97d6908054f4ddf9bac28f1f1b49019221b6e888ea SHA512 8432db8586cf20fac1ae7fba67874d74a165c1234e8aabd17a19abc45a85418ada2bfd9a3b21cbe41ff2d9da6de5f88ef1c590695b1e4a15cac38df9dd34e648
+EBUILD hydrus-446.ebuild 4190 BLAKE2B 4046a68b8f099dfc101e789e5b9f1de78c092a21d3d76caa0c281a1c0d8335695075cc0e2ea383f04404cb97d6908054f4ddf9bac28f1f1b49019221b6e888ea SHA512 8432db8586cf20fac1ae7fba67874d74a165c1234e8aabd17a19abc45a85418ada2bfd9a3b21cbe41ff2d9da6de5f88ef1c590695b1e4a15cac38df9dd34e648
+EBUILD hydrus-447.ebuild 4190 BLAKE2B 4046a68b8f099dfc101e789e5b9f1de78c092a21d3d76caa0c281a1c0d8335695075cc0e2ea383f04404cb97d6908054f4ddf9bac28f1f1b49019221b6e888ea SHA512 8432db8586cf20fac1ae7fba67874d74a165c1234e8aabd17a19abc45a85418ada2bfd9a3b21cbe41ff2d9da6de5f88ef1c590695b1e4a15cac38df9dd34e648
 EBUILD hydrus-9999.ebuild 4190 BLAKE2B 4046a68b8f099dfc101e789e5b9f1de78c092a21d3d76caa0c281a1c0d8335695075cc0e2ea383f04404cb97d6908054f4ddf9bac28f1f1b49019221b6e888ea SHA512 8432db8586cf20fac1ae7fba67874d74a165c1234e8aabd17a19abc45a85418ada2bfd9a3b21cbe41ff2d9da6de5f88ef1c590695b1e4a15cac38df9dd34e648
 MISC metadata.xml 1168 BLAKE2B 6480f7938566059342a4b8eef89ee26e4f3843faab9b8c937f74e71a1a27b63630bc6e64482b7ff5ebc647c1247a030e62635a4c3a5bc42d6df87209e35ffb53 SHA512 9bb31694a8d1ce56741340431e82b0e7f35866d90dd1359062703809be331192e5ba4acca94b8c0fc146cbb6199335e724345924687c904795c3c2d0d917acb3
diff --git a/media-gfx/hydrus/hydrus-442.ebuild b/media-gfx/hydrus/hydrus-442.ebuild
deleted file mode 100644
index 3133d5282a53..000000000000
--- a/media-gfx/hydrus/hydrus-442.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
-				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
-		)
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/upnpc.patch"
-	"${FILESDIR}/userpath-in-local-share.patch"
-	"${FILESDIR}/test-exitcode.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
-}
diff --git a/media-gfx/hydrus/hydrus-443.ebuild b/media-gfx/hydrus/hydrus-443.ebuild
deleted file mode 100644
index fb12102cde91..000000000000
--- a/media-gfx/hydrus/hydrus-443.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
-				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
-		)
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/upnpc.patch"
-	"${FILESDIR}/userpath-in-local-share.patch"
-	"${FILESDIR}/test-exitcode.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
-}
diff --git a/media-gfx/hydrus/hydrus-446.ebuild b/media-gfx/hydrus/hydrus-446.ebuild
new file mode 100644
index 000000000000..abe83ba38720
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-446.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		mpv? (
+			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+		)
+		socks? (
+			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
+				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	ln -s "${doc}/html/help" help || die
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}
diff --git a/media-gfx/hydrus/hydrus-447.ebuild b/media-gfx/hydrus/hydrus-447.ebuild
new file mode 100644
index 000000000000..abe83ba38720
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-447.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		mpv? (
+			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+		)
+		socks? (
+			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
+				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	ln -s "${doc}/html/help" help || die
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index f7b90b70b2a2..36df496ab4ed 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,24 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.12-12.tar.xz 9141288 BLAKE2B 95ec30e77fc3f963bb0cae5280ad8e72ba9b6e0c8419fdf41f1899371ecbf5f64bbb70cc6193e751da0c3365551bdb2442e9f4746284ecff92ca351fc906fa4c SHA512 7e680809954326d32439c922cbcb65c9076823c50bd56ba2a230ec4a6d46f00a03a032d2ff153fe9b7651a9f6bac9625fe2aea7acccba56e15b6dce96e477c8d
-DIST ImageMagick-6.9.12-13.tar.xz 9172456 BLAKE2B cc931e49f152945a0022f6e57e49db08dc45169d5913b884cdf47d18d1f3d7a453f02b3ade56395e985cbe3f996584b8ad1686d947b6b4c04cc85475ca4f65c4 SHA512 4273e6cc864e759c55b5612475c268095948bb0ebabc1188637df87ac8595a97ce94ef7307687f0abd1325646ba23a8bf1219081655307b17ec96b335a01de6c
-DIST ImageMagick-6.9.12-15.tar.xz 9181060 BLAKE2B 099482e71ce899a95e22dd63ae4e3f0a36ed722f318a22796e5b28552d9c3770f33fef9d3dbeebbdcf91e78ac30421e7e48f9a3db7fdf73bfbdbafea4894ddc5 SHA512 7336b832abf96fed5d0f861b9c3724c27770a4f9fa868399406bb49003184a06a5fc51a96d3c66fa8d1ca85bcdfaa9ed59d9e80c751ae4c660f38f4d50a931ef
-DIST ImageMagick-6.9.12-16.tar.xz 9186096 BLAKE2B ce6db7e7d47f983be14f6a99dd7742fc249980bc3c872c613bf3e18b53c33060b767fd540498f76ec69252ddcf326cd95210185ef49c57d18e10d84f30d763dc SHA512 9248a916a4f930b797afc40600561555df362fdb80fab33d07bf0bca2444309eeb8d5fb564f442d3f3171557a91f33a9c0d9c7ebd30103c304ef579f36795d34
 DIST ImageMagick-6.9.12-17.tar.xz 9172828 BLAKE2B 87724cfad2b11fa3901dcffb243c314efe303de6f6f17382b82fbbd05b963b70394f17f68b1d87cc53eb7a12233a62241145d4f7f9e48ce8b1fedb9be3dda981 SHA512 c966524b82fd667b2eea45a78d4c4f62745f744889ca15c4b0a5bf390f47c801fff926ecd54e48b42b6142637ff95babaa1464fb8eb401c615fcc000166f46b7
-DIST ImageMagick-7.0.11-12.tar.xz 10284100 BLAKE2B 2b664106152f764948f34fe766552cb48e7ff2a5c83f3f8b7e0a83861ed218bbda278f487678704d42aee900f1ef4be4252d94ccafda2192f39d9a3701115520 SHA512 f5faf124a1923d8b3d362ae59c594dff4d92cf097b42995f6631812bbb320830cee71ca10a15b3894cecf1a286b4fa10e874d213c7438356d194d3ebff778cbe
-DIST ImageMagick-7.0.11-13.tar.xz 10305476 BLAKE2B 464ea44f8e31148bdcbdf2e66410e5eb9fe0526d06b2b1376311018f7e4897648601d5f4d541469e9f8a72ecbc279695f23288e90725e564a917f68df92f8aed SHA512 8b5fe1ad06ca3af752454f67f53a066842668832bbd4efede35c515449cd2b970e6f7f23e716928ba598f89a7ec020bd988cc392196c89117586fb97a48e1d9e
-DIST ImageMagick-7.1.0-0.tar.xz 10307628 BLAKE2B cd59142d40fffa583e19b5bb3016ad84afd1901c3dc679798341f764ff2b341f85a5049907c560eeb58866ccb21985910a99ea92a5ca734d60e5af35fbbe8378 SHA512 51a52ee2c09bb8ea276445393cc2f3398a54c10047d58eaea29a1a1d231ddae0fc00d81b930f299661fed0a3940c08e8c9f0b3932ffd46128186348ebb89fb00
-DIST ImageMagick-7.1.0-1.tar.xz 10313392 BLAKE2B f451101f524d3b43de300bb7a54779c698a97bf8afece444849d491ef78e7b69cd68d97908243cda99adf8041013f449f84dc6c5c9a13c48a4e2baca8f62a70e SHA512 42eb8aee1f62782cff9e0e6e7ac1ef1dfb27ed03c803cf53a5d2a5c794110efc475ae886e8879e05219d067971d2359b4a183ad5802e8bc1f41a42fcd21bf19e
 DIST ImageMagick-7.1.0-2.tar.xz 10312288 BLAKE2B 0c79b02a84c883e8016856bd5543a036228e9febab0160525737ab1105d3af52595959412b36d6120c52a11efb7a0f4c0638aa04d11b8dc3774fe655c347e929 SHA512 e9b38ccc56ad6936c59adbd934148aeca441f41015be8d2d4b7dd4106a120748aff8cba0239d8ada4288d679a19931696a0bec5ae05681eba7d3078fa119ad0a
-EBUILD imagemagick-6.9.12.12.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
-EBUILD imagemagick-6.9.12.13.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
-EBUILD imagemagick-6.9.12.15.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
-EBUILD imagemagick-6.9.12.16.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
-EBUILD imagemagick-6.9.12.17.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
-EBUILD imagemagick-7.0.11.12.ebuild 7340 BLAKE2B ecd38b0e0d7ed63543c514bdbf3f232ac2ca908891f2cab24a93fced4a08586eb207e3d236c8f1ee35361d743995f129e96e4f693eca30973f3c9320a7cd5a45 SHA512 258513e90922bb80e11c9a148d9d04a28ade01c6187281f6741ea2f384180aaf3ba81f25394bb58b7d6e28bc2379a41aad01a1b7c669b52efd5c5dc5bacc6d50
-EBUILD imagemagick-7.0.11.13.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
-EBUILD imagemagick-7.1.0.0.ebuild 7396 BLAKE2B e824e8d1c9b1b1561bcfe59e6bfa2fd6770508453c1a4246b88cdd671470f35a5576d0c0a76803501d76bb31768d87c5066c92f1f9f786ed6d01e77e5792f96e SHA512 bdfeb146f22e581bcab707407229a31debf6623b7861141d8fec50cea8d134232fe83066a9898a2136553edf946bf727d7a8e5724a7f979c0bac39868356b191
-EBUILD imagemagick-7.1.0.1.ebuild 7404 BLAKE2B 2a92a400e6b41a28bd9ff356ad4a40656c61df367ec298c685b663a22463cbc090fb368f12aae33a75dda7ade766464822d0293bc302ad11db790b7b3c7a4a8d SHA512 758697ee60c9d674ea02c32d1e997466809f515bd7ea361aaa5ef77528b9705eccb16d906cc548c0df9a3d0054e8a7615be665797cb6d9cb3eab6d06510c5dcf
-EBUILD imagemagick-7.1.0.2.ebuild 7404 BLAKE2B 2a92a400e6b41a28bd9ff356ad4a40656c61df367ec298c685b663a22463cbc090fb368f12aae33a75dda7ade766464822d0293bc302ad11db790b7b3c7a4a8d SHA512 758697ee60c9d674ea02c32d1e997466809f515bd7ea361aaa5ef77528b9705eccb16d906cc548c0df9a3d0054e8a7615be665797cb6d9cb3eab6d06510c5dcf
+EBUILD imagemagick-6.9.12.17.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
+EBUILD imagemagick-7.1.0.2.ebuild 7396 BLAKE2B e824e8d1c9b1b1561bcfe59e6bfa2fd6770508453c1a4246b88cdd671470f35a5576d0c0a76803501d76bb31768d87c5066c92f1f9f786ed6d01e77e5792f96e SHA512 bdfeb146f22e581bcab707407229a31debf6623b7861141d8fec50cea8d134232fe83066a9898a2136553edf946bf727d7a8e5724a7f979c0bac39868356b191
 EBUILD imagemagick-9999.ebuild 7397 BLAKE2B 9845d38817e2dbcfbc3c970d6ed508588caf22adc844178de2c2fae9f12c12cee60e7c97db29b99393720675a9401d1175e2114b8f5c3bee664335bdd4703823 SHA512 8832088aa61e5c7f6293d970f4460dbc629c2a7a0a9b70a44b8e7de9473823b7ee156e0f40981eb327eb222a9b604e21f3bbffb41ffff580b036c67d7da996b8
 MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.12.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.12.ebuild
deleted file mode 100644
index 69de151f32bc..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.12.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.13.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.13.ebuild
deleted file mode 100644
index d17773f5081b..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.13.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild
deleted file mode 100644
index 69de151f32bc..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.15.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.16.ebuild
deleted file mode 100644
index d17773f5081b..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.16.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.17.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.17.ebuild
index d17773f5081b..69de151f32bc 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.17.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.17.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.12.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.12.ebuild
deleted file mode 100644
index 53b6fa068e7a..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.11.12.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.11-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.13.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.13.ebuild
deleted file mode 100644
index 769cb4c0e00a..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.11.13.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.11-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild
deleted file mode 100644
index aee829b4dd8d..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.1.0.0.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.1.0-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zip? ( dev-libs/libzip:= )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zip)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.1.ebuild
deleted file mode 100644
index 42e594451118..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.1.0.1.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.1.0-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zip? ( dev-libs/libzip:= )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zip)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.2.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.2.ebuild
index 42e594451118..aee829b4dd8d 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.0.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.2.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/kuickshow/Manifest b/media-gfx/kuickshow/Manifest
index 75db4c0a8c81..bf1e406c6daa 100644
--- a/media-gfx/kuickshow/Manifest
+++ b/media-gfx/kuickshow/Manifest
@@ -1,4 +1,3 @@
-AUX kuickshow-0.10.1-kwindowsystem-5.82.patch 1012 BLAKE2B de7f74de219e1f31f8ed9b67c724c81f0fdb0a7735cd74e8fdd76035e17adee55156e912ae13ca3366ff8465c95aaacd7283c668ef7c97c6c4d99865a3f09aca SHA512 9bd270286ae0822403665f9308b50004e867cfc84b02cf062018347cfa6fed10f0c439d2d1f1f5c9aa37b7577f6200d6cc951b5ce89cba92f79f522277460cbc
-DIST kuickshow-0.10.1.tar.xz 896900 BLAKE2B 50e6bf055a76d0668fe6f92d411610908e9098b5cb14df89403d7e6462941e137390e14a6828c790c1b7067b9f596e70c40d40e2a64c6a0887b1f11251911219 SHA512 c2d812a0e97be1b5b0db1f6c90dc1347be2ffccd48403b46e637549b608a395cdcdb6b36e842b1c5039d18861cfbafd4dc7283bb69f530548a3b5193a586d4dc
-EBUILD kuickshow-0.10.1.ebuild 1163 BLAKE2B 8e80c8ea207559afba44eee60688535f5298388e1760348eee96291bfbd91ae640ebd24c71b1b09b9ab96113fc76157d8a3ef2b5143cdc4a1d7ffc3b5b3172d7 SHA512 bc022001f2757a5bddb82e44666c1d4beb3f0d1c20515d9623e5855d30626422aea8ec060f721f46c9ce61e0919bd4df32b9b539cb03a7368b4a8366c2b93f1e
+DIST kuickshow-0.10.2.tar.xz 905984 BLAKE2B c290a47835fd0d583d406cd322f2c617ca6da0868c86bc0ee11bd97220746e45d289e6ac9fd8ddcfbcd9784e72b5b12d9262792c649494c884824971e9387e19 SHA512 970db3724938e43d574e5a6df198115b7240baa93b83680dd3b613837b1ea0f1d9e28275dfe7c8afa962205c926fc127cc41bfb8469f9e68131714057f72635f
+EBUILD kuickshow-0.10.2.ebuild 1087 BLAKE2B 078017fe307177d92701b456bfeba2b497e55fa7355eef7aca110d0ab82715698ced4016b934bb64cab5050db916e328fcdf412db3b07b6f424abb43c8358d49 SHA512 ae36dcd26079e22f0c9080d6f684b21c588d3d3bf853f141a469805305e2086f194e0884220deb4dfb340e459c4f15e451c0fee294301e69a73bf3f3692c43a3
 MISC metadata.xml 398 BLAKE2B aed31745382f12d6c97f524780103c48078a618501d3ed4ea2845e6e4d7fa74090d46a043527162cf3183e2d1ddcde9f500729f2efccb958ffc03c7250d5da62 SHA512 cc4d87aea5776c4bd51fe4f86366acba9cb96a1657651ea5ba4610d361804acbb8046bff4dc75c2b72f98e69b3fb7be468119d1d760e2d75861cbf7e35e0a54d
diff --git a/media-gfx/kuickshow/files/kuickshow-0.10.1-kwindowsystem-5.82.patch b/media-gfx/kuickshow/files/kuickshow-0.10.1-kwindowsystem-5.82.patch
deleted file mode 100644
index 84883fc64156..000000000000
--- a/media-gfx/kuickshow/files/kuickshow-0.10.1-kwindowsystem-5.82.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 52e30eb18b9b6becbd58e8c1333f9f81afbeb8d6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 14 May 2021 18:31:23 +0200
-Subject: [PATCH] Port away from deprecated API (NET::StaysOnTop ->
- NET::KeepAbove)
-
-Deprecated since 5.0.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/aboutwidget.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/aboutwidget.cpp b/src/aboutwidget.cpp
-index 79cb942..5ec75b2 100644
---- a/src/aboutwidget.cpp
-+++ b/src/aboutwidget.cpp
-@@ -41,7 +41,7 @@ AboutWidget::AboutWidget( QWidget *parent )
- 
-     // KDE specific settings for "window" display (it's just a frame, not a real window)
-     KWindowSystem::setType(winId(), NET::Override);
--    KWindowSystem::setState(winId(), NET::StaysOnTop | NET::SkipTaskbar);
-+    KWindowSystem::setState(winId(), NET::KeepAbove | NET::SkipTaskbar);
- 
-     // these settings are difficult to set in designer
-     QPalette whitePalette((QColor(Qt::white)));
--- 
-2.31.1
-
diff --git a/media-gfx/kuickshow/kuickshow-0.10.1.ebuild b/media-gfx/kuickshow/kuickshow-0.10.1.ebuild
deleted file mode 100644
index fd2850a1a6f9..000000000000
--- a/media-gfx/kuickshow/kuickshow-0.10.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Image viewer based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/KuickShow"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-libs/imlib
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!media-gfx/kuickshow:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-kwindowsystem-5.82.patch" ) # bug 790200
diff --git a/media-gfx/kuickshow/kuickshow-0.10.2.ebuild b/media-gfx/kuickshow/kuickshow-0.10.2.ebuild
new file mode 100644
index 000000000000..ef6840410a0f
--- /dev/null
+++ b/media-gfx/kuickshow/kuickshow-0.10.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.76.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Image viewer based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/KuickShow"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-libs/imlib
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!media-gfx/kuickshow:4
+"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0668acb45546..35b04b636a22 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index c7f32332faca..0873ce740677 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -1,3 +1,4 @@
+AUX fdk-aac-2.0.2-always_inline.patch 2581 BLAKE2B 46f18480fe138f4b6fd98bf3474673234e1fc3e88020be07bc63284634b971a902cbe3b1996c676e12c30e502e877d7a0b4e328b97a469dd2ed7d6bd759d5161 SHA512 030bfb1ad2dc53618a0387852910687e89bacb4cefd8d7a9a230bcda5a0c0e5493e464771691491d5da4c9bc8c83ff48a99dec5e384d2c50ebcd672a051a7ce3
 DIST fdk-aac-2.0.2.tar.gz 2886434 BLAKE2B f9917cf8ded3e4165048b27211c5985b4fe174d1ac815a7bc4afad88e059f3a89a24f88ad20633becdba9cb91717b9d4bf44781368c436e35002061b1644eb64 SHA512 8e5a7992869a7e649bee6d41bf7c6e408cec7ba1931a6cd7a9ad8a01e6ac49bd299ddd147b18823e8ee379ce7c6373d7f5a94f0f859ed973a30c61eccd53fa7e
-EBUILD fdk-aac-2.0.2.ebuild 1328 BLAKE2B 53645e3a1085a5a9ac932600bf744b5a2c6964e51dc45fab1c2cefe50e101ace619deb7cc5cd1c55148611362e7290527d925ad03d0b7766beb476a85f6c089b SHA512 959b4333e726e664005cd5ed920eab51de7966197eaf0e02361c3498ebdb4a90f7ce48a092b8c24a75c3202fac61372cbbbbd133a6351ea80f0063900da6e362
+EBUILD fdk-aac-2.0.2.ebuild 1334 BLAKE2B 3f40d1e627579dc4b3c388a85d478573fe7b0a39e10fa4595e96f9142d1541412bdd9c3dba28d6c42813f42c3991d0fcdb4e54d28b794caa61b985e8f271dc1c SHA512 bfc171b2d4546db918e721d4986050ec151f21aece58f8833f254bac3146dfcbc0dda08f33757a04d13fdd8152b3b47af1e7973ddedf6c9e54ba84f33295dead
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
index b003c4ad8fd4..913c27ccdda8 100644
--- a/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
@@ -24,7 +24,9 @@ LICENSE="FraunhoferFDK"
 # subslot == N where N is libfdk-aac.so.N
 SLOT="0/2"
 
-IUSE="static-libs examples"
+IUSE="examples"
+
+PATCHES=( "${FILESDIR}"/${P}-always_inline.patch )
 
 src_prepare() {
 	default
@@ -33,8 +35,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
+		--disable-static
 		$(use_enable examples example)
 	)
 	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
diff --git a/media-libs/fdk-aac/files/fdk-aac-2.0.2-always_inline.patch b/media-libs/fdk-aac/files/fdk-aac-2.0.2-always_inline.patch
new file mode 100644
index 000000000000..afb2dbe1026d
--- /dev/null
+++ b/media-libs/fdk-aac/files/fdk-aac-2.0.2-always_inline.patch
@@ -0,0 +1,72 @@
+From 7f328b93ee2aa8bb4e94613b6ed218e7525d8dc0 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 10 Jul 2021 13:06:57 +0200
+Subject: [PATCH] Do not force inlining of indirect functions
+
+* A function called indirectly cannot be decorated
+  with `__attribute((always_inline))`, as this is
+  guaranteed to only work with direct calls:
+    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63220#c1
+
+Bug: https://bugs.gentoo.org/798045
+---
+ libFDK/include/fft.h | 4 ++--
+ libFDK/src/fft.cpp   | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libFDK/include/fft.h b/libFDK/include/fft.h
+index d394046..4ef62b4 100644
+--- a/libFDK/include/fft.h
++++ b/libFDK/include/fft.h
+@@ -139,7 +139,7 @@ void ifft(int length, FIXP_DBL *pInput, INT *scalefactor);
+  * bit scale headroom. The values are interleaved, real/imag pairs.
+  */
+ LNK_SECTION_CODE_L1
+-static FDK_FORCEINLINE void fft_4(FIXP_DBL *x) {
++static inline void fft_4(FIXP_DBL *x) {
+   FIXP_DBL a00, a10, a20, a30, tmp0, tmp1;
+ 
+   a00 = (x[0] + x[4]) >> 1; /* Re A + Re B */
+@@ -168,7 +168,7 @@ static FDK_FORCEINLINE void fft_4(FIXP_DBL *x) {
+ 
+ #ifndef FUNCTION_fft_8
+ LNK_SECTION_CODE_L1
+-static FDK_FORCEINLINE void fft_8(FIXP_DBL *x) {
++static inline void fft_8(FIXP_DBL *x) {
+   FIXP_SPK w_PiFOURTH = {{FIXP_SGL(0x5A82), FIXP_SGL(0x5A82)}};
+ 
+   FIXP_DBL a00, a10, a20, a30;
+diff --git a/libFDK/src/fft.cpp b/libFDK/src/fft.cpp
+index 4e6fdd2..c9ee784 100644
+--- a/libFDK/src/fft.cpp
++++ b/libFDK/src/fft.cpp
+@@ -170,7 +170,7 @@ amm-info@iis.fraunhofer.de
+ 
+ /* Performs the FFT of length 2. Input vector unscaled, output vector scaled
+  * with factor 0.5 */
+-static FDK_FORCEINLINE void fft2(FIXP_DBL *RESTRICT pDat) {
++static inline void fft2(FIXP_DBL *RESTRICT pDat) {
+   FIXP_DBL r1, i1;
+   FIXP_DBL r2, i2;
+ 
+@@ -196,7 +196,7 @@ static FDK_FORCEINLINE void fft2(FIXP_DBL *RESTRICT pDat) {
+ 
+ #ifndef FUNCTION_fft3
+ /* Performs the FFT of length 3 according to the algorithm after winograd. */
+-static FDK_FORCEINLINE void fft3(FIXP_DBL *RESTRICT pDat) {
++static inline void fft3(FIXP_DBL *RESTRICT pDat) {
+   FIXP_DBL r1, r2;
+   FIXP_DBL s1, s2;
+   FIXP_DBL pD;
+@@ -233,7 +233,7 @@ static FDK_FORCEINLINE void fft3(FIXP_DBL *RESTRICT pDat) {
+ 
+ /* performs the FFT of length 5 according to the algorithm after winograd */
+ /* This version works with a prescale of 2 instead of 3 */
+-static FDK_FORCEINLINE void fft5(FIXP_DBL *RESTRICT pDat) {
++static inline void fft5(FIXP_DBL *RESTRICT pDat) {
+   FIXP_DBL r1, r2, r3, r4;
+   FIXP_DBL s1, s2, s3, s4;
+   FIXP_DBL t;
+-- 
+2.32.0
+
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 2e0a1b39ac64..db90fac27510 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,4 +1,4 @@
 AUX flac-1.3.3-fix-zero-first-byte-md5sum-check.patch 813 BLAKE2B 83c327bebf5b813a52a533e2860887313e065cb0fdda807539e20dcef68203aaf5903622f8eae3b3016e6b6259b3af841facb6dfc9ab735d6f87b43a5e3b8974 SHA512 c5f5d13298a7c3c18e7b8ffa0c10ab0427331ac393672443b54686465f833712c522c1e55f834823804dcdbcdb5deb742d65f6edd30e271d980c4337a61a4480
 DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6 SHA512 d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
-EBUILD flac-1.3.3-r1.ebuild 1643 BLAKE2B 9f0aeb88e19be519f2301802437f27cf4a834ae5903d75b5a91d7d5f2c1ab658b010c1499bb0ceed4550d577a1e27e7a7130e218f00aa68c61e59b32ae3a7186 SHA512 865a739368e3da2ced5c9f5fd47c971a120e791385af709ddc546561744f2a855c9398a9941482826a1a94d9e59eb94f2b070297039770fcaf2b7bf7daf30fec
+EBUILD flac-1.3.3-r1.ebuild 1650 BLAKE2B 533743aa397fca73f1dbdf04610591752cceec2aace494a8a87a7ce7937c16ea18cc896af4b08e45cc6c261b3743665fda7c0042cef886e9fd9888a9276e047d SHA512 5583b0e40c767a63f3ff2addb2705f091b5c4a5bcf341cc0e737fc9d0684c2ae535d8a10663879191c70d459ad5f191fa237c1fcaca4caae369f31a31f1a1938
 MISC metadata.xml 327 BLAKE2B dee4aea4020b899879f83487d34853963264b68e7a7e8c509571bc353a5b20fde4d7f78899b900bf4214f5d488f088523090d4f41e8542f069e9a4eb7791c2ad SHA512 a4e6ad50d3089ff980a07a6ea6f7fcc22e3efc4da4c5721492aae001861fa185f12d68fc5effb55ccce8d67042b7a605c28096f4bca88f2ba9d5b4eb2593d14c
diff --git a/media-libs/flac/flac-1.3.3-r1.ebuild b/media-libs/flac/flac-1.3.3-r1.ebuild
index 1dd5109adf9e..86c9e3eda8e1 100644
--- a/media-libs/flac/flac-1.3.3-r1.ebuild
+++ b/media-libs/flac/flac-1.3.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index 65b752ca5764..edd97249a632 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,6 +1,3 @@
-AUX game-music-emu-0.6.2-gcc10.patch 546 BLAKE2B ef04c95fbb0fc51afbfaf27d93cb38c689ff07499f3b7362a0c50ccf726082bf68f4b7d6bc36a3abdff9d81a8bb87f650ddac362e989da590471ebbece810e92 SHA512 a09190e164c969760eded45474c965db1ebd53d78485b748d31e067eccc42f32f370ccab80d4ed51bab393d535ccc499ec8212eb4258428417c60b79399691c9
-DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
 DIST game-music-emu-0.6.3.tar.xz 234412 BLAKE2B 21edd8f5e868231424c56dad6740a5c7cb8e7f503b707dc56ea71d7a75085566b2bd0c2060b0f9e919f858c13821b3810959cff96c41f9248bb3b98f12eb22f7 SHA512 4b20c69ced696bb879c34bcb7ce0f5f276642458d4cebca8ede673eed7d50664e527626e2077f85a3411a26660f1b3f01e43cccd72945e1edb2994421efeb552
-EBUILD game-music-emu-0.6.2.ebuild 544 BLAKE2B cfc296de059a13c0d684ee037cebd5088044792b04a2b78b4c3bd316e2ed5d61d1011a67bbfb40262a6bf8778737156aa48eeb651be2824d2c577849b757fb42 SHA512 d0d62797c51dc871ae10fb137cfa700f2ea2c7055d05d15450c0dea2ab89592330e5be913a28a11fba5a6e97b42c78e9459cbdb5d50aa7b8f8ae9dc9bc2f2823
-EBUILD game-music-emu-0.6.3.ebuild 646 BLAKE2B 49bfadb112ac0cc6f3fb9f93ac28d9bd56f4272bb0811b15221f331e274e022c7b2bfabb216b51a81234a15e8d60afda1bd2cbbdfdc46ca0b2aea324250dd40a SHA512 cd40014180fd4f78476efcf69e169039034eb453053e862f1d3531b27297409ca237c956112a91d5b1adb157b6d9979b21d29b9254303fb23912533cc5eee176
+EBUILD game-music-emu-0.6.3.ebuild 645 BLAKE2B 074907dac20317bfdd490d630996d8f4421fa716a1da889c48efab21e62ed8998ca45acc97d470a69dd1afd1b2f9aebea914d7ec3390b0d8bc78f66dbb6e7b82 SHA512 0312b6ebd47b07f16b335dfdc17f2e3253acd97959846d7c1c43d98614548267a7836c15e2b1cea4f41c76e932fceb1085735d43212337af94ccf6fab45b9366
 MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/files/game-music-emu-0.6.2-gcc10.patch b/media-libs/game-music-emu/files/game-music-emu-0.6.2-gcc10.patch
deleted file mode 100644
index 620085ca7b78..000000000000
--- a/media-libs/game-music-emu/files/game-music-emu-0.6.2-gcc10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,7 +66,7 @@
-    if (__LIBGME_TEST_VISIBILITY)
-       # get the gcc version
-       exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
--      string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
-+      string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" _gcc_version "${_gcc_version_info}")
- 
-       # gcc <4.1 had poor support for symbol visibility
-       if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
deleted file mode 100644
index 4f0e7ce5c127..000000000000
--- a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Video game music file emulators"
-HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu/wiki/Home"
-SRC_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-DOCS=( changes.txt design.txt gme.txt readme.txt )
-
-PATCHES=( "${FILESDIR}/game-music-emu-0.6.2-gcc10.patch" )
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
index 37ddef00f8c7..46796f67c682 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 DOCS=( changes.txt design.txt gme.txt readme.txt )
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index e1ee8cbf4552..d14eca2f72d0 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -4,5 +4,5 @@ DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa
 DIST glew-2.2.0.tgz 835861 BLAKE2B f403f3ebd5a78d21cf5744e8e6714a0558c7cda57930751afeced966a54bc9634c070eee4d791f5948bfc60b5c03ca5f488559c6372c0953c0ffe1711a3913f3 SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1
 EBUILD glew-1.10.0-r100.ebuild 1908 BLAKE2B 59364c25acda1a16267dd8cd552161edce0666c0871a1d79bd70ed1229da1ea2115e1cb8e53609a3471b534ab0a09268335ed1024578787eb857b05028682e52 SHA512 88b6c7add297fbf7b8b954b761faa14020d614e96bcabc51e48d9dcc7da98c022062173c19188d996ad5fa294d989a9df14e62fe296259bf84093bacdffcab27
 EBUILD glew-1.6.0-r100.ebuild 1881 BLAKE2B d32880f9de5e91a332f2b42e3c3649e22234ac152e1216d944cab4be1866887673a2fa14de3e0136984b13dbb89ce75d125cef8a338507651185ea9f2b25a8e5 SHA512 a628e0b5eb4e6dc1691688ad59223793686e9d899046a1713195dcc69c7a467cc8acf23ad9ed5f5018088342b9c27bb51d08b58aec9c73c0dc87781c11417e42
-EBUILD glew-2.2.0.ebuild 2446 BLAKE2B df522bb082823fd231b72a622bdd81a07c9722fd491b309ef29b1a8fb4017bf0c8559d72daa80b69075d0fe37915d27573d478c735d73acc0e822fbcd19cd823 SHA512 5bece96e3a75a5c95309ec324a26e5915c7b41c18d58c78ad97ae248eca97cec5d339fd178fb9431d4e0f0466491cb490cdda370935c2b0b99fc04f62609baad
+EBUILD glew-2.2.0.ebuild 2453 BLAKE2B 2f442d1897072543feaf796777e6d8a149601a8d282c2fbcba9a290b1913a9899eb6ae50a9db5db15797831eb88d0682e257b0fed514cac57a1461d9baf92a20 SHA512 1bc2a8a286c0b7e6a2d0e050044cfbcdc3be8b107447199f0dd766cc6bb47a8c4352f960d5098594900f959eb9cf3634cb248c83407059d08e72fd06c3da8baa
 MISC metadata.xml 367 BLAKE2B 0ad00ad189fd494aa7c89bb30ab03d4bd13f05876bacb215c7cd5ab4b0dd61a35aef1ea0857b3143bf065438e9ce01ecf86ca61fb059fcea53ff9796c69d00c6 SHA512 b7df9f67584854dc8b6010bc804cc8940aa663c5640b2ba2c9c260ad5776b9ceac9c5afbcdb3eb5f37da75cf85b59eeee911d37661e318c3f5fecbfd6ef5b9a9
diff --git a/media-libs/glew/glew-2.2.0.ebuild b/media-libs/glew/glew-2.2.0.ebuild
index 940dea894139..d49b94eaf249 100644
--- a/media-libs/glew/glew-2.2.0.ebuild
+++ b/media-libs/glew/glew-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index 55d3ae2aa04d..d0ff029868a8 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,6 +1,6 @@
 DIST glu-9.0.1.tar.xz 434632 BLAKE2B ed624b107a97ac84517cd0fa740090746ab93c77498135bf6dae3ee488e04afc93b0d239aba15533de8ab407d3d3d5e7cb5086b29985d93037e78753b249741e SHA512 8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018
 DIST glu-9.0.2.tar.xz 436176 BLAKE2B 90485938e4809ce7bb56da25bd60be9f3f7b7f40d511ea6635e40d749e519d1dca6241d891224d3cf331b911f545df4ef9aa2101baf4e3b18df69244edbcb8a4 SHA512 2517d7406bb643d12c017a95dcb5d8716f307344332638bcbdf274a90752a7c22165d34745f1b082ed916bb07d40e62d1d1d67d96426225be63166f3480d6f64
 EBUILD glu-9.0.1.ebuild 1010 BLAKE2B 078af9acf532164d49b0a31a3a3da31d6c7ee3dbe696a8113eb29fa0a1943915b0aacaf3d082688c4cb34ef046edd67f8dd9be4ae3517460a9d527b122b08fd7 SHA512 434aceecdf7108304d26b077e50978064471acf01399a72384c0d7e682ee996ba3aca1262a7edd0a82e26525c22798e0c6fce84b2af74cc0f4a1a96c0b9bfc31
-EBUILD glu-9.0.2.ebuild 899 BLAKE2B 27b4df51389f7963e58f9fc3bee10dec6062d9012819d3d78919d67bad2b5db960ee92518518eccf2e883975d682e56807521188f9a87a76f9c913bf6b06d259 SHA512 d1dc7621a6bc71a9fda9b2c781340e637947a5b2949d05f3949c2a43b72b5b097c1be15561f28a7dba7d33f9c05a4164695c22ad8a90a41dc01659c0817cecce
+EBUILD glu-9.0.2.ebuild 897 BLAKE2B 45dba9f9239273f10ef184aea1be13db4ee88a72727301758ca82b5b5ccab651ea35bdb2a97b968f2ee6b4b76783cc9ad993ec78a2faf4120b0e824fdfaa557f SHA512 31d333b7e83280eada99a79ae5f45de1b6e5c54bebc3393626252d7784821f284966c0848478eac2ce6aa003b4df0a56ec90843f7433f319b57084a3cfbe2e18
 EBUILD glu-9999.ebuild 901 BLAKE2B 2377cc6c78fd9bca5a1c31e2ad14cb30e5f97cb0e7f9be7d2900874e6b1d8481766afd939a6c312f98a6e55d3d35cc7eb30ed1f971e4ea5473f4572fa3b01f85 SHA512 4bc9bd397157b3bdc2767b75537650829502a278276479d8b5d153649286c32e39504ba8dbddfe79cb090f3d874eb730cb959af201374c89b7af3fb0aae8da0d
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.2.ebuild b/media-libs/glu/glu-9.0.2.ebuild
index 3caca8302a02..61d7a20c4368 100644
--- a/media-libs/glu/glu-9.0.2.ebuild
+++ b/media-libs/glu/glu-9.0.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index 2a2edae30e67..dc7a692b7952 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -2,5 +2,5 @@ AUX libao-1.2.2-automagic_sndio_oss.patch 1407 BLAKE2B 8a67faac3b2d4a617683af689
 AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
 EBUILD libao-1.2.2-r1.ebuild 1523 BLAKE2B c5234b18ee4fee0d71c12f22fb6143b0426dea17282d2b6fae84550a6707101316080d2cf8fdcd89f55e7bd40d88e6a50ff5d508da30bfdee62a371fa6720ff7 SHA512 c1823efe1bebe94ff7c5ee1352db03b1f07aaa47d849db9bc4a089679115c8e8f75ade6e6ff07a64db9ab192d0be2655b35e7eb3881efdb4fcc6f79566f63780
-EBUILD libao-1.2.2-r2.ebuild 1679 BLAKE2B d139b11c2bf71a9ac4899a148d167d537f471ab34ab5f87e576888700d781fe9ddf8822492bc8cd0b707c00f7a020433a05ca3faa81f1878e535e52a405ec15a SHA512 21b1fdba34f3a1ea88a52e8687df9053a549985f2366897c1c5a04951701a15a72ac52a9e2e46328d13efae4b52aba6d3504328adc1a9d42e191188bf5edc8a8
+EBUILD libao-1.2.2-r2.ebuild 1676 BLAKE2B 6361cdc5748b06d7ba2c07718955aebf109fa2e2373a625de6f1724dd0f8699124694647cfe06982620018ac8a40be90a281bc8d13307650ff63d0d61e3f4473 SHA512 3855db86f275be862fd7646364704dd4ffad3740c6faecd3d2f6422d546bed4e9288a648a58cd735ff5f109c239aa14121fa7716cf9ddc080983e0d22ea5b85d
 MISC metadata.xml 334 BLAKE2B 31591836828157d48ba8a49c8b44fee8a42b0a78f0c95c451fa0dc347c36b1508115bbc14abb0b84246edda5da8b733d9d126fdf2850cc35c54620e105e76e8d SHA512 f3d4066c208ef45f754e0fc0c30e895c7cb06ee8a2fa21265d09d90b3937917d0ed156e88f7d75b9441361282677171980112c3e1a088442abf20bf66fb3d813
diff --git a/media-libs/libao/libao-1.2.2-r2.ebuild b/media-libs/libao/libao-1.2.2-r2.ebuild
index b3bfad6d156f..9adab706b812 100644
--- a/media-libs/libao/libao-1.2.2-r2.ebuild
+++ b/media-libs/libao/libao-1.2.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio sndio"
 
 RDEPEND="
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 28fb95fc21cc..da1bacf0d7cb 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,6 +1,4 @@
 AUX libogg-1.3.4-libdir-m4.patch 409 BLAKE2B 68ff8990afa20d42cd527ef9b46ddf0861f167648bba14661e00fc453d8b9df33e4feb94050c13d33bd6da38e68b44e0e179e4c7049582765b3d1e4b3bbf8c84 SHA512 f285cea745d8eb5c2f3356b007b9bd686a9a0331e1a0c96f85da48b258e6544de0c3cf8ba9cd8f0caaf7c0cccc9ea033162c7b4e9fa18c93463bc43d176e8316
-DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
 DIST libogg-1.3.5.tar.xz 429076 BLAKE2B 464cf767902bd8bd463d3faaae01fecbe33d4cc87dabf38388ac961bfbe24e6d113f4ee88542e6bed6fd7eaaf0709c7f5cb7a306ee910527f79810054ccdbae7 SHA512 5d1cbc2a3a1fcf5543f5729bd5eb560cfc740c5d17a2492ead137970c45e6203ec1f5de536d77c4b73ece9e3b0046eaa9181c02a09de72ac7ae51b1fca1e1ee7
-EBUILD libogg-1.3.4-r1.ebuild 796 BLAKE2B 08a72998e40a302156f66999b90e2677834b50c9ed289453fdeb33c95ecaa15056d9171e93b177811e989a0449049ea15a9d1be7d8f8187c1c0dec1999717132 SHA512 1e06f19cbb3d33d1ea9abc7632e9ba6dff1df2d2c9b4269841932075f58896fad1e39cb1f96c4eff0440a6491c74ef61af778ca6cf5829baa6b1d355c0af3ebd
-EBUILD libogg-1.3.5.ebuild 797 BLAKE2B fe69e740292c2098e78321c186df2f36df5025cc28cc7c245f4877f0cf8646da20b89e535a0a59d3f52224e581a88074fba0442c29f77bbb3853ea36cfb245ce SHA512 4d23206edd824e3002feaf27386ba764e38088e1d1436cc619a1d5e0baf51672aa20fceaf3526f722360d198f02701019efced04e09e610730b2e7fc6aa23054
+EBUILD libogg-1.3.5.ebuild 796 BLAKE2B ce81c206143129383e9e6a3c4946db95c891a5f3c3cbbe994b7aecb65b9f602a510ba075b52f90a71d5c9a31765901e34904a74d1216a68787e6d4ecddb7925a SHA512 a416fc465a99d81987438a136aad423a701397834db8e5024553c2a3b29896ef76647dcd29bad529f641a860f07f0054b6c2c13efafede95bb33912ecb6470e2
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.4-r1.ebuild b/media-libs/libogg/libogg-1.3.4-r1.ebuild
deleted file mode 100644
index 0814202d3a0f..000000000000
--- a/media-libs/libogg/libogg-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="the Ogg media file format library"
-HOMEPAGE="https://xiph.org/ogg/"
-SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ogg/config_types.h
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/libogg/libogg-1.3.5.ebuild b/media-libs/libogg/libogg-1.3.5.ebuild
index e410ca255528..960eea10c8d6 100644
--- a/media-libs/libogg/libogg-1.3.5.ebuild
+++ b/media-libs/libogg/libogg-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index dd4628165067..724568c8243e 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -1,3 +1,4 @@
 DIST libpano13-2.9.20.tar.gz 3564544 BLAKE2B aabf9d8a3dac5b01e4a5bdb6d5ad6b56ea3e672f143b002c06b7108fae19cd6a00e8b524a4c18cbe16c65f41242fc12e7b19dd71c00bf6b553db65472fe8798d SHA512 18da5cb3760f06df8007622a64c4121c3acdadf8b02faa2125f319acde30532378cec5d97ccd5a65d6d2c1960c1b4946c80ffa850da2dc790051f5c0b76f8a86
+EBUILD libpano13-2.9.20-r1.ebuild 868 BLAKE2B dc6c4d1bb745a4e96290b84dcbd8b62647860868c464a3eee3d96e11f7660b36c4092f82ee4052bc95d66bd71d43490b800d48706f7709d8a871beddeea81036 SHA512 ef5be06c6ab77742256672c355557095b5edfcb0784cb0ca3a144ecacb2b9969ab3728b849dc19e16eed412f25b700cee336c305edcbd394db6ac9f4f54caed3
 EBUILD libpano13-2.9.20.ebuild 863 BLAKE2B bfedeb2bdacaaf0869fc81b94639696d8e3a55780ece792315d106bf4b273f24ef37e3616277d36d78397f19fdedb79ddc826cb7d0eb6454dd046ee7f82c5d29 SHA512 70a3d1b93416a41481a5de719aee25a322caaf5093eb781b257c5e23d115e642531297110d785d90e552d98d0ff435b6c457e650234e801b43a5392fefc706ee
 MISC metadata.xml 324 BLAKE2B 04d40b636b02143022e3a5e9d5733a8bb758937d86d0800faf7dcf21b501f97ff8e970e13b5e842492e74f237dfed8f07efb40ce3e952172c41a208196a4cf23 SHA512 40a9330f4bbbfdc98598c5677d7b9ce485fe13e96bfc976f3829e881c5da234e8abc6d5c9e8db7522ba32536d953b2a0daddc878bc09fb474d446139da33f3a6
diff --git a/media-libs/libpano13/libpano13-2.9.20-r1.ebuild b/media-libs/libpano13/libpano13-2.9.20-r1.ebuild
new file mode 100644
index 000000000000..dceea6134c5b
--- /dev/null
+++ b/media-libs/libpano13/libpano13-2.9.20-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="Helmut Dersch's panorama toolbox library"
+HOMEPAGE="http://panotools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="java static-libs"
+
+DEPEND="media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	java? ( >=virtual/jdk-1.8:* )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+src_configure() {
+	LIBS="-lm" econf \
+		$(use_with java java ${JAVA_HOME}) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README README.linux AUTHORS NEWS doc/*.txt
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index 1b89051a6ffd..7410cc62c694 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,4 +1,4 @@
 DIST libsamplerate-0.2.1.tar.bz2 3747188 BLAKE2B 83540f3e75cfa79cbd166f075d22cab6a63e0e057b90ac6a3760c07196cac962df7d1ca26620a9033de046e0528bee3ded2b482e8629b1ae316844b5b31f3074 SHA512 f54f7f12c9536868d7a11fc9cbb86857505e7b75fe34cedaf0b9bfc864da6037296b3eae303a33d4c87b7fd20d96933b91ef59c8cc3d1313b9fc21654e5daa2d
-EBUILD libsamplerate-0.2.1.ebuild 1275 BLAKE2B 31ae278e123cf062ad85bcb0ab30e010cf8f2567b0dee4cc4489b58a2d1771b1272b36e4dc8787bfc03888aba50cd2db2b407863ab45a81d6acd1c9a2dd8c75a SHA512 937dd69f5070996dfecfcf32dd1fafed4546e33f904312cccfc541b16fff911b9c9532bf7a326968e277b73945eb262674f17f84210c13e6753f3fc84b080eb9
-EBUILD libsamplerate-9999.ebuild 1282 BLAKE2B a8a0a12e7b2d244f497998d36318d4122f376c79eb0e4abfe6b0b028b9fbd460b7ed7a57e2ea966cd2c8c3bf21d8c86027835cf62f1c61723e5601422f030cd0 SHA512 9eba6f3eb488a4912777efc82b3529a87d581dafc817d903170ba2f19148aa67e829f926786dfc5c6d632ae1e10feaa9430dc6bfcd82f66087f4ac8f6138687f
+EBUILD libsamplerate-0.2.1.ebuild 1283 BLAKE2B 9a2ab16ba202ce58d532b595f8e751f3f17374d7985de6d4dce8a34daaf899c369a30223932f7b34c21f69d5c6373cbe98d492d52b36852b69a29eddc9902120 SHA512 92d9463d1b2f58021e2c9478ccbaca5f611190676aead11430211412fbaa31224ededcf47147545e1298f7588e30b594f53a9e240de0ac18283d1ba6382533ba
+EBUILD libsamplerate-9999.ebuild 1290 BLAKE2B 8444874ab6922d1076ea1774511d290544a0b3a3968437e615cada7fa7df07b07af0c61575e571811fadb4e2d1aa97e6831a7f28f02829e5f15f6f5c22cd9d0f SHA512 fab015255dc964b6387d09b4e7d7add29232ddb86517c7d6105176e91789c7c52416a4bbd8277c163c3197864c57b472e17a0fd4ec99d8d5fc6eccfabff9d691
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
index 6d9b87d12f82..283b46dc02b6 100644
--- a/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
@@ -6,14 +6,14 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
-HOMEPAGE="http://libsndfile.github.io/libsamplerate/"
+HOMEPAGE="https://libsndfile.github.io/libsamplerate/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
index c2eb013b6fe2..f754eb4667e5 100644
--- a/media-libs/libsamplerate/libsamplerate-9999.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild
@@ -6,14 +6,14 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
-HOMEPAGE="http://libsndfile.github.io/libsamplerate/"
+HOMEPAGE="https://libsndfile.github.io/libsamplerate/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index c807cd848036..82b5328df8fb 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,4 +1,4 @@
 DIST libsndfile-1.0.31.tar.bz2 875335 BLAKE2B 33e3c3d111427e829d8233aec52c227188834936839da9a04cf1ea5d2595d6a3127e7ce86d7686ca0336cca2017e6e2466845c27c7fc399efae34a0902316e41 SHA512 62202092e5cac6346fd3c0a977380e9bf888fc59d08c9c9707dc254a8ef6ed6356da2ab0430bb970c7b06ba5bb1dafa5d7b0fe13898834c1fe4acb16f409f0e1
-EBUILD libsndfile-1.0.31.ebuild 1781 BLAKE2B 8e1f3d7a97b6d4c6f2d50cf21771d61e155f8c6cb24ec0e8fc9299094f0c45b732b5c3b8bf2af83fa2b88526987dfec43a566f36e75875fb13421f812d631dbe SHA512 c1081cd331cbb6b07f08a6cea0e23ecf980d30fd01bd129ba39898c64d520d52834719c16825160383721bcab1bd9b7a50c3cd826ab072fbd0d85fd3e32e3bb7
-EBUILD libsndfile-9999.ebuild 1788 BLAKE2B 2c16c7480477006e1a72e91f50e19d9c9b8fb5e6edecf4b351a8a48925f90749e1a55368a6e74b7c77a77f030e1a2dbd4431d9a8b24d17650f20378b875ab2b5 SHA512 423e5e7c5be3fcd74d4b5523394eb27bb9c2890300f330e5d8f8d05e54ec4e4a4cb706164880aaeb3a20f9408bc1d4a2f90207a3ce6334f43b59f39516841f64
+EBUILD libsndfile-1.0.31.ebuild 1789 BLAKE2B 56e5cd82fd34a00c556b9ddfa5d9865fe0bf301d6839e2a94a155f0fc872c5093df958e6c39c733578b45a49997043e6a42658ecff46b8e8e91bf7984e45b6a9 SHA512 4d691e0a8aa3c96444b821aa1354d9cd6fd736c95a1a148a5a899820b73afe61049c9d49616f69f200ed6e8688e1ee518ae1ec05aaab898e1d215420bc8333cb
+EBUILD libsndfile-9999.ebuild 1796 BLAKE2B 69a2b08924f431c5221173d629098e439a8f1317954e84bbd102aafdf2585ddcfcb23fd50e8241b4c3a103f2f17c4c442d726f4d04331e17fe6c59ae7742be28 SHA512 af3570e8edb2877a81b107823d3467ed0ff0f2c7b5d10228138ceeba12b9d2e3b64b05ef4820a6b15f413bf1709556d828bbfa179e4abf30567ece40c712f149
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.31.ebuild b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
index bbcf03ae429c..c897eaf1d6ef 100644
--- a/media-libs/libsndfile/libsndfile-1.0.31.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
@@ -3,19 +3,19 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
 DESCRIPTION="C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://libsndfile.github.io/libsndfile/"
+HOMEPAGE="https://libsndfile.github.io/libsndfile/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index 541b8501fc49..39c0f12398c9 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -10,12 +10,12 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
 DESCRIPTION="C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://libsndfile.github.io/libsndfile/"
+HOMEPAGE="https://libsndfile.github.io/libsndfile/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 47f69a16238f..4ba1e4f36783 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -9,5 +9,5 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae
 AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
-EBUILD libwmf-0.2.8.4-r8.ebuild 2522 BLAKE2B 29538d7934a49b1dbdc277ec00a2a96c839fe66f2c258acc751a8480d952772907a77058f1b9ad4c9dbfb65ab998eae9d08b636c4f542c9cd641da0208c3cf00 SHA512 a03be6e5fbb8100c2fc1fe9668534d9c7a7d7d19aa6ec255e63add33c23cc11e17d9021bd83f4fbd4b9d1cbcb62751eef97d2e43beb1b6d9988950ad7ae60eb7
+EBUILD libwmf-0.2.8.4-r8.ebuild 2558 BLAKE2B d0d3d0a0053dd4bb6a48ea239a59ea87de839a9ef8b6d7094f669c9a1381d7ab35391b2fa98d0632b563fe4ba427496b8d4e096495f795bcc25a33aa7baed4c4 SHA512 ab0f5be34e6f66d0eac8c35598160d9c367c7b3bab62cef79685d102dbc5dd3e64cd457a774e2fd7e2bcb3afe8f3a3b05a5720386705686dbe76afbe88251ffb
 MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
index 5015c38df7d8..53c0743ac37c 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools gnome2-utils
 
 DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile Format (WMF)"
 HOMEPAGE="http://wvware.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/wvware/${PN}/${PV}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"
@@ -27,8 +27,8 @@ RDEPEND="app-text/ghostscript-gpl
 		x11-libs/libXt
 		x11-libs/libXpm )"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" "TODO" )
 
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index ac1b1e0ef3c6..9dcce5df1728 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -3,6 +3,6 @@ DIST lsp-plugins-1.1.24.tar.gz 63809276 BLAKE2B 3d623d4a5b21f2b4dbd7263805b50c9c
 DIST lsp-plugins-1.1.29.tar.gz 66143142 BLAKE2B 6fa6943d8cdf3aedc9f671c64b433ffd5c4f6c7ca14f6a75578300240971e7c9e8546b9a7df7a13b8cd6e0844724c064daa7e249aba70636f47a622e73ed264a SHA512 b8c3804ad583322bce414d6beb079afa5b98a111126bb4507642376fcf1f82b31525b4959c6388b02cc1d14e0ec25de3596794895f2860f492a5fbf87f6e88b7
 EBUILD lsp-plugins-1.1.22.ebuild 1037 BLAKE2B e3f7c25cfbd4938ee04bc88f3026b24ed254d6e6f68a4262dcca59e5f99ef61c91c16293763aa4e53c42633da9db7416947d36c2de4fffba6c0407c86de11e99 SHA512 2d8042b5a22dae0e3e9df23a639184562f3623789e44d1a02d58d3b8bde5b6d136e4e74874c0c3a5656ae28f108eb177ec295c03afcac5764281336b58c1e617
 EBUILD lsp-plugins-1.1.24.ebuild 1076 BLAKE2B 399febc0f6dc791d765d16c3455469eafe5a5ea76934b4475993d9758e3ce0a3c00540995e7719c94cdc849cd7dc7208fb86eff9094af139be70ae5625d1d184 SHA512 2dc5383e1da3ccaebf80a8a5edf092db87177a2590dbf7e96bfc1862ebd9a4567f1dbec95c2e35ec38c5603a2f5d691c67c6f4836bf0c568873b04483aeef0c6
-EBUILD lsp-plugins-1.1.29.ebuild 1089 BLAKE2B f8d392c402f63e6b170caaad0a7da7ebe9f15e31ff6e392d160723112f0e77159f450e49125bc8b5db3cd7f6131804e441ff31228a8ddd255ebd180c52e720f9 SHA512 f85be73dbe995d41f437540876a0572311e25c80301d7746c25f6a13104dd469c4daf54553642a17d12bd2e9b209e73e6c27a014c5ce7e8e3da4b242a87a5c45
+EBUILD lsp-plugins-1.1.29.ebuild 1087 BLAKE2B 87b54877d6cf206de8c5a05b413d20421105c689492c5f896aa3a672e1c7ea46a7e66c2e3e975b3222f748b0247c77b8748554e3b1575f59e88b127f79fe6e5a SHA512 8eb42cca80ad628dd0e1df1649b9bedcf2d3d7ac5bcefa768363af8b25f51ab978c0e98b6b3f399a90dc56dbf7ba91cd142ca0d5656d68da96cd1a7393f64eee
 EBUILD lsp-plugins-9999.ebuild 1065 BLAKE2B 57234488746b4b43a1b71b89491a74540646b074b13276ad84bde7398c02a2a2665197a953d2a5974f9eb4f9402585d7fa681e9f55fdb233ec6dc7d94d255ba3 SHA512 48b0fae3be3abe2c80cba542553886fb8e850694b00b1d3c7154466647ff2a20e4aa6eb466a8cdb4ddea4ad2371f7d2cb70319866e92fa958281df53913981e3
 MISC metadata.xml 492 BLAKE2B 6550b2fe0e0a6bc5bece22d51b36d920284f662f1da5dbe2551fbf82ebc3416262339436ce2eddf9efbee49e57d5a28139f6ac3f1f86e20b5a74e5c4fb3bc37d SHA512 681338f3f8abbd1c103ef72c176595e10ca6bc0e6ca309e2f4d39166309329d8176aa9025056685d67d708ec1732d023c773a1e2a4cce7f019945ea112ab8f84
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
index e7c2d946d2c3..0247cef3a961 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="LGPL-3"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index b6f6d3c01889..7c203b479829 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,6 +3,6 @@ DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b
 DIST mesa-21.1.4.tar.xz 15254812 BLAKE2B 7ec6177ad4fb6f053553b634c9ff03c5d618d0212fd77c2fda8803197bef529c74ccf3c3ae75a810ba1d57862f08405c6df702e41f6cb0fd202833ce7b9efef0 SHA512 1f4e2d8ba2c3c02bad5468687752d7e87d6e79c4a0e6ec4b2741a57fb270d18ae4712aaa07a9e09a2d3348540f5a26cdbe05464cd52adb8df1e2e28a581b2b53
 EBUILD mesa-20.3.5.ebuild 14915 BLAKE2B 73f85b8bbbbbbfba3be499ba55ffa2bcdb5e6f860049819502957e803c2760edf3e45ada1f103f58752e77177065ad12d81ea72c36f96c19c6ebc87d1fe03ab9 SHA512 0b1dd3fad90392be514da0d347efe19b35fe82d13ca02d959f56e625d00a9beb917c83c678e7d6ad419dc81b6fc32e0dd8ca6f95f5fd77484872af464f9ae52b
 EBUILD mesa-21.0.3.ebuild 14826 BLAKE2B 1c9793f1dc8b7769406d49d02fcf152c2b21a446972fb754871ec5103ddab1eb93bfc52aed895bbc74b9c7a6743c360d5cbcbc0d1ede2cd28307eb243803a77b SHA512 3b5db1497b6b99412353134139bfd2abac642989d1570d4c8d2172dd82e63aeed6ef1bc1d7ce0c2653288a6c7bd8a6315494ed152deb627fc3eb304a6d5f9be7
-EBUILD mesa-21.1.4.ebuild 14938 BLAKE2B e079873070bdd9ba7407fa1cb0622330445de99a860bf6aa3a89fe4cb5792201d19b0305302b650251d2c2fa8148063e84d6caa7d960536261ef2914329f3cca SHA512 b1b0c852c991c5c452b43a33e4ed6dd677b7f8bd4c8a61bafe29bf0f0fd9fd5e044115ffc9cdef9c9ee06c57bef74ea1f607857be70f61a7e8bdc4f1a97ef4f8
+EBUILD mesa-21.1.4.ebuild 14936 BLAKE2B 8cd4c9305cab8084015db25061a5098f1e686e83001f75d25eb2aa9dae82f2c545d3c43d36aa769e46dbd85a555c23b103fb148b2af5957334bfea4435be45eb SHA512 e8a8255ba66aef51e74de4a2490affd4bdf75db8d0e94452d7df2e3cb47052d35f6b4f9865fe3236328a9d8679712277fb3de9ff5c0a6c7f1a895449c4da8b96
 EBUILD mesa-9999.ebuild 14877 BLAKE2B 09baa10ab66a17a1c2ce4f320c2e97843d15a75e1a9e43c74a94fb9ba9bc316f5bd8188c35ccf686823f838e33c9bbcfb6183432d253281eaf1eee17f825142f SHA512 f50d925183fdb79f6494c71ca10e6d409ca7adee1b58eb7ebec50bc4d07f8d34ff4c95d311ab8e2618836342ea70bdfc5232b63b62c6819fc1e64011b5384450
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-21.1.4.ebuild b/media-libs/mesa/mesa-21.1.4.ebuild
index 635fc07d42b0..df605cbfa7ee 100644
--- a/media-libs/mesa/mesa-21.1.4.ebuild
+++ b/media-libs/mesa/mesa-21.1.4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 6dcae8c46e8d..88a0a26ef324 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,9 +1,10 @@
 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
 AUX openexr-2.5.7-0001-disable-testRgba-on-sparc.patch 937 BLAKE2B e2e432649100457a3273b50aa6725625ac50f48bf95bb04b85a2587a44d4c9e87662a36b68c3b7ac0c741068223e439fb51c1b69d5ae8f852794b0a7ee238d4a SHA512 8c640d67f2db6ed2789b8e25dd25e6ba8db6b3ed0ddb2138027ca579b3fe5db43b60d5bffc4de3f31ba60521c6479cf89f1ff7a8b2bbba97dd22c13279b92f81
+AUX openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch 687 BLAKE2B 49aaf9d5282ad878ec415413106540d4a92aecceebbc9a03e30a4289377ec1d8ec4e1bacf49e0cec80a44e75f7f345c885c4746092c4dc3d57b03b317631d4d5 SHA512 9bcb62eec3bdf05ba54dff037ccd71e5e1dcd37831246f95d7803f1710b7335d930292dd27b5a6ddd927c45e7734d61d3a42a637fdf7e83724830f21b3d3db9e
 DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 DIST openexr-3.0.1.tar.gz 25059445 BLAKE2B 76bce1ff830b5e32362bfaf91d39945add171c5c1f453968b2fa8ba41e0996064d3a104eb7759cea87477e96e8a52d548743c7d83f5c6131dd38aecdd47bd6dd SHA512 e450c55d150e4c0a8a9147f78fe1c73ea9134976444f8c77c832d0671d4c3796f96fee74d23f26cdb9383e658a33d6d57c989e9207d1edfc8556ad688ff25a5b
 EBUILD openexr-2.5.6.ebuild 1690 BLAKE2B eab42b0f5ce389e642e80fc4a53a3721d883d22332f5e773a86aa19ae85cf0f0002b38e9cc0266f2dc00c1b8aac722957a987e266efbdb304dda674fcc958e9a SHA512 100e7b271952985f3e576aca1965345a7ed5dfbbef070cb22ba1d8907a22de436a57b2eeb2500707c11db1ed2e1179778e75820b651309557ef5d20cc73da87c
-EBUILD openexr-2.5.7.ebuild 1844 BLAKE2B 46fd538c32594befd9cf01c4f0d7c8f2d351605052c6973972f9822a03111012783c5846dbe42b5c9163fe6ec915a28de48ce13416ec2d4e609663a0fb26db18 SHA512 7d7217c198dd99dbb37471ed4e74c95e21fa6d67b4d050fa2e14cfe098c53e1dbc5663e267677effab868a39bedc5f8f5149143884def484f3c8738b1a2a8ad1
+EBUILD openexr-2.5.7.ebuild 2121 BLAKE2B 617e588fa2578ec358c5b4f21f03f2c3feb7ecd7141fd6e45e652021b58bee0694c2fae2efbb23513bb5903e6d7fa94e143de25cf716c816782f986231331692 SHA512 d0a0fdf11f53bbd2ecbc82d5ebbecae3aef73ae4fc127ea529506bf74432baea18358e6b3686d2ef1ee3fbebd444e629c77c6e6015975fc37f36fd5506bdc5f7
 EBUILD openexr-3.0.1.ebuild 1913 BLAKE2B cc37bc00d13d64d5eb0787c165f051572b92ecb23798e6e753e5a723143ad4e93081b04877bbe2232b4480564b751b6be4b584d535bea5e303c703482fbe1684 SHA512 147d8abb4af8ba2f56ffc17632436e42621da0289fe0b0585299da55c16e7055d454e13db0da8011f25ccac878034e741d1f5b227013388a67d28b6ffa18c5a3
 MISC metadata.xml 796 BLAKE2B dacf5230d89550bae31517f5babc9cf7ea99ef94ab223e4acf1abb39d1042d146e71352f4b55a6bebff88689f32efc3d098f5d7ac04a207211f784a9b5e2ed30 SHA512 3deb6a5e83a03fabbbfce2845529a7c2f1aacdc6038ffb4a35ed16bd3f93521ea490ff0fc1576291b5e1d84d19dc4d4123aecf228e270e6b55b01c09ea2a6b56
diff --git a/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch b/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch
new file mode 100644
index 000000000000..ef71bc0e6871
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch
@@ -0,0 +1,13 @@
+This consists of A LOT of individual tests and on some hardware
+(e.g. the RISC-V board BeagleV Starlight) the default test time-out
+of 1500 seconds is greatly insufficient. On said BeagleV OpenEXR.IlmImf
+takes almost 4800 s even on an otherwise idle system so let's add a bit
+of margin and set the time-out of this test to 1.5 hours.
+
+--- a/IlmImfTest/CMakeLists.txt	2021-06-15 00:15:14.000000000 +0000
++++ b/IlmImfTest/CMakeLists.txt	2021-07-16 16:51:20.600435829 +0000
+@@ -73,3 +73,4 @@
+   target_compile_definitions(IlmImfTest PRIVATE OPENEXR_DLL)
+ endif()
+ add_test(NAME OpenEXR.IlmImf COMMAND $<TARGET_FILE:IlmImfTest>)
++set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 5400)
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild
index d94729d81f27..8a5f1c968b22 100644
--- a/media-libs/openexr/openexr-2.5.7.ebuild
+++ b/media-libs/openexr/openexr-2.5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}/OpenEXR"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
@@ -36,6 +36,12 @@ src_prepare() {
 			eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
 		fi
 
+		# Technically this doesn't disable anything, it just gives this test time to complete.
+		# Could probably be applied unconditionally but will leave this to the maintainers.
+		if use riscv; then
+			eapply "${FILESDIR}/${P}-0002-increase-IlmImfTest-timeout.patch"
+		fi
+
 		if use sparc; then
 			eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch"
 		fi
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 049baac46ac7..ec8edc3c4d39 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,4 +1,4 @@
 AUX opus-1.3.1-libdir-macro.patch 359 BLAKE2B 901a1f09417bb962b3268a1d9a85cfc356df9c67b05452e31599c37cf9c0a2267c50e6b9bd820af2445d54a290d4170492bff692566c01e9b1841ed755b9c020 SHA512 ec9643035203e70589eeed1079cf4da7af548fc1e2f8f30645217042e6adb3f9e0f874dcbd96ad49c07637abb3abca94c201cfc7dd41ad1d687ecbc00320eb2c
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
-EBUILD opus-1.3.1-r2.ebuild 1304 BLAKE2B f71a6bef7d72f01784023a939d056e4183d2ee2ab69c227f52b256655646a124db198164f4b0068e1efa3b248fc043d59bcdda02fdb36cf737e67419a16a7795 SHA512 7cf5995c556ff4b56e6a2b182cde0f4f5d09ff77fa4026bf3b7eba1fd607245b6fad26462b2c49e22c66eac06a70da5d8d903c33644cf91cd98257a29fc685f9
+EBUILD opus-1.3.1-r2.ebuild 1311 BLAKE2B a2b310c4afe81e0365bfcc1bc8d5e1768f1813d089376510c97d54fd42fac237710af100aeea005bca53a7bb010832e0f921b2b504c92858fe4dd282fdfbcc70 SHA512 ea34fb01ace8eef285e0739dff8526e20c6d92b37c84599baf0101ca0764a292bc47b01b020e7c68332cc662ded3317ba4e25a5666a9932387efec10dbc0ad52
 MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/opus-1.3.1-r2.ebuild b/media-libs/opus/opus-1.3.1-r2.ebuild
index 8f28b5956956..22658e5c64bd 100644
--- a/media-libs/opus/opus-1.3.1-r2.ebuild
+++ b/media-libs/opus/opus-1.3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
 IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
 
diff --git a/media-libs/pcaudiolib/Manifest b/media-libs/pcaudiolib/Manifest
index 4a58c51f9b5b..98bc1b8e9995 100644
--- a/media-libs/pcaudiolib/Manifest
+++ b/media-libs/pcaudiolib/Manifest
@@ -1,3 +1,3 @@
 DIST pcaudiolib-1.1.tar.gz 34049 BLAKE2B 7c6ce1532c47db30db2b80be690453257148be9a7115cd24dabda3dfcaca667d5c3a8278276f278556406144461cda48905ce581f0fde2f8429b3f829a948a36 SHA512 d503c11b355601e1e05f0f438a0cd9ce277d19fd53d3f7edf26f6e17f1f8184e8b2112a282e8ed74db8646bb5534d2a9a3c707b1742ce02ef13fd89669785007
-EBUILD pcaudiolib-1.1.ebuild 829 BLAKE2B d9afafebd3eb748583524c0124f2c4d28d70ba0054a9895a12b51dc149360694469b5f9664bcaa452c5f4e5c2504eb5dddd5731a13079a4e2429ed9000016b75 SHA512 7f589e8981d867b3d8fc194c46cd7da8cea1214054440550553a0665333036d6c27aff41bb73407dd6fee214fa69e1e67ee474d26bc477601aa76c91c08b6335
+EBUILD pcaudiolib-1.1.ebuild 843 BLAKE2B 82f5056f3bb62e7c9ea7f6cb96b7be236a12499c32241a32bc8d317caeac5c03196d903f08317d96176ba9bb8051ecc52fd0e10eb63f8779a8f152fcd858b777 SHA512 e430aec3c6f60d9be9daca45fd67c5f7f9d31e0fc38a51524fc9ba3a21f56ca9c137f89a0c32e77b5825cdd986855aded6439d1f1e08b366e93640cd779f74be
 MISC metadata.xml 587 BLAKE2B 8e440fdab1383e734543c921f69db7cf5fa10714ac903845f453349af14f2008e0976206d85118d8acc10c40bc9cf579d06b01578595c112637605993bfc6555 SHA512 f9737ed539062e93481f4715837f9956667e5e73c8e4cebbdc1a639c1899cb79c13e26f8076929eff92e4b5bf4ccedecd50d31fb75d23fcea46af58c280df382
diff --git a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild b/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
index eb7b4b4ff88a..1cf4db58210c 100644
--- a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
+++ b/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/espeak-ng/pcaudiolib/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3+ ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64 ~sparc"
 IUSE="+alsa oss pulseaudio"
 
 REQUIRED_USE="|| ( alsa oss pulseaudio )"
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index f2b34aff7362..293ccda7926d 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,7 +1,5 @@
 AUX rubberband-1.9.1-build.patch 6538 BLAKE2B 9387ebba5a8a06f6ea11dfa16c9b37fb2bc607a4982a6b77ad62e59fce597e7d4c358c0795c471a5e8b74cb553da31239cff50b2ac367e702e04262a66c462a0 SHA512 64677e108c17e35739a2e86a473c08b3d1e575daee14db124bec013e348120538e29e9a6829f7ec905998f7ba8f4386e8aea8591642bf45cf3be0f6e657b828f
 AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab02d1712b920a3c6c41b8981aa13ac5d7155bfd11e33577cb7b1e49a079ca5ea9840d37aaf477deffa0dea609b03fed7 SHA512 035f5549c902c1517ad5e09ee472eca578eed7d7f87f7ee20166dc46f495d5abaebc32902472b9ac6a3a367176c130bfa6fc743159b9efa3227873a16d8b4877
-DIST rubberband-1.9.1.tar.bz2 164644 BLAKE2B 1bbbd0056b2131ac16bf427db93e19bdd6adb5433733e62523f4a04c8a74d1a48e82dbace09e7ffe6dddfeec699e3aeee8e84344c9e7cbe75067316dde6268d6 SHA512 cb20ef8fb717a9e6b5b0b921541bd701e94326e12cdb20d50bed344d12fa1b4fd731335c3a0a7f2d2a5ce96031d965b209e7667c4d55fd8494b8e20d3409f0d3
 DIST rubberband-1.9.2.tar.bz2 164178 BLAKE2B dc8e5b4c773dbb5c556331fa56e6cf4a5dd3f8a0fc7dcfed1fbe53d1a7635f12db6a884e775fbff8022e252d98b4e14a46a2395a5d4cb7645522ddf3e6b5482f SHA512 b1c763ab2a428aa2f1f8e5d0be6e9eb669808059ee5389e94f12de25f1a05cd89022656d98906c90b616773da11ab1f596ae2c5a9d300118e88049e1443121f2
-EBUILD rubberband-1.9.1-r1.ebuild 1320 BLAKE2B a5aed87ad51ebd6db178862b58eaf6dcd783fd18e6b0dc7479a85e67350c433cdf6ea2febf662fdac1920767e5e802e020bde2e6954d11ec726d146352d02642 SHA512 5392bc5bcb1a46696207161b557a78f6b0fcfa12f32bd360ea3d73da0bbe00c0e3c1d5840a3dcae390e9b16eccf106814eec0ae97560646bbb69fbb9b61a76cd
-EBUILD rubberband-1.9.2.ebuild 1322 BLAKE2B e32ea62b4d2b2e3099d0d91cb350586c2d5128a3f8cd3be2435cc63f3907450fff49b36fba516ba99c98d123354614d409ed97aaba7d1ee2f82b9046f2505a55 SHA512 e508ffe705e1220c2b5d981db6a0851f2ae3ccaa400b5acaf21a27bcafd30c476caa77c7e94a9a3ba5f0cb332e2b0bc8a715da151f6fcc5c3656bec8df73ad2e
+EBUILD rubberband-1.9.2.ebuild 1320 BLAKE2B a5aed87ad51ebd6db178862b58eaf6dcd783fd18e6b0dc7479a85e67350c433cdf6ea2febf662fdac1920767e5e802e020bde2e6954d11ec726d146352d02642 SHA512 5392bc5bcb1a46696207161b557a78f6b0fcfa12f32bd360ea3d73da0bbe00c0e3c1d5840a3dcae390e9b16eccf106814eec0ae97560646bbb69fbb9b61a76cd
 MISC metadata.xml 490 BLAKE2B 849555ada519e1a558d37977b952b8338d4d19ac3a7e8523a15cc3924b7b7b5faca70df7782597e322c362af7d05b1a35dae64b8cd8f2a998cc5d074ee81f090 SHA512 a1e8673326887e5582aa7a948543341d3061a149e0232a01ef8aa3b6778a499393aae434d5f1c2181910aa309a3cd2f0d80820922dfe668745f75314e0526e31
diff --git a/media-libs/rubberband/rubberband-1.9.1-r1.ebuild b/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
deleted file mode 100644
index 23f485140902..000000000000
--- a/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson-multilib
-
-DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="https://www.breakfastquay.com/rubberband/"
-SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="ladspa jni static-libs +programs vamp"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="
-	media-libs/libsamplerate[${MULTILIB_USEDEP}]
-	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
-	jni? ( >=virtual/jdk-1.8:* )
-	ladspa? ( media-libs/ladspa-sdk )
-	programs? ( media-libs/libsndfile )
-	vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		--buildtype=release
-		-Dfft=fftw
-		-Dresampler=libsamplerate
-		$(meson_use static-libs static)
-		$(meson_use ladspa)
-		$(meson_use jni)
-		$(meson_use programs)
-		$(meson_use vamp)
-	)
-	use jni && emesonargs+=(
-		-Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux"
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	! use jni && find "${ED}" -name "*.a" -delete
-}
diff --git a/media-libs/rubberband/rubberband-1.9.2.ebuild b/media-libs/rubberband/rubberband-1.9.2.ebuild
index c559f5862dd3..23f485140902 100644
--- a/media-libs/rubberband/rubberband-1.9.2.ebuild
+++ b/media-libs/rubberband/rubberband-1.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="ladspa jni static-libs +programs vamp"
 
 BDEPEND="
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index a74a61d2edcc..1a8b80285788 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,6 +1,3 @@
-AUX zxing-cpp-1.1.1-gcc11.patch 612 BLAKE2B 661ce79b9d44667225b33480c2dcabeaa771acb35a8b908c76ca78571f360576c36889c1629a3eb22af316fcedbaece3a68713a39f3d6a8ec17f34d09ec19b0f SHA512 647f862468764b902fe7204c304e1e2d838efcfa226468027662942a7a6286dfdf5884bfae6d4f14e325d13ba40a20671a3ba72ec46db4417b451654c2806a09
-DIST zxing-cpp-1.1.1.tar.gz 128925736 BLAKE2B d2d6b4b13c26ee1bf8c9f1188809207f895d9ab4bde83e7e06d85d7105c56021bb9f82f34b9f11e1c8ff5b82825de127d1bc873745fa6ef603a8d206f3eaedec SHA512 c7d97df147602e31e58eede54413814378895e9710cf266de984b22965a9a3f4c67648a0bf936a8bc8b213b45def59d1e5b34d6ce516265333dd2c0430554dc7
 DIST zxing-cpp-1.2.0.tar.gz 97942494 BLAKE2B dc220783fe8a9c1ea321ad5b7835553985a06318f909af1574131b55f3a4bb71f8cf90f56925dfe8338df5cc24f91d93d8a7626cd8d2c01473b1ccce09bad8b0 SHA512 e61b4e44ccaf0871b5d8badf9ce0a81576f55e5d6a9458907b9b599a66227adceabb8d51a0c47b32319d8aeff93e758b4785d3bd0440375247471d95999de487
-EBUILD zxing-cpp-1.1.1.ebuild 625 BLAKE2B 460b22d28d1458b4affdb2be9e4b5cd71b849eabecbd05fbb0c486117bc5836fa73e05ee2895b701c2775155f9d1746085f522ced874f1f9c5a55a3fe650bc6a SHA512 73532b0a7fe4f8dc31b24d45cf173de9284c92344dae15981fdb9c0575acdb8f7da42cd640323a56f38ed3a27dd9012118d88b3bfa2a08782a35d3ab0044bd4a
-EBUILD zxing-cpp-1.2.0.ebuild 656 BLAKE2B b8b019f02528ab389c6c1b0fbc55675f7ed40f6fda5ce4c22907a7fc618e58c7671ca7f4a6fac5b7448b05137c8038e9b9ca377a90bb772599c91f65dc37d000 SHA512 5607c41a5be2345e134551c1b0f391a157f56c604ac8b67d8a05e79695b0e938fff0ec872a78aef480d62fb8a41ef82062ba1b5a3139fa669c9f52542bbbc13c
+EBUILD zxing-cpp-1.2.0.ebuild 655 BLAKE2B c7ab1c495e4acedcac7d7fcdff92bb9e0d6e763c5d0b317d694223f7bec1ba93cf8efbd5bf8ae8899c8b729c071db05c61fe75518d5697245ca8e8ebb8ec79c1 SHA512 c8367a8e389afc4775cd4204968e3f4a3f6833c9eecbadee443d7cacfdaa096bf7bf7155e98ada4c46075cf68b829499642c674a026a8630e51317911be21998
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch
deleted file mode 100644
index 13adad906c0d..000000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 427e814ebcfd2e55e1c18531b7e4aa9d6a1ca6fc Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Tue, 9 Feb 2021 09:28:23 +0100
-Subject: [PATCH] Fix build with GCC 11
-
-Starting with GCC 11, the  'limits' header is not included transitively anymore.
----
- core/src/Pattern.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/core/src/Pattern.h b/core/src/Pattern.h
-index 4bbe6d26..c4a3f7c5 100644
---- a/core/src/Pattern.h
-+++ b/core/src/Pattern.h
-@@ -22,6 +22,7 @@
- #include <cmath>
- #include <cstddef>
- #include <cstdint>
-+#include <limits>
- #include <numeric>
- #include <vector>
- 
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
deleted file mode 100644
index 3b38eb67cad9..000000000000
--- a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
-HOMEPAGE="https://github.com/nu-book/zxing-cpp"
-SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/${P}-gcc11.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=OFF # nothing is installed
-		-DBUILD_BLACKBOX_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
index 05094ad0df2d..93fb973a3c16 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 src_configure() {
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index e1240d0d2b66..be8ef82e9627 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index b1ea467c63a5..793ec19aa1b9 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-inputstream-adaptive-2.6.17.tar.gz 752293 BLAKE2B f6b2c5d512bd5222e9e7bf1d5b06cb174c804bd24e12ef3b01c56e47db41eed4adbbc1bf46a777c8dc60d01367745b82cf59e4b09a138461c925e489379056e3 SHA512 512a299d5711012c0396c2b84c68a364122b52d5e75f14a4de9e1f5767d652f8d992436c54970c2f5f141207f926b4d4112ff61f3414862456a212a2f77f2c3d
+DIST kodi-inputstream-adaptive-2.6.18.tar.gz 754089 BLAKE2B 8dcff383fb77c35f64523f86d915620daef813f7b0d12d254cbb8eab05c9c9fe4e60e738b0815dbfad1b0385dcd6b46ad5a2ee1d4e609b43d1f4867584b83f43 SHA512 66a5c1338f80c4d9307b075f0e932e2b97f1ffa8734f5644794c26cff9b610a1be6c2f02ab095dad6d2155b12f37106e950685b607c5fc6251005897bdd68786
 EBUILD kodi-inputstream-adaptive-2.6.17.ebuild 1002 BLAKE2B 1d3abb0c33d1b61d5b24cbb73b772fc83aed7c0821b3ac382b80b4a790a13bbc6f7f608d8026b00a7cf0410cf493f00faa51ddc376d5773c09d5a2555a87d0fe SHA512 8603bfc240ed2237a7a10778666a393559ce84736d278f0c0ae11be7a4c8b564b7dec14772e36a73284b62e10154214237933f46fc32c34824721dcc7d2bc26b
+EBUILD kodi-inputstream-adaptive-2.6.18.ebuild 1002 BLAKE2B 1d3abb0c33d1b61d5b24cbb73b772fc83aed7c0821b3ac382b80b4a790a13bbc6f7f608d8026b00a7cf0410cf493f00faa51ddc376d5773c09d5a2555a87d0fe SHA512 8603bfc240ed2237a7a10778666a393559ce84736d278f0c0ae11be7a4c8b564b7dec14772e36a73284b62e10154214237933f46fc32c34824721dcc7d2bc26b
 EBUILD kodi-inputstream-adaptive-9999.ebuild 1002 BLAKE2B 1d3abb0c33d1b61d5b24cbb73b772fc83aed7c0821b3ac382b80b4a790a13bbc6f7f608d8026b00a7cf0410cf493f00faa51ddc376d5773c09d5a2555a87d0fe SHA512 8603bfc240ed2237a7a10778666a393559ce84736d278f0c0ae11be7a4c8b564b7dec14772e36a73284b62e10154214237933f46fc32c34824721dcc7d2bc26b
 MISC metadata.xml 370 BLAKE2B 3cb26d2c0afe08e8bfd5d0074439528252d30a4d46952f48ead0f06e959f29dae992be1410aee15b62b4daae154c2973ddd5278e0515cb25221955c9d5f35593 SHA512 41ea83a2731d3a135075842b41bab398acb3f2c9c8c0bd6c589e00669eea8b9e23bd3dd71b3be8cac954138259a91eeffa4eddbaab3774b8750531b63999e1f3
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.18.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.18.ebuild
new file mode 100644
index 000000000000..eb913a08d263
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.18.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Adaptive inputstream addon"
+HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="!test? ( test )"
+IUSE="test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-19*
+	"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+	"
+RDEPEND="
+	${COMMON_DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/media-plugins/kodi-pvr-dvbviewer/Manifest b/media-plugins/kodi-pvr-dvbviewer/Manifest
index 694bd72295ea..d7a49a8101b0 100644
--- a/media-plugins/kodi-pvr-dvbviewer/Manifest
+++ b/media-plugins/kodi-pvr-dvbviewer/Manifest
@@ -3,10 +3,14 @@ DIST kodi-pvr-dvbviewer-6.0.7-Matrix.tar.gz 137278 BLAKE2B 5dd775d9d721a07213f5b
 DIST kodi-pvr-dvbviewer-7.0.0-Matrix.tar.gz 137286 BLAKE2B 86ec3f7c41e48cf1f47a55fe03dad4e362c7d279dbe11a9a014353fcb1afe67ad56498fd6d5054aa472ced9e8813de78cd89767a6546344caebbb33171661f83 SHA512 c2c43767f8cfaa5a2b50bd807a192ca73e4a52de242a0127e9486d9a9dc02cb5dea9ce4f57601e42f697f2121ce6c7347fd2ace2ea4f1ab834bf9877f1f35cc6
 DIST kodi-pvr-dvbviewer-7.1.0-Matrix.tar.gz 137334 BLAKE2B 138a69d2ff824de1d51968c89d8426508a0d941d0196c93ad5ea488549cfd25654de3bee8ea3d580c863575fce38c431520267f6e0f6fd56a82e69e6a35a0d40 SHA512 4b4d7f195695d22250b09d40a1c071c89fa1be51ab2c0fcf007292d3276b1b3cd19892209474aaa90000f6552339a084368860914ff200ee3907f3f94db75b65
 DIST kodi-pvr-dvbviewer-7.3.1-Matrix.tar.gz 143297 BLAKE2B 937e4b6771a4a4248c4869f259ba77887ecff48ced59fb4c9258168b4b8c3798401c3452a3bfc75e130d969c1472998e871d54492ae8ae4879c44fb515c81ee8 SHA512 ce81ab7712e7e428eac8569fa866afb69401046d93f096331ad491ca71ee2f56064824719d994dfe1c28d3c9e29282d17a757b9c8e003e5ca7083b617e26c223
+DIST kodi-pvr-dvbviewer-7.3.2-Matrix.tar.gz 144213 BLAKE2B f17b9562d151411d57b1d236d4e7341e10e59be1ed3252d847e6b4d181967452ea5bc9e99b16a8ff7fa642f2d1def1521768373fd3b98e9482d9359c7223c6f8 SHA512 63c1a4994ca1bce99967950b75b3d1d8fd3aee643152cf15611e3b41cd159c5c5e255c4cfdee4c28abedc74c04c441fe7104040bc140eeb322289520c078c00b
+DIST kodi-pvr-dvbviewer-7.3.3-Matrix.tar.gz 144323 BLAKE2B a1e2f537b659f4530cf6693195ad56d4ee74a11e5d598461b9c6d4d1542ddbdb090b00f5d9b80a88a988779e57cea89483bdbcae024d979d7ab08d1039483a0e SHA512 ec87de4800790ca6d67541335eac32472b3c4417d6e906d4f2fa6864389b2f7dcb114ffc5c1281e1047b8f7a819d4072725fc24f72a63b29181e9851b782b547
 EBUILD kodi-pvr-dvbviewer-6.0.6.ebuild 715 BLAKE2B a62dc022e091e40897750608e163cde3d1a008d1f546305d4b9390083fefe6bc069b7e1b1a6f3ce0a3324b9a0713c717e9db04c750177c4ffc9166e3b908de4e SHA512 7bc858a9057e624a5023b5d08b2a08e5c05f970003574f0d4c9acbb66fff3033e98bf69e25ca8b1acb199bcd664ec6bd2a94b7c96617024b95edbc1370e162c8
 EBUILD kodi-pvr-dvbviewer-6.0.7.ebuild 689 BLAKE2B 6c2aca99b98713ca4c822ec1f45b94a7dd5c40fe6b10f5199806d54c9715ee9eceba7282f1da3da6aaaadc5b167bfddb2d544202860cd6327b2255ea5dcfe03f SHA512 2744de0efee148f91ea4a4e3719ecfa30b5bd0329e83279fde854a3e2aa5fd27f4087476c8bcad432f495eb663e7c42a8982e71402170980d8da6cefef1da969
 EBUILD kodi-pvr-dvbviewer-7.0.0.ebuild 689 BLAKE2B 6c2aca99b98713ca4c822ec1f45b94a7dd5c40fe6b10f5199806d54c9715ee9eceba7282f1da3da6aaaadc5b167bfddb2d544202860cd6327b2255ea5dcfe03f SHA512 2744de0efee148f91ea4a4e3719ecfa30b5bd0329e83279fde854a3e2aa5fd27f4087476c8bcad432f495eb663e7c42a8982e71402170980d8da6cefef1da969
 EBUILD kodi-pvr-dvbviewer-7.1.0.ebuild 689 BLAKE2B 6c2aca99b98713ca4c822ec1f45b94a7dd5c40fe6b10f5199806d54c9715ee9eceba7282f1da3da6aaaadc5b167bfddb2d544202860cd6327b2255ea5dcfe03f SHA512 2744de0efee148f91ea4a4e3719ecfa30b5bd0329e83279fde854a3e2aa5fd27f4087476c8bcad432f495eb663e7c42a8982e71402170980d8da6cefef1da969
 EBUILD kodi-pvr-dvbviewer-7.3.1.ebuild 689 BLAKE2B dba762de709a360425dc50c7bcd47a065c4eb547e7a99515f47e0939b4e168c4ab347b430f9fffe501e81c74f4fea3d1eccb2ac10bb5583b0c679708286eefe7 SHA512 23e819ad23cea55dd262828b0fdce905bed30c22d96fd70bcf707ef63ff209ecaf8055e472cf3e18f5e445b69803a518fe6c06385f52ec7684fe8a36a6d74a1a
+EBUILD kodi-pvr-dvbviewer-7.3.2.ebuild 689 BLAKE2B dba762de709a360425dc50c7bcd47a065c4eb547e7a99515f47e0939b4e168c4ab347b430f9fffe501e81c74f4fea3d1eccb2ac10bb5583b0c679708286eefe7 SHA512 23e819ad23cea55dd262828b0fdce905bed30c22d96fd70bcf707ef63ff209ecaf8055e472cf3e18f5e445b69803a518fe6c06385f52ec7684fe8a36a6d74a1a
+EBUILD kodi-pvr-dvbviewer-7.3.3.ebuild 689 BLAKE2B dba762de709a360425dc50c7bcd47a065c4eb547e7a99515f47e0939b4e168c4ab347b430f9fffe501e81c74f4fea3d1eccb2ac10bb5583b0c679708286eefe7 SHA512 23e819ad23cea55dd262828b0fdce905bed30c22d96fd70bcf707ef63ff209ecaf8055e472cf3e18f5e445b69803a518fe6c06385f52ec7684fe8a36a6d74a1a
 EBUILD kodi-pvr-dvbviewer-9999.ebuild 690 BLAKE2B 7b2c27e9088e2e5bb13ba17ce11cdafbd0ee43258b5edbd1f0fea33ec60d162ee40d4cf1cbc8b064ee989455cae2c7da2dd42749e6cdcf2bfb23c045bf14e066 SHA512 66b42c5dbc7fa9f1b94eb4a8d57af8b86c3e77f1339384e2e02ef2d83507b9b521c6c226a33ca3b11e0306ef073f226098442abb57e7ce701fd320ce2d76d85a
 MISC metadata.xml 365 BLAKE2B a13c6950b258165bdf4234a7ace93cad012a7e934979a022061a8944f7763d336a5b4af191b0ee8e9780adcd47b1a41c3499c58677ff4e81f0cbe4e6c0c61400 SHA512 1b3436d9f3a1830a273f235d55c9ec06475e5065a609a1dd835a698abb19b7b457957546b0c2b872238d26cacc580affd35bdbad3e18ea40a21305ad12432038
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.2.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.2.ebuild
new file mode 100644
index 000000000000..e9950f3e4f38
--- /dev/null
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's DVBViewer client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
+	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.3.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.3.ebuild
new file mode 100644
index 000000000000..e9950f3e4f38
--- /dev/null
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's DVBViewer client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
+	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-filmon/Manifest b/media-plugins/kodi-pvr-filmon/Manifest
index 7dc773a02f74..8a32b593d178 100644
--- a/media-plugins/kodi-pvr-filmon/Manifest
+++ b/media-plugins/kodi-pvr-filmon/Manifest
@@ -1,8 +1,10 @@
 DIST kodi-pvr-filmon-5.1.0.tar.gz 111224 BLAKE2B 8c65a7ed7bcd1846c0bf64ccf99111d8fdbd882a06a6045577d031fa68730ade691362f8b60105714e5ebe7f57e31d1e76927b1b505926b4fd7f3e99efc24983 SHA512 02ba24e23c44ae3000c4f41e90169ea1455678927c6de1fda1927c705bbb236ed06bd5ecd0da59f547f02afe7b695306f7282cdc5014816fd9e0f1922243b2fd
 DIST kodi-pvr-filmon-6.0.0.tar.gz 108084 BLAKE2B a30f73569fdea28d9c4beca1e605099e9ee4bdfc61c9c56e7c5089d26857cd67785bff0b7ac81916379d8ec825e2f1c1f870a9351bd49d24f35e7274777596ec SHA512 c86f649a12fca13ba5aabcd3c4c37a75279646fd093f48aa20ed3d6a75ad1de0980daffd3aac4771581628974515351c8f9618f60b4b5ea6b66ad91ea6ba0f6d
 DIST kodi-pvr-filmon-6.1.1.tar.gz 109741 BLAKE2B bb5bae3f97e6722f501c3ed5f8873787568ec5397306580d46c2ba68847315fc07ba2156a789ad6f9d7a35edd4e05f7399389db6833800ed3f49a7a9c966d388 SHA512 435bdb66092a7c48093915bb4a70ad6fb266f6706d130d1be31e272b12ae1bedf0f42b57fa81385cbeec0f948b8a3664fc1a4ea590f5c179e74266a506f08631
+DIST kodi-pvr-filmon-6.1.2.tar.gz 111152 BLAKE2B 43a8dc37b45cff82b9bd753d95595a61901df03a9e7ddc8c028dee3192693609a1d6c6803969bc5186817779c55819f90b002aaea2c4e99026cbe216341cdce2 SHA512 96f767e55c0d2f9784886c2f3a2e8500e007060898cbf6d448b676c89723759da5172b185e9a5e34c21975379cc103cc3d6a95ba6b51b39af0c2a6333406a0b6
 EBUILD kodi-pvr-filmon-5.1.0.ebuild 662 BLAKE2B 7866d82a74f4c3636f63ef889ccc87abb2ef325002b5313fa2c5f28ab3ef80e544747c0ce9add7386ac39bee3ed34cad22d68da2ba28464a5bddf7488f945ded SHA512 32a94940509cdb8523bbf0ab6013b37dcb9ef18b865ab3b82b005f7eea88a64804f457092d8a69f0c94fc7e4caf64f0f626c518bce690ee01f4369d7a598f7d3
 EBUILD kodi-pvr-filmon-6.0.0.ebuild 662 BLAKE2B 7866d82a74f4c3636f63ef889ccc87abb2ef325002b5313fa2c5f28ab3ef80e544747c0ce9add7386ac39bee3ed34cad22d68da2ba28464a5bddf7488f945ded SHA512 32a94940509cdb8523bbf0ab6013b37dcb9ef18b865ab3b82b005f7eea88a64804f457092d8a69f0c94fc7e4caf64f0f626c518bce690ee01f4369d7a598f7d3
 EBUILD kodi-pvr-filmon-6.1.1.ebuild 662 BLAKE2B cc7cbf9fafc1c4981edf531aaae78e759006e91d27a5439278d8732152232f457e86215a5ac7346189c98abce22cb85dfbb3013777199bbcb5b6eec6f783dc68 SHA512 3b1f3ee7291cf288955af5490a4b2a5d907e4557cb697eb0f09314147e88ab2596a442dfb28c82bc34d6c93f5fd25b483f3635199bf1db3e7e4d1205ffe996c1
+EBUILD kodi-pvr-filmon-6.1.2.ebuild 662 BLAKE2B cc7cbf9fafc1c4981edf531aaae78e759006e91d27a5439278d8732152232f457e86215a5ac7346189c98abce22cb85dfbb3013777199bbcb5b6eec6f783dc68 SHA512 3b1f3ee7291cf288955af5490a4b2a5d907e4557cb697eb0f09314147e88ab2596a442dfb28c82bc34d6c93f5fd25b483f3635199bf1db3e7e4d1205ffe996c1
 EBUILD kodi-pvr-filmon-9999.ebuild 663 BLAKE2B 4b2f64e7ad0b13994ae98e611346d88b3b24255e8d4ffe3dd9eda35b553b9de85c78538855df31ad6d7bea05660251a1f53eb603d87a5e3039a0a3b24230cd5b SHA512 8aa1ccd46a6af7fcb08e54e833652f5e6747a0c223f450fd8a6ecad4918a84082d7d32fe4686a2d1829ff1ea75757928898fc61e653b3d434a18f47cf663462a
 MISC metadata.xml 362 BLAKE2B 994323335a8588c4281b8a54c7d3129ec08bfb8430b3f56b31c62a20bab0683ea0397d6ce7af1ee4e77e97c6ad880aadc8cbf5c8b3fe3544b41f786fe42bb3de SHA512 c53ff24095bb3246146ad503596d61833a610ce82c670c8250fe6be159f4fff9303e43601b492f86ce99a47c37aa55aee938dc4060530eed67b525e7fe6a49f7
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.1.2.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.1.2.ebuild
new file mode 100644
index 000000000000..cbcac25ff490
--- /dev/null
+++ b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Filmon client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.filmon.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index cfab7cb68f29..079aab66d135 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1,8 +1,10 @@
 DIST kodi-pvr-hts-8.3.0.tar.gz 181974 BLAKE2B d86bea7a037ea0abf4a2e6e9b45fb7c69f03d4f29f7b97f9ed0367bee3d243e09fb1b3998c437e9103672de4bd8fa7422f5c89ac35e87c5ebccf730f3d2a3c71 SHA512 4c49e5351608da49317e4916e8f60d88df0f9f907ce0cae026708e758f6937e33ab25dcb82351986dc3f3b8d73f40222db38bdb3db046c8b67b0c17ef7892abf
 DIST kodi-pvr-hts-8.3.1.tar.gz 190434 BLAKE2B d1a2d17e94e02ec37d0598c5d550859db46214bb0acc20034b809386935301499cba53bae8db8668099d82deab986983f3952cc879a4160ae1bf1b992c347b6d SHA512 adbc77518f45d0c745edb8c1c687b4a3165b8d96f62f5a923b327f0ad89a52a7f1d45ad4541ac1dd9bc8f22b2537c018d977db4e0e8ee6fa3c9495bd36eb7fc3
 DIST kodi-pvr-hts-8.3.2.tar.gz 190508 BLAKE2B b48ba46bc640d23ea7157c7a4c013879e201a30d8c45849cdbfa33e4d52bd9508761d241f67db980fb9c518aa9921781907329f3ef3f1388cd8321bd49eb0bf5 SHA512 5ff3791c0413cc6a3ddfece9da1296611dc2bd8fd726260ded391f04f2a259a7ead756f7a069c1a5d3e2d9249e03b767b0553a2a71d297adea8644ee27f1fa7e
+DIST kodi-pvr-hts-8.3.3.tar.gz 190712 BLAKE2B 3c3470eacda0df7f5dbb014597b9a492a1b926aeaaf48febb439cc253b096feec416e5ddd4c29b521c7e8389e80f274dc507912862563ed0254db03f121d50af SHA512 30d3baeb6c970a14b965f09f572d35f9d3a1339dfa624610045ad8d7dccb65d7eced665227fccda6c12801745e08ceb90ad73f2829540d49854af62757ecc5d1
 EBUILD kodi-pvr-hts-8.3.0.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 EBUILD kodi-pvr-hts-8.3.1.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 EBUILD kodi-pvr-hts-8.3.2.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
+EBUILD kodi-pvr-hts-8.3.3.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 EBUILD kodi-pvr-hts-9999.ebuild 661 BLAKE2B 2e17ace5bb95016788db8c07b1d0aef10f72c5bf82f7c0321d27525550a382a565df112d4a5125233ae029dc294962da333d1f384a46bedd643d81e1c1a65fa0 SHA512 f6122a34e52426853d476eedfa33209d9435e02c79ae75520e6c64ae36a5cb663ee9140c96d53f2e7437c20135776ab8071c1a2de6cf73841c0cf3adc8bd10da
 MISC metadata.xml 439 BLAKE2B bc951f0eaf43cf751137213ab717ca84d60964687c640b778459afcc461700148ade8cf59afa7d0d0805fc53285db28de84950f38a0b9c3c7bb6c5a2c553214c SHA512 92746f7dacc9316b473e2e62ffaecedf88d760f91970cfd794d306e117ba45cdb509fc0cc7d868d55f70d8c567ffc34517c27c37dc51e0756758ce2860739a5f
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.3.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.3.ebuild
new file mode 100644
index 000000000000..2229139c850a
--- /dev/null
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
+SRC_URI=""
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
+	inherit git-r3
+else
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 59ada0385886..931bbca90638 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,8 +1,12 @@
 DIST kodi-pvr-iptvsimple-7.6.5.tar.gz 192388 BLAKE2B 596622b1058c392656dc27fd0a1b615f9fe1ce12695adc4e26aa5417e5250d6f18fcc3cafaab4d6c53d00c44fb57821fdc976b4efe369e24a3997921606dbeef SHA512 ef16b71cb1adf6d68e74935a12d5ecb8c52c732f5a69e0765558107f356686c83427356bbef3227b6744ea314ef2f1e6c2548ecb1f90a38a521d351048fac43a
 DIST kodi-pvr-iptvsimple-7.6.6.tar.gz 282395 BLAKE2B cdb3a98f9e727aad872f91a9f8784a797c0a87f6ce05ec0a21630b3912fc8a5b6548b94fcff58c35c62618c00bcedb8abcf45b7073afcd35dfde576034e75617 SHA512 7a927bed2e2121f3949a706cbd0f8085462f66dc8cfe3bfd686364cb8412f7feec53440054839ea2b6ac8bc124a15875112aff906c04c86d5867194e42875c30
 DIST kodi-pvr-iptvsimple-7.6.7.tar.gz 283836 BLAKE2B ac9a49ce09dfb02c5f69c57bbcfe2112fe7c68610e702c1690bf07398d53954512650294eb34d82cc3da037b6925beda4bb226ae55526c1a5837a97631b6e0e7 SHA512 ba9d70da83cb503f30027b2d57941f84a13b335596d085cc59a1dc61ce05e08735c6dd260fc17ac9175035a5928f211d045a8da462e323f6e9d7ed852eeede95
+DIST kodi-pvr-iptvsimple-7.6.8.tar.gz 288131 BLAKE2B db77ea4e2f374a714041a4bdc8d8a49458b05c3ee40a989039ed0087a6872c167da2fd56aea7e284290a1a0cb84a46e3e714e4bd803c6b3167c4741f3f99ae68 SHA512 19d884b1497e64bffae10e380b4536651c31d567d2857b665098aa576766f26c035be0e5ba3398cac04d376389e972530a795ae91b533fc87ea97e3f35532d27
+DIST kodi-pvr-iptvsimple-7.6.9.tar.gz 288485 BLAKE2B 35c752b0f7ed10d8f6b452d074c576554d3e49a67e56076af1c2cb31037a02f9ca7b7cc86815c30c3aff17b2ce8b33eca1f0848b353f3cf30b51b6e288458183 SHA512 72316d784410284b2c53dc259b22498e871ea8d82c0b91a744ad100a5c511cf0dffef9952a6bca33adfe129d7f88a4cbae74659a8b1fa4037083283d2916f699
 EBUILD kodi-pvr-iptvsimple-7.6.5.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
 EBUILD kodi-pvr-iptvsimple-7.6.6.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
 EBUILD kodi-pvr-iptvsimple-7.6.7.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
+EBUILD kodi-pvr-iptvsimple-7.6.8.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
+EBUILD kodi-pvr-iptvsimple-7.6.9.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
 EBUILD kodi-pvr-iptvsimple-9999.ebuild 777 BLAKE2B 1f18d43d3ce74c2dffbba99b6ad31c572d5fc5235409ddfb864abc8b2dcb3e5c1b584d7c58fd34b6aee45503198361c5b0b1d90b3946be18ac7cc9429330c214 SHA512 98b61705920ca7daf65b16c5c38e10f7e0a832e2b91c8eee0a513f2f459591ddfdd59a4146eca101630a7ccf863218c8d5e593a4704ffa70eccb4c7133679328
 MISC metadata.xml 366 BLAKE2B 7e2c022e027a3c4d0c1f5d5aa889b390fa079d8c71b16ea773403b9bbce28c7dae01d370d741575255b20dd4b7cf1b9d3f58161ac271c8829ed26d65920f5876 SHA512 379194149299ccced43f0c2054ef9fd8c049e4d9397c062ece4dd2e517f1f10a670cf53626daf7f53261981ac346c38e7aed9ae0710527843051a2d861c7f655
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.8.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.8.ebuild
new file mode 100644
index 000000000000..36d5b715c65a
--- /dev/null
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's IPTVSimple client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/pugixml
+	=media-tv/kodi-19*
+	sys-libs/zlib
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.9.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.9.ebuild
new file mode 100644
index 000000000000..36d5b715c65a
--- /dev/null
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's IPTVSimple client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/pugixml
+	=media-tv/kodi-19*
+	sys-libs/zlib
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index 90d803c4357e..3c744b6e788f 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,8 +1,10 @@
 DIST kodi-pvr-vuplus-7.4.3.tar.gz 285230 BLAKE2B 0ef24cb24f745494ea86ea025943bd4c159beaa684cacad569ef603d355b917351b92dd145d1fc8e3069896f404727f6aaa2567b5f3633fcfa9dbdd1c60fd09e SHA512 b563c29600126ac0d25c744be64d060691331a875b7945c211f1267daa43d8db034c717b1def49ad85aaf50f81826e4c7ffcff08ad4422fa67abe2ea3cf5557f
 DIST kodi-pvr-vuplus-7.4.4.tar.gz 946491 BLAKE2B d3a64a10b7d0b0774aadf6290f70a6f8fd90de0790616d4b64927316c46929c77cb49fa0d69aaf5ba847513d5ad1fa2d208557e4b0b071c04bda94f53a3d086f SHA512 21d705116816d6acc1b70b6b1bebc0ca4bc0eedc2e55c204697608597d6bc88be47b16f18a2d1b04f8f22600a5388062ae259842702ab1d2170ace496edee2b7
 DIST kodi-pvr-vuplus-7.4.5.tar.gz 947455 BLAKE2B 055afbc8dd7e902771b88e34b47ff7d42ab6e30de27d1779f54847a4d04cda920552b3bbcac46e1ae26f5a113f014d04998aec71b83c4ab242f966035df398ce SHA512 04ba9ab1b7aee4418c305538ac880aae80c1523fed10d7104dce8a294c072d6be87469016fc673e4d54cc1faaab0074cd15f6edf3207ad88a962d4a41844985b
+DIST kodi-pvr-vuplus-7.4.7.tar.gz 947568 BLAKE2B 92ed09db11542a0d8c027e2828dd55df464ebd26ae22076c00a617124c3503f1e70623ae594789f1867d7f1e54649a417198153d7841e569f43506cd09dc1792 SHA512 a5843b36a3249810e0f23c9df66079dfc587697bc3dc43e013392648c60fde3f09b461a8323389a50cb3874a1bed24139bef1db9854fdc579f23d246b5c69e3e
 EBUILD kodi-pvr-vuplus-7.4.3.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
 EBUILD kodi-pvr-vuplus-7.4.4.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
 EBUILD kodi-pvr-vuplus-7.4.5.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
+EBUILD kodi-pvr-vuplus-7.4.7.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
 EBUILD kodi-pvr-vuplus-9999.ebuild 765 BLAKE2B 65a7bb78532a89ffa205709e64b92a14f6088412e8456d8a836ab496f1a010150b602ce9f8841f38cdb585dcf1135662405f2ca200658a88ff0dd0944ad07852 SHA512 70534928d3d77fe610b75048d73443481ea0eaa0419a22a6376774aff60d04382f8e9305c5a8d42cd7425dbe5c4bde17dd81026ea8074323bfd3599c094d4b8f
 MISC metadata.xml 362 BLAKE2B b551dbe10d765427e74ffc88979ea464caa79988f4204b05ced79d38745ffb4dff3fefd0464a999af66de4d132dcc0439ceb1239ccea3f924bf2a2c9083fd3ee SHA512 c9053d27b0f39fcef4c226c9a6c5578ae9cb076288fdd8f6ee39fb12b12b445499005515e79e5de8e4ba9e96fa991fd0210b3621b682960b41143ded1d84ac14
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.7.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.7.ebuild
new file mode 100644
index 000000000000..20323489f843
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index 92d41da36661..5ed48ef7ca71 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,5 +1,5 @@
-DIST qmmp-plugin-pack-1.4.1.tar.bz2 235757 BLAKE2B 6ce61db9b4af6eaeb182c3bc4fe3965c1b7a6c36fb20c68cf45595af4e60667d4c8c20fb5c80246b3be523bcde8735f6a240853a6869beff0c17e0e4b0a9dc63 SHA512 e050bafb949209c75d1f9406bc2bff4e4372ff709cb9f5564a226784d160fe3732ce5fb058c4d11c92653e7097e121fc2e46fc693c60168e346cc5f645c5bacc
 DIST qmmp-plugin-pack-1.5.0.tar.bz2 227931 BLAKE2B 5d036ed0627f6d42187c9d4055185cae2945f99d835694937e2e32ea00063aeecb4ecb4ab494bea151fa7112cc8f604175129e99fc999b2cba4d0ca95074ab12 SHA512 ccc62290f5ce45e6f6743c495800641865f07b0abbc40f8eb2e50319407c85f088c93f952905356b695b57e3b7341096faeaa3153e0635722d62c32bbd3bf7b3
-EBUILD qmmp-plugin-pack-1.4.1.ebuild 676 BLAKE2B f1e0c6fe8f58c9abb907049b8c4678854f3243a847efcbbf0dac729188a681720b01e545e92fd94c30305e2f18106d9df1ad768e51a6ab6725c9fed9bf7d2de9 SHA512 6ed309664867b86d813b96458c929466ba58c5080e4cb949a9d478a6e9888f466b399ba25aa49a7d739adb30fb10f740258e4a5b4ad2e059a8693d6b07897a79
-EBUILD qmmp-plugin-pack-1.5.0.ebuild 677 BLAKE2B 1d9563b330c69bb2e186a60a190c2e317c683fe70aa113eb1f9cdc7c261045a8d4b6a3ab71c081024fb3a459c405cc12e5558250ac4a98771190037a3d794819 SHA512 34a2ccda3eb2e0ebc0c9922b9d729cfebb1170f1dafd7d8106adcb9aa1723ac57055c416f9ea6a01c18c3dc0931710aaa3c2c5169cd800090232bff8430c956d
+DIST qmmp-plugin-pack-1.5.1.tar.bz2 226034 BLAKE2B 804e18c538119bfe89700f1975ff717c20bb65c2b956c30dae91d1ab2a06baf716a07809d1391f1844dadc3e8524fb6d37106b33091b91109a19f323b0942306 SHA512 0242754fdea26fc7c48a18edf77d35820af86643079c729465d9e4ddacb22470686e9d2771abe52e30441f97db5f1546ab984e941396d4cc67e7a0a1450328f3
+EBUILD qmmp-plugin-pack-1.5.0.ebuild 676 BLAKE2B f1e0c6fe8f58c9abb907049b8c4678854f3243a847efcbbf0dac729188a681720b01e545e92fd94c30305e2f18106d9df1ad768e51a6ab6725c9fed9bf7d2de9 SHA512 6ed309664867b86d813b96458c929466ba58c5080e4cb949a9d478a6e9888f466b399ba25aa49a7d739adb30fb10f740258e4a5b4ad2e059a8693d6b07897a79
+EBUILD qmmp-plugin-pack-1.5.1.ebuild 685 BLAKE2B 9ee13f88cfb6f754fc2596f8f88e820871b8030a8fcca42e4412dfde48d5c6c0183ff4b1da982991b48d6ab471c79e86d64d2800fbb892f2411218609fbdfffb SHA512 e64b16597c20e75cef8883dca3236190dcb706aa14388c5f1fd6e664d8d1431b7f0e52e8ebcd01db7116d2f90ae4f22a45badae2297c1d32c0f2aadf54815965
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.4.1.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.4.1.ebuild
deleted file mode 100644
index df779d96ad38..000000000000
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.4.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A set of extra plugins for Qmmp"
-HOMEPAGE="http://qmmp.ylsoftware.com/"
-SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/libsamplerate
-	>=media-libs/taglib-1.10
-	=media-sound/qmmp-$(ver_cut 1-2)*
-	media-video/ffmpeg
-"
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	cmake_src_configure
-}
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.0.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.0.ebuild
index db7c51aef33a..df779d96ad38 100644
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.0.ebuild
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.1.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.1.ebuild
new file mode 100644
index 000000000000..348abb6cd527
--- /dev/null
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A set of extra plugins for Qmmp"
+HOMEPAGE="http://qmmp.ylsoftware.com/"
+SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libsamplerate
+	media-libs/taglib
+	=media-sound/qmmp-$(ver_cut 1-2)*
+	media-video/ffmpeg
+"
+DEPEND="${RDEPEND}
+	dev-lang/yasm
+	dev-qt/linguist-tools:5
+"
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	cmake_src_configure
+}
diff --git a/media-plugins/vdr-actuator/Manifest b/media-plugins/vdr-actuator/Manifest
index acfdbc5627bd..04441b667d60 100644
--- a/media-plugins/vdr-actuator/Manifest
+++ b/media-plugins/vdr-actuator/Manifest
@@ -1,5 +1,5 @@
 DIST vdr-actuator-1.2.1.tgz 91343 BLAKE2B 93c29c026a7e5178e0ec71c7276f01de8afb2bf3360a654029aed6f32dc769a6fb0100900e3dd33ce7386dd09e2bf3952db66b21387346a043b8b096e0a64602 SHA512 faed02e0dfd1027e412418023caba7c257d6f7c46ebca89139436bf2769c3b928f103ab2e1d90bd0836db32356e3fa238d5fbef6c5548415cefee0f09c96fd66
 DIST vdr-actuator-2.4.1_pre20181025.tar.gz 122233 BLAKE2B f49cfe08f9201fa0d2795e12acbb2c981fbf7e91a9609930deb70d8d642ef5aec3d740af3d0613ec1f9332a5e08135ab05fd2eb4a6d1ab0da18b1b1a9378b5a8 SHA512 f2a79534d3bbb1320b75be7a870e7cce95bbd814f82bbfa61ab30bafeb333dcf3220a4f9c470f4390b691aa2cf745f565e45d776e4ae170ff940132e1dcecaac
 EBUILD vdr-actuator-1.2.1.ebuild 545 BLAKE2B ab32426ea8a0ef046d1c243d5685607f62f2f086d8b62e3088fff5b80e37a16dc317a29ea4b526cedb861a2301f5f842407e436131e35ea6c5615802f3af5cab SHA512 40b02c715bc3a70feb78f1fd9048b9dd5cee56215791b8b638bd1f41fa2b9ec6582274cfe59056b5a721ede1e260f6f1ba695f14bc09cab486e19fe4c05a19d0
-EBUILD vdr-actuator-2.4.1_pre20181025.ebuild 685 BLAKE2B d93d0187068696eafb108535057a70d89aa8c8f33c3f41959e417def38d1d0c456a7e218d097f83a28a3ce18af59f1fdc02b5d198f4de95b443765aaf124c625 SHA512 5a7e7062aca1e4a3857e644d7a9f316d499dba4a58d91f10d7966968ac428f46e651c0cbacdbabd5ec7ac28f657f96f1830514a7ab9ad7ca8abcbf6f36ef32ad
+EBUILD vdr-actuator-2.4.1_pre20181025.ebuild 683 BLAKE2B 78ec07324035755cb25ccdccc31191d8dc6a51e7f4ac14028e8286aae4a7c2f9e8a78138561f2d8f2a378f5f06842a5249c254a9008edb294fdbcf4e358e3a77 SHA512 6952eb7c074b3c36492b98e40fe32eff6fa4130c97aafdab9e7af71b827a868d5efe7aff5937f60f299bad427f59a8449e4ac2753941809fdefb82a36d2148be
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-actuator/vdr-actuator-2.4.1_pre20181025.ebuild b/media-plugins/vdr-actuator/vdr-actuator-2.4.1_pre20181025.ebuild
index f07e61092cf5..d787ce070e05 100644
--- a/media-plugins/vdr-actuator/vdr-actuator-2.4.1_pre20181025.ebuild
+++ b/media-plugins/vdr-actuator/vdr-actuator-2.4.1_pre20181025.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/olivluca/vdr-actuator-plugin/archive/${GIT_VERSION}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=media-video/vdr-2.4"
 
diff --git a/media-plugins/vdr-avards/Manifest b/media-plugins/vdr-avards/Manifest
index 08f79861de01..d114b5d09128 100644
--- a/media-plugins/vdr-avards/Manifest
+++ b/media-plugins/vdr-avards/Manifest
@@ -1,5 +1,5 @@
 DIST vdr-avards-0.2.4.tar.bz2 24865 BLAKE2B 13d14a923869054145e7cc30515271ff5676dcdc14d6a7237934deec17d9b2ae52b34df5d32b00f415c744d16311dc2af9e7c28bb9842244e6b024b89d9bba5a SHA512 d878016d83317ff4d8a6fc121344615d508f1dc1c8b1d555a9e94cb02725353fe8c9f274cbeca45b5ee46e384379128a8c1d1ec8833aa10454d7bef1be02fc83
 DIST vdr-avards-0.2.6.tar.bz2 26190 BLAKE2B 56bd73baeea816dfdb0c1c67b9699236a62f29333f97ee9a962ecf215f153e427ff738e24af2faa531c272075a0e7eb4fea6dc8f627bf3023caeb8d132b1d3c1 SHA512 945182b77d4dd5fc927d0fb28635183a29dcf45addc3ce8fee50e00bf5f12823fa20e707736f87b43c53c821c149365c8b4e47390ca70ad0a63f01b544ccc024
 EBUILD vdr-avards-0.2.4.ebuild 834 BLAKE2B a7eb4c13e94155b58b0cb14ada352bcee53c53d671a8984946873aece6740d1972981e3bb3fcb5e147e8573c563f53bf569755d4200ac4694f9b32902dcc9ffb SHA512 ae0adb8dfeb1195562317ee0fcfae3147834bb762eeea2391f9b210d0e7db7fc21e2beee2941af039da75573c462b27ce66004ae9fd90da7480638b6a8258231
-EBUILD vdr-avards-0.2.6.ebuild 583 BLAKE2B 33df7761f2fc528f2801cbf40b72ffde42f678d30493963dfee9b96db2e3e3cc9fb33d2a3ae67f4f5c7bde0f280f16dcc66df15b668a3734463a22bad17cea44 SHA512 b6437610641e81fdce3db3709c0dfc2c593a8590f41638d467e158bfecbe88881da185a1cc85e3e94f3db869b6d818377d2bd2205cccc8958e5d56cd0fe10135
+EBUILD vdr-avards-0.2.6.ebuild 581 BLAKE2B a13bf8494e0e3344e8031b99e9628c1fd60a4e155953497d24ec02da487903dbcb4ebaba4d600757b4b74cf73495bde7aefbb24e687907d60d115b41f755ca6a SHA512 b0af3323362975b737c9cfef05b552682ab060831c6c035882e23d7055e832a4da15d45fc0dc3fe52efa333bdcaf65e65dfa5714af3449028be42843e3e88034
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-avards/vdr-avards-0.2.6.ebuild b/media-plugins/vdr-avards/vdr-avards-0.2.6.ebuild
index 2b5ba1064f50..0f88ee0a6e4a 100644
--- a/media-plugins/vdr-avards/vdr-avards-0.2.6.ebuild
+++ b/media-plugins/vdr-avards/vdr-avards-0.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://firefly.vdr-developer.org/avards/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="media-video/vdr"
 
diff --git a/media-plugins/vdr-duplicates/Manifest b/media-plugins/vdr-duplicates/Manifest
index 55b17759f7cc..f5f4c26e97fc 100644
--- a/media-plugins/vdr-duplicates/Manifest
+++ b/media-plugins/vdr-duplicates/Manifest
@@ -5,5 +5,5 @@ DIST vdr-duplicates-1.0.1.tar.gz 17836 BLAKE2B e48b8fae13ef0ff8e310045dfd40eef27
 EBUILD vdr-duplicates-0.0.5-r1.ebuild 452 BLAKE2B 58d430e31b753d1b838273f69536b95f70584f2f03dd02a130574c169bac00d8572e0826cc866746ace9228e8722bb13f954d5b27e9af6c7353192301efa30d1 SHA512 2889da1b8a2f7e318565667b071e6dafa84dbf3f238fc97d204354581c6abe212bf6f5b02fde268e3f6c579d752093a378e518681cf13f39b0594cd35e50e9fb
 EBUILD vdr-duplicates-0.0.5.ebuild 390 BLAKE2B 818d664947213bfcafb42c3345718d1b5950e86ebc1192ac9315029bac514f4388b214d88316f0c21bb5d54c7d5a46f75e718e23a3aaf69f77ebc0c48e365b04 SHA512 e5de3cc0e2217d75df4b0cedfaa2ddbb381b1d19593492198480fd03a147f4e4bd9820da5185576214537dbc140144c002cfbb2c551c789292b292574eb9d943
 EBUILD vdr-duplicates-0.1.0.ebuild 392 BLAKE2B f9bfb5c37128084edbf3652fa8b868fa0577b4ecc4e0eba401fe631693a60e663411853e43e0d695b03ffabaa3620ccab3b43e435ea606f21e27dd068080fae9 SHA512 5a9b874faf3a5291271530c6cb9967a2bc8977bbca3edc0f25f5e0a86128a37218034dc794d07f34dde713e216d8d6323755053656f34b5536cf5700eee54e87
-EBUILD vdr-duplicates-1.0.1.ebuild 609 BLAKE2B 1013ef73dcf5688e86f5d48737649a07cb988e78a1a2ec4b6b83565bf72a12cfabf4de6dc5e8c27d7b2d5983361056152780800219103d080a190d26e443771c SHA512 99e30ab3dbc127a13b2baf84868fda4879c8a8ccf4c8111fba5ba7726f52909c89c618641c6ddf1aea8953a94f36370005d98533b1fd9fee0684d83efb599721
+EBUILD vdr-duplicates-1.0.1.ebuild 607 BLAKE2B 3f618fc99f43a5e2a7d2c728ee037093c448de8daeed22b04d487a5cbedd1e22a4c820b611ee9e538260c4a22811fa2ff7960daa1ede94258a09983c95cddff7 SHA512 83ab06716ffbb345c15b01e0406247fbf1d0e2c3a79c4594a4b626a21a180e6c22f102e1b73f61833b5631bce7e3d932bf9afa746365940e2d97db3a3158a594
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-duplicates/vdr-duplicates-1.0.1.ebuild b/media-plugins/vdr-duplicates/vdr-duplicates-1.0.1.ebuild
index 7356943a4a10..6e0110ce321b 100644
--- a/media-plugins/vdr-duplicates/vdr-duplicates-1.0.1.ebuild
+++ b/media-plugins/vdr-duplicates/vdr-duplicates-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ DESCRIPTION="VDR Plugin: show duplicated records"
 HOMEPAGE="https://projects.vdr-developer.org/projects/plg-duplicates/repository"
 SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-duplicates.git/snapshot/vdr-plugin-duplicates-${GIT_VERSION}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/media-plugins/vdr-dvdswitch/Manifest b/media-plugins/vdr-dvdswitch/Manifest
index ac159ad81cb8..c645d1f92cf0 100644
--- a/media-plugins/vdr-dvdswitch/Manifest
+++ b/media-plugins/vdr-dvdswitch/Manifest
@@ -3,5 +3,5 @@ AUX rc-addon.sh 313 BLAKE2B 50098e5fe29f09a5841a253965ecfeae132b5991874768baa635
 DIST vdr-dvdswitch-0.2.2.tgz 50332 BLAKE2B c84fe0c1525a037bb3509d240f6d2fcdf41560a705d064167f5a21316e33ce7dc0b072367a393ddf245e0a8a3c3a5dbb795bb2e61c0ef6d80507dbf069b082d8 SHA512 37a89f33a2280823a885fdb8aa4919c7bc438c26ba6273ec25a7c980d7dac6c57df125f560b6f2f04d46a1db623c129a6e598d61cde66f5944e5b349d65ffeb8
 DIST vdr-dvdswitch-0.2.3.tgz 48515 BLAKE2B 5a342a518be0729be114500fe50d47330aa319fc84ef90e3fc1384be91b8e79748bf6c4301e549d7a7ce9d6d3b466ce89dfbba3f979be0e6927e7d8a4dcb6c06 SHA512 2c27b28a9b68f4880396c7297358eecb13d76341c98902c02eca86ef366709f38cba414b3e94445c52b56816e37e742340c93145816f5bae1b7ffca0bcd48df7
 EBUILD vdr-dvdswitch-0.2.2.ebuild 679 BLAKE2B 71674fcf19f0d25d6d179a566b2ee752564612d22b9e049f843432f39df7e683562c22b8c9c7296168171e92a68e414f091c854cdc0e38e37402a443c859e8ab SHA512 b4833e10ca2e86c0f35aeebf8752cfbee8d5c9ca8d4022737c8aa5bd7f106353cf5d28436c7be11a1e36b39ae329bcb6625b415e30f42f7231193349401e2402
-EBUILD vdr-dvdswitch-0.2.3.ebuild 674 BLAKE2B a4c830b0a46c4f40085e8932262f28c9fd5a41a48537b84bc27f986bd73cc84ff5c07b32e00ec69dc687529c83a2a84e532eadf10d7c75883633c0d0b47d18a9 SHA512 3b4d98578ca5ae20b70d939ce6068a0f9964a8a26c2614d2372848bbb6da03582cc5cfd3dfce2f45caac07c7b26237d74f8667924953f5877b0c41a04482e31c
+EBUILD vdr-dvdswitch-0.2.3.ebuild 672 BLAKE2B 6878e720d5f5ea8268e0a2a824f8f1f33a6f39653fbeadfedc50f4b047539098dbfa994a2e51e18c38079cae875f0cb335d4bad5eff2af5923830033b0d4e4f5 SHA512 549b3666e0ea49b02ea4ecaff8d1d2980aa41788f2d39968b6e3d6e0880c58f5f22452eea81a54c1124946ae5c0747e4929d8905d7c3d1fce912183619ba63f2
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.2.3.ebuild b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.2.3.ebuild
index e20d6e3795c6..3f3399221e8e 100644
--- a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.2.3.ebuild
+++ b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="media-video/vdr"
diff --git a/media-plugins/vdr-epgsync/Manifest b/media-plugins/vdr-epgsync/Manifest
index 9f051cf70e84..d8d59cb93543 100644
--- a/media-plugins/vdr-epgsync/Manifest
+++ b/media-plugins/vdr-epgsync/Manifest
@@ -1,5 +1,5 @@
 AUX vdr-epgsync-1.0.1_vdr-2.4.patch 2244 BLAKE2B 76f1a631d4bdc0c86121b96ac23d08c3b691c0152a6238e392a9308b0220e9cf7acd04ffa23fcb7d509191f0d9ab31ddc6e64acf603ca491ae459ad1f6ce34f6 SHA512 0e8558222090dc2248c7c96798523a69988738a4e28d0aed24f93a4b8eb197d220227896fa364ccf5c029666164a4a2a51876794d53c0a6e8c4bee9f89d3f4f5
 DIST vdr-epgsync-1.0.1.tgz 18198 BLAKE2B 0c2d782253d9c48a59e2dcf8cb58295b92d5c8b9384d947659b760c1f6b68c9b63c10ca4bccf5ae767d7499ea934f321edd4cc9c600f8da746781bc3a050b84d SHA512 1c9d1220460031a7dd22f8a8131c291bf9c66847be33c2a57464c29d7ed4b2297d6bda04c3ea0a24e3f00d5afe040d9236c5f9ef9f4389878906abc54466de18
-EBUILD vdr-epgsync-1.0.1-r1.ebuild 431 BLAKE2B 4a79ae59d5149bbc7f057dc8256319ff0ba1ff92439f33b515441bf9ec4148fd63cb961106dd0134864a39f8a9c72ac25f0f0bf997b1bf931a47a0814f7cfb49 SHA512 2d21526ee05b65a9e0ef749ef0b15350919e82956ff3356e2b6f8d7523864cba6e765c4bb125767cf73a3a3ea58513b47c0fcf5d6e69cb86da6286941cdd66ff
+EBUILD vdr-epgsync-1.0.1-r1.ebuild 429 BLAKE2B 93efc73bbf83fb4ef9fd5652a982ee3b6ad0f79dadedd7f188e727b4ddee0e56b0b709e0cb7baa8dedf7f31dddf7b9fc4c3bc878fd6a7efef9f6bb4c65aeeaef SHA512 114d3d2443015dfbfe7722f2d131c52b353dd904c0700bf682bef51bcc770bf6103f8ff50a57ecb1112b5b2af7ed9af907d101a16fdd3d6020a5866ed050c84f
 EBUILD vdr-epgsync-1.0.1.ebuild 413 BLAKE2B b60b73e5fac81790e228cf3139c17517d0e3b32ffabb30fe4466682a6921afb8d0f0879687977fa1031071d26efec645ad639d88e134f7b3fd9a1866693e4761 SHA512 c5fd54121d0cb0c4f8246a920ab6fa4cbe3ca804f03bc4b6c601702f589b7f9282d376657284b0e9bf9f5e5ee0ab5179e027223508bee5d31e7b8de2c7a55fad
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild
index 12631b5c4ecd..c6ef2cedef44 100644
--- a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild
+++ b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://vdr.schmirler.de/epgsync/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND=">=media-video/vdr-2.4"
 
diff --git a/media-plugins/vdr-extrecmenu/Manifest b/media-plugins/vdr-extrecmenu/Manifest
index 61af237cc388..61bccb39fad4 100644
--- a/media-plugins/vdr-extrecmenu/Manifest
+++ b/media-plugins/vdr-extrecmenu/Manifest
@@ -5,6 +5,6 @@ AUX vdr-extrecmenu-1.2.4_c++11.patch 1039 BLAKE2B a62bf2595d2eb5e6caf2a267f7234b
 DIST dvdarchive-2.3-beta.sh.gz 3412 BLAKE2B aca97b4c7abcc907f1242482f0f0550cb38fcd357acb9ec6ebc4c978a8f50e9c63fe6fcc2932e426c5d7301f0eaccc5e2f8726e72abafe504e5503528ce782e9 SHA512 18262b1e6749961bae37894649f518f88ad2ca100b83965eb48ce7344bbf4f7bfac9d36c9b9d91744281c00c4b89fa49209cc98ca5d848b46225facf4ef7a48f
 DIST vdr-extrecmenu-1.2.4-r2.tar.gz 729966 BLAKE2B 2ec2790cc57db3a9f1d12cdc43eea3e70076ef14d9f0392eb9ab4cda4bf30999a163526416276e661430bf9b684f7d313f5f7193997118e061bf5352c5bbe39a SHA512 d3103e5bc65f968bc4f512195eaa25b04fb5261281d79c7c486fe2532656b8ee7ddc00648d46e92c468b33f95e77c6ce3b2ca67a2debcc0c7021a4b525ac0aa4
 DIST vdr-extrecmenu-1.2.4.tgz 731823 BLAKE2B a226aadb843480b62798e2c4226af8bbb5bba41946f14222616ec43eec94a1b45150661ceb9ecb85e714673f408ab01849b6d55b6572da8028e6b47f9991916d SHA512 a750c6ad244e2afd3f04cafe634ec3c58baf4a38a809121a7c9045c327b4f10cb28b7aab4b7bd0e86d0b7febf85cc7fbc258bdd83386a60ddfe748347192f592
-EBUILD vdr-extrecmenu-1.2.4-r2.ebuild 1098 BLAKE2B 90e947b247b944d3d2d9e6b0139a0a75a3f9b09d46b632dd421500fd7eb390cfa07300d34cb7ba10f209319ea7a00620e4a01189b8aec20508e911c15f9409cf SHA512 017cddfe0c29191f8582a14ad548694820cf30531cdc9fd96f87aa649868c60f50676e34f4a9c13045f88a86fb5f10dc993fea35b87bded404ad1529ed30e9ac
+EBUILD vdr-extrecmenu-1.2.4-r2.ebuild 1096 BLAKE2B db5bbdef3560dd09c3208c67d7729616a58bde7d93418e68183fbe3ade4ccda2be45c723d0955b7142454aaeccccde457e0413a91a03489dbb6ea109443e4de6 SHA512 5cbf2f7fb2bd35d54312ab0ee345b48b21d0454461715c26e07dcd3902d12495eb8c1fd71c59341d4f4da1856d9e536d23ec993f150e03554467dc1ac850dbf3
 EBUILD vdr-extrecmenu-1.2.4.ebuild 971 BLAKE2B dc21e6f6257e60c5908639dcffbd2a030262decba1bebfabc9bc31dbbfcc2da33ae19274db5ff04a18fd2ef31c2b62d110ee8ff72ecc3dc98ecbb18954abfd40 SHA512 3a77be9edbb717937019724446722a8cfc30fd88b67699c8cae6b2854411381662abe97152b35078b3dbb107dc5ee916bbf5335c4a0015d3f8305248e7438b29
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r2.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r2.ebuild
index 9292fd19242c..1fdb6d35dc20 100644
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r2.ebuild
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-extrecmenu.git/snapsh
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND="media-video/vdr"
 
diff --git a/media-plugins/vdr-freecell/Manifest b/media-plugins/vdr-freecell/Manifest
index 75b432b7c48a..87b84ee9279f 100644
--- a/media-plugins/vdr-freecell/Manifest
+++ b/media-plugins/vdr-freecell/Manifest
@@ -5,5 +5,5 @@ AUX vdr-freecell-0.0.2_vdr-1.5.4-compile.diff 570 BLAKE2B deb8adbbef3519e1ce8d0c
 AUX vdr-freecell-time_ms.diff 332 BLAKE2B 7e7c3f7b2039dcfc1482eadc18d1ed99078cd4ccec519527d290fd532c06f3d33943cabc491ef24128d50989f084392aa6e3efbcbe18d99c01a172671205360f SHA512 8a00f7d82fc48adc29ebff3802c971387306735b0be562c2cc25813c70a68f386708f8e10b10ec3bde7d634a6d68b829558c97bd12705091c7237dfc279ea542
 DIST vdr-freecell-0.0.2.tgz 44019 BLAKE2B 56dd49906bb9cccebed3d51a3dbc0fc589f536bdb9d9bc4b3b9d0c5a5f582b706747d45865be057d8d3be5664292c01144a933eee6e36dc4a2610556b3fcd4cb SHA512 78288f10e56baffdd42a0448c118ccd619bdb3f94123a89661918976fc818052f45db0e3a6e0e45794dbe9f3db00b9ccfc140426e0f26d647c863c666827feb8
 EBUILD vdr-freecell-0.0.2-r3.ebuild 791 BLAKE2B 609a02219f8177692863be375e90317a45e0ad6dc57b7c6f7296dac383f72fb65d37baff6eef321707017787b0debceb2c3811584eb155f88d4302495fe0770e SHA512 b4ce18c6361ab4e59fdf695211a59f08b3e7af3cea4de0956df9606cdbe5874ee81b205f3c6f6a3f1d8b570693223d4d856c0de7d08c55aa77239ec7eeee0f56
-EBUILD vdr-freecell-0.0.2-r4.ebuild 812 BLAKE2B 07aae313bd3e3122d4d7401cbf8769fd38df88a5a28ea467a93f64170cfbd4b16c92a3bc908e133af0de975a5e8cd9daa35b430c55af59001ce8c882145ebe95 SHA512 ca4bd240bb9ac7aa3d2039d4422a090ceb27dd8d0585cdf67b3482018cbfdd6d6f459fee4f8873b83aac2865d5863fac5d8ddbef01ff3f0e7da36029b6ed4073
+EBUILD vdr-freecell-0.0.2-r4.ebuild 810 BLAKE2B 043e0131864b9e99277c7781f894dc64c0d299d5415ecf9d6185258fbd2c5f493636e70eae5a6b9bb4ca5c033e494ca2ff604a179e34b2da0bf9654c518038db SHA512 0ac17795a39ed588953423362d1337e7a658dfb8b1b874ba92b11c687e4bff4640bc39bc5ca13073db5adfae25dfd1b54dc125e33b19609a84e166e5f213f6bf
 MISC metadata.xml 252 BLAKE2B d1f37eaf7710a1eecf1cb5507974353424cfff01c8bf3521100e2c974c107e7f960401fa132c22ab3d4725f43b2472e146219e16b9903e4b9d239f17a4f03bbc SHA512 a212f4d0fb9a7a79e6c203fe2722bdc136618f0058b01c53df37f5a507f1113ca007cabbff7abdd4041d20a901e7ba0ea62c95f22ba79b1e801a2662c00b3fdb
diff --git a/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r4.ebuild b/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r4.ebuild
index f7f610e71233..4b9e7bcc7a1b 100644
--- a/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r4.ebuild
+++ b/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="media-video/vdr"
diff --git a/media-plugins/vdr-osdteletext/Manifest b/media-plugins/vdr-osdteletext/Manifest
index d3be585ca531..c936dfc7db00 100644
--- a/media-plugins/vdr-osdteletext/Manifest
+++ b/media-plugins/vdr-osdteletext/Manifest
@@ -9,6 +9,6 @@ DIST vdr-osdteletext-1.1.1.tar.gz 111113 BLAKE2B 5f9f44ad0615877896a9080f1b32fe4
 DIST vdr-osdteletext-2.1.1.tar.gz 123531 BLAKE2B a8a294b9406d7fe52da2fda0da4d59a4bff7392d9d05fd5c5856fd40c875004280abcb255ca47fd0fb84c45c8fc285992d18c41f9b668be746e3b728066ac70e SHA512 53edeaecf79d5008d13e3c621126494967c333a38ab51c1941cee5dd3ce2bcf1c6d4e1bbb8220657b9ad7972170724d956025d72728b4153d4d45d5998829001
 EBUILD vdr-osdteletext-0.9.7.ebuild 1206 BLAKE2B 26d9c561a70002d6531181fc039203d8f7292fd23966f42f1d4080948d04c168d3c91df83454473ff13e8179a3c6ae21b8988cebd633723280a2635f9d119e51 SHA512 6b06ee1321f69fadb3eb9a1fd3af39c7942f85f35ce19ccac8ffb0aa45e9353a608d0f4fa4acdc75e367e5341262a4f9e13922d6a027b9f62b1b9a9d0a6e2644
 EBUILD vdr-osdteletext-0.9.8.ebuild 1232 BLAKE2B dc12f1752e8e66001fe7c5a2d7605b37983f121f5fd50218a268ee807c3b0ced95b2c0e63112a56bc6d191dbe1940d6ad806b1da45607f845317a482684c210f SHA512 9de8ac1f54cb0cce110094e658b8a21bb8d5ef6e76d5930059659743da942afc75b0e0538e0c2f954927ca140db8f36a07e0d8e092b3c8d7294149b7b6ce3401
-EBUILD vdr-osdteletext-1.1.1.ebuild 1234 BLAKE2B 65693a600e0378b9adccdde33aa8aa2dde04f8f7147af8d63189a9ef53f7356ef2d0270e0b33f112328fb9750e66fdedae4fe6b42ad993685a989434eb677b28 SHA512 cde3e9da20239555bce2bea3af95915e791e853afe94c367fad8b38abeae393eb56c943edaa170b0c549a08ec5b1b058ec58c0c03cccf23ec4a3a0057007e865
+EBUILD vdr-osdteletext-1.1.1.ebuild 1232 BLAKE2B dc12f1752e8e66001fe7c5a2d7605b37983f121f5fd50218a268ee807c3b0ced95b2c0e63112a56bc6d191dbe1940d6ad806b1da45607f845317a482684c210f SHA512 9de8ac1f54cb0cce110094e658b8a21bb8d5ef6e76d5930059659743da942afc75b0e0538e0c2f954927ca140db8f36a07e0d8e092b3c8d7294149b7b6ce3401
 EBUILD vdr-osdteletext-2.1.1.ebuild 1234 BLAKE2B 65693a600e0378b9adccdde33aa8aa2dde04f8f7147af8d63189a9ef53f7356ef2d0270e0b33f112328fb9750e66fdedae4fe6b42ad993685a989434eb677b28 SHA512 cde3e9da20239555bce2bea3af95915e791e853afe94c367fad8b38abeae393eb56c943edaa170b0c549a08ec5b1b058ec58c0c03cccf23ec4a3a0057007e865
 MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-1.1.1.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-1.1.1.ebuild
index 58ca915916a6..ca437a9ac7bd 100644
--- a/media-plugins/vdr-osdteletext/vdr-osdteletext-1.1.1.ebuild
+++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v${PV}.t
 
 LICENSE="GPL-2+ public-domain" #teletext2.ttf, not copyrightable
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="media-video/vdr"
 RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-remote/Manifest b/media-plugins/vdr-remote/Manifest
index a90956945129..3dcbba15ebd5 100644
--- a/media-plugins/vdr-remote/Manifest
+++ b/media-plugins/vdr-remote/Manifest
@@ -1,6 +1,6 @@
 AUX confd 1103 BLAKE2B 0528d3246b087ce2ca3e59a9f8729882a5122c84829700a3a58c5ca99c12b821e9d3fcc262756c0d8b1f1a5086eaa2fb25c3fae8274e51f08c62310e1794e444 SHA512 f2f703a8f9e5ec1bfcf6ab2e8b36b5c08849f497a563316c4e98614c69d7c8bbd06e5e636815d93895ef78e85d19f48ee95622db74a1592e7a6a8053523d5bda
 AUX rc-addon.sh 2228 BLAKE2B 8fd508f06bd725f6f3d62e4a5aac5c9968653602525776be7dc76cd606757555532be4d4f2a2dd8eda0d82404a38e1766de8fb2824c5ccf666418f1f50bf6de4 SHA512 2d589137ec81934bd8e3e3e78679faa182c5e8b31528bf43dfbc19bd643fdf0ebde8517551af3ee071dddbbdf266b62d634ee40b1ca5131337fef4093e8bed82
 DIST vdr-remote-0.7.0.tgz 34267 BLAKE2B bd7c2b0ef794191eb9211bc9696a48d933af37fc1ec84eda137a50d0727388e9b4338f2d835211f75d1172fd4dca40a184729fbbef9722f49afd5b88490c0467 SHA512 18c758e9cd519ffc6ccd2a1b53109d7f1ac1c65a32ae43b9eae41ea64ff2ec9721c557ca75a03620b9fee1463608ab0a84d09fad31e233804695570eadec3728
-EBUILD vdr-remote-0.7.0-r1.ebuild 647 BLAKE2B 17bbef3d765e091a256eebf4a65233dfb050e812f7fb0bb362b78894707ca8da3a683c58c7ec1893f59a143bba160e2ff622551eabd77150dfcdad8a023ef357 SHA512 b82cfa7d43a35fd2d35fd75a297082c4b2b10cab28ad7acff0cdc63be80f8d3f97dcdfa6dc7d1850ca26d4406b0a82969c8ca7f48604f31814bd9443a83701b3
+EBUILD vdr-remote-0.7.0-r1.ebuild 645 BLAKE2B 679105d16181333a95fcda03db2750d859269c104e371ffce027d4ca51f7625e1259d6d3a6765498d7d15c26962f32421e3791bea209f85070c7ea16c505e458 SHA512 8b0ba89fe60145a030f1a75bbdf79bc6e02e208dd1ff05dbaa0682c268897f450c2bc6d684ec315468b4fc5cfa7ebe5836f78c8e36c7ba4def3d63ed220c0e01
 EBUILD vdr-remote-0.7.0.ebuild 681 BLAKE2B 4b09aeed8e879b822edcfd1b45c06013a34091c060305ed1e62491e3471d9a981c8c722bd2edc09542fb5052653ea149720f5aefb593390390f365ec3444a686 SHA512 fe9f06ca523e3b124b2cc671770693b4852ab685b0bdb624d592ac7e29b6de4a87557ddbe003655e4a0fd1417e03866f1b636b482cdc3b0df454170f2e5ed35c
 MISC metadata.xml 248 BLAKE2B 459a5e1d86106b2519d4d6ca805c6255c157566b9bcd4b1f4de804c771d0276dab1740940efc1d24c68beec0e2860c74d65a01b33ba2bb28d0735221dbc2bd64 SHA512 d2b0fcac72aa7f30ad4e0e6f5e60ef00c6bd80f54edec007af1c9b8677b3c5241b365c0602bf3d4b01d3bd6bfe27c6a7f7d97bf467d3ffb10254b54f63d3dd5e
diff --git a/media-plugins/vdr-remote/vdr-remote-0.7.0-r1.ebuild b/media-plugins/vdr-remote/vdr-remote-0.7.0-r1.ebuild
index b331f7f46439..8dab4f28306a 100644
--- a/media-plugins/vdr-remote/vdr-remote-0.7.0-r1.ebuild
+++ b/media-plugins/vdr-remote/vdr-remote-0.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.escape-edv.de/endriss/vdr/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="systemd"
 
 DEPEND=">=media-video/vdr-2.2.0"
diff --git a/media-plugins/vdr-remoteosd/Manifest b/media-plugins/vdr-remoteosd/Manifest
index 7f4ceba56b31..91772c60abcd 100644
--- a/media-plugins/vdr-remoteosd/Manifest
+++ b/media-plugins/vdr-remoteosd/Manifest
@@ -1,5 +1,5 @@
 AUX vdr-2.4_remoteosd-1.0.0.patch 1293 BLAKE2B 4728cd6d81600d22b00bda303fe6c9ebe08b17d29c7b3e3f8f26219463f681d6653c9f173c6b96f080dce63eccc9a6f5e4289f2eaec651c427571f0998ea4908 SHA512 33ba02f42d23880344414d19994bdcfcd2734aef8f81401d2ad9124e73e5ce6b538640c6da805a90b551058f7049a8cb1c1e7a7bd276a2202dd8aa4f30d43fbd
 DIST vdr-remoteosd-1.0.0.tgz 20154 BLAKE2B e507b2ecdf74b69f946df23cd312a1bbc9370809ce6dc38bc1ea1a84c0ec08c4d93d06f7f6e6e7be7a67058165991b706173011d6ceeac41d5a0527187f7af1b SHA512 c5af72ac82e41af7d753f20230cf511cb95abad07906be96b14f26aacce3c461ef3b552a1f28dceecfa5b50023268bbf9bf41b71e66326af610ba113295e9056
-EBUILD vdr-remoteosd-1.0.0-r1.ebuild 417 BLAKE2B 89f391a71ea574d9683435ca9e3bacc68e941ac25e058d4bb8f61ad9f8b591e3b38b253cdfeecb904c5c85b0bc86afacfda0700010d1cd2615f107067c29ce3e SHA512 843bdaaf68cbc97fc819d4895300749d759dc6d2e81c3df60c733c9b8db82d6e04b42eeaaa78b13c42fb238ab2dd0164ceb419b7c64ed18a14d525063d68b0e7
+EBUILD vdr-remoteosd-1.0.0-r1.ebuild 415 BLAKE2B c453f957247671c9689e8c11f7314ac755bfb7cc5b01a6d3203e36d2de7a034ad764a5e5fa070bd326482bfaab316b582f6617196a59162a62a549da0d9f982a SHA512 47c3e013cc4f7373abda060afe63fefc9c4dc3138f72c9eefc90e924e4e8e2d4f66d9c5538fe41aa995b3a81237cf254300234a9550e66403ff0f1b3e507fa84
 EBUILD vdr-remoteosd-1.0.0.ebuild 360 BLAKE2B c6834d53d8d4f1b6ab5c95f7bbb6dd8a7ac0e4d168e53fb904903b75d94a7428529bbbc982dbdb9fd91f05c5bb71a91f724063015781c962259703934c23bf24 SHA512 68ca8511edcfaf7354fe0ad2e1d71b1297120648ad0332928a61fddcc6d6b70ca609cf09f2d6dadcca21e5fb03570416d33cc9dc8b4b5c2394c8202b0a11f744
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-remoteosd/vdr-remoteosd-1.0.0-r1.ebuild b/media-plugins/vdr-remoteosd/vdr-remoteosd-1.0.0-r1.ebuild
index 01bd87ca4f14..29baec6a1391 100644
--- a/media-plugins/vdr-remoteosd/vdr-remoteosd-1.0.0-r1.ebuild
+++ b/media-plugins/vdr-remoteosd/vdr-remoteosd-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://vdr.schmirler.de/remoteosd/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND=">=media-video/vdr-2.4"
 
diff --git a/media-plugins/vdr-remotetimers/Manifest b/media-plugins/vdr-remotetimers/Manifest
index 26c7b9abcead..d9bebc1361f7 100644
--- a/media-plugins/vdr-remotetimers/Manifest
+++ b/media-plugins/vdr-remotetimers/Manifest
@@ -1,4 +1,4 @@
 DIST vdr-remotetimers-1.0.2.tgz 62750 BLAKE2B 9c741c45d78c195e112cc936fdee76a36be1443468d027b8672d6641bd3ab8e897864f169d9956373944f788388a22746b4597fbd567f03b0f911b4d4f029c2a SHA512 37a93600e11c21b0ab5d18b0e0631b527db96b4a19967b34fb7f912607f803ca8872efdbd642dfcde0953129b7a1a8fe971459deab6d8c78449f94505d8674de
-EBUILD vdr-remotetimers-1.0.2-r1.ebuild 374 BLAKE2B eecd665ac114f58c0a12401b087cf9efcb00f88ec1db2ff8a7bbc4d9f7dc4e4c26d4ce204d9381328f9310f9010413df10b1406ed5964d08a319ce6b4b475eef SHA512 924e4d4291611887f8142f011c038c4c840675ad85260630fed4591c36bb40e063f6a726d331e3bb352cc738b747a27e47504d9351b668cc8f69c47f94628291
+EBUILD vdr-remotetimers-1.0.2-r1.ebuild 372 BLAKE2B 90482502e3785b1cc7e68e416b44ae642c0bb95b07a28aee6563650a3c88e465ded9a7f7f0f3f561f50c6839000295308663eb83d99e4727db3decf78f8ad700 SHA512 c687a91034bfcb34be93463958f8a1df29bf0be24c5843706fe7639ae13ee78dc94b1c28f31de16955d0c98bb1b5c2a212a37c85cf1d1cff5cdb6c5003d90e5b
 EBUILD vdr-remotetimers-1.0.2.ebuild 401 BLAKE2B c2c395a2f54b23987748a15a2fe6e79241cc48e9dc080388933803a506f13e39586e6f7aa208c5648e28ae8cd972d52613e538739abee3de345d68a9f57d8856 SHA512 c981c9d683f0c5c66bcdc8c332911ff3a8c3f853e57e37edaca132459fdb8b0a32dec7ee656e6bf7eef86bb374fd9fee178be735452956380e4172f4da90d0cf
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2-r1.ebuild b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2-r1.ebuild
index da790dcac4cf..9d5f1d93cdba 100644
--- a/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2-r1.ebuild
+++ b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,6 +11,6 @@ SRC_URI="http://vdr.schmirler.de/${PN#vdr-}/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND="~media-video/vdr-2.2.0"
diff --git a/media-plugins/vdr-rssreader/Manifest b/media-plugins/vdr-rssreader/Manifest
index 58fa7158d7bf..f6fef9b82e53 100644
--- a/media-plugins/vdr-rssreader/Manifest
+++ b/media-plugins/vdr-rssreader/Manifest
@@ -5,5 +5,5 @@ DIST vdr-rssreader-2.4.0.tar.gz 27355 BLAKE2B 484e827c86f06179ff24a67116934c4b81
 EBUILD vdr-rssreader-2.2.1-r1.ebuild 678 BLAKE2B 329d02253a9853a7f96d9b42dd1d00a59e3e2df8c4b5f85dc64b7c2da0ea5683779c3023abada7215454fbbf01557f7a5827d7a5373c0a289357689d4d98a73c SHA512 fd6ce0575bc276bc05e30af0adce40807ed21e86b55006fc7a9bd3133ee75d3e217ee2c08c4e4847dbc1406237da9cf8c04a0e8291d9d2110b54426503505fe9
 EBUILD vdr-rssreader-2.2.1-r2.ebuild 782 BLAKE2B 1e0c2f960281d050eb83902d4435f5e5ae6e8ec05a0ed732d607f124045f710e2197337ddf36e92c0998cf51ba1399d65d70c17485f94b02fbd7f411a324cbaf SHA512 b64fbdb36d4b8096fd6160ace065dc517e39b72f26456b9bb32c03397ba8d63654a357360973df26356372aaaef7004170bee92789ea17ad3b56cb8ce465302f
 EBUILD vdr-rssreader-2.4.0-r1.ebuild 811 BLAKE2B 03b95b283bd06abc8875e60147b11b9a56bd99460bc75e772b623750345fcd9232b9bdc74daf7fe2bc33bbc1cb826163e56de9e3d53e294b22e776e16cd24580 SHA512 b6b411166a24c2181a29669050ebc5b9459ecbe36fcea8c38b1de01f83a03d3f6dca11ccc9fc96f91893d733123ddbeac4ea8f26ba517defd5f3ea9b91948742
-EBUILD vdr-rssreader-2.4.0.ebuild 677 BLAKE2B a104d8cd6e5ac3fbaa264386db4d701fc4c8c33faa5af331b663555d108f7d2d5dbfe4aa2528941dec5557b68cf4efa4f99c91cf1ba0e7491cd9389d910bbd5b SHA512 a6ca438e983fe2ebda3cbeb1b9ae1ef88c779617d0d41ba1b322ab3eb0f555c5101362cb6f49829e7f683291adb66bef814c6fe0c2967f7d3557bdc0e557556b
+EBUILD vdr-rssreader-2.4.0.ebuild 675 BLAKE2B 2d43488400d9cc114aabed52975701229f3afda7e58c1150b34c471d45b3d6100058d0e1fe0cc54b8161b50f8e038d914a697b39dafd1eda9d923d957923c1e9 SHA512 42e8e7eb75feec07ed95068cd19fdff715f283b8d93cae88672ac1f2af60c500acf754b04875f13d6d15eb36e2f3caf0a82616af4f13f0e9ea0de96f6e4c24d0
 MISC metadata.xml 601 BLAKE2B a1a14b9b9b1ac64e4d74b5621f1087cf7f4d2435a9191fc938a0a1295a47641e2a302cf5de10dc055b9755bb3aeb9b188d246bb6a8762c685e25eca9d782e872 SHA512 ddd4c46de386042ec45978a42703666c10e57fdb1e3f91b6b88753bab62461e95e72265b82e1778e6640ee49d90528d3b70dfb012160dacbe61a223745f2dd09
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-2.4.0.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-2.4.0.ebuild
index 56cbe83b6909..8af2d8a20fa3 100644
--- a/media-plugins/vdr-rssreader/vdr-rssreader-2.4.0.ebuild
+++ b/media-plugins/vdr-rssreader/vdr-rssreader-2.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rofafor/vdr-plugin-rssreader/archive/refs/tags/${MY_
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-2.4.0
diff --git a/media-plugins/vdr-satip/Manifest b/media-plugins/vdr-satip/Manifest
index c7502b1a528f..b1c636f17475 100644
--- a/media-plugins/vdr-satip/Manifest
+++ b/media-plugins/vdr-satip/Manifest
@@ -1,6 +1,6 @@
 AUX confd 2025 BLAKE2B 56f5d7cd65289204c5ca05e9f885110064cef68283dda7619c7efa6e0653db00d82af627c2523d1b732cdf32ab7f3a7202938c59970ec1e8275c5007d83b4020 SHA512 514a4b6a6b920410a83220b8345d8b918f922b096b356d690d771947cfaf8705797fd15498c21c44201a2ecda8cd1aff7deedde4489d24497c7dc3206354b16c
-DIST vdr-plugin-satip-43b60b1566878104240cbae5b1e322bbacd380e1.tar.gz 74697 BLAKE2B a1e763e1837cf00718469333304a858cec9802bc65ca0e607664ce0bc0594d038586b10fdbe822cb62e8d9d68441bc39b9c4356ce88e328cc08e41a3e7e2c213 SHA512 6447d424d119e738b3dc747b9ec27c24ed15143bee176cca4cbd09d43a9c5cfd03bb1d39fa2c3b4409af583e25489872d5350d32570d0790e2327759a6181b2e
 DIST vdr-satip-2.2.5.tgz 74669 BLAKE2B e586297f0f0c1ca776d4c9f83b46da7f7afe82b80ac7e79ec2da7107c793f5c8a5092590ad23030a435e2d034b084373b9b069bac6ef81822723d33ff6c7fab2 SHA512 3f8ab1d9e84843e71bc6fc8f712d178fa3d304d0959ec977de1b11829e27b575feb78735c6770b15d4dfb8f4fce933aed7df07a6d9ba0b20e937aacd3c643a21
+DIST vdr-satip-2.4.1.tar.gz 75880 BLAKE2B 4c935922921856a56eacdfa9afd0ccd2f3957c3221ef527948e90fc3f45c0deaa34bbd7a4b5aad9bfba6d4e34c93f7d23225bc24c2525929571256de06c7f811 SHA512 0c6eb3fcb274e34395d8483e7382a655019683fe0cb1c677f120bce85c2bd181517d38f5325003ed6326e8fb0badeef937397d596723b8403ee865fa5e521ead
 EBUILD vdr-satip-2.2.5.ebuild 797 BLAKE2B 38e3e9ba257e3e7237c6918bf4935d6f50796edad3d04265c4fb0f36f9477e1558093f08deb518c3fde8377ca396a4c24e90ec1fda46a4f19d4d7df2bf7284b8 SHA512 3ced04c065278d0d593a11ee9c2fcbbaeaedaa6fd0586ff5a0ae935c050afdfece801d28dbc73109a0b8592c10b690bb574134763b62ad88ae6350b0134ef64d
-EBUILD vdr-satip-2.4.0_p20210131.ebuild 1067 BLAKE2B 0b2cc81f1718c98a5559310098bf47a9f7028cae7c22e0d7ec13f1fcd067135dca0e1d9225cfe811fb0efec9215a8c84bcc0d8ba621d9b9edd29037df9c247fb SHA512 38e0f6cb84aece67a69e466d8dcab7333a78da01840a59c38ebd0504d0f43a7a23c89e61328efaa6daf5ac42d2be5acc02c04e9615a7430192e59cbc17f87643
+EBUILD vdr-satip-2.4.1.ebuild 838 BLAKE2B c8ba50297d64fd66f7d55a19beea789bdfabb55135731ab5c8bd1dc0de172a9dc84d3f46ed09e0f0cb82a71385914f0f888b917398653fe3087024b6d8a284c1 SHA512 778115b2ddea549010e340011449fd05f9fa1db6c8833bad74f3aff46f0f64a125cdb48cb7d802070d86d5a587035fac8142f564d7eab6b80b99c123d3163840
 MISC metadata.xml 597 BLAKE2B 3769259fb6cf0f798c25656fb99dad805d291338542bcca76dac37b426a3ef8b9720358adb35f4e151bf2744071768a487a34bd37997111ef54c68e46a8c34b2 SHA512 ffb5c4cb39c4e3b2a84279e157d7fbc85262590a023bae89b7af7b249af19dd27cb683a6ab5872c442354213d133f191debbb9b58d98613f26fb6e426a231aad
diff --git a/media-plugins/vdr-satip/vdr-satip-2.4.0_p20210131.ebuild b/media-plugins/vdr-satip/vdr-satip-2.4.0_p20210131.ebuild
deleted file mode 100644
index eb01453dfd26..000000000000
--- a/media-plugins/vdr-satip/vdr-satip-2.4.0_p20210131.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-GIT_COMMIT="43b60b1566878104240cbae5b1e322bbacd380e1"
-MY_P="vdr-plugin-satip-${GIT_COMMIT}"
-
-DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR"
-HOMEPAGE="https://github.com/rofafor/vdr-plugin-satip"
-SRC_URI="https://github.com/rofafor/vdr-plugin-satip/archive/${GIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND="
-	>=media-video/vdr-2.4.0
-	>=net-misc/curl-7.36
-	|| ( dev-libs/tinyxml dev-libs/pugixml )"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="
-	usr/lib/vdr/plugins/libvdr-satip.*
-	usr/lib64/vdr/plugins/libvdr-satip.*"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	if has_version "dev-libs/tinyxml"; then
-		sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile || die "sed failed"
-	fi
-
-	local GIT_COMMIT_SHORT=${GIT_COMMIT:0:7}
-	sed -i -e "s:GITTAG  =.*:GITTAG=${GIT_COMMIT_SHORT}:" Makefile || die "Failed to modify Makefile"
-}
diff --git a/media-plugins/vdr-satip/vdr-satip-2.4.1.ebuild b/media-plugins/vdr-satip/vdr-satip-2.4.1.ebuild
new file mode 100644
index 000000000000..f8991ebbdcd3
--- /dev/null
+++ b/media-plugins/vdr-satip/vdr-satip-2.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR"
+HOMEPAGE="https://github.com/rofafor/vdr-plugin-satip"
+SRC_URI="https://github.com/rofafor/vdr-plugin-satip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vdr-plugin-satip-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	>=media-video/vdr-2.4.0
+	>=net-misc/curl-7.36
+	|| ( dev-libs/tinyxml dev-libs/pugixml )"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-satip.*
+	usr/lib64/vdr/plugins/libvdr-satip.*"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	if has_version "dev-libs/tinyxml"; then
+		sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile || die "sed failed"
+	fi
+}
diff --git a/media-plugins/vdr-streamdev/Manifest b/media-plugins/vdr-streamdev/Manifest
index f8398d3c16a0..1fb6ddb48f36 100644
--- a/media-plugins/vdr-streamdev/Manifest
+++ b/media-plugins/vdr-streamdev/Manifest
@@ -5,5 +5,5 @@ DIST vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.bz2 16340
 DIST vdr-streamdev-0.6.1.tgz 186546 BLAKE2B 7d5d92c8ec92e7a57e8e335bdbdf5c91bcbfcdc3ea96fe8154af7015f33d6f2822cf35681a8018cad5b19776199d90870b747bc0a551f42a7b0eedc94f040188 SHA512 bbe6231bd8e69e299c8d94173e7ed4b1f49e5b17b7bcadf2d1e827b5e8dd57c6b975c8c409fd44f252110099b3565a7d4d8c2f7d03636fc2d2e3580d0050d971
 EBUILD vdr-streamdev-0.6.1.ebuild 2956 BLAKE2B db86b5f2947a2d2a38263a031cf2f51a8275ced65314c645a762c64dce6b860a0620fb585d78dcce0e3c6bb6f7c226d570415d49e228022f7e18791d1edf220c SHA512 59a204d12eee43f9a9bbcd993394e29a4618d13ee9fc6acb129bfcab5f24edadade6049032693edb7f7930382a2c5dfefd08d79fc6ec3cb4a671665446e0a41e
 EBUILD vdr-streamdev-0.6.1_p20160320.ebuild 3098 BLAKE2B c7b3d6db489f772f073077f5a6e25a3cba8f093ec8316e2108e3d1858ad57083d27810cf47c37107f46570c18a55730e22bf886080074855119978efc934c3bc SHA512 37f87dc10bc94c5bd37389292a2617c95879a0f5cea6144db80998bce7ad943c94ca9279e6221200ad006c686adf22472b00d058cfd84ce1877c5055094d7157
-EBUILD vdr-streamdev-0.6.1_p20170930.ebuild 2215 BLAKE2B f960f552495d0bd70e2feffaaea4fa213961921ddbb656acff73de57be61d4f2647ab24cebfbf6e7d5dd57bba3fbf62be0bf97a2c7be9e0361591135dab89743 SHA512 3c605948dcef8ec3d0bc5ac277107f571ec8a13f5b7c70e16b27b5992102e8f7f7c8a3547488ed4adb359ce3609636521f156f4211ab9dbc9d8c92ff2ff4e3ab
+EBUILD vdr-streamdev-0.6.1_p20170930.ebuild 2218 BLAKE2B 32074008f255993549ba8d5096280dfdbcc62b8a9c9f6ec288f1e687ac3d54375751dc26eaae07f5a123a4aec5ace97e8db2075b4694b864caab4969e1c9afb0 SHA512 f1e8c981d96222aa0ef8462671038f0b25c5a6808e683edf34d0f70cbac3457d9fe2163c99e0b6c4ee2cf58113dbd738b7c1063a06db5678c16409a8700a027f
 MISC metadata.xml 540 BLAKE2B 3c69478def52669a549baee4a05af5a1b169bd8fb32ff774c465739f73a5b42bd92d7e294e1937c8d23daf7820055175ebe601ddc91b276533381812b5213d25 SHA512 7d8ee3fa799171758e6a5a174da5ad25b1d15b3099e9891f285cbffa163ced341347a550af2aa3a9e33612b1eac571feabf538bf0cccb9bd953568acaebd308b
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild
index b5c3b4f0a9cc..3be806ff9c96 100644
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapsho
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="client server"
 REQUIRED_USE="|| ( client server )"
 
diff --git a/media-plugins/vdr-svdrpservice/Manifest b/media-plugins/vdr-svdrpservice/Manifest
index 21e2f322f510..4e0f48d1aba8 100644
--- a/media-plugins/vdr-svdrpservice/Manifest
+++ b/media-plugins/vdr-svdrpservice/Manifest
@@ -1,4 +1,4 @@
 DIST vdr-svdrpservice-1.0.0.tgz 16979 BLAKE2B dfa3cbbd25df28e2480fd69dae649ab687b8c63da291356dcab14134753ed00a225b71762c665e8cf96b338586a3b2829cfa96f4318cb1bccf7cf0f4dd9b896b SHA512 2395aed428a072b568ed790e0ee8b3e1d17be62fb28a21bc030c021cef778ba00d7e17451eccf26f09da63c8d5b7786fd12e377d904b23ca1b24c040dc5ce429
-EBUILD vdr-svdrpservice-1.0.0-r1.ebuild 419 BLAKE2B a9953c1b6153f0d73103263ca9edbe0fb907937a85537685ac2d505f65faccdbb1389c211e14dfab4b6e9fcd8702fc2ad5a65d542978ce58fdf52645254e2e7a SHA512 8d4157f6bacfe00bd9da796c540425549f625a8c338741f7e2eea773aa6a4c2c3dd2b1658a4a2e64976651e9a43b800376e7d163cc1ef962a7d6947bb8dc07b4
+EBUILD vdr-svdrpservice-1.0.0-r1.ebuild 417 BLAKE2B 1de7ad509439c7d12e1a0015c7d5bb14e5925eb62253a38b7f88e2b857e14eb8c8e01020e1c0fd17fc91edd2d37fd5afcbf3a694b9a65651192945ec42ed4ec8 SHA512 96b742c67bf2a34a676ea90994cd1d4321b8a6ad482e0264bde00ffcaef8a66bc60522c0a6623784826f9acfe63c809727f194b0b702817a0e848c7ff1d88752
 EBUILD vdr-svdrpservice-1.0.0.ebuild 425 BLAKE2B d2d64c79498177d1a6ec782711ea6cfa9fffea0f79feb9f8439dad74f4b12daea763bf8270f34687d7995e76aed823fc412cf2390bdfcf0e1f804b66285c9fe5 SHA512 2ef7b6957d6b9ad33f747389af1aba6bc887ee75814545c73b9944b9276a84c000c28c32e84a2ff238083a5ceea4577cd9fe05fb247f34d50e7fa91d9e63e7be
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-svdrpservice/vdr-svdrpservice-1.0.0-r1.ebuild b/media-plugins/vdr-svdrpservice/vdr-svdrpservice-1.0.0-r1.ebuild
index 809007eb49ed..2abacced8889 100644
--- a/media-plugins/vdr-svdrpservice/vdr-svdrpservice-1.0.0-r1.ebuild
+++ b/media-plugins/vdr-svdrpservice/vdr-svdrpservice-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://vdr.schmirler.de/svdrpservice/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-2.0.0"
diff --git a/media-plugins/vdr-ttxtsubs/Manifest b/media-plugins/vdr-ttxtsubs/Manifest
index 344cd7bce3c8..e37bdae6839d 100644
--- a/media-plugins/vdr-ttxtsubs/Manifest
+++ b/media-plugins/vdr-ttxtsubs/Manifest
@@ -1,6 +1,6 @@
 AUX vdr-ttxtsubs-0.3.0_teletext-chars.patch 2983 BLAKE2B b18aa4f8a00ef102345531ba3fa02d2dc44ef1a5f38d93f74ba307b56828bc9861283fd8aa70777dc14c3bfb37688bfccee9ee4cc4259b2e2b7c45d21394ed7f SHA512 120ee81b47323792c94868a0e4b2bc3af26af9280854bc54a643777181ba6653920e6edb89558ee21eb94ee9983dbc929bd9a4d23ab8d5d7da0d1d644ca62408
 AUX vdr-ttxtsubs-0.3.0_vdr-2.4.0.patch 4085 BLAKE2B 7bb61a31b1b906728f24f2107bc65975a599f9b3738a829957a8aec5b5a31db0226210f2e509fb37973ab1ea911da14ced2f543820943a24d0a6e86428be9f93 SHA512 e97d49697a185ebe43e96c0908e364007b8d5681f2a8448a6a810429d10a384669e82037ab136d64f32ab15bcd57ff6773baff6e417e21e1222388e074fe4194
 DIST vdr-ttxtsubs-0.3.0.tar.gz 58956 BLAKE2B 681b517c25793bc5a7cc9bde4efdfc5d61cb69ba9524348eaf1c9df1b896650634b489be4a2705d040b7cbdff7648f270d74b63493739544040ebc2051cadb7b SHA512 60edbbc152e4c168dbc91f67f2105f9e9536f108ba0210a8834d950659a0923bc7bc23f44dcfa484135d5d9a6f89abb4e90f0ad39db826ad41c8f1192446bc56
-EBUILD vdr-ttxtsubs-0.3.0-r2.ebuild 700 BLAKE2B d4cc799a027bd6c56ab853662c90a0a6a1e5ff56c35d80b6feb0e89f2444d76fa56b1c7bca210051dd65860ce15031ec19c954258c9af76e1b66d4bf4b0dbbe1 SHA512 d6ea201d21c2894c2fae7ab5a7d13f09c43122a3914fa78d51eab1c2614b1a14bf0d1e0076725be06261c252bffe64a1920128f4f36e66716225e9267af7063e
+EBUILD vdr-ttxtsubs-0.3.0-r2.ebuild 698 BLAKE2B 8f90ebeceed012811d9b72d6ffee51e0211f063176d63f747090238ac292650d9dc758d50bae229bcf9a59fbec7e3cb460e761ed32dae7b82f8829a5705fff98 SHA512 4ff458230561b44bf48f9538c60293da75eadd9734c9d26eaee74d22d85e7f61a52a2a5b96d5f07de490c8cf1e13280670bac4e44c216b7f757da51384a116bb
 EBUILD vdr-ttxtsubs-0.3.0.ebuild 513 BLAKE2B cff7fbf91a6b9592c532dc81e92c3724a9dea10f6784e2a8eb380db75beeb220c1f1c5ba0e26b09ac8e62dcc8993401d9e4a69f1f720d5473b543e0aafb18028 SHA512 a187f1b95b6f7eb349233c8a604069528dd7acf9c764b95050e7689ea063bbce2fe740f33262c5af8f4db85a7627cf1211a4f7f6a6468cf84d294f450e42ee15
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r2.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r2.ebuild
index a240d7a019a2..c5cc387ba0bb 100644
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r2.ebuild
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="VDR Plugin: displaying, recording and replaying teletext based subt
 HOMEPAGE="https://projects.vdr-developer.org/projects/plg-ttxtsubs"
 SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 SLOT="0"
 LICENSE="GPL-2+"
 IUSE=""
diff --git a/media-plugins/vdr-undelete/Manifest b/media-plugins/vdr-undelete/Manifest
index a05fec64de39..0af378596caf 100644
--- a/media-plugins/vdr-undelete/Manifest
+++ b/media-plugins/vdr-undelete/Manifest
@@ -2,5 +2,5 @@ DIST vdr-undelete-0.0.7.tgz 34655 BLAKE2B 81f40ad993d06386112ef46c3ba1c1402211c2
 DIST vdr-undelete-2.3.0_pre1.tgz 13865 BLAKE2B 065550c0c6aa150677550450f458db496ac55e6ad1b8024de22abca37093259adfdd6ffc7b9c07a66e76df573c3c1d4d69920bcf56872406234a4898f99021d2 SHA512 3200efcbd2eec5ef04d66fcf9dbbd1973ef7488a332618a6d2f5dc4bc20323e2b88746f02883e9488436b32f21aea2fb60e7e675e247af392ee121423af4b878
 EBUILD vdr-undelete-0.0.7-r1.ebuild 958 BLAKE2B 8a8c55b0ea229acc87ec2acb11acff603c02aee76a7849e8ddb3af020fd48b6daad36bfa48b9d34e0c5045c758ce79ab358812e97b64c29f343a69838041b711 SHA512 7df43a6cd5127736f33b9969f7f448c31262fee741b3a010f481e140c94341f7631257b343b46a9293a1bbbe2f0888dbb6531dec7aa6e337a3660c05054be807
 EBUILD vdr-undelete-0.0.7.ebuild 475 BLAKE2B 7188f8fa2b3ae7ed65f954648d9557af9aa25a8687b4ef203425ee72c2d17171d80b193f20e910d17807a95d654f76ddf20768b854c7f287d27bee8b9b5a26d6 SHA512 abf36f156e2356b43e0b90343b620e6b7893baa9a9e5ba21a69c0f67145ac4ecda41bb1e59221ff9892472c369e0feee2e4ac078925f06cb86477668cbc085ae
-EBUILD vdr-undelete-2.3.0_pre1.ebuild 444 BLAKE2B ba1c505e93762092179c7621392a94579dc3cc0fe1bc61bb583db8cc9abf430c228ff7daa763ff61b70cfd479303fde82c90bce589872b29013acfe709ecb91e SHA512 a6584257efb2baed7b6ae12b2dcd1ecfcf4a3f07ce4aa031a390691b6d68da02b8b01a8d96e0bddcd4ee57e3da3dec74eb126bce0b45464ee30a861e8abe7fdb
+EBUILD vdr-undelete-2.3.0_pre1.ebuild 442 BLAKE2B 5865ad7f961a5be47b6981a6de89db5a04e1f1bfed24b6e523f8207d5afb648b4fd7c43db5cf5b6ec24b3c8245ff1a01a9bfdbe91445322446b64a1b61e380e2 SHA512 db267b6a36a9a00699eb259f34ea26bfdf497f9093dd039160ccffd62a334c4d354261d89282030b9aa01df9da7d9e7d8d58c98c5d2114934c94858a736bf535
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild b/media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild
index 0bd32ff45520..7ea4ea0b4a86 100644
--- a/media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild
+++ b/media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz -
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND="media-video/vdr"
 
diff --git a/media-plugins/vdr-vcd/Manifest b/media-plugins/vdr-vcd/Manifest
index 798c8559cf5a..82e74383b3a9 100644
--- a/media-plugins/vdr-vcd/Manifest
+++ b/media-plugins/vdr-vcd/Manifest
@@ -6,5 +6,5 @@ AUX vdr-vcd-0.9_vdr-1.7.2.diff 504 BLAKE2B 0a64d3ad808bbfbd643c55204fafff9a96504
 AUX vdr-vcd-0.9_xgettext.diff 7167 BLAKE2B b861b3cdd4f87dc27b7f9dcb155714752b3990ee2c2deb5dacc85566dbf950dd60981988326dff962eb453d6c172316ccf0930a2f6d22831134c3416c843729f SHA512 7e54813e5a685cd95bb9f274946e155f00dc5e9f1b1c6c317d10a3ab796bca1a505cd67eedbbf635477b83ba7066c980be66e2e8cb10e49a5fd802e7fd82b548
 DIST vdr-vcd-0.9.tgz 33687 BLAKE2B e3631e9556fa16351fe336fc71da0b7ed385b39ecef722a92a98648ffd8a0f0767531b92af8888ef408dc1d56860d17860fa24c7c18cfc62b91cb2de60977a01 SHA512 d1d58a5395877da38ee16f6b338e957781a4369497b9a3f92b80ce8b3577eb4a2387108d1da8889c3195b49c3b0f0e6baebc9c1868a35d7727de0c2b6e81469b
 EBUILD vdr-vcd-0.9-r3.ebuild 751 BLAKE2B 5a4563d855bfe1e1b3ab8d45cde76b662c834707599f86c3380d51e1c5d6eebaf0da5499becf5961e2a70f7f1baa9d77dad339af611a8e175a685ee70848a54c SHA512 c9cd1679a8338f909e3fc44597e3626a498e8597c198812f38842f29884f58360cb309b6072b0b08610a2d7120e3e8a057f3f9a457a9a413988a1e2f7b907f32
-EBUILD vdr-vcd-0.9-r4.ebuild 759 BLAKE2B 5bfd168266acd8816c3fc730c02a439bb9efdd24a80d541882d598a929b6dd14f9cb10324bdbaadb448e079776b24ea8a901fb15f8b6dee3ddd87bc3016083b9 SHA512 485f8405aa5875670960a3279895abb035acc22eb6713d2c7f12bd895458c713dda84480bb8136784f9602171731ffec8c67cd8786f6e28353ca3151057309cb
+EBUILD vdr-vcd-0.9-r4.ebuild 758 BLAKE2B 9b516bc417c3d7505f11ee703e7621a14dd63d16602e6bac39099442e8952f51d9f985d263674a375a487232b5aea15029387869e4bb9edfc101d8495e15d66e SHA512 7f3430afc7cb9fe6ceab5a5bd9eeb7597451e228116ccda5d85a5cc707893ac7766f3408cecd8b680cc758784195b90852363acc0ecf2100f567161a5c9ce349
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9-r4.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9-r4.ebuild
index 01d773f2b6a2..4fe81467974b 100644
--- a/media-plugins/vdr-vcd/vdr-vcd-0.9-r4.ebuild
+++ b/media-plugins/vdr-vcd/vdr-vcd-0.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://vdr.websitec.de/download/vdr-vcd/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.5.9"
diff --git a/media-plugins/vdr-vompserver/Manifest b/media-plugins/vdr-vompserver/Manifest
index fc56ea80167e..2433c297c9fc 100644
--- a/media-plugins/vdr-vompserver/Manifest
+++ b/media-plugins/vdr-vompserver/Manifest
@@ -3,5 +3,5 @@ DIST vdr-vompserver-0.4.1.tgz 87056 BLAKE2B a2106bc88407a198a218a003bb7973af8e96
 DIST vdr-vompserver-0.5.1.tgz 97156 BLAKE2B a4c122cd83eb9f228ec2acb53b3e4ca0774effdda85516d8af131d9d93b791d92e78373fc79c9260d6dc7961039acc452789b37e8a5f873bfb8293dc1123e40e SHA512 24c5c67c25889a62735ad473143246a99df72cc972ffa68989821214765cc16eb49e4057fd7e1987e7602afe631f07c6e3554499c768cfc45e3a030db105ce45
 EBUILD vdr-vompserver-0.4.1-r1.ebuild 903 BLAKE2B f0d93998228dc226f755ade90cbbc4eca2e8649ba535bb54fe487c35aa13dc1a991ee220c497cdabe0d962a4794eaa91b06bf9a091f63bbafa26edd9d392e179 SHA512 e6e847029ccdc5761d23368bc55448182442ec5c34a29ae8e541ad5c4392f5138de7f6b465c7a8a7de9c545eef085a9d4d8e1b19861d1bdd8c272b595cef1f6f
 EBUILD vdr-vompserver-0.4.1.ebuild 854 BLAKE2B 020a908ca53219ce24969cff4bbb0540c879bbf101631f1659e110846e5c3c2c7806f71146c536c126ec34bff564cf10918a3240154f2fe5a3331b1f17e9e1fb SHA512 bf552e032180bd3e5deae1bdbe7c6f22a9f599444e2cb59e04afd39f5705e3c44f81346fdf81b2d7adc1b25df852d85627d824d41f538fb6a7b8aabf4a33e48c
-EBUILD vdr-vompserver-0.5.1.ebuild 707 BLAKE2B 77d7b39df7cd54e8ece1ae976e7551e880f41d09fd828569e149c2a0bc7fcc0aac3f30f8c0e7336d1e3476cdc1d5cb5d424754f383ac6c5fb4337e25b1d37303 SHA512 df50d730f2360c87da3c0c8e211de96ceb54f58c7aa2d53772a2b820941555e263f49c4fe70851e6cdd9b15031435b73acf1b075c894c8e1edf36cfbb21ec48d
+EBUILD vdr-vompserver-0.5.1.ebuild 705 BLAKE2B 280977b3ba73ad5acfe2eff60c088dea3b4d4d8b07618d12a5a3249fa75163ebfc12a24365c4fef9e1f521b5a38910abfbbf17d4b10eb603ecaea62ec4a79309 SHA512 76229cda4abecfb6a60bf1cd7200e026b9957bacca3ddc910fe8dd4253e0aa32c0a80658066a938d8c809e10c4b9b21babc2ec79a1be613e28ca968cd50007c5
 MISC metadata.xml 493 BLAKE2B e6f11b4dfeeb1ee7c402a0fffa80a34f852ad6222a65dedd447ec9a246e3267720663b6fceaf8fe9c3c8b68850d80072d26053b0f259e0942c8727386f6128be SHA512 74031e7d0a17edb6e2c83690f8bb82a559f94699785cafb74b4e2f46751e16019bc53fb433f3137ff4c51cbc0c82dd015b0342b724b18a08c55b528b3fbea272
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.5.1.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.5.1.ebuild
index c42150ece85b..1831959e75ff 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.5.1.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.loggytronic.com/dl/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND=">=media-video/vdr-2.4.1"
 
diff --git a/media-plugins/vdr-zappilot/Manifest b/media-plugins/vdr-zappilot/Manifest
index 85427ea07cc4..0f64e6bd2782 100644
--- a/media-plugins/vdr-zappilot/Manifest
+++ b/media-plugins/vdr-zappilot/Manifest
@@ -1,5 +1,5 @@
 AUX vdr-zappilot-0.0.5_vdr-2.3.1.patch 10468 BLAKE2B 46cc16c6ad139f3e5e723b7828abf3d92968e4fd97d19b99e31ad0174a792b6cad89cda352a5243b62e3cf0cd6410fa8dd31bf4f37013eb410463e82162c2ef6 SHA512 568f77a33134667a013a7c9983a9887eb29d083b533cf226e94e95240d1b89f12c969f7257ff8d718e1c94fcbaa266b836bcf360d62cbff8bc28d3ce3468dcfc
 DIST vdr-zappilot-0.0.5.tgz 17061 BLAKE2B 334c1a27cb24792b4cf1d8ab29672d141b0a996097b230208e2c9a78317693d1a46b9949ef610d506255bc441c9ce35760bc322843ce78f4658f4a32aef0808e SHA512 9f1dfd3ecb38c5a4afdcad963f2680fe3c5e8dbe4610de0ccc8967811e51ca5e4ad268b9d01a5e4dd392ffa275bf896dd03225bc6568a72d92063a1dfa576222
-EBUILD vdr-zappilot-0.0.5-r2.ebuild 644 BLAKE2B 672ae73ef9df4c74e93533e7d3921b5f2b3fbfd2f759c423f65562b08c3495be157bd4e94d678ec4f126d19d0b3a939e2c97eb2c74c171d17f073c763c991664 SHA512 65e5b5442f8fe03e9f782b871a3e05c3fed126de7beb64c527e17d86a7be64a443e2f25045d70d1a831fd16b53ddb6f20c8e591647d2d0f45702a4d2a10d181b
+EBUILD vdr-zappilot-0.0.5-r2.ebuild 642 BLAKE2B e98ff35bfb23b572c9dc52e805819ec18984b755d86f26ea36fec1234baa920ea2ba79443aa6497a164c5ef5a3618b531f9e8acd2ffd88f2ad7ae9d5b8ec9637 SHA512 26e8a81628bd126f81efd84883301225a908a9470a0642bbfbca1a9c482982cce2352e12f83b87c6e20784683e03662c0c101b4a49ad090dc575e0a58b8b52af
 EBUILD vdr-zappilot-0.0.5.ebuild 500 BLAKE2B dd45d2cfdea1eb5fea5763ca7b63abe0661de9c29e58db94fff3af55f4a4e5be3d044733941873151a646426744399cbc5e26d1c666451d8c919951930440799 SHA512 7fe71f9e376582167fad649c49a0378b8bef853a4e0a3e0570898b57b0cebecc966cdd6ec5fcbfa81c1cbe151b8cda74219fdea06665dad88502cd9cb7093d3d
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r2.ebuild b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r2.ebuild
index b22b4f45d872..92cb1749d488 100644
--- a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r2.ebuild
+++ b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="VDR Plugin: browse fast the EPG information without being to switch
 HOMEPAGE="https://projects.vdr-developer.org/projects/plg-zappilot"
 SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/media-plugins/x42-plugins/Manifest b/media-plugins/x42-plugins/Manifest
index 8744ebb22a0c..91ec136d14f5 100644
--- a/media-plugins/x42-plugins/Manifest
+++ b/media-plugins/x42-plugins/Manifest
@@ -1,4 +1,6 @@
 DIST x42-plugins-20210409.tar.xz 3442288 BLAKE2B d6d4e6e20935b400b96a944b9e8aea7797129f09be79313092760a32b69913c94a7b3ea0b434e35052adc9b348a03788e73bd22556941315f39c15c7d66c0dd4 SHA512 4f551af86904368b2cf13367bb0ea47055c1bff43f32d4e846a1758dc014bb83b69a6612cae30357a734195bbb3802b943d3c64f6f5a264403c4dbcb14b467a6
+DIST x42-plugins-20210714.tar.xz 3443752 BLAKE2B 8e871ba52a83139ace41ae68c09a99bcfc4402c76614f8b9afbd47177e9bb8f0f146e21edb00efaf8648dc4105ac9c5acb1336f7e64764424b162b8f48af11a8 SHA512 9ee50cd389b573044e36d903c6468dc3470ca2d6a0aeee9cc9c52c6caeb3f7a4e7855d5e7defcfb6908111a31bb91ed1f4fc90270b09aefa158c864d8e23f2ea
 EBUILD x42-plugins-20210409.ebuild 947 BLAKE2B 5ad534fa0954e9bbe4dcf494c9b75e73b769c1b89d67a74089ca9074fdcfc5533310fda5ed6c8a3d74dfbc6fbf4c97b18d0bbe7ba86bedd720e02147bfdba9ee SHA512 66b5f2a43c3de5105eaa42c6f54295950ddd99c0f811d1c9d50d9931fbad8d34e8fbf42238348a6a7ba858b507ae58d7bc3ed79d0256c38c76c1a967ff179415
+EBUILD x42-plugins-20210714.ebuild 948 BLAKE2B 7424af2904f562a89b95424c5a4e7f3b33fee9e446ca06f0f8adc7a41e67827d16f95ef351f4a89cae672937e6e40db63ffc3b88c5020b75e322fb9a6904d227 SHA512 fb140d12cd2485546360ece3d2002fc97c3aa640edfaf500ecf57dd2be8b2110b1ea7149d2e3f0a576d47fdebad25a3bbe7f9c1abf6eef853b47fd15218fa0a4
 EBUILD x42-plugins-9999.ebuild 948 BLAKE2B 7424af2904f562a89b95424c5a4e7f3b33fee9e446ca06f0f8adc7a41e67827d16f95ef351f4a89cae672937e6e40db63ffc3b88c5020b75e322fb9a6904d227 SHA512 fb140d12cd2485546360ece3d2002fc97c3aa640edfaf500ecf57dd2be8b2110b1ea7149d2e3f0a576d47fdebad25a3bbe7f9c1abf6eef853b47fd15218fa0a4
 MISC metadata.xml 339 BLAKE2B 6bbc98489c148507b921e5135a8d6adb02da4491c6058b80e02993372e017d66607a279cc0286a48707c2716ec2a7ab8dc2570149c48a7655bcf18246fbdaacf SHA512 fe60864eb9c9ce69a21f2f1d3625823fc28f0b8eb2ad6b9087b7e8746bd17824497767303e10c5a1063c2cf0dea6357cf382c127b5f734c2b673838c0e9b8134
diff --git a/media-plugins/x42-plugins/x42-plugins-20210714.ebuild b/media-plugins/x42-plugins/x42-plugins-20210714.ebuild
new file mode 100644
index 000000000000..62be7c10ec26
--- /dev/null
+++ b/media-plugins/x42-plugins/x42-plugins-20210714.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Collection of LV2 plugins"
+HOMEPAGE="https://github.com/x42/x42-plugins"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/x42/x42-plugins.git"
+else
+	SRC_URI="http://gareus.org/misc/x42-plugins/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="mirror"
+
+RDEPEND="dev-libs/glib
+	media-fonts/dejavu
+	media-libs/ftgl
+	media-libs/glu
+	media-libs/liblo
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libltc
+	media-libs/lv2
+	media-libs/zita-convolver
+	sci-libs/fftw:3.0
+	virtual/jack
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	sys-apps/help2man"
+
+src_compile() {
+	emake STRIP="#" FONTFILE="/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" LV2DIR="/usr/$(get_libdir)/lv2" install
+}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index b8c010858a93..65da5a038fe2 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index 94db94da07b8..338cd99c9aa0 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,5 +1,7 @@
 DIST tucnak-4.28.tar.gz 3592213 BLAKE2B 24a6a381367b823e24584541c56b4d34bfeab883cf6e488a42f20fe0f05d79432017f82c10702bd97cdb9a2454129410bfc3a894803ea3aaea8dad11029c702e SHA512 c5186ba331a0127d14f637548c738482ee3050749135404dd93d636c392e1e3b5032b1c92941b22548095d3b3131cc0768f71061feed532c40c8ff1e8a06cea7
 DIST tucnak-4.29.tar.gz 3593562 BLAKE2B 8469485e8262bf6fe83b22e8a3049bdfa519d8d9d8bfadb5be7068352ce8b6bf35cd4fb070fc9d337b06ca8d241645d9f8b978ce71263b89ea60a855567c7de7 SHA512 b938a62b5691e886903e0f876b4f2a387b1f3311cd179112202cfce12684bebeed9090ae9fcfafbab859162b6c992fa33481a2e9462b5b50dd59e2f9e10f1000
+DIST tucnak-4.30.tar.gz 3594691 BLAKE2B 41ea3469ebd7ab4a50805c2806289c78ec4fe2ab28b3fea0301e486c9b9232a86b3c93ed26dc1ffc3dc531b69acb847f5cfe66b48ea2579d702d0a5427387d79 SHA512 dd840295c69c2a42ab2ac803444684e06bbf4f47623f9200832f2600bf4540817e2e375ffd1e1dcb6bb57743991396eea7f99a79182397d22dcb78adcf98f500
 EBUILD tucnak-4.28.ebuild 1968 BLAKE2B 33060a1288edd2bc2f564f58bd541419a43404b0206fb8d62738002f49d01e6a206ab17f986c90326b194876bab55e8e4b477afe48f4c5046e19c3451b846a88 SHA512 8912dc644b499c39dc65c8fa502793f40b498a23a9bade6d0399e2a961304ced5e51342bc0581d13ac123cf247747d083757508bfb5f1501d98a9f1127bb76ef
 EBUILD tucnak-4.29.ebuild 1970 BLAKE2B d218d6fa3a2447f0983f076d9ad7a46a77374d1a2429c22b2fb2f2594d6b8a422906a29ae9e34ed50eb10caf54b76f9c8446b15c6ed2ed67cce977b7c2f8c0b5 SHA512 4c78b7d2a222360f8cb8d40de6c4c4357b9d871a82068ce7b3d097871757e197d94dccaead83fc99b1d47cfe3e58e192f4c9fde81dbc66c88e16ef780c576b6b
+EBUILD tucnak-4.30.ebuild 1970 BLAKE2B d218d6fa3a2447f0983f076d9ad7a46a77374d1a2429c22b2fb2f2594d6b8a422906a29ae9e34ed50eb10caf54b76f9c8446b15c6ed2ed67cce977b7c2f8c0b5 SHA512 4c78b7d2a222360f8cb8d40de6c4c4357b9d871a82068ce7b3d097871757e197d94dccaead83fc99b1d47cfe3e58e192f4c9fde81dbc66c88e16ef780c576b6b
 MISC metadata.xml 408 BLAKE2B 80978177d2257cefae04860fc52e43ea7f0d2221bf4a5b3050fe8057acda81625117b1ba74e7357d40d00cc7fbd44f2dac713494cd8d20679c690cf851e1b678 SHA512 ad015a404c42d5cd0f160907400f545698045bb6c7c3da59816830ec6ed51938a02988c59d4a9ade472a78fd39feeb49ebe6c2a9c625e535a37e44bf19db1b17
diff --git a/media-radio/tucnak/tucnak-4.30.ebuild b/media-radio/tucnak/tucnak-4.30.ebuild
new file mode 100644
index 000000000000..74d1b35b9c84
--- /dev/null
+++ b/media-radio/tucnak/tucnak-4.30.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic multilib
+
+DESCRIPTION="Amateur Radio VHF Contest Logbook"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa fftw gpm hamlib suid"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libzia
+	media-libs/libsndfile
+	>=media-libs/libsdl-1.2
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0 )
+	gpm? ( sys-libs/gpm )
+	hamlib? ( media-libs/hamlib:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	# fix destop file
+	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
+	# fix doc install path
+	sed -i -e "s/docsdir/# docsdir/" \
+		-e "s/docs_DATA =/# docs_DATA/" \
+		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/hamlib
+	econf $(use_with alsa) \
+		$(use_with gpm) $(use_with hamlib) \
+		$(use_with fftw fftw3)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
+	if use suid ; then
+		fperms 4711 /usr/bin/soundwrapper
+	fi
+}
+
+pkg_postinst() {
+	elog "In order to use sound with tucnak add yourself to the 'audio' group"
+	elog "and to key your rig via the parport add yourself to the 'lp' group"
+	elog ""
+	elog "tucnak can be used with the following additional packages:"
+	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
+	elog "                             (No need to recompile)"
+	if use suid ; then
+		ewarn "You have choosen to install the little helper program 'soundwrapper'"
+		ewarn "setuid by setting USE=suid. That helper is only needed if you"
+		ewarn "want to use morse sidetone output via the PC speaker."
+		ewarn ""
+		ewarn "While the helper should be safe by design be aware that setting"
+		ewarn "any program setuid is a security risk."
+	fi
+}
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 871b1838805c..d37cca704af6 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,4 +1,3 @@
-AUX xlog-2.0.13-desktop-update.patch 1393 BLAKE2B c44070ad106834a89fa2323b33d5df90f2eaab50e0e3d2a03884a2f997f1e9cf0ac4c9e03e819956e7af09dc538729baac0ae8ac612f06f1b4a44929047795c1 SHA512 7e4f9f83eabf9a598e2e1382c6934240991f3743da50eb0da6b7532435d2dce3264e30aded7b6ca32a685b9b7c203f694268c500c89be76175194c0900296865
 AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15f927525694100471b296412675eb97237c7e239cc407a2ffb145dbf779e802c1a1f5914a064d70f73ad269d12 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6
 DIST xlog-2.0.22.tar.gz 11407849 BLAKE2B 85d2e904d33ef39883cb8ac086eed4dc7e65503cdccb95e8d33f169d12de4f1ed556a28ac2f40e0044e937185bf4d93fe55608088d6e95744617c9c3a051fb55 SHA512 a261f8e28b75aed9380c29b3da69c7615b0d32346eaf84a0ace5cf77c53407372c4985c599078dba5ed92f77bd8052a74c7dca40028b99bca49cc3164d4ec490
 EBUILD xlog-2.0.22.ebuild 1888 BLAKE2B bee6934c6a426de22807f032b2ef5706b2014ea3f13cb36cd9229aac625e220209a1a6a1a33bd5f95086415a612770302d2692dcc228d8c0ff642ce53764874c SHA512 8dd97e60010d3abb1985ebb3f3ead50ea5c867528705eca25035e244d3bd4ffee397c6fde5548d87b0918e636cb71476dfc21b2c7a409370764f5577210808d9
diff --git a/media-radio/xlog/files/xlog-2.0.13-desktop-update.patch b/media-radio/xlog/files/xlog-2.0.13-desktop-update.patch
deleted file mode 100644
index cf834e13ec7c..000000000000
--- a/media-radio/xlog/files/xlog-2.0.13-desktop-update.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- configure.ac.orig	2007-11-06 15:49:25.000000000 -0800
-+++ configure.ac	2007-11-06 15:51:22.000000000 -0800
-@@ -48,6 +48,7 @@
- AH_TEMPLATE([HAVE_LC_MESSAGES], [])
- AH_TEMPLATE([HAVE_STPCPY], [])
- 
-+dnl MIME update
- AC_ARG_ENABLE(mime-update,
- [  --enable-mime-update    update the mime database],
- [case "${enableval}" in
-@@ -63,6 +64,21 @@
- 	echo "disabled updating of the mime database"
- fi
- 
-+dnl Desktop update
-+AC_ARG_ENABLE(desktop-update,
-+[  --enable-desktop-update    update the desktop database],
-+[case "${enableval}" in
-+  yes) desk_update=true ;;
-+  no)  desk_update=false ;;
-+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-desk-update) ;;
-+esac],[desk_update=false])
-+AM_CONDITIONAL(DESKUPDATE, test x$desk_update = xtrue)
-+
-+if test "x${desk_update}" != "xfalse"; then
-+	echo "enabled updating of the desktop database"
-+else
-+	echo "disabled updating of the desktop database"
-+fi
- 
- AC_OUTPUT([po/Makefile.in
- Makefile
---- data/desktop/Makefile.am.orig	2007-11-06 15:47:51.000000000 -0800
-+++ data/desktop/Makefile.am	2007-11-06 15:48:16.000000000 -0800
-@@ -5,12 +5,16 @@
- 
- EXTRA_DIST = $(DESKTOP_FILES)
- 
-+if DESKUPDATE
- install-data-hook:
- if HAVE_DESKTOP
- 	$(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)$(datadir)/applications"
- endif
-+endif
- 
-+if DESKUPDATE
- uninstall-hook:
- if HAVE_DESKTOP
- 	$(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)$(datadir)/applications"
- endif
-+endif
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bc026c990100..1d754e793b3d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 7bb3cd48f0b3..1c87980c950d 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,3 +1,5 @@
 DIST abcm2ps-8.14.11.tar.gz 259453 BLAKE2B a5b2b4142b9d3190fdedd3b560f8baa582293badd90fd380ddb9991871b2e08050d07c3c97f908529be715bce62b9cda242487f3d6a7885ecf802318a64b7df8 SHA512 b156c84cfa929aa5999a42b23564af5bac399dccbf116342891b5e5ed2e34e81b4658fab9f3c51f5de084cc96d8ea0965a2bdf81de14de6eb324b8998dbb8b98
+DIST abcm2ps-8.14.12.tar.gz 259618 BLAKE2B d0efa0b8a624447791a56591b4a2c0d775c3c3f628dab437a0cb02d49614e21e587d13467f7fa72955a2846704dde0a0da28ae6888faa0032edcb6d026365f47 SHA512 a9bd26b21ed057be11f0de6c89e76615820c476b18e521fb7f478e6f685fb768824879d441d616b3de1bbb4a4335ec169aa819a609bea295e0d522d1466e42ed
 EBUILD abcm2ps-8.14.11.ebuild 878 BLAKE2B 36b88fa45779d165602ae5b5805d501e3dda59ebf6d0712e0201b6af0922a8e7cc7a3322d7b9ac0efbaee636f59079caf3fa14b83d28071efb3e50b931139901 SHA512 8d166545f746551422117be43d011fcab1efc2591065a8e599089537c098f39220de25354f7963040d462c6faf203ee13957993bc66d6ca1c7ee0daaec2404eb
+EBUILD abcm2ps-8.14.12.ebuild 880 BLAKE2B 1b3abbe2c30bdaf0a3f48738493e4d745485e87736ae139bf33bd38505e95a1d1de8101801feb2093372323086cc6f0293a7b9c1f39fa20bcd5f35273b461d9d SHA512 d34ceecaf4794c8124167b7922c23b578395ec0ff317970f322567fbd42bf8fdca87aef921aa75478434413b419d3b232969eee40e10700c37a06421d9c4504c
 MISC metadata.xml 442 BLAKE2B 1644918baf09ce3fbbdfb92858c155cd739f48f0d7b3c52827b900547cb065f93a645203250bc6cb9f40ae9086cd6dd1e92f5b23a06d4cd19139c9f0952626b9 SHA512 b73b1bb4b151438f0328d9371f636d172072ade500c8d055b749a53a10975174f7d4a3a6f61937206e0342202827f7fb968f3d073745bf62fa954f2ffc8c9d0f
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.12.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.12.ebuild
new file mode 100644
index 000000000000..48eee1a8dfd2
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.14.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Program to convert abc files to Postscript files"
+HOMEPAGE="https://github.com/leesavide/abcm2ps"
+SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples pango"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	pango? (
+		media-libs/freetype:2
+		x11-libs/pango
+	)"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--enable-a4 \
+		--enable-deco-is-roll \
+		$(use_enable pango)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin abcm2ps
+
+	insinto /usr/share/${PN}
+	doins *.fmt
+
+	dodoc README.md
+
+	if use examples ; then
+		docinto examples
+		dodoc sample*.*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index a595c86ce8d8..b4d9de974db3 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,5 +1,6 @@
+AUX aqualung-1.1-configure-lua-version.patch 1230 BLAKE2B ea7a3f9a5bfaef41e97639e9a417da233cd0b0577abf674ebee2e07141493f6f6207142f9b910e14e765d7fe2c1cdf43ab0b1a68234944f4134b3d8e35a255f1 SHA512 dfdfa42025e7c27cb735129fa0af0c2cd0b29803231bf225daa16c9b46357172eb9a5b6429cffc634dd4c3003de17339df3a4f27fbd0de682291302c63b89b10
 AUX aqualung-1.1-ifp.patch 1445 BLAKE2B 80e4baadf577d17985d657ff3b3a357f30ec027d1c2e81398472226c87f787a37257eecc34ef3c8c435216e8746947d1d87dc9acb62d08d8a1c44f2ba51e8159 SHA512 c20426ff125f9273dc8297a188c768ca64ae57f8a507049ed534b58fb0214ad21477c8375a5c999c5dda5de96dd2f1599fda0c768878441f4ca7190ef75bf90e
 AUX aqualung-1.1-var-collision.patch 1174 BLAKE2B 25ff8f99a38b5d857f3f3175400e535ba9343eec1954b97fc9552101c8581557b9ea3241d3976a6f9dd6d44e41aaaf6e4319469d89d7f68a6bfab5104a63d52c SHA512 d414f1af65466391a4b59e4b2de81b83db9eeddb60fe1b44f9a0fe101aa33453f18ac8c28e5a57ddba8ecb604c4571adfad1f94f12d4b0ef03e4c01c503a2e4d
 DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
-EBUILD aqualung-1.1-r101.ebuild 2498 BLAKE2B 23ecf60db98468881ee9c4d338998a7c988bbd2d0c1e50cdeece3213baa84d210f4daf6d8c55dd8aff6d57fb64b3a9ef6d3b495bb4d512973a2f24209163bcf7 SHA512 cb2b8401f75e1a9be4fc9c30d4ab0559c25b01668da23e6d914d31f45783545bc494298968124a8dff9fe173f1a9d597d3f06e88c846f162fa202c210e75a954
+EBUILD aqualung-1.1-r101.ebuild 2645 BLAKE2B 596843f46ed718bd2977782ee9c066efd1462fc907eda1bc593ae247d1fecd761b64591f887d41d3f44bf36e566bc5f02fb22a2cc80873ce338774aef05cddcf SHA512 ba93c99aeb4a5c55fef8a4cfa2f897988d997e36e89b96995682369c9c43d9a1aa49478c844f831e9fa04d2ea5cf346461e0dcac988008b1fe8638bb8abd3df3
 MISC metadata.xml 918 BLAKE2B b095813ec060712043d858b8e1ab6e4b5bcfa9ec2dd8e3b2003310774c4d1bf51d9a97c5335d1403d079e044006c4dd4a70e72258cf21f412bcc54facf57f003 SHA512 734b389036bed628f85a69b992efc5f144121c2edc9cc3f08bf7f00b8cbc73bcdcebc5893f8ceb9188de86a605ad6d4013451f45ba3478baaa5d16dc50643531
diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild
index 87d3f7995f0b..26cd9a923812 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-2 )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit autotools desktop lua-single xdg
 
 DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+HOMEPAGE="https://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
 SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -18,6 +18,8 @@ IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
 	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
 	vorbis wavpack"
 
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
 BDEPEND="
 	virtual/pkgconfig
 	sys-devel/gettext
@@ -53,6 +55,7 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}/${P}-configure-lua-version.patch"
 	"${FILESDIR}/${P}-ifp.patch"
 	"${FILESDIR}/${P}-var-collision.patch"
 )
@@ -61,6 +64,11 @@ pkg_setup() {
 	use lua && lua-single_pkg_setup
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-rpath \
diff --git a/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch
new file mode 100644
index 000000000000..a88839728c53
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -401,24 +401,11 @@
+ ])
+ 
+ AQUALUNG_DETECT([lua], [Lua Extension],
+-    [PKG_CHECK_MODULES([lua], [lua5.2],
++    [PKG_CHECK_MODULES([lua], [lua],
+         [AQUALUNG_FOUND([lua])],
+-        [PKG_CHECK_MODULES([lua], [lua-5.2],
+-            [AQUALUNG_FOUND([lua])],
+-            [PKG_CHECK_MODULES([lua], [lua52],
+-                [AQUALUNG_FOUND([lua])],
+-                [PKG_CHECK_MODULES([lua], [lua5.1],
+-                    [AQUALUNG_FOUND([lua])],
+-                    [PKG_CHECK_MODULES([lua], [lua-5.1],
+-                        [AQUALUNG_FOUND([lua])],
+-                        [PKG_CHECK_MODULES([lua], [lua51],
+-                            [AQUALUNG_FOUND([lua])],
+-                            [PKG_CHECK_MODULES([lua], [lua >= 5.2],
+-                                [AQUALUNG_FOUND([lua])],
+-                                    [PKG_CHECK_MODULES([lua], [lua >= 5.1],
+-                                    [AQUALUNG_FOUND([lua])],
+-                                [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])])])])])])])])])])
+-
++        [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])]
++    )]
++)
+ 
+ # Compiler and linker variables.
+ AS_VAR_IF([GCC], [yes], [CFLAGS="-Wall $CFLAGS"])
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 0f022e9ff4f5..ff3f667fd0aa 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -10,7 +10,7 @@ DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8
 DIST csound-6.16.0-distributable.tar.xz 25129496 BLAKE2B cecfe82e9d584ac9e453659b617d54d2f899efd3e65243ba38770e5174baec6f12b0fa6c06c8ef2154f7c80faee8b9992bbe0957892a4ba86e142066aea85578 SHA512 243b23fc7cde3f0348953e88856117355b5b7185314045aad1b6dac236e227c558afd3fd8a73d9d760f3e5a30ee50d02cc7fe3d8b4b84fb63fa82c64972ca1ca
 DIST csound-6.16.1-distributable.tar.xz 25142436 BLAKE2B fe29208afe2cfc9740e68da213f269ca909facd452ffdd595e14a6dc14526bd497e8a2bc1832da28b0bbd6c8b9ac8891f79d819abf64cba0a9e1002c42f8e5dd SHA512 2535f16dab6a682e38b8352cb7bb87a65aedf0550c1705cde8a64b3c0112d7fd97e6c366dad18ef9ef5e1baaf7123f2c0032d9a2ab6979c202692c3a4069117e
 EBUILD csound-6.15.0-r101.ebuild 7400 BLAKE2B 9d711ee4305dbbe74d059f67109aa24a55fa99ec661c20c119cbe3344569904dd4f0888eaafb62bdfff2d178cbbc724bb1222b30a7cfd571a027e2b25f1247a0 SHA512 743d51af0fbc2235cba6968bbee28213b4aebc0b876cf4b820e3034a94b6b7d36b4cbaad1facf5f2a87db1cbdbbd4c6ed634f91f8b5ce3d1406040fca8aedf7c
-EBUILD csound-6.16.0.ebuild 7123 BLAKE2B 207820801b2d07d69253ad9113ca973ecfac3b70a5674697888178aaadab541553b2f9d87546e4141c17c8b8fcc53fde977e3cfea758c6a9523a4bcd8155af84 SHA512 6eb96c1b9be8e48846560dc368aa5305134ff447ed49413a04a878c70d310070cfee7dbec91471a1c17697126d214fc0cdb63d80297476a3304cf9c3f615f9b8
+EBUILD csound-6.16.0.ebuild 7121 BLAKE2B 37403bd6c1326b4684a43e47d60e01eece0ec35f05b8d883ddec22f2648045388e76afde0f62ae8bc8b3dab5ea1b38a85398c1993a147619e37424ef78398e5a SHA512 1b81cd50e7274ce13f99241915c8070b0918160f9669a6b1cbe9a8a58dfdb62030d5dab990dd9d36f893d1f147fc85d6e906e6813253b7a5e7206cbeee734f4b
 EBUILD csound-6.16.1.ebuild 7134 BLAKE2B db5317b6bee40c4c71beafcfe5a835ed0ca5efdb51ca1ad2efa7bd8ba5d163a2d3b209a6fee0e46e19fdef6c1c758a859372028c83681a26c99e8163fbfad98e SHA512 584f1e398cac005552c18e86bec63e4690eb4282c0f9663c0fac4e632ee2aec737c59d6e24b23d0444eb0b5dc43656cb3b0a5873a708ca51a12606bfdbbdac65
 EBUILD csound-9999.ebuild 6880 BLAKE2B f07b7aff3c721a0115d1edd7e6389ecc7203ff7bb20c4d114516a96490a29af0005837724a1ddeb5ae3ae362fa8a743757c13b6fe16dfc68346089b4e66d837d SHA512 cb74a9452eda7897f5595491d2c974cba029af4609faaed6fadcb2895b850e5c73b0e54c62172bd50919cb46de20aaa9f1a510c8a43298f750ae93cfd34fa256
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.16.0.ebuild b/media-sound/csound/csound-6.16.0.ebuild
index 27e5f4a83d43..c21367e524e4 100644
--- a/media-sound/csound/csound-6.16.0.ebuild
+++ b/media-sound/csound/csound-6.16.0.ebuild
@@ -22,7 +22,7 @@ else
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
 		)"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and performance"
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
new file mode 100644
index 000000000000..cecba42c86ae
--- /dev/null
+++ b/media-sound/easyeffects/Manifest
@@ -0,0 +1,3 @@
+DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df932af63b8fb7e9642c6e24b29360dd17efba71ae0daae265538cd9cde1d9e33de453b0c469e3d54709a3f337cd583a7 SHA512 78074341c8376a4918d09950fd7db8804346cd2e00d6849da464662643809010eeb1d009c44ca5d3eadd2faf3bb9c43a18a41b7c3e77b883beff44618967b30e
+EBUILD easyeffects-5.0.4.ebuild 1790 BLAKE2B 5be8a0a80e5ee355ab69ae30cf9553de9b0859dcdd9baaff20373c7aa1e89d95730a3a2ab0f552a4ee37209cfed53871a5e423b8d434d0532673e230c1fbbd56 SHA512 18ef1d69d988aa1d5553f97c48be4bed66e8d9859d22a2764593c9cfb3f7b36b1e784b0f7ddf6c206f99f4d2a534b133472ee4461afb5a66b04a20f9ba5ff6f2
+MISC metadata.xml 694 BLAKE2B 0995339a202cfc2134c90d19c18a9efb8be097ff69d996d53470bcc94b3c6ad47376749c95ab94a3da917df33ebf01b993b538f7163224dad04eec01efe10ca2 SHA512 941917bf4e9ee80f56f9b7387028dee554210848e706aabd8fe523a635c7d7c77d192a1fdb751dc54c499627409656fa3a180859498aa4b9c0ace386ae789f35
diff --git a/media-sound/easyeffects/easyeffects-5.0.4.ebuild b/media-sound/easyeffects/easyeffects-5.0.4.ebuild
new file mode 100644
index 000000000000..e050d932ceae
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-5.0.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="!media-sound/pulseeffects
+	>=dev-libs/boost-1.41:=
+	>=dev-cpp/glibmm-2.56.0:2
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	>=media-video/pipewire-0.3.24[gstreamer]
+	sys-apps/dbus
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	rubberband? ( media-libs/rubberband )"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext"
+BDEPEND="dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/easyeffects/metadata.xml b/media-sound/easyeffects/metadata.xml
new file mode 100644
index 000000000000..e4010fa254cf
--- /dev/null
+++ b/media-sound/easyeffects/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<use>
+		<flag name="bs2b">Enable use of media-libs/libbs2b</flag>
+		<flag name="calf">Enable use of media-plugins/calf for adding various FX</flag>
+		<flag name="rubberband">Enable usse of media-libs/rubberband for the pitch shifting FX</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">wwmm/easyeffects</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 4b211bca5c40..4322492155de 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,7 +1,5 @@
 DIST elisa-20.12.3.tar.xz 1661968 BLAKE2B 17f7bf9bf589f19d010fa644c54d941647b3ed267c84ffb60b47ffcba27f28f0e639df3211d92ca27556e8887a9e83db3efa92739959c38e2051db79de6b2f4f SHA512 8fcf91c5421596a90e52329ab9d0f47cd5d4432f28ed1cede9f5e0e46f77124dd2cf6e2485fd184437034d3fb0820daeda3f8ad488e24637b97482ac3586c4ee
-DIST elisa-21.04.2.tar.xz 1724456 BLAKE2B f2c78a98168131bf6b6bc3a085ed43d6c65dcd3801c9dd5f4001906fa18441cddab098b73a1b056265854b951f9a4cbd8c1386f9fd1b5c7844e90a3493e39ff5 SHA512 69c9f605c1c15bf5d8a076f9851fee99655bff78a5da628c0b767f63ef5efd36df53112cdc523fe988afb56f62786b5f8c670a3c996b7827e8f6df58b76274d6
 DIST elisa-21.04.3.tar.xz 1725896 BLAKE2B 4937403cb1e58c23979ec5525232f227a92f4cfded11127af2cbf62b1f0a72163f39f1a02bec5e9d5acb9c78659f66bb3519a7ab322aaf3a5be7f855975cf365 SHA512 12a83267332f3d36d4906cd9dbc6c46558cd5a3efbf67ccdcfc53156e4e6b3cf334cd05033bc299105ce72df3625852ba8b9dc1438c0b50b7e29798796699ecc
 EBUILD elisa-20.12.3.ebuild 1658 BLAKE2B 4351d92ef0d8902ff9ff6435161f79580327b31a21add05d8a90978a4724e8bc5d6e6720772f46f14c0f0fdb6076ae9f2d86f23e1a21327dd7617481e2ecac52 SHA512 2ff5520e1c11115a4ccdecfbacadefdae94be53155f742e03c579ce1a9daaafc34ac22dd8a898183403788250e9076debdbba82defbdb9a2d69475352a002979
-EBUILD elisa-21.04.2.ebuild 1650 BLAKE2B 452bc1f0bdcd1a345678b2d73cf7e1e9d71f53047d43751a453c9d55339f2ec743c110d251456d2bf0092700387b2ee4e325018fd1f748c20f591acf6cd71b9c SHA512 84f615203f30d22624e476db0db3eebd211475cd6ce06382e31f9b8e4b90de01a529c5bf2789068b7f17b70f53a22facc2afe3a0e32655575b9f12f0b47cb2ff
 EBUILD elisa-21.04.3.ebuild 1650 BLAKE2B 452bc1f0bdcd1a345678b2d73cf7e1e9d71f53047d43751a453c9d55339f2ec743c110d251456d2bf0092700387b2ee4e325018fd1f748c20f591acf6cd71b9c SHA512 84f615203f30d22624e476db0db3eebd211475cd6ce06382e31f9b8e4b90de01a529c5bf2789068b7f17b70f53a22facc2afe3a0e32655575b9f12f0b47cb2ff
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-21.04.2.ebuild b/media-sound/elisa/elisa-21.04.2.ebuild
deleted file mode 100644
index b7ac1e0751d2..000000000000
--- a/media-sound/elisa/elisa-21.04.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KDE_GEAR="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/elisa/"
-
-LICENSE="LGPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="mpris semantic-desktop +vlc"
-
-RESTRICT+=" test"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	mpris? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	)
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	vlc? ( media-video/vlc:= )
-	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer] )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package mpris KF5DBusAddons)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index f69da860a6b9..8ab1201398fd 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,7 @@
 DIST fluidsynth-2.2.0.tar.gz 1507709 BLAKE2B 4ec162ecf461f3fbc80d1b5c1a4bc0624d8274dedcfa32addfd79d7270811e532bccee46b90181bca504183e092176652f6c9d0ae8eccfb5617b9176b8bc511e SHA512 fa08c6d6914accbb5a99bb912066d97ded26ab3c706e663e76a4f1b024f610f676d2e1f7c30872d00e0fe86b5c494dcea581ecd0770977d235962a845c074bd6
 DIST fluidsynth-2.2.1.tar.gz 1594153 BLAKE2B 9a297859ae90e3dba21a3923059c081596d2a5ff107219b829f75e2067bea315364c9b4a9a4e6563c5a9f9ded92efff2c58d1aef9840b308fe69f546797c83ae SHA512 a42728f179fd2583a292d18d9b7d98498b42574aff6559e8e3762329893dd18c451b5611517aa9aa7ee6ba9fc0db3c83e127d097c68769c5d8562a49dc427ee9
+DIST fluidsynth-2.2.2.tar.gz 1741567 BLAKE2B 78fe02ae37db70e7aa92071aa609ff6f3dc6217827f89091ded1a8e2d30e84f3d7a095e101fcccfe720e9c3445f58e15da588cfcd7063388ab642649536b8fa0 SHA512 208956e367725de4b1faeba7d4125a6a85bb4191ef0354a7087809e93d93b8986cdc30b78c135a743104851d15f3bb09776855fa02a686de0810dd14c97851c3
 EBUILD fluidsynth-2.2.0-r1.ebuild 3314 BLAKE2B 1170bc2979a36dcbe5b84ca2ef8e4c34256c9da3514833bd23d1e0edd7753f876a943be534630a8ec0637024ca0a4a34ec06bcf83a42ee4f3f0948cd716cf29b SHA512 6de4ee1f429768af858bc9bedf365e4977ef8f2d04a815ba0fb6c5649b2989c56bb56951cd1647e3c6f3a1a93d1daf99783532aa4e32512db4273df4091b235f
-EBUILD fluidsynth-2.2.1.ebuild 3357 BLAKE2B cef1dd162fa1c63d1b12e2b34821cb3afb341ee80e1237bb5844ecc3f40a0026d1dafcbbb49b35fa021f2959e5cf89dcc0e93b4868c3a8f1dce20c5db8c29ec1 SHA512 d85b312be9ccbc4e363d834b49a52f2b77f89195f76d608bede59a8f865bc8341f48d83503799fffddaccbe9115b9c3b7a6e94913210c8f4a1d596a4b5332437
+EBUILD fluidsynth-2.2.1.ebuild 3356 BLAKE2B db78921d090a791457306485639b42d424d8c4695b8b55c2a00a66c1aa706fa65d14289072127ad96a49edbc1f437efb40dde003e44861f6b8a80b1d01a2f7d1 SHA512 c78089e8fe83cbd8f922814b3d797fe0a618feedd15c0cef0708c32f0cc24ee0b969b1f756d3f13b6637a0ee312bb09ae695e4a497a982ac76df234aa75497a2
+EBUILD fluidsynth-2.2.2.ebuild 3360 BLAKE2B 2f0caa610b00d7ac09122ab8dfae6390864240cff2272232f1ebd582f5d3e30d4460ab0ce0a33ba3fb14694a119017aafb96defabe36acb34b58db35709a4b1d SHA512 1f35e5811cb12736c6ee7790a507298bf2a78aa2c0263c4f510381cbe1ecc52a5b2e3d12b723978b25909cdd2288d3a90cb3ffc3ff9dd4708da8370f02c63245
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
index c7eb8de786ca..b066b19eae1b 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild
new file mode 100644
index 000000000000..aca45d6ed7a1
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib systemd
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="https://www.fluidsynth.org"
+SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable-alsa=$(usex alsa)
+		-Denable-aufile=ON
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-dsound=OFF # Windows
+		-Denable-floats=OFF # loat instead of double for DSP samples
+		-Denable-fpe-check=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
+		-Denable-midishare=OFF # http://midishare.sourceforge.net/
+		-Denable-network=$(usex network)
+		-Denable-opensles=OFF
+		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-pkgconfig=ON
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-profiling=$(usex debug)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+		-Denable-sdl2=$(usex sdl)
+		-Denable-systemd=$(usex systemd)
+		-Denable-threads=$(usex threads)
+		-Denable-trap-on-fpe=$(usex debug)
+		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
+		-Denable-waveout=OFF # Windows
+		-Denable-winmidi=OFF # Windows
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	if use systemd; then
+		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+install_systemd_files() {
+	if multilib_is_native_abi; then
+		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
+		insinto /etc
+		doins "${BUILD_DIR}/fluidsynth.conf"
+	fi
+}
+
+multilib_src_test() {
+	eninja check
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+
+	if use systemd; then
+		multilib_foreach_abi install_systemd_files
+
+		elog "When using fluidsynth as a systemd service, make sure"
+		elog "to configure your fluidsynth settings globally in "
+		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
+	fi
+}
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
index 9ca4741ba56e..837582b765e0 100644
--- a/media-sound/gnump3d/Manifest
+++ b/media-sound/gnump3d/Manifest
@@ -1,5 +1,5 @@
 AUX gnump3d.conf.d 159 BLAKE2B d03de16b977c8c892be3dcd6ec7b45414dac9694a777fde5775f30ad94552349263563316c7e48517c60947e5751ef1f7d9eff4648c7a0cc720b845df32ee8cf SHA512 33c87ac067be3ae4f3dac690e38eecf8400ac393e47cea8f6b5b1238cc41b08dfe684ee33a7bf3bcb24cd6f9a8ff3861caed12c0d9d7f0df61a757cee5910e33
-AUX gnump3d.init.d 724 BLAKE2B 734bfb5daddea0894aff9254874d7135ad7a01bb46d2b6a2515ee359e98ada5ec328c31342dde936fdfeb051a8a8731b4a4a07f356b3566398dd7e0cc833bc53 SHA512 86f43db016e4dd1d2cb75b68ed1a11ea7b7f9ab1d78d18d0e6cf47c3380c466251f733d7aa73ef0354c3f63b78f18b966f583ea0aa328773442270c2aa0867d0
+AUX gnump3d.init.d-r1 826 BLAKE2B 37e9ea5403584881c2a4d87460fa058464eac1a1342af0decec37149f682b4946bb9cf34dc8eff21e6cd83c03aa2a334a8fbe2d9f7c9afd77194897b914dec20 SHA512 c54609e031615cf84328e52ed44d2744391abc580c19df512a62ff8e9091f52eea3741748559fe22f995cedc7d47bb12ea5bd0f5851bf4706327a8fd24d17309
 DIST gnump3d-3.0.tar.bz2 633215 BLAKE2B aec3e2e95ebcbf2b9465f8f7e5cf579fe64e9e48d3b1757f78d3102f3a02f92970cbccc5986741013505e1b2f0e54e0d7a7c3871837c6169898e763f23e7fcca SHA512 23778604b557346e42f5cd2045cc394c7d6f7044479c74cd635dfdbbfd6835c8e3ad761d54c5cba239cc5e020b049ac11d64eb463272fc4134b7645226e2524b
-EBUILD gnump3d-3.0-r2.ebuild 1966 BLAKE2B b390a0ca69dec14cf56720913ba3b848a46466288048f05c7c5b3246f6b249a6460fd4d245ca03b972ab8b3eff001d7b23cbeb430be08df56cb198c25e6616e6 SHA512 322875a08047fdf344a2c92efb957af4c6b70b2d9ee2c50a873fcf011df1debb2f56b16ab089234be2fd1c983422f87b16ea937c59c7aa9d3b3e85688e7ab7ad
+EBUILD gnump3d-3.0-r4.ebuild 1907 BLAKE2B 0e8b43a98ae2cf32071aa48b95bf35b041af4a218cd44d5303dc052296e891389a91ee5b693d95e71389137dced0739eaac3ebca23ed92ccf3e519a871d40c13 SHA512 11431e8a2e3b56cf068132662236debb247390ae5aff1608ff9268c8aa07ff7480d3b098d9f071aa0ca35bcf8fb135f369f3ed30b039a1f7d84cbf61b77cc67f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gnump3d/files/gnump3d.init.d b/media-sound/gnump3d/files/gnump3d.init.d
deleted file mode 100644
index 730fc0cdb2db..000000000000
--- a/media-sound/gnump3d/files/gnump3d.init.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="index"
-
-depend() {
-	need net
-	after netmount nfsmount
-}
-
-start() {
-	ebegin "Starting gnump3d"
-
-	if [ ${DO_INDEX} -eq 1 ]; then
-		ebegin "Updating index of music files (may take a while for the first time)"
-		/usr/bin/gnump3d-index
-		eend $?
-	fi
-
-	start-stop-daemon --start --quiet --exec /usr/bin/gnump3d2 --make-pidfile \
-		--pidfile /var/run/gnump3d.pid --background -- --quiet
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping gnump3d"
-	start-stop-daemon --stop --quiet --pidfile /var/run/gnump3d.pid
-	eend $?
-}
-
-index() {
-	ebegin "Indexing music files"
-	/usr/bin/gnump3d-index
-	eend $?
-}
diff --git a/media-sound/gnump3d/files/gnump3d.init.d-r1 b/media-sound/gnump3d/files/gnump3d.init.d-r1
new file mode 100644
index 000000000000..2ead467d7882
--- /dev/null
+++ b/media-sound/gnump3d/files/gnump3d.init.d-r1
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="index"
+
+depend() {
+	need net
+	after netmount nfsmount
+}
+
+start() {
+	ebegin "Starting gnump3d"
+
+	if [ ${DO_INDEX} -eq 1 ]; then
+		ebegin "Updating index of music files (may take a while for the first time)"
+		/usr/bin/gnump3d-index
+		eend $?
+	fi
+
+	start-stop-daemon --start --quiet --exec /usr/bin/gnump3d2 --make-pidfile \
+		--pidfile /var/run/gnump3d.pid --background -- --quiet
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping gnump3d"
+	start-stop-daemon --stop --quiet --pidfile /var/run/gnump3d.pid
+	eend $?
+}
+
+index() {
+	ebegin "Indexing music files"
+	/usr/bin/gnump3d-index
+	eend $?
+}
+
+start_pre() {
+	checkpath -d -o "gnump3d:gnump3d" -q "/var/cache/gnump3d" "/var/cache/gnump3d/serving"
+}
diff --git a/media-sound/gnump3d/gnump3d-3.0-r2.ebuild b/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
deleted file mode 100644
index 63c211a36959..000000000000
--- a/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit multilib user perl-module
-
-DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
-HOMEPAGE="https://www.gnu.org/software/gnump3d/"
-SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
-IUSE="sox"
-
-RDEPEND="sox? ( media-sound/sox )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewuser gnump3d '' '' '' nogroup
-	LIBDIR=/usr/$(get_libdir)
-}
-
-src_compile() { :; }
-
-src_install() {
-	perl_set_version
-
-	insinto "${VENDOR_LIB}"/gnump3d
-	doins lib/gnump3d/*.pm
-	insinto "${VENDOR_LIB}"/gnump3d/plugins
-	doins lib/gnump3d/plugins/*.pm
-	insinto "${VENDOR_LIB}"/gnump3d/lang
-	doins lib/gnump3d/lang/*.pm
-
-	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
-	dosym /usr/bin/gnump3d2 /usr/bin/gnump3d
-	doman man/*.1
-
-	insinto /usr/share/gnump3d
-	doins -r templates/*
-
-	insinto /etc/gnump3d
-	doins etc/gnump3d.conf etc/mime.types etc/file.types
-	sed -e "s,PLUGINDIR,${VENDOR_LIB},g" -i "${ED}/etc/gnump3d/gnump3d.conf" || die
-	sed -e 's,^user *= *\(.*\)$,user = gnump3d,g' -i "${ED}/etc/gnump3d/gnump3d.conf" || die
-
-	dodoc AUTHORS ChangeLog DOWNSAMPLING PLUGINS README SUPPORT TODO
-
-	newinitd "${FILESDIR}"/${PN}.init.d gnump3d
-	newconfd "${FILESDIR}"/${PN}.conf.d gnump3d
-
-	keepdir /var/log/gnump3d
-	keepdir /var/cache/gnump3d/serving
-
-	fowners gnump3d:nogroup /var/log/gnump3d /var/cache/gnump3d
-}
-
-pkg_postinst() {
-	elog "Please edit your /etc/gnump3d/gnump3d.conf before running"
-	elog "/etc/init.d/gnump3d start"
-	elog ""
-	elog "At the very least, you will need to change the root directory"
-	elog "where music is found.  By default, gnump3d will also listen"
-	elog "to any address on port 8888"
-	elog ""
-	elog "You can optionally use sox to downmix the quality of streamed"
-	elog "music in realtime for slow connections."
-}
diff --git a/media-sound/gnump3d/gnump3d-3.0-r4.ebuild b/media-sound/gnump3d/gnump3d-3.0-r4.ebuild
new file mode 100644
index 000000000000..fc1a65587ece
--- /dev/null
+++ b/media-sound/gnump3d/gnump3d-3.0-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib perl-module
+
+DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
+HOMEPAGE="https://www.gnu.org/software/gnump3d/"
+SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
+IUSE="sox"
+
+DEPEND="
+	acct-group/gnump3d
+	acct-user/gnump3d
+"
+
+RDEPEND="
+	${DEPEND}
+	sox? ( media-sound/sox )
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	LIBDIR=/usr/$(get_libdir)
+}
+
+src_compile() { :; }
+
+src_install() {
+	perl_set_version
+
+	insinto "${VENDOR_LIB}"/gnump3d
+	doins lib/gnump3d/*.pm
+	insinto "${VENDOR_LIB}"/gnump3d/plugins
+	doins lib/gnump3d/plugins/*.pm
+	insinto "${VENDOR_LIB}"/gnump3d/lang
+	doins lib/gnump3d/lang/*.pm
+
+	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
+	dosym /usr/bin/gnump3d2 /usr/bin/gnump3d
+	doman man/*.1
+
+	insinto /usr/share/gnump3d
+	doins -r templates/*
+
+	insinto /etc/gnump3d
+	doins etc/gnump3d.conf etc/mime.types etc/file.types
+	sed -e "s,PLUGINDIR,${VENDOR_LIB},g" -i "${ED}/etc/gnump3d/gnump3d.conf" || die
+	sed -e 's,^user *= *\(.*\)$,user = gnump3d,g' -i "${ED}/etc/gnump3d/gnump3d.conf" || die
+
+	dodoc AUTHORS ChangeLog DOWNSAMPLING PLUGINS README SUPPORT TODO
+
+	newinitd "${FILESDIR}"/${PN}.init.d-r1 gnump3d
+	newconfd "${FILESDIR}"/${PN}.conf.d gnump3d
+
+	keepdir /var/log/gnump3d
+	fowners gnump3d:gnump3d /var/log/gnump3d
+}
+
+pkg_postinst() {
+	elog "Please edit your /etc/gnump3d/gnump3d.conf before running"
+	elog "/etc/init.d/gnump3d start"
+	elog ""
+	elog "At the very least, you will need to change the root directory"
+	elog "where music is found.  By default, gnump3d will also listen"
+	elog "to any address on port 8888"
+	elog ""
+	elog "You can optionally use sox to downmix the quality of streamed"
+	elog "music in realtime for slow connections."
+}
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 0cf4f3d2b291..5f413e1408f0 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +1,7 @@
 AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef877123a57b717e3a1d91d7943b92dcc776f7e654b5c4fa85e7113c44bc232cf2a0d0ba413f6165e4a861c625ee267 SHA512 e1b65b55098534e3989c53470c3b690eba0bf2e087c1dd1f337332030e6fc8185fd1c2be590ad4b78df663d201a3e86f1b6e448619e93514c5e05311947862d4
 DIST jack2-1.9.18.tar.gz 987166 BLAKE2B e1684d50c26ce45b36133b5e9632e916cd5bdf2a2ffba9257d7d6018d9fab8ade87f2de4c837d3cc3cb37bdda296fbcd8c2da6468676a3a4c74563fb42397879 SHA512 7b9116b8002db88d9df746acf99e523cf9103c1a7955e8174912c8538b2c53bc8e7c34a64d0df4dc1f212e35035392814fdfcfe78597e26bd08ec028876bcb98
+DIST jack2-1.9.19.tar.gz 988780 BLAKE2B 37536e23f97ea8a3bf62fe77e35a4a40c5d88cea1197a2f72c4ab31cbbc689fcf99a1d51bb0ee96122c618464eefe1ca8479dc53ab7de9e6570cb4009cf2a7a1 SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
 EBUILD jack2-1.9.18.ebuild 2452 BLAKE2B 63f95828a08f855d195c9923a71e2cd5a292b24c791f9a6681bfc3794cb4ffdfa80cbfc7e1ef3d05afc845a2ba06cf63d0fa3f699e4f5ad6b5d5f8213246db49 SHA512 0e2241fa26abb4ab1f0bd163bea7e445d71c33adf3c79537a553534ed80e55b65a1a9c6baebdef597fe4a6793ab15e2fc46d9665df95ed1ec8c88d5f2efd43d2
+EBUILD jack2-1.9.19.ebuild 2406 BLAKE2B 80e17fd0792b2cb18c0a53fb134ff8c7161fd80996cb06f4f4adbb5c2666ac8ff855d695a9734ed0f41f3778edd8fffc0c75f5c2b25f9b6e2f0ee66d0c452d53 SHA512 d98dc183de011c5beb79dc646ed339f613a007823d246d74eec9d687359abec120b771c5e0cafcacb846f7bc31af47c740609b7c33e7a073435eab5468f4cd0a
 EBUILD jack2-9999.ebuild 2403 BLAKE2B afac511cd97033be22891584d22fb9cfe9d9891bf94cd3d11f3e21e3a1214ba11d8ba834e9011fcee783a469d301f7edf4170e4ca15f97b5475d8d871c5f095d SHA512 1377402a21cc82a8a1ea9c88d92c20768e352ad15d1f74b3dae89f57e5eeb23ec57c0373bb8ad3331efb82597c8da05221586213876e8827da4b6d60c3d46343
 MISC metadata.xml 557 BLAKE2B 76000f6e4bd787a3e2687f9bd3a71c0456cf4fbbd27e7bad1aaae7ee9e3e6832afd0cb44e07a4a23f13e01f7aa732be18e72e711f4148fc65b2b263c5190b49c SHA512 1a0a066f0829cd623672513b5c8950ffd6cb1a4d0921cd48174949af24070d1ef6c3bb0a850749c348d1afa2cdf56bcd94d6937b21163fd0a0667f7cdd1632e6
diff --git a/media-sound/jack2/jack2-1.9.19.ebuild b/media-sound/jack2/jack2-1.9.19.ebuild
new file mode 100644
index 000000000000..a696ea21763c
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.19.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="https://jackaudio.org/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+else
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="${PYTHON_DEPS}
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:* )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	dbus? (
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
+
+src_prepare() {
+	default
+	python_fix_shebang waf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=no
+		--db=$(usex metadata yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=$(usex ieee1394 yes no)
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index dcdd3b1fea31..cfd1687e49b8 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,8 +1,7 @@
-DIST mpg123-1.27.2.tar.bz2 1067102 BLAKE2B 14da616ffd9e798f07f8eaa00080a1a5ff8cf3c3c7436cc83c8f2264317a30a88ee98ddd0ac077c43672887daff447bf10d287be72a5c7d1a4d5580c90e68298 SHA512 b1c7de0c1b1d14cce3b3ba72e7454b7ce392443a3eaace0431381f1871e2fda1470b8efd07176057f8bf76d88f14c2b7ffae470ba34a3271c7e779277b86d6c0
 DIST mpg123-1.28.0.tar.bz2 1063321 BLAKE2B a4fa37ac9c3aca867ac4f18eea9c2d39ed80c7e86908b2f5399da8ae82c2e4b57c1a041f17427702da14af9902051ce4de5a85497f7236963ae390ef8715327a SHA512 4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77
 DIST mpg123-1.28.1.tar.bz2 1066558 BLAKE2B 4516ed6cafda21aaaf132266b91ae235ca0b911a79c4514c0588c030f4f5f2f3923153729f1fc3354cb5fa982ca8dc27ba6cb58fa884da379a8913c8119e8bd2 SHA512 af1fb96878a7b57f62f06445e9b888cbecc569a91fe118459c71415f62287f9d9de9b0d0663522cb181e1a21692d64d0a810d8aebfa6e085eb76926d7a2186f9
-EBUILD mpg123-1.27.2.ebuild 2753 BLAKE2B 129900b38d6e5464f19aec88b4b2894feff3d8c6023230f93c63e1fa5954658de8c9aafc10f1fa1b1dc2c70347667557576d9ecc0ef9e612aed17190ce31317e SHA512 67a19b872805005f14f719468c97ade3b94a2220e95dcced877e79b807dbf4826acf3c5f3673e9ffd644261d4cb28e4decb35be50de3d94bab71a77f444f698f
-EBUILD mpg123-1.28.0-r1.ebuild 2764 BLAKE2B bcc28d43dc1a60fa5e3cded8c387e35cb0e960ef52acb602956ce714bb3a2690815ec80948e9966b301bb07acda4309318fce8b74c46b738c247ddffd00f527d SHA512 ba5345fd2f5c3147cde4dc39250ae15c09f399a06489cddcdfcc3213e13ed20255be2605b71060ee558e455f62563101e93bc735c2a6b94e796304d0bdff5d06
-EBUILD mpg123-1.28.0.ebuild 2760 BLAKE2B 71996cbe978df08d7a2eaa45ed95a71649eef62dd1ee89b878e44fadbfef173718f3ddbdba8e98109cb5cee4d46ad8dbeb144a1b90197af68c131f543f086745 SHA512 3031dc355f017f04dbe2bdc9337e7d1db250ea0fc09dd92e1816ef08615e679edee70e8f8b2dc54ebb42a953ea97200e72e6841525616831f97431c7411419b6
+DIST mpg123-1.28.2.tar.bz2 1065867 BLAKE2B 2fc585598e49334b608c2a8487b40b599dc1a57afc53249975a339dbc381b968cc099d4274fb74872d3c4c54d1a6ee1858c4b00c78feb93809c823cc56398661 SHA512 45ac11c5997d13f80917e135a40d2fb4448703dad56271dfe8ce7c8dea339cbac7727ec121779040bd7a07fc4ea79086860ea4a8ec879eda3bdcbf7d57348cda
+EBUILD mpg123-1.28.0-r1.ebuild 2762 BLAKE2B d04be49750a688f21f4696b5649f5330b0832a09375475537072675473bb59d8a3a424b5c3e68141d8f21815e3ed019b3d1048b6a8d2aa005ca6511fe2a9bde3 SHA512 b9b74309aed772b7bb4984786c7c0635b6d5dec56033a1fc176549be55b7b36d24abbc21d3e69dca8417a99da56b23d36000489fa2e6951f266af21103342114
 EBUILD mpg123-1.28.1.ebuild 2769 BLAKE2B fa730d6ba2f282f774b3de5e0fcb61ae4ec04c7431c61a02fc38da1496032c49fd7bbab296801a6778954ee91bf88625c803022c62ca4aabb199ad91410fc82d SHA512 76bbbe89ffd5f8d0cbcd7ce8f07acff4ec19e9ead7ca3130372e75719595c68de2c1adf8b529018200c6f9a6f8b052b102b996bf7560676d293e469a98aa7eb3
+EBUILD mpg123-1.28.2.ebuild 2769 BLAKE2B fa730d6ba2f282f774b3de5e0fcb61ae4ec04c7431c61a02fc38da1496032c49fd7bbab296801a6778954ee91bf88625c803022c62ca4aabb199ad91410fc82d SHA512 76bbbe89ffd5f8d0cbcd7ce8f07acff4ec19e9ead7ca3130372e75719595c68de2c1adf8b529018200c6f9a6f8b052b102b996bf7560676d293e469a98aa7eb3
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.27.2.ebuild b/media-sound/mpg123/mpg123-1.27.2.ebuild
deleted file mode 100644
index 4d8fe02781d3..000000000000
--- a/media-sound/mpg123/mpg123-1.27.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-RDEPEND="
-	app-eselect/eselect-mpg123
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext
-		# bug #164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.28.0-r1.ebuild b/media-sound/mpg123/mpg123-1.28.0-r1.ebuild
index 5ea1d218bc53..b43f88f17c22 100644
--- a/media-sound/mpg123/mpg123-1.28.0-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.28.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123/mpg123-1.28.0.ebuild b/media-sound/mpg123/mpg123-1.28.0.ebuild
deleted file mode 100644
index b8286510b25f..000000000000
--- a/media-sound/mpg123/mpg123-1.28.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-RDEPEND="
-	app-eselect/eselect-mpg123
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext
-		# bug #164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.28.2.ebuild b/media-sound/mpg123/mpg123-1.28.2.ebuild
new file mode 100644
index 000000000000..9d14cfb3dbb9
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.28.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+IDEPEND="app-eselect/eselect-mpg123"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	if $(multilib_is_native_abi) ; then
+		local flag
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio="${_audio}"
+		--with-default-audio=${_output}
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+	)
+
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index ab62fdaeb7ec..e5556c25e67f 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,11 +1,5 @@
-AUX patch-4.7.2-gcc10.patch 1083 BLAKE2B 216c71658161024a8ea8992813f5627ee39d5404aab1af91fe5c88af916ab91a16c9c527053beac018de0e1e2231b7df26e7d2271baf7be33db8f6af6955af1b SHA512 07c95e025e43f2c0a2bef0a5b1ca6eb7977bfb5a34c70f7c4d99a9a4d18d3192383ed82784a7548d6fe263b2860a361128c2cae008e41737d383f30fd324a581
-DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
 DIST pulseeffects-4.8.5.tar.gz 2028531 BLAKE2B 0ba68c90d4eb25e3b22c4f39f989bef428c970f0dcfa0b301c500928f835d76c31cd1d7692d1a853b3121d4e8fbee8102c1f538b06cb15933509719a6da5d8a0 SHA512 b72f4d5356af1308d997f01ac2efc5eefb569e9a1253f0a19918aec5f9c2d386ab5c293a5aa6a28e8d15200289f32d34c8f3d524bc50874c750afdee61bc0820
-DIST pulseeffects-5.0.3.tar.gz 2052473 BLAKE2B f313abae0f432f767ea4c91350207c97c261845fe64dbb32b0aebab4792b33a993c5ee4084f8b14116058bc989965380c8acb393d10f59a3243ad676c9916f33 SHA512 e9a969b7661e8daca84f5406dafba59a3cbf036f3b8a8893320574ed56465537454d2c854a7053c7f425728342776e9156ebcae8fa2b07bc5bfca04d04356dfd
 DIST pulseeffects-5.0.4.tar.gz 2070799 BLAKE2B f059926672b690cce71ac2a26a8cb2e3e1b97e99b462418494516de54e33906d52a40ccf807d50fb133500270ae6468d1a4ab9c12b4bf2b15348752a7622c8d4 SHA512 db40291351e6da79d87d372b06734e0129df7640da90ccf3cb3564f58130c9d8d35cbb854d53878773c37811649f17141e2a40b2ba670fdaf1b2e12138f694a6
-EBUILD pulseeffects-4.7.2-r2.ebuild 1905 BLAKE2B 61eaf56d327b9f99b1e337cbbb316e8c191ac6d316929a9ac4049985a421ecbdba229ccd61d773412be3f5eebdcb39fbe121f64e268a4aab0157ec61b9eaa669 SHA512 3fd3c448f9716f943e4c1f5a679f2a0b242e725ec2a8ee11efaa3d98e396d7e7d0bf9d0954eec0276d0df38f781230cafba3d7b34cd9272c6e0d0a67341c2a36
-EBUILD pulseeffects-4.8.5.ebuild 1812 BLAKE2B 8993a53c15218aea86a546d78285e12d236377a6a5cdebd7370ef16ee55b1842455705fbeff4b9ce67c234c544496ce83e8c7bd5aebea00081ede8a99282449d SHA512 ef5d2c3af4a3168db6cb85119af7a9ab9b773c78170261dace79cd0bc52f1c963dae5fe0d718974efa4adab5705926a8d76aa0978c5b662b04f3adca45c45c42
-EBUILD pulseeffects-5.0.3.ebuild 2165 BLAKE2B 645812419b880942134baa3ffbf87fdf9b8d9e5f0d27c094852023b997e83e2605814f554641174b4b9ddb140f346e63d1d7cc0145968d7bc9c9a5b7b6400c4f SHA512 6689a5859227ae8292262abb20649422e58eb0d1422e0438fd7d60d384dadeec0ae2599df5e21d139b53b545bb390cd0212b8e0c0ac71e3699dc3357c5069aea
-EBUILD pulseeffects-5.0.4.ebuild 2165 BLAKE2B 645812419b880942134baa3ffbf87fdf9b8d9e5f0d27c094852023b997e83e2605814f554641174b4b9ddb140f346e63d1d7cc0145968d7bc9c9a5b7b6400c4f SHA512 6689a5859227ae8292262abb20649422e58eb0d1422e0438fd7d60d384dadeec0ae2599df5e21d139b53b545bb390cd0212b8e0c0ac71e3699dc3357c5069aea
-EBUILD pulseeffects-9999.ebuild 2237 BLAKE2B 2857391a14ea9cbe8918b178e5bbde379c8bfe1ac8b2e78b6611c076c9d2e1ae23c3664840af30af367431c1d50a52142640661c1fc242a96c59f78e33801e89 SHA512 b91c4f542cf98b447099e7d5649c7a689760b37523a046c653950be7ceda61df2b1aa4e99b436231adc08e4b5c978815d42e4bd124786962770ebb9df8e5cffe
-MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
+EBUILD pulseeffects-4.8.5.ebuild 1824 BLAKE2B 1e68075519cb839026d230d2757fe7699b6cdc54f78e5c83222d2edf15dd64f0e50f32a4b73eedd5d57bb8773b920b01de058c8fc2ca85d15d98aab1bf794ced SHA512 46efcb59bba3e32bed6a8605b22021383be739351aeacc87fc7ff692d7f1d1bf8762187ca85064a32eedecd06b0cdc3793bb53e12bb9e729a67a2c88b72b7904
+EBUILD pulseeffects-5.0.4.ebuild 2186 BLAKE2B b2c0a8af9a3192375adfa3a5e348a4e334c8963dd5cbff988b4023f5daebddb1bcc4662da03bd837aae9746263448c7e73b1ea561db35f236106ceadb5593a2e SHA512 977047459cd27236be7221103fc5e9ae552d46de3b4e18e1ed7f4c360112a344b88d7ffdee37cd70456c33610ffe2056c76b0dc2de8c22faf77c7296cc51bb54
+MISC metadata.xml 859 BLAKE2B 0d60e8c3843a433bb589037c34988b9a1304f1a8a5b5e6c4dceaf16891da91aaf1e65ae37787636f3d84a34b06403e2267e963e13751b07cd6d030361a297a44 SHA512 5fea2819ca87bf3eec5c5b430fd448df160b47370002448b879ca1e10e0732e09e047756c107162b50617c7cb427bf07daf2f23f2293b734e367587d4f66723a
diff --git a/media-sound/pulseeffects/files/patch-4.7.2-gcc10.patch b/media-sound/pulseeffects/files/patch-4.7.2-gcc10.patch
deleted file mode 100644
index fb8080dd823a..000000000000
--- a/media-sound/pulseeffects/files/patch-4.7.2-gcc10.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dbaea05da683f7bfcd7960c88b1b7d13379435c0 Mon Sep 17 00:00:00 2001
-From: Vasiliy Glazov <vascom2@gmail.com>
-Date: Tue, 24 Mar 2020 10:54:09 +0300
-Subject: [PATCH] Fix build with GCC 10
-
-This fix build error:
-```
-../include/plugin_base.hpp:10:25: error: expected ')' before 'tag'
-   10 |   PluginBase(std::string tag, std::string plugin_name, const std::string& schema);
-      |             ~           ^~~~
-      |                         )
-../include/plugin_base.hpp:17:8: error: 'string' in namespace 'std' does not name a type
-   17 |   std::string log_tag, name;
-      |        ^~~~~~
-../include/plugin_base.hpp:7:1: note: 'std::string' is defined in header '<string>'; did you forget to '#include <string>'?
-```
----
- include/plugin_base.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/plugin_base.hpp b/include/plugin_base.hpp
-index a2356fbf..79fd5452 100644
---- a/include/plugin_base.hpp
-+++ b/include/plugin_base.hpp
-@@ -4,6 +4,7 @@
- #include <gio/gio.h>
- #include <gst/gst.h>
- #include <sigc++/sigc++.h>
-+#include <string>
- 
- class PluginBase {
-  public:
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
index c0da3601cd32..9f7e8c81b246 100644
--- a/media-sound/pulseeffects/metadata.xml
+++ b/media-sound/pulseeffects/metadata.xml
@@ -2,13 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
 	<use>
 		<flag name="bs2b">Enable use of media-libs/libbs2b</flag>
 		<flag name="calf">Enable use of media-plugins/calf for adding various FX</flag>
-		<flag name="mda-lv2">Enable use of media-plugins/mda-lv2 for the loudness FX</flag>
 		<flag name="rubberband">Enable usse of media-libs/rubberband for the pitch shifting FX</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.2-r2.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.2-r2.ebuild
deleted file mode 100644
index 6f046476075a..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.7.2-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0:2
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.7[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/patch-4.7.2-gcc10.patch"
-)
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild
index 47bbfaf9b5fe..532f5ba39c14 100644
--- a/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild
@@ -6,44 +6,44 @@ EAPI=7
 inherit gnome2-utils meson
 
 DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
+HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy"
 
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+	EGIT_BRANCH="pulseaudio-legacy"
 else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="bs2b calf rubberband"
 
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
+RDEPEND="!media-sound/easyeffects
+	>=dev-libs/boost-1.72:=
 	>=dev-cpp/glibmm-2.56.0:2
 	>=dev-cpp/gtkmm-3.24:3.0
 	>=dev-libs/glib-2.56:2
 	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
+	>=x11-libs/gtk+-3.20:3
 	>=media-libs/lilv-0.24.2-r1
 	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	rubberband? ( media-libs/rubberband )
+	>=media-libs/gstreamer-1.12.5:1.0
+	>=media-libs/gst-plugins-good-1.12.5:1.0
+	>=media-libs/gst-plugins-bad-1.12.5:1.0
+	>=media-plugins/gst-plugins-ladspa-1.12.5:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.5:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
 	>=media-libs/zita-convolver-3.0.0
 	media-libs/libebur128
 	media-sound/pulseaudio
-	sys-apps/dbus"
+	sys-apps/dbus
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	rubberband? ( media-libs/rubberband )"
 # see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
 # and sys-devel/gettext depends reasoning
 DEPEND="
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.3.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.3.ebuild
deleted file mode 100644
index e9dde9ba03b9..000000000000
--- a/media-sound/pulseeffects/pulseeffects-5.0.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	>=media-video/pipewire-0.3.24[gstreamer]
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt "5.0.0"; then
-				if ver_test ${REPLACED_BY_VERSION} -ge "5.0.0"; then
-					elog "PulseEffects has switched to pipewire as it's audio backend"
-					elog "See https://wiki.gentoo.org/wiki/Pipewire for how to use the new backend"
-				fi
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild
index e9dde9ba03b9..749f06d01a61 100644
--- a/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild
@@ -6,14 +6,14 @@ EAPI=7
 inherit gnome2-utils meson
 
 DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
 
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="bs2b calf rubberband"
 
 #TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
+RDEPEND="!media-sound/easyeffects
 	>=dev-libs/boost-1.41:=
 	>=dev-cpp/glibmm-2.56.0:2
 	>=dev-cpp/gtkmm-3.24:3.0
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
deleted file mode 100644
index 1d89fa03f254..000000000000
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	>=media-video/pipewire-0.3.24[gstreamer]
-	sys-apps/dbus
-	gnome-extra/yelp"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-# gnome-extra/yelp needed for help docs link from app
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt "5.0.0"; then
-				if ver_test ${REPLACED_BY_VERSION} -ge "5.0.0"; then
-					elog "PulseEffects has switched to pipewire as it's audio backend"
-					elog "See https://wiki.gentoo.org/wiki/Pipewire for how to use the new backend"
-				fi
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index f631ecb48baa..5941e40ebb1e 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,6 +1,6 @@
-DIST qmmp-1.4.6.tar.bz2 1297295 BLAKE2B ec0b27c5faf2c76c15ff8594eecad8b6f73bb5fefd60e4916751a297ff055b252762c8e1ff6d6fc75535bc299159fc595e95767977958a8e94ff2d13218e6fb1 SHA512 dca9d06763be6ded45db14a5e8967e9bd8eebc14e5ec7b077171417e942d61a904ecd1944b8d80deecfb642248663739c3e1784449a10466475deb6e575ea7dc
 DIST qmmp-1.5.0.tar.bz2 1337043 BLAKE2B 71da332bb125ddcc37cdc159e155af2e185cfef8f70348484ca6099666a4715258fadb8a7db68329a009e0d727b1d7b000553e34eb56552c229b6cc1a5f3dd45 SHA512 b8a29bf6b2f6da08e1ff2801c973821663570de436562ba79b40212b8b8522f0e25ea79c941bfacf252904851ed477cbfa66d7f145b172f93a105127894d5e04
-EBUILD qmmp-1.4.6.ebuild 4049 BLAKE2B bdb6ba0a6ad610e92d46d42371c66ef1a965e85bd565fce5e2f2295fd3ade3cb063414a29e523599250b0a743510459876f63bf1b8973e9449fbb06698eaa0f8 SHA512 67657e3a6f89c33c166f1aa34d33446c58ad3d77b18dad4b05560d228effa93603d9f4421621bc1bbd785a8ae3f9099daa0d9a78dbef277f75f3c34d691283e5
-EBUILD qmmp-1.5.0.ebuild 4132 BLAKE2B e56d49d4e6676bf1894261f53f71d031c858cb5b7ded275a93813a1b19aa5120aae22fc0433ed9c177bf1cc8832002e22325afdd7cda8676acfad72ac756c2f4 SHA512 cc252dbd29a703a5d8b5aa11c1a0a9ebe5ee7c4fd21df9acb4ebc1ec2c7267cedaeac82cde25c3c5b274cdc1f4fbcb01bb551872544b5b5dc25311b0f916625f
+DIST qmmp-1.5.1.tar.bz2 1363593 BLAKE2B 7c344ce2d9c1bc419b17c8d3727afa6f95273e7487f539b0e2f8cb5328f0185a7aab184d9df01a023f896e8b516135fd58ebe0e2204fb1f5ca283f4e0c04d78f SHA512 4b866e7b53ea1757a94e028730dd99bab3b56917e6835b46284cce148e779e00a5fe0a396667283aa13c980a9ee33d0fe76df0198320f1897ec3b73bcd1f275e
+EBUILD qmmp-1.5.0.ebuild 4131 BLAKE2B 9a1ad81f31602acdefc2e9c3a30d3953c61d19edc5186f796399bbb5a24e7e078d9deebb35d09594b66a56a9e396c4f141832b259c7739c8a06ca8299c78a224 SHA512 6f39f9ee519e07872d6c73eb51f78bb4c71fb1c1665d905cc511064ab86e8cf0c541e8cd4a6440682e57371bfbc30b51dba98ac309bb65fa19af7e50ffbd55b3
+EBUILD qmmp-1.5.1.ebuild 4133 BLAKE2B 7d65727a5858560cea4992734486ef6d080c64673ff65509a6883f05dc0f21b125f84635203b2f06f4d2baebddd2b769141b7db2ac9768fe23ffa46a7f888d30 SHA512 12d3d0b02a7a221a7f6edc82e0da2d3f7c60b77013f34c734f38155abbd924a4f53c98554a58317fc71dd30be06ad158eb34e387aa9439af778f75570bdc5736
 EBUILD qmmp-9999.ebuild 4133 BLAKE2B 7d65727a5858560cea4992734486ef6d080c64673ff65509a6883f05dc0f21b125f84635203b2f06f4d2baebddd2b769141b7db2ac9768fe23ffa46a7f888d30 SHA512 12d3d0b02a7a221a7f6edc82e0da2d3f7c60b77013f34c734f38155abbd924a4f53c98554a58317fc71dd30be06ad158eb34e387aa9439af778f75570bdc5736
 MISC metadata.xml 1882 BLAKE2B 05e4092242842436df6f1dfcd82ab4b7a08675668d6ff5817dc7901bafdeb1725ef26fe7529cf38ca7a5f3edcded04cbee82c3d2bc44644e902b29c238a671f9 SHA512 790c2d0d07117a51a9f33f4575a871e839d1fc403309d765888f98aa532292d8e7dcfc23ba127037babc48272927aab9aae37781b9264991606115690eeb875c
diff --git a/media-sound/qmmp/qmmp-1.4.6.ebuild b/media-sound/qmmp/qmmp-1.4.6.ebuild
deleted file mode 100644
index 2170cb945e31..000000000000
--- a/media-sound/qmmp/qmmp-1.4.6.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-else
-	QMMP_DEV_BRANCH="1.3"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/taglib
-	x11-libs/libX11
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
-	enca? ( app-i18n/enca )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		virtual/jack
-	)
-	ladspa? ( media-plugins/cmt-plugins )
-	mad? (
-		media-libs/libmad:=
-		media-sound/mpg123:=
-	)
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm:=
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_ARCHIVE="$(usex archive)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FILEWRITER="$(usex vorbis)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SHOUT="$(usex shout)"
-		-DUSE_SID="$(usex sid)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-1.5.0.ebuild b/media-sound/qmmp/qmmp-1.5.0.ebuild
index b5d8a08df439..3f6f68e35de6 100644
--- a/media-sound/qmmp/qmmp-1.5.0.ebuild
+++ b/media-sound/qmmp/qmmp-1.5.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://qmmp.ylsoftware.com"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	QMMP_DEV_BRANCH="1.3"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
diff --git a/media-sound/qmmp/qmmp-1.5.1.ebuild b/media-sound/qmmp/qmmp-1.5.1.ebuild
new file mode 100644
index 000000000000..2fe547a222c2
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.5.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		virtual/jack
+	)
+	ladspa? ( media-plugins/cmt-plugins )
+	mad? (
+		media-libs/libmad:=
+		media-sound/mpg123:=
+	)
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
+	projectm? (
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm:=
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia ; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index 375ba6a0a4c9..87490546826a 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -1,5 +1,5 @@
 AUX rplay-3.3.2-built-in_function_exit-r1.patch 366 BLAKE2B 104e722c7da8a97b5fc8abe58a9efe8b6cb7fbfbebe3493eaa094ac9580ac982eb32dcdfedd1ed11a972a665514788db6c2c29ac51839fa979692aaa56eb3f60 SHA512 6c5f358a6ef89b7338ae5bf2e485a3996e143fdab0c73455d97bdb2e07729464323992d72424d29c954f2537acef2c45ebd744db6a2e26b99ffd97be2f44957d
 DIST rplay-3.3.2.tar.gz 480015 BLAKE2B 5f506e81a5c9bad175c8906cb3104564ec9c8c6f4496382a428d77dff6264d0f39d3ab9af7cb83b0ef34bccc14f15978e399d428c62f6dafe46ee8ad70d32d37 SHA512 b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
-EBUILD rplay-3.3.2-r3.ebuild 1257 BLAKE2B 14f2171510d46e77fa291aa516a8e5c53238831f19f413533907bc34caf7c32697c97aacb41f27a53b6baeb9b91dcaa3664ee36412b0c09df7754f208f724cdd SHA512 4ccd8861af5760ebd0a9067a38f924deaa019ae79ccb8dc7f5ae7b01703a0df25159e9ab0b33d76e3ead9b5ca6e628dda0e5f785356a28596d27f9d3178028a8
+EBUILD rplay-3.3.2-r4.ebuild 1217 BLAKE2B 53483168d478bcbbfc49ab4157d457ddf38f01c73439d096a76a1330a9c9a00c178f71cdb90728a6a227b4c5c7c37d24c18c5fdfbf1a86a073685ac588873191 SHA512 ee6d8d6b95133f4ba46a17b1127c6acf09ed882dbcf60309c2eea5e97d129d3fc107d263d057058ca5895bf06c0f0b58d694b26e76f719c7a90f080a6ad20ef4
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
deleted file mode 100644
index b0daba33d9a6..000000000000
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools user
-
-DESCRIPTION="Play sounds on remote Unix systems without data transfer"
-HOMEPAGE="http://rplay.doit.org/"
-SRC_URI="http://rplay.doit.org/dist/${P}.tar.gz
-	mirror://debian/pool/main/r/${PN}/${PN}_${PV}-16.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="media-sound/gsm"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${WORKDIR}/debian/patches"
-	"${FILESDIR}/${P}-built-in_function_exit-r1.patch"
-)
-
-pkg_setup() {
-	enewgroup rplayd ""
-	enewuser rplayd "" "" "" rplayd
-}
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	mv rx/configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-rplayd-user=rplayd \
-		--enable-rplayd-group=rplayd
-}
-
-src_install() {
-	# This is borrowed from the old einstall helper, and is necessary
-	# (at least some of variables).
-	emake prefix="${ED}/usr" \
-		libdir="${ED}/usr/$(get_libdir)" \
-		datadir="${ED}/usr/share" \
-		infodir="${ED}/usr/share/info" \
-		localstatedir="${ED}/var/lib" \
-		mandir="${ED}/usr/share/man" \
-		sysconfdir="${ED}/etc" \
-		install
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/rplay/rplay-3.3.2-r4.ebuild b/media-sound/rplay/rplay-3.3.2-r4.ebuild
new file mode 100644
index 000000000000..0cbf1cbc4a6d
--- /dev/null
+++ b/media-sound/rplay/rplay-3.3.2-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Play sounds on remote Unix systems without data transfer"
+HOMEPAGE="http://rplay.doit.org/"
+SRC_URI="
+	http://rplay.doit.org/dist/${P}.tar.gz
+	mirror://debian/pool/main/r/${PN}/${PN}_${PV}-16.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+
+RDEPEND="
+	acct-group/rplayd
+	acct-user/rplayd
+	media-sound/gsm
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}/debian/patches"
+	"${FILESDIR}/${P}-built-in_function_exit-r1.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	mv rx/configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-rplayd-user=rplayd \
+		--enable-rplayd-group=rplayd
+}
+
+src_install() {
+	# This is borrowed from the old einstall helper, and is necessary
+	# (at least some of variables).
+	emake prefix="${ED}/usr" \
+		libdir="${ED}/usr/$(get_libdir)" \
+		datadir="${ED}/usr/share" \
+		infodir="${ED}/usr/share/info" \
+		localstatedir="${ED}/var/lib" \
+		mandir="${ED}/usr/share/man" \
+		sysconfdir="${ED}/etc" \
+		install
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 6623986c824c..bd4db0d9427f 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -12,5 +12,5 @@ AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6d
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.15.0.ebuild 5199 BLAKE2B c18bd5a8f2af423325659a37db88cbd3382fe6e7644ee282d202646e72409ad3120fb54e858d0cd754bf3c27dc670e42d2d46621790069d91ab218a186b01174 SHA512 da54b66c4e9341d0be7f680e46fa82e32a9f0e21b1059449a2f2c413f15fa600900c2e810f49e8dde74cd83a355ef720ccbd3a81a0c169fd6b73d59a0b636157
+EBUILD timidity++-2.15.0-r1.ebuild 5080 BLAKE2B a3b9385287ae0c3f441affbbb051efb3ce7e0d496d488f49aa339a75e55bf49fabc848318b41c4b8c4a33eba04208e3847e1f2ea57f4817ababf91eeac28a85a SHA512 da5f5eb0696cff423569685d4e54e0fd2e6ea6797f0becb4310cb68fa78d304808ee41c6c383b4209810459dfd0ab59adc51bd64e21404515b116cf3854fda0a
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/timidity++-2.15.0-r1.ebuild b/media-sound/timidity++/timidity++-2.15.0-r1.ebuild
new file mode 100644
index 000000000000..efa232bbc9d3
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.15.0-r1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop elisp-common systemd toolchain-funcs xdg
+
+MY_PV="${PV/_/-}"
+MY_P="TiMidity++-${MY_PV}"
+
+DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
+HOMEPAGE="http://timidity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
+IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
+
+REQUIRED_USE="tk? ( X )"
+
+DEPEND="
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.5 )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	flac? ( media-libs/flac )
+	gtk? ( x11-libs/gtk+:2 )
+	jack? ( virtual/jack )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( >=media-libs/nas-1.4 )
+	ncurses? ( sys-libs/ncurses:0= )
+	slang? ( sys-libs/slang )
+	speex? ( media-libs/speex )
+	tk? ( dev-lang/tk:0= )
+	vorbis? ( media-libs/libvorbis )
+	X? (
+		media-libs/libpng:0=
+		x11-libs/libXaw
+		x11-libs/libXext
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/audio
+	acct-group/nobody
+	acct-user/timidity
+	app-eselect/eselect-timidity
+	alsa? ( media-sound/alsa-utils )
+	selinux? ( sec-policy/selinux-timidity )
+"
+
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
+
+SITEFILE=50${PN}-gentoo.el
+
+DOCS=( AUTHORS ChangeLog NEWS README "${FILESDIR}"/timidity.cfg-r1 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.14.0-params.patch
+	"${FILESDIR}"/${PN}-2.14.0-ar.patch
+	"${FILESDIR}"/${PN}-2.14.0-configure-flags.patch
+	"${FILESDIR}"/${PN}-2.15.0-pkg-config.patch
+	"${FILESDIR}"/${PN}-2.14.0-CVE-2017-1154{6,7}.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	export EXTRACFLAGS="${CFLAGS}" #385817
+
+	local audios
+	local myeconfargs=(
+		--localstatedir=/var/state/${PN}
+		--with-module-dir="${EPREFIX}/usr/share/timidity"
+		--with-lispdir="${SITELISP}/${PN}"
+		--with-elf
+		--enable-server
+		--enable-network
+		--enable-dynamic
+		--enable-vt100
+		--enable-spline=cubic
+		$(use_enable emacs)
+		$(use_enable slang)
+		$(use_enable ncurses)
+		$(use_with X x)
+		$(use_enable X spectrogram)
+		$(use_enable X wrd)
+		$(use_enable X xskin)
+		$(use_enable X xaw)
+		$(use_enable gtk)
+		$(use_enable tk tcltk)
+		$(use_enable motif)
+	)
+
+	use flac && audios+=",flac"
+	use speex && audios+=",speex"
+	use vorbis && audios+=",vorbis"
+	use oss && audios+=",oss"
+	use jack && audios+=",jack"
+	use ao && audios+=",ao"
+
+	if use nas; then
+		audios+=",nas"
+		myeconfargs+=(
+			--with-nas-library="/usr/$(get_libdir)/libaudio.so"
+			--with-x
+		)
+		use X || ewarn "Basic X11 support will be enabled because required by nas."
+	fi
+
+	if use alsa; then
+		audios+=",alsa"
+		myeconfargs+=(
+			--with-default-output=alsa
+			--enable-alsaseq
+		)
+	fi
+
+	if use motif; then
+		myeconfargs+=(
+			--with-x
+		)
+		use X || ewarn "Basic X11 support will be enabled because required by motif."
+	fi
+
+	# needs to come after all audios have been collected
+	myeconfargs+=(
+		--enable-audio=${audios}
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# these are only for the ALSA sequencer mode
+	if use alsa; then
+		newconfd "${FILESDIR}"/conf.d.timidity.2 timidity
+		newinitd "${FILESDIR}"/init.d.timidity.4 timidity
+
+		systemd_dounit "${FILESDIR}"/timidity.service
+	fi
+
+	insinto /etc
+	newins "${FILESDIR}"/timidity.cfg-r1 timidity.cfg
+
+	dodir /usr/share/timidity
+	dosym ../../../etc/timidity.cfg /usr/share/timidity/timidity.cfg
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	doicon "${FILESDIR}"/timidity.xpm
+	newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
+
+	# Order of preference: gtk, X (Xaw), ncurses, slang
+	# Do not create menu item for terminal ones
+	local interface="-id"
+	local terminal="true"
+	local nodisplay="true"
+	if use gtk || use X; then
+		interface="-ia"
+		terminal="false"
+		nodisplay="false"
+		use gtk && interface="-ig"
+	elif use ncurses || use slang; then
+		local interface="-is"
+		use ncurses && interface="-in"
+	fi
+	sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
+		-e "s/Terminal=.*/Terminal=${terminal}/" \
+		-e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
+		-i "${ED}"/usr/share/applications/timidity.desktop || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "A timidity config file has been installed in /etc/timidity.cfg."
+	elog "Do not edit this file as it will interfere with the eselect timidity tool."
+	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
+
+	if use alsa; then
+		elog "An init script for the alsa timidity sequencer has been installed."
+		elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
+		elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
+	fi
+
+	if use sparc; then
+		elog "Only saving to wave file and ALSA soundback has been tested working."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	xdg_pkg_postrm
+}
diff --git a/media-sound/timidity++/timidity++-2.15.0.ebuild b/media-sound/timidity++/timidity++-2.15.0.ebuild
deleted file mode 100644
index fdf335c638f8..000000000000
--- a/media-sound/timidity++/timidity++-2.15.0.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop elisp-common systemd toolchain-funcs user xdg
-
-MY_PV=${PV/_/-}
-MY_P=TiMidity++-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
-HOMEPAGE="http://timidity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
-
-REQUIRED_USE="tk? ( X )"
-
-DEPEND="
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.5 )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	flac? ( media-libs/flac )
-	gtk? ( x11-libs/gtk+:2 )
-	jack? ( virtual/jack )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( >=media-libs/nas-1.4 )
-	ncurses? ( sys-libs/ncurses:0= )
-	slang? ( sys-libs/slang )
-	speex? ( media-libs/speex )
-	tk? ( dev-lang/tk:0= )
-	vorbis? ( media-libs/libvorbis )
-	X? (
-		media-libs/libpng:0=
-		x11-libs/libXaw
-		x11-libs/libXext
-	)
-"
-RDEPEND="${DEPEND}
-	app-eselect/eselect-timidity
-	alsa? ( media-sound/alsa-utils )
-	selinux? ( sec-policy/selinux-timidity )
-"
-
-PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	enewgroup audio 18 # Just make sure it exists
-	enewuser timidity -1 -1 /var/lib/timidity audio
-}
-
-DOCS=( AUTHORS ChangeLog NEWS README "${FILESDIR}"/timidity.cfg-r1 )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.14.0-params.patch
-	"${FILESDIR}"/${PN}-2.14.0-ar.patch
-	"${FILESDIR}"/${PN}-2.14.0-configure-flags.patch
-	"${FILESDIR}"/${PN}-2.15.0-pkg-config.patch
-	"${FILESDIR}"/${PN}-2.14.0-CVE-2017-1154{6,7}.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	export EXTRACFLAGS="${CFLAGS}" #385817
-
-	local audios
-	local myeconfargs=(
-		--localstatedir=/var/state/${PN}
-		--with-module-dir="${EPREFIX}/usr/share/timidity"
-		--with-lispdir="${SITELISP}/${PN}"
-		--with-elf
-		--enable-server
-		--enable-network
-		--enable-dynamic
-		--enable-vt100
-		--enable-spline=cubic
-		$(use_enable emacs)
-		$(use_enable slang)
-		$(use_enable ncurses)
-		$(use_with X x)
-		$(use_enable X spectrogram)
-		$(use_enable X wrd)
-		$(use_enable X xskin)
-		$(use_enable X xaw)
-		$(use_enable gtk)
-		$(use_enable tk tcltk)
-		$(use_enable motif)
-	)
-
-	use flac && audios+=",flac"
-	use speex && audios+=",speex"
-	use vorbis && audios+=",vorbis"
-	use oss && audios+=",oss"
-	use jack && audios+=",jack"
-	use ao && audios+=",ao"
-
-	if use nas; then
-		audios+=",nas"
-		myeconfargs+=(
-			--with-nas-library="/usr/$(get_libdir)/libaudio.so"
-			--with-x
-		)
-		use X || ewarn "Basic X11 support will be enabled because required by nas."
-	fi
-
-	if use alsa; then
-		audios+=",alsa"
-		myeconfargs+=(
-			--with-default-output=alsa
-			--enable-alsaseq
-		)
-	fi
-
-	if use motif; then
-		myeconfargs+=(
-			--with-x
-		)
-		use X || ewarn "Basic X11 support will be enabled because required by motif."
-	fi
-
-	# needs to come after all audios have been collected
-	myeconfargs+=(
-		--enable-audio=${audios}
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	# these are only for the ALSA sequencer mode
-	if use alsa; then
-		newconfd "${FILESDIR}"/conf.d.timidity.2 timidity
-		newinitd "${FILESDIR}"/init.d.timidity.4 timidity
-
-		systemd_dounit "${FILESDIR}"/timidity.service
-	fi
-
-	insinto /etc
-	newins "${FILESDIR}"/timidity.cfg-r1 timidity.cfg
-
-	dodir /usr/share/timidity
-	dosym ../../../etc/timidity.cfg /usr/share/timidity/timidity.cfg
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	diropts -o timidity -g nobody -m 0700
-	keepdir /var/lib/timidity
-
-	doicon "${FILESDIR}"/timidity.xpm
-	newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
-
-	# Order of preference: gtk, X (Xaw), ncurses, slang
-	# Do not create menu item for terminal ones
-	local interface="-id"
-	local terminal="true"
-	local nodisplay="true"
-	if use gtk || use X; then
-		interface="-ia"
-		terminal="false"
-		nodisplay="false"
-		use gtk && interface="-ig"
-	elif use ncurses || use slang; then
-		local interface="-is"
-		use ncurses && interface="-in"
-	fi
-	sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
-		-e "s/Terminal=.*/Terminal=${terminal}/" \
-		-e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
-		-i "${ED}"/usr/share/applications/timidity.desktop || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "A timidity config file has been installed in /etc/timidity.cfg."
-	elog "Do not edit this file as it will interfere with the eselect timidity tool."
-	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
-
-	if use alsa; then
-		elog "An init script for the alsa timidity sequencer has been installed."
-		elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
-		elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
-	fi
-
-	if use sparc; then
-		elog "Only saving to wave file and ALSA soundback has been tested working."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	xdg_pkg_postrm
-}
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 980bb1972c87..a9702e4400d8 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,4 +1,4 @@
 AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364ac191af87185e99d5ecaa951c125938b66d4f1928d3b13794e5f1be4446b0b8ee8eed1e2a0c92e25edc0582b38264 SHA512 fab914f078597e9c4ba4ffa289f559106d62354d5f97c0847855c08cd8a9a1bdfd9db3f74d9b3868e6150d39fadc4c2c8d51b4815bb6b19ccdbee1fb6ddf72e2
 DIST xwax-1.7.tar.gz 80745 BLAKE2B b431951651b66899b5bcceadfadc546c564123e47632aa9b395c26d706fc37cda4b5bf4f8695538e1a5e2bb0a690f125ca89705259d11df580f6a833e5d114b6 SHA512 ab0fcaf32f1fd1d6b38323095524f1932a067a3d04d40e4b043993e360411fed0c4b78bb71662581b438cb1e3005bc21659db4521a6ec704994b2e8e1b7e62d4
-EBUILD xwax-1.7.ebuild 1992 BLAKE2B 47073b5d08b53f0e3e7c430ad860692dea7dcda19cdff22925a2f0199f27a69b42774cffb158b248576bc9071bf7bf88ccc5f6536525eb30a85740cbb1c58ef3 SHA512 24430fb03f7185db5f3ac6b0d411c950af3870bb41f4c192e104066fce46a7f575287296fc4f932cf7ef0d519fd77dbb875e74c388ecb7df8e6692070f9b84c7
+EBUILD xwax-1.7-r1.ebuild 1977 BLAKE2B 1d54913f2c3e018371d8a4b2b5c9a19d5e9fd044e256b4fb8273666f66200ed6796c431a831c856b3aeb548c3b7e8b26a1118b77218f5c644eb487c2227af319 SHA512 c6c989d648d059aa011a031842c7d3a007b2d139a83165c5f82df7c960fe00c33a1e48bfad32bce549c4ff4c63e6f7853e79e1772696fdae91a219b679709dd9
 MISC metadata.xml 705 BLAKE2B 0c5c6a1538fbe0faef37eac4c62ac8e806041e1dc2883b4341981e75e8829da8af4588f371215794e40a452b7178a538489abd4a1b211233370b85cdded4d9eb SHA512 39e87e361947199009b2b9c0d722418d21181d330f503e9fae493c6b7300e5ef287b78a2ef609e3084719c51de57cfe536e7ae726eae257b967871422639c54c
diff --git a/media-sound/xwax/xwax-1.7-r1.ebuild b/media-sound/xwax/xwax-1.7-r1.ebuild
new file mode 100644
index 000000000000..ecde10ea92a6
--- /dev/null
+++ b/media-sound/xwax/xwax-1.7-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Digital vinyl emulation software"
+HOMEPAGE="https://xwax.org/"
+SRC_URI="https://xwax.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="alsa jack oss cdda mp3 +fallback"
+
+REQUIRED_USE="
+	|| ( cdda mp3 fallback )
+	|| ( alsa jack oss )
+"
+
+DEPEND="
+	media-fonts/dejavu
+	media-libs/libsdl
+	media-libs/sdl-ttf
+	sys-libs/glibc
+	sys-libs/pam
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( media-sound/cdparanoia )
+	fallback? ( media-video/ffmpeg )
+	jack? ( virtual/jack )
+	mp3? ( media-sound/mpg123 )
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/xwax
+"
+
+DOCS=( README CHANGES )
+
+src_prepare() {
+	default
+	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
+	# the Makefile
+	# Also remove the dependency on the .version target so we don't need
+	# git just to build
+	sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \
+		-e 's/^xwax\.o:.*\.version//' \
+		Makefile || die "sed failed"
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		--prefix "${EPREFIX}/usr" \
+		$(use_enable alsa) \
+		$(use_enable jack) \
+		$(use_enable oss)
+}
+
+src_compile() {
+	# EXECDIR is the default directory in which xwax will look for
+	# the 'xwax-import' and 'xwax-scan' scripts
+	emake EXECDIR="\$(BINDIR)" VERSION="${PV}" xwax
+}
+
+src_install() {
+	# This is easier than setting all the environment variables
+	# needed, running the sed script required to get the man directory
+	# correct, and removing the GPL-2 after a 'make install' run
+	dobin xwax
+	newbin scan xwax-scan
+	newbin import xwax-import
+	doman xwax.1
+
+	dodoc ${DOCS}
+
+	insinto "/etc/security/limits.d"
+	newins "${FILESDIR}/xwax-etc-security-limits.conf" xwax.conf
+}
+
+pkg_postinst() {
+	elog "Be sure to add any users that will be using ${PN} to the"
+	elog "\"${PN}\" group. Doing so will allow processes that user"
+	elog "runs to request realtime priority."
+}
diff --git a/media-sound/xwax/xwax-1.7.ebuild b/media-sound/xwax/xwax-1.7.ebuild
deleted file mode 100644
index 20b519759a8b..000000000000
--- a/media-sound/xwax/xwax-1.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs user
-
-DESCRIPTION="Digital vinyl emulation software"
-HOMEPAGE="https://xwax.org/"
-SRC_URI="https://xwax.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa jack oss cdda mp3 +fallback"
-
-REQUIRED_USE="|| ( cdda mp3 fallback )
-	|| ( alsa jack oss )"
-
-DEPEND="
-	media-fonts/dejavu
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	sys-libs/glibc
-	sys-libs/pam
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( media-sound/cdparanoia )
-	fallback? ( media-video/ffmpeg )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/mpg123 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README CHANGES )
-
-src_prepare() {
-	default
-	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
-	# the Makefile
-	# Also remove the dependency on the .version target so we don't need
-	# git just to build
-	sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \
-		-e 's/^xwax\.o:.*\.version//' \
-		Makefile || die "sed failed"
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		--prefix "${EROOT}/usr" \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable oss)
-}
-
-src_compile() {
-	# EXECDIR is the default directory in which xwax will look for
-	# the 'xwax-import' and 'xwax-scan' scripts
-	emake EXECDIR="\$(BINDIR)" VERSION="${PV}" xwax
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-}
-
-src_install() {
-	# This is easier than setting all the environment variables
-	# needed, running the sed script required to get the man directory
-	# correct, and removing the GPL-2 after a 'make install' run
-	dobin xwax
-	newbin scan xwax-scan
-	newbin import xwax-import
-	doman xwax.1
-
-	dodoc ${DOCS}
-
-	insinto "/etc/security/limits.d"
-	newins "${FILESDIR}/xwax-etc-security-limits.conf" xwax.conf
-}
-
-pkg_postinst() {
-	elog "Be sure to add any users that will be using ${PN} to the"
-	elog "\"${PN}\" group. Doing so will allow processes that user"
-	elog "runs to request realtime priority."
-}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 3c55bcc88965..12d29aaeff8a 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 1faba8d5a84b..dccfeb863165 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -1,15 +1,13 @@
 AUX 80plexmediaserver 191 BLAKE2B 74f870eb772efcee47eab654732cae69b3e3991b66ebbbdd241dc1272cf90d536d2309f10053878d1f904dcf77afea238133be06a66c9a0541e94d18fa669e1b SHA512 55fb0ab1d95ae5af385e9b22f275a8854034db27cadd87e5fe20f6b5580180195715773c08281d42a2aae5466f55c85f8294d9cdd30da9d134e7ad6b08e26bb5
-AUX README.gentoo 603 BLAKE2B 01a0be613587c682077b480dfce7f7f95cb48ed0ee8ca7ea789cf0814f7485b769131a16627bd68ce330810478e52b0d0931e0ee8325c10c369daea3ca47f525 SHA512 fa811d3555c267fc895e783fdb54ccdc13cceb9dccfdd3a69a00871f4cc75ab647aa097fb3a8547f5322c076fd8cde7d8f14e893c8a8968922ce1cd3f883e0a1
+AUX README.gentoo 581 BLAKE2B f11001e1ab9e905701e536cd2d6c9075571948ec8ea9e045cb50b449e2ba15a15598d9e4f0ecd63317af0d0d35a08b72b2cc887c56376256cb6411c485498587 SHA512 a029ea093893585ef0f57e1f1fccebe06eb12494b8f7aa5bf9d1525862ab9fbf7e39e828e8288c28eecfeb0a81c317d385edbd9bd028a1eabb9cd4d35c6fa538
 AUX plex-media-server.conf.d 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe02a12c3ee986c1078ae0a46d974adc25dce252a49c3fd72e0dfe1ba65c49d575e12036fba44ce9b0390da64ec SHA512 d3d68fa58a1c1064803a9607708123302890571e823e5bc26de741bb15bd51db19234636672ff01757cbbcdb984c60663545689fa915761c78c3cf49e6da0f95
 AUX plex-media-server.init.d 380 BLAKE2B 03d5737128390c13d914a94e8d861cf24abed92b2a5c672e72cd7dad8ed9a71ba7bccc28f06acaf5920be7d0b809746b6a8f4daffef4594830cf8ad5f071a2f5 SHA512 44ddd5a046851f77f550ff9f0bf158a3bce465101b5fdbd31b68ed64dc6c8e823f70c05b833f97101b4608256422ff4aa026114fac17f9e6e3670602ed9ef816
+AUX plexmediaserver 89 BLAKE2B c7866fce849e6ce2a15ec5a1550146072aa62d278ee47bf2ca70327babf5877750c0749d879e51bacc05ddd242d8a46c808665b9f299cee999dfa2d243ced073 SHA512 798a1736133339865aa1ffc6074720e84b28f3e3298c044019ec4959ba724f7a96dcbfcac29f1f39252cadb2a863a500423027970e5f2699e806bc4d532d9974
 AUX start_pms 1768 BLAKE2B c111f268535f03f1763c9a2f16ccc4a317f9540721a1c89e33306d6ad6d6ee34673d6a13326923c2fa399d1a3f7ad3e26c89d097de8f977a9ad7973c99dff811 SHA512 8c672a9de6f20c968869fb2bd643bdfe6d3e7ca6d89dfddfd5d7a4bc425a34e1b30ba711a0f0afd79df428df4151a59f18880cff7e0ef12df146421f299858c5
-DIST plexmediaserver_1.23.1.4602-280ab6053_amd64.deb 81613502 BLAKE2B 59f3bc54e8436bb35983cc7b77c252c88d5ccc26325203edcbaf7ef2428dbe465e0db8bb0b24472f7f7b07b25b23d23e240903243d8dcd7983edd4cda62906b3 SHA512 e269066a10794d63cf9912df3e66b92874701a8263f2806f42d0abe9484bd347284e2bacb3ba2f6825e1489be164f0b2abe6d23021737b37be918a9b356c1301
-DIST plexmediaserver_1.23.1.4602-280ab6053_i386.deb 75020714 BLAKE2B 12c8057592f734969c9d4a3ea245c2b725fe16433260214c1e18d0b192151b51c61d55bde7b40015727b1775a21fe965960165b8cc6f039a138f521f95f34cb3 SHA512 afd569e0cfd665b81e422b925e623b910d29b99e77dbfe2ff2333497f63fb69adf851562c887a9bd8ff216f37b18397cad673547a41d8fdba611d9a6bd7254e2
-DIST plexmediaserver_1.23.2.4625-a83d2d0f9_amd64.deb 81773538 BLAKE2B 7b22cdd4662f37c4138bd5edc74a5471e7d31c89465ce25a428e7963fc10e5dc07c154812b51c1c17d725175f093c7e22560acde8b00ee3b5d6a724441af2729 SHA512 632497e596542fc11cd2b9ec6dd9d7403800f26473811fbd5c75d73aa1abde08b881005f1c51663afe190ce95b6d02900272f2024bbcce02f6b952efe498430d
-DIST plexmediaserver_1.23.2.4625-a83d2d0f9_i386.deb 75148422 BLAKE2B 1758529c97b3f743df44321074f95f85ce7003fd9d92e4a849776e9f24bf6034de6e90c123db9c36c8732cffbc65089f6db20fba8ffffac1b6bce238b1595b04 SHA512 0e727d96bc147d7c4457f91c8309e1937bbee49a1599ff376959fb25cdc62fa3df1ae09880cc6ada7d8dfa4cbadccce24c35ad3bd41143f086ea1a0861e010f0
 DIST plexmediaserver_1.23.3.4707-ebb5fe9f3_amd64.deb 81474702 BLAKE2B 8e12a9c39bea8f44e6fa4fa495556cafc9865682b27c64b06072470367d7e9a64eca3147197ddef0b277fbd28970f85b388fc812f3532890d45506c49432324e SHA512 c30e19e1895eeaa699effb1d3d282fbf1f3657aff2d41af61f30f398fc501bac12e8d178abc12c818f52c52c0bc1bf803ad74985521e37f5db6baf60ecc959ab
 DIST plexmediaserver_1.23.3.4707-ebb5fe9f3_i386.deb 74842010 BLAKE2B 36967187241afdd7294ac46e03b5f55c1b22f5f7e2ba974ea322a369c41768cd6b7fd44d82ebf0afae1a98f5178161740e1d40d5f2c17faffa5b4ccb1d811eed SHA512 4625ea0b195fad305679656728c98ba8b15b38b86cbc9a95fbc6b617fb45e7e41b24f2c1ef2bc9736207d888c295d4e423a3d00fe654036ca1865782d88790ac
-EBUILD plex-media-server-1.23.1.4602.ebuild 1963 BLAKE2B d6848a06ff1b0ae8b549612c4134de017945171bca8d0095e88c9e4290163f2bbbe75dc3519ff03020b9aaa5006264f89b6b0af356ef343791c2526a11f81a2d SHA512 e182f5a1da3ea94d2733e018f96bf4dd67382360e165ce389e0d81404e3666296f211a4f9f4cad803d1abdbef3573e170cb8f7bef07ed0859ee931d800f62942
-EBUILD plex-media-server-1.23.2.4625.ebuild 1963 BLAKE2B 89de95b39c64d16d67c2b897bf929dfddcff233c737536025c8c5002686d5ba85c7ed2d84ce3978d0bd7a752480d014013e5569af9413199c6573bf5710f37ea SHA512 859a487b1155caec0fd022b358cea338ec18c5b9e44c69dfa6fe82802c9362acfb6023203dac3912d936f2ea3702a27e45ff2273d66e3fceaa5b5eca06d85ba7
+DIST plexmediaserver_1.23.4.4805-186bae04e_amd64.deb 81419308 BLAKE2B df205474d640a6e6403e8c33f507a52bf2b1f5fd5352285e71357e0640a3e1ab644b0ed8e7ce2d01c30a4a657fab9601e4bf169bb520567550b0b182b988a1f3 SHA512 6e8febdfe7d3dbd7d00c76b5f8e10a72ec6fe5744602101adca4ea127147b6a0681f5207f1805b621bd9107ae0b15f8286b2e9e0ed96838378f29d888af52fd8
+DIST plexmediaserver_1.23.4.4805-186bae04e_i386.deb 74764294 BLAKE2B c4f1b978acd84d30d1685065e7eab7a87dec5c03d448c9d2ef378c57ed4f2dc9067379279cd97815e58a86690406fc8646be2f9bbdd552288782c14750ee1799 SHA512 55ed319e0a5e2290157cc800967ae26f80dcfa3c8476c0fb770a13069096ef8d88d9dd24cd8b7619828e5f2f17ac2ab2ca4ac0c748843e9af61866d4c60a45fd
 EBUILD plex-media-server-1.23.3.4707.ebuild 1963 BLAKE2B b439267e8fb2d96f4079be0b4c20906fda429f2397e230d0f84ccce9e03e8c6af19727641d4be68dae9f42462b7c76a32630ec27915648591e333f87bcbbb98d SHA512 50d7f39404a164399bf6514fd311c6aeff66ba4d5a181abf1bb61cd770fe1bac97f89746ae614e2f3a85a735b7fb6ba8c1c39c2a7d553ae2477240837555948e
+EBUILD plex-media-server-1.23.4.4805.ebuild 1897 BLAKE2B 63ce0a48bf86ba1d5f4872ec3185d16eaa99253947e658fc82d9124eae6622592330409e8efc1a447088ce8e1b3d527022e4dca59f66e6348fc69c1912039553 SHA512 af3741ea319bf7f2cf2e661f1c8f435ae667dcd09a5f2967bd28b2a46c1d29cf73d05ccf4c66a6180379889572fcb2bba3e66a1b868f788f8ee44b3a392c41ac
 MISC metadata.xml 746 BLAKE2B 32ddcdfc95a50cd336dec02a232ed50eeeca7d74d410cd327068da50fa55ac2090338854cff3fbc1da5c5c7027f0114db9c007cdb4ffc4426bf69ee8a5bdba59 SHA512 0f95894ecb5a28aaa0254435ad9b29552623e33340a23358ed3287c8e23d6a98e3cde838916f279970990ccc0113bd662a0c9d32259be3a50fec70fcd1ae2530
diff --git a/media-tv/plex-media-server/files/README.gentoo b/media-tv/plex-media-server/files/README.gentoo
index ec4445ac397d..db988e30fe06 100644
--- a/media-tv/plex-media-server/files/README.gentoo
+++ b/media-tv/plex-media-server/files/README.gentoo
@@ -1,7 +1,8 @@
 Plex Media Server is now installed. Please check the configuration file.
 It can be found in /etc/plex/plexmediaserver to verify the default settings.
-Adjust thread counts and memory usage limits in /usr/sbin/start_pms for best
-performance. To start the Plex Server, run 'rc-config start plex-media-server'
+Adjust thread counts and memory usage limits for best performance.
+
+To start the Plex Server, run 'rc-config start plex-media-server'
 You will then be able to access your library at http://localhost:32400/manage
 
 If installing on a remote host you will need to use a ssh tunnel eg,
diff --git a/media-tv/plex-media-server/files/plexmediaserver b/media-tv/plex-media-server/files/plexmediaserver
new file mode 100644
index 000000000000..d1981dc1c6f4
--- /dev/null
+++ b/media-tv/plex-media-server/files/plexmediaserver
@@ -0,0 +1,2 @@
+export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=4
+export PLEX_MEDIA_SERVER_MAX_STACK_SIZE=3000
diff --git a/media-tv/plex-media-server/plex-media-server-1.23.1.4602.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.1.4602.ebuild
deleted file mode 100644
index 3c08b6b51bf1..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.23.1.4602.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 systemd unpacker
-
-MY_PV="${PV}-280ab6053"
-MY_URI="https://downloads.plex.tv/plex-media-server-new"
-
-DESCRIPTION="Free media library that is intended for use with a plex client"
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="
-	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
-	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )"
-S="${WORKDIR}"
-
-LICENSE="Plex"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="system-openssl"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	acct-group/plex
-	acct-user/plex"
-RDEPEND="
-	${DEPEND}
-	system-openssl? ( dev-libs/openssl:0/1.1 )"
-
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/plexmediaserver/lib/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
-)
-
-src_install() {
-	# Remove Debian specific files
-	rm -r "usr/share/doc" || die
-
-	# Remove shipped openssl library
-	if use system-openssl; then
-		rm usr/lib/plexmediaserver/lib/libssl.so.1.1 || die
-	fi
-
-	# Add startup wrapper
-	dosbin "${FILESDIR}/start_pms"
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Make sure the logging directory is created
-	keepdir /var/log/pms
-	fowners plex:plex /var/log/pms
-
-	keepdir /var/lib/plexmediaserver
-	fowners plex:plex /var/lib/plexmediaserver
-
-	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-
-	systemd_dounit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service
-	keepdir /var/lib/plexmediaserver
-
-	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
-	# so it doesn't try to rebuild libraries that can't be rebuilt.
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/80plexmediaserver
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.23.2.4625.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.2.4625.ebuild
deleted file mode 100644
index 92b87a68f4e0..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.23.2.4625.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 systemd unpacker
-
-MY_PV="${PV}-a83d2d0f9"
-MY_URI="https://downloads.plex.tv/plex-media-server-new"
-
-DESCRIPTION="Free media library that is intended for use with a plex client"
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="
-	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
-	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )"
-S="${WORKDIR}"
-
-LICENSE="Plex"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="system-openssl"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	acct-group/plex
-	acct-user/plex"
-RDEPEND="
-	${DEPEND}
-	system-openssl? ( dev-libs/openssl:0/1.1 )"
-
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/plexmediaserver/lib/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
-)
-
-src_install() {
-	# Remove Debian specific files
-	rm -r "usr/share/doc" || die
-
-	# Remove shipped openssl library
-	if use system-openssl; then
-		rm usr/lib/plexmediaserver/lib/libssl.so.1.1 || die
-	fi
-
-	# Add startup wrapper
-	dosbin "${FILESDIR}/start_pms"
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Make sure the logging directory is created
-	keepdir /var/log/pms
-	fowners plex:plex /var/log/pms
-
-	keepdir /var/lib/plexmediaserver
-	fowners plex:plex /var/lib/plexmediaserver
-
-	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-
-	systemd_dounit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service
-	keepdir /var/lib/plexmediaserver
-
-	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
-	# so it doesn't try to rebuild libraries that can't be rebuilt.
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/80plexmediaserver
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.23.4.4805.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.4.4805.ebuild
new file mode 100644
index 000000000000..6a97c242b504
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.23.4.4805.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 systemd unpacker
+
+MY_PV="${PV}-186bae04e"
+MY_URI="https://downloads.plex.tv/plex-media-server-new"
+
+DESCRIPTION="Free media library that is intended for use with a plex client"
+HOMEPAGE="https://www.plex.tv/"
+SRC_URI="
+	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
+	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )"
+S="${WORKDIR}"
+
+LICENSE="Plex"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="mirror bindist"
+
+DEPEND="
+	acct-group/plex
+	acct-user/plex"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/plexmediaserver/lib/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
+)
+
+src_install() {
+	# Remove Debian specific files
+	rm -r "usr/share/doc" || die
+
+	# Add startup wrapper
+	dosbin "${FILESDIR}/start_pms"
+
+	# Add user config file
+	mkdir -p "${ED}/etc/default" || die
+	cp "${FILESDIR}/plexmediaserver" "${ED}/etc/default/" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}" || die
+
+	# Make sure the logging directory is created
+	keepdir /var/log/pms
+	fowners plex:plex /var/log/pms
+
+	keepdir /var/lib/plexmediaserver
+	fowners plex:plex /var/lib/plexmediaserver
+
+	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
+
+	systemd_dounit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service
+	keepdir /var/lib/plexmediaserver
+
+	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+	# so it doesn't try to rebuild libraries that can't be rebuilt.
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/80plexmediaserver
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index dd95c459fbdf..da17c265deff 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 5bb8c8fa7472..967efe50d9cd 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,5 +1,4 @@
 AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb531df3f9b3e64aa17a2a3d03cf9d71577ba1961961d3d058dfa383ef3bb5215eba8a2c84231531b35f1a331850070ae0bcc5b5fa1586c67 SHA512 044b0cb7d9302f74e1ef92e37162135b8ac76d96bf7d647c269ef19b5cf2a8771ce0cc76cbc8817b2480cc3e40af6bafd717888a3982b3e679d831519aad4e64
-AUX handbrake-1.3.2-x265-link.patch 585 BLAKE2B aa46591f144e787212194e937ea594f29b55cac79c7bb659010775c09a4c5e1d9b1345047b377a6bfc0db5ee17e57a41670ad72373f0d01d390cf21b1d2c10b4 SHA512 ea13eab2a080f1d0080247f5a25cb09e2d495077caddd2ad3ce473f79d7bc611795dd1e13847cd982b0a19eddfddc96dbdd3deae8928bb9597d1a6627f17396a
 AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6e884637c8dc9a900774db9db07d1c0686a1b5c2db9276ca1c14612615e3974a7f9b05cb48c23f8f30ed0851238b92c32 SHA512 a74a2d20972a01b89dbfd7b81c070608d57e646de2ce63d9ae2d2e1486d31ca63e96d5ec803052b52e68bee157d5a1882914e0009ae480d1f8192031d79852eb
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
diff --git a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
deleted file mode 100644
index 589a204cc195..000000000000
--- a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/test/module.defs b/test/module.defs
---- a/test/module.defs	2020-05-23 17:23:21.912103481 +0200
-+++ b/test/module.defs	2020-05-23 17:23:36.106103799 +0200
-@@ -16,7 +16,7 @@
- TEST.GCC.l = \
-         ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
-         dvdread fribidi \
--        swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
-+        swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
-         bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
- 
- ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index 8bb9284a4aee..eee6bcf9b434 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -3,4 +3,5 @@ AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2
 AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474
 DIST unifi-video.Ubuntu18.04_amd64.v3.10.13.deb 178800688 BLAKE2B b35f91e77514fcf0165298473be503f6d977cb9f8f53e88f5bb700a2c76a3636e2f475c93c395eab6af4a215074521e47e1dc2d868695c1de83968b64e157cc8 SHA512 58d03b1004ba6da58b52c20720137639167647539c135c71c6abb36b80e37c4f33f0d0ae4092f98858bed8fcb4a3c9f05cc2a0a25e96fee957da176b9b6801d2
 EBUILD unifi-video-3.10.13-r2.ebuild 1965 BLAKE2B 21f735f65e95f3d0f0169a7be009d43b9a1525318faa50d9639264bba9c23a119a3bedc255a1bc7881dc94cad9346decb3acdf473732ab87ffe75caa31d8dcb6 SHA512 5c0d9af2a50cdbf82029e1b6aefad026779592828ca99a1223b1602886b078bcf383197f4a1299d7ebffbbd74b67abcbac93f911a73170cd3ec112ec85e48b32
+EBUILD unifi-video-3.10.13-r3.ebuild 1965 BLAKE2B fc71df9184fea92ec66910f36815bcffffc4869d52eb112ff56806942dc442dedfd1097c5983f669f424ccbec9f0cf3bce44bd67c3f57ba41939fc6e1b7f7d2f SHA512 d174900c49e91eed75d41526d63f36c3a055087ec1b1b042a90ed63c2a7a3b7d651a0a755a9d73489da375db3bff9b95b13d33e7abde29463d42c73bc9a3d23a
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild
new file mode 100644
index 000000000000..a86ef7450ebd
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PV="${PV/_beta/-beta.}"
+DESCRIPTION="UniFi Video Server"
+HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
+SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND="acct-group/unifi-video
+	acct-user/unifi-video"
+RDEPEND="${DEPEND}
+	dev-db/mongodb
+	dev-java/commons-daemon
+	sys-apps/lsb-release
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/jre:1.8"
+
+S=${WORKDIR}
+QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}"/data.tar.gz
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/commons-daemon-move.patch
+	sed -i usr/sbin/${PN} \
+		-e '/require_root$/d' \
+		-e '/update_limits$/d' \
+		-e '/ulimit/d' \
+		-e '/coredump_filter/d' || die
+	default
+}
+
+src_install() {
+	export CODEPATH=/usr/lib/${PN}
+	export DATAPATH=/var/lib/${PN}
+	LOGPATH=${DATAPATH}/logs
+	VARLOGPATH=/var/log/${PN}
+
+	insinto /usr/lib
+	doins -r .${CODEPATH}
+	into /usr
+	dosbin usr/sbin/unifi-video
+
+	dodir ${LOGPATH}
+	fowners -R ${PN}:${PN} ${DATAPATH}
+	dosym ${LOGPATH} ${VARLOGPATH}
+	dosym ${LOGPATH} ${CODEPATH}/logs
+
+	dosym ${DATAPATH} ${CODEPATH}/data
+
+	fperms 500 ${CODEPATH}/bin/ubnt.avtool
+	fperms 500 ${CODEPATH}/bin/evostreamms
+	fperms 500 /usr/sbin/${PN}
+	fowners -R ${PN}:${PN} ${CODEPATH}
+	fperms -R 0400 ${CODEPATH}/lib/
+	fperms 500 ${CODEPATH}/lib/
+
+	echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	dosym ../../../bin/mongod ${CODEPATH}/bin/mongod
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	if [[ ! -f ${DATAPATH}/system.properties ]]; then
+		cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
+		echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
+	fi
+}
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 1967d03031d2..df5b5552297e 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -33,5 +33,5 @@ EBUILD vdr-2.2.0-r6.ebuild 8168 BLAKE2B 4965d23936592348a37cdba6c6b89e0f651780b3
 EBUILD vdr-2.2.0-r7.ebuild 8210 BLAKE2B 004d8448d54dfe58ca1e83d6e1cfd9b84a22e8b0bb837900eba90666d55d4aae91e2e2d55095ab68665af104f52010b10268f5f730f451cedb54570d0271f8e9 SHA512 ca05beee04a50a8af95e4a990050c3430ac5a5829d4162e9c35f29bfd14deff2aa70e6ce6fcee10ceb506c48eca6a5bc15c418894e6d23ad5fb9d58da594e638
 EBUILD vdr-2.4.1-r3.ebuild 6090 BLAKE2B 5fa4d91be87dbd1edd93eced6f6f2c8916777fe8ded5472e15b0ec9ef19f817646eb82261965b7a2757887821e1282c7513c4aa06ca67f7825009a8f7f664368 SHA512 5b38708119e60fd4d87c8640952b16532c2df18b8541c64395e4c953ecf553631e85539b21c458f83eb4511be243d25486ebb21e85ad1fee6e153c12e3d687f8
 EBUILD vdr-2.4.6-r1.ebuild 5997 BLAKE2B 503afbd4a766bd4b050f05e74fe9ee9cef98718077eae7b34478e413d93ecdd97721813d6551ea4367a9c8eea9776bbfacd627ae110349fa7b1d4e7688d6ff9d SHA512 eaf2e9d0e2dd6c67b44d124261737fd4ba4ffcfe33550e951c93fae350b443556fc47ff5ddd343aeeda83fe890ea5f12a1eb6987505dd3af028929637c63f09f
-EBUILD vdr-2.4.7-r1.ebuild 6171 BLAKE2B 7d0bd4f3d09e2f531b250af3a882fee46bd93d2883fd7464f38daa39d441e3fa0c7f7b642b6ee08020da076e3047b31203c8d3ea9d1fec1b0466bbbd69074a9b SHA512 a5bb20d7b4e606ed2728e10657c20bbf02828f15144715cfdffc182169dfc7a8bc1fe3347da2692c7ed4d53327a5690f77778dcb3abe25f6a7f36a105a6ad3d7
+EBUILD vdr-2.4.7-r1.ebuild 6169 BLAKE2B 006d0156bebd83ad5200e0f6587e3252d85fc0818203915c5af3d27e0f3e0b5f99cf272f11f855a344535be6dc4cc8a121a424369fda6bf5cb941a295e48642d SHA512 702c24d7dfda3d4664432ae93b5bfcc063093fb9e5fca2b2f8fd26f1daf8283a9a1dde0028d6a23ba97acf4a5cb3576c4234d7461e9e17c379bdcc8bdb5f4192
 MISC metadata.xml 1892 BLAKE2B 2a233ceb745f8df9350e37d99d8dce2cc56d3c21e0d187de483a2d2d18c0129a047d48cf7cddff7ea2500ae044d1eb196efb508cce0424368e03bbddb75c6d82 SHA512 dba266e22f0d99b98284db088beaf4fbd288cb8eee046a5f96610ed6cd748a116a3ced7ce74c69660d9943a7f7ccc016ba8a242174780275334b95a1ad4489c7
diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild b/media-video/vdr/vdr-2.4.7-r1.ebuild
index a0e8811b5dbf..0e8eed4d4ee5 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.7-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 8b8063f4c059..00e566269885 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 80697622a60d..598a38ee3e84 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 12 Jul 2021 07:08:55 +0000
+Sat, 17 Jul 2021 17:39:07 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 29379dfcc71a..dae4120315e4 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 513815 BLAKE2B c9341c70c451176624067442c934e00b2746cd12e3817b856dc0f8fd8c41edcf12efea2ca7042e862fd64a6f5fc4c391e4bdeab74017bbb63dda51c5ff0fcf2a SHA512 6745132a386e572818d7fd992a7f2ef031ba828e3e48360c5a4f3b3160c32f4e65e615769109aebc74bb29d44c91864e25ff06783231a9b67785a728877e9e1d
-TIMESTAMP 2021-07-12T07:09:00Z
+MANIFEST Manifest.files.gz 515403 BLAKE2B 2c3efe7a5a7d2ab8e90e9b1bd7118eceae943d57d96054bc9b9f1f28ce3625d956a0ef4b37dc99a8f53983d4cb1c230b5d63cdaf2310372c379209c8703ec67f SHA512 3314ee13046d68813f7a4f6d648d5b31496fb976d5d8456229403081e0e0f9369fa83c271c4d6eb3dbe296b3a72758271782ca5d805b74a5deaa07e14742bafb
+TIMESTAMP 2021-07-17T17:39:10Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDr6oxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDzFb5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBPRQ/9EcSbkFNNsrrJbsDGdKEnzgbOn+Wr9RNajghqM1MAYNkZ1LnBYt4UDc6S
-KJOM9kbrtVXvyBu88jpIabBJG3NuPhvB/mpQnzPxkux6bO6q1da+h2DMf5hgNL+N
-Er5r3FI1WWHIJ7ECLej2jowXcuyTHSQOpWoSXm9X8uMhBMHDYygf2EB7yinxfxa4
-ZoJwm9FJn7SX+YhQpS4aZSQ3cVSHEe1hF59HWGcj5Dz5g93/pJwxl+EolQvtsHPE
-zX/CybqINK4RPouccjZJPyGVcuwCVuaWc2vTlQullbKq0RwkAJgn9oFRYCxxZgTN
-IT9YbBsB5i2Bwfj9/l/NVJYQ3BMzkicpoJoSTTYsKXBX+PZJeUxo+ozfqOrbEZmq
-aE0Ag3k/fTVaabjFqUm4sJD+F3FR06nT0SsSUMJCC5zotqgiuyYOGJJ9ew7ywQEr
-gSmVsUbWS0PC+PaldHuLAAuPe8S4lfsssLQsOe9q35rmjuxGO3Y1di/AEt028eJt
-HL321clXyXE95Px+5pd7cDRfKv+Z6pre907zAuzMzbmzg81iZuAectOmCNgC4yqT
-80/VqQZSYpsURIFyBIFBUeGIyp9pk5YP3KOk8OPMMOk6mmhHW3pDW424VWPjVtfO
-GMg46I5+78fC5BhkBNu5geidmyh8xuTz91VD7MB26WBMEtaVzcI=
-=UXqP
+klDTaRAAiEapxlJpnLp5i442vw3FGhXvzblQCEiX/58EfEx0FZ/OsnvkGWhC55p5
+7SUCZNE0doIskdzXItmenbaWy+BBmzWtqMTSkt3mMDddxt9ElaU1LWlr9XefH/BM
+sjlwAJfeJndyw60i7JMTETTjX3scBM+Z9wP8n0uyuiLFQQ0kNM8DrwxyKOlEV5Fy
+xQv9DieSnnPaMiQZ+yLuZQM4lpiwTEToGjs9MgC2d032AL9G1TiZFFjFYRcaJWKS
+mhZeGUHUI81VYa93a7yeHCYC6fE19S0bsg+KPccyMYcxa4e3UwebT+zNPWQHA50c
+89YLMVAGTIgR7qweUzfgDOM2M5Si1Rj1gtq442Hg78p+uoE9gdKicAxyW9qiMBBs
+LkgD5HMM6+x/x2VwdNHszYPfbKKJX5Av52KSLqy2hX8fHZAvSIIogxQftr2SJqsU
+/OIZKqzgksB/masJn6BdDGrE/EyeyoQxSeXTgfHrytOzWaZkTnnSZmoF2aLEQf5y
+H6gB7PyCQgCw5rtPc/eyl0Zhu1FXwq9soK4a6BJW0WCQHL0AWdM/xR7P7ZTJKc2e
+haCmlIBwxbWtk1656Zm/JcEgOvsgkYrH+g8RBtD3UtMgOWpXS+TSM1HEslM6rgkL
+1hFP5bztPPwgcs0vHkwVy9bm0y9t4vgCDibxJ/1M94WlFvUHG14=
+=jtEe
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 2302cd653bc1..0db27d5d926b 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-202107-18.xml b/metadata/glsa/glsa-202107-18.xml
index f05d598c50b4..2b65f114639a 100644
--- a/metadata/glsa/glsa-202107-18.xml
+++ b/metadata/glsa/glsa-202107-18.xml
@@ -32,7 +32,7 @@
   </workaround>
   <resolution>
     <p>Gentoo has discontinued support for BladeEnc. We recommend that users
-      unmerge ssvnc:
+      unmerge it:
     </p>
     
     <code>
diff --git a/metadata/glsa/glsa-202107-31.xml b/metadata/glsa/glsa-202107-31.xml
new file mode 100644
index 000000000000..77846b9839bb
--- /dev/null
+++ b/metadata/glsa/glsa-202107-31.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-31">
+  <title>polkit: Privilege escalation</title>
+  <synopsis>A vulnerability in polkit could lead to local root privilege
+    escalation.
+  </synopsis>
+  <product type="ebuild">polkit</product>
+  <announced>2021-07-13</announced>
+  <revised count="1">2021-07-13</revised>
+  <bug>794052</bug>
+  <access>local</access>
+  <affected>
+    <package name="sys-auth/polkit" auto="yes" arch="*">
+      <unaffected range="ge">0.119</unaffected>
+      <vulnerable range="lt">0.119</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>polkit is a toolkit for managing policies related to unprivileged
+      processes communicating with privileged process.
+    </p>
+  </background>
+  <description>
+    <p>The function polkit_system_bus_name_get_creds_sync() was called without
+      checking for error, and as such temporarily treats the authentication
+      request as coming from root.
+    </p>
+  </description>
+  <impact type="high">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All polkit users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=sys-auth/polkit-0.119"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3560">CVE-2021-3560</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-13T00:16:39Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-13T02:29:59Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-32.xml b/metadata/glsa/glsa-202107-32.xml
new file mode 100644
index 000000000000..1471ab62487f
--- /dev/null
+++ b/metadata/glsa/glsa-202107-32.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-32">
+  <title>Apache Thrift: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Apache Thrift, the
+    worst of which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">thrift</product>
+  <announced>2021-07-14</announced>
+  <revised count="1">2021-07-14</revised>
+  <bug>761409</bug>
+  <bug>770145</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-python/thrift" auto="yes" arch="*">
+      <unaffected range="ge">0.14.1</unaffected>
+      <vulnerable range="lt">0.14.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Apache Thrift is a software framework that combines a software stack
+      with a code generation engine to build services that work efficiently and
+      seamlessly between many languages.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Apache Thrift. Please
+      review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="low">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Apache Thrift users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-python/thrift-0.14.1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-0205">CVE-2019-0205</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-0210">CVE-2019-0210</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-13949">CVE-2020-13949</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-08T01:05:35Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-14T03:10:06Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-33.xml b/metadata/glsa/glsa-202107-33.xml
new file mode 100644
index 000000000000..ab54702ebb12
--- /dev/null
+++ b/metadata/glsa/glsa-202107-33.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-33">
+  <title>Pillow: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Pillow, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">pillow</product>
+  <announced>2021-07-14</announced>
+  <revised count="1">2021-07-14</revised>
+  <bug>773559</bug>
+  <bug>774387</bug>
+  <bug>779760</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-python/pillow" auto="yes" arch="*">
+      <unaffected range="ge">8.2.0</unaffected>
+      <vulnerable range="lt">8.2.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Python Imaging Library (fork)</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Pillow. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Pillow users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-python/pillow-8.2.0"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-25287">CVE-2021-25287</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-25288">CVE-2021-25288</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-25289">CVE-2021-25289</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-25290">CVE-2021-25290</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-25291">CVE-2021-25291</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-25292">CVE-2021-25292</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-25293">CVE-2021-25293</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-27921">CVE-2021-27921</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-27922">CVE-2021-27922</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-27923">CVE-2021-27923</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-28675">CVE-2021-28675</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-28676">CVE-2021-28676</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-28677">CVE-2021-28677</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-28678">CVE-2021-28678</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-13T01:09:21Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-14T03:15:19Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-34.xml b/metadata/glsa/glsa-202107-34.xml
new file mode 100644
index 000000000000..45507b800ec2
--- /dev/null
+++ b/metadata/glsa/glsa-202107-34.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-34">
+  <title>FluidSynth: Remote code execution</title>
+  <synopsis>A vulnerability was found in FluidSynth that could result in remote
+    code execution.
+  </synopsis>
+  <product type="ebuild">fluidsynth</product>
+  <announced>2021-07-15</announced>
+  <revised count="1">2021-07-15</revised>
+  <bug>782700</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-sound/fluidsynth" auto="yes" arch="*">
+      <unaffected range="ge">2.2.0</unaffected>
+      <vulnerable range="lt">2.2.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>FluidSynth is a real-time synthesizer based on the Soundfont 2
+      specifications.
+    </p>
+  </background>
+  <description>
+    <p>FluidSynth contains a use-after-free in sfloader/fluid_sffile.c which
+      occurs when parsing Soundfile 2 files.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted
+      Soundfont 2 file using FluidSynth, possibly resulting in execution of
+      arbitrary code with the privileges of the process or a Denial of Service
+      condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All FluidSynth users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-sound/fluidsynth-2.2.0"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-28421">CVE-2021-28421</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-14T23:27:29Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-15T05:12:31Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-35.xml b/metadata/glsa/glsa-202107-35.xml
new file mode 100644
index 000000000000..392ebaa6e18e
--- /dev/null
+++ b/metadata/glsa/glsa-202107-35.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-35">
+  <title>OpenSCAD: Buffer overflow</title>
+  <synopsis>A buffer overflow in OpenSCAD might allow remote attacker(s) to
+    execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">openscad</product>
+  <announced>2021-07-15</announced>
+  <revised count="1">2021-07-15</revised>
+  <bug>773217</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-gfx/openscad" auto="yes" arch="*">
+      <unaffected range="ge">2021.01</unaffected>
+      <vulnerable range="lt">2021.01</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>OpenSCAD is the programmer’s solid 3D CAD modeller.</p>
+  </background>
+  <description>
+    <p>A buffer overflow exists in OpenSCAD when parsing STL files.</p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted STL
+      file using OpenSCAD, possibly resulting in execution of arbitrary code
+      with the privileges of the process or a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All OpenSCAD users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-gfx/openscad-2021.01"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28599">CVE-2020-28599</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-14T23:34:45Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-15T05:18:07Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-36.xml b/metadata/glsa/glsa-202107-36.xml
new file mode 100644
index 000000000000..f5fc80d84489
--- /dev/null
+++ b/metadata/glsa/glsa-202107-36.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-36">
+  <title>urllib3: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in urllib3, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">urllib3</product>
+  <announced>2021-07-15</announced>
+  <revised count="1">2021-07-15</revised>
+  <bug>776421</bug>
+  <bug>799413</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-python/urllib3" auto="yes" arch="*">
+      <unaffected range="ge">1.26.5</unaffected>
+      <vulnerable range="lt">1.26.5</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The urllib3 library is an HTTP library with thread-safe connection
+      pooling, file post, and more.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in urllib3. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>An attacker could cause a possible Denial of Service condition.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All urllib3 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-python/urllib3-1.26.5"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-28363">CVE-2021-28363</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-33503">CVE-2021-33503</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-13T14:50:16Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-15T05:20:38Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-37.xml b/metadata/glsa/glsa-202107-37.xml
new file mode 100644
index 000000000000..649bc79dcaa8
--- /dev/null
+++ b/metadata/glsa/glsa-202107-37.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-37">
+  <title>Apache Commons Collections: Remote code execution</title>
+  <synopsis>Apache Commons Collections unsafely deserializes untrusted input,
+    potentially resulting in arbitrary code execution.
+  </synopsis>
+  <product type="ebuild">commons-collections</product>
+  <announced>2021-07-16</announced>
+  <revised count="1">2021-07-16</revised>
+  <bug>739348</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-java/commons-collections" auto="yes" arch="*">
+      <unaffected range="ge">3.2.2</unaffected>
+      <vulnerable range="lt">3.2.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Apache Commons Collections extends the JCF classes with new interfaces,
+      implementations and utilities.
+    </p>
+  </background>
+  <description>
+    <p>Some classes in the Apache Commons Collections functor package
+      deserialized potentially untrusted input by default.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Deserializing untrusted input using Apache Commons Collections could
+      result in remote code execution.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Apache Commons Collections users should upgrade to the latest
+      version:
+    </p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=dev-java/commons-collections-3.2.2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-15708">CVE-2017-15708</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-14T23:32:40Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-16T04:11:42Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-38.xml b/metadata/glsa/glsa-202107-38.xml
new file mode 100644
index 000000000000..f727464eb5b8
--- /dev/null
+++ b/metadata/glsa/glsa-202107-38.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-38">
+  <title>Apache: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Apache, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">apache</product>
+  <announced>2021-07-17</announced>
+  <revised count="1">2021-07-17</revised>
+  <bug>795231</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-servers/apache" auto="yes" arch="*">
+      <unaffected range="ge">2.4.48</unaffected>
+      <vulnerable range="lt">2.4.48</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The Apache HTTP server is one of the most popular web servers on the
+      Internet.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Apache. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="low">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Apache users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=www-servers/apache-2.4.48"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17567">CVE-2019-17567</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-13950">CVE-2020-13950</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-35452">CVE-2020-35452</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-26690">CVE-2021-26690</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-26691">CVE-2021-26691</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30641">CVE-2021-30641</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-31618">CVE-2021-31618</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-17T03:52:42Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-17T04:57:02Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-39.xml b/metadata/glsa/glsa-202107-39.xml
new file mode 100644
index 000000000000..42a2dbf5f8e6
--- /dev/null
+++ b/metadata/glsa/glsa-202107-39.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-39">
+  <title>Apache Commons FileUpload: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Apache Commons
+    FileUpload, the worst of which could result in a Denial of Service
+    condition.
+  </synopsis>
+  <product type="ebuild">commons-fileupload</product>
+  <announced>2021-07-17</announced>
+  <revised count="1">2021-07-17</revised>
+  <bug>739350</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-java/commons-fileupload" auto="yes" arch="*">
+      <vulnerable range="le">1.3</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The Apache Commons FileUpload package makes it easy to add robust,
+      high-performance, file upload capability to your servlets and web
+      applications.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Apache Commons
+      FileUpload. Please review the CVE identifiers referenced below for
+      details.
+    </p>
+  </description>
+  <impact type="low">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>Gentoo has discontinued support for Apache Commons FileUpload. We
+      recommend that users unmerge it:
+    </p>
+    
+    <code>
+      # emerge --ask --depclean "dev-java/commons-fileupload"
+    </code>
+    
+    <p>NOTE: The Gentoo developer(s) maintaining Apache Commons FileUpload have
+      discontinued support at this time. It may be possible that a new Gentoo
+      developer will update Apache Commons FileUpload at a later date. We do
+      not have a suggestion for a replacement at this time.
+    </p>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2013-0248">CVE-2013-0248</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2014-0050">CVE-2014-0050</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2016-3092">CVE-2016-3092</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-17T04:04:02Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-17T05:07:31Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202107-40.xml b/metadata/glsa/glsa-202107-40.xml
new file mode 100644
index 000000000000..3ad90ee21f0a
--- /dev/null
+++ b/metadata/glsa/glsa-202107-40.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202107-40">
+  <title>MediaWiki: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in MediaWiki, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">mediawiki</product>
+  <announced>2021-07-17</announced>
+  <revised count="1">2021-07-17</revised>
+  <bug>780654</bug>
+  <bug>797661</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-apps/mediawiki" auto="yes" arch="*">
+      <unaffected range="ge">1.36.1</unaffected>
+      <vulnerable range="lt">1.36.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>MediaWiki is a collaborative editing software used by large projects
+      such as Wikipedia.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in MediaWiki. Please
+      review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="low">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All MediaWiki users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=www-apps/mediawiki-1.36.1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30152">CVE-2021-30152</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30154">CVE-2021-30154</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30155">CVE-2021-30155</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30157">CVE-2021-30157</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30158">CVE-2021-30158</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30159">CVE-2021-30159</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30458">CVE-2021-30458</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-35197">CVE-2021-35197</uri>
+  </references>
+  <metadata tag="requester" timestamp="2021-07-17T03:41:24Z">ajak</metadata>
+  <metadata tag="submitter" timestamp="2021-07-17T05:10:27Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 80697622a60d..598a38ee3e84 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 12 Jul 2021 07:08:55 +0000
+Sat, 17 Jul 2021 17:39:07 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 33b059e9fdb6..4a0f4bdf44a0 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-cabcc55894eaeb6351c50c95fa8ce6eb111a368b 1626058189 2021-07-12T02:49:49+00:00
+8869d4a8d53cf7ba0e777627877b7a395ba645d6 1626498718 2021-07-17T05:11:58+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 13627bb55f76..5588deb52f39 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 77e701a1686f..6b5bc2a6436f 100644
--- a/metadata/md5-cache/acct-group/Manifest.gz
+++ b/metadata/md5-cache/acct-group/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/arpwatch-0 b/metadata/md5-cache/acct-group/arpwatch-0
new file mode 100644
index 000000000000..074942b98123
--- /dev/null
+++ b/metadata/md5-cache/acct-group/arpwatch-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/arpwatch
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=18abf91633100aa1afeb6e5bd1b27928
diff --git a/metadata/md5-cache/acct-group/axtls-0 b/metadata/md5-cache/acct-group/axtls-0
new file mode 100644
index 000000000000..a8189b1679dc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/axtls-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-libs/axtls
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=dc367e60f51dd7e43359750bec5c5d04
diff --git a/metadata/md5-cache/acct-group/badvpn-0 b/metadata/md5-cache/acct-group/badvpn-0
new file mode 100644
index 000000000000..417d22d152ab
--- /dev/null
+++ b/metadata/md5-cache/acct-group/badvpn-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/badvpn
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=61dec2aa6c1078629b87c0bc0491afde
diff --git a/metadata/md5-cache/acct-group/beanstalk-0 b/metadata/md5-cache/acct-group/beanstalk-0
new file mode 100644
index 000000000000..b89292a626b4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/beanstalk-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/beanstalkd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=20575dd90ceb0ec27c5a4b641c2c144c
diff --git a/metadata/md5-cache/acct-group/bitflu-0 b/metadata/md5-cache/acct-group/bitflu-0
new file mode 100644
index 000000000000..e2b1beac1594
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bitflu-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-p2p/bitflu
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=8cf2ae9469d7240140821a3bc9b55726
diff --git a/metadata/md5-cache/acct-group/burrow_exporter-0 b/metadata/md5-cache/acct-group/burrow_exporter-0
new file mode 100644
index 000000000000..e77a8c57c7c1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/burrow_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/burrow_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=5fbd3b973c38d56280f9f743d057cae3
diff --git a/metadata/md5-cache/acct-group/cockroach-0 b/metadata/md5-cache/acct-group/cockroach-0
new file mode 100644
index 000000000000..72e2e8e47429
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cockroach-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-db/cockroach
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=66f7da19c3d7d8a55f6ce74acd14d344
diff --git a/metadata/md5-cache/acct-group/cron-0 b/metadata/md5-cache/acct-group/cron-0
new file mode 100644
index 000000000000..77d2d08a1cd1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cron-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-process/cronbase
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=f95ae7fb5167a41e3c0c48f91bb639e6
diff --git a/metadata/md5-cache/acct-group/dbskkd-0 b/metadata/md5-cache/acct-group/dbskkd-0
new file mode 100644
index 000000000000..83726d9e43ea
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dbskkd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-i18n/dbskkd-cdb
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=8a89ed1add86532209d1fd7e45ad43ab
diff --git a/metadata/md5-cache/acct-group/drone-0 b/metadata/md5-cache/acct-group/drone-0
new file mode 100644
index 000000000000..89ea5c030b1c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/drone-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-util/drone
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=553bbe639516091a183834334745a759
diff --git a/metadata/md5-cache/acct-group/elasticsearch_exporter-0 b/metadata/md5-cache/acct-group/elasticsearch_exporter-0
new file mode 100644
index 000000000000..b553549cbeaa
--- /dev/null
+++ b/metadata/md5-cache/acct-group/elasticsearch_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/elasticsearch_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=6f03103450216336fafd9a3193ca2715
diff --git a/metadata/md5-cache/acct-group/fcron-0 b/metadata/md5-cache/acct-group/fcron-0
new file mode 100644
index 000000000000..b2018629895f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fcron-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-process/fcron
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ec67655d6dea6f914dfcde637d3ba0e6
diff --git a/metadata/md5-cache/acct-group/firebird-0 b/metadata/md5-cache/acct-group/firebird-0
new file mode 100644
index 000000000000..99bb630767e0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/firebird-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-db/firebird
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=98ba81a633525e097e4da384e5073592
diff --git a/metadata/md5-cache/acct-group/fluentd-0 b/metadata/md5-cache/acct-group/fluentd-0
new file mode 100644
index 000000000000..366607799dc4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fluentd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-admin/fluentd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=fb59ad84b4c5ca664223cd1ac552a363
diff --git a/metadata/md5-cache/acct-group/foldingathome-0 b/metadata/md5-cache/acct-group/foldingathome-0
new file mode 100644
index 000000000000..04292d9a14a8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/foldingathome-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sci-biology/foldingathome
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=0cde01ea6a2d8c9cd2cf3f8a9a92f297
diff --git a/metadata/md5-cache/acct-group/gauth-0 b/metadata/md5-cache/acct-group/gauth-0
new file mode 100644
index 000000000000..8777dd6e6efb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gauth-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-auth/google-authenticator-wrappers
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ec1021f72f47ec3bdc9138455b6f2ec4
diff --git a/metadata/md5-cache/acct-group/gnump3d-0 b/metadata/md5-cache/acct-group/gnump3d-0
new file mode 100644
index 000000000000..aef8b60ee1f0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gnump3d-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/gnump3d
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=7151feff902beba0223fbcd87b4cf0ba
diff --git a/metadata/md5-cache/acct-group/gopherd-0 b/metadata/md5-cache/acct-group/gopherd-0
new file mode 100644
index 000000000000..bae580566bba
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gopherd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/geomyidae
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ce1c211c6ae847481daa3aa9519717a0
diff --git a/metadata/md5-cache/acct-group/grok_exporter-0 b/metadata/md5-cache/acct-group/grok_exporter-0
new file mode 100644
index 000000000000..0e28791a0fa8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/grok_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/grok_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=87baa22bef03e7a6173552e0b909d62f
diff --git a/metadata/md5-cache/acct-group/h2o-0 b/metadata/md5-cache/acct-group/h2o-0
new file mode 100644
index 000000000000..b6a5336a30e9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/h2o-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/h2o
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=4a84b01e2971202a92807c67a8eed975
diff --git a/metadata/md5-cache/acct-group/haclient-0 b/metadata/md5-cache/acct-group/haclient-0
new file mode 100644
index 000000000000..7d317757a041
--- /dev/null
+++ b/metadata/md5-cache/acct-group/haclient-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-cluster/cluster-glue
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=e8c9006c8133f5547390297ee87ec4af
diff --git a/metadata/md5-cache/acct-group/icecast-0 b/metadata/md5-cache/acct-group/icecast-0
new file mode 100644
index 000000000000..5873a83c3c75
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icecast-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/icecast
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=95cb7ebe9f2c38367630c8d2020a6653
diff --git a/metadata/md5-cache/acct-group/icecream-0 b/metadata/md5-cache/acct-group/icecream-0
new file mode 100644
index 000000000000..7c72f44bd2dd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icecream-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-devel/icecream
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=9ce1bdeb0490c71db009e4b8d05656aa
diff --git a/metadata/md5-cache/acct-group/ices-0 b/metadata/md5-cache/acct-group/ices-0
new file mode 100644
index 000000000000..b805264b7092
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ices-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/ices
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=6332ce88917781f8f66742e8b3818337
diff --git a/metadata/md5-cache/acct-group/ipsentinel-0 b/metadata/md5-cache/acct-group/ipsentinel-0
new file mode 100644
index 000000000000..54f052b057da
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ipsentinel-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/ip-sentinel
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=aaaca4b3d345d2b4647e7f4bebebcbcc
diff --git a/metadata/md5-cache/acct-group/karma-0 b/metadata/md5-cache/acct-group/karma-0
new file mode 100644
index 000000000000..8b3716775810
--- /dev/null
+++ b/metadata/md5-cache/acct-group/karma-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/karma-bin
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=58fcc43bee645083bc6dd2f5f1bc071f
diff --git a/metadata/md5-cache/acct-group/lightdm-0 b/metadata/md5-cache/acct-group/lightdm-0
new file mode 100644
index 000000000000..0e1296f74608
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lightdm-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for x11-misc/lightdm
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=2c0eda5c611d02aea2c99ff133f063e6
diff --git a/metadata/md5-cache/acct-group/monkeyd-0 b/metadata/md5-cache/acct-group/monkeyd-0
new file mode 100644
index 000000000000..533e64e20053
--- /dev/null
+++ b/metadata/md5-cache/acct-group/monkeyd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/monkeyd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=4c53e5082a920b16acd70700eddc8b94
diff --git a/metadata/md5-cache/acct-group/munge-0 b/metadata/md5-cache/acct-group/munge-0
new file mode 100644
index 000000000000..98708cf5d42f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/munge-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-auth/munge
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=f4271f090e2d7c3b9daaaa7b2dcfc250
diff --git a/metadata/md5-cache/acct-group/netperf-0 b/metadata/md5-cache/acct-group/netperf-0
new file mode 100644
index 000000000000..2220cc7f69d7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/netperf-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/netperf
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=36de3a0e486846e535e569a5d34c271d
diff --git a/metadata/md5-cache/acct-group/nginx-0 b/metadata/md5-cache/acct-group/nginx-0
new file mode 100644
index 000000000000..567777ff26a3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nginx-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/nginx
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=d3f3453dc446afb11de512b9272602e3
diff --git a/metadata/md5-cache/acct-group/ngrep-0 b/metadata/md5-cache/acct-group/ngrep-0
deleted file mode 100644
index e34f47ce62d6..000000000000
--- a/metadata/md5-cache/acct-group/ngrep-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-analyzer/ngrep
-EAPI=7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-SLOT=0
-_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=b1901c6895b79f594de2dd8c1d947b2e
diff --git a/metadata/md5-cache/acct-group/ngrep-0-r1 b/metadata/md5-cache/acct-group/ngrep-0-r1
new file mode 100644
index 000000000000..c06e02b4f97f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ngrep-0-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/ngrep
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=21b9b50342a1745d1821796d410bf95a
diff --git a/metadata/md5-cache/acct-group/nm-openconnect-0 b/metadata/md5-cache/acct-group/nm-openconnect-0
new file mode 100644
index 000000000000..a2db410d9057
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nm-openconnect-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/networkmanager-openconnect
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=828688dff44247448fcb77741ca82c4b
diff --git a/metadata/md5-cache/acct-group/nm-openvpn-0 b/metadata/md5-cache/acct-group/nm-openvpn-0
new file mode 100644
index 000000000000..7d7547cfcf85
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nm-openvpn-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/networkmanager-openvpn
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=435972a37aa86bf93a159432669be8c0
diff --git a/metadata/md5-cache/acct-group/opendnssec-0 b/metadata/md5-cache/acct-group/opendnssec-0
new file mode 100644
index 000000000000..808cada8f108
--- /dev/null
+++ b/metadata/md5-cache/acct-group/opendnssec-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-dns/opendnssec
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=abc693e4c90009a43cb59b2149e9ea9c
diff --git a/metadata/md5-cache/acct-group/opm-0 b/metadata/md5-cache/acct-group/opm-0
new file mode 100644
index 000000000000..e8553370d339
--- /dev/null
+++ b/metadata/md5-cache/acct-group/opm-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for an open proxy monitor
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=abc28a39265be7b510f5751a312c2ce9
diff --git a/metadata/md5-cache/acct-group/partimag-0 b/metadata/md5-cache/acct-group/partimag-0
new file mode 100644
index 000000000000..7e9b37ed2dea
--- /dev/null
+++ b/metadata/md5-cache/acct-group/partimag-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-block/partimage
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=12723f90b0bdbdf5e48fb61ea23328d7
diff --git a/metadata/md5-cache/acct-group/pgagent-0 b/metadata/md5-cache/acct-group/pgagent-0
new file mode 100644
index 000000000000..30de880aa012
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pgagent-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-db/pgagent
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=b724096dd1af210d584316579db9a1c3
diff --git a/metadata/md5-cache/acct-group/pushgateway-0 b/metadata/md5-cache/acct-group/pushgateway-0
new file mode 100644
index 000000000000..0ff831b87b6a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pushgateway-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/pushgateway
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=973610429b1d0fb6c58b43deca928160
diff --git a/metadata/md5-cache/acct-group/rabbitmq-0 b/metadata/md5-cache/acct-group/rabbitmq-0
new file mode 100644
index 000000000000..bfa1dfe9321e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rabbitmq-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/rabbitmq-server
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ab4b417278e62a735f425076f9415f59
diff --git a/metadata/md5-cache/acct-group/rabbitmq_exporter-0 b/metadata/md5-cache/acct-group/rabbitmq_exporter-0
new file mode 100644
index 000000000000..57755703d795
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rabbitmq_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/rabbitmq_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ed80fb06b0243b2988e1ab851e9827d0
diff --git a/metadata/md5-cache/acct-group/rbot-0 b/metadata/md5-cache/acct-group/rbot-0
new file mode 100644
index 000000000000..a993b75582c7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rbot-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-irc/rbot
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=6f094ee834ca494e4b37de9f3ef04c2d
diff --git a/metadata/md5-cache/acct-group/redsocks-0 b/metadata/md5-cache/acct-group/redsocks-0
new file mode 100644
index 000000000000..db1851ca655a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/redsocks-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-proxy/redsocks
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=643c7ee211d8b8dddf852f09ef545bc0
diff --git a/metadata/md5-cache/acct-group/reg-0 b/metadata/md5-cache/acct-group/reg-0
new file mode 100644
index 000000000000..14d0608eb734
--- /dev/null
+++ b/metadata/md5-cache/acct-group/reg-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-emulation/reg
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=12772411b799aecfff1e5e723682503e
diff --git a/metadata/md5-cache/acct-group/registry-0 b/metadata/md5-cache/acct-group/registry-0
new file mode 100644
index 000000000000..a548a5605112
--- /dev/null
+++ b/metadata/md5-cache/acct-group/registry-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-emulation/docker-registry
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=36e4c3c5d50d9da693964a070b708bdd
diff --git a/metadata/md5-cache/acct-group/resin-0 b/metadata/md5-cache/acct-group/resin-0
new file mode 100644
index 000000000000..88dad98dc6f2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/resin-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/resin
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=6df35c594caae444f4fa40b95650ca02
diff --git a/metadata/md5-cache/acct-group/roccat-0 b/metadata/md5-cache/acct-group/roccat-0
new file mode 100644
index 000000000000..6ad05e30f28f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/roccat-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-apps/roccat-tools
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=04a2c0506ba3b5a25ece67ff0c907b7a
diff --git a/metadata/md5-cache/acct-group/ros-0 b/metadata/md5-cache/acct-group/ros-0
new file mode 100644
index 000000000000..6b572b5b68c6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ros-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-ros/roslaunch
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=156f21246830c23452022b4cb5562758
diff --git a/metadata/md5-cache/acct-group/rplayd-0 b/metadata/md5-cache/acct-group/rplayd-0
new file mode 100644
index 000000000000..7eada31a2547
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rplayd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/rplay
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=d6fedc027767ee546f1a5350e0a4894d
diff --git a/metadata/md5-cache/acct-group/rt-0 b/metadata/md5-cache/acct-group/rt-0
new file mode 100644
index 000000000000..a09fbc425500
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rt-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/rt
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=5a515f03b0e23782b419ad2035de1b46
diff --git a/metadata/md5-cache/acct-group/rundeck-0 b/metadata/md5-cache/acct-group/rundeck-0
new file mode 100644
index 000000000000..5052c8d3665d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rundeck-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/rundeck-bin
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=67809b37284cdfca7bdda2e10180be9b
diff --git a/metadata/md5-cache/acct-group/scanlogd-0 b/metadata/md5-cache/acct-group/scanlogd-0
new file mode 100644
index 000000000000..6dfb9cc625ce
--- /dev/null
+++ b/metadata/md5-cache/acct-group/scanlogd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/scanlogd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=02aef9fa4c0506cfafc12a85febb743e
diff --git a/metadata/md5-cache/acct-group/sguil-0 b/metadata/md5-cache/acct-group/sguil-0
new file mode 100644
index 000000000000..551d1a4d248e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sguil-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/sguil-sensor
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=d346065687075dd82b95d8ecbcfa5292
diff --git a/metadata/md5-cache/acct-group/smokeping-0 b/metadata/md5-cache/acct-group/smokeping-0
new file mode 100644
index 000000000000..a602c15dbfb4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/smokeping-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/smokeping
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=540b8be3789b1255453122826ad9cf80
diff --git a/metadata/md5-cache/acct-group/snmp_exporter-0 b/metadata/md5-cache/acct-group/snmp_exporter-0
new file mode 100644
index 000000000000..dbb8d55d6c2a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/snmp_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/snmp_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=51beb02be8623452b80e8860639fcb6b
diff --git a/metadata/md5-cache/acct-group/speech-0 b/metadata/md5-cache/acct-group/speech-0
new file mode 100644
index 000000000000..fedcd321da62
--- /dev/null
+++ b/metadata/md5-cache/acct-group/speech-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-accessibility/eflite
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=57849aac139c47948ff691c235cc4aa1
diff --git a/metadata/md5-cache/acct-group/spread-0 b/metadata/md5-cache/acct-group/spread-0
new file mode 100644
index 000000000000..2d8b416321b3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/spread-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/spread
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=176f32600aa265111b8437f687601eeb
diff --git a/metadata/md5-cache/acct-group/subsonic-0 b/metadata/md5-cache/acct-group/subsonic-0
new file mode 100644
index 000000000000..7bfada569f92
--- /dev/null
+++ b/metadata/md5-cache/acct-group/subsonic-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/subsonic-bin
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=b432ae97f685dd50347a0f56cfc88160
diff --git a/metadata/md5-cache/acct-group/taskd-0 b/metadata/md5-cache/acct-group/taskd-0
new file mode 100644
index 000000000000..8f9263df7daf
--- /dev/null
+++ b/metadata/md5-cache/acct-group/taskd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/taskd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=5d67c76f91bced5e03ecabf19a9fa23b
diff --git a/metadata/md5-cache/acct-group/thttpd-0 b/metadata/md5-cache/acct-group/thttpd-0
new file mode 100644
index 000000000000..bb46804af846
--- /dev/null
+++ b/metadata/md5-cache/acct-group/thttpd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/thttpd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=56cb00c84de67a6080110a569e0a2506
diff --git a/metadata/md5-cache/acct-group/trickster-0 b/metadata/md5-cache/acct-group/trickster-0
new file mode 100644
index 000000000000..2f7232fae39f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/trickster-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/trickster
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=a3c348cc69eb3da6e13665dbce8f49ee
diff --git a/metadata/md5-cache/acct-group/uwsgi_exporter-0 b/metadata/md5-cache/acct-group/uwsgi_exporter-0
new file mode 100644
index 000000000000..afd86541a396
--- /dev/null
+++ b/metadata/md5-cache/acct-group/uwsgi_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/uwsgi_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=fc7a036f684f9e4995ce90094a6672fb
diff --git a/metadata/md5-cache/acct-group/vacation-0 b/metadata/md5-cache/acct-group/vacation-0
new file mode 100644
index 000000000000..7628fc3ff7f8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vacation-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/postfixadmin
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=7441efdb18b7361bb94c6172dc07899e
diff --git a/metadata/md5-cache/acct-group/vdr-0-r1 b/metadata/md5-cache/acct-group/vdr-0-r1
new file mode 100644
index 000000000000..fcd71e774515
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vdr-0-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the VDR (VideoDiskRecorder)
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=2b8b353d128e19962bc22c07ad0c5fc8
diff --git a/metadata/md5-cache/acct-group/xwax-0 b/metadata/md5-cache/acct-group/xwax-0
new file mode 100644
index 000000000000..f7adfaaf172a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/xwax-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/xwax
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=9bb374b6c0a8bc4913b64e0436585be0
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index b00261f5fc48..92c5656c296e 100644
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/arpwatch-0 b/metadata/md5-cache/acct-user/arpwatch-0
new file mode 100644
index 000000000000..c71cb6b5027d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/arpwatch-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/arpwatch
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/arpwatch
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=4707c48563f39862fd0f9011e1980927
diff --git a/metadata/md5-cache/acct-user/gnump3d-0 b/metadata/md5-cache/acct-user/gnump3d-0
new file mode 100644
index 000000000000..8ea3a6cf11c9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gnump3d-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for media-sound/gnump3d
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/gnump3d
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=3f7258d07681bf67e372d62b5b81df4e
diff --git a/metadata/md5-cache/acct-user/ices-0 b/metadata/md5-cache/acct-user/ices-0
new file mode 100644
index 000000000000..d178247e19a8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ices-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/ices
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/ices
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=7265d152afcbb3a3205dba24db3050f1
diff --git a/metadata/md5-cache/acct-user/ipsentinel-0 b/metadata/md5-cache/acct-user/ipsentinel-0
new file mode 100644
index 000000000000..e2e55135235d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ipsentinel-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/ip-sentinel
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/ipsentinel
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=b135aa760c7b6ad44422667ffd81083f
diff --git a/metadata/md5-cache/acct-user/netperf-0 b/metadata/md5-cache/acct-user/netperf-0
new file mode 100644
index 000000000000..24e120da0541
--- /dev/null
+++ b/metadata/md5-cache/acct-user/netperf-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/netperf
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/netperf
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=dbda66e6e1bb22cd52211ce5eef82e50
diff --git a/metadata/md5-cache/acct-user/ngrep-0 b/metadata/md5-cache/acct-user/ngrep-0
deleted file mode 100644
index e6fdf9e76b6b..000000000000
--- a/metadata/md5-cache/acct-user/ngrep-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-analyzer/ngrep
-EAPI=7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=acct-group/ngrep
-SLOT=0
-_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=032477eb05a58183d0ef51afdae165cc
diff --git a/metadata/md5-cache/acct-user/ngrep-0-r1 b/metadata/md5-cache/acct-user/ngrep-0-r1
new file mode 100644
index 000000000000..9251ac1afdfa
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ngrep-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/ngrep
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/ngrep
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=1467c1cd405ff0a40d0560fe998b20be
diff --git a/metadata/md5-cache/acct-user/opendnssec-0 b/metadata/md5-cache/acct-user/opendnssec-0
new file mode 100644
index 000000000000..55f4aed618bc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/opendnssec-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-dns/opendnssec
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/opendnssec
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=6f6647d11fee25a9625dea44298db219
diff --git a/metadata/md5-cache/acct-user/opm-0-r1 b/metadata/md5-cache/acct-user/opm-0-r1
new file mode 100644
index 000000000000..1fd263cc27ac
--- /dev/null
+++ b/metadata/md5-cache/acct-user/opm-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for an open proxy monitor
+EAPI=8
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/opm
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=82b017c2325ea9391eb65e445803d031
diff --git a/metadata/md5-cache/acct-user/redsocks-0 b/metadata/md5-cache/acct-user/redsocks-0
new file mode 100644
index 000000000000..754feffcaa15
--- /dev/null
+++ b/metadata/md5-cache/acct-user/redsocks-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-proxy/redsocks
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/redsocks
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=b96aecea0ba174ee287f67d31e47557f
diff --git a/metadata/md5-cache/acct-user/rplayd-0 b/metadata/md5-cache/acct-user/rplayd-0
new file mode 100644
index 000000000000..fd8ded2f52b7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rplayd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for media-sound/rplay
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/rplayd
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=a97ed2fb7a50e381460a0f1b1787b52f
diff --git a/metadata/md5-cache/acct-user/scanlogd-0 b/metadata/md5-cache/acct-user/scanlogd-0
new file mode 100644
index 000000000000..6962321f2ac8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/scanlogd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/scanlogd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/scanlogd
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=4c5ea2120bde6a0c4c0553f3b658c592
diff --git a/metadata/md5-cache/acct-user/sguil-0 b/metadata/md5-cache/acct-user/sguil-0
new file mode 100644
index 000000000000..d1cfb2577081
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sguil-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/sguil-sensor
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/sguil
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=0eaecdeb684fb191fedf9d692518b3e1
diff --git a/metadata/md5-cache/acct-user/smokeping-0 b/metadata/md5-cache/acct-user/smokeping-0
new file mode 100644
index 000000000000..4545aa0715ed
--- /dev/null
+++ b/metadata/md5-cache/acct-user/smokeping-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/smokeping
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/smokeping
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=b2136a2915e896dc5ca99944ffc63a4e
diff --git a/metadata/md5-cache/acct-user/spread-0 b/metadata/md5-cache/acct-user/spread-0
new file mode 100644
index 000000000000..6996671db68e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/spread-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/spread
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/spread
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=be50511c7e8d750c5665e2492353926b
diff --git a/metadata/md5-cache/acct-user/taskd-0 b/metadata/md5-cache/acct-user/taskd-0
new file mode 100644
index 000000000000..af0ae2cbcddd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/taskd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-misc/taskd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/taskd
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=1d2e8518c73330103820b072845422be
diff --git a/metadata/md5-cache/acct-user/timidity-0 b/metadata/md5-cache/acct-user/timidity-0
new file mode 100644
index 000000000000..37329973bfbc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/timidity-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for media-sound/timidity++
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/nobody
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=dc5b0fb040e298e0fb31721f23f9d59f
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index eaa9f3dee532..e5214821f88a 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.40.3 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.40.3
new file mode 100644
index 000000000000..3b158704207f
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.40.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/glib-2.62:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=D-Bus accessibility specifications and registration daemon
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core
+IUSE=X gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2.1+
+RDEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/glib-2.62:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=gtk-doc? ( X )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/at-spi2-core/2.40/at-spi2-core-2.40.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bf48990c466900e89754c8ab7aea3b01
diff --git a/metadata/md5-cache/app-accessibility/espeak-ng-1.50 b/metadata/md5-cache/app-accessibility/espeak-ng-1.50
index 3bbe5d275498..139017e89ce0 100644
--- a/metadata/md5-cache/app-accessibility/espeak-ng-1.50
+++ b/metadata/md5-cache/app-accessibility/espeak-ng-1.50
@@ -5,10 +5,10 @@ DESCRIPTION=Software speech synthesizer for English, and some other languages
 EAPI=7
 HOMEPAGE=https://github.com/espeak-ng/espeak-ng
 IUSE=+async +klatt l10n_ru l10n_zh man mbrola +sound
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc64
 LICENSE=GPL-3+ Turkowski unicode
 RDEPEND=!app-accessibility/espeak mbrola? ( app-accessibility/mbrola ) sound? ( media-libs/pcaudiolib ) sound? ( media-sound/sox )
 SLOT=0
 SRC_URI=https://github.com/espeak-ng/espeak-ng/archive/1.50.tar.gz -> espeak-ng-1.50.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=31b77adc5781f45e0ae82565024952cd
+_md5_=d73dd4774d049d0fa6d6ecadc1a7d148
diff --git a/metadata/md5-cache/app-accessibility/kontrast-21.04.2 b/metadata/md5-cache/app-accessibility/kontrast-21.04.2
deleted file mode 100644
index 775c4c55f25c..000000000000
--- a/metadata/md5-cache/app-accessibility/kontrast-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kirigami-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Tool to check contrast for colors to verify they are correctly accessible
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kontrast/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kirigami-5.80.0:5 kde-plasma/xdg-desktop-portal-kde || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kontrast-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=97ddb557b9a2c4bf27bcfa9c05c3473f
diff --git a/metadata/md5-cache/app-accessibility/mbrola-3.3-r1 b/metadata/md5-cache/app-accessibility/mbrola-3.3-r1
index f7101384a466..a899341a294e 100644
--- a/metadata/md5-cache/app-accessibility/mbrola-3.3-r1
+++ b/metadata/md5-cache/app-accessibility/mbrola-3.3-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Speech synthesizer based on the concatenation of diphones
 EAPI=7
 HOMEPAGE=https://github.com/numediart/MBROLA
-KEYWORDS=~amd64 ~sparc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc
 LICENSE=AGPL-3+
 RDEPEND=app-accessibility/mbrola-voices
 SLOT=0
 SRC_URI=https://github.com/numediart/MBROLA/archive/3.3.tar.gz -> mbrola-3.3.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e083dfaa34222519bc11b9e3ad202f22
+_md5_=33e7cd38cd6b7d66e08e77c4cef1a7ed
diff --git a/metadata/md5-cache/app-accessibility/mbrola-voices-0_pre20200331 b/metadata/md5-cache/app-accessibility/mbrola-voices-0_pre20200331
index fdddc187f096..f0e43d3d7043 100644
--- a/metadata/md5-cache/app-accessibility/mbrola-voices-0_pre20200331
+++ b/metadata/md5-cache/app-accessibility/mbrola-voices-0_pre20200331
@@ -3,8 +3,8 @@ DESCRIPTION=mbrola speech synthesizer voices database
 EAPI=7
 HOMEPAGE=https://github.com/numediart/mbrola-voices
 IUSE=l10n_la l10n_lt l10n_nl l10n_id l10n_is l10n_it l10n_de l10n_pt-BR l10n_fr l10n_fa l10n_ar l10n_af l10n_fr-CA l10n_sv l10n_pl +l10n_en-US l10n_ko l10n_ms l10n_zh-CN l10n_mi l10n_hu l10n_hr l10n_he l10n_hi l10n_cs l10n_es-MX l10n_ro l10n_tr l10n_pt-PT l10n_te l10n_ja l10n_el l10n_et l10n_es l10n_br l10n_en-GB
-KEYWORDS=~amd64 ~sparc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc
 LICENSE=MBROLA-VOICES
 SLOT=0
 SRC_URI=https://github.com/numediart/mbrola-voices/archive/fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz -> mbrola-voices-0_pre20200331.tar.gz
-_md5_=a5d1802a320f7a3131c558842191773d
+_md5_=d64d22cc9bf0b23ef2b9decf08633e48
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 1f9f7813a17a..ec65923a956a 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ananicy-2.2.1-r1 b/metadata/md5-cache/app-admin/ananicy-2.2.1-r1
new file mode 100644
index 000000000000..f746d9aef445
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ananicy-2.2.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+DEFINED_PHASES=compile install setup
+DESCRIPTION=ANother Auto NICe daemon
+EAPI=8
+HOMEPAGE=https://github.com/Nefelim4ag/Ananicy
+IUSE=python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) sys-process/schedtool
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/Nefelim4ag/Ananicy/archive/2.2.1.tar.gz -> ananicy-2.2.1.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3788874b78237698b5dba7de4778ce88
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.48-r1 b/metadata/md5-cache/app-admin/apache-tools-2.4.48-r1
index eb418157b6be..74b5e0da9c62 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.48-r1
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.48-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.48.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=068ce0e2138af05cfa1ae42e00bfc4ab
+_md5_=09d10509e22d5d3a9f478ee2c23d2b7e
diff --git a/metadata/md5-cache/app-admin/awscli-1.19.104 b/metadata/md5-cache/app-admin/awscli-1.19.104
index df1a7c4b3dd5..04987929e640 100644
--- a/metadata/md5-cache/app-admin/awscli-1.19.104
+++ b/metadata/md5-cache/app-admin/awscli-1.19.104
@@ -4,12 +4,12 @@ DESCRIPTION=Universal Command Line Environment for AWS
 EAPI=7
 HOMEPAGE=https://pypi.org/project/awscli/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.20.104[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.19.104.tar.gz -> awscli-1.19.104.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=383108bd725409654cec81f2318676df
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a1d34d6a3aa1066bda8901e9c3a3f674
diff --git a/metadata/md5-cache/app-admin/awscli-1.19.105 b/metadata/md5-cache/app-admin/awscli-1.19.105
deleted file mode 100644
index 6b9d09995c8b..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.19.105
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.20.105[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=7
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.105[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.19.105.tar.gz -> awscli-1.19.105.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.19.106 b/metadata/md5-cache/app-admin/awscli-1.19.106
deleted file mode 100644
index 6752ff74eeaa..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.19.106
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.20.106[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=7
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.106[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.19.106.tar.gz -> awscli-1.19.106.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.19.107 b/metadata/md5-cache/app-admin/awscli-1.19.107
deleted file mode 100644
index 75c53c112e59..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.19.107
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.20.107[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=7
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.107[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.19.107.tar.gz -> awscli-1.19.107.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.19.108 b/metadata/md5-cache/app-admin/awscli-1.19.108
deleted file mode 100644
index e65894926c23..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.19.108
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.20.108[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=7
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.108[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.19.108.tar.gz -> awscli-1.19.108.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.19.109 b/metadata/md5-cache/app-admin/awscli-1.19.109
deleted file mode 100644
index e5672ea0e5be..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.19.109
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.20.109[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=7
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.109[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.19.109.tar.gz -> awscli-1.19.109.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.19.112 b/metadata/md5-cache/app-admin/awscli-1.19.112
new file mode 100644
index 000000000000..37f768bb3107
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.19.112
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.20.112[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.112[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.19.112.tar.gz -> awscli-1.19.112.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.19.97 b/metadata/md5-cache/app-admin/awscli-1.19.97
deleted file mode 100644
index 67c7a5014d44..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.19.97
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.20.97[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=7
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.97[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.19.97.tar.gz -> awscli-1.19.97.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a1d34d6a3aa1066bda8901e9c3a3f674
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.0 b/metadata/md5-cache/app-admin/awscli-1.20.0
new file mode 100644
index 000000000000..f2f967311f90
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.0.tar.gz -> awscli-1.20.0.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.1 b/metadata/md5-cache/app-admin/awscli-1.20.1
new file mode 100644
index 000000000000..e411dca53695
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.1.tar.gz -> awscli-1.20.1.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.26.4 b/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.26.4
deleted file mode 100644
index 4d3b5f155c8c..000000000000
--- a/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.26.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DESCRIPTION=Bitwarden password manager desktop client
-EAPI=7
-HOMEPAGE=https://bitwarden.com/
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-crypt/libsecret dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
-SLOT=0
-SRC_URI=https://github.com/bitwarden/desktop/releases/download/v1.26.4/Bitwarden-1.26.4-amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=85895f8cffe69ca9574b65d11f52d6c2
diff --git a/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.27.1 b/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.27.1
new file mode 100644
index 000000000000..43ff24dffb7e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.27.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm unpack
+DESCRIPTION=Bitwarden password manager desktop client
+EAPI=7
+HOMEPAGE=https://bitwarden.com/
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-crypt/libsecret dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
+SLOT=0
+SRC_URI=https://github.com/bitwarden/desktop/releases/download/v1.27.1/Bitwarden-1.27.1-amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=85895f8cffe69ca9574b65d11f52d6c2
diff --git a/metadata/md5-cache/app-admin/consul-1.10.1 b/metadata/md5-cache/app-admin/consul-1.10.1
new file mode 100644
index 000000000000..6894f1a21444
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.10.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/consul acct-user/consul
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+RDEPEND=acct-group/consul acct-user/consul
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.10.1.tar.gz -> consul-1.10.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.8.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.8.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.1.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.1.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.4.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.4.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.1.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20200609203250-aecfd211c9ce.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20200609203250-aecfd211c9ce.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1-0.20210112042008-8ebf2d61a8b4.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1-0.20210112042008-8ebf2d61a8b4.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1-0.20210112042008-8ebf2d61a8b4.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1-0.20210112042008-8ebf2d61a8b4.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 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/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.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.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=461117c0e69a70b953be7156b230c2ca
diff --git a/metadata/md5-cache/app-admin/consul-1.7.11 b/metadata/md5-cache/app-admin/consul-1.7.11
deleted file mode 100644
index e37b6d7dfd85..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.7.11
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/consul acct-user/consul
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=7
-HOMEPAGE=https://www.consul.io
-KEYWORDS=amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
-RDEPEND=acct-group/consul acct-user/consul
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v1.7.11.tar.gz -> consul-1.7.11.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.7.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.7.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/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/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/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/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/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/mock/@v/v1.1.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.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/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.16.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.16.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-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/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/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/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-20181126121408-4724e9255275.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180820201707-7c9eb446e3cf.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/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/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20170807180024-9a379c6b3e95.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-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-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.zip -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20180806132203-61b11ee65332.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20180806132203-61b11ee65332.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20180821005732-488889b0007f.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20180821005732-488889b0007f.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.zip -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.mod -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=81a545ecffaa5a7432097cb809ca3b08
diff --git a/metadata/md5-cache/app-admin/consul-1.7.14 b/metadata/md5-cache/app-admin/consul-1.7.14
deleted file mode 100644
index 57ac24afe471..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.7.14
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/consul acct-user/consul
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=7
-HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
-RDEPEND=acct-group/consul acct-user/consul
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v1.7.14.tar.gz -> consul-1.7.14.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.7.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.7.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/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/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/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/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/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/mock/@v/v1.1.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.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/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.16.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.16.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-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/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/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/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-20181126121408-4724e9255275.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180820201707-7c9eb446e3cf.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/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/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20170807180024-9a379c6b3e95.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-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-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.zip -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20180806132203-61b11ee65332.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20180806132203-61b11ee65332.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20180821005732-488889b0007f.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20180821005732-488889b0007f.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.zip -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.mod -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=604112bd70d50cb8c8f810273721ff13
diff --git a/metadata/md5-cache/app-admin/consul-1.8.12 b/metadata/md5-cache/app-admin/consul-1.8.12
deleted file mode 100644
index 04accc7d41f6..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.8.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/consul acct-user/consul
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=7
-HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
-RDEPEND=acct-group/consul acct-user/consul
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v1.8.12.tar.gz -> consul-1.8.12.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.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-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.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.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.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.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.9+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.9+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.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/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 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/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.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-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.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-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-20200416051211-89c76fbcd5d1.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.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.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a67962a31eb40228ab3a89c368026c15
diff --git a/metadata/md5-cache/app-admin/consul-1.8.14 b/metadata/md5-cache/app-admin/consul-1.8.14
new file mode 100644
index 000000000000..dc5b5fd5aa9b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.8.14
@@ -0,0 +1,14 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/consul acct-user/consul
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+KEYWORDS=amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+RDEPEND=acct-group/consul acct-user/consul
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.8.14.tar.gz -> consul-1.8.14.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.9+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.9+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 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/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.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.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=53c1fa11a2485eeb6fa9f166b3d22d1c
diff --git a/metadata/md5-cache/app-admin/consul-1.9.6 b/metadata/md5-cache/app-admin/consul-1.9.6
deleted file mode 100644
index 867d633563d8..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/consul acct-user/consul
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=7
-HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
-RDEPEND=acct-group/consul acct-user/consul
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v1.9.6.tar.gz -> consul-1.9.6.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.6.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.6.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20200609203250-aecfd211c9ce.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20200609203250-aecfd211c9ce.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200930160638-afb6bcd081ae.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200930160638-afb6bcd081ae.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 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/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.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.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=31b7f52505d58e5555256ed51bbe6972
diff --git a/metadata/md5-cache/app-admin/consul-1.9.8 b/metadata/md5-cache/app-admin/consul-1.9.8
new file mode 100644
index 000000000000..27cd338522d0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.9.8
@@ -0,0 +1,14 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/consul acct-user/consul
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+RDEPEND=acct-group/consul acct-user/consul
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.9.8.tar.gz -> consul-1.9.8.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.6.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.6.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20200609203250-aecfd211c9ce.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20200609203250-aecfd211c9ce.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 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/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.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.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=563428c556e0a2cc369df90c2eb4ccb2
diff --git a/metadata/md5-cache/app-admin/docker-bench-0.2.2 b/metadata/md5-cache/app-admin/docker-bench-0.2.2
index 216a761f54d1..da87ed5c36c2 100644
--- a/metadata/md5-cache/app-admin/docker-bench-0.2.2
+++ b/metadata/md5-cache/app-admin/docker-bench-0.2.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/aquasecurity/docker-bench/archive/v0.2.2.tar.gz -> docker-bench-0.2.2.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/aquasecurity/bench-common/@v/v0.0.0-20190806090815-81f08528fa03.zip -> github.com%2Faquasecurity%2Fbench-common%2F@v%2Fv0.0.0-20190806090815-81f08528fa03.zip mirror://goproxy//github.com/aquasecurity/bench-common/@v/v0.0.0-20190806090815-81f08528fa03.mod -> github.com%2Faquasecurity%2Fbench-common%2F@v%2Fv0.0.0-20190806090815-81f08528fa03.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/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/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-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.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/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/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.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-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/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/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/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/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/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.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/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/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/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/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-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-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-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/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-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.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/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/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91d6331253b4c15fae847ca1ab37ef4a
diff --git a/metadata/md5-cache/app-admin/doctl-1.57.0 b/metadata/md5-cache/app-admin/doctl-1.57.0
index c5cc934556a2..4c62e91e699f 100644
--- a/metadata/md5-cache/app-admin/doctl-1.57.0
+++ b/metadata/md5-cache/app-admin/doctl-1.57.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/digitalocean/doctl/archive/v1.57.0.tar.gz -> doctl-1.57.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d03da8077917a8fcd3414f1fcd6fe2d
diff --git a/metadata/md5-cache/app-admin/doctl-9999 b/metadata/md5-cache/app-admin/doctl-9999
index 87deab17bb3d..ff9769060575 100644
--- a/metadata/md5-cache/app-admin/doctl-9999
+++ b/metadata/md5-cache/app-admin/doctl-9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0
 PROPERTIES=live
 RESTRICT=strip
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8711ebcea30c7d5378218c80dc9d9b62
diff --git a/metadata/md5-cache/app-admin/drush-6.7.0-r2 b/metadata/md5-cache/app-admin/drush-6.7.0-r2
index adf0261a029b..4e14701f0051 100644
--- a/metadata/md5-cache/app-admin/drush-6.7.0-r2
+++ b/metadata/md5-cache/app-admin/drush-6.7.0-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[cli,ctype,json(+),simplexml] dev-php/PEAR-Console_Table
 SLOT=0
 SRC_URI=https://github.com/drush-ops/drush/archive/6.7.0.tar.gz -> drush-6.7.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e4031f965b04cacd59c5c8195006e3f7
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.16 b/metadata/md5-cache/app-admin/eselect-1.4.16
index 3fa78c045251..82fbb3939809 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.16
+++ b/metadata/md5-cache/app-admin/eselect-1.4.16
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.16.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5de78eb39f3a0b17d69148e601268b31
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.17 b/metadata/md5-cache/app-admin/eselect-1.4.17
index 6958c9ff54c5..b0805f0003a7 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.17
+++ b/metadata/md5-cache/app-admin/eselect-1.4.17
@@ -11,5 +11,5 @@ PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.17.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=490b8f045318669434ed72979d49414b
diff --git a/metadata/md5-cache/app-admin/eselect-9999 b/metadata/md5-cache/app-admin/eselect-9999
index 2f9545e068a4..5707e00ee47a 100644
--- a/metadata/md5-cache/app-admin/eselect-9999
+++ b/metadata/md5-cache/app-admin/eselect-9999
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 PROPERTIES=live
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1bcfefe8af8b4ee71bfcb71bf28aa31c
diff --git a/metadata/md5-cache/app-admin/exo-1.36.0 b/metadata/md5-cache/app-admin/exo-1.36.0
deleted file mode 100644
index 1b52fbed4ca5..000000000000
--- a/metadata/md5-cache/app-admin/exo-1.36.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/go:=
-DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
-EAPI=7
-HOMEPAGE=https://github.com/exoscale/cli
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.36.0.tar.gz -> exo-1.36.0.tar.gz
-_md5_=a638813d2b712f85d21a976d47d1d5b9
diff --git a/metadata/md5-cache/app-admin/exo-1.37.0 b/metadata/md5-cache/app-admin/exo-1.37.0
new file mode 100644
index 000000000000..ded2e8cd934b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/exo-1.37.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/go:=
+DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
+EAPI=7
+HOMEPAGE=https://github.com/exoscale/cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/exoscale/cli/archive/v1.37.0.tar.gz -> exo-1.37.0.tar.gz
+_md5_=a638813d2b712f85d21a976d47d1d5b9
diff --git a/metadata/md5-cache/app-admin/fam-2.7.0_p17_p3 b/metadata/md5-cache/app-admin/fam-2.7.0_p17_p3
index dcea21b65c4a..684d910488d5 100644
--- a/metadata/md5-cache/app-admin/fam-2.7.0_p17_p3
+++ b/metadata/md5-cache/app-admin/fam-2.7.0_p17_p3
@@ -5,10 +5,10 @@ DESCRIPTION=FAM, the File Alteration Monitor
 EAPI=7
 HOMEPAGE=https://tracker.debian.org/pkg/fam
 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 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!app-admin/gamin net-libs/libtirpc net-nds/rpcbind
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fam/fam_2.7.0.orig.tar.gz mirror://debian/pool/main/f/fam/fam_2.7.0-17.3.diff.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba102c746b027f5be40478c9208f2523
+_md5_=4f29582330437a7ba06fc66932fdd0f4
diff --git a/metadata/md5-cache/app-admin/gam-server-0.1.10-r2 b/metadata/md5-cache/app-admin/gam-server-0.1.10-r2
index 0d13ff38fb18..5eca7371a093 100644
--- a/metadata/md5-cache/app-admin/gam-server-0.1.10-r2
+++ b/metadata/md5-cache/app-admin/gam-server-0.1.10-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=5
 HOMEPAGE=https://www.gnome.org/~veillard/gamin/
 IUSE=debug kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1beeb887a3658fae0dab57d83c42e4f8
+_md5_=440aa06a60c6b572724d03f23cee38da
diff --git a/metadata/md5-cache/app-admin/gamin-0.1.10-r1 b/metadata/md5-cache/app-admin/gamin-0.1.10-r1
index 7b0223920af4..09a328678fe6 100644
--- a/metadata/md5-cache/app-admin/gamin-0.1.10-r1
+++ b/metadata/md5-cache/app-admin/gamin-0.1.10-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Meta package providing the File Alteration Monitor API & Server
 EAPI=5
 HOMEPAGE=https://www.gnome.org/~veillard/gamin/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=>=app-admin/gam-server-0.1.10
 RDEPEND=!app-admin/fam >=dev-libs/libgamin-0.1.10-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fb65c88cd92b12fe40ae4d00fe35225e
+_md5_=8ffad04f82c2f220103b307addc30af6
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.3.2 b/metadata/md5-cache/app-admin/haskell-updater-1.3.2
index 8ac3ff4fadf7..953b5d7e4fa5 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.3.2
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.3.2/haskell-updater-1.3.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8e340ece875242ca88b9352f03bcfd05
diff --git a/metadata/md5-cache/app-admin/helm-3.3.4 b/metadata/md5-cache/app-admin/helm-3.3.4
index e37216479047..037ca2c46cdf 100644
--- a/metadata/md5-cache/app-admin/helm-3.3.4
+++ b/metadata/md5-cache/app-admin/helm-3.3.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/helm/helm/archive/v3.3.4.tar.gz -> helm-3.3.4.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//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/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/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/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/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/!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/!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/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/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/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/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-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-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/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/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.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/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/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/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/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/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/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/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/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/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/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_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/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/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/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/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/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.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-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-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/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-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.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.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.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-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/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.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-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-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-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-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-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-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/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/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-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-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-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-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-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-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.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/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.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-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-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/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.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//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/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//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-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/apiextensions-apiserver/@v/v0.18.4.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.4.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.18.4.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.4.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.18.8.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.8.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.18.8.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.8.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.4.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.4.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.4.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.4.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.8.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.8.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.8.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.8.mod mirror://goproxy//k8s.io/apiserver/@v/v0.18.4.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.18.4.mod mirror://goproxy//k8s.io/apiserver/@v/v0.18.8.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.18.8.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.18.4.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.18.4.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.18.4.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.18.4.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.18.8.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.18.8.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.18.8.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.18.8.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.4.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.4.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.4.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.4.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.8.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.8.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.8.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.8.mod mirror://goproxy//k8s.io/code-generator/@v/v0.18.4.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.18.4.mod mirror://goproxy//k8s.io/code-generator/@v/v0.18.8.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.18.8.mod mirror://goproxy//k8s.io/component-base/@v/v0.18.4.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.18.4.zip mirror://goproxy//k8s.io/component-base/@v/v0.18.4.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.18.4.mod mirror://goproxy//k8s.io/component-base/@v/v0.18.8.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.18.8.zip mirror://goproxy//k8s.io/component-base/@v/v0.18.8.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.18.8.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//k8s.io/kubectl/@v/v0.18.4.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.18.4.zip mirror://goproxy//k8s.io/kubectl/@v/v0.18.4.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.18.4.mod mirror://goproxy//k8s.io/kubectl/@v/v0.18.8.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.18.8.zip mirror://goproxy//k8s.io/kubectl/@v/v0.18.8.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.18.8.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.18.4.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.18.4.mod mirror://goproxy//k8s.io/metrics/@v/v0.18.8.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.18.8.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.7.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.7.mod mirror://goproxy//sigs.k8s.io/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/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//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	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b7b4dfc4ab9893182009124147c0c3c0
diff --git a/metadata/md5-cache/app-admin/helm-3.4.1 b/metadata/md5-cache/app-admin/helm-3.4.1
index 4e6a22274e8c..fbd4c7fca1c0 100644
--- a/metadata/md5-cache/app-admin/helm-3.4.1
+++ b/metadata/md5-cache/app-admin/helm-3.4.1
@@ -8,5 +8,5 @@ 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	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6cea39d71f246e53d5cf588d1ed24537
diff --git a/metadata/md5-cache/app-admin/helm-3.4.2 b/metadata/md5-cache/app-admin/helm-3.4.2
index b8554d01e0f0..2092cd96f985 100644
--- a/metadata/md5-cache/app-admin/helm-3.4.2
+++ b/metadata/md5-cache/app-admin/helm-3.4.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/helm/helm/archive/v3.4.2.tar.gz -> helm-3.4.2.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.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/api/@v/v0.19.4.zip -> k8s.io%2Fapi%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/api/@v/v0.19.4.mod -> k8s.io%2Fapi%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.19.2.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.2.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.19.2.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.2.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/apiextensions-apiserver/@v/v0.19.4.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.19.4.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.19.2.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.2.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.19.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.2.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/apimachinery/@v/v0.19.4.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.19.4.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/apiserver/@v/v0.19.2.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.19.2.mod mirror://goproxy//k8s.io/apiserver/@v/v0.19.3.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.19.3.mod mirror://goproxy//k8s.io/apiserver/@v/v0.19.4.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.19.2.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.19.2.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.19.2.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.19.2.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/cli-runtime/@v/v0.19.4.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.19.4.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/client-go/@v/v0.19.2.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.19.2.zip mirror://goproxy//k8s.io/client-go/@v/v0.19.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.19.2.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/client-go/@v/v0.19.4.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/client-go/@v/v0.19.4.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/code-generator/@v/v0.19.2.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.19.2.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/code-generator/@v/v0.19.4.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/component-base/@v/v0.19.2.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.2.zip mirror://goproxy//k8s.io/component-base/@v/v0.19.2.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.2.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/component-base/@v/v0.19.4.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/component-base/@v/v0.19.4.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.4.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/kubectl/@v/v0.19.4.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/kubectl/@v/v0.19.4.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.19.4.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/metrics/@v/v0.19.4.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.19.4.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	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c5d690b5d92172564dc80dc461ff3d67
diff --git a/metadata/md5-cache/app-admin/helm-3.5.4 b/metadata/md5-cache/app-admin/helm-3.5.4
index a15c7717fc0a..e65ea5427f48 100644
--- a/metadata/md5-cache/app-admin/helm-3.5.4
+++ b/metadata/md5-cache/app-admin/helm-3.5.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/helm/helm/archive/v3.5.4.tar.gz -> helm-3.5.4.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.5.0.zip -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.5.0.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!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.1.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.1.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.1.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.1.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.mod mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.2.2.zip -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.2.2.zip mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.2.2.mod -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.2.2.mod mirror://goproxy//github.com/!masterminds/squirrel/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/squirrel/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/vcs/@v/v1.13.1.zip -> github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.zip mirror://goproxy//github.com/!masterminds/vcs/@v/v1.13.1.mod -> github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.zip -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.zip mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/!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/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/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-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.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.zip -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.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/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/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-20200531161412-0dbf7f05ba59.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20201208142359-180525291bb7.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20201208142359-180525291bb7.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20201208142359-180525291bb7.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20201208142359-180525291bb7.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-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/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/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.10.0.zip -> github.com%2Fdeislabs%2Foras%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/deislabs/oras/@v/v0.10.0.mod -> github.com%2Fdeislabs%2Foras%2F@v%2Fv0.10.0.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.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/v20.10.3+incompatible.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.3+incompatible.zip mirror://goproxy//github.com/docker/cli/@v/v20.10.3+incompatible.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.3+incompatible.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-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.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/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/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.mod -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.zip -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.zip mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/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.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.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.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/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/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-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/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godror/godror/@v/v0.13.3.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.13.3.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.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.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.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.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.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.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gosuri/uitable/@v/v0.0.4.zip -> github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/gosuri/uitable/@v/v0.0.4.mod -> github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-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.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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/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.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.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/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.9.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.9.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.9.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/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.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.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/moby/@v/v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.zip -> github.com%2Fmoby%2Fmoby%2F@v%2Fv17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.zip mirror://goproxy//github.com/moby/moby/@v/v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.mod -> github.com%2Fmoby%2Fmoby%2F@v%2Fv17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.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.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.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/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.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.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.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.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.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.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.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.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/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/shopspring/decimal/@v/v1.2.0.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.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.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.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/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.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/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/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/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.2.0.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.2.0.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/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.20200910180754-dd1b699fc489.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.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-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-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20200414173820-0848c9571904.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200505023115-26f46d2f7ef8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200505023115-26f46d2f7ef8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200616133436-c1934b75d054.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200616133436-c1934b75d054.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.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.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.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.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.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.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/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/gorp.v1/@v/v1.7.2.zip -> gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.zip mirror://goproxy//gopkg.in/gorp.v1/@v/v1.7.2.mod -> gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/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.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/api/@v/v0.20.4.zip -> k8s.io%2Fapi%2F@v%2Fv0.20.4.zip mirror://goproxy//k8s.io/api/@v/v0.20.4.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.20.4.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.20.4.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.20.4.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.4.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.4.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.20.4.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/apiserver/@v/v0.20.4.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.20.4.zip mirror://goproxy//k8s.io/apiserver/@v/v0.20.4.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.20.4.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.20.4.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.20.4.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.4.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.20.4.zip mirror://goproxy//k8s.io/client-go/@v/v0.20.4.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/code-generator/@v/v0.20.4.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/component-base/@v/v0.20.4.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.4.zip mirror://goproxy//k8s.io/component-base/@v/v0.20.4.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/component-helpers/@v/v0.20.4.mod -> k8s.io%2Fcomponent-helpers%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201113003025-83324d819ded.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201113003025-83324d819ded.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.5.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.5.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.5.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.5.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod mirror://goproxy//k8s.io/kubectl/@v/v0.20.4.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.20.4.zip mirror://goproxy//k8s.io/kubectl/@v/v0.20.4.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/metrics/@v/v0.20.4.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.14.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.14.mod mirror://goproxy//sigs.k8s.io/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.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a3481268334cf60e8edacf3403b9783a
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.6.6 b/metadata/md5-cache/app-admin/keepassxc-2.6.6
index d4ac6dcec33d..05564f54c56a 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.6.6
+++ b/metadata/md5-cache/app-admin/keepassxc-2.6.6
@@ -5,11 +5,11 @@ DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
 EAPI=7
 HOMEPAGE=https://keepassxc.org
 IUSE=autotype browser ccache doc keeshare +network test yubikey
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1 GPL-2 GPL-3
 RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/archive/2.6.6.tar.gz -> keepassxc-2.6.6.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22907aef3650b320c5a660c171555d5c
+_md5_=3a443ad473e5b33eb8b60024502a8020
diff --git a/metadata/md5-cache/app-admin/kubectx-0.9.1 b/metadata/md5-cache/app-admin/kubectx-0.9.1
index 2b3dc685945c..bb398ae015ce 100644
--- a/metadata/md5-cache/app-admin/kubectx-0.9.1
+++ b/metadata/md5-cache/app-admin/kubectx-0.9.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/ahmetb/kubectx/archive/v0.9.1.tar.gz -> kubectx-0.9.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//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//facette.io/natsort/@v/v0.0.0-20181210072756-2cd4dd1e2dcb.zip -> facette.io%2Fnatsort%2F@v%2Fv0.0.0-20181210072756-2cd4dd1e2dcb.zip mirror://goproxy//facette.io/natsort/@v/v0.0.0-20181210072756-2cd4dd1e2dcb.mod -> facette.io%2Fnatsort%2F@v%2Fv0.0.0-20181210072756-2cd4dd1e2dcb.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/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/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/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/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/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/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/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.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/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.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/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/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/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/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/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/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/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.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.9.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/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/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/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/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.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.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/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/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//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.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.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/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-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/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/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.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.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/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/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-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/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.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/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//k8s.io/api/@v/v0.17.0.zip -> k8s.io%2Fapi%2F@v%2Fv0.17.0.zip mirror://goproxy//k8s.io/api/@v/v0.17.0.mod -> k8s.io%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.17.0.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.0.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.17.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.17.0.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.17.0.zip mirror://goproxy//k8s.io/client-go/@v/v0.17.0.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200414100711-2df71ebbae66.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200414100711-2df71ebbae66.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.zip -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b285332a64f804dab8230a84e896c35
diff --git a/metadata/md5-cache/app-admin/lnav-0.9.0 b/metadata/md5-cache/app-admin/lnav-0.9.0
index cbf2948872d8..dac6d9fe9f56 100644
--- a/metadata/md5-cache/app-admin/lnav-0.9.0
+++ b/metadata/md5-cache/app-admin/lnav-0.9.0
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= >=dev-db/sqlite-3.9.0 dev-libs/libpcre[cxx] >=net-misc
 SLOT=0
 SRC_URI=https://github.com/tstack/lnav/releases/download/v0.9.0/lnav-0.9.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f7e483fe1fdefe3f83af582c34c9c7a
+_md5_=14ec53bee360c9551a58a53949644959
diff --git a/metadata/md5-cache/app-admin/lnav-0.9.0-r1 b/metadata/md5-cache/app-admin/lnav-0.9.0-r1
new file mode 100644
index 000000000000..269147e0da89
--- /dev/null
+++ b/metadata/md5-cache/app-admin/lnav-0.9.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=app-arch/bzip2:0= >=dev-db/sqlite-3.9.0 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= sys-libs/zlib:0=
+DESCRIPTION=A curses-based tool for viewing and analyzing log files
+EAPI=7
+HOMEPAGE=https://lnav.org
+IUSE=unicode
+KEYWORDS=amd64 x86
+LICENSE=BSD-2
+RDEPEND=app-arch/bzip2:0= >=dev-db/sqlite-3.9.0 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= sys-libs/zlib:0=
+SLOT=0
+SRC_URI=https://github.com/tstack/lnav/releases/download/v0.9.0/lnav-0.9.0.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c430325f490e0f9d26cfda3641ec6823
diff --git a/metadata/md5-cache/app-admin/logcheck-1.3.18-r1 b/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
deleted file mode 100644
index 88f7430c7d73..000000000000
--- a/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=Mails anomalies in the system logfiles to the administrator
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/logcheck
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=!app-admin/logsentry app-misc/lockfile-progs dev-lang/perl dev-perl/mime-construct virtual/mailx
-SLOT=0
-SRC_URI=mirror://debian/pool/main/l/logcheck/logcheck_1.3.18.tar.xz
-_eclasses_=readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=28c1e4f3e54d7917cbcdb4e231c2a254
diff --git a/metadata/md5-cache/app-admin/mcelog-177-r1 b/metadata/md5-cache/app-admin/mcelog-177-r1
new file mode 100644
index 000000000000..526ca35aabf7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mcelog-177-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare pretend setup
+DESCRIPTION=A tool to log and decode Machine Check Exceptions
+EAPI=8
+HOMEPAGE=http://mcelog.org/
+IUSE=selinux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-mcelog )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/andikleen/mcelog/archive/v177.tar.gz -> mcelog-177.tar.gz
+_eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a82a9ddfbe364ddbc9f4435bde36523d
diff --git a/metadata/md5-cache/app-admin/monit-5.27.1-r1 b/metadata/md5-cache/app-admin/monit-5.27.1-r1
index 93af52ed5c10..e3248d2562bc 100644
--- a/metadata/md5-cache/app-admin/monit-5.27.1-r1
+++ b/metadata/md5-cache/app-admin/monit-5.27.1-r1
@@ -10,5 +10,5 @@ LICENSE=AGPL-3
 RDEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://mmonit.com/monit/dist/monit-5.27.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b0f9cd4a34f96edb25c78334510a81c6
diff --git a/metadata/md5-cache/app-admin/monit-5.27.2-r1 b/metadata/md5-cache/app-admin/monit-5.27.2-r1
index b21e78aa92f5..14d87aef471c 100644
--- a/metadata/md5-cache/app-admin/monit-5.27.2-r1
+++ b/metadata/md5-cache/app-admin/monit-5.27.2-r1
@@ -10,5 +10,5 @@ LICENSE=AGPL-3
 RDEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://mmonit.com/monit/dist/monit-5.27.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b0f9cd4a34f96edb25c78334510a81c6
diff --git a/metadata/md5-cache/app-admin/monit-5.28.0-r1 b/metadata/md5-cache/app-admin/monit-5.28.0-r1
index 82bb52cc650c..038a90dd0b16 100644
--- a/metadata/md5-cache/app-admin/monit-5.28.0-r1
+++ b/metadata/md5-cache/app-admin/monit-5.28.0-r1
@@ -10,5 +10,5 @@ LICENSE=AGPL-3
 RDEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://mmonit.com/monit/dist/monit-5.28.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0606104f45028e049ae16f3d60f409b3
diff --git a/metadata/md5-cache/app-admin/pass-1.7.3 b/metadata/md5-cache/app-admin/pass-1.7.3
index 74f03dd29cfd..94737e2422f3 100644
--- a/metadata/md5-cache/app-admin/pass-1.7.3
+++ b/metadata/md5-cache/app-admin/pass-1.7.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.3.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c212f1491880a9837abab79581527ec3
diff --git a/metadata/md5-cache/app-admin/pass-1.7.4 b/metadata/md5-cache/app-admin/pass-1.7.4
index a3d716ce7081..7da66086e7f6 100644
--- a/metadata/md5-cache/app-admin/pass-1.7.4
+++ b/metadata/md5-cache/app-admin/pass-1.7.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.4.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf37ed6d6733cc0532f40e0850633f2a
diff --git a/metadata/md5-cache/app-admin/pass-9999 b/metadata/md5-cache/app-admin/pass-9999
index 6db6d239271f..6972e5df7ae5 100644
--- a/metadata/md5-cache/app-admin/pass-9999
+++ b/metadata/md5-cache/app-admin/pass-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed702abb271fde06b8d455b7ba503d19
diff --git a/metadata/md5-cache/app-admin/pass-otp-1.2.0 b/metadata/md5-cache/app-admin/pass-otp-1.2.0
index 08e164781237..122e30a849a0 100644
--- a/metadata/md5-cache/app-admin/pass-otp-1.2.0
+++ b/metadata/md5-cache/app-admin/pass-otp-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-admin/pass-1.7 sys-auth/oath-toolkit qrcode? ( media-gfx/qrencode
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tadfisher/pass-otp/releases/download/v1.2.0/pass-otp-1.2.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51747febbd0196bc8c7e1a07850ec14c
diff --git a/metadata/md5-cache/app-admin/ps_mem-3.13_p20200417 b/metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
deleted file mode 100644
index c6d81e32638c..000000000000
--- a/metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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(-)] )
-DESCRIPTION=A utility to report core memory usage per program
-EAPI=6
-HOMEPAGE=https://github.com/pixelb/ps_mem
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/pixelb/ps_mem/archive/fc75a8cc3cda05c53a4ae4fe296deeb9fc43908d.tar.gz -> ps_mem-3.13_p20200417.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f75a9e8e295c5f8d0b1d652967ad5d31
diff --git a/metadata/md5-cache/app-admin/rex-1.13.3 b/metadata/md5-cache/app-admin/rex-1.13.3
index a7ad69877bce..713a00346deb 100644
--- a/metadata/md5-cache/app-admin/rex-1.13.3
+++ b/metadata/md5-cache/app-admin/rex-1.13.3
@@ -11,5 +11,5 @@ RDEPEND=!minimal? ( dev-perl/DBI dev-perl/Expect dev-perl/IPC-Shareable dev-perl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERKI/Rex-1.13.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=775060fd4ae278a14a97e3a3a4967e0b
diff --git a/metadata/md5-cache/app-admin/rex-9999 b/metadata/md5-cache/app-admin/rex-9999
index c9e3ef87bdbb..e2ee61b260e2 100644
--- a/metadata/md5-cache/app-admin/rex-9999
+++ b/metadata/md5-cache/app-admin/rex-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!minimal? ( dev-perl/DBI dev-perl/Expect dev-perl/IPC-Shareable dev-perl/XML-LibXML ) virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Data-Validate-IP dev-perl/Devel-Caller dev-perl/Digest-HMAC virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec dev-perl/HTTP-Message dev-perl/Hash-Merge virtual/perl-IO dev-perl/IO-String dev-perl/IO-Tty dev-perl/JSON-MaybeXS virtual/perl-MIME-Base64 dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape virtual/perl-Storable dev-perl/TermReadKey virtual/perl-Test-Simple dev-perl/Text-Glob virtual/perl-Text-Tabs+Wrap virtual/perl-Time-HiRes dev-perl/URI dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-version dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=775060fd4ae278a14a97e3a3a4967e0b
diff --git a/metadata/md5-cache/app-admin/ryzen_monitor-1.0.4 b/metadata/md5-cache/app-admin/ryzen_monitor-1.0.4
new file mode 100644
index 000000000000..43e084c59d91
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ryzen_monitor-1.0.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Monitor power information of Ryzen processors via the PM table of the SMU
+EAPI=7
+HOMEPAGE=https://github.com/hattedsquirrel/ryzen_monitor
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=app-admin/ryzen_smu
+SLOT=0
+SRC_URI=https://github.com/hattedsquirrel/ryzen_monitor/archive/v1.0.4.tar.gz -> ryzen_monitor-1.0.4.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ada6b32abeda667d5c62d5633a0dbc48
diff --git a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
new file mode 100644
index 000000000000..79c4ef8bf5d8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel driver for AMD Ryzen's System Management Unit
+EAPI=7
+HOMEPAGE=https://github.com/leogx9r/ryzen_smu
+IUSE=kernel_linux kernel_linux dist-kernel kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://github.com/leogx9r/ryzen_smu/archive/v0.1.2.tar.gz -> ryzen_smu-0.1.2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9ee7a9a54882c0756a86572f4fcabba0
diff --git a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
new file mode 100644
index 000000000000..6a5c482f331e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel driver for AMD Ryzen's System Management Unit
+EAPI=7
+HOMEPAGE=https://github.com/leogx9r/ryzen_smu
+IUSE=kernel_linux kernel_linux dist-kernel kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/ryzen_smu/ryzen_smu-0.1.2_p20210627.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=98d57297c7863e3c6b0b08b0fda2ff7d
diff --git a/metadata/md5-cache/app-admin/salt-3000.8-r1 b/metadata/md5-cache/app-admin/salt-3000.8-r1
index d6b90a6ec040..b9fad696a0f4 100644
--- a/metadata/md5-cache/app-admin/salt-3000.8-r1
+++ b/metadata/md5-cache/app-admin/salt-3000.8-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Salt is a remote execution and configuration manager
 EAPI=7
 HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
 IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_8
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=sys-apps/pciutils dev-python/distro[python_targets_python3_8(-)?] dev-python/jinja[python_targets_python3_8(-)?] dev-python/libnacl[python_targets_python3_8(-)?] >=dev-python/msgpack-0.5[python_targets_python3_8(-)?] <dev-python/msgpack-1.0[python_targets_python3_8(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/markupsafe[python_targets_python3_8(-)?] >=dev-python/requests-1.0.0[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python3_8(-)?] ) mako? ( dev-python/mako[python_targets_python3_8(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?] ) libvirt? ( python_targets_python3_8? ( dev-python/libvirt-python[python_targets_python3_8(-)?] ) ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_8(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_8(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_8(-)?] >=dev-python/raet-0.6.0[python_targets_python3_8(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_8(-)?] ) cheetah? ( dev-python/cheetah3[python_targets_python3_8(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_8(-)?] ) portage? ( sys-apps/portage[python_targets_python3_8(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_8(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_8? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_8(-)?] ) ) neutron? ( python_targets_python3_8? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_8(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_8(-)?] ) profile? ( dev-python/yappi[python_targets_python3_8(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) x86? ( test ) test
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3000.8.tar.gz https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1a5423865dd7f457ccca55c3c0ccbd30
+_md5_=dd686e80c96f0fc5e94d7871efb7595c
diff --git a/metadata/md5-cache/app-admin/salt-3000.9-r1 b/metadata/md5-cache/app-admin/salt-3000.9-r1
index a79f84bdb429..0eb7678309d0 100644
--- a/metadata/md5-cache/app-admin/salt-3000.9-r1
+++ b/metadata/md5-cache/app-admin/salt-3000.9-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Salt is a remote execution and configuration manager
 EAPI=7
 HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
 IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=sys-apps/pciutils dev-python/distro[python_targets_python3_8(-)?] dev-python/jinja[python_targets_python3_8(-)?] dev-python/libnacl[python_targets_python3_8(-)?] >=dev-python/msgpack-0.5[python_targets_python3_8(-)?] <dev-python/msgpack-1.0[python_targets_python3_8(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/markupsafe[python_targets_python3_8(-)?] >=dev-python/requests-1.0.0[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python3_8(-)?] ) mako? ( dev-python/mako[python_targets_python3_8(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?] ) libvirt? ( python_targets_python3_8? ( dev-python/libvirt-python[python_targets_python3_8(-)?] ) ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_8(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_8(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_8(-)?] >=dev-python/raet-0.6.0[python_targets_python3_8(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_8(-)?] ) cheetah? ( dev-python/cheetah3[python_targets_python3_8(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_8(-)?] ) portage? ( sys-apps/portage[python_targets_python3_8(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_8(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_8? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_8(-)?] ) ) neutron? ( python_targets_python3_8? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_8(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_8(-)?] ) profile? ( dev-python/yappi[python_targets_python3_8(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3000.9.tar.gz https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b636c860bf1b48b13fbc66e7c8c95f7
+_md5_=64bd26c3f37add4a113dc37d2711765b
diff --git a/metadata/md5-cache/app-admin/salt-3001.6-r1 b/metadata/md5-cache/app-admin/salt-3001.6-r1
index 628264b1165e..464bf99928cb 100644
--- a/metadata/md5-cache/app-admin/salt-3001.6-r1
+++ b/metadata/md5-cache/app-admin/salt-3001.6-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Salt is a remote execution and configuration manager
 EAPI=7
 HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
 IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=sys-apps/pciutils dev-python/distro[python_targets_python3_8(-)?] dev-python/jinja[python_targets_python3_8(-)?] dev-python/libnacl[python_targets_python3_8(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?] >=dev-python/pycryptodome-3.9.7[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/markupsafe[python_targets_python3_8(-)?] >=dev-python/requests-1.0.0[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?] dev-python/toml[python_targets_python3_8(-)?] dev-python/watchdog[python_targets_python3_8(-)?] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python3_8(-)?] ) mako? ( dev-python/mako[python_targets_python3_8(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?] ) libvirt? ( python_targets_python3_8? ( dev-python/libvirt-python[python_targets_python3_8(-)?] ) ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_8(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_8(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_8(-)?] >=dev-python/raet-0.6.0[python_targets_python3_8(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_8(-)?] ) cheetah? ( dev-python/cheetah3[python_targets_python3_8(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_8(-)?] ) portage? ( sys-apps/portage[python_targets_python3_8(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_8(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_8? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_8(-)?] ) ) neutron? ( python_targets_python3_8? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_8(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_8(-)?] ) profile? ( dev-python/yappi[python_targets_python3_8(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3001.6.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=76e6af04d1d7324e001f58d5ed043ead
+_md5_=29dbea826d7028feb0c2d3e83af19ac6
diff --git a/metadata/md5-cache/app-admin/salt-3002.5-r1 b/metadata/md5-cache/app-admin/salt-3002.5-r1
index 7c1755cd95cf..fed72c77e3c8 100644
--- a/metadata/md5-cache/app-admin/salt-3002.5-r1
+++ b/metadata/md5-cache/app-admin/salt-3002.5-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Salt is a remote execution and configuration manager
 EAPI=7
 HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
 IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libnacl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mako? ( dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) libvirt? ( python_targets_python3_8? ( dev-python/libvirt-python[python_targets_python3_8(-)?] ) ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/raet-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cheetah? ( dev-python/cheetah3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) portage? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_8? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_8(-)?] ) ) neutron? ( python_targets_python3_8? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_8(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) profile? ( dev-python/yappi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3002.5.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=21ad1a5d308bb918e5653f1e1e3c8e6d
+_md5_=a56136d24ade8dfaca38f6c2ebd65745
diff --git a/metadata/md5-cache/app-admin/salt-3003-r1 b/metadata/md5-cache/app-admin/salt-3003-r1
index fdc360d80cfe..ba43eb5938e9 100644
--- a/metadata/md5-cache/app-admin/salt-3003-r1
+++ b/metadata/md5-cache/app-admin/salt-3003-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Salt is a remote execution and configuration manager
 EAPI=7
 HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
 IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libnacl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?] libcloud? ( >=dev-python/libcloud-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mako? ( dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) libvirt? ( python_targets_python3_8? ( dev-python/libvirt-python[python_targets_python3_8(-)?] ) ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/raet-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cheetah? ( dev-python/cheetah3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) portage? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_8? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_8(-)?] ) ) neutron? ( python_targets_python3_8? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_8(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) profile? ( dev-python/yappi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3003.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0638db562fc4470b9548dd8ae7c22a80
+_md5_=f13d2d01bbd5398d0fad0b7713bf8d13
diff --git a/metadata/md5-cache/app-admin/salt-3003.1 b/metadata/md5-cache/app-admin/salt-3003.1
deleted file mode 100644
index 80f0e719d817..000000000000
--- a/metadata/md5-cache/app-admin/salt-3003.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libnacl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?] libcloud? ( >=dev-python/libcloud-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mako? ( dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) libvirt? ( python_targets_python3_8? ( dev-python/libvirt-python[python_targets_python3_8(-)?] ) ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/raet-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cheetah? ( dev-python/cheetah3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) portage? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_8? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_8(-)?] ) ) neutron? ( python_targets_python3_8? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_8(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) profile? ( dev-python/yappi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/boto-2.32.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/moto-0.3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-salt-factories-0.121.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libcloud[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-20.0.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !x86? ( >=dev-python/boto3-1.3.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) virtual/pkgconfig python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Salt is a remote execution and configuration manager
-EAPI=7
-HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
-IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libnacl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?] libcloud? ( >=dev-python/libcloud-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mako? ( dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) libvirt? ( python_targets_python3_8? ( dev-python/libvirt-python[python_targets_python3_8(-)?] ) ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/raet-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cheetah? ( dev-python/cheetah3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) portage? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_8? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_8(-)?] ) ) neutron? ( python_targets_python3_8? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_8(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) profile? ( dev-python/yappi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) x86? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-3003.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8595f9f40490f73bb877c446224d2d8d
diff --git a/metadata/md5-cache/app-admin/salt-3003.1-r1 b/metadata/md5-cache/app-admin/salt-3003.1-r1
new file mode 100644
index 000000000000..aadb60960229
--- /dev/null
+++ b/metadata/md5-cache/app-admin/salt-3003.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libnacl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?] libcloud? ( >=dev-python/libcloud-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mako? ( dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) libvirt? ( python_targets_python3_8? ( dev-python/libvirt-python[python_targets_python3_8(-)?] ) ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/raet-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cheetah? ( dev-python/cheetah3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) portage? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_8? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_8(-)?] ) ) neutron? ( python_targets_python3_8? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_8(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) profile? ( dev-python/yappi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/boto-2.32.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/moto-0.3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-salt-factories-0.121.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libcloud[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-20.0.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !x86? ( >=dev-python/boto3-1.3.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) virtual/pkgconfig python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Salt is a remote execution and configuration manager
+EAPI=7
+HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
+IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libnacl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?] libcloud? ( >=dev-python/libcloud-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mako? ( dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) libvirt? ( python_targets_python3_8? ( dev-python/libvirt-python[python_targets_python3_8(-)?] ) ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/raet-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cheetah? ( dev-python/cheetah3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) portage? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_8? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_8(-)?] ) ) neutron? ( python_targets_python3_8? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_8(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) profile? ( dev-python/yappi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) x86? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/salt/salt-3003.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2b7679942a235da5cfb9582cb8aacfdc
diff --git a/metadata/md5-cache/app-admin/serf-0.8.1-r1 b/metadata/md5-cache/app-admin/serf-0.8.1-r1
deleted file mode 100644
index e6e82ffdd6b7..000000000000
--- a/metadata/md5-cache/app-admin/serf-0.8.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.6:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Service orchestration and management tool
-EAPI=6
-HOMEPAGE=https://www.serfdom.io/
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/serf/archive/v0.8.1.tar.gz -> serf-0.8.1.tar.gz https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=c437d68a75b1add11d9a3bd0b68fcdf0
diff --git a/metadata/md5-cache/app-admin/serf-0.8.2 b/metadata/md5-cache/app-admin/serf-0.8.2
deleted file mode 100644
index 9d13ada73dd3..000000000000
--- a/metadata/md5-cache/app-admin/serf-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=Service orchestration and management tool
-EAPI=7
-HOMEPAGE=https://www.serfdom.io/
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD MIT
-RDEPEND=acct-user/serf acct-group/serf
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/serf/archive/v0.8.2.tar.gz -> serf-0.8.2.tar.gz mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/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/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip 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.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.zip -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.zip 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.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip 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/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.zip 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.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.zip 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/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.zip 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.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.zip 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/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/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.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip 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/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.zip 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/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.zip 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/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/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-20181026203630-95b1ffbd15a5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.zip 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
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5793d54b5dea547096c843517c50bfc7
diff --git a/metadata/md5-cache/app-admin/sysklogd-2.2.3 b/metadata/md5-cache/app-admin/sysklogd-2.2.3
index 6d89e6935d5c..223d1fce3785 100644
--- a/metadata/md5-cache/app-admin/sysklogd-2.2.3
+++ b/metadata/md5-cache/app-admin/sysklogd-2.2.3
@@ -5,11 +5,11 @@ DESCRIPTION=Standard log daemons
 EAPI=7
 HOMEPAGE=https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd
 IUSE=logger logrotate systemd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=logger? ( !<sys-apps/util-linux-2.34-r3 !>=sys-apps/util-linux-2.34-r3[logger] ) logrotate? ( app-admin/logrotate )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/troglobit/sysklogd/releases/download/v2.2.3/sysklogd-2.2.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1a70cfd3e444efbf6a80b9b75d4017ac
+_md5_=5f9298b51dee27204118a95172928d1e
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.30.1-r2 b/metadata/md5-cache/app-admin/syslog-ng-3.30.1-r2
index 625f9577716e..9d5e0628ef01 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.30.1-r2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.30.1-r2
@@ -5,7 +5,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.30.1/syslog-ng-3.30.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88df5037d742ae2fd582ef2fea559926
+_md5_=f91c850cf3600403281e74c138fb95ce
diff --git a/metadata/md5-cache/app-admin/sysstat-12.5.3 b/metadata/md5-cache/app-admin/sysstat-12.5.3
deleted file mode 100644
index 5e504bac570c..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-12.5.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( sys-devel/gettext )
-DESCRIPTION=System performance tools for Linux
-EAPI=7
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=dcron debug nls lm-sensors selinux static systemd
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) !dcron? ( !sys-process/dcron ) selinux? ( sec-policy/selinux-sysstat )
-REQUIRED_USE=dcron? ( !systemd )
-SLOT=0
-SRC_URI=https://github.com/sysstat/sysstat/archive/v12.5.3.tar.gz -> sysstat-12.5.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c1138edab549679432814206c1f231a4
diff --git a/metadata/md5-cache/app-admin/sysstat-12.5.4 b/metadata/md5-cache/app-admin/sysstat-12.5.4
index 7e9e08c78bf5..ed07e3376344 100644
--- a/metadata/md5-cache/app-admin/sysstat-12.5.4
+++ b/metadata/md5-cache/app-admin/sysstat-12.5.4
@@ -5,11 +5,11 @@ DESCRIPTION=System performance tools for Linux
 EAPI=7
 HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
 IUSE=dcron debug nls lm-sensors selinux static systemd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) !dcron? ( !sys-process/dcron ) selinux? ( sec-policy/selinux-sysstat )
 REQUIRED_USE=dcron? ( !systemd )
 SLOT=0
 SRC_URI=https://github.com/sysstat/sysstat/archive/v12.5.4.tar.gz -> sysstat-12.5.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=745f30e9c07692623c85ee9f0c5d6f13
+_md5_=c1138edab549679432814206c1f231a4
diff --git a/metadata/md5-cache/app-admin/xkcdpass-1.17.6-r1 b/metadata/md5-cache/app-admin/xkcdpass-1.17.6-r1
deleted file mode 100644
index ff0c7e3da1dd..000000000000
--- a/metadata/md5-cache/app-admin/xkcdpass-1.17.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Password generator inspired by XKCD 936
-EAPI=7
-HOMEPAGE=https://github.com/redacted/XKCD-password-generator
-IUSE=l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD CC-BY-3.0 l10n_de? ( GPL-3 ) l10n_it? ( CC-BY-SA-3.0 ) l10n_no? ( CC-BY-4.0 )
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/x/xkcdpass/xkcdpass-1.17.6.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7d2e72104c5ee44549edded3539d2dfa
diff --git a/metadata/md5-cache/app-admin/yadm-2.4.0 b/metadata/md5-cache/app-admin/yadm-2.4.0
index 732115a88b90..73e0f55e063c 100644
--- a/metadata/md5-cache/app-admin/yadm-2.4.0
+++ b/metadata/md5-cache/app-admin/yadm-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gnupg dev-vcs/git
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TheLocehiliosan/yadm/archive/2.4.0.tar.gz -> yadm-2.4.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e33aa7bd34eb8a0b147cb5bab849919
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index f220f2b714f3..9f254cc8f1f9 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/libarchive-3.5.1 b/metadata/md5-cache/app-arch/libarchive-3.5.1
deleted file mode 100644
index 044e67bad572..000000000000
--- a/metadata/md5-cache/app-arch/libarchive-3.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( 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(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) )
-DESCRIPTION=Multi-format archive and compression library
-EAPI=7
-HOMEPAGE=https://www.libarchive.org/
-IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD BSD-2 BSD-4 public-domain
-RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( 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(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/13
-SRC_URI=https://www.libarchive.org/downloads/libarchive-3.5.1.tar.gz
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c76ff0d4a513eaac749a562e83c13054
diff --git a/metadata/md5-cache/app-arch/libarchive-3.5.1-r1 b/metadata/md5-cache/app-arch/libarchive-3.5.1-r1
new file mode 100644
index 000000000000..327f049768cd
--- /dev/null
+++ b/metadata/md5-cache/app-arch/libarchive-3.5.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( 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(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.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(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) )
+DESCRIPTION=Multi-format archive and compression library
+EAPI=7
+HOMEPAGE=https://www.libarchive.org/
+IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs xattr +zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD BSD-2 BSD-4 public-domain
+RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( 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(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.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(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/13
+SRC_URI=https://www.libarchive.org/downloads/libarchive-3.5.1.tar.gz
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=083633053973455a6ee4066a05e76b62
diff --git a/metadata/md5-cache/app-arch/makeself-2.2.0-r2 b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
deleted file mode 100644
index d5c3f4029056..000000000000
--- a/metadata/md5-cache/app-arch/makeself-2.2.0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Shell script that generates a self-extractible tar.gz
-EAPI=7
-HOMEPAGE=http://www.megastep.org/makeself/
-KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=https://github.com/megastep/makeself/archive/release-2.2.0.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=c02a669a1c8f12a5c082d9e4e12f7189
diff --git a/metadata/md5-cache/app-arch/makeself-2.4.3 b/metadata/md5-cache/app-arch/makeself-2.4.3
index 211b351e049c..ecb2eca78722 100644
--- a/metadata/md5-cache/app-arch/makeself-2.4.3
+++ b/metadata/md5-cache/app-arch/makeself-2.4.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Shell script that generates a self-extractible tar.gz
 EAPI=7
-HOMEPAGE=http://www.megastep.org/makeself/
+HOMEPAGE=https://makeself.io/
 KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/megastep/makeself/archive/refs/tags/release-2.4.3.tar.gz -> makeself-2.4.3.tar.gz
 _eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
-_md5_=8de606a05a44d7b62a502d31323c43cd
+_md5_=7e20de2dfa6528e738298283bdb75610
diff --git a/metadata/md5-cache/app-arch/makeself-2.4.4 b/metadata/md5-cache/app-arch/makeself-2.4.4
deleted file mode 100644
index 2ae5c13373af..000000000000
--- a/metadata/md5-cache/app-arch/makeself-2.4.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Shell script that generates a self-extractible tar.gz
-EAPI=7
-HOMEPAGE=http://www.megastep.org/makeself/
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/megastep/makeself/archive/refs/tags/release-2.4.4.tar.gz -> makeself-2.4.4.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
-_md5_=ce6d42a006afade516d990e042cffcdd
diff --git a/metadata/md5-cache/app-arch/makeself-2.4.5 b/metadata/md5-cache/app-arch/makeself-2.4.5
new file mode 100644
index 000000000000..775df0bc8113
--- /dev/null
+++ b/metadata/md5-cache/app-arch/makeself-2.4.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Shell script that generates a self-extractible tar.gz
+EAPI=7
+HOMEPAGE=https://makeself.io/
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/megastep/makeself/archive/refs/tags/release-2.4.5.tar.gz -> makeself-2.4.5.tar.gz
+_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_md5_=7d9e0383d20c17c8ad70089a4a3e3451
diff --git a/metadata/md5-cache/app-arch/pigz-2.4-r1 b/metadata/md5-cache/app-arch/pigz-2.4-r1
deleted file mode 100644
index 8ffbe58c04eb..000000000000
--- a/metadata/md5-cache/app-arch/pigz-2.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!static? ( sys-libs/zlib ) static? ( sys-libs/zlib[static-libs(+)] ) test? ( app-arch/ncompress )
-DESCRIPTION=A parallel implementation of gzip
-EAPI=6
-HOMEPAGE=https://www.zlib.net/pigz/
-IUSE=static symlink test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris
-LICENSE=ZLIB
-RDEPEND=!static? ( sys-libs/zlib )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.zlib.net/pigz/pigz-2.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6970e74861d5f27e3ba0624185ec300f
diff --git a/metadata/md5-cache/app-arch/pigz-2.5 b/metadata/md5-cache/app-arch/pigz-2.5
deleted file mode 100644
index eb037fe73225..000000000000
--- a/metadata/md5-cache/app-arch/pigz-2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!static? ( sys-libs/zlib ) static? ( sys-libs/zlib[static-libs(+)] ) test? ( app-arch/ncompress )
-DESCRIPTION=A parallel implementation of gzip
-EAPI=7
-HOMEPAGE=https://www.zlib.net/pigz/
-IUSE=static symlink test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris
-LICENSE=ZLIB
-RDEPEND=!static? ( sys-libs/zlib )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.zlib.net/pigz/pigz-2.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c7c1b7a023822908a5a3c7ab9362cdc3
diff --git a/metadata/md5-cache/app-arch/pigz-2.6 b/metadata/md5-cache/app-arch/pigz-2.6
index 8e55846c0971..a15ddd3c8f9d 100644
--- a/metadata/md5-cache/app-arch/pigz-2.6
+++ b/metadata/md5-cache/app-arch/pigz-2.6
@@ -4,11 +4,11 @@ DESCRIPTION=A parallel implementation of gzip
 EAPI=7
 HOMEPAGE=https://www.zlib.net/pigz/
 IUSE=static symlink test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris
 LICENSE=ZLIB
 RDEPEND=!static? ( sys-libs/zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.zlib.net/pigz/pigz-2.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c7c1b7a023822908a5a3c7ab9362cdc3
+_md5_=9049333524509d16cc99ea1ae4e359ef
diff --git a/metadata/md5-cache/app-arch/rpm-4.16.0 b/metadata/md5-cache/app-arch/rpm-4.16.0
index f81862542852..324c25abb3c6 100644
--- a/metadata/md5-cache/app-arch/rpm-4.16.0
+++ b/metadata/md5-cache/app-arch/rpm-4.16.0
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dbus? ( sys-apps/dbus ) dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) nls? ( virtual/libintl ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) virtual/pkgconfig test? ( sys-apps/fakechroot ) dev-lang/perl
+DEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dbus? ( sys-apps/dbus ) dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) nls? ( virtual/libintl ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) virtual/pkgconfig test? ( sys-apps/fakechroot ) dev-lang/perl
 DESCRIPTION=Red Hat Package Management Utils
 EAPI=7
 HOMEPAGE=https://rpm.org https://github.com/rpm-software-management/rpm
-IUSE=acl caps doc dbus lua nls openmp python selinux test +zstd +lua_single_target_lua5-2 python_single_target_python3_8 python_single_target_python3_9
+IUSE=acl caps doc dbus lua nls openmp python selinux test +zstd lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
-RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dbus? ( sys-apps/dbus ) dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) nls? ( virtual/libintl ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dbus? ( sys-apps/dbus ) dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) nls? ( virtual/libintl ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.16.x/rpm-4.16.0.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=446c6baf3b52e478cf3c48c7e0e00eec
+_md5_=21ad04c58b69a8eb29da8155105ef02f
diff --git a/metadata/md5-cache/app-arch/rpm-4.16.1.3 b/metadata/md5-cache/app-arch/rpm-4.16.1.3
index 3bad84438595..cb22b148c6f5 100644
--- a/metadata/md5-cache/app-arch/rpm-4.16.1.3
+++ b/metadata/md5-cache/app-arch/rpm-4.16.1.3
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dbus? ( sys-apps/dbus ) dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/libgcrypt python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) nls? ( virtual/libintl ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) virtual/pkgconfig test? ( sys-apps/fakechroot ) dev-lang/perl
+DEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dbus? ( sys-apps/dbus ) dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/libgcrypt python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) nls? ( virtual/libintl ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) virtual/pkgconfig test? ( sys-apps/fakechroot ) dev-lang/perl
 DESCRIPTION=Red Hat Package Management Utils
 EAPI=7
 HOMEPAGE=https://rpm.org https://github.com/rpm-software-management/rpm
-IUSE=acl caps doc dbus lua nls openmp python selinux test +zstd +lua_single_target_lua5-2 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+IUSE=acl caps doc dbus lua nls openmp python selinux test +zstd lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
-RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dbus? ( sys-apps/dbus ) dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/libgcrypt python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) nls? ( virtual/libintl ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dbus? ( sys-apps/dbus ) dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/libgcrypt python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) nls? ( virtual/libintl ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.16.x/rpm-4.16.1.3.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0ba6555936564a55017768e6b9870ee5
+_md5_=6bee9e36fb77788ff61486fe17e6ef85
diff --git a/metadata/md5-cache/app-arch/unar-1.10.7 b/metadata/md5-cache/app-arch/unar-1.10.7
index a61b33f45106..8feea6cb0d56 100644
--- a/metadata/md5-cache/app-arch/unar-1.10.7
+++ b/metadata/md5-cache/app-arch/unar-1.10.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/bzip2:= dev-libs/icu:= gnustep-base/gnustep-base:= media-sound/wavpack sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/MacPaw/XADMaster/archive/v1.10.7/XADMaster-1.10.7.tar.gz https://github.com/MacPaw/universal-detector/archive/1.1/universal-detector-1.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=183ef53183ce8906921fcbc3e0cde8cf
diff --git a/metadata/md5-cache/app-arch/unp-2.0_pre7_p1-r1 b/metadata/md5-cache/app-arch/unp-2.0_pre7_p1-r1
index 4666ab56cbac..b40090e1db0e 100644
--- a/metadata/md5-cache/app-arch/unp-2.0_pre7_p1-r1
+++ b/metadata/md5-cache/app-arch/unp-2.0_pre7_p1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( sys-devel/gettext ) dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=99e04024aeb3dca5fd7ae89bb8170f75
diff --git a/metadata/md5-cache/app-arch/unp-2.0_pre8 b/metadata/md5-cache/app-arch/unp-2.0_pre8
index 40058cb1fb81..8232fc35a7a3 100644
--- a/metadata/md5-cache/app-arch/unp-2.0_pre8
+++ b/metadata/md5-cache/app-arch/unp-2.0_pre8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( sys-devel/gettext ) dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/u/unp/unp_2.0~pre8.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4defb762215dc4143c3b6b2ad6536545
diff --git a/metadata/md5-cache/app-arch/unp-2.0_pre9 b/metadata/md5-cache/app-arch/unp-2.0_pre9
index 2b0b319eb3ff..f3a562465f58 100644
--- a/metadata/md5-cache/app-arch/unp-2.0_pre9
+++ b/metadata/md5-cache/app-arch/unp-2.0_pre9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( sys-devel/gettext ) dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/u/unp/unp_2.0~pre9.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6667f395da4e87b4d68f80f62655068d
diff --git a/metadata/md5-cache/app-arch/upx-bin-3.96 b/metadata/md5-cache/app-arch/upx-bin-3.96
index 4c035ab2c9ac..1335e581c148 100644
--- a/metadata/md5-cache/app-arch/upx-bin-3.96
+++ b/metadata/md5-cache/app-arch/upx-bin-3.96
@@ -9,5 +9,5 @@ RDEPEND=!app-arch/upx
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-i386_linux.tar.xz ) amd64? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz ) arm64? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-arm64_linux.tar.xz ) arm? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-armeb_linux.tar.xz ) mips? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-mipsel_linux.tar.xz ) ppc? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-powerpc_linux.tar.xz ) ppc64? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-powerpc64le_linux.tar.xz )
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=f306c2e6c723a4d0b6c31dd30aed5129
diff --git a/metadata/md5-cache/app-arch/wimlib-1.13.3 b/metadata/md5-cache/app-arch/wimlib-1.13.3
index 8f82960d4643..fd222ef6f807 100644
--- a/metadata/md5-cache/app-arch/wimlib-1.13.3
+++ b/metadata/md5-cache/app-arch/wimlib-1.13.3
@@ -5,12 +5,12 @@ DESCRIPTION=The open source Windows Imaging (WIM) library
 EAPI=7
 HOMEPAGE=https://wimlib.net/
 IUSE=cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-3+ LGPL-3+ ) CC0-1.0
 RDEPEND=dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) openssl? ( dev-libs/openssl:0= ) iso? ( app-arch/cabextract app-cdr/cdrtools )
 REQUIRED_USE=cpu_flags_x86_ssse3? ( !openssl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wimlib.net/downloads/wimlib-1.13.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=becc8bb2db944f42a9bb42fbbc2aef78
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7a3f03ce3f0c7aa0d2933fbf05500dfe
diff --git a/metadata/md5-cache/app-arch/wimlib-1.13.4 b/metadata/md5-cache/app-arch/wimlib-1.13.4
new file mode 100644
index 000000000000..e371e5c34bd5
--- /dev/null
+++ b/metadata/md5-cache/app-arch/wimlib-1.13.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig cpu_flags_x86_ssse3? ( yasm? ( dev-lang/yasm ) !yasm? ( dev-lang/nasm ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=The open source Windows Imaging (WIM) library
+EAPI=7
+HOMEPAGE=https://wimlib.net
+IUSE=cpu_flags_x86_ssse3 fuse iso ntfs ssl test threads yasm
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-3+ LGPL-3+ ) CC0-1.0
+RDEPEND=dev-libs/libxml2:2 fuse? ( sys-fs/fuse:0 ) iso? ( app-arch/cabextract app-cdr/cdrtools ) ntfs? ( sys-fs/ntfs3g ) ssl? ( dev-libs/openssl:0= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://wimlib.net/downloads/wimlib-1.13.4.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=df230daa9ed86ec51a1b52bf08739da8
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.5 b/metadata/md5-cache/app-arch/xz-utils-5.2.5
deleted file mode 100644
index 3d9d30bd9785..000000000000
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
-DESCRIPTION=utils for managing LZMA compressed files
-EAPI=7
-HOMEPAGE=https://tukaani.org/xz/
-IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-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=public-domain LGPL-2.1+ GPL-2+
-RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
-RESTRICT=!extra-filters? ( test )
-SLOT=0
-SRC_URI=https://tukaani.org/xz/xz-5.2.5.tar.gz
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=fbdf248150b26b55c7b5670172b068a9
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.5-r1 b/metadata/md5-cache/app-arch/xz-utils-5.2.5-r1
new file mode 100644
index 000000000000..bdb02d21b5b2
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
+DESCRIPTION=utils for managing LZMA compressed files
+EAPI=7
+HOMEPAGE=https://tukaani.org/xz/
+IUSE=elibc_FreeBSD +extra-filters nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+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=public-domain LGPL-2.1+ GPL-2+
+RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
+RESTRICT=!extra-filters? ( test )
+SLOT=0
+SRC_URI=https://tukaani.org/xz/xz-5.2.5.tar.gz
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_md5_=2b4a122b46c6b68b0fca2625f53e7a44
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index facdc3374a79..7068d9396193 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -4,11 +4,11 @@ DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 DESCRIPTION=utils for managing LZMA compressed files
 EAPI=7
 HOMEPAGE=https://tukaani.org/xz/
-IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+IUSE=elibc_FreeBSD +extra-filters nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 PROPERTIES=live
 RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 RESTRICT=!extra-filters? ( test )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=17bcb6b2e2938e2931a8b90d0ffac532
+_md5_=f0d519ea23e09ce30f12a2d2ecc550e7
diff --git a/metadata/md5-cache/app-arch/zpaq-7.15 b/metadata/md5-cache/app-arch/zpaq-7.15
index 7eb4cd387996..906421d28d64 100644
--- a/metadata/md5-cache/app-arch/zpaq-7.15
+++ b/metadata/md5-cache/app-arch/zpaq-7.15
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Unlicense
 SLOT=0
 SRC_URI=http://mattmahoney.net/dc/zpaq715.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f16f69019a0c500a213d6ca36baa565c
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 497ec2b079e5..fb0cff6ca03c 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/backupninja-1.2.1-r1 b/metadata/md5-cache/app-backup/backupninja-1.2.1-r1
new file mode 100644
index 000000000000..6c711ae98205
--- /dev/null
+++ b/metadata/md5-cache/app-backup/backupninja-1.2.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure
+DESCRIPTION=lightweight, extensible meta-backup system
+EAPI=8
+HOMEPAGE=https://0xacab.org/liberate/backupninja
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog
+SLOT=0
+SRC_URI=https://0xacab.org/liberate/backupninja/-/archive/backupninja_upstream/1.2.1/backupninja-backupninja_upstream-1.2.1.tar.gz
+_md5_=e49be3519b15731f753591ba8cfef116
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.17 b/metadata/md5-cache/app-backup/borgbackup-1.1.17
new file mode 100644
index 000000000000..b0c1a9f5c51c
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.17
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0=
+DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
+EAPI=7
+HOMEPAGE=https://borgbackup.readthedocs.io/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.17.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a3644624cb00287998f94d3815089475
diff --git a/metadata/md5-cache/app-backup/borgbackup-9999 b/metadata/md5-cache/app-backup/borgbackup-9999
index e4890dab74af..9bf5dca839c8 100644
--- a/metadata/md5-cache/app-backup/borgbackup-9999
+++ b/metadata/md5-cache/app-backup/borgbackup-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/openssl:0=
+DEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0=
 DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
 EAPI=7
 HOMEPAGE=https://borgbackup.readthedocs.io/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/openssl:0= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c0ea7741190461c2fe647f349c8aa581
+_md5_=a3644624cb00287998f94d3815089475
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.14 b/metadata/md5-cache/app-backup/borgmatic-1.5.14
deleted file mode 100644
index 5942b4b6c402..000000000000
--- a/metadata/md5-cache/app-backup/borgmatic-1.5.14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=Automatically create, prune and verify backups with borgbackup
-EAPI=7
-HOMEPAGE=https://torsion.org/borgmatic/
-IUSE=test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=GPL-3
-RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.14.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88d4510279b7699efc8a0a8f318f253c
diff --git a/metadata/md5-cache/app-backup/dar-2.6.14 b/metadata/md5-cache/app-backup/dar-2.6.14
deleted file mode 100644
index 9fe2f885cd3f..000000000000
--- a/metadata/md5-cache/app-backup/dar-2.6.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext virtual/libintl )
-DEFINED_PHASES=configure install
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar:= ) xattr? ( sys-apps/attr:= )
-DESCRIPTION=A full featured backup tool, aimed for disks
-EAPI=7
-HOMEPAGE=http://dar.linux.free.fr/
-IUSE=curl dar32 dar64 doc gcrypt gpg lzo nls rsync threads xattr
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar:= ) xattr? ( sys-apps/attr:= )
-REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/dar/dar-2.6.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fb1f1b919c9bca7b17dc0303364ef6cc
diff --git a/metadata/md5-cache/app-backup/restic-0.11.0 b/metadata/md5-cache/app-backup/restic-0.11.0
index 9250f6581c31..ee3967c752f2 100644
--- a/metadata/md5-cache/app-backup/restic-0.11.0
+++ b/metadata/md5-cache/app-backup/restic-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/fuse:0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/restic/restic/archive/v0.11.0.tar.gz -> restic-0.11.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200407214033-5883e5a4b512.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200407214033-5883e5a4b512.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.66.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.66.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.66.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.66.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.12.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.12.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.12.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.12.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/v46.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv46.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v46.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv46.1.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.6.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.6.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.4.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.4.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.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/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/cenkalti/backoff/v4/@v/v4.0.2.zip -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.2.zip mirror://goproxy//github.com/cenkalti/backoff/v4/@v/v4.0.2.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/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-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dchest/siphash/@v/v1.2.2.zip -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/dchest/siphash/@v/v1.2.2.mod -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.2.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/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/elithrar/simple-scrypt/@v/v1.3.0.zip -> github.com%2Felithrar%2Fsimple-scrypt%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/elithrar/simple-scrypt/@v/v1.3.0.mod -> github.com%2Felithrar%2Fsimple-scrypt%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200905233945-acf8798be1f7.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200905233945-acf8798be1f7.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.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20200217142428-fce0ec30dd00.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20200217142428-fce0ec30dd00.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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/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/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/ratelimit/@v/v1.0.1.zip -> github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/juju/ratelimit/@v/v1.0.1.mod -> github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.zip -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kurin/blazer/@v/v0.5.3.zip -> github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/kurin/blazer/@v/v0.5.3.mod -> github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.3.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/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.5.zip -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.5.zip mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.5.mod -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.5.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.zip 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.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.zip 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/ncw/swift/@v/v1.0.52.zip -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.zip mirror://goproxy//github.com/ncw/swift/@v/v1.0.52.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.5.0.zip -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/pkg/profile/@v/v1.5.0.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.12.0.zip -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/pkg/sftp/@v/v1.12.0.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/pkg/xattr/@v/v0.4.1.zip -> github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/pkg/xattr/@v/v0.4.1.mod -> github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_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/restic/chunker/@v/v0.4.0.zip -> github.com%2Frestic%2Fchunker%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/restic/chunker/@v/v0.4.0.mod -> github.com%2Frestic%2Fchunker%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.zip -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.2.0.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.2.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.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/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.zip -> go.opencensus.io%2F@v%2Fv0.22.4.zip mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/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-20181021155630-eda9bb28ed51.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181021155630-eda9bb28ed51.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200828194041-157a740278f4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200828161849-5deb26317202.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200828161849-5deb26317202.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200915173823-2db8f0ff891c.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200915173823-2db8f0ff891c.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200915173823-2db8f0ff891c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200915173823-2db8f0ff891c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200918232735-d647fc253266.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200918232735-d647fc253266.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200918232735-d647fc253266.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200918232735-d647fc253266.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.31.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.31.0.mod mirror://goproxy//google.golang.org/api/@v/v0.32.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.32.0.zip mirror://goproxy//google.golang.org/api/@v/v0.32.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.32.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200831141814-d751682dd103.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200831141814-d751682dd103.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200914193844-75d14daec038.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200914193844-75d14daec038.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200921151605-7abf4a1a14d5.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200921151605-7abf4a1a14d5.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200921151605-7abf4a1a14d5.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200921151605-7abf4a1a14d5.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.32.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.32.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-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-20200902074654-038fdea0a05b.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.61.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.61.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.61.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.61.0.mod mirror://goproxy//gopkg.in/tomb.v2/@v/v2.0.0-20161208151619-d5d1b5820637.zip -> gopkg.in%2Ftomb.v2%2F@v%2Fv2.0.0-20161208151619-d5d1b5820637.zip mirror://goproxy//gopkg.in/tomb.v2/@v/v2.0.0-20161208151619-d5d1b5820637.mod -> gopkg.in%2Ftomb.v2%2F@v%2Fv2.0.0-20161208151619-d5d1b5820637.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e49edcd346b125e0d874d0d1ec78d30d
diff --git a/metadata/md5-cache/app-backup/restic-0.12.0 b/metadata/md5-cache/app-backup/restic-0.12.0
index c52ce6006a90..855c59fd470a 100644
--- a/metadata/md5-cache/app-backup/restic-0.12.0
+++ b/metadata/md5-cache/app-backup/restic-0.12.0
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/fuse:0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/restic/restic/archive/v0.12.0.tar.gz -> restic-0.12.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200407214033-5883e5a4b512.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200407214033-5883e5a4b512.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.66.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.66.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.66.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.66.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.12.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.12.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.12.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.12.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/v46.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv46.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v46.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv46.1.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.6.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.6.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.4.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.4.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.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/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/cenkalti/backoff/v4/@v/v4.0.2.zip -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.2.zip mirror://goproxy//github.com/cenkalti/backoff/v4/@v/v4.0.2.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/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-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dchest/siphash/@v/v1.2.2.zip -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/dchest/siphash/@v/v1.2.2.mod -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.2.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/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/elithrar/simple-scrypt/@v/v1.3.0.zip -> github.com%2Felithrar%2Fsimple-scrypt%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/elithrar/simple-scrypt/@v/v1.3.0.mod -> github.com%2Felithrar%2Fsimple-scrypt%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200905233945-acf8798be1f7.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200905233945-acf8798be1f7.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.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20200217142428-fce0ec30dd00.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20200217142428-fce0ec30dd00.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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/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/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/ratelimit/@v/v1.0.1.zip -> github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/juju/ratelimit/@v/v1.0.1.mod -> github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.zip -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kurin/blazer/@v/v0.5.3.zip -> github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/kurin/blazer/@v/v0.5.3.mod -> github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.3.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/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.5.zip -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.5.zip mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.5.mod -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.5.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.zip 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.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.zip 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/ncw/swift/@v/v1.0.52.zip -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.zip mirror://goproxy//github.com/ncw/swift/@v/v1.0.52.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.5.0.zip -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/pkg/profile/@v/v1.5.0.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.12.0.zip -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/pkg/sftp/@v/v1.12.0.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/pkg/xattr/@v/v0.4.2.zip -> github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/pkg/xattr/@v/v0.4.2.mod -> github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_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/restic/chunker/@v/v0.4.0.zip -> github.com%2Frestic%2Fchunker%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/restic/chunker/@v/v0.4.0.mod -> github.com%2Frestic%2Fchunker%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.zip -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.2.0.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.2.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.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/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.zip -> go.opencensus.io%2F@v%2Fv0.22.4.zip mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/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-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200828194041-157a740278f4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201101102859-da207088b7d1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201101102859-da207088b7d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200828161849-5deb26317202.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200828161849-5deb26317202.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200915173823-2db8f0ff891c.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200915173823-2db8f0ff891c.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200915173823-2db8f0ff891c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200915173823-2db8f0ff891c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200918232735-d647fc253266.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200918232735-d647fc253266.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200918232735-d647fc253266.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200918232735-d647fc253266.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.31.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.31.0.mod mirror://goproxy//google.golang.org/api/@v/v0.32.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.32.0.zip mirror://goproxy//google.golang.org/api/@v/v0.32.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.32.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200831141814-d751682dd103.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200831141814-d751682dd103.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200914193844-75d14daec038.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200914193844-75d14daec038.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200921151605-7abf4a1a14d5.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200921151605-7abf4a1a14d5.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200921151605-7abf4a1a14d5.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200921151605-7abf4a1a14d5.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.32.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.32.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-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-20200902074654-038fdea0a05b.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.61.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.61.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.61.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.61.0.mod mirror://goproxy//gopkg.in/tomb.v2/@v/v2.0.0-20161208151619-d5d1b5820637.zip -> gopkg.in%2Ftomb.v2%2F@v%2Fv2.0.0-20161208151619-d5d1b5820637.zip mirror://goproxy//gopkg.in/tomb.v2/@v/v2.0.0-20161208151619-d5d1b5820637.mod -> gopkg.in%2Ftomb.v2%2F@v%2Fv2.0.0-20161208151619-d5d1b5820637.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=78191324493f3a6b1b55dde4ac3d54e2
diff --git a/metadata/md5-cache/app-backup/snapper-0.8.15-r2 b/metadata/md5-cache/app-backup/snapper-0.8.15-r2
index c9c690c14adc..cd362df146ec 100644
--- a/metadata/md5-cache/app-backup/snapper-0.8.15-r2
+++ b/metadata/md5-cache/app-backup/snapper-0.8.15-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openSUSE/snapper/archive/v0.8.15.tar.gz -> snapper-0.8.15.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5886507cf233d3f58ec8f681796a03ca
diff --git a/metadata/md5-cache/app-backup/snapper-0.8.16-r1 b/metadata/md5-cache/app-backup/snapper-0.8.16-r1
index fe511205bc79..5f2595fcb5aa 100644
--- a/metadata/md5-cache/app-backup/snapper-0.8.16-r1
+++ b/metadata/md5-cache/app-backup/snapper-0.8.16-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openSUSE/snapper/archive/v0.8.16.tar.gz -> snapper-0.8.16.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aada5f39e0a158bb5354008ab8460ad2
diff --git a/metadata/md5-cache/app-backup/snapper-0.9.0-r1 b/metadata/md5-cache/app-backup/snapper-0.9.0-r1
index 723606df84a2..5baded1d0cb0 100644
--- a/metadata/md5-cache/app-backup/snapper-0.9.0-r1
+++ b/metadata/md5-cache/app-backup/snapper-0.9.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openSUSE/snapper/archive/v0.9.0.tar.gz -> snapper-0.9.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=31c8980576dcc15fe6acb0d73e5409b2
diff --git a/metadata/md5-cache/app-backup/tarsnap-1.0.39 b/metadata/md5-cache/app-backup/tarsnap-1.0.39
index 840dba4c54e0..f5863170bf65 100644
--- a/metadata/md5-cache/app-backup/tarsnap-1.0.39
+++ b/metadata/md5-cache/app-backup/tarsnap-1.0.39
@@ -9,5 +9,5 @@ LICENSE=tarsnap
 RDEPEND=dev-libs/openssl:0= sys-libs/e2fsprogs-libs sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=https://www.tarsnap.com/download/tarsnap-autoconf-1.0.39.tgz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fece46b0acef52b560c294b897dd78ff
diff --git a/metadata/md5-cache/app-backup/tsm-8.1.6.0-r2 b/metadata/md5-cache/app-backup/tsm-8.1.6.0-r2
index fc8810592858..90c57c6c0301 100644
--- a/metadata/md5-cache/app-backup/tsm-8.1.6.0-r2
+++ b/metadata/md5-cache/app-backup/tsm-8.1.6.0-r2
@@ -10,5 +10,5 @@ RDEPEND=acct-group/tsm dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v816/8.1.6.0-TIV-TSMBAC-LinuxX86.tar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b591942ebf0ef3324203e41de360c770
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 1184680eb361..e64bfb7375aa 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/siege-4.0.9 b/metadata/md5-cache/app-benchmarks/siege-4.0.9
index ed92e2b91efc..449e6b2a1dfe 100644
--- a/metadata/md5-cache/app-benchmarks/siege-4.0.9
+++ b/metadata/md5-cache/app-benchmarks/siege-4.0.9
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://download.joedog.org/siege/siege-4.0.9.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee85534af49f82bf057b28c0665c1326
diff --git a/metadata/md5-cache/app-benchmarks/siege-4.1.0 b/metadata/md5-cache/app-benchmarks/siege-4.1.0
new file mode 100644
index 000000000000..a5a07059f000
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/siege-4.1.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A HTTP regression testing and benchmarking utility
+EAPI=7
+HOMEPAGE=https://www.joedog.org/siege-home https://github.com/JoeDog/siege
+IUSE=ssl
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=sys-libs/zlib ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=http://download.joedog.org/siege/siege-4.1.0.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ac1ff2a6fb741715d869066cc89a8147
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index c736194e07f4..c49ad634e91a 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/cdemu-3.2.4 b/metadata/md5-cache/app-cdr/cdemu-3.2.4
index 477423c2c76c..12403d471483 100644
--- a/metadata/md5-cache/app-cdr/cdemu-3.2.4
+++ b/metadata/md5-cache/app-cdr/cdemu-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/cdemu-client/cdemu-client-3.2.4.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=55e0549b14461479308a0ea8809bc498
diff --git a/metadata/md5-cache/app-cdr/cdemu-3.2.5 b/metadata/md5-cache/app-cdr/cdemu-3.2.5
index 05fe5262d54d..34f2497f1d6f 100644
--- a/metadata/md5-cache/app-cdr/cdemu-3.2.5
+++ b/metadata/md5-cache/app-cdr/cdemu-3.2.5
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/cdemu-client/cdemu-client-3.2.5.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9cadd1f5a3d70a8d029ee4f84aa0978e
diff --git a/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-21.04.2 b/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-21.04.2
deleted file mode 100644
index 4333581c595a..000000000000
--- a/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for ISO loopback device mounting
-EAPI=7
-HOMEPAGE=https://apps.kde.org/dolphin_plugins/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/dolphin-plugins-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7900e64cb40f25a4e43f4ec684d404d5
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 8e84cf604c1a..e43fa5e114f8 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/aescrypt-3.14 b/metadata/md5-cache/app-crypt/aescrypt-3.14
index 43e0f45f3e2a..07b5fa12d747 100644
--- a/metadata/md5-cache/app-crypt/aescrypt-3.14
+++ b/metadata/md5-cache/app-crypt/aescrypt-3.14
@@ -10,4 +10,4 @@ RDEPEND=X? ( || ( gnome-extra/zenity kde-apps/kdialog ) dev-lang/perl )
 SLOT=0
 SRC_URI=https://www.aescrypt.com/download/v3/linux/aescrypt-3.14.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=19bfa261df8a61ca1dc7cf9f94666876
+_md5_=74702324845e97f445f701bfd00bb04c
diff --git a/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2 b/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2
deleted file mode 100644
index f745855fbf73..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install setup
-DEPEND=dev-libs/openssl:0= dev-libs/libassuan:= >=dev-libs/libgcrypt-1.2.2:= >=dev-libs/libgpg-error-1.3:= >=dev-libs/pkcs11-helper-1.02:=
-DESCRIPTION=PKCS#11 support for GnuPG
-EAPI=7
-HOMEPAGE=http://gnupg-pkcs11.sourceforge.net
-IUSE=proxy
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:0= dev-libs/libassuan:= >=dev-libs/libgcrypt-1.2.2:= >=dev-libs/libgpg-error-1.3:= >=dev-libs/pkcs11-helper-1.02:=
-SLOT=0
-SRC_URI=https://github.com/alonbl/gnupg-pkcs11-scd/releases/download/gnupg-pkcs11-scd-0.9.2/gnupg-pkcs11-scd-0.9.2.tar.bz2
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=84cb4023b919df9457e362fa1978ca9b
diff --git a/metadata/md5-cache/app-crypt/hashcat-6.2.1-r1 b/metadata/md5-cache/app-crypt/hashcat-6.2.1-r1
index ba07af845018..3b5e340e35dc 100644
--- a/metadata/md5-cache/app-crypt/hashcat-6.2.1-r1
+++ b/metadata/md5-cache/app-crypt/hashcat-6.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=app-arch/lzma app-arch/unrar sys-libs/zlib[minizip] brain? ( dev-libs/xxhash ) video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64 || ( dev-util/nvidia-cuda-toolkit virtual/opencl ) ) !video_cards_nvidia? ( virtual/opencl )
 SLOT=0
 SRC_URI=https://github.com/hashcat/hashcat/archive/v6.2.1.tar.gz -> hashcat-6.2.1.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=66546ef8fc731f1d25dc0915df7d2bfd
diff --git a/metadata/md5-cache/app-crypt/hashcat-9999 b/metadata/md5-cache/app-crypt/hashcat-9999
index 95c99b2613a1..10d6af8b1d26 100644
--- a/metadata/md5-cache/app-crypt/hashcat-9999
+++ b/metadata/md5-cache/app-crypt/hashcat-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=app-arch/lzma app-arch/unrar sys-libs/zlib[minizip] brain? ( dev-libs/xxhash ) video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64 || ( dev-util/nvidia-cuda-toolkit virtual/opencl ) ) !video_cards_nvidia? ( virtual/opencl )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=66546ef8fc731f1d25dc0915df7d2bfd
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.8.0-r1 b/metadata/md5-cache/app-crypt/johntheripper-1.8.0-r1
index 2438cfdd8d72..5be4be51c962 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.8.0-r1
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.8.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/libcrypt:=
 SLOT=0
 SRC_URI=https://www.openwall.com/john/j/john-1.8.0.tar.xz
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=49b21d0a0609a6f70f28c99f881dfbe5
diff --git a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0-r3 b/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0-r3
index d843cd8bf4d7..064bf9030e1d 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0-r3
+++ b/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/openssl-1.0.1:0= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2 !app-crypt/johntheripper
 SLOT=0
 SRC_URI=https://www.openwall.com/john/k/john-1.9.0-jumbo-1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e31f5ee7ca340150c162c377ee0a489
diff --git a/metadata/md5-cache/app-crypt/johntheripper-jumbo-9999 b/metadata/md5-cache/app-crypt/johntheripper-jumbo-9999
index e7be4c624dfe..0ecfa3788b0b 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-jumbo-9999
+++ b/metadata/md5-cache/app-crypt/johntheripper-jumbo-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-libs/openssl-1.0.1:0= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2 !app-crypt/johntheripper
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9e35a1c73b849b65672869cf24c17d4d
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.3-r1 b/metadata/md5-cache/app-crypt/libmd-1.0.3-r1
new file mode 100644
index 000000000000..56053aa0e1ff
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.3-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=Message Digest functions from BSD systems
+EAPI=8
+HOMEPAGE=https://www.hadrons.org/software/libmd/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
+SLOT=0
+SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.3.tar.xz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=49ed3b47806a16960e0afd19e29ff275
diff --git a/metadata/md5-cache/app-crypt/libmd-9999 b/metadata/md5-cache/app-crypt/libmd-9999
index f6b89deee64a..240940953023 100644
--- a/metadata/md5-cache/app-crypt/libmd-9999
+++ b/metadata/md5-cache/app-crypt/libmd-9999
@@ -1,10 +1,11 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Message Digest functions from BSD systems
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.hadrons.org/software/libmd/
+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
 LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7bd88bde0d3a6a7def42e07053d013a4
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5cfcc66a6a0a124654a429409aca19bc
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.4 b/metadata/md5-cache/app-crypt/nitrocli-0.3.4
index 629cd18dfbd4..31f2141c2939 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.4
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.3.4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/anyhow/1.0.32/download -> anyhow-1.0.32.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nitrocli/0.3.4/download -> nitrocli-0.3.4.crate https://crates.io/api/v1/crates/nitrokey/0.7.1/download -> nitrokey-0.7.1.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.4.0/download -> nitrokey-test-0.4.0.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.19/download -> proc-macro2-1.0.19.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.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/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/structopt/0.3.13/download -> structopt-0.3.13.crate https://crates.io/api/v1/crates/structopt-derive/0.4.6/download -> structopt-derive-0.4.6.crate https://crates.io/api/v1/crates/syn/1.0.36/download -> syn-1.0.36.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6bd20b0d4668ad28543bdc55112e83b
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.5 b/metadata/md5-cache/app-crypt/nitrocli-0.3.5
index 2ebd3ee06f1e..4f73a8d4ea6a 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.5
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.3.5
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/anyhow/1.0.32/download -> anyhow-1.0.32.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/directories/3.0.1/download -> directories-3.0.1.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/envy/0.4.2/download -> envy-0.4.2.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/merge/0.1.0/download -> merge-0.1.0.crate https://crates.io/api/v1/crates/merge_derive/0.1.0/download -> merge_derive-0.1.0.crate https://crates.io/api/v1/crates/nitrocli/0.3.5/download -> nitrocli-0.3.5.crate https://crates.io/api/v1/crates/nitrokey/0.7.1/download -> nitrokey-0.7.1.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.4.0/download -> nitrokey-test-0.4.0.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.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/proc-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.19/download -> proc-macro2-1.0.19.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.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/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.114/download -> serde-1.0.114.crate https://crates.io/api/v1/crates/serde_derive/1.0.114/download -> serde_derive-1.0.114.crate https://crates.io/api/v1/crates/structopt/0.3.17/download -> structopt-0.3.17.crate https://crates.io/api/v1/crates/structopt-derive/0.4.10/download -> structopt-derive-0.4.10.crate https://crates.io/api/v1/crates/syn/1.0.36/download -> syn-1.0.36.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.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/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b5af507cbc9cf7b881a62059809c586
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.4.0 b/metadata/md5-cache/app-crypt/nitrocli-0.4.0
index 184da866ff08..c51e15d137d4 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.4.0
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.4.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/anyhow/1.0.39/download -> anyhow-1.0.39.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download -> crossbeam-utils-0.8.3.crate https://crates.io/api/v1/crates/directories/3.0.1/download -> directories-3.0.1.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/envy/0.4.2/download -> envy-0.4.2.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.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.90/download -> libc-0.2.90.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/merge/0.1.0/download -> merge-0.1.0.crate https://crates.io/api/v1/crates/merge_derive/0.1.0/download -> merge_derive-0.1.0.crate https://crates.io/api/v1/crates/nitrocli/0.4.0/download -> nitrocli-0.4.0.crate https://crates.io/api/v1/crates/nitrokey/0.8.0/download -> nitrokey-0.8.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.6.0/download -> nitrokey-sys-3.6.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.5.0/download -> nitrokey-test-0.5.0.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/progressing/3.0.2/download -> progressing-3.0.2.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/redox_termios/0.1.2/download -> redox_termios-0.1.2.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.5/download -> regex-1.4.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.23/download -> regex-syntax-0.6.23.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/serde/1.0.124/download -> serde-1.0.124.crate https://crates.io/api/v1/crates/serde_derive/1.0.124/download -> serde_derive-1.0.124.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/syn/1.0.64/download -> syn-1.0.64.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ddec9a5ba64574ec861001cc6826b781
diff --git a/metadata/md5-cache/app-crypt/nitrokey-app-1.4.2 b/metadata/md5-cache/app-crypt/nitrokey-app-1.4.2
index 9d56b8a93482..b66e3b556260 100644
--- a/metadata/md5-cache/app-crypt/nitrokey-app-1.4.2
+++ b/metadata/md5-cache/app-crypt/nitrokey-app-1.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-crypt/libnitrokey-3.5:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/Nitrokey/nitrokey-app/archive/v1.4.2.tar.gz -> nitrokey-app-1.4.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0cdca0b9e35404b95d3e7681941949a1
diff --git a/metadata/md5-cache/app-crypt/nitrokey-app-9999 b/metadata/md5-cache/app-crypt/nitrokey-app-9999
index ac3b31dbd65e..472204ccf986 100644
--- a/metadata/md5-cache/app-crypt/nitrokey-app-9999
+++ b/metadata/md5-cache/app-crypt/nitrokey-app-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=app-crypt/libnitrokey-3.5:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=39538e57ffb3711998ba4f2026c5f62d
diff --git a/metadata/md5-cache/app-crypt/qca-2.3.3 b/metadata/md5-cache/app-crypt/qca-2.3.3
index d9f4875988e3..66a099d8cc2f 100644
--- a/metadata/md5-cache/app-crypt/qca-2.3.3
+++ b/metadata/md5-cache/app-crypt/qca-2.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=Qt Cryptographic Architecture (QCA)
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/QCA
 IUSE=botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( >=dev-libs/openssl-1.1:0= )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.3.3/qca-2.3.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=99c04b4d735a7956665710a0333aac84
+_md5_=c222daf0f5f3650a183a20743578284b
diff --git a/metadata/md5-cache/app-crypt/rhash-1.4.0 b/metadata/md5-cache/app-crypt/rhash-1.4.0
deleted file mode 100644
index 0dc4799421e4..000000000000
--- a/metadata/md5-cache/app-crypt/rhash-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ssl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Console utility and library for computing and verifying file hash sums
-EAPI=7
-HOMEPAGE=http://rhash.sourceforge.net/
-IUSE=debug nls ssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ssl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=mirror://sourceforge/rhash/rhash-1.4.0-src.tar.gz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ee0e4bcfab19f21e0368b8ab513b33f8
diff --git a/metadata/md5-cache/app-crypt/rhash-1.4.2 b/metadata/md5-cache/app-crypt/rhash-1.4.2
new file mode 100644
index 000000000000..2d51a3e1b38d
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/rhash-1.4.2
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ssl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Console utility and library for computing and verifying file hash sums
+EAPI=7
+HOMEPAGE=http://rhash.sourceforge.net/
+IUSE=debug nls ssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ssl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=mirror://sourceforge/rhash/rhash-1.4.2-src.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8c22eef206be87d87c347bf7ffeecfe8
diff --git a/metadata/md5-cache/app-crypt/shash-0.2.6-r3 b/metadata/md5-cache/app-crypt/shash-0.2.6-r3
index a167280b3d43..f89d4c975e31 100644
--- a/metadata/md5-cache/app-crypt/shash-0.2.6-r3
+++ b/metadata/md5-cache/app-crypt/shash-0.2.6-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-crypt/mhash-0.8.18-r1 static? ( app-crypt/mhash[static-libs(+)] )
 SLOT=0
 SRC_URI=ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b7f3647c38aad47d04b13abe14b6f272
diff --git a/metadata/md5-cache/app-crypt/swtpm-0.6.0-r1 b/metadata/md5-cache/app-crypt/swtpm-0.6.0-r1
index 315693cd6ab3..bccb7a710510 100644
--- a/metadata/md5-cache/app-crypt/swtpm-0.6.0-r1
+++ b/metadata/md5-cache/app-crypt/swtpm-0.6.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Libtpms-based TPM emulator
 EAPI=7
 HOMEPAGE=https://github.com/stefanberger/swtpm
 IUSE=fuse +gnutls seccomp test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~ppc
 LICENSE=BSD
 RDEPEND=fuse? ( dev-libs/glib:2 sys-fs/fuse:0 ) gnutls? ( dev-libs/libtasn1:= >=net-libs/gnutls-3.1.0[tools,pkcs11] ) seccomp? ( sys-libs/libseccomp ) test? ( net-misc/socat dev-tcltk/expect ) acct-group/tss acct-user/tss dev-libs/openssl:0= dev-libs/json-glib dev-libs/libtpms python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefanberger/swtpm/archive/v0.6.0.tar.gz -> swtpm-0.6.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f21e5ca1e906d9073e53bc3aceed1664
+_md5_=cc1e04b886866a8293196fdf1562a680
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-5.1.1 b/metadata/md5-cache/app-crypt/tpm2-tools-5.1.1
deleted file mode 100644
index c9715ffe742b..000000000000
--- a/metadata/md5-cache/app-crypt/tpm2-tools-5.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=net-misc/curl:= >=app-crypt/tpm2-tss-3.0.1:=[fapi?] dev-libs/openssl:0=
-DESCRIPTION=Tools for the TPM 2.0 TSS
-EAPI=7
-HOMEPAGE=https://github.com/tpm2-software/tpm2-tools
-IUSE=+fapi
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=net-misc/curl:= >=app-crypt/tpm2-tss-3.0.1:=[fapi?] dev-libs/openssl:0=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/5.1.1/tpm2-tools-5.1.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=89cd2b729d387296dc2a47d80e5f20a1
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-5.1.1-r1 b/metadata/md5-cache/app-crypt/tpm2-tools-5.1.1-r1
new file mode 100644
index 000000000000..8f39de035dbb
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-tools-5.1.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DEPEND=net-misc/curl:= >=app-crypt/tpm2-tss-3.0.1:=[fapi?] dev-libs/openssl:= 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] ) test? ( app-crypt/swtpm app-crypt/tpm2-abrmd app-editors/vim-core dev-tcltk/expect dev-util/cmocka dev-python/pyyaml )
+DESCRIPTION=Tools for the TPM 2.0 TSS
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-tools
+IUSE=+fapi test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=net-misc/curl:= >=app-crypt/tpm2-tss-3.0.1:=[fapi?] dev-libs/openssl:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/5.1.1/tpm2-tools-5.1.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9da1c255c754ad7df4f368eded972be5
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0 b/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0
index 929cd74aaf0d..ded5ea84025d 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/tpm2-tss dev-libs/openssl:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-tss-engine/releases/download/v1.1.0/tpm2-tss-engine-1.1.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ae4e86e520b49a1e1b49d965a537b69
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.24_p8 b/metadata/md5-cache/app-crypt/veracrypt-1.24_p8
index 54bbef25176c..7bfbf6900fe7 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.24_p8
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.24_p8
@@ -11,5 +11,5 @@ RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.24-Update8_MacOSX.tar.gz -> veracrypt-1.24_p8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
 _md5_=b707ea647c3b3974200dd26cabe53a73
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index e62609969eb9..baeb7eb2b793 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/canna-2ch-20040519 b/metadata/md5-cache/app-dicts/canna-2ch-20040519
deleted file mode 100644
index 0e731607e875..000000000000
--- a/metadata/md5-cache/app-dicts/canna-2ch-20040519
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=canna? ( app-i18n/canna )
-DEFINED_PHASES=compile install postinst postrm
-DESCRIPTION=Japanese Canna dictionary for 2channelers
-EAPI=7
-HOMEPAGE=http://omaemona.sourceforge.net/packages/Canna
-IUSE=canna
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~naota/files/canna-2ch-20040519.tar.gz
-_eclasses_=cannadic	145c711b38518c18057f15cf6fb3ae9f
-_md5_=db46e51d9cdbb454d4275b401f6b5458
diff --git a/metadata/md5-cache/app-dicts/canna-cannadic-0.95c b/metadata/md5-cache/app-dicts/canna-cannadic-0.95c
deleted file mode 100644
index 70869f330526..000000000000
--- a/metadata/md5-cache/app-dicts/canna-cannadic-0.95c
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-i18n/canna
-DEFINED_PHASES=compile install postinst postrm
-DESCRIPTION=Japanese dictionary as a supplement/replacement to Canna3.5b2
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/cannadic-0.95c.tar.gz
-_eclasses_=cannadic	145c711b38518c18057f15cf6fb3ae9f
-_md5_=c7f3b0e9c54cd591dfa1e56720a98d3d
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20210601-r1 b/metadata/md5-cache/app-dicts/myspell-en-20210601-r1
deleted file mode 100644
index 6fd12e78c62e..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-en-20210601-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=English dictionaries for myspell/hunspell
-EAPI=7
-HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
-IUSE=l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=BSD MIT LGPL-3+
-REQUIRED_USE=|| ( l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA )
-SLOT=0
-SRC_URI=https://extensions.libreoffice.org/assets/downloads/41/dict-en-20210601.oxt
-_eclasses_=myspell-r2	ef7a68d04e0a4e113580dda8d3142612
-_md5_=dfe779819f908736e1d89e4edd2db7a8
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20210601-r2 b/metadata/md5-cache/app-dicts/myspell-en-20210601-r2
new file mode 100644
index 000000000000..1db28486ed46
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/myspell-en-20210601-r2
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=English dictionaries for myspell/hunspell
+EAPI=7
+HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
+IUSE=l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD MIT LGPL-3+
+REQUIRED_USE=|| ( l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA )
+SLOT=0
+SRC_URI=https://extensions.libreoffice.org/assets/downloads/41/dict-en-20210601.oxt
+_eclasses_=myspell-r2	ef7a68d04e0a4e113580dda8d3142612
+_md5_=6ef82e995d452ec1e6d731fb190faa0f
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index d4b7226e7c3d..0572c17dab13 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/csound-manual-6.16 b/metadata/md5-cache/app-doc/csound-manual-6.16
index 3b5a532550b7..1beabcfe882a 100644
--- a/metadata/md5-cache/app-doc/csound-manual-6.16
+++ b/metadata/md5-cache/app-doc/csound-manual-6.16
@@ -4,8 +4,8 @@ DESCRIPTION=The Csound reference manual
 EAPI=7
 HOMEPAGE=http://csounds.com/
 IUSE=html l10n_fr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=FDL-1.2+
 SLOT=0
 SRC_URI=https://github.com/csound/csound/releases/download/6.16.0/Csound6.16.0_manual_pdf.zip l10n_fr? ( https://github.com/csound/csound/releases/download/6.16.0/Csound6.16.0_manual-fr_pdf.zip ) html? ( https://github.com/csound/csound/releases/download/6.16.0/Csound6.16.0_manual_html.zip l10n_fr? ( https://github.com/csound/csound/releases/download/6.16.0/Csound6.16.0_manual-fr_html.zip ) )
-_md5_=d8439d6ec3cd979272bac2a94af6c552
+_md5_=ba3428e40fe2e151232d7d159f13b6ca
diff --git a/metadata/md5-cache/app-doc/eclass-manpages-20200913 b/metadata/md5-cache/app-doc/eclass-manpages-20200913
deleted file mode 100644
index 36ec4d67ae28..000000000000
--- a/metadata/md5-cache/app-doc/eclass-manpages-20200913
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-apps/gawk
-DEFINED_PHASES=install
-DESCRIPTION=Collection of Gentoo eclass manpages
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/eclass-to-manpage
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/eclass-manpages-20200913.tar.xz
-_md5_=122635ffa252a167a91c609c8a93478a
diff --git a/metadata/md5-cache/app-doc/eclass-manpages-20210712 b/metadata/md5-cache/app-doc/eclass-manpages-20210712
new file mode 100644
index 000000000000..3f7d1c9bd6a8
--- /dev/null
+++ b/metadata/md5-cache/app-doc/eclass-manpages-20210712
@@ -0,0 +1,10 @@
+BDEPEND=app-arch/xz-utils sys-apps/gawk
+DEFINED_PHASES=install
+DESCRIPTION=Collection of Gentoo eclass manpages
+EAPI=8
+HOMEPAGE=https://github.com/mgorny/eclass-to-manpage
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/eclass-manpages-20210712.tar.xz
+_md5_=ec1630b773610b02e0860c4673f40dac
diff --git a/metadata/md5-cache/app-doc/eclass-manpages-99999999 b/metadata/md5-cache/app-doc/eclass-manpages-99999999
index 4bf43292122e..ece2a07b2f99 100644
--- a/metadata/md5-cache/app-doc/eclass-manpages-99999999
+++ b/metadata/md5-cache/app-doc/eclass-manpages-99999999
@@ -1,10 +1,10 @@
 BDEPEND=sys-apps/gawk >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install unpack
 DESCRIPTION=Collection of Gentoo eclass manpages
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/mgorny/eclass-to-manpage
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=23ad43c13c03e9918853d8bf02aec9ee
+_md5_=888797cef30de17d72e8ab9825f9beae
diff --git a/metadata/md5-cache/app-doc/selflinux-0.13.0-r1 b/metadata/md5-cache/app-doc/selflinux-0.13.0-r1
index 2a2db5cd5570..f2f2523a2e10 100644
--- a/metadata/md5-cache/app-doc/selflinux-0.13.0-r1
+++ b/metadata/md5-cache/app-doc/selflinux-0.13.0-r1
@@ -3,8 +3,8 @@ DEFINED_PHASES=prepare
 DESCRIPTION=A german-language hypertext tutorial about Linux
 EAPI=7
 HOMEPAGE=https://www.selflinux.org/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=FDL-1.1+
 SLOT=0
 SRC_URI=https://www.selflinux.org/download/SelfLinux-0.13.0/SelfLinux-0.13.0-html.tar.gz
-_md5_=7626471d3ba1f716b3559be8db930ab4
+_md5_=ad0ccb13e84430fc9f9533c556baedc5
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index cef51e664873..7ec23fa24e41 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r3 b/metadata/md5-cache/app-editors/emacs-27.2-r3
new file mode 100644
index 000000000000..e67b82a961c9
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-27.2-r3
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common[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? ( 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=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk 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
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common[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? ( 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-vcs:27 app-eselect/eselect-emacs
+RESTRICT=test
+SLOT=27
+SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-27.2-patches-2.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6ef2caf91d33e5408bb4392c4b9a2351
diff --git a/metadata/md5-cache/app-editors/emacs-27.2.9999 b/metadata/md5-cache/app-editors/emacs-27.2.9999
index 8e4ae5dd2ac1..cae5f91dddef 100644
--- a/metadata/md5-cache/app-editors/emacs-27.2.9999
+++ b/metadata/md5-cache/app-editors/emacs-27.2.9999
@@ -1,14 +1,15 @@
-BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
 DEPEND=app-emacs/emacs-common[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? ( 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
+EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk 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
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 PROPERTIES=live
 RDEPEND=app-emacs/emacs-common[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? ( 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-vcs:27 app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27-vcs
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ddcbf23a6d3309d5e838c5f3f6dc2ad3
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=363cf18e0aabd27b839ed81872644533
diff --git a/metadata/md5-cache/app-editors/emacs-28.0.9999 b/metadata/md5-cache/app-editors/emacs-28.0.9999
index f3cb141ad8cc..35c563e57a94 100644
--- a/metadata/md5-cache/app-editors/emacs-28.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.0.9999
@@ -1,14 +1,15 @@
-BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
 DEPEND=app-emacs/emacs-common[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 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) 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? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( 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
+EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 PROPERTIES=live
 RDEPEND=app-emacs/emacs-common[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 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) 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? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=28-vcs
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dd017df64e9d241e26299672cbef58cf
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=802bb41892859f0387a7e2da3c72facf
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.0814-r100 b/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
index 2b51f1502d23..18a9210c034c 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
+++ b/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0814.tar.gz -> vim-8.2.0814.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5b51f18b7978cf74c13bedd915e1e367
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index ae9ce514b339..be3c646cf0a6 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -11,5 +11,5 @@ RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurs
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=60610e944439e69d74ec5c6a9c03cd53
diff --git a/metadata/md5-cache/app-editors/ng-1.5_beta1-r2 b/metadata/md5-cache/app-editors/ng-1.5_beta1-r2
deleted file mode 100644
index 5e0a8083cb36..000000000000
--- a/metadata/md5-cache/app-editors/ng-1.5_beta1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sys-libs/ncurses:0= !dev-java/nailgun canna? ( app-i18n/canna ) sys-apps/sed sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Emacs like micro editor Ng -- based on mg2a
-EAPI=6
-HOMEPAGE=http://tt.sakura.ne.jp/~amura/ng/
-IUSE=canna
-KEYWORDS=amd64 ppc x86
-LICENSE=Emacs
-RDEPEND=sys-libs/ncurses:0= !dev-java/nailgun canna? ( app-i18n/canna )
-SLOT=0
-SRC_URI=http://tt.sakura.ne.jp/~amura/archives/ng/ng-1.5beta1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=40a2c5f8d08ec6fb0157b3125fc344b7
diff --git a/metadata/md5-cache/app-editors/ng-1.5_beta1-r3 b/metadata/md5-cache/app-editors/ng-1.5_beta1-r3
new file mode 100644
index 000000000000..3e319ee3f17c
--- /dev/null
+++ b/metadata/md5-cache/app-editors/ng-1.5_beta1-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=sys-libs/ncurses:0= !dev-java/nailgun sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Emacs like micro editor Ng -- based on mg2a
+EAPI=6
+HOMEPAGE=http://tt.sakura.ne.jp/~amura/ng/
+KEYWORDS=amd64 ppc x86
+LICENSE=Emacs
+RDEPEND=sys-libs/ncurses:0= !dev-java/nailgun
+SLOT=0
+SRC_URI=http://tt.sakura.ne.jp/~amura/archives/ng/ng-1.5beta1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=50d05a194aa9e4afcb38b73ac2296cef
diff --git a/metadata/md5-cache/app-editors/retext-7.2.1 b/metadata/md5-cache/app-editors/retext-7.2.1
index 996d4a0e02ef..35d6d03f3675 100644
--- a/metadata/md5-cache/app-editors/retext-7.2.1
+++ b/metadata/md5-cache/app-editors/retext-7.2.1
@@ -5,7 +5,7 @@ DESCRIPTION=Simple editor for Markdown and reStructuredText
 EAPI=7
 HOMEPAGE=https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki
 IUSE=python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/markups-3.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-markdown-math[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[dbus,gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReText/ReText-7.2.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=15883466f143b8f61feb4993a825dc2a
+_md5_=7be5b92d4bd878327d33b6bd86763cec
diff --git a/metadata/md5-cache/app-editors/sublime-text-4_p4113 b/metadata/md5-cache/app-editors/sublime-text-4_p4113
new file mode 100644
index 000000000000..0cf5d0d75bdb
--- /dev/null
+++ b/metadata/md5-cache/app-editors/sublime-text-4_p4113
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Sophisticated text editor for code, markup and prose
+EAPI=7
+HOMEPAGE=https://www.sublimetext.com
+IUSE=dbus
+KEYWORDS=~amd64
+LICENSE=Sublime
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libX11 dbus? ( sys-apps/dbus )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://download.sublimetext.com/sublime_text_build_4113_x64.tar.xz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ee8aac04d890593d47de4b0049fcbc96
diff --git a/metadata/md5-cache/app-editors/vim-8.2.0814-r100 b/metadata/md5-cache/app-editors/vim-8.2.0814-r100
index 49295ebcd25b..d7104493bb93 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.0814-r100
+++ b/metadata/md5-cache/app-editors/vim-8.2.0814-r100
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0814.tar.gz -> vim-8.2.0814.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2df9e54ecfd1ed4c739417609c38ebc1
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index e8ce4acceed3..8f684ee69009 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c87c1c7a2e079f189dbf98f0b4caa2df
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.0814 b/metadata/md5-cache/app-editors/vim-core-8.2.0814
index c84a59265124..1bdeca966118 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.0814
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.0814
@@ -10,5 +10,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0814.tar.gz -> vim-8.2.0814.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e92b191622c5d980066027408b941fad
diff --git a/metadata/md5-cache/app-editors/vim-core-9999 b/metadata/md5-cache/app-editors/vim-core-9999
index 55e5e3c4398b..c491f1b4b052 100644
--- a/metadata/md5-cache/app-editors/vim-core-9999
+++ b/metadata/md5-cache/app-editors/vim-core-9999
@@ -10,5 +10,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 PROPERTIES=live
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dfb10d1c13d9445274ec7c55afaf1760
diff --git a/metadata/md5-cache/app-editors/vscode-1.57.1 b/metadata/md5-cache/app-editors/vscode-1.57.1
index 800f70ef02a2..b8077dd8d932 100644
--- a/metadata/md5-cache/app-editors/vscode-1.57.1
+++ b/metadata/md5-cache/app-editors/vscode-1.57.1
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret[crypt] dev-libs/nss me
 RESTRICT=mirror strip bindist
 SLOT=0
 SRC_URI=amd64? ( https://update.code.visualstudio.com/1.57.1/linux-x64/stable -> vscode-1.57.1-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.57.1/linux-armhf/stable -> vscode-1.57.1-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.57.1/linux-arm64/stable -> vscode-1.57.1-arm64.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	fce6ad998516159787b92e8043167889	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d66722b7ef1832393e371e785fa70f75
diff --git a/metadata/md5-cache/app-editors/vscode-1.58.2 b/metadata/md5-cache/app-editors/vscode-1.58.2
new file mode 100644
index 000000000000..eb84bac5688e
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vscode-1.58.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Multiplatform Visual Studio Code from Microsoft
+EAPI=7
+HOMEPAGE=https://code.visualstudio.com
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ Microsoft-vscode MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
+RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret[crypt] dev-libs/nss media-libs/alsa-lib media-libs/libpng:0/16 x11-libs/cairo x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
+RESTRICT=mirror strip bindist
+SLOT=0
+SRC_URI=amd64? ( https://update.code.visualstudio.com/1.58.2/linux-x64/stable -> vscode-1.58.2-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.58.2/linux-armhf/stable -> vscode-1.58.2-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.58.2/linux-arm64/stable -> vscode-1.58.2-arm64.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	fce6ad998516159787b92e8043167889	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d66722b7ef1832393e371e785fa70f75
diff --git a/metadata/md5-cache/app-editors/vscodium-1.56.2 b/metadata/md5-cache/app-editors/vscodium-1.56.2
deleted file mode 100644
index c817b9268ccf..000000000000
--- a/metadata/md5-cache/app-editors/vscodium-1.56.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A community-driven, freely-licensed binary distribution of Microsoft's VSCode
-EAPI=7
-HOMEPAGE=https://vscodium.com/
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
-RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret[crypt] dev-libs/nss media-libs/alsa-lib media-libs/libpng:0/16 net-print/cups x11-libs/cairo x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
-RESTRICT=mirror strip bindist
-SLOT=0
-SRC_URI=amd64? ( https://github.com/VSCodium/vscodium/releases/download/1.56.2/VSCodium-linux-x64-1.56.2.tar.gz -> vscodium-1.56.2-amd64.tar.gz ) arm? ( https://github.com/VSCodium/vscodium/releases/download/1.56.2/VSCodium-linux-armhf-1.56.2.tar.gz -> vscodium-1.56.2-arm.tar.gz ) arm64? ( https://github.com/VSCodium/vscodium/releases/download/1.56.2/VSCodium-linux-arm64-1.56.2.tar.gz -> vscodium-1.56.2-arm64.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=784419342a1516dd1d8019f328c5c506
diff --git a/metadata/md5-cache/app-editors/vscodium-1.57.0 b/metadata/md5-cache/app-editors/vscodium-1.57.0
deleted file mode 100644
index 60e69b92e76f..000000000000
--- a/metadata/md5-cache/app-editors/vscodium-1.57.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A community-driven, freely-licensed binary distribution of Microsoft's VSCode
-EAPI=7
-HOMEPAGE=https://vscodium.com/
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
-RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret[crypt] dev-libs/nss media-libs/alsa-lib media-libs/libpng:0/16 net-print/cups x11-libs/cairo x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
-RESTRICT=mirror strip bindist
-SLOT=0
-SRC_URI=amd64? ( https://github.com/VSCodium/vscodium/releases/download/1.57.0/VSCodium-linux-x64-1.57.0.tar.gz -> vscodium-1.57.0-amd64.tar.gz ) arm? ( https://github.com/VSCodium/vscodium/releases/download/1.57.0/VSCodium-linux-armhf-1.57.0.tar.gz -> vscodium-1.57.0-arm.tar.gz ) arm64? ( https://github.com/VSCodium/vscodium/releases/download/1.57.0/VSCodium-linux-arm64-1.57.0.tar.gz -> vscodium-1.57.0-arm64.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=784419342a1516dd1d8019f328c5c506
diff --git a/metadata/md5-cache/app-editors/vscodium-1.57.1 b/metadata/md5-cache/app-editors/vscodium-1.57.1
index 54b4fdbe078c..2145dec33103 100644
--- a/metadata/md5-cache/app-editors/vscodium-1.57.1
+++ b/metadata/md5-cache/app-editors/vscodium-1.57.1
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret[crypt] dev-libs/nss me
 RESTRICT=mirror strip bindist
 SLOT=0
 SRC_URI=amd64? ( https://github.com/VSCodium/vscodium/releases/download/1.57.1/VSCodium-linux-x64-1.57.1.tar.gz -> vscodium-1.57.1-amd64.tar.gz ) arm? ( https://github.com/VSCodium/vscodium/releases/download/1.57.1/VSCodium-linux-armhf-1.57.1.tar.gz -> vscodium-1.57.1-arm.tar.gz ) arm64? ( https://github.com/VSCodium/vscodium/releases/download/1.57.1/VSCodium-linux-arm64-1.57.1.tar.gz -> vscodium-1.57.1-arm64.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	fce6ad998516159787b92e8043167889	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=784419342a1516dd1d8019f328c5c506
diff --git a/metadata/md5-cache/app-editors/vscodium-1.58.2 b/metadata/md5-cache/app-editors/vscodium-1.58.2
new file mode 100644
index 000000000000..3d2467609fd2
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vscodium-1.58.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A community-driven, freely-licensed binary distribution of Microsoft's VSCode
+EAPI=7
+HOMEPAGE=https://vscodium.com/
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
+RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret[crypt] dev-libs/nss media-libs/alsa-lib media-libs/libpng:0/16 net-print/cups x11-libs/cairo x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
+RESTRICT=mirror strip bindist
+SLOT=0
+SRC_URI=amd64? ( https://github.com/VSCodium/vscodium/releases/download/1.58.2/VSCodium-linux-x64-1.58.2.tar.gz -> vscodium-1.58.2-amd64.tar.gz ) arm? ( https://github.com/VSCodium/vscodium/releases/download/1.58.2/VSCodium-linux-armhf-1.58.2.tar.gz -> vscodium-1.58.2-arm.tar.gz ) arm64? ( https://github.com/VSCodium/vscodium/releases/download/1.58.2/VSCodium-linux-arm64-1.58.2.tar.gz -> vscodium-1.58.2-arm64.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	fce6ad998516159787b92e8043167889	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=784419342a1516dd1d8019f328c5c506
diff --git a/metadata/md5-cache/app-editors/xemacs-21.4.24-r2 b/metadata/md5-cache/app-editors/xemacs-21.4.24-r2
deleted file mode 100644
index 698d3372faf4..000000000000
--- a/metadata/md5-cache/app-editors/xemacs-21.4.24-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 >=sys-apps/texinfo-5
-DESCRIPTION=highly customizable open source text editor and application development system
-EAPI=7
-HOMEPAGE=http://www.xemacs.org/
-IUSE=eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb
-KEYWORDS=~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.24.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c7dc1171a3e7971fb3cd2b820637a3b3
diff --git a/metadata/md5-cache/app-editors/xemacs-21.4.24-r3 b/metadata/md5-cache/app-editors/xemacs-21.4.24-r3
new file mode 100644
index 000000000000..5e9d91995629
--- /dev/null
+++ b/metadata/md5-cache/app-editors/xemacs-21.4.24-r3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare unpack
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 >=sys-apps/texinfo-5
+DESCRIPTION=highly customizable open source text editor and application development system
+EAPI=7
+HOMEPAGE=http://www.xemacs.org/
+IUSE=eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xim athena neXt Xaw3d gdbm berkdb
+KEYWORDS=~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86
+LICENSE=GPL-2+
+PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.24.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e32f0e3adddeca929cbd97c418676978
diff --git a/metadata/md5-cache/app-editors/xemacs-21.5.34-r5 b/metadata/md5-cache/app-editors/xemacs-21.5.34-r5
deleted file mode 100644
index adcc57e8d9cd..000000000000
--- a/metadata/md5-cache/app-editors/xemacs-21.5.34-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 virtual/pkgconfig
-DESCRIPTION=highly customizable open source text editor and application development system
-EAPI=7
-HOMEPAGE=http://www.xemacs.org/
-IUSE=alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3+
-PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
-RDEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.34.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2a913f3a9bf101b48e9a9d9859892478
diff --git a/metadata/md5-cache/app-editors/xemacs-21.5.34-r6 b/metadata/md5-cache/app-editors/xemacs-21.5.34-r6
new file mode 100644
index 000000000000..8fe42af228ca
--- /dev/null
+++ b/metadata/md5-cache/app-editors/xemacs-21.5.34-r6
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 virtual/pkgconfig
+DESCRIPTION=highly customizable open source text editor and application development system
+EAPI=7
+HOMEPAGE=http://www.xemacs.org/
+IUSE=alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
+RDEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.34.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=67fda8d3a77bc32866b81d2b87cfef08
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e6e56107c637..33edc739d190 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.53 b/metadata/md5-cache/app-emacs/ebuild-mode-1.53
new file mode 100644
index 000000000000..e9fccf504dce
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.53
@@ -0,0 +1,12 @@
+BDEPEND=sys-apps/texinfo >=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.53.tar.xz
+_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=4ec37b8ef84ed182d55adac315a735d5
diff --git a/metadata/md5-cache/app-emacs/ebuild-run-mode-20210713 b/metadata/md5-cache/app-emacs/ebuild-run-mode-20210713
new file mode 100644
index 000000000000..b98b8d7397c5
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ebuild-run-mode-20210713
@@ -0,0 +1,12 @@
+BDEPEND=>=app-editors/emacs-24.5:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Major mode for Emacs buffers where ebuild commands run
+EAPI=8
+HOMEPAGE=https://gitlab.com/akater/emacs-ebuild-run-mode
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-emacs/ebuild-mode-1.53 >=app-editors/emacs-24.5:*
+SLOT=0
+SRC_URI=https://gitlab.com/akater/emacs-ebuild-run-mode/-/archive/v20210713/emacs-ebuild-run-mode-v20210713.tar.gz
+_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=16ccef65393baab3927330d3b9ba1c26
diff --git a/metadata/md5-cache/app-emacs/yc-4.0.13 b/metadata/md5-cache/app-emacs/yc-4.0.13
deleted file mode 100644
index 233d35d1cd8b..000000000000
--- a/metadata/md5-cache/app-emacs/yc-4.0.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-editors/emacs-23.1:*
-DESCRIPTION=Yet another Canna client on Emacsen
-EAPI=6
-HOMEPAGE=http://www.ceres.dti.ne.jp/~knak/yc.html
-KEYWORDS=~alpha ~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/canna >=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-4.0.13.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9fb935d7f79667cb3923f212985850db
diff --git a/metadata/md5-cache/app-emacs/yc-5.2.1 b/metadata/md5-cache/app-emacs/yc-5.2.1
deleted file mode 100644
index c186963a5a92..000000000000
--- a/metadata/md5-cache/app-emacs/yc-5.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-editors/emacs-23.1:*
-DESCRIPTION=Yet another Canna client on Emacsen
-EAPI=6
-HOMEPAGE=http://www.ceres.dti.ne.jp/~knak/yc.html
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/canna >=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-5.2.1.el.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=3f3e22fba959d3df0c008b9bee62491a
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 5cec1c9b1cba..55521deb618f 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/buildah-1.21.1 b/metadata/md5-cache/app-emulation/buildah-1.21.1
index a0eeb7a26c54..dd9bea743218 100644
--- a/metadata/md5-cache/app-emulation/buildah-1.21.1
+++ b/metadata/md5-cache/app-emulation/buildah-1.21.1
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/containers/buildah/archive/v1.21.1.tar.gz -> buildah-1.21.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e455a820ba4aa172711affa819c150ab
diff --git a/metadata/md5-cache/app-emulation/cri-tools-1.18.0 b/metadata/md5-cache/app-emulation/cri-tools-1.18.0
index 1d425583e156..3db31f6a428e 100644
--- a/metadata/md5-cache/app-emulation/cri-tools-1.18.0
+++ b/metadata/md5-cache/app-emulation/cri-tools-1.18.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes-sigs/cri-tools/archive/v1.18.0.tar.gz -> cri-tools-1.18.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=433c900cf8282ee8166482432f27cda4
diff --git a/metadata/md5-cache/app-emulation/cri-tools-1.21.0 b/metadata/md5-cache/app-emulation/cri-tools-1.21.0
index 570e6aa4484e..1caf15bcf12d 100644
--- a/metadata/md5-cache/app-emulation/cri-tools-1.21.0
+++ b/metadata/md5-cache/app-emulation/cri-tools-1.21.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes-sigs/cri-tools/archive/v1.21.0.tar.gz -> cri-tools-1.21.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d9a905ae84ae8da8d0ce5df051956822
diff --git a/metadata/md5-cache/app-emulation/docker-20.10.7 b/metadata/md5-cache/app-emulation/docker-20.10.7
index d007d39b5743..cde44270de67 100644
--- a/metadata/md5-cache/app-emulation/docker-20.10.7
+++ b/metadata/md5-cache/app-emulation/docker-20.10.7
@@ -11,5 +11,5 @@ RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparm
 RESTRICT=installsources strip test
 SLOT=0
 SRC_URI=https://github.com/moby/moby/archive/v20.10.7.tar.gz -> docker-20.10.7.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=71a70ac78c66d7916049ac0cef9c3164
diff --git a/metadata/md5-cache/app-emulation/docker-cli-20.10.7 b/metadata/md5-cache/app-emulation/docker-cli-20.10.7
index 8f211fcee258..74a95903c86c 100644
--- a/metadata/md5-cache/app-emulation/docker-cli-20.10.7
+++ b/metadata/md5-cache/app-emulation/docker-cli-20.10.7
@@ -10,5 +10,5 @@ RDEPEND=!<app-emulation/docker-20.10.1
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/cli/archive/v20.10.7.tar.gz -> docker-cli-20.10.7.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a20efc934fe51c3c110a7b624b0e3de0
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.27.4 b/metadata/md5-cache/app-emulation/docker-compose-1.27.4
index 0cd41d0571d1..932075dcab0d 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.27.4
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.27.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.27.4.tar.gz -> docker-compose-1.27.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1a5632caf1c51f0eee2cae8868dae990
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.28.4 b/metadata/md5-cache/app-emulation/docker-compose-1.28.4
index 891451b2949e..c295067cb253 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.28.4
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.28.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.28.4.tar.gz -> docker-compose-1.28.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9d77118406bddaf77c025569df720b46
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.28.5 b/metadata/md5-cache/app-emulation/docker-compose-1.28.5
index 74a3db5d032c..1ad8940e97be 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.28.5
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.28.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.28.5.tar.gz -> docker-compose-1.28.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91f01d1cd5321d00f91e072967899711
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.28.6 b/metadata/md5-cache/app-emulation/docker-compose-1.28.6
index 710f4a2b8b13..b53684f40bd4 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.28.6
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.28.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.28.6.tar.gz -> docker-compose-1.28.6.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e133be6244b0f7223ef6605cef25cc15
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.29.0 b/metadata/md5-cache/app-emulation/docker-compose-1.29.0
index 942848d64a73..f6a664c0aed1 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.29.0
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.29.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.29.0.tar.gz -> docker-compose-1.29.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5a52ffcbdc0a6301c5fe7b55d88acf17
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.29.1 b/metadata/md5-cache/app-emulation/docker-compose-1.29.1
index 283ec3095318..266ff3af679e 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.29.1
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.29.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.29.1.tar.gz -> docker-compose-1.29.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5a52ffcbdc0a6301c5fe7b55d88acf17
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.29.2 b/metadata/md5-cache/app-emulation/docker-compose-1.29.2
index 9e5e532ce63f..7879d80e4244 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.29.2
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.29.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.29.2.tar.gz -> docker-compose-1.29.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5a52ffcbdc0a6301c5fe7b55d88acf17
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
index d6e95001ca3b..f0622326bae1 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) gpm? ( sys-libs/gpm ) svga? ( media-libs/svgalib ) X? ( x11-apps/xset )
 SLOT=0
 SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz https://dev.gentoo.org/~slyfox/distfiles/dosemu-1.4.1_pre20130107.zip
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6b1fff0a13c7a74af747c1630f4c4c0a
diff --git a/metadata/md5-cache/app-emulation/genymotion-bin-3.2.1 b/metadata/md5-cache/app-emulation/genymotion-bin-3.2.1
index fa38d7d5592d..1073a5f97581 100644
--- a/metadata/md5-cache/app-emulation/genymotion-bin-3.2.1
+++ b/metadata/md5-cache/app-emulation/genymotion-bin-3.2.1
@@ -8,5 +8,5 @@ RDEPEND=app-emulation/virtualbox || ( dev-libs/openssl-compat:1.0.0 =dev-libs/op
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=genymotion-3.2.1-linux_x64.bin
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28db05f2a13e6736597799e63ca1b665
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103
index c78d8a05bf63..f2b7b877a8a5 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/1.38
 SRC_URI=https://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ef96376198e01e0fa24440e69c5c730d
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.44.1 b/metadata/md5-cache/app-emulation/libguestfs-1.44.1
index 5aa869f5afcc..14a6de05250f 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.44.1
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.44.1
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/1.44
 SRC_URI=https://libguestfs.org/download/1.44-stable/libguestfs-1.44.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a927eb3da71060f8f48c87ce2c615599
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3 b/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3
index 63e5f9f57d2f..ab8f636fab93 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3
+++ b/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.0.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.0.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.0.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bc5391f3b2b6324a3bfcf6c243ce8730
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1 b/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1
index bbc91110b205..1eaa1b12bff5 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.1.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.1.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.1.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
 _md5_=2d202afb794ada23ac836763f4ac6157
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1 b/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1
index 40355e0a4a75..5a82c7d93494 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.2.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.2.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.2.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
 _md5_=5f2c325d953e787c57f19fe5803bca9c
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.3.0 b/metadata/md5-cache/app-emulation/libvirt-7.3.0
index 351412b38a33..97a77ff7dd06 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.3.0
+++ b/metadata/md5-cache/app-emulation/libvirt-7.3.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.3.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.3.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.3.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
 _md5_=f6519aec5e6ba22d5a1ba3dddb818feb
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.4.0 b/metadata/md5-cache/app-emulation/libvirt-7.4.0
index 80211e7834a1..66403e72b3cf 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.4.0
+++ b/metadata/md5-cache/app-emulation/libvirt-7.4.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.4.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.4.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.4.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
 _md5_=e916be3bc136f1ecdaa1344848761a7c
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.5.0 b/metadata/md5-cache/app-emulation/libvirt-7.5.0
new file mode 100644
index 000000000000..5fc8de7a3322
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-7.5.0
@@ -0,0 +1,15 @@
+BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( app-crypt/openpgp-keys-libvirt ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( app-crypt/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
+DESCRIPTION=C toolkit to manipulate virtual machines
+EAPI=7
+HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
+IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs kernel_linux verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) virtual/tmpfiles
+REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
+SLOT=0/7.5.0
+SRC_URI=https://libvirt.org/sources/libvirt-7.5.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.5.0.tar.xz.asc )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=11f8d24a41695606e6c1a9430a172258
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index cdf7d2daea2e..23e8921e9483 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -1,14 +1,14 @@
 BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( app-crypt/openpgp-keys-libvirt ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( app-crypt/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
+DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( app-crypt/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=7
 HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
 IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs kernel_linux verify-sig
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) virtual/tmpfiles
+RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) virtual/tmpfiles
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=06d9316fc6d0541891d5c58622e2ace4
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=11f8d24a41695606e6c1a9430a172258
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.6 b/metadata/md5-cache/app-emulation/lxc-4.0.6
index 6c5dadd98e2e..12e628496ad5 100644
--- a/metadata/md5-cache/app-emulation/lxc-4.0.6
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.6
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap sys-libs/libseccomp virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.6.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.6.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6daa32380fa95a74181f10b2241d91f0
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.9-r1 b/metadata/md5-cache/app-emulation/lxc-4.0.9-r1
index cb41ab93d1d0..677a79375b73 100644
--- a/metadata/md5-cache/app-emulation/lxc-4.0.9-r1
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.9-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap sys-libs/libseccomp virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.9.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.9.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=932827931ea6840cbef1638999cc7b85
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.5 b/metadata/md5-cache/app-emulation/lxd-4.0.5
index dd8494fb4e4d..b89573eaf6ab 100644
--- a/metadata/md5-cache/app-emulation/lxd-4.0.5
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.5
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.5.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.5.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
 _md5_=b972eac46fcae382786968506af627f7
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.6 b/metadata/md5-cache/app-emulation/lxd-4.0.6
deleted file mode 100644
index 20c9bc05daf8..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-4.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/go nls? ( sys-devel/gettext ) verify-sig? ( app-crypt/openpgp-keys-linuxcontainers ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft net-dns/dnsmasq[dhcp,ipv6?]
-DESCRIPTION=Fast, dense and secure container management
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
-IUSE=apparmor ipv6 nls verify-sig kernel_linux verify-sig
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.6.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.6.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=4410a18ae50ddaf9e6a6fe840a99f98b
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.6-r1 b/metadata/md5-cache/app-emulation/lxd-4.0.6-r1
new file mode 100644
index 000000000000..26d96d2507c9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.6-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/go nls? ( sys-devel/gettext ) verify-sig? ( app-crypt/openpgp-keys-linuxcontainers ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?]
+DESCRIPTION=Fast, dense and secure container management
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
+IUSE=apparmor ipv6 nls verify-sig kernel_linux verify-sig
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.6.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.6.tar.gz.asc )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=fc76da6c338016edac3ce2e147bbd6a7
diff --git a/metadata/md5-cache/app-emulation/podman-3.1.2 b/metadata/md5-cache/app-emulation/podman-3.1.2
index 19423f1c1297..677c4363c37b 100644
--- a/metadata/md5-cache/app-emulation/podman-3.1.2
+++ b/metadata/md5-cache/app-emulation/podman-3.1.2
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/gpgme:= >=app-emulation/conmon-2.0.0 || ( >=app-emulation/runc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/podman/archive/v3.1.2.tar.gz -> podman-3.1.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bf5533d2e2f59b98867f133f543f2e37
diff --git a/metadata/md5-cache/app-emulation/podman-3.2.1 b/metadata/md5-cache/app-emulation/podman-3.2.1
index d62592b00a19..999f92ec21f3 100644
--- a/metadata/md5-cache/app-emulation/podman-3.2.1
+++ b/metadata/md5-cache/app-emulation/podman-3.2.1
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/gpgme:= >=app-emulation/conmon-2.0.0 || ( >=app-emulation/runc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/podman/archive/v3.2.1.tar.gz -> podman-3.2.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=af6a7ea1c5c61f274dd8b363da411a9e
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.5.2 b/metadata/md5-cache/app-emulation/protontricks-1.5.2
index 3f191d7ebb84..2dcc3d3fc473 100644
--- a/metadata/md5-cache/app-emulation/protontricks-1.5.2
+++ b/metadata/md5-cache/app-emulation/protontricks-1.5.2
@@ -4,7 +4,7 @@ DESCRIPTION=app-emulation/winetricks wrapper for Proton (Steam Play) games
 EAPI=7
 HOMEPAGE=https://github.com/Matoking/protontricks
 IUSE=+gui test python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=app-emulation/winetricks python_single_target_pypy3? ( dev-python/vdf[python_targets_pypy3(-)] ) python_single_target_python3_8? ( dev-python/vdf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/vdf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/vdf[python_targets_python3_10(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_pypy3? ( >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Matoking/protontricks/archive/1.5.2.tar.gz -> protontricks-1.5.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e5884d4e4e14e4bac5b33dbab6f302b6
+_md5_=94567ea1a521ba952b6c4eeb57535652
diff --git a/metadata/md5-cache/app-emulation/qemu-6.0.0 b/metadata/md5-cache/app-emulation/qemu-6.0.0
index c75870a1ce8d..96d86c6fcdd8 100644
--- a/metadata/md5-cache/app-emulation/qemu-6.0.0
+++ b/metadata/md5-cache/app-emulation/qemu-6.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-6.0.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=26825a84634a6537d4d7ea3ffd90842b
diff --git a/metadata/md5-cache/app-emulation/qemu-6.0.0-r50 b/metadata/md5-cache/app-emulation/qemu-6.0.0-r50
index 495374804a9a..45a3f5d9b919 100644
--- a/metadata/md5-cache/app-emulation/qemu-6.0.0-r50
+++ b/metadata/md5-cache/app-emulation/qemu-6.0.0-r50
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-6.0.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8443e6a2951489cca10f44be7d8715cf
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index 367785ca9797..82cfdf17c32e 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -11,5 +11,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3bc6c5345cb5a31f769c724830c33c98
diff --git a/metadata/md5-cache/app-emulation/skopeo-0.1.41 b/metadata/md5-cache/app-emulation/skopeo-0.1.41
index 3d4730216fb6..d387b8a7dd68 100644
--- a/metadata/md5-cache/app-emulation/skopeo-0.1.41
+++ b/metadata/md5-cache/app-emulation/skopeo-0.1.41
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-e
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/skopeo/archive/v0.1.41.tar.gz -> skopeo-0.1.41.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b2d22acb4beee5267650039d94fd0f8
diff --git a/metadata/md5-cache/app-emulation/skopeo-0.2.0 b/metadata/md5-cache/app-emulation/skopeo-0.2.0
index e10cc4ae8f75..c69771e9fe47 100644
--- a/metadata/md5-cache/app-emulation/skopeo-0.2.0
+++ b/metadata/md5-cache/app-emulation/skopeo-0.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-e
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/skopeo/archive/v0.2.0.tar.gz -> skopeo-0.2.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9807f9c2b3d2ade2db04c47608c47102
diff --git a/metadata/md5-cache/app-emulation/skopeo-1.1.0 b/metadata/md5-cache/app-emulation/skopeo-1.1.0
index 45fabffa873d..cf52918a1675 100644
--- a/metadata/md5-cache/app-emulation/skopeo-1.1.0
+++ b/metadata/md5-cache/app-emulation/skopeo-1.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-e
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/skopeo/archive/v1.1.0.tar.gz -> skopeo-1.1.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab7a444df4892969e4ab27c0d488c3ec
diff --git a/metadata/md5-cache/app-emulation/skopeo-1.1.1 b/metadata/md5-cache/app-emulation/skopeo-1.1.1
index eabe0caa1c16..1081f7937d2c 100644
--- a/metadata/md5-cache/app-emulation/skopeo-1.1.1
+++ b/metadata/md5-cache/app-emulation/skopeo-1.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-e
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/skopeo/archive/v1.1.1.tar.gz -> skopeo-1.1.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6b119d3fd3411e7bd5d2073ab551946
diff --git a/metadata/md5-cache/app-emulation/skopeo-1.3.0 b/metadata/md5-cache/app-emulation/skopeo-1.3.0
index 146cdcf76331..d3d2da8a27b9 100644
--- a/metadata/md5-cache/app-emulation/skopeo-1.3.0
+++ b/metadata/md5-cache/app-emulation/skopeo-1.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-e
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/skopeo/archive/v1.3.0.tar.gz -> skopeo-1.3.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=98c9aaeca099a61cb0cef9d5e501d9d1
diff --git a/metadata/md5-cache/app-emulation/skopeo-1.3.1 b/metadata/md5-cache/app-emulation/skopeo-1.3.1
index 74bd996dfee5..8fbdbede2d40 100644
--- a/metadata/md5-cache/app-emulation/skopeo-1.3.1
+++ b/metadata/md5-cache/app-emulation/skopeo-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-e
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/skopeo/archive/v1.3.1.tar.gz -> skopeo-1.3.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=98c9aaeca099a61cb0cef9d5e501d9d1
diff --git a/metadata/md5-cache/app-emulation/snapd-2.48 b/metadata/md5-cache/app-emulation/snapd-2.48
index 1ce6c9415e33..f8ac707b0e09 100644
--- a/metadata/md5-cache/app-emulation/snapd-2.48
+++ b/metadata/md5-cache/app-emulation/snapd-2.48
@@ -13,5 +13,5 @@ REQUIRED_USE=!forced-devmode? ( apparmor cgroup-hybrid ) systemd
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/snapcore/snapd/releases/download/2.48/snapd_2.48.vendor.tar.xz -> snapd-2.48.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=48dc080c0c34e71f91a66ab4a1e75cd5
diff --git a/metadata/md5-cache/app-emulation/snapd-2.51 b/metadata/md5-cache/app-emulation/snapd-2.51
index d7ca179790d1..b71ab2e9a15f 100644
--- a/metadata/md5-cache/app-emulation/snapd-2.51
+++ b/metadata/md5-cache/app-emulation/snapd-2.51
@@ -13,5 +13,5 @@ REQUIRED_USE=!forced-devmode? ( apparmor cgroup-hybrid ) systemd
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/snapcore/snapd/releases/download/2.51/snapd_2.51.vendor.tar.xz -> snapd-2.51.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=74067ca897f2a642f386674c1fcadf80
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.7-r1 b/metadata/md5-cache/app-emulation/vagrant-2.2.7-r1
index c1a373a389ff..3553c4731a9d 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.2.7-r1
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.7.tar.gz -> vagrant-2.2.7.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7659da174e6ab3eb32e2c03fb3a5dade
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.9-r1 b/metadata/md5-cache/app-emulation/vagrant-2.2.9-r1
index 92245ade5d63..29e5335071e0 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.2.9-r1
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.9.tar.gz -> vagrant-2.2.9.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a83c665ce1731beda4ac8a4b1901aa30
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.18 b/metadata/md5-cache/app-emulation/virtualbox-6.1.18
index 986fda29a078..4ca66141d5ce 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.18
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.18/VirtualBox-6.1.18.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=05e8f3e1886402e5ef6a9e718c3a026b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.20-r1 b/metadata/md5-cache/app-emulation/virtualbox-6.1.20-r1
index 5c506d32ac4f..9bdb3a6cf49c 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.20-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.20-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.20/VirtualBox-6.1.20.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cd8ea824db83cec0f08c9aca7a5da9c0
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-6.1.22
index cdb52cc316b8..0e1f956ed006 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.22
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/VirtualBox-6.1.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7842f423d34c991f09c420cccbd5a740
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.10 b/metadata/md5-cache/app-emulation/wine-staging-6.10
index f6b610aa65d2..009b07a78e2b 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-6.10
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=6.10
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.10.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.10.tar.gz -> wine-staging-6.10.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7086b743b508dabe71ee7bd8f06c51a4
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.11 b/metadata/md5-cache/app-emulation/wine-staging-6.11
index 45864d2a3c64..57b4729e9f69 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-6.11
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=6.11
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.11.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.11.tar.gz -> wine-staging-6.11.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7086b743b508dabe71ee7bd8f06c51a4
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.12 b/metadata/md5-cache/app-emulation/wine-staging-6.12
index 9a032b34234d..5dfa2743660f 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-6.12
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=6.12
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.12.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.12.1.tar.gz -> wine-staging-6.12.1.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d2513045c34a2ccb2f0952176c6fad53
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=65475c962dc61fc4d629663fe22373cd
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.9 b/metadata/md5-cache/app-emulation/wine-staging-6.9
index 810999f2904e..d714f3452ddc 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-6.9
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=6.9
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.9.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.9.tar.gz -> wine-staging-6.9.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=92c963a2fa47a37060505e8819bf7f40
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 752d6ef800e8..0c1f2809b102 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7086b743b508dabe71ee7bd8f06c51a4
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=23edf5f23f83a653aed658f00b804a7b
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.0 b/metadata/md5-cache/app-emulation/wine-vanilla-6.0
index ff537065d733..4f02429c985a 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.0
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=6.0
 SRC_URI=https://dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3fc2528312cda88c91c0d40550fc7f06
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1 b/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1
index 82430261c0b2..f402618d7389 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=6.0.1
 SRC_URI=https://dl.winehq.org/wine/source/6.0/wine-6.0.1.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=96c26e8d98eb441ae7fa342aef979d72
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.10 b/metadata/md5-cache/app-emulation/wine-vanilla-6.10
index c9aa81fb6d8e..b11802902ddf 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.10
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=6.10
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.10.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=22967e39a94ecfd9752f335ab06fe863
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.11 b/metadata/md5-cache/app-emulation/wine-vanilla-6.11
index 0263a9dc4fd3..196de82c2fa6 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.11
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=6.11
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.11.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=22967e39a94ecfd9752f335ab06fe863
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.12 b/metadata/md5-cache/app-emulation/wine-vanilla-6.12
index 9be14418f896..808c06f6ad22 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.12
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=6.12
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.12.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22967e39a94ecfd9752f335ab06fe863
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0f24765578b7c1fc4dcbb032898b2193
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.9 b/metadata/md5-cache/app-emulation/wine-vanilla-6.9
index b09111ae23ea..ed5283e418d5 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.9
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=6.9
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.9.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6ba57cecaef2ea0491ec9c3d2258535d
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index fa652571ad0b..db9fbd593897 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=22967e39a94ecfd9752f335ab06fe863
diff --git a/metadata/md5-cache/app-emulation/xen-4.13.3 b/metadata/md5-cache/app-emulation/xen-4.13.3
deleted file mode 100644
index 807acb131571..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.13.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=debug efi flask
-KEYWORDS=amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.13.3
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.13.3/xen-4.13.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bc4130d18afd07dc79de59e63d89560d
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.2 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.2
deleted file mode 100644
index 1b4b93f33c69..000000000000
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-devel/gettext sys-devel/bin86 sys-apps/texinfo x11-libs/pixman
-DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=+python_single_target_python3_8
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-emulation/xen-tools-4.13.2
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c07a5b042399f8f63a28f5da8c9bbf6
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.3 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.3
deleted file mode 100644
index b8735fc9a710..000000000000
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-devel/gettext sys-devel/bin86 sys-apps/texinfo x11-libs/pixman
-DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-emulation/xen-tools-4.13.3
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.13.3/xen-4.13.3.tar.gz https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=893c24a3d5f9a63d1569c58fe73f22d9
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.1 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.1
deleted file mode 100644
index 6ac79e871056..000000000000
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-devel/gettext sys-devel/bin86 sys-apps/texinfo x11-libs/pixman
-DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-emulation/xen-tools-4.14.1
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f6845628651d78965de27d4716ff2963
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.13.3-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.13.3-r1
deleted file mode 100644
index fe434dff0c17..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.13.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=sys-kernel/linux-headers-4.11 python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.13
-SRC_URI=https://downloads.xenproject.org/release/xen/4.13.3/xen-4.13.3.tar.gz https://www.seabios.org/downloads/seabios-1.12.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-21.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-21.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85c2666a9e6078eae10208dbb04b8736
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.14.2-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.14.2-r1
index 37eb27f67d5f..ef5588d51d6b 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.14.2-r1
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.14.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0/4.14
 SRC_URI=https://downloads.xenproject.org/release/xen/4.14.2/xen-4.14.2.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.14.2-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.2-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-23.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-23.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=771898c9e80791cee5e86e429ed01e5c
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.0-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.15.0-r1
deleted file mode 100644
index e61cd594af60..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-misc/pax-utils dev-lang/perl >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.15
-SRC_URI=https://downloads.xenproject.org/release/xen/4.15.0/xen-4.15.0.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.15.0-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.15.0-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-23.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-23.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2da62f3cdcbfc2ab5378478b2549fd32
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.0-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.15.0-r2
new file mode 100644
index 000000000000..5e17cdabf505
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.15.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-misc/pax-utils dev-lang/perl >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.15
+SRC_URI=https://downloads.xenproject.org/release/xen/4.15.0/xen-4.15.0.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.15.0-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.15.0-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-23.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-23.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=601948973743c302815ec4f76b787428
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 9560083f5c4c..6abb98f6bb55 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/honggfuzz-2.4 b/metadata/md5-cache/app-forensics/honggfuzz-2.4
index 12e7350d6bc2..9c2a32a5d0de 100644
--- a/metadata/md5-cache/app-forensics/honggfuzz-2.4
+++ b/metadata/md5-cache/app-forensics/honggfuzz-2.4
@@ -1,8 +1,8 @@
 DEFINED_PHASES=install prepare pretend
 DEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind:= app-arch/xz-utils clang? ( sys-libs/blocksruntime )
 DESCRIPTION=A general purpose fuzzer with feedback support
-EAPI=7
-HOMEPAGE=https://google.github.io/honggfuzz/
+EAPI=8
+HOMEPAGE=https://honggfuzz.dev/
 IUSE=clang
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind:= app-arch/xz-utils c
 SLOT=0
 SRC_URI=https://github.com/google/honggfuzz/archive/2.4.tar.gz -> honggfuzz-2.4.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8b43d72ad89a0d5e6aaff23af17e8bd7
+_md5_=d513a7b88279a0ee36696d4ba1cde3d9
diff --git a/metadata/md5-cache/app-forensics/lynis-3.0.4 b/metadata/md5-cache/app-forensics/lynis-3.0.4
index 848f07fe5493..bef9841485f1 100644
--- a/metadata/md5-cache/app-forensics/lynis-3.0.4
+++ b/metadata/md5-cache/app-forensics/lynis-3.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=https://cisofy.com/files/lynis-3.0.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b1bb46006b3817751f27cd986582bda
diff --git a/metadata/md5-cache/app-forensics/rkhunter-1.4.6-r1 b/metadata/md5-cache/app-forensics/rkhunter-1.4.6-r1
index f03a202a2fa9..348535287640 100644
--- a/metadata/md5-cache/app-forensics/rkhunter-1.4.6-r1
+++ b/metadata/md5-cache/app-forensics/rkhunter-1.4.6-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl sys-process/lsof[rpc]
 SLOT=0
 SRC_URI=mirror://sourceforge/rkhunter/rkhunter-1.4.6.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ff3df0ae236c702615f2402f7744051a
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 8347b39e1ee0..ce9e980a7f1b 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/anthy-9100h-r2 b/metadata/md5-cache/app-i18n/anthy-9100h-r2
deleted file mode 100644
index 316284a2db26..000000000000
--- a/metadata/md5-cache/app-i18n/anthy-9100h-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=canna-2ch? ( app-dicts/canna-2ch ) emacs? ( >=app-editors/emacs-23.1:* )
-DEFINED_PHASES=configure install postinst postrm prepare
-DESCRIPTION=Anthy -- free and secure Japanese input system
-EAPI=7
-HOMEPAGE=http://anthy.osdn.jp/
-IUSE=canna-2ch emacs static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=canna-2ch? ( app-dicts/canna-2ch ) emacs? ( >=app-editors/emacs-23.1:* )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/anthy/37536/anthy-9100h.tar.gz
-_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=19b43decca4686ac9959a14b1a06c72c
diff --git a/metadata/md5-cache/app-i18n/anthy-9100h-r3 b/metadata/md5-cache/app-i18n/anthy-9100h-r3
new file mode 100644
index 000000000000..93b6c9f92a20
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/anthy-9100h-r3
@@ -0,0 +1,13 @@
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
+DEFINED_PHASES=configure install postinst postrm
+DESCRIPTION=Anthy -- free and secure Japanese input system
+EAPI=7
+HOMEPAGE=http://anthy.osdn.jp/
+IUSE=emacs static-libs
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/anthy/37536/anthy-9100h.tar.gz
+_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=8b3a56f6bacf42ac132f36aba1147192
diff --git a/metadata/md5-cache/app-i18n/canfep-1.0-r1 b/metadata/md5-cache/app-i18n/canfep-1.0-r1
deleted file mode 100644
index a0727ca01813..000000000000
--- a/metadata/md5-cache/app-i18n/canfep-1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=app-i18n/canna sys-libs/ncurses:=
-DESCRIPTION=Canna Japanese kana-kanji frontend processor on console
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=unicode
-KEYWORDS=~alpha amd64 ppc ~sparc x86
-LICENSE=canfep
-RDEPEND=app-i18n/canna sys-libs/ncurses:=
-SLOT=0
-SRC_URI=mirror://gentoo/canfep-1.0.tar.gz unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/canfep_utf8.diff )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=600cad60f0f5c354871f6539d02ab3ff
diff --git a/metadata/md5-cache/app-i18n/canna-3.7_p3-r4 b/metadata/md5-cache/app-i18n/canna-3.7_p3-r4
deleted file mode 100644
index a253189d1922..000000000000
--- a/metadata/md5-cache/app-i18n/canna-3.7_p3-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=x11-misc/gccmakedep x11-misc/imake canuum? ( virtual/pkgconfig ) doc? ( app-text/ghostscript-gpl dev-texlive/texlive-langjapanese dev-texlive/texlive-latexrecommended ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=canuum? ( dev-libs/libspt sys-libs/ncurses:= )
-DESCRIPTION=A client-server based Kana-Kanji conversion system
-EAPI=7
-HOMEPAGE=http://canna.osdn.jp/
-IUSE=canuum doc ipv6
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT GPL-2
-RDEPEND=canuum? ( dev-libs/libspt sys-libs/ncurses:= )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/canna/9565/Canna37p3.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cannadic	145c711b38518c18057f15cf6fb3ae9f	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bbf5773bdf54babf2e9b5998277ecc01
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.22 b/metadata/md5-cache/app-i18n/ibus-1.5.22
index 178774635762..b4df0ce23d62 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.22
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.22
@@ -12,5 +12,5 @@ REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) python? ( || ( python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.22/ibus-1.5.22.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0be74d6d78171872534a6816917496b7
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.23 b/metadata/md5-cache/app-i18n/ibus-1.5.23
index 3a4185a5c29f..645426c960b9 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.23
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.23
@@ -12,5 +12,5 @@ REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) python? ( || ( python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.23/ibus-1.5.23.tar.gz https://dev.gentoo.org/~dlan/distfiles/ibus-1.5.23-gentoo-patches-1.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=df99eebd9556a41760b2900509b6b32d
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.24 b/metadata/md5-cache/app-i18n/ibus-1.5.24
index e52ce8159ceb..dadd063cfbfd 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.24
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.24
@@ -12,5 +12,5 @@ REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) python? ( || ( python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.24/ibus-1.5.24.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=56569460658bab8bde3dc2b2d49616cb
diff --git a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1 b/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
deleted file mode 100644
index 67a982d0db57..000000000000
--- a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-i18n/canna x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Japanese Canna input method module for GTK+2
-EAPI=6
-HOMEPAGE=http://bonobo.gnome.gr.jp/~nakai/immodule/
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/canna x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-canna-0.3.2.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=610ba2e5e956f0c22ffc6a278c6585c0
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.14.3 b/metadata/md5-cache/app-i18n/transifex-client-0.14.3
new file mode 100644
index 000000000000..298d2de3044d
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.14.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/python-slugify-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/six-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A command line interface for Transifex
+EAPI=7
+HOMEPAGE=https://pypi.org/project/transifex-client/ https://www.transifex.net/ https://github.com/transifex/transifex-client
+IUSE=test test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/python-slugify-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/six-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.14.3.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=adaccca1c8f570791b9b91bbe613f063
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.8 b/metadata/md5-cache/app-i18n/uim-1.8.8
deleted file mode 100644
index 8bfcc8b073ec..000000000000
--- a/metadata/md5-cache/app-i18n/uim-1.8.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=anthy? ( app-i18n/anthy ) canna? ( app-i18n/canna ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A multilingual input method framework
-EAPI=7
-HOMEPAGE=https://github.com/uim/uim
-IUSE=X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
-LICENSE=BSD GPL-2 LGPL-2.1
-RDEPEND=anthy? ( app-i18n/anthy ) canna? ( app-i18n/canna ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) !dev-scheme/sigscheme X? ( media-fonts/font-sony-misc l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) l10n_zh-TW? ( media-fonts/intlfonts ) )
-REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/uim/uim/releases/download/1.8.8/uim-1.8.8.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0944bd27cff6c1d43bdf77aa6bd63ea3
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.8-r1 b/metadata/md5-cache/app-i18n/uim-1.8.8-r1
new file mode 100644
index 000000000000..2f4a588fc80b
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/uim-1.8.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=anthy? ( app-i18n/anthy ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A multilingual input method framework
+EAPI=7
+HOMEPAGE=https://github.com/uim/uim
+IUSE=X +anthy curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
+LICENSE=BSD GPL-2 LGPL-2.1
+RDEPEND=anthy? ( app-i18n/anthy ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtx11extras:5 ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt ) !dev-scheme/sigscheme X? ( media-fonts/font-sony-misc l10n_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) l10n_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) l10n_zh-CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) l10n_zh-TW? ( media-fonts/intlfonts ) )
+REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/uim/uim/releases/download/1.8.8/uim-1.8.8.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d0fef4dc0e0bc2f2860ed1fe434f057d
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 6ae92eecebf6..4b598c021e23 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/thinkfan-1.2.2 b/metadata/md5-cache/app-laptop/thinkfan-1.2.2
new file mode 100644
index 000000000000..be7d243abbd2
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/thinkfan-1.2.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp )
+DESCRIPTION=Simple fan control program for thinkpads
+EAPI=7
+HOMEPAGE=https://github.com/vmatare/thinkfan
+IUSE=atasmart nvidia +yaml
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=atasmart? ( dev-libs/libatasmart ) yaml? ( dev-cpp/yaml-cpp ) nvidia? ( x11-drivers/nvidia-drivers )
+SLOT=0
+SRC_URI=https://github.com/vmatare/thinkfan/archive/1.2.2.tar.gz -> thinkfan-1.2.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c5a724c11085a0fa273e18c6faec74df
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 7dfd4d81e6a7..1c7f737889b2 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/node_exporter-1.2.0 b/metadata/md5-cache/app-metrics/node_exporter-1.2.0
new file mode 100644
index 000000000000..2952ebd46ab5
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/node_exporter-1.2.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=dev-util/promu-0.3.0 acct-group/node_exporter acct-user/node_exporter
+DESCRIPTION=Prometheus exporter for machine metrics
+EAPI=7
+HOMEPAGE=https://github.com/prometheus/node_exporter
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=acct-group/node_exporter acct-user/node_exporter
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/prometheus/node_exporter/archive/v1.2.0.tar.gz -> node_exporter-1.2.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/beevik/ntp/@v/v0.3.0.zip -> github.com%2Fbeevik%2Fntp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/beevik/ntp/@v/v0.3.0.mod -> github.com%2Fbeevik%2Fntp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.mod mirror://goproxy//github.com/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/ema/qdisc/@v/v0.0.0-20200603082823-62d0308e3e00.zip -> github.com%2Fema%2Fqdisc%2F@v%2Fv0.0.0-20200603082823-62d0308e3e00.zip mirror://goproxy//github.com/ema/qdisc/@v/v0.0.0-20200603082823-62d0308e3e00.mod -> github.com%2Fema%2Fqdisc%2F@v%2Fv0.0.0-20200603082823-62d0308e3e00.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.zip -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190402143921-271e53dc4968.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190402143921-271e53dc4968.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190402143921-271e53dc4968.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190402143921-271e53dc4968.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hodgesds/perf-utils/@v/v0.2.5.zip -> github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.zip mirror://goproxy//github.com/hodgesds/perf-utils/@v/v0.2.5.mod -> github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.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/illumos/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.zip -> github.com%2Fillumos%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.zip mirror://goproxy//github.com/illumos/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.mod -> github.com%2Fillumos%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.mod mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.zip -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.zip mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.mod -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190830100107-3784a6c7c552.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190830100107-3784a6c7c552.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201220180245-69540ac93943.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201220180245-69540ac93943.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210122163228-8d122574c736.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210122163228-8d122574c736.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210212075122-66c871082f2b.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210212075122-66c871082f2b.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210525051524-4cc836578190.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210525051524-4cc836578190.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210713125558-2bfdf1dbdbd6.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210713125558-2bfdf1dbdbd6.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210713125558-2bfdf1dbdbd6.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210713125558-2bfdf1dbdbd6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lufia/iostat/@v/v1.1.0.zip -> github.com%2Flufia%2Fiostat%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lufia/iostat/@v/v1.1.0.mod -> github.com%2Flufia%2Fiostat%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-xmlrpc/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-xmlrpc%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-xmlrpc/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-xmlrpc%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mdlayher/ethtool/@v/v0.0.0-20210210192532-2b88debcdd43.zip -> github.com%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.zip mirror://goproxy//github.com/mdlayher/ethtool/@v/v0.0.0-20210210192532-2b88debcdd43.mod -> github.com%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.mod mirror://goproxy//github.com/mdlayher/genetlink/@v/v1.0.0.zip -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mdlayher/genetlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190828143259-340058475d09.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190828143259-340058475d09.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.2-0.20210123213345-5cc92139ae3e.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.2-0.20210123213345-5cc92139ae3e.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.3.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.1.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/mdlayher/socket/@v/v0.0.0-20210307095302-262dc9984e00.zip -> github.com%2Fmdlayher%2Fsocket%2F@v%2Fv0.0.0-20210307095302-262dc9984e00.zip mirror://goproxy//github.com/mdlayher/socket/@v/v0.0.0-20210307095302-262dc9984e00.mod -> github.com%2Fmdlayher%2Fsocket%2F@v%2Fv0.0.0-20210307095302-262dc9984e00.mod mirror://goproxy//github.com/mdlayher/wifi/@v/v0.0.0-20200527114002-84f0b9457fdd.zip -> github.com%2Fmdlayher%2Fwifi%2F@v%2Fv0.0.0-20200527114002-84f0b9457fdd.zip mirror://goproxy//github.com/mdlayher/wifi/@v/v0.0.0-20200527114002-84f0b9457fdd.mod -> github.com%2Fmdlayher%2Fwifi%2F@v%2Fv0.0.0-20200527114002-84f0b9457fdd.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.29.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.29.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.mod mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.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/safchain/ethtool/@v/v0.0.0-20201023143004-874930cb3ce0.zip -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20201023143004-874930cb3ce0.zip mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20201023143004-874930cb3ce0.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20201023143004-874930cb3ce0.mod mirror://goproxy//github.com/siebenmann/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.zip -> github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.zip mirror://goproxy//github.com/siebenmann/go-kstat/@v/v0.0.0-20210513183136-173c9b0a9973.mod -> github.com%2Fsiebenmann%2Fgo-kstat%2F@v%2Fv0.0.0-20210513183136-173c9b0a9973.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/soundcloud/go-runit/@v/v0.0.0-20150630195641-06ad41a06c4a.zip -> github.com%2Fsoundcloud%2Fgo-runit%2F@v%2Fv0.0.0-20150630195641-06ad41a06c4a.zip mirror://goproxy//github.com/soundcloud/go-runit/@v/v0.0.0-20150630195641-06ad41a06c4a.mod -> github.com%2Fsoundcloud%2Fgo-runit%2F@v%2Fv0.0.0-20150630195641-06ad41a06c4a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201010224723-4f7140c49acb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210525063256-abc453219eb5.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210525063256-abc453219eb5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210514164344-f6687ab2804c.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210514164344-f6687ab2804c.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190219203350-90b0e4468f99.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190219203350-90b0e4468f99.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190902133755-9109b7679e13.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190902133755-9109b7679e13.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201118182958-a01c418693c7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201118182958-a01c418693c7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201218084310-7d0127a74742.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210110051926-789bb1bd4061.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210110051926-789bb1bd4061.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210123111255-9b0068b26619.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210123111255-9b0068b26619.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210216163648-f7da38b97c65.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210216163648-f7da38b97c65.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210525143221-35b2ab0089ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210525143221-35b2ab0089ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fbd81601adf9a5917c8060b93939dc34
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.28.1 b/metadata/md5-cache/app-metrics/prometheus-2.28.1
new file mode 100644
index 000000000000..ff08651adad3
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-2.28.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/promu-0.3.0 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=!app-metrics/prometheus-bin acct-group/prometheus acct-user/prometheus
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=7
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64 ~arm
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RDEPEND=acct-group/prometheus acct-user/prometheus
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v2.28.1.tar.gz -> prometheus-2.28.1.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-metrics/prometheus/prometheus-2.28.1-asset.tar.xz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.43.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.43.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.83.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.83.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.83.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.83.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/bigtable/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fbigtable%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/bigtable/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigtable%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//collectd.org/@v/v0.3.0.mod -> collectd.org%2F@v%2Fv0.3.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/v41.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv41.3.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v55.2.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.2.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v55.2.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.12.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.12.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.19.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.19.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.19.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.19.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.14.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.14.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.14.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.14.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.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.3.3.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 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/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!hdr!histogram/hdrhistogram-go/@v/v1.0.1.zip -> github.com%2F!hdr!histogram%2Fhdrhistogram-go%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!hdr!histogram/hdrhistogram-go/@v/v1.0.1.mod -> github.com%2F!hdr!histogram%2Fhdrhistogram-go%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.16.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.16.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod mirror://goproxy//github.com/!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/!s!a!p/go-hdb/@v/v0.14.1.mod -> github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/!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/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20210208195552-ff826a37aa15.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20210208195552-ff826a37aa15.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20210208195552-ff826a37aa15.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20210208195552-ff826a37aa15.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/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod mirror://goproxy//github.com/antihax/optional/@v/v1.0.0.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aokoli/goutils/@v/v1.0.1.mod -> github.com%2Faokoli%2Fgoutils%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20191024131854-af6fa24be0db.mod -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20191024131854-af6fa24be0db.mod mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20200923215132-ac86123a3f01.mod -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200923215132-ac86123a3f01.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/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.3.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.3.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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-20200108200545-475eaeb16496.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.mod 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/asaskevich/govalidator/@v/v0.0.0-20200907205600-7a23bdc65eef.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200907205600-7a23bdc65eef.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200907205600-7a23bdc65eef.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200907205600-7a23bdc65eef.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.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.29.16.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.29.16.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.30.12.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.28.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.28.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.60.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.60.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.60.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.60.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/benbjohnson/immutable/@v/v0.2.1.mod -> github.com%2Fbenbjohnson%2Fimmutable%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/benbjohnson/tmpl/@v/v1.0.0.mod -> github.com%2Fbenbjohnson%2Ftmpl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.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/bmizerany/pat/@v/v0.0.0-20170815010413-6226ea591a40.mod -> github.com%2Fbmizerany%2Fpat%2F@v%2Fv0.0.0-20170815010413-6226ea591a40.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bonitoo-io/go-sql-bigquery/@v/v0.3.4-1.4.0.mod -> github.com%2Fbonitoo-io%2Fgo-sql-bigquery%2F@v%2Fv0.3.4-1.4.0.mod mirror://goproxy//github.com/c-bata/go-prompt/@v/v0.2.2.mod -> github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/cactus/go-statsd-client/statsd/@v/v0.0.0-20191106001114-12b4e2b38748.mod -> github.com%2Fcactus%2Fgo-statsd-client%2Fstatsd%2F@v%2Fv0.0.0-20191106001114-12b4e2b38748.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/v0.0.0-20181003080854-62661b46c409.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv0.0.0-20181003080854-62661b46c409.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/cenkalti/backoff/v4/@v/v4.1.0.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/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.0.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/clbanning/x2j/@v/v0.0.0-20191024224557-825249438eec.mod -> github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/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/containerd/@v/v1.4.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.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/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/dave/jennifer/@v/v1.2.0.mod -> github.com%2Fdave%2Fjennifer%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200428022330-06a60b6afbbc.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgrijalva/jwt-go/v4/@v/v4.0.0-preview1.mod -> github.com%2Fdgrijalva%2Fjwt-go%2Fv4%2F@v%2Fv4.0.0-preview1.mod mirror://goproxy//github.com/dgryski/go-bitstream/@v/v0.0.0-20180413035011-3522498ce2c8.mod -> github.com%2Fdgryski%2Fgo-bitstream%2F@v%2Fv0.0.0-20180413035011-3522498ce2c8.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20190329191031-25c5027a8c7b.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20190329191031-25c5027a8c7b.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20200911182023-62edffca9245.zip -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20200911182023-62edffca9245.zip mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20200911182023-62edffca9245.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20200911182023-62edffca9245.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.62.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.62.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.62.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.62.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.7+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.7+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v20.10.7+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.7+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/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/eclipse/paho.mqtt.golang/@v/v1.2.0.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.zip -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.zip 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-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.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.9.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/foxcpp/go-mockdns/@v/v0.0.0-20201212160233-ede2f9158d15.mod -> github.com%2Ffoxcpp%2Fgo-mockdns%2F@v%2Fv0.0.0-20201212160233-ede2f9158d15.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/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/glycerine/go-unsnap-stream/@v/v0.0.0-20180323001048-9f0cb55181dd.mod -> github.com%2Fglycerine%2Fgo-unsnap-stream%2F@v%2Fv0.0.0-20180323001048-9f0cb55181dd.mod mirror://goproxy//github.com/glycerine/goconvey/@v/v0.0.0-20190410193231-58a59202ab31.mod -> github.com%2Fglycerine%2Fgoconvey%2F@v%2Fv0.0.0-20190410193231-58a59202ab31.mod mirror://goproxy//github.com/go-chi/chi/@v/v4.1.0+incompatible.mod -> github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.zip -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-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.4.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.4.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/analysis/@v/v0.19.10.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.10.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.16.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.16.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.20.0.zip -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.20.0.zip mirror://goproxy//github.com/go-openapi/analysis/@v/v0.20.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.20.0.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/errors/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.6.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.6.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.7.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.7.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.8.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.8.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.9.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.9.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.20.0.zip -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.20.0.zip mirror://goproxy//github.com/go-openapi/errors/@v/v0.20.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.20.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.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.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.3.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/loads/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.6.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.6.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.7.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.7.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.20.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.20.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.20.2.zip -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.20.2.zip mirror://goproxy//github.com/go-openapi/loads/@v/v0.20.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.20.2.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/runtime/@v/v0.19.15.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.15.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.16.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.16.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.24.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.24.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.28.zip -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.28.zip mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.28.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.28.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.6.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.6.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.7.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.7.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.8.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.8.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.15.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.15.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.20.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.20.1.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.20.3.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.3.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.20.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.20.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.2.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.11.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.11.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.20.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.20.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.20.1.zip -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.20.1.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.20.1.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.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.7.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.7.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.9.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.9.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.12.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.12.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.13.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.13.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.14.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.15.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.15.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.15.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.15.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.3.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.8.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.10.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.10.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.12.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.12.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.15.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.15.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.20.1.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.20.2.zip -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.2.zip mirror://goproxy//github.com/go-openapi/validate/@v/v0.20.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.20.2.mod mirror://goproxy//github.com/go-resty/resty/v2/@v/v2.1.1-0.20191201195748-d7b97669fe48.zip -> github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.1.1-0.20191201195748-d7b97669fe48.zip mirror://goproxy//github.com/go-resty/resty/v2/@v/v2.1.1-0.20191201195748-d7b97669fe48.mod -> github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.1.1-0.20191201195748-d7b97669fe48.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-zookeeper/zk/@v/v1.0.2.zip -> github.com%2Fgo-zookeeper%2Fzk%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-zookeeper/zk/@v/v1.0.2.mod -> github.com%2Fgo-zookeeper%2Fzk%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gobuffalo/attrs/@v/v0.0.0-20190224210810-a9411de4debd.mod -> github.com%2Fgobuffalo%2Fattrs%2F@v%2Fv0.0.0-20190224210810-a9411de4debd.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.0.0-20190329151759-d478694a28d3.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.0.0-20190329151759-d478694a28d3.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.6.15.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.6.15.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.7.0.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.3.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190329151137-27723ad26ef9.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190329151137-27723ad26ef9.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190403191548-3ca520ef0d9e.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190403191548-3ca520ef0d9e.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/gitgen/@v/v0.0.0-20190315122116-cc086187d211.mod -> github.com%2Fgobuffalo%2Fgitgen%2F@v%2Fv0.0.0-20190315122116-cc086187d211.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.0.0-20190315121717-8f38393713f5.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.0.0-20190315121717-8f38393713f5.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v0.0.0-20190315122211-86e12af44bc2.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv0.0.0-20190315122211-86e12af44bc2.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.1.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.2.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.0.0-20190315124812-a385830c7fc0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.0.0-20190315124812-a385830c7fc0.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.0.9.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.0.9.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.2.0.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/gobuffalo/syncx/@v/v0.0.0-20190224160051-33c29581e754.mod -> github.com%2Fgobuffalo%2Fsyncx%2F@v%2Fv0.0.0-20190224160051-33c29581e754.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gofrs/uuid/@v/v4.0.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv4.0.0+incompatible.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.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.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190730201129-28a6bbf47e48.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190730201129-28a6bbf47e48.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/geo/@v/v0.0.0-20190916061304-5b978397cfec.mod -> github.com%2Fgolang%2Fgeo%2F@v%2Fv0.0.0-20190916061304-5b978397cfec.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.11.0.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.2.1.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.2.1.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200417002340-c6e0a841f49a.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200417002340-c6e0a841f49a.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210609004039-a478d1d731e9.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210609004039-a478d1d731e9.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210609004039-a478d1d731e9.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210609004039-a478d1d731e9.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.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.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.10.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.18.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.18.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.18.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/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/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.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.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.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.14.4.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.14.4.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.8.1.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.8.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.7.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.7.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.2.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.4.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.3.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hetznercloud/hcloud-go/@v/v1.26.2.zip -> github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.26.2.zip mirror://goproxy//github.com/hetznercloud/hcloud-go/@v/v1.26.2.mod -> github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.26.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.0.0.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.4.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/flux/@v/v0.65.0.mod -> github.com%2Finfluxdata%2Fflux%2F@v%2Fv0.65.0.mod mirror://goproxy//github.com/influxdata/flux/@v/v0.113.0.mod -> github.com%2Finfluxdata%2Fflux%2F@v%2Fv0.113.0.mod mirror://goproxy//github.com/influxdata/httprouter/@v/v1.3.1-0.20191122104820-ee83e2772f69.mod -> github.com%2Finfluxdata%2Fhttprouter%2F@v%2Fv1.3.1-0.20191122104820-ee83e2772f69.mod mirror://goproxy//github.com/influxdata/influxdb/@v/v1.8.0.mod -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/influxdata/influxdb/@v/v1.9.2.zip -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.9.2.zip mirror://goproxy//github.com/influxdata/influxdb/@v/v1.9.2.mod -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.9.2.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/influxdata/influxql/@v/v1.1.0.mod -> github.com%2Finfluxdata%2Finfluxql%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/influxdata/influxql/@v/v1.1.1-0.20210223160523-b6ab99450c93.mod -> github.com%2Finfluxdata%2Finfluxql%2F@v%2Fv1.1.1-0.20210223160523-b6ab99450c93.mod mirror://goproxy//github.com/influxdata/line-protocol/@v/v0.0.0-20180522152040-32c6aa80de5e.mod -> github.com%2Finfluxdata%2Fline-protocol%2F@v%2Fv0.0.0-20180522152040-32c6aa80de5e.mod mirror://goproxy//github.com/influxdata/pkg-config/@v/v0.2.6.mod -> github.com%2Finfluxdata%2Fpkg-config%2F@v%2Fv0.2.6.mod mirror://goproxy//github.com/influxdata/pkg-config/@v/v0.2.7.mod -> github.com%2Finfluxdata%2Fpkg-config%2F@v%2Fv0.2.7.mod mirror://goproxy//github.com/influxdata/promql/v2/@v/v2.12.0.mod -> github.com%2Finfluxdata%2Fpromql%2Fv2%2F@v%2Fv2.12.0.mod mirror://goproxy//github.com/influxdata/roaring/@v/v0.4.13-0.20180809181101-fc520f41fab6.mod -> github.com%2Finfluxdata%2Froaring%2F@v%2Fv0.4.13-0.20180809181101-fc520f41fab6.mod mirror://goproxy//github.com/influxdata/tdigest/@v/v0.0.0-20181121200506-bf2b5ad3c0a9.mod -> github.com%2Finfluxdata%2Ftdigest%2F@v%2Fv0.0.0-20181121200506-bf2b5ad3c0a9.mod mirror://goproxy//github.com/influxdata/tdigest/@v/v0.0.2-0.20210216194612-fc98d27c9e8b.mod -> github.com%2Finfluxdata%2Ftdigest%2F@v%2Fv0.0.2-0.20210216194612-fc98d27c9e8b.mod mirror://goproxy//github.com/influxdata/usage-client/@v/v0.0.0-20160829180054-6d3895376368.mod -> github.com%2Finfluxdata%2Fusage-client%2F@v%2Fv0.0.0-20160829180054-6d3895376368.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/jessevdk/go-flags/@v/v1.5.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.zip -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.mod -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jsternberg/zap-logfmt/@v/v1.0.0.mod -> github.com%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jsternberg/zap-logfmt/@v/v1.2.0.mod -> github.com%2Fjsternberg%2Fzap-logfmt%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/jwilder/encoding/@v/v0.0.0-20170811194829-b4e1701a28ef.mod -> github.com%2Fjwilder%2Fencoding%2F@v%2Fv0.0.0-20170811194829-b4e1701a28ef.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.8.0.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.10.3.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v0.0.0-20170728055534-ae7887de9fa5.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20170728055534-ae7887de9fa5.mod mirror://goproxy//github.com/klauspost/crc32/@v/v0.0.0-20161016154125-cb6bfca970f6.mod -> github.com%2Fklauspost%2Fcrc32%2F@v%2Fv0.0.0-20161016154125-cb6bfca970f6.mod mirror://goproxy//github.com/klauspost/pgzip/@v/v1.0.2-0.20170402124221-0bf5dcad4ada.mod -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.0.2-0.20170402124221-0bf5dcad4ada.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.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.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.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20160406211939-eadb3ce320cb.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20160406211939-eadb3ce320cb.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.28.5.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.28.5.zip mirror://goproxy//github.com/linode/linodego/@v/v0.28.5.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.28.5.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/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.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/markbates/oncer/@v/v0.0.0-20181203154359-bf2de49a0be2.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv0.0.0-20181203154359-bf2de49a0be2.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.11.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/mattn/go-tty/@v/v0.0.0-20180907095812-13ff1204f104.mod -> github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.0-20180907095812-13ff1204f104.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.22.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.22.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.29.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.29.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.42.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.42.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.42.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.42.mod mirror://goproxy//github.com/mileusna/useragent/@v/v0.0.0-20190129205925-3e331f0949a5.mod -> github.com%2Fmileusna%2Fuseragent%2F@v%2Fv0.0.0-20190129205925-3e331f0949a5.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.0.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.mod -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.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/montanaflynn/stats/@v/v0.0.0-20171201202039-1bf9dbcd8cbe.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.0.0-20171201202039-1bf9dbcd8cbe.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mschoch/smat/@v/v0.0.0-20160514031455-90eadee771ae.mod -> github.com%2Fmschoch%2Fsmat%2F@v%2Fv0.0.0-20160514031455-90eadee771ae.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/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/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/oklog/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/run/@v/v1.1.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.1.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.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/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/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-contrib/go-stdlib/@v/v0.0.0-20190519235532-cf7a6c988dc9.mod -> github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv0.0.0-20190519235532-cf7a6c988dc9.mod mirror://goproxy//github.com/opentracing-contrib/go-stdlib/@v/v1.0.0.zip -> github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opentracing-contrib/go-stdlib/@v/v1.0.0.mod -> github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv1.0.0.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.0.3-0.20180606204148-bd9c31933947.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.3-0.20180606204148-bd9c31933947.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/opentracing/opentracing-go/@v/v1.2.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.2.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.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/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/paulbellamy/ratecounter/@v/v0.2.0.mod -> github.com%2Fpaulbellamy%2Fratecounter%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.4.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.7.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/peterh/liner/@v/v1.0.1-0.20180619022028-8c1271fcf47f.mod -> github.com%2Fpeterh%2Fliner%2F@v%2Fv1.0.1-0.20180619022028-8c1271fcf47f.mod mirror://goproxy//github.com/philhofer/fwd/@v/v1.0.0.mod -> github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.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/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.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/pkg/term/@v/v0.0.0-20180730021639-bffc007b7fd5.mod -> github.com%2Fpkg%2Fterm%2F@v%2Fv0.0.0-20180730021639-bffc007b7fd5.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/prometheus/alertmanager/@v/v0.20.0.mod -> github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.20.0.mod mirror://goproxy//github.com/prometheus/alertmanager/@v/v0.22.2.zip -> github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.22.2.zip mirror://goproxy//github.com/prometheus/alertmanager/@v/v0.22.2.mod -> github.com%2Fprometheus%2Falertmanager%2F@v%2Fv0.22.2.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/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.2.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.5.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.10.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.15.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.18.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.23.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.23.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.29.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.29.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.mod mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.5.1.mod -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.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.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/prometheus/@v/v0.0.0-20200609090129-a6600f564e3c.mod -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv0.0.0-20200609090129-a6600f564e3c.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/retailnext/hllpp/@v/v1.0.1-0.20180308014038-101a6d2f8b52.mod -> github.com%2Fretailnext%2Fhllpp%2F@v%2Fv1.0.1-0.20180308014038-101a6d2f8b52.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.2.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/cors/@v/v1.6.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/rs/cors/@v/v1.7.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.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/v0.0.0-20160603004225-b111a074d5ef.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv0.0.0-20160603004225-b111a074d5ef.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.1-0.20181028125025-b2ce2384e17b.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.1-0.20181028125025-b2ce2384e17b.mod mirror://goproxy//github.com/scaleway/scaleway-sdk-go/@v/v1.0.0-beta.7.0.20210223165440-c65ae3540d44.zip -> github.com%2Fscaleway%2Fscaleway-sdk-go%2F@v%2Fv1.0.0-beta.7.0.20210223165440-c65ae3540d44.zip mirror://goproxy//github.com/scaleway/scaleway-sdk-go/@v/v1.0.0-beta.7.0.20210223165440-c65ae3540d44.mod -> github.com%2Fscaleway%2Fscaleway-sdk-go%2F@v%2Fv1.0.0-beta.7.0.20210223165440-c65ae3540d44.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/segmentio/kafka-go/@v/v0.1.0.mod -> github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/segmentio/kafka-go/@v/v0.2.0.mod -> github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20190707220628-8d4bc4ba7749.zip -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20190707220628-8d4bc4ba7749.zip mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20190707220628-8d4bc4ba7749.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20190707220628-8d4bc4ba7749.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/vfsgen/@v/v0.0.0-20181202132449-6a9ea43bcacd.mod -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20181202132449-6a9ea43bcacd.mod mirror://goproxy//github.com/shurcoo!l/vfsgen/@v/v0.0.0-20200824052919-0d455de96546.zip -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.zip mirror://goproxy//github.com/shurcoo!l/vfsgen/@v/v0.0.0-20200824052919-0d455de96546.mod -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.mod mirror://goproxy//github.com/simonpasquier/klog-gokit/@v/v0.3.0.zip -> github.com%2Fsimonpasquier%2Fklog-gokit%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/simonpasquier/klog-gokit/@v/v0.3.0.mod -> github.com%2Fsimonpasquier%2Fklog-gokit%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/simonpasquier/klog-gokit/v2/@v/v2.1.0.zip -> github.com%2Fsimonpasquier%2Fklog-gokit%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/simonpasquier/klog-gokit/v2/@v/v2.1.0.mod -> github.com%2Fsimonpasquier%2Fklog-gokit%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/snowflakedb/gosnowflake/@v/v1.3.4.mod -> github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.3.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.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.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/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.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tinylib/msgp/@v/v1.0.2.mod -> github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/tinylib/msgp/@v/v1.1.0.mod -> github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/uber-go/tally/@v/v3.3.15+incompatible.mod -> github.com%2Fuber-go%2Ftally%2F@v%2Fv3.3.15+incompatible.mod mirror://goproxy//github.com/uber/athenadriver/@v/v1.1.4.mod -> github.com%2Fuber%2Fathenadriver%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/uber/jaeger-client-go/@v/v2.23.0+incompatible.mod -> github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.23.0+incompatible.mod mirror://goproxy//github.com/uber/jaeger-client-go/@v/v2.29.1+incompatible.zip -> github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.29.1+incompatible.zip mirror://goproxy//github.com/uber/jaeger-client-go/@v/v2.29.1+incompatible.mod -> github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.29.1+incompatible.mod mirror://goproxy//github.com/uber/jaeger-lib/@v/v2.2.0+incompatible.mod -> github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/uber/jaeger-lib/@v/v2.4.1+incompatible.zip -> github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.4.1+incompatible.zip mirror://goproxy//github.com/uber/jaeger-lib/@v/v2.4.1+incompatible.mod -> github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv2.4.1+incompatible.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/willf/bitset/@v/v1.1.3.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.9.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/xdg-go/pbkdf2/@v/v1.0.0.mod -> github.com%2Fxdg-go%2Fpbkdf2%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xdg-go/scram/@v/v1.0.2.mod -> github.com%2Fxdg-go%2Fscram%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/xdg-go/stringprep/@v/v1.0.2.mod -> github.com%2Fxdg-go%2Fstringprep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v0.0.0-20180714160509-73f8eece6fdc.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv0.0.0-20180714160509-73f8eece6fdc.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20180616005107-d6fb6747feb6.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20180616005107-d6fb6747feb6.mod mirror://goproxy//github.com/xlab/treeprint/@v/v1.1.0.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/youmark/pkcs8/@v/v0.0.0-20181117223130-1be2e3e5546d.mod -> github.com%2Fyoumark%2Fpkcs8%2F@v%2Fv0.0.0-20181117223130-1be2e3e5546d.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.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.mongodb.org/mongo-driver/@v/v1.3.0.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.0.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.3.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.2.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.3.4.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.4.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.4.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.4.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.5.1.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.5.1.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.5.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.5.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.1.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.1.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.8.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.8.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.8.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.8.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.4.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/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.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180505025534-4ec37c66abab.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180505025534-4ec37c66abab.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-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-20190422162423-af44ce270edf.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422162423-af44ce270edf.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190617133340-57b3e21c3d56.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191202143827-86a70503ff7e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191202143827-86a70503ff7e.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200302210943-78000ba7a073.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200422194213-44a606286825.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200422194213-44a606286825.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201208171446-5f87f3452ae9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20210508222113-6edffad5e616.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20210508222113-6edffad5e616.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20191126235420-ef20fe5d7933.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191126235420-ef20fe5d7933.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200421231249-e086a090c8fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201202161906-c7110b5ffcbb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201202161906-c7110b5ffcbb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210224082022-3d97a244fca7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210421230115-4e50805a0758.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210421230115-4e50805a0758.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210503060351-7fd8e65b6420.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210503060351-7fd8e65b6420.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210525063256-abc453219eb5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210610132358-84b48f89b13b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210610132358-84b48f89b13b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210610132358-84b48f89b13b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210610132358-84b48f89b13b.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210514164344-f6687ab2804c.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210514164344-f6687ab2804c.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190412183630-56d357773e84.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190412183630-56d357773e84.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190419153524-e8e3143a4f4a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190531175056-4c3a928424d2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190531175056-4c3a928424d2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191010194322-b09406accb47.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191128015809-6d18c012aee9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20200107162124-548cf772de50.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200107162124-548cf772de50.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200420163511-1957bb5e6d1f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210225134936-a50acf3fe073.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210309074719-68d13333faf2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309074719-68d13333faf2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210420072515-93ed5bcd2bfe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210420072515-93ed5bcd2bfe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603125802-9665404d3644.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603125802-9665404d3644.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210611083556-38a9dc6acbc6.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210611083556-38a9dc6acbc6.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210611083556-38a9dc6acbc6.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210611083556-38a9dc6acbc6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190329151228-23e29df326fe.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190329151228-23e29df326fe.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190416151739-9c9e1878f421.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190416151739-9c9e1878f421.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190420181800-aa740d480789.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190531172133-b3315ee88b7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190531172133-b3315ee88b7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20190813034749-528a2984e271.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190813034749-528a2984e271.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191203134012-c197fd4bf371.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191203134012-c197fd4bf371.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200108203644-89082a384178.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200108203644-89082a384178.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304024140-c4206d458c3f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304024140-c4206d458c3f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200422205258-72e4a01eba43.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200422205258-72e4a01eba43.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200721032237-77f530d86f9a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200721032237-77f530d86f9a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.1.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.3.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20181121035319-3f7ecaa7e8ca.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20181121035319-3f7ecaa7e8ca.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.0.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20181029234149-ec6d1f5cefe6.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20181029234149-ec6d1f5cefe6.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.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.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.47.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.47.0.mod mirror://goproxy//google.golang.org/api/@v/v0.48.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.48.0.zip mirror://goproxy//google.golang.org/api/@v/v0.48.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.48.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-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-20190716160619-c506a9f90610.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190716160619-c506a9f90610.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190927181202-20e1ac93f88c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200108215221-bd8f9a0ef82f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200108215221-bd8f9a0ef82f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200420144010-e5e8543f8aeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200420144010-e5e8543f8aeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200513103714-09dca8ec2884.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210402141018-6c239bbf2bb1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210513213006-bf773b8c8384.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210513213006-bf773b8c8384.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210602131652-f16073e35f0c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210604141403-392c879c8b08.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210604141403-392c879c8b08.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210604141403-392c879c8b08.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210604141403-392c879c8b08.mod mirror://goproxy//google.golang.org/grpc/@v/v1.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.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod mirror://goproxy//google.golang.org/grpc/cmd/protoc-gen-go-grpc/@v/v1.1.0.mod -> google.golang.org%2Fgrpc%2Fcmd%2Fprotoc-gen-go-grpc%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/fsnotify/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200605160147-a5ece683394c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200605160147-a5ece683394c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//k8s.io/api/@v/v0.17.5.mod -> k8s.io%2Fapi%2F@v%2Fv0.17.5.mod mirror://goproxy//k8s.io/api/@v/v0.21.1.zip -> k8s.io%2Fapi%2F@v%2Fv0.21.1.zip mirror://goproxy//k8s.io/api/@v/v0.21.1.mod -> k8s.io%2Fapi%2F@v%2Fv0.21.1.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.17.5.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.5.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.21.1.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.21.1.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.21.1.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.21.1.mod mirror://goproxy//k8s.io/client-go/@v/v0.17.5.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.17.5.mod mirror://goproxy//k8s.io/client-go/@v/v0.21.1.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.21.1.zip mirror://goproxy//k8s.io/client-go/@v/v0.21.1.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.21.1.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200316234421-82d701f24f9d.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200316234421-82d701f24f9d.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210305001622-591a79e4bda7.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210305001622-591a79e4bda7.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200414100711-2df71ebbae66.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v2/@v/v2.0.1.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=236521c8c1119b9f3b731967546009f9
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index c69b4a1dde1f..cf0d637108dd 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/devtodo-0.1.20-r3 b/metadata/md5-cache/app-misc/devtodo-0.1.20-r3
index d15fc334e8b4..b459a99bbb3d 100644
--- a/metadata/md5-cache/app-misc/devtodo-0.1.20-r3
+++ b/metadata/md5-cache/app-misc/devtodo-0.1.20-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= >=sys-libs/readline-4.1:0=
 SLOT=0
 SRC_URI=http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=119d5f0ac2e2b70c1b2149fa24461d27
diff --git a/metadata/md5-cache/app-misc/dfshow-0.9.1_beta-r1 b/metadata/md5-cache/app-misc/dfshow-0.9.1_beta-r1
index 0580b269af7b..b0f573e4a58d 100644
--- a/metadata/md5-cache/app-misc/dfshow-0.9.1_beta-r1
+++ b/metadata/md5-cache/app-misc/dfshow-0.9.1_beta-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libconfig:= sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/roberthawdon/dfshow/archive/v0.9.1-beta.tar.gz -> dfshow-0.9.1_beta.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8a8201c9156c51abb01a17947d5b0b4b
diff --git a/metadata/md5-cache/app-misc/figlet-2.2.5-r1 b/metadata/md5-cache/app-misc/figlet-2.2.5-r1
index beddba09fef0..b3234d7d17f8 100644
--- a/metadata/md5-cache/app-misc/figlet-2.2.5-r1
+++ b/metadata/md5-cache/app-misc/figlet-2.2.5-r1
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-li
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f7b8a9e128927ec119882588f3a79af4
diff --git a/metadata/md5-cache/app-misc/figlet-9999 b/metadata/md5-cache/app-misc/figlet-9999
index b101876a93a1..7828671f6042 100644
--- a/metadata/md5-cache/app-misc/figlet-9999
+++ b/metadata/md5-cache/app-misc/figlet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.figlet.org/
 LICENSE=BSD
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c9baf8d6d7b03a991392220e1e326f5
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.18 b/metadata/md5-cache/app-misc/hivex-1.3.18
deleted file mode 100644
index b554b0673ce4..000000000000
--- a/metadata/md5-cache/app-misc/hivex-1.3.18
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( ruby? ( dev-ruby/rake[ruby_targets_ruby25(-)] virtual/rubygems[ruby_targets_ruby25(-)] dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ruby? ( dev-ruby/rake[ruby_targets_ruby26(-)] virtual/rubygems[ruby_targets_ruby26(-)] dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) test? ( ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ruby? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libxml2:2 virtual/libiconv virtual/libintl ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) perl? ( dev-lang/perl:= dev-perl/IO-stringy ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0 ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) dev-lang/perl
-DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
-EAPI=7
-HOMEPAGE=https://libguestfs.org
-IUSE=ocaml readline +perl python test ruby test ruby_targets_ruby25 ruby_targets_ruby26 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2:2 virtual/libiconv virtual/libintl ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) perl? ( dev-lang/perl:= dev-perl/IO-stringy ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0 ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ruby? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) dev-lang/perl:=
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) ruby? ( || ( ruby_targets_ruby25 ruby_targets_ruby26 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://libguestfs.org/download/hivex/hivex-1.3.18.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a2b89296d6dc89bff21c023e3fb4bc8d
diff --git a/metadata/md5-cache/app-misc/mc-4.8.26-r2 b/metadata/md5-cache/app-misc/mc-4.8.26-r2
index 6d2d0a09aeee..acff2cef6a9e 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.26-r2
+++ b/metadata/md5-cache/app-misc/mc-4.8.26-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst prepare pretend test
 DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
 DESCRIPTION=GNU Midnight Commander is a text based file manager
 EAPI=7
-HOMEPAGE=https://www.midnight-commander.org
+HOMEPAGE=https://midnight-commander.org
 IUSE=+edit gpm nls samba sftp +slang spell test unicode X +xdg
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://ftp.midnight-commander.org/mc-4.8.26.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=10e06d7b61cad47cd663b48d7fe7c9ac
+_md5_=fcba7e32901d057d6c84257d6d6369f8
diff --git a/metadata/md5-cache/app-misc/mc-4.8.26-r3 b/metadata/md5-cache/app-misc/mc-4.8.26-r3
new file mode 100644
index 000000000000..1221ebb99af3
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mc-4.8.26-r3
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst prepare pretend test
+DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
+DESCRIPTION=GNU Midnight Commander is a text based file manager
+EAPI=8
+HOMEPAGE=https://midnight-commander.org
+IUSE=+edit gpm nls samba sftp +slang spell test unicode X +xdg
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
+REQUIRED_USE=spell? ( edit )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://ftp.midnight-commander.org/mc-4.8.26.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8512523654d5a4e51c063a725066c5aa
diff --git a/metadata/md5-cache/app-misc/mc-9999 b/metadata/md5-cache/app-misc/mc-9999
index 360cedaa456e..a49a9c1eea54 100644
--- a/metadata/md5-cache/app-misc/mc-9999
+++ b/metadata/md5-cache/app-misc/mc-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst prepare pretend test unpack
 DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
 DESCRIPTION=GNU Midnight Commander is a text based file manager
 EAPI=7
-HOMEPAGE=https://www.midnight-commander.org
+HOMEPAGE=https://midnight-commander.org
 IUSE=+edit gpm nls samba sftp +slang spell test unicode X
 LICENSE=GPL-3
 PROPERTIES=live
@@ -12,4 +12,4 @@ REQUIRED_USE=spell? ( edit )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=20b46e1787ce771f5da8920ffa66f425
+_md5_=55b06e09215f17a5d4eb2e784cf981a9
diff --git a/metadata/md5-cache/app-misc/nnn-1.9 b/metadata/md5-cache/app-misc/nnn-1.9
index 49975fa5bb86..4cdc70ef6012 100644
--- a/metadata/md5-cache/app-misc/nnn-1.9
+++ b/metadata/md5-cache/app-misc/nnn-1.9
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v1.9.tar.gz -> nnn-1.9.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3f5b68cfc7acedbb795fad330f5e665
diff --git a/metadata/md5-cache/app-misc/nnn-2.0 b/metadata/md5-cache/app-misc/nnn-2.0
index aa21a3c99a45..fd0a9ffb75ff 100644
--- a/metadata/md5-cache/app-misc/nnn-2.0
+++ b/metadata/md5-cache/app-misc/nnn-2.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v2.0.tar.gz -> nnn-2.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83137f648942ab677594675fc8f9a77f
diff --git a/metadata/md5-cache/app-misc/nnn-2.1 b/metadata/md5-cache/app-misc/nnn-2.1
index eb5cdd54ec3b..03de56ef21c9 100644
--- a/metadata/md5-cache/app-misc/nnn-2.1
+++ b/metadata/md5-cache/app-misc/nnn-2.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v2.1.tar.gz -> nnn-2.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83137f648942ab677594675fc8f9a77f
diff --git a/metadata/md5-cache/app-misc/nnn-2.2 b/metadata/md5-cache/app-misc/nnn-2.2
index f7f7b88bac11..cb633455cd8f 100644
--- a/metadata/md5-cache/app-misc/nnn-2.2
+++ b/metadata/md5-cache/app-misc/nnn-2.2
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v2.2.tar.gz -> nnn-2.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efb49088ec0b492ce62ab66731225973
diff --git a/metadata/md5-cache/app-misc/nnn-2.3 b/metadata/md5-cache/app-misc/nnn-2.3
index e30cc2d3a9f9..0237ee1c714e 100644
--- a/metadata/md5-cache/app-misc/nnn-2.3
+++ b/metadata/md5-cache/app-misc/nnn-2.3
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v2.3.tar.gz -> nnn-2.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efb49088ec0b492ce62ab66731225973
diff --git a/metadata/md5-cache/app-misc/nnn-2.4 b/metadata/md5-cache/app-misc/nnn-2.4
index 95e3d7f6d12a..2d69ce03bbb2 100644
--- a/metadata/md5-cache/app-misc/nnn-2.4
+++ b/metadata/md5-cache/app-misc/nnn-2.4
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v2.4.tar.gz -> nnn-2.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efb49088ec0b492ce62ab66731225973
diff --git a/metadata/md5-cache/app-misc/nnn-2.5 b/metadata/md5-cache/app-misc/nnn-2.5
index f9ce26a15ba7..9a6eb4426e49 100644
--- a/metadata/md5-cache/app-misc/nnn-2.5
+++ b/metadata/md5-cache/app-misc/nnn-2.5
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v2.5.tar.gz -> nnn-2.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efb49088ec0b492ce62ab66731225973
diff --git a/metadata/md5-cache/app-misc/nnn-2.6 b/metadata/md5-cache/app-misc/nnn-2.6
index 3ae16a373200..392a07322641 100644
--- a/metadata/md5-cache/app-misc/nnn-2.6
+++ b/metadata/md5-cache/app-misc/nnn-2.6
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v2.6.tar.gz -> nnn-2.6.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a825e94446649dc45e2f6f13d26a10b
diff --git a/metadata/md5-cache/app-misc/nnn-2.7 b/metadata/md5-cache/app-misc/nnn-2.7
index 55d8abe0acba..e08a1f11318e 100644
--- a/metadata/md5-cache/app-misc/nnn-2.7
+++ b/metadata/md5-cache/app-misc/nnn-2.7
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v2.7.tar.gz -> nnn-2.7.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=946e81596509aa411cbe0121fd3ccb47
diff --git a/metadata/md5-cache/app-misc/nnn-2.8.1 b/metadata/md5-cache/app-misc/nnn-2.8.1
index 3e7df93e0ff4..56d9405b81eb 100644
--- a/metadata/md5-cache/app-misc/nnn-2.8.1
+++ b/metadata/md5-cache/app-misc/nnn-2.8.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v2.8.1.tar.gz -> nnn-2.8.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=946e81596509aa411cbe0121fd3ccb47
diff --git a/metadata/md5-cache/app-misc/nnn-2.9 b/metadata/md5-cache/app-misc/nnn-2.9
index 84e1e5c53ac9..50fb023cec4c 100644
--- a/metadata/md5-cache/app-misc/nnn-2.9
+++ b/metadata/md5-cache/app-misc/nnn-2.9
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v2.9.tar.gz -> nnn-2.9.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07e36a4ae30cbdf0f4c0ca8d80365a31
diff --git a/metadata/md5-cache/app-misc/nnn-3.0 b/metadata/md5-cache/app-misc/nnn-3.0
index d3007f8a6846..c262b7637cb4 100644
--- a/metadata/md5-cache/app-misc/nnn-3.0
+++ b/metadata/md5-cache/app-misc/nnn-3.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v3.0.tar.gz -> nnn-3.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07e36a4ae30cbdf0f4c0ca8d80365a31
diff --git a/metadata/md5-cache/app-misc/nnn-3.1 b/metadata/md5-cache/app-misc/nnn-3.1
index 67253a96fdb9..23ab339fcd4f 100644
--- a/metadata/md5-cache/app-misc/nnn-3.1
+++ b/metadata/md5-cache/app-misc/nnn-3.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v3.1.tar.gz -> nnn-3.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07e36a4ae30cbdf0f4c0ca8d80365a31
diff --git a/metadata/md5-cache/app-misc/nnn-3.2 b/metadata/md5-cache/app-misc/nnn-3.2
index 34e22577f724..fe7271049fa3 100644
--- a/metadata/md5-cache/app-misc/nnn-3.2
+++ b/metadata/md5-cache/app-misc/nnn-3.2
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v3.2.tar.gz -> nnn-3.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07e36a4ae30cbdf0f4c0ca8d80365a31
diff --git a/metadata/md5-cache/app-misc/nnn-3.3 b/metadata/md5-cache/app-misc/nnn-3.3
index 9d2f57ae293c..da8f30fc7d43 100644
--- a/metadata/md5-cache/app-misc/nnn-3.3
+++ b/metadata/md5-cache/app-misc/nnn-3.3
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v3.3.tar.gz -> nnn-3.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07e36a4ae30cbdf0f4c0ca8d80365a31
diff --git a/metadata/md5-cache/app-misc/nnn-3.4 b/metadata/md5-cache/app-misc/nnn-3.4
index 51d8ed78708e..f68dbc7ebd76 100644
--- a/metadata/md5-cache/app-misc/nnn-3.4
+++ b/metadata/md5-cache/app-misc/nnn-3.4
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v3.4.tar.gz -> nnn-3.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d7dcf6468a65837f757c8c321780b82
diff --git a/metadata/md5-cache/app-misc/nnn-3.5 b/metadata/md5-cache/app-misc/nnn-3.5
index de35adae16ed..81fd2d70d3d1 100644
--- a/metadata/md5-cache/app-misc/nnn-3.5
+++ b/metadata/md5-cache/app-misc/nnn-3.5
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v3.5.tar.gz -> nnn-3.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d7dcf6468a65837f757c8c321780b82
diff --git a/metadata/md5-cache/app-misc/nnn-3.6 b/metadata/md5-cache/app-misc/nnn-3.6
index c9e8734deec7..ab87c16774e4 100644
--- a/metadata/md5-cache/app-misc/nnn-3.6
+++ b/metadata/md5-cache/app-misc/nnn-3.6
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v3.6.tar.gz -> nnn-3.6.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ee266a867eedde45de4916df83818a20
diff --git a/metadata/md5-cache/app-misc/nnn-4.0 b/metadata/md5-cache/app-misc/nnn-4.0
index a75badc0d05d..fb721af2d99b 100644
--- a/metadata/md5-cache/app-misc/nnn-4.0
+++ b/metadata/md5-cache/app-misc/nnn-4.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v4.0.tar.gz -> nnn-4.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ee266a867eedde45de4916df83818a20
diff --git a/metadata/md5-cache/app-misc/qlcplus-4.12.4 b/metadata/md5-cache/app-misc/qlcplus-4.12.4
new file mode 100644
index 000000000000..168006a6d625
--- /dev/null
+++ b/metadata/md5-cache/app-misc/qlcplus-4.12.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm preinst prepare test
+DEPEND=dev-embedded/libftdi:= dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libmad media-libs/libsndfile sci-libs/fftw:3.0 virtual/libusb:0 virtual/libusb:1 virtual/udev dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A software to control DMX or analog lighting systems
+EAPI=7
+HOMEPAGE=https://www.qlcplus.org/
+IUSE=test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-embedded/libftdi:= dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libmad media-libs/libsndfile sci-libs/fftw:3.0 virtual/libusb:0 virtual/libusb:1 virtual/udev
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mcallegari/qlcplus/archive/QLC+_4.12.4.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dffa89a7a48db379f47110de59dbf560
diff --git a/metadata/md5-cache/app-misc/reptyr-0.8.0 b/metadata/md5-cache/app-misc/reptyr-0.8.0
index 324d4de5321c..3de024b0dc41 100644
--- a/metadata/md5-cache/app-misc/reptyr-0.8.0
+++ b/metadata/md5-cache/app-misc/reptyr-0.8.0
@@ -7,5 +7,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nelhage/reptyr/archive/reptyr-0.8.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=acebf14367917c9dd837d739f765ddbd
diff --git a/metadata/md5-cache/app-misc/task-2.5.1-r2 b/metadata/md5-cache/app-misc/task-2.5.1-r2
index 681af2d2ebbb..aca0e1231baa 100644
--- a/metadata/md5-cache/app-misc/task-2.5.1-r2
+++ b/metadata/md5-cache/app-misc/task-2.5.1-r2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sync? ( net-libs/gnutls )
 SLOT=0
 SRC_URI=https://taskwarrior.org/download/task-2.5.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1526658f2c2b31340a897fb6db23fac8
diff --git a/metadata/md5-cache/app-misc/task-2.5.3 b/metadata/md5-cache/app-misc/task-2.5.3
index b75018216342..ec4ce3f07c5c 100644
--- a/metadata/md5-cache/app-misc/task-2.5.3
+++ b/metadata/md5-cache/app-misc/task-2.5.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sync? ( net-libs/gnutls )
 SLOT=0
 SRC_URI=https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v2.5.3/task-2.5.3.tar.gz https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v2.5.3/tests-2.5.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=802706f0f38bb0b66f8a1453a1e1ee32
diff --git a/metadata/md5-cache/app-misc/taskd-1.1.0-r2 b/metadata/md5-cache/app-misc/taskd-1.1.0-r2
deleted file mode 100644
index e694dac31f0b..000000000000
--- a/metadata/md5-cache/app-misc/taskd-1.1.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=net-libs/gnutls:= sys-apps/util-linux sys-libs/readline:0= sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Server part of Taskwarrior, a command-line todo list manager
-EAPI=6
-HOMEPAGE=https://taskwarrior.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-libs/gnutls:= sys-apps/util-linux sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://taskwarrior.org/download/taskd-1.1.0.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=44a96694ca021381bf9f231a5de0b1ae
diff --git a/metadata/md5-cache/app-misc/taskd-1.1.0-r3 b/metadata/md5-cache/app-misc/taskd-1.1.0-r3
new file mode 100644
index 000000000000..90d2292bf345
--- /dev/null
+++ b/metadata/md5-cache/app-misc/taskd-1.1.0-r3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=net-libs/gnutls:= sys-apps/util-linux sys-libs/readline:0=
+DESCRIPTION=Server part of Taskwarrior, a command-line todo list manager
+EAPI=7
+HOMEPAGE=https://taskwarrior.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=net-libs/gnutls:= sys-apps/util-linux sys-libs/readline:0= acct-group/taskd acct-user/taskd
+SLOT=0
+SRC_URI=https://taskwarrior.org/download/taskd-1.1.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=566cd2e9d8251ddbb39126f01a784446
diff --git a/metadata/md5-cache/app-misc/todo-2.11.0 b/metadata/md5-cache/app-misc/todo-2.11.0
index 0c70ea4f5d08..3d7410b54dc6 100644
--- a/metadata/md5-cache/app-misc/todo-2.11.0
+++ b/metadata/md5-cache/app-misc/todo-2.11.0
@@ -9,5 +9,5 @@ RDEPEND=app-shells/bash
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/todotxt/todo.txt-cli/archive/v2.11.0.tar.gz -> todo-2.11.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7c4d2668c84eb120f1fde61b687835ae
diff --git a/metadata/md5-cache/app-misc/todo-2.12.0-r1 b/metadata/md5-cache/app-misc/todo-2.12.0-r1
index ce968451bd3b..efae7eeb1b46 100644
--- a/metadata/md5-cache/app-misc/todo-2.12.0-r1
+++ b/metadata/md5-cache/app-misc/todo-2.12.0-r1
@@ -9,5 +9,5 @@ RDEPEND=app-shells/bash
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/todotxt/todo.txt-cli/archive/v2.12.0.tar.gz -> todo-2.12.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6dfb3c4584040f12fe5dd986a7adee35
diff --git a/metadata/md5-cache/app-misc/tracker-2.3.5 b/metadata/md5-cache/app-misc/tracker-2.3.5
index 413d9d346d7c..ef05fa243ecf 100644
--- a/metadata/md5-cache/app-misc/tracker-2.3.5
+++ b/metadata/md5-cache/app-misc/tracker-2.3.5
@@ -11,5 +11,5 @@ PDEPEND=miners? ( >=app-misc/tracker-miners-2.3 )
 RDEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux
 SLOT=0/2.0
 SRC_URI=mirror://gnome/sources/tracker/2.3/tracker-2.3.5.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5273961c5988ba46c01f5348432a676c
diff --git a/metadata/md5-cache/app-misc/tracker-3.1.1 b/metadata/md5-cache/app-misc/tracker-3.1.1
index 10c1698c1e39..65a89725e01a 100644
--- a/metadata/md5-cache/app-misc/tracker-3.1.1
+++ b/metadata/md5-cache/app-misc/tracker-3.1.1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspe
 RESTRICT=!test? ( test )
 SLOT=3/0
 SRC_URI=mirror://gnome/sources/tracker/3.1/tracker-3.1.1.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=454181582645b4167f646bbb9b2adf89
diff --git a/metadata/md5-cache/app-misc/tracker-3.1.2 b/metadata/md5-cache/app-misc/tracker-3.1.2
index 650d9b247ecb..f9d25dd4c9c3 100644
--- a/metadata/md5-cache/app-misc/tracker-3.1.2
+++ b/metadata/md5-cache/app-misc/tracker-3.1.2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspe
 RESTRICT=!test? ( test )
 SLOT=3/0
 SRC_URI=mirror://gnome/sources/tracker/3.1/tracker-3.1.2.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c0de69945ed913cda0b41f8f0ceb5390
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.1-r1 b/metadata/md5-cache/app-misc/uptimed-0.4.1-r1
deleted file mode 100644
index eaead4a17857..000000000000
--- a/metadata/md5-cache/app-misc/uptimed-0.4.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
-EAPI=6
-HOMEPAGE=https://github.com/rpodgorny/uptimed/
-IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.1.tar.gz -> uptimed-0.4.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cdf8903e7129ea032ddd189b6d7ab4ea
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.1-r2 b/metadata/md5-cache/app-misc/uptimed-0.4.1-r2
deleted file mode 100644
index 567100a22c1d..000000000000
--- a/metadata/md5-cache/app-misc/uptimed-0.4.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=acct-group/uptimed acct-user/uptimed sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/uptimed acct-user/uptimed
-DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
-EAPI=7
-HOMEPAGE=https://github.com/rpodgorny/uptimed/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/uptimed acct-user/uptimed
-SLOT=0
-SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.1.tar.gz -> uptimed-0.4.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=db3a3d213e28ed4ff0ce8ad21c0bb2fd
diff --git a/metadata/md5-cache/app-misc/vzstats-0.5.1 b/metadata/md5-cache/app-misc/vzstats-0.5.1
index bf8780b03799..e02578d9e4d1 100644
--- a/metadata/md5-cache/app-misc/vzstats-0.5.1
+++ b/metadata/md5-cache/app-misc/vzstats-0.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-process/cronbase app-portage/gentoolkit net-misc/curl[ssl] sys-cluster/vzctl
 SLOT=0
 SRC_URI=http://download.openvz.org/utils/vzstats/0.5.1/src/vzstats-0.5.1.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=577c1bd5d0dd5d0ed41d493dee5eef27
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 8304066d80e1..be089dbaae70 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/homebank-5.4.3 b/metadata/md5-cache/app-office/homebank-5.4.3
deleted file mode 100644
index bdf06cd1dab5..000000000000
--- a/metadata/md5-cache/app-office/homebank-5.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/perl-5.8.1 dev-perl/XML-Parser >=dev-util/intltool-0.40.5 sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Free, easy, personal accounting for everyone
-EAPI=7
-HOMEPAGE=http://homebank.free.fr/index.php
-IUSE=+ofx
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3:= )
-SLOT=0
-SRC_URI=http://homebank.free.fr/public/homebank-5.4.3.tar.gz
-_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=901f63bc6affc208134648d9912822be
diff --git a/metadata/md5-cache/app-office/homebank-5.5.2 b/metadata/md5-cache/app-office/homebank-5.5.2
new file mode 100644
index 000000000000..eefb6416d3db
--- /dev/null
+++ b/metadata/md5-cache/app-office/homebank-5.5.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/perl-5.8.1 dev-perl/XML-Parser >=dev-util/intltool-0.40.5 sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free, easy, personal accounting for everyone
+EAPI=7
+HOMEPAGE=http://homebank.free.fr/index.php
+IUSE=+ofx
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3:= )
+SLOT=0
+SRC_URI=http://homebank.free.fr/public/homebank-5.5.2.tar.gz
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2fc001fd56cf905338bb2941d3f21143
diff --git a/metadata/md5-cache/app-office/ledger-3.2.1 b/metadata/md5-cache/app-office/ledger-3.2.1
index 74980f9aa451..dbb8c21cf608 100644
--- a/metadata/md5-cache/app-office/ledger-3.2.1
+++ b/metadata/md5-cache/app-office/ledger-3.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger/archive/v3.2.1.tar.gz -> ledger-3.2.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e89c734b886b62c534b42afa16030886
diff --git a/metadata/md5-cache/app-office/libreoffice-7.1.3.2 b/metadata/md5-cache/app-office/libreoffice-7.1.3.2
index 85cc252ee0c8..00dd9294058c 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.1.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-7.1.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 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.1.3.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.1.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.3//libreoffice-7.1.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.3//libreoffice-help-7.1.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.3.2/src/libreoffice-7.1.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.3.2/src/libreoffice-help-7.1.3.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.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	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2bd7705fc67ea6e7a87168253ff12750
diff --git a/metadata/md5-cache/app-office/libreoffice-7.1.4.2 b/metadata/md5-cache/app-office/libreoffice-7.1.4.2
index 5eac9a001db5..d71e66b18b16 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.1.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-7.1.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 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.1.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.1.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.4//libreoffice-7.1.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.4//libreoffice-help-7.1.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.4.2/src/libreoffice-7.1.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.4.2/src/libreoffice-help-7.1.4.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.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	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=504bd4e74e336a3aae635be205a239a7
diff --git a/metadata/md5-cache/app-office/libreoffice-7.1.9999 b/metadata/md5-cache/app-office/libreoffice-7.1.9999
index 221bead40946..d5f21935c2dd 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.1.9999
+++ b/metadata/md5-cache/app-office/libreoffice-7.1.9999
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 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-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.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	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9babdd96f22e9fb3efeb508a4a8fa03b
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 099ad2ae6fdb..adac4cf80e5c 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_8 python_single_target_python3_9
 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-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.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	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8c189fd5dd2b5157936962eebef64c9e
diff --git a/metadata/md5-cache/app-office/upwork-5.4.5.1-r1 b/metadata/md5-cache/app-office/upwork-5.4.5.1-r1
index bf25a67c2c56..2a87f17c5c7e 100644
--- a/metadata/md5-cache/app-office/upwork-5.4.5.1-r1
+++ b/metadata/md5-cache/app-office/upwork-5.4.5.1-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat dev-libs/nspr dev-libs/nss gnome-base/gconf media-libs/al
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_4_5_1_941af939eff74e21/upwork-5.4.5.1-1fc24.x86_64.rpm -> upwork-5.4.5.1_x86_64.rpm ) x86? ( https://updates-desktopapp.upwork.com/binaries/v5_4_5_1_941af939eff74e21/upwork-5.4.5.1-1fc24.i386.rpm -> upwork-5.4.5.1_i386.rpm )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	pax-utils	74cd9920d64148719fb62c462935c1b5	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	pax-utils	fce6ad998516159787b92e8043167889	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a50be480943b381fe821ba0184772559
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index 5602875c2150..06f1f5e643e8 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/barry-0.18.3 b/metadata/md5-cache/app-pda/barry-0.18.3
index 4a3ecc57d69a..c21ab93f145d 100644
--- a/metadata/md5-cache/app-pda/barry-0.18.3
+++ b/metadata/md5-cache/app-pda/barry-0.18.3
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.6 ) nls? ( >=sys-devel/gettext-0.18.1.1 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-cpp/libxmlpp-2.6:2.6 dev-libs/glib:2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2 >=sys-fs/fuse-2.5:= sys-libs/zlib virtual/libusb:1 boost? ( >=dev-libs/boost-1.33 ) gui? ( dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libglademm:2.4 ) virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.6 ) nls? ( >=sys-devel/gettext-0.18.1.1 ) virtual/pkgconfig
+DEPEND=>=dev-cpp/libxmlpp-2.6:2.6 dev-libs/glib:2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2 >=sys-fs/fuse-2.5:= sys-libs/zlib virtual/libusb:1 boost? ( dev-libs/boost:= ) gui? ( dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libglademm:2.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Sync, backup, program management, and charging for BlackBerry devices
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.netdirect.ca/software/packages/barry/
-IUSE=boost doc gui nls static-libs
+IUSE=boost doc gui nls
 KEYWORDS=~amd64 ~x86
 LICENSE=CC-BY-SA-3.0 GPL-2
-RDEPEND=>=dev-cpp/libxmlpp-2.6:2.6 dev-libs/glib:2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2 >=sys-fs/fuse-2.5:= sys-libs/zlib virtual/libusb:1 boost? ( >=dev-libs/boost-1.33 ) gui? ( dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libglademm:2.4 )
+RDEPEND=>=dev-cpp/libxmlpp-2.6:2.6 dev-libs/glib:2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2 >=sys-fs/fuse-2.5:= sys-libs/zlib virtual/libusb:1 boost? ( dev-libs/boost:= ) gui? ( dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libglademm:2.4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/barry/barry-0.18.3.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e77a7d5670103a8f9667d63f967e6722
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2488f6e06a63e9e6588d9e727cb2cc25
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 7f56df39758c..d27e84098226 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/eix-0.34.12 b/metadata/md5-cache/app-portage/eix-0.34.12
index faac1f0a2ad3..856e4a419df2 100644
--- a/metadata/md5-cache/app-portage/eix-0.34.12
+++ b/metadata/md5-cache/app-portage/eix-0.34.12
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.34.12/eix-0.34.12.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6b00153b21474f9c59519c9009003f7b
diff --git a/metadata/md5-cache/app-portage/eix-0.35.0 b/metadata/md5-cache/app-portage/eix-0.35.0
index b85892d059c4..cd5d920e6b1e 100644
--- a/metadata/md5-cache/app-portage/eix-0.35.0
+++ b/metadata/md5-cache/app-portage/eix-0.35.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.35.0/eix-0.35.0.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9d5765c1143b032a7de5f391dbc994f0
diff --git a/metadata/md5-cache/app-portage/eix-0.35.1 b/metadata/md5-cache/app-portage/eix-0.35.1
index f4d5d9850a15..05d750f7699f 100644
--- a/metadata/md5-cache/app-portage/eix-0.35.1
+++ b/metadata/md5-cache/app-portage/eix-0.35.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.35.1/eix-0.35.1.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9d5765c1143b032a7de5f391dbc994f0
diff --git a/metadata/md5-cache/app-portage/eix-0.35.2 b/metadata/md5-cache/app-portage/eix-0.35.2
index dddfa8099c1b..c27fcec5aef6 100644
--- a/metadata/md5-cache/app-portage/eix-0.35.2
+++ b/metadata/md5-cache/app-portage/eix-0.35.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.35.2/eix-0.35.2.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9d5765c1143b032a7de5f391dbc994f0
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1 b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
index 50270281c6b4..cc7e115c9657 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bb0d4f59acf8200eb75753b21ac19f15
diff --git a/metadata/md5-cache/app-portage/flaggie-9999 b/metadata/md5-cache/app-portage/flaggie-9999
index a9077374e48d..9fc472bbc9d8 100644
--- a/metadata/md5-cache/app-portage/flaggie-9999
+++ b/metadata/md5-cache/app-portage/flaggie-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fef1badad4b28ad91c7c1a7ba316ff54
diff --git a/metadata/md5-cache/app-portage/fquery-0.2.3-r1 b/metadata/md5-cache/app-portage/fquery-0.2.3-r1
index 7a271991d362..f2c3743e8deb 100644
--- a/metadata/md5-cache/app-portage/fquery-0.2.3-r1
+++ b/metadata/md5-cache/app-portage/fquery-0.2.3-r1
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/fquery-0.2.3/fquery-0.2.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e0629fdc36fc818aa5191e45de023043
diff --git a/metadata/md5-cache/app-portage/genlop-0.30.10-r2 b/metadata/md5-cache/app-portage/genlop-0.30.10-r2
index 25ad5d867206..01dc44da50d2 100644
--- a/metadata/md5-cache/app-portage/genlop-0.30.10-r2
+++ b/metadata/md5-cache/app-portage/genlop-0.30.10-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/genlop-0.30.10.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=496e5503ce47327ecaa60501c9348ffa
diff --git a/metadata/md5-cache/app-portage/genlop-9999 b/metadata/md5-cache/app-portage/genlop-9999
index 5270eddb3f1d..313ca0b44de3 100644
--- a/metadata/md5-cache/app-portage/genlop-9999
+++ b/metadata/md5-cache/app-portage/genlop-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=40b43aa1ffc4cc3ffca7fa4f4547e704
diff --git a/metadata/md5-cache/app-portage/hackport-0.6.6 b/metadata/md5-cache/app-portage/hackport-0.6.6
index 289265a630c9..624d32a2a918 100644
--- a/metadata/md5-cache/app-portage/hackport-0.6.6
+++ b/metadata/md5-cache/app-portage/hackport-0.6.6
@@ -10,5 +10,5 @@ RDEPEND=app-portage/repoman >=dev-haskell/async-2.0:= >=dev-haskell/base16-bytes
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hackport-0.6.6/hackport-0.6.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5687c286fbd8c2669a632933b8cdbfb0
diff --git a/metadata/md5-cache/app-portage/hackport-0.7 b/metadata/md5-cache/app-portage/hackport-0.7
index 9c35618102f6..5d6e28e5ac58 100644
--- a/metadata/md5-cache/app-portage/hackport-0.7
+++ b/metadata/md5-cache/app-portage/hackport-0.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.0:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-h
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hackport-0.7/hackport-0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f1da2f20eedd331e11e45afbfa2cba1
diff --git a/metadata/md5-cache/app-portage/hackport-9999 b/metadata/md5-cache/app-portage/hackport-9999
index 2f6d4a9131c6..d97cc1490a2d 100644
--- a/metadata/md5-cache/app-portage/hackport-9999
+++ b/metadata/md5-cache/app-portage/hackport-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=app-portage/repoman dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27ebc926495e66f7802e325b762a7c22
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.87 b/metadata/md5-cache/app-portage/portage-utils-0.87
deleted file mode 100644
index 877084ebe042..000000000000
--- a/metadata/md5-cache/app-portage/portage-utils-0.87
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure postinst
-DEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= dev-libs/openssl:0= sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( dev-libs/openssl:0=[static-libs] ) !static? ( dev-libs/openssl:0= ) )
-DESCRIPTION=Small and fast Portage helper tools written in C
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
-IUSE=nls static openmp +qmanifest +qtegrity
-KEYWORDS=hppa ppc
-LICENSE=GPL-2
-RDEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= dev-libs/openssl:0= sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( dev-libs/openssl:0=[static-libs] ) !static? ( dev-libs/openssl:0= ) )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.87.tar.xz
-_md5_=e8a389b27bc98e26d628eb144b2c08b1
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.90.1 b/metadata/md5-cache/app-portage/portage-utils-0.90.1
index 817c8a926229..559f80ce6e22 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.90.1
+++ b/metadata/md5-cache/app-portage/portage-utils-0.90.1
@@ -4,9 +4,9 @@ DESCRIPTION=Small and fast Portage helper tools written in C
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static openmp +qmanifest +qtegrity
-KEYWORDS=sparc x86
+KEYWORDS=hppa ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= dev-libs/openssl:0= sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( dev-libs/openssl:0=[static-libs] ) !static? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.90.1.tar.xz
-_md5_=7e5dd729da56a2d37f9f3b79374c4599
+_md5_=82c681cc717365310ea57160093acf07
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 0a630aa38a21..ad60bd151e62 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/autojump-22.5.3 b/metadata/md5-cache/app-shells/autojump-22.5.3
index e7e1356007d1..1a2bb139e344 100644
--- a/metadata/md5-cache/app-shells/autojump-22.5.3
+++ b/metadata/md5-cache/app-shells/autojump-22.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=ipython? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wting/autojump/archive/release-v22.5.3.tar.gz -> autojump-22.5.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=8ec9cbef49ab2fa2dec0d364d871de7d
diff --git a/metadata/md5-cache/app-shells/autojump-22.5.3-r1 b/metadata/md5-cache/app-shells/autojump-22.5.3-r1
index 5cb0eb818fbf..1d264414d03e 100644
--- a/metadata/md5-cache/app-shells/autojump-22.5.3-r1
+++ b/metadata/md5-cache/app-shells/autojump-22.5.3-r1
@@ -5,12 +5,12 @@ DESCRIPTION=change directory command that learns
 EAPI=7
 HOMEPAGE=https://github.com/wting/autojump
 IUSE=ipython test test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~hppa ~x64-macos
+KEYWORDS=~amd64 ~hppa ~ppc ~x64-macos
 LICENSE=GPL-3
 RDEPEND=ipython? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python_single_target_python3_8? ( dev-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=ipython? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wting/autojump/archive/release-v22.5.3.tar.gz -> autojump-22.5.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=0bc417c0e0b44f9ca8efe20710f57839
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=792e3d661c10573e280f2b072dccdf55
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.11 b/metadata/md5-cache/app-shells/bash-completion-2.11
index d2313bc2757d..1a78fe088932 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.11
+++ b/metadata/md5-cache/app-shells/bash-completion-2.11
@@ -11,5 +11,5 @@ RDEPEND=>=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scop/bash-completion/releases/download/2.11/bash-completion-2.11.tar.xz eselect? ( https://github.com/mgorny/bashcomp2/releases/download/v2.0.3/bashcomp-2.0.3.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=4479c1359885d4a1323ae5e2d99b0bb5
diff --git a/metadata/md5-cache/app-shells/fzf-0.27.0 b/metadata/md5-cache/app-shells/fzf-0.27.0
index 186541be2796..db0026e9ea78 100644
--- a/metadata/md5-cache/app-shells/fzf-0.27.0
+++ b/metadata/md5-cache/app-shells/fzf-0.27.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=A general-purpose command-line fuzzy finder, written in Golang
 EAPI=7
 HOMEPAGE=https://github.com/junegunn/fzf
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT BSD-with-disclosure
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/junegunn/fzf/archive/0.27.0.tar.gz -> fzf-0.27.0.tar.gz mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.zip -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.mod -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gdamore/tcell/@v/v1.4.0.zip -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gdamore/tcell/@v/v1.4.0.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.2.0.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.2.0.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.11.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.11.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/saracen/walker/@v/v0.1.2.zip -> github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/saracen/walker/@v/v0.1.2.mod -> github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.2.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626150813-e07cf5db2756.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=92852c61c8af59529139ad3421bb7d1c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=30fe20338f0d1e35c757e24bd4e9d4e7
diff --git a/metadata/md5-cache/app-shells/fzf-0.27.2 b/metadata/md5-cache/app-shells/fzf-0.27.2
index 397b3ddab531..2152fceb0ced 100644
--- a/metadata/md5-cache/app-shells/fzf-0.27.2
+++ b/metadata/md5-cache/app-shells/fzf-0.27.2
@@ -8,5 +8,5 @@ LICENSE=MIT BSD-with-disclosure
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/junegunn/fzf/archive/0.27.2.tar.gz -> fzf-0.27.2.tar.gz mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.zip -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.mod -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gdamore/tcell/@v/v1.4.0.zip -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gdamore/tcell/@v/v1.4.0.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.2.0.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.2.0.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.11.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.11.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/saracen/walker/@v/v0.1.2.zip -> github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/saracen/walker/@v/v0.1.2.mod -> github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.2.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626150813-e07cf5db2756.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=93d8fc135229a26a615bbba05063cf46
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
index ab45dbfad28e..6c708fb3ee10 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd6
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/snapshot/gentoo-bashcomp-20180302.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cee6bdf57d8d70e00a93bf4fbf5928b6
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
index 10e9580762b2..bba5e4d11ac9 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd6
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/snapshot/gentoo-bashcomp-20190211.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad7b681dda76b5e404bbbcecd4948ac7
diff --git a/metadata/md5-cache/app-shells/mcfly-0.5.3-r1 b/metadata/md5-cache/app-shells/mcfly-0.5.3-r1
deleted file mode 100644
index b31dff5dbee6..000000000000
--- a/metadata/md5-cache/app-shells/mcfly-0.5.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install postinst test unpack
-DEPEND=dev-db/sqlite:3
-DESCRIPTION=Context-aware bash history search replacement (ctrl-r)
-EAPI=7
-HOMEPAGE=https://github.com/cantino/mcfly
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 MIT Unlicense
-RDEPEND=dev-db/sqlite:3
-SLOT=0
-SRC_URI=https://github.com/cantino/mcfly/archive/v0.5.3.tar.gz -> mcfly-0.5.3.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.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/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.52/download -> cc-1.0.52.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/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/hermit-abi/0.1.12/download -> hermit-abi-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.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.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.10.0/download -> libsqlite3-sys-0.10.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lru-cache/0.1.2/download -> lru-cache-0.1.2.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.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/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/relative-path/1.0.0/download -> relative-path-1.0.0.crate https://crates.io/api/v1/crates/rusqlite/0.15.0/download -> rusqlite-0.15.0.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.106/download -> serde-1.0.106.crate https://crates.io/api/v1/crates/shellexpand/2.0.0/download -> shellexpand-2.0.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/termion/1.5.5/download -> termion-1.5.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.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/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=792c36b331841f605ee232c9f51ea938
diff --git a/metadata/md5-cache/app-shells/mcfly-0.5.7 b/metadata/md5-cache/app-shells/mcfly-0.5.7
new file mode 100644
index 000000000000..7e7e324fe02d
--- /dev/null
+++ b/metadata/md5-cache/app-shells/mcfly-0.5.7
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install postinst test unpack
+DEPEND=dev-db/sqlite:3
+DESCRIPTION=Context-aware bash history search replacement (ctrl-r)
+EAPI=8
+HOMEPAGE=https://github.com/cantino/mcfly
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 CC0-1.0 MIT Unlicense
+RDEPEND=dev-db/sqlite:3
+SLOT=0
+SRC_URI=https://github.com/cantino/mcfly/archive/v0.5.7.tar.gz -> mcfly-0.5.7.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.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/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.52/download -> cc-1.0.52.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/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/hermit-abi/0.1.12/download -> hermit-abi-0.1.12.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.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.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.10.0/download -> libsqlite3-sys-0.10.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lru-cache/0.1.2/download -> lru-cache-0.1.2.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.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/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/relative-path/1.0.0/download -> relative-path-1.0.0.crate https://crates.io/api/v1/crates/rusqlite/0.15.0/download -> rusqlite-0.15.0.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.106/download -> serde-1.0.106.crate https://crates.io/api/v1/crates/shellexpand/2.0.0/download -> shellexpand-2.0.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/termion/1.5.5/download -> termion-1.5.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.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/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ff3f30db333c5dc70f36628a5b09325a
diff --git a/metadata/md5-cache/app-shells/tmux-bash-completion-9999 b/metadata/md5-cache/app-shells/tmux-bash-completion-9999
index b6c5af45d01e..89f973383793 100644
--- a/metadata/md5-cache/app-shells/tmux-bash-completion-9999
+++ b/metadata/md5-cache/app-shells/tmux-bash-completion-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=app-misc/tmux-2.2 app-shells/bash-completion
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=73621ef711bf68408774e732c74660d4
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 6ec2020ae550..907384ef87c3 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/ansifilter-2.18 b/metadata/md5-cache/app-text/ansifilter-2.18
index 8ccb194b575a..88af0448d8f2 100644
--- a/metadata/md5-cache/app-text/ansifilter-2.18
+++ b/metadata/md5-cache/app-text/ansifilter-2.18
@@ -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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 sparc 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.18.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7c093c8747a88981d4b465fbfa1e8dc6
+_md5_=6e253cd0816ef2eac23d5a72e2dc87b3
diff --git a/metadata/md5-cache/app-text/calibre-5.16.1 b/metadata/md5-cache/app-text/calibre-5.16.1
index 729adf762d1d..f52b6b119d48 100644
--- a/metadata/md5-cache/app-text/calibre-5.16.1
+++ b/metadata/md5-cache/app-text/calibre-5.16.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[ipv6,sqlite,ssl] >
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://download.calibre-ebook.com/5.16.1/calibre-5.16.1.tar.xz https://dev.gentoo.org/~zmedico/dist/calibre-5.16.0-SIP-v4.patch.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6c5b1ed22f8c6bba83a19d083aac7c13
diff --git a/metadata/md5-cache/app-text/discount-2.2.7-r2 b/metadata/md5-cache/app-text/discount-2.2.7-r2
new file mode 100644
index 000000000000..ec41b9da7bd9
--- /dev/null
+++ b/metadata/md5-cache/app-text/discount-2.2.7-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DESCRIPTION=A Markdown-to HTML translator written in C
+EAPI=8
+HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
+IUSE=minimal test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.7.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=00431287ba0b2ff1189f70304918c6e6
diff --git a/metadata/md5-cache/app-text/evince-40.3 b/metadata/md5-cache/app-text/evince-40.3
new file mode 100644
index 000000000000..774f2097330f
--- /dev/null
+++ b/metadata/md5-cache/app-text/evince-40.3
@@ -0,0 +1,14 @@
+BDEPEND=gtk-doc? ( >=dev-util/gtk-doc-1.33 ) app-text/docbook-xml-dtd:4.3 dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.76.0[cairo] >=app-arch/libarchive-3.2.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple document viewer for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Evince
+IUSE=cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.76.0[cairo] >=app-arch/libarchive-3.2.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
+SLOT=0/evd3.4-evv3.3
+SRC_URI=mirror://gnome/sources/evince/40/evince-40.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=badc34bcab3705c073052504cd1aa14d
diff --git a/metadata/md5-cache/app-text/evince-40.4 b/metadata/md5-cache/app-text/evince-40.4
new file mode 100644
index 000000000000..ba3dcca2d9b0
--- /dev/null
+++ b/metadata/md5-cache/app-text/evince-40.4
@@ -0,0 +1,14 @@
+BDEPEND=gtk-doc? ( >=dev-util/gtk-doc-1.33 ) app-text/docbook-xml-dtd:4.3 dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.76.0[cairo] >=app-arch/libarchive-3.2.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple document viewer for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Evince
+IUSE=cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.76.0[cairo] >=app-arch/libarchive-3.2.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
+SLOT=0/evd3.4-evv3.3
+SRC_URI=mirror://gnome/sources/evince/40/evince-40.4.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=badc34bcab3705c073052504cd1aa14d
diff --git a/metadata/md5-cache/app-text/jo-1.4 b/metadata/md5-cache/app-text/jo-1.4
index bc62320dc31d..7f71a850f20a 100644
--- a/metadata/md5-cache/app-text/jo-1.4
+++ b/metadata/md5-cache/app-text/jo-1.4
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/jpmens/jo/releases/download/1.4/jo-1.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d13ead9bdc666a45bab65221a3947eea
diff --git a/metadata/md5-cache/app-text/jo-99999 b/metadata/md5-cache/app-text/jo-99999
index c2a452c091e2..6ee2a0288738 100644
--- a/metadata/md5-cache/app-text/jo-99999
+++ b/metadata/md5-cache/app-text/jo-99999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jpmens/jo
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30dea3e40b9cf898e75b6239da1cd168
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.28 b/metadata/md5-cache/app-text/libpaper-1.1.28
index 505cd617cc9c..00a436386be4 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.28
+++ b/metadata/md5-cache/app-text/libpaper-1.1.28
@@ -4,9 +4,9 @@ DESCRIPTION=Library for handling paper characteristics
 EAPI=7
 HOMEPAGE=https://packages.debian.org/unstable/source/libpaper
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.28.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c95223ed7d6f90225f750c0cd342c694
+_md5_=9d1efd3791421fc9077d1b7b3940e97f
diff --git a/metadata/md5-cache/app-text/pandoc-2.11.3.1 b/metadata/md5-cache/app-text/pandoc-2.11.3.1
index 5681867cd382..5d12441a66d4 100644
--- a/metadata/md5-cache/app-text/pandoc-2.11.3.1
+++ b/metadata/md5-cache/app-text/pandoc-2.11.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >
 RESTRICT=test
 SLOT=0/2.11.3.1
 SRC_URI=https://hackage.haskell.org/package/pandoc-2.11.3.1/pandoc-2.11.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7ea41d3a8458f3217a17d84948035713
diff --git a/metadata/md5-cache/app-text/pandoc-2.13 b/metadata/md5-cache/app-text/pandoc-2.13
index c8cf7b840156..fe104064488b 100644
--- a/metadata/md5-cache/app-text/pandoc-2.13
+++ b/metadata/md5-cache/app-text/pandoc-2.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >
 RESTRICT=test
 SLOT=0/2.13
 SRC_URI=https://hackage.haskell.org/package/pandoc-2.13/pandoc-2.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c2733eba84471b8275db9869ba89d35
diff --git a/metadata/md5-cache/app-text/pandoc-2.9.2.1 b/metadata/md5-cache/app-text/pandoc-2.9.2.1
index e65555731ba3..4f2f2dfbcc42 100644
--- a/metadata/md5-cache/app-text/pandoc-2.9.2.1
+++ b/metadata/md5-cache/app-text/pandoc-2.9.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >
 RESTRICT=test
 SLOT=0/2.9.2.1
 SRC_URI=https://hackage.haskell.org/package/pandoc-2.9.2.1/pandoc-2.9.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb5336639ac3e4582f53ebc476a3a883
diff --git a/metadata/md5-cache/app-text/teckit-2.5.10 b/metadata/md5-cache/app-text/teckit-2.5.10
index 564593544499..8f23bc66b722 100644
--- a/metadata/md5-cache/app-text/teckit-2.5.10
+++ b/metadata/md5-cache/app-text/teckit-2.5.10
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install prepare test
 DEPEND=dev-libs/expat sys-libs/zlib
 DESCRIPTION=Text Encoding Conversion toolkit
 EAPI=7
-HOMEPAGE=http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+HOMEPAGE=https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( CPL-0.5 LGPL-2.1 )
 RDEPEND=dev-libs/expat sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/silnrsi/teckit/releases/download/v2.5.10/teckit-2.5.10.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d8b08827d340b4ed2b2da6d45425d881
+_md5_=6e8dc09788770ee3ffb04a8c80a2f073
diff --git a/metadata/md5-cache/app-text/tree-1.8.0 b/metadata/md5-cache/app-text/tree-1.8.0
index 59d0993e47fc..e47d34ab7930 100644
--- a/metadata/md5-cache/app-text/tree-1.8.0
+++ b/metadata/md5-cache/app-text/tree-1.8.0
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.8.0.tgz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=edbd3e683ab498c2e237087e1aa3d159
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 5c6004d25c49..dc090f10b716 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20210716 b/metadata/md5-cache/app-vim/gentoo-syntax-20210716
new file mode 100644
index 000000000000..9b68bc01811d
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20210716
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
+EAPI=7
+HOMEPAGE=https://github.com/gentoo/gentoo-syntax
+IUSE=ignore-glep31
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-20210716.tar.bz2
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_md5_=efd73e1821001afe173e15eb006d2abe
diff --git a/metadata/md5-cache/app-vim/salt-vim-20151119 b/metadata/md5-cache/app-vim/salt-vim-20151119
index 7fe86af8bd34..41e47a06a7b0 100644
--- a/metadata/md5-cache/app-vim/salt-vim-20151119
+++ b/metadata/md5-cache/app-vim/salt-vim-20151119
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=Vim files for working on Salt files
 EAPI=7
 HOMEPAGE=https://github.com/saltstack/salt-vim
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=!<=app-admin/salt-2015.5.6 !~app-admin/salt-2015.8.0 !~app-admin/salt-2015.8.1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/salt-vim/archive/5b15d379fbcbb84f82c6a345abc08cea9d374be9.tar.gz -> salt-vim-20151119.tar.gz
 _eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
-_md5_=027a66e6a177b968b5b6d9f474db53d2
+_md5_=019089f3d2f11e7978329633dfeda493
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index 57b72cf33025..1ff2efb1ba21 100644
--- a/metadata/md5-cache/app-xemacs/Manifest.gz
+++ b/metadata/md5-cache/app-xemacs/Manifest.gz
diff --git a/metadata/md5-cache/app-xemacs/ebuild-mode-1.53 b/metadata/md5-cache/app-xemacs/ebuild-mode-1.53
new file mode 100644
index 000000000000..6de92c0b573e
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/ebuild-mode-1.53
@@ -0,0 +1,11 @@
+BDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
+DEFINED_PHASES=compile install
+DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.53.tar.xz
+_md5_=f9d9259ab79533586771cab7af18da60
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index acdc6a49d13b..0368e3fa3c58 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/asio-1.19.1 b/metadata/md5-cache/dev-cpp/asio-1.19.1
new file mode 100644
index 000000000000..e21598f7f0b3
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/asio-1.19.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/boost:= ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Asynchronous Network Library
+EAPI=7
+HOMEPAGE=https://think-async.com https://github.com/chriskohlhoff/asio
+IUSE=doc examples ssl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Boost-1.0
+RDEPEND=dev-libs/boost:= ssl? ( dev-libs/openssl:0= )
+REQUIRED_USE=test? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/asio/asio/asio-1.19.1.tar.bz2
+_md5_=d30bfdc5f684b26ec99f5af643126978
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1 b/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
index ef73a579d6b8..32e954312d5e 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
@@ -10,5 +10,5 @@ LICENSE=MPL-2.0
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.bz2 -> eigen-3.3.7-gitlab.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2691c842b352e29789b2785fe88fa0a8
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.9 b/metadata/md5-cache/dev-cpp/eigen-3.3.9
index e1018a87aa1b..a54134db0cfe 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.9
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.9
@@ -10,5 +10,5 @@ LICENSE=MPL-2.0
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a2dbb3fc140591ac837377c0b6acd2c9
diff --git a/metadata/md5-cache/dev-cpp/sol2-3.2.2 b/metadata/md5-cache/dev-cpp/sol2-3.2.2
new file mode 100644
index 000000000000..de96d5876795
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/sol2-3.2.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) dev-cpp/catch:0 )
+DESCRIPTION=Header-only C++ <-> Lua API wrapper
+EAPI=7
+HOMEPAGE=https://github.com/ThePhD/sol2
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+REQUIRED_USE=test? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ThePhD/sol2/archive/refs/tags/v3.2.2.tar.gz -> sol2-3.2.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua	2afa2308593141ae89672d1c2b96f9e8	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=41ff882a85e04815b12df6c7f11cb405
diff --git a/metadata/md5-cache/dev-cpp/tbb-2020.3 b/metadata/md5-cache/dev-cpp/tbb-2020.3
index fbf9c1e4bcc8..59961ff50153 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2020.3
+++ b/metadata/md5-cache/dev-cpp/tbb-2020.3
@@ -3,9 +3,9 @@ DESCRIPTION=High level abstract threading library
 EAPI=7
 HOMEPAGE=https://www.threadingbuildingblocks.org
 IUSE=debug examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/intel/tbb/archive/2020_U3.tar.gz -> tbb-2020.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6928e787aa23128af29b345b275d7b77
+_md5_=62f7256b735a2f3191eeb9db67e65036
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0
new file mode 100644
index 000000000000..51265b8c62fa
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=YAML parser and emitter in C++
+EAPI=7
+HOMEPAGE=https://github.com/jbeder/yaml-cpp
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0/0.7
+SRC_URI=https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.7.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1878cdeed9f06cfefdf287f4e8774fbe
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 83a572f9f2ac..b61004fdf70f 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r3 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r3
index ce9c615120fe..7cfc133b815d 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r3
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r3
@@ -5,11 +5,11 @@ DESCRIPTION=The leading SQL relational database engine written in Java
 EAPI=7
 HOMEPAGE=http://hsqldb.org
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/hsqldb acct-user/hsqldb dev-java/tomcat-servlet-api:4.0 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
 _eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6f7c7f9e0cb44737cf4c1a6fbef6248d
+_md5_=77f3d2543217e4ed5a244019d1ae4a42
diff --git a/metadata/md5-cache/dev-db/kyotocabinet-1.2.77 b/metadata/md5-cache/dev-db/kyotocabinet-1.2.77
index 5d28fc820621..8c9cea042dc4 100644
--- a/metadata/md5-cache/dev-db/kyotocabinet-1.2.77
+++ b/metadata/md5-cache/dev-db/kyotocabinet-1.2.77
@@ -5,10 +5,10 @@ DESCRIPTION=A straightforward implementation of DBM
 EAPI=7
 HOMEPAGE=https://fallabs.com/kyotocabinet/
 IUSE=debug doc examples +lzma +lzo static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=sys-libs/zlib[static-libs?] lzma? ( app-arch/xz-utils:=[static-libs?] ) lzo? ( dev-libs/lzo:=[static-libs?] )
 SLOT=0
 SRC_URI=https://fallabs.com/kyotocabinet/pkg/kyotocabinet-1.2.77.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d0a22950100108e3a956d2b4a4e622ab
+_md5_=e3d3f79fa8220e3066942e6b49050e66
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.13 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.13
index 2cdc3e68075d..9c1edfb41cbc 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.13
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.13
@@ -5,11 +5,11 @@ DESCRIPTION=C client library for MariaDB/MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+curl gnutls kerberos +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://downloads.mariadb.org/f/connector-c-3.1.13/mariadb-connector-c-3.1.13-src.tar.gz?serve -> mariadb-connector-c-3.1.13-src.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=af928b31e5b9f3af422bdd3fd57a8a68
+_md5_=4e1a3d088e3f137e359c0c8a92856a73
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.2.3 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.2.3
new file mode 100644
index 000000000000..bb26f9dc3f04
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.2.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+DESCRIPTION=C client library for MariaDB/MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+IUSE=+curl gnutls kerberos +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://downloads.mariadb.org/f/connector-c-3.2.3/mariadb-connector-c-3.2.3-src.tar.gz?serve -> mariadb-connector-c-3.2.3-src.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0b4a90b8bb05053ce06655e2190e2af3
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-9999 b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
index 1c3497e78641..b345bf81b9e4 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-9999
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 RESTRICT=!test? ( test )
 SLOT=0/3
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0e50b7270f147be9fce89b4dcf4d91fa
+_md5_=0b4a90b8bb05053ce06655e2190e2af3
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.11 b/metadata/md5-cache/dev-db/mongodb-4.2.11
index e31f42ca5fa5..fa362746e87d 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.11
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.11
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.11.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d44d3ccd27ebbf7ea318776e1d8f80f2
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.12 b/metadata/md5-cache/dev-db/mongodb-4.2.12
index a9c976ba46cc..aa4590390ed3 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.12
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.12
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.12.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d98a6f49cd8f889e8d914fc4b2bf147
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.1 b/metadata/md5-cache/dev-db/mongodb-4.4.1
index 695244d87e34..f097cfcf06c3 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.1
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.1
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.1.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b7165825613d79c3372d0022bf30d935
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8b8452f370fdc37a26186b6057c366a5
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.2 b/metadata/md5-cache/dev-db/mongodb-4.4.2
index baba6e8c4001..dfe448867e91 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.2
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.2
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.2.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9f2f94b28a1db6a22226cfb946cbdca
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2fc6fc7e9e16cc961a561a66bbf4dfa8
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.4 b/metadata/md5-cache/dev-db/mongodb-4.4.4
index aec484b1a48d..b2afe365b119 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.4
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.4
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.4.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9f2f94b28a1db6a22226cfb946cbdca
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2fc6fc7e9e16cc961a561a66bbf4dfa8
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-18.3.0.0-r2 b/metadata/md5-cache/dev-db/oracle-instantclient-18.3.0.0-r2
index 26ad8e3d6735..b9d9eefae38b 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-18.3.0.0-r2
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-18.3.0.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=fetch splitdebug
 SLOT=0/18.1
 SRC_URI=abi_x86_32? ( instantclient-basic-linux-18.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux-18.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux-18.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux-18.3.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-18.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux-18.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux-18.3.0.0.0dbru.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-18.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-18.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-18.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-18.3.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-18.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-18.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-18.3.0.0.0dbru.zip ) )
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e63478c9ab9d9e1f73f5bc6bc60fde6
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-18.5.0.0 b/metadata/md5-cache/dev-db/oracle-instantclient-18.5.0.0
index 7bc372757685..b96731397862 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-18.5.0.0
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-18.5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=fetch splitdebug
 SLOT=0/18.1
 SRC_URI=abi_x86_64? ( instantclient-basic-linux.x64-18.5.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-18.5.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-18.5.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-18.5.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-18.5.0.0.0dbru.zip ) )
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fcefedfd7740d690829ff4cf85fc40a5
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.11.0.0.0 b/metadata/md5-cache/dev-db/oracle-instantclient-19.11.0.0.0
new file mode 100644
index 000000000000..d37313effacc
--- /dev/null
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.11.0.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Oracle 18c Instant Client with SDK
+EAPI=7
+HOMEPAGE=https://www.oracle.com/database/technologies/instant-client.html
+IUSE=jdbc odbc precomp +sdk +sqlplus tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=OTN
+RDEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-db/oracle-instantclient-basic-12 !<dev-db/oracle-instantclient-odbc-12 !<dev-db/oracle-instantclient-jdbc-12 !<dev-db/oracle-instantclient-sqlplus-12 odbc? ( dev-db/unixODBC )
+REQUIRED_USE=precomp? ( sdk )
+RESTRICT=mirror splitdebug test
+SLOT=0/19.1
+SRC_URI=abi_x86_32? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-basic-linux-19.11.0.0.0dbru.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-jdbc-linux-19.11.0.0.0dbru.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-odbc-linux-19.11.0.0.0dbru.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-precomp-linux-19.11.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-sdk-linux-19.11.0.0.0dbru.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-sqlplus-linux-19.11.0.0.0dbru.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-tools-linux-19.11.0.0.0dbru.zip ) ) ) abi_x86_64? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-basic-linux.x64-19.11.0.0.0dbru.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-jdbc-linux.x64-19.11.0.0.0dbru.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-odbc-linux.x64-19.11.0.0.0dbru.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-precomp-linux.x64-19.11.0.0.0dbru.zip ) sdk? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-sdk-linux.x64-19.11.0.0.0dbru.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-sqlplus-linux.x64-19.11.0.0.0dbru.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/1911000/instantclient-tools-linux.x64-19.11.0.0.0dbru.zip ) )
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0bb6a1198680189f718f81e6d46f824c
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.3.0.0-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-19.3.0.0-r1
index 8ed0ee8722ba..fc952a97c729 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-19.3.0.0-r1
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.3.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=fetch splitdebug
 SLOT=0/18.1
 SRC_URI=abi_x86_32? ( instantclient-basic-linux-19.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux-19.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux-19.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux-19.3.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-19.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux-19.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux-19.3.0.0.0dbru.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-19.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-19.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-19.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-19.3.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-19.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-19.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-19.3.0.0.0dbru.zip ) )
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f07a85d45a6b295824131ef6f611f16
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.5.0.0 b/metadata/md5-cache/dev-db/oracle-instantclient-19.5.0.0
index 9b06570037df..c15e0f8562c8 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-19.5.0.0
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=fetch splitdebug
 SLOT=0/19.1
 SRC_URI=abi_x86_32? ( instantclient-basic-linux-19.5.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux-19.5.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux-19.5.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux-19.5.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-19.5.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux-19.5.0.0.0dbru.zip ) tools? ( instantclient-tools-linux-19.5.0.0.0dbru.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-19.5.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-19.5.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-19.5.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-19.5.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-19.5.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-19.5.0.0.0dbru.zip ) )
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8627238dc8a794f069231b3900f13aa8
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0 b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0
index 361840279aa8..13fd39c79e82 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=fetch splitdebug
 SLOT=0/19.1
 SRC_URI=abi_x86_32? ( instantclient-basic-linux-19.6.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux-19.6.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux-19.6.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux-19.6.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-19.6.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux-19.6.0.0.0dbru.zip ) tools? ( instantclient-tools-linux-19.6.0.0.0dbru.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-19.6.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-19.6.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-19.6.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-19.6.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-19.6.0.0.0dbru.zip ) )
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8627238dc8a794f069231b3900f13aa8
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
index 2a8c3a213562..5036a1723ff0 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=mirror splitdebug test
 SLOT=0/19.1
 SRC_URI=abi_x86_32? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-basic-linux-19.6.0.0.0dbru.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-jdbc-linux-19.6.0.0.0dbru.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-odbc-linux-19.6.0.0.0dbru.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-precomp-linux-19.6.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sdk-linux-19.6.0.0.0dbru.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sqlplus-linux-19.6.0.0.0dbru.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-tools-linux-19.6.0.0.0dbru.zip ) ) ) abi_x86_64? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-basic-linux.x64-19.6.0.0.0dbru.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-jdbc-linux.x64-19.6.0.0.0dbru.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-odbc-linux.x64-19.6.0.0.0dbru.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-precomp-linux.x64-19.6.0.0.0dbru.zip ) sdk? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-tools-linux.x64-19.6.0.0.0dbru.zip ) )
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e187712cfe671f2efa140f811630da7
diff --git a/metadata/md5-cache/dev-db/sqlcl-bin-21.1.1.113.1704 b/metadata/md5-cache/dev-db/sqlcl-bin-21.1.1.113.1704
deleted file mode 100644
index 4ed5dae7910b..000000000000
--- a/metadata/md5-cache/dev-db/sqlcl-bin-21.1.1.113.1704
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install nofetch preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Oracle SQLcl is the new SQL*Plus
-EAPI=7
-HOMEPAGE=https://www.oracle.com/database/technologies/appdev/sqlcl.html
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=OTN
-RDEPEND=dev-db/oracle-instantclient dev-java/java-config:2 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist fetch mirror
-SLOT=0
-SRC_URI=sqlcl-21.1.1.113.1704.zip
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=6c4bc970985f16294d6161f07d433cab
diff --git a/metadata/md5-cache/dev-db/sqlcl-bin-21.2.0.174.2245 b/metadata/md5-cache/dev-db/sqlcl-bin-21.2.0.174.2245
new file mode 100644
index 000000000000..d0068270894a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqlcl-bin-21.2.0.174.2245
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Oracle SQLcl is the new SQL*Plus
+EAPI=7
+HOMEPAGE=https://www.oracle.com/database/technologies/appdev/sqlcl.html
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=OTN
+RDEPEND=dev-db/oracle-instantclient dev-java/java-config:2 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-21.2.0.174.2245.zip
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=96f7f753478ebdfaa1f577a07a5918b4
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-20.4.1.407.0006 b/metadata/md5-cache/dev-db/sqldeveloper-20.4.1.407.0006
deleted file mode 100644
index b9705acf3daf..000000000000
--- a/metadata/md5-cache/dev-db/sqldeveloper-20.4.1.407.0006
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install nofetch postinst preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Oracle SQL Developer is a graphical tool for database development
-EAPI=7
-HOMEPAGE=https://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html
-IUSE=mssql mysql postgres sybase elibc_FreeBSD
-KEYWORDS=-* ~amd64
-LICENSE=OTN
-RDEPEND=mssql? ( dev-java/jtds:1.3 ) mysql? ( dev-java/jdbc-mysql:0 ) postgres? ( dev-java/jdbc-postgresql:0 ) sybase? ( dev-java/jtds:1.3 ) >=dev-java/openjdk-8:*[javafx] >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=sqldeveloper-20.4.1.407.0006-no-jre.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=9305e4d2d0d30740655d499da57b3ca0
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-21.2.0.187.1842 b/metadata/md5-cache/dev-db/sqldeveloper-21.2.0.187.1842
new file mode 100644
index 000000000000..808f8dce3e78
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqldeveloper-21.2.0.187.1842
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install nofetch postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Oracle SQL Developer is a graphical tool for database development
+EAPI=7
+HOMEPAGE=https://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html
+IUSE=mssql mysql postgres sybase elibc_FreeBSD
+KEYWORDS=-* ~amd64
+LICENSE=OTN
+RDEPEND=>=dev-java/openjdk-8:*[javafx] >=virtual/jre-1.8:* mssql? ( dev-java/jtds:1.3 ) mysql? ( dev-java/jdbc-mysql:0 ) postgres? ( dev-java/jdbc-postgresql:0 ) sybase? ( dev-java/jtds:1.3 ) >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=sqldeveloper-21.2.0.187.1842-no-jre.zip
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=c46c1cfd3ba35b4a0020bc07579d5164
diff --git a/metadata/md5-cache/dev-db/sqlite-3.35.5 b/metadata/md5-cache/dev-db/sqlite-3.35.5
index 56e7db5aa991..5fdad44cfecb 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.35.5
+++ b/metadata/md5-cache/dev-db/sqlite-3.35.5
@@ -5,11 +5,11 @@ DESCRIPTION=SQL database engine
 EAPI=7
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=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(-)?] icu? ( dev-libs/icu: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(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl: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(-)?] ) tools? ( dev-lang/tcl:0= )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://sqlite.org/2021/sqlite-src-3350500.zip doc? ( https://sqlite.org/2021/sqlite-doc-3350500.zip )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=104498506dee422b5edac690a5273dee
+_md5_=352e499673bb53689e4d6a4bc16e5bd8
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-3.12.2 b/metadata/md5-cache/dev-db/sqlitebrowser-3.12.2
index 49cf2f83e8d0..2501728b6fed 100644
--- a/metadata/md5-cache/dev-db/sqlitebrowser-3.12.2
+++ b/metadata/md5-cache/dev-db/sqlitebrowser-3.12.2
@@ -5,11 +5,11 @@ DESCRIPTION=A light GUI editor for SQLite databases
 EAPI=7
 HOMEPAGE=https://sqlitebrowser.org/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+ MPL-2.0
 RDEPEND=app-editors/qhexedit2 dev-db/sqlite:3 dev-libs/qcustomplot >=dev-qt/qtconcurrent-5.5:5 >=dev-qt/qtcore-5.5:5 >=dev-qt/qtgui-5.5:5 >=dev-qt/qtnetwork-5.5:5[ssl] >=dev-qt/qtprintsupport-5.5:5 >=dev-qt/qtwidgets-5.5:5 >=dev-qt/qtxml-5.5:5 >=x11-libs/qscintilla-2.8.10:= >=dev-qt/qtsvg-5.5:5
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.12.2.tar.gz -> sqlitebrowser-3.12.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e2fe80274de4d7803f92688bd531cd65
+_md5_=e752f4ffe8e0507f11cd2fd6dae7b87a
diff --git a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1 b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
index 00466d3d8281..93bfdbfad7b7 100644
--- a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
+++ b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A library of routines for managing a database
 EAPI=7
 HOMEPAGE=https://fallabs.com/tokyocabinet/
 IUSE=bzip2 debug doc examples threads zlib
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=94d1e5302e830271385facc08eee3c70
+_md5_=06b67d643edc63e7fdc60ece7db25f3a
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index e04d817302bb..35a1616b6751 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/goatee-0.4.0 b/metadata/md5-cache/dev-games/goatee-0.4.0
index fa8cfe7072a4..1f4c1ecb100f 100644
--- a/metadata/md5-cache/dev-games/goatee-0.4.0
+++ b/metadata/md5-cache/dev-games/goatee-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev
 RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://hackage.haskell.org/package/goatee-0.4.0/goatee-0.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bdd85c63ba0cfc71fb8508469bab9fbd
diff --git a/metadata/md5-cache/dev-games/physfs-3.0.2-r1 b/metadata/md5-cache/dev-games/physfs-3.0.2-r1
new file mode 100644
index 000000000000..e70e3da9e4be
--- /dev/null
+++ b/metadata/md5-cache/dev-games/physfs-3.0.2-r1
@@ -0,0 +1,12 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstraction layer for filesystem and archive access
+EAPI=7
+HOMEPAGE=https://icculus.org/physfs/
+IUSE=7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip 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 ~ppc64 ~x86
+LICENSE=ZLIB
+SLOT=0
+SRC_URI=https://icculus.org/physfs/downloads/physfs-3.0.2.tar.bz2
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d1efd6ee848e6ee1992ee88b6ea5aa79
diff --git a/metadata/md5-cache/dev-games/tiled-1.7.1 b/metadata/md5-cache/dev-games/tiled-1.7.1
new file mode 100644
index 000000000000..adb9ee393f41
--- /dev/null
+++ b/metadata/md5-cache/dev-games/tiled-1.7.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=app-arch/zstd:= >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtdeclarative-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtnetwork-5.15:5 >=dev-qt/qtwidgets-5.15:5 sys-libs/zlib python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+DESCRIPTION=A general purpose tile map editor
+EAPI=7
+HOMEPAGE=https://www.mapeditor.org/
+IUSE=examples python python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=BSD BSD-2 GPL-2+
+RDEPEND=app-arch/zstd:= >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtdeclarative-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtnetwork-5.15:5 >=dev-qt/qtwidgets-5.15:5 sys-libs/zlib python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=https://github.com/bjorn/tiled/archive/v1.7.1/tiled-1.7.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4d426fde142eeea900af5e740d46edc1
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 5ddd6a5ecb57..64d4d29bd8e6 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/go-tools-0.1.4 b/metadata/md5-cache/dev-go/go-tools-0.1.4
index a050f740fdbb..fdb47cbcfc80 100644
--- a/metadata/md5-cache/dev-go/go-tools-0.1.4
+++ b/metadata/md5-cache/dev-go/go-tools-0.1.4
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/golang/tools/archive/v0.1.4.tar.gz -> go-tools-0.1.4.tar.gz mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/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-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.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-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.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-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
-_md5_=68cebb516b6354d0323ac4fa09b9cca4
+_md5_=023c194b3d9b212c96cf2e85dc89a6af
diff --git a/metadata/md5-cache/dev-go/goversion-1.2.0 b/metadata/md5-cache/dev-go/goversion-1.2.0
index 170cfc8382be..2c0f510969f0 100644
--- a/metadata/md5-cache/dev-go/goversion-1.2.0
+++ b/metadata/md5-cache/dev-go/goversion-1.2.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/rsc/goversion/archive/v1.2.0.tar.gz -> goversion-1.2.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77515931836f081181250aecfc3d454d
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 64198949059d..ace939fad74e 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/abstract-deque-0.3 b/metadata/md5-cache/dev-haskell/abstract-deque-0.3
index aff03e0c32cb..9e7011a7210e 100644
--- a/metadata/md5-cache/dev-haskell/abstract-deque-0.3
+++ b/metadata/md5-cache/dev-haskell/abstract-deque-0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] )
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/abstract-deque-0.3/abstract-deque-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=83df5b2508b46c057e3e10d52b954362
diff --git a/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3 b/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
index 1b9b836915a9..f6cdb1469a3a 100644
--- a/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
+++ b/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] dev-haskell/hunit:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/abstract-deque-tests-0.3/abstract-deque-tests-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=31a2ca0eeb42e954085e5b0005f98476
diff --git a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1 b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
index 7fc5235d3f12..a9d8934a99b0 100644
--- a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/abstract-par-0.3.3/abstract-par-0.3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65daf1de9f320e79c539e13876da75cd
diff --git a/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1 b/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
index 8532e6a032cc..eb0bb1a87675 100644
--- a/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
+++ b/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.1
 SRC_URI=https://hackage.haskell.org/package/AC-PPM-1.1.1/AC-PPM-1.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22691d32fdef3a5394fa1b941d4a7c6f
diff --git a/metadata/md5-cache/dev-haskell/adjunctions-4.4 b/metadata/md5-cache/dev-haskell/adjunctions-4.4
index 81971d0a2f66..d7a5f8df01d2 100644
--- a/metadata/md5-cache/dev-haskell/adjunctions-4.4
+++ b/metadata/md5-cache/dev-haskell/adjunctions-4.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/4.4
 SRC_URI=https://hackage.haskell.org/package/adjunctions-4.4/adjunctions-4.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=df8dae79fdb38b2ace61255ff7293263
diff --git a/metadata/md5-cache/dev-haskell/aeson-1.4.7.1 b/metadata/md5-cache/dev-haskell/aeson-1.4.7.1
index f246fa3a18ed..a063473bd755 100644
--- a/metadata/md5-cache/dev-haskell/aeson-1.4.7.1
+++ b/metadata/md5-cache/dev-haskell/aeson-1.4.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.
 RESTRICT=!test? ( test )
 SLOT=0/1.4.7.1
 SRC_URI=https://hackage.haskell.org/package/aeson-1.4.7.1/aeson-1.4.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=df4de5d274c11c1868d600921dd7e019
diff --git a/metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2 b/metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2
index a031ffbf39bb..d8920e877313 100644
--- a/metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2
+++ b/metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.3.9
 SRC_URI=https://hackage.haskell.org/package/aeson-compat-0.3.9/aeson-compat-0.3.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8cf4c07d5e3f021658bce38d859d6553
diff --git a/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8 b/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8
index fff103e3cb1d..6a6f426fef63 100644
--- a/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8
+++ b/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/edit-distance-vector:=[profile
 RESTRICT=test
 SLOT=0/1.1.0.8
 SRC_URI=https://hackage.haskell.org/package/aeson-diff-1.1.0.8/aeson-diff-1.1.0.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=45fcab3f6e5de4d2c75679bac6aedc84
diff --git a/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.8 b/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.8
index 7fdc08f6a400..9379445e4355 100644
--- a/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.8
+++ b/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] )
 SLOT=0/0.8.8
 SRC_URI=https://hackage.haskell.org/package/aeson-pretty-0.8.8/aeson-pretty-0.8.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=251c4ef4caea147ac70afb53ef989865
diff --git a/metadata/md5-cache/dev-haskell/aeson-qq-0.8.3 b/metadata/md5-cache/dev-haskell/aeson-qq-0.8.3
index fbbc9aeaa477..6ed28b016f7f 100644
--- a/metadata/md5-cache/dev-haskell/aeson-qq-0.8.3
+++ b/metadata/md5-cache/dev-haskell/aeson-qq-0.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] dev-haskell/attoparsec:=[profile?] d
 RESTRICT=!test? ( test )
 SLOT=0/0.8.3
 SRC_URI=https://hackage.haskell.org/package/aeson-qq-0.8.3/aeson-qq-0.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=972d0fa6e2d974985b30a83b99ab7658
diff --git a/metadata/md5-cache/dev-haskell/alex-3.2.5 b/metadata/md5-cache/dev-haskell/alex-3.2.5
index 383438ef2a70..a19c1a806e8f 100644
--- a/metadata/md5-cache/dev-haskell/alex-3.2.5
+++ b/metadata/md5-cache/dev-haskell/alex-3.2.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/alex-3.2.5/alex-3.2.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	gnuconfig	262062cef0ba4f22b397193da514a350	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68e79e66addc68413d82bd9b616491a3
diff --git a/metadata/md5-cache/dev-haskell/alex-tools-0.4 b/metadata/md5-cache/dev-haskell/alex-tools-0.4
index 6e089f493c0b..1ba09727bf9e 100644
--- a/metadata/md5-cache/dev-haskell/alex-tools-0.4
+++ b/metadata/md5-cache/dev-haskell/alex-tools-0.4
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.4
 SRC_URI=https://hackage.haskell.org/package/alex-tools-0.4/alex-tools-0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=39bd0631930b5b2d4c6d068e0219b043
diff --git a/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2 b/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
index 4903c94ff3af..7eb0d8c03a84 100644
--- a/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
+++ b/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/alsa-lib
 SLOT=0/0.5.0.1
 SRC_URI=https://hackage.haskell.org/package/alsa-core-0.5.0.1/alsa-core-0.5.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ce89bc54c869c8543312c67f4ffeb23
diff --git a/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0 b/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0
index b0c188a9f0d9..5e5718f04628 100644
--- a/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0
+++ b/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= media-libs/alsa-lib
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/alsa-mixer-0.3.0/alsa-mixer-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ea867112cc1b18015ddb4a5c2db107de
diff --git a/metadata/md5-cache/dev-haskell/alut-2.4.0.3 b/metadata/md5-cache/dev-haskell/alut-2.4.0.3
index c1b7d650d3e1..17322354e2b5 100644
--- a/metadata/md5-cache/dev-haskell/alut-2.4.0.3
+++ b/metadata/md5-cache/dev-haskell/alut-2.4.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/openal-1.7:=[profile?] <dev-haskell/openal-1.8:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= media-libs/freealut
 SLOT=0/2.4.0.3
 SRC_URI=https://hackage.haskell.org/package/ALUT-2.4.0.3/ALUT-2.4.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d5acaf173052458666c077b5512e633b
diff --git a/metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0 b/metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0
index 790bba91cebc..9e0efee41930 100644
--- a/metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0
+++ b/metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.10.2:=
 SLOT=0/0.7.0
 SRC_URI=https://hackage.haskell.org/package/annotated-wl-pprint-0.7.0/annotated-wl-pprint-0.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d4148e82b4e5eddf402e11be63fdb80
diff --git a/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3 b/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
index 3cad1b410e0f..d860763c2d09 100644
--- a/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
+++ b/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/colour-2.1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.10.3
 SRC_URI=https://hackage.haskell.org/package/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=25585e0c26d6be3c5a4a5df525a412da
diff --git a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.8.2-r1 b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.8.2-r1
index 19bd5250ed36..1df88aded241 100644
--- a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.8.2-r1
+++ b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.8.2
 SRC_URI=https://hackage.haskell.org/package/ansi-wl-pprint-0.6.8.2/ansi-wl-pprint-0.6.8.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c9fbf085f79c490dc69c10c53b080f96
diff --git a/metadata/md5-cache/dev-haskell/appar-0.1.8 b/metadata/md5-cache/dev-haskell/appar-0.1.8
index c86dc249d864..ed4489af2833 100644
--- a/metadata/md5-cache/dev-haskell/appar-0.1.8
+++ b/metadata/md5-cache/dev-haskell/appar-0.1.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.8
 SRC_URI=https://hackage.haskell.org/package/appar-0.1.8/appar-0.1.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ace09dc04ed47fa81e6cd4d6266d5671
diff --git a/metadata/md5-cache/dev-haskell/argparser-0.3.4 b/metadata/md5-cache/dev-haskell/argparser-0.3.4
index c5110793a100..71a27316a4b1 100644
--- a/metadata/md5-cache/dev-haskell/argparser-0.3.4
+++ b/metadata/md5-cache/dev-haskell/argparser-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.3.4
 SRC_URI=https://hackage.haskell.org/package/argparser-0.3.4/argparser-0.3.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0dfe64b0757506c2a449ee6bfa74d54
diff --git a/metadata/md5-cache/dev-haskell/arithmoi-0.11.0.1 b/metadata/md5-cache/dev-haskell/arithmoi-0.11.0.1
index d1c3e3540611..805239c96b5f 100644
--- a/metadata/md5-cache/dev-haskell/arithmoi-0.11.0.1
+++ b/metadata/md5-cache/dev-haskell/arithmoi-0.11.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/chimera-0.3:=[profile?] dev-haskell/constraints:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/0.11.0.1
 SRC_URI=https://hackage.haskell.org/package/arithmoi-0.11.0.1/arithmoi-0.11.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=276841ad1318ab78719aa944550592c7
diff --git a/metadata/md5-cache/dev-haskell/arrows-0.4.4.2 b/metadata/md5-cache/dev-haskell/arrows-0.4.4.2
index 1b5f9aa495c8..9bea675adf14 100644
--- a/metadata/md5-cache/dev-haskell/arrows-0.4.4.2
+++ b/metadata/md5-cache/dev-haskell/arrows-0.4.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/stream:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.4.2
 SRC_URI=https://hackage.haskell.org/package/arrows-0.4.4.2/arrows-0.4.4.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2213cbe9811b92b68b815341f41d25c
diff --git a/metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0 b/metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0
index 406b84963ab6..137eef4b5916 100644
--- a/metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0
+++ b/metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.0.1.5:=[profile?] >=dev-haskell/concurrent-output-
 RESTRICT=!test? ( test )
 SLOT=0/0.3.3.0
 SRC_URI=https://hackage.haskell.org/package/ascii-progress-0.3.3.0/ascii-progress-0.3.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e55f10afd24880e44b746cdfe7f4f945
diff --git a/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6 b/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6
index 49e9f23f6414..cfdafcfbbaf1 100644
--- a/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6
+++ b/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.6
 SRC_URI=https://hackage.haskell.org/package/asn1-encoding-0.9.6/asn1-encoding-0.9.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4553abbb8d9ce2a7308a0ece16e060d9
diff --git a/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5 b/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
index a247fe1bd868..a6374260998b 100644
--- a/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
+++ b/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.9.5
 SRC_URI=https://hackage.haskell.org/package/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=43a609a3a9ea1b8037ff2d1223d4392d
diff --git a/metadata/md5-cache/dev-haskell/asn1-types-0.3.3 b/metadata/md5-cache/dev-haskell/asn1-types-0.3.3
index 3eea42958fc0..ab516c1b9bcf 100644
--- a/metadata/md5-cache/dev-haskell/asn1-types-0.3.3
+++ b/metadata/md5-cache/dev-haskell/asn1-types-0.3.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/asn1-types-0.3.3/asn1-types-0.3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36728c6cd14f6d4188f1f389f85b9f83
diff --git a/metadata/md5-cache/dev-haskell/async-2.2.2 b/metadata/md5-cache/dev-haskell/async-2.2.2
index 4c36aeb3a7a5..d92d186e74be 100644
--- a/metadata/md5-cache/dev-haskell/async-2.2.2
+++ b/metadata/md5-cache/dev-haskell/async-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.4:=[p
 RESTRICT=!test? ( test )
 SLOT=0/2.2.2
 SRC_URI=https://hackage.haskell.org/package/async-2.2.2/async-2.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a479d77f1c3ade7508261bc033db9b12
diff --git a/metadata/md5-cache/dev-haskell/atomic-primops-0.8.3 b/metadata/md5-cache/dev-haskell/atomic-primops-0.8.3
index 9476a3bd0d6b..87a1ea9acc35 100644
--- a/metadata/md5-cache/dev-haskell/atomic-primops-0.8.3
+++ b/metadata/md5-cache/dev-haskell/atomic-primops-0.8.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.8.3
 SRC_URI=https://hackage.haskell.org/package/atomic-primops-0.8.3/atomic-primops-0.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=14367d12c16de325a20dca345c71c3da
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3 b/metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3
index a2cff8d6cd13..ab3e7ac14dc3 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3
+++ b/metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=test
 SLOT=0/0.13.2.3
 SRC_URI=https://hackage.haskell.org/package/attoparsec-0.13.2.3/attoparsec-0.13.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b2040f3327975a84647395550f8d0f8
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0 b/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0
index 07d551d3760c..9ace127dc393 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0
+++ b/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/attoparsec-conduit-1.1.0/attoparsec-conduit-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ed269df425b392e77388827c4a8348a0
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4 b/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
index 2ca66111716d..7e7129f4dbb0 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
+++ b/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.4
 SRC_URI=https://hackage.haskell.org/package/attoparsec-enumerator-0.3.4/attoparsec-enumerator-0.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f7308fc6177b0fb16f22c5ea69f49481
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1 b/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1
index f09114449dab..a6f405b00ac5 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.13.0.1:=[profile?] >=dev-haskell/base-compat-0.9.1:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.0
 SRC_URI=https://hackage.haskell.org/package/attoparsec-iso8601-1.0.1.0/attoparsec-iso8601-1.0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cbf1eb9c75f5bea8759fe1f80832118a
diff --git a/metadata/md5-cache/dev-haskell/authenticate-1.3.5 b/metadata/md5-cache/dev-haskell/authenticate-1.3.5
index a815d73c9630..1dfa2cdf841b 100644
--- a/metadata/md5-cache/dev-haskell/authenticate-1.3.5
+++ b/metadata/md5-cache/dev-haskell/authenticate-1.3.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/html-conduit-1.3:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
 SLOT=0/1.3.5
 SRC_URI=https://hackage.haskell.org/package/authenticate-1.3.5/authenticate-1.3.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=64bb724a95055cff04c19ce2f4431ba0
diff --git a/metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1 b/metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1
index 8c62080118e1..bc5757aad0e5 100644
--- a/metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1
+++ b/metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/crypto-pubkey-types-0.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.3:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/rsa-2.0:=[profile?] <dev-haskell/rsa-2.5:=[profile?] >=dev-haskell/sha-1.4:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.6.0.1
 SRC_URI=https://hackage.haskell.org/package/authenticate-oauth-1.6.0.1/authenticate-oauth-1.6.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4518c92e86c83de7944ca550700e714d
diff --git a/metadata/md5-cache/dev-haskell/auto-update-0.1.6 b/metadata/md5-cache/dev-haskell/auto-update-0.1.6
index 8817563d9828..3951f2002e77 100644
--- a/metadata/md5-cache/dev-haskell/auto-update-0.1.6
+++ b/metadata/md5-cache/dev-haskell/auto-update-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.6
 SRC_URI=https://hackage.haskell.org/package/auto-update-0.1.6/auto-update-0.1.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=17161b5d53e1f0420b6bbdb364f93acb
diff --git a/metadata/md5-cache/dev-haskell/aws-0.22-r1 b/metadata/md5-cache/dev-haskell/aws-0.22-r1
index 803872ec4394..5f6a9049dff5 100644
--- a/metadata/md5-cache/dev-haskell/aws-0.22-r1
+++ b/metadata/md5-cache/dev-haskell/aws-0.22-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[prof
 RESTRICT=test
 SLOT=0/0.22
 SRC_URI=https://hackage.haskell.org/package/aws-0.22/aws-0.22.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=71201f1b01f2da3c5d45220ff40f5da7
diff --git a/metadata/md5-cache/dev-haskell/base-compat-0.11.1 b/metadata/md5-cache/dev-haskell/base-compat-0.11.1
index c54584ffe779..46dde2a488cb 100644
--- a/metadata/md5-cache/dev-haskell/base-compat-0.11.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-0.11.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.11.1
 SRC_URI=https://hackage.haskell.org/package/base-compat-0.11.1/base-compat-0.11.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3c4e9cccf5b2a94228a85ea01b36f933
diff --git a/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1 b/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
index 2580823c3c2f..8962f6e52089 100644
--- a/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-haskell/base-compat-0.11.1:=[profile?] >=dev-haskell/bifunctors-5.5
 RESTRICT=!test? ( test )
 SLOT=0/0.11.1
 SRC_URI=https://hackage.haskell.org/package/base-compat-batteries-0.11.1/base-compat-batteries-0.11.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ccf08d266b226a39f37bd2528cdc620c
diff --git a/metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0 b/metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0
index aec809dc7e79..661ef9ed8bca 100644
--- a/metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0
+++ b/metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.8.1:=
 SLOT=0/4.13.0.0
 SRC_URI=https://hackage.haskell.org/package/base-noprelude-4.13.0.0/base-noprelude-4.13.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e4ac3ae3ce273ae4cc5e77551520395d
diff --git a/metadata/md5-cache/dev-haskell/base-orphans-0.8.4 b/metadata/md5-cache/dev-haskell/base-orphans-0.8.4
index 14a16ba40c78..788adfdc3889 100644
--- a/metadata/md5-cache/dev-haskell/base-orphans-0.8.4
+++ b/metadata/md5-cache/dev-haskell/base-orphans-0.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.8.4
 SRC_URI=https://hackage.haskell.org/package/base-orphans-0.8.4/base-orphans-0.8.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=37ab137528349fa6f3296999b71145ae
diff --git a/metadata/md5-cache/dev-haskell/base-prelude-1.3 b/metadata/md5-cache/dev-haskell/base-prelude-1.3
index f636f0494cfe..21a707b2890c 100644
--- a/metadata/md5-cache/dev-haskell/base-prelude-1.3
+++ b/metadata/md5-cache/dev-haskell/base-prelude-1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.6.1:=
 SLOT=0/1.3
 SRC_URI=https://hackage.haskell.org/package/base-prelude-1.3/base-prelude-1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27e40cded3c734f7d12e22637a38e7b1
diff --git a/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.4.2 b/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.4.2
index dee988b81c62..8e8ddfcd3e2d 100644
--- a/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.4.2
+++ b/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.4.2
 SRC_URI=https://hackage.haskell.org/package/base-unicode-symbols-0.2.4.2/base-unicode-symbols-0.2.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=33384d4af0056f56017083d20e54852f
diff --git a/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7 b/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7
index 4585fe624e74..958c005f6f00 100644
--- a/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7
+++ b/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.7
 SRC_URI=https://hackage.haskell.org/package/base16-bytestring-0.1.1.7/base16-bytestring-0.1.1.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6db2e6b6e6e3eab02d77f584a0168cce
diff --git a/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3 b/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
index b4b04bfea897..1c13d74792ed 100644
--- a/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
+++ b/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0.3
 SRC_URI=https://hackage.haskell.org/package/base64-bytestring-1.0.0.3/base64-bytestring-1.0.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e53f6b838c5629c0c2f15bc96884f082
diff --git a/metadata/md5-cache/dev-haskell/basement-0.0.11 b/metadata/md5-cache/dev-haskell/basement-0.0.11
index 334f434a7519..97ae803fdc39 100644
--- a/metadata/md5-cache/dev-haskell/basement-0.0.11
+++ b/metadata/md5-cache/dev-haskell/basement-0.0.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 SLOT=0/0.0.11
 SRC_URI=https://hackage.haskell.org/package/basement-0.0.11/basement-0.0.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=899278eee12714379c3a6b7772554869
diff --git a/metadata/md5-cache/dev-haskell/basic-prelude-0.7.0 b/metadata/md5-cache/dev-haskell/basic-prelude-0.7.0
index f67ed9159830..355e4708529b 100644
--- a/metadata/md5-cache/dev-haskell/basic-prelude-0.7.0
+++ b/metadata/md5-cache/dev-haskell/basic-prelude-0.7.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/hashable:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.7.0
 SRC_URI=https://hackage.haskell.org/package/basic-prelude-0.7.0/basic-prelude-0.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=916c2e8cfbf9ddfc77afa7f22c5cd8aa
diff --git a/metadata/md5-cache/dev-haskell/bencode-0.6.1.1 b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
index ed58c840dc04..e5f6ae7e51ff 100644
--- a/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
+++ b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/parsec:=[profile?] >=dev-haskell/transformers-compat-0.4:=[p
 RESTRICT=!test? ( test )
 SLOT=0/0.6.1.1
 SRC_URI=https://hackage.haskell.org/package/bencode-0.6.1.1/bencode-0.6.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82186cf79d64aeb3c3e1a402c52391fb
diff --git a/metadata/md5-cache/dev-haskell/bifunctors-5.5.6 b/metadata/md5-cache/dev-haskell/bifunctors-5.5.6
index 83c7a76a1695..b248fdcf2352 100644
--- a/metadata/md5-cache/dev-haskell/bifunctors-5.5.6
+++ b/metadata/md5-cache/dev-haskell/bifunctors-5.5.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1
 RESTRICT=!test? ( test )
 SLOT=0/5.5.6
 SRC_URI=https://hackage.haskell.org/package/bifunctors-5.5.6/bifunctors-5.5.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eba402a5b6cb4df2475b782a6c0da16c
diff --git a/metadata/md5-cache/dev-haskell/binary-0.8.7.0 b/metadata/md5-cache/dev-haskell/binary-0.8.7.0
index 0874ac5bfae3..c32ae50c4bec 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.8.7.0
+++ b/metadata/md5-cache/dev-haskell/binary-0.8.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=test
 SLOT=0/0.8.7.0
 SRC_URI=https://hackage.haskell.org/package/binary-0.8.7.0/binary-0.8.7.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0210dda539e8e9f9596797b3126c060a
diff --git a/metadata/md5-cache/dev-haskell/binary-instances-1.0.0.1 b/metadata/md5-cache/dev-haskell/binary-instances-1.0.0.1
index 517a2ff23fa7..ba76775f556d 100644
--- a/metadata/md5-cache/dev-haskell/binary-instances-1.0.0.1
+++ b/metadata/md5-cache/dev-haskell/binary-instances-1.0.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile
 RESTRICT=test
 SLOT=0/1.0.0.1
 SRC_URI=https://hackage.haskell.org/package/binary-instances-1.0.0.1/binary-instances-1.0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=efe37556de5228842544dbba65f1783d
diff --git a/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1 b/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
index 35061bc440d2..49abc05ec05c 100644
--- a/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
+++ b/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=https://hackage.haskell.org/package/binary-orphans-1.0.1/binary-orphans-1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7e4c26653aad86d38f35ec165b7b37f8
diff --git a/metadata/md5-cache/dev-haskell/binary-tagged-0.2 b/metadata/md5-cache/dev-haskell/binary-tagged-0.2
index cd9be1863c84..c7c9f3b860ac 100644
--- a/metadata/md5-cache/dev-haskell/binary-tagged-0.2
+++ b/metadata/md5-cache/dev-haskell/binary-tagged-0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/0.2
 SRC_URI=https://hackage.haskell.org/package/binary-tagged-0.2/binary-tagged-0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50a357b56d98595fe749579e68b10e1d
diff --git a/metadata/md5-cache/dev-haskell/biocore-0.3.1 b/metadata/md5-cache/dev-haskell/biocore-0.3.1
index 0322ecdd1a72..7a652e5d491b 100644
--- a/metadata/md5-cache/dev-haskell/biocore-0.3.1
+++ b/metadata/md5-cache/dev-haskell/biocore-0.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-haskell/stringable:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/biocore-0.3.1/biocore-0.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=63b817f99576d441cf4df298025a466c
diff --git a/metadata/md5-cache/dev-haskell/biofasta-0.0.3 b/metadata/md5-cache/dev-haskell/biofasta-0.0.3
index 7ca7aef76167..1a8ec72e7a4f 100644
--- a/metadata/md5-cache/dev-haskell/biofasta-0.0.3
+++ b/metadata/md5-cache/dev-haskell/biofasta-0.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/biocore-0.3.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.3
 SRC_URI=https://hackage.haskell.org/package/biofasta-0.0.3/biofasta-0.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d5dce0dd43834ff9038b6072a64d1877
diff --git a/metadata/md5-cache/dev-haskell/biosff-0.3.7.1 b/metadata/md5-cache/dev-haskell/biosff-0.3.7.1
index c7d7f454171f..380230ab86cd 100644
--- a/metadata/md5-cache/dev-haskell/biosff-0.3.7.1
+++ b/metadata/md5-cache/dev-haskell/biosff-0.3.7.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/biocore-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= flower? ( dev-haskell/cmdargs:=[profile?] >=dev-haskell/mtl-2:=[profile?] )
 SLOT=0/0.3.7.1
 SRC_URI=https://hackage.haskell.org/package/biosff-0.3.7.1/biosff-0.3.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8567600b22f61d278a363158ea70b4e9
diff --git a/metadata/md5-cache/dev-haskell/bitarray-0.0.1.1 b/metadata/md5-cache/dev-haskell/bitarray-0.0.1.1
index 809021da7b5b..ed9203a72f82 100644
--- a/metadata/md5-cache/dev-haskell/bitarray-0.0.1.1
+++ b/metadata/md5-cache/dev-haskell/bitarray-0.0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1.1
 SRC_URI=https://hackage.haskell.org/package/bitarray-0.0.1.1/bitarray-0.0.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=edba6f0f544a8021e59cddfea565f392
diff --git a/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3-r1 b/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3-r1
index 4eeb4cadac09..2e50eb077ec7 100644
--- a/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3-r1
+++ b/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/bits-atomic-0.1.3/bits-atomic-0.1.3.tar.gz https://dev.gentoo.org/~slyfox/patches/bits-atomic-0.1.3-gcc-5.patch
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b1d058dc5c03487218b8a6d4e2a544b
diff --git a/metadata/md5-cache/dev-haskell/bitwise-1.0.0.1 b/metadata/md5-cache/dev-haskell/bitwise-1.0.0.1
index fe1103a16537..909d91c77a34 100644
--- a/metadata/md5-cache/dev-haskell/bitwise-1.0.0.1
+++ b/metadata/md5-cache/dev-haskell/bitwise-1.0.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0.1
 SRC_URI=https://hackage.haskell.org/package/bitwise-1.0.0.1/bitwise-1.0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=350e8d5065b45d05905299b34ba1a913
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0 b/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
index b7e06e381e04..ccebde64fbca 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/semigroups-0.16
 RESTRICT=!test? ( test )
 SLOT=0/0.4.1.0
 SRC_URI=https://hackage.haskell.org/package/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b3d1ccf3d1a431bfed7fc6868afd9e95
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.1.0 b/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.1.0
index 7ce33e0320a2..6326b8f7da1e 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.1.0
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/blaze-builder-conduit-1.1.0/blaze-builder-conduit-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=222a3c84ace92f045eaf53602d247003
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2 b/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
index 29dbac5a5bb2..41ba7a5e9bc9 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0
 RESTRICT=!test? ( test )
 SLOT=0/0.9.1.2
 SRC_URI=https://hackage.haskell.org/package/blaze-html-0.9.1.2/blaze-html-0.9.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=62f8e09f037e7bf8624cf45f69fa2365
diff --git a/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4 b/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
index 569f59d9ca50..a36d1275f407 100644
--- a/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
+++ b/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0
 RESTRICT=!test? ( test )
 SLOT=0/0.8.2.4
 SRC_URI=https://hackage.haskell.org/package/blaze-markup-0.8.2.4/blaze-markup-0.8.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8da098cae56fd211650df6067e311190
diff --git a/metadata/md5-cache/dev-haskell/blaze-textual-0.2.1.0 b/metadata/md5-cache/dev-haskell/blaze-textual-0.2.1.0
index 6899e1831cd9..d824203085d4 100644
--- a/metadata/md5-cache/dev-haskell/blaze-textual-0.2.1.0
+++ b/metadata/md5-cache/dev-haskell/blaze-textual-0.2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/double-con
 RESTRICT=test
 SLOT=0/0.2.1.0
 SRC_URI=https://hackage.haskell.org/package/blaze-textual-0.2.1.0/blaze-textual-0.2.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4904ea50d8df8cdef4ea0afbaba4274
diff --git a/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0 b/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
index ceb2406abba1..7c66836184fa 100644
--- a/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
+++ b/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.0.1.0
 SRC_URI=https://hackage.haskell.org/package/bloomfilter-2.0.1.0/bloomfilter-2.0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0de5adcafd0fe21e1ec6f3ae24435da4
diff --git a/metadata/md5-cache/dev-haskell/boolean-0.2.4 b/metadata/md5-cache/dev-haskell/boolean-0.2.4
index d26cdb07c044..3ae1a62500e6 100644
--- a/metadata/md5-cache/dev-haskell/boolean-0.2.4
+++ b/metadata/md5-cache/dev-haskell/boolean-0.2.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/Boolean-0.2.4/Boolean-0.2.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5cf2078b7b79ae805b846b98f2cefd06
diff --git a/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0 b/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
index 0c843f2b3613..2f5f0b8caef9 100644
--- a/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
+++ b/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.3.0
 SRC_URI=https://hackage.haskell.org/package/BoundedChan-1.0.3.0/BoundedChan-1.0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a15d7848e25177503663c7d3e340d875
diff --git a/metadata/md5-cache/dev-haskell/boxes-0.1.5 b/metadata/md5-cache/dev-haskell/boxes-0.1.5
index 8761154f0e80..79328f5ce260 100644
--- a/metadata/md5-cache/dev-haskell/boxes-0.1.5
+++ b/metadata/md5-cache/dev-haskell/boxes-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/0.1.5
 SRC_URI=https://hackage.haskell.org/package/boxes-0.1.5/boxes-0.1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f89299e7bd0a8fe6ed9092b6b0a09ab0
diff --git a/metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4 b/metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4
index aedeeefb4c6f..d48324848286 100644
--- a/metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4
+++ b/metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.0.4
 SRC_URI=https://hackage.haskell.org/package/bsb-http-chunked-0.0.0.4/bsb-http-chunked-0.0.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f1aedffeca95e4a1afe692e473968811
diff --git a/metadata/md5-cache/dev-haskell/byteable-0.1.1 b/metadata/md5-cache/dev-haskell/byteable-0.1.1
index f1648e9c6ea2..3ca87fe6ff2e 100644
--- a/metadata/md5-cache/dev-haskell/byteable-0.1.1
+++ b/metadata/md5-cache/dev-haskell/byteable-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/byteable-0.1.1/byteable-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=20c5a39a81ce10325c5ac40b98e4e5ee
diff --git a/metadata/md5-cache/dev-haskell/bytedump-1.0 b/metadata/md5-cache/dev-haskell/bytedump-1.0
index c0f0067c384d..8888996bbc24 100644
--- a/metadata/md5-cache/dev-haskell/bytedump-1.0
+++ b/metadata/md5-cache/dev-haskell/bytedump-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/bytedump-1.0/bytedump-1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f134c61318901ed1ac9922e1466e9322
diff --git a/metadata/md5-cache/dev-haskell/byteorder-1.0.4 b/metadata/md5-cache/dev-haskell/byteorder-1.0.4
index 7d7c2b6daea3..20b5249c0d0f 100644
--- a/metadata/md5-cache/dev-haskell/byteorder-1.0.4
+++ b/metadata/md5-cache/dev-haskell/byteorder-1.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.4
 SRC_URI=https://hackage.haskell.org/package/byteorder-1.0.4/byteorder-1.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7016caa59a040705abe1a1de8c6b5125
diff --git a/metadata/md5-cache/dev-haskell/bytes-0.17 b/metadata/md5-cache/dev-haskell/bytes-0.17
index b3c5f1f561b4..4d5470a60b2a 100644
--- a/metadata/md5-cache/dev-haskell/bytes-0.17
+++ b/metadata/md5-cache/dev-haskell/bytes-0.17
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orpha
 RESTRICT=test
 SLOT=0/0.17
 SRC_URI=https://hackage.haskell.org/package/bytes-0.17/bytes-0.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=698c31cdd6db246cf27ef9848f7db59f
diff --git a/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0 b/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0
index 15179f093817..2a5901643d84 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0
+++ b/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.10.8.2.0
 SRC_URI=https://hackage.haskell.org/package/bytestring-builder-0.10.8.2.0/bytestring-builder-0.10.8.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c55439bdcad75e3d9e07d36235f56842
diff --git a/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.6 b/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.6
index f82a517f74df..db3979165f62 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.6
+++ b/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.6
 SRC_URI=https://hackage.haskell.org/package/bytestring-handle-0.1.0.6/bytestring-handle-0.1.0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0f2e9858632fad66f413521f8e653978
diff --git a/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1 b/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
index afc07e82df1b..a2a8f18fe515 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
+++ b/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/bytestring-mmap-0.2.2/bytestring-mmap-0.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=999d6fbd822ab4d389c82304680a0159
diff --git a/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.6-r1 b/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.6-r1
index 333453573990..debd7ae0f6fb 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.6-r1
+++ b/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.5.6
 SRC_URI=https://hackage.haskell.org/package/bytestring-show-0.3.5.6/bytestring-show-0.3.5.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3cfb31423bbd4779c6e727712fecdb59
diff --git a/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0 b/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0
index 4f0ef4744c6f..ce33c832825c 100644
--- a/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/bzip2 >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.1.0
 SRC_URI=https://hackage.haskell.org/package/bzlib-0.5.1.0/bzlib-0.5.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b19c96b7be91768ea2dfeec7dc1f7c5
diff --git a/metadata/md5-cache/dev-haskell/c2hs-0.28.7 b/metadata/md5-cache/dev-haskell/c2hs-0.28.7
index 574a646bdbcd..6ff9ff05c991 100644
--- a/metadata/md5-cache/dev-haskell/c2hs-0.28.7
+++ b/metadata/md5-cache/dev-haskell/c2hs-0.28.7
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/dlist:= dev-haskell/fail:= >=dev-haskell/language-c-0.7.1:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/c2hs-0.28.7/c2hs-0.28.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3e0b3f0f426b4edf88a2ed9ec63a22b1
diff --git a/metadata/md5-cache/dev-haskell/c2hs-0.28.8 b/metadata/md5-cache/dev-haskell/c2hs-0.28.8
index 6e9e2e453b22..aa3b4fd2b07f 100644
--- a/metadata/md5-cache/dev-haskell/c2hs-0.28.8
+++ b/metadata/md5-cache/dev-haskell/c2hs-0.28.8
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/dlist:= >=dev-haskell/language-c-0.7.1:= <dev-haskell/langua
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/c2hs-0.28.8/c2hs-0.28.8.tar.gz
-_eclasses_=ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=769e91c9d60b04cc543ab94ce7512857
diff --git a/metadata/md5-cache/dev-haskell/cabal-3.0.1.0 b/metadata/md5-cache/dev-haskell/cabal-3.0.1.0
index dc149c08bc2c..c16c1e5909c7 100644
--- a/metadata/md5-cache/dev-haskell/cabal-3.0.1.0
+++ b/metadata/md5-cache/dev-haskell/cabal-3.0.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=test
 SLOT=0/3.0.1.0
 SRC_URI=https://hackage.haskell.org/package/Cabal-3.0.1.0/Cabal-3.0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=542459d828419f1849235f07b9ba3ffe
diff --git a/metadata/md5-cache/dev-haskell/cabal-3.2.1.0-r1 b/metadata/md5-cache/dev-haskell/cabal-3.2.1.0-r1
index a6975f476ee3..2297ee30915b 100644
--- a/metadata/md5-cache/dev-haskell/cabal-3.2.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/cabal-3.2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev
 RESTRICT=test
 SLOT=0/3.2.1.0
 SRC_URI=https://hackage.haskell.org/package/Cabal-3.2.1.0/Cabal-3.2.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=af9ae8217872bc2d730592a0c8f2d5f2
diff --git a/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8-r1 b/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8-r1
index 945d5b807083..d02b17343eb8 100644
--- a/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8-r1
+++ b/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.8
 SRC_URI=https://hackage.haskell.org/package/cabal-doctest-1.0.8/cabal-doctest-1.0.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b0dd2f8ba9fd0b841572596a1d66bf90
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0 b/metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0
index 9cdd0bf7af70..57972a6994d0 100644
--- a/metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0
+++ b/metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:= >=dev-haskell/binary-0.7.3:= <dev-haskell/binary-0.9:= >=dev-haskell/cabal-3.0:= <dev-haskell/cabal-3.1:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:= >=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:= >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-2.6:= <dev-haskell/network-3.2:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/cabal-install-3.0.0.0/cabal-install-3.0.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=445017a12a0f07e89409b9c06b28865f
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0 b/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0
index 5e0f52582469..6cb31ed0e825 100644
--- a/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0
+++ b/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:= >=dev-haskell/cabal-3.2:= <dev-haskell/cabal-3.3:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:= >=dev-haskell/hackage-security-0.6.0.0:= <dev-haskell/hackage-security-0.7:= >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-2.6:= <dev-haskell/network-3.2:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/semigroups-0.18.3:= <dev-haskell/semigroups-0.20:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/cabal-install-3.2.0.0/cabal-install-3.2.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f68e1e4a548cccc481cfc70e8232461
diff --git a/metadata/md5-cache/dev-haskell/cairo-0.13.8.1 b/metadata/md5-cache/dev-haskell/cairo-0.13.8.1
index 24d6580df7dd..b6cd8d7901df 100644
--- a/metadata/md5-cache/dev-haskell/cairo-0.13.8.1
+++ b/metadata/md5-cache/dev-haskell/cairo-0.13.8.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.10.1:= x11-libs/cairo
 SLOT=0/0.13.8.1
 SRC_URI=https://hackage.haskell.org/package/cairo-0.13.8.1/cairo-0.13.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=12c5eb7278018838f5b7f3af334160ab
diff --git a/metadata/md5-cache/dev-haskell/cairo-0.13.8.1-r1 b/metadata/md5-cache/dev-haskell/cairo-0.13.8.1-r1
index 4074131abdcd..4c4638122eb9 100644
--- a/metadata/md5-cache/dev-haskell/cairo-0.13.8.1-r1
+++ b/metadata/md5-cache/dev-haskell/cairo-0.13.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.10.1:= x11-libs/cairo
 SLOT=0/0.13.8.1
 SRC_URI=https://hackage.haskell.org/package/cairo-0.13.8.1/cairo-0.13.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9041ea0f0a19798acf10b07e7a04ba2e
diff --git a/metadata/md5-cache/dev-haskell/call-stack-0.2.0 b/metadata/md5-cache/dev-haskell/call-stack-0.2.0
index 1a2d13a6aef1..199971b542f2 100644
--- a/metadata/md5-cache/dev-haskell/call-stack-0.2.0
+++ b/metadata/md5-cache/dev-haskell/call-stack-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/call-stack-0.2.0/call-stack-0.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=af5642338f3f9709ae009b48efbeb593
diff --git a/metadata/md5-cache/dev-haskell/casa-client-0.0.1 b/metadata/md5-cache/dev-haskell/casa-client-0.0.1
index 8f2efc21313a..8c5998ed04da 100644
--- a/metadata/md5-cache/dev-haskell/casa-client-0.0.1
+++ b/metadata/md5-cache/dev-haskell/casa-client-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/casa-types:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/casa-client-0.0.1/casa-client-0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc75c0ebacb6b07da6b500cf870b4776
diff --git a/metadata/md5-cache/dev-haskell/casa-types-0.0.1 b/metadata/md5-cache/dev-haskell/casa-types-0.0.1
index 0c0f0039010b..9722bed8b942 100644
--- a/metadata/md5-cache/dev-haskell/casa-types-0.0.1
+++ b/metadata/md5-cache/dev-haskell/casa-types-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/path-pieces:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/casa-types-0.0.1/casa-types-0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac0d7469aeb3f502bb1441882f67bbb0
diff --git a/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0 b/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0
index fbc289324709..51d794b37080 100644
--- a/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0
+++ b/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.0:=[profile?] >=dev-haskell/semigroups-0.18:=[p
 RESTRICT=!test? ( test )
 SLOT=0/1.2.1.0
 SRC_URI=https://hackage.haskell.org/package/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b15f6f66d7306c0afe9c62777380a8be
diff --git a/metadata/md5-cache/dev-haskell/cassava-0.5.2.0 b/metadata/md5-cache/dev-haskell/cassava-0.5.2.0
index 42e3db17b240..f525d5559ddf 100644
--- a/metadata/md5-cache/dev-haskell/cassava-0.5.2.0
+++ b/metadata/md5-cache/dev-haskell/cassava-0.5.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.
 RESTRICT=!test? ( test )
 SLOT=0/0.5.2.0
 SRC_URI=https://hackage.haskell.org/package/cassava-0.5.2.0/cassava-0.5.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=29c0a4aaf1f3f01b2edc58955e2c52fc
diff --git a/metadata/md5-cache/dev-haskell/cereal-0.5.8.1 b/metadata/md5-cache/dev-haskell/cereal-0.5.8.1
index 952ff20f0f88..9e9474f22b15 100644
--- a/metadata/md5-cache/dev-haskell/cereal-0.5.8.1
+++ b/metadata/md5-cache/dev-haskell/cereal-0.5.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestr
 RESTRICT=!test? ( test )
 SLOT=0/0.5.8.1
 SRC_URI=https://hackage.haskell.org/package/cereal-0.5.8.1/cereal-0.5.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=31b918aba2b3bd1f7fcb9a4f61d2e169
diff --git a/metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1 b/metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1
index 7d61cbfb14ae..bf4ecf105695 100644
--- a/metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0.1
 SRC_URI=https://hackage.haskell.org/package/cereal-vector-0.2.0.1/cereal-vector-0.2.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0916e79bebe17da833dfe45cda6275b7
diff --git a/metadata/md5-cache/dev-haskell/cgi-3001.5.0.0 b/metadata/md5-cache/dev-haskell/cgi-3001.5.0.0
index a09bedfbd2a4..b107b9d8595d 100644
--- a/metadata/md5-cache/dev-haskell/cgi-3001.5.0.0
+++ b/metadata/md5-cache/dev-haskell/cgi-3001.5.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.10:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >dev-haskell/mtl-2.2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.3:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/3001.5.0.0
 SRC_URI=https://hackage.haskell.org/package/cgi-3001.5.0.0/cgi-3001.5.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=29420492e903bd28ed9420db54d1917a
diff --git a/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1 b/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
index 3c86a8682d99..ad10ff75d9bb 100644
--- a/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
+++ b/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/unordered-containers-0.1.4.6:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.7.1
 SRC_URI=https://hackage.haskell.org/package/charset-0.3.7.1/charset-0.3.7.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=39dd362f834d98ddb3d172a87c39adcd
diff --git a/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5 b/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5
index 22b2dbdb04a7..90ed3f2d81d8 100644
--- a/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5
+++ b/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0.5
 SRC_URI=https://hackage.haskell.org/package/chaselev-deque-0.5.0.5/chaselev-deque-0.5.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f3d438498b269bb80c562c495d33151
diff --git a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9 b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9
index f9587667ea7e..340afd25e577 100644
--- a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9
+++ b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-h
 RESTRICT=!test? ( test )
 SLOT=0/1.3.1.9
 SRC_URI=https://hackage.haskell.org/package/ChasingBottoms-1.3.1.9/ChasingBottoms-1.3.1.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3118f6e3fdf9a7b8a0efd446f39b6b9e
diff --git a/metadata/md5-cache/dev-haskell/chell-0.4.0.2 b/metadata/md5-cache/dev-haskell/chell-0.4.0.2
index c6adc92acf3c..dc478ed2872b 100644
--- a/metadata/md5-cache/dev-haskell/chell-0.4.0.2
+++ b/metadata/md5-cache/dev-haskell/chell-0.4.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?] >=dev-haskell/patience-0.1:=[profile?] <dev-haskell/patience-0.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.8.2:= color-output? ( >=dev-haskell/ansi-terminal-0.5:=[profile?] )
 SLOT=0/0.4.0.2
 SRC_URI=https://hackage.haskell.org/package/chell-0.4.0.2/chell-0.4.0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27113fb5a8fbf909d101a84bbd25b0fb
diff --git a/metadata/md5-cache/dev-haskell/chimera-0.3.1.0 b/metadata/md5-cache/dev-haskell/chimera-0.3.1.0
index 3e897cbcf144..15e611818b7c 100644
--- a/metadata/md5-cache/dev-haskell/chimera-0.3.1.0
+++ b/metadata/md5-cache/dev-haskell/chimera-0.3.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= representable? ( d
 RESTRICT=!test? ( test )
 SLOT=0/0.3.1.0
 SRC_URI=https://hackage.haskell.org/package/chimera-0.3.1.0/chimera-0.3.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd0c3d6506a9d603aa4837ff5d38d8ff
diff --git a/metadata/md5-cache/dev-haskell/chunked-data-0.3.0 b/metadata/md5-cache/dev-haskell/chunked-data-0.3.0
index a898490ce1de..edd4f685bbc2 100644
--- a/metadata/md5-cache/dev-haskell/chunked-data-0.3.0
+++ b/metadata/md5-cache/dev-haskell/chunked-data-0.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/semigroups:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/chunked-data-0.3.0/chunked-data-0.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6faa5b313a7c864a377d88146636b23e
diff --git a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11 b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
index 20c29aead57b..32f50a783f39 100644
--- a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
+++ b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.6
 RESTRICT=!test? ( test )
 SLOT=0/0.2.11
 SRC_URI=https://hackage.haskell.org/package/cipher-aes-0.2.11/cipher-aes-0.2.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=564ec9f2ce2c909ba9c7ad230ec4c30f
diff --git a/metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1 b/metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1
index 3865caa74a88..7de80b8899b4 100644
--- a/metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.7.0.5
 SRC_URI=https://hackage.haskell.org/package/cipher-aes128-0.7.0.5/cipher-aes128-0.7.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8df3e3492c5ee1807964093cc53a306b
diff --git a/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2 b/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2
index 217ba850f278..a453861a4fa1 100644
--- a/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2
+++ b/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3
 RESTRICT=!test? ( test )
 SLOT=0/0.0.2
 SRC_URI=https://hackage.haskell.org/package/cipher-camellia-0.0.2/cipher-camellia-0.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=93f5bd893e8f5af83e2ff6f5acf5893d
diff --git a/metadata/md5-cache/dev-haskell/cipher-des-0.0.6 b/metadata/md5-cache/dev-haskell/cipher-des-0.0.6
index 047882807059..4b5b5452de9a 100644
--- a/metadata/md5-cache/dev-haskell/cipher-des-0.0.6
+++ b/metadata/md5-cache/dev-haskell/cipher-des-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3
 RESTRICT=!test? ( test )
 SLOT=0/0.0.6
 SRC_URI=https://hackage.haskell.org/package/cipher-des-0.0.6/cipher-des-0.0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56c349c54de50f546e5e8b272447cd15
diff --git a/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4 b/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4
index d493c653e397..d1d3390420a8 100644
--- a/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4
+++ b/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.5
 RESTRICT=!test? ( test )
 SLOT=0/0.1.4
 SRC_URI=https://hackage.haskell.org/package/cipher-rc4-0.1.4/cipher-rc4-0.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9444852d47030bc05d884ba90454eb7f
diff --git a/metadata/md5-cache/dev-haskell/citeproc-0.3.0.9 b/metadata/md5-cache/dev-haskell/citeproc-0.3.0.9
index 23b06e9ce140..8e63e125debd 100644
--- a/metadata/md5-cache/dev-haskell/citeproc-0.3.0.9
+++ b/metadata/md5-cache/dev-haskell/citeproc-0.3.0.9
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-h
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0.9
 SRC_URI=https://hackage.haskell.org/package/citeproc-0.3.0.9/citeproc-0.3.0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2cca6e7a1baedb827b8419c74b62f0b8
diff --git a/metadata/md5-cache/dev-haskell/classy-prelude-1.5.0 b/metadata/md5-cache/dev-haskell/classy-prelude-1.5.0
index 85618145e769..efcd57d104a2 100644
--- a/metadata/md5-cache/dev-haskell/classy-prelude-1.5.0
+++ b/metadata/md5-cache/dev-haskell/classy-prelude-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/basic-prelude-0.7:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/1.5.0
 SRC_URI=https://hackage.haskell.org/package/classy-prelude-1.5.0/classy-prelude-1.5.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=135ee6ea6198a87602879a706b63094f
diff --git a/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2 b/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
index a7c2580f1ca4..6bf16488d94b 100644
--- a/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
+++ b/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] >=dev-haskell/cereal
 RESTRICT=!test? ( test )
 SLOT=0/0.9.1.2
 SRC_URI=https://hackage.haskell.org/package/clientsession-0.9.1.2/clientsession-0.9.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61254601780da2cd91b361f908182bab
diff --git a/metadata/md5-cache/dev-haskell/clock-0.7.2 b/metadata/md5-cache/dev-haskell/clock-0.7.2
index d019711482c8..942f059c4df3 100644
--- a/metadata/md5-cache/dev-haskell/clock-0.7.2
+++ b/metadata/md5-cache/dev-haskell/clock-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.7.2
 SRC_URI=https://hackage.haskell.org/package/clock-0.7.2/clock-0.7.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=97f2e61d85994ce4273ef4c931f07baf
diff --git a/metadata/md5-cache/dev-haskell/cmark-0.6 b/metadata/md5-cache/dev-haskell/cmark-0.6
index dc69b470c4fe..3a1baee94944 100644
--- a/metadata/md5-cache/dev-haskell/cmark-0.6
+++ b/metadata/md5-cache/dev-haskell/cmark-0.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=d
 RESTRICT=!test? ( test )
 SLOT=0/0.6
 SRC_URI=https://hackage.haskell.org/package/cmark-0.6/cmark-0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5b27f315631a19ad2d188438e0e62d16
diff --git a/metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1 b/metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1
index 7499bf2a5093..2ab5ef1e0d9c 100644
--- a/metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1
+++ b/metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=d
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1
 SRC_URI=https://hackage.haskell.org/package/cmark-gfm-0.2.1/cmark-gfm-0.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=839883ce18022b62f30b578cc69d4dcb
diff --git a/metadata/md5-cache/dev-haskell/cmdargs-0.10.20 b/metadata/md5-cache/dev-haskell/cmdargs-0.10.20
index cc54cfe01763..4a8a574beda0 100644
--- a/metadata/md5-cache/dev-haskell/cmdargs-0.10.20
+++ b/metadata/md5-cache/dev-haskell/cmdargs-0.10.20
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.18:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.10.20
 SRC_URI=https://hackage.haskell.org/package/cmdargs-0.10.20/cmdargs-0.10.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d57d51d8c6858ed82c88ddf83a8790c9
diff --git a/metadata/md5-cache/dev-haskell/code-page-0.1.3 b/metadata/md5-cache/dev-haskell/code-page-0.1.3
index 63339770321e..543f27aca452 100644
--- a/metadata/md5-cache/dev-haskell/code-page-0.1.3
+++ b/metadata/md5-cache/dev-haskell/code-page-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/code-page-0.1.3/code-page-0.1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=939c8762018d4085602e8be836c3b5dc
diff --git a/metadata/md5-cache/dev-haskell/colour-2.3.5 b/metadata/md5-cache/dev-haskell/colour-2.3.5
index 702abe101ecb..9a41d6e9aeb9 100644
--- a/metadata/md5-cache/dev-haskell/colour-2.3.5
+++ b/metadata/md5-cache/dev-haskell/colour-2.3.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.0.1:=
 RESTRICT=test
 SLOT=0/2.3.5
 SRC_URI=https://hackage.haskell.org/package/colour-2.3.5/colour-2.3.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c47fcf559a35c2c9934911cc562df0aa
diff --git a/metadata/md5-cache/dev-haskell/commonmark-0.1.1.4 b/metadata/md5-cache/dev-haskell/commonmark-0.1.1.4
index 0994fd310090..60ddf618a1b8 100644
--- a/metadata/md5-cache/dev-haskell/commonmark-0.1.1.4
+++ b/metadata/md5-cache/dev-haskell/commonmark-0.1.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/g
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.4
 SRC_URI=https://hackage.haskell.org/package/commonmark-0.1.1.4/commonmark-0.1.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb506de2ff8b6bb0d637a8f8359e4c77
diff --git a/metadata/md5-cache/dev-haskell/commonmark-extensions-0.2.0.4 b/metadata/md5-cache/dev-haskell/commonmark-extensions-0.2.0.4
index cd6484cf6679..6baffbfc0420 100644
--- a/metadata/md5-cache/dev-haskell/commonmark-extensions-0.2.0.4
+++ b/metadata/md5-cache/dev-haskell/commonmark-extensions-0.2.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/commonmark-0.1.1.2:=[profile?] <dev-haskell/commonmark-0.2
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0.4
 SRC_URI=https://hackage.haskell.org/package/commonmark-extensions-0.2.0.4/commonmark-extensions-0.2.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d487a1e4c9ab1b8d3118a5670f646e2e
diff --git a/metadata/md5-cache/dev-haskell/commonmark-pandoc-0.2.0.1 b/metadata/md5-cache/dev-haskell/commonmark-pandoc-0.2.0.1
index e0ee92d7af16..87cafbc21582 100644
--- a/metadata/md5-cache/dev-haskell/commonmark-pandoc-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/commonmark-pandoc-0.2.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/commonmark-0.1:=[profile?] <dev-haskell/commonmark-0.2:=[profile?] >=dev-haskell/commonmark-extensions-0.2:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] >=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/0.2.0.1
 SRC_URI=https://hackage.haskell.org/package/commonmark-pandoc-0.2.0.1/commonmark-pandoc-0.2.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=531da0d319d85048530e3744a13f8e40
diff --git a/metadata/md5-cache/dev-haskell/comonad-5.0.7 b/metadata/md5-cache/dev-haskell/comonad-5.0.7
index 4c5f1f97d5d5..6645135f3d21 100644
--- a/metadata/md5-cache/dev-haskell/comonad-5.0.7
+++ b/metadata/md5-cache/dev-haskell/comonad-5.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1
 RESTRICT=test
 SLOT=0/5.0.7
 SRC_URI=https://hackage.haskell.org/package/comonad-5.0.7/comonad-5.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d095532c6e85dd13aabb5b29c1e5cb3a
diff --git a/metadata/md5-cache/dev-haskell/comonad-transformers-4.0 b/metadata/md5-cache/dev-haskell/comonad-transformers-4.0
index 2479c22982d7..efcc6f9b0911 100644
--- a/metadata/md5-cache/dev-haskell/comonad-transformers-4.0
+++ b/metadata/md5-cache/dev-haskell/comonad-transformers-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.0
 SRC_URI=https://hackage.haskell.org/package/comonad-transformers-4.0/comonad-transformers-4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35a2a57a4bc1dd40e2adc950968ae2fa
diff --git a/metadata/md5-cache/dev-haskell/comonads-fd-4.0 b/metadata/md5-cache/dev-haskell/comonads-fd-4.0
index 9750df4d98b4..e6aab7b8eb96 100644
--- a/metadata/md5-cache/dev-haskell/comonads-fd-4.0
+++ b/metadata/md5-cache/dev-haskell/comonads-fd-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.0
 SRC_URI=https://hackage.haskell.org/package/comonads-fd-4.0/comonads-fd-4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b73c2133f66c10e14b6754b8f6294e0
diff --git a/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.12 b/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.12
index f093d813ba5d..95e1fcc15b0d 100644
--- a/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.12
+++ b/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/stm-2.1.2.1:=[profile?] >=dev-haskell/unbounded-delays-0.1
 RESTRICT=test
 SLOT=0/0.7.0.12
 SRC_URI=https://hackage.haskell.org/package/concurrent-extra-0.7.0.12/concurrent-extra-0.7.0.12.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b3dfb01a6afa2fed559a8d2e7e9f944e
diff --git a/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11 b/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
index 713ff7a05d3d..1c41e7a78ef7 100644
--- a/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
+++ b/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.11.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.11.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/1.10.11
 SRC_URI=https://hackage.haskell.org/package/concurrent-output-1.10.11/concurrent-output-1.10.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4b43f94cac107ca35dedbaea0578068
diff --git a/metadata/md5-cache/dev-haskell/conduit-1.3.4 b/metadata/md5-cache/dev-haskell/conduit-1.3.4
index 3c6065aba50c..5db3bc81160c 100644
--- a/metadata/md5-cache/dev-haskell/conduit-1.3.4
+++ b/metadata/md5-cache/dev-haskell/conduit-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/exceptions:=[profile?] >=dev-haskell/mono-traversable-1.0.7:
 RESTRICT=!test? ( test )
 SLOT=0/1.3.4
 SRC_URI=https://hackage.haskell.org/package/conduit-1.3.4/conduit-1.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=779ac11c649cf6887616d90aa65c3e56
diff --git a/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0 b/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
index e076562440c6..daaf1c8d3c91 100644
--- a/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
+++ b/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 SLOT=0/1.3.0
 SRC_URI=https://hackage.haskell.org/package/conduit-combinators-1.3.0/conduit-combinators-1.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2e0634bcb22bad12ffa820b802e9f154
diff --git a/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4 b/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
index fad9a1f109c7..6ce504a6bb4f 100644
--- a/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
+++ b/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?]
 RESTRICT=test
 SLOT=0/1.3.4
 SRC_URI=https://hackage.haskell.org/package/conduit-extra-1.3.4/conduit-extra-1.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa35331dac65cb519f3b125ceefac2bd
diff --git a/metadata/md5-cache/dev-haskell/configfile-1.1.4 b/metadata/md5-cache/dev-haskell/configfile-1.1.4
index a3c5209980a8..770074cf28be 100644
--- a/metadata/md5-cache/dev-haskell/configfile-1.1.4
+++ b/metadata/md5-cache/dev-haskell/configfile-1.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/missingh-1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.4
 SRC_URI=https://hackage.haskell.org/package/ConfigFile-1.1.4/ConfigFile-1.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6990f88a16ca87a9c788ea8cefd73546
diff --git a/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1 b/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1
index a46a8393810d..1348dc75baab 100644
--- a/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.0.2:=[profile?] dev-haskell/hashable:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0.0
 SRC_URI=https://hackage.haskell.org/package/configurator-0.3.0.0/configurator-0.3.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=963a9855d0913414af94a32bea793822
diff --git a/metadata/md5-cache/dev-haskell/connection-0.3.1 b/metadata/md5-cache/dev-haskell/connection-0.3.1
index b77e0654fe46..e37d19ce3ea9 100644
--- a/metadata/md5-cache/dev-haskell/connection-0.3.1
+++ b/metadata/md5-cache/dev-haskell/connection-0.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/basement:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/network-2.6.3:=[profile?] >=dev-haskell/socks-0.6:=[profile?] >=dev-haskell/tls-1.4:=[profile?] >=dev-haskell/x509-1.5:=[profile?] >=dev-haskell/x509-store-1.5:=[profile?] >=dev-haskell/x509-system-1.5:=[profile?] >=dev-haskell/x509-validation-1.5:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/connection-0.3.1/connection-0.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b853cb919f73194bfd2872f90ccb4508
diff --git a/metadata/md5-cache/dev-haskell/constraints-0.11.2 b/metadata/md5-cache/dev-haskell/constraints-0.11.2
index d56f0b2af970..44088c9e08e5 100644
--- a/metadata/md5-cache/dev-haskell/constraints-0.11.2
+++ b/metadata/md5-cache/dev-haskell/constraints-0.11.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profi
 RESTRICT=!test? ( test )
 SLOT=0/0.11.2
 SRC_URI=https://hackage.haskell.org/package/constraints-0.11.2/constraints-0.11.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9bd6e36f705aa9b1750fa3d1c769977d
diff --git a/metadata/md5-cache/dev-haskell/contravariant-1.5.2 b/metadata/md5-cache/dev-haskell/contravariant-1.5.2
index 029395977892..3d3044e561e1 100644
--- a/metadata/md5-cache/dev-haskell/contravariant-1.5.2
+++ b/metadata/md5-cache/dev-haskell/contravariant-1.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) statevar? ( >=dev-haskell/statevar-1.1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
 SLOT=0/1.5.2
 SRC_URI=https://hackage.haskell.org/package/contravariant-1.5.2/contravariant-1.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fbdf1f96309dd03fa67d5c944e04d068
diff --git a/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2 b/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2
index 47bf3d3d792c..a3a5665e3e73 100644
--- a/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2
+++ b/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/template-haskell-compat-v0208-0.1.4:=[profile?] <dev-haskell/template-haskell-compat-v0208-2:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/0.3.5.2
 SRC_URI=https://hackage.haskell.org/package/contravariant-extras-0.3.5.2/contravariant-extras-0.3.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0e2c783a85b58e03c065e5bcb17687c7
diff --git a/metadata/md5-cache/dev-haskell/control-monad-loop-0.1 b/metadata/md5-cache/dev-haskell/control-monad-loop-0.1
index 37c460915494..316ddcf657c5 100644
--- a/metadata/md5-cache/dev-haskell/control-monad-loop-0.1
+++ b/metadata/md5-cache/dev-haskell/control-monad-loop-0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/control-monad-loop-0.1/control-monad-loop-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9b7d89044c192ac1342dd0a97ea99655
diff --git a/metadata/md5-cache/dev-haskell/convertible-1.1.1.0 b/metadata/md5-cache/dev-haskell/convertible-1.1.1.0
index ddf9027c1b89..bc8b4cdb0bad 100644
--- a/metadata/md5-cache/dev-haskell/convertible-1.1.1.0
+++ b/metadata/md5-cache/dev-haskell/convertible-1.1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.1.0
 SRC_URI=https://hackage.haskell.org/package/convertible-1.1.1.0/convertible-1.1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56c16b1163236be4a5cfd5688d9d9bf8
diff --git a/metadata/md5-cache/dev-haskell/cookie-0.4.4 b/metadata/md5-cache/dev-haskell/cookie-0.4.4
index 599470fa83cc..db838bb84f19 100644
--- a/metadata/md5-cache/dev-haskell/cookie-0.4.4
+++ b/metadata/md5-cache/dev-haskell/cookie-0.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-haskell/text-1.1:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.4.4
 SRC_URI=https://hackage.haskell.org/package/cookie-0.4.4/cookie-0.4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=501d043f768cd13d86a962d0f01bd7a1
diff --git a/metadata/md5-cache/dev-haskell/cpphs-1.20.9.1 b/metadata/md5-cache/dev-haskell/cpphs-1.20.9.1
index ae3eda528509..b53d377847d3 100644
--- a/metadata/md5-cache/dev-haskell/cpphs-1.20.9.1
+++ b/metadata/md5-cache/dev-haskell/cpphs-1.20.9.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/polyparse-1.13:=[profile?] <dev-haskell/polyparse-1.14:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.20.9.1
 SRC_URI=https://hackage.haskell.org/package/cpphs-1.20.9.1/cpphs-1.20.9.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a500cfced350c9b97cdb9d6ede8da60b
diff --git a/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1 b/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
index 1ba0f50aef56..e1c75039d82b 100644
--- a/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
+++ b/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cipher-aes-0.2.9:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.1
 SRC_URI=https://hackage.haskell.org/package/cprng-aes-0.6.1/cprng-aes-0.6.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50a3104f6267bc58beefd0c7e532d31a
diff --git a/metadata/md5-cache/dev-haskell/cpu-0.1.2 b/metadata/md5-cache/dev-haskell/cpu-0.1.2
index 38da73bd08a6..f045ff4e75dc 100644
--- a/metadata/md5-cache/dev-haskell/cpu-0.1.2
+++ b/metadata/md5-cache/dev-haskell/cpu-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/cpu-0.1.2/cpu-0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb46162f31e9ff8232d589fcdb108678
diff --git a/metadata/md5-cache/dev-haskell/criterion-1.5.6.2 b/metadata/md5-cache/dev-haskell/criterion-1.5.6.2
index bc345a86d6b6..85e60f675bcb 100644
--- a/metadata/md5-cache/dev-haskell/criterion-1.5.6.2
+++ b/metadata/md5-cache/dev-haskell/criterion-1.5.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2
 RESTRICT=!test? ( test )
 SLOT=0/1.5.6.2
 SRC_URI=https://hackage.haskell.org/package/criterion-1.5.6.2/criterion-1.5.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b84dc875c6d28be7928a9f93121079f
diff --git a/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0 b/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
index 8390ec2f2127..6e3188776673 100644
--- a/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/criterion-measurement-0.1.2.0/criterion-measurement-0.1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c5447d778c9e94e8863b7c8ac8029329
diff --git a/metadata/md5-cache/dev-haskell/crypto-4.2.5.1-r1 b/metadata/md5-cache/dev-haskell/crypto-4.2.5.1-r1
index 126ab30a7d00..8b612a5d89d1 100644
--- a/metadata/md5-cache/dev-haskell/crypto-4.2.5.1-r1
+++ b/metadata/md5-cache/dev-haskell/crypto-4.2.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4.0.1:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.2.5.1
 SRC_URI=https://hackage.haskell.org/package/Crypto-4.2.5.1/Crypto-4.2.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5dbe3cdb1bc4feb5fc910dcde82d33e9
diff --git a/metadata/md5-cache/dev-haskell/crypto-api-0.13.3 b/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
index 2bfc7e7c311e..7bbe874772b8 100644
--- a/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
+++ b/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/0.13.3
 SRC_URI=https://hackage.haskell.org/package/crypto-api-0.13.3/crypto-api-0.13.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=222dce1fb4da5874123833a5dba5b6a4
diff --git a/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1 b/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
index d503e1f5ad92..043564cca2d7 100644
--- a/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
+++ b/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/test-framework-0.4:=[profile?] >=dev-haskell/test-framework-hunit-0.2:=[profile?] >=dev-haskell/test-framework-quickcheck2-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/crypto-api-tests-0.3/crypto-api-tests-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=29e8d101ac639374458bb93cf085867c
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1 b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
index 46ed4360384f..0a3c23b0f94a 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.0.11
 SRC_URI=https://hackage.haskell.org/package/crypto-cipher-tests-0.0.11/crypto-cipher-tests-0.0.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6d2e2b1e5bbdf9f7e9acd90e5b195496
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9 b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
index 403202d0986c..6c078a24dd82 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.9
 SRC_URI=https://hackage.haskell.org/package/crypto-cipher-types-0.0.9/crypto-cipher-types-0.0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cfb20d4d08657619b69967d40e2a82ea
diff --git a/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.7 b/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.7
index cfbb32fe8a0c..bf0653bf54ba 100644
--- a/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.7
+++ b/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0
 RESTRICT=!test? ( test )
 SLOT=0/0.2.7
 SRC_URI=https://hackage.haskell.org/package/crypto-numbers-0.2.7/crypto-numbers-0.2.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5b603b93fa954bb975543ff06f09940
diff --git a/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.8 b/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.8
index 7a71f5e2b645..8e59bba14573 100644
--- a/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.8
+++ b/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.8
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-numbers-0.2.2:=[pr
 RESTRICT=test
 SLOT=0/0.2.8
 SRC_URI=https://hackage.haskell.org/package/crypto-pubkey-0.2.8/crypto-pubkey-0.2.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cb2d2e75e2181839c858d7584c582e1e
diff --git a/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.3 b/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.3
index e8b4020c60aa..9b3ca1dcf5e0 100644
--- a/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.3
+++ b/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.3
 SRC_URI=https://hackage.haskell.org/package/crypto-pubkey-types-0.4.3/crypto-pubkey-types-0.4.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=198febb5a38fe15ba457d800688055a9
diff --git a/metadata/md5-cache/dev-haskell/crypto-random-0.0.9 b/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
index f95a61b042a3..4544c5989144 100644
--- a/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
+++ b/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/securemem:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.9
 SRC_URI=https://hackage.haskell.org/package/crypto-random-0.0.9/crypto-random-0.0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9fb4227cbc86899d4f4ef55d84a2ad09
diff --git a/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0 b/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0
index 685992331d32..a45203492637 100644
--- a/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0
+++ b/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/entropy:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/crypto-random-api-0.2.0/crypto-random-api-0.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8bb65f9753e97cfc4608a53b0d5430ed
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-0.11.9 b/metadata/md5-cache/dev-haskell/cryptohash-0.11.9
index d2461ad6b4a3..99821995880d 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-0.11.9
+++ b/metadata/md5-cache/dev-haskell/cryptohash-0.11.9
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.11.9
 SRC_URI=https://hackage.haskell.org/package/cryptohash-0.11.9/cryptohash-0.11.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a6bb0a3cdaa71dbc2f5b43e607fed80d
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-conduit-0.1.1 b/metadata/md5-cache/dev-haskell/cryptohash-conduit-0.1.1
index b05064d4294b..b99450fb0b78 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-conduit-0.1.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-conduit-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/cryptohash-conduit-0.1.1/cryptohash-conduit-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b43d75511dbadc013f0077e764b0029
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.4 b/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.4
index 75a7302b4eef..90051d5d5995 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.4
+++ b/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.11:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.4
 SRC_URI=https://hackage.haskell.org/package/cryptohash-cryptoapi-0.1.4/cryptohash-cryptoapi-0.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd620c63a97412d65588b935db9c7095
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1 b/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
index 580a8d764027..98118cd0a49c 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.100.1
 SRC_URI=https://hackage.haskell.org/package/cryptohash-md5-0.11.100.1/cryptohash-md5-0.11.100.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f651e5f5a5407a62c0adb3f6bd504fdf
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1 b/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
index a9e224338628..50bec0a9ba87 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.100.1
 SRC_URI=https://hackage.haskell.org/package/cryptohash-sha1-0.11.100.1/cryptohash-sha1-0.11.100.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d4da5e2af7596ae7a0de2b262121d083
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0 b/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
index b35a7231c7df..da9f366f3d07 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
+++ b/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.101.0
 SRC_URI=https://hackage.haskell.org/package/cryptohash-sha256-0.11.101.0/cryptohash-sha256-0.11.101.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d51d3042a188d3c36b4cb98182079ac2
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-0.26-r1 b/metadata/md5-cache/dev-haskell/cryptonite-0.26-r1
index c813277abf67..61670ebd3bc8 100644
--- a/metadata/md5-cache/dev-haskell/cryptonite-0.26-r1
+++ b/metadata/md5-cache/dev-haskell/cryptonite-0.26-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/basement-0.0.6:=[profile?] >=dev-haskell/memory-0.14.18:=[
 RESTRICT=!test? ( test )
 SLOT=0/0.26
 SRC_URI=https://hackage.haskell.org/package/cryptonite-0.26/cryptonite-0.26.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=99322c981d0d0f34535af649d434aae2
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2 b/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
index aab9fb35f774..2cb990c57a65 100644
--- a/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
+++ b/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] de
 RESTRICT=test
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/cryptonite-conduit-0.2.2/cryptonite-conduit-0.2.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a48599985a552e41d1299fe25d2354d
diff --git a/metadata/md5-cache/dev-haskell/css-text-0.1.3.0 b/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
index c120755b59d1..6c5c3dcc2a4d 100644
--- a/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
+++ b/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.2.0:=[profile?] >=dev-haskell/semigroups-0
 RESTRICT=test
 SLOT=0/0.1.3.0
 SRC_URI=https://hackage.haskell.org/package/css-text-0.1.3.0/css-text-0.1.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=946948cad7f3fad1b6276faea490b23a
diff --git a/metadata/md5-cache/dev-haskell/curl-1.3.8 b/metadata/md5-cache/dev-haskell/curl-1.3.8
index 459421945243..c8397577ab56 100644
--- a/metadata/md5-cache/dev-haskell/curl-1.3.8
+++ b/metadata/md5-cache/dev-haskell/curl-1.3.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= net-misc/curl
 SLOT=0/1.3.8
 SRC_URI=https://hackage.haskell.org/package/curl-1.3.8/curl-1.3.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d38fe550bb00a62c0b18d7d32fb27bbe
diff --git a/metadata/md5-cache/dev-haskell/data-accessor-0.2.3 b/metadata/md5-cache/dev-haskell/data-accessor-0.2.3
index cdde576a9526..c44d5086e9a9 100644
--- a/metadata/md5-cache/dev-haskell/data-accessor-0.2.3
+++ b/metadata/md5-cache/dev-haskell/data-accessor-0.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.3
 SRC_URI=https://hackage.haskell.org/package/data-accessor-0.2.3/data-accessor-0.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=547c6190940e734dd4c28c85882114eb
diff --git a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4 b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
index f4c26ed570bc..ecadc50f6af0 100644
--- a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
+++ b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.4
 SRC_URI=https://hackage.haskell.org/package/data-binary-ieee754-0.4.4/data-binary-ieee754-0.4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=11e45aea46fa6ca8e1524abfd05aa8a9
diff --git a/metadata/md5-cache/dev-haskell/data-default-0.7.1.1 b/metadata/md5-cache/dev-haskell/data-default-0.7.1.1
index 0594e722bf3b..761619fa2173 100644
--- a/metadata/md5-cache/dev-haskell/data-default-0.7.1.1
+++ b/metadata/md5-cache/dev-haskell/data-default-0.7.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.1.1
 SRC_URI=https://hackage.haskell.org/package/data-default-0.7.1.1/data-default-0.7.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a625f41a75f2a78af01680de39143ab2
diff --git a/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0 b/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0
index bc921257d222..95c151d16632 100644
--- a/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=51ac5968af9b1bea222f345107a866b6
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-base-0.1.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-base-0.1.0.1
index af051b2f8ad9..eee3a779626e 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-base-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-base-0.1.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-base-0.1.0.1/data-default-instances-base-0.1.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6b2e217d5c3b69b9d86860342a0cfc05
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
index 1f1680952226..e2c56756e927 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-containers-0.0.1/data-default-instances-containers-0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b0d76b03dbfa587ae5c0e06240cc9141
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
index 6f2c110b77f1..8e8704f62d37 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-dlist-0.0.1/data-default-instances-dlist-0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=81742c85f11db84865d1e0cd2e6e9375
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
index 610140762cba..2e91cb1be6f8 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-old-locale-0.0.1/data-default-instances-old-locale-0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68a37185bd443a804492881f32f644be
diff --git a/metadata/md5-cache/dev-haskell/data-endian-0.1.1 b/metadata/md5-cache/dev-haskell/data-endian-0.1.1
index 51c2980a077b..c6144b270e3a 100644
--- a/metadata/md5-cache/dev-haskell/data-endian-0.1.1
+++ b/metadata/md5-cache/dev-haskell/data-endian-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/data-endian-0.1.1/data-endian-0.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5145a6ce253d2f0e99b42943c84da780
diff --git a/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1 b/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
index 45843f17b18e..b44b1e48ce76 100644
--- a/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0.1
 SRC_URI=https://hackage.haskell.org/package/data-hash-0.2.0.1/data-hash-0.2.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e13bda262f3f4bc38e56e811c0a5212c
diff --git a/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0 b/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
index 04dbe7a1ba48..011d56a59b1d 100644
--- a/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
+++ b/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.7.0
 SRC_URI=https://hackage.haskell.org/package/data-ordlist-0.4.7.0/data-ordlist-0.4.7.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e9f5bce11791280ddd18679e62c1ceb9
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
index 236d53a8cf76..5189a83c97f4 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.14.0.7
 SRC_URI=https://hackage.haskell.org/package/dataenc-0.14.0.7/dataenc-0.14.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a2082174bcd0ef553be1197875ff821
diff --git a/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1 b/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
index b7fc2df98584..99a4b277a220 100644
--- a/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/date-cache-0.3.0/date-cache-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=266114897f337b735adbb39dc429cd4a
diff --git a/metadata/md5-cache/dev-haskell/dav-1.3.4 b/metadata/md5-cache/dev-haskell/dav-1.3.4
index d4b9d54423c2..543148055b65 100644
--- a/metadata/md5-cache/dev-haskell/dav-1.3.4
+++ b/metadata/md5-cache/dev-haskell/dav-1.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] dev-haskell/haskeline:=[profile?] >=dev-haskell/http-client-0.4:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/network-2.6.10:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/optparse-applicative-0.10.0:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.3.4
 SRC_URI=https://hackage.haskell.org/package/DAV-1.3.4/DAV-1.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc7c609c0eeb480148085d0850dc0418
diff --git a/metadata/md5-cache/dev-haskell/dbus-1.2.16 b/metadata/md5-cache/dev-haskell/dbus-1.2.16
index 6ddd19c5a42d..2d7f32e39147 100644
--- a/metadata/md5-cache/dev-haskell/dbus-1.2.16
+++ b/metadata/md5-cache/dev-haskell/dbus-1.2.16
@@ -10,5 +10,5 @@ RDEPEND=<dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3.0:=[profil
 RESTRICT=test
 SLOT=0/1.2.16
 SRC_URI=https://hackage.haskell.org/package/dbus-1.2.16/dbus-1.2.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee27d09451ebaf53600919e358d0644b
diff --git a/metadata/md5-cache/dev-haskell/dec-0.0.3 b/metadata/md5-cache/dev-haskell/dec-0.0.3
index 728e52e95a4b..d4d3beaab62e 100644
--- a/metadata/md5-cache/dev-haskell/dec-0.0.3
+++ b/metadata/md5-cache/dev-haskell/dec-0.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.0.3
 SRC_URI=https://hackage.haskell.org/package/dec-0.0.3/dec-0.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c799f45cb022ca76a5b05472e77a5e98
diff --git a/metadata/md5-cache/dev-haskell/deepseq-generics-0.2.0.0 b/metadata/md5-cache/dev-haskell/deepseq-generics-0.2.0.0
index 874292fe02a8..fdb51681590e 100644
--- a/metadata/md5-cache/dev-haskell/deepseq-generics-0.2.0.0
+++ b/metadata/md5-cache/dev-haskell/deepseq-generics-0.2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0.0
 SRC_URI=https://hackage.haskell.org/package/deepseq-generics-0.2.0.0/deepseq-generics-0.2.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7be90f9e73616470e898aa2ae1db8874
diff --git a/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0 b/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
index bf85cd7efda1..400b0fc51f45 100644
--- a/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/math-functions-0.1.7:=[profile?] >=dev-haskell/primitive-0
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/dense-linear-algebra-0.1.0.0/dense-linear-algebra-0.1.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b41fc5b6b7002a20aa108e6d20cf766
diff --git a/metadata/md5-cache/dev-haskell/deriving-compat-0.5.8 b/metadata/md5-cache/dev-haskell/deriving-compat-0.5.8
index 150e4a837612..b31acb5905d0 100644
--- a/metadata/md5-cache/dev-haskell/deriving-compat-0.5.8
+++ b/metadata/md5-cache/dev-haskell/deriving-compat-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction
 RESTRICT=!test? ( test )
 SLOT=0/0.5.8
 SRC_URI=https://hackage.haskell.org/package/deriving-compat-0.5.8/deriving-compat-0.5.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ec1ee5d993abd5b256519cdcbbe8e006
diff --git a/metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0 b/metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0
index 51d3734251f8..a0548e681088 100644
--- a/metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/dictionary-sharing-0.1.0.0/dictionary-sharing-0.1.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9084f5357e04a047ea5828cf64a0d5bb
diff --git a/metadata/md5-cache/dev-haskell/diff-0.4.0 b/metadata/md5-cache/dev-haskell/diff-0.4.0
index 89d8e0ac2f33..bc05e882f84e 100644
--- a/metadata/md5-cache/dev-haskell/diff-0.4.0
+++ b/metadata/md5-cache/dev-haskell/diff-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://hackage.haskell.org/package/Diff-0.4.0/Diff-0.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a56b1c1176383ee5a1ef2ffcc7fe803
diff --git a/metadata/md5-cache/dev-haskell/digest-0.0.1.2 b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
index cb5a4226c5ef..45e61e64cb6a 100644
--- a/metadata/md5-cache/dev-haskell/digest-0.0.1.2
+++ b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
 SLOT=0/0.0.1.2
 SRC_URI=https://hackage.haskell.org/package/digest-0.0.1.2/digest-0.0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=85bbc5f11ed1448fcd64c8de1bf59fe9
diff --git a/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1 b/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
index f4f155bb5362..1fe9585075f9 100644
--- a/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/disk-free-space-0.1.0.1/disk-free-space-0.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=33f69d00969c4ae0d1aaa9a423e44bda
diff --git a/metadata/md5-cache/dev-haskell/distributive-0.6.1 b/metadata/md5-cache/dev-haskell/distributive-0.6.1
index ce338e7642a4..0e64ff58fee1 100644
--- a/metadata/md5-cache/dev-haskell/distributive-0.6.1
+++ b/metadata/md5-cache/dev-haskell/distributive-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1
 RESTRICT=test
 SLOT=0/0.6.1
 SRC_URI=https://hackage.haskell.org/package/distributive-0.6.1/distributive-0.6.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1412360d6d21eb1662cd9479346216a5
diff --git a/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3 b/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
index d55711c0a059..d6b8f26cbce8 100644
--- a/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
+++ b/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/djinn-lib-0.0.1.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.0.2.3
 SRC_URI=https://hackage.haskell.org/package/djinn-ghc-0.0.2.3/djinn-ghc-0.0.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6ff44c14b83fbb2e232a13afb6dead6e
diff --git a/metadata/md5-cache/dev-haskell/djinn-lib-0.0.1.3 b/metadata/md5-cache/dev-haskell/djinn-lib-0.0.1.3
index 188efa3aa5a8..173f60ee8af7 100644
--- a/metadata/md5-cache/dev-haskell/djinn-lib-0.0.1.3
+++ b/metadata/md5-cache/dev-haskell/djinn-lib-0.0.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1.3
 SRC_URI=https://hackage.haskell.org/package/djinn-lib-0.0.1.3/djinn-lib-0.0.1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c60d3e56d901c47c2004b03303e0bc25
diff --git a/metadata/md5-cache/dev-haskell/dlist-0.8.0.7 b/metadata/md5-cache/dev-haskell/dlist-0.8.0.7
index 7a547130b47f..29ab8eb67bcc 100644
--- a/metadata/md5-cache/dev-haskell/dlist-0.8.0.7
+++ b/metadata/md5-cache/dev-haskell/dlist-0.8.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.0.7
 SRC_URI=https://hackage.haskell.org/package/dlist-0.8.0.7/dlist-0.8.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=573248f798970b57412b047f1c27f8d4
diff --git a/metadata/md5-cache/dev-haskell/dlist-instances-0.1.1.1 b/metadata/md5-cache/dev-haskell/dlist-instances-0.1.1.1
index c4f17cd7da8d..52afc13d2c22 100644
--- a/metadata/md5-cache/dev-haskell/dlist-instances-0.1.1.1
+++ b/metadata/md5-cache/dev-haskell/dlist-instances-0.1.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/dlist:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.1
 SRC_URI=https://hackage.haskell.org/package/dlist-instances-0.1.1.1/dlist-instances-0.1.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b2e1da7fdaed55517f7a20e7ab63f406
diff --git a/metadata/md5-cache/dev-haskell/dns-4.0.1 b/metadata/md5-cache/dev-haskell/dns-4.0.1
index 413d341a7919..03c9d8a6ac3e 100644
--- a/metadata/md5-cache/dev-haskell/dns-4.0.1
+++ b/metadata/md5-cache/dev-haskell/dns-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] dev-haskell/attoparsec:=[profile?] dev-has
 RESTRICT=test
 SLOT=0/4.0.1
 SRC_URI=https://hackage.haskell.org/package/dns-4.0.1/dns-4.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=79c3b1343a56de748500c7dd32c524a6
diff --git a/metadata/md5-cache/dev-haskell/doclayout-0.3.0.2 b/metadata/md5-cache/dev-haskell/doclayout-0.3.0.2
index 81e9c955651b..b008c1ca3c15 100644
--- a/metadata/md5-cache/dev-haskell/doclayout-0.3.0.2
+++ b/metadata/md5-cache/dev-haskell/doclayout-0.3.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/tex
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0.2
 SRC_URI=https://hackage.haskell.org/package/doclayout-0.3.0.2/doclayout-0.3.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e44d9cf1e0be15652e802b2f182882a6
diff --git a/metadata/md5-cache/dev-haskell/doctemplates-0.8.2 b/metadata/md5-cache/dev-haskell/doctemplates-0.8.2
index f7f726c61f5d..a52a6baf69a2 100644
--- a/metadata/md5-cache/dev-haskell/doctemplates-0.8.2
+++ b/metadata/md5-cache/dev-haskell/doctemplates-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/doclayout-0.3:=[profile?] <d
 RESTRICT=!test? ( test )
 SLOT=0/0.8.2
 SRC_URI=https://hackage.haskell.org/package/doctemplates-0.8.2/doctemplates-0.8.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c33779426d2768321fe5ac86b0205d8d
diff --git a/metadata/md5-cache/dev-haskell/doctemplates-0.9 b/metadata/md5-cache/dev-haskell/doctemplates-0.9
index 22b4859e413c..0ac64ca594f5 100644
--- a/metadata/md5-cache/dev-haskell/doctemplates-0.9
+++ b/metadata/md5-cache/dev-haskell/doctemplates-0.9
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/doclayout-0.3:=[profile?] <d
 RESTRICT=!test? ( test )
 SLOT=0/0.9
 SRC_URI=https://hackage.haskell.org/package/doctemplates-0.9/doctemplates-0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1df40d3ee3201b3a6fc7b5743a90a6ec
diff --git a/metadata/md5-cache/dev-haskell/doctest-0.16.3 b/metadata/md5-cache/dev-haskell/doctest-0.16.3
index b83fa6036be2..508f2ebf09ef 100644
--- a/metadata/md5-cache/dev-haskell/doctest-0.16.3
+++ b/metadata/md5-cache/dev-haskell/doctest-0.16.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/code-page-0.1:
 RESTRICT=test
 SLOT=0/0.16.3
 SRC_URI=https://hackage.haskell.org/package/doctest-0.16.3/doctest-0.16.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=08a05d3b14ca9bcd16e21dd885bffa99
diff --git a/metadata/md5-cache/dev-haskell/double-conversion-2.0.2.0 b/metadata/md5-cache/dev-haskell/double-conversion-2.0.2.0
index c665e1368776..c101a53eba17 100644
--- a/metadata/md5-cache/dev-haskell/double-conversion-2.0.2.0
+++ b/metadata/md5-cache/dev-haskell/double-conversion-2.0.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.11.0.8:=[profile?] >=dev-lang/ghc-7.4.1:= sys-devel
 RESTRICT=test
 SLOT=0/2.0.2.0
 SRC_URI=https://hackage.haskell.org/package/double-conversion-2.0.2.0/double-conversion-2.0.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6073b40a1b9206f59a5bd6985e2c6ba6
diff --git a/metadata/md5-cache/dev-haskell/drbg-0.5.5 b/metadata/md5-cache/dev-haskell/drbg-0.5.5
index 0d36a8bbfc87..d7f2d985a9a6 100644
--- a/metadata/md5-cache/dev-haskell/drbg-0.5.5
+++ b/metadata/md5-cache/dev-haskell/drbg-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cereal-0.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
 RESTRICT=test
 SLOT=0/0.5.5
 SRC_URI=https://hackage.haskell.org/package/DRBG-0.5.5/DRBG-0.5.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e4b8bb8ed3b10d4135fe7c315024dcfe
diff --git a/metadata/md5-cache/dev-haskell/easy-file-0.2.2 b/metadata/md5-cache/dev-haskell/easy-file-0.2.2
index 8ecf3c7820df..c40a33bf0482 100644
--- a/metadata/md5-cache/dev-haskell/easy-file-0.2.2
+++ b/metadata/md5-cache/dev-haskell/easy-file-0.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/easy-file-0.2.2/easy-file-0.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=78833690e706c393a373cf0f69e02a45
diff --git a/metadata/md5-cache/dev-haskell/echo-0.1.3 b/metadata/md5-cache/dev-haskell/echo-0.1.3
index 6f24187c17d6..021b414532f1 100644
--- a/metadata/md5-cache/dev-haskell/echo-0.1.3
+++ b/metadata/md5-cache/dev-haskell/echo-0.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/echo-0.1.3/echo-0.1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=01fef73992aaabbcc5e7def1329772dc
diff --git a/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0 b/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
index 8a12f53cab23..c00646e97f5d 100644
--- a/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
+++ b/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.0.5.0
 SRC_URI=https://hackage.haskell.org/package/ed25519-0.0.5.0/ed25519-0.0.5.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36a459e7b03958a3c8dba22349d44b89
diff --git a/metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1 b/metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1
index d05cae318898..93e5b34c617d 100644
--- a/metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/mtl-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.1
 SRC_URI=https://hackage.haskell.org/package/EdisonAPI-1.3.1/EdisonAPI-1.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8707667d6a85d6bfa4d00060d510ee24
diff --git a/metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1 b/metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
index aa5e0625cbbf..b3369c0602c8 100644
--- a/metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.2.1
 SRC_URI=https://hackage.haskell.org/package/EdisonCore-1.3.2.1/EdisonCore-1.3.2.1.tar.gz https://dev.gentoo.org/~slyfox/distfiles/edisoncore-1.3.2.1-ghc-8.8.patch
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=73b5f632c1a1cc6d435d52b203754afa
diff --git a/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1 b/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
index f5422b3dfffb..05782f70c5ed 100644
--- a/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.2.1
 SRC_URI=https://hackage.haskell.org/package/edit-distance-0.2.2.1/edit-distance-0.2.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=baf4f6c21d67126314d4382869e0ac18
diff --git a/metadata/md5-cache/dev-haskell/edit-distance-vector-1.0.0.4 b/metadata/md5-cache/dev-haskell/edit-distance-vector-1.0.0.4
index 11e347bfdb27..0620f767db65 100644
--- a/metadata/md5-cache/dev-haskell/edit-distance-vector-1.0.0.4
+++ b/metadata/md5-cache/dev-haskell/edit-distance-vector-1.0.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/vector-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0.4
 SRC_URI=https://hackage.haskell.org/package/edit-distance-vector-1.0.0.4/edit-distance-vector-1.0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb1b9ef4cbf9bd4ddc20065fb4e1d318
diff --git a/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1 b/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
index 8f77547390f9..8126c6677d6e 100644
--- a/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/libedit
 SLOT=0/0.2.1.1
 SRC_URI=https://hackage.haskell.org/package/editline-0.2.1.1/editline-0.2.1.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	gnuconfig	262062cef0ba4f22b397193da514a350	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=10d5bbcbc642b6b79045dfbfbd44bd00
diff --git a/metadata/md5-cache/dev-haskell/either-5.0.1.1 b/metadata/md5-cache/dev-haskell/either-5.0.1.1
index f2d05f3ec048..b5df52eac846 100644
--- a/metadata/md5-cache/dev-haskell/either-5.0.1.1
+++ b/metadata/md5-cache/dev-haskell/either-5.0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profi
 RESTRICT=!test? ( test )
 SLOT=0/5.0.1.1
 SRC_URI=https://hackage.haskell.org/package/either-5.0.1.1/either-5.0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b25d5b1633354a35e9bd551bcb49a446
diff --git a/metadata/md5-cache/dev-haskell/ekg-0.4.0.15-r7 b/metadata/md5-cache/dev-haskell/ekg-0.4.0.15-r7
index 55b966d7142d..749a6d454341 100644
--- a/metadata/md5-cache/dev-haskell/ekg-0.4.0.15-r7
+++ b/metadata/md5-cache/dev-haskell/ekg-0.4.0.15-r7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.4:=[profile?] <dev-haskell/aeson-1.6:= >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] >=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?] <dev-haskell/network-3.2:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] <dev-haskell/snap-server-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.4.0.15
 SRC_URI=https://hackage.haskell.org/package/ekg-0.4.0.15/ekg-0.4.0.15.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b88b14edb81d8807080211726392da18
diff --git a/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.7 b/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.7
index 7d26c164d74a..87711b076b1a 100644
--- a/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.7
+++ b/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.6.2:=
 SLOT=0/0.1.1.7
 SRC_URI=https://hackage.haskell.org/package/ekg-core-0.1.1.7/ekg-core-0.1.1.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18464830e3fa1aacc02f2163c38b1cb7
diff --git a/metadata/md5-cache/dev-haskell/ekg-json-0.1.0.6-r1 b/metadata/md5-cache/dev-haskell/ekg-json-0.1.0.6-r1
index e4fe71d054ed..b77d9ed161f7 100644
--- a/metadata/md5-cache/dev-haskell/ekg-json-0.1.0.6-r1
+++ b/metadata/md5-cache/dev-haskell/ekg-json-0.1.0.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.4:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.6
 SRC_URI=https://hackage.haskell.org/package/ekg-json-0.1.0.6/ekg-json-0.1.0.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6fdfb17de7fc3d34f67c5fb626b9d5ae
diff --git a/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13 b/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
index a31403708473..9ac52fbecced 100644
--- a/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
+++ b/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14
 RESTRICT=!test? ( test )
 SLOT=0/2.3.2.13
 SRC_URI=https://hackage.haskell.org/package/email-validate-2.3.2.13/email-validate-2.3.2.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9dfbbb3d91fad6e576650d5c689e05e1
diff --git a/metadata/md5-cache/dev-haskell/emojis-0.1 b/metadata/md5-cache/dev-haskell/emojis-0.1
index a3d5ad5600f4..fb86efdd0d6d 100644
--- a/metadata/md5-cache/dev-haskell/emojis-0.1
+++ b/metadata/md5-cache/dev-haskell/emojis-0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/emojis-0.1/emojis-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7ba760a8c4b7c9310a36a6e655bea567
diff --git a/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3 b/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
index fc9feee30f19..15f26a7e5fe3 100644
--- a/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
+++ b/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[pr
 RESTRICT=!test? ( test )
 SLOT=0/1.0.3
 SRC_URI=https://hackage.haskell.org/package/enclosed-exceptions-1.0.3/enclosed-exceptions-1.0.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=040f2dd3e905156b20f13fd33fb9a231
diff --git a/metadata/md5-cache/dev-haskell/entropy-0.4.1.6 b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6
index 3b9399631ca0..3c5503843e14 100644
--- a/metadata/md5-cache/dev-haskell/entropy-0.4.1.6
+++ b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.10.1:=
 SLOT=0/0.4.1.6
 SRC_URI=https://hackage.haskell.org/package/entropy-0.4.1.6/entropy-0.4.1.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a6f61a7a50a124189cf9da3a27961ff9
diff --git a/metadata/md5-cache/dev-haskell/enumerator-0.4.20 b/metadata/md5-cache/dev-haskell/enumerator-0.4.20
index cb5cd1da0952..f59440771478 100644
--- a/metadata/md5-cache/dev-haskell/enumerator-0.4.20
+++ b/metadata/md5-cache/dev-haskell/enumerator-0.4.20
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.20
 SRC_URI=https://hackage.haskell.org/package/enumerator-0.4.20/enumerator-0.4.20.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=150ca827b82abd23c8d445fdd28fbaeb
diff --git a/metadata/md5-cache/dev-haskell/equivalence-0.3.5 b/metadata/md5-cache/dev-haskell/equivalence-0.3.5
index 518c080e80a9..fd1b8212c30f 100644
--- a/metadata/md5-cache/dev-haskell/equivalence-0.3.5
+++ b/metadata/md5-cache/dev-haskell/equivalence-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] >=dev-h
 RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://hackage.haskell.org/package/equivalence-0.3.5/equivalence-0.3.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=333da8c4aae8006a4f97d2a39d3dd3e0
diff --git a/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1 b/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
index bd4eb80bccf2..39a86d783b81 100644
--- a/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/2.0.0.0
 SRC_URI=https://hackage.haskell.org/package/erf-2.0.0.0/erf-2.0.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3f104214d7b9059cf0983b40efa2cfb
diff --git a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0 b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
index 5bca624a8530..851c99abb0af 100644
--- a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
+++ b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base-orphans:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/errorcall-eq-instance-0.3.0/errorcall-eq-instance-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=73a56340d455fb2e2478bc9e6a25eb0b
diff --git a/metadata/md5-cache/dev-haskell/errors-2.3.0 b/metadata/md5-cache/dev-haskell/errors-2.3.0
index 14ade29c8fb7..ac469cae3e6d 100644
--- a/metadata/md5-cache/dev-haskell/errors-2.3.0
+++ b/metadata/md5-cache/dev-haskell/errors-2.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/2.3.0
 SRC_URI=https://hackage.haskell.org/package/errors-2.3.0/errors-2.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=48bccaa461a2ee56d540c0bab817ee46
diff --git a/metadata/md5-cache/dev-haskell/esqueleto-3.3.4.0 b/metadata/md5-cache/dev-haskell/esqueleto-3.3.4.0
index 751c9359538c..be619e61b103 100644
--- a/metadata/md5-cache/dev-haskell/esqueleto-3.3.4.0
+++ b/metadata/md5-cache/dev-haskell/esqueleto-3.3.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/attoparsec-0.13:=[prof
 RESTRICT=test
 SLOT=0/3.3.4.0
 SRC_URI=https://hackage.haskell.org/package/esqueleto-3.3.4.0/esqueleto-3.3.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fed1bb4436dc081855eb744a8ce841b3
diff --git a/metadata/md5-cache/dev-haskell/exact-pi-0.5.0.1 b/metadata/md5-cache/dev-haskell/exact-pi-0.5.0.1
index 7d7be5d69aa0..d1fa5c14fb59 100644
--- a/metadata/md5-cache/dev-haskell/exact-pi-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/exact-pi-0.5.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/numtype-dk-0.5:=[profile?] >=dev-haskell/semigroups-0.8:=[
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0.1
 SRC_URI=https://hackage.haskell.org/package/exact-pi-0.5.0.1/exact-pi-0.5.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=551aa0a228794111bb78847b62539011
diff --git a/metadata/md5-cache/dev-haskell/exceptions-0.10.4 b/metadata/md5-cache/dev-haskell/exceptions-0.10.4
index e80b0cd5f42f..802e8be98b9d 100644
--- a/metadata/md5-cache/dev-haskell/exceptions-0.10.4
+++ b/metadata/md5-cache/dev-haskell/exceptions-0.10.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.4
 SRC_URI=https://hackage.haskell.org/package/exceptions-0.10.4/exceptions-0.10.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a3e986a091589924f0e31246177e1ff9
diff --git a/metadata/md5-cache/dev-haskell/executable-path-0.0.3.1 b/metadata/md5-cache/dev-haskell/executable-path-0.0.3.1
index e65c3be8ae52..b19f0da80ad4 100644
--- a/metadata/md5-cache/dev-haskell/executable-path-0.0.3.1
+++ b/metadata/md5-cache/dev-haskell/executable-path-0.0.3.1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.3.1
 SRC_URI=https://hackage.haskell.org/package/executable-path-0.0.3.1/executable-path-0.0.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f304be7d554c6d125a51091222a6264
diff --git a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4 b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
index de17ad316657..6590d06992b5 100644
--- a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
+++ b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.4
 SRC_URI=https://hackage.haskell.org/package/extensible-exceptions-0.1.1.4/extensible-exceptions-0.1.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=220b953bad689268c1d1ad05642606aa
diff --git a/metadata/md5-cache/dev-haskell/extra-1.7.8 b/metadata/md5-cache/dev-haskell/extra-1.7.8
index 3d32bd307e88..cb4a8a386401 100644
--- a/metadata/md5-cache/dev-haskell/extra-1.7.8
+++ b/metadata/md5-cache/dev-haskell/extra-1.7.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/clock-0.7:=[profile?] >=dev-lang/ghc-8.0.1:=
 RESTRICT=!test? ( test )
 SLOT=2/1.7.8
 SRC_URI=https://hackage.haskell.org/package/extra-1.7.8/extra-1.7.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bed9a0c08f6063825d4eaeeed490a4e1
diff --git a/metadata/md5-cache/dev-haskell/fail-4.9.0.0 b/metadata/md5-cache/dev-haskell/fail-4.9.0.0
index f6d72f4f4fb6..b3895a75e4b7 100644
--- a/metadata/md5-cache/dev-haskell/fail-4.9.0.0
+++ b/metadata/md5-cache/dev-haskell/fail-4.9.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/4.9.0.0
 SRC_URI=https://hackage.haskell.org/package/fail-4.9.0.0/fail-4.9.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d49a31e67cbcd50c71055f18e529d0a2
diff --git a/metadata/md5-cache/dev-haskell/failure-0.2.0.3 b/metadata/md5-cache/dev-haskell/failure-0.2.0.3
index c522ec7c25f3..501825defaa7 100644
--- a/metadata/md5-cache/dev-haskell/failure-0.2.0.3
+++ b/metadata/md5-cache/dev-haskell/failure-0.2.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.0.3
 SRC_URI=https://hackage.haskell.org/package/failure-0.2.0.3/failure-0.2.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8a076caba97d1bbff79cd9e3affeccb8
diff --git a/metadata/md5-cache/dev-haskell/fast-logger-3.0.1 b/metadata/md5-cache/dev-haskell/fast-logger-3.0.1
index 5c9e557e5ffb..fd7921c5ad32 100644
--- a/metadata/md5-cache/dev-haskell/fast-logger-3.0.1
+++ b/metadata/md5-cache/dev-haskell/fast-logger-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/auto-update-0.1.2:=[profile?] >=dev-haskell/easy-file-0.2:
 RESTRICT=!test? ( test )
 SLOT=0/3.0.1
 SRC_URI=https://hackage.haskell.org/package/fast-logger-3.0.1/fast-logger-3.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f461703e03a4e62fb9268fbe49c634e
diff --git a/metadata/md5-cache/dev-haskell/fclabels-2.0.5 b/metadata/md5-cache/dev-haskell/fclabels-2.0.5
index eb30bfd6d707..47892d62b4ee 100644
--- a/metadata/md5-cache/dev-haskell/fclabels-2.0.5
+++ b/metadata/md5-cache/dev-haskell/fclabels-2.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.8.2:=[profile?] <dev-haskell/base-orphans-0
 RESTRICT=!test? ( test )
 SLOT=0/2.0.5
 SRC_URI=https://hackage.haskell.org/package/fclabels-2.0.5/fclabels-2.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d11a2bbc162e00529cf9c1e4fb18f731
diff --git a/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1 b/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
index ab40ddfd5697..0afdea47214e 100644
--- a/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
+++ b/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/dbus-0.10.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/fdo-notify-0.3.1/fdo-notify-0.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa211ae0736954ba604ef8f56643f0b1
diff --git a/metadata/md5-cache/dev-haskell/feed-1.3.0.1 b/metadata/md5-cache/dev-haskell/feed-1.3.0.1
index 6ee77be82baf..731390396ffe 100644
--- a/metadata/md5-cache/dev-haskell/feed-1.3.0.1
+++ b/metadata/md5-cache/dev-haskell/feed-1.3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.12:
 RESTRICT=test
 SLOT=0/1.3.0.1
 SRC_URI=https://hackage.haskell.org/package/feed-1.3.0.1/feed-1.3.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac79d2be9fe0115c69b327e2ad2cc4b7
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.7.0.2 b/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
index b78086e12dbf..420ed4b19dca 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
+++ b/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/5.7.0.2
 SRC_URI=https://hackage.haskell.org/package/fgl-5.7.0.2/fgl-5.7.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5b47a57593ac412e5e07f1fbd4b74c47
diff --git a/metadata/md5-cache/dev-haskell/fgl-arbitrary-0.2.0.3-r1 b/metadata/md5-cache/dev-haskell/fgl-arbitrary-0.2.0.3-r1
index 00eeb390287a..698ec828314a 100644
--- a/metadata/md5-cache/dev-haskell/fgl-arbitrary-0.2.0.3-r1
+++ b/metadata/md5-cache/dev-haskell/fgl-arbitrary-0.2.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?] >=d
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0.3
 SRC_URI=https://hackage.haskell.org/package/fgl-arbitrary-0.2.0.3/fgl-arbitrary-0.2.0.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ff9e3386c6e49542c1002382e7d3f038
diff --git a/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2 b/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
index 5e45a98b26a5..96ca6c614d11 100644
--- a/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
+++ b/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.0.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.11.2
 SRC_URI=https://hackage.haskell.org/package/file-embed-0.0.11.2/file-embed-0.0.11.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ff7a961ef777c1709c8f16744a254cce
diff --git a/metadata/md5-cache/dev-haskell/file-location-0.4.9.1 b/metadata/md5-cache/dev-haskell/file-location-0.4.9.1
index c1a7d1f1aae3..b6a6d7e1f9a9 100644
--- a/metadata/md5-cache/dev-haskell/file-location-0.4.9.1
+++ b/metadata/md5-cache/dev-haskell/file-location-0.4.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-
 RESTRICT=test
 SLOT=0/0.4.9.1
 SRC_URI=https://hackage.haskell.org/package/file-location-0.4.9.1/file-location-0.4.9.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3fab254dcc3d5ff0fcc844fad26190d4
diff --git a/metadata/md5-cache/dev-haskell/filelock-0.1.1.5 b/metadata/md5-cache/dev-haskell/filelock-0.1.1.5
index dc7dca5fc91d..bafcabe3e6c8 100644
--- a/metadata/md5-cache/dev-haskell/filelock-0.1.1.5
+++ b/metadata/md5-cache/dev-haskell/filelock-0.1.1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.0.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.5
 SRC_URI=https://hackage.haskell.org/package/filelock-0.1.1.5/filelock-0.1.1.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b2c09acced6911c701b3b43e5e7d811d
diff --git a/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3 b/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
index 3f11d29ca20a..3df9957f2a11 100644
--- a/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
+++ b/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.6.3
 SRC_URI=https://hackage.haskell.org/package/filemanip-0.3.6.3/filemanip-0.3.6.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4657f029d3e18fda9ad12d40fb15ad84
diff --git a/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6 b/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
index e7c72ac9eb02..d08f84c43f6a 100644
--- a/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
+++ b/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.4.2.1.6
 SRC_URI=https://hackage.haskell.org/package/filepath-bytestring-1.4.2.1.6/filepath-bytestring-1.4.2.1.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9709e4cbb08f917bc7fbc6da00d9c180
diff --git a/metadata/md5-cache/dev-haskell/filepattern-0.1.2 b/metadata/md5-cache/dev-haskell/filepattern-0.1.2
index 057648228412..7dc754148ba6 100644
--- a/metadata/md5-cache/dev-haskell/filepattern-0.1.2
+++ b/metadata/md5-cache/dev-haskell/filepattern-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/extra-1.6.2:=[profile?] >=dev-haskell/semigroups-0.18:=[pr
 RESTRICT=!test? ( test )
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/filepattern-0.1.2/filepattern-0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4466d88d58fb05bde3ce3e80117d1834
diff --git a/metadata/md5-cache/dev-haskell/filestore-0.6.5 b/metadata/md5-cache/dev-haskell/filestore-0.6.5
index 822029ded3cc..87b98389991f 100644
--- a/metadata/md5-cache/dev-haskell/filestore-0.6.5
+++ b/metadata/md5-cache/dev-haskell/filestore-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/diff-0.4:=[profile?] <dev-haskell/diff-0.5:=[profile?] >=d
 RESTRICT=test
 SLOT=0/0.6.5
 SRC_URI=https://hackage.haskell.org/package/filestore-0.6.5/filestore-0.6.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1f9681843c1f508746bf407f672a0177
diff --git a/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1 b/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
index 142ad8d07720..d215e9c45574 100644
--- a/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.5
 SRC_URI=https://hackage.haskell.org/package/FindBin-0.0.5/FindBin-0.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=344950c7b45db7605bd85c75bb7cc4ee
diff --git a/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2 b/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
index 195a35397b51..b9fdaf6a8fa2 100644
--- a/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
+++ b/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.4.2
 SRC_URI=https://hackage.haskell.org/package/fingertree-0.1.4.2/fingertree-0.1.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a6b30e14beb7be7f98e91bffa477259b
diff --git a/metadata/md5-cache/dev-haskell/fixed-0.3 b/metadata/md5-cache/dev-haskell/fixed-0.3
index 116b67785a7d..2355518fa75b 100644
--- a/metadata/md5-cache/dev-haskell/fixed-0.3
+++ b/metadata/md5-cache/dev-haskell/fixed-0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/fixed-0.3/fixed-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dfbdfdb3aab9c9a4b91b48f126db3d0c
diff --git a/metadata/md5-cache/dev-haskell/fmlist-0.9.3 b/metadata/md5-cache/dev-haskell/fmlist-0.9.3
index f1a351debe3a..112b1301a0a8 100644
--- a/metadata/md5-cache/dev-haskell/fmlist-0.9.3
+++ b/metadata/md5-cache/dev-haskell/fmlist-0.9.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/fail:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.9.3
 SRC_URI=https://hackage.haskell.org/package/fmlist-0.9.3/fmlist-0.9.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a5a01cb11d584da4637a86ce0c4b6f6d
diff --git a/metadata/md5-cache/dev-haskell/foldl-1.4.7 b/metadata/md5-cache/dev-haskell/foldl-1.4.7
index 3e9992716ca1..931e24e1e458 100644
--- a/metadata/md5-cache/dev-haskell/foldl-1.4.7
+++ b/metadata/md5-cache/dev-haskell/foldl-1.4.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
 RESTRICT=test
 SLOT=0/1.4.7
 SRC_URI=https://hackage.haskell.org/package/foldl-1.4.7/foldl-1.4.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=970b3371361b142bde28f9be235af11b
diff --git a/metadata/md5-cache/dev-haskell/foundation-0.0.25 b/metadata/md5-cache/dev-haskell/foundation-0.0.25
index 91e1930659b4..258f60936c46 100644
--- a/metadata/md5-cache/dev-haskell/foundation-0.0.25
+++ b/metadata/md5-cache/dev-haskell/foundation-0.0.25
@@ -10,5 +10,5 @@ RDEPEND=~dev-haskell/basement-0.0.11:=[profile?] >=dev-lang/ghc-8.0.1:=
 RESTRICT=test
 SLOT=0/0.0.25
 SRC_URI=https://hackage.haskell.org/package/foundation-0.0.25/foundation-0.0.25.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=100d501590a91a75017937d915737641
diff --git a/metadata/md5-cache/dev-haskell/free-5.1.3 b/metadata/md5-cache/dev-haskell/free-5.1.3
index 8c27e7a9f4db..daf6e09e77f5 100644
--- a/metadata/md5-cache/dev-haskell/free-5.1.3
+++ b/metadata/md5-cache/dev-haskell/free-5.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.5.1.0:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/5.1.3
 SRC_URI=https://hackage.haskell.org/package/free-5.1.3/free-5.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0ac94d30587154314ff8782e2c094aab
diff --git a/metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1 b/metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1
index 6f7750f8d3ba..bd01d4a480c4 100644
--- a/metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1
+++ b/metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.0.1:=[profile?] >=dev-haskell/hinotify-0.3.0:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0.1
 SRC_URI=https://hackage.haskell.org/package/fsnotify-0.3.0.1/fsnotify-0.3.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9906363310fd62e30014e6b60927bdc5
diff --git a/metadata/md5-cache/dev-haskell/generic-deriving-1.13.1 b/metadata/md5-cache/dev-haskell/generic-deriving-1.13.1
index 1b95fc1ecc52..32e084f09dcc 100644
--- a/metadata/md5-cache/dev-haskell/generic-deriving-1.13.1
+++ b/metadata/md5-cache/dev-haskell/generic-deriving-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction
 RESTRICT=!test? ( test )
 SLOT=0/1.13.1
 SRC_URI=https://hackage.haskell.org/package/generic-deriving-1.13.1/generic-deriving-1.13.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=428807ae822c3f7965b187ea1d5c7450
diff --git a/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0 b/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
index 911588fa4f72..3da66bd3ca20 100644
--- a/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/sop-core-0.5.0:=[profile?] <dev-haskell/sop-core-0.5.1:=[p
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1.0
 SRC_URI=https://hackage.haskell.org/package/generics-sop-0.5.1.0/generics-sop-0.5.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e2d58767f0cd5ccf8fd2c654bcd753fe
diff --git a/metadata/md5-cache/dev-haskell/geniplate-mirror-0.7.7 b/metadata/md5-cache/dev-haskell/geniplate-mirror-0.7.7
index 79a5a579751f..06f15693e9c2 100644
--- a/metadata/md5-cache/dev-haskell/geniplate-mirror-0.7.7
+++ b/metadata/md5-cache/dev-haskell/geniplate-mirror-0.7.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.7
 SRC_URI=https://hackage.haskell.org/package/geniplate-mirror-0.7.7/geniplate-mirror-0.7.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c16bc25864b430bbfe20f591f6548273
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2 b/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
index 19e2086787ed..ad83bbeaf6d5 100644
--- a/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
+++ b/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/quickcheck-2.7:2=[profile?] dev-haskell/random:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.10.0.2
 SRC_URI=https://hackage.haskell.org/package/genvalidity-0.10.0.2/genvalidity-0.10.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f6acdd6727c4de71817bdcaacc43262
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4 b/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
index 35dbfe92096d..ab4d53b58a5a 100644
--- a/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
+++ b/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/genvalidity-0.8:=[profile?] >=dev-haskell/genvalidity-prop
 RESTRICT=!test? ( test )
 SLOT=0/0.7.0.4
 SRC_URI=https://hackage.haskell.org/package/genvalidity-hspec-0.7.0.4/genvalidity-hspec-0.7.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8eec9242bc1f428f1e7b2e2ba039e215
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1 b/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
index 92eb2a51ed83..311d6412c120 100644
--- a/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/genvalidity-0.7:=[profile?] >=dev-haskell/hspec-2.1:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0.1
 SRC_URI=https://hackage.haskell.org/package/genvalidity-property-0.5.0.1/genvalidity-property-0.5.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=97d5bd48c7fe2abf420109c7a7e5ca8a
diff --git a/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4 b/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
index 4c2718dd36ff..c3db164ba6b3 100644
--- a/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
+++ b/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/base-orphans:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.13.0.4
 SRC_URI=https://hackage.haskell.org/package/getopt-generics-0.13.0.4/getopt-generics-0.13.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58da864d98ba4cf89d2ed3675e8d1880
diff --git a/metadata/md5-cache/dev-haskell/ghc-lib-parser-8.10.2.20200916 b/metadata/md5-cache/dev-haskell/ghc-lib-parser-8.10.2.20200916
index 7f9c5d71ed4a..4293a2bba606 100644
--- a/metadata/md5-cache/dev-haskell/ghc-lib-parser-8.10.2.20200916
+++ b/metadata/md5-cache/dev-haskell/ghc-lib-parser-8.10.2.20200916
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.6.3:=
 SLOT=0/8.10.2.20200916
 SRC_URI=https://hackage.haskell.org/package/ghc-lib-parser-8.10.2.20200916/ghc-lib-parser-8.10.2.20200916.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=48da7203c43e9515158ff2059480b953
diff --git a/metadata/md5-cache/dev-haskell/ghc-lib-parser-ex-8.10.0.19 b/metadata/md5-cache/dev-haskell/ghc-lib-parser-ex-8.10.0.19
index ddb0260f0a56..5b6bc8908d83 100644
--- a/metadata/md5-cache/dev-haskell/ghc-lib-parser-ex-8.10.0.19
+++ b/metadata/md5-cache/dev-haskell/ghc-lib-parser-ex-8.10.0.19
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ghc-lib-parser-8.10:=[profile?] <dev-haskell/ghc-lib-parse
 RESTRICT=!test? ( test )
 SLOT=0/8.10.0.19
 SRC_URI=https://hackage.haskell.org/package/ghc-lib-parser-ex-8.10.0.19/ghc-lib-parser-ex-8.10.0.19.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18582d72088564c9818f3483c67b2049
diff --git a/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1 b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
index 4c15e2062720..fad6548444c6 100644
--- a/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
+++ b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.12
 SRC_URI=https://hackage.haskell.org/package/ghc-paths-0.1.0.12/ghc-paths-0.1.0.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c90ab037922e62e7f6558e98a46797fb
diff --git a/metadata/md5-cache/dev-haskell/gio-0.13.8.1 b/metadata/md5-cache/dev-haskell/gio-0.13.8.1
index ede30836d091..bf16875302d9 100644
--- a/metadata/md5-cache/dev-haskell/gio-0.13.8.1
+++ b/metadata/md5-cache/dev-haskell/gio-0.13.8.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2
 SLOT=0/0.13.8.1
 SRC_URI=https://hackage.haskell.org/package/gio-0.13.8.1/gio-0.13.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=64c617092400394f6aae43b90c87e995
diff --git a/metadata/md5-cache/dev-haskell/git-0.3.0 b/metadata/md5-cache/dev-haskell/git-0.3.0
index 73880d932c90..48897c2a3dd1 100644
--- a/metadata/md5-cache/dev-haskell/git-0.3.0
+++ b/metadata/md5-cache/dev-haskell/git-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/basement:=[profile?] >=dev-haskell/cryptonite-0.22:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/git-0.3.0/git-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b6166fb6f22f76c16c53760678a58ca2
diff --git a/metadata/md5-cache/dev-haskell/git-lfs-1.1.0 b/metadata/md5-cache/dev-haskell/git-lfs-1.1.0
index 34b8664d90a8..991efbc1eda2 100644
--- a/metadata/md5-cache/dev-haskell/git-lfs-1.1.0
+++ b/metadata/md5-cache/dev-haskell/git-lfs-1.1.0
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=dev-haskell/aeson-1.3:=[profile?] <=dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <=dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] <=dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <=dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <=dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/text-1.2:=[profile?] <=dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.6.3:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/git-lfs-1.1.0/git-lfs-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7420ec3a16b69f1e6e9618a9152f812b
diff --git a/metadata/md5-cache/dev-haskell/githash-0.1.3.3 b/metadata/md5-cache/dev-haskell/githash-0.1.3.3
index 82eb18ebc1c1..9744862e7a57 100644
--- a/metadata/md5-cache/dev-haskell/githash-0.1.3.3
+++ b/metadata/md5-cache/dev-haskell/githash-0.1.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.0.2:= dev-vcs/git
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3.3
 SRC_URI=https://hackage.haskell.org/package/githash-0.1.3.3/githash-0.1.3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=237ad6a6dc3c40f19ccc880839eee2a8
diff --git a/metadata/md5-cache/dev-haskell/gitrev-1.3.1 b/metadata/md5-cache/dev-haskell/gitrev-1.3.1
index 7c72cc42186a..6c4e60e99e55 100644
--- a/metadata/md5-cache/dev-haskell/gitrev-1.3.1
+++ b/metadata/md5-cache/dev-haskell/gitrev-1.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-compat-0.6.0:=[profile?] >=dev-lang/ghc-7.6.1:=
 SLOT=0/1.3.1
 SRC_URI=https://hackage.haskell.org/package/gitrev-1.3.1/gitrev-1.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=abe2c7666c10a3dbce3ff4a328c94c25
diff --git a/metadata/md5-cache/dev-haskell/glib-0.13.8.1 b/metadata/md5-cache/dev-haskell/glib-0.13.8.1
index c328d5d01d4d..456b080d376d 100644
--- a/metadata/md5-cache/dev-haskell/glib-0.13.8.1
+++ b/metadata/md5-cache/dev-haskell/glib-0.13.8.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2
 SLOT=0/0.13.8.1
 SRC_URI=https://hackage.haskell.org/package/glib-0.13.8.1/glib-0.13.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=63d91bbd73a366644c119c5c3959a2f4
diff --git a/metadata/md5-cache/dev-haskell/glob-0.9.3 b/metadata/md5-cache/dev-haskell/glob-0.9.3
index 570d3e71bbb6..24ca39fad437 100644
--- a/metadata/md5-cache/dev-haskell/glob-0.9.3
+++ b/metadata/md5-cache/dev-haskell/glob-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/0.9.3
 SRC_URI=https://hackage.haskell.org/package/Glob-0.9.3/Glob-0.9.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7508a47831fabc25f1217aca8dc6cfd3
diff --git a/metadata/md5-cache/dev-haskell/gluraw-2.0.0.4 b/metadata/md5-cache/dev-haskell/gluraw-2.0.0.4
index d5b2be5e3b5a..4205b9f01896 100644
--- a/metadata/md5-cache/dev-haskell/gluraw-2.0.0.4
+++ b/metadata/md5-cache/dev-haskell/gluraw-2.0.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/glu
 SLOT=0/2.0.0.4
 SRC_URI=https://hackage.haskell.org/package/GLURaw-2.0.0.4/GLURaw-2.0.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98b6a76b80d6695e83aecd1d15884b30
diff --git a/metadata/md5-cache/dev-haskell/glut-2.7.0.15 b/metadata/md5-cache/dev-haskell/glut-2.7.0.15
index bf3eecd96e21..abce51444e77 100644
--- a/metadata/md5-cache/dev-haskell/glut-2.7.0.15
+++ b/metadata/md5-cache/dev-haskell/glut-2.7.0.15
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/openglraw-1.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
 SLOT=0/2.7.0.15
 SRC_URI=https://hackage.haskell.org/package/GLUT-2.7.0.15/GLUT-2.7.0.15.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=839bce0e3ac90dd0440c6a334df55f90
diff --git a/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1 b/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
index e050be54f662..32e57b6df68a 100644
--- a/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
+++ b/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= net-dns/libidn:0=
 RESTRICT=test
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/gnuidn-0.2.2/gnuidn-0.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=074412b2be6595d28d4407e0ecfff680
diff --git a/metadata/md5-cache/dev-haskell/gnutls-0.2 b/metadata/md5-cache/dev-haskell/gnutls-0.2
index cb7cc3e98f52..78378ff20139 100644
--- a/metadata/md5-cache/dev-haskell/gnutls-0.2
+++ b/metadata/md5-cache/dev-haskell/gnutls-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= net-libs/gnutls:=
 SLOT=0/0.2
 SRC_URI=https://hackage.haskell.org/package/gnutls-0.2/gnutls-0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65f43148d65a05b395e9a6a07913fa32
diff --git a/metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4 b/metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
index 178afddc4502..2466c931842e 100644
--- a/metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
+++ b/metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?]
 RESTRICT=test
 SLOT=0/2999.20.0.4
 SRC_URI=https://hackage.haskell.org/package/graphviz-2999.20.0.4/graphviz-2999.20.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=41352b6c2bed674a43877778b420c6fa
diff --git a/metadata/md5-cache/dev-haskell/groupoids-4.0 b/metadata/md5-cache/dev-haskell/groupoids-4.0
index 5f82b50f96a5..60818bf88f9f 100644
--- a/metadata/md5-cache/dev-haskell/groupoids-4.0
+++ b/metadata/md5-cache/dev-haskell/groupoids-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.0
 SRC_URI=https://hackage.haskell.org/package/groupoids-4.0/groupoids-4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e1c73041101e9d8fbec8ad2b32d1a89f
diff --git a/metadata/md5-cache/dev-haskell/gsasl-0.3.7 b/metadata/md5-cache/dev-haskell/gsasl-0.3.7
index cc544c37d6ec..b2d70189a071 100644
--- a/metadata/md5-cache/dev-haskell/gsasl-0.3.7
+++ b/metadata/md5-cache/dev-haskell/gsasl-0.3.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/monad-loops-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/gsasl
 SLOT=0/0.3.7
 SRC_URI=https://hackage.haskell.org/package/gsasl-0.3.7/gsasl-0.3.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd03b00844a438e8bc49d71e98d3a1de
diff --git a/metadata/md5-cache/dev-haskell/gtk-0.15.5-r1 b/metadata/md5-cache/dev-haskell/gtk-0.15.5-r1
index 13b276d3f90b..391fb490b700 100644
--- a/metadata/md5-cache/dev-haskell/gtk-0.15.5-r1
+++ b/metadata/md5-cache/dev-haskell/gtk-0.15.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
 SLOT=2/0.15.5
 SRC_URI=https://hackage.haskell.org/package/gtk-0.15.5/gtk-0.15.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d4b63d9f701faf43ecba2b641166bd6
diff --git a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0-r1 b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0-r1
index dc151e5d4a8e..89837ff6b73f 100644
--- a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0-r1
+++ b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/cabal-1.24.0.0:=[profile?] dev-haskell/fail:=[profile?] dev-haskell/hashtables:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.13.8.0
 SRC_URI=https://hackage.haskell.org/package/gtk2hs-buildtools-0.13.8.0/gtk2hs-buildtools-0.13.8.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3d3fe9e7c54da142da1e044256740e87
diff --git a/metadata/md5-cache/dev-haskell/gtk3-0.15.5 b/metadata/md5-cache/dev-haskell/gtk3-0.15.5
index ab88be9ab553..2a5541c6c9ca 100644
--- a/metadata/md5-cache/dev-haskell/gtk3-0.15.5
+++ b/metadata/md5-cache/dev-haskell/gtk3-0.15.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:3 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
 SLOT=0/0.15.5
 SRC_URI=https://hackage.haskell.org/package/gtk3-0.15.5/gtk3-0.15.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3ba794095c511355086c94af636f4cf
diff --git a/metadata/md5-cache/dev-haskell/hackage-security-0.5.3.0-r3 b/metadata/md5-cache/dev-haskell/hackage-security-0.5.3.0-r3
index 446a67a439c2..12f0bc1027b0 100644
--- a/metadata/md5-cache/dev-haskell/hackage-security-0.5.3.0-r3
+++ b/metadata/md5-cache/dev-haskell/hackage-security-0.5.3.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-by
 RESTRICT=test
 SLOT=0/0.5.3.0
 SRC_URI=https://hackage.haskell.org/package/hackage-security-0.5.3.0/hackage-security-0.5.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f6724408e06e1d29fdfe08d0eef2e50e
diff --git a/metadata/md5-cache/dev-haskell/hackage-security-0.6.0.1-r1 b/metadata/md5-cache/dev-haskell/hackage-security-0.6.0.1-r1
index 3f307584ecbe..d73cf892de17 100644
--- a/metadata/md5-cache/dev-haskell/hackage-security-0.6.0.1-r1
+++ b/metadata/md5-cache/dev-haskell/hackage-security-0.6.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-by
 RESTRICT=!test? ( test )
 SLOT=0/0.6.0.1
 SRC_URI=https://hackage.haskell.org/package/hackage-security-0.6.0.1/hackage-security-0.6.0.1.tar.gz https://hackage.haskell.org/package/hackage-security-0.6.0.1/revision/4.cabal -> hackage-security-0.6.0.1-r1.cabal
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1e3fcb2cf4eea62d7b246ea94701a6f0
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.23.1 b/metadata/md5-cache/dev-haskell/haddock-2.23.1
index ab459cd5a44a..c73786afa635 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.23.1
+++ b/metadata/md5-cache/dev-haskell/haddock-2.23.1
@@ -9,5 +9,5 @@ RDEPEND=~dev-haskell/haddock-api-2.23.1:= >=dev-lang/ghc-8.8.1:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haddock-2.23.1/haddock-2.23.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f9d5e11f871660dade42fa6993ade91
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.24.0 b/metadata/md5-cache/dev-haskell/haddock-2.24.0
index 869bb698d18c..c7bc372e27a1 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.24.0
+++ b/metadata/md5-cache/dev-haskell/haddock-2.24.0
@@ -9,5 +9,5 @@ RDEPEND=~dev-haskell/haddock-api-2.24.0:= >=dev-lang/ghc-8.10.1:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haddock-2.24.0/haddock-2.24.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=af18caebd4f411c8ed746469dc6d7476
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.23.1 b/metadata/md5-cache/dev-haskell/haddock-api-2.23.1
index e0f5216a57d1..9de9a03c0788 100644
--- a/metadata/md5-cache/dev-haskell/haddock-api-2.23.1
+++ b/metadata/md5-cache/dev-haskell/haddock-api-2.23.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=
 RESTRICT=!test? ( test )
 SLOT=0/2.23.1
 SRC_URI=https://hackage.haskell.org/package/haddock-api-2.23.1/haddock-api-2.23.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1f02aedd14ad49c4eedc3b146f5d532b
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.24.0 b/metadata/md5-cache/dev-haskell/haddock-api-2.24.0
index f98cb2a439cb..0ad16bf7b608 100644
--- a/metadata/md5-cache/dev-haskell/haddock-api-2.24.0
+++ b/metadata/md5-cache/dev-haskell/haddock-api-2.24.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=
 RESTRICT=!test? ( test )
 SLOT=0/2.24.0
 SRC_URI=https://hackage.haskell.org/package/haddock-api-2.24.0/haddock-api-2.24.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ae0e73c3d5843468481953cd1c9da092
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.8.0 b/metadata/md5-cache/dev-haskell/haddock-library-1.8.0
index dfce5db41d79..13ff99a08ee0 100644
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.8.0
+++ b/metadata/md5-cache/dev-haskell/haddock-library-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/1.8.0
 SRC_URI=https://hackage.haskell.org/package/haddock-library-1.8.0/haddock-library-1.8.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad00e362d34ea83030d67a68bd9450c2
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.9.0 b/metadata/md5-cache/dev-haskell/haddock-library-1.9.0
index b2b841594c55..6010fa27d6ea 100644
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.9.0
+++ b/metadata/md5-cache/dev-haskell/haddock-library-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/1.9.0
 SRC_URI=https://hackage.haskell.org/package/haddock-library-1.9.0/haddock-library-1.9.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=94150257c4ceec76a03f81269d72404e
diff --git a/metadata/md5-cache/dev-haskell/hakyll-4.14.0.0-r1 b/metadata/md5-cache/dev-haskell/hakyll-4.14.0.0-r1
index a0fa12c71e90..45dadf1a21c1 100644
--- a/metadata/md5-cache/dev-haskell/hakyll-4.14.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/hakyll-4.14.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[
 RESTRICT=!test? ( test )
 SLOT=0/4.14.0.0
 SRC_URI=https://hackage.haskell.org/package/hakyll-4.14.0.0/hakyll-4.14.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2077a784fa83a8a36e26b88a4b2fb36e
diff --git a/metadata/md5-cache/dev-haskell/half-0.3-r1 b/metadata/md5-cache/dev-haskell/half-0.3-r1
index c4306d46c3d8..c08f6b00ea68 100644
--- a/metadata/md5-cache/dev-haskell/half-0.3-r1
+++ b/metadata/md5-cache/dev-haskell/half-0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/half-0.3/half-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4c1af8edbda9cd023440f68cc8620d3e
diff --git a/metadata/md5-cache/dev-haskell/hamlet-1.2.0 b/metadata/md5-cache/dev-haskell/hamlet-1.2.0
index dca90f235ccc..b808f987dc4e 100644
--- a/metadata/md5-cache/dev-haskell/hamlet-1.2.0
+++ b/metadata/md5-cache/dev-haskell/hamlet-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.0
 SRC_URI=https://hackage.haskell.org/package/hamlet-1.2.0/hamlet-1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e38d8d16575d4b4def7ed0f6a3a3775
diff --git a/metadata/md5-cache/dev-haskell/happstack-server-7.6.1 b/metadata/md5-cache/dev-haskell/happstack-server-7.6.1
index 448635dde499..e4eb3b52c9b1 100644
--- a/metadata/md5-cache/dev-haskell/happstack-server-7.6.1
+++ b/metadata/md5-cache/dev-haskell/happstack-server-7.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-byte
 RESTRICT=!test? ( test )
 SLOT=0/7.6.1
 SRC_URI=https://hackage.haskell.org/package/happstack-server-7.6.1/happstack-server-7.6.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4c640c4ce95e7009bdf7c163c2bd6076
diff --git a/metadata/md5-cache/dev-haskell/happy-1.19.12 b/metadata/md5-cache/dev-haskell/happy-1.19.12
index 8791c33f9381..e57b4c89ada8 100644
--- a/metadata/md5-cache/dev-haskell/happy-1.19.12
+++ b/metadata/md5-cache/dev-haskell/happy-1.19.12
@@ -11,5 +11,5 @@ RDEPEND=>=dev-haskell/mtl-2.2.1:= >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/happy-1.19.12/happy-1.19.12.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	gnuconfig	262062cef0ba4f22b397193da514a350	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=07a9a80a91f1b1f62afb02c342269de9
diff --git a/metadata/md5-cache/dev-haskell/harp-0.4.3.2 b/metadata/md5-cache/dev-haskell/harp-0.4.3.2
index e09cc296585d..ea936f45b13a 100644
--- a/metadata/md5-cache/dev-haskell/harp-0.4.3.2
+++ b/metadata/md5-cache/dev-haskell/harp-0.4.3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.3.2
 SRC_URI=https://hackage.haskell.org/package/harp-0.4.3.2/harp-0.4.3.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb90ee5de6d4553f03a3a849cc339f9b
diff --git a/metadata/md5-cache/dev-haskell/hashable-1.2.7.0 b/metadata/md5-cache/dev-haskell/hashable-1.2.7.0
index 41b1aa758aeb..373299c8993d 100644
--- a/metadata/md5-cache/dev-haskell/hashable-1.2.7.0
+++ b/metadata/md5-cache/dev-haskell/hashable-1.2.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/1.2.7.0
 SRC_URI=https://hackage.haskell.org/package/hashable-1.2.7.0/hashable-1.2.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cb3da05deb3f1c19efa2f71e0fc91f62
diff --git a/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1 b/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
index b9a529224349..8e710c136d9c 100644
--- a/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
+++ b/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.0.2
 SRC_URI=https://hackage.haskell.org/package/hashable-time-0.2.0.2/hashable-time-0.2.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6d8e4c2d3912748364b14ac2c56c4173
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.2.4.1 b/metadata/md5-cache/dev-haskell/hashtables-1.2.4.1
index d94154e22f75..c237dc323d86 100644
--- a/metadata/md5-cache/dev-haskell/hashtables-1.2.4.1
+++ b/metadata/md5-cache/dev-haskell/hashtables-1.2.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <
 RESTRICT=!test? ( test )
 SLOT=0/1.2.4.1
 SRC_URI=https://hackage.haskell.org/package/hashtables-1.2.4.1/hashtables-1.2.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=025fd7d4d94b2a6629ea53fbb2d4a233
diff --git a/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0 b/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
index 60656213ecdf..caa3bb4b5ba6 100644
--- a/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-8.0.1:= terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
 SLOT=0/0.7.5.0
 SRC_URI=https://hackage.haskell.org/package/haskeline-0.7.5.0/haskeline-0.7.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a570cd0d37f985b48815fb4c1477ab49
diff --git a/metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2 b/metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2
index d104ad3964c3..a64748715f49 100644
--- a/metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2
+++ b/metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/haskell-lexer-1.0.2/haskell-lexer-1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=458044df77004e832576ffd8bab64725
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-1.0.3.0 b/metadata/md5-cache/dev-haskell/haskell-src-1.0.3.0
index 69a6177079ed..4c406885dac0 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-1.0.3.0
+++ b/metadata/md5-cache/dev-haskell/haskell-src-1.0.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.3.0
 SRC_URI=https://hackage.haskell.org/package/haskell-src-1.0.3.0/haskell-src-1.0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f41d31abd1837f1d4774a067e34d6c2
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
index 1a2d3fd02ccf..dc6bc3ec4710 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/1.17.1
 SRC_URI=https://hackage.haskell.org/package/haskell-src-exts-1.17.1/haskell-src-exts-1.17.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3589036a49772c85025f543877df5a58
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
index edab87204e0f..7d8bc0de8b84 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=!test? ( test )
 SLOT=1.21/1.21.1
 SRC_URI=https://hackage.haskell.org/package/haskell-src-exts-1.21.1/haskell-src-exts-1.21.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fee0783ef17dae511552db7c15d576a1
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-util-0.2.5 b/metadata/md5-cache/dev-haskell/haskell-src-exts-util-0.2.5
index da3f4ac1b87f..e2d9e721e431 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-exts-util-0.2.5
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-util-0.2.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default:=[profile?] >=dev-haskell/haskell-src-exts-1.20.0:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/uniplate:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.5
 SRC_URI=https://hackage.haskell.org/package/haskell-src-exts-util-0.2.5/haskell-src-exts-util-0.2.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fb83f40ab7db478e42a19a44ec814461
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1 b/metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1
index 55138529ec99..277700a6ee9f 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1
+++ b/metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/haskell-src-exts-1.18:=[profile?] <dev-haskell/haskell-src
 RESTRICT=test
 SLOT=0/0.8.5
 SRC_URI=https://hackage.haskell.org/package/haskell-src-meta-0.8.5/haskell-src-meta-0.8.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=434d503b2ad7464a2778ff9b5ca4357d
diff --git a/metadata/md5-cache/dev-haskell/haxml-1.25.5-r1 b/metadata/md5-cache/dev-haskell/haxml-1.25.5-r1
index 3cf85c431b8d..eebcdd16f30e 100644
--- a/metadata/md5-cache/dev-haskell/haxml-1.25.5-r1
+++ b/metadata/md5-cache/dev-haskell/haxml-1.25.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/polyparse-1.12.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.25.5
 SRC_URI=https://hackage.haskell.org/package/HaXml-1.25.5/HaXml-1.25.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2201f5f072d76a14ab017985a4c9d0a4
diff --git a/metadata/md5-cache/dev-haskell/hcg-minus-0.15 b/metadata/md5-cache/dev-haskell/hcg-minus-0.15
index 773269524082..b3e1e407d020 100644
--- a/metadata/md5-cache/dev-haskell/hcg-minus-0.15
+++ b/metadata/md5-cache/dev-haskell/hcg-minus-0.15
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/colour:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.15
 SRC_URI=https://hackage.haskell.org/package/hcg-minus-0.15/hcg-minus-0.15.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f8d040408ef9c260087902db15222dc
diff --git a/metadata/md5-cache/dev-haskell/hcodecs-0.5.2 b/metadata/md5-cache/dev-haskell/hcodecs-0.5.2
index f2687e5f5f23..6cacce084413 100644
--- a/metadata/md5-cache/dev-haskell/hcodecs-0.5.2
+++ b/metadata/md5-cache/dev-haskell/hcodecs-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/quickcheck-2.0:2=[profile?] d
 RESTRICT=!test? ( test )
 SLOT=0/0.5.2
 SRC_URI=https://hackage.haskell.org/package/HCodecs-0.5.2/HCodecs-0.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad5131c1089525436b07505469d02521
diff --git a/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3 b/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3
index 3b50bf5e1f51..b29b4ad3b9ca 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3
+++ b/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/convertible-1.1.0.0:=[profile?] dev-haskell/mtl:=[profile?
 RESTRICT=test
 SLOT=2/2.4.0.3
 SRC_URI=https://hackage.haskell.org/package/HDBC-2.4.0.3/HDBC-2.4.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=43f92d3108a0dfb58bfd480c7bd03035
diff --git a/metadata/md5-cache/dev-haskell/hdbc-mysql-0.7.1.0-r1 b/metadata/md5-cache/dev-haskell/hdbc-mysql-0.7.1.0-r1
index af96409f739d..1ca7dd2bfa45 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-mysql-0.7.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/hdbc-mysql-0.7.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= dev-libs/openssl:0= sys-libs/zlib dev-db/mysql-connector-c:0=
 SLOT=0/0.7.1.0
 SRC_URI=https://hackage.haskell.org/package/HDBC-mysql-0.7.1.0/HDBC-mysql-0.7.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ddc31d4f8b2be401c7d6366a5fc598ac
diff --git a/metadata/md5-cache/dev-haskell/hdbc-odbc-2.6.0.0 b/metadata/md5-cache/dev-haskell/hdbc-odbc-2.6.0.0
index 46b8340f26f7..273b014dd53c 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-odbc-2.6.0.0
+++ b/metadata/md5-cache/dev-haskell/hdbc-odbc-2.6.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-db/unixODBC >=dev-haskell/concurrent-extra-0.7.0.8:=[profile?] >=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc
 SLOT=2/2.6.0.0
 SRC_URI=https://hackage.haskell.org/package/HDBC-odbc-2.6.0.0/HDBC-odbc-2.6.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d5ad6f5c4f6939900fcc2f11229edb57
diff --git a/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.7 b/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.7
index e9139e8f93da..d9d2ce4a652d 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.7
+++ b/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-db/postgresql-7:* dev-haskell/convertible:=[profile?] >=dev-haskell/hdbc-2.2.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=2/2.3.2.7
 SRC_URI=https://hackage.haskell.org/package/HDBC-postgresql-2.3.2.7/HDBC-postgresql-2.3.2.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8fae6295bb52ad140b24ff623156aebb
diff --git a/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1 b/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
index d91143dd9d6d..973d23ab41b4 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hdbc-2.3.0.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.3.3.1
 SRC_URI=https://hackage.haskell.org/package/HDBC-sqlite3-2.3.3.1/HDBC-sqlite3-2.3.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a5c9fe53c9a36d46f41f673fc83583da
diff --git a/metadata/md5-cache/dev-haskell/heaps-0.3.6.1 b/metadata/md5-cache/dev-haskell/heaps-0.3.6.1
index 831e5be3f81b..ab759e0c4bc2 100644
--- a/metadata/md5-cache/dev-haskell/heaps-0.3.6.1
+++ b/metadata/md5-cache/dev-haskell/heaps-0.3.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.6.1
 SRC_URI=https://hackage.haskell.org/package/heaps-0.3.6.1/heaps-0.3.6.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=84da6a2ebbba5330407246913fdc30b3
diff --git a/metadata/md5-cache/dev-haskell/hedgehog-1.0.4 b/metadata/md5-cache/dev-haskell/hedgehog-1.0.4
index 8c9762916fa6..570459018df9 100644
--- a/metadata/md5-cache/dev-haskell/hedgehog-1.0.4
+++ b/metadata/md5-cache/dev-haskell/hedgehog-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0
 RESTRICT=!test? ( test )
 SLOT=0/1.0.4
 SRC_URI=https://hackage.haskell.org/package/hedgehog-1.0.4/hedgehog-1.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b42615b0bd172835b0643584311dcba
diff --git a/metadata/md5-cache/dev-haskell/hex-0.1.2 b/metadata/md5-cache/dev-haskell/hex-0.1.2
index 48251e9d559d..a991429fe381 100644
--- a/metadata/md5-cache/dev-haskell/hex-0.1.2
+++ b/metadata/md5-cache/dev-haskell/hex-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.8.1:=
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/hex-0.1.2/hex-0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c5723cd033e8747e681641ded79772d4
diff --git a/metadata/md5-cache/dev-haskell/hexpat-0.20.13 b/metadata/md5-cache/dev-haskell/hexpat-0.20.13
index bc40e650e6a8..f23240ba8acc 100644
--- a/metadata/md5-cache/dev-haskell/hexpat-0.20.13
+++ b/metadata/md5-cache/dev-haskell/hexpat-0.20.13
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/expat
 SLOT=0/0.20.13
 SRC_URI=https://hackage.haskell.org/package/hexpat-0.20.13/hexpat-0.20.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a1e54c0a2e6a571d775a6b0b9988dba
diff --git a/metadata/md5-cache/dev-haskell/hi-file-parser-0.1.0.0 b/metadata/md5-cache/dev-haskell/hi-file-parser-0.1.0.0
index 32a481b97a85..1c97e478d737 100644
--- a/metadata/md5-cache/dev-haskell/hi-file-parser-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/hi-file-parser-0.1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/rio-0.1.9.2:=[profile?] >=dev-haskell/vector-0.12.0.1:=[pr
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/hi-file-parser-0.1.0.0/hi-file-parser-0.1.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f367d01ccdfe2e69314ba3fb095226bc
diff --git a/metadata/md5-cache/dev-haskell/highlighting-kate-0.6.4 b/metadata/md5-cache/dev-haskell/highlighting-kate-0.6.4
index ae83aba992ac..e490398785f8 100644
--- a/metadata/md5-cache/dev-haskell/highlighting-kate-0.6.4
+++ b/metadata/md5-cache/dev-haskell/highlighting-kate-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.10:
 RESTRICT=!test? ( test )
 SLOT=0/0.6.4
 SRC_URI=https://hackage.haskell.org/package/highlighting-kate-0.6.4/highlighting-kate-0.6.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f6a1d723412447081cd5c62f60da5e19
diff --git a/metadata/md5-cache/dev-haskell/hinotify-0.3.10 b/metadata/md5-cache/dev-haskell/hinotify-0.3.10
index 28c740b5f973..01f4e85ae707 100644
--- a/metadata/md5-cache/dev-haskell/hinotify-0.3.10
+++ b/metadata/md5-cache/dev-haskell/hinotify-0.3.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/0.3.10
 SRC_URI=https://hackage.haskell.org/package/hinotify-0.3.10/hinotify-0.3.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c624eeb0393e42d828bbb86872e5987
diff --git a/metadata/md5-cache/dev-haskell/hit-0.7.0 b/metadata/md5-cache/dev-haskell/hit-0.7.0
index c07521778f78..6d4a15b00dee 100644
--- a/metadata/md5-cache/dev-haskell/hit-0.7.0
+++ b/metadata/md5-cache/dev-haskell/hit-0.7.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/git-0.3.0:= >=dev-haskell/hashable-1.2:= dev-haskell/hashtables:= dev-haskell/hourglass:= >=dev-lang/ghc-7.4.1:=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hit-0.7.0/hit-0.7.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b31ad478e1870580233f40b1acaf26be
diff --git a/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4 b/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
index 4e08dc955c4e..6fb9ceae5446 100644
--- a/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
+++ b/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-
 RESTRICT=test
 SLOT=0/0.2.0.4
 SRC_URI=https://hackage.haskell.org/package/hjsmin-0.2.0.4/hjsmin-0.2.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e248adb12b4a25bbea519c6a08e6d112
diff --git a/metadata/md5-cache/dev-haskell/hlint-3.2.7 b/metadata/md5-cache/dev-haskell/hlint-3.2.7
index 5b1ddbf464b9..97223092fa90 100644
--- a/metadata/md5-cache/dev-haskell/hlint-3.2.7
+++ b/metadata/md5-cache/dev-haskell/hlint-3.2.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] >=dev-haskell/ansi-terminal-0.8.
 RESTRICT=!test? ( test )
 SLOT=0/3.2.7
 SRC_URI=https://hackage.haskell.org/package/hlint-3.2.7/hlint-3.2.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=42541a254b41077d7f5ed236bcf5181b
diff --git a/metadata/md5-cache/dev-haskell/hoauth2-1.16.0 b/metadata/md5-cache/dev-haskell/hoauth2-1.16.0
index cecbca986578..12a620750a50 100644
--- a/metadata/md5-cache/dev-haskell/hoauth2-1.16.0
+++ b/metadata/md5-cache/dev-haskell/hoauth2-1.16.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/binary-0.8.3:=[profile?] >=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?] >=dev-haskell/uri-bytestring-aeson-0.1:=[profile?] <dev-haskell/uri-bytestring-aeson-0.2:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/1.16.0
 SRC_URI=https://hackage.haskell.org/package/hoauth2-1.16.0/hoauth2-1.16.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f7bd7e89d446e30a55561954b3bfaac9
diff --git a/metadata/md5-cache/dev-haskell/hostname-1.0-r1 b/metadata/md5-cache/dev-haskell/hostname-1.0-r1
index babdf1fdba69..0cae7081553c 100644
--- a/metadata/md5-cache/dev-haskell/hostname-1.0-r1
+++ b/metadata/md5-cache/dev-haskell/hostname-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/hostname-1.0/hostname-1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a4c7da7a22c107fa32b06fcb12f7612f
diff --git a/metadata/md5-cache/dev-haskell/hourglass-0.2.12 b/metadata/md5-cache/dev-haskell/hourglass-0.2.12
index 353d518bb820..154a39da54e3 100644
--- a/metadata/md5-cache/dev-haskell/hourglass-0.2.12
+++ b/metadata/md5-cache/dev-haskell/hourglass-0.2.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.12
 SRC_URI=https://hackage.haskell.org/package/hourglass-0.2.12/hourglass-0.2.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd3a0887df2c0b0daed11693a5300a6b
diff --git a/metadata/md5-cache/dev-haskell/hpack-0.33.0 b/metadata/md5-cache/dev-haskell/hpack-0.33.0
index a68caf0441f3..eb084701c0a7 100644
--- a/metadata/md5-cache/dev-haskell/hpack-0.33.0
+++ b/metadata/md5-cache/dev-haskell/hpack-0.33.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.4.3.0:=[profile?] dev-haskell/bifunctors:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.33.0
 SRC_URI=https://hackage.haskell.org/package/hpack-0.33.0/hpack-0.33.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=518fd1e9bf53af59b23823854ffbddd6
diff --git a/metadata/md5-cache/dev-haskell/hps-0.15 b/metadata/md5-cache/dev-haskell/hps-0.15
index 7524981c46e3..8fcbc4d569ae 100644
--- a/metadata/md5-cache/dev-haskell/hps-0.15
+++ b/metadata/md5-cache/dev-haskell/hps-0.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?] >=dev-lang/ghc-7.4.1:= build-exec? ( dev-haskell/random:=[profile?] )
 SLOT=0/0.15
 SRC_URI=https://hackage.haskell.org/package/hps-0.15/hps-0.15.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b7282921d232ca2de89b56dd498ba6f
diff --git a/metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0 b/metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0
index 5019411a4a05..614449d7033c 100644
--- a/metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0
+++ b/metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/6.8.0.0
 SRC_URI=https://hackage.haskell.org/package/hs-bibutils-6.8.0.0/hs-bibutils-6.8.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=70bb1242a9673ec4c7e8304ee91ac4dd
diff --git a/metadata/md5-cache/dev-haskell/hs3-0.5.9 b/metadata/md5-cache/dev-haskell/hs3-0.5.9
index 7239fc8ff149..ceb805c50f8c 100644
--- a/metadata/md5-cache/dev-haskell/hs3-0.5.9
+++ b/metadata/md5-cache/dev-haskell/hs3-0.5.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/crypto-4.1.0:=[profile?] dev-haskell/dataenc:=[profile?] >=dev-haskell/http-4000.0.0:=[profile?] >=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?] >=dev-haskell/missingh-0.18.6:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] )
 SLOT=0/0.5.9
 SRC_URI=https://hackage.haskell.org/package/hS3-0.5.9/hS3-0.5.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82c3a6493c9794a44fca1abc530206db
diff --git a/metadata/md5-cache/dev-haskell/hsb2hs-0.3.1 b/metadata/md5-cache/dev-haskell/hsb2hs-0.3.1
index f66579b6a0a5..dcc97f67e6a0 100644
--- a/metadata/md5-cache/dev-haskell/hsb2hs-0.3.1
+++ b/metadata/md5-cache/dev-haskell/hsb2hs-0.3.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>dev-haskell/preprocessor-tools-1.0:= >=dev-lang/ghc-7.4.1:=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hsb2hs-0.3.1/hsb2hs-0.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=171409fe86e768859047cd8aec2103d2
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.24.4 b/metadata/md5-cache/dev-haskell/hscolour-1.24.4
index 289b1dbad7f4..1e13bd3ff85c 100644
--- a/metadata/md5-cache/dev-haskell/hscolour-1.24.4
+++ b/metadata/md5-cache/dev-haskell/hscolour-1.24.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.24.4
 SRC_URI=https://hackage.haskell.org/package/hscolour-1.24.4/hscolour-1.24.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=716fbd0425166ef7ddc6aa3d239d6d0d
diff --git a/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1 b/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
index 29242d36dced..5537b4780e59 100644
--- a/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[p
 RESTRICT=!test? ( test )
 SLOT=0/1.3.1.0
 SRC_URI=https://hackage.haskell.org/package/hslogger-1.3.1.0/hslogger-1.3.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27e6df689e006a22d3eb37bd9ff50088
diff --git a/metadata/md5-cache/dev-haskell/hslua-1.0.3.1 b/metadata/md5-cache/dev-haskell/hslua-1.0.3.1
index b9b950a14587..f4af86734f0c 100644
--- a/metadata/md5-cache/dev-haskell/hslua-1.0.3.1
+++ b/metadata/md5-cache/dev-haskell/hslua-1.0.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[
 RESTRICT=!test? ( test )
 SLOT=0/1.0.3.1
 SRC_URI=https://hackage.haskell.org/package/hslua-1.0.3.1/hslua-1.0.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=feb68bfe8d471a3c5fe783fb5e553e3f
diff --git a/metadata/md5-cache/dev-haskell/hslua-1.1.2 b/metadata/md5-cache/dev-haskell/hslua-1.1.2
index 16db5e960272..6b40eec5e8a7 100644
--- a/metadata/md5-cache/dev-haskell/hslua-1.1.2
+++ b/metadata/md5-cache/dev-haskell/hslua-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/exceptions-0.8:
 RESTRICT=!test? ( test )
 SLOT=0/1.1.2
 SRC_URI=https://hackage.haskell.org/package/hslua-1.1.2/hslua-1.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f64acea6a18ef8d9d48eb5cc8fa2b9f6
diff --git a/metadata/md5-cache/dev-haskell/hslua-1.3.0.1 b/metadata/md5-cache/dev-haskell/hslua-1.3.0.1
index ee13e7889419..25b6fcd4e522 100644
--- a/metadata/md5-cache/dev-haskell/hslua-1.3.0.1
+++ b/metadata/md5-cache/dev-haskell/hslua-1.3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/exceptions-0.8:
 RESTRICT=!test? ( test )
 SLOT=0/1.3.0.1
 SRC_URI=https://hackage.haskell.org/package/hslua-1.3.0.1/hslua-1.3.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=107aedf7e8cc1f69eef3b674439dad48
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-path-0.1.0.1 b/metadata/md5-cache/dev-haskell/hslua-module-path-0.1.0.1
index e56291fb8b8b..0d717d5d4aa3 100644
--- a/metadata/md5-cache/dev-haskell/hslua-module-path-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/hslua-module-path-0.1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/hslua-module-path-0.1.0.1/hslua-module-path-0.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4ebcc9ea6d26179a799fbe1bb4a2d106
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.2.1 b/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.2.1
index a557ab0ab3c3..e543416001fb 100644
--- a/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.2.1
+++ b/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[
 RESTRICT=!test? ( test )
 SLOT=0/0.2.2.1
 SRC_URI=https://hackage.haskell.org/package/hslua-module-system-0.2.2.1/hslua-module-system-0.2.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=de5963a676601b4f5bcf0dde2a067f9d
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1 b/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
index 7eab37c6de99..00ffc380a0d2 100644
--- a/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
+++ b/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1
 SRC_URI=https://hackage.haskell.org/package/hslua-module-text-0.2.1/hslua-module-text-0.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0c7de546a9a151c3badfa79bfb5952e5
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-text-0.3.0.1 b/metadata/md5-cache/dev-haskell/hslua-module-text-0.3.0.1
index f662acd62fdb..887dd7b33180 100644
--- a/metadata/md5-cache/dev-haskell/hslua-module-text-0.3.0.1
+++ b/metadata/md5-cache/dev-haskell/hslua-module-text-0.3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0.1
 SRC_URI=https://hackage.haskell.org/package/hslua-module-text-0.3.0.1/hslua-module-text-0.3.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa7a49571774cbabd8d9182066e0729c
diff --git a/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17-r1 b/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17-r1
index 2ff348bcf5a3..b9c0315610a7 100644
--- a/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17-r1
+++ b/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3.2:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.11.4.17
 SRC_URI=https://hackage.haskell.org/package/HsOpenSSL-0.11.4.17/HsOpenSSL-0.11.4.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d7377113b40d882528709c38d6999618
diff --git a/metadata/md5-cache/dev-haskell/hspec-2.7.1 b/metadata/md5-cache/dev-haskell/hspec-2.7.1
index 0d535b57e915..7ea3117a76a6 100644
--- a/metadata/md5-cache/dev-haskell/hspec-2.7.1
+++ b/metadata/md5-cache/dev-haskell/hspec-2.7.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=~dev-haskell/hspec-core-2.7.1:=[profile?] ~dev-haskell/hspec-discover-2.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.7.1
 SRC_URI=https://hackage.haskell.org/package/hspec-2.7.1/hspec-2.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0e6f3eb973040de975b28c4d2271a0d
diff --git a/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1 b/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
index 5543bd7b929f..9902cbe7ce4b 100644
--- a/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
+++ b/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hspec-core-2.5.0:=[profile?] dev-haskell/hunit:=[profile?]
 RESTRICT=test
 SLOT=0/0.5.1
 SRC_URI=https://hackage.haskell.org/package/hspec-contrib-0.5.1/hspec-contrib-0.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f888d708245957c1283ccb35f6ff2133
diff --git a/metadata/md5-cache/dev-haskell/hspec-core-2.7.1 b/metadata/md5-cache/dev-haskell/hspec-core-2.7.1
index 14edced9c4b5..54982532ab6d 100644
--- a/metadata/md5-cache/dev-haskell/hspec-core-2.7.1
+++ b/metadata/md5-cache/dev-haskell/hspec-core-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/call-stack:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/2.7.1
 SRC_URI=https://hackage.haskell.org/package/hspec-core-2.7.1/hspec-core-2.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=787c31005019ed3711af0d020f48b250
diff --git a/metadata/md5-cache/dev-haskell/hspec-discover-2.7.1 b/metadata/md5-cache/dev-haskell/hspec-discover-2.7.1
index 9e178b6fc73d..f13a42be75da 100644
--- a/metadata/md5-cache/dev-haskell/hspec-discover-2.7.1
+++ b/metadata/md5-cache/dev-haskell/hspec-discover-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.7.1
 SRC_URI=https://hackage.haskell.org/package/hspec-discover-2.7.1/hspec-discover-2.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f1c3867624b9b07654bebb646d38c53d
diff --git a/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2 b/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
index 2c5f686e4ce0..b20b09f1ed26 100644
--- a/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
+++ b/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/call-stack:=[profile?] dev-haskell/hunit:=[profile?] >=dev-l
 RESTRICT=!test? ( test )
 SLOT=0/0.8.2
 SRC_URI=https://hackage.haskell.org/package/hspec-expectations-0.8.2/hspec-expectations-0.8.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8cd32758c8b62855a2eb1706cd7bc47e
diff --git a/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0 b/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
index a74c65df97ae..c6e48a68e0d4 100644
--- a/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
+++ b/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/call-stack:=[profile?] dev-haskell/clock:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/2.6.0
 SRC_URI=https://hackage.haskell.org/package/hspec-meta-2.6.0/hspec-meta-2.6.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e3e2128b16828618e94962a6a80d8196
diff --git a/metadata/md5-cache/dev-haskell/hspec-smallcheck-0.5.2 b/metadata/md5-cache/dev-haskell/hspec-smallcheck-0.5.2
index 9d024e513e61..ad86d7842ab3 100644
--- a/metadata/md5-cache/dev-haskell/hspec-smallcheck-0.5.2
+++ b/metadata/md5-cache/dev-haskell/hspec-smallcheck-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-haskell/hspec-core-2.5.0:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.5.2
 SRC_URI=https://hackage.haskell.org/package/hspec-smallcheck-0.5.2/hspec-smallcheck-0.5.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1702d5cd4717e2e673ca9af9df0def1
diff --git a/metadata/md5-cache/dev-haskell/hsql-1.8.2-r1 b/metadata/md5-cache/dev-haskell/hsql-1.8.2-r1
index 5b5926a642a4..fe20ea1a4763 100644
--- a/metadata/md5-cache/dev-haskell/hsql-1.8.2-r1
+++ b/metadata/md5-cache/dev-haskell/hsql-1.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.8.2
 SRC_URI=https://hackage.haskell.org/package/hsql-1.8.2/hsql-1.8.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b030c6db100e88dbd462287b7c3e3246
diff --git a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1 b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1
index 5176604ae4d5..3ec0997b3497 100644
--- a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1
+++ b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 dev-db/mysql-connector-c:0=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hsql-mysql-1.8.2/hsql-mysql-1.8.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=992ad53d7ac9be3bec196b366f3b4b33
diff --git a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.3 b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.3
index fb02fe6b6a38..3de069a0f58c 100644
--- a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.3
+++ b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 dev-db/mysql-connector-c:0=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hsql-mysql-1.8.3/hsql-mysql-1.8.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=75bcbd3526c1736cdeef0648a5211785
diff --git a/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2 b/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
index 4f911b34b8fe..d2415cd75df9 100644
--- a/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
+++ b/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.1:= >=dev-db/unixODBC-2.2
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hsql-odbc-1.8.2/hsql-odbc-1.8.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=09a301af05c8e5cc4f3fca0f95b53f21
diff --git a/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1 b/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
index 6a4e0b8da9b9..0d111a88fcc9 100644
--- a/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
+++ b/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.8.2
 SRC_URI=https://hackage.haskell.org/package/hsql-sqlite3-1.8.2/hsql-sqlite3-1.8.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82f12bcad5dce4956fefaa649cab4371
diff --git a/metadata/md5-cache/dev-haskell/hstringtemplate-0.8.7 b/metadata/md5-cache/dev-haskell/hstringtemplate-0.8.7
index 3cabd3dfc193..6d4c4e2e7c8e 100644
--- a/metadata/md5-cache/dev-haskell/hstringtemplate-0.8.7
+++ b/metadata/md5-cache/dev-haskell/hstringtemplate-0.8.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.8.7
 SRC_URI=https://hackage.haskell.org/package/HStringTemplate-0.8.7/HStringTemplate-0.8.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=670e6ecaed7fe8089f306a974fe78676
diff --git a/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0 b/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
index a9fc68af47d6..c276308d7675 100644
--- a/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
+++ b/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1.0
 SRC_URI=https://hackage.haskell.org/package/HsYAML-0.2.1.0/HsYAML-0.2.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=90ce740f06da41c3d795cb99fe7f22ac
diff --git a/metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0 b/metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0
index d15f94009eab..832f4625d55c 100644
--- a/metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0
+++ b/metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/hsyaml-0.2.0:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.12.0.2:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0.0
 SRC_URI=https://hackage.haskell.org/package/HsYAML-aeson-0.2.0.0/HsYAML-aeson-0.2.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c4c8b169d544c38e889817f0bf22c8e
diff --git a/metadata/md5-cache/dev-haskell/htf-0.14.0.3 b/metadata/md5-cache/dev-haskell/htf-0.14.0.3
index f9ae6e016b41..e4d27966a716 100644
--- a/metadata/md5-cache/dev-haskell/htf-0.14.0.3
+++ b/metadata/md5-cache/dev-haskell/htf-0.14.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.11:= dev-haskell/base64-bytestring:= >=dev-haskell
 RESTRICT=test
 SLOT=0/0.14.0.3
 SRC_URI=https://hackage.haskell.org/package/HTF-0.14.0.3/HTF-0.14.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1a26272f7e36318ab802fa01cdc8011
diff --git a/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1 b/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
index 1f0ede70a53c..bcc56fcfe2c8 100644
--- a/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
+++ b/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.2
 SRC_URI=https://hackage.haskell.org/package/html-1.0.1.2/html-1.0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f196367cbaa23a0dcb409adaf6c6ad97
diff --git a/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1 b/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
index aaf5010acab5..df6ba2bf58c2 100644
--- a/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
+++ b/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-1.3:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.3.2.1
 SRC_URI=https://hackage.haskell.org/package/html-conduit-1.3.2.1/html-conduit-1.3.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=da6acd1337de78d1d223d3f9eb46c588
diff --git a/metadata/md5-cache/dev-haskell/http-4000.3.14 b/metadata/md5-cache/dev-haskell/http-4000.3.14
index 4cbd3cfd8291..f46911fadd1f 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.3.14
+++ b/metadata/md5-cache/dev-haskell/http-4000.3.14
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev
 RESTRICT=test
 SLOT=0/4000.3.14
 SRC_URI=https://hackage.haskell.org/package/HTTP-4000.3.14/HTTP-4000.3.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ea670444c4edd95669e0a1c64f13ff8f
diff --git a/metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1 b/metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1
index 17f34e3842b9..bf9347b90102 100644
--- a/metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1
+++ b/metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.
 RESTRICT=!test? ( test )
 SLOT=0/0.4.1.1
 SRC_URI=https://hackage.haskell.org/package/http-api-data-0.4.1.1/http-api-data-0.4.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=16e66c4e7acad8dab7309ecc0ab87ff1
diff --git a/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.1-r3 b/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.1-r3
index 331e631acdff..5d64656d1090 100644
--- a/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.1-r3
+++ b/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.1-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/http-types-0.8.0:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/http-attoparsec-0.1.1/http-attoparsec-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2b3485e96b2e982f52db1c3d8ddacfc
diff --git a/metadata/md5-cache/dev-haskell/http-client-0.6.4.1 b/metadata/md5-cache/dev-haskell/http-client-0.6.4.1
index ca2970c3bcc0..18117d6ba6c1 100644
--- a/metadata/md5-cache/dev-haskell/http-client-0.6.4.1
+++ b/metadata/md5-cache/dev-haskell/http-client-0.6.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensiti
 RESTRICT=test
 SLOT=0/0.6.4.1
 SRC_URI=https://hackage.haskell.org/package/http-client-0.6.4.1/http-client-0.6.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a1b4a342b4ace90f7c85669359d9ef9
diff --git a/metadata/md5-cache/dev-haskell/http-client-conduit-0.3.0 b/metadata/md5-cache/dev-haskell/http-client-conduit-0.3.0
index fae3132b4d91..a16ea79850ed 100644
--- a/metadata/md5-cache/dev-haskell/http-client-conduit-0.3.0
+++ b/metadata/md5-cache/dev-haskell/http-client-conduit-0.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/http-client-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/http-client-conduit-0.3.0/http-client-conduit-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8cb0441b1a92050394ab2304218a389e
diff --git a/metadata/md5-cache/dev-haskell/http-client-multipart-0.3.0.0 b/metadata/md5-cache/dev-haskell/http-client-multipart-0.3.0.0
index 2f09850937ad..9f623968fefc 100644
--- a/metadata/md5-cache/dev-haskell/http-client-multipart-0.3.0.0
+++ b/metadata/md5-cache/dev-haskell/http-client-multipart-0.3.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/http-client-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.0
 SRC_URI=https://hackage.haskell.org/package/http-client-multipart-0.3.0.0/http-client-multipart-0.3.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=91f900f5295d53054ad13f959b50a76a
diff --git a/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3 b/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
index 1b365d6b6389..ba8835fcf7e1 100644
--- a/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
+++ b/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] <dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-client-tls-0.3.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/network-3.0.0.0:=[profile?] dev-haskell/network-bsd:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.0.3
 SRC_URI=https://hackage.haskell.org/package/http-client-restricted-0.0.3/http-client-restricted-0.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4fa8eb38be64aef405f44eac68a4277b
diff --git a/metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3 b/metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3
index 31d725c567de..bf0f6f10c07f 100644
--- a/metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3
+++ b/metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/case-insensitive:=[profile?] >=dev-haskell/connection-0.2.5:
 RESTRICT=test
 SLOT=0/0.3.5.3
 SRC_URI=https://hackage.haskell.org/package/http-client-tls-0.3.5.3/http-client-tls-0.3.5.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aad30ac0507b68b79e1992bfdc7c9727
diff --git a/metadata/md5-cache/dev-haskell/http-common-0.8.2.1 b/metadata/md5-cache/dev-haskell/http-common-0.8.2.1
index 3e2ebae07912..04aaaf18d778 100644
--- a/metadata/md5-cache/dev-haskell/http-common-0.8.2.1
+++ b/metadata/md5-cache/dev-haskell/http-common-0.8.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.8.2.1
 SRC_URI=https://hackage.haskell.org/package/http-common-0.8.2.1/http-common-0.8.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18ca5791be9e2215a32965f220ed7fcf
diff --git a/metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3 b/metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3
index 220661f24245..329f3adcd247 100644
--- a/metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3
+++ b/metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] >
 RESTRICT=test
 SLOT=0/2.3.7.3
 SRC_URI=https://hackage.haskell.org/package/http-conduit-2.3.7.3/http-conduit-2.3.7.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d711f1b13ae83b1538b0d5e941ec09c
diff --git a/metadata/md5-cache/dev-haskell/http-date-0.0.8 b/metadata/md5-cache/dev-haskell/http-date-0.0.8
index 15225b4296f7..e575da91a36c 100644
--- a/metadata/md5-cache/dev-haskell/http-date-0.0.8
+++ b/metadata/md5-cache/dev-haskell/http-date-0.0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.0.8
 SRC_URI=https://hackage.haskell.org/package/http-date-0.0.8/http-date-0.0.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db7a744ea5b5ba0ceb69c2da96f18f04
diff --git a/metadata/md5-cache/dev-haskell/http-download-0.2.0.0 b/metadata/md5-cache/dev-haskell/http-download-0.2.0.0
index ff6bb33c8b05..2b4091b83d75 100644
--- a/metadata/md5-cache/dev-haskell/http-download-0.2.0.0
+++ b/metadata/md5-cache/dev-haskell/http-download-0.2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/conduit:=[profile?
 RESTRICT=test
 SLOT=0/0.2.0.0
 SRC_URI=https://hackage.haskell.org/package/http-download-0.2.0.0/http-download-0.2.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5fa04488ebbfb9d4dea6456b53e9adca
diff --git a/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.4.3.2 b/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.4.3.2
index 80ef664a7926..c2e2ecba9e73 100644
--- a/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.4.3.2
+++ b/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.4.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3.2
 SRC_URI=https://hackage.haskell.org/package/http-reverse-proxy-0.4.3.2/http-reverse-proxy-0.4.3.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a30883e78bc99c3dbcce1ac687255a1
diff --git a/metadata/md5-cache/dev-haskell/http-streams-0.8.7.2 b/metadata/md5-cache/dev-haskell/http-streams-0.8.7.2
index d43b3e4b1880..0a2442a1d048 100644
--- a/metadata/md5-cache/dev-haskell/http-streams-0.8.7.2
+++ b/metadata/md5-cache/dev-haskell/http-streams-0.8.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-has
 RESTRICT=test
 SLOT=0/0.8.7.2
 SRC_URI=https://hackage.haskell.org/package/http-streams-0.8.7.2/http-streams-0.8.7.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68cb6311da8088ef8e3b1d9608bfbc2b
diff --git a/metadata/md5-cache/dev-haskell/http-types-0.12.3 b/metadata/md5-cache/dev-haskell/http-types-0.12.3
index 211dc1818cba..163772cc9d0e 100644
--- a/metadata/md5-cache/dev-haskell/http-types-0.12.3
+++ b/metadata/md5-cache/dev-haskell/http-types-0.12.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensi
 RESTRICT=!test? ( test )
 SLOT=0/0.12.3
 SRC_URI=https://hackage.haskell.org/package/http-types-0.12.3/http-types-0.12.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=900591806c9d69401dfb3397873c599b
diff --git a/metadata/md5-cache/dev-haskell/http2-2.0.3 b/metadata/md5-cache/dev-haskell/http2-2.0.3
index a96dab10265b..c2b9d5a3f856 100644
--- a/metadata/md5-cache/dev-haskell/http2-2.0.3
+++ b/metadata/md5-cache/dev-haskell/http2-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/case-insensitive:=[profile?] dev-haskell/http-types:=[profil
 RESTRICT=!test? ( test )
 SLOT=0/2.0.3
 SRC_URI=https://hackage.haskell.org/package/http2-2.0.3/http2-2.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58755d80bdc7cc883c801683931d341c
diff --git a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1 b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
index 1bba0f0f36c7..c39aade49c0e 100644
--- a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
+++ b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.5:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] network-bsd? ( >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-2.7:=[profile?] ) !network-bsd? ( <dev-haskell/network-2.7:=[profile?] ) network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/network-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] )
 SLOT=0/0.4.1.1
 SRC_URI=https://hackage.haskell.org/package/httpd-shed-0.4.1.1/httpd-shed-0.4.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=391e6750c4ff4c2e7251d4b618e62b04
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1 b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
index 0a3eb0308796..c46131d810df 100644
--- a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
+++ b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.5.2
 SRC_URI=https://hackage.haskell.org/package/HUnit-1.2.5.2/HUnit-1.2.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d2cd814822779253a71d5d753247bd5
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.6.0.0 b/metadata/md5-cache/dev-haskell/hunit-1.6.0.0
index f878edf63eac..3fb97208889d 100644
--- a/metadata/md5-cache/dev-haskell/hunit-1.6.0.0
+++ b/metadata/md5-cache/dev-haskell/hunit-1.6.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.0.0
 SRC_URI=https://hackage.haskell.org/package/HUnit-1.6.0.0/HUnit-1.6.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=df91456e08dc07205f22e4726f67f9fe
diff --git a/metadata/md5-cache/dev-haskell/hxt-9.3.1.18 b/metadata/md5-cache/dev-haskell/hxt-9.3.1.18
index cccda7f9f31c..f996246c8b7e 100644
--- a/metadata/md5-cache/dev-haskell/hxt-9.3.1.18
+++ b/metadata/md5-cache/dev-haskell/hxt-9.3.1.18
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/hxt-charproperties-9.1:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/network-uri-2.6:=[profile?]
 SLOT=0/9.3.1.18
 SRC_URI=https://hackage.haskell.org/package/hxt-9.3.1.18/hxt-9.3.1.18.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=118a6df1a915e1a42b23adc36891a6e4
diff --git a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0 b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0
index 9058c86e451f..a23154d27ab5 100644
--- a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0
+++ b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/9.4.0.0
 SRC_URI=https://hackage.haskell.org/package/hxt-charproperties-9.4.0.0/hxt-charproperties-9.4.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=79635efdb23b0621e03874efd023ace6
diff --git a/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.2.0.3 b/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.2.0.3
index 3feb297b804c..8c5f353db740 100644
--- a/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.2.0.3
+++ b/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.2.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charprop
 RESTRICT=!test? ( test )
 SLOT=0/9.2.0.3
 SRC_URI=https://hackage.haskell.org/package/hxt-regex-xmlschema-9.2.0.3/hxt-regex-xmlschema-9.2.0.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7eb53e69258450e6714229b45a87241
diff --git a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4 b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
index f81cdf2cfa0c..69bc230df63b 100644
--- a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
+++ b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/9.0.2.4
 SRC_URI=https://hackage.haskell.org/package/hxt-unicode-9.0.2.4/hxt-unicode-9.0.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=079eaf572b20b7ae007692c61346c698
diff --git a/metadata/md5-cache/dev-haskell/icalendar-0.4.0.5-r1 b/metadata/md5-cache/dev-haskell/icalendar-0.4.0.5-r1
index 34a49a77361f..ef14f86a9179 100644
--- a/metadata/md5-cache/dev-haskell/icalendar-0.4.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/icalendar-0.4.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/mime-0.4.0.2:=[profile?] >=dev-haskell/mtl-2.1.0:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.4.0.5
 SRC_URI=https://hackage.haskell.org/package/iCalendar-0.4.0.5/iCalendar-0.4.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e277dfd5ae974c685673ecaa5ef76738
diff --git a/metadata/md5-cache/dev-haskell/iconv-0.4.1.3 b/metadata/md5-cache/dev-haskell/iconv-0.4.1.3
index f71280dff8f9..a9d4e27b14c8 100644
--- a/metadata/md5-cache/dev-haskell/iconv-0.4.1.3
+++ b/metadata/md5-cache/dev-haskell/iconv-0.4.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.1.3
 SRC_URI=https://hackage.haskell.org/package/iconv-0.4.1.3/iconv-0.4.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c6c176edf62b191e99e9d82ee717d711
diff --git a/metadata/md5-cache/dev-haskell/idiii-0.1.3.3 b/metadata/md5-cache/dev-haskell/idiii-0.1.3.3
index fdc1f5bfedb2..bc3361eef489 100644
--- a/metadata/md5-cache/dev-haskell/idiii-0.1.3.3
+++ b/metadata/md5-cache/dev-haskell/idiii-0.1.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/data-accessor:=[profile?] dev-haskell/missingh:=[profile?] d
 RESTRICT=test
 SLOT=0/0.1.3.3
 SRC_URI=https://hackage.haskell.org/package/idiii-0.1.3.3/idiii-0.1.3.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fbf603c72635faba798935250358e155
diff --git a/metadata/md5-cache/dev-haskell/idna-0.3.0 b/metadata/md5-cache/dev-haskell/idna-0.3.0
index 1a97cfe52128..93af17c23e7c 100644
--- a/metadata/md5-cache/dev-haskell/idna-0.3.0
+++ b/metadata/md5-cache/dev-haskell/idna-0.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/punycode-2.0:=[profile?] >=dev-haskell/stringprep-1:=[profile?] <dev-haskell/stringprep-2:=[profile?] >=dev-haskell/text-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/idna-0.3.0/idna-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c90c09cbab9561fd035257d85d446e11
diff --git a/metadata/md5-cache/dev-haskell/ieee754-0.7.8 b/metadata/md5-cache/dev-haskell/ieee754-0.7.8
index 9410160a994d..21c041554473 100644
--- a/metadata/md5-cache/dev-haskell/ieee754-0.7.8
+++ b/metadata/md5-cache/dev-haskell/ieee754-0.7.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.8
 SRC_URI=https://hackage.haskell.org/package/ieee754-0.7.8/ieee754-0.7.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35bc49bf1db739218b93eeb5b6a6b781
diff --git a/metadata/md5-cache/dev-haskell/ifelse-0.85-r1 b/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
index 6ef304d0504a..f614684833c5 100644
--- a/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
+++ b/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.85
 SRC_URI=https://hackage.haskell.org/package/IfElse-0.85/IfElse-0.85.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=693b724c6457b03479c7a79cc3875094
diff --git a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1 b/metadata/md5-cache/dev-haskell/indexed-traversable-0.1
index ab6608bee118..162ff3e54fed 100644
--- a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1
+++ b/metadata/md5-cache/dev-haskell/indexed-traversable-0.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/indexed-traversable-0.1/indexed-traversable-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ea4c0734db7ea67b28ee9068ada0d8a6
diff --git a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1.1 b/metadata/md5-cache/dev-haskell/indexed-traversable-0.1.1
index 4058b4b482be..b4a3a6e44eca 100644
--- a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1.1
+++ b/metadata/md5-cache/dev-haskell/indexed-traversable-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/indexed-traversable-0.1.1/indexed-traversable-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1cd95ff50db7914ee352e17072bfbc53
diff --git a/metadata/md5-cache/dev-haskell/infer-license-0.2.0 b/metadata/md5-cache/dev-haskell/infer-license-0.2.0
index 13c73ec4288c..a1212982e061 100644
--- a/metadata/md5-cache/dev-haskell/infer-license-0.2.0
+++ b/metadata/md5-cache/dev-haskell/infer-license-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/text:=[profile?] >=dev-haskell/text-metrics-0.3.0:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/infer-license-0.2.0/infer-license-0.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ae0e78bd6b45c43f27b115d07cf81b7b
diff --git a/metadata/md5-cache/dev-haskell/inspection-testing-0.4.2.4 b/metadata/md5-cache/dev-haskell/inspection-testing-0.4.2.4
index 4eafad7dcd14..fa1b87762624 100644
--- a/metadata/md5-cache/dev-haskell/inspection-testing-0.4.2.4
+++ b/metadata/md5-cache/dev-haskell/inspection-testing-0.4.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-8.0.1:=
 RESTRICT=test
 SLOT=0/0.4.2.4
 SRC_URI=https://hackage.haskell.org/package/inspection-testing-0.4.2.4/inspection-testing-0.4.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ed6877032db8aafa8151f642a282b3fd
diff --git a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3 b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
index 87b2e4c6062d..49ad5ecdbbcb 100644
--- a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
+++ b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >
 RESTRICT=test
 SLOT=0/1.0.3
 SRC_URI=https://hackage.haskell.org/package/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a5df11a393b417de735b2ffb1fa1f69
diff --git a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1 b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1
index bf1fb8fd01c8..e8f9b01e92f5 100644
--- a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1
+++ b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/1.0.3.1
 SRC_URI=https://hackage.haskell.org/package/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac88ca4bbeba76b204d4d350b76ef620
diff --git a/metadata/md5-cache/dev-haskell/integer-roots-1.0 b/metadata/md5-cache/dev-haskell/integer-roots-1.0
index 801e2c2e55fa..ae2fb1c1fec3 100644
--- a/metadata/md5-cache/dev-haskell/integer-roots-1.0
+++ b/metadata/md5-cache/dev-haskell/integer-roots-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.0.1:=[gmp]
 RESTRICT=test
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/integer-roots-1.0/integer-roots-1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2470862d24e853a7ec9d35d2619535d7
diff --git a/metadata/md5-cache/dev-haskell/interpolate-0.2.0 b/metadata/md5-cache/dev-haskell/interpolate-0.2.0
index b1622f783593..666f7df5da79 100644
--- a/metadata/md5-cache/dev-haskell/interpolate-0.2.0
+++ b/metadata/md5-cache/dev-haskell/interpolate-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/haskell-src-meta-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/interpolate-0.2.0/interpolate-0.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7a99beee89c3ec063704920311506a57
diff --git a/metadata/md5-cache/dev-haskell/invariant-0.5.3 b/metadata/md5-cache/dev-haskell/invariant-0.5.3
index 021cf8af1e00..7f832e20811b 100644
--- a/metadata/md5-cache/dev-haskell/invariant-0.5.3
+++ b/metadata/md5-cache/dev-haskell/invariant-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.5.3
 SRC_URI=https://hackage.haskell.org/package/invariant-0.5.3/invariant-0.5.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dc00358ab4d7c06b8d1d2bd16673f1fd
diff --git a/metadata/md5-cache/dev-haskell/io-streams-1.5.2.0 b/metadata/md5-cache/dev-haskell/io-streams-1.5.2.0
index 583a88ed7af2..f3065f5b67b2 100644
--- a/metadata/md5-cache/dev-haskell/io-streams-1.5.2.0
+++ b/metadata/md5-cache/dev-haskell/io-streams-1.5.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=
 RESTRICT=test
 SLOT=0/1.5.2.0
 SRC_URI=https://hackage.haskell.org/package/io-streams-1.5.2.0/io-streams-1.5.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=46b4d410dfbee10b4113e744300cfadd
diff --git a/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1 b/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
index 579acd9c96c3..45751afe6152 100644
--- a/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[
 RESTRICT=test
 SLOT=0/1.0.1.0
 SRC_URI=https://hackage.haskell.org/package/io-streams-haproxy-1.0.1.0/io-streams-haproxy-1.0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe917edb129e2153e4a1739067bcd81e
diff --git a/metadata/md5-cache/dev-haskell/iproute-1.7.8 b/metadata/md5-cache/dev-haskell/iproute-1.7.8
index 3a31ed669ee7..e42507d7eaff 100644
--- a/metadata/md5-cache/dev-haskell/iproute-1.7.8
+++ b/metadata/md5-cache/dev-haskell/iproute-1.7.8
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-hask
 RESTRICT=test
 SLOT=0/1.7.8
 SRC_URI=https://hackage.haskell.org/package/iproute-1.7.8/iproute-1.7.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fedbaa69660e5b16fd3ad5c7a427f76e
diff --git a/metadata/md5-cache/dev-haskell/ipynb-0.1 b/metadata/md5-cache/dev-haskell/ipynb-0.1
index 631c8193fbed..736f05f0e0af 100644
--- a/metadata/md5-cache/dev-haskell/ipynb-0.1
+++ b/metadata/md5-cache/dev-haskell/ipynb-0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/base64-bytestring:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/ipynb-0.1/ipynb-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9ae4e4d7643aefb1c9ca7c993cc7e206
diff --git a/metadata/md5-cache/dev-haskell/iwlib-0.1.0 b/metadata/md5-cache/dev-haskell/iwlib-0.1.0
index e4fbfa8a145c..990110e6693b 100644
--- a/metadata/md5-cache/dev-haskell/iwlib-0.1.0
+++ b/metadata/md5-cache/dev-haskell/iwlib-0.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= net-wireless/wireless-tools
 SLOT=0/0.1.0
 SRC_URI=https://hackage.haskell.org/package/iwlib-0.1.0/iwlib-0.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a39f90959fcc561cd9f3657e2465ccad
diff --git a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4 b/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
index 36e69a3d55b2..003a21bf8614 100644
--- a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
+++ b/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev
 RESTRICT=!test? ( test )
 SLOT=0/1.1.4
 SRC_URI=https://hackage.haskell.org/package/jira-wiki-markup-1.1.4/jira-wiki-markup-1.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a2f8e5103c3a8b9d2496733efc0292e9
diff --git a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.3.4 b/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.3.4
index 6617bfc2be11..31b2128bb105 100644
--- a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.3.4
+++ b/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev
 RESTRICT=!test? ( test )
 SLOT=0/1.3.4
 SRC_URI=https://hackage.haskell.org/package/jira-wiki-markup-1.3.4/jira-wiki-markup-1.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8cc71c0635685eb5a472f7c0cc9bdded
diff --git a/metadata/md5-cache/dev-haskell/js-flot-0.8.3 b/metadata/md5-cache/dev-haskell/js-flot-0.8.3
index ab21732504ae..a96d9eeb0a50 100644
--- a/metadata/md5-cache/dev-haskell/js-flot-0.8.3
+++ b/metadata/md5-cache/dev-haskell/js-flot-0.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.3
 SRC_URI=https://hackage.haskell.org/package/js-flot-0.8.3/js-flot-0.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9bc1a03f2eb4883e2c7bd4563d00824a
diff --git a/metadata/md5-cache/dev-haskell/js-jquery-3.3.1 b/metadata/md5-cache/dev-haskell/js-jquery-3.3.1
index 0946f1c7ace0..d2c0dc3857f9 100644
--- a/metadata/md5-cache/dev-haskell/js-jquery-3.3.1
+++ b/metadata/md5-cache/dev-haskell/js-jquery-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/3.3.1
 SRC_URI=https://hackage.haskell.org/package/js-jquery-3.3.1/js-jquery-3.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc53819de019b444ff69bbfe375e9e7b
diff --git a/metadata/md5-cache/dev-haskell/json-0.10 b/metadata/md5-cache/dev-haskell/json-0.10
index e9f177445bd3..8ee8d9a8e0aa 100644
--- a/metadata/md5-cache/dev-haskell/json-0.10
+++ b/metadata/md5-cache/dev-haskell/json-0.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/syb-0.3.3:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:= parsec? ( dev-haskell/parsec:=[profile?] )
 SLOT=0/0.10
 SRC_URI=https://hackage.haskell.org/package/json-0.10/json-0.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4b43799897716a3b0eebb2e79ef8019c
diff --git a/metadata/md5-cache/dev-haskell/juicypixels-3.3.5 b/metadata/md5-cache/dev-haskell/juicypixels-3.3.5
index 408dbe371a6f..dd407e1b80a5 100644
--- a/metadata/md5-cache/dev-haskell/juicypixels-3.3.5
+++ b/metadata/md5-cache/dev-haskell/juicypixels-3.3.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.4:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/3.3.5
 SRC_URI=https://hackage.haskell.org/package/JuicyPixels-3.3.5/JuicyPixels-3.3.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2c179df30cbf3806be85c3d2c529b7a9
diff --git a/metadata/md5-cache/dev-haskell/kan-extensions-5.2 b/metadata/md5-cache/dev-haskell/kan-extensions-5.2
index 124db4b10fe0..7903f4a36867 100644
--- a/metadata/md5-cache/dev-haskell/kan-extensions-5.2
+++ b/metadata/md5-cache/dev-haskell/kan-extensions-5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/5.2
 SRC_URI=https://hackage.haskell.org/package/kan-extensions-5.2/kan-extensions-5.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=063f13ef6f49ef77392997e89ef19fa3
diff --git a/metadata/md5-cache/dev-haskell/keys-3.12.3 b/metadata/md5-cache/dev-haskell/keys-3.12.3
index df0fd86f3741..a3a3ad53d72a 100644
--- a/metadata/md5-cache/dev-haskell/keys-3.12.3
+++ b/metadata/md5-cache/dev-haskell/keys-3.12.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.5.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/3.12.3
 SRC_URI=https://hackage.haskell.org/package/keys-3.12.3/keys-3.12.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b21845a4eb1f8146565d2c14f0b5581
diff --git a/metadata/md5-cache/dev-haskell/language-bash-0.9.0 b/metadata/md5-cache/dev-haskell/language-bash-0.9.0
index 44b1bd396b66..ab3f9323d35c 100644
--- a/metadata/md5-cache/dev-haskell/language-bash-0.9.0
+++ b/metadata/md5-cache/dev-haskell/language-bash-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?]
 RESTRICT=test
 SLOT=0/0.9.0
 SRC_URI=https://hackage.haskell.org/package/language-bash-0.9.0/language-bash-0.9.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=90ae55e8f760ee5d52fbb35202379efe
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.4.7 b/metadata/md5-cache/dev-haskell/language-c-0.4.7
index 271a3b4462cb..e0441b4f293f 100644
--- a/metadata/md5-cache/dev-haskell/language-c-0.4.7
+++ b/metadata/md5-cache/dev-haskell/language-c-0.4.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.7
 SRC_URI=https://hackage.haskell.org/package/language-c-0.4.7/language-c-0.4.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7328d5699e32aae0b55c85aa4b6f18d5
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.7.1 b/metadata/md5-cache/dev-haskell/language-c-0.7.1
index c8893e8abf87..c943f4013d6e 100644
--- a/metadata/md5-cache/dev-haskell/language-c-0.7.1
+++ b/metadata/md5-cache/dev-haskell/language-c-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.7.1
 SRC_URI=https://hackage.haskell.org/package/language-c-0.7.1/language-c-0.7.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee779cf358f2a3c659fc6420a9122c27
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.8.3-r1 b/metadata/md5-cache/dev-haskell/language-c-0.8.3-r1
index 4a926b6e07b8..6b479d13148b 100644
--- a/metadata/md5-cache/dev-haskell/language-c-0.8.3-r1
+++ b/metadata/md5-cache/dev-haskell/language-c-0.8.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.3
 SRC_URI=https://hackage.haskell.org/package/language-c-0.8.3/language-c-0.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b05e0531d29a15be0d8f9450987e46d5
diff --git a/metadata/md5-cache/dev-haskell/language-css-0.0.3 b/metadata/md5-cache/dev-haskell/language-css-0.0.3
index fafa1294e04b..4ce60271f62d 100644
--- a/metadata/md5-cache/dev-haskell/language-css-0.0.3
+++ b/metadata/md5-cache/dev-haskell/language-css-0.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.3
 SRC_URI=https://hackage.haskell.org/package/language-css-0.0.3/language-css-0.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30ba5e8f44374314fb6f44c12fbd85fc
diff --git a/metadata/md5-cache/dev-haskell/language-dot-0.1.1 b/metadata/md5-cache/dev-haskell/language-dot-0.1.1
index 1bbeef9364a1..7f3c551297dc 100644
--- a/metadata/md5-cache/dev-haskell/language-dot-0.1.1
+++ b/metadata/md5-cache/dev-haskell/language-dot-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=d
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/language-dot-0.1.1/language-dot-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=542dc636fae2fd1d22678a63c95c0992
diff --git a/metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0 b/metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0
index 5ba063c4bc0a..cdbc4152dd57 100644
--- a/metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0
+++ b/metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint
 RESTRICT=!test? ( test )
 SLOT=0/0.19.1.0
 SRC_URI=https://hackage.haskell.org/package/language-ecmascript-0.19.1.0/language-ecmascript-0.19.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d0883279ebb9b6a3386c30d894ef659d
diff --git a/metadata/md5-cache/dev-haskell/language-glsl-0.3.0 b/metadata/md5-cache/dev-haskell/language-glsl-0.3.0
index b2a10ff85fa1..941cf51f7d4c 100644
--- a/metadata/md5-cache/dev-haskell/language-glsl-0.3.0
+++ b/metadata/md5-cache/dev-haskell/language-glsl-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/prettyclass:=[profile?] >=dev
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/language-glsl-0.3.0/language-glsl-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=20057eb1752002052f7a6ebbe8ed69c5
diff --git a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1 b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
index a94e8d42fde2..4f79a445eeaf 100644
--- a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
+++ b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/regex-posix:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/language-haskell-extract-0.2.4/language-haskell-extract-0.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ce28954ad5c96d5c56205894a27de2d7
diff --git a/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14 b/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
index ea92b8fe27f1..9db0c35472b7 100644
--- a/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
+++ b/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/mtl-1.1:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.6.0.14
 SRC_URI=https://hackage.haskell.org/package/language-javascript-0.6.0.14/language-javascript-0.6.0.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=11c731656d07741714c4218ce2e90062
diff --git a/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1 b/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
index 69fe7fbc07d7..e03e6e6c9a6d 100644
--- a/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
+++ b/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/alex-tools-0.4:=[profile?] <dev-haskell/alex-tools-0.5:=[p
 RESTRICT=!test? ( test )
 SLOT=0/0.11.0.1
 SRC_URI=https://hackage.haskell.org/package/language-lua-0.11.0.1/language-lua-0.11.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65f00d5bb20d41715aabcb71457b46d1
diff --git a/metadata/md5-cache/dev-haskell/language-python-0.5.8 b/metadata/md5-cache/dev-haskell/language-python-0.5.8
index 5ae157a1d335..dc3957cec7b3 100644
--- a/metadata/md5-cache/dev-haskell/language-python-0.5.8
+++ b/metadata/md5-cache/dev-haskell/language-python-0.5.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.5.8
 SRC_URI=https://hackage.haskell.org/package/language-python-0.5.8/language-python-0.5.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82c86effa853d3b032d5caa4f91523f0
diff --git a/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6-r1 b/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6-r1
index e283165a63e5..e213d687de9d 100644
--- a/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6-r1
+++ b/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6
 SRC_URI=https://hackage.haskell.org/package/lazysmallcheck-0.6/lazysmallcheck-0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7f1b9624c3bdd03e4e73f16eca58804
diff --git a/metadata/md5-cache/dev-haskell/lcs-0.2-r1 b/metadata/md5-cache/dev-haskell/lcs-0.2-r1
index 33f003077eca..f3fb51c2a3d7 100644
--- a/metadata/md5-cache/dev-haskell/lcs-0.2-r1
+++ b/metadata/md5-cache/dev-haskell/lcs-0.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD GPL-2 )
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2
 SRC_URI=https://hackage.haskell.org/package/lcs-0.2/lcs-0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54ee621d8aaa02e110b4f4dceffb16bf
diff --git a/metadata/md5-cache/dev-haskell/leancheck-0.9.3 b/metadata/md5-cache/dev-haskell/leancheck-0.9.3
index a15fc869f1bb..d96819bee012 100644
--- a/metadata/md5-cache/dev-haskell/leancheck-0.9.3
+++ b/metadata/md5-cache/dev-haskell/leancheck-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.3
 SRC_URI=https://hackage.haskell.org/package/leancheck-0.9.3/leancheck-0.9.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a62df54835a3b725d2af2f9915aa7b7
diff --git a/metadata/md5-cache/dev-haskell/lens-4.19.1 b/metadata/md5-cache/dev-haskell/lens-4.19.1
index 4e38e541502c..a3a4e2adaee4 100644
--- a/metadata/md5-cache/dev-haskell/lens-4.19.1
+++ b/metadata/md5-cache/dev-haskell/lens-4.19.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1
 RESTRICT=test
 SLOT=0/4.19.1
 SRC_URI=https://hackage.haskell.org/package/lens-4.19.1/lens-4.19.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cddc630da05966f9726404e156768361
diff --git a/metadata/md5-cache/dev-haskell/lens-aeson-1.1 b/metadata/md5-cache/dev-haskell/lens-aeson-1.1
index 0af13a0ed0fc..d0abf4774943 100644
--- a/metadata/md5-cache/dev-haskell/lens-aeson-1.1
+++ b/metadata/md5-cache/dev-haskell/lens-aeson-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.5:=[profile
 RESTRICT=test
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/lens-aeson-1.1/lens-aeson-1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e54cb722d59c9e80a3d0d4ad3a1953b4
diff --git a/metadata/md5-cache/dev-haskell/lens-family-1.2.3 b/metadata/md5-cache/dev-haskell/lens-family-1.2.3
index 1f18dfcd0431..6a1b134b5979 100644
--- a/metadata/md5-cache/dev-haskell/lens-family-1.2.3
+++ b/metadata/md5-cache/dev-haskell/lens-family-1.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/lens-family-core-1.2.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/1.2.3
 SRC_URI=https://hackage.haskell.org/package/lens-family-1.2.3/lens-family-1.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6de328dde311f48ee6bcc0060afd6c91
diff --git a/metadata/md5-cache/dev-haskell/lens-family-core-1.2.3 b/metadata/md5-cache/dev-haskell/lens-family-core-1.2.3
index 12924d10e01e..a89384b61af6 100644
--- a/metadata/md5-cache/dev-haskell/lens-family-core-1.2.3
+++ b/metadata/md5-cache/dev-haskell/lens-family-core-1.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.2.1:=
 SLOT=0/1.2.3
 SRC_URI=https://hackage.haskell.org/package/lens-family-core-1.2.3/lens-family-core-1.2.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1371c247a191c34aaae2baa904fda4ff
diff --git a/metadata/md5-cache/dev-haskell/lens-family-th-0.5.1.0 b/metadata/md5-cache/dev-haskell/lens-family-th-0.5.1.0
index 63494cc0281e..b301ad636d59 100644
--- a/metadata/md5-cache/dev-haskell/lens-family-th-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/lens-family-th-0.5.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.0.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1.0
 SRC_URI=https://hackage.haskell.org/package/lens-family-th-0.5.1.0/lens-family-th-0.5.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=412a225fc80633acf2bca9182d027105
diff --git a/metadata/md5-cache/dev-haskell/lens-simple-0.1.0.9 b/metadata/md5-cache/dev-haskell/lens-simple-0.1.0.9
index a1352500d97a..0fcb72cd472c 100644
--- a/metadata/md5-cache/dev-haskell/lens-simple-0.1.0.9
+++ b/metadata/md5-cache/dev-haskell/lens-simple-0.1.0.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/lens-family-1.2:=[profile?] <dev-haskell/lens-family-1.3:=[profile?] >=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] <dev-haskell/lens-family-th-0.6:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-6:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.9
 SRC_URI=https://hackage.haskell.org/package/lens-simple-0.1.0.9/lens-simple-0.1.0.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=77a272512d25f80b348977c904a9b1b9
diff --git a/metadata/md5-cache/dev-haskell/lhs2tex-1.24 b/metadata/md5-cache/dev-haskell/lhs2tex-1.24
index f0e3e49e7fc2..0c4b7dbee17e 100644
--- a/metadata/md5-cache/dev-haskell/lhs2tex-1.24
+++ b/metadata/md5-cache/dev-haskell/lhs2tex-1.24
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/mtl-2.2.1:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:= dev-texlive/texlive-mathscience:= dev-texlive/texlive-latexextra:=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/lhs2tex-1.24/lhs2tex-1.24.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=16efbebe55edf5d1eb07072921d21c10
diff --git a/metadata/md5-cache/dev-haskell/libmpd-0.9.2.0 b/metadata/md5-cache/dev-haskell/libmpd-0.9.2.0
index 3ebc5da465f3..0321683b7051 100644
--- a/metadata/md5-cache/dev-haskell/libmpd-0.9.2.0
+++ b/metadata/md5-cache/dev-haskell/libmpd-0.9.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[
 RESTRICT=!test? ( test )
 SLOT=0/0.9.2.0
 SRC_URI=https://hackage.haskell.org/package/libmpd-0.9.2.0/libmpd-0.9.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6bdbbd7ab3717eca1528f85c597ef998
diff --git a/metadata/md5-cache/dev-haskell/libxml-0.1.1 b/metadata/md5-cache/dev-haskell/libxml-0.1.1
index 97979b5b5c50..cd71ab52bb51 100644
--- a/metadata/md5-cache/dev-haskell/libxml-0.1.1
+++ b/metadata/md5-cache/dev-haskell/libxml-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/libxml-0.1.1/libxml-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e76be88a4c64fb49e0293180ce1b8239
diff --git a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5 b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5
index 043db03b0c28..53275fe53695 100644
--- a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5
+++ b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/libxml2
 SLOT=0/0.7.5
 SRC_URI=https://hackage.haskell.org/package/libxml-sax-0.7.5/libxml-sax-0.7.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5e8fce8989e64f4d42fd75db2f0d3ae7
diff --git a/metadata/md5-cache/dev-haskell/libyaml-0.1.2 b/metadata/md5-cache/dev-haskell/libyaml-0.1.2
index e21cca2f216d..313300b06c6f 100644
--- a/metadata/md5-cache/dev-haskell/libyaml-0.1.2
+++ b/metadata/md5-cache/dev-haskell/libyaml-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-lang/ghc-8.0.2:= system-libyaml? ( dev-libs/libyaml )
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/libyaml-0.1.2/libyaml-0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e3166e0d81337ca727552bde060f73ed
diff --git a/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6 b/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
index ab72bfc9c5aa..e9244938ec4d 100644
--- a/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
+++ b/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/0.10.0.6
 SRC_URI=https://hackage.haskell.org/package/lifted-async-0.10.0.6/lifted-async-0.10.0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=684614bf1d40dabc9ec927a3600f820f
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12 b/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12
index 9c7a30832750..25b1ad522202 100644
--- a/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/transformers-b
 RESTRICT=!test? ( test )
 SLOT=0/0.2.3.12
 SRC_URI=https://hackage.haskell.org/package/lifted-base-0.2.3.12/lifted-base-0.2.3.12.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c1ed6b3451e20464286c98262b318516
diff --git a/metadata/md5-cache/dev-haskell/linear-1.21.3 b/metadata/md5-cache/dev-haskell/linear-1.21.3
index 3fbd6ab5073a..865e5c4589e4 100644
--- a/metadata/md5-cache/dev-haskell/linear-1.21.3
+++ b/metadata/md5-cache/dev-haskell/linear-1.21.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/1.21.3
 SRC_URI=https://hackage.haskell.org/package/linear-1.21.3/linear-1.21.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=38b027cd18ad1e9a986a38f55283f4be
diff --git a/metadata/md5-cache/dev-haskell/linear-1.21.5 b/metadata/md5-cache/dev-haskell/linear-1.21.5
index c60da2f70de3..cdf92cc583f6 100644
--- a/metadata/md5-cache/dev-haskell/linear-1.21.5
+++ b/metadata/md5-cache/dev-haskell/linear-1.21.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/1.21.5
 SRC_URI=https://hackage.haskell.org/package/linear-1.21.5/linear-1.21.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e8e4aff79913eb61ac25b4876d447011
diff --git a/metadata/md5-cache/dev-haskell/list-0.6.2 b/metadata/md5-cache/dev-haskell/list-0.6.2
index 25b2d60ef23c..b4c2bae9aad9 100644
--- a/metadata/md5-cache/dev-haskell/list-0.6.2
+++ b/metadata/md5-cache/dev-haskell/list-0.6.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.6.2
 SRC_URI=https://hackage.haskell.org/package/List-0.6.2/List-0.6.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5275af9e92a00615bce3b9567d05ec3e
diff --git a/metadata/md5-cache/dev-haskell/listlike-4.6.3 b/metadata/md5-cache/dev-haskell/listlike-4.6.3
index f832c2460ef8..7b89a8a778db 100644
--- a/metadata/md5-cache/dev-haskell/listlike-4.6.3
+++ b/metadata/md5-cache/dev-haskell/listlike-4.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/4.6.3
 SRC_URI=https://hackage.haskell.org/package/ListLike-4.6.3/ListLike-4.6.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d2164fd091e4b8e2f9003a45fe115f82
diff --git a/metadata/md5-cache/dev-haskell/logging-facade-0.3.0 b/metadata/md5-cache/dev-haskell/logging-facade-0.3.0
index f16ea501d0fe..e25b39f58b85 100644
--- a/metadata/md5-cache/dev-haskell/logging-facade-0.3.0
+++ b/metadata/md5-cache/dev-haskell/logging-facade-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/logging-facade-0.3.0/logging-facade-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ff3b4596fe506ebc4592a2f6e03996b
diff --git a/metadata/md5-cache/dev-haskell/logict-0.7.0.3 b/metadata/md5-cache/dev-haskell/logict-0.7.0.3
index 560c193bddbf..a7670036a3b8 100644
--- a/metadata/md5-cache/dev-haskell/logict-0.7.0.3
+++ b/metadata/md5-cache/dev-haskell/logict-0.7.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskel
 RESTRICT=!test? ( test )
 SLOT=0/0.7.0.3
 SRC_URI=https://hackage.haskell.org/package/logict-0.7.0.3/logict-0.7.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9d5ae9b1f66988f3de487a4910755cb1
diff --git a/metadata/md5-cache/dev-haskell/logict-state-0.1.0.5 b/metadata/md5-cache/dev-haskell/logict-state-0.1.0.5
index daf50bc85aa5..a55156e8c965 100644
--- a/metadata/md5-cache/dev-haskell/logict-state-0.1.0.5
+++ b/metadata/md5-cache/dev-haskell/logict-state-0.1.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/logict-0.6.0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.1.0.5
 SRC_URI=https://hackage.haskell.org/package/logict-state-0.1.0.5/logict-state-0.1.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96d0c0387e26b99a382c3884ef8db762
diff --git a/metadata/md5-cache/dev-haskell/lrucache-1.2.0.1 b/metadata/md5-cache/dev-haskell/lrucache-1.2.0.1
index 8d313f94233a..ecddd69dc3d0 100644
--- a/metadata/md5-cache/dev-haskell/lrucache-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/lrucache-1.2.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.0.1
 SRC_URI=https://hackage.haskell.org/package/lrucache-1.2.0.1/lrucache-1.2.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8d74e9dc7d6f9205d014ed3b3b1e4466
diff --git a/metadata/md5-cache/dev-haskell/lukko-0.1.1.2 b/metadata/md5-cache/dev-haskell/lukko-0.1.1.2
index 5ef617004a56..b79b1ecd8241 100644
--- a/metadata/md5-cache/dev-haskell/lukko-0.1.1.2
+++ b/metadata/md5-cache/dev-haskell/lukko-0.1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.2
 SRC_URI=https://hackage.haskell.org/package/lukko-0.1.1.2/lukko-0.1.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dcfa161554584fa3bfcf5915316334fd
diff --git a/metadata/md5-cache/dev-haskell/maccatcher-2.1.5-r1 b/metadata/md5-cache/dev-haskell/maccatcher-2.1.5-r1
index ae40f6646454..54e612c99e79 100644
--- a/metadata/md5-cache/dev-haskell/maccatcher-2.1.5-r1
+++ b/metadata/md5-cache/dev-haskell/maccatcher-2.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.1.5
 SRC_URI=https://hackage.haskell.org/package/maccatcher-2.1.5/maccatcher-2.1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cc8b7934749d49e782bde4768192fc66
diff --git a/metadata/md5-cache/dev-haskell/magic-1.1 b/metadata/md5-cache/dev-haskell/magic-1.1
index 1199e80ccd2e..3841e63b875a 100644
--- a/metadata/md5-cache/dev-haskell/magic-1.1
+++ b/metadata/md5-cache/dev-haskell/magic-1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= sys-apps/file
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/magic-1.1/magic-1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=51b385f30a6964e089defc1f0d3139d2
diff --git a/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0 b/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
index a694f6bd2c9f..b836550c88bc 100644
--- a/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
+++ b/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://hackage.haskell.org/package/markdown-unlit-0.5.0/markdown-unlit-0.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=62392b8eb8b0246512b74c96e5b39e08
diff --git a/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0 b/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0
index 6621a5fc632b..8d4651533aa3 100644
--- a/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0
+++ b/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/primiti
 RESTRICT=!test? ( test )
 SLOT=0/0.3.3.0
 SRC_URI=https://hackage.haskell.org/package/math-functions-0.3.3.0/math-functions-0.3.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac81a9aa9848ddc14a78a93cc9360642
diff --git a/metadata/md5-cache/dev-haskell/megaparsec-9.0.1 b/metadata/md5-cache/dev-haskell/megaparsec-9.0.1
index 3f2ebfddb7f4..b85d6cab56be 100644
--- a/metadata/md5-cache/dev-haskell/megaparsec-9.0.1
+++ b/metadata/md5-cache/dev-haskell/megaparsec-9.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/mtl-2.2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.6.3:=
 SLOT=0/9.0.1
 SRC_URI=https://hackage.haskell.org/package/megaparsec-9.0.1/megaparsec-9.0.1.tar.gz https://hackage.haskell.org/package/megaparsec-9.0.1/revision/1.cabal -> megaparsec-9.0.1.cabal
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd40f50d35d918c010e4ad437965ff73
diff --git a/metadata/md5-cache/dev-haskell/memory-0.15.0 b/metadata/md5-cache/dev-haskell/memory-0.15.0
index 5a5e2bbe4d2c..cfa51ea6f5a9 100644
--- a/metadata/md5-cache/dev-haskell/memory-0.15.0
+++ b/metadata/md5-cache/dev-haskell/memory-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/basement-0.0.7:=[profile?] >=dev-lang/ghc-8.0.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15.0
 SRC_URI=https://hackage.haskell.org/package/memory-0.15.0/memory-0.15.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=77a9e58de8acf67f9eba7ce28249fc93
diff --git a/metadata/md5-cache/dev-haskell/memotrie-0.6.10 b/metadata/md5-cache/dev-haskell/memotrie-0.6.10
index 6db43fba7d1a..fff8b3aa2eac 100644
--- a/metadata/md5-cache/dev-haskell/memotrie-0.6.10
+++ b/metadata/md5-cache/dev-haskell/memotrie-0.6.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/newtype-generics-0.5.3:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.10
 SRC_URI=https://hackage.haskell.org/package/MemoTrie-0.6.10/MemoTrie-0.6.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a364043e3c6eff1b1a6c9fc800dea9b
diff --git a/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.2.0 b/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.2.0
index f44d2524414d..659f9a3631a1 100644
--- a/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.2.0
+++ b/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.2.0
 SRC_URI=https://hackage.haskell.org/package/mersenne-random-pure64-0.2.2.0/mersenne-random-pure64-0.2.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b1cb2c33323e55c94abf6d16156adb3
diff --git a/metadata/md5-cache/dev-haskell/microlens-0.4.11.2 b/metadata/md5-cache/dev-haskell/microlens-0.4.11.2
index c0a2db5fb681..720ca1892e17 100644
--- a/metadata/md5-cache/dev-haskell/microlens-0.4.11.2
+++ b/metadata/md5-cache/dev-haskell/microlens-0.4.11.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.4.11.2
 SRC_URI=https://hackage.haskell.org/package/microlens-0.4.11.2/microlens-0.4.11.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=016e56fe0a9b94eed1073427204c85b3
diff --git a/metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4 b/metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4
index e1bb866ebf5f..3b0d04fa99f7 100644
--- a/metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4
+++ b/metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/2.3.0.4
 SRC_URI=https://hackage.haskell.org/package/microlens-aeson-2.3.0.4/microlens-aeson-2.3.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=41d5b37ef54ad1288555c51f7e64f1c1
diff --git a/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1 b/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
index b237f2ea9424..1b0cdb27fb41 100644
--- a/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/microlens-0.4:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.0.1
 SRC_URI=https://hackage.haskell.org/package/microlens-mtl-0.2.0.1/microlens-mtl-0.2.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e77043386a26834ee8a5506036fed5ce
diff --git a/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4 b/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
index 0bb4bbb7fa5b..7d1e8c589925 100644
--- a/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
+++ b/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[p
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3.4
 SRC_URI=https://hackage.haskell.org/package/microlens-th-0.4.3.4/microlens-th-0.4.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5c8e9bc49470d696a9ef38cc9d218110
diff --git a/metadata/md5-cache/dev-haskell/microstache-1.0.1.1 b/metadata/md5-cache/dev-haskell/microstache-1.0.1.1
index 9492bb40e33d..6598c6bfdb74 100644
--- a/metadata/md5-cache/dev-haskell/microstache-1.0.1.1
+++ b/metadata/md5-cache/dev-haskell/microstache-1.0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/parsec-3.1.11:=[profi
 RESTRICT=!test? ( test )
 SLOT=0/1.0.1.1
 SRC_URI=https://hackage.haskell.org/package/microstache-1.0.1.1/microstache-1.0.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1c58fce205bc38e292404ddf078e0084
diff --git a/metadata/md5-cache/dev-haskell/mime-0.4.0.2 b/metadata/md5-cache/dev-haskell/mime-0.4.0.2
index dea6a99116f2..53b037c830a1 100644
--- a/metadata/md5-cache/dev-haskell/mime-0.4.0.2
+++ b/metadata/md5-cache/dev-haskell/mime-0.4.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.0.2
 SRC_URI=https://hackage.haskell.org/package/mime-0.4.0.2/mime-0.4.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b4845f6ade8641c4d4088e635b4f29d
diff --git a/metadata/md5-cache/dev-haskell/mime-mail-0.5.0 b/metadata/md5-cache/dev-haskell/mime-mail-0.5.0
index 5a308692c047..2a130e7ce6cd 100644
--- a/metadata/md5-cache/dev-haskell/mime-mail-0.5.0
+++ b/metadata/md5-cache/dev-haskell/mime-mail-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-buil
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://hackage.haskell.org/package/mime-mail-0.5.0/mime-mail-0.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b346170a83ba17fbc0e322c551b9f49
diff --git a/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9 b/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9
index b97178b584fe..3610c8719faf 100644
--- a/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9
+++ b/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.9
 SRC_URI=https://hackage.haskell.org/package/mime-types-0.1.0.9/mime-types-0.1.0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9dd8bfaf084e5ef59dbc7c0ac4a6f4f2
diff --git a/metadata/md5-cache/dev-haskell/minisat-0.1.2 b/metadata/md5-cache/dev-haskell/minisat-0.1.2
index d0d6d90ccdef..f09209697ba6 100644
--- a/metadata/md5-cache/dev-haskell/minisat-0.1.2
+++ b/metadata/md5-cache/dev-haskell/minisat-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/async:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/minisat-0.1.2/minisat-0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=599a51700719351995576e7e24254e15
diff --git a/metadata/md5-cache/dev-haskell/mintty-0.1.2 b/metadata/md5-cache/dev-haskell/mintty-0.1.2
index 92addeffee2c..d1b718e8dcc2 100644
--- a/metadata/md5-cache/dev-haskell/mintty-0.1.2
+++ b/metadata/md5-cache/dev-haskell/mintty-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/mintty-0.1.2/mintty-0.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa840fc4b7f7e1c99fc6500293228c7c
diff --git a/metadata/md5-cache/dev-haskell/missingh-1.4.3.0 b/metadata/md5-cache/dev-haskell/missingh-1.4.3.0
index 1e33f8fb87ae..cb138300aee4 100644
--- a/metadata/md5-cache/dev-haskell/missingh-1.4.3.0
+++ b/metadata/md5-cache/dev-haskell/missingh-1.4.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[p
 RESTRICT=test
 SLOT=0/1.4.3.0
 SRC_URI=https://hackage.haskell.org/package/MissingH-1.4.3.0/MissingH-1.4.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=01104d6fc11fb05ffedc05f34afe1fc8
diff --git a/metadata/md5-cache/dev-haskell/mmap-0.5.9 b/metadata/md5-cache/dev-haskell/mmap-0.5.9
index 653e29489c6b..7bac922f0c57 100644
--- a/metadata/md5-cache/dev-haskell/mmap-0.5.9
+++ b/metadata/md5-cache/dev-haskell/mmap-0.5.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.5.9
 SRC_URI=https://hackage.haskell.org/package/mmap-0.5.9/mmap-0.5.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6575b2c2292d99cb4e58d379c3ce36df
diff --git a/metadata/md5-cache/dev-haskell/mmorph-1.1.3 b/metadata/md5-cache/dev-haskell/mmorph-1.1.3
index 1178e071bb92..55924cb94b4b 100644
--- a/metadata/md5-cache/dev-haskell/mmorph-1.1.3
+++ b/metadata/md5-cache/dev-haskell/mmorph-1.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.3
 SRC_URI=https://hackage.haskell.org/package/mmorph-1.1.3/mmorph-1.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad3e1e1d3f43217a0cdee0c0a8fc8ff5
diff --git a/metadata/md5-cache/dev-haskell/mockery-0.3.5 b/metadata/md5-cache/dev-haskell/mockery-0.3.5
index a07f91c6f553..68e4a61c7a09 100644
--- a/metadata/md5-cache/dev-haskell/mockery-0.3.5
+++ b/metadata/md5-cache/dev-haskell/mockery-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base-compat:=[profile?] dev-haskell/logging-facade:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://hackage.haskell.org/package/mockery-0.3.5/mockery-0.3.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=03dc531c44f86d599e779c3ac1fada5c
diff --git a/metadata/md5-cache/dev-haskell/mod-0.1.1.0 b/metadata/md5-cache/dev-haskell/mod-0.1.1.0
index 98045a352024..032f9bc42690 100644
--- a/metadata/md5-cache/dev-haskell/mod-0.1.1.0
+++ b/metadata/md5-cache/dev-haskell/mod-0.1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.2.1:= semirings? ( >=dev-haskell/semirings-0.5:=[profil
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.0
 SRC_URI=https://hackage.haskell.org/package/mod-0.1.1.0/mod-0.1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=756d6a288ad71fbd3add1872f3e3033b
diff --git a/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3 b/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3
index da8664ce1d76..db453875dd21 100644
--- a/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3
+++ b/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.0.2.3
 SRC_URI=https://hackage.haskell.org/package/monad-control-1.0.2.3/monad-control-1.0.2.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=59c90f409c493b6f3c0884ff108e02f8
diff --git a/metadata/md5-cache/dev-haskell/monad-journal-0.8.1 b/metadata/md5-cache/dev-haskell/monad-journal-0.8.1
index c686fb9bb370..3ce5bddf4309 100644
--- a/metadata/md5-cache/dev-haskell/monad-journal-0.8.1
+++ b/metadata/md5-cache/dev-haskell/monad-journal-0.8.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.8.1
 SRC_URI=https://hackage.haskell.org/package/monad-journal-0.8.1/monad-journal-0.8.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb9ff190747a92e483d705af4e58dc72
diff --git a/metadata/md5-cache/dev-haskell/monad-logger-0.3.32 b/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
index 8f965a169271..5ac614a106c4 100644
--- a/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
+++ b/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-3.1:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.3.32
 SRC_URI=https://hackage.haskell.org/package/monad-logger-0.3.32/monad-logger-0.3.32.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=21db67ceb75c1bca17f019aabe40f4a5
diff --git a/metadata/md5-cache/dev-haskell/monad-loops-0.4.3 b/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
index ab73f8519b2a..e9d887176b29 100644
--- a/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
+++ b/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3
 SRC_URI=https://hackage.haskell.org/package/monad-loops-0.4.3/monad-loops-0.4.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5014e4c863411dee5e1b43e7ad564cf3
diff --git a/metadata/md5-cache/dev-haskell/monad-par-0.3.5 b/metadata/md5-cache/dev-haskell/monad-par-0.3.5
index 57aa49ae705a..82b018d82cf6 100644
--- a/metadata/md5-cache/dev-haskell/monad-par-0.3.5
+++ b/metadata/md5-cache/dev-haskell/monad-par-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:
 RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://hackage.haskell.org/package/monad-par-0.3.5/monad-par-0.3.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f0fee2bd76b286fa9ec3ec33cd096042
diff --git a/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1 b/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
index fc5c03859433..3c8ed4c62cda 100644
--- a/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/abstract-par-0.3:=[profile?] <dev-haskell/abstract-par-0.4:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/monad-par-extras-0.3.3/monad-par-extras-0.3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=42a30d8b317c763e6942e1d98ce077bf
diff --git a/metadata/md5-cache/dev-haskell/monad-unlift-0.2.0 b/metadata/md5-cache/dev-haskell/monad-unlift-0.2.0
index 15a8f12bdebd..c3d2a85f67b4 100644
--- a/metadata/md5-cache/dev-haskell/monad-unlift-0.2.0
+++ b/metadata/md5-cache/dev-haskell/monad-unlift-0.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/constraints:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.6.1:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/monad-unlift-0.2.0/monad-unlift-0.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=73e53dafe1b920f57250ebff6ec82d98
diff --git a/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.1.0-r2 b/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.1.0-r2
index 676fe5ea9b81..53bad1eabb4b 100644
--- a/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.1.0-r2
+++ b/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.1.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3.1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1.0
 SRC_URI=https://hackage.haskell.org/package/MonadCatchIO-mtl-0.3.1.0/MonadCatchIO-mtl-0.3.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f6d70b5ed394f53e807f4e248835bb58
diff --git a/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.3-r1 b/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.3-r1
index b2580853b895..5c31947665c5 100644
--- a/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.3-r1
+++ b/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.3.1.3
 SRC_URI=https://hackage.haskell.org/package/MonadCatchIO-transformers-0.3.1.3/MonadCatchIO-transformers-0.3.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4b5adf91ded70b815254be4b71651164
diff --git a/metadata/md5-cache/dev-haskell/monadlib-3.10 b/metadata/md5-cache/dev-haskell/monadlib-3.10
index f9680f0da241..0fab1968cb98 100644
--- a/metadata/md5-cache/dev-haskell/monadlib-3.10
+++ b/metadata/md5-cache/dev-haskell/monadlib-3.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 SLOT=0/3.10
 SRC_URI=https://hackage.haskell.org/package/monadLib-3.10/monadLib-3.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5820253652179f3d789b8b074e489794
diff --git a/metadata/md5-cache/dev-haskell/monadplus-1.4.2-r1 b/metadata/md5-cache/dev-haskell/monadplus-1.4.2-r1
index 66b3b366ac22..f6967c0048bd 100644
--- a/metadata/md5-cache/dev-haskell/monadplus-1.4.2-r1
+++ b/metadata/md5-cache/dev-haskell/monadplus-1.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.4.2
 SRC_URI=https://hackage.haskell.org/package/monadplus-1.4.2/monadplus-1.4.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30bc302a310607c467f6d0e13f1a7b78
diff --git a/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2 b/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2
index aa1bac7f8643..d4145a4ed91c 100644
--- a/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2
+++ b/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.5.1.2
 SRC_URI=https://hackage.haskell.org/package/MonadRandom-0.5.1.2/MonadRandom-0.5.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d0f0837c197200c52dcfaba1a9162fe3
diff --git a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3 b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
index 65442bfa148a..646ebf2a73e7 100644
--- a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
+++ b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.3
 SRC_URI=https://hackage.haskell.org/package/monads-tf-0.1.0.3/monads-tf-0.1.0.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c128ac91e2a52ec8fcdff114029b729
diff --git a/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1 b/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
index ea24ceaada0a..70bf5df6c1aa 100644
--- a/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
+++ b/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/split-0.2:=[profile?] >=d
 RESTRICT=!test? ( test )
 SLOT=0/1.0.15.1
 SRC_URI=https://hackage.haskell.org/package/mono-traversable-1.0.15.1/mono-traversable-1.0.15.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa092693967821b75bd47ed78f37d25c
diff --git a/metadata/md5-cache/dev-haskell/mono-traversable-instances-0.1.0.0 b/metadata/md5-cache/dev-haskell/mono-traversable-instances-0.1.0.0
index 3d1235493de5..758a24a06aa0 100644
--- a/metadata/md5-cache/dev-haskell/mono-traversable-instances-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/mono-traversable-instances-0.1.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] >=dev-haskell/mono-traversable-1.0:=[profile?] <dev-haskell/mono-traversable-1.1:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/mono-traversable-instances-0.1.0.0/mono-traversable-instances-0.1.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=986633ea165bbec5a323e781d8be7ddf
diff --git a/metadata/md5-cache/dev-haskell/mountpoints-1.0.2 b/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
index 193441f618b2..57c3a1de9cd5 100644
--- a/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
+++ b/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/mountpoints-1.0.2/mountpoints-1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fcc35c2318b86f75dfd403d37073b84c
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.2.2 b/metadata/md5-cache/dev-haskell/mtl-2.2.2
index 9e3a137ee67b..f425ceb694e8 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.2.2
+++ b/metadata/md5-cache/dev-haskell/mtl-2.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.10.1:=
 SLOT=0/2.2.2
 SRC_URI=https://hackage.haskell.org/package/mtl-2.2.2/mtl-2.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=649e9a4fa6e52b5aa54aef737658e1cd
diff --git a/metadata/md5-cache/dev-haskell/mtl-compat-0.2.2 b/metadata/md5-cache/dev-haskell/mtl-compat-0.2.2
index 6166559ca9d3..d23ad87f47b5 100644
--- a/metadata/md5-cache/dev-haskell/mtl-compat-0.2.2
+++ b/metadata/md5-cache/dev-haskell/mtl-compat-0.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/transformers-compat:= >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/mtl-compat-0.2.2/mtl-compat-0.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=93da1f8df0dead07848719a4b75e6820
diff --git a/metadata/md5-cache/dev-haskell/multipart-0.2.0 b/metadata/md5-cache/dev-haskell/multipart-0.2.0
index abc43b890f11..c6a0ad40750c 100644
--- a/metadata/md5-cache/dev-haskell/multipart-0.2.0
+++ b/metadata/md5-cache/dev-haskell/multipart-0.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] dev-haskell/stringsearch:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/multipart-0.2.0/multipart-0.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30a361c1010f8f308bbc2cf5a94f17e6
diff --git a/metadata/md5-cache/dev-haskell/murmur-hash-0.1.0.9 b/metadata/md5-cache/dev-haskell/murmur-hash-0.1.0.9
index b8daaa6518a5..c5ff427eb4ce 100644
--- a/metadata/md5-cache/dev-haskell/murmur-hash-0.1.0.9
+++ b/metadata/md5-cache/dev-haskell/murmur-hash-0.1.0.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.9
 SRC_URI=https://hackage.haskell.org/package/murmur-hash-0.1.0.9/murmur-hash-0.1.0.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d22d03ce12e945007fb96b23ad24b59
diff --git a/metadata/md5-cache/dev-haskell/mustache-2.3.1 b/metadata/md5-cache/dev-haskell/mustache-2.3.1
index 0f3550aab922..8570698ae889 100644
--- a/metadata/md5-cache/dev-haskell/mustache-2.3.1
+++ b/metadata/md5-cache/dev-haskell/mustache-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/cmdargs:=[profile?] dev-haskel
 RESTRICT=test
 SLOT=0/2.3.1
 SRC_URI=https://hackage.haskell.org/package/mustache-2.3.1/mustache-2.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=37761571eaef0ea21cd4e6c2da8f7e91
diff --git a/metadata/md5-cache/dev-haskell/mutable-containers-0.3.4 b/metadata/md5-cache/dev-haskell/mutable-containers-0.3.4
index 2cd31fd60beb..b34c83a1b84d 100644
--- a/metadata/md5-cache/dev-haskell/mutable-containers-0.3.4
+++ b/metadata/md5-cache/dev-haskell/mutable-containers-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mono-traversable:=[profile?] >=dev-haskell/primitive-0.5.2.1
 RESTRICT=!test? ( test )
 SLOT=0/0.3.4
 SRC_URI=https://hackage.haskell.org/package/mutable-containers-0.3.4/mutable-containers-0.3.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50e4c2e0e918e50ac018afea0c666bd1
diff --git a/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0 b/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0
index dced2aecf6c3..d0795b901cfe 100644
--- a/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0
+++ b/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/math-functions-0.2.1.0:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.14.0.0
 SRC_URI=https://hackage.haskell.org/package/mwc-random-0.14.0.0/mwc-random-0.14.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=af959e8cff0e91cada75967295b6b23b
diff --git a/metadata/md5-cache/dev-haskell/mysql-0.1.7 b/metadata/md5-cache/dev-haskell/mysql-0.1.7
index 9baadaaa45ec..0419cc8f70e8 100644
--- a/metadata/md5-cache/dev-haskell/mysql-0.1.7
+++ b/metadata/md5-cache/dev-haskell/mysql-0.1.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=
 RESTRICT=test
 SLOT=0/0.1.7
 SRC_URI=https://hackage.haskell.org/package/mysql-0.1.7/mysql-0.1.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=738dc77aa3638fdcfeaac8c379e6d5ca
diff --git a/metadata/md5-cache/dev-haskell/mysql-simple-0.4.5 b/metadata/md5-cache/dev-haskell/mysql-simple-0.4.5
index d85f6aa72d18..a806da13a16f 100644
--- a/metadata/md5-cache/dev-haskell/mysql-simple-0.4.5
+++ b/metadata/md5-cache/dev-haskell/mysql-simple-0.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.0.0:=[profile?] dev-haskell/base16-bytestr
 RESTRICT=test
 SLOT=0/0.4.5
 SRC_URI=https://hackage.haskell.org/package/mysql-simple-0.4.5/mysql-simple-0.4.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f665e935240b1dd8958ece364c813a27
diff --git a/metadata/md5-cache/dev-haskell/nanospec-0.2.2 b/metadata/md5-cache/dev-haskell/nanospec-0.2.2
index 28cee5c6d811..3c776fe5431d 100644
--- a/metadata/md5-cache/dev-haskell/nanospec-0.2.2
+++ b/metadata/md5-cache/dev-haskell/nanospec-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/nanospec-0.2.2/nanospec-0.2.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a21311c2357a3c9f4ca77a20677a0db
diff --git a/metadata/md5-cache/dev-haskell/nats-1.1.2 b/metadata/md5-cache/dev-haskell/nats-1.1.2
index 368672c828b3..869f24ed1871 100644
--- a/metadata/md5-cache/dev-haskell/nats-1.1.2
+++ b/metadata/md5-cache/dev-haskell/nats-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= binary? ( >=dev-haskell/binary-0.2:=[profile?] <d
 RESTRICT=test
 SLOT=0/1.1.2
 SRC_URI=https://hackage.haskell.org/package/nats-1.1.2/nats-1.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=60789e6958f7ac6851dfa1cc8aacd320
diff --git a/metadata/md5-cache/dev-haskell/neat-interpolation-0.5.1.2 b/metadata/md5-cache/dev-haskell/neat-interpolation-0.5.1.2
index 832ca2dab90d..b744c0ebaeca 100644
--- a/metadata/md5-cache/dev-haskell/neat-interpolation-0.5.1.2
+++ b/metadata/md5-cache/dev-haskell/neat-interpolation-0.5.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/megaparsec-7:=[profile?] <dev-haskell/megaparsec-10:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1.2
 SRC_URI=https://hackage.haskell.org/package/neat-interpolation-0.5.1.2/neat-interpolation-0.5.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3e5c168a06261a73e94310d5c094ce4
diff --git a/metadata/md5-cache/dev-haskell/netlink-1.1.1.0 b/metadata/md5-cache/dev-haskell/netlink-1.1.1.0
index 4c3be513351c..174e0cf1cbe9 100644
--- a/metadata/md5-cache/dev-haskell/netlink-1.1.1.0
+++ b/metadata/md5-cache/dev-haskell/netlink-1.1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/monad-loops-0.3:=[profile?] dev-haskell/pretty-hex:=[profile?] >=dev-lang/ghc-7.6.1:= generators? ( <dev-haskell/language-c-0.7:=[profile?] dev-haskell/regex-pcre:=[profile?] )
 SLOT=0/1.1.1.0
 SRC_URI=https://hackage.haskell.org/package/netlink-1.1.1.0/netlink-1.1.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=920be4018c6d652dcb60d4e99f3bfee9
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.1.2 b/metadata/md5-cache/dev-haskell/network-2.4.1.2
index 2f2ec0203c94..5a3f1a89d5e3 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.1.2
+++ b/metadata/md5-cache/dev-haskell/network-2.4.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 RESTRICT=!test? ( test )
 SLOT=0/2.4.1.2
 SRC_URI=https://hackage.haskell.org/package/network-2.4.1.2/network-2.4.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2f88eb0cc0d6aacce506c13546b85f7b
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.2.2 b/metadata/md5-cache/dev-haskell/network-2.4.2.2
index e9c797438205..9bbf6faaa6ab 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.2.2
+++ b/metadata/md5-cache/dev-haskell/network-2.4.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 RESTRICT=!test? ( test )
 SLOT=0/2.4.2.2
 SRC_URI=https://hackage.haskell.org/package/network-2.4.2.2/network-2.4.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d0efb9f7d02b7dc0d643a8645347c3fe
diff --git a/metadata/md5-cache/dev-haskell/network-2.5.0.0 b/metadata/md5-cache/dev-haskell/network-2.5.0.0
index 66b96f97fc92..bf1db7f6f409 100644
--- a/metadata/md5-cache/dev-haskell/network-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/network-2.5.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.5.0.0
 SRC_URI=https://hackage.haskell.org/package/network-2.5.0.0/network-2.5.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=26980f4109426e20a26d5e3d510b5f77
diff --git a/metadata/md5-cache/dev-haskell/network-2.6.2.1 b/metadata/md5-cache/dev-haskell/network-2.6.2.1
index 08bf5c09d52f..10219486ca28 100644
--- a/metadata/md5-cache/dev-haskell/network-2.6.2.1
+++ b/metadata/md5-cache/dev-haskell/network-2.6.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.6.2.1
 SRC_URI=https://hackage.haskell.org/package/network-2.6.2.1/network-2.6.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0300616145ec8e68657890a313b4945a
diff --git a/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1 b/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
index 89183f6495c5..347038559e69 100644
--- a/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/2.6.3.1
 SRC_URI=https://hackage.haskell.org/package/network-2.6.3.1/network-2.6.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0bed46a53ec00fc21039279dad6adbd8
diff --git a/metadata/md5-cache/dev-haskell/network-3.0.1.1 b/metadata/md5-cache/dev-haskell/network-3.0.1.1
index 790befd5b2a4..4691f0a49abb 100644
--- a/metadata/md5-cache/dev-haskell/network-3.0.1.1
+++ b/metadata/md5-cache/dev-haskell/network-3.0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=test
 SLOT=0/3.0.1.1
 SRC_URI=https://hackage.haskell.org/package/network-3.0.1.1/network-3.0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a9bb956209213caa4aede27f7ddd3f8
diff --git a/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0 b/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0
index 9d3e05331789..ace79ccc4804 100644
--- a/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0
+++ b/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.1.2:=[profile?]
 SLOT=0/2.8.1.0
 SRC_URI=https://hackage.haskell.org/package/network-bsd-2.8.1.0/network-bsd-2.8.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54c1fcc147efa576b3c3fcd8c57975d1
diff --git a/metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0 b/metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0
index 232c37748751..4ee5c69a76fd 100644
--- a/metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0
+++ b/metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.4.0
 SRC_URI=https://hackage.haskell.org/package/network-byte-order-0.1.4.0/network-byte-order-0.1.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d5b5823019bd67e9639115103d311bf8
diff --git a/metadata/md5-cache/dev-haskell/network-conduit-1.1.0 b/metadata/md5-cache/dev-haskell/network-conduit-1.1.0
index 27bbe0a49b21..bd6194e029aa 100644
--- a/metadata/md5-cache/dev-haskell/network-conduit-1.1.0
+++ b/metadata/md5-cache/dev-haskell/network-conduit-1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/network-conduit-1.1.0/network-conduit-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0445124d9138ca463a04775b97608094
diff --git a/metadata/md5-cache/dev-haskell/network-data-0.5.3 b/metadata/md5-cache/dev-haskell/network-data-0.5.3
index 53a35615eec8..57300bd8b54a 100644
--- a/metadata/md5-cache/dev-haskell/network-data-0.5.3
+++ b/metadata/md5-cache/dev-haskell/network-data-0.5.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/prettyclass-1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.3
 SRC_URI=https://hackage.haskell.org/package/network-data-0.5.3/network-data-0.5.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f182dc37d4d83c8d04616e76221af82
diff --git a/metadata/md5-cache/dev-haskell/network-info-0.2.0.10 b/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
index 8c91fbb84afe..eaa54d5164a2 100644
--- a/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
+++ b/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0.10
 SRC_URI=https://hackage.haskell.org/package/network-info-0.2.0.10/network-info-0.2.0.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=43f9e78d7b79637e87588311cf698b12
diff --git a/metadata/md5-cache/dev-haskell/network-multicast-0.3.2 b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
index ed70f0379439..04f4612ff022 100644
--- a/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
+++ b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=dev-haskell/network:=[profile?] dev-haskell/network-bsd:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.2
 SRC_URI=https://hackage.haskell.org/package/network-multicast-0.3.2/network-multicast-0.3.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd4af9e13d89a196f97ef5013fc58221
diff --git a/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0 b/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
index b89d43413714..47d96639484b 100644
--- a/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/2.5.0.0
 SRC_URI=https://hackage.haskell.org/package/network-uri-2.5.0.0/network-uri-2.5.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82021aa1b4773e26a26139b355b78028
diff --git a/metadata/md5-cache/dev-haskell/network-uri-2.6.3.0 b/metadata/md5-cache/dev-haskell/network-uri-2.6.3.0
index 788024d393e2..ef527d59a7d3 100644
--- a/metadata/md5-cache/dev-haskell/network-uri-2.6.3.0
+++ b/metadata/md5-cache/dev-haskell/network-uri-2.6.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[prof
 RESTRICT=test
 SLOT=0/2.6.3.0
 SRC_URI=https://hackage.haskell.org/package/network-uri-2.6.3.0/network-uri-2.6.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50469135c34afac1cd1dfd6a41935a04
diff --git a/metadata/md5-cache/dev-haskell/newtype-0.2.2.0 b/metadata/md5-cache/dev-haskell/newtype-0.2.2.0
index c38f8fba7eca..f8294167ab97 100644
--- a/metadata/md5-cache/dev-haskell/newtype-0.2.2.0
+++ b/metadata/md5-cache/dev-haskell/newtype-0.2.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.2.0
 SRC_URI=https://hackage.haskell.org/package/newtype-0.2.2.0/newtype-0.2.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c29b06277e9bce5753f7fb87982aff14
diff --git a/metadata/md5-cache/dev-haskell/newtype-generics-0.5.4 b/metadata/md5-cache/dev-haskell/newtype-generics-0.5.4
index 6fdd6469c154..40cda498ca89 100644
--- a/metadata/md5-cache/dev-haskell/newtype-generics-0.5.4
+++ b/metadata/md5-cache/dev-haskell/newtype-generics-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.4
 SRC_URI=https://hackage.haskell.org/package/newtype-generics-0.5.4/newtype-generics-0.5.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a19ed884217083ada7ba077531c32156
diff --git a/metadata/md5-cache/dev-haskell/nonce-1.0.7 b/metadata/md5-cache/dev-haskell/nonce-1.0.7
index 6298893d98f4..0a7a445674e6 100644
--- a/metadata/md5-cache/dev-haskell/nonce-1.0.7
+++ b/metadata/md5-cache/dev-haskell/nonce-1.0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/entropy-0.3.7:=[profile?] >=dev-haskell/text-0.9:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.0.7
 SRC_URI=https://hackage.haskell.org/package/nonce-1.0.7/nonce-1.0.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35db5ab7b691e4dabdb7ffbdc214aca3
diff --git a/metadata/md5-cache/dev-haskell/numinstances-1.4 b/metadata/md5-cache/dev-haskell/numinstances-1.4
index 250160b4721f..0d4aeba4698a 100644
--- a/metadata/md5-cache/dev-haskell/numinstances-1.4
+++ b/metadata/md5-cache/dev-haskell/numinstances-1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.4
 SRC_URI=https://hackage.haskell.org/package/NumInstances-1.4/NumInstances-1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd61fdcc7278fe6ce598b4b86884cb94
diff --git a/metadata/md5-cache/dev-haskell/numtype-dk-0.5.0.2 b/metadata/md5-cache/dev-haskell/numtype-dk-0.5.0.2
index d3fb05cabc6b..453775a8c2d9 100644
--- a/metadata/md5-cache/dev-haskell/numtype-dk-0.5.0.2
+++ b/metadata/md5-cache/dev-haskell/numtype-dk-0.5.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.5.0.2
 SRC_URI=https://hackage.haskell.org/package/numtype-dk-0.5.0.2/numtype-dk-0.5.0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=83b8ae2f3f7a0f3ade42de01c08afd19
diff --git a/metadata/md5-cache/dev-haskell/objectname-1.1.0.1 b/metadata/md5-cache/dev-haskell/objectname-1.1.0.1
index 22bf122d261f..b7b70dfd9281 100644
--- a/metadata/md5-cache/dev-haskell/objectname-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/objectname-1.1.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.0.1
 SRC_URI=https://hackage.haskell.org/package/ObjectName-1.1.0.1/ObjectName-1.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=222b9d1ef7587871103f739ec1ce7330
diff --git a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7 b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
index 3f6f7e7f7832..36f76b6ce50a 100644
--- a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
+++ b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.0.7
 SRC_URI=https://hackage.haskell.org/package/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=391cd5d64cd8bad9935aaf5b2bd2cee3
diff --git a/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1 b/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
index cd2ddf33a606..9adb47a6c8c3 100644
--- a/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
+++ b/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.3
 SRC_URI=https://hackage.haskell.org/package/old-time-1.1.0.3/old-time-1.1.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f61af5886e883772e879bc9d11a553d6
diff --git a/metadata/md5-cache/dev-haskell/only-0.1 b/metadata/md5-cache/dev-haskell/only-0.1
index af28395ee78c..8de1fc082697 100644
--- a/metadata/md5-cache/dev-haskell/only-0.1
+++ b/metadata/md5-cache/dev-haskell/only-0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/Only-0.1/Only-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7815da8c093351298cd580275b3c167f
diff --git a/metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1 b/metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1
index 8060765073a2..c06cf585ebab 100644
--- a/metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.1.0
 SRC_URI=https://hackage.haskell.org/package/open-browser-0.2.1.0/open-browser-0.2.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e3b2ec40c9443f28041fe5c2dc2efe9a
diff --git a/metadata/md5-cache/dev-haskell/openal-1.7.0.5 b/metadata/md5-cache/dev-haskell/openal-1.7.0.5
index 542fdda7ae90..783adfa4badc 100644
--- a/metadata/md5-cache/dev-haskell/openal-1.7.0.5
+++ b/metadata/md5-cache/dev-haskell/openal-1.7.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= media-libs/openal
 SLOT=0/1.7.0.5
 SRC_URI=https://hackage.haskell.org/package/OpenAL-1.7.0.5/OpenAL-1.7.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db1ea3a2df89437e4214455eaa13f946
diff --git a/metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1 b/metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1
index 44bca47429dc..f48c3ba14040 100644
--- a/metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/gluraw-2.0:=[profile?] <dev-haskell/gluraw-2.1:=[profile?] >=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/3.0.3.0
 SRC_URI=https://hackage.haskell.org/package/OpenGL-3.0.3.0/OpenGL-3.0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=587a0d420beeb8ca190b3eb3de92e1d1
diff --git a/metadata/md5-cache/dev-haskell/openglraw-3.3.4.0 b/metadata/md5-cache/dev-haskell/openglraw-3.3.4.0
index 5c114e654ee6..6032b5234081 100644
--- a/metadata/md5-cache/dev-haskell/openglraw-3.3.4.0
+++ b/metadata/md5-cache/dev-haskell/openglraw-3.3.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fixed-0.2:=[profile?] <dev-haskell/fixed-0.4:=[profile?] >=dev-haskell/half-0.2.2.1:=[profile?] <dev-haskell/half-0.4:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/opengl
 SLOT=0/3.3.4.0
 SRC_URI=https://hackage.haskell.org/package/OpenGLRaw-3.3.4.0/OpenGLRaw-3.3.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c2c3ed03b29d7ade677442dacc6ce8a
diff --git a/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0 b/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0
index 8eace861b1d4..98af645a2a4d 100644
--- a/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0
+++ b/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=
 RESTRICT=test
 SLOT=0/1.2.3.0
 SRC_URI=https://hackage.haskell.org/package/openssl-streams-1.2.3.0/openssl-streams-1.2.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f66f6ff09042282490acbd9fdaa3976b
diff --git a/metadata/md5-cache/dev-haskell/options-1.2.1.1 b/metadata/md5-cache/dev-haskell/options-1.2.1.1
index 41a65958761d..7d4c128021c5 100644
--- a/metadata/md5-cache/dev-haskell/options-1.2.1.1
+++ b/metadata/md5-cache/dev-haskell/options-1.2.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] >=dev-haskell/transformers-0.2:=
 RESTRICT=test
 SLOT=0/1.2.1.1
 SRC_URI=https://hackage.haskell.org/package/options-1.2.1.1/options-1.2.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4fa162e608c9646737ab463057226db6
diff --git a/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0 b/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
index cb3c47a7caa8..87e35573c402 100644
--- a/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
+++ b/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-ppri
 RESTRICT=!test? ( test )
 SLOT=0/0.15.1.0
 SRC_URI=https://hackage.haskell.org/package/optparse-applicative-0.15.1.0/optparse-applicative-0.15.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a8fcea588cdcfa3b2b62d7aa5f912be0
diff --git a/metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.3 b/metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.3
index ef00dbfe783c..70923797b330 100644
--- a/metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.3
+++ b/metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/githash-0.1.3.0:=[profile?] dev-haskell/optparse-applicati
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.3
 SRC_URI=https://hackage.haskell.org/package/optparse-simple-0.1.1.3/optparse-simple-0.1.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=471811eb305cc9b6c1eeae9367de28de
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.2 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.2
index a8da8b0cebc3..95c449dad7ef 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.2
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/pandoc-2.8:=[profile?] <app-text/pandoc-2.11:=[profile?] >=de
 RESTRICT=test
 SLOT=0/0.17.0.2
 SRC_URI=https://hackage.haskell.org/package/pandoc-citeproc-0.17.0.2/pandoc-citeproc-0.17.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cce576b1fa10cbd589bd377692ee51a6
diff --git a/metadata/md5-cache/dev-haskell/pandoc-types-1.20 b/metadata/md5-cache/dev-haskell/pandoc-types-1.20
index 6851c206f07a..198e37c610a5 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-types-1.20
+++ b/metadata/md5-cache/dev-haskell/pandoc-types-1.20
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.20
 SRC_URI=https://hackage.haskell.org/package/pandoc-types-1.20/pandoc-types-1.20.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96d62af53106755adfcc493b615673ad
diff --git a/metadata/md5-cache/dev-haskell/pandoc-types-1.22 b/metadata/md5-cache/dev-haskell/pandoc-types-1.22
index bbd6869a65a4..3fdeef993ea3 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-types-1.22
+++ b/metadata/md5-cache/dev-haskell/pandoc-types-1.22
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.22
 SRC_URI=https://hackage.haskell.org/package/pandoc-types-1.22/pandoc-types-1.22.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86fff0a2f79d37c4743f620c8983e651
diff --git a/metadata/md5-cache/dev-haskell/pango-0.13.8.1 b/metadata/md5-cache/dev-haskell/pango-0.13.8.1
index 9764c372866c..80214e311541 100644
--- a/metadata/md5-cache/dev-haskell/pango-0.13.8.1
+++ b/metadata/md5-cache/dev-haskell/pango-0.13.8.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo x11-libs/pango
 SLOT=0/0.13.8.1
 SRC_URI=https://hackage.haskell.org/package/pango-0.13.8.1/pango-0.13.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d6a605213ced28f546406a4e96c0eaf8
diff --git a/metadata/md5-cache/dev-haskell/pantry-0.4.0.2 b/metadata/md5-cache/dev-haskell/pantry-0.4.0.2
index 1f3bf1591996..d0808c71b892 100644
--- a/metadata/md5-cache/dev-haskell/pantry-0.4.0.2
+++ b/metadata/md5-cache/dev-haskell/pantry-0.4.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] >=de
 RESTRICT=test
 SLOT=0/0.4.0.2
 SRC_URI=https://hackage.haskell.org/package/pantry-0.4.0.2/pantry-0.4.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=035556bc9eee4074b335e7c8c5fb4abc
diff --git a/metadata/md5-cache/dev-haskell/parallel-3.2.2.0 b/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
index 582178596322..94b327a48c1e 100644
--- a/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
+++ b/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=3/3.2.2.0
 SRC_URI=https://hackage.haskell.org/package/parallel-3.2.2.0/parallel-3.2.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f77fccabb463156d82b15a279bc83242
diff --git a/metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3 b/metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3
index dff382bd049d..4df83a6a6b0d 100644
--- a/metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3
+++ b/metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>dev-haskell/extensible-exceptions-0.1.0.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/parallel-io-0.3.3/parallel-io-0.3.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9599911e263b05de2962fbe774d50b1d
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.14.0 b/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
index 72f6cd8d611c..4d8f3d2dd203 100644
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=test
 SLOT=0/3.1.14.0
 SRC_URI=https://hackage.haskell.org/package/parsec-3.1.14.0/parsec-3.1.14.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bdc8ea44225bb7199b82e900379a8ff6
diff --git a/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0 b/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0
index 6590de41bff8..5cf38a05b492 100644
--- a/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0
+++ b/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= parsec1? ( dev-haskell/parsec1:=[profile?] ) !parsec1? ( dev-haskell/parsec:=[profile?] )
 SLOT=0/0.1.0
 SRC_URI=https://hackage.haskell.org/package/parsec-numbers-0.1.0/parsec-numbers-0.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f2919b241f32e518460c826a5fbbb0a
diff --git a/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7 b/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7
index 8ad60f186777..21dfea4f5793 100644
--- a/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7
+++ b/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 SLOT=0/1.0.0.7
 SRC_URI=https://hackage.haskell.org/package/parsec1-1.0.0.7/parsec1-1.0.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d1ca68b0f1e46d93acd26bb92da12c31
diff --git a/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0 b/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
index d48caded1108..e3229552311e 100644
--- a/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
+++ b/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/1.0.0
 SRC_URI=https://hackage.haskell.org/package/parser-combinators-1.0.0/parser-combinators-1.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb534863bdaad3b53a6563b56f174cc6
diff --git a/metadata/md5-cache/dev-haskell/parsers-0.12.10 b/metadata/md5-cache/dev-haskell/parsers-0.12.10
index 1b22e1854bcb..d6fe3e2e3f98 100644
--- a/metadata/md5-cache/dev-haskell/parsers-0.12.10
+++ b/metadata/md5-cache/dev-haskell/parsers-0.12.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.12.10
 SRC_URI=https://hackage.haskell.org/package/parsers-0.12.10/parsers-0.12.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7325cd397b9fea9285eda2aa7fb05a13
diff --git a/metadata/md5-cache/dev-haskell/path-0.7.0 b/metadata/md5-cache/dev-haskell/path-0.7.0
index 4de55b405761..7dc7d109718d 100644
--- a/metadata/md5-cache/dev-haskell/path-0.7.0
+++ b/metadata/md5-cache/dev-haskell/path-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <
 RESTRICT=!test? ( test )
 SLOT=0/0.7.0
 SRC_URI=https://hackage.haskell.org/package/path-0.7.0/path-0.7.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=354970f70e5aa8c5a35b60ed99721367
diff --git a/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1 b/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
index f01d780eec8b..3584d87cb1c8 100644
--- a/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
+++ b/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/1.6.0
 SRC_URI=https://hackage.haskell.org/package/path-io-1.6.0/path-io-1.6.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=88cb3413d7f49d0ec6c551e276068d62
diff --git a/metadata/md5-cache/dev-haskell/path-pieces-0.2.1 b/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
index 6443fa03d0ce..480eb7327518 100644
--- a/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
+++ b/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.5:=[profile?] >=dev-lang/ghc-7.6.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1
 SRC_URI=https://hackage.haskell.org/package/path-pieces-0.2.1/path-pieces-0.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cf1dec02c461cf3704d83a313070991e
diff --git a/metadata/md5-cache/dev-haskell/patience-0.1.1-r1 b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
index a009bce14f0e..0eab8aef64ec 100644
--- a/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/patience-0.1.1/patience-0.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cdc3b78334ca531edc23f09f2751bf5e
diff --git a/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1 b/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1
index 7d827dec89ed..acea96d45886 100644
--- a/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1
+++ b/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.12.1:= net-libs/libpcap
 SLOT=0/0.4.5.2
 SRC_URI=https://hackage.haskell.org/package/pcap-0.4.5.2/pcap-0.4.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f492e47481f7a588b38a664ab78a7e2
diff --git a/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0 b/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0
index 5dbd460462d6..c8862c2ccdbd 100644
--- a/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0
+++ b/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= dev-libs/libpcre
 RESTRICT=!test? ( test )
 SLOT=0/0.4.1.0
 SRC_URI=https://hackage.haskell.org/package/pcre-light-0.4.1.0/pcre-light-0.4.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=62fc80da6ef7420e5f8c0b01391f34aa
diff --git a/metadata/md5-cache/dev-haskell/pem-0.2.4 b/metadata/md5-cache/dev-haskell/pem-0.2.4
index 12e225643511..bdc27e74bf21 100644
--- a/metadata/md5-cache/dev-haskell/pem-0.2.4
+++ b/metadata/md5-cache/dev-haskell/pem-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/basement:=[profile?] dev-haskell/memory:=[profile?] >=dev-la
 RESTRICT=!test? ( test )
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/pem-0.2.4/pem-0.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f29718818e07c9e4f15bd495f84a9177
diff --git a/metadata/md5-cache/dev-haskell/persistent-2.10.5.2 b/metadata/md5-cache/dev-haskell/persistent-2.10.5.2
index 07d84a5590fd..3a6f6b52e1bd 100644
--- a/metadata/md5-cache/dev-haskell/persistent-2.10.5.2
+++ b/metadata/md5-cache/dev-haskell/persistent-2.10.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/attoparsec:=[profile?] d
 RESTRICT=!test? ( test )
 SLOT=0/2.10.5.2
 SRC_URI=https://hackage.haskell.org/package/persistent-2.10.5.2/persistent-2.10.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7797fbf08791a54ab355b43be4bd8948
diff --git a/metadata/md5-cache/dev-haskell/persistent-mysql-2.10.2.3 b/metadata/md5-cache/dev-haskell/persistent-mysql-2.10.2.3
index 360615100d7f..9ef232f81dc4 100644
--- a/metadata/md5-cache/dev-haskell/persistent-mysql-2.10.2.3
+++ b/metadata/md5-cache/dev-haskell/persistent-mysql-2.10.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/blaze-builder:=[profile?
 RESTRICT=test
 SLOT=0/2.10.2.3
 SRC_URI=https://hackage.haskell.org/package/persistent-mysql-2.10.2.3/persistent-mysql-2.10.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=88b2ef4216ecee13d660203e0eb0caf3
diff --git a/metadata/md5-cache/dev-haskell/persistent-postgresql-2.10.1.2 b/metadata/md5-cache/dev-haskell/persistent-postgresql-2.10.1.2
index b6e164ab5657..b2578096dacb 100644
--- a/metadata/md5-cache/dev-haskell/persistent-postgresql-2.10.1.2
+++ b/metadata/md5-cache/dev-haskell/persistent-postgresql-2.10.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/blaze-builder:=[profile?
 RESTRICT=test
 SLOT=0/2.10.1.2
 SRC_URI=https://hackage.haskell.org/package/persistent-postgresql-2.10.1.2/persistent-postgresql-2.10.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4cda1e1bd66deb8132bcee35e78032ae
diff --git a/metadata/md5-cache/dev-haskell/persistent-qq-2.9.2 b/metadata/md5-cache/dev-haskell/persistent-qq-2.9.2
index 0d839b2a71e1..0e323f9f0171 100644
--- a/metadata/md5-cache/dev-haskell/persistent-qq-2.9.2
+++ b/metadata/md5-cache/dev-haskell/persistent-qq-2.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/haskell-src-meta:=[profile?] dev-haskell/mtl:=[profile?] >=d
 RESTRICT=test
 SLOT=0/2.9.2
 SRC_URI=https://hackage.haskell.org/package/persistent-qq-2.9.2/persistent-qq-2.9.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e1281a35838e9a7b0518858ea31c00bc
diff --git a/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2 b/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
index 201206acf16d..d4c4497ea823 100644
--- a/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
+++ b/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/conduit-1.2.12:=[profi
 RESTRICT=!test? ( test )
 SLOT=0/2.10.6.2
 SRC_URI=https://hackage.haskell.org/package/persistent-sqlite-2.10.6.2/persistent-sqlite-2.10.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d4ce2d5dc9ed7ff598fe4189b943807
diff --git a/metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3 b/metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3
index 40af05ff353a..5a0c1f922f09 100644
--- a/metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3
+++ b/metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/2.8.2.3
 SRC_URI=https://hackage.haskell.org/package/persistent-template-2.8.2.3/persistent-template-2.8.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2498cb36050b3cefbca0671617807e4d
diff --git a/metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0 b/metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0
index 01c2070fbabc..b38261c27685 100644
--- a/metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0
+++ b/metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] >=dev-haskell/hspec-2.4:=[profile?] dev-haskell/hspec-expectations:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/path-pieces-0.2:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/persistent-template:=[profile?] >=dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/quickcheck-instances-0.3:=[profile?] >=dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/2.0.3.0
 SRC_URI=https://hackage.haskell.org/package/persistent-test-2.0.3.0/persistent-test-2.0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=19943ee71cb2e5c0acab3a7c2347cb1d
diff --git a/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3 b/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3
index 3079b16fa835..d9cdbb82e642 100644
--- a/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3
+++ b/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-haskell/vector-0.5:=[profile?]
 RESTRICT=test
 SLOT=0/0.1.0.3
 SRC_URI=https://hackage.haskell.org/package/pgp-wordlist-0.1.0.3/pgp-wordlist-0.1.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c5fa231810c22735aa6cade8bd04adc6
diff --git a/metadata/md5-cache/dev-haskell/pid1-0.1.2.0 b/metadata/md5-cache/dev-haskell/pid1-0.1.2.0
index 698a9b9c714b..db62ace2ee9d 100644
--- a/metadata/md5-cache/dev-haskell/pid1-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/pid1-0.1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/pid1-0.1.2.0/pid1-0.1.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=278fdd47301ce270ac262a241e20ee6b
diff --git a/metadata/md5-cache/dev-haskell/pipes-4.3.14 b/metadata/md5-cache/dev-haskell/pipes-4.3.14
index 0522b501044b..8862e0ee5a59 100644
--- a/metadata/md5-cache/dev-haskell/pipes-4.3.14
+++ b/metadata/md5-cache/dev-haskell/pipes-4.3.14
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[
 RESTRICT=!test? ( test )
 SLOT=0/4.3.14
 SRC_URI=https://hackage.haskell.org/package/pipes-4.3.14/pipes-4.3.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c249236618da15d0872e84a514d593eb
diff --git a/metadata/md5-cache/dev-haskell/pointed-5.0.1-r1 b/metadata/md5-cache/dev-haskell/pointed-5.0.1-r1
index aa830cf20d92..04f394d36264 100644
--- a/metadata/md5-cache/dev-haskell/pointed-5.0.1-r1
+++ b/metadata/md5-cache/dev-haskell/pointed-5.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] ) kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] ) semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] ) semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
 SLOT=0/5.0.1
 SRC_URI=https://hackage.haskell.org/package/pointed-5.0.1/pointed-5.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27564fd4c9d6bcddde16778dbfd2539f
diff --git a/metadata/md5-cache/dev-haskell/polyparse-1.13 b/metadata/md5-cache/dev-haskell/polyparse-1.13
index 538b64fa4d81..6bc9ecbe79a5 100644
--- a/metadata/md5-cache/dev-haskell/polyparse-1.13
+++ b/metadata/md5-cache/dev-haskell/polyparse-1.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.13
 SRC_URI=https://hackage.haskell.org/package/polyparse-1.13/polyparse-1.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0ff24bceb35f5647c9dba9f40c7e1981
diff --git a/metadata/md5-cache/dev-haskell/postgresql-libpq-0.9.4.2-r2 b/metadata/md5-cache/dev-haskell/postgresql-libpq-0.9.4.2-r2
index 8d98f0fb0da6..56795c82d517 100644
--- a/metadata/md5-cache/dev-haskell/postgresql-libpq-0.9.4.2-r2
+++ b/metadata/md5-cache/dev-haskell/postgresql-libpq-0.9.4.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/postgresql-7:* >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.4.2
 SRC_URI=https://hackage.haskell.org/package/postgresql-libpq-0.9.4.2/postgresql-libpq-0.9.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e51612177b92fcd66fd1d6a87c40efe7
diff --git a/metadata/md5-cache/dev-haskell/postgresql-simple-0.6.2 b/metadata/md5-cache/dev-haskell/postgresql-simple-0.6.2
index 446d9d40c4f5..e4b71a8aaf71 100644
--- a/metadata/md5-cache/dev-haskell/postgresql-simple-0.6.2
+++ b/metadata/md5-cache/dev-haskell/postgresql-simple-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile
 RESTRICT=test
 SLOT=0/0.6.2
 SRC_URI=https://hackage.haskell.org/package/postgresql-simple-0.6.2/postgresql-simple-0.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ab46b561627a914370a8984551d4c592
diff --git a/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3 b/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3
index a75cdd95f03a..66eb57ebd0f2 100644
--- a/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3
+++ b/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.4.1.3
 SRC_URI=https://hackage.haskell.org/package/pqueue-1.4.1.3/pqueue-1.4.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3e2d28211a9f19d030b2ca63f8429ca6
diff --git a/metadata/md5-cache/dev-haskell/prelude-extras-0.4.0.3 b/metadata/md5-cache/dev-haskell/prelude-extras-0.4.0.3
index 78e52c9b19e5..0929477b533c 100644
--- a/metadata/md5-cache/dev-haskell/prelude-extras-0.4.0.3
+++ b/metadata/md5-cache/dev-haskell/prelude-extras-0.4.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.0.3
 SRC_URI=https://hackage.haskell.org/package/prelude-extras-0.4.0.3/prelude-extras-0.4.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1c6f0c0565b623fa036b076744e718c6
diff --git a/metadata/md5-cache/dev-haskell/preprocessor-tools-2.0.2 b/metadata/md5-cache/dev-haskell/preprocessor-tools-2.0.2
index 07a5223e157e..70d3487f3267 100644
--- a/metadata/md5-cache/dev-haskell/preprocessor-tools-2.0.2
+++ b/metadata/md5-cache/dev-haskell/preprocessor-tools-2.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/2.0.2
 SRC_URI=https://hackage.haskell.org/package/preprocessor-tools-2.0.2/preprocessor-tools-2.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ef4b9369b6b4def8e4240efd927090b0
diff --git a/metadata/md5-cache/dev-haskell/pretty-hex-1.0 b/metadata/md5-cache/dev-haskell/pretty-hex-1.0
index 7c98d8ed8d46..c795b9b03c5c 100644
--- a/metadata/md5-cache/dev-haskell/pretty-hex-1.0
+++ b/metadata/md5-cache/dev-haskell/pretty-hex-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/pretty-hex-1.0/pretty-hex-1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b48230b41d70d63bf88d0843d11a9b4
diff --git a/metadata/md5-cache/dev-haskell/pretty-show-1.9.5 b/metadata/md5-cache/dev-haskell/pretty-show-1.9.5
index fdfb32a46056..2fc857d6bf67 100644
--- a/metadata/md5-cache/dev-haskell/pretty-show-1.9.5
+++ b/metadata/md5-cache/dev-haskell/pretty-show-1.9.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.9.5
 SRC_URI=https://hackage.haskell.org/package/pretty-show-1.9.5/pretty-show-1.9.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6d054d740d1eb68eabdca5e6eb598cd2
diff --git a/metadata/md5-cache/dev-haskell/prettyclass-1.0.0.0 b/metadata/md5-cache/dev-haskell/prettyclass-1.0.0.0
index b7def259bf37..869a8dfe3cb1 100644
--- a/metadata/md5-cache/dev-haskell/prettyclass-1.0.0.0
+++ b/metadata/md5-cache/dev-haskell/prettyclass-1.0.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.0.0
 SRC_URI=https://hackage.haskell.org/package/prettyclass-1.0.0.0/prettyclass-1.0.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b395d414bfe6ac94f6791a68a88d3247
diff --git a/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1 b/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
index 5557264c6045..fe399086ef1e 100644
--- a/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
+++ b/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/1.6.1
 SRC_URI=https://hackage.haskell.org/package/prettyprinter-1.6.1/prettyprinter-1.6.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eecc138762e9096d1999dd390e5d0d1d
diff --git a/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2 b/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2
index e1debc026b02..16f9a2b6b44b 100644
--- a/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2
+++ b/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/prettyprinte
 RESTRICT=!test? ( test )
 SLOT=0/1.1.1.2
 SRC_URI=https://hackage.haskell.org/package/prettyprinter-ansi-terminal-1.1.1.2/prettyprinter-ansi-terminal-1.1.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=89e2ecfadfb9474a6ff635f49edd40ae
diff --git a/metadata/md5-cache/dev-haskell/primitive-0.7.1.0 b/metadata/md5-cache/dev-haskell/primitive-0.7.1.0
index 7c99be7cece9..3569163427a0 100644
--- a/metadata/md5-cache/dev-haskell/primitive-0.7.1.0
+++ b/metadata/md5-cache/dev-haskell/primitive-0.7.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=test
 SLOT=0/0.7.1.0
 SRC_URI=https://hackage.haskell.org/package/primitive-0.7.1.0/primitive-0.7.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82f06ecd66fe9f2f23354e31c114286a
diff --git a/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2 b/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2
index cd3bfbe11fbb..963fc5b2f428 100644
--- a/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2
+++ b/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-lang/ghc-7.4.2:=
 SLOT=0/0.1.0.2
 SRC_URI=https://hackage.haskell.org/package/primitive-addr-0.1.0.2/primitive-addr-0.1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7a1ef1163e35dd1e69617ee85d8fda3
diff --git a/metadata/md5-cache/dev-haskell/process-extras-0.7.4 b/metadata/md5-cache/dev-haskell/process-extras-0.7.4
index 113f501dc785..e172ef6054fe 100644
--- a/metadata/md5-cache/dev-haskell/process-extras-0.7.4
+++ b/metadata/md5-cache/dev-haskell/process-extras-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/data-default:=[profile?] >=dev-haskell/generic-deriving-1.10
 RESTRICT=!test? ( test )
 SLOT=0/0.7.4
 SRC_URI=https://hackage.haskell.org/package/process-extras-0.7.4/process-extras-0.7.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0f347b2654a977e706c1ccabc9d79edc
diff --git a/metadata/md5-cache/dev-haskell/profunctor-extras-4.0 b/metadata/md5-cache/dev-haskell/profunctor-extras-4.0
index 20997b1d57c1..f7012a80b828 100644
--- a/metadata/md5-cache/dev-haskell/profunctor-extras-4.0
+++ b/metadata/md5-cache/dev-haskell/profunctor-extras-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/profunctors-4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.0
 SRC_URI=https://hackage.haskell.org/package/profunctor-extras-4.0/profunctor-extras-4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee4adc76c09f40d5b6ce83bc67ae2b41
diff --git a/metadata/md5-cache/dev-haskell/profunctors-5.5.1 b/metadata/md5-cache/dev-haskell/profunctors-5.5.1
index 4d2fa540cbd1..7d778184943a 100644
--- a/metadata/md5-cache/dev-haskell/profunctors-5.5.1
+++ b/metadata/md5-cache/dev-haskell/profunctors-5.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/5.5.1
 SRC_URI=https://hackage.haskell.org/package/profunctors-5.5.1/profunctors-5.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e742f963f97700d5416bc6702421a958
diff --git a/metadata/md5-cache/dev-haskell/project-template-0.2.0.1 b/metadata/md5-cache/dev-haskell/project-template-0.2.0.1
index 32d4bbcbb2a1..c01fd6211009 100644
--- a/metadata/md5-cache/dev-haskell/project-template-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/project-template-0.2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/conduit-1.2.8:=[
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0.1
 SRC_URI=https://hackage.haskell.org/package/project-template-0.2.0.1/project-template-0.2.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=00d934e6a814595b7e5e5ef0846fade6
diff --git a/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1 b/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1
index 04751d00e9c5..59476d97288d 100644
--- a/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.1
 SRC_URI=https://hackage.haskell.org/package/PSQueue-1.1.0.1/PSQueue-1.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=89c339921429eaeea3f8db526e55b8b5
diff --git a/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2 b/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
index c0f2932d26a1..d321504e63eb 100644
--- a/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
+++ b/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[p
 RESTRICT=!test? ( test )
 SLOT=0/0.2.7.2
 SRC_URI=https://hackage.haskell.org/package/psqueues-0.2.7.2/psqueues-0.2.7.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=24cca263868c4c7e48226f832b796846
diff --git a/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1 b/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1
index d99daba508a0..d9f4438766b3 100644
--- a/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1
+++ b/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/data-default:=[profile?] >=de
 RESTRICT=!test? ( test )
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/publicsuffixlist-0.1/publicsuffixlist-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=184029ef4bd6257770f36f6e12def938
diff --git a/metadata/md5-cache/dev-haskell/punycode-2.0 b/metadata/md5-cache/dev-haskell/punycode-2.0
index 98fac16f12ac..d435d0ee5cbd 100644
--- a/metadata/md5-cache/dev-haskell/punycode-2.0
+++ b/metadata/md5-cache/dev-haskell/punycode-2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/t
 RESTRICT=test
 SLOT=0/2.0
 SRC_URI=https://hackage.haskell.org/package/punycode-2.0/punycode-2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e2e0a26478b155f68a37a67f0debb5fc
diff --git a/metadata/md5-cache/dev-haskell/puremd5-2.1.3 b/metadata/md5-cache/dev-haskell/puremd5-2.1.3
index eba8983fc085..86e7eea16b2f 100644
--- a/metadata/md5-cache/dev-haskell/puremd5-2.1.3
+++ b/metadata/md5-cache/dev-haskell/puremd5-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/binary-0.4.0:=[profile?] >=dev-haskell/cereal-0.2:=[profil
 RESTRICT=!test? ( test )
 SLOT=0/2.1.3
 SRC_URI=https://hackage.haskell.org/package/pureMD5-2.1.3/pureMD5-2.1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f394147e09086d42e029db6ae5e62c2f
diff --git a/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.4 b/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.4
index 6c7ef8f91e94..6482d11a249a 100644
--- a/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.4
+++ b/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.4.4
 SRC_URI=https://hackage.haskell.org/package/pwstore-fast-2.4.4/pwstore-fast-2.4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8e04ab2069d6c494104bf41c7c6f86f1
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.13.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.13.2
index c3b892e356e3..0d07feb440f7 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.13.2
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.13.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/random-1.0.1.0:=[profile?] <dev-haskell/random-1.2:=[profi
 RESTRICT=!test? ( test )
 SLOT=2/2.13.2
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.13.2/QuickCheck-2.13.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d55758f6bd509697ce0bfe6a7f19c50
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.6 b/metadata/md5-cache/dev-haskell/quickcheck-2.6
index 98b24a893d3f..9d32c2141316 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.6
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=2/2.6
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.6/QuickCheck-2.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=19018f35818b7af2a26e12d116611222
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.7.6 b/metadata/md5-cache/dev-haskell/quickcheck-2.7.6
index 0a228089d725..4f6d4c6c22fb 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.7.6
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=2/2.7.6
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.7.6/QuickCheck-2.7.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aad3071c4502049ae113026b1713aaa0
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.8.1 b/metadata/md5-cache/dev-haskell/quickcheck-2.8.1
index e36d0e3c5d62..333ae6d368f6 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.8.1
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=2/2.8.1
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.8.1/QuickCheck-2.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56390ee6196d3b087a8df5682ff6cd5d
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.8.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.8.2
index 665bb6cd5c59..40da7514fc89 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.8.2
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >
 RESTRICT=test
 SLOT=2/2.8.2
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.8.2/QuickCheck-2.8.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ecdb6baa11b362747cc95c5187f6d448
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.9.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
index 6a6131c3a0df..580bf8554178 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/nats-1:=[profile?] dev-haskell/random:=[profile?] >=dev-ha
 RESTRICT=test
 SLOT=2/2.9.2
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.9.2/QuickCheck-2.9.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bedcaa2ea1374297ec2e2fb412c9c325
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0 b/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0
index 121f4225c5b8..39f517498841 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/bifunctors:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.6.4.0
 SRC_URI=https://hackage.haskell.org/package/quickcheck-classes-0.6.4.0/quickcheck-classes-0.6.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2487f891c3f967d9c6c7ccdf0d5d388
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0 b/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0
index e5e1998744af..2a6624487ebf 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/contravariant:=[profile?] dev-haskell/fail:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-8.0.1:= binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
 SLOT=0/0.6.0.0
 SRC_URI=https://hackage.haskell.org/package/quickcheck-classes-base-0.6.0.0/quickcheck-classes-base-0.6.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=257a35eb8df34a3e382b949343d841f2
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22 b/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
index 0269cef1b25e..0bb9fd6b3adb 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
+++ b/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-0.9.3:=[profile?] >=dev-haskell/case-insensiti
 RESTRICT=!test? ( test )
 SLOT=0/0.3.22
 SRC_URI=https://hackage.haskell.org/package/quickcheck-instances-0.3.22/quickcheck-instances-0.3.22.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe1e3479593a777a6d4bd8c165836914
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0 b/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
index dce4e246c6e4..4dd05abab37e 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.7:2=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/quickcheck-io-0.2.0/quickcheck-io-0.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fa064b825f519219e8f2c782b585cb77
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-unicode-1.0.1.0 b/metadata/md5-cache/dev-haskell/quickcheck-unicode-1.0.1.0
index cb023ed50a68..7e9174e9716c 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-unicode-1.0.1.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-unicode-1.0.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-haskell/quickcheck-2.7:2=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.0
 SRC_URI=https://hackage.haskell.org/package/quickcheck-unicode-1.0.1.0/quickcheck-unicode-1.0.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=adcab9810c2e08ea65c711070f554cb4
diff --git a/metadata/md5-cache/dev-haskell/random-1.1 b/metadata/md5-cache/dev-haskell/random-1.1
index f53eae86bc53..f533091c81a2 100644
--- a/metadata/md5-cache/dev-haskell/random-1.1
+++ b/metadata/md5-cache/dev-haskell/random-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/random-1.1/random-1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9849de8e62128985cf4f7c4d4705e14b
diff --git a/metadata/md5-cache/dev-haskell/ranges-0.2.4-r1 b/metadata/md5-cache/dev-haskell/ranges-0.2.4-r1
index 038f37d42df4..66c3108ee73c 100644
--- a/metadata/md5-cache/dev-haskell/ranges-0.2.4-r1
+++ b/metadata/md5-cache/dev-haskell/ranges-0.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/ranges-0.2.4/ranges-0.2.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65d0749d2bd8007a39399d25dba1fad8
diff --git a/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1 b/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1
index d2244f95fa0a..58061e199ba0 100644
--- a/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1
+++ b/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/raw-strings-qq-1.1/raw-strings-qq-1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30f811d91026b284283fa006e72367a8
diff --git a/metadata/md5-cache/dev-haskell/readable-0.3.1 b/metadata/md5-cache/dev-haskell/readable-0.3.1
index d4ed73e5f775..167f63dc9c76 100644
--- a/metadata/md5-cache/dev-haskell/readable-0.3.1
+++ b/metadata/md5-cache/dev-haskell/readable-0.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/readable-0.3.1/readable-0.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6f3d1da5321e98bbc8048a22005a83ed
diff --git a/metadata/md5-cache/dev-haskell/readargs-1.2.3 b/metadata/md5-cache/dev-haskell/readargs-1.2.3
index 81cdd90e2856..44c39343aca1 100644
--- a/metadata/md5-cache/dev-haskell/readargs-1.2.3
+++ b/metadata/md5-cache/dev-haskell/readargs-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-file
 RESTRICT=!test? ( test )
 SLOT=0/1.2.3
 SRC_URI=https://hackage.haskell.org/package/ReadArgs-1.2.3/ReadArgs-1.2.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9138483b2a9722409a84949b1cd6e0f3
diff --git a/metadata/md5-cache/dev-haskell/readline-1.0.3.0-r1 b/metadata/md5-cache/dev-haskell/readline-1.0.3.0-r1
index 7d5c8b0d3be3..339423b897da 100644
--- a/metadata/md5-cache/dev-haskell/readline-1.0.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/readline-1.0.3.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.3.0
 SRC_URI=https://hackage.haskell.org/package/readline-1.0.3.0/readline-1.0.3.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	gnuconfig	262062cef0ba4f22b397193da514a350	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=32997a03cb1639c2c0dbec19e63dce6c
diff --git a/metadata/md5-cache/dev-haskell/rebase-1.4.1 b/metadata/md5-cache/dev-haskell/rebase-1.4.1
index 24e06c7452d0..79d2a9e2adca 100644
--- a/metadata/md5-cache/dev-haskell/rebase-1.4.1
+++ b/metadata/md5-cache/dev-haskell/rebase-1.4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/base-prelude-0.1:=[profile?] <dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/contravariant-extras-0.3.2:=[profile?] <dev-haskell/contravariant-extras-0.4:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/either-5:=[profile?] <dev-haskell/either-6:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/hashable-1:=[profile?] <dev-haskell/hashable-2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/selective-0.3:=[profile?] <dev-haskell/selective-0.4:=[profile?] >=dev-haskell/semigroupoids-5.2.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/stm-2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-1:=[profile?] <dev-haskell/uuid-2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/1.4.1
 SRC_URI=https://hackage.haskell.org/package/rebase-1.4.1/rebase-1.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=02e4a427a90bbc027d8b7ff82cb5a15b
diff --git a/metadata/md5-cache/dev-haskell/recaptcha-0.1.0.4 b/metadata/md5-cache/dev-haskell/recaptcha-0.1.0.4
index 2c0af7425762..7399954fa65e 100644
--- a/metadata/md5-cache/dev-haskell/recaptcha-0.1.0.4
+++ b/metadata/md5-cache/dev-haskell/recaptcha-0.1.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/http-3001.1.4:=[profile?] >=dev-haskell/xhtml-3000.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
 SLOT=0/0.1.0.4
 SRC_URI=https://hackage.haskell.org/package/recaptcha-0.1.0.4/recaptcha-0.1.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=99a59ecf5026f4aa430411c7b6df78fa
diff --git a/metadata/md5-cache/dev-haskell/reducers-3.12.3 b/metadata/md5-cache/dev-haskell/reducers-3.12.3
index a7250ddfec70..c04cf8e8744c 100644
--- a/metadata/md5-cache/dev-haskell/reducers-3.12.3
+++ b/metadata/md5-cache/dev-haskell/reducers-3.12.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/3.12.3
 SRC_URI=https://hackage.haskell.org/package/reducers-3.12.3/reducers-3.12.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8875a86fb1cc9a122ae1e9d1350b235b
diff --git a/metadata/md5-cache/dev-haskell/refact-0.3.0.2 b/metadata/md5-cache/dev-haskell/refact-0.3.0.2
index d4c976171f4d..8d53daf56376 100644
--- a/metadata/md5-cache/dev-haskell/refact-0.3.0.2
+++ b/metadata/md5-cache/dev-haskell/refact-0.3.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.2
 SRC_URI=https://hackage.haskell.org/package/refact-0.3.0.2/refact-0.3.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ade7e305250e6407b835a89a1dce0ddd
diff --git a/metadata/md5-cache/dev-haskell/reflection-2.1.4 b/metadata/md5-cache/dev-haskell/reflection-2.1.4
index 070bedd8d9b1..5f806bfd7ae9 100644
--- a/metadata/md5-cache/dev-haskell/reflection-2.1.4
+++ b/metadata/md5-cache/dev-haskell/reflection-2.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.1.4
 SRC_URI=https://hackage.haskell.org/package/reflection-2.1.4/reflection-2.1.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7ac913d21aff365ab25bf98d6397f3a
diff --git a/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1 b/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1
index e218320f9b88..dd10118ae3bf 100644
--- a/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1
+++ b/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.3.1
 SRC_URI=https://hackage.haskell.org/package/regex-applicative-0.3.3.1/regex-applicative-0.3.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a678d9c4232516cac2744ed45edc8a9
diff --git a/metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1 b/metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
index f5e7f38752a6..cf8974d66339 100644
--- a/metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/regex-applicative-text-0.1.0.1/regex-applicative-text-0.1.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0f6af008cb830fb9fa94613ec207a052
diff --git a/metadata/md5-cache/dev-haskell/regex-base-0.94.0.0 b/metadata/md5-cache/dev-haskell/regex-base-0.94.0.0
index 173e82641214..d26caa51e3dd 100644
--- a/metadata/md5-cache/dev-haskell/regex-base-0.94.0.0
+++ b/metadata/md5-cache/dev-haskell/regex-base-0.94.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.94.0.0
 SRC_URI=https://hackage.haskell.org/package/regex-base-0.94.0.0/regex-base-0.94.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=659bd7efeb54b82831b571b8b4ce5ddb
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0 b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
index 32275afd28d2..ea08798702f0 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
+++ b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.95.2.0
 SRC_URI=https://hackage.haskell.org/package/regex-compat-0.95.2.0/regex-compat-0.95.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=224d24034c88fb49dab960931a8aa4e1
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4 b/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
index f8c71c43cf30..14fe78c18b89 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
+++ b/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-tdfa-1.1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.95.1.4
 SRC_URI=https://hackage.haskell.org/package/regex-compat-tdfa-0.95.1.4/regex-compat-tdfa-0.95.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4cff680c7405ee23df7cce3a7df769be
diff --git a/metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0 b/metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0
index e3ed522422ed..874642f646ab 100644
--- a/metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0
+++ b/metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/libpcre
 SLOT=0/0.95.0.0
 SRC_URI=https://hackage.haskell.org/package/regex-pcre-0.95.0.0/regex-pcre-0.95.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c1fb6c761f7fb6943c7c7b2542f6af8b
diff --git a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.95.1.3.8.43 b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.95.1.3.8.43
index 716d3822b131..27387bd005bb 100644
--- a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.95.1.3.8.43
+++ b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.95.1.3.8.43
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.95.1.3.8.43
 SRC_URI=https://hackage.haskell.org/package/regex-pcre-builtin-0.95.1.3.8.43/regex-pcre-builtin-0.95.1.3.8.43.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a7f533bebbcfcdb31138fe10df68d9b
diff --git a/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0 b/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
index 5b8f7c888a02..af67d9451c2f 100644
--- a/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
+++ b/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.96.0.0
 SRC_URI=https://hackage.haskell.org/package/regex-posix-0.96.0.0/regex-posix-0.96.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8769f9e6e558503f08aee6c7f2c1b93f
diff --git a/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2 b/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2
index 95a4ee408c6c..ecee336e18c2 100644
--- a/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.2
 SRC_URI=https://hackage.haskell.org/package/regex-tdfa-1.2.2/regex-tdfa-1.2.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=53802cc21d15a47b619c227d8ad5ddab
diff --git a/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0 b/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
index 75d423e5b69b..d0e43f55fca9 100644
--- a/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=!test? ( test )
 SLOT=0/1.3.1.0
 SRC_URI=https://hackage.haskell.org/package/regex-tdfa-1.3.1.0/regex-tdfa-1.3.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c248c4889282ded7907804ef482cbf6c
diff --git a/metadata/md5-cache/dev-haskell/rerebase-1.4.1 b/metadata/md5-cache/dev-haskell/rerebase-1.4.1
index f5de3a4f527f..6ac61e5dd44e 100644
--- a/metadata/md5-cache/dev-haskell/rerebase-1.4.1
+++ b/metadata/md5-cache/dev-haskell/rerebase-1.4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=~dev-haskell/rebase-1.4.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.4.1
 SRC_URI=https://hackage.haskell.org/package/rerebase-1.4.1/rerebase-1.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d008214c84b5b714711178bdeec572f9
diff --git a/metadata/md5-cache/dev-haskell/resolv-0.1.2.0 b/metadata/md5-cache/dev-haskell/resolv-0.1.2.0
index 8fefeb8d9ab2..677ec46b1001 100644
--- a/metadata/md5-cache/dev-haskell/resolv-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/resolv-0.1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-byte
 RESTRICT=test
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/resolv-0.1.2.0/resolv-0.1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b521b04c076c6f703d67a1f19b7c75c
diff --git a/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2 b/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
index dd28b8c78198..d9ff108b54d7 100644
--- a/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
+++ b/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/monad-control-0.2.0.1:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.3.2
 SRC_URI=https://hackage.haskell.org/package/resource-pool-0.2.3.2/resource-pool-0.2.3.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=63b7d26895cc350b7c8ea6d5f5c0d976
diff --git a/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2 b/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
index 2a0fcf893ce8..97ee4d30e1ff 100644
--- a/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
+++ b/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-h
 RESTRICT=!test? ( test )
 SLOT=0/1.2.4.2
 SRC_URI=https://hackage.haskell.org/package/resourcet-1.2.4.2/resourcet-1.2.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=368e9e2756e47263177bd99ab6b86b3e
diff --git a/metadata/md5-cache/dev-haskell/retry-0.8.1.1 b/metadata/md5-cache/dev-haskell/retry-0.8.1.1
index cebc7b5fde2a..25ea06ec3fcf 100644
--- a/metadata/md5-cache/dev-haskell/retry-0.8.1.1
+++ b/metadata/md5-cache/dev-haskell/retry-0.8.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/random-1:=[profil
 RESTRICT=!test? ( test )
 SLOT=0/0.8.1.1
 SRC_URI=https://hackage.haskell.org/package/retry-0.8.1.1/retry-0.8.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd88c79585591c0cbad9dbf773de404c
diff --git a/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4 b/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4
index df9946893571..641d5ec73eaf 100644
--- a/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4
+++ b/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.4
 SRC_URI=https://hackage.haskell.org/package/rfc5051-0.1.0.4/rfc5051-0.1.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3c92607e0a097293be55e64d9919552a
diff --git a/metadata/md5-cache/dev-haskell/rfc5051-0.2 b/metadata/md5-cache/dev-haskell/rfc5051-0.2
index 0602b4dcb295..322b9053554e 100644
--- a/metadata/md5-cache/dev-haskell/rfc5051-0.2
+++ b/metadata/md5-cache/dev-haskell/rfc5051-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2
 SRC_URI=https://hackage.haskell.org/package/rfc5051-0.2/rfc5051-0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3533f3431a014327488043280f6fba21
diff --git a/metadata/md5-cache/dev-haskell/riff-0.3.0.1 b/metadata/md5-cache/dev-haskell/riff-0.3.0.1
index 284e282c8892..0099f4b11bb7 100644
--- a/metadata/md5-cache/dev-haskell/riff-0.3.0.1
+++ b/metadata/md5-cache/dev-haskell/riff-0.3.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/either-4.3:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.3.0.1
 SRC_URI=https://hackage.haskell.org/package/riff-0.3.0.1/riff-0.3.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=51f8c15ed6a2b3d31097353d15a75f60
diff --git a/metadata/md5-cache/dev-haskell/rio-0.1.18.0 b/metadata/md5-cache/dev-haskell/rio-0.1.18.0
index 158cbc18ee08..5709fe814161 100644
--- a/metadata/md5-cache/dev-haskell/rio-0.1.18.0
+++ b/metadata/md5-cache/dev-haskell/rio-0.1.18.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/hashable:=[profile?] dev-
 RESTRICT=!test? ( test )
 SLOT=0/0.1.18.0
 SRC_URI=https://hackage.haskell.org/package/rio-0.1.18.0/rio-0.1.18.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=89a2261c545120e256040b2accc47dd1
diff --git a/metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0 b/metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0
index b83ac6d27add..29b7958696a3 100644
--- a/metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0
+++ b/metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/fast-logger:=[profile?] d
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.0
 SRC_URI=https://hackage.haskell.org/package/rio-orphans-0.1.1.0/rio-orphans-0.1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35addf4110708179984393ee5df525d3
diff --git a/metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.1.0 b/metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.1.0
index a290432ecd0d..0734638674a1 100644
--- a/metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.1.0
+++ b/metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/annotated-wl-pprint:=[profile?] >=dev-haskell/ansi-terminal-0.9:=[profile?] dev-haskell/cabal:=[profile?] dev-haskell/colour:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/path:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/0.1.1.0
 SRC_URI=https://hackage.haskell.org/package/rio-prettyprint-0.1.1.0/rio-prettyprint-0.1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cfd6c04af53d9ac29201b85ccedfcc5f
diff --git a/metadata/md5-cache/dev-haskell/rsa-2.3.1 b/metadata/md5-cache/dev-haskell/rsa-2.3.1
index bc578403191b..3292cd9be21c 100644
--- a/metadata/md5-cache/dev-haskell/rsa-2.3.1
+++ b/metadata/md5-cache/dev-haskell/rsa-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/crypto-api-0.10:=[profile?] <dev-haskell/crypto-api-0.14:=
 RESTRICT=!test? ( test )
 SLOT=0/2.3.1
 SRC_URI=https://hackage.haskell.org/package/RSA-2.3.1/RSA-2.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7172540117e9ba54a5f70fef4ef7e8f2
diff --git a/metadata/md5-cache/dev-haskell/safe-0.3.19 b/metadata/md5-cache/dev-haskell/safe-0.3.19
index a5d351df8c19..1aa7916115c4 100644
--- a/metadata/md5-cache/dev-haskell/safe-0.3.19
+++ b/metadata/md5-cache/dev-haskell/safe-0.3.19
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.19
 SRC_URI=https://hackage.haskell.org/package/safe-0.3.19/safe-0.3.19.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1eca07add143c42a14f5dac7553a7893
diff --git a/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0 b/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0
index ac2ad646e578..da7abfb56b19 100644
--- a/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0
+++ b/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.7.0
 SRC_URI=https://hackage.haskell.org/package/safe-exceptions-0.1.7.0/safe-exceptions-0.1.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7a20bd03c8a33aefa965f01e15cd81e7
diff --git a/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1 b/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
index 035459ef389c..0a3436605d8e 100644
--- a/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
+++ b/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/stm:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.1
 SRC_URI=https://hackage.haskell.org/package/SafeSemaphore-0.10.1/SafeSemaphore-0.10.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=204788e08ba8fb1419d4b005c93ec6c0
diff --git a/metadata/md5-cache/dev-haskell/sandi-0.5 b/metadata/md5-cache/dev-haskell/sandi-0.5
index 1f77102336f7..bfd989a1cb3e 100644
--- a/metadata/md5-cache/dev-haskell/sandi-0.5
+++ b/metadata/md5-cache/dev-haskell/sandi-0.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= conduit? ( >=dev-haskell/conduit-1.3:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.5
 SRC_URI=https://hackage.haskell.org/package/sandi-0.5/sandi-0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06574ea4e076e29606eaaed4f64d38a8
diff --git a/metadata/md5-cache/dev-haskell/say-0.1.0.0 b/metadata/md5-cache/dev-haskell/say-0.1.0.0
index cdc2cd2a673b..28fcfd3d4a47 100644
--- a/metadata/md5-cache/dev-haskell/say-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/say-0.1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/say-0.1.0.0/say-0.1.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2251264bdff675431925d1c337308af8
diff --git a/metadata/md5-cache/dev-haskell/scientific-0.3.6.2 b/metadata/md5-cache/dev-haskell/scientific-0.3.6.2
index e7bdfd21cae2..05d90d56cf52 100644
--- a/metadata/md5-cache/dev-haskell/scientific-0.3.6.2
+++ b/metadata/md5-cache/dev-haskell/scientific-0.3.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestr
 RESTRICT=test
 SLOT=0/0.3.6.2
 SRC_URI=https://hackage.haskell.org/package/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0bb216be144ca46ba56a3dc9a5893e81
diff --git a/metadata/md5-cache/dev-haskell/securemem-0.1.10 b/metadata/md5-cache/dev-haskell/securemem-0.1.10
index eb9553bc8332..ffd53a1da9d5 100644
--- a/metadata/md5-cache/dev-haskell/securemem-0.1.10
+++ b/metadata/md5-cache/dev-haskell/securemem-0.1.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.10
 SRC_URI=https://hackage.haskell.org/package/securemem-0.1.10/securemem-0.1.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d2b07b7d1b439c67ec030dd869a27ef
diff --git a/metadata/md5-cache/dev-haskell/selective-0.3 b/metadata/md5-cache/dev-haskell/selective-0.3
index 9808e89eede5..6f99da6421b1 100644
--- a/metadata/md5-cache/dev-haskell/selective-0.3
+++ b/metadata/md5-cache/dev-haskell/selective-0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/selective-0.3/selective-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=970af3d67ad33c267c7633479114b4f0
diff --git a/metadata/md5-cache/dev-haskell/semigroupoid-extras-5 b/metadata/md5-cache/dev-haskell/semigroupoid-extras-5
index 8887559b8d1d..fdd1dae4d9e0 100644
--- a/metadata/md5-cache/dev-haskell/semigroupoid-extras-5
+++ b/metadata/md5-cache/dev-haskell/semigroupoid-extras-5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-lang/ghc-7.6.2:= profunctors? ( >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] )
 SLOT=0/5
 SRC_URI=https://hackage.haskell.org/package/semigroupoid-extras-5/semigroupoid-extras-5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=657d4f4c39e5f75cbe591c7406b83b3c
diff --git a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4 b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
index c2e2b7a85bbe..c65aa19c83a0 100644
--- a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
+++ b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=
 RESTRICT=test
 SLOT=0/5.3.4
 SRC_URI=https://hackage.haskell.org/package/semigroupoids-5.3.4/semigroupoids-5.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0fa89d432a58783a22283f7ab0390ee7
diff --git a/metadata/md5-cache/dev-haskell/semigroups-0.18.5 b/metadata/md5-cache/dev-haskell/semigroups-0.18.5
index b708b1256dd7..0355cb7ee084 100644
--- a/metadata/md5-cache/dev-haskell/semigroups-0.18.5
+++ b/metadata/md5-cache/dev-haskell/semigroups-0.18.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= transformers? ( >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
 SLOT=0/0.18.5
 SRC_URI=https://hackage.haskell.org/package/semigroups-0.18.5/semigroups-0.18.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=336024fdceebbe1f1aee9c8740f58b3f
diff --git a/metadata/md5-cache/dev-haskell/semirings-0.5.4 b/metadata/md5-cache/dev-haskell/semirings-0.5.4
index e65cdb1bc141..58b570c93da9 100644
--- a/metadata/md5-cache/dev-haskell/semirings-0.5.4
+++ b/metadata/md5-cache/dev-haskell/semirings-0.5.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/base-compat-batteries:=[profile?] >=dev-lang/ghc-7.10.1:=[gmp] hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
 SLOT=0/0.5.4
 SRC_URI=https://hackage.haskell.org/package/semirings-0.5.4/semirings-0.5.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=500fd11d949ae935518ec9eaf70519f0
diff --git a/metadata/md5-cache/dev-haskell/sendfile-0.7.11.1 b/metadata/md5-cache/dev-haskell/sendfile-0.7.11.1
index e77df3ef5a72..178f7a768495 100644
--- a/metadata/md5-cache/dev-haskell/sendfile-0.7.11.1
+++ b/metadata/md5-cache/dev-haskell/sendfile-0.7.11.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/network-2:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.11.1
 SRC_URI=https://hackage.haskell.org/package/sendfile-0.7.11.1/sendfile-0.7.11.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3169d3c683d79d5f25329330a294fc3
diff --git a/metadata/md5-cache/dev-haskell/setenv-0.1.1.3 b/metadata/md5-cache/dev-haskell/setenv-0.1.1.3
index c8f0a704280f..77be5884e540 100644
--- a/metadata/md5-cache/dev-haskell/setenv-0.1.1.3
+++ b/metadata/md5-cache/dev-haskell/setenv-0.1.1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.3
 SRC_URI=https://hackage.haskell.org/package/setenv-0.1.1.3/setenv-0.1.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06af0e4c273493fc209690d58ffa5958
diff --git a/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9 b/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
index cc9377c9d329..1f9a2434b1d4 100644
--- a/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
+++ b/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.6.1:=
 SLOT=0/1.0.0.9
 SRC_URI=https://hackage.haskell.org/package/setlocale-1.0.0.9/setlocale-1.0.0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f62a9d3a1a5a3b1b36505edc4a31c642
diff --git a/metadata/md5-cache/dev-haskell/sha-1.6.4.4 b/metadata/md5-cache/dev-haskell/sha-1.6.4.4
index bfbc57bde4c9..1b0da6c31ab0 100644
--- a/metadata/md5-cache/dev-haskell/sha-1.6.4.4
+++ b/metadata/md5-cache/dev-haskell/sha-1.6.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.4.4
 SRC_URI=https://hackage.haskell.org/package/SHA-1.6.4.4/SHA-1.6.4.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e87ea8cafc3fc954dc1fb803500cf0b
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-2.0.25 b/metadata/md5-cache/dev-haskell/shakespeare-2.0.25
index 7c6061510c3c..42058eb9ec09 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-2.0.25
+++ b/metadata/md5-cache/dev-haskell/shakespeare-2.0.25
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-has
 RESTRICT=!test? ( test )
 SLOT=0/2.0.25
 SRC_URI=https://hackage.haskell.org/package/shakespeare-2.0.25/shakespeare-2.0.25.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3013209c043b7805f2e36504bfc670c7
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-css-1.1.0 b/metadata/md5-cache/dev-haskell/shakespeare-css-1.1.0
index dc36a46b77ab..c721883bb6cf 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-css-1.1.0
+++ b/metadata/md5-cache/dev-haskell/shakespeare-css-1.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/shakespeare-css-1.1.0/shakespeare-css-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=14e28642f1d4c362417276ee0b850ac1
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.1.0 b/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.1.0
index 992f22b859e8..7be599f19c9f 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.1.0
+++ b/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/shakespeare-i18n-1.1.0/shakespeare-i18n-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8375518e8bf355b6aca55e839fb0acb2
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-js-1.3.0 b/metadata/md5-cache/dev-haskell/shakespeare-js-1.3.0
index f7228157bf9d..72e703fa3b7a 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-js-1.3.0
+++ b/metadata/md5-cache/dev-haskell/shakespeare-js-1.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.0
 SRC_URI=https://hackage.haskell.org/package/shakespeare-js-1.3.0/shakespeare-js-1.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a3cd40afbcaf77a37ad85f7b64f23873
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-text-1.1.0 b/metadata/md5-cache/dev-haskell/shakespeare-text-1.1.0
index 8ec01c53c7dc..19e7d52d69ac 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-text-1.1.0
+++ b/metadata/md5-cache/dev-haskell/shakespeare-text-1.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/shakespeare-text-1.1.0/shakespeare-text-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b95de94df92772cb3aee30e09de84ce0
diff --git a/metadata/md5-cache/dev-haskell/shell-escape-0.2.0 b/metadata/md5-cache/dev-haskell/shell-escape-0.2.0
index 5159d39fb32a..cde5531cadd8 100644
--- a/metadata/md5-cache/dev-haskell/shell-escape-0.2.0
+++ b/metadata/md5-cache/dev-haskell/shell-escape-0.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/vector-0.6.0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/shell-escape-0.2.0/shell-escape-0.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a784eed580cbdd3ef9cffb385d968b10
diff --git a/metadata/md5-cache/dev-haskell/shelly-1.9.0 b/metadata/md5-cache/dev-haskell/shelly-1.9.0
index 997e82c96035..47ef34ed48ec 100644
--- a/metadata/md5-cache/dev-haskell/shelly-1.9.0
+++ b/metadata/md5-cache/dev-haskell/shelly-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/1.9.0
 SRC_URI=https://hackage.haskell.org/package/shelly-1.9.0/shelly-1.9.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a9af7570a43492288a32485e5d5e63f2
diff --git a/metadata/md5-cache/dev-haskell/silently-1.2.5.1 b/metadata/md5-cache/dev-haskell/silently-1.2.5.1
index 06dc5b6802be..ba00b465be53 100644
--- a/metadata/md5-cache/dev-haskell/silently-1.2.5.1
+++ b/metadata/md5-cache/dev-haskell/silently-1.2.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.2.5.1
 SRC_URI=https://hackage.haskell.org/package/silently-1.2.5.1/silently-1.2.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2135f8fa193998086424c341c35691e
diff --git a/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3 b/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3
index 86fe2735eb40..16ba9e96c467 100644
--- a/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3
+++ b/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/simple-reflect-0.3.3/simple-reflect-0.3.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2902783b529e840a018686bd41857924
diff --git a/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28 b/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28
index bf2bb0185e76..9740cfa0940c 100644
--- a/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28
+++ b/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.28
 SRC_URI=https://hackage.haskell.org/package/simple-sendfile-0.2.28/simple-sendfile-0.2.28.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=79f53b06638febbfc9b58c692bc29fb9
diff --git a/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1 b/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
index 79fb6983fa90..ce91101301fa 100644
--- a/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
+++ b/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/dec-0.0.3 <dev-haskell/dec-0.1
 SLOT=0/0.1.5
 SRC_URI=https://hackage.haskell.org/package/singleton-bool-0.1.5/singleton-bool-0.1.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=15bb456a320ae2e1f93282236aa7fac1
diff --git a/metadata/md5-cache/dev-haskell/size-based-0.1.2.0 b/metadata/md5-cache/dev-haskell/size-based-0.1.2.0
index f3b07507dd61..476217457dd0 100644
--- a/metadata/md5-cache/dev-haskell/size-based-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/size-based-0.1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/dictionary-sharing-0.1:=[profile?] <dev-haskell/dictionary-sharing-1.0:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/testing-type-modifiers-0.1:=[profile?] <dev-haskell/testing-type-modifiers-1.0:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/size-based-0.1.2.0/size-based-0.1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2e21b7c90e2573cb499e2f9494bf8d84
diff --git a/metadata/md5-cache/dev-haskell/skein-1.0.9.4 b/metadata/md5-cache/dev-haskell/skein-1.0.9.4
index e3d8b612a69c..f5181c394f51 100644
--- a/metadata/md5-cache/dev-haskell/skein-1.0.9.4
+++ b/metadata/md5-cache/dev-haskell/skein-1.0.9.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.0.9.4
 SRC_URI=https://hackage.haskell.org/package/skein-1.0.9.4/skein-1.0.9.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd6bf2e0acdf57b8e4379f69b49fe956
diff --git a/metadata/md5-cache/dev-haskell/skylighting-0.10.5-r1 b/metadata/md5-cache/dev-haskell/skylighting-0.10.5-r1
index a8c81a547da7..9a625eb650cb 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-0.10.5-r1
+++ b/metadata/md5-cache/dev-haskell/skylighting-0.10.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~dev-haskell/skylighting-core-0.10.5:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/libpcre:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] )
 SLOT=0/0.10.5
 SRC_URI=https://hackage.haskell.org/package/skylighting-0.10.5/skylighting-0.10.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ea0a9b433e0f81152b43cce377769c59
diff --git a/metadata/md5-cache/dev-haskell/skylighting-0.8.5-r1 b/metadata/md5-cache/dev-haskell/skylighting-0.8.5-r1
index b52f2f0d0102..fc2c9a0d5185 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-0.8.5-r1
+++ b/metadata/md5-cache/dev-haskell/skylighting-0.8.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~dev-haskell/skylighting-core-0.8.5:=[profile?] >=dev-lang/ghc-7.10.1:= dev-libs/libpcre:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] )
 SLOT=0/0.8.5
 SRC_URI=https://hackage.haskell.org/package/skylighting-0.8.5/skylighting-0.8.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06d3303a7cd9690cd51352189a9dceeb
diff --git a/metadata/md5-cache/dev-haskell/skylighting-core-0.10.5-r1 b/metadata/md5-cache/dev-haskell/skylighting-core-0.10.5-r1
index 6b0b8a3dffc0..a537c8ed85b3 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-core-0.10.5-r1
+++ b/metadata/md5-cache/dev-haskell/skylighting-core-0.10.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[pr
 RESTRICT=!test? ( test )
 SLOT=0/0.10.5
 SRC_URI=https://hackage.haskell.org/package/skylighting-core-0.10.5/skylighting-core-0.10.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db4b3dd860daee2db90b5ab5c2bc3491
diff --git a/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5-r1 b/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5-r1
index 1eb48d705a4c..c817fda6e8a1 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5-r1
+++ b/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[pr
 RESTRICT=!test? ( test )
 SLOT=0/0.8.5
 SRC_URI=https://hackage.haskell.org/package/skylighting-core-0.8.5/skylighting-core-0.8.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5e7802d187cd3ab1bbb8df80a6a6377
diff --git a/metadata/md5-cache/dev-haskell/smallcheck-1.2.0 b/metadata/md5-cache/dev-haskell/smallcheck-1.2.0
index 5d806410e62d..dde494008f64 100644
--- a/metadata/md5-cache/dev-haskell/smallcheck-1.2.0
+++ b/metadata/md5-cache/dev-haskell/smallcheck-1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/logict:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/nats:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.2.0
 SRC_URI=https://hackage.haskell.org/package/smallcheck-1.2.0/smallcheck-1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1abe9c39b3654fcd9ebec885970f01f8
diff --git a/metadata/md5-cache/dev-haskell/snap-core-1.0.4.2 b/metadata/md5-cache/dev-haskell/snap-core-1.0.4.2
index fabdc6860dfa..effdb3fd4d67 100644
--- a/metadata/md5-cache/dev-haskell/snap-core-1.0.4.2
+++ b/metadata/md5-cache/dev-haskell/snap-core-1.0.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=
 RESTRICT=test
 SLOT=0/1.0.4.2
 SRC_URI=https://hackage.haskell.org/package/snap-core-1.0.4.2/snap-core-1.0.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ab1b53a7fda967bbd301149a54b7ae5
diff --git a/metadata/md5-cache/dev-haskell/snap-server-1.1.1.2 b/metadata/md5-cache/dev-haskell/snap-server-1.1.1.2
index 6ce60e723f7e..39f2ccd70e75 100644
--- a/metadata/md5-cache/dev-haskell/snap-server-1.1.1.2
+++ b/metadata/md5-cache/dev-haskell/snap-server-1.1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1.1.2
 SRC_URI=https://hackage.haskell.org/package/snap-server-1.1.1.2/snap-server-1.1.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a77da2aa3aaa5c33accb238adf3d439b
diff --git a/metadata/md5-cache/dev-haskell/socks-0.6.1 b/metadata/md5-cache/dev-haskell/socks-0.6.1
index 394a9cf26aaa..64583e5e7f68 100644
--- a/metadata/md5-cache/dev-haskell/socks-0.6.1
+++ b/metadata/md5-cache/dev-haskell/socks-0.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/basement:=[profile?] >=dev-haskell/cereal-0.3.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.1
 SRC_URI=https://hackage.haskell.org/package/socks-0.6.1/socks-0.6.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=04d2eb21259f26538e4f62f10fe53193
diff --git a/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1 b/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
index dd89bbc4dbe3..936bb50060a6 100644
--- a/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 SLOT=0/0.5.0.1
 SRC_URI=https://hackage.haskell.org/package/sop-core-0.5.0.1/sop-core-0.5.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=afdc0bb356980cd81f2ea8f1a253a97f
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.3.4 b/metadata/md5-cache/dev-haskell/split-0.2.3.4
index 300713f218f2..3c5b06c260d5 100644
--- a/metadata/md5-cache/dev-haskell/split-0.2.3.4
+++ b/metadata/md5-cache/dev-haskell/split-0.2.3.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.3.4
 SRC_URI=https://hackage.haskell.org/package/split-0.2.3.4/split-0.2.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5c61c28b2c61af22f8bc2f61db77592f
diff --git a/metadata/md5-cache/dev-haskell/splitmix-0.0.4 b/metadata/md5-cache/dev-haskell/splitmix-0.0.4
index 69fe12f400ea..72534822631a 100644
--- a/metadata/md5-cache/dev-haskell/splitmix-0.0.4
+++ b/metadata/md5-cache/dev-haskell/splitmix-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= random? ( >=dev-haskell/random-1.0:=[profile?] <d
 RESTRICT=test
 SLOT=0/0.0.4
 SRC_URI=https://hackage.haskell.org/package/splitmix-0.0.4/splitmix-0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=933e939552dffd8030e321225d39dc76
diff --git a/metadata/md5-cache/dev-haskell/stack-2.3.3 b/metadata/md5-cache/dev-haskell/stack-2.3.3
index 80b17597f2ae..f7c2d5b4a17e 100644
--- a/metadata/md5-cache/dev-haskell/stack-2.3.3
+++ b/metadata/md5-cache/dev-haskell/stack-2.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.4.6.0:=[profile?] >=dev-haskell/annotated-wl-pprin
 RESTRICT=test
 SLOT=0/2.3.3
 SRC_URI=https://hackage.haskell.org/package/stack-2.3.3/stack-2.3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4fa1f6420a7eaf660c10130c55cbc534
diff --git a/metadata/md5-cache/dev-haskell/statevar-1.1.1.1 b/metadata/md5-cache/dev-haskell/statevar-1.1.1.1
index 7d3becefc371..540aa7bb0149 100644
--- a/metadata/md5-cache/dev-haskell/statevar-1.1.1.1
+++ b/metadata/md5-cache/dev-haskell/statevar-1.1.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.2.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.1.1
 SRC_URI=https://hackage.haskell.org/package/StateVar-1.1.1.1/StateVar-1.1.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7c7f07f8bf8783f588378cf4c56d27f
diff --git a/metadata/md5-cache/dev-haskell/statistics-0.15.2.0 b/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
index 38f606197f98..08990a087a08 100644
--- a/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
+++ b/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.6.0.0:=[profile?] >=dev-haskell/async-2.2.2:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.15.2.0
 SRC_URI=https://hackage.haskell.org/package/statistics-0.15.2.0/statistics-0.15.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4fdb24bd02632a1304d51070a9b9cda1
diff --git a/metadata/md5-cache/dev-haskell/stm-2.5.0.0 b/metadata/md5-cache/dev-haskell/stm-2.5.0.0
index fe42e86ad8ad..de5c769f0c30 100644
--- a/metadata/md5-cache/dev-haskell/stm-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/stm-2.5.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/nats-0.1.3:=[profile?] <dev-haskell/nats-1.2:=[profile?]
 SLOT=0/2.5.0.0
 SRC_URI=https://hackage.haskell.org/package/stm-2.5.0.0/stm-2.5.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5b34097b793752963c41916a2ba14dfe
diff --git a/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4 b/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
index 8085b613bf63..1050b54d2384 100644
--- a/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
+++ b/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/3.0.0.4
 SRC_URI=https://hackage.haskell.org/package/stm-chans-3.0.0.4/stm-chans-3.0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=520da41578af7a9c39796c7c43bf196c
diff --git a/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4 b/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4
index cab28e4b6132..1f2fb1737564 100644
--- a/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4
+++ b/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/fail:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-
 RESTRICT=!test? ( test )
 SLOT=0/0.4.4
 SRC_URI=https://hackage.haskell.org/package/STMonadTrans-0.4.4/STMonadTrans-0.4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=21c3af352ebc0e83b96cde3dd713c950
diff --git a/metadata/md5-cache/dev-haskell/store-0.7.6 b/metadata/md5-cache/dev-haskell/store-0.7.6
index 6da1cadc179d..63d3a9ba718c 100644
--- a/metadata/md5-cache/dev-haskell/store-0.7.6
+++ b/metadata/md5-cache/dev-haskell/store-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.0.2:=[profile?] >=dev-haskell/base-orphans-0.4.3:=
 RESTRICT=test
 SLOT=0/0.7.6
 SRC_URI=https://hackage.haskell.org/package/store-0.7.6/store-0.7.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=da3c4567a11953bf470e7b4e279efad3
diff --git a/metadata/md5-cache/dev-haskell/store-core-0.4.4.3 b/metadata/md5-cache/dev-haskell/store-core-0.4.4.3
index ce8c87c581c8..3df4b2703288 100644
--- a/metadata/md5-cache/dev-haskell/store-core-0.4.4.3
+++ b/metadata/md5-cache/dev-haskell/store-core-0.4.4.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.4.4.3
 SRC_URI=https://hackage.haskell.org/package/store-core-0.4.4.3/store-core-0.4.4.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54452d8665aadd742f05be0f6f8c3c80
diff --git a/metadata/md5-cache/dev-haskell/stream-0.4.7.2 b/metadata/md5-cache/dev-haskell/stream-0.4.7.2
index a9f06f03b9bb..528e1357a445 100644
--- a/metadata/md5-cache/dev-haskell/stream-0.4.7.2
+++ b/metadata/md5-cache/dev-haskell/stream-0.4.7.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/lazysmallcheck-0.3:=[profile?] >=dev-haskell/quickcheck-2.0:2=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.7.2
 SRC_URI=https://hackage.haskell.org/package/Stream-0.4.7.2/Stream-0.4.7.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe1ad915921cf6b1fd47b8581d8fcdb4
diff --git a/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2 b/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
index 401fe385546c..6af10d3a9644 100644
--- a/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
+++ b/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/network-2.4.0.0:=[profile?]
 RESTRICT=test
 SLOT=0/0.2.1.2
 SRC_URI=https://hackage.haskell.org/package/streaming-commons-0.2.1.2/streaming-commons-0.2.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2c9bca1c2279669b89141f2dd0815d2a
diff --git a/metadata/md5-cache/dev-haskell/strict-0.3.2-r1 b/metadata/md5-cache/dev-haskell/strict-0.3.2-r1
index 43ec995f3918..6e2e6683715c 100644
--- a/metadata/md5-cache/dev-haskell/strict-0.3.2-r1
+++ b/metadata/md5-cache/dev-haskell/strict-0.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.2
 SRC_URI=https://hackage.haskell.org/package/strict-0.3.2/strict-0.3.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bf42f5cf65879d9dac660ced8811e500
diff --git a/metadata/md5-cache/dev-haskell/string-qq-0.0.4 b/metadata/md5-cache/dev-haskell/string-qq-0.0.4
index 26f4a92c215e..dbe2f569703a 100644
--- a/metadata/md5-cache/dev-haskell/string-qq-0.0.4
+++ b/metadata/md5-cache/dev-haskell/string-qq-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.4
 SRC_URI=https://hackage.haskell.org/package/string-qq-0.0.4/string-qq-0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5184c8ecb47230c67175c68c972959a2
diff --git a/metadata/md5-cache/dev-haskell/stringable-0.1.3 b/metadata/md5-cache/dev-haskell/stringable-0.1.3
index 5b97e869a1e8..c6d876468dd9 100644
--- a/metadata/md5-cache/dev-haskell/stringable-0.1.3
+++ b/metadata/md5-cache/dev-haskell/stringable-0.1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] >=dev-haskell/text-0.11.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/stringable-0.1.3/stringable-0.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=07ef4d7f76c774217ff9699d410f96c4
diff --git a/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1 b/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
index dd809df5d18f..8b675e45049e 100644
--- a/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
+++ b/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1
 SRC_URI=https://hackage.haskell.org/package/stringbuilder-0.5.1/stringbuilder-0.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d6f746a4a3771c5a0aba6b3278d6a88
diff --git a/metadata/md5-cache/dev-haskell/stringprep-1.0.0 b/metadata/md5-cache/dev-haskell/stringprep-1.0.0
index aa875f87c2ea..6884115a3104 100644
--- a/metadata/md5-cache/dev-haskell/stringprep-1.0.0
+++ b/metadata/md5-cache/dev-haskell/stringprep-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-haskell/text-icu-0.6:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://hackage.haskell.org/package/stringprep-1.0.0/stringprep-1.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c35803d97051bfac7e7ff60943186270
diff --git a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6-r1 b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6-r1
index e4a0f843085e..c9089e6a6822 100644
--- a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6-r1
+++ b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.6.6
 SRC_URI=https://hackage.haskell.org/package/stringsearch-0.3.6.6/stringsearch-0.3.6.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8951924e87dff00ffbfdf346611aa443
diff --git a/metadata/md5-cache/dev-haskell/syb-0.7.1 b/metadata/md5-cache/dev-haskell/syb-0.7.1
index 1846dbfcdd11..28073f489b7b 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.7.1
+++ b/metadata/md5-cache/dev-haskell/syb-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.7.1
 SRC_URI=https://hackage.haskell.org/package/syb-0.7.1/syb-0.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4c33546dd082bf18013d4078d0612fc3
diff --git a/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.13 b/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.13
index 3ebbd51389c7..0bff68ca458a 100644
--- a/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.13
+++ b/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.6.1.13
 SRC_URI=https://hackage.haskell.org/package/syb-with-class-0.6.1.13/syb-with-class-0.6.1.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=158359255d7bd157f2ea91beaee3d63e
diff --git a/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4 b/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
index a4028c961ccd..b6346cd05dab 100644
--- a/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
+++ b/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-file
 RESTRICT=!test? ( test )
 SLOT=0/0.3.16.4
 SRC_URI=https://hackage.haskell.org/package/system-fileio-0.3.16.4/system-fileio-0.3.16.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d050e53010f00aa9d3c12cc9138d1a1a
diff --git a/metadata/md5-cache/dev-haskell/system-filepath-0.4.14 b/metadata/md5-cache/dev-haskell/system-filepath-0.4.14
index bee919d34dc4..e8aef96a9e87 100644
--- a/metadata/md5-cache/dev-haskell/system-filepath-0.4.14
+++ b/metadata/md5-cache/dev-haskell/system-filepath-0.4.14
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=
 RESTRICT=test
 SLOT=0/0.4.14
 SRC_URI=https://hackage.haskell.org/package/system-filepath-0.4.14/system-filepath-0.4.14.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac540735d382dd74bd8313324c8ce3e1
diff --git a/metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1 b/metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1
index 0c9606b78fd8..72d4ae9ba671 100644
--- a/metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.1
 SRC_URI=https://hackage.haskell.org/package/system-posix-redirect-1.1.0.1/system-posix-redirect-1.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=af77d647a824e7f6a1e4025924fb8e38
diff --git a/metadata/md5-cache/dev-haskell/tagged-0.8.6 b/metadata/md5-cache/dev-haskell/tagged-0.8.6
index 1f020999e6ea..f3667d3114b0 100644
--- a/metadata/md5-cache/dev-haskell/tagged-0.8.6
+++ b/metadata/md5-cache/dev-haskell/tagged-0.8.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.8.6
 SRC_URI=https://hackage.haskell.org/package/tagged-0.8.6/tagged-0.8.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b0349b58cf856a6e4e5d75a46f9e956
diff --git a/metadata/md5-cache/dev-haskell/tagshare-0.0 b/metadata/md5-cache/dev-haskell/tagshare-0.0
index 1c108242cedd..e2f90240242a 100644
--- a/metadata/md5-cache/dev-haskell/tagshare-0.0
+++ b/metadata/md5-cache/dev-haskell/tagshare-0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0
 SRC_URI=https://hackage.haskell.org/package/tagshare-0.0/tagshare-0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=685c44f0d5dafa5a4dfbd577d0be14de
diff --git a/metadata/md5-cache/dev-haskell/tagsoup-0.14.8 b/metadata/md5-cache/dev-haskell/tagsoup-0.14.8
index 8843fdc293ec..7cb8734a4fb9 100644
--- a/metadata/md5-cache/dev-haskell/tagsoup-0.14.8
+++ b/metadata/md5-cache/dev-haskell/tagsoup-0.14.8
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.14.8
 SRC_URI=https://hackage.haskell.org/package/tagsoup-0.14.8/tagsoup-0.14.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3723203921bf2eceeee455ce5da375c4
diff --git a/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.6 b/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.6
index 7a5a166b39b3..38b9bc29f5d2 100644
--- a/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.6
+++ b/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[pr
 RESTRICT=!test? ( test )
 SLOT=0/0.5.6
 SRC_URI=https://hackage.haskell.org/package/tagstream-conduit-0.5.6/tagstream-conduit-0.5.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c1b96a9e061faf67685a61bd0f420f05
diff --git a/metadata/md5-cache/dev-haskell/tar-0.5.1.1 b/metadata/md5-cache/dev-haskell/tar-0.5.1.1
index 5f5bad9a5320..0543360fd8ab 100644
--- a/metadata/md5-cache/dev-haskell/tar-0.5.1.1
+++ b/metadata/md5-cache/dev-haskell/tar-0.5.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/byt
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1.1
 SRC_URI=https://hackage.haskell.org/package/tar-0.5.1.1/tar-0.5.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b4c5a6c94ff2e569e4fd6deb58fcc621
diff --git a/metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1 b/metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1
index c0a35ffc0e14..2d63ca37cb40 100644
--- a/metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1
+++ b/metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/conduit-combinators-1.0.8.1 >=dev-haskell/conduit-1.3 dev-
 RESTRICT=!test? ( test )
 SLOT=0/0.3.2
 SRC_URI=https://hackage.haskell.org/package/tar-conduit-0.3.2/tar-conduit-0.3.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=239628b163a25fdd705cf548ba05adaa
diff --git a/metadata/md5-cache/dev-haskell/tasty-1.2.3 b/metadata/md5-cache/dev-haskell/tasty-1.2.3
index 7c48c8a43bb0..989ccfa82f54 100644
--- a/metadata/md5-cache/dev-haskell/tasty-1.2.3
+++ b/metadata/md5-cache/dev-haskell/tasty-1.2.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/ansi-terminal-0.9:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] >=dev-haskell/optparse-applicative-0.14:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] dev-haskell/wcwidth:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/clock-0.4.4.0:=[profile?]
 SLOT=0/1.2.3
 SRC_URI=https://hackage.haskell.org/package/tasty-1.2.3/tasty-1.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7710b7d029a012ca256efeee03884819
diff --git a/metadata/md5-cache/dev-haskell/tasty-ant-xml-1.1.6 b/metadata/md5-cache/dev-haskell/tasty-ant-xml-1.1.6
index 07ac06ccba21..8c4050615173 100644
--- a/metadata/md5-cache/dev-haskell/tasty-ant-xml-1.1.6
+++ b/metadata/md5-cache/dev-haskell/tasty-ant-xml-1.1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/generic-deriving-1.6.2:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-1.3:=[profile?] >=dev-haskell/xml-1.3.13:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/1.1.6
 SRC_URI=https://hackage.haskell.org/package/tasty-ant-xml-1.1.6/tasty-ant-xml-1.1.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b46430d917ba8dac9ce2f885356151cd
diff --git a/metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2 b/metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2
index 3a418cce2b85..fc8ebd325b73 100644
--- a/metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2
+++ b/metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.11.1.2
 SRC_URI=https://hackage.haskell.org/package/tasty-expected-failure-0.11.1.2/tasty-expected-failure-0.11.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2103d23c11e7301172e0b132464a317b
diff --git a/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1 b/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1
index d25deff4dc6c..712f7c84b461 100644
--- a/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1
+++ b/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/op
 RESTRICT=!test? ( test )
 SLOT=0/2.3.1.1
 SRC_URI=https://hackage.haskell.org/package/tasty-golden-2.3.1.1/tasty-golden-2.3.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a727a0a11e446a05296e20fc0faa4540
diff --git a/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1 b/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1
index 87df990ad7d7..a73abf62f867 100644
--- a/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1
+++ b/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.1:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0.2
 SRC_URI=https://hackage.haskell.org/package/tasty-hedgehog-1.0.0.2/tasty-hedgehog-1.0.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4ff4e2ba27397d8537ac44dcc413e5ed
diff --git a/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2 b/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
index 8b04b99a647a..7fe2bfe61fca 100644
--- a/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
+++ b/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-haskell/tasty-1.2.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.10.0.2
 SRC_URI=https://hackage.haskell.org/package/tasty-hunit-0.10.0.2/tasty-hunit-0.10.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc124c2365da8746abe76488504a9fab
diff --git a/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3 b/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3
index 03846dc976e7..db9a12603705 100644
--- a/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3
+++ b/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.3
 SRC_URI=https://hackage.haskell.org/package/tasty-kat-0.0.3/tasty-kat-0.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f36d7fb2cc0b867f0903245f74561a7
diff --git a/metadata/md5-cache/dev-haskell/tasty-lua-0.2.3.1 b/metadata/md5-cache/dev-haskell/tasty-lua-0.2.3.1
index 38c9c26127c5..ff027b823da8 100644
--- a/metadata/md5-cache/dev-haskell/tasty-lua-0.2.3.1
+++ b/metadata/md5-cache/dev-haskell/tasty-lua-0.2.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[p
 RESTRICT=!test? ( test )
 SLOT=0/0.2.3.1
 SRC_URI=https://hackage.haskell.org/package/tasty-lua-0.2.3.1/tasty-lua-0.2.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3c4f0fd39d2524ec21a5bfed104a9eb8
diff --git a/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1 b/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
index 8e7aa8bf8309..4214c0d62f85 100644
--- a/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
+++ b/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/quickcheck-2.
 RESTRICT=!test? ( test )
 SLOT=0/0.10.1.1
 SRC_URI=https://hackage.haskell.org/package/tasty-quickcheck-0.10.1.1/tasty-quickcheck-0.10.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c743d101942a58ee2b3a151096fe895
diff --git a/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17 b/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17
index f08b871eb9b1..50b7f6114d62 100644
--- a/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17
+++ b/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.17
 SRC_URI=https://hackage.haskell.org/package/tasty-rerun-1.1.17/tasty-rerun-1.1.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=207eb95819dad130131da880d521cfc9
diff --git a/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1 b/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1
index 4872a147db93..23a5bd6e740c 100644
--- a/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1
+++ b/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.8.1
 SRC_URI=https://hackage.haskell.org/package/tasty-smallcheck-0.8.1/tasty-smallcheck-0.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2902878a539585f8fad2f6216611fd86
diff --git a/metadata/md5-cache/dev-haskell/tasty-th-0.1.7 b/metadata/md5-cache/dev-haskell/tasty-th-0.1.7
index ba9ab5ad767a..a03d0099f14d 100644
--- a/metadata/md5-cache/dev-haskell/tasty-th-0.1.7
+++ b/metadata/md5-cache/dev-haskell/tasty-th-0.1.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/haskell-src-exts-1.18.0:=[profile?] dev-haskell/tasty:=[pr
 RESTRICT=!test? ( test )
 SLOT=0/0.1.7
 SRC_URI=https://hackage.haskell.org/package/tasty-th-0.1.7/tasty-th-0.1.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b3721784ed15f18c17318d9ce6506b0e
diff --git a/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4 b/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4
index 44a047041c8b..23a4750a9048 100644
--- a/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4
+++ b/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.6.2:=
 SLOT=0/0.1.4
 SRC_URI=https://hackage.haskell.org/package/template-haskell-compat-v0208-0.1.4/template-haskell-compat-v0208-0.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=125795c6db0b41154dfdc6470ec34b87
diff --git a/metadata/md5-cache/dev-haskell/temporary-1.3 b/metadata/md5-cache/dev-haskell/temporary-1.3
index acb6eba4e005..01ad9930bcab 100644
--- a/metadata/md5-cache/dev-haskell/temporary-1.3
+++ b/metadata/md5-cache/dev-haskell/temporary-1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/random-1.1:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/1.3
 SRC_URI=https://hackage.haskell.org/package/temporary-1.3/temporary-1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7cee727f7c71fa1291c35f0b987b1d4c
diff --git a/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3 b/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3
index ebaf8575b746..28aab38e1a7c 100644
--- a/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3
+++ b/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.2.0.3
 SRC_URI=https://hackage.haskell.org/package/temporary-rc-1.2.0.3/temporary-rc-1.2.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7acb88058553b7522338a38e4b3fc6e0
diff --git a/metadata/md5-cache/dev-haskell/tensor-1.1.0.1 b/metadata/md5-cache/dev-haskell/tensor-1.1.0.1
index d1eab9584143..66e9eef2b315 100644
--- a/metadata/md5-cache/dev-haskell/tensor-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/tensor-1.1.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.1
 SRC_URI=https://hackage.haskell.org/package/Tensor-1.1.0.1/Tensor-1.1.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dbe0a77e54d92c35b08e1ff11aa114ec
diff --git a/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1 b/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1
index 22060e51147d..35178abf4048 100644
--- a/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1
+++ b/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.2.1
 SRC_URI=https://hackage.haskell.org/package/terminal-size-0.3.2.1/terminal-size-0.3.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3515b86c0dae3817d7a20422bce5a5b
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4 b/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
index 6bd70233d53d..fb5f3f9e64c4 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 SLOT=0/0.4.1.4
 SRC_URI=https://hackage.haskell.org/package/terminfo-0.4.1.4/terminfo-0.4.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4a67408a19b2bd20ebb4a1c1bfe64133
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2 b/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2
index 070519541be4..85bcc71e2559 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/ansi-wl-ppri
 RESTRICT=test
 SLOT=0/0.8.2.0
 SRC_URI=https://hackage.haskell.org/package/test-framework-0.8.2.0/test-framework-0.8.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3c76e99d3d9f51f9708e68a2baa5418
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1
index 70e4abda466d..28b82a6540a1 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] >=dev-haskell/test-framework-0.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.2
 SRC_URI=https://hackage.haskell.org/package/test-framework-hunit-0.3.0.2/test-framework-hunit-0.3.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=63f409bda0020b3d87adb9d1c1325278
diff --git a/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1 b/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1
index a527195551eb..7a1121eca5d8 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1
+++ b/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/leancheck:=[profile?] dev-haskell/test-framework:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/test-framework-leancheck-0.0.1/test-framework-leancheck-0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e846aa6606668f5f20bfdc91e830b2a9
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1
index 6cf1a0ceaa86..96de17e357e3 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.5
 SRC_URI=https://hackage.haskell.org/package/test-framework-quickcheck2-0.3.0.5/test-framework-quickcheck2-0.3.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f1879fb8365bb3cdb3d4a7e31478e71
diff --git a/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4 b/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
index 3a2b706c451e..f203b0570e88 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
+++ b/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/haskell-src-exts:=[profile?] >=dev-haskell/language-haskell-extract-0.2:=[profile?] dev-haskell/regex-posix:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/test-framework-th-0.2.4/test-framework-th-0.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa515fed92f139a4e05d28cc6c2c2081
diff --git a/metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0 b/metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0
index e2a02b527b6c..b4d92108d16a 100644
--- a/metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0
+++ b/metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] <dev-haskell/semigroups-0.19:=[profile?] <dev-haskell/size-based-0.2:=[profile?] <dev-haskell/testing-type-modifiers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.0
 SRC_URI=https://hackage.haskell.org/package/testing-feat-1.1.0.0/testing-feat-1.1.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=47ab6a98372dc2d76a1c62a948d3e865
diff --git a/metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1 b/metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1
index 72b5147698a6..38f9e341430e 100644
--- a/metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/testing-type-modifiers-0.1.0.1/testing-type-modifiers-0.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2340b364166dff676fcedc28e71f2487
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.12.2 b/metadata/md5-cache/dev-haskell/texmath-0.12.2
index 8ff506cb015a..0c1aa3df09d8 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.12.2
+++ b/metadata/md5-cache/dev-haskell/texmath-0.12.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.12.2
 SRC_URI=https://hackage.haskell.org/package/texmath-0.12.2/texmath-0.12.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb35d84bfd437606dd92999acc840301
diff --git a/metadata/md5-cache/dev-haskell/text-1.2.4.0-r1 b/metadata/md5-cache/dev-haskell/text-1.2.4.0-r1
index 57e4e3099402..5442a1d1fd58 100644
--- a/metadata/md5-cache/dev-haskell/text-1.2.4.0-r1
+++ b/metadata/md5-cache/dev-haskell/text-1.2.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.8.1:= <dev-lang/ghc-8.10:=
 RESTRICT=test
 SLOT=0/1.2.4.0
 SRC_URI=https://hackage.haskell.org/package/text-1.2.4.0/text-1.2.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d35ee87363462f34fae62fde45522357
diff --git a/metadata/md5-cache/dev-haskell/text-1.2.4.1_rc1 b/metadata/md5-cache/dev-haskell/text-1.2.4.1_rc1
index 8df16998c03f..b7d263ffa527 100644
--- a/metadata/md5-cache/dev-haskell/text-1.2.4.1_rc1
+++ b/metadata/md5-cache/dev-haskell/text-1.2.4.1_rc1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.10.3:=
 RESTRICT=test
 SLOT=0/1.2.4.1_rc1
 SRC_URI=https://github.com/haskell/text/archive/v1.2.4.1-rc1.tar.gz -> text-1.2.4.1_rc1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=010ee59db4d7deec2f014f4da0fe3cdf
diff --git a/metadata/md5-cache/dev-haskell/text-binary-0.2.1.1 b/metadata/md5-cache/dev-haskell/text-binary-0.2.1.1
index ef6f602324f6..dd56de48573b 100644
--- a/metadata/md5-cache/dev-haskell/text-binary-0.2.1.1
+++ b/metadata/md5-cache/dev-haskell/text-binary-0.2.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.1.1
 SRC_URI=https://hackage.haskell.org/package/text-binary-0.2.1.1/text-binary-0.2.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c0ad97f354a470c1a587e1eb7cc16345
diff --git a/metadata/md5-cache/dev-haskell/text-conversions-0.3.0 b/metadata/md5-cache/dev-haskell/text-conversions-0.3.0
index 0ab9384dd563..09b378756229 100644
--- a/metadata/md5-cache/dev-haskell/text-conversions-0.3.0
+++ b/metadata/md5-cache/dev-haskell/text-conversions-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/text-conversions-0.3.0/text-conversions-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e9184e12904ac82372984d439f9ac54
diff --git a/metadata/md5-cache/dev-haskell/text-icu-0.7.0.1 b/metadata/md5-cache/dev-haskell/text-icu-0.7.0.1
index e166fae1a189..df1a704d9ff9 100644
--- a/metadata/md5-cache/dev-haskell/text-icu-0.7.0.1
+++ b/metadata/md5-cache/dev-haskell/text-icu-0.7.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.9.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/i
 RESTRICT=test
 SLOT=0/0.7.0.1
 SRC_URI=https://hackage.haskell.org/package/text-icu-0.7.0.1/text-icu-0.7.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ad4ddf397ed3a12ce006b62554c6685
diff --git a/metadata/md5-cache/dev-haskell/text-metrics-0.3.0 b/metadata/md5-cache/dev-haskell/text-metrics-0.3.0
index ea64bf2fceb9..bdae57e1ae96 100644
--- a/metadata/md5-cache/dev-haskell/text-metrics-0.3.0
+++ b/metadata/md5-cache/dev-haskell/text-metrics-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=d
 RESTRICT=test
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/text-metrics-0.3.0/text-metrics-0.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d70def7d451c7a22812571f928fe71b4
diff --git a/metadata/md5-cache/dev-haskell/text-short-0.1.3 b/metadata/md5-cache/dev-haskell/text-short-0.1.3
index 41770d5ed8f6..3d4253f44116 100644
--- a/metadata/md5-cache/dev-haskell/text-short-0.1.3
+++ b/metadata/md5-cache/dev-haskell/text-short-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.4:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/text-short-0.1.3/text-short-0.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=872f8aa09e5b72a0c22f7c806b7fff1c
diff --git a/metadata/md5-cache/dev-haskell/text-show-3.8.5 b/metadata/md5-cache/dev-haskell/text-show-3.8.5
index 361640753c51..aeda491d70bd 100644
--- a/metadata/md5-cache/dev-haskell/text-show-3.8.5
+++ b/metadata/md5-cache/dev-haskell/text-show-3.8.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-c
 RESTRICT=!test? ( test )
 SLOT=0/3.8.5
 SRC_URI=https://hackage.haskell.org/package/text-show-3.8.5/text-show-3.8.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=57074aeb6b48a5a188b7f40dbffaca77
diff --git a/metadata/md5-cache/dev-haskell/text-stream-decode-0.1.0.5 b/metadata/md5-cache/dev-haskell/text-stream-decode-0.1.0.5
index 762101ac351a..f0debef2936f 100644
--- a/metadata/md5-cache/dev-haskell/text-stream-decode-0.1.0.5
+++ b/metadata/md5-cache/dev-haskell/text-stream-decode-0.1.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.5
 SRC_URI=https://hackage.haskell.org/package/text-stream-decode-0.1.0.5/text-stream-decode-0.1.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=990a76f8f9da2404ef94a5d3ab03574f
diff --git a/metadata/md5-cache/dev-haskell/tf-random-0.5 b/metadata/md5-cache/dev-haskell/tf-random-0.5
index 0700dacff851..1887f95d47d1 100644
--- a/metadata/md5-cache/dev-haskell/tf-random-0.5
+++ b/metadata/md5-cache/dev-haskell/tf-random-0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/primitive-0.3:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5
 SRC_URI=https://hackage.haskell.org/package/tf-random-0.5/tf-random-0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5e141b65b98fa5c9f60cbab87fa9e6f
diff --git a/metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.0 b/metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.0
index 72b66c08e5fe..6236e496661a 100644
--- a/metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.0
+++ b/metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.2.0
 SRC_URI=https://hackage.haskell.org/package/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d02ff9f3e1492a889ee0f049ebd503a
diff --git a/metadata/md5-cache/dev-haskell/th-expand-syns-0.4.6.0 b/metadata/md5-cache/dev-haskell/th-expand-syns-0.4.6.0
index d4550d7665c6..ff53ac6696ef 100644
--- a/metadata/md5-cache/dev-haskell/th-expand-syns-0.4.6.0
+++ b/metadata/md5-cache/dev-haskell/th-expand-syns-0.4.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.6.0
 SRC_URI=https://hackage.haskell.org/package/th-expand-syns-0.4.6.0/th-expand-syns-0.4.6.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0785bcf5eceb5c98e40412e6900b8c80
diff --git a/metadata/md5-cache/dev-haskell/th-lift-0.8.1 b/metadata/md5-cache/dev-haskell/th-lift-0.8.1
index 9c486e957190..6093ad627262 100644
--- a/metadata/md5-cache/dev-haskell/th-lift-0.8.1
+++ b/metadata/md5-cache/dev-haskell/th-lift-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstracti
 RESTRICT=!test? ( test )
 SLOT=0/0.8.1
 SRC_URI=https://hackage.haskell.org/package/th-lift-0.8.1/th-lift-0.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2078aef7484031fa506cc5ca394ae1f4
diff --git a/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14 b/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
index 24213657e17d..2a91b673ba7c 100644
--- a/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
+++ b/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/text:=[profile?] >=dev-haskell/th-lift-0.8:=[profile?] >=dev
 RESTRICT=!test? ( test )
 SLOT=0/0.1.14
 SRC_URI=https://hackage.haskell.org/package/th-lift-instances-0.1.14/th-lift-instances-0.1.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8485a4e5494a745f3545d7f4196fc957
diff --git a/metadata/md5-cache/dev-haskell/th-orphans-0.13.10 b/metadata/md5-cache/dev-haskell/th-orphans-0.13.10
index 87880129cb65..17eb84a0bd7b 100644
--- a/metadata/md5-cache/dev-haskell/th-orphans-0.13.10
+++ b/metadata/md5-cache/dev-haskell/th-orphans-0.13.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=!test? ( test )
 SLOT=0/0.13.10
 SRC_URI=https://hackage.haskell.org/package/th-orphans-0.13.10/th-orphans-0.13.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6209eb0d92ff1b17ea3803ff611bf147
diff --git a/metadata/md5-cache/dev-haskell/th-reify-many-0.1.9 b/metadata/md5-cache/dev-haskell/th-reify-many-0.1.9
index 23dd20c3f96e..4a0f50127c48 100644
--- a/metadata/md5-cache/dev-haskell/th-reify-many-0.1.9
+++ b/metadata/md5-cache/dev-haskell/th-reify-many-0.1.9
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/th-
 RESTRICT=!test? ( test )
 SLOT=0/0.1.9
 SRC_URI=https://hackage.haskell.org/package/th-reify-many-0.1.9/th-reify-many-0.1.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee2809c1349eebede4178e01ebee6adc
diff --git a/metadata/md5-cache/dev-haskell/th-utilities-0.2.4.1 b/metadata/md5-cache/dev-haskell/th-utilities-0.2.4.1
index 67257538df54..4f5247c24e5c 100644
--- a/metadata/md5-cache/dev-haskell/th-utilities-0.2.4.1
+++ b/metadata/md5-cache/dev-haskell/th-utilities-0.2.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskel
 RESTRICT=!test? ( test )
 SLOT=0/0.2.4.1
 SRC_URI=https://hackage.haskell.org/package/th-utilities-0.2.4.1/th-utilities-0.2.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc3df5ec6952d1d30c0215e43184644a
diff --git a/metadata/md5-cache/dev-haskell/threads-0.5.1.6 b/metadata/md5-cache/dev-haskell/threads-0.5.1.6
index 507027dcddf3..b2349fb4aeb8 100644
--- a/metadata/md5-cache/dev-haskell/threads-0.5.1.6
+++ b/metadata/md5-cache/dev-haskell/threads-0.5.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/stm-2.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1.6
 SRC_URI=https://hackage.haskell.org/package/threads-0.5.1.6/threads-0.5.1.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0b77a18204df740b44397573fceccb4
diff --git a/metadata/md5-cache/dev-haskell/thyme-0.3.5.5 b/metadata/md5-cache/dev-haskell/thyme-0.3.5.5
index 1d8b47903c53..9c2e548e902a 100644
--- a/metadata/md5-cache/dev-haskell/thyme-0.3.5.5
+++ b/metadata/md5-cache/dev-haskell/thyme-0.3.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.10:=[prof
 RESTRICT=test
 SLOT=0/0.3.5.5
 SRC_URI=https://hackage.haskell.org/package/thyme-0.3.5.5/thyme-0.3.5.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9419dc27ac9b62a5a1e608c07ba2363a
diff --git a/metadata/md5-cache/dev-haskell/time-compat-1.9.3 b/metadata/md5-cache/dev-haskell/time-compat-1.9.3
index fe757dffda0a..2e3a8073302f 100644
--- a/metadata/md5-cache/dev-haskell/time-compat-1.9.3
+++ b/metadata/md5-cache/dev-haskell/time-compat-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.8.1:=[profile?] <dev-haskell/base-orphans-0
 RESTRICT=test
 SLOT=0/1.9.3
 SRC_URI=https://hackage.haskell.org/package/time-compat-1.9.3/time-compat-1.9.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=775bd61a961a037ceaf703c5acd1237c
diff --git a/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5 b/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5
index 60b0ef307572..e20966a35bf0 100644
--- a/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5
+++ b/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.5
 SRC_URI=https://hackage.haskell.org/package/time-locale-compat-0.1.1.5/time-locale-compat-0.1.1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a68eceffa62019a3b938ae8a31139a0b
diff --git a/metadata/md5-cache/dev-haskell/time-manager-0.0.0 b/metadata/md5-cache/dev-haskell/time-manager-0.0.0
index 57609c7c0e93..42f7df5e539c 100644
--- a/metadata/md5-cache/dev-haskell/time-manager-0.0.0
+++ b/metadata/md5-cache/dev-haskell/time-manager-0.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/auto-update:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.0.0
 SRC_URI=https://hackage.haskell.org/package/time-manager-0.0.0/time-manager-0.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f882e9687b698bc613715e3f4db10816
diff --git a/metadata/md5-cache/dev-haskell/timeit-2.0 b/metadata/md5-cache/dev-haskell/timeit-2.0
index fdfab68ceb3d..3e64d9cd7d2f 100644
--- a/metadata/md5-cache/dev-haskell/timeit-2.0
+++ b/metadata/md5-cache/dev-haskell/timeit-2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/2.0
 SRC_URI=https://hackage.haskell.org/package/timeit-2.0/timeit-2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bffe46f419f137fa79b4f2607db0f68f
diff --git a/metadata/md5-cache/dev-haskell/timezone-olson-0.2.0 b/metadata/md5-cache/dev-haskell/timezone-olson-0.2.0
index d24898fe4b2b..0fc977c62827 100644
--- a/metadata/md5-cache/dev-haskell/timezone-olson-0.2.0
+++ b/metadata/md5-cache/dev-haskell/timezone-olson-0.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/timezone-olson-0.2.0/timezone-olson-0.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c87c777be4afdd9f4f0e79e1120901d2
diff --git a/metadata/md5-cache/dev-haskell/timezone-series-0.1.9 b/metadata/md5-cache/dev-haskell/timezone-series-0.1.9
index 2e11a21cc5a7..bf7567a66b78 100644
--- a/metadata/md5-cache/dev-haskell/timezone-series-0.1.9
+++ b/metadata/md5-cache/dev-haskell/timezone-series-0.1.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.9
 SRC_URI=https://hackage.haskell.org/package/timezone-series-0.1.9/timezone-series-0.1.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=860972c6e788f96a78b0a5162df7bd37
diff --git a/metadata/md5-cache/dev-haskell/tls-1.5.4 b/metadata/md5-cache/dev-haskell/tls-1.5.4
index c4c99a6f8460..695793c75283 100644
--- a/metadata/md5-cache/dev-haskell/tls-1.5.4
+++ b/metadata/md5-cache/dev-haskell/tls-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[p
 RESTRICT=!test? ( test )
 SLOT=0/1.5.4
 SRC_URI=https://hackage.haskell.org/package/tls-1.5.4/tls-1.5.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a5b6902835b42fce658274f1c271a9ea
diff --git a/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4 b/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
index cc9a61e0359e..4680336b6e90 100644
--- a/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
+++ b/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/auto-update:=[profile?] dev-haskell/basement:=[profile?] dev-haskell/clock:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/psqueues-0.2.3:=[profile?] dev-haskell/tls:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.0.4
 SRC_URI=https://hackage.haskell.org/package/tls-session-manager-0.0.4/tls-session-manager-0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2622ce5de60e89b9b4da7376ee68dff5
diff --git a/metadata/md5-cache/dev-haskell/top-1.7 b/metadata/md5-cache/dev-haskell/top-1.7
index 11ee1bdefd94..ed2094ee4bb9 100644
--- a/metadata/md5-cache/dev-haskell/top-1.7
+++ b/metadata/md5-cache/dev-haskell/top-1.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.7
 SRC_URI=https://hackage.haskell.org/package/Top-1.7/Top-1.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98806eb64e10ed2491d0c79072ff9e5b
diff --git a/metadata/md5-cache/dev-haskell/torrent-10000.1.1 b/metadata/md5-cache/dev-haskell/torrent-10000.1.1
index 3c67947d850b..4fe2604748cc 100644
--- a/metadata/md5-cache/dev-haskell/torrent-10000.1.1
+++ b/metadata/md5-cache/dev-haskell/torrent-10000.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/bencode-0.2:=[profile?] dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/10000.1.1
 SRC_URI=https://hackage.haskell.org/package/torrent-10000.1.1/torrent-10000.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a961d2f9e63d1f8038487e642ef22bb
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.5.6.2 b/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
index 1f24d9b2ac90..ba6bdeaf9cd6 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
+++ b/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.6.2
 SRC_URI=https://hackage.haskell.org/package/transformers-0.5.6.2/transformers-0.5.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9cb0aa445eed9c60e75062a22737c8d3
diff --git a/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2 b/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
index 6f562127a19f..536ff356a63f 100644
--- a/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
+++ b/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-compat-0.6.1:=[profile?] >=dev-lang/ghc-7.8.2:= orphaninstances? ( >=dev-haskell/base-orphans-0.3:=[profile?] )
 SLOT=0/0.4.5.2
 SRC_URI=https://hackage.haskell.org/package/transformers-base-0.4.5.2/transformers-base-0.4.5.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2e909f253b0c74a43b052f2156ad32af
diff --git a/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6 b/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6
index 6fcb93c5c220..ea0d8c19074f 100644
--- a/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6
+++ b/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.6.6
 SRC_URI=https://hackage.haskell.org/package/transformers-compat-0.6.6/transformers-compat-0.6.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=efa312c0f59432cce547e5f4ab9978cd
diff --git a/metadata/md5-cache/dev-haskell/tree-diff-0.1 b/metadata/md5-cache/dev-haskell/tree-diff-0.1
index 4cd81bb2ceec..7fcb929f1bbd 100644
--- a/metadata/md5-cache/dev-haskell/tree-diff-0.1
+++ b/metadata/md5-cache/dev-haskell/tree-diff-0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/tree-diff-0.1/tree-diff-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=029b4f158d7d17617b48c722845671fd
diff --git a/metadata/md5-cache/dev-haskell/trifecta-2.1 b/metadata/md5-cache/dev-haskell/trifecta-2.1
index aa96170a8b78..4e47788837f7 100644
--- a/metadata/md5-cache/dev-haskell/trifecta-2.1
+++ b/metadata/md5-cache/dev-haskell/trifecta-2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0
 RESTRICT=test
 SLOT=0/2.1
 SRC_URI=https://hackage.haskell.org/package/trifecta-2.1/trifecta-2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=10714e3cdffa7e5dfd1a1b9c9bc614ef
diff --git a/metadata/md5-cache/dev-haskell/type-equality-1 b/metadata/md5-cache/dev-haskell/type-equality-1
index 939db5fccf10..61075a54e2bf 100644
--- a/metadata/md5-cache/dev-haskell/type-equality-1
+++ b/metadata/md5-cache/dev-haskell/type-equality-1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1
 SRC_URI=https://hackage.haskell.org/package/type-equality-1/type-equality-1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c95c23c37fd821430b14e4c732c8de7b
diff --git a/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0 b/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
index f8a9317f913c..52973de95d06 100644
--- a/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
+++ b/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/un
 RESTRICT=!test? ( test )
 SLOT=0/0.2.6.0
 SRC_URI=https://hackage.haskell.org/package/typed-process-0.2.6.0/typed-process-0.2.6.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ca2a15401f1f498697de5d390a0a8de1
diff --git a/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0 b/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0
index 2903bdb1af36..965d0f0dccdb 100644
--- a/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0
+++ b/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.0
 SRC_URI=https://hackage.haskell.org/package/unbounded-delays-0.1.1.0/unbounded-delays-0.1.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3bea5dffdab10305041f9ffc8c1150eb
diff --git a/metadata/md5-cache/dev-haskell/unexceptionalio-0.5.1 b/metadata/md5-cache/dev-haskell/unexceptionalio-0.5.1
index f58edc4002a0..475c2f776e47 100644
--- a/metadata/md5-cache/dev-haskell/unexceptionalio-0.5.1
+++ b/metadata/md5-cache/dev-haskell/unexceptionalio-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1
 SRC_URI=https://hackage.haskell.org/package/unexceptionalio-0.5.1/unexceptionalio-0.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e88fd8efcaf08f9bfdec3de0f0380145
diff --git a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1 b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1
index bfcd9c3b572a..1caefedf9af7 100644
--- a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1
+++ b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/0.3.7.1
 SRC_URI=https://hackage.haskell.org/package/unicode-transforms-0.3.7.1/unicode-transforms-0.3.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3863ae04dbcdbef5180ead63cd7d647a
diff --git a/metadata/md5-cache/dev-haskell/uniplate-1.6.12 b/metadata/md5-cache/dev-haskell/uniplate-1.6.12
index 5fb4345d9fa4..f6614ea37fcc 100644
--- a/metadata/md5-cache/dev-haskell/uniplate-1.6.12
+++ b/metadata/md5-cache/dev-haskell/uniplate-1.6.12
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.6.12
 SRC_URI=https://hackage.haskell.org/package/uniplate-1.6.12/uniplate-1.6.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b67870a7da09557be387d7bb2fb29ce
diff --git a/metadata/md5-cache/dev-haskell/uniqueid-0.1.1 b/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
index 8c5d0143d52a..451b1ad1dba3 100644
--- a/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
+++ b/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/uniqueid-0.1.1/uniqueid-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b76019a5fd7bca88ea736ae2bd3ccef9
diff --git a/metadata/md5-cache/dev-haskell/unix-compat-0.5.2 b/metadata/md5-cache/dev-haskell/unix-compat-0.5.2
index b309cf2f7f3b..d2723a34add8 100644
--- a/metadata/md5-cache/dev-haskell/unix-compat-0.5.2
+++ b/metadata/md5-cache/dev-haskell/unix-compat-0.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.2
 SRC_URI=https://hackage.haskell.org/package/unix-compat-0.5.2/unix-compat-0.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=71db102530246e9b65269ed2022de7a5
diff --git a/metadata/md5-cache/dev-haskell/unix-time-0.4.7 b/metadata/md5-cache/dev-haskell/unix-time-0.4.7
index 0d0f2ed1e673..e1c0ea4f5a61 100644
--- a/metadata/md5-cache/dev-haskell/unix-time-0.4.7
+++ b/metadata/md5-cache/dev-haskell/unix-time-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.4.7
 SRC_URI=https://hackage.haskell.org/package/unix-time-0.4.7/unix-time-0.4.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3ee956d5c4afd12c3cc713080bb26c36
diff --git a/metadata/md5-cache/dev-haskell/unixutils-1.54.2-r1 b/metadata/md5-cache/dev-haskell/unixutils-1.54.2-r1
index 4e092777442d..bda4973069f9 100644
--- a/metadata/md5-cache/dev-haskell/unixutils-1.54.2-r1
+++ b/metadata/md5-cache/dev-haskell/unixutils-1.54.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/process-extras-0.3:=[profile?] dev-haskell/puremd5:=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-8.4.3:= virtual/libcrypt:=
 SLOT=0/1.54.2
 SRC_URI=https://hackage.haskell.org/package/Unixutils-1.54.2/Unixutils-1.54.2.tar.gz
-_eclasses_=ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a546bf3cf0a603d3129bb30b57029b76
diff --git a/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1 b/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
index 03d89c771b9f..1966bbfff3ea 100644
--- a/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
+++ b/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
@@ -10,5 +10,5 @@ RDEPEND=>dev-haskell/async-2.1.1:=[profile?] >=dev-haskell/stm-2.4.3:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.2.12.1
 SRC_URI=https://hackage.haskell.org/package/unliftio-0.2.12.1/unliftio-0.2.12.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5cd60b507183f36a6587d24bbdb3c462
diff --git a/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0 b/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
index 35d24466d713..72f2f6017f42 100644
--- a/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/unliftio-core-0.1.2.0/unliftio-core-0.1.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b710c49566ac8498796be3847312a31
diff --git a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0 b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0
index bf6ff1fd7c83..3ef819c36f6e 100644
--- a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0
+++ b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[p
 RESTRICT=test
 SLOT=0/0.2.12.0
 SRC_URI=https://hackage.haskell.org/package/unordered-containers-0.2.12.0/unordered-containers-0.2.12.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5fdd0f41583f67d8f8f88acf550d548f
diff --git a/metadata/md5-cache/dev-haskell/uri-0.1.6.4 b/metadata/md5-cache/dev-haskell/uri-0.1.6.4
index cd3431c46435..c2ca6c069c2a 100644
--- a/metadata/md5-cache/dev-haskell/uri-0.1.6.4
+++ b/metadata/md5-cache/dev-haskell/uri-0.1.6.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.6.4
 SRC_URI=https://hackage.haskell.org/package/uri-0.1.6.4/uri-0.1.6.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f40c6b906c06ea6f69b1dacdad2d3b9c
diff --git a/metadata/md5-cache/dev-haskell/uri-bytestring-0.3.3.0 b/metadata/md5-cache/dev-haskell/uri-bytestring-0.3.3.0
index 3526fb424cb4..ac46d4512b2a 100644
--- a/metadata/md5-cache/dev-haskell/uri-bytestring-0.3.3.0
+++ b/metadata/md5-cache/dev-haskell/uri-bytestring-0.3.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.13.1.0:=[profile?] >=dev-haskell/blaze-builde
 RESTRICT=!test? ( test )
 SLOT=0/0.3.3.0
 SRC_URI=https://hackage.haskell.org/package/uri-bytestring-0.3.3.0/uri-bytestring-0.3.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a84278d733bed2519b0804635bc6b319
diff --git a/metadata/md5-cache/dev-haskell/uri-bytestring-aeson-0.1.0.7 b/metadata/md5-cache/dev-haskell/uri-bytestring-aeson-0.1.0.7
index 19de6c9afbb3..7a7cea4e0086 100644
--- a/metadata/md5-cache/dev-haskell/uri-bytestring-aeson-0.1.0.7
+++ b/metadata/md5-cache/dev-haskell/uri-bytestring-aeson-0.1.0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-haskell/uri-bytestring-0.2:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/0.1.0.7
 SRC_URI=https://hackage.haskell.org/package/uri-bytestring-aeson-0.1.0.7/uri-bytestring-aeson-0.1.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ed59ff191b64b60ced32bf49a12f9fe3
diff --git a/metadata/md5-cache/dev-haskell/uri-encode-1.5.0.5 b/metadata/md5-cache/dev-haskell/uri-encode-1.5.0.5
index 72690a1302e2..0330406a678e 100644
--- a/metadata/md5-cache/dev-haskell/uri-encode-1.5.0.5
+++ b/metadata/md5-cache/dev-haskell/uri-encode-1.5.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >dev-haskell/network-2.4.1.0:=[profile?] <dev-haskell/network-2.6:=[profile?] )
 SLOT=0/1.5.0.5
 SRC_URI=https://hackage.haskell.org/package/uri-encode-1.5.0.5/uri-encode-1.5.0.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06aaf1f294db7f92ded4e8d293ead9c9
diff --git a/metadata/md5-cache/dev-haskell/url-2.1.3-r1 b/metadata/md5-cache/dev-haskell/url-2.1.3-r1
index 9bb066041d85..930d2ebf56a9 100644
--- a/metadata/md5-cache/dev-haskell/url-2.1.3-r1
+++ b/metadata/md5-cache/dev-haskell/url-2.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.1.3
 SRC_URI=https://hackage.haskell.org/package/url-2.1.3/url-2.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b091ac82a30182e34577a759c42f7b8
diff --git a/metadata/md5-cache/dev-haskell/utf8-light-0.4.2 b/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
index 89e2a1347f06..59fddb9334a3 100644
--- a/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
+++ b/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.2
 SRC_URI=https://hackage.haskell.org/package/utf8-light-0.4.2/utf8-light-0.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=28159c50d123dedd82cf8995212aa031
diff --git a/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1 b/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
index 7a6d4861d6f8..1cde22948d85 100644
--- a/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
+++ b/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.1
 SRC_URI=https://hackage.haskell.org/package/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96b2db00ec42498a35f474f8e4f89d3f
diff --git a/metadata/md5-cache/dev-haskell/uuagc-0.9.53.1 b/metadata/md5-cache/dev-haskell/uuagc-0.9.53.1
index b44f6fcd75ff..daa3609a3ac9 100644
--- a/metadata/md5-cache/dev-haskell/uuagc-0.9.53.1
+++ b/metadata/md5-cache/dev-haskell/uuagc-0.9.53.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/haskell-src-exts-1.11.1:=[profile?] >=dev-haskell/mtl-1.1.1.1:=[profile?] >=dev-haskell/uuagc-cabal-1.0.2.0:=[profile?] >=dev-haskell/uulib-0.9.14:=[profile?] >=dev-lang/ghc-7.4.1:= loag? ( dev-haskell/minisat:=[profile?] )
 SLOT=0/0.9.53.1
 SRC_URI=https://hackage.haskell.org/package/uuagc-0.9.53.1/uuagc-0.9.53.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=acb97380b4164571762a556adae7971a
diff --git a/metadata/md5-cache/dev-haskell/uuagc-cabal-1.2.0.0 b/metadata/md5-cache/dev-haskell/uuagc-cabal-1.2.0.0
index 588b863fef4b..cfb3083f67ac 100644
--- a/metadata/md5-cache/dev-haskell/uuagc-cabal-1.2.0.0
+++ b/metadata/md5-cache/dev-haskell/uuagc-cabal-1.2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cabal-2:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/uulib-0.9.14:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.0.0
 SRC_URI=https://hackage.haskell.org/package/uuagc-cabal-1.2.0.0/uuagc-cabal-1.2.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=accdbdc5be75fb76ff403f447773bad2
diff --git a/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1 b/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
index 2303e233c5c8..065d1fc889b9 100644
--- a/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
+++ b/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohas
 RESTRICT=!test? ( test )
 SLOT=0/1.3.13
 SRC_URI=https://hackage.haskell.org/package/uuid-1.3.13/uuid-1.3.13.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=70a47e7c3cecb3091c79e5b262f04c16
diff --git a/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1 b/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
index d878080d7680..2176baa1d7af 100644
--- a/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
+++ b/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.0.3
 SRC_URI=https://hackage.haskell.org/package/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6f85542da3b5f5a78f04097de2868332
diff --git a/metadata/md5-cache/dev-haskell/uulib-0.9.24 b/metadata/md5-cache/dev-haskell/uulib-0.9.24
index abc596f07393..7f5e4980edff 100644
--- a/metadata/md5-cache/dev-haskell/uulib-0.9.24
+++ b/metadata/md5-cache/dev-haskell/uulib-0.9.24
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.9.24
 SRC_URI=https://hackage.haskell.org/package/uulib-0.9.24/uulib-0.9.24.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b72081fbb9b4e6548e14522b19723b08
diff --git a/metadata/md5-cache/dev-haskell/validity-0.9.0.3 b/metadata/md5-cache/dev-haskell/validity-0.9.0.3
index e573e511beb2..9c84b096a4a3 100644
--- a/metadata/md5-cache/dev-haskell/validity-0.9.0.3
+++ b/metadata/md5-cache/dev-haskell/validity-0.9.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.0.3
 SRC_URI=https://hackage.haskell.org/package/validity-0.9.0.3/validity-0.9.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58201b194b4eaf56be4603953323923c
diff --git a/metadata/md5-cache/dev-haskell/vault-0.3.1.4 b/metadata/md5-cache/dev-haskell/vault-0.3.1.4
index 79913f8d6386..5fd8d763aa05 100644
--- a/metadata/md5-cache/dev-haskell/vault-0.3.1.4
+++ b/metadata/md5-cache/dev-haskell/vault-0.3.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.1.4
 SRC_URI=https://hackage.haskell.org/package/vault-0.3.1.4/vault-0.3.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=75becc646b0ca2924dd7836d73053389
diff --git a/metadata/md5-cache/dev-haskell/vector-0.12.1.2 b/metadata/md5-cache/dev-haskell/vector-0.12.1.2
index dfa7e746e2aa..33369662b494 100644
--- a/metadata/md5-cache/dev-haskell/vector-0.12.1.2
+++ b/metadata/md5-cache/dev-haskell/vector-0.12.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=test
 SLOT=0/0.12.1.2
 SRC_URI=https://hackage.haskell.org/package/vector-0.12.1.2/vector-0.12.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f0e73ac73cbf229d4e23f50aa527d59
diff --git a/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3 b/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
index 2f74efd7b248..6dcd686d1578 100644
--- a/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
+++ b/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.8.0.3
 SRC_URI=https://hackage.haskell.org/package/vector-algorithms-0.8.0.3/vector-algorithms-0.8.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35d279425b04965bd94c21e48ff1434d
diff --git a/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1 b/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
index 53023d9ff9c9..45cb7f360fce 100644
--- a/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
+++ b/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/0.2.5.1
 SRC_URI=https://hackage.haskell.org/package/vector-binary-instances-0.2.5.1/vector-binary-instances-0.2.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ff6a327168f412854abbb77845613054
diff --git a/metadata/md5-cache/dev-haskell/vector-builder-0.3.8 b/metadata/md5-cache/dev-haskell/vector-builder-0.3.8
index c9fbba9b8361..a59dd6a26039 100644
--- a/metadata/md5-cache/dev-haskell/vector-builder-0.3.8
+++ b/metadata/md5-cache/dev-haskell/vector-builder-0.3.8
@@ -10,5 +10,5 @@ RDEPEND=<dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/semigroups-0.16:=[
 RESTRICT=!test? ( test )
 SLOT=0/0.3.8
 SRC_URI=https://hackage.haskell.org/package/vector-builder-0.3.8/vector-builder-0.3.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5150f6334fab9f3e3d4a7537475dfd8d
diff --git a/metadata/md5-cache/dev-haskell/vector-instances-3.4 b/metadata/md5-cache/dev-haskell/vector-instances-3.4
index e77b3168906c..2cf24aa54cd4 100644
--- a/metadata/md5-cache/dev-haskell/vector-instances-3.4
+++ b/metadata/md5-cache/dev-haskell/vector-instances-3.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/keys-3:=[profile?] >=dev-haskell/pointed-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1.1.0:=[profile?] )
 SLOT=0/3.4
 SRC_URI=https://hackage.haskell.org/package/vector-instances-3.4/vector-instances-3.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8acec3c08690a38d5db2e4d19d48cf7b
diff --git a/metadata/md5-cache/dev-haskell/vector-space-0.16 b/metadata/md5-cache/dev-haskell/vector-space-0.16
index 2b1474ea140b..5fbd51de9de0 100644
--- a/metadata/md5-cache/dev-haskell/vector-space-0.16
+++ b/metadata/md5-cache/dev-haskell/vector-space-0.16
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/boolean-0.1.0:=[profile?] >=dev-haskell/memotrie-0.5:=[profile?] >=dev-haskell/numinstances-1.0:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] >=dev-haskell/void-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.16
 SRC_URI=https://hackage.haskell.org/package/vector-space-0.16/vector-space-0.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f3c1c7d63a3da0f539624171ca5ce58
diff --git a/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7 b/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
index 003992683fd3..66fcc226eae5 100644
--- a/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
+++ b/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/vector-0.7.1:=[profile?] <dev-haskell/vector-0.13:=[profil
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1.7
 SRC_URI=https://hackage.haskell.org/package/vector-th-unbox-0.2.1.7/vector-th-unbox-0.2.1.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e1dea7106db8d1dca74c037dc92ad6b7
diff --git a/metadata/md5-cache/dev-haskell/void-0.7.3 b/metadata/md5-cache/dev-haskell/void-0.7.3
index 126c01a1e7db..5fbf832ad283 100644
--- a/metadata/md5-cache/dev-haskell/void-0.7.3
+++ b/metadata/md5-cache/dev-haskell/void-0.7.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.3
 SRC_URI=https://hackage.haskell.org/package/void-0.7.3/void-0.7.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=014a2db8f559d6a749752c17f33336b6
diff --git a/metadata/md5-cache/dev-haskell/wai-3.2.2.1 b/metadata/md5-cache/dev-haskell/wai-3.2.2.1
index 22467f52fa67..1afd4ee97150 100644
--- a/metadata/md5-cache/dev-haskell/wai-3.2.2.1
+++ b/metadata/md5-cache/dev-haskell/wai-3.2.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=
 RESTRICT=!test? ( test )
 SLOT=0/3.2.2.1
 SRC_URI=https://hackage.haskell.org/package/wai-3.2.2.1/wai-3.2.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=588cc0f4599d856d9448a38a050ba93e
diff --git a/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1 b/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
index 0628880b43fb..ead4e2ecd5d1 100644
--- a/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
+++ b/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.
 RESTRICT=!test? ( test )
 SLOT=0/3.1.7.2
 SRC_URI=https://hackage.haskell.org/package/wai-app-static-3.1.7.2/wai-app-static-3.1.7.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5e2c8cd8da9def44b3a13dd85be326ec
diff --git a/metadata/md5-cache/dev-haskell/wai-conduit-3.0.0.4 b/metadata/md5-cache/dev-haskell/wai-conduit-3.0.0.4
index 4d59b626af96..3837991b9866 100644
--- a/metadata/md5-cache/dev-haskell/wai-conduit-3.0.0.4
+++ b/metadata/md5-cache/dev-haskell/wai-conduit-3.0.0.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/conduit:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/3.0.0.4
 SRC_URI=https://hackage.haskell.org/package/wai-conduit-3.0.0.4/wai-conduit-3.0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c4c6595f4460fd8812b57d32ac55afb2
diff --git a/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1 b/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
index a61c60e54526..cec207f7a44f 100644
--- a/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
+++ b/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-
 RESTRICT=!test? ( test )
 SLOT=0/3.1.4.1
 SRC_URI=https://hackage.haskell.org/package/wai-extra-3.1.4.1/wai-extra-3.1.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96dc7ffaccc4ac2551d0c0e6a981e3f1
diff --git a/metadata/md5-cache/dev-haskell/wai-logger-2.3.6 b/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
index 0817d1539cb9..7b6d806c72bb 100644
--- a/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
+++ b/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteorder:=[profile?] >=dev-haskell/fast-logger-3:=[profile?
 RESTRICT=test
 SLOT=0/2.3.6
 SRC_URI=https://hackage.haskell.org/package/wai-logger-2.3.6/wai-logger-2.3.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c6a46e6207d09a4426ed585a6224042
diff --git a/metadata/md5-cache/dev-haskell/wai-test-3.0.0 b/metadata/md5-cache/dev-haskell/wai-test-3.0.0
index 4071de243909..47645f9089c9 100644
--- a/metadata/md5-cache/dev-haskell/wai-test-3.0.0
+++ b/metadata/md5-cache/dev-haskell/wai-test-3.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/wai-3.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/3.0.0
 SRC_URI=https://hackage.haskell.org/package/wai-test-3.0.0/wai-test-3.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1bdd0c9b60602e87c75c5cc4d5a462e3
diff --git a/metadata/md5-cache/dev-haskell/warp-3.3.13 b/metadata/md5-cache/dev-haskell/warp-3.3.13
index 2471a66aed5b..fdbb9676633a 100644
--- a/metadata/md5-cache/dev-haskell/warp-3.3.13
+++ b/metadata/md5-cache/dev-haskell/warp-3.3.13
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/auto-update-0.1.3:=[profile?
 RESTRICT=test
 SLOT=0/3.3.13
 SRC_URI=https://hackage.haskell.org/package/warp-3.3.13/warp-3.3.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fa6186c5451e5afefcdb126fae7d81f5
diff --git a/metadata/md5-cache/dev-haskell/warp-tls-3.2.12 b/metadata/md5-cache/dev-haskell/warp-tls-3.2.12
index c8825140c887..f98f913a924d 100644
--- a/metadata/md5-cache/dev-haskell/warp-tls-3.2.12
+++ b/metadata/md5-cache/dev-haskell/warp-tls-3.2.12
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/cryptonite-0.12:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/tls-1.5.3:=[profile?] >=dev-haskell/tls-session-manager-0.0.4:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/warp-3.3.6:=[profile?] <dev-haskell/warp-3.4:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/3.2.12
 SRC_URI=https://hackage.haskell.org/package/warp-tls-3.2.12/warp-tls-3.2.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c924fe86b4c7b75e15ade9a8cf3637cc
diff --git a/metadata/md5-cache/dev-haskell/wavy-0.1.0.0 b/metadata/md5-cache/dev-haskell/wavy-0.1.0.0
index 11ddf230d2dc..2e1d78b05ce1 100644
--- a/metadata/md5-cache/dev-haskell/wavy-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/wavy-0.1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/pretty-show:=[profile?] >=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/wavy-0.1.0.0/wavy-0.1.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22acdde7ee0edf395bb7c2ddeac0a4e1
diff --git a/metadata/md5-cache/dev-haskell/wcwidth-0.0.2 b/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
index 3589bfdd831c..93871ea9b794 100644
--- a/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
+++ b/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= cli? ( >=dev-haskell/attoparsec-0.8.5:=[profile?] >=dev-haskell/setlocale-0.0.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] )
 SLOT=0/0.0.2
 SRC_URI=https://hackage.haskell.org/package/wcwidth-0.0.2/wcwidth-0.0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c099309f806ecebae60ebd9e0d507ab9
diff --git a/metadata/md5-cache/dev-haskell/weigh-0.0.16 b/metadata/md5-cache/dev-haskell/weigh-0.0.16
index 557ff941d145..0e70f9e35f05 100644
--- a/metadata/md5-cache/dev-haskell/weigh-0.0.16
+++ b/metadata/md5-cache/dev-haskell/weigh-0.0.16
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/split:=[profile?] dev-haskell/te
 RESTRICT=!test? ( test )
 SLOT=0/0.0.16
 SRC_URI=https://hackage.haskell.org/package/weigh-0.0.16/weigh-0.0.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c858d0681b0b51e7f1ce305646e2315e
diff --git a/metadata/md5-cache/dev-haskell/with-location-0.1.0 b/metadata/md5-cache/dev-haskell/with-location-0.1.0
index 2e0b47f3945e..3c8499a64088 100644
--- a/metadata/md5-cache/dev-haskell/with-location-0.1.0
+++ b/metadata/md5-cache/dev-haskell/with-location-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0
 SRC_URI=https://hackage.haskell.org/package/with-location-0.1.0/with-location-0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=304a7f8255635c9312549b2ac24c7081
diff --git a/metadata/md5-cache/dev-haskell/wl-pprint-1.2.1 b/metadata/md5-cache/dev-haskell/wl-pprint-1.2.1
index c68a6e33703d..90d4f0c39566 100644
--- a/metadata/md5-cache/dev-haskell/wl-pprint-1.2.1
+++ b/metadata/md5-cache/dev-haskell/wl-pprint-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.1
 SRC_URI=https://hackage.haskell.org/package/wl-pprint-1.2.1/wl-pprint-1.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8a1ebbbcd53311d1c656b284a0335897
diff --git a/metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1 b/metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1
index 1e72cc51ac98..cd12b8227279 100644
--- a/metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/wl-pprint-annotated-0.1.0.1/wl-pprint-annotated-0.1.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=21c942ed3a9b98876bb2115055011174
diff --git a/metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1 b/metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1
index 700e78773afa..f01b5a1359bb 100644
--- a/metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-compat-0.10:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] >=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.0.1
 SRC_URI=https://hackage.haskell.org/package/wl-pprint-text-1.2.0.1/wl-pprint-text-1.2.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1331793cddd844b8160301eaf4117e5d
diff --git a/metadata/md5-cache/dev-haskell/word8-0.1.3 b/metadata/md5-cache/dev-haskell/word8-0.1.3
index 2db686988ac6..470cb7127c87 100644
--- a/metadata/md5-cache/dev-haskell/word8-0.1.3
+++ b/metadata/md5-cache/dev-haskell/word8-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/word8-0.1.3/word8-0.1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e0675a9fb7fd3e6f9e28ce34a2f0e4e6
diff --git a/metadata/md5-cache/dev-haskell/wreq-0.5.3.2 b/metadata/md5-cache/dev-haskell/wreq-0.5.3.2
index e8ce58039d14..6badcbc9c48e 100644
--- a/metadata/md5-cache/dev-haskell/wreq-0.5.3.2
+++ b/metadata/md5-cache/dev-haskell/wreq-0.5.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0.0.0:=[profile?] >=dev-haskell/attoparsec-0.11.1.
 RESTRICT=test
 SLOT=0/0.5.3.2
 SRC_URI=https://hackage.haskell.org/package/wreq-0.5.3.2/wreq-0.5.3.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd247a48e2167e618b5722e5e7bd612f
diff --git a/metadata/md5-cache/dev-haskell/wx-0.92.3.0-r1 b/metadata/md5-cache/dev-haskell/wx-0.92.3.0-r1
index dd1e50300244..9b9e1e746278 100644
--- a/metadata/md5-cache/dev-haskell/wx-0.92.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/wx-0.92.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=dev-haskell/stm:=[profile?] >=dev-haskell/wxcore-0.92:3.0-gtk3=[profile?] >=dev-lang/ghc-7.6.1:= !!dev-haskell/wx:3.0
 SLOT=3.0-gtk3/0.92.3.0
 SRC_URI=https://hackage.haskell.org/package/wx-0.92.3.0/wx-0.92.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=378eddae34caeacdddc30d1529a9ea7c
diff --git a/metadata/md5-cache/dev-haskell/wxc-0.92.3.0-r1 b/metadata/md5-cache/dev-haskell/wxc-0.92.3.0-r1
index 0e627165b276..404d6a67b167 100644
--- a/metadata/md5-cache/dev-haskell/wxc-0.92.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/wxc-0.92.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=>dev-haskell/split-0:=[profile?] >=dev-haskell/wxdirect-0.90.1.1:3.0-gtk3=[profile?] x11-libs/wxGTK:3.0-gtk3=[X,gstreamer?,opengl] >=dev-lang/ghc-7.6.1:= !!dev-haskell/wxc:3.0
 SLOT=3.0-gtk3/0.92.3.0
 SRC_URI=https://hackage.haskell.org/package/wxc-0.92.3.0/wxc-0.92.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
 _md5_=f6d33289e548969a62cce319d89730fb
diff --git a/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0-r1 b/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0-r1
index 41c1bbfdf735..f65048180185 100644
--- a/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/wxc-0.92:3.0-gtk3=[profile?,gstreamer?] >=dev-haskell/wxdirect-0.91:3.0-gtk3=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/wxGTK:3.0-gtk3=[X,gstreamer?,opengl] !!dev-haskell/wxcore:3.0
 SLOT=3.0-gtk3/0.92.3.0
 SRC_URI=https://hackage.haskell.org/package/wxcore-0.92.3.0/wxcore-0.92.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
 _md5_=2d00e764dd4acf75f427b4f091d294a1
diff --git a/metadata/md5-cache/dev-haskell/wxdirect-0.92.3.0-r2 b/metadata/md5-cache/dev-haskell/wxdirect-0.92.3.0-r2
index d668bd1e8483..48f06e8e83ee 100644
--- a/metadata/md5-cache/dev-haskell/wxdirect-0.92.3.0-r2
+++ b/metadata/md5-cache/dev-haskell/wxdirect-0.92.3.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/strict:=[profile?] >=dev-lang/ghc-7.4.1:= !!dev-haskell/wxdirect:3.0
 SLOT=3.0-gtk3/0.92.3.0
 SRC_URI=https://hackage.haskell.org/package/wxdirect-0.92.3.0/wxdirect-0.92.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=72b3c580dbd15cf1eabdcc9ce3a036eb
diff --git a/metadata/md5-cache/dev-haskell/x11-1.9.2 b/metadata/md5-cache/dev-haskell/x11-1.9.2
index cc27d15a0592..a1acff428ca1 100644
--- a/metadata/md5-cache/dev-haskell/x11-1.9.2
+++ b/metadata/md5-cache/dev-haskell/x11-1.9.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver xinerama? ( x11-libs/libXinerama )
 SLOT=0/1.9.2
 SRC_URI=https://hackage.haskell.org/package/X11-1.9.2/X11-1.9.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9c562d577132d877c31259c86fa8c6ad
diff --git a/metadata/md5-cache/dev-haskell/x11-xft-0.3.1-r1 b/metadata/md5-cache/dev-haskell/x11-xft-0.3.1-r1
index 1752a1412f7b..4f054267b22c 100644
--- a/metadata/md5-cache/dev-haskell/x11-xft-0.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/x11-xft-0.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/utf8-string-0.1:=[profile?] >=dev-haskell/x11-1.2.1:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/libXft
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/X11-xft-0.3.1/X11-xft-0.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1d259f7c699930f2712bc18bf3c47de
diff --git a/metadata/md5-cache/dev-haskell/x509-1.7.5 b/metadata/md5-cache/dev-haskell/x509-1.7.5
index 2fce990fb240..5d06bfeb9420 100644
--- a/metadata/md5-cache/dev-haskell/x509-1.7.5
+++ b/metadata/md5-cache/dev-haskell/x509-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0
 RESTRICT=!test? ( test )
 SLOT=0/1.7.5
 SRC_URI=https://hackage.haskell.org/package/x509-1.7.5/x509-1.7.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d597d26d28731afbde19ee5f2dc4d4d
diff --git a/metadata/md5-cache/dev-haskell/x509-store-1.6.7 b/metadata/md5-cache/dev-haskell/x509-store-1.6.7
index 66d3a14abbc4..dfd5d1d5ab05 100644
--- a/metadata/md5-cache/dev-haskell/x509-store-1.6.7
+++ b/metadata/md5-cache/dev-haskell/x509-store-1.6.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0
 RESTRICT=!test? ( test )
 SLOT=0/1.6.7
 SRC_URI=https://hackage.haskell.org/package/x509-store-1.6.7/x509-store-1.6.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e5b398d3b0982476fe37c6ae5c857259
diff --git a/metadata/md5-cache/dev-haskell/x509-system-1.6.6 b/metadata/md5-cache/dev-haskell/x509-system-1.6.6
index 56169342037e..cbf309f9e270 100644
--- a/metadata/md5-cache/dev-haskell/x509-system-1.6.6
+++ b/metadata/md5-cache/dev-haskell/x509-system-1.6.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] >=dev-haskell/x509-store-1.6.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.6.6
 SRC_URI=https://hackage.haskell.org/package/x509-system-1.6.6/x509-system-1.6.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=93e1c0990fa9a1a64775da622f0dba3b
diff --git a/metadata/md5-cache/dev-haskell/x509-validation-1.6.11 b/metadata/md5-cache/dev-haskell/x509-validation-1.6.11
index d0c4a71a6731..23781c0f0cf5 100644
--- a/metadata/md5-cache/dev-haskell/x509-validation-1.6.11
+++ b/metadata/md5-cache/dev-haskell/x509-validation-1.6.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0
 RESTRICT=!test? ( test )
 SLOT=0/1.6.11
 SRC_URI=https://hackage.haskell.org/package/x509-validation-1.6.11/x509-validation-1.6.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f10a5d1240e98536070b7810d5408c4b
diff --git a/metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1 b/metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
index f81819e4caf6..3b6d4a6f3bb7 100644
--- a/metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
+++ b/metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.2:=
 SLOT=0/3000.2.2.1
 SRC_URI=https://hackage.haskell.org/package/xhtml-3000.2.2.1/xhtml-3000.2.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=638f2a25460fc40096a9c3d111da677d
diff --git a/metadata/md5-cache/dev-haskell/xml-1.3.14 b/metadata/md5-cache/dev-haskell/xml-1.3.14
index d12af8077b06..ce8e2a727bfb 100644
--- a/metadata/md5-cache/dev-haskell/xml-1.3.14
+++ b/metadata/md5-cache/dev-haskell/xml-1.3.14
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.14
 SRC_URI=https://hackage.haskell.org/package/xml-1.3.14/xml-1.3.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0316adc0c035995fea2f878bd63d7d10
diff --git a/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1 b/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1
index 1047302677bf..46007ef0a367 100644
--- a/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1
+++ b/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-html-0.5:=
 RESTRICT=!test? ( test )
 SLOT=0/1.9.1.1
 SRC_URI=https://hackage.haskell.org/package/xml-conduit-1.9.1.1/xml-conduit-1.9.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f620b4a188346621f7d8909bbcb4a3dc
diff --git a/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1 b/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
index 12f96389b0ea..29ac7cdf144b 100644
--- a/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0.1
 SRC_URI=https://hackage.haskell.org/package/xml-hamlet-0.5.0.1/xml-hamlet-0.5.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4627c072c3185e12ac9c36a9a576694e
diff --git a/metadata/md5-cache/dev-haskell/xml-types-0.3.8 b/metadata/md5-cache/dev-haskell/xml-types-0.3.8
index 1897af42ed32..4f270dd99fd8 100644
--- a/metadata/md5-cache/dev-haskell/xml-types-0.3.8
+++ b/metadata/md5-cache/dev-haskell/xml-types-0.3.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.8
 SRC_URI=https://hackage.haskell.org/package/xml-types-0.3.8/xml-types-0.3.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c3e119a9bf63c3016a6c7c1de24c4729
diff --git a/metadata/md5-cache/dev-haskell/xmlgen-0.6.2.2 b/metadata/md5-cache/dev-haskell/xmlgen-0.6.2.2
index b734849a6c35..151c6cc91073 100644
--- a/metadata/md5-cache/dev-haskell/xmlgen-0.6.2.2
+++ b/metadata/md5-cache/dev-haskell/xmlgen-0.6.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[prof
 RESTRICT=test
 SLOT=0/0.6.2.2
 SRC_URI=https://hackage.haskell.org/package/xmlgen-0.6.2.2/xmlgen-0.6.2.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=51ac3117fed664fc15e46627b3d4dc08
diff --git a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6 b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
index d66affa2c61b..0669c1d03959 100644
--- a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
+++ b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:
 RESTRICT=!test? ( test )
 SLOT=0/0.3.6
 SRC_URI=https://hackage.haskell.org/package/xss-sanitize-0.3.6/xss-sanitize-0.3.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ce71299ea380629b3c9cd73c2626c07b
diff --git a/metadata/md5-cache/dev-haskell/yaml-0.11.5.0 b/metadata/md5-cache/dev-haskell/yaml-0.11.5.0
index b549313790fc..2c106dab9610 100644
--- a/metadata/md5-cache/dev-haskell/yaml-0.11.5.0
+++ b/metadata/md5-cache/dev-haskell/yaml-0.11.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.5.0
 SRC_URI=https://hackage.haskell.org/package/yaml-0.11.5.0/yaml-0.11.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b83797bc78d1aa1564da0320a7554062
diff --git a/metadata/md5-cache/dev-haskell/yesod-1.6.1.0 b/metadata/md5-cache/dev-haskell/yesod-1.6.1.0
index 7815691f08f5..0897d29d1336 100644
--- a/metadata/md5-cache/dev-haskell/yesod-1.6.1.0
+++ b/metadata/md5-cache/dev-haskell/yesod-1.6.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/fast-logger:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/shakespeare:=[profile?] dev-haskell/streaming-commons:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3:=[profile?] >=dev-haskell/yaml-0.8.17:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/1.6.1.0
 SRC_URI=https://hackage.haskell.org/package/yesod-1.6.1.0/yesod-1.6.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d2462f05bddddac5a1961f3a2678827f
diff --git a/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9 b/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
index 8c2082736ebe..a806bd5292b9 100644
--- a/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
+++ b/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/authenticate-1.3.4:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] dev-haskell/http-client-tls:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?] >=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] >=dev-lang/ghc-8.2.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
 SLOT=0/1.6.9
 SRC_URI=https://hackage.haskell.org/package/yesod-auth-1.6.9/yesod-auth-1.6.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5da16ac5d878abc8705a8153360d7fbc
diff --git a/metadata/md5-cache/dev-haskell/yesod-auth-hashdb-1.7.1.2 b/metadata/md5-cache/dev-haskell/yesod-auth-hashdb-1.7.1.2
index 640c564c3bff..0b126a1536d5 100644
--- a/metadata/md5-cache/dev-haskell/yesod-auth-hashdb-1.7.1.2
+++ b/metadata/md5-cache/dev-haskell/yesod-auth-hashdb-1.7.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <
 RESTRICT=!test? ( test )
 SLOT=0/1.7.1.2
 SRC_URI=https://hackage.haskell.org/package/yesod-auth-hashdb-1.7.1.2/yesod-auth-hashdb-1.7.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0e78e8219116168643ea2771e55b9389
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8 b/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8
index 24a87248a564..155e73ef9f09 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/auto-update:=[profile?]
 RESTRICT=test
 SLOT=0/1.6.18.8
 SRC_URI=https://hackage.haskell.org/package/yesod-core-1.6.18.8/yesod-core-1.6.18.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a89d8d965729f50a3e2fa9fc9d2b0e29
diff --git a/metadata/md5-cache/dev-haskell/yesod-default-1.2.0 b/metadata/md5-cache/dev-haskell/yesod-default-1.2.0
index 54749ba86e45..3469bbc722cd 100644
--- a/metadata/md5-cache/dev-haskell/yesod-default-1.2.0
+++ b/metadata/md5-cache/dev-haskell/yesod-default-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0
 SRC_URI=https://hackage.haskell.org/package/yesod-default-1.2.0/yesod-default-1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=42511ac439a52bfe6374a53829f0b1a8
diff --git a/metadata/md5-cache/dev-haskell/yesod-form-1.6.7 b/metadata/md5-cache/dev-haskell/yesod-form-1.6.7
index 197c53c8649e..419e41a6d3f2 100644
--- a/metadata/md5-cache/dev-haskell/yesod-form-1.6.7
+++ b/metadata/md5-cache/dev-haskell/yesod-form-1.6.7
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.6.7
 SRC_URI=https://hackage.haskell.org/package/yesod-form-1.6.7/yesod-form-1.6.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fce9fa40253ed7b7f553a15a4b1c44fd
diff --git a/metadata/md5-cache/dev-haskell/yesod-json-1.2.0 b/metadata/md5-cache/dev-haskell/yesod-json-1.2.0
index d0734d86be42..3342d3e87fe1 100644
--- a/metadata/md5-cache/dev-haskell/yesod-json-1.2.0
+++ b/metadata/md5-cache/dev-haskell/yesod-json-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0
 SRC_URI=https://hackage.haskell.org/package/yesod-json-1.2.0/yesod-json-1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9616c98a827521d8834590e63c9f2d90
diff --git a/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4 b/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4
index 61df4d692332..7bc2b1a3d9a4 100644
--- a/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4
+++ b/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.0.4
 SRC_URI=https://hackage.haskell.org/package/yesod-persistent-1.6.0.4/yesod-persistent-1.6.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=766a5e4231ad07ca01121eddd4f02586
diff --git a/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0 b/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
index 416c5ece61d4..58be92b9f5c4 100644
--- a/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
+++ b/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.6.1.0
 SRC_URI=https://hackage.haskell.org/package/yesod-static-1.6.1.0/yesod-static-1.6.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=85487cf0b8e3615a6f09e4fb849bad69
diff --git a/metadata/md5-cache/dev-haskell/yesod-test-1.6.12 b/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
index 7620b8b4c0d7..45c65e612be7 100644
--- a/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
+++ b/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.6.12
 SRC_URI=https://hackage.haskell.org/package/yesod-test-1.6.12/yesod-test-1.6.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c3123d6f260928af19f4a43c5d100f8a
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.4.1 b/metadata/md5-cache/dev-haskell/zip-archive-0.4.1
index 429963ec7a0f..4ea28d432aa7 100644
--- a/metadata/md5-cache/dev-haskell/zip-archive-0.4.1
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/digest-0.0.0.1:=[profile?] dev-haskell/mtl:=[profile?] >=d
 RESTRICT=!test? ( test )
 SLOT=0/0.4.1
 SRC_URI=https://hackage.haskell.org/package/zip-archive-0.4.1/zip-archive-0.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=87f8bacc8f0770567119b149d2dc3e89
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.6.2.2 b/metadata/md5-cache/dev-haskell/zlib-0.6.2.2
index 191f5849f65e..84a3f1c5e516 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.6.2.2
+++ b/metadata/md5-cache/dev-haskell/zlib-0.6.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0/0.6.2.2
 SRC_URI=https://hackage.haskell.org/package/zlib-0.6.2.2/zlib-0.6.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f658bd5a9816b543baf74a6d7f1e446c
diff --git a/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5 b/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
index 4e268fd678a5..3d8d59ea6db5 100644
--- a/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
+++ b/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/zlib-0.5.2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.5
 SRC_URI=https://hackage.haskell.org/package/zlib-bindings-0.1.1.5/zlib-bindings-0.1.1.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d9f425aae155b9db97771d4d9a6720b
diff --git a/metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0 b/metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0
index 175e86064990..124fd76a4dc3 100644
--- a/metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0
+++ b/metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/zlib-conduit-1.1.0/zlib-conduit-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e54eb19938f51c03b23ded672e180438
diff --git a/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1 b/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
index c4a4d4f93c99..aec6f55a2169 100644
--- a/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.3.1
 SRC_URI=https://hackage.haskell.org/package/zlib-enum-0.2.3.1/zlib-enum-0.2.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0d6e80dada0167015cdf56d240c275f
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index daea3f3bde7b..328961d047d9 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-4.5.13 b/metadata/md5-cache/dev-java/commons-httpclient-4.5.13
deleted file mode 100644
index dece1d0d6eda..000000000000
--- a/metadata/md5-cache/dev-java/commons-httpclient-4.5.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0 >=virtual/jdk-1.8:* test? ( dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Apache HttpComponents Client
-EAPI=7
-HOMEPAGE=https://hc.apache.org/httpcomponents-client
-IUSE=elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=d9c5f017f21b41676210f3d4d73f4ace
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1 b/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1
new file mode 100644
index 000000000000..a1be4454cd02
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0 >=virtual/jdk-1.8:* test? ( dev-java/hamcrest-core:1.3 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Apache HttpComponents Client
+EAPI=7
+HOMEPAGE=https://hc.apache.org/httpcomponents-client
+IUSE=elibc_FreeBSD doc source test
+KEYWORDS=~amd64 ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=f17809b98751e17e599c7a2d3a1cab72
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.3 b/metadata/md5-cache/dev-java/dom4j-2.1.3
new file mode 100644
index 000000000000..a35f9793c63f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/dom4j-2.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 jaxen? ( dev-java/jaxen:1.2[dom4j] ) >=virtual/jdk-1.8:* test? ( dev-java/xerces:2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/testng:0 )
+DESCRIPTION=flexible XML framework for Java
+EAPI=7
+HOMEPAGE=https://dom4j.github.io/
+IUSE=jaxen elibc_FreeBSD doc source test
+KEYWORDS=~amd64 ~x86
+LICENSE=dom4j
+RDEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 jaxen? ( dev-java/jaxen:1.2[dom4j] ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=1
+SRC_URI=https://github.com/dom4j/dom4j/archive/refs/tags/version-2.1.3.tar.gz -> dom4j-2.1.3.tar.gz https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=f3c9e97cfeafe63a346c27f37a160131
diff --git a/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1 b/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
index 6aa5600df1f6..fc2d5d42fce1 100644
--- a/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
+++ b/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-java/ecj-gcj:* dev-lang/perl ~sys-devel/gcc-5.4.0[awt?,gcj] >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=0
-_eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9523fa2844511511e13c0b1eceedd033
diff --git a/metadata/md5-cache/dev-java/gwt-2.8.2 b/metadata/md5-cache/dev-java/gwt-2.8.2
deleted file mode 100644
index 8fc5ac6a80c3..000000000000
--- a/metadata/md5-cache/dev-java/gwt-2.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/json:0 dev-java/guava:20 dev-java/rhino:1.6 >=dev-java/asm-5.0.3:4 dev-java/eclipse-ecj:4.5 dev-java/validation-api:1.0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Google Web Toolkit library
-EAPI=7
-HOMEPAGE=http://www.gwtproject.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/json:0 dev-java/guava:20 dev-java/rhino:1.6 >=dev-java/asm-5.0.3:4 dev-java/eclipse-ecj:4.5 dev-java/validation-api:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=mirror
-SLOT=2.8
-SRC_URI=https://github.com/gwtproject/gwt/archive/2.8.2.zip -> gwt-2.8.2.zip https://github.com/gwtproject/tools/archive/f42d2729a3a8e6ba9b9aec069957bce5dc0f6f6d.zip -> gwt-tools-f42d2729a3a8e6ba9b9aec069957bce5dc0f6f6d.zip
-_eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f3477a4da86db1b379167b54f194ce7
diff --git a/metadata/md5-cache/dev-java/httpcore-4.4.14 b/metadata/md5-cache/dev-java/httpcore-4.4.14
index 23a69129a204..44a52578265b 100644
--- a/metadata/md5-cache/dev-java/httpcore-4.4.14
+++ b/metadata/md5-cache/dev-java/httpcore-4.4.14
@@ -4,11 +4,11 @@ DESCRIPTION=Apache HttpComponents Core (blocking I/O)
 EAPI=7
 HOMEPAGE=https://hc.apache.org/httpcomponents-core-ga
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=ebca8dcbaa0fcb37e73d156633d985e9
+_md5_=fa3f2b8a50302a067bf585009a1cc912
diff --git a/metadata/md5-cache/dev-java/icedtea-3.18.0 b/metadata/md5-cache/dev-java/icedtea-3.18.0
index 74d6efebe301..7bb2df2315de 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.18.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/openjdk.tar.xz -> icedtea-3.18-openjdk-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/corba.tar.xz -> icedtea-3.18-corba-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jaxp.tar.xz -> icedtea-3.18-jaxp-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jaxws.tar.xz -> icedtea-3.18-jaxws-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jdk.tar.xz -> icedtea-3.18-jdk-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/hotspot.tar.xz -> icedtea-3.18-hotspot-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/nashorn.tar.xz -> icedtea-3.18-nashorn-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/langtools.tar.xz -> icedtea-3.18-langtools-3.18.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/shenandoah.tar.xz -> icedtea-3.18-shenandoah-3.18.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/aarch32.tar.xz -> icedtea-3.18-aarch32-3.18.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=93171dc65c4aa08edc3aa86bbc282a8f
diff --git a/metadata/md5-cache/dev-java/icedtea-3.19.0 b/metadata/md5-cache/dev-java/icedtea-3.19.0
index 67dd212cfd70..81f0cd623ba2 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.19.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/openjdk.tar.xz -> icedtea-3.19-openjdk-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/corba.tar.xz -> icedtea-3.19-corba-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jaxp.tar.xz -> icedtea-3.19-jaxp-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jaxws.tar.xz -> icedtea-3.19-jaxws-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jdk.tar.xz -> icedtea-3.19-jdk-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/hotspot.tar.xz -> icedtea-3.19-hotspot-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/nashorn.tar.xz -> icedtea-3.19-nashorn-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/langtools.tar.xz -> icedtea-3.19-langtools-3.19.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/shenandoah.tar.xz -> icedtea-3.19-shenandoah-3.19.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/aarch32.tar.xz -> icedtea-3.19-aarch32-3.19.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=93171dc65c4aa08edc3aa86bbc282a8f
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
index ddc3a46578c2..2baf260b7c8e 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.16.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.16.0.tar.xz ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-x86.tar.xz ) )
-_eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4bc6a6c3d396914bb57c6503c2835e94
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
index 710b3c949570..3caba8d2cdc5 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.4.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6d20088db7fbdf10b73369a50581fccd
diff --git a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1 b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
index 543dc68ad5d0..92e882449bc1 100644
--- a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
+++ b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) libffi? ( dev-libs/libffi:= ) ppc64? ( dev-libs/libffi:= ) sparc? ( dev-libs/libffi:= ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jamvm/jamvm-2.0.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e73e73e3ab1e1b903dc57c12fd5fd904
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1 b/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
index 19b331396326..eee65c407bb3 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.11-ga.tar.bz2 -> openjdk-11.0.11_p9.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a5047643b0a8a954600ef40894c5775f
diff --git a/metadata/md5-cache/dev-java/openjdk-8.292_p10 b/metadata/md5-cache/dev-java/openjdk-8.292_p10
index 9af4581df6b2..5b1a6d6183df 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.292_p10
+++ b/metadata/md5-cache/dev-java/openjdk-8.292_p10
@@ -10,5 +10,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=8
 SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u292-ga.tar.bz2 -> openjdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u292-ga.tar.bz2 -> openjdk-corba-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u292-ga.tar.bz2 -> openjdk-hotspot-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u292-ga.tar.bz2 -> openjdk-jaxp-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u292-ga.tar.bz2 -> openjdk-jaxws-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u292-ga.tar.bz2 -> openjdk-jdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u292-ga.tar.bz2 -> openjdk-langtools-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u292-ga.tar.bz2 -> openjdk-nashorn-8.292_p10.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.292_p10.tar.bz2 )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=56de332b7b59352a2eca762e9fa5504a
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.11_p9-r1 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.11_p9-r1
index f642815db486..56f2658b9e66 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.11_p9-r1
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.11_p9-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=arm? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz ) x64-macos? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz )
-_eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3160334f4a81f73b9124ccd9b2aa164c
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10 b/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10
index b268095cc6a9..37251c5ef912 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=arm64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz ) arm? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz ) x64-macos? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=519cb175c385a54b77516b304a773252
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.11_p9 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.11_p9
index 99a557d31293..0cfaddea0159 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.11_p9
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.11_p9
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11+9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz )
-_eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6e5bc3b9fa48c1b336deea6d1ab03a4d
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.292_p10 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.292_p10
index 8c78d6c14165..4a06f543110b 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.292_p10
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.292_p10
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=8
 SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b11acdbab71e4469ba1d6fa528abb635
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
index 0944a7b530af..682e9a58d235 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=JAI is a class library for managing images
 EAPI=7
 HOMEPAGE=https://jai.dev.java.net/
 IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64
+KEYWORDS=amd64 ppc64
 LICENSE=sun-bcla-jai
 RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=!amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz ) amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz )
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=398508cfc17e895bbceea61885cda435
+_md5_=54567162b1664e747a2264c264419dd7
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r2 b/metadata/md5-cache/dev-java/swt-4.10-r2
new file mode 100644
index 000000000000..2f4f704271cd
--- /dev/null
+++ b/metadata/md5-cache/dev-java/swt-4.10-r2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jdk-1.8:*[-headless-awt] x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=GTK based SWT Library
+EAPI=7
+HOMEPAGE=http://www.eclipse.org/
+IUSE=cairo opengl webkit elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64
+LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
+RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+SLOT=4.10
+SRC_URI=amd64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-osgi	ce28920e0b96f350c1d47b5880faff44	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=784083a419340482ef475d2715a18cf7
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.28 b/metadata/md5-cache/dev-java/tomcat-native-1.2.28
deleted file mode 100644
index 2e2080509419..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.28
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=static-libs test elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.28/source/tomcat-native-1.2.28-src.tar.gz
-_eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e83e396997fe8d7bc561354ca091870c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.66 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.66
deleted file mode 100644
index 06800cc79233..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.66
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.66/src/apache-tomcat-8.5.66-src.tar.gz
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=79a96c508aead4b84cfed9039f703158
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.68 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.68
index c493e5873ffc..e447fd9b9e56 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.68
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.68
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.68/src/apache-tomcat-8.5.68-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=6bfb744c21b3aef71221b585819bbcf5
+_md5_=79a96c508aead4b84cfed9039f703158
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index deab30b8f61c..960c9c042b2c 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/R-4.0.4 b/metadata/md5-cache/dev-lang/R-4.0.4
index 5d2a3716bc52..828a63444007 100644
--- a/metadata/md5-cache/dev-lang/R-4.0.4
+++ b/metadata/md5-cache/dev-lang/R-4.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-4/R-4.0.4.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7208d3b936aec675033c15641975fb1b
diff --git a/metadata/md5-cache/dev-lang/R-4.0.5-r1 b/metadata/md5-cache/dev-lang/R-4.0.5-r1
index f6cc28d93917..3a31c2763e0c 100644
--- a/metadata/md5-cache/dev-lang/R-4.0.5-r1
+++ b/metadata/md5-cache/dev-lang/R-4.0.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-4/R-4.0.5.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e6f368af5f353e73495f3a2ba7f7a7f1
diff --git a/metadata/md5-cache/dev-lang/R-4.1.0-r1 b/metadata/md5-cache/dev-lang/R-4.1.0-r1
new file mode 100644
index 000000000000..ca968437cd70
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/R-4.1.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) test? ( virtual/latex-base ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl dev-libs/libpcre2:= net-libs/libtirpc net-misc/curl virtual/blas:0 || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-libs/libXt x11-misc/xdg-utils ) virtual/fortran
+DESCRIPTION=Language and environment for statistical computing and graphics
+EAPI=7
+HOMEPAGE=https://www.r-project.org/
+IUSE=cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline static-libs test tiff tk X
+KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl dev-libs/libpcre2:= net-libs/libtirpc net-misc/curl virtual/blas:0 || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-libs/libXt x11-misc/xdg-utils ) sys-libs/zlib:0[minizip] java? ( >=virtual/jre-1.8:* ) virtual/fortran
+REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
+RESTRICT=minimal? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://cran/src/base/R-4/R-4.1.0.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=61fcadb7669eca1c0b1d86e6fa7f1ddf
diff --git a/metadata/md5-cache/dev-lang/crystal-1.0.0 b/metadata/md5-cache/dev-lang/crystal-1.0.0
deleted file mode 100644
index cfedced346ec..000000000000
--- a/metadata/md5-cache/dev-lang/crystal-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-devel/llvm:11 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 !!sys-devel/llvm:0
-DESCRIPTION=The Crystal Programming Language
-EAPI=7
-HOMEPAGE=https://crystal-lang.org
-IUSE=doc debug examples blocking-stdio-hack +xml +yaml
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/llvm:11 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/crystal/archive/1.0.0.tar.gz -> crystal-1.0.0.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/1.0.0/crystal-1.0.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/1.0.0/crystal-1.0.0-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cbdf764a856b469c5ba2e946b9ec5439
diff --git a/metadata/md5-cache/dev-lang/crystal-1.1.0 b/metadata/md5-cache/dev-lang/crystal-1.1.0
new file mode 100644
index 000000000000..d547e8cca37d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/crystal-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=sys-devel/llvm:11 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 !!sys-devel/llvm:0
+DESCRIPTION=The Crystal Programming Language
+EAPI=7
+HOMEPAGE=https://crystal-lang.org
+IUSE=doc debug examples blocking-stdio-hack +xml +yaml
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=sys-devel/llvm:11 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/crystal-lang/crystal/archive/1.1.0.tar.gz -> crystal-1.1.0.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/1.1.0/crystal-1.1.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/1.1.0/crystal-1.1.0-1-linux-i686.tar.gz )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f0743b552af2fde1a286de8bef917aa1
diff --git a/metadata/md5-cache/dev-lang/erlang-24.0 b/metadata/md5-cache/dev-lang/erlang-24.0
deleted file mode 100644
index eb290ff1883d..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=7
-HOMEPAGE=https://www.erlang.org/
-IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/24.0
-SRC_URI=https://github.com/erlang/otp/archive/OTP-24.0.tar.gz -> erlang-24.0.tar.gz http://erlang.org/download/otp_doc_man_24.0.tar.gz -> erlang_doc_man_24.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_24.0.tar.gz -> erlang_doc_html_24.0.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
-_md5_=9fe3ab795131c43633ae2cf1752d9e05
diff --git a/metadata/md5-cache/dev-lang/gforth-0.7.3-r1 b/metadata/md5-cache/dev-lang/gforth-0.7.3-r1
deleted file mode 100644
index e9debde34de5..000000000000
--- a/metadata/md5-cache/dev-lang/gforth-0.7.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-libs/ffcall emacs? ( >=app-editors/emacs-23.1:* )
-DESCRIPTION=GNU Forth is a fast and portable implementation of the ANSI Forth language
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gforth
-IUSE=+check emacs
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=dev-libs/ffcall emacs? ( >=app-editors/emacs-23.1:* )
-SLOT=0
-SRC_URI=mirror://gnu/gforth/gforth-0.7.3.tar.gz
-_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=7725916e4a9058691242d9015aa39fcc
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.4 b/metadata/md5-cache/dev-lang/ghc-8.10.4
index d2467099b0eb..216a7619b7b2 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.10.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.4
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
 RESTRICT=!test? ( test )
 SLOT=0/8.10.4
 SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.4/ghc-8.10.4-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.4/ghc-8.10.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.4-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	4b1080271e43b6d7693aa7052f970626	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4103ce3ed97ec1cc9d14a3b9b89e8589
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.5 b/metadata/md5-cache/dev-lang/ghc-8.10.5
index c8556d46c9e8..4e67900fcfe5 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.10.5
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.5
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
 RESTRICT=!test? ( test )
 SLOT=0/8.10.5
 SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.5/ghc-8.10.5-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.5/ghc-8.10.5-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.5-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.5-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	4b1080271e43b6d7693aa7052f970626	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f12597544c75c10d79aee1eed053a2ce
diff --git a/metadata/md5-cache/dev-lang/ghc-8.8.4 b/metadata/md5-cache/dev-lang/ghc-8.8.4
index e558eacfc380..e21ea2cf0c23 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.8.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.8.4
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
 RESTRICT=!test? ( test )
 SLOT=0/8.8.4
 SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.4-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	4b1080271e43b6d7693aa7052f970626	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4e4b5393fd1fc537234074c3a70c610f
diff --git a/metadata/md5-cache/dev-lang/ghc-9.0.1 b/metadata/md5-cache/dev-lang/ghc-9.0.1
index 8072b63df3d1..684ac80c1952 100644
--- a/metadata/md5-cache/dev-lang/ghc-9.0.1
+++ b/metadata/md5-cache/dev-lang/ghc-9.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
 RESTRICT=!test? ( test )
 SLOT=0/9.0.1
 SRC_URI=!binary? ( https://downloads.haskell.org/ghc/9.0.1/ghc-9.0.1-src.tar.xz test? ( https://downloads.haskell.org/ghc/9.0.1/ghc-9.0.1-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-9.0.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-9.0.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	4b1080271e43b6d7693aa7052f970626	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b431dd8563e922a8b209bfaddbae887
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
index 3a87defa882e..306db0239f61 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=!sys-devel/gcc:6.3.0 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEPEND=!sys-devel/gcc:6.3.0 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* x11-libs/pango virtual/pkgconfig ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+ada +bootstrap test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize cilk ada +vtv jit mpx +pie +ssp +pch
+IUSE=+ada +bootstrap test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize cilk ada vtv jit mpx +pie +ssp +pch
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
 RESTRICT=!test? ( test )
 SLOT=6.3.0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5795a247e934bc6ad85ca75ee0b1c224
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
index 15f088c93913..46f0a083a17e 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=!sys-devel/gcc:7.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEPEND=!sys-devel/gcc:7.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+ada +bootstrap test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite cilk ada +vtv jit mpx +pie +ssp +pch
+IUSE=+ada +bootstrap test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite cilk ada vtv jit mpx +pie +ssp +pch
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=7.3.1
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0ed22962849b42bbc6d445632f93a3ed
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
index c67087430f2e..5599854c7706 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=!sys-devel/gcc:8.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEPEND=!sys-devel/gcc:8.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+ada +bootstrap test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit mpx +pie +ssp +pch systemtap
+IUSE=+ada +bootstrap test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit mpx +pie +ssp +pch systemtap
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=!sys-devel/gcc:8.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=!sys-devel/gcc:8.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=test
 SLOT=8.3.1
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49 -> gnat-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049 -> gcc-8-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50 -> gcc-interface-8-2019-20190510-18F59-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-4.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27927871f5886f2ea85b6eb1de05115a
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2020 b/metadata/md5-cache/dev-lang/gnat-gpl-2020
index 71a1aace2d7e..dd2f0e1f1c9d 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2020
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2020
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=!sys-devel/gcc:9.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
+DEPEND=!sys-devel/gcc:9.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+ada +bootstrap test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit +pie +ssp +pch systemtap d lto
+IUSE=+ada +bootstrap test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=!sys-devel/gcc:9.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=!sys-devel/gcc:9.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=test
 SLOT=9.3.1
 SRC_URI=https://community.download.adacore.com/v1/649a561ec6de9e476c54b02715b79f7503600ce5?filename=gnat-2020-20200429-19B04-src.tar.gz -> gnat-2020-20200429-19B04-src.tar.gz https://community.download.adacore.com/v1/e6b6a3e318e13248456bd37b758435e602b367da?filename=gcc-9-2020-20200429-19AA7-src.tar.gz -> gcc-9-2020-20200429-19AA7-src.tar.gz https://community.download.adacore.com/v1/c7a97636b31f3575df85f1eb0965462a353630dd?filename=gcc-interface-9-2020-20200429-19B10-src.tar.gz -> gcc-interface-9-2020-20200429-19B10-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e843473c2c004ecfab6898be720adeb1
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021 b/metadata/md5-cache/dev-lang/gnat-gpl-2021
index b81faa7bc33a..0e3104079633 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
@@ -8,9 +8,9 @@ IUSE=+ada +bootstrap test vanilla +nls debug +cxx +nptl +fortran doc hardened mu
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=!~sys-devel/gcc-10.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=!~sys-devel/gcc-10.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=test
 SLOT=10
 SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1e35d639253667a5f7d869d63f9df9e0
diff --git a/metadata/md5-cache/dev-lang/go-1.15.14 b/metadata/md5-cache/dev-lang/go-1.15.14
new file mode 100644
index 000000000000..99c766fa5fe1
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.15.14
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install postinst test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+KEYWORDS=-* amd64 arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=strip
+SLOT=0/1.15.14
+SRC_URI=https://storage.googleapis.com/golang/go1.15.14.src.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=835825c669961f31e3e1321a603f6969
diff --git a/metadata/md5-cache/dev-lang/go-1.16.6 b/metadata/md5-cache/dev-lang/go-1.16.6
new file mode 100644
index 000000000000..0197eeee1089
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.16.6
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install postinst test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+IUSE=cpu_flags_x86_sse2
+KEYWORDS=-* amd64 arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=strip
+SLOT=0/1.16.6
+SRC_URI=https://storage.googleapis.com/golang/go1.16.6.src.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fd06be8466465b16ec7f392b3be3f938
diff --git a/metadata/md5-cache/dev-lang/julia-1.5.3 b/metadata/md5-cache/dev-lang/julia-1.5.3
index 8351b951c8c5..c95030cc8f79 100644
--- a/metadata/md5-cache/dev-lang/julia-1.5.3
+++ b/metadata/md5-cache/dev-lang/julia-1.5.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0 >=dev-libs/libpcre2-10.23:0=[jit,unicode] dev-libs/mpfr:0= dev-libs/openspecfun net-libs/libssh2 >=net-libs/mbedtls-2.2 sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= sci-mathematics/z3 >=sys-libs/libunwind-1.1:0= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.5.3/julia-1.5.3.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/1fcc6d66f9df74189c74d3d390f02202bb7db953 -> julia-libuv-1fcc6d66f9df74189c74d3d390f02202bb7db953.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/0890a538bf8238cded9be0c81171f57e43f2c755 -> julia-utf8proc-0890a538bf8238cded9be0c81171f57e43f2c755.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz http://www.unicode.org/Public/13.0.0/ucd/UnicodeData.txt -> julia-UnicodeData-13.0.0.txt https://dev.gentoo.org/~tamiko/distfiles/Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz -> julia-Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz !system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/llvm-9.0.1.src.tar.xz )
-_eclasses_=llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86e4c4ca08cc9b51d87ef0ff5b1c0658
diff --git a/metadata/md5-cache/dev-lang/julia-1.6.0 b/metadata/md5-cache/dev-lang/julia-1.6.0
index ac7ae9b8c887..54e0dc3023f5 100644
--- a/metadata/md5-cache/dev-lang/julia-1.6.0
+++ b/metadata/md5-cache/dev-lang/julia-1.6.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=system-llvm? ( sys-devel/llvm:11=[llvm_targets_NVPTX(-)] ) app-arch/p7zip dev-libs/gmp:0= dev-libs/libgit2:0 >=dev-libs/libpcre2-10.23:0=[jit,unicode] dev-libs/mpfr:0= dev-libs/libutf8proc:0= dev-util/patchelf >=net-libs/mbedtls-2.2 net-misc/curl[http2,ssh] sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= >=sci-mathematics/dsfmt-2.2.4 >=sys-libs/libunwind-1.1:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.6.0/julia-1.6.0.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/fb3e3364c33ae48c827f6b103e05c3f0e78b79a9 -> julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz !system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/llvm-11.0.1.src.tar.xz )
-_eclasses_=llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea313845df9c7bbe72d6730a83163384
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.5-r3 b/metadata/md5-cache/dev-lang/luajit-2.0.5-r3
index c95a9bc9e08a..38e6756e7d10 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.5-r3
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.5-r3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm -hppa ppc -riscv -sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=https://luajit.org/download/LuaJIT-2.0.5.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed3922940d86219c2a2ff7e1191bd126
diff --git a/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3-r2 b/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3-r2
index 6820da5b19ee..f45e3b4957af 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3-r2
+++ b/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3-r2
@@ -7,5 +7,5 @@ KEYWORDS=~arm64 -hppa -riscv -sparc
 LICENSE=MIT
 SLOT=2
 SRC_URI=https://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c066d480f29e720575e633dac6a4bde0
diff --git a/metadata/md5-cache/dev-lang/mlton-20180207 b/metadata/md5-cache/dev-lang/mlton-20180207
index 90f24d960379..7c6c624a0718 100644
--- a/metadata/md5-cache/dev-lang/mlton-20180207
+++ b/metadata/md5-cache/dev-lang/mlton-20180207
@@ -9,5 +9,5 @@ LICENSE=HPND MIT
 RDEPEND=dev-libs/gmp:*
 SLOT=0/20180207
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20180207.src.tgz ) !bootstrap-smlnj? ( amd64? ( mirror://sourceforge/mlton/mlton-20180207-1.amd64-linux.tgz ) )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	pax-utils	fce6ad998516159787b92e8043167889
 _md5_=8b77f08003e305274e9aafdaabf2ffe0
diff --git a/metadata/md5-cache/dev-lang/mono-6.12.0.122 b/metadata/md5-cache/dev-lang/mono-6.12.0.122
index 3feb14ed94ab..af0462860ea4 100644
--- a/metadata/md5-cache/dev-lang/mono-6.12.0.122
+++ b/metadata/md5-cache/dev-lang/mono-6.12.0.122
@@ -10,5 +10,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ia64? ( sys-libs/libunwind ) !minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) nls? ( sys-devel/gettext ) app-misc/ca-certificates
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-6.12.0.122.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17c6793927baa266e816ef5115ceebb2
diff --git a/metadata/md5-cache/dev-lang/mujs-1.1.3 b/metadata/md5-cache/dev-lang/mujs-1.1.3
index f096e65c3869..dbd926c83979 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.1.3
+++ b/metadata/md5-cache/dev-lang/mujs-1.1.3
@@ -3,10 +3,10 @@ DEPEND=sys-libs/readline:0=
 DESCRIPTION=An embeddable JavaScript interpreter in C
 EAPI=7
 HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=ISC
 RDEPEND=sys-libs/readline:0=
 SLOT=0/1.1.3
 SRC_URI=https://mujs.com/downloads/mujs-1.1.3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a86ffec4f24aae4046212c5e2d5c00f2
+_md5_=94a2d15555e9d12795ca039afd1b401f
diff --git a/metadata/md5-cache/dev-lang/nim-1.4.8 b/metadata/md5-cache/dev-lang/nim-1.4.8
index 32cd1281fe93..3adc5a7ce7e2 100644
--- a/metadata/md5-cache/dev-lang/nim-1.4.8
+++ b/metadata/md5-cache/dev-lang/nim-1.4.8
@@ -10,5 +10,5 @@ RDEPEND=readline? ( sys-libs/readline:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nim-lang.org/download/nim-1.4.8.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0cbbba59704ca78143b32b8d7ed9d514
diff --git a/metadata/md5-cache/dev-lang/parrot-8.1.0-r3 b/metadata/md5-cache/dev-lang/parrot-8.1.0-r3
deleted file mode 100644
index 1490a24e9508..000000000000
--- a/metadata/md5-cache/dev-lang/parrot-8.1.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl[doc?] sys-libs/readline:0= dev-libs/libffi:= net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-DEFINED_PHASES=compile configure install test
-DEPEND=sys-libs/readline:0= dev-libs/libffi:= net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre )
-DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
-EAPI=7
-HOMEPAGE=http://www.parrot.org/
-IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=Artistic-2
-RDEPEND=sys-libs/readline:0= dev-libs/libffi:= net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-RESTRICT=test
-SLOT=0/8.1.0
-SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/8.1.0/parrot-8.1.0.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4bdf668f25441242b7772e3c1e5f8ee9
diff --git a/metadata/md5-cache/dev-lang/parrot-8.1.0-r4 b/metadata/md5-cache/dev-lang/parrot-8.1.0-r4
new file mode 100644
index 000000000000..8bb902c818bf
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/parrot-8.1.0-r4
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl[doc?] sys-libs/readline:0= dev-libs/libffi:= net-libs/libnsl:0= virtual/libcrypt:= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1:= ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+DEFINED_PHASES=compile configure install test
+DEPEND=sys-libs/readline:0= dev-libs/libffi:= net-libs/libnsl:0= virtual/libcrypt:= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1:= ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre )
+DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
+EAPI=7
+HOMEPAGE=http://www.parrot.org/
+IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=Artistic-2
+RDEPEND=sys-libs/readline:0= dev-libs/libffi:= net-libs/libnsl:0= virtual/libcrypt:= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1:= ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+RESTRICT=test
+SLOT=0/8.1.0
+SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/8.1.0/parrot-8.1.0.tar.gz
+_md5_=5840ef5ede0e32d66b32355b1820860c
diff --git a/metadata/md5-cache/dev-lang/php-7.3.29 b/metadata/md5-cache/dev-lang/php-7.3.29
index 920fba85264b..1cb2022f1ab5 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.29
+++ b/metadata/md5-cache/dev-lang/php-7.3.29
@@ -5,7 +5,7 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode:0= ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) oci8-instant-client? ( !ldap ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=7.3
 SRC_URI=https://www.php.net/distributions/php-7.3.29.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=acf735e368726900fd14c121731e7797
+_md5_=e7fa18c27beac22ada3b4b11b1fa726d
diff --git a/metadata/md5-cache/dev-lang/php-7.4.21-r1 b/metadata/md5-cache/dev-lang/php-7.4.21-r1
index f28840c3d23f..90308c2e2d1b 100644
--- a/metadata/md5-cache/dev-lang/php-7.4.21-r1
+++ b/metadata/md5-cache/dev-lang/php-7.4.21-r1
@@ -5,7 +5,7 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=7.4
 SRC_URI=https://www.php.net/distributions/php-7.4.21.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=68c099773cf290135db701af5c72d3f6
+_md5_=ff29179c58e545f603fb9f12d75034c8
diff --git a/metadata/md5-cache/dev-lang/php-8.0.8-r1 b/metadata/md5-cache/dev-lang/php-8.0.8-r1
deleted file mode 100644
index 942e11c372e8..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.0.8-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=7
-HOMEPAGE=https://www.php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=8.0
-SRC_URI=https://www.php.net/distributions/php-8.0.8.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a425cfc35d96d8200c6f5abf9f9ce391
diff --git a/metadata/md5-cache/dev-lang/php-8.0.8-r2 b/metadata/md5-cache/dev-lang/php-8.0.8-r2
new file mode 100644
index 000000000000..bd12c1f586ea
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.0.8-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.0
+SRC_URI=https://www.php.net/distributions/php-8.0.8.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=75c562d07f7cf89461718e412a39cf5f
diff --git a/metadata/md5-cache/dev-lang/polyml-5.8 b/metadata/md5-cache/dev-lang/polyml-5.8
index 70a38cb6865b..a8b0839432af 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.8
+++ b/metadata/md5-cache/dev-lang/polyml-5.8
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads
 RESTRICT=!test? ( test )
 SLOT=0/5.8
 SRC_URI=https://codeload.github.com/polyml/polyml/tar.gz/v5.8 -> polyml-5.8.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=94b55b6bf7fe6b07acc3a898fb8e84ef
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p10 b/metadata/md5-cache/dev-lang/python-2.7.18_p10
index 7cc5f6348560..d67f66405fcf 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18_p10
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p10
@@ -11,5 +11,5 @@ PDEPEND=app-eselect/eselect-python
 RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( dev-libs/openssl:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types ) !<=dev-lang/python-exec-2.4.6-r1
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p10.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=588bd7f131841c9711cb34e19745ab35
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p11 b/metadata/md5-cache/dev-lang/python-2.7.18_p11
index 9596f8afcb1f..ca231d0470ab 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18_p11
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p11
@@ -5,10 +5,10 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml verify-sig
-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
 RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( dev-libs/openssl:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types ) !<=dev-lang/python-exec-2.4.6-r1
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p11.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f57fc0b0ca0e2a8a6e9f4468e0af156a
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=45861cb91c3d8525dc4e007eed93475b
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_beta2 b/metadata/md5-cache/dev-lang/python-3.10.0_beta2
index 76115e93784d..69f15e54945e 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.0_beta2
+++ b/metadata/md5-cache/dev-lang/python-3.10.0_beta2
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0b2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0b2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0b2.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4fc2e7d468d87af795ec46b574c40ebe
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_beta3 b/metadata/md5-cache/dev-lang/python-3.10.0_beta3
index 9fe4e39050a2..433418d05731 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.0_beta3
+++ b/metadata/md5-cache/dev-lang/python-3.10.0_beta3
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0b3.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0b3.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0b3.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=965a05f681df42d3acf8ca56b3dae3f6
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_beta4 b/metadata/md5-cache/dev-lang/python-3.10.0_beta4
index 3241ad690561..8c81c101b708 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.0_beta4
+++ b/metadata/md5-cache/dev-lang/python-3.10.0_beta4
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0b4.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0b4.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0b4.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=965a05f681df42d3acf8ca56b3dae3f6
diff --git a/metadata/md5-cache/dev-lang/python-3.6.13_p5 b/metadata/md5-cache/dev-lang/python-3.6.13_p5
index 79884a5c1811..36228affb758 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.13_p5
+++ b/metadata/md5-cache/dev-lang/python-3.6.13_p5
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.13_p5.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eecf4b5bd31c99ef4f7ca5ed697616b9
diff --git a/metadata/md5-cache/dev-lang/python-3.6.14 b/metadata/md5-cache/dev-lang/python-3.6.14
index c0279fd65533..de12e6bc1e35 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.14
+++ b/metadata/md5-cache/dev-lang/python-3.6.14
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.14/Python-3.6.14.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.14.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.14/Python-3.6.14.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7435574098c97666a1434d461962afdc
diff --git a/metadata/md5-cache/dev-lang/python-3.7.10_p6 b/metadata/md5-cache/dev-lang/python-3.7.10_p6
index 6ec2d086c86d..9378e01de7c7 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.10_p6
+++ b/metadata/md5-cache/dev-lang/python-3.7.10_p6
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.10_p6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d7ee28d14d8e0e4ba6d86149c719f752
diff --git a/metadata/md5-cache/dev-lang/python-3.7.11 b/metadata/md5-cache/dev-lang/python-3.7.11
index 116ed0155927..ab22e35a7e49 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.11
+++ b/metadata/md5-cache/dev-lang/python-3.7.11
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.11.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1eeef532b5d9d4a671482f20e3f33b06
diff --git a/metadata/md5-cache/dev-lang/python-3.8.10_p2 b/metadata/md5-cache/dev-lang/python-3.8.10_p2
index e92e065eebd3..f3c47f923a84 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.10_p2
+++ b/metadata/md5-cache/dev-lang/python-3.8.10_p2
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.10_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=44282e2e62add02b6d0b24a4a4b40410
diff --git a/metadata/md5-cache/dev-lang/python-3.8.11 b/metadata/md5-cache/dev-lang/python-3.8.11
index 5e9de9fbe46e..61e9f084f3f6 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.11
+++ b/metadata/md5-cache/dev-lang/python-3.8.11
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.11.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0cff2557e10e93cc5c806550861cea97
diff --git a/metadata/md5-cache/dev-lang/python-3.9.5_p2 b/metadata/md5-cache/dev-lang/python-3.9.5_p2
index 3e32756a6d93..d3a4ed9b8a7d 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.5_p2
+++ b/metadata/md5-cache/dev-lang/python-3.9.5_p2
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.5_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=24d4eb0bf0c56d7bacffd6cccd0b4eda
diff --git a/metadata/md5-cache/dev-lang/python-3.9.6 b/metadata/md5-cache/dev-lang/python-3.9.6
index 8267ff1e5309..507fa3c7d345 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.6
+++ b/metadata/md5-cache/dev-lang/python-3.9.6
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=11ee814a5f69f86bfa46804e47c4d962
diff --git a/metadata/md5-cache/dev-lang/regina-rexx-3.9.1-r1 b/metadata/md5-cache/dev-lang/regina-rexx-3.9.1-r1
deleted file mode 100644
index c02c78e71db2..000000000000
--- a/metadata/md5-cache/dev-lang/regina-rexx-3.9.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Portable Rexx interpreter
-EAPI=7
-HOMEPAGE=https://regina-rexx.sourceforge.io/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1 MPL-1.0
-SLOT=0
-SRC_URI=mirror://sourceforge/regina-rexx/Regina-REXX-3.9.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=890fe454dd360c6c60c4f746f5317d04
diff --git a/metadata/md5-cache/dev-lang/regina-rexx-3.9.1-r2 b/metadata/md5-cache/dev-lang/regina-rexx-3.9.1-r2
new file mode 100644
index 000000000000..cf23750277d8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/regina-rexx-3.9.1-r2
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=virtual/libcrypt:=
+DESCRIPTION=Portable Rexx interpreter
+EAPI=7
+HOMEPAGE=https://regina-rexx.sourceforge.io/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1 MPL-1.0
+RDEPEND=virtual/libcrypt:=
+SLOT=0
+SRC_URI=mirror://sourceforge/regina-rexx/Regina-REXX-3.9.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6f7e55b9802930ac0b3f195dec838b26
diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.8-r3 b/metadata/md5-cache/dev-lang/ruby-2.5.8-r3
deleted file mode 100644
index d687f9863a03..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.5.8-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20171225
-DESCRIPTION=An object-oriented scripting language
-EAPI=7
-HOMEPAGE=https://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] virtual/rubygems[ruby_targets_ruby25] >=dev-ruby/json-2.0.2[ruby_targets_ruby25] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby25] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20171225
-SLOT=2.5
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.8.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=913b95fb29525b95f7ceae86bc58cdd5
diff --git a/metadata/md5-cache/dev-lang/ruby-2.6.6-r5 b/metadata/md5-cache/dev-lang/ruby-2.6.6-r5
deleted file mode 100644
index 623337df2b8a..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.6.6-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20181225
-DESCRIPTION=An object-oriented scripting language
-EAPI=7
-HOMEPAGE=https://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] virtual/rubygems[ruby_targets_ruby26] >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] >=dev-ruby/json-2.0.2[ruby_targets_ruby26] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20181225
-SLOT=2.6
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.6.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6be6ceaf67cba4c4278b8e57d298ac6c
diff --git a/metadata/md5-cache/dev-lang/ruby-2.6.7-r1 b/metadata/md5-cache/dev-lang/ruby-2.6.7-r1
deleted file mode 100644
index 6b061b529189..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.6.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20181225
-DESCRIPTION=An object-oriented scripting language
-EAPI=7
-HOMEPAGE=https://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] virtual/rubygems[ruby_targets_ruby26] >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] >=dev-ruby/json-2.0.2[ruby_targets_ruby26] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20181225
-SLOT=2.6
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.7.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6be6ceaf67cba4c4278b8e57d298ac6c
diff --git a/metadata/md5-cache/dev-lang/ruby-2.6.7-r2 b/metadata/md5-cache/dev-lang/ruby-2.6.7-r2
index 3b4dbb0f0606..819c456d731d 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.6.7-r2
+++ b/metadata/md5-cache/dev-lang/ruby-2.6.7-r2
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] virtual/rubygems[ruby_targets_ruby26] >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] >=dev-ruby/json-2.0.2[ruby_targets_ruby26] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20181225
 SLOT=2.6
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.7.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c04e5be39a88bf05235f3906c47ecd2a
+_md5_=ed475ab30e8ee46b513cd3f77a803eb7
diff --git a/metadata/md5-cache/dev-lang/ruby-2.6.8 b/metadata/md5-cache/dev-lang/ruby-2.6.8
index 28b87f91c44b..14df093269c1 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.6.8
+++ b/metadata/md5-cache/dev-lang/ruby-2.6.8
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] virtual/rubygems[ruby_targets_ruby26] >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] >=dev-ruby/json-2.0.2[ruby_targets_ruby26] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20181225
 SLOT=2.6
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.8.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=54463f98c794a89d5a9fb6b6ec7a0132
+_md5_=5ea9837bbe28917e31d68ffffd43890b
diff --git a/metadata/md5-cache/dev-lang/rust-1.52.1 b/metadata/md5-cache/dev-lang/rust-1.52.1
index d7d2d29d620c..6b3ef0ca8cb5 100644
--- a/metadata/md5-cache/dev-lang/rust-1.52.1
+++ b/metadata/md5-cache/dev-lang/rust-1.52.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.52
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.52.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.52.1-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.51.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.51.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.51.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.51.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1201b7c569aa90206713efd457cffc0c
diff --git a/metadata/md5-cache/dev-lang/rust-1.53.0 b/metadata/md5-cache/dev-lang/rust-1.53.0
index 27b03a445b9e..0d37db227359 100644
--- a/metadata/md5-cache/dev-lang/rust-1.53.0
+++ b/metadata/md5-cache/dev-lang/rust-1.53.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.53
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.52.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.52.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.52.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.52.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f86b110f9e6e6f11a7d5b1e0bcc64369
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.52.1 b/metadata/md5-cache/dev-lang/rust-bin-1.52.1
index 1a0269557a56..09873b0ca0cb 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.52.1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.52.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.52.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.52.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.52.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.52.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.52.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.52.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.52.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
 _md5_=5ddcf5e8ac1aa288b3b82e751ab54d21
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.53.0 b/metadata/md5-cache/dev-lang/rust-bin-1.53.0
index fa82b6d8517b..c7f716d888c7 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.53.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.53.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.53.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
 _md5_=6a6c495e81c8fe20c51d283294ffb28d
diff --git a/metadata/md5-cache/dev-lang/scala-bin-2.13.1-r1 b/metadata/md5-cache/dev-lang/scala-bin-2.13.1-r1
deleted file mode 100644
index e6111f05c756..000000000000
--- a/metadata/md5-cache/dev-lang/scala-bin-2.13.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The Scala Programming Language
-EAPI=6
-HOMEPAGE=http://scala.epfl.ch/
-IUSE=doc elibc_FreeBSD doc
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://downloads.lightbend.com/scala/2.13.1/scala-2.13.1.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2dc6eee88e184a497e86a7fa45075234
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
index 1dc2023c3cc6..09e4dd0f1534 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemallo
 RESTRICT=!test? ( test )
 SLOT=0/mozjs185
 SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-02.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad59235e0a2d56a2fdda42c7ca67e198
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r2 b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r2
index a97c77089cce..bdc1e7bb74e2 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.13.1 dev-libs/libffi sys-libs/readline:0= >=sys-libs/z
 RESTRICT=test
 SLOT=52
 SRC_URI=http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.1pre1.tar.bz2 -> mozjs-52.9.1pre1.tar.bz2 https://dev.gentoo.org/~whissi/dist/mozilla/spidermonkey-52.0-patches-1.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozcoreconf-v5	40bd169844938931a92480a45f07caec	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozcoreconf-v5	40bd169844938931a92480a45f07caec	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=196646e6bcc10310f3272826958bfd39
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r4 b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r4
index 61feffcb4c67..0b32c87e3777 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r4
+++ b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.13.1 dev-libs/libffi sys-libs/readline:0= >=sys-libs/z
 RESTRICT=test
 SLOT=60
 SRC_URI=https://dev.gentoo.org/~axs/distfiles/mozjs-60.5.2.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-60.0-patches-04.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozcoreconf-v5	40bd169844938931a92480a45f07caec	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozcoreconf-v5	40bd169844938931a92480a45f07caec	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3acc65284c888407a8870a08106761b6
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.11.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.11.0
index 2c09cb731b5f..a72a701b433d 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.11.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.11.0
@@ -5,11 +5,11 @@ DESCRIPTION=SpiderMonkey is Mozilla's JavaScript engine written in C and C++
 EAPI=7
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
 IUSE=clang cpu_flags_arm_neon debug +jit lto test
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-libs/zlib-1.2.3
 RESTRICT=!test? ( test )
 SLOT=78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/source/firefox-78.11.0esr.source.tar.xz -> firefox-78.11.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e52116cee2355cc84a554ed44e19990
+_md5_=6724f482f208f38d8f0d0ed95597b565
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.12.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.12.0
new file mode 100644
index 000000000000..427ad3ea5b0e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.12.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=virtual/rust-1.41.0 virtual/pkgconfig || ( ( sys-devel/llvm:12 clang? ( sys-devel/clang:12 lto? ( =sys-devel/lld-12* ) ) ) ( sys-devel/llvm:11 clang? ( sys-devel/clang:11 lto? ( =sys-devel/lld-11* ) ) ) ( sys-devel/llvm:10 clang? ( sys-devel/clang:10 lto? ( =sys-devel/lld-10* ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-libs/zlib-1.2.3 test? ( || ( ( dev-lang/python:3.9 dev-python/six[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/six[python_targets_python3_8(-)] ) ) ) !!sys-devel/llvm:0
+DESCRIPTION=SpiderMonkey is Mozilla's JavaScript engine written in C and C++
+EAPI=7
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
+IUSE=clang cpu_flags_arm_neon debug +jit lto test
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-libs/zlib-1.2.3
+RESTRICT=!test? ( test )
+SLOT=78
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/source/firefox-78.12.0esr.source.tar.xz -> firefox-78.12.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8d8edc8b400deb1f3d8cb6a437321f20
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.2.3-r1 b/metadata/md5-cache/dev-lang/swi-prolog-8.2.3-r1
deleted file mode 100644
index 3b98d5617258..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.2.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
-DESCRIPTION=versatile implementation of the Prolog programming language
-EAPI=7
-HOMEPAGE=https://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.swi-prolog.org/download/stable/src/swipl-8.2.3.tar.gz https://dev.gentoo.org/~keri/distfiles/swi-prolog/swi-prolog-8.2.3-gentoo-patchset-0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=07ead76aafcd699ae56bfb38cf6cc4ef
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.2.3-r2 b/metadata/md5-cache/dev-lang/swi-prolog-8.2.3-r2
new file mode 100644
index 000000000000..8683b5e27eb7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.2.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
+DESCRIPTION=versatile implementation of the Prolog programming language
+EAPI=7
+HOMEPAGE=https://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.swi-prolog.org/download/stable/src/swipl-8.2.3.tar.gz https://dev.gentoo.org/~keri/distfiles/swi-prolog/swi-prolog-8.2.3-gentoo-patchset-0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f2388749f96c45051958f62c1995aa16
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.2.4-r1 b/metadata/md5-cache/dev-lang/swi-prolog-8.2.4-r1
deleted file mode 100644
index 53f54a1a74c7..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.2.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
-DESCRIPTION=Versatile implementation of the Prolog programming language
-EAPI=7
-HOMEPAGE=https://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.swi-prolog.org/download/stable/src/swipl-8.2.4.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=640b88954fcb1bd87c2960df9ecc285b
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.2.4-r2 b/metadata/md5-cache/dev-lang/swi-prolog-8.2.4-r2
new file mode 100644
index 000000000000..282285ddd360
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.2.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
+DESCRIPTION=Versatile implementation of the Prolog programming language
+EAPI=7
+HOMEPAGE=https://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.swi-prolog.org/download/stable/src/swipl-8.2.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=930eb8fb604f807209a755414b5d9690
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.25-r1 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.25-r1
deleted file mode 100644
index 60bba05c6241..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.3.25-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
-DESCRIPTION=Versatile implementation of the Prolog programming language
-EAPI=7
-HOMEPAGE=https://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-8.3.25.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=666ceaf9ac1fd0c9d4b54575e0124090
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.25-r2 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.25-r2
new file mode 100644
index 000000000000..865d7b226792
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.3.25-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
+DESCRIPTION=Versatile implementation of the Prolog programming language
+EAPI=7
+HOMEPAGE=https://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-8.3.25.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e849473245a76c4df864634c6e1a3d31
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.26 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.26
deleted file mode 100644
index 53347e1551d7..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.3.26
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
-DESCRIPTION=Versatile implementation of the Prolog programming language
-EAPI=7
-HOMEPAGE=https://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-8.3.26.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=666ceaf9ac1fd0c9d4b54575e0124090
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.26-r1 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.26-r1
new file mode 100644
index 000000000000..066a11cda920
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.3.26-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
+DESCRIPTION=Versatile implementation of the Prolog programming language
+EAPI=7
+HOMEPAGE=https://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-8.3.26.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e849473245a76c4df864634c6e1a3d31
diff --git a/metadata/md5-cache/dev-lang/whitespace-0.4 b/metadata/md5-cache/dev-lang/whitespace-0.4
index 6235d87d9f50..41eb85ec149e 100644
--- a/metadata/md5-cache/dev-lang/whitespace-0.4
+++ b/metadata/md5-cache/dev-lang/whitespace-0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/random:= >=dev-lang/ghc-7.4.1:=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/whitespace-0.4/whitespace-0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=696b0342495caaca35fd79e304cef540
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.5-r1 b/metadata/md5-cache/dev-libs/Ice-3.6.5-r1
deleted file mode 100644
index 7e7e74c84426..000000000000
--- a/metadata/md5-cache/dev-libs/Ice-3.6.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ruby? ( dev-lang/ruby:2.6 ) mono? ( dev-lang/mono ) readline? ( sys-libs/readline:0= ) test? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DESCRIPTION=ICE middleware C++ library and generator tools
-EAPI=7
-HOMEPAGE=https://zeroc.com/products/ice
-IUSE=debug doc examples +readline mono php python ruby test php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 ruby_targets_ruby26
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ruby? ( dev-lang/ruby:2.6 ) mono? ( dev-lang/mono ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) php? ( || ( php_targets_php7-4 ) )
-RESTRICT=test
-SLOT=0/36
-SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.5.tar.gz -> Ice-3.6.5.tar.gz doc? ( https://download.zeroc.com/Ice/3.6/Ice-3.6.4.pdf )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=846358576df3bec24dcf390ad03033d8
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.5-r2 b/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
new file mode 100644
index 000000000000..5a50e7f37ad7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= virtual/libcrypt:= || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ruby? ( dev-lang/ruby:2.6 ) mono? ( dev-lang/mono ) readline? ( sys-libs/readline:0= ) test? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DESCRIPTION=ICE middleware C++ library and generator tools
+EAPI=7
+HOMEPAGE=https://zeroc.com/products/ice
+IUSE=debug doc examples +readline mono php python ruby test php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 ruby_targets_ruby26
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= virtual/libcrypt:= || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ruby? ( dev-lang/ruby:2.6 ) mono? ( dev-lang/mono ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) php? ( || ( php_targets_php7-4 ) )
+RESTRICT=test
+SLOT=0/36
+SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.5.tar.gz -> Ice-3.6.5.tar.gz doc? ( https://download.zeroc.com/Ice/3.6/Ice-3.6.4.pdf )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a9e4ad486e9713ff011a481d0cf623eb
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index e17eda838dd4..bc42095bb845 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/botan-2.18.1-r1 b/metadata/md5-cache/dev-libs/botan-2.18.1-r1
index 9cf16f12bb42..90c82f1eaabe 100644
--- a/metadata/md5-cache/dev-libs/botan-2.18.1-r1
+++ b/metadata/md5-cache/dev-libs/botan-2.18.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( ( dev-lang/python:3.9 doc? ( dev-python/sphinx[python_targets_python3_9(-)] ) ) ( dev-lang/python:3.8 doc? ( dev-python/sphinx[python_targets_python3_8(-)] ) ) ) verify-sig? ( app-crypt/openpgp-keys-botan ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( ( dev-lang/python:3.10 doc? ( dev-python/sphinx[python_targets_python3_10(-)] ) ) ( dev-lang/python:3.9 doc? ( dev-python/sphinx[python_targets_python3_9(-)] ) ) ( dev-lang/python:3.8 doc? ( dev-python/sphinx[python_targets_python3_8(-)] ) ) ) verify-sig? ( app-crypt/openpgp-keys-botan ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=configure install test unpack
-DEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ssl? ( dev-libs/openssl:0=[bindist(-)=] ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
+DEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( dev-libs/openssl:0=[bindist(-)=] ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
 DESCRIPTION=C++ crypto library
 EAPI=7
 HOMEPAGE=https://botan.randombit.net/
-IUSE=bindist doc boost bzip2 lzma python ssl static-libs sqlite zlib cpu_flags_arm_aes cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_rdrand cpu_flags_x86_sse2 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 python_targets_python3_8 python_targets_python3_9 verify-sig
+IUSE=bindist doc boost bzip2 lzma python ssl static-libs sqlite zlib cpu_flags_arm_aes cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_rdrand cpu_flags_x86_sse2 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos
 LICENSE=BSD-2
-RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ssl? ( dev-libs/openssl:0=[bindist(-)=] ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( dev-libs/openssl:0=[bindist(-)=] ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=2/2.18
 SRC_URI=https://botan.randombit.net/releases/Botan-2.18.1.tar.xz verify-sig? ( https://botan.randombit.net/releases/Botan-2.18.1.tar.xz.asc )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=b5362273eb5d69eea2070d27bacb79b3
+_md5_=60c839d22024a91f2d8cb257682e786c
diff --git a/metadata/md5-cache/dev-libs/collada-dom-2.5.0 b/metadata/md5-cache/dev-libs/collada-dom-2.5.0
index d3d306003212..871a70cd304c 100644
--- a/metadata/md5-cache/dev-libs/collada-dom-2.5.0
+++ b/metadata/md5-cache/dev-libs/collada-dom-2.5.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpc
 DESCRIPTION=COLLADA Document Object Model (DOM) C++ Library
 EAPI=6
 HOMEPAGE=https://github.com/rdiankov/collada-dom
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpcre[cxx]
 SLOT=0/25
 SRC_URI=https://github.com/rdiankov/collada-dom/archive/v2.5.0.tar.gz -> collada-dom-2.5.0.tar.gz
 _eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c6319f224ce65168fc63c5a9b698a1e
+_md5_=21c9daad81a54f066c6f6b38346326ad
diff --git a/metadata/md5-cache/dev-libs/collada-dom-9999 b/metadata/md5-cache/dev-libs/collada-dom-9999
index f4b5408ed618..39b7565be007 100644
--- a/metadata/md5-cache/dev-libs/collada-dom-9999
+++ b/metadata/md5-cache/dev-libs/collada-dom-9999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2:= dev-libs/libpcre:=[cxx]
 SLOT=0/25
 _eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=df6fbf587042a61e10a8236ce0553b84
+_md5_=5e5a81a4b012e5f1746c8c897ea27d76
diff --git a/metadata/md5-cache/dev-libs/confuse-3.3 b/metadata/md5-cache/dev-libs/confuse-3.3
index c510306b2c1d..5ab5473cee5d 100644
--- a/metadata/md5-cache/dev-libs/confuse-3.3
+++ b/metadata/md5-cache/dev-libs/confuse-3.3
@@ -4,10 +4,10 @@ DESCRIPTION=a configuration file parser library
 EAPI=7
 HOMEPAGE=https://github.com/martinh/libconfuse
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/2.1.0
 SRC_URI=https://github.com/martinh/libconfuse/releases/download/v3.3/confuse-3.3.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8dee25f4d1760d8077447cb56721c7ad
+_md5_=cfc377bae3e37f4a5356d211f5eb25a5
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.110 b/metadata/md5-cache/dev-libs/dbus-glib-0.110
index 37ef3095a016..d26a517c505f 100644
--- a/metadata/md5-cache/dev-libs/dbus-glib-0.110
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.110
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=395dd4857b02c6a4a06291114a29afce
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.112 b/metadata/md5-cache/dev-libs/dbus-glib-0.112
new file mode 100644
index 000000000000..b73c811f32fe
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.112
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-libs/expat-2.1.0-r3 >=dev-libs/glib-2.40:2 >=sys-apps/dbus-1.8 >=dev-util/glib-utils-2.40 >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=D-Bus bindings for glib
+EAPI=7
+HOMEPAGE=https://dbus.freedesktop.org/
+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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=|| ( GPL-2 AFL-2.1 )
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.8[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://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.112.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b7ca12a3628d442d16049e0428cd5e51
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.184 b/metadata/md5-cache/dev-libs/elfutils-0.184
deleted file mode 100644
index 6fbcf31dfaf0..000000000000
--- a/metadata/md5-cache/dev-libs/elfutils-0.184
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/zlib-1.2.8-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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) zstd? ( app-arch/zstd:=[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(-)?] ) !dev-libs/libelf valgrind? ( dev-util/valgrind )
-DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
-EAPI=7
-HOMEPAGE=http://elfutils.org/
-IUSE=bzip2 lzma nls static-libs test +threads +utils valgrind zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
-RDEPEND=>=sys-libs/zlib-1.2.8-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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) zstd? ( app-arch/zstd:=[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(-)?] ) !dev-libs/libelf
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://sourceware.org/elfutils/ftp/0.184/elfutils-0.184.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=16175d6e0b56351094b842393c2da1d7
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.185 b/metadata/md5-cache/dev-libs/elfutils-0.185
index 5f92f6cb0299..278824f3a0e5 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.185
+++ b/metadata/md5-cache/dev-libs/elfutils-0.185
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for l
 EAPI=7
 HOMEPAGE=http://elfutils.org/
 IUSE=bzip2 lzma nls static-libs test +threads +utils valgrind zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
 RDEPEND=>=sys-libs/zlib-1.2.8-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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) zstd? ( app-arch/zstd:=[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(-)?] ) !dev-libs/libelf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.185/elfutils-0.185.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9df604c29b06a637af7b786a435ea022
+_md5_=aef37e9dede4c755e8b20993ce0fb538
diff --git a/metadata/md5-cache/dev-libs/ell-0.41 b/metadata/md5-cache/dev-libs/ell-0.41
index 20ff85467348..200c0731dffb 100644
--- a/metadata/md5-cache/dev-libs/ell-0.41
+++ b/metadata/md5-cache/dev-libs/ell-0.41
@@ -4,11 +4,11 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.41.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b6f33b21368c21749ac3e3cf36354aa3
+_md5_=bc1c306250acbbc7a8b07255d7bdfc4c
diff --git a/metadata/md5-cache/dev-libs/kopeninghours-21.04.2 b/metadata/md5-cache/dev-libs/kopeninghours-21.04.2
deleted file mode 100644
index 4591d4d5c7c1..000000000000
--- a/metadata/md5-cache/dev-libs/kopeninghours-21.04.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/kpublictransport-21.04.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for parsing and evaluating OSM opening hours expressions
-EAPI=7
-HOMEPAGE=https://api.kde.org/kopeninghours/html/index.html https://invent.kde.org/libraries/kopeninghours
-IUSE=python debug test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/kpublictransport-21.04.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) ) python_single_target_python3_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-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kopeninghours-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1c4fb12e475caf49e22e68094f39eac3
diff --git a/metadata/md5-cache/dev-libs/kosmindoormap-21.04.2 b/metadata/md5-cache/dev-libs/kosmindoormap-21.04.2
deleted file mode 100644
index d9c2ac6b249b..000000000000
--- a/metadata/md5-cache/dev-libs/kosmindoormap-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/kpublictransport-21.04.2:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib test? ( >=dev-qt/qtwidgets-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Data Model and Extraction System for Travel Reservation information
-EAPI=7
-HOMEPAGE=https://invent.kde.org/libraries/kosmindoormap
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/kpublictransport-21.04.2:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kosmindoormap-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=20b9189784b70b2a48dcb9772ca992a6
diff --git a/metadata/md5-cache/dev-libs/kpublictransport-21.04.2 b/metadata/md5-cache/dev-libs/kpublictransport-21.04.2
deleted file mode 100644
index a80736ab1a3a..000000000000
--- a/metadata/md5-cache/dev-libs/kpublictransport-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 sys-libs/zlib test? ( >=dev-qt/qtwidgets-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for accessing public transport timetables and other information
-EAPI=7
-HOMEPAGE=https://invent.kde.org/libraries/kpublictransport https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kpublictransport-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a2dd5c8dfb780c623a9699a50c37217d
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.2 b/metadata/md5-cache/dev-libs/leatherman-1.12.2
deleted file mode 100644
index 6e7fd307bcca..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl >=sys-devel/gcc-4.8:*
-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
-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	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d3c22dc1d4bd7f7e2d7d8d93b21ab909
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.4 b/metadata/md5-cache/dev-libs/leatherman-1.12.4
deleted file mode 100644
index b1cbb3b22bb1..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl >=sys-devel/gcc-4.8:*
-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
-LICENSE=Apache-2.0
-RDEPEND=net-misc/curl
-RESTRICT=test
-SLOT=0/1.12.4
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.4.tar.gz -> leatherman-1.12.4.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d3c22dc1d4bd7f7e2d7d8d93b21ab909
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.5 b/metadata/md5-cache/dev-libs/leatherman-1.12.5
index ed8575cb7ba8..2ede41b86e79 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.5
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.5
@@ -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.5
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.5.tar.gz -> leatherman-1.12.5.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=90247ff87e77264040d6437aa7d036ca
+_md5_=d953c6d2d6ec86227666ca813b141a1f
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.6 b/metadata/md5-cache/dev-libs/leatherman-1.12.6
new file mode 100644
index 000000000000..9d10f9ab74b6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.6
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl >=sys-devel/gcc-4.8:*
+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
+LICENSE=Apache-2.0
+RDEPEND=net-misc/curl
+RESTRICT=test
+SLOT=0/1.12.6
+SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.6.tar.gz -> leatherman-1.12.6.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=90247ff87e77264040d6437aa7d036ca
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.11.3 b/metadata/md5-cache/dev-libs/libbsd-0.11.3
new file mode 100644
index 000000000000..496590e4d66e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbsd-0.11.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install setup test
+DEPEND=app-crypt/libmd[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-kernel/linux-headers-3.17
+DESCRIPTION=Library to provide useful functions commonly found on BSD systems
+EAPI=8
+HOMEPAGE=https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd
+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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD BSD-2 BSD-4 ISC
+RDEPEND=app-crypt/libmd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.11.3.tar.xz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e6f70600d35fe268fc7b3b5e29fda121
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14-r2 b/metadata/md5-cache/dev-libs/libdnet-1.14-r2
index ee4c997d9767..1e1c9659c9a9 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.14-r2
+++ b/metadata/md5-cache/dev-libs/libdnet-1.14-r2
@@ -5,7 +5,7 @@ DESCRIPTION=simplified, portable interface to several low-level networking routi
 EAPI=7
 HOMEPAGE=https://github.com/ofalk/libdnet
 IUSE=python test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
 RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ofalk/libdnet/archive/libdnet-1.14.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=69a70be640e2c5bc3719f59847382abb
+_md5_=f0570d2c72a41982ae0fd3c737279ee8
diff --git a/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1 b/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
index 7ffb78d62674..573c358a889a 100644
--- a/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
+++ b/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/c-blosc:0= cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-l
 RESTRICT=!test? ( test )
 SLOT=0/0.7.2
 SRC_URI=https://github.com/libdynd/libdynd/archive/v0.7.2.tar.gz -> libdynd-0.7.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b350142359c0e8dfb39dccb3903c88dc
diff --git a/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009 b/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
index 78148d30c7ae..e831c4d546b1 100644
--- a/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
+++ b/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/STEllAR-GROUP/libflatarray/archive/c8df37f6ac73250998b90c397458469902d6d9b9.tar.gz -> libflatarray-0.4.0_pre20201009.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=53e4733346863f16ccb5eed2e5677080
diff --git a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6 b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
index f4a9e36c6fb0..b5b3d41ef9f0 100644
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=6
 HOMEPAGE=https://www.gnome.org/~veillard/gamin/
 IUSE=debug kernel_linux 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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=!app-admin/fam !<app-admin/gamin-0.1.10
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=23e206825dccd5761d5b50946ed8a896
+_md5_=e6fa6da41aaf84720468f22fcb7323d6
diff --git a/metadata/md5-cache/dev-libs/libinput-1.18.0 b/metadata/md5-cache/dev-libs/libinput-1.18.0
index d34b1c859481..3db0deb07a3b 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.18.0
+++ b/metadata/md5-cache/dev-libs/libinput-1.18.0
@@ -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 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.18.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=ee55cdfe841a0f6960e499165e5b4a38
+_md5_=47ea8a3ddb01bb60751a78fda9df9674
diff --git a/metadata/md5-cache/dev-libs/libmix-2.05-r7 b/metadata/md5-cache/dev-libs/libmix-2.05-r7
index ea340a1a1581..634964dcf3a1 100644
--- a/metadata/md5-cache/dev-libs/libmix-2.05-r7
+++ b/metadata/md5-cache/dev-libs/libmix-2.05-r7
@@ -4,9 +4,9 @@ DESCRIPTION=Programs Crypto/Network/Multipurpose Library
 EAPI=7
 HOMEPAGE=http://mixter.void.ru/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://mixter.void.ru/libmix-205.tgz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=86a4c77c2231c092d335419d38c48b1a
+_md5_=ae96e76b0f656ac6680c23207848d47f
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.8.3 b/metadata/md5-cache/dev-libs/libtpms-0.8.3
index c4eb31e94833..395fa949152d 100644
--- a/metadata/md5-cache/dev-libs/libtpms-0.8.3
+++ b/metadata/md5-cache/dev-libs/libtpms-0.8.3
@@ -4,10 +4,10 @@ DEPEND=dev-libs/openssl:0=
 DESCRIPTION=Library providing software emultion of a TPM
 EAPI=7
 HOMEPAGE=https://github.com/stefanberger/libtpms
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~ppc
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.8.3.tar.gz -> libtpms-0.8.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4ffea00cf973e671cf10019f9222c610
+_md5_=61aa69ca7daf2eb827394a7eb3ae4353
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.8.4 b/metadata/md5-cache/dev-libs/libtpms-0.8.4
new file mode 100644
index 000000000000..30f3fd38403d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtpms-0.8.4
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/openssl:=
+DESCRIPTION=Library providing software emultion of a TPM
+EAPI=7
+HOMEPAGE=https://github.com/stefanberger/libtpms
+KEYWORDS=~amd64 ~arm64 ~ppc
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:=
+SLOT=0
+SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.8.4.tar.gz -> libtpms-0.8.4.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b6dbd3d11255161b7466724a0903b386
diff --git a/metadata/md5-cache/dev-libs/libuv-1.41.1 b/metadata/md5-cache/dev-libs/libuv-1.41.1
index 5dae11269718..0aca366b5371 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.41.1
+++ b/metadata/md5-cache/dev-libs/libuv-1.41.1
@@ -4,9 +4,9 @@ DESCRIPTION=Cross-platform asychronous I/O
 EAPI=7
 HOMEPAGE=https://github.com/libuv/libuv
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.41.1.tar.gz -> libuv-1.41.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ccb98f50dc38ba13cef6472ea20fd0dd
+_md5_=4c5c851e2ce5e10d5237fcd558a64dfa
diff --git a/metadata/md5-cache/dev-libs/libwacom-1.11 b/metadata/md5-cache/dev-libs/libwacom-1.11
new file mode 100644
index 000000000000..2124f9a7514e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libwacom-1.11
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/python-libevdev[python_targets_python3_10(-)] dev-python/pyudev[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/python-libevdev[python_targets_python3_9(-)] dev-python/pyudev[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/python-libevdev[python_targets_python3_8(-)] dev-python/pyudev[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install setup test
+DEPEND=dev-libs/glib:2 dev-libs/libgudev:=
+DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
+EAPI=8
+HOMEPAGE=https://github.com/linuxwacom/libwacom
+IUSE=doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.11/libwacom-1.11.tar.bz2
+_eclasses_=meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=771005386b03b6e1cef06eabdf0b3a09
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r4 b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r4
new file mode 100644
index 000000000000..591d8aafec73
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-danielveillard ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=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(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:= )
+DESCRIPTION=XML C parser and toolkit
+EAPI=7
+HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
+IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+LICENSE=MIT
+RDEPEND=>=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(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.12-r4-patchset.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f2c923b6cd44c4fd4d23022091a80d5b
diff --git a/metadata/md5-cache/dev-libs/libzia-4.30 b/metadata/md5-cache/dev-libs/libzia-4.30
new file mode 100644
index 000000000000..b3dff33ea9c0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzia-4.30
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
+DESCRIPTION=Platform abstraction code for tucnak package
+EAPI=7
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=ftdi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/libzia-4.30.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2da53c9a22042bae2f3ad696676d643e
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.21-r1 b/metadata/md5-cache/dev-libs/newt-0.52.21-r1
index fbdc2a7ac93b..dcf54c45ddb1 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.21-r1
+++ b/metadata/md5-cache/dev-libs/newt-0.52.21-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.pagure.org/newt/newt-0.52.21.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8be573b042b6d32b012da9979dc90d42
+_md5_=f578f20b3f276bccec674205c3595fe7
diff --git a/metadata/md5-cache/dev-libs/nss-3.68 b/metadata/md5-cache/dev-libs/nss-3.68
new file mode 100644
index 000000000000..9c1006575b1d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.68
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/nspr-4.32[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=7
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
+IUSE=cacert utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.32[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+RESTRICT=test
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_68_RTM/src/nss-3.68.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6cd75c4d63b1d5bbd72a34bbf5b1450b
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-12.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-12.0.0
new file mode 100644
index 000000000000..6d90d55e7e9a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/opencl-clang-12.0.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-util/spirv-llvm-translator-12.0.0:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-12.0.0:12=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
+DESCRIPTION=OpenCL-oriented thin wrapper library around clang
+EAPI=7
+HOMEPAGE=https://github.com/intel/opencl-clang
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=UoI-NCSA
+RDEPEND=>=dev-util/spirv-llvm-translator-12.0.0:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-12.0.0:12=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=12
+SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v12.0.0.tar.gz -> opencl-clang-12.0.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=eb41634e01133d64267b59fabb875365
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r5 b/metadata/md5-cache/dev-libs/openct-0.6.20-r5
index 4ebecdefb406..363e52c23126 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r5
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r5
@@ -5,10 +5,10 @@ DESCRIPTION=library for accessing smart card terminals
 EAPI=7
 HOMEPAGE=https://github.com/OpenSC/openct/wiki
 IUSE=doc debug pcsc-lite usb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0= acct-group/openct acct-user/openctd
 SLOT=0
 SRC_URI=mirror://sourceforge/opensc/openct/openct-0.6.20.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0a46b7ab3f66fb7c6cb4b7572f543d63
+_md5_=750f6e4b1110362423fa6280f342b787
diff --git a/metadata/md5-cache/dev-libs/opensc-0.21.0-r1 b/metadata/md5-cache/dev-libs/opensc-0.21.0-r1
index ce4dce704d63..e1e42d234d72 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.21.0-r1
+++ b/metadata/md5-cache/dev-libs/opensc-0.21.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.21.0/opensc-0.21.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6d0ca3a6890e1449d206920cbe0042f6
diff --git a/metadata/md5-cache/dev-libs/openspecfun-0.5.3 b/metadata/md5-cache/dev-libs/openspecfun-0.5.3
index e2977d95acb5..bedd44bf2ccc 100644
--- a/metadata/md5-cache/dev-libs/openspecfun-0.5.3
+++ b/metadata/md5-cache/dev-libs/openspecfun-0.5.3
@@ -8,5 +8,5 @@ LICENSE=MIT public-domain
 RDEPEND=sci-libs/openlibm:= virtual/fortran
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/openspecfun/archive/v0.5.3.tar.gz -> openspecfun-0.5.3.tar.gz
-_eclasses_=fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e92a4d59deaddaab9300b5e6318b741e
diff --git a/metadata/md5-cache/dev-libs/papi-6.0.0.1 b/metadata/md5-cache/dev-libs/papi-6.0.0.1
index 654ee6410a87..4b12f5a2ee4e 100644
--- a/metadata/md5-cache/dev-libs/papi-6.0.0.1
+++ b/metadata/md5-cache/dev-libs/papi-6.0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libpfm[static-libs] virtual/mpi virtual/fortran
 SLOT=0
 SRC_URI=http://icl.cs.utk.edu/projects/papi/downloads/papi-6.0.0.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=08b3f51cc2a5e9ef0e12be68ed20696d
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.10.0 b/metadata/md5-cache/dev-libs/qtkeychain-0.10.0
deleted file mode 100644
index f34ea75f3cfb..000000000000
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 )
-DESCRIPTION=Qt API for storing passwords securely
-EAPI=7
-HOMEPAGE=https://github.com/frankosterfeld/qtkeychain
-IUSE=gnome-keyring
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 )
-SLOT=0/1
-SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/v0.10.0.tar.gz -> qtkeychain-0.10.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=80d81e39519a93e56541583b1df77f73
diff --git a/metadata/md5-cache/dev-libs/rocclr-4.1.0 b/metadata/md5-cache/dev-libs/rocclr-4.1.0
index a6b68de7b544..e67dcf094885 100644
--- a/metadata/md5-cache/dev-libs/rocclr-4.1.0
+++ b/metadata/md5-cache/dev-libs/rocclr-4.1.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/rocm-comgr-4.1.0 >=dev-libs/rocr-runtime-4.1.0
 SLOT=0/4.1
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-4.1.0.tar.gz -> rocclr-4.1.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.1.0.tar.gz -> rocm-opencl-runtime-4.1.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0d7a7ce6f7d2b20373e0889c5dc9c79a
+_md5_=7759fa1190858641100723e587dd30b4
diff --git a/metadata/md5-cache/dev-libs/rocclr-4.2.0 b/metadata/md5-cache/dev-libs/rocclr-4.2.0
index 7de837c85f13..68ed0f301a1a 100644
--- a/metadata/md5-cache/dev-libs/rocclr-4.2.0
+++ b/metadata/md5-cache/dev-libs/rocclr-4.2.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/rocm-comgr-4.2.0 >=dev-libs/rocr-runtime-4.2.0
 SLOT=0/4.2
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-4.2.0.tar.gz -> rocclr-4.2.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-4.2.0.tar.gz -> rocm-opencl-runtime-4.2.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0d7a7ce6f7d2b20373e0889c5dc9c79a
+_md5_=7759fa1190858641100723e587dd30b4
diff --git a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1 b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
index 48ea3dfcc32b..eb2030759283 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
+++ b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) test? ( gcc-plugin? ( dev-scheme/guile ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=sci-mathematics/glpk:0= sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) test? ( gcc-plugin? ( dev-scheme/guile ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DEPEND=sci-mathematics/glpk:0= sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
 DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
-EAPI=6
+EAPI=7
 HOMEPAGE=http://starpu.gforge.inria.fr/
 IUSE=blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl spinlock-check static-libs test valgrind
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sci-mathematics/glpk:0= sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
-SLOT=0/8
+SLOT=0/5
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/37744/starpu-1.2.6.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ddeca1c80860c93748056395b156a533
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e29718546ebc6f05e147a9a65a99c83d
diff --git a/metadata/md5-cache/dev-libs/starpu-1.3.8 b/metadata/md5-cache/dev-libs/starpu-1.3.8
new file mode 100644
index 000000000000..368106e9d725
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/starpu-1.3.8
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=sci-mathematics/glpk:0= >=sys-apps/hwloc-2.3.0:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
+DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
+EAPI=7
+HOMEPAGE=https://starpu.gitlabpages.inria.fr/
+IUSE=blas cuda doc examples fftw fortran hdf5 mpi opencl opengl openmp spinlock-check static-libs test valgrind
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=sci-mathematics/glpk:0= >=sys-apps/hwloc-2.3.0:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
+SLOT=0/7
+SRC_URI=https://files.inria.fr/starpu/starpu-1.3.8/starpu-1.3.8.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cea8e8b427a254509c89f01d5cfe8836
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-0.20.0
index 5f6bea308477..87937da28030 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.20.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.20.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library.
 EAPI=7
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.20.0.tar.gz -> tree-sitter-0.20.0.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=52376048414ffd1275f1e9e1f65729b3
+_md5_=701eaeffefdf892fb1347cb1fdccc23b
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.9.5 b/metadata/md5-cache/dev-libs/uriparser-0.9.5
index 8a3ebf54c284..933ff7bac54b 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.9.5
+++ b/metadata/md5-cache/dev-libs/uriparser-0.9.5
@@ -5,11 +5,11 @@ DESCRIPTION=Strictly RFC 3986 compliant URI parsing library in C
 EAPI=7
 HOMEPAGE=https://uriparser.github.io/
 IUSE=+doc qt5 test unicode
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD
 REQUIRED_USE=qt5? ( doc ) test? ( unicode )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.5/uriparser-0.9.5.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4f637e8e0e56fa85bb26d900fdf2e381
+_md5_=e092ed3ca7d3e6f8f82cf29fad0c3944
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 80e18119a20a..29d603dfdcae 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/hyperspec-7.0-r1 b/metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
deleted file mode 100644
index 2fbe188b852d..000000000000
--- a/metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Common Lisp ANSI-standard Hyperspec
-EAPI=6
-HOMEPAGE=http://www.lispworks.com/reference/HyperSpec/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=HyperSpec
-SLOT=0
-SRC_URI=ftp://ftp.lispworks.com/pub/software_tools/reference/HyperSpec-7-0.tar.gz
-_md5_=edc2a3656882097914ab34a4b3bd11df
diff --git a/metadata/md5-cache/dev-lisp/hyperspec-7.0-r2 b/metadata/md5-cache/dev-lisp/hyperspec-7.0-r2
new file mode 100644
index 000000000000..819e5c6539fc
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/hyperspec-7.0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Common Lisp ANSI-standard Hyperspec
+EAPI=8
+HOMEPAGE=http://www.lispworks.com/reference/HyperSpec/
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=HyperSpec
+SLOT=0
+SRC_URI=ftp://ftp.lispworks.com/pub/software_tools/reference/HyperSpec-7-0.tar.gz
+_md5_=045ababdc19f7dd177ef537086976d0e
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.3.11 b/metadata/md5-cache/dev-lisp/sbcl-1.3.11
index fdb67a445120..aca95557b3a9 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.3.11
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.3.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/1.3.11
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.3.11-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.3.11-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.9-armhf-linux-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=03589b13442cea664daab62b7c77108d
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.4.9 b/metadata/md5-cache/dev-lisp/sbcl-1.4.9
index 4f61c457d883..0f4d8b19619b 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.4.9
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.4.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/1.4.9
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.4.9-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.4.8-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.12-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b54cabfe93b5de56d3cffdc3d889400b
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.0.10 b/metadata/md5-cache/dev-lisp/sbcl-2.0.10
index 0db4ccc2d7f7..46a3f5dc96f6 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.0.10
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.0.10
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.0.10
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.0.10-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.0.10-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7df4a1fc20ed9bdd5f5a0f7c735d1d62
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.0.11 b/metadata/md5-cache/dev-lisp/sbcl-2.0.11
index 0daddd83265d..31bd6732ab7f 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.0.11
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.0.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.0.11
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.0.11-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.0.11-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d2d4f96abc329ed9ab5862c629a0f706
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.1.0 b/metadata/md5-cache/dev-lisp/sbcl-2.1.0
index 4c2cca023b52..887622a91a7d 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.0
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.1.0
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.1.0-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.1.0-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=79fda7e70af057972d782e3151b60bc8
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.1.1 b/metadata/md5-cache/dev-lisp/sbcl-2.1.1
index f65b6845c74c..7f5585862650 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.1
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.1.1
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.1.1-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.1.1-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e9cbba68719bef6b250463dc4973b685
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.1.2 b/metadata/md5-cache/dev-lisp/sbcl-2.1.2
index e8228870b13c..f9efef4b918e 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.2
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.1.2
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.1.2-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.1.2-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cdfe808901f53d0fb1b3a44b806e3381
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.1.3 b/metadata/md5-cache/dev-lisp/sbcl-2.1.3
index 8f8903e9883b..110e30606a22 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.3
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.1.3
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.1.3-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.1.3-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7a00095da2c7ac5333e435cc68e9258b
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.1.4 b/metadata/md5-cache/dev-lisp/sbcl-2.1.4
index 7291f30cf7e2..5a42135350da 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.4
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.1.4
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.1.4-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.1.4-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c7abbbc5f14e8914465b8d3906241817
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.1.5 b/metadata/md5-cache/dev-lisp/sbcl-2.1.5
index ff5b271683af..7ffc0dc7cc03 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.5
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.1.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.1.5
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.1.5-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.1.5-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=113d8c9a28981d464e177795385395ab
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
index 1fa73bd62808..af6c43e7ade5 100644
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
+++ b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
@@ -5,7 +5,7 @@ DESCRIPTION=Bit Operations Library for the Lua Programming Language
 EAPI=7
 HOMEPAGE=http://bitop.luajit.org
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua	2afa2308593141ae89672d1c2b96f9e8	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c47fd5aa00963ca789ad03fd6018efad
+_md5_=da521e3ffac62569b0c98dce6b00ce59
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index ff2a3216293b..591928ada85a 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 8bcee59016a0..333116e267ec 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.10 b/metadata/md5-cache/dev-ml/labltk-8.06.10
index e79a833fc531..fc0425929d7e 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.10
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.10
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[
 SLOT=0/8.06.10
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.10.tar.gz -> labltk-8.06.10.tar.gz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
-_md5_=0f521f98630df1ac61c2e220f05d8783
+_md5_=bd18ffcba3e130203c43457c322db736
diff --git a/metadata/md5-cache/dev-ml/mtime-1.2.0 b/metadata/md5-cache/dev-ml/mtime-1.2.0
new file mode 100644
index 000000000000..60a66dd8bcf3
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/mtime-1.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/opam-installer dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:=
+DESCRIPTION=OCaml module to access monotonic wall-clock time
+EAPI=7
+HOMEPAGE=https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=ISC
+RDEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
+SLOT=0/1.2.0
+SRC_URI=https://erratique.ch/software/mtime/releases/mtime-1.2.0.tbz
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
+_md5_=957c3c7cc5a87d8554ee54eb4d131469
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.9 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
new file mode 100644
index 000000000000..5a6e039d3d71
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/cppo virtual/pkgconfig
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Modules for OCaml application-level Internet protocols
+EAPI=7
+HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
+IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip ocamlopt
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=ZLIB GPL-2+
+RDEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) dev-lang/ocaml:=[ocamlopt?]
+RESTRICT=installsources strip
+SLOT=0/4.1.9
+SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.9.tar.gz
+_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_md5_=933316bc7f0b62c4cf18d59291a2f0fe
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.1.3 b/metadata/md5-cache/dev-ml/opam-file-format-2.1.3
new file mode 100644
index 000000000000..00dfdd516fa4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.1.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=test? ( dev-ml/alcotest ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Parser and printer for the opam file syntax
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/opam-file-format
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/2.1.3
+SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.1.3.tar.gz -> opam-file-format-2.1.3.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=44f33a6bee8abd5eea17d0ae37525906
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-5.2.1 b/metadata/md5-cache/dev-ml/ppx_deriving-5.2.1
new file mode 100644
index 000000000000..d0c160349d13
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_deriving-5.2.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= >=dev-ml/ppxlib-0.20.0:= dev-ml/result:= dev-ml/cppo test? ( dev-ml/ounit2 ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Type-driven code generation for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-ppx/ppx_deriving
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= >=dev-ml/ppxlib-0.20.0:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/5.2.1
+SRC_URI=https://github.com/ocaml-ppx/ppx_deriving/archive/v5.2.1.tar.gz -> ppx_deriving-5.2.1.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=1328462542636ee99d013bae80449aca
diff --git a/metadata/md5-cache/dev-ml/ppx_expect-0.14.1 b/metadata/md5-cache/dev-ml/ppx_expect-0.14.1
new file mode 100644
index 000000000000..2d64e509e315
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.14.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/re:= test? ( dev-ml/ppx_jane ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Cram like framework for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_expect
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.14.1.tar.gz -> ppx_expect-0.14.1.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=81365aad4c7f10f2353c48794bc72eec
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
index 548a3a583726..efa9df519d89 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
@@ -1,14 +1,14 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.22:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=Support Library for type-driven code generators
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.22:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz -> ppx_sexp_conv-0.14.1.tar.gz
 _eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
-_md5_=87764ab47113c3c3f300648c75b9ec09
+_md5_=ea84fe064b80adb9ec181f8eaf49a11d
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
new file mode 100644
index 000000000000..29a30ab055c9
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Support Library for type-driven code generators
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.3
+SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.3.tar.gz -> ppx_sexp_conv-0.14.3.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=33b2116948276e1bcafb5752d96f79ef
diff --git a/metadata/md5-cache/dev-perl/Alien-GMP-1.160.0 b/metadata/md5-cache/dev-perl/Alien-GMP-1.160.0
index 911be479e494..78dabc06ee5a 100644
--- a/metadata/md5-cache/dev-perl/Alien-GMP-1.160.0
+++ b/metadata/md5-cache/dev-perl/Alien-GMP-1.160.0
@@ -5,11 +5,11 @@ DESCRIPTION=Alien package for the GNU Multiple Precision library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Alien-GMP
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~mips ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-Build-1.460.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.16.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=88a9da947ce62c91a51c3040995c49d1
+_md5_=a195b6a8a1a7d330736aa63982d7ee3a
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.260.0 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.260.0
index 00666675690e..c7122c616108 100644
--- a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.260.0
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.260.0
@@ -5,11 +5,11 @@ DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Cpanel-JSON-XS
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.160.0 virtual/perl-Carp >=virtual/perl-Encode-1.980.100 virtual/perl-Exporter virtual/perl-XSLoader >=virtual/perl-podlators-2.80.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.26.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=5097546b3513e78d4ffbf857b0b50099
+_md5_=f0f4b083e917afed4e30639b4e8abcc1
diff --git a/metadata/md5-cache/dev-perl/Crypt-RC4-2.20.0-r2 b/metadata/md5-cache/dev-perl/Crypt-RC4-2.20.0-r2
index 9f894af74bd7..b7c30d47c404 100644
--- a/metadata/md5-cache/dev-perl/Crypt-RC4-2.20.0-r2
+++ b/metadata/md5-cache/dev-perl/Crypt-RC4-2.20.0-r2
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Implements the RC4 encryption algorithm
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-RC4
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIFUKURT/Crypt-RC4-2.02.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=5d1f436e13cf84b08ad7a6e04ae40e2a
+_md5_=b9cf1b264861e641b96cbda3c2d09284
diff --git a/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0-r1 b/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0-r1
index 8717585c33c3..392d60a01051 100644
--- a/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0-r1
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Pure perl implementation of MD5
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Digest-Perl-MD5
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) RSA
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DELTA/Digest-Perl-MD5-1.9.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=a9a477571f965f8f55292a2128338aa9
+_md5_=84e0da810a265e18fef9db77e8821d72
diff --git a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r2 b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r2
index 81f78a5d6d23..a2c2fd61a882 100644
--- a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r2
+++ b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension providing access to the GSSAPIv2 library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/GSSAPI
 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 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/krb5 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=eac2b9dedc66eac1bfb31ad887d06d82
+_md5_=37f9b4ec8153ad1dbef60150901ec190
diff --git a/metadata/md5-cache/dev-perl/IO-stringy-2.113.0 b/metadata/md5-cache/dev-perl/IO-stringy-2.113.0
index 77506ca27c90..fa1ae3df9c9f 100644
--- a/metadata/md5-cache/dev-perl/IO-stringy-2.113.0
+++ b/metadata/md5-cache/dev-perl/IO-stringy-2.113.0
@@ -5,11 +5,11 @@ DESCRIPTION=I/O on in-core objects like strings and arrays
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Stringy
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPOEIRAB/IO-Stringy-2.113.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=3aef7244bdf578792ff9709d097392a0
+_md5_=2009d68cb3e77fd10de1c58a411bd279
diff --git a/metadata/md5-cache/dev-perl/Inline-C-0.810.0 b/metadata/md5-cache/dev-perl/Inline-C-0.810.0
index 2485cdd52ebe..e5279d8abf79 100644
--- a/metadata/md5-cache/dev-perl/Inline-C-0.810.0
+++ b/metadata/md5-cache/dev-perl/Inline-C-0.810.0
@@ -5,11 +5,11 @@ DESCRIPTION=C Language Support for Inline
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Inline-C
 IUSE=test test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-7 >=virtual/perl-File-Spec-0.800.0 >=dev-perl/Inline-0.830.0 >=dev-perl/Parse-RecDescent-1.967.9 >=dev-perl/Pegex-0.660.0 !<dev-perl/Inline-0.510.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.81.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=72b843a96845e5b433e9bbbccca4f02f
+_md5_=90238dfafdc4420eb99b1fd8b6700a3a
diff --git a/metadata/md5-cache/dev-perl/Jcode-2.70.0-r2 b/metadata/md5-cache/dev-perl/Jcode-2.70.0-r2
index ac814ebf1131..2f6e1349cf5f 100644
--- a/metadata/md5-cache/dev-perl/Jcode-2.70.0-r2
+++ b/metadata/md5-cache/dev-perl/Jcode-2.70.0-r2
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Japanese transcoding module for Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Jcode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2.1 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Jcode-2.07.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=04218b0e53a4466a5f71dba0f3ec7d83
+_md5_=b8341bbddbdbbe4193b75e42f4d5e455
diff --git a/metadata/md5-cache/dev-perl/Lab-Measurement-3.762 b/metadata/md5-cache/dev-perl/Lab-Measurement-3.762
new file mode 100644
index 000000000000..741a5d14e754
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lab-Measurement-3.762
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex dev-perl/Math-Round >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 dev-perl/MooseX-StrictConstructor >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes dev-perl/Time-Monotonic virtual/perl-Time-Piece >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-perl/Lab-VXI11 dev-perl/USB-TMC virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Slurper virtual/perl-File-Temp dev-perl/Test-Fatal dev-perl/Test-File virtual/perl-Test-Simple dev-perl/Text-Diff dev-perl/aliased ) dev-lang/perl
+DESCRIPTION=Measurement control and automation with Perl
+EAPI=7
+HOMEPAGE=https://www.labmeasurement.de
+IUSE=test examples
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex dev-perl/Math-Round >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 dev-perl/MooseX-StrictConstructor >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes dev-perl/Time-Monotonic virtual/perl-Time-Piece >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-perl/Lab-VXI11 dev-perl/USB-TMC dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AK/AKHUETTEL/Lab-Measurement-3.762.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
+_md5_=74e69c789aba93166edeb8c0b1f68990
diff --git a/metadata/md5-cache/dev-perl/Lab-Measurement-9999 b/metadata/md5-cache/dev-perl/Lab-Measurement-9999
index 3a751d68597d..c26a42031709 100644
--- a/metadata/md5-cache/dev-perl/Lab-Measurement-9999
+++ b/metadata/md5-cache/dev-perl/Lab-Measurement-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 dev-perl/MooseX-StrictConstructor >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes dev-perl/Time-Monotonic virtual/perl-Time-Piece >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-perl/Lab-VXI11 dev-perl/USB-TMC virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Slurper virtual/perl-File-Temp dev-perl/Test-Fatal dev-perl/Test-File virtual/perl-Test-Simple dev-perl/Text-Diff dev-perl/aliased ) dev-perl/Dist-Zilla dev-perl/Dist-Zilla-Plugin-Git dev-perl/Dist-Zilla-Plugin-PodWeaver dev-perl/Dist-Zilla-Plugin-AuthorsFromGit dev-lang/perl
+DEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex dev-perl/Math-Round >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 dev-perl/MooseX-StrictConstructor >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes dev-perl/Time-Monotonic virtual/perl-Time-Piece >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-perl/Lab-VXI11 dev-perl/USB-TMC virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Slurper virtual/perl-File-Temp dev-perl/Test-Fatal dev-perl/Test-File virtual/perl-Test-Simple dev-perl/Text-Diff dev-perl/aliased ) dev-perl/Dist-Zilla dev-perl/Dist-Zilla-Plugin-Git dev-perl/Dist-Zilla-Plugin-PodWeaver dev-perl/Dist-Zilla-Plugin-AuthorsFromGit dev-perl/Dist-Zilla-Plugin-RPM dev-lang/perl
 DESCRIPTION=Measurement control and automation with Perl
 EAPI=7
 HOMEPAGE=https://www.labmeasurement.de
 IUSE=test examples
 LICENSE=|| ( Artistic GPL-1+ )
 PROPERTIES=live
-RDEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 dev-perl/MooseX-StrictConstructor >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes dev-perl/Time-Monotonic virtual/perl-Time-Piece >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-perl/Lab-VXI11 dev-perl/USB-TMC dev-lang/perl:=
+RDEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex dev-perl/Math-Round >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 dev-perl/MooseX-StrictConstructor >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes dev-perl/Time-Monotonic virtual/perl-Time-Piece >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-perl/Lab-VXI11 dev-perl/USB-TMC dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d3b7b5cdb9eef8829534b7e9fb5ba6c3
+_md5_=69d3e5c21e80f1104077a639f33af978
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index f81c3ddddb30..02d945ace909 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Math-GMP-2.200.0 b/metadata/md5-cache/dev-perl/Math-GMP-2.200.0
index b7c6fb9562ae..82702b5c6128 100644
--- a/metadata/md5-cache/dev-perl/Math-GMP-2.200.0
+++ b/metadata/md5-cache/dev-perl/Math-GMP-2.200.0
@@ -5,11 +5,11 @@ DESCRIPTION=High speed arbitrary size integer math
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Math-GMP
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~mips ppc x86
 LICENSE=LGPL-2
 RDEPEND=virtual/perl-AutoLoader virtual/perl-Carp virtual/perl-Exporter dev-libs/gmp:0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b13f65790c3eb54847950603e6a9b242
+_md5_=160b4ab27e683cab798be6d0be8003db
diff --git a/metadata/md5-cache/dev-perl/Math-Round-0.70.0 b/metadata/md5-cache/dev-perl/Math-Round-0.70.0
index f847304f11f9..944f2743ca8d 100644
--- a/metadata/md5-cache/dev-perl/Math-Round-0.70.0
+++ b/metadata/md5-cache/dev-perl/Math-Round-0.70.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=Perl extension for rounding numbers
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Math-Round
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GROMMEL/Math-Round-0.07.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c0e5bfa1e0c52b164b6bbc7d8a85d1c5
+_md5_=086b80cab8ba4d31ce9859ee4436bbea
diff --git a/metadata/md5-cache/dev-perl/Mojolicious-8.580.0 b/metadata/md5-cache/dev-perl/Mojolicious-8.580.0
index f6c908ba97ef..8726e056a2d7 100644
--- a/metadata/md5-cache/dev-perl/Mojolicious-8.580.0
+++ b/metadata/md5-cache/dev-perl/Mojolicious-8.580.0
@@ -5,11 +5,11 @@ DESCRIPTION=Real-time web framework
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Mojolicious
 IUSE=test minimal examples
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ppc64 x86
 LICENSE=Artistic-2
 RDEPEND=!minimal? ( >=dev-perl/Cpanel-JSON-XS-4.90.0 >=dev-perl/EV-4.0.0 ) >=virtual/perl-IO-Socket-IP-0.370.0 >=virtual/perl-Scalar-List-Utils-1.410.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.58.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=877d1e5bb3599dde9466802c0a1a68ac
+_md5_=169fa31ea6c5526a2d304fbf4acce80b
diff --git a/metadata/md5-cache/dev-perl/MooX-late-0.100.0 b/metadata/md5-cache/dev-perl/MooX-late-0.100.0
index 632c9dc7eb45..364ee32e570f 100644
--- a/metadata/md5-cache/dev-perl/MooX-late-0.100.0
+++ b/metadata/md5-cache/dev-perl/MooX-late-0.100.0
@@ -5,11 +5,11 @@ DESCRIPTION=Easily translate Moose code to Moo
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/MooX-late
 IUSE=test examples
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~hppa ~ppc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moo-2.0.0 >=dev-perl/Sub-HandlesVia-0.13.0 >=dev-perl/Type-Tiny-1.0.1 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.100.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=c19162e11bd04aa761d6153ab86cb384
+_md5_=02448cae2318457fc02ce2221670680a
diff --git a/metadata/md5-cache/dev-perl/Moose-2.201.400 b/metadata/md5-cache/dev-perl/Moose-2.201.400
index 4f3f46f43d51..a9e5f6d6cafd 100644
--- a/metadata/md5-cache/dev-perl/Moose-2.201.400
+++ b/metadata/md5-cache/dev-perl/Moose-2.201.400
@@ -4,11 +4,11 @@ DESCRIPTION=A postmodern object system for Perl 5
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Moose
 IUSE=test examples
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/Catalyst-5.900.499.990 !<=dev-perl/Config-MVP-2.200.4 !<=dev-perl/Devel-REPL-1.3.20 !<=dev-perl/Dist-Zilla-5.43.0 !<=dev-perl/Dist-Zilla-Plugin-Git-2.16.0 !<=dev-perl/Fey-0.360.0 !<=dev-perl/Fey-ORM-0.420.0 !<=dev-perl/File-ChangeNotify-0.150.0 !<=dev-perl/HTTP-Throwable-0.17.0 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160.0 !<=dev-perl/Mason-2.180.0 !<=dev-perl/Moose-Autobox-0.150.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80.0 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-App-1.220.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.3 !<=dev-perl/MooseX-Attribute-Prototype-0.100.0 !<=dev-perl/MooseX-AttributeHelpers-0.220.0 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20.0 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.260.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.21.0 !<=dev-perl/MooseX-Declare-0.350.0 !<=dev-perl/MooseX-FollowPBP-0.20.0 !<=dev-perl/MooseX-Getopt-0.560.0 !<=dev-perl/MooseX-InstanceTracking-0.40.0 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Method-Signatures-0.440.0 !<=dev-perl/MooseX-MethodAttributes-0.220.0 !<=dev-perl/MooseX-NonMoose-0.240.0 !<=dev-perl/MooseX-Object-Pluggable-0.1.100 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50.0 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60.0 !<=dev-perl/MooseX-Role-Parameterized-1.0.0 !<=dev-perl/MooseX-Role-WithOverloading-0.140.0 !<=dev-perl/MooseX-Runnable-0.30.0 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.473 !<=dev-perl/MooseX-Singleton-0.250.0 !<=dev-perl/MooseX-SlurpyConstructor-1.100.0 !<=dev-perl/MooseX-Storage-0.420.0 !<=dev-perl/MooseX-StrictConstructor-0.120.0 !<=dev-perl/MooseX-Traits-0.110.0 !<=dev-perl/MooseX-Types-0.190.0 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Set-Object-0.30.0 !<=dev-perl/MooseX-Types-Signal-1.101.930 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Pod-Weaver-3.101.638 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/Test-CleanNamespaces-0.30.0 !<=dev-perl/Test-Moose-More-0.22.0 !<=dev-perl/Test-TempDir-0.50.0 !<=dev-perl/Throwable-0.102.80 !<=dev-perl/namespace-autoclean-0.80.0 >=virtual/perl-Carp-1.220.0 >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Data-OptList-0.110.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Devel-OverloadInfo-0.5.0 >=dev-perl/Devel-StackTrace-2.30.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Eval-Closure-0.40.0 >=dev-perl/MRO-Compat-0.50.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Module-Runtime-Conflicts-0.2.0 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Sub-Exporter-0.980.0 >=dev-perl/Sub-Name-0.200.0 >=dev-perl/Try-Tiny-0.170.0 >=virtual/perl-parent-0.223.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2014.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=cf46a2bac22a1d1ddb05ec8e750905b9
+_md5_=b7d12f6078b588c41ddfc99438c65cea
diff --git a/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.220.0 b/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.220.0
index 176e6635563d..3c13719861e9 100644
--- a/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.220.0
+++ b/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.220.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for merging IPv4 or IPv6 CIDR addresses
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Net-CIDR-Lite
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STIGTSP/Net-CIDR-Lite-0.22.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=60301825089840f504f11ce1b261a5c8
+_md5_=02273cb98521293c34658cafddb50cb6
diff --git a/metadata/md5-cache/dev-perl/Net-DBus-1.1.0-r1 b/metadata/md5-cache/dev-perl/Net-DBus-1.1.0-r1
index f9e4fbc91073..5d7093a58217 100644
--- a/metadata/md5-cache/dev-perl/Net-DBus-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-DBus-1.1.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for the DBus message system
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Net-DBus
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-apps/dbus virtual/perl-Time-HiRes dev-perl/XML-Twig dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.1.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=baceade73235c5c2ef7d91563d582e66
+_md5_=0218323e844633e6c6e519f45804ece1
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-1.230.0 b/metadata/md5-cache/dev-perl/Net-DNS-1.230.0
index cc52013f5ba4..c8996a9d66c3 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-1.230.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-1.230.0
@@ -4,7 +4,7 @@ DESCRIPTION=Perl Interface to the Domain Name System
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Net-DNS
 IUSE=test minimal examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=!minimal? ( >=dev-perl/Net-DNS-SEC-1.30.0 )
 RDEPEND=>=dev-perl/Digest-HMAC-1.30.0 >=virtual/perl-Digest-MD5-2.130.0 >=virtual/perl-Digest-SHA-5.230.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.130.0 >=virtual/perl-Time-Local-1.190.0 >=virtual/perl-IO-Socket-IP-0.380.0 >=virtual/perl-IO-1.050 !minimal? ( >=dev-perl/Digest-BubbleBabble-0.10.0 >=dev-perl/Net-LibIDN2-1.0.0 ) dev-lang/perl:=
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.23.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=330649d45d8b7bb779ffad93dce82342
+_md5_=d1689f4e67b8e36614c6db691b3d3a22
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.160.0 b/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.160.0
index e34121459a7f..242ccc7dc030 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.160.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.160.0
@@ -4,11 +4,11 @@ DESCRIPTION=DNSSEC extensions to Net::DNS
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Net-DNS-SEC
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.110.0 >=dev-perl/Net-DNS-1.10.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-1.16.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=4ac3112e9b4dc095feed74247a985bf6
+_md5_=de541ddff281baf3409da3271da79497
diff --git a/metadata/md5-cache/dev-perl/Net-HTTP-6.210.0 b/metadata/md5-cache/dev-perl/Net-HTTP-6.210.0
index dfe71f08cb9d..8980019175da 100644
--- a/metadata/md5-cache/dev-perl/Net-HTTP-6.210.0
+++ b/metadata/md5-cache/dev-perl/Net-HTTP-6.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=Low-level HTTP connection (client)
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Net-HTTP
 IUSE=minimal test
-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-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( virtual/perl-IO-Socket-IP dev-perl/IO-Socket-INET6 >=dev-perl/IO-Socket-SSL-2.12.0 ) virtual/perl-Carp !<dev-perl/libwww-perl-6 virtual/perl-Compress-Raw-Zlib virtual/perl-IO virtual/perl-IO-Compress dev-perl/URI dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c357e4a7e72555dc662b048471f9ae65
+_md5_=54c89d695db5fc7fe8cf3568d447971e
diff --git a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0 b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0
deleted file mode 100644
index 6eafd8dd1460..000000000000
--- a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Unicode-Normalize virtual/perl-ExtUtils-CBuilder >=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-NoWarnings ) dev-lang/perl
-DESCRIPTION=Internationalizing Domain Names in Applications (IDNA)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-IDN-Encode
-IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Unicode-Normalize dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=63120bea9407387413b6a12bbd71fb29
diff --git a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.500.0 b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.500.0
deleted file mode 100644
index 0f86c4372f20..000000000000
--- a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.500.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Unicode-Normalize virtual/perl-ExtUtils-CBuilder >=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-NoWarnings ) dev-lang/perl
-DESCRIPTION=Internationalizing Domain Names in Applications (IDNA)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-IDN-Encode
-IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Unicode-Normalize dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.500.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=52345f45c0236a8b88a508fda6705fdc
diff --git a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.500.0-r1 b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.500.0-r1
new file mode 100644
index 000000000000..4e2c7b2839dd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.500.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Unicode-Normalize virtual/perl-ExtUtils-CBuilder >=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-NoWarnings ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Internationalizing Domain Names in Applications (IDNA)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-IDN-Encode
+IUSE=test examples
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Unicode-Normalize dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.500.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=87241ebf667b65af5f75122791bebc24
diff --git a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200 b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
new file mode 100644
index 000000000000..46c435b661f9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-IO dev-perl/Parse-RecDescent virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl extension for simple IMAP account handling
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-IMAP-Simple
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-IO dev-perl/Parse-RecDescent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JE/JETTERO/Net-IMAP-Simple-1.2212.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=9a348b6b85cf206d710b07bc16db31bb
diff --git a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1 b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
deleted file mode 100644
index 2fda00c130fb..000000000000
--- a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/IO-Socket-SSL dev-perl/Net-IMAP-Simple dev-lang/perl:=[-build(-)]
-DESCRIPTION=SSL support for Net::IMAP::Simple
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Net-IMAP-Simple-SSL
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/IO-Socket-SSL dev-perl/Net-IMAP-Simple dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CW/CWEST/Net-IMAP-Simple-SSL-1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a1c01d68695984c5c447d69afa2ff986
diff --git a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r2 b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r2
new file mode 100644
index 000000000000..6b09dbce214a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/IO-Socket-SSL dev-perl/Net-IMAP-Simple dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=SSL support for Net::IMAP::Simple
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-IMAP-Simple-SSL
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/IO-Socket-SSL dev-perl/Net-IMAP-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CW/CWEST/Net-IMAP-Simple-SSL-1.3.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=8c953e14bf6d8472290ee402c59dacb1
diff --git a/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1 b/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
deleted file mode 100644
index 0c6af34dfef3..000000000000
--- a/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl extension for manipulating IPv4/IPv6 addresses
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Net-IP
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c27e45be6f972a4d3f9b902a89ccde40
diff --git a/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r2 b/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r2
new file mode 100644
index 000000000000..4b458be4522e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl extension for manipulating IPv4/IPv6 addresses
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-IP
+IUSE=test
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=bb58a09ad3dfe27f488a5e03978d2941
diff --git a/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0 b/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
deleted file mode 100644
index 93fc85b39c11..000000000000
--- a/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Minimal functions from Net::IP
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Net-IP-Minimal
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Net-IP-Minimal-0.06.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3ee068f7756a85741892a7954589129f
diff --git a/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0-r1 b/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0-r1
new file mode 100644
index 000000000000..832dd02e17f9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl
+DESCRIPTION=Minimal functions from Net::IP
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-IP-Minimal
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Net-IP-Minimal-0.06.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=5454c643c0445400185899f331fbbe33
diff --git a/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0 b/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
deleted file mode 100644
index bbbad399cd00..000000000000
--- a/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl extension for manipulating IPv4 addresses
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Net-IPv4Addr
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FR/FRAJULAC/Net-IPv4Addr-0.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a6e82f076c8705f2aa1085ff15174d2
diff --git a/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0-r1 b/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0-r1
new file mode 100644
index 000000000000..3ec0b8f1c5d1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl extension for manipulating IPv4 addresses
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-IPv4Addr
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FR/FRAJULAC/Net-IPv4Addr-0.10.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=79bd46e2625f4ba024e0e7632149f5f3
diff --git a/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1 b/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
deleted file mode 100644
index 95a91583d50a..000000000000
--- a/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl IRC module
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Net-IRC
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86
-LICENSE=Artistic
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AP/APEIRON/Net-IRC-0.79.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cc8d51550d1e9f5585b7009c1c700907
diff --git a/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r2 b/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r2
new file mode 100644
index 000000000000..9428a95e0642
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl IRC module
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-IRC
+IUSE=test
+KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86
+LICENSE=Artistic
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AP/APEIRON/Net-IRC-0.79.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=57d4271b2ce332544d791b349b2ceffb
diff --git a/metadata/md5-cache/dev-perl/Net-IRR-0.80.0-r1 b/metadata/md5-cache/dev-perl/Net-IRR-0.80.0-r1
deleted file mode 100644
index 08c86a9bad32..000000000000
--- a/metadata/md5-cache/dev-perl/Net-IRR-0.80.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/perl-IO dev-lang/perl
-DESCRIPTION=Internet Route Registry daemon (IRRd) client
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-IRR
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-IO dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TC/TCAINE/Net-IRR-0.08.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8eb5c252f8b18d96276916840ead678a
diff --git a/metadata/md5-cache/dev-perl/Net-IRR-0.80.0-r2 b/metadata/md5-cache/dev-perl/Net-IRR-0.80.0-r2
new file mode 100644
index 000000000000..25fa84388cd9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-IRR-0.80.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker virtual/perl-IO dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Internet Route Registry daemon (IRRd) client
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-IRR
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TC/TCAINE/Net-IRR-0.08.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=c733be86be2d9aad0318ed7177129663
diff --git a/metadata/md5-cache/dev-perl/Net-Ident-1.250.0 b/metadata/md5-cache/dev-perl/Net-Ident-1.250.0
new file mode 100644
index 000000000000..00acf14c3120
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Ident-1.250.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Socket virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-IO virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=lookup the username on the remote end of a TCP/IP connection
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Ident
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Socket dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Net-Ident-1.25.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=ade1dff0a52a1cf4786eca2256dc2ef2
diff --git a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1 b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
deleted file mode 100644
index 70a533bebba9..000000000000
--- a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/XML-Stream dev-perl/Net-XMPP dev-perl/Digest-SHA1 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Jabber Perl library
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Net-Jabber
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/XML-Stream dev-perl/Net-XMPP dev-perl/Digest-SHA1 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RE/REATMON/Net-Jabber-2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8f8269aa1bd135ba2eaa0c0677370e1c
diff --git a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2 b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2
index 19f28d55cb7d..1cb030a86d97 100644
--- a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Jabber Perl library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Net-Jabber
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-Stream dev-perl/Net-XMPP dev-perl/Digest-SHA1 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REATMON/Net-Jabber-2.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=20de8a7b73da0220563199d0a693487f
+_md5_=40433a1e044ff544109846f5d238f243
diff --git a/metadata/md5-cache/dev-perl/Net-LDAP-Server-0.430.0-r1 b/metadata/md5-cache/dev-perl/Net-LDAP-Server-0.430.0-r1
deleted file mode 100644
index 69c6540252c6..000000000000
--- a/metadata/md5-cache/dev-perl/Net-LDAP-Server-0.430.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/perl-ldap dev-perl/Convert-ASN1 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=LDAP server side protocol handling
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-LDAP-Server
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/perl-ldap dev-perl/Convert-ASN1 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=02c83bc381bf57277bbc9c7235143968
diff --git a/metadata/md5-cache/dev-perl/Net-LDAP-Server-0.430.0-r2 b/metadata/md5-cache/dev-perl/Net-LDAP-Server-0.430.0-r2
new file mode 100644
index 000000000000..a2d0569aecca
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-LDAP-Server-0.430.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/perl-ldap dev-perl/Convert-ASN1 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=LDAP server side protocol handling
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-LDAP-Server
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/perl-ldap dev-perl/Convert-ASN1 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=e4b7d92fcf289356284476447730b9c3
diff --git a/metadata/md5-cache/dev-perl/Net-LDAPapi-3.0.7 b/metadata/md5-cache/dev-perl/Net-LDAPapi-3.0.7
new file mode 100644
index 000000000000..adecc03581a1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-LDAPapi-3.0.7
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-nds/openldap[sasl] dev-libs/cyrus-sasl >=dev-perl/Convert-ASN1-0.190.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DESCRIPTION=Perl5 Module Supporting LDAP API
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/net-ldapapi/ http://search.cpan.org/~mishikal/Net-LDAPapi/
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=net-nds/openldap[sasl] dev-libs/cyrus-sasl >=dev-perl/Convert-ASN1-0.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MISHIKAL/Net-LDAPapi-3.0.7.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2645f981fb59b5865ffba2613bbbc9cf
diff --git a/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r2 b/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r2
deleted file mode 100644
index 46309471fe7d..000000000000
--- a/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-dns/libidn:0= dev-lang/perl
-DESCRIPTION=Perl bindings for GNU Libidn
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-LibIDN
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=net-dns/libidn:0= dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN-0.12.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c450133af1931436f50b1c393b928092
diff --git a/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r3 b/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r3
new file mode 100644
index 000000000000..fe5f9ee8bd20
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=net-dns/libidn:0= dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-dns/libidn:0= dev-lang/perl
+DESCRIPTION=Perl bindings for GNU Libidn
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-LibIDN
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=net-dns/libidn:0= dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN-0.12.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=c1cf1a12a9c9298f213438e1aadfe8f2
diff --git a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0-r1 b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0-r1
deleted file mode 100644
index 82d10589f6c4..000000000000
--- a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-dns/libidn2:= virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-ParseXS dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.10.0 ) dev-lang/perl
-DESCRIPTION=Perl bindings for GNU Libidn2
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-LibIDN2
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=net-dns/libidn2:= dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN2-1.00.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ba241c2e5440260f6fbda7f59d74f853
diff --git a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0-r2 b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0-r2
index 489daa38c2d2..968d728ba6f6 100644
--- a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Perl bindings for GNU Libidn2
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Net-LibIDN2
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-dns/libidn2:= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN2-1.00.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=84012153887a1617d4b9de88bf6beddb
+_md5_=6ab1c326ee33e3e0419aa0066d5439ff
diff --git a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.10.0 b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.10.0
new file mode 100644
index 000000000000..2ffb0a69e710
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.10.0
@@ -0,0 +1,15 @@
+BDEPEND=net-dns/libidn2:= dev-perl/Module-Build virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-ParseXS dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.10.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-dns/libidn2:= dev-lang/perl
+DESCRIPTION=Perl bindings for GNU Libidn2
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-LibIDN2
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=net-dns/libidn2:= dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN2-1.01.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=68d02dfc08d146f076a30ebcb6e4ca48
diff --git a/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1 b/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
deleted file mode 100644
index 0029f367ca91..000000000000
--- a/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Class-Accessor-0.31 >=dev-perl/Class-Data-Inheritable-0.06 dev-perl/Digest-HMAC dev-perl/URI virtual/perl-Digest-SHA >=virtual/perl-Encode-2.35 dev-perl/libwww-perl dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.66 >=dev-perl/Test-Warn-0.21 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=OAuth protocol support
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Net-OAuth
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Class-Accessor-0.31 >=dev-perl/Class-Data-Inheritable-0.06 dev-perl/Digest-HMAC dev-perl/URI virtual/perl-Digest-SHA >=virtual/perl-Encode-2.35 dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fa9831222996d9b891a8bfe3e5d57d25
diff --git a/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r2 b/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r2
new file mode 100644
index 000000000000..2e2fa6a3e29c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Class-Accessor-0.31 >=dev-perl/Class-Data-Inheritable-0.06 dev-perl/Digest-HMAC dev-perl/URI virtual/perl-Digest-SHA >=virtual/perl-Encode-2.35 dev-perl/libwww-perl dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.66 >=dev-perl/Test-Warn-0.21 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=OAuth protocol support
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-OAuth
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Class-Accessor-0.31 >=dev-perl/Class-Data-Inheritable-0.06 dev-perl/Digest-HMAC dev-perl/URI virtual/perl-Digest-SHA >=virtual/perl-Encode-2.35 dev-perl/libwww-perl dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=28b7e1e9c3a71a948a9c7825402acb0a
diff --git a/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0 b/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0
deleted file mode 100644
index cb1193f5ee22..000000000000
--- a/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Crypt-DH-GMP-0.0.110 virtual/perl-Encode >=dev-perl/HTML-Parser-3.400.0 >=dev-perl/HTTP-Message-5.814.0 virtual/perl-MIME-Base64 virtual/perl-Math-BigInt virtual/perl-Time-Local dev-perl/XML-Simple !<dev-perl/Net-OpenID-Consumer-1.30.99 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Libraries shared between Net::OpenID::Consumer and Net::OpenID::Server
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-OpenID-Common
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Crypt-DH-GMP-0.0.110 virtual/perl-Encode >=dev-perl/HTML-Parser-3.400.0 >=dev-perl/HTTP-Message-5.814.0 virtual/perl-MIME-Base64 virtual/perl-Math-BigInt virtual/perl-Time-Local dev-perl/XML-Simple !<dev-perl/Net-OpenID-Consumer-1.30.99 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Common-1.20.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=afac89ffc91ca82bd114e8aca590ae08
diff --git a/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0-r1 b/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0-r1
new file mode 100644
index 000000000000..a6a19f793c0e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Crypt-DH-GMP-0.0.110 virtual/perl-Encode >=dev-perl/HTML-Parser-3.400.0 >=dev-perl/HTTP-Message-5.814.0 virtual/perl-MIME-Base64 virtual/perl-Math-BigInt virtual/perl-Time-Local dev-perl/XML-Simple !<dev-perl/Net-OpenID-Consumer-1.30.99 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Libraries shared between Net::OpenID::Consumer and Net::OpenID::Server
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-OpenID-Common
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Crypt-DH-GMP-0.0.110 virtual/perl-Encode >=dev-perl/HTML-Parser-3.400.0 >=dev-perl/HTTP-Message-5.814.0 virtual/perl-MIME-Base64 virtual/perl-Math-BigInt virtual/perl-Time-Local dev-perl/XML-Simple !<dev-perl/Net-OpenID-Consumer-1.30.99 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Common-1.20.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=5b120f639474d95f328895e9f7bc542d
diff --git a/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0 b/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0
deleted file mode 100644
index dbebbd364809..000000000000
--- a/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/JSON dev-perl/libwww-perl virtual/perl-MIME-Base64 >=dev-perl/Net-OpenID-Common-1.190.0 virtual/perl-Storable virtual/perl-Time-Local virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/CGI virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Library for consumers of OpenID identities
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-OpenID-Consumer
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/JSON dev-perl/libwww-perl virtual/perl-MIME-Base64 >=dev-perl/Net-OpenID-Common-1.190.0 virtual/perl-Storable virtual/perl-Time-Local dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Consumer-1.18.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=dc4b90f429826d9556753e0cece37b83
diff --git a/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0-r1 b/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0-r1
new file mode 100644
index 000000000000..3cb9a74d0619
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/JSON dev-perl/libwww-perl virtual/perl-MIME-Base64 >=dev-perl/Net-OpenID-Common-1.190.0 virtual/perl-Storable virtual/perl-Time-Local virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/CGI virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Library for consumers of OpenID identities
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-OpenID-Consumer
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/JSON dev-perl/libwww-perl virtual/perl-MIME-Base64 >=dev-perl/Net-OpenID-Common-1.190.0 virtual/perl-Storable virtual/perl-Time-Local dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Consumer-1.18.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=13ddfa69a303d5fa278236f4d7a55479
diff --git a/metadata/md5-cache/dev-perl/Net-OpenSSH-0.800.0 b/metadata/md5-cache/dev-perl/Net-OpenSSH-0.800.0
new file mode 100644
index 000000000000..33bafd4d2379
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-OpenSSH-0.800.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/ssh dev-perl/IO-Tty !minimal? ( dev-perl/Net-SSH-Any dev-perl/Net-SFTP-Foreign ) virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Net::OpenSSH, Perl wrapper for OpenSSH secure shell client
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-OpenSSH
+IUSE=minimal test examples
+KEYWORDS=~amd64 ~hppa ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/ssh dev-perl/IO-Tty !minimal? ( dev-perl/Net-SSH-Any dev-perl/Net-SFTP-Foreign ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.80.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=f5903195291db1bab5109c5bb83a5995
diff --git a/metadata/md5-cache/dev-perl/Net-Patricia-1.220.0-r1 b/metadata/md5-cache/dev-perl/Net-Patricia-1.220.0-r1
deleted file mode 100644
index d1866a1be3d0..000000000000
--- a/metadata/md5-cache/dev-perl/Net-Patricia-1.220.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Net-CIDR-Lite ipv6? ( dev-perl/Socket6 ) dev-lang/perl
-DESCRIPTION=Patricia Trie perl module for fast IP address lookups
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-Patricia
-IUSE=ipv6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=dev-perl/Net-CIDR-Lite ipv6? ( dev-perl/Socket6 ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GR/GRUBER/Net-Patricia-1.22.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2d0388d2b7d0d97ed2d8126e2967a586
diff --git a/metadata/md5-cache/dev-perl/Net-Patricia-1.220.0-r2 b/metadata/md5-cache/dev-perl/Net-Patricia-1.220.0-r2
new file mode 100644
index 000000000000..1f699b3f269b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Patricia-1.220.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Net-CIDR-Lite ipv6? ( dev-perl/Socket6 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Patricia Trie perl module for fast IP address lookups
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Patricia
+IUSE=ipv6 test
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=dev-perl/Net-CIDR-Lite ipv6? ( dev-perl/Socket6 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GR/GRUBER/Net-Patricia-1.22.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4eadb46f32a5a58930cb8b7c45b464fc
diff --git a/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0 b/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0
deleted file mode 100644
index b8133197a9d1..000000000000
--- a/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/libpcap dev-perl/IO-Interface dev-lang/perl
-DESCRIPTION=Interface to the pcap(3) LBL packet capture library
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-Pcap
-IUSE=examples
-KEYWORDS=~alpha amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=net-libs/libpcap dev-perl/IO-Interface dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Net-Pcap-0.18.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=6efa6a388ec1cc7530ecd07e975cbe28
diff --git a/metadata/md5-cache/dev-perl/Net-PcapUtils-0.10.0-r2 b/metadata/md5-cache/dev-perl/Net-PcapUtils-0.10.0-r2
deleted file mode 100644
index e2575ee4a724..000000000000
--- a/metadata/md5-cache/dev-perl/Net-PcapUtils-0.10.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Net-Pcap dev-lang/perl
-DESCRIPTION=Utility routines for use with Net::Pcap
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-PcapUtils
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Net-Pcap dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TI/TIMPOTTER/Net-PcapUtils-0.01.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=2204f4723928583859b3476561cb64a8
diff --git a/metadata/md5-cache/dev-perl/Net-PcapUtils-0.10.0-r3 b/metadata/md5-cache/dev-perl/Net-PcapUtils-0.10.0-r3
new file mode 100644
index 000000000000..6ca53976d2be
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-PcapUtils-0.10.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Net-Pcap dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Utility routines for use with Net::Pcap
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-PcapUtils
+IUSE=test
+KEYWORDS=amd64 ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Net-Pcap dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TI/TIMPOTTER/Net-PcapUtils-0.01.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=70902d9b74a78961975ca0b5ebac5015
diff --git a/metadata/md5-cache/dev-perl/Net-RBLClient-0.500.0-r2 b/metadata/md5-cache/dev-perl/Net-RBLClient-0.500.0-r2
deleted file mode 100644
index a2f3cb0b9b38..000000000000
--- a/metadata/md5-cache/dev-perl/Net-RBLClient-0.500.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Queries multiple Realtime Blackhole Lists in parallel
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-RBLClient
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Time-HiRes dev-perl/Net-DNS dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AB/ABLUM/Net-RBLClient-0.5.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=cf4571c42fa6857377aae8cf8e955778
diff --git a/metadata/md5-cache/dev-perl/Net-RBLClient-0.500.0-r3 b/metadata/md5-cache/dev-perl/Net-RBLClient-0.500.0-r3
new file mode 100644
index 000000000000..b3c176ebda33
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-RBLClient-0.500.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Time-HiRes dev-perl/Net-DNS dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Queries multiple Realtime Blackhole Lists in parallel
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-RBLClient
+IUSE=test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Time-HiRes dev-perl/Net-DNS dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AB/ABLUM/Net-RBLClient-0.5.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=d2dd5f401888932596c05f2885279bea
diff --git a/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r2 b/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r2
deleted file mode 100644
index 705629494643..000000000000
--- a/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/libpcap dev-lang/perl
-DESCRIPTION=Raw IP packets manipulation Module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-RawIP
-IUSE=examples
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=net-libs/libpcap dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Net-RawIP-0.25.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8d28089520a4137062a8dd46fc55b7dc
diff --git a/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r3 b/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r3
new file mode 100644
index 000000000000..5eff5b559ddb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=net-libs/libpcap dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-libs/libpcap dev-lang/perl
+DESCRIPTION=Raw IP packets manipulation Module
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-RawIP
+IUSE=test examples
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=net-libs/libpcap dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Net-RawIP-0.25.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=39350b4e52d448a43b3fbc197ddab055
diff --git a/metadata/md5-cache/dev-perl/Net-SFTP-0.120.0 b/metadata/md5-cache/dev-perl/Net-SFTP-0.120.0
new file mode 100644
index 000000000000..d65345fbed37
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SFTP-0.120.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Math-Int64-0.540.0 >=dev-perl/Net-SSH-Perl-2.120.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Secure File Transfer Protocol client
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SFTP
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Math-Int64-0.540.0 >=dev-perl/Net-SSH-Perl-2.120.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LK/LKINLEY/Net-SFTP-0.12.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=805b62cca73e6ba331e576b110b69b02
diff --git a/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.930.0 b/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.930.0
new file mode 100644
index 000000000000..1107b905eec3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.930.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=SSH File Transfer Protocol client
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SFTP-Foreign
+IUSE=examples test examples
+KEYWORDS=~amd64 ~hppa ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/ssh dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.93.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=cd731a8623c1918f0da3308a176232d5
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0 b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0
deleted file mode 100644
index 231a53fe8a54..000000000000
--- a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/perl-libnet dev-perl/IO-Socket-SSL virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DESCRIPTION=(Deprecated) SSL support for Net::SMTP
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-SMTP-SSL
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-libnet dev-perl/IO-Socket-SSL dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=48a681e512bda9988f4318695c04a13d
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0-r1 b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0-r1
new file mode 100644
index 000000000000..0083547f10d2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-libnet dev-perl/IO-Socket-SSL virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=(Deprecated) SSL support for Net::SMTP
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SMTP-SSL
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-libnet dev-perl/IO-Socket-SSL dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=54a761d29c38859d819e09ccd6003748
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2 b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
deleted file mode 100644
index aaec6809c447..000000000000
--- a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
-DESCRIPTION=A SMTP client supporting TLS and AUTH
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Net-SMTP-TLS
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a0269ac76a3a084f9b01c1e2d46aa8e3
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r3 b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r3
new file mode 100644
index 000000000000..26e1d4f87791
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A SMTP client supporting TLS and AUTH
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SMTP-TLS
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=8b9ed0db91d8212c1187ba72abbf0e75
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1 b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
deleted file mode 100644
index 0c6843136711..000000000000
--- a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-IO virtual/perl-libnet >=dev-perl/IO-Socket-SSL-1.760.0 dev-perl/Net-SSLeay virtual/perl-MIME-Base64 dev-perl/Digest-HMAC >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl:=[-build(-)]
-DESCRIPTION=An SMTP client supporting TLS and AUTH
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Net-SMTP-TLS-ButMaintained
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-IO virtual/perl-libnet >=dev-perl/IO-Socket-SSL-1.760.0 dev-perl/Net-SSLeay virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e28c7adbe11220eb36b3e57ef2dfb2f3
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r2 b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r2
new file mode 100644
index 000000000000..4909415ca781
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-IO virtual/perl-libnet >=dev-perl/IO-Socket-SSL-1.760.0 dev-perl/Net-SSLeay virtual/perl-MIME-Base64 dev-perl/Digest-HMAC >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=An SMTP client supporting TLS and AUTH
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SMTP-TLS-ButMaintained
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-IO virtual/perl-libnet >=dev-perl/IO-Socket-SSL-1.760.0 dev-perl/Net-SSLeay virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=968c1638d9cab9a2a5a34d2a2bd06ef7
diff --git a/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0 b/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
new file mode 100644
index 000000000000..3c136d3f1ffa
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Authen-SASL-2.0.0 >=dev-perl/IO-Socket-SSL-1.0.0 >=virtual/perl-libnet-2.0.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=SSL/STARTTLS support for Net::SMTP
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SMTPS
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Authen-SASL-2.0.0 >=dev-perl/IO-Socket-SSL-1.0.0 >=virtual/perl-libnet-2.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOMO/src/Net-SMTPS-0.10.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=1fb04dac6e74211f3067d4d51dfde53b
diff --git a/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r2 b/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r2
deleted file mode 100644
index 56a51c1cbaae..000000000000
--- a/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!minimal? ( >=dev-perl/Crypt-DES-2.30.0 >=dev-perl/Crypt-Rijndael-1.20.0 >=dev-perl/Digest-HMAC-1.0 >=virtual/perl-Digest-MD5-2.110.0 >=dev-perl/Digest-SHA1-1.20.0 >=dev-perl/Socket6-0.230.0 ) virtual/perl-Carp virtual/perl-Exporter virtual/perl-IO virtual/perl-Math-BigInt >=dev-perl/Module-Build-0.360.0 test? ( virtual/perl-Test ) dev-lang/perl
-DESCRIPTION=A SNMP Perl Module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-SNMP
-IUSE=examples test minimal
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~sparc-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!minimal? ( >=dev-perl/Crypt-DES-2.30.0 >=dev-perl/Crypt-Rijndael-1.20.0 >=dev-perl/Digest-HMAC-1.0 >=virtual/perl-Digest-MD5-2.110.0 >=dev-perl/Digest-SHA1-1.20.0 >=dev-perl/Socket6-0.230.0 ) virtual/perl-Carp virtual/perl-Exporter virtual/perl-IO virtual/perl-Math-BigInt dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DT/DTOWN/Net-SNMP-v6.0.1.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c7cfcf2278bbe56c14174c3eff4c9ae8
diff --git a/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r3 b/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r3
new file mode 100644
index 000000000000..eb941efbbc9d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r3
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( >=dev-perl/Crypt-DES-2.30.0 >=dev-perl/Crypt-Rijndael-1.20.0 >=dev-perl/Digest-HMAC-1.0 >=virtual/perl-Digest-MD5-2.110.0 >=dev-perl/Digest-SHA1-1.20.0 >=dev-perl/Socket6-0.230.0 ) virtual/perl-Carp virtual/perl-Exporter virtual/perl-IO virtual/perl-Math-BigInt >=dev-perl/Module-Build-0.360.0 test? ( virtual/perl-Test ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A SNMP Perl Module
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SNMP
+IUSE=examples minimal test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( >=dev-perl/Crypt-DES-2.30.0 >=dev-perl/Crypt-Rijndael-1.20.0 >=dev-perl/Digest-HMAC-1.0 >=virtual/perl-Digest-MD5-2.110.0 >=dev-perl/Digest-SHA1-1.20.0 >=dev-perl/Socket6-0.230.0 ) virtual/perl-Carp virtual/perl-Exporter virtual/perl-IO virtual/perl-Math-BigInt dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DT/DTOWN/Net-SNMP-v6.0.1.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=262241e9425e4b895aad743655449eb8
diff --git a/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r2 b/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r2
deleted file mode 100644
index e558be012c49..000000000000
--- a/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-libnet dev-lang/perl
-DESCRIPTION=libnet SNPP component
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-SNPP
-IUSE=examples
-KEYWORDS=amd64 ~ia64 ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-libnet dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TOBEYA/Net-SNPP-1.17.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=690e8b5964982e02b49dee73ca91217e
diff --git a/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r3 b/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r3
new file mode 100644
index 000000000000..0c0cb682f656
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-libnet dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=libnet SNPP component
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SNPP
+IUSE=test examples
+KEYWORDS=amd64 ~ia64 ppc sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-libnet dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOBEYA/Net-SNPP-1.17.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=434f36c49fc7d4315f304f841ec788f4
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0 b/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0
deleted file mode 100644
index 3cb2c512a0b3..000000000000
--- a/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-1.302.26 ) dev-lang/perl
-DESCRIPTION=Use any SSH module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-SSH-Any
-IUSE=test examples
-KEYWORDS=amd64 ~hppa ~sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-SSH-Any-0.10.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=127870ad49d682afb50b23f7d36e04cb
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0-r1 b/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0-r1
new file mode 100644
index 000000000000..8e69f1a3513d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-1.302.26 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Use any SSH module
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SSH-Any
+IUSE=test examples
+KEYWORDS=amd64 ~hppa ~sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-SSH-Any-0.10.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=7775c8eebde93f4e468abff3d2b5060f
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-Any-0.40.0 b/metadata/md5-cache/dev-perl/Net-SSH-Any-0.40.0
deleted file mode 100644
index c1d1d5cee7c2..000000000000
--- a/metadata/md5-cache/dev-perl/Net-SSH-Any-0.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Use any SSH module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-SSH-Any
-KEYWORDS=amd64 ~hppa ~sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-SSH-Any-0.04.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=cc56aede3743ef48331f7f465959bbc7
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0 b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0
deleted file mode 100644
index 3230f8e0edaa..000000000000
--- a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Log-Log4perl-1.0.0 virtual/perl-Text-ParseWords virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Temp virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Read and modify ssh's authorized_keys files
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-SSH-AuthorizedKeysFile
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Log-Log4perl-1.0.0 virtual/perl-Text-ParseWords dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Net-SSH-AuthorizedKeysFile-0.18.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=2493efaf9d1610d8af7ad24386e77d79
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r1 b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r1
new file mode 100644
index 000000000000..9294be72d5f9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Log-Log4perl-1.0.0 virtual/perl-Text-ParseWords virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Temp virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read and modify ssh's authorized_keys files
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SSH-AuthorizedKeysFile
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Log-Log4perl-1.0.0 virtual/perl-Text-ParseWords dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Net-SSH-AuthorizedKeysFile-0.18.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=ba00cfec416b76168ed1ba8bed3a2da7
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0 b/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0
deleted file mode 100644
index 3e308e3512a8..000000000000
--- a/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Crypt-Curve25519-0.50.0 dev-perl/Crypt-IDEA >=dev-perl/CryptX-0.32.0 virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Math-GMP-1.40.0 virtual/perl-Scalar-List-Utils >=dev-perl/String-CRC32-1.200.0 !minimal? ( dev-perl/Digest-BubbleBabble dev-perl/Crypt-RSA dev-perl/TermReadKey ) virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.610.0 ) dev-lang/perl
-DESCRIPTION=Perl client Interface to SSH
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-SSH-Perl
-IUSE=minimal test examples
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Crypt-Curve25519-0.50.0 dev-perl/Crypt-IDEA >=dev-perl/CryptX-0.32.0 virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Math-GMP-1.40.0 virtual/perl-Scalar-List-Utils >=dev-perl/String-CRC32-1.200.0 !minimal? ( dev-perl/Digest-BubbleBabble dev-perl/Crypt-RSA dev-perl/TermReadKey ) dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=5fdd726bcb8a57017cc42fb726a62707
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0-r1 b/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0-r1
new file mode 100644
index 000000000000..2f7ea00dc300
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Crypt-Curve25519-0.50.0 dev-perl/Crypt-IDEA >=dev-perl/CryptX-0.32.0 virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Math-GMP-1.40.0 virtual/perl-Scalar-List-Utils >=dev-perl/String-CRC32-1.200.0 !minimal? ( dev-perl/Digest-BubbleBabble dev-perl/Crypt-RSA dev-perl/TermReadKey ) virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.610.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl client Interface to SSH
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SSH-Perl
+IUSE=minimal test examples
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Crypt-Curve25519-0.50.0 dev-perl/Crypt-IDEA >=dev-perl/CryptX-0.32.0 virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Math-GMP-1.40.0 virtual/perl-Scalar-List-Utils >=dev-perl/String-CRC32-1.200.0 !minimal? ( dev-perl/Digest-BubbleBabble dev-perl/Crypt-RSA dev-perl/TermReadKey ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=ecd878c78fdf90b587f13554ce9d6877
diff --git a/metadata/md5-cache/dev-perl/Net-SSH2-0.720.0 b/metadata/md5-cache/dev-perl/Net-SSH2-0.720.0
new file mode 100644
index 000000000000..8445afb79f14
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSH2-0.720.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-libs/zlib net-libs/libssh2 !gcrypt? ( dev-libs/openssl:0 ) gcrypt? ( dev-libs/libgcrypt:0 ) virtual/perl-ExtUtils-Constant >=virtual/perl-ExtUtils-MakeMaker-6.50 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib net-libs/libssh2 !gcrypt? ( dev-libs/openssl:0 ) gcrypt? ( dev-libs/libgcrypt:0 ) dev-lang/perl
+DESCRIPTION=Support for the SSH 2 protocol via libssh2
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SSH2
+IUSE=gcrypt test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sys-libs/zlib net-libs/libssh2 !gcrypt? ( dev-libs/openssl:0 ) gcrypt? ( dev-libs/libgcrypt:0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-SSH2-0.72.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=85e01371bddc760c4e2e13532c762f9f
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0
new file mode 100644
index 000000000000..38c7af98f960
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/openssl:0= virtual/perl-MIME-Base64 virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( dev-perl/Test-Exception dev-perl/Test-Warn dev-perl/Test-NoWarnings ) virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl extension for using OpenSSL
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SSLeay
+IUSE=minimal examples test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Artistic-2
+RDEPEND=dev-libs/openssl:0= virtual/perl-MIME-Base64 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.90.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=526d6617cfc169ef68b9ba8b5e966b04
diff --git a/metadata/md5-cache/dev-perl/Net-Server-2.10.0 b/metadata/md5-cache/dev-perl/Net-Server-2.10.0
new file mode 100644
index 000000000000..05c5c8746996
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Server-2.10.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-HiRes dev-perl/IO-Multiplex ipv6? ( dev-perl/IO-Socket-INET6 ) >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extensible, general Perl server engine
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Server
+IUSE=ipv6 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-HiRes dev-perl/IO-Multiplex ipv6? ( dev-perl/IO-Socket-INET6 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.010.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=11c6b4032b6e4b19b80efa08aa679822
diff --git a/metadata/md5-cache/dev-perl/Net-Server-Coro-1.300.0-r1 b/metadata/md5-cache/dev-perl/Net-Server-Coro-1.300.0-r1
deleted file mode 100644
index 4781ef2e4a29..000000000000
--- a/metadata/md5-cache/dev-perl/Net-Server-Coro-1.300.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Coro dev-perl/AnyEvent >=dev-perl/Net-Server-2 ssl? ( dev-perl/Net-SSLeay ) dev-lang/perl
-DESCRIPTION=A co-operative multithreaded server using Coro
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-Server-Coro
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-perl/Coro dev-perl/AnyEvent >=dev-perl/Net-Server-2 ssl? ( dev-perl/Net-SSLeay ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Net-Server-Coro-1.3.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=4a420c73155b13d6b21a91c48ac7d349
diff --git a/metadata/md5-cache/dev-perl/Net-Server-Coro-1.300.0-r2 b/metadata/md5-cache/dev-perl/Net-Server-Coro-1.300.0-r2
new file mode 100644
index 000000000000..9a4ad72f4064
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Server-Coro-1.300.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Coro dev-perl/AnyEvent >=dev-perl/Net-Server-2 ssl? ( dev-perl/Net-SSLeay ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A co-operative multithreaded server using Coro
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Server-Coro
+IUSE=ssl test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-perl/Coro dev-perl/AnyEvent >=dev-perl/Net-Server-2 ssl? ( dev-perl/Net-SSLeay ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Net-Server-Coro-1.3.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=49f8a9045a3ecca3924db4faa2fceaf1
diff --git a/metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0 b/metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0
deleted file mode 100644
index 135c49246320..000000000000
--- a/metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/IO-Socket-SSL-1.831.0 virtual/perl-libnet virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Most ) dev-lang/perl
-DESCRIPTION=Class to easily create a mail server
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-Server-Mail
-IUSE=test examples
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=LGPL-2.1+ Artistic-2
-RDEPEND=>=dev-perl/IO-Socket-SSL-1.831.0 virtual/perl-libnet dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GU/GUIMARD/Net-Server-Mail-0.28.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=121ff07a8e2bb662955af469e23057da
diff --git a/metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0-r1 b/metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0-r1
new file mode 100644
index 000000000000..e8eb9e3977de
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/IO-Socket-SSL-1.831.0 virtual/perl-libnet virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Most ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Class to easily create a mail server
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Server-Mail
+IUSE=test examples
+KEYWORDS=amd64 ~ppc ~x86
+LICENSE=LGPL-2.1+ Artistic-2
+RDEPEND=>=dev-perl/IO-Socket-SSL-1.831.0 virtual/perl-libnet dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GU/GUIMARD/Net-Server-Mail-0.28.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=38ba87c326611eca93ef7c1f6c18967f
diff --git a/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r1 b/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r1
deleted file mode 100644
index 9193aea7e040..000000000000
--- a/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Socket6-0.250.0 dev-lang/perl
-DESCRIPTION=Fast IP-in-subnet matcher for IPv4 and IPv6, CIDR or mask
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-Subnet
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Socket6-0.250.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JU/JUERD/Net-Subnet-1.03.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=384f8d3c291c54c58bde3544441db68a
diff --git a/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r2 b/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r2
new file mode 100644
index 000000000000..722c14e38e55
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Socket6-0.250.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Fast IP-in-subnet matcher for IPv4 and IPv6, CIDR or mask
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Subnet
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Socket6-0.250.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JU/JUERD/Net-Subnet-1.03.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=03f71b4854de1369ad5baae1adb0fd4d
diff --git a/metadata/md5-cache/dev-perl/Net-Telnet-3.50.0 b/metadata/md5-cache/dev-perl/Net-Telnet-3.50.0
new file mode 100644
index 000000000000..bcd409113b51
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Telnet-3.50.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-libnet-1.70.300 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=interact with TELNET port or other TCP ports in Perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Telnet
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-libnet-1.70.300 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=0ea09935322c72b64fb75f2a602343c2
diff --git a/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.120.0 b/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.120.0
new file mode 100644
index 000000000000..c71fe0b1fa27
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.120.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Net-Telnet-3.20.0 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/TermReadKey ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Automate telnet sessions w/ routers&switches
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Telnet-Cisco
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Net-Telnet-3.20.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/V/VI/VINSWORLD/Net-Telnet-Cisco-1.12.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=9b7f7a48512e49077ebd489b5eeba52e
diff --git a/metadata/md5-cache/dev-perl/Net-Trackback-1.10.0-r1 b/metadata/md5-cache/dev-perl/Net-Trackback-1.10.0-r1
deleted file mode 100644
index 8f4ce33c3f72..000000000000
--- a/metadata/md5-cache/dev-perl/Net-Trackback-1.10.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Object-oriented interface for developing Trackback clients and servers
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-Trackback
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/libwww-perl-5.831.0 >=dev-perl/Class-ErrorHandler-0.10.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/Net-Trackback-1.01.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=266f6e6bda72ef9a0ed41462a3b93348
diff --git a/metadata/md5-cache/dev-perl/Net-Trackback-1.10.0-r2 b/metadata/md5-cache/dev-perl/Net-Trackback-1.10.0-r2
new file mode 100644
index 000000000000..4d2c419493f2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Trackback-1.10.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/libwww-perl-5.831.0 >=dev-perl/Class-ErrorHandler-0.10.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Object-oriented interface for developing Trackback clients and servers
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Trackback
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/libwww-perl-5.831.0 >=dev-perl/Class-ErrorHandler-0.10.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/Net-Trackback-1.01.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=c3abceb12cb444c9890b551573c0ee8d
diff --git a/metadata/md5-cache/dev-perl/Net-Twitter-4.10.420 b/metadata/md5-cache/dev-perl/Net-Twitter-4.10.420
index fb85193146a7..fc813406c38c 100644
--- a/metadata/md5-cache/dev-perl/Net-Twitter-4.10.420
+++ b/metadata/md5-cache/dev-perl/Net-Twitter-4.10.420
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Carp-Clan dev-perl/Class-Load dev-perl/Data-Visitor >=dev-perl/DateTime-0.51 dev-perl/DateTime-Format-Strptime >=dev-perl/Devel-StackTrace-1.21 virtual/perl-Digest-SHA virtual/perl-Encode dev-perl/HTML-Parser dev-perl/HTTP-Message >=dev-perl/IO-Socket-SSL-2.5.0 dev-perl/JSON-MaybeXS dev-perl/LWP-Protocol-https virtual/perl-Scalar-List-Utils >=dev-perl/Moose-0.940.0 dev-perl/MooseX-Role-Parameterized dev-perl/Net-HTTP !=dev-perl/Net-HTTP-6.40.0 !=dev-perl/Net-HTTP-6.50.0 virtual/perl-libnet >=dev-perl/Net-OAuth-0.25 virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.30.0 >=dev-perl/URI-1.400.0 virtual/perl-libnet dev-perl/namespace-autoclean >=virtual/perl-ExtUtils-MakeMaker-7.110.100 test? ( virtual/perl-Carp virtual/perl-File-Spec virtual/perl-IO >=dev-perl/libwww-perl-5.819.0 dev-perl/Test-Deep dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.980.0 dev-perl/Test-Warn ) dev-lang/perl
+DEPEND=dev-perl/Carp-Clan dev-perl/Class-Load dev-perl/Data-Visitor >=dev-perl/DateTime-0.51 dev-perl/DateTime-Format-Strptime >=dev-perl/Devel-StackTrace-1.21 virtual/perl-Digest-SHA virtual/perl-Encode dev-perl/HTML-Parser dev-perl/HTTP-Message >=dev-perl/IO-Socket-SSL-2.5.0 dev-perl/JSON-MaybeXS dev-perl/LWP-Protocol-https virtual/perl-Scalar-List-Utils >=dev-perl/Moose-0.940.0 dev-perl/MooseX-Role-Parameterized dev-perl/Net-HTTP !~dev-perl/Net-HTTP-6.40.0 !~dev-perl/Net-HTTP-6.50.0 virtual/perl-libnet >=dev-perl/Net-OAuth-0.25 virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.30.0 >=dev-perl/URI-1.400.0 virtual/perl-libnet dev-perl/namespace-autoclean >=virtual/perl-ExtUtils-MakeMaker-7.110.100 test? ( virtual/perl-Carp virtual/perl-File-Spec virtual/perl-IO >=dev-perl/libwww-perl-5.819.0 dev-perl/Test-Deep dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.980.0 dev-perl/Test-Warn ) dev-lang/perl
 DESCRIPTION=A perl interface to the Twitter API
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Net-Twitter
 IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Carp-Clan dev-perl/Class-Load dev-perl/Data-Visitor >=dev-perl/DateTime-0.51 dev-perl/DateTime-Format-Strptime >=dev-perl/Devel-StackTrace-1.21 virtual/perl-Digest-SHA virtual/perl-Encode dev-perl/HTML-Parser dev-perl/HTTP-Message >=dev-perl/IO-Socket-SSL-2.5.0 dev-perl/JSON-MaybeXS dev-perl/LWP-Protocol-https virtual/perl-Scalar-List-Utils >=dev-perl/Moose-0.940.0 dev-perl/MooseX-Role-Parameterized dev-perl/Net-HTTP !=dev-perl/Net-HTTP-6.40.0 !=dev-perl/Net-HTTP-6.50.0 virtual/perl-libnet >=dev-perl/Net-OAuth-0.25 virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.30.0 >=dev-perl/URI-1.400.0 virtual/perl-libnet dev-perl/namespace-autoclean dev-lang/perl:=
+RDEPEND=dev-perl/Carp-Clan dev-perl/Class-Load dev-perl/Data-Visitor >=dev-perl/DateTime-0.51 dev-perl/DateTime-Format-Strptime >=dev-perl/Devel-StackTrace-1.21 virtual/perl-Digest-SHA virtual/perl-Encode dev-perl/HTML-Parser dev-perl/HTTP-Message >=dev-perl/IO-Socket-SSL-2.5.0 dev-perl/JSON-MaybeXS dev-perl/LWP-Protocol-https virtual/perl-Scalar-List-Utils >=dev-perl/Moose-0.940.0 dev-perl/MooseX-Role-Parameterized dev-perl/Net-HTTP !~dev-perl/Net-HTTP-6.40.0 !~dev-perl/Net-HTTP-6.50.0 virtual/perl-libnet >=dev-perl/Net-OAuth-0.25 virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.30.0 >=dev-perl/URI-1.400.0 virtual/perl-libnet dev-perl/namespace-autoclean dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-4.01042.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8c6a0be0e9db416861fa8cedd15949d5
+_md5_=4472424d46e069273bc1fb531316889d
diff --git a/metadata/md5-cache/dev-perl/Net-Twitter-4.10.430 b/metadata/md5-cache/dev-perl/Net-Twitter-4.10.430
new file mode 100644
index 000000000000..7d4ff13441dc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Twitter-4.10.430
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Carp-Clan dev-perl/Class-Load dev-perl/Data-Visitor >=dev-perl/DateTime-0.51 dev-perl/DateTime-Format-Strptime >=dev-perl/Devel-StackTrace-1.21 virtual/perl-Digest-SHA virtual/perl-Encode dev-perl/HTML-Parser dev-perl/HTTP-Message >=dev-perl/IO-Socket-SSL-2.5.0 dev-perl/JSON-MaybeXS dev-perl/LWP-Protocol-https virtual/perl-Scalar-List-Utils >=dev-perl/Moose-0.940.0 dev-perl/MooseX-Role-Parameterized dev-perl/Net-HTTP !~dev-perl/Net-HTTP-6.40.0 !~dev-perl/Net-HTTP-6.50.0 virtual/perl-libnet >=dev-perl/Net-OAuth-0.25 virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.30.0 >=dev-perl/URI-1.400.0 virtual/perl-libnet dev-perl/namespace-autoclean >=virtual/perl-ExtUtils-MakeMaker-7.110.100 test? ( virtual/perl-Carp virtual/perl-File-Spec virtual/perl-IO >=dev-perl/libwww-perl-5.819.0 dev-perl/Test-Deep dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.980.0 dev-perl/Test-Warn ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A perl interface to the Twitter API (DEPRECATED)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Twitter
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Carp-Clan dev-perl/Class-Load dev-perl/Data-Visitor >=dev-perl/DateTime-0.51 dev-perl/DateTime-Format-Strptime >=dev-perl/Devel-StackTrace-1.21 virtual/perl-Digest-SHA virtual/perl-Encode dev-perl/HTML-Parser dev-perl/HTTP-Message >=dev-perl/IO-Socket-SSL-2.5.0 dev-perl/JSON-MaybeXS dev-perl/LWP-Protocol-https virtual/perl-Scalar-List-Utils >=dev-perl/Moose-0.940.0 dev-perl/MooseX-Role-Parameterized dev-perl/Net-HTTP !~dev-perl/Net-HTTP-6.40.0 !~dev-perl/Net-HTTP-6.50.0 virtual/perl-libnet >=dev-perl/Net-OAuth-0.25 virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.30.0 >=dev-perl/URI-1.400.0 virtual/perl-libnet dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-4.01043.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=14fc4a2565e0162d533bfc4b367e3e3b
diff --git a/metadata/md5-cache/dev-perl/Net-UPnP-1.4.6 b/metadata/md5-cache/dev-perl/Net-UPnP-1.4.6
new file mode 100644
index 000000000000..84682baf5164
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-UPnP-1.4.6
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-version dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl extension for UPnP
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-UPnP
+IUSE=examples test
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-solaris
+LICENSE=BSD
+RDEPEND=virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SK/SKONNO/Net-UPnP-1.4.6.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=17062ba379235d83f6a512e1e24224ca
diff --git a/metadata/md5-cache/dev-perl/Net-Whois-IP-1.190.0-r1 b/metadata/md5-cache/dev-perl/Net-Whois-IP-1.190.0-r1
deleted file mode 100644
index 91cfd9fec9eb..000000000000
--- a/metadata/md5-cache/dev-perl/Net-Whois-IP-1.190.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Regexp-IPv6 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Perl extension for looking up the whois information for ip addresses
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-Whois-IP
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Regexp-IPv6 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BS/BSCHMITZ/Net-Whois-IP-1.19.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0935044393f34c9439ec4bd9c578a1a2
diff --git a/metadata/md5-cache/dev-perl/Net-Whois-IP-1.190.0-r2 b/metadata/md5-cache/dev-perl/Net-Whois-IP-1.190.0-r2
new file mode 100644
index 000000000000..54d6ae7affb5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Whois-IP-1.190.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Regexp-IPv6 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl extension for looking up the whois information for ip addresses
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-Whois-IP
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Regexp-IPv6 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BS/BSCHMITZ/Net-Whois-IP-1.19.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=d2f50a0d4a2a9419119eca2bc663c955
diff --git a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0 b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
deleted file mode 100644
index 87c2dcd9cce9..000000000000
--- a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Authen-SASL-2.120.0 virtual/perl-Digest-SHA virtual/perl-Scalar-List-Utils >=dev-perl/XML-Stream-1.240.0 >=dev-perl/Module-Build-0.360.300 test? ( >=dev-perl/LWP-Online-1.70.0 >=dev-perl/YAML-Tiny-1.410.0 >=virtual/perl-Test-Simple-0.920.0 ) dev-lang/perl
-DESCRIPTION=XMPP Perl Library
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-XMPP
-IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-perl/Authen-SASL-2.120.0 virtual/perl-Digest-SHA virtual/perl-Scalar-List-Utils >=dev-perl/XML-Stream-1.240.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAPATRICK/Net-XMPP-1.05.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=de9fddb4022843ebff94ad355469adfb
diff --git a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0-r1 b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0-r1
new file mode 100644
index 000000000000..1a26b7813107
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Authen-SASL-2.120.0 virtual/perl-Digest-SHA virtual/perl-Scalar-List-Utils >=dev-perl/XML-Stream-1.240.0 >=dev-perl/Module-Build-0.360.300 test? ( >=dev-perl/LWP-Online-1.70.0 >=dev-perl/YAML-Tiny-1.410.0 >=virtual/perl-Test-Simple-0.920.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=XMPP Perl Library
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-XMPP
+IUSE=test examples
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-perl/Authen-SASL-2.120.0 virtual/perl-Digest-SHA virtual/perl-Scalar-List-Utils >=dev-perl/XML-Stream-1.240.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAPATRICK/Net-XMPP-1.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=13b5525fbec194d4f0d22d58179e054f
diff --git a/metadata/md5-cache/dev-perl/NetPacket-1.7.2 b/metadata/md5-cache/dev-perl/NetPacket-1.7.2
new file mode 100644
index 000000000000..6b434105b769
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/NetPacket-1.7.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Assemble / disassemble network packets at the protocol level
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/NetPacket
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/NetPacket-1.7.2.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=3694dff5138932c5cfdab915afb3b17d
diff --git a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0 b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0
index f124d5e8f8ea..796f342c8993 100644
--- a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0
+++ b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Simple Class for OLE document interface
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/OLE-Storage_Lite
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.20.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8bc5a51d6227ef0b92c1aaedf23d2e06
+_md5_=3781d54c0e7d43fca41fc546c9b3d279
diff --git a/metadata/md5-cache/dev-perl/PDL-2.17.0-r1 b/metadata/md5-cache/dev-perl/PDL-2.17.0-r1
index 781520d1ee1a..6ad5c2374cf3 100644
--- a/metadata/md5-cache/dev-perl/PDL-2.17.0-r1
+++ b/metadata/md5-cache/dev-perl/PDL-2.17.0-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-pe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHM/PDL-2.017.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c5f11b5e360cb2043aaf94448aa6fd80
diff --git a/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.13.0-r2 b/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.13.0-r2
deleted file mode 100644
index 85e2fe5b745d..000000000000
--- a/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.13.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Alien-Gnuplot virtual/perl-IO dev-perl/IPC-Run virtual/perl-Scalar-List-Utils dev-perl/PDL dev-perl/PDL-Transform-Color dev-perl/Safe-Isa virtual/perl-Storable virtual/perl-Time-HiRes || ( sci-visualization/gnuplot[X] sci-visualization/gnuplot[qt4(-)] ) >=virtual/perl-ExtUtils-MakeMaker-6.480.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Gnuplot-based plotting for PDL
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/PDL-Graphics-Gnuplot
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Alien-Gnuplot virtual/perl-IO dev-perl/IPC-Run virtual/perl-Scalar-List-Utils dev-perl/PDL dev-perl/PDL-Transform-Color dev-perl/Safe-Isa virtual/perl-Storable virtual/perl-Time-HiRes || ( sci-visualization/gnuplot[X] sci-visualization/gnuplot[qt4(-)] ) dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/PDL-Graphics-Gnuplot-2.013.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c274a0024bf409f339fbdd682ad6660b
diff --git a/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.17.0 b/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.17.0
new file mode 100644
index 000000000000..1550f3ba280b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.17.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Alien-Gnuplot virtual/perl-IO dev-perl/IPC-Run virtual/perl-Scalar-List-Utils dev-perl/PDL dev-perl/PDL-Transform-Color dev-perl/Safe-Isa virtual/perl-Storable virtual/perl-Time-HiRes || ( sci-visualization/gnuplot[X] sci-visualization/gnuplot[qt4(-)] ) >=virtual/perl-ExtUtils-MakeMaker-6.480.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Gnuplot-based plotting for PDL
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PDL-Graphics-Gnuplot
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Alien-Gnuplot virtual/perl-IO dev-perl/IPC-Run virtual/perl-Scalar-List-Utils dev-perl/PDL dev-perl/PDL-Transform-Color dev-perl/Safe-Isa virtual/perl-Storable virtual/perl-Time-HiRes || ( sci-visualization/gnuplot[X] sci-visualization/gnuplot[qt4(-)] ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/PDL-Graphics-Gnuplot-2.017.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=3b3a4ae19214aa936e89c066155be854
diff --git a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15 b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
index 2d490fe5a6ff..d66b25a09a3d 100644
--- a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
+++ b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
@@ -4,11 +4,11 @@ DESCRIPTION=Generate Recursive-Descent Parsers
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Parse-RecDescent
 IUSE=test examples
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Text-Balanced-1.950.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=bdecc6a254848dab027139e6e937cf06
+_md5_=29d794d08542395147b252a5ef05927e
diff --git a/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0 b/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
index f5e9e2b12493..523316b8dd49 100644
--- a/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
+++ b/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
@@ -4,10 +4,10 @@ DESCRIPTION=Compiles yacc-like LALR grammars to generate Perl OO parser modules
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Parse-Yapp
 IUSE=examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<net-fs/samba-4.10.6 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=518f004281ffe911913a0c8321b80867
+_md5_=b039ce863c0ae96601295411422eb819
diff --git a/metadata/md5-cache/dev-perl/Pegex-0.750.0 b/metadata/md5-cache/dev-perl/Pegex-0.750.0
index f2d8f6e065f8..abfd87dc4320 100644
--- a/metadata/md5-cache/dev-perl/Pegex-0.750.0
+++ b/metadata/md5-cache/dev-perl/Pegex-0.750.0
@@ -5,11 +5,11 @@ DESCRIPTION=Acmeist PEG Parser Framework
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Pegex
 IUSE=test test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/File-ShareDir-Install virtual/perl-JSON-PP virtual/perl-Scalar-List-Utils >=dev-perl/XXX-0.350.0 >=dev-perl/YAML-PP-0.19.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Pegex-0.75.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=e7c3a499906274321534eeee0be975ec
+_md5_=5d619c9619c467d01b353407ae3612d6
diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0 b/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
index e7995ffbd364..05b25e6fc071 100644
--- a/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
+++ b/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
@@ -4,11 +4,11 @@ DESCRIPTION=Read information from an Excel file
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Spreadsheet-ParseExcel
 IUSE=test cjk unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/OLE-StorageLite-0.19 dev-perl/IO-stringy dev-perl/Text-CSV_XS dev-perl/Crypt-RC4 dev-perl/Digest-Perl-MD5 unicode? ( dev-perl/Unicode-Map ) cjk? ( dev-perl/Jcode ) dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e4a87167e78aeba81268a99e2d37579
+_md5_=6ee0611d387089b6e5c09d35b9dd495c
diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0 b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
index 10185b0f28d0..a54f99a41dbb 100644
--- a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
+++ b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-File-Temp dev-perl/Parse-RecDescent >=dev-perl/OLE-StorageLi
 DESCRIPTION=Write cross-platform Excel binary file
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Spreadsheet-WriteExcel
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp dev-perl/Parse-RecDescent >=dev-perl/OLE-StorageLite-0.19 dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-WriteExcel-2.40.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d280ae7d63b6cb93c05957db2ccf977a
+_md5_=6fa3a7e2187a84fea24415571ec6bb3c
diff --git a/metadata/md5-cache/dev-perl/Sub-HandlesVia-0.16.0 b/metadata/md5-cache/dev-perl/Sub-HandlesVia-0.16.0
index 52ea78d9ff9f..6d8422d926e6 100644
--- a/metadata/md5-cache/dev-perl/Sub-HandlesVia-0.16.0
+++ b/metadata/md5-cache/dev-perl/Sub-HandlesVia-0.16.0
@@ -5,11 +5,11 @@ DESCRIPTION=alternative handles_via implementation
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Sub-HandlesVia
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~hppa ~ppc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Method-Modifiers dev-perl/Class-Tiny dev-perl/Exporter-Tiny >=virtual/perl-Scalar-List-Utils-1.540.0 dev-perl/Role-Tiny >=dev-perl/Type-Tiny-1.4.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.016.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=c546c39f9aa5f53fa1c69b5bbe14e491
+_md5_=4a559b82cf470c4deee72d25f3c926d9
diff --git a/metadata/md5-cache/dev-perl/Text-CSV_XS-1.340.0 b/metadata/md5-cache/dev-perl/Text-CSV_XS-1.340.0
index af4ef217b68e..c9b36b7cb22e 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV_XS-1.340.0
+++ b/metadata/md5-cache/dev-perl/Text-CSV_XS-1.340.0
@@ -4,11 +4,11 @@ DESCRIPTION=Comma-separated values manipulation routines
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Text-CSV_XS
 IUSE=test examples
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.34.tgz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9c465429138f42d53384adfc5ebcde45
+_md5_=55851db5b1edd07269d7121a24cd89d0
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1 b/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
index ae4617609c34..04d75bae5e1c 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Map charsets from and to utf16 code
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Unicode-Map
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7a123ba30e28176c9ec251db53f80155
+_md5_=a39913d93f8cecc9817c257840a72124
diff --git a/metadata/md5-cache/dev-perl/XXX-0.370.0 b/metadata/md5-cache/dev-perl/XXX-0.370.0
index c8bb945b1bad..1413df6295be 100644
--- a/metadata/md5-cache/dev-perl/XXX-0.370.0
+++ b/metadata/md5-cache/dev-perl/XXX-0.370.0
@@ -5,11 +5,11 @@ DESCRIPTION=See Your Data in the Nude
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/XXX
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/YAML-PP-0.18.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/XXX-0.37.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=1d94d5ecb223f080cd5ff5702be77eed
+_md5_=e9075213580c7356131dcbc7c3044999
diff --git a/metadata/md5-cache/dev-perl/common-sense-3.750.0 b/metadata/md5-cache/dev-perl/common-sense-3.750.0
index c31f82f783fb..c90081c54b06 100644
--- a/metadata/md5-cache/dev-perl/common-sense-3.750.0
+++ b/metadata/md5-cache/dev-perl/common-sense-3.750.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Save a tree AND a kitten, use common::sense!
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/common-sense
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.75.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=20807dab19784d9459da2eb4bca5adca
+_md5_=c349512a6d78eaebf219664d8571aa54
diff --git a/metadata/md5-cache/dev-perl/libwww-perl-6.530.0 b/metadata/md5-cache/dev-perl/libwww-perl-6.530.0
index 401e4490a002..dbe5694fea3e 100644
--- a/metadata/md5-cache/dev-perl/libwww-perl-6.530.0
+++ b/metadata/md5-cache/dev-perl/libwww-perl-6.530.0
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of Perl Modules for the WWW
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/libwww-perl
 IUSE=ssl test
-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-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=ssl? ( >=dev-perl/LWP-Protocol-https-6.20.0 )
 RDEPEND=virtual/perl-Digest-MD5 >=virtual/perl-Encode-2.120.0 dev-perl/Encode-Locale >=dev-perl/File-Listing-6.0.0 >=dev-perl/HTML-Parser-3.340.0 >=dev-perl/HTTP-Cookies-6.0.0 >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Negotiate-6.0.0 >=dev-perl/HTTP-Message-6.0.0 virtual/perl-IO >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-MIME-Base64-2.100.0 >=virtual/perl-libnet-2.580.0 >=dev-perl/Net-HTTP-6.180.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny >=dev-perl/URI-1.100.0 >=dev-perl/WWW-RobotRules-6.0.0 dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.53.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d0eed5866fce70ab29714e28abe735d9
+_md5_=39beeb5f491375dbd93e66ad3f4f6145
diff --git a/metadata/md5-cache/dev-python/Faker-8.10.1 b/metadata/md5-cache/dev-python/Faker-8.10.1
new file mode 100644
index 000000000000..a016d87af5b4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-8.10.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Faker/Faker-8.10.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c84b768513e08347afc638daf4125a99
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.15 b/metadata/md5-cache/dev-python/GitPython-3.1.15
deleted file mode 100644
index c6930be60b29..000000000000
--- a/metadata/md5-cache/dev-python/GitPython-3.1.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/ddt-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library used to interact with Git repositories
-EAPI=7
-HOMEPAGE=https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/G/GitPython/GitPython-3.1.15.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.15.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.5-r1.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-3.0.4.gitbundle )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8b750140b393f645a06d4eab774c98db
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.17 b/metadata/md5-cache/dev-python/GitPython-3.1.17
deleted file mode 100644
index d95c9246beb1..000000000000
--- a/metadata/md5-cache/dev-python/GitPython-3.1.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/ddt-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library used to interact with Git repositories
-EAPI=7
-HOMEPAGE=https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/G/GitPython/GitPython-3.1.17.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.17.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.7.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-4.0.0.gitbundle )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bfb9cd9d4ba877135284c77fd613ca94
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.18 b/metadata/md5-cache/dev-python/GitPython-3.1.18
index 9e18299f3912..280e3cd38ad1 100644
--- a/metadata/md5-cache/dev-python/GitPython-3.1.18
+++ b/metadata/md5-cache/dev-python/GitPython-3.1.18
@@ -4,7 +4,7 @@ DESCRIPTION=Library used to interact with Git repositories
 EAPI=7
 HOMEPAGE=https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-3.1.18.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.18.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.7.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-4.0.0.gitbundle )
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bfb9cd9d4ba877135284c77fd613ca94
+_md5_=b25a8a3271f851d2e5ea197beffa75f3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 5574b2eebd50..56f3010f3ad0 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/PyPDF2-1.26.0-r1 b/metadata/md5-cache/dev-python/PyPDF2-1.26.0-r1
index b53a96d74435..478f92bf82d6 100644
--- a/metadata/md5-cache/dev-python/PyPDF2-1.26.0-r1
+++ b/metadata/md5-cache/dev-python/PyPDF2-1.26.0-r1
@@ -1,14 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Python library to work with pdf files
-EAPI=6
+DESCRIPTION=Python library to work with PDF files
+EAPI=7
 HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/mstamy2/PyPDF2
-IUSE=examples python_targets_python3_8 python_targets_python3_9
+IUSE=examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyPDF2/PyPDF2-1.26.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9c40635b4d111c2aebe82f3b6c266335
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a815db05bf1eaacc758fe77896944ac3
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4
index e4582b15ef7f..15d2f6c9e232 100644
--- a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4
+++ b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for QtWebEngine
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/intro https://pypi.org/project/PyQtWebEngine/
 IUSE=debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-5.15[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQtWebEngine/PyQtWebEngine-5.15.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c71dd47a655dd7f7501cae3e53acb85
+_md5_=4367adfb49125c684c7d736274e880ed
diff --git a/metadata/md5-cache/dev-python/SaltTesting-2018.9.21 b/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
index 54737d4eb067..135f91d5ca2f 100644
--- a/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
+++ b/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
@@ -4,11 +4,11 @@ DESCRIPTION=Required testing tools needed in the several Salt Stack projects
 EAPI=7
 HOMEPAGE=https://saltstack.com/community/
 IUSE=python_targets_python3_8
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/psutil[python_targets_python3_8(-)?] >=dev-python/requests-2.4.2[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/salt-testing/archive/v2018.9.21.tar.gz -> SaltTesting-2018.9.21.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f450182d1281ac9d8c3740f7ef0feee6
+_md5_=d506e9c9de8555050f13b116d2946aaa
diff --git a/metadata/md5-cache/dev-python/absl-py-0.12.0 b/metadata/md5-cache/dev-python/absl-py-0.12.0
index 81d06e02e46a..0d2b90592ad3 100644
--- a/metadata/md5-cache/dev-python/absl-py-0.12.0
+++ b/metadata/md5-cache/dev-python/absl-py-0.12.0
@@ -5,11 +5,11 @@ DESCRIPTION=Abseil Python Common Libraries
 EAPI=7
 HOMEPAGE=https://github.com/abseil/abseil-py
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/abseil/abseil-py/archive/pypi-v0.12.0.tar.gz -> absl-py-0.12.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=67834e36316009feb5078d029fdfd064
+_md5_=21c0477310409c9404c502e50a368777
diff --git a/metadata/md5-cache/dev-python/aesara-2.1.0 b/metadata/md5-cache/dev-python/aesara-2.1.0
new file mode 100644
index 000000000000..4abee21304af
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=7
+HOMEPAGE=https://github.com/aesara-devs/aesara
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.1.0.tar.gz -> aesara-rel-2.1.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b97230be7c2f7fcb94143cd8f3b589b6
diff --git a/metadata/md5-cache/dev-python/aesara-2.1.1 b/metadata/md5-cache/dev-python/aesara-2.1.1
new file mode 100644
index 000000000000..c9dec2ca86d3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=7
+HOMEPAGE=https://github.com/aesara-devs/aesara
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.1.1.tar.gz -> aesara-rel-2.1.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=68a4fadb4bfeef3895f4cfefed45df28
diff --git a/metadata/md5-cache/dev-python/agate-1.6.3 b/metadata/md5-cache/dev-python/agate-1.6.3
new file mode 100644
index 000000000000..380d5d2a39d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/agate-1.6.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python data analysis library that is optimized for humans instead of machines
+EAPI=8
+HOMEPAGE=https://github.com/wireservice/agate https://pypi.org/project/agate/
+IUSE=+xml test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/agate/agate-1.6.3.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e8f0feb87060aedc6484b037be7cea13
diff --git a/metadata/md5-cache/dev-python/agate-sql-0.5.7 b/metadata/md5-cache/dev-python/agate-sql-0.5.7
new file mode 100644
index 000000000000..00e3c2699c68
--- /dev/null
+++ b/metadata/md5-cache/dev-python/agate-sql-0.5.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Adds SQL read/write support to agate.
+EAPI=8
+HOMEPAGE=https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/
+IUSE=+xml test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/agate-sql/agate-sql-0.5.7.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6368205e29d0ca7468fa83fa04d2de92
diff --git a/metadata/md5-cache/dev-python/astor-0.8.1 b/metadata/md5-cache/dev-python/astor-0.8.1
index 40b1a0cad71c..b2bb8fc9838a 100644
--- a/metadata/md5-cache/dev-python/astor-0.8.1
+++ b/metadata/md5-cache/dev-python/astor-0.8.1
@@ -4,7 +4,7 @@ DESCRIPTION=Read/rewrite/write Python ASTs
 EAPI=7
 HOMEPAGE=https://pypi.org/project/astor/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.8.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df8814521657381b571f066879f63d58
+_md5_=8d357a15f5ce7b1680f872f142f40664
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.35.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.35.0
deleted file mode 100644
index 0b39bf1a8d5e..000000000000
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.35.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/boto3-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
-EAPI=7
-HOMEPAGE=https://github.com/aws/serverless-application-model https://pypi.org/project/aws-sam-translator/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/boto3-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.35.0.tar.gz -> aws-sam-translator-1.35.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b92df27181a839292b6cc0cf9b1c600b
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.36.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.36.0
index 3c783ed488ea..a4851b58a08c 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.36.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.36.0
@@ -4,7 +4,7 @@ DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templ
 EAPI=7
 HOMEPAGE=https://github.com/aws/serverless-application-model https://pypi.org/project/aws-sam-translator/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/boto3-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.36.0.tar.gz -> aws-sam-translator-1.36.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=715401056e1d840fe4d46114a34207ca
+_md5_=ee1e4d2b5ad34aa2f1834a5beaacbd21
diff --git a/metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0 b/metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0
new file mode 100644
index 000000000000..ecc97a52d02a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Compatibility shim providing selectable entry points
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/backports.entry_points_selectable/ https://pypi.org/project/backports.entry-points-selectable/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jaraco/backports.entry_points_selectable/archive/v1.1.0.tar.gz -> backports.entry_points_selectable-1.1.0.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e573a24a26e4b72d6239725989fd7735
diff --git a/metadata/md5-cache/dev-python/backrefs-5.0.1 b/metadata/md5-cache/dev-python/backrefs-5.0.1
index 3998b835ca31..acc70e7d7c12 100644
--- a/metadata/md5-cache/dev-python/backrefs-5.0.1
+++ b/metadata/md5-cache/dev-python/backrefs-5.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Wrapper around re or regex that adds additional back references
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/backrefs/ https://pypi.org/project/backrefs/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/backrefs/archive/5.0.1.tar.gz -> backrefs-5.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=94bc5f5d018f7c717f6fbf28806f26ea
+_md5_=6d7ff7f6daf662a819394e57ac66b647
diff --git a/metadata/md5-cache/dev-python/bitarray-2.1.0 b/metadata/md5-cache/dev-python/bitarray-2.1.0
deleted file mode 100644
index ae3b4152edf8..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Efficient arrays of booleans -- C extension
-EAPI=7
-HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c92f86920a1351dfe9c5dd898a3c9ab
diff --git a/metadata/md5-cache/dev-python/bitarray-2.1.1 b/metadata/md5-cache/dev-python/bitarray-2.1.1
deleted file mode 100644
index fa930cfc4128..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Efficient arrays of booleans -- C extension
-EAPI=7
-HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.1.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=12f61fff604a52b0c4a0dfaa10487e78
diff --git a/metadata/md5-cache/dev-python/bitarray-2.1.2 b/metadata/md5-cache/dev-python/bitarray-2.1.2
deleted file mode 100644
index 09b79c64b08d..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Efficient arrays of booleans -- C extension
-EAPI=7
-HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.1.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=12f61fff604a52b0c4a0dfaa10487e78
diff --git a/metadata/md5-cache/dev-python/bitarray-2.1.3 b/metadata/md5-cache/dev-python/bitarray-2.1.3
index 8bfdceb42a15..edc57db86d96 100644
--- a/metadata/md5-cache/dev-python/bitarray-2.1.3
+++ b/metadata/md5-cache/dev-python/bitarray-2.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Efficient arrays of booleans -- C extension
 EAPI=7
 HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-2.1.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=12f61fff604a52b0c4a0dfaa10487e78
+_md5_=5d15b2acb6c1fe059affa3325f38d03f
diff --git a/metadata/md5-cache/dev-python/bitarray-2.2.0 b/metadata/md5-cache/dev-python/bitarray-2.2.0
deleted file mode 100644
index 27442cba5c5a..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Efficient arrays of booleans -- C extension
-EAPI=8
-HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.2.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=83c3618eca0c3f422984662fe0f911ef
diff --git a/metadata/md5-cache/dev-python/bitarray-2.2.2 b/metadata/md5-cache/dev-python/bitarray-2.2.2
new file mode 100644
index 000000000000..5af5fe9db106
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitarray-2.2.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Efficient arrays of booleans -- C extension
+EAPI=8
+HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=PSF-2
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/bitarray/bitarray-2.2.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=83c3618eca0c3f422984662fe0f911ef
diff --git a/metadata/md5-cache/dev-python/black-21.4_beta1 b/metadata/md5-cache/dev-python/black-21.4_beta1
deleted file mode 100644
index 06ff883307f2..000000000000
--- a/metadata/md5-cache/dev-python/black-21.4_beta1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/aiohttp-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=The uncompromising Python code formatter
-EAPI=7
-HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/psf/black/archive/21.4b1.tar.gz -> black-21.4b1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=312c71c9d0fb7f8a545d3b9bca3e0c86
diff --git a/metadata/md5-cache/dev-python/black-21.4_beta2 b/metadata/md5-cache/dev-python/black-21.4_beta2
deleted file mode 100644
index b8df80dd6195..000000000000
--- a/metadata/md5-cache/dev-python/black-21.4_beta2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/aiohttp-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=The uncompromising Python code formatter
-EAPI=7
-HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/psf/black/archive/21.4b2.tar.gz -> black-21.4b2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=312c71c9d0fb7f8a545d3b9bca3e0c86
diff --git a/metadata/md5-cache/dev-python/black-21.5_beta1 b/metadata/md5-cache/dev-python/black-21.5_beta1
deleted file mode 100644
index 2eba22ad5a92..000000000000
--- a/metadata/md5-cache/dev-python/black-21.5_beta1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/aiohttp-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=The uncompromising Python code formatter
-EAPI=7
-HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/psf/black/archive/21.5b1.tar.gz -> black-21.5b1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ddfe9b516b84db086a799c4bf0f6c3e5
diff --git a/metadata/md5-cache/dev-python/black-21.5_beta2 b/metadata/md5-cache/dev-python/black-21.5_beta2
deleted file mode 100644
index 62bdf2346afd..000000000000
--- a/metadata/md5-cache/dev-python/black-21.5_beta2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/aiohttp-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=The uncompromising Python code formatter
-EAPI=7
-HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/psf/black/archive/21.5b2.tar.gz -> black-21.5b2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=15353d5204fd8e8b5e386be03a815fde
diff --git a/metadata/md5-cache/dev-python/black-21.6_beta0 b/metadata/md5-cache/dev-python/black-21.6_beta0
index 764ab16452a2..203cb34e631d 100644
--- a/metadata/md5-cache/dev-python/black-21.6_beta0
+++ b/metadata/md5-cache/dev-python/black-21.6_beta0
@@ -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 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/21.6b0.tar.gz -> black-21.6b0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0cff0ead905e23b9d75d6df14b578989
+_md5_=dcceaf2d8297530a892cba4d5a5248cc
diff --git a/metadata/md5-cache/dev-python/black-21.7_beta0 b/metadata/md5-cache/dev-python/black-21.7_beta0
new file mode 100644
index 000000000000..0a42c4ed4f11
--- /dev/null
+++ b/metadata/md5-cache/dev-python/black-21.7_beta0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/aiohttp-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=The uncompromising Python code formatter
+EAPI=7
+HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/psf/black/archive/21.7b0.tar.gz -> black-21.7b0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=870f10b0e0f7ee519b5f27413d8e9d61
diff --git a/metadata/md5-cache/dev-python/bleach-3.3.1 b/metadata/md5-cache/dev-python/bleach-3.3.1
new file mode 100644
index 000000000000..9255b269d5b3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bleach-3.3.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An easy whitelist-based HTML-sanitizing tool
+EAPI=8
+HOMEPAGE=https://github.com/mozilla/bleach/ https://pypi.org/project/bleach/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/bleach/bleach-3.3.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b558099959f812915ae6b8cd82840e14
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.104 b/metadata/md5-cache/dev-python/boto3-1.17.104
index ce5284ca02b4..3e211aa78f82 100644
--- a/metadata/md5-cache/dev-python/boto3-1.17.104
+++ b/metadata/md5-cache/dev-python/boto3-1.17.104
@@ -4,7 +4,7 @@ DESCRIPTION=The AWS SDK for Python
 EAPI=8
 HOMEPAGE=https://github.com/boto/boto3
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.20.104[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.17.104.tar.gz -> boto3-1.17.104.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da4dc8966b899e2a909bab7490a90462
+_md5_=60ccd6855708ec8d84acc3ecb08a3612
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.105 b/metadata/md5-cache/dev-python/boto3-1.17.105
deleted file mode 100644
index 5ff761a2278c..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.17.105
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.20.105[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.105[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.17.105.tar.gz -> boto3-1.17.105.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da4dc8966b899e2a909bab7490a90462
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.106 b/metadata/md5-cache/dev-python/boto3-1.17.106
deleted file mode 100644
index 33474d6a699e..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.17.106
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.20.106[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.106[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.17.106.tar.gz -> boto3-1.17.106.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da4dc8966b899e2a909bab7490a90462
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.107 b/metadata/md5-cache/dev-python/boto3-1.17.107
deleted file mode 100644
index 8f11860ddc73..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.17.107
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.20.107[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.107[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.17.107.tar.gz -> boto3-1.17.107.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da4dc8966b899e2a909bab7490a90462
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.108 b/metadata/md5-cache/dev-python/boto3-1.17.108
deleted file mode 100644
index a91d9d4c1c35..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.17.108
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.20.108[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.108[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.17.108.tar.gz -> boto3-1.17.108.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da4dc8966b899e2a909bab7490a90462
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.109 b/metadata/md5-cache/dev-python/boto3-1.17.109
deleted file mode 100644
index a19cb6e69072..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.17.109
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.20.109[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.109[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.17.109.tar.gz -> boto3-1.17.109.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da4dc8966b899e2a909bab7490a90462
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.112 b/metadata/md5-cache/dev-python/boto3-1.17.112
new file mode 100644
index 000000000000..db6db6b0a8c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.112
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.20.112[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.112[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.17.112.tar.gz -> boto3-1.17.112.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=da4dc8966b899e2a909bab7490a90462
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.97 b/metadata/md5-cache/dev-python/boto3-1.17.97
deleted file mode 100644
index a2a91e20ad27..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.17.97
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.20.97[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=7
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.97[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.17.97.tar.gz -> boto3-1.17.97.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=67d7db69a218639ec6ec39ad1be41911
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.0 b/metadata/md5-cache/dev-python/boto3-1.18.0
new file mode 100644
index 000000000000..2c31de917013
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.0.tar.gz -> boto3-1.18.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.1 b/metadata/md5-cache/dev-python/boto3-1.18.1
new file mode 100644
index 000000000000..4e45a0a36fc4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.1.tar.gz -> boto3-1.18.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.104 b/metadata/md5-cache/dev-python/botocore-1.20.104
index abdf37118060..385b10b7008c 100644
--- a/metadata/md5-cache/dev-python/botocore-1.20.104
+++ b/metadata/md5-cache/dev-python/botocore-1.20.104
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level, data-driven core of boto 3
 EAPI=8
 HOMEPAGE=https://github.com/boto/botocore
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.20.104.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
+_md5_=5f28598add674dfc967045ac2385739e
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.105 b/metadata/md5-cache/dev-python/botocore-1.20.105
deleted file mode 100644
index 45792b8c99e0..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.20.105
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.20.105.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.106 b/metadata/md5-cache/dev-python/botocore-1.20.106
deleted file mode 100644
index 3af36521a268..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.20.106
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.20.106.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.107 b/metadata/md5-cache/dev-python/botocore-1.20.107
deleted file mode 100644
index 15c784d0a537..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.20.107
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.20.107.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.108 b/metadata/md5-cache/dev-python/botocore-1.20.108
deleted file mode 100644
index 9318a866aa15..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.20.108
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.20.108.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.109 b/metadata/md5-cache/dev-python/botocore-1.20.109
deleted file mode 100644
index 15c304f55755..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.20.109
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.20.109.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.112 b/metadata/md5-cache/dev-python/botocore-1.20.112
new file mode 100644
index 000000000000..91af9fa6ab4d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.112
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.20.112.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.97 b/metadata/md5-cache/dev-python/botocore-1.20.97
deleted file mode 100644
index 5d92ef28c445..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.20.97
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=7
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.20.97.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a7bed5bb119e705becca61f76cc6a10b
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.0 b/metadata/md5-cache/dev-python/botocore-1.21.0
new file mode 100644
index 000000000000..294185bec099
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.1 b/metadata/md5-cache/dev-python/botocore-1.21.1
new file mode 100644
index 000000000000..872d9b6d3274
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/bracex-2.1.1 b/metadata/md5-cache/dev-python/bracex-2.1.1
index 748b37e59320..e87903e74d19 100644
--- a/metadata/md5-cache/dev-python/bracex-2.1.1
+++ b/metadata/md5-cache/dev-python/bracex-2.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Bash style brace expansion for Python
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/bracex/ https://pypi.org/project/bracex/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/bracex/archive/2.1.1.tar.gz -> bracex-2.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9cdad4688cd0dc2667af5f2b6a88b3b0
+_md5_=3a2cc53fe785a16c0928a72600bdfa62
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.2.0 b/metadata/md5-cache/dev-python/cairocffi-1.2.0
index ff7b5d5d88e9..a7a1896d18b8 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.2.0
+++ b/metadata/md5-cache/dev-python/cairocffi-1.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=CFFI-based drop-in replacement for Pycairo
 EAPI=7
 HOMEPAGE=https://github.com/Kozea/cairocffi
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/xcffib-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-1.2.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=fe3ef19adfb0a34e7a435ceb053cab97
+_md5_=ea5382317321d7f3c7569d0d550dcc94
diff --git a/metadata/md5-cache/dev-python/cfgv-3.3.0 b/metadata/md5-cache/dev-python/cfgv-3.3.0
index ab0e699f30b7..b0111c3e6f97 100644
--- a/metadata/md5-cache/dev-python/cfgv-3.3.0
+++ b/metadata/md5-cache/dev-python/cfgv-3.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Validate configuration and produce human-readable error messages
 EAPI=7
 HOMEPAGE=https://github.com/asottile/cfgv
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~hppa ~riscv
+KEYWORDS=amd64 ~hppa ~ppc ~riscv
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asottile/cfgv/archive/refs/tags/v3.3.0.tar.gz -> cfgv-3.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=90342d2630c03abf237774cd624ac2e5
+_md5_=b198a92054b738436129c01c887bd3cb
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
new file mode 100644
index 000000000000..b61f7f69cb8e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The Real First Universal Charset Detector
+EAPI=8
+HOMEPAGE=https://pypi.org/project/charset-normalizer/ https://github.com/ousret/charset_normalizer/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Ousret/charset_normalizer/archive/2.0.3.tar.gz -> charset_normalizer-2.0.3.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a56186e0de4d83aeb5ecd4ebab7b92a6
diff --git a/metadata/md5-cache/dev-python/click-help-colors-0.9.1 b/metadata/md5-cache/dev-python/click-help-colors-0.9.1
new file mode 100644
index 000000000000..fd88c0255576
--- /dev/null
+++ b/metadata/md5-cache/dev-python/click-help-colors-0.9.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Colorization of help messages in Click
+EAPI=8
+HOMEPAGE=https://github.com/click-contrib/click-help-colors
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/click-contrib/click-help-colors/archive/0.9.1.tar.gz -> click-help-colors-0.9.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9fa36bb41b97ceec03a6c17429e4000a
diff --git a/metadata/md5-cache/dev-python/cmd2-1.5.0 b/metadata/md5-cache/dev-python/cmd2-1.5.0
deleted file mode 100644
index f8fcf5211965..000000000000
--- a/metadata/md5-cache/dev-python/cmd2-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/which || ( x11-misc/xclip x11-misc/xsel ) ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extra features for standard library's cmd module
-EAPI=7
-HOMEPAGE=https://github.com/python-cmd2/cmd2
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cmd2/cmd2-1.5.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=6bf726373592026c3dce4f1e294724c0
diff --git a/metadata/md5-cache/dev-python/cmd2-2.0.1 b/metadata/md5-cache/dev-python/cmd2-2.0.1
deleted file mode 100644
index 89eebf4b5a99..000000000000
--- a/metadata/md5-cache/dev-python/cmd2-2.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/which || ( x11-misc/xclip x11-misc/xsel ) ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extra features for standard library's cmd module
-EAPI=7
-HOMEPAGE=https://github.com/python-cmd2/cmd2
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cmd2/cmd2-2.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=e002d2edcaa50f9a062e1aa42590764e
diff --git a/metadata/md5-cache/dev-python/cmd2-2.1.0 b/metadata/md5-cache/dev-python/cmd2-2.1.0
deleted file mode 100644
index ede7537034d6..000000000000
--- a/metadata/md5-cache/dev-python/cmd2-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/which || ( x11-misc/xclip x11-misc/xsel ) ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extra features for standard library's cmd module
-EAPI=7
-HOMEPAGE=https://github.com/python-cmd2/cmd2
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cmd2/cmd2-2.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=e002d2edcaa50f9a062e1aa42590764e
diff --git a/metadata/md5-cache/dev-python/cmd2-2.1.1 b/metadata/md5-cache/dev-python/cmd2-2.1.1
index bd6686083a92..1640cba3b288 100644
--- a/metadata/md5-cache/dev-python/cmd2-2.1.1
+++ b/metadata/md5-cache/dev-python/cmd2-2.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Extra features for standard library's cmd module
 EAPI=7
 HOMEPAGE=https://github.com/python-cmd2/cmd2
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-2.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=ff61e384e0c53b699943d5c39c43df7a
+_md5_=024f86560f7720625349f3c12cb7c20c
diff --git a/metadata/md5-cache/dev-python/croniter-1.0.12 b/metadata/md5-cache/dev-python/croniter-1.0.12
deleted file mode 100644
index 261e43cb75d4..000000000000
--- a/metadata/md5-cache/dev-python/croniter-1.0.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tzlocal[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module to provide iteration for datetime object
-EAPI=7
-HOMEPAGE=https://github.com/kiorky/croniter https://pypi.org/project/croniter/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/croniter/croniter-1.0.12.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c2b016016a799add49533bf0d5171c98
diff --git a/metadata/md5-cache/dev-python/croniter-1.0.13 b/metadata/md5-cache/dev-python/croniter-1.0.13
deleted file mode 100644
index b32372a245e0..000000000000
--- a/metadata/md5-cache/dev-python/croniter-1.0.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tzlocal[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module to provide iteration for datetime object
-EAPI=7
-HOMEPAGE=https://github.com/kiorky/croniter https://pypi.org/project/croniter/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/croniter/croniter-1.0.13.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea96ba6e1cc17f0699bc515f97f81f7e
diff --git a/metadata/md5-cache/dev-python/croniter-1.0.15 b/metadata/md5-cache/dev-python/croniter-1.0.15
index 2a0c7c191ae3..c61e1cdd5edd 100644
--- a/metadata/md5-cache/dev-python/croniter-1.0.15
+++ b/metadata/md5-cache/dev-python/croniter-1.0.15
@@ -4,7 +4,7 @@ DESCRIPTION=Python module to provide iteration for datetime object
 EAPI=7
 HOMEPAGE=https://github.com/kiorky/croniter https://pypi.org/project/croniter/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-1.0.15.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea96ba6e1cc17f0699bc515f97f81f7e
+_md5_=8958ceee2bd1c259cadb46966699b9ca
diff --git a/metadata/md5-cache/dev-python/csvkit-1.0.6 b/metadata/md5-cache/dev-python/csvkit-1.0.6
new file mode 100644
index 000000000000..588be5c5f41e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/csvkit-1.0.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A suite of utilities for converting to and working with CSV.
+EAPI=8
+HOMEPAGE=https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/
+IUSE=test +xml test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/csvkit/csvkit-1.0.6.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b7eb7c402afd02f28357d6dace7285cf
diff --git a/metadata/md5-cache/dev-python/cython-0.29.23 b/metadata/md5-cache/dev-python/cython-0.29.23
index d5ce6f6d0c0f..47a13fb80b86 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.23
+++ b/metadata/md5-cache/dev-python/cython-0.29.23
@@ -4,7 +4,7 @@ DESCRIPTION=A Python to C compiler
 EAPI=7
 HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
 IUSE=emacs test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.23.tar.gz -> cython-0.29.23.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b1402fbf5339d5cbdd4c7757f0b86214
+_md5_=e71f9d3a3c21d3fdceb2048bfa96a805
diff --git a/metadata/md5-cache/dev-python/cython-0.29.24 b/metadata/md5-cache/dev-python/cython-0.29.24
new file mode 100644
index 000000000000..6c8e489de465
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cython-0.29.24
@@ -0,0 +1,15 @@
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) doc? ( || ( ( dev-lang/python:3.10[threads(+)] dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=A Python to C compiler
+EAPI=8
+HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
+IUSE=emacs test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cython/cython/archive/0.29.24.tar.gz -> cython-0.29.24.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f3bf824f60b03bba99a96f63e39b58cf
diff --git a/metadata/md5-cache/dev-python/dask-2021.5.0 b/metadata/md5-cache/dev-python/dask-2021.5.0
deleted file mode 100644
index bbd7826b26af..000000000000
--- a/metadata/md5-cache/dev-python/dask-2021.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/sqlalchemy-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
-EAPI=7
-HOMEPAGE=https://dask.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dask/dask-2021.5.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=450f97d6ad3d86954aabde1e932b22f7
diff --git a/metadata/md5-cache/dev-python/dask-2021.6.0 b/metadata/md5-cache/dev-python/dask-2021.6.0
deleted file mode 100644
index cfa31dfc2d69..000000000000
--- a/metadata/md5-cache/dev-python/dask-2021.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/sqlalchemy-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
-EAPI=7
-HOMEPAGE=https://dask.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dask/dask-2021.6.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e2d1ec14ae6d6678dad013eb98c7112b
diff --git a/metadata/md5-cache/dev-python/dask-2021.6.1 b/metadata/md5-cache/dev-python/dask-2021.6.1
deleted file mode 100644
index 090abe22e50a..000000000000
--- a/metadata/md5-cache/dev-python/dask-2021.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/sqlalchemy-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
-EAPI=7
-HOMEPAGE=https://dask.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dask/dask-2021.6.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e2d1ec14ae6d6678dad013eb98c7112b
diff --git a/metadata/md5-cache/dev-python/dask-2021.6.2 b/metadata/md5-cache/dev-python/dask-2021.6.2
index f76acf1f8b2b..9543add34d44 100644
--- a/metadata/md5-cache/dev-python/dask-2021.6.2
+++ b/metadata/md5-cache/dev-python/dask-2021.6.2
@@ -4,7 +4,7 @@ DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
 EAPI=7
 HOMEPAGE=https://dask.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-2021.6.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e2d1ec14ae6d6678dad013eb98c7112b
+_md5_=b800a62a48dfe013e0dd5b1e32762dc0
diff --git a/metadata/md5-cache/dev-python/dj-database-url-0.5.0 b/metadata/md5-cache/dev-python/dj-database-url-0.5.0
index 51a28714f632..e08a1508f1ee 100644
--- a/metadata/md5-cache/dev-python/dj-database-url-0.5.0
+++ b/metadata/md5-cache/dev-python/dj-database-url-0.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Use Database URLs in your Django Application
 EAPI=7
 HOMEPAGE=https://pypi.org/project/dj-database-url/ https://github.com/jacobian/dj-database-url
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jacobian/dj-database-url/archive/v0.5.0.tar.gz -> dj-database-url-0.5.0.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0fb089c6ea8da64c06c640d3725ea3cc
+_md5_=e6a15902665fb3c6fc7057c428a0ca24
diff --git a/metadata/md5-cache/dev-python/dj-email-url-1.0.2 b/metadata/md5-cache/dev-python/dj-email-url-1.0.2
index 061ea9702050..59d80f030b97 100644
--- a/metadata/md5-cache/dev-python/dj-email-url-1.0.2
+++ b/metadata/md5-cache/dev-python/dj-email-url-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Use an URL to configure email backend settings in your Django Applic
 EAPI=7
 HOMEPAGE=https://github.com/migonzalvar/dj-email-url
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/migonzalvar/dj-email-url/archive/refs/tags/v1.0.2.tar.gz -> dj-email-url-1.0.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=724ad3db9454672874dd3d8a654fb50d
+_md5_=79fb9eb8f2267b80ed61ef60e1d18d1b
diff --git a/metadata/md5-cache/dev-python/dj-search-url-0.1 b/metadata/md5-cache/dev-python/dj-search-url-0.1
index 55f5f6ae504f..65eff5c1dfc9 100644
--- a/metadata/md5-cache/dev-python/dj-search-url-0.1
+++ b/metadata/md5-cache/dev-python/dj-search-url-0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Use Search URLs in your Django Haystack Application
 EAPI=7
 HOMEPAGE=https://pypi.org/project/dj-search-url/ https://github.com/dstufft/dj-search-url/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dj-search-url/dj-search-url-0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4b1caab0754cd9b1ce76e87fbb3b3b07
+_md5_=4f4305fb1ab445a58f06a129a67d1644
diff --git a/metadata/md5-cache/dev-python/django-2.2.24 b/metadata/md5-cache/dev-python/django-2.2.24
index e77413e6a440..a314b07d61e1 100644
--- a/metadata/md5-cache/dev-python/django-2.2.24
+++ b/metadata/md5-cache/dev-python/django-2.2.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/2.2/Django-2.2.24.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-2.2.24.checksum.txt )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
 _md5_=aa460f2d5d13ca216f9e16564ab083be
diff --git a/metadata/md5-cache/dev-python/django-3.1.13 b/metadata/md5-cache/dev-python/django-3.1.13
index d7a50cc2ed4c..61cfe6b800b0 100644
--- a/metadata/md5-cache/dev-python/django-3.1.13
+++ b/metadata/md5-cache/dev-python/django-3.1.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.1/Django-3.1.13.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.1.13.checksum.txt )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
 _md5_=ef6e6af8165fbaeeef1ba5c1b940881c
diff --git a/metadata/md5-cache/dev-python/django-3.2.5 b/metadata/md5-cache/dev-python/django-3.2.5
index d725e2838970..8edbefa25ad4 100644
--- a/metadata/md5-cache/dev-python/django-3.2.5
+++ b/metadata/md5-cache/dev-python/django-3.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.5.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.5.checksum.txt )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
 _md5_=214b9422c81b0f038163bbe0ecef783a
diff --git a/metadata/md5-cache/dev-python/django-allauth-0.45.0 b/metadata/md5-cache/dev-python/django-allauth-0.45.0
new file mode 100644
index 000000000000..a9780ecce5d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-allauth-0.45.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python3-openid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Django 3rd party (social) account authentication
+EAPI=8
+HOMEPAGE=https://www.intenct.nl/projects/django-allauth/ https://github.com/pennersr/django-allauth/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python3-openid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/django-allauth/django-allauth-0.45.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bc8a3799b6d9656693239387b977a117
diff --git a/metadata/md5-cache/dev-python/django-cache-url-3.2.3 b/metadata/md5-cache/dev-python/django-cache-url-3.2.3
index 6a3b9239660b..72255a970690 100644
--- a/metadata/md5-cache/dev-python/django-cache-url-3.2.3
+++ b/metadata/md5-cache/dev-python/django-cache-url-3.2.3
@@ -4,7 +4,7 @@ DESCRIPTION=Use Cache URLs in your Django application
 EAPI=7
 HOMEPAGE=https://github.com/epicserve/django-cache-url
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/epicserve/django-cache-url/archive/3480e70bb19eef22f4e1beeddd236f44414ac5ac.tar.gz -> django-cache-url-3.2.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b17610199a79adfe9d1ebbeb42f4afba
+_md5_=bf279daf1df9487a023a448289d2c8a2
diff --git a/metadata/md5-cache/dev-python/django-configurations-2.2 b/metadata/md5-cache/dev-python/django-configurations-2.2
index 5f4db844c478..6a80f80dfc1c 100644
--- a/metadata/md5-cache/dev-python/django-configurations-2.2
+++ b/metadata/md5-cache/dev-python/django-configurations-2.2
@@ -4,7 +4,7 @@ DESCRIPTION=A helper for organizing Django settings
 EAPI=7
 HOMEPAGE=https://pypi.org/project/django-configurations/ https://github.com/jazzband/django-configurations/ https://django-configurations.readthedocs.io/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jazzband/django-configurations/archive/2.2.tar.gz -> django-configurations-2.2.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9912f1fb23b8d484fa693626493f2fa7
+_md5_=57eac7a456f473386f2620ab573a2baa
diff --git a/metadata/md5-cache/dev-python/docutils-0.17 b/metadata/md5-cache/dev-python/docutils-0.17
deleted file mode 100644
index 20418ffcedc8..000000000000
--- a/metadata/md5-cache/dev-python/docutils-0.17
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Documentation Utilities
-EAPI=7
-HOMEPAGE=https://docutils.sourceforge.io/ https://pypi.org/project/docutils/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2 GPL-3 public-domain
-RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docutils/docutils-0.17.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1febad8c87620798eca8b1c1f45f1b86
diff --git a/metadata/md5-cache/dev-python/docutils-0.17.1 b/metadata/md5-cache/dev-python/docutils-0.17.1
index 5b10235f5b67..c9f8d4a01ccd 100644
--- a/metadata/md5-cache/dev-python/docutils-0.17.1
+++ b/metadata/md5-cache/dev-python/docutils-0.17.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python Documentation Utilities
 EAPI=7
 HOMEPAGE=https://docutils.sourceforge.io/ https://pypi.org/project/docutils/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils/docutils-0.17.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2cab8cf7299855bf11ba9f83fd05e798
+_md5_=ac427d554ea0b6fe0aff2d4a274edfb3
diff --git a/metadata/md5-cache/dev-python/doit-0.33.1 b/metadata/md5-cache/dev-python/doit-0.33.1
index 40d556bba616..40f0918d4dc3 100644
--- a/metadata/md5-cache/dev-python/doit-0.33.1
+++ b/metadata/md5-cache/dev-python/doit-0.33.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/doit/doit-0.33.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e87fe4bc99f1ce1d840727a270aaf7ab
diff --git a/metadata/md5-cache/dev-python/dulwich-0.20.23 b/metadata/md5-cache/dev-python/dulwich-0.20.23
index 3f8e8850ed58..548ec6df4aca 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.20.23
+++ b/metadata/md5-cache/dev-python/dulwich-0.20.23
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !hppa? ( !ia64? ( dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/geventhttpclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/fastimport[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !hppa? ( !ia64? ( dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/geventhttpclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) app-crypt/gpgme[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/fastimport[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure-Python implementation of the Git file formats and protocols
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.20.23.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6f11cd648e9b5c38b78505deb50c7f9c
+_md5_=edb98a0767e165b2fc21604ff1f6986f
diff --git a/metadata/md5-cache/dev-python/editdistance-s-1.0.0 b/metadata/md5-cache/dev-python/editdistance-s-1.0.0
index e5db87eef46f..5e5d766922e7 100644
--- a/metadata/md5-cache/dev-python/editdistance-s-1.0.0
+++ b/metadata/md5-cache/dev-python/editdistance-s-1.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Fast implementation of edit (Levenshtein) distance
 EAPI=7
 HOMEPAGE=https://github.com/asottile/editdistance-s
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~hppa ~riscv
+KEYWORDS=amd64 ~hppa ~ppc ~riscv
 LICENSE=MIT
 RDEPEND=virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asottile/editdistance-s/archive/refs/tags/v1.0.0.tar.gz -> editdistance-s-1.0.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=abdb1906fa208e3af2e346d797e97e92
+_md5_=3eed510c0e55ca9cd7321b97878443aa
diff --git a/metadata/md5-cache/dev-python/eventlet-0.31.0 b/metadata/md5-cache/dev-python/eventlet-0.31.0
index 7d8ebfe75594..ed3320a58656 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.31.0
+++ b/metadata/md5-cache/dev-python/eventlet-0.31.0
@@ -4,7 +4,7 @@ DESCRIPTION=Highly concurrent networking library
 EAPI=7
 HOMEPAGE=https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/
 IUSE=doc examples doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/dnspython-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.31.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5815cf62665658f0225c317bb80e79ac
+_md5_=0d81f1bc9837ddefe10f3969aed3ffe3
diff --git a/metadata/md5-cache/dev-python/eventlet-0.31.1 b/metadata/md5-cache/dev-python/eventlet-0.31.1
new file mode 100644
index 000000000000..51fad0b2a862
--- /dev/null
+++ b/metadata/md5-cache/dev-python/eventlet-0.31.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/dnspython-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/dnspython-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Highly concurrent networking library
+EAPI=8
+HOMEPAGE=https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/
+IUSE=examples test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/dnspython-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/e/eventlet/eventlet-0.31.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f0f6b20fd2825e3f21e2a4e81e05ce7b
diff --git a/metadata/md5-cache/dev-python/fasteners-0.16-r1 b/metadata/md5-cache/dev-python/fasteners-0.16-r1
deleted file mode 100644
index 359aa5c1b087..000000000000
--- a/metadata/md5-cache/dev-python/fasteners-0.16-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/diskcache[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python package that provides useful locks
-EAPI=7
-HOMEPAGE=https://github.com/harlowja/fasteners
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/fasteners/fasteners-0.16.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f90c26f5cc7d3bee2f23f55f78d1433c
diff --git a/metadata/md5-cache/dev-python/fasteners-0.16.2 b/metadata/md5-cache/dev-python/fasteners-0.16.2
deleted file mode 100644
index 56e325fcb8d1..000000000000
--- a/metadata/md5-cache/dev-python/fasteners-0.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/diskcache[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python package that provides useful locks
-EAPI=7
-HOMEPAGE=https://github.com/harlowja/fasteners/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/harlowja/fasteners/archive/0.16.2.tar.gz -> fasteners-0.16.2.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5ee825207239886c0020f553d36cceaa
diff --git a/metadata/md5-cache/dev-python/fasteners-0.16.3 b/metadata/md5-cache/dev-python/fasteners-0.16.3
index 16f35304beb1..1f4bef1f0402 100644
--- a/metadata/md5-cache/dev-python/fasteners-0.16.3
+++ b/metadata/md5-cache/dev-python/fasteners-0.16.3
@@ -4,7 +4,7 @@ DESCRIPTION=Python package that provides useful locks
 EAPI=7
 HOMEPAGE=https://github.com/harlowja/fasteners/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/harlowja/fasteners/archive/0.16.3.tar.gz -> fasteners-0.16.3.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9cddbba1a79c0f5951bab84c4e5c158e
+_md5_=e5aad90e6a9a4e43240733300acf09e0
diff --git a/metadata/md5-cache/dev-python/flask-migrate-2.7.0 b/metadata/md5-cache/dev-python/flask-migrate-2.7.0
deleted file mode 100644
index d436aeb03715..000000000000
--- a/metadata/md5-cache/dev-python/flask-migrate-2.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/flask-script-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/alembic-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=SQLAlchemy database migrations for Flask applications using Alembic
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Flask-Migrate/
-IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/alembic-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-2.7.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=51ebf8bf8c26ee732a286427c7eccd9b
diff --git a/metadata/md5-cache/dev-python/flask-migrate-3.0.0 b/metadata/md5-cache/dev-python/flask-migrate-3.0.0
deleted file mode 100644
index 094b4cfa20b3..000000000000
--- a/metadata/md5-cache/dev-python/flask-migrate-3.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/alembic-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=SQLAlchemy database migrations for Flask applications using Alembic
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Flask-Migrate/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/alembic-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-3.0.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aa485a2948892019aba0cbb1214c301d
diff --git a/metadata/md5-cache/dev-python/flask-migrate-3.0.1 b/metadata/md5-cache/dev-python/flask-migrate-3.0.1
deleted file mode 100644
index a62c2a457308..000000000000
--- a/metadata/md5-cache/dev-python/flask-migrate-3.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/alembic-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=SQLAlchemy database migrations for Flask applications using Alembic
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Flask-Migrate/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/alembic-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-3.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aa485a2948892019aba0cbb1214c301d
diff --git a/metadata/md5-cache/dev-python/flask-migrate-3.0.1-r1 b/metadata/md5-cache/dev-python/flask-migrate-3.0.1-r1
new file mode 100644
index 000000000000..647f4244784b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-migrate-3.0.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/alembic-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/flask-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=SQLAlchemy database migrations for Flask applications using Alembic
+EAPI=7
+HOMEPAGE=https://pypi.org/project/Flask-Migrate/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-python/alembic-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/flask-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-3.0.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8a16779c0d976349c4f1b031e416be6a
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.14.3 b/metadata/md5-cache/dev-python/flask-wtf-0.14.3
deleted file mode 100644
index 06b6f7056920..000000000000
--- a/metadata/md5-cache/dev-python/flask-wtf-0.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wtforms-1.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wtforms-1.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple integration of Flask and WTForms
-EAPI=7
-HOMEPAGE=https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/
-IUSE=doc test doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wtforms-1.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Flask-WTF/Flask-WTF-0.14.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dd5e0faf2bbd9c1682059cfb95707813
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.15.1 b/metadata/md5-cache/dev-python/flask-wtf-0.15.1
index c1b8e3fb8da8..e7824ad22a6a 100644
--- a/metadata/md5-cache/dev-python/flask-wtf-0.15.1
+++ b/metadata/md5-cache/dev-python/flask-wtf-0.15.1
@@ -4,7 +4,7 @@ DESCRIPTION=Simple integration of Flask and WTForms
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/
 IUSE=doc test doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wtforms-1.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-WTF/Flask-WTF-0.15.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d44fdeb293e5b2493966aaef4ad3167f
+_md5_=a9ae4aa4e74d1ae5040f1bf21cd76246
diff --git a/metadata/md5-cache/dev-python/fonttools-4.23.1 b/metadata/md5-cache/dev-python/fonttools-4.23.1
deleted file mode 100644
index 0064ea1efac0..000000000000
--- a/metadata/md5-cache/dev-python/fonttools-4.23.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-arch/zopfli ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
-EAPI=7
-HOMEPAGE=https://github.com/fonttools/fonttools/
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fonttools/fonttools/archive/4.23.1.tar.gz -> fonttools-4.23.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=aa22d214d26cd2e15e1aa987f6948a26
diff --git a/metadata/md5-cache/dev-python/fonttools-4.24.4 b/metadata/md5-cache/dev-python/fonttools-4.24.4
deleted file mode 100644
index cf9228088f39..000000000000
--- a/metadata/md5-cache/dev-python/fonttools-4.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-arch/zopfli ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
-EAPI=7
-HOMEPAGE=https://github.com/fonttools/fonttools/
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fonttools/fonttools/archive/4.24.4.tar.gz -> fonttools-4.24.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=206f746006b413ac614989cf1b59f006
diff --git a/metadata/md5-cache/dev-python/fonttools-4.25.1 b/metadata/md5-cache/dev-python/fonttools-4.25.1
new file mode 100644
index 000000000000..23ba8d0f3942
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fonttools-4.25.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-arch/zopfli ) test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
+EAPI=7
+HOMEPAGE=https://github.com/fonttools/fonttools/
+IUSE=test python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fonttools/fonttools/archive/4.25.1.tar.gz -> fonttools-4.25.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=f744027b4dbb3ce3b60bd7b2d1b6c0e0
diff --git a/metadata/md5-cache/dev-python/frozen-flask-0.15 b/metadata/md5-cache/dev-python/frozen-flask-0.15
deleted file mode 100644
index ab1a11985828..000000000000
--- a/metadata/md5-cache/dev-python/frozen-flask-0.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/flask-0.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Freezes a Flask application into a set of static files
-EAPI=7
-HOMEPAGE=https://github.com/Frozen-Flask/Frozen-Flask https://pypi.org/project/Frozen-Flask/
-IUSE=doc test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Frozen-Flask/Frozen-Flask-0.15.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c08527b6805f3b60d9bf055277e07380
diff --git a/metadata/md5-cache/dev-python/frozen-flask-0.17 b/metadata/md5-cache/dev-python/frozen-flask-0.17
deleted file mode 100644
index 4ac756febd6c..000000000000
--- a/metadata/md5-cache/dev-python/frozen-flask-0.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/flask-sphinx-themes[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/flask-sphinx-themes[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/flask-sphinx-themes[python_targets_pypy3(-)] ) ) ) test? ( <dev-python/flask-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Freezes a Flask application into a set of static files
-EAPI=7
-HOMEPAGE=https://github.com/Frozen-Flask/Frozen-Flask https://pypi.org/project/Frozen-Flask/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=<dev-python/flask-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Frozen-Flask/Frozen-Flask-0.17.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f28de8febe99606f20297309d983376
diff --git a/metadata/md5-cache/dev-python/frozen-flask-0.18 b/metadata/md5-cache/dev-python/frozen-flask-0.18
index 96d3c9bf3e99..9f8dee0fe32b 100644
--- a/metadata/md5-cache/dev-python/frozen-flask-0.18
+++ b/metadata/md5-cache/dev-python/frozen-flask-0.18
@@ -4,7 +4,7 @@ DESCRIPTION=Freezes a Flask application into a set of static files
 EAPI=7
 HOMEPAGE=https://github.com/Frozen-Flask/Frozen-Flask https://pypi.org/project/Frozen-Flask/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Frozen-Flask/Frozen-Flask-0.18.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c3876b4b27e0b5b2c08fb436ff3fa07
+_md5_=677651ede6a6870c90ba47f2006a4f63
diff --git a/metadata/md5-cache/dev-python/fsspec-2021.07.0 b/metadata/md5-cache/dev-python/fsspec-2021.07.0
new file mode 100644
index 000000000000..dbfbd73c045c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fsspec-2021.07.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A specification that python filesystems should adhere to
+EAPI=7
+HOMEPAGE=https://github.com/intake/filesystem_spec/ https://pypi.org/project/fsspec/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intake/filesystem_spec/archive/2021.07.0.tar.gz -> filesystem_spec-2021.07.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0012a85113c6d115c1c79e32dcf9522d
diff --git a/metadata/md5-cache/dev-python/genshi-0.7.5 b/metadata/md5-cache/dev-python/genshi-0.7.5
index cd26912d8b2a..9ec5ef57364f 100644
--- a/metadata/md5-cache/dev-python/genshi-0.7.5
+++ b/metadata/md5-cache/dev-python/genshi-0.7.5
@@ -4,7 +4,7 @@ DESCRIPTION=Python toolkit for stream-based generation of output for the web
 EAPI=7
 HOMEPAGE=https://genshi.edgewall.org/ https://pypi.org/project/Genshi/
 IUSE=doc examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/G/Genshi/Genshi-0.7.5.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eaa3798e519c5ed6653ede95f2284cbf
+_md5_=8c3a98f680dcc2069ad0e24e6308d790
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.4.5 b/metadata/md5-cache/dev-python/geventhttpclient-1.4.5
index 8e20cae73a99..12e6129b3a3e 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.4.5
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.4.5
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A high performance, concurrent HTTP client library for Python using gevent
 EAPI=7
 HOMEPAGE=https://github.com/gwik/geventhttpclient
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-1.4.5.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c65d14afd2bb9a81135d5bc87ad5f336
+_md5_=b4e5171abd40bd525fe8708588908992
diff --git a/metadata/md5-cache/dev-python/ghp-import-2.0.1 b/metadata/md5-cache/dev-python/ghp-import-2.0.1
index 33fe49556c81..e6feb6c7efdd 100644
--- a/metadata/md5-cache/dev-python/ghp-import-2.0.1
+++ b/metadata/md5-cache/dev-python/ghp-import-2.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Copy your docs directly to the gh-pages branch
 EAPI=7
 HOMEPAGE=https://github.com/c-w/ghp-import
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/g/ghp-import/ghp-import-2.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3f4a2ae829b4ebb551002c270b0e14d2
+_md5_=b701a2a3bc6d21ff05e8c27f50f278cb
diff --git a/metadata/md5-cache/dev-python/gmpy-2.0.8-r2 b/metadata/md5-cache/dev-python/gmpy-2.0.8-r2
deleted file mode 100644
index 4e37818931df..000000000000
--- a/metadata/md5-cache/dev-python/gmpy-2.0.8-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/mpc-1.0.2:= >=dev-libs/mpfr-3.1.2:= !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir:= )
-DESCRIPTION=Python bindings for GMP, MPC, MPFR and MPIR libraries
-EAPI=7
-HOMEPAGE=https://github.com/aleaxit/gmpy
-IUSE=mpir doc 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 ~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_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=2
-SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.0.8.zip
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3dc96300e7584fba9b258317785f173d
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.13.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.13.0
new file mode 100644
index 000000000000..4a4773b807a8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.13.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/six-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/six-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.13.0.tar.gz -> google-api-python-client-2.13.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=77b042fa2daa1b52afdfabd452540972
diff --git a/metadata/md5-cache/dev-python/google-auth-1.33.0 b/metadata/md5-cache/dev-python/google-auth-1.33.0
new file mode 100644
index 000000000000..3247c2d6c35a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-1.33.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/google-auth/google-auth-1.33.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2c5837684f82d9b7d53526dd7d532653
diff --git a/metadata/md5-cache/dev-python/graphviz-0.17 b/metadata/md5-cache/dev-python/graphviz-0.17
new file mode 100644
index 000000000000..9160e84cfd4f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/graphviz-0.17
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip test? ( >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-mock-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz[gts,pdf] ) test? ( media-gfx/graphviz >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple Python interface for Graphviz
+EAPI=8
+HOMEPAGE=https://graphviz.readthedocs.io/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=media-gfx/graphviz python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/graphviz/graphviz-0.17.zip
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6d815d17aef3c69d2cafd098c49043b9
diff --git a/metadata/md5-cache/dev-python/greenlet-1.0.0 b/metadata/md5-cache/dev-python/greenlet-1.0.0
deleted file mode 100644
index eeb96bb8a5e5..000000000000
--- a/metadata/md5-cache/dev-python/greenlet-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Lightweight in-process concurrent programming
-EAPI=7
-HOMEPAGE=https://pypi.org/project/greenlet/
-IUSE=doc test 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 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/greenlet/greenlet-1.0.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=79cd35621cab6dd7ade178f5bbf36227
diff --git a/metadata/md5-cache/dev-python/greenlet-1.1.0 b/metadata/md5-cache/dev-python/greenlet-1.1.0
index acc8046abb8f..1a2b3ae583f4 100644
--- a/metadata/md5-cache/dev-python/greenlet-1.1.0
+++ b/metadata/md5-cache/dev-python/greenlet-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Lightweight in-process concurrent programming
 EAPI=7
 HOMEPAGE=https://pypi.org/project/greenlet/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-1.1.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d964e424d63155f2215a952517bffbd4
+_md5_=79560db3ddc5e3855c571b8e67d602fe
diff --git a/metadata/md5-cache/dev-python/h11-0.12.0 b/metadata/md5-cache/dev-python/h11-0.12.0
index 32521f523f34..8d348eaf02db 100644
--- a/metadata/md5-cache/dev-python/h11-0.12.0
+++ b/metadata/md5-cache/dev-python/h11-0.12.0
@@ -4,7 +4,7 @@ DESCRIPTION=A pure-Python implementation of HTTP/1.1 inspired by hyper-h2
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/h11/ https://pypi.org/project/h11/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h11/h11-0.12.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aa14209065abf3ff86ca1eba88e6bd14
+_md5_=1b60fd1f750df857097a01fcb881e739
diff --git a/metadata/md5-cache/dev-python/hcloud-python-1.13.0 b/metadata/md5-cache/dev-python/hcloud-python-1.13.0
new file mode 100644
index 000000000000..bfa56e54b79a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hcloud-python-1.13.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/future-0.17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.7.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Official Hetzner Cloud python library
+EAPI=8
+HOMEPAGE=https://github.com/hetznercloud/hcloud-python
+IUSE=doc examples doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/future-0.17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.7.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hetznercloud/hcloud-python/archive/v1.13.0.tar.gz -> hcloud-python-1.13.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2b34e437f6763f51a150dc44799ebf90
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.3 b/metadata/md5-cache/dev-python/httpcore-0.13.3
index 7cd231400d8e..4846260b1d6d 100644
--- a/metadata/md5-cache/dev-python/httpcore-0.13.3
+++ b/metadata/md5-cache/dev-python/httpcore-0.13.3
@@ -4,7 +4,7 @@ DESCRIPTION=A minimal low-level HTTP client
 EAPI=7
 HOMEPAGE=https://www.encode.io/httpcore/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 sparc ~x86
 LICENSE=BSD
 RDEPEND=<dev-python/h11-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/hyper-h2-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpcore/archive/0.13.3.tar.gz -> httpcore-0.13.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=45e6b8f52c0d5aa1e6ae1a06443db469
+_md5_=bd5c74608df28345d3e9d2b4312873d5
diff --git a/metadata/md5-cache/dev-python/httpretty-1.1.3 b/metadata/md5-cache/dev-python/httpretty-1.1.3
index 16ed000ba55f..c93465602ee9 100644
--- a/metadata/md5-cache/dev-python/httpretty-1.1.3
+++ b/metadata/md5-cache/dev-python/httpretty-1.1.3
@@ -5,7 +5,7 @@ DESCRIPTION=HTTP client mock for Python
 EAPI=7
 HOMEPAGE=https://github.com/gabrielfalcao/httpretty
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-1.1.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a0047daaf182544aff607022058eceb5
+_md5_=ab7d59e97ef0e73168a5f3a2da83a647
diff --git a/metadata/md5-cache/dev-python/httpx-0.18.1 b/metadata/md5-cache/dev-python/httpx-0.18.1
index 3177d2883c48..e4a3c85a6813 100644
--- a/metadata/md5-cache/dev-python/httpx-0.18.1
+++ b/metadata/md5-cache/dev-python/httpx-0.18.1
@@ -4,7 +4,7 @@ DESCRIPTION=Fully-featured HTTP client which provides sync and async APIs
 EAPI=7
 HOMEPAGE=https://www.python-httpx.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/httpcore-0.13*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rfc3986-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/rfc3986-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpx/archive/0.18.1.tar.gz -> httpx-0.18.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a607758150123ebfaad9d155eb641af8
+_md5_=711c0c889ed3c76ff3b3560161c731e6
diff --git a/metadata/md5-cache/dev-python/humanize-3.5.0 b/metadata/md5-cache/dev-python/humanize-3.5.0
deleted file mode 100644
index 397ad390cb49..000000000000
--- a/metadata/md5-cache/dev-python/humanize-3.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common humanization utilities
-EAPI=7
-HOMEPAGE=https://github.com/jmoiron/humanize/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanize/humanize-3.5.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4d45a4f9b0123b0197e63f48593a700e
diff --git a/metadata/md5-cache/dev-python/humanize-3.7.0 b/metadata/md5-cache/dev-python/humanize-3.7.0
deleted file mode 100644
index edd7adc504da..000000000000
--- a/metadata/md5-cache/dev-python/humanize-3.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common humanization utilities
-EAPI=7
-HOMEPAGE=https://github.com/jmoiron/humanize/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanize/humanize-3.7.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fea5f96fabf06b1db55bb30e053f30ca
diff --git a/metadata/md5-cache/dev-python/humanize-3.7.1 b/metadata/md5-cache/dev-python/humanize-3.7.1
deleted file mode 100644
index 8a5c7e5765d2..000000000000
--- a/metadata/md5-cache/dev-python/humanize-3.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common humanization utilities
-EAPI=7
-HOMEPAGE=https://github.com/jmoiron/humanize/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanize/humanize-3.7.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fea5f96fabf06b1db55bb30e053f30ca
diff --git a/metadata/md5-cache/dev-python/humanize-3.8.0 b/metadata/md5-cache/dev-python/humanize-3.8.0
deleted file mode 100644
index b58748531a19..000000000000
--- a/metadata/md5-cache/dev-python/humanize-3.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common humanization utilities
-EAPI=7
-HOMEPAGE=https://github.com/jmoiron/humanize/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanize/humanize-3.8.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5beb4edc5902306b36e023acd1ae7a05
diff --git a/metadata/md5-cache/dev-python/humanize-3.9.0 b/metadata/md5-cache/dev-python/humanize-3.9.0
index aca7e0a89204..9a50a4c2fde1 100644
--- a/metadata/md5-cache/dev-python/humanize-3.9.0
+++ b/metadata/md5-cache/dev-python/humanize-3.9.0
@@ -4,7 +4,7 @@ DESCRIPTION=Common humanization utilities
 EAPI=7
 HOMEPAGE=https://github.com/jmoiron/humanize/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/humanize/humanize-3.9.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5beb4edc5902306b36e023acd1ae7a05
+_md5_=76a96adb4c0805ae781759676a3b597d
diff --git a/metadata/md5-cache/dev-python/hvac-0.11.0 b/metadata/md5-cache/dev-python/hvac-0.11.0
new file mode 100644
index 000000000000..439f008327e3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hvac-0.11.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/flask-sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jwcrypto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/semantic_version[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pyhcl-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.24.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=hashicorp vault client in python
+EAPI=8
+HOMEPAGE=https://github.com/hvac/hvac
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pyhcl-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.24.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hvac/hvac/archive/v0.11.0.tar.gz -> hvac-0.11.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=46b013fe8bb3cb65f332c9afa19580f0
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.10.1-r1 b/metadata/md5-cache/dev-python/hypothesis-6.10.1-r1
deleted file mode 100644
index 79e3d23d273f..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.10.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=7
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.10.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e4fff32aeea33dbe5da2097974375702
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.13.14-r1 b/metadata/md5-cache/dev-python/hypothesis-6.13.14-r1
deleted file mode 100644
index 48cba9ca2776..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.13.14-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!dev-python/pytest-describe !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=7
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.13.14.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c17d15ab1989dc38cf3939bb45bd0114
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.14.0-r1 b/metadata/md5-cache/dev-python/hypothesis-6.14.0-r1
index 33792faf6f88..264abf7d7abe 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.14.0-r1
+++ b/metadata/md5-cache/dev-python/hypothesis-6.14.0-r1
@@ -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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.14.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c17d15ab1989dc38cf3939bb45bd0114
+_md5_=9d9c3b1785003b5afbfa20d665f253e1
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.14.1 b/metadata/md5-cache/dev-python/hypothesis-6.14.1
deleted file mode 100644
index ba09fab9776d..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!dev-python/pytest-describe !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=7
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.14.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c17d15ab1989dc38cf3939bb45bd0114
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.14.2 b/metadata/md5-cache/dev-python/hypothesis-6.14.2
new file mode 100644
index 000000000000..97b05eec3c2b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.14.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!dev-python/pytest-describe !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.14.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c17d15ab1989dc38cf3939bb45bd0114
diff --git a/metadata/md5-cache/dev-python/identify-2.2.11 b/metadata/md5-cache/dev-python/identify-2.2.11
index 967e7897b27c..a7ee68473a59 100644
--- a/metadata/md5-cache/dev-python/identify-2.2.11
+++ b/metadata/md5-cache/dev-python/identify-2.2.11
@@ -4,7 +4,7 @@ DESCRIPTION=File identification library for Python
 EAPI=8
 HOMEPAGE=https://github.com/pre-commit/identify
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~hppa ~riscv
+KEYWORDS=~amd64 ~hppa ~ppc ~riscv
 LICENSE=MIT
 RDEPEND=dev-python/editdistance-s[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pre-commit/identify/archive/refs/tags/v2.2.11.tar.gz -> identify-2.2.11.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=78ba3ecfc6d78cf541d05eefaa0c9d36
+_md5_=5e5119f3804387e3767ca9060efd1544
diff --git a/metadata/md5-cache/dev-python/immutables-0.15 b/metadata/md5-cache/dev-python/immutables-0.15
index ba9b11c9aaa4..3db9af4dd6f2 100644
--- a/metadata/md5-cache/dev-python/immutables-0.15
+++ b/metadata/md5-cache/dev-python/immutables-0.15
@@ -4,7 +4,7 @@ DESCRIPTION=A high-performance immutable mapping type for Python
 EAPI=7
 HOMEPAGE=https://github.com/MagicStack/immutables
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MagicStack/immutables/archive/v0.15.tar.gz -> immutables-0.15.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=afe5ef8d923c0f1e246087c9232603a5
+_md5_=5a2daba2bebc4aed7f4c751e852bf540
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.3.1 b/metadata/md5-cache/dev-python/importlib_metadata-4.3.1
deleted file mode 100644
index 303fd6814d8e..000000000000
--- a/metadata/md5-cache/dev-python/importlib_metadata-4.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-)] dev-python/rst-linker[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read metadata from Python packages
-EAPI=7
-HOMEPAGE=https://github.com/python/importlib_metadata
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-4.3.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9927ad06b1845991d261ad70d8852e8a
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.5.0 b/metadata/md5-cache/dev-python/importlib_metadata-4.5.0
index cafcaa59a2c7..d4650005cc78 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-4.5.0
+++ b/metadata/md5-cache/dev-python/importlib_metadata-4.5.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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-4.5.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a599bb89fa5865f3d83d1e13e7445407
+_md5_=907bb4628acd237613066d74eda2cea3
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.6.0 b/metadata/md5-cache/dev-python/importlib_metadata-4.6.0
deleted file mode 100644
index 15b7df8a35e6..000000000000
--- a/metadata/md5-cache/dev-python/importlib_metadata-4.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/jaraco-packaging[python_targets_python3_10(-)] dev-python/rst-linker[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-)] dev-python/rst-linker[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read metadata from Python packages
-EAPI=7
-HOMEPAGE=https://github.com/python/importlib_metadata
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-4.6.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a599bb89fa5865f3d83d1e13e7445407
diff --git a/metadata/md5-cache/dev-python/ioflo-2.0.2 b/metadata/md5-cache/dev-python/ioflo-2.0.2
index 0104553c8684..9a112acfaa95 100644
--- a/metadata/md5-cache/dev-python/ioflo-2.0.2
+++ b/metadata/md5-cache/dev-python/ioflo-2.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Automated Reasoning Engine and Flow Based Programming Framework
 EAPI=7
 HOMEPAGE=https://github.com/ioflo/ioflo/
 IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ioflo/ioflo/archive/v2.0.2.tar.gz -> ioflo-2.0.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d032fdc83cbf3a2b8e991901fbc22ce0
+_md5_=fbef1e4c0c051696193617c8fd1aa92f
diff --git a/metadata/md5-cache/dev-python/ipython-7.22.0-r1 b/metadata/md5-cache/dev-python/ipython-7.22.0-r1
deleted file mode 100644
index 7322dbabf995..000000000000
--- a/metadata/md5-cache/dev-python/ipython-7.22.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=7
-HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
-IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-7.22.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=4752f476e9d6183b9bd6ddc445f0ef52
diff --git a/metadata/md5-cache/dev-python/ipython-7.23.1 b/metadata/md5-cache/dev-python/ipython-7.23.1
deleted file mode 100644
index 473bbe8cdbbc..000000000000
--- a/metadata/md5-cache/dev-python/ipython-7.23.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=7
-HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
-IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
-LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-7.23.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=d435f1ecba337948a0aa70e6f5937491
diff --git a/metadata/md5-cache/dev-python/ipython-7.24.1 b/metadata/md5-cache/dev-python/ipython-7.24.1
index 55cfa798c08f..c85ca5d77475 100644
--- a/metadata/md5-cache/dev-python/ipython-7.24.1
+++ b/metadata/md5-cache/dev-python/ipython-7.24.1
@@ -4,7 +4,7 @@ DESCRIPTION=Advanced interactive shell for Python
 EAPI=7
 HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
 IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=BSD
 PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.24.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=1231e31ca5c65df7956f107515f0d3c7
+_md5_=f2b7fc32155f65aa044ea414417a1f5b
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.16 b/metadata/md5-cache/dev-python/iso8601-0.1.16
new file mode 100644
index 000000000000..070c545261af
--- /dev/null
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.16
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple module to parse ISO 8601 dates
+EAPI=8
+HOMEPAGE=https://pypi.org/project/iso8601/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.16.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1355f44d99e2ac52d91c467dbaf3ba93
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.5.1 b/metadata/md5-cache/dev-python/jaraco-text-3.5.1
new file mode 100644
index 000000000000..b5716e85a877
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.5.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_10(-)] >=dev-python/rst-linker-1.9[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)] ) ) ) test? ( dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Text utilities used by other projects by developer jaraco
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/jaraco.text
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.5.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=29acdb8d642f554bca448e3f06881495
diff --git a/metadata/md5-cache/dev-python/jeepney-0.7.0 b/metadata/md5-cache/dev-python/jeepney-0.7.0
index 8add87cd673b..1d9c368e7293 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.7.0
+++ b/metadata/md5-cache/dev-python/jeepney-0.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level, pure Python DBus protocol wrapper
 EAPI=8
 HOMEPAGE=https://gitlab.com/takluyver/jeepney
 IUSE=examples test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.7.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=435c593752c4d804b84fb29aad16fc06
+_md5_=a0370f365ac6a488c0a2b86926b51b75
diff --git a/metadata/md5-cache/dev-python/jwcrypto-0.8.0 b/metadata/md5-cache/dev-python/jwcrypto-0.8.0
deleted file mode 100644
index c3d93e9cbb67..000000000000
--- a/metadata/md5-cache/dev-python/jwcrypto-0.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements JWK,JWS,JWE specifications using python-cryptography
-EAPI=7
-HOMEPAGE=https://github.com/latchset/jwcrypto
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/latchset/jwcrypto/archive/v0.8.0.tar.gz -> jwcrypto-0.8.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5fb0e8d4c1302a86dc0aca84dc79f8e9
diff --git a/metadata/md5-cache/dev-python/jwcrypto-0.9.0 b/metadata/md5-cache/dev-python/jwcrypto-0.9.0
deleted file mode 100644
index b5a983027d1c..000000000000
--- a/metadata/md5-cache/dev-python/jwcrypto-0.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements JWK,JWS,JWE specifications using python-cryptography
-EAPI=7
-HOMEPAGE=https://github.com/latchset/jwcrypto
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/latchset/jwcrypto/archive/v0.9.0.tar.gz -> jwcrypto-0.9.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8d9a0a1abecdf4876265290e187415f
diff --git a/metadata/md5-cache/dev-python/jwcrypto-0.9.1 b/metadata/md5-cache/dev-python/jwcrypto-0.9.1
index 4adf44a51ea4..fdbe91378ffd 100644
--- a/metadata/md5-cache/dev-python/jwcrypto-0.9.1
+++ b/metadata/md5-cache/dev-python/jwcrypto-0.9.1
@@ -4,7 +4,7 @@ DESCRIPTION=Implements JWK,JWS,JWE specifications using python-cryptography
 EAPI=7
 HOMEPAGE=https://github.com/latchset/jwcrypto
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/latchset/jwcrypto/archive/v0.9.1.tar.gz -> jwcrypto-0.9.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=018cdca375df1d3c697d162787f4a892
+_md5_=567b93929c37d09a3c1607611f50a487
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.15.0 b/metadata/md5-cache/dev-python/lesscpy-0.15.0
new file mode 100644
index 000000000000..0de06f4b9e1b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lesscpy-0.15.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A compiler written in Python for the LESS language
+EAPI=8
+HOMEPAGE=https://pypi.org/project/lesscpy/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/l/lesscpy/lesscpy-0.15.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c70f750d954a6da4b89248effa211612
diff --git a/metadata/md5-cache/dev-python/libarchive-c-2.9 b/metadata/md5-cache/dev-python/libarchive-c-2.9
index 871be5a64a0e..5eb461924a4e 100644
--- a/metadata/md5-cache/dev-python/libarchive-c-2.9
+++ b/metadata/md5-cache/dev-python/libarchive-c-2.9
@@ -1,14 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-arch/libarchive >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python interface to libarchive
 EAPI=7
 HOMEPAGE=https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=CC0-1.0
-RDEPEND=app-arch/libarchive python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=app-arch/libarchive python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/libarchive-c/libarchive-c-2.9.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=43f457ea774d75fee38ae5378325f296
+_md5_=dcc0ae31573c8c6e59cdccc9d1c2126f
diff --git a/metadata/md5-cache/dev-python/libcloud-3.3.0 b/metadata/md5-cache/dev-python/libcloud-3.3.0
index 2b2a72d94c32..d17cd9c85866 100644
--- a/metadata/md5-cache/dev-python/libcloud-3.3.0
+++ b/metadata/md5-cache/dev-python/libcloud-3.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Unified Interface to the Cloud - python support libs
 EAPI=7
 HOMEPAGE=https://libcloud.apache.org/
 IUSE=examples test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/libcloud/apache-libcloud-3.3.0.tar.bz2
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30cef65b406e33c1071f0dacff675166
+_md5_=5de5eb3a051dd88b847125e99432ad71
diff --git a/metadata/md5-cache/dev-python/libnacl-1.7.2-r1 b/metadata/md5-cache/dev-python/libnacl-1.7.2-r1
index e9506f26c999..39b7ea5b1664 100644
--- a/metadata/md5-cache/dev-python/libnacl-1.7.2-r1
+++ b/metadata/md5-cache/dev-python/libnacl-1.7.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python ctypes wrapper for libsodium
 EAPI=7
 HOMEPAGE=https://libnacl.readthedocs.org/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/libsodium python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/libnacl/archive/v1.7.2.tar.gz -> libnacl-1.7.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1f50796c515a38ea611dd438a8f143ca
+_md5_=e0229c5916e025c44332dd9bd41cf709
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.5.0 b/metadata/md5-cache/dev-python/libvirt-python-7.5.0
new file mode 100644
index 000000000000..c44859960658
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.5.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) verify-sig? ( app-crypt/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:0/7.5.0 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=libvirt Python bindings
+EAPI=7
+HOMEPAGE=https://www.libvirt.org
+IUSE=examples test test python_targets_python3_8 python_targets_python3_9 verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=app-emulation/libvirt:0/7.5.0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.5.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.5.0.tar.gz.asc )
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=6d19a6426da1789d1095c2b7566ee84d
diff --git a/metadata/md5-cache/dev-python/llfuse-1.4.1 b/metadata/md5-cache/dev-python/llfuse-1.4.1
index d0ac60ee6567..7570df275108 100644
--- a/metadata/md5-cache/dev-python/llfuse-1.4.1
+++ b/metadata/md5-cache/dev-python/llfuse-1.4.1
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig test? ( >=sys-fs/fuse-2.8.0:0 >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=virtual/pkgconfig test? ( >=sys-fs/fuse-2.8.0:0 >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sys-fs/fuse-2.8.0:0 sys-apps/attr
 DESCRIPTION=Python bindings for the low-level FUSE API
 EAPI=7
 HOMEPAGE=https://github.com/python-llfuse/python-llfuse/ https://pypi.org/project/llfuse/
-IUSE=doc examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2
-RDEPEND=>=sys-fs/fuse-2.8.0:0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=sys-fs/fuse-2.8.0:0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/llfuse/llfuse-1.4.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e3106af6eb5ec08f56eafd265075c29c
+_md5_=83c82d70e51f9027c7aedd6d14aaebc5
diff --git a/metadata/md5-cache/dev-python/markups-3.1.0 b/metadata/md5-cache/dev-python/markups-3.1.0
deleted file mode 100644
index e5c21683e8f9..000000000000
--- a/metadata/md5-cache/dev-python/markups-3.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/pytextile[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-markdown-math[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-markdown-math[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=A wrapper around various text markups
-EAPI=7
-HOMEPAGE=https://pymarkups.readthedocs.io/en/latest/ https://github.com/retext-project/pymarkups https://pypi.org/project/Markups/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-markdown-math[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/M/Markups/Markups-3.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9898f6f55225af85f74a7a9474449d2
diff --git a/metadata/md5-cache/dev-python/markups-3.1.1 b/metadata/md5-cache/dev-python/markups-3.1.1
index 5da3b0d77abc..7c9d09d5fe58 100644
--- a/metadata/md5-cache/dev-python/markups-3.1.1
+++ b/metadata/md5-cache/dev-python/markups-3.1.1
@@ -5,7 +5,7 @@ DESCRIPTION=A wrapper around various text markups
 EAPI=7
 HOMEPAGE=https://pymarkups.readthedocs.io/en/latest/ https://github.com/retext-project/pymarkups https://pypi.org/project/Markups/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-markdown-math[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markups/Markups-3.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4c163350493e86b40ae8058665e550ac
+_md5_=0b5fa1edcab4dbdabd5a1934cf5b92a6
diff --git a/metadata/md5-cache/dev-python/mergedeep-1.3.4 b/metadata/md5-cache/dev-python/mergedeep-1.3.4
index fdd6a31c7579..23d3a345d610 100644
--- a/metadata/md5-cache/dev-python/mergedeep-1.3.4
+++ b/metadata/md5-cache/dev-python/mergedeep-1.3.4
@@ -4,7 +4,7 @@ DESCRIPTION=A deep merge tool for Python
 EAPI=7
 HOMEPAGE=https://github.com/clarketm/mergedeep/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clarketm/mergedeep/archive/refs/tags/v1.3.4.tar.gz -> mergedeep-1.3.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d284522a8a8a1982fb937f45c20ac11a
+_md5_=34dd5060417ad2221b3b46bb471f9aea
diff --git a/metadata/md5-cache/dev-python/micawber-0.5.4 b/metadata/md5-cache/dev-python/micawber-0.5.4
new file mode 100644
index 000000000000..ac9649c04b55
--- /dev/null
+++ b/metadata/md5-cache/dev-python/micawber-0.5.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) dev-python/beautifulsoup:4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A small library for extracting rich content from urls
+EAPI=8
+HOMEPAGE=https://github.com/coleifer/micawber/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/coleifer/micawber/archive/0.5.4.tar.gz -> micawber-0.5.4.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c9e10906d5c893f3ce328dacfd2502f3
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.4 b/metadata/md5-cache/dev-python/minidb-2.0.4
deleted file mode 100644
index 4d18128e6aa4..000000000000
--- a/metadata/md5-cache/dev-python/minidb-2.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple SQLite-based object store
-EAPI=7
-HOMEPAGE=https://thp.io/2010/minidb/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64 x86
-LICENSE=ISC
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/minidb/minidb-2.0.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=856e450e09023c453be831796293e058
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.5 b/metadata/md5-cache/dev-python/minidb-2.0.5
index 2491b16e30be..8f4e420944b0 100644
--- a/metadata/md5-cache/dev-python/minidb-2.0.5
+++ b/metadata/md5-cache/dev-python/minidb-2.0.5
@@ -4,7 +4,7 @@ DESCRIPTION=Simple SQLite-based object store
 EAPI=7
 HOMEPAGE=https://thp.io/2010/minidb/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=ISC
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/minidb/minidb-2.0.5.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7534d9092872a11333c737414ad8aa4b
+_md5_=856e450e09023c453be831796293e058
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.2.1 b/metadata/md5-cache/dev-python/mkdocs-1.2.1
index 446f31fdd5fd..5e816e6efc82 100644
--- a/metadata/md5-cache/dev-python/mkdocs-1.2.1
+++ b/metadata/md5-cache/dev-python/mkdocs-1.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Project documentation with Markdown
 EAPI=7
 HOMEPAGE=https://www.mkdocs.org https://github.com/mkdocs/mkdocs
 IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/Babel-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/markdown-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/importlib_metadata-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mkdocs/mkdocs/archive/1.2.1.tar.gz -> mkdocs-1.2.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=188dedcd66efda450c7c0c69f4fd5a4b
+_md5_=78ccaa4d33c8f7dad13d2dd7de438e83
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9
index 2166bcf41422..1531a7948858 100644
--- a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9
+++ b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9
@@ -4,7 +4,7 @@ DESCRIPTION=Display the localized date of the last git modification of a markdow
 EAPI=7
 HOMEPAGE=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/ https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
 IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/archive/v0.9.tar.gz -> mkdocs-git-revision-date-localized-plugin-0.9.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=32160a5fd19bcfdda454a17243c7b68d
+_md5_=a8b4b5a14a8b1314830df52e69c9d2ff
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-7.1.1 b/metadata/md5-cache/dev-python/mkdocs-material-7.1.1
index 999273c0e729..a249b8374859 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-7.1.1
+++ b/metadata/md5-cache/dev-python/mkdocs-material-7.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Material Design theme for MkDocs
 EAPI=7
 HOMEPAGE=https://github.com/squidfunk/mkdocs-material https://pypi.org/project/mkdocs-material
 IUSE=python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pymdown-extensions-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-material-extensions-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/7.1.1.tar.gz -> mkdocs-material-7.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b8f012a543c84b16875f780515c257f
+_md5_=ab00b100068f56e939d8cba2bb27f6cc
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.1 b/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.1
index 995f87f70f1c..54491d314b2e 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.1
+++ b/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Extension pack for Python Markdown
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/mkdocs-material-extensions https://pypi.org/project/mkdocs-material-extensions
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 PDEPEND=>=dev-python/mkdocs-material-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/mkdocs-material-extensions/archive/1.0.1.tar.gz -> mkdocs-material-extensions-1.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1ba7f89feefecc4d626a4633145c01a3
+_md5_=5a08d7671a97a3263c6cf4c94f8383da
diff --git a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.4.0 b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.4.0
index 1babb74e8a43..37144d0a27ed 100644
--- a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.4.0
+++ b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=An MkDocs plugin to minify HTML and/or JS files prior to being writt
 EAPI=7
 HOMEPAGE=https://github.com/byrnereese/mkdocs-minify-plugin https://pypi.org/project/mkdocs-minify-plugin/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=app-text/htmlmin-0.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsmin-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5a9530a9b56a30fbd095ed862516ee73
+_md5_=6e5fe13909fafb993477dcc79c4d67f5
diff --git a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3 b/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3
index cfc8e637cf4c..67211e7f865b 100644
--- a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3
+++ b/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Plugin for Mkdocs page redirects
 EAPI=7
 HOMEPAGE=https://github.com/datarobot/mkdocs-redirects https://pypi.org/project/mkdocs-redirects/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/twine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mkdocs-redirects/mkdocs-redirects-1.0.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7b83168208e101532c6d5ecb0a32b3ab
+_md5_=67a195f5cea3a4e53b0ea324cae9297b
diff --git a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.0.7 b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.0.7
index ddb61f8360c8..b22954620bf6 100644
--- a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.0.7
+++ b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=Custom alterations based on Mkdocs-Material
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/mkdocs_pymdownx_material_extras https://pypi.org/project/mkdocs-pymdownx-material-extras
 IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/mkdocs-material-5.0.2[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/mkdocs_pymdownx_material_extras/archive/1.0.7.tar.gz -> mkdocs_pymdownx_material_extras-1.0.7.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6b9be98ea6f912d6f1e99a5659286ded
+_md5_=d70b0eeb31dbfc2e676acafcbcf2bc1f
diff --git a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.1.3 b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.1.3
index 8398d33a1228..dd2bb3dc47fe 100644
--- a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.1.3
+++ b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Custom alterations based on Mkdocs-Material
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/mkdocs_pymdownx_material_extras https://pypi.org/project/mkdocs-pymdownx-material-extras
 IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/mkdocs-material-5.0.2[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/mkdocs_pymdownx_material_extras/archive/1.1.3.tar.gz -> mkdocs_pymdownx_material_extras-1.1.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6b9be98ea6f912d6f1e99a5659286ded
+_md5_=d70b0eeb31dbfc2e676acafcbcf2bc1f
diff --git a/metadata/md5-cache/dev-python/mongomock-3.22.1 b/metadata/md5-cache/dev-python/mongomock-3.22.1
deleted file mode 100644
index 19ac14f539cf..000000000000
--- a/metadata/md5-cache/dev-python/mongomock-3.22.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pbr-5.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/pymongo-3.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sentinels-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library to help testing Python code that interacts with MongoDB via Pymongo
-EAPI=7
-HOMEPAGE=https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/pymongo-3.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sentinels-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/mongomock/mongomock-3.22.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17f18df7e9e093abd57eb85510a94695
diff --git a/metadata/md5-cache/dev-python/mongomock-3.23.0 b/metadata/md5-cache/dev-python/mongomock-3.23.0
index 4b4a4d46bd89..b56594f4afdc 100644
--- a/metadata/md5-cache/dev-python/mongomock-3.23.0
+++ b/metadata/md5-cache/dev-python/mongomock-3.23.0
@@ -4,7 +4,7 @@ DESCRIPTION=Library to help testing Python code that interacts with MongoDB via
 EAPI=7
 HOMEPAGE=https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/pymongo-3.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sentinels-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mongomock/mongomock-3.23.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=437d414619f4d02a465b41c446ffbbf8
+_md5_=b4bfef17d45e64ec29fe387c00b8e5b3
diff --git a/metadata/md5-cache/dev-python/moto-2.1.0 b/metadata/md5-cache/dev-python/moto-2.1.0
new file mode 100644
index 000000000000..27e6dfc80057
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-2.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-python-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=8
+HOMEPAGE=https://github.com/spulec/moto
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-python-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dicttoxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/moto/moto-2.1.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=93b0210a13bd175ab16e474bf23159ab
diff --git a/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1 b/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
index 3d6276f0ddff..51446c64b40a 100644
--- a/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A class library for writing nagios-compatible plugins
 EAPI=7
 HOMEPAGE=https://github.com/mpounsett/nagiosplugin https://nagiosplugin.readthedocs.io
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=ZPL
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nagiosplugin/nagiosplugin-1.3.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=123fda755c34402a16bf959659e3139e
+_md5_=05e888c9a3e2f6851d41ac0e2efd7bae
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.8.5 b/metadata/md5-cache/dev-python/nbsphinx-0.8.5
deleted file mode 100644
index b4ca01cd763c..000000000000
--- a/metadata/md5-cache/dev-python/nbsphinx-0.8.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jupyter Notebook Tools for Sphinx
-EAPI=7
-HOMEPAGE=https://github.com/spatialaudio/nbsphinx/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/n/nbsphinx/nbsphinx-0.8.5.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=744fe76a84f02ffee80a34cb3b1e0203
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.8.6 b/metadata/md5-cache/dev-python/nbsphinx-0.8.6
index 617e63d6a3cf..f11ed693f261 100644
--- a/metadata/md5-cache/dev-python/nbsphinx-0.8.6
+++ b/metadata/md5-cache/dev-python/nbsphinx-0.8.6
@@ -4,11 +4,11 @@ DESCRIPTION=Jupyter Notebook Tools for Sphinx
 EAPI=7
 HOMEPAGE=https://github.com/spatialaudio/nbsphinx/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbsphinx/nbsphinx-0.8.6.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=48be2230cabe19458ce34cfd58fd4ea9
+_md5_=744fe76a84f02ffee80a34cb3b1e0203
diff --git a/metadata/md5-cache/dev-python/netifaces-0.10.9 b/metadata/md5-cache/dev-python/netifaces-0.10.9
deleted file mode 100644
index c4b4ec189f8d..000000000000
--- a/metadata/md5-cache/dev-python/netifaces-0.10.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Portable network interface information
-EAPI=7
-HOMEPAGE=https://pypi.org/project/netifaces/ https://alastairs-place.net/projects/netifaces/ https://github.com/al45tair/netifaces
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/n/netifaces/netifaces-0.10.9.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=72b36e50bfffc09643cda69ebdc0bdad
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.6.0 b/metadata/md5-cache/dev-python/nodeenv-1.6.0
index 693edbb4c123..065b456e8256 100644
--- a/metadata/md5-cache/dev-python/nodeenv-1.6.0
+++ b/metadata/md5-cache/dev-python/nodeenv-1.6.0
@@ -4,7 +4,7 @@ DESCRIPTION=Node.js virtual environment builder
 EAPI=7
 HOMEPAGE=https://github.com/ekalinin/nodeenv
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ekalinin/nodeenv/archive/1.6.0.tar.gz -> nodeenv-1.6.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=310e1963bb4699ee17fe67b82cb9ee77
+_md5_=e26ec108fe66410605e40a1c7e716a5d
diff --git a/metadata/md5-cache/dev-python/ntlm-auth-1.5.0 b/metadata/md5-cache/dev-python/ntlm-auth-1.5.0
index 6d5d07a8a213..8e1392691a76 100644
--- a/metadata/md5-cache/dev-python/ntlm-auth-1.5.0
+++ b/metadata/md5-cache/dev-python/ntlm-auth-1.5.0
@@ -5,7 +5,7 @@ DESCRIPTION=Calculates NTLM Authentication codes
 EAPI=7
 HOMEPAGE=https://github.com/jborean93/ntlm-auth
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jborean93/ntlm-auth/archive/v1.5.0.tar.gz -> ntlm-auth-1.5.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88bd2f998d7bc28d2df2cce34a57ecee
+_md5_=3d15607d97e7101fc4c7e9a7a3422f09
diff --git a/metadata/md5-cache/dev-python/numexpr-2.7.2_p1 b/metadata/md5-cache/dev-python/numexpr-2.7.2_p1
deleted file mode 100644
index 54ce5a444810..000000000000
--- a/metadata/md5-cache/dev-python/numexpr-2.7.2_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fast numerical array expression evaluator for Python and NumPy
-EAPI=7
-HOMEPAGE=https://github.com/pydata/numexpr
-IUSE=mkl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mkl? ( sci-libs/mkl ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/pydata/numexpr/archive/v2.7.2.tar.gz -> numexpr-2.7.2.r1.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7bb098d3afc6ba081656ce88204cbfc6
diff --git a/metadata/md5-cache/dev-python/numexpr-2.7.3 b/metadata/md5-cache/dev-python/numexpr-2.7.3
index 5af70b032d7d..68e6482ae42f 100644
--- a/metadata/md5-cache/dev-python/numexpr-2.7.3
+++ b/metadata/md5-cache/dev-python/numexpr-2.7.3
@@ -4,11 +4,11 @@ DESCRIPTION=Fast numerical array expression evaluator for Python and NumPy
 EAPI=7
 HOMEPAGE=https://github.com/pydata/numexpr
 IUSE=mkl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mkl? ( sci-libs/mkl ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/pydata/numexpr/archive/v2.7.3.tar.gz -> numexpr-2.7.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=057ae7ac0a34f889e7cba18c28bccde7
+_md5_=24aaf51054b79ed75e45ff71bc68a657
diff --git a/metadata/md5-cache/dev-python/numpy-1.20.2-r1 b/metadata/md5-cache/dev-python/numpy-1.20.2-r1
index 0b61c48d307a..386feb4e5ea9 100644
--- a/metadata/md5-cache/dev-python/numpy-1.20.2-r1
+++ b/metadata/md5-cache/dev-python/numpy-1.20.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.20.2.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=323b31e251563b463d593ecc3333fbeb
diff --git a/metadata/md5-cache/dev-python/numpy-1.20.3-r1 b/metadata/md5-cache/dev-python/numpy-1.20.3-r1
index 6b05465be857..7c4d2eac50ae 100644
--- a/metadata/md5-cache/dev-python/numpy-1.20.3-r1
+++ b/metadata/md5-cache/dev-python/numpy-1.20.3-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://numpy.org/
 IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.20.3.zip doc? ( https://numpy.org/doc/1.20/numpy-html.zip -> numpy-html-1.20.3.zip https://numpy.org/doc/1.20/numpy-ref.pdf -> numpy-ref-1.20.3.pdf https://numpy.org/doc/1.20/numpy-user.pdf -> numpy-user-1.20.3.pdf )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=066c948b54e383ec047775c228486cd7
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7e25cc9467e6ccf346087152f371a193
diff --git a/metadata/md5-cache/dev-python/numpy-1.21.0 b/metadata/md5-cache/dev-python/numpy-1.21.0
index 9d195c6551ae..8025143db0eb 100644
--- a/metadata/md5-cache/dev-python/numpy-1.21.0
+++ b/metadata/md5-cache/dev-python/numpy-1.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.21.0.zip doc? ( https://numpy.org/doc/1.21/numpy-html.zip -> numpy-html-1.21.0.zip https://numpy.org/doc/1.21/numpy-ref.pdf -> numpy-ref-1.21.0.pdf https://numpy.org/doc/1.21/numpy-user.pdf -> numpy-user-1.21.0.pdf )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=612aaa534c4d0d33e463f9a868514ab8
diff --git a/metadata/md5-cache/dev-python/oauthlib-3.1.0 b/metadata/md5-cache/dev-python/oauthlib-3.1.0
deleted file mode 100644
index 1d6da006c2bf..000000000000
--- a/metadata/md5-cache/dev-python/oauthlib-3.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pyjwt-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Spec-compliant and thorough implementation of the OAuth request-signing logic
-EAPI=7
-HOMEPAGE=https://github.com/oauthlib/oauthlib https://pypi.org/project/oauthlib/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/pyjwt-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oauthlib/oauthlib-3.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=52adee89fca4b69a296a5de5f6fbc5a0
diff --git a/metadata/md5-cache/dev-python/oauthlib-3.1.1 b/metadata/md5-cache/dev-python/oauthlib-3.1.1
index 029ef2d14830..34656a17170f 100644
--- a/metadata/md5-cache/dev-python/oauthlib-3.1.1
+++ b/metadata/md5-cache/dev-python/oauthlib-3.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Spec-compliant and thorough implementation of the OAuth request-sign
 EAPI=7
 HOMEPAGE=https://github.com/oauthlib/oauthlib https://pypi.org/project/oauthlib/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/pyjwt-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-3.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8d3b42dc2a563fa1ce54a43c2c8d8965
+_md5_=0aa78d2b46569fb06b5fc5d0273d5780
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.58.0 b/metadata/md5-cache/dev-python/openstacksdk-0.58.0
new file mode 100644
index 000000000000..d476b7b1aeba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.58.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.1.0 test? ( >=dev-python/ddt-1.0.1[python_targets_python3_8(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?] dev-python/hacking[python_targets_python3_8(-)?] >=dev-python/prometheus_client-0.4.2[python_targets_python3_8(-)?] >=dev-python/oslo-config-6.1.0[python_targets_python3_8(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_8(-)?] >=dev-python/statsd-3.3.0[python_targets_python3_8(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?] ) test? ( >=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.1.0 >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_8(-)?] >=dev-python/jsonpatch-1.16[python_targets_python3_8(-)?] !~dev-python/jsonpatch-1.20[python_targets_python3_8(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_8(-)?] >=dev-python/keystoneauth-3.18.0[python_targets_python3_8(-)?] >=dev-python/munch-2.1.0[python_targets_python3_8(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_8(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_8(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_8(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_8(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A collection of libraries for building applications to work with OpenStack.
+EAPI=8
+HOMEPAGE=https://github.com/openstack/python-openstacksdk
+IUSE=test python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.1.0 >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_8(-)?] >=dev-python/jsonpatch-1.16[python_targets_python3_8(-)?] !~dev-python/jsonpatch-1.20[python_targets_python3_8(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_8(-)?] >=dev-python/keystoneauth-3.18.0[python_targets_python3_8(-)?] >=dev-python/munch-2.1.0[python_targets_python3_8(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_8(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_8(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_8(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_8(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.58.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=048cf8dcd675af2cba7dc73519c69097
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.7.1 b/metadata/md5-cache/dev-python/oslo-config-8.7.1
new file mode 100644
index 000000000000..9dd0ae6b5ddc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-config-8.7.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pbr-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-mock-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pbr-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Oslo Configuration API
+EAPI=8
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.config/oslo.config-8.7.1.tar.gz -> oslo-config-8.7.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9c529be474c8c08aa28e7dabe26798f6
diff --git a/metadata/md5-cache/dev-python/outcome-1.1.0 b/metadata/md5-cache/dev-python/outcome-1.1.0
index 1a9d2eed83bf..1a574319c1e7 100644
--- a/metadata/md5-cache/dev-python/outcome-1.1.0
+++ b/metadata/md5-cache/dev-python/outcome-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Capture the outcome of Python function calls
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/outcome https://pypi.org/project/outcome
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/outcome/archive/v1.1.0.tar.gz -> outcome-1.1.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6c8dec31259c99eb46e572eb3b9c6583
+_md5_=3c006e868b7c0adecca004b77e53334f
diff --git a/metadata/md5-cache/dev-python/pandas-datareader-0.10.0 b/metadata/md5-cache/dev-python/pandas-datareader-0.10.0
new file mode 100644
index 000000000000..9ccb349c6158
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pandas-datareader-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/wrapt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.19.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pandas DataFrame extraction from a wide range of Internet sources
+EAPI=8
+HOMEPAGE=https://github.com/pydata/pandas-datareader
+IUSE=doc doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+PROPERTIES=test_network
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.19.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pydata/pandas-datareader/archive/v0.10.0.tar.gz -> pandas-datareader-0.10.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=549951a366330729fb2a63f4d75c23a0
diff --git a/metadata/md5-cache/dev-python/path-and-address-2.0.1 b/metadata/md5-cache/dev-python/path-and-address-2.0.1
index bfdc7951e9a0..b67e27d50e64 100644
--- a/metadata/md5-cache/dev-python/path-and-address-2.0.1
+++ b/metadata/md5-cache/dev-python/path-and-address-2.0.1
@@ -1,15 +1,15 @@
-BDEPEND=app-arch/unzip python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=app-arch/unzip python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Functions for server CLI applications used by humans
 EAPI=7
 HOMEPAGE=https://github.com/joeyespo/path-and-address
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/path-and-address/path-and-address-2.0.1.zip
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4496b4d51ff052b89411fabffb4ab4c4
+_md5_=f6e86545427fbe44080a75071da6ae74
diff --git a/metadata/md5-cache/dev-python/pikepdf-2.15.0 b/metadata/md5-cache/dev-python/pikepdf-2.15.0
new file mode 100644
index 000000000000..d8dc08e2d681
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-2.15.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pybind11-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-text/qpdf:0= dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/qpdf:0=
+DESCRIPTION=Python library to work with pdf files based on qpdf
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=app-text/qpdf:0= dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pikepdf/pikepdf/archive/v2.15.0.tar.gz -> pikepdf-2.15.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e0536cafc835cb93c4beafe283a5bb14
diff --git a/metadata/md5-cache/dev-python/pip-21.1.2-r1 b/metadata/md5-cache/dev-python/pip-21.1.2-r1
index 85ba4f0a882a..431110e38070 100644
--- a/metadata/md5-cache/dev-python/pip-21.1.2-r1
+++ b/metadata/md5-cache/dev-python/pip-21.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/21.1.2.tar.gz -> pip-21.1.2.tar.gz test? ( https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-56.0.0-py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.36.2-py2.py3-none-any.whl https://github.com/pypa/virtualenv/archive/16.7.10.tar.gz -> virtualenv-16.7.10.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9910d2a658b9702277ce1692cb54ba1
diff --git a/metadata/md5-cache/dev-python/pip-21.1.3 b/metadata/md5-cache/dev-python/pip-21.1.3
index c96262565e90..8b274f2316a9 100644
--- a/metadata/md5-cache/dev-python/pip-21.1.3
+++ b/metadata/md5-cache/dev-python/pip-21.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/21.1.3.tar.gz -> pip-21.1.3.tar.gz test? ( https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-56.0.0-py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.36.2-py2.py3-none-any.whl https://github.com/pypa/virtualenv/archive/16.7.10.tar.gz -> virtualenv-16.7.10.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aef211d65408fd514728d57dfbaab83d
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.5.2 b/metadata/md5-cache/dev-python/pkgconfig-1.5.2
deleted file mode 100644
index b3ed18f8708a..000000000000
--- a/metadata/md5-cache/dev-python/pkgconfig-1.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( virtual/pkgconfig >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Interface Python with pkg-config
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/matze/pkgconfig/archive/v1.5.2.tar.gz -> pkgconfig-1.5.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7b316a49b7fd8a5e45c924193877f8b9
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.5.3 b/metadata/md5-cache/dev-python/pkgconfig-1.5.3
deleted file mode 100644
index 5745c9a9d3b8..000000000000
--- a/metadata/md5-cache/dev-python/pkgconfig-1.5.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( virtual/pkgconfig >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Interface Python with pkg-config
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/matze/pkgconfig/archive/v1.5.3.tar.gz -> pkgconfig-1.5.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=122d3e973f94b9f7ab6831faea99422d
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.5.4 b/metadata/md5-cache/dev-python/pkgconfig-1.5.4
index eab0e6ebca00..d83f3cf05023 100644
--- a/metadata/md5-cache/dev-python/pkgconfig-1.5.4
+++ b/metadata/md5-cache/dev-python/pkgconfig-1.5.4
@@ -4,7 +4,7 @@ DESCRIPTION=Interface Python with pkg-config
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matze/pkgconfig/archive/v1.5.4.tar.gz -> pkgconfig-1.5.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5134a7b8c948bf433aeb14afc91c13de
+_md5_=226d803ec21d9f42882e44d6ca0f3edf
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.7.1 b/metadata/md5-cache/dev-python/pkginfo-1.7.1
index 93fff6c2de97..7602b51f376a 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.7.1
+++ b/metadata/md5-cache/dev-python/pkginfo-1.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=Provides an API for querying the distutils metadata written in a PKG
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pkginfo/
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.7.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=01b225b5abd32eb87125b8a3e434dd8c
+_md5_=9f714975c46ceeb58fea009112e01252
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.0.2 b/metadata/md5-cache/dev-python/platformdirs-2.0.2
new file mode 100644
index 000000000000..1194a4b94b44
--- /dev/null
+++ b/metadata/md5-cache/dev-python/platformdirs-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A small Python module for determining appropriate platform-specific dirs
+EAPI=8
+HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/platformdirs/platformdirs/archive/2.0.2.tar.gz -> platformdirs-2.0.2.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=627ffeb9e5a4d3a08d5e2ff07bcb39d0
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0 b/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
index c77c27046354..a6e435d56eeb 100644
--- a/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Get CPU info with pure Python 2 & 3
 EAPI=7
 HOMEPAGE=https://github.com/workhorsy/py-cpuinfo/ https://pypi.org/project/py-cpuinfo/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-8.0.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6a6d8b6b551bba10051fe2889d8fe507
+_md5_=38badc52852805a5bb4453f2e9fbc3c3
diff --git a/metadata/md5-cache/dev-python/pybind11-2.7.0 b/metadata/md5-cache/dev-python/pybind11-2.7.0
new file mode 100644
index 000000000000..bfb4a11c4574
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pybind11-2.7.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-cpp/eigen:3 >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-util/ninja dev-util/cmake python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=AST-based Python refactoring library
+EAPI=7
+HOMEPAGE=https://pybind11.readthedocs.io/en/stable/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-cpp/eigen:3 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pybind/pybind11/archive/v2.7.0.tar.gz -> pybind11-2.7.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d0496c9f9a6fc991777ff1b7e298e8aa
diff --git a/metadata/md5-cache/dev-python/pycairo-1.20.0 b/metadata/md5-cache/dev-python/pycairo-1.20.0
deleted file mode 100644
index 0f566b0f5fd7..000000000000
--- a/metadata/md5-cache/dev-python/pycairo-1.20.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10[threads(+)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( >=x11-libs/cairo-1.15.10[svg] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/cairo-1.15.10[svg]
-DESCRIPTION=Python bindings for the cairo library
-EAPI=7
-HOMEPAGE=https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo
-IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=|| ( LGPL-2.1 MPL-1.1 )
-RDEPEND=>=x11-libs/cairo-1.15.10[svg] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.20.0/pycairo-1.20.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8137b87d7e1d9433502972a0e5d0283e
diff --git a/metadata/md5-cache/dev-python/pycairo-1.20.1 b/metadata/md5-cache/dev-python/pycairo-1.20.1
index b9b6758ba9b7..fd0ff07891f6 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.20.1
+++ b/metadata/md5-cache/dev-python/pycairo-1.20.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for the cairo library
 EAPI=7
 HOMEPAGE=https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.15.10[svg] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.20.1/pycairo-1.20.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=de0b5ce60ff55e77baf2086207132ef0
+_md5_=de6e91fba5b3adcc3bf5736cbd74b944
diff --git a/metadata/md5-cache/dev-python/pycuda-2019.1.2 b/metadata/md5-cache/dev-python/pycuda-2019.1.2
index 2a0afe2022e2..7f196b86d146 100644
--- a/metadata/md5-cache/dev-python/pycuda-2019.1.2
+++ b/metadata/md5-cache/dev-python/pycuda-2019.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=userpriv !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycuda/pycuda-2019.1.2.tar.gz
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0d597a82ea017d8d365321eef951d0f7
diff --git a/metadata/md5-cache/dev-python/pycxx-7.1.2-r2 b/metadata/md5-cache/dev-python/pycxx-7.1.2-r2
deleted file mode 100644
index 295634f04a55..000000000000
--- a/metadata/md5-cache/dev-python/pycxx-7.1.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Set of facilities to extend Python with C++
-EAPI=7
-HOMEPAGE=http://cxx.sourceforge.net
-IUSE=doc examples python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://sourceforge/cxx/pycxx-7.1.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7740deed2915b5a85e8251e32b68e0aa
diff --git a/metadata/md5-cache/dev-python/pycxx-7.1.5 b/metadata/md5-cache/dev-python/pycxx-7.1.5
index f6ff804115d1..008c5eeef26e 100644
--- a/metadata/md5-cache/dev-python/pycxx-7.1.5
+++ b/metadata/md5-cache/dev-python/pycxx-7.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Set of facilities to extend Python with C++
 EAPI=7
 HOMEPAGE=http://cxx.sourceforge.net
 IUSE=doc examples python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cxx/pycxx-7.1.5.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da308bae799f351b603c1a26a04e4983
+_md5_=7740deed2915b5a85e8251e32b68e0aa
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.4.0 b/metadata/md5-cache/dev-python/pyfakefs-4.4.0
deleted file mode 100644
index 9c900b9c49bd..000000000000
--- a/metadata/md5-cache/dev-python/pyfakefs-4.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.4.0.tar.gz -> pyfakefs-4.4.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54977fff53cd94cbcb8a2956248c228d
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.5.0 b/metadata/md5-cache/dev-python/pyfakefs-4.5.0
index 500b7a5bb8f8..a8d150c39bbf 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.5.0
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.5.0
@@ -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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.5.0.tar.gz -> pyfakefs-4.5.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cf4526543a54a445a069e8cc6108d4b7
+_md5_=649290d2798041447b663cec193255a7
diff --git a/metadata/md5-cache/dev-python/pygit2-1.5.0 b/metadata/md5-cache/dev-python/pygit2-1.5.0
deleted file mode 100644
index 9f2e315e4a41..000000000000
--- a/metadata/md5-cache/dev-python/pygit2-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( =dev-libs/libgit2-1.1* dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings for libgit2
-EAPI=7
-HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND==dev-libs/libgit2-1.1* dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pygit2/pygit2-1.5.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7be6f60bb89821f4c04e549dc4e2f653
diff --git a/metadata/md5-cache/dev-python/pygit2-1.6.0 b/metadata/md5-cache/dev-python/pygit2-1.6.0
deleted file mode 100644
index c0c4972819c4..000000000000
--- a/metadata/md5-cache/dev-python/pygit2-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( =dev-libs/libgit2-1.1* dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings for libgit2
-EAPI=7
-HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND==dev-libs/libgit2-1.1* dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pygit2/pygit2-1.6.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=158a1d6ca3bcd76cf9163026553e8b2f
diff --git a/metadata/md5-cache/dev-python/pygit2-1.6.1 b/metadata/md5-cache/dev-python/pygit2-1.6.1
index 695aa85f0402..a18b5c636423 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.6.1
+++ b/metadata/md5-cache/dev-python/pygit2-1.6.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for libgit2
 EAPI=7
 HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2-with-linking-exception
 RDEPEND==dev-libs/libgit2-1.1* dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-1.6.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=158a1d6ca3bcd76cf9163026553e8b2f
+_md5_=692477b7ac6cf87d212e5a83201c1633
diff --git a/metadata/md5-cache/dev-python/pygments-2.9.0 b/metadata/md5-cache/dev-python/pygments-2.9.0
index a21438f5b6e3..6f12a52aa77f 100644
--- a/metadata/md5-cache/dev-python/pygments-2.9.0
+++ b/metadata/md5-cache/dev-python/pygments-2.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.9.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1bb14a2e9e6da5515130bb6d4c990d5f
diff --git a/metadata/md5-cache/dev-python/pyinotify-0.9.6 b/metadata/md5-cache/dev-python/pyinotify-0.9.6
index 070dc81bb433..54a6239b39bf 100644
--- a/metadata/md5-cache/dev-python/pyinotify-0.9.6
+++ b/metadata/md5-cache/dev-python/pyinotify-0.9.6
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python module used for monitoring filesystems events
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pyinotify/ https://github.com/seb-m/pyinotify/
-IUSE=examples python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=examples python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-0.9.6.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f314f91af3db54826fde4253555bc811
+_md5_=850bf0d0387d62129e88416694edff7c
diff --git a/metadata/md5-cache/dev-python/pykerberos-1.3.1 b/metadata/md5-cache/dev-python/pykerberos-1.3.1
index f9b8e95275d1..6cf564e68e4e 100644
--- a/metadata/md5-cache/dev-python/pykerberos-1.3.1
+++ b/metadata/md5-cache/dev-python/pykerberos-1.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=A high-level Python wrapper for Kerberos/GSSAPI operations
 EAPI=7
 HOMEPAGE=https://www.calendarserver.org/PyKerberos.html https://github.com/apple/ccs-pykerberos/ https://pypi.org/project/kerberos/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=app-crypt/mit-krb5 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/ccs-pykerberos/archive/PyKerberos-1.3.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=016892b588d3eddc29cb3cae1fc07424
+_md5_=f7b0b0bcb40c83579fa9f309e32cf328
diff --git a/metadata/md5-cache/dev-python/pyls-black-0.4.6-r1 b/metadata/md5-cache/dev-python/pyls-black-0.4.6-r1
deleted file mode 100644
index d0aa4cd2b65d..000000000000
--- a/metadata/md5-cache/dev-python/pyls-black-0.4.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/python-language-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/black-21[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Black plugin for the Python Language Server
-EAPI=7
-HOMEPAGE=https://github.com/rupert/pyls-black https://pypi.org/project/pyls-black/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/python-language-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/black-21[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rupert/pyls-black/archive/v0.4.6.tar.gz -> pyls-black-0.4.6-gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=add276a838e9904a733ce4473ea07ae4
diff --git a/metadata/md5-cache/dev-python/pyls-black-0.4.7 b/metadata/md5-cache/dev-python/pyls-black-0.4.7
deleted file mode 100644
index 7152a04352cf..000000000000
--- a/metadata/md5-cache/dev-python/pyls-black-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/python-language-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/black-21[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Black plugin for the Python Language Server
-EAPI=7
-HOMEPAGE=https://github.com/rupert/pyls-black https://pypi.org/project/pyls-black/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/python-language-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/black-21[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rupert/pyls-black/archive/v0.4.7.tar.gz -> pyls-black-0.4.7.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6d44b1c0718aec8fb9836ae73d4ea9d8
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-8.1.1 b/metadata/md5-cache/dev-python/pymdown-extensions-8.1.1
index 3a1f10314374..c3ad83df7436 100644
--- a/metadata/md5-cache/dev-python/pymdown-extensions-8.1.1
+++ b/metadata/md5-cache/dev-python/pymdown-extensions-8.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Extensions for Python Markdown.
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
 IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/pymdown-extensions/archive/8.1.1.tar.gz -> pymdown-extensions-8.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ff40eddf2eb4faffa5f38533968cf3d4
+_md5_=9aaebbdea7d1176e40ae1dbddc1ba179
diff --git a/metadata/md5-cache/dev-python/pymdown-lexers-0_pre20210308 b/metadata/md5-cache/dev-python/pymdown-lexers-0_pre20210308
index 7aff9408e04d..00988ace431b 100644
--- a/metadata/md5-cache/dev-python/pymdown-lexers-0_pre20210308
+++ b/metadata/md5-cache/dev-python/pymdown-lexers-0_pre20210308
@@ -4,11 +4,11 @@ DESCRIPTION=Additional lexers for use in Pygments
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/pymdown-lexers
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pygments-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/pymdown-lexers/archive/84dc78c7692720bd614209124c3e8af65678532a.tar.gz -> pymdown-lexers-0_pre20210308.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=57b711af22a648de732fed6b185ecf2c
+_md5_=996bcdb31367578bd7ab18ab172252d3
diff --git a/metadata/md5-cache/dev-python/pyopencl-2021.2.3 b/metadata/md5-cache/dev-python/pyopencl-2021.2.3
deleted file mode 100644
index 716603b36dd8..000000000000
--- a/metadata/md5-cache/dev-python/pyopencl-2021.2.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=virtual/opencl-2 dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( media-libs/libglvnd )
-DESCRIPTION=Python wrapper for OpenCL
-EAPI=7
-HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
-IUSE=examples opengl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=virtual/opencl-2 >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/decorator-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytools-2021.2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2021.2.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d815e41d5bc5a6edbe15e015804899f4
diff --git a/metadata/md5-cache/dev-python/pyopencl-2021.2.5 b/metadata/md5-cache/dev-python/pyopencl-2021.2.5
deleted file mode 100644
index 24ecb7a158ba..000000000000
--- a/metadata/md5-cache/dev-python/pyopencl-2021.2.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=virtual/opencl-2 dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( media-libs/libglvnd )
-DESCRIPTION=Python wrapper for OpenCL
-EAPI=8
-HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
-IUSE=examples opengl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=virtual/opencl-2 >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytools-2021.2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2021.2.5.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=613a532dc17fc66c7add30fd45735c80
diff --git a/metadata/md5-cache/dev-python/pyopencl-2021.2.6 b/metadata/md5-cache/dev-python/pyopencl-2021.2.6
new file mode 100644
index 000000000000..0e22306157b4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopencl-2021.2.6
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=virtual/opencl-2 dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( media-libs/libglvnd )
+DESCRIPTION=Python wrapper for OpenCL
+EAPI=8
+HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
+IUSE=examples opengl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=virtual/opencl-2 >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytools-2021.2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2021.2.6.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=613a532dc17fc66c7add30fd45735c80
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.4 b/metadata/md5-cache/dev-python/pypy-7.3.4
index 01ad2fb1314a..369782ee4ae4 100644
--- a/metadata/md5-cache/dev-python/pypy-7.3.4
+++ b/metadata/md5-cache/dev-python/pypy-7.3.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=dev-python/pypy-exe-7.3.4:7.3.4[bzip2?,ncurses?] >=dev-python/pypy-exe-bin-7.3.4:7.3.4 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
 SLOT=0/73
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.4-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b8644004e9691217286bf37a601687f7
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.4_p1 b/metadata/md5-cache/dev-python/pypy-7.3.4_p1
index aec32df0deaa..b22c0b9aca43 100644
--- a/metadata/md5-cache/dev-python/pypy-7.3.4_p1
+++ b/metadata/md5-cache/dev-python/pypy-7.3.4_p1
@@ -4,10 +4,10 @@ DESCRIPTION=A fast, compliant alternative implementation of the Python language
 EAPI=7
 HOMEPAGE=https://www.pypy.org/
 IUSE=bzip2 gdbm +jit ncurses sqlite tk
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=|| ( >=dev-python/pypy-exe-7.3.4:7.3.4[bzip2?,ncurses?] >=dev-python/pypy-exe-bin-7.3.4:7.3.4 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
 SLOT=0/73
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.4-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.4_p1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0906affa5ba1a962ad9fbe63eeaa3f37
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3e65fbeb46e4260ace23bb38b440d218
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.5_rc3 b/metadata/md5-cache/dev-python/pypy-7.3.5_rc3
index e3b68bde4bb2..fc8679252dd2 100644
--- a/metadata/md5-cache/dev-python/pypy-7.3.5_rc3
+++ b/metadata/md5-cache/dev-python/pypy-7.3.5_rc3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=dev-python/pypy-exe-7.3.5_rc3:7.3.5_rc3[bzip2?,ncurses?] >=dev-python/pypy-exe-bin-7.3.5_rc3:7.3.5_rc3 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
 SLOT=0/73
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.5rc3-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.5rc3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=18d99fc05a5b9d6b49cf6260155202a0
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.5_rc3_p1 b/metadata/md5-cache/dev-python/pypy-7.3.5_rc3_p1
index b6d1fd797024..f253b8d01e57 100644
--- a/metadata/md5-cache/dev-python/pypy-7.3.5_rc3_p1
+++ b/metadata/md5-cache/dev-python/pypy-7.3.5_rc3_p1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=dev-python/pypy-exe-7.3.5_rc3:7.3.5_rc3[bzip2?,ncurses?] >=dev-python/pypy-exe-bin-7.3.5_rc3:7.3.5_rc3 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
 SLOT=0/73
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.5rc3-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.5rc3_p1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=815b67056bfa6c020d1b8220c5865f77
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.4 b/metadata/md5-cache/dev-python/pypy-exe-7.3.4
index a3e0845e2b2c..6fa8e959909d 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-7.3.4
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.4
 SLOT=7.3.4
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.4-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.4.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fb64831e440f339d1495e6bd451e696
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.5_rc3 b/metadata/md5-cache/dev-python/pypy-exe-7.3.5_rc3
index 7bf611fed826..1a484a918cc5 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-7.3.5_rc3
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.5_rc3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.5_rc3
 SLOT=7.3.5_rc3
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.5rc3-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.5rc3.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=800dfe76216bf7e48ed245ae2d45130b
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.4 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.4
index 07b286dc35e5..cb92ca9df621 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.4
+++ b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.4
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0/1 dev-libs/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.4
 SLOT=7.3.4
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.4-1.xpak -> pypy-exe-7.3.4-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.4-1.xpak -> pypy-exe-7.3.4-1.x86.xpak )
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=6d676afd85c6245b4e13eaf4068689b1
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.4_p2 b/metadata/md5-cache/dev-python/pypy3-7.3.4_p2
index d0b143cf4f6b..cad11cd06c72 100644
--- a/metadata/md5-cache/dev-python/pypy3-7.3.4_p2
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.4_p2
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.4:7.3.4[bzip2?,ncurses?] >=dev-python/py
 RESTRICT=test
 SLOT=0/pypy37-pp73
 SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.4-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.7-gentoo-patches-7.3.4_p2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc20cccb03ca0478c5e71600981d159c
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.5_rc3_p1 b/metadata/md5-cache/dev-python/pypy3-7.3.5_rc3_p1
index 27c36930d9fd..835124498119 100644
--- a/metadata/md5-cache/dev-python/pypy3-7.3.5_rc3_p1
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.5_rc3_p1
@@ -9,5 +9,5 @@ RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.5_rc3:7.3.5_rc3[bzip2?,ncurses?] >=dev-p
 RESTRICT=test
 SLOT=0/pypy37-pp73
 SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.5rc3-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.7-gentoo-patches-7.3.5rc3_p1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=afc3d4c025bb1c09e49f65e50909fa29
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.4 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.4
index 48ae9c2ba401..99dca02bc43d 100644
--- a/metadata/md5-cache/dev-python/pypy3-exe-7.3.4
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.4
 SLOT=7.3.4
 SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.4-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.7-gentoo-patches-7.3.4.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68eaf39fd1658e288444a3283802496f
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.5_rc3 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.5_rc3
index 5230b45d0188..4b243d638ba8 100644
--- a/metadata/md5-cache/dev-python/pypy3-exe-7.3.5_rc3
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.5_rc3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.5_rc3
 SLOT=7.3.5_rc3
 SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.5rc3-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.7-gentoo-patches-7.3.5rc3.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad46932b3913e6cf879b67610836e2f0
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.4 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.4
index ea56ed37e697..999a87ffb321 100644
--- a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.4
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.4
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0/1 dev-libs/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.4
 SLOT=7.3.4
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.4-1.xpak -> pypy3-exe-7.3.4-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.4-1.xpak -> pypy3-exe-7.3.4-1.x86.xpak )
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=2902606f83345e042df4fb563a608b53
diff --git a/metadata/md5-cache/dev-python/pyspelling-2.7.2 b/metadata/md5-cache/dev-python/pyspelling-2.7.2
index 093c41afb0f9..e7f0311430d1 100644
--- a/metadata/md5-cache/dev-python/pyspelling-2.7.2
+++ b/metadata/md5-cache/dev-python/pyspelling-2.7.2
@@ -4,7 +4,7 @@ DESCRIPTION=Spell checker automation tool
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/pyspelling
 IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( app-text/aspell app-text/hunspell ) dev-python/beautifulsoup:4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/soupsieve-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wcmatch-6.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/pyspelling/archive/2.7.2.tar.gz -> pyspelling-2.7.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=03a615bedab8350addbcea5151f67b02
+_md5_=c8969ddd5a58847956430cd0171ad1d0
diff --git a/metadata/md5-cache/dev-python/pytest-6.2.2 b/metadata/md5-cache/dev-python/pytest-6.2.2
deleted file mode 100644
index 0e102b042e3e..000000000000
--- a/metadata/md5-cache/dev-python/pytest-6.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools_scm-3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] !!dev-python/flaky )
-DESCRIPTION=Simple powerful testing with Python
-EAPI=7
-HOMEPAGE=https://pytest.org/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest/pytest-6.2.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=32a25e20bc01c0bdc6cab641597a79f4
diff --git a/metadata/md5-cache/dev-python/pytest-6.2.4-r1 b/metadata/md5-cache/dev-python/pytest-6.2.4-r1
index 6a8303e23968..8671fece20d2 100644
--- a/metadata/md5-cache/dev-python/pytest-6.2.4-r1
+++ b/metadata/md5-cache/dev-python/pytest-6.2.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=7
 HOMEPAGE=https://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-6.2.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7e9e522eac56bd4508259103a3bff8f5
+_md5_=d9f1fe7e08436bb9eefed85326774397
diff --git a/metadata/md5-cache/dev-python/pytest-django-4.3.0 b/metadata/md5-cache/dev-python/pytest-django-4.3.0
deleted file mode 100644
index 9a8d29b6aad8..000000000000
--- a/metadata/md5-cache/dev-python/pytest-django-4.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pytest-5.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools_scm-1.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=A Django plugin for py.test
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.io/ https://github.com/pytest-dev/pytest-django/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/pytest-5.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/pytest-dev/pytest-django/archive/v4.3.0.tar.gz -> pytest-django-4.3.0.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=490f3770f33d5cb02814fe99563adede
diff --git a/metadata/md5-cache/dev-python/pytest-django-4.4.0 b/metadata/md5-cache/dev-python/pytest-django-4.4.0
index 0fd9bc6cd7f7..3c71ce10bc40 100644
--- a/metadata/md5-cache/dev-python/pytest-django-4.4.0
+++ b/metadata/md5-cache/dev-python/pytest-django-4.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Django plugin for py.test
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.io/ https://github.com/pytest-dev/pytest-django/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-django/archive/v4.4.0.tar.gz -> pytest-django-4.4.0.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7838b45850a71e3294111304cf6e5390
+_md5_=6c6e35915f13da1a40976e02935d76b6
diff --git a/metadata/md5-cache/dev-python/pytest-env-0.6.2 b/metadata/md5-cache/dev-python/pytest-env-0.6.2
index 1b1750c562bd..35e26178f7d3 100644
--- a/metadata/md5-cache/dev-python/pytest-env-0.6.2
+++ b/metadata/md5-cache/dev-python/pytest-env-0.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=py.test plugin that allows you to add environment variables
 EAPI=7
 HOMEPAGE=https://github.com/MobileDynasty/pytest-env
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~hppa
+KEYWORDS=amd64 ~hppa ~ppc
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-env/pytest-env-0.6.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a3c0847d8f33c645a9c7d9ae6e4b017c
+_md5_=12ce716b9d16d54fee13df88f7b7791b
diff --git a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1 b/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
index 7163eece8bcf..2f8ab175e5de 100644
--- a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
+++ b/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Provides a helpers pytest namespace
 EAPI=7
 HOMEPAGE=https://github.com/saltstack/pytest-helpers-namespace
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-helpers-namespace/archive/v2019.1.8.tar.gz -> pytest-helpers-namespace-v2019.1.8.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9b6f29f6d3fff8c4a8abf6cb13cbb9c3
+_md5_=d4a4bb2bfcedf95011d4cecef4748266
diff --git a/metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3 b/metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3
index 146e8f21bfa3..013014522684 100644
--- a/metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3
+++ b/metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3
@@ -4,7 +4,7 @@ DESCRIPTION=PyTest Salt Plugin
 EAPI=7
 HOMEPAGE=https://github.com/saltstack/pytest-salt
 IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( app-admin/salt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-salt/archive/v2020.1.27.tar.gz -> pytest-salt-2020.1.27.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c801a044512df01247d3c549f2a4c870
+_md5_=e029abec70a5df89154db21b72bb72e2
diff --git a/metadata/md5-cache/dev-python/pytest-salt-factories-0.121.1 b/metadata/md5-cache/dev-python/pytest-salt-factories-0.121.1
index 6b39286c4833..044c82ef936c 100644
--- a/metadata/md5-cache/dev-python/pytest-salt-factories-0.121.1
+++ b/metadata/md5-cache/dev-python/pytest-salt-factories-0.121.1
@@ -4,7 +4,7 @@ DESCRIPTION=The new generation of the pytest-salt Plugin
 EAPI=7
 HOMEPAGE=https://github.com/saltstack/pytest-salt-factories
 IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-salt-factories/archive/0.121.1.tar.gz -> pytest-salt-factories-0.121.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=644f3532b21a72650a2e4c9b67458309
+_md5_=1e809cff80ef6282f1b3dad8a985b124
diff --git a/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12 b/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
index 0f9a4a1275bb..a63862c515b1 100644
--- a/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
+++ b/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
@@ -4,7 +4,7 @@ DESCRIPTION=Pytest plugin to support for a predictable and repeatable temporary
 EAPI=7
 HOMEPAGE=https://github.com/saltstack/pytest-tempdir
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-tempdir/archive/v2019.10.12.tar.gz -> pytest-tempdir-2019.10.12.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=413d9523ebef198019c50117e89ba945
+_md5_=d48fe94fbe263f9f9c2d0211a8d47ee6
diff --git a/metadata/md5-cache/dev-python/pytest-trio-0.7.0 b/metadata/md5-cache/dev-python/pytest-trio-0.7.0
index 138ae66a943e..5b2dae1e5464 100644
--- a/metadata/md5-cache/dev-python/pytest-trio-0.7.0
+++ b/metadata/md5-cache/dev-python/pytest-trio-0.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=This is a pytest plugin to help you test projects that use Trio
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/pytest-trio https://pypi.org/project/pytest-trio/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
 LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=dev-python/async_generator-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/outcome[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/trio-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-trio/pytest-trio-0.7.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bff60be7da39e097578a65b4974093ad
+_md5_=572fbade9029a927366d512915b223ba
diff --git a/metadata/md5-cache/dev-python/python-backoff-1.11.0 b/metadata/md5-cache/dev-python/python-backoff-1.11.0
new file mode 100644
index 000000000000..fa601452ca08
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-backoff-1.11.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Function decoration for backoff and retry
+EAPI=8
+HOMEPAGE=https://github.com/litl/backoff https://pypi.org/project/backoff/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/litl/backoff/archive/v1.11.0.tar.gz -> python-backoff-1.11.0.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dc5e5ecb1b27fb47a94622868b88126c
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.8.2 b/metadata/md5-cache/dev-python/python-dateutil-2.8.2
new file mode 100644
index 000000000000..6a5b1c4513ed
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.8.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-libs/timezone-data >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extensions to the standard Python datetime module
+EAPI=8
+HOMEPAGE=https://dateutil.readthedocs.io/ https://pypi.org/project/python-dateutil/ https://github.com/dateutil/dateutil/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-libs/timezone-data python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.8.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=87b9023d0def5e851dd82ac43a91e635
diff --git a/metadata/md5-cache/dev-python/python-jose-3.2.0-r1 b/metadata/md5-cache/dev-python/python-jose-3.2.0-r1
deleted file mode 100644
index 5f87f54b6ab0..000000000000
--- a/metadata/md5-cache/dev-python/python-jose-3.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycryptodome-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A JavaScript Object Signing and Encryption (JOSE) implementation in Python
-EAPI=7
-HOMEPAGE=https://github.com/mpdavis/python-jose https://pypi.org/project/python-jose/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycryptodome-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mpdavis/python-jose/archive/3.2.0.tar.gz -> python-jose-3.2.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9c6b6f192fe97181b3a1081c4e99a0f
diff --git a/metadata/md5-cache/dev-python/python-jose-3.3.0 b/metadata/md5-cache/dev-python/python-jose-3.3.0
index 86050e7f2edc..d8696d650bc7 100644
--- a/metadata/md5-cache/dev-python/python-jose-3.3.0
+++ b/metadata/md5-cache/dev-python/python-jose-3.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=A JavaScript Object Signing and Encryption (JOSE) implementation in
 EAPI=7
 HOMEPAGE=https://github.com/mpdavis/python-jose https://pypi.org/project/python-jose/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycryptodome-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpdavis/python-jose/archive/3.3.0.tar.gz -> python-jose-3.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=76a824f0c4a7d84d604704a971212e58
+_md5_=918a879bf0e098286829fa8dcbccec35
diff --git a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1 b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
deleted file mode 100644
index 4159d189a7ff..000000000000
--- a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python 2 and 3 asynchronous JSON RPC server
-EAPI=7
-HOMEPAGE=https://github.com/palantir/python-jsonrpc-server
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-jsonrpc-server/python-jsonrpc-server-0.4.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=12ece748a0aca074f5f1351383b18cc4
diff --git a/metadata/md5-cache/dev-python/python-keyutils-0.6 b/metadata/md5-cache/dev-python/python-keyutils-0.6
new file mode 100644
index 000000000000..b7d6bda32f52
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-keyutils-0.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( sys-apps/keyutils >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-apps/keyutils
+DESCRIPTION=A set of python bindings for keyutils
+EAPI=8
+HOMEPAGE=https://github.com/sassoftware/python-keyutils/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-apps/keyutils python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sassoftware/python-keyutils/archive/refs/tags/0.6.tar.gz -> python-keyutils-0.6.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b5ff6eb0beca62b5e328094e72057368
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.36.2-r1 b/metadata/md5-cache/dev-python/python-language-server-0.36.2-r1
deleted file mode 100644
index d989d060ba7d..000000000000
--- a/metadata/md5-cache/dev-python/python-language-server-0.36.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jedi-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-jsonrpc-server-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=An implementation of the Language Server Protocol for Python
-EAPI=7
-HOMEPAGE=https://github.com/palantir/python-language-server
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jedi-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-jsonrpc-server-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.36.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ffd2db41567c8f552e1e602cd548f5d
diff --git a/metadata/md5-cache/dev-python/python-podman-3.2.0 b/metadata/md5-cache/dev-python/python-podman-3.2.0
new file mode 100644
index 000000000000..46aabd6e19a7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-podman-3.2.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library to interact with a Podman server
+EAPI=8
+HOMEPAGE=https://github.com/containers/podman-py/ https://pypi.org/project/podman/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/containers/podman-py/archive/v3.2.0.tar.gz -> podman-py-3.2.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=96f87edf25be0da6c7517a45be4da8b0
diff --git a/metadata/md5-cache/dev-python/pythran-0.9.12_p1 b/metadata/md5-cache/dev-python/pythran-0.9.12_p1
new file mode 100644
index 000000000000..aa7ca7993180
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pythran-0.9.12_p1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/cblas ) test? ( =dev-python/beniget-0.4*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ply-3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Ahead of Time compiler for numeric kernels
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pythran/ https://github.com/serge-sans-paille/pythran/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND==dev-python/beniget-0.4*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ply-3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/serge-sans-paille/pythran/archive/0.9.12.post1.tar.gz -> pythran-0.9.12.post1.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=808fafbf9d83bd0dcb9615389fe0d790
diff --git a/metadata/md5-cache/dev-python/pyvirtualdisplay-2.1 b/metadata/md5-cache/dev-python/pyvirtualdisplay-2.1
deleted file mode 100644
index 5ea1ed5561ed..000000000000
--- a/metadata/md5-cache/dev-python/pyvirtualdisplay-2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-python/backports-tempfile[python_targets_python3_8(-)?] ) dev-python/entrypoint2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/path-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyscreenshot[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/vncdotool-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-apps/xmessage x11-base/xorg-server[xvfb,xephyr] x11-misc/x11vnc ) test? ( dev-python/easyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python wrapper for Xvfb, Xephyr and Xvnc
-EAPI=7
-HOMEPAGE=https://github.com/ponty/PyVirtualDisplay
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=dev-python/easyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ponty/PyVirtualDisplay/archive/2.1.tar.gz -> PyVirtualDisplay-2.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20acf3770fa768862a958dfc2bc961da
diff --git a/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2 b/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2
index fe7d8ee97393..df887240c8bf 100644
--- a/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2
+++ b/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python wrapper for Xvfb, Xephyr and Xvnc
 EAPI=7
 HOMEPAGE=https://github.com/ponty/PyVirtualDisplay
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=dev-python/easyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/PyVirtualDisplay/archive/2.2.tar.gz -> PyVirtualDisplay-2.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c267e2fa7c13548d3f98564297169034
+_md5_=571a03eec1e0cdfb6e1cf890a512d634
diff --git a/metadata/md5-cache/dev-python/pyyaml_env_tag-0.1 b/metadata/md5-cache/dev-python/pyyaml_env_tag-0.1
index acbcf97fe9ee..e38b716954e5 100644
--- a/metadata/md5-cache/dev-python/pyyaml_env_tag-0.1
+++ b/metadata/md5-cache/dev-python/pyyaml_env_tag-0.1
@@ -4,7 +4,7 @@ DESCRIPTION=A custom YAML tag for referencing environment variables in YAML file
 EAPI=7
 HOMEPAGE=https://github.com/waylan/pyyaml-env-tag
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyyaml_env_tag/pyyaml_env_tag-0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c2a420b5b8d13bb22bc1aa89eecb1da0
+_md5_=c2f63936734f8aed9efbde96f7b6f309
diff --git a/metadata/md5-cache/dev-python/raet-0.6.8-r2 b/metadata/md5-cache/dev-python/raet-0.6.8-r2
index 17ddd82716b0..a147249e5c85 100644
--- a/metadata/md5-cache/dev-python/raet-0.6.8-r2
+++ b/metadata/md5-cache/dev-python/raet-0.6.8-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Reliable Asynchronous Event Transport Protocol
 EAPI=7
 HOMEPAGE=https://github.com/RaetProtocol/raet
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/libnacl-1.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/raet/raet-0.6.8.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d7db5e179f2f78a0b950f5c74b7a67a6
+_md5_=3189d329bfc78f3716f32e87c6e2c39d
diff --git a/metadata/md5-cache/dev-python/requests-2.26.0 b/metadata/md5-cache/dev-python/requests-2.26.0
new file mode 100644
index 000000000000..9e9ab93b87ea
--- /dev/null
+++ b/metadata/md5-cache/dev-python/requests-2.26.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/idna-4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/urllib3-1.27[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HTTP library for human beings
+EAPI=8
+HOMEPAGE=https://requests.readthedocs.io/
+IUSE=socks5 test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/idna-4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/urllib3-1.27[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/requests/requests-2.26.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=685f1b82ea6298b0c6e61c793febed9b
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.6.3 b/metadata/md5-cache/dev-python/requests-cache-0.6.3
deleted file mode 100644
index 14177ac4c5eb..000000000000
--- a/metadata/md5-cache/dev-python/requests-cache-0.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Persistent cache for requests library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.6.3.tar.gz -> requests-cache-0.6.3.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a273c2794b942b5010b2eb4139827b5e
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.6.4 b/metadata/md5-cache/dev-python/requests-cache-0.6.4
index 55810c39b8c4..efeb6617f60f 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.6.4
+++ b/metadata/md5-cache/dev-python/requests-cache-0.6.4
@@ -4,7 +4,7 @@ DESCRIPTION=Persistent cache for requests library
 EAPI=7
 HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.6.4.tar.gz -> requests-cache-0.6.4.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0fba60259d577af7bee7acf4b18d2a7b
+_md5_=53b85d17d5d82d085bca133267bd665d
diff --git a/metadata/md5-cache/dev-python/requests-credssp-1.2.0 b/metadata/md5-cache/dev-python/requests-credssp-1.2.0
index c22151a4e169..ec4cdb73bb4c 100644
--- a/metadata/md5-cache/dev-python/requests-credssp-1.2.0
+++ b/metadata/md5-cache/dev-python/requests-credssp-1.2.0
@@ -5,7 +5,7 @@ DESCRIPTION=HTTPS CredSSP authentication with the requests library
 EAPI=7
 HOMEPAGE=https://pypi.org/project/requests-credssp/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ntlm-auth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jborean93/requests-credssp/archive/refs/tags/v1.2.0.tar.gz -> requests-credssp-1.2.0.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ff14a26ad86ea700323d040ddc55576f
+_md5_=db5d24dc654e0ef14b9e2bc8c9101212
diff --git a/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0 b/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
index 2651dcb56543..43c745a1932f 100644
--- a/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
+++ b/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oauthlib-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oauthlib-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=This project provides first-class OAuth library support for Requests
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/requests/requests-oauthlib
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm x86
 LICENSE=ISC
-RDEPEND=>=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oauthlib-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oauthlib-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/requests/requests-oauthlib/archive/v1.3.0.tar.gz -> requests-oauthlib-1.3.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=49c859b59a3ba6e3c29d295fbed95e32
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=938d8def78d84b2922da0eebec3ff986
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.4.0 b/metadata/md5-cache/dev-python/rfc3986-1.4.0
deleted file mode 100644
index 042643897dcc..000000000000
--- a/metadata/md5-cache/dev-python/rfc3986-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=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_8 python_targets_python3_9 python_targets_python3_10
-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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.4.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3c25d9bbfdcc0615907f32a850cd4cca
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.5.0 b/metadata/md5-cache/dev-python/rfc3986-1.5.0
index 7d6307a292ed..d5d842e76c35 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.5.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.5.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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.5.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dad50075246a64d92bf7988a89d59fbc
+_md5_=05d321bbb12461040f13253dc09a04f5
diff --git a/metadata/md5-cache/dev-python/rich-10.6.0 b/metadata/md5-cache/dev-python/rich-10.6.0
new file mode 100644
index 000000000000..457ddcd730f5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rich-10.6.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/commonmark[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library for renrering rich text, tables, etc. to the terminal
+EAPI=7
+HOMEPAGE=https://github.com/willmcgugan/rich
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/commonmark[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/willmcgugan/rich/archive/v10.6.0.tar.gz -> rich-10.6.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ce8a8a5e3b06ada882bd9aebcc46c1b6
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.5.0 b/metadata/md5-cache/dev-python/s3transfer-0.5.0
new file mode 100644
index 000000000000..090a6c60de10
--- /dev/null
+++ b/metadata/md5-cache/dev-python/s3transfer-0.5.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An Amazon S3 Transfer Manager
+EAPI=8
+HOMEPAGE=https://github.com/boto/s3transfer
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.5.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=28eebaba6134e4315eff88ede1ded925
diff --git a/metadata/md5-cache/dev-python/scipy-1.6.2 b/metadata/md5-cache/dev-python/scipy-1.6.2
index c961fac937cd..b986bfee9deb 100644
--- a/metadata/md5-cache/dev-python/scipy-1.6.2
+++ b/metadata/md5-cache/dev-python/scipy-1.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.6.2.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.6.1/scipy-html-1.6.1.zip https://docs.scipy.org/doc/scipy-1.6.1/scipy-ref-1.6.1.pdf )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18ddf555b56117c85f6414cd8caec8a2
diff --git a/metadata/md5-cache/dev-python/scipy-1.6.3 b/metadata/md5-cache/dev-python/scipy-1.6.3
index 567497f4ef16..67dd41b5ff48 100644
--- a/metadata/md5-cache/dev-python/scipy-1.6.3
+++ b/metadata/md5-cache/dev-python/scipy-1.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.6.3.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.6.2/scipy-html-1.6.2.zip https://docs.scipy.org/doc/scipy-1.6.2/scipy-ref-1.6.2.pdf )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9db79fc0ea9a2d5caed88f223cd1e94f
diff --git a/metadata/md5-cache/dev-python/simpy-3.0.13 b/metadata/md5-cache/dev-python/simpy-3.0.13
deleted file mode 100644
index c9b4666474ce..000000000000
--- a/metadata/md5-cache/dev-python/simpy-3.0.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8[tk] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8[tk] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Object-oriented, process-based discrete-event simulation language
-EAPI=7
-HOMEPAGE=https://simpy.readthedocs.org
-IUSE=doc test doc python_targets_python3_8
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[tk] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/simpy/simpy-3.0.13.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1d57fe5fb4ca85d2a1adc8ef7564b3f4
diff --git a/metadata/md5-cache/dev-python/simpy-4.0.1 b/metadata/md5-cache/dev-python/simpy-4.0.1
index 9ef0a80181b8..99ca5382de9b 100644
--- a/metadata/md5-cache/dev-python/simpy-4.0.1
+++ b/metadata/md5-cache/dev-python/simpy-4.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Object-oriented, process-based discrete-event simulation language
 EAPI=7
 HOMEPAGE=https://simpy.readthedocs.org
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[tk] ) python_targets_python3_9? ( dev-lang/python:3.9[tk] ) python_targets_python3_10? ( dev-lang/python:3.10[tk] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpy/simpy-4.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8acd32432583f81066ab7d984139fb57
+_md5_=658b382870b561a470264b9ab444d7cc
diff --git a/metadata/md5-cache/dev-python/slixmpp-1.7.0 b/metadata/md5-cache/dev-python/slixmpp-1.7.0
deleted file mode 100644
index 63290ab3295a..000000000000
--- a/metadata/md5-cache/dev-python/slixmpp-1.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-dns/libidn dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-dns/libidn
-DESCRIPTION=Python 3 library for XMPP
-EAPI=7
-HOMEPAGE=https://lab.louiz.org/poezio/slixmpp
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-dns/libidn python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/slixmpp/slixmpp-1.7.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d2b663cfc2132dab221d5c0a83246b53
diff --git a/metadata/md5-cache/dev-python/sniffio-1.2.0 b/metadata/md5-cache/dev-python/sniffio-1.2.0
index b4d7e6810230..92f0f8d83d39 100644
--- a/metadata/md5-cache/dev-python/sniffio-1.2.0
+++ b/metadata/md5-cache/dev-python/sniffio-1.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Sniff out which async library your code is running under
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/sniffio/ https://pypi.org/project/sniffio/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 sparc ~x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/sniffio/archive/v1.2.0.tar.gz -> sniffio-1.2.0.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=161d965d4142a34a5560f5079813adc3
+_md5_=544f272b65f74a19a3211d930e1f1438
diff --git a/metadata/md5-cache/dev-python/sphinx-4.0.2 b/metadata/md5-cache/dev-python/sphinx-4.0.2
deleted file mode 100644
index 2ccedb1afbe7..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-4.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python documentation generator
-EAPI=7
-HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx
-IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-4.0.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f023d30104c0d1d2b1d937a843603c56
diff --git a/metadata/md5-cache/dev-python/sphinx-4.0.3 b/metadata/md5-cache/dev-python/sphinx-4.0.3
index be8668a0e5e5..b1702805c1d2 100644
--- a/metadata/md5-cache/dev-python/sphinx-4.0.3
+++ b/metadata/md5-cache/dev-python/sphinx-4.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Python documentation generator
 EAPI=8
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx
 IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-4.0.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c87cab472836be7b8e3383e0d5d2867
+_md5_=19728106ca7b2b6a4cac8c7486ab618d
diff --git a/metadata/md5-cache/dev-python/sphinx-4.1.0 b/metadata/md5-cache/dev-python/sphinx-4.1.0
new file mode 100644
index 000000000000..67b6077d0f64
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-4.1.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python documentation generator
+EAPI=8
+HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx
+IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/Sphinx/Sphinx-4.1.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fe5e24646e9862d2e5eabd8d81e15f82
diff --git a/metadata/md5-cache/dev-python/sphinx-4.1.1 b/metadata/md5-cache/dev-python/sphinx-4.1.1
new file mode 100644
index 000000000000..1bc16b623917
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-4.1.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python documentation generator
+EAPI=8
+HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx
+IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/Sphinx/Sphinx-4.1.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b799f7bebd387c57c440d1e798d78fe5
diff --git a/metadata/md5-cache/dev-python/sphinx-panels-0.5.2 b/metadata/md5-cache/dev-python/sphinx-panels-0.5.2
deleted file mode 100644
index 514c6aa9f3c7..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-panels-0.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A sphinx extension for creating panels in a grid layout
-EAPI=7
-HOMEPAGE=https://github.com/executablebooks/sphinx-panels
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/executablebooks/sphinx-panels/archive/v0.5.2.tar.gz -> sphinx-panels-0.5.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0a6e00ff9a85c1f92a59d68a66f95bde
diff --git a/metadata/md5-cache/dev-python/sphinx-panels-0.6.0 b/metadata/md5-cache/dev-python/sphinx-panels-0.6.0
index c5f57ec91b73..8c93b9879634 100644
--- a/metadata/md5-cache/dev-python/sphinx-panels-0.6.0
+++ b/metadata/md5-cache/dev-python/sphinx-panels-0.6.0
@@ -4,7 +4,7 @@ DESCRIPTION=A sphinx extension for creating panels in a grid layout
 EAPI=7
 HOMEPAGE=https://github.com/executablebooks/sphinx-panels
 IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/executablebooks/sphinx-panels/archive/v0.6.0.tar.gz -> sphinx-panels-0.6.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=671d869e605a026ae128e4bf90c7d6ee
+_md5_=2c4920a35fd94bf7b9ad6c0c20a2f250
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3 b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
deleted file mode 100644
index 66ee942cd8d8..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx extension which outputs HTML help book
-EAPI=7
-HOMEPAGE=https://www.sphinx-doc.org https://github.com/sphinx-doc/sphinxcontrib-htmlhelp
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=886628faf8bbfecfbc9fdfeaabd2bdb1
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0 b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0
index c9afb625b93e..01d89b8af071 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx extension which outputs HTML help book
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
 PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b19a96d3d931f29527bddead824c59a3
+_md5_=d8f04d7865efe6b4c27ed0b4a25cbbaf
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.4 b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.4
deleted file mode 100644
index b9cb511e52ff..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx extension which outputs outputs serialized HTML files
-EAPI=7
-HOMEPAGE=https://www.sphinx-doc.org https://github.com/sphinx-doc/sphinxcontrib-serializinghtml
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7941467ff1d14e37c6fcf848fa61fe1
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5 b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5
index 112d5a6711ad..7a4b99f8eaf3 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx extension which outputs outputs serialized HTML files
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org https://github.com/sphinx-doc/sphinxcontrib-serializinghtml
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
 PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a78b1e018583b2fedffd389cf18dd3f8
+_md5_=4d67580db5b6dfcc08edc5276e8f2a44
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2 b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
index 65f661cda265..d2d42588b994 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Make Sphinx better at documenting Python functions and methods
 EAPI=8
 HOMEPAGE=https://github.com/python-trio/sphinxcontrib-trio https://pypi.org/project/sphinxcontrib-trio
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b3885235d37bfda683eb833aa1ed8eff
+_md5_=fc1307acaf5cebc865b3a074d9143886
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.18 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.18
index 29192f31a59a..4253cd820b06 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.18
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.18
@@ -4,7 +4,7 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.18.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2fa4fcfd4e3c775dc85a8c45a07b3444
+_md5_=23d643bd3c2e627a912edd6e35b6c3ff
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.21 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.21
new file mode 100644
index 000000000000..c7d4111d4139
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.21
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=7
+HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
+IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.21.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2fa4fcfd4e3c775dc85a8c45a07b3444
diff --git a/metadata/md5-cache/dev-python/stripe-2.56.0 b/metadata/md5-cache/dev-python/stripe-2.56.0
deleted file mode 100644
index f53683c8e02e..000000000000
--- a/metadata/md5-cache/dev-python/stripe-2.56.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/stripe-mock-0.103.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/curl )
-DESCRIPTION=Stripe python bindings
-EAPI=7
-HOMEPAGE=https://github.com/stripe/stripe-python
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/stripe/stripe-2.56.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6b3d545d0f38e4d95101e4d506957092
diff --git a/metadata/md5-cache/dev-python/stripe-2.57.0 b/metadata/md5-cache/dev-python/stripe-2.57.0
deleted file mode 100644
index 56927c64ccd9..000000000000
--- a/metadata/md5-cache/dev-python/stripe-2.57.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/stripe-mock-0.103.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/curl )
-DESCRIPTION=Stripe python bindings
-EAPI=7
-HOMEPAGE=https://github.com/stripe/stripe-python
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/stripe/stripe-2.57.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6898824cbf7aa08d8f0df49ebe8e763c
diff --git a/metadata/md5-cache/dev-python/stripe-2.58.0 b/metadata/md5-cache/dev-python/stripe-2.58.0
index 36e146ebc9c3..09671a0b6184 100644
--- a/metadata/md5-cache/dev-python/stripe-2.58.0
+++ b/metadata/md5-cache/dev-python/stripe-2.58.0
@@ -1,11 +1,11 @@
 BDEPEND=test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/stripe-mock-0.103.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/curl )
+DEPEND=test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/stripe-mock-0.106.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/curl )
 DESCRIPTION=Stripe python bindings
 EAPI=7
 HOMEPAGE=https://github.com/stripe/stripe-python
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stripe/stripe-2.58.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4bfa4271e9fcd33deddc2fe0285bf2ea
+_md5_=4b0016bb1591050c6c793623315fac34
diff --git a/metadata/md5-cache/dev-python/stripe-2.59.0 b/metadata/md5-cache/dev-python/stripe-2.59.0
index 9ce2ac5d3efd..1eeb9f678926 100644
--- a/metadata/md5-cache/dev-python/stripe-2.59.0
+++ b/metadata/md5-cache/dev-python/stripe-2.59.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-util/stripe-mock-0.103.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-util/stripe-mock-0.109.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Stripe python bindings
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stripe/stripe-2.59.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2a7c127a42f1c739b6b5a8ba11a30ab5
+_md5_=4021fb6af293679afdcf240f6a83628a
diff --git a/metadata/md5-cache/dev-python/stripe-2.60.0 b/metadata/md5-cache/dev-python/stripe-2.60.0
new file mode 100644
index 000000000000..4f9a5151f1c1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stripe-2.60.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-util/stripe-mock-0.109.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Stripe python bindings
+EAPI=8
+HOMEPAGE=https://github.com/stripe/stripe-python
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/stripe/stripe-2.60.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4021fb6af293679afdcf240f6a83628a
diff --git a/metadata/md5-cache/dev-python/tenacity-8.0.1 b/metadata/md5-cache/dev-python/tenacity-8.0.1
new file mode 100644
index 000000000000..8570d0a0f661
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tenacity-8.0.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=General-purpose retrying library
+EAPI=8
+HOMEPAGE=https://github.com/jd/tenacity
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tenacity/tenacity-8.0.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=25a92aebe0d4efb8d17d8fcbed7deea1
diff --git a/metadata/md5-cache/dev-python/terminado-0.10.0 b/metadata/md5-cache/dev-python/terminado-0.10.0
deleted file mode 100644
index 05f4cbe8b7a1..000000000000
--- a/metadata/md5-cache/dev-python/terminado-0.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Terminals served to term.js using Tornado websockets
-EAPI=7
-HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/terminado/terminado-0.10.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=84c9cd29c87f3446a9f5e5ad24caff75
diff --git a/metadata/md5-cache/dev-python/terminado-0.10.1 b/metadata/md5-cache/dev-python/terminado-0.10.1
index e5ccb5e82bb4..8e0e26f762c7 100644
--- a/metadata/md5-cache/dev-python/terminado-0.10.1
+++ b/metadata/md5-cache/dev-python/terminado-0.10.1
@@ -4,7 +4,7 @@ DESCRIPTION=Terminals served to term.js using Tornado websockets
 EAPI=7
 HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.10.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bdb7670555a761c26433a35f13e63bdb
+_md5_=e86c2ee1dce7b400aff7afb5072f4743
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.18.0 b/metadata/md5-cache/dev-python/testfixtures-6.18.0
new file mode 100644
index 000000000000..27bc3d8eabbb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/testfixtures-6.18.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sybil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/twisted-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A collection of helpers and mock objects for unit tests and doc tests
+EAPI=8
+HOMEPAGE=https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/testfixtures/testfixtures-6.18.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=641c6bc14e71e9494a164eec92bc52a9
diff --git a/metadata/md5-cache/dev-python/testtools-2.5.0 b/metadata/md5-cache/dev-python/testtools-2.5.0
new file mode 100644
index 000000000000..eabca9f72a40
--- /dev/null
+++ b/metadata/md5-cache/dev-python/testtools-2.5.0
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10[threads(+)] dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/extras-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-mimeparse[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pbr-0.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrsistent[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/fixtures-1.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testscenarios[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=Extensions to the Python standard library unit testing framework
+EAPI=8
+HOMEPAGE=https://github.com/testing-cabal/testtools
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT
+PDEPEND=>=dev-python/fixtures-1.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=>=dev-python/extras-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-mimeparse[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pbr-0.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrsistent[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/testtools/testtools-2.5.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=39981e1d2c42cae4dbdbe8ea8eaee81b
diff --git a/metadata/md5-cache/dev-python/texttable-1.6.4 b/metadata/md5-cache/dev-python/texttable-1.6.4
new file mode 100644
index 000000000000..93c320db5547
--- /dev/null
+++ b/metadata/md5-cache/dev-python/texttable-1.6.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Module for creating simple ASCII tables
+EAPI=7
+HOMEPAGE=https://github.com/foutaise/texttable https://pypi.org/project/texttable/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/foutaise/texttable/archive/v1.6.4.tar.gz -> texttable-1.6.4.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0730d0ae533f464681e57580e0cc4a33
diff --git a/metadata/md5-cache/dev-python/tomli-1.0.4 b/metadata/md5-cache/dev-python/tomli-1.0.4
new file mode 100644
index 000000000000..5215952800e6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tomli-1.0.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A lil' TOML parser
+EAPI=8
+HOMEPAGE=https://pypi.org/project/tomli/ https://github.com/hukkin/tomli/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hukkin/tomli/archive/1.0.4.tar.gz -> tomli-1.0.4.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=97d0f2319a13b82b054ba7fe99e2c941
diff --git a/metadata/md5-cache/dev-python/tox-3.24.0 b/metadata/md5-cache/dev-python/tox-3.24.0
new file mode 100644
index 000000000000..e77964be46c9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-3.24.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flaky-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=virtualenv-based automation of test activities
+EAPI=7
+HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/tox/archive/3.24.0.tar.gz -> tox-3.24.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7377497a41c41ca5e66955c311426f8f
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.19.0 b/metadata/md5-cache/dev-python/tree-sitter-0.19.0
deleted file mode 100644
index 3300d441c117..000000000000
--- a/metadata/md5-cache/dev-python/tree-sitter-0.19.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings to the Tree-sitter parsing library
-EAPI=7
-HOMEPAGE=https://github.com/tree-sitter/py-tree-sitter
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tree_sitter/tree_sitter-0.19.0.tar.gz -> py-tree-sitter-0.19.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1cf5660c21b3c209171a3b147666e50a
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1 b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
index 373c9983b181..388c9fd3324d 100644
--- a/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
+++ b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings to the Tree-sitter parsing library
 EAPI=7
 HOMEPAGE=https://github.com/tree-sitter/py-tree-sitter/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=dev-libs/tree-sitter:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/py-tree-sitter/archive/b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz -> py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz test? ( https://github.com/tree-sitter/tree-sitter-javascript/archive/v0.19.0.tar.gz -> tree-sitter-javascript-0.19.0.tar.gz https://github.com/tree-sitter/tree-sitter-python/archive/v0.19.0.tar.gz -> tree-sitter-python-0.19.0.tar.gz )
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=095327f64daffe899affcd7eb46c5b95
+_md5_=498f98a1e2bbe4be7c612eac055f63ff
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.2.1 b/metadata/md5-cache/dev-python/tree-sitter-0.2.1
deleted file mode 100644
index 48609e862e31..000000000000
--- a/metadata/md5-cache/dev-python/tree-sitter-0.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings to the Tree-sitter parsing library
-EAPI=7
-HOMEPAGE=https://github.com/tree-sitter/py-tree-sitter
-IUSE=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_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tree_sitter/tree_sitter-0.2.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c41963b90ba7f4559352463b19d030cf
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.2.2 b/metadata/md5-cache/dev-python/tree-sitter-0.2.2
deleted file mode 100644
index a8dcb0183f31..000000000000
--- a/metadata/md5-cache/dev-python/tree-sitter-0.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings to the Tree-sitter parsing library
-EAPI=7
-HOMEPAGE=https://github.com/tree-sitter/py-tree-sitter
-IUSE=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_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tree_sitter/tree_sitter-0.2.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2eaa97e882051fd066b83a6cc321cf01
diff --git a/metadata/md5-cache/dev-python/trio-0.19.0 b/metadata/md5-cache/dev-python/trio-0.19.0
index 07c4048ef0bd..37797404b1d6 100644
--- a/metadata/md5-cache/dev-python/trio-0.19.0
+++ b/metadata/md5-cache/dev-python/trio-0.19.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python library for async concurrency and I/O
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/trio https://pypi.org/project/trio
 IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=>=dev-python/async_generator-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/outcome[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sortedcontainers[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/trio/archive/v0.19.0.tar.gz -> trio-0.19.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e8dedb4ad09c95e8ff9ab94d213f8807
+_md5_=9ef232448b2083b7f46960e92270d08b
diff --git a/metadata/md5-cache/dev-python/trustme-0.7.0 b/metadata/md5-cache/dev-python/trustme-0.7.0
deleted file mode 100644
index e6406137f011..000000000000
--- a/metadata/md5-cache/dev-python/trustme-0.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=#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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Apache-2.0 MIT )
-RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/trustme/trustme-0.7.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ba4ad9cfeb32ece0ecde2db613d3de3d
diff --git a/metadata/md5-cache/dev-python/trustme-0.8.0 b/metadata/md5-cache/dev-python/trustme-0.8.0
index 3523a5f6948f..25a126b554b3 100644
--- a/metadata/md5-cache/dev-python/trustme-0.8.0
+++ b/metadata/md5-cache/dev-python/trustme-0.8.0
@@ -4,7 +4,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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.8.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bc12a5bf70da24905822500783658041
+_md5_=9395637836f571fca1576f4f06bc2d7b
diff --git a/metadata/md5-cache/dev-python/twython-3.9.1 b/metadata/md5-cache/dev-python/twython-3.9.1
new file mode 100644
index 000000000000..f342b0727cf6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twython-3.9.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/requests-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-oauthlib-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An easy way to access Twitter data with Python
+EAPI=8
+HOMEPAGE=https://github.com/ryanmcgrath/twython
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-oauthlib-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ryanmcgrath/twython/archive/v3.9.1.tar.gz -> twython-3.9.1.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4de2fc093b2dbbe04c90d579cd4fc488
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.1.6 b/metadata/md5-cache/dev-python/uncertainties-3.1.6
new file mode 100644
index 000000000000..3d07703be488
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uncertainties-3.1.6
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=Python module for calculations with uncertainties
+EAPI=8
+HOMEPAGE=https://pythonhosted.org/uncertainties/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/uncertainties/uncertainties-3.1.6.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5d92ee4b9a7e33a9482211bd9ffaa829
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.4 b/metadata/md5-cache/dev-python/urllib3-1.26.4
deleted file mode 100644
index e8358424d47a..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-1.26.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=www-servers/tornado-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=www-servers/tornado-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=7
-HOMEPAGE=https://github.com/urllib3/urllib3
-IUSE=brotli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=23e46fe591b87ae0a75256a50c792eb7
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.14.0 b/metadata/md5-cache/dev-python/uvicorn-0.14.0
index 9d448bbf6a66..393b1b1daa26 100644
--- a/metadata/md5-cache/dev-python/uvicorn-0.14.0
+++ b/metadata/md5-cache/dev-python/uvicorn-0.14.0
@@ -4,7 +4,7 @@ DESCRIPTION=Lightning-fast ASGI server implementation
 EAPI=7
 HOMEPAGE=https://www.uvicorn.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/h11-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/uvicorn/archive/0.14.0.tar.gz -> uvicorn-0.14.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=424ace1712d837e57ece15d81720f9fe
+_md5_=99fc09a69c273b0a2328ce07e57c62c9
diff --git a/metadata/md5-cache/dev-python/uvloop-0.15.3 b/metadata/md5-cache/dev-python/uvloop-0.15.3
new file mode 100644
index 000000000000..4fec9e563b46
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uvloop-0.15.3
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-libs/libuv-1.11.0:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libuv-1.11.0:=
+DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
+EAPI=8
+HOMEPAGE=https://github.com/magicstack/uvloop
+IUSE=doc examples test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/uvloop/uvloop-0.15.3.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bad2f5069fb9e5a03410f1e659096847
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r1 b/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r1
deleted file mode 100644
index a462c3f7653c..000000000000
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-subtesthack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/click-log-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-threading-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Synchronize calendars and contacts
-EAPI=8
-HOMEPAGE=https://github.com/pimutils/vdirsyncer
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/click-log-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-threading-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.18.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4effb749026bd4c8b42274c6644d9eeb
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r2 b/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r2
new file mode 100644
index 000000000000..12731845fef8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-subtesthack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/click-log-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-threading-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Synchronize calendars and contacts
+EAPI=8
+HOMEPAGE=https://github.com/pimutils/vdirsyncer
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/click-log-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-threading-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.18.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fe4cac35b59c4e3847bb03ef406ed195
diff --git a/metadata/md5-cache/dev-python/versioneer-0.20 b/metadata/md5-cache/dev-python/versioneer-0.20
new file mode 100644
index 000000000000..3f73c393df2e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/versioneer-0.20
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Easy VCS-based management of project version strings
+EAPI=8
+HOMEPAGE=https://pypi.org/project/versioneer/ https://github.com/python-versioneer/python-versioneer/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=public-domain
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/versioneer/versioneer-0.20.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8ff8c2b703649d47e55e33992a8d6373
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.6.0 b/metadata/md5-cache/dev-python/virtualenv-20.6.0
new file mode 100644
index 000000000000..a09bed5abb5b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.6.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_python3_8? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pip-20.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pip-20.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pip-20.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/backports-entry_points_selectable-1.0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=8
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/backports-entry_points_selectable-1.0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.6.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=24883422d6566ad4206904306d3f0475
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.2 b/metadata/md5-cache/dev-python/wcmatch-8.2
index eba319a1a3cc..66b5aa86212a 100644
--- a/metadata/md5-cache/dev-python/wcmatch-8.2
+++ b/metadata/md5-cache/dev-python/wcmatch-8.2
@@ -4,7 +4,7 @@ DESCRIPTION=Wildcard/glob file name matcher
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/wcmatch/ https://pypi.org/project/wcmatch/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/backrefs-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/bracex-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/wcmatch/archive/8.2.tar.gz -> wcmatch-8.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3f6ff29d5e89aeaa1853717f96792a3f
+_md5_=b98638f733af226eeb346cd7648193b7
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.0.1 b/metadata/md5-cache/dev-python/websocket-client-1.0.1
deleted file mode 100644
index c44e5644867e..000000000000
--- a/metadata/md5-cache/dev-python/websocket-client-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WebSocket client for python with hybi13 support
-EAPI=7
-HOMEPAGE=https://github.com/websocket-client/websocket-client
-IUSE=examples python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
-LICENSE=LGPL-2.1+
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/w/websocket-client/websocket-client-1.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b458a8b82f83c0b2c6ef8c2f09596fac
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.1.0 b/metadata/md5-cache/dev-python/websocket-client-1.1.0
index 87b7698e89c4..7c381ab82df5 100644
--- a/metadata/md5-cache/dev-python/websocket-client-1.1.0
+++ b/metadata/md5-cache/dev-python/websocket-client-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=WebSocket client for python with hybi13 support
 EAPI=7
 HOMEPAGE=https://github.com/websocket-client/websocket-client
 IUSE=examples python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
 LICENSE=LGPL-2.1+
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/w/websocket-client/websocket-client-1.1.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eb0e6d934ee57e4f08fc6c9f9ab155f0
+_md5_=d7872593b2aa6c31dbe95637d707bf54
diff --git a/metadata/md5-cache/dev-python/websockets-9.1 b/metadata/md5-cache/dev-python/websockets-9.1
index c6d19af5d809..dc6eb6b77689 100644
--- a/metadata/md5-cache/dev-python/websockets-9.1
+++ b/metadata/md5-cache/dev-python/websockets-9.1
@@ -4,7 +4,7 @@ DESCRIPTION=Library for building WebSocket servers and clients in Python
 EAPI=7
 HOMEPAGE=https://websockets.readthedocs.io/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aaugustin/websockets/archive/9.1.tar.gz -> websockets-9.1-src.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2b0016861175269c7eb0bc67111908be
+_md5_=a2dd5aafddd0af752984b205e11ec610
diff --git a/metadata/md5-cache/dev-python/wsproto-1.0.0 b/metadata/md5-cache/dev-python/wsproto-1.0.0
index e0543cc64ec4..317270e9a431 100644
--- a/metadata/md5-cache/dev-python/wsproto-1.0.0
+++ b/metadata/md5-cache/dev-python/wsproto-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=WebSockets state-machine based protocol implementation
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/wsproto/ https://pypi.org/project/wsproto/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/h11-0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-1.0.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=baef8ae7d7de2fe16f8c0ffa84832ff6
+_md5_=459b22f3564c35b024369e94637e8699
diff --git a/metadata/md5-cache/dev-python/xapp-2.0.2 b/metadata/md5-cache/dev-python/xapp-2.0.2
deleted file mode 100644
index 13d9ed24223a..000000000000
--- a/metadata/md5-cache/dev-python/xapp-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/xapps[introspection]
-DESCRIPTION=Python bindings for x11-libs/xapps
-EAPI=7
-HOMEPAGE=https://github.com/linuxmint/python3-xapp
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-2
-RDEPEND=x11-libs/xapps[introspection] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/python3-xapp/archive/2.0.2.tar.gz -> xapp-2.0.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ccd0fe01863c5bc26254d423f42fde5e
diff --git a/metadata/md5-cache/dev-python/xapp-2.2.1 b/metadata/md5-cache/dev-python/xapp-2.2.1
index 13da8828b5e0..c2fe58d3689e 100644
--- a/metadata/md5-cache/dev-python/xapp-2.2.1
+++ b/metadata/md5-cache/dev-python/xapp-2.2.1
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for x11-libs/xapps
 EAPI=7
 HOMEPAGE=https://github.com/linuxmint/python3-xapp
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=x11-libs/xapps-2.2.0[introspection] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/python3-xapp/archive/2.2.1.tar.gz -> xapp-2.2.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc787b94e3262a3d44f4197438a6e1e2
+_md5_=183728e3dfdfaeb3206279de3d9c559b
diff --git a/metadata/md5-cache/dev-python/xcffib-0.11.1 b/metadata/md5-cache/dev-python/xcffib-0.11.1
index affc5a4f417b..d67807e465e0 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.11.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.11.1
@@ -5,7 +5,7 @@ DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
 EAPI=7
 HOMEPAGE=https://github.com/tych0/xcffib
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/libxcb python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.11.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=702335f7cd38222837198dc7ffc4e632
+_md5_=316a06943521719032eadd2d9a5da8d4
diff --git a/metadata/md5-cache/dev-python/xlwt-1.3.0-r1 b/metadata/md5-cache/dev-python/xlwt-1.3.0-r1
index 4ee7bfd453da..a75a1fe648be 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/xlwt-1.3.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python library to create spreadsheet files compatible with Excel
 EAPI=7
 HOMEPAGE=https://pypi.org/project/xlwt/
 IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-1.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9bc6e3f5955c61ab5de28ba8d14f901c
+_md5_=1c7deccaff2b4df265da30ea22ed27b0
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.6.2 b/metadata/md5-cache/dev-python/xmlschema-1.6.2
deleted file mode 100644
index a8b3b24c1528..000000000000
--- a/metadata/md5-cache/dev-python/xmlschema-1.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/elementpath-2.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An XML Schema validator and decoder
-EAPI=7
-HOMEPAGE=https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/elementpath-2.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.6.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=82f28fee5544f9b95a883de5379b1146
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.6.4 b/metadata/md5-cache/dev-python/xmlschema-1.6.4
index 35a2e63e2088..511c1e6fd25b 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.6.4
+++ b/metadata/md5-cache/dev-python/xmlschema-1.6.4
@@ -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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/elementpath-2.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.6.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=64c2ce062c072c30fcbda6c1f3596b08
+_md5_=3ed5c820b9cd089d0253c7200386dd20
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 70199b961eba..6f201dd3d8be 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625
index 775cf6ecdd24..c8772b574277 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625
@@ -5,7 +5,7 @@ DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applica
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtwebchannel-5.15.2[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.15.2 ) geolocation? ( ~dev-qt/qtpositioning-5.15.2 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( ~dev-qt/qtdeclarative-5.15.2[widgets] ~dev-qt/qtwidgets-5.15.2 )
 REQUIRED_USE=designer? ( widgets )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.2_p20210625.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-chromium87-ppc64le.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qt5-build	ebf98dc5d506667a2561e6d874653586	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ad2ec06803401d9963cc42bfd6ca6f7a
+_md5_=70b1a2a06b16516f8d30a6c72387dab0
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index e337c81e9fb5..839c0dbda892 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.6.0 b/metadata/md5-cache/dev-ruby/addressable-2.6.0
deleted file mode 100644
index ee36d0aa2815..000000000000
--- a/metadata/md5-cache/dev-ruby/addressable-2.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby25(-)] <dev-ruby/public_suffix-4:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby26(-)] <dev-ruby/public_suffix-4:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A replacement for the URI implementation that is part of Ruby's standard library
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
-IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby25(-)] <dev-ruby/public_suffix-4:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby26(-)] <dev-ruby/public_suffix-4:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/addressable-2.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b55410f6b06f123cd4b2ab6128999686
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.7.0 b/metadata/md5-cache/dev-ruby/addressable-2.7.0
deleted file mode 100644
index 428a9a2c14da..000000000000
--- a/metadata/md5-cache/dev-ruby/addressable-2.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby25(-)] dev-ruby/public_suffix:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby26(-)] dev-ruby/public_suffix:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby27(-)] dev-ruby/public_suffix:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby30(-)] dev-ruby/public_suffix:3[ruby_targets_ruby30(-)] ) ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby30(-)] ) ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A replacement for the URI implementation that is part of Ruby's standard library
-EAPI=7
-HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
-IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby25(-)] dev-ruby/public_suffix:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby26(-)] dev-ruby/public_suffix:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby27(-)] dev-ruby/public_suffix:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby30(-)] dev-ruby/public_suffix:3[ruby_targets_ruby30(-)] ) ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/addressable-2.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=35b48ec2d672636546ebd4cbd0e7a371
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.8.0 b/metadata/md5-cache/dev-ruby/addressable-2.8.0
index 49603ce62d64..b84fbb3743c9 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.8.0
+++ b/metadata/md5-cache/dev-ruby/addressable-2.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=A replacement for the URI implementation that is part of Ruby's stan
 EAPI=7
 HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
 IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby25? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby25(-)] dev-ruby/public_suffix:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby26(-)] dev-ruby/public_suffix:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby27(-)] dev-ruby/public_suffix:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby30(-)] dev-ruby/public_suffix:3[ruby_targets_ruby30(-)] ) ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/addressable-2.8.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=339eca09efb80f8b2bd222fd164ebffd
+_md5_=5480889e6c6642024ebfaadca2e4748f
diff --git a/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1 b/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
new file mode 100644
index 000000000000..ba05c7902254
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=The Ruby ANSI project is collection of ANSI escape codes for Ruby
+EAPI=7
+HOMEPAGE=https://rubyworks.github.io/ansi/
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://rubygems.org/gems/ansi-1.5.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b739be77664c31368e99ba53dcd4cd2c
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
deleted file mode 100644
index 1a012f921b48..000000000000
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A binary search library for Ruby
-EAPI=5
-HOMEPAGE=http://0xcc.net/ruby-bsearch/
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/bsearch-1.5.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6da374db336f5e5492e2553b1683f980
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.11 b/metadata/md5-cache/dev-ruby/curb-0.9.11
index 0d7a4265c638..973869e4da11 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.9.11
+++ b/metadata/md5-cache/dev-ruby/curb-0.9.11
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby-language bindings for libcurl
 EAPI=7
 HOMEPAGE=https://github.com/taf2/curb
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Ruby
 RDEPEND=net-misc/curl[ssl] 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 )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-0.9.11.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=57d825881155b89e2e0f63516408788d
+_md5_=3212294dd02233b595fa3ea08471f14b
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.11-r1 b/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
new file mode 100644
index 000000000000..644721cfb259
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=net-misc/curl[ssl] ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Ruby-language bindings for libcurl
+EAPI=7
+HOMEPAGE=https://github.com/taf2/curb
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=net-misc/curl[ssl] ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/curb-0.9.11.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=511432292ff6150f18a5f98b7db1830d
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.10 b/metadata/md5-cache/dev-ruby/dalli-2.7.10
deleted file mode 100644
index de8a5bb761d8..000000000000
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=net-misc/memcached-1.5.4 ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby25(-)] dev-ruby/connection_pool[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby26(-)] dev-ruby/connection_pool[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A high performance pure Ruby client for accessing memcached servers
-EAPI=6
-HOMEPAGE=https://github.com/petergoldstein/dalli
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.10.tar.gz -> dalli-2.7.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b318a410c88749102d593c93ab85d6a2
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0 b/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
index f174db30a2d3..6160bb5da874 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
@@ -5,7 +5,7 @@ DESCRIPTION='did you mean?'experience in Ruby
 EAPI=7
 HOMEPAGE=https://github.com/yuki24/did_you_mean
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.4.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=28e484cf5f2c1d441e58f61ec538e040
+_md5_=c2daf1cd1fb1f424e4c132fffb01f9b9
diff --git a/metadata/md5-cache/dev-ruby/diva-1.0.2 b/metadata/md5-cache/dev-ruby/diva-1.0.2
deleted file mode 100644
index db3f9e908bc7..000000000000
--- a/metadata/md5-cache/dev-ruby/diva-1.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( <dev-ruby/addressable-2.8[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( <dev-ruby/addressable-2.8[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/addressable-2.8[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
-DESCRIPTION=Implementation of expression for handling things.
-EAPI=7
-HOMEPAGE=https://github.com/toshia/diva https://rubygems.org/gems/diva
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( <dev-ruby/addressable-2.8[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( <dev-ruby/addressable-2.8[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/addressable-2.8[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 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/diva-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ef401df41c6aa3769a82ab392a13f779
diff --git a/metadata/md5-cache/dev-ruby/diva-1.0.2-r1 b/metadata/md5-cache/dev-ruby/diva-1.0.2-r1
deleted file mode 100644
index a31d12dd10de..000000000000
--- a/metadata/md5-cache/dev-ruby/diva-1.0.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( <dev-ruby/addressable-2.8[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( <dev-ruby/addressable-2.8[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/addressable-2.8[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
-DESCRIPTION=Implementation of expression for handling things.
-EAPI=7
-HOMEPAGE=https://github.com/toshia/diva https://rubygems.org/gems/diva
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( <dev-ruby/addressable-2.8[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( <dev-ruby/addressable-2.8[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/addressable-2.8[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 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/toshia/diva/archive/v1.0.2.tar.gz -> diva-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c87e52e66a682b176d27a589773295e0
diff --git a/metadata/md5-cache/dev-ruby/diva-1.0.2-r2 b/metadata/md5-cache/dev-ruby/diva-1.0.2-r2
new file mode 100644
index 000000000000..04310a79570f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/diva-1.0.2-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( <dev-ruby/addressable-2.9[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/addressable-2.9[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Implementation of expression for handling things.
+EAPI=7
+HOMEPAGE=https://github.com/toshia/diva https://rubygems.org/gems/diva
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( <dev-ruby/addressable-2.9[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/addressable-2.9[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/toshia/diva/archive/v1.0.2.tar.gz -> diva-1.0.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c059623ad13feaa54dbb861ff56318c5
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
new file mode 100644
index 000000000000..fd78237b72b7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/faraday:1[ruby_targets_ruby27(-)] dev-ruby/multi_json[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] dev-ruby/curb[ruby_targets_ruby26(-)] dev-ruby/patron[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby27(-)] dev-ruby/mocha:1.0[ruby_targets_ruby27(-)] dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/shoulda-context[ruby_targets_ruby27(-)] dev-ruby/curb[ruby_targets_ruby27(-)] dev-ruby/patron[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Ruby integrations for ES, elasticsearch-transport module
+EAPI=7
+HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/faraday:1[ruby_targets_ruby27(-)] dev-ruby/multi_json[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e587174e6155801a107c489c10e9ef10
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.18 b/metadata/md5-cache/dev-ruby/facter-3.14.18
index 54ee6947367d..a9e64761218a 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.14.18
+++ b/metadata/md5-cache/dev-ruby/facter-3.14.18
@@ -5,7 +5,7 @@ DESCRIPTION=A cross-platform ruby library for retrieving facts from operating sy
 EAPI=7
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.18.tar.gz -> facter-3.14.18.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f892652831b3a7281c0984b82759ac62
+_md5_=dea72c42ef0ec27061e8566cd6e6545a
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.19 b/metadata/md5-cache/dev-ruby/facter-3.14.19
new file mode 100644
index 000000000000..0ade99b49c58
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/facter-3.14.19
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/rspec:2[ruby_targets_ruby25(-)] dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec:2[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rspec:2[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) dev-util/ninja dev-util/cmake ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
+EAPI=7
+HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.19.tar.gz -> facter-3.14.19.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f892652831b3a7281c0984b82759ac62
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
new file mode 100644
index 000000000000..1e98b60883c6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/faraday_middleware:*[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/faraday_middleware:*[ruby_targets_ruby27(-)] dev-ruby/multi_json[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Response JSON parser using MultiJson and FaradayMiddleware
+EAPI=7
+HOMEPAGE=https://github.com/denro/faraday_middleware-multi_json
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/faraday_middleware:*[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/faraday_middleware:*[ruby_targets_ruby27(-)] dev-ruby/multi_json[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=712557625ce91aa282d69fc45cd3c062
diff --git a/metadata/md5-cache/dev-ruby/haml-5.2.1 b/metadata/md5-cache/dev-ruby/haml-5.2.1
new file mode 100644
index 000000000000..56ca6f87b6c8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/haml-5.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby26(-)] dev-ruby/tilt:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby27(-)] dev-ruby/tilt:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] dev-ruby/railties:6.0[ruby_targets_ruby26(-)] dev-ruby/activemodel:6.0[ruby_targets_ruby26(-)] dev-ruby/actionpack:6.0[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] dev-ruby/railties:6.0[ruby_targets_ruby27(-)] dev-ruby/activemodel:6.0[ruby_targets_ruby27(-)] dev-ruby/actionpack:6.0[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A ruby web page templating engine
+EAPI=7
+HOMEPAGE=https://haml.info/
+IUSE=doc test test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!!<dev-ruby/haml-4.0.7-r2 ruby_targets_ruby26? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby26(-)] dev-ruby/tilt:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby27(-)] dev-ruby/tilt:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://github.com/haml/haml/archive/5.2.1.tar.gz -> haml-5.2.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ff53044f704f6d136d856dc24fdc4fce
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.5.0 b/metadata/md5-cache/dev-ruby/launchy-2.5.0
index 74ae5a2351ef..91bc4c7e07dd 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.5.0
+++ b/metadata/md5-cache/dev-ruby/launchy-2.5.0
@@ -5,7 +5,7 @@ DESCRIPTION=Helper class for launching cross-platform applications
 EAPI=7
 HOMEPAGE=https://github.com/copiousfreetime/launchy
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=ISC
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/addressable-2.7[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=0
 SRC_URI=https://rubygems.org/gems/launchy-2.5.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0cb801da07d3f5b26c6ad36c86a79147
+_md5_=a1ad556d4ff497edde6057bf6985adfa
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.0.0 b/metadata/md5-cache/dev-ruby/liquid-5.0.0
deleted file mode 100644
index 37d09212e087..000000000000
--- a/metadata/md5-cache/dev-ruby/liquid-5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[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? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
-DESCRIPTION=Template engine for Ruby
-EAPI=7
-HOMEPAGE=https://shopify.github.io/liquid/
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm64
-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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=https://github.com/Shopify/liquid/archive/v5.0.0.tar.gz -> liquid-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bc41794c8b95f4be08385fa419e85cdd
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0 b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0
deleted file mode 100644
index 308ca8f902dc..000000000000
--- a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Liquid performance extension in C
-EAPI=6
-HOMEPAGE=https://github.com/Shopify/liquid-c
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~arm64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/liquid-3.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=https://rubygems.org/gems/liquid-c-4.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c49410cf496bbeab32161bf51b0c3071
diff --git a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2 b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
deleted file mode 100644
index 365845d1a540..000000000000
--- a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Descriptive configuration files for Ruby written in Ruby
-EAPI=5
-HOMEPAGE=https://github.com/TwP/loquacious
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/loquacious-1.9.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=087d423c01f24025072d74c6cbf87676
diff --git a/metadata/md5-cache/dev-ruby/mab-0.0.3 b/metadata/md5-cache/dev-ruby/mab-0.0.3
deleted file mode 100644
index 3218f605abf7..000000000000
--- a/metadata/md5-cache/dev-ruby/mab-0.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Markup as Ruby
-EAPI=5
-HOMEPAGE=https://github.com/camping/mab
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/mab-0.0.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=96505adc9038e84b72f30c1439beef39
diff --git a/metadata/md5-cache/dev-ruby/method_source-0.9.2 b/metadata/md5-cache/dev-ruby/method_source-0.9.2
deleted file mode 100644
index 2773c617a957..000000000000
--- a/metadata/md5-cache/dev-ruby/method_source-0.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Retrieve the source code for a method
-EAPI=6
-HOMEPAGE=https://github.com/banister/method_source
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-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_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/method_source-0.9.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=21d83c617d0520303c86913f4eb80b7a
diff --git a/metadata/md5-cache/dev-ruby/middleware-0.1.0 b/metadata/md5-cache/dev-ruby/middleware-0.1.0
index 5199dddfbf67..a414dbce310e 100644
--- a/metadata/md5-cache/dev-ruby/middleware-0.1.0
+++ b/metadata/md5-cache/dev-ruby/middleware-0.1.0
@@ -1,16 +1,16 @@
-BDEPEND=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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
+DEPEND=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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Generalized implementation of the middleware abstraction for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/mitchellh/middleware
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~amd64
 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 )
+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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/middleware-0.1.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3288fd7b3a9b01002debb9e0c7faca23
+_md5_=bf20b274ee71f4edf631514406e60f26
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.3.1 b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
index 3e62489cd187..20f207936c58 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.3.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby25(-)] dev-ruby/minitest-hooks:1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby26(-)] dev-ruby/minitest-hooks:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby27(-)] dev-ruby/minitest-hooks:1[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby27(-)] ) ) ruby_targets_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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby25(-)] dev-ruby/minitest-hooks:1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby26(-)] dev-ruby/minitest-hooks:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby27(-)] dev-ruby/minitest-hooks:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby30(-)] dev-ruby/minitest-hooks:1[ruby_targets_ruby30(-)] ) ) test? ( ruby_targets_ruby25? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
+DEPEND=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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby27(-)] ) ruby_targets_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 )
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-3.3.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=78a8b7cf48f6286c07eb4ddb70df2dc6
+_md5_=dba374499a7e83ec3017b8f4de3dc537
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.13.0 b/metadata/md5-cache/dev-ruby/minitest-5.13.0
index 3fd19049891f..24ef34e0cf04 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.13.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.13.0
@@ -5,7 +5,7 @@ DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and sl
 EAPI=7
 HOMEPAGE=https://github.com/seattlerb/minitest
 IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.13.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b9605de1ab27f3f64e4e1737fc9f1206
+_md5_=9203ed33ac0fd32cfbda98e4e00fcd59
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
new file mode 100644
index 000000000000..20d451142432
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/minitest-pretty_diff[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/minitest-pretty_diff[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/minitest-pretty_diff[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Bonus assertions for minitest
+EAPI=7
+HOMEPAGE=https://github.com/halostatue/minitest-bonus-assertions
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/minitest-bonus-assertions-3.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2252e7ac9231b33e8006eb218e7717ba
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.15.0 b/metadata/md5-cache/dev-ruby/multi_json-1.15.0
index 29c04ff7ae7f..b1df33aa5539 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.15.0
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.15.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby25(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby26(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby27(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/json[ruby_targets_ruby25(-)] dev-ruby/yajl-ruby[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/json[ruby_targets_ruby26(-)] dev-ruby/yajl-ruby[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/json[ruby_targets_ruby27(-)] dev-ruby/yajl-ruby[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby25? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby25(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby26(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby27(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby30(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby30(-)] ) ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/json[ruby_targets_ruby25(-)] dev-ruby/yajl-ruby[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/json[ruby_targets_ruby26(-)] dev-ruby/yajl-ruby[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/json[ruby_targets_ruby27(-)] dev-ruby/yajl-ruby[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/json[ruby_targets_ruby30(-)] dev-ruby/yajl-ruby[ruby_targets_ruby30(-)] ) ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
+DEPEND=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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=A gem to provide swappable JSON backends
 EAPI=7
 HOMEPAGE=https://github.com/intridea/multi_json
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby25(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby26(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby27(-)] >=dev-ruby/yajl-ruby-1.0[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 )
+RDEPEND=ruby_targets_ruby25? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby25(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby26(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby27(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby30(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby30(-)] ) ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.15.0.tar.gz -> multi_json-1.15.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b880a40d7013c391f445ac6777a8cbd1
+_md5_=cbbd50160de172b98f3226337cc0f996
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
new file mode 100644
index 000000000000..bec88e07e0b1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A uniform interface for Ruby testing libraries
+EAPI=7
+HOMEPAGE=https://cucumber.io/
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://rubygems.org/gems/multi_test-0.1.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea1683dcddb2b20e1afb9b2593fc2144
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
new file mode 100644
index 000000000000..10ec9c6f88e9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Extremely mynymal test framework
+EAPI=7
+HOMEPAGE=https://github.com/mynyml/nanotest
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/nanotest-0.9.4.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bc9ecd36b49bb0b879ecf2b7e2058751
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.3 b/metadata/md5-cache/dev-ruby/patron-0.13.3
deleted file mode 100644
index db73b8cdb85d..000000000000
--- a/metadata/md5-cache/dev-ruby/patron-0.13.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl ruby_targets_ruby25? ( test? ( dev-ruby/rack[ruby_targets_ruby25(-)] www-servers/puma[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rack[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rack[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
-EAPI=6
-HOMEPAGE=https://toland.github.com/patron/
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=net-misc/curl 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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/patron-0.13.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ec6f1a020d9e90d222d0cc5e40c1b871
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1 b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
new file mode 100644
index 000000000000..8573079752c5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/rack[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rack[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=net-misc/curl ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
+EAPI=7
+HOMEPAGE=https://toland.github.com/patron/
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=net-misc/curl ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/patron-0.13.3.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4fa444b6653729e588bcce33dc1634b8
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.1.7 b/metadata/md5-cache/dev-ruby/power_assert-1.1.7
index 5434d02e577d..b4313352fc6c 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.1.7
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.1.7
@@ -5,7 +5,7 @@ DESCRIPTION=Shows each value of variables and method calls in the expression
 EAPI=7
 HOMEPAGE=https://github.com/k-tsj/power_assert
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby BSD-2 )
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.1.7.tar.gz -> power_assert-1.1.7.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=48856cc88d8b6ab7a2f9da8ef68a61f0
+_md5_=c9fb28297b9231d82c6e5f6bd980a656
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.3 b/metadata/md5-cache/dev-ruby/rack-2.2.3
index 3496bc4d7475..c4bb35b2cfcc 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.2.3
+++ b/metadata/md5-cache/dev-ruby/rack-2.2.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=A modular Ruby webserver interface
 EAPI=7
-HOMEPAGE=https://rack.github.com/
+HOMEPAGE=https://github.com/rack/rack
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.2
 SRC_URI=https://github.com/rack/rack/archive/2.2.3.tar.gz -> rack-2.2.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b0b66f6fea2744e766b4e471699cd1f6
+_md5_=e6301d8cd8b38f0b114f7dfcfa468854
diff --git a/metadata/md5-cache/dev-ruby/rake-12.3.3 b/metadata/md5-cache/dev-ruby/rake-12.3.3
index d09268909a36..a3f6c63d0d07 100644
--- a/metadata/md5-cache/dev-ruby/rake-12.3.3
+++ b/metadata/md5-cache/dev-ruby/rake-12.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v12.3.3.tar.gz -> rake-12.3.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bbe8563a0c284f95683fa2e4a2b8d94f
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.3 b/metadata/md5-cache/dev-ruby/rake-13.0.3
index 831ded935e7a..7fd6e00946a7 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.3
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.3.tar.gz -> rake-13.0.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3495429eafaea9354af5494d4f08761b
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.3-r1 b/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
index c3646f6977fe..0504cc51b0e4 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Make-like scripting in Ruby
 EAPI=7
 HOMEPAGE=https://github.com/ruby/rake
 IUSE=doc ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.3.tar.gz -> rake-13.0.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=08ac1c7618e39e2fcad59541eb9d97a5
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea3937a91cda21326fcb13d05c50b0a3
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.4 b/metadata/md5-cache/dev-ruby/rake-13.0.4
index 4b1dee3c4180..a927b57ce28a 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.4
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.4.tar.gz -> rake-13.0.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f1f8dc5748b050b972f5456415f01792
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.6 b/metadata/md5-cache/dev-ruby/rake-13.0.6
index bba9e9af8b13..a3aafe1d17ed 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.6
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.6.tar.gz -> rake-13.0.6.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f1f8dc5748b050b972f5456415f01792
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.3.2 b/metadata/md5-cache/dev-ruby/rdoc-6.3.2
index 57cfa8efacde..3722b9fef5a7 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.3.2
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.3.2
@@ -5,7 +5,7 @@ DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
 EAPI=7
 HOMEPAGE=https://github.com/ruby/rdoc/
 IUSE=doc ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby MIT
 RDEPEND=>=app-eselect/eselect-ruby-20181225 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.3.2.tar.gz -> rdoc-6.3.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=19de439be4b6d36a313c1a142f5aac92
+_md5_=7bee793679eb69fcb941a31dc871d591
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.2.2 b/metadata/md5-cache/dev-ruby/rmagick-4.2.2
index 46cc3860beba..aee0f2af876f 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-4.2.2
+++ b/metadata/md5-cache/dev-ruby/rmagick-4.2.2
@@ -1,16 +1,16 @@
-BDEPEND=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? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,webp] ) 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(-)] )
+DEPEND=test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,webp] ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing library
 EAPI=7
 HOMEPAGE=https://github.com/rmagick/rmagick
-IUSE=doc ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+IUSE=doc ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Artistic
-RDEPEND=>=media-gfx/imagemagick-6.9.0:= ruby_targets_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 )
+RDEPEND=>=media-gfx/imagemagick-6.9.0:= 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_4-2-2.tar.gz -> rmagick-4.2.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5bfec7809dcb754e3163c6d4d8e1b0f7
+_md5_=42adf110ccb4275f30bdc6dea947e152
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.10.0 b/metadata/md5-cache/dev-ruby/rspec-3.10.0
index cad18ef936ae..3d800e53b8b4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.10.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.10.0
@@ -5,7 +5,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rspec/rspec
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby25(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby25(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby26(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby26(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby27(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby27(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby30(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby30(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby30(-)] ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.10.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8425400bb7acfc0a033d674fd7d076f5
+_md5_=5c12ce2d3c4caf3aecd7cef77c8b24cd
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.10.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
index 7e6f17613353..b11e182c5895 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
@@ -5,7 +5,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rspec/rspec-core
 IUSE=highlight test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby27(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby30(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby30(-)] ) ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.10.1.tar.gz -> rspec-core-3.10.1-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=773cf077e8514b14da2d9592f763ab8a
+_md5_=50880b2d57dc89a493ad21896034b366
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
index f9dd79a33ccb..60986a594912 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
@@ -5,7 +5,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rspec/rspec-expectations
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby30(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby30(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby30(-)] ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.10.1.tar.gz -> rspec-expectations-3.10.1-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=98cc1d19f7e2a75741e8b86e1542917f
+_md5_=b7eb52544e476d3057810d4752828c8a
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
index cf5ed3164e9e..646ba59fd556 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
@@ -5,7 +5,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rspec/rspec-mocks
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby30(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby30(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby30(-)] ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.10.2.tar.gz -> rspec-mocks-3.10.2-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e62509c9a313c28f8d80483adc9dc6a9
+_md5_=6e037a6de03e60f0297ce4c1a4496c6e
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
index 220087f0aa9d..67958013c20b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
@@ -5,7 +5,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rspec/rspec-support
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.10.2.tar.gz -> rspec-support-3.10.2-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3fb2939d9af931002a1d8197c49944e1
+_md5_=dca3acb39f3a609a4c4afa671ce38f92
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
deleted file mode 100644
index 1d9383d972d1..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=Ruby/SDL: Ruby bindings for SDL
-EAPI=5
-HOMEPAGE=https://www.kmc.gr.jp/~ohai/rubysdl.en.html
-IUSE=image mixer truetype mpeg sge ruby_targets_ruby25 ruby_targets_ruby26
-KEYWORDS=amd64 ~ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=https://github.com/ohai/rubysdl/archive/rel-2-1-2.tar.gz -> ruby-sdl-2.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2536b637a90dfde929ff64f5cc0a08e2
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
index 7019455be544..4594524f03d3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A Ruby interface to libshout2
 EAPI=7
 HOMEPAGE=https://github.com/niko/ruby-shout
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=Ruby
 RDEPEND=>=media-libs/libshout-2.0 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shout-2.2.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f29d444d5f0a1dcfc09b104577f8d3a1
+_md5_=15a09d58bcbb83b56facc4808ad9a222
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
index cb2bef4573a1..13fa7c333056 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
@@ -5,7 +5,7 @@ DESCRIPTION=Shim library for Module#ruby2_keywords
 EAPI=7
 HOMEPAGE=https://github.com/ruby/ruby2_keywords
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Ruby
 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d191498e01ca3eac55f22ee9cd95ea79
+_md5_=1355e930bf7d92562ac015e1b407867d
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
new file mode 100644
index 000000000000..c27544e51189
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Shim library for Module#ruby2_keywords
+EAPI=7
+HOMEPAGE=https://github.com/ruby/ruby2_keywords
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test )
+SLOT=0.0
+SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.5.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bd366e40f8ee4461a93e8f0fc9ec1cae
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5
deleted file mode 100644
index a7a5b3a1c883..000000000000
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/hashie[ruby_targets_ruby25(-)] dev-ruby/heredoc_unindent[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/hashie[ruby_targets_ruby26(-)] dev-ruby/heredoc_unindent[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Parse YAML safely, alternative implementation of YAML.load
-EAPI=6
-HOMEPAGE=https://dtao.github.com/safe_yaml
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/safe_yaml-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e4230908adf802857134a3620e0d0a9
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
index c9276470dd54..8006c6e40b17 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Parse YAML safely, alternative implementation of YAML.load
 EAPI=7
 HOMEPAGE=https://dtao.github.com/safe_yaml
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/safe_yaml-1.0.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=98c489cd6061b32ec0eb9dcd75aaf48a
+_md5_=abc76e97aa062fe5fd38fdf48b70bc58
diff --git a/metadata/md5-cache/dev-ruby/sfl-2.2-r1 b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
deleted file mode 100644
index e7a072877686..000000000000
--- a/metadata/md5-cache/dev-ruby/sfl-2.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Library providing spawn() which is almost perfectly compatible with ruby 1.9's
-EAPI=5
-HOMEPAGE=https://github.com/ujihisa/spawn-for-legacy
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/sfl-2.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ae312257d6b1834abf8cbe57539ee6c1
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
deleted file mode 100644
index e7223cba11d6..000000000000
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Making tests easy on the fingers and eyes
-EAPI=5
-HOMEPAGE=http://thoughtbot.com/projects/shoulda
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/thoughtbot/shoulda/tarball/v2.11.3 -> shoulda-2.11.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7d59f2d95ea99e2ee17d42239943065d
diff --git a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1 b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
deleted file mode 100644
index 309d41754429..000000000000
--- a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/shoulda[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/shoulda[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Subexec spawns an external command with a timeout
-EAPI=5
-HOMEPAGE=https://github.com/nulayer/subexec
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nulayer/subexec/archive/v0.2.3.tar.gz -> subexec-0.2.3.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1ef0fcab789da0a89018f3182ab6f202
diff --git a/metadata/md5-cache/dev-ruby/sys-uname-1.2.1 b/metadata/md5-cache/dev-ruby/sys-uname-1.2.1
deleted file mode 100644
index dd201f6521e1..000000000000
--- a/metadata/md5-cache/dev-ruby/sys-uname-1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/ffi-1.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.0.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.0.0[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? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
-DESCRIPTION=A Ruby interface for getting operating system information
-EAPI=7
-HOMEPAGE=https://github.com/djberg96/sys-uname
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/ffi-1.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.0.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.0.0[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 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://rubygems.org/gems/sys-uname-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3ec6d2dc095be5b9eff96f4b9986f834
diff --git a/metadata/md5-cache/dev-ruby/sys-uname-1.2.2 b/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
index e145456e732b..7f6f19c2af2b 100644
--- a/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
+++ b/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.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? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby30(-)] ) ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
+DEPEND=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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=A Ruby interface for getting operating system information
 EAPI=7
 HOMEPAGE=https://github.com/djberg96/sys-uname
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.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 )
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby30(-)] ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/sys-uname-1.2.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=67db984bedc3ab788eb039db0f09e21f
+_md5_=3ef24b79588f64f3c68728db91573206
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.3.9 b/metadata/md5-cache/dev-ruby/test-unit-3.3.9
index 8492d8b3d1cc..f96a29ef2ff3 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.3.9
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.3.9
@@ -5,7 +5,7 @@ DESCRIPTION=An xUnit family unit testing framework for Ruby
 EAPI=7
 HOMEPAGE=https://rubygems.org/gems/test-unit
 IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby GPL-2 ) PSF-2
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/power_assert[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/power_assert[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/power_assert[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/power_assert[ruby_targets_ruby30(-)] ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/test-unit-3.3.9.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=950eb58dc00dd053a995c3789be2f9ba
+_md5_=96e22b89106d04c4962048a8a0041386
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
deleted file mode 100644
index a2b359fd4a48..000000000000
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Tool to convert an array of struct into an HTML table
-EAPI=5
-HOMEPAGE=https://github.com/topfunky/tidy_table
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/tidy_table-0.0.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9f70aea28df4d57ea6d549bb5e4a9a4b
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5
index 7f72afeeaf77..a61277de7c2b 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Tool to convert an array of struct into an HTML table
 EAPI=6
 HOMEPAGE=https://github.com/topfunky/tidy_table
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 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/tidy_table-0.0.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=947365c188e5dcc96923513fd24e99d1
+_md5_=6cecaaa032101307cc3f5c0685ea0884
diff --git a/metadata/md5-cache/dev-ruby/travis-1.10.0 b/metadata/md5-cache/dev-ruby/travis-1.10.0
index a1cae7521970..ad8fc55725fc 100644
--- a/metadata/md5-cache/dev-ruby/travis-1.10.0
+++ b/metadata/md5-cache/dev-ruby/travis-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/travis-1.10.0.gem
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d4a8fa52ab67560aac69702a4f8719c
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.1.3 b/metadata/md5-cache/dev-ruby/trollop-2.1.3
deleted file mode 100644
index 61316d278def..000000000000
--- a/metadata/md5-cache/dev-ruby/trollop-2.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/chronic[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/chronic[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Trollop is a commandline option parser for Ruby
-EAPI=6
-HOMEPAGE=https://manageiq.github.io/trollop/
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/trollop-2.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e30f4365429839fb742d8b889bb1f982
diff --git a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1 b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
deleted file mode 100644
index cfa114a563c2..000000000000
--- a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A syntax highlighting engine based on Textpow
-EAPI=5
-HOMEPAGE=https://github.com/grosser/ultraviolet
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/ultraviolet-1.0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db8edb038913fd678a942ebd2c82ce82
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0-r1 b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
new file mode 100644
index 000000000000..ef8df27b288f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/nanotest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/nanotest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/nanotest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Ruby method to unindent strings
+EAPI=7
+HOMEPAGE=https://github.com/mynyml/unindent
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/unindent-1.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0976d025fb7458e512e5d8747681fc88
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5
deleted file mode 100644
index 0885389e1d0a..000000000000
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A complete implementation of the WebSocket protocols
-EAPI=5
-HOMEPAGE=https://github.com/faye/websocket-driver-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.5.tar.gz -> websocket-driver-0.6.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=976bd45c3d91138b7fe07fc1ba90d443
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.4 b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.4
deleted file mode 100644
index 60eac5d66dcd..000000000000
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby30(-)] ) ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A complete implementation of the WebSocket protocols
-EAPI=7
-HOMEPAGE=https://github.com/faye/websocket-driver-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby30(-)] ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0.7
-SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.7.4.tar.gz -> websocket-driver-0.7.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2914c101656b7c6edc0e7731252cb580
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.26 b/metadata/md5-cache/dev-ruby/yard-0.9.26
index 903dd1aef77a..63554eea735c 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.26
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.26
@@ -5,7 +5,7 @@ DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=7
 HOMEPAGE=https://yardoc.org/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.26.tar.gz -> yard-0.9.26-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eadac45782697d5a4ce7176eccc67bba
+_md5_=d75d517b5f36f2765db15081a42684ed
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 72105ee7947f..8888042bfa5e 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/guile-2.2.7-r1 b/metadata/md5-cache/dev-scheme/guile-2.2.7-r1
index 21b867a44503..4ede1f13a416 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.2.7-r1
+++ b/metadata/md5-cache/dev-scheme/guile-2.2.7-r1
@@ -5,11 +5,11 @@ DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= dev-libs/libffi:= dev-libs/libltdl:= dev-libs/libunistring:0= sys-libs/ncurses:0= sys-libs/readline:0= virtual/libcrypt:=
 REQUIRED_USE=regex
 RESTRICT=strip
 SLOT=12/2.2-1
 SRC_URI=mirror://gnu/guile/guile-2.2.7.tar.gz
-_md5_=821478667212ca1b70cd65a7acad88fe
+_md5_=5d3a0e41eff285f480ec92412fff7f10
diff --git a/metadata/md5-cache/dev-scheme/racket-7.0-r1 b/metadata/md5-cache/dev-scheme/racket-7.0-r1
index e8511b3bd4c3..87307d354eb6 100644
--- a/metadata/md5-cache/dev-scheme/racket-7.0-r1
+++ b/metadata/md5-cache/dev-scheme/racket-7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?
 REQUIRED_USE=futures? ( jit )
 SLOT=0
 SRC_URI=minimal? ( https://download.racket-lang.org/installers/7.0/racket-minimal-7.0-src-builtpkgs.tgz ) !minimal? ( https://download.racket-lang.org/installers/7.0/racket-7.0-src-builtpkgs.tgz )
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=79e2e17661396f58587271cd23418b6e
diff --git a/metadata/md5-cache/dev-scheme/racket-7.1-r1 b/metadata/md5-cache/dev-scheme/racket-7.1-r1
index f11dade1567c..3a0fbee8c072 100644
--- a/metadata/md5-cache/dev-scheme/racket-7.1-r1
+++ b/metadata/md5-cache/dev-scheme/racket-7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?
 REQUIRED_USE=futures? ( jit )
 SLOT=0
 SRC_URI=minimal? ( https://download.racket-lang.org/installers/7.1/racket-minimal-7.1-src-builtpkgs.tgz ) !minimal? ( https://download.racket-lang.org/installers/7.1/racket-7.1-src-builtpkgs.tgz )
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=1f66175958eec229696645ec434e612f
diff --git a/metadata/md5-cache/dev-scheme/racket-7.2-r1 b/metadata/md5-cache/dev-scheme/racket-7.2-r1
index 7baa882e35bb..ff42b819f0e5 100644
--- a/metadata/md5-cache/dev-scheme/racket-7.2-r1
+++ b/metadata/md5-cache/dev-scheme/racket-7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?
 REQUIRED_USE=futures? ( jit )
 SLOT=0
 SRC_URI=minimal? ( https://download.racket-lang.org/installers/7.2/racket-minimal-7.2-src-builtpkgs.tgz ) !minimal? ( https://download.racket-lang.org/installers/7.2/racket-7.2-src-builtpkgs.tgz )
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=a2460af9919cf396d9fae0fc7ed4ef09
diff --git a/metadata/md5-cache/dev-scheme/racket-7.3-r1 b/metadata/md5-cache/dev-scheme/racket-7.3-r1
index f2504d6c0f36..7dedb32c344a 100644
--- a/metadata/md5-cache/dev-scheme/racket-7.3-r1
+++ b/metadata/md5-cache/dev-scheme/racket-7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?
 REQUIRED_USE=futures? ( jit )
 SLOT=0
 SRC_URI=minimal? ( https://download.racket-lang.org/installers/7.3/racket-minimal-7.3-src-builtpkgs.tgz ) !minimal? ( https://download.racket-lang.org/installers/7.3/racket-7.3-src-builtpkgs.tgz )
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=a2460af9919cf396d9fae0fc7ed4ef09
diff --git a/metadata/md5-cache/dev-scheme/racket-8.0-r1 b/metadata/md5-cache/dev-scheme/racket-8.0-r1
index 22375e674f32..6cf9f6d0d09d 100644
--- a/metadata/md5-cache/dev-scheme/racket-8.0-r1
+++ b/metadata/md5-cache/dev-scheme/racket-8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?
 REQUIRED_USE=futures? ( jit )
 SLOT=0
 SRC_URI=minimal? ( https://download.racket-lang.org/installers/8.0/racket-minimal-8.0-src-builtpkgs.tgz ) !minimal? ( https://download.racket-lang.org/installers/8.0/racket-8.0-src-builtpkgs.tgz )
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=2baa640b6fe955fbd4c4a43e2bef9207
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 1e4c4d36214c..f77584e1aaa4 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/hevea-2.35-r1 b/metadata/md5-cache/dev-tex/hevea-2.35-r1
index 130a1d11fb69..7d888cbf8b66 100644
--- a/metadata/md5-cache/dev-tex/hevea-2.35-r1
+++ b/metadata/md5-cache/dev-tex/hevea-2.35-r1
@@ -10,4 +10,4 @@ LICENSE=QPL-1.0
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] dev-texlive/texlive-latexextra
 SLOT=0
 SRC_URI=http://hevea.inria.fr/distri/hevea-2.35.tar.gz
-_md5_=29a4a25d6329a4eb791b573f150ad842
+_md5_=51f9dd39b32fcd539dab3c151a9a6512
diff --git a/metadata/md5-cache/dev-tex/latexmk-456 b/metadata/md5-cache/dev-tex/latexmk-456
index a0d59a8ed1fb..c8579715e26f 100644
--- a/metadata/md5-cache/dev-tex/latexmk-456
+++ b/metadata/md5-cache/dev-tex/latexmk-456
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-lang/perl
 SLOT=0
 SRC_URI=http://www.phys.psu.edu/~collins/software/latexmk/latexmk-456.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2b3678a84e83afd5df3831243ccfed5
diff --git a/metadata/md5-cache/dev-tex/latexmk-465 b/metadata/md5-cache/dev-tex/latexmk-465
index d80d747decb4..2acab86ff28b 100644
--- a/metadata/md5-cache/dev-tex/latexmk-465
+++ b/metadata/md5-cache/dev-tex/latexmk-465
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-lang/perl
 SLOT=0
 SRC_URI=http://www.phys.psu.edu/~collins/software/latexmk/latexmk-465.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c76f338e9ee05ffedfb70aa7951034b
diff --git a/metadata/md5-cache/dev-tex/latexmk-469 b/metadata/md5-cache/dev-tex/latexmk-469
index 52165c0cd456..e86e629d1933 100644
--- a/metadata/md5-cache/dev-tex/latexmk-469
+++ b/metadata/md5-cache/dev-tex/latexmk-469
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-lang/perl
 SLOT=0
 SRC_URI=http://personal.psu.edu/jcc8/software/latexmk/latexmk-469.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=06ed307c998cfb249eaba18cc7917630
diff --git a/metadata/md5-cache/dev-tex/latexmk-470b b/metadata/md5-cache/dev-tex/latexmk-470b
index 5e826c93cb8e..ed2746cac77b 100644
--- a/metadata/md5-cache/dev-tex/latexmk-470b
+++ b/metadata/md5-cache/dev-tex/latexmk-470b
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-lang/perl
 SLOT=0
 SRC_URI=https://personal.psu.edu/~jcc8/software/latexmk/latexmk-470b.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17cc5d298c649605d642c5945588da57
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.5b b/metadata/md5-cache/dev-tex/pgf-3.1.5b
index db1240d91563..9a0fb826568f 100644
--- a/metadata/md5-cache/dev-tex/pgf-3.1.5b
+++ b/metadata/md5-cache/dev-tex/pgf-3.1.5b
@@ -4,10 +4,10 @@ DESCRIPTION=The TeX Portable Graphic Format
 EAPI=7
 HOMEPAGE=https://github.com/pgf-tikz/pgf
 IUSE=doc source
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3c FDL-1.2
 RDEPEND=dev-texlive/texlive-latexrecommended virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.5b.tar.gz -> pgf-3.1.5b.tar.gz https://dev.gentoo.org/~zlogene/distfiles/dev-tex/pgf/pgf-3.1.5b-revisioned.xz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.5b/pgfmanual.pdf -> pgf-3.1.5b-pgfmanual.pdf )
 _eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
-_md5_=4be82acd5bba48acce9bef94bef2d704
+_md5_=f0cf40a8733f68133f58ef6910d861d4
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 06ce3e5b0aa0..98a79e693355 100644
--- a/metadata/md5-cache/dev-texlive/Manifest.gz
+++ b/metadata/md5-cache/dev-texlive/Manifest.gz
diff --git a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2021 b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2021
index d9b56a44a1a4..8389967415ee 100644
--- a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive BibTeX additional styles
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2 GPL-2
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=dev-texlive/texlive-latex-2019 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aaai-named-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aaai-named-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aichej-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aichej-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ajl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ajl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsrefs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsrefs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-annotate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-annotate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apacite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apacite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apalike2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apalike2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaeologie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaeologie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authordate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authordate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beebe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beebe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-besjournals-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-besjournals-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bestpapers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bestpapers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib2gls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib2gls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibarts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibarts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibexport-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibexport-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibhtml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibhtml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-abnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-abnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ajc2020unofficial-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ajc2020unofficial-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-anonymous-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-anonymous-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa6-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa6-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-archaeology-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-archaeology-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-arthistory-bonn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-arthistory-bonn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinarticle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinarticle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinother-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinother-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bwl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bwl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-caspervector-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-caspervector-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chicago-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chicago-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-claves-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-claves-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-dw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-dw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-enc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-enc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-fiwi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-fiwi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gb7714-2015-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gb7714-2015-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-german-legal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-german-legal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gost-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-historian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-historian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ieee-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ieee-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ijsra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ijsra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-iso690-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-iso690-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-jura2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-jura2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-juradiss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-juradiss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-license-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-license-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-lni-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-lni-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-luh-ipw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-luh-ipw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-manuscripts-philology-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-manuscripts-philology-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-mla-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-mla-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-morenames-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-morenames-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-multiple-dm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-multiple-dm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-musuos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-musuos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nature-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nature-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nejm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nejm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nottsclassic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nottsclassic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-opcit-booktitle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-opcit-booktitle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-oxref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-oxref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-philosophy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-philosophy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-phys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-phys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-publist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-publist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-realauthor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-realauthor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-sbl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-sbl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-science-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-science-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-shortfields-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-shortfields-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-socialscienceshuberlin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-socialscienceshuberlin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-software-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-software-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-source-division-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-source-division-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-subseries-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-subseries-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-swiss-legal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-swiss-legal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-trad-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-trad-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-true-citepages-omit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-true-citepages-omit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-unified-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-unified-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-vancouver-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-vancouver-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex2bibitem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex2bibitem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtexperllibs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtexperllibs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopicprefix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopicprefix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibunits-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibunits-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biolett-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biolett-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookdb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookdb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakcites-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakcites-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chbibref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chbibref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicago-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicago-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicagoa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicagoa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicago-annote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicago-annote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chembst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chembst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chscite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chscite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeall-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeall-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-compactbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-compactbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossrefware-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossrefware-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-custom-bib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-custom-bib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-din1505-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-din1505-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dk-bib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dk-bib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doipubmed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doipubmed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecobiblatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecobiblatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econ-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econ-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-economic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-economic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-francais-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-francais-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gbt7714-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gbt7714-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geschichtsfrkl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geschichtsfrkl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-historische-zeitschrift-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-historische-zeitschrift-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ietfbibs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ietfbibs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijqc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijqc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinebib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinebib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iopart-num-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iopart-num-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-is-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-is-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jbact-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jbact-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jneurosci-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jneurosci-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurabib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurabib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ksfh_nat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ksfh_nat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltb2bib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltb2bib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logreq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logreq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabibentry-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabibentry-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-margbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-margbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibibliography-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibibliography-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-munich-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-munich-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nmbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nmbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes2bib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes2bib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notex-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notex-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oscola-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oscola-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perception-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perception-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plainyr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plainyr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pnas2009-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pnas2009-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showtags-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showtags-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sort-by-letters-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sort-by-letters-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian-formatting-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian-formatting-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-ger-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-ger-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-lin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-lin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urlbst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urlbst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-usebib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-usebib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-windycity-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-windycity-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zootaxa-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zootaxa-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-bibtexextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-bibtexextra-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsrefs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsrefs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apacite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apacite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaeologie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaeologie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authordate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authordate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-besjournals.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-besjournals.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bestpapers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bestpapers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib2gls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib2gls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibarts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibarts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibexport.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibexport.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibhtml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibhtml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-abnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-abnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ajc2020unofficial.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ajc2020unofficial.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-anonymous.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-anonymous.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa6.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa6.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-archaeology.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-archaeology.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-arthistory-bonn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-arthistory-bonn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinarticle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinarticle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinother.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinother.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bwl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bwl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-caspervector.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-caspervector.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chicago.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chicago.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-claves.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-claves.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-dw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-dw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-enc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-enc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-fiwi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-fiwi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gb7714-2015.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gb7714-2015.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-german-legal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-german-legal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gost.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gost.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-historian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-historian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ieee.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ieee.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ijsra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ijsra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-iso690.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-iso690.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-jura2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-jura2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-juradiss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-juradiss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-license.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-license.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-lni.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-lni.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-luh-ipw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-luh-ipw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-manuscripts-philology.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-manuscripts-philology.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-mla.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-mla.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-morenames.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-morenames.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-multiple-dm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-multiple-dm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-musuos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-musuos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nature.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nature.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nejm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nejm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nottsclassic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nottsclassic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-opcit-booktitle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-opcit-booktitle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-oxref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-oxref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-philosophy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-philosophy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-phys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-phys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-publist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-publist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-realauthor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-realauthor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-sbl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-sbl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-science.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-science.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-shortfields.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-shortfields.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-socialscienceshuberlin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-socialscienceshuberlin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-software.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-software.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-source-division.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-source-division.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-subseries.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-subseries.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-swiss-legal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-swiss-legal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-trad.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-trad.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-true-citepages-omit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-true-citepages-omit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-unified.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-unified.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-vancouver.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-vancouver.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex2bibitem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex2bibitem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopicprefix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopicprefix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibunits.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibunits.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biolett-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biolett-bst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookdb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookdb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakcites.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakcites.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chbibref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chbibref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicago-annote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicago-annote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chembst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chembst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chscite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chscite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeall.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeall.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossrefware.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossrefware.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-custom-bib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-custom-bib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-din1505.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-din1505.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dk-bib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dk-bib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doipubmed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doipubmed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecobiblatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecobiblatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econ-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econ-bst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-economic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-economic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-francais-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-francais-bst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gbt7714.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gbt7714.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geschichtsfrkl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geschichtsfrkl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-historische-zeitschrift.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-historische-zeitschrift.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ietfbibs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ietfbibs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijqc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijqc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinebib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinebib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iopart-num.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iopart-num.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-is-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-is-bst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jneurosci.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jneurosci.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurabib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurabib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltb2bib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltb2bib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logreq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logreq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabibentry.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabibentry.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-margbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-margbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibibliography.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibibliography.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-munich.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-munich.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nmbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nmbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes2bib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes2bib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oscola.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oscola.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perception.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perception.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showtags.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showtags.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sort-by-letters.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sort-by-letters.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian-formatting.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian-formatting.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-ger.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-ger.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-lin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-lin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urlbst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urlbst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-usebib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-usebib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-windycity.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-windycity.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zootaxa-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zootaxa-bst.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsrefs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsrefs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apacite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apacite.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaeologie.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaeologie.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib2gls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib2gls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibarts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibarts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biber.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibexport.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibexport.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-archaeology.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-archaeology.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nejm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nejm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-oxref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-oxref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-philosophy.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-philosophy.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-software.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-software.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtexperllibs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtexperllibs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopicprefix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopicprefix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibunits.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibunits.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chembst.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chembst.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chscite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chscite.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-custom-bib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-custom-bib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dk-bib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dk-bib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doipubmed.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doipubmed.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footbib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footbib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gbt7714.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gbt7714.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geschichtsfrkl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geschichtsfrkl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icite.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurabib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurabib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltb2bib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltb2bib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listbib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listbib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabibentry.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabibentry.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-margbib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-margbib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibibliography.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibibliography.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nmbib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nmbib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes2bib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes2bib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitbib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitbib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urlbst.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urlbst.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-usebib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-usebib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcite.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=b68523192936a5e5c9a4090bafce8ad9
+_md5_=e9712fb3ab5d4c2fe1fbe2595518f502
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2021 b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2021
index 0458a9d5e9a8..7edb2369c0a0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Additional fonts
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD CC-BY-SA-4.0 GPL-1 GPL-2 LPPL-1.3 GPL-2+
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Asana-Math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Asana-Math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-academicons-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-academicons-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accanthis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accanthis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adforn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adforn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aesupp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aesupp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alegreya-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alegreya-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alfaslabone-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alfaslabone-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algolrevived-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algolrevived-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-allrunes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-allrunes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almendra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almendra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almfixed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almfixed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymouspro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymouspro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antiqua-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antiqua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archivo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archivo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arimo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arimo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arvo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arvo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asapsym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asapsym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-font-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-font-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aspectratio-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aspectratio-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-astro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-astro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atkinson-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atkinson-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-augie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-augie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auncial-new-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auncial-new-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurical-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurical-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-b1encoding-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-b1encoding-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barcodes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barcodes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervald-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervald-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervaldx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervaldx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervillef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervillef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbding-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbding-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-macros-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-macros-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-belleek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-belleek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bera-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bera-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-berenisadf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-berenisadf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beuron-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beuron-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bguq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bguq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blacklettert1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blacklettert1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boisik-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boisik-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookhands-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookhands-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boondox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boondox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braille-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braille-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brushscr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brushscr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cabin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cabin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caladea-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caladea-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cantarell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cantarell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlito-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlito-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carolmin-ps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carolmin-ps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascadia-code-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascadia-code-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccicons-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccicons-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-initials-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-initials-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-lm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-lm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-charissil-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-charissil-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cherokee-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cherokee-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chivo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chivo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cinzel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cinzel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clara-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clara-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clearsans-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clearsans-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-lgc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-lgc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-mf-extra-bold-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-mf-extra-bold-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-unicode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-unicode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmathbb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmathbb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmbright-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmbright-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmexb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmexb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmll-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmll-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsrb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsrb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmtiup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmtiup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmupint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmupint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cochineal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cochineal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coelacanth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coelacanth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comfortaa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comfortaa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comicneue-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comicneue-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cookingsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cookingsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cormorantgaramond-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cormorantgaramond-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-countriesofeurope-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-countriesofeurope-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courier-scaled-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courier-scaled-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courierten-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courierten-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimson-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimson-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimsonpro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimsonpro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cryst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cryst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuprum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuprum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyklop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyklop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dancers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dancers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dantelogo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dantelogo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dictsym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dictsym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dingbat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dingbat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-domitian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-domitian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doublestroke-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doublestroke-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doulossil-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doulossil-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dozenal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dozenal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsserif-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsserif-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dutchcal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dutchcal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond-maths-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond-maths-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eco-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eco-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eczar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eczar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-ltx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-ltx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ektype-tanka-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ektype-tanka-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-electrum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-electrum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elvish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elvish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigrafica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigrafica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsdice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsdice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon-math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon-math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esrelation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esrelation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esstix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esstix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esvect-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esvect-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etbb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etbb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulervm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulervm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euxm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euxm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fdsymbol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fdsymbol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetamont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetamont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feyn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feyn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fge-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fge-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fira-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fira-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foekfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foekfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonetika-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonetika-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome5-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome5-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontmfizz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontmfizz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-churchslavonic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-churchslavonic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fourier-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fourier-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouriernc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouriernc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frcursive-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frcursive-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frederika2016-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frederika2016-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frimurer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frimurer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-libre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-libre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentium-tug-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentium-tug-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsartemisia-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsartemisia-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbodoni-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbodoni-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfscomplutum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfscomplutum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidotclassic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidotclassic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenicmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenicmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfssolomos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfssolomos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillcm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillcm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillius-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillius-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnu-freefont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnu-freefont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gofonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gofonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gothic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gothic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greenpoint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greenpoint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grotesq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grotesq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gudea-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gudea-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hacm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hacm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hands-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hands-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-heuristica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-heuristica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfbright-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfbright-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfoldsty-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfoldsty-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hindmadurai-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hindmadurai-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibarra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibarra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifsym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifsym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imfellenglish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imfellenglish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inconsolata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inconsolata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-initials-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-initials-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inriafonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inriafonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwona-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwona-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jablantile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jablantile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jamtimes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jamtimes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-josefin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-josefin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-junicode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-junicode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kixfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kixfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurier-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurier-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lato-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lato-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexend-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexend-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lfb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lfb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinegc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinegc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinust1math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinust1math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebaskerville-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebaskerville-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebodoni-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebodoni-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librecaslon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librecaslon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librefranklin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librefranklin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libris-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libris-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linearA-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linearA-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguisticspro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguisticspro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lobster2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lobster2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lxfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lxfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ly1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ly1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marcellus-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marcellus-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdesign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdesign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdputu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdputu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdsymbol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdsymbol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-merriweather-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-merriweather-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miama-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miama-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mintspirit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mintspirit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-missaali-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-missaali-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlmodern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlmodern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnsymbol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnsymbol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montserrat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montserrat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mweights-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mweights-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcomputermodern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcomputermodern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxsf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxsf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxtt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxtt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimbus15-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimbus15-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nkarta-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nkarta-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto-emoji-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto-emoji-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notomath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notomath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nunito-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nunito-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-obnov-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-obnov-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocherokee-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocherokee-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-outline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-outline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ogham-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ogham-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oinuit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oinuit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-old-arrows-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-old-arrows-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldlatin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldlatin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstandard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstandard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opensans-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opensans-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orkhun-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orkhun-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oswald-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oswald-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlock-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlock-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pacioli-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pacioli-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paratype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paratype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phaistos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phaistos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonetic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonetic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pigpen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pigpen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-playfair-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-playfair-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plimsoll-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plimsoll-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poiretone-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poiretone-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poltawski-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poltawski-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prodint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prodint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punknova-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punknova-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtxalfa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtxalfa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qualitype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qualitype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quattrocento-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quattrocento-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-raleway-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-raleway-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recycle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recycle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roboto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roboto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romande-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romande-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rosario-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rosario-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsfso-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsfso-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathaccent-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathaccent-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauterfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauterfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scholax-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scholax-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulschriften-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulschriften-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semaphor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semaphor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shobhika-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shobhika-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skull-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skull-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcecodepro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcecodepro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcesanspro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcesanspro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourceserifpro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourceserifpro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectral-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectral-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-starfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-starfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-staves-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-staves-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-step-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-step-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stepgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stepgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stickstoo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stickstoo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-superiors-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-superiors-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svrsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svrsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tapir-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tapir-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tempora-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tempora-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tengwarscript-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tengwarscript-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tfrupee-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tfrupee-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanodidot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanodidot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanomodern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanomodern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanooldstyle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanooldstyle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tinos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tinos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpslifonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tpslifonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trajan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trajan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twemoji-colr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twemoji-colr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfontsb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfontsb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txuprcal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txuprcal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typicons-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typicons-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umtypewriter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umtypewriter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universalis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universalis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uppunctlm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uppunctlm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urwchancal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urwchancal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venturisadf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venturisadf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsuipa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsuipa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcharter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcharter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xits-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xits-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts-t1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts-t1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yinit-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yinit-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zlmtt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zlmtt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-fontsextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-fontsextra-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Asana-Math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Asana-Math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-academicons.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-academicons.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accanthis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accanthis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adforn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adforn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aesupp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aesupp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alegreya.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alegreya.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alfaslabone.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alfaslabone.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algolrevived.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algolrevived.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-allrunes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-allrunes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almendra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almendra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almfixed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almfixed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymouspro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymouspro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antiqua.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antiqua.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archivo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archivo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arimo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arimo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arvo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arvo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asapsym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asapsym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-font.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-font.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aspectratio.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aspectratio.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-astro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-astro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atkinson.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atkinson.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-augie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-augie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auncial-new.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auncial-new.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurical.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurical.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-b1encoding.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-b1encoding.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barcodes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barcodes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervald.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervald.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervaldx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervaldx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervillef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervillef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbding.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbding.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-macros.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-macros.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-belleek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-belleek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bera.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bera.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-berenisadf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-berenisadf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beuron.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beuron.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bguq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bguq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blacklettert1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blacklettert1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boisik.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boisik.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookhands.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookhands.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boondox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boondox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braille.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braille.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brushscr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brushscr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cabin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cabin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caladea.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caladea.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cantarell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cantarell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlito.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlito.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carolmin-ps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carolmin-ps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascadia-code.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascadia-code.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccicons.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccicons.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-initials.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-initials.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-lm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-lm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-charissil.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-charissil.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cherokee.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cherokee.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chivo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chivo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cinzel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cinzel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clara.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clara.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clearsans.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clearsans.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-lgc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-lgc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-unicode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-unicode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmathbb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmathbb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmbright.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmbright.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmexb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmexb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmll.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmll.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsrb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsrb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmtiup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmtiup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmupint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmupint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cochineal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cochineal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coelacanth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coelacanth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comfortaa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comfortaa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comicneue.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comicneue.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cookingsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cookingsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cormorantgaramond.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cormorantgaramond.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-countriesofeurope.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-countriesofeurope.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courier-scaled.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courier-scaled.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courierten.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courierten.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimson.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimson.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimsonpro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimsonpro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cryst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cryst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuprum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuprum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyklop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyklop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dantelogo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dantelogo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dice.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dictsym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dictsym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dingbat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dingbat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-domitian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-domitian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doublestroke.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doublestroke.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doulossil.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doulossil.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dozenal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dozenal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsserif.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsserif.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dutchcal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dutchcal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond-maths.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond-maths.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eco.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eco.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eczar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eczar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-ltx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-ltx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ektype-tanka.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ektype-tanka.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-electrum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-electrum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elvish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elvish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigrafica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigrafica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsdice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsdice.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon-math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon-math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esrelation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esrelation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esstix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esstix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esvect.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esvect.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etbb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etbb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulervm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulervm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fdsymbol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fdsymbol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetamont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetamont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feyn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feyn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fge.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fge.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fira.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fira.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foekfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foekfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonetika.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonetika.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome5.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome5.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontmfizz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontmfizz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-churchslavonic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-churchslavonic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fourier.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fourier.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouriernc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouriernc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frcursive.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frcursive.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frederika2016.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frederika2016.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frimurer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frimurer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-libre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-libre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentium-tug.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentium-tug.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsartemisia.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsartemisia.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbodoni.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbodoni.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfscomplutum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfscomplutum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidotclassic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidotclassic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenicmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenicmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfssolomos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfssolomos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillcm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillcm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillius.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillius.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnu-freefont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnu-freefont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gofonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gofonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gothic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gothic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greenpoint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greenpoint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grotesq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grotesq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gudea.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gudea.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hacm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hacm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-heuristica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-heuristica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfbright.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfbright.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfoldsty.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfoldsty.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hindmadurai.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hindmadurai.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibarra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibarra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifsym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifsym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imfellenglish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imfellenglish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inconsolata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inconsolata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-initials.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-initials.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inriafonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inriafonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwona.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwona.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jablantile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jablantile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jamtimes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jamtimes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-josefin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-josefin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-junicode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-junicode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kixfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kixfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurier.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurier.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lato.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lato.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexend.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexend.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lfb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lfb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinegc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinegc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinust1math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinust1math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebaskerville.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebaskerville.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebodoni.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebodoni.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librecaslon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librecaslon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librefranklin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librefranklin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libris.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libris.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linearA.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linearA.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguisticspro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguisticspro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lobster2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lobster2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lxfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lxfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ly1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ly1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marcellus.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marcellus.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdesign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdesign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdputu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdputu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdsymbol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdsymbol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-merriweather.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-merriweather.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miama.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miama.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mintspirit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mintspirit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-missaali.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-missaali.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlmodern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlmodern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnsymbol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnsymbol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montserrat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montserrat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mweights.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mweights.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcomputermodern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcomputermodern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxsf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxsf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxtt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxtt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimbus15.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimbus15.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nkarta.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nkarta.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto-emoji.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto-emoji.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notomath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notomath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nunito.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nunito.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-obnov.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-obnov.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocherokee.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocherokee.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-outline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-outline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ogham.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ogham.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oinuit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oinuit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-old-arrows.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-old-arrows.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldlatin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldlatin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstandard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstandard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opensans.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opensans.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orkhun.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orkhun.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oswald.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oswald.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlock.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlock.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pacioli.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pacioli.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paratype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paratype.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phaistos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phaistos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonetic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonetic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pigpen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pigpen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-playfair.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-playfair.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plimsoll.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plimsoll.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poiretone.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poiretone.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poltawski.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poltawski.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prodint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prodint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punknova.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punknova.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtxalfa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtxalfa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qualitype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qualitype.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quattrocento.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quattrocento.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-raleway.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-raleway.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recycle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recycle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roboto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roboto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romande.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romande.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rosario.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rosario.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsfso.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsfso.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathaccent.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathaccent.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauterfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauterfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scholax.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scholax.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulschriften.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulschriften.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semaphor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semaphor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shobhika.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shobhika.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcecodepro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcecodepro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcesanspro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcesanspro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourceserifpro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourceserifpro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectral.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectral.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-starfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-starfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-staves.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-staves.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-step.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-step.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stepgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stepgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stickstoo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stickstoo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-superiors.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-superiors.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svrsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svrsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tapir.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tapir.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tempora.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tempora.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tengwarscript.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tengwarscript.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tfrupee.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tfrupee.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanodidot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanodidot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanomodern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanomodern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanooldstyle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanooldstyle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tinos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tinos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpslifonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tpslifonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trajan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trajan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twemoji-colr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twemoji-colr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfontsb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfontsb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txuprcal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txuprcal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typicons.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typicons.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universalis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universalis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uppunctlm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uppunctlm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urwchancal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urwchancal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venturisadf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venturisadf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsuipa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsuipa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcharter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcharter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xits.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xits.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts-t1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts-t1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yinit-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yinit-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zlmtt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zlmtt.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aesupp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aesupp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-allrunes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-allrunes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymouspro.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymouspro.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asapsym.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asapsym.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-font.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-font.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auncial-new.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auncial-new.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-b1encoding.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-b1encoding.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barcodes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barcodes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervald.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervald.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbding.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbding.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-macros.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-macros.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-belleek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-belleek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bguq.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bguq.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blacklettert1.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blacklettert1.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookhands.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookhands.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccicons.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccicons.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-lm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-lm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chivo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chivo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmbright.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmbright.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmll.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmll.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cookingsymbols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cookingsymbols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dingbat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dingbat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dozenal.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dozenal.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsserif.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsserif.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eco.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eco.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-ltx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-ltx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-electrum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-electrum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsdice.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsdice.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esrelation.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esrelation.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esvect.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esvect.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulervm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulervm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fdsymbol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fdsymbol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetamont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetamont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feyn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feyn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fge.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fge.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frimurer.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frimurer.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentium-tug.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentium-tug.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnu-freefont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnu-freefont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gothic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gothic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfoldsty.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfoldsty.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libris.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libris.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linearA.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linearA.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lxfonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lxfonts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdsymbol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdsymbol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miama.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miama.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnsymbol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnsymbol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nkarta.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nkarta.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-outline.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-outline.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oinuit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oinuit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pacioli.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pacioli.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phaistos.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phaistos.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plimsoll.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plimsoll.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romande.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romande.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rosario.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rosario.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauterfonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauterfonts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skull.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skull.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-staves.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-staves.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-type1.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-type1.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svrsymbols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svrsymbols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tengwarscript.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tengwarscript.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tfrupee.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tfrupee.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpslifonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tpslifonts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trajan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trajan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfontsb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfontsb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universa.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universa.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venturisadf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venturisadf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=2e80e696de50c1acf3c182b6c8a4742a
+_md5_=5c7a54e212a03e24b22bc06fda7aaf24
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexextra-2021 b/metadata/md5-cache/dev-texlive/texlive-latexextra-2021
index 3c8ec701fed8..2d5605f65e22 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexextra-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-latexextra-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive LaTeX additional packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 Artistic BSD GPL-2 CC0-1.0
 RDEPEND=>=dev-texlive/texlive-latexrecommended-2021 >=dev-texlive/texlive-pictures-2021 dev-perl/Spreadsheet-ParseExcel >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-2up-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-2up-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a0poster-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a0poster-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a4wide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a4wide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a5comb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a5comb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abraces-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abraces-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-advdate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-advdate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akktex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akktex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonchap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonchap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anyfontsize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anyfontsize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendixnumberbeamer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendixnumberbeamer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabicfront-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabicfront-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arrayjobx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arrayjobx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assignment-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assignment-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assoccnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assoccnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-association-matrix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-association-matrix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authoraftertitle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authoraftertitle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorarchive-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorarchive-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autofancyhdr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autofancyhdr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bankstatement-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bankstatement-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bashful-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bashful-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bchart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bchart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer2thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer2thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-rl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-rl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerappendixnote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerappendixnote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beameraudience-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beameraudience-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerauxtheme-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerauxtheme-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerdarkthemes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerdarkthemes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerposter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerposter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-detlevcm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-detlevcm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-epyt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-epyt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-focus-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-focus-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-light-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-light-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-npbt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-npbt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-phnompenh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-phnompenh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-pure-minimalistic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-pure-minimalistic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-upenn-bc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-upenn-bc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemejltree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemejltree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenirma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenirma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenord-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenord-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beaulivre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beaulivre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibletext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibletext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigints-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigints-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biochemistry-colors-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biochemistry-colors-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bithesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bithesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blkarray-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blkarray-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-block-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-block-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bold-extra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bold-extra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookest-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookest-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookshelf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookshelf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bracketkey-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bracketkey-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braket-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braket-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bubblesort-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bubblesort-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcalc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcalc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdpx-beamer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdpx-beamer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdvidriver-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdvidriver-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxenclose-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxenclose-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxnewfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxnewfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpapersize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpapersize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpdfver-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpdfver-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxtexlogo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxtexlogo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calctab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calctab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calrsfs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calrsfs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calxxxx-yyyy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calxxxx-yyyy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cancel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cancel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captdef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captdef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carbohydrates-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carbohydrates-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cases-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cases-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-casyl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-casyl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catoptions-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catoptions-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbcoptic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbcoptic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellspace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellspace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-censor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-censor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centeredline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centeredline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centerlastline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centerlastline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelayout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelayout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelog-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelog-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkend-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkend-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chkfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chkfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chngcntr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chngcntr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronology-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronology-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circledsteps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circledsteps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clipboard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clipboard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clock-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clock-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdstring-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdstring-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnltx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnltx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntformats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntformats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntperchap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntperchap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codedoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codedoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-color-edits-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-color-edits-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coloring-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coloring-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorspace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorspace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colourchange-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colourchange-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combelow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combelow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comment-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comment-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concepts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concepts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concprog-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concprog-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conditext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conditext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyrightbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyrightbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coseoul-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coseoul-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courseoutline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courseoutline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coursepaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coursepaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreftools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreftools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-css-colors-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-css-colors-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvsimple-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvsimple-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currvita-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currvita-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv4tw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv4tw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cweb-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dataref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dataref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datax-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datax-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dblfloatfix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dblfloatfix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diabetes-logbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diabetes-logbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagnose-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagnose-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dichokey-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dichokey-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-directory-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-directory-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dlfltxb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dlfltxb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docutils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docutils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotlessi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotlessi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftfigure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftfigure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgallery-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxgallery-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvdcoll-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvdcoll-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynblocks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynblocks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean13isbn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean13isbn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-todo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-todo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easybook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easybook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfloats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfloats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyformat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyformat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easylist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easylist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econlipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econlipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edichokey-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edichokey-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ehhline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ehhline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-einfart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-einfart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantnote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantnote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantpaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantpaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elements-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elements-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elpres-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elpres-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embrac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embrac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emulateapj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emulateapj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes-hy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes-hy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enotez-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enotez-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envbig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envbig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envlab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envlab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph-keys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph-keys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eq-pin2corr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eq-pin2corr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqname-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqname-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esami-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esami-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulerpx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulerpx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europasscv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europasscv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europecv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europecv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-randomizechoices-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-randomizechoices-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-example-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-example-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examplep-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examplep-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exceltex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exceltex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-excludeonly-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-excludeonly-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisebank-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisebank-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisepoints-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisepoints-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exesheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exesheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsheets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsheets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhandout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhandout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ffslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ffslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figsize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figsize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filemod-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filemod-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixfoot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixfoot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fjodor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fjodor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flacards-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flacards-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashmovie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashmovie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flipbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flipbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fn2end-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fn2end-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncychap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncychap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncylab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncylab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpara-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpara-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpct-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpct-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsetup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsetup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotebackref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotebackref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formlett-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formlett-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragments-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fragments-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frame-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frame-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-framed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-framed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frege-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frege-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-froufrou-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-froufrou-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftcap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftcap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullwidth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullwidth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-cyr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-cyr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fwlw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fwlw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-g-brief-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-g-brief-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gauss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gauss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getfiledate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getfiledate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitlog-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitlog-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitver-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitver-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-globalvals-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-globalvals-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-nynorsk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-nynorsk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmiflink-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmiflink-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmutils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmutils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphpaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphpaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfpaste-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfpaste-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-system-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-system-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridpapers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridpapers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hackthefootline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hackthefootline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hang-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hang-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harnon-cv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harnon-cv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harpoon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harpoon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-he-she-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-he-she-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-highlightlatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-highlightlatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitreport-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitreport-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobsub-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobsub-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvqrurl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvqrurl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdestopt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdestopt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdvips-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdvips-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypernat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypernat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-identkey-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-identkey-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxcmds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxcmds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmslide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmslide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifthenx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifthenx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-image-gallery-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-image-gallery-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-import-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-import-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-incgraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-incgraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inline-images-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inline-images-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interactiveworkbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interactiveworkbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-class-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-class-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isonums-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isonums-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isopt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isopt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwhdp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwhdp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlabels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlabels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jslectureplanner-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jslectureplanner-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jumplines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jumplines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyreader-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyreader-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keystroke-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keystroke-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyval2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyval2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-moderncvclassic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-moderncvclassic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-sfs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-sfs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels4easylist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels4easylist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-firstaid-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-firstaid-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-uni8-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-uni8-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lazylist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lazylist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leaflet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leaflet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lebhart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lebhart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectures-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectures-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectureslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectureslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lewis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lewis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lisp-on-tex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lisp-on-tex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lkproof-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lkproof-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logical-markup-utils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logical-markup-utils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-loops-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-loops-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lsc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lsc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstfiracode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstfiracode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lt3graph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lt3graph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltablex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltablex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltabptch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltabptch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxdockit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxdockit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxguidex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxguidex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxkeys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxkeys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxtools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxtools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-check-hyphen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-check-hyphen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-physical-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-physical-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magaz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magaz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecookbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecookbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makerobust-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makerobust-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebarcode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebarcode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecirc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecirc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeglos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeglos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manyind-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manyind-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathalpha-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathalpha-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfam256-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfam256-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maybemath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maybemath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mceinleger-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mceinleger-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mciteplus-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mciteplus-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media4svg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media4svg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-medstarbeamer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-medstarbeamer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memexsupp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memexsupp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mensa-tex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mensa-tex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menucard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menucard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metanorma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metanorma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mindflow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mindflow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minimalist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minimalist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minitoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minitoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minorrevision-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minorrevision-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mla-paper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mla-paper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mmap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mmap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderncv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderncv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modernposter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modernposter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modular-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modular-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreenum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreenum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-movie15-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-movie15-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mslapa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mslapa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multenum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multenum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncclatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncclatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nestquot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nestquot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcommand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcommand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newenviron-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newenviron-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nextpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nextpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nfssext-cfr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nfssext-cfr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nlctdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nlctdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noconflict-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noconflict-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noindentafter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noindentafter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nolbreaks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nolbreaks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nopageno-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nopageno-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notestex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notestex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notoccite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notoccite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberedblock-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberedblock-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numname-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numname-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numspell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numspell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocg-p-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocg-p-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optidef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optidef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optional-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optional-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-options-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-options-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orcidlink-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orcidlink-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orientation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orientation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outliner-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outliner-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlays-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlays-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagerange-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagerange-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parades-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parades-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parnotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parnotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parsa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parsa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cours-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cours-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-tableur-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-tableur-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbalance-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbalance-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcolmk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcolmk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcomment-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcomment-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfmarginpar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfmarginpar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpagediff-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpagediff-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfreview-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfreview-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfscreen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfscreen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfslide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfslide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfsync-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfsync-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfwin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfwin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pecha-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pecha-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petiteannonce-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petiteannonce-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonenumbers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonenumbers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piff-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piff-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkgloader-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkgloader-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeins-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeins-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantslabels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantslabels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plates-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plates-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postcards-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postcards-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poster-mac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poster-mac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-practicalreports-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-practicalreports-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prelim2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prelim2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-printlen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-printlen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-program-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-program-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progress-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progress-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progressbar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progressbar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-properties-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-properties-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prosper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prosper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstool-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstool-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstring-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstring-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pygmentex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pygmentex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-python-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-python-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quicktype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quicktype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quiz2socrative-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quiz2socrative-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randtext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randtext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readablecv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readablecv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readarray-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readarray-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipebook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rectopma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rectopma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcheck-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcheck-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refenums-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refenums-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relsize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relsize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repeatindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repeatindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-returntogrid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-returntogrid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rlepsf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rlepsf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanneg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanneg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotpages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotpages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rterface-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rterface-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulerbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulerbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-runcode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-runcode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rvwrite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rvwrite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanitize-umlaut-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanitize-umlaut-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savesym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savesym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalerel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalerel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scanpages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scanpages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schooldocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schooldocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlayer-fancyhdr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlayer-fancyhdr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlttr2copy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlttr2copy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdrt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdrt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secdot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secdot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbreak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbreak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selectp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selectp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-markup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-markup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semesterplanner-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semesterplanner-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepfootnotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepfootnotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sfmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sfmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadethm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadethm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadowtext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadowtext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapepar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapepar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shipunov-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shipunov-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showdim-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showdim-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showhyphens-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showhyphens-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleinvoice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleinvoice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplivre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplivre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeldoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeldoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeycommand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeycommand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeyval-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeyval-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skills-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skills-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smalltableof-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smalltableof-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartunits-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartunits-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snotez-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snotez-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulpos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulpos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spark-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spark-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sparklines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sparklines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spotcolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spotcolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spreadtab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spreadtab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srbook-mem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srbook-mem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stackengine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stackengine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storecmd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storecmd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stubs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stubs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-studenthandouts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-studenthandouts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigmat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigmat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substitutefont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substitutefont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suppose-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suppose-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svgcolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svgcolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svninfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svninfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swfigure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swfigure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntax-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntax-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableaux-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableaux-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabstackengine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabstackengine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabto-ltx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabto-ltx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularcalc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularcalc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagging-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagging-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpair-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpair-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamefloats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamefloats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tasks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tasks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcolorbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcolorbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdclock-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdclock-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlogos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlogos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theoremref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theoremref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thinsp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thinsp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttablex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttablex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumby-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumby-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticket-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticket-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlecaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlecaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlefoot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlefoot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titleref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titleref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlesec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlesec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokcycle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokcycle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokenizer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokenizer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topiclongtable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topiclongtable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totalcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totalcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translations-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translations-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-truncate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-truncate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnthepage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnthepage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoinone-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoinone-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typoaid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typoaid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uassign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uassign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uebungsblatt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uebungsblatt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underoverlap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underoverlap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitipa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitipa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitconv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitconv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upmethodology-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upmethodology-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utf8add-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utf8add-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwmslide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwmslide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variablelm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variablelm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varsfromjobname-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varsfromjobname-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varwidth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varwidth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vcell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vcell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vdmlisting-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vdmlisting-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbasef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbasef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimcopy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimcopy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbdef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbdef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbments-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbments-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifiche-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifiche-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-version-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-version-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versions-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versions-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vertbars-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vertbars-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vhistory-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vhistory-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vpe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vpe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vruler-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vruler-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vtable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vtable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallcalendar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallcalendar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallpaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallpaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warning-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warning-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webquiz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webquiz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-williams-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-williams-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-willowtreebook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-willowtreebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-withargs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-withargs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-worksheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-worksheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wrapfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wrapfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wtref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wtref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xassoccnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xassoccnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcntperchap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcntperchap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcomment-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcomment-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfakebold-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfakebold-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xhfill-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xhfill-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xifthen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xifthen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkcdcolors-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkcdcolors-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltabular-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltabular-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xnewcommand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xnewcommand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xoptarg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xoptarg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xprintlen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xprintlen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsim-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsim-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xstring-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xstring-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xurl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xurl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xwatermark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xwatermark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xytree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xytree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ycbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ycbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yplan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yplan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zed-csp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zed-csp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ziffer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ziffer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwgetfdate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwgetfdate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwpagelayout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwpagelayout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-latexextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-latexextra-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-2up.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-2up.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a0poster.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a0poster.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a4wide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a4wide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a5comb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a5comb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abraces.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abraces.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-advdate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-advdate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akktex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akktex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonchap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonchap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anyfontsize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anyfontsize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendixnumberbeamer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendixnumberbeamer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabicfront.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabicfront.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arrayjobx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arrayjobx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assignment.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assignment.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assoccnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assoccnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-association-matrix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-association-matrix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authoraftertitle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authoraftertitle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorarchive.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorarchive.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autofancyhdr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autofancyhdr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bankstatement.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bankstatement.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bashful.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bashful.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bchart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bchart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer2thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer2thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-rl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-rl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerappendixnote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerappendixnote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beameraudience.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beameraudience.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerauxtheme.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerauxtheme.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerdarkthemes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerdarkthemes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerposter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerposter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-detlevcm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-detlevcm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-epyt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-epyt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-focus.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-focus.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-light.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-light.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-npbt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-npbt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-phnompenh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-phnompenh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-pure-minimalistic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-pure-minimalistic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-upenn-bc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-upenn-bc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenirma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenirma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenord.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenord.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beaulivre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beaulivre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibletext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibletext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigints.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigints.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biochemistry-colors.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biochemistry-colors.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bithesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bithesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blkarray.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blkarray.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-block.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-block.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bold-extra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bold-extra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookest.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookest.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookshelf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookshelf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bracketkey.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bracketkey.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braket.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braket.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bubblesort.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bubblesort.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcalc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcalc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdpx-beamer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdpx-beamer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdvidriver.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdvidriver.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxenclose.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxenclose.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxnewfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxnewfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpapersize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpapersize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpdfver.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpdfver.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxtexlogo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxtexlogo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calctab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calctab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calrsfs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calrsfs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calxxxx-yyyy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calxxxx-yyyy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cancel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cancel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captdef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captdef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carbohydrates.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carbohydrates.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cases.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cases.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-casyl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-casyl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catoptions.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catoptions.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbcoptic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbcoptic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellspace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellspace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-censor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-censor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centeredline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centeredline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centerlastline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centerlastline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelayout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelayout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelog.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelog.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkend.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkend.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chkfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chkfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chngcntr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chngcntr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronology.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronology.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circledsteps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circledsteps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clipboard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clipboard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clock.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clock.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdstring.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdstring.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnltx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnltx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntformats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntformats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntperchap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntperchap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codedoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codedoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-color-edits.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-color-edits.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorinfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coloring.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coloring.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorspace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorspace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colourchange.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colourchange.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combelow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combelow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comment.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comment.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concepts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concepts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concprog.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concprog.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conditext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conditext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyrightbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyrightbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coseoul.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coseoul.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courseoutline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courseoutline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coursepaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coursepaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreftools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreftools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-css-colors.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-css-colors.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvsimple.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvsimple.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currvita.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currvita.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv4tw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv4tw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cweb-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dataref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dataref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datax.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datax.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dblfloatfix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dblfloatfix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diabetes-logbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diabetes-logbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagnose.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagnose.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dichokey.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dichokey.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-directory.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-directory.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dlfltxb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dlfltxb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docutils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docutils.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotlessi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotlessi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftfigure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftfigure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgallery.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxgallery.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvdcoll.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvdcoll.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynblocks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynblocks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean13isbn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean13isbn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-todo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-todo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easybook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easybook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfloats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfloats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyformat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyformat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easylist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easylist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econlipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econlipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edichokey.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edichokey.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ehhline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ehhline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-einfart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-einfart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantnote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantnote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantpaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantpaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elements.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elements.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elpres.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elpres.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embrac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embrac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emulateapj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emulateapj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes-hy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes-hy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enotez.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enotez.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envbig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envbig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envlab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envlab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph-keys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph-keys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eq-pin2corr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eq-pin2corr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esami.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esami.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulerpx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulerpx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europasscv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europasscv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europecv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europecv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-randomizechoices.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-randomizechoices.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examplep.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examplep.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exceltex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exceltex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-excludeonly.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-excludeonly.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisebank.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisebank.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisepoints.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisepoints.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exesheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exesheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsheets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsheets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhandout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhandout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ffslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ffslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figsize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figsize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filemod.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filemod.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixfoot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixfoot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fjodor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fjodor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flacards.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flacards.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashmovie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashmovie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flipbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flipbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fn2end.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fn2end.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncychap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncychap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncylab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncylab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpara.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpara.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpct.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpct.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsetup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsetup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotebackref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotebackref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formlett.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formlett.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragments.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fragments.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frame.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frame.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-framed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-framed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frege.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frege.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-froufrou.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-froufrou.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftcap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftcap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullwidth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullwidth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fwlw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fwlw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-g-brief.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-g-brief.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gauss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gauss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getfiledate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getfiledate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitlog.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitlog.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitver.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitver.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-globalvals.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-globalvals.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-nynorsk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-nynorsk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmiflink.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmiflink.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmutils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmutils.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphpaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphpaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfpaste.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfpaste.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-system.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-system.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridpapers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridpapers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hackthefootline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hackthefootline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hang.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hang.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harnon-cv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harnon-cv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harpoon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harpoon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-he-she.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-he-she.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-highlightlatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-highlightlatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitreport.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitreport.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobsub.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobsub.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvqrurl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvqrurl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdestopt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdestopt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdvips.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdvips.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypernat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypernat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-identkey.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-identkey.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxcmds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxcmds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmslide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmslide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifthenx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifthenx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-image-gallery.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-image-gallery.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-import.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-import.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-incgraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-incgraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inline-images.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inline-images.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interactiveworkbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interactiveworkbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-class.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-class.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isonums.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isonums.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isopt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isopt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwhdp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwhdp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlabels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlabels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jslectureplanner.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jslectureplanner.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jumplines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jumplines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyreader.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyreader.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keystroke.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keystroke.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyval2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyval2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-moderncvclassic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-moderncvclassic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-sfs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-sfs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels4easylist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels4easylist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-firstaid-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-firstaid-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-uni8.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-uni8.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lazylist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lazylist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leaflet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leaflet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lebhart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lebhart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectures.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectures.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectureslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectureslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lewis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lewis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lisp-on-tex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lisp-on-tex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listing.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listing.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lkproof.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lkproof.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logical-markup-utils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logical-markup-utils.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-loops.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-loops.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lsc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lsc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstfiracode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstfiracode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lt3graph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lt3graph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltablex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltablex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltabptch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltabptch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxdockit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxdockit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxguidex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxguidex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxkeys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxkeys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxtools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxtools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-check-hyphen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-check-hyphen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-physical.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-physical.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magaz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magaz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecookbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecookbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makerobust.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makerobust.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebarcode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebarcode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecirc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecirc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeglos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeglos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manyind.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manyind.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathalpha.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathalpha.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfam256.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfam256.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maybemath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maybemath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mceinleger.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mceinleger.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mciteplus.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mciteplus.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media4svg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media4svg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-medstarbeamer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-medstarbeamer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memexsupp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memexsupp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mensa-tex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mensa-tex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menucard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menucard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metanorma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metanorma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mindflow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mindflow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minimalist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minimalist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minitoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minitoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minorrevision.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minorrevision.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mla-paper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mla-paper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mmap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mmap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderncv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderncv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modernposter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modernposter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modular.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modular.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreenum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreenum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-movie15.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-movie15.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mslapa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mslapa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multenum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multenum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncclatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncclatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcommand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcommand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newenviron.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newenviron.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nfssext-cfr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nfssext-cfr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nlctdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nlctdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noconflict.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noconflict.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noindentafter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noindentafter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nolbreaks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nolbreaks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nopageno.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nopageno.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notestex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notestex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notoccite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notoccite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberedblock.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberedblock.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numname.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numname.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numspell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numspell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocg-p.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocg-p.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optidef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optidef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optional.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optional.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-options.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-options.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orcidlink.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orcidlink.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orientation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orientation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outliner.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outliner.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlays.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlays.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagerange.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagerange.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parades.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parades.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parnotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parnotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parsa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parsa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cours.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cours.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-tableur.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-tableur.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbalance.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbalance.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcolmk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcolmk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcomment.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcomment.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfmarginpar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfmarginpar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpagediff.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpagediff.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfreview.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfreview.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfscreen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfscreen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfslide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfslide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfsync.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfsync.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfwin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfwin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pecha.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pecha.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petiteannonce.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petiteannonce.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonenumbers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonenumbers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piff.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piff.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkgloader.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkgloader.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeins.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeins.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantslabels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantslabels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plates.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plates.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postcards.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postcards.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poster-mac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poster-mac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-practicalreports.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-practicalreports.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prelim2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prelim2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-printlen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-printlen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-program.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-program.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progress.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progress.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progressbar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progressbar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-properties.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-properties.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prosper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prosper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstool.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstool.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstring.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstring.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pygmentex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pygmentex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-python.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-python.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quicktype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quicktype.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quiz2socrative.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quiz2socrative.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randtext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randtext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readablecv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readablecv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readarray.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readarray.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipebook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rectopma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rectopma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcheck.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcheck.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refenums.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refenums.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relsize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relsize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repeatindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repeatindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-returntogrid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-returntogrid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rlepsf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rlepsf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanneg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanneg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotpages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotpages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rterface.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rterface.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulerbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulerbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-runcode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-runcode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rvwrite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rvwrite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanitize-umlaut.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanitize-umlaut.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalerel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalerel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scanpages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scanpages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schooldocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schooldocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlayer-fancyhdr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlayer-fancyhdr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlttr2copy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlttr2copy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdrt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdrt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secdot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secdot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbreak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbreak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selectp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selectp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-markup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-markup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semesterplanner.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semesterplanner.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepfootnotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepfootnotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadethm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadethm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadowtext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadowtext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapepar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapepar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shipunov.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shipunov.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showdim.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showdim.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showhyphens.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showhyphens.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleinvoice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleinvoice.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplivre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplivre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeldoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeldoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeycommand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeycommand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeyval.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeyval.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skills.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skills.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smalltableof.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smalltableof.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartunits.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartunits.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snotez.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snotez.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulpos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulpos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spark-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spark-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sparklines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sparklines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spotcolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spotcolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spreadtab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spreadtab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srbook-mem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srbook-mem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stackengine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stackengine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storecmd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storecmd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stubs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stubs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-studenthandouts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-studenthandouts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigmat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigmat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substitutefont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substitutefont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suppose.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suppose.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svgcolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svgcolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svninfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svninfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swfigure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swfigure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntax.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntax.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableaux.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableaux.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabstackengine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabstackengine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabto-ltx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabto-ltx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularcalc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularcalc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagging.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagging.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpair.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpair.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamefloats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamefloats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tasks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tasks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcolorbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcolorbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdclock.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdclock.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theoremref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theoremref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thinsp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thinsp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttablex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttablex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumby.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumby.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticket.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticket.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlecaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlecaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titleref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titleref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlesec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlesec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokcycle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokcycle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokenizer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokenizer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topiclongtable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topiclongtable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totalcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totalcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translations.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translations.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-truncate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-truncate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnthepage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnthepage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoinone.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoinone.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typoaid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typoaid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uassign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uassign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uebungsblatt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uebungsblatt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underoverlap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underoverlap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitipa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitipa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitconv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitconv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upmethodology.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upmethodology.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utf8add.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utf8add.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwmslide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwmslide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variablelm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variablelm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varsfromjobname.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varsfromjobname.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varwidth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varwidth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vcell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vcell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vdmlisting.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vdmlisting.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbasef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbasef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimcopy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimcopy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbdef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbdef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbments.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbments.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifiche.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifiche.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-version.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-version.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versions.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versions.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vertbars.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vertbars.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vhistory.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vhistory.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vpe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vpe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vruler.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vruler.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vtable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vtable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallcalendar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallcalendar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallpaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallpaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warning.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warning.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webquiz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webquiz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-williams.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-williams.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-willowtreebook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-willowtreebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-withargs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-withargs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-worksheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-worksheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wrapfig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wrapfig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wtref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wtref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xassoccnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xassoccnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcntperchap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcntperchap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcomment.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcomment.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfakebold.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfakebold.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xhfill.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xhfill.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xifthen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xifthen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkcdcolors.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkcdcolors.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltabular.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltabular.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xnewcommand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xnewcommand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xoptarg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xoptarg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xprintlen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xprintlen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsim.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsim.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xstring.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xstring.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xurl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xurl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xwatermark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xwatermark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xytree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xytree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ycbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ycbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yplan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yplan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zed-csp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zed-csp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ziffer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ziffer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwgetfdate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwgetfdate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwpagelayout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwpagelayout.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerappendixnote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerappendixnote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bithesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bithesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookshelf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookshelf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bubblesort.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bubblesort.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centerlastline.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centerlastline.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-color-edits.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-color-edits.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currvita.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currvita.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datax.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datax.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easybook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easybook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfloats.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfloats.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econlipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econlipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes-hy.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes-hy.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envlab.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envlab.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eq-pin2corr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eq-pin2corr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exesheet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exesheet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-froufrou.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-froufrou.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-g-brief.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-g-brief.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-nynorsk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-nynorsk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphpaper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphpaper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridpapers.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridpapers.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitreport.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitreport.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-firstaid-dev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-firstaid-dev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leaflet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leaflet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menucard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menucard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mindflow.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mindflow.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orcidlink.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orcidlink.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbalance.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbalance.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prelim2e.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prelim2e.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schooldocs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schooldocs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlayer-fancyhdr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlayer-fancyhdr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semesterplanner.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semesterplanner.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svninfo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svninfo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swfigure.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swfigure.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpdf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpdf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totalcount.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totalcount.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitipa.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitipa.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifiche.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifiche.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=a2d4fa7025978481c207fcd5bd0292e1
+_md5_=bb6ae9fcd50809c414c04f0f2ee3db12
diff --git a/metadata/md5-cache/dev-texlive/texlive-pictures-2021 b/metadata/md5-cache/dev-texlive/texlive-pictures-2021
index d3a081d361ce..4c4e0fdf2090 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pictures-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-pictures-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Graphics, pictures, diagrams
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD-2 GPL-2 CC0-1.0
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-tex/pgf-3.0.1 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adigraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adigraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askmaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askmaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoarea-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoarea-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bardiag-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bardiag-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bloques-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bloques-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bodegraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bodegraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxeepic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxeepic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cachepic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cachepic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-callouts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-callouts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuit-macros-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuit-macros-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuitikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuitikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dcpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dcpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagmac2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagmac2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ditaa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ditaa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doc-pictex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doc-pictex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dot2texi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dot2texi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpcircling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpcircling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dratex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dratex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duotenzor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duotenzor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynkin-diagrams-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynkin-diagrams-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eepic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eepic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endofproofwd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endofproofwd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epspdfconversion-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epspdfconversion-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fast-diagram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fast-diagram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fig4latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fig4latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogytree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogytree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getmap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getmap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grafcet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grafcet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxpsd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxpsd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harveyballs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harveyballs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-here-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-here-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-istgame-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-istgame-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kblocks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kblocks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knitting-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knitting-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knittingpattern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knittingpattern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ladder-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ladder-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lapdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lapdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamesh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamesh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maker-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maker-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mercatormap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mercatormap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milsymb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milsymb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miniplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miniplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modiagram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modiagram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-neuralnetwork-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-neuralnetwork-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nl-interval-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nl-interval-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numericplots-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numericplots-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pb-diagram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pb-diagram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petri-nets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petri-nets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-pie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-pie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-soroban-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-soroban-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-spectra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-spectra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlcd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlcd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlsd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlsd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfkeyx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfkeyx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmorepages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmorepages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfornament-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfornament-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picinpar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picinpar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinlabel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinlabel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmgraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmgraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prerex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prerex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-puyotikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-puyotikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpgfmark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpgfmark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcircuit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcircuit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reotex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reotex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sa-tikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sa-tikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemabloc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemabloc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch3-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch3-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scsnowman-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scsnowman-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setdeck-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setdeck-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleoptics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleoptics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectralsequences-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectralsequences-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swimgraf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swimgraf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntaxdi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntaxdi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-table-fct-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-table-fct-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdraw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdraw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticollege-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticollege-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-3dplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-3dplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-among-us-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-among-us-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bayesnet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bayesnet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-cd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-cd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dependency-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dependency-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dimline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dimline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynhand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynhand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynman-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynman-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-inet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-inet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-kalender-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-kalender-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-karnaugh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-karnaugh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-ladder-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-ladder-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-lake-fig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-lake-fig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-layers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-layers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-nef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-nef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-network-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-network-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-opm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-opm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-optics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-optics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-palattice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-palattice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-planets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-planets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-qtree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-qtree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-relay-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-relay-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-sfc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-sfc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-trackschematic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-trackschematic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzcodeblocks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzcodeblocks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzducks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzducks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzlings-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzlings-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmarmots-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmarmots-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzorbital-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzorbital-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpackets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpackets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpeople-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpeople-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikztosvg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikztosvg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tile-graphic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tile-graphic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timing-diagrams-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timing-diagrams-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipfr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipfr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-base-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-base-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-berge-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-berge-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-euclide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-euclide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-fct-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-fct-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-graph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-graph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-orm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-orm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-tab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-tab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tsemlines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tsemlines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tufte-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tufte-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tzplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tzplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utfsym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utfsym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualpstricks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualpstricks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-pictures-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-pictures-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adigraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adigraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askmaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askmaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoarea.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoarea.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bardiag.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bardiag.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bloques.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bloques.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bodegraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bodegraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxeepic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxeepic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cachepic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cachepic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-callouts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-callouts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemfig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemfig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuit-macros.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuit-macros.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuitikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuitikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dcpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dcpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagmac2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagmac2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ditaa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ditaa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doc-pictex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doc-pictex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dot2texi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dot2texi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpcircling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpcircling.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dratex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dratex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duotenzor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duotenzor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynkin-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynkin-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eepic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eepic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endofproofwd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endofproofwd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epspdfconversion.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epspdfconversion.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fast-diagram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fast-diagram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fig4latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fig4latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogytree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogytree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getmap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getmap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grafcet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grafcet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxpsd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxpsd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harveyballs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harveyballs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-here.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-here.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-istgame.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-istgame.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kblocks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kblocks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knitting.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knitting.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knittingpattern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knittingpattern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ladder.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ladder.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lapdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lapdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamesh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamesh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maker.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maker.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mercatormap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mercatormap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milsymb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milsymb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miniplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miniplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modiagram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modiagram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-neuralnetwork.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-neuralnetwork.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nl-interval.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nl-interval.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numericplots.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numericplots.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pb-diagram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pb-diagram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petri-nets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petri-nets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-pie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-pie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-soroban.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-soroban.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-spectra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-spectra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlcd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlcd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlsd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlsd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfkeyx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfkeyx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmorepages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmorepages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfornament.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfornament.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picinpar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picinpar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinlabel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinlabel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmgraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmgraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prerex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prerex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-puyotikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-puyotikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpgfmark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpgfmark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcircuit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcircuit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reotex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reotex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sa-tikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sa-tikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemabloc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemabloc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch3.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch3.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scsnowman.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scsnowman.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setdeck.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setdeck.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleoptics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleoptics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectralsequences.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectralsequences.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swimgraf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swimgraf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntaxdi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntaxdi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-table-fct.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-table-fct.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdraw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdraw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticollege.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticollege.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-3dplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-3dplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-among-us.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-among-us.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bayesnet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bayesnet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-cd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-cd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dependency.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dependency.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dimline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dimline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynhand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynhand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynman.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynman.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-inet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-inet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-kalender.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-kalender.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-karnaugh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-karnaugh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-ladder.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-ladder.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-lake-fig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-lake-fig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-layers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-layers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-nef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-nef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-network.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-network.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-opm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-opm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-optics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-optics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-palattice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-palattice.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-planets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-planets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-qtree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-qtree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-relay.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-relay.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-sfc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-sfc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-trackschematic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-trackschematic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzcodeblocks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzcodeblocks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzducks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzducks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzlings.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzlings.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmarmots.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmarmots.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzorbital.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzorbital.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpackets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpackets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpeople.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpeople.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikztosvg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikztosvg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tile-graphic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tile-graphic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timing-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timing-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipfr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipfr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-base.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-base.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-berge.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-berge.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-euclide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-euclide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-fct.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-fct.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-graph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-graph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-orm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-orm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-tab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-tab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tufte-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tufte-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tzplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tzplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utfsym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utfsym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualpstricks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualpstricks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tile-graphic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tile-graphic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=9a03058e63fcda807af7609e1ad3b0a5
+_md5_=43a1452eeb4b7e83d3a4f695dca8e64d
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c053ecac854b..ca239c07e605 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/android-tools-31.0.0_p1 b/metadata/md5-cache/dev-util/android-tools-31.0.0_p1
new file mode 100644
index 000000000000..e8f83f950af6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-tools-31.0.0_p1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/go dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1=
+DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
+EAPI=7
+HOMEPAGE=https://github.com/nmeum/android-tools/ https://developer.android.com/
+IUSE=python python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm ~arm64 x86 ~x86-linux
+LICENSE=Apache-2.0 BSD-2
+RDEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1= python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://github.com/nmeum/android-tools/releases/download/31.0.0p1/android-tools-31.0.0p1.tar.xz https://github.com/mid-kid/android-tools/commit/32d76cdbeb8a4fc2bb5fe22f496a9b82b68305a3.patch -> android-tools-no-gtest.patch https://github.com/mid-kid/android-tools/commit/9806fe4b730e15027ace235c62e166ae6148df56.patch -> android-tools-fix-gcc11.patch https://github.com/mid-kid/android-tools/commit/557182ba3f912327e747c3c3638d6ee7c529fb96.patch -> android-tools-dont-install-license.patch https://github.com/mid-kid/android-tools/commit/5971ec8ebab527fa17c91eaebe012d2a89a838db.patch -> android-tools-install-e2fsdroid-ext2simg.patch
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e8abc234d4cf46cad14140e90cef2357
diff --git a/metadata/md5-cache/dev-util/android-tools-9.0.0_p3-r1 b/metadata/md5-cache/dev-util/android-tools-9.0.0_p3-r1
index 6d192a866b87..5725ce6f453e 100644
--- a/metadata/md5-cache/dev-util/android-tools-9.0.0_p3-r1
+++ b/metadata/md5-cache/dev-util/android-tools-9.0.0_p3-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:= dev-libs/libpcre2:= virtual/libusb:1= python? ( python_t
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/archlinux/svntogit-community/archive/0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.gz -> android-tools-9.0.0_r3-arch.tar.gz https://github.com/android/platform_system_core/archive/android-9.0.0_r3.tar.gz -> android-tools-9.0.0_r3-core.tar.gz https://github.com/google/boringssl/archive/45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz -> boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz mirror://gentoo/android-tools-9.0.0_r3-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-e2fsprogs.tar.xz mirror://gentoo/android-tools-9.0.0_r3-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-extras.tar.xz mirror://gentoo/android-tools-9.0.0_r3-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-selinux.tar.xz mirror://gentoo/android-tools-9.0.0_r3-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-f2fs-tools.tar.xz mirror://gentoo/android-tools-9.0.0_r3.ninja.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3.ninja.xz https://raw.githubusercontent.com/nmeum/android-tools/8a30dba5768304176fd78aaa131242f6b880f828/patches/core/0022-Use-glibc-s-gettid-when-using-glibc-2.30.patch -> android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c60f6786db2fe6f7c72ca363f42f0e78
diff --git a/metadata/md5-cache/dev-util/bazel-0.22.0 b/metadata/md5-cache/dev-util/bazel-0.22.0
index e763a125c076..23cebe26bb75 100644
--- a/metadata/md5-cache/dev-util/bazel-0.22.0
+++ b/metadata/md5-cache/dev-util/bazel-0.22.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.22.0/bazel-0.22.0-dist.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a38b959e835ab01b656e35eccf23c798
diff --git a/metadata/md5-cache/dev-util/bazel-0.24.1 b/metadata/md5-cache/dev-util/bazel-0.24.1
index 56906861038c..540ef54f35d6 100644
--- a/metadata/md5-cache/dev-util/bazel-0.24.1
+++ b/metadata/md5-cache/dev-util/bazel-0.24.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.24.1/bazel-0.24.1-dist.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a38b959e835ab01b656e35eccf23c798
diff --git a/metadata/md5-cache/dev-util/bazel-0.27.2 b/metadata/md5-cache/dev-util/bazel-0.27.2
index 51e9ed2f8248..019d9a1b7c85 100644
--- a/metadata/md5-cache/dev-util/bazel-0.27.2
+++ b/metadata/md5-cache/dev-util/bazel-0.27.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.27.2/bazel-0.27.2-dist.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5069d36b9f93d8d0b17cb145e6e0dab6
diff --git a/metadata/md5-cache/dev-util/bazel-0.29.1 b/metadata/md5-cache/dev-util/bazel-0.29.1
index 2e4cfada9f4e..1788d016a869 100644
--- a/metadata/md5-cache/dev-util/bazel-0.29.1
+++ b/metadata/md5-cache/dev-util/bazel-0.29.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.29.1/bazel-0.29.1-dist.zip https://raw.githubusercontent.com/clearlinux-pkgs/bazel/adefd9046582cb52f39579033132e6265ef6ddb0/rename-gettid-functions.patch -> bazel-0.29.1-rename-gettid-functions.patch
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95777bb0b638cd58ed891541a48bfd1a
diff --git a/metadata/md5-cache/dev-util/bazel-1.0.1 b/metadata/md5-cache/dev-util/bazel-1.0.1
index fb1194eef089..0d90abc03349 100644
--- a/metadata/md5-cache/dev-util/bazel-1.0.1
+++ b/metadata/md5-cache/dev-util/bazel-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/1.0.1/bazel-1.0.1-dist.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9305c71693a782c3585c6363f0767513
diff --git a/metadata/md5-cache/dev-util/bazel-1.2.0 b/metadata/md5-cache/dev-util/bazel-1.2.0
index cf06f96767b9..2ee6542c50d3 100644
--- a/metadata/md5-cache/dev-util/bazel-1.2.0
+++ b/metadata/md5-cache/dev-util/bazel-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/1.2.0/bazel-1.2.0-dist.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9305c71693a782c3585c6363f0767513
diff --git a/metadata/md5-cache/dev-util/bazel-1.2.0-r1 b/metadata/md5-cache/dev-util/bazel-1.2.0-r1
index 32dd81dabea1..8cc0cec70041 100644
--- a/metadata/md5-cache/dev-util/bazel-1.2.0-r1
+++ b/metadata/md5-cache/dev-util/bazel-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/1.2.0/bazel-1.2.0-dist.zip https://raw.githubusercontent.com/clearlinux-pkgs/bazel/adefd9046582cb52f39579033132e6265ef6ddb0/rename-gettid-functions.patch -> bazel-1.2.0-rename-gettid-functions.patch
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b9563bc190721b15f5e190b88699282
diff --git a/metadata/md5-cache/dev-util/bazel-1.2.1 b/metadata/md5-cache/dev-util/bazel-1.2.1
index a558511fe7b2..1b654da67941 100644
--- a/metadata/md5-cache/dev-util/bazel-1.2.1
+++ b/metadata/md5-cache/dev-util/bazel-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/1.2.1/bazel-1.2.1-dist.zip https://raw.githubusercontent.com/clearlinux-pkgs/bazel/adefd9046582cb52f39579033132e6265ef6ddb0/rename-gettid-functions.patch -> bazel-1.2.0-rename-gettid-functions.patch
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a2c738ce8af9bd26ec2e9016e9dc60d
diff --git a/metadata/md5-cache/dev-util/bazel-2.0.0 b/metadata/md5-cache/dev-util/bazel-2.0.0
index 1f8fba0c45e4..ad8133292201 100644
--- a/metadata/md5-cache/dev-util/bazel-2.0.0
+++ b/metadata/md5-cache/dev-util/bazel-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/2.0.0/bazel-2.0.0-dist.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=029c3a577fde770ec12bbafe75753a3e
diff --git a/metadata/md5-cache/dev-util/bazel-3.2.0 b/metadata/md5-cache/dev-util/bazel-3.2.0
index 7a93c6afb7eb..e66fe00dbe84 100644
--- a/metadata/md5-cache/dev-util/bazel-3.2.0
+++ b/metadata/md5-cache/dev-util/bazel-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=prefix? ( static-libs )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/3.2.0/bazel-3.2.0-dist.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2a18cfc0241e70401226fa9cb3b6d33c
diff --git a/metadata/md5-cache/dev-util/bazel-3.7.2 b/metadata/md5-cache/dev-util/bazel-3.7.2
index 79b75d032f32..73bf4a64c617 100644
--- a/metadata/md5-cache/dev-util/bazel-3.7.2
+++ b/metadata/md5-cache/dev-util/bazel-3.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=prefix? ( static-libs )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/3.7.2/bazel-3.7.2-dist.zip
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2a18cfc0241e70401226fa9cb3b6d33c
diff --git a/metadata/md5-cache/dev-util/bear-3.0.13 b/metadata/md5-cache/dev-util/bear-3.0.13
index 6bc263ef3c55..5cebafe2abb9 100644
--- a/metadata/md5-cache/dev-util/bear-3.0.13
+++ b/metadata/md5-cache/dev-util/bear-3.0.13
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+BDEPEND=test? ( || ( ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-cpp/nlohmann_json-3.7:= >=dev-db/sqlite-3.14:= >=dev-libs/libfmt-6.2:= dev-libs/protobuf:= >=dev-libs/spdlog-1.5 >=net-libs/grpc-1.26:= test? ( >=dev-cpp/gtest-1.10 )
 DESCRIPTION=Build EAR generates a compilation database for clang tooling
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rizsotto/Bear/archive/3.0.13.tar.gz -> bear-3.0.13.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=215b484f7e556caf299ee1ca8b2c4d83
+_md5_=db17d93ddada9372560abfefe40fc600
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-0.20.1 b/metadata/md5-cache/dev-util/bitcoin-tx-0.20.1
index 135c105a0c70..88d07f1d5f97 100644
--- a/metadata/md5-cache/dev-util/bitcoin-tx-0.20.1
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.20.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >dev-libs/libsecp256k1-0.1_pre20170321:=[recovery] >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/bf0dc356ac4a2bdeda1908af021dea2de0dfb35a.tar.gz -> bitcoin-v0.20.1.tar.gz https://bitcoinknots.org/files/0.20.x/0.20.1.knots20200815/bitcoin-0.20.1.knots20200815.patches.txz -> bitcoin-0.20.1.knots20200815.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad493dc8858d418402fcc36a603032bf
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-0.21.0 b/metadata/md5-cache/dev-util/bitcoin-tx-0.21.0
index b5ad8dbb9784..df228ae43956 100644
--- a/metadata/md5-cache/dev-util/bitcoin-tx-0.21.0
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.21.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.58.0:=[threads(+)] >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr] >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/95ea54ba089610019a74c1176a2c7c0dba144b1c.tar.gz -> bitcoin-v0.21.0.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.0.knots20210130/bitcoin-0.21.0.knots20210130.patches.txz -> bitcoin-0.21.0.knots20210130.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=48ee0a500eec9e32f1e03201861e3db2
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-0.21.1 b/metadata/md5-cache/dev-util/bitcoin-tx-0.21.1
index 8033754f2072..75340d1d43a4 100644
--- a/metadata/md5-cache/dev-util/bitcoin-tx-0.21.1
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.21.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.58.0:=[threads(+)] >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr] >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf.tar.gz -> bitcoin-v0.21.1.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.1.knots20210629/bitcoin-0.21.1.knots20210629.patches.txz -> bitcoin-0.21.1.knots20210629.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=932930acc07e64ac172e3f4ea8a66256
diff --git a/metadata/md5-cache/dev-util/bnfc-2.8.3 b/metadata/md5-cache/dev-util/bnfc-2.8.3
index 6ae8697c7302..40bb12f0d996 100644
--- a/metadata/md5-cache/dev-util/bnfc-2.8.3
+++ b/metadata/md5-cache/dev-util/bnfc-2.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lan
 RESTRICT=test
 SLOT=0/2.8.3
 SRC_URI=https://hackage.haskell.org/package/BNFC-2.8.3/BNFC-2.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0529337713b66df2aa7e4fed68b0658d
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.13.0 b/metadata/md5-cache/dev-util/bpftrace-0.13.0-r1
index bb97fd31b1a0..bb97fd31b1a0 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.13.0
+++ b/metadata/md5-cache/dev-util/bpftrace-0.13.0-r1
diff --git a/metadata/md5-cache/dev-util/bustle-0.8.0 b/metadata/md5-cache/dev-util/bustle-0.8.0
index b55861370ca2..00fcb8321f15 100644
--- a/metadata/md5-cache/dev-util/bustle-0.8.0
+++ b/metadata/md5-cache/dev-util/bustle-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/cairo:= dev-haskell/gio:= dev-haskell/glib:= dev-haskell/gtk
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/bustle-0.8.0/bustle-0.8.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=46163976cf73153cb6d6981d06dead92
diff --git a/metadata/md5-cache/dev-util/cmake-3.13.5 b/metadata/md5-cache/dev-util/cmake-3.13.5
index 8567f21034ea..5dfba6e92de2 100644
--- a/metadata/md5-cache/dev-util/cmake-3.13.5
+++ b/metadata/md5-cache/dev-util/cmake-3.13.5
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.13/cmake-3.13.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0eb3eb2d6101aba7927f93abc1231c88
diff --git a/metadata/md5-cache/dev-util/cmake-3.18.5 b/metadata/md5-cache/dev-util/cmake-3.18.5
index 11bc31964c40..0d8e041a9294 100644
--- a/metadata/md5-cache/dev-util/cmake-3.18.5
+++ b/metadata/md5-cache/dev-util/cmake-3.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.18/cmake-3.18.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a0534cb013ea0d4963c4666fe4fefa72
diff --git a/metadata/md5-cache/dev-util/cmake-3.19.7 b/metadata/md5-cache/dev-util/cmake-3.19.7
index 49ceab4c7942..f1af0faf523c 100644
--- a/metadata/md5-cache/dev-util/cmake-3.19.7
+++ b/metadata/md5-cache/dev-util/cmake-3.19.7
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.19/cmake-3.19.7.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2b05dc93551f629b5e16ba64d73aac39
diff --git a/metadata/md5-cache/dev-util/cmake-3.20.5 b/metadata/md5-cache/dev-util/cmake-3.20.5
index 112f9588d1aa..ef9a582f173d 100644
--- a/metadata/md5-cache/dev-util/cmake-3.20.5
+++ b/metadata/md5-cache/dev-util/cmake-3.20.5
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.20/cmake-3.20.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=229a4c6efbbdb05bdf1c29c74d770397
diff --git a/metadata/md5-cache/dev-util/cmake-3.21.0 b/metadata/md5-cache/dev-util/cmake-3.21.0
new file mode 100644
index 000000000000..01b491b5312c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.21.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Cross platform Make
+EAPI=7
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs ncurses qt5 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=CMake
+RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.21/cmake-3.21.0.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=229a4c6efbbdb05bdf1c29c74d770397
diff --git a/metadata/md5-cache/dev-util/cmake-3.21.0_rc3 b/metadata/md5-cache/dev-util/cmake-3.21.0_rc3
deleted file mode 100644
index c3691a21921e..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.21.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=7
-HOMEPAGE=https://cmake.org/
-IUSE=doc emacs ncurses qt5 test test
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.21/cmake-3.21.0-rc3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=229a4c6efbbdb05bdf1c29c74d770397
diff --git a/metadata/md5-cache/dev-util/cucumber-3.1.2 b/metadata/md5-cache/dev-util/cucumber-3.1.2
deleted file mode 100644
index 5c520a9cc20d..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-3.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25(-)] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby25(-)] >=dev-util/aruba-0.6.1[ruby_targets_ruby25(-)] =dev-util/aruba-0.6*[ruby_targets_ruby25(-)] dev-ruby/json[ruby_targets_ruby25(-)] >=dev-util/cucumber-3[ruby_targets_ruby25(-)] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby26(-)] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby26(-)] >=dev-util/aruba-0.6.1[ruby_targets_ruby26(-)] =dev-util/aruba-0.6*[ruby_targets_ruby26(-)] dev-ruby/json[ruby_targets_ruby26(-)] >=dev-util/cucumber-3[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby26(-)] ) ) test? ( ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby25(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby25(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby26(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby26(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Executable feature scenarios
-EAPI=6
-HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
-IUSE=examples test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby25(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby25(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby26(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby26(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.2.tar.gz -> cucumber-3.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=306589c3afdf6b3ea08e45f9e083588a
diff --git a/metadata/md5-cache/dev-util/cucumber-3.2.0 b/metadata/md5-cache/dev-util/cucumber-3.2.0
index 5a8bab268fd3..44017eb9e178 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.2.0
+++ b/metadata/md5-cache/dev-util/cucumber-3.2.0
@@ -5,7 +5,7 @@ DESCRIPTION=Executable feature scenarios
 EAPI=7
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby25(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby25(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby26(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby26(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby27(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby27(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2[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=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.2.0.tar.gz -> cucumber-3.2.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e26154ddd8df19b44b0a792d5703b91
+_md5_=54914840b49314d9e33371d9dc9a8a24
diff --git a/metadata/md5-cache/dev-util/cucumber-6.1.0 b/metadata/md5-cache/dev-util/cucumber-6.1.0
new file mode 100644
index 000000000000..0fe40986908c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-6.1.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby26(-)] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby26(-)] dev-ruby/json[ruby_targets_ruby26(-)] >=dev-util/cucumber-3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby27(-)] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby27(-)] dev-ruby/json[ruby_targets_ruby27(-)] >=dev-util/cucumber-3[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby26(-)] dev-util/cucumber-create-meta:4[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby26(-)] >=dev-util/cucumber-html-formatter-13.0.0:13[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-5.0.1:5[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby27(-)] dev-util/cucumber-create-meta:4[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby27(-)] >=dev-util/cucumber-html-formatter-13.0.0:13[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-5.0.1:5[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Executable feature scenarios
+EAPI=7
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=examples test test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby26(-)] dev-util/cucumber-create-meta:4[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby26(-)] >=dev-util/cucumber-html-formatter-13.0.0:13[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-5.0.1:5[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby27(-)] dev-util/cucumber-create-meta:4[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby27(-)] >=dev-util/cucumber-html-formatter-13.0.0:13[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-5.0.1:5[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v6.1.0.tar.gz -> cucumber-6.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a44564e026a16a2b238e74bcd9206113
diff --git a/metadata/md5-cache/dev-util/cucumber-core-10.0.0 b/metadata/md5-cache/dev-util/cucumber-core-10.0.0
new file mode 100644
index 000000000000..eab99e5ae187
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-core-10.0.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby30(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-gherkin-20.0.0:20[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-gherkin-20.0.0:20[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-gherkin-20.0.0:20[ruby_targets_ruby30(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby30(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Executable feature scenarios
+EAPI=7
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-gherkin-20.0.0:20[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-gherkin-20.0.0:20[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-gherkin-20.0.0:20[ruby_targets_ruby30(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby30(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=10
+SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v10.0.0.tar.gz -> cucumber-core-10.0.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bc4b9b092775b12cea6cd1f068f8fdff
diff --git a/metadata/md5-cache/dev-util/cucumber-core-3.2.1 b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
index ba63dfae1134..b81712738e3b 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-3.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v3.2.1.tar.gz -> cucumber-core-3.2.1.tar.gz
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9d3258da808435754a4a43ab17a668dd
+_md5_=e63023d058e14dbbe35bca860b5eccea
diff --git a/metadata/md5-cache/dev-util/cucumber-core-9.0.1 b/metadata/md5-cache/dev-util/cucumber-core-9.0.1
new file mode 100644
index 000000000000..f1f7860600ec
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-core-9.0.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby26(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Executable feature scenarios
+EAPI=7
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby26(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=9
+SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v9.0.1.tar.gz -> cucumber-core-9.0.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e6c29f06ff6e71f1ee4e9aa502636402
diff --git a/metadata/md5-cache/dev-util/cucumber-create-meta-4.0.0 b/metadata/md5-cache/dev-util/cucumber-create-meta-4.0.0
new file mode 100644
index 000000000000..0baaa79bb0cf
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-create-meta-4.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=HTML formatter for Cucumber
+EAPI=7
+HOMEPAGE=https://cucumber.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://rubygems.org/gems/cucumber-create-meta-4.0.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a36bcfc75d3d4cc47f478612ba5c9ffb
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.2.0 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.2.0
deleted file mode 100644
index 341b31b9cf72..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
-DESCRIPTION=a simpler alternative to Regular Expressions
-EAPI=7
-HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=10
-SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-10.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3dc382400b0c5124c925e97734ab4336
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.2.1 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.2.1
deleted file mode 100644
index 119299be29f3..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
-DESCRIPTION=a simpler alternative to Regular Expressions
-EAPI=7
-HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=10
-SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-10.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1eee106df6d300c6474fa877888623cb
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1
new file mode 100644
index 000000000000..854673fe5504
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=a simpler alternative to Regular Expressions
+EAPI=7
+HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=12
+SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-12.1.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=91c36ae67949d73511c04adc2ee11b37
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-18.1.1 b/metadata/md5-cache/dev-util/cucumber-gherkin-18.1.1
new file mode 100644
index 000000000000..c2aa1335fd32
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-18.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Fast Gherkin lexer and parser
+EAPI=7
+HOMEPAGE=https://github.com/cucumber/gherkin
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=18
+SRC_URI=https://github.com/cucumber/common/archive/gherkin/v18.1.1.tar.gz -> cucumber-gherkin-18.1.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d48109823f4b8185bf24cb7127ffe2a0
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.0 b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.0
new file mode 100644
index 000000000000..ba9dcff6aaad
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Fast Gherkin lexer and parser
+EAPI=7
+HOMEPAGE=https://github.com/cucumber/gherkin
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=20
+SRC_URI=https://github.com/cucumber/common/archive/gherkin/v20.0.0.tar.gz -> cucumber-gherkin-20.0.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=16186e441329c6a4e0b77885d7f9a398
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r1 b/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r1
new file mode 100644
index 000000000000..7c4396a8336a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=HTML formatter for Cucumber
+EAPI=7
+HOMEPAGE=https://cucumber.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=13
+SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-13.0.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f989818e16d5f55f164dcb86b95d20b8
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-13.1.0 b/metadata/md5-cache/dev-util/cucumber-messages-13.1.0
deleted file mode 100644
index 45b97be53d73..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-messages-13.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby27(-)] ) ) ruby_targets_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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
-DESCRIPTION=Protocol Buffer messages for Cucumber's inter-process communication
-EAPI=7
-HOMEPAGE=https://github.com/cucumber/cucumber-messages-ruby#readme
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby27(-)] ) ruby_targets_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 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=13
-SRC_URI=https://rubygems.org/gems/cucumber-messages-13.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=167ff8887cfee1aed80359757d8b00ae
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-13.2.0 b/metadata/md5-cache/dev-util/cucumber-messages-13.2.0
deleted file mode 100644
index 81a4ff816851..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-messages-13.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby27(-)] ) ) ruby_targets_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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_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(-)] )
-DESCRIPTION=Protocol Buffer messages for Cucumber's inter-process communication
-EAPI=7
-HOMEPAGE=https://github.com/cucumber/cucumber-messages-ruby#readme
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby27(-)] ) ruby_targets_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 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=13
-SRC_URI=https://rubygems.org/gems/cucumber-messages-13.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da2288094b511d0ebd73d072060fa99f
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-15.0.0 b/metadata/md5-cache/dev-util/cucumber-messages-15.0.0
new file mode 100644
index 000000000000..47a80fb131e3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-messages-15.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Protocol Buffer messages for Cucumber's inter-process communication
+EAPI=7
+HOMEPAGE=https://github.com/cucumber/cucumber-messages-ruby#readme
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=15
+SRC_URI=https://rubygems.org/gems/cucumber-messages-15.0.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2548438d97706663743ac69bb7cdffa4
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-17.0.0 b/metadata/md5-cache/dev-util/cucumber-messages-17.0.0
new file mode 100644
index 000000000000..52e147b69bb4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-messages-17.0.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Protocol Buffer messages for Cucumber's inter-process communication
+EAPI=7
+HOMEPAGE=https://github.com/cucumber/cucumber-messages-ruby#readme
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=17
+SRC_URI=https://rubygems.org/gems/cucumber-messages-17.0.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0fde2ea7003cc8551c70e432bf26e378
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.3.0 b/metadata/md5-cache/dev-util/cucumber-rails-2.3.0
new file mode 100644
index 000000000000..17e8ada412b5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/capybara-2.18:*[ruby_targets_ruby26(-)] <dev-ruby/capybara-4:*[ruby_targets_ruby26(-)] >=dev-util/cucumber-3.0.2[ruby_targets_ruby26(-)] <dev-util/cucumber-7[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.2:3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby26(-)] >=dev-ruby/rails-5.0:*[ruby_targets_ruby26(-)] <dev-ruby/rails-7:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/capybara-2.18:*[ruby_targets_ruby27(-)] <dev-ruby/capybara-4:*[ruby_targets_ruby27(-)] >=dev-util/cucumber-3.0.2[ruby_targets_ruby27(-)] <dev-util/cucumber-7[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.2:3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby27(-)] >=dev-ruby/rails-5.0:*[ruby_targets_ruby27(-)] <dev-ruby/rails-7:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Executable feature scenarios for Rails
+EAPI=7
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/capybara-2.18:*[ruby_targets_ruby26(-)] <dev-ruby/capybara-4:*[ruby_targets_ruby26(-)] >=dev-util/cucumber-3.0.2[ruby_targets_ruby26(-)] <dev-util/cucumber-7[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.2:3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby26(-)] >=dev-ruby/rails-5.0:*[ruby_targets_ruby26(-)] <dev-ruby/rails-7:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/capybara-2.18:*[ruby_targets_ruby27(-)] <dev-ruby/capybara-4:*[ruby_targets_ruby27(-)] >=dev-util/cucumber-3.0.2[ruby_targets_ruby27(-)] <dev-util/cucumber-7[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.2:3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby27(-)] >=dev-ruby/rails-5.0:*[ruby_targets_ruby27(-)] <dev-ruby/rails-7:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=test !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/cucumber/cucumber-rails/archive/v2.3.0.tar.gz -> cucumber-rails-2.3.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fa58ed0508ddb88629a1c63b5d345d80
diff --git a/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1 b/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1
new file mode 100644
index 000000000000..f55bb9b2076b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Cucumber tag expressions for ruby
+EAPI=7
+HOMEPAGE=https://docs.cucumber.io/tag-expressions/
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/cucumber-tag-expressions-3.0.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2349d8a0ad9d7b12b43cbc6fba3813b8
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-5.0.1 b/metadata/md5-cache/dev-util/cucumber-wire-5.0.1
new file mode 100644
index 000000000000..fee58d7705e4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-wire-5.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Executable feature scenarios
+EAPI=7
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://rubygems.org/gems/cucumber-wire-5.0.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=271713d6f6eb41fa9e8f2a60a9b13a0a
diff --git a/metadata/md5-cache/dev-util/diffoscope-178 b/metadata/md5-cache/dev-util/diffoscope-178
new file mode 100644
index 000000000000..d2fe264315bc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-178
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( app-text/docx2txt media-libs/libcaca )
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-178.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c8a217bd350231967bbe31f3651c6459
diff --git a/metadata/md5-cache/dev-util/docker-ls-0.3.1 b/metadata/md5-cache/dev-util/docker-ls-0.3.1
index e25723778ffa..866a7b67ff7a 100644
--- a/metadata/md5-cache/dev-util/docker-ls-0.3.1
+++ b/metadata/md5-cache/dev-util/docker-ls-0.3.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mayflower/docker-ls/archive/d80310976c9707e261e57ebfa9acf4e0b1781460.tar.gz -> docker-ls-0.3.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1531256a117debc3481f7322dab2a561
diff --git a/metadata/md5-cache/dev-util/dput-ng-1.32 b/metadata/md5-cache/dev-util/dput-ng-1.32
index f47d38120e67..2b3d69aa13fe 100644
--- a/metadata/md5-cache/dev-util/dput-ng-1.32
+++ b/metadata/md5-cache/dev-util/dput-ng-1.32
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dput-ng/dput-ng_1.32.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=13000471f212c9f6b6b42218c8da8fb8
diff --git a/metadata/md5-cache/dev-util/ebuildtester-0.1.27 b/metadata/md5-cache/dev-util/ebuildtester-0.1.27
index bb81e0aec9c0..c0ff5fe1b4a4 100644
--- a/metadata/md5-cache/dev-util/ebuildtester-0.1.27
+++ b/metadata/md5-cache/dev-util/ebuildtester-0.1.27
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.27.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0834cd53aa49fcb2c636ba9f6ff623c1
diff --git a/metadata/md5-cache/dev-util/ebuildtester-0.1.29 b/metadata/md5-cache/dev-util/ebuildtester-0.1.29
index 7078c3e23709..89844538ca60 100644
--- a/metadata/md5-cache/dev-util/ebuildtester-0.1.29
+++ b/metadata/md5-cache/dev-util/ebuildtester-0.1.29
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.29.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0834cd53aa49fcb2c636ba9f6ff623c1
diff --git a/metadata/md5-cache/dev-util/ebuildtester-0.1.30 b/metadata/md5-cache/dev-util/ebuildtester-0.1.30
index 01d7abb3e69f..b654c4473afc 100644
--- a/metadata/md5-cache/dev-util/ebuildtester-0.1.30
+++ b/metadata/md5-cache/dev-util/ebuildtester-0.1.30
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.30.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0834cd53aa49fcb2c636ba9f6ff623c1
diff --git a/metadata/md5-cache/dev-util/git-delta-0.7.1 b/metadata/md5-cache/dev-util/git-delta-0.7.1
index feeeb1508289..49ed596954cd 100644
--- a/metadata/md5-cache/dev-util/git-delta-0.7.1
+++ b/metadata/md5-cache/dev-util/git-delta-0.7.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT Unlicense ZLIB
 RDEPEND=dev-libs/libgit2:= dev-libs/oniguruma:= !app-text/delta
 SLOT=0
 SRC_URI=https://github.com/dandavison/delta/archive/0.7.1.tar.gz -> git-delta-0.7.1.tar.gz https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_colours/1.0.1/download -> ansi_colours-1.0.1.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bincode/1.3.1/download -> bincode-1.3.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/box_drawing/0.1.2/download -> box_drawing-0.1.2.crate https://crates.io/api/v1/crates/bytelines/2.2.2/download -> bytelines-2.2.2.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/console/0.14.1/download -> console-0.14.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.1/download -> dirs-sys-next-0.1.1.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.0/download -> form_urlencoded-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/git2/0.13.17/download -> git2-0.13.17.crate https://crates.io/api/v1/crates/hashbrown/0.8.2/download -> hashbrown-0.8.2.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.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.5.2/download -> indexmap-1.5.2.crate https://crates.io/api/v1/crates/itertools/0.10.0/download -> itertools-0.10.0.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.81/download -> libc-0.2.81.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.18+1.1.0/download -> libgit2-sys-0.12.18+1.1.0.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/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.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/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/onig/6.1.1/download -> onig-6.1.1.crate https://crates.io/api/v1/crates/onig_sys/69.6.0/download -> onig_sys-69.6.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.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/plist/1.0.1/download -> plist-1.0.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.5/download -> regex-1.4.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.22/download -> regex-syntax-0.6.22.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/serde/1.0.118/download -> serde-1.0.118.crate https://crates.io/api/v1/crates/serde_derive/1.0.118/download -> serde_derive-1.0.118.crate https://crates.io/api/v1/crates/serde_json/1.0.61/download -> serde_json-1.0.61.crate https://crates.io/api/v1/crates/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/syn/1.0.57/download -> syn-1.0.57.crate https://crates.io/api/v1/crates/syntect/4.5.0/download -> syntect-4.5.0.crate https://crates.io/api/v1/crates/terminal_size/0.1.15/download -> terminal_size-0.1.15.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/tinyvec/1.1.0/download -> tinyvec-1.1.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.0/download -> url-2.2.0.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/vte/0.10.0/download -> vte-0.10.0.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.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/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e4fd6a558a359c60d42ed1367f4f7cfa
diff --git a/metadata/md5-cache/dev-util/git-delta-0.8.2 b/metadata/md5-cache/dev-util/git-delta-0.8.2
deleted file mode 100644
index 4a0cb4b6558a..000000000000
--- a/metadata/md5-cache/dev-util/git-delta-0.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-libs/libgit2:= dev-libs/oniguruma:=
-DESCRIPTION=A syntax-highlighting pager for git
-EAPI=7
-HOMEPAGE=https://github.com/dandavison/delta
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB
-RDEPEND=dev-libs/libgit2:= dev-libs/oniguruma:= !app-text/delta
-SLOT=0
-SRC_URI=https://github.com/dandavison/delta/archive/0.8.2.tar.gz -> git-delta-0.8.2.tar.gz https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_colours/1.0.3/download -> ansi_colours-1.0.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bincode/1.3.1/download -> bincode-1.3.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/box_drawing/0.1.2/download -> box_drawing-0.1.2.crate https://crates.io/api/v1/crates/bytelines/2.2.2/download -> bytelines-2.2.2.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/console/0.14.1/download -> console-0.14.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.1/download -> dirs-sys-next-0.1.1.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.0/download -> form_urlencoded-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/git2/0.13.20/download -> git2-0.13.20.crate https://crates.io/api/v1/crates/hashbrown/0.8.2/download -> hashbrown-0.8.2.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.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.5.2/download -> indexmap-1.5.2.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.81/download -> libc-0.2.81.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.21+1.1.0/download -> libgit2-sys-0.12.21+1.1.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.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/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/onig/6.1.1/download -> onig-6.1.1.crate https://crates.io/api/v1/crates/onig_sys/69.6.0/download -> onig_sys-69.6.0.crate https://crates.io/api/v1/crates/pathdiff/0.2.0/download -> pathdiff-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.0.1/download -> plist-1.0.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.6/download -> regex-1.4.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.22/download -> regex-syntax-0.6.22.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/serde/1.0.118/download -> serde-1.0.118.crate https://crates.io/api/v1/crates/serde_derive/1.0.118/download -> serde_derive-1.0.118.crate https://crates.io/api/v1/crates/serde_json/1.0.61/download -> serde_json-1.0.61.crate https://crates.io/api/v1/crates/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/syn/1.0.57/download -> syn-1.0.57.crate https://crates.io/api/v1/crates/syntect/4.5.0/download -> syntect-4.5.0.crate https://crates.io/api/v1/crates/terminal_size/0.1.15/download -> terminal_size-0.1.15.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/tinyvec/1.1.0/download -> tinyvec-1.1.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.0/download -> url-2.2.0.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.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/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3a061cf5b933d08e26f9999d502f15ca
diff --git a/metadata/md5-cache/dev-util/git-delta-0.8.3 b/metadata/md5-cache/dev-util/git-delta-0.8.3
new file mode 100644
index 000000000000..cf149a8c9b13
--- /dev/null
+++ b/metadata/md5-cache/dev-util/git-delta-0.8.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=dev-libs/libgit2:= dev-libs/oniguruma:=
+DESCRIPTION=A syntax-highlighting pager for git
+EAPI=7
+HOMEPAGE=https://github.com/dandavison/delta
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB
+RDEPEND=dev-libs/libgit2:= dev-libs/oniguruma:= !app-text/delta
+SLOT=0
+SRC_URI=https://github.com/dandavison/delta/archive/0.8.3.tar.gz -> git-delta-0.8.3.tar.gz https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_colours/1.0.4/download -> ansi_colours-1.0.4.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bincode/1.3.1/download -> bincode-1.3.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/box_drawing/0.1.2/download -> box_drawing-0.1.2.crate https://crates.io/api/v1/crates/bstr/0.2.15/download -> bstr-0.2.15.crate https://crates.io/api/v1/crates/bytelines/2.2.2/download -> bytelines-2.2.2.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/console/0.14.1/download -> console-0.14.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.1/download -> dirs-sys-next-0.1.1.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.0/download -> form_urlencoded-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/git2/0.13.20/download -> git2-0.13.20.crate https://crates.io/api/v1/crates/globset/0.4.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/grep-cli/0.1.6/download -> grep-cli-0.1.6.crate https://crates.io/api/v1/crates/hashbrown/0.8.2/download -> hashbrown-0.8.2.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.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.5.2/download -> indexmap-1.5.2.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.81/download -> libc-0.2.81.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.21+1.1.0/download -> libgit2-sys-0.12.21+1.1.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.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/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/onig/6.1.1/download -> onig-6.1.1.crate https://crates.io/api/v1/crates/onig_sys/69.6.0/download -> onig_sys-69.6.0.crate https://crates.io/api/v1/crates/pathdiff/0.2.0/download -> pathdiff-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.0.1/download -> plist-1.0.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.6/download -> regex-1.4.6.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.22/download -> regex-syntax-0.6.22.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/serde/1.0.118/download -> serde-1.0.118.crate https://crates.io/api/v1/crates/serde_derive/1.0.118/download -> serde_derive-1.0.118.crate https://crates.io/api/v1/crates/serde_json/1.0.61/download -> serde_json-1.0.61.crate https://crates.io/api/v1/crates/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.22/download -> structopt-0.3.22.crate https://crates.io/api/v1/crates/structopt-derive/0.4.15/download -> structopt-derive-0.4.15.crate https://crates.io/api/v1/crates/syn/1.0.57/download -> syn-1.0.57.crate https://crates.io/api/v1/crates/syntect/4.5.0/download -> syntect-4.5.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.15/download -> terminal_size-0.1.15.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/tinyvec/1.1.0/download -> tinyvec-1.1.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.0/download -> url-2.2.0.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.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/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ce18959abe030518ef8a718cf48dfe41
diff --git a/metadata/md5-cache/dev-util/github-cli-1.10.3 b/metadata/md5-cache/dev-util/github-cli-1.10.3
index b3a8b4f82057..e35e60ab0904 100644
--- a/metadata/md5-cache/dev-util/github-cli-1.10.3
+++ b/metadata/md5-cache/dev-util/github-cli-1.10.3
@@ -9,5 +9,5 @@ RDEPEND=>=dev-vcs/git-1.7.3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/cli/cli/archive/v1.10.3.tar.gz -> github-cli-1.10.3.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.9.zip -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.9.zip mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.9.mod -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.9.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.zip -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.zip mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.mod -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.2.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/aymerick/douceur/@v/v0.2.0.zip -> github.com%2Faymerick%2Fdouceur%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/aymerick/douceur/@v/v0.2.0.mod -> github.com%2Faymerick%2Fdouceur%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.zip -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.mod -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.3.0.zip -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.3.0.mod -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/cli/browser/@v/v1.0.0.mod -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/browser/@v/v1.1.0.zip -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cli/browser/@v/v1.1.0.mod -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.zip -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.mod -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.zip -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.mod -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/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/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/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/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/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/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.2.zip -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.2.mod -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.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/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/css/@v/v1.0.0.zip -> github.com%2Fgorilla%2Fcss%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gorilla/css/@v/v1.0.0.mod -> github.com%2Fgorilla%2Fcss%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20200622220639-c1d9693c95a6.mod -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/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/henvic/httpretty/@v/v0.0.6.zip -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/henvic/httpretty/@v/v0.0.6.mod -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.zip -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.mod -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.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/itchyny/astgen-go/@v/v0.0.0-20210113000433-0da0671862a3.zip -> github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.zip mirror://goproxy//github.com/itchyny/astgen-go/@v/v0.0.0-20210113000433-0da0671862a3.mod -> github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.mod mirror://goproxy//github.com/itchyny/go-flags/@v/v1.5.0.mod -> github.com%2Fitchyny%2Fgo-flags%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/itchyny/gojq/@v/v0.12.1.zip -> github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.zip mirror://goproxy//github.com/itchyny/gojq/@v/v0.12.1.mod -> github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.mod mirror://goproxy//github.com/itchyny/timefmt-go/@v/v0.1.1.zip -> github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/itchyny/timefmt-go/@v/v0.1.1.mod -> github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/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/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.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/lucasb-eyer/go-colorful/@v/v1.2.0.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.2.0.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.10.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.6.zip -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.6.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/muesli/reflow/@v/v0.2.0.zip -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/muesli/reflow/@v/v0.2.0.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.8.1.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.8.1.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.zip -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.zip mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.mod -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.3.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.3.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/yuin/goldmark-emoji/@v/v1.0.1.zip -> github.com%2Fyuin%2Fgoldmark-emoji%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/yuin/goldmark-emoji/@v/v1.0.1.mod -> github.com%2Fyuin%2Fgoldmark-emoji%2F@v%2Fv1.0.1.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210331212208-0fccb6fa2b5c.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210331212208-0fccb6fa2b5c.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210331212208-0fccb6fa2b5c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210331212208-0fccb6fa2b5c.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190530182044-ad28b68e88f1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210113181707-4bcb84eeeb78.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210319071255-635bc2c9138d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210319071255-635bc2c9138d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210422114643-f5beecf764ed.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210422114643-f5beecf764ed.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210422114643-f5beecf764ed.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210422114643-f5beecf764ed.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9d379a8727fe081b58cc998b728230fd
diff --git a/metadata/md5-cache/dev-util/github-cli-1.4.0 b/metadata/md5-cache/dev-util/github-cli-1.4.0
index aa292494f361..c80e17ccb72b 100644
--- a/metadata/md5-cache/dev-util/github-cli-1.4.0
+++ b/metadata/md5-cache/dev-util/github-cli-1.4.0
@@ -9,5 +9,5 @@ RDEPEND=>=dev-vcs/git-1.7.3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/cli/cli/archive/v1.4.0.tar.gz -> github-cli-1.4.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.3.zip -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.zip mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.3.mod -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.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/!make!now!just/heredoc/@v/v1.0.0.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.zip -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.zip mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.mod -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.zip -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.mod -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.zip -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.zip mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.mod -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.mod mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.zip -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.mod -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/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/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/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/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.zip -> github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.mod -> github.com%2Fenescakir%2Femoji%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/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.zip -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.mod -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20200622220639-c1d9693c95a6.mod -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/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/henvic/httpretty/@v/v0.0.6.zip -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/henvic/httpretty/@v/v0.0.6.mod -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.zip -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.mod -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/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/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.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/lucasb-eyer/go-colorful/@v/v1.0.3.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.zip -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.zip -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.zip -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.zip mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.mod -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190530182044-ad28b68e88f1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.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.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fac5f3e8e5cd5ba225f1f3a81c392b74
diff --git a/metadata/md5-cache/dev-util/github-cli-1.5.0 b/metadata/md5-cache/dev-util/github-cli-1.5.0
index 2873ff1393b6..ad80fb5e16ec 100644
--- a/metadata/md5-cache/dev-util/github-cli-1.5.0
+++ b/metadata/md5-cache/dev-util/github-cli-1.5.0
@@ -9,5 +9,5 @@ RDEPEND=>=dev-vcs/git-1.7.3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/cli/cli/archive/v1.5.0.tar.gz -> github-cli-1.5.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.zip -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.zip mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.mod -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.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/!make!now!just/heredoc/@v/v1.0.0.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.zip -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.zip mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.mod -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.zip -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.mod -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.zip -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.zip mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.mod -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.mod mirror://goproxy//github.com/cli/browser/@v/v1.0.0.zip -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/browser/@v/v1.0.0.mod -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.zip -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.mod -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.zip -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.mod -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/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/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/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/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.zip -> github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.mod -> github.com%2Fenescakir%2Femoji%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/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.zip -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.mod -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20200622220639-c1d9693c95a6.mod -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/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/henvic/httpretty/@v/v0.0.6.zip -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/henvic/httpretty/@v/v0.0.6.mod -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.zip -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.mod -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/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/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.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/lucasb-eyer/go-colorful/@v/v1.0.3.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.zip -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.zip -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.zip -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.zip mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.mod -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190530182044-ad28b68e88f1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.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.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=64e1cc17ceaf7bbff03ff7c90c868b41
diff --git a/metadata/md5-cache/dev-util/github-cli-1.7.0 b/metadata/md5-cache/dev-util/github-cli-1.7.0
index 8d6a33f5a8bf..00ca1d4145a5 100644
--- a/metadata/md5-cache/dev-util/github-cli-1.7.0
+++ b/metadata/md5-cache/dev-util/github-cli-1.7.0
@@ -9,5 +9,5 @@ RDEPEND=>=dev-vcs/git-1.7.3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/cli/cli/archive/v1.7.0.tar.gz -> github-cli-1.7.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.zip -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.zip mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.mod -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.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/!make!now!just/heredoc/@v/v1.0.0.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.zip -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.zip mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.mod -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.zip -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.mod -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.zip -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.zip mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.mod -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.mod mirror://goproxy//github.com/cli/browser/@v/v1.0.0.zip -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/browser/@v/v1.0.0.mod -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.zip -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.mod -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.zip -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.mod -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/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/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/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/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.zip -> github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.mod -> github.com%2Fenescakir%2Femoji%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/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.zip -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.mod -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20200622220639-c1d9693c95a6.mod -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/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/henvic/httpretty/@v/v0.0.6.zip -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/henvic/httpretty/@v/v0.0.6.mod -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.zip -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.mod -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.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/itchyny/astgen-go/@v/v0.0.0-20210113000433-0da0671862a3.zip -> github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.zip mirror://goproxy//github.com/itchyny/astgen-go/@v/v0.0.0-20210113000433-0da0671862a3.mod -> github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.mod mirror://goproxy//github.com/itchyny/go-flags/@v/v1.5.0.mod -> github.com%2Fitchyny%2Fgo-flags%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/itchyny/gojq/@v/v0.12.1.zip -> github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.zip mirror://goproxy//github.com/itchyny/gojq/@v/v0.12.1.mod -> github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.mod mirror://goproxy//github.com/itchyny/timefmt-go/@v/v0.1.1.zip -> github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/itchyny/timefmt-go/@v/v0.1.1.mod -> github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/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/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.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/lucasb-eyer/go-colorful/@v/v1.0.3.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.zip -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.zip -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.zip -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.zip mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.mod -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190530182044-ad28b68e88f1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210113181707-4bcb84eeeb78.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210113181707-4bcb84eeeb78.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.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.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4e764a4e88f4ae721673066c29da400
diff --git a/metadata/md5-cache/dev-util/github-cli-1.8.1 b/metadata/md5-cache/dev-util/github-cli-1.8.1
index 3d4d578c0a5d..1ba63470ed3b 100644
--- a/metadata/md5-cache/dev-util/github-cli-1.8.1
+++ b/metadata/md5-cache/dev-util/github-cli-1.8.1
@@ -9,5 +9,5 @@ RDEPEND=>=dev-vcs/git-1.7.3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/cli/cli/archive/v1.8.1.tar.gz -> github-cli-1.8.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.zip mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.zip -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.zip mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.zip -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.zip mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.zip -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.zip mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.mod -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.zip -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.zip mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.zip -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.zip mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.mod -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.zip -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip 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/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.zip -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.zip mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.zip -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.mod -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.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/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.zip -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.zip mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.mod -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.mod mirror://goproxy//github.com/cli/browser/@v/v1.0.0.mod -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/browser/@v/v1.1.0.zip -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cli/browser/@v/v1.1.0.mod -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.zip -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.mod -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.zip -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.mod -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.zip -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.zip mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/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.zip -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.zip 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/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.zip -> github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.mod -> github.com%2Fenescakir%2Femoji%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/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/gabriel-vasile/mimetype/@v/v1.1.2.zip -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.2.mod -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.zip -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.zip mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/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-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/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/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.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.zip -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.mod -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.zip -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20200622220639-c1d9693c95a6.zip -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.zip mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20200622220639-c1d9693c95a6.mod -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip 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.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.zip -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.zip 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.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.zip 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.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.zip 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.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.zip 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/henvic/httpretty/@v/v0.0.6.zip -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/henvic/httpretty/@v/v0.0.6.mod -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.zip -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.mod -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.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/itchyny/astgen-go/@v/v0.0.0-20210113000433-0da0671862a3.zip -> github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.zip mirror://goproxy//github.com/itchyny/astgen-go/@v/v0.0.0-20210113000433-0da0671862a3.mod -> github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.mod mirror://goproxy//github.com/itchyny/go-flags/@v/v1.5.0.zip -> github.com%2Fitchyny%2Fgo-flags%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/itchyny/go-flags/@v/v1.5.0.mod -> github.com%2Fitchyny%2Fgo-flags%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/itchyny/gojq/@v/v0.12.1.zip -> github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.zip mirror://goproxy//github.com/itchyny/gojq/@v/v0.12.1.mod -> github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.mod mirror://goproxy//github.com/itchyny/timefmt-go/@v/v0.1.1.zip -> github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/itchyny/timefmt-go/@v/v0.1.1.mod -> github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.zip -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.zip -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.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/lucasb-eyer/go-colorful/@v/v1.0.3.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.zip -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.zip 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.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/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/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/muesli/reflow/@v/v0.1.0.zip -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/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.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.zip -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.zip 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/rivo/uniseg/@v/v0.1.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.zip -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.zip mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/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.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.zip -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.zip mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.mod -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.zip 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.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.zip -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.zip mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.zip -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.zip mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190530182044-ad28b68e88f1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210113181707-4bcb84eeeb78.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210113181707-4bcb84eeeb78.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210319071255-635bc2c9138d.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210319071255-635bc2c9138d.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210319071255-635bc2c9138d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210319071255-635bc2c9138d.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-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/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.zip mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.zip -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.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.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.zip -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26b61130c8390993dcc272646d6da380
diff --git a/metadata/md5-cache/dev-util/github-cli-1.9.1 b/metadata/md5-cache/dev-util/github-cli-1.9.1
index e90c53ea0bee..ba2e33beac1c 100644
--- a/metadata/md5-cache/dev-util/github-cli-1.9.1
+++ b/metadata/md5-cache/dev-util/github-cli-1.9.1
@@ -9,5 +9,5 @@ RDEPEND=>=dev-vcs/git-1.7.3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/cli/cli/archive/v1.9.1.tar.gz -> github-cli-1.9.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.zip mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.zip -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.zip mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.zip -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.zip mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.zip -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.zip mirror://goproxy//github.com/!alec!aivazis/survey/v2/@v/v2.2.7.mod -> github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.zip -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.zip mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v1.0.0.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.zip -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.zip mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180615182759-c93bf25de8e8.mod -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.zip -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip 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/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.zip -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.zip mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.zip -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/briandowns/spinner/@v/v1.11.1.mod -> github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.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/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.zip -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.zip mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.1-0.20200724174618-1246d13c1684.mod -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.mod mirror://goproxy//github.com/cli/browser/@v/v1.0.0.mod -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/browser/@v/v1.1.0.zip -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cli/browser/@v/v1.1.0.mod -> github.com%2Fcli%2Fbrowser%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.zip -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/cli/oauth/@v/v0.8.0.mod -> github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.zip -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip mirror://goproxy//github.com/cli/shurcoo!l-graphql/@v/v0.0.0-20200707151639-0f7232a2bf7e.mod -> github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.zip -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.zip mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/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.zip -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.zip 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/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.zip -> github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/enescakir/emoji/@v/v1.0.0.mod -> github.com%2Fenescakir%2Femoji%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/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/gabriel-vasile/mimetype/@v/v1.1.2.zip -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.2.mod -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.zip -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.zip mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/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-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/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/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.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.zip -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.mod -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.zip -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20200622220639-c1d9693c95a6.zip -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.zip mirror://goproxy//github.com/graph-gophers/graphql-go/@v/v0.0.0-20200622220639-c1d9693c95a6.mod -> github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip 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.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.zip -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.zip 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.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.zip 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.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.zip 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.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.zip 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/henvic/httpretty/@v/v0.0.6.zip -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/henvic/httpretty/@v/v0.0.6.mod -> github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.zip -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180616224451-1954e6464174.mod -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.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/itchyny/astgen-go/@v/v0.0.0-20210113000433-0da0671862a3.zip -> github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.zip mirror://goproxy//github.com/itchyny/astgen-go/@v/v0.0.0-20210113000433-0da0671862a3.mod -> github.com%2Fitchyny%2Fastgen-go%2F@v%2Fv0.0.0-20210113000433-0da0671862a3.mod mirror://goproxy//github.com/itchyny/go-flags/@v/v1.5.0.zip -> github.com%2Fitchyny%2Fgo-flags%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/itchyny/go-flags/@v/v1.5.0.mod -> github.com%2Fitchyny%2Fgo-flags%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/itchyny/gojq/@v/v0.12.1.zip -> github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.zip mirror://goproxy//github.com/itchyny/gojq/@v/v0.12.1.mod -> github.com%2Fitchyny%2Fgojq%2F@v%2Fv0.12.1.mod mirror://goproxy//github.com/itchyny/timefmt-go/@v/v0.1.1.zip -> github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/itchyny/timefmt-go/@v/v0.1.1.mod -> github.com%2Fitchyny%2Ftimefmt-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.zip -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.zip -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.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/lucasb-eyer/go-colorful/@v/v1.0.3.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20200706080929-d51e80ef957d.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.zip -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.zip 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.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/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/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/muesli/reflow/@v/v0.1.0.zip -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/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.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.zip -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.zip 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/rivo/uniseg/@v/v0.1.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.zip -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.zip mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/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.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.zip -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.zip mirror://goproxy//github.com/shurcoo!l/githubv4/@v/v0.0.0-20200928013246-d292edc3691b.mod -> github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.zip 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.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.zip -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.zip mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.zip -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.zip mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190530182044-ad28b68e88f1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210113181707-4bcb84eeeb78.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210113181707-4bcb84eeeb78.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210319071255-635bc2c9138d.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210319071255-635bc2c9138d.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210319071255-635bc2c9138d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210319071255-635bc2c9138d.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-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/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.zip mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.zip -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.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.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.zip -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26b61130c8390993dcc272646d6da380
diff --git a/metadata/md5-cache/dev-util/github-cli-9999 b/metadata/md5-cache/dev-util/github-cli-9999
index 2bbf0afefbb5..ae48b6ae5e66 100644
--- a/metadata/md5-cache/dev-util/github-cli-9999
+++ b/metadata/md5-cache/dev-util/github-cli-9999
@@ -8,5 +8,5 @@ PROPERTIES=live
 RDEPEND=>=dev-vcs/git-1.7.3
 RESTRICT=strip
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0597d578d2c92dc1e2248c492f724b38
diff --git a/metadata/md5-cache/dev-util/gnome-devel-docs-40.3 b/metadata/md5-cache/dev-util/gnome-devel-docs-40.3
new file mode 100644
index 000000000000..209a77914c21
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gnome-devel-docs-40.3
@@ -0,0 +1,13 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Documentation for developing for the GNOME desktop environment
+EAPI=7
+HOMEPAGE=https://developer.gnome.org/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-devel-docs/40/gnome-devel-docs-40.3.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=72be41116bfd30fde758283ddc519290
diff --git a/metadata/md5-cache/dev-util/ltrace-0.7.3.6.1 b/metadata/md5-cache/dev-util/ltrace-0.7.3.6.1
index ba72c23cedff..3192498f7016 100644
--- a/metadata/md5-cache/dev-util/ltrace-0.7.3.6.1
+++ b/metadata/md5-cache/dev-util/ltrace-0.7.3.6.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) elibc_musl? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2 mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.1.debian.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fda62e92eb4623cf5dfa0cdbc66ad4ab
+_md5_=c258aa8f979e8f97d117a8b85f17fcfc
diff --git a/metadata/md5-cache/dev-util/ltrace-0.7.3_p4-r1 b/metadata/md5-cache/dev-util/ltrace-0.7.3_p4-r1
index 1b8e9432d53f..54e7d417521e 100644
--- a/metadata/md5-cache/dev-util/ltrace-0.7.3_p4-r1
+++ b/metadata/md5-cache/dev-util/ltrace-0.7.3_p4-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) elibc_musl? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2 mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-4.debian.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=46af47d756011ed760d89b6230ee7458
+_md5_=9a7f0437ee04e5a1ed2ad40b393572ff
diff --git a/metadata/md5-cache/dev-util/mage-1.11.0 b/metadata/md5-cache/dev-util/mage-1.11.0
new file mode 100644
index 000000000000..c48049f806f7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/mage-1.11.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=make/rake like tool using go
+EAPI=7
+HOMEPAGE=https://magefile.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/magefile/mage/archive/v1.11.0.tar.gz -> mage-1.11.0.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=9fec69034ff802169b1228dc71aa7a5f
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.0 b/metadata/md5-cache/dev-util/ninja-1.10.0
index 750c57a61641..2b4d840122f9 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.0
+++ b/metadata/md5-cache/dev-util/ninja-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz -> ninja-1.10.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f06f6509db9fdac60f17dd00eeefa2dc
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.1 b/metadata/md5-cache/dev-util/ninja-1.10.1
index 3d5aca4ef885..3cd813b7d68b 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.1
+++ b/metadata/md5-cache/dev-util/ninja-1.10.1
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.1.tar.gz -> ninja-1.10.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b39d507293cbc54aeb83eee91cabc17
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.2 b/metadata/md5-cache/dev-util/ninja-1.10.2
index 83b4f31f6b50..eecb5778ad52 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.2
+++ b/metadata/md5-cache/dev-util/ninja-1.10.2
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.2.tar.gz -> ninja-1.10.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1fde879fb4317751a0633e81151ef05
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.2-r1 b/metadata/md5-cache/dev-util/ninja-1.10.2-r1
index 8b84afc75a3e..93b25fb8f367 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.2-r1
+++ b/metadata/md5-cache/dev-util/ninja-1.10.2-r1
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.2.tar.gz -> ninja-1.10.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3718dd89b95c34334e2addf9eac9d69a
diff --git a/metadata/md5-cache/dev-util/ninja-9999 b/metadata/md5-cache/dev-util/ninja-9999
index 00d7dd49f989..be9d11c53ff6 100644
--- a/metadata/md5-cache/dev-util/ninja-9999
+++ b/metadata/md5-cache/dev-util/ninja-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=139af70ef1ff78e1e66d5793dec1a9f2
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89-r1
index 819b6b770ba5..367eb4d5ec67 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89-r1
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-10.2.89 media-libs/freeglut examples? ( me
 RESTRICT=test
 SLOT=0/10.2.89
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61ee58020557a37f6fe2fde3a5e5a5aa
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1
index 23e5791d1c3c..e8c5516eda7a 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1
@@ -1,7 +1,8 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=~dev-util/nvidia-cuda-toolkit-8.0.61 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-375.26[uvm(+)] mpi? ( virtual/mpi ) ) virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=~dev-util/nvidia-cuda-toolkit-8.0.61 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-375.26[uvm(+)] mpi? ( virtual/mpi ) )
 DESCRIPTION=NVIDIA CUDA Software Development Kit
-EAPI=6
+EAPI=7
 HOMEPAGE=https://developer.nvidia.com/cuda-zone
 IUSE=+cuda debug +doc +examples opencl mpi
 KEYWORDS=~amd64 ~amd64-linux
@@ -10,5 +11,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-8.0.61 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run -> cuda_8.0.61_375.26_linux.run
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d09f387d2e1a3b0d986224672c75cf60
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fbccf13da18fde9f1ec628192542ecab
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88-r1
index 695050a8541b..a74a92c5ffd8 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88-r1
@@ -1,7 +1,8 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-396.24[uvm(+)] mpi? ( virtual/mpi ) ) virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-396.24[uvm(+)] mpi? ( virtual/mpi ) )
 DESCRIPTION=NVIDIA CUDA Software Development Kit
-EAPI=6
+EAPI=7
 HOMEPAGE=https://developer.nvidia.com/cuda-zone
 IUSE=+cuda debug +doc +examples opencl mpi
 KEYWORDS=~amd64 ~amd64-linux
@@ -10,5 +11,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a0e8b1d5a4710a8d7b081e9582e4146e
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4e30c4e884415c7099fd7065d1cb1324
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r3 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r3
index 03fc2458a180..5a3dcba1210a 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r3
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r3
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-440.33.01 debugger? (
 RESTRICT=bindist mirror
 SLOT=0/10.2.89
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0618e2c6d2d2b367f01c20021e7f03e0
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=88b6e548c1e3d9f9eb2fce0f8fbd6611
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1-r2
index a77139d7c3f3..444c1bacc014 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1-r2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1-r2
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-455.32.00 debugg
 RESTRICT=bindist mirror
 SLOT=0/11.1.1
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=213da99e26e958fc750ead217c8058a8
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=4370cf6bc16f771445333d4eafdcfcfc
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.0-r3 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.0-r3
index 925e8e0ff97a..c0f74d7d6c0f 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.0-r3
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.0-r3
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-460.27.04 debugg
 RESTRICT=bindist mirror
 SLOT=0/11.2.0
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.2.0/local_installers/cuda_11.2.0_460.27.04_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=de4f299eb0ef3626a422a07e63dad11f
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=66a12e5a4baeebb24b631790d145abb1
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.2
index 729dd2df6624..f7260023c9fb 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.2
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-460.32.03 debugg
 RESTRICT=bindist mirror
 SLOT=0/11.2.2
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.2.2/local_installers/cuda_11.2.2_460.32.03_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d90bcafabf421f1ec14cd9b1568c6627
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=8ce50ba2fb6d73dcad60d8f8d957367b
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.0-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.0-r1
index 76979d60c88b..2f5c05865eb3 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.0-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.0-r1
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-465.19.01 debugg
 RESTRICT=bindist mirror
 SLOT=0/11.3.0
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.3.0/local_installers/cuda_11.3.0_465.19.01_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b93956dabe00e31f50490a5ca101d132
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=f08238fbe503d555270c7cd3ca234dff
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.1
index 6e3fa9effb35..1648231516bd 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.1
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-465.19.01 debugg
 RESTRICT=bindist mirror
 SLOT=0/11.3.1
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.3.1/local_installers/cuda_11.3.1_465.19.01_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7428b78457ab243afc734da4c8e44fa8
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=8a28a0d95b25baacee79ca09698f5480
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.0 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.0
index 0085519afb96..770688d27c8f 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.0
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.0
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-470.42.01 debugg
 RESTRICT=bindist mirror
 SLOT=0/11.4.0
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.4.0/local_installers/cuda_11.4.0_470.42.01_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85e39f6ffa5b1ca8a3adb821dab9e749
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=f34485b9ece11b6960f8f067fed31c85
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1
index 145d1fd0d641..43e529ad96e6 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst prepare pretend setup unpack
 DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
-EAPI=6
+EAPI=7
 HOMEPAGE=https://developer.nvidia.com/cuda-zone
 IUSE=debugger doc eclipse profiler
 KEYWORDS=-* ~amd64 ~amd64-linux
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-8[cxx] >=x11-drivers/nvidia-drivers-396.26 debugger? ( sy
 RESTRICT=bindist mirror
 SLOT=0/9.2.88
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e107e7505d914da51ebab56110c55e6f
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=ca2cec901adb39d17fe7d12910b88d28
diff --git a/metadata/md5-cache/dev-util/perf-5.10.16 b/metadata/md5-cache/dev-util/perf-5.10.16
index 7756c1d6ef85..537c5748d568 100644
--- a/metadata/md5-cache/dev-util/perf-5.10.16
+++ b/metadata/md5-cache/dev-util/perf-5.10.16
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.16.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ff4b008c649a90f3a3d164f677b6eee8
diff --git a/metadata/md5-cache/dev-util/perf-5.11 b/metadata/md5-cache/dev-util/perf-5.11
index 2ccc9583c4f9..bd7382857b03 100644
--- a/metadata/md5-cache/dev-util/perf-5.11
+++ b/metadata/md5-cache/dev-util/perf-5.11
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6110d2d7d91e7826e6f35c8f19015eb
diff --git a/metadata/md5-cache/dev-util/perf-5.12 b/metadata/md5-cache/dev-util/perf-5.12
index 846a0f0f1d92..a2c121ea6479 100644
--- a/metadata/md5-cache/dev-util/perf-5.12
+++ b/metadata/md5-cache/dev-util/perf-5.12
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) crypt?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7c0f66e8a3035d0ba2344ad69a88e0b8
diff --git a/metadata/md5-cache/dev-util/perf-5.8 b/metadata/md5-cache/dev-util/perf-5.8
index ca7b7e579406..4d0e59df66d9 100644
--- a/metadata/md5-cache/dev-util/perf-5.8
+++ b/metadata/md5-cache/dev-util/perf-5.8
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c24843544e3419ec451e83f497a3db5
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2021.1.2 b/metadata/md5-cache/dev-util/pycharm-community-2021.1.2
deleted file mode 100644
index 10943c4e3634..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-community-2021.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=7
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-IUSE=+bundled-jdk
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
-RDEPEND=!bundled-jdk? ( >=virtual/jre-1.8 ) dev-libs/libdbusmenu dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-community-2021.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f77a1a9dcfb52fe70c1287bfb046d8ed
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2021.1.2-r1 b/metadata/md5-cache/dev-util/pycharm-community-2021.1.2-r1
new file mode 100644
index 000000000000..a05e970c479b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-community-2021.1.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install postinst postrm prepare
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=7
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+IUSE=+bundled-jdk
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
+RDEPEND=!bundled-jdk? ( >=virtual/jre-1.8 ) app-arch/brotli app-arch/zstd app-crypt/p11-kit dev-libs/fribidi dev-libs/glib dev-libs/json-c dev-libs/libbsd dev-libs/libdbusmenu dev-libs/nss dev-python/pip media-fonts/dejavu media-gfx/graphite2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2= media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:0= net-libs/gnutls net-print/cups sys-apps/dbus sys-libs/libcap sys-libs/zlib virtual/jpeg:0= x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2021.1.2.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7823e7ab04caedf3a3eb2b1a75886ed9
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2021.1.2 b/metadata/md5-cache/dev-util/pycharm-professional-2021.1.2
deleted file mode 100644
index fa209d53f99f..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-professional-2021.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=7
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-IUSE=+bundled-jdk
-KEYWORDS=amd64 x86
-LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
-RDEPEND=!bundled-jdk? ( >=virtual/jre-1.8 ) dev-libs/libdbusmenu dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2021.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=de571f208e055b6d3239081f64a07af1
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2021.1.2-r1 b/metadata/md5-cache/dev-util/pycharm-professional-2021.1.2-r1
new file mode 100644
index 000000000000..2f08f440468a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2021.1.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install postinst postrm prepare
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=7
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+IUSE=+bundled-jdk
+KEYWORDS=amd64 x86
+LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
+RDEPEND=!bundled-jdk? ( >=virtual/jre-1.8 ) app-arch/brotli app-arch/zstd app-crypt/p11-kit dev-libs/fribidi dev-libs/glib dev-libs/json-c dev-libs/libbsd dev-libs/libdbusmenu dev-libs/nss dev-python/pip media-fonts/dejavu media-gfx/graphite2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2= media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:0= net-libs/gnutls net-print/cups sys-apps/dbus sys-libs/libcap sys-libs/zlib virtual/jpeg:0= x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2021.1.2.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ba16a3f46e46681f454b538c9b5ce5f7
diff --git a/metadata/md5-cache/dev-util/quilt-0.66 b/metadata/md5-cache/dev-util/quilt-0.66
index 1891298197a5..d3b595213fd5 100644
--- a/metadata/md5-cache/dev-util/quilt-0.66
+++ b/metadata/md5-cache/dev-util/quilt-0.66
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/ed dev-util/diffstat graphviz? ( media-gfx/graphviz ) elibc_Dar
 RESTRICT=test
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/quilt/quilt-0.66.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=076fc8cb770925674502b5d35f389299
diff --git a/metadata/md5-cache/dev-util/quilt-0.66-r1 b/metadata/md5-cache/dev-util/quilt-0.66-r1
index ad48063ef22a..7727484d85a3 100644
--- a/metadata/md5-cache/dev-util/quilt-0.66-r1
+++ b/metadata/md5-cache/dev-util/quilt-0.66-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/ed dev-util/diffstat graphviz? ( media-gfx/graphviz ) elibc_Dar
 RESTRICT=test
 SLOT=0
 SRC_URI=https://savannah.nongnu.orgdownload/quilt/quilt-0.66.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b2bdd6893fa8b28154cfdfb2df8af0c
diff --git a/metadata/md5-cache/dev-util/quilt-9999 b/metadata/md5-cache/dev-util/quilt-9999
index d2ea7d020fc7..116e6db09f2c 100644
--- a/metadata/md5-cache/dev-util/quilt-9999
+++ b/metadata/md5-cache/dev-util/quilt-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-util/diffstat mail-mta/sendmail sys-apps/ed elibc_Darwin? ( app-misc/getopt ) elibc_SunOS? ( app-misc/getopt ) >=sys-apps/coreutils-8.32-r1 graphviz? ( media-gfx/graphviz )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=636c8e0dde49da4d49212e66386877e6
diff --git a/metadata/md5-cache/dev-util/radare2-4.5.1-r1 b/metadata/md5-cache/dev-util/radare2-4.5.1-r1
index d4dff1fc3fd6..e6ebdf6805e7 100644
--- a/metadata/md5-cache/dev-util/radare2-4.5.1-r1
+++ b/metadata/md5-cache/dev-util/radare2-4.5.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libzip dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/radareorg/radare2/archive/4.5.1.tar.gz -> radare2-4.5.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=164a61b83cf93ce857a008743be4a899
diff --git a/metadata/md5-cache/dev-util/radare2-5.3.1 b/metadata/md5-cache/dev-util/radare2-5.3.1
index d8ec1ef48753..881de2696fde 100644
--- a/metadata/md5-cache/dev-util/radare2-5.3.1
+++ b/metadata/md5-cache/dev-util/radare2-5.3.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libzip dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/radareorg/radare2/archive/5.3.1.tar.gz -> radare2-5.3.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a512a11440acfb05ef3a12fec76a7a39
diff --git a/metadata/md5-cache/dev-util/radare2-9999 b/metadata/md5-cache/dev-util/radare2-9999
index 769e4e56480a..67291b135c88 100644
--- a/metadata/md5-cache/dev-util/radare2-9999
+++ b/metadata/md5-cache/dev-util/radare2-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/libzip dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( dev-libs/openssl:0= )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a512a11440acfb05ef3a12fec76a7a39
diff --git a/metadata/md5-cache/dev-util/rebar-2.6.4-r1 b/metadata/md5-cache/dev-util/rebar-2.6.4-r1
index 09a7965dfd3d..e7a8f2e80a0a 100644
--- a/metadata/md5-cache/dev-util/rebar-2.6.4-r1
+++ b/metadata/md5-cache/dev-util/rebar-2.6.4-r1
@@ -8,5 +8,5 @@ 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	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7f3975dce8a7548f3073542be1180b9
diff --git a/metadata/md5-cache/dev-util/rt-tests-1.10 b/metadata/md5-cache/dev-util/rt-tests-1.10
deleted file mode 100644
index 0c6a97982426..000000000000
--- a/metadata/md5-cache/dev-util/rt-tests-1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-process/numactl
-DESCRIPTION=A collection of latency testing tools for the linux(-rt) kernel
-EAPI=7
-HOMEPAGE=https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2 GPL-2+ LGPL-2.1+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-process/numactl
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://kernel.org/pub/linux/utils/rt-tests/rt-tests-1.10.tar.xz https://kernel.org/pub/linux/utils/rt-tests/older/rt-tests-1.10.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d83312ad9120fe0d792b65e905f144a5
diff --git a/metadata/md5-cache/dev-util/rt-tests-2.1 b/metadata/md5-cache/dev-util/rt-tests-2.1
new file mode 100644
index 000000000000..c11d2e0d29ba
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rt-tests-2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) sys-process/numactl
+DESCRIPTION=A collection of latency testing tools for the linux(-rt) kernel
+EAPI=7
+HOMEPAGE=https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 GPL-2+ LGPL-2.1+
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) sys-process/numactl
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://kernel.org/pub/linux/utils/rt-tests/rt-tests-2.1.tar.xz https://kernel.org/pub/linux/utils/rt-tests/older/rt-tests-2.1.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=785262da8c05d11c2aa1773a56ab8112
diff --git a/metadata/md5-cache/dev-util/rustup-1.24.3 b/metadata/md5-cache/dev-util/rustup-1.24.3
index a849b05295d9..03f412afa7ba 100644
--- a/metadata/md5-cache/dev-util/rustup-1.24.3
+++ b/metadata/md5-cache/dev-util/rustup-1.24.3
@@ -11,5 +11,5 @@ 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.24.3.tar.gz -> rustup-1.24.3.tar.gz https://github.com/rbtcollins/home/archive/a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz -> home-a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.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.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/async-compression/0.3.7/download -> async-compression-0.3.7.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/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/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.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.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.6.1/download -> bumpalo-3.6.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/cast5/0.8.0/download -> cast5-0.8.0.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.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.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/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.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.3/download -> crossbeam-epoch-0.9.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download -> crossbeam-utils-0.8.3.crate https://crates.io/api/v1/crates/curl/0.4.35/download -> curl-0.4.35.crate https://crates.io/api/v1/crates/curl-sys/0.4.41+curl-7.75.0/download -> curl-sys-0.4.41+curl-7.75.0.crate https://crates.io/api/v1/crates/curve25519-dalek/3.0.2/download -> curve25519-dalek-3.0.2.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.9.0/download -> digest-0.9.0.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.28/download -> encoding_rs-0.8.28.crate https://crates.io/api/v1/crates/enum-map/1.1.0/download -> enum-map-1.1.0.crate https://crates.io/api/v1/crates/enum-map-derive/0.5.0/download -> enum-map-derive-0.5.0.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/filetime/0.2.14/download -> filetime-0.2.14.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/futures-channel/0.3.13/download -> futures-channel-0.3.13.crate https://crates.io/api/v1/crates/futures-core/0.3.13/download -> futures-core-0.3.13.crate https://crates.io/api/v1/crates/futures-io/0.3.13/download -> futures-io-0.3.13.crate https://crates.io/api/v1/crates/futures-macro/0.3.13/download -> futures-macro-0.3.13.crate https://crates.io/api/v1/crates/futures-sink/0.3.13/download -> futures-sink-0.3.13.crate https://crates.io/api/v1/crates/futures-task/0.3.13/download -> futures-task-0.3.13.crate https://crates.io/api/v1/crates/futures-util/0.3.13/download -> futures-util-0.3.13.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.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.3.2/download -> h2-0.3.2.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/http/0.2.3/download -> http-0.2.3.crate https://crates.io/api/v1/crates/httparse/1.3.5/download -> httparse-1.3.5.crate https://crates.io/api/v1/crates/http-body/0.4.1/download -> http-body-0.4.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.14.5/download -> hyper-0.14.5.crate https://crates.io/api/v1/crates/hyper-rustls/0.22.1/download -> hyper-rustls-0.22.1.crate https://crates.io/api/v1/crates/hyper-tls/0.5.0/download -> hyper-tls-0.5.0.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.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/ipnet/2.3.0/download -> ipnet-2.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/js-sys/0.3.50/download -> js-sys-0.3.50.crate https://crates.io/api/v1/crates/keccak/0.1.0/download -> keccak-0.1.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.93/download -> libc-0.2.93.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.14/download -> log-0.4.14.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/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/md-5/0.9.1/download -> md-5-0.9.1.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memoffset/0.6.3/download -> memoffset-0.6.3.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.11/download -> mio-0.7.11.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/native-tls/0.2.7/download -> native-tls-0.2.7.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.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.1/download -> num-bigint-dig-0.6.1.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.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/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.33/download -> openssl-0.10.33.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.15.0+1.1.1k/download -> openssl-src-111.15.0+1.1.1k.crate https://crates.io/api/v1/crates/openssl-sys/0.9.61/download -> openssl-sys-0.9.61.crate https://crates.io/api/v1/crates/pem/0.8.3/download -> pem-0.8.3.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/pgp/0.7.1/download -> pgp-0.7.1.crate https://crates.io/api/v1/crates/pin-project/1.0.6/download -> pin-project-1.0.6.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.6/download -> pin-project-internal-1.0.6.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.6/download -> pin-project-lite-0.2.6.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/pulldown-cmark/0.8.0/download -> pulldown-cmark-0.8.0.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/regex/1.4.5/download -> regex-1.4.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.23/download -> regex-syntax-0.6.23.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/remove_dir_all/0.7.0/download -> remove_dir_all-0.7.0.crate https://crates.io/api/v1/crates/reqwest/0.11.2/download -> reqwest-0.11.2.crate https://crates.io/api/v1/crates/retry/1.2.1/download -> retry-1.2.1.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.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/rustls/0.19.0/download -> rustls-0.19.0.crate https://crates.io/api/v1/crates/rustls-native-certs/0.5.0/download -> rustls-native-certs-0.5.0.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/sct/0.6.0/download -> sct-0.6.0.crate https://crates.io/api/v1/crates/security-framework/2.2.0/download -> security-framework-2.2.0.crate https://crates.io/api/v1/crates/security-framework-sys/2.2.0/download -> security-framework-sys-2.2.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha-1/0.9.4/download -> sha-1-0.9.4.crate https://crates.io/api/v1/crates/sha2/0.9.3/download -> sha2-0.9.3.crate https://crates.io/api/v1/crates/sha3/0.9.1/download -> sha3-0.9.1.crate https://crates.io/api/v1/crates/sharded-slab/0.1.1/download -> sharded-slab-0.1.1.crate https://crates.io/api/v1/crates/signature/1.3.0/download -> signature-1.3.0.crate https://crates.io/api/v1/crates/simple_asn1/0.4.1/download -> simple_asn1-0.4.1.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/socket2/0.4.0/download -> socket2-0.4.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/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.4.0/download -> subtle-2.4.0.crate https://crates.io/api/v1/crates/syn/1.0.68/download -> syn-1.0.68.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.33/download -> tar-0.4.33.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.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.24/download -> thiserror-1.0.24.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.24/download -> thiserror-impl-1.0.24.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.4.0/download -> tokio-1.4.0.crate https://crates.io/api/v1/crates/tokio-native-tls/0.3.0/download -> tokio-native-tls-0.3.0.crate https://crates.io/api/v1/crates/tokio-rustls/0.22.0/download -> tokio-rustls-0.22.0.crate https://crates.io/api/v1/crates/tokio-socks/0.5.1/download -> tokio-socks-0.5.1.crate https://crates.io/api/v1/crates/tokio-util/0.6.5/download -> tokio-util-0.6.5.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.25/download -> tracing-0.1.25.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.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_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.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.73/download -> wasm-bindgen-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.73/download -> wasm-bindgen-backend-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.23/download -> wasm-bindgen-futures-0.4.23.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.73/download -> wasm-bindgen-macro-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.73/download -> wasm-bindgen-macro-support-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.73/download -> wasm-bindgen-shared-0.2.73.crate https://crates.io/api/v1/crates/webpki/0.21.4/download -> webpki-0.21.4.crate https://crates.io/api/v1/crates/web-sys/0.3.50/download -> web-sys-0.3.50.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.7.0/download -> winreg-0.7.0.crate https://crates.io/api/v1/crates/winreg/0.8.0/download -> winreg-0.8.0.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.2.0/download -> zeroize-1.2.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.0.1/download -> zeroize_derive-1.0.1.crate https://crates.io/api/v1/crates/zstd/0.6.1+zstd.1.4.9/download -> zstd-0.6.1+zstd.1.4.9.crate https://crates.io/api/v1/crates/zstd-safe/3.0.1+zstd.1.4.9/download -> zstd-safe-3.0.1+zstd.1.4.9.crate https://crates.io/api/v1/crates/zstd-sys/1.4.20+zstd.1.4.9/download -> zstd-sys-1.4.20+zstd.1.4.9.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e34845abeb9abaa31349617d6a87bec5
diff --git a/metadata/md5-cache/dev-util/rustup-9999 b/metadata/md5-cache/dev-util/rustup-9999
index b2a54edbc17e..dbffa503dc6f 100644
--- a/metadata/md5-cache/dev-util/rustup-9999
+++ b/metadata/md5-cache/dev-util/rustup-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-arch/xz-utils net-misc/curl:=[http2,ssl] dev-libs/openssl:0=
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=89783dd2d54617b25ef5eaa3ca07f273
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r1 b/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r1
index bdcd87e9b8a1..8e0913432a67 100644
--- a/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r1
+++ b/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.42.0:= >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/b
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.10.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.10-12.debian.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7831e98a07c39ce3092351d8d90d788e
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.10_p7-r1 b/metadata/md5-cache/dev-util/schroot-1.6.10_p7-r1
index dc09944a25e6..b2c8033c7720 100644
--- a/metadata/md5-cache/dev-util/schroot-1.6.10_p7-r1
+++ b/metadata/md5-cache/dev-util/schroot-1.6.10_p7-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.42.0:= >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/b
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.10.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.10-7.debian.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3453fd2decd252b4f27b9d9f75c381ab
diff --git a/metadata/md5-cache/dev-util/shards-0.14.1 b/metadata/md5-cache/dev-util/shards-0.14.1
deleted file mode 100644
index 24c3692ecd23..000000000000
--- a/metadata/md5-cache/dev-util/shards-0.14.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>dev-lang/crystal-0.11.1[yaml]
-DESCRIPTION=Dependency manager for the Crystal language
-EAPI=7
-HOMEPAGE=https://github.com/crystal-lang/shards
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>dev-lang/crystal-0.11.1[yaml]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/shards/archive/v0.14.1.tar.gz -> shards-0.14.1.tar.gz https://github.com/crystal-lang/crystal-molinillo/archive/v0.1.0.tar.gz -> crystal-molinillo-0.1.0.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7cfc734149f7ab5a07e2676813ccf6c5
diff --git a/metadata/md5-cache/dev-util/shellcheck-0.7.2 b/metadata/md5-cache/dev-util/shellcheck-0.7.2
index 66fca4978113..cfcbdc8c3746 100644
--- a/metadata/md5-cache/dev-util/shellcheck-0.7.2
+++ b/metadata/md5-cache/dev-util/shellcheck-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/diff-0.2.0:=[profile?] >=dev
 RESTRICT=!test? ( test )
 SLOT=0/0.7.2
 SRC_URI=https://hackage.haskell.org/package/ShellCheck-0.7.2/ShellCheck-0.7.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2dd6b98b998d683acfdfeaddbf4e1ee6
diff --git a/metadata/md5-cache/dev-util/shelltestrunner-1.9 b/metadata/md5-cache/dev-util/shelltestrunner-1.9
index c5fe1ea1bfb3..7e1ddcc0df37 100644
--- a/metadata/md5-cache/dev-util/shelltestrunner-1.9
+++ b/metadata/md5-cache/dev-util/shelltestrunner-1.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cmdargs-0.7:= >=dev-haskell/diff-0.2.0:= >=dev-haskell/fil
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/shelltestrunner-1.9/shelltestrunner-1.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=973b4e28495f2a2f45ecd7b802a4236f
diff --git a/metadata/md5-cache/dev-util/source-highlight-3.1.9-r1 b/metadata/md5-cache/dev-util/source-highlight-3.1.9-r1
index 01af28515e99..c53eb6225e81 100644
--- a/metadata/md5-cache/dev-util/source-highlight-3.1.9-r1
+++ b/metadata/md5-cache/dev-util/source-highlight-3.1.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.62.0:=[threads(+)] dev-util/ctags
 SLOT=0
 SRC_URI=mirror://gnu/src-highlite/source-highlight-3.1.9.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a297dd3a5c69ff78550f9271f54f481
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-12.0.0 b/metadata/md5-cache/dev-util/spirv-llvm-translator-12.0.0
new file mode 100644
index 000000000000..fc02b2cb2103
--- /dev/null
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-12.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/lit ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/clang:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
+DESCRIPTION=Bi-directional translator between SPIR-V and LLVM IR
+EAPI=7
+HOMEPAGE=https://github.com/KhronosGroup/SPIRV-LLVM-Translator
+IUSE=test +tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=UoI-NCSA
+RDEPEND=sys-devel/clang:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
+SLOT=12
+SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v12.0.0.tar.gz -> spirv-llvm-translator-12.0.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=689bf3dd84b530aa910f4d002f01e1e9
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.107.0 b/metadata/md5-cache/dev-util/stripe-mock-0.107.0
index 484ecf4a1e16..e320349b0586 100644
--- a/metadata/md5-cache/dev-util/stripe-mock-0.107.0
+++ b/metadata/md5-cache/dev-util/stripe-mock-0.107.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install test unpack
 DESCRIPTION=Mock HTTP server that responds like the real Stripe API
 EAPI=7
 HOMEPAGE=https://github.com/stripe/stripe-mock
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT ISC BSD-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.107.0.tar.gz -> stripe-mock-0.107.0.tar.gz
 _eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec
-_md5_=8c8ea1a8cbd7fa4eaf5ee80824e7625f
+_md5_=edc7a7d9c151160b84af7379b6ae49f9
diff --git a/metadata/md5-cache/dev-util/sysdig-0.27.0 b/metadata/md5-cache/dev-util/sysdig-0.27.0
index 72cb98b4dd79..fbca57424623 100644
--- a/metadata/md5-cache/dev-util/sysdig-0.27.0
+++ b/metadata/md5-cache/dev-util/sysdig-0.27.0
@@ -12,5 +12,5 @@ RDEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.0.tar.gz -> sysdig-0.27.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c1712efd00b515ebb542c0e12b1eed11
diff --git a/metadata/md5-cache/dev-util/sysdig-0.27.1 b/metadata/md5-cache/dev-util/sysdig-0.27.1
index 06a2a7a67664..e1153741d80b 100644
--- a/metadata/md5-cache/dev-util/sysdig-0.27.1
+++ b/metadata/md5-cache/dev-util/sysdig-0.27.1
@@ -12,5 +12,5 @@ RDEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.1.tar.gz -> sysdig-0.27.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c1712efd00b515ebb542c0e12b1eed11
diff --git a/metadata/md5-cache/dev-util/sysdig-0.27.1-r100 b/metadata/md5-cache/dev-util/sysdig-0.27.1-r100
index 2b470988b2fa..40afcf78f042 100644
--- a/metadata/md5-cache/dev-util/sysdig-0.27.1-r100
+++ b/metadata/md5-cache/dev-util/sysdig-0.27.1-r100
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.1.tar.gz -> sysdig-0.27.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=003897d6d1f6fc4b99e1748acc6fd1cd
diff --git a/metadata/md5-cache/dev-util/systemtap-4.0-r1 b/metadata/md5-cache/dev-util/systemtap-4.0-r1
deleted file mode 100644
index b299e0b934f3..000000000000
--- a/metadata/md5-cache/dev-util/systemtap-4.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-util/dejagnu ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi ) app-arch/cpio app-text/xmlto python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) >=sys-devel/gettext-0.18.2 libvirt? ( dev-libs/libxml2 )
-DESCRIPTION=A linux trace/probe tool
-EAPI=7
-HOMEPAGE=https://www.sourceware.org/systemtap/
-IUSE=libvirt selinux sqlite +ssl test zeroconf kernel_linux +python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=f4fb891067165a9f6fd36040d91a5498
diff --git a/metadata/md5-cache/dev-util/systemtap-4.0-r2 b/metadata/md5-cache/dev-util/systemtap-4.0-r2
deleted file mode 100644
index 653f81f54e8a..000000000000
--- a/metadata/md5-cache/dev-util/systemtap-4.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-util/dejagnu ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= 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] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi ) app-arch/cpio app-text/xmlto python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) >=sys-devel/gettext-0.18.2 libvirt? ( dev-libs/libxml2 )
-DESCRIPTION=A linux trace/probe tool
-EAPI=7
-HOMEPAGE=https://www.sourceware.org/systemtap/
-IUSE=libvirt selinux sqlite +ssl test zeroconf kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= 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] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi ) acct-group/stapdev acct-group/stapsys acct-group/stapusr
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=428e4b6ed7508482fcb7549b7488a82b
diff --git a/metadata/md5-cache/dev-util/systemtap-4.4 b/metadata/md5-cache/dev-util/systemtap-4.4
index b7b3feb290a4..32e6d68ac1b0 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.4
+++ b/metadata/md5-cache/dev-util/systemtap-4.4
@@ -5,7 +5,7 @@ DESCRIPTION=A linux trace/probe tool
 EAPI=7
 HOMEPAGE=https://www.sourceware.org/systemtap/
 IUSE=libvirt selinux sqlite +ssl test zeroconf kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= 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] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi ) acct-group/stapdev acct-group/stapsys acct-group/stapusr
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.4.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c1d78404135551d0e778b8059a4119d
+_md5_=72ec240e14a479b4220100067a7c17ca
diff --git a/metadata/md5-cache/dev-util/trace-cmd-2.9.1 b/metadata/md5-cache/dev-util/trace-cmd-2.9.1
index 9e37c60634e7..214dcc8b97f6 100644
--- a/metadata/md5-cache/dev-util/trace-cmd-2.9.1
+++ b/metadata/md5-cache/dev-util/trace-cmd-2.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) test
 SLOT=0/2.9.1
 SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v2.9.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=21d62ebda4dae5fb77e22a3c46cc3e2d
diff --git a/metadata/md5-cache/dev-util/uftrace-0.10 b/metadata/md5-cache/dev-util/uftrace-0.10
index b5100e1f285a..87eb76110be3 100644
--- a/metadata/md5-cache/dev-util/uftrace-0.10
+++ b/metadata/md5-cache/dev-util/uftrace-0.10
@@ -11,5 +11,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/namhyung/uftrace/archive/v0.10.tar.gz -> uftrace-0.10.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69a7259bae43476a52f90027e0638aa1
diff --git a/metadata/md5-cache/dev-util/uncrustify-0.71.0 b/metadata/md5-cache/dev-util/uncrustify-0.71.0
index 4f0f5721d1f7..17a6dfdcc940 100644
--- a/metadata/md5-cache/dev-util/uncrustify-0.71.0
+++ b/metadata/md5-cache/dev-util/uncrustify-0.71.0
@@ -1,6 +1,5 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=test? ( || ( dev-lang/python:3.8 ) ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( || ( dev-lang/python:3.8 ) )
 DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
 EAPI=7
 HOMEPAGE=http://uncrustify.sourceforge.net/
@@ -11,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.71.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=366ff34fd5f4173504e26ca0d953295e
+_md5_=5b89e4efb3965f492f375ef90b7a7cb2
diff --git a/metadata/md5-cache/dev-util/uncrustify-0.72.0 b/metadata/md5-cache/dev-util/uncrustify-0.72.0
index cf56bb50973c..3d8414e319a2 100644
--- a/metadata/md5-cache/dev-util/uncrustify-0.72.0
+++ b/metadata/md5-cache/dev-util/uncrustify-0.72.0
@@ -1,6 +1,5 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) )
 DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
 EAPI=7
 HOMEPAGE=http://uncrustify.sourceforge.net/
@@ -11,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.72.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fef40dba117bccc156f19d8bf2a10802
+_md5_=2e532e743c737d2b2999c123ece1603f
diff --git a/metadata/md5-cache/dev-util/uncrustify-9999 b/metadata/md5-cache/dev-util/uncrustify-9999
index 8a06856f0334..e40f4c3db0d0 100644
--- a/metadata/md5-cache/dev-util/uncrustify-9999
+++ b/metadata/md5-cache/dev-util/uncrustify-9999
@@ -1,6 +1,5 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( || ( dev-lang/python:3.8 ) ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( || ( dev-lang/python:3.8 ) )
 DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
 EAPI=7
 HOMEPAGE=http://uncrustify.sourceforge.net/
@@ -10,4 +9,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c6c5de9d82ce2b38ff9d8c0d1af2d814
+_md5_=c0e181bcbd89e559663a658262490169
diff --git a/metadata/md5-cache/dev-util/valgrind-3.16.1 b/metadata/md5-cache/dev-util/valgrind-3.16.1
index 29ed90889490..6874ecacc676 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.16.1
+++ b/metadata/md5-cache/dev-util/valgrind-3.16.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.16.1.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e4394f309efd27368cfbc2b7c6284ce0
diff --git a/metadata/md5-cache/dev-util/valgrind-3.17.0 b/metadata/md5-cache/dev-util/valgrind-3.17.0
index d84d6d17e1ba..ba8143ca0c45 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.17.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.17.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.17.0.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7fb9334f17ab3b5eb22decbcf4f322fb
diff --git a/metadata/md5-cache/dev-util/valgrind-9999 b/metadata/md5-cache/dev-util/valgrind-9999
index 77ceca530739..b30c83210e66 100644
--- a/metadata/md5-cache/dev-util/valgrind-9999
+++ b/metadata/md5-cache/dev-util/valgrind-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4f668c690dec1cb0ef159333ae4fe4a4
diff --git a/metadata/md5-cache/dev-util/vbindiff-3.0_beta5-r1 b/metadata/md5-cache/dev-util/vbindiff-3.0_beta5-r1
new file mode 100644
index 000000000000..67976bf7d77f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/vbindiff-3.0_beta5-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Visual binary diff utility
+EAPI=8
+HOMEPAGE=https://www.cjmweb.net/vbindiff/
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://github.com/mrdudz/vbindiff/releases/download/3.0_beta5/vbindiff-3.0_beta5.tar.gz
+_md5_=74364459d4e5f860c540786b9270b71f
diff --git a/metadata/md5-cache/dev-util/xdelta-3.1.0 b/metadata/md5-cache/dev-util/xdelta-3.1.0
deleted file mode 100644
index 09a0df219a4a..000000000000
--- a/metadata/md5-cache/dev-util/xdelta-3.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare setup test
-DEPEND=app-arch/xz-utils test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) )
-DESCRIPTION=Computes changes between binary or text files and creates deltas
-EAPI=7
-HOMEPAGE=http://xdelta.org/
-IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/xz-utils
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://github.com/jmacd/xdelta-gpl/releases/download/v3.1.0/xdelta3-3.1.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8bbdff23dd7031f99f9169b60df95012
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 04eb4d561091..9100a64dff36 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/darcs-2.16.3 b/metadata/md5-cache/dev-vcs/darcs-2.16.3
index ec29ece65b93..9aa7123768af 100644
--- a/metadata/md5-cache/dev-vcs/darcs-2.16.3
+++ b/metadata/md5-cache/dev-vcs/darcs-2.16.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
 RESTRICT=test
 SLOT=0/2.16.3
 SRC_URI=https://hackage.haskell.org/package/darcs-2.16.3/darcs-2.16.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd45a6c7dd2434493c8cdc6ea4158ca4
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.12.1-r1 b/metadata/md5-cache/dev-vcs/fossil-2.12.1-r1
deleted file mode 100644
index 4b3fc53c9ec8..000000000000
--- a/metadata/md5-cache/dev-vcs/fossil-2.12.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.33.0:3 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) !tcl? ( || ( dev-lang/tcl:* dev-lang/jimtcl:* ) )
-DESCRIPTION=Simple, high-reliability, source control management, and more
-EAPI=7
-HOMEPAGE=https://www.fossil-scm.org/
-IUSE=debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
-KEYWORDS=amd64 arm ppc ppc64 x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.33.0:3 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=ssl? ( !miniz )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://fossil-scm.org/home/uv/fossil-src-2.12.1.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f5599123da46a405c79cd5fb3f8cc3c8
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.13-r1 b/metadata/md5-cache/dev-vcs/fossil-2.13-r1
deleted file mode 100644
index 17497547564e..000000000000
--- a/metadata/md5-cache/dev-vcs/fossil-2.13-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.34.0:3 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) !tcl? ( || ( dev-lang/tcl:* dev-lang/jimtcl:* ) )
-DESCRIPTION=Simple, high-reliability, source control management, and more
-EAPI=7
-HOMEPAGE=https://www.fossil-scm.org/
-IUSE=debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.34.0:3 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=ssl? ( !miniz )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://fossil-scm.org/home/uv/fossil-src-2.13.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8e23d00feeca7ae5fef27a7fce1dfe3a
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.14-r1 b/metadata/md5-cache/dev-vcs/fossil-2.14-r1
deleted file mode 100644
index d6880a6832ad..000000000000
--- a/metadata/md5-cache/dev-vcs/fossil-2.14-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.34.0:3 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= ) !tcl? ( || ( dev-lang/tcl:* dev-lang/jimtcl:* ) )
-DESCRIPTION=Simple, high-reliability, source control management, and more
-EAPI=7
-HOMEPAGE=https://www.fossil-scm.org/
-IUSE=debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.34.0:3 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=ssl? ( !miniz )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://fossil-scm.org/home/uv/fossil-src-2.14.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c68a52c57f7e2f1e327440d4f84b586d
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.16-r1 b/metadata/md5-cache/dev-vcs/fossil-2.16-r1
index 3ae6a0b05270..6d9131e71e69 100644
--- a/metadata/md5-cache/dev-vcs/fossil-2.16-r1
+++ b/metadata/md5-cache/dev-vcs/fossil-2.16-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Simple, high-reliability, source control management, and more
 EAPI=7
 HOMEPAGE=https://www.fossil-scm.org/
 IUSE=debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
-KEYWORDS=amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.35.0:3 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=ssl? ( !miniz )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://fossil-scm.org/home/tarball/7aedd5675883d4412cf20917d340b6985e3ecb842e88a39f135df034b2d5f4d3/fossil-src-2.16.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=52dacc0cf7143e2770c306e18e08e61b
+_md5_=f43478e2be9ef0175cd3b4fd9a3c40e4
diff --git a/metadata/md5-cache/dev-vcs/git-2.26.3 b/metadata/md5-cache/dev-vcs/git-2.26.3
index 9287e6dbc16b..5970ce4d3aa8 100644
--- a/metadata/md5-cache/dev-vcs/git-2.26.3
+++ b/metadata/md5-cache/dev-vcs/git-2.26.3
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.26.3.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.26.3.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.26.3.tar.xz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=38f6ffb4fa723669d6a7e25136f8d569
diff --git a/metadata/md5-cache/dev-vcs/git-2.28.1 b/metadata/md5-cache/dev-vcs/git-2.28.1
index 1941641db159..192cae33bf32 100644
--- a/metadata/md5-cache/dev-vcs/git-2.28.1
+++ b/metadata/md5-cache/dev-vcs/git-2.28.1
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.28.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.28.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.28.1.tar.xz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=940ab67faa8c76b306b478010e6dad9b
diff --git a/metadata/md5-cache/dev-vcs/git-2.29.3 b/metadata/md5-cache/dev-vcs/git-2.29.3
index d86c96e18471..755681962923 100644
--- a/metadata/md5-cache/dev-vcs/git-2.29.3
+++ b/metadata/md5-cache/dev-vcs/git-2.29.3
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.29.3.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.29.3.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.29.3.tar.xz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e332d2deb5cc11639155eae7e6eff8b3
diff --git a/metadata/md5-cache/dev-vcs/git-2.30.2 b/metadata/md5-cache/dev-vcs/git-2.30.2
index 3a4d9c1450b5..fdcaa9e98486 100644
--- a/metadata/md5-cache/dev-vcs/git-2.30.2
+++ b/metadata/md5-cache/dev-vcs/git-2.30.2
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.30.2.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.30.2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.30.2.tar.xz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e4ecf7a203230cb476d495523282d27e
diff --git a/metadata/md5-cache/dev-vcs/git-2.31.1 b/metadata/md5-cache/dev-vcs/git-2.31.1
index 023b0171c7ab..2820e9f853b3 100644
--- a/metadata/md5-cache/dev-vcs/git-2.31.1
+++ b/metadata/md5-cache/dev-vcs/git-2.31.1
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.31.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.31.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.31.1.tar.xz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8ff8005e2f9df9de0cf872c6b889ff6
diff --git a/metadata/md5-cache/dev-vcs/git-2.32.0 b/metadata/md5-cache/dev-vcs/git-2.32.0
index 268c0c3ccfec..4d5d00ab0b2d 100644
--- a/metadata/md5-cache/dev-vcs/git-2.32.0
+++ b/metadata/md5-cache/dev-vcs/git-2.32.0
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.32.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.32.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.32.0.tar.xz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad1c5a4ed606fe0b77dbe5f85f74dffb
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index 6943879723e4..83b44b34d8b9 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c1a91051d9cd7786cf267a1d949c6da
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index a595175abdfc..3b49498630b7 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1a6853bff887e285bfeca788f9e9c565
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index a595175abdfc..3b49498630b7 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1a6853bff887e285bfeca788f9e9c565
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index 76dd487f60a3..9bab0b990e3d 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=141029ce3f3d1677029f2411423a3bfe
diff --git a/metadata/md5-cache/dev-vcs/git-annex-8.20200810 b/metadata/md5-cache/dev-vcs/git-annex-8.20200810
index 59c448f68f52..1a7ea0cdb105 100644
--- a/metadata/md5-cache/dev-vcs/git-annex-8.20200810
+++ b/metadata/md5-cache/dev-vcs/git-annex-8.20200810
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:= dev-haskell/async:= dev-haskell/attoparsec:= >=dev-h
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/git-annex-8.20200810/git-annex-8.20200810.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e6919339abd5347a4dfa2fe70f3d2ac8
diff --git a/metadata/md5-cache/dev-vcs/git-flow-1.12.3 b/metadata/md5-cache/dev-vcs/git-flow-1.12.3
index 9550aadf8b10..dc69a8c3c00a 100644
--- a/metadata/md5-cache/dev-vcs/git-flow-1.12.3
+++ b/metadata/md5-cache/dev-vcs/git-flow-1.12.3
@@ -7,5 +7,5 @@ LICENSE=BSD MIT
 RDEPEND=dev-vcs/git
 SLOT=0
 SRC_URI=https://github.com/petervanderdoes/gitflow-avh/archive/1.12.3.tar.gz -> git-flow-1.12.3.tar.gz https://github.com/petervanderdoes/git-flow-completion/archive/0.6.0.tar.gz -> git-flow-completion-0.6.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=652007b4f6260f07bfa763933a672a98
diff --git a/metadata/md5-cache/dev-vcs/git-flow-1.12.3-r2 b/metadata/md5-cache/dev-vcs/git-flow-1.12.3-r2
index 178842084b38..d8a5234e2a90 100644
--- a/metadata/md5-cache/dev-vcs/git-flow-1.12.3-r2
+++ b/metadata/md5-cache/dev-vcs/git-flow-1.12.3-r2
@@ -7,5 +7,5 @@ LICENSE=BSD MIT
 RDEPEND=dev-vcs/git
 SLOT=0
 SRC_URI=https://github.com/petervanderdoes/gitflow-avh/archive/1.12.3.tar.gz -> git-flow-1.12.3.tar.gz https://github.com/petervanderdoes/git-flow-completion/archive/0.6.0.tar.gz -> git-flow-completion-0.6.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=730d15d9c24511d0e977871ead69f315
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r2 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r2
index 088dc90d6f16..ed133265250a 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r2
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r2
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/perl >=dev-vcs/git-1.6.6 virtual/perl-File-Path virtual/perl-Fi
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-2.3.1.tar.bz2
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=2b613d0cae7ad9785be119230bfc0750
+_md5_=7fe5c3f387d5022b157b4fbd6d6dce28
diff --git a/metadata/md5-cache/dev-vcs/hub-2.14.2-r1 b/metadata/md5-cache/dev-vcs/hub-2.14.2-r1
index 6bfb0da1f1ae..cf0b4670690a 100644
--- a/metadata/md5-cache/dev-vcs/hub-2.14.2-r1
+++ b/metadata/md5-cache/dev-vcs/hub-2.14.2-r1
@@ -9,5 +9,5 @@ RDEPEND=>=dev-vcs/git-1.7.3
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/github/hub/archive/v2.14.2.tar.gz -> hub-2.14.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab6e18e1e142e4a5486bf66b27ab672e
diff --git a/metadata/md5-cache/dev-vcs/lab-0.17.2 b/metadata/md5-cache/dev-vcs/lab-0.17.2
index c75a3ca39a0a..4b8ff635a166 100644
--- a/metadata/md5-cache/dev-vcs/lab-0.17.2
+++ b/metadata/md5-cache/dev-vcs/lab-0.17.2
@@ -9,5 +9,5 @@ RDEPEND=dev-vcs/git
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/zaquestion/lab/archive/v0.17.2.tar.gz -> lab-0.17.2.tar.gz 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/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.3.3.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/avast/retry-go/@v/v0.0.0-20180319101611-5469272a8171.zip -> github.com%2Favast%2Fretry-go%2F@v%2Fv0.0.0-20180319101611-5469272a8171.zip mirror://goproxy//github.com/avast/retry-go/@v/v0.0.0-20180319101611-5469272a8171.mod -> github.com%2Favast%2Fretry-go%2F@v%2Fv0.0.0-20180319101611-5469272a8171.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.8.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.8.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.8.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.8.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/derekparker/delve/@v/v1.1.0.zip -> github.com%2Fderekparker%2Fdelve%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/derekparker/delve/@v/v1.1.0.mod -> github.com%2Fderekparker%2Fdelve%2F@v%2Fv1.1.0.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/gdamore/encoding/@v/v0.0.0-20151215212835-b23993cbb635.zip -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv0.0.0-20151215212835-b23993cbb635.zip mirror://goproxy//github.com/gdamore/encoding/@v/v0.0.0-20151215212835-b23993cbb635.mod -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv0.0.0-20151215212835-b23993cbb635.mod mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.zip -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.mod -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gdamore/tcell/@v/v0.0.0-20180416163743-2f258105ca8c.zip -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv0.0.0-20180416163743-2f258105ca8c.zip mirror://goproxy//github.com/gdamore/tcell/@v/v0.0.0-20180416163743-2f258105ca8c.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv0.0.0-20180416163743-2f258105ca8c.mod mirror://goproxy//github.com/gdamore/tcell/@v/v1.1.2.zip -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/gdamore/tcell/@v/v1.1.2.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/gdamore/tcell/@v/v1.1.4.zip -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/gdamore/tcell/@v/v1.1.4.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/gdamore/tcell/@v/v1.3.0.zip -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/gdamore/tcell/@v/v1.3.0.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181103185306-d547d1d9531e.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181103185306-d547d1d9531e.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181103185306-d547d1d9531e.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181103185306-d547d1d9531e.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20180404174102-ef8a98b0bbce.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20180404174102-ef8a98b0bbce.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod mirror://goproxy//github.com/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/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/jtolds/gls/@v/v4.2.1+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/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/lucasb-eyer/go-colorful/@v/v0.0.0-20170903184257-231272389856.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv0.0.0-20170903184257-231272389856.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v0.0.0-20170903184257-231272389856.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv0.0.0-20170903184257-231272389856.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.2.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.2.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v0.0.0-20180621232353-2d01aacdc34a.zip -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv0.0.0-20180621232353-2d01aacdc34a.zip mirror://goproxy//github.com/lunixbochs/vtclean/@v/v0.0.0-20180621232353-2d01aacdc34a.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv0.0.0-20180621232353-2d01aacdc34a.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.7.6.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.7.6.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.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-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20180220230111-00c29f56e238.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20180220230111-00c29f56e238.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.zip 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/pelletier/go-toml/@v/v1.1.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.1.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rivo/tview/@v/v0.0.0-20180419193403-f855bee0205c.zip -> github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20180419193403-f855bee0205c.zip mirror://goproxy//github.com/rivo/tview/@v/v0.0.0-20180419193403-f855bee0205c.mod -> github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20180419193403-f855bee0205c.mod mirror://goproxy//github.com/rivo/tview/@v/v0.0.0-20190721135419-23dc8a0944e4.zip -> github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20190721135419-23dc8a0944e4.zip mirror://goproxy//github.com/rivo/tview/@v/v0.0.0-20190721135419-23dc8a0944e4.mod -> github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20190721135419-23dc8a0944e4.mod mirror://goproxy//github.com/rivo/tview/@v/v0.0.0-20191129065140-82b05c9fb329.zip -> github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20191129065140-82b05c9fb329.zip mirror://goproxy//github.com/rivo/tview/@v/v0.0.0-20191129065140-82b05c9fb329.mod -> github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20191129065140-82b05c9fb329.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.0.0-20190513083848-b9f5b9457d44.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.0.0-20190513083848-b9f5b9457d44.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.0.0-20190513083848-b9f5b9457d44.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.0.0-20190513083848-b9f5b9457d44.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rsteube/cobra/@v/v0.0.1-zsh-completion-custom.zip -> github.com%2Frsteube%2Fcobra%2F@v%2Fv0.0.1-zsh-completion-custom.zip mirror://goproxy//github.com/rsteube/cobra/@v/v0.0.1-zsh-completion-custom.mod -> github.com%2Frsteube%2Fcobra%2F@v%2Fv0.0.1-zsh-completion-custom.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.1.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.1.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20181108003508-044398e4856c.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20181108003508-044398e4856c.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20181108003508-044398e4856c.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20181108003508-044398e4856c.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.0.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/afero/@v/v1.1.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.2.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.2.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.0-20180412120829-615425954c3b.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.0-20180412120829-615425954c3b.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.0-20180412120829-615425954c3b.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.0-20180412120829-615425954c3b.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v0.0.0-20180109140146-7c0cea34c8ec.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v0.0.0-20180109140146-7c0cea34c8ec.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/viper/@v/v0.0.0-20180507071007-15738813a09d.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv0.0.0-20180507071007-15738813a09d.zip mirror://goproxy//github.com/spf13/viper/@v/v0.0.0-20180507071007-15738813a09d.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv0.0.0-20180507071007-15738813a09d.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/tcnksm/go-gitconfig/@v/v0.1.2.zip -> github.com%2Ftcnksm%2Fgo-gitconfig%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/tcnksm/go-gitconfig/@v/v0.1.2.mod -> github.com%2Ftcnksm%2Fgo-gitconfig%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/wadey/gocovmerge/@v/v0.0.0-20160331181800-b5bfa59ec0ad.zip -> github.com%2Fwadey%2Fgocovmerge%2F@v%2Fv0.0.0-20160331181800-b5bfa59ec0ad.zip mirror://goproxy//github.com/wadey/gocovmerge/@v/v0.0.0-20160331181800-b5bfa59ec0ad.mod -> github.com%2Fwadey%2Fgocovmerge%2F@v%2Fv0.0.0-20160331181800-b5bfa59ec0ad.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.0.0-20180921132519-8d21e61ce4a9.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.0.0-20180921132519-8d21e61ce4a9.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.0.0-20180921132519-8d21e61ce4a9.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.0.0-20180921132519-8d21e61ce4a9.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.11.3.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.11.3.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.11.3.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.11.3.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.12.2.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.12.2.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.12.2.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.12.2.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.12.3-0.20181228114601-7bc4155e8bf8.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.12.3-0.20181228114601-7bc4155e8bf8.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.12.3-0.20181228114601-7bc4155e8bf8.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.12.3-0.20181228114601-7bc4155e8bf8.mod mirror://goproxy//golang.org/x/arch/@v/v0.0.0-20181203225421-5a4828bb7045.zip -> golang.org%2Fx%2Farch%2F@v%2Fv0.0.0-20181203225421-5a4828bb7045.zip mirror://goproxy//golang.org/x/arch/@v/v0.0.0-20181203225421-5a4828bb7045.mod -> golang.org%2Fx%2Farch%2F@v%2Fv0.0.0-20181203225421-5a4828bb7045.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180420171155-e73bf333ef89.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180420171155-e73bf333ef89.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180420171155-e73bf333ef89.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180420171155-e73bf333ef89.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/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-20180906233101-161cd47e91fd.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180724155351-3d292e4d0cdc.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180724155351-3d292e4d0cdc.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180724155351-3d292e4d0cdc.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180724155351-3d292e4d0cdc.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/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.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.zip 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-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.zip 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-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-20190626150813-e07cf5db2756.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626150813-e07cf5db2756.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191018095205-727590c5006e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191018095205-727590c5006e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip 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-20191210023423-ac6580df4449.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.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/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-20190107155254-e063def13b29.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190107155254-e063def13b29.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190107155254-e063def13b29.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190107155254-e063def13b29.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191212224101-0f69de236bb7.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191212224101-0f69de236bb7.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191212224101-0f69de236bb7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191212224101-0f69de236bb7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip 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.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//gopkg.in/!d!a!t!a-!d!o!g/go-sqlmock.v1/@v/v1.3.0.zip -> gopkg.in%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock.v1%2F@v%2Fv1.3.0.zip mirror://goproxy//gopkg.in/!d!a!t!a-!d!o!g/go-sqlmock.v1/@v/v1.3.0.mod -> gopkg.in%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock.v1%2F@v%2Fv1.3.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/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/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b8e9ec0c3f4996d88e69030e3dfeb9de
diff --git a/metadata/md5-cache/dev-vcs/lab-0.19.0 b/metadata/md5-cache/dev-vcs/lab-0.19.0
index b8202688d1ae..28501a458e1a 100644
--- a/metadata/md5-cache/dev-vcs/lab-0.19.0
+++ b/metadata/md5-cache/dev-vcs/lab-0.19.0
@@ -9,5 +9,5 @@ RDEPEND=dev-vcs/git
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/zaquestion/lab/archive/v0.19.0.tar.gz -> lab-0.19.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!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.3.3.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/!geert!johan/go.incremental/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.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/acarl005/stripansi/@v/v0.0.0-20180116102854-5a71ef0e047d.zip -> github.com%2Facarl005%2Fstripansi%2F@v%2Fv0.0.0-20180116102854-5a71ef0e047d.zip mirror://goproxy//github.com/acarl005/stripansi/@v/v0.0.0-20180116102854-5a71ef0e047d.mod -> github.com%2Facarl005%2Fstripansi%2F@v%2Fv0.0.0-20180116102854-5a71ef0e047d.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alcortesm/tgz/@v/v0.0.0-20161220082320-9c5fe88206d7.zip -> github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.zip mirror://goproxy//github.com/alcortesm/tgz/@v/v0.0.0-20161220082320-9c5fe88206d7.mod -> github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.0.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.0.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.1.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.1.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.3.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.1.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.1.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.1.17-0.20190424132513-439c674f7ae0.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/kong-hcl/@v/v0.1.8-0.20190615233001-b21fea9723c8.mod -> github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.zip -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.zip mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/araddon/dateparse/@v/v0.0.0-20200409225146-d820a6159ab1.zip -> github.com%2Faraddon%2Fdateparse%2F@v%2Fv0.0.0-20200409225146-d820a6159ab1.zip mirror://goproxy//github.com/araddon/dateparse/@v/v0.0.0-20200409225146-d820a6159ab1.mod -> github.com%2Faraddon%2Fdateparse%2F@v%2Fv0.0.0-20200409225146-d820a6159ab1.mod mirror://goproxy//github.com/araddon/dateparse/@v/v0.0.0-20201001162425-8aadafed4dc4.zip -> github.com%2Faraddon%2Fdateparse%2F@v%2Fv0.0.0-20201001162425-8aadafed4dc4.zip mirror://goproxy//github.com/araddon/dateparse/@v/v0.0.0-20201001162425-8aadafed4dc4.mod -> github.com%2Faraddon%2Fdateparse%2F@v%2Fv0.0.0-20201001162425-8aadafed4dc4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/avast/retry-go/@v/v0.0.0-20180319101611-5469272a8171.zip -> github.com%2Favast%2Fretry-go%2F@v%2Fv0.0.0-20180319101611-5469272a8171.zip mirror://goproxy//github.com/avast/retry-go/@v/v0.0.0-20180319101611-5469272a8171.mod -> github.com%2Favast%2Fretry-go%2F@v%2Fv0.0.0-20180319101611-5469272a8171.mod mirror://goproxy//github.com/avast/retry-go/@v/v3.0.0+incompatible.zip -> github.com%2Favast%2Fretry-go%2F@v%2Fv3.0.0+incompatible.zip mirror://goproxy//github.com/avast/retry-go/@v/v3.0.0+incompatible.mod -> github.com%2Favast%2Fretry-go%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/aymerick/douceur/@v/v0.2.0.zip -> github.com%2Faymerick%2Fdouceur%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/aymerick/douceur/@v/v0.2.0.mod -> github.com%2Faymerick%2Fdouceur%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.1.1-0.20200114010931-28cbdae8e7a9.zip -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200114010931-28cbdae8e7a9.zip mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.1.1-0.20200114010931-28cbdae8e7a9.mod -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200114010931-28cbdae8e7a9.mod mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.0.zip -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/charmbracelet/glamour/@v/v0.2.0.mod -> github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/chris-ramon/douceur/@v/v0.2.0.zip -> github.com%2Fchris-ramon%2Fdouceur%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/chris-ramon/douceur/@v/v0.2.0.mod -> github.com%2Fchris-ramon%2Fdouceur%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-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-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/daaku/go.zipexe/@v/v1.0.0.mod -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/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/dlclark/regexp2/@v/v1.1.6.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/emirpasic/gods/@v/v1.12.0.zip -> github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/emirpasic/gods/@v/v1.12.0.mod -> github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.10.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.10.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.zip -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.mod -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gdamore/tcell/@v/v1.3.0.zip -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/gdamore/tcell/@v/v1.3.0.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gdamore/tcell/@v/v1.4.0.zip -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gdamore/tcell/@v/v1.4.0.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gdamore/tcell/v2/@v/v2.0.1-0.20201017141208-acf90d56d591.zip -> github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.0.1-0.20201017141208-acf90d56d591.zip mirror://goproxy//github.com/gdamore/tcell/v2/@v/v2.0.1-0.20201017141208-acf90d56d591.mod -> github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.0.1-0.20201017141208-acf90d56d591.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.zip -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/go-git/gcfg/@v/v1.5.0.zip -> github.com%2Fgo-git%2Fgcfg%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-git/gcfg/@v/v1.5.0.mod -> github.com%2Fgo-git%2Fgcfg%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-git/go-billy/v5/@v/v5.0.0.zip -> github.com%2Fgo-git%2Fgo-billy%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//github.com/go-git/go-billy/v5/@v/v5.0.0.mod -> github.com%2Fgo-git%2Fgo-billy%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//github.com/go-git/go-git-fixtures/v4/@v/v4.0.1.zip -> github.com%2Fgo-git%2Fgo-git-fixtures%2Fv4%2F@v%2Fv4.0.1.zip mirror://goproxy//github.com/go-git/go-git-fixtures/v4/@v/v4.0.1.mod -> github.com%2Fgo-git%2Fgo-git-fixtures%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//github.com/go-git/go-git-fixtures/v4/@v/v4.0.2-0.20200613231340-f56387b50c12.mod -> github.com%2Fgo-git%2Fgo-git-fixtures%2Fv4%2F@v%2Fv4.0.2-0.20200613231340-f56387b50c12.mod mirror://goproxy//github.com/go-git/go-git/v5/@v/v5.0.0.zip -> github.com%2Fgo-git%2Fgo-git%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//github.com/go-git/go-git/v5/@v/v5.0.0.mod -> github.com%2Fgo-git%2Fgo-git%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//github.com/go-git/go-git/v5/@v/v5.2.0.zip -> github.com%2Fgo-git%2Fgo-git%2Fv5%2F@v%2Fv5.2.0.zip mirror://goproxy//github.com/go-git/go-git/v5/@v/v5.2.0.mod -> github.com%2Fgo-git%2Fgo-git%2Fv5%2F@v%2Fv5.2.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.zip -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.mod -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20200907032337-555d40f16ae2.mod -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20200907032337-555d40f16ae2.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/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/csrf/@v/v1.6.0.mod -> github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/gorilla/css/@v/v1.0.0.zip -> github.com%2Fgorilla%2Fcss%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gorilla/css/@v/v1.0.0.mod -> github.com%2Fgorilla%2Fcss%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.4.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.8.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.8.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.8.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.8.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.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/jaytaylor/html2text/@v/v0.0.0-20200412013138-3577fbdbcff7.zip -> github.com%2Fjaytaylor%2Fhtml2text%2F@v%2Fv0.0.0-20200412013138-3577fbdbcff7.zip mirror://goproxy//github.com/jaytaylor/html2text/@v/v0.0.0-20200412013138-3577fbdbcff7.mod -> github.com%2Fjaytaylor%2Fhtml2text%2F@v%2Fv0.0.0-20200412013138-3577fbdbcff7.mod mirror://goproxy//github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.zip -> github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.zip mirror://goproxy//github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.mod -> github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/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/kevinburke/ssh_config/@v/v0.0.0-20190725054713-01f96b0aa0cd.zip -> github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa0cd.zip mirror://goproxy//github.com/kevinburke/ssh_config/@v/v0.0.0-20190725054713-01f96b0aa0cd.mod -> github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa0cd.mod mirror://goproxy//github.com/kevinburke/ssh_config/@v/v0.0.0-20201106050909-4977a11b4351.zip -> github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20201106050909-4977a11b4351.zip mirror://goproxy//github.com/kevinburke/ssh_config/@v/v0.0.0-20201106050909-4977a11b4351.mod -> github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20201106050909-4977a11b4351.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.2.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.2.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v0.0.0-20180621232353-2d01aacdc34a.zip -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv0.0.0-20180621232353-2d01aacdc34a.zip mirror://goproxy//github.com/lunixbochs/vtclean/@v/v0.0.0-20180621232353-2d01aacdc34a.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv0.0.0-20180621232353-2d01aacdc34a.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.zip -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.4.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.4.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.4.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.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-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/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/microcosm-cc/bluemonday/@v/v1.0.2.zip -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.4.zip -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.4.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/muesli/reflow/@v/v0.0.0-20191216070243-e5efeac4e302.zip -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.0.0-20191216070243-e5efeac4e302.zip mirror://goproxy//github.com/muesli/reflow/@v/v0.0.0-20191216070243-e5efeac4e302.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.0.0-20191216070243-e5efeac4e302.mod mirror://goproxy//github.com/muesli/reflow/@v/v0.1.0.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/muesli/reflow/@v/v0.2.0.zip -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/muesli/reflow/@v/v0.2.0.mod -> github.com%2Fmuesli%2Freflow%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.0.0-20200114005430-a7aeffd54956.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.0.0-20200114005430-a7aeffd54956.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.0.0-20200114005430-a7aeffd54956.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.0.0-20200114005430-a7aeffd54956.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.6.0.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.zip -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.zip mirror://goproxy//github.com/muesli/termenv/@v/v0.7.4.mod -> github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.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/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nkovacs/streamquote/@v/v0.0.0-20170412213628-49af9bddb229.mod -> github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.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.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.zip 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/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.1.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.1.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rivo/tview/@v/v0.0.0-20191129065140-82b05c9fb329.zip -> github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20191129065140-82b05c9fb329.zip mirror://goproxy//github.com/rivo/tview/@v/v0.0.0-20191129065140-82b05c9fb329.mod -> github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20191129065140-82b05c9fb329.mod mirror://goproxy//github.com/rivo/tview/@v/v0.0.0-20201018122409-d551c850a743.zip -> github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20201018122409-d551c850a743.zip mirror://goproxy//github.com/rivo/tview/@v/v0.0.0-20201018122409-d551c850a743.mod -> github.com%2Frivo%2Ftview%2F@v%2Fv0.0.0-20201018122409-d551c850a743.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rsteube/carapace/@v/v0.1.6.zip -> github.com%2Frsteube%2Fcarapace%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/rsteube/carapace/@v/v0.1.6.mod -> github.com%2Frsteube%2Fcarapace%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/scylladb/termtables/@v/v0.0.0-20191203121021-c4c0b6d42ff4.mod -> github.com%2Fscylladb%2Ftermtables%2F@v%2Fv0.0.0-20191203121021-c4c0b6d42ff4.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip 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.4.1.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/spf13/afero/@v/v1.4.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.4.1.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.7.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.7.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.7.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/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/ssor/bom/@v/v0.0.0-20170718123548-6386211fdfcf.zip -> github.com%2Fssor%2Fbom%2F@v%2Fv0.0.0-20170718123548-6386211fdfcf.zip mirror://goproxy//github.com/ssor/bom/@v/v0.0.0-20170718123548-6386211fdfcf.mod -> github.com%2Fssor%2Fbom%2F@v%2Fv0.0.0-20170718123548-6386211fdfcf.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tcnksm/go-gitconfig/@v/v0.1.2.zip -> github.com%2Ftcnksm%2Fgo-gitconfig%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/tcnksm/go-gitconfig/@v/v0.1.2.mod -> github.com%2Ftcnksm%2Fgo-gitconfig%2F@v%2Fv0.1.2.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/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/wadey/gocovmerge/@v/v0.0.0-20160331181800-b5bfa59ec0ad.mod -> github.com%2Fwadey%2Fgocovmerge%2F@v%2Fv0.0.0-20160331181800-b5bfa59ec0ad.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.33.1-0.20200713191942-71ea998bed24.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.33.1-0.20200713191942-71ea998bed24.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.33.1-0.20200713191942-71ea998bed24.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.33.1-0.20200713191942-71ea998bed24.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.38.1.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.38.1.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.38.1.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.38.1.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.39.0.zip -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.39.0.zip mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.39.0.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.39.0.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.zip -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.3.0.zip -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.3.0.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.19.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.19.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.19.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.19.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.0.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20190219172222-a4c6cb3142f2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200302210943-78000ba7a073.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200302210943-78000ba7a073.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20181108082009-03003ca0c849.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/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.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/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.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.zip 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-20181128092732-4ed8d59d0b35.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190221075227-b4e8571b14e0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626150813-e07cf5db2756.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626150813-e07cf5db2756.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.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-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191018095205-727590c5006e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191018095205-727590c5006e.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-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201017003518-b09fb700fbb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201017003518-b09fb700fbb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201109165425-215b40eba54c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201109165425-215b40eba54c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201109165425-215b40eba54c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201109165425-215b40eba54c.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200930213115-e57f6d466a48.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200930213115-e57f6d466a48.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip 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.3.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/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/ini.v1/@v/v1.51.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.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.zip -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.zip 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.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6001c3e26723e3e39f57295519e9c412
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.8 b/metadata/md5-cache/dev-vcs/mercurial-5.8
index fe6e9fde4613..3da542024202 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.8
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.8.tar.gz rust? ( https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.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-cast/0.1.0/download -> bytes-cast-0.1.0.crate https://crates.io/api/v1/crates/bytes-cast-derive/0.1.0/download -> bytes-cast-derive-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/const_fn/0.4.4/download -> const_fn-0.4.4.crate https://crates.io/api/v1/crates/cpython/0.5.2/download -> cpython-0.5.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/derive_more/0.99.11/download -> derive_more-0.99.11.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/format-bytes/0.2.2/download -> format-bytes-0.2.2.crate https://crates.io/api/v1/crates/format-bytes-macros/0.3.0/download -> format-bytes-macros-0.3.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.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/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/im-rc/15.0.0/download -> im-rc-15.0.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.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.81/download -> libc-0.2.81.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/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/micro-timer/0.3.1/download -> micro-timer-0.3.1.crate https://crates.io/api/v1/crates/micro-timer-macros/0.3.1/download -> micro-timer-macros-0.3.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/python27-sys/0.5.2/download -> python27-sys-0.5.2.crate https://crates.io/api/v1/crates/python3-sys/0.5.2/download -> python3-sys-0.5.2.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.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.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sized-chunks/0.6.2/download -> sized-chunks-0.6.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.54/download -> syn-1.0.54.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/twox-hash/1.6.0/download -> twox-hash-1.6.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicode-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/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.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/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zstd/0.5.3+zstd.1.4.5/download -> zstd-0.5.3+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-safe/2.0.5+zstd.1.4.5/download -> zstd-safe-2.0.5+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-sys/1.4.17+zstd.1.4.5/download -> zstd-sys-1.4.17+zstd.1.4.5.crate )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=be40bb3a5f82dda07d40176775bb9303
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.8.1 b/metadata/md5-cache/dev-vcs/mercurial-5.8.1
index 653bcf97053a..1b14da8194a1 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.8.1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.8.1
@@ -7,10 +7,9 @@ HOMEPAGE=https://www.mercurial-scm.org/
 IUSE=+chg emacs gpg test tk rust debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )
-RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=app-misc/ca-certificates gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.8.1.tar.gz rust? ( https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.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-cast/0.1.0/download -> bytes-cast-0.1.0.crate https://crates.io/api/v1/crates/bytes-cast-derive/0.1.0/download -> bytes-cast-derive-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/const_fn/0.4.4/download -> const_fn-0.4.4.crate https://crates.io/api/v1/crates/cpython/0.5.2/download -> cpython-0.5.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/derive_more/0.99.11/download -> derive_more-0.99.11.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/format-bytes/0.2.2/download -> format-bytes-0.2.2.crate https://crates.io/api/v1/crates/format-bytes-macros/0.3.0/download -> format-bytes-macros-0.3.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.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/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/im-rc/15.0.0/download -> im-rc-15.0.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.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.81/download -> libc-0.2.81.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/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/micro-timer/0.3.1/download -> micro-timer-0.3.1.crate https://crates.io/api/v1/crates/micro-timer-macros/0.3.1/download -> micro-timer-macros-0.3.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/python27-sys/0.5.2/download -> python27-sys-0.5.2.crate https://crates.io/api/v1/crates/python3-sys/0.5.2/download -> python3-sys-0.5.2.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.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.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sized-chunks/0.6.2/download -> sized-chunks-0.6.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.54/download -> syn-1.0.54.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/twox-hash/1.6.0/download -> twox-hash-1.6.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicode-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/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.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/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zstd/0.5.3+zstd.1.4.5/download -> zstd-0.5.3+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-safe/2.0.5+zstd.1.4.5/download -> zstd-safe-2.0.5+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-sys/1.4.17+zstd.1.4.5/download -> zstd-sys-1.4.17+zstd.1.4.5.crate )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73e0122ac4c87c722e70ee072b6708aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=02797fae2bd8ccbe9765ec7fe18c7743
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index 686d3ecb3d35..aa87ff5da0bf 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -11,5 +11,5 @@ RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python3_8(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	mercurial	d9b8e6c09ecb32dd80eb36f50f27b157	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	mercurial	d9b8e6c09ecb32dd80eb36f50f27b157	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=deade8acbd9a704f0110d95c6abaafcd
diff --git a/metadata/md5-cache/dev-vcs/pre-commit-2.13.0 b/metadata/md5-cache/dev-vcs/pre-commit-2.13.0
index eac03489f931..ee8ae1f91e53 100644
--- a/metadata/md5-cache/dev-vcs/pre-commit-2.13.0
+++ b/metadata/md5-cache/dev-vcs/pre-commit-2.13.0
@@ -4,7 +4,7 @@ DESCRIPTION=A framework for managing and maintaining multi-language Git pre-comm
 EAPI=7
 HOMEPAGE=https://pre-commit.com/
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~hppa
+KEYWORDS=amd64 ~hppa ~ppc
 LICENSE=MIT
 RDEPEND=dev-vcs/git python_single_target_python3_8? ( dev-python/cfgv[python_targets_python3_8(-)] dev-python/identify[python_targets_python3_8(-)] dev-python/nodeenv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/toml[python_targets_python3_8(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cfgv[python_targets_python3_9(-)] dev-python/identify[python_targets_python3_9(-)] dev-python/nodeenv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/toml[python_targets_python3_9(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cfgv[python_targets_python3_10(-)] dev-python/identify[python_targets_python3_10(-)] dev-python/nodeenv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/toml[python_targets_python3_10(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pre-commit/pre-commit/archive/refs/tags/v2.13.0.tar.gz -> pre-commit-2.13.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c82d4af4515d1fbbb3e8910d2c4c419d
+_md5_=08d1cbc11eb339801ea2038e2baee932
diff --git a/metadata/md5-cache/dev-vcs/repo-2.12-r1 b/metadata/md5-cache/dev-vcs/repo-2.12-r1
index 029fb59af198..3f67962a011e 100644
--- a/metadata/md5-cache/dev-vcs/repo-2.12-r1
+++ b/metadata/md5-cache/dev-vcs/repo-2.12-r1
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/git-repo-downloads/repo-2.12 https://gerrit.googlesource.com/git-repo/+/511a0e54f5801a3f36c00fac478a596d83867d10/completion.bash?format=TEXT -> repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=796db02deeb298c39c207c14f35fce7a
diff --git a/metadata/md5-cache/dev-vcs/repo-2.14 b/metadata/md5-cache/dev-vcs/repo-2.14
index 2bee158159e8..662ee905c34f 100644
--- a/metadata/md5-cache/dev-vcs/repo-2.14
+++ b/metadata/md5-cache/dev-vcs/repo-2.14
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/git-repo-downloads/repo-2.14 https://gerrit.googlesource.com/git-repo/+/511a0e54f5801a3f36c00fac478a596d83867d10/completion.bash?format=TEXT -> repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=796db02deeb298c39c207c14f35fce7a
diff --git a/metadata/md5-cache/dev-vcs/repo-2.15 b/metadata/md5-cache/dev-vcs/repo-2.15
index 3416baecf874..e14568bd4b01 100644
--- a/metadata/md5-cache/dev-vcs/repo-2.15
+++ b/metadata/md5-cache/dev-vcs/repo-2.15
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/git-repo-downloads/repo-2.15 https://gerrit.googlesource.com/git-repo/+/511a0e54f5801a3f36c00fac478a596d83867d10/completion.bash?format=TEXT -> repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe931b2461c3c2be1c24b26707c24054
diff --git a/metadata/md5-cache/dev-vcs/stgit-1.0 b/metadata/md5-cache/dev-vcs/stgit-1.0
deleted file mode 100644
index 1cfd445e9f55..000000000000
--- a/metadata/md5-cache/dev-vcs/stgit-1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-vcs/git-1.6.3.3 doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
-DESCRIPTION=Manage a stack of patches using GIT as a backend
-EAPI=7
-HOMEPAGE=https://stacked-git.github.io
-IUSE=doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/ctmarinas/stgit/archive/v1.0.tar.gz -> stgit-1.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1d48b20dcf9e6a56e3c580a00e009d04
diff --git a/metadata/md5-cache/dev-vcs/stgit-1.1 b/metadata/md5-cache/dev-vcs/stgit-1.1
index 750e37db2f15..286a8d63d64e 100644
--- a/metadata/md5-cache/dev-vcs/stgit-1.1
+++ b/metadata/md5-cache/dev-vcs/stgit-1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_8? ( dev-lang/python:3.8 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ctmarinas/stgit/archive/v1.1.tar.gz -> stgit-1.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d48b20dcf9e6a56e3c580a00e009d04
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.1 b/metadata/md5-cache/dev-vcs/subversion-1.14.1
index db523c23d0f7..22ea2d183eb4 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.1.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	db-use	063d3e7add942762a8203b52ec3066c2	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	db-use	063d3e7add942762a8203b52ec3066c2	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4f4c0c8e5e76193f7a33a8986addd220
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.1 b/metadata/md5-cache/dev-vcs/tig-2.5.1
index 90d8724a8cc9..17550c40b56a 100644
--- a/metadata/md5-cache/dev-vcs/tig-2.5.1
+++ b/metadata/md5-cache/dev-vcs/tig-2.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( unicode )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.5.1/tig-2.5.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e478e0e7e5a92034264a60502905a7a
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.3-r1 b/metadata/md5-cache/dev-vcs/tig-2.5.3-r1
index 92d46cb8a0a9..1287317cd77f 100644
--- a/metadata/md5-cache/dev-vcs/tig-2.5.3-r1
+++ b/metadata/md5-cache/dev-vcs/tig-2.5.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( unicode )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.5.3/tig-2.5.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20fcc2a1d35822ac1f86f02cea4592ec
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.4 b/metadata/md5-cache/dev-vcs/tig-2.5.4
index ab8740a239d3..a8ec83252ad8 100644
--- a/metadata/md5-cache/dev-vcs/tig-2.5.4
+++ b/metadata/md5-cache/dev-vcs/tig-2.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( unicode )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.5.4/tig-2.5.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20fcc2a1d35822ac1f86f02cea4592ec
diff --git a/metadata/md5-cache/dev-vcs/tig-9999 b/metadata/md5-cache/dev-vcs/tig-9999
index 62312f3fcd92..2b374ee8035c 100644
--- a/metadata/md5-cache/dev-vcs/tig-9999
+++ b/metadata/md5-cache/dev-vcs/tig-9999
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
 REQUIRED_USE=test? ( unicode )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1af17ab4468af13205e6a0940b62b58b
diff --git a/metadata/md5-cache/dev-vcs/topgit-0.19.12 b/metadata/md5-cache/dev-vcs/topgit-0.19.12
index 9ca8040b60e4..78c7c35b1f5a 100644
--- a/metadata/md5-cache/dev-vcs/topgit-0.19.12
+++ b/metadata/md5-cache/dev-vcs/topgit-0.19.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/git-2.10.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mackyle/topgit/archive/topgit-0.19.12.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be33ba537a4dc59e6ff436e37ebd5f35
diff --git a/metadata/md5-cache/dev-vcs/topgit-0.9-r1 b/metadata/md5-cache/dev-vcs/topgit-0.9-r1
index 02c1342d83e5..35b7cad72fa5 100644
--- a/metadata/md5-cache/dev-vcs/topgit-0.9-r1
+++ b/metadata/md5-cache/dev-vcs/topgit-0.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/git
 SLOT=0
 SRC_URI=https://github.com/greenrd/topgit/archive/topgit-0.9.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2ad87922d14ad1088a5664a6f432a59
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index a651bc7f9ab3..3e9cca94ec20 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/minecraft-launcher-928 b/metadata/md5-cache/games-action/minecraft-launcher-928
deleted file mode 100644
index 2a64af5814e8..000000000000
--- a/metadata/md5-cache/games-action/minecraft-launcher-928
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An open-world game whose gameplay revolves around breaking and placing blocks
-EAPI=7
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
-LICENSE=Mojang
-RDEPEND=>=x11-libs/gtk+-2.24.32-r1[X(+)] dev-libs/nss dev-libs/libbsd dev-libs/libffi dev-libs/libpcre media-libs/alsa-lib media-libs/openal net-libs/gnutls[idn] net-print/cups sys-apps/dbus virtual/jre:1.8 virtual/opengl x11-apps/xrandr x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_928.tar.gz -> minecraft-launcher-928.tar.gz https://launcher.mojang.com/download/minecraft-launcher.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1e15a73b636b32340c85060ea711770e
diff --git a/metadata/md5-cache/games-action/minecraft-launcher-928-r1 b/metadata/md5-cache/games-action/minecraft-launcher-928-r1
new file mode 100644
index 000000000000..fd705bfe9cd4
--- /dev/null
+++ b/metadata/md5-cache/games-action/minecraft-launcher-928-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An open-world game whose gameplay revolves around breaking and placing blocks
+EAPI=7
+HOMEPAGE=https://www.minecraft.net/
+KEYWORDS=-* ~amd64
+LICENSE=Mojang
+RDEPEND=>=x11-libs/gtk+-2.24.32-r1[X(+)] app-crypt/libsecret dev-libs/nss dev-libs/libbsd dev-libs/libffi dev-libs/libpcre media-libs/alsa-lib media-libs/openal net-libs/gnutls[idn] net-print/cups sys-apps/dbus virtual/jre:1.8 virtual/opengl x11-apps/xrandr x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_928.tar.gz -> minecraft-launcher-928.tar.gz https://launcher.mojang.com/download/minecraft-launcher.svg
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a81bab8f77c9ffeed98e6e3dbc70fcf7
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 5438518149f5..bc0a0a52ff34 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/gnuchess-6.2.9 b/metadata/md5-cache/games-board/gnuchess-6.2.9
new file mode 100644
index 000000000000..c863b505b487
--- /dev/null
+++ b/metadata/md5-cache/games-board/gnuchess-6.2.9
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Console based chess interface
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/chess/chess.html
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/chess/gnuchess-6.2.9.tar.gz
+_md5_=c6675dcb0b6e7ddbc2251f26a98a529a
diff --git a/metadata/md5-cache/games-board/goatee-gtk-0.4.0 b/metadata/md5-cache/games-board/goatee-gtk-0.4.0
index 8c1e0cc12ebd..f0e05dd096e6 100644
--- a/metadata/md5-cache/games-board/goatee-gtk-0.4.0
+++ b/metadata/md5-cache/games-board/goatee-gtk-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-games/goatee-0.4:=[profile?] <dev-games/goatee-0.5:=[profile?] >=d
 RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://hackage.haskell.org/package/goatee-gtk-0.4.0/goatee-gtk-0.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c76a6d468d98dc22e251301e43fb7da
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 182b07500197..ec95fcd4dda6 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506 b/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506
index 1dc63eaec82b..03b9258390fb 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/hidapi:0= >=dev-libs/libfmt-7.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) vulkan? ( media-libs/vulkan-loader )
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68.tar.gz -> dolphin-5.0_p20210506.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=54e7302e16951268c1c09315f2b0d822
diff --git a/metadata/md5-cache/games-emulation/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index 7c4a7c17d06b..1fe53ef36b4d 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/hidapi:0= >=dev-libs/libfmt-7.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) vulkan? ( media-libs/vulkan-loader )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=775fe6f0b21ce1692cbd660233ee5743
diff --git a/metadata/md5-cache/games-emulation/mednafen-1.27.1 b/metadata/md5-cache/games-emulation/mednafen-1.27.1
index cdff86d31ca7..5170dc18a55a 100644
--- a/metadata/md5-cache/games-emulation/mednafen-1.27.1
+++ b/metadata/md5-cache/games-emulation/mednafen-1.27.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2 dev-libs/trio media-libs/libsdl2[joystick,opengl,video] media-libs/tremor media-sound/musepack-tools sys-libs/zlib:=[minizip] virtual/libintl alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) jack? ( virtual/jack )
 SLOT=0
 SRC_URI=https://mednafen.github.io/releases/files/mednafen-1.27.1.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=388b9cc93e47430e4fac6b27b6eb32dd
diff --git a/metadata/md5-cache/games-emulation/stella-6.5.2 b/metadata/md5-cache/games-emulation/stella-6.5.2
deleted file mode 100644
index b633143de835..000000000000
--- a/metadata/md5-cache/games-emulation/stella-6.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=media-libs/libsdl2[joystick?,opengl,video] media-libs/libpng:0= sys-libs/zlib
-DESCRIPTION=Multi-platform Atari 2600 VCS Emulator
-EAPI=7
-HOMEPAGE=https://stella-emu.github.io
-IUSE=joystick
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ BSD
-RDEPEND=media-libs/libsdl2[joystick?,opengl,video] media-libs/libpng:0= sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/stella-emu/stella/releases/download/6.5.2/stella-6.5.2-src.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=26bc61be9d156df2f4bf71bc0025281f
diff --git a/metadata/md5-cache/games-emulation/zsnes-1.51-r10 b/metadata/md5-cache/games-emulation/zsnes-1.51-r10
index 2305b0601678..c7de51353be6 100644
--- a/metadata/md5-cache/games-emulation/zsnes-1.51-r10
+++ b/metadata/md5-cache/games-emulation/zsnes-1.51-r10
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2 -> zsnes-1.51-20071031.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=32c3e27676b616a36ddc1828998de5d2
diff --git a/metadata/md5-cache/games-emulation/zsnes-1.51-r11 b/metadata/md5-cache/games-emulation/zsnes-1.51-r11
index 9b1cc5024eaa..66555a0638ff 100644
--- a/metadata/md5-cache/games-emulation/zsnes-1.51-r11
+++ b/metadata/md5-cache/games-emulation/zsnes-1.51-r11
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2 -> zsnes-1.51-20071031.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f2ffe9274051c5a6079d43545f671b0
diff --git a/metadata/md5-cache/games-emulation/zsnes-1.51-r9 b/metadata/md5-cache/games-emulation/zsnes-1.51-r9
index 0a3f3566bce1..5955e1dc1dcf 100644
--- a/metadata/md5-cache/games-emulation/zsnes-1.51-r9
+++ b/metadata/md5-cache/games-emulation/zsnes-1.51-r9
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2 -> zsnes-1.51-20071031.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=25e4590923ab579bbefc246314b968b6
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index e9b27933b94d..4a40dd4c402d 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/openmw-9999 b/metadata/md5-cache/games-engines/openmw-9999
index f44f6a2a2459..45ce68516162 100644
--- a/metadata/md5-cache/games-engines/openmw-9999
+++ b/metadata/md5-cache/games-engines/openmw-9999
@@ -1,14 +1,15 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[doc] dev-python/sphinx ) test? ( dev-cpp/gtest ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=app-arch/lz4 dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/lz4 dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) dev-cpp/sol2
 DESCRIPTION=Open source reimplementation of TES III: Morrowind
 EAPI=7
 HOMEPAGE=https://openmw.org/ https://gitlab.com/OpenMW/openmw
-IUSE=doc devtools +osg-fork test +qt5
+IUSE=doc devtools +osg-fork test +qt5 lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=GPL-3 MIT BitstreamVera ZLIB
 PROPERTIES=live
-RDEPEND=app-arch/lz4 dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/lz4 dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dd8d151189a4f19e78d55d293d2c3e4f
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dfed34cf9253be36491965250bdbb26c
diff --git a/metadata/md5-cache/games-engines/stratagus-3.1.1 b/metadata/md5-cache/games-engines/stratagus-3.1.1
new file mode 100644
index 000000000000..a633c6d3ea6c
--- /dev/null
+++ b/metadata/md5-cache/games-engines/stratagus-3.1.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/toluapp[lua_single_target_lua5-1(-)?] media-libs/libpng:0 x11-libs/libX11 media-libs/libsdl2[sound,opengl,video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-image[png] sys-libs/zlib bzip2? ( app-arch/bzip2 ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+DESCRIPTION=A realtime strategy game engine
+EAPI=7
+HOMEPAGE=https://stratagus.com/stratagus.html https://github.com/Wargus/stratagus
+IUSE=bzip2 debug doc mng theora vorbis +lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/toluapp[lua_single_target_lua5-1(-)?] media-libs/libpng:0 x11-libs/libX11 media-libs/libsdl2[sound,opengl,video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-image[png] sys-libs/zlib bzip2? ( app-arch/bzip2 ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
+SLOT=0/3
+SRC_URI=https://github.com/Wargus/stratagus/archive/v3.1.1.tar.gz -> stratagus-3.1.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d99da0f8ba91fde0a167d647ce77eebb
diff --git a/metadata/md5-cache/games-engines/stratagus-3.1.2 b/metadata/md5-cache/games-engines/stratagus-3.1.2
new file mode 100644
index 000000000000..2a3225630106
--- /dev/null
+++ b/metadata/md5-cache/games-engines/stratagus-3.1.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/toluapp[lua_single_target_lua5-1(-)?] media-libs/libpng:0 x11-libs/libX11 media-libs/libsdl2[sound,opengl,video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-image[png] sys-libs/zlib bzip2? ( app-arch/bzip2 ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+DESCRIPTION=A realtime strategy game engine
+EAPI=7
+HOMEPAGE=https://stratagus.com/stratagus.html https://github.com/Wargus/stratagus
+IUSE=bzip2 debug doc mng theora vorbis +lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/toluapp[lua_single_target_lua5-1(-)?] media-libs/libpng:0 x11-libs/libX11 media-libs/libsdl2[sound,opengl,video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-image[png] sys-libs/zlib bzip2? ( app-arch/bzip2 ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
+SLOT=0/3
+SRC_URI=https://github.com/Wargus/stratagus/archive/v3.1.2.tar.gz -> stratagus-3.1.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d99da0f8ba91fde0a167d647ce77eebb
diff --git a/metadata/md5-cache/games-kids/Manifest.gz b/metadata/md5-cache/games-kids/Manifest.gz
index 3dae5480b6a7..2bd89108d86e 100644
--- a/metadata/md5-cache/games-kids/Manifest.gz
+++ b/metadata/md5-cache/games-kids/Manifest.gz
diff --git a/metadata/md5-cache/games-kids/gmult-8.0-r1 b/metadata/md5-cache/games-kids/gmult-8.0-r1
deleted file mode 100644
index 8ac7130b5d4d..000000000000
--- a/metadata/md5-cache/games-kids/gmult-8.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Multiplication Puzzle emulates the multiplication game found in Emacs
-EAPI=6
-HOMEPAGE=http://www.mterry.name/gmult/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl
-SLOT=0
-SRC_URI=https://launchpad.net/gmult/trunk/8.0/+download/gmult-8.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0b332db981b2595be3f8024dd6e948f1
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 19ded5c708c9..2b5ba235be5a 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/bsd-games-3.1-r1 b/metadata/md5-cache/games-misc/bsd-games-3.1-r1
index af7f12601496..f0e61204a967 100644
--- a/metadata/md5-cache/games-misc/bsd-games-3.1-r1
+++ b/metadata/md5-cache/games-misc/bsd-games-3.1-r1
@@ -4,11 +4,11 @@ DEPEND=sys-apps/miscfiles sys-libs/ncurses:= !games-puzzle/hangman !games-misc/w
 DESCRIPTION=collection of games from NetBSD
 EAPI=7
 HOMEPAGE=https://www.polyomino.org.uk/computer/software/bsd-games/
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-apps/miscfiles sys-libs/ncurses:= !games-puzzle/hangman !games-misc/wumpus acct-group/gamestat
 RESTRICT=test
 SLOT=0/3
 SRC_URI=https://github.com/msharov/bsd-games/archive/refs/tags/v3.1.tar.gz -> bsd-games-3.1.tar.gz https://dev.gentoo.org/~sam/distfiles/games-misc/bsd-games/bsd-games-3.1-verbose-build.patch.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=41909eb2b4931a9258aab8a70bc0a249
+_md5_=42236555e6e05279a2ff4e6866dfffde
diff --git a/metadata/md5-cache/games-misc/ponysay-3.0.3 b/metadata/md5-cache/games-misc/ponysay-3.0.3
index b09fd615a5b7..4f5cd504a135 100644
--- a/metadata/md5-cache/games-misc/ponysay-3.0.3
+++ b/metadata/md5-cache/games-misc/ponysay-3.0.3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/erkin/ponysay/archive/3.0.3.tar.gz -> ponysay-3.0.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=39653dd2b16f1f41f5a1a620832901e3
diff --git a/metadata/md5-cache/games-mud/Manifest.gz b/metadata/md5-cache/games-mud/Manifest.gz
index 1bda2e58988b..0f6b0f67d7c4 100644
--- a/metadata/md5-cache/games-mud/Manifest.gz
+++ b/metadata/md5-cache/games-mud/Manifest.gz
diff --git a/metadata/md5-cache/games-mud/tkmoo-0.3.32-r1 b/metadata/md5-cache/games-mud/tkmoo-0.3.32-r1
index a7b9d116148c..78c809d1abff 100644
--- a/metadata/md5-cache/games-mud/tkmoo-0.3.32-r1
+++ b/metadata/md5-cache/games-mud/tkmoo-0.3.32-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/tcl-8.3.3:0= >=dev-lang/tk-8.3.3:0=
+DEPEND=dev-lang/tcl dev-lang/tk
 DESCRIPTION=MOO Client written in Tcl/Tk
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www.awns.com/tkMOO-light/
 KEYWORDS=~amd64 ~x86
 LICENSE=tkMOO
-RDEPEND=>=dev-lang/tcl-8.3.3:0= >=dev-lang/tk-8.3.3:0=
+RDEPEND=dev-lang/tcl dev-lang/tk
 SLOT=0
 SRC_URI=http://www.awns.com/tkMOO-light/Source/tkMOO-light-0.3.32.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5774059e170d6dfe8ec70df834c106e4
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=f248690c7b8f8cb6eb7792c16a2afee8
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 9ac459414319..08667b409ca3 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1 b/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1
deleted file mode 100644
index aa7981a9047b..000000000000
--- a/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=highly addictive and remotely related to tetris
-EAPI=6
-HOMEPAGE=https://www.karimmi.de/cuyo/
-IUSE=+music
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/cuyo/cuyo-2.~-1.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2ed73885e5937963594d52698aa79ba0
diff --git a/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r2 b/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r2
new file mode 100644
index 000000000000..6c9c63de4b1f
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer[mod] sys-libs/zlib:= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Highly addictive and remotely related to tetris
+EAPI=7
+HOMEPAGE=https://www.karimmi.de/cuyo/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer[mod] sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/cuyo/cuyo-2.~-1.1.tar.gz
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3e0a8084d16ffb6bd0a0a5013358f0fb
diff --git a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1 b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1
deleted file mode 100644
index fc84a0bca815..000000000000
--- a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=x11-libs/gtk+:3 virtual/pkgconfig
-DESCRIPTION=Graphical implementation of the sliding puzzle game fifteen
-EAPI=6
-HOMEPAGE=https://frigidcode.com/code/gfifteen/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://frigidcode.com/code/gfifteen/gfifteen-1.0.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d6067d752571b1e31c60ea9d134b142a
diff --git a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r2 b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r2
new file mode 100644
index 000000000000..9d80dc936a94
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:3
+DESCRIPTION=Graphical implementation of the sliding puzzle game fifteen
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:3
+SLOT=0
+SRC_URI=mirror://gentoo/gfifteen-1.0.3.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=3652afececcacf0b6aaaa5fec7f7bba9
diff --git a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r1 b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r1
deleted file mode 100644
index 6e74459c0b57..000000000000
--- a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install
-DEPEND=acct-group/gamestat media-libs/libsdl[video] media-libs/sdl-mixer
-DESCRIPTION=puzzle game inspired by Atomix and written in SDL
-EAPI=7
-HOMEPAGE=http://lgames.sourceforge.net/LMarbles/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/gamestat media-libs/libsdl[video] media-libs/sdl-mixer
-SLOT=0
-SRC_URI=https://download.sourceforge.net/lgames/lmarbles-1.0.8.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6faab015b0ddada2198ac5b9f3ebc9a
diff --git a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r2 b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r2
new file mode 100644
index 000000000000..7420cd0d1892
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=acct-group/gamestat media-libs/libsdl[sound,video] media-libs/sdl-mixer
+DESCRIPTION=Puzzle game inspired by Atomix and written in SDL
+EAPI=8
+HOMEPAGE=http://lgames.sourceforge.net/LMarbles/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=acct-group/gamestat media-libs/libsdl[sound,video] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=https://download.sourceforge.net/lgames/lmarbles-1.0.8.tar.gz https://dev.gentoo.org/~ionen/distfiles/lmarbles.png
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=bc716e3493d7a1b2bb0d57bb5baeb236
diff --git a/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1 b/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
index 9ea57b42785b..3e49a3714e86 100644
--- a/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
+++ b/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
@@ -1,14 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext )
 DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=media-libs/libsdl2[sound,joystick,opengl,video] media-libs/sdl2-ttf media-libs/libpng:0= virtual/jpeg:0 media-libs/libvorbis virtual/opengl dev-games/physfs media-fonts/dejavu media-fonts/wqy-microhei nls? ( virtual/libintl ) sys-devel/gettext
+DEPEND=dev-games/physfs media-libs/libpng:= media-libs/libsdl2[joystick,opengl,sound,video] media-libs/libvorbis media-libs/sdl2-ttf virtual/jpeg virtual/opengl nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Clone of Super Monkey Ball using SDL/OpenGL
-EAPI=6
+EAPI=7
 HOMEPAGE=https://neverball.org
 IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ IJG
-RDEPEND=media-libs/libsdl2[sound,joystick,opengl,video] media-libs/sdl2-ttf media-libs/libpng:0= virtual/jpeg:0 media-libs/libvorbis virtual/opengl dev-games/physfs media-fonts/dejavu media-fonts/wqy-microhei nls? ( virtual/libintl )
+RDEPEND=dev-games/physfs media-libs/libpng:= media-libs/libsdl2[joystick,opengl,sound,video] media-libs/libvorbis media-libs/sdl2-ttf virtual/jpeg virtual/opengl nls? ( virtual/libintl ) media-fonts/dejavu media-fonts/wqy-microhei
 RESTRICT=test
 SLOT=0
 SRC_URI=https://neverball.org/neverball-1.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=78899d4fe5d197cff73185ab873b8b4d
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9003c7ac0897478e21be39ae9486daf4
diff --git a/metadata/md5-cache/games-puzzle/nightsky-20111222-r1 b/metadata/md5-cache/games-puzzle/nightsky-20111222-r1
index 54c662f3992e..a84d55508640 100644
--- a/metadata/md5-cache/games-puzzle/nightsky-20111222-r1
+++ b/metadata/md5-cache/games-puzzle/nightsky-20111222-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare
+DEFINED_PHASES=install nofetch postinst prepare
 DESCRIPTION=Puzzle game that puts you inside and ambient and mysterious universe
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.nicalis.com/nightsky/
 IUSE=bundled-libs
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXxf86vm !bundled-libs? ( media-libs/freealut media-libs/freeglut media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib )
-RESTRICT=bindist fetch splitdebug
+RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=nightskyhd-linux-1324519044.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3e91177054d91e73d8980886706cf8d5
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=fef0ec44ddc33400263a694b47654d59
diff --git a/metadata/md5-cache/games-puzzle/numptyphysics-0.3.5 b/metadata/md5-cache/games-puzzle/numptyphysics-0.3.5
deleted file mode 100644
index 1f23497d2b4c..000000000000
--- a/metadata/md5-cache/games-puzzle/numptyphysics-0.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile postinst postrm preinst
-DEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl
-DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
-EAPI=7
-HOMEPAGE=https://github.com/thp/numptyphysics
-IUSE=+user-levels
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl
-SLOT=0
-SRC_URI=user-levels? ( https://github.com/thp/numptyphysics/archive/0.3.5.tar.gz -> numptyphysics-0.3.5.tar.gz http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7c80d5c692bf5c6fcfeb4c65187f524
diff --git a/metadata/md5-cache/games-puzzle/numptyphysics-0.3.8 b/metadata/md5-cache/games-puzzle/numptyphysics-0.3.8
new file mode 100644
index 000000000000..cf7ac4651101
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/numptyphysics-0.3.8
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
+EAPI=7
+HOMEPAGE=https://github.com/thp/numptyphysics
+KEYWORDS=~amd64
+LICENSE=BSD GPL-3+ ZLIB
+RDEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/thp/numptyphysics/archive/0.3.8.tar.gz -> numptyphysics-0.3.8.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b87ec5adada6cc2f0092c091486532d2
diff --git a/metadata/md5-cache/games-puzzle/numptyphysics-9999 b/metadata/md5-cache/games-puzzle/numptyphysics-9999
index b5fc776aa573..97f0a248caca 100644
--- a/metadata/md5-cache/games-puzzle/numptyphysics-9999
+++ b/metadata/md5-cache/games-puzzle/numptyphysics-9999
@@ -1,14 +1,12 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile postinst postrm preinst unpack
-DEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl
+DEFINED_PHASES=compile postinst postrm preinst prepare unpack
+DEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
 EAPI=7
 HOMEPAGE=https://github.com/thp/numptyphysics
-IUSE=+user-levels
-LICENSE=GPL-3+
+LICENSE=BSD GPL-3+ ZLIB
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl
 SLOT=0
-SRC_URI=user-levels? ( http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e33050fe39cd4dbd19f6fb9474ba1f51
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8813e05b5b1a657895ef91baba9bef80
diff --git a/metadata/md5-cache/games-puzzle/picpuz-2.5-r1 b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
index 190b57eaf811..63cdef5ba5de 100644
--- a/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
+++ b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DEPEND=x11-libs/gtk+:3 virtual/pkgconfig
-DESCRIPTION=A jigsaw puzzle program
-EAPI=6
-HOMEPAGE=http://kornelix.squarespace.com/picpuz/
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/gtk+:3
+DESCRIPTION=Jigsaw puzzle program
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-3+
 RDEPEND=x11-libs/gtk+:3
 SLOT=0
-SRC_URI=http://kornelix.squarespace.com/storage/downloads/picpuz-2.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6eb78cb971dba8cb31dc3bb8c35b7b14
+SRC_URI=mirror://gentoo/picpuz-2.5.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6ba749395008aa219d26a628152db40d
diff --git a/metadata/md5-cache/games-puzzle/xlogical-1.0.7-r1 b/metadata/md5-cache/games-puzzle/xlogical-1.0.7-r1
deleted file mode 100644
index e98e6890bc9b..000000000000
--- a/metadata/md5-cache/games-puzzle/xlogical-1.0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=alt_gfx? ( app-arch/unzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
-DESCRIPTION=SDL logical clone
-EAPI=7
-HOMEPAGE=https://changeling.ixionstudios.com/xlogical/
-IUSE=alt_gfx
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod] acct-group/gamestat
-SLOT=0
-SRC_URI=https://changeling.ixionstudios.com/xlogical/downloads/xlogical-1.0-7.tar.bz2 alt_gfx? ( https://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bf14dd81ed026b596f41810b06c57618
diff --git a/metadata/md5-cache/games-puzzle/xlogical-1.0.8 b/metadata/md5-cache/games-puzzle/xlogical-1.0.8
new file mode 100644
index 000000000000..cc22c12f4230
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/xlogical-1.0.8
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=install prepare
+DEPEND=acct-group/gamestat media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
+DESCRIPTION=Puzzle game based on the Logical! game released on the Commodore Amiga
+EAPI=8
+HOMEPAGE=https://changeling.ixionstudios.com/xlogical/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=acct-group/gamestat media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
+SLOT=0
+SRC_URI=https://changeling.ixionstudios.com/xlogical/downloads/xlogical-1.0-8.tar.bz2 https://dev.gentoo.org/~ionen/distfiles/xlogical.png
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d563f853311c7b9f6ed1a5579a256b1d
diff --git a/metadata/md5-cache/games-puzzle/xye-0.12.2 b/metadata/md5-cache/games-puzzle/xye-0.12.2
index d6aa5b47d2a1..d5d57caa00cf 100644
--- a/metadata/md5-cache/games-puzzle/xye-0.12.2
+++ b/metadata/md5-cache/games-puzzle/xye-0.12.2
@@ -1,12 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-ttf dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Free version of the classic game Kye
-EAPI=6
+EAPI=7
 HOMEPAGE=http://xye.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
-RDEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png]
+RDEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-ttf
 SLOT=0
 SRC_URI=mirror://sourceforge/xye/xye-0.12.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c06256972ddd5914756be4d609f217e6
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d5bd261ce67cb1371af3963ef4a67934
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 21e0da06d6a6..78cb0fbe6e5c 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.17.1.01 b/metadata/md5-cache/games-server/bedrock-server-1.17.1.01
deleted file mode 100644
index 5519a71ae4d7..000000000000
--- a/metadata/md5-cache/games-server/bedrock-server-1.17.1.01
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install
-DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
-EAPI=7
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
-LICENSE=Mojang
-RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 net-misc/curl[ssl] sys-libs/zlib
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.17.1.01.zip
-_md5_=deeb1a44800d95200001665bddc84742
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.17.10.04 b/metadata/md5-cache/games-server/bedrock-server-1.17.10.04
new file mode 100644
index 000000000000..a23e8bcd3f1d
--- /dev/null
+++ b/metadata/md5-cache/games-server/bedrock-server-1.17.10.04
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install
+DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
+EAPI=7
+HOMEPAGE=https://www.minecraft.net/
+KEYWORDS=-* ~amd64
+LICENSE=Mojang
+RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 net-misc/curl[ssl] sys-libs/zlib
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.17.10.04.zip
+_md5_=deeb1a44800d95200001665bddc84742
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.17 b/metadata/md5-cache/games-server/minecraft-server-1.17
deleted file mode 100644
index 5cbaf7a040a9..000000000000
--- a/metadata/md5-cache/games-server/minecraft-server-1.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The official server for the sandbox video game
-EAPI=7
-HOMEPAGE=https://www.minecraft.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Mojang
-RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( >=virtual/jre-1.8 >=virtual/jdk-1.8 ) >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar -> minecraft-server-1.17.jar
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9eb68ec47e6c7b17e3d238409ec49269
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.17.1 b/metadata/md5-cache/games-server/minecraft-server-1.17.1
new file mode 100644
index 000000000000..1bc98f9057a6
--- /dev/null
+++ b/metadata/md5-cache/games-server/minecraft-server-1.17.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst prepare setup unpack
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=The official server for the sandbox video game
+EAPI=7
+HOMEPAGE=https://www.minecraft.net/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Mojang
+RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( >=virtual/jre-1.8 >=virtual/jdk-1.8 ) >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar -> minecraft-server-1.17.1.jar
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a610dc48ac8c0c8a629448d90b724e05
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 86f7a871327f..a74b4d850122 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/flightgear-2020.3.8 b/metadata/md5-cache/games-simulation/flightgear-2020.3.8
index f830675f4c9f..91de93177bcf 100644
--- a/metadata/md5-cache/games-simulation/flightgear-2020.3.8
+++ b/metadata/md5-cache/games-simulation/flightgear-2020.3.8
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-20
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/flightgear-2020.3.8.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f518585f3145a8759a6fe9d6c282b374
diff --git a/metadata/md5-cache/games-simulation/flightgear-9999 b/metadata/md5-cache/games-simulation/flightgear-9999
index e376f9ec798f..2833210ad536 100644
--- a/metadata/md5-cache/games-simulation/flightgear-9999
+++ b/metadata/md5-cache/games-simulation/flightgear-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-9999
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=86919e200a0fbfe9f6dabe36ceb723ba
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 400ce13ac380..24a58bd2aa9c 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/war1gus-3.1.1 b/metadata/md5-cache/games-strategy/war1gus-3.1.1
new file mode 100644
index 000000000000..cb08fb067ae5
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/war1gus-3.1.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==games-engines/stratagus-3.1.1*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+DESCRIPTION=Warcraft: Orcs & Humans for the Stratagus game engine
+EAPI=7
+HOMEPAGE=https://stratagus.com/war1gus.html https://github.com/Wargus/war1gus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==games-engines/stratagus-3.1.1*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/Wargus/war1gus/archive/v3.1.1.tar.gz -> war1gus-3.1.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=57fd2426dffa735ce3ad97a5c208062f
diff --git a/metadata/md5-cache/games-strategy/war1gus-3.1.2 b/metadata/md5-cache/games-strategy/war1gus-3.1.2
new file mode 100644
index 000000000000..4cbd5551e3eb
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/war1gus-3.1.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==games-engines/stratagus-3.1.2*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+DESCRIPTION=Warcraft: Orcs & Humans for the Stratagus game engine
+EAPI=7
+HOMEPAGE=https://stratagus.com/war1gus.html https://github.com/Wargus/war1gus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==games-engines/stratagus-3.1.2*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/Wargus/war1gus/archive/v3.1.2.tar.gz -> war1gus-3.1.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=57fd2426dffa735ce3ad97a5c208062f
diff --git a/metadata/md5-cache/games-strategy/wargus-3.1.1 b/metadata/md5-cache/games-strategy/wargus-3.1.1
new file mode 100644
index 000000000000..f0e1681480d2
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wargus-3.1.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend test
+DEPEND==games-engines/stratagus-3.1.1*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 bne? ( app-arch/stormlib:= ) !games-strategy/wargus-data
+DESCRIPTION=Warcraft II for the Stratagus game engine
+EAPI=7
+HOMEPAGE=https://stratagus.com/ https://github.com/Wargus/wargus
+IUSE=+bne
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==games-engines/stratagus-3.1.1*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 bne? ( app-arch/stormlib:= ) !games-strategy/wargus-data
+SLOT=0
+SRC_URI=https://github.com/Wargus/wargus/archive/v3.1.1.tar.gz -> wargus-3.1.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7c1c07cb3dc673db3ea326a230c23d99
diff --git a/metadata/md5-cache/games-strategy/wargus-3.1.2 b/metadata/md5-cache/games-strategy/wargus-3.1.2
new file mode 100644
index 000000000000..34b18b006199
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wargus-3.1.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend test
+DEPEND==games-engines/stratagus-3.1.2*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 bne? ( app-arch/stormlib:= ) !games-strategy/wargus-data
+DESCRIPTION=Warcraft II for the Stratagus game engine
+EAPI=7
+HOMEPAGE=https://stratagus.com/ https://github.com/Wargus/wargus
+IUSE=+bne
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==games-engines/stratagus-3.1.2*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 bne? ( app-arch/stormlib:= ) !games-strategy/wargus-data
+SLOT=0
+SRC_URI=https://github.com/Wargus/wargus/archive/v3.1.2.tar.gz -> wargus-3.1.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7c1c07cb3dc673db3ea326a230c23d99
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 261939f37d50..57d2f7cd9f73 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/dconf-0.40.0 b/metadata/md5-cache/gnome-base/dconf-0.40.0
index e8d890af0cbe..155aeef0bb2b 100644
--- a/metadata/md5-cache/gnome-base/dconf-0.40.0
+++ b/metadata/md5-cache/gnome-base/dconf-0.40.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf/0.40/dconf-0.40.0.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=67e5f8d4e05f693ef0fd6cf450255a8c
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-40.0 b/metadata/md5-cache/gnome-base/gnome-control-center-40.0
index 03e9e5f6b18d..a40ecc3533ed 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-40.0
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-40.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/40/gnome-control-center-40.0.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-40.0-patchset-2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=595f4ae4335537ff4b6ae30bd4f12fc7
+_md5_=d0d363e22e58513a5e32011c62ec8eed
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-40.3 b/metadata/md5-cache/gnome-base/gnome-shell-40.3
new file mode 100644
index 000000000000..771cb00a0b48
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-shell-40.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/sassc dev-libs/libxslt app-text/asciidoc >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.65.1 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-40.0:0/8[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.1 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:0/0.3 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) media-libs/mesa[X(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Provides core UI functions for the GNOME desktop
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
+IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
+RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.65.1 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-40.0:0/8[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.1 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:0/0.3 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell sys-apps/xdg-desktop-portal-gtk
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell/40/gnome-shell-40.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=02812c36bdc8d2de63653667c2fa677e
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index c79621c3d4ae..1ca0f39949bc 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-4.8.6 b/metadata/md5-cache/gnome-extra/cinnamon-4.8.6
index 6c28338bb200..97ad24fab435 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-4.8.6
+++ b/metadata/md5-cache/gnome-extra/cinnamon-4.8.6
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon/archive/4.8.6.tar.gz -> cinnamon-4.8.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1be6f1f028cf03efea86b4e624adfe76
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-5.0.2 b/metadata/md5-cache/gnome-extra/cinnamon-5.0.2
deleted file mode 100644
index f4b32d314b5e..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-5.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon
-IUSE=+gstreamer gtk-doc +nls +networkmanager python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) >=app-accessibility/caribou-0.3 dev-libs/keybinder:3[introspection] dev-libs/libtimezonemap python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pexpect[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] dev-python/pypam[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/tinycss2[python_targets_python3_8(-)] >=dev-python/xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pexpect[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] dev-python/pypam[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/tinycss2[python_targets_python3_9(-)] >=dev-python/xapp-2.2.0[python_targets_python3_9(-)] ) >=gnome-base/dconf-0.4.1 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/libgnomekbd-2.91.4 >=gnome-extra/cinnamon-control-center-5.0[networkmanager=] >=gnome-extra/cinnamon-screensaver-5.0 >=gnome-extra/cinnamon-session-5.0 >=gnome-extra/cinnamon-settings-daemon-5.0 >=gnome-extra/nemo-5.0 gnome-extra/polkit-gnome net-misc/wget sys-apps/accountsservice[introspection] sys-power/upower[introspection] >=x11-libs/xapps-2.2.0[introspection] x11-misc/xdg-utils x11-themes/adwaita-icon-theme x11-themes/gnome-themes-standard nls? ( >=gnome-extra/cinnamon-translations-5.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon/archive/5.0.2.tar.gz -> cinnamon-5.0.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c8c99a79ec9e25addc6b9409bac45c8d
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-5.0.4 b/metadata/md5-cache/gnome-extra/cinnamon-5.0.4
new file mode 100644
index 000000000000..6af9798b422e
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-5.0.4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon
+IUSE=+gstreamer gtk-doc +nls +networkmanager python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) >=app-accessibility/caribou-0.3 dev-libs/keybinder:3[introspection] dev-libs/libtimezonemap python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pexpect[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] dev-python/pypam[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/tinycss2[python_targets_python3_8(-)] >=dev-python/xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pexpect[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] dev-python/pypam[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/tinycss2[python_targets_python3_9(-)] >=dev-python/xapp-2.2.0[python_targets_python3_9(-)] ) >=gnome-base/dconf-0.4.1 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/libgnomekbd-2.91.4 >=gnome-extra/cinnamon-control-center-5.0[networkmanager=] >=gnome-extra/cinnamon-screensaver-5.0 >=gnome-extra/cinnamon-session-5.0 >=gnome-extra/cinnamon-settings-daemon-5.0 >=gnome-extra/nemo-5.0 gnome-extra/polkit-gnome net-misc/wget sys-apps/accountsservice[introspection] sys-power/upower[introspection] >=x11-libs/xapps-2.2.0[introspection] x11-misc/xdg-utils x11-themes/adwaita-icon-theme x11-themes/gnome-themes-standard nls? ( >=gnome-extra/cinnamon-translations-5.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon/archive/5.0.4.tar.gz -> cinnamon-5.0.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=63b6cf8f1ad40d5623848524be8355b2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.0.1
deleted file mode 100644
index e622d542148c..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/glib-utils >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.44.0:2 >=gnome-base/libgnomekbd-3.0.0:0= >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0:0= media-libs/fontconfig >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 >=x11-libs/libxklavier-5.1 colord? ( >=x11-misc/colord-0.1.14:0= ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-extra/cinnamon-settings-daemon-5.0:0= >=x11-libs/libXi-1.2 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager?] modemmanager? ( >=net-misc/modemmanager-0.7 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.18.0 ) app-text/iso-codes x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Cinnamons's main interface to configure various aspects of the desktop
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center
-IUSE=+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.44.0:2 >=gnome-base/libgnomekbd-3.0.0:0= >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0:0= media-libs/fontconfig >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 >=x11-libs/libxklavier-5.1 colord? ( >=x11-misc/colord-0.1.14:0= ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-extra/cinnamon-settings-daemon-5.0:0= >=x11-libs/libXi-1.2 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager?] modemmanager? ( >=net-misc/modemmanager-0.7 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.18.0 ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd )
-REQUIRED_USE=modemmanager? ( networkmanager )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/5.0.1.tar.gz -> cinnamon-control-center-5.0.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=67ab9e871e5e2610c3a5c0d1498a9fc3
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.0.2 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.0.2
new file mode 100644
index 000000000000..ee00b3134e3b
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.0.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/glib-utils >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.44.0:2 >=gnome-base/libgnomekbd-3.0.0:0= >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0:0= media-libs/fontconfig >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 >=x11-libs/libxklavier-5.1 colord? ( >=x11-misc/colord-0.1.14:0= ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-extra/cinnamon-settings-daemon-5.0:0= >=x11-libs/libXi-1.2 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager?] modemmanager? ( >=net-misc/modemmanager-0.7 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.18.0 ) app-text/iso-codes x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamons's main interface to configure various aspects of the desktop
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center
+IUSE=+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.44.0:2 >=gnome-base/libgnomekbd-3.0.0:0= >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0:0= media-libs/fontconfig >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 >=x11-libs/libxklavier-5.1 colord? ( >=x11-misc/colord-0.1.14:0= ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-extra/cinnamon-settings-daemon-5.0:0= >=x11-libs/libXi-1.2 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager?] modemmanager? ( >=net-misc/modemmanager-0.7 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.18.0 ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd )
+REQUIRED_USE=modemmanager? ( networkmanager )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/5.0.2.tar.gz -> cinnamon-control-center-5.0.2.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=67ab9e871e5e2610c3a5c0d1498a9fc3
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.5 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.5
deleted file mode 100644
index b9a1b34f2bc2..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-5.0:0= sys-apps/dbus sys-libs/pam >=x11-libs/gtk+-3.22:3[introspection] x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-themes/adwaita-icon-theme xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Screensaver for Cinnamon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-screensaver
-IUSE=systemd xinerama python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-5.0:0= sys-apps/dbus sys-libs/pam >=x11-libs/gtk+-3.22:3[introspection] x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-themes/adwaita-icon-theme xinerama? ( x11-libs/libXinerama ) >=app-accessibility/caribou-0.3 sys-apps/accountsservice[introspection] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] >=dev-python/xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] >=dev-python/xapp-2.2.0[python_targets_python3_9(-)] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( sys-auth/elogind )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/5.0.5.tar.gz -> cinnamon-screensaver-5.0.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fec78d12f9f5eeb71b534752801c9be2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.6 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.6
new file mode 100644
index 000000000000..83445d961edf
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.6
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-5.0:0= sys-apps/dbus sys-libs/pam >=x11-libs/gtk+-3.22:3[introspection] x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-themes/adwaita-icon-theme xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Screensaver for Cinnamon
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-screensaver
+IUSE=systemd xinerama python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-5.0:0= sys-apps/dbus sys-libs/pam >=x11-libs/gtk+-3.22:3[introspection] x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-themes/adwaita-icon-theme xinerama? ( x11-libs/libXinerama ) >=app-accessibility/caribou-0.3 sys-apps/accountsservice[introspection] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] >=dev-python/xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] >=dev-python/xapp-2.2.0[python_targets_python3_9(-)] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( sys-auth/elogind )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/5.0.6.tar.gz -> cinnamon-screensaver-5.0.6.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fec78d12f9f5eeb71b534752801c9be2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.2 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.2
deleted file mode 100644
index daf89f663a9e..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/glib-utils dev-util/gdbus-codegen >=dev-util/intltool-0.37.1 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6 >=gnome-extra/cinnamon-desktop-5.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3,pulseaudio] >=media-sound/pulseaudio-0.9.16[glib] >=sys-apps/dbus-1.1.2 dev-libs/dbus-glib >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi >=x11-libs/libxklavier-5.0 >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-base/librsvg-2.36.2 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= ) dev-libs/libxml2:2 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Cinnamon's settings daemon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon
-IUSE=+colord cups input_devices_wacom smartcard systemd
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6 >=gnome-extra/cinnamon-desktop-5.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3,pulseaudio] >=media-sound/pulseaudio-0.9.16[glib] >=sys-apps/dbus-1.1.2 dev-libs/dbus-glib >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi >=x11-libs/libxklavier-5.0 >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-base/librsvg-2.36.2 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/5.0.2.tar.gz -> cinnamon-settings-daemon-5.0.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f8ff3aa67870fe853d0d87fba31ee205
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.3 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.3
new file mode 100644
index 000000000000..be993bd0ccf8
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.3
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/glib-utils dev-util/gdbus-codegen >=dev-util/intltool-0.37.1 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6 >=gnome-extra/cinnamon-desktop-5.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3,pulseaudio] >=media-sound/pulseaudio-0.9.16[glib] >=sys-apps/dbus-1.1.2 dev-libs/dbus-glib >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi >=x11-libs/libxklavier-5.0 >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-base/librsvg-2.36.2 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= ) dev-libs/libxml2:2 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamon's settings daemon
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon
+IUSE=+colord cups input_devices_wacom smartcard systemd
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6 >=gnome-extra/cinnamon-desktop-5.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3,pulseaudio] >=media-sound/pulseaudio-0.9.16[glib] >=sys-apps/dbus-1.1.2 dev-libs/dbus-glib >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi >=x11-libs/libxklavier-5.0 >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-base/librsvg-2.36.2 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/5.0.3.tar.gz -> cinnamon-settings-daemon-5.0.3.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f8ff3aa67870fe853d0d87fba31ee205
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-5.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-translations-5.0.1
deleted file mode 100644
index 9b3e3bc17456..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-5.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=sys-devel/gettext
-DEFINED_PHASES=configure install
-DESCRIPTION=Translation data for Cinnamon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/5.0.1.tar.gz -> cinnamon-translations-5.0.1.tar.gz
-_eclasses_=plocale	89c6aac5da68423465e6fd79fb4ad5fb
-_md5_=805d90351ad528baf5b3c131fec1bc92
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-5.0.2 b/metadata/md5-cache/gnome-extra/cinnamon-translations-5.0.2
new file mode 100644
index 000000000000..7bd0018bbffa
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-5.0.2
@@ -0,0 +1,11 @@
+BDEPEND=sys-devel/gettext
+DEFINED_PHASES=configure install
+DESCRIPTION=Translation data for Cinnamon
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/5.0.2.tar.gz -> cinnamon-translations-5.0.2.tar.gz
+_eclasses_=plocale	89c6aac5da68423465e6fd79fb4ad5fb
+_md5_=d05cf23a91e2cca2f4c064de9d445866
diff --git a/metadata/md5-cache/gnome-extra/cjs-4.8.2-r1 b/metadata/md5-cache/gnome-extra/cjs-4.8.2-r1
index 38a5ec860b2b..684befe3d9b2 100644
--- a/metadata/md5-cache/gnome-extra/cjs-4.8.2-r1
+++ b/metadata/md5-cache/gnome-extra/cjs-4.8.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/spidermonkey:78 >=dev-libs/glib-2.58.0:2 >=dev-libs/gobject-int
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/4.8.2.tar.gz -> cjs-4.8.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=2a7b4d4f2fea6d6bc82ece027e4f12de
diff --git a/metadata/md5-cache/gnome-extra/cjs-5.0.0-r1 b/metadata/md5-cache/gnome-extra/cjs-5.0.0-r1
index 7a574ea11abe..4d864185d081 100644
--- a/metadata/md5-cache/gnome-extra/cjs-5.0.0-r1
+++ b/metadata/md5-cache/gnome-extra/cjs-5.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/spidermonkey:78 >=dev-libs/glib-2.58.0:2 >=dev-libs/gobject-int
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/5.0.0.tar.gz -> cjs-5.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=fb75f47d366c2f3a1baa8e088d4a932a
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-40.3 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-40.3
new file mode 100644
index 000000000000..696bf14051c6
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-40.3
@@ -0,0 +1,13 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=JavaScript extensions for GNOME Shell
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-40.3* media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme >=x11-wm/mutter-3.32[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell-extensions/40/gnome-shell-extensions-40.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d9e3f12839c7554fccf07c4d5c869232
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-40.3-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-40.3-r1
new file mode 100644
index 000000000000..31e44e8989ce
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-40.3-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=JavaScript extensions for GNOME Shell
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-40.3* media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme >=x11-wm/mutter-3.32[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell-extensions/40/gnome-shell-extensions-40.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=24a25c8ab29487fda9dd35a51f8118ac
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-40.3 b/metadata/md5-cache/gnome-extra/gnome-user-docs-40.3
new file mode 100644
index 000000000000..e2337d066f63
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-user-docs-40.3
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME end user documentation
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-user-docs
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=CC-BY-3.0
+RESTRICT=binchecks strip !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-user-docs/40/gnome-user-docs-40.3.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fb72bb30f9f314c1f00a4c08cea6ea63
diff --git a/metadata/md5-cache/gnome-extra/nemo-5.0.1 b/metadata/md5-cache/gnome-extra/nemo-5.0.1
deleted file mode 100644
index 6c2cced1fe28..000000000000
--- a/metadata/md5-cache/gnome-extra/nemo-5.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/gdbus-codegen-2.31.0 >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.45.7:2[dbus] >=dev-libs/gobject-introspection-0.9.12:= >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/libgsf >=x11-libs/gtk+-3.10.0:3[introspection] >=x11-libs/libnotify-0.7:= x11-libs/libX11 >=x11-libs/pango-1.40.0 >=x11-libs/xapps-2.2.0 exif? ( >=media-libs/libexif-0.6.20:= ) selinux? ( sys-libs/libselinux ) tracker? ( >=app-misc/tracker-2.0:0= ) xmp? ( >=media-libs/exempi-2.2.0:= ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo
-IUSE=doc exif +nls selinux test tracker xmp python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1
-PDEPEND=>=gnome-base/gvfs-0.1.2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.45.7:2[dbus] >=dev-libs/gobject-introspection-0.9.12:= >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/libgsf >=x11-libs/gtk+-3.10.0:3[introspection] >=x11-libs/libnotify-0.7:= x11-libs/libX11 >=x11-libs/pango-1.40.0 >=x11-libs/xapps-2.2.0 exif? ( >=media-libs/libexif-0.6.20:= ) selinux? ( sys-libs/libselinux ) tracker? ( >=app-misc/tracker-2.0:0= ) xmp? ( >=media-libs/exempi-2.2.0:= ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-5.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linuxmint/nemo/archive/5.0.1.tar.gz -> nemo-5.0.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f815d6fa50193fd383fa8b3afb5aecdb
diff --git a/metadata/md5-cache/gnome-extra/nemo-5.0.3 b/metadata/md5-cache/gnome-extra/nemo-5.0.3
new file mode 100644
index 000000000000..d0140787a694
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nemo-5.0.3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/gdbus-codegen-2.31.0 >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.45.7:2[dbus] >=dev-libs/gobject-introspection-0.9.12:= >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/libgsf >=x11-libs/gtk+-3.10.0:3[introspection] >=x11-libs/libnotify-0.7:= x11-libs/libX11 >=x11-libs/pango-1.40.0 >=x11-libs/xapps-2.2.0 exif? ( >=media-libs/libexif-0.6.20:= ) selinux? ( sys-libs/libselinux ) tracker? ( >=app-misc/tracker-2.0:0= ) xmp? ( >=media-libs/exempi-2.2.0:= ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo
+IUSE=doc exif +nls selinux test tracker xmp python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+ FDL-1.1
+PDEPEND=>=gnome-base/gvfs-0.1.2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.45.7:2[dbus] >=dev-libs/gobject-introspection-0.9.12:= >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/libgsf >=x11-libs/gtk+-3.10.0:3[introspection] >=x11-libs/libnotify-0.7:= x11-libs/libX11 >=x11-libs/pango-1.40.0 >=x11-libs/xapps-2.2.0 exif? ( >=media-libs/libexif-0.6.20:= ) selinux? ( sys-libs/libselinux ) tracker? ( >=app-misc/tracker-2.0:0= ) xmp? ( >=media-libs/exempi-2.2.0:= ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-5.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/nemo/archive/5.0.3.tar.gz -> nemo-5.0.3.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=09dc65aefc4d2401828328f4d5d6d378
diff --git a/metadata/md5-cache/gnome-extra/nemo-fileroller-5.0.0 b/metadata/md5-cache/gnome-extra/nemo-fileroller-5.0.0
deleted file mode 100644
index 499848c2b016..000000000000
--- a/metadata/md5-cache/gnome-extra/nemo-fileroller-5.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.14.0 >=gnome-extra/nemo-2.0.0
-DESCRIPTION=Nemo file-roller integration
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo-extensions
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14.0 >=gnome-extra/nemo-2.0.0 app-arch/file-roller
-SLOT=0
-SRC_URI=https://github.com/linuxmint/nemo-extensions/archive/5.0.0.tar.gz -> nemo-extensions-5.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b57b9b0e4866a3f0c24fbd2cd15116e
diff --git a/metadata/md5-cache/gnome-extra/nemo-fileroller-5.0.1 b/metadata/md5-cache/gnome-extra/nemo-fileroller-5.0.1
new file mode 100644
index 000000000000..fd4d8288a61d
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nemo-fileroller-5.0.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.14.0 >=gnome-extra/nemo-2.0.0
+DESCRIPTION=Nemo file-roller integration
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo-extensions
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.14.0 >=gnome-extra/nemo-2.0.0 app-arch/file-roller
+SLOT=0
+SRC_URI=https://github.com/linuxmint/nemo-extensions/archive/5.0.0.tar.gz -> nemo-extensions-5.0.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1145b470ac6fe7e4f2261df61e5e916f
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index f4c37480a960..9fe5ec88131d 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/waybar-0.9.5-r1 b/metadata/md5-cache/gui-apps/waybar-0.9.5-r1
index 80213a8b89b6..15dc5ccfe5a3 100644
--- a/metadata/md5-cache/gui-apps/waybar-0.9.5-r1
+++ b/metadata/md5-cache/gui-apps/waybar-0.9.5-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsig
 SLOT=0
 SRC_URI=https://github.com/Alexays/Waybar/archive/0.9.5.tar.gz -> waybar-0.9.5.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=880e082471bcdd5368cfba334ab7f90c
+_md5_=b7d1ed512241dfffa6472246dc69aad9
diff --git a/metadata/md5-cache/gui-apps/waybar-0.9.7-r1 b/metadata/md5-cache/gui-apps/waybar-0.9.7-r1
index 54852f0c7c84..3ffed3ae04d2 100644
--- a/metadata/md5-cache/gui-apps/waybar-0.9.7-r1
+++ b/metadata/md5-cache/gui-apps/waybar-0.9.7-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsig
 SLOT=0
 SRC_URI=https://github.com/Alexays/Waybar/archive/0.9.7.tar.gz -> waybar-0.9.7.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=880e082471bcdd5368cfba334ab7f90c
+_md5_=678fdfe80a51dcabaacdc66e39a8d663
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index d37358e1fb49..a08d1ea83b65 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/akonadi-21.04.2 b/metadata/md5-cache/kde-apps/akonadi-21.04.2
deleted file mode 100644
index 8d49a5dad07e..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-21.04.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.3:5 net-libs/accounts-qt ) sqlite? ( dev-db/sqlite:3 >=dev-qt/qtsql-5.15.2:5=[sqlite] ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Storage service for PIM data and libraries for PIM apps
-EAPI=7
-HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
-IUSE=+kaccounts +mysql postgres sqlite tools xml test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=app-arch/xz-utils >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.3:5 net-libs/accounts-qt ) sqlite? ( dev-db/sqlite:3 >=dev-qt/qtsql-5.15.2:5=[sqlite] ) xml? ( dev-libs/libxml2 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/akonadi-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fff3138a1ff01be0d9e6e53c5c68c79b
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-21.04.2 b/metadata/md5-cache/kde-apps/akonadi-calendar-21.04.2
deleted file mode 100644
index 4bf3e1df9946..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi calendar integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/akonadi-calendar-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=02d93cf26956c1133e2ee26a4531a659
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-21.04.2 b/metadata/md5-cache/kde-apps/akonadi-contacts-21.04.2
deleted file mode 100644
index 61e370ba6139..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/prison-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi contact integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/prison-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/akonadi-contacts-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=18193640781d3c9e6d8916bbbe8e9370
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-21.04.2 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-21.04.2
deleted file mode 100644
index cf5e296d3069..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/qtkeychain:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/mailimporter-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
-EAPI=7
-HOMEPAGE=https://kde.org/ https://userbase.kde.org/KMail/Import_Options
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=dev-libs/qtkeychain:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/mailimporter-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/akonadi-import-wizard-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8185ed04c6ea7512cc4307f1c0058ae0
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-21.04.2 b/metadata/md5-cache/kde-apps/akonadi-mime-21.04.2
deleted file mode 100644
index c1863054c715..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi mime types
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/akonadi-mime-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aa6e9fff1c70cdf3aaaa6e2f5b6f040d
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-21.04.2 b/metadata/md5-cache/kde-apps/akonadi-notes-21.04.2
deleted file mode 100644
index cd05152ffbd4..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-frameworks/ki18n-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi notes integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/akonadi-notes-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e93da722aca61b7d14adca3edc0d3fcb
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-21.04.2 b/metadata/md5-cache/kde-apps/akonadi-search-21.04.2
deleted file mode 100644
index 47689912a6f4..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-apps/akonadi-21.04.2:5[tools] ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/xapian-1.3:=[chert(+)] >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/krunner-5.80.0:5 dev-libs/boost test? ( >=kde-apps/akonadi-21.04.2:5[mysql,postgres,sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libraries and daemons to implement searching in Akonadi
-EAPI=7
-HOMEPAGE=https://invent.kde.org/pim/akonadi-search
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/xapian-1.3:=[chert(+)] >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/krunner-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/akonadi-search-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0092ca338e9ff44f34725e29bb41e484
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-21.04.2 b/metadata/md5-cache/kde-apps/akonadiconsole-21.04.2
deleted file mode 100644
index aa2b684726d9..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/xapian:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application for debugging Akonadi Resources
-EAPI=7
-HOMEPAGE=https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
-RDEPEND=dev-libs/xapian:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/akonadiconsole-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7fa545ff442a491e18acdb5c6b1c081
diff --git a/metadata/md5-cache/kde-apps/akregator-21.04.2 b/metadata/md5-cache/kde-apps/akregator-21.04.2
deleted file mode 100644
index d8112e06ef77..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/syndication-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/grantlee:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=News feed aggregator
-EAPI=7
-HOMEPAGE=https://apps.kde.org/akregator/
-IUSE=telemetry debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/syndication-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/akregator-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2a6c90e5bb5bd67f844c122cc7de1a91
diff --git a/metadata/md5-cache/kde-apps/analitza-21.04.2 b/metadata/md5-cache/kde-apps/analitza-21.04.2
deleted file mode 100644
index abb64b7d7c01..000000000000
--- a/metadata/md5-cache/kde-apps/analitza-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[-gles2-only] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 eigen? ( dev-cpp/eigen:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE library for mathematical features
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=eigen nls test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[-gles2-only] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 eigen? ( dev-cpp/eigen:3 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/analitza-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3c1cd41b543baaf8d39a5ac91cfd1994
diff --git a/metadata/md5-cache/kde-apps/ark-21.04.2 b/metadata/md5-cache/kde-apps/ark-21.04.2
deleted file mode 100644
index 155a1242179b..000000000000
--- a/metadata/md5-cache/kde-apps/ark-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/libarchive:=[bzip2,lzma,zlib] >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=File archiver by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/ark/ https://utils.kde.org/projects/ark/
-IUSE=zip test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/libarchive:=[bzip2,lzma,zlib] >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ark-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a77a0bb4dd62ee037df072e4c01b7622
diff --git a/metadata/md5-cache/kde-apps/artikulate-21.04.2 b/metadata/md5-cache/kde-apps/artikulate-21.04.2
deleted file mode 100644
index b9d3a8ec6024..000000000000
--- a/metadata/md5-cache/kde-apps/artikulate-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Language learning application that helps improving pronunciation skills
-EAPI=7
-HOMEPAGE=https://apps.kde.org/artikulate/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/artikulate-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5d5402945db676940de2a7ad6c51d95b
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-21.04.2 b/metadata/md5-cache/kde-apps/audiocd-kio-21.04.2
deleted file mode 100644
index e6c1911bb1c4..000000000000
--- a/metadata/md5-cache/kde-apps/audiocd-kio-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkcddb-21.04.2:5 >=kde-apps/libkcompactdisc-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=kioslave for accessing audio CDs
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=flac vorbis debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkcddb-21.04.2:5 >=kde-apps/libkcompactdisc-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/audiocd-kio-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=65ef8fcc7efa7abff401175d1dccfa35
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-21.04.2 b/metadata/md5-cache/kde-apps/baloo-widgets-21.04.2
deleted file mode 100644
index 0b8f2a3e481d..000000000000
--- a/metadata/md5-cache/kde-apps/baloo-widgets-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/baloo-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Widget library for baloo
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/baloo-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/baloo-widgets-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e7a138c6eeb31192c5a09c4a21c0000f
diff --git a/metadata/md5-cache/kde-apps/blinken-21.04.2 b/metadata/md5-cache/kde-apps/blinken-21.04.2
deleted file mode 100644
index 5b65dd23b239..000000000000
--- a/metadata/md5-cache/kde-apps/blinken-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Memory enhancement game based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/blinken/ https://edu.kde.org/blinken/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/blinken-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=87b14aca95c2a0fdab9caa1d83661770
diff --git a/metadata/md5-cache/kde-apps/bomber-21.04.2 b/metadata/md5-cache/kde-apps/bomber-21.04.2
deleted file mode 100644
index 7562b98804db..000000000000
--- a/metadata/md5-cache/kde-apps/bomber-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Single player arcade bombing game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/bomber/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 !games-action/xbomber || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/bomber-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9d646c0da5ad2efbabaecf392550f2f8
diff --git a/metadata/md5-cache/kde-apps/bovo-21.04.2 b/metadata/md5-cache/kde-apps/bovo-21.04.2
deleted file mode 100644
index d53c99f8199f..000000000000
--- a/metadata/md5-cache/kde-apps/bovo-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Five-in-a-row Board Game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/bovo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/bovo-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7b990376e7bd68e872124f42ab66995a
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-21.04.2 b/metadata/md5-cache/kde-apps/calendarjanitor-21.04.2
deleted file mode 100644
index ecd9d215784c..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Tool to scan calendar data for buggy instances
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/akonadi-calendar-tools-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2d00e2bf9a3ca934eaac29d8085093ee
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-21.04.2 b/metadata/md5-cache/kde-apps/calendarsupport-21.04.2
deleted file mode 100644
index b90dad295e53..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libical >=dev-qt/designer-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/akonadi-notes-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Calendar support library
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/libical >=dev-qt/designer-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/akonadi-notes-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/calendarsupport-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=91e733547aaf8ec69607dea1fe42ae29
diff --git a/metadata/md5-cache/kde-apps/cantor-21.04.2 b/metadata/md5-cache/kde-apps/cantor-21.04.2
deleted file mode 100644
index d102a758ca41..000000000000
--- a/metadata/md5-cache/kde-apps/cantor-21.04.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/make dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/poppler[qt5] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 analitza? ( >=kde-apps/analitza-21.04.2:5 ) julia? ( dev-lang/julia ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtdbus-5.15.2:5 ) R? ( dev-lang/R ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Interface for doing mathematics and scientific computing
-EAPI=7
-HOMEPAGE=https://apps.kde.org/cantor/ https://edu.kde.org/cantor/
-IUSE=+analitza julia lua postscript python qalculate R debug +handbook test +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[qt5] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 analitza? ( >=kde-apps/analitza-21.04.2:5 ) julia? ( dev-lang/julia ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtdbus-5.15.2:5 ) R? ( dev-lang/R ) !analitza? ( !julia? ( !lua? ( !python? ( !qalculate? ( !R? ( || ( sci-mathematics/maxima sci-mathematics/octave ) ) ) ) ) ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/cantor-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5e8f674fff8b419a61090177e5146b77
diff --git a/metadata/md5-cache/kde-apps/cervisia-21.04.2 b/metadata/md5-cache/kde-apps/cervisia-21.04.2
deleted file mode 100644
index 64b5ae32f2d9..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdesu-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=CVS frontend by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/cervisia/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdesu-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-vcs/cvs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/cervisia-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=44bfedab83ebf43df5f9d9e148984add
diff --git a/metadata/md5-cache/kde-apps/cervisia-21.04.3 b/metadata/md5-cache/kde-apps/cervisia-21.04.3
deleted file mode 100644
index 6824949da977..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-21.04.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdesu-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=CVS frontend by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/cervisia/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdesu-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-vcs/cvs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.3/src/cervisia-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=44bfedab83ebf43df5f9d9e148984add
diff --git a/metadata/md5-cache/kde-apps/cervisia-21.04.3-r1 b/metadata/md5-cache/kde-apps/cervisia-21.04.3-r1
new file mode 100644
index 000000000000..95274faff94a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cervisia-21.04.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdesu-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=CVS frontend by KDE
+EAPI=7
+HOMEPAGE=https://apps.kde.org/cervisia/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdesu-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-vcs/cvs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.3/src/cervisia-21.04.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=cf44bb1591bae8c1d8be07fab23b177c
diff --git a/metadata/md5-cache/kde-apps/dolphin-21.04.2 b/metadata/md5-cache/kde-apps/dolphin-21.04.2
deleted file mode 100644
index baba7db49cbd..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5= >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/phonon-4.11.0 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) semantic-desktop? ( >=kde-apps/baloo-widgets-21.04.2:5 >=kde-frameworks/baloo-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma filemanager focusing on usability
-EAPI=7
-HOMEPAGE=https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin
-IUSE=activities semantic-desktop telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5= >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/phonon-4.11.0 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) semantic-desktop? ( >=kde-apps/baloo-widgets-21.04.2:5 >=kde-frameworks/baloo-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kio-extras-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/dolphin-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=17fc390288b2103ea8bcf75f41fb2bba
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-21.04.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-21.04.2
deleted file mode 100644
index 5c5a9a3fd4c6..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Dropbox service integration
-EAPI=7
-HOMEPAGE=https://apps.kde.org/dolphin_plugins/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 net-misc/dropbox-cli || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/dolphin-plugins-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=51f5e96ae2722028d86f9b1387191e65
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-git-21.04.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-git-21.04.2
deleted file mode 100644
index 1a975bd4af81..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-git-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Git integration
-EAPI=7
-HOMEPAGE=https://apps.kde.org/dolphin_plugins/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 dev-vcs/git || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/dolphin-plugins-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a5f780055c6743f4bd15662dc4f76e35
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-21.04.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-21.04.2
deleted file mode 100644
index 97c40454d1f7..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Mercurial integration
-EAPI=7
-HOMEPAGE=https://apps.kde.org/dolphin_plugins/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-vcs/mercurial || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/dolphin-plugins-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22cdcbe71ee7f345fb2a391eef48254e
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-21.04.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-21.04.2
deleted file mode 100644
index fcc0f9033ef6..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Subversion integration
-EAPI=7
-HOMEPAGE=https://apps.kde.org/dolphin_plugins/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 dev-vcs/subversion >=kde-apps/kompare-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/dolphin-plugins-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=94898d1c9a7734c1a882da4493b364bf
diff --git a/metadata/md5-cache/kde-apps/dragon-21.04.2 b/metadata/md5-cache/kde-apps/dragon-21.04.2
deleted file mode 100644
index 233f360b070f..000000000000
--- a/metadata/md5-cache/kde-apps/dragon-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/phonon-4.11.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple video player
-EAPI=7
-HOMEPAGE=https://apps.kde.org/dragonplayer/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/dragon-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=17ec1ace4a0948c38939d1dfe9fc9c07
diff --git a/metadata/md5-cache/kde-apps/eventviews-21.04.2 b/metadata/md5-cache/kde-apps/eventviews-21.04.2
deleted file mode 100644
index 2e175394d593..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/kdiagram:5 dev-libs/libical >=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Calendar viewer for KDE PIM
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/kdiagram:5 dev-libs/libical >=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/eventviews-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=32608da202fbd0d914e5d2374eab34e7
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-21.04.2 b/metadata/md5-cache/kde-apps/ffmpegthumbs-21.04.2
deleted file mode 100644
index 739010c1e97a..000000000000
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 media-libs/taglib media-video/ffmpeg:0= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=FFmpeg based thumbnail generator for video files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 media-libs/taglib media-video/ffmpeg:0= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ffmpegthumbs-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cac70a15ecb8a10e6f407d81faf02794
diff --git a/metadata/md5-cache/kde-apps/filelight-21.04.2 b/metadata/md5-cache/kde-apps/filelight-21.04.2
deleted file mode 100644
index eef867b75e34..000000000000
--- a/metadata/md5-cache/kde-apps/filelight-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
-EAPI=7
-HOMEPAGE=https://apps.kde.org/filelight/ https://utils.kde.org/projects/filelight/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/filelight-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c8f7dd0622fbdb40d9b66acaa4d192a9
diff --git a/metadata/md5-cache/kde-apps/granatier-21.04.2 b/metadata/md5-cache/kde-apps/granatier-21.04.2
deleted file mode 100644
index bd6a7450315f..000000000000
--- a/metadata/md5-cache/kde-apps/granatier-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Bomberman game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/granatier/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/granatier-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4452ef4f738ddb0516259581cd310299
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-21.04.2 b/metadata/md5-cache/kde-apps/grantlee-editor-21.04.2
deleted file mode 100644
index e1f3e0c7ec3f..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/grantlee-editor-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0d6fe777b4e48890cffcac6d99b2e8ec
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-21.04.2 b/metadata/md5-cache/kde-apps/grantleetheme-21.04.2
deleted file mode 100644
index 62b8c04691c8..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/grantlee:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=dev-qt/qtnetwork-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for Grantlee plugins
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/grantleetheme-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c12b7a62f32281f4c58cd59372a2e83b
diff --git a/metadata/md5-cache/kde-apps/gwenview-21.04.2 b/metadata/md5-cache/kde-apps/gwenview-21.04.2
deleted file mode 100644
index 30fb2ccc3836..000000000000
--- a/metadata/md5-cache/kde-apps/gwenview-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/phonon-4.11.0 media-libs/tiff virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-21.04.2:5= ) mpris? ( >=dev-qt/qtdbus-5.15.2:5 ) raw? ( >=kde-apps/libkdcraw-21.04.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=dev-qt/qtconcurrent-5.15.2:5 >=kde-frameworks/kwindowsystem-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Image viewer by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview
-IUSE=activities fits kipi +mpris raw semantic-desktop share X debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/phonon-4.11.0 media-libs/tiff virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-21.04.2:5= ) mpris? ( >=dev-qt/qtdbus-5.15.2:5 ) raw? ( >=kde-apps/libkdcraw-21.04.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=dev-qt/qtimageformats-5.15.2:5 >=kde-frameworks/kimageformats-5.80.0:5 kipi? ( >=kde-apps/kipi-plugins-21.04.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/gwenview-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=92db8b797051f27f55785aeb0131299f
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-21.04.2 b/metadata/md5-cache/kde-apps/incidenceeditor-21.04.2
deleted file mode 100644
index aafc069d2276..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-apps/akonadi-21.04.2:5[tools] ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/kdiagram:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/eventviews-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kldap-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 test? ( >=kde-apps/akonadi-21.04.2:5[postgres,sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Incidence editor for korganizer
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/kdiagram:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/eventviews-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kldap-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/incidenceeditor-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c55e91b8f4ca2d0f4bb2b0b01924958a
diff --git a/metadata/md5-cache/kde-apps/juk-21.04.2 b/metadata/md5-cache/kde-apps/juk-21.04.2
deleted file mode 100644
index 3afab41996d9..000000000000
--- a/metadata/md5-cache/kde-apps/juk-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 >=media-libs/taglib-1.6 >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Jukebox and music manager by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/juk/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 >=media-libs/taglib-1.6 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/juk-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2ac2c041b0f46dbd8514b4942291a118
diff --git a/metadata/md5-cache/kde-apps/k3b-21.04.2 b/metadata/md5-cache/kde-apps/k3b-21.04.2
deleted file mode 100644
index 479e69c17b2a..000000000000
--- a/metadata/md5-cache/kde-apps/k3b-21.04.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkcddb-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5[taglib?] >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/k3b/ https://userbase.kde.org/K3b
-IUSE=dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkcddb-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5[taglib?] >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) app-cdr/cdrdao app-cdr/cdrtools dev-libs/libburn media-sound/cdparanoia dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/k3b-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4d8dd99248754418382acbfae7ed145d
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-21.04.2 b/metadata/md5-cache/kde-apps/kaccounts-integration-21.04.2
deleted file mode 100644
index c0c3bef1e8c4..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21:= net-libs/signond >=kde-frameworks/kcmutils-5.80.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21:= net-libs/signond dev-util/intltool || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kaccounts-integration-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fd5f8a1c734ed5d3222c33b2a547ad72
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-21.04.2 b/metadata/md5-cache/kde-apps/kaccounts-providers-21.04.2
deleted file mode 100644
index ddb061b57f30..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/kaccounts-integration-21.04.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kpackage-5.80.0:5 webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE accounts providers
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=+webengine debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/kaccounts-integration-21.04.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kpackage-5.80.0:5 webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) net-libs/signon-oauth2 net-libs/signon-ui || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kaccounts-providers-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=876c23a41d7bfd3f75f28e4730dc78c0
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-21.04.2 b/metadata/md5-cache/kde-apps/kaddressbook-21.04.2
deleted file mode 100644
index 55266bcbfc53..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/libgravatar-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/prison-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Address book application based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kaddressbook/
-IUSE=telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/libgravatar-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/prison-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kdepim-runtime-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kaddressbook-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3725709241c88c23960a2ab6e2a02d04
diff --git a/metadata/md5-cache/kde-apps/kajongg-21.04.2 b/metadata/md5-cache/kde-apps/kajongg-21.04.2
deleted file mode 100644
index 837687c8bd60..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-db/sqlite:3 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 python_single_target_python3_8? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_8(-)] >=dev-python/twisted-16.6.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_9(-)] >=dev-python/twisted-16.6.0[python_targets_python3_9(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Classical Mah Jongg for four players
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kajongg/
-IUSE=python_single_target_python3_8 python_single_target_python3_9 debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-db/sqlite:3 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 python_single_target_python3_8? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_8(-)] >=dev-python/twisted-16.6.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_9(-)] >=dev-python/twisted-16.6.0[python_targets_python3_9(-)] ) >=kde-apps/libkmahjongg-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kajongg-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=17d19fea3d418797c0dd137d57e72931
diff --git a/metadata/md5-cache/kde-apps/kalarm-21.04.2 b/metadata/md5-cache/kde-apps/kalarm-21.04.2
deleted file mode 100644
index 7cf36ba3e9cc..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kalarmcal-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kauth-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kidletime-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kalarmcal-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kauth-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kidletime-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=kde-apps/kdepim-runtime-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kalarm-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=62c569235d4e96003566cc1ea8389e0a
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-21.04.2 b/metadata/md5-cache/kde-apps/kalarmcal-21.04.2
deleted file mode 100644
index 0953c2423568..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 test? ( >=dev-qt/qtdbus-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Client library to access and handling of KAlarm calendar data
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kalarmcal-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aa00e73fc90e60ae5b84c9f770a30b7b
diff --git a/metadata/md5-cache/kde-apps/kalgebra-21.04.2 b/metadata/md5-cache/kde-apps/kalgebra-21.04.2
deleted file mode 100644
index 0455eb8ac5a3..000000000000
--- a/metadata/md5-cache/kde-apps/kalgebra-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/analitza-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 readline? ( sys-libs/readline:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=MathML-based 2D and 3D graph calculator by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kalgebra/ https://edu.kde.org/kalgebra/
-IUSE=readline debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/analitza-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 readline? ( sys-libs/readline:0= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kalgebra-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=48ea2072f1abdc9049e3bd8bf04be8d9
diff --git a/metadata/md5-cache/kde-apps/kalzium-21.04.2 b/metadata/md5-cache/kde-apps/kalzium-21.04.2
deleted file mode 100644
index 2f933b2c2cbc..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kplotting-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kunitconversion-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 editor? ( dev-cpp/eigen:3 >=dev-qt/qtopengl-5.15.2:5 >=kde-frameworks/knewstuff-5.80.0:5 sci-chemistry/openbabel:= >=sci-libs/avogadrolibs-1.93[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Periodic table of the elements
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kalzium/ https://edu.kde.org/kalzium/
-IUSE=editor solver debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kplotting-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kunitconversion-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 editor? ( dev-cpp/eigen:3 >=dev-qt/qtopengl-5.15.2:5 >=kde-frameworks/knewstuff-5.80.0:5 sci-chemistry/openbabel:= >=sci-libs/avogadrolibs-1.93[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kalzium-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d1ce996b4c686df9be7758b7cbd58ceb
diff --git a/metadata/md5-cache/kde-apps/kamera-21.04.2 b/metadata/md5-cache/kde-apps/kamera-21.04.2
deleted file mode 100644
index 5857b84aed76..000000000000
--- a/metadata/md5-cache/kde-apps/kamera-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 media-libs/libgphoto2:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma integration for gphoto2 cameras
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kamera/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 media-libs/libgphoto2:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kamera-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dc70b33f2744f573f1eb161f1f7c8c0b
diff --git a/metadata/md5-cache/kde-apps/kamoso-21.04.2 b/metadata/md5-cache/kde-apps/kamoso-21.04.2
deleted file mode 100644
index 978bbe199dc8..000000000000
--- a/metadata/md5-cache/kde-apps/kamoso-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/purpose-5.80.0:5 media-libs/gst-plugins-base:1.0 virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application to take pictures and videos from your webcam by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kamoso/ https://userbase.kde.org/Kamoso
-IUSE=test debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/purpose-5.80.0:5 media-libs/gst-plugins-base:1.0 virtual/opengl >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.80.0:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kamoso-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c1892af56bfa60a33671219930b89e4f
diff --git a/metadata/md5-cache/kde-apps/kanagram-21.04.2 b/metadata/md5-cache/kde-apps/kanagram-21.04.2
deleted file mode 100644
index d97577567bc7..000000000000
--- a/metadata/md5-cache/kde-apps/kanagram-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkeduvocdocument-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=media-libs/phonon-4.11.0 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game based on anagrams of words
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kanagram/ https://edu.kde.org/kanagram/
-IUSE=speech debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkeduvocdocument-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=media-libs/phonon-4.11.0 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) >=dev-qt/qtmultimedia-5.15.2:5[qml] >=dev-qt/qtquickcontrols-5.15.2:5 >=kde-apps/kdeedu-data-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kanagram-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0af8d1e60d4c7b1b3d1f4475d7b7f741
diff --git a/metadata/md5-cache/kde-apps/kapman-21.04.2 b/metadata/md5-cache/kde-apps/kapman-21.04.2
deleted file mode 100644
index 78b0b512feb7..000000000000
--- a/metadata/md5-cache/kde-apps/kapman-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Pac-Man clone by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kapman/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kapman-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dfd6ba64f365c8b1860803159a965851
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-21.04.2 b/metadata/md5-cache/kde-apps/kapptemplate-21.04.2
deleted file mode 100644
index c6dbc85602da..000000000000
--- a/metadata/md5-cache/kde-apps/kapptemplate-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Shell script to create the necessary framework to develop KDE applications
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kapptemplate/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kapptemplate-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1844343be865d891988fcd3a8ca76727
diff --git a/metadata/md5-cache/kde-apps/kate-21.04.2 b/metadata/md5-cache/kde-apps/kate-21.04.2
deleted file mode 100644
index 3b85f854c610..000000000000
--- a/metadata/md5-cache/kde-apps/kate-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.80.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.80.0:5 ) plasma? ( >=kde-frameworks/plasma-5.80.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/threadweaver-5.80.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.80.0:5 ) sql? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kwallet-5.80.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Multi-document editor with network transparency, Plasma integration and more
-EAPI=7
-HOMEPAGE=https://kate-editor.org/ https://apps.kde.org/kate/
-IUSE=activities +filebrowser lspclient +projects plasma +snippets sql telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.80.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.80.0:5 ) plasma? ( >=kde-frameworks/plasma-5.80.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/threadweaver-5.80.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.80.0:5 ) sql? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kwallet-5.80.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kate-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=490a5b3b7271b3ffab0d969b3b916004
diff --git a/metadata/md5-cache/kde-apps/katomic-21.04.2 b/metadata/md5-cache/kde-apps/katomic-21.04.2
deleted file mode 100644
index 68074bee6b6f..000000000000
--- a/metadata/md5-cache/kde-apps/katomic-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Atomic Entertainment Game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/katomic/ https://games.kde.org/games/katomic/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/katomic-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0a9060df73878f8982047b2166b0bae2
diff --git a/metadata/md5-cache/kde-apps/kbackup-21.04.2 b/metadata/md5-cache/kde-apps/kbackup-21.04.2
deleted file mode 100644
index f6ad6184b478..000000000000
--- a/metadata/md5-cache/kde-apps/kbackup-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Program that lets you back up any directories or files
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kbackup/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kbackup-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=296566853a0d39c06d7ca2a560288fd6
diff --git a/metadata/md5-cache/kde-apps/kblackbox-21.04.2 b/metadata/md5-cache/kde-apps/kblackbox-21.04.2
deleted file mode 100644
index 6cf97693cc56..000000000000
--- a/metadata/md5-cache/kde-apps/kblackbox-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game of hide and seek played on a grid of boxes
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kblackbox/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kblackbox-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=68cfe894c5a9091f7085d5e99c83b1c0
diff --git a/metadata/md5-cache/kde-apps/kblocks-21.04.2 b/metadata/md5-cache/kde-apps/kblocks-21.04.2
deleted file mode 100644
index 8ab1078d3acc..000000000000
--- a/metadata/md5-cache/kde-apps/kblocks-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Single-player Tetris-like KDE game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kblocks/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kblocks-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=64b9ae74195852d9e81b30a03419a200
diff --git a/metadata/md5-cache/kde-apps/kbounce-21.04.2 b/metadata/md5-cache/kde-apps/kbounce-21.04.2
deleted file mode 100644
index 7e00505d810e..000000000000
--- a/metadata/md5-cache/kde-apps/kbounce-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Bounce Ball Game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kbounce/ https://games.kde.org/games/kbounce/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kbounce-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=35fed89a19506a8778af22a1590c193b
diff --git a/metadata/md5-cache/kde-apps/kbreakout-21.04.2 b/metadata/md5-cache/kde-apps/kbreakout-21.04.2
deleted file mode 100644
index 32c35059f079..000000000000
--- a/metadata/md5-cache/kde-apps/kbreakout-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Breakout-like game by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kbreakout/ https://games.kde.org/games/kbreakout/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kbreakout-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=db8f3046480a8ca651b2fcc26feaa1a0
diff --git a/metadata/md5-cache/kde-apps/kbruch-21.04.2 b/metadata/md5-cache/kde-apps/kbruch-21.04.2
deleted file mode 100644
index 66a608b15b50..000000000000
--- a/metadata/md5-cache/kde-apps/kbruch-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Educational application to learn calculating with fractions
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kbruch/ https://edu.kde.org/kbruch/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kbruch-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f7099c4b020754c5e31c6138d8b34c54
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-21.04.2 b/metadata/md5-cache/kde-apps/kcachegrind-21.04.2
deleted file mode 100644
index 2dcd54f8101d..000000000000
--- a/metadata/md5-cache/kde-apps/kcachegrind-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Frontend for Cachegrind by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kcachegrind/ https://kcachegrind.github.io/html/Home.html
-IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-gfx/graphviz || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kcachegrind-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=69ec568942870f5dffb1046e2cd99617
diff --git a/metadata/md5-cache/kde-apps/kcalc-21.04.2 b/metadata/md5-cache/kde-apps/kcalc-21.04.2
deleted file mode 100644
index ccfaf9b7ebc6..000000000000
--- a/metadata/md5-cache/kde-apps/kcalc-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE calculator
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kcalc/ https://utils.kde.org/projects/kcalc/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kcalc-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a25bb3171bc262441e2a2c3fea29928f
diff --git a/metadata/md5-cache/kde-apps/kcalutils-21.04.2 b/metadata/md5-cache/kde-apps/kcalutils-21.04.2
deleted file mode 100644
index 945a37448915..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library providing utility functions for the handling of calendar data
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kcalutils/html/index.html
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kcalutils-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f8b6dcfa0ef289a61bd2931434d6291c
diff --git a/metadata/md5-cache/kde-apps/kcharselect-21.04.2 b/metadata/md5-cache/kde-apps/kcharselect-21.04.2
deleted file mode 100644
index 14a8d01e8b17..000000000000
--- a/metadata/md5-cache/kde-apps/kcharselect-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE character selection utility
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kcharselect/ https://utils.kde.org/projects/kcharselect/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kcharselect-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=58b98a448179dcca3d1487a4b018070c
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-21.04.2 b/metadata/md5-cache/kde-apps/kcolorchooser-21.04.2
deleted file mode 100644
index 7aab26477b63..000000000000
--- a/metadata/md5-cache/kde-apps/kcolorchooser-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE color selector/editor
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kcolorchooser/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kcolorchooser-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b318e0bf1856931b2fc6a3208414b8a7
diff --git a/metadata/md5-cache/kde-apps/kcron-21.04.2 b/metadata/md5-cache/kde-apps/kcron-21.04.2
deleted file mode 100644
index 81bfa09f87d7..000000000000
--- a/metadata/md5-cache/kde-apps/kcron-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Task Scheduler
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kcron/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 virtual/cron || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kcron-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2190919daca8defc84c44e513326d7d2
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-21.04.2 b/metadata/md5-cache/kde-apps/kde-apps-meta-21.04.2
deleted file mode 100644
index a8d1a8e3fa4c..000000000000
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-21.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for the KDE Release Service collection
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=accessibility +admin +education +games +graphics +multimedia +network pim sdk +utils
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdecore-meta-21.04.2:5 accessibility? ( >=kde-apps/kdeaccessibility-meta-21.04.2:5 ) admin? ( >=kde-apps/kdeadmin-meta-21.04.2:5 ) education? ( >=kde-apps/kdeedu-meta-21.04.2:5 ) games? ( >=kde-apps/kdegames-meta-21.04.2:5 ) graphics? ( >=kde-apps/kdegraphics-meta-21.04.2:5 ) multimedia? ( >=kde-apps/kdemultimedia-meta-21.04.2:5 ) network? ( >=kde-apps/kdenetwork-meta-21.04.2:5 ) pim? ( >=kde-apps/kdepim-meta-21.04.2:5 ) sdk? ( >=kde-apps/kdesdk-meta-21.04.2:5 ) utils? ( >=kde-apps/kdeutils-meta-21.04.2:5 )
-SLOT=5
-_md5_=79dbf402b21e931d0725000340ec5a15
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-21.04.2 b/metadata/md5-cache/kde-apps/kde-dev-scripts-21.04.2
deleted file mode 100644
index 80bb1c02b04e..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.80.0:5 >=kde-frameworks/kdoctools-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Development Scripts
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kde-dev-scripts-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f31062892942cce0265d27372aec7c6b
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-21.04.2 b/metadata/md5-cache/kde-apps/kde-dev-utils-21.04.2
deleted file mode 100644
index 913e76ef7265..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/designer-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Development Utilities
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/designer-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kde-dev-utils-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a82cd5285185c10b358e82cd57ab81c7
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-21.04.2 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-21.04.2
deleted file mode 100644
index 767519c20e81..000000000000
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-21.04.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=app-accessibility/kontrast-21.04.2:5 >=kde-apps/kmag-21.04.2:5 >=kde-apps/kmousetool-21.04.2:5 >=kde-apps/kmouth-21.04.2:5
-SLOT=5
-_md5_=531e9cddbd88f7db57a5ec86d097ad78
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-21.04.2 b/metadata/md5-cache/kde-apps/kdeadmin-meta-21.04.2
deleted file mode 100644
index cbf01b03b4f2..000000000000
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-21.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+cron
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ksystemlog-21.04.2:5 cron? ( >=kde-apps/kcron-21.04.2:5 )
-SLOT=5
-_md5_=c7cb2327377889463316203f7013266e
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-21.04.2 b/metadata/md5-cache/kde-apps/kdebugsettings-21.04.2
deleted file mode 100644
index d6cb509de524..000000000000
--- a/metadata/md5-cache/kde-apps/kdebugsettings-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Application to enable/disable qCDebug
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kdebugsettings/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdebugsettings-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=46393a4242b9e1b295e6d9a3dc3adc94
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-21.04.2 b/metadata/md5-cache/kde-apps/kdecore-meta-21.04.2
deleted file mode 100644
index 867f27f1bd72..000000000000
--- a/metadata/md5-cache/kde-apps/kdecore-meta-21.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdecore - merge this to pull in the most basic applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+handbook +share +thumbnail +webengine
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-21.04.2:5 >=kde-apps/kdialog-21.04.2:5 >=kde-apps/keditbookmarks-21.04.2:5 >=kde-apps/kfind-21.04.2:5 >=kde-apps/konsole-21.04.2:5 >=kde-apps/kwrite-21.04.2:5 handbook? ( >=kde-apps/khelpcenter-21.04.2:5 ) webengine? ( || ( www-client/falkon >=kde-apps/konqueror-21.04.2:5 ) ) share? ( kde-frameworks/purpose:5 ) thumbnail? ( >=kde-apps/ffmpegthumbs-21.04.2:5 >=kde-apps/thumbnailers-21.04.2:5 )
-SLOT=5
-_md5_=f5935b38b2bf993d02e19202c18098c8
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-21.04.2 b/metadata/md5-cache/kde-apps/kdeedu-data-21.04.2
deleted file mode 100644
index c09c96e385a6..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-21.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DESCRIPTION=Shared icons, artwork and data files for educational applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdeedu-data-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e5acda8dcc55775603addcf641b6f573
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-21.04.2 b/metadata/md5-cache/kde-apps/kdeedu-meta-21.04.2
deleted file mode 100644
index 8bd8bcfd6f32..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-21.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
-EAPI=7
-HOMEPAGE=https://edu.kde.org
-IUSE=+webengine
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/analitza-21.04.2:5 >=kde-apps/artikulate-21.04.2:5 >=kde-apps/blinken-21.04.2:5 >=kde-apps/cantor-21.04.2:5 >=kde-apps/kalzium-21.04.2:5 >=kde-apps/kanagram-21.04.2:5 >=kde-apps/kbruch-21.04.2:5 >=kde-apps/kdeedu-data-21.04.2:5 >=kde-apps/kgeography-21.04.2:5 >=kde-apps/khangman-21.04.2:5 >=kde-apps/kig-21.04.2:5 >=kde-apps/kiten-21.04.2:5 >=kde-apps/klettres-21.04.2:5 >=kde-apps/kmplot-21.04.2:5 >=kde-apps/kqtquickcharts-21.04.2:5 >=kde-apps/ktouch-21.04.2:5 >=kde-apps/kturtle-21.04.2:5 >=kde-apps/kwordquiz-21.04.2:5 >=kde-apps/libkeduvocdocument-21.04.2:5 >=kde-apps/marble-21.04.2:5 >=kde-apps/minuet-21.04.2:5 >=kde-apps/rocs-21.04.2:5 >=kde-apps/step-21.04.2:5 webengine? ( >=kde-apps/kalgebra-21.04.2:5 >=kde-apps/parley-21.04.2:5 )
-SLOT=5
-_md5_=08d5dc8f27b12e73adbda08d05213a0d
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-21.04.2 b/metadata/md5-cache/kde-apps/kdegames-meta-21.04.2
deleted file mode 100644
index 0c7e790a6d38..000000000000
--- a/metadata/md5-cache/kde-apps/kdegames-meta-21.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
-EAPI=7
-HOMEPAGE=https://games.kde.org/
-IUSE=opengl python
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/bomber-21.04.2:5 >=kde-apps/bovo-21.04.2:5 >=kde-apps/granatier-21.04.2:5 >=kde-apps/kapman-21.04.2:5 >=kde-apps/katomic-21.04.2:5 >=kde-apps/kblackbox-21.04.2:5 >=kde-apps/kblocks-21.04.2:5 >=kde-apps/kbounce-21.04.2:5 >=kde-apps/kbreakout-21.04.2:5 >=kde-apps/kdiamond-21.04.2:5 >=kde-apps/kfourinline-21.04.2:5 >=kde-apps/kgoldrunner-21.04.2:5 >=kde-apps/kigo-21.04.2:5 >=kde-apps/killbots-21.04.2:5 >=kde-apps/kiriki-21.04.2:5 >=kde-apps/kjumpingcube-21.04.2:5 >=kde-apps/klickety-21.04.2:5 >=kde-apps/klines-21.04.2:5 >=kde-apps/kmahjongg-21.04.2:5 >=kde-apps/kmines-21.04.2:5 >=kde-apps/knavalbattle-21.04.2:5 >=kde-apps/knetwalk-21.04.2:5 >=kde-apps/knights-21.04.2:5 >=kde-apps/kolf-21.04.2:5 >=kde-apps/kollision-21.04.2:5 >=kde-apps/konquest-21.04.2:5 >=kde-apps/kpat-21.04.2:5 >=kde-apps/kreversi-21.04.2:5 >=kde-apps/kshisen-21.04.2:5 >=kde-apps/ksirk-21.04.2:5 >=kde-apps/ksnakeduel-21.04.2:5 >=kde-apps/kspaceduel-21.04.2:5 >=kde-apps/ksquares-21.04.2:5 >=kde-apps/ktuberling-21.04.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-apps/libkmahjongg-21.04.2:5 >=kde-apps/lskat-21.04.2:5 >=kde-apps/palapeli-21.04.2:5 >=kde-apps/picmi-21.04.2:5 opengl? ( >=kde-apps/ksudoku-21.04.2:5 >=kde-apps/kubrick-21.04.2:5 ) python? ( >=kde-apps/kajongg-21.04.2:5 )
-SLOT=5
-_md5_=0566e9acfe33742b47489bc829c238d0
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-21.04.2 b/metadata/md5-cache/kde-apps/kdegraphics-meta-21.04.2
deleted file mode 100644
index b96c22f33fce..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-21.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
-EAPI=7
-HOMEPAGE=https://apps.kde.org/graphics/
-IUSE=scanner
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/gwenview-21.04.2:5 >=kde-apps/kamera-21.04.2:5 >=kde-apps/kcolorchooser-21.04.2:5 >=kde-apps/kdegraphics-mobipocket-21.04.2:5 >=kde-apps/kipi-plugins-21.04.2:5 >=kde-apps/kolourpaint-21.04.2:5 >=kde-apps/kruler-21.04.2:5 >=kde-apps/libkdcraw-21.04.2:5 >=kde-apps/libkexiv2-21.04.2:5 >=kde-apps/libkipi-21.04.2:5 >=kde-apps/okular-21.04.2:5 >=kde-apps/spectacle-21.04.2:5 >=kde-apps/svgpart-21.04.2:5 >=kde-apps/thumbnailers-21.04.2:5 scanner? ( >=kde-apps/libksane-21.04.2:5 )
-SLOT=5
-_md5_=69a3aafae800140854cb827739fe7c96
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-21.04.2 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-21.04.2
deleted file mode 100644
index e39db931586f..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 thumbnail? ( >=kde-frameworks/kio-5.80.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Library to support mobipocket ebooks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+thumbnail debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 thumbnail? ( >=kde-frameworks/kio-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdegraphics-mobipocket-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=90db920e4c1e95b4839d1c7a16fb133f
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-21.04.2 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-21.04.2
deleted file mode 100644
index 6ad217c0ee54..000000000000
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-21.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
-EAPI=7
-HOMEPAGE=https://apps.kde.org/multimedia/ https://multimedia.kde.org/
-IUSE=+cdrom +ffmpeg gstreamer
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dragon-21.04.2:5 >=kde-apps/juk-21.04.2:5 >=kde-apps/kdenlive-21.04.2:5 >=kde-apps/kmix-21.04.2:5 >=kde-apps/kwave-21.04.2:5 >=media-sound/elisa-21.04.2:5 cdrom? ( >=kde-apps/audiocd-kio-21.04.2:5 >=kde-apps/k3b-21.04.2:5 >=kde-apps/libkcddb-21.04.2:5 >=kde-apps/libkcompactdisc-21.04.2:5 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-21.04.2:5 ) gstreamer? ( >=kde-apps/kamoso-21.04.2:5 )
-SLOT=5
-_md5_=482b16e6e6ddf1a6baa6932138d4fea9
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-21.04.2 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-21.04.2
deleted file mode 100644
index 8d4728a4e606..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Samba filesharing plugin for file properties
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kdenetwork_filesharing/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.80.0:5 net-fs/samba || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdenetwork-filesharing-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2b24b25f57b82a9c5bbc91f7f3b29465
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-21.04.2 b/metadata/md5-cache/kde-apps/kdenetwork-meta-21.04.2
deleted file mode 100644
index bea3a5928154..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-21.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+bittorrent dropbox samba +webengine
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kget-21.04.2:5 >=kde-apps/kopete-21.04.2:5 >=kde-apps/krdc-21.04.2:5 >=kde-apps/krfb-21.04.2:5 >=kde-apps/zeroconf-ioslave-21.04.2:5 >=kde-misc/kdeconnect-21.04.2:5 >=kde-misc/kio-gdrive-21.04.2:5 >=net-irc/konversation-21.04.2:5 bittorrent? ( >=net-libs/libktorrent-21.04.2:5 >=net-p2p/ktorrent-21.04.2:5 ) dropbox? ( >=kde-apps/dolphin-plugins-dropbox-21.04.2:5 ) samba? ( >=kde-apps/kdenetwork-filesharing-21.04.2:5 ) webengine? ( >=kde-apps/plasma-telepathy-meta-21.04.2:5 )
-SLOT=5
-_md5_=d2a3d2a07ed55570025f43f2b6afdede
diff --git a/metadata/md5-cache/kde-apps/kdenlive-21.04.2 b/metadata/md5-cache/kde-apps/kdenlive-21.04.2
deleted file mode 100644
index 5a05e9013ed5..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtnetworkauth-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/mlt-6.26.0[ffmpeg,frei0r,qt5,sdl,xml] semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.80.0:5 ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) v4l? ( media-libs/libv4l ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Non-linear video editing suite by KDE
-EAPI=7
-HOMEPAGE=https://kdenlive.org/en/
-IUSE=gles2-only semantic-desktop share v4l test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtnetworkauth-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/mlt-6.26.0[ffmpeg,frei0r,qt5,sdl,xml] semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.80.0:5 ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtquickcontrols-5.15.2:5 media-video/ffmpeg[encode,sdl,X] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdenlive-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0234e6f327c201c110405dc3db02dc1e
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-21.04.2 b/metadata/md5-cache/kde-apps/kdepim-addons-21.04.2
deleted file mode 100644
index 4df847b3ac1f..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-notes-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/eventviews-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/incidenceeditor-21.04.2:5 >=kde-apps/kaddressbook-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kimap-21.04.2:5 >=kde-apps/kitinerary-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpkpass-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-apps/libksieve-21.04.2:5 >=kde-apps/libktnef-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/prison-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 importwizard? ( >=kde-apps/akonadi-import-wizard-21.04.2:5 ) markdown? ( app-text/discount ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugins for KDE Personal Information Management Suite
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kontact/
-IUSE=importwizard markdown test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-notes-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/eventviews-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/incidenceeditor-21.04.2:5 >=kde-apps/kaddressbook-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kimap-21.04.2:5 >=kde-apps/kitinerary-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpkpass-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-apps/libksieve-21.04.2:5 >=kde-apps/libktnef-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/prison-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 importwizard? ( >=kde-apps/akonadi-import-wizard-21.04.2:5 ) markdown? ( app-text/discount ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdepim-addons-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e04997bd329871b525f34f1f7a5cd11c
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-21.04.2 b/metadata/md5-cache/kde-apps/kdepim-meta-21.04.2
deleted file mode 100644
index 40752f647381..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-21.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kontact/
-IUSE=bogofilter clamav spamassassin
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadiconsole-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-import-wizard-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/akonadi-notes-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/akregator-21.04.2:5 >=kde-apps/calendarjanitor-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/eventviews-21.04.2:5 >=kde-apps/grantlee-editor-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/incidenceeditor-21.04.2:5 >=kde-apps/kaddressbook-21.04.2:5 >=kde-apps/kalarm-21.04.2:5 >=kde-apps/kalarmcal-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kdepim-addons-21.04.2:5 >=kde-apps/kdepim-runtime-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kimap-21.04.2:5 >=kde-apps/kitinerary-21.04.2:5 >=kde-apps/kldap-21.04.2:5 >=kde-apps/kleopatra-21.04.2:5 >=kde-apps/kmail-21.04.2:5 >=kde-apps/kmail-account-wizard-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmbox-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/knotes-21.04.2:5 >=kde-apps/konsolekalendar-21.04.2:5 >=kde-apps/kontact-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/korganizer-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/kpkpass-21.04.2:5 >=kde-apps/ksmtp-21.04.2:5 >=kde-apps/libgravatar-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkgapi-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-apps/libksieve-21.04.2:5 >=kde-apps/libktnef-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/mailimporter-21.04.2:5 >=kde-apps/mbox-importer-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pim-data-exporter-21.04.2:5 >=kde-apps/pim-sieve-editor-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 bogofilter? ( mail-filter/bogofilter ) clamav? ( app-antivirus/clamav ) spamassassin? ( mail-filter/spamassassin )
-SLOT=5
-_md5_=1d4cb1a40a477c9c48b988baa173c209
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-21.04.2 b/metadata/md5-cache/kde-apps/kdepim-runtime-21.04.2
deleted file mode 100644
index d098542e4962..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2 dev-libs/cyrus-sasl:2 dev-libs/libical:= dev-libs/qtkeychain:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtnetworkauth-5.15.2:5 >=dev-qt/qtspeech-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/akonadi-notes-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kalarmcal-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kimap-21.04.2:5 >=kde-apps/kldap-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmbox-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkgapi-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdav-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=dev-qt/qtxmlpatterns-5.15.2:5 test? ( >=kde-apps/kimap-21.04.2:5[test] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kontact/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-crypt/qca-2.3.0:2 dev-libs/cyrus-sasl:2 dev-libs/libical:= dev-libs/qtkeychain:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtnetworkauth-5.15.2:5 >=dev-qt/qtspeech-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/akonadi-notes-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kalarmcal-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kimap-21.04.2:5 >=kde-apps/kldap-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmbox-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkgapi-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdav-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdepim-runtime-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4df79ef3c0fa88a5be31ef6d21fb0447
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-21.04.2 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-21.04.2
deleted file mode 100644
index 86eaa210329d..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-lang/perl >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=kioslaves from kdesdk package
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdesdk-kioslaves-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9bf61a0aace5cbe7db31c0b8f8183eb5
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-21.04.2 b/metadata/md5-cache/kde-apps/kdesdk-meta-21.04.2
deleted file mode 100644
index f9a0cc688d1a..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-21.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
-EAPI=7
-HOMEPAGE=https://apps.kde.org/development/
-IUSE=cvs git mercurial python ruby subversion
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kapptemplate-21.04.2:5 >=kde-apps/kcachegrind-21.04.2:5 >=kde-apps/kde-dev-scripts-21.04.2:5 >=kde-apps/kde-dev-utils-21.04.2:5 >=kde-apps/kdesdk-kioslaves-21.04.2:5 >=kde-apps/kdesdk-thumbnailers-21.04.2:5 >=kde-apps/kompare-21.04.2:5 >=kde-apps/libkomparediff2-21.04.2:5 >=kde-apps/poxml-21.04.2:5 >=kde-apps/umbrello-21.04.2:5 cvs? ( >=kde-apps/cervisia-21.04.2:5 ) git? ( >=kde-apps/dolphin-plugins-git-21.04.2:5 ) mercurial? ( >=kde-apps/dolphin-plugins-mercurial-21.04.2:5 ) python? ( >=kde-apps/lokalize-21.04.2:5 ) ruby? ( >=kde-apps/kross-interpreters-21.04.2:5 ) subversion? ( >=kde-apps/dolphin-plugins-subversion-21.04.2:5 )
-SLOT=5
-_md5_=aa4c5d54cf60159abfe04bdd18c74ef9
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-21.04.2 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-21.04.2
deleted file mode 100644
index 879883faf98d..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Thumbnail generator for PO files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdesdk-thumbnailers-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=99fd6fd9cd4b66ac350110531501c00f
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-21.04.2 b/metadata/md5-cache/kde-apps/kdeutils-meta-21.04.2
deleted file mode 100644
index a5e005b72d23..000000000000
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-21.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
-EAPI=7
-HOMEPAGE=https://apps.kde.org/utilities/ https://utils.kde.org
-IUSE=7zip cups floppy gpg lrz rar +webengine
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=app-cdr/dolphin-plugins-mountiso-21.04.2:5 >=kde-apps/ark-21.04.2:5 >=kde-apps/filelight-21.04.2:5 >=kde-apps/kate-21.04.2:5 >=kde-apps/kbackup-21.04.2:5 >=kde-apps/kcalc-21.04.2:5 >=kde-apps/kcharselect-21.04.2:5 >=kde-apps/kdebugsettings-21.04.2:5 >=kde-apps/kdf-21.04.2:5 >=kde-apps/kteatime-21.04.2:5 >=kde-apps/ktimer-21.04.2:5 >=kde-apps/kwalletmanager-21.04.2:5 >=kde-apps/sweeper-21.04.2:5 >=kde-apps/yakuake-21.04.2:5 >=kde-misc/markdownpart-21.04.2:5 >=sys-block/partitionmanager-21.04.2:5 >=sys-libs/kpmcore-21.04.2:5 cups? ( >=kde-apps/print-manager-21.04.2:5 ) floppy? ( >=kde-apps/kfloppy-21.04.2:5 ) gpg? ( >=kde-apps/kgpg-21.04.2:5 ) webengine? ( >=kde-apps/kimagemapeditor-21.04.2:5 ) 7zip? ( app-arch/p7zip ) lrz? ( app-arch/lrzip ) rar? ( || ( app-arch/rar app-arch/unrar app-arch/unar ) )
-SLOT=5
-_md5_=4bb5b94d83e005e9a1c807eec5dc0404
diff --git a/metadata/md5-cache/kde-apps/kdf-21.04.2 b/metadata/md5-cache/kde-apps/kdf-21.04.2
deleted file mode 100644
index 886dd1dbeb0d..000000000000
--- a/metadata/md5-cache/kde-apps/kdf-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE free disk space utility
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kdf/ https://utils.kde.org/projects/kdf/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdf-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=83aa49cc28bc69f24724f7882effdb31
diff --git a/metadata/md5-cache/kde-apps/kdialog-21.04.2 b/metadata/md5-cache/kde-apps/kdialog-21.04.2
deleted file mode 100644
index 896178a2b7bd..000000000000
--- a/metadata/md5-cache/kde-apps/kdialog-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kdialog/
-IUSE=X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdialog-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3e9b88e87abeacb40f9c921093b5ecc2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-21.04.2 b/metadata/md5-cache/kde-apps/kdiamond-21.04.2
deleted file mode 100644
index 0a941eee9edc..000000000000
--- a/metadata/md5-cache/kde-apps/kdiamond-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Single player three-in-a-row game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kdiamond/ https://games.kde.org/games/kdiamond/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdiamond-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d9677ed9d2c43f632a4c779534f085d9
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-21.04.2 b/metadata/md5-cache/kde-apps/keditbookmarks-21.04.2
deleted file mode 100644
index 6c0a8ecbbf6b..000000000000
--- a/metadata/md5-cache/kde-apps/keditbookmarks-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Bookmarks editor based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+man test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/keditbookmarks-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=54609f20b714a326c51492b43cb88409
diff --git a/metadata/md5-cache/kde-apps/kfind-21.04.2 b/metadata/md5-cache/kde-apps/kfind-21.04.2
deleted file mode 100644
index 5ad316d54fa7..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=File finder utility based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kfind/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kfind-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=db5042fff673c6fa2dad475f5387abfb
diff --git a/metadata/md5-cache/kde-apps/kfind-21.04.3 b/metadata/md5-cache/kde-apps/kfind-21.04.3
deleted file mode 100644
index 625cfaad4fbf..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-21.04.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=File finder utility based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kfind/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kfind-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=db5042fff673c6fa2dad475f5387abfb
diff --git a/metadata/md5-cache/kde-apps/kfind-21.04.3-r1 b/metadata/md5-cache/kde-apps/kfind-21.04.3-r1
new file mode 100644
index 000000000000..0e3be77b5df9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfind-21.04.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=File finder utility based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://apps.kde.org/kfind/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kfind-21.04.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b7a8ea1f00ee012292a0bfb2a164590a
diff --git a/metadata/md5-cache/kde-apps/kfloppy-21.04.2 b/metadata/md5-cache/kde-apps/kfloppy-21.04.2
deleted file mode 100644
index 851d866305e1..000000000000
--- a/metadata/md5-cache/kde-apps/kfloppy-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Straightforward graphical means to format 3.5" and 5.25" floppy disks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kfloppy/ https://utils.kde.org/projects/kfloppy/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kfloppy-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=560905ad289c57b48a94d936f754431d
diff --git a/metadata/md5-cache/kde-apps/kfourinline-21.04.2 b/metadata/md5-cache/kde-apps/kfourinline-21.04.2
deleted file mode 100644
index 1af9cf84f57e..000000000000
--- a/metadata/md5-cache/kde-apps/kfourinline-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE four-in-a-row game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kfourinline/ https://games.kde.org/games/kfourinline/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kfourinline-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=84a255022aab05b2cf160639fa38c2c6
diff --git a/metadata/md5-cache/kde-apps/kgeography-21.04.2 b/metadata/md5-cache/kde-apps/kgeography-21.04.2
deleted file mode 100644
index 1aa5400c6b3f..000000000000
--- a/metadata/md5-cache/kde-apps/kgeography-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Geography learning tool
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kgeography/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kgeography-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7d8c069c472e6bc15eb0cab731a535ef
diff --git a/metadata/md5-cache/kde-apps/kget-21.04.2 b/metadata/md5-cache/kde-apps/kget-21.04.2
deleted file mode 100644
index f016e2eea7af..000000000000
--- a/metadata/md5-cache/kde-apps/kget-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdelibs4support-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( kde-plasma/libkworkspace:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Advanced download manager by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kget/
-IUSE=bittorrent gpg kde mms sqlite test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdelibs4support-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( kde-plasma/libkworkspace:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kget-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=993a5b1ba70bb5f2dda61041b25df4b3
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-21.04.2 b/metadata/md5-cache/kde-apps/kgoldrunner-21.04.2
deleted file mode 100644
index 8764b1558536..000000000000
--- a/metadata/md5-cache/kde-apps/kgoldrunner-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-libs/libsndfile media-libs/openal dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game of action and puzzle solving by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kgoldrunner/ https://games.kde.org/games/kgoldrunner/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-libs/libsndfile media-libs/openal >=dev-qt/qtsvg-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kgoldrunner-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bde7fb9ca11e3963c22d4b0918502a24
diff --git a/metadata/md5-cache/kde-apps/kgpg-21.04.2 b/metadata/md5-cache/kde-apps/kgpg-21.04.2
deleted file mode 100644
index 426472310648..000000000000
--- a/metadata/md5-cache/kde-apps/kgpg-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 app-crypt/gpgme dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kgpg/ https://utils.kde.org/projects/kgpg/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 app-crypt/gnupg || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-gpg )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kgpg-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3c67a2032f958c9b7944e2163f95f847
diff --git a/metadata/md5-cache/kde-apps/khangman-21.04.2 b/metadata/md5-cache/kde-apps/khangman-21.04.2
deleted file mode 100644
index 2524469d2a1e..000000000000
--- a/metadata/md5-cache/kde-apps/khangman-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkeduvocdocument-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Classical hangman game by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/khangman/ https://edu.kde.org/khangman/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkeduvocdocument-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=kde-apps/kdeedu-data-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/khangman-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=30f0145d3b4954c6498a5293b4ad0b83
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-21.04.2 b/metadata/md5-cache/kde-apps/khelpcenter-21.04.2
deleted file mode 100644
index 333bc80f9ac6..000000000000
--- a/metadata/md5-cache/kde-apps/khelpcenter-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdoctools-5.80.0:5 >=kde-frameworks/khtml-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application to read documentation for KDE Plasma, Applications, Utilities
-EAPI=7
-HOMEPAGE=https://apps.kde.org/help/ https://userbase.kde.org/KHelpCenter
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdoctools-5.80.0:5 >=kde-frameworks/khtml-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/khelpcenter-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=559e65e66fe7ea70cb023de0e10d6eb7
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-21.04.2 b/metadata/md5-cache/kde-apps/kidentitymanagement-21.04.2
deleted file mode 100644
index 3aa29a948139..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for managing identitites
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kidentitymanagement-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7fb603a087e5ab807c4363781c785f73
diff --git a/metadata/md5-cache/kde-apps/kig-21.04.2 b/metadata/md5-cache/kde-apps/kig-21.04.2
deleted file mode 100644
index 2c396fe4d370..000000000000
--- a/metadata/md5-cache/kde-apps/kig-21.04.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.15.2:5 ) scripting? ( python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) ) >=kde-frameworks/ktexteditor-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Interactive Geometry tool
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kig/ https://edu.kde.org/kig/
-IUSE=geogebra scripting python_single_target_python3_8 python_single_target_python3_9 debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.15.2:5 ) scripting? ( python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kig-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=12e9b52cb1e401d49ccd12d594a5dea0
diff --git a/metadata/md5-cache/kde-apps/kigo-21.04.2 b/metadata/md5-cache/kde-apps/kigo-21.04.2
deleted file mode 100644
index 43b803fb50e4..000000000000
--- a/metadata/md5-cache/kde-apps/kigo-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Go game by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kigo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 games-board/gnugo || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kigo-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6df516701a4cfee1529b6a02eb5006fb
diff --git a/metadata/md5-cache/kde-apps/killbots-21.04.2 b/metadata/md5-cache/kde-apps/killbots-21.04.2
deleted file mode 100644
index 0ea15613152c..000000000000
--- a/metadata/md5-cache/kde-apps/killbots-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Kill the bots or they kill you!
-EAPI=7
-HOMEPAGE=https://apps.kde.org/killbots/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/killbots-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5055d1351f5218375e067de2eeb36e20
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-21.04.2 b/metadata/md5-cache/kde-apps/kimagemapeditor-21.04.2
deleted file mode 100644
index dd9e2a9d950d..000000000000
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Generator of HTML image maps
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kimagemapeditor/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kimagemapeditor-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3be64e53f6d1d543fbb1d6aa7af67717
diff --git a/metadata/md5-cache/kde-apps/kimap-21.04.2 b/metadata/md5-cache/kde-apps/kimap-21.04.2
deleted file mode 100644
index fac36b4d085f..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.15.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 test? ( >=dev-qt/qtnetwork-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interacting with IMAP servers
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kimap/html/index.html
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.15.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kimap-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bfa000cbf3b6bc9370d5213f7733c1ad
diff --git a/metadata/md5-cache/kde-apps/kio-extras-21.04.2 b/metadata/md5-cache/kde-apps/kio-extras-21.04.2
deleted file mode 100644
index 43bea2c39ceb..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( dev-util/gperf ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 activities? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/kactivities-stats-5.80.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:= ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=7
-HOMEPAGE=https://invent.kde.org/network/kio-extras
-IUSE=activities +man mtp nfs openexr phonon samba +sftp taglib X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 activities? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/kactivities-stats-5.80.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:= ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) >=kde-frameworks/kded-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kio-extras-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=53b05e99564140f821293461241ddd99
diff --git a/metadata/md5-cache/kde-apps/kio-extras-21.04.3 b/metadata/md5-cache/kde-apps/kio-extras-21.04.3
deleted file mode 100644
index bf52b1a2e1c8..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-21.04.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( dev-util/gperf ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 activities? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/kactivities-stats-5.80.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:= ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=7
-HOMEPAGE=https://invent.kde.org/network/kio-extras
-IUSE=activities +man mtp nfs openexr phonon samba +sftp taglib X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 activities? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/kactivities-stats-5.80.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:= ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) >=kde-frameworks/kded-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kio-extras-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=53b05e99564140f821293461241ddd99
diff --git a/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r1 b/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r1
new file mode 100644
index 000000000000..93947bca3072
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=man? ( dev-util/gperf ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 activities? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/kactivities-stats-5.80.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:= ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
+EAPI=7
+HOMEPAGE=https://invent.kde.org/network/kio-extras
+IUSE=activities +man mtp nfs openexr phonon samba +sftp taglib X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 activities? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/kactivities-stats-5.80.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:= ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) >=kde-frameworks/kded-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kio-extras-21.04.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bc99935585d18d88b450b34c21d6876b
diff --git a/metadata/md5-cache/kde-apps/kipi-plugins-21.04.2 b/metadata/md5-cache/kde-apps/kipi-plugins-21.04.2
deleted file mode 100644
index b29bc067abcb..000000000000
--- a/metadata/md5-cache/kde-apps/kipi-plugins-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-apps/libkipi-21.04.2:5= >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 flashexport? ( >=kde-frameworks/karchive-5.80.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.80.0:5 ) >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugins for the KDE Image Plugin Interface
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/KIPI https://invent.kde.org/graphics/kipi-plugins
-IUSE=flashexport mediawiki +remotestorage debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-apps/libkipi-21.04.2:5= >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 flashexport? ( >=kde-frameworks/karchive-5.80.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kipi-plugins-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=11d6473dc095ed12b176d03290b677ca
diff --git a/metadata/md5-cache/kde-apps/kipi-plugins-21.04.3 b/metadata/md5-cache/kde-apps/kipi-plugins-21.04.3
deleted file mode 100644
index a501c7d84674..000000000000
--- a/metadata/md5-cache/kde-apps/kipi-plugins-21.04.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-apps/libkipi-21.04.3:5= >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 flashexport? ( >=kde-frameworks/karchive-5.80.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.80.0:5 ) >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugins for the KDE Image Plugin Interface
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/KIPI https://invent.kde.org/graphics/kipi-plugins
-IUSE=flashexport mediawiki +remotestorage debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-apps/libkipi-21.04.3:5= >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 flashexport? ( >=kde-frameworks/karchive-5.80.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kipi-plugins-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=11d6473dc095ed12b176d03290b677ca
diff --git a/metadata/md5-cache/kde-apps/kipi-plugins-21.04.3-r1 b/metadata/md5-cache/kde-apps/kipi-plugins-21.04.3-r1
new file mode 100644
index 000000000000..9ea849045e04
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kipi-plugins-21.04.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-apps/libkipi-21.04.3:5= >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.80.0:5 ) >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugins for the KDE Image Plugin Interface
+EAPI=7
+HOMEPAGE=https://apps.kde.org/kipi_plugins/ https://userbase.kde.org/KIPI
+IUSE=mediawiki +remotestorage debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-apps/libkipi-21.04.3:5= >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kipi-plugins-21.04.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c361fad311b459a3ff44aa278637e70f
diff --git a/metadata/md5-cache/kde-apps/kiriki-21.04.2 b/metadata/md5-cache/kde-apps/kiriki-21.04.2
deleted file mode 100644
index 117f6ecccd97..000000000000
--- a/metadata/md5-cache/kde-apps/kiriki-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=An addictive and fun dice game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kiriki/ https://games.kde.org/games/kiriki/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kiriki-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0141f05ac740eee131caac6afeb668b0
diff --git a/metadata/md5-cache/kde-apps/kiten-21.04.2 b/metadata/md5-cache/kde-apps/kiten-21.04.2
deleted file mode 100644
index 999cd27f4672..000000000000
--- a/metadata/md5-cache/kde-apps/kiten-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Japanese dictionary and reference
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kiten/ https://edu.kde.org/kiten/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-fonts/kanjistrokeorders || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kiten-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1c254b4b7d0171e62a01b5dfd5c629ed
diff --git a/metadata/md5-cache/kde-apps/kitinerary-21.04.2 b/metadata/md5-cache/kde-apps/kitinerary-21.04.2
deleted file mode 100644
index 9cdd7c74d40a..000000000000
--- a/metadata/md5-cache/kde-apps/kitinerary-21.04.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpkpass-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0 ) pdf? ( app-text/poppler:=[qt5] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Data Model and Extraction System for Travel Reservation information
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kontact/
-IUSE=+barcode pdf test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpkpass-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0 ) pdf? ( app-text/poppler:=[qt5] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=test? ( pdf )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kitinerary-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c52c89088100ceffe78610caca483e3
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-21.04.2 b/metadata/md5-cache/kde-apps/kjumpingcube-21.04.2
deleted file mode 100644
index 8c9b494bd7e2..000000000000
--- a/metadata/md5-cache/kde-apps/kjumpingcube-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Tactical one or two player game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kjumpingcube/ https://games.kde.org/games/kjumpingcube/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kjumpingcube-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=37ad2bfb949d95e4b6f3563126903b20
diff --git a/metadata/md5-cache/kde-apps/kldap-21.04.2 b/metadata/md5-cache/kde-apps/kldap-21.04.2
deleted file mode 100644
index 06f66e4e6831..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/cyrus-sasl dev-libs/qtkeychain:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-nds/openldap dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interacting with LDAP servers
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kldap/html/index.html
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/cyrus-sasl dev-libs/qtkeychain:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-nds/openldap || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kldap-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=564514013ddba2457d1fde39da9545dc
diff --git a/metadata/md5-cache/kde-apps/kleopatra-21.04.2 b/metadata/md5-cache/kde-apps/kleopatra-21.04.2
deleted file mode 100644
index 9c7fe33512ae..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.13.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kleopatra/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=app-crypt/gpgme-1.13.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=app-crypt/gnupg-2.1 app-crypt/paperkey || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kleopatra-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8d901e04b068f47d2151da36005f963f
diff --git a/metadata/md5-cache/kde-apps/klettres-21.04.2 b/metadata/md5-cache/kde-apps/klettres-21.04.2
deleted file mode 100644
index 5cb6c11908a6..000000000000
--- a/metadata/md5-cache/kde-apps/klettres-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Alphabet learning application
-EAPI=7
-HOMEPAGE=https://apps.kde.org/klettres/ https://edu.kde.org/klettres/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/klettres-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8ed5f6f0fc8e7026a6defc300c8e7bef
diff --git a/metadata/md5-cache/kde-apps/klickety-21.04.2 b/metadata/md5-cache/kde-apps/klickety-21.04.2
deleted file mode 100644
index 60bc271dec0c..000000000000
--- a/metadata/md5-cache/kde-apps/klickety-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=An adaptation of the Clickomania game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/klickety/ https://games.kde.org/games/klickety/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/klickety-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=983ddd7886aab8fc46e9d687c4a89192
diff --git a/metadata/md5-cache/kde-apps/klines-21.04.2 b/metadata/md5-cache/kde-apps/klines-21.04.2
deleted file mode 100644
index 5fca5a3dd2d6..000000000000
--- a/metadata/md5-cache/kde-apps/klines-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A little KDE game about balls and how to get rid of them
-EAPI=7
-HOMEPAGE=https://apps.kde.org/klines/ https://games.kde.org/games/klines/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/klines-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=24217d908f42eb72465e1a0968eaabf7
diff --git a/metadata/md5-cache/kde-apps/kmag-21.04.2 b/metadata/md5-cache/kde-apps/kmag-21.04.2
deleted file mode 100644
index 77ede4cf18d4..000000000000
--- a/metadata/md5-cache/kde-apps/kmag-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE screen magnifier
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kmag/
-IUSE=keyboardfocus debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmag-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7c2adc7c40332d993743282e0e065e7c
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-21.04.2 b/metadata/md5-cache/kde-apps/kmahjongg-21.04.2
deleted file mode 100644
index 70da5c4b5655..000000000000
--- a/metadata/md5-cache/kde-apps/kmahjongg-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-apps/libkmahjongg-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A tile matching game for one or two players
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kmahjongg/ https://games.kde.org/games/kmahjongg/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-apps/libkmahjongg-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmahjongg-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5c60faa2cc8517bf21da79d6cecf090c
diff --git a/metadata/md5-cache/kde-apps/kmail-21.04.2 b/metadata/md5-cache/kde-apps/kmail-21.04.2
deleted file mode 100644
index d0a2b30dcb61..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt test? ( >=kde-apps/akonadi-21.04.2:5[tools] ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libgravatar-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-apps/libksieve-21.04.2:5 >=kde-apps/libktnef-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kldap-21.04.2:5 test? ( >=kde-apps/akonadi-21.04.2:5[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kmail2/ https://kontact.kde.org/components/kmail.html
-IUSE=pch telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libgravatar-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-apps/libksieve-21.04.2:5 >=kde-apps/libktnef-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kdepim-runtime-21.04.2:5 >=kde-apps/kmail-account-wizard-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmail-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=08769839191a7acfe25490237283d298
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-21.04.2 b/metadata/md5-cache/kde-apps/kmail-account-wizard-21.04.2
deleted file mode 100644
index 019e7f32325e..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/qtkeychain:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kldap-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Assistant for KMail accounts configuration
-EAPI=7
-HOMEPAGE=https://kde.org/ https://userbase.kde.org/KMail/Account_Wizard
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=dev-libs/qtkeychain:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kldap-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmail-account-wizard-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eaa1ca520cb8c81e5244f19683bd69ab
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-21.04.2 b/metadata/md5-cache/kde-apps/kmailtransport-21.04.2
deleted file mode 100644
index 826b24533b22..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/qtkeychain:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/ksmtp-21.04.2:5 >=kde-apps/libkgapi-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 test? ( >=kde-frameworks/ktextwidgets-5.80.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Mail transport service
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/qtkeychain:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/ksmtp-21.04.2:5 >=kde-apps/libkgapi-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmailtransport-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=893f5aebf9a099f4c6c586b52eecab8b
diff --git a/metadata/md5-cache/kde-apps/kmbox-21.04.2 b/metadata/md5-cache/kde-apps/kmbox-21.04.2
deleted file mode 100644
index 91f31e11c05b..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-21.04.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for accessing MBox format mail storages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-apps/kmime-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmbox-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aafc5f1d1a498f8a9c6b9a27f5d3664a
diff --git a/metadata/md5-cache/kde-apps/kmime-21.04.2 b/metadata/md5-cache/kde-apps/kmime-21.04.2
deleted file mode 100644
index d4b577dd3661..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libary for handling mail messages and newsgroup articles
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmime-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c5adbb1cb91c48056479d063745d7a31
diff --git a/metadata/md5-cache/kde-apps/kmines-21.04.2 b/metadata/md5-cache/kde-apps/kmines-21.04.2
deleted file mode 100644
index 2796a563c33f..000000000000
--- a/metadata/md5-cache/kde-apps/kmines-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Classic mine sweeper game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kmines/ https://games.kde.org/games/kmines/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmines-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2b4fac541c19871d8352b5f94550ff24
diff --git a/metadata/md5-cache/kde-apps/kmix-21.04.2 b/metadata/md5-cache/kde-apps/kmix-21.04.2
deleted file mode 100644
index f2585621deb6..000000000000
--- a/metadata/md5-cache/kde-apps/kmix-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) plasma? ( >=kde-frameworks/plasma-5.80.0:5 ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Volume control gui based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kmix/
-IUSE=alsa plasma pulseaudio debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) plasma? ( >=kde-frameworks/plasma-5.80.0:5 ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) kde-plasma/kde-cli-tools:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmix-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d31422acde9a375876ff525bdf38f370
diff --git a/metadata/md5-cache/kde-apps/kmousetool-21.04.2 b/metadata/md5-cache/kde-apps/kmousetool-21.04.2
deleted file mode 100644
index 6537f46af0ec..000000000000
--- a/metadata/md5-cache/kde-apps/kmousetool-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libXext x11-libs/libXt dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE program that clicks the mouse for you
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kmousetool/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXtst || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmousetool-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=98e124829ceb8bd794c47b0b995d4470
diff --git a/metadata/md5-cache/kde-apps/kmouth-21.04.2 b/metadata/md5-cache/kde-apps/kmouth-21.04.2
deleted file mode 100644
index 53faa1572b9e..000000000000
--- a/metadata/md5-cache/kde-apps/kmouth-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtspeech-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Text-to-speech synthesizer front end
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kmouth/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtspeech-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmouth-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c188c0620d752bf06e99bac0bf19a4dc
diff --git a/metadata/md5-cache/kde-apps/kmplot-21.04.2 b/metadata/md5-cache/kde-apps/kmplot-21.04.2
deleted file mode 100644
index 8506a52948cc..000000000000
--- a/metadata/md5-cache/kde-apps/kmplot-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Mathematical function plotter
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kmplot/ https://edu.kde.org/kmplot/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kmplot-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ed9d9dadcb8b22c63c02eca29e490db9
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-21.04.2 b/metadata/md5-cache/kde-apps/knavalbattle-21.04.2
deleted file mode 100644
index 29745c898a95..000000000000
--- a/metadata/md5-cache/kde-apps/knavalbattle-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Battleship clone by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/knavalbattle/ https://games.kde.org/games/kbattleship/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/knavalbattle-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2612fd24063f59fd1f054fdef632c039
diff --git a/metadata/md5-cache/kde-apps/knetwalk-21.04.2 b/metadata/md5-cache/kde-apps/knetwalk-21.04.2
deleted file mode 100644
index 69055d6249d3..000000000000
--- a/metadata/md5-cache/kde-apps/knetwalk-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE version of the popular NetWalk game for system administrators
-EAPI=7
-HOMEPAGE=https://apps.kde.org/knetwalk/ https://games.kde.org/games/knetwalk/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/knetwalk-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=58dabb3875715df7a0d9de913a6acf4b
diff --git a/metadata/md5-cache/kde-apps/knights-21.04.2 b/metadata/md5-cache/kde-apps/knights-21.04.2
deleted file mode 100644
index 26e695f3b9ac..000000000000
--- a/metadata/md5-cache/kde-apps/knights-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kplotting-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple chess board based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/knights/
-IUSE=speech debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kplotting-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) || ( games-board/gnuchess games-board/crafty games-board/stockfish games-board/sjeng ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/knights-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=775fbcbb030924562dea3482b2340cbd
diff --git a/metadata/md5-cache/kde-apps/knotes-21.04.2 b/metadata/md5-cache/kde-apps/knotes-21.04.2
deleted file mode 100644
index 05cc1908a562..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/grantlee:5 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-notes-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Note taking application
-EAPI=7
-HOMEPAGE=https://apps.kde.org/knotes/ https://kontact.kde.org/components/knotes.html
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=dev-libs/grantlee:5 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-notes-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 x11-libs/libX11 >=kde-apps/kdepim-runtime-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/knotes-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dd4d7dfa5cf51ac7704ce47f8c8df907
diff --git a/metadata/md5-cache/kde-apps/kolf-21.04.2 b/metadata/md5-cache/kde-apps/kolf-21.04.2
deleted file mode 100644
index 05f224df10c8..000000000000
--- a/metadata/md5-cache/kde-apps/kolf-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Minigolf game by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kolf/ https://games.kde.org/games/kolf/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kolf-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0af516ff490dca72ccce92e0fa4eb182
diff --git a/metadata/md5-cache/kde-apps/kollision-21.04.2 b/metadata/md5-cache/kde-apps/kollision-21.04.2
deleted file mode 100644
index 6ad6a74ca3de..000000000000
--- a/metadata/md5-cache/kde-apps/kollision-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple ball dodging game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kollision/ https://games.kde.org/games/kollision/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kollision-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b2a526245c7b6a9cd4cbfdb1a76668ee
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-21.04.2 b/metadata/md5-cache/kde-apps/kolourpaint-21.04.2
deleted file mode 100644
index 4414dace0b20..000000000000
--- a/metadata/md5-cache/kde-apps/kolourpaint-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 scanner? ( >=kde-apps/libksane-21.04.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Paint Program by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kolourpaint/
-IUSE=scanner debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 scanner? ( >=kde-apps/libksane-21.04.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kolourpaint-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=296bda2c7b39a74295e78f5cfac470de
diff --git a/metadata/md5-cache/kde-apps/kompare-21.04.2 b/metadata/md5-cache/kde-apps/kompare-21.04.2
deleted file mode 100644
index 3519dda9bfd6..000000000000
--- a/metadata/md5-cache/kde-apps/kompare-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkomparediff2-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A program to view the differences between files
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kompare/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkomparediff2-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kompare-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dd740ad5876bffa00fd860283bb99b98
diff --git a/metadata/md5-cache/kde-apps/konqueror-21.04.2 b/metadata/md5-cache/kde-apps/konqueror-21.04.2
deleted file mode 100644
index a911abbdb636..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdesu-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Web browser and file manager based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/konqueror/
-IUSE=activities speech X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdesu-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) kde-apps/kfind:5 kde-plasma/kde-cli-tools:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/konqueror-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4ece51f22bed02aed0649e627702bf09
diff --git a/metadata/md5-cache/kde-apps/konquest-21.04.2 b/metadata/md5-cache/kde-apps/konquest-21.04.2
deleted file mode 100644
index 7930ae3fedcf..000000000000
--- a/metadata/md5-cache/kde-apps/konquest-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Galactic Strategy KDE Game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/konquest/ https://games.kde.org/games/konquest/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/konquest-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=438d833847c01e6beab5a6139c4cbda4
diff --git a/metadata/md5-cache/kde-apps/konsole-21.04.2 b/metadata/md5-cache/kde-apps/konsole-21.04.2
deleted file mode 100644
index 557f775b1c7d..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE's terminal emulator
-EAPI=7
-HOMEPAGE=https://apps.kde.org/konsole/ https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/konsole-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ad015da6f351d11e182bca792808a3d7
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-21.04.2 b/metadata/md5-cache/kde-apps/konsolekalendar-21.04.2
deleted file mode 100644
index c6ccbcba0839..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Command line interface to KDE calendars
-EAPI=7
-HOMEPAGE=https://kde.org/ https://userbase.kde.org/KonsoleKalendar
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/akonadi-calendar-tools-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f707bfa49d9267fad491f58d37a510d8
diff --git a/metadata/md5-cache/kde-apps/kontact-21.04.2 b/metadata/md5-cache/kde-apps/kontact-21.04.2
deleted file mode 100644
index 8f9a0db1cfa5..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Container application to unify several major PIM applications within one
-EAPI=7
-HOMEPAGE=https://kontact.kde.org/ https://apps.kde.org/kontact/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kontact-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b1f5b124c6b2d9990dd0945ec13be63
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-21.04.2 b/metadata/md5-cache/kde-apps/kontactinterface-21.04.2
deleted file mode 100644
index 0736dd5757f4..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Library for embedding KParts in a Kontact component
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kontactinterface/html/index.html
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kontactinterface-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bb48d062ced6eee8d41df047e656858e
diff --git a/metadata/md5-cache/kde-apps/kopete-21.04.2 b/metadata/md5-cache/kde-apps/kopete-21.04.2
deleted file mode 100644
index fd4d60919d4a..000000000000
--- a/metadata/md5-cache/kde-apps/kopete-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdelibs4support-5.80.0:5 >=kde-frameworks/kemoticons-5.80.0:5 >=kde-frameworks/khtml-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( >=app-crypt/qca-2.3.0:2 ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( >=app-crypt/qca-2.3.0:2 net-dns/libidn:0= sys-libs/zlib ) zeroconf? ( >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-frameworks/kdnssd-5.80.0:5 ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kopete/
-IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdelibs4support-5.80.0:5 >=kde-frameworks/kemoticons-5.80.0:5 >=kde-frameworks/khtml-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( >=app-crypt/qca-2.3.0:2 ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( >=app-crypt/qca-2.3.0:2 net-dns/libidn:0= sys-libs/zlib ) zeroconf? ( >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-frameworks/kdnssd-5.80.0:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( >=app-crypt/qca-2.3.0:2[ssl] ) xmpp? ( >=app-crypt/qca-2.3.0:2[ssl?] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kopete-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=192dd97bbc4c8ce24a0e0be10fff23db
diff --git a/metadata/md5-cache/kde-apps/korganizer-21.04.2 b/metadata/md5-cache/kde-apps/korganizer-21.04.2
deleted file mode 100644
index 3b8f7f176b81..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-apps/akonadi-21.04.2:5[tools] ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/akonadi-notes-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/eventviews-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/incidenceeditor-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 telemetry? ( dev-libs/kuserfeedback:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=dev-qt/designer-5.15.2:5 >=kde-apps/kldap-21.04.2:5 test? ( >=kde-apps/akonadi-21.04.2:5[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
-EAPI=7
-HOMEPAGE=https://apps.kde.org/korganizer/
-IUSE=telemetry X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-calendar-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/akonadi-notes-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/eventviews-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/incidenceeditor-21.04.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kontactinterface-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 telemetry? ( dev-libs/kuserfeedback:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=kde-apps/kdepim-runtime-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/korganizer-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22c60609a8a96bdced23f086ac61838a
diff --git a/metadata/md5-cache/kde-apps/kpat-21.04.2 b/metadata/md5-cache/kde-apps/kpat-21.04.2
deleted file mode 100644
index 939bf512c0a1..000000000000
--- a/metadata/md5-cache/kde-apps/kpat-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-games/freecell-solver >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE patience game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kpat/ https://games.kde.org/games/kpat/
-IUSE=test debug +handbook test selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-games/freecell-solver >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kpat-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=41c1965130649fc0732faa8aa5a43942
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-21.04.2 b/metadata/md5-cache/kde-apps/kpimtextedit-21.04.2
deleted file mode 100644
index 80695e48f5ea..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtspeech-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 test? ( >=kde-frameworks/ktextwidgets-5.80.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Extended text editor for PIM applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtspeech-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kpimtextedit-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d9fde314f3b40f1acd5e8c7ca81a4b67
diff --git a/metadata/md5-cache/kde-apps/kpkpass-21.04.2 b/metadata/md5-cache/kde-apps/kpkpass-21.04.2
deleted file mode 100644
index 83ecacc2b0e9..000000000000
--- a/metadata/md5-cache/kde-apps/kpkpass-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to deal with Apple Wallet pass files
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kontact/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kpkpass-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cec27d0ef77323d609a295d375977009
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-21.04.2 b/metadata/md5-cache/kde-apps/kqtquickcharts-21.04.2
deleted file mode 100644
index 48f5b8a30d54..000000000000
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kqtquickcharts-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d22119bd1023a8a76252d060b2c44499
diff --git a/metadata/md5-cache/kde-apps/krdc-21.04.2 b/metadata/md5-cache/kde-apps/krdc-21.04.2
deleted file mode 100644
index 0adfb4dde675..000000000000
--- a/metadata/md5-cache/kde-apps/krdc-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 vnc? ( >=net-libs/libvncserver-0.9 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Remote desktop connection (RDP and VNC) client
-EAPI=7
-HOMEPAGE=https://apps.kde.org/krdc/
-IUSE=+rdp +vnc debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/krdc-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1786f39de0a027b76e8899da174df16d
diff --git a/metadata/md5-cache/kde-apps/kreversi-21.04.2 b/metadata/md5-cache/kde-apps/kreversi-21.04.2
deleted file mode 100644
index 2abbbf2cd6e0..000000000000
--- a/metadata/md5-cache/kde-apps/kreversi-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Board game by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kreversi/ https://games.kde.org/games/kreversi/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kreversi-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c128cce422e9f53cf283f1a5b967ce83
diff --git a/metadata/md5-cache/kde-apps/krfb-21.04.2 b/metadata/md5-cache/kde-apps/krfb-21.04.2
deleted file mode 100644
index eaf4a05aab4a..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image wayland? ( media-video/pipewire:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=VNC-compatible server to share Plasma desktops
-EAPI=7
-HOMEPAGE=https://apps.kde.org/krfb/
-IUSE=wayland debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image wayland? ( media-video/pipewire:= ) wayland? ( sys-apps/xdg-desktop-portal[screencast] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/krfb-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1f7c632b686fbc2d5808c582037b7fed
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-21.04.2 b/metadata/md5-cache/kde-apps/kross-interpreters-21.04.2
deleted file mode 100644
index 976f1ccfdeba..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kross-5.80.0:5 || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Kross interpreter plugins for programming languages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kross-5.80.0:5 || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kross-interpreters-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9e93f44415d9423e43dd317f94d9fdaf
diff --git a/metadata/md5-cache/kde-apps/kruler-21.04.2 b/metadata/md5-cache/kde-apps/kruler-21.04.2
deleted file mode 100644
index 9fb74739e0e9..000000000000
--- a/metadata/md5-cache/kde-apps/kruler-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Screen ruler for Plasma
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kruler/
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kruler-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5408fff879d79dda861269023d02117f
diff --git a/metadata/md5-cache/kde-apps/kshisen-21.04.2 b/metadata/md5-cache/kde-apps/kshisen-21.04.2
deleted file mode 100644
index a1cf122affe9..000000000000
--- a/metadata/md5-cache/kde-apps/kshisen-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-apps/libkmahjongg-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Solitaire-like game played using the standard set of Mahjong tiles
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kshisen/ https://games.kde.org/games/kshisen/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-apps/libkmahjongg-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kshisen-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a9a46cbd3744af0fea85d6e14f46e425
diff --git a/metadata/md5-cache/kde-apps/ksirk-21.04.2 b/metadata/md5-cache/kde-apps/ksirk-21.04.2
deleted file mode 100644
index 18b4a79d7c40..000000000000
--- a/metadata/md5-cache/kde-apps/ksirk-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 sys-libs/zlib dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Port of the board game risk
-EAPI=7
-HOMEPAGE=https://apps.kde.org/ksirk/ https://games.kde.org/games/ksirk/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ksirk-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=85318a1c61592d3e6284a1ba8b888184
diff --git a/metadata/md5-cache/kde-apps/ksmtp-21.04.2 b/metadata/md5-cache/kde-apps/ksmtp-21.04.2
deleted file mode 100644
index 6c953fab2b34..000000000000
--- a/metadata/md5-cache/kde-apps/ksmtp-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/cyrus-sasl >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Job-based library to send email through an SMTP server
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/ksmtp/html/index.html
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ksmtp-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4ba38c7a7c8c29a28ab53b6062539446
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-21.04.2 b/metadata/md5-cache/kde-apps/ksnakeduel-21.04.2
deleted file mode 100644
index 243947ccc507..000000000000
--- a/metadata/md5-cache/kde-apps/ksnakeduel-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Tron game
-EAPI=7
-HOMEPAGE=https://apps.kde.org/ksnakeduel/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ksnakeduel-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=157b4ddce7704a321463cfedfe430e1d
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-21.04.2 b/metadata/md5-cache/kde-apps/kspaceduel-21.04.2
deleted file mode 100644
index 6bf693d07e8c..000000000000
--- a/metadata/md5-cache/kde-apps/kspaceduel-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Space Game by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kspaceduel/ https://games.kde.org/games/kspaceduel/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kspaceduel-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=30f894a3bf367ce29f9ecc1b9d83f26e
diff --git a/metadata/md5-cache/kde-apps/ksquares-21.04.2 b/metadata/md5-cache/kde-apps/ksquares-21.04.2
deleted file mode 100644
index 29b82bd57c15..000000000000
--- a/metadata/md5-cache/kde-apps/ksquares-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE clone of the game squares
-EAPI=7
-HOMEPAGE=https://apps.kde.org/ksquares/ https://games.kde.org/games/ksquares/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ksquares-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=861ca84144521944abd3eb561115a261
diff --git a/metadata/md5-cache/kde-apps/ksudoku-21.04.2 b/metadata/md5-cache/kde-apps/ksudoku-21.04.2
deleted file mode 100644
index 6854c77331c0..000000000000
--- a/metadata/md5-cache/kde-apps/ksudoku-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 opengl? ( >=dev-qt/qtopengl-5.15.2:5 virtual/glu ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Logic-based symbol placement puzzle by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/ksudoku/ https://games.kde.org/games/ksudoku/
-IUSE=opengl debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 opengl? ( >=dev-qt/qtopengl-5.15.2:5 virtual/glu ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ksudoku-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5e7b195225bd60113c800977c6929d8c
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-21.04.2 b/metadata/md5-cache/kde-apps/ksystemlog-21.04.2
deleted file mode 100644
index 7333bb213e61..000000000000
--- a/metadata/md5-cache/kde-apps/ksystemlog-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 audit? ( sys-process/audit ) systemd? ( sys-apps/systemd ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=System log viewer by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/ksystemlog/
-IUSE=audit kdesu systemd test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 audit? ( sys-process/audit ) systemd? ( sys-apps/systemd ) kdesu? ( kde-plasma/kde-cli-tools[kdesu] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ksystemlog-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=02b5d9a9d8076780f70d043c65073c25
diff --git a/metadata/md5-cache/kde-apps/kteatime-21.04.2 b/metadata/md5-cache/kde-apps/kteatime-21.04.2
deleted file mode 100644
index b98f2666c650..000000000000
--- a/metadata/md5-cache/kde-apps/kteatime-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE timer for making a fine cup of tea
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kteatime/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kteatime-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d1ece47b2b00c72f1b5ce6efd68f1b79
diff --git a/metadata/md5-cache/kde-apps/ktimer-21.04.2 b/metadata/md5-cache/kde-apps/ktimer-21.04.2
deleted file mode 100644
index 2ad7f25d6ff9..000000000000
--- a/metadata/md5-cache/kde-apps/ktimer-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Little tool to execute programs after some time
-EAPI=7
-HOMEPAGE=https://apps.kde.org/ktimer/ https://utils.kde.org/projects/ktimer/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktimer-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2382651177ac8d4d6807a9e312023c80
diff --git a/metadata/md5-cache/kde-apps/ktouch-21.04.2 b/metadata/md5-cache/kde-apps/ktouch-21.04.2
deleted file mode 100644
index 002da7c1312e..000000000000
--- a/metadata/md5-cache/kde-apps/ktouch-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile ) >=kde-frameworks/kwindowsystem-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Program that helps to learn and practice touch typing
-EAPI=7
-HOMEPAGE=https://apps.kde.org/ktouch/
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile ) >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-apps/kqtquickcharts-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktouch-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=422b8461542bf5c445d4561af097aa67
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-21.04.2 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-21.04.2
deleted file mode 100644
index 5f62da20a51c..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kaccounts-integration-21.04.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-libs/accounts-qt net-libs/signond >=net-libs/telepathy-qt-0.9.8 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 net-libs/libaccounts-glib dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy account management kcm
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=experimental debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kaccounts-integration-21.04.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-libs/accounts-qt net-libs/signond >=net-libs/telepathy-qt-0.9.8 >=kde-apps/kaccounts-providers-21.04.2:5 net-im/telepathy-connection-managers || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktp-accounts-kcm-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=20d99c6e243e1735984724d2a39f07f2
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-21.04.2 b/metadata/md5-cache/kde-apps/ktp-approver-21.04.2
deleted file mode 100644
index d145b8e0091f..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-approver-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy notification handler
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-apps/ktp-contact-list-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktp-approver-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ad90541b8f62c4007fd65be37d442b02
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-21.04.2 b/metadata/md5-cache/kde-apps/ktp-auth-handler-21.04.2
deleted file mode 100644
index cf7702f42ea3..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kaccounts-integration-21.04.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-libs/accounts-qt net-libs/signond >=net-libs/telepathy-qt-0.9.8 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy authentication handler
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kaccounts-integration-21.04.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-libs/accounts-qt net-libs/signond >=net-libs/telepathy-qt-0.9.8 >=app-crypt/qca-2.3.0:2[ssl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktp-auth-handler-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9224ecbc17e39a20db301941db7da001
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-21.04.2 b/metadata/md5-cache/kde-apps/ktp-common-internals-21.04.2
deleted file mode 100644
index dc3442c6b1ac..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.8 otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-21.04.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kio-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy common library
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=otr +sso debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.8 otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-21.04.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktp-common-internals-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=62b050afb4b66e5f46c05c933229185a
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-21.04.2 b/metadata/md5-cache/kde-apps/ktp-contact-list-21.04.2
deleted file mode 100644
index dda58d16e7dc..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy contact list
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktp-contact-list-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4c7bea1a30e35edd613bce522fd5d077
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-21.04.2 b/metadata/md5-cache/kde-apps/ktp-contact-runner-21.04.2
deleted file mode 100644
index 3cd68082193f..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/krunner-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-frameworks/kservice-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy krunner plugin
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/krunner-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktp-contact-runner-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=df26a3ab77badf097bd439e621c6ea8c
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-21.04.2 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-21.04.2
deleted file mode 100644
index 529a18f4cda0..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktp-desktop-applets-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=deea4e138b06e43fae0b3d5add8145b6
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-21.04.2 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-21.04.2
deleted file mode 100644
index 3dfe695561c8..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy file transfer handler
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktp-filetransfer-handler-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ca7e787b169bf2459ab2a79caf69574d
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-21.04.2 b/metadata/md5-cache/kde-apps/ktp-kded-module-21.04.2
deleted file mode 100644
index f9eb37d7a81c..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kidletime-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy workspace integration
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kidletime-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-apps/signon-kwallet-extension-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktp-kded-module-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=88a87aeb9088e8f78864970e7af0b369
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-21.04.2 b/metadata/md5-cache/kde-apps/ktp-send-file-21.04.2
deleted file mode 100644
index 8870349c13df..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-send-file-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-frameworks/kcmutils-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-apps/ktp-contact-list-21.04.2:5 >=kde-apps/ktp-filetransfer-handler-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktp-send-file-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=26d6bfcfdf2d92ada9130313b9126d46
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-21.04.2 b/metadata/md5-cache/kde-apps/ktp-text-ui-21.04.2
deleted file mode 100644
index 3aba4977d040..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5[otr] >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kemoticons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy text chat window
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=speech debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.2:5[otr] >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kemoticons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) >=kde-apps/ktp-contact-list-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktp-text-ui-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a349b50518d637f89ce81ed0ec7f0e93
diff --git a/metadata/md5-cache/kde-apps/ktuberling-21.04.2 b/metadata/md5-cache/kde-apps/ktuberling-21.04.2
deleted file mode 100644
index 1c06f1260807..000000000000
--- a/metadata/md5-cache/kde-apps/ktuberling-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Potato game for kids by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/ktuberling/ https://games.kde.org/games/ktuberling/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktuberling-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=422f29ad0d3c0bf81994e695b0ef9e5d
diff --git a/metadata/md5-cache/kde-apps/kturtle-21.04.2 b/metadata/md5-cache/kde-apps/kturtle-21.04.2
deleted file mode 100644
index 4ac23e53d4b5..000000000000
--- a/metadata/md5-cache/kde-apps/kturtle-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Educational programming environment using the Logo programming language
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kturtle/ https://edu.kde.org/kturtle/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kturtle-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=01658de1478242a0d162922446a9a7c3
diff --git a/metadata/md5-cache/kde-apps/kturtle-21.04.3 b/metadata/md5-cache/kde-apps/kturtle-21.04.3
index 942c7ed18d46..63111252c513 100644
--- a/metadata/md5-cache/kde-apps/kturtle-21.04.3
+++ b/metadata/md5-cache/kde-apps/kturtle-21.04.3
@@ -11,4 +11,4 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kturtle-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=01658de1478242a0d162922446a9a7c3
+_md5_=0e97a9fbe91096d46d961c02e0bc135a
diff --git a/metadata/md5-cache/kde-apps/kubrick-21.04.2 b/metadata/md5-cache/kde-apps/kubrick-21.04.2
deleted file mode 100644
index d83b586c767b..000000000000
--- a/metadata/md5-cache/kde-apps/kubrick-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtopengl-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 virtual/glu virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kubrick/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtopengl-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 virtual/glu virtual/opengl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kubrick-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2878685e1b066d0afbbdaa55e5635e06
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-21.04.2 b/metadata/md5-cache/kde-apps/kwalletmanager-21.04.2
deleted file mode 100644
index 0e2a83ccfdfa..000000000000
--- a/metadata/md5-cache/kde-apps/kwalletmanager-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kauth-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Tool to manage the passwords on your system using KDE Wallet
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kauth-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kwalletmanager-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=152da36ef9075de26a81f142b261115b
diff --git a/metadata/md5-cache/kde-apps/kwave-21.04.2 b/metadata/md5-cache/kde-apps/kwave-21.04.2
deleted file mode 100644
index e394bb6a7f69..000000000000
--- a/metadata/md5-cache/kde-apps/kwave-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kwave/
-IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kwave-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f2cd5de4557ef1f588462f71c3b79f6b
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-21.04.2 b/metadata/md5-cache/kde-apps/kwordquiz-21.04.2
deleted file mode 100644
index c47fd9498c1c..000000000000
--- a/metadata/md5-cache/kde-apps/kwordquiz-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkeduvocdocument-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Powerful flashcard and vocabulary learning program
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kwordquiz/ https://edu.kde.org/kwordquiz/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkeduvocdocument-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kwordquiz-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6740aa8f839d60beb3961ceb2e11cd2e
diff --git a/metadata/md5-cache/kde-apps/kwrite-21.04.2 b/metadata/md5-cache/kde-apps/kwrite-21.04.2
deleted file mode 100644
index 390781862ae3..000000000000
--- a/metadata/md5-cache/kde-apps/kwrite-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple text editor based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kwrite/
-IUSE=activities debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kate-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ab729f46f9f254fbed92bf72806db35f
diff --git a/metadata/md5-cache/kde-apps/libgravatar-21.04.2 b/metadata/md5-cache/kde-apps/libgravatar-21.04.2
deleted file mode 100644
index 6f32a53162dd..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for gravatar integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libgravatar-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=04ea5f9b71919e63e6a1fcc3e2c24749
diff --git a/metadata/md5-cache/kde-apps/libkcddb-21.04.2 b/metadata/md5-cache/kde-apps/libkcddb-21.04.2
deleted file mode 100644
index 2d2ad2dab145..000000000000
--- a/metadata/md5-cache/kde-apps/libkcddb-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 musicbrainz? ( media-libs/musicbrainz:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE library for CDDB
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=musicbrainz debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 musicbrainz? ( media-libs/musicbrainz:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkcddb-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bd920a3c9c1eb99580349e69061e4937
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-21.04.2 b/metadata/md5-cache/kde-apps/libkcompactdisc-21.04.2
deleted file mode 100644
index d96b67aaa9b1..000000000000
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/phonon-4.11.0 alsa? ( media-libs/alsa-lib ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for playing & ripping CDs
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=alsa debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/phonon-4.11.0 alsa? ( media-libs/alsa-lib ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkcompactdisc-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=16f2da4f51c939e0abd7f6f27bff345a
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-21.04.2 b/metadata/md5-cache/kde-apps/libkdcraw-21.04.2
deleted file mode 100644
index e8d3f30149ba..000000000000
--- a/metadata/md5-cache/kde-apps/libkdcraw-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=media-libs/libraw-0.16:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Digital camera raw image library wrapper
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=media-libs/libraw-0.16:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkdcraw-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ed5fff56d5eefe1e040f96f021b2c593
diff --git a/metadata/md5-cache/kde-apps/libkdegames-21.04.2 b/metadata/md5-cache/kde-apps/libkdegames-21.04.2
deleted file mode 100644
index 28308ddefc5c..000000000000
--- a/metadata/md5-cache/kde-apps/libkdegames-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-libs/libsndfile media-libs/openal dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Base library common to many KDE games
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-libs/libsndfile media-libs/openal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkdegames-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e22c9badc1ef7fe7fc7f3a44bdabaa25
diff --git a/metadata/md5-cache/kde-apps/libkdepim-21.04.2 b/metadata/md5-cache/kde-apps/libkdepim-21.04.2
deleted file mode 100644
index 5d21273e79a0..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common PIM libraries
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkdepim-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=21de1d3a29acc2c3b976f51c49458861
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-21.04.2 b/metadata/md5-cache/kde-apps/libkeduvocdocument-21.04.2
deleted file mode 100644
index ec0be88a32b8..000000000000
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for reading/writing KVTML
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkeduvocdocument-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2889deedafe12b561d1208c5cef2c24e
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-21.04.2 b/metadata/md5-cache/kde-apps/libkexiv2-21.04.2
deleted file mode 100644
index 9546d634b69b..000000000000
--- a/metadata/md5-cache/kde-apps/libkexiv2-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=media-gfx/exiv2-0.25:=[xmp=] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Wrapper around exiv2 library
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+xmp debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=media-gfx/exiv2-0.25:=[xmp=] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkexiv2-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8aa1661f96ab754bde38cfbbb5392fce
diff --git a/metadata/md5-cache/kde-apps/libkgapi-21.04.2 b/metadata/md5-cache/kde-apps/libkgapi-21.04.2
deleted file mode 100644
index 7182b2f7397c..000000000000
--- a/metadata/md5-cache/kde-apps/libkgapi-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/cyrus-sasl:2 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for accessing Google calendar and contact resources
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/libkgapi/html/index.html
-IUSE=nls test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/cyrus-sasl:2 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkgapi-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=920ab1572084e3bb947c4d0710b3a326
diff --git a/metadata/md5-cache/kde-apps/libkipi-21.04.2 b/metadata/md5-cache/kde-apps/libkipi-21.04.2
deleted file mode 100644
index 909e710166aa..000000000000
--- a/metadata/md5-cache/kde-apps/libkipi-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A library for image plugins accross KDE applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/32
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkipi-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=32c1e851b4ded22be1e0a9920470133f
diff --git a/metadata/md5-cache/kde-apps/libkleo-21.04.2 b/metadata/md5-cache/kde-apps/libkleo-21.04.2
deleted file mode 100644
index d255014387cd..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.13.1[cxx,qt5] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 fancyviewer? ( >=kde-apps/kpimtextedit-21.04.2:5 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Library for encryption handling
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+fancyviewer debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-crypt/gpgme-1.13.1[cxx,qt5] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 fancyviewer? ( >=kde-apps/kpimtextedit-21.04.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkleo-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bc63383a604bd6cd2db64c12e639272a
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-21.04.2 b/metadata/md5-cache/kde-apps/libkmahjongg-21.04.2
deleted file mode 100644
index 2bdc0fa0d41e..000000000000
--- a/metadata/md5-cache/kde-apps/libkmahjongg-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkmahjongg-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a5149c0b71d233478d9395ff2b5675f5
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-21.04.2 b/metadata/md5-cache/kde-apps/libkomparediff2-21.04.2
deleted file mode 100644
index 379ca34cf913..000000000000
--- a/metadata/md5-cache/kde-apps/libkomparediff2-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE library to compare files and strings
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libkomparediff2-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fb95b475e287a8960180a7e05f8ea932
diff --git a/metadata/md5-cache/kde-apps/libksane-21.04.2 b/metadata/md5-cache/kde-apps/libksane-21.04.2
deleted file mode 100644
index fac34529b7d8..000000000000
--- a/metadata/md5-cache/kde-apps/libksane-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.80.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=SANE Library interface based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=kwallet debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libksane-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=08384e6cc9bb3ec35b9c4f66603ae329
diff --git a/metadata/md5-cache/kde-apps/libksieve-21.04.2 b/metadata/md5-cache/kde-apps/libksieve-21.04.2
deleted file mode 100644
index 81971ca31cfa..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/cyrus-sasl >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 >=kde-apps/kimap-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common PIM libraries
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libksieve-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b1a02008270ba6cb61dbbf8271ac67ef
diff --git a/metadata/md5-cache/kde-apps/libktnef-21.04.2 b/metadata/md5-cache/kde-apps/libktnef-21.04.2
deleted file mode 100644
index 8c0d5bb6bae5..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for handling TNEF data
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kcalutils-21.04.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktnef-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c1ebd2c40f0c005caf04e0cd04afcc19
diff --git a/metadata/md5-cache/kde-apps/lokalize-21.04.2 b/metadata/md5-cache/kde-apps/lokalize-21.04.2
deleted file mode 100644
index aace486d4894..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-21.04.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Localization tool for KDE software and other free and open source software
-EAPI=7
-HOMEPAGE=https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/
-IUSE=python_single_target_python3_8 python_single_target_python3_9 debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 python_single_target_python3_8? ( dev-python/translate-toolkit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/translate-toolkit[python_targets_python3_9(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/lokalize-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a97d247b5f6519b68e1884ea98d3e428
diff --git a/metadata/md5-cache/kde-apps/lokalize-21.04.3 b/metadata/md5-cache/kde-apps/lokalize-21.04.3
deleted file mode 100644
index a52851984006..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-21.04.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Localization tool for KDE software and other free and open source software
-EAPI=7
-HOMEPAGE=https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/
-IUSE=python_single_target_python3_8 python_single_target_python3_9 debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 python_single_target_python3_8? ( dev-python/translate-toolkit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/translate-toolkit[python_targets_python3_9(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.3/src/lokalize-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b4e3459b95a6066fcb82eb1190d6fa8c
diff --git a/metadata/md5-cache/kde-apps/lokalize-21.04.3-r1 b/metadata/md5-cache/kde-apps/lokalize-21.04.3-r1
new file mode 100644
index 000000000000..a6ffb7a49aca
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-21.04.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Localization tool for KDE software and other free and open source software
+EAPI=7
+HOMEPAGE=https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/
+IUSE=python_single_target_python3_8 python_single_target_python3_9 debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 python_single_target_python3_8? ( dev-python/translate-toolkit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/translate-toolkit[python_targets_python3_9(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.3/src/lokalize-21.04.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5950aed4299abe6fe5dda17086614161
diff --git a/metadata/md5-cache/kde-apps/lskat-21.04.2 b/metadata/md5-cache/kde-apps/lskat-21.04.2
deleted file mode 100644
index db6749676de8..000000000000
--- a/metadata/md5-cache/kde-apps/lskat-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Skat game by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/lskat/ https://games.kde.org/games/lskat/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/lskat-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3fe7372e21772d2ac046b4756ec0beb2
diff --git a/metadata/md5-cache/kde-apps/mailcommon-21.04.2 b/metadata/md5-cache/kde-apps/mailcommon-21.04.2
deleted file mode 100644
index 68e76b3241fc..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/mailimporter-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 >=media-libs/phonon-4.11.0 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common mail library
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/mailimporter-21.04.2:5 >=kde-apps/messagelib-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/mailcommon-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=55bee28b08cbda9e87a80b9e8d2ee30d
diff --git a/metadata/md5-cache/kde-apps/mailimporter-21.04.2 b/metadata/md5-cache/kde-apps/mailimporter-21.04.2
deleted file mode 100644
index 4d563bf2256d..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to import mail from various sources
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/mailimporter-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f578ff096c9051283f6d764127b97349
diff --git a/metadata/md5-cache/kde-apps/marble-21.04.2 b/metadata/md5-cache/kde-apps/marble-21.04.2
deleted file mode 100644
index 932b93f04c6c..000000000000
--- a/metadata/md5-cache/kde-apps/marble-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-libs/zlib aprs? ( >=dev-qt/qtserialport-5.15.2:5 ) dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) designer? ( >=dev-qt/designer-5.15.2:5 ) geolocation? ( >=dev-qt/qtpositioning-5.15.2:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/krunner-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 ) pbf? ( dev-libs/protobuf:= ) phonon? ( >=media-libs/phonon-4.11.0 ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
-EAPI=7
-HOMEPAGE=https://marble.kde.org/
-IUSE=aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-libs/zlib aprs? ( >=dev-qt/qtserialport-5.15.2:5 ) dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) designer? ( >=dev-qt/designer-5.15.2:5 ) geolocation? ( >=dev-qt/qtpositioning-5.15.2:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/krunner-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 ) pbf? ( dev-libs/protobuf:= ) phonon? ( >=media-libs/phonon-4.11.0 ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/21.04
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/marble-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b29d8e9e088f58a165c09869df6230dc
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-21.04.2 b/metadata/md5-cache/kde-apps/mbox-importer-21.04.2
deleted file mode 100644
index a53fd6e6a5c3..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/mailimporter-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Import mbox email archives from various sources into Akonadi
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/mailimporter-21.04.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/mbox-importer-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9f3c05a0a8dfad572255aa2c6e554738
diff --git a/metadata/md5-cache/kde-apps/messagelib-21.04.2 b/metadata/md5-cache/kde-apps/messagelib-21.04.2
deleted file mode 100644
index 113a39eab250..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=app-crypt/qca-2.3.0:2 >=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/incidenceeditor-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kldap-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmbox-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libgravatar-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libraries for messaging functions
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=app-crypt/qca-2.3.0:2 >=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/incidenceeditor-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kldap-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmbox-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libgravatar-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/libkleo-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/messagelib-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=70cfa5c06f80ad3f9b0f53c10e030f76
diff --git a/metadata/md5-cache/kde-apps/minuet-21.04.2 b/metadata/md5-cache/kde-apps/minuet-21.04.2
deleted file mode 100644
index ddf294f22181..000000000000
--- a/metadata/md5-cache/kde-apps/minuet-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 media-sound/fluidsynth:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Music Education software by KDE
-EAPI=7
-HOMEPAGE=https://minuet.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 media-sound/fluidsynth:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/minuet-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c8dbebc63f685f195da99a03888cb606
diff --git a/metadata/md5-cache/kde-apps/okular-21.04.2 b/metadata/md5-cache/kde-apps/okular-21.04.2
deleted file mode 100644
index 032e1ce007a8..000000000000
--- a/metadata/md5-cache/kde-apps/okular-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjs-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/threadweaver-5.80.0:5 media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib chm? ( dev-libs/chmlib dev-libs/libzip:= >=kde-frameworks/khtml-5.80.0:5 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=dev-qt/qtgui-5.15.2:5[gif,jpeg,png] >=kde-apps/libkexiv2-21.04.2:5 ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-21.04.2:5 ) pdf? ( app-text/poppler[nss,qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) tiff? ( media-libs/tiff:0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Universal document viewer based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://okular.kde.org https://apps.kde.org/okular/
-IUSE=chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjs-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/threadweaver-5.80.0:5 media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib chm? ( dev-libs/chmlib dev-libs/libzip:= >=kde-frameworks/khtml-5.80.0:5 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=dev-qt/qtgui-5.15.2:5[gif,jpeg,png] >=kde-apps/libkexiv2-21.04.2:5 ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-21.04.2:5 ) pdf? ( app-text/poppler[nss,qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.80.0:5 ) qml? ( >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/okular-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bfa3fdbd780385345f12035cb7c57ed8
diff --git a/metadata/md5-cache/kde-apps/okular-21.04.3 b/metadata/md5-cache/kde-apps/okular-21.04.3
deleted file mode 100644
index 77e9b2ad407c..000000000000
--- a/metadata/md5-cache/kde-apps/okular-21.04.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjs-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/threadweaver-5.80.0:5 media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib chm? ( dev-libs/chmlib dev-libs/libzip:= >=kde-frameworks/khtml-5.80.0:5 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=dev-qt/qtgui-5.15.2:5[gif,jpeg,png] >=kde-apps/libkexiv2-21.04.3:5 ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-21.04.3:5 ) pdf? ( app-text/poppler[nss,qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) tiff? ( media-libs/tiff:0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Universal document viewer based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://okular.kde.org https://apps.kde.org/okular/
-IUSE=chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjs-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/threadweaver-5.80.0:5 media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib chm? ( dev-libs/chmlib dev-libs/libzip:= >=kde-frameworks/khtml-5.80.0:5 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=dev-qt/qtgui-5.15.2:5[gif,jpeg,png] >=kde-apps/libkexiv2-21.04.3:5 ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-21.04.3:5 ) pdf? ( app-text/poppler[nss,qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.80.0:5 ) qml? ( >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.3/src/okular-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bfa3fdbd780385345f12035cb7c57ed8
diff --git a/metadata/md5-cache/kde-apps/okular-21.04.3-r2 b/metadata/md5-cache/kde-apps/okular-21.04.3-r2
new file mode 100644
index 000000000000..d7eabbd20c1d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okular-21.04.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjs-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/threadweaver-5.80.0:5 media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib chm? ( dev-libs/chmlib dev-libs/libzip:= >=kde-frameworks/khtml-5.80.0:5 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=dev-qt/qtgui-5.15.2:5[gif,jpeg,png] >=kde-apps/libkexiv2-21.04.3:5 ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-21.04.3:5 ) pdf? ( app-text/poppler[nss,qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) tiff? ( media-libs/tiff:0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Universal document viewer based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://okular.kde.org https://apps.kde.org/okular/
+IUSE=chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjs-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/threadweaver-5.80.0:5 media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib chm? ( dev-libs/chmlib dev-libs/libzip:= >=kde-frameworks/khtml-5.80.0:5 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=dev-qt/qtgui-5.15.2:5[gif,jpeg,png] >=kde-apps/libkexiv2-21.04.3:5 ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-21.04.3:5 ) pdf? ( app-text/poppler[nss,qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.80.0:5 ) qml? ( >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.3/src/okular-21.04.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2d16fa4d4e23d16d80c2fb4de85356ad
diff --git a/metadata/md5-cache/kde-apps/palapeli-21.04.2 b/metadata/md5-cache/kde-apps/palapeli-21.04.2
deleted file mode 100644
index 47a749003755..000000000000
--- a/metadata/md5-cache/kde-apps/palapeli-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Jigsaw puzzle game by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/palapeli/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/palapeli-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=29dc84c3c9e75da2f831ea65fb57c2dc
diff --git a/metadata/md5-cache/kde-apps/parley-21.04.2 b/metadata/md5-cache/kde-apps/parley-21.04.2
deleted file mode 100644
index c9d7d9d95da6..000000000000
--- a/metadata/md5-cache/kde-apps/parley-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=kde-apps/libkeduvocdocument-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A vocabulary trainer to help you memorize things
-EAPI=7
-HOMEPAGE=https://apps.kde.org/parley/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=kde-apps/libkeduvocdocument-21.04.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=kde-apps/kdeedu-data-21.04.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/parley-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=08d67596c1288c649e65d696137ff9b7
diff --git a/metadata/md5-cache/kde-apps/picmi-21.04.2 b/metadata/md5-cache/kde-apps/picmi-21.04.2
deleted file mode 100644
index b0dc5ce46cbb..000000000000
--- a/metadata/md5-cache/kde-apps/picmi-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Nonogram logic game by KDE
-EAPI=7
-HOMEPAGE=https://apps.kde.org/picmi/ https://games.kde.org/games/picmi/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/picmi-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9cc6814ef4e7cb555e40b85fac5fca7a
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-21.04.2 b/metadata/md5-cache/kde-apps/pim-data-exporter-21.04.2
deleted file mode 100644
index 4773c58f39d8..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Assistant to backup and archive PIM data and configuration
-EAPI=7
-HOMEPAGE=https://apps.kde.org/pimdataexporter/ https://userbase.kde.org/KMail/Backup_Options
-IUSE=telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/grantleetheme-21.04.2:5 >=kde-apps/kidentitymanagement-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/kmime-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-apps/mailcommon-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/pim-data-exporter-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3e943a72d2c45d01630f13e69b014599
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-21.04.2 b/metadata/md5-cache/kde-apps/pim-sieve-editor-21.04.2
deleted file mode 100644
index cb8c317605be..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/qtkeychain:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/libksieve-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Assistant for editing IMAP Sieve filters
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=dev-libs/qtkeychain:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-mime-21.04.2:5 >=kde-apps/calendarsupport-21.04.2:5 >=kde-apps/kmailtransport-21.04.2:5 >=kde-apps/libksieve-21.04.2:5 >=kde-apps/pimcommon-21.04.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/pim-sieve-editor-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=87747d59a3c3ebf9d4573bf95d212dcf
diff --git a/metadata/md5-cache/kde-apps/pimcommon-21.04.2 b/metadata/md5-cache/kde-apps/pimcommon-21.04.2
deleted file mode 100644
index cdd125d48217..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/kimap-21.04.2:5 >=kde-apps/kldap-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/purpose-5.80.0:5 test? ( >=kde-apps/kmime-21.04.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common PIM libraries
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.2:5 >=kde-apps/akonadi-contacts-21.04.2:5 >=kde-apps/akonadi-search-21.04.2:5 >=kde-apps/kimap-21.04.2:5 >=kde-apps/kldap-21.04.2:5 >=kde-apps/kpimtextedit-21.04.2:5 >=kde-apps/libkdepim-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/purpose-5.80.0:5 !<kde-apps/libkdepim-20.07.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/pimcommon-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eb58ed5eed25ce817e44a5c5ff15eef1
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-21.04.2 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-21.04.2
deleted file mode 100644
index 540ba09cc74d..000000000000
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-21.04.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Plasma Telepathy client
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ktp-accounts-kcm-21.04.2:5 >=kde-apps/ktp-approver-21.04.2:5 >=kde-apps/ktp-auth-handler-21.04.2:5 >=kde-apps/ktp-common-internals-21.04.2:5 >=kde-apps/ktp-contact-list-21.04.2:5 >=kde-apps/ktp-contact-runner-21.04.2:5 >=kde-apps/ktp-desktop-applets-21.04.2:5 >=kde-apps/ktp-filetransfer-handler-21.04.2:5 >=kde-apps/ktp-kded-module-21.04.2:5 >=kde-apps/ktp-send-file-21.04.2:5 >=kde-apps/ktp-text-ui-21.04.2:5
-SLOT=5
-_md5_=6a0034ad9bd4b0fff9e82597fc0e8856
diff --git a/metadata/md5-cache/kde-apps/poxml-21.04.2 b/metadata/md5-cache/kde-apps/poxml-21.04.2
deleted file mode 100644
index 833dc21b80d1..000000000000
--- a/metadata/md5-cache/kde-apps/poxml-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.64.0:5 ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.15.2:5 sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtxml-5.15.2:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/poxml-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=28880b61d68014e0fdf178aa0a098c91
diff --git a/metadata/md5-cache/kde-apps/print-manager-21.04.2 b/metadata/md5-cache/kde-apps/print-manager-21.04.2
deleted file mode 100644
index eb1df596a4f3..000000000000
--- a/metadata/md5-cache/kde-apps/print-manager-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 net-print/cups dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Manage print jobs and printers in Plasma
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+gtk debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 net-print/cups >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 gtk? ( app-admin/system-config-printer ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/print-manager-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e5454d08c3927173942743a51fa13a0e
diff --git a/metadata/md5-cache/kde-apps/rocs-21.04.2 b/metadata/md5-cache/kde-apps/rocs-21.04.2
deleted file mode 100644
index ec5beafffdff..000000000000
--- a/metadata/md5-cache/kde-apps/rocs-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5[scripttools] >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=dev-libs/boost-1.49 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Interface to work with Graph Theory
-EAPI=7
-HOMEPAGE=https://apps.kde.org/rocs/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5[scripttools] >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/rocs-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=77a8f0a098047679cdde7d51a82d6051
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-21.04.2 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-21.04.2
deleted file mode 100644
index c35848bf869c..000000000000
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.80.0:5 net-libs/signond dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KWallet extension for signond
-EAPI=7
-HOMEPAGE=https://accounts-sso.gitlab.io/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kwallet-5.80.0:5 net-libs/signond || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/signon-kwallet-extension-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3a1030b465c267c49dccce2668c17fb0
diff --git a/metadata/md5-cache/kde-apps/spectacle-21.04.2 b/metadata/md5-cache/kde-apps/spectacle-21.04.2
deleted file mode 100644
index 5276f029313a..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwayland-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image annotate? ( >=media-libs/kimageannotator-0.4.1 ) kipi? ( >=kde-apps/libkipi-21.04.2:5= ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Screenshot capture utility
-EAPI=7
-HOMEPAGE=https://apps.kde.org/spectacle/
-IUSE=+annotate kipi share debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
-RDEPEND=>=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwayland-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image annotate? ( >=media-libs/kimageannotator-0.4.1 ) kipi? ( >=kde-apps/libkipi-21.04.2:5= ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) kipi? ( >=kde-apps/kipi-plugins-21.04.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/spectacle-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=687dd71bb2e539f869e954f037c74c1c
diff --git a/metadata/md5-cache/kde-apps/step-21.04.2 b/metadata/md5-cache/kde-apps/step-21.04.2
deleted file mode 100644
index 5839e82873df..000000000000
--- a/metadata/md5-cache/kde-apps/step-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-cpp/eigen-3.2:3 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtopengl-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kplotting-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Interactive physics simulator
-EAPI=7
-HOMEPAGE=https://apps.kde.org/step/ https://edu.kde.org/step/
-IUSE=+gsl nls +qalculate debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/eigen-3.2:3 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtopengl-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kplotting-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/step-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=abafea68a1322881683bf55c3eaa0ccc
diff --git a/metadata/md5-cache/kde-apps/svgpart-21.04.2 b/metadata/md5-cache/kde-apps/svgpart-21.04.2
deleted file mode 100644
index 0634024bdd80..000000000000
--- a/metadata/md5-cache/kde-apps/svgpart-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Kpart for viewing SVGs
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/svgpart-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c480b166bc6bafe71197332340ced05
diff --git a/metadata/md5-cache/kde-apps/sweeper-21.04.2 b/metadata/md5-cache/kde-apps/sweeper-21.04.2
deleted file mode 100644
index ae51f17bbad2..000000000000
--- a/metadata/md5-cache/kde-apps/sweeper-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-stats-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
-EAPI=7
-HOMEPAGE=https://apps.kde.org/sweeper/ https://utils.kde.org/projects/sweeper/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-stats-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/sweeper-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c3085a0cde86679065223fe41a3e7b01
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-21.04.2 b/metadata/md5-cache/kde-apps/thumbnailers-21.04.2
deleted file mode 100644
index cb310c996f58..000000000000
--- a/metadata/md5-cache/kde-apps/thumbnailers-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 raw? ( >=kde-apps/libkdcraw-21.04.2:5 >=kde-apps/libkexiv2-21.04.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=raw debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 raw? ( >=kde-apps/libkdcraw-21.04.2:5 >=kde-apps/libkexiv2-21.04.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdegraphics-thumbnailers-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8393bb1780786de3e97fe9d5f84b820d
diff --git a/metadata/md5-cache/kde-apps/umbrello-21.04.2 b/metadata/md5-cache/kde-apps/umbrello-21.04.2
deleted file mode 100644
index 4ab75113b558..000000000000
--- a/metadata/md5-cache/kde-apps/umbrello-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdelibs4support-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 php? ( dev-util/kdevelop:5= dev-util/kdevelop-pg-qt:5 dev-util/kdevelop-php:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE UML Modeller
-EAPI=7
-HOMEPAGE=https://apps.kde.org/umbrello/ https://umbrello.kde.org
-IUSE=php test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdelibs4support-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 php? ( dev-util/kdevelop:5= dev-util/kdevelop-pg-qt:5 dev-util/kdevelop-php:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/umbrello-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eab7d088c1709b7f77591fbd91667c0a
diff --git a/metadata/md5-cache/kde-apps/yakuake-21.04.2 b/metadata/md5-cache/kde-apps/yakuake-21.04.2
deleted file mode 100644
index 0522c289d795..000000000000
--- a/metadata/md5-cache/kde-apps/yakuake-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/konsole-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 absolute-position? ( >=kde-frameworks/kwayland-5.80.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Quake-style terminal emulator based on konsole
-EAPI=7
-HOMEPAGE=https://apps.kde.org/yakuake/
-IUSE=absolute-position X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/konsole-21.04.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 absolute-position? ( >=kde-frameworks/kwayland-5.80.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/yakuake-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=241c316d8b54ecfd497bf0a96d5e3366
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-21.04.2 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-21.04.2
deleted file mode 100644
index 2022cff0c711..000000000000
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/zeroconf-ioslave-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=661f74aedc282e0bfd94dff3e1f29bd8
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 00212e23b33c..73e154b7acf6 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.83.0 b/metadata/md5-cache/kde-frameworks/attica-5.83.0
deleted file mode 100644
index 3dbe20301246..000000000000
--- a/metadata/md5-cache/kde-frameworks/attica-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to Open Collaboration Services
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/attica-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8516649e62a853b3f28272e11f24d5a6
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.83.0 b/metadata/md5-cache/kde-frameworks/baloo-5.83.0
deleted file mode 100644
index 94d854fccf7c..000000000000
--- a/metadata/md5-cache/kde-frameworks/baloo-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/kfilemetadata-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kidletime-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/solid-5.83*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for searching and managing metadata
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/kfilemetadata-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kidletime-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/solid-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/baloo-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c07d3b8894d94bb9b5cb78c220720199
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.83.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.83.0
deleted file mode 100644
index 58163858ece2..000000000000
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt wrapper for Bluez 5 DBus API
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/bluez-qt-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=776828e8a6916a3e0708f2fe0171d51d
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.83.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.83.0
deleted file mode 100644
index a611c582dbb5..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.83.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.83:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/breeze-icons-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=389b77a3120939d0137cd4e87a4879f6
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.83.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.83.0
deleted file mode 100644
index 71edb498b43c..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.83.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.83:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme binary resource
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/breeze-icons-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=829625a4c5e3d229a24b5cfa694b86b2
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.83.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.83.0
deleted file mode 100644
index 1af4eb8b3116..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.83.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) >=dev-qt/qthelp-5.15.2:5 ) test? ( >=dev-qt/linguist-tools-5.15.2:5 >=dev-qt/qtcore-5.15.2:5 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
-IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/libarchive[bzip2]
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/extra-cmake-modules-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ddb402e0515f6ec4d21b397a7dfa16f5
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.83.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.83.0
deleted file mode 100644
index a25a79611cd6..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/knewstuff-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kpackage-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/knewstuff-5.83*:5 =kde-frameworks/knotifications-5.83*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/frameworkintegration-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=44abdda9da5740ffccf171d957b5fb19
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.83.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.83.0
deleted file mode 100644
index 5687d83dd7b8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for working with KDE activities
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kactivities-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bffe162fec757ca9dc958d42bcdac6a7
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.83.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.83.0
deleted file mode 100644
index 318612f8d227..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kactivities-5.83*:5 =kde-frameworks/kconfig-5.83*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for getting the usage statistics collected by the activities service
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kactivities-5.83*:5 =kde-frameworks/kconfig-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kactivities-stats-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5aea89a80b6fa7cea3c7062c9526ee26
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.83.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.83.0
deleted file mode 100644
index db398d57d45a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.83.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_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 nofetch prepare setup test unpack
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jinja[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) media-gfx/graphviz[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kapidox-5.83.0.tar.xz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d2215bdc37dfeffb09f65de4e7f271b5
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.83.0 b/metadata/md5-cache/kde-frameworks/karchive-5.83.0
deleted file mode 100644
index 7ec78a1bfdd0..000000000000
--- a/metadata/md5-cache/kde-frameworks/karchive-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=zstd? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib zstd? ( app-arch/zstd:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+zstd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib zstd? ( app-arch/zstd:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/karchive-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5ac0855534764278bb8e322f1cfd5714
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.83.0 b/metadata/md5-cache/kde-frameworks/kauth-5.83.0
deleted file mode 100644
index 8332a824378c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kauth-5.83.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.83*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to let applications perform actions as a privileged user
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls +policykit test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.83*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kauth-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=241e87d50aaf188757d1dfd8520c7213
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.83.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.83.0
deleted file mode 100644
index 4aa053e4f7e9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 >=kde-frameworks/kconfigwidgets-5.83:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kbookmarks-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5da4f8caf8bb3aac0d7d836587de81c3
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.83.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.83.0
deleted file mode 100644
index 9c5447f22965..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interfacing with calendars
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kcalendarcore-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=67cb406eb21e6b1561295e2a0e936466
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.83.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.83.0
deleted file mode 100644
index 898594160f77..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kdeclarative-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kdeclarative-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kcmutils-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b9772842f582a8291c6c074d4ad88d19
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.83.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.83.0
deleted file mode 100644
index 4947a5a8e8ae..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for manipulating strings using various encodings
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kcodecs-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9f116733276df6ae11be55604633f372
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.83.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.83.0
deleted file mode 100644
index 084ff7b243a1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for common completion tasks such as filename or URL completion
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kcompletion-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3513182ddf43be9a46ebb59fe9ec9af9
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.83.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.83.0
deleted file mode 100644
index 8a70a7b817e9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading and writing configuration
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=dbus nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kconfig-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5c44964139f2be3e817521ee3893b2a1
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.83.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.83.0
deleted file mode 100644
index 8b09e24aea5d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.83:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.83*:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.83*:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kconfigwidgets-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1a3c1fb521fe5972ee4b7eb04feb7b92
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.83.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.83.0
deleted file mode 100644
index 28b83ec94bf0..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcontacts-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 !kde-apps/kcontacts:5 app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kcontacts-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4216c1dc35bdcd152028f49c6d6bc4fd
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.83.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.83.0
deleted file mode 100644
index 4f7d48753535..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.15.2:5[icu] fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=fam nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.15.2:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kcoreaddons-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2a618a2507a03494ec24f0408428d90d
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.83.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.83.0
deleted file mode 100644
index c4767edcdfb6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for intercepting and handling application crashes
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kcrash-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=32554cc1d32ac43cac337f0b743bfa41
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.83.0 b/metadata/md5-cache/kde-frameworks/kdav-5.83.0
deleted file mode 100644
index d73ca08ddb4e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdav-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcoreaddons-5.83:5 >=kde-frameworks/ki18n-5.83:5 >=kde-frameworks/kio-5.83:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=DAV protocol implemention with KJobs
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcoreaddons-5.83:5 >=kde-frameworks/ki18n-5.83:5 >=kde-frameworks/kio-5.83:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kdav-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4d0bdf86374c78a76fbede4ada6fab6b
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.83.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.83.0
deleted file mode 100644
index 00e4e2042a3a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for registering services and applications per freedesktop standards
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kdbusaddons-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e1991ce1586e66d30fcb115d13680cd5
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.83.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.83.0
deleted file mode 100644
index 1249a5ad6f64..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.83.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kglobalaccel-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kpackage-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kglobalaccel-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kpackage-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kdeclarative-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=549aabd7b38c0a799790dd1e2fb1d4ea
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.83.0 b/metadata/md5-cache/kde-frameworks/kded-5.83.0
deleted file mode 100644
index 9862335bfe7e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.83.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.83:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/kinit-5.83*:5 =kde-frameworks/kservice-5.83*:5 dev-qt/qtcore:5
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/kinit-5.83*:5 =kde-frameworks/kservice-5.83*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kded-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8a8962f7bb454b35f78897a9f8700a26
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.83.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.83.0
deleted file mode 100644
index 180d30c2dce0..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.83:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.83*:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 >=kde-frameworks/kded-5.83:5 =kde-frameworks/kdoctools-5.83*:5 =kde-frameworks/kemoticons-5.83*:5 =kde-frameworks/kglobalaccel-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kjobwidgets-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kparts-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/ktextwidgets-5.83*:5 =kde-frameworks/kunitconversion-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 =kde-frameworks/solid-5.83*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.83*:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 >=kde-frameworks/kded-5.83:5 =kde-frameworks/kdoctools-5.83*:5 =kde-frameworks/kemoticons-5.83*:5 =kde-frameworks/kglobalaccel-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kjobwidgets-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kparts-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/ktextwidgets-5.83*:5 =kde-frameworks/kunitconversion-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 =kde-frameworks/solid-5.83*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kinit-5.83*:5 =kde-frameworks/kitemmodels-5.83*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/portingAids/kdelibs4support-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3eb73f452e53a9595465963fb7af4fa8
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.83.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.83.0
deleted file mode 100644
index 9d1b196ef90e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kpty-5.83*:5 =kde-frameworks/kservice-5.83*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle super user actions
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND==kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kpty-5.83*:5 =kde-frameworks/kservice-5.83*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kdesu-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a0e2eb5357928579b3229e3e297b1ea0
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.83.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.83.0
deleted file mode 100644
index cb9f2dff8c0b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.15.2:5 zeroconf? ( >=dev-qt/qtdbus-5.15.2:5 net-dns/avahi[mdnsresponder-compat] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for network service discovery using Zeroconf
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls zeroconf debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 zeroconf? ( >=dev-qt/qtdbus-5.15.2:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kdnssd-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e556ce795f2a4f785b1b437606efe1f2
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.83.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.83.0
deleted file mode 100644
index 38d095746e4a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.83:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.83*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools to generate documentation in various formats from DocBook files
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.83*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kdoctools-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9b7a10c64fc3946d4d7890ae594d7fd9
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.83.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.83.0
deleted file mode 100644
index c94800b5c256..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kservice-5.83*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kservice-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kemoticons-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dc62f9bb2db06b38b028274bd94aa581
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.83.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.83.0
deleted file mode 100644
index ab2152d7558d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.83*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for extracting file metadata
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=epub exif ffmpeg kernel_linux office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.83*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kfilemetadata-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=50103c67573822b2e23a92adc409f12a
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.83.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.83.0
deleted file mode 100644
index ac08c38680dc..000000000000
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle global shortcuts
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kglobalaccel-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=40444dbb3321e2173e318bec7d401cb5
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.83.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.83.0
deleted file mode 100644
index 00aae6eaf112..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5[wayland?] >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 wayland? ( dev-libs/wayland >=dev-qt/qtwayland-5.15.2:5 ) x11-base/xorg-proto x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=wayland test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5[wayland?] >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 wayland? ( dev-libs/wayland >=dev-qt/qtwayland-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kguiaddons-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fdefd21c0159d94cc4448fd825e1f387
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.83.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.83.0
deleted file mode 100644
index 6af88664a45c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to determine holidays and other special events for a geographical region
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kholidays-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=80760306e20981b4fcad658c1800f3cc
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.83.0 b/metadata/md5-cache/kde-frameworks/khtml-5.83.0
deleted file mode 100644
index 257ab9fbe670..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kglobalaccel-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kjobwidgets-5.83*:5 =kde-frameworks/kjs-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kparts-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/ktextwidgets-5.83*:5 =kde-frameworks/kwallet-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 =kde-frameworks/sonnet-5.83*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.15.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KHTML web rendering engine
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kglobalaccel-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kjobwidgets-5.83*:5 =kde-frameworks/kjs-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kparts-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/ktextwidgets-5.83*:5 =kde-frameworks/kwallet-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 =kde-frameworks/sonnet-5.83*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/portingAids/khtml-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=39b58049c89b9c1e0e6831bad4487539
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.83.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.83.0
deleted file mode 100644
index ff8622b1eb13..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.83.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-qt/qtdeclarative-5.15.2:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-qt/qtdeclarative-5.15.2:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/ki18n-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5dddddfd97fb4884fb1409b4fc51953f
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.83.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.83.0
deleted file mode 100644
index 1732ee1788fe..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kiconthemes-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=24a1619710ad97dc64d0dfc8a86ce606
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.83.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.83.0
deleted file mode 100644
index a64626fe4b7b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.2:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X xscreensaver debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.2:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=xscreensaver? ( X )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kidletime-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8f39f7ad48f71cc91adb85bac0d557a5
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.83.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.83.0
deleted file mode 100644
index 9e3eef5bdef9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/karchive-5.83*:5 avif? ( >=media-libs/libavif-0.8.2 ) eps? ( >=dev-qt/qtprintsupport-5.15.2:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=avif eps heif openexr test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/karchive-5.83*:5 avif? ( >=media-libs/libavif-0.8.2 ) eps? ( >=dev-qt/qtprintsupport-5.15.2:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kimageformats-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2dac815c470e3b9ee0330ad1a88f1e75
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.83.0 b/metadata/md5-cache/kde-frameworks/kinit-5.83.0
deleted file mode 100644
index bf13b19589b5..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.83.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.83:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kinit-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1a5c9e13d5890ab99385d3536e9ccbee
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.83.0 b/metadata/md5-cache/kde-frameworks/kio-5.83.0
deleted file mode 100644
index 2029db964d54..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.83.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.83*:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kbookmarks-5.83*:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kjobwidgets-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/ktextwidgets-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 =kde-frameworks/solid-5.83*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.83*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.83*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=dev-qt/qtconcurrent-5.15.2:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.83:5
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.83*:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kbookmarks-5.83*:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kjobwidgets-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/ktextwidgets-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 =kde-frameworks/solid-5.83*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.83*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.83*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kio-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2f6115407208d346f9a962e9ce6afce0
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.84.0 b/metadata/md5-cache/kde-frameworks/kio-5.84.0
deleted file mode 100644
index 7457419f5a7b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.84.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.84:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.84*:5 =kde-frameworks/karchive-5.84*:5 =kde-frameworks/kbookmarks-5.84*:5 =kde-frameworks/kcodecs-5.84*:5 =kde-frameworks/kcompletion-5.84*:5 =kde-frameworks/kconfig-5.84*:5 =kde-frameworks/kconfigwidgets-5.84*:5 =kde-frameworks/kcoreaddons-5.84*:5 =kde-frameworks/kcrash-5.84*:5 =kde-frameworks/kdbusaddons-5.84*:5 =kde-frameworks/kguiaddons-5.84*:5 =kde-frameworks/ki18n-5.84*:5 =kde-frameworks/kiconthemes-5.84*:5 =kde-frameworks/kitemviews-5.84*:5 =kde-frameworks/kjobwidgets-5.84*:5 =kde-frameworks/knotifications-5.84*:5 =kde-frameworks/kservice-5.84*:5 =kde-frameworks/ktextwidgets-5.84*:5 =kde-frameworks/kwidgetsaddons-5.84*:5 =kde-frameworks/kwindowsystem-5.84*:5 =kde-frameworks/kxmlgui-5.84*:5 =kde-frameworks/solid-5.84*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.84*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.84*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=dev-qt/qtconcurrent-5.15.2:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.84:5
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.84*:5 =kde-frameworks/karchive-5.84*:5 =kde-frameworks/kbookmarks-5.84*:5 =kde-frameworks/kcodecs-5.84*:5 =kde-frameworks/kcompletion-5.84*:5 =kde-frameworks/kconfig-5.84*:5 =kde-frameworks/kconfigwidgets-5.84*:5 =kde-frameworks/kcoreaddons-5.84*:5 =kde-frameworks/kcrash-5.84*:5 =kde-frameworks/kdbusaddons-5.84*:5 =kde-frameworks/kguiaddons-5.84*:5 =kde-frameworks/ki18n-5.84*:5 =kde-frameworks/kiconthemes-5.84*:5 =kde-frameworks/kitemviews-5.84*:5 =kde-frameworks/kjobwidgets-5.84*:5 =kde-frameworks/knotifications-5.84*:5 =kde-frameworks/kservice-5.84*:5 =kde-frameworks/ktextwidgets-5.84*:5 =kde-frameworks/kwidgetsaddons-5.84*:5 =kde-frameworks/kwindowsystem-5.84*:5 =kde-frameworks/kxmlgui-5.84*:5 =kde-frameworks/solid-5.84*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.84*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.84*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.84
-SRC_URI=mirror://kde/stable/frameworks/5.84/kio-5.84.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8025c0ad3acdcc9d5ab6407a701ca542
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.84.0-r1 b/metadata/md5-cache/kde-frameworks/kio-5.84.0-r1
new file mode 100644
index 000000000000..e5afde352cbb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.84.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.84:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.84*:5 =kde-frameworks/karchive-5.84*:5 =kde-frameworks/kbookmarks-5.84*:5 =kde-frameworks/kcodecs-5.84*:5 =kde-frameworks/kcompletion-5.84*:5 =kde-frameworks/kconfig-5.84*:5 =kde-frameworks/kconfigwidgets-5.84*:5 =kde-frameworks/kcoreaddons-5.84*:5 =kde-frameworks/kcrash-5.84*:5 =kde-frameworks/kdbusaddons-5.84*:5 =kde-frameworks/kguiaddons-5.84*:5 =kde-frameworks/ki18n-5.84*:5 =kde-frameworks/kiconthemes-5.84*:5 =kde-frameworks/kitemviews-5.84*:5 =kde-frameworks/kjobwidgets-5.84*:5 =kde-frameworks/knotifications-5.84*:5 =kde-frameworks/kservice-5.84*:5 =kde-frameworks/ktextwidgets-5.84*:5 =kde-frameworks/kwidgetsaddons-5.84*:5 =kde-frameworks/kwindowsystem-5.84*:5 =kde-frameworks/kxmlgui-5.84*:5 =kde-frameworks/solid-5.84*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.84*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.84*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=dev-qt/qtconcurrent-5.15.2:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.84:5
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.84*:5 =kde-frameworks/karchive-5.84*:5 =kde-frameworks/kbookmarks-5.84*:5 =kde-frameworks/kcodecs-5.84*:5 =kde-frameworks/kcompletion-5.84*:5 =kde-frameworks/kconfig-5.84*:5 =kde-frameworks/kconfigwidgets-5.84*:5 =kde-frameworks/kcoreaddons-5.84*:5 =kde-frameworks/kcrash-5.84*:5 =kde-frameworks/kdbusaddons-5.84*:5 =kde-frameworks/kguiaddons-5.84*:5 =kde-frameworks/ki18n-5.84*:5 =kde-frameworks/kiconthemes-5.84*:5 =kde-frameworks/kitemviews-5.84*:5 =kde-frameworks/kjobwidgets-5.84*:5 =kde-frameworks/knotifications-5.84*:5 =kde-frameworks/kservice-5.84*:5 =kde-frameworks/ktextwidgets-5.84*:5 =kde-frameworks/kwidgetsaddons-5.84*:5 =kde-frameworks/kwindowsystem-5.84*:5 =kde-frameworks/kxmlgui-5.84*:5 =kde-frameworks/solid-5.84*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.84*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.84*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.84
+SRC_URI=mirror://kde/stable/frameworks/5.84/kio-5.84.0.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d01b9a12f65c75ebf2efa715e7b10411
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.83.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.83.0
deleted file mode 100644
index c1089226fc7c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15.2:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
-EAPI=7
-HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kirigami2-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2dc3721e3d570c26ae271a7b15ac5c39
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.83.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.83.0
deleted file mode 100644
index f84fdd5a954d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=qml test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kitemmodels-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b81fdf395fb8ef8c9bbabee7b2892604
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.83.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.83.0
deleted file mode 100644
index a73ef68500e7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kitemviews-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b700afc793d208f4634b327f3a6e0e95
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.83.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.83.0
deleted file mode 100644
index b6a55ddfd4a1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kjobwidgets-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c62372e2f3982e3c70936141e2ccabdb
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.83.0 b/metadata/md5-cache/kde-frameworks/kjs-5.83.0
deleted file mode 100644
index eb37f1817f31..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjs-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.83:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=ECMAScipt compatible parser and engine
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/portingAids/kjs-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=042f9f07f1bbacc8de846bfb8ab0f9d0
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.83.0-r1 b/metadata/md5-cache/kde-frameworks/knewstuff-5.83.0-r1
deleted file mode 100644
index 8775b926a433..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.83.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.83*:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kpackage-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/ktextwidgets-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 opds? ( =kde-frameworks/syndication-5.83*:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=opds debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.83*:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kpackage-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/ktextwidgets-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 opds? ( =kde-frameworks/syndication-5.83*:5 ) >=kde-frameworks/kirigami-5.83:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/knewstuff-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8cebb6f327afac283881866a5616ab8d
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.83.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.83.0
deleted file mode 100644
index d39882f8f934..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.83.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for notifying the user of an event
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=dbus nls phonon speech X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/knotifications-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8364561cf7ca9fea7ffb4074fc8d3a02
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.83.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.83.0
deleted file mode 100644
index 59f19b0b9f92..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.83.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kio-5.83*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=phonon debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kio-5.83*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/knotifyconfig-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=28d536fa7eada0b9b2cf65f19323f5b9
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.83.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.83.0
deleted file mode 100644
index 7f0072e24b81..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.83:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kpackage-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e8b80b445ff9683f9aafe29925d26bd6
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.83.0 b/metadata/md5-cache/kde-frameworks/kparts-5.83.0
deleted file mode 100644
index c4fee5a363ee..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kjobwidgets-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 >=kde-frameworks/ktextwidgets-5.83:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kjobwidgets-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kparts-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=001c184f6288e2a74330eaf5f13c25a0
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.83.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.83.0
deleted file mode 100644
index 270e62baa9dc..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE contact person abstraction library
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/kpeople
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kpeople-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=af99ba7b77ac14e29f817b6614103352
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.83.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.83.0
deleted file mode 100644
index fecc7239e4c9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing easy data-plotting functions
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kplotting-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bb2b9aa05659165788533e02301918d0
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.83.0 b/metadata/md5-cache/kde-frameworks/kpty-5.83.0
deleted file mode 100644
index f608363e078e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kpty-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7b93394e11566963da161f916d4f382d
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.83.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.83.0
deleted file mode 100644
index b5fec998cc4b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kquickcharts-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 examples? ( >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kdeclarative-5.83*:5 =kde-frameworks/kirigami-5.83*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=QtQuick plugin providing high-performance charts
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
-IUSE=test debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 examples? ( >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kdeclarative-5.83*:5 =kde-frameworks/kirigami-5.83*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kquickcharts-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2655231b9d56aae120c4e88f86277b81
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.83.0 b/metadata/md5-cache/kde-frameworks/kross-5.83.0
deleted file mode 100644
index 71dc32018032..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.83:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kparts-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 >=dev-qt/designer-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for embedding scripting into applications
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kparts-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/portingAids/kross-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b063fc1156e2c0ddc194810ce2af02c9
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.83.0 b/metadata/md5-cache/kde-frameworks/krunner-5.83.0
deleted file mode 100644
index 381eb531758f..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/plasma-5.83*:5 =kde-frameworks/solid-5.83*:5 =kde-frameworks/threadweaver-5.83*:5 activities? ( =kde-frameworks/kactivities-5.83*:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=activities test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/plasma-5.83*:5 =kde-frameworks/solid-5.83*:5 =kde-frameworks/threadweaver-5.83*:5 activities? ( =kde-frameworks/kactivities-5.83*:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/krunner-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2133532067e1b3110ce291331483f900
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.83.0 b/metadata/md5-cache/kde-frameworks/kservice-5.83.0
deleted file mode 100644
index 23568da32e50..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.83:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kcrash-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kservice-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ac16f21350bc3b4441e8b4b16da61998
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.83.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.83.0
deleted file mode 100644
index 8c1c24484da2..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-frameworks/kservice-5.83:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kauth-5.83*:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kjobwidgets-5.83*:5 =kde-frameworks/kparts-5.83*:5 =kde-frameworks/ktextwidgets-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 =kde-frameworks/sonnet-5.83*:5 =kde-frameworks/syntax-highlighting-5.83*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing a full text editor component
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+editorconfig git test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kauth-5.83*:5 =kde-frameworks/kcodecs-5.83*:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kjobwidgets-5.83*:5 =kde-frameworks/kparts-5.83*:5 =kde-frameworks/ktextwidgets-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 =kde-frameworks/sonnet-5.83*:5 =kde-frameworks/syntax-highlighting-5.83*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/ktexteditor-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9f46ea40d4c7f637a6d018382e2ad949
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.83.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.83.0
deleted file mode 100644
index 22066338fdb6..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/sonnet-5.83*:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=speech test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/sonnet-5.83*:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/ktextwidgets-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e5fb6e01ffa2693643fc93f795aea2e4
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.83.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.83.0
deleted file mode 100644
index ca0df6a4b229..000000000000
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.15.2:5 =kde-frameworks/ki18n-5.83*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting units
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 =kde-frameworks/ki18n-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kunitconversion-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bb5af1d24568cdd9b3be2ea53a6cd946
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.83.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.83.0
deleted file mode 100644
index b2ae7ca916b9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.83:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=gpg +man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kdbusaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kwallet-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5135b9479bc90fbd0b61f9148cefd297
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.83.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.83.0
deleted file mode 100644
index a87e6b372a42..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/wayland-scanner-1.19.0 dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 media-libs/mesa[egl] >=dev-libs/plasma-wayland-protocols-1.3.0 >=dev-libs/wayland-protocols-1.15 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/kwayland
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 media-libs/mesa[egl] >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kwayland-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b9030676cfbd890cd5457341805d6c51
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.83.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.83.0
deleted file mode 100644
index 98ec129a7e64..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kwidgetsaddons-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cd0699d8c693e2a3091f1e084c31b182
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.83.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.83.0
deleted file mode 100644
index 7b3a41925632..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to properties and features of the window manager
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kwindowsystem-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a72577cad5f52f852ef20e1da600aa1b
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.83.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.83.0
deleted file mode 100644
index 484e8bee021f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.15.2:5= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kglobalaccel-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.15.2:5= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kglobalaccel-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kitemviews-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/kxmlgui-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=583119ec94670a64fb8d7b17d5db84a2
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.83.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.83.0
deleted file mode 100644
index 2583ee9b4b81..000000000000
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=ModemManager bindings for Qt
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/modemmanager-qt-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=837a5b997b01de7326714f12109fc566
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.83.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.83.0
deleted file mode 100644
index 469dbf056dff..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/networkmanager-qt-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1d280d82f03532c384f4ace21a0366ed
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.83.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.83.0
deleted file mode 100644
index 1f6c92761e9b..000000000000
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.83.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-qt/qtcore-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.83:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=test? ( >=dev-qt/qttest-5.15.2:5 )
-DESCRIPTION=Oxygen SVG icon theme
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/oxygen-icons5-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=53b95611290300d5075fb53373dadf83
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.83.0 b/metadata/md5-cache/kde-frameworks/plasma-5.83.0
deleted file mode 100644
index e78ae51ddf2d..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=kde-frameworks/kdoctools-5.83:5 dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.83*:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kdeclarative-5.83*:5 =kde-frameworks/kglobalaccel-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kirigami-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kpackage-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.83*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma framework
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=gles2-only wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.83*:5 =kde-frameworks/karchive-5.83*:5 =kde-frameworks/kconfig-5.83*:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/kdeclarative-5.83*:5 =kde-frameworks/kglobalaccel-5.83*:5 =kde-frameworks/kguiaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kirigami-5.83*:5 =kde-frameworks/knotifications-5.83*:5 =kde-frameworks/kpackage-5.83*:5 =kde-frameworks/kservice-5.83*:5 =kde-frameworks/kwidgetsaddons-5.83*:5 =kde-frameworks/kwindowsystem-5.83*:5 =kde-frameworks/kxmlgui-5.83*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.83*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/plasma-framework-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0be533dab6945525cce817a860572822
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.83.0 b/metadata/md5-cache/kde-frameworks/prison-5.83.0
deleted file mode 100644
index cf19b118a47a..000000000000
--- a/metadata/md5-cache/kde-frameworks/prison-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=QRCode and data matrix barcode library
-EAPI=7
-HOMEPAGE=https://invent.kde.org/frameworks/prison
-IUSE=qml debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/prison-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=356c18ee170584c45d4c25ff5cc89cad
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.83.0 b/metadata/md5-cache/kde-frameworks/purpose-5.83.0
deleted file mode 100644
index fcf6441c305f..000000000000
--- a/metadata/md5-cache/kde-frameworks/purpose-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kirigami-5.83*:5 =kde-frameworks/knotifications-5.83*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=bluetooth +kaccounts debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.83*:5 =kde-frameworks/ki18n-5.83*:5 =kde-frameworks/kio-5.83*:5 =kde-frameworks/kirigami-5.83*:5 =kde-frameworks/knotifications-5.83*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kdeclarative-5.83:5 bluetooth? ( =kde-frameworks/bluez-qt-5.83*:5 ) kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/purpose-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=138d650ef6ec5bcd715041d3eb40743b
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.83.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.83.0
deleted file mode 100644
index 50f353f5eaba..000000000000
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kirigami-5.83*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfigwidgets-5.83*:5 =kde-frameworks/kiconthemes-5.83*:5 =kde-frameworks/kirigami-5.83*:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/qqc2-desktop-style-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=78b7626feb4e0ab77fc3b97fa9a63a63
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.83.0 b/metadata/md5-cache/kde-frameworks/solid-5.83.0
deleted file mode 100644
index 69bf072d809e..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=ios nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/solid-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c3b145e7fd64ccc1296b7ae075a5908a
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.83.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.83.0
deleted file mode 100644
index 97984dfbe125..000000000000
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=aspell +hunspell nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/sonnet-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=714553800a5e85689fbc1ad969deee7d
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.83.0 b/metadata/md5-cache/kde-frameworks/syndication-5.83.0
deleted file mode 100644
index d9f9676215bc..000000000000
--- a/metadata/md5-cache/kde-frameworks/syndication-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.83*:5 test? ( >=dev-qt/qtnetwork-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.83*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/syndication-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=27ae3ec7cc083a6563c796838aa65c7b
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.83.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.83.0
deleted file mode 100644
index 3ca9025eafad..000000000000
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for syntax highlighting
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/syntax-highlighting-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1f6a8f0b62eba3e86c1d9d647d04d2d0
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.83.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.83.0
deleted file mode 100644
index d7266f9c74ff..000000000000
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.83.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.83:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing threads using job and queue-based interfaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.83
-SRC_URI=mirror://kde/stable/frameworks/5.83/threadweaver-5.83.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=da61434d5ddd6ecccb7446e633bfdd71
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 080e3ad2a667..d502f70cbf01 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-21.04.2 b/metadata/md5-cache/kde-misc/kdeconnect-21.04.2
deleted file mode 100644
index ac74fd74003d..000000000000
--- a/metadata/md5-cache/kde-misc/kdeconnect-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2[ssl] >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kirigami-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15.2:5 ) X? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) pulseaudio? ( media-libs/pulseaudio-qt ) wayland? ( >=kde-frameworks/kwayland-5.80.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Adds communication between KDE Plasma and your smartphone
-EAPI=7
-HOMEPAGE=https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect.kcm/
-IUSE=bluetooth pulseaudio wayland X debug +handbook test selinux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-crypt/qca-2.3.0:2[ssl] >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kirigami-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15.2:5 ) X? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) pulseaudio? ( media-libs/pulseaudio-qt ) wayland? ( >=kde-frameworks/kwayland-5.80.0:5 ) dev-libs/kpeoplevcard >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5[qml] >=kde-frameworks/kdeclarative-5.80.0:5 net-fs/sshfs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-kdeconnect )
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kdeconnect-kde-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3a79b438a2ee33d50b7c108c895873c5
diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.8.5 b/metadata/md5-cache/kde-misc/kdiff3-1.8.5
deleted file mode 100644
index 405915835581..000000000000
--- a/metadata/md5-cache/kde-misc/kdiff3-1.8.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Frontend to diff3 based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/en/kdiff3 https://userbase.kde.org/KDiff3
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.8.5.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b23b4f3c92828f18141d2ca50036ee4
diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.9.2 b/metadata/md5-cache/kde-misc/kdiff3-1.9.2
index fc6c5b10faa7..a7698abdcda9 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-1.9.2
+++ b/metadata/md5-cache/kde-misc/kdiff3-1.9.2
@@ -1,14 +1,15 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Frontend to diff3 based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+IUSE=test debug +handbook
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.9.2.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a9933412f5d13158640f0e0b235fc93d
+_md5_=e14dfbcbb52db2b1f261faeb8bcbd76c
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-21.04.2 b/metadata/md5-cache/kde-misc/kio-gdrive-21.04.2
deleted file mode 100644
index b3980d643621..000000000000
--- a/metadata/md5-cache/kde-misc/kio-gdrive-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkgapi-19.08.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.3:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) >=dev-qt/qtnetwork-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KIO Slave for Google Drive service
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kio_gdrive/
-IUSE=+kaccounts +share debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkgapi-19.08.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.3:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) kaccounts? ( >=kde-apps/kaccounts-providers-20.08.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kio-gdrive-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d2ee5ea94520fa792f163e6d6871ae52
diff --git a/metadata/md5-cache/kde-misc/markdownpart-21.04.2 b/metadata/md5-cache/kde-misc/markdownpart-21.04.2
deleted file mode 100644
index 551930269feb..000000000000
--- a/metadata/md5-cache/kde-misc/markdownpart-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Markdown viewer KParts plugin based on QTextDocument
-EAPI=7
-HOMEPAGE=https://apps.kde.org/markdownpart/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/markdownpart-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=133c4bd52472da9a3ba945d5de9e223d
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 533a7e34801a..9e4489ccb39e 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/mutt-2.1.1 b/metadata/md5-cache/mail-client/mutt-2.1.1
new file mode 100644
index 000000000000..b71b05d6de52
--- /dev/null
+++ b/metadata/md5-cache/mail-client/mutt-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) autocrypt? ( >=dev-db/sqlite-3 ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=7
+HOMEPAGE=http://www.mutt.org/
+IUSE=autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) autocrypt? ( >=dev-db/sqlite-3 ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime-classic? ( >=dev-libs/openssl-0.9.6:0 ) pgp-classic? ( app-crypt/gnupg )
+REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) ) autocrypt? ( gpgme )
+SLOT=0
+SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-2.1.1.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-2.1.1.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-2.1.1-patches-r0.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=91aa28fa90c7eedfdb5d75fc95d8af82
diff --git a/metadata/md5-cache/mail-client/thunderbird-78.11.0 b/metadata/md5-cache/mail-client/thunderbird-78.11.0
index 489a1bfc8ee3..4683cb85477d 100644
--- a/metadata/md5-cache/mail-client/thunderbird-78.11.0
+++ b/metadata/md5-cache/mail-client/thunderbird-78.11.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >
 REQUIRED_USE=wifi? ( dbus )
 SLOT=0/78
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/source/thunderbird-78.11.0.source.tar.xz -> thunderbird-78.11.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-14.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.11.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.11.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.11.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.11.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.11.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.11.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.11.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.11.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.11.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.11.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.11.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.11.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.11.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.11.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.11.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.11.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.11.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.11.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.11.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.11.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.11.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.11.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.11.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.11.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.11.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.11.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.11.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.11.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.11.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.11.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.11.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.11.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.11.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.11.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.11.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.11.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.11.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.11.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.11.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.11.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.11.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.11.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.11.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.11.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.11.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.11.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.11.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.11.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.11.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.11.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.11.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.11.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.11.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.11.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.11.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.11.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.11.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.11.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.11.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.11.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.11.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.11.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.11.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.11.0-zh-TW.xpi )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e5a870215c23a7758f4fa58e277923d1
diff --git a/metadata/md5-cache/mail-client/thunderbird-78.12.0 b/metadata/md5-cache/mail-client/thunderbird-78.12.0
new file mode 100644
index 000000000000..7dabbd96f2ab
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-78.12.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.21.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Thunderbird Mail Client
+EAPI=7
+HOMEPAGE=https://www.mozilla.org/thunderbird
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack lto +openh264 pgo pulseaudio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) 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 ) !<x11-plugins/enigmail-2.2
+REQUIRED_USE=wifi? ( dbus )
+SLOT=0/78
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/source/thunderbird-78.12.0.source.tar.xz -> thunderbird-78.12.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-15.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.12.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.12.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.12.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.12.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.12.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.12.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.12.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.12.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.12.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.12.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.12.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.12.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.12.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.12.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.12.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.12.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.12.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.12.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.12.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.12.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.12.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.12.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.12.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.12.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.12.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.12.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.12.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.12.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.12.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.12.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.12.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.12.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.12.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.12.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.12.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.12.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.12.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.12.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.12.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.12.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.12.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.12.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.12.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.12.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.12.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.12.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.12.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.12.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.12.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.12.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.12.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.12.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.12.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.12.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.12.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.12.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.12.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.12.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.12.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.12.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.12.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.12.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.12.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.12.0-zh-TW.xpi )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ac3987b566d039545537c8059df4f9de
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-78.11.0 b/metadata/md5-cache/mail-client/thunderbird-bin-78.11.0
index 2daa3ae5b07e..83c4d007d616 100644
--- a/metadata/md5-cache/mail-client/thunderbird-bin-78.11.0
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-78.11.0
@@ -11,5 +11,5 @@ RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus
 RESTRICT=strip
 SLOT=0/78
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/en-US/thunderbird-78.11.0.tar.bz2 -> thunderbird-bin_x86_64-78.11.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/en-US/thunderbird-78.11.0.tar.bz2 -> thunderbird-bin_i686-78.11.0.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.11.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.11.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.11.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.11.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.11.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.11.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.11.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.11.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.11.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.11.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.11.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.11.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.11.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.11.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.11.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.11.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.11.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.11.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.11.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.11.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.11.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.11.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.11.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.11.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.11.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.11.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.11.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.11.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.11.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.11.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.11.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.11.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.11.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.11.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.11.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.11.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.11.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.11.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.11.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.11.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.11.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.11.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.11.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.11.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.11.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.11.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.11.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.11.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.11.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.11.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.11.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.11.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.11.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.11.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.11.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.11.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.11.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.11.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.11.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.11.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.11.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.11.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.11.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.11.0-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	fce6ad998516159787b92e8043167889	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f99471bb6728676b111bc3ac979c4665
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index ef0f5699463e..bb21eb612821 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/bogofilter-1.2.5 b/metadata/md5-cache/mail-filter/bogofilter-1.2.5
index 5998c6c947d3..c5026c8d0c17 100644
--- a/metadata/md5-cache/mail-filter/bogofilter-1.2.5
+++ b/metadata/md5-cache/mail-filter/bogofilter-1.2.5
@@ -6,9 +6,9 @@ EAPI=7
 HOMEPAGE=http://bogofilter.sourceforge.net/
 IUSE=berkdb sqlite tokyocabinet
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3+ CC-BY-ND-3.0
+LICENSE=GPL-3+
 RDEPEND=app-arch/pax sci-libs/gsl:= virtual/libiconv berkdb? ( >=sys-libs/db-3.2:* ) !berkdb? ( sqlite? ( >=dev-db/sqlite-3.6.22 ) !sqlite? ( tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( >=sys-libs/db-3.2:* ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/bogofilter/bogofilter-1.2.5.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=44d72b4ff757685d25025792f15a2a36
+_md5_=79b2cd6aa6989192c6097e8849795b4e
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.6-r101 b/metadata/md5-cache/mail-filter/rspamd-2.6-r101
index 152311d12870..6c815de2dba9 100644
--- a/metadata/md5-cache/mail-filter/rspamd-2.6-r101
+++ b/metadata/md5-cache/mail-filter/rspamd-2.6-r101
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit )
 SLOT=0
 SRC_URI=https://github.com/rspamd/rspamd/archive/2.6.tar.gz -> rspamd-2.6.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=681aad1a4b46c2d19da25a6a9bf522fa
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.7-r101 b/metadata/md5-cache/mail-filter/rspamd-2.7-r101
index 95393c09e038..432dbf4fdb7a 100644
--- a/metadata/md5-cache/mail-filter/rspamd-2.7-r101
+++ b/metadata/md5-cache/mail-filter/rspamd-2.7-r101
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit )
 SLOT=0
 SRC_URI=https://github.com/rspamd/rspamd/archive/2.7.tar.gz -> rspamd-2.7.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f79adb990d3fdac1e016d40e0ddbd556
diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999
index 57f8c0ee2903..82e71ccb2c67 100644
--- a/metadata/md5-cache/mail-filter/rspamd-9999
+++ b/metadata/md5-cache/mail-filter/rspamd-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/LuaBitOp[lua_targets_lua5-2(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f15a02b394cc7e841a4594708604cc90
diff --git a/metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r2 b/metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r2
deleted file mode 100644
index 9ff4eb9143ce..000000000000
--- a/metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=config install postinst setup
-DEPEND=dev-lang/perl dev-perl/DBI dev-perl/Date-Calc dev-perl/Net-Server virtual/mailx mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) sys-apps/sed
-DESCRIPTION=A postfix policy service implementing a grey-listing policy
-EAPI=7
-HOMEPAGE=http://sqlgrey.sourceforge.net/
-IUSE=mysql +postgres sqlite
-KEYWORDS=amd64 ~arm ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/DBI dev-perl/Date-Calc dev-perl/Net-Server virtual/mailx mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=0
-SRC_URI=mirror://sourceforge/sqlgrey/sqlgrey-1.7.6.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=bf3bae3d1c60681a23818a176fea9845
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 74cd9b0c73e6..79fb8552dd09 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.2-r2 b/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
index 15d9082f8253..beaaf178ca1c 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Simple relay-only local mail transport agent
 EAPI=7
 HOMEPAGE=http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer
 IUSE=ssl test
-KEYWORDS=amd64 ~arm ~arm64 ppc x86 ~x64-cygwin
+KEYWORDS=amd64 arm arm64 ppc x86 ~x64-cygwin
 LICENSE=GPL-2
 RDEPEND=acct-group/nullmail acct-user/nullmail virtual/logger sys-apps/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta(+)] !mail-mta/netqmail !mail-mta/opensmtpd[mta(+)] !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta(+)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=821ea69efffaa38fe7367b1f104574ab
+_md5_=7c009ccf071e67f907895d3359d11392
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 6b78c5d3301e..d07e8b0c34f1 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/noto-emoji-20210715 b/metadata/md5-cache/media-fonts/noto-emoji-20210715
new file mode 100644
index 000000000000..27fb4548cb75
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/noto-emoji-20210715
@@ -0,0 +1,13 @@
+BDEPEND=buildfont? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/zopfli || ( ( dev-lang/python:3.9 >=dev-python/fonttools-4.7.0[python_targets_python3_9(-)] >=dev-python/nototools-0.2.13[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/fonttools-4.7.0[python_targets_python3_8(-)] >=dev-python/nototools-0.2.13[python_targets_python3_8(-)] ) ) media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DESCRIPTION=Google Noto Emoji fonts
+EAPI=7
+HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji
+IUSE=buildfont X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 OFL-1.1
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/googlefonts/noto-emoji/archive/c05b4b47c8250ccd232780cae46d66a8179e77ab.tar.gz -> noto-emoji-20210715.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	font	0667878c2b594871023dd1833d05996f	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=281a81433d57f99a8ea177291d1de2b6
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 8fbf1be8f030..687129699b5a 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/blender-2.83.15 b/metadata/md5-cache/media-gfx/blender-2.83.15
index 388b0d39df5c..fbe033a721a7 100644
--- a/metadata/md5-cache/media-gfx/blender-2.83.15
+++ b/metadata/md5-cache/media-gfx/blender-2.83.15
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 ) alembic? ( openexr ) cuda? (
 RESTRICT=!test? ( test )
 SLOT=2.83
 SRC_URI=https://download.blender.org/source/blender-2.83.15.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.83.1-tests.tar.bz2 )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2b8f1805577b42be85b85301ac35e88f
diff --git a/metadata/md5-cache/media-gfx/blender-2.93.0 b/metadata/md5-cache/media-gfx/blender-2.93.0
index 5261a4916046..ba1f8d36966a 100644
--- a/metadata/md5-cache/media-gfx/blender-2.93.0
+++ b/metadata/md5-cache/media-gfx/blender-2.93.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 ) alembic? ( openexr ) cuda? (
 RESTRICT=!test? ( test )
 SLOT=2.93
 SRC_URI=https://download.blender.org/source/blender-2.93.0.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.93.0-tests.tar.bz2 )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=771c1d476689adb8c7864ca863c9ca46
diff --git a/metadata/md5-cache/media-gfx/blender-9999 b/metadata/md5-cache/media-gfx/blender-9999
index 724a1eda3b96..01974e2d5e7a 100644
--- a/metadata/md5-cache/media-gfx/blender-9999
+++ b/metadata/md5-cache/media-gfx/blender-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_9 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) opencl? ( cycles ) openvdb? ( tbb ) osl? ( cycles ) standalone? ( cycles ) test? ( color-management )
 RESTRICT=!test? ( test )
 SLOT=9999
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c500a1b7795f44153bd96fc2597e3c05	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c500a1b7795f44153bd96fc2597e3c05	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a66f213e1ea3bbc4c2f1291fbcee2261
diff --git a/metadata/md5-cache/media-gfx/colorhug-client-0.2.8 b/metadata/md5-cache/media-gfx/colorhug-client-0.2.8
index 028bd950fbb0..af19114f5ffd 100644
--- a/metadata/md5-cache/media-gfx/colorhug-client-0.2.8
+++ b/metadata/md5-cache/media-gfx/colorhug-client-0.2.8
@@ -1,7 +1,8 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.31.10:2 >=dev-libs/libgusb-0.2.2 media-libs/lcms:2 >=media-libs/libcanberra-0.10[gtk3] net-libs/libsoup:2.4 >=x11-libs/gtk+-3.11.2:3 >=x11-misc/colord-1.2.9:0= >=x11-libs/colord-gtk-0.1.24 app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils app-text/yelp-tools >=dev-util/intltool-0.50 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+BDEPEND=app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils app-text/yelp-tools >=dev-util/intltool-0.50 >=sys-devel/gettext-0.17 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.31.10:2 >=dev-libs/libgusb-0.2.2 media-libs/lcms:2 >=media-libs/libcanberra-0.10[gtk3] net-libs/libsoup:2.4 >=x11-libs/gtk+-3.11.2:3 >=x11-misc/colord-1.2.9:0= >=x11-libs/colord-gtk-0.1.24 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Client tools for the ColorHug display colorimeter
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.hughski.com/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -9,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.31.10:2 >=dev-libs/libgusb-0.2.2 media
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/colorhug-client-0.2.8.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f277d268733524fc864521272b1a064f
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=08d55fa7d11e2c1326aa96ac3e2ced86
diff --git a/metadata/md5-cache/media-gfx/converseen-0.9.9.0 b/metadata/md5-cache/media-gfx/converseen-0.9.9.0
index ff199ccbfc72..441cd954ee23 100644
--- a/metadata/md5-cache/media-gfx/converseen-0.9.9.0
+++ b/metadata/md5-cache/media-gfx/converseen-0.9.9.0
@@ -5,10 +5,10 @@ DESCRIPTION=Batch image converter and resizer based on ImageMagick
 EAPI=7
 HOMEPAGE=https://converseen.fasterland.net/ https://github.com/Faster3ck/Converseen/
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-gfx/imagemagick:=[cxx]
 SLOT=0
 SRC_URI=https://github.com/Faster3ck/Converseen/archive/v0.9.9.0.tar.gz -> converseen-0.9.9.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7d0a3b44a99d704aed1c47999efaeb47
+_md5_=e132d120bedfb0a273c9acde3e3d0a2b
diff --git a/metadata/md5-cache/media-gfx/darktable-3.6.0 b/metadata/md5-cache/media-gfx/darktable-3.6.0
index ec534f35b2cb..f0a5d65a654f 100644
--- a/metadata/md5-cache/media-gfx/darktable-3.6.0
+++ b/metadata/md5-cache/media-gfx/darktable-3.6.0
@@ -11,6 +11,6 @@ RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.6.0/darktable-3.6.0.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-3.4.0/darktable-usermanual.pdf -> darktable-usermanual-3.4.0.pdf )
+SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.6.0/darktable-3.6.0.tar.xz doc? ( https://www.darktable.org/usermanual/3.6/en/darktable_user_manual.pdf -> darktable-usermanual-3.6.pdf )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2976c5a51d1203ad34814898736329cc
+_md5_=6335f9a42c0e3764cc6d4e13cbd3f4c8
diff --git a/metadata/md5-cache/media-gfx/fotoxx-21.40 b/metadata/md5-cache/media-gfx/fotoxx-21.40
deleted file mode 100644
index 802d097361f2..000000000000
--- a/metadata/md5-cache/media-gfx/fotoxx-21.40
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3
-DESCRIPTION=Program for improving image files made with a digital camera
-EAPI=7
-HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3+
-RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
-SLOT=0
-SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-21.40.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0956d368f32dc6ba7a1c28cbf005f64a
diff --git a/metadata/md5-cache/media-gfx/fotoxx-21.41 b/metadata/md5-cache/media-gfx/fotoxx-21.41
index 5cee8ab91d16..e65c64966dc0 100644
--- a/metadata/md5-cache/media-gfx/fotoxx-21.41
+++ b/metadata/md5-cache/media-gfx/fotoxx-21.41
@@ -3,10 +3,10 @@ DEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/li
 DESCRIPTION=Program for improving image files made with a digital camera
 EAPI=7
 HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+
 RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-21.41.tar.gz
 _eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ae72bdaed0b69572a8a3cc4cbbb67086
+_md5_=0956d368f32dc6ba7a1c28cbf005f64a
diff --git a/metadata/md5-cache/media-gfx/fotoxx-21.42 b/metadata/md5-cache/media-gfx/fotoxx-21.42
deleted file mode 100644
index a8527b5ac5e0..000000000000
--- a/metadata/md5-cache/media-gfx/fotoxx-21.42
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3
-DESCRIPTION=Program for improving image files made with a digital camera
-EAPI=7
-HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
-SLOT=0
-SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-21.42.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4dea35aa773696ef57af1e6798530643
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.7 b/metadata/md5-cache/media-gfx/gmic-2.9.7
index 725e781c0a76..d1cb1bd176f5 100644
--- a/metadata/md5-cache/media-gfx/gmic-2.9.7
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.7
@@ -11,5 +11,5 @@ RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( me
 REQUIRED_USE=gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
 SLOT=0
 SRC_URI=https://gmic.eu/files/source/gmic_2.9.7.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=86ddeb9ea8f0fad6ef2ef9e9484a625e
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.8 b/metadata/md5-cache/media-gfx/gmic-2.9.8
new file mode 100644
index 000000000000..2d0a0c0dca85
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.8
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
+DESCRIPTION=GREYC's Magic Image Converter
+EAPI=7
+HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
+IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CeCILL-2 GPL-3
+RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
+REQUIRED_USE=gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
+SLOT=0
+SRC_URI=https://gmic.eu/files/source/gmic_2.9.8.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9c3260cc9a0b364c5b0a4e348a3f34b3
diff --git a/metadata/md5-cache/media-gfx/hydrus-442 b/metadata/md5-cache/media-gfx/hydrus-442
deleted file mode 100644
index 13e27c7a85e5..000000000000
--- a/metadata/md5-cache/media-gfx/hydrus-442
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
-DEFINED_PHASES=compile install postinst prepare setup test
-DESCRIPTION=A booru-like media organizer for the desktop
-EAPI=7
-HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v442.tar.gz -> hydrus-442.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c8098b10f6cb0d9f8da27fb7bb6ffa05
diff --git a/metadata/md5-cache/media-gfx/hydrus-443 b/metadata/md5-cache/media-gfx/hydrus-443
deleted file mode 100644
index 4197ca6ba4b0..000000000000
--- a/metadata/md5-cache/media-gfx/hydrus-443
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
-DEFINED_PHASES=compile install postinst prepare setup test
-DESCRIPTION=A booru-like media organizer for the desktop
-EAPI=7
-HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v443.tar.gz -> hydrus-443.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6d687f8f383ca354c4c06c58b43a8227
diff --git a/metadata/md5-cache/media-gfx/hydrus-446 b/metadata/md5-cache/media-gfx/hydrus-446
new file mode 100644
index 000000000000..5102d3ca95de
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-446
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=7
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v446.tar.gz -> hydrus-446.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b69fd34f075ffcc23453976f6ffb4c92
diff --git a/metadata/md5-cache/media-gfx/hydrus-447 b/metadata/md5-cache/media-gfx/hydrus-447
new file mode 100644
index 000000000000..932f56ff688b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-447
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=7
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v447.tar.gz -> hydrus-447.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b69fd34f075ffcc23453976f6ffb4c92
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.12 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.12
deleted file mode 100644
index 9c09104dc6e0..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/6.9.11-60
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-12.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc2ef5a551779a18c7aa34433ba40bd6
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.13 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.13
deleted file mode 100644
index ab339e345a42..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/6.9.11-60
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-13.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0829eaf775ae9235270afdf62a2f3db3
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.15 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.15
deleted file mode 100644
index 57be011bee44..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/6.9.11-60
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-15.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc2ef5a551779a18c7aa34433ba40bd6
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.16 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.16
deleted file mode 100644
index f692fbc78560..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/6.9.11-60
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-16.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0829eaf775ae9235270afdf62a2f3db3
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.17 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.17
index bd497210eff6..68e6cdb23c99 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.17
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.17
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6.9.11-60
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-17.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0829eaf775ae9235270afdf62a2f3db3
+_md5_=fc2ef5a551779a18c7aa34433ba40bd6
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.11.12 b/metadata/md5-cache/media-gfx/imagemagick-7.0.11.12
deleted file mode 100644
index e53239dbff01..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.11.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/7.0.11-0
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.11-12.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2012f9e8a5009d05ea1905a44561e7ad
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.11.13 b/metadata/md5-cache/media-gfx/imagemagick-7.0.11.13
deleted file mode 100644
index 85f80f3a6683..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.11.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/7.0.11-0
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.11-13.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0b321fb6a1280d57459001937e2faa4a
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.0 b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.0
deleted file mode 100644
index d632565765e5..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/7.1.0-0
-SRC_URI=mirror://imagemagick/ImageMagick-7.1.0-0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b86d4a7c194e22e0f51aa5f8db3e4c0f
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.1 b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.1
deleted file mode 100644
index a34a868bb365..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/7.1.0-0
-SRC_URI=mirror://imagemagick/ImageMagick-7.1.0-1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=98a788e6ec6294d3fba4f460511ca0a0
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.2 b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.2
index be5130b1752c..d91e9e18d72a 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.2
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.2
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7.1.0-0
 SRC_URI=mirror://imagemagick/ImageMagick-7.1.0-2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=98a788e6ec6294d3fba4f460511ca0a0
+_md5_=b86d4a7c194e22e0f51aa5f8db3e4c0f
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.10.1 b/metadata/md5-cache/media-gfx/kuickshow-0.10.1
deleted file mode 100644
index c08eb5aabda8..000000000000
--- a/metadata/md5-cache/media-gfx/kuickshow-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-libs/imlib x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Image viewer based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/KuickShow
-IUSE=debug debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-libs/imlib x11-libs/libX11 !media-gfx/kuickshow:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kuickshow/0.10.1/kuickshow-0.10.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c098bff7027d79e84aa14d77f1602617
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.10.2 b/metadata/md5-cache/media-gfx/kuickshow-0.10.2
new file mode 100644
index 000000000000..0bcc97ada448
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/kuickshow-0.10.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.76.0:5 ) >=kde-frameworks/extra-cmake-modules-5.76.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/kcompletion-5.76.0:5 >=kde-frameworks/kconfig-5.76.0:5 >=kde-frameworks/kconfigwidgets-5.76.0:5 >=kde-frameworks/kcoreaddons-5.76.0:5 >=kde-frameworks/ki18n-5.76.0:5 >=kde-frameworks/kiconthemes-5.76.0:5 >=kde-frameworks/kinit-5.76.0:5 >=kde-frameworks/kio-5.76.0:5 >=kde-frameworks/kjobwidgets-5.76.0:5 >=kde-frameworks/kwidgetsaddons-5.76.0:5 >=kde-frameworks/kwindowsystem-5.76.0:5 >=kde-frameworks/kxmlgui-5.76.0:5 media-libs/imlib x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Image viewer based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://userbase.kde.org/KuickShow
+IUSE=debug debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/kcompletion-5.76.0:5 >=kde-frameworks/kconfig-5.76.0:5 >=kde-frameworks/kconfigwidgets-5.76.0:5 >=kde-frameworks/kcoreaddons-5.76.0:5 >=kde-frameworks/ki18n-5.76.0:5 >=kde-frameworks/kiconthemes-5.76.0:5 >=kde-frameworks/kinit-5.76.0:5 >=kde-frameworks/kio-5.76.0:5 >=kde-frameworks/kjobwidgets-5.76.0:5 >=kde-frameworks/kwidgetsaddons-5.76.0:5 >=kde-frameworks/kwindowsystem-5.76.0:5 >=kde-frameworks/kxmlgui-5.76.0:5 media-libs/imlib x11-libs/libX11 !media-gfx/kuickshow:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kuickshow/kuickshow-0.10.2.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ebbaaeca723eb0603c8f336ca51dc7e4
diff --git a/metadata/md5-cache/media-gfx/scrot-1.4 b/metadata/md5-cache/media-gfx/scrot-1.4
index bd7dab2f0145..55f9b4558396 100644
--- a/metadata/md5-cache/media-gfx/scrot-1.4
+++ b/metadata/md5-cache/media-gfx/scrot-1.4
@@ -9,5 +9,5 @@ LICENSE=feh LGPL-2+
 RDEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] )
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/scrot/archive/1.4.tar.gz -> scrot-1.4.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0df5d157a95e2fec262ec38436a2359
diff --git a/metadata/md5-cache/media-gfx/scrot-9999 b/metadata/md5-cache/media-gfx/scrot-9999
index f36cabb98639..7e0c990426b5 100644
--- a/metadata/md5-cache/media-gfx/scrot-9999
+++ b/metadata/md5-cache/media-gfx/scrot-9999
@@ -8,5 +8,5 @@ LICENSE=feh LGPL-2+
 PROPERTIES=live
 RDEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=833593bb6b5e56e157be66202a511091
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 6acd61a8fc08..ac5fcfaa0971 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/fdk-aac-2.0.2 b/metadata/md5-cache/media-libs/fdk-aac-2.0.2
index 15a087971c40..818eb823b012 100644
--- a/metadata/md5-cache/media-libs/fdk-aac-2.0.2
+++ b/metadata/md5-cache/media-libs/fdk-aac-2.0.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Fraunhofer AAC codec library
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/opencore-amr/
-IUSE=static-libs examples 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=examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~x64-macos
 LICENSE=FraunhoferFDK
 SLOT=0/2
 SRC_URI=mirror://sourceforge/opencore-amr/fdk-aac-2.0.2.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a366f9f6b6959362b126ada8d03d43a3
+_md5_=6f7df92c68f7182c1295852a9b114dc2
diff --git a/metadata/md5-cache/media-libs/flac-1.3.3-r1 b/metadata/md5-cache/media-libs/flac-1.3.3-r1
index af4042bed8ae..7e8697f6396f 100644
--- a/metadata/md5-cache/media-libs/flac-1.3.3-r1
+++ b/metadata/md5-cache/media-libs/flac-1.3.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=free lossless audio encoder and decoder
 EAPI=7
 HOMEPAGE=https://xiph.org/flac/
 IUSE=+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
 RDEPEND=ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0975c1a6a7008c433755886afcf99d9b
+_md5_=f8dc899a701e33a46903d3865032a93c
diff --git a/metadata/md5-cache/media-libs/game-music-emu-0.6.2 b/metadata/md5-cache/media-libs/game-music-emu-0.6.2
deleted file mode 100644
index 42257e1302c6..000000000000
--- a/metadata/md5-cache/media-libs/game-music-emu-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Video game music file emulators
-EAPI=7
-HOMEPAGE=https://bitbucket.org/mpyne/game-music-emu/wiki/Home
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-0.6.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6ec69551b24c7b07ae24363d6bafef37
diff --git a/metadata/md5-cache/media-libs/game-music-emu-0.6.3 b/metadata/md5-cache/media-libs/game-music-emu-0.6.3
index 2179e0253101..dba28e92680d 100644
--- a/metadata/md5-cache/media-libs/game-music-emu-0.6.3
+++ b/metadata/md5-cache/media-libs/game-music-emu-0.6.3
@@ -4,9 +4,9 @@ DESCRIPTION=Video game music file emulators
 EAPI=7
 HOMEPAGE=https://bitbucket.org/mpyne/game-music-emu/wiki/Home
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-0.6.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9e1bba26d14cb26974bb0256c4ad0147
+_md5_=946de25938521eb74d02b0ccb2d23662
diff --git a/metadata/md5-cache/media-libs/glew-2.2.0 b/metadata/md5-cache/media-libs/glew-2.2.0
index 75d4d51ab1d9..7c011ecd9221 100644
--- a/metadata/md5-cache/media-libs/glew-2.2.0
+++ b/metadata/md5-cache/media-libs/glew-2.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenGL Extension Wrangler Library
 EAPI=7
 HOMEPAGE=http://glew.sourceforge.net/
 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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD MIT
 RDEPEND=>=virtual/glu-9.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(-)?] >=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(-)?] >=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/libXi-1.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(-)?] >=x11-libs/libXmu-1.1.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(-)?]
 SLOT=0/2.2
 SRC_URI=mirror://sourceforge/glew/glew-2.2.0.tgz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fcad4c7b235c5126f23fbd79163aa9fc
+_md5_=c672792a53f835c64728ca7832d11af2
diff --git a/metadata/md5-cache/media-libs/glu-9.0.2 b/metadata/md5-cache/media-libs/glu-9.0.2
index 16ed6e35c16f..55328d0929e8 100644
--- a/metadata/md5-cache/media-libs/glu-9.0.2
+++ b/metadata/md5-cache/media-libs/glu-9.0.2
@@ -5,10 +5,10 @@ DESCRIPTION=The OpenGL Utility Library
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/mesa/glu
 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 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=SGI-B-2.0
 RDEPEND=>=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(-)?]
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4d2a192581b25049d4b3dcb1dec402c2
+_md5_=aa6eb5151128f4f3292b5f136a75fd84
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.16.3 b/metadata/md5-cache/media-libs/gstreamer-1.16.3
index 0cc94c554ea1..ee2ca9d583fb 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.16.3
+++ b/metadata/md5-cache/media-libs/gstreamer-1.16.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.16.3.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ba46fcd9996149e5712f5c3067c9b64
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.18.4 b/metadata/md5-cache/media-libs/gstreamer-1.18.4
index 1b4a335e3231..119cd633d3ed 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.18.4
+++ b/metadata/md5-cache/media-libs/gstreamer-1.18.4
@@ -11,5 +11,5 @@ RDEPEND=caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d0e8785d881b9409fdd48bc541a711f8
diff --git a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.16.3 b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.16.3
index 3bd02352a7bb..c9d8fe44944a 100644
--- a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.16.3
+++ b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.16.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.16.3.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=18f10aa600f91151297f172e822895a4
diff --git a/metadata/md5-cache/media-libs/libao-1.2.2-r2 b/metadata/md5-cache/media-libs/libao-1.2.2-r2
index bc2a0da183a0..387a14fda8df 100644
--- a/metadata/md5-cache/media-libs/libao-1.2.2-r2
+++ b/metadata/md5-cache/media-libs/libao-1.2.2-r2
@@ -5,10 +5,10 @@ DESCRIPTION=The Audio Output library
 EAPI=7
 HOMEPAGE=https://www.xiph.org/ao/
 IUSE=alsa nas mmap pulseaudio sndio 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 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 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(-)?] ) nas? ( >=media-libs/nas-1.9.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(-)?] ) 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(-)?] ) sndio? ( media-sound/sndio:= )
 SLOT=0
 SRC_URI=https://github.com/xiph/libao/archive/1.2.2.tar.gz -> libao-1.2.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0c682804ce17590714289c5c7ea279f9
+_md5_=710b1cbb0d2af62a7d54ae896f3b22ac
diff --git a/metadata/md5-cache/media-libs/libogg-1.3.4-r1 b/metadata/md5-cache/media-libs/libogg-1.3.4-r1
deleted file mode 100644
index 34bdf3703415..000000000000
--- a/metadata/md5-cache/media-libs/libogg-1.3.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=the Ogg media file format library
-EAPI=7
-HOMEPAGE=https://xiph.org/ogg/
-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 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://downloads.xiph.org/releases/ogg/libogg-1.3.4.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6f598a8c9334098abf74b6959ced158
diff --git a/metadata/md5-cache/media-libs/libogg-1.3.5 b/metadata/md5-cache/media-libs/libogg-1.3.5
index 42c6a7a6f30b..f641fbbe739d 100644
--- a/metadata/md5-cache/media-libs/libogg-1.3.5
+++ b/metadata/md5-cache/media-libs/libogg-1.3.5
@@ -3,9 +3,9 @@ DESCRIPTION=The Ogg media file format library
 EAPI=7
 HOMEPAGE=https://xiph.org/ogg/
 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 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb3c45d6527b7de47c60198620186acc
+_md5_=912623ee0276e7658a89bee1c2fb75b8
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.20-r1 b/metadata/md5-cache/media-libs/libpano13-2.9.20-r1
new file mode 100644
index 000000000000..cd7c4fc59336
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libpano13-2.9.20-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install preinst prepare setup
+DEPEND=media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Helmut Dersch's panorama toolbox library
+EAPI=7
+HOMEPAGE=http://panotools.sourceforge.net/
+IUSE=java static-libs elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/3
+SRC_URI=mirror://sourceforge/panotools/libpano13-2.9.20.tar.gz
+_eclasses_=java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=0f365595fea18203e9354481bbf86ebf
diff --git a/metadata/md5-cache/media-libs/libsamplerate-0.2.1 b/metadata/md5-cache/media-libs/libsamplerate-0.2.1
index 68c9f72a0987..8ad95e9e7a09 100644
--- a/metadata/md5-cache/media-libs/libsamplerate-0.2.1
+++ b/metadata/md5-cache/media-libs/libsamplerate-0.2.1
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio
 EAPI=7
-HOMEPAGE=http://libsndfile.github.io/libsamplerate/
+HOMEPAGE=https://libsndfile.github.io/libsamplerate/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libsndfile/libsamplerate/releases/download/0.2.1/libsamplerate-0.2.1.tar.bz2
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8237407e09a72886e9f1edf55c78c4a7
+_md5_=63be4555d986593b191790669137d7a6
diff --git a/metadata/md5-cache/media-libs/libsamplerate-9999 b/metadata/md5-cache/media-libs/libsamplerate-9999
index 0887b2b75482..60dbdfad85d5 100644
--- a/metadata/md5-cache/media-libs/libsamplerate-9999
+++ b/metadata/md5-cache/media-libs/libsamplerate-9999
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=test? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio
 EAPI=7
-HOMEPAGE=http://libsndfile.github.io/libsamplerate/
+HOMEPAGE=https://libsndfile.github.io/libsamplerate/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD-2
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b487f4116d65d2d91c2cf1ce70a131b7
+_md5_=f960918044c00bd5647b7278a56f1a34
diff --git a/metadata/md5-cache/media-libs/libsixel-1.8.6 b/metadata/md5-cache/media-libs/libsixel-1.8.6
index 89004a8b2469..897f65a5b584 100644
--- a/metadata/md5-cache/media-libs/libsixel-1.8.6
+++ b/metadata/md5-cache/media-libs/libsixel-1.8.6
@@ -9,5 +9,5 @@ LICENSE=MIT public-domain
 RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 )
 SLOT=0
 SRC_URI=https://github.com/saitoha/libsixel/archive/v1.8.6.tar.gz -> libsixel-1.8.6.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=489bd39f50204a00b72835fb390ea0e6
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.31 b/metadata/md5-cache/media-libs/libsndfile-1.0.31
index c419f287905c..e51afce319fe 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.31
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.31
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=!minimal? ( media-libs/flac:=[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:=[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/libvorbis:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/opus:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib:= ) sqlite? ( dev-db/sqlite )
 DESCRIPTION=C library for reading and writing files containing sampled sound
 EAPI=7
-HOMEPAGE=http://libsndfile.github.io/libsndfile/
+HOMEPAGE=https://libsndfile.github.io/libsndfile/
 IUSE=alsa minimal sqlite test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!minimal? ( media-libs/flac:=[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:=[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/libvorbis:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/opus:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib:= ) sqlite? ( dev-db/sqlite )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libsndfile/libsndfile/releases/download/1.0.31/libsndfile-1.0.31.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=83d415b47695a42591bbf752b32deb66
+_md5_=b184a3e0cb1d33316823c7bdfb1af8fa
diff --git a/metadata/md5-cache/media-libs/libsndfile-9999 b/metadata/md5-cache/media-libs/libsndfile-9999
index a763e27207e6..4e5eb27f3ff2 100644
--- a/metadata/md5-cache/media-libs/libsndfile-9999
+++ b/metadata/md5-cache/media-libs/libsndfile-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=!minimal? ( media-libs/flac:=[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:=[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/libvorbis:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/opus:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib:= ) sqlite? ( dev-db/sqlite )
 DESCRIPTION=C library for reading and writing files containing sampled sound
 EAPI=7
-HOMEPAGE=http://libsndfile.github.io/libsndfile/
+HOMEPAGE=https://libsndfile.github.io/libsndfile/
 IUSE=alsa minimal sqlite test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=LGPL-2.1
 PROPERTIES=live
@@ -11,4 +11,4 @@ RDEPEND=!minimal? ( media-libs/flac:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8ec9db159481854cbc82900fbcfbcdeb
+_md5_=bed25598edf76dbdc2fb50740ceb8a93
diff --git a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r8 b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r8
index 783b376c4a57..039b83b30f1e 100644
--- a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r8
+++ b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r8
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-text/ghostscript-gpl media-fonts/urw-fonts media-libs/freetype:2= media-libs/libpng:0= sys-libs/zlib:= x11-libs/gdk-pixbuf:2 virtual/jpeg:0= expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2= ) X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=app-text/ghostscript-gpl media-fonts/urw-fonts media-libs/freetype:2= media-libs/libpng:0= sys-libs/zlib:= x11-libs/gdk-pixbuf:2 virtual/jpeg:0= expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2= ) X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
 DESCRIPTION=A library for reading vector images in Microsoft's Windows Metafile Format (WMF)
-EAPI=6
+EAPI=7
 HOMEPAGE=http://wvware.sourceforge.net/
 IUSE=debug doc expat X
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=LGPL-2
 RDEPEND=app-text/ghostscript-gpl media-fonts/urw-fonts media-libs/freetype:2= media-libs/libpng:0= sys-libs/zlib:= x11-libs/gdk-pixbuf:2 virtual/jpeg:0= expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2= ) X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
 SLOT=0
-SRC_URI=mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eb6b200659da4f3fc1bb0544d4e68fd6
+SRC_URI=mirror://sourceforge/project/wvware/libwmf/0.2.8.4/libwmf-0.2.8.4.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8fa349df9170e94412744bef49059c6b
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.12 b/metadata/md5-cache/media-libs/lilv-0.24.12
index 5327aff73d92..5c9ae00bf463 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.12
+++ b/metadata/md5-cache/media-libs/lilv-0.24.12
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.12.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
 _md5_=0249bf8f1485558945ab86c9e48579d5
diff --git a/metadata/md5-cache/media-libs/lsp-plugins-1.1.29 b/metadata/md5-cache/media-libs/lsp-plugins-1.1.29
index a89e3b147057..af9eaaf19202 100644
--- a/metadata/md5-cache/media-libs/lsp-plugins-1.1.29
+++ b/metadata/md5-cache/media-libs/lsp-plugins-1.1.29
@@ -4,11 +4,11 @@ DESCRIPTION=Linux Studio Plugins
 EAPI=7
 HOMEPAGE=https://lsp-plug.in
 IUSE=doc jack ladspa +lv2
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=dev-libs/expat media-libs/libsndfile media-libs/libglvnd[X] doc? ( dev-lang/php:* ) jack? ( virtual/jack x11-libs/cairo[X] ) ladspa? ( media-libs/ladspa-sdk ) lv2? ( media-libs/lv2 x11-libs/cairo[X] )
 REQUIRED_USE=|| ( jack ladspa lv2 )
 SLOT=0
 SRC_URI=https://github.com/sadko4u/lsp-plugins/archive/1.1.29.tar.gz -> lsp-plugins-1.1.29.tar.gz
 _eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=17616c6a563361b50fa4a5db3595f253
+_md5_=b9d9031fb28b078f63ef4e0ee70820ef
diff --git a/metadata/md5-cache/media-libs/mesa-21.1.4 b/metadata/md5-cache/media-libs/mesa-21.1.4
index d835548149d8..8ca283b39c1d 100644
--- a/metadata/md5-cache/media-libs/mesa-21.1.4
+++ b/metadata/md5-cache/media-libs/mesa-21.1.4
@@ -5,7 +5,7 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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-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-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.105[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.105[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.105[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=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/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.105[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-13:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-13:=[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=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( dri3 video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-21.1.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f7dff57c8d0f1c8a0644c2ccd78818f6
+_md5_=48e2868ff21838c172dfc6ffee2dfce5
diff --git a/metadata/md5-cache/media-libs/openexr-2.5.7 b/metadata/md5-cache/media-libs/openexr-2.5.7
index 277560a88dc1..2a473b1d3eaa 100644
--- a/metadata/md5-cache/media-libs/openexr-2.5.7
+++ b/metadata/md5-cache/media-libs/openexr-2.5.7
@@ -5,11 +5,11 @@ DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
 EAPI=7
 HOMEPAGE=https://www.openexr.com/
 IUSE=cpu_flags_x86_avx doc examples static-libs utils test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=~media-libs/ilmbase-2.5.7:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.7.tar.gz -> openexr-2.5.7.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=560cb04fe6c506355024feab1c8fbd30
+_md5_=004e77691b6fb519879920877aff89ad
diff --git a/metadata/md5-cache/media-libs/opus-1.3.1-r2 b/metadata/md5-cache/media-libs/opus-1.3.1-r2
index e4259b2f3031..9ad331f795b1 100644
--- a/metadata/md5-cache/media-libs/opus-1.3.1-r2
+++ b/metadata/md5-cache/media-libs/opus-1.3.1-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Open codec for interactive speech and music transmission over the In
 EAPI=7
 HOMEPAGE=https://opus-codec.org/
 IUSE=custom-modes doc static-libs cpu_flags_x86_sse cpu_flags_arm_neon 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 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eecbabf1d28add53de94eee275a70881
+_md5_=a451448b9eb36f92b32eeb150aeb4093
diff --git a/metadata/md5-cache/media-libs/pcaudiolib-1.1 b/metadata/md5-cache/media-libs/pcaudiolib-1.1
index 1d5e100bc452..1f70f1db33ed 100644
--- a/metadata/md5-cache/media-libs/pcaudiolib-1.1
+++ b/metadata/md5-cache/media-libs/pcaudiolib-1.1
@@ -5,11 +5,11 @@ DESCRIPTION=Portable C Audio Library
 EAPI=7
 HOMEPAGE=https://github.com/espeak-ng/pcaudiolib
 IUSE=+alsa oss pulseaudio
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc64 ~sparc
 LICENSE=GPL-3+ ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.18 ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=|| ( alsa oss pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/espeak-ng/pcaudiolib/archive/1.1.tar.gz -> pcaudiolib-1.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d40186abe3f5df6addb187465b87ab9e
+_md5_=e13281e1609c5413247f43aef247fac0
diff --git a/metadata/md5-cache/media-libs/rubberband-1.9.1-r1 b/metadata/md5-cache/media-libs/rubberband-1.9.1-r1
deleted file mode 100644
index 020eb5d4ba66..000000000000
--- a/metadata/md5-cache/media-libs/rubberband-1.9.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=An audio time-stretching and pitch-shifting library and utility program
-EAPI=7
-HOMEPAGE=https://www.breakfastquay.com/rubberband/
-IUSE=ladspa jni static-libs +programs vamp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://breakfastquay.com/files/releases/rubberband-1.9.1.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=61069213440ff15598d005ca7b40e4e5
diff --git a/metadata/md5-cache/media-libs/rubberband-1.9.2 b/metadata/md5-cache/media-libs/rubberband-1.9.2
index 375004e211a8..34187017921b 100644
--- a/metadata/md5-cache/media-libs/rubberband-1.9.2
+++ b/metadata/md5-cache/media-libs/rubberband-1.9.2
@@ -5,10 +5,10 @@ DESCRIPTION=An audio time-stretching and pitch-shifting library and utility prog
 EAPI=7
 HOMEPAGE=https://www.breakfastquay.com/rubberband/
 IUSE=ladspa jni static-libs +programs vamp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://breakfastquay.com/files/releases/rubberband-1.9.2.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5cafdace11af72337b639524e3386d51
+_md5_=61069213440ff15598d005ca7b40e4e5
diff --git a/metadata/md5-cache/media-libs/zxing-cpp-1.1.1 b/metadata/md5-cache/media-libs/zxing-cpp-1.1.1
deleted file mode 100644
index f97fa10ce890..000000000000
--- a/metadata/md5-cache/media-libs/zxing-cpp-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=C++ Multi-format 1D/2D barcode image processing library
-EAPI=7
-HOMEPAGE=https://github.com/nu-book/zxing-cpp
-IUSE=test
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nu-book/zxing-cpp/archive/v1.1.1.tar.gz -> zxing-cpp-1.1.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=399ae32637f7878ba3775c0f97a61a5f
diff --git a/metadata/md5-cache/media-libs/zxing-cpp-1.2.0 b/metadata/md5-cache/media-libs/zxing-cpp-1.2.0
index 880f40bf44e4..5787146773fc 100644
--- a/metadata/md5-cache/media-libs/zxing-cpp-1.2.0
+++ b/metadata/md5-cache/media-libs/zxing-cpp-1.2.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C++ Multi-format 1D/2D barcode image processing library
 EAPI=7
 HOMEPAGE=https://github.com/nu-book/zxing-cpp
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/nu-book/zxing-cpp/archive/v1.2.0.tar.gz -> zxing-cpp-1.2.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d9282d7d1c0ccc6006df05c66f3b43cb
+_md5_=e87b2d832a8e6356ad59deeb7914c381
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 77966088e4c3..0eaa1e1ae906 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.18 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.18
new file mode 100644
index 000000000000..bd44dc4c9099
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.18
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/expat =media-tv/kodi-19* test? ( dev-cpp/gtest )
+DESCRIPTION=Kodi's Adaptive inputstream addon
+EAPI=7
+HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat =media-tv/kodi-19*
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.6.18-Matrix.tar.gz -> kodi-inputstream-adaptive-2.6.18.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=82bb3fa48c656cba4d23f725cf0e0f09
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.2 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.2
new file mode 100644
index 000000000000..ed029fc7eacf
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/tinyxml
+DESCRIPTION=Kodi's DVBViewer client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/7.3.2-Matrix.tar.gz -> kodi-pvr-dvbviewer-7.3.2-Matrix.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9b58362aff7ed1977336ae4e5797d5cf
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.3 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.3
new file mode 100644
index 000000000000..e7aa211ee1af
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/tinyxml
+DESCRIPTION=Kodi's DVBViewer client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/7.3.3-Matrix.tar.gz -> kodi-pvr-dvbviewer-7.3.3-Matrix.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9b58362aff7ed1977336ae4e5797d5cf
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.2
new file mode 100644
index 000000000000..d4c79119b5d8
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
+DESCRIPTION=Kodi's Filmon client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.filmon
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/6.1.2-Matrix.tar.gz -> kodi-pvr-filmon-6.1.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=431ff8674f3d1d36a464011034d02c13
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.3 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.3
new file mode 100644
index 000000000000..9e8519fc4c2d
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19*
+DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19*
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/8.3.3-Matrix.tar.gz -> kodi-pvr-hts-8.3.3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.8 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.8
new file mode 100644
index 000000000000..340efc913e0f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.8
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
+DESCRIPTION=Kodi's IPTVSimple client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/7.6.8-Matrix.tar.gz -> kodi-pvr-iptvsimple-7.6.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=83333caae1b7f093080ef3a8cd465654
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.9 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.9
new file mode 100644
index 000000000000..0b475d4afdea
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.9
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
+DESCRIPTION=Kodi's IPTVSimple client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/7.6.9-Matrix.tar.gz -> kodi-pvr-iptvsimple-7.6.9.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=83333caae1b7f093080ef3a8cd465654
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.7 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.7
new file mode 100644
index 000000000000..fe3d5ce0ad31
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.7
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
+DESCRIPTION=Kodi's VuPlus client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.4.7-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.7.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.4.1 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.4.1
deleted file mode 100644
index 692e4a2fddb2..000000000000
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsamplerate >=media-libs/taglib-1.10 =media-sound/qmmp-1.4* media-video/ffmpeg dev-lang/yasm dev-qt/linguist-tools:5
-DESCRIPTION=A set of extra plugins for Qmmp
-EAPI=7
-HOMEPAGE=http://qmmp.ylsoftware.com/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsamplerate >=media-libs/taglib-1.10 =media-sound/qmmp-1.4* media-video/ffmpeg
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.4.1.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c261111cf75a306bf1d9dbc9365c4b16
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.5.0 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.5.0
index b0d9714bdabb..e9d93536a8f4 100644
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.5.0
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.5.0
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 medi
 DESCRIPTION=A set of extra plugins for Qmmp
 EAPI=7
 HOMEPAGE=http://qmmp.ylsoftware.com/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsamplerate >=media-libs/taglib-1.10 =media-sound/qmmp-1.5* media-video/ffmpeg
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.5.0.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=72ba8c221fbfcab18f9a7ef034c42e29
+_md5_=c261111cf75a306bf1d9dbc9365c4b16
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.5.1 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.5.1
new file mode 100644
index 000000000000..ea691964f89a
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.5.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsamplerate media-libs/taglib =media-sound/qmmp-1.5* media-video/ffmpeg dev-lang/yasm dev-qt/linguist-tools:5
+DESCRIPTION=A set of extra plugins for Qmmp
+EAPI=7
+HOMEPAGE=http://qmmp.ylsoftware.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsamplerate media-libs/taglib =media-sound/qmmp-1.5* media-video/ffmpeg
+SLOT=0
+SRC_URI=https://qmmp.ylsoftware.com/files/qmmp-plugin-pack/1.5/qmmp-plugin-pack-1.5.1.tar.bz2
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bd49703b7a8ecaf1228507cb2ed21411
diff --git a/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025 b/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
index 141c0672e242..627ab2451ef0 100644
--- a/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
+++ b/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-2.4 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv
 DESCRIPTION=VDR plugin: control an hor. or ver. actuator attached trough the parallel port
 EAPI=7
 HOMEPAGE=http://ventoso.org/luca/vdr/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/olivluca/vdr-actuator-plugin/archive/c810abffbf6dc6f1f354b0c545abe65311203fd8.tar.gz -> vdr-actuator-2.4.1_pre20181025.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b47a23c63d4d857f6535ac465ac147fd
+_md5_=d5c2273d0a3bb037fd5387a7e43fec4b
diff --git a/metadata/md5-cache/media-plugins/vdr-avards-0.2.6 b/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
index 4a0dd66a9adf..3743bc3b1d6a 100644
--- a/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
+++ b/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
@@ -3,10 +3,10 @@ DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-h
 DESCRIPTION=VDR Plugin: Automatic Video Aspect Ratio Detection and Signaling
 EAPI=7
 HOMEPAGE=http://firefly.vdr-developer.org/avards/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/avards/vdr-avards-0.2.6.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b575825a5676cb3e01b32e4b9952dde8
+_md5_=a93235141234334e07961e07725632bb
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1 b/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
index 8f7419fa5fa8..b538217e5046 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-2.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR Plugin: show duplicated records
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-duplicates/repository
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-duplicates.git/snapshot/vdr-plugin-duplicates-68739fd72beb9745b3e47b9e466311ef23a8ca97.tar.gz -> vdr-duplicates-1.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=14ee08282f564159af75536b7ba7d73b
+_md5_=7561edb06967a092efd0ddc0c5fcc46c
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
index caa2416649a6..257c4eb40ce3 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
@@ -3,10 +3,10 @@ DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-h
 DESCRIPTION=VDR Plugin: to play dvds and dvd file structures
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-dvdswitch
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-dvd >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2084/vdr-dvdswitch-0.2.3.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3bcc9b199d4dd096ee6c67126b1892d1
+_md5_=2bdb61208ef1e0be8d2fe32381d7e902
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1 b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
index 7fcda2614d50..7820fa0521ed 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-2.4 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv
 DESCRIPTION=VDR Plugin: Import the EPG of another VDR via vdr-svdrpservice
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/epgsync/vdr-epgsync-1.0.1.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=41a5b89b4b3eca78cc28549ec0d3644a
+_md5_=b359a6edf2c06b5932898dd379d99d59
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2
index 096909f93669..ea11d3ab00a9 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2
@@ -3,10 +3,10 @@ DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-h
 DESCRIPTION=VDR Plugin: Extended recordings menu
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-extrecmenu
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-extrecmenu.git/snapshot/vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.tar.gz -> vdr-extrecmenu-1.2.4-r2.tar.gz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e87a0316afbef5b1a4e0770a41efbf9e
+_md5_=a148c9e848d60aba8925154ea4c0aad1
diff --git a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4 b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
index ed4ec647c3b8..954b0662b88f 100644
--- a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
+++ b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
@@ -3,10 +3,10 @@ DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-h
 DESCRIPTION=VDR plugin: play 'Freecell' on the On Screen Display
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-freecell/vdr-freecell-0.0.2.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85914c956c84c74f6ca46be8fa29421a
+_md5_=a78ca9d81ec713d0abf535cadb312a07
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-1.1.1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-1.1.1
index 46daddaaa5d4..1cd3ae34c647 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-1.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-1.1.1
@@ -3,10 +3,10 @@ DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-h
 DESCRIPTION=VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ public-domain
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v1.1.1.tar.gz -> vdr-osdteletext-1.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d29e12ea0263418d5ca5459c3356fe13
+_md5_=c88e4c08aeada3209253a38076395ebe
diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1 b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1
index 225434fa03e7..b60bd9cbdbd0 100644
--- a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=VDR Plugin: use various devices for controlling vdr (keyboards, lirc
 EAPI=7
 HOMEPAGE=http://www.escape-edv.de/endriss/vdr/
 IUSE=systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.7.0.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8e2b8135e9c5999490ffd257419fc50d
+_md5_=b7d8db54b54cb2325127cc3f4f2b4398
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
index a3937d8c82d6..0d46338879b9 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-2.4 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv
 DESCRIPTION=VDR Plugin: server/client remoteosd
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remoteosd/vdr-remoteosd-1.0.0.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=685403cc1f9d801f1b2bd6c465bc2de1
+_md5_=1ee1ab0516aa94a4acba8ff9a44e378d
diff --git a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1 b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
index ae29febcc491..9cb117214998 100644
--- a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
@@ -3,10 +3,10 @@ DEPEND=~media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxt
 DESCRIPTION=VDR plugin: edit timers on remote vdr instances
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remotetimers/vdr-remotetimers-1.0.2.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0b98c1c6a2e6628e3559c65ab4fed0dd
+_md5_=706c57ed7d50f20ffea951543854572f
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0
index 41e7d75671d2..14285597286b 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1
 DESCRIPTION=VDR Plugin: RSS reader
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-rssreader
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-rssreader/archive/refs/tags/v2.4.0.tar.gz -> vdr-rssreader-2.4.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=05efda2c2bebc327928e3bfa30998a49
+_md5_=2bfaa21bcf55eea1e35ebb7ab2edc395
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20210131 b/metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20210131
deleted file mode 100644
index 62c2e31603a1..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20210131
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: integrates SAT>IP network devices seamlessly into VDR
-EAPI=7
-HOMEPAGE=https://github.com/rofafor/vdr-plugin-satip
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=https://github.com/rofafor/vdr-plugin-satip/archive/43b60b1566878104240cbae5b1e322bbacd380e1.tar.gz -> vdr-plugin-satip-43b60b1566878104240cbae5b1e322bbacd380e1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8866e82a9a0b77698f1c9d85115f1c03
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.4.1 b/metadata/md5-cache/media-plugins/vdr-satip-2.4.1
new file mode 100644
index 000000000000..ed825682b309
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
+DEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DESCRIPTION=VDR Plugin: integrates SAT>IP network devices seamlessly into VDR
+EAPI=7
+HOMEPAGE=https://github.com/rofafor/vdr-plugin-satip
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+SLOT=0
+SRC_URI=https://github.com/rofafor/vdr-plugin-satip/archive/v2.4.1.tar.gz -> vdr-satip-2.4.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ea2160f5fbce17bb86788a2c43e280b9
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
index 08e79bec2157..ea4ad314b073 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
@@ -4,11 +4,11 @@ DESCRIPTION=VDR Plugin: Client/Server and http streaming plugin
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-streamdev
 IUSE=client server
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b2f4e6a7829ea0c2b01e066e075b3758
+_md5_=5b0defa3bf660d2c8f6631e107d64943
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1
index e25115937fc6..2229bfd3c567 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR Plugin: offers SVDRP connections as a service to other plugins
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpservice/vdr-svdrpservice-1.0.0.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d7d36916cde098db78d30f021a836fd3
+_md5_=b2841030c8740edffe8cf7d1e73cc57b
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
index 68236b7b4634..466672bae3ac 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
@@ -3,10 +3,10 @@ DEPEND=media-video/vdr[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/lin
 DESCRIPTION=VDR Plugin: displaying, recording and replaying teletext based subtitles
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-ttxtsubs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=media-video/vdr[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1281/vdr-ttxtsubs-0.3.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e5dbbb5a5db677df9f57cf889fe4b1ab
+_md5_=b7ede07a9c442f041b9434819c8da022
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1 b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
index 5e0651da9f59..a6c7de778ef0 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
@@ -3,10 +3,10 @@ DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-h
 DESCRIPTION=VDR Plugin: Recover deleted recordings of VDR
 EAPI=7
 HOMEPAGE=http://phivdr.dyndns.org/vdr/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz -> vdr-undelete-2.3.0_pre1.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ecc6d1a6f113c4ff2f85218b9b03eae
+_md5_=af628f6068126780a5b5768e6f41d06c
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
index 6ecbc995923c..825d62af1618 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR plugin: play video cds
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-vcd/vdr-vcd-0.9.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3b44aba257c3df277951221da5c8dc2b
+_md5_=5996cdcb4e1ecdb8a202e8816aca538a
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
index b51571601e63..63dfd3947c9b 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-2.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR Plugin: server part for MediaMVP device
 EAPI=7
 HOMEPAGE=http://www.loggytronic.com/vomp.php
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.5.1.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7d3f1f67b154a163d09539315db506ea
+_md5_=53e8eb7d65f3356f165dc7b972128e3c
diff --git a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2 b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
index 262d0921563a..75beb61d3024 100644
--- a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
+++ b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linu
 DESCRIPTION=VDR Plugin: browse fast the EPG information without being to switch to a channel
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-zappilot
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1318/vdr-zappilot-0.0.5.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=39aa980fd748467f05d803bb2799983d
+_md5_=07528e62e2c305b0d29db5529b536c3e
diff --git a/metadata/md5-cache/media-plugins/x42-plugins-20210714 b/metadata/md5-cache/media-plugins/x42-plugins-20210714
new file mode 100644
index 000000000000..745a10596c3f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/x42-plugins-20210714
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/glib media-fonts/dejavu media-libs/ftgl media-libs/glu media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/libltc media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 virtual/jack virtual/opengl x11-libs/cairo[X] x11-libs/pango sys-apps/help2man
+DESCRIPTION=Collection of LV2 plugins
+EAPI=7
+HOMEPAGE=https://github.com/x42/x42-plugins
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib media-fonts/dejavu media-libs/ftgl media-libs/glu media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/libltc media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 virtual/jack virtual/opengl x11-libs/cairo[X] x11-libs/pango
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://gareus.org/misc/x42-plugins/x42-plugins-20210714.tar.xz
+_md5_=c5d293b8db778102d25ba9f82e0c6fe3
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index f44d8ecb82fe..57589485d977 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/tucnak-4.30 b/metadata/md5-cache/media-radio/tucnak-4.30
new file mode 100644
index 000000000000..27e827c19ba8
--- /dev/null
+++ b/metadata/md5-cache/media-radio/tucnak-4.30
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= ) virtual/pkgconfig
+DESCRIPTION=Amateur Radio VHF Contest Logbook
+EAPI=7
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=alsa fftw gpm hamlib suid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/tucnak-4.30.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4e2c03770dc2fb71365db1050fb89f5d
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a982ef8946e8..09c4458066af 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/abcm2ps-8.14.12 b/metadata/md5-cache/media-sound/abcm2ps-8.14.12
new file mode 100644
index 000000000000..cb2abd818612
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcm2ps-8.14.12
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install
+DEPEND=pango? ( media-libs/freetype:2 x11-libs/pango )
+DESCRIPTION=Program to convert abc files to Postscript files
+EAPI=7
+HOMEPAGE=https://github.com/leesavide/abcm2ps
+IUSE=examples pango
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=pango? ( media-libs/freetype:2 x11-libs/pango )
+SLOT=0
+SRC_URI=https://github.com/leesavide/abcm2ps/archive/v8.14.12.tar.gz -> abcm2ps-8.14.12.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=606037cf6b7383a5a3e8db1ca8f4ef3b
diff --git a/metadata/md5-cache/media-sound/aqualung-1.1-r101 b/metadata/md5-cache/media-sound/aqualung-1.1-r101
index 173aaa785083..2e80719eb975 100644
--- a/metadata/md5-cache/media-sound/aqualung-1.1-r101
+++ b/metadata/md5-cache/media-sound/aqualung-1.1-r101
@@ -1,14 +1,15 @@
 BDEPEND=virtual/pkgconfig sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Music player for a wide range of formats designed for gapless playback
 EAPI=7
-HOMEPAGE=http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung
-IUSE=alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack +lua_single_target_lua5-2
+HOMEPAGE=https://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung
+IUSE=alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack )
+RDEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
 SRC_URI=https://github.com/jeremyevans/aqualung/releases/download/1.1/aqualung-1.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=46ab7397445e98aaf2eb9e1bae774fb1
+_md5_=871d14c34fb555d303d578498216275f
diff --git a/metadata/md5-cache/media-sound/beets-1.4.9-r6 b/metadata/md5-cache/media-sound/beets-1.4.9-r6
index f5305bf2373d..bbf13d7596fe 100644
--- a/metadata/md5-cache/media-sound/beets-1.4.9-r6
+++ b/metadata/md5-cache/media-sound/beets-1.4.9-r6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/beets/beets-1.4.9.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=038310e25e86f39fb2ef453b5b52a841
diff --git a/metadata/md5-cache/media-sound/beets-9999 b/metadata/md5-cache/media-sound/beets-9999
index 81faa33a481f..042d770e590f 100644
--- a/metadata/md5-cache/media-sound/beets-9999
+++ b/metadata/md5-cache/media-sound/beets-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-python/jellyfish-0.7.1[python_ta
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=82789e1eb6c5e798a644c63e3705ae31
diff --git a/metadata/md5-cache/media-sound/bluez-alsa-3.1.0 b/metadata/md5-cache/media-sound/bluez-alsa-3.1.0
index 9aa576699d9f..4976d9f3ff06 100644
--- a/metadata/md5-cache/media-sound/bluez-alsa-3.1.0
+++ b/metadata/md5-cache/media-sound/bluez-alsa-3.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.26[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Arkq/bluez-alsa/archive/v3.1.0.tar.gz -> bluez-alsa-3.1.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5108775845ca411298390438bad064ff
diff --git a/metadata/md5-cache/media-sound/bluez-alsa-9999 b/metadata/md5-cache/media-sound/bluez-alsa-9999
index 6c0015e2f560..7cfdab518bbf 100644
--- a/metadata/md5-cache/media-sound/bluez-alsa-9999
+++ b/metadata/md5-cache/media-sound/bluez-alsa-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.26[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/alsa-lib-1.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(-)?] >=media-libs/sbc-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(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= aac? ( >=media-libs/fdk-aac-0.1.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(-)?] ) aptx? ( media-libs/libopenaptx ) lame? ( media-sound/lame[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpg123? ( media-sound/mpg123[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= ) ldac? ( >=media-libs/libldac-2.0.0 ) ofono? ( net-misc/ofono ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) upower? ( sys-power/upower )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5108775845ca411298390438bad064ff
diff --git a/metadata/md5-cache/media-sound/cmus-2.9.1 b/metadata/md5-cache/media-sound/cmus-2.9.1
index 1ff8b26bb5e8..78030fb6afda 100644
--- a/metadata/md5-cache/media-sound/cmus-2.9.1
+++ b/metadata/md5-cache/media-sound/cmus-2.9.1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-
 REQUIRED_USE=tremor? ( vorbis ) mp4? ( aac )
 SLOT=0
 SRC_URI=https://github.com/cmus/cmus/archive/v2.9.1.tar.gz -> cmus-2.9.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=15b190457da42b1e37ee81f62165b2d2
diff --git a/metadata/md5-cache/media-sound/cmus-9999 b/metadata/md5-cache/media-sound/cmus-9999
index c950bff082e1..c7659c2d3cca 100644
--- a/metadata/md5-cache/media-sound/cmus-9999
+++ b/metadata/md5-cache/media-sound/cmus-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack ) pidgin? ( dev-python/dbus-python net-im/pidgin )
 REQUIRED_USE=tremor? ( vorbis ) mp4? ( aac )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c07261124bd6060819bf7209343f3f9
diff --git a/metadata/md5-cache/media-sound/csound-6.16.0 b/metadata/md5-cache/media-sound/csound-6.16.0
index bde58edf6678..34400d172380 100644
--- a/metadata/md5-cache/media-sound/csound-6.16.0
+++ b/metadata/md5-cache/media-sound/csound-6.16.0
@@ -5,7 +5,7 @@ DESCRIPTION=Sound design and signal processing system for composition and perfor
 EAPI=7
 HOMEPAGE=https://csound.github.io/
 IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
 RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= )
 REQUIRED_USE=alsa? ( threads ) java? ( cxx ) linear? ( double-precision ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) cxx ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) cxx )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.16.0-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.16.0/Csound6.16.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.16.0/Csound6.16.0_manual_html.zip )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=63d709755886537f4cd08d5267bb17bc
+_md5_=5c52edc76e7922fd9c5ef2ec3545ae42
diff --git a/metadata/md5-cache/media-sound/easyeffects-5.0.4 b/metadata/md5-cache/media-sound/easyeffects-5.0.4
new file mode 100644
index 000000000000..8868e4b51b9e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/easyeffects-5.0.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=!media-sound/pulseeffects >=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 >=media-video/pipewire-0.3.24[gstreamer] sys-apps/dbus bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) dev-libs/appstream-glib sys-devel/gettext
+DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire applications
+EAPI=7
+HOMEPAGE=https://github.com/wwmm/easyeffects
+IUSE=bs2b calf rubberband
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=!media-sound/pulseeffects >=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 >=media-video/pipewire-0.3.24[gstreamer] sys-apps/dbus bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband )
+SLOT=0
+SRC_URI=https://github.com/wwmm/easyeffects/archive/v5.0.4.tar.gz -> easyeffects-5.0.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=37a2b706228447af6203759617a64fdb
diff --git a/metadata/md5-cache/media-sound/elisa-21.04.2 b/metadata/md5-cache/media-sound/elisa-21.04.2
deleted file mode 100644
index 73aa0204db37..000000000000
--- a/metadata/md5-cache/media-sound/elisa-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5[taglib] >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kirigami-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 mpris? ( >=dev-qt/qtdbus-5.15.2:5 >=kde-frameworks/kdbusaddons-5.80.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.80.0:5 ) vlc? ( media-video/vlc:= ) !vlc? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Simple music player by KDE
-EAPI=7
-HOMEPAGE=https://elisa.kde.org/ https://apps.kde.org/elisa/
-IUSE=mpris semantic-desktop +vlc debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5[taglib] >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kirigami-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 mpris? ( >=dev-qt/qtdbus-5.15.2:5 >=kde-frameworks/kdbusaddons-5.80.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.80.0:5 ) vlc? ( media-video/vlc:= ) !vlc? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer] ) >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/elisa-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c2570e0f4a11110a68d09d1603924723
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.2.1 b/metadata/md5-cache/media-sound/fluidsynth-2.2.1
index 5f528ecba1fd..7ebcf941b36e 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-2.2.1
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.2.1
@@ -5,10 +5,10 @@ DESCRIPTION=Software real-time synthesizer based on the Soundfont 2 specificatio
 EAPI=7
 HOMEPAGE=https://www.fluidsynth.org
 IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/3
 SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.2.1.tar.gz -> fluidsynth-2.2.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0167b578cf73ada2ffa7a57e31085965
+_md5_=17e0d69f4618078c1322f4d9040aa029
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.2.2 b/metadata/md5-cache/media-sound/fluidsynth-2.2.2
new file mode 100644
index 000000000000..0097c2051594
--- /dev/null
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.2.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Software real-time synthesizer based on the Soundfont 2 specifications
+EAPI=7
+HOMEPAGE=https://www.fluidsynth.org
+IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/3
+SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.2.2.tar.gz -> fluidsynth-2.2.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=11099ab6a1de00bc02c61163615dda2c
diff --git a/metadata/md5-cache/media-sound/gnump3d-3.0-r2 b/metadata/md5-cache/media-sound/gnump3d-3.0-r2
deleted file mode 100644
index 5de734643eeb..000000000000
--- a/metadata/md5-cache/media-sound/gnump3d-3.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=A streaming server for MP3, OGG vorbis and other streamable files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gnump3d/
-IUSE=sox
-KEYWORDS=~alpha amd64 ~ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=sox? ( media-sound/sox ) dev-lang/perl:=[-build(-)]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://savannah.gnu.org/download/gnump3d/gnump3d-3.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c84eb7ffda240d8b8c30177c682dbd60
diff --git a/metadata/md5-cache/media-sound/gnump3d-3.0-r4 b/metadata/md5-cache/media-sound/gnump3d-3.0-r4
new file mode 100644
index 000000000000..8ca1f5e61590
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gnump3d-3.0-r4
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/gnump3d acct-user/gnump3d dev-lang/perl
+DESCRIPTION=A streaming server for MP3, OGG vorbis and other streamable files
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/gnump3d/
+IUSE=sox
+KEYWORDS=~alpha amd64 ~ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=acct-group/gnump3d acct-user/gnump3d sox? ( media-sound/sox ) dev-lang/perl:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://savannah.gnu.org/download/gnump3d/gnump3d-3.0.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6aafd859cdd8e0e23ec6ba847a21c682
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.19 b/metadata/md5-cache/media-sound/jack2-1.9.19
new file mode 100644
index 000000000000..a9dda8a19a37
--- /dev/null
+++ b/metadata/md5-cache/media-sound/jack2-1.9.19
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[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/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Jackdmp jack implemention for multi-processor machine
+EAPI=7
+HOMEPAGE=https://jackaudio.org/
+IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[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/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( classic dbus )
+SLOT=2
+SRC_URI=https://github.com/jackaudio/jack2/archive/v1.9.19/v1.9.19.tar.gz -> jack2-1.9.19.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
+_md5_=0e6c26fa192db914a3854f292fcddc56
diff --git a/metadata/md5-cache/media-sound/lmms-9999 b/metadata/md5-cache/media-sound/lmms-9999
index 035e44997bd7..ada759c6989c 100644
--- a/metadata/md5-cache/media-sound/lmms-9999
+++ b/metadata/md5-cache/media-sound/lmms-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) mp3? ( media-sound/lame ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-plugins/calf media-plugins/caps-plugins media-plugins/cmt-plugins media-plugins/swh-plugins media-plugins/tap-plugins
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f99e86c5eae39ac6b2c825f5a5004844
diff --git a/metadata/md5-cache/media-sound/mpc-0.33 b/metadata/md5-cache/media-sound/mpc-0.33
index 86c4a6bead9c..60d2ecaf2ee6 100644
--- a/metadata/md5-cache/media-sound/mpc-0.33
+++ b/metadata/md5-cache/media-sound/mpc-0.33
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libmpdclient
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpc/0/mpc-0.33.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df4579257c397c2d600cc092aa1867f8
diff --git a/metadata/md5-cache/media-sound/mpg123-1.27.2 b/metadata/md5-cache/media-sound/mpg123-1.27.2
deleted file mode 100644
index 677a1c2aa1e4..000000000000
--- a/metadata/md5-cache/media-sound/mpg123-1.27.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
-DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
-EAPI=7
-HOMEPAGE=https://www.mpg123.org/
-IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
-SLOT=0
-SRC_URI=https://www.mpg123.org/download/mpg123-1.27.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=22d6f2cf0dafc3f5b51124471afb8993
diff --git a/metadata/md5-cache/media-sound/mpg123-1.28.0 b/metadata/md5-cache/media-sound/mpg123-1.28.0
deleted file mode 100644
index ae29a3db72cc..000000000000
--- a/metadata/md5-cache/media-sound/mpg123-1.28.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
-DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
-EAPI=7
-HOMEPAGE=https://www.mpg123.org/
-IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
-SLOT=0
-SRC_URI=https://www.mpg123.org/download/mpg123-1.28.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=07db5d115fcca0692f37d290ab440b59
diff --git a/metadata/md5-cache/media-sound/mpg123-1.28.0-r1 b/metadata/md5-cache/media-sound/mpg123-1.28.0-r1
index 11c4843f38cb..2c2c12667343 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.28.0-r1
+++ b/metadata/md5-cache/media-sound/mpg123-1.28.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.mpg123.org/
 IDEPEND=app-eselect/eselect-mpg123
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=https://www.mpg123.org/download/mpg123-1.28.0.tar.bz2
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1228603b6dea905b856f73d778a2844c
+_md5_=fdebd4d4156c33c690fa154571c2590c
diff --git a/metadata/md5-cache/media-sound/mpg123-1.28.2 b/metadata/md5-cache/media-sound/mpg123-1.28.2
new file mode 100644
index 000000000000..a20c5a5b91f1
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpg123-1.28.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
+DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
+EAPI=8
+HOMEPAGE=https://www.mpg123.org/
+IDEPEND=app-eselect/eselect-mpg123
+IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
+SLOT=0
+SRC_URI=https://www.mpg123.org/download/mpg123-1.28.2.tar.bz2
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=776e0fa3d33c0d99842f007fef2f28e4
diff --git a/metadata/md5-cache/media-sound/playerctl-2.3.1 b/metadata/md5-cache/media-sound/playerctl-2.3.1
index 4dc7d4ffd63a..a8feeeb7df91 100644
--- a/metadata/md5-cache/media-sound/playerctl-2.3.1
+++ b/metadata/md5-cache/media-sound/playerctl-2.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/acrisci/playerctl/archive/v2.3.1.tar.gz -> playerctl-2.3.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=53e9d0f3ea877651604db80215e5f995
diff --git a/metadata/md5-cache/media-sound/pulseaudio-13.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
index 67c7c0e7b7ae..858ae3a7a44e 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( elogind systemd ) bluetooth? ( dbus ) equalizer? ( dbus ) ofon
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=128ffbd8a7a0b3986566323db161549c
diff --git a/metadata/md5-cache/media-sound/pulseaudio-14.99.2_pre1 b/metadata/md5-cache/media-sound/pulseaudio-14.99.2_pre1
index efb202160fdf..c33299fa122e 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-14.99.2_pre1
+++ b/metadata/md5-cache/media-sound/pulseaudio-14.99.2_pre1
@@ -12,5 +12,5 @@ REQUIRED_USE=alsa-plugin? ( alsa ) bluetooth? ( dbus ) daemon? ( ?? ( elogind sy
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-14.99.2.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=42ac2a3df753525372442270c6cc0d1b
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.7.2-r2 b/metadata/md5-cache/media-sound/pulseeffects-4.7.2-r2
deleted file mode 100644
index d8304a91b5be..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-4.7.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=7
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=bs2b calf mda-lv2 rubberband
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.7.2.tar.gz -> pulseeffects-4.7.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e4a110f80c647e4263685febf866171c
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.8.5 b/metadata/md5-cache/media-sound/pulseeffects-4.8.5
index 1c4cb526e8b6..f47ad300e086 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.8.5
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.8.5
@@ -1,14 +1,14 @@
 BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
+DEPEND=!media-sound/easyeffects >=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.20:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.5:1.0 >=media-libs/gst-plugins-good-1.12.5:1.0 >=media-libs/gst-plugins-bad-1.12.5:1.0 >=media-plugins/gst-plugins-ladspa-1.12.5:1.0 >=media-plugins/gst-plugins-lv2-1.12.5:1.0 >=media-plugins/gst-plugins-pulse-1.12.5:1.0 >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) dev-libs/appstream-glib sys-devel/gettext
 DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
 EAPI=7
-HOMEPAGE=https://github.com/wwmm/pulseeffects
+HOMEPAGE=https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy
 IUSE=bs2b calf rubberband
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
+RDEPEND=!media-sound/easyeffects >=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.20:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.5:1.0 >=media-libs/gst-plugins-good-1.12.5:1.0 >=media-libs/gst-plugins-bad-1.12.5:1.0 >=media-plugins/gst-plugins-ladspa-1.12.5:1.0 >=media-plugins/gst-plugins-lv2-1.12.5:1.0 >=media-plugins/gst-plugins-pulse-1.12.5:1.0 >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband )
 SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.8.5.tar.gz -> pulseeffects-4.8.5.tar.gz
+SRC_URI=https://github.com/wwmm/easyeffects/archive/v4.8.5.tar.gz -> pulseeffects-4.8.5.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=51b007023ac60b83ab21158ffbc31f08
+_md5_=14397167861662b32e2f6323f2433b37
diff --git a/metadata/md5-cache/media-sound/pulseeffects-5.0.3 b/metadata/md5-cache/media-sound/pulseeffects-5.0.3
deleted file mode 100644
index 5b9f3ffc3c5f..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-5.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 >=media-video/pipewire-0.3.24[gstreamer] sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=7
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=bs2b calf rubberband
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 >=media-video/pipewire-0.3.24[gstreamer] sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v5.0.3.tar.gz -> pulseeffects-5.0.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c02676ee3f2ccd20d060f7bfe95563ab
diff --git a/metadata/md5-cache/media-sound/pulseeffects-5.0.4 b/metadata/md5-cache/media-sound/pulseeffects-5.0.4
index e2a8d0fa2f1d..98d82a0f1255 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-5.0.4
+++ b/metadata/md5-cache/media-sound/pulseeffects-5.0.4
@@ -1,14 +1,14 @@
 BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 >=media-video/pipewire-0.3.24[gstreamer] sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
+DEPEND=!media-sound/easyeffects >=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 >=media-video/pipewire-0.3.24[gstreamer] sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
 DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
 EAPI=7
-HOMEPAGE=https://github.com/wwmm/pulseeffects
+HOMEPAGE=https://github.com/wwmm/easyeffects
 IUSE=bs2b calf rubberband
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 >=media-video/pipewire-0.3.24[gstreamer] sys-apps/dbus
+RDEPEND=!media-sound/easyeffects >=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 >=media-video/pipewire-0.3.24[gstreamer] sys-apps/dbus
 SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v5.0.4.tar.gz -> pulseeffects-5.0.4.tar.gz
+SRC_URI=https://github.com/wwmm/easyeffects/archive/v5.0.4.tar.gz -> pulseeffects-5.0.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c02676ee3f2ccd20d060f7bfe95563ab
+_md5_=95e7f0c331660281a44ab10829620ddf
diff --git a/metadata/md5-cache/media-sound/pulseeffects-9999 b/metadata/md5-cache/media-sound/pulseeffects-9999
deleted file mode 100644
index 8fe960005666..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 >=media-video/pipewire-0.3.24[gstreamer] sys-apps/dbus gnome-extra/yelp dev-libs/appstream-glib sys-devel/gettext
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=7
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=bs2b calf rubberband
-LICENSE=GPL-3
-PROPERTIES=live
-RDEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 >=media-video/pipewire-0.3.24[gstreamer] sys-apps/dbus gnome-extra/yelp
-SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3a8b3d8c225262fb74de3b3dbe8993d9
diff --git a/metadata/md5-cache/media-sound/qmmp-1.4.6 b/metadata/md5-cache/media-sound/qmmp-1.4.6
deleted file mode 100644
index 0d0ecd3e2012..000000000000
--- a/metadata/md5-cache/media-sound/qmmp-1.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( media-libs/libmad:= media-sound/mpg123:= ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
-EAPI=7
-HOMEPAGE=http://qmmp.ylsoftware.com
-IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( media-libs/libmad:= media-sound/mpg123:= ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.4.6.tar.bz2 mirror://sourceforge/qmmp-dev/files/qmmp-1.4.6.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5feb34c53842c20ac7b50dbf7cfa11a1
diff --git a/metadata/md5-cache/media-sound/qmmp-1.5.0 b/metadata/md5-cache/media-sound/qmmp-1.5.0
index 133e8fd85ce9..65ec9d0326c6 100644
--- a/metadata/md5-cache/media-sound/qmmp-1.5.0
+++ b/metadata/md5-cache/media-sound/qmmp-1.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
 EAPI=7
 HOMEPAGE=http://qmmp.ylsoftware.com
 IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( media-libs/libmad:= media-sound/mpg123:= ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pipewire? ( media-video/pipewire ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
 REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.5.0.tar.bz2 mirror://sourceforge/qmmp-dev/files/qmmp-1.5.0.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=444ef21845e5357dbebfdf4409ac74fa
+_md5_=49438899fc419eaecc0e4aa28aa79bc4
diff --git a/metadata/md5-cache/media-sound/qmmp-1.5.1 b/metadata/md5-cache/media-sound/qmmp-1.5.1
new file mode 100644
index 000000000000..666df0b87b6f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qmmp-1.5.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( media-libs/libmad:= media-sound/mpg123:= ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pipewire? ( media-video/pipewire ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
+EAPI=7
+HOMEPAGE=http://qmmp.ylsoftware.com
+IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( media-libs/libmad:= media-sound/mpg123:= ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pipewire? ( media-video/pipewire ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
+REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
+SLOT=0
+SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.5.1.tar.bz2 mirror://sourceforge/qmmp-dev/files/qmmp-1.5.1.tar.bz2
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fd59d2e88d3f0411bb162fdb7867fddb
diff --git a/metadata/md5-cache/media-sound/rplay-3.3.2-r3 b/metadata/md5-cache/media-sound/rplay-3.3.2-r3
deleted file mode 100644
index 8696b294c909..000000000000
--- a/metadata/md5-cache/media-sound/rplay-3.3.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=media-sound/gsm
-DESCRIPTION=Play sounds on remote Unix systems without data transfer
-EAPI=7
-HOMEPAGE=http://rplay.doit.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=media-sound/gsm
-SLOT=0
-SRC_URI=http://rplay.doit.org/dist/rplay-3.3.2.tar.gz mirror://debian/pool/main/r/rplay/rplay_3.3.2-16.debian.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=a12e0835b94ed7988aa0c203fa020508
diff --git a/metadata/md5-cache/media-sound/rplay-3.3.2-r4 b/metadata/md5-cache/media-sound/rplay-3.3.2-r4
new file mode 100644
index 000000000000..f8cc5877e663
--- /dev/null
+++ b/metadata/md5-cache/media-sound/rplay-3.3.2-r4
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=acct-group/rplayd acct-user/rplayd media-sound/gsm
+DESCRIPTION=Play sounds on remote Unix systems without data transfer
+EAPI=7
+HOMEPAGE=http://rplay.doit.org/
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=acct-group/rplayd acct-user/rplayd media-sound/gsm
+SLOT=0
+SRC_URI=http://rplay.doit.org/dist/rplay-3.3.2.tar.gz mirror://debian/pool/main/r/rplay/rplay_3.3.2-16.debian.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d3ea47a4c72af116799eb309f2127d68
diff --git a/metadata/md5-cache/media-sound/split2flac-122 b/metadata/md5-cache/media-sound/split2flac-122
index f1db79f44a1b..e2056080e87f 100644
--- a/metadata/md5-cache/media-sound/split2flac-122
+++ b/metadata/md5-cache/media-sound/split2flac-122
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-cdr/cuetools media-sound/shntool[mac?] virtual/libiconv media-libs/flac enca? ( app-i18n/enca ) flake? ( media-sound/flake ) mp3? ( media-sound/lame || ( media-libs/mutagen media-libs/id3lib ) ) mp4? ( media-libs/faac media-libs/libmp4v2:0[utils] ) ogg? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack ) replaygain? ( mp3? ( media-sound/mp3gain ) ogg? ( media-sound/vorbisgain ) ) imagemagick? ( media-gfx/imagemagick )
 SLOT=0
 SRC_URI=https://github.com/ftrvxmtrx/split2flac/archive/122.tar.gz -> split2flac-122.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d939e707051d054b352a311be04f72d8
diff --git a/metadata/md5-cache/media-sound/split2flac-9999 b/metadata/md5-cache/media-sound/split2flac-9999
index 735f418c12e4..e5aaf39ef322 100644
--- a/metadata/md5-cache/media-sound/split2flac-9999
+++ b/metadata/md5-cache/media-sound/split2flac-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=app-cdr/cuetools media-sound/shntool[mac?] virtual/libiconv media-libs/flac enca? ( app-i18n/enca ) flake? ( media-sound/flake ) mp3? ( media-sound/lame || ( media-libs/mutagen media-libs/id3lib ) ) mp4? ( media-libs/faac media-libs/libmp4v2:0[utils] ) ogg? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack ) replaygain? ( mp3? ( media-sound/mp3gain ) ogg? ( media-sound/vorbisgain ) ) imagemagick? ( media-gfx/imagemagick )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e62091093e7ebbd4473b9f3b804b654
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.72-r1 b/metadata/md5-cache/media-sound/spotify-1.0.72-r1
index ec42f8e36328..7be2ca6ff618 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.72-r1
+++ b/metadata/md5-cache/media-sound/spotify-1.0.72-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib med
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6f577f3e7a17ef1c274635bd0303ce5c
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.26-r1 b/metadata/md5-cache/media-sound/spotify-1.1.26-r1
index ae0809ff6d33..5ee868f71c31 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.26-r1
+++ b/metadata/md5-cache/media-sound/spotify-1.1.26-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? (
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=10ea72aef1945a2f33eb1fb3f63ed536
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.26-r2 b/metadata/md5-cache/media-sound/spotify-1.1.26-r2
index 4cca01e2a29d..629837ce3ee7 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.26-r2
+++ b/metadata/md5-cache/media-sound/spotify-1.1.26-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? (
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=28979e0e477399c28ad2a9d7fe756ca1
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.55 b/metadata/md5-cache/media-sound/spotify-1.1.55
index 374038a304b2..04401fb38da4 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.55
+++ b/metadata/md5-cache/media-sound/spotify-1.1.55
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? (
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.55.498.gf9a83c60_amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8a97e632bde978a8f68561d9b6854f16
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.56 b/metadata/md5-cache/media-sound/spotify-1.1.56
index f07afdeff54f..1b599d5d13f7 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.56
+++ b/metadata/md5-cache/media-sound/spotify-1.1.56
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? (
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.56.595.g2d2da0de_amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f9e46d7a819df2f8048e3881aa96bf98
diff --git a/metadata/md5-cache/media-sound/timidity++-2.15.0 b/metadata/md5-cache/media-sound/timidity++-2.15.0
deleted file mode 100644
index 437aac497525..000000000000
--- a/metadata/md5-cache/media-sound/timidity++-2.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? ( >=app-editors/emacs-23.1:* ) flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) jack? ( virtual/jack ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( >=media-libs/nas-1.4 ) ncurses? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) speex? ( media-libs/speex ) tk? ( dev-lang/tk:0= ) vorbis? ( media-libs/libvorbis ) X? ( media-libs/libpng:0= x11-libs/libXaw x11-libs/libXext ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A handy MIDI to WAV converter with OSS and ALSA output support
-EAPI=7
-HOMEPAGE=http://timidity.sourceforge.net/
-IUSE=alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-PDEPEND=|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )
-RDEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? ( >=app-editors/emacs-23.1:* ) flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) jack? ( virtual/jack ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( >=media-libs/nas-1.4 ) ncurses? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) speex? ( media-libs/speex ) tk? ( dev-lang/tk:0= ) vorbis? ( media-libs/libvorbis ) X? ( media-libs/libpng:0= x11-libs/libXaw x11-libs/libXext ) app-eselect/eselect-timidity alsa? ( media-sound/alsa-utils ) selinux? ( sec-policy/selinux-timidity )
-REQUIRED_USE=tk? ( X )
-SLOT=0
-SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7e55d9648fab3bd63c8bc8363e9a1758
diff --git a/metadata/md5-cache/media-sound/timidity++-2.15.0-r1 b/metadata/md5-cache/media-sound/timidity++-2.15.0-r1
new file mode 100644
index 000000000000..695c62ed544e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/timidity++-2.15.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? ( >=app-editors/emacs-23.1:* ) flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) jack? ( virtual/jack ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( >=media-libs/nas-1.4 ) ncurses? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) speex? ( media-libs/speex ) tk? ( dev-lang/tk:0= ) vorbis? ( media-libs/libvorbis ) X? ( media-libs/libpng:0= x11-libs/libXaw x11-libs/libXext ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A handy MIDI to WAV converter with OSS and ALSA output support
+EAPI=7
+HOMEPAGE=http://timidity.sourceforge.net/
+IUSE=alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86
+LICENSE=GPL-2
+PDEPEND=|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )
+RDEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? ( >=app-editors/emacs-23.1:* ) flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) jack? ( virtual/jack ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( >=media-libs/nas-1.4 ) ncurses? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) speex? ( media-libs/speex ) tk? ( dev-lang/tk:0= ) vorbis? ( media-libs/libvorbis ) X? ( media-libs/libpng:0= x11-libs/libXaw x11-libs/libXext ) acct-group/audio acct-group/nobody acct-user/timidity app-eselect/eselect-timidity alsa? ( media-sound/alsa-utils ) selinux? ( sec-policy/selinux-timidity )
+REQUIRED_USE=tk? ( X )
+SLOT=0
+SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=65092ea973bc774352f729178bd581d7
diff --git a/metadata/md5-cache/media-sound/xwax-1.7 b/metadata/md5-cache/media-sound/xwax-1.7
deleted file mode 100644
index f0f772fa91d9..000000000000
--- a/metadata/md5-cache/media-sound/xwax-1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=media-fonts/dejavu media-libs/libsdl media-libs/sdl-ttf sys-libs/glibc sys-libs/pam alsa? ( media-libs/alsa-lib ) cdda? ( media-sound/cdparanoia ) fallback? ( media-video/ffmpeg ) jack? ( virtual/jack ) mp3? ( media-sound/mpg123 )
-DESCRIPTION=Digital vinyl emulation software
-EAPI=7
-HOMEPAGE=https://xwax.org/
-IUSE=alsa jack oss cdda mp3 +fallback
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=media-fonts/dejavu media-libs/libsdl media-libs/sdl-ttf sys-libs/glibc sys-libs/pam alsa? ( media-libs/alsa-lib ) cdda? ( media-sound/cdparanoia ) fallback? ( media-video/ffmpeg ) jack? ( virtual/jack ) mp3? ( media-sound/mpg123 )
-REQUIRED_USE=|| ( cdda mp3 fallback ) || ( alsa jack oss )
-SLOT=0
-SRC_URI=https://xwax.org/releases/xwax-1.7.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=f332061718175274307a4f1377f1c56c
diff --git a/metadata/md5-cache/media-sound/xwax-1.7-r1 b/metadata/md5-cache/media-sound/xwax-1.7-r1
new file mode 100644
index 000000000000..b70859c58d4c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/xwax-1.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=media-fonts/dejavu media-libs/libsdl media-libs/sdl-ttf sys-libs/glibc sys-libs/pam alsa? ( media-libs/alsa-lib ) cdda? ( media-sound/cdparanoia ) fallback? ( media-video/ffmpeg ) jack? ( virtual/jack ) mp3? ( media-sound/mpg123 )
+DESCRIPTION=Digital vinyl emulation software
+EAPI=7
+HOMEPAGE=https://xwax.org/
+IUSE=alsa jack oss cdda mp3 +fallback
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=media-fonts/dejavu media-libs/libsdl media-libs/sdl-ttf sys-libs/glibc sys-libs/pam alsa? ( media-libs/alsa-lib ) cdda? ( media-sound/cdparanoia ) fallback? ( media-video/ffmpeg ) jack? ( virtual/jack ) mp3? ( media-sound/mpg123 ) acct-group/xwax
+REQUIRED_USE=|| ( cdda mp3 fallback ) || ( alsa jack oss )
+SLOT=0
+SRC_URI=https://xwax.org/releases/xwax-1.7.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=531cb650ca5f8f4f3c20ed6ea226b649
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 190f348a61b8..d8397c021603 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/kodi-19.0 b/metadata/md5-cache/media-tv/kodi-19.0
index f5a4cfc967fe..dcab69e43b6a 100644
--- a/metadata/md5-cache/media-tv/kodi-19.0
+++ b/metadata/md5-cache/media-tv/kodi-19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.1-Matrix-Beta1.tar.gz -> ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.0-Matrix.tar.gz -> kodi-19.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=426aa43224eb2c8294854a72547c22a0
diff --git a/metadata/md5-cache/media-tv/kodi-19.1 b/metadata/md5-cache/media-tv/kodi-19.1
index c71a78a7d2e7..bfd680efc73a 100644
--- a/metadata/md5-cache/media-tv/kodi-19.1
+++ b/metadata/md5-cache/media-tv/kodi-19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/v19.1.tar.gz -> kodi-19.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ec737dcd44e52fae634861f585dc4edc
diff --git a/metadata/md5-cache/media-tv/kodi-19.9999 b/metadata/md5-cache/media-tv/kodi-19.9999
index 6a2dfb7d9154..77cc012ccb8e 100644
--- a/metadata/md5-cache/media-tv/kodi-19.9999
+++ b/metadata/md5-cache/media-tv/kodi-19.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=aa494d1c82c6e1b28a500109995e70fa
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index f366584eea2f..7b0cf1060ac2 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.4-N-Alpha1.tar.gz -> ffmpeg-kodi-4.4-N-Alpha1.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2fb1a5e9e3370fc5a161b263da7fe21f
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.23.1.4602 b/metadata/md5-cache/media-tv/plex-media-server-1.23.1.4602
deleted file mode 100644
index 07f47ee6e3e2..000000000000
--- a/metadata/md5-cache/media-tv/plex-media-server-1.23.1.4602
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst unpack
-DEPEND=acct-group/plex acct-user/plex
-DESCRIPTION=Free media library that is intended for use with a plex client
-EAPI=7
-HOMEPAGE=https://www.plex.tv/
-IUSE=system-openssl
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Plex
-RDEPEND=acct-group/plex acct-user/plex system-openssl? ( dev-libs/openssl:0/1.1 )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.23.1.4602-280ab6053/debian/plexmediaserver_1.23.1.4602-280ab6053_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.23.1.4602-280ab6053/debian/plexmediaserver_1.23.1.4602-280ab6053_i386.deb )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=7cd0d3c9fd0d226bf16f44316ef81521
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.23.2.4625 b/metadata/md5-cache/media-tv/plex-media-server-1.23.2.4625
deleted file mode 100644
index e17c24e5c1fa..000000000000
--- a/metadata/md5-cache/media-tv/plex-media-server-1.23.2.4625
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst unpack
-DEPEND=acct-group/plex acct-user/plex
-DESCRIPTION=Free media library that is intended for use with a plex client
-EAPI=7
-HOMEPAGE=https://www.plex.tv/
-IUSE=system-openssl
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Plex
-RDEPEND=acct-group/plex acct-user/plex system-openssl? ( dev-libs/openssl:0/1.1 )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.23.2.4625-a83d2d0f9/debian/plexmediaserver_1.23.2.4625-a83d2d0f9_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.23.2.4625-a83d2d0f9/debian/plexmediaserver_1.23.2.4625-a83d2d0f9_i386.deb )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=26b0c0385b191668373253e0bb069d93
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.23.4.4805 b/metadata/md5-cache/media-tv/plex-media-server-1.23.4.4805
new file mode 100644
index 000000000000..ae6d43dc15fe
--- /dev/null
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.23.4.4805
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst unpack
+DEPEND=acct-group/plex acct-user/plex
+DESCRIPTION=Free media library that is intended for use with a plex client
+EAPI=7
+HOMEPAGE=https://www.plex.tv/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Plex
+RDEPEND=acct-group/plex acct-user/plex
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.23.4.4805-186bae04e/debian/plexmediaserver_1.23.4.4805-186bae04e_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.23.4.4805-186bae04e/debian/plexmediaserver_1.23.4.4805-186bae04e_i386.deb )
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=5081ada82488b2911088b9079286e377
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 9a05ef1be5cf..19ba38950131 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/mpv-0.33.1-r1 b/metadata/md5-cache/media-video/mpv-0.33.1-r1
index f03ec3ac1131..dd1414ff0665 100644
--- a/metadata/md5-cache/media-video/mpv-0.33.1-r1
+++ b/metadata/md5-cache/media-video/mpv-0.33.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.33.1.tar.gz -> mpv-0.33.1.tar.gz https://waf.io/waf-2.0.9
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	74cd9920d64148719fb62c462935c1b5	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0a4f52bac9f2d68133dc26659b0b0aa1
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 61db585f427e..d38d8fb7d5a3 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://waf.io/waf-2.0.9
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	74cd9920d64148719fb62c462935c1b5	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f692bc51f5601accae4d5acda4c0dfde
diff --git a/metadata/md5-cache/media-video/unifi-video-3.10.13-r3 b/metadata/md5-cache/media-video/unifi-video-3.10.13-r3
new file mode 100644
index 000000000000..0a324ab9112c
--- /dev/null
+++ b/metadata/md5-cache/media-video/unifi-video-3.10.13-r3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare unpack
+DEPEND=acct-group/unifi-video acct-user/unifi-video
+DESCRIPTION=UniFi Video Server
+EAPI=8
+HOMEPAGE=https://www.ubnt.com/download/unifi-video/
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=acct-group/unifi-video acct-user/unifi-video dev-db/mongodb dev-java/commons-daemon sys-apps/lsb-release sys-apps/util-linux sys-libs/libcap virtual/jre:1.8
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.ubnt.com/firmwares/ufv/v3.10.13/unifi-video.Ubuntu18.04_amd64.v3.10.13.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0b0546b560096e7bb9e87ef516138127
diff --git a/metadata/md5-cache/media-video/vdr-2.4.7-r1 b/metadata/md5-cache/media-video/vdr-2.4.7-r1
index 9b91bba1f7db..b28934a9245e 100644
--- a/metadata/md5-cache/media-video/vdr-2.4.7-r1
+++ b/metadata/md5-cache/media-video/vdr-2.4.7-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Video Disk Recorder - turns a pc into a powerful set top box for DVB
 EAPI=7
 HOMEPAGE=http://www.tvdr.de/
 IUSE=bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 dev-lang/perl media-tv/gentoo-vdr-scripts media-fonts/corefonts bidi? ( dev-libs/fribidi ) systemd? ( sys-apps/systemd )
 REQUIRED_USE=pinplugin? ( !mainmenuhooks ) permashift? ( !naludump !pinplugin )
 SLOT=0
 SRC_URI=http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> vdr-2.4.7.tbz2 mainmenuhooks? ( http://vdr.websitec.de/download/vdr/vdr-2.4.1/vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 ) menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff ) naludump? ( https://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff ) pinplugin? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4.6_pinplugin.patch.bz2 ) ttxtsubs? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4.6_ttxtsubs_v2.patch.bz2 ) permashift? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4-patch-for-permashift.diff.bz2 )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c1ec0e7c2d16d2a4c5b5172a8b69a43c
+_md5_=43db4ace2e2fb48378c4fc1b8ef97482
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index c43c0ea2208e..1b0e5a30d788 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/arp-scan-1.9.7 b/metadata/md5-cache/net-analyzer/arp-scan-1.9.7
index 7c364a0e26e3..166b7db9f4ed 100644
--- a/metadata/md5-cache/net-analyzer/arp-scan-1.9.7
+++ b/metadata/md5-cache/net-analyzer/arp-scan-1.9.7
@@ -4,10 +4,10 @@ DEPEND=net-libs/libpcap
 DESCRIPTION=ARP scanning and fingerprinting tool
 EAPI=7
 HOMEPAGE=https://github.com/royhills/arp-scan
-KEYWORDS=amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64 ~riscv
 LICENSE=GPL-3
 RDEPEND=net-libs/libpcap dev-lang/perl
 SLOT=0
 SRC_URI=https://github.com/royhills/arp-scan/archive/1.9.7.tar.gz -> arp-scan-1.9.7.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=24dc6b47221ebc1eca4111bae8f85212
+_md5_=c1cc6b4e8f5d17b9ac5b2fec8ceef6a0
diff --git a/metadata/md5-cache/net-analyzer/arp-sk-0.0.16-r2 b/metadata/md5-cache/net-analyzer/arp-sk-0.0.16-r2
index e73eb150aca5..64354d7e5a8d 100644
--- a/metadata/md5-cache/net-analyzer/arp-sk-0.0.16-r2
+++ b/metadata/md5-cache/net-analyzer/arp-sk-0.0.16-r2
@@ -3,10 +3,10 @@ DEPEND=>=net-libs/libnet-1.1 sys-devel/gnuconfig >=app-portage/elt-patches-20170
 DESCRIPTION=A swiss knife tool for ARP
 EAPI=5
 HOMEPAGE=http://sid.rstack.org/arp-sk/
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libnet-1.1
 SLOT=0
 SRC_URI=http://sid.rstack.org/arp-sk/files/arp-sk-0.0.16.tgz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d5a0c388314df4c2603ed9f4a7e2564e
+_md5_=602b41a35a512b2496553564a077d68b
diff --git a/metadata/md5-cache/net-analyzer/arpoison-0.7 b/metadata/md5-cache/net-analyzer/arpoison-0.7
index a2443919345e..f7f665136df7 100644
--- a/metadata/md5-cache/net-analyzer/arpoison-0.7
+++ b/metadata/md5-cache/net-analyzer/arpoison-0.7
@@ -4,10 +4,10 @@ DEPEND=net-libs/libnet:1.1
 DESCRIPTION=A utility to poison ARP caches
 EAPI=7
 HOMEPAGE=http://arpoison.sourceforge.net/ http://www.arpoison.net/
-KEYWORDS=amd64 ~arm ppc x86
+KEYWORDS=amd64 ~arm ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libnet:1.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/arpoison-0.7.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3393a2d862c97802a377f29873135ca4
+_md5_=54345566122dbdf6145099685ae6ad94
diff --git a/metadata/md5-cache/net-analyzer/arptools-1.0.2 b/metadata/md5-cache/net-analyzer/arptools-1.0.2
index f8e5c6ec94fb..0d5f89e56bb0 100644
--- a/metadata/md5-cache/net-analyzer/arptools-1.0.2
+++ b/metadata/md5-cache/net-analyzer/arptools-1.0.2
@@ -3,9 +3,9 @@ DEPEND=net-libs/libnet:1.1 net-libs/libpcap
 DESCRIPTION=a collection of libnet and libpcap based ARP utilities
 EAPI=5
 HOMEPAGE=https://github.com/burghardt/arptools
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=http://www.burghardt.pl/files/arptools-1.0.2.tar.gz
-_md5_=67d4e15c2c3d1d59b5c9c6d3951c1c62
+_md5_=5d27a5a10a02d359e883b6ac36a1e6ff
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r3 b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r3
deleted file mode 100644
index dc4e82d68b93..000000000000
--- a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst setup
-DEPEND=net-libs/libpcap sys-libs/ncurses:=
-DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address pairings
-EAPI=7
-HOMEPAGE=https://ee.lbl.gov/
-IUSE=selinux
-KEYWORDS=amd64 ~hppa ppc sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=net-libs/libpcap sys-libs/ncurses:= selinux? ( sec-policy/selinux-arpwatch ) virtual/mta
-SLOT=0
-SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-3.1.tar.gz https://dev.gentoo.org/~jer/ethercodes.dat-20200628.xz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=1262faba4c5adadb8d2a91b2bbd2b141
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r4 b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r4
new file mode 100644
index 000000000000..9aede6a3db56
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst
+DEPEND=acct-group/arpwatch net-libs/libpcap sys-libs/ncurses:=
+DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address pairings
+EAPI=7
+HOMEPAGE=https://ee.lbl.gov/
+IUSE=selinux
+KEYWORDS=amd64 ~hppa ppc ~riscv sparc x86
+LICENSE=BSD GPL-2
+RDEPEND=acct-group/arpwatch net-libs/libpcap sys-libs/ncurses:= acct-user/arpwatch selinux? ( sec-policy/selinux-arpwatch ) virtual/mta
+SLOT=0
+SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-3.1.tar.gz https://dev.gentoo.org/~jer/ethercodes.dat-20200628.xz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c958e1dfb2571cbaed4d2868477036f8
diff --git a/metadata/md5-cache/net-analyzer/bmon-4.0 b/metadata/md5-cache/net-analyzer/bmon-4.0
index cde4a11be9cf..101357cec1ee 100644
--- a/metadata/md5-cache/net-analyzer/bmon-4.0
+++ b/metadata/md5-cache/net-analyzer/bmon-4.0
@@ -5,10 +5,10 @@ DESCRIPTION=Interface bandwidth monitor
 EAPI=7
 HOMEPAGE=http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/
 IUSE=kernel_linux
-KEYWORDS=amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2 MIT
 RDEPEND=>=sys-libs/ncurses-5.3-r2:0= dev-libs/confuse:= dev-libs/libnl:3
 SLOT=0
 SRC_URI=https://codeload.github.com/tgraf/bmon/tar.gz/v4.0 -> bmon-4.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6c130689f70ed63bd132ea693fd658d
+_md5_=f651b5f7d3d4b06808f479ae57177d5a
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2 b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
index 159ceea0c86a..66e007f28fd8 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) syst
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/archive/0.11.2.tar.gz -> fail2ban-0.11.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=684b5d462fe0992a6db09da1e3cb546b
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-9999 b/metadata/md5-cache/net-analyzer/fail2ban-9999
index f14c8e164301..6acb67448711 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-9999
+++ b/metadata/md5-cache/net-analyzer/fail2ban-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_8? ( || ( dev-python/python-systemd[python_targets_python3_8(-)] sys-apps/systemd[python(-),python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( || ( dev-python/python-systemd[python_targets_python3_9(-)] sys-apps/systemd[python(-),python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91c1d170ce60bae90ddbe08618c73e12
diff --git a/metadata/md5-cache/net-analyzer/ibmonitor-1.4-r1 b/metadata/md5-cache/net-analyzer/ibmonitor-1.4-r1
index 3a68bf8a0707..eb672506c5b5 100644
--- a/metadata/md5-cache/net-analyzer/ibmonitor-1.4-r1
+++ b/metadata/md5-cache/net-analyzer/ibmonitor-1.4-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Interactive bandwidth monitor
 EAPI=7
 HOMEPAGE=http://ibmonitor.sourceforge.net
-KEYWORDS=~amd64 ~hppa ~ppc x86
+KEYWORDS=~amd64 ~hppa ~ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/TermReadKey
 SLOT=0
 SRC_URI=mirror://sourceforge/ibmonitor/ibmonitor-1.4.tar.gz
-_md5_=9dafce779e9e13a408461d6c8e55aabb
+_md5_=bad2dabf3e64141be2d9ccc5e1e7a059
diff --git a/metadata/md5-cache/net-analyzer/ifstat-1.1-r2 b/metadata/md5-cache/net-analyzer/ifstat-1.1-r2
index af5004f4d825..2842670618a1 100644
--- a/metadata/md5-cache/net-analyzer/ifstat-1.1-r2
+++ b/metadata/md5-cache/net-analyzer/ifstat-1.1-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Network interface bandwidth usage, with support for snmp targets
 EAPI=7
 HOMEPAGE=http://gael.roualland.free.fr/ifstat/
 IUSE=snmp
-KEYWORDS=~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=snmp? ( >=net-analyzer/net-snmp-5.0 )
 SLOT=0
 SRC_URI=http://gael.roualland.free.fr/ifstat/ifstat-1.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e75792da1dc7b93c8595d3c8bb440aee
+_md5_=f4595d3e88bc96ad334e71dec7f175b7
diff --git a/metadata/md5-cache/net-analyzer/ifstatus-2.0.0 b/metadata/md5-cache/net-analyzer/ifstatus-2.0.0
index 0c079a95d8ba..13dce29d3df8 100644
--- a/metadata/md5-cache/net-analyzer/ifstatus-2.0.0
+++ b/metadata/md5-cache/net-analyzer/ifstatus-2.0.0
@@ -4,10 +4,10 @@ DEPEND=>=sys-libs/ncurses-4.2:0=
 DESCRIPTION=A simple CLI program for displaying network statistics in real time
 EAPI=7
 HOMEPAGE=http://ifstatus.sourceforge.net/
-KEYWORDS=amd64 arm ~ppc x86
+KEYWORDS=amd64 arm ~ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-4.2:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/ifstatus/ifstatus-v2.0.0.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c0625bfc7dc3f5ccd9bbab28571b4f66
+_md5_=d2e553e994d59f914dc4fc9eb5e97a3b
diff --git a/metadata/md5-cache/net-analyzer/iplog-2.2.3-r3 b/metadata/md5-cache/net-analyzer/iplog-2.2.3-r3
new file mode 100644
index 000000000000..a7f375877cc9
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/iplog-2.2.3-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=net-libs/libpcap
+DESCRIPTION=TCP/IP traffic logger
+EAPI=8
+HOMEPAGE=http://ojnk.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~mips ~ppc ~sparc ~x86
+LICENSE=|| ( GPL-2 FDL-1.1 )
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=mirror://sourceforge/ojnk/iplog-2.2.3.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2c664ad87770c4981d4e73f05d71edbd
diff --git a/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1 b/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
deleted file mode 100644
index b2974a0ac855..000000000000
--- a/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Monitoring, processing and alerting on time series data
-EAPI=6
-HOMEPAGE=https://www.influxdata.com
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/influxdata/kapacitor/archive/v1.4.1.tar.gz -> kapacitor-1.4.1.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=fabc11f51ec713f1faba37b2c0415fdb
diff --git a/metadata/md5-cache/net-analyzer/kapacitor-1.5.1 b/metadata/md5-cache/net-analyzer/kapacitor-1.5.1
deleted file mode 100644
index 9abf1169ca03..000000000000
--- a/metadata/md5-cache/net-analyzer/kapacitor-1.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Monitoring, processing and alerting on time series data
-EAPI=6
-HOMEPAGE=https://www.influxdata.com
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/influxdata/kapacitor/archive/v1.5.1.tar.gz -> kapacitor-1.5.1.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=fabc11f51ec713f1faba37b2c0415fdb
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729 b/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
index 21e2a30df643..5c6898d5b167 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
+++ b/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linkchecker/linkchecker/archive/a977e4d7129450ba9fda8389724c80c1bde66883.tar.gz -> linkchecker-10.0.0_pre20200729.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fafc131786c70324095aa5c082bc0c7f
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-10.0.1 b/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
index 25da0f66e63b..94ec53c0d8f1 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
+++ b/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linkchecker/linkchecker/archive/v10.0.1.tar.gz -> linkchecker-10.0.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9754e534ea8547b7c133cba4ca7cfd64
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9999 b/metadata/md5-cache/net-analyzer/linkchecker-9999
index a1988867687f..2f9f1f868889 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-9999
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2fb533cb66ea018208dff010aab40bc4
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r4 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r4
deleted file mode 100644
index ec85b210cc54..000000000000
--- a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst preinst
-DEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] )
-DESCRIPTION=50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu
-EAPI=6
-HOMEPAGE=https://www.monitoring-plugins.org/
-IUSE=gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl
-KEYWORDS=amd64 ~arm ~arm64 sparc x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) !net-analyzer/nagios-plugins
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b92c83a3f5680627a0813824ed5b279e
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3
deleted file mode 100644
index 5ac921faefcd..000000000000
--- a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst
-DEPEND=dev-lang/perl curl? ( dev-libs/uriparser net-misc/curl ) ldap? ( net-nds/openldap ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] )
-DESCRIPTION=50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu
-EAPI=7
-HOMEPAGE=https://www.monitoring-plugins.org/
-IUSE=curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl
-KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl curl? ( dev-libs/uriparser net-misc/curl ) ldap? ( net-nds/openldap ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) acct-group/nagios acct-user/nagios !net-analyzer/nagios-plugins
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fd6f5f91aaf9b73b78478d0a033af528
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.1 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.1
index 6da1cbe237a3..b8df473b4cd9 100644
--- a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.1
+++ b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu
 EAPI=7
 HOMEPAGE=https://www.monitoring-plugins.org/
 IUSE=curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl
-KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl curl? ( dev-libs/uriparser net-misc/curl ) ldap? ( net-nds/openldap ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) acct-group/nagios acct-user/nagios !net-analyzer/nagios-plugins
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fd6f5f91aaf9b73b78478d0a033af528
+_md5_=d3615f4409c5ddeb1cd70e8b4176eeac
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.94 b/metadata/md5-cache/net-analyzer/mtr-0.94
index cfa51db94350..09868359769c 100644
--- a/metadata/md5-cache/net-analyzer/mtr-0.94
+++ b/metadata/md5-cache/net-analyzer/mtr-0.94
@@ -11,5 +11,5 @@ RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson ) n
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/traviscross/mtr/archive/v0.94.tar.gz -> mtr-0.94.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e9c225a302aaccd334f935b33baec7ce
diff --git a/metadata/md5-cache/net-analyzer/mtr-9999 b/metadata/md5-cache/net-analyzer/mtr-9999
index 178d6f9b422b..0b086fdf4891 100644
--- a/metadata/md5-cache/net-analyzer/mtr-9999
+++ b/metadata/md5-cache/net-analyzer/mtr-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson ) ncurses? ( sys-libs/ncurses:0= ) filecaps? ( sys-libs/libcap )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=38d6b3e0d322b93d76c2ce216505178c
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r2 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r2
deleted file mode 100644
index acce1017929b..000000000000
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) doc? ( app-doc/doxygen )
-DESCRIPTION=Software for generating and retrieving SNMP data
-EAPI=7
-HOMEPAGE=http://www.net-snmp.org/
-IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=HPND BSD GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
-RESTRICT=test
-SLOT=0/40
-SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jer/net-snmp-5.9.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=42535c50f67abdf33eab57a3296c48c2
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r3 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r3
deleted file mode 100644
index 4febdf07f651..000000000000
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 )
-DESCRIPTION=Software for generating and retrieving SNMP data
-EAPI=7
-HOMEPAGE=http://www.net-snmp.org/
-IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=HPND BSD GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
-RESTRICT=test
-SLOT=0/40
-SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jer/net-snmp-5.9.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0ada14094c22443c4decd80673e90f60
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4
new file mode 100644
index 000000000000..2739b2628e1c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) doc? ( app-doc/doxygen )
+DESCRIPTION=Software for generating and retrieving SNMP data
+EAPI=7
+HOMEPAGE=http://www.net-snmp.org/
+IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=HPND BSD GPL-2
+RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
+RESTRICT=test
+SLOT=0/40
+SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jer/net-snmp-5.9.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e92008102eaed9da0a3898d64b72bdf7
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5
new file mode 100644
index 000000000000..97d856a78c31
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 )
+DESCRIPTION=Software for generating and retrieving SNMP data
+EAPI=7
+HOMEPAGE=http://www.net-snmp.org/
+IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=HPND BSD GPL-2
+RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
+RESTRICT=test
+SLOT=0/40
+SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jer/net-snmp-5.9.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bd50abd66c53e5203733fb7662ee9325
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9.1 b/metadata/md5-cache/net-analyzer/net-snmp-5.9.1
deleted file mode 100644
index 3beea0385069..000000000000
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 )
-DESCRIPTION=Software for generating and retrieving SNMP data
-EAPI=7
-HOMEPAGE=http://www.net-snmp.org/
-IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=HPND BSD GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
-RESTRICT=test
-SLOT=0/40
-SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://github.com/net-snmp/net-snmp/archive/refs/tags/v5.9.1.tar.gz -> net-snmp-5.9.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d602b2dd0be55ec399ff7a31483962a3
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
new file mode 100644
index 000000000000..dec61e8d840d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 )
+DESCRIPTION=Software for generating and retrieving SNMP data
+EAPI=7
+HOMEPAGE=http://www.net-snmp.org/
+IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=HPND BSD GPL-2
+RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
+RESTRICT=test
+SLOT=0/40
+SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://github.com/net-snmp/net-snmp/archive/refs/tags/v5.9.1.tar.gz -> net-snmp-5.9.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c3d7bedab2290791a27b5800301752be
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-99999999 b/metadata/md5-cache/net-analyzer/net-snmp-99999999
index 0dd9434e95f8..b6caeef055ad 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-99999999
+++ b/metadata/md5-cache/net-analyzer/net-snmp-99999999
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 )
+DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 )
 DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=7
 HOMEPAGE=http://www.net-snmp.org/
 IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_single_target_python3_8 python_single_target_python3_9
 LICENSE=HPND BSD GPL-2
 PROPERTIES=live
-RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) 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] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/40
 SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bdd508f2e35de9585f67d053969ebd45
+_md5_=18d2a11745cf491b2c12f945b1b554e6
diff --git a/metadata/md5-cache/net-analyzer/netcat-110.20180111-r1 b/metadata/md5-cache/net-analyzer/netcat-110.20180111-r1
index 2b5eb301e5b2..15c278b35613 100644
--- a/metadata/md5-cache/net-analyzer/netcat-110.20180111-r1
+++ b/metadata/md5-cache/net-analyzer/netcat-110.20180111-r1
@@ -3,9 +3,9 @@ DESCRIPTION=The network swiss army knife
 EAPI=7
 HOMEPAGE=https://nc110.sourceforge.io
 IUSE=ipv6 static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris
 LICENSE=netcat
 SLOT=0
 SRC_URI=mirror://sourceforge/nc110/nc110.20180111.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd4b71dda7370b846fee010b547c28d8
+_md5_=3a461c20568d31c41c609ed9ad3cec2e
diff --git a/metadata/md5-cache/net-analyzer/netperf-2.7.0-r2 b/metadata/md5-cache/net-analyzer/netperf-2.7.0-r2
deleted file mode 100644
index 51c106947944..000000000000
--- a/metadata/md5-cache/net-analyzer/netperf-2.7.0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DESCRIPTION=Network performance benchmark
-EAPI=7
-HOMEPAGE=http://www.netperf.org/
-IUSE=demo sctp
-KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=netperf
-SLOT=0
-SRC_URI=ftp://ftp.netperf.org/netperf/netperf-2.7.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=11a23a10d9e2b987f4c4862206e86b05
diff --git a/metadata/md5-cache/net-analyzer/netperf-2.7.0-r3 b/metadata/md5-cache/net-analyzer/netperf-2.7.0-r3
new file mode 100644
index 000000000000..1f69393ef3c3
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netperf-2.7.0-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=acct-group/netperf acct-user/netperf
+DESCRIPTION=Network performance benchmark
+EAPI=7
+HOMEPAGE=http://www.netperf.org/
+IUSE=demo sctp
+KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+LICENSE=netperf
+RDEPEND=acct-group/netperf acct-user/netperf
+SLOT=0
+SRC_URI=ftp://ftp.netperf.org/netperf/netperf-2.7.0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=20745ec78f466306a194e5795e89d9a5
diff --git a/metadata/md5-cache/net-analyzer/scanlogd-2.2.7 b/metadata/md5-cache/net-analyzer/scanlogd-2.2.7
deleted file mode 100644
index 981986d2b141..000000000000
--- a/metadata/md5-cache/net-analyzer/scanlogd-2.2.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap )
-DESCRIPTION=A port scan detection tool
-EAPI=7
-HOMEPAGE=http://www.openwall.com/scanlogd/
-IUSE=+nids pcap savedconfig
-KEYWORDS=~amd64 ppc x86
-LICENSE=scanlogd GPL-2
-RDEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap )
-REQUIRED_USE=?? ( nids pcap )
-SLOT=0
-SRC_URI=http://www.openwall.com/scanlogd/scanlogd-2.2.7.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=6965d67671601b480b3f0f2cb7742328
diff --git a/metadata/md5-cache/net-analyzer/scanlogd-2.2.7-r1 b/metadata/md5-cache/net-analyzer/scanlogd-2.2.7-r1
new file mode 100644
index 000000000000..7d0b2eacd638
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/scanlogd-2.2.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap )
+DESCRIPTION=A port scan detection tool
+EAPI=7
+HOMEPAGE=http://www.openwall.com/scanlogd/
+IUSE=+nids pcap savedconfig
+KEYWORDS=~amd64 ppc x86
+LICENSE=scanlogd GPL-2
+RDEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap ) acct-group/scanlogd acct-user/scanlogd
+REQUIRED_USE=?? ( nids pcap )
+SLOT=0
+SRC_URI=http://www.openwall.com/scanlogd/scanlogd-2.2.7.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0d7bc737f7f0c10f93b92cf419463e31
diff --git a/metadata/md5-cache/net-analyzer/scanlogd-2.2.8 b/metadata/md5-cache/net-analyzer/scanlogd-2.2.8
deleted file mode 100644
index 396b2c771fd3..000000000000
--- a/metadata/md5-cache/net-analyzer/scanlogd-2.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap )
-DESCRIPTION=A port scan detection tool
-EAPI=7
-HOMEPAGE=https://www.openwall.com/scanlogd/
-IUSE=+nids pcap savedconfig
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=scanlogd GPL-2
-RDEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap )
-REQUIRED_USE=?? ( nids pcap )
-SLOT=0
-SRC_URI=https://www.openwall.com/scanlogd/scanlogd-2.2.8.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=5c8dba41b576fb19f8aadf55a354995e
diff --git a/metadata/md5-cache/net-analyzer/scanlogd-2.2.8-r1 b/metadata/md5-cache/net-analyzer/scanlogd-2.2.8-r1
new file mode 100644
index 000000000000..9a3849a95e5b
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/scanlogd-2.2.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap )
+DESCRIPTION=A port scan detection tool
+EAPI=7
+HOMEPAGE=https://www.openwall.com/scanlogd/
+IUSE=+nids pcap savedconfig
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=scanlogd GPL-2
+RDEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap ) acct-group/scanlogd acct-user/scanlogd
+REQUIRED_USE=?? ( nids pcap )
+SLOT=0
+SRC_URI=https://www.openwall.com/scanlogd/scanlogd-2.2.8.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=716b559a68aff0f13044f4a9f1c64a12
diff --git a/metadata/md5-cache/net-analyzer/scanssh-2.1.2 b/metadata/md5-cache/net-analyzer/scanssh-2.1.2
index 86492c36e61c..4fd1b9e1d8a9 100644
--- a/metadata/md5-cache/net-analyzer/scanssh-2.1.2
+++ b/metadata/md5-cache/net-analyzer/scanssh-2.1.2
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libdnet dev-libs/libevent:= net-libs/libpcap
 DESCRIPTION=network scanner that gathers info on SSH protocols and versions
 EAPI=7
 HOMEPAGE=https://github.com/ofalk/scanssh/
-KEYWORDS=amd64 ~hppa ppc ~ppc64 sparc x86
+KEYWORDS=amd64 ~hppa ppc ~ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=dev-libs/libdnet dev-libs/libevent:= net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/ofalk/scanssh/archive/2.1.2.tar.gz -> scanssh-2.1.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7a2209c5241359259a8e2c2ae3c54fbf
+_md5_=4aae83c0bb04b136ec40542969fe6831
diff --git a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r1 b/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r1
deleted file mode 100644
index eb98652f5665..000000000000
--- a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=Sensor part of sguil Network Security Monitoring
-EAPI=7
-HOMEPAGE=https://github.com/bammv/sguil
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 GPL-2+ QPL-1.0 GPL-2
-RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tls >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml net-analyzer/sancp
-SLOT=0
-SRC_URI=https://github.com/bammv/sguil/archive/v1.0.0.tar.gz -> sguil-1.0.0.tar.gz
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=e4a8fe13fd848a79ed3248ec43beb497
diff --git a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r2 b/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r2
new file mode 100644
index 000000000000..0130a5d59626
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=acct-group/sguil acct-user/sguil
+DESCRIPTION=Sensor part of sguil Network Security Monitoring
+EAPI=7
+HOMEPAGE=https://github.com/bammv/sguil
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 GPL-2+ QPL-1.0 GPL-2
+RDEPEND=acct-group/sguil acct-user/sguil >=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tls >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml net-analyzer/sancp
+SLOT=0
+SRC_URI=https://github.com/bammv/sguil/archive/v1.0.0.tar.gz -> sguil-1.0.0.tar.gz
+_md5_=c17c415a2af0d8ba45bb94e68e2e804d
diff --git a/metadata/md5-cache/net-analyzer/smokeping-2.7.3 b/metadata/md5-cache/net-analyzer/smokeping-2.7.3
deleted file mode 100644
index d601b5053857..000000000000
--- a/metadata/md5-cache/net-analyzer/smokeping-2.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet dev-perl/CGI-Fast !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius )
-DESCRIPTION=A powerful latency measurement tool
-EAPI=7
-HOMEPAGE=https://oss.oetiker.ch/smokeping/
-IUSE=apache2 curl dig echoping ipv6 radius
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet dev-perl/CGI-Fast !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius ) virtual/tmpfiles
-SLOT=0
-SRC_URI=https://oss.oetiker.ch/smokeping/pub/smokeping-2.7.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=b5a94ecc4c84cbc4408db8ef060cf87f
diff --git a/metadata/md5-cache/net-analyzer/smokeping-2.7.3-r1 b/metadata/md5-cache/net-analyzer/smokeping-2.7.3-r1
new file mode 100644
index 000000000000..739fc0f46cac
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/smokeping-2.7.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=acct-group/smokeping acct-user/smokeping >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet dev-perl/CGI-Fast !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius )
+DESCRIPTION=A powerful latency measurement tool
+EAPI=7
+HOMEPAGE=https://oss.oetiker.ch/smokeping/
+IUSE=apache2 curl dig echoping ipv6 radius
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=acct-group/smokeping acct-user/smokeping >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet dev-perl/CGI-Fast !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius ) virtual/tmpfiles
+SLOT=0
+SRC_URI=https://oss.oetiker.ch/smokeping/pub/smokeping-2.7.3.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=03c847b6861f78d32038af4eb2b2da3d
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.99.1 b/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
index 3fe59b436841..88ca3d25317d 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
@@ -5,7 +5,7 @@ DESCRIPTION=A tool for network monitoring and data acquisition
 EAPI=7
 HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
 IUSE=+drop-root +smi +ssl +samba suid test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=net-libs/libpcap drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m:0= ) suid? ( acct-group/pcap acct-user/pcap )
 REQUIRED_USE=test? ( samba )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz -> tcpdump-4.99.1-upstream.tar.gz verify-sig? ( https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz.sig -> tcpdump-4.99.1-upstream.tar.gz.sig )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=706f8da60181b9aa8780c50dfdfaf62a
+_md5_=415c2d21b4fce5482f9a0be255d69a43
diff --git a/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r3 b/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r3
index c09ae09b4aec..cae25a09e6dc 100644
--- a/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r3
+++ b/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r3
@@ -4,11 +4,11 @@ DEPEND=net-libs/libnet:1.1 net-libs/libpcap
 DESCRIPTION=tcptraceroute is a traceroute implementation using TCP packets
 EAPI=7
 HOMEPAGE=https://github.com/mct/tcptraceroute
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mct/tcptraceroute/archive/tcptraceroute-1.5beta7.tar.gz -> tcptraceroute-1.5_beta7.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea58d546f8c9bf99ddafd982ca802c2d
+_md5_=32091855fd4c8f0eadc766e52cbefcdf
diff --git a/metadata/md5-cache/net-analyzer/traceroute-2.1.0 b/metadata/md5-cache/net-analyzer/traceroute-2.1.0
index 5b4df3c59773..8e524233d605 100644
--- a/metadata/md5-cache/net-analyzer/traceroute-2.1.0
+++ b/metadata/md5-cache/net-analyzer/traceroute-2.1.0
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to trace the route of IP packets
 EAPI=6
 HOMEPAGE=http://traceroute.sourceforge.net/
 IUSE=static
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!<net-misc/iputils-20121221-r1 !net-misc/iputils[traceroute6]
 SLOT=0
 SRC_URI=mirror://sourceforge/traceroute/traceroute-2.1.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bbfee488a8fa46224a697b899ab6933b
+_md5_=5ef061f839b4078a916466c9c2e394f4
diff --git a/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1 b/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
index c472b3d0209a..c5860d1c54c3 100644
--- a/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
+++ b/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Traceroute with AS lookup, TOS support, MTU discovery and other features
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~arm ~ppc x86
+KEYWORDS=amd64 ~arm ~ppc ~riscv x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/traceroute-nanog_6.4.2.orig.tar.gz https://dev.gentoo.org/~jer/traceroute-nanog_6.4.2-1.diff.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c10fc1e6d869e89027923bd6f336ebd8
+_md5_=6c7d166dc10aa0f709129345762a2225
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.6 b/metadata/md5-cache/net-analyzer/wireshark-3.4.6
index 0c5b442cda65..9be1c91beaac 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.6
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.6
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/3.4.6
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.6.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f0aec676a35f37bfdc380aa76d50aa07
+_md5_=9d9f54fded9147abdf996a154c847168
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.7 b/metadata/md5-cache/net-analyzer/wireshark-3.4.7
new file mode 100644
index 000000000000..2fbf9601b117
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=7
+HOMEPAGE=https://www.wireshark.org/
+IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps lua_single_target_lua5-1 lua_single_target_lua5-2
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) plugin-ifdemo? ( plugins )
+RESTRICT=test
+SLOT=0/3.4.7
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.7.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=003af61fe9e05aa0dd1a60a01c4d93af
diff --git a/metadata/md5-cache/net-analyzer/wireshark-9999 b/metadata/md5-cache/net-analyzer/wireshark-9999
index 3277e9e191ca..fe2aab2cf385 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-9999
+++ b/metadata/md5-cache/net-analyzer/wireshark-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) p
 RESTRICT=test
 SLOT=0/9999
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4622edbe6d4a821ebb3df2df6102d562
+_md5_=003af61fe9e05aa0dd1a60a01c4d93af
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 761dce58db8e..7b1a93104a48 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.9-r3 b/metadata/md5-cache/net-dialup/ppp-2.4.9-r3
deleted file mode 100644
index 95211e72a58c..000000000000
--- a/metadata/md5-cache/net-dialup/ppp-2.4.9-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam )
-DESCRIPTION=Point-to-Point Protocol (PPP)
-EAPI=7
-HOMEPAGE=https://ppp.samba.org/
-IUSE=activefilter atm dhcp +eap-tls gtk ipv6 pam radius kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD GPL-2
-PDEPEND=net-dialup/ppp-scripts
-RDEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam ) !<net-misc/netifrc-0.7.1-r2
-SLOT=0/2.4.9
-SRC_URI=https://github.com/paulusmack/ppp/archive/ppp-2.4.9.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.9-patches-02.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f08f90295d57d2e1f839655b0aee3712
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.9-r4 b/metadata/md5-cache/net-dialup/ppp-2.4.9-r4
new file mode 100644
index 000000000000..fc6c7680a00c
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.9-r4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam )
+DESCRIPTION=Point-to-Point Protocol (PPP)
+EAPI=7
+HOMEPAGE=https://ppp.samba.org/
+IUSE=activefilter atm dhcp +eap-tls gtk ipv6 pam radius kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=BSD GPL-2
+PDEPEND=net-dialup/ppp-scripts
+RDEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam ) !<net-misc/netifrc-0.7.1-r2
+SLOT=0/2.4.9
+SRC_URI=https://github.com/paulusmack/ppp/archive/ppp-2.4.9.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.9-patches-03.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b39e126c9f0f18196a9c4ddf5334b822
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 2b5a54f23be8..e7ea1e367792 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r35 b/metadata/md5-cache/net-dns/djbdns-1.05-r35
index 3880de7f713a..deea8085736d 100644
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r35
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r35
@@ -3,10 +3,10 @@ DESCRIPTION=Collection of DNS client/server software
 EAPI=7
 HOMEPAGE=http://cr.yp.to/djbdns.html
 IUSE=ipv6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc ppc64 sparc x86
 LICENSE=public-domain
 RDEPEND=acct-user/dnscache acct-user/dnslog acct-user/tinydns sys-apps/ucspi-tcp virtual/daemontools selinux? ( sec-policy/selinux-djbdns )
 SLOT=0
 SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz http://smarden.org/pape/djb/manpages/djbdns-1.05-man.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test28.diff.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=36972b6060a9641e12a0b76cf6eaee0d
+_md5_=ee89c067d5c08dc0d69fd0395c109b8d
diff --git a/metadata/md5-cache/net-dns/getdns-1.5.1 b/metadata/md5-cache/net-dns/getdns-1.5.1
deleted file mode 100644
index c45b155bd8ba..000000000000
--- a/metadata/md5-cache/net-dns/getdns-1.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) filecaps? ( sys-libs/libcap ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-libs/libbsd:= dev-libs/libyaml:= idn? ( net-dns/libidn2:= ) dev-libs/openssl:0= libev? ( dev-libs/libev:= ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) unbound? ( >=net-dns/unbound-1.4.16:= )
-DESCRIPTION=Modern asynchronous DNS API
-EAPI=7
-HOMEPAGE=https://getdnsapi.net/
-IUSE=doc +getdns-query +getdns-server-mon +idn libev libevent libuv static-libs stubby +threads +unbound +filecaps
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libbsd:= dev-libs/libyaml:= idn? ( net-dns/libidn2:= ) dev-libs/openssl:0= libev? ( dev-libs/libev:= ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) unbound? ( >=net-dns/unbound-1.4.16:= ) stubby? ( sys-libs/libcap:= ) filecaps? ( sys-libs/libcap ) virtual/tmpfiles
-RESTRICT=test
-SLOT=0
-SRC_URI=https://getdnsapi.net/releases/getdns-1-5-1/getdns-1.5.1.tar.gz
-_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=b531d3350862230812435c117ecc6222
diff --git a/metadata/md5-cache/net-dns/getdns-1.5.2-r2 b/metadata/md5-cache/net-dns/getdns-1.5.2-r2
deleted file mode 100644
index dc3b44a8e0d3..000000000000
--- a/metadata/md5-cache/net-dns/getdns-1.5.2-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) filecaps? ( sys-libs/libcap ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-libs/libbsd:= dev-libs/libyaml:= idn? ( net-dns/libidn2:= ) !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:0=[dane] ) libev? ( dev-libs/libev:= ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) nettle? ( dev-libs/nettle:0= ) unbound? ( >=net-dns/unbound-1.4.16:= )
-DESCRIPTION=Modern asynchronous DNS API
-EAPI=7
-HOMEPAGE=https://getdnsapi.net/
-IUSE=doc +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv nettle static-libs stubby +threads +unbound +filecaps
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libbsd:= dev-libs/libyaml:= idn? ( net-dns/libidn2:= ) !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:0=[dane] ) libev? ( dev-libs/libev:= ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) nettle? ( dev-libs/nettle:0= ) unbound? ( >=net-dns/unbound-1.4.16:= ) stubby? ( sys-libs/libcap:= ) filecaps? ( sys-libs/libcap ) virtual/tmpfiles
-REQUIRED_USE=gnutls? ( nettle )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://getdnsapi.net/releases/getdns-1-5-2/getdns-1.5.2.tar.gz
-_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=a12294cd6d77c9b6f661be65d540d2ef
diff --git a/metadata/md5-cache/net-dns/getdns-1.6.0_beta1-r2 b/metadata/md5-cache/net-dns/getdns-1.6.0_beta1-r2
deleted file mode 100644
index ffb1ae3bc538..000000000000
--- a/metadata/md5-cache/net-dns/getdns-1.6.0_beta1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake filecaps? ( sys-libs/libcap ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libbsd dev-libs/libyaml dev-libs/openssl:= idn? ( net-dns/libidn2:= ) gnutls? ( net-libs/gnutls:0=[dane,openssl] dev-libs/nettle:0= ) libev? ( dev-libs/libev:= ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) >=net-dns/unbound-1.5.9:=
-DESCRIPTION=Modern asynchronous DNS API
-EAPI=7
-HOMEPAGE=https://getdnsapi.net/
-IUSE=doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby +unbound +filecaps
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libbsd dev-libs/libyaml dev-libs/openssl:= idn? ( net-dns/libidn2:= ) gnutls? ( net-libs/gnutls:0=[dane,openssl] dev-libs/nettle:0= ) libev? ( dev-libs/libev:= ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) >=net-dns/unbound-1.5.9:= stubby? ( acct-group/stubby acct-user/stubby sys-libs/libcap ) filecaps? ( sys-libs/libcap ) virtual/tmpfiles
-RESTRICT=test
-SLOT=0
-SRC_URI=https://getdnsapi.net/releases/getdns-1-6-0-beta-1/getdns-1.6.0-beta.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1b421e6939d1d4e80d533830b46f4f3b
diff --git a/metadata/md5-cache/net-dns/getdns-1.7.0 b/metadata/md5-cache/net-dns/getdns-1.7.0
index b8ff6fd11b84..2e9ad2489a67 100644
--- a/metadata/md5-cache/net-dns/getdns-1.7.0
+++ b/metadata/md5-cache/net-dns/getdns-1.7.0
@@ -5,11 +5,11 @@ DESCRIPTION=Modern asynchronous DNS API
 EAPI=7
 HOMEPAGE=https://getdnsapi.net/
 IUSE=doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound +filecaps
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libbsd dev-libs/libyaml dev-libs/openssl:= idn? ( net-dns/libidn2:= ) gnutls? ( net-libs/gnutls:0=[dane,openssl] dev-libs/nettle:0= ) libev? ( dev-libs/libev:= ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) test? ( dev-libs/check ) >=net-dns/unbound-1.5.9:= stubby? ( acct-group/stubby acct-user/stubby sys-libs/libcap ) filecaps? ( sys-libs/libcap ) virtual/tmpfiles
 RESTRICT=test
 SLOT=0
 SRC_URI=https://getdnsapi.net/releases/getdns-1-7-0/getdns-1.7.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8cf8ee28dd8e697fa8a840eb5dc666aa
+_md5_=fd4001f79a2df1e7aa4420feab3c5923
diff --git a/metadata/md5-cache/net-dns/knot-3.0.7 b/metadata/md5-cache/net-dns/knot-3.0.7
new file mode 100644
index 000000000000..4cae4ef0c94d
--- /dev/null
+++ b/metadata/md5-cache/net-dns/knot-3.0.7
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=High-performance authoritative-only DNS server
+EAPI=7
+HOMEPAGE=https://www.knot-dns.cz/
+IUSE=doc caps +fastparser idn +libidn2 systemd +utils +cookies +dnsproxy dnstap geoip +noudp +onlinesign +queryacl +rrl +stats +synthrecord +whoami
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
+SLOT=0
+SRC_URI=https://secure.nic.cz/files/knot-dns/knot-3.0.7.tar.xz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=abd3645bac18d4bea2c262febb9e2853
diff --git a/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1 b/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
deleted file mode 100644
index cfaf383979cf..000000000000
--- a/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) test? ( app-text/trang ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( dev-db/mysql-connector-c:0= dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
-DESCRIPTION=An open-source turn-key solution for DNSSEC
-EAPI=7
-HOMEPAGE=https://www.opendnssec.org/
-IUSE=debug doc +mysql readline +signer sqlite test +softhsm opensc external-hsm
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2
-RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( dev-db/mysql-connector-c:0= dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
-REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.opendnssec.org/files/source/opendnssec-2.0.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=bf450f721f9aaa133cc5e1062c3207b9
diff --git a/metadata/md5-cache/net-dns/opendnssec-2.0.3-r2 b/metadata/md5-cache/net-dns/opendnssec-2.0.3-r2
new file mode 100644
index 000000000000..7fb2e6536b69
--- /dev/null
+++ b/metadata/md5-cache/net-dns/opendnssec-2.0.3-r2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen ) test? ( app-text/trang ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-group/opendnssec acct-user/opendnssec dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( dev-db/mysql-connector-c:0= dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
+DESCRIPTION=An open-source turn-key solution for DNSSEC
+EAPI=7
+HOMEPAGE=https://www.opendnssec.org/
+IUSE=debug doc +mysql readline +signer sqlite test +softhsm opensc external-hsm
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=acct-group/opendnssec acct-user/opendnssec dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( dev-db/mysql-connector-c:0= dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
+REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.opendnssec.org/files/source/opendnssec-2.0.3.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dde8a5260974bd191bc20d009d317528
diff --git a/metadata/md5-cache/net-dns/pdns-4.5.0 b/metadata/md5-cache/net-dns/pdns-4.5.0
new file mode 100644
index 000000000000..4fe44897ee1e
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-4.5.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= >=dev-libs/boost-1.35:= lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 )
+DESCRIPTION=The PowerDNS Daemon
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=debug doc geoip ldap lua-records mydns mysql postgres remote sodium sqlite systemd tools tinydns test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= >=dev-libs/boost-1.35:= lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) acct-user/pdns acct-group/pdns
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) mydns? ( mysql )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-4.5.0.tar.bz2
+_eclasses_=lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=99c82286a9231ad60fc9fd830dcb8094
diff --git a/metadata/md5-cache/net-dns/pdns-4.5.0_rc2 b/metadata/md5-cache/net-dns/pdns-4.5.0_rc2
deleted file mode 100644
index 4c1e7e3037db..000000000000
--- a/metadata/md5-cache/net-dns/pdns-4.5.0_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install postinst setup
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= >=dev-libs/boost-1.35:= lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 )
-DESCRIPTION=The PowerDNS Daemon
-EAPI=7
-HOMEPAGE=https://www.powerdns.com/
-IUSE=debug doc geoip ldap lua-records mydns mysql postgres remote sodium sqlite systemd tools tinydns test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
-LICENSE=GPL-2
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= >=dev-libs/boost-1.35:= lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) acct-user/pdns acct-group/pdns
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) mydns? ( mysql )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/pdns-4.5.0-rc2.tar.bz2
-_eclasses_=lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5421ad9691efdff7b567ae72ca5a3c7e
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 67ac0a986327..0f8d139c1881 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3 b/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
index 24b649154d43..5a4c95e0a1ac 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
+++ b/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.7.1.tar.gz -> firewalld-0.7.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7d189068e627ae9851707538e39b41a9
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1 b/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
index 81e13c878cee..6f5e906f8941 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.7.3.tar.gz -> firewalld-0.7.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=391e9778c463824473c47fef182340fa
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.9.1-r1 b/metadata/md5-cache/net-firewall/firewalld-0.9.1-r1
index c4832170d52b..9f5ccc7b9d71 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.9.1-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.9.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.9.1.tar.gz -> firewalld-0.9.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5da17a6fc8a78143ba503e107551f20a
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1 b/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
index 9c85c47b9180..38d7f75624d6 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.9.3.tar.gz -> firewalld-0.9.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b3ad74e6bac8bc3a34b71ba062f7afba
diff --git a/metadata/md5-cache/net-firewall/ufw-0.36 b/metadata/md5-cache/net-firewall/ufw-0.36
index fbe13964fcf9..2f2deed54b59 100644
--- a/metadata/md5-cache/net-firewall/ufw-0.36
+++ b/metadata/md5-cache/net-firewall/ufw-0.36
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e9d27fbc8c007d82598a32dca619993f
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 70978fb0b594..70ddde763e56 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.11 b/metadata/md5-cache/net-fs/cifs-utils-6.11
index f0bea042db5b..cde6ced97622 100644
--- a/metadata/md5-cache/net-fs/cifs-utils-6.11
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.11
@@ -12,5 +12,5 @@ RDEPEND=!net-fs/mount-cifs sys-apps/keyutils:= ads? ( sys-libs/talloc virtual/kr
 REQUIRED_USE=acl? ( ads )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.11.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=225ef0bc010017fc2bb2aaf2b13fbf6b
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.12 b/metadata/md5-cache/net-fs/cifs-utils-6.12
index d924f167c385..74b82def5c1d 100644
--- a/metadata/md5-cache/net-fs/cifs-utils-6.12
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.12
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=acl? ( ads ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.12.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=195f8abbc1e796cfa10baa40afa89fd3
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.7.3 b/metadata/md5-cache/net-fs/cvmfs-2.7.3
index bea22bb6ca00..4d39a5feefbb 100644
--- a/metadata/md5-cache/net-fs/cvmfs-2.7.3
+++ b/metadata/md5-cache/net-fs/cvmfs-2.7.3
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
 SLOT=0
 SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.7.3/source.tar.gz -> cvmfs-2.7.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=18161a6aeb1e42293bb91404dcb019c6
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.8.1 b/metadata/md5-cache/net-fs/cvmfs-2.8.1
index bd91607c50a0..3fd04b985900 100644
--- a/metadata/md5-cache/net-fs/cvmfs-2.8.1
+++ b/metadata/md5-cache/net-fs/cvmfs-2.8.1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
 SLOT=0
 SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.8.1/source.tar.gz -> cvmfs-2.8.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=35ca3f571befe5270fcbc0adf80ed672
diff --git a/metadata/md5-cache/net-fs/samba-4.13.10-r1 b/metadata/md5-cache/net-fs/samba-4.13.10-r1
new file mode 100644
index 000000000000..009ecb9a8349
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.13.10-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.2.1[ldap(+)?,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/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),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_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.2.1[ldap(+)?,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/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.13.10.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2f14dd940c22db1c3bbd0e6e837d5cb7
diff --git a/metadata/md5-cache/net-fs/samba-4.13.9-r1 b/metadata/md5-cache/net-fs/samba-4.13.9-r1
deleted file mode 100644
index 22031057718d..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.13.9-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.2.1[ldap(+)?,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/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
-DESCRIPTION=Samba Suite Version 4
-EAPI=7
-HOMEPAGE=https://samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.2.1[ldap(+)?,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/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.13.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=adc345cd61193a6b65f1e3790ceaafd6
diff --git a/metadata/md5-cache/net-fs/samba-4.13.9-r2 b/metadata/md5-cache/net-fs/samba-4.13.9-r2
new file mode 100644
index 000000000000..5f94277f80ce
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.13.9-r2
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.2.1[ldap(+)?,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/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),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_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.2.1[ldap(+)?,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/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.13.9.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=da469f371c6ffc1f34d7e4e5d4a75998
diff --git a/metadata/md5-cache/net-fs/samba-4.14.4-r1 b/metadata/md5-cache/net-fs/samba-4.14.4-r1
deleted file mode 100644
index 8c0d6331d865..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.14.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.3.0[ldap(+)?,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/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
-DESCRIPTION=Samba Suite Version 4
-EAPI=7
-HOMEPAGE=https://samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.3.0[ldap(+)?,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/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.14.4.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e9ad778bae0e8519c63cf84e389d1fbe
diff --git a/metadata/md5-cache/net-fs/samba-4.14.4-r2 b/metadata/md5-cache/net-fs/samba-4.14.4-r2
new file mode 100644
index 000000000000..2773c648e447
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.14.4-r2
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.3.0[ldap(+)?,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/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),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_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.3.0[ldap(+)?,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/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.14.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=593b364c03cf9e2c3f7625eff1da3055
diff --git a/metadata/md5-cache/net-fs/samba-4.14.5-r1 b/metadata/md5-cache/net-fs/samba-4.14.5-r1
deleted file mode 100644
index 864875bfe447..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.14.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.3.0[ldap(+)?,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/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
-DESCRIPTION=Samba Suite Version 4
-EAPI=7
-HOMEPAGE=https://samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.3.0[ldap(+)?,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/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.14.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e9ad778bae0e8519c63cf84e389d1fbe
diff --git a/metadata/md5-cache/net-fs/samba-4.14.5-r2 b/metadata/md5-cache/net-fs/samba-4.14.5-r2
new file mode 100644
index 000000000000..87a0d5be0c2c
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.14.5-r2
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.3.0[ldap(+)?,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/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),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_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.3.0[ldap(+)?,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/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.14.5.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=593b364c03cf9e2c3f7625eff1da3055
diff --git a/metadata/md5-cache/net-fs/samba-4.14.6-r1 b/metadata/md5-cache/net-fs/samba-4.14.6-r1
new file mode 100644
index 000000000000..652fd64a5f0d
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.14.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.3.0[ldap(+)?,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/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),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_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.3.0[ldap(+)?,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/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.14.6.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=593b364c03cf9e2c3f7625eff1da3055
diff --git a/metadata/md5-cache/net-fs/samba-4.15.0_rc1-r1 b/metadata/md5-cache/net-fs/samba-4.15.0_rc1-r1
new file mode 100644
index 000000000000..3eccc6a4f1e1
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.15.0_rc1-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.4.0[ldap(+)?,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/ldb-2.5.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.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(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),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_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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/e2fsprogs-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/ldb-2.4.0[ldap(+)?,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/ldb-2.5.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[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/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.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(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-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(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/rc/samba-4.15.0rc1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0a2f6fe7727c508b5a0294a23ee5af4e
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index a2ad8ae57df5..f25c702cd7ab 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/yafc-1.3.7-r1 b/metadata/md5-cache/net-ftp/yafc-1.3.7-r1
index 4253d929caa3..240fafe2b7f1 100644
--- a/metadata/md5-cache/net-ftp/yafc-1.3.7-r1
+++ b/metadata/md5-cache/net-ftp/yafc-1.3.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= dev-libs/libbsd dev-libs/openssl:0= kerberos? ( virtual/krb5 ) readline? ( >=sys-libs/readline-6:0= ) socks5? ( net-proxy/dante ) ssh? ( net-libs/libssh )
 SLOT=0
 SRC_URI=http://www.yafc-ftp.com/downloads/yafc-1.3.7.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=34333c6465a2de682c71472582272415
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 09d8033fc70b..2cbb368f4dfa 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/discord-bin-0.0.15 b/metadata/md5-cache/net-im/discord-bin-0.0.15
index 0cc466e6771f..5a1b55f593ed 100644
--- a/metadata/md5-cache/net-im/discord-bin-0.0.15
+++ b/metadata/md5-cache/net-im/discord-bin-0.0.15
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://dl.discordapp.net/apps/linux/0.0.15/discord-0.0.15.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=42a7354d1627ca29de91890788b939fb
diff --git a/metadata/md5-cache/net-im/gitter-bin-4.1.0-r1 b/metadata/md5-cache/net-im/gitter-bin-4.1.0-r1
index 1a8160d3268a..853da75c3193 100644
--- a/metadata/md5-cache/net-im/gitter-bin-4.1.0-r1
+++ b/metadata/md5-cache/net-im/gitter-bin-4.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://update.gitter.im/linux64/gitter_4.1.0_amd64.deb ) x86? ( https://update.gitter.im/linux32/gitter_4.1.0_i386.deb )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=324d1913cef68fa86dfbed4de2c6f6af
diff --git a/metadata/md5-cache/net-im/gitter-bin-5.0.1 b/metadata/md5-cache/net-im/gitter-bin-5.0.1
index 29c56d555772..65c336223214 100644
--- a/metadata/md5-cache/net-im/gitter-bin-5.0.1
+++ b/metadata/md5-cache/net-im/gitter-bin-5.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://update.gitter.im/linux64/gitter_5.0.1_amd64.deb ) x86? ( https://update.gitter.im/linux32/gitter_5.0.1_i386.deb )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fad2b973564315ea27f4bb8867cb50c4
diff --git a/metadata/md5-cache/net-im/neochat-1.1.1 b/metadata/md5-cache/net-im/neochat-1.1.1
deleted file mode 100644
index 4e8623c63776..000000000000
--- a/metadata/md5-cache/net-im/neochat-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.77.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/cmark:= dev-libs/qtkeychain:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.77.0:5 >=kde-frameworks/kcoreaddons-5.77.0:5 >=kde-frameworks/kdbusaddons-5.77.0:5 >=kde-frameworks/ki18n-5.77.0:5 >=kde-frameworks/kirigami-5.77.0:5 >=kde-frameworks/knotifications-5.77.0:5 media-libs/kquickimageeditor:5 >=net-libs/libquotient-0.6 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Client for Matrix, the decentralized communication protocol
-EAPI=7
-HOMEPAGE=https://apps.kde.org/neochat/
-IUSE=debug
-KEYWORDS=~amd64 ~ppc64
-LICENSE=GPL-3
-RDEPEND=app-text/cmark:= dev-libs/qtkeychain:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.77.0:5 >=kde-frameworks/kcoreaddons-5.77.0:5 >=kde-frameworks/kdbusaddons-5.77.0:5 >=kde-frameworks/ki18n-5.77.0:5 >=kde-frameworks/kirigami-5.77.0:5 >=kde-frameworks/knotifications-5.77.0:5 media-libs/kquickimageeditor:5 >=net-libs/libquotient-0.6 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5[qml] >=kde-frameworks/kitemmodels-5.77.0:5[qml] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=0
-SRC_URI=mirror://kde/stable/neochat/1.1.1/neochat-1.1.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a3fa3f3da1b99371f1a8b605d9c6d3ca
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.5 b/metadata/md5-cache/net-im/pidgin-2.14.5
index 7411c01f5217..9f90178abef7 100644
--- a/metadata/md5-cache/net-im/pidgin-2.14.5
+++ b/metadata/md5-cache/net-im/pidgin-2.14.5
@@ -5,11 +5,11 @@ DESCRIPTION=GTK Instant Messenger client
 EAPI=7
 HOMEPAGE=https://pidgin.im/
 IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:0=[unicode] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= )
 REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.5.tar.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b9cdb3fb491cf8da885f34a1c2ab5e33
+_md5_=82bb7c67a8a160b4c889fc0aa6e6c52d
diff --git a/metadata/md5-cache/net-im/poezio-0.13.1-r1 b/metadata/md5-cache/net-im/poezio-0.13.1-r1
index 56f71cc82afe..2f5348517b76 100644
--- a/metadata/md5-cache/net-im/poezio-0.13.1-r1
+++ b/metadata/md5-cache/net-im/poezio-0.13.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/aiodns[python_targets_python3_8(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?] dev-python/pyasn1[python_targets_python3_8(-)?] >=dev-python/slixmpp-1.5.0[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=test? ( dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/slixmpp-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Console XMPP client that looks like most famous IRC clients
 EAPI=7
 HOMEPAGE=https://poez.io/
-IUSE=test python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64
 LICENSE=ZLIB
-RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?] dev-python/pyasn1[python_targets_python3_8(-)?] >=dev-python/slixmpp-1.5.0[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/slixmpp-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poezio/poezio-0.13.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=44b2a3dc398a5f5cc8c554bd0ba3d7f2
+_md5_=5eb5112de89653563f3557fb445502a3
diff --git a/metadata/md5-cache/net-im/poezio-0.13.1-r2 b/metadata/md5-cache/net-im/poezio-0.13.1-r2
new file mode 100644
index 000000000000..95685b858dfd
--- /dev/null
+++ b/metadata/md5-cache/net-im/poezio-0.13.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/slixmpp-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Console XMPP client that looks like most famous IRC clients
+EAPI=7
+HOMEPAGE=https://poez.io/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=ZLIB
+RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/slixmpp-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/poezio/poezio-0.13.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=97262b7c9c72c910db95d41a0578ae15
diff --git a/metadata/md5-cache/net-im/poezio-9999 b/metadata/md5-cache/net-im/poezio-9999
index 351d5732b0ff..b7f59831d476 100644
--- a/metadata/md5-cache/net-im/poezio-9999
+++ b/metadata/md5-cache/net-im/poezio-9999
@@ -1,14 +1,15 @@
-BDEPEND=test? ( dev-python/aiodns[python_targets_python3_8(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?] dev-python/pyasn1[python_targets_python3_8(-)?] >=dev-python/slixmpp-1.5.2[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare test unpack
+BDEPEND=dev-python/sphinx test? ( dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/slixmpp-1.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Console XMPP client that looks like most famous IRC clients
 EAPI=7
 HOMEPAGE=https://poez.io/
-IUSE=test python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=ZLIB
 PROPERTIES=live
-RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?] dev-python/pyasn1[python_targets_python3_8(-)?] >=dev-python/slixmpp-1.5.2[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/slixmpp-1.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b6457e5948271ccefc5b2714dfb690ee
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ac57cdea6d95e59ac37b4b6cea7818c6
diff --git a/metadata/md5-cache/net-im/ricochet-1.1.4 b/metadata/md5-cache/net-im/ricochet-1.1.4
index 8328b407fb59..c0597e889d72 100644
--- a/metadata/md5-cache/net-im/ricochet-1.1.4
+++ b/metadata/md5-cache/net-im/ricochet-1.1.4
@@ -5,10 +5,10 @@ DESCRIPTION=Privacy-focused instant messaging through Tor hidden services
 EAPI=7
 HOMEPAGE=https://ricochet.im
 IUSE=debug hardened
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 net-vpn/tor
 SLOT=0
 SRC_URI=https://github.com/ricochet-im/ricochet/archive/v1.1.4.tar.gz -> ricochet-1.1.4.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=07d9b8e4f160b67f124004690214a246
+_md5_=ea882b680903b28c84f3ad2b35524087
diff --git a/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.2.3 b/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.2.3
new file mode 100644
index 000000000000..882d0f47988e
--- /dev/null
+++ b/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.2.3
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/rpm2targz
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Ultimate Open Source Web Chat Platform
+EAPI=7
+HOMEPAGE=https://rocket.chat
+KEYWORDS=-* ~amd64
+LICENSE=MIT
+RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/libappindicator dev-libs/nspr dev-libs/nss media-fonts/noto-emoji media-libs/alsa-lib net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango
+SLOT=0
+SRC_URI=https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/3.2.3/rocketchat-3.2.3.x86_64.rpm
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=587423ccb2032d482dcd6061a4f3239e
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.7.1 b/metadata/md5-cache/net-im/signal-desktop-bin-5.7.1
deleted file mode 100644
index 658d9987b5f4..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
-EAPI=7
-HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
-IUSE=+sound
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.7.1_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7650c4c46a42fcdff79211543fc0530e
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.8.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.8.0
new file mode 100644
index 000000000000..638c728d8a71
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
+EAPI=7
+HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
+IUSE=+sound
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.8.0_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=81ff1563a12f5acbd8eb48b7b0c01af5
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.72.0.94 b/metadata/md5-cache/net-im/skypeforlinux-8.72.0.94
index 00fa0b33747a..1f865561736e 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.72.0.94
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.72.0.94
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.72.0.94-1.x86_64.rpm
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	74cd9920d64148719fb62c462935c1b5	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	fce6ad998516159787b92e8043167889	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b5c1028452f548c5c399caf319930425
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.73.0.129 b/metadata/md5-cache/net-im/skypeforlinux-8.73.0.129
index 7d3c4d749711..34e588812f9d 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.73.0.129
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.73.0.129
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.73.0.129-1.x86_64.rpm
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	74cd9920d64148719fb62c462935c1b5	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	fce6ad998516159787b92e8043167889	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b5c1028452f548c5c399caf319930425
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.73.0.92 b/metadata/md5-cache/net-im/skypeforlinux-8.73.0.92
index d5db566d8d5b..af818ac7dc35 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.73.0.92
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.73.0.92
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.73.0.92-1.x86_64.rpm
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	74cd9920d64148719fb62c462935c1b5	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	pax-utils	fce6ad998516159787b92e8043167889	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b5c1028452f548c5c399caf319930425
diff --git a/metadata/md5-cache/net-im/slack-4.12.2 b/metadata/md5-cache/net-im/slack-4.12.2
index ebdfa0ff3b25..4bd94dc7cfc0 100644
--- a/metadata/md5-cache/net-im/slack-4.12.2
+++ b/metadata/md5-cache/net-im/slack-4.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.12.2-amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c6d5971000938948d234e829dac103dc
diff --git a/metadata/md5-cache/net-im/slack-4.13.0 b/metadata/md5-cache/net-im/slack-4.13.0
index 3107f145fe90..44dba1397245 100644
--- a/metadata/md5-cache/net-im/slack-4.13.0
+++ b/metadata/md5-cache/net-im/slack-4.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.13.0-amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e42896db4e2ce36893fcda205e510f75
diff --git a/metadata/md5-cache/net-im/slack-4.14.0 b/metadata/md5-cache/net-im/slack-4.14.0
index e33a3ceeb466..79f57c0f016d 100644
--- a/metadata/md5-cache/net-im/slack-4.14.0
+++ b/metadata/md5-cache/net-im/slack-4.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.14.0-amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a5c41cf66c767326e5f36c48689dad9d
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.8.10 b/metadata/md5-cache/net-im/telegram-desktop-2.8.10
new file mode 100644
index 000000000000..2985c9ba585d
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.8.10
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X(-)?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) jemalloc? ( dev-libs/jemalloc:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3* dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+IUSE=+dbus enchant +gtk +hunspell +jemalloc +spell wayland webkit +X
+KEYWORDS=~amd64 ~ppc64
+LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
+RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X(-)?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) jemalloc? ( dev-libs/jemalloc:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
+REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webkit? ( gtk ) gtk? ( dbus )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.8.10/tdesktop-2.8.10-full.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=27e0be340e2ab9ffd8296fbff8ce9e94
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 4acf8586a8c7..f37497f12001 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.32-r2 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.32-r2
index 67b97df7084d..36f169eff590 100644
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.32-r2
+++ b/metadata/md5-cache/net-irc/iroffer-dinoex-3.32-r2
@@ -4,11 +4,11 @@ DESCRIPTION=IRC fileserver using DCC
 EAPI=7
 HOMEPAGE=http://iroffer.dinoex.net/
 IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/libcrypt:= acct-user/iroffer chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
 REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.32.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.32.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e87e0e4ed218eeb17a5842ecfb8ce5c
+_md5_=c1b6cd38b3b7aca1a4b54639416604e3
diff --git a/metadata/md5-cache/net-irc/konversation-21.04.2-r1 b/metadata/md5-cache/net-irc/konversation-21.04.2-r1
deleted file mode 100644
index 57adea371301..000000000000
--- a/metadata/md5-cache/net-irc/konversation-21.04.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kidletime-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 crypt? ( >=app-crypt/qca-2.3.0:2 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=User friendly IRC Client
-EAPI=7
-HOMEPAGE=https://konversation.kde.org https://apps.kde.org/konversation/
-IUSE=+crypt debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kidletime-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 crypt? ( >=app-crypt/qca-2.3.0:2 ) >=dev-qt/qtsvg-5.15.2:5 crypt? ( >=app-crypt/qca-2.3.0:2[ssl] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/konversation-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7f43124407fe2eae81ecdae7b6be35df
diff --git a/metadata/md5-cache/net-irc/quassel-0.13.1-r2 b/metadata/md5-cache/net-irc/quassel-0.13.1-r2
index 57cda8da47f4..f386b1ee6684 100644
--- a/metadata/md5-cache/net-irc/quassel-0.13.1-r2
+++ b/metadata/md5-cache/net-irc/quassel-0.13.1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( acc
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
 SRC_URI=https://quassel-irc.org/pub/quassel-0.13.1.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9597328acdd594a45cd6f8d0b365da21
diff --git a/metadata/md5-cache/net-irc/quassel-9999 b/metadata/md5-cache/net-irc/quassel-9999
index 106931e93264..5b2b7414fdc4 100644
--- a/metadata/md5-cache/net-irc/quassel-9999
+++ b/metadata/md5-cache/net-irc/quassel-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9ef5936563b2e10e262fd52ad973424b
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index fc815d6e281c..748b7bbc8e21 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libesmtp-1.1.0-r1 b/metadata/md5-cache/net-libs/libesmtp-1.1.0-r1
index 07d1b8327566..dcee273c42e4 100644
--- a/metadata/md5-cache/net-libs/libesmtp-1.1.0-r1
+++ b/metadata/md5-cache/net-libs/libesmtp-1.1.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Lib that implements the client side of the SMTP protocol
 EAPI=7
 HOMEPAGE=https://libesmtp.github.io/
 IUSE=ssl static-libs threads
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-1.1.0:0= )
 SLOT=0/8
 SRC_URI=https://github.com/libesmtp/libESMTP/archive/v1.1.0.tar.gz -> libesmtp-1.1.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2f790c2425da35775d83f35553260c32
+_md5_=a1193b0aa35ec495d24f209de7e64fad
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.10.0 b/metadata/md5-cache/net-libs/libgsasl-1.10.0
index dff7197f0fcf..60aa83e6f8de 100644
--- a/metadata/md5-cache/net-libs/libgsasl-1.10.0
+++ b/metadata/md5-cache/net-libs/libgsasl-1.10.0
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU SASL library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gsasl/
 IUSE=idn gcrypt kerberos nls ntlm static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) !net-misc/gsasl
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/libgsasl-1.10.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c0d5f9da43f076288a9eb2d64f7b9dc7
+_md5_=38bba0904ac7e4ae87c84b93c282b11c
diff --git a/metadata/md5-cache/net-libs/libktorrent-21.04.2 b/metadata/md5-cache/net-libs/libktorrent-21.04.2
deleted file mode 100644
index d741d2839c11..000000000000
--- a/metadata/md5-cache/net-libs/libktorrent-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=BitTorrent library based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 !dev-libs/botan[gmp(-)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/libktorrent-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6ae37be9b3fc4371e390c65081ba129c
diff --git a/metadata/md5-cache/net-libs/libnet-1.2 b/metadata/md5-cache/net-libs/libnet-1.2
index 79ff41ddfd1d..1795a55dd263 100644
--- a/metadata/md5-cache/net-libs/libnet-1.2
+++ b/metadata/md5-cache/net-libs/libnet-1.2
@@ -3,8 +3,8 @@ DESCRIPTION=library providing an API for commonly used low-level network functio
 EAPI=7
 HOMEPAGE=http://libnet-dev.sourceforge.net/ https://github.com/libnet/libnet
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD BSD-2 HPND
 SLOT=1.1
 SRC_URI=https://github.com/libnet/libnet/releases/download/v1.2/libnet-1.2.tar.gz
-_md5_=7edf0da03d6c7c92a39c1382d160898b
+_md5_=7b1d9fb5c9e5e40ea9c6e8c268ee94a7
diff --git a/metadata/md5-cache/net-libs/libntlm-1.6 b/metadata/md5-cache/net-libs/libntlm-1.6
index 7e74982efa99..43eeeab0085c 100644
--- a/metadata/md5-cache/net-libs/libntlm-1.6
+++ b/metadata/md5-cache/net-libs/libntlm-1.6
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install
 DESCRIPTION=Microsoft's NTLM authentication (libntlm) library
 EAPI=7
-HOMEPAGE=http://www.nongnu.org/libntlm/
+HOMEPAGE=https://www.nongnu.org/libntlm/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux
 LICENSE=LGPL-2
 SLOT=0
-SRC_URI=http://www.nongnu.org/libntlm/releases/libntlm-1.6.tar.gz
-_md5_=c0e19af26c5db8fbd177c5864b411dff
+SRC_URI=https://www.nongnu.org/libntlm/releases/libntlm-1.6.tar.gz
+_md5_=7907391f1941cd8690a979db270d9b56
diff --git a/metadata/md5-cache/net-libs/libquotient-0.6.6 b/metadata/md5-cache/net-libs/libquotient-0.6.6
deleted file mode 100644
index 9afbf5c6d440..000000000000
--- a/metadata/md5-cache/net-libs/libquotient-0.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5
-DESCRIPTION=Qt5-based SDK to develop applications for Matrix
-EAPI=7
-HOMEPAGE=https://github.com/quotient-im/libQuotient
-KEYWORDS=~amd64 ~ppc64
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5
-SLOT=0
-SRC_URI=https://github.com/quotient-im/libQuotient/archive/0.6.6.tar.gz -> libquotient-0.6.6.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=164d7a4e421df2c9bbedf3b084f56848
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 5097f4ffe91b..735882aa0036 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 ~riscv ~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_=63cc02b7f6b9e4476d125e1c81728a40
+_md5_=ee50a3fc5a9a999b9225b26bb5e31a8b
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.9.47 b/metadata/md5-cache/net-libs/nativebiginteger-0.9.47
deleted file mode 100644
index d0cdcf5518ef..000000000000
--- a/metadata/md5-cache/net-libs/nativebiginteger-0.9.47
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-libs/gmp:0= virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=jbigi library used by net-vpn/i2p
-EAPI=7
-HOMEPAGE=https://geti2p.net
-IUSE=test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=dev-libs/gmp:0= virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.i2p2.de/releases/0.9.47/i2psource_0.9.47.tar.bz2
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b58ed39b06d9e5561ed71b3e5f269a4b
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.9.50 b/metadata/md5-cache/net-libs/nativebiginteger-0.9.50
new file mode 100644
index 000000000000..25e18cfbd350
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nativebiginteger-0.9.50
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-libs/gmp:0= virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=jbigi library used by net-vpn/i2p
+EAPI=7
+HOMEPAGE=https://geti2p.net
+IUSE=test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=dev-libs/gmp:0= virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.i2p2.de/releases/0.9.50/i2psource_0.9.50.tar.bz2
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=33d1acc71ffe522daa65efcfa2d5591b
diff --git a/metadata/md5-cache/net-libs/nodejs-12.22.1 b/metadata/md5-cache/net-libs/nodejs-12.22.1
index d6c49391f0ac..86b916cbfdcd 100644
--- a/metadata/md5-cache/net-libs/nodejs-12.22.1
+++ b/metadata/md5-cache/net-libs/nodejs-12.22.1
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test
 KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
 RESTRICT=test
 SLOT=0/12
 SRC_URI=https://nodejs.org/dist/v12.22.1/node-v12.22.1.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b056b9f5f45ae00e0e8f4b706d2f3e25
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bf83ae98caefb5e383d3510bc42d94ef
diff --git a/metadata/md5-cache/net-libs/nodejs-12.22.2 b/metadata/md5-cache/net-libs/nodejs-12.22.2
deleted file mode 100644
index b0916fddf76c..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-12.22.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0/12
-SRC_URI=https://nodejs.org/dist/v12.22.2/node-v12.22.2.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9171c1ec49112e62dae51cf3d522470d
diff --git a/metadata/md5-cache/net-libs/nodejs-12.22.3 b/metadata/md5-cache/net-libs/nodejs-12.22.3
new file mode 100644
index 000000000000..1cdab74a5a36
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-12.22.3
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test
+KEYWORDS=~amd64 arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0/12
+SRC_URI=https://nodejs.org/dist/v12.22.3/node-v12.22.3.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b65aa5bd171ba998601af98b4cb10267
diff --git a/metadata/md5-cache/net-libs/nodejs-14.16.1 b/metadata/md5-cache/net-libs/nodejs-14.16.1
index c85ea288159c..5aff5565127c 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.16.1
+++ b/metadata/md5-cache/net-libs/nodejs-14.16.1
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
 KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
 RESTRICT=test
 SLOT=0/14
 SRC_URI=https://nodejs.org/dist/v14.16.1/node-v14.16.1.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=15493fa9d86cd8f9ac1f01e8b6b46aba
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=22e2af77f62830918bf9f995c88c6e60
diff --git a/metadata/md5-cache/net-libs/nodejs-14.17.3 b/metadata/md5-cache/net-libs/nodejs-14.17.3
index c08e81887cb7..71f1172d380e 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.17.3
+++ b/metadata/md5-cache/net-libs/nodejs-14.17.3
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0/14
 SRC_URI=https://nodejs.org/dist/v14.17.3/node-v14.17.3.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=793497a50fc091c5f3f3a332737b8c4c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=14c95c161130c97b38dd65d0b8a86743
diff --git a/metadata/md5-cache/net-libs/nodejs-16.4.2 b/metadata/md5-cache/net-libs/nodejs-16.4.2
deleted file mode 100644
index dccb68d7250f..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-16.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0/16
-SRC_URI=https://nodejs.org/dist/v16.4.2/node-v16.4.2.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a4c9f4c85e728e59193cbeb13a385078
diff --git a/metadata/md5-cache/net-libs/nodejs-16.5.0 b/metadata/md5-cache/net-libs/nodejs-16.5.0
new file mode 100644
index 000000000000..12270eb9998a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-16.5.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0/16
+SRC_URI=https://nodejs.org/dist/v16.5.0/node-v16.5.0.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=953c89dfa0cdf683f31e97c0031ebc3b
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index 783567298e68..67c927a1700b 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cde4a984f6fecf88e5f44f34fc9db5a6
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fa028a703cc2094c1f0afbe1b3492cbf
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.32.1 b/metadata/md5-cache/net-libs/webkit-gtk-2.32.1
index 55fa71e92a37..f313d6c555ff 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.32.1
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.32.1
@@ -12,5 +12,5 @@ REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland?
 RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.32.1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=04c065807d96fbcd57183724975a3022
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 59968a5a406a..d6f69a86ac75 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.13-r101 b/metadata/md5-cache/net-mail/dovecot-2.3.13-r101
deleted file mode 100644
index 09062e1c6495..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.3.13-r101
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=argon2? ( dev-libs/libsodium:= ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) dev-libs/openssl:0= suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= ) virtual/libcrypt:= virtual/libiconv dev-libs/icu:=
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=7
-HOMEPAGE=https://www.dovecot.org/
-IUSE=kerberos ldap lua mysql pam postgres sqlite bzip2 lzma lz4 zlib zstd argon2 caps doc ipv6 lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=argon2? ( dev-libs/libsodium:= ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) dev-libs/openssl:0= suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= ) virtual/libcrypt:= virtual/libiconv dev-libs/icu:= acct-group/dovecot acct-group/dovenull acct-user/dovecot acct-user/dovenull net-mail/mailbase
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.13.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6dbe6b2d91e32e1064d8b22981849f06
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.14-r1 b/metadata/md5-cache/net-mail/dovecot-2.3.14-r1
deleted file mode 100644
index 09b5bd09b8c8..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.3.14-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=argon2? ( dev-libs/libsodium:= ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) dev-libs/openssl:0= suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) virtual/libcrypt:= virtual/libiconv dev-libs/icu:=
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=7
-HOMEPAGE=https://www.dovecot.org/
-IUSE=kerberos ldap lua mysql pam postgres sqlite bzip2 lzma lz4 zlib zstd argon2 caps doc ipv6 lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=argon2? ( dev-libs/libsodium:= ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) dev-libs/openssl:0= suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) virtual/libcrypt:= virtual/libiconv dev-libs/icu:= acct-group/dovecot acct-group/dovenull acct-user/dovecot acct-user/dovenull net-mail/mailbase
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.14.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.14.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.14.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=74134888d303d6ee56755b35983a1a8b
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.14.1-r1 b/metadata/md5-cache/net-mail/dovecot-2.3.14.1-r1
index 2c95ce333fc5..67c78132921c 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.14.1-r1
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.14.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=7
 HOMEPAGE=https://www.dovecot.org/
 IUSE=kerberos ldap lua mysql pam postgres sqlite bzip2 lzma lz4 zlib zstd argon2 caps doc ipv6 lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-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=LGPL-2.1 MIT
 RDEPEND=argon2? ( dev-libs/libsodium:= ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) dev-libs/openssl:0= suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= ) virtual/libcrypt:= virtual/libiconv dev-libs/icu:= acct-group/dovecot acct-group/dovenull acct-user/dovecot acct-user/dovenull net-mail/mailbase
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.14.1.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.14.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.14.tar.gz )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=530539f70eb20b64fc832e1ad29b62eb
+_md5_=9f8a2a58c11830e2b8db571a6c64df19
diff --git a/metadata/md5-cache/net-mail/fdm-2.0 b/metadata/md5-cache/net-mail/fdm-2.0
deleted file mode 100644
index 1b19a8dbcb90..000000000000
--- a/metadata/md5-cache/net-mail/fdm-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install preinst
-DEPEND=dev-libs/openssl:0= sys-libs/tdb pcre? ( dev-libs/libpcre )
-DESCRIPTION=fetch, filter and deliver mail
-EAPI=7
-HOMEPAGE=https://github.com/nicm/fdm
-IUSE=examples pcre
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl: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	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=72ed96c21ffea125497f5fdb8cf60c37
diff --git a/metadata/md5-cache/net-mail/fdm-2.0-r1 b/metadata/md5-cache/net-mail/fdm-2.0-r1
index 081f83b43be2..33a7437369a0 100644
--- a/metadata/md5-cache/net-mail/fdm-2.0-r1
+++ b/metadata/md5-cache/net-mail/fdm-2.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=fetch, filter and deliver mail
 EAPI=7
 HOMEPAGE=https://github.com/nicm/fdm
 IUSE=examples pcre
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= sys-libs/tdb pcre? ( dev-libs/libpcre ) acct-group/fdm acct-user/fdm
 SLOT=0
 SRC_URI=https://github.com/nicm/fdm/releases/download/2.0/fdm-2.0.tar.gz
-_md5_=b586eaede1194b56e0c0a2a70d61574e
+_md5_=c311f754ea0ed633eb5f552f4f3ae2f0
diff --git a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2 b/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
index 0096850c83e3..c63d3df5e596 100644
--- a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
+++ b/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/list-remote-forwards-0.0.1/list-remote-forwards-0.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0154ce122affc82dfa34d38553709621
diff --git a/metadata/md5-cache/net-mail/mailbox-count-0.0.5 b/metadata/md5-cache/net-mail/mailbox-count-0.0.5
index 3cfedbbbd50c..a6dca40cfbb0 100644
--- a/metadata/md5-cache/net-mail/mailbox-count-0.0.5
+++ b/metadata/md5-cache/net-mail/mailbox-count-0.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cmdargs-0.10 >=dev-haskell/configurator-0.2 >=dev-haskell/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/mailbox-count-0.0.5/mailbox-count-0.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=48da14b404bc49f4da5a4f8a2b744022
diff --git a/metadata/md5-cache/net-mail/mailutils-3.12-r2 b/metadata/md5-cache/net-mail/mailutils-3.12-r2
index 8514135e1575..14394c3202d5 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.12-r2
+++ b/metadata/md5-cache/net-mail/mailutils-3.12-r2
@@ -5,11 +5,11 @@ DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=7
 HOMEPAGE=https://mailutils.org/
 IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.12.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2b7cf094e426cf51d8f17c01401bddac
+_md5_=050dfed899bb0bfedf3000764a73e5fe
diff --git a/metadata/md5-cache/net-mail/mu-1.4.15-r2 b/metadata/md5-cache/net-mail/mu-1.4.15-r2
new file mode 100644
index 000000000000..ade8c6c41a55
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mu-1.4.15-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
+DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
+EAPI=8
+HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
+IUSE=emacs guile mug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
+SLOT=0
+SRC_URI=https://github.com/djcb/mu/archives/refs/tags/1.4.15.tar.gz -> mu-1.4.15.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1688ad383e50b9a7fc5239562ba8069a
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31.3 b/metadata/md5-cache/net-mail/notmuch-0.31.3
index abbfb0c6b75d..43cd8a01467d 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31.3
+++ b/metadata/md5-cache/net-mail/notmuch-0.31.3
@@ -12,5 +12,5 @@ REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pyp
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0c8a2636eace55dd17caa6ca05a413e2
diff --git a/metadata/md5-cache/net-mail/notmuch-0.32.1 b/metadata/md5-cache/net-mail/notmuch-0.32.1
index 4602a3d530c5..e04aa1fdddab 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.32.1
+++ b/metadata/md5-cache/net-mail/notmuch-0.32.1
@@ -12,5 +12,5 @@ REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pyp
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.32.1.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=339c0547fe3686e2d5e3e37835d86292
diff --git a/metadata/md5-cache/net-mail/notmuch-0.32.2 b/metadata/md5-cache/net-mail/notmuch-0.32.2
index b386cdac076a..090f4ee60101 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.32.2
+++ b/metadata/md5-cache/net-mail/notmuch-0.32.2
@@ -12,5 +12,5 @@ REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pyp
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.32.2.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=226fe174816b03444d923ab092a3b9a9
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 2eb142381424..2fc69fc7161b 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/aria2-1.35.0 b/metadata/md5-cache/net-misc/aria2-1.35.0
index 3efb56e2082c..bb4257dffd3b 100644
--- a/metadata/md5-cache/net-misc/aria2-1.35.0
+++ b/metadata/md5-cache/net-misc/aria2-1.35.0
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f12868661cd9325d9430db997185164
diff --git a/metadata/md5-cache/net-misc/asterisk-16.19.0-r1 b/metadata/md5-cache/net-misc/asterisk-16.19.0-r1
new file mode 100644
index 000000000000..e000d2279852
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-16.19.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0/16
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.19.0.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b2bae83c70f40755ebd7504912cc3906
diff --git a/metadata/md5-cache/net-misc/asterisk-18.5.0-r1 b/metadata/md5-cache/net-misc/asterisk-18.5.0-r1
new file mode 100644
index 000000000000..63c3622ff3df
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-18.5.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
+SLOT=0/18
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.5.0.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=76c0bc13dc94cd65af2417b7b763ea52
diff --git a/metadata/md5-cache/net-misc/bopm-3.1.3-r4 b/metadata/md5-cache/net-misc/bopm-3.1.3-r4
deleted file mode 100644
index 840f968c77df..000000000000
--- a/metadata/md5-cache/net-misc/bopm-3.1.3-r4
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DESCRIPTION=Blitzed Open Proxy Monitor
-EAPI=7
-HOMEPAGE=https://github.com/blitzed-org/bopm
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://static.blitzed.org/www.blitzed.org/bopm/files/bopm-3.1.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=29a6a487c1d23e2c96d68396f9cf2d6c
diff --git a/metadata/md5-cache/net-misc/bopm-3.1.3-r6 b/metadata/md5-cache/net-misc/bopm-3.1.3-r6
new file mode 100644
index 000000000000..c548b392f078
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bopm-3.1.3-r6
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DESCRIPTION=Blitzed Open Proxy Monitor
+EAPI=7
+HOMEPAGE=https://github.com/blitzed-org/bopm
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/opm
+SLOT=0
+SRC_URI=http://static.blitzed.org/www.blitzed.org/bopm/files/bopm-3.1.3.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3ea86d45b4fc42c7f5cc0effac70382d
diff --git a/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r2 b/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r2
index 2c3a23d742f9..287b2c548a8a 100644
--- a/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r2
+++ b/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=install setup unpack
 DESCRIPTION=Desktop notification integration for connman
 EAPI=7
 HOMEPAGE=https://gitlab.com/wavexx/connman-notify/
-IUSE=python_single_target_python3_8 python_single_target_python3_9
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) net-misc/connman virtual/notification-daemon
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) net-misc/connman virtual/notification-daemon
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://gitlab.com/wavexx/connman-notify/repository/4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52/archive.tar.bz2 -> connman-notify-0_pre20191003.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=230d7d6928aff77404c87bd06472042b
+_md5_=da40889587c59f9c3aeb0fd03f2130ee
diff --git a/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r3 b/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r3
new file mode 100644
index 000000000000..11c692bb9dd0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Desktop notification integration for connman
+EAPI=8
+HOMEPAGE=https://gitlab.com/wavexx/connman-notify/
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) net-misc/connman virtual/notification-daemon
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://gitlab.com/wavexx/connman-notify/repository/4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52/archive.tar.bz2 -> connman-notify-0_pre20191003.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=19cd15db8676517b0533cf4be0a3a7cb
diff --git a/metadata/md5-cache/net-misc/croc-9.1.6 b/metadata/md5-cache/net-misc/croc-9.1.6
index ee1de1026ccd..432fd4f99ca3 100644
--- a/metadata/md5-cache/net-misc/croc-9.1.6
+++ b/metadata/md5-cache/net-misc/croc-9.1.6
@@ -9,5 +9,5 @@ RDEPEND=acct-group/croc acct-user/croc
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/schollz/croc/releases/download/v9.1.6/croc_9.1.6_src.tar.gz -> croc-9.1.6.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.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/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.zip -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.mod -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/k0kubun/go-ansi/@v/v0.0.0-20180517002512-3bf9e2903213.mod -> github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.2.zip -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.2.mod -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.1.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.zip -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.mod -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.zip -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.mod -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.zip -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.mod -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/schollz/pake/v3/@v/v3.0.2.zip -> github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//github.com/schollz/pake/v3/@v/v3.0.2.mod -> github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.6.zip -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.6.zip mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.6.mod -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.6.mod mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.8.1.zip -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.1.zip mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.8.1.mod -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.1.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.zip -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod mirror://goproxy//github.com/twmb/murmur3/@v/v1.1.5.zip -> github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/twmb/murmur3/@v/v1.1.5.mod -> github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210506145944-38f3c27a63bf.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210506145944-38f3c27a63bf.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210614182718-04defd469f4e.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210614182718-04defd469f4e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210511113859-b0526f3d8744.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210503060354-a79de5458b56.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210503060354-a79de5458b56.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.zip -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.mod -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e702fb204c6ecfa3a58036ccd1a0bd4
diff --git a/metadata/md5-cache/net-misc/croc-9.2.0 b/metadata/md5-cache/net-misc/croc-9.2.0
index 6d3f882fbcc4..a0b918d569cb 100644
--- a/metadata/md5-cache/net-misc/croc-9.2.0
+++ b/metadata/md5-cache/net-misc/croc-9.2.0
@@ -9,5 +9,5 @@ RDEPEND=acct-group/croc acct-user/croc
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/schollz/croc/releases/download/v9.2.0/croc_9.2.0_src.tar.gz -> croc-9.2.0.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.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/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.zip -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.mod -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/k0kubun/go-ansi/@v/v0.0.0-20180517002512-3bf9e2903213.mod -> github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.2.zip -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.2.mod -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.13.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.zip -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.mod -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.zip -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.mod -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.zip -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.mod -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/schollz/pake/v3/@v/v3.0.2.zip -> github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//github.com/schollz/pake/v3/@v/v3.0.2.mod -> github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.6.zip -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.6.zip mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.6.mod -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.6.mod mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.8.2.zip -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.2.zip mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.8.2.mod -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.2.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.zip -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod mirror://goproxy//github.com/twmb/murmur3/@v/v1.1.5.zip -> github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/twmb/murmur3/@v/v1.1.5.mod -> github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210614182718-04defd469f4e.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210614182718-04defd469f4e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210511113859-b0526f3d8744.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.zip -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.mod -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26567b1b9c973a636666d8e03bd148b9
diff --git a/metadata/md5-cache/net-misc/dahdi-tools-3.1.0 b/metadata/md5-cache/net-misc/dahdi-tools-3.1.0
index 68a86b9d3f4d..569580d9ab44 100644
--- a/metadata/md5-cache/net-misc/dahdi-tools-3.1.0
+++ b/metadata/md5-cache/net-misc/dahdi-tools-3.1.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/newt net-misc/dahdi sys-kernel/linux-headers virtual/libusb:0 ppp? ( net-dialup/ppp ) dev-lang/perl:= dev-perl/CGI
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-3.1.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91b2959529b3c2e7c82e61ed91d58118
diff --git a/metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r1 b/metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r1
index 5d2681424b37..6ad519d0a73a 100644
--- a/metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r1
+++ b/metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/newt net-misc/dahdi sys-kernel/linux-headers virtual/libusb:0 ppp? ( net-dialup/ppp ) dev-lang/perl:= dev-perl/CGI
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-3.1.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=84ba35efafb12bab15e5733e14dfaa1f
diff --git a/metadata/md5-cache/net-misc/dropbox-125.4.3474 b/metadata/md5-cache/net-misc/dropbox-125.4.3474
index a9779d9f2308..660e4115948a 100644
--- a/metadata/md5-cache/net-misc/dropbox-125.4.3474
+++ b/metadata/md5-cache/net-misc/dropbox-125.4.3474
@@ -11,5 +11,5 @@ RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropb
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-125.4.3474.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-125.4.3474.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9d303c3393ad0f33b4bad318a29dc488
diff --git a/metadata/md5-cache/net-misc/dropbox-126.4.4618 b/metadata/md5-cache/net-misc/dropbox-126.4.4618
index db0e5f0edf40..0bf606f27cfc 100644
--- a/metadata/md5-cache/net-misc/dropbox-126.4.4618
+++ b/metadata/md5-cache/net-misc/dropbox-126.4.4618
@@ -11,5 +11,5 @@ RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropb
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-126.4.4618.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-126.4.4618.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5e792a6a58a299121e467bbadbd00e03
diff --git a/metadata/md5-cache/net-misc/dropbox-cli-2020.03.04-r1 b/metadata/md5-cache/net-misc/dropbox-cli-2020.03.04-r1
index 82bd4c15dc86..20a87b6c868f 100644
--- a/metadata/md5-cache/net-misc/dropbox-cli-2020.03.04-r1
+++ b/metadata/md5-cache/net-misc/dropbox-cli-2020.03.04-r1
@@ -9,5 +9,5 @@ RDEPEND=net-misc/dropbox python_targets_python3_8? ( dev-lang/python:3.8 ) pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/dropbox-cli-2020.03.04.py.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f83acb5d9d98e684a0f5fa388b2900fd
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.2.19 b/metadata/md5-cache/net-misc/gns3-gui-2.2.19
deleted file mode 100644
index 83cd5916def9..000000000000
--- a/metadata/md5-cache/net-misc/gns3-gui-2.2.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Graphical Network Simulator
-EAPI=7
-HOMEPAGE=https://www.gns3.com/ https://github.com/GNS3/gns3-gui
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-python/distro-1.3.0[python_targets_python3_8(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?] >=dev-python/psutil-5.7.0[python_targets_python3_8(-)?] >=dev-python/sentry-sdk-0.14.4[python_targets_python3_8(-)?] ~net-misc/gns3-server-2.2.19[python_targets_python3_8(-)?] dev-python/PyQt5[gui,network,svg,websockets,widgets,python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.2.19.tar.gz -> gns3-gui-2.2.19.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0a5e50a3419ed70e08b0f64d43742006
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.2.22 b/metadata/md5-cache/net-misc/gns3-gui-2.2.22
new file mode 100644
index 000000000000..6bc0a2b059e7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gns3-gui-2.2.22
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/distro-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sentry-sdk-0.14.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~net-misc/gns3-server-2.2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[gui,network,svg,websockets,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Graphical Network Simulator
+EAPI=7
+HOMEPAGE=https://www.gns3.com/ https://github.com/GNS3/gns3-gui
+IUSE=test python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-python/distro-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sentry-sdk-0.14.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~net-misc/gns3-server-2.2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[gui,network,svg,websockets,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.2.22.tar.gz -> gns3-gui-2.2.22.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6c95f462792d0ea329cd9ce0516094f5
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.2.19 b/metadata/md5-cache/net-misc/gns3-server-2.2.19
deleted file mode 100644
index 858c7d2e9918..000000000000
--- a/metadata/md5-cache/net-misc/gns3-server-2.2.19
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=GNS3 server to asynchronously manage emulators
-EAPI=7
-HOMEPAGE=https://www.gns3.com/ https://github.com/GNS3/gns3-server
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=app-emulation/dynamips-0.2.18 >=dev-python/aiofiles-0.5.0[python_targets_python3_8(-)?] >=dev-python/aiohttp-3.6.2[python_targets_python3_8(-)?] >=dev-python/aiohttp-cors-0.7.0[python_targets_python3_8(-)?] >=dev-python/async_timeout-3.0.1[python_targets_python3_8(-)?] >=dev-python/distro-1.3.0[python_targets_python3_8(-)?] >=dev-python/jinja-2.11.3[python_targets_python3_8(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?] >=dev-python/psutil-5.7.0[python_targets_python3_8(-)?] >=dev-python/py-cpuinfo-7.0.0[python_targets_python3_8(-)?] >=dev-python/sentry-sdk-0.14.4[python_targets_python3_8(-)?] >=net-misc/ubridge-0.9.14 python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.2.19.tar.gz -> gns3-server-2.2.19.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=209eec3fc0b7130a3d175080cf06a5fb
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.2.22 b/metadata/md5-cache/net-misc/gns3-server-2.2.22
new file mode 100644
index 000000000000..be85c0b1f735
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gns3-server-2.2.22
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=app-emulation/dynamips-0.2.18 >=dev-python/aiofiles-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/aiohttp-3.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/aiohttp-cors-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/async_timeout-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/distro-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.11.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/py-cpuinfo-7.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sentry-sdk-0.14.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=net-misc/ubridge-0.9.14 sys-apps/busybox >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=GNS3 server to asynchronously manage emulators
+EAPI=7
+HOMEPAGE=https://www.gns3.com/ https://github.com/GNS3/gns3-server
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-emulation/dynamips-0.2.18 >=dev-python/aiofiles-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/aiohttp-3.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/aiohttp-cors-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/async_timeout-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/distro-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.11.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/py-cpuinfo-7.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sentry-sdk-0.14.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=net-misc/ubridge-0.9.14 sys-apps/busybox python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.2.22.tar.gz -> gns3-server-2.2.22.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e434ce26c3e3d2db2ca1e3e5053a3de4
diff --git a/metadata/md5-cache/net-misc/gofish-1.2 b/metadata/md5-cache/net-misc/gofish-1.2
deleted file mode 100644
index 979584f4719a..000000000000
--- a/metadata/md5-cache/net-misc/gofish-1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install setup
-DESCRIPTION=Gofish gopher server
-EAPI=6
-HOMEPAGE=http://gofish.sourceforge.net
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://sourceforge/gofish/gofish-1.2.tar.gz
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=12a7c27215565fb2242f2e8e3dc95003
diff --git a/metadata/md5-cache/net-misc/gofish-1.2-r1 b/metadata/md5-cache/net-misc/gofish-1.2-r1
index 3d395e83b120..e94d84b01ac7 100644
--- a/metadata/md5-cache/net-misc/gofish-1.2-r1
+++ b/metadata/md5-cache/net-misc/gofish-1.2-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Gofish gopher server
 EAPI=7
 HOMEPAGE=http://gofish.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/gopher acct-user/gopher
 SLOT=0
 SRC_URI=mirror://sourceforge/gofish/gofish-1.2.tar.gz
-_md5_=0daa5196dbf21312d4f904f06d6a0aa4
+_md5_=d65751aef7d3b99da43601c8c7539899
diff --git a/metadata/md5-cache/net-misc/gsasl-1.10.0 b/metadata/md5-cache/net-misc/gsasl-1.10.0
index f8176f67c171..b047acb380b8 100644
--- a/metadata/md5-cache/net-misc/gsasl-1.10.0
+++ b/metadata/md5-cache/net-misc/gsasl-1.10.0
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU SASL client, server, and library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gsasl/
 IUSE=doc gcrypt idn kerberos nls ntlm static-libs +threads
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/gsasl-1.10.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=73faf7d3e89a9402b09b08a4135a0d9f
+_md5_=09081e79b4b896a39a57861d00a828bd
diff --git a/metadata/md5-cache/net-misc/haeredes-0.5.2 b/metadata/md5-cache/net-misc/haeredes-0.5.2
index 546c13f07a09..4d691c99b802 100644
--- a/metadata/md5-cache/net-misc/haeredes-0.5.2
+++ b/metadata/md5-cache/net-misc/haeredes-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cmdargs-0.10:= >=dev-haskell/dns-1.4:= >=dev-haskell/iprou
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haeredes-0.5.2/haeredes-0.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3601a0e721432a14430f5c760c90ac40
diff --git a/metadata/md5-cache/net-misc/hath-0.5.0 b/metadata/md5-cache/net-misc/hath-0.5.0
index e97867dd8bcf..189ae3452a52 100644
--- a/metadata/md5-cache/net-misc/hath-0.5.0
+++ b/metadata/md5-cache/net-misc/hath-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cmdargs-0.10:= >=dev-haskell/split-0.2:= >=dev-haskell/tas
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hath-0.5.0/hath-0.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=49593706f6174cdbdd2639a4c21f20b6
diff --git a/metadata/md5-cache/net-misc/httpie-2.4.0 b/metadata/md5-cache/net-misc/httpie-2.4.0
index da0716c8e80d..ade98627870a 100644
--- a/metadata/md5-cache/net-misc/httpie-2.4.0
+++ b/metadata/md5-cache/net-misc/httpie-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakubroztocil/httpie/archive/2.4.0.tar.gz -> httpie-2.4.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7881a2f3f2aba7805d3c59953db35097
diff --git a/metadata/md5-cache/net-misc/ices-2.0.2 b/metadata/md5-cache/net-misc/ices-2.0.2
deleted file mode 100644
index 07976528b364..000000000000
--- a/metadata/md5-cache/net-misc/ices-2.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=dev-libs/libxml2 >=media-libs/libshout-2 >=media-libs/libvorbis-1 virtual/pkgconfig
-DESCRIPTION=Icecast OGG streaming client, supports on the fly re-encoding
-EAPI=5
-HOMEPAGE=https://icecast.org/ices/
-KEYWORDS=~alpha amd64 ~arm ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 >=media-libs/libshout-2 >=media-libs/libvorbis-1
-SLOT=0
-SRC_URI=http://downloads.xiph.org/releases/ices/ices-2.0.2.tar.bz2
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=6aab94bb44e6221206a6e9cf2df4bb87
diff --git a/metadata/md5-cache/net-misc/ices-2.0.2-r1 b/metadata/md5-cache/net-misc/ices-2.0.2-r1
new file mode 100644
index 000000000000..4281403c9722
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ices-2.0.2-r1
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=acct-group/ices acct-user/ices dev-libs/libxml2 >=media-libs/libshout-2 >=media-libs/libvorbis-1
+DESCRIPTION=Icecast OGG streaming client, supports on the fly re-encoding
+EAPI=7
+HOMEPAGE=https://icecast.org/ices/
+KEYWORDS=~alpha amd64 ~arm ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=acct-group/ices acct-user/ices dev-libs/libxml2 >=media-libs/libshout-2 >=media-libs/libvorbis-1
+SLOT=0
+SRC_URI=http://downloads.xiph.org/releases/ices/ices-2.0.2.tar.bz2
+_md5_=20aa5fa68d8f3fca33267b41f109025d
diff --git a/metadata/md5-cache/net-misc/ip-sentinel-0.12-r1 b/metadata/md5-cache/net-misc/ip-sentinel-0.12-r1
deleted file mode 100644
index 64659315338d..000000000000
--- a/metadata/md5-cache/net-misc/ip-sentinel-0.12-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=config install postinst prepare setup
-DESCRIPTION=Prevent unauthorized usage of IP addresses
-EAPI=7
-HOMEPAGE=https://www.nongnu.org/ip-sentinel/
-KEYWORDS=x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/ip-sentinel/ip-sentinel-0.12.tar.bz2
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=8abf32ac27aeb8c1aa1b9d29a5b03339
diff --git a/metadata/md5-cache/net-misc/ip-sentinel-0.12-r2 b/metadata/md5-cache/net-misc/ip-sentinel-0.12-r2
new file mode 100644
index 000000000000..a5887091f902
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ip-sentinel-0.12-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=config install postinst prepare
+DESCRIPTION=Prevent unauthorized usage of IP addresses
+EAPI=7
+HOMEPAGE=https://www.nongnu.org/ip-sentinel/
+KEYWORDS=x86
+LICENSE=GPL-2
+RDEPEND=acct-group/ipsentinel acct-user/ipsentinel
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/ip-sentinel/ip-sentinel-0.12.tar.bz2
+_md5_=9d558545b1a1606a4447e02a64b55a8d
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.10-r1 b/metadata/md5-cache/net-misc/lldpd-1.0.10-r1
index 5b56528392c8..5222459ffd73 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.10-r1
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.10-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.10.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=01efa62757f022209c31dbc740458db7
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.11-r1 b/metadata/md5-cache/net-misc/lldpd-1.0.11-r1
index 822b3a110c20..c9ab3dc251c4 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.11-r1
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.11.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7f6db3fd200a43ed43ea6f9c426898a
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.7-r1 b/metadata/md5-cache/net-misc/lldpd-1.0.7-r1
index 5de8d1ac7639..1d0ace4914b5 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.7-r1
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.7.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9bee5657aab113a3180cbea4c9a608f6
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.9-r1 b/metadata/md5-cache/net-misc/lldpd-1.0.9-r1
index cf5a024ff558..ce2898d4ab2e 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.9-r1
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.9-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.9.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d764fdfded33b38adec48426c02d2cd
diff --git a/metadata/md5-cache/net-misc/mikutter-4.0.6 b/metadata/md5-cache/net-misc/mikutter-4.0.6
deleted file mode 100644
index d8f5235d1007..000000000000
--- a/metadata/md5-cache/net-misc/mikutter-4.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby25(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby25(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby25(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby25(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby25(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby25(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby25(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby25(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby26(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby26(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby26(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby26(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby26(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby26(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby26(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby26(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=Simple, powerful and moeful twitter client
-EAPI=7
-HOMEPAGE=https://mikutter.hachune.net/
-IUSE=+libnotify test ruby_targets_ruby25 ruby_targets_ruby26
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby25? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby25(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby25(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby25(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby25(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby25(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby25(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby25(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby25(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby26(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby26(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby26(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby26(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby26(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby26(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby26(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby26(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://mikutter.hachune.net/bin/mikutter-4.0.6.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8fa2bac2d592f3f40bd2c5082386aa00
diff --git a/metadata/md5-cache/net-misc/mikutter-4.0.6-r1 b/metadata/md5-cache/net-misc/mikutter-4.0.6-r1
new file mode 100644
index 000000000000..f71abc07c24f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mikutter-4.0.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby25(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby25(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby25(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby25(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby25(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby25(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby25(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby25(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby26(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby26(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby26(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby26(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby26(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby26(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby26(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Simple, powerful and moeful twitter client
+EAPI=7
+HOMEPAGE=https://mikutter.hachune.net/
+IUSE=+libnotify test ruby_targets_ruby25 ruby_targets_ruby26
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby25? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby25(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby25(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby25(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby25(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby25(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby25(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby25(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby25(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby26(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby26(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby26(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby26(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby26(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby26(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby26(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://mikutter.hachune.net/bin/mikutter-4.0.6.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c31e22b53a6011aedd7ec1ae4523d823
diff --git a/metadata/md5-cache/net-misc/mikutter-4.1.5 b/metadata/md5-cache/net-misc/mikutter-4.1.5
deleted file mode 100644
index 3f29260062a4..000000000000
--- a/metadata/md5-cache/net-misc/mikutter-4.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby25(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby25(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby25(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby25(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby25(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby25(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby25(-)] dev-ruby/twitter-text[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby26(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby26(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby26(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby26(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby26(-)] dev-ruby/twitter-text[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DESCRIPTION=Simple, powerful and moeful twitter client
-EAPI=7
-HOMEPAGE=https://mikutter.hachune.net/
-IUSE=+libnotify test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby25? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby25(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby25(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby25(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby25(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby25(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby25(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby25(-)] dev-ruby/twitter-text[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby26(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby26(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby26(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby26(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby26(-)] dev-ruby/twitter-text[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://mikutter.hachune.net/bin/mikutter-4.1.5.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54a964143c3728ae19db98b089c5fe42
diff --git a/metadata/md5-cache/net-misc/mikutter-4.1.5-r1 b/metadata/md5-cache/net-misc/mikutter-4.1.5-r1
new file mode 100644
index 000000000000..8b0fd81acd53
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mikutter-4.1.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby25(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby25(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby25(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby25(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby25(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby25(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby25(-)] dev-ruby/twitter-text[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby26(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby26(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby26(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby26(-)] dev-ruby/twitter-text[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+DESCRIPTION=Simple, powerful and moeful twitter client
+EAPI=7
+HOMEPAGE=https://mikutter.hachune.net/
+IUSE=+libnotify test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby25? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby25(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby25(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby25(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby25(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby25(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby25(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby25(-)] dev-ruby/twitter-text[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby26(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby26(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby26(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby26(-)] dev-ruby/twitter-text[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://mikutter.hachune.net/bin/mikutter-4.1.5.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4acf713a6ab0a3a088b85880ff44c19e
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index e9a087c15382..c2009dd0616c 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby25(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby25(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby25(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby25(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby25(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby25(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby25(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby25(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby26(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby26(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby26(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby26(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby26(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby26(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby26(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby26(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby25(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby25(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby25(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby25(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby25(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby25(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby25(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby25(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby26(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby26(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby26(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby26(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby26(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby26(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby26(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
 DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 DESCRIPTION=Simple, powerful and moeful twitter client
@@ -7,10 +7,10 @@ HOMEPAGE=https://mikutter.hachune.net/
 IUSE=+libnotify test ruby_targets_ruby25 ruby_targets_ruby26
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby25? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby25(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby25(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby25(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby25(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby25(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby25(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby25(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby25(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.7*[ruby_targets_ruby26(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby26(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby26(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby26(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby26(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby26(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby26(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby26(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby25? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby25(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby25(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby25(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby25(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby25(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:2[ruby_targets_ruby25(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby25(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby25(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby25(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby25(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby25(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby25(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby26(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby26(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby26(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby26(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby26(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby26(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby26(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8fa2bac2d592f3f40bd2c5082386aa00
+_md5_=c31e22b53a6011aedd7ec1ae4523d823
diff --git a/metadata/md5-cache/net-misc/mosh-1.3.2 b/metadata/md5-cache/net-misc/mosh-1.3.2
index f6cd35c7852d..75f08eb9a965 100644
--- a/metadata/md5-cache/net-misc/mosh-1.3.2
+++ b/metadata/md5-cache/net-misc/mosh-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://mosh.org/mosh-1.3.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=89f058fdf22e6ebb20553a4e68ac8ce7
diff --git a/metadata/md5-cache/net-misc/mosh-9999 b/metadata/md5-cache/net-misc/mosh-9999
index 60608f93724a..ab09ea177d19 100644
--- a/metadata/md5-cache/net-misc/mosh-9999
+++ b/metadata/md5-cache/net-misc/mosh-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) dev-libs/openssl:0= utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a8c7abb990d71bcf13096101217a775
diff --git a/metadata/md5-cache/net-misc/mstpd-0.0.9 b/metadata/md5-cache/net-misc/mstpd-0.0.9
index ea84ee3b3cd1..39a84dec1299 100644
--- a/metadata/md5-cache/net-misc/mstpd-0.0.9
+++ b/metadata/md5-cache/net-misc/mstpd-0.0.9
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/mstpd/mstpd/archive/0.0.9.tar.gz -> mstpd-0.0.9.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e59b021dd7977f06898c83db7195027
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.30.4 b/metadata/md5-cache/net-misc/networkmanager-1.30.4
index 4257a2134169..4b90c48efcb4 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.30.4
+++ b/metadata/md5-cache/net-misc/networkmanager-1.30.4
@@ -12,5 +12,5 @@ REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) w
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.30/NetworkManager-1.30.4.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=de2b92ae0570dd39c94cad4457310fb7
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.2 b/metadata/md5-cache/net-misc/networkmanager-1.32.2
index db5ace1732e5..4e717cf6d36b 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.2
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.2
@@ -12,5 +12,5 @@ REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nft
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.2.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c173e2a7ee8792e0d9976f27841f6936
diff --git a/metadata/md5-cache/net-misc/plowshare-2.1.6 b/metadata/md5-cache/net-misc/plowshare-2.1.6
index 192f6716c3ef..2099899b9920 100644
--- a/metadata/md5-cache/net-misc/plowshare-2.1.6
+++ b/metadata/md5-cache/net-misc/plowshare-2.1.6
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-shells/bash-4 || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) dev-vcs/git net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
 SLOT=0
 SRC_URI=https://github.com/mcrapet/plowshare/archive/v2.1.6.tar.gz -> plowshare-2.1.6.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=788c9538bf926fc5e498de081e2619a5
diff --git a/metadata/md5-cache/net-misc/plowshare-2.1.7 b/metadata/md5-cache/net-misc/plowshare-2.1.7
index 8507617a3064..091b7067c6b7 100644
--- a/metadata/md5-cache/net-misc/plowshare-2.1.7
+++ b/metadata/md5-cache/net-misc/plowshare-2.1.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-shells/bash-4 || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) dev-vcs/git net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
 SLOT=0
 SRC_URI=https://github.com/mcrapet/plowshare/archive/v2.1.7.tar.gz -> plowshare-2.1.7.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=788c9538bf926fc5e498de081e2619a5
diff --git a/metadata/md5-cache/net-misc/plowshare-9999 b/metadata/md5-cache/net-misc/plowshare-9999
index a334c90e9e2d..c5aace3144e6 100644
--- a/metadata/md5-cache/net-misc/plowshare-9999
+++ b/metadata/md5-cache/net-misc/plowshare-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=app-shells/bash-4 || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) dev-vcs/git net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=97da2cdac07789df3d93ee5855978237
diff --git a/metadata/md5-cache/net-misc/putty-0.74 b/metadata/md5-cache/net-misc/putty-0.74
deleted file mode 100644
index a40daf1e0fdb..000000000000
--- a/metadata/md5-cache/net-misc/putty-0.74
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
-DESCRIPTION=A Free Telnet/SSH Client
-EAPI=7
-HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
-IUSE=doc +gtk gtk2 ipv6 gssapi
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
-REQUIRED_USE=gtk2? ( gtk )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.74/putty-0.74.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c0ea788e1f149d66a7fcf77b407902f5
diff --git a/metadata/md5-cache/net-misc/rclone-1.53.3 b/metadata/md5-cache/net-misc/rclone-1.53.3
index d1a71f8616a6..1a66deab0e11 100644
--- a/metadata/md5-cache/net-misc/rclone-1.53.3
+++ b/metadata/md5-cache/net-misc/rclone-1.53.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 ISC MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/rclone/rclone/archive/v1.53.3.tar.gz -> rclone-1.53.3.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200407214033-5883e5a4b512.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200407214033-5883e5a4b512.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.59.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.59.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.59.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.59.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//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-pipeline-go/@v/v0.2.2.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.10.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.10.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.10.0.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/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.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/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/!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/!roaring!bitmap/roaring/@v/v0.4.7.mod -> github.com%2F!roaring!bitmap%2Froaring%2F@v%2Fv0.4.7.mod mirror://goproxy//github.com/!unknwon/goconfig/@v/v0.0.0-20191126170842-860a72fb44fd.zip -> github.com%2F!unknwon%2Fgoconfig%2F@v%2Fv0.0.0-20191126170842-860a72fb44fd.zip mirror://goproxy//github.com/!unknwon/goconfig/@v/v0.0.0-20191126170842-860a72fb44fd.mod -> github.com%2F!unknwon%2Fgoconfig%2F@v%2Fv0.0.0-20191126170842-860a72fb44fd.mod mirror://goproxy//github.com/a8m/tree/@v/v0.0.0-20181222104329-6a0b80129de4.zip -> github.com%2Fa8m%2Ftree%2F@v%2Fv0.0.0-20181222104329-6a0b80129de4.zip mirror://goproxy//github.com/a8m/tree/@v/v0.0.0-20181222104329-6a0b80129de4.mod -> github.com%2Fa8m%2Ftree%2F@v%2Fv0.0.0-20181222104329-6a0b80129de4.mod mirror://goproxy//github.com/aalpar/deheap/@v/v0.0.0-20200318053559-9a0c2883bd56.zip -> github.com%2Faalpar%2Fdeheap%2F@v%2Fv0.0.0-20200318053559-9a0c2883bd56.zip mirror://goproxy//github.com/aalpar/deheap/@v/v0.0.0-20200318053559-9a0c2883bd56.mod -> github.com%2Faalpar%2Fdeheap%2F@v%2Fv0.0.0-20200318053559-9a0c2883bd56.mod mirror://goproxy//github.com/abbot/go-http-auth/@v/v0.4.0.zip -> github.com%2Fabbot%2Fgo-http-auth%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/abbot/go-http-auth/@v/v0.4.0.mod -> github.com%2Fabbot%2Fgo-http-auth%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/aead/siphash/@v/v1.0.1.mod -> github.com%2Faead%2Fsiphash%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/anacrolix/dms/@v/v1.1.0.zip -> github.com%2Fanacrolix%2Fdms%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/anacrolix/dms/@v/v1.1.0.mod -> github.com%2Fanacrolix%2Fdms%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/anacrolix/envpprof/@v/v0.0.0-20180404065416-323002cec2fa.mod -> github.com%2Fanacrolix%2Fenvpprof%2F@v%2Fv0.0.0-20180404065416-323002cec2fa.mod mirror://goproxy//github.com/anacrolix/envpprof/@v/v1.0.0.mod -> github.com%2Fanacrolix%2Fenvpprof%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/anacrolix/ffprobe/@v/v1.0.0.mod -> github.com%2Fanacrolix%2Fffprobe%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/anacrolix/missinggo/@v/v1.1.0.mod -> github.com%2Fanacrolix%2Fmissinggo%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/anacrolix/tagflag/@v/v0.0.0-20180109131632-2146c8d41bf0.mod -> github.com%2Fanacrolix%2Ftagflag%2F@v%2Fv0.0.0-20180109131632-2146c8d41bf0.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/atotto/clipboard/@v/v0.1.2.zip -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.mod -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.32.11.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.32.11.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.32.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.32.11.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/billziss-gh/cgofuse/@v/v1.4.0.zip -> github.com%2Fbillziss-gh%2Fcgofuse%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/billziss-gh/cgofuse/@v/v1.4.0.mod -> github.com%2Fbillziss-gh%2Fcgofuse%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/bradfitz/iter/@v/v0.0.0-20140124041915-454541ec3da2.mod -> github.com%2Fbradfitz%2Fiter%2F@v%2Fv0.0.0-20140124041915-454541ec3da2.mod mirror://goproxy//github.com/bradfitz/iter/@v/v0.0.0-20190303215204-33e6a9893b0c.mod -> github.com%2Fbradfitz%2Fiter%2F@v%2Fv0.0.0-20190303215204-33e6a9893b0c.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.20.1-beta.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.mod mirror://goproxy//github.com/btcsuite/btclog/@v/v0.0.0-20170628155309-84c8d2346e9f.mod -> github.com%2Fbtcsuite%2Fbtclog%2F@v%2Fv0.0.0-20170628155309-84c8d2346e9f.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v0.0.0-20190425235716-9e5f4b9a998d.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190425235716-9e5f4b9a998d.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v1.0.1.zip -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/btcsuite/btcutil/@v/v1.0.1.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v1.0.2.zip -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/btcsuite/btcutil/@v/v1.0.2.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/btcsuite/go-socks/@v/v0.0.0-20170105172521-4720035b7bfd.mod -> github.com%2Fbtcsuite%2Fgo-socks%2F@v%2Fv0.0.0-20170105172521-4720035b7bfd.mod mirror://goproxy//github.com/btcsuite/goleveldb/@v/v0.0.0-20160330041536-7834afc9e8cd.mod -> github.com%2Fbtcsuite%2Fgoleveldb%2F@v%2Fv0.0.0-20160330041536-7834afc9e8cd.mod mirror://goproxy//github.com/btcsuite/snappy-go/@v/v0.0.0-20151229074030-0bdef8d06723.mod -> github.com%2Fbtcsuite%2Fsnappy-go%2F@v%2Fv0.0.0-20151229074030-0bdef8d06723.mod mirror://goproxy//github.com/btcsuite/websocket/@v/v0.0.0-20150119174127-31079b680792.mod -> github.com%2Fbtcsuite%2Fwebsocket%2F@v%2Fv0.0.0-20150119174127-31079b680792.mod mirror://goproxy//github.com/btcsuite/winsvc/@v/v1.0.0.mod -> github.com%2Fbtcsuite%2Fwinsvc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/calebcase/tmpfile/@v/v1.0.2-0.20200602150926-3af473ef8439.mod -> github.com%2Fcalebcase%2Ftmpfile%2F@v%2Fv1.0.2-0.20200602150926-3af473ef8439.mod mirror://goproxy//github.com/calebcase/tmpfile/@v/v1.0.2.zip -> github.com%2Fcalebcase%2Ftmpfile%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/calebcase/tmpfile/@v/v1.0.2.mod -> github.com%2Fcalebcase%2Ftmpfile%2F@v%2Fv1.0.2.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/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/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-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/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/davecgh/go-spew/@v/v0.0.0-20171005155431-ecdeabc65495.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20171005155431-ecdeabc65495.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/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/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/dropbox/dropbox-sdk-go-unofficial/@v/v5.6.0+incompatible.zip -> github.com%2Fdropbox%2Fdropbox-sdk-go-unofficial%2F@v%2Fv5.6.0+incompatible.zip mirror://goproxy//github.com/dropbox/dropbox-sdk-go-unofficial/@v/v5.6.0+incompatible.mod -> github.com%2Fdropbox%2Fdropbox-sdk-go-unofficial%2F@v%2Fv5.6.0+incompatible.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20180421182945-02af3965c54e.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20180421182945-02af3965c54e.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/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/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/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/glycerine/go-unsnap-stream/@v/v0.0.0-20180323001048-9f0cb55181dd.mod -> github.com%2Fglycerine%2Fgo-unsnap-stream%2F@v%2Fv0.0.0-20180323001048-9f0cb55181dd.mod mirror://goproxy//github.com/glycerine/goconvey/@v/v0.0.0-20180728074245-46e3a41ad493.mod -> github.com%2Fglycerine%2Fgoconvey%2F@v%2Fv0.0.0-20180728074245-46e3a41ad493.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-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-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180124185431-e89373fe6b4a.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180124185431-e89373fe6b4a.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200507031123-427632fa3b1c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200507031123-427632fa3b1c.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.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.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181103185306-d547d1d9531e.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181103185306-d547d1d9531e.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181103185306-d547d1d9531e.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181103185306-d547d1d9531e.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/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hanwen/go-fuse/@v/v1.0.0.zip -> github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hanwen/go-fuse/@v/v1.0.0.mod -> github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hanwen/go-fuse/v2/@v/v2.0.3.zip -> github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.3.zip mirror://goproxy//github.com/hanwen/go-fuse/v2/@v/v2.0.3.mod -> github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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.0.0.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/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/jessevdk/go-flags/@v/v0.0.0-20141203071132-1679536dcc89.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv0.0.0-20141203071132-1679536dcc89.mod mirror://goproxy//github.com/jlaffaye/ftp/@v/v0.0.0-20190624084859-c1312a7102bf.mod -> github.com%2Fjlaffaye%2Fftp%2F@v%2Fv0.0.0-20190624084859-c1312a7102bf.mod mirror://goproxy//github.com/jlaffaye/ftp/@v/v0.0.0-20200720194710-13949d38913e.zip -> github.com%2Fjlaffaye%2Fftp%2F@v%2Fv0.0.0-20200720194710-13949d38913e.zip mirror://goproxy//github.com/jlaffaye/ftp/@v/v0.0.0-20200720194710-13949d38913e.mod -> github.com%2Fjlaffaye%2Fftp%2F@v%2Fv0.0.0-20200720194710-13949d38913e.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jrick/logrotate/@v/v1.0.0.mod -> github.com%2Fjrick%2Flogrotate%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.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.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jzelinskie/whirlpool/@v/v0.0.0-20170603002051-c19460b8caa6.zip -> github.com%2Fjzelinskie%2Fwhirlpool%2F@v%2Fv0.0.0-20170603002051-c19460b8caa6.zip mirror://goproxy//github.com/jzelinskie/whirlpool/@v/v0.0.0-20170603002051-c19460b8caa6.mod -> github.com%2Fjzelinskie%2Fwhirlpool%2F@v%2Fv0.0.0-20170603002051-c19460b8caa6.mod mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.zip -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.mod -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kkdai/bstream/@v/v0.0.0-20161212061736-f391b8402d23.mod -> github.com%2Fkkdai%2Fbstream%2F@v%2Fv0.0.0-20161212061736-f391b8402d23.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.10.11.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.11.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.10.11.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.11.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/koofr/go-httpclient/@v/v0.0.0-20200420163713-93aa7c75b348.zip -> github.com%2Fkoofr%2Fgo-httpclient%2F@v%2Fv0.0.0-20200420163713-93aa7c75b348.zip mirror://goproxy//github.com/koofr/go-httpclient/@v/v0.0.0-20200420163713-93aa7c75b348.mod -> github.com%2Fkoofr%2Fgo-httpclient%2F@v%2Fv0.0.0-20200420163713-93aa7c75b348.mod mirror://goproxy//github.com/koofr/go-koofrclient/@v/v0.0.0-20190724113126-8e5366da203a.zip -> github.com%2Fkoofr%2Fgo-koofrclient%2F@v%2Fv0.0.0-20190724113126-8e5366da203a.zip mirror://goproxy//github.com/koofr/go-koofrclient/@v/v0.0.0-20190724113126-8e5366da203a.mod -> github.com%2Fkoofr%2Fgo-koofrclient%2F@v%2Fv0.0.0-20190724113126-8e5366da203a.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.zip -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190702010315-6dee0af9227d.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190702010315-6dee0af9227d.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/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/minio/minio-go/v6/@v/v6.0.46.zip -> github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.46.zip mirror://goproxy//github.com/minio/minio-go/v6/@v/v6.0.46.mod -> github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.46.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-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/mschoch/smat/@v/v0.0.0-20160514031455-90eadee771ae.mod -> github.com%2Fmschoch%2Fsmat%2F@v%2Fv0.0.0-20160514031455-90eadee771ae.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/ncw/go-acd/@v/v0.0.0-20171120105400-887eb06ab6a2.zip -> github.com%2Fncw%2Fgo-acd%2F@v%2Fv0.0.0-20171120105400-887eb06ab6a2.zip mirror://goproxy//github.com/ncw/go-acd/@v/v0.0.0-20171120105400-887eb06ab6a2.mod -> github.com%2Fncw%2Fgo-acd%2F@v%2Fv0.0.0-20171120105400-887eb06ab6a2.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.52.zip -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.zip mirror://goproxy//github.com/ncw/swift/@v/v1.0.52.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.mod mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.mod -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.mod mirror://goproxy//github.com/nsf/termbox-go/@v/v0.0.0-20200418040025-38ba6e5628f1.zip -> github.com%2Fnsf%2Ftermbox-go%2F@v%2Fv0.0.0-20200418040025-38ba6e5628f1.zip mirror://goproxy//github.com/nsf/termbox-go/@v/v0.0.0-20200418040025-38ba6e5628f1.mod -> github.com%2Fnsf%2Ftermbox-go%2F@v%2Fv0.0.0-20200418040025-38ba6e5628f1.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/okzk/sdnotify/@v/v0.0.0-20180710141335-d9becc38acbd.zip -> github.com%2Fokzk%2Fsdnotify%2F@v%2Fv0.0.0-20180710141335-d9becc38acbd.zip mirror://goproxy//github.com/okzk/sdnotify/@v/v0.0.0-20180710141335-d9becc38acbd.mod -> github.com%2Fokzk%2Fsdnotify%2F@v%2Fv0.0.0-20180710141335-d9becc38acbd.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.12.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/onsi/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.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pengsrc/go-shared/@v/v0.2.1-0.20190131101655-1999055a4a14.zip -> github.com%2Fpengsrc%2Fgo-shared%2F@v%2Fv0.2.1-0.20190131101655-1999055a4a14.zip mirror://goproxy//github.com/pengsrc/go-shared/@v/v0.2.1-0.20190131101655-1999055a4a14.mod -> github.com%2Fpengsrc%2Fgo-shared%2F@v%2Fv0.2.1-0.20190131101655-1999055a4a14.mod mirror://goproxy//github.com/philhofer/fwd/@v/v1.0.0.mod -> github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.11.0.zip -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/pkg/sftp/@v/v1.11.0.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.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-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.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/putdotio/go-putio/putio/@v/v0.0.0-20200123120452-16d982cac2b8.zip -> github.com%2Fputdotio%2Fgo-putio%2Fputio%2F@v%2Fv0.0.0-20200123120452-16d982cac2b8.zip mirror://goproxy//github.com/putdotio/go-putio/putio/@v/v0.0.0-20200123120452-16d982cac2b8.mod -> github.com%2Fputdotio%2Fgo-putio%2Fputio%2F@v%2Fv0.0.0-20200123120452-16d982cac2b8.mod mirror://goproxy//github.com/rfjakob/eme/@v/v1.1.1.zip -> github.com%2Frfjakob%2Feme%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/rfjakob/eme/@v/v1.1.1.mod -> github.com%2Frfjakob%2Feme%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryszard/goskiplist/@v/v0.0.0-20150312221310-2dfbae5fcf46.mod -> github.com%2Fryszard%2Fgoskiplist%2F@v%2Fv0.0.0-20150312221310-2dfbae5fcf46.mod mirror://goproxy//github.com/sevlyar/go-daemon/@v/v0.1.5.zip -> github.com%2Fsevlyar%2Fgo-daemon%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/sevlyar/go-daemon/@v/v0.1.5.mod -> github.com%2Fsevlyar%2Fgo-daemon%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.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/skratchdot/open-golang/@v/v0.0.0-20200116055534-eef842397966.zip -> github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.zip mirror://goproxy//github.com/skratchdot/open-golang/@v/v0.0.0-20200116055534-eef842397966.mod -> github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20181108003508-044398e4856c.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20181108003508-044398e4856c.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spacemonkeygo/monkit/v3/@v/v3.0.4.mod -> github.com%2Fspacemonkeygo%2Fmonkit%2Fv3%2F@v%2Fv3.0.4.mod mirror://goproxy//github.com/spacemonkeygo/monkit/v3/@v/v3.0.5.mod -> github.com%2Fspacemonkeygo%2Fmonkit%2Fv3%2F@v%2Fv3.0.5.mod mirror://goproxy//github.com/spacemonkeygo/monkit/v3/@v/v3.0.7-0.20200515175308-072401d8c752.zip -> github.com%2Fspacemonkeygo%2Fmonkit%2Fv3%2F@v%2Fv3.0.7-0.20200515175308-072401d8c752.zip mirror://goproxy//github.com/spacemonkeygo/monkit/v3/@v/v3.0.7-0.20200515175308-072401d8c752.mod -> github.com%2Fspacemonkeygo%2Fmonkit%2Fv3%2F@v%2Fv3.0.7-0.20200515175308-072401d8c752.mod mirror://goproxy//github.com/spacemonkeygo/monotime/@v/v0.0.0-20180824235756-e3f48a95f98a.mod -> github.com%2Fspacemonkeygo%2Fmonotime%2F@v%2Fv0.0.0-20180824235756-e3f48a95f98a.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.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/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.1-0.20190311161405-34c6fa2dc709.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.1-0.20190311161405-34c6fa2dc709.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/t3rm1n4l/go-mega/@v/v0.0.0-20200416171014-ffad7fcb44b8.zip -> github.com%2Ft3rm1n4l%2Fgo-mega%2F@v%2Fv0.0.0-20200416171014-ffad7fcb44b8.zip mirror://goproxy//github.com/t3rm1n4l/go-mega/@v/v0.0.0-20200416171014-ffad7fcb44b8.mod -> github.com%2Ft3rm1n4l%2Fgo-mega%2F@v%2Fv0.0.0-20200416171014-ffad7fcb44b8.mod mirror://goproxy//github.com/tinylib/msgp/@v/v1.0.2.mod -> github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.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/vivint/infectious/@v/v0.0.0-20200605153912-25a574ae18a3.zip -> github.com%2Fvivint%2Finfectious%2F@v%2Fv0.0.0-20200605153912-25a574ae18a3.zip mirror://goproxy//github.com/vivint/infectious/@v/v0.0.0-20200605153912-25a574ae18a3.mod -> github.com%2Fvivint%2Finfectious%2F@v%2Fv0.0.0-20200605153912-25a574ae18a3.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.9.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.zip -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/youmark/pkcs8/@v/v0.0.0-20200520070018-fad002e585ce.zip -> github.com%2Fyoumark%2Fpkcs8%2F@v%2Fv0.0.0-20200520070018-fad002e585ce.zip mirror://goproxy//github.com/youmark/pkcs8/@v/v0.0.0-20200520070018-fad002e585ce.mod -> github.com%2Fyoumark%2Fpkcs8%2F@v%2Fv0.0.0-20200520070018-fad002e585ce.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yunify/qingstor-sdk-go/v3/@v/v3.2.0.zip -> github.com%2Fyunify%2Fqingstor-sdk-go%2Fv3%2F@v%2Fv3.2.0.zip mirror://goproxy//github.com/yunify/qingstor-sdk-go/v3/@v/v3.2.0.mod -> github.com%2Fyunify%2Fqingstor-sdk-go%2Fv3%2F@v%2Fv3.2.0.mod mirror://goproxy//github.com/zeebo/admission/v3/@v/v3.0.1.mod -> github.com%2Fzeebo%2Fadmission%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/zeebo/assert/@v/v1.1.0.zip -> github.com%2Fzeebo%2Fassert%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/zeebo/assert/@v/v1.1.0.mod -> github.com%2Fzeebo%2Fassert%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/zeebo/errs/@v/v1.2.2.zip -> github.com%2Fzeebo%2Ferrs%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/zeebo/errs/@v/v1.2.2.mod -> github.com%2Fzeebo%2Ferrs%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/zeebo/float16/@v/v0.1.0.mod -> github.com%2Fzeebo%2Ffloat16%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/zeebo/incenc/@v/v0.0.0-20180505221441-0d92902eec54.mod -> github.com%2Fzeebo%2Fincenc%2F@v%2Fv0.0.0-20180505221441-0d92902eec54.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.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.zip -> go.opencensus.io%2F@v%2Fv0.22.4.zip mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.15.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.15.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.15.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.15.0.mod mirror://goproxy//goftp.io/server/@v/v0.4.0.zip -> goftp.io%2Fserver%2F@v%2Fv0.4.0.zip mirror://goproxy//goftp.io/server/@v/v0.4.0.mod -> goftp.io%2Fserver%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20170930174604-9419663f5a44.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20170930174604-9419663f5a44.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-20190131182504-b8fe1690c613.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190131182504-b8fe1690c613.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190219172222-a4c6cb3142f2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20200115085410-6d4e4cb37c7d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200115085410-6d4e4cb37c7d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200302210943-78000ba7a073.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190415214537-1da14a5a36f2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190415214537-1da14a5a36f2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.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.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190221075227-b4e8571b14e0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190415145633-3fd5a3612ccd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190415145633-3fd5a3612ccd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200610111108-226ff32320da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200610111108-226ff32320da.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-20200720211630-cb9d2d5c5666.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200720211630-cb9d2d5c5666.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200720211630-cb9d2d5c5666.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200720211630-cb9d2d5c5666.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200622203043-20e05c1c8ffa.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200622203043-20e05c1c8ffa.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200622203043-20e05c1c8ffa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200622203043-20e05c1c8ffa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200820180210-c8f393745106.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200820180210-c8f393745106.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200820180210-c8f393745106.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200820180210-c8f393745106.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.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.zip mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200623002339-fbb79eadd5eb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200623002339-fbb79eadd5eb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200626011028-ee7919e894b5.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200626011028-ee7919e894b5.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200626011028-ee7919e894b5.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200626011028-ee7919e894b5.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/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/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//storj.io/common/@v/v0.0.0-20200729140050-4c1ddac6fa63.zip -> storj.io%2Fcommon%2F@v%2Fv0.0.0-20200729140050-4c1ddac6fa63.zip mirror://goproxy//storj.io/common/@v/v0.0.0-20200729140050-4c1ddac6fa63.mod -> storj.io%2Fcommon%2F@v%2Fv0.0.0-20200729140050-4c1ddac6fa63.mod mirror://goproxy//storj.io/drpc/@v/v0.0.14.zip -> storj.io%2Fdrpc%2F@v%2Fv0.0.14.zip mirror://goproxy//storj.io/drpc/@v/v0.0.14.mod -> storj.io%2Fdrpc%2F@v%2Fv0.0.14.mod mirror://goproxy//storj.io/uplink/@v/v1.2.0.zip -> storj.io%2Fuplink%2F@v%2Fv1.2.0.zip mirror://goproxy//storj.io/uplink/@v/v1.2.0.mod -> storj.io%2Fuplink%2F@v%2Fv1.2.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1574af35e86894752bd090e450202c25
diff --git a/metadata/md5-cache/net-misc/rclone-9999 b/metadata/md5-cache/net-misc/rclone-9999
index f4291ad63dfd..e6792c7b5e7e 100644
--- a/metadata/md5-cache/net-misc/rclone-9999
+++ b/metadata/md5-cache/net-misc/rclone-9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0 BSD BSD-2 ISC MIT
 PROPERTIES=live
 RESTRICT=strip
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=165951ec43000252b3785674c823d8f7
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.13 b/metadata/md5-cache/net-misc/remmina-1.4.13
deleted file mode 100644
index f62297878b38..000000000000
--- a/metadata/md5-cache/net-misc/remmina-1.4.13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/wayland net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) dev-libs/openssl:0= spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
-EAPI=7
-HOMEPAGE=https://remmina.org/
-IUSE=appindicator crypt cups examples gnome-keyring kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/wayland net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) dev-libs/openssl:0= spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.13/Remmina-v1.4.13.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2c7cce59a6a9ebdd3e7ac41ad1c876c8
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.16 b/metadata/md5-cache/net-misc/remmina-1.4.16
deleted file mode 100644
index 36ac8d7693b9..000000000000
--- a/metadata/md5-cache/net-misc/remmina-1.4.16
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= dev-libs/wayland net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
-EAPI=7
-HOMEPAGE=https://remmina.org/
-IUSE=appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= dev-libs/wayland net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.16/Remmina-v1.4.16.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0b841eafdcf9e91958febaa60a68041d
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.17 b/metadata/md5-cache/net-misc/remmina-1.4.17
deleted file mode 100644
index 463c5a7bd99a..000000000000
--- a/metadata/md5-cache/net-misc/remmina-1.4.17
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= dev-libs/wayland net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
-EAPI=7
-HOMEPAGE=https://remmina.org/
-IUSE=appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= dev-libs/wayland net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.17/Remmina-v1.4.17.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0b841eafdcf9e91958febaa60a68041d
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.19 b/metadata/md5-cache/net-misc/remmina-1.4.19
deleted file mode 100644
index fb2b2b58aff8..000000000000
--- a/metadata/md5-cache/net-misc/remmina-1.4.19
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libappindicator:3 dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= dev-libs/wayland net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
-EAPI=7
-HOMEPAGE=https://remmina.org/
-IUSE=crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libappindicator:3 dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= dev-libs/wayland net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.19/Remmina-v1.4.19.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3eb043c488e49abd2076dc51f6be139e
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.20 b/metadata/md5-cache/net-misc/remmina-1.4.20
index 316df6620ff8..7987495a9669 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.20
+++ b/metadata/md5-cache/net-misc/remmina-1.4.20
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libappindicator:3 dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
+DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libappindicator:3 dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A GTK+ RDP, SPICE, VNC and SSH client
 EAPI=7
 HOMEPAGE=https://remmina.org/
-IUSE=crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf
+IUSE=crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit zeroconf
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libappindicator:3 dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libappindicator:3 dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.20/Remmina-v1.4.20.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f26f429898a30c28f57edc316bf98629
+_md5_=9722286c2e694d568875b969cd01ffe8
diff --git a/metadata/md5-cache/net-misc/scponly-4.8-r6 b/metadata/md5-cache/net-misc/scponly-4.8-r6
deleted file mode 100644
index ae465523c339..000000000000
--- a/metadata/md5-cache/net-misc/scponly-4.8-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst
-DEPEND=sys-apps/sed net-misc/openssh quota? ( sys-fs/quota ) rsync? ( net-misc/rsync ) subversion? ( dev-vcs/subversion ) unison? ( net-misc/unison:= )
-DESCRIPTION=A tiny pseudoshell which only permits scp and sftp
-EAPI=7
-HOMEPAGE=https://github.com/scponly/scponly
-IUSE=+sftp scp winscp gftp rsync unison subversion wildcards quota passwd logging
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=BSD-2
-RDEPEND=sys-apps/sed net-misc/openssh quota? ( sys-fs/quota ) rsync? ( net-misc/rsync ) subversion? ( dev-vcs/subversion ) unison? ( net-misc/unison:= )
-REQUIRED_USE=|| ( sftp scp winscp rsync unison subversion )
-SLOT=0
-SRC_URI=mirror://sourceforge/scponly/scponly-4.8.tgz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=ed668ea049d5a012e9bc419c3eaf1cbe
diff --git a/metadata/md5-cache/net-misc/sipcalc-1.1.6 b/metadata/md5-cache/net-misc/sipcalc-1.1.6
deleted file mode 100644
index 3ee4b7a05ee3..000000000000
--- a/metadata/md5-cache/net-misc/sipcalc-1.1.6
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Sipcalc is an advanced console-based IP subnet calculator
-EAPI=7
-HOMEPAGE=http://www.routemeister.net/projects/sipcalc/
-KEYWORDS=amd64 ~arm64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.routemeister.net/projects/sipcalc/files/sipcalc-1.1.6.tar.gz
-_md5_=6e9a3afebd9fd0f2f6048d05b6664a4c
diff --git a/metadata/md5-cache/net-misc/sipcalc-1.1.6-r1 b/metadata/md5-cache/net-misc/sipcalc-1.1.6-r1
index 8d2aa13ca064..ef132d802d3c 100644
--- a/metadata/md5-cache/net-misc/sipcalc-1.1.6-r1
+++ b/metadata/md5-cache/net-misc/sipcalc-1.1.6-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
-DESCRIPTION=Sipcalc is an advanced console-based IP subnet calculator
+DESCRIPTION=Advanced console-based IPv4/IPv6 subnet calculator
 EAPI=7
 HOMEPAGE=http://www.routemeister.net/projects/sipcalc/ https://github.com/sii/sipcalc
-KEYWORDS=~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.routemeister.net/projects/sipcalc/files/sipcalc-1.1.6.tar.gz
-_md5_=a374ab8a220d8ed3357e2461750c8033
+_md5_=5a87c1bb2a310d922c8b0f6708ca7650
diff --git a/metadata/md5-cache/net-misc/spread-4.4.1 b/metadata/md5-cache/net-misc/spread-4.4.1
deleted file mode 100644
index 3644d9007848..000000000000
--- a/metadata/md5-cache/net-misc/spread-4.4.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Distributed network messaging system
-EAPI=6
-HOMEPAGE=http://www.spread.org
-KEYWORDS=amd64 x86
-LICENSE=Spread-1.0
-SLOT=0
-SRC_URI=mirror://gentoo/spread-src-4.4.1.tar.gz
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=b72081808897c49b1782265c6ab4c87c
diff --git a/metadata/md5-cache/net-misc/spread-4.4.1-r1 b/metadata/md5-cache/net-misc/spread-4.4.1-r1
new file mode 100644
index 000000000000..ae25dd2d731e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/spread-4.4.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Distributed network messaging system
+EAPI=7
+HOMEPAGE=http://www.spread.org
+KEYWORDS=amd64 x86
+LICENSE=Spread-1.0
+RDEPEND=acct-group/spread acct-user/spread
+SLOT=0
+SRC_URI=mirror://gentoo/spread-src-4.4.1.tar.gz
+_md5_=2deab20d43c1d7e38b1ef8dd5626e8ba
diff --git a/metadata/md5-cache/net-misc/spread-5.0.1 b/metadata/md5-cache/net-misc/spread-5.0.1
deleted file mode 100644
index 5944029bb1a9..000000000000
--- a/metadata/md5-cache/net-misc/spread-5.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Distributed network messaging system
-EAPI=6
-HOMEPAGE=http://www.spread.org
-KEYWORDS=~amd64 ~x86
-LICENSE=Spread-1.0
-SLOT=0
-SRC_URI=mirror://gentoo/spread-src-5.0.1.tar.gz
-_eclasses_=user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=4103e0c4137b00b45bf97bbed0a555d6
diff --git a/metadata/md5-cache/net-misc/spread-5.0.1-r1 b/metadata/md5-cache/net-misc/spread-5.0.1-r1
new file mode 100644
index 000000000000..f91fcc9043e5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/spread-5.0.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Distributed network messaging system
+EAPI=7
+HOMEPAGE=http://www.spread.org
+KEYWORDS=~amd64 ~x86
+LICENSE=Spread-1.0
+RDEPEND=acct-group/spread acct-user/spread
+SLOT=0
+SRC_URI=mirror://gentoo/spread-src-5.0.1.tar.gz
+_md5_=6780a715d94ce06a91ef8113757fc05e
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.2 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.2
deleted file mode 100644
index 1ec716a38be8..000000000000
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The X2Go server
-EAPI=6
-HOMEPAGE=http://www.x2go.org
-IUSE=+fuse postgres +sqlite
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:= dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which dev-perl/Switch dev-perl/Try-Tiny media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.99.14 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
-REQUIRED_USE=|| ( postgres sqlite )
-SLOT=0
-SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.2.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3572db335e01879b409700ea4ac18282
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.3
deleted file mode 100644
index 739a6680fd13..000000000000
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The X2Go server
-EAPI=7
-HOMEPAGE=http://www.x2go.org
-IUSE=+fuse postgres +sqlite
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:= dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which dev-perl/Switch dev-perl/Try-Tiny media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.99.14 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
-REQUIRED_USE=|| ( postgres sqlite )
-SLOT=0
-SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.3.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=036c3c5b88e49f1e3ef59c5c2ea0cb61
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
index d4f4bb4a3098..3f1da088b982 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
+++ b/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=The X2Go server
 EAPI=7
 HOMEPAGE=http://www.x2go.org
 IUSE=+fuse postgres +sqlite
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=acct-user/x2gouser acct-user/x2goprint dev-lang/perl:= dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which dev-perl/Switch dev-perl/Try-Tiny media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.99.14 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.3.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ff71f3c81b75390accf1064c4d28b216
+_md5_=5ac877c24bd6e0ae5a99a383917ac1a2
diff --git a/metadata/md5-cache/net-misc/yandex-disk-0.1.5.1039_p1 b/metadata/md5-cache/net-misc/yandex-disk-0.1.5.1039_p1
index dc9387d28eea..9dd6a9782b5e 100644
--- a/metadata/md5-cache/net-misc/yandex-disk-0.1.5.1039_p1
+++ b/metadata/md5-cache/net-misc/yandex-disk-0.1.5.1039_p1
@@ -9,5 +9,5 @@ LICENSE=YDSLA
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=amd64? ( https://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/yandex-disk-0.1.5.1039-1.fedora.x86_64.rpm ) x86? ( https://repo.yandex.ru/yandex-disk/rpm/stable/i386/yandex-disk-0.1.5.1039-1.fedora.i386.rpm )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=872eb498ff497327080e7058863b5c42
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2021.05.16 b/metadata/md5-cache/net-misc/youtube-dl-2021.05.16
deleted file mode 100644
index 619f2539f4b0..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2021.05.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install 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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2021.05.16/youtube-dl-2021.05.16.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=15ace8fbce6d5fcadec9af32ecb700d4
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2021.06.06 b/metadata/md5-cache/net-misc/youtube-dl-2021.06.06
index 0d8c8bd46ac6..e69893796aa4 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2021.06.06
+++ b/metadata/md5-cache/net-misc/youtube-dl-2021.06.06
@@ -4,12 +4,12 @@ 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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2021.06.06/youtube-dl-2021.06.06.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d2e65e17b10f09cfd90a83e3cd2d4736
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2b9b8df6fc44933040b19fca1d408700
diff --git a/metadata/md5-cache/net-misc/youtube-dl-9999 b/metadata/md5-cache/net-misc/youtube-dl-9999
index ac69f2d8fb9e..b6bceb686dfc 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-9999
+++ b/metadata/md5-cache/net-misc/youtube-dl-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2136af00ab4792c02be25819fb1773e
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 5a589c688033..e0ce0fa348d7 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/automatic-0.8.3 b/metadata/md5-cache/net-p2p/automatic-0.8.3
deleted file mode 100644
index 858ebf2baaa7..000000000000
--- a/metadata/md5-cache/net-p2p/automatic-0.8.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=dev-libs/libxml2:2 dev-libs/libpcre:3 net-misc/curl app-admin/logrotate sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=RSS downloader for Tranmission
-EAPI=6
-HOMEPAGE=https://github.com/1100101/Automatic
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2:2 dev-libs/libpcre:3 net-misc/curl
-SLOT=0
-SRC_URI=https://github.com/1100101/Automatic/archive/v0.8.3.tar.gz -> automatic-0.8.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=27baff7e3a5a297c124341444a0e26a6
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1
index 784031d9e201..f2314947879e 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/bf0dc356ac4a2bdeda1908af021dea2de0dfb35a.tar.gz -> bitcoin-v0.20.1.tar.gz https://bitcoinknots.org/files/0.20.x/0.20.1.knots20200815/bitcoin-0.20.1.knots20200815.patches.txz -> bitcoin-0.20.1.knots20200815.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f3a23c2f70161ef3c7da30ede04d4929
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.0 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.0
index e8b75e430bdb..23b6703e9044 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.0
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.58.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/95ea54ba089610019a74c1176a2c7c0dba144b1c.tar.gz -> bitcoin-v0.21.0.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.0.knots20210130/bitcoin-0.21.0.knots20210130.patches.txz -> bitcoin-0.21.0.knots20210130.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c01991113b03be457a857e201f75a5df
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.1 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.1
index 16dfe21c6413..30910149e3aa 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.58.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf.tar.gz -> bitcoin-v0.21.1.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.1.knots20210629/bitcoin-0.21.1.knots20210629.patches.txz -> bitcoin-0.21.1.knots20210629.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=325e5da3a6b23fcab64bc179de28c18a
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.20.1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.20.1
index 4ea4fd70832d..40300ab5494e 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.20.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.20.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >dev-libs/libsecp256k1-0.1_pre2017
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/bf0dc356ac4a2bdeda1908af021dea2de0dfb35a.tar.gz -> bitcoin-v0.20.1.tar.gz https://bitcoinknots.org/files/0.20.x/0.20.1.knots20200815/bitcoin-0.20.1.knots20200815.patches.txz -> bitcoin-0.20.1.knots20200815.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	db-use	063d3e7add942762a8203b52ec3066c2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	db-use	063d3e7add942762a8203b52ec3066c2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2356baa8a717b86b352e6702d07ae98d
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.0 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.0
index 50b841094d03..7251e918ea8c 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.0
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.58.0:=[threads(+)] >dev-libs/libsecp256k1-0.1_pre2020
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/95ea54ba089610019a74c1176a2c7c0dba144b1c.tar.gz -> bitcoin-v0.21.0.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.0.knots20210130/bitcoin-0.21.0.knots20210130.patches.txz -> bitcoin-0.21.0.knots20210130.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	db-use	063d3e7add942762a8203b52ec3066c2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	db-use	063d3e7add942762a8203b52ec3066c2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e1473bc4e6f21173f8610a9c2826c911
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.1
index fe396c32497b..c70645448b36 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.1
@@ -12,5 +12,5 @@ REQUIRED_USE=sqlite? ( wallet ) berkdb? ( wallet ) wallet? ( || ( berkdb sqlite
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf.tar.gz -> bitcoin-v0.21.1.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.1.knots20210629/bitcoin-0.21.1.knots20210629.patches.txz -> bitcoin-0.21.1.knots20210629.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	db-use	063d3e7add942762a8203b52ec3066c2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	db-use	063d3e7add942762a8203b52ec3066c2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c932045f5644c8b00ed004ae62f2abb8
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.20.1 b/metadata/md5-cache/net-p2p/bitcoind-0.20.1
index 742d4932b2b3..404b29778389 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.20.1
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.20.1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/bitcoin acct-user/bitcoin >=dev-libs/boost-1.52.0:=[threads(+
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/bf0dc356ac4a2bdeda1908af021dea2de0dfb35a.tar.gz -> bitcoin-v0.20.1.tar.gz https://bitcoinknots.org/files/0.20.x/0.20.1.knots20200815/bitcoin-0.20.1.knots20200815.patches.txz -> bitcoin-0.20.1.knots20200815.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	db-use	063d3e7add942762a8203b52ec3066c2	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	db-use	063d3e7add942762a8203b52ec3066c2	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d45579e6d9dc1ebbd67ece387d63ee1
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.21.0 b/metadata/md5-cache/net-p2p/bitcoind-0.21.0
index 83857f7818c2..803e514fdbef 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.21.0
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.21.0
@@ -11,5 +11,5 @@ RDEPEND=acct-group/bitcoin acct-user/bitcoin >=dev-libs/boost-1.58.0:=[threads(+
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/95ea54ba089610019a74c1176a2c7c0dba144b1c.tar.gz -> bitcoin-v0.21.0.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.0.knots20210130/bitcoin-0.21.0.knots20210130.patches.txz -> bitcoin-0.21.0.knots20210130.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	db-use	063d3e7add942762a8203b52ec3066c2	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	db-use	063d3e7add942762a8203b52ec3066c2	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42b9ecbf3dbc3486eca3df5705d29396
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.21.1 b/metadata/md5-cache/net-p2p/bitcoind-0.21.1
index a8a9afd58ab3..b790d02eff6b 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.21.1
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.21.1
@@ -12,5 +12,5 @@ REQUIRED_USE=sqlite? ( wallet ) berkdb? ( wallet ) wallet? ( || ( berkdb sqlite
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf.tar.gz -> bitcoin-v0.21.1.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.1.knots20210629/bitcoin-0.21.1.knots20210629.patches.txz -> bitcoin-0.21.1.knots20210629.patches.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	db-use	063d3e7add942762a8203b52ec3066c2	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	db-use	063d3e7add942762a8203b52ec3066c2	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=807efe2d7c7d9a9369c6e52f6e5b487f
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-0.7.0 b/metadata/md5-cache/net-p2p/go-ipfs-0.7.0
index 32096d8b7f33..629b0b27a669 100644
--- a/metadata/md5-cache/net-p2p/go-ipfs-0.7.0
+++ b/metadata/md5-cache/net-p2p/go-ipfs-0.7.0
@@ -9,5 +9,5 @@ RDEPEND=!net-p2p/go-ipfs-bin acct-group/ipfs acct-user/ipfs sys-fs/fuse:0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/ipfs/go-ipfs/archive/v0.7.0.tar.gz -> go-ipfs-0.7.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200117225306-7b5117fecadc.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200117225306-7b5117fecadc.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200117225306-7b5117fecadc.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200117225306-7b5117fecadc.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/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/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//dmitri.shuralyov.com/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20180913140656-343706a395b7.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20180913140656-343706a395b7.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190306092124-e2d15f34fcf9.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190825152654-46b345b51c96.zip -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.zip mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190825152654-46b345b51c96.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.mod mirror://goproxy//github.com/!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/!kubuxu/go-os-helper/@v/v0.0.1.zip -> github.com%2F!kubuxu%2Fgo-os-helper%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/!kubuxu/go-os-helper/@v/v0.0.1.mod -> github.com%2F!kubuxu%2Fgo-os-helper%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!stebalien/go-bitfield/@v/v0.0.0-20180330043415-076a62f9ce6e.mod -> github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.0-20180330043415-076a62f9ce6e.mod mirror://goproxy//github.com/!stebalien/go-bitfield/@v/v0.0.1.zip -> github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/!stebalien/go-bitfield/@v/v0.0.1.mod -> github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/aead/siphash/@v/v1.0.1.mod -> github.com%2Faead%2Fsiphash%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/alexbrainman/goissue34681/@v/v0.0.0-20191006012335-3fc7a47baff5.zip -> github.com%2Falexbrainman%2Fgoissue34681%2F@v%2Fv0.0.0-20191006012335-3fc7a47baff5.zip mirror://goproxy//github.com/alexbrainman/goissue34681/@v/v0.0.0-20191006012335-3fc7a47baff5.mod -> github.com%2Falexbrainman%2Fgoissue34681%2F@v%2Fv0.0.0-20191006012335-3fc7a47baff5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/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/benbjohnson/clock/@v/v1.0.2.zip -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.2.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.zip -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/bren2010/proquint/@v/v0.0.0-20160323162903-38337c27106d.zip -> github.com%2Fbren2010%2Fproquint%2F@v%2Fv0.0.0-20160323162903-38337c27106d.zip mirror://goproxy//github.com/bren2010/proquint/@v/v0.0.0-20160323162903-38337c27106d.mod -> github.com%2Fbren2010%2Fproquint%2F@v%2Fv0.0.0-20160323162903-38337c27106d.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190213025234-306aecffea32.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190213025234-306aecffea32.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190523000118-16327141da8c.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190523000118-16327141da8c.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190605094302-a0d1e3e36d50.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190605094302-a0d1e3e36d50.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190824003749-130ea5bddde3.zip -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190824003749-130ea5bddde3.zip mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190824003749-130ea5bddde3.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190824003749-130ea5bddde3.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.20.1-beta.zip -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.zip mirror://goproxy//github.com/btcsuite/btcd/@v/v0.20.1-beta.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.mod mirror://goproxy//github.com/btcsuite/btclog/@v/v0.0.0-20170628155309-84c8d2346e9f.mod -> github.com%2Fbtcsuite%2Fbtclog%2F@v%2Fv0.0.0-20170628155309-84c8d2346e9f.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v0.0.0-20190207003914-4c204d697803.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190207003914-4c204d697803.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v0.0.0-20190425235716-9e5f4b9a998d.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190425235716-9e5f4b9a998d.mod mirror://goproxy//github.com/btcsuite/go-socks/@v/v0.0.0-20170105172521-4720035b7bfd.mod -> github.com%2Fbtcsuite%2Fgo-socks%2F@v%2Fv0.0.0-20170105172521-4720035b7bfd.mod mirror://goproxy//github.com/btcsuite/goleveldb/@v/v0.0.0-20160330041536-7834afc9e8cd.mod -> github.com%2Fbtcsuite%2Fgoleveldb%2F@v%2Fv0.0.0-20160330041536-7834afc9e8cd.mod mirror://goproxy//github.com/btcsuite/snappy-go/@v/v0.0.0-20151229074030-0bdef8d06723.mod -> github.com%2Fbtcsuite%2Fsnappy-go%2F@v%2Fv0.0.0-20151229074030-0bdef8d06723.mod mirror://goproxy//github.com/btcsuite/websocket/@v/v0.0.0-20150119174127-31079b680792.mod -> github.com%2Fbtcsuite%2Fwebsocket%2F@v%2Fv0.0.0-20150119174127-31079b680792.mod mirror://goproxy//github.com/btcsuite/winsvc/@v/v1.0.0.mod -> github.com%2Fbtcsuite%2Fwinsvc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/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/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/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-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.2.1-0.20180108230905-e214231b295a.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.1-0.20180108230905-e214231b295a.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/crackcomm/go-gitignore/@v/v0.0.0-20170627025303-887ab5e44cc3.zip -> github.com%2Fcrackcomm%2Fgo-gitignore%2F@v%2Fv0.0.0-20170627025303-887ab5e44cc3.zip mirror://goproxy//github.com/crackcomm/go-gitignore/@v/v0.0.0-20170627025303-887ab5e44cc3.mod -> github.com%2Fcrackcomm%2Fgo-gitignore%2F@v%2Fv0.0.0-20170627025303-887ab5e44cc3.mod mirror://goproxy//github.com/cskr/pubsub/@v/v1.0.2.zip -> github.com%2Fcskr%2Fpubsub%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/cskr/pubsub/@v/v1.0.2.mod -> github.com%2Fcskr%2Fpubsub%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20171005155431-ecdeabc65495.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20171005155431-ecdeabc65495.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/davidlazar/go-crypto/@v/v0.0.0-20170701192655-dcfb0a7ac018.zip -> github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20170701192655-dcfb0a7ac018.zip mirror://goproxy//github.com/davidlazar/go-crypto/@v/v0.0.0-20170701192655-dcfb0a7ac018.mod -> github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20170701192655-dcfb0a7ac018.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.5.5-0.20190226225317-8115aed38f8f.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.5-0.20190226225317-8115aed38f8f.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0-rc1.zip -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0-rc1.zip mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0-rc1.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0-rc1.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0.zip -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.1.zip -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.1.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190104051053-3adb47b1fb0f.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190104051053-3adb47b1fb0f.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elgris/jsondiff/@v/v0.0.0-20160530203242-765b5c24c302.zip -> github.com%2Felgris%2Fjsondiff%2F@v%2Fv0.0.0-20160530203242-765b5c24c302.zip mirror://goproxy//github.com/elgris/jsondiff/@v/v0.0.0-20160530203242-765b5c24c302.mod -> github.com%2Felgris%2Fjsondiff%2F@v%2Fv0.0.0-20160530203242-765b5c24c302.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/facebookgo/atomicfile/@v/v0.0.0-20151019160806-2de1f203e7d5.zip -> github.com%2Ffacebookgo%2Fatomicfile%2F@v%2Fv0.0.0-20151019160806-2de1f203e7d5.zip mirror://goproxy//github.com/facebookgo/atomicfile/@v/v0.0.0-20151019160806-2de1f203e7d5.mod -> github.com%2Ffacebookgo%2Fatomicfile%2F@v%2Fv0.0.0-20151019160806-2de1f203e7d5.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fd/go-nat/@v/v1.0.0.mod -> github.com%2Ffd%2Fgo-nat%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/flynn/noise/@v/v0.0.0-20180327030543-2492fe189ae6.zip -> github.com%2Fflynn%2Fnoise%2F@v%2Fv0.0.0-20180327030543-2492fe189ae6.zip mirror://goproxy//github.com/flynn/noise/@v/v0.0.0-20180327030543-2492fe189ae6.mod -> github.com%2Fflynn%2Fnoise%2F@v%2Fv0.0.0-20180327030543-2492fe189ae6.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.zip -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.1.zip -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.1.mod -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/go-bindata/go-bindata/v3/@v/v3.1.3.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2Fv3%2F@v%2Fv3.1.3.zip mirror://goproxy//github.com/go-bindata/go-bindata/v3/@v/v3.1.3.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20180628173108-788fd7840127.zip -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.zip mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20180628173108-788fd7840127.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.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/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.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-20191027212112-611e8accdfc9.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.zip 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.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.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.zip 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/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gopacket/@v/v1.1.17.zip -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.17.zip mirror://goproxy//github.com/google/gopacket/@v/v1.1.17.mod -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.17.mod mirror://goproxy//github.com/google/gopacket/@v/v1.1.18.zip -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.18.zip mirror://goproxy//github.com/google/gopacket/@v/v1.1.18.mod -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.18.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-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.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.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/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190430165422-3e4dfb77656c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190430165422-3e4dfb77656c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190812055157-5d271430af9f.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190812055157-5d271430af9f.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190812055157-5d271430af9f.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190812055157-5d271430af9f.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/gxed/hashland/keccakpg/@v/v0.0.1.mod -> github.com%2Fgxed%2Fhashland%2Fkeccakpg%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/gxed/hashland/murmur3/@v/v0.0.1.mod -> github.com%2Fgxed%2Fhashland%2Fmurmur3%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/gxed/pubsub/@v/v0.0.0-20180201040156-26ebdf44f824.mod -> github.com%2Fgxed%2Fpubsub%2F@v%2Fv0.0.0-20180201040156-26ebdf44f824.mod mirror://goproxy//github.com/hannahhoward/go-pubsub/@v/v0.0.0-20200423002714-8d62886cc36e.zip -> github.com%2Fhannahhoward%2Fgo-pubsub%2F@v%2Fv0.0.0-20200423002714-8d62886cc36e.zip mirror://goproxy//github.com/hannahhoward/go-pubsub/@v/v0.0.0-20200423002714-8d62886cc36e.mod -> github.com%2Fhannahhoward%2Fgo-pubsub%2F@v%2Fv0.0.0-20200423002714-8d62886cc36e.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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/huin/goupnp/@v/v0.0.0-20180415215157-1395d1447324.mod -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv0.0.0-20180415215157-1395d1447324.mod mirror://goproxy//github.com/huin/goupnp/@v/v1.0.0.zip -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/huin/goupnp/@v/v1.0.0.mod -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huin/goutil/@v/v0.0.0-20170803182201-1ca381bf3150.mod -> github.com%2Fhuin%2Fgoutil%2F@v%2Fv0.0.0-20170803182201-1ca381bf3150.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/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.1.mod -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.4.zip -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.4.mod -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.0.9.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.3.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.8.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.2.20.zip -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.2.20.zip mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.2.20.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.2.20.mod mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.2.zip -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.3.zip -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.3.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.4.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.5.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.6.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.7.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-cidutil/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-cidutil%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-cidutil/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-cidutil%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.1.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.3.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.3.1.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.3.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.4.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.4.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.4.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.4.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.5.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.5.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/ipfs/go-detect-race/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-detect-race%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-detect-race/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-detect-race%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.5.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.7.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.1.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.1.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.3.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.3.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.4.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.4.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/ipfs/go-ds-flatfs/@v/v0.4.5.zip -> github.com%2Fipfs%2Fgo-ds-flatfs%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/ipfs/go-ds-flatfs/@v/v0.4.5.mod -> github.com%2Fipfs%2Fgo-ds-flatfs%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.1.zip -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.1.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.2.zip -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.2.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/ipfs/go-ds-measure/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ds-measure%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ds-measure/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ds-measure%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-filestore/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-filestore%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-filestore/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-filestore%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-fs-lock/@v/v0.0.6.zip -> github.com%2Fipfs%2Fgo-fs-lock%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/ipfs/go-fs-lock/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-fs-lock%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-graphsync/@v/v0.1.1.zip -> github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/ipfs/go-graphsync/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.4.zip -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.4.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/ipfs/go-ipfs-blocksutil/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-blocksutil%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-blocksutil/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-blocksutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.5.zip -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-ipfs-cmds/@v/v0.4.0.zip -> github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-cmds/@v/v0.4.0.mod -> github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-config/@v/v0.9.0.zip -> github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-config/@v/v0.9.0.mod -> github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.0-20181109222059-70721b86a9a8.mod -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.0-20181109222059-70721b86a9a8.mod mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.1.1.zip -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-exchange-interface/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-exchange-interface%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-exchange-interface/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-exchange-interface%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-exchange-offline/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-exchange-offline%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-exchange-offline/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-exchange-offline%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.8.zip -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.8.mod -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/ipfs/go-ipfs-flags/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-flags%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-pinner/@v/v0.0.4.zip -> github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ipfs/go-ipfs-pinner/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-ipfs-posinfo/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-posinfo%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-posinfo/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-posinfo%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipfs-provider/@v/v0.4.3.zip -> github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/ipfs/go-ipfs-provider/@v/v0.4.3.mod -> github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.4.zip -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.2.0.zip -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.2.0.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ipfs/go-ipld-git/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-ipld-git/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-ipns/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipns/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-log/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-log/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.1.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.1.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.2.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.2.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.3.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.3.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.4.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.4.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.1.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.1.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.2.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.2.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.2.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.2.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.3.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.3.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.3.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.5.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.5.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.1.1.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.1.1.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.2.3.zip -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.2.3.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.0.zip -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.0.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.1.zip -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.1.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.2.zip -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.2.zip mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.2.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/ipfs/go-metrics-interface/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-metrics-interface%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-metrics-interface/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-metrics-interface%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-metrics-prometheus/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-metrics-prometheus%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-metrics-prometheus/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-metrics-prometheus%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-mfs/@v/v0.1.2.zip -> github.com%2Fipfs%2Fgo-mfs%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/ipfs/go-mfs/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-mfs%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.7.zip -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.8.zip -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.8.mod -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.2.0.zip -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.2.0.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.2.4.zip -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.2.4.mod -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/ipfs/go-verifcid/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-verifcid%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-verifcid/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-verifcid%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.3.0.zip -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.3.0.mod -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.4.0.zip -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.4.0.mod -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/ipld/go-car/@v/v0.1.1-0.20200429200904-c222d793c339.zip -> github.com%2Fipld%2Fgo-car%2F@v%2Fv0.1.1-0.20200429200904-c222d793c339.zip mirror://goproxy//github.com/ipld/go-car/@v/v0.1.1-0.20200429200904-c222d793c339.mod -> github.com%2Fipld%2Fgo-car%2F@v%2Fv0.1.1-0.20200429200904-c222d793c339.mod mirror://goproxy//github.com/ipld/go-ipld-prime/@v/v0.0.2-0.20200428162820-8b59dc292b8e.zip -> github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.0.2-0.20200428162820-8b59dc292b8e.zip mirror://goproxy//github.com/ipld/go-ipld-prime/@v/v0.0.2-0.20200428162820-8b59dc292b8e.mod -> github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.0.2-0.20200428162820-8b59dc292b8e.mod mirror://goproxy//github.com/ipld/go-ipld-prime-proto/@v/v0.0.0-20200428191222-c1ffdadc01e1.zip -> github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.0.0-20200428191222-c1ffdadc01e1.zip mirror://goproxy//github.com/ipld/go-ipld-prime-proto/@v/v0.0.0-20200428191222-c1ffdadc01e1.mod -> github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.0.0-20200428191222-c1ffdadc01e1.mod mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.4.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.5.zip -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.5.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.1.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.1.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.0.0-20150120210510-1bb1476777ec.mod -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.0.0-20150120210510-1bb1476777ec.mod mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.1.0.zip -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.1.0.mod -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jbenet/go-is-domain/@v/v1.0.5.zip -> github.com%2Fjbenet%2Fgo-is-domain%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/jbenet/go-is-domain/@v/v1.0.5.mod -> github.com%2Fjbenet%2Fgo-is-domain%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jbenet/go-random/@v/v0.0.0-20190219211222-123a90aedc0c.zip -> github.com%2Fjbenet%2Fgo-random%2F@v%2Fv0.0.0-20190219211222-123a90aedc0c.zip mirror://goproxy//github.com/jbenet/go-random/@v/v0.0.0-20190219211222-123a90aedc0c.mod -> github.com%2Fjbenet%2Fgo-random%2F@v%2Fv0.0.0-20190219211222-123a90aedc0c.mod mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.0.0-20150120210811-aac704a3f4f2.zip -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.0.0-20150120210811-aac704a3f4f2.zip mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.0.0-20150120210811-aac704a3f4f2.mod -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.0.0-20150120210811-aac704a3f4f2.mod mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.1.0.zip -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.1.0.mod -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.0.0-20160826012719-b497e2f366b8.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.0.0-20160826012719-b497e2f366b8.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.3.zip -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.3.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.4.zip -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.4.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v0.0.0-20141203071132-1679536dcc89.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv0.0.0-20141203071132-1679536dcc89.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/jrick/logrotate/@v/v1.0.0.mod -> github.com%2Fjrick%2Flogrotate%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/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.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kami-zh/go-capturer/@v/v0.0.0-20171211120116-e492ea43421d.mod -> github.com%2Fkami-zh%2Fgo-capturer%2F@v%2Fv0.0.0-20171211120116-e492ea43421d.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.zip -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kkdai/bstream/@v/v0.0.0-20161212061736-f391b8402d23.mod -> github.com%2Fkkdai%2Fbstream%2F@v%2Fv0.0.0-20161212061736-f391b8402d23.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/koron/go-ssdp/@v/v0.0.0-20180514024734-4a0ed625a78b.zip -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20180514024734-4a0ed625a78b.zip mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20180514024734-4a0ed625a78b.mod -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20180514024734-4a0ed625a78b.mod mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20191105050749-2e1c40ed0b5d.zip -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20191105050749-2e1c40ed0b5d.zip mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20191105050749-2e1c40ed0b5d.mod -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20191105050749-2e1c40ed0b5d.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/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/libp2p/go-addr-util/@v/v0.0.1.zip -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-cidranger/@v/v1.1.0.zip -> github.com%2Flibp2p%2Fgo-cidranger%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/libp2p/go-cidranger/@v/v1.1.0.mod -> github.com%2Flibp2p%2Fgo-cidranger%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/libp2p/go-conn-security/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-conn-security%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.1.zip -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.3.zip -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.0.30.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.0.30.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.6.0.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.6.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.6.1.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.6.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.0.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.4.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.4.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.4.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.8.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.8.3.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.8.3.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.11.0.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.11.0.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.11.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.11.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-asn-util/@v/v0.0.0-20200825225859-85005c6cf052.zip -> github.com%2Flibp2p%2Fgo-libp2p-asn-util%2F@v%2Fv0.0.0-20200825225859-85005c6cf052.zip mirror://goproxy//github.com/libp2p/go-libp2p-asn-util/@v/v0.0.0-20200825225859-85005c6cf052.mod -> github.com%2Flibp2p%2Fgo-libp2p-asn-util%2F@v%2Fv0.0.0-20200825225859-85005c6cf052.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.3.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.3.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.3.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.6.zip -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.0.9.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.1.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.3.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-connmgr/@v/v0.2.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-connmgr%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-connmgr/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-connmgr%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.5.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.5.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.6.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.7.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.5.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.5.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-gostream/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-gostream/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-host/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-host%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-host/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-host%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-http/@v/v0.1.5.zip -> github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/libp2p/go-libp2p-http/@v/v0.1.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-pnet/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-pnet%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-kad-dht/@v/v0.9.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-kad-dht/@v/v0.9.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-kbucket/@v/v0.4.7.zip -> github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.4.7.zip mirror://goproxy//github.com/libp2p/go-libp2p-kbucket/@v/v0.4.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.4.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-metrics/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.5.zip -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.6.zip -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-net/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-net/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-net%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-noise/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-noise/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.6.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.6.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-pnet/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-pnet%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-pnet/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-pnet%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-protocol/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-protocol%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-protocol/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-protocol%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.3.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.3.5.zip -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.3.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub-router/@v/v0.3.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.3.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-pubsub-router/@v/v0.3.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-quic-transport/@v/v0.8.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-quic-transport/@v/v0.8.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-routing/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-routing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-routing-helpers/@v/v0.2.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-routing-helpers%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-routing-helpers/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-routing-helpers%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.8.zip -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.8.zip mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.8.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.8.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-tls/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-tls%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-tls/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-tls%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.5.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.5.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.7.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.7.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.8.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.8.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.8.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.8.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.5.zip -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.2.zip -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.6.zip -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.3.zip -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.5.zip -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.2.zip -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.3.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.5.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.7.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.7.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.1.zip -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.3.zip -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-sockaddr/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-sockaddr/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-socket-activation/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-socket-activation%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-socket-activation/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-socket-activation%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-stream-muxer/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-stream-muxer%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-stream-muxer/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-testutil/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-testutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-testutil/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-testutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.1.zip -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.1.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.2.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.3.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.3.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.0.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.0.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.3.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.3.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.5.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.5.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.7.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.7.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.7.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.7.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.18.0.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.18.0.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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-20180823135443-60711f1a8329.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.zip 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/marten-seemann/qpack/@v/v0.2.0.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.zip -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.0.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.0.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.12.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.12.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.12.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.12.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.28.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.28.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.28.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.28.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.mod mirror://goproxy//github.com/minio/blake2b-simd/@v/v0.0.0-20160723061019-3f5f724cb5b1.zip -> github.com%2Fminio%2Fblake2b-simd%2F@v%2Fv0.0.0-20160723061019-3f5f724cb5b1.zip mirror://goproxy//github.com/minio/blake2b-simd/@v/v0.0.0-20160723061019-3f5f724cb5b1.mod -> github.com%2Fminio%2Fblake2b-simd%2F@v%2Fv0.0.0-20160723061019-3f5f724cb5b1.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.0.0-20190131020904-2d45a736cd16.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.0.0-20190131020904-2d45a736cd16.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.0.0-20190328051042-05b4dd3047e5.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.0.0-20190328051042-05b4dd3047e5.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.0.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1-0.20190913151208-6de447530771.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1-0.20190913151208-6de447530771.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.0.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.1.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.2.zip -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.2.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.3.zip -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.3.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.2.0.zip -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/mr-tron/base58/@v/v1.2.0.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/multiformats/go-base32/@v/v0.0.3.zip -> github.com%2Fmultiformats%2Fgo-base32%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/multiformats/go-base32/@v/v0.0.3.mod -> github.com%2Fmultiformats%2Fgo-base32%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/multiformats/go-base36/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-base36%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-base36/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-base36%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.4.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.1.1.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.1.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.2.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.1.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.2.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.1.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.2.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.3.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.3.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.4.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.4.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.5.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.5.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.2.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.1.zip -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.2.zip -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.3.zip -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.3.mod -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.5.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.7.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.8.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.8.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.9.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.9.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.10.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.10.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.10.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.13.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.13.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.13.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.14.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.14.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.14.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.0.4.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.1.zip -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.2.zip -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.2.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.1.zip -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.5.zip -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.5.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.6.zip -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.6.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.6.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/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/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.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.zip 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/opentracing/opentracing-go/@v/v1.2.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.2.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190221155625-df39d6c2d992.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190221155625-df39d6c2d992.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190408063855-01bf1e26dd14.zip -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190408063855-01bf1e26dd14.zip mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190408063855-01bf1e26dd14.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190408063855-01bf1e26dd14.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190807091052-3d65705ee9f1.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190807091052-3d65705ee9f1.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190809202753-05966cbd336a.zip -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190809202753-05966cbd336a.zip mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190809202753-05966cbd336a.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190809202753-05966cbd336a.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.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-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.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/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/cors/@v/v1.7.0.zip -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/rs/cors/@v/v1.7.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.mod -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.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/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.1.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.1.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190222223459-a17d461953aa.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190222223459-a17d461953aa.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190731233626-505e41936337.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190731233626-505e41936337.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190731233626-505e41936337.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190731233626-505e41936337.mod mirror://goproxy//github.com/smola/gocompat/@v/v0.2.0.zip -> github.com%2Fsmola%2Fgocompat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/smola/gocompat/@v/v0.2.0.mod -> github.com%2Fsmola%2Fgocompat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod mirror://goproxy//github.com/spacemonkeygo/openssl/@v/v0.0.0-20181017203307-c2dcc5cca94a.mod -> github.com%2Fspacemonkeygo%2Fopenssl%2F@v%2Fv0.0.0-20181017203307-c2dcc5cca94a.mod mirror://goproxy//github.com/spacemonkeygo/spacelog/@v/v0.0.0-20180420211403-2296661a0572.zip -> github.com%2Fspacemonkeygo%2Fspacelog%2F@v%2Fv0.0.0-20180420211403-2296661a0572.zip mirror://goproxy//github.com/spacemonkeygo/spacelog/@v/v0.0.0-20180420211403-2296661a0572.mod -> github.com%2Fspacemonkeygo%2Fspacelog%2F@v%2Fv0.0.0-20180420211403-2296661a0572.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.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/src-d/envconfig/@v/v1.0.0.mod -> github.com%2Fsrc-d%2Fenvconfig%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.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/goleveldb/@v/v1.0.0.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.0.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/texttheater/golang-levenshtein/@v/v0.0.0-20180516184445-d188e65d659e.zip -> github.com%2Ftexttheater%2Fgolang-levenshtein%2F@v%2Fv0.0.0-20180516184445-d188e65d659e.zip mirror://goproxy//github.com/texttheater/golang-levenshtein/@v/v0.0.0-20180516184445-d188e65d659e.mod -> github.com%2Ftexttheater%2Fgolang-levenshtein%2F@v%2Fv0.0.0-20180516184445-d188e65d659e.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.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/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20180510122957-5ad1f5abf436.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20180510122957-5ad1f5abf436.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20190328234359-8b3e70f8e830.zip -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20190328234359-8b3e70f8e830.zip mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20190328234359-8b3e70f8e830.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20190328234359-8b3e70f8e830.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20200122115046-b9ea61034e4a.zip -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20200122115046-b9ea61034e4a.zip mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20200122115046-b9ea61034e4a.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20200122115046-b9ea61034e4a.mod mirror://goproxy//github.com/whyrusleeping/base32/@v/v0.0.0-20170828182744-c30ac30633cc.zip -> github.com%2Fwhyrusleeping%2Fbase32%2F@v%2Fv0.0.0-20170828182744-c30ac30633cc.zip mirror://goproxy//github.com/whyrusleeping/base32/@v/v0.0.0-20170828182744-c30ac30633cc.mod -> github.com%2Fwhyrusleeping%2Fbase32%2F@v%2Fv0.0.0-20170828182744-c30ac30633cc.mod mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200123233031-1cdf64d27158.zip -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200123233031-1cdf64d27158.zip mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200123233031-1cdf64d27158.mod -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200123233031-1cdf64d27158.mod mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200402171437-3d27c146c105.zip -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200402171437-3d27c146c105.zip mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200402171437-3d27c146c105.mod -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200402171437-3d27c146c105.mod mirror://goproxy//github.com/whyrusleeping/chunker/@v/v0.0.0-20181014151217-fe64bd25879f.zip -> github.com%2Fwhyrusleeping%2Fchunker%2F@v%2Fv0.0.0-20181014151217-fe64bd25879f.zip mirror://goproxy//github.com/whyrusleeping/chunker/@v/v0.0.0-20181014151217-fe64bd25879f.mod -> github.com%2Fwhyrusleeping%2Fchunker%2F@v%2Fv0.0.0-20181014151217-fe64bd25879f.mod mirror://goproxy//github.com/whyrusleeping/go-keyspace/@v/v0.0.0-20160322163242-5b898ac5add1.zip -> github.com%2Fwhyrusleeping%2Fgo-keyspace%2F@v%2Fv0.0.0-20160322163242-5b898ac5add1.zip mirror://goproxy//github.com/whyrusleeping/go-keyspace/@v/v0.0.0-20160322163242-5b898ac5add1.mod -> github.com%2Fwhyrusleeping%2Fgo-keyspace%2F@v%2Fv0.0.0-20160322163242-5b898ac5add1.mod mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.0-20170515211332-0457bb6b88fc.zip -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.0-20170515211332-0457bb6b88fc.zip mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.0-20170515211332-0457bb6b88fc.mod -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.0-20170515211332-0457bb6b88fc.mod mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.1.zip -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.1.mod -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/whyrusleeping/go-notifier/@v/v0.0.0-20170827234753-097c5d47330f.zip -> github.com%2Fwhyrusleeping%2Fgo-notifier%2F@v%2Fv0.0.0-20170827234753-097c5d47330f.zip mirror://goproxy//github.com/whyrusleeping/go-notifier/@v/v0.0.0-20170827234753-097c5d47330f.mod -> github.com%2Fwhyrusleeping%2Fgo-notifier%2F@v%2Fv0.0.0-20170827234753-097c5d47330f.mod mirror://goproxy//github.com/whyrusleeping/go-smux-multiplex/@v/v3.0.16+incompatible.mod -> github.com%2Fwhyrusleeping%2Fgo-smux-multiplex%2F@v%2Fv3.0.16+incompatible.mod mirror://goproxy//github.com/whyrusleeping/go-smux-multistream/@v/v2.0.2+incompatible.mod -> github.com%2Fwhyrusleeping%2Fgo-smux-multistream%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/whyrusleeping/go-smux-yamux/@v/v2.0.8+incompatible.mod -> github.com%2Fwhyrusleeping%2Fgo-smux-yamux%2F@v%2Fv2.0.8+incompatible.mod mirror://goproxy//github.com/whyrusleeping/go-smux-yamux/@v/v2.0.9+incompatible.mod -> github.com%2Fwhyrusleeping%2Fgo-smux-yamux%2F@v%2Fv2.0.9+incompatible.mod mirror://goproxy//github.com/whyrusleeping/go-sysinfo/@v/v0.0.0-20190219211824-4a357d4b90b1.zip -> github.com%2Fwhyrusleeping%2Fgo-sysinfo%2F@v%2Fv0.0.0-20190219211824-4a357d4b90b1.zip mirror://goproxy//github.com/whyrusleeping/go-sysinfo/@v/v0.0.0-20190219211824-4a357d4b90b1.mod -> github.com%2Fwhyrusleeping%2Fgo-sysinfo%2F@v%2Fv0.0.0-20190219211824-4a357d4b90b1.mod mirror://goproxy//github.com/whyrusleeping/mafmt/@v/v1.2.8.zip -> github.com%2Fwhyrusleeping%2Fmafmt%2F@v%2Fv1.2.8.zip mirror://goproxy//github.com/whyrusleeping/mafmt/@v/v1.2.8.mod -> github.com%2Fwhyrusleeping%2Fmafmt%2F@v%2Fv1.2.8.mod mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20180901202407-ef14215e6b30.mod -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20180901202407-ef14215e6b30.mod mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20190826153040-b9b60ed33aa9.zip -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20190826153040-b9b60ed33aa9.zip mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20190826153040-b9b60ed33aa9.mod -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20190826153040-b9b60ed33aa9.mod mirror://goproxy//github.com/whyrusleeping/multiaddr-filter/@v/v0.0.0-20160516205228-e903e4adabd7.zip -> github.com%2Fwhyrusleeping%2Fmultiaddr-filter%2F@v%2Fv0.0.0-20160516205228-e903e4adabd7.zip mirror://goproxy//github.com/whyrusleeping/multiaddr-filter/@v/v0.0.0-20160516205228-e903e4adabd7.mod -> github.com%2Fwhyrusleeping%2Fmultiaddr-filter%2F@v%2Fv0.0.0-20160516205228-e903e4adabd7.mod mirror://goproxy//github.com/whyrusleeping/tar-utils/@v/v0.0.0-20180509141711-8c6c8ba81d5c.zip -> github.com%2Fwhyrusleeping%2Ftar-utils%2F@v%2Fv0.0.0-20180509141711-8c6c8ba81d5c.zip mirror://goproxy//github.com/whyrusleeping/tar-utils/@v/v0.0.0-20180509141711-8c6c8ba81d5c.mod -> github.com%2Fwhyrusleeping%2Ftar-utils%2F@v%2Fv0.0.0-20180509141711-8c6c8ba81d5c.mod mirror://goproxy//github.com/whyrusleeping/timecache/@v/v0.0.0-20160911033111-cfcb2f1abfee.zip -> github.com%2Fwhyrusleeping%2Ftimecache%2F@v%2Fv0.0.0-20160911033111-cfcb2f1abfee.zip mirror://goproxy//github.com/whyrusleeping/timecache/@v/v0.0.0-20160911033111-cfcb2f1abfee.mod -> github.com%2Fwhyrusleeping%2Ftimecache%2F@v%2Fv0.0.0-20160911033111-cfcb2f1abfee.mod mirror://goproxy//github.com/whyrusleeping/yamux/@v/v1.1.5.mod -> github.com%2Fwhyrusleeping%2Fyamux%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/x-cray/logrus-prefixed-formatter/@v/v0.5.2.mod -> github.com%2Fx-cray%2Flogrus-prefixed-formatter%2F@v%2Fv0.5.2.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//go.opencensus.io/@v/v0.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.1.zip -> go.opencensus.io%2F@v%2Fv0.22.1.zip mirror://goproxy//go.opencensus.io/@v/v0.22.1.mod -> go.opencensus.io%2F@v%2Fv0.22.1.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.zip -> go.opencensus.io%2F@v%2Fv0.22.4.zip mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/dig/@v/v1.10.0.zip -> go.uber.org%2Fdig%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/dig/@v/v1.10.0.mod -> go.uber.org%2Fdig%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/fx/@v/v1.13.1.zip -> go.uber.org%2Ffx%2F@v%2Fv1.13.1.zip mirror://goproxy//go.uber.org/fx/@v/v1.13.1.mod -> go.uber.org%2Ffx%2F@v%2Fv1.13.1.mod mirror://goproxy//go.uber.org/goleak/@v/v0.10.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.zip mirror://goproxy//go.uber.org/goleak/@v/v0.10.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.4.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.4.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.15.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.15.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.15.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.15.0.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//go4.org/@v/v0.0.0-20200411211856-f5505b9728dd.zip -> go4.org%2F@v%2Fv0.0.0-20200411211856-f5505b9728dd.zip mirror://goproxy//go4.org/@v/v0.0.0-20200411211856-f5505b9728dd.mod -> go4.org%2F@v%2Fv0.0.0-20200411211856-f5505b9728dd.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20170930174604-9419663f5a44.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20170930174604-9419663f5a44.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-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20190225124518-7f87c0fbb88b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190225124518-7f87c0fbb88b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190618222545-ea8f1a30c443.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190618222545-ea8f1a30c443.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.zip 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-20200115085410-6d4e4cb37c7d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200115085410-6d4e4cb37c7d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200117160349-530e935923ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200117160349-530e935923ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200423211502-4bdfaf469ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200423211502-4bdfaf469ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.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-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 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/net/@v/v0.0.0-20180524181706-dfa909b99c79.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180524181706-dfa909b99c79.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190227160552-c95aed5357e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190227160552-c95aed5357e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190611141213-3f473d35a33a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190611141213-3f473d35a33a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190219092855-153ac476189d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190219092855-153ac476189d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190302025703-b6889370fb10.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190302025703-b6889370fb10.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190524122548-abf6ff778158.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190524122548-abf6ff778158.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190524152521-dbbf3f1254d4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190524152521-dbbf3f1254d4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190526052359-791d8a0f4d09.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190526052359-791d8a0f4d09.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-20190610200419-93c9922d18ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190610200419-93c9922d18ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200509044756-6aff5f38e54f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200509044756-6aff5f38e54f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.zip 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/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181130052023-1c3d964395ce.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181130052023-1c3d964395ce.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.zip 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-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20191030062658-86caa796c7ab.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191030062658-86caa796c7ab.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191114200427-caa0b0f7d508.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191114200427-caa0b0f7d508.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191114200427-caa0b0f7d508.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191114200427-caa0b0f7d508.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.zip 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-20191216052735-49a3e744a425.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200522201501-cb1345f3a375.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200522201501-cb1345f3a375.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200522201501-cb1345f3a375.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200522201501-cb1345f3a375.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.zip 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.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip 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-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/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.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip 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.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.28.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.zip mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.28.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.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/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/src-d/go-cli.v0/@v/v0.0.0-20181105080154-d492247bbc0d.mod -> gopkg.in%2Fsrc-d%2Fgo-cli.v0%2F@v%2Fv0.0.0-20181105080154-d492247bbc0d.mod mirror://goproxy//gopkg.in/src-d/go-log.v1/@v/v1.0.1.mod -> gopkg.in%2Fsrc-d%2Fgo-log.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a2fe50281b42a04350baeeba76100494
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-0.8.0 b/metadata/md5-cache/net-p2p/go-ipfs-0.8.0
index c460c4e95481..920e33813fb1 100644
--- a/metadata/md5-cache/net-p2p/go-ipfs-0.8.0
+++ b/metadata/md5-cache/net-p2p/go-ipfs-0.8.0
@@ -9,5 +9,5 @@ RDEPEND=!net-p2p/go-ipfs-bin acct-group/ipfs acct-user/ipfs sys-fs/fuse:0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/ipfs/go-ipfs/archive/v0.8.0.tar.gz -> go-ipfs-0.8.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200117225306-7b5117fecadc.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200117225306-7b5117fecadc.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200117225306-7b5117fecadc.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200117225306-7b5117fecadc.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/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/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/prometheus/@v/v0.2.0.zip -> contrib.go.opencensus.io%2Fexporter%2Fprometheus%2F@v%2Fv0.2.0.zip mirror://goproxy//contrib.go.opencensus.io/exporter/prometheus/@v/v0.2.0.mod -> contrib.go.opencensus.io%2Fexporter%2Fprometheus%2F@v%2Fv0.2.0.mod mirror://goproxy//dmitri.shuralyov.com/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20180913140656-343706a395b7.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20180913140656-343706a395b7.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190306092124-e2d15f34fcf9.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190825152654-46b345b51c96.zip -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.zip mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190825152654-46b345b51c96.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.mod mirror://goproxy//github.com/!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/!kubuxu/go-os-helper/@v/v0.0.1.zip -> github.com%2F!kubuxu%2Fgo-os-helper%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/!kubuxu/go-os-helper/@v/v0.0.1.mod -> github.com%2F!kubuxu%2Fgo-os-helper%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!stebalien/go-bitfield/@v/v0.0.1.zip -> github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/!stebalien/go-bitfield/@v/v0.0.1.mod -> github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/aead/siphash/@v/v1.0.1.mod -> github.com%2Faead%2Fsiphash%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.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alexbrainman/goissue34681/@v/v0.0.0-20191006012335-3fc7a47baff5.zip -> github.com%2Falexbrainman%2Fgoissue34681%2F@v%2Fv0.0.0-20191006012335-3fc7a47baff5.zip mirror://goproxy//github.com/alexbrainman/goissue34681/@v/v0.0.0-20191006012335-3fc7a47baff5.mod -> github.com%2Falexbrainman%2Fgoissue34681%2F@v%2Fv0.0.0-20191006012335-3fc7a47baff5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/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/benbjohnson/clock/@v/v1.0.2.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.zip -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/bren2010/proquint/@v/v0.0.0-20160323162903-38337c27106d.zip -> github.com%2Fbren2010%2Fproquint%2F@v%2Fv0.0.0-20160323162903-38337c27106d.zip mirror://goproxy//github.com/bren2010/proquint/@v/v0.0.0-20160323162903-38337c27106d.mod -> github.com%2Fbren2010%2Fproquint%2F@v%2Fv0.0.0-20160323162903-38337c27106d.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190213025234-306aecffea32.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190213025234-306aecffea32.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190523000118-16327141da8c.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190523000118-16327141da8c.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190605094302-a0d1e3e36d50.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190605094302-a0d1e3e36d50.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190824003749-130ea5bddde3.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190824003749-130ea5bddde3.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.20.1-beta.zip -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.zip mirror://goproxy//github.com/btcsuite/btcd/@v/v0.20.1-beta.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.mod mirror://goproxy//github.com/btcsuite/btclog/@v/v0.0.0-20170628155309-84c8d2346e9f.mod -> github.com%2Fbtcsuite%2Fbtclog%2F@v%2Fv0.0.0-20170628155309-84c8d2346e9f.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v0.0.0-20190207003914-4c204d697803.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190207003914-4c204d697803.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v0.0.0-20190425235716-9e5f4b9a998d.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190425235716-9e5f4b9a998d.mod mirror://goproxy//github.com/btcsuite/go-socks/@v/v0.0.0-20170105172521-4720035b7bfd.mod -> github.com%2Fbtcsuite%2Fgo-socks%2F@v%2Fv0.0.0-20170105172521-4720035b7bfd.mod mirror://goproxy//github.com/btcsuite/goleveldb/@v/v0.0.0-20160330041536-7834afc9e8cd.mod -> github.com%2Fbtcsuite%2Fgoleveldb%2F@v%2Fv0.0.0-20160330041536-7834afc9e8cd.mod mirror://goproxy//github.com/btcsuite/snappy-go/@v/v0.0.0-20151229074030-0bdef8d06723.mod -> github.com%2Fbtcsuite%2Fsnappy-go%2F@v%2Fv0.0.0-20151229074030-0bdef8d06723.mod mirror://goproxy//github.com/btcsuite/websocket/@v/v0.0.0-20150119174127-31079b680792.mod -> github.com%2Fbtcsuite%2Fwebsocket%2F@v%2Fv0.0.0-20150119174127-31079b680792.mod mirror://goproxy//github.com/btcsuite/winsvc/@v/v1.0.0.mod -> github.com%2Fbtcsuite%2Fwinsvc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/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.0.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.zip -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.zip mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/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-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.2.1-0.20180108230905-e214231b295a.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.1-0.20180108230905-e214231b295a.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/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/crackcomm/go-gitignore/@v/v0.0.0-20170627025303-887ab5e44cc3.zip -> github.com%2Fcrackcomm%2Fgo-gitignore%2F@v%2Fv0.0.0-20170627025303-887ab5e44cc3.zip mirror://goproxy//github.com/crackcomm/go-gitignore/@v/v0.0.0-20170627025303-887ab5e44cc3.mod -> github.com%2Fcrackcomm%2Fgo-gitignore%2F@v%2Fv0.0.0-20170627025303-887ab5e44cc3.mod mirror://goproxy//github.com/cskr/pubsub/@v/v1.0.2.zip -> github.com%2Fcskr%2Fpubsub%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/cskr/pubsub/@v/v1.0.2.mod -> github.com%2Fcskr%2Fpubsub%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20171005155431-ecdeabc65495.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20171005155431-ecdeabc65495.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/davidlazar/go-crypto/@v/v0.0.0-20170701192655-dcfb0a7ac018.zip -> github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20170701192655-dcfb0a7ac018.zip mirror://goproxy//github.com/davidlazar/go-crypto/@v/v0.0.0-20170701192655-dcfb0a7ac018.mod -> github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20170701192655-dcfb0a7ac018.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.5.5-0.20190226225317-8115aed38f8f.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.5-0.20190226225317-8115aed38f8f.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0-rc1.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0-rc1.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.1.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.2.zip -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.2.zip mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.2.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190104051053-3adb47b1fb0f.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190104051053-3adb47b1fb0f.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elgris/jsondiff/@v/v0.0.0-20160530203242-765b5c24c302.zip -> github.com%2Felgris%2Fjsondiff%2F@v%2Fv0.0.0-20160530203242-765b5c24c302.zip mirror://goproxy//github.com/elgris/jsondiff/@v/v0.0.0-20160530203242-765b5c24c302.mod -> github.com%2Felgris%2Fjsondiff%2F@v%2Fv0.0.0-20160530203242-765b5c24c302.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/facebookgo/atomicfile/@v/v0.0.0-20151019160806-2de1f203e7d5.zip -> github.com%2Ffacebookgo%2Fatomicfile%2F@v%2Fv0.0.0-20151019160806-2de1f203e7d5.zip mirror://goproxy//github.com/facebookgo/atomicfile/@v/v0.0.0-20151019160806-2de1f203e7d5.mod -> github.com%2Ffacebookgo%2Fatomicfile%2F@v%2Fv0.0.0-20151019160806-2de1f203e7d5.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/flynn/noise/@v/v0.0.0-20180327030543-2492fe189ae6.zip -> github.com%2Fflynn%2Fnoise%2F@v%2Fv0.0.0-20180327030543-2492fe189ae6.zip mirror://goproxy//github.com/flynn/noise/@v/v0.0.0-20180327030543-2492fe189ae6.mod -> github.com%2Fflynn%2Fnoise%2F@v%2Fv0.0.0-20180327030543-2492fe189ae6.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.zip -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.2.zip -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.2.mod -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/go-bindata/go-bindata/v3/@v/v3.1.3.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2Fv3%2F@v%2Fv3.1.3.zip mirror://goproxy//github.com/go-bindata/go-bindata/v3/@v/v3.1.3.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20180628173108-788fd7840127.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191027212112-611e8accdfc9.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.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.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.zip 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/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gopacket/@v/v1.1.17.mod -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.17.mod mirror://goproxy//github.com/google/gopacket/@v/v1.1.18.zip -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.18.zip mirror://goproxy//github.com/google/gopacket/@v/v1.1.18.mod -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.18.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-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.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.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190430165422-3e4dfb77656c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190812055157-5d271430af9f.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190812055157-5d271430af9f.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190812055157-5d271430af9f.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190812055157-5d271430af9f.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/gxed/hashland/keccakpg/@v/v0.0.1.mod -> github.com%2Fgxed%2Fhashland%2Fkeccakpg%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/gxed/hashland/murmur3/@v/v0.0.1.mod -> github.com%2Fgxed%2Fhashland%2Fmurmur3%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hannahhoward/cbor-gen-for/@v/v0.0.0-20200817222906-ea96cece81f1.mod -> github.com%2Fhannahhoward%2Fcbor-gen-for%2F@v%2Fv0.0.0-20200817222906-ea96cece81f1.mod mirror://goproxy//github.com/hannahhoward/go-pubsub/@v/v0.0.0-20200423002714-8d62886cc36e.zip -> github.com%2Fhannahhoward%2Fgo-pubsub%2F@v%2Fv0.0.0-20200423002714-8d62886cc36e.zip mirror://goproxy//github.com/hannahhoward/go-pubsub/@v/v0.0.0-20200423002714-8d62886cc36e.mod -> github.com%2Fhannahhoward%2Fgo-pubsub%2F@v%2Fv0.0.0-20200423002714-8d62886cc36e.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huin/goupnp/@v/v1.0.0.zip -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/huin/goupnp/@v/v1.0.0.mod -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huin/goutil/@v/v0.0.0-20170803182201-1ca381bf3150.mod -> github.com%2Fhuin%2Fgoutil%2F@v%2Fv0.0.0-20170803182201-1ca381bf3150.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/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.1.mod -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.4.zip -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.4.mod -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.0.9.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.3.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.8.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.3.3.zip -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.3.3.zip mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.3.3.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.3.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.4.zip -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.4.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.7.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-cidutil/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-cidutil%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-cidutil/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-cidutil%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.3.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.3.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.4.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.4.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.5.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.5.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/ipfs/go-detect-race/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-detect-race%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-detect-race/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-detect-race%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.1.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.3.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.6.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.6.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.6.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.6.mod mirror://goproxy//github.com/ipfs/go-ds-flatfs/@v/v0.4.5.zip -> github.com%2Fipfs%2Fgo-ds-flatfs%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/ipfs/go-ds-flatfs/@v/v0.4.5.mod -> github.com%2Fipfs%2Fgo-ds-flatfs%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.1.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.2.zip -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.2.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/ipfs/go-ds-measure/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ds-measure%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ds-measure/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ds-measure%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-filestore/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-filestore%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-filestore/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-filestore%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-fs-lock/@v/v0.0.6.zip -> github.com%2Fipfs%2Fgo-fs-lock%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/ipfs/go-fs-lock/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-fs-lock%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-graphsync/@v/v0.6.0.zip -> github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/ipfs/go-graphsync/@v/v0.6.0.mod -> github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.4.zip -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.4.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/ipfs/go-ipfs-blocksutil/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-blocksutil%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-blocksutil/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-blocksutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.5.zip -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-ipfs-cmds/@v/v0.6.0.zip -> github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-cmds/@v/v0.6.0.mod -> github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-config/@v/v0.12.0.zip -> github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-config/@v/v0.12.0.mod -> github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.0-20181109222059-70721b86a9a8.mod -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.0-20181109222059-70721b86a9a8.mod mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.1.1.zip -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-exchange-interface/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-exchange-interface%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-exchange-interface/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-exchange-interface%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-exchange-offline/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-exchange-offline%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-exchange-offline/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-exchange-offline%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.8.zip -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.8.mod -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/ipfs/go-ipfs-pinner/@v/v0.1.1.zip -> github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-pinner/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-posinfo/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-posinfo%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-posinfo/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-posinfo%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipfs-provider/@v/v0.4.3.zip -> github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/ipfs/go-ipfs-provider/@v/v0.4.3.mod -> github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.5.zip -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.2.0.zip -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.2.0.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ipfs/go-ipld-git/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-ipld-git/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-ipns/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipns/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-log/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.1.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.2.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.3.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.4.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.4.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.1.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.2.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.2.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.3.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.5.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.1.1.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.1.1.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.2.3.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.0.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.1.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.2.zip -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.2.zip mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.2.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/ipfs/go-metrics-interface/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-metrics-interface%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-metrics-interface/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-metrics-interface%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-metrics-prometheus/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-metrics-prometheus%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-metrics-prometheus/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-metrics-prometheus%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-mfs/@v/v0.1.2.zip -> github.com%2Fipfs%2Fgo-mfs%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/ipfs/go-mfs/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-mfs%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.9.zip -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.9.mod -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.2.0.zip -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.2.0.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ipfs/go-pinning-service-http-client/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-pinning-service-http-client%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-pinning-service-http-client/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-pinning-service-http-client%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.2.4.zip -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.2.4.mod -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/ipfs/go-verifcid/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-verifcid%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-verifcid/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-verifcid%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.4.0.zip -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.4.0.mod -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/ipld/go-car/@v/v0.1.1-0.20201015032735-ff6ccdc46acc.zip -> github.com%2Fipld%2Fgo-car%2F@v%2Fv0.1.1-0.20201015032735-ff6ccdc46acc.zip mirror://goproxy//github.com/ipld/go-car/@v/v0.1.1-0.20201015032735-ff6ccdc46acc.mod -> github.com%2Fipld%2Fgo-car%2F@v%2Fv0.1.1-0.20201015032735-ff6ccdc46acc.mod mirror://goproxy//github.com/ipld/go-ipld-prime/@v/v0.5.1-0.20200828233916-988837377a7f.mod -> github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.5.1-0.20200828233916-988837377a7f.mod mirror://goproxy//github.com/ipld/go-ipld-prime/@v/v0.5.1-0.20201021195245-109253e8a018.zip -> github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.5.1-0.20201021195245-109253e8a018.zip mirror://goproxy//github.com/ipld/go-ipld-prime/@v/v0.5.1-0.20201021195245-109253e8a018.mod -> github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.5.1-0.20201021195245-109253e8a018.mod mirror://goproxy//github.com/ipld/go-ipld-prime-proto/@v/v0.0.0-20200922192210-9a2bfd4440a6.mod -> github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.0.0-20200922192210-9a2bfd4440a6.mod mirror://goproxy//github.com/ipld/go-ipld-prime-proto/@v/v0.1.0.zip -> github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipld/go-ipld-prime-proto/@v/v0.1.0.mod -> github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.5.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.1.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.0.0-20150120210510-1bb1476777ec.mod -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.0.0-20150120210510-1bb1476777ec.mod mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.1.0.zip -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.1.0.mod -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jbenet/go-is-domain/@v/v1.0.5.zip -> github.com%2Fjbenet%2Fgo-is-domain%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/jbenet/go-is-domain/@v/v1.0.5.mod -> github.com%2Fjbenet%2Fgo-is-domain%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jbenet/go-random/@v/v0.0.0-20190219211222-123a90aedc0c.zip -> github.com%2Fjbenet%2Fgo-random%2F@v%2Fv0.0.0-20190219211222-123a90aedc0c.zip mirror://goproxy//github.com/jbenet/go-random/@v/v0.0.0-20190219211222-123a90aedc0c.mod -> github.com%2Fjbenet%2Fgo-random%2F@v%2Fv0.0.0-20190219211222-123a90aedc0c.mod mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.0.0-20150120210811-aac704a3f4f2.mod -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.0.0-20150120210811-aac704a3f4f2.mod mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.1.0.zip -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.1.0.mod -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.0.0-20160826012719-b497e2f366b8.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.0.0-20160826012719-b497e2f366b8.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.3.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.4.zip -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.4.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v0.0.0-20141203071132-1679536dcc89.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv0.0.0-20141203071132-1679536dcc89.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/jrick/logrotate/@v/v1.0.0.mod -> github.com%2Fjrick%2Flogrotate%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/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.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kami-zh/go-capturer/@v/v0.0.0-20171211120116-e492ea43421d.mod -> github.com%2Fkami-zh%2Fgo-capturer%2F@v%2Fv0.0.0-20171211120116-e492ea43421d.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.zip -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kkdai/bstream/@v/v0.0.0-20161212061736-f391b8402d23.mod -> github.com%2Fkkdai%2Fbstream%2F@v%2Fv0.0.0-20161212061736-f391b8402d23.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20180514024734-4a0ed625a78b.mod -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20180514024734-4a0ed625a78b.mod mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20191105050749-2e1c40ed0b5d.zip -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20191105050749-2e1c40ed0b5d.zip mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20191105050749-2e1c40ed0b5d.mod -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20191105050749-2e1c40ed0b5d.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.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/libp2p/go-addr-util/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-cidranger/@v/v1.1.0.zip -> github.com%2Flibp2p%2Fgo-cidranger%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/libp2p/go-cidranger/@v/v1.1.0.mod -> github.com%2Flibp2p%2Fgo-cidranger%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/libp2p/go-conn-security/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-conn-security%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.3.zip -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.0.30.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.0.30.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.6.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.4.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.8.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.12.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.13.0.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.13.0.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.13.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-asn-util/@v/v0.0.0-20200825225859-85005c6cf052.zip -> github.com%2Flibp2p%2Fgo-libp2p-asn-util%2F@v%2Fv0.0.0-20200825225859-85005c6cf052.zip mirror://goproxy//github.com/libp2p/go-libp2p-asn-util/@v/v0.0.0-20200825225859-85005c6cf052.mod -> github.com%2Flibp2p%2Fgo-libp2p-asn-util%2F@v%2Fv0.0.0-20200825225859-85005c6cf052.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.0.9.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-connmgr/@v/v0.2.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-connmgr%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-connmgr/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-connmgr%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.7.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.8.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.8.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.5.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.5.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-gostream/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-gostream/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-host/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-host%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-host/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-host%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-http/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-http/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-pnet/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-pnet%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-kad-dht/@v/v0.11.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.11.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-kad-dht/@v/v0.11.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-kbucket/@v/v0.4.7.zip -> github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.4.7.zip mirror://goproxy//github.com/libp2p/go-libp2p-kbucket/@v/v0.4.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.4.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-metrics/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.4.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.4.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.6.zip -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-net/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-net/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-net%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-noise/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-noise/@v/v0.1.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-noise/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.6.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.6.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-pnet/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-pnet%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-pnet/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-pnet%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-protocol/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-protocol%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-protocol/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-protocol%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.4.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.4.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub-router/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-pubsub-router/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-quic-transport/@v/v0.10.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-quic-transport/@v/v0.10.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-routing/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-routing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-routing-helpers/@v/v0.2.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-routing-helpers%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-routing-helpers/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-routing-helpers%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.8.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.8.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.2-0.20200422005655-8775583591d8.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.2-0.20200422005655-8775583591d8.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-tls/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-tls%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-tls/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-tls%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.8.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.8.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.5.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.5.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.5.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.6.zip -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.5.zip -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.7.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.7.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-sockaddr/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-sockaddr/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-socket-activation/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-socket-activation%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-socket-activation/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-socket-activation%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-stream-muxer/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-stream-muxer%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-stream-muxer/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-testutil/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-testutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-testutil/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-testutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.1.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.2.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.3.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.0.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.3.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.5.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.7.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.7.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.4.0.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.4.1.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.4.1.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/libp2p/go-yamux/v2/@v/v2.0.0.zip -> github.com%2Flibp2p%2Fgo-yamux%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/libp2p/go-yamux/v2/@v/v2.0.0.mod -> github.com%2Flibp2p%2Fgo-yamux%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.19.3.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.19.3.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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-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/marten-seemann/qpack/@v/v0.2.1.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.zip -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.1.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.1.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.12.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.12.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.28.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.28.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.mod mirror://goproxy//github.com/minio/blake2b-simd/@v/v0.0.0-20160723061019-3f5f724cb5b1.zip -> github.com%2Fminio%2Fblake2b-simd%2F@v%2Fv0.0.0-20160723061019-3f5f724cb5b1.zip mirror://goproxy//github.com/minio/blake2b-simd/@v/v0.0.0-20160723061019-3f5f724cb5b1.mod -> github.com%2Fminio%2Fblake2b-simd%2F@v%2Fv0.0.0-20160723061019-3f5f724cb5b1.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.0.0-20190131020904-2d45a736cd16.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.0.0-20190131020904-2d45a736cd16.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.0.0-20190328051042-05b4dd3047e5.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.0.0-20190328051042-05b4dd3047e5.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.0.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1-0.20190913151208-6de447530771.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1-0.20190913151208-6de447530771.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.0.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.1.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.2.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.3.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.2.0.zip -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/mr-tron/base58/@v/v1.2.0.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/multiformats/go-base32/@v/v0.0.3.zip -> github.com%2Fmultiformats%2Fgo-base32%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/multiformats/go-base32/@v/v0.0.3.mod -> github.com%2Fmultiformats%2Fgo-base32%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/multiformats/go-base36/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-base36%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-base36/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-base36%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.4.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.1.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.2.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.3.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.4.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.5.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.2.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.3.zip -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.3.mod -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.5.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.8.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.9.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.10.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.13.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.14.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.14.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.14.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.0.4.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.2.0.zip -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.5.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.6.zip -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.6.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.6.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/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/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/opentracing/opentracing-go/@v/v1.2.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.2.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190221155625-df39d6c2d992.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190221155625-df39d6c2d992.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190408063855-01bf1e26dd14.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190408063855-01bf1e26dd14.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190807091052-3d65705ee9f1.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190807091052-3d65705ee9f1.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190809202753-05966cbd336a.zip -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190809202753-05966cbd336a.zip mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190809202753-05966cbd336a.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190809202753-05966cbd336a.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.2.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.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-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.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.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.6.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.6.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/statsd_exporter/@v/v0.15.0.zip -> github.com%2Fprometheus%2Fstatsd_exporter%2F@v%2Fv0.15.0.zip mirror://goproxy//github.com/prometheus/statsd_exporter/@v/v0.15.0.mod -> github.com%2Fprometheus%2Fstatsd_exporter%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/cors/@v/v1.7.0.zip -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/rs/cors/@v/v1.7.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.mod -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.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/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.1.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.1.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190222223459-a17d461953aa.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190222223459-a17d461953aa.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/smola/gocompat/@v/v0.2.0.mod -> github.com%2Fsmola%2Fgocompat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod mirror://goproxy//github.com/spacemonkeygo/openssl/@v/v0.0.0-20181017203307-c2dcc5cca94a.mod -> github.com%2Fspacemonkeygo%2Fopenssl%2F@v%2Fv0.0.0-20181017203307-c2dcc5cca94a.mod mirror://goproxy//github.com/spacemonkeygo/spacelog/@v/v0.0.0-20180420211403-2296661a0572.zip -> github.com%2Fspacemonkeygo%2Fspacelog%2F@v%2Fv0.0.0-20180420211403-2296661a0572.zip mirror://goproxy//github.com/spacemonkeygo/spacelog/@v/v0.0.0-20180420211403-2296661a0572.mod -> github.com%2Fspacemonkeygo%2Fspacelog%2F@v%2Fv0.0.0-20180420211403-2296661a0572.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.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/src-d/envconfig/@v/v1.0.0.mod -> github.com%2Fsrc-d%2Fenvconfig%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.0.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.0.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/texttheater/golang-levenshtein/@v/v0.0.0-20180516184445-d188e65d659e.zip -> github.com%2Ftexttheater%2Fgolang-levenshtein%2F@v%2Fv0.0.0-20180516184445-d188e65d659e.zip mirror://goproxy//github.com/texttheater/golang-levenshtein/@v/v0.0.0-20180516184445-d188e65d659e.mod -> github.com%2Ftexttheater%2Fgolang-levenshtein%2F@v%2Fv0.0.0-20180516184445-d188e65d659e.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.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/v2/@v/v2.0.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20180510122957-5ad1f5abf436.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20180510122957-5ad1f5abf436.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20190328234359-8b3e70f8e830.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20190328234359-8b3e70f8e830.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20200122115046-b9ea61034e4a.zip -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20200122115046-b9ea61034e4a.zip mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20200122115046-b9ea61034e4a.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20200122115046-b9ea61034e4a.mod mirror://goproxy//github.com/whyrusleeping/base32/@v/v0.0.0-20170828182744-c30ac30633cc.zip -> github.com%2Fwhyrusleeping%2Fbase32%2F@v%2Fv0.0.0-20170828182744-c30ac30633cc.zip mirror://goproxy//github.com/whyrusleeping/base32/@v/v0.0.0-20170828182744-c30ac30633cc.mod -> github.com%2Fwhyrusleeping%2Fbase32%2F@v%2Fv0.0.0-20170828182744-c30ac30633cc.mod mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200123233031-1cdf64d27158.mod -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200123233031-1cdf64d27158.mod mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200710004633-5379fc63235d.zip -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200710004633-5379fc63235d.zip mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200710004633-5379fc63235d.mod -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200710004633-5379fc63235d.mod mirror://goproxy//github.com/whyrusleeping/chunker/@v/v0.0.0-20181014151217-fe64bd25879f.zip -> github.com%2Fwhyrusleeping%2Fchunker%2F@v%2Fv0.0.0-20181014151217-fe64bd25879f.zip mirror://goproxy//github.com/whyrusleeping/chunker/@v/v0.0.0-20181014151217-fe64bd25879f.mod -> github.com%2Fwhyrusleeping%2Fchunker%2F@v%2Fv0.0.0-20181014151217-fe64bd25879f.mod mirror://goproxy//github.com/whyrusleeping/go-keyspace/@v/v0.0.0-20160322163242-5b898ac5add1.zip -> github.com%2Fwhyrusleeping%2Fgo-keyspace%2F@v%2Fv0.0.0-20160322163242-5b898ac5add1.zip mirror://goproxy//github.com/whyrusleeping/go-keyspace/@v/v0.0.0-20160322163242-5b898ac5add1.mod -> github.com%2Fwhyrusleeping%2Fgo-keyspace%2F@v%2Fv0.0.0-20160322163242-5b898ac5add1.mod mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.0-20170515211332-0457bb6b88fc.mod -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.0-20170515211332-0457bb6b88fc.mod mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.1.mod -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/whyrusleeping/go-notifier/@v/v0.0.0-20170827234753-097c5d47330f.mod -> github.com%2Fwhyrusleeping%2Fgo-notifier%2F@v%2Fv0.0.0-20170827234753-097c5d47330f.mod mirror://goproxy//github.com/whyrusleeping/go-sysinfo/@v/v0.0.0-20190219211824-4a357d4b90b1.zip -> github.com%2Fwhyrusleeping%2Fgo-sysinfo%2F@v%2Fv0.0.0-20190219211824-4a357d4b90b1.zip mirror://goproxy//github.com/whyrusleeping/go-sysinfo/@v/v0.0.0-20190219211824-4a357d4b90b1.mod -> github.com%2Fwhyrusleeping%2Fgo-sysinfo%2F@v%2Fv0.0.0-20190219211824-4a357d4b90b1.mod mirror://goproxy//github.com/whyrusleeping/mafmt/@v/v1.2.8.mod -> github.com%2Fwhyrusleeping%2Fmafmt%2F@v%2Fv1.2.8.mod mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20180901202407-ef14215e6b30.mod -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20180901202407-ef14215e6b30.mod mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20190826153040-b9b60ed33aa9.zip -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20190826153040-b9b60ed33aa9.zip mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20190826153040-b9b60ed33aa9.mod -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20190826153040-b9b60ed33aa9.mod mirror://goproxy//github.com/whyrusleeping/multiaddr-filter/@v/v0.0.0-20160516205228-e903e4adabd7.zip -> github.com%2Fwhyrusleeping%2Fmultiaddr-filter%2F@v%2Fv0.0.0-20160516205228-e903e4adabd7.zip mirror://goproxy//github.com/whyrusleeping/multiaddr-filter/@v/v0.0.0-20160516205228-e903e4adabd7.mod -> github.com%2Fwhyrusleeping%2Fmultiaddr-filter%2F@v%2Fv0.0.0-20160516205228-e903e4adabd7.mod mirror://goproxy//github.com/whyrusleeping/tar-utils/@v/v0.0.0-20201201191210-20a61371de5b.zip -> github.com%2Fwhyrusleeping%2Ftar-utils%2F@v%2Fv0.0.0-20201201191210-20a61371de5b.zip mirror://goproxy//github.com/whyrusleeping/tar-utils/@v/v0.0.0-20201201191210-20a61371de5b.mod -> github.com%2Fwhyrusleeping%2Ftar-utils%2F@v%2Fv0.0.0-20201201191210-20a61371de5b.mod mirror://goproxy//github.com/whyrusleeping/timecache/@v/v0.0.0-20160911033111-cfcb2f1abfee.zip -> github.com%2Fwhyrusleeping%2Ftimecache%2F@v%2Fv0.0.0-20160911033111-cfcb2f1abfee.zip mirror://goproxy//github.com/whyrusleeping/timecache/@v/v0.0.0-20160911033111-cfcb2f1abfee.mod -> github.com%2Fwhyrusleeping%2Ftimecache%2F@v%2Fv0.0.0-20160911033111-cfcb2f1abfee.mod mirror://goproxy//github.com/x-cray/logrus-prefixed-formatter/@v/v0.5.2.mod -> github.com%2Fx-cray%2Flogrus-prefixed-formatter%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.opencensus.io/@v/v0.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.1.mod -> go.opencensus.io%2F@v%2Fv0.22.1.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.zip -> go.opencensus.io%2F@v%2Fv0.22.5.zip mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/dig/@v/v1.10.0.zip -> go.uber.org%2Fdig%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/dig/@v/v1.10.0.mod -> go.uber.org%2Fdig%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/fx/@v/v1.13.1.zip -> go.uber.org%2Ffx%2F@v%2Fv1.13.1.zip mirror://goproxy//go.uber.org/fx/@v/v1.13.1.mod -> go.uber.org%2Ffx%2F@v%2Fv1.13.1.mod mirror://goproxy//go.uber.org/goleak/@v/v0.10.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.4.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.15.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.15.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.16.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.16.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.16.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.16.0.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//go4.org/@v/v0.0.0-20200411211856-f5505b9728dd.zip -> go4.org%2F@v%2Fv0.0.0-20200411211856-f5505b9728dd.zip mirror://goproxy//go4.org/@v/v0.0.0-20200411211856-f5505b9728dd.mod -> go4.org%2F@v%2Fv0.0.0-20200411211856-f5505b9728dd.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20170930174604-9419663f5a44.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20170930174604-9419663f5a44.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-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20190225124518-7f87c0fbb88b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190225124518-7f87c0fbb88b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190618222545-ea8f1a30c443.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190618222545-ea8f1a30c443.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-20200115085410-6d4e4cb37c7d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200115085410-6d4e4cb37c7d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200117160349-530e935923ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200117160349-530e935923ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200423211502-4bdfaf469ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190227160552-c95aed5357e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190227160552-c95aed5357e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190611141213-3f473d35a33a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190611141213-3f473d35a33a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190219092855-153ac476189d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190219092855-153ac476189d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190302025703-b6889370fb10.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190302025703-b6889370fb10.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190524122548-abf6ff778158.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190524122548-abf6ff778158.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190524152521-dbbf3f1254d4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190524152521-dbbf3f1254d4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190526052359-791d8a0f4d09.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190526052359-791d8a0f4d09.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-20190610200419-93c9922d18ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190610200419-93c9922d18ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20191010194322-b09406accb47.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.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-20191113165036-4c7a9d0fe056.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191113165036-4c7a9d0fe056.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181130052023-1c3d964395ce.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181130052023-1c3d964395ce.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20191030062658-86caa796c7ab.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191030062658-86caa796c7ab.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191114200427-caa0b0f7d508.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191114200427-caa0b0f7d508.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200827010519-17fd2f27a9e3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200827010519-17fd2f27a9e3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/src-d/go-cli.v0/@v/v0.0.0-20181105080154-d492247bbc0d.mod -> gopkg.in%2Fsrc-d%2Fgo-cli.v0%2F@v%2Fv0.0.0-20181105080154-d492247bbc0d.mod mirror://goproxy//gopkg.in/src-d/go-log.v1/@v/v1.0.1.mod -> gopkg.in%2Fsrc-d%2Fgo-log.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=587e44fdf125dd39e8de47b4b0d15382
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.22 b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.22
deleted file mode 100644
index 088a5706dd6b..000000000000
--- a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.22
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst preinst
-DESCRIPTION=Main implementation of IPFS
-EAPI=7
-HOMEPAGE=https://ipfs.io/
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=acct-group/ipfs acct-user/ipfs sys-fs/fuse:0
-SLOT=0
-SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.4.22/go-ipfs_v0.4.22_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.4.22/go-ipfs_v0.4.22_linux-386.tar.gz ) arm? ( https://dist.ipfs.io/go-ipfs/v0.4.22/go-ipfs_v0.4.22_linux-arm.tar.gz ) https://raw.githubusercontent.com/ipfs/go-ipfs/v0.4.22/misc/completion/ipfs-completion.bash -> go-ipfs-bin-0.4.22.bash
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b09443401aa772b30edb498468737ff6
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.7.0 b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.7.0
index 7bf5070e60da..ae537b235038 100644
--- a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.7.0
+++ b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.7.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=acct-group/ipfs acct-user/ipfs !net-p2p/go-ipfs sys-fs/fuse:0
 SLOT=0
 SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.7.0/go-ipfs_v0.7.0_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.7.0/go-ipfs_v0.7.0_linux-386.tar.gz ) arm? ( https://dist.ipfs.io/go-ipfs/v0.7.0/go-ipfs_v0.7.0_linux-arm.tar.gz ) https://raw.githubusercontent.com/ipfs/go-ipfs/v0.7.0/misc/completion/ipfs-completion.bash -> go-ipfs-bin-0.7.0.bash
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f7ab9e589362938a5cb2a3945bb5b64
diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-1.2.0-r1 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.2.0-r1
deleted file mode 100644
index da5c599a777c..000000000000
--- a/metadata/md5-cache/net-p2p/gtk-gnutella-1.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
-DESCRIPTION=A GTK+ Gnutella client
-EAPI=7
-HOMEPAGE=http://gtk-gnutella.sourceforge.net/
-IUSE=nls dbus ssl +gtk
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=CC-BY-SA-4.0 GPL-2
-RDEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-1.2.0.tar.xz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9f0edf099e1ab8f93f58931380e525f4
diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-1.2.1 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.2.1
new file mode 100644
index 000000000000..e82e9d1b1fa9
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/gtk-gnutella-1.2.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
+DESCRIPTION=A GTK+ Gnutella client
+EAPI=7
+HOMEPAGE=http://gtk-gnutella.sourceforge.net/
+IUSE=nls dbus ssl +gtk
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=CC-BY-SA-4.0 GPL-2
+RDEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
+SLOT=0
+SRC_URI=https://github.com/gtk-gnutella/gtk-gnutella/archive/v1.2.1.tar.gz -> gtk-gnutella-1.2.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3acf86624d18b7c4bf44e76066a68bfe
diff --git a/metadata/md5-cache/net-p2p/ktorrent-21.04.2 b/metadata/md5-cache/net-p2p/ktorrent-21.04.2
deleted file mode 100644
index e4feceb1f1b6..000000000000
--- a/metadata/md5-cache/net-p2p/ktorrent-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=net-libs/libktorrent-21.04.2:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 ) mediaplayer? ( >=media-libs/phonon-4.11.0 >=media-libs/taglib-1.5 ) rss? ( >=dev-qt/qtwebengine-5.15.2:5 >=kde-frameworks/syndication-5.80.0:5 ) shutdown? ( kde-plasma/libkworkspace:5 ) stats? ( >=kde-frameworks/kplotting-5.80.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.80.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.80.0:5 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Powerful BitTorrent client based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://apps.kde.org/ktorrent/
-IUSE=+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=net-libs/libktorrent-21.04.2:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 ) mediaplayer? ( >=media-libs/phonon-4.11.0 >=media-libs/taglib-1.5 ) rss? ( >=dev-qt/qtwebengine-5.15.2:5 >=kde-frameworks/syndication-5.80.0:5 ) shutdown? ( kde-plasma/libkworkspace:5 ) stats? ( >=kde-frameworks/kplotting-5.80.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.80.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.80.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip kde-apps/kio-extras:5 >=kde-frameworks/ktextwidgets-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/ktorrent-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c200147b0b700ed3ef818363d01a579c
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.1.7-r2 b/metadata/md5-cache/net-p2p/mldonkey-3.1.7-r2
index aa9661002c68..d7dbc65adb3f 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.1.7-r2
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.1.7-r2
@@ -13,4 +13,4 @@ RESTRICT=!ocamlopt? ( strip )
 SLOT=0
 SRC_URI=https://github.com/ygrek/mldonkey/releases/download/release-3-1-7-2/mldonkey-3.1.7-2.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5058edbfaad7d977ecb1c83db62df7b2
+_md5_=068b4b9813a2a2db15410ae731b06d6e
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3-r2 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3-r2
index 06ef55fa4bbc..8c6820c57748 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3-r2
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3-r2
@@ -10,5 +10,5 @@ RDEPEND=acct-group/rslsync acct-user/rslsync || ( sys-libs/glibc[crypt(+)] sys-l
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_amd64.deb ) x86? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_i386.deb )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
 _md5_=4c907981d6c065330986c80518b36170
diff --git a/metadata/md5-cache/net-p2p/tremc-0.9.2-r1 b/metadata/md5-cache/net-p2p/tremc-0.9.2-r1
index 52ad4cf78fd8..701be8fa6e0d 100644
--- a/metadata/md5-cache/net-p2p/tremc-0.9.2-r1
+++ b/metadata/md5-cache/net-p2p/tremc-0.9.2-r1
@@ -9,5 +9,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[ncurses] >=dev-lan
 REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tremc/tremc/archive/0.9.2.tar.gz -> tremc-0.9.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d57af7e8763772c8c138f2659aabb50e
diff --git a/metadata/md5-cache/net-p2p/tremc-0.9.2_p20201101 b/metadata/md5-cache/net-p2p/tremc-0.9.2_p20201101
index d2cc44b01920..ddadcd435d87 100644
--- a/metadata/md5-cache/net-p2p/tremc-0.9.2_p20201101
+++ b/metadata/md5-cache/net-p2p/tremc-0.9.2_p20201101
@@ -9,5 +9,5 @@ RDEPEND=python_single_target_python3_9? ( dev-lang/python:3.9[ncurses] >=dev-lan
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/tremc/tremc/archive/8b6b29163295e5cf12d9d874e80203c5906619c8.tar.gz -> tremc-0.9.2_p20201101.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d33ca84e23090650aeaedbf036983324
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 154db753b3bb..20ca6fdc818e 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/dante-1.4.1-r5 b/metadata/md5-cache/net-proxy/dante-1.4.1-r5
deleted file mode 100644
index 2db407b8028e..000000000000
--- a/metadata/md5-cache/net-proxy/dante-1.4.1-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) upnp? ( net-libs/miniupnpc:= ) userland_GNU? ( sys-apps/shadow ) sys-devel/bison sys-devel/flex
-DESCRIPTION=A free socks4,5 and msproxy implementation
-EAPI=7
-HOMEPAGE=https://www.inet.no/dante/
-IUSE=debug kerberos pam selinux static-libs tcpd upnp
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) upnp? ( net-libs/miniupnpc:= ) userland_GNU? ( sys-apps/shadow ) acct-group/sockd acct-user/sockd selinux? ( sec-policy/selinux-dante )
-SLOT=0
-SRC_URI=https://www.inet.no/dante/files/dante-1.4.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ab92a1b957224d6e41b73f83bd248ba0
diff --git a/metadata/md5-cache/net-proxy/dante-1.4.1-r6 b/metadata/md5-cache/net-proxy/dante-1.4.1-r6
new file mode 100644
index 000000000000..1ac0cd87dfb1
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/dante-1.4.1-r6
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/libcrypt:= kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) upnp? ( net-libs/miniupnpc:= ) userland_GNU? ( sys-apps/shadow ) sys-devel/bison sys-devel/flex
+DESCRIPTION=A free socks4,5 and msproxy implementation
+EAPI=7
+HOMEPAGE=https://www.inet.no/dante/
+IUSE=debug kerberos pam selinux static-libs tcpd upnp
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=BSD GPL-2
+RDEPEND=virtual/libcrypt:= kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) upnp? ( net-libs/miniupnpc:= ) userland_GNU? ( sys-apps/shadow ) acct-group/sockd acct-user/sockd selinux? ( sec-policy/selinux-dante )
+SLOT=0
+SRC_URI=https://www.inet.no/dante/files/dante-1.4.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=96c51481cd1da534ff0fb6cbb35212b6
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.30-r1 b/metadata/md5-cache/net-proxy/haproxy-1.8.30-r1
index 6abd235d1eb8..e0428a6b6385 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.30-r1
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.30-r1
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+IUSE=+crypt doc examples slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/1.8
 SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.30.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=29ec032441476ed4063af9f472c5fd62
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a2edf4d636b0d38154695856d101a6bc
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.14-r3 b/metadata/md5-cache/net-proxy/haproxy-2.0.14-r3
index aee3a0ef20b9..a6a06fc2da8c 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.14-r3
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.14-r3
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples 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
+IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 KEYWORDS=amd64 arm ~ppc x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
 SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1720417c7abee76c91042fde60a5691f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ca0977e61ae94f985cfe3f745b96d801
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.22-r1 b/metadata/md5-cache/net-proxy/haproxy-2.0.22-r1
index 163a23e1faa0..367203bb22f2 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.22-r1
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.22-r1
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples 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
+IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
 SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.22.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0790b649f1ac59ae2ac93614eaec1561
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5984513f36c7a9537331181d34807cff
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.9999 b/metadata/md5-cache/net-proxy/haproxy-2.0.9999
index cfbc3b6785d1..4abde7737550 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.9999
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples 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
+IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=789e07b942d97b7437801c54209276fd
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=243e85b5965532c052f3dc7f8bd95c02
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.14-r1 b/metadata/md5-cache/net-proxy/haproxy-2.2.14-r1
index e2cdfa26640f..6f2c1d35d253 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.14-r1
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.14-r1
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples 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
+IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
 SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0790b649f1ac59ae2ac93614eaec1561
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5984513f36c7a9537331181d34807cff
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.5-r2 b/metadata/md5-cache/net-proxy/haproxy-2.2.5-r2
index 8157ecd98e1d..6170e18f5e60 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.5-r2
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.5-r2
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples 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
+IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 KEYWORDS=amd64 arm ppc x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
 SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7fc67f404f0580f37f56b9b85d41c184
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2c54523d9ef280723b486afeabd9d4b6
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.9999 b/metadata/md5-cache/net-proxy/haproxy-2.2.9999
index c34cbb0b30b4..6903bff33257 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.9999
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples 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
+IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0790b649f1ac59ae2ac93614eaec1561
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5984513f36c7a9537331181d34807cff
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.10-r1 b/metadata/md5-cache/net-proxy/haproxy-2.3.10-r1
index 874427a3972c..898819225bda 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.10-r1
+++ b/metadata/md5-cache/net-proxy/haproxy-2.3.10-r1
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples 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
+IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.3
 SRC_URI=http://haproxy.1wt.eu/download/2.3/src/haproxy-2.3.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=96ab93ae3223435b7727504c3f9cba58
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7b0a9b2fa1d4174564ed507ff44936b2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.12 b/metadata/md5-cache/net-proxy/haproxy-2.3.12
index accd7dede8a6..7ce72145fe2e 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.12
+++ b/metadata/md5-cache/net-proxy/haproxy-2.3.12
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples 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
+IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.3
 SRC_URI=http://haproxy.1wt.eu/download/2.3/src/haproxy-2.3.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=96ab93ae3223435b7727504c3f9cba58
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7b0a9b2fa1d4174564ed507ff44936b2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.9999 b/metadata/md5-cache/net-proxy/haproxy-2.3.9999
index 5bb3fb652307..d91f905baf44 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.3.9999
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples 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
+IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.3
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=96ab93ae3223435b7727504c3f9cba58
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7b0a9b2fa1d4174564ed507ff44936b2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.1-r1 b/metadata/md5-cache/net-proxy/haproxy-2.4.1-r1
index 9931d90d1c6f..63f8851e06cc 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.1-r1
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples +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
+IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.4
 SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a118be030f909723c3b8254162f6e49
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=758fc862b37847c6604a3342d1c3bf87
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.2 b/metadata/md5-cache/net-proxy/haproxy-2.4.2
index 9a4b3a33e09c..2917f9313865 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.2
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.2
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples +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
+IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.4
 SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a118be030f909723c3b8254162f6e49
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=758fc862b37847c6604a3342d1c3bf87
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.9999 b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
index b7e43672f155..8eaf911aec74 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples +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
+IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) 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 )
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.4
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a118be030f909723c3b8254162f6e49
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=758fc862b37847c6604a3342d1c3bf87
diff --git a/metadata/md5-cache/net-proxy/redsocks-0.5 b/metadata/md5-cache/net-proxy/redsocks-0.5
deleted file mode 100644
index 352db2cb7114..000000000000
--- a/metadata/md5-cache/net-proxy/redsocks-0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=dev-libs/libevent:0= virtual/pkgconfig
-DESCRIPTION=Transparent redirector of any TCP connection to proxy
-EAPI=6
-HOMEPAGE=http://darkk.net.ru/redsocks/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1+ ZLIB
-RDEPEND=dev-libs/libevent:0= net-firewall/iptables
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/darkk/redsocks/archive/release-0.5.tar.gz -> redsocks-0.5.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=bd97986950c8f96f57ceef8ac0f6e1dd
diff --git a/metadata/md5-cache/net-proxy/redsocks-0.5-r1 b/metadata/md5-cache/net-proxy/redsocks-0.5-r1
deleted file mode 100644
index 80041852947f..000000000000
--- a/metadata/md5-cache/net-proxy/redsocks-0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=dev-libs/libevent:0= virtual/pkgconfig
-DESCRIPTION=Transparent redirector of any TCP connection to proxy
-EAPI=6
-HOMEPAGE=http://darkk.net.ru/redsocks/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1+ ZLIB
-RDEPEND=dev-libs/libevent:0= net-firewall/iptables
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/darkk/redsocks/archive/release-0.5.tar.gz -> redsocks-0.5.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=b9f18015f2e3bea3060dac08b6fc1a7e
diff --git a/metadata/md5-cache/net-proxy/redsocks-0.5-r2 b/metadata/md5-cache/net-proxy/redsocks-0.5-r2
new file mode 100644
index 000000000000..59b14c6d4d3d
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/redsocks-0.5-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/libevent:0=
+DESCRIPTION=Transparent redirector of any TCP connection to proxy
+EAPI=7
+HOMEPAGE=http://darkk.net.ru/redsocks/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 LGPL-2.1+ ZLIB
+RDEPEND=dev-libs/libevent:0= acct-group/redsocks acct-user/redsocks net-firewall/iptables
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/darkk/redsocks/archive/release-0.5.tar.gz -> redsocks-0.5.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c2173f1719094e83a17e992adbdbe881
diff --git a/metadata/md5-cache/net-proxy/redsocks-9999 b/metadata/md5-cache/net-proxy/redsocks-9999
index e1c36ab40848..45d0ff96ad42 100644
--- a/metadata/md5-cache/net-proxy/redsocks-9999
+++ b/metadata/md5-cache/net-proxy/redsocks-9999
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=dev-libs/libevent:0= virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install unpack
+DEPEND=dev-libs/libevent:0=
 DESCRIPTION=Transparent redirector of any TCP connection to proxy
-EAPI=6
+EAPI=7
 HOMEPAGE=http://darkk.net.ru/redsocks/
 IUSE=doc
 LICENSE=Apache-2.0 LGPL-2.1+ ZLIB
 PROPERTIES=live
-RDEPEND=dev-libs/libevent:0= net-firewall/iptables
+RDEPEND=dev-libs/libevent:0= acct-group/redsocks acct-user/redsocks net-firewall/iptables
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=bd97986950c8f96f57ceef8ac0f6e1dd
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c2173f1719094e83a17e992adbdbe881
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index de84ff6b8f99..972af2877a78 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/i2p-0.9.50 b/metadata/md5-cache/net-vpn/i2p-0.9.50
new file mode 100644
index 000000000000..90eb78da41bc
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/i2p-0.9.50
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/java-service-wrapper:0 dev-java/tomcat-servlet-api:4.0 dev-java/eclipse-ecj:* nls? ( >=sys-devel/gettext-0.19 ) virtual/jdk:1.8 test? ( dev-java/ant-junit4:0 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A privacy-centric, anonymous network
+EAPI=7
+HOMEPAGE=https://geti2p.net
+IUSE=nls test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
+RDEPEND=dev-java/java-service-wrapper:0 dev-java/tomcat-servlet-api:4.0 acct-user/i2p acct-group/i2p virtual/jre:1.8 net-libs/nativebiginteger:0 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.i2p2.de/releases/0.9.50/i2psource_0.9.50.tar.bz2
+_eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=218e835005271dd276afbcae1eadb344
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606 b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
index cc47dc0d1742..fbe6eb26602a 100644
--- a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
+++ b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=module? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20210606.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50125427e4d052d0666f6f50dc2c2d03
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424
index 1f6e292a9142..085d37a7228b 100644
--- a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20210424.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f17605fb00581c4a76036cd5740deab7
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 9ffc9d7f587d..7dc2e2a32168 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/bluez-5.58-r1 b/metadata/md5-cache/net-wireless/bluez-5.58-r1
index 91b6d53a9923..6539f2aa065b 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.58-r1
+++ b/metadata/md5-cache/net-wireless/bluez-5.58-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=7
 HOMEPAGE=http://www.bluez.org
 IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session kernel_linux python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) )
 REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test-programs? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.58.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=eb883f3f523de8ecf83d311a496adf37
+_md5_=a711725a006114f173e212eb8f9a2cea
diff --git a/metadata/md5-cache/net-wireless/iwd-1.15 b/metadata/md5-cache/net-wireless/iwd-1.15
index bb294ff93289..44c7aa8a4499 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.15
+++ b/metadata/md5-cache/net-wireless/iwd-1.15
@@ -5,10 +5,10 @@ DESCRIPTION=Wireless daemon for linux
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
 IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 standalone systemd kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.41 net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.15.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b7bde790d65ed420c8b5484da90815b8
+_md5_=9b2dd75cabe522d587dae3c7d8bafd8f
diff --git a/metadata/md5-cache/net-wireless/qdmr-0.7.3 b/metadata/md5-cache/net-wireless/qdmr-0.7.3
deleted file mode 100644
index c4296b48e312..000000000000
--- a/metadata/md5-cache/net-wireless/qdmr-0.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1 dev-qt/linguist-tools:5
-DESCRIPTION=GUI application for configuring and programming cheap DMR radios
-EAPI=7
-HOMEPAGE=https://dm3mat.darc.de/qdmr/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1
-SLOT=0
-SRC_URI=https://github.com/hmatuschek/qdmr/archive/refs/tags/v0.7.3.tar.gz -> qdmr-0.7.3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d63d351d9e988be83522a38eafabd699
diff --git a/metadata/md5-cache/net-wireless/qdmr-0.8.0 b/metadata/md5-cache/net-wireless/qdmr-0.8.0
new file mode 100644
index 000000000000..bdabc2468fef
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/qdmr-0.8.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1 dev-qt/linguist-tools:5
+DESCRIPTION=GUI application for configuring and programming cheap DMR radios
+EAPI=7
+HOMEPAGE=https://dm3mat.darc.de/qdmr/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1
+SLOT=0
+SRC_URI=https://github.com/hmatuschek/qdmr/archive/refs/tags/v0.8.0.tar.gz -> qdmr-0.8.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d63d351d9e988be83522a38eafabd699
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 1814ba6f7063..3500f0e91b00 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/esomidas-17.02-r1 b/metadata/md5-cache/sci-astronomy/esomidas-17.02-r1
index e741e3025e2d..96bb2a433da4 100644
--- a/metadata/md5-cache/sci-astronomy/esomidas-17.02-r1
+++ b/metadata/md5-cache/sci-astronomy/esomidas-17.02-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= x11-libs/motif:0= x11-libs/libX11:= x11-libs/libXt:= !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) virtual/fortran
 SLOT=0/8
 SRC_URI=ftp://ftp.eso.org/pub/midaspub/17FEB/sources/17FEBpl1.2.tar.gz -> esomidas-17.02.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9e5a06fb77023d72584d4b3c97b96bfc
diff --git a/metadata/md5-cache/sci-astronomy/wcslib-7.3 b/metadata/md5-cache/sci-astronomy/wcslib-7.3
index c4d81ca83312..a28840fa5332 100644
--- a/metadata/md5-cache/sci-astronomy/wcslib-7.3
+++ b/metadata/md5-cache/sci-astronomy/wcslib-7.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=fits? ( sci-libs/cfitsio:0= ) pgplot? ( sci-libs/pgplot:0= ) fortran? ( virtual/fortran )
 SLOT=0/7
 SRC_URI=ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-7.3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b46ea3a3da3f865355ac4a79a481730b
diff --git a/metadata/md5-cache/sci-astronomy/wcslib-7.3.1 b/metadata/md5-cache/sci-astronomy/wcslib-7.3.1
index fced6cb1d939..b26df85ac632 100644
--- a/metadata/md5-cache/sci-astronomy/wcslib-7.3.1
+++ b/metadata/md5-cache/sci-astronomy/wcslib-7.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=fits? ( sci-libs/cfitsio:0= ) pgplot? ( sci-libs/pgplot:0= ) fortran? ( virtual/fortran )
 SLOT=0/7
 SRC_URI=ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-7.3.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=276cce4f3a42199ab7351ebafbf33160
diff --git a/metadata/md5-cache/sci-astronomy/wcslib-7.4 b/metadata/md5-cache/sci-astronomy/wcslib-7.4
index 2b0ba8a5fbe3..7e5934670630 100644
--- a/metadata/md5-cache/sci-astronomy/wcslib-7.4
+++ b/metadata/md5-cache/sci-astronomy/wcslib-7.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=fits? ( sci-libs/cfitsio:0= ) pgplot? ( sci-libs/pgplot:0= ) fortran? ( virtual/fortran )
 SLOT=0/7
 SRC_URI=ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-7.4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=04cfc9006ac7d08fd0e8dc7659eb79a4
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 3fce4b0c462a..1781c03d3e97 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/mothur-1.27.0-r1 b/metadata/md5-cache/sci-biology/mothur-1.27.0-r1
index 4108cfdfaebe..49675d029925 100644
--- a/metadata/md5-cache/sci-biology/mothur-1.27.0-r1
+++ b/metadata/md5-cache/sci-biology/mothur-1.27.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=sci-biology/uchime mpi? ( virtual/mpi ) virtual/fortran
 SLOT=0
 SRC_URI=https://www.mothur.org/w/images/c/cb/Mothur.1.27.0.zip -> mothur-1.27.0.zip
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a931ea6d0536a0cb3441d235f5d2d6b
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index bf2228ecfa09..4ccc31104d8e 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/aqua-3.2-r3 b/metadata/md5-cache/sci-chemistry/aqua-3.2-r3
index 2a150012ed06..51266e2d8190 100644
--- a/metadata/md5-cache/sci-chemistry/aqua-3.2-r3
+++ b/metadata/md5-cache/sci-chemistry/aqua-3.2-r3
@@ -10,5 +10,5 @@ RDEPEND=sci-chemistry/procheck virtual/fortran
 RESTRICT=fetch
 SLOT=0
 SRC_URI=aqua3.2.tar.gz doc? ( aqua-3.2-nmr_manual.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=448c80984b2fce68c6d5bef34cf480bc
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.8 b/metadata/md5-cache/sci-chemistry/gromacs-2018.8
index 624b79cac690..df777603400f 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.8
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2018.8
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2018.8.tar.gz doc? ( http://ftp.gromacs.org/manual/manual-2018.8.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2018.8.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=85b7a173ee593b0b33a93efeb2a4cfaa
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.6 b/metadata/md5-cache/sci-chemistry/gromacs-2019.6
index fcb108e0ec10..0bc9122a75b0 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.6
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2019.6
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2019.6.tar.gz doc? ( http://ftp.gromacs.org/manual/manual-2019.6.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2019.6.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d0d6475c3249a2ef40ee9869a89b11e5
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.4 b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
index 7f5e61600f8e..4155b0a3ccf7 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.4
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2020.4
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2020.4.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2020.4.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2020.4.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=bcc74c928c294a71b916d27251396ebc
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.6 b/metadata/md5-cache/sci-chemistry/gromacs-2020.6
index 78f178a3d216..64836a95183f 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.6
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2020.6
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2020.6.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2020.6.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2020.6.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b392ca251e8d7c5b6a4184f22303e577
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.2 b/metadata/md5-cache/sci-chemistry/gromacs-2021.2
index d5f5cbb1215b..2eab6331c950 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2021.2
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.2.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.2.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.2.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=070db88009fa19b22250ef328934e081
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
index 093e8191d6f3..c6fa3a453279 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2021.9999
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cdb632896246dd97e14a59f72626d5b5
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index 566edf6e6ee3..9b868c3f9219 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cdb632896246dd97e14a59f72626d5b5
diff --git a/metadata/md5-cache/sci-chemistry/mm-align-20120321 b/metadata/md5-cache/sci-chemistry/mm-align-20120321
index 4653bf3ca7ce..faafa21e871d 100644
--- a/metadata/md5-cache/sci-chemistry/mm-align-20120321
+++ b/metadata/md5-cache/sci-chemistry/mm-align-20120321
@@ -8,5 +8,5 @@ LICENSE=tm-align
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/MM-align-20120321.tar.xz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=49c7ebd406de721ad41571fdc9428f3f
diff --git a/metadata/md5-cache/sci-chemistry/molden-5.5 b/metadata/md5-cache/sci-chemistry/molden-5.5
index 81b58c1b3635..84e4161b276e 100644
--- a/metadata/md5-cache/sci-chemistry/molden-5.5
+++ b/metadata/md5-cache/sci-chemistry/molden-5.5
@@ -9,5 +9,5 @@ LICENSE=MOLDEN
 RDEPEND=x11-libs/libXmu virtual/glu opengl? ( media-libs/freeglut virtual/opengl ) virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden5.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e001bc09cd538ab64d80eae49115c766
diff --git a/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1 b/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
index a23079d87349..47a96aeeb02b 100644
--- a/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
+++ b/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=dev-libs/libf2c virtual/fortran
 SLOT=0
 SRC_URI=http://www.bioinformatics.org/ghemical/download/current/mopac7-1.15.tar.gz http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/dcart.f http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/gmxmop.f
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3771f029b2ebed87ddf490178be003a2
diff --git a/metadata/md5-cache/sci-chemistry/pdbmat-3.89 b/metadata/md5-cache/sci-chemistry/pdbmat-3.89
index caf23ec399a8..63d370ae1e48 100644
--- a/metadata/md5-cache/sci-chemistry/pdbmat-3.89
+++ b/metadata/md5-cache/sci-chemistry/pdbmat-3.89
@@ -9,5 +9,5 @@ LICENSE=CeCILL-2
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=http://ecole.modelisation.free.fr/enm2011.tar.gz -> pdbmat-3.89.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5de2f612591221cdc5d57106eab44a2a
diff --git a/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r3 b/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r3
index 15a9bb370acd..d577d5ea8434 100644
--- a/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r3
+++ b/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r3
@@ -10,5 +10,5 @@ RDEPEND=app-shells/tcsh virtual/fortran
 RESTRICT=fetch
 SLOT=0
 SRC_URI=procheck-3.5.4.tar.gz procheck-3.5.4-README doc? ( procheck-3.5.4-manual.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=37126e817c9ca6bc8863625728e8be68
diff --git a/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2 b/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
index cc48e38be755..c51afb1d8be5 100644
--- a/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
+++ b/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
@@ -11,5 +11,5 @@ RDEPEND=!sci-visualization/extrema virtual/blas virtual/lapack >=sci-libs/libint
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/psicode/psi-3.4.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ecd9eddd7cba15554c7599004f94761a
diff --git a/metadata/md5-cache/sci-chemistry/raster3d-3.0.6 b/metadata/md5-cache/sci-chemistry/raster3d-3.0.6
index 11c5f6d8aea0..5ac097354bc8 100644
--- a/metadata/md5-cache/sci-chemistry/raster3d-3.0.6
+++ b/metadata/md5-cache/sci-chemistry/raster3d-3.0.6
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=gd? ( media-libs/gd[jpeg,png] ) tiff? ( media-libs/tiff:0 ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.bmsc.washington.edu/raster3d/Raster3D_3.0-6.tar.gz -> Raster3D_3.0-6.tar
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9be75cc0fea7287e4d0805dc7c90da7f
diff --git a/metadata/md5-cache/sci-chemistry/tinker-8.2.1 b/metadata/md5-cache/sci-chemistry/tinker-8.2.1
index ab41cb30d464..450be70a42c3 100644
--- a/metadata/md5-cache/sci-chemistry/tinker-8.2.1
+++ b/metadata/md5-cache/sci-chemistry/tinker-8.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/fftw-3.2.2-r1[fortran,threads] dev-libs/maloc !sys-apps/bar !
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dasher.wustl.edu/tinker/downloads/tinker-8.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fb598b8d929f5e0c789410edc0a98c00
diff --git a/metadata/md5-cache/sci-chemistry/tm-align-20150914 b/metadata/md5-cache/sci-chemistry/tm-align-20150914
index be386c8e3bae..9a8da8d39c23 100644
--- a/metadata/md5-cache/sci-chemistry/tm-align-20150914
+++ b/metadata/md5-cache/sci-chemistry/tm-align-20150914
@@ -9,5 +9,5 @@ LICENSE=tm-align
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools20150914.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b2861c00ea1789213f819316513af081
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha51 b/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha51
index 26fb75d0d224..518bbfa6903c 100644
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha51
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha51
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=fetch
 SLOT=0
 SRC_URI=vmd-1.9.4a51.src.tar.gz https://dev.gentoo.org/~pacho/vmd/vmd-1.9.4_alpha51-gentoo-patches.tar.xz
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4485f954055fc234c15fb8e7545726f3
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-1.5.1 b/metadata/md5-cache/sci-chemistry/votca-csg-1.5.1
index 8c6b3a988901..1c9cb65d6ab7 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-1.5.1
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-1.5.1
@@ -10,5 +10,5 @@ PDEPEND=extras? ( ~sci-chemistry/votca-csgapps-1.5.1 )
 RDEPEND=~sci-libs/votca-tools-1.5.1 >=dev-cpp/eigen-3.3 gromacs? ( <sci-chemistry/gromacs-2020:= ) hdf5? ( sci-libs/hdf5 ) dev-lang/perl app-shells/bash:*
 SLOT=0
 SRC_URI=https://github.com/votca/csg/archive/v1.5.1.tar.gz -> votca-csg-1.5.1.tar.gz doc? ( https://github.com/votca/csg-manual/releases/download/v1.5.1/votca-csg-manual-1.5.1.pdf ) examples? ( https://github.com/votca/csg-tutorials/archive/v1.5.1.tar.gz -> votca-csg-tutorials-1.5.1.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d99c6eea2a8214cd6d5f0e2eb06a13d9
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-1.6.4 b/metadata/md5-cache/sci-chemistry/votca-csg-1.6.4
index 86adf62a8a27..720111cb66dd 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-1.6.4
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-1.6.4
@@ -11,5 +11,5 @@ PDEPEND=extras? ( ~sci-chemistry/votca-csgapps-1.6.4 )
 RDEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-1.6.4 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 )
 SLOT=0
 SRC_URI=https://github.com/votca/csg/archive/v1.6.4.tar.gz -> votca-csg-1.6.4.tar.gz doc? ( https://github.com/votca/csg-manual/releases/download/v1.6.4/votca-csg-manual-1.6.4.pdf ) examples? ( https://github.com/votca/csg-tutorials/archive/v1.6.4.tar.gz -> votca-csg-tutorials-1.6.4.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0c5e4f1979706ca3a2c505a910271516
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-2021 b/metadata/md5-cache/sci-chemistry/votca-csg-2021
index 01b99c8026ea..0a48a8077439 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-2021
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-2021
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-2021 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 )
 SLOT=0
 SRC_URI=https://github.com/votca/csg/archive/v2021.tar.gz -> votca-csg-2021.tar.gz examples? ( https://github.com/votca/csg-tutorials/archive/v2021.tar.gz -> votca-csg-tutorials-2021.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5b60b47ec9878e1ef21c5293f2838dec
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-9999 b/metadata/md5-cache/sci-chemistry/votca-csg-9999
index 4277c87396b3..1efbab1acb36 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-9999 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9cda1d192741b1fa850610bb3c343de0
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.4 b/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.4
index 116c868e8dcf..3cf7be7b460b 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.4
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-1.6.4 sci-libs/hdf5[cxx] sci-libs/libxc ~sci-libs/votca-tools-1.6.4
 SLOT=0
 SRC_URI=https://github.com/votca/xtp/archive/v1.6.4.tar.gz -> votca-xtp-1.6.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2748df7df0e3b59bd0a842fe11ca3f68
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-2021 b/metadata/md5-cache/sci-chemistry/votca-xtp-2021
index c5e37b3003c0..b444263e2cb4 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-2021
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-2021
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-2021 sci-libs/hdf5[cxx] sci-libs/libxc sci-libs/libint:2 ~sci-libs/votca-tools-2021
 SLOT=0
 SRC_URI=https://github.com/votca/xtp/archive/v2021.tar.gz -> votca-xtp-2021.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=85c7281c1f408e1689f29c458eae5f46
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-9999 b/metadata/md5-cache/sci-chemistry/votca-xtp-9999
index c5aa29dfec57..354f0252118d 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-9999 sci-libs/hdf5[cxx] sci-libs/libecpint sci-libs/libxc ~sci-libs/votca-tools-9999
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=38744417d995f9e3eeeaab8156f21668
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 76d75111664a..20424a4659b0 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/voacapl-0.7.6 b/metadata/md5-cache/sci-electronics/voacapl-0.7.6
index df383e5683ea..998d5a03fb80 100644
--- a/metadata/md5-cache/sci-electronics/voacapl-0.7.6
+++ b/metadata/md5-cache/sci-electronics/voacapl-0.7.6
@@ -9,5 +9,5 @@ RDEPEND=virtual/fortran
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://github.com/jawatson/voacapl/archive/v.0.7.6.tar.gz -> voacapl-0.7.6.tar.gz
-_eclasses_=fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f72766c5b5aea46076386c09b0fd465
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 6c97fe23e0c2..bd059ac8ff48 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gmt-5.4.4 b/metadata/md5-cache/sci-geosciences/gmt-5.4.4
index 2f77ac79c12c..99a6d1f4bb1b 100644
--- a/metadata/md5-cache/sci-geosciences/gmt-5.4.4
+++ b/metadata/md5-cache/sci-geosciences/gmt-5.4.4
@@ -11,5 +11,5 @@ RDEPEND=app-text/ghostscript-gpl net-misc/curl >=sci-libs/netcdf-4.1:=[hdf5] sys
 REQUIRED_USE=?? ( pcre pcre2 )
 SLOT=5
 SRC_URI=mirror://gmt/gmt-5.4.4-src.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9a0afcca8676db8f0619492e59999416
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 3b0f7a32cd74..76db34082cc1 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/adolc-2.7.2 b/metadata/md5-cache/sci-libs/adolc-2.7.2
index db522da03bae..f65ef6c14c7c 100644
--- a/metadata/md5-cache/sci-libs/adolc-2.7.2
+++ b/metadata/md5-cache/sci-libs/adolc-2.7.2
@@ -5,10 +5,10 @@ DESCRIPTION=Automatic differentiation system for C/C++
 EAPI=7
 HOMEPAGE=https://projects.coin-or.org/ADOL-C/
 IUSE=+boost mpi sparse
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( EPL-1.0 GPL-2 )
 RDEPEND=boost? ( dev-libs/boost:0= ) mpi? ( sys-cluster/ampi:0= ) sparse? ( sci-libs/colpack:0= )
 SLOT=0/2
 SRC_URI=https://github.com/coin-or/ADOL-C/archive/releases/2.7.2.tar.gz -> adolc-2.7.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=326f3db783f962746f01201ebc66c12d
+_md5_=f1e011abd4a1f5ea504f0efdc99ceaf2
diff --git a/metadata/md5-cache/sci-libs/amd-2.4.6 b/metadata/md5-cache/sci-libs/amd-2.4.6
index e638f47f5678..130585fc50de 100644
--- a/metadata/md5-cache/sci-libs/amd-2.4.6
+++ b/metadata/md5-cache/sci-libs/amd-2.4.6
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0 fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/amd-2.4.6.tar.bz2
-_eclasses_=fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3342a8e026f3a6725b1c9ce921b083c6
diff --git a/metadata/md5-cache/sci-libs/amd-2.4.6-r1 b/metadata/md5-cache/sci-libs/amd-2.4.6-r1
index 9ec1449e4b88..0b6675c78f7a 100644
--- a/metadata/md5-cache/sci-libs/amd-2.4.6-r1
+++ b/metadata/md5-cache/sci-libs/amd-2.4.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 IUSE=doc fortran
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0 fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/amd-2.4.6.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ff1a3f1dfe7dd1e53e6f9fc931932042
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cceba81ac4797cd4b3089cf3c4e7c331
diff --git a/metadata/md5-cache/sci-libs/arpack-3.8.0 b/metadata/md5-cache/sci-libs/arpack-3.8.0
index e75287288a78..d92ae1369e64 100644
--- a/metadata/md5-cache/sci-libs/arpack-3.8.0
+++ b/metadata/md5-cache/sci-libs/arpack-3.8.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
 SLOT=0
 SRC_URI=https://github.com/opencollab/arpack-ng/archive/3.8.0.tar.gz -> arpack-3.8.0.tar.gz doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=194970301586c0ac1595620ad3248d64
diff --git a/metadata/md5-cache/sci-libs/arpack-9999 b/metadata/md5-cache/sci-libs/arpack-9999
index 7b2c7dfc3796..ca1f8e0dfdd8 100644
--- a/metadata/md5-cache/sci-libs/arpack-9999
+++ b/metadata/md5-cache/sci-libs/arpack-9999
@@ -9,5 +9,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1bc18998f451f41826c4d03246ade9d4
diff --git a/metadata/md5-cache/sci-libs/arprec-2.2.19 b/metadata/md5-cache/sci-libs/arprec-2.2.19
index 9b4d393db5a5..719f6cdd2d8e 100644
--- a/metadata/md5-cache/sci-libs/arprec-2.2.19
+++ b/metadata/md5-cache/sci-libs/arprec-2.2.19
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=qd? ( sci-libs/qd[fortran=] ) fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=https://crd.lbl.gov/~dhbailey/mpdist/arprec-2.2.19.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=92ce41cd4be639ddfcea936898d8683b
diff --git a/metadata/md5-cache/sci-libs/atlas-3.10.2 b/metadata/md5-cache/sci-libs/atlas-3.10.2
index 737f2e9e7f2e..b97ac522e400 100644
--- a/metadata/md5-cache/sci-libs/atlas-3.10.2
+++ b/metadata/md5-cache/sci-libs/atlas-3.10.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=mirror://sourceforge/math-atlas/atlas3.10.2.tar.bz2 fortran? ( lapack? ( http://www.netlib.org/lapack/lapack-3.6.0.tgz ) )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=da6f6a54e02fbefe338a48def4b52db8
diff --git a/metadata/md5-cache/sci-libs/buddy-2.4-r1 b/metadata/md5-cache/sci-libs/buddy-2.4-r1
index e41ec7b550ff..414392a00b12 100644
--- a/metadata/md5-cache/sci-libs/buddy-2.4-r1
+++ b/metadata/md5-cache/sci-libs/buddy-2.4-r1
@@ -9,5 +9,5 @@ LICENSE=buddy
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/buddy/buddy-2.4.tar.gz
-_eclasses_=fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d55bb0c1d7c81f697a7e6fd08a699b0
diff --git a/metadata/md5-cache/sci-libs/camd-2.4.6-r1 b/metadata/md5-cache/sci-libs/camd-2.4.6-r1
index a2f23a602861..2df79cc3041e 100644
--- a/metadata/md5-cache/sci-libs/camd-2.4.6-r1
+++ b/metadata/md5-cache/sci-libs/camd-2.4.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/camd-2.4.6.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2dc084f64eb77129c8aa7896a3cb7e36
+_md5_=ebae1b1c95de9ab0095a32d3d2a76e0f
diff --git a/metadata/md5-cache/sci-libs/cantera-2.5.1-r1 b/metadata/md5-cache/sci-libs/cantera-2.5.1-r1
index 1c56ab7cabaa..7b0732c5f4a0 100644
--- a/metadata/md5-cache/sci-libs/cantera-2.5.1-r1
+++ b/metadata/md5-cache/sci-libs/cantera-2.5.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_8 python_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Cantera/cantera/archive/v2.5.1.tar.gz -> cantera-2.5.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b448b0c72a3a5da1e85c5bb105399a1
diff --git a/metadata/md5-cache/sci-libs/ccolamd-2.9.6 b/metadata/md5-cache/sci-libs/ccolamd-2.9.6
index 8fcf60bc28ad..ea1c30470aeb 100644
--- a/metadata/md5-cache/sci-libs/ccolamd-2.9.6
+++ b/metadata/md5-cache/sci-libs/ccolamd-2.9.6
@@ -4,9 +4,9 @@ DEPEND=sci-libs/suitesparseconfig
 DESCRIPTION=Constrained Column approximate minimum degree ordering algorithm
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://202.36.178.9/sage//ccolamd-2.9.6.tar.bz2
-_md5_=4b1299a36360903774bceba1b80d2d62
+_md5_=d487b6ca3c59af0c7ccaa0c7ee3f807f
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.490 b/metadata/md5-cache/sci-libs/cfitsio-3.490
index edfb44bb8894..4f093ea160ea 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-3.490
+++ b/metadata/md5-cache/sci-libs/cfitsio-3.490
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/fortran
 SLOT=0/9
 SRC_URI=http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz
-_eclasses_=fortran-2	3cec34b0def864e87677d8b2b1c370b8	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f4d5eda7f71be1e1dfdbb296af428d7
diff --git a/metadata/md5-cache/sci-libs/cgcode-1.0-r2 b/metadata/md5-cache/sci-libs/cgcode-1.0-r2
index 395f8dbdfbb3..e30597a34ec8 100644
--- a/metadata/md5-cache/sci-libs/cgcode-1.0-r2
+++ b/metadata/md5-cache/sci-libs/cgcode-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/fortran
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/cgcode-1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a08942d709e164cb4c51986f278fc202
diff --git a/metadata/md5-cache/sci-libs/cgnslib-3.4.0 b/metadata/md5-cache/sci-libs/cgnslib-3.4.0
index 80a07ce68348..1425d511a182 100644
--- a/metadata/md5-cache/sci-libs/cgnslib-3.4.0
+++ b/metadata/md5-cache/sci-libs/cgnslib-3.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=mpi? ( hdf5 ) szip? ( hdf5 )
 RESTRICT=fortran? ( test ) !test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/CGNS/CGNS/archive/v3.4.0.tar.gz -> cgnslib-3.4.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=03fffbfe8be6400786923dbec1e6eed3
diff --git a/metadata/md5-cache/sci-libs/cholmod-3.0.13 b/metadata/md5-cache/sci-libs/cholmod-3.0.13
index 550d959d5f15..3ddc56ec4bfc 100644
--- a/metadata/md5-cache/sci-libs/cholmod-3.0.13
+++ b/metadata/md5-cache/sci-libs/cholmod-3.0.13
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base )
 DEFINED_PHASES=configure install
-DEPEND=>=sci-libs/amd-2.4 >=sci-libs/colamd-2.9 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) partition? ( >=sci-libs/camd-2.4 >=sci-libs/ccolamd-2.9 || ( >=sci-libs/metis-5.1.0 sci-libs/parmetis ) )
+DEPEND=>=sci-libs/amd-2.4 >=sci-libs/colamd-2.9 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) partition? ( >=sci-libs/camd-2.4 >=sci-libs/ccolamd-2.9 >=sci-libs/metis-5.1.0 )
 DESCRIPTION=Sparse Cholesky factorization and update/downdate library
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 IUSE=cuda doc +lapack +matrixops +modify +partition
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )
-RDEPEND=>=sci-libs/amd-2.4 >=sci-libs/colamd-2.9 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) partition? ( >=sci-libs/camd-2.4 >=sci-libs/ccolamd-2.9 || ( >=sci-libs/metis-5.1.0 sci-libs/parmetis ) )
+RDEPEND=>=sci-libs/amd-2.4 >=sci-libs/colamd-2.9 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) partition? ( >=sci-libs/camd-2.4 >=sci-libs/ccolamd-2.9 >=sci-libs/metis-5.1.0 )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/cholmod-3.0.13.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=05d791dbc3f21f386b40debe79836985
+_md5_=a461c6e800fa90ff814de57a2fbd3fa7
diff --git a/metadata/md5-cache/sci-libs/cholmod-3.0.14 b/metadata/md5-cache/sci-libs/cholmod-3.0.14
index 277ea1ffd61c..225dc6fc610c 100644
--- a/metadata/md5-cache/sci-libs/cholmod-3.0.14
+++ b/metadata/md5-cache/sci-libs/cholmod-3.0.14
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base )
 DEFINED_PHASES=configure install
-DEPEND=sci-libs/amd sci-libs/colamd cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) lapack? ( virtual/lapack ) partition? ( sci-libs/camd sci-libs/ccolamd || ( >=sci-libs/metis-5.1.0 sci-libs/parmetis ) )
+DEPEND=sci-libs/amd sci-libs/colamd cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) lapack? ( virtual/lapack ) partition? ( sci-libs/camd sci-libs/ccolamd >=sci-libs/metis-5.1.0 )
 DESCRIPTION=Sparse Cholesky factorization and update/downdate library
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 IUSE=cuda doc +lapack +matrixops +modify +partition
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )
-RDEPEND=sci-libs/amd sci-libs/colamd cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) lapack? ( virtual/lapack ) partition? ( sci-libs/camd sci-libs/ccolamd || ( >=sci-libs/metis-5.1.0 sci-libs/parmetis ) )
+RDEPEND=sci-libs/amd sci-libs/colamd cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) lapack? ( virtual/lapack ) partition? ( sci-libs/camd sci-libs/ccolamd >=sci-libs/metis-5.1.0 )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/cholmod-3.0.14.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=99b04407ca7c7d5ab5fab40a199e70c4
+_md5_=57717cc7289df6f2e216987555724ad0
diff --git a/metadata/md5-cache/sci-libs/coinhsl-2015.06.23 b/metadata/md5-cache/sci-libs/coinhsl-2015.06.23
index 472e78952c2d..13eb1dd99cd4 100644
--- a/metadata/md5-cache/sci-libs/coinhsl-2015.06.23
+++ b/metadata/md5-cache/sci-libs/coinhsl-2015.06.23
@@ -9,5 +9,5 @@ RDEPEND=sci-libs/metis virtual/blas virtual/fortran
 RESTRICT=mirror fetch
 SLOT=0
 SRC_URI=coinhsl-2015.06.23.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c5eeecea4e7fb1279fe866d0e8cc60a
diff --git a/metadata/md5-cache/sci-libs/coinor-clp-1.17.6 b/metadata/md5-cache/sci-libs/coinor-clp-1.17.6
index 2ad24ea03681..ef1b80f9a42b 100644
--- a/metadata/md5-cache/sci-libs/coinor-clp-1.17.6
+++ b/metadata/md5-cache/sci-libs/coinor-clp-1.17.6
@@ -1,15 +1,15 @@
 BDEPEND=virtual/fortran virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) test? ( sci-libs/coinor-sample )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/coinor-osi:= sci-libs/coinor-utils:= glpk? ( sci-mathematics/glpk:= sci-libs/amd ) metis? ( || ( sci-libs/metis sci-libs/parmetis ) ) mumps? ( sci-libs/mumps[-mpi] ) sparse? ( sci-libs/cholmod )
+DEPEND=sci-libs/coinor-osi:= sci-libs/coinor-utils:= glpk? ( sci-mathematics/glpk:= sci-libs/amd ) metis? ( sci-libs/metis ) mumps? ( sci-libs/mumps[-mpi] ) sparse? ( sci-libs/cholmod )
 DESCRIPTION=COIN-OR linear programming solver
 EAPI=7
 HOMEPAGE=https://github.com/coin-or/Clp/
 IUSE=doc examples glpk metis mumps sparse static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
-RDEPEND=sci-libs/coinor-osi:= sci-libs/coinor-utils:= glpk? ( sci-mathematics/glpk:= sci-libs/amd ) metis? ( || ( sci-libs/metis sci-libs/parmetis ) ) mumps? ( sci-libs/mumps[-mpi] ) sparse? ( sci-libs/cholmod )
+RDEPEND=sci-libs/coinor-osi:= sci-libs/coinor-utils:= glpk? ( sci-mathematics/glpk:= sci-libs/amd ) metis? ( sci-libs/metis ) mumps? ( sci-libs/mumps[-mpi] ) sparse? ( sci-libs/cholmod )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/coin-or/Clp/archive/releases/1.17.6.tar.gz -> coinor-clp-1.17.6.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ac909571f5f8bc762a656d2f6615930e
+_md5_=7ba97df15b5a340a413a6797c7d95074
diff --git a/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1 b/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1
index 31f378f85c96..9188ab3280b7 100644
--- a/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1
+++ b/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-bonmin:= sci-libs/coinor-cbc:= sci-libs/coinor-cgl:= sci-libs/coinor-clp:= sci-libs/coinor-osi:= sci-libs/coinor-utils:= sci-libs/ipopt:=[lapack] virtual/blas virtual/fortran
 SLOT=0/1
 SRC_URI=https://github.com/coin-or/Couenne/archive/releases/0.5.8.tar.gz -> coinor-couenne-0.5.8.tar.gz
-_eclasses_=fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f26bbb70f06ec5e46afe6b12e4c31f28
diff --git a/metadata/md5-cache/sci-libs/colamd-2.9.6 b/metadata/md5-cache/sci-libs/colamd-2.9.6
index 729649df7cd8..8a2cfee1df19 100644
--- a/metadata/md5-cache/sci-libs/colamd-2.9.6
+++ b/metadata/md5-cache/sci-libs/colamd-2.9.6
@@ -4,9 +4,9 @@ DEPEND=>=sci-libs/suitesparseconfig-5.4.0
 DESCRIPTION=Column approximate minimum degree ordering algorithm
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/colamd-2.9.6.tar.bz2
-_md5_=561ed3c21493ff4b940fc61bf260de24
+_md5_=77a5320c49e5c47f6dc7a0a586078055
diff --git a/metadata/md5-cache/sci-libs/colpack-1.0.10 b/metadata/md5-cache/sci-libs/colpack-1.0.10
index 2b93497ccc53..357d2b2027cc 100644
--- a/metadata/md5-cache/sci-libs/colpack-1.0.10
+++ b/metadata/md5-cache/sci-libs/colpack-1.0.10
@@ -2,11 +2,11 @@ BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/
 DEFINED_PHASES=configure install prepare pretend setup
 DESCRIPTION=C++ algorithms for specialized vertex coloring problems
 EAPI=7
-HOMEPAGE=http://cscapes.cs.purdue.edu/coloringpage/
+HOMEPAGE=https://cscapes.cs.purdue.edu/coloringpage/
 IUSE=openmp
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3 LGPL-3
 SLOT=0
 SRC_URI=https://github.com/CSCsw/ColPack/archive/v1.0.10.tar.gz -> colpack-1.0.10.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4335be941836149e4e6309e0e3c285d7
+_md5_=d59f904fb90878e0ee38a7e7f0a98496
diff --git a/metadata/md5-cache/sci-libs/dealii-9.2.0-r1 b/metadata/md5-cache/sci-libs/dealii-9.2.0-r1
index 9942d86efc5f..9bb524346465 100644
--- a/metadata/md5-cache/sci-libs/dealii-9.2.0-r1
+++ b/metadata/md5-cache/sci-libs/dealii-9.2.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) nanoflann? ( sci-libs/nanoflann ) opencascade? ( sci-libs/opencascade:* ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( <sci-libs/sundials-4:= ) symengine? ( >=sci-libs/symengine-0.4:= ) tbb? ( dev-cpp/tbb ) trilinos? ( sci-libs/trilinos ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl )
+DEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) nanoflann? ( sci-libs/nanoflann ) opencascade? ( sci-libs/opencascade:* ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( <sci-libs/sundials-4:= ) symengine? ( >=sci-libs/symengine-0.4:= ) tbb? ( dev-cpp/tbb ) trilinos? ( sci-libs/trilinos ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl )
 DESCRIPTION=Solving partial differential equations with the finite element method
 EAPI=7
 HOMEPAGE=https://www.dealii.org/
 IUSE=adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 +lapack metis mpi muparser nanoflann opencascade p4est petsc scalapack slepc +sparse static-libs sundials symengine +tbb trilinos
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) nanoflann? ( sci-libs/nanoflann ) opencascade? ( sci-libs/opencascade:* ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( <sci-libs/sundials-4:= ) symengine? ( >=sci-libs/symengine-0.4:= ) tbb? ( dev-cpp/tbb ) trilinos? ( sci-libs/trilinos )
+RDEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) nanoflann? ( sci-libs/nanoflann ) opencascade? ( sci-libs/opencascade:* ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( <sci-libs/sundials-4:= ) symengine? ( >=sci-libs/symengine-0.4:= ) tbb? ( dev-cpp/tbb ) trilinos? ( sci-libs/trilinos )
 REQUIRED_USE=p4est? ( mpi ) slepc? ( petsc ) trilinos? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/dealii/dealii/releases/download/v9.2.0/dealii-9.2.0.tar.gz doc? ( https://github.com/dealii/dealii/releases/download/v9.2.0/dealii-9.2.0-offline_documentation.tar.gz )
 _eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0fd7c63db72e8b668c4eb07ae2b2fdd5
+_md5_=3b1f26af06a025697a49fdfcadb073d2
diff --git a/metadata/md5-cache/sci-libs/dealii-9.3.0-r1 b/metadata/md5-cache/sci-libs/dealii-9.3.0-r1
index be24e2d31480..3e6782be860b 100644
--- a/metadata/md5-cache/sci-libs/dealii-9.3.0-r1
+++ b/metadata/md5-cache/sci-libs/dealii-9.3.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/tbb adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.1:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl )
+DEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/tbb adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.1:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl )
 DESCRIPTION=Solving partial differential equations with the finite element method
 EAPI=7
 HOMEPAGE=https://www.dealii.org/
 IUSE=adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 +lapack metis mpi muparser opencascade p4est petsc scalapack slepc +sparse static-libs sundials symengine trilinos
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/tbb adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.1:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos )
+RDEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/tbb adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.1:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos )
 REQUIRED_USE=p4est? ( mpi ) slepc? ( petsc ) trilinos? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/dealii/dealii/releases/download/v9.3.0/dealii-9.3.0.tar.gz doc? ( https://github.com/dealii/dealii/releases/download/v9.3.0/dealii-9.3.0-offline_documentation.tar.gz )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eb5e78d847a57bbf5833c728bfe2a288
+_md5_=31cb11fb6dd2254667d6f3e8f372f303
diff --git a/metadata/md5-cache/sci-libs/dealii-9.3.1 b/metadata/md5-cache/sci-libs/dealii-9.3.1
new file mode 100644
index 000000000000..0a1d35a8c71d
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/dealii-9.3.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/tbb adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.2:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl )
+DESCRIPTION=Solving partial differential equations with the finite element method
+EAPI=7
+HOMEPAGE=https://www.dealii.org/
+IUSE=adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 +lapack metis mpi muparser opencascade p4est petsc scalapack slepc +sparse static-libs sundials symengine trilinos
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/tbb adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.2:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos )
+REQUIRED_USE=p4est? ( mpi ) slepc? ( petsc ) trilinos? ( mpi )
+SLOT=0
+SRC_URI=https://github.com/dealii/dealii/releases/download/v9.3.1/dealii-9.3.1.tar.gz doc? ( https://github.com/dealii/dealii/releases/download/v9.3.1/dealii-9.3.1-offline_documentation.tar.gz )
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=38d34c78f375baa49f2dd00537e17676
diff --git a/metadata/md5-cache/sci-libs/dealii-9999 b/metadata/md5-cache/sci-libs/dealii-9999
index 4e7997172d91..208b6ca7eece 100644
--- a/metadata/md5-cache/sci-libs/dealii-9999
+++ b/metadata/md5-cache/sci-libs/dealii-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/cpp-taskflow dev-cpp/tbb adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.1:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl )
+DEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/cpp-taskflow dev-cpp/tbb adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.2:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl )
 DESCRIPTION=Solving partial differential equations with the finite element method
 EAPI=7
 HOMEPAGE=https://www.dealii.org/
 IUSE=adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 +lapack metis mpi muparser opencascade p4est petsc scalapack slepc +sparse static-libs sundials symengine trilinos
 LICENSE=LGPL-2.1+
 PROPERTIES=live
-RDEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/cpp-taskflow dev-cpp/tbb adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.1:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos )
+RDEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/cpp-taskflow dev-cpp/tbb adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.2:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos )
 REQUIRED_USE=p4est? ( mpi ) slepc? ( petsc ) trilinos? ( mpi )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8aa4063b9f862036769449437cc822a9
+_md5_=f3e3f3f842c0a35f4a8b2c8bf71d0f59
diff --git a/metadata/md5-cache/sci-libs/dlib-19.22 b/metadata/md5-cache/sci-libs/dlib-19.22
index 6fb41d92b18b..1f8234501293 100644
--- a/metadata/md5-cache/sci-libs/dlib-19.22
+++ b/metadata/md5-cache/sci-libs/dlib-19.22
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( png || ( python_targets_python3_8 python_targets_python3_
 RESTRICT=!test? ( test )
 SLOT=0/19.22
 SRC_URI=https://github.com/davisking/dlib/archive/v19.22.tar.gz -> dlib-19.22.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fb8f6442c02887729dbe17313420074b
diff --git a/metadata/md5-cache/sci-libs/eccodes-2.18.0 b/metadata/md5-cache/sci-libs/eccodes-2.18.0
index 29e481223531..3121b938334a 100644
--- a/metadata/md5-cache/sci-libs/eccodes-2.18.0
+++ b/metadata/md5-cache/sci-libs/eccodes-2.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=fortran? ( !threads ( openmp ) ) openmp? ( !threads ( fortran ) ) t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://confluence.ecmwf.int/download/attachments/45757960/eccodes-2.18.0-Source.tar.gz extra-test? ( http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz http://download.ecmwf.org/test-data/eccodes/data/mercator.grib2 )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=99712b5a5c73c31575cf599ddd2865f6
diff --git a/metadata/md5-cache/sci-libs/exodusii-6.09 b/metadata/md5-cache/sci-libs/exodusii-6.09
index 8a2f9946195e..a73e23069370 100644
--- a/metadata/md5-cache/sci-libs/exodusii-6.09
+++ b/metadata/md5-cache/sci-libs/exodusii-6.09
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/netcdf[hdf5]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/exodus-6.09.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ee7cba877b48eb5dcc9cbee3047b107a
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.9 b/metadata/md5-cache/sci-libs/fftw-3.3.9
index 1cda1dd2c472..ee0adacad523 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.9
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.9
@@ -11,5 +11,5 @@ RDEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=!test? ( test )
 SLOT=3.0/3
 SRC_URI=http://www.fftw.org/fftw-3.3.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a01f5ab719b855192e7509829b9cc555
diff --git a/metadata/md5-cache/sci-libs/fftw-9999 b/metadata/md5-cache/sci-libs/fftw-9999
index 90acb221e3fa..45e2bd77d670 100644
--- a/metadata/md5-cache/sci-libs/fftw-9999
+++ b/metadata/md5-cache/sci-libs/fftw-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=mpi? ( >=virtual/mpi-2.0-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(-)?] ) fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
 SLOT=3.0/3
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6bd5ad874fe828f1d767f62dbe0c0937
diff --git a/metadata/md5-cache/sci-libs/flann-1.9.1-r3 b/metadata/md5-cache/sci-libs/flann-1.9.1-r3
index 53bf7042757c..1c5972a5d1ea 100644
--- a/metadata/md5-cache/sci-libs/flann-1.9.1-r3
+++ b/metadata/md5-cache/sci-libs/flann-1.9.1-r3
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=app-arch/lz4:= cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( dev-libs/boost:=[mpi] sci-libs/hdf5[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 )
 SLOT=0
 SRC_URI=https://github.com/mariusmuja/flann/archive/1.9.1.tar.gz -> flann-1.9.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5136eae2df1c5da1ed4419a1cf9604ee
diff --git a/metadata/md5-cache/sci-libs/flann-9999 b/metadata/md5-cache/sci-libs/flann-9999
index 8cf5e8a0ad11..c2949a6fbd12 100644
--- a/metadata/md5-cache/sci-libs/flann-9999
+++ b/metadata/md5-cache/sci-libs/flann-9999
@@ -9,5 +9,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=app-arch/lz4:= cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 )
 SLOT=0
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=444091586aa733bb30411232bc8736a8
diff --git a/metadata/md5-cache/sci-libs/gdal-3.2.1-r1 b/metadata/md5-cache/sci-libs/gdal-3.2.1-r1
index 4402af7a72f5..136aa01085c9 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.2.1-r1
+++ b/metadata/md5-cache/sci-libs/gdal-3.2.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
 SLOT=0/3.2
 SRC_URI=https://download.osgeo.org/gdal/3.2.1/gdal-3.2.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fdc3e25c743c59f889e97cf1198f1d67
diff --git a/metadata/md5-cache/sci-libs/gdal-3.2.2 b/metadata/md5-cache/sci-libs/gdal-3.2.2
index c8d64a7b9135..e9e218ab32e1 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.2.2
+++ b/metadata/md5-cache/sci-libs/gdal-3.2.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
 SLOT=0/3.2
 SRC_URI=https://download.osgeo.org/gdal/3.2.2/gdal-3.2.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5eb853adfdbed418d23a7f2e38d2985d
diff --git a/metadata/md5-cache/sci-libs/gdal-3.2.3 b/metadata/md5-cache/sci-libs/gdal-3.2.3
index 70adfff17098..4a79d00654a9 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.2.3
+++ b/metadata/md5-cache/sci-libs/gdal-3.2.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
 SLOT=0/3.2
 SRC_URI=https://download.osgeo.org/gdal/3.2.3/gdal-3.2.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b8d1a7fdab9f7de7af83f402ddd5fde
diff --git a/metadata/md5-cache/sci-libs/gdal-3.3.0 b/metadata/md5-cache/sci-libs/gdal-3.3.0
index 1125ee88546a..3484ec24b35c 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.3.0
+++ b/metadata/md5-cache/sci-libs/gdal-3.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
 SLOT=0/3.3
 SRC_URI=https://download.osgeo.org/gdal/3.3.0/gdal-3.3.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b0213bc8e890bafe630d76078552ecd2
diff --git a/metadata/md5-cache/sci-libs/gdal-3.3.1 b/metadata/md5-cache/sci-libs/gdal-3.3.1
index ae04dbf4df4d..34ff0eeada0a 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.3.1
+++ b/metadata/md5-cache/sci-libs/gdal-3.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
 SLOT=0/3.3
 SRC_URI=https://download.osgeo.org/gdal/3.3.1/gdal-3.3.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=039742314139f87b99f145cd9e8d0698
diff --git a/metadata/md5-cache/sci-libs/getdata-0.9.0-r3 b/metadata/md5-cache/sci-libs/getdata-0.9.0-r3
index e6b617eb52d7..2f517f881389 100644
--- a/metadata/md5-cache/sci-libs/getdata-0.9.0-r3
+++ b/metadata/md5-cache/sci-libs/getdata-0.9.0-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/getdata/getdata/0.9.0/getdata-0.9.0.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5b3e8a3fb99301a9e01f7e47986cf428
diff --git a/metadata/md5-cache/sci-libs/gmsh-4.6.0 b/metadata/md5-cache/sci-libs/gmsh-4.6.0
index 499965a4602f..ed78ab0cf202 100644
--- a/metadata/md5-cache/sci-libs/gmsh-4.6.0
+++ b/metadata/md5-cache/sci-libs/gmsh-4.6.0
@@ -11,5 +11,5 @@ RDEPEND=virtual/fortran X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapa
 REQUIRED_USE=med? ( mpi )
 SLOT=0
 SRC_URI=http://www.geuz.org/gmsh/src/gmsh-4.6.0-source.tgz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7aab4ad7166c5b744252f47c566128e5
diff --git a/metadata/md5-cache/sci-libs/gmsh-4.8.4 b/metadata/md5-cache/sci-libs/gmsh-4.8.4
index b43268d74b23..4cf0a08cdbcb 100644
--- a/metadata/md5-cache/sci-libs/gmsh-4.8.4
+++ b/metadata/md5-cache/sci-libs/gmsh-4.8.4
@@ -11,5 +11,5 @@ RDEPEND=virtual/fortran X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapa
 REQUIRED_USE=med? ( mpi )
 SLOT=0
 SRC_URI=http://www.geuz.org/gmsh/src/gmsh-4.8.4-source.tgz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7aab4ad7166c5b744252f47c566128e5
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.13-r1 b/metadata/md5-cache/sci-libs/hdf-4.2.13-r1
index ab6ebe4d2deb..aab3f709b6df 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.13-r1
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.13-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( szip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.13.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4e3556ddd9cb3e786011bc1e9ec9303b
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.15 b/metadata/md5-cache/sci-libs/hdf-4.2.15
index ad8fef5176c6..fc94be888d8c 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.15
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.15
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( szip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.15/src/hdf-4.2.15.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9b793c54389aa9ec8503417d28f02b90
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.10.5 b/metadata/md5-cache/sci-libs/hdf5-1.10.5
index 776cfdd3dc17..74549854b746 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5
@@ -11,5 +11,5 @@ RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib
 REQUIRED_USE=cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl )
 SLOT=0/1.10.5
 SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b6bc8615894f8e21e102fa6a103e0111
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1 b/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
index 33a34d5e9fe9..2cdb6e158ba4 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
@@ -11,5 +11,5 @@ RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib
 REQUIRED_USE=!unsupported? ( ?? ( cxx mpi ) threads? ( !cxx !mpi !fortran !hl ) )
 SLOT=0/1.10.5
 SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=72ecb4224d6a50593ca71a93771a86a0
diff --git a/metadata/md5-cache/sci-libs/hypre-2.20.0 b/metadata/md5-cache/sci-libs/hypre-2.20.0
index 7205cb07901f..b07a1413b1c9 100644
--- a/metadata/md5-cache/sci-libs/hypre-2.20.0
+++ b/metadata/md5-cache/sci-libs/hypre-2.20.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/superlu:= virtual/blas virtual/lapack mpi? ( virtual/mpi ) fortran? ( virtual/fortran )
 SLOT=0/2.20.0
 SRC_URI=https://github.com/hypre-space/hypre/archive/v2.20.0.tar.gz -> hypre-2.20.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=911c5704684a376f811600860c9659d1
diff --git a/metadata/md5-cache/sci-libs/hypre-2.21.0 b/metadata/md5-cache/sci-libs/hypre-2.21.0
index e8a99b293e48..fb79c8e916be 100644
--- a/metadata/md5-cache/sci-libs/hypre-2.21.0
+++ b/metadata/md5-cache/sci-libs/hypre-2.21.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/superlu:= virtual/blas virtual/lapack mpi? ( virtual/mpi ) fortran? ( virtual/fortran )
 SLOT=0/2.21.0
 SRC_URI=https://github.com/hypre-space/hypre/archive/v2.21.0.tar.gz -> hypre-2.21.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=16a7f187ff76755a4157ef7ccaf003ee
diff --git a/metadata/md5-cache/sci-libs/indilib-1.9.1 b/metadata/md5-cache/sci-libs/indilib-1.9.1
deleted file mode 100644
index 1cda1476db48..000000000000
--- a/metadata/md5-cache/sci-libs/indilib-1.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) rtlsdr? ( net-wireless/rtl-sdr ) websocket? ( dev-libs/boost:= ) kernel_linux? ( sys-kernel/linux-headers ) test? ( >=dev-cpp/gtest-1.8.0 ) websocket? ( dev-cpp/websocketpp )
-DESCRIPTION=INDI Astronomical Control Protocol library
-EAPI=7
-HOMEPAGE=https://www.indilib.org/
-IUSE=ogg rtlsdr test websocket
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
-RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) rtlsdr? ( net-wireless/rtl-sdr ) websocket? ( dev-libs/boost:= )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/indilib/indi/archive/v1.9.1.tar.gz -> indilib-1.9.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3974e2ac28f8dbeeb0a30dbac1c12584
diff --git a/metadata/md5-cache/sci-libs/indilib-1.9.1-r1 b/metadata/md5-cache/sci-libs/indilib-1.9.1-r1
new file mode 100644
index 000000000000..eca96fa25bf2
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/indilib-1.9.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) rtlsdr? ( net-wireless/rtl-sdr ) websocket? ( dev-libs/boost:= ) kernel_linux? ( sys-kernel/linux-headers ) test? ( >=dev-cpp/gtest-1.8.0 ) websocket? ( dev-cpp/websocketpp )
+DESCRIPTION=INDI Astronomical Control Protocol library
+EAPI=7
+HOMEPAGE=https://www.indilib.org/
+IUSE=ogg rtlsdr test websocket
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
+RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) rtlsdr? ( net-wireless/rtl-sdr ) websocket? ( dev-libs/boost:= )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/indilib/indi/archive/v1.9.1.tar.gz -> indilib-1.9.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2d0187243262a72f4c8703309559279f
diff --git a/metadata/md5-cache/sci-libs/ipopt-3.12.12 b/metadata/md5-cache/sci-libs/ipopt-3.12.12
index 3e91fd9c318d..77a00d0b7e9d 100644
--- a/metadata/md5-cache/sci-libs/ipopt-3.12.12
+++ b/metadata/md5-cache/sci-libs/ipopt-3.12.12
@@ -10,5 +10,5 @@ RDEPEND=virtual/blas hsl? ( sci-libs/coinhsl:0= ) lapack? ( virtual/lapack ) mpi
 RESTRICT=test
 SLOT=0/1
 SRC_URI=http://www.coin-or.org/download/source/Ipopt/Ipopt-3.12.12.tgz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=952aeb1d029254e672182c103d2f3757
diff --git a/metadata/md5-cache/sci-libs/kim-api-2.2.1 b/metadata/md5-cache/sci-libs/kim-api-2.2.1
index c12d43e029b3..6466035584ae 100644
--- a/metadata/md5-cache/sci-libs/kim-api-2.2.1
+++ b/metadata/md5-cache/sci-libs/kim-api-2.2.1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=app-editors/vim-core virtual/fortran
 SLOT=0
 SRC_URI=https://s3.openkim.org/kim-api/kim-api-2.2.1.txz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ca26624f7059868e49639e0d2d9428f2
diff --git a/metadata/md5-cache/sci-libs/libaec-1.0.4 b/metadata/md5-cache/sci-libs/libaec-1.0.4
index 6f135baf2c19..e6ddd4134f3d 100644
--- a/metadata/md5-cache/sci-libs/libaec-1.0.4
+++ b/metadata/md5-cache/sci-libs/libaec-1.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=Adaptive Entropy Coding library
 EAPI=7
 HOMEPAGE=https://gitlab.dkrz.de/k202009/libaec
 IUSE=+szip
-KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=szip? ( !sci-libs/szip )
 SLOT=0/2
 SRC_URI=https://gitlab.dkrz.de/k202009/libaec/-/archive/v1.0.4/libaec-v1.0.4.tar.gz -> libaec-1.0.4.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3441676c4e845cc35e1883d1706dfc13
+_md5_=02c01a7eaac9254c04c939e56f5fd4fd
diff --git a/metadata/md5-cache/sci-libs/libbufr-000405 b/metadata/md5-cache/sci-libs/libbufr-000405
index d1f1dc609c1a..cd6a23d4c016 100644
--- a/metadata/md5-cache/sci-libs/libbufr-000405
+++ b/metadata/md5-cache/sci-libs/libbufr-000405
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=virtual/fortran virtual/fortran
 SLOT=0
 SRC_URI=https://software.ecmwf.int/wiki/download/attachments/35752466/bufrdc_000405.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7028282da655c36fc6c4a5d8fc0c81c6
diff --git a/metadata/md5-cache/sci-libs/libgeodecomp-0.5.0_pre20201009 b/metadata/md5-cache/sci-libs/libgeodecomp-0.5.0_pre20201009
index ab271b18a172..3d0f14d326b9 100644
--- a/metadata/md5-cache/sci-libs/libgeodecomp-0.5.0_pre20201009
+++ b/metadata/md5-cache/sci-libs/libgeodecomp-0.5.0_pre20201009
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/STEllAR-GROUP/libgeodecomp/archive/6848b3a17b359e03585e56dd1f37dc7c71136114.tar.gz -> libgeodecomp-0.5.0_pre20201009.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c8c957247d69b0c82856d9641f206718
diff --git a/metadata/md5-cache/sci-libs/libint-1.1.6 b/metadata/md5-cache/sci-libs/libint-1.1.6
index 8db196169fc1..e8923af756c1 100644
--- a/metadata/md5-cache/sci-libs/libint-1.1.6
+++ b/metadata/md5-cache/sci-libs/libint-1.1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=1
 SRC_URI=https://github.com/evaleev/libint/archive/release-1-1-6.tar.gz -> libint-1.1.6.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95ec4b1ff5c8597d703e0e2e019e2dee
diff --git a/metadata/md5-cache/sci-libs/libint-2.6.0-r3 b/metadata/md5-cache/sci-libs/libint-2.6.0-r3
index 7aa3c7200161..9eab5b697c58 100644
--- a/metadata/md5-cache/sci-libs/libint-2.6.0-r3
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=2
 SRC_URI=https://github.com/evaleev/libint/archive/v2.6.0.tar.gz -> libint-2.6.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0449f93f1fdf40c408684c382be58279
diff --git a/metadata/md5-cache/sci-libs/libint-2.6.0-r5 b/metadata/md5-cache/sci-libs/libint-2.6.0-r5
index 60956d2c99e0..2745fa8d4be3 100644
--- a/metadata/md5-cache/sci-libs/libint-2.6.0-r5
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=2
 SRC_URI=https://github.com/evaleev/libint/archive/v2.6.0.tar.gz -> libint-2.6.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6646af70bbaedf0e52ea2f7d877bdada
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.25 b/metadata/md5-cache/sci-libs/libsvm-3.25
index 3b429b42afb0..3261c1b62fab 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.25
+++ b/metadata/md5-cache/sci-libs/libsvm-3.25
@@ -4,11 +4,11 @@ DESCRIPTION=Library for Support Vector Machines
 EAPI=7
 HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/libsvm/
 IUSE=java openmp python tools elibc_FreeBSD java python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=java? ( >=virtual/jre-1.8:* ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0/2
 SRC_URI=https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.25.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f7aa461354603d81ddd50a6c9375cdf9
+_md5_=94ed343e5ca29f3fc2e82592463b5458
diff --git a/metadata/md5-cache/sci-libs/libxc-5.1.0 b/metadata/md5-cache/sci-libs/libxc-5.1.0
index 4d7f519f9aa2..a9c5de9f96d7 100644
--- a/metadata/md5-cache/sci-libs/libxc-5.1.0
+++ b/metadata/md5-cache/sci-libs/libxc-5.1.0
@@ -11,5 +11,5 @@ RDEPEND=virtual/fortran
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/libxc/libxc/-/archive/5.1.0/libxc-5.1.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d6edcbf8fc37390c5ba86337dcb8f7c
diff --git a/metadata/md5-cache/sci-libs/libxc-5.1.4 b/metadata/md5-cache/sci-libs/libxc-5.1.4
index 251712ebcb31..62efa9205488 100644
--- a/metadata/md5-cache/sci-libs/libxc-5.1.4
+++ b/metadata/md5-cache/sci-libs/libxc-5.1.4
@@ -11,5 +11,5 @@ RDEPEND=virtual/fortran
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/libxc/libxc/-/archive/5.1.4/libxc-5.1.4.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ebdfbf7748fe7fef69722b40572a312
diff --git a/metadata/md5-cache/sci-libs/lis-1.6.5 b/metadata/md5-cache/sci-libs/lis-1.6.5
index b961fae0c5f6..b1165c1a413b 100644
--- a/metadata/md5-cache/sci-libs/lis-1.6.5
+++ b/metadata/md5-cache/sci-libs/lis-1.6.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=mpi? ( virtual/mpi ) virtual/fortran
 SLOT=0
 SRC_URI=https://www.ssisc.org/lis/dl/lis-1.6.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e07d91723a7a5f55ecf59ad6619e37d6
diff --git a/metadata/md5-cache/sci-libs/mc-1.5 b/metadata/md5-cache/sci-libs/mc-1.5
index 3e5aa6a41604..bf8d63c32ab6 100644
--- a/metadata/md5-cache/sci-libs/mc-1.5
+++ b/metadata/md5-cache/sci-libs/mc-1.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc <sci-libs/superlu-5 sci-libs/umfpack virtual/blas virtual/lapack virtual/fortran
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/mc-1.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=05deb03c9f153ffbacd0611c4c66f6c1
diff --git a/metadata/md5-cache/sci-libs/med-4.1.0 b/metadata/md5-cache/sci-libs/med-4.1.0
index 43d131d951d0..1f34989dfcbb 100644
--- a/metadata/md5-cache/sci-libs/med-4.1.0
+++ b/metadata/md5-cache/sci-libs/med-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test ) python? ( test )
 SLOT=0
 SRC_URI=https://files.salome-platform.org/Salome/other/med-4.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=407587f4df2eff9329ade7913d778f1f
diff --git a/metadata/md5-cache/sci-libs/metis-5.1.0-r4 b/metadata/md5-cache/sci-libs/metis-5.1.0-r4
index 97d7b1cf7de7..061a905fbbca 100644
--- a/metadata/md5-cache/sci-libs/metis-5.1.0-r4
+++ b/metadata/md5-cache/sci-libs/metis-5.1.0-r4
@@ -1,14 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/fortran
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A package for unstructured serial graph partitioning
 EAPI=7
-HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/metis/
+HOMEPAGE=https://www-users.cs.umn.edu/~karypis/metis/metis/
 IUSE=doc openmp
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=!sci-libs/parmetis virtual/fortran
+RDEPEND=!sci-libs/parmetis
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a495b319b09f6c1f3a18491ccfa73476
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2fd0a1808c648371f8073fbdb984ffe1
diff --git a/metadata/md5-cache/sci-libs/metis-5.1.0-r5 b/metadata/md5-cache/sci-libs/metis-5.1.0-r5
new file mode 100644
index 000000000000..34c8a2bc993b
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/metis-5.1.0-r5
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A package for unstructured serial graph partitioning
+EAPI=7
+HOMEPAGE=https://www-users.cs.umn.edu/~karypis/metis/metis/
+IUSE=doc double-precision examples int64 openmp
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=!<sci-libs/parmetis-4.0.3-r2
+SLOT=0
+SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=eed986d5f7b2003b72d2a27185f48a55
diff --git a/metadata/md5-cache/sci-libs/mumps-5.3.5 b/metadata/md5-cache/sci-libs/mumps-5.3.5
index 7f73a32c48fc..ae23df55894e 100644
--- a/metadata/md5-cache/sci-libs/mumps-5.3.5
+++ b/metadata/md5-cache/sci-libs/mumps-5.3.5
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/blas metis? ( || ( >=sci-libs/metis-5 >=sci-libs/parmetis-4 ) mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( sci-libs/scalapack ) scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] ) virtual/fortran
+DEPEND=virtual/blas metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( sci-libs/scalapack ) scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] ) virtual/fortran
 DESCRIPTION=MUltifrontal Massively Parallel sparse direct matrix Solver
 EAPI=7
 HOMEPAGE=http://mumps.enseeiht.fr/
 IUSE=doc examples metis mpi +scotch static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
-RDEPEND=virtual/blas metis? ( || ( >=sci-libs/metis-5 >=sci-libs/parmetis-4 ) mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( sci-libs/scalapack ) scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] ) virtual/fortran
+RDEPEND=virtual/blas metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( sci-libs/scalapack ) scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] ) virtual/fortran
 SLOT=0
 SRC_URI=http://mumps.enseeiht.fr/MUMPS_5.3.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6c13e03efb504d799f93e7d6f35e20b8
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1bd4d6bc7fd82688558f9ff9aa462b22
diff --git a/metadata/md5-cache/sci-libs/netcdf-fortran-4.4.3 b/metadata/md5-cache/sci-libs/netcdf-fortran-4.4.3
index aa80de39f1d0..9b1e8f9f512e 100644
--- a/metadata/md5-cache/sci-libs/netcdf-fortran-4.4.3
+++ b/metadata/md5-cache/sci-libs/netcdf-fortran-4.4.3
@@ -9,5 +9,5 @@ LICENSE=UCAR-Unidata
 RDEPEND=sci-libs/netcdf virtual/fortran
 SLOT=0/6
 SRC_URI=https://github.com/Unidata/netcdf-fortran/archive/v4.4.3.tar.gz -> netcdf-fortran-4.4.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d25334d5083de5c0e52831b358e17a70
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1 b/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
index 444caf319227..bc318f931424 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
+++ b/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stevengj/nlopt/archive/v2.6.2.tar.gz -> nlopt-2.6.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=15e63995648d3c870dc23c75765adda0
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.12-r1 b/metadata/md5-cache/sci-libs/openblas-0.3.12-r1
index b46dfb66eb79..39d0732ab169 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.12-r1
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.12-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( openmp pthread )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.12.tar.gz -> openblas-0.3.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e3a189c4d3aac1c2913f7b73c0c5fb93
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.13 b/metadata/md5-cache/sci-libs/openblas-0.3.13
index cfa1f5ceb247..351c12473b17 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.13
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.13
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( openmp pthread )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.13.tar.gz -> openblas-0.3.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=383a1059bda6b97723b672d95e4b1ce0
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.14 b/metadata/md5-cache/sci-libs/openblas-0.3.14
index d8ae8abf7c58..337156cd3bae 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.14
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.14
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( openmp pthread )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.14.tar.gz -> openblas-0.3.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e3a189c4d3aac1c2913f7b73c0c5fb93
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.15 b/metadata/md5-cache/sci-libs/openblas-0.3.15
index d7286005bd6e..f9d33f098ff5 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.15
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.15
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( openmp pthread )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.15.tar.gz -> openblas-0.3.15.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=383a1059bda6b97723b672d95e4b1ce0
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.16 b/metadata/md5-cache/sci-libs/openblas-0.3.16
new file mode 100644
index 000000000000..564621be4657
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.16
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
+DEPEND=virtual/fortran
+DESCRIPTION=Optimized BLAS library based on GotoBLAS2
+EAPI=7
+HOMEPAGE=http://xianyi.github.com/OpenBLAS/
+IUSE=dynamic eselect-ldso index-64bit openmp pthread relapack test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) virtual/fortran
+REQUIRED_USE=?? ( openmp pthread )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.16.tar.gz -> openblas-0.3.16.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=383a1059bda6b97723b672d95e4b1ce0
diff --git a/metadata/md5-cache/sci-libs/parmetis-4.0.3-r2 b/metadata/md5-cache/sci-libs/parmetis-4.0.3-r2
new file mode 100644
index 000000000000..d6b9019c80e4
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/parmetis-4.0.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=sci-libs/metis-5.1.0-r5 virtual/mpi[fortran] pcre? ( dev-libs/libpcre:= )
+DESCRIPTION=Parallel (MPI) unstructured graph partitioning library
+EAPI=7
+HOMEPAGE=https://www-users.cs.umn.edu/~karypis/metis/parmetis/
+IUSE=doc examples openmp pcre
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=all-rights-reserved
+RDEPEND=>=sci-libs/metis-5.1.0-r5 virtual/mpi[fortran] pcre? ( dev-libs/libpcre:= ) !<sci-libs/metis-5.1.0-r5
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6ce82e4e626b8e247fb154b17e604e88
diff --git a/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1 b/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1
index 612ac33ca003..a0e966e3bf49 100644
--- a/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1
+++ b/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( virtual/mpi ) starpu? ( dev-libs/starpu:0= ) virtual/pkgconfig virtual/fortran
 DESCRIPTION=Parallel solver for very large sparse linear systems
 EAPI=6
-HOMEPAGE=http://pastix.gforge.inria.fr
+HOMEPAGE=https://pastix.gforge.inria.fr
 IUSE=doc int64 mpi +smp starpu static-libs
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-C
 RDEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( virtual/mpi ) starpu? ( dev-libs/starpu:0= ) virtual/fortran
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/35070/pastix_5.2.2.22.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3349ea9ae74eb1b16e00f4e314cbf0c1
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8c7b78807f628b0f3b3e147b6b5678ef
diff --git a/metadata/md5-cache/sci-libs/pastix-5.2.3 b/metadata/md5-cache/sci-libs/pastix-5.2.3
index b00d748c2a20..9a0b53c56c7d 100644
--- a/metadata/md5-cache/sci-libs/pastix-5.2.3
+++ b/metadata/md5-cache/sci-libs/pastix-5.2.3
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( virtual/mpi ) starpu? ( dev-libs/starpu:0= ) virtual/pkgconfig virtual/fortran
+DEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( virtual/mpi ) starpu? ( dev-libs/starpu:0= ) virtual/fortran
 DESCRIPTION=Parallel solver for very large sparse linear systems
-EAPI=6
-HOMEPAGE=http://pastix.gforge.inria.fr
+EAPI=7
+HOMEPAGE=https://pastix.gforge.inria.fr
 IUSE=doc int64 mpi +smp starpu static-libs
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-C
 RDEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( virtual/mpi ) starpu? ( dev-libs/starpu:0= ) virtual/fortran
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/latestfile/218/pastix_5.2.3.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a625a505e973fe9810f4238747073d9d
+_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5b789b93caedcddecf8cdd0b222c3d44
diff --git a/metadata/md5-cache/sci-libs/pastix-6.0.3 b/metadata/md5-cache/sci-libs/pastix-6.0.3
new file mode 100644
index 000000000000..fd4b2062499f
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/pastix-6.0.3
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) virtual/pkgconfig test? ( sys-apps/hwloc:0= virtual/blas virtual/cblas virtual/lapack virtual/lapacke cuda? ( dev-util/nvidia-cuda-toolkit ) metis? ( sci-libs/metis[int64(+)=] ) mpi? ( virtual/mpi[fortran] metis? ( sci-libs/parmetis ) ) python? ( python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) ) scotch? ( >=sci-libs/scotch-6.1.0-r1:0=[int64=,mpi?] ) starpu? ( >=dev-libs/starpu-1.3.0:0= ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-apps/hwloc:0= virtual/blas virtual/cblas virtual/lapack virtual/lapacke cuda? ( dev-util/nvidia-cuda-toolkit ) metis? ( sci-libs/metis[int64(+)=] ) mpi? ( virtual/mpi[fortran] metis? ( sci-libs/parmetis ) ) python? ( python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) ) scotch? ( >=sci-libs/scotch-6.1.0-r1:0=[int64=,mpi?] ) starpu? ( >=dev-libs/starpu-1.3.0:0= ) virtual/fortran
+DESCRIPTION=Parallel solver for very large sparse linear systems
+EAPI=7
+HOMEPAGE=https://pastix.gforge.inria.fr
+IUSE=cuda examples +fortran int64 metis mpi +python +scotch starpu test python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=CeCILL-C
+RDEPEND=sys-apps/hwloc:0= virtual/blas virtual/cblas virtual/lapack virtual/lapacke cuda? ( dev-util/nvidia-cuda-toolkit ) metis? ( sci-libs/metis[int64(+)=] ) mpi? ( virtual/mpi[fortran] metis? ( sci-libs/parmetis ) ) python? ( python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) ) scotch? ( >=sci-libs/scotch-6.1.0-r1:0=[int64=,mpi?] ) starpu? ( >=dev-libs/starpu-1.3.0:0= ) virtual/fortran
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) || ( metis scotch )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gforge.inria.fr/frs/download.php/file/38205/pastix-6.0.3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ecd7a67743cc7165cab4b50450d1b5f8
diff --git a/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7 b/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
index fa6e012887a4..b8708dbab8e8 100644
--- a/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
+++ b/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
@@ -9,5 +9,5 @@ LICENSE=free-noncomm
 RDEPEND=media-libs/libpng:= x11-libs/libX11:= x11-libs/libXt:= motif? ( x11-libs/motif:= ) tk? ( dev-lang/tk:= ) virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.astro.caltech.edu/pub/pgplot/pgplot522.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d6282c23a7da12e45a2a2214bf0c78ed
diff --git a/metadata/md5-cache/sci-libs/plplot-5.15.0-r102 b/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
index 822749f9d7ea..9cfd87f232f1 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
+++ b/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test ) octave? ( test )
 SLOT=0/14
 SRC_URI=mirror://sourceforge/plplot/plplot-5.15.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=74432df7396875048cdb601dd5cb018d
diff --git a/metadata/md5-cache/sci-libs/profnet-1.0.22 b/metadata/md5-cache/sci-libs/profnet-1.0.22
index a0f27bb08569..f16f3c25910d 100644
--- a/metadata/md5-cache/sci-libs/profnet-1.0.22
+++ b/metadata/md5-cache/sci-libs/profnet-1.0.22
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/libunwind virtual/fortran
 SLOT=0
 SRC_URI=ftp://rostlab.org/profnet/profnet-1.0.22.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4d06a5fe4ea8a7a7441e0480e42be2ce
diff --git a/metadata/md5-cache/sci-libs/profphd-utils-1.0.10-r1 b/metadata/md5-cache/sci-libs/profphd-utils-1.0.10-r1
index 4decdffbafab..e33200faf266 100644
--- a/metadata/md5-cache/sci-libs/profphd-utils-1.0.10-r1
+++ b/metadata/md5-cache/sci-libs/profphd-utils-1.0.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=ftp://rostlab.org/profphd-utils/profphd-utils-1.0.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f9f3c7e90a136f97769099889576bdfe
diff --git a/metadata/md5-cache/sci-libs/punc-1.5 b/metadata/md5-cache/sci-libs/punc-1.5
index 38d2e442dee0..18238f7012f0 100644
--- a/metadata/md5-cache/sci-libs/punc-1.5
+++ b/metadata/md5-cache/sci-libs/punc-1.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/maloc[mpi=] dev-libs/libf2c sci-libs/amd sci-libs/cgcode sci-libs/arpack[mpi=] sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack mpi? ( virtual/mpi ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/punc-1.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3d47ec3cf38024643b37e1b336c4cdd5
diff --git a/metadata/md5-cache/sci-libs/qd-2.3.22 b/metadata/md5-cache/sci-libs/qd-2.3.22
index ee0301f1bd78..798f9260c114 100644
--- a/metadata/md5-cache/sci-libs/qd-2.3.22
+++ b/metadata/md5-cache/sci-libs/qd-2.3.22
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://crd.lbl.gov/~dhbailey/mpdist/qd-2.3.22.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=04949c9781b6a2bcbba4b0426c529bba
diff --git a/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r1 b/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r1
index 325c4345bf6e..9097b2bd553b 100644
--- a/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r1
+++ b/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/lapack virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d2cce46cc42a0f73fd6993c1fbbc83d5
diff --git a/metadata/md5-cache/sci-libs/scalapack-2.1.0 b/metadata/md5-cache/sci-libs/scalapack-2.1.0
index 521e2d77d8cb..e4ffd499618b 100644
--- a/metadata/md5-cache/sci-libs/scalapack-2.1.0
+++ b/metadata/md5-cache/sci-libs/scalapack-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=virtual/lapack virtual/mpi virtual/fortran
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.netlib.org/scalapack/scalapack-2.1.0.tgz https://github.com/Reference-ScaLAPACK/scalapack/commit/bc6cad585362aa58e05186bb85d4b619080c45a9.patch -> scalapack-2.1.0-gcc10.patch
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c66802c962c9e5e3d9bbeb1b78ea6480
diff --git a/metadata/md5-cache/sci-libs/scotch-6.1.0 b/metadata/md5-cache/sci-libs/scotch-6.1.0
index 119c4a11a057..e7b1aa50a612 100644
--- a/metadata/md5-cache/sci-libs/scotch-6.1.0
+++ b/metadata/md5-cache/sci-libs/scotch-6.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Software for graph, mesh and hypergraph partitioning
 EAPI=7
 HOMEPAGE=https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch
 IUSE=doc int64 mpi static-libs test tools threads
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
 RDEPEND=sys-libs/zlib mpi? ( virtual/mpi )
 REQUIRED_USE=test? ( threads )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.0/scotch-v6.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a06eeef143cea3f54ded2dc2f5d201f3
+_md5_=fdecb31886fedfb9efbad2187783a027
diff --git a/metadata/md5-cache/sci-libs/scotch-6.1.0-r1 b/metadata/md5-cache/sci-libs/scotch-6.1.0-r1
new file mode 100644
index 000000000000..f1203ca52041
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/scotch-6.1.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=sys-libs/zlib mpi? ( virtual/mpi )
+DESCRIPTION=Software for graph, mesh and hypergraph partitioning
+EAPI=7
+HOMEPAGE=https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch
+IUSE=doc int64 mpi static-libs test tools threads
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=CeCILL-2
+RDEPEND=sys-libs/zlib mpi? ( virtual/mpi )
+REQUIRED_USE=test? ( threads )
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.0/scotch-v6.1.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c94e374831a239c30fd225417e82113a
diff --git a/metadata/md5-cache/sci-libs/silo-4.10.2-r1 b/metadata/md5-cache/sci-libs/silo-4.10.2-r1
index 46090b479b80..84651537ed97 100644
--- a/metadata/md5-cache/sci-libs/silo-4.10.2-r1
+++ b/metadata/md5-cache/sci-libs/silo-4.10.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=silex? ( qt5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.10.2/silo-4.10.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18a2dc1a81c296a6e657b73634e14d61
diff --git a/metadata/md5-cache/sci-libs/spqr-2.0.9 b/metadata/md5-cache/sci-libs/spqr-2.0.9
index b59a397dda6c..cca9652b9b15 100644
--- a/metadata/md5-cache/sci-libs/spqr-2.0.9
+++ b/metadata/md5-cache/sci-libs/spqr-2.0.9
@@ -5,9 +5,9 @@ DESCRIPTION=Multithreaded multifrontal sparse QR factorization library
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=doc partition tbb
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=virtual/lapack >=sci-libs/cholmod-2[lapack,partition?] partition? ( >=sci-libs/metis-5.1.0 ) tbb? ( dev-cpp/tbb )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/spqr-2.0.9.tar.bz2
-_md5_=7ef9cb3479da9c5f9ce21f30675c072a
+_md5_=3b3f1c1d06d1d3e353ed15a40a8754a4
diff --git a/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0 b/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
index 1efa9d0c81f5..20ee3b680061 100644
--- a/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
+++ b/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
@@ -3,9 +3,9 @@ DESCRIPTION=Common configurations for all packages in suitesparse
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/suitesparseconfig-5.4.0.tar.bz2
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06aa70369dca01f4cd02eb209986164c
+_md5_=dca1421b557c58e83fcefa1285358d5d
diff --git a/metadata/md5-cache/sci-libs/sundials-3.2.1 b/metadata/md5-cache/sci-libs/sundials-3.2.1
index b1a0a968b8dd..6a53475ff342 100644
--- a/metadata/md5-cache/sci-libs/sundials-3.2.1
+++ b/metadata/md5-cache/sci-libs/sundials-3.2.1
@@ -11,5 +11,5 @@ RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse?
 REQUIRED_USE=hypre? ( mpi )
 SLOT=0/3
 SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-3.2.1.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=03b3a4172f715b3393f2129cd265215e
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=37280fbd8a4869e0bbbebe7245018bdc
diff --git a/metadata/md5-cache/sci-libs/sundials-5.2.0 b/metadata/md5-cache/sci-libs/sundials-5.2.0
index feb3481ceda9..a89e9b153b74 100644
--- a/metadata/md5-cache/sci-libs/sundials-5.2.0
+++ b/metadata/md5-cache/sci-libs/sundials-5.2.0
@@ -11,5 +11,5 @@ RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse?
 REQUIRED_USE=hypre? ( mpi )
 SLOT=0/5
 SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-5.2.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5ddfe56db0f2f18f4acb91d29de9b235
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d56c664ad314f8c240cc44507bff51c7
diff --git a/metadata/md5-cache/sci-libs/sundials-5.7.0 b/metadata/md5-cache/sci-libs/sundials-5.7.0
index c082ed629876..108d454ba284 100644
--- a/metadata/md5-cache/sci-libs/sundials-5.7.0
+++ b/metadata/md5-cache/sci-libs/sundials-5.7.0
@@ -11,5 +11,5 @@ RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse?
 REQUIRED_USE=hypre? ( mpi )
 SLOT=0/5
 SRC_URI=https://github.com/LLNL/sundials/releases/download/v5.7.0/sundials-5.7.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5e52ea010cc9198bc14480b5a471299a
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=677989db12dbd78327d1ee849fac7fea
diff --git a/metadata/md5-cache/sci-libs/superlu-4.3-r2 b/metadata/md5-cache/sci-libs/superlu-4.3-r2
index c14a32673d40..cab2b9deff1e 100644
--- a/metadata/md5-cache/sci-libs/superlu-4.3-r2
+++ b/metadata/md5-cache/sci-libs/superlu-4.3-r2
@@ -11,5 +11,5 @@ RDEPEND=virtual/blas virtual/fortran
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_4.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=10b466aab236fad2107276eaf4595483
diff --git a/metadata/md5-cache/sci-libs/superlu-5.2.2 b/metadata/md5-cache/sci-libs/superlu-5.2.2
index e094a8386529..e2f22262a90c 100644
--- a/metadata/md5-cache/sci-libs/superlu-5.2.2
+++ b/metadata/md5-cache/sci-libs/superlu-5.2.2
@@ -5,11 +5,11 @@ DESCRIPTION=Sparse LU factorization library
 EAPI=7
 HOMEPAGE=https://crd-legacy.lbl.gov/~xiaoye/SuperLU/
 IUSE=doc examples test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/blas virtual/fortran
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://crd-legacy.lbl.gov/~xiaoye/SuperLU//superlu_5.2.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=022d816c8a8b7557a8ada2a3d46f4639
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a1c56770b69f39db7e6a60b88fdab534
diff --git a/metadata/md5-cache/sci-libs/szip-2.1-r2 b/metadata/md5-cache/sci-libs/szip-2.1-r2
index 874111420509..24e980576644 100644
--- a/metadata/md5-cache/sci-libs/szip-2.1-r2
+++ b/metadata/md5-cache/sci-libs/szip-2.1-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Extended-Rice lossless compression algorithm implementation
 EAPI=6
 HOMEPAGE=https://www.hdfgroup.org/doc_resource/SZIP/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=szip
 RDEPEND=!sci-libs/libaec[szip]
 SLOT=0/2
 SRC_URI=ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz
-_md5_=ec6433c57385e2fdd458b78224734d08
+_md5_=601b8b39d916a3e4d929c89762fc8f2e
diff --git a/metadata/md5-cache/sci-libs/szip-2.1.1 b/metadata/md5-cache/sci-libs/szip-2.1.1
new file mode 100644
index 000000000000..cd5d9403bab4
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/szip-2.1.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Extended-Rice lossless compression algorithm implementation
+EAPI=8
+HOMEPAGE=https://www.hdfgroup.org/doc_resource/SZIP/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=szip
+RDEPEND=!sci-libs/libaec[szip]
+SLOT=0/2
+SRC_URI=https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/szip-2.1.1.tar.gz
+_md5_=e9049a3e294cd3c6e0195c4bd0460fb9
diff --git a/metadata/md5-cache/sci-libs/taucs-2.2-r1 b/metadata/md5-cache/sci-libs/taucs-2.2-r1
index 1c8ed6252c55..1ad8aec5af21 100644
--- a/metadata/md5-cache/sci-libs/taucs-2.2-r1
+++ b/metadata/md5-cache/sci-libs/taucs-2.2-r1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install setup test
-DEPEND=virtual/blas virtual/lapack || ( sci-libs/metis sci-libs/parmetis ) virtual/fortran
+DEPEND=sci-libs/metis virtual/blas virtual/lapack virtual/fortran
 DESCRIPTION=C library of sparse linear solvers
 EAPI=7
 HOMEPAGE=http://www.tau.ac.il/~stoledo/taucs/
 IUSE=doc
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=virtual/blas virtual/lapack || ( sci-libs/metis sci-libs/parmetis ) virtual/fortran
+RDEPEND=sci-libs/metis virtual/blas virtual/lapack virtual/fortran
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.tau.ac.il/~stoledo/taucs/2.2/taucs.tgz -> taucs-2.2.tgz
-_eclasses_=fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70cb1a13db6d7ab0ae66ad91fe219481
+_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4f12683a1b61c8d603deff3f671360d8
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.4.0 b/metadata/md5-cache/sci-libs/tensorflow-2.4.0
index b912178f39fb..290ad92c998c 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.4.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.4.0
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.4.0.tar.gz -> tensorflow-2.4.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.4.0.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	59a065fda63cffd0092d61c79599e1c2	check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f706c82f71850c2ffbe56bbc4cc90b3
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.5.0 b/metadata/md5-cache/sci-libs/tensorflow-2.5.0
index ba938b74a13d..c768f2026221 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.5.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.5.0
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.5.0.tar.gz -> tensorflow-2.5.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.5.0.tar.bz2 https://github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz -> abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip -> ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz -> llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz -> oneDNN-v2.2.tar.gz https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/tensorflow/toolchains/archive/v1.1.10.tar.gz -> tensorflow-toolchains-v1.1.10.tar.gz https://gitlab.com/libeigen/eigen/-/archive/f612df273689a19d25b45ca4f8269463207c4fee/eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz cuda? ( https://github.com/NVIDIA/cudnn-frontend/archive/360d6e7164dfb7c802493fd1c0464f0d815b852a.zip -> cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip https://github.com/nvidia/nccl/archive/v2.8.3-1.tar.gz -> nvidia-nccl-v2.8.3-1.tar.gz ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d15dae7073531439e979d3dc5170660
diff --git a/metadata/md5-cache/sci-libs/trilinos-13.0.1 b/metadata/md5-cache/sci-libs/trilinos-13.0.1
index dd2752ffcb45..aa9e4ab4a6f4 100644
--- a/metadata/md5-cache/sci-libs/trilinos-13.0.1
+++ b/metadata/md5-cache/sci-libs/trilinos-13.0.1
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/binutils-libs virtual/blas virtual/lapack virtual/mpi adolc? ( sci-libs/adolc ) arprec? ( sci-libs/arprec ) boost? ( dev-libs/boost ) clp? ( sci-libs/coinor-clp ) cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) eigen? ( dev-cpp/eigen:3 ) glpk? ( sci-mathematics/glpk ) gtest? ( dev-cpp/gtest ) hdf5? ( sci-libs/hdf5[mpi] ) hypre? ( sci-libs/hypre ) hwloc? ( sys-apps/hwloc ) matio? ( sci-libs/matio ) mkl? ( sci-libs/mkl ) metis? ( || ( sci-libs/parmetis sci-libs/metis ) ) mumps? ( sci-libs/mumps ) netcdf? ( sci-libs/netcdf ) petsc? ( sci-mathematics/petsc ) qd? ( sci-libs/qd ) scalapack? ( sci-libs/scalapack ) scotch? ( sci-libs/scotch ) sparse? ( sci-libs/cxsparse sci-libs/umfpack ) superlu? ( sci-libs/superlu ) taucs? ( sci-libs/taucs ) tbb? ( dev-cpp/tbb ) tvmet? ( dev-libs/tvmet ) yaml? ( dev-cpp/yaml-cpp ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 ) virtual/pkgconfig
+DEPEND=sys-libs/binutils-libs virtual/blas virtual/lapack virtual/mpi adolc? ( sci-libs/adolc ) arprec? ( sci-libs/arprec ) boost? ( dev-libs/boost ) clp? ( sci-libs/coinor-clp ) cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) eigen? ( dev-cpp/eigen:3 ) glpk? ( sci-mathematics/glpk ) gtest? ( dev-cpp/gtest ) hdf5? ( sci-libs/hdf5[mpi] ) hypre? ( sci-libs/hypre ) hwloc? ( sys-apps/hwloc ) matio? ( sci-libs/matio ) mkl? ( sci-libs/mkl ) metis? ( sci-libs/metis ) mumps? ( sci-libs/mumps ) netcdf? ( sci-libs/netcdf ) petsc? ( sci-mathematics/petsc ) qd? ( sci-libs/qd ) scalapack? ( sci-libs/scalapack ) scotch? ( sci-libs/scotch ) sparse? ( sci-libs/cxsparse sci-libs/umfpack ) superlu? ( sci-libs/superlu ) taucs? ( sci-libs/taucs ) tbb? ( dev-cpp/tbb ) tvmet? ( dev-libs/tvmet ) yaml? ( dev-cpp/yaml-cpp ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 ) virtual/pkgconfig
 DESCRIPTION=Scientific library collection for large scale problems
 EAPI=7
 HOMEPAGE=http://trilinos.sandia.gov/
 IUSE=adolc arprec boost clp cuda eigen glpk gtest hdf5 hwloc hypre matio metis mkl mumps netcdf petsc qd scalapack scotch sparse superlu taucs tbb test threads tvmet yaml zlib X
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2.1
-RDEPEND=sys-libs/binutils-libs virtual/blas virtual/lapack virtual/mpi adolc? ( sci-libs/adolc ) arprec? ( sci-libs/arprec ) boost? ( dev-libs/boost ) clp? ( sci-libs/coinor-clp ) cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) eigen? ( dev-cpp/eigen:3 ) glpk? ( sci-mathematics/glpk ) gtest? ( dev-cpp/gtest ) hdf5? ( sci-libs/hdf5[mpi] ) hypre? ( sci-libs/hypre ) hwloc? ( sys-apps/hwloc ) matio? ( sci-libs/matio ) mkl? ( sci-libs/mkl ) metis? ( || ( sci-libs/parmetis sci-libs/metis ) ) mumps? ( sci-libs/mumps ) netcdf? ( sci-libs/netcdf ) petsc? ( sci-mathematics/petsc ) qd? ( sci-libs/qd ) scalapack? ( sci-libs/scalapack ) scotch? ( sci-libs/scotch ) sparse? ( sci-libs/cxsparse sci-libs/umfpack ) superlu? ( sci-libs/superlu ) taucs? ( sci-libs/taucs ) tbb? ( dev-cpp/tbb ) tvmet? ( dev-libs/tvmet ) yaml? ( dev-cpp/yaml-cpp ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
+RDEPEND=sys-libs/binutils-libs virtual/blas virtual/lapack virtual/mpi adolc? ( sci-libs/adolc ) arprec? ( sci-libs/arprec ) boost? ( dev-libs/boost ) clp? ( sci-libs/coinor-clp ) cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) eigen? ( dev-cpp/eigen:3 ) glpk? ( sci-mathematics/glpk ) gtest? ( dev-cpp/gtest ) hdf5? ( sci-libs/hdf5[mpi] ) hypre? ( sci-libs/hypre ) hwloc? ( sys-apps/hwloc ) matio? ( sci-libs/matio ) mkl? ( sci-libs/mkl ) metis? ( sci-libs/metis ) mumps? ( sci-libs/mumps ) netcdf? ( sci-libs/netcdf ) petsc? ( sci-mathematics/petsc ) qd? ( sci-libs/qd ) scalapack? ( sci-libs/scalapack ) scotch? ( sci-libs/scotch ) sparse? ( sci-libs/cxsparse sci-libs/umfpack ) superlu? ( sci-libs/superlu ) taucs? ( sci-libs/taucs ) tbb? ( dev-cpp/tbb ) tvmet? ( dev-libs/tvmet ) yaml? ( dev-cpp/yaml-cpp ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/trilinos/Trilinos/archive/trilinos-release-13-0-1.tar.gz -> trilinos-13.0.1.tar.gz https://dev.gentoo.org/~tamiko/distfiles/trilinos-13.0.0-patches-r0.tar.xz
 _eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e3e5de933301aea59e82cacbc6afbaa0
+_md5_=5366e95ebe372a5a2a9d8d90483cf3b3
diff --git a/metadata/md5-cache/sci-libs/udunits-2.2.28 b/metadata/md5-cache/sci-libs/udunits-2.2.28
index 7bcd3b3a9322..8b2544c63030 100644
--- a/metadata/md5-cache/sci-libs/udunits-2.2.28
+++ b/metadata/md5-cache/sci-libs/udunits-2.2.28
@@ -8,5 +8,5 @@ LICENSE=UCAR-BSD
 RDEPEND=dev-libs/expat virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.2.28.tar.gz
-_eclasses_=fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f647d0f6d32e2d4d704d433cb4baf769
diff --git a/metadata/md5-cache/sci-libs/umfpack-5.7.9 b/metadata/md5-cache/sci-libs/umfpack-5.7.9
index 996743f3f93c..b4f3e16092b5 100644
--- a/metadata/md5-cache/sci-libs/umfpack-5.7.9
+++ b/metadata/md5-cache/sci-libs/umfpack-5.7.9
@@ -5,10 +5,10 @@ DESCRIPTION=Unsymmetric multifrontal sparse LU factorization library
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=+cholmod doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=sci-libs/amd >=sci-libs/suitesparseconfig-5.4.0 virtual/blas cholmod? ( sci-libs/cholmod )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/umfpack-5.7.9.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=79126e5bca4a2022f7370017d3658b39
+_md5_=fa14556f7c9c17028c6fa2ce49a15f4c
diff --git a/metadata/md5-cache/sci-libs/vtk-9.0.1 b/metadata/md5-cache/sci-libs/vtk-9.0.1
index 829413011d1d..8ce62e4d1766 100644
--- a/metadata/md5-cache/sci-libs/vtk-9.0.1
+++ b/metadata/md5-cache/sci-libs/vtk-9.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=all-modules? ( boost ffmpeg gdal imaging mysql odbc postgres qt5 re
 RESTRICT=!test? ( test )
 SLOT=0/9.0
 SRC_URI=https://www.vtk.org/files/release/9.0/VTK-9.0.1.tar.gz https://www.vtk.org/files/release/9.0/VTKData-9.0.1.tar.gz doc? ( https://www.vtk.org/files/release/9.0/vtkDocHtml-9.0.1.tar.gz ) examples? ( https://www.vtk.org/files/release/9.0/VTKLargeData-9.0.1.tar.gz ) test? ( https://www.vtk.org/files/release/9.0/VTKLargeData-9.0.1.tar.gz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8bb8dad74c488942420dcad7094ddbe0
diff --git a/metadata/md5-cache/sci-libs/xdrfile-1.1.4 b/metadata/md5-cache/sci-libs/xdrfile-1.1.4
index 4a8ee1eb63d9..52cfd7c4e3b6 100644
--- a/metadata/md5-cache/sci-libs/xdrfile-1.1.4
+++ b/metadata/md5-cache/sci-libs/xdrfile-1.1.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=ftp://ftp.gromacs.org/pub/contrib/xdrfile-1.1.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=be5630490d6ff669ee4328ce93335919
diff --git a/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5 b/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
index 38bfee9440aa..ea5fd6d0a62b 100644
--- a/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
+++ b/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
@@ -10,5 +10,5 @@ LICENSE=UCAR-Unidata
 RDEPEND=x11-libs/libX11 virtual/fortran
 SLOT=0
 SRC_URI=http://www.gentoogeek.org/files/xgks-pmel-2.5.5.tar.gz
-_eclasses_=fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6798d96d728f3a3bc3c681b23dca9e17
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 75c3809a679c..1b01bee54caa 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2 b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
index 30bb442fbf43..db2802401dda 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
+++ b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
@@ -10,5 +10,5 @@ PDEPEND=stdlib? ( ~sci-mathematics/agda-stdlib-2.6.1.2.1.4 )
 RDEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/blaze-html-0.8:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] >=dev-haskell/equivalence-0.3.2:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] <dev-haskell/gitrev-2.0:=[profile?] >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/hashtables-1.2.0.2:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] >=dev-haskell/haskeline-0.7.2.3:=[profile?] <dev-haskell/haskeline-0.9:=[profile?] >=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.9:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/regex-tdfa-1.3.1.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?] >=dev-haskell/split-0.2.0.0:=[profile?] <dev-haskell/split-0.2.4:=[profile?] >=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.5:=[profile?] >=dev-haskell/text-1.2.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uri-encode-1.5.0.4:=[profile?] <dev-haskell/uri-encode-1.6:=[profile?] >=dev-haskell/zlib-0.6:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.2:= enable-cluster-counting? ( >=dev-haskell/text-icu-0.7:=[profile?] <dev-haskell/text-icu-0.8:=[profile?] ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode )
 SLOT=0/2.6.1.2
 SRC_URI=https://hackage.haskell.org/package/Agda-2.6.1.2/Agda-2.6.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1f3460c80b1eeef5a25db800e151e56d
diff --git a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4 b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
index 08596d42d219..d5be42af48c8 100644
--- a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
+++ b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sci-mathematics/agda-2.6.1.2:=[profile?]
 SLOT=0
 SRC_URI=https://github.com/agda/agda-stdlib/archive/v1.4.tar.gz -> agda-stdlib-2.6.1.2.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=592624cf25722d12d36034a11cf539f8
diff --git a/metadata/md5-cache/sci-mathematics/dataplot-20131220 b/metadata/md5-cache/sci-mathematics/dataplot-20131220
index fd08e6239a2a..a0777f8ef830 100644
--- a/metadata/md5-cache/sci-mathematics/dataplot-20131220
+++ b/metadata/md5-cache/sci-mathematics/dataplot-20131220
@@ -11,5 +11,5 @@ RDEPEND=media-libs/plotutils opengl? ( virtual/opengl ) gd? ( media-libs/gd[png,
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=ftp://ftp.nist.gov/pub/dataplot/unix/dpsrc_2013_12_20.tar.gz ftp://ftp.nist.gov/pub/dataplot/unix/dplib.2009_07_15.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=304c7ba27edbe3f1e5e6c83a467d0ad0
diff --git a/metadata/md5-cache/sci-mathematics/diagrtb-2.64 b/metadata/md5-cache/sci-mathematics/diagrtb-2.64
index 12faaea58fec..55424c6efbe1 100644
--- a/metadata/md5-cache/sci-mathematics/diagrtb-2.64
+++ b/metadata/md5-cache/sci-mathematics/diagrtb-2.64
@@ -11,5 +11,5 @@ RDEPEND=virtual/fortran
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://ecole.modelisation.free.fr/rtb2011.tar.gz -> diagrtb-2.64.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9d6abef4976841d445b75446ef4cc6d3
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.3.6 b/metadata/md5-cache/sci-mathematics/gimps-30.3.6
index 16222cc4c952..d19720ae95bb 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-30.3.6
+++ b/metadata/md5-cache/sci-mathematics/gimps-30.3.6
@@ -9,5 +9,5 @@ RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v303b6.linux64.tar.gz ) x86? ( https://www.mersenne.org/ftp_root/gimps/p95v303b6.linux32.tar.gz )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d4a593534e55ad4d6af15b11154bece2
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.5.2 b/metadata/md5-cache/sci-mathematics/gimps-30.5.2
index 4fd82e21d9ed..2ffe5151307a 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-30.5.2
+++ b/metadata/md5-cache/sci-mathematics/gimps-30.5.2
@@ -9,5 +9,5 @@ RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v305b2.linux64.tar.gz ) x86? ( https://www.mersenne.org/ftp_root/gimps/p95v305b2.linux32.tar.gz )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc196d74cce6b501e862f34761df2725
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.6.4 b/metadata/md5-cache/sci-mathematics/gimps-30.6.4
index b5266526561b..1eaa355309e4 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-30.6.4
+++ b/metadata/md5-cache/sci-mathematics/gimps-30.6.4
@@ -9,5 +9,5 @@ RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v306b4.linux64.tar.gz -> gimps-30.6.4.linux64.tar.gz )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa502a8d23a582fbd32a485a2943a1f0
diff --git a/metadata/md5-cache/sci-mathematics/glpk-5.0-r1 b/metadata/md5-cache/sci-mathematics/glpk-5.0-r1
index e6fa4c27d0a2..2edfbc299c63 100644
--- a/metadata/md5-cache/sci-mathematics/glpk-5.0-r1
+++ b/metadata/md5-cache/sci-mathematics/glpk-5.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=GNU Linear Programming Kit
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/glpk/
 IUSE=doc examples gmp odbc mysql
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=sci-libs/amd:0= sci-libs/colamd:= sys-libs/zlib:0= gmp? ( dev-libs/gmp:0= ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )
 SLOT=0/40
 SRC_URI=mirror://gnu/glpk/glpk-5.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=78d8bb83abc892a52d1e46657627716e
+_md5_=5de1b8bd079f2f805d6a802ec398177b
diff --git a/metadata/md5-cache/sci-mathematics/lcalc-2.0.2 b/metadata/md5-cache/sci-mathematics/lcalc-2.0.2
deleted file mode 100644
index f1bd8ead844b..000000000000
--- a/metadata/md5-cache/sci-mathematics/lcalc-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/gengetopt
-DEFINED_PHASES=configure
-DEPEND=double-double? ( sci-libs/qd:= ) quad-double? ( sci-libs/qd:= ) pari? ( sci-mathematics/pari:= )
-DESCRIPTION=Command-line utility and library for L-function computations
-EAPI=8
-HOMEPAGE=https://gitlab.com/sagemath/lcalc
-IUSE=+double double-double quad-double pari
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-REQUIRED_USE=^^ ( double double-double quad-double )
-SLOT=0/1
-SRC_URI=https://gitlab.com/sagemath/lcalc/uploads/e7158e6f51f40012ea97fbb9c798da56/lcalc-2.0.2.tar.xz
-_md5_=9512c67c3742e3aa610b46ee29c86b6c
diff --git a/metadata/md5-cache/sci-mathematics/lcalc-2.0.3 b/metadata/md5-cache/sci-mathematics/lcalc-2.0.3
new file mode 100644
index 000000000000..3252629fd19d
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/lcalc-2.0.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/gengetopt
+DEFINED_PHASES=configure
+DEPEND=double-double? ( sci-libs/qd:= ) quad-double? ( sci-libs/qd:= ) pari? ( sci-mathematics/pari:= )
+DESCRIPTION=Command-line utility and library for L-function computations
+EAPI=8
+HOMEPAGE=https://gitlab.com/sagemath/lcalc
+IUSE=+double double-double quad-double pari
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+REQUIRED_USE=^^ ( double double-double quad-double )
+SLOT=0/1
+SRC_URI=https://gitlab.com/sagemath/lcalc/uploads/32cb4e639e3c1051eb6caf19dfe0769b/lcalc-2.0.3.tar.xz
+_md5_=173ccfec1e311ba1857c22559a477f7f
diff --git a/metadata/md5-cache/sci-mathematics/octave-5.2.0 b/metadata/md5-cache/sci-mathematics/octave-5.2.0
index 441c3928b7a7..71b9879c3d97 100644
--- a/metadata/md5-cache/sci-mathematics/octave-5.2.0
+++ b/metadata/md5-cache/sci-mathematics/octave-5.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) ssl? ( dev-libs/openssl:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5.2.0
 SRC_URI=mirror://gnu/octave/octave-5.2.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d1aaea16a861d05eeb512171b226f8a2
diff --git a/metadata/md5-cache/sci-mathematics/octave-6.2.0 b/metadata/md5-cache/sci-mathematics/octave-6.2.0
index 62a85bc8a184..7321af73cc10 100644
--- a/metadata/md5-cache/sci-mathematics/octave-6.2.0
+++ b/metadata/md5-cache/sci-mathematics/octave-6.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) ssl? ( dev-libs/openssl:0= ) sundials? ( >=sci-libs/sundials-4:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/6.2.0
 SRC_URI=mirror://gnu/octave/octave-6.2.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c50536018afd3f3d56f14bbb2b2bd39a
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.13.1 b/metadata/md5-cache/sci-mathematics/petsc-3.13.1
index e8ab08e5e682..f45fa8bc2323 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.13.1
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.13.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boo
 REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi ) hypre? ( cxx mpi !superlu ) mumps? ( mpi scotch ) scotch? ( mpi ) superlu? ( !hypre )
 SLOT=0
 SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.13.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b42518be7719b50dc3b94d861b1a6293
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.14.6 b/metadata/md5-cache/sci-mathematics/petsc-3.14.6
index a19dee6d43a9..75bbee048068 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.14.6
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.14.6
@@ -10,5 +10,5 @@ RDEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boo
 REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi ) hypre? ( cxx mpi !superlu ) mumps? ( mpi scotch ) scotch? ( mpi ) superlu? ( !hypre )
 SLOT=0
 SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.14.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d2a6ed1ace00389d032a28062d287d4
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.15.0 b/metadata/md5-cache/sci-mathematics/petsc-3.15.0
index 2b1b38626ca9..7c5f08156ef5 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.15.0
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.15.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boo
 REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi ) hypre? ( cxx mpi !superlu ) mumps? ( mpi scotch ) scotch? ( mpi ) superlu? ( !hypre )
 SLOT=0
 SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.15.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9986667c37d7e3633870170fe0d735d4
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1 b/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
index ade1b0eba17e..5c0d4fbeb2d7 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
@@ -10,5 +10,5 @@ LICENSE=AGPL-3
 RDEPEND=>=app-text/pandoc-2.9.2.1 dev-java/aopalliance:1 dev-java/gin:2.1 dev-java/javax-inject =dev-java/validation-api-1.0*:1.0[source] dev-haskell/pandoc-citeproc dev-lang/R dev-libs/boost:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux sys-devel/clang:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.12.6:5 >=dev-qt/qtdeclarative-5.12.6:5 >=dev-qt/qtdbus-5.12.6:5 >=dev-qt/qtgui-5.12.6:5 >=dev-qt/qtnetwork-5.12.6:5 >=dev-qt/qtopengl-5.12.6:5 >=dev-qt/qtpositioning-5.12.6:5 >=dev-qt/qtprintsupport-5.12.6:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.12.6:5 >=dev-qt/qtsql-5.12.6:5 >=dev-qt/qtsvg-5.12.6:5 >=dev-qt/qtwebchannel-5.12.6:5 >=dev-qt/qtwebengine-5.12.6:5[widgets] >=dev-qt/qtwidgets-5.12.6:5 >=dev-qt/qtxml-5.12.6:5 >=dev-qt/qtxmlpatterns-5.12.6:5 server? ( sys-libs/pam ) ) dedicated? ( sys-libs/pam ) dedicated? ( sys-libs/pam acct-user/rstudio-server acct-group/rstudio-server ) server? ( acct-user/rstudio-server acct-group/rstudio-server ) dev-libs/openssl:0= >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v1.3.1093.tar.gz -> rstudio-1.3.1093.tar.gz https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=690ba148729925a510aee79e2fbdb847
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 5e3a8387c97a..13b15afed09f 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/espresso-4.1.3 b/metadata/md5-cache/sci-physics/espresso-4.1.3
index 950254e101a4..e99b3dfb27b1 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.1.3
+++ b/metadata/md5-cache/sci-physics/espresso-4.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/releases/download/4.1.3/espresso-4.1.3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	portability	d1186f1e621de7b27ddcae82e6253259	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	portability	d1186f1e621de7b27ddcae82e6253259	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7e74b9d866ddb75b51f69a922a4df082
diff --git a/metadata/md5-cache/sci-physics/espresso-9999 b/metadata/md5-cache/sci-physics/espresso-9999
index 0a1c1ae59921..cb6decd31095 100644
--- a/metadata/md5-cache/sci-physics/espresso-9999
+++ b/metadata/md5-cache/sci-physics/espresso-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	portability	d1186f1e621de7b27ddcae82e6253259	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	portability	d1186f1e621de7b27ddcae82e6253259	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7e74b9d866ddb75b51f69a922a4df082
diff --git a/metadata/md5-cache/sci-physics/fastjet-3.0.6-r3 b/metadata/md5-cache/sci-physics/fastjet-3.0.6-r3
index 4a44f02aefda..e1af28ec0c4a 100644
--- a/metadata/md5-cache/sci-physics/fastjet-3.0.6-r3
+++ b/metadata/md5-cache/sci-physics/fastjet-3.0.6-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=cgal? ( sci-mathematics/cgal:=[shared(+)] ) plugins? ( sci-physics/siscone:= ) plugins? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://www.fastjet.fr/repo/fastjet-3.0.6.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f5bdbc82d1502db81b017820117d500
diff --git a/metadata/md5-cache/sci-physics/herwig-6.5.21-r1 b/metadata/md5-cache/sci-physics/herwig-6.5.21-r1
index c593a7f084ad..13cad2978a46 100644
--- a/metadata/md5-cache/sci-physics/herwig-6.5.21-r1
+++ b/metadata/md5-cache/sci-physics/herwig-6.5.21-r1
@@ -10,5 +10,5 @@ RDEPEND=!sci-physics/cernlib-montecarlo[herwig] virtual/fortran
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/herwig6521.f https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/herwig6521.inc https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/HERWIG65.INC doc? ( https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/hw65_manual.pdf )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c325c9b364e3e98c95baf968ea9d2250
diff --git a/metadata/md5-cache/sci-physics/lammps-20200303-r1 b/metadata/md5-cache/sci-physics/lammps-20200303-r1
index ee5aa5c0d45a..813afe460b72 100644
--- a/metadata/md5-cache/sci-physics/lammps-20200303-r1
+++ b/metadata/md5-cache/sci-physics/lammps-20200303-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/stable_3Mar2020.tar.gz -> lammps-stable_3Mar2020.tar.gz test? ( https://github.com/lammps/lammps-testing/archive/stable_3Mar2020.tar.gz -> lammps-testing-stable_3Mar2020.tar.gz )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8f7ace5535e3becae37370fd2d2e57dd
diff --git a/metadata/md5-cache/sci-physics/looptools-2.15 b/metadata/md5-cache/sci-physics/looptools-2.15
index 38ee77a5f670..919ed84f3d4a 100644
--- a/metadata/md5-cache/sci-physics/looptools-2.15
+++ b/metadata/md5-cache/sci-physics/looptools-2.15
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=virtual/fortran
 SLOT=0/2.15
 SRC_URI=http://www.feynarts.de/looptools/LoopTools-2.15.tar.gz
-_eclasses_=fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb0d033d8e620e381623a3811dfe4022
diff --git a/metadata/md5-cache/sci-physics/pythia-6.4.28-r2 b/metadata/md5-cache/sci-physics/pythia-6.4.28-r2
index 124a93321d90..ded26fb958fa 100644
--- a/metadata/md5-cache/sci-physics/pythia-6.4.28-r2
+++ b/metadata/md5-cache/sci-physics/pythia-6.4.28-r2
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=virtual/fortran
 SLOT=6
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/pythia-6.4.28.tar.xz https://root.cern.ch/download/pythia6.tar.gz -> pythia6-20160413.tar.gz doc? ( http://home.thep.lu.se/~torbjorn/pythia/lutp0613man2.pdf ) examples? ( mirror://gentoo/pythia-6.4.18-examples.tar.bz2 )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=569005808d84cd5466aaa18abed1c332
diff --git a/metadata/md5-cache/sci-physics/root-6.22.08-r2 b/metadata/md5-cache/sci-physics/root-6.22.08-r2
index 92b591857e00..4e9abb6ef780 100644
--- a/metadata/md5-cache/sci-physics/root-6.22.08-r2
+++ b/metadata/md5-cache/sci-physics/root-6.22.08-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asim
 RESTRICT=!test? ( test )
 SLOT=6.22/08
 SRC_URI=https://root.cern/download/root_v6.22.08.source.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9ab0b0c51132da30f052c8d7053c6cc4
diff --git a/metadata/md5-cache/sci-physics/root-6.24.02-r1 b/metadata/md5-cache/sci-physics/root-6.24.02-r1
index b6cf1af239d4..af955ba9717e 100644
--- a/metadata/md5-cache/sci-physics/root-6.24.02-r1
+++ b/metadata/md5-cache/sci-physics/root-6.24.02-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asim
 RESTRICT=!test? ( test )
 SLOT=6.24/02
 SRC_URI=https://root.cern/download/root_v6.24.02.source.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=47ec95fce651fa239c6c16b97c0f4071
diff --git a/metadata/md5-cache/sci-physics/root-6.24.9999 b/metadata/md5-cache/sci-physics/root-6.24.9999
index 2618dc244d5e..a82a1a21fcb9 100644
--- a/metadata/md5-cache/sci-physics/root-6.24.9999
+++ b/metadata/md5-cache/sci-physics/root-6.24.9999
@@ -11,5 +11,5 @@ RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortra
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl ) uring? ( root7 )
 RESTRICT=!test? ( test )
 SLOT=6.24/9999
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=645e3d48bcc3fe0eb2a9630d56fb68b3
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index e6ab0a5b402c..3873e6806f2a 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -11,5 +11,5 @@ RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortra
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl ) uring? ( root7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=645e3d48bcc3fe0eb2a9630d56fb68b3
diff --git a/metadata/md5-cache/sci-physics/xfoil-6.99 b/metadata/md5-cache/sci-physics/xfoil-6.99
index 9006cd9d0413..feea76f59777 100644
--- a/metadata/md5-cache/sci-physics/xfoil-6.99
+++ b/metadata/md5-cache/sci-physics/xfoil-6.99
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 virtual/fortran
 SLOT=0
 SRC_URI=http://web.mit.edu/drela/Public/web/xfoil/xfoil6.99.tgz doc? ( http://web.mit.edu/drela/Public/web/xfoil/dataflow.pdf )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=14482aa044d29ab03602ff6cc17d999f
diff --git a/metadata/md5-cache/sci-physics/yoda-1.8.5 b/metadata/md5-cache/sci-physics/yoda-1.8.5
index a246b1e13067..e45261f4098b 100644
--- a/metadata/md5-cache/sci-physics/yoda-1.8.5
+++ b/metadata/md5-cache/sci-physics/yoda-1.8.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=root? ( sci-physics/root:= )
 SLOT=0/1.8.5
 SRC_URI=https://www.hepforge.org/archive/yoda/YODA-1.8.5.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5b4d3541d09a7d903f50788b91a408ae
diff --git a/metadata/md5-cache/sci-physics/yoda-1.9.0 b/metadata/md5-cache/sci-physics/yoda-1.9.0
index 05ae699a0266..b87a49e0344d 100644
--- a/metadata/md5-cache/sci-physics/yoda-1.9.0
+++ b/metadata/md5-cache/sci-physics/yoda-1.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=root? ( sci-physics/root:= )
 SLOT=0/1.9.0
 SRC_URI=https://yoda.hepforge.org/downloads?f=YODA-1.9.0.tar.bz2 -> YODA-1.9.0.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6801438f217c229a20376f506e25ad3f
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index bc982b164693..e266aa7a8a7b 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/epix-1.2.11-r3 b/metadata/md5-cache/sci-visualization/epix-1.2.11-r3
index 567f1477f5b7..6519eef11dc6 100644
--- a/metadata/md5-cache/sci-visualization/epix-1.2.11-r3
+++ b/metadata/md5-cache/sci-visualization/epix-1.2.11-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://mathcs.holycross.edu/~ahwang/epix/epix-1.2.11_withpdf.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a665940ab76946366dbefb2fecfdf4f0
diff --git a/metadata/md5-cache/sci-visualization/epix-1.2.19 b/metadata/md5-cache/sci-visualization/epix-1.2.19
index d43699f0a9f1..f4c2c3f99b26 100644
--- a/metadata/md5-cache/sci-visualization/epix-1.2.19
+++ b/metadata/md5-cache/sci-visualization/epix-1.2.19
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://mathcs.holycross.edu/~ahwang/epix/epix-1.2.19_withpdf.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d74ae29e941f8559496322ecebbbf052
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1dc3af2845e8557737d39fd939da7b91
diff --git a/metadata/md5-cache/sci-visualization/grace-5.1.25_p7 b/metadata/md5-cache/sci-visualization/grace-5.1.25_p7
index 4d79f7988e81..668bedf93e71 100644
--- a/metadata/md5-cache/sci-visualization/grace-5.1.25_p7
+++ b/metadata/md5-cache/sci-visualization/grace-5.1.25_p7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=media-libs/t1lib media-libs/tiff:0 sys-libs/zlib >=x11-libs/motif-2.3:0 x11-libs/xbae fftw? ( sci-libs/fftw:3.0= ) jpeg? ( virtual/jpeg:0 ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng:0= ) x11-misc/xdg-utils fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/grace-5.1.25.tar.gz mirror://debian/pool/main/g/grace/grace_5.1.25-7.debian.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c8d2422fb94a425747f69e4f12fd888
diff --git a/metadata/md5-cache/sci-visualization/grace-5.1.25_p9 b/metadata/md5-cache/sci-visualization/grace-5.1.25_p9
index 644f15720502..aa6c1c6b5c26 100644
--- a/metadata/md5-cache/sci-visualization/grace-5.1.25_p9
+++ b/metadata/md5-cache/sci-visualization/grace-5.1.25_p9
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=media-libs/t1lib media-libs/tiff:0 sys-libs/zlib >=x11-libs/motif-2.3:0 x11-libs/xbae fftw? ( sci-libs/fftw:3.0= ) jpeg? ( virtual/jpeg:0 ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng:0= ) x11-misc/xdg-utils fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/grace-5.1.25.tar.gz mirror://debian/pool/main/g/grace/grace_5.1.25-9.debian.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86e9246638e27e7234470ee407fb34c2
diff --git a/metadata/md5-cache/sci-visualization/xd3d-8.3.1-r1 b/metadata/md5-cache/sci-visualization/xd3d-8.3.1-r1
index 531e5d25760d..3876d6bb94d4 100644
--- a/metadata/md5-cache/sci-visualization/xd3d-8.3.1-r1
+++ b/metadata/md5-cache/sci-visualization/xd3d-8.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXpm virtual/fortran
 SLOT=0
 SRC_URI=mirror://gentoo/xd3d-8.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d9d3e4150e015a6fbec9c775318ac8aa
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 9d4218cefbea..0b46557ad337 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/bubblewrap-0.4.1 b/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
index f65dff368779..a07de06f01b2 100644
--- a/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/bubblewrap/releases/download/v0.4.1/bubblewrap-0.4.1.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=70626adb8292465490c7885a74a37d38
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.14 b/metadata/md5-cache/sys-apps/etckeeper-1.18.14
index 9aa696ead658..b091a1016150 100644
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.14
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.14
@@ -10,5 +10,5 @@ RDEPEND=app-portage/portage-utils cron? ( virtual/cron ) || ( dev-vcs/git dev-vc
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-1.18.14.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ae14cef09b75ade78319bfa8f6868e8
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.16 b/metadata/md5-cache/sys-apps/etckeeper-1.18.16
index ac97ae098372..026cfc15e3d4 100644
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.16
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.16
@@ -10,5 +10,5 @@ RDEPEND=app-portage/portage-utils cron? ( virtual/cron ) || ( dev-vcs/git dev-vc
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-1.18.16.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cf69558ba8900a1bbb7018045bd8d2e1
diff --git a/metadata/md5-cache/sys-apps/exa-0.10.1 b/metadata/md5-cache/sys-apps/exa-0.10.1
index 55e8721ac726..51e008aa6f1f 100644
--- a/metadata/md5-cache/sys-apps/exa-0.10.1
+++ b/metadata/md5-cache/sys-apps/exa-0.10.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 MIT Unlicense
 RDEPEND=git? ( dev-libs/libgit2:= )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/datetime/0.5.2/download -> datetime-0.5.2.crate https://crates.io/api/v1/crates/env_logger/0.8.3/download -> env_logger-0.8.3.crate https://crates.io/api/v1/crates/exa/0.10.1/download -> exa-0.10.1.crate https://crates.io/api/v1/crates/git2/0.13.17/download -> git2-0.13.17.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/iso8601/0.4.0/download -> iso8601-0.4.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.93/download -> libc-0.2.93.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.18+1.1.0/download -> libgit2-sys-0.12.18+1.1.0.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/locale/0.2.2/download -> locale-0.2.2.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/openssl-src/111.15.0+1.1.1k/download -> openssl-src-111.15.0+1.1.1k.crate https://crates.io/api/v1/crates/openssl-sys/0.9.61/download -> openssl-sys-0.9.61.crate https://crates.io/api/v1/crates/pad/0.1.6/download -> pad-0.1.6.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/quick-error/2.0.1/download -> quick-error-2.0.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/redox_termios/0.1.2/download -> redox_termios-0.1.2.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/ucd-util/0.1.8/download -> ucd-util-0.1.8.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.4/download -> utf8-ranges-1.0.4.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.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/wincolor/1.0.3/download -> wincolor-1.0.3.crate https://crates.io/api/v1/crates/zoneinfo_compiled/0.5.1/download -> zoneinfo_compiled-0.5.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cebf279fbcc8f589b873cd51a17b05c6
diff --git a/metadata/md5-cache/sys-apps/exa-0.9.0-r1 b/metadata/md5-cache/sys-apps/exa-0.9.0-r1
index 3694d5a4d697..a524bc633baf 100644
--- a/metadata/md5-cache/sys-apps/exa-0.9.0-r1
+++ b/metadata/md5-cache/sys-apps/exa-0.9.0-r1
@@ -11,5 +11,5 @@ RDEPEND=git? ( dev-libs/libgit2:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.12.0/download -> ansi_term-0.12.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.4/download -> autocfg-0.1.4.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.35/download -> cc-1.0.35.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/datetime/0.4.7/download -> datetime-0.4.7.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/exa/0.9.0/download -> exa-0.9.0.crate https://crates.io/api/v1/crates/git2/0.9.1/download -> git2-0.9.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iso8601/0.1.1/download -> iso8601-0.1.1.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.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.51/download -> libc-0.2.51.crate https://crates.io/api/v1/crates/libgit2-sys/0.8.1/download -> libgit2-sys-0.8.1.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/locale/0.2.2/download -> locale-0.2.2.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/number_prefix/0.3.0/download -> number_prefix-0.3.0.crate https://crates.io/api/v1/crates/openssl-src/111.3.0+1.1.1c/download -> openssl-src-111.3.0+1.1.1c.crate https://crates.io/api/v1/crates/openssl-sys/0.9.47/download -> openssl-sys-0.9.47.crate https://crates.io/api/v1/crates/pad/0.1.5/download -> pad-0.1.5.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.54/download -> redox_syscall-0.1.54.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/smallvec/0.6.9/download -> smallvec-0.6.9.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.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.7/download -> winapi-0.3.7.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.2/download -> winapi-util-0.1.2.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/wincolor/1.0.1/download -> wincolor-1.0.1.crate https://crates.io/api/v1/crates/zoneinfo_compiled/0.4.8/download -> zoneinfo_compiled-0.4.8.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=64438df04b38609a951a7b3f5a2f0c7e
diff --git a/metadata/md5-cache/sys-apps/fakechroot-2.20.1 b/metadata/md5-cache/sys-apps/fakechroot-2.20.1
index 376fb52853ad..dc660a466f2d 100644
--- a/metadata/md5-cache/sys-apps/fakechroot-2.20.1
+++ b/metadata/md5-cache/sys-apps/fakechroot-2.20.1
@@ -1,10 +1,10 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=install
 DESCRIPTION=Provide a faked chroot environment without requiring root privileges
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/dex4er/fakechroot
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dex4er/fakechroot/releases/download/2.20.1/fakechroot-2.20.1.tar.gz
-_md5_=84573405dbb9f266173ff27401ce3ce8
+_md5_=057446157e6f7003e120ae159f29e75b
diff --git a/metadata/md5-cache/sys-apps/fd-8.1.1 b/metadata/md5-cache/sys-apps/fd-8.1.1
index 60418ee2de91..ad898c07e195 100644
--- a/metadata/md5-cache/sys-apps/fd-8.1.1
+++ b/metadata/md5-cache/sys-apps/fd-8.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD-2 ISC MIT Unlicense
 RDEPEND=!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )
 SLOT=0
 SRC_URI=https://github.com/sharkdp/fd/archive/v8.1.1.tar.gz -> fd-8.1.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.31/download -> anyhow-1.0.31.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.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/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/ctrlc/3.1.4/download -> ctrlc-3.1.4.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/fd-find/8.1.1/download -> fd-find-8.1.1.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/humantime/2.0.0/download -> humantime-2.0.0.crate https://crates.io/api/v1/crates/ignore/0.4.15/download -> ignore-0.4.15.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.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.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lscolors/0.7.0/download -> lscolors-0.7.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.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/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.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/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/users/0.10.0/download -> users-0.10.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.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/winapi/0.3.8/download -> winapi-0.3.8.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
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=734c2fc32d582dd84f3d1086df0ee364
diff --git a/metadata/md5-cache/sys-apps/fd-8.2.1 b/metadata/md5-cache/sys-apps/fd-8.2.1
index a9b387a69ca4..cc2b145a849c 100644
--- a/metadata/md5-cache/sys-apps/fd-8.2.1
+++ b/metadata/md5-cache/sys-apps/fd-8.2.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD-2 ISC MIT Unlicense
 RDEPEND=!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )
 SLOT=0
 SRC_URI=https://github.com/sharkdp/fd/archive/v8.2.1.tar.gz -> fd-8.2.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.35/download -> anyhow-1.0.35.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.14/download -> bstr-0.2.14.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/ctrlc/3.1.7/download -> ctrlc-3.1.7.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.1/download -> dirs-sys-next-0.1.1.crate https://crates.io/api/v1/crates/filetime/0.2.13/download -> filetime-0.2.13.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.2.0/download -> fs_extra-1.2.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/globset/0.4.6/download -> globset-0.4.6.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/humantime/2.0.1/download -> humantime-2.0.1.crate https://crates.io/api/v1/crates/ignore/0.4.17/download -> ignore-0.4.17.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.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.80/download -> libc-0.2.80.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/lscolors/0.7.1/download -> lscolors-0.7.1.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/nix/0.18.0/download -> nix-0.18.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/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.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/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=044e09fe77b53de74b08efbb7087eca3
diff --git a/metadata/md5-cache/sys-apps/file-5.40-r3 b/metadata/md5-cache/sys-apps/file-5.40-r3
index 77ccfcd04eba..27e18682f790 100644
--- a/metadata/md5-cache/sys-apps/file-5.40-r3
+++ b/metadata/md5-cache/sys-apps/file-5.40-r3
@@ -5,11 +5,11 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
 EAPI=7
 HOMEPAGE=https://www.darwinsys.com/file/
 IUSE=bzip2 lzma python seccomp static-libs zlib python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.40.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6e5d4a2d72f6e81463ea508d6d11c95
+_md5_=3d189d4b5f1fd1d58240a1f01dab4375
diff --git a/metadata/md5-cache/sys-apps/firejail-0.9.66 b/metadata/md5-cache/sys-apps/firejail-0.9.66
new file mode 100644
index 000000000000..f09978a8a804
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.66
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( 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] ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy ) sys-libs/libseccomp test? ( dev-tcltk/expect )
+DESCRIPTION=Security sandbox for any type of processes
+EAPI=7
+HOMEPAGE=https://firejail.wordpress.com/
+IUSE=apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home +suid test +userns +whitelist X python_single_target_python3_8 python_single_target_python3_9 kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( 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] ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy )
+REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/netblue30/firejail/releases/download/0.9.66/firejail-0.9.66.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=660d63410bdde3b5d2f07a93969aa824
diff --git a/metadata/md5-cache/sys-apps/firejail-9999 b/metadata/md5-cache/sys-apps/firejail-9999
index fcceed31d6b8..90d670aa5d71 100644
--- a/metadata/md5-cache/sys-apps/firejail-9999
+++ b/metadata/md5-cache/sys-apps/firejail-9999
@@ -1,10 +1,10 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEFINED_PHASES=compile configure install prepare setup unpack
 DEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( 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] ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy ) sys-libs/libseccomp test? ( dev-tcltk/expect )
 DESCRIPTION=Security sandbox for any type of processes
 EAPI=7
 HOMEPAGE=https://firejail.wordpress.com/
-IUSE=X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home +suid test +userns +whitelist python_single_target_python3_8 python_single_target_python3_9 kernel_linux
+IUSE=apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home +suid test +userns +whitelist X python_single_target_python3_8 python_single_target_python3_9 kernel_linux
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( 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] ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy )
@@ -12,4 +12,4 @@ REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_8 python_single_target
 RESTRICT=test
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54da8662346850e4e559a178d46999fd
+_md5_=660d63410bdde3b5d2f07a93969aa824
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.7-r1 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.7-r1
index 535b33901db4..808831208750 100644
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.7-r1
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.7-r1
@@ -5,10 +5,10 @@ DESCRIPTION=GPT partition table manipulator for Linux
 EAPI=7
 HOMEPAGE=https://www.rodsbooks.com/gdisk/
 IUSE=kernel_linux ncurses static
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) kernel_linux? ( sys-apps/util-linux ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-1.0.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=453398432fe92136e4a7bae63ee85f5e
+_md5_=a54bf0f1cbd3dcdef848f8accd640602
diff --git a/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0 b/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
index 56c11460bc61..857e21ac0009 100644
--- a/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
+++ b/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/x86_64/current/hponcfg-4.6.0-0.x86_64.rpm ) x86? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/i686/current/hponcfg-4.6.0-0.i386.rpm )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6fa45d35789eadd1f05d0c6ed48b59b5
diff --git a/metadata/md5-cache/sys-apps/hponcfg-5.4.0.0 b/metadata/md5-cache/sys-apps/hponcfg-5.4.0.0
index 6dbff5ddb02d..d811b29b845d 100644
--- a/metadata/md5-cache/sys-apps/hponcfg-5.4.0.0
+++ b/metadata/md5-cache/sys-apps/hponcfg-5.4.0.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/hponcfg-5.4.0-0.x86_64.rpm )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	pax-utils	74cd9920d64148719fb62c462935c1b5	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	pax-utils	fce6ad998516159787b92e8043167889	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c882ad1cb96339931b4761d6aa377d99
diff --git a/metadata/md5-cache/sys-apps/hponcfg-5.5.0.0 b/metadata/md5-cache/sys-apps/hponcfg-5.5.0.0
index 902288e2cc1d..88d9b676a05c 100644
--- a/metadata/md5-cache/sys-apps/hponcfg-5.5.0.0
+++ b/metadata/md5-cache/sys-apps/hponcfg-5.5.0.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/hponcfg-5.5.0-0.x86_64.rpm )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	pax-utils	74cd9920d64148719fb62c462935c1b5	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	pax-utils	fce6ad998516159787b92e8043167889	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f3f3debe1bc4c6651dd45e3e0400f38b
diff --git a/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0 b/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0
index 5829c0b297a9..e1d5a994fadc 100644
--- a/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0
+++ b/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/hponcfg-5.6.0-0.x86_64.rpm )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	pax-utils	74cd9920d64148719fb62c462935c1b5	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	pax-utils	fce6ad998516159787b92e8043167889	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9a32764a8db09b5cfbbc509a05892486
diff --git a/metadata/md5-cache/sys-apps/hwinfo-21.72 b/metadata/md5-cache/sys-apps/hwinfo-21.72
deleted file mode 100644
index 95efcd595fe5..000000000000
--- a/metadata/md5-cache/sys-apps/hwinfo-21.72
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/rpm2targz
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=amd64? ( dev-libs/libx86emu ) x86? ( dev-libs/libx86emu ) sys-devel/flex >=sys-kernel/linux-headers-2.6.17
-DESCRIPTION=Hardware detection tool used in SuSE Linux
-EAPI=7
-HOMEPAGE=https://www.opensuse.org/
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=amd64? ( dev-libs/libx86emu ) x86? ( dev-libs/libx86emu )
-SLOT=0
-SRC_URI=http://download.opensuse.org/tumbleweed/repo/src-oss/src/hwinfo-21.72-1.3.src.rpm
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1cbb6aa36fc3cc87e29124a20633337a
diff --git a/metadata/md5-cache/sys-apps/hwloc-1.11.13 b/metadata/md5-cache/sys-apps/hwloc-1.11.13
index b8cd8409faca..5ad3ede1999e 100644
--- a/metadata/md5-cache/sys-apps/hwloc-1.11.13
+++ b/metadata/md5-cache/sys-apps/hwloc-1.11.13
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) numa? ( >=sys-process/numactl-2.0.10-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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) numa? ( >=sys-process/numactl-2.0.10-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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=displays the hardware topology in convenient formats
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.open-mpi.org/projects/hwloc/
 IUSE=cairo cuda debug gl +numa +pci plugins svg static-libs xml X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
@@ -9,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) numa? ( >=sys-process/numactl-2.0.10-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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/5
 SRC_URI=https://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.13.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=96e890aa3f8b5853ffc8297aedf6887f
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3e47eb4b2802ecaac606456ebce88ce7
diff --git a/metadata/md5-cache/sys-apps/hwloc-2.3.0 b/metadata/md5-cache/sys-apps/hwloc-2.3.0
index 1903b2846c57..cbe2aa53fcb0 100644
--- a/metadata/md5-cache/sys-apps/hwloc-2.3.0
+++ b/metadata/md5-cache/sys-apps/hwloc-2.3.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) netloc? ( !sys-apps/netloc ) nvml? ( x11-drivers/nvidia-drivers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pci? ( >=sys-apps/pciutils-3.3.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/15
 SRC_URI=https://www.open-mpi.org/software/hwloc/v2.3/downloads/hwloc-2.3.0.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1264a897f3e4b259acd6b1ac5e5d94c2
diff --git a/metadata/md5-cache/sys-apps/hwloc-2.5.0 b/metadata/md5-cache/sys-apps/hwloc-2.5.0
index 464f77d5fa45..9353a9680098 100644
--- a/metadata/md5-cache/sys-apps/hwloc-2.5.0
+++ b/metadata/md5-cache/sys-apps/hwloc-2.5.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) netloc? ( !sys-apps/netloc ) nvml? ( x11-drivers/nvidia-drivers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pci? ( >=sys-apps/pciutils-3.3.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/15
 SRC_URI=https://www.open-mpi.org/software/hwloc/v2.5/downloads/hwloc-2.5.0.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f42b772b790fdcb042e80845ba672776
diff --git a/metadata/md5-cache/sys-apps/kmod-28 b/metadata/md5-cache/sys-apps/kmod-28
index e96bbc540529..81331a26d6ea 100644
--- a/metadata/md5-cache/sys-apps/kmod-28
+++ b/metadata/md5-cache/sys-apps/kmod-28
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-28.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eba7500aa950987fb4ebd3f840fe7fcc
diff --git a/metadata/md5-cache/sys-apps/kmod-29 b/metadata/md5-cache/sys-apps/kmod-29
index 5a78a2070a62..cee52365047b 100644
--- a/metadata/md5-cache/sys-apps/kmod-29
+++ b/metadata/md5-cache/sys-apps/kmod-29
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=36892f0aaf01121ff4eb2928031d2d14
diff --git a/metadata/md5-cache/sys-apps/kmod-9999 b/metadata/md5-cache/sys-apps/kmod-9999
index 1ff2f78a1458..0518ab3e1758 100644
--- a/metadata/md5-cache/sys-apps/kmod-9999
+++ b/metadata/md5-cache/sys-apps/kmod-9999
@@ -11,5 +11,5 @@ RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=36892f0aaf01121ff4eb2928031d2d14
diff --git a/metadata/md5-cache/sys-apps/kmscon-8_p20180906-r2 b/metadata/md5-cache/sys-apps/kmscon-8_p20180906-r2
new file mode 100644
index 000000000000..1d0b4fd8dd45
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/kmscon-8_p20180906-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-util/gtk-doc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=>=virtual/udev-172 x11-libs/libxkbcommon >=dev-libs/libtsm-4.0.0:= media-libs/mesa[X(+)] drm? ( x11-libs/libdrm >=media-libs/mesa-8.0.3[egl,gbm] ) gles2? ( >=media-libs/mesa-8.0.3[gles2] ) systemd? ( sys-apps/systemd ) pango? ( x11-libs/pango dev-libs/glib:2 ) pixman? ( x11-libs/pixman ) x11-base/xorg-proto
+DESCRIPTION=KMS/DRM based virtual Console Emulator
+EAPI=7
+HOMEPAGE=https://github.com/Aetf/kmscon
+IUSE=debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT LGPL-2.1 BSD-2
+RDEPEND=>=virtual/udev-172 x11-libs/libxkbcommon >=dev-libs/libtsm-4.0.0:= media-libs/mesa[X(+)] drm? ( x11-libs/libdrm >=media-libs/mesa-8.0.3[egl,gbm] ) gles2? ( >=media-libs/mesa-8.0.3[gles2] ) systemd? ( sys-apps/systemd ) pango? ( x11-libs/pango dev-libs/glib:2 ) pixman? ( x11-libs/pixman ) x11-misc/xkeyboard-config
+REQUIRED_USE=gles2? ( drm )
+SLOT=0
+SRC_URI=https://github.com/Aetf/kmscon/archive/01dd0a231e2125a40ceba5f59fd945ff29bf2cdc.tar.gz -> kmscon-8_p20180906.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b195d2cce810260532cf2627863a460f
diff --git a/metadata/md5-cache/sys-apps/likwid-4.3.4 b/metadata/md5-cache/sys-apps/likwid-4.3.4
index a8563d8c269c..6462ba13fdb8 100644
--- a/metadata/md5-cache/sys-apps/likwid-4.3.4
+++ b/metadata/md5-cache/sys-apps/likwid-4.3.4
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_
 REQUIRED_USE=^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://ftp.fau.de/pub/likwid/likwid-4.3.4.tar.gz
-_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	fortran-2	3cec34b0def864e87677d8b2b1c370b8	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	fortran-2	cca0c11947f3e90961771da271435fdb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e45d804ed79ec12750fd4e07c45bd5f
diff --git a/metadata/md5-cache/sys-apps/lsd-0.20.1 b/metadata/md5-cache/sys-apps/lsd-0.20.1
index 4b0bf39c19d7..31d21df6c8ea 100644
--- a/metadata/md5-cache/sys-apps/lsd-0.20.1
+++ b/metadata/md5-cache/sys-apps/lsd-0.20.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD-2 ISC MIT
 SLOT=0
 SRC_URI=https://github.com/Peltoche/lsd/archive/0.20.1.tar.gz -> lsd-0.20.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.1/download -> assert_cmd-1.0.1.crate https://crates.io/api/v1/crates/assert_fs/1.0.0/download -> assert_fs-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.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.15/download -> chrono-0.4.15.crate https://crates.io/api/v1/crates/chrono-humanize/0.1.1/download -> chrono-humanize-0.1.1.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/3.0.1/download -> dirs-3.0.1.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/globwalk/0.7.3/download -> globwalk-0.7.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.16/download -> hermit-abi-0.1.16.crate https://crates.io/api/v1/crates/human-sort/0.2.2/download -> human-sort-0.2.2.crate https://crates.io/api/v1/crates/ignore/0.4.16/download -> ignore-0.4.16.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.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.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lock_api/0.4.2/download -> lock_api-0.4.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/lscolors/0.7.1/download -> lscolors-0.7.1.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.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/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.2/download -> parking_lot_core-0.8.2.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/predicates/1.0.5/download -> predicates-1.0.5.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.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/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.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/rust-argon2/0.8.2/download -> rust-argon2-0.8.2.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/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_yaml/0.8.13/download -> serde_yaml-0.8.13.crate https://crates.io/api/v1/crates/serial_test/0.5.1/download -> serial_test-0.5.1.crate https://crates.io/api/v1/crates/serial_test_derive/0.5.1/download -> serial_test_derive-0.5.1.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.48/download -> syn-1.0.48.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/terminal_size/0.1.13/download -> terminal_size-0.1.13.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.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/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/wild/2.0.4/download -> wild-2.0.4.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.1.0/download -> xdg-2.1.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.4/download -> yaml-rust-0.4.4.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e56b5624e196c9cfaa432951680d310
diff --git a/metadata/md5-cache/sys-apps/lshw-02.19.2b b/metadata/md5-cache/sys-apps/lshw-02.19.2b
deleted file mode 100644
index 64eb13bd567a..000000000000
--- a/metadata/md5-cache/sys-apps/lshw-02.19.2b
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=gtk? ( virtual/pkgconfig ) sqlite? ( virtual/pkgconfig )
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Hardware Lister
-EAPI=7
-HOMEPAGE=https://www.ezix.org/project/wiki/HardwareLiSter
-IUSE=gtk sqlite static
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-apps/hwids gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=static? ( !gtk !sqlite )
-SLOT=0
-SRC_URI=https://www.ezix.org/software/files/lshw-B.02.19.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1b2642f1731bc1c90c2efdbcd65892b2
diff --git a/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6 b/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
index cd84f3e35614..b9dc422b5d05 100644
--- a/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
+++ b/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/plugdev >=sys-apps/util-linux-2.17.2 crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pmount/pmount_0.9.99-alpha.orig.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=48fea456d71196aebc2da1d343d9f535
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-3.1-r2 b/metadata/md5-cache/sys-apps/policycoreutils-3.1-r2
index a3afdfc6f9d3..7f297ef49e69 100644
--- a/metadata/md5-cache/sys-apps/policycoreutils-3.1-r2
+++ b/metadata/md5-cache/sys-apps/policycoreutils-3.1-r2
@@ -12,5 +12,5 @@ RDEPEND=>=sys-libs/libselinux-3.1:=[python,python_targets_python3_8(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/policycoreutils-3.1.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.37.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9fcf784f3bb2c8139bd4da0a094b52b5
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-3.2 b/metadata/md5-cache/sys-apps/policycoreutils-3.2
index 213e222a5416..893a11d04dd1 100644
--- a/metadata/md5-cache/sys-apps/policycoreutils-3.2
+++ b/metadata/md5-cache/sys-apps/policycoreutils-3.2
@@ -12,5 +12,5 @@ RDEPEND=>=sys-libs/libselinux-3.2:=[python,python_targets_python3_8(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/policycoreutils-3.2.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.37.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=80bec2ed3172589da7ea3932b7c943ee
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-9999 b/metadata/md5-cache/sys-apps/policycoreutils-9999
index 01efbcef189e..8ed20553877a 100644
--- a/metadata/md5-cache/sys-apps/policycoreutils-9999
+++ b/metadata/md5-cache/sys-apps/policycoreutils-9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-libs/libselinux-9999:=[python,python_targets_python3_8(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.37.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea6fd168790cc9ada8f9e981ff58f318
diff --git a/metadata/md5-cache/sys-apps/ripgrep-12.1.1 b/metadata/md5-cache/sys-apps/ripgrep-12.1.1
index 63fc3e67259d..19799f65c20d 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-12.1.1
+++ b/metadata/md5-cache/sys-apps/ripgrep-12.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://github.com/BurntSushi/ripgrep/archive/12.1.1.tar.gz -> ripgrep-12.1.1.tar.gz https://github.com/BurntSushi/ripgrep/releases/download/12.1.1/ripgrep-12.1.1-x86_64-unknown-linux-musl.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.12.1/download -> base64-0.12.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/bytecount/0.6.0/download -> bytecount-0.6.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.54/download -> cc-1.0.54.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/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.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/encoding_rs/0.8.23/download -> encoding_rs-0.8.23.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.7/download -> encoding_rs_io-0.1.7.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.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.71/download -> libc-0.2.71.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.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/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.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/packed_simd/0.3.3/download -> packed_simd-0.3.3.crate https://crates.io/api/v1/crates/pcre2/0.2.3/download -> pcre2-0.2.3.crate https://crates.io/api/v1/crates/pcre2-sys/0.2.2/download -> pcre2-sys-0.2.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/proc-macro2/1.0.17/download -> proc-macro2-1.0.17.crate https://crates.io/api/v1/crates/quote/1.0.6/download -> quote-1.0.6.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.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/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.27/download -> syn-1.0.27.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.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
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=546b08aeb19e13e52d1db1fd29f75a71
diff --git a/metadata/md5-cache/sys-apps/ripgrep-13.0.0 b/metadata/md5-cache/sys-apps/ripgrep-13.0.0
index 452ffc01bccf..67c416f03c42 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-13.0.0
+++ b/metadata/md5-cache/sys-apps/ripgrep-13.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2:= )
 SLOT=0
 SRC_URI=https://github.com/BurntSushi/ripgrep/archive/13.0.0.tar.gz -> ripgrep-13.0.0.tar.gz https://github.com/BurntSushi/ripgrep/releases/download/13.0.0/ripgrep-13.0.0-x86_64-unknown-linux-musl.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/bytecount/0.6.2/download -> bytecount-0.6.2.crate https://crates.io/api/v1/crates/cc/1.0.68/download -> cc-1.0.68.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/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/encoding_rs/0.8.28/download -> encoding_rs-0.8.28.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.7/download -> encoding_rs_io-0.1.7.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.2.0/download -> fs_extra-1.2.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.97/download -> libc-0.2.97.crate https://crates.io/api/v1/crates/libm/0.1.4/download -> libm-0.1.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memmap2/0.3.0/download -> memmap2-0.3.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/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/packed_simd_2/0.3.5/download -> packed_simd_2-0.3.5.crate https://crates.io/api/v1/crates/pcre2/0.2.3/download -> pcre2-0.2.3.crate https://crates.io/api/v1/crates/pcre2-sys/0.2.5/download -> pcre2-sys-0.2.5.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/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.73/download -> syn-1.0.73.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa4ed73760ed547c89b371242f42d936
diff --git a/metadata/md5-cache/sys-apps/ripgrep-all-0.9.6 b/metadata/md5-cache/sys-apps/ripgrep-all-0.9.6
new file mode 100644
index 000000000000..0e8c2daa8cf0
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ripgrep-all-0.9.6
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=app-text/pandoc app-text/poppler sys-apps/ripgrep media-video/ffmpeg
+DESCRIPTION=Like ripgrep, but also search in PDFs, E-Books, Office documents, archives, etc.
+EAPI=7
+HOMEPAGE=https://github.com/phiresky/ripgrep-all
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+ Apache-2.0 BSD-2 ISC MIT ZLIB
+RDEPEND=app-text/pandoc app-text/poppler sys-apps/ripgrep media-video/ffmpeg
+SLOT=0
+SRC_URI=https://github.com/phiresky/ripgrep-all/archive/v0.9.6.tar.gz -> ripgrep-all-0.9.6.tar.gz https://crates.io/api/v1/crates/addr2line/0.12.0/download -> addr2line-0.12.0.crate https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.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/arrayref/0.3.6/download -> arrayref-0.3.6.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.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.48/download -> backtrace-0.3.48.crate https://crates.io/api/v1/crates/bincode/1.2.1/download -> bincode-1.2.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.8+1.0.8/download -> bzip2-sys-0.1.8+1.0.8.crate https://crates.io/api/v1/crates/cachedir/0.1.1/download -> cachedir-0.1.1.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.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/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam/0.7.3/download -> crossbeam-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.1/download -> crossbeam-queue-0.2.1.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/encoding_rs/0.8.23/download -> encoding_rs-0.8.23.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.7/download -> encoding_rs_io-0.1.7.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/exitfailure/0.5.1/download -> exitfailure-0.5.1.crate https://crates.io/api/v1/crates/failure/0.1.8/download -> failure-0.1.8.crate https://crates.io/api/v1/crates/failure_derive/0.1.8/download -> failure_derive-0.1.8.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/fixedbitset/0.1.9/download -> fixedbitset-0.1.9.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gimli/0.21.0/download -> gimli-0.21.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.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.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.18.0/download -> libsqlite3-sys-0.18.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lmdb-rkv/0.14.0/download -> lmdb-rkv-0.14.0.crate https://crates.io/api/v1/crates/lmdb-rkv-sys/0.11.0/download -> lmdb-rkv-sys-0.11.0.crate https://crates.io/api/v1/crates/lock_api/0.2.0/download -> lock_api-0.2.0.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lru-cache/0.1.2/download -> lru-cache-0.1.2.crate https://crates.io/api/v1/crates/lzma-sys/0.1.16/download -> lzma-sys-0.1.16.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/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memoffset/0.5.4/download -> memoffset-0.5.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/nom/2.2.1/download -> nom-2.2.1.crate https://crates.io/api/v1/crates/num/0.2.1/download -> num-0.2.1.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-iter/0.1.40/download -> num-iter-0.1.40.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/object/0.19.0/download -> object-0.19.0.crate https://crates.io/api/v1/crates/ordered-float/1.0.2/download -> ordered-float-1.0.2.crate https://crates.io/api/v1/crates/ordermap/0.3.5/download -> ordermap-0.3.5.crate https://crates.io/api/v1/crates/parking_lot/0.8.0/download -> parking_lot-0.8.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.5.0/download -> parking_lot_core-0.5.0.crate https://crates.io/api/v1/crates/paste/0.1.12/download -> paste-0.1.12.crate https://crates.io/api/v1/crates/paste-impl/0.1.12/download -> paste-impl-0.1.12.crate https://crates.io/api/v1/crates/path-clean/0.1.0/download -> path-clean-0.1.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/petgraph/0.4.13/download -> petgraph-0.4.13.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.15/download -> proc-macro-hack-0.5.15.crate https://crates.io/api/v1/crates/proc-macro2/1.0.13/download -> proc-macro2-1.0.13.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.6/download -> quote-1.0.6.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rkv/0.10.4/download -> rkv-0.10.4.crate https://crates.io/api/v1/crates/rusqlite/0.23.1/download -> rusqlite-0.23.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/size_format/1.0.2/download -> size_format-1.0.2.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/smallvec/1.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.14/download -> structopt-0.3.14.crate https://crates.io/api/v1/crates/structopt-derive/0.4.7/download -> structopt-derive-0.4.7.crate https://crates.io/api/v1/crates/syn/1.0.22/download -> syn-1.0.22.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tree_magic_fork/0.2.2/download -> tree_magic_fork-0.2.2.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.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.12/download -> unicode-normalization-0.1.12.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/uuid/0.8.1/download -> uuid-0.8.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.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/winapi/0.3.8/download -> winapi-0.3.8.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/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/zip/0.5.5/download -> zip-0.5.5.crate https://crates.io/api/v1/crates/zstd/0.5.1+zstd.1.4.4/download -> zstd-0.5.1+zstd.1.4.4.crate https://crates.io/api/v1/crates/zstd-safe/2.0.3+zstd.1.4.4/download -> zstd-safe-2.0.3+zstd.1.4.4.crate https://crates.io/api/v1/crates/zstd-sys/1.4.15+zstd.1.4.4/download -> zstd-sys-1.4.15+zstd.1.4.4.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fdc24212f10d521ec9c8456b620a79be
diff --git a/metadata/md5-cache/sys-apps/salinfo-1.2 b/metadata/md5-cache/sys-apps/salinfo-1.2
index bcd46a9f29fa..a1b1dc7e021d 100644
--- a/metadata/md5-cache/sys-apps/salinfo-1.2
+++ b/metadata/md5-cache/sys-apps/salinfo-1.2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install
 DESCRIPTION=decode Itanium SAL records (e.g. various hardware errors)
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.kernel.org/pub/linux/kernel/people/helgaas/
 KEYWORDS=-* ~ia64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/salinfo-1.2.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4b8bf8220c4d96d5e32c4ee8cb2d2921
+_md5_=07b790090c0f7b4c44a3a0eb36968caf
diff --git a/metadata/md5-cache/sys-apps/sparc-utils-1.9-r7 b/metadata/md5-cache/sys-apps/sparc-utils-1.9-r7
new file mode 100644
index 000000000000..d94009ff26a8
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sparc-utils-1.9-r7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=virtual/os-headers
+DESCRIPTION=Various sparc utilities from Debian GNU/Linux
+EAPI=8
+HOMEPAGE=https://packages.debian.org/sparc-utils
+KEYWORDS=-* ~sparc
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/util-linux-2.13-r1
+SLOT=0
+SRC_URI=mirror://debian/pool/main/s/sparc-utils/sparc-utils_1.9.orig.tar.gz mirror://debian/pool/main/s/sparc-utils/sparc-utils_1.9-4.diff.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=47a44a3079d8afb68ace9ce527c317df
diff --git a/metadata/md5-cache/sys-apps/systemd-248.3-r1 b/metadata/md5-cache/sys-apps/systemd-248.3-r1
index 2aceed9feb7c..cfa15a338703 100644
--- a/metadata/md5-cache/sys-apps/systemd-248.3-r1
+++ b/metadata/md5-cache/sys-apps/systemd-248.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality?
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v248.3/systemd-stable-248.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98ce027c250c395d4e6e6088fbfae72f
diff --git a/metadata/md5-cache/sys-apps/systemd-249-r3 b/metadata/md5-cache/sys-apps/systemd-249-r3
index 1fdd1ec32487..b0c468398a9d 100644
--- a/metadata/md5-cache/sys-apps/systemd-249-r3
+++ b/metadata/md5-cache/sys-apps/systemd-249-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality?
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v249/systemd-249.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a2ddb375f7339e089ff67f30fc0cf819
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 55e69b248d70..cb506dca5c2a 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
 RESTRICT=!test? ( test )
 SLOT=0/2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4abecfc9eff5df02ae1170080cb0202f
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-246 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
index f59e39339d13..8f33f50d8d30 100644
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
@@ -1,15 +1,15 @@
 BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext sys-devel/m4 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= >=sys-kernel/linux-headers-3.11 sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= )
+DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd >=sys-kernel/linux-headers-3.11
 DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=selinux test
 KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 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= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd
+RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux: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_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ddf655c2cc83cb1a2fbcf47f549fa86e
+_md5_=e44d4d9e39cba675181db0ca4021bb01
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3
index 213c8f6f5594..abf8e0a0a7d4 100644
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3
@@ -1,15 +1,15 @@
 BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext sys-devel/m4 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= >=sys-kernel/linux-headers-3.11 sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= )
+DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd >=sys-kernel/linux-headers-3.11
 DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=selinux test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~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= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd
+RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v248.3.tar.gz -> systemd-stable-248.3.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-tmpfiles-248.3-musl.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f094413e8d887c6032b1ee895598fbe1
+_md5_=5612ef3294a27ae80a0f8297f9696038
diff --git a/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0 b/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0
index 8b82f9d38510..c5b9867a3e63 100644
--- a/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0
+++ b/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libpcre lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ggreer/the_silver_searcher/archive/2.2.0.tar.gz -> the_silver_searcher-2.2.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=31337f76b72b81be1ad60db2b4858d89
diff --git a/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0_p20201217-r1 b/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0_p20201217-r1
index eb7a6ddc7ae3..93edbd23aefc 100644
--- a/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0_p20201217-r1
+++ b/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0_p20201217-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libpcre lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ggreer/the_silver_searcher/archive/a61f1780b64266587e7bc30f0f5f71c6cca97c0f.tar.gz -> the_silver_searcher-2.2.0_p20201217.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8efd5c09e5ecfdd4e3627b2ceefd1c1b
diff --git a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18 b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
index 1931fc0dd141..0276c7eff82b 100644
--- a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
+++ b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
@@ -3,11 +3,11 @@ DESCRIPTION=Collection of tools for managing UNIX services
 EAPI=7
 HOMEPAGE=https://cr.yp.to/ucspi-tcp.html
 IUSE=ipv6 qmail-spp selinux
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=public-domain
 RDEPEND=!app-doc/ucspi-tcp-man selinux? ( sec-policy/selinux-ucspitcp )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/ucspi-tcp-0.88-man.tar.gz http://xs3.b92.net/tomislavr/ucspi-tcp-0.88-rblspp.patch ipv6? ( https://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff19.bz2 )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qmail	5e8c0b723a0dd58e095f12233aa9d00c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=74bec42651c8f9cfe488812aa2a48756
+_md5_=7652314ebbf80ea28540c181f147b398
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.6.1 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.6.1
new file mode 100644
index 000000000000..7d999d56a7bf
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.6.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup
+DEPEND=virtual/udev virtual/libusb:1
+DESCRIPTION=Tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks
+EAPI=8
+HOMEPAGE=https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/udev virtual/libusb:1
+SLOT=0
+SRC_URI=https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.6.1.tar.bz2 https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20191128.tar.bz2
+_eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=a324955cccecc619993ce817d9046efc
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.36.2 b/metadata/md5-cache/sys-apps/util-linux-2.36.2
index 27156eaa0b48..5b1ffe788b31 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.36.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.36.2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.2.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c85d69372dd7a666bc9fe754c7d5411
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.37 b/metadata/md5-cache/sys-apps/util-linux-2.37
index e4a7800ef38e..d9b19aead58a 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.37
+++ b/metadata/md5-cache/sys-apps/util-linux-2.37
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.tar.xz https://dev.gentoo.org/~polynomial-c/util-linux-2.37-manpages.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad5bfdf22192cb43e3566a716d5ab1a7
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index 3e98df94cd40..539c405feb29 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -11,5 +11,5 @@ RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8f9a11c9f2c47db76d8a55e9072d0852
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index ecbed339bc79..329730c01cf3 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/polkit-0.116-r3 b/metadata/md5-cache/sys-auth/polkit-0.116-r3
index a5fadfd3987f..ff917b3e59be 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.116-r3
+++ b/metadata/md5-cache/sys-auth/polkit-0.116-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.116.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3a5a5509d1eef5a18d96deb8546c6927
diff --git a/metadata/md5-cache/sys-auth/polkit-0.117-r2 b/metadata/md5-cache/sys-auth/polkit-0.117-r2
index e8c2d7f347fb..38d3708ec63f 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.117-r2
+++ b/metadata/md5-cache/sys-auth/polkit-0.117-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.117.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cdb83ce88a3406187b45a22d5b41cd87
diff --git a/metadata/md5-cache/sys-auth/polkit-0.118-r2 b/metadata/md5-cache/sys-auth/polkit-0.118-r2
index 59bb723f34da..f6341696fb55 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.118-r2
+++ b/metadata/md5-cache/sys-auth/polkit-0.118-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.118.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5052398042ee205ee1243419981d1c0a
diff --git a/metadata/md5-cache/sys-auth/polkit-0.119-r2 b/metadata/md5-cache/sys-auth/polkit-0.119-r2
index baee2a938166..7854b0f01219 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.119-r2
+++ b/metadata/md5-cache/sys-auth/polkit-0.119-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Policy framework for controlling privileges for system-wide services
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit
 IUSE=elogind examples gtk +introspection kde nls pam selinux systemd test
-KEYWORDS=amd64 arm ~arm64 ~mips ppc64 ~riscv ~s390 x86
+KEYWORDS=amd64 arm arm64 ~mips ppc64 ~riscv ~s390 x86
 LICENSE=LGPL-2
 PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent )
 RDEPEND=dev-lang/spidermonkey:78[-debug] dev-libs/glib:2 dev-libs/expat elogind? ( sys-auth/elogind ) pam? ( sys-auth/pambase sys-libs/pam ) !pam? ( virtual/libcrypt:= ) systemd? ( sys-apps/systemd:0=[policykit] ) acct-user/polkitd selinux? ( sec-policy/selinux-policykit )
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.119.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0d480d99fe5ad307fe5a932abf227eaa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=518442762ffa815019aca1a677f05e21
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index ec5da40d51d2..25a8bc183f6a 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/hpacucli-9.30.15.0 b/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
index 058df907b368..daa6c5a34448 100644
--- a/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
+++ b/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
@@ -8,5 +8,5 @@ LICENSE=hp-proliant-essentials
 RDEPEND=sys-apps/coreutils sys-process/procps >=sys-apps/util-linux-2.20.1
 SLOT=0
 SRC_URI=amd64? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1257348637/v77370/hpacucli-9.30-15.0.x86_64.rpm ) x86? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p414707558/v77371/hpacucli-9.30-15.0.i386.rpm )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=16e2666efaaffdca8ffa6e9bcdfda432
diff --git a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0 b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
index c2ca104ff273..a3920fd5755f 100644
--- a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
+++ b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
@@ -8,5 +8,5 @@ LICENSE=hp-proliant-essentials
 RDEPEND=sys-apps/coreutils sys-process/procps >=sys-apps/util-linux-2.20.1
 SLOT=0
 SRC_URI=amd64? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1257348637/v80070/hpacucli-9.40-12.0.x86_64.rpm ) x86? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p414707558/v80071/hpacucli-9.40-12.0.i386.rpm )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2eaf5c83ce7e781a71a3e76d877d41ef
diff --git a/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1 b/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
index 94c1eccce190..caafcdce7c55 100644
--- a/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
+++ b/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 ) >=sys-libs/libunwind-0.99 >=sys-process/procps-3.3.6
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/x86_64/current/hpssacli-2.40-13.0.x86_64.rpm ) x86? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/i686/current/hpssacli-2.40-13.0.i386.rpm )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d456bb38892284aa5efcbf5124872a28
diff --git a/metadata/md5-cache/sys-block/hpssacli-3.10.3.0 b/metadata/md5-cache/sys-block/hpssacli-3.10.3.0
index 61f15bfcd901..2a7b76188595 100644
--- a/metadata/md5-cache/sys-block/hpssacli-3.10.3.0
+++ b/metadata/md5-cache/sys-block/hpssacli-3.10.3.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 ) >=sys-libs/libunwind-0.99 >=sys-process/procps-3.3.6
 SLOT=0
 SRC_URI=https://downloads.linux.hpe.com/SDR/repo/spp/2017.10.1/packages/ssacli-3.10-3.0.x86_64.rpm
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7952d95d2be8a71833dcf1e6aee5fdf6
diff --git a/metadata/md5-cache/sys-block/hpssacli-3.40.3.0 b/metadata/md5-cache/sys-block/hpssacli-3.40.3.0
index 1212252d1dcd..d59111c20dc8 100644
--- a/metadata/md5-cache/sys-block/hpssacli-3.40.3.0
+++ b/metadata/md5-cache/sys-block/hpssacli-3.40.3.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( sys-libs/glibc ) sys-libs/libunwind sys-process/procps
 SLOT=0
 SRC_URI=https://downloads.linux.hpe.com/SDR/repo/spp/2019.03.0/packages/ssacli-3.40-3.0.x86_64.rpm
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c1fea691a9dac6c9c541c2b46f751185
diff --git a/metadata/md5-cache/sys-block/ndctl-71.1-r1 b/metadata/md5-cache/sys-block/ndctl-71.1-r1
index 31360e6797d1..b686ec1877a5 100644
--- a/metadata/md5-cache/sys-block/ndctl-71.1-r1
+++ b/metadata/md5-cache/sys-block/ndctl-71.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/json-c:= sys-apps/keyutils:= sys-apps/kmod:= sys-apps/util-linu
 RESTRICT=!test? ( test ) test
 SLOT=0/6
 SRC_URI=https://github.com/pmem/ndctl/archive/v71.1.tar.gz -> ndctl-71.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9107cdeceb066fb281eceb3960efbdcf
diff --git a/metadata/md5-cache/sys-block/partitionmanager-21.04.2 b/metadata/md5-cache/sys-block/partitionmanager-21.04.2
deleted file mode 100644
index ab49506f7c28..000000000000
--- a/metadata/md5-cache/sys-block/partitionmanager-21.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=sys-libs/kpmcore-21.04.2:5= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Utility for management of disks, partitions and file systems
-EAPI=7
-HOMEPAGE=https://apps.kde.org/partitionmanager/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=sys-libs/kpmcore-21.04.2:5= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/partitionmanager-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3f7280266b4de61145e6fa821c40fcf3
diff --git a/metadata/md5-cache/sys-block/storcli-1.19.04 b/metadata/md5-cache/sys-block/storcli-1.19.04
index 2ac5c07391e0..e77b72868ac3 100644
--- a/metadata/md5-cache/sys-block/storcli-1.19.04
+++ b/metadata/md5-cache/sys-block/storcli-1.19.04
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/6.11
 SRC_URI=http://docs.avagotech.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.19.04_StorCLI.zip -> storcli-1.19.04.zip
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=a8b83605150da4ff30a04b0f1ed1958c
diff --git a/metadata/md5-cache/sys-block/storcli-1.20.15 b/metadata/md5-cache/sys-block/storcli-1.20.15
index e9496f06d036..cc45b58abff6 100644
--- a/metadata/md5-cache/sys-block/storcli-1.20.15
+++ b/metadata/md5-cache/sys-block/storcli-1.20.15
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/6.12
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.20.15_StorCLI.zip -> storcli-1.20.15.zip
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=6ab92dadb8cb6677eac4360625e87bf3
diff --git a/metadata/md5-cache/sys-block/storcli-1.21.06 b/metadata/md5-cache/sys-block/storcli-1.21.06
index c1891c4d9f6c..28479b99d14a 100644
--- a/metadata/md5-cache/sys-block/storcli-1.21.06
+++ b/metadata/md5-cache/sys-block/storcli-1.21.06
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/6.13
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.21.16_StorCLI.zip -> storcli-1.21.06.zip https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.21.06_StorCLI.txt -> storcli-1.21.06_readme.txt
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=c2d5377c5ff89994f64f9e61b3827b72
diff --git a/metadata/md5-cache/sys-block/storcli-1.23.02 b/metadata/md5-cache/sys-block/storcli-1.23.02
index 1cc83ed46963..6b42f8287984 100644
--- a/metadata/md5-cache/sys-block/storcli-1.23.02
+++ b/metadata/md5-cache/sys-block/storcli-1.23.02
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/6.14
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.23.02_StorCLI.zip -> storcli-1.23.02.zip https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.23.02_StorCLI.txt -> storcli-1.23.02_readme.txt
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=2e74f81dda553fd1a4583515051c385a
diff --git a/metadata/md5-cache/sys-block/storcli-7.0504 b/metadata/md5-cache/sys-block/storcli-7.0504
index 4f70330613af..6a36971b6563 100644
--- a/metadata/md5-cache/sys-block/storcli-7.0504
+++ b/metadata/md5-cache/sys-block/storcli-7.0504
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/7.5
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.0504.0000.0000_Unified_StorCLI.zip -> storcli-7.0504.zip
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=f6c9181132f2c9cb67cb4c35584c702e
diff --git a/metadata/md5-cache/sys-block/storcli-7.0606 b/metadata/md5-cache/sys-block/storcli-7.0606
index 6aee0acff07f..7cae9bc6077d 100644
--- a/metadata/md5-cache/sys-block/storcli-7.0606
+++ b/metadata/md5-cache/sys-block/storcli-7.0606
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/7.6
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.0606.0000.0000_Unified_StorCLI.zip -> storcli-7.0606.zip
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=0f269f3577fdee7530089e3cbc6e3340
diff --git a/metadata/md5-cache/sys-block/storcli-7.0709-r1 b/metadata/md5-cache/sys-block/storcli-7.0709-r1
index 793b3ec64eb5..177ecfdd432e 100644
--- a/metadata/md5-cache/sys-block/storcli-7.0709-r1
+++ b/metadata/md5-cache/sys-block/storcli-7.0709-r1
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/7.7
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.0709.0000.0000_Unified_StorCLI.zip -> storcli-7.0709.zip
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=145ca78ca8813456b594f13f12ca09a7
diff --git a/metadata/md5-cache/sys-block/storcli-7.1017 b/metadata/md5-cache/sys-block/storcli-7.1017
index 1054a9d0f03c..69151b474de9 100644
--- a/metadata/md5-cache/sys-block/storcli-7.1017
+++ b/metadata/md5-cache/sys-block/storcli-7.1017
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/7.10
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/MR_SAS_Unified_StorCLI_007.1017.0000.0000.zip -> storcli-7.1017.zip
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=6b59f09b2a2bab3b915f866abc507efa
diff --git a/metadata/md5-cache/sys-block/storcli-7.1211 b/metadata/md5-cache/sys-block/storcli-7.1211
index 05e05c21720a..30b1f10ccf2e 100644
--- a/metadata/md5-cache/sys-block/storcli-7.1211
+++ b/metadata/md5-cache/sys-block/storcli-7.1211
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/7.12
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.1211.0000.0000_Unified_StorCLI.zip -> storcli-7.1211.zip
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=ec99961fd718315f2754bfa67adecc1d
diff --git a/metadata/md5-cache/sys-block/storcli-7.1316 b/metadata/md5-cache/sys-block/storcli-7.1316
index d4231a975326..8538684d2c05 100644
--- a/metadata/md5-cache/sys-block/storcli-7.1316
+++ b/metadata/md5-cache/sys-block/storcli-7.1316
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/7.13
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.1316.0000.0000_Unified_StorCLI.zip -> storcli-7.1316.zip
-_eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
 _md5_=4942854fb6df811b3f2e4fef57b078c6
diff --git a/metadata/md5-cache/sys-block/storcli-7.1410 b/metadata/md5-cache/sys-block/storcli-7.1410
index 41d8f58e3176..fb8c44da435a 100644
--- a/metadata/md5-cache/sys-block/storcli-7.1410
+++ b/metadata/md5-cache/sys-block/storcli-7.1410
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64
 LICENSE=Avago LSI BSD
 SLOT=0/7.14
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.1410.0000.0000_Unified_StorCLI.zip -> storcli-7.1410.zip
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d8b4d9fcb44637351f20853883a8102
diff --git a/metadata/md5-cache/sys-block/storcli-7.1508 b/metadata/md5-cache/sys-block/storcli-7.1508
index fc89edcd94d4..f7f8014306b7 100644
--- a/metadata/md5-cache/sys-block/storcli-7.1508
+++ b/metadata/md5-cache/sys-block/storcli-7.1508
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64
 LICENSE=Avago LSI BSD
 SLOT=0/7.15
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.1508.0000.0000_Unified_StorCLI-PUL.zip -> storcli-7.1508.zip
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d63f64a66ad514681a503c8c9721d4c4
diff --git a/metadata/md5-cache/sys-block/storcli-7.1613 b/metadata/md5-cache/sys-block/storcli-7.1613
index 47dd49332343..4d55d4e9859e 100644
--- a/metadata/md5-cache/sys-block/storcli-7.1613
+++ b/metadata/md5-cache/sys-block/storcli-7.1613
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64
 LICENSE=Avago LSI BSD
 SLOT=0/7.16
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.1613.0000.0000_Unified_StorCLI-PUL.zip -> storcli-7.1613.zip
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=492af261af1be2d8916fcfe0eb573e9f
diff --git a/metadata/md5-cache/sys-block/storcli-7.1715 b/metadata/md5-cache/sys-block/storcli-7.1715
index 83b0d6236da7..631d9d4d12c0 100644
--- a/metadata/md5-cache/sys-block/storcli-7.1715
+++ b/metadata/md5-cache/sys-block/storcli-7.1715
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64
 LICENSE=Avago LSI BSD
 SLOT=0/7.16
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.1715.0000.0000_Unified_StorCLI-PUL.zip -> storcli-7.1715.zip
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=660be10a32da2d43f790560304e2199b
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index ccc5a1ebc7c5..bca0d18559ba 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/elilo-3.16-r5 b/metadata/md5-cache/sys-boot/elilo-3.16-r5
new file mode 100644
index 000000000000..87230b63c822
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/elilo-3.16-r5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=>=sys-boot/gnu-efi-3.0g dev-util/patchutils
+DESCRIPTION=Linux boot loader for EFI-based systems such as IA-64
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/elilo/
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-boot/efibootmgr sys-fs/dosfstools[compat]
+SLOT=0
+SRC_URI=mirror://sourceforge/elilo/elilo-3.16-all.tar.gz mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cffaaf6f7e1a27c8e32672168acb893a
diff --git a/metadata/md5-cache/sys-boot/grub-2.06 b/metadata/md5-cache/sys-boot/grub-2.06
index 38620aa48a9b..7314a3378120 100644
--- a/metadata/md5-cache/sys-boot/grub-2.06
+++ b/metadata/md5-cache/sys-boot/grub-2.06
@@ -12,5 +12,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=!test? ( test )
 SLOT=2/2.06
 SRC_URI=mirror://gnu/grub/grub-2.06.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fde51d4b3320f8fc0e64321993d6f49e
diff --git a/metadata/md5-cache/sys-boot/grub-2.06_rc1 b/metadata/md5-cache/sys-boot/grub-2.06_rc1
index c47f91bb2242..6ec7cdd55a4d 100644
--- a/metadata/md5-cache/sys-boot/grub-2.06_rc1
+++ b/metadata/md5-cache/sys-boot/grub-2.06_rc1
@@ -12,5 +12,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=!test? ( test )
 SLOT=2/2.06_rc1
 SRC_URI=https://alpha.gnu.org/gnu/grub/grub-2.06~rc1.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e6e29b038a5202463cf91761d95cf37d
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index 482d8f3eb7c9..36e3541546dc 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=!test? ( test )
 SLOT=2/9999
 SRC_URI=fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=105ef8bbbfdeace9308236f26c7ae148
diff --git a/metadata/md5-cache/sys-boot/os-prober-1.77 b/metadata/md5-cache/sys-boot/os-prober-1.77
deleted file mode 100644
index 7e11f791e009..000000000000
--- a/metadata/md5-cache/sys-boot/os-prober-1.77
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Utility to detect other OSs on a set of drives
-EAPI=7
-HOMEPAGE=https://packages.debian.org/source/sid/os-prober
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=sys-boot/grub:2[mount]
-SLOT=0
-SRC_URI=mirror://debian/pool/main/o/os-prober/os-prober_1.77.tar.xz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0930d57de09032b7c97f94d571ca0bfc
diff --git a/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r2 b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r2
index b654b38405c5..95137a302487 100644
--- a/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r2
+++ b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 dev-lang/nasm >=sys-boot/gnu-efi-3.0u virtual/os-headers
+DEPEND=sys-apps/util-linux sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 dev-lang/nasm >=sys-boot/gnu-efi-3.0u virtual/os-headers
 DESCRIPTION=SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders
 EAPI=7
 HOMEPAGE=https://www.syslinux.org/
 IUSE=custom-cflags
 KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
-RDEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1
+RDEPEND=sys-apps/util-linux sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/syslinux-6.04-pre1.tar.xz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7abf7223c8c0044ed766916d4852fb81
+_md5_=efc7809adf13d4582affdfd8a4230439
diff --git a/metadata/md5-cache/sys-boot/woeusb-5.1.2 b/metadata/md5-cache/sys-boot/woeusb-5.1.2
new file mode 100644
index 000000000000..75629a60b4cb
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/woeusb-5.1.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=prepare
+DEPEND=app-arch/wimlib sys-apps/util-linux sys-block/parted sys-boot/grub:2[grub_platforms_pc] sys-fs/dosfstools sys-fs/ntfs3g
+DESCRIPTION=Creates windows installer on usb media from an iso image
+EAPI=8
+HOMEPAGE=https://github.com/WoeUSB/WoeUSB
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-4.0 GPL-3+
+RDEPEND=app-arch/wimlib sys-apps/util-linux sys-block/parted sys-boot/grub:2[grub_platforms_pc] sys-fs/dosfstools sys-fs/ntfs3g
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/WoeUSB/WoeUSB/archive/v5.1.2.tar.gz -> woeusb-5.1.2.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3e525d09b29d81029d0bb99cb3d8ac68
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 960a5e4ee6bf..47fc792a55a3 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/ampi-0_pre20140616 b/metadata/md5-cache/sys-cluster/ampi-0_pre20140616
index 0ecd8fa9d5f9..61f8fb4b4e8f 100644
--- a/metadata/md5-cache/sys-cluster/ampi-0_pre20140616
+++ b/metadata/md5-cache/sys-cluster/ampi-0_pre20140616
@@ -1,12 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=prepare
-DEPEND=virtual/mpi sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=virtual/mpi
 DESCRIPTION=MPI library for algorithmic differentiation
-EAPI=5
+EAPI=8
 HOMEPAGE=https://www.mcs.anl.gov/~utke/AdjoinableMPI/AdjoinableMPIDox/index.html
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=virtual/mpi
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jauhien/distfiles/ampi-0_pre20140616.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2035fbeba8d295613c0b38462898c6ad
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e4d2817ef294ec2b1f45186c23752377
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.21-r2 b/metadata/md5-cache/sys-cluster/ceph-14.2.21-r2
index db18d34ccdb8..104c51182421 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.21-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.21-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) diskpredic
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.21.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ce83b5ede747798d77b805a690dd3032
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.22 b/metadata/md5-cache/sys-cluster/ceph-14.2.22
index a4091b0b3cc0..c14e7a027c0c 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.22
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.22
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) diskpredic
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.22.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3985323e9c3ab37fd0347c50f0687bc8
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2 b/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2
index 284188a1b278..e316cd790668 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ?? ( jemal
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.12.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=de0dd03f86ac687241f83d10a1abda80
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2 b/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2
index 7dbb34ea0835..16e7229142fa 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ?? ( jemal
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.13.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3cbbe807b05e4d31c1440b61f92fdcba
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2 b/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
index 66252a61770f..8019f12ffbfc 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ^^ ( lua_s
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2fe25e6a28077bfd54c00cb506a8d9a0
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.5 b/metadata/md5-cache/sys-cluster/ceph-16.2.5
new file mode 100644
index 000000000000..9c6022291b0f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.5
@@ -0,0 +1,16 @@
+BDEPEND=amd64? ( dev-lang/nasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig jaeger? ( sys-devel/bison sys-devel/flex ) test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= <app-arch/snappy-1.1.9:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=Ceph distributed filesystem
+EAPI=7
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rgw-lua +ssl spdk +sqlite system-boost systemd +tcmalloc test uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9 +lua_single_target_lua5-3
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= <app-arch/snappy-1.1.9:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ^^ ( lua_single_target_lua5-3 ) ?? ( jemalloc tcmalloc ) jaeger? ( !system-boost ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.5.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2fe25e6a28077bfd54c00cb506a8d9a0
diff --git a/metadata/md5-cache/sys-cluster/charm-6.8.2 b/metadata/md5-cache/sys-cluster/charm-6.8.2
index c32752208ca4..86e86e64ec0e 100644
--- a/metadata/md5-cache/sys-cluster/charm-6.8.2
+++ b/metadata/md5-cache/sys-cluster/charm-6.8.2
@@ -10,5 +10,5 @@ RDEPEND=mpi? ( virtual/mpi ) virtual/fortran
 REQUIRED_USE=cmkopt? ( !charmdebug !charmtracing ) charmproduction? ( !charmdebug !charmtracing )
 SLOT=0
 SRC_URI=http://charm.cs.uiuc.edu/distrib/charm-6.8.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a4fe77d28319a3fab9588722f19e588a
diff --git a/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1-r1 b/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1-r1
index 83bdd2562f1a..6ad5a7201a68 100644
--- a/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1-r1
+++ b/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://www.linbit.com/downloads/drbd/utils/drbd-utils-9.15.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=1f007aedcc925d341ec2d350f9e44d2d
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.19 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.19
index 649c9b0b3410..ed0d9201f78f 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.19
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.19
@@ -11,5 +11,5 @@ RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernet
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.19.tar.gz -> kubernetes-1.18.19.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b2a4babf0de802818ca7781b93d8c06
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.20 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.20
new file mode 100644
index 000000000000..7c4b30695053
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.20
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.20.tar.gz -> kubernetes-1.18.20.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=089e677f694d9e34183b579eec0866a1
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.11 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.11
index 9c2304ea6b68..2517ec9419c6 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.11
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.11
@@ -11,5 +11,5 @@ RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernet
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.11.tar.gz -> kubernetes-1.19.11.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9da20f9a64dfc7719e1c6181c220ba1f
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.12 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.12
new file mode 100644
index 000000000000..43b7fc1d68a4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.12
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.12.tar.gz -> kubernetes-1.19.12.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=36ab89728a0c2e65d19c280228410d82
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.7 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.7
index 568428a9fdcb..c07e218d385e 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.7
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.7
@@ -11,5 +11,5 @@ RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernet
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.7.tar.gz -> kubernetes-1.20.7.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9da20f9a64dfc7719e1c6181c220ba1f
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.8 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.8
new file mode 100644
index 000000000000..2e830fe860b5
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.8
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.8.tar.gz -> kubernetes-1.20.8.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=36ab89728a0c2e65d19c280228410d82
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.21.1 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.21.1
index dd9d7833caca..1ef125d40766 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.21.1
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.21.1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernet
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.21.1.tar.gz -> kubernetes-1.21.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3de84485331cb788303d84bac63937b8
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.21.2 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.21.2
new file mode 100644
index 000000000000..a047120978a0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.21.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.21.2.tar.gz -> kubernetes-1.21.2.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=03a9bf22cc2a841b9d96edf55cb08cef
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.20 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.20
new file mode 100644
index 000000000000..8a02186343b0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.20
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.20.tar.gz -> kubernetes-1.18.20.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=8f67c1102fa28afe1d4f12a89338b2a2
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.12 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.12
new file mode 100644
index 000000000000..b6b53fbb7869
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.12
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.12.tar.gz -> kubernetes-1.19.12.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=07ff6146f6e4fa837ef0cbec8b39e42b
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.8 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.8
new file mode 100644
index 000000000000..43ea4b190c18
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.8
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.8.tar.gz -> kubernetes-1.20.8.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=07ff6146f6e4fa837ef0cbec8b39e42b
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.21.2 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.21.2
new file mode 100644
index 000000000000..2285337dd0a4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.21.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.21.2.tar.gz -> kubernetes-1.21.2.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=c7a50efdddbfc98cc00559645058ce2a
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.20 b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.20
new file mode 100644
index 000000000000..80b3e5603b20
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.20
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.20.tar.gz -> kubernetes-1.18.20.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=0e0cd98da74bbece5c192089aef9abc5
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.19.12 b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.12
new file mode 100644
index 000000000000..910a28442be0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.12
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.12.tar.gz -> kubernetes-1.19.12.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=35c934db79530475bda3e6b39bb76c20
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.20.8 b/metadata/md5-cache/sys-cluster/kube-proxy-1.20.8
new file mode 100644
index 000000000000..5a4c2475938b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.20.8
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.8.tar.gz -> kubernetes-1.20.8.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=35c934db79530475bda3e6b39bb76c20
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.21.2 b/metadata/md5-cache/sys-cluster/kube-proxy-1.21.2
new file mode 100644
index 000000000000..34ce5a312104
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.21.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.21.2.tar.gz -> kubernetes-1.21.2.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=d8a10a27e6cca15176973036e46a005e
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.20 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.20
new file mode 100644
index 000000000000..413c6255e027
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.20
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.20.tar.gz -> kubernetes-1.18.20.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=8c322e9eed06da7ab32e70dec5ba6647
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.12 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.12
new file mode 100644
index 000000000000..caec378c582f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.12
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.12.tar.gz -> kubernetes-1.19.12.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=755817be0785af0170cb9775e6884322
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.8 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.8
new file mode 100644
index 000000000000..2a0b71dcff35
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.8
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.8.tar.gz -> kubernetes-1.20.8.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=755817be0785af0170cb9775e6884322
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.21.2 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.21.2
new file mode 100644
index 000000000000..3fca67a9e279
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.21.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.21.2.tar.gz -> kubernetes-1.21.2.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=7fea2b91bff64d6caa8940bdc885b30e
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.18.19 b/metadata/md5-cache/sys-cluster/kubeadm-1.18.19
index 5b2dc00599cd..07626cedd137 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.18.19
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.18.19
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.19.tar.gz -> kubernetes-1.18.19.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f06b8010e1cd9ae358f8f71788d2859f
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.18.20 b/metadata/md5-cache/sys-cluster/kubeadm-1.18.20
new file mode 100644
index 000000000000..4b53643629fc
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.18.20
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.20.tar.gz -> kubernetes-1.18.20.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7c67712e419992185d91da317fe231a1
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.19.11 b/metadata/md5-cache/sys-cluster/kubeadm-1.19.11
index 5810dfe1c81a..e0dfff35f887 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.19.11
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.19.11
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.11.tar.gz -> kubernetes-1.19.11.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ddc0a2f1398c40db3723a76b9cf4ef68
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.19.12 b/metadata/md5-cache/sys-cluster/kubeadm-1.19.12
new file mode 100644
index 000000000000..3505640109d3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.19.12
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.12.tar.gz -> kubernetes-1.19.12.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8f8eebbb9dba1a33e138c5035ec5b722
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.20.7 b/metadata/md5-cache/sys-cluster/kubeadm-1.20.7
index d827e99b8cc6..8b5682e80172 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.20.7
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.20.7
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.7.tar.gz -> kubernetes-1.20.7.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ddc0a2f1398c40db3723a76b9cf4ef68
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.20.8 b/metadata/md5-cache/sys-cluster/kubeadm-1.20.8
new file mode 100644
index 000000000000..5a289bfe60a2
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.20.8
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.8.tar.gz -> kubernetes-1.20.8.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8f8eebbb9dba1a33e138c5035ec5b722
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.21.1 b/metadata/md5-cache/sys-cluster/kubeadm-1.21.1
index 07062f55085a..92c845522a80 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.21.1
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.21.1
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.21.1.tar.gz -> kubernetes-1.21.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cecb29961a6c80ef3d4305b9a5d6a272
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.21.2 b/metadata/md5-cache/sys-cluster/kubeadm-1.21.2
new file mode 100644
index 000000000000..cd187c8c81cb
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.21.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.21.2.tar.gz -> kubernetes-1.21.2.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1611b69f7866eec9d993fc7ba6291642
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.18.19 b/metadata/md5-cache/sys-cluster/kubectl-1.18.19
index bafd0cbae495..605d347ae14a 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.18.19
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.18.19
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.19.tar.gz -> kubernetes-1.18.19.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b64c7465031e43305a324040bb3038a
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.18.20 b/metadata/md5-cache/sys-cluster/kubectl-1.18.20
new file mode 100644
index 000000000000..a214709bdb53
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.18.20
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.20.tar.gz -> kubernetes-1.18.20.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=689279e26e1f0d16db20b768a2e3f80e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.19.11 b/metadata/md5-cache/sys-cluster/kubectl-1.19.11
index 1649a1dedf02..d56e28812df5 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.19.11
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.19.11
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.11.tar.gz -> kubernetes-1.19.11.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95efef4b28b5b992f646422e9bd5fd88
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.19.12 b/metadata/md5-cache/sys-cluster/kubectl-1.19.12
new file mode 100644
index 000000000000..f6a0cd092b29
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.19.12
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=!sys-cluster/kubernetes
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.12.tar.gz -> kubernetes-1.19.12.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c63a0aad11add34093b27f12275b69bf
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.20.7 b/metadata/md5-cache/sys-cluster/kubectl-1.20.7
index e70bbbbd4fa6..3ab786b13b41 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.20.7
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.20.7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.7.tar.gz -> kubernetes-1.20.7.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95efef4b28b5b992f646422e9bd5fd88
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.20.8 b/metadata/md5-cache/sys-cluster/kubectl-1.20.8
new file mode 100644
index 000000000000..d0bef94ebeba
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.20.8
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=!sys-cluster/kubernetes
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.8.tar.gz -> kubernetes-1.20.8.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c63a0aad11add34093b27f12275b69bf
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.21.1 b/metadata/md5-cache/sys-cluster/kubectl-1.21.1
index 8c412ae4df74..cdcbe206a41e 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.21.1
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.21.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.21.1.tar.gz -> kubernetes-1.21.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6bd50d5028d53541763dda08e2dbfe37
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.21.2 b/metadata/md5-cache/sys-cluster/kubectl-1.21.2
new file mode 100644
index 000000000000..2fb6cb3dfec4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.21.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=!sys-cluster/kubernetes
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.21.2.tar.gz -> kubernetes-1.21.2.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=85c1cf2c9ff5aa4e8b5a11eb2859b71f
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.18.20 b/metadata/md5-cache/sys-cluster/kubelet-1.18.20
new file mode 100644
index 000000000000..9062a10fe342
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.18.20
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.20.tar.gz -> kubernetes-1.18.20.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=acb430f9d295561dbc6c6c843801cfbc
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.19.12 b/metadata/md5-cache/sys-cluster/kubelet-1.19.12
new file mode 100644
index 000000000000..6f8baa1fe58c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.19.12
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.12.tar.gz -> kubernetes-1.19.12.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6ce51e69604cde401830b8f5bf520b45
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.20.8 b/metadata/md5-cache/sys-cluster/kubelet-1.20.8
new file mode 100644
index 000000000000..3ae66239d7de
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.20.8
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.8.tar.gz -> kubernetes-1.20.8.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6ce51e69604cde401830b8f5bf520b45
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.21.2 b/metadata/md5-cache/sys-cluster/kubelet-1.21.2
new file mode 100644
index 000000000000..b76ad37de7fd
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.21.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.21.2.tar.gz -> kubernetes-1.21.2.tar.gz
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d9072f12c35ac25916bd72baf1b9d77f
diff --git a/metadata/md5-cache/sys-cluster/libquo-1.2.9 b/metadata/md5-cache/sys-cluster/libquo-1.2.9
index 6809c0330a0e..7a86510054bd 100644
--- a/metadata/md5-cache/sys-cluster/libquo-1.2.9
+++ b/metadata/md5-cache/sys-cluster/libquo-1.2.9
@@ -10,5 +10,5 @@ RDEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] fortr
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://lanl.github.io/libquo/dists/libquo-1.2.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=59bb7218d6b2863f4ce85f5dc59818e6
diff --git a/metadata/md5-cache/sys-cluster/libquo-9999 b/metadata/md5-cache/sys-cluster/libquo-9999
index fb1e1e1e8a86..75ed4892116a 100644
--- a/metadata/md5-cache/sys-cluster/libquo-9999
+++ b/metadata/md5-cache/sys-cluster/libquo-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1cd264642b80371e617d62c49839eda7
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.14.0 b/metadata/md5-cache/sys-cluster/minikube-1.14.0
index d5bdd8936fb2..c6db2b395f85 100644
--- a/metadata/md5-cache/sys-cluster/minikube-1.14.0
+++ b/metadata/md5-cache/sys-cluster/minikube-1.14.0
@@ -11,5 +11,5 @@ RDEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v1.14.0.tar.gz -> minikube-1.14.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.zip mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//code.gitea.io/sdk/gitea/@v/v0.12.0.mod -> code.gitea.io%2Fsdk%2Fgitea%2F@v%2Fv0.12.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/aws/@v/v0.0.0-20181029163544-2befc13012d0.mod -> contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/ocagent/@v/v0.5.0.mod -> contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.5.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod mirror://goproxy//contrib.go.opencensus.io/integrations/ocsql/@v/v0.1.4.mod -> contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v2/@v/v2.1.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v29.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv29.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v30.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv30.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v35.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv35.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v38.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv38.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v42.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv42.3.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-service-bus-go/@v/v0.9.1.mod -> github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-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/v12.0.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.1.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.1.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.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.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/!djarvur/go-err113/@v/v0.0.0-20200410182137-af658d038157.mod -> github.com%2F!djarvur%2Fgo-err113%2F@v%2Fv0.0.0-20200410182137-af658d038157.mod mirror://goproxy//github.com/!djarvur/go-err113/@v/v0.1.0.mod -> github.com%2F!djarvur%2Fgo-err113%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!google!cloud!platform/cloudsql-proxy/@v/v0.0.0-20191009163259-e802c2cb94ae.mod -> github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20190822182118-27a4ced34534.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20190822182118-27a4ced34534.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.0.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.0.0-20190417211021-672e52e9209d.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.0.0-20190417211021-672e52e9209d.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.0.0-20190417211021-672e52e9209d.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.0.0-20190417211021-672e52e9209d.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.0.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.1.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!parallels/docker-machine-parallels/@v/v1.3.0.zip -> github.com%2F!parallels%2Fdocker-machine-parallels%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/!parallels/docker-machine-parallels/@v/v1.3.0.mod -> github.com%2F!parallels%2Fdocker-machine-parallels%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/!vivid!cortex/ewma/@v/v1.1.1.zip -> github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!vivid!cortex/ewma/@v/v1.1.1.mod -> github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/afbjorklund/go-containerregistry/@v/v0.0.0-20200902152226-fbad78ec2813.zip -> github.com%2Fafbjorklund%2Fgo-containerregistry%2F@v%2Fv0.0.0-20200902152226-fbad78ec2813.zip mirror://goproxy//github.com/afbjorklund/go-containerregistry/@v/v0.0.0-20200902152226-fbad78ec2813.mod -> github.com%2Fafbjorklund%2Fgo-containerregistry%2F@v%2Fv0.0.0-20200902152226-fbad78ec2813.mod mirror://goproxy//github.com/afbjorklund/go-getter/@v/v1.4.1-0.20190910175809-eb9f6c26742c.zip -> github.com%2Fafbjorklund%2Fgo-getter%2F@v%2Fv1.4.1-0.20190910175809-eb9f6c26742c.zip mirror://goproxy//github.com/afbjorklund/go-getter/@v/v1.4.1-0.20190910175809-eb9f6c26742c.mod -> github.com%2Fafbjorklund%2Fgo-getter%2F@v%2Fv1.4.1-0.20190910175809-eb9f6c26742c.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/kingpin/@v/v2.2.6+incompatible.mod -> github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip 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.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/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/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/apex/log/@v/v1.1.4.mod -> github.com%2Fapex%2Flog%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/apex/log/@v/v1.3.0.mod -> github.com%2Fapex%2Flog%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/apex/logs/@v/v0.0.4.mod -> github.com%2Fapex%2Flogs%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/aphistic/golf/@v/v0.0.0-20180712155816-02c07f170c5a.mod -> github.com%2Faphistic%2Fgolf%2F@v%2Fv0.0.0-20180712155816-02c07f170c5a.mod mirror://goproxy//github.com/aphistic/sweet/@v/v0.2.0.mod -> github.com%2Faphistic%2Fsweet%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.78.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.78.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.16.26.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.16.26.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.16.26.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.16.26.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.18.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.45.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.45.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.20.6.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.20.6.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.1.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.1.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.28.2.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.28.2.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.6.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.6.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.6.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.6.mod mirror://goproxy//github.com/aybabtme/rgbterm/@v/v0.0.0-20170906152045-cc83f3b3ce59.mod -> github.com%2Faybabtme%2Frgbterm%2F@v%2Fv0.0.0-20170906152045-cc83f3b3ce59.mod mirror://goproxy//github.com/bazelbuild/bazel-gazelle/@v/v0.18.2.mod -> github.com%2Fbazelbuild%2Fbazel-gazelle%2F@v%2Fv0.18.2.mod mirror://goproxy//github.com/bazelbuild/bazel-gazelle/@v/v0.19.1-0.20191105222053-70208cbdc798.mod -> github.com%2Fbazelbuild%2Fbazel-gazelle%2F@v%2Fv0.19.1-0.20191105222053-70208cbdc798.mod mirror://goproxy//github.com/bazelbuild/buildtools/@v/v0.0.0-20190731111112-f720930ceb60.mod -> github.com%2Fbazelbuild%2Fbuildtools%2F@v%2Fv0.0.0-20190731111112-f720930ceb60.mod mirror://goproxy//github.com/bazelbuild/buildtools/@v/v0.0.0-20190917191645-69366ca98f89.mod -> github.com%2Fbazelbuild%2Fbuildtools%2F@v%2Fv0.0.0-20190917191645-69366ca98f89.mod mirror://goproxy//github.com/bazelbuild/rules_go/@v/v0.0.0-20190719190356-6dae44dc5cab.mod -> github.com%2Fbazelbuild%2Frules_go%2F@v%2Fv0.0.0-20190719190356-6dae44dc5cab.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.zip -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.mod -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bifurcation/mint/@v/v0.0.0-20180715133206-93c51c6ce115.mod -> github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bombsimon/wsl/v2/@v/v2.0.0.mod -> github.com%2Fbombsimon%2Fwsl%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/bombsimon/wsl/v2/@v/v2.2.0.mod -> github.com%2Fbombsimon%2Fwsl%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/bombsimon/wsl/v3/@v/v3.0.0.mod -> github.com%2Fbombsimon%2Fwsl%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/bombsimon/wsl/v3/@v/v3.1.0.mod -> github.com%2Fbombsimon%2Fwsl%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/c4milo/gotoolkit/@v/v0.0.0-20170318115440-bcc06269efa9.zip -> github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.zip mirror://goproxy//github.com/c4milo/gotoolkit/@v/v0.0.0-20170318115440-bcc06269efa9.mod -> github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.mod mirror://goproxy//github.com/caarlos0/ctrlc/@v/v1.0.0.mod -> github.com%2Fcaarlos0%2Fctrlc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.mod -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/campoy/unique/@v/v0.0.0-20180121183637-88950e537e7e.mod -> github.com%2Fcampoy%2Funique%2F@v%2Fv0.0.0-20180121183637-88950e537e7e.mod mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.mod -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.1.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/prettybench/@v/v0.0.0-20150116022406-03b8cfe5406c.mod -> github.com%2Fcespare%2Fprettybench%2F@v%2Fv0.0.0-20150116022406-03b8cfe5406c.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.zip -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/@v/v0.0.0-20181120144056-17b0214f6c48.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2F@v%2Fv0.0.0-20181120144056-17b0214f6c48.mod mirror://goproxy//github.com/cheekybits/genny/@v/v0.0.0-20170328200008-9127e812e1e9.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.zip -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.zip mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod mirror://goproxy//github.com/cheggaaa/pb/v3/@v/v3.0.1.zip -> github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/cheggaaa/pb/v3/@v/v3.0.1.mod -> github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20191025125908-95b36a581eed.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20191025125908-95b36a581eed.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/cloudevents/sdk-go/v2/@v/v2.1.0.zip -> github.com%2Fcloudevents%2Fsdk-go%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/cloudevents/sdk-go/v2/@v/v2.1.0.mod -> github.com%2Fcloudevents%2Fsdk-go%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/cloudfoundry-attic/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.zip -> github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip mirror://goproxy//github.com/cloudfoundry-attic/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.mod -> github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod mirror://goproxy//github.com/cloudfoundry/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.zip -> github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip mirror://goproxy//github.com/cloudfoundry/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.mod -> github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.mod -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20170925154832-84eeaae905fa.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20170925154832-84eeaae905fa.zip mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20170925154832-84eeaae905fa.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20170925154832-84eeaae905fa.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190228175220-2a93cfde8c20.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190228175220-2a93cfde8c20.zip mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190228175220-2a93cfde8c20.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190228175220-2a93cfde8c20.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.6.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/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.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.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/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.zip -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20191017083524-a8ff7f821017.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20191017083524-a8ff7f821017.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200303162255-7d407207c304.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200303162255-7d407207c304.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20190924003213-a8608b5b67c7.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20190924003213-a8608b5b67c7.zip mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20190924003213-a8608b5b67c7.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20190924003213-a8608b5b67c7.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.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.zip mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/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/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20190421051319-9d40249d3c2f.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20190421051319-9d40249d3c2f.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod mirror://goproxy//github.com/elazarl/goproxy/ext/@v/v0.0.0-20190421051319-9d40249d3c2f.zip -> github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip mirror://goproxy//github.com/elazarl/goproxy/ext/@v/v0.0.0-20190421051319-9d40249d3c2f.mod -> github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.6.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.2.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/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/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-acme/lego/@v/v2.5.0+incompatible.mod -> github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.3.5-0.20190526074819-1df300866540.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.3.5-0.20190526074819-1df300866540.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.4.1.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.4.3.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-lintpack/lintpack/@v/v0.5.2.mod -> github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/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-ozzo/ozzo-validation/@v/v3.5.0+incompatible.zip -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-toolsmith/astcast/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astcopy/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v0.0.0-20180903214952-dcb477bfacd6.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv0.0.0-20180903214952-dcb477bfacd6.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v0.0.0-20180903215011-8f8ee99c3086.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv0.0.0-20180903215011-8f8ee99c3086.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astinfo/@v/v0.0.0-20180906194353-9809ff7efb21.mod -> github.com%2Fgo-toolsmith%2Fastinfo%2F@v%2Fv0.0.0-20180906194353-9809ff7efb21.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v0.0.0-20180903215135-0af7e3c24f30.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv0.0.0-20180903215135-0af7e3c24f30.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v0.0.0-20181119091011-e9e65178eee8.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv0.0.0-20181119091011-e9e65178eee8.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/strparse/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.2.mod -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-xmlfmt/xmlfmt/@v/v0.0.0-20191208150333-d5b6f63a941b.mod -> github.com%2Fgo-xmlfmt%2Fxmlfmt%2F@v%2Fv0.0.0-20191208150333-d5b6f63a941b.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-20181101234600-2ff6f7ffd60f.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20181101234600-2ff6f7ffd60f.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20181101234600-2ff6f7ffd60f.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20181101234600-2ff6f7ffd60f.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.0.0-20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.0.0-20190320160742-5135e617513b.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang-collections/collections/@v/v0.0.0-20130729185459-604e922904d3.zip -> github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.zip mirror://goproxy//github.com/golang-collections/collections/@v/v0.0.0-20130729185459-604e922904d3.mod -> github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.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.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.0.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golangci/check/@v/v0.0.0-20180506172741-cfe4005ccda2.mod -> github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod mirror://goproxy//github.com/golangci/dupl/@v/v0.0.0-20180902072040-3e9179ac440a.mod -> github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod mirror://goproxy//github.com/golangci/errcheck/@v/v0.0.0-20181223084120-ef45e06d44b6.mod -> github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod mirror://goproxy//github.com/golangci/go-misc/@v/v0.0.0-20180628070357-927a3d87b613.mod -> github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.mod mirror://goproxy//github.com/golangci/go-tools/@v/v0.0.0-20190318055746-e32c54105b7c.mod -> github.com%2Fgolangci%2Fgo-tools%2F@v%2Fv0.0.0-20190318055746-e32c54105b7c.mod mirror://goproxy//github.com/golangci/goconst/@v/v0.0.0-20180610141641-041c5f2b40f3.mod -> github.com%2Fgolangci%2Fgoconst%2F@v%2Fv0.0.0-20180610141641-041c5f2b40f3.mod mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528134321-2becd97e67ee.mod -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528134321-2becd97e67ee.mod mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528144436-0a533e8fa43d.mod -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528144436-0a533e8fa43d.mod mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20181222123516-0b8337e80d98.mod -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20181222123516-0b8337e80d98.mod mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20190930125516-244bba706f1a.mod -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20190930125516-244bba706f1a.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.18.0.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.18.0.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.23.7.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.23.7.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.27.0.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/golangci/gosec/@v/v0.0.0-20190211064107-66fb7fc33547.mod -> github.com%2Fgolangci%2Fgosec%2F@v%2Fv0.0.0-20190211064107-66fb7fc33547.mod mirror://goproxy//github.com/golangci/ineffassign/@v/v0.0.0-20190609212857-42439a7714cc.mod -> github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.mod mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20190420132249-ee948d087217.mod -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20190420132249-ee948d087217.mod mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20191013205115-297bf364a8e0.mod -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20191013205115-297bf364a8e0.mod mirror://goproxy//github.com/golangci/maligned/@v/v0.0.0-20180506175553-b1d89398deca.mod -> github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.mod mirror://goproxy//github.com/golangci/misspell/@v/v0.0.0-20180809174111-950f5d19e770.mod -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.0.0-20180809174111-950f5d19e770.mod mirror://goproxy//github.com/golangci/misspell/@v/v0.3.5.mod -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/golangci/prealloc/@v/v0.0.0-20180630174525-215b22d4de21.mod -> github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180526074752-d9c87f5ffaf0.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180526074752-d9c87f5ffaf0.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180812185044-276a5c0a1039.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180812185044-276a5c0a1039.mod mirror://goproxy//github.com/golangci/unconvert/@v/v0.0.0-20180507085042-28b1c447d1f4.mod -> github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod mirror://goproxy//github.com/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/cadvisor/@v/v0.35.0.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.35.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod mirror://goproxy//github.com/google/go-github/v32/@v/v32.1.0.zip -> github.com%2Fgoogle%2Fgo-github%2Fv32%2F@v%2Fv32.1.0.zip mirror://goproxy//github.com/google/go-github/v32/@v/v32.1.0.mod -> github.com%2Fgoogle%2Fgo-github%2Fv32%2F@v%2Fv32.1.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod mirror://goproxy//github.com/google/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.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.mod -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod mirror://goproxy//github.com/google/slowjam/@v/v0.0.0-20200530021616-df27e642fe7b.zip -> github.com%2Fgoogle%2Fslowjam%2F@v%2Fv0.0.0-20200530021616-df27e642fe7b.zip mirror://goproxy//github.com/google/slowjam/@v/v0.0.0-20200530021616-df27e642fe7b.mod -> github.com%2Fgoogle%2Fslowjam%2F@v%2Fv0.0.0-20200530021616-df27e642fe7b.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/wire/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/wire/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.zip -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.2.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/gookit/color/@v/v1.2.4.mod -> github.com%2Fgookit%2Fcolor%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/goreleaser/goreleaser/@v/v0.136.0.mod -> github.com%2Fgoreleaser%2Fgoreleaser%2F@v%2Fv0.136.0.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.2.1.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.3.0.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.0.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/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.0-20190318220348-4088753ea4d3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.3.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.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.8.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.2.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.2.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.4.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-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.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.0.0-20180201235237-0fb14efe8c47.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20180404174102-ef8a98b0bbce.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.zip -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.zip mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hooklift/assert/@v/v0.0.0-20170704181755-9d1defd6d214.zip -> github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.zip mirror://goproxy//github.com/hooklift/assert/@v/v0.0.0-20170704181755-9d1defd6d214.mod -> github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.mod mirror://goproxy//github.com/hooklift/iso9660/@v/v0.0.0-20170318115843-1cf07e5970d8.zip -> github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.zip mirror://goproxy//github.com/hooklift/iso9660/@v/v0.0.0-20170318115843-1cf07e5970d8.mod -> github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.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/imdario/mergo/@v/v0.3.9.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.mod mirror://goproxy//github.com/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/intel-go/cpuid/@v/v0.0.0-20181003105527-1a4a6f06a1c6.zip -> github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.zip mirror://goproxy//github.com/intel-go/cpuid/@v/v0.0.0-20181003105527-1a4a6f06a1c6.mod -> github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/jimstudt/http-authentication/@v/v0.0.0-20140401203705-3eca13d6893a.mod -> github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod mirror://goproxy//github.com/jingyugao/rowserrcheck/@v/v0.0.0-20191204022205-72ab7603b68a.mod -> github.com%2Fjingyugao%2Frowserrcheck%2F@v%2Fv0.0.0-20191204022205-72ab7603b68a.mod mirror://goproxy//github.com/jirfag/go-printf-func-name/@v/v0.0.0-20191110105641-45db9963cdd3.mod -> github.com%2Fjirfag%2Fgo-printf-func-name%2F@v%2Fv0.0.0-20191110105641-45db9963cdd3.mod mirror://goproxy//github.com/jirfag/go-printf-func-name/@v/v0.0.0-20200119135958-7558a9eaa5af.mod -> github.com%2Fjirfag%2Fgo-printf-func-name%2F@v%2Fv0.0.0-20200119135958-7558a9eaa5af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/joefitzgerald/rainbow-reporter/@v/v0.1.0.mod -> github.com%2Fjoefitzgerald%2Frainbow-reporter%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/johanneswuerbach/nfsexports/@v/v0.0.0-20200318065542-c48c3734757f.zip -> github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.zip mirror://goproxy//github.com/johanneswuerbach/nfsexports/@v/v0.0.0-20200318065542-c48c3734757f.mod -> github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.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.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/clock/@v/v0.0.0-20190205081909-9c5c9712527c.zip -> github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.zip mirror://goproxy//github.com/juju/clock/@v/v0.0.0-20190205081909-9c5c9712527c.mod -> github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.mod mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20190806202954-0232dcc7464d.zip -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.zip mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20190806202954-0232dcc7464d.mod -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.mod mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.zip -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.zip mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.mod -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.mod mirror://goproxy//github.com/juju/mutex/@v/v0.0.0-20180619145857-d21b13acf4bf.zip -> github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.zip mirror://goproxy//github.com/juju/mutex/@v/v0.0.0-20180619145857-d21b13acf4bf.mod -> github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.mod mirror://goproxy//github.com/juju/retry/@v/v0.0.0-20180821225755-9058e192b216.zip -> github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.zip mirror://goproxy//github.com/juju/retry/@v/v0.0.0-20180821225755-9058e192b216.mod -> github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.mod mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190723135506-ce30eb24acd2.zip -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.zip mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190723135506-ce30eb24acd2.mod -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.mod mirror://goproxy//github.com/juju/utils/@v/v0.0.0-20180820210520-bf9cc5bdd62d.zip -> github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.zip mirror://goproxy//github.com/juju/utils/@v/v0.0.0-20180820210520-bf9cc5bdd62d.mod -> github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.mod mirror://goproxy//github.com/juju/version/@v/v0.0.0-20180108022336-b64dbd566305.zip -> github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.zip mirror://goproxy//github.com/juju/version/@v/v0.0.0-20180108022336-b64dbd566305.mod -> github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.7.5.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v0.0.0-20161130080628-0de1eaf82fa3.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v0.0.0-20180405133222-e7e905edc00e.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/libvirt/libvirt-go/@v/v3.4.0+incompatible.zip -> github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.4.0+incompatible.zip mirror://goproxy//github.com/libvirt/libvirt-go/@v/v3.4.0+incompatible.mod -> github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.4.0+incompatible.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/tracecontext.go/@v/v0.0.0-20181129014701-1757c391b1ac.zip -> github.com%2Flightstep%2Ftracecontext.go%2F@v%2Fv0.0.0-20181129014701-1757c391b1ac.zip mirror://goproxy//github.com/lightstep/tracecontext.go/@v/v0.0.0-20181129014701-1757c391b1ac.mod -> github.com%2Flightstep%2Ftracecontext.go%2F@v%2Fv0.0.0-20181129014701-1757c391b1ac.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.zip -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/logrusorgru/aurora/@v/v0.0.0-20181002194514-a7b3b318ed4e.mod -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/lucas-clemente/aes12/@v/v0.0.0-20171027163421-cd47fb39b79f.mod -> github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod mirror://goproxy//github.com/lucas-clemente/quic-clients/@v/v0.1.0.mod -> github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.10.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/lucas-clemente/quic-go-certificates/@v/v0.0.0-20160823095156-d2f86524cced.mod -> github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod mirror://goproxy//github.com/machine-drivers/docker-machine-driver-vmware/@v/v0.1.1.zip -> github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/machine-drivers/docker-machine-driver-vmware/@v/v0.1.1.mod -> github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/machine-drivers/machine/@v/v0.7.1-0.20200810185219-7d42fed1b770.zip -> github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20200810185219-7d42fed1b770.zip mirror://goproxy//github.com/machine-drivers/machine/@v/v0.7.1-0.20200810185219-7d42fed1b770.mod -> github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20200810185219-7d42fed1b770.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.7.6.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/maratori/testpackage/@v/v1.0.1.mod -> github.com%2Fmaratori%2Ftestpackage%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.2.3.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.0.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/matoous/godox/@v/v0.0.0-20190911065817-5d6d842e92eb.mod -> github.com%2Fmatoous%2Fgodox%2F@v%2Fv0.0.0-20190911065817-5d6d842e92eb.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190702010315-6dee0af9227d.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.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-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.5.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.5.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/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-zglob/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/goveralls/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.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/maxbrunsfeld/counterfeiter/v6/@v/v6.2.2.zip -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.zip mirror://goproxy//github.com/maxbrunsfeld/counterfeiter/v6/@v/v6.2.2.mod -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.mod mirror://goproxy//github.com/mesos/mesos-go/@v/v0.0.9.mod -> github.com%2Fmesos%2Fmesos-go%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mholt/certmagic/@v/v0.6.2-0.20190624175158-6a42ef9fe8c2.mod -> github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.3.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.27.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.27.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.1+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20170309133038-4fdf99ab2936.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20170309133038-4fdf99ab2936.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20190716172923-621e5597135b.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20190716172923-621e5597135b.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20190716172923-621e5597135b.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20190716172923-621e5597135b.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.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/v0.0.0-20180220230111-00c29f56e238.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.1.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.1.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/moby/hyperkit/@v/v0.0.0-20171020124204-a12cd7250bcd.zip -> github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20171020124204-a12cd7250bcd.zip mirror://goproxy//github.com/moby/hyperkit/@v/v0.0.0-20171020124204-a12cd7250bcd.mod -> github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20171020124204-a12cd7250bcd.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20180409132520-8791a200eb40.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20180409132520-8791a200eb40.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20190404164649-a3c1b6cfecfd.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20190404164649-a3c1b6cfecfd.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20200317151703-4fa42e1c2dee.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20200317151703-4fa42e1c2dee.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20171103030105-7d4729fb3618.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20171103030105-7d4729fb3618.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.mod mirror://goproxy//github.com/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/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nakabonne/nestif/@v/v0.3.0.mod -> github.com%2Fnakabonne%2Fnestif%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20160627004424-a22cb81b2ecd.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20160627004424-a22cb81b2ecd.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20171102151520-eafdab6b0663.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20171102151520-eafdab6b0663.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20180912185939-ae427f1e4c1d.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.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.10.2.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.8.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/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/v1.0.0-rc1.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc10.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc10.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.3.1-0.20190929122143-5215b1806f52.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.1-0.20190929122143-5215b1806f52.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.3.1-0.20190929122143-5215b1806f52.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.1-0.20190929122143-5215b1806f52.mod mirror://goproxy//github.com/otiai10/copy/@v/v1.0.2.zip -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/otiai10/copy/@v/v1.0.2.mod -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.zip -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.zip mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.zip -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.zip -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.1.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/phayes/checkstyle/@v/v0.0.0-20170904204023-bfd46e6a821d.mod -> github.com%2Fphayes%2Fcheckstyle%2F@v%2Fv0.0.0-20170904204023-bfd46e6a821d.mod mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.zip -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.zip mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.mod -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20160118053552-9302be274faa.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20160118053552-9302be274faa.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/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/v0.0.0-20161223203901-3a8809bd8a80.zip -> github.com%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.zip mirror://goproxy//github.com/pkg/profile/@v/v0.0.0-20161223203901-3a8809bd8a80.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/pquerna/ffjson/@v/v0.0.0-20180717144149-af8b230fcd20.mod -> github.com%2Fpquerna%2Fffjson%2F@v%2Fv0.0.0-20180717144149-af8b230fcd20.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.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.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-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.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quasilyte/go-consistent/@v/v0.0.0-20190521200055-c6f3937de18c.mod -> github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod mirror://goproxy//github.com/quasilyte/go-ruleguard/@v/v0.1.2-0.20200318202121-b00d7a75d3d8.mod -> github.com%2Fquasilyte%2Fgo-ruleguard%2F@v%2Fv0.1.2-0.20200318202121-b00d7a75d3d8.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.2.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.mod -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-charset/@v/v0.0.0-20180617210344-2471d30d28b4.mod -> github.com%2Frogpeppe%2Fgo-charset%2F@v%2Fv0.0.0-20180617210344-2471d30d28b4.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20160810183302-0bfd3b39853c.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20160810183302-0bfd3b39853c.mod mirror://goproxy//github.com/russross/blackfriday/@v/v0.0.0-20170610170232-067529f716f4.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.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/ryancurrah/gomodguard/@v/v1.0.4.mod -> github.com%2Fryancurrah%2Fgomodguard%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/ryancurrah/gomodguard/@v/v1.1.0.mod -> github.com%2Fryancurrah%2Fgomodguard%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v0.0.0-20170128012129-256dc444b735.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv0.0.0-20170128012129-256dc444b735.mod mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.mod -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sayboras/dockerclient/@v/v1.0.0.zip -> github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sayboras/dockerclient/@v/v1.0.0.mod -> github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sclevine/spec/@v/v1.2.0.mod -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.zip -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/securego/gosec/@v/v0.0.0-20200103095621-79fbf3af8d83.mod -> github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20200103095621-79fbf3af8d83.mod mirror://goproxy//github.com/securego/gosec/@v/v0.0.0-20200401082031-e946c8c39989.mod -> github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20200401082031-e946c8c39989.mod mirror://goproxy//github.com/securego/gosec/v2/@v/v2.3.0.mod -> github.com%2Fsecurego%2Fgosec%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20180427012116-c95755e4bcd7.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20190901111213-e4ec7b275ada.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20190901111213-e4ec7b275ada.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.18.12+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.18.12+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.18.12+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.18.12+incompatible.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.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.5.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.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/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/go-aws-auth/@v/v0.0.0-20180515143844-0c1422d1fdb9.mod -> github.com%2Fsmartystreets%2Fgo-aws-auth%2F@v%2Fv0.0.0-20180515143844-0c1422d1fdb9.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/smartystreets/gunit/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fgunit%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.5.1.mod -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.5.3.mod -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.2.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.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.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.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/v0.0.0-20180109140146-7c0cea34c8ec.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.0.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.6.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.6.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/storageos/go-api/@v/v0.0.0-20180912212459-343b3eff91fc.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.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/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/tdakkota/asciicheck/@v/v0.0.0-20200416190851-d7f85be797a2.mod -> github.com%2Ftdakkota%2Fasciicheck%2F@v%2Fv0.0.0-20200416190851-d7f85be797a2.mod mirror://goproxy//github.com/tdakkota/asciicheck/@v/v0.0.0-20200416200610-e657995f937b.mod -> github.com%2Ftdakkota%2Fasciicheck%2F@v%2Fv0.0.0-20200416200610-e657995f937b.mod mirror://goproxy//github.com/tetafro/godot/@v/v0.3.7.mod -> github.com%2Ftetafro%2Fgodot%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/tetafro/godot/@v/v0.4.2.mod -> github.com%2Ftetafro%2Fgodot%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.mod -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20190721030226-87058b9bfcec.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20190930140734-f7f2e9bca95e.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190930140734-f7f2e9bca95e.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20200424151742-cb6215831a94.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20200424151742-cb6215831a94.mod mirror://goproxy//github.com/tj/assert/@v/v0.0.0-20171129193455-018094318fb0.mod -> github.com%2Ftj%2Fassert%2F@v%2Fv0.0.0-20171129193455-018094318fb0.mod mirror://goproxy//github.com/tj/go-elastic/@v/v0.0.0-20171221160941-36157cbbebc2.mod -> github.com%2Ftj%2Fgo-elastic%2F@v%2Fv0.0.0-20171221160941-36157cbbebc2.mod mirror://goproxy//github.com/tj/go-kinesis/@v/v0.0.0-20171128231115-08b17f58cb1b.mod -> github.com%2Ftj%2Fgo-kinesis%2F@v%2Fv0.0.0-20171128231115-08b17f58cb1b.mod mirror://goproxy//github.com/tj/go-spin/@v/v1.1.0.mod -> github.com%2Ftj%2Fgo-spin%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tommy-muehle/go-mnd/@v/v1.1.1.mod -> github.com%2Ftommy-muehle%2Fgo-mnd%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/tommy-muehle/go-mnd/@v/v1.3.1-0.20200224220436-e6f9a994e8fa.mod -> github.com%2Ftommy-muehle%2Fgo-mnd%2F@v%2Fv1.3.1-0.20200224220436-e6f9a994e8fa.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.5.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.5.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.1.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.2.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ultraware/whitespace/@v/v0.0.4.mod -> github.com%2Fultraware%2Fwhitespace%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/uudashr/gocognit/@v/v1.0.1.mod -> github.com%2Fuudashr%2Fgocognit%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.zip -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasthttp/@v/v1.2.0.mod -> github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/valyala/quicktemplate/@v/v1.1.1.mod -> github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/valyala/quicktemplate/@v/v1.2.0.mod -> github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.mod -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod mirror://goproxy//github.com/vdemeester/k8s-pkg-credentialprovider/@v/v1.17.4.mod -> github.com%2Fvdemeester%2Fk8s-pkg-credentialprovider%2F@v%2Fv1.17.4.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20171111001504-be1fbeda1936.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20171111001504-be1fbeda1936.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20171111001504-be1fbeda1936.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20171111001504-be1fbeda1936.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.31.0.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.31.0.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.32.0.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.32.0.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.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.zip 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/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/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.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/zchee/go-vmnet/@v/v0.0.0-20161021174912-97ebf9174097.zip -> github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.zip mirror://goproxy//github.com/zchee/go-vmnet/@v/v0.0.0-20161021174912-97ebf9174097.mod -> github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.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.15.0.mod -> go.opencensus.io%2F@v%2Fv0.15.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.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.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//gocloud.dev/@v/v0.19.0.mod -> gocloud.dev%2F@v%2Fv0.19.0.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190927031335-2835ba2e683f.zip -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.zip mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190927031335-2835ba2e683f.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180426230345-b49d69b5da94.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180426230345-b49d69b5da94.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-20190123085648-057139ce5d2b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190123085648-057139ce5d2b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20190424203555-c05e17bb3b2d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190424203555-c05e17bb3b2d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20190820162420-60c769a6c586.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.zip mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170915142106-8351a756f30f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170915142106-8351a756f30f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180911220305-26e67e76b6c3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20181102091132-c10e9556a7bc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181102091132-c10e9556a7bc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190502183928-7f726cade0ab.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190502183928-7f726cade0ab.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.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/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-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20171026204733-164713f0dfce.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190122071731-054c452bb702.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190122071731-054c452bb702.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190124100055-b90733256f2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190124100055-b90733256f2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502175342-a43fa875dd82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190620070143-6f217b454f45.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190620070143-6f217b454f45.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915090833-1cbadb444a80.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915090833-1cbadb444a80.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20170915040203-e531a2a1c15f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20170915040203-e531a2a1c15f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181117154741-2ddaf7f79a09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181117154741-2ddaf7f79a09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190110163146-51295c7ec13a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190110163146-51295c7ec13a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190121143147-24cd39ecf745.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190121143147-24cd39ecf745.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190122202912-9c309ee22fab.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190122202912-9c309ee22fab.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190221204921-83362c3779f5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190221204921-83362c3779f5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311215038-5c2858a9cfe5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311215038-5c2858a9cfe5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190322203728-c1a832b0ad89.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190322203728-c1a832b0ad89.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190422233926-fe54fb35175b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190521203540-521d6ed310dd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190521203540-521d6ed310dd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190706070813-72ffa07ba3db.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190706070813-72ffa07ba3db.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190719005602-e377ae9d6386.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190719005602-e377ae9d6386.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-20190909030654-5b82db07426d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190909030654-5b82db07426d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190910044552-dd2b5c81c578.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190910044552-dd2b5c81c578.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113232020-e2727e816f5a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113232020-e2727e816f5a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200102140908-9497f49d5709.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200102140908-9497f49d5709.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204192400-7124308813f3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204192400-7124308813f3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200324003944-a576cf524670.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200324003944-a576cf524670.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331202046-9d5940d49312.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331202046-9d5940d49312.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200414032229-332987a829c3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200414032229-332987a829c3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200422022333-3d57cf2e726e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200422022333-3d57cf2e726e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200426102838-f3a5411a4c3b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200426102838-f3a5411a4c3b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200502202811-ed308ab3e770.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200502202811-ed308ab3e770.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200527183253-8e7acdbce89d.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200527183253-8e7acdbce89d.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200527183253-8e7acdbce89d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200527183253-8e7acdbce89d.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.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip 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//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.6.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.6.0.mod mirror://goproxy//google.golang.org/api/@v/v0.6.1-0.20190607001116-5213b8090861.mod -> google.golang.org%2Fapi%2F@v%2Fv0.6.1-0.20190607001116-5213b8090861.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.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.25.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.25.0.zip mirror://goproxy//google.golang.org/api/@v/v0.25.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.25.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.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190620144150-6af8c5fc6601.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190620144150-6af8c5fc6601.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200527145253-8367513e4ece.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200527145253-8367513e4ece.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200527145253-8367513e4ece.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200527145253-8367513e4ece.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.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.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.zip mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.56.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.56.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.56.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.56.0.mod mirror://goproxy//gopkg.in/mcuadros/go-syslog.v2/@v/v2.2.1.mod -> gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.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.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gotest.tools/@v/v2.1.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/gotestsum/@v/v0.3.5.mod -> gotest.tools%2Fgotestsum%2F@v%2Fv0.3.5.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-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.2.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//k8s.io/api/@v/v0.17.3.zip -> k8s.io%2Fapi%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/api/@v/v0.17.3.mod -> k8s.io%2Fapi%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.3.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.3.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.17.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.17.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apiserver/@v/v0.17.3.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/apiserver/@v/v0.17.3.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.17.3.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.17.3.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/client-go/@v/v0.17.3.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/client-go/@v/v0.17.3.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cloud-provider/@v/v0.17.3.mod -> k8s.io%2Fcloud-provider%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.17.3.zip -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.17.3.mod -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/code-generator/@v/v0.17.3.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/component-base/@v/v0.17.3.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/component-base/@v/v0.17.3.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cri-api/@v/v0.17.3.zip -> k8s.io%2Fcri-api%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/cri-api/@v/v0.17.3.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/csi-translation-lib/@v/v0.17.3.mod -> k8s.io%2Fcsi-translation-lib%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190822140433-26a664648505.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190822140433-26a664648505.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.mod -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-aggregator/@v/v0.17.3.mod -> k8s.io%2Fkube-aggregator%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-controller-manager/@v/v0.17.3.mod -> k8s.io%2Fkube-controller-manager%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//k8s.io/kube-proxy/@v/v0.17.3.zip -> k8s.io%2Fkube-proxy%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/kube-proxy/@v/v0.17.3.mod -> k8s.io%2Fkube-proxy%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-scheduler/@v/v0.17.3.mod -> k8s.io%2Fkube-scheduler%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubectl/@v/v0.17.3.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/kubectl/@v/v0.17.3.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubelet/@v/v0.17.3.zip -> k8s.io%2Fkubelet%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/kubelet/@v/v0.17.3.mod -> k8s.io%2Fkubelet%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.18.5.zip -> k8s.io%2Fkubernetes%2F@v%2Fv1.18.5.zip mirror://goproxy//k8s.io/kubernetes/@v/v1.18.5.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.18.5.mod mirror://goproxy//k8s.io/legacy-cloud-providers/@v/v0.17.3.mod -> k8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/metrics/@v/v0.17.3.zip -> k8s.io%2Fmetrics%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/metrics/@v/v0.17.3.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/repo-infra/@v/v0.0.1-alpha.1.mod -> k8s.io%2Frepo-infra%2F@v%2Fv0.0.1-alpha.1.mod mirror://goproxy//k8s.io/sample-apiserver/@v/v0.17.3.mod -> k8s.io%2Fsample-apiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/system-validators/@v/v1.0.4.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.0.4.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200124190032-861946025e34.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200124190032-861946025e34.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//mvdan.cc/interfacer/@v/v0.0.0-20180901003855-c20040233aed.mod -> mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod mirror://goproxy//mvdan.cc/lint/@v/v0.0.0-20170908181259-adc824a0674b.mod -> mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20190209190245-fbb59629db34.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190209190245-fbb59629db34.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20190720180237-d51796306d8f.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190720180237-d51796306d8f.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20200501210554-b37ab49443f7.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20200501210554-b37ab49443f7.mod mirror://goproxy//pack.ag/amqp/@v/v0.11.2.mod -> pack.ag%2Famqp%2F@v%2Fv0.11.2.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/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/sig-storage-lib-external-provisioner/@v/v4.0.0+incompatible.zip -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2F@v%2Fv4.0.0+incompatible.zip mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/@v/v4.0.0+incompatible.mod -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2F@v%2Fv4.0.0+incompatible.mod mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/v5/@v/v5.0.0.zip -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/v5/@v/v5.0.0.mod -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v1.0.1-0.20191108220359-b1b620dd3f06.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v1.0.0.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv1.0.0.mod mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.zip -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.zip mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.mod -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68eefc925d29625020d772e0533127b4
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.14.1 b/metadata/md5-cache/sys-cluster/minikube-1.14.1
index a7cfb80a5322..d8ea656c6f8b 100644
--- a/metadata/md5-cache/sys-cluster/minikube-1.14.1
+++ b/metadata/md5-cache/sys-cluster/minikube-1.14.1
@@ -11,5 +11,5 @@ RDEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v1.14.1.tar.gz -> minikube-1.14.1.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.zip mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//code.gitea.io/sdk/gitea/@v/v0.12.0.mod -> code.gitea.io%2Fsdk%2Fgitea%2F@v%2Fv0.12.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/aws/@v/v0.0.0-20181029163544-2befc13012d0.mod -> contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/ocagent/@v/v0.5.0.mod -> contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.5.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod mirror://goproxy//contrib.go.opencensus.io/integrations/ocsql/@v/v0.1.4.mod -> contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v2/@v/v2.1.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v29.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv29.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v30.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv30.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v35.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv35.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v38.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv38.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v42.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv42.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v42.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv42.3.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-service-bus-go/@v/v0.9.1.mod -> github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-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/v12.0.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.1.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.1.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.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.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/!djarvur/go-err113/@v/v0.0.0-20200410182137-af658d038157.mod -> github.com%2F!djarvur%2Fgo-err113%2F@v%2Fv0.0.0-20200410182137-af658d038157.mod mirror://goproxy//github.com/!djarvur/go-err113/@v/v0.1.0.mod -> github.com%2F!djarvur%2Fgo-err113%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!google!cloud!platform/cloudsql-proxy/@v/v0.0.0-20191009163259-e802c2cb94ae.mod -> github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20190822182118-27a4ced34534.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20190822182118-27a4ced34534.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.0.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.0.0-20190417211021-672e52e9209d.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.0.0-20190417211021-672e52e9209d.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.0.0-20190417211021-672e52e9209d.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.0.0-20190417211021-672e52e9209d.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.0.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.1.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!parallels/docker-machine-parallels/@v/v1.3.0.zip -> github.com%2F!parallels%2Fdocker-machine-parallels%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/!parallels/docker-machine-parallels/@v/v1.3.0.mod -> github.com%2F!parallels%2Fdocker-machine-parallels%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/!vivid!cortex/ewma/@v/v1.1.1.zip -> github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!vivid!cortex/ewma/@v/v1.1.1.mod -> github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/afbjorklund/go-containerregistry/@v/v0.0.0-20200902152226-fbad78ec2813.zip -> github.com%2Fafbjorklund%2Fgo-containerregistry%2F@v%2Fv0.0.0-20200902152226-fbad78ec2813.zip mirror://goproxy//github.com/afbjorklund/go-containerregistry/@v/v0.0.0-20200902152226-fbad78ec2813.mod -> github.com%2Fafbjorklund%2Fgo-containerregistry%2F@v%2Fv0.0.0-20200902152226-fbad78ec2813.mod mirror://goproxy//github.com/afbjorklund/go-getter/@v/v1.4.1-0.20201020145846-c0da14b4bffe.zip -> github.com%2Fafbjorklund%2Fgo-getter%2F@v%2Fv1.4.1-0.20201020145846-c0da14b4bffe.zip mirror://goproxy//github.com/afbjorklund/go-getter/@v/v1.4.1-0.20201020145846-c0da14b4bffe.mod -> github.com%2Fafbjorklund%2Fgo-getter%2F@v%2Fv1.4.1-0.20201020145846-c0da14b4bffe.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/kingpin/@v/v2.2.6+incompatible.mod -> github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip 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.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/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/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/apex/log/@v/v1.1.4.mod -> github.com%2Fapex%2Flog%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/apex/log/@v/v1.3.0.mod -> github.com%2Fapex%2Flog%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/apex/logs/@v/v0.0.4.mod -> github.com%2Fapex%2Flogs%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/aphistic/golf/@v/v0.0.0-20180712155816-02c07f170c5a.mod -> github.com%2Faphistic%2Fgolf%2F@v%2Fv0.0.0-20180712155816-02c07f170c5a.mod mirror://goproxy//github.com/aphistic/sweet/@v/v0.2.0.mod -> github.com%2Faphistic%2Fsweet%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.78.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.78.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.16.26.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.16.26.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.16.26.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.16.26.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.18.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.45.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.45.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.20.6.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.20.6.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.1.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.1.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.28.2.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.28.2.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.6.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.6.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.6.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.6.mod mirror://goproxy//github.com/aybabtme/rgbterm/@v/v0.0.0-20170906152045-cc83f3b3ce59.mod -> github.com%2Faybabtme%2Frgbterm%2F@v%2Fv0.0.0-20170906152045-cc83f3b3ce59.mod mirror://goproxy//github.com/bazelbuild/bazel-gazelle/@v/v0.18.2.mod -> github.com%2Fbazelbuild%2Fbazel-gazelle%2F@v%2Fv0.18.2.mod mirror://goproxy//github.com/bazelbuild/bazel-gazelle/@v/v0.19.1-0.20191105222053-70208cbdc798.mod -> github.com%2Fbazelbuild%2Fbazel-gazelle%2F@v%2Fv0.19.1-0.20191105222053-70208cbdc798.mod mirror://goproxy//github.com/bazelbuild/buildtools/@v/v0.0.0-20190731111112-f720930ceb60.mod -> github.com%2Fbazelbuild%2Fbuildtools%2F@v%2Fv0.0.0-20190731111112-f720930ceb60.mod mirror://goproxy//github.com/bazelbuild/buildtools/@v/v0.0.0-20190917191645-69366ca98f89.mod -> github.com%2Fbazelbuild%2Fbuildtools%2F@v%2Fv0.0.0-20190917191645-69366ca98f89.mod mirror://goproxy//github.com/bazelbuild/rules_go/@v/v0.0.0-20190719190356-6dae44dc5cab.mod -> github.com%2Fbazelbuild%2Frules_go%2F@v%2Fv0.0.0-20190719190356-6dae44dc5cab.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.zip -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.mod -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bifurcation/mint/@v/v0.0.0-20180715133206-93c51c6ce115.mod -> github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bombsimon/wsl/v2/@v/v2.0.0.mod -> github.com%2Fbombsimon%2Fwsl%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/bombsimon/wsl/v2/@v/v2.2.0.mod -> github.com%2Fbombsimon%2Fwsl%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/bombsimon/wsl/v3/@v/v3.0.0.mod -> github.com%2Fbombsimon%2Fwsl%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/bombsimon/wsl/v3/@v/v3.1.0.mod -> github.com%2Fbombsimon%2Fwsl%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/c4milo/gotoolkit/@v/v0.0.0-20170318115440-bcc06269efa9.zip -> github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.zip mirror://goproxy//github.com/c4milo/gotoolkit/@v/v0.0.0-20170318115440-bcc06269efa9.mod -> github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.mod mirror://goproxy//github.com/caarlos0/ctrlc/@v/v1.0.0.mod -> github.com%2Fcaarlos0%2Fctrlc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.mod -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/campoy/unique/@v/v0.0.0-20180121183637-88950e537e7e.mod -> github.com%2Fcampoy%2Funique%2F@v%2Fv0.0.0-20180121183637-88950e537e7e.mod mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.mod -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.1.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/prettybench/@v/v0.0.0-20150116022406-03b8cfe5406c.mod -> github.com%2Fcespare%2Fprettybench%2F@v%2Fv0.0.0-20150116022406-03b8cfe5406c.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.zip -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/@v/v0.0.0-20181120144056-17b0214f6c48.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2F@v%2Fv0.0.0-20181120144056-17b0214f6c48.mod mirror://goproxy//github.com/cheekybits/genny/@v/v0.0.0-20170328200008-9127e812e1e9.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.zip -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.zip mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod mirror://goproxy//github.com/cheggaaa/pb/v3/@v/v3.0.1.zip -> github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/cheggaaa/pb/v3/@v/v3.0.1.mod -> github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20191025125908-95b36a581eed.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20191025125908-95b36a581eed.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/cloudevents/sdk-go/v2/@v/v2.1.0.zip -> github.com%2Fcloudevents%2Fsdk-go%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/cloudevents/sdk-go/v2/@v/v2.1.0.mod -> github.com%2Fcloudevents%2Fsdk-go%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/cloudfoundry-attic/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.zip -> github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip mirror://goproxy//github.com/cloudfoundry-attic/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.mod -> github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod mirror://goproxy//github.com/cloudfoundry/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.zip -> github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip mirror://goproxy//github.com/cloudfoundry/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.mod -> github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.mod -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20170925154832-84eeaae905fa.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20170925154832-84eeaae905fa.zip mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20170925154832-84eeaae905fa.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20170925154832-84eeaae905fa.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190228175220-2a93cfde8c20.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190228175220-2a93cfde8c20.zip mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190228175220-2a93cfde8c20.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190228175220-2a93cfde8c20.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.6.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/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.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.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/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.zip -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20191017083524-a8ff7f821017.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20191017083524-a8ff7f821017.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200303162255-7d407207c304.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200303162255-7d407207c304.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20190924003213-a8608b5b67c7.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20190924003213-a8608b5b67c7.zip mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20190924003213-a8608b5b67c7.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20190924003213-a8608b5b67c7.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.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.zip mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/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/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20190421051319-9d40249d3c2f.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20190421051319-9d40249d3c2f.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod mirror://goproxy//github.com/elazarl/goproxy/ext/@v/v0.0.0-20190421051319-9d40249d3c2f.zip -> github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip mirror://goproxy//github.com/elazarl/goproxy/ext/@v/v0.0.0-20190421051319-9d40249d3c2f.mod -> github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.6.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.2.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/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/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-acme/lego/@v/v2.5.0+incompatible.mod -> github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.3.5-0.20190526074819-1df300866540.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.3.5-0.20190526074819-1df300866540.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.4.1.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.4.3.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-lintpack/lintpack/@v/v0.5.2.mod -> github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.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-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/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-ozzo/ozzo-validation/@v/v3.5.0+incompatible.zip -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-toolsmith/astcast/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astcopy/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v0.0.0-20180903214952-dcb477bfacd6.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv0.0.0-20180903214952-dcb477bfacd6.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v0.0.0-20180903215011-8f8ee99c3086.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv0.0.0-20180903215011-8f8ee99c3086.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astinfo/@v/v0.0.0-20180906194353-9809ff7efb21.mod -> github.com%2Fgo-toolsmith%2Fastinfo%2F@v%2Fv0.0.0-20180906194353-9809ff7efb21.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v0.0.0-20180903215135-0af7e3c24f30.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv0.0.0-20180903215135-0af7e3c24f30.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v0.0.0-20181119091011-e9e65178eee8.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv0.0.0-20181119091011-e9e65178eee8.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/strparse/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.2.mod -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-xmlfmt/xmlfmt/@v/v0.0.0-20191208150333-d5b6f63a941b.mod -> github.com%2Fgo-xmlfmt%2Fxmlfmt%2F@v%2Fv0.0.0-20191208150333-d5b6f63a941b.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-20181101234600-2ff6f7ffd60f.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20181101234600-2ff6f7ffd60f.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20181101234600-2ff6f7ffd60f.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20181101234600-2ff6f7ffd60f.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.0.0-20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.0.0-20190320160742-5135e617513b.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang-collections/collections/@v/v0.0.0-20130729185459-604e922904d3.zip -> github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.zip mirror://goproxy//github.com/golang-collections/collections/@v/v0.0.0-20130729185459-604e922904d3.mod -> github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.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.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.0.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golangci/check/@v/v0.0.0-20180506172741-cfe4005ccda2.mod -> github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod mirror://goproxy//github.com/golangci/dupl/@v/v0.0.0-20180902072040-3e9179ac440a.mod -> github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod mirror://goproxy//github.com/golangci/errcheck/@v/v0.0.0-20181223084120-ef45e06d44b6.mod -> github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod mirror://goproxy//github.com/golangci/go-misc/@v/v0.0.0-20180628070357-927a3d87b613.mod -> github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.mod mirror://goproxy//github.com/golangci/go-tools/@v/v0.0.0-20190318055746-e32c54105b7c.mod -> github.com%2Fgolangci%2Fgo-tools%2F@v%2Fv0.0.0-20190318055746-e32c54105b7c.mod mirror://goproxy//github.com/golangci/goconst/@v/v0.0.0-20180610141641-041c5f2b40f3.mod -> github.com%2Fgolangci%2Fgoconst%2F@v%2Fv0.0.0-20180610141641-041c5f2b40f3.mod mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528134321-2becd97e67ee.mod -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528134321-2becd97e67ee.mod mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528144436-0a533e8fa43d.mod -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528144436-0a533e8fa43d.mod mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20181222123516-0b8337e80d98.mod -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20181222123516-0b8337e80d98.mod mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20190930125516-244bba706f1a.mod -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20190930125516-244bba706f1a.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.18.0.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.18.0.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.23.7.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.23.7.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.27.0.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/golangci/gosec/@v/v0.0.0-20190211064107-66fb7fc33547.mod -> github.com%2Fgolangci%2Fgosec%2F@v%2Fv0.0.0-20190211064107-66fb7fc33547.mod mirror://goproxy//github.com/golangci/ineffassign/@v/v0.0.0-20190609212857-42439a7714cc.mod -> github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.mod mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20190420132249-ee948d087217.mod -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20190420132249-ee948d087217.mod mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20191013205115-297bf364a8e0.mod -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20191013205115-297bf364a8e0.mod mirror://goproxy//github.com/golangci/maligned/@v/v0.0.0-20180506175553-b1d89398deca.mod -> github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.mod mirror://goproxy//github.com/golangci/misspell/@v/v0.0.0-20180809174111-950f5d19e770.mod -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.0.0-20180809174111-950f5d19e770.mod mirror://goproxy//github.com/golangci/misspell/@v/v0.3.5.mod -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/golangci/prealloc/@v/v0.0.0-20180630174525-215b22d4de21.mod -> github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180526074752-d9c87f5ffaf0.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180526074752-d9c87f5ffaf0.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180812185044-276a5c0a1039.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180812185044-276a5c0a1039.mod mirror://goproxy//github.com/golangci/unconvert/@v/v0.0.0-20180507085042-28b1c447d1f4.mod -> github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod mirror://goproxy//github.com/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/cadvisor/@v/v0.35.0.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.35.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod mirror://goproxy//github.com/google/go-github/v32/@v/v32.1.0.zip -> github.com%2Fgoogle%2Fgo-github%2Fv32%2F@v%2Fv32.1.0.zip mirror://goproxy//github.com/google/go-github/v32/@v/v32.1.0.mod -> github.com%2Fgoogle%2Fgo-github%2Fv32%2F@v%2Fv32.1.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod mirror://goproxy//github.com/google/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.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.mod -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod mirror://goproxy//github.com/google/slowjam/@v/v0.0.0-20200530021616-df27e642fe7b.zip -> github.com%2Fgoogle%2Fslowjam%2F@v%2Fv0.0.0-20200530021616-df27e642fe7b.zip mirror://goproxy//github.com/google/slowjam/@v/v0.0.0-20200530021616-df27e642fe7b.mod -> github.com%2Fgoogle%2Fslowjam%2F@v%2Fv0.0.0-20200530021616-df27e642fe7b.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/wire/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/wire/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.zip -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.2.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/gookit/color/@v/v1.2.4.mod -> github.com%2Fgookit%2Fcolor%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/goreleaser/goreleaser/@v/v0.136.0.mod -> github.com%2Fgoreleaser%2Fgoreleaser%2F@v%2Fv0.136.0.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.2.1.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.3.0.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.0.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/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.0-20190318220348-4088753ea4d3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.3.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.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.8.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.2.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.2.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.4.2.mod -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.4.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-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.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.0.0-20180201235237-0fb14efe8c47.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20180404174102-ef8a98b0bbce.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.zip -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.zip mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hooklift/assert/@v/v0.0.0-20170704181755-9d1defd6d214.zip -> github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.zip mirror://goproxy//github.com/hooklift/assert/@v/v0.0.0-20170704181755-9d1defd6d214.mod -> github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.mod mirror://goproxy//github.com/hooklift/iso9660/@v/v0.0.0-20170318115843-1cf07e5970d8.zip -> github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.zip mirror://goproxy//github.com/hooklift/iso9660/@v/v0.0.0-20170318115843-1cf07e5970d8.mod -> github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.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/imdario/mergo/@v/v0.3.9.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.mod mirror://goproxy//github.com/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/intel-go/cpuid/@v/v0.0.0-20181003105527-1a4a6f06a1c6.zip -> github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.zip mirror://goproxy//github.com/intel-go/cpuid/@v/v0.0.0-20181003105527-1a4a6f06a1c6.mod -> github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/jimstudt/http-authentication/@v/v0.0.0-20140401203705-3eca13d6893a.mod -> github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod mirror://goproxy//github.com/jingyugao/rowserrcheck/@v/v0.0.0-20191204022205-72ab7603b68a.mod -> github.com%2Fjingyugao%2Frowserrcheck%2F@v%2Fv0.0.0-20191204022205-72ab7603b68a.mod mirror://goproxy//github.com/jirfag/go-printf-func-name/@v/v0.0.0-20191110105641-45db9963cdd3.mod -> github.com%2Fjirfag%2Fgo-printf-func-name%2F@v%2Fv0.0.0-20191110105641-45db9963cdd3.mod mirror://goproxy//github.com/jirfag/go-printf-func-name/@v/v0.0.0-20200119135958-7558a9eaa5af.mod -> github.com%2Fjirfag%2Fgo-printf-func-name%2F@v%2Fv0.0.0-20200119135958-7558a9eaa5af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/joefitzgerald/rainbow-reporter/@v/v0.1.0.mod -> github.com%2Fjoefitzgerald%2Frainbow-reporter%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/johanneswuerbach/nfsexports/@v/v0.0.0-20200318065542-c48c3734757f.zip -> github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.zip mirror://goproxy//github.com/johanneswuerbach/nfsexports/@v/v0.0.0-20200318065542-c48c3734757f.mod -> github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.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.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/clock/@v/v0.0.0-20190205081909-9c5c9712527c.zip -> github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.zip mirror://goproxy//github.com/juju/clock/@v/v0.0.0-20190205081909-9c5c9712527c.mod -> github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.mod mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20190806202954-0232dcc7464d.zip -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.zip mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20190806202954-0232dcc7464d.mod -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.mod mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.zip -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.zip mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.mod -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.mod mirror://goproxy//github.com/juju/mutex/@v/v0.0.0-20180619145857-d21b13acf4bf.zip -> github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.zip mirror://goproxy//github.com/juju/mutex/@v/v0.0.0-20180619145857-d21b13acf4bf.mod -> github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.mod mirror://goproxy//github.com/juju/retry/@v/v0.0.0-20180821225755-9058e192b216.zip -> github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.zip mirror://goproxy//github.com/juju/retry/@v/v0.0.0-20180821225755-9058e192b216.mod -> github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.mod mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190723135506-ce30eb24acd2.zip -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.zip mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190723135506-ce30eb24acd2.mod -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.mod mirror://goproxy//github.com/juju/utils/@v/v0.0.0-20180820210520-bf9cc5bdd62d.zip -> github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.zip mirror://goproxy//github.com/juju/utils/@v/v0.0.0-20180820210520-bf9cc5bdd62d.mod -> github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.mod mirror://goproxy//github.com/juju/version/@v/v0.0.0-20180108022336-b64dbd566305.zip -> github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.zip mirror://goproxy//github.com/juju/version/@v/v0.0.0-20180108022336-b64dbd566305.mod -> github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.7.5.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v0.0.0-20161130080628-0de1eaf82fa3.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v0.0.0-20180405133222-e7e905edc00e.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/libvirt/libvirt-go/@v/v3.4.0+incompatible.zip -> github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.4.0+incompatible.zip mirror://goproxy//github.com/libvirt/libvirt-go/@v/v3.4.0+incompatible.mod -> github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.4.0+incompatible.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/tracecontext.go/@v/v0.0.0-20181129014701-1757c391b1ac.zip -> github.com%2Flightstep%2Ftracecontext.go%2F@v%2Fv0.0.0-20181129014701-1757c391b1ac.zip mirror://goproxy//github.com/lightstep/tracecontext.go/@v/v0.0.0-20181129014701-1757c391b1ac.mod -> github.com%2Flightstep%2Ftracecontext.go%2F@v%2Fv0.0.0-20181129014701-1757c391b1ac.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.zip -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/logrusorgru/aurora/@v/v0.0.0-20181002194514-a7b3b318ed4e.mod -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/lucas-clemente/aes12/@v/v0.0.0-20171027163421-cd47fb39b79f.mod -> github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod mirror://goproxy//github.com/lucas-clemente/quic-clients/@v/v0.1.0.mod -> github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.10.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/lucas-clemente/quic-go-certificates/@v/v0.0.0-20160823095156-d2f86524cced.mod -> github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod mirror://goproxy//github.com/machine-drivers/docker-machine-driver-vmware/@v/v0.1.1.zip -> github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/machine-drivers/docker-machine-driver-vmware/@v/v0.1.1.mod -> github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/machine-drivers/machine/@v/v0.7.1-0.20200810185219-7d42fed1b770.zip -> github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20200810185219-7d42fed1b770.zip mirror://goproxy//github.com/machine-drivers/machine/@v/v0.7.1-0.20200810185219-7d42fed1b770.mod -> github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20200810185219-7d42fed1b770.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.7.6.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/maratori/testpackage/@v/v1.0.1.mod -> github.com%2Fmaratori%2Ftestpackage%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.2.3.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.0.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/matoous/godox/@v/v0.0.0-20190911065817-5d6d842e92eb.mod -> github.com%2Fmatoous%2Fgodox%2F@v%2Fv0.0.0-20190911065817-5d6d842e92eb.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190702010315-6dee0af9227d.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.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-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.5.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.5.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/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-zglob/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/goveralls/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.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/maxbrunsfeld/counterfeiter/v6/@v/v6.2.2.zip -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.zip mirror://goproxy//github.com/maxbrunsfeld/counterfeiter/v6/@v/v6.2.2.mod -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.mod mirror://goproxy//github.com/mesos/mesos-go/@v/v0.0.9.mod -> github.com%2Fmesos%2Fmesos-go%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mholt/certmagic/@v/v0.6.2-0.20190624175158-6a42ef9fe8c2.mod -> github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.3.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.27.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.27.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.1+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20170309133038-4fdf99ab2936.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20170309133038-4fdf99ab2936.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20190716172923-621e5597135b.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20190716172923-621e5597135b.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20190716172923-621e5597135b.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20190716172923-621e5597135b.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.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/v0.0.0-20180220230111-00c29f56e238.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.1.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.1.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/moby/hyperkit/@v/v0.0.0-20171020124204-a12cd7250bcd.zip -> github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20171020124204-a12cd7250bcd.zip mirror://goproxy//github.com/moby/hyperkit/@v/v0.0.0-20171020124204-a12cd7250bcd.mod -> github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20171020124204-a12cd7250bcd.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20180409132520-8791a200eb40.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20180409132520-8791a200eb40.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20190404164649-a3c1b6cfecfd.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20190404164649-a3c1b6cfecfd.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20200317151703-4fa42e1c2dee.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20200317151703-4fa42e1c2dee.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20171103030105-7d4729fb3618.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20171103030105-7d4729fb3618.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.mod mirror://goproxy//github.com/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/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nakabonne/nestif/@v/v0.3.0.mod -> github.com%2Fnakabonne%2Fnestif%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20160627004424-a22cb81b2ecd.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20160627004424-a22cb81b2ecd.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20171102151520-eafdab6b0663.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20171102151520-eafdab6b0663.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20180912185939-ae427f1e4c1d.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.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.10.2.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.8.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/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/v1.0.0-rc1.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc10.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc10.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.3.1-0.20190929122143-5215b1806f52.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.1-0.20190929122143-5215b1806f52.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.3.1-0.20190929122143-5215b1806f52.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.1-0.20190929122143-5215b1806f52.mod mirror://goproxy//github.com/otiai10/copy/@v/v1.0.2.zip -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/otiai10/copy/@v/v1.0.2.mod -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.zip -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.zip mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.zip -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.zip -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.1.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/phayes/checkstyle/@v/v0.0.0-20170904204023-bfd46e6a821d.mod -> github.com%2Fphayes%2Fcheckstyle%2F@v%2Fv0.0.0-20170904204023-bfd46e6a821d.mod mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.zip -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.zip mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.mod -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20160118053552-9302be274faa.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20160118053552-9302be274faa.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/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/v0.0.0-20161223203901-3a8809bd8a80.zip -> github.com%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.zip mirror://goproxy//github.com/pkg/profile/@v/v0.0.0-20161223203901-3a8809bd8a80.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/pquerna/ffjson/@v/v0.0.0-20180717144149-af8b230fcd20.mod -> github.com%2Fpquerna%2Fffjson%2F@v%2Fv0.0.0-20180717144149-af8b230fcd20.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.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.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-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.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quasilyte/go-consistent/@v/v0.0.0-20190521200055-c6f3937de18c.mod -> github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod mirror://goproxy//github.com/quasilyte/go-ruleguard/@v/v0.1.2-0.20200318202121-b00d7a75d3d8.mod -> github.com%2Fquasilyte%2Fgo-ruleguard%2F@v%2Fv0.1.2-0.20200318202121-b00d7a75d3d8.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.2.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.mod -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-charset/@v/v0.0.0-20180617210344-2471d30d28b4.mod -> github.com%2Frogpeppe%2Fgo-charset%2F@v%2Fv0.0.0-20180617210344-2471d30d28b4.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20160810183302-0bfd3b39853c.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20160810183302-0bfd3b39853c.mod mirror://goproxy//github.com/russross/blackfriday/@v/v0.0.0-20170610170232-067529f716f4.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.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/ryancurrah/gomodguard/@v/v1.0.4.mod -> github.com%2Fryancurrah%2Fgomodguard%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/ryancurrah/gomodguard/@v/v1.1.0.mod -> github.com%2Fryancurrah%2Fgomodguard%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v0.0.0-20170128012129-256dc444b735.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv0.0.0-20170128012129-256dc444b735.mod mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.mod -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sayboras/dockerclient/@v/v1.0.0.zip -> github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sayboras/dockerclient/@v/v1.0.0.mod -> github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sclevine/spec/@v/v1.2.0.mod -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.zip -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/securego/gosec/@v/v0.0.0-20200103095621-79fbf3af8d83.mod -> github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20200103095621-79fbf3af8d83.mod mirror://goproxy//github.com/securego/gosec/@v/v0.0.0-20200401082031-e946c8c39989.mod -> github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20200401082031-e946c8c39989.mod mirror://goproxy//github.com/securego/gosec/v2/@v/v2.3.0.mod -> github.com%2Fsecurego%2Fgosec%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20180427012116-c95755e4bcd7.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20190901111213-e4ec7b275ada.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20190901111213-e4ec7b275ada.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.18.12+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.18.12+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.18.12+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.18.12+incompatible.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.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.5.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.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/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/go-aws-auth/@v/v0.0.0-20180515143844-0c1422d1fdb9.mod -> github.com%2Fsmartystreets%2Fgo-aws-auth%2F@v%2Fv0.0.0-20180515143844-0c1422d1fdb9.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/smartystreets/gunit/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fgunit%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.5.1.mod -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.5.3.mod -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.2.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.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.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.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/v0.0.0-20180109140146-7c0cea34c8ec.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.0.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.6.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.6.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/storageos/go-api/@v/v0.0.0-20180912212459-343b3eff91fc.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.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/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/tdakkota/asciicheck/@v/v0.0.0-20200416190851-d7f85be797a2.mod -> github.com%2Ftdakkota%2Fasciicheck%2F@v%2Fv0.0.0-20200416190851-d7f85be797a2.mod mirror://goproxy//github.com/tdakkota/asciicheck/@v/v0.0.0-20200416200610-e657995f937b.mod -> github.com%2Ftdakkota%2Fasciicheck%2F@v%2Fv0.0.0-20200416200610-e657995f937b.mod mirror://goproxy//github.com/tetafro/godot/@v/v0.3.7.mod -> github.com%2Ftetafro%2Fgodot%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/tetafro/godot/@v/v0.4.2.mod -> github.com%2Ftetafro%2Fgodot%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.mod -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20190721030226-87058b9bfcec.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20190930140734-f7f2e9bca95e.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190930140734-f7f2e9bca95e.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20200424151742-cb6215831a94.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20200424151742-cb6215831a94.mod mirror://goproxy//github.com/tj/assert/@v/v0.0.0-20171129193455-018094318fb0.mod -> github.com%2Ftj%2Fassert%2F@v%2Fv0.0.0-20171129193455-018094318fb0.mod mirror://goproxy//github.com/tj/go-elastic/@v/v0.0.0-20171221160941-36157cbbebc2.mod -> github.com%2Ftj%2Fgo-elastic%2F@v%2Fv0.0.0-20171221160941-36157cbbebc2.mod mirror://goproxy//github.com/tj/go-kinesis/@v/v0.0.0-20171128231115-08b17f58cb1b.mod -> github.com%2Ftj%2Fgo-kinesis%2F@v%2Fv0.0.0-20171128231115-08b17f58cb1b.mod mirror://goproxy//github.com/tj/go-spin/@v/v1.1.0.mod -> github.com%2Ftj%2Fgo-spin%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tommy-muehle/go-mnd/@v/v1.1.1.mod -> github.com%2Ftommy-muehle%2Fgo-mnd%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/tommy-muehle/go-mnd/@v/v1.3.1-0.20200224220436-e6f9a994e8fa.mod -> github.com%2Ftommy-muehle%2Fgo-mnd%2F@v%2Fv1.3.1-0.20200224220436-e6f9a994e8fa.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.5.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.5.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.1.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.2.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ultraware/whitespace/@v/v0.0.4.mod -> github.com%2Fultraware%2Fwhitespace%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/uudashr/gocognit/@v/v1.0.1.mod -> github.com%2Fuudashr%2Fgocognit%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.zip -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasthttp/@v/v1.2.0.mod -> github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/valyala/quicktemplate/@v/v1.1.1.mod -> github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/valyala/quicktemplate/@v/v1.2.0.mod -> github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.mod -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod mirror://goproxy//github.com/vdemeester/k8s-pkg-credentialprovider/@v/v1.17.4.mod -> github.com%2Fvdemeester%2Fk8s-pkg-credentialprovider%2F@v%2Fv1.17.4.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20171111001504-be1fbeda1936.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20171111001504-be1fbeda1936.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20171111001504-be1fbeda1936.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20171111001504-be1fbeda1936.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.31.0.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.31.0.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.32.0.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.32.0.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.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.zip 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/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/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.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/zchee/go-vmnet/@v/v0.0.0-20161021174912-97ebf9174097.zip -> github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.zip mirror://goproxy//github.com/zchee/go-vmnet/@v/v0.0.0-20161021174912-97ebf9174097.mod -> github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.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.15.0.mod -> go.opencensus.io%2F@v%2Fv0.15.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.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.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//gocloud.dev/@v/v0.19.0.mod -> gocloud.dev%2F@v%2Fv0.19.0.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190927031335-2835ba2e683f.zip -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.zip mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190927031335-2835ba2e683f.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180426230345-b49d69b5da94.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180426230345-b49d69b5da94.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-20190123085648-057139ce5d2b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190123085648-057139ce5d2b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20190424203555-c05e17bb3b2d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190424203555-c05e17bb3b2d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20190820162420-60c769a6c586.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.zip mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170915142106-8351a756f30f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170915142106-8351a756f30f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180911220305-26e67e76b6c3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20181102091132-c10e9556a7bc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181102091132-c10e9556a7bc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190502183928-7f726cade0ab.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190502183928-7f726cade0ab.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.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/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-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20171026204733-164713f0dfce.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190122071731-054c452bb702.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190122071731-054c452bb702.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190124100055-b90733256f2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190124100055-b90733256f2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502175342-a43fa875dd82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190620070143-6f217b454f45.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190620070143-6f217b454f45.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915090833-1cbadb444a80.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915090833-1cbadb444a80.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20170915040203-e531a2a1c15f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20170915040203-e531a2a1c15f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181117154741-2ddaf7f79a09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181117154741-2ddaf7f79a09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190110163146-51295c7ec13a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190110163146-51295c7ec13a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190121143147-24cd39ecf745.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190121143147-24cd39ecf745.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190122202912-9c309ee22fab.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190122202912-9c309ee22fab.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190221204921-83362c3779f5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190221204921-83362c3779f5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311215038-5c2858a9cfe5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311215038-5c2858a9cfe5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190322203728-c1a832b0ad89.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190322203728-c1a832b0ad89.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190422233926-fe54fb35175b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190521203540-521d6ed310dd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190521203540-521d6ed310dd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190706070813-72ffa07ba3db.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190706070813-72ffa07ba3db.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190719005602-e377ae9d6386.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190719005602-e377ae9d6386.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-20190909030654-5b82db07426d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190909030654-5b82db07426d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190910044552-dd2b5c81c578.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190910044552-dd2b5c81c578.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113232020-e2727e816f5a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113232020-e2727e816f5a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200102140908-9497f49d5709.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200102140908-9497f49d5709.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204192400-7124308813f3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204192400-7124308813f3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200324003944-a576cf524670.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200324003944-a576cf524670.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331202046-9d5940d49312.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331202046-9d5940d49312.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200414032229-332987a829c3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200414032229-332987a829c3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200422022333-3d57cf2e726e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200422022333-3d57cf2e726e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200426102838-f3a5411a4c3b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200426102838-f3a5411a4c3b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200502202811-ed308ab3e770.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200502202811-ed308ab3e770.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200527183253-8e7acdbce89d.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200527183253-8e7acdbce89d.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200527183253-8e7acdbce89d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200527183253-8e7acdbce89d.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.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip 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//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.6.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.6.0.mod mirror://goproxy//google.golang.org/api/@v/v0.6.1-0.20190607001116-5213b8090861.mod -> google.golang.org%2Fapi%2F@v%2Fv0.6.1-0.20190607001116-5213b8090861.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.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.25.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.25.0.zip mirror://goproxy//google.golang.org/api/@v/v0.25.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.25.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.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190620144150-6af8c5fc6601.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190620144150-6af8c5fc6601.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200527145253-8367513e4ece.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200527145253-8367513e4ece.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200527145253-8367513e4ece.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200527145253-8367513e4ece.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.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.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.zip mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.56.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.56.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.56.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.56.0.mod mirror://goproxy//gopkg.in/mcuadros/go-syslog.v2/@v/v2.2.1.mod -> gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.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.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gotest.tools/@v/v2.1.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/gotestsum/@v/v0.3.5.mod -> gotest.tools%2Fgotestsum%2F@v%2Fv0.3.5.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-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.2.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//k8s.io/api/@v/v0.17.3.zip -> k8s.io%2Fapi%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/api/@v/v0.17.3.mod -> k8s.io%2Fapi%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.3.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.3.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.17.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.17.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apiserver/@v/v0.17.3.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/apiserver/@v/v0.17.3.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.17.3.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.17.3.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/client-go/@v/v0.17.3.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/client-go/@v/v0.17.3.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cloud-provider/@v/v0.17.3.mod -> k8s.io%2Fcloud-provider%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.17.3.zip -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.17.3.mod -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/code-generator/@v/v0.17.3.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/component-base/@v/v0.17.3.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/component-base/@v/v0.17.3.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cri-api/@v/v0.17.3.zip -> k8s.io%2Fcri-api%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/cri-api/@v/v0.17.3.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/csi-translation-lib/@v/v0.17.3.mod -> k8s.io%2Fcsi-translation-lib%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190822140433-26a664648505.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190822140433-26a664648505.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.mod -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.3.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.3.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//k8s.io/kube-aggregator/@v/v0.17.3.mod -> k8s.io%2Fkube-aggregator%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-controller-manager/@v/v0.17.3.mod -> k8s.io%2Fkube-controller-manager%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//k8s.io/kube-proxy/@v/v0.17.3.zip -> k8s.io%2Fkube-proxy%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/kube-proxy/@v/v0.17.3.mod -> k8s.io%2Fkube-proxy%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-scheduler/@v/v0.17.3.mod -> k8s.io%2Fkube-scheduler%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubectl/@v/v0.17.3.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/kubectl/@v/v0.17.3.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubelet/@v/v0.17.3.zip -> k8s.io%2Fkubelet%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/kubelet/@v/v0.17.3.mod -> k8s.io%2Fkubelet%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.18.5.zip -> k8s.io%2Fkubernetes%2F@v%2Fv1.18.5.zip mirror://goproxy//k8s.io/kubernetes/@v/v1.18.5.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.18.5.mod mirror://goproxy//k8s.io/legacy-cloud-providers/@v/v0.17.3.mod -> k8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/metrics/@v/v0.17.3.zip -> k8s.io%2Fmetrics%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/metrics/@v/v0.17.3.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/repo-infra/@v/v0.0.1-alpha.1.mod -> k8s.io%2Frepo-infra%2F@v%2Fv0.0.1-alpha.1.mod mirror://goproxy//k8s.io/sample-apiserver/@v/v0.17.3.mod -> k8s.io%2Fsample-apiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/system-validators/@v/v1.0.4.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.0.4.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200124190032-861946025e34.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200124190032-861946025e34.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//mvdan.cc/interfacer/@v/v0.0.0-20180901003855-c20040233aed.mod -> mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod mirror://goproxy//mvdan.cc/lint/@v/v0.0.0-20170908181259-adc824a0674b.mod -> mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20190209190245-fbb59629db34.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190209190245-fbb59629db34.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20190720180237-d51796306d8f.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190720180237-d51796306d8f.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20200501210554-b37ab49443f7.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20200501210554-b37ab49443f7.mod mirror://goproxy//pack.ag/amqp/@v/v0.11.2.mod -> pack.ag%2Famqp%2F@v%2Fv0.11.2.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/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/sig-storage-lib-external-provisioner/@v/v4.0.0+incompatible.zip -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2F@v%2Fv4.0.0+incompatible.zip mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/@v/v4.0.0+incompatible.mod -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2F@v%2Fv4.0.0+incompatible.mod mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/v5/@v/v5.0.0.zip -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/v5/@v/v5.0.0.mod -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v1.0.1-0.20191108220359-b1b620dd3f06.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v1.0.0.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv1.0.0.mod mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.zip -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.zip mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.mod -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0cc27433ffb5f9d920db3691c9fba790
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.17.1 b/metadata/md5-cache/sys-cluster/minikube-1.17.1
index 003d22bd4126..b34d9ede1bf6 100644
--- a/metadata/md5-cache/sys-cluster/minikube-1.17.1
+++ b/metadata/md5-cache/sys-cluster/minikube-1.17.1
@@ -11,5 +11,5 @@ RDEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v1.17.1.tar.gz -> minikube-1.17.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//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.61.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.61.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.61.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.61.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.zip -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.zip mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.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/v35.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv35.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v38.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv38.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v42.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv42.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v42.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv42.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.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.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!data!dog/sketches-go/@v/v0.0.1.mod -> github.com%2F!data!dog%2Fsketches-go%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20190822182118-27a4ced34534.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20190822182118-27a4ced34534.mod mirror://goproxy//github.com/!google!cloud!platform/opentelemetry-operations-go/exporter/trace/@v/v0.13.0.zip -> github.com%2F!google!cloud!platform%2Fopentelemetry-operations-go%2Fexporter%2Ftrace%2F@v%2Fv0.13.0.zip mirror://goproxy//github.com/!google!cloud!platform/opentelemetry-operations-go/exporter/trace/@v/v0.13.0.mod -> github.com%2F!google!cloud!platform%2Fopentelemetry-operations-go%2Fexporter%2Ftrace%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.0.0-20190417211021-672e52e9209d.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.0.0-20190417211021-672e52e9209d.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/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.zip -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.zip mirror://goproxy//github.com/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.mod -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.0.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.1.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!parallels/docker-machine-parallels/v2/@v/v2.0.1.zip -> github.com%2F!parallels%2Fdocker-machine-parallels%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/!parallels/docker-machine-parallels/v2/@v/v2.0.1.mod -> github.com%2F!parallels%2Fdocker-machine-parallels%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.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.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/!vivid!cortex/ewma/@v/v1.1.1.zip -> github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!vivid!cortex/ewma/@v/v1.1.1.mod -> github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!vivid!cortex/godaemon/@v/v0.0.0-20201030160542-15e3f4925a21.zip -> github.com%2F!vivid!cortex%2Fgodaemon%2F@v%2Fv0.0.0-20201030160542-15e3f4925a21.zip mirror://goproxy//github.com/!vivid!cortex/godaemon/@v/v0.0.0-20201030160542-15e3f4925a21.mod -> github.com%2F!vivid!cortex%2Fgodaemon%2F@v%2Fv0.0.0-20201030160542-15e3f4925a21.mod mirror://goproxy//github.com/afbjorklund/go-containerregistry/@v/v0.1.2-0.20210101161202-de47504a564f.zip -> github.com%2Fafbjorklund%2Fgo-containerregistry%2F@v%2Fv0.1.2-0.20210101161202-de47504a564f.zip mirror://goproxy//github.com/afbjorklund/go-containerregistry/@v/v0.1.2-0.20210101161202-de47504a564f.mod -> github.com%2Fafbjorklund%2Fgo-containerregistry%2F@v%2Fv0.1.2-0.20210101161202-de47504a564f.mod mirror://goproxy//github.com/afbjorklund/go-getter/@v/v1.4.3-0.20201119203610-3f740b1eaf7d.zip -> github.com%2Fafbjorklund%2Fgo-getter%2F@v%2Fv1.4.3-0.20201119203610-3f740b1eaf7d.zip mirror://goproxy//github.com/afbjorklund/go-getter/@v/v1.4.3-0.20201119203610-3f740b1eaf7d.mod -> github.com%2Fafbjorklund%2Fgo-getter%2F@v%2Fv1.4.3-0.20201119203610-3f740b1eaf7d.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alonyb/spinner/@v/v1.12.1.zip -> github.com%2Falonyb%2Fspinner%2F@v%2Fv1.12.1.zip mirror://goproxy//github.com/alonyb/spinner/@v/v1.12.1.mod -> github.com%2Falonyb%2Fspinner%2F@v%2Fv1.12.1.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/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.78.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.16.26.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.16.26.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.18.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.28.2.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.28.2.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.6.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.6.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.6.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.6.mod mirror://goproxy//github.com/bazelbuild/bazel-gazelle/@v/v0.18.2.mod -> github.com%2Fbazelbuild%2Fbazel-gazelle%2F@v%2Fv0.18.2.mod mirror://goproxy//github.com/bazelbuild/bazel-gazelle/@v/v0.19.1-0.20191105222053-70208cbdc798.mod -> github.com%2Fbazelbuild%2Fbazel-gazelle%2F@v%2Fv0.19.1-0.20191105222053-70208cbdc798.mod mirror://goproxy//github.com/bazelbuild/buildtools/@v/v0.0.0-20190731111112-f720930ceb60.mod -> github.com%2Fbazelbuild%2Fbuildtools%2F@v%2Fv0.0.0-20190731111112-f720930ceb60.mod mirror://goproxy//github.com/bazelbuild/buildtools/@v/v0.0.0-20190917191645-69366ca98f89.mod -> github.com%2Fbazelbuild%2Fbuildtools%2F@v%2Fv0.0.0-20190917191645-69366ca98f89.mod mirror://goproxy//github.com/bazelbuild/rules_go/@v/v0.0.0-20190719190356-6dae44dc5cab.mod -> github.com%2Fbazelbuild%2Frules_go%2F@v%2Fv0.0.0-20190719190356-6dae44dc5cab.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.zip -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.mod -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bifurcation/mint/@v/v0.0.0-20180715133206-93c51c6ce115.mod -> github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/c4milo/gotoolkit/@v/v0.0.0-20170318115440-bcc06269efa9.zip -> github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.zip mirror://goproxy//github.com/c4milo/gotoolkit/@v/v0.0.0-20170318115440-bcc06269efa9.mod -> github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.mod mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.mod -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.1.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/cenkalti/backoff/v4/@v/v4.1.0.zip -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/cenkalti/backoff/v4/@v/v4.1.0.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/prettybench/@v/v0.0.0-20150116022406-03b8cfe5406c.mod -> github.com%2Fcespare%2Fprettybench%2F@v%2Fv0.0.0-20150116022406-03b8cfe5406c.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/@v/v0.0.0-20181120144056-17b0214f6c48.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2F@v%2Fv0.0.0-20181120144056-17b0214f6c48.mod mirror://goproxy//github.com/cheekybits/genny/@v/v0.0.0-20170328200008-9127e812e1e9.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.zip -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.zip mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod mirror://goproxy//github.com/cheggaaa/pb/v3/@v/v3.0.1.zip -> github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/cheggaaa/pb/v3/@v/v3.0.1.mod -> github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20191025125908-95b36a581eed.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20191025125908-95b36a581eed.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/cloudevents/sdk-go/v2/@v/v2.1.0.zip -> github.com%2Fcloudevents%2Fsdk-go%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/cloudevents/sdk-go/v2/@v/v2.1.0.mod -> github.com%2Fcloudevents%2Fsdk-go%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/cloudfoundry-attic/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.zip -> github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip mirror://goproxy//github.com/cloudfoundry-attic/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.mod -> github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod mirror://goproxy//github.com/cloudfoundry/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.zip -> github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip mirror://goproxy//github.com/cloudfoundry/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.mod -> github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.mod -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20170925154832-84eeaae905fa.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20170925154832-84eeaae905fa.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20201208142359-180525291bb7.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20201208142359-180525291bb7.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20201208142359-180525291bb7.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20201208142359-180525291bb7.mod mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.0.0-20201217071531-2b97b583765b.zip -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.0.0-20201217071531-2b97b583765b.zip mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.0.0-20201217071531-2b97b583765b.mod -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.0.0-20201217071531-2b97b583765b.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190228175220-2a93cfde8c20.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190228175220-2a93cfde8c20.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.6.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-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-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/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/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20191017083524-a8ff7f821017.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200303162255-7d407207c304.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200303162255-7d407207c304.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v0.7.3-0.20190327010347-be7ac8be2ae0.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv0.7.3-0.20190327010347-be7ac8be2ae0.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20190924003213-a8608b5b67c7.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20190924003213-a8608b5b67c7.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.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/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20190421051319-9d40249d3c2f.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20190421051319-9d40249d3c2f.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod mirror://goproxy//github.com/elazarl/goproxy/ext/@v/v0.0.0-20190421051319-9d40249d3c2f.zip -> github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip mirror://goproxy//github.com/elazarl/goproxy/ext/@v/v0.0.0-20190421051319-9d40249d3c2f.mod -> github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.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/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.6.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.6.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/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-acme/lego/@v/v2.5.0+incompatible.mod -> github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.3.5-0.20190526074819-1df300866540.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.3.5-0.20190526074819-1df300866540.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-lintpack/lintpack/@v/v0.5.2.mod -> github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.3.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.3.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/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.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.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/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.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-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-toolsmith/astcast/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astcopy/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v0.0.0-20180903214952-dcb477bfacd6.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv0.0.0-20180903214952-dcb477bfacd6.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v0.0.0-20180903215011-8f8ee99c3086.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv0.0.0-20180903215011-8f8ee99c3086.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astinfo/@v/v0.0.0-20180906194353-9809ff7efb21.mod -> github.com%2Fgo-toolsmith%2Fastinfo%2F@v%2Fv0.0.0-20180906194353-9809ff7efb21.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v0.0.0-20180903215135-0af7e3c24f30.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv0.0.0-20180903215135-0af7e3c24f30.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v0.0.0-20181119091011-e9e65178eee8.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv0.0.0-20181119091011-e9e65178eee8.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/strparse/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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-20181101234600-2ff6f7ffd60f.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20181101234600-2ff6f7ffd60f.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.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-collections/collections/@v/v0.0.0-20130729185459-604e922904d3.zip -> github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.zip mirror://goproxy//github.com/golang-collections/collections/@v/v0.0.0-20130729185459-604e922904d3.mod -> github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.0.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golangci/check/@v/v0.0.0-20180506172741-cfe4005ccda2.mod -> github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod mirror://goproxy//github.com/golangci/dupl/@v/v0.0.0-20180902072040-3e9179ac440a.mod -> github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod mirror://goproxy//github.com/golangci/errcheck/@v/v0.0.0-20181223084120-ef45e06d44b6.mod -> github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod mirror://goproxy//github.com/golangci/go-misc/@v/v0.0.0-20180628070357-927a3d87b613.mod -> github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.mod mirror://goproxy//github.com/golangci/go-tools/@v/v0.0.0-20190318055746-e32c54105b7c.mod -> github.com%2Fgolangci%2Fgo-tools%2F@v%2Fv0.0.0-20190318055746-e32c54105b7c.mod mirror://goproxy//github.com/golangci/goconst/@v/v0.0.0-20180610141641-041c5f2b40f3.mod -> github.com%2Fgolangci%2Fgoconst%2F@v%2Fv0.0.0-20180610141641-041c5f2b40f3.mod mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528134321-2becd97e67ee.mod -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528134321-2becd97e67ee.mod mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20181222123516-0b8337e80d98.mod -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20181222123516-0b8337e80d98.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.18.0.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.18.0.mod mirror://goproxy//github.com/golangci/gosec/@v/v0.0.0-20190211064107-66fb7fc33547.mod -> github.com%2Fgolangci%2Fgosec%2F@v%2Fv0.0.0-20190211064107-66fb7fc33547.mod mirror://goproxy//github.com/golangci/ineffassign/@v/v0.0.0-20190609212857-42439a7714cc.mod -> github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.mod mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20190420132249-ee948d087217.mod -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20190420132249-ee948d087217.mod mirror://goproxy//github.com/golangci/maligned/@v/v0.0.0-20180506175553-b1d89398deca.mod -> github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.mod mirror://goproxy//github.com/golangci/misspell/@v/v0.0.0-20180809174111-950f5d19e770.mod -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.0.0-20180809174111-950f5d19e770.mod mirror://goproxy//github.com/golangci/prealloc/@v/v0.0.0-20180630174525-215b22d4de21.mod -> github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180526074752-d9c87f5ffaf0.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180526074752-d9c87f5ffaf0.mod mirror://goproxy//github.com/golangci/unconvert/@v/v0.0.0-20180507085042-28b1c447d1f4.mod -> github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod mirror://goproxy//github.com/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.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.35.0.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.35.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-github/v32/@v/v32.1.0.zip -> github.com%2Fgoogle%2Fgo-github%2Fv32%2F@v%2Fv32.1.0.zip mirror://goproxy//github.com/google/go-github/v32/@v/v32.1.0.mod -> github.com%2Fgoogle%2Fgo-github%2Fv32%2F@v%2Fv32.1.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/slowjam/@v/v0.0.0-20200530021616-df27e642fe7b.zip -> github.com%2Fgoogle%2Fslowjam%2F@v%2Fv0.0.0-20200530021616-df27e642fe7b.zip mirror://goproxy//github.com/google/slowjam/@v/v0.0.0-20200530021616-df27e642fe7b.mod -> github.com%2Fgoogle%2Fslowjam%2F@v%2Fv0.0.0-20200530021616-df27e642fe7b.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.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.2.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/googleinterns/cloud-operations-api-mock/@v/v0.0.0-20200709193332-a1e58c29bdd3.zip -> github.com%2Fgoogleinterns%2Fcloud-operations-api-mock%2F@v%2Fv0.0.0-20200709193332-a1e58c29bdd3.zip mirror://goproxy//github.com/googleinterns/cloud-operations-api-mock/@v/v0.0.0-20200709193332-a1e58c29bdd3.mod -> github.com%2Fgoogleinterns%2Fcloud-operations-api-mock%2F@v%2Fv0.0.0-20200709193332-a1e58c29bdd3.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.0.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/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.0-20190318220348-4088753ea4d3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-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.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.0.0-20180201235237-0fb14efe8c47.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20180404174102-ef8a98b0bbce.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hooklift/assert/@v/v0.0.0-20170704181755-9d1defd6d214.zip -> github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.zip mirror://goproxy//github.com/hooklift/assert/@v/v0.0.0-20170704181755-9d1defd6d214.mod -> github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.mod mirror://goproxy//github.com/hooklift/iso9660/@v/v0.0.0-20170318115843-1cf07e5970d8.zip -> github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.zip mirror://goproxy//github.com/hooklift/iso9660/@v/v0.0.0-20170318115843-1cf07e5970d8.mod -> github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/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/intel-go/cpuid/@v/v0.0.0-20181003105527-1a4a6f06a1c6.zip -> github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.zip mirror://goproxy//github.com/intel-go/cpuid/@v/v0.0.0-20181003105527-1a4a6f06a1c6.mod -> github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/jimstudt/http-authentication/@v/v0.0.0-20140401203705-3eca13d6893a.mod -> github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/joefitzgerald/rainbow-reporter/@v/v0.1.0.mod -> github.com%2Fjoefitzgerald%2Frainbow-reporter%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/johanneswuerbach/nfsexports/@v/v0.0.0-20200318065542-c48c3734757f.zip -> github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.zip mirror://goproxy//github.com/johanneswuerbach/nfsexports/@v/v0.0.0-20200318065542-c48c3734757f.mod -> github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.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/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/clock/@v/v0.0.0-20190205081909-9c5c9712527c.zip -> github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.zip mirror://goproxy//github.com/juju/clock/@v/v0.0.0-20190205081909-9c5c9712527c.mod -> github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.mod mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20190806202954-0232dcc7464d.zip -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.zip mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20190806202954-0232dcc7464d.mod -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.mod mirror://goproxy//github.com/juju/fslock/@v/v0.0.0-20160525022230-4d5c94c67b4b.zip -> github.com%2Fjuju%2Ffslock%2F@v%2Fv0.0.0-20160525022230-4d5c94c67b4b.zip mirror://goproxy//github.com/juju/fslock/@v/v0.0.0-20160525022230-4d5c94c67b4b.mod -> github.com%2Fjuju%2Ffslock%2F@v%2Fv0.0.0-20160525022230-4d5c94c67b4b.mod mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.zip -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.zip mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.mod -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.mod mirror://goproxy//github.com/juju/mutex/@v/v0.0.0-20180619145857-d21b13acf4bf.zip -> github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.zip mirror://goproxy//github.com/juju/mutex/@v/v0.0.0-20180619145857-d21b13acf4bf.mod -> github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.mod mirror://goproxy//github.com/juju/retry/@v/v0.0.0-20180821225755-9058e192b216.zip -> github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.zip mirror://goproxy//github.com/juju/retry/@v/v0.0.0-20180821225755-9058e192b216.mod -> github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.mod mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190723135506-ce30eb24acd2.zip -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.zip mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190723135506-ce30eb24acd2.mod -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.mod mirror://goproxy//github.com/juju/utils/@v/v0.0.0-20180820210520-bf9cc5bdd62d.zip -> github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.zip mirror://goproxy//github.com/juju/utils/@v/v0.0.0-20180820210520-bf9cc5bdd62d.mod -> github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.mod mirror://goproxy//github.com/juju/version/@v/v0.0.0-20180108022336-b64dbd566305.zip -> github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.zip mirror://goproxy//github.com/juju/version/@v/v0.0.0-20180108022336-b64dbd566305.mod -> github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.7.5.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v0.0.0-20161130080628-0de1eaf82fa3.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v0.0.0-20180405133222-e7e905edc00e.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/libvirt/libvirt-go/@v/v3.4.0+incompatible.zip -> github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.4.0+incompatible.zip mirror://goproxy//github.com/libvirt/libvirt-go/@v/v3.4.0+incompatible.mod -> github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.4.0+incompatible.mod 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/tracecontext.go/@v/v0.0.0-20181129014701-1757c391b1ac.zip -> github.com%2Flightstep%2Ftracecontext.go%2F@v%2Fv0.0.0-20181129014701-1757c391b1ac.zip mirror://goproxy//github.com/lightstep/tracecontext.go/@v/v0.0.0-20181129014701-1757c391b1ac.mod -> github.com%2Flightstep%2Ftracecontext.go%2F@v%2Fv0.0.0-20181129014701-1757c391b1ac.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/logrusorgru/aurora/@v/v0.0.0-20181002194514-a7b3b318ed4e.mod -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/lucas-clemente/aes12/@v/v0.0.0-20171027163421-cd47fb39b79f.mod -> github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod mirror://goproxy//github.com/lucas-clemente/quic-clients/@v/v0.1.0.mod -> github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.10.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/lucas-clemente/quic-go-certificates/@v/v0.0.0-20160823095156-d2f86524cced.mod -> github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod mirror://goproxy//github.com/machine-drivers/docker-machine-driver-vmware/@v/v0.1.1.zip -> github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/machine-drivers/docker-machine-driver-vmware/@v/v0.1.1.mod -> github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/machine-drivers/machine/@v/v0.7.1-0.20200810185219-7d42fed1b770.zip -> github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20200810185219-7d42fed1b770.zip mirror://goproxy//github.com/machine-drivers/machine/@v/v0.7.1-0.20200810185219-7d42fed1b770.mod -> github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20200810185219-7d42fed1b770.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.7.6.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.2.3.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.0.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.5.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/mattn/goveralls/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.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/maxbrunsfeld/counterfeiter/v6/@v/v6.2.2.mod -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.mod mirror://goproxy//github.com/mesos/mesos-go/@v/v0.0.9.mod -> github.com%2Fmesos%2Fmesos-go%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mholt/certmagic/@v/v0.6.2-0.20190624175158-6a42ef9fe8c2.mod -> github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.3.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.27.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.27.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.1+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20170309133038-4fdf99ab2936.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20190716172923-621e5597135b.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20190716172923-621e5597135b.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20190716172923-621e5597135b.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20190716172923-621e5597135b.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.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/v0.0.0-20180220230111-00c29f56e238.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/moby/hyperkit/@v/v0.0.0-20171020124204-a12cd7250bcd.zip -> github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20171020124204-a12cd7250bcd.zip mirror://goproxy//github.com/moby/hyperkit/@v/v0.0.0-20171020124204-a12cd7250bcd.mod -> github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20171020124204-a12cd7250bcd.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20180409132520-8791a200eb40.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20180409132520-8791a200eb40.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20171103030105-7d4729fb3618.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.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/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20160627004424-a22cb81b2ecd.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20160627004424-a22cb81b2ecd.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20171102151520-eafdab6b0663.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20171102151520-eafdab6b0663.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.2.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/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.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc10.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc10.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc10.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc10.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.3.1-0.20190929122143-5215b1806f52.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.1-0.20190929122143-5215b1806f52.mod mirror://goproxy//github.com/otiai10/copy/@v/v1.0.2.zip -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/otiai10/copy/@v/v1.0.2.mod -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.zip -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.zip mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.zip -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.zip -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.1.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.zip -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.zip mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.mod -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20160118053552-9302be274faa.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20160118053552-9302be274faa.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v0.0.0-20161223203901-3a8809bd8a80.zip -> github.com%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.zip mirror://goproxy//github.com/pkg/profile/@v/v0.0.0-20161223203901-3a8809bd8a80.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/pquerna/ffjson/@v/v0.0.0-20180717144149-af8b230fcd20.mod -> github.com%2Fpquerna%2Fffjson%2F@v%2Fv0.0.0-20180717144149-af8b230fcd20.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quasilyte/go-consistent/@v/v0.0.0-20190521200055-c6f3937de18c.mod -> github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.2.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.mod -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.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-charset/@v/v0.0.0-20180617210344-2471d30d28b4.mod -> github.com%2Frogpeppe%2Fgo-charset%2F@v%2Fv0.0.0-20180617210344-2471d30d28b4.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/rubiojr/go-vhd/@v/v0.0.0-20160810183302-0bfd3b39853c.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20160810183302-0bfd3b39853c.mod mirror://goproxy//github.com/russross/blackfriday/@v/v0.0.0-20170610170232-067529f716f4.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.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/ryanuber/go-glob/@v/v0.0.0-20170128012129-256dc444b735.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv0.0.0-20170128012129-256dc444b735.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sayboras/dockerclient/@v/v1.0.0.zip -> github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sayboras/dockerclient/@v/v1.0.0.mod -> github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sclevine/spec/@v/v1.2.0.mod -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20180427012116-c95755e4bcd7.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20180427012116-c95755e4bcd7.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.12.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.12.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.12.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.12.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.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.5.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.5.1.mod -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.2.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.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/v0.0.0-20180109140146-7c0cea34c8ec.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.0.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/storageos/go-api/@v/v0.0.0-20180912212459-343b3eff91fc.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.mod -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20190721030226-87058b9bfcec.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.mod mirror://goproxy//github.com/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/ulikunitz/xz/@v/v0.5.8.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.8.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.1.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.2.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.2.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.4.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.zip -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasthttp/@v/v1.2.0.mod -> github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/valyala/quicktemplate/@v/v1.1.1.mod -> github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.mod -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod mirror://goproxy//github.com/vdemeester/k8s-pkg-credentialprovider/@v/v1.18.1-0.20201019120933-f1d16962a4db.mod -> github.com%2Fvdemeester%2Fk8s-pkg-credentialprovider%2F@v%2Fv1.18.1-0.20201019120933-f1d16962a4db.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20171111001504-be1fbeda1936.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20171111001504-be1fbeda1936.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/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.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/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.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/zchee/go-vmnet/@v/v0.0.0-20161021174912-97ebf9174097.zip -> github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.zip mirror://goproxy//github.com/zchee/go-vmnet/@v/v0.0.0-20161021174912-97ebf9174097.mod -> github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.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/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.zip -> go.opencensus.io%2F@v%2Fv0.22.4.zip mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.13.0.zip -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.13.0.zip mirror://goproxy//go.opentelemetry.io/otel/@v/v0.13.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.13.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.13.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.13.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.13.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.13.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190927031335-2835ba2e683f.zip -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.zip mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190927031335-2835ba2e683f.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180426230345-b49d69b5da94.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180426230345-b49d69b5da94.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-20190123085648-057139ce5d2b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190123085648-057139ce5d2b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20190424203555-c05e17bb3b2d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190424203555-c05e17bb3b2d.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-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170915142106-8351a756f30f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170915142106-8351a756f30f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180911220305-26e67e76b6c3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20181102091132-c10e9556a7bc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181102091132-c10e9556a7bc.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-20190328230028-74de082e2cca.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190502183928-7f726cade0ab.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190502183928-7f726cade0ab.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20171026204733-164713f0dfce.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190122071731-054c452bb702.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190122071731-054c452bb702.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190124100055-b90733256f2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190124100055-b90733256f2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502175342-a43fa875dd82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915090833-1cbadb444a80.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915090833-1cbadb444a80.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20170915040203-e531a2a1c15f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20170915040203-e531a2a1c15f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181117154741-2ddaf7f79a09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181117154741-2ddaf7f79a09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190110163146-51295c7ec13a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190110163146-51295c7ec13a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190121143147-24cd39ecf745.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190121143147-24cd39ecf745.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190122202912-9c309ee22fab.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190122202912-9c309ee22fab.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311215038-5c2858a9cfe5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311215038-5c2858a9cfe5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190322203728-c1a832b0ad89.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190322203728-c1a832b0ad89.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190521203540-521d6ed310dd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190521203540-521d6ed310dd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190706070813-72ffa07ba3db.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190706070813-72ffa07ba3db.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190909030654-5b82db07426d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190909030654-5b82db07426d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200701151220-7cb253f4c4f8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200701151220-7cb253f4c4f8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200713011307-fd294ab11aed.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200713011307-fd294ab11aed.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200916195026-c9a70fc28ce3.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200916195026-c9a70fc28ce3.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200916195026-c9a70fc28ce3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200916195026-c9a70fc28ce3.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.6.1-0.20190607001116-5213b8090861.mod -> google.golang.org%2Fapi%2F@v%2Fv0.6.1-0.20190607001116-5213b8090861.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.zip mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200527145253-8367513e4ece.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200527145253-8367513e4ece.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200605102947-12044bf5ea91.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200605102947-12044bf5ea91.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200711021454-869866162049.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200711021454-869866162049.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200715011427-11fb19a81f2c.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200715011427-11fb19a81f2c.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200715011427-11fb19a81f2c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200715011427-11fb19a81f2c.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.32.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.32.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/mcuadros/go-syslog.v2/@v/v2.2.1.mod -> gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.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.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gotest.tools/@v/v2.1.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/gotestsum/@v/v0.3.5.mod -> gotest.tools%2Fgotestsum%2F@v%2Fv0.3.5.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-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.2.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//k8s.io/api/@v/v0.17.3.zip -> k8s.io%2Fapi%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/api/@v/v0.17.3.mod -> k8s.io%2Fapi%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.3.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.17.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.17.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apiserver/@v/v0.17.3.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.17.3.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/client-go/@v/v0.17.3.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/client-go/@v/v0.17.3.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cloud-provider/@v/v0.17.3.mod -> k8s.io%2Fcloud-provider%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.17.3.zip -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.17.3.mod -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/code-generator/@v/v0.17.3.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/component-base/@v/v0.17.3.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/component-base/@v/v0.17.3.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cri-api/@v/v0.17.3.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/csi-translation-lib/@v/v0.17.3.mod -> k8s.io%2Fcsi-translation-lib%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190822140433-26a664648505.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.mod -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/kube-aggregator/@v/v0.17.3.mod -> k8s.io%2Fkube-aggregator%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-controller-manager/@v/v0.17.3.mod -> k8s.io%2Fkube-controller-manager%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//k8s.io/kube-proxy/@v/v0.17.3.mod -> k8s.io%2Fkube-proxy%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-scheduler/@v/v0.17.3.mod -> k8s.io%2Fkube-scheduler%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubectl/@v/v0.17.3.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/kubectl/@v/v0.17.3.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubelet/@v/v0.17.3.mod -> k8s.io%2Fkubelet%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.18.5.zip -> k8s.io%2Fkubernetes%2F@v%2Fv1.18.5.zip mirror://goproxy//k8s.io/kubernetes/@v/v1.18.5.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.18.5.mod mirror://goproxy//k8s.io/legacy-cloud-providers/@v/v0.17.3.mod -> k8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/metrics/@v/v0.17.3.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/repo-infra/@v/v0.0.1-alpha.1.mod -> k8s.io%2Frepo-infra%2F@v%2Fv0.0.1-alpha.1.mod mirror://goproxy//k8s.io/sample-apiserver/@v/v0.17.3.mod -> k8s.io%2Fsample-apiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/system-validators/@v/v1.0.4.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.0.4.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200124190032-861946025e34.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200124190032-861946025e34.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//mvdan.cc/interfacer/@v/v0.0.0-20180901003855-c20040233aed.mod -> mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod mirror://goproxy//mvdan.cc/lint/@v/v0.0.0-20170908181259-adc824a0674b.mod -> mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20190209190245-fbb59629db34.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190209190245-fbb59629db34.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.mod -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/@v/v4.0.0+incompatible.zip -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2F@v%2Fv4.0.0+incompatible.zip mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/@v/v4.0.0+incompatible.mod -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2F@v%2Fv4.0.0+incompatible.mod mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/v5/@v/v5.0.0.zip -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/v5/@v/v5.0.0.mod -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v1.0.1-0.20191108220359-b1b620dd3f06.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.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/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.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	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=270f89585568a34dfcb8ef18c98f7bf4
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.19.0 b/metadata/md5-cache/sys-cluster/minikube-1.19.0
index 95a24ef6cf73..a48d91fd7493 100644
--- a/metadata/md5-cache/sys-cluster/minikube-1.19.0
+++ b/metadata/md5-cache/sys-cluster/minikube-1.19.0
@@ -11,5 +11,5 @@ RDEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v1.19.0.tar.gz -> minikube-1.19.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.61.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.61.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.75.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.75.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.13.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.13.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.13.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.13.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.zip -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.zip mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!delta456/box-cli-maker/v2/@v/v2.2.1.zip -> github.com%2F!delta456%2Fbox-cli-maker%2Fv2%2F@v%2Fv2.2.1.zip mirror://goproxy//github.com/!delta456/box-cli-maker/v2/@v/v2.2.1.mod -> github.com%2F!delta456%2Fbox-cli-maker%2Fv2%2F@v%2Fv2.2.1.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.mod mirror://goproxy//github.com/!google!cloud!platform/opentelemetry-operations-go/exporter/trace/@v/v0.16.0.zip -> github.com%2F!google!cloud!platform%2Fopentelemetry-operations-go%2Fexporter%2Ftrace%2F@v%2Fv0.16.0.zip mirror://goproxy//github.com/!google!cloud!platform/opentelemetry-operations-go/exporter/trace/@v/v0.16.0.mod -> github.com%2F!google!cloud!platform%2Fopentelemetry-operations-go%2Fexporter%2Ftrace%2F@v%2Fv0.16.0.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7-0.20190325164909-8abdbb8205e4.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.10-0.20200715222032-5eafd1556990.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.10-0.20200715222032-5eafd1556990.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.15.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.15.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20201218223536-d3e5debf77da.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20201218223536-d3e5debf77da.mod mirror://goproxy//github.com/!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/!parallels/docker-machine-parallels/v2/@v/v2.0.1.zip -> github.com%2F!parallels%2Fdocker-machine-parallels%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/!parallels/docker-machine-parallels/v2/@v/v2.0.1.mod -> github.com%2F!parallels%2Fdocker-machine-parallels%2Fv2%2F@v%2Fv2.0.1.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.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/!vivid!cortex/ewma/@v/v1.1.1.zip -> github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!vivid!cortex/ewma/@v/v1.1.1.mod -> github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!vivid!cortex/godaemon/@v/v0.0.0-20201030160542-15e3f4925a21.zip -> github.com%2F!vivid!cortex%2Fgodaemon%2F@v%2Fv0.0.0-20201030160542-15e3f4925a21.zip mirror://goproxy//github.com/!vivid!cortex/godaemon/@v/v0.0.0-20201030160542-15e3f4925a21.mod -> github.com%2F!vivid!cortex%2Fgodaemon%2F@v%2Fv0.0.0-20201030160542-15e3f4925a21.mod mirror://goproxy//github.com/afbjorklund/go-containerregistry/@v/v0.4.1-0.20210321165649-761f6f9626b1.zip -> github.com%2Fafbjorklund%2Fgo-containerregistry%2F@v%2Fv0.4.1-0.20210321165649-761f6f9626b1.zip mirror://goproxy//github.com/afbjorklund/go-containerregistry/@v/v0.4.1-0.20210321165649-761f6f9626b1.mod -> github.com%2Fafbjorklund%2Fgo-containerregistry%2F@v%2Fv0.4.1-0.20210321165649-761f6f9626b1.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/alonyb/spinner/@v/v1.12.7.zip -> github.com%2Falonyb%2Fspinner%2F@v%2Fv1.12.7.zip mirror://goproxy//github.com/alonyb/spinner/@v/v1.12.7.mod -> github.com%2Falonyb%2Fspinner%2F@v%2Fv1.12.7.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/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.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.15.78.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.18.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.zip -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.mod -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bifurcation/mint/@v/v0.0.0-20180715133206-93c51c6ce115.mod -> github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/c4milo/gotoolkit/@v/v0.0.0-20170318115440-bcc06269efa9.zip -> github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.zip mirror://goproxy//github.com/c4milo/gotoolkit/@v/v0.0.0-20170318115440-bcc06269efa9.mod -> github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.mod mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.mod -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.1.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/cenkalti/backoff/v4/@v/v4.1.0.zip -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/cenkalti/backoff/v4/@v/v4.1.0.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/cheekybits/genny/@v/v0.0.0-20170328200008-9127e812e1e9.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.zip -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.zip mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod mirror://goproxy//github.com/cheggaaa/pb/v3/@v/v3.0.7.zip -> github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.7.zip mirror://goproxy//github.com/cheggaaa/pb/v3/@v/v3.0.7.mod -> github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.7.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudevents/sdk-go/v2/@v/v2.3.1.zip -> github.com%2Fcloudevents%2Fsdk-go%2Fv2%2F@v%2Fv2.3.1.zip mirror://goproxy//github.com/cloudevents/sdk-go/v2/@v/v2.3.1.mod -> github.com%2Fcloudevents%2Fsdk-go%2Fv2%2F@v%2Fv2.3.1.mod mirror://goproxy//github.com/cloudfoundry-attic/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.zip -> github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip mirror://goproxy//github.com/cloudfoundry-attic/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.mod -> github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod mirror://goproxy//github.com/cloudfoundry/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.zip -> github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip mirror://goproxy//github.com/cloudfoundry/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.mod -> github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.mod -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20200908144142-dab0cbea06f4.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20200908144142-dab0cbea06f4.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190717030353-c4b9ac5c7601.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200824123100-0b889c03f102.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200824123100-0b889c03f102.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20181022165439-0650fd9eeb50.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.2.10.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.0-beta.2.0.20200729163537-40b22ef07410.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.0-beta.2.0.20200729163537-40b22ef07410.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.1.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.1.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.1.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190815185530-f2a389ac0a02.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190815185530-f2a389ac0a02.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20191127005431-f65d91d395eb.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20191127005431-f65d91d395eb.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20201208142359-180525291bb7.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20201208142359-180525291bb7.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20201208142359-180525291bb7.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20201208142359-180525291bb7.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20180307165137-3d5202aec260.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20201026212402-0724c46b320c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20201026212402-0724c46b320c.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20190911050354-e029b79d8cda.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20201007170849-eb1350a75164.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20201007170849-eb1350a75164.mod mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.4.1.zip -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.4.1.mod -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828172938-92c8520ef9f8.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20191028202541-4f1b8fe65a5c.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190911142611-5eb25027c9fd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20200918131355-0a33824f23a2.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20200918131355-0a33824f23a2.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.10.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20191017083524-a8ff7f821017.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200303162255-7d407207c304.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200303162255-7d407207c304.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20190905152932-14b96e55d84c.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20190924003213-a8608b5b67c7.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20190924003213-a8608b5b67c7.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20170721190031-9461782956ad.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20190421051319-9d40249d3c2f.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20190421051319-9d40249d3c2f.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod mirror://goproxy//github.com/elazarl/goproxy/ext/@v/v0.0.0-20190421051319-9d40249d3c2f.zip -> github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip mirror://goproxy//github.com/elazarl/goproxy/ext/@v/v0.0.0-20190421051319-9d40249d3c2f.mod -> github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.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.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/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.mod -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-acme/lego/@v/v2.5.0+incompatible.mod -> github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/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.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/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-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20151105175453-c7fdd8b5cd55.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.2.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang-collections/collections/@v/v0.0.0-20130729185459-604e922904d3.zip -> github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.zip mirror://goproxy//github.com/golang-collections/collections/@v/v0.0.0-20130729185459-604e922904d3.mod -> github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.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.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.38.8.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.38.8.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-github/v32/@v/v32.1.0.zip -> github.com%2Fgoogle%2Fgo-github%2Fv32%2F@v%2Fv32.1.0.zip mirror://goproxy//github.com/google/go-github/v32/@v/v32.1.0.mod -> github.com%2Fgoogle%2Fgo-github%2Fv32%2F@v%2Fv32.1.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201218002935-b9804c9f04c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201218002935-b9804c9f04c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/slowjam/@v/v0.0.0-20200530021616-df27e642fe7b.zip -> github.com%2Fgoogle%2Fslowjam%2F@v%2Fv0.0.0-20200530021616-df27e642fe7b.zip mirror://goproxy//github.com/google/slowjam/@v/v0.0.0-20200530021616-df27e642fe7b.mod -> github.com%2Fgoogle%2Fslowjam%2F@v%2Fv0.0.0-20200530021616-df27e642fe7b.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.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/googleinterns/cloud-operations-api-mock/@v/v0.0.0-20200709193332-a1e58c29bdd3.zip -> github.com%2Fgoogleinterns%2Fcloud-operations-api-mock%2F@v%2Fv0.0.0-20200709193332-a1e58c29bdd3.zip mirror://goproxy//github.com/googleinterns/cloud-operations-api-mock/@v/v0.0.0-20200709193332-a1e58c29bdd3.mod -> github.com%2Fgoogleinterns%2Fcloud-operations-api-mock%2F@v%2Fv0.0.0-20200709193332-a1e58c29bdd3.mod mirror://goproxy//github.com/gookit/color/@v/v1.3.6.zip -> github.com%2Fgookit%2Fcolor%2F@v%2Fv1.3.6.zip mirror://goproxy//github.com/gookit/color/@v/v1.3.6.mod -> github.com%2Fgookit%2Fcolor%2F@v%2Fv1.3.6.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.5.2.zip -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.5.2.mod -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-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-retryablehttp/@v/v0.6.8.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.8.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.8.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.8.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-safetemp/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-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.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.0.0-20180201235237-0fb14efe8c47.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.zip -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.zip mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.mod -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.mod mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hooklift/assert/@v/v0.0.0-20170704181755-9d1defd6d214.zip -> github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.zip mirror://goproxy//github.com/hooklift/assert/@v/v0.0.0-20170704181755-9d1defd6d214.mod -> github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.mod mirror://goproxy//github.com/hooklift/iso9660/@v/v0.0.0-20170318115843-1cf07e5970d8.zip -> github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.zip mirror://goproxy//github.com/hooklift/iso9660/@v/v0.0.0-20170318115843-1cf07e5970d8.mod -> github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.10.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.10.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/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/intel-go/cpuid/@v/v0.0.0-20181003105527-1a4a6f06a1c6.zip -> github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.zip mirror://goproxy//github.com/intel-go/cpuid/@v/v0.0.0-20181003105527-1a4a6f06a1c6.mod -> github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.mod mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.mod -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/jimstudt/http-authentication/@v/v0.0.0-20140401203705-3eca13d6893a.mod -> github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joefitzgerald/rainbow-reporter/@v/v0.1.0.mod -> github.com%2Fjoefitzgerald%2Frainbow-reporter%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/johanneswuerbach/nfsexports/@v/v0.0.0-20200318065542-c48c3734757f.zip -> github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.zip mirror://goproxy//github.com/johanneswuerbach/nfsexports/@v/v0.0.0-20200318065542-c48c3734757f.mod -> github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.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.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/clock/@v/v0.0.0-20190205081909-9c5c9712527c.zip -> github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.zip mirror://goproxy//github.com/juju/clock/@v/v0.0.0-20190205081909-9c5c9712527c.mod -> github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.mod mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20190806202954-0232dcc7464d.zip -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.zip mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20190806202954-0232dcc7464d.mod -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.mod mirror://goproxy//github.com/juju/fslock/@v/v0.0.0-20160525022230-4d5c94c67b4b.zip -> github.com%2Fjuju%2Ffslock%2F@v%2Fv0.0.0-20160525022230-4d5c94c67b4b.zip mirror://goproxy//github.com/juju/fslock/@v/v0.0.0-20160525022230-4d5c94c67b4b.mod -> github.com%2Fjuju%2Ffslock%2F@v%2Fv0.0.0-20160525022230-4d5c94c67b4b.mod mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.zip -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.zip mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.mod -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.mod mirror://goproxy//github.com/juju/mutex/@v/v0.0.0-20180619145857-d21b13acf4bf.zip -> github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.zip mirror://goproxy//github.com/juju/mutex/@v/v0.0.0-20180619145857-d21b13acf4bf.mod -> github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.mod mirror://goproxy//github.com/juju/retry/@v/v0.0.0-20180821225755-9058e192b216.zip -> github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.zip mirror://goproxy//github.com/juju/retry/@v/v0.0.0-20180821225755-9058e192b216.mod -> github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.mod mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190723135506-ce30eb24acd2.zip -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.zip mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190723135506-ce30eb24acd2.mod -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.mod mirror://goproxy//github.com/juju/utils/@v/v0.0.0-20180820210520-bf9cc5bdd62d.zip -> github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.zip mirror://goproxy//github.com/juju/utils/@v/v0.0.0-20180820210520-bf9cc5bdd62d.mod -> github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.mod mirror://goproxy//github.com/juju/version/@v/v0.0.0-20180108022336-b64dbd566305.zip -> github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.zip mirror://goproxy//github.com/juju/version/@v/v0.0.0-20180108022336-b64dbd566305.mod -> github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.2.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.3.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/libvirt/libvirt-go/@v/v3.9.0+incompatible.zip -> github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.9.0+incompatible.zip mirror://goproxy//github.com/libvirt/libvirt-go/@v/v3.9.0+incompatible.mod -> github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.9.0+incompatible.mod 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/tracecontext.go/@v/v0.0.0-20181129014701-1757c391b1ac.zip -> github.com%2Flightstep%2Ftracecontext.go%2F@v%2Fv0.0.0-20181129014701-1757c391b1ac.zip mirror://goproxy//github.com/lightstep/tracecontext.go/@v/v0.0.0-20181129014701-1757c391b1ac.mod -> github.com%2Flightstep%2Ftracecontext.go%2F@v%2Fv0.0.0-20181129014701-1757c391b1ac.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/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/lucas-clemente/aes12/@v/v0.0.0-20171027163421-cd47fb39b79f.mod -> github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod mirror://goproxy//github.com/lucas-clemente/quic-clients/@v/v0.1.0.mod -> github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.10.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/lucas-clemente/quic-go-certificates/@v/v0.0.0-20160823095156-d2f86524cced.mod -> github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod mirror://goproxy//github.com/machine-drivers/docker-machine-driver-vmware/@v/v0.1.1.zip -> github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/machine-drivers/docker-machine-driver-vmware/@v/v0.1.1.mod -> github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/machine-drivers/machine/@v/v0.7.1-0.20210306082426-fcb2ad5bcb17.zip -> github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20210306082426-fcb2ad5bcb17.zip mirror://goproxy//github.com/machine-drivers/machine/@v/v0.7.1-0.20210306082426-fcb2ad5bcb17.mod -> github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20210306082426-fcb2ad5bcb17.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.2.3.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.0.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/mattbaird/jsonpatch/@v/v0.0.0-20200820163806-098863c1fc24.zip -> github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20200820163806-098863c1fc24.zip mirror://goproxy//github.com/mattbaird/jsonpatch/@v/v0.0.0-20200820163806-098863c1fc24.mod -> github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20200820163806-098863c1fc24.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/maxbrunsfeld/counterfeiter/v6/@v/v6.2.2.mod -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mholt/certmagic/@v/v0.6.2-0.20190624175158-6a42ef9fe8c2.mod -> github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.3.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.29.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.29.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.29.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.29.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/moby/hyperkit/@v/v0.0.0-20210108224842-2f061e447e14.zip -> github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20210108224842-2f061e447e14.zip mirror://goproxy//github.com/moby/hyperkit/@v/v0.0.0-20210108224842-2f061e447e14.mod -> github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20210108224842-2f061e447e14.mod mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.mod -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.1.3.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.0.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20200520151820-abd8a0e76976.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/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.5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.2.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc92.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20190207185410-29686dbc5559.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200728170252-4d89ac9fbff6.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/otiai10/copy/@v/v1.5.0.zip -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/otiai10/copy/@v/v1.5.0.mod -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod mirror://goproxy//github.com/otiai10/curr/@v/v1.0.0.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.2.zip -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/otiai10/mint/@v/v1.3.2.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.zip -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.zip -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.zip mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.mod -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20160118053552-9302be274faa.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20160118053552-9302be274faa.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.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/v0.0.0-20161223203901-3a8809bd8a80.zip -> github.com%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.zip mirror://goproxy//github.com/pkg/profile/@v/v0.0.0-20161223203901-3a8809bd8a80.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.5.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.8.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.mod -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.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-charset/@v/v0.0.0-20180617210344-2471d30d28b4.mod -> github.com%2Frogpeppe%2Fgo-charset%2F@v%2Fv0.0.0-20180617210344-2471d30d28b4.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/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.mod mirror://goproxy//github.com/russross/blackfriday/@v/v0.0.0-20170610170232-067529f716f4.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sayboras/dockerclient/@v/v1.0.0.zip -> github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sayboras/dockerclient/@v/v1.0.0.mod -> github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sclevine/spec/@v/v1.2.0.mod -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.21.3.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.21.3.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.21.3.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.21.3.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/storageos/go-api/@v/v2.2.0+incompatible.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.mod -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.4.zip -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.4.mod -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.1.zip -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.1.mod -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.1.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/ulikunitz/xz/@v/v0.5.8.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.8.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.4.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.zip -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xo/terminfo/@v/v0.0.0-20200218205459-454e5b68f9e8.zip -> github.com%2Fxo%2Fterminfo%2F@v%2Fv0.0.0-20200218205459-454e5b68f9e8.zip mirror://goproxy//github.com/xo/terminfo/@v/v0.0.0-20200218205459-454e5b68f9e8.mod -> github.com%2Fxo%2Fterminfo%2F@v%2Fv0.0.0-20200218205459-454e5b68f9e8.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//github.com/zchee/go-vmnet/@v/v0.0.0-20161021174912-97ebf9174097.zip -> github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.zip mirror://goproxy//github.com/zchee/go-vmnet/@v/v0.0.0-20161021174912-97ebf9174097.mod -> github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.16.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.16.0.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.17.0.zip -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.17.0.zip mirror://goproxy//go.opentelemetry.io/otel/@v/v0.17.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.17.0.mod mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.17.0.zip -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.17.0.zip mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.17.0.mod -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.17.0.mod mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.17.0.zip -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.17.0.zip mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.17.0.mod -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.17.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.16.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.16.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.16.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.16.0.mod mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.17.0.zip -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.17.0.zip mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.17.0.mod -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.17.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190927031335-2835ba2e683f.zip -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.zip mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190927031335-2835ba2e683f.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190123085648-057139ce5d2b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190123085648-057139ce5d2b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.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-20190424203555-c05e17bb3b2d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190424203555-c05e17bb3b2d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190617133340-57b3e21c3d56.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190328230028-74de082e2cca.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190502183928-7f726cade0ab.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190502183928-7f726cade0ab.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210113205817-d3ed898aa8a3.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210113205817-d3ed898aa8a3.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190124100055-b90733256f2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190124100055-b90733256f2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502175342-a43fa875dd82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190522044717-8097e1b27ff5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190529164535-6a60838ec259.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190529164535-6a60838ec259.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190812073006-9eafafc0a87e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200922070232-aee5d888a860.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201015000850-e3ed0017c211.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201015000850-e3ed0017c211.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201110211018-35f3e6cf4a65.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201110211018-35f3e6cf4a65.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201202213521-69691e467435.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201223074533-0d417f636930.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201223074533-0d417f636930.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210217105451-b926d437f341.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210217105451-b926d437f341.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190706070813-72ffa07ba3db.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190706070813-72ffa07ba3db.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200505023115-26f46d2f7ef8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200505023115-26f46d2f7ef8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200616133436-c1934b75d054.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200616133436-c1934b75d054.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200701151220-7cb253f4c4f8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200701151220-7cb253f4c4f8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200713011307-fd294ab11aed.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200713011307-fd294ab11aed.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200916195026-c9a70fc28ce3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200916195026-c9a70fc28ce3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210108195828-e2f9c7f1fc8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210108195828-e2f9c7f1fc8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1-0.20200106000736-b8fc810ca6b5.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1-0.20200106000736-b8fc810ca6b5.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.38.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.38.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.zip mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190522204451-c2c4e71fbf69.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200527145253-8367513e4ece.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200527145253-8367513e4ece.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200605102947-12044bf5ea91.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200605102947-12044bf5ea91.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200711021454-869866162049.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200711021454-869866162049.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200715011427-11fb19a81f2c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200715011427-11fb19a81f2c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210108203827-ffc7fda8c3d7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210108203827-ffc7fda8c3d7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210203152818-3206188e46ba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210203152818-3206188e46ba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.32.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/mcuadros/go-syslog.v2/@v/v2.2.1.mod -> gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//k8s.io/api/@v/v0.20.5.zip -> k8s.io%2Fapi%2F@v%2Fv0.20.5.zip mirror://goproxy//k8s.io/api/@v/v0.20.5.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.20.5.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.5.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.5.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.20.5.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/apiserver/@v/v0.20.5.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.20.5.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.5.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.20.5.zip mirror://goproxy//k8s.io/client-go/@v/v0.20.5.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/cloud-provider/@v/v0.20.5.mod -> k8s.io%2Fcloud-provider%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.20.5.zip -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.20.5.zip mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.20.5.mod -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/code-generator/@v/v0.20.5.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/component-base/@v/v0.20.5.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.5.zip mirror://goproxy//k8s.io/component-base/@v/v0.20.5.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/component-helpers/@v/v0.20.5.mod -> k8s.io%2Fcomponent-helpers%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/controller-manager/@v/v0.20.5.mod -> k8s.io%2Fcontroller-manager%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/cri-api/@v/v0.20.5.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/csi-translation-lib/@v/v0.20.5.mod -> k8s.io%2Fcsi-translation-lib%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201113003025-83324d819ded.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201113003025-83324d819ded.mod mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.mod -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.3.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.8.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.8.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.8.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.8.0.mod mirror://goproxy//k8s.io/kube-aggregator/@v/v0.20.5.mod -> k8s.io%2Fkube-aggregator%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/kube-controller-manager/@v/v0.20.5.mod -> k8s.io%2Fkube-controller-manager%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod mirror://goproxy//k8s.io/kube-proxy/@v/v0.20.5.mod -> k8s.io%2Fkube-proxy%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/kube-scheduler/@v/v0.20.5.mod -> k8s.io%2Fkube-scheduler%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/kubectl/@v/v0.20.5.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.20.5.zip mirror://goproxy//k8s.io/kubectl/@v/v0.20.5.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/kubelet/@v/v0.20.5.mod -> k8s.io%2Fkubelet%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.20.5.zip -> k8s.io%2Fkubernetes%2F@v%2Fv1.20.5.zip mirror://goproxy//k8s.io/kubernetes/@v/v1.20.5.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.20.5.mod mirror://goproxy//k8s.io/legacy-cloud-providers/@v/v0.20.5.mod -> k8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/metrics/@v/v0.20.5.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/mount-utils/@v/v0.20.5.mod -> k8s.io%2Fmount-utils%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/sample-apiserver/@v/v0.20.5.mod -> k8s.io%2Fsample-apiserver%2F@v%2Fv0.20.5.mod mirror://goproxy//k8s.io/system-validators/@v/v1.2.0.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.2.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.mod -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/v6/@v/v6.3.0.zip -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2Fv6%2F@v%2Fv6.3.0.zip mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/v6/@v/v6.3.0.mod -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2Fv6%2F@v%2Fv6.3.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7708b52692ea1faadecf967a3e54fec9
diff --git a/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2 b/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
index 851a3a9c2fde..d2dc650bee18 100644
--- a/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
+++ b/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
@@ -9,5 +9,5 @@ LICENSE=mpich2
 RDEPEND=!minimal? ( >=virtual/jre-1.6 ) !minimal? ( x11-libs/libXtst x11-libs/libXi ) || ( sys-cluster/openmpi[fortran?,threads?] sys-cluster/mpich2[fortran?,threads?] ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=ftp://ftp.mcs.anl.gov/pub/mpi/mpe/mpe2-1.0.6p1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a2473c48b5c0242e995d3b49873697b
diff --git a/metadata/md5-cache/sys-cluster/mpich-3.0.4 b/metadata/md5-cache/sys-cluster/mpich-3.0.4
index 9b6ae8f2f35c..bee82cda9c11 100644
--- a/metadata/md5-cache/sys-cluster/mpich-3.0.4
+++ b/metadata/md5-cache/sys-cluster/mpich-3.0.4
@@ -9,5 +9,5 @@ LICENSE=mpich2
 RDEPEND=dev-libs/libaio <sys-apps/hwloc-2 romio? ( net-fs/nfs-utils ) !sys-cluster/mpich2 !sys-cluster/openmpi fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://www.mpich.org/static/downloads/3.0.4/mpich-3.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f69ef192345b9e9b3f163d5526057b12
diff --git a/metadata/md5-cache/sys-cluster/mpich-3.3-r1 b/metadata/md5-cache/sys-cluster/mpich-3.3-r1
index 36bbf080567e..aa7d4f9514d7 100644
--- a/metadata/md5-cache/sys-cluster/mpich-3.3-r1
+++ b/metadata/md5-cache/sys-cluster/mpich-3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 REQUIRED_USE=mpi-threads? ( threads )
 SLOT=0
 SRC_URI=http://www.mpich.org/static/downloads/3.3/mpich-3.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=19e5e30df2f748fca2badabd87065755
diff --git a/metadata/md5-cache/sys-cluster/mpich2-1.5 b/metadata/md5-cache/sys-cluster/mpich2-1.5
index e38b72bb9845..a23668c6d6c7 100644
--- a/metadata/md5-cache/sys-cluster/mpich2-1.5
+++ b/metadata/md5-cache/sys-cluster/mpich2-1.5
@@ -9,5 +9,5 @@ LICENSE=mpich2
 RDEPEND=dev-libs/libaio net-libs/libnsl:0= sys-apps/hwloc romio? ( net-fs/nfs-utils ) !sys-cluster/mpich !sys-cluster/openmpi fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.5/mpich2-1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	3cec34b0def864e87677d8b2b1c370b8	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fortran-2	cca0c11947f3e90961771da271435fdb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=061f2a7d1eb809b9189c7de7fbb9ce5e
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.10.7 b/metadata/md5-cache/sys-cluster/openmpi-1.10.7
index ad7043c4c816..124d5c8605d7 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.10.7
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.10.7
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/pmix >=dev-libs/libevent-2.0.21[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/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.open-mpi.org
 IUSE=cma cuda +cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.7.tar.bz2
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e60645dc1386e18d4035e37d9f78fe8
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=acc75b925a103c438fe807a874ff8bbb
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.4.5 b/metadata/md5-cache/sys-cluster/openmpi-1.4.5
index 88e5d4d0bd14..836f7620d17c 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.4.5
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typeto
 RESTRICT=mpi-threads? ( test )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.5.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=55f843008fde24b959d597bb25e243fe
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1 b/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
index 19c79911ab01..31106f4c2b82 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/pmix <sys-apps/hwloc
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a960c00b7f8e6105894394b5f9475fb1
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1 b/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
index 7bc93d4bafc2..1656e7906c4c 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/pmix dev-libs/libeve
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v1.7/downloads/openmpi-1.7.5.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c30e9b6d20d4e01a5d7e6d1a5dc8516
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.8.8 b/metadata/md5-cache/sys-cluster/openmpi-1.8.8
index 0ffb4cf55970..e22bdfa9259b 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.8.8
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/pmix dev-libs/libeve
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.bz2
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac526e9dcff4efd5ed5e260399b2c4bc
diff --git a/metadata/md5-cache/sys-cluster/openmpi-2.0.4 b/metadata/md5-cache/sys-cluster/openmpi-2.0.4
index 92c309da8796..cef4592aad0e 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-2.0.4
+++ b/metadata/md5-cache/sys-cluster/openmpi-2.0.4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.open-mpi.org
 IUSE=cma cuda cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v2.0/downloads/openmpi-2.0.4.tar.bz2
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2893e56bd0b31e423a33845ac9898bc3
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e5d03caf0807506bd0634fff22ef773c
diff --git a/metadata/md5-cache/sys-cluster/openmpi-2.1.6 b/metadata/md5-cache/sys-cluster/openmpi-2.1.6
index f6c8b0590877..8729584d18a5 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-2.1.6
+++ b/metadata/md5-cache/sys-cluster/openmpi-2.1.6
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.open-mpi.org
 IUSE=cma cuda cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.6.tar.bz2
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a14d4a08d1337d321b5c91dbd78b184a
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=aebfb93b243b7d405f193c39662fccc4
diff --git a/metadata/md5-cache/sys-cluster/openmpi-3.0.4 b/metadata/md5-cache/sys-cluster/openmpi-3.0.4
index 4c01e4802e96..03afaf2b3485 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-3.0.4
+++ b/metadata/md5-cache/sys-cluster/openmpi-3.0.4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.open-mpi.org
 IUSE=cma cuda cxx fortran heterogeneous ipv6 java numa romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v3.0/downloads/openmpi-3.0.4.tar.bz2
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1cf7c8e0ba24f0ba3177f12e35ff39d3
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e5c57f66acb324b3c891782ae305a6be
diff --git a/metadata/md5-cache/sys-cluster/openmpi-3.1.4 b/metadata/md5-cache/sys-cluster/openmpi-3.1.4
index 6d0957bdb0a7..8ba8200e24f5 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-3.1.4
+++ b/metadata/md5-cache/sys-cluster/openmpi-3.1.4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.open-mpi.org
 IUSE=cma cuda cxx fortran heterogeneous ipv6 java numa romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v3.1/downloads/openmpi-3.1.4.tar.bz2
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1cf7c8e0ba24f0ba3177f12e35ff39d3
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e5c57f66acb324b3c891782ae305a6be
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.2 b/metadata/md5-cache/sys-cluster/openmpi-4.0.2
index 2dfd0ca29332..c7091d321dc1 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.2
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.2
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/l
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.2.tar.bz2
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b96ac748629fb017548adb70f83aec0
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.3 b/metadata/md5-cache/sys-cluster/openmpi-4.0.3
index 4474aca2022c..e3ccb8d50563 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.3
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.3
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/l
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.3.tar.bz2
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b96ac748629fb017548adb70f83aec0
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.4 b/metadata/md5-cache/sys-cluster/openmpi-4.0.4
index 9e2d375489a7..2d846cbcc951 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.4
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.4
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/l
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.4.tar.bz2
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b96ac748629fb017548adb70f83aec0
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.5 b/metadata/md5-cache/sys-cluster/openmpi-4.0.5
index 74322fe2f5a9..18d76d924420 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.5
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.5
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/l
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.5.tar.bz2
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=517868dc1e03554aff9bec3c0034c238
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1 b/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
index f8d0eb459940..092d451efe92 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/l
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.5.tar.bz2
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	3cec34b0def864e87677d8b2b1c370b8	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	cca0c11947f3e90961771da271435fdb	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=be2c39df6c4fea7d38cbea90c84f72d3
diff --git a/metadata/md5-cache/sys-cluster/singularity-3.8.0 b/metadata/md5-cache/sys-cluster/singularity-3.8.0
index 1dfaef6b27c2..7733cef53962 100644
--- a/metadata/md5-cache/sys-cluster/singularity-3.8.0
+++ b/metadata/md5-cache/sys-cluster/singularity-3.8.0
@@ -5,10 +5,10 @@ DESCRIPTION=Application containers for Linux
 EAPI=7
 HOMEPAGE=https://sylabs.io
 IUSE=examples +network +suid kernel_linux
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sys-libs/libseccomp sys-fs/squashfs-tools
 SLOT=0
 SRC_URI=https://github.com/hpcng/singularity/releases/download/v3.8.0/singularity-3.8.0.tar.gz
 _eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f919d327163502dd0517323d2a6c70bb
+_md5_=01609083305c1c0c779fef6910a38cfd
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
index 2213ac62701e..34c5433104a7 100644
--- a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
+++ b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c65f947b51a10aae437968a8c0817892
diff --git a/metadata/md5-cache/sys-cluster/vzctl-4.9.4 b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
index 57dfeb2089e3..b0b4b8bd0d07 100644
--- a/metadata/md5-cache/sys-cluster/vzctl-4.9.4
+++ b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libcgroup-0.38 net-firewall/iptables sys-apps/attr sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 virtual/udev ploop? ( dev-libs/libxml2 sys-block/parted >=sys-cluster/ploop-1.13 sys-fs/quota ) vzmigrate? ( app-arch/tar[xattr,acl] net-misc/openssh net-misc/rsync[xattr,acl] net-misc/bridge-utils virtual/awk )
 SLOT=0
 SRC_URI=https://download.openvz.org/utils/vzctl/4.9.4/src/vzctl-4.9.4.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=348bda5e701de72e6dbbc07e7d5aa657
diff --git a/metadata/md5-cache/sys-cluster/zetcd-0.0.4 b/metadata/md5-cache/sys-cluster/zetcd-0.0.4
deleted file mode 100644
index b0ec3eb83eb3..000000000000
--- a/metadata/md5-cache/sys-cluster/zetcd-0.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=A ZooKeeper personality for etcd
-EAPI=6
-HOMEPAGE=https://github.com/coreos/zetcd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coreos/zetcd/archive/v0.0.4.tar.gz -> zetcd-0.0.4.tar.gz https://github.com/coreos/etcd/archive/714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz -> github.com-coreos-etcd-714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz https://github.com/grpc/grpc-go/archive/777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz -> github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/go-genproto/archive/ee236bd376b077c7a89f260c026c4735b195e459.tar.gz -> github.com-google-go-genproto-ee236bd376b077c7a89f260c026c4735b195e459.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=c3dd77f41b8f3fefaabf253ce9656d62
diff --git a/metadata/md5-cache/sys-cluster/zetcd-0.0.4-r2 b/metadata/md5-cache/sys-cluster/zetcd-0.0.4-r2
new file mode 100644
index 000000000000..e18eebb21c10
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/zetcd-0.0.4-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install test unpack
+DEPEND=acct-group/zetcd acct-user/zetcd
+DESCRIPTION=A ZooKeeper personality for etcd
+EAPI=7
+HOMEPAGE=https://github.com/coreos/zetcd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/zetcd acct-user/zetcd
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/coreos/zetcd/archive/v0.0.4.tar.gz -> zetcd-0.0.4.tar.gz https://github.com/coreos/etcd/archive/714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz -> github.com-coreos-etcd-714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz https://github.com/grpc/grpc-go/archive/777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz -> github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/go-genproto/archive/ee236bd376b077c7a89f260c026c4735b195e459.tar.gz -> github.com-google-go-genproto-ee236bd376b077c7a89f260c026c4735b195e459.tar.gz
+_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec
+_md5_=fce77c50a374f61b3252d0c9a384cd9c
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r1 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r1
deleted file mode 100644
index 203d54e6bb3b..000000000000
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DESCRIPTION=A high-performance coordination service for distributed applications.
-EAPI=5
-HOMEPAGE=http://zookeeper.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7
-RESTRICT=mirror binchecks
-SLOT=0
-SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.13/zookeeper-3.4.13.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4b41bca76ffbdf1c9f3fb74c9bc181b8
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.5.9 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.5.9
deleted file mode 100644
index a714fadbd7c6..000000000000
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.5.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=A high-performance coordination service for distributed applications.
-EAPI=5
-HOMEPAGE=http://zookeeper.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7
-RESTRICT=mirror binchecks
-SLOT=0
-SRC_URI=mirror://apache/zookeeper/zookeeper-3.5.9/apache-zookeeper-3.5.9-bin.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9676dc192dff9943c096ba2d807c809
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.2 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.2
deleted file mode 100644
index 351ec49cf913..000000000000
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=A high-performance coordination service for distributed applications.
-EAPI=5
-HOMEPAGE=http://zookeeper.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7
-RESTRICT=mirror binchecks
-SLOT=0
-SRC_URI=mirror://apache/zookeeper/zookeeper-3.6.2/apache-zookeeper-3.6.2-bin.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9676dc192dff9943c096ba2d807c809
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.7.0 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.7.0
index 6d009ba025a9..ff936f62b790 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.7.0
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=A high-performance coordination service for distributed applications
 EAPI=7
 HOMEPAGE=https://zookeeper.apache.org/
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=acct-group/zookeeper acct-user/zookeeper >=virtual/jre-1.8
 RESTRICT=mirror binchecks
 SLOT=0
 SRC_URI=https://downloads.apache.org/zookeeper/zookeeper-3.7.0/apache-zookeeper-3.7.0-bin.tar.gz -> zookeeper-bin-3.7.0.tar.gz
 _eclasses_=java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=2c14bd0a3c8b17d19c2d37f99141ad73
+_md5_=33ce242ede29e0adc9078b645c3b327a
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 2af91c701bda..7a32c3e77212 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/binutils-2.32-r1 b/metadata/md5-cache/sys-devel/binutils-2.32-r1
deleted file mode 100644
index 4de3a1635e37..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-2.32-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
-DESCRIPTION=Tools necessary to build programs
-EAPI=6
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=+cxx default-gold doc +gold multitarget +nls +plugins static-libs test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-REQUIRED_USE=cxx? ( gold plugins ) default-gold? ( gold )
-RESTRICT=!test? ( test )
-SLOT=2.32
-SRC_URI=mirror://gnu/binutils/binutils-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.32-patches-2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=62f179a196f6ddf922c2b12b3166a805
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.32-r1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.32-r1
deleted file mode 100644
index fb4fe9cb45b0..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.32-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
-DESCRIPTION=Tools necessary to build programs
-EAPI=6
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=+cxx default-gold doc +gold multitarget +nls +plugins static-libs test
-KEYWORDS=-* hppa
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-REQUIRED_USE=cxx? ( gold plugins ) default-gold? ( gold )
-RESTRICT=!test? ( test )
-SLOT=2.32
-SRC_URI=mirror://gnu/binutils/binutils-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.32-patches-2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c2cbb7de9cded426b15f41bf0956d18a
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.33.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.33.1
deleted file mode 100644
index 0fa916e8a86f..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.33.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 sys-devel/gnuconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc
-DESCRIPTION=Tools necessary to build programs
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=default-gold doc +gold multitarget +nls +plugins static-libs test
-KEYWORDS=-* hppa
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-REQUIRED_USE=default-gold? ( gold )
-RESTRICT=!test? ( test )
-SLOT=2.33
-SRC_URI=mirror://gnu/binutils/binutils-2.33.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.33.1-patches-1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=08dd297d99aecda97545c51996958774
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.34-r2 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.34-r2
deleted file mode 100644
index 7ea114a95903..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.34-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-DESCRIPTION=Tools necessary to build programs
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=default-gold doc +gold multitarget +nls +plugins static-libs test
-KEYWORDS=-* hppa
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-REQUIRED_USE=default-gold? ( gold )
-RESTRICT=!test? ( test )
-SLOT=2.34
-SRC_URI=mirror://gnu/binutils/binutils-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.34-patches-6.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8cff752f5a0f3e27f0225ededc9f6764
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.1 b/metadata/md5-cache/sys-devel/clang-10.0.1
index 7a19b70d4b3a..a40948cd837c 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.1
+++ b/metadata/md5-cache/sys-devel/clang-10.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b073c104957b1401328f64dde52c7756
diff --git a/metadata/md5-cache/sys-devel/clang-11.1.0 b/metadata/md5-cache/sys-devel/clang-11.1.0
index abf05b7a5efd..5fc285660c6e 100644
--- a/metadata/md5-cache/sys-devel/clang-11.1.0
+++ b/metadata/md5-cache/sys-devel/clang-11.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=11/11.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-11.1.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1b963cdf206d377f4fb1cf5c23faa255
diff --git a/metadata/md5-cache/sys-devel/clang-12.0.0-r1 b/metadata/md5-cache/sys-devel/clang-12.0.0-r1
index f370c55766eb..c6009743180a 100644
--- a/metadata/md5-cache/sys-devel/clang-12.0.0-r1
+++ b/metadata/md5-cache/sys-devel/clang-12.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=12
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-12.0.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=24f5a429eebe9784d5ae00950abff847
diff --git a/metadata/md5-cache/sys-devel/clang-12.0.1 b/metadata/md5-cache/sys-devel/clang-12.0.1
index 14e96a5c74c5..8eae17f61101 100644
--- a/metadata/md5-cache/sys-devel/clang-12.0.1
+++ b/metadata/md5-cache/sys-devel/clang-12.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=12
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-12.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ae23af24fa5deb65f37f9c07e368b53e
diff --git a/metadata/md5-cache/sys-devel/clang-13.0.0.9999 b/metadata/md5-cache/sys-devel/clang-13.0.0.9999
index 35e3531a0845..da25cabed4c0 100644
--- a/metadata/md5-cache/sys-devel/clang-13.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-13.0.0.9999
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=13
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9bb12087bc9e60aaee3b5b66eeeaa3e2
diff --git a/metadata/md5-cache/sys-devel/clang-common-10.0.1 b/metadata/md5-cache/sys-devel/clang-common-10.0.1
index 99cb64f8f7cb..c7b5feec86bf 100644
--- a/metadata/md5-cache/sys-devel/clang-common-10.0.1
+++ b/metadata/md5-cache/sys-devel/clang-common-10.0.1
@@ -7,5 +7,5 @@ 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.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=adade0b4461ea612110e077bfbad8b1b
diff --git a/metadata/md5-cache/sys-devel/clang-common-11.1.0 b/metadata/md5-cache/sys-devel/clang-common-11.1.0
index ecf94505522a..ffdccba81072 100644
--- a/metadata/md5-cache/sys-devel/clang-common-11.1.0
+++ b/metadata/md5-cache/sys-devel/clang-common-11.1.0
@@ -7,5 +7,5 @@ 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-11.1.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad5c57d3900d811224444bde2c7bcdb9
diff --git a/metadata/md5-cache/sys-devel/clang-common-12.0.0 b/metadata/md5-cache/sys-devel/clang-common-12.0.0
index 417bbcaeea9c..e45305adbfb3 100644
--- a/metadata/md5-cache/sys-devel/clang-common-12.0.0
+++ b/metadata/md5-cache/sys-devel/clang-common-12.0.0
@@ -7,5 +7,5 @@ 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-12.0.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=84aaad63c41d19e1795c0de0c01add97
diff --git a/metadata/md5-cache/sys-devel/clang-common-12.0.1 b/metadata/md5-cache/sys-devel/clang-common-12.0.1
index 49bbc1542383..07177a1fc4cc 100644
--- a/metadata/md5-cache/sys-devel/clang-common-12.0.1
+++ b/metadata/md5-cache/sys-devel/clang-common-12.0.1
@@ -7,5 +7,5 @@ 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-12.0.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a595ff2d43181fa2e05cd4b7e10ca6a2
diff --git a/metadata/md5-cache/sys-devel/clang-common-13.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-13.0.0.9999
index 3597105bdbf6..c7fce9865d30 100644
--- a/metadata/md5-cache/sys-devel/clang-common-13.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-13.0.0.9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b90c4c0dc9eaa89be17463c64885562d
diff --git a/metadata/md5-cache/sys-devel/crossdev-20201129 b/metadata/md5-cache/sys-devel/crossdev-20201129
deleted file mode 100644
index 12f911abaefe..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20201129
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=install
-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-20201129.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20201129.tar.xz
-_md5_=c482bb7ad50b913236f85bc28e1de0ab
diff --git a/metadata/md5-cache/sys-devel/crossdev-20210608 b/metadata/md5-cache/sys-devel/crossdev-20210608
deleted file mode 100644
index 1f5c33242952..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20210608
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=install
-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-20210608.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20210608.tar.xz
-_md5_=0e5033235e81f96e741efb38158a1b33
diff --git a/metadata/md5-cache/sys-devel/gcc-10.2.0-r5 b/metadata/md5-cache/sys-devel/gcc-10.2.0-r5
deleted file mode 100644
index e884666a09db..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.2.0-r5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=10
-SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz mirror://gentoo/gcc-10.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a2bc8304e5274ca19694564989ef899b
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.0 b/metadata/md5-cache/sys-devel/gcc-10.3.0
index 44d34769b3b3..e03f03c925ca 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.0
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -8,9 +8,9 @@ IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2262381a31a63dbf42632428c9e531ef
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.0-r1 b/metadata/md5-cache/sys-devel/gcc-10.3.0-r1
index 7f0af7b63cea..5d880a824749 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.0-r1
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz mirror://gentoo/gcc-10.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dd19e02b2db67dd0910dd12b4d36002c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=02297571a30601987d8b1a6670df5f3d
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.0-r2 b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
index 5a34a2f7004a..13b73095cb7c 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -8,9 +8,9 @@ IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5d5d722d1074e13bc89b1c5857994e63
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.1_pre9999 b/metadata/md5-cache/sys-devel/gcc-10.3.1_pre9999
index 96044e6eee30..d29ac168bfc4 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.1_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.1_pre9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -8,9 +8,9 @@ IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 PROPERTIES=live
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e292546d4839eca2e919d2a37705e392
diff --git a/metadata/md5-cache/sys-devel/gcc-11.1.0 b/metadata/md5-cache/sys-devel/gcc-11.1.0
deleted file mode 100644
index 50d3335e3848..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd valgrind custom-cflags
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=11
-SRC_URI=mirror://gnu/gcc/gcc-11.1.0/gcc-11.1.0.tar.xz mirror://gentoo/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.1.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=99e671a6747c899a398140bf7ffcc4dd
diff --git a/metadata/md5-cache/sys-devel/gcc-11.1.0-r1 b/metadata/md5-cache/sys-devel/gcc-11.1.0-r1
deleted file mode 100644
index 2876b686db6b..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd valgrind custom-cflags
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=11
-SRC_URI=mirror://gnu/gcc/gcc-11.1.0/gcc-11.1.0.tar.xz mirror://gentoo/gcc-11.1.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.1.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.1.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.1.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.1.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.1.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.1.0-patches-2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=89761f11282c8e4e542f18bac342f1da
diff --git a/metadata/md5-cache/sys-devel/gcc-11.1.0-r2 b/metadata/md5-cache/sys-devel/gcc-11.1.0-r2
index 3430ae3b57b6..52317f996e63 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.1.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-11.1.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -8,9 +8,9 @@ IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gnu/gcc/gcc-11.1.0/gcc-11.1.0.tar.xz mirror://gentoo/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.1.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=05e4cf2325176e19386f543b87d0a495
diff --git a/metadata/md5-cache/sys-devel/gcc-11.1.1_pre9999 b/metadata/md5-cache/sys-devel/gcc-11.1.1_pre9999
index 449c123d8b8f..2a19377fa16d 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.1.1_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-11.1.1_pre9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -8,9 +8,9 @@ IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 PROPERTIES=live
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gentoo/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.1.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=333d3453f4dee9ac9a211b78caff33d0
diff --git a/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999 b/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
index 2895b2f79d1c..56d6348c8c26 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
 DESCRIPTION=The GNU Compiler Collection
-EAPI=7
+EAPI=8
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd valgrind custom-cflags
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 PROPERTIES=live
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gentoo/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-12.0.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92c935c9edec0dff226c4bd9316c14d5
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=88cb582aeedbbadc222b42381674a088
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r3 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r3
deleted file mode 100644
index 670461aadb3c..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite cilk ada +vtv jit mpx +pie +ssp +pch
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=6.5.0
-SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=41dc4036d8e6585315b14dc4d7e90010
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r4 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r4
index ba7f69a0f7ec..04ac58fe2dc7 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r4
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* x11-libs/pango virtual/pkgconfig ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite cilk ada +vtv jit mpx +pie +ssp +pch
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite cilk ada vtv jit mpx +pie +ssp +pch
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=6.5.0
 SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-6.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f8f43a350a54709604645df150d2db6b
diff --git a/metadata/md5-cache/sys-devel/gcc-7.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-7.5.0-r1
deleted file mode 100644
index cae6ccd08244..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-7.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite cilk ada +vtv jit mpx +pie +ssp +pch
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=7.5.0
-SRC_URI=mirror://gnu/gcc/gcc-7.5.0/gcc-7.5.0.tar.xz mirror://gentoo/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.5.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=65f6340bcf808fba19718ee16376cb2a
diff --git a/metadata/md5-cache/sys-devel/gcc-7.5.0-r2 b/metadata/md5-cache/sys-devel/gcc-7.5.0-r2
index 5a837a1f5e1b..15bb09e72683 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.5.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-7.5.0-r2
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite cilk ada +vtv jit mpx +pie +ssp +pch
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite cilk ada vtv jit mpx +pie +ssp +pch
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=7.5.0
 SRC_URI=mirror://gnu/gcc/gcc-7.5.0/gcc-7.5.0.tar.xz mirror://gentoo/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.5.0-patches-4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f27156fb5bdc447364253107591e28f1
diff --git a/metadata/md5-cache/sys-devel/gcc-8.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.4.0-r1
deleted file mode 100644
index f8032726d0af..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-8.4.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit mpx +pie +ssp +pch systemtap
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=8.4.0
-SRC_URI=mirror://gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz mirror://gentoo/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.4.0-patches-2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5db021f282348ebe91be240970a0c178
diff --git a/metadata/md5-cache/sys-devel/gcc-8.4.0-r2 b/metadata/md5-cache/sys-devel/gcc-8.4.0-r2
deleted file mode 100644
index 2d0aab91b80e..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-8.4.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit mpx +pie +ssp +pch systemtap
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=8.4.0
-SRC_URI=mirror://gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz mirror://gentoo/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.4.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=50cd18b0e3cda413d652ddd86a7d853f
diff --git a/metadata/md5-cache/sys-devel/gcc-8.5.0 b/metadata/md5-cache/sys-devel/gcc-8.5.0
index 9c9bf9341a0e..60b3ca899844 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-8.5.0
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit mpx +pie +ssp +pch systemtap
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit mpx +pie +ssp +pch systemtap
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=8.5.0
 SRC_URI=mirror://gnu/gcc/gcc-8.5.0/gcc-8.5.0.tar.xz mirror://gentoo/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.5.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=382774bfde8167c04ea52a72ba3b719c
diff --git a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
index 2936cd3cc8ba..83bf84db1709 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit mpx +pie +ssp +pch systemtap
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit mpx +pie +ssp +pch systemtap
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=8.5.0
 SRC_URI=mirror://gnu/gcc/gcc-8.5.0/gcc-8.5.0.tar.xz mirror://gentoo/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.5.0-patches-2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=57e696242edf3005ca0154c514022b72
diff --git a/metadata/md5-cache/sys-devel/gcc-9.3.0-r1 b/metadata/md5-cache/sys-devel/gcc-9.3.0-r1
index 58ed1afea0e4..6cf60d7a12a4 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.3.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-9.3.0-r1
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit +pie +ssp +pch systemtap d lto
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=9.3.0
 SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5b372c920b8b5473cdc1443edaf16222
diff --git a/metadata/md5-cache/sys-devel/gcc-9.3.0-r2 b/metadata/md5-cache/sys-devel/gcc-9.3.0-r2
index 956d7a23d53f..bf80a052eb6d 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.3.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-9.3.0-r2
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit +pie +ssp +pch systemtap d lto
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=9.3.0
 SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d85737f0edaacb47603ab4cfc29f8bc8
diff --git a/metadata/md5-cache/sys-devel/gcc-9.4.0 b/metadata/md5-cache/sys-devel/gcc-9.4.0
index 938c3242a03e..a0a652e686fb 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.4.0
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit +pie +ssp +pch systemtap d lto
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=9.4.0
 SRC_URI=mirror://gnu/gcc/gcc-9.4.0/gcc-9.4.0.tar.xz mirror://gentoo/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.4.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3ac848da7a3c622e7f326dba04ff5174
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0dd04a33798fd4ec0cc37613f55fc6c1
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index af66a18ee7f6..d3b20c7339c5 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.8-r1 !<sys-apps/portage-2.2.14 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.8-r1 !<sys-apps/portage-2.2.14 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Apple branch of the GNU Compiler Collection, Developer Tools 4.0
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org
@@ -7,9 +7,9 @@ IUSE=bootstrap fortran nls +openmp objc objc++ +cxx test vanilla +nls
 KEYWORDS=~ppc-macos ~x64-macos
 LICENSE=GPL-2 GPL-3
 PDEPEND=sys-libs/csu >=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.8-r1 !<sys-apps/portage-2.2.14 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.8-r1 !<sys-apps/portage-2.2.14 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl )
 RESTRICT=!test? ( test ) strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe049e2fdb356ee5ec3a248f2b5445a8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-10.3.0 b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
index b434bccf52f9..018b09cb0290 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-10.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=hppa? ( sys-devel/binutils-hppa64 ) sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+DEPEND=hppa? ( sys-devel/binutils-hppa64 ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
 DESCRIPTION=64bit kernel compiler
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -8,9 +8,9 @@ IUSE=test vanilla +nls
 KEYWORDS=hppa
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=499c3e296cb44fae1926c95e7fac1e3b
diff --git a/metadata/md5-cache/sys-devel/kgcc64-11.1.0 b/metadata/md5-cache/sys-devel/kgcc64-11.1.0
index c8122bf273f6..ef5b3159da5d 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-11.1.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-11.1.0
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=hppa? ( sys-devel/binutils-hppa64 ) sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+DEPEND=hppa? ( sys-devel/binutils-hppa64 ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
 DESCRIPTION=64bit kernel compiler
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -8,9 +8,9 @@ IUSE=test vanilla +nls
 KEYWORDS=~hppa
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gnu/gcc/gcc-11.1.0/gcc-11.1.0.tar.xz mirror://gentoo/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.1.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c819679af79cb7ed395c6f91baf6357
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2 b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
index 8d1613ac44d8..ae239313ab46 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=hppa? ( sys-devel/binutils-hppa64 ) sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+DEPEND=hppa? ( sys-devel/binutils-hppa64 ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
 DESCRIPTION=64bit kernel compiler
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
@@ -8,9 +8,9 @@ IUSE=test vanilla +nls
 KEYWORDS=hppa
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
 RESTRICT=!test? ( test )
 SLOT=9.3.0
 SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	15770f21d269fa209ab88435a631d7a5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eab09eed56a9314a6cd3be9578241be2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3aeb65e537bc37427af84e711e14e1d8
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.1 b/metadata/md5-cache/sys-devel/llvm-10.0.1
index 027490ad491c..f08c6671ec63 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6a4996af0949ca6a581f2d572ebd5d69
diff --git a/metadata/md5-cache/sys-devel/llvm-11.1.0 b/metadata/md5-cache/sys-devel/llvm-11.1.0
index bbd4204a6695..fccead61bb6c 100644
--- a/metadata/md5-cache/sys-devel/llvm-11.1.0
+++ b/metadata/md5-cache/sys-devel/llvm-11.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-11.1.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cbfa585703ce7d381568718358a57878
diff --git a/metadata/md5-cache/sys-devel/llvm-12.0.0 b/metadata/md5-cache/sys-devel/llvm-12.0.0
index f087b880b179..c322df5e2650 100644
--- a/metadata/md5-cache/sys-devel/llvm-12.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-12.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-12.0.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c2340224bb1792b378b98ea240f582c9
diff --git a/metadata/md5-cache/sys-devel/llvm-12.0.1 b/metadata/md5-cache/sys-devel/llvm-12.0.1
index 7ef0fac4dbfe..d0f5889b9833 100644
--- a/metadata/md5-cache/sys-devel/llvm-12.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-12.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-12.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2caa3cd3a915673262272e53b3d559e6
diff --git a/metadata/md5-cache/sys-devel/llvm-13.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-13.0.0.9999
index af066b63ef0f..97b573d15152 100644
--- a/metadata/md5-cache/sys-devel/llvm-13.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-13.0.0.9999
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	dd40f38d2b2dec3b8e567d6b5a1b7903	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fd422feab10bd00ed98513969ce5d740
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index c6be455a5e42..afd804acabb6 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2 b/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
index 6aa56c65301f..d3912e28e5a4 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
+++ b/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=7
 HOMEPAGE=https://www.seabios.org/
 IUSE=+binary debug +seavgabios
-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=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary )
 SLOT=0
 SRC_URI=!binary? ( https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ) binary? ( https://dev.gentoo.org/~slyfox/distfiles/seabios-1.14.0-r2-bin.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d711faa78864fc6486bb9991131dcab8
+_md5_=4df9dd623b67085197c475cfd3766ade
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index e5538dd9618a..5549c8483e60 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1
index 94ce7fe453a3..acd8953dda1e 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.10.1.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=137b17aeadb501771880e82c8d182d10
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.11.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.11.1
deleted file mode 100644
index 3aa6eb99be3d..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=7
-HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=test
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.11.1.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=013268db687bd3867f3d88ba2c565169
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.12 b/metadata/md5-cache/sys-fs/btrfs-progs-5.12
deleted file mode 100644
index 388af18d75d6..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=7
-HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=test
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.12.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=beef567f825ef5a46025410d6dd7aac1
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.12.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.12.1
index e262251f0f3f..65492d387362 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.12.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.12.1.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=beef567f825ef5a46025410d6dd7aac1
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.13 b/metadata/md5-cache/sys-fs/btrfs-progs-5.13
new file mode 100644
index 000000000000..ceb6d9ca3270
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.13
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
+DESCRIPTION=Btrfs filesystem utilities
+EAPI=7
+HOMEPAGE=https://btrfs.wiki.kernel.org
+IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=test
+SLOT=0/0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.13.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=beef567f825ef5a46025410d6dd7aac1
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index f91a7973ec4a..2c6d65e7b5be 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=test
 SLOT=0/0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=beef567f825ef5a46025410d6dd7aac1
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.6 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.6
index 84b5e4216a56..e650f59cd863 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.6
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.6
@@ -5,11 +5,11 @@ DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=7
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 IUSE=gcrypt kernel nettle +openssl +argon2 nls pwquality reencrypt static static-libs +udev urandom kernel_linux
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+
 RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.6.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b65731994db724fcbb8378e773a9fdfc
+_md5_=0e9f59f73fa40fcbb21f9534026b60e1
diff --git a/metadata/md5-cache/sys-fs/genfstab-24 b/metadata/md5-cache/sys-fs/genfstab-24
index 19f3278ddfea..50a7439a6c46 100644
--- a/metadata/md5-cache/sys-fs/genfstab-24
+++ b/metadata/md5-cache/sys-fs/genfstab-24
@@ -3,8 +3,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Genfstab - generate output suitable for addition to an fstab file
 EAPI=7
 HOMEPAGE=https://github.com/scardracs/genfstab https://man.archlinux.org/man/genfstab.8
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/scardracs/genfstab/releases/download/24/genfstab-24.tar.gz
-_md5_=bbb7bb70aa9e00be8ae66b2cd5126a89
+_md5_=8809b5099308b4c5a03887bc20f34d7b
diff --git a/metadata/md5-cache/sys-fs/iprutils-2.4.18.1 b/metadata/md5-cache/sys-fs/iprutils-2.4.18.1
index 92d31687d5e0..9cf9f0c85c1c 100644
--- a/metadata/md5-cache/sys-fs/iprutils-2.4.18.1
+++ b/metadata/md5-cache/sys-fs/iprutils-2.4.18.1
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=>=sys-libs/ncurses-5.4-r5:= >=sys-apps/pciutils-2.1.11-r1 virtual/logger virtual/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/iprdd/iprutils-2.4.18.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=29a564c08951b11b2d964d8c8d68e631
diff --git a/metadata/md5-cache/sys-fs/lufis-0.3-r1 b/metadata/md5-cache/sys-fs/lufis-0.3-r1
index b1989802e14c..5a7290e364cb 100644
--- a/metadata/md5-cache/sys-fs/lufis-0.3-r1
+++ b/metadata/md5-cache/sys-fs/lufis-0.3-r1
@@ -3,10 +3,10 @@ DEPEND=!<sys-fs/lufs-0.9.7-r3 >=sys-fs/fuse-1.3:0=
 DESCRIPTION=Wrapper to use lufs modules with fuse kernel support
 EAPI=7
 HOMEPAGE=http://fuse.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=!<sys-fs/lufs-0.9.7-r3 >=sys-fs/fuse-1.3:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/fuse/lufis-0.3.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cdd418cc0637291ad72431ac54fcb5b7
+_md5_=8410bf91d9e675a53163f1a4d3abfd5c
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.187-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.187-r2
index 8a12dfd4b498..bab638b9ba75 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.187-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.187-r2
@@ -8,8 +8,8 @@ IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs(-)?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )
+REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) static? ( !systemd ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.187.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.187.tgz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=efe7be88eb2ec47c99662b74889af074
+_md5_=d007dca88a09081f07dcb1dd7802a2b2
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.188 b/metadata/md5-cache/sys-fs/lvm2-2.02.188
index 00807e206b24..0054484e508b 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.188
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.188
@@ -8,8 +8,8 @@ IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs(-)?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )
+REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) static? ( !systemd ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.188.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.188.tgz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=255bcaaee2789f896e13c962629e6413
+_md5_=58792009b7b96214f083fdf9e459123b
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.12 b/metadata/md5-cache/sys-fs/lvm2-2.03.12
index 6edaf8019ad6..7008a9a4803a 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.12
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.12
@@ -8,8 +8,8 @@ IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs(-)?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )
+REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) static? ( !systemd ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.03.12.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.03.12.tgz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8d32c61d9ccbd822c48611635ed6d004
+_md5_=c25118619c0a9401f6d1592ab69a4268
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.31 b/metadata/md5-cache/sys-fs/mtools-4.0.31
index 6a8f561731e5..db36fc0d7de8 100644
--- a/metadata/md5-cache/sys-fs/mtools-4.0.31
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.31
@@ -4,10 +4,10 @@ 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 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~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.31.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=67a395b949b8d4f1f1535f59b6720630
+_md5_=6729ef9cc5d6d2cc7f36a6205dce1f7a
diff --git a/metadata/md5-cache/sys-fs/udev-245.5-r1 b/metadata/md5-cache/sys-fs/udev-245.5-r1
index fb7a994e0004..fe869e8aadaf 100644
--- a/metadata/md5-cache/sys-fs/udev-245.5-r1
+++ b/metadata/md5-cache/sys-fs/udev-245.5-r1
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v245.5/systemd-stable-245.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=fd70862d8e0decdba8c9f5b34a1b0969
diff --git a/metadata/md5-cache/sys-fs/udev-246-r1 b/metadata/md5-cache/sys-fs/udev-246-r1
index 2f67221a29c5..fef03bf1afd1 100644
--- a/metadata/md5-cache/sys-fs/udev-246-r1
+++ b/metadata/md5-cache/sys-fs/udev-246-r1
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v246/systemd-246.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=7b2578d75d9772029e4b7355e24b7049
diff --git a/metadata/md5-cache/sys-fs/udev-247.2 b/metadata/md5-cache/sys-fs/udev-247.2
index 03ed12ffbe8d..a4554cf44b63 100644
--- a/metadata/md5-cache/sys-fs/udev-247.2
+++ b/metadata/md5-cache/sys-fs/udev-247.2
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v247.2/systemd-stable-247.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=dfa32a34c88c4e25c5c9c16a5bf86880
diff --git a/metadata/md5-cache/sys-fs/udev-248 b/metadata/md5-cache/sys-fs/udev-248
index 458f4524c9fd..f907493e70c4 100644
--- a/metadata/md5-cache/sys-fs/udev-248
+++ b/metadata/md5-cache/sys-fs/udev-248
@@ -5,12 +5,12 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-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=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-34
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v248/systemd-248.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=1ed2e67502af37e8719974286e82f3e4
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_md5_=4f40e5f7977f74482ef228425c070220
diff --git a/metadata/md5-cache/sys-fs/udev-249-r1 b/metadata/md5-cache/sys-fs/udev-249-r1
index 34ae5effcd2b..df66d45e3a8b 100644
--- a/metadata/md5-cache/sys-fs/udev-249-r1
+++ b/metadata/md5-cache/sys-fs/udev-249-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v249/systemd-249.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=cdb807e9fa367c5dcd426a340291299f
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_md5_=51078b0bea954618def6473b2de9e147
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 387267eb5970..ceb4cd5554ea 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=53cda668a618f44f8cce8eadbb18378f
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_md5_=446c8cd322a8ac6a9b604351525cd8f8
diff --git a/metadata/md5-cache/sys-fs/udiskie-2.3.3 b/metadata/md5-cache/sys-fs/udiskie-2.3.3
index a20491b33e4b..795e37f205f5 100644
--- a/metadata/md5-cache/sys-fs/udiskie-2.3.3
+++ b/metadata/md5-cache/sys-fs/udiskie-2.3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-text/asciidoc dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=app-text/asciidoc dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=An automatic disk mounting service using udisks
 EAPI=6
 HOMEPAGE=https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
-RDEPEND=dev-python/docopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-fs/udisks:2 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/docopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-fs/udisks:2 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/u/udiskie/udiskie-2.3.3.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e42523a1dd93d4e1431853e1031f889a
+_md5_=8aacaecb4c70be5f74fd5a441779ae9a
diff --git a/metadata/md5-cache/sys-fs/udiskie-2.3.3-r1 b/metadata/md5-cache/sys-fs/udiskie-2.3.3-r1
new file mode 100644
index 000000000000..a2bc7ecbdacc
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udiskie-2.3.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/docopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-fs/udisks:2 >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-text/asciidoc dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/python-keyutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=An automatic disk mounting service using udisks
+EAPI=8
+HOMEPAGE=https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/docopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-fs/udisks:2 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/udiskie/udiskie-2.3.3.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3dac1e685f59f51ec149f2e68eabdd69
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.1-r1 b/metadata/md5-cache/sys-fs/udisks-2.9.1-r1
index 024941cfbd48..6f99211c270d 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.9.1-r1
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.1/udisks-2.9.1.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=db1c00bbe566a5bc6848702ea77628e7
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.2-r1 b/metadata/md5-cache/sys-fs/udisks-2.9.2-r1
index c91ece8ebc7b..3ea701595221 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.9.2-r1
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.2/udisks-2.9.2.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7df28c0c0df93bd773aeeb8a6a885e09
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.6 b/metadata/md5-cache/sys-fs/zfs-0.8.6
index 5f32cfa428a0..4c06b1acd436 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.8.6
+++ b/metadata/md5-cache/sys-fs/zfs-0.8.6
@@ -12,5 +12,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.6/zfs-0.8.6.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3de69a6a7380de70ad8fe6f4bb608ea7
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.5 b/metadata/md5-cache/sys-fs/zfs-2.0.5
index 1dcd4efdebf4..93464a5b8def 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.0.5
+++ b/metadata/md5-cache/sys-fs/zfs-2.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=92f2369315ce0ee29c30f5f50d991f4a
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.0 b/metadata/md5-cache/sys-fs/zfs-2.1.0
index a4db81df008b..aba5ed7c9b85 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.0
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9
 RESTRICT=test
 SLOT=0/5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=442e4e9ba86b7fcb49fdb0e1e256f5d3
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index fb8a9a859240..0bd6072b7d32 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -11,5 +11,5 @@ RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-li
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/5
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7f4a0c85dfcdaefa6a5ff1173eb432a0
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 21a5de3c53f1..5d2d52ab0978 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/dracut-050-r2 b/metadata/md5-cache/sys-kernel/dracut-050-r2
index b504e7940fae..bb6b63f02961 100644
--- a/metadata/md5-cache/sys-kernel/dracut-050-r2
+++ b/metadata/md5-cache/sys-kernel/dracut-050-r2
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-050.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f04016930c5af9a636a6ec19c6acea9f
diff --git a/metadata/md5-cache/sys-kernel/dracut-051-r1 b/metadata/md5-cache/sys-kernel/dracut-051-r1
index 59f79198260d..8675c1c6399c 100644
--- a/metadata/md5-cache/sys-kernel/dracut-051-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-051-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-051.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=29db4c5edd9b7015eca659c8d31ce6ac
diff --git a/metadata/md5-cache/sys-kernel/dracut-053-r1 b/metadata/md5-cache/sys-kernel/dracut-053-r1
index 019e79479f97..953c4595d672 100644
--- a/metadata/md5-cache/sys-kernel/dracut-053-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-053-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-053.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=92ee7226528c22aacd6099ded139bb7d
diff --git a/metadata/md5-cache/sys-kernel/dracut-055 b/metadata/md5-cache/sys-kernel/dracut-055
index 6b887109a944..3d3f1fac6143 100644
--- a/metadata/md5-cache/sys-kernel/dracut-055
+++ b/metadata/md5-cache/sys-kernel/dracut-055
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-055.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6599a55209812928df0da855f7221b69
diff --git a/metadata/md5-cache/sys-kernel/dracut-9999 b/metadata/md5-cache/sys-kernel/dracut-9999
index 8efb871356b6..1c86e3ba8080 100644
--- a/metadata/md5-cache/sys-kernel/dracut-9999
+++ b/metadata/md5-cache/sys-kernel/dracut-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys-apps/kmod-23[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/openrc[sysv-utils(-),selinux?] sys-apps/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig virtual/udev elibc_musl? ( sys-libs/fts-standalone ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6599a55209812928df0da855f7221b69
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.3.3 b/metadata/md5-cache/sys-kernel/genkernel-3.5.3.3
index 85480dc273a8..ba2bd6f3f021 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.5.3.3
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.5.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/cryptsetup ) app-arch/cpio >=app-misc/pax-utils-1.2.2 sys-apps/util-linux[static-libs(+)] firmware? ( sys-kernel/linux-firmware ) !<sys-apps/openrc-0.9.9
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.5.3.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.0.tar.xz ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz https://busybox.net/downloads/busybox-1.27.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.22.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=21cdb7378e3b430b8e0675e2d3707fde
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.0.10 b/metadata/md5-cache/sys-kernel/genkernel-4.0.10
index 58af284be304..53e84d90b6b9 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-4.0.10
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.0.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.0.10.tar.xz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.6.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-2020.80.tar.bz2 https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-27.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.6.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.38.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.7/strace-5.7.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.6.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.5.tar.gz -> zstd-1.4.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b4c791bff9ea1e016c5eeb14b11b7ed
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.1.2-r3 b/metadata/md5-cache/sys-kernel/genkernel-4.1.2-r3
deleted file mode 100644
index 21e3c5a674c1..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-4.1.2-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
-IUSE=ibm +firmware
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.1.2.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.7.tar.xz https://www.busybox.net/downloads/busybox-1.32.0.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.4.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-2020.80.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.9.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20200813.1.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-27.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.6.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.39.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.8/strace-5.8.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.7.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.5.tar.gz -> zstd-1.4.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=51b10edd21c2134ebef7faff4ec1de95
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.2.1-r1 b/metadata/md5-cache/sys-kernel/genkernel-4.2.1-r1
deleted file mode 100644
index f2f2acb37485..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-4.2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
-IUSE=ibm +firmware
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.2.1.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.11.tar.xz https://www.busybox.net/downloads/busybox-1.33.0.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.5.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/e2fsprogs-1.46.2.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20201207.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-28.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.2.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.41.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.11/strace-5.11.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.11.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.9.tar.gz -> zstd-1.4.9.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3bb6a5c9e2532d18aa09f19d48998c84
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.2.3 b/metadata/md5-cache/sys-kernel/genkernel-4.2.3
index 2ded9d5db5d7..dc0369942e4d 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-4.2.3
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.2.3
@@ -3,11 +3,11 @@ DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
 IUSE=ibm +firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.2.3.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://dl.bintray.com/boostorg/release/1.76.0/source/boost_1_76_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.12.1.tar.xz https://www.busybox.net/downloads/busybox-1.33.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.6.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/e2fsprogs-1.46.2.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.3.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.42.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.23.tar.gz -> libxcrypt-4.4.23.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.12/strace-5.12.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.12.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e40cade218aaf87134dcd081f4854fa2
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ad828c2f2a7b08dddb6e80a6c8807c3c
diff --git a/metadata/md5-cache/sys-kernel/genkernel-9999 b/metadata/md5-cache/sys-kernel/genkernel-9999
index 9d6898cc6246..4408f1eb6dc6 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-9999
+++ b/metadata/md5-cache/sys-kernel/genkernel-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://dl.bintray.com/boostorg/release/1.76.0/source/boost_1_76_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.12.1.tar.xz https://www.busybox.net/downloads/busybox-1.33.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.6.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/e2fsprogs-1.46.2.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.3.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.42.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.23.tar.gz -> libxcrypt-4.4.23.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.12/strace-5.12.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.12.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e40cade218aaf87134dcd081f4854fa2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.38 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.38
deleted file mode 100644
index 41858cfa2e4a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.38
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.38
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.38 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.38
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-41.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-41.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=721d7fe7e2c8a1e552119ef77bdf6a10
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.43 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.43
deleted file mode 100644
index 001c2266ed81..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.43
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.43
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.43 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.43
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-47.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-47.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4371d0c7aaf07c84ca0bba3fedcfa408
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.44 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.44
deleted file mode 100644
index 11f54272911f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.44
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.44
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.44 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.44
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-48.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4371d0c7aaf07c84ca0bba3fedcfa408
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.45 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.45
deleted file mode 100644
index b475a73a888b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.45
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.45
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.45 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.45
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-49.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-49.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4371d0c7aaf07c84ca0bba3fedcfa408
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.46 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.46
deleted file mode 100644
index de38d941330d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.46
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.46
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.46 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.46
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-50.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-50.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4371d0c7aaf07c84ca0bba3fedcfa408
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.47
index dd1c1a5407d1..15d0a206d696 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.47
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.47
@@ -4,7 +4,7 @@ DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.10.47
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.47 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.47
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-51.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-51.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e395728d45b056559b520a0c2486b3b6
+_md5_=52966c4de0e50a109703b1b62c6363d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.50 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.50
new file mode 100644
index 000000000000..d5552e3e2259
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.50
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.50
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.50 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.50
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-56.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-56.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=800130f427d30d90d17ffbbcfeaa08e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.10
deleted file mode 100644
index 10314039e896..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.10
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.12.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.10
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-11.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2905f5d05d59123880a6affd11ac355a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.11 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.11
deleted file mode 100644
index 7e930373516e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.11
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.12.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.11
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-12.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2905f5d05d59123880a6affd11ac355a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.12
deleted file mode 100644
index c8ee1a03fb5a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.12
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.12.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.12
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-13.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2905f5d05d59123880a6affd11ac355a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.13 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.13
deleted file mode 100644
index 40821cfa1fce..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.13
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.12.13 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.13
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-16.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a20d6324ae0fa916a31392ff4bccb659
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.14 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.14
deleted file mode 100644
index 74dca8921426..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.14
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.12.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.14
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-17.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a20d6324ae0fa916a31392ff4bccb659
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.17
new file mode 100644
index 000000000000..7df56ac9b3dd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.17
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.12.17
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.12.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.12.17
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-20.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a20d6324ae0fa916a31392ff4bccb659
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.120 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.120
deleted file mode 100644
index a54773606464..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.120
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.120
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.120 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.120
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-123.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-123.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc2430618b0810188d49fe0c8dfef969
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.125 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.125
deleted file mode 100644
index 36fcb080d5df..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.125
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.125
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.125 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.125
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-128.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-128.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0be3e7d2998d7a5f7d70fabb1b2c6818
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.126 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.126
deleted file mode 100644
index af501bb49e4c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.126
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.126
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.126 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.126
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-129.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-129.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0be3e7d2998d7a5f7d70fabb1b2c6818
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.127 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.127
deleted file mode 100644
index 11e7e5784dde..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.127
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.127
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.127 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.127
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-130.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-130.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0be3e7d2998d7a5f7d70fabb1b2c6818
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.128 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.128
deleted file mode 100644
index 8d4881622ac7..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.128
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.128
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.128 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.128
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-131.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-131.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0be3e7d2998d7a5f7d70fabb1b2c6818
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.129 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.129
index 38c08ded6249..731f4cbaf719 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.129
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.129
@@ -4,7 +4,7 @@ DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.129
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.129 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.129
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-133.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-133.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=688f8ebca8ef55f61f8b417c1a0cf846
+_md5_=5b186dfc4c1585348ee7ca5f08b1d988
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.132 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.132
new file mode 100644
index 000000000000..da782ce9d090
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.132
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.132
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.132 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.132
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-136.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-136.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=90061225b63ee2e6e582dba6f3d5f21a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.38 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.38
deleted file mode 100644
index 66ab8a610fa5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.38
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.38
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.38 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.38
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-41.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-41.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.38-1.xpak -> gentoo-kernel-5.10.38-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.38-1.xpak -> gentoo-kernel-5.10.38-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4233214f3c98b5a7e03e19ad157742ca
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.38-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.38-r1
deleted file mode 100644
index 79bf3a8564cf..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.38-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.38
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.38 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.38
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-41.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-41.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.38-1.xpak -> gentoo-kernel-5.10.38-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=39267b52203bf462a57d324fa2ad7335
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.43 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.43
deleted file mode 100644
index 91a907995992..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.43
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.43
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.43 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.43
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-47.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-47.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.43-1.xpak -> gentoo-kernel-5.10.43-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.43-1.xpak -> gentoo-kernel-5.10.43-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.43-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.43-r1
deleted file mode 100644
index 6787b8018b9a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.43-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.43
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.43 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.43
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-46.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-46.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.43-1.xpak -> gentoo-kernel-5.10.43-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.44 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.44
deleted file mode 100644
index 28e1cd8fc455..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.44
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.44
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.44 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.44
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-48.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.44-1.xpak -> gentoo-kernel-5.10.44-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.44-1.xpak -> gentoo-kernel-5.10.44-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.44-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.44-r1
deleted file mode 100644
index 85b30eb631ef..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.44-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.44
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.44 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.44
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-47.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-47.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.44-1.xpak -> gentoo-kernel-5.10.44-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.45 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.45
deleted file mode 100644
index 594057d5ffd0..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.45
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.45
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.45 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.45
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-49.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-49.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.45-1.xpak -> gentoo-kernel-5.10.45-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.45-1.xpak -> gentoo-kernel-5.10.45-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.45-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.45-r1
deleted file mode 100644
index 47406006ebea..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.45-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.45
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.45 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.45
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-48.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.45-1.xpak -> gentoo-kernel-5.10.45-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.46 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.46
deleted file mode 100644
index 2153a7c454a5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.46
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.46
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.46 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.46
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-50.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-50.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.46-1.xpak -> gentoo-kernel-5.10.46-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.46-1.xpak -> gentoo-kernel-5.10.46-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.46-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.46-r2
deleted file mode 100644
index bfe7aee87c4a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.46-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.46
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.46 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.46
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-49.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-49.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.46-1.xpak -> gentoo-kernel-5.10.46-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.47
index ece3b80708e9..ef380166302b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.47
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.47
@@ -4,7 +4,7 @@ DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.10.47
 RDEPEND=!sys-kernel/gentoo-kernel:5.10.47 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.47
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-51.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-51.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.47-1.xpak -> gentoo-kernel-5.10.47-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.47-1.xpak -> gentoo-kernel-5.10.47-1.x86.xpak )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70de02a54cbc49b1ccfa306794e5ceb8
+_md5_=835c5eedf1b9827ca8bd0652f5452449
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.47-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.47-r1
index b4a753d14cd3..518fa6cba0da 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.47-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.47-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
-KEYWORDS=~arm64
+KEYWORDS=arm64
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.10.47
 RDEPEND=!sys-kernel/gentoo-kernel:5.10.47 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.47
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-50.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-50.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.47-1.xpak -> gentoo-kernel-5.10.47-1.arm64.xpak )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10f924d9e2609c47462cf6e6560aebc8
+_md5_=b003d06d924fb794fca5ce42d472a8cc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.49-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.49-r1
new file mode 100644
index 000000000000..2161d9d2dd6a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.49-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.49
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.49 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.49
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-52.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-52.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.49-1.xpak -> gentoo-kernel-5.10.49-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.50 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.50
new file mode 100644
index 000000000000..f0840bdf7890
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.50
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.50
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.50 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.50
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-56.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-56.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.50-1.xpak -> gentoo-kernel-5.10.50-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.50-1.xpak -> gentoo-kernel-5.10.50-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=57a69e56a2a0ddd314c54789b46ea687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.50-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.50-r1
new file mode 100644
index 000000000000..3c2149c5f683
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.50-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.50
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.50 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.50
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-53.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-53.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.50-1.xpak -> gentoo-kernel-5.10.50-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.10
deleted file mode 100644
index 07380eacf500..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.10
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.10
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-11.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.10-1.xpak -> gentoo-kernel-5.12.10-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.10-1.xpak -> gentoo-kernel-5.12.10-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.10-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.10-r1
deleted file mode 100644
index 32aa0f168674..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.10-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.10
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.10
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-11.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.10-1.xpak -> gentoo-kernel-5.12.10-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=933962642b66cce533afd3ff5c4c28e1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.11 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.11
deleted file mode 100644
index 50efe839342f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.11
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.11
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-12.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11-1.xpak -> gentoo-kernel-5.12.11-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11-1.xpak -> gentoo-kernel-5.12.11-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.11-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.11-r1
deleted file mode 100644
index 1afc09d9837c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.11-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.11
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.11
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-12.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11-1.xpak -> gentoo-kernel-5.12.11-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=933962642b66cce533afd3ff5c4c28e1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.12
deleted file mode 100644
index dabb50ff6c9b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.12
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.12
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-13.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.12-1.xpak -> gentoo-kernel-5.12.12-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.12-1.xpak -> gentoo-kernel-5.12.12-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.12-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.12-r1
deleted file mode 100644
index d854d12f4696..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.12-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.12
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.12
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-13.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.12-1.xpak -> gentoo-kernel-5.12.12-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=933962642b66cce533afd3ff5c4c28e1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.13 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.13
deleted file mode 100644
index d7bb2039d0fb..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.13
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.13 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.13
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-16.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.13-1.xpak -> gentoo-kernel-5.12.13-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.13-1.xpak -> gentoo-kernel-5.12.13-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.13-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.13-r2
deleted file mode 100644
index 2a852d0f7e68..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.13-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.13
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.13 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.13
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-14.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.13-1.xpak -> gentoo-kernel-5.12.13-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=933962642b66cce533afd3ff5c4c28e1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.14 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.14
deleted file mode 100644
index 3a5529d8a045..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.14
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.14
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-17.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.14-1.xpak -> gentoo-kernel-5.12.14-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.14-1.xpak -> gentoo-kernel-5.12.14-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.14-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.14-r1
deleted file mode 100644
index b83b099c42bf..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.14-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.14
-RDEPEND=!sys-kernel/gentoo-kernel:5.12.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.14
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-15.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.14-1.xpak -> gentoo-kernel-5.12.14-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=933962642b66cce533afd3ff5c4c28e1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.16-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.16-r1
new file mode 100644
index 000000000000..47535fb12355
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.16-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.12.16
+RDEPEND=!sys-kernel/gentoo-kernel:5.12.16 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.12.16
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-17.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.16-1.xpak -> gentoo-kernel-5.12.16-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=933962642b66cce533afd3ff5c4c28e1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.17
new file mode 100644
index 000000000000..574c1361ffe6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.17
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.12.17
+RDEPEND=!sys-kernel/gentoo-kernel:5.12.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.12.17
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-20.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.17-1.xpak -> gentoo-kernel-5.12.17-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.17-1.xpak -> gentoo-kernel-5.12.17-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.17-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.17-r1
new file mode 100644
index 000000000000..618660be9166
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.17-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.12.17
+RDEPEND=!sys-kernel/gentoo-kernel:5.12.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.12.17
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-18.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.17-1.xpak -> gentoo-kernel-5.12.17-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=933962642b66cce533afd3ff5c4c28e1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.120 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.120
deleted file mode 100644
index c37982ad54f2..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.120
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.120
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.120 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.120
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-123.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-123.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.120-1.xpak -> gentoo-kernel-5.4.120-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.120-1.xpak -> gentoo-kernel-5.4.120-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9939491909982f514495c2fd5fae50b7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.120-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.120-r1
deleted file mode 100644
index 29aaab3ed87c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.120-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.120
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.120 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.120
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-123.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-123.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.120-1.xpak -> gentoo-kernel-5.4.120-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b003d06d924fb794fca5ce42d472a8cc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.125 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.125
deleted file mode 100644
index 1df02d6d7575..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.125
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.125
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.125 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.125
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-128.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-128.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.125-1.xpak -> gentoo-kernel-5.4.125-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.125-1.xpak -> gentoo-kernel-5.4.125-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.125-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.125-r1
deleted file mode 100644
index 35d650b0cd83..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.125-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.125
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.125 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.125
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-128.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-128.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.125-1.xpak -> gentoo-kernel-5.4.125-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.126 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.126
deleted file mode 100644
index 8c5f326dc153..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.126
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.126
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.126 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.126
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-129.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-129.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.126-1.xpak -> gentoo-kernel-5.4.126-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.126-1.xpak -> gentoo-kernel-5.4.126-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.126-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.126-r1
deleted file mode 100644
index 8611650a437f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.126-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.126
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.126 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.126
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-129.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-129.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.126-1.xpak -> gentoo-kernel-5.4.126-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.127 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.127
deleted file mode 100644
index 61888548f6cb..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.127
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.127
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.127 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.127
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-130.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-130.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.127-1.xpak -> gentoo-kernel-5.4.127-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.127-1.xpak -> gentoo-kernel-5.4.127-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.127-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.127-r1
deleted file mode 100644
index 97a27083a4b4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.127-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.127
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.127 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.127
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-130.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-130.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.127-1.xpak -> gentoo-kernel-5.4.127-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.128 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.128
deleted file mode 100644
index 9ce106c77176..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.128
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.128
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.128 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.128
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-131.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-131.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.128-1.xpak -> gentoo-kernel-5.4.128-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.128-1.xpak -> gentoo-kernel-5.4.128-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.128-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.128-r2
deleted file mode 100644
index 6182a28363c8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.128-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.128
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.128 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.128
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-131.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-131.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.128-1.xpak -> gentoo-kernel-5.4.128-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.129 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.129
index e3d8af6ded6b..21c3b8d25cfd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.129
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.129
@@ -4,7 +4,7 @@ DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.129
 RDEPEND=!sys-kernel/gentoo-kernel:5.4.129 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.129
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-133.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-133.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.129-1.xpak -> gentoo-kernel-5.4.129-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.129-1.xpak -> gentoo-kernel-5.4.129-1.x86.xpak )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70de02a54cbc49b1ccfa306794e5ceb8
+_md5_=835c5eedf1b9827ca8bd0652f5452449
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.129-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.129-r1
index 0cc6cb113ea6..b6da6e552c69 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.129-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.129-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
-KEYWORDS=~arm64
+KEYWORDS=arm64
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.129
 RDEPEND=!sys-kernel/gentoo-kernel:5.4.129 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.129
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-132.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-132.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.129-1.xpak -> gentoo-kernel-5.4.129-1.arm64.xpak )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10f924d9e2609c47462cf6e6560aebc8
+_md5_=b003d06d924fb794fca5ce42d472a8cc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.131-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.131-r1
new file mode 100644
index 000000000000..094c11351f07
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.131-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.131
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.131 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.131
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-134.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-134.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.131-1.xpak -> gentoo-kernel-5.4.131-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.132 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.132
new file mode 100644
index 000000000000..e692d9113aa9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.132
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.132
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.132 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.132
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-136.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-136.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.132-1.xpak -> gentoo-kernel-5.4.132-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.132-1.xpak -> gentoo-kernel-5.4.132-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.132-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.132-r1
new file mode 100644
index 000000000000..74d3df7b0d83
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.132-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.132
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.132 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.132
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-135.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-135.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.132-1.xpak -> gentoo-kernel-5.4.132-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.234 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.234
deleted file mode 100644
index a21b7c0c56ad..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.234
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-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
-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.234
-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-244.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-244.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-244.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-244.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-244.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-244.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-244.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-244.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-244.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fef188df7aca6fd875546dbff5957909
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.235 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.235
deleted file mode 100644
index f827379851a1..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.235
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.235
-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-245.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-245.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-245.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-245.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-245.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-245.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-245.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-245.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-245.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=94709ed017a2f7b70b0bafb8550ba890
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.236 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.236
deleted file mode 100644
index 8d2444b773bc..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.236
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.236
-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-246.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-246.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-246.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-246.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-246.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-246.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-246.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-246.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-246.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f6fb91ad3260187f157a0efea56d8c7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.239 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.239
index a3cb1f3a60c0..ff248e423382 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.239
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.239
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
 EAPI=7
 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.239
 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-249.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-249.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-249.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-249.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-249.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-249.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-249.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-249.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-249.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5d04ced23892989271f8f8af02e61c46
+_md5_=314549768780bf7049fdf15744b73f58
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.192 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.192
deleted file mode 100644
index c7ce053445d1..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.192
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-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
-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.192
-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-191.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-191.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-191.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-191.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-191.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-191.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-191.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-191.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-191.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=40ff19ce562780c68d2310baece237d9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.193 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.193
deleted file mode 100644
index 4963249903ce..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.193
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.193
-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-192.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-192.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-192.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-192.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-192.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-192.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-192.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-192.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-192.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d7d1aeb4eb3fe65e1cc092dacd4b4089
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.194 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.194
deleted file mode 100644
index 6e7649a98c70..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.194
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.194
-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-193.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-193.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-193.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-193.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-193.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-193.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-193.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-193.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-193.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9db5fef3939a442f5e2b2c05e52f8876
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.197 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.197
index 249200a1b5e7..2bca4a79e0c8 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.197
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.197
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
 EAPI=7
 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.197
 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-196.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-196.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-196.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-196.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-196.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-196.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-196.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-196.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-196.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5345ab75afb31b2eabd24d5669b5c63a
+_md5_=3f0ba049c4797cb26f207ec030518868
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.270 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.270
deleted file mode 100644
index d6eb0ac62c5a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.270
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-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
-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.270
-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-272.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-272.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-272.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-272.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-272.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-272.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-272.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-272.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-272.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ec1ae1481150fe445916d8cbff668445
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.271 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.271
deleted file mode 100644
index e08a7d19b96b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.271
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( 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.271
-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-273.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-273.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-273.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-273.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-273.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-273.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-273.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-273.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-273.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=72e66e960b29795c5d2152d9f7e4403b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.272 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.272
deleted file mode 100644
index f67d656c6b7c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.272
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( 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.272
-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-274.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-274.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-274.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-274.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-274.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-274.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-274.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-274.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-274.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=87c35452dcddeac59c12d8072e5a3aed
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.275 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.275
index 509e70bb6ae8..bc888ed2aff4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.275
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.275
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
 EAPI=7
 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.275
 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-277.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-277.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-277.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-277.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-277.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-277.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-277.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-277.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-277.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c2ac761fca23274c402a8cd93786e9c1
+_md5_=f9087580d3cf2b95bde2fecb595aba9e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.270 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.270
deleted file mode 100644
index ef3cc5501b77..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.270
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-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
-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.270
-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-274.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-274.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-274.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-274.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-274.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-274.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-274.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-274.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-274.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cc3c1eebc6ad0debb2fd40176f0037d5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.271 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.271
deleted file mode 100644
index 0b7f6bead567..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.271
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( 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.271
-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-275.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-275.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-275.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-275.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-275.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-275.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-275.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-275.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-275.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=129b592c56acb21c22361008dbae22fc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.272 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.272
deleted file mode 100644
index cb07dc6616e8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.272
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( 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.272
-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-276.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-276.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-276.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-276.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-276.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-276.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-276.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-276.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-276.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=541a2ac4b5a36a6958fcf1c8007b1375
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.275 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.275
index a4c6d249ff67..34085185d148 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.275
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.275
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
 EAPI=7
 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.275
 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-279.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-279.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-279.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-279.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-279.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-279.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-279.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-279.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-279.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da915429ba555b09ac1ddc412d25f750
+_md5_=0231e6d32c0a8e1a5ab21c281006cc51
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.40 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.40
deleted file mode 100644
index 3be8793a2754..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.40
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 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 ~riscv ~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.10.40
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-43.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-43.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-43.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-43.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-43.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-43.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-43.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-43.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-43.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=609a2d1610788a3c3fe8d490b03da940
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.41 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.41
deleted file mode 100644
index 6d34d989d84a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.41
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.41
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-44.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-44.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-44.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-44.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-44.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-44.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-44.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-44.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-44.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6bfab688b0406ee3968ac3cfd09a1944
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.42 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.42
deleted file mode 100644
index d8ba31b0ef01..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.42
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.42
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-45.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-45.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-45.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-45.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-45.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-45.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-45.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-45.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-45.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eac6e1c199f38c804e7021299942c099
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.43-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.43-r1
deleted file mode 100644
index 7a77a6524a77..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.43-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.43-r1
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-47.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-47.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-47.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-47.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-47.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-47.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-47.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-47.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-47.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7f557eacda8f02f610ba5f79f07bf4a2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.44 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.44
deleted file mode 100644
index f1efd12ead17..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.44
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.44
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-48.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-48.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-48.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-48.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-48.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-48.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-48.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-48.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e2ee6d5f1224681966a6cf9c48d36ad5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.45 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.45
deleted file mode 100644
index e09073b60444..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.45
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.45
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-49.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-49.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-49.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-49.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-49.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-49.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-49.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-49.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-49.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=efbd10bf046dab79145076567eb5c511
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.46 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.46
deleted file mode 100644
index dea9ae3042e8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.46
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.46
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-50.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-50.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-50.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-50.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-50.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-50.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-50.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-50.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-50.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da59a169e39b3722b91212aef4f65dec
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.49-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.49-r1
new file mode 100644
index 000000000000..63e04df5e015
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.49-r1
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.49-r1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-55.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-55.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-55.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-55.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-55.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-55.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-55.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-55.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-55.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=06b1b97cadb479483c4040fda3494c54
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.50 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.50
new file mode 100644
index 000000000000..a1ac89f1c7e0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.50
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.50
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-56.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-56.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-56.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-56.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-56.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-56.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-56.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-56.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-56.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6be306f94815f3a798000bdf286dd0c9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.10 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.10
deleted file mode 100644
index 62a0e0c87ec4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.12 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.12.10
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-11.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-11.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-11.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-11.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-11.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-11.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-11.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-11.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a33a665ae7aed20d2faa77ae3f246350
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.11 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.11
deleted file mode 100644
index b02248357806..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.11
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.12 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.12.11
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-12.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-12.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-12.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-12.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-12.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-12.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-12.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-12.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d8d9108fef5424ec45ff22f496383695
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.12
deleted file mode 100644
index f1148f0ede06..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.12 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.12.12
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-15.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-15.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-15.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-15.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-15.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-15.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-15.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-15.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aea043ce22dd26d91583756cd86896de
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.17 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.17
new file mode 100644
index 000000000000..6c3afc78bdef
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.17
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.12 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( 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.12.17
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-20.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-20.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-20.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-20.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-20.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-20.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-20.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-20.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=20cb4bebf2a67b52f42ac97fff706575
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.7
deleted file mode 100644
index a0dd15b8afba..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.12 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 ~riscv ~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.12.7
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-8.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-8.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-8.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-8.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-8.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-8.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-8.experimental.tar.xz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17044596e01bdbfb5ec162f71671df16
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.8
deleted file mode 100644
index d134e01af075..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.12 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.12.8
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-9.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-9.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-9.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-9.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-9.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-9.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-9.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4edb4038fe406edb7656824dee29f708
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.9
deleted file mode 100644
index 8ff27e8ec9ca..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.12 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.12.9
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-10.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-10.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-10.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-10.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-10.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-10.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-10.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9e120c4716a97df2b2dd3cec9b8f0285
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.0
deleted file mode 100644
index a4e33447800d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.13 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.13.0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-1.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-1.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-1.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-1.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3e80ed32c50dfd538ab749a1b1267e02
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.2 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.2
new file mode 100644
index 000000000000..77d3217e8828
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.2
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.13 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.13.2
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-4.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-4.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-4.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-4.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-4.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-4.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-4.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-4.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=90ac6c786150f87fab246658a893f17f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.123 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.123
deleted file mode 100644
index ceb570e9756e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.123
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.123
-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-126.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-126.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-126.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-126.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-126.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-126.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-126.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-126.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-126.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7d05f648834816e29bfb9d8354f9023
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.124 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.124
deleted file mode 100644
index 81dae31b9b03..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.124
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.124
-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-127.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-127.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-127.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-127.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-127.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-127.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-127.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-127.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-127.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=34a3444e8f25923feeb673df89426b67
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.125 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.125
deleted file mode 100644
index 511c6da68598..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.125
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.125
-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-128.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-128.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-128.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-128.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-128.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-128.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-128.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-128.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-128.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5a9998c6f2ee7dea3370259daab08dc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.126 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.126
deleted file mode 100644
index c212afeccd12..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.126
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.126
-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-129.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-129.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-129.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-129.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-129.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-129.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-129.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-129.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-129.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b44bc3923e62519410e29bdb18adeb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.127 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.127
deleted file mode 100644
index 3704e78c5124..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.127
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.127
-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-130.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-130.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-130.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-130.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-130.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-130.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-130.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-130.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-130.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2357839a57c714db09d67b0f13bd3d45
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.128 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.128
deleted file mode 100644
index ef235f8eebac..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.128
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
-EAPI=7
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.128
-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-131.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-131.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-131.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-131.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-131.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-131.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-131.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-131.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-131.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2200cd7b882b6d761d8e4e8a65b7dbc2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.131 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.131
index 05c7883cda15..3c3db4df7597 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.131
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.131
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
 EAPI=7
 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.131
 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-135.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-135.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-135.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-135.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-135.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-135.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-135.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-135.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-135.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=60d27b4c59a705aea16cc19171d8a22c
+_md5_=22b3a2631d33965b7337d607bdf7956b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.132 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.132
new file mode 100644
index 000000000000..a72883266e8a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.132
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( 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.132
+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-136.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-136.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-136.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-136.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-136.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-136.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-136.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-136.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-136.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8790c5908c626dc4c6ef8886b28e3d08
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-5.10.17 b/metadata/md5-cache/sys-kernel/linux-docs-5.10.17
deleted file mode 100644
index a94503b0a346..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-docs-5.10.17
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-python/sphinx dev-python/sphinx_rtd_theme media-libs/fontconfig
-DEFINED_PHASES=compile install prepare setup
-DESCRIPTION=Developer documentation generated from the Linux kernel
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f3e0be147f1f6074b9669c8c2d2f36cf
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-5.10.50 b/metadata/md5-cache/sys-kernel/linux-docs-5.10.50
new file mode 100644
index 000000000000..36d55c016a2c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-docs-5.10.50
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-python/sphinx dev-python/sphinx_rtd_theme media-libs/fontconfig
+DEFINED_PHASES=compile install prepare setup
+DESCRIPTION=Developer documentation generated from the Linux kernel
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=graphviz
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=graphviz? ( media-gfx/graphviz )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ad4adf95a98b0ff6e818649323801b3e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.10_p12 b/metadata/md5-cache/sys-kernel/pf-sources-5.10_p12
deleted file mode 100644
index 0f84c31827f1..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.10_p12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=6
-HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10_p12
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.10...v5.10-pf12.diff -> pf-sources-5.10_p12.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-1.extras.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54a58c81dcab848f18df9010256f5264
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2
new file mode 100644
index 000000000000..88053d88d1b0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=7
+HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.13_p2
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.13...v5.13-pf2.diff -> pf-sources-5.13_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.13/prjc_v5.13-r1.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4996c8507f1b78e3dd06822d09187a2e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7 b/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
deleted file mode 100644
index e823ee85129c..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=6
-HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.9_p7
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.9...v5.9-pf7.diff -> pf-sources-5.9_p7.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.extras.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=31cdb42e03dfb5e21e7677d52e13296e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.43 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.43
deleted file mode 100644
index a7759f18b7e9..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.43
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.43
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.43 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.43
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.43.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.43.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.44 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.44
deleted file mode 100644
index 087f83bc5a7e..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.44
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.44
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.44 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.44
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.44.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.44.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.45 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.45
deleted file mode 100644
index ed01ee83a742..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.45
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.45
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.45 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.45
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.45.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.45.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.46 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.46
deleted file mode 100644
index 0bbdc3469597..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.46
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.46
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.46 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.46
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.46.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.46.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.50 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.50
new file mode 100644
index 000000000000..d7fdeaa209fe
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.50
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.50
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.50 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.50
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.50.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.50.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.10 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.10
deleted file mode 100644
index e72e2234019d..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.10
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.12.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.10
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.10.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.10.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=5df19398044f74fd0dd076acc605cac3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.11 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.11
deleted file mode 100644
index d77b5b5d64ed..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.11
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.12.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.11
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.11.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.11.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=5df19398044f74fd0dd076acc605cac3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.12 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.12
deleted file mode 100644
index 68a960fbcf18..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.12
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.12.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.12
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.12.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.12.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=5df19398044f74fd0dd076acc605cac3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.13 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.13
deleted file mode 100644
index 1ed9b1a4a513..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.13
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.12.13 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.13
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.13.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.13.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=5df19398044f74fd0dd076acc605cac3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.14 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.14
deleted file mode 100644
index c6bb2e4a300d..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.12.14
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.12.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.12.14
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.14.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.14.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=5df19398044f74fd0dd076acc605cac3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.17 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.17
new file mode 100644
index 000000000000..bee6b1fefe42
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.17
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.12.17
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.12.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.12.17
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.17.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.17.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=5df19398044f74fd0dd076acc605cac3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.120 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.120
deleted file mode 100644
index 07c2f7f9f5d0..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.120
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.120
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.120 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.120
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.120.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.120.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.125 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.125
deleted file mode 100644
index 02a349c32aac..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.125
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.125
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.125 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.125
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.125.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.125.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.126 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.126
deleted file mode 100644
index b9a9efd9d932..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.126
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.126
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.126 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.126
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.126.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.126.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.127 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.127
deleted file mode 100644
index be23c0245f41..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.127
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.127
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.127 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.127
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.127.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.127.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.128 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.128
deleted file mode 100644
index 11a6f33b34e8..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.128
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.128
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.128 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.128
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.128.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.128.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.132 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.132
new file mode 100644
index 000000000000..eb458b9fd69b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.132
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.132
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.132 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.132
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.132.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.132.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	0e50d459e3b8aef7799ea582ded425d5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.49 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.49
deleted file mode 100644
index c17142feca40..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.49
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.49
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.49.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.50 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.50
new file mode 100644
index 000000000000..cc0cc5f95e2d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.50
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.50
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.50.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.16 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.16
deleted file mode 100644
index 925a272dda07..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.12.16
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.12.16.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.17 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.17
new file mode 100644
index 000000000000..7f456c6fff8a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( 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.12.17
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.12.17.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.1 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.1
deleted file mode 100644
index b9dd1a93ba8d..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.13.1
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.1.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.2 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.2
new file mode 100644
index 000000000000..d5f3c25e03ed
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.13.2
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.2.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.131 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.131
deleted file mode 100644
index 39829cc3c32d..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.131
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( 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.131
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.131.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.132 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.132
new file mode 100644
index 000000000000..10a3dc678043
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.132
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( 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.132
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.132.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	9788655f424cd85443f40d85540c700c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 3ec476b495c7..0a9d103128a6 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/glibc-2.33-r2 b/metadata/md5-cache/sys-libs/glibc-2.33-r2
new file mode 100644
index 000000000000..983a7d67783c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.33-r2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DESCRIPTION=GNU libc C library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RESTRICT=!test? ( test )
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.33.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.33-patches-4.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2a00ff5e6a8aa775612de5f96b6e1166
diff --git a/metadata/md5-cache/sys-libs/glibc-2.33-r3 b/metadata/md5-cache/sys-libs/glibc-2.33-r3
new file mode 100644
index 000000000000..5e64b710e32e
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.33-r3
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DESCRIPTION=GNU libc C library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RESTRICT=!test? ( test )
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.33.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.33-patches-4.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ab371d4cad4aa908217541a53a2e4ae7
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 8a0bb5b891fb..daa25a138abb 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -12,5 +12,5 @@ RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b8cf0f32ca57798cbb740350aa9bbdd3
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bb38628fca510112c03651e0a89b24a5
diff --git a/metadata/md5-cache/sys-libs/kpmcore-21.04.2 b/metadata/md5-cache/sys-libs/kpmcore-21.04.2
deleted file mode 100644
index 92fa19ced83e..000000000000
--- a/metadata/md5-cache/sys-libs/kpmcore-21.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=sys-apps/util-linux-2.33.2 sys-auth/polkit-qt dev-qt/qtcore:5
-DESCRIPTION=Library for managing partitions
-EAPI=7
-HOMEPAGE=https://apps.kde.org/partitionmanager/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=sys-apps/util-linux-2.33.2 sys-auth/polkit-qt >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test
-SLOT=5/10
-SRC_URI=mirror://kde/stable/release-service/21.04.2/src/kpmcore-21.04.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bfd4a6aee5dbcabbebde8dd034856230
diff --git a/metadata/md5-cache/sys-libs/ldb-2.4.0 b/metadata/md5-cache/sys-libs/ldb-2.4.0
new file mode 100644
index 000000000000..294bf37476ea
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-2.4.0
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/libxslt virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.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(-)?] >=sys-libs/tevent-0.11.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(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=LDAP-like embedded database
+EAPI=7
+HOMEPAGE=https://ldb.samba.org
+IUSE=doc +ldap +lmdb python test python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-3
+RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.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(-)?] >=sys-libs/tevent-0.11.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(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) test? ( python )
+RESTRICT=!test? ( test )
+SLOT=0/2.4.0
+SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.4.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
+_md5_=767734696fd184e39393b8d933d3d0c6
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r1 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r1
new file mode 100644
index 000000000000..bedf1a02de1a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl sys-apps/findutils test? ( || ( ( dev-lang/python:3.10 dev-python/passlib[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/passlib[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/passlib[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) !sys-libs/musl )
+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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.23-autotools.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bd4ecfc9aa838de127465eabe14c0e41
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r2 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r2
new file mode 100644
index 000000000000..553e2e5a91ed
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl sys-apps/findutils test? ( || ( ( dev-lang/python:3.10 dev-python/passlib[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/passlib[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/passlib[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) !sys-libs/musl )
+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
+LICENSE=LGPL-2.1+ public-domain BSD BSD-2
+RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) !sys-libs/musl )
+REQUIRED_USE=split-usr? ( system )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.23-autotools.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d80448ef92ba7b9d1c3bb96cfc5e2a7b
diff --git a/metadata/md5-cache/sys-libs/talloc-2.3.3 b/metadata/md5-cache/sys-libs/talloc-2.3.3
new file mode 100644
index 000000000000..d99c9f8ded61
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/talloc-2.3.3
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/libxslt sys-devel/gettext
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) !!<sys-libs/talloc-2.0.5
+DESCRIPTION=Samba talloc library
+EAPI=7
+HOMEPAGE=https://talloc.samba.org/
+IUSE=compat +python python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-3 LGPL-3+ LGPL-2
+RDEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) !!<sys-libs/talloc-2.0.5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.3.3.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
+_md5_=d3e3e912784379619c4690ba93ab7c98
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.4 b/metadata/md5-cache/sys-libs/tdb-1.4.4
new file mode 100644
index 000000000000..bd1f04ca4fde
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.4
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xml-dtd:4.2
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+DESCRIPTION=Simple database API
+EAPI=7
+HOMEPAGE=https://tdb.samba.org/
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://samba.org/ftp/tdb/tdb-1.4.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
+_md5_=34d48fdf8f05c05e6b65291b0e7aa132
diff --git a/metadata/md5-cache/sys-libs/tevent-0.11.0 b/metadata/md5-cache/sys-libs/tevent-0.11.0
new file mode 100644
index 000000000000..fd7ae5d10498
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tevent-0.11.0
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) >=dev-util/cmocka-1.1.3 elibc_glibc? ( net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) )
+DESCRIPTION=Samba tevent library
+EAPI=7
+HOMEPAGE=https://tevent.samba.org/
+IUSE=elibc_glibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-3
+RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://samba.org/ftp/tevent/tevent-0.11.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
+_md5_=0e5d245b640af4d13a829aea86c596e1
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index c102df770201..f2df635e36a3 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/nut-2.7.4-r7 b/metadata/md5-cache/sys-power/nut-2.7.4-r7
index caee64509237..1e5b70d7c5e7 100644
--- a/metadata/md5-cache/sys-power/nut-2.7.4-r7
+++ b/metadata/md5-cache/sys-power/nut-2.7.4-r7
@@ -11,5 +11,5 @@ RDEPEND=acct-group/nut acct-user/nut dev-libs/libltdl:* net-libs/libnsl virtual/
 REQUIRED_USE=ups_drivers_usbhid-ups? ( usb ) ups_drivers_bcmxcp_usb? ( usb ) ups_drivers_tripplite_usb? ( usb ) ups_drivers_blazer_usb? ( usb ) ups_drivers_richcomm_usb? ( usb ) ups_drivers_riello_usb? ( usb ) ups_drivers_nutdrv_qx? ( usb ) ups_drivers_netxml-ups? ( xml ) ups_drivers_snmp-ups? ( snmp ) ups_drivers_nut-ipmipsu? ( ipmi )
 SLOT=0
 SRC_URI=https://networkupstools.org/source/2.7/nut-2.7.4.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=84ee746719cb3e8c6bd878d39e622cd4
diff --git a/metadata/md5-cache/sys-power/sispmctl-4.1-r1 b/metadata/md5-cache/sys-power/sispmctl-4.1-r1
index 3d1d82b9d049..87669c141c3b 100644
--- a/metadata/md5-cache/sys-power/sispmctl-4.1-r1
+++ b/metadata/md5-cache/sys-power/sispmctl-4.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 acct-group/sispmctl
 SLOT=0
 SRC_URI=mirror://sourceforge/sispmctl/sispmctl-4.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=b4218aebbd6d323ff70625c8d964155d
diff --git a/metadata/md5-cache/sys-power/upower-0.99.12 b/metadata/md5-cache/sys-power/upower-0.99.12
new file mode 100644
index 000000000000..61599671a1d9
--- /dev/null
+++ b/metadata/md5-cache/sys-power/upower-0.99.12
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig doc? ( dev-util/gtk-doc ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=dev-libs/glib-2.38:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( dev-libs/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-2:= ) )
+DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history and statistics
+EAPI=8
+HOMEPAGE=https://upower.freedesktop.org/
+IUSE=doc +introspection ios kernel_FreeBSD kernel_linux selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.38:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( dev-libs/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-2:= ) ) selinux? ( sec-policy/selinux-devicekit )
+SLOT=0/3
+SRC_URI=https://gitlab.freedesktop.org/upower/upower/uploads/244f5966c58773bbd3b4c507c549560f/upower-0.99.12.tar.xz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=95df669316adde591a74216aa6b5c74f
diff --git a/metadata/md5-cache/sys-power/upower-0.99.9-r1 b/metadata/md5-cache/sys-power/upower-0.99.9-r1
deleted file mode 100644
index 927c42fb4891..000000000000
--- a/metadata/md5-cache/sys-power/upower-0.99.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( dev-libs/libgudev:= virtual/libusb:1 virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) doc? ( dev-util/gtk-doc ) dev-libs/libxslt app-text/docbook-xsl-stylesheets dev-util/intltool >=sys-devel/gettext-0.17 virtual/pkgconfig
-DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history and statistics
-EAPI=7
-HOMEPAGE=https://upower.freedesktop.org/
-IUSE=doc +introspection ios kernel_FreeBSD kernel_linux selinux
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( dev-libs/libgudev:= virtual/libusb:1 virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) selinux? ( sec-policy/selinux-devicekit )
-SLOT=0/3
-SRC_URI=https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/upower-0.99.9.tar.xz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5a465a2fe449b870b35efd9b98d71cbd
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 0e8ad2d53a93..cdc363e8402a 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/at-3.1.23-r1 b/metadata/md5-cache/sys-process/at-3.1.23-r1
deleted file mode 100644
index ebb8b5f7b0e0..000000000000
--- a/metadata/md5-cache/sys-process/at-3.1.23-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/mta >=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a pam? ( sys-libs/pam )
-DESCRIPTION=Queues jobs for later execution
-EAPI=7
-HOMEPAGE=https://packages.qa.debian.org/a/at.html
-IUSE=pam selinux
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/at/at_3.1.23.orig.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=676b9c637502bf8654f0d49fd916fecf
diff --git a/metadata/md5-cache/sys-process/at-3.2.1-r1 b/metadata/md5-cache/sys-process/at-3.2.1-r1
deleted file mode 100644
index c7971b62b6ee..000000000000
--- a/metadata/md5-cache/sys-process/at-3.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/mta >=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a pam? ( sys-libs/pam )
-DESCRIPTION=Queues jobs for later execution
-EAPI=7
-HOMEPAGE=http://blog.calhariz.com/index.php/tag/at https://packages.qa.debian.org/a/at.html
-IUSE=pam selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
-SLOT=0
-SRC_URI=http://software.calhariz.com/at/at_3.2.1.orig.tar.gz mirror://debian/pool/main/a/at/at_3.2.1.orig.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2fd8055729f17a601cc4d6d2d8ddd87a
diff --git a/metadata/md5-cache/sys-process/at-3.2.2-r1 b/metadata/md5-cache/sys-process/at-3.2.2-r2
index b8ea08e72469..b8ea08e72469 100644
--- a/metadata/md5-cache/sys-process/at-3.2.2-r1
+++ b/metadata/md5-cache/sys-process/at-3.2.2-r2
diff --git a/metadata/md5-cache/sys-process/audit-3.0.2 b/metadata/md5-cache/sys-process/audit-3.0.2
new file mode 100644
index 000000000000..8a63eaf3d3c4
--- /dev/null
+++ b/metadata/md5-cache/sys-process/audit-3.0.2
@@ -0,0 +1,16 @@
+BDEPEND=python? ( dev-lang/swig:0 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=sys-kernel/linux-headers-2.6.34
+DESCRIPTION=Userspace utilities for storing and processing auditing records
+EAPI=7
+HOMEPAGE=https://people.redhat.com/sgrubb/audit/
+IUSE=gssapi ldap python 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 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://people.redhat.com/sgrubb/audit/audit-3.0.2.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_md5_=f47f6c2a73a027c1152536fe7417e815
diff --git a/metadata/md5-cache/sys-process/below-0.2.0 b/metadata/md5-cache/sys-process/below-0.2.0
new file mode 100644
index 000000000000..9db5e279d4e9
--- /dev/null
+++ b/metadata/md5-cache/sys-process/below-0.2.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/rust[rustfmt] dev-lang/rust-bin[rustfmt] ) virtual/pkgconfig >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=virtual/libelf sys-libs/zlib dev-libs/libbpf sys-libs/ncurses
+DESCRIPTION=An interactive tool to view and record historical system data
+EAPI=7
+HOMEPAGE=https://github.com/facebookincubator/below
+IUSE=debug
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 ISC LGPL-2.1 MIT MPL-2.0 Unlicense
+RDEPEND=virtual/libelf sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/facebookincubator/below/archive/refs/tags/v0.2.0.tar.gz -> below-0.2.0.tar.gz https://crates.io/api/v1/crates/ahash/0.6.3/download -> ahash-0.6.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/array-macro/1.0.5/download -> array-macro-1.0.5.crate https://crates.io/api/v1/crates/async-trait/0.1.50/download -> async-trait-0.1.50.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bytes/0.5.6/download -> bytes-0.5.6.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/cargo-platform/0.1.1/download -> cargo-platform-0.1.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.12.3/download -> cargo_metadata-0.12.3.crate https://crates.io/api/v1/crates/cc/1.0.68/download -> cc-1.0.68.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crossterm/0.19.0/download -> crossterm-0.19.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.7.0/download -> crossterm_winapi-0.7.0.crate https://crates.io/api/v1/crates/cursive/0.16.3/download -> cursive-0.16.3.crate https://crates.io/api/v1/crates/cursive_buffered_backend/0.5.0/download -> cursive_buffered_backend-0.5.0.crate https://crates.io/api/v1/crates/cursive_core/0.2.2/download -> cursive_core-0.2.2.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/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/enum-map/0.6.4/download -> enum-map-0.6.4.crate https://crates.io/api/v1/crates/enum-map-derive/0.4.6/download -> enum-map-derive-0.4.6.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.31/download -> futures-0.1.31.crate https://crates.io/api/v1/crates/futures/0.3.15/download -> futures-0.3.15.crate https://crates.io/api/v1/crates/futures-channel/0.3.15/download -> futures-channel-0.3.15.crate https://crates.io/api/v1/crates/futures-core/0.3.15/download -> futures-core-0.3.15.crate https://crates.io/api/v1/crates/futures-executor/0.3.15/download -> futures-executor-0.3.15.crate https://crates.io/api/v1/crates/futures-io/0.3.15/download -> futures-io-0.3.15.crate https://crates.io/api/v1/crates/futures-macro/0.3.15/download -> futures-macro-0.3.15.crate https://crates.io/api/v1/crates/futures-sink/0.3.15/download -> futures-sink-0.3.15.crate https://crates.io/api/v1/crates/futures-task/0.3.15/download -> futures-task-0.3.15.crate https://crates.io/api/v1/crates/futures-util/0.3.15/download -> futures-util-0.3.15.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/half/1.7.1/download -> half-1.7.1.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/hostname/0.3.1/download -> hostname-0.3.1.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.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/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/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/libbpf-cargo/0.7.1/download -> libbpf-cargo-0.7.1.crate https://crates.io/api/v1/crates/libbpf-rs/0.10.0/download -> libbpf-rs-0.10.0.crate https://crates.io/api/v1/crates/libbpf-sys/0.3.0-2/download -> libbpf-sys-0.3.0-2.crate https://crates.io/api/v1/crates/libc/0.2.96/download -> libc-0.2.96.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/match_cfg/0.1.0/download -> match_cfg-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio/0.7.11/download -> mio-0.7.11.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.7/download -> mio-named-pipes-0.1.7.crate https://crates.io/api/v1/crates/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num_enum/0.5.1/download -> num_enum-0.5.1.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.1/download -> num_enum_derive-0.5.1.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/openat/0.1.21/download -> openat-0.1.21.crate https://crates.io/api/v1/crates/os_info/2.0.1/download -> os_info-2.0.1.crate https://crates.io/api/v1/crates/owning_ref/0.4.1/download -> owning_ref-0.4.1.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/paste/1.0.5/download -> paste-1.0.5.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.12/download -> pin-project-lite-0.1.12.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.6/download -> pin-project-lite-0.2.6.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.8/download -> redox_syscall-0.2.8.crate https://crates.io/api/v1/crates/redox_termios/0.1.2/download -> redox_termios-0.1.2.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustversion/1.0.5/download -> rustversion-1.0.5.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.10.2/download -> scroll-0.10.2.crate https://crates.io/api/v1/crates/scroll_derive/0.10.5/download -> scroll_derive-0.10.5.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.118/download -> serde-1.0.118.crate https://crates.io/api/v1/crates/serde_cbor/0.11.1/download -> serde_cbor-0.11.1.crate https://crates.io/api/v1/crates/serde_derive/1.0.118/download -> serde_derive-1.0.118.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook/0.3.9/download -> signal-hook-0.3.9.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.3/download -> slab-0.4.3.crate https://crates.io/api/v1/crates/slog/2.7.0/download -> slog-2.7.0.crate https://crates.io/api/v1/crates/slog-async/2.6.0/download -> slog-async-2.6.0.crate https://crates.io/api/v1/crates/slog-term/2.8.0/download -> slog-term-2.8.0.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/strum_macros/0.18.0/download -> strum_macros-0.18.0.crate https://crates.io/api/v1/crates/syn/1.0.73/download -> syn-1.0.73.crate https://crates.io/api/v1/crates/take_mut/0.2.2/download -> take_mut-0.2.2.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/term/0.7.0/download -> term-0.7.0.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.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.25/download -> thiserror-1.0.25.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.25/download -> thiserror-impl-1.0.25.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.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.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tokio/0.2.25/download -> tokio-0.2.25.crate https://crates.io/api/v1/crates/tokio-macros/0.2.6/download -> tokio-macros-0.2.6.crate https://crates.io/api/v1/crates/toml/0.5.7/download -> toml-0.5.7.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vsprintf/2.0.0/download -> vsprintf-2.0.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasmer_enumset/1.0.1/download -> wasmer_enumset-1.0.1.crate https://crates.io/api/v1/crates/wasmer_enumset_derive/0.5.0/download -> wasmer_enumset_derive-0.5.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.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/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xi-unicode/0.3.0/download -> xi-unicode-0.3.0.crate https://crates.io/api/v1/crates/zstd/0.7.0+zstd.1.4.9/download -> zstd-0.7.0+zstd.1.4.9.crate https://crates.io/api/v1/crates/zstd-safe/3.1.0+zstd.1.4.9/download -> zstd-safe-3.1.0+zstd.1.4.9.crate https://crates.io/api/v1/crates/zstd-sys/1.5.0+zstd.1.4.9/download -> zstd-sys-1.5.0+zstd.1.4.9.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=eab4c31874c2dd2d96fae2eee7286a26
diff --git a/metadata/md5-cache/sys-process/cronie-1.5.5-r1 b/metadata/md5-cache/sys-process/cronie-1.5.5-r1
deleted file mode 100644
index 246aff84ea6b..000000000000
--- a/metadata/md5-cache/sys-process/cronie-1.5.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) elibc_uclibc? ( sys-libs/obstack-standalone ) )
-DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
-EAPI=7
-HOMEPAGE=https://github.com/cronie-crond/cronie
-IUSE=+anacron +inotify pam selinux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=ISC BSD BSD-2 GPL-2
-RDEPEND=pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) elibc_uclibc? ( sys-libs/obstack-standalone ) ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
-SLOT=0
-SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.5.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cron	be3d08eb2cdfb330f694bb07c6affc03	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92c0323890039c665fa3241cd8556f5c
diff --git a/metadata/md5-cache/sys-process/cronie-1.5.6 b/metadata/md5-cache/sys-process/cronie-1.5.6
deleted file mode 100644
index cf9ea411c40f..000000000000
--- a/metadata/md5-cache/sys-process/cronie-1.5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) elibc_uclibc? ( sys-libs/obstack-standalone ) )
-DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
-EAPI=7
-HOMEPAGE=https://github.com/cronie-crond/cronie
-IUSE=+anacron +inotify pam selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=ISC BSD BSD-2 GPL-2
-RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) elibc_uclibc? ( sys-libs/obstack-standalone ) ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
-SLOT=0
-SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.5.6.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cron	be3d08eb2cdfb330f694bb07c6affc03	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=44a01cc638265549f00254d8b3cb0868
diff --git a/metadata/md5-cache/sys-process/daemontools-0.76-r8 b/metadata/md5-cache/sys-process/daemontools-0.76-r8
index 0b2366bbe6b5..737e0f57fd39 100644
--- a/metadata/md5-cache/sys-process/daemontools-0.76-r8
+++ b/metadata/md5-cache/sys-process/daemontools-0.76-r8
@@ -3,10 +3,10 @@ DESCRIPTION=Collection of tools for managing UNIX services
 EAPI=7
 HOMEPAGE=http://cr.yp.to/daemontools.html
 IUSE=selinux static
-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=public-domain
 RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !app-doc/daemontools-man
 SLOT=0
 SRC_URI=http://cr.yp.to/daemontools/daemontools-0.76.tar.gz http://smarden.org/pape/djb/manpages/daemontools-0.76-man-20020131.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qmail	5e8c0b723a0dd58e095f12233aa9d00c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3406d2b256954fdc105bdcb5801c3f3b
+_md5_=8e8c7aa486c4bc3ad459baf3983fcf04
diff --git a/metadata/md5-cache/sys-process/glances-3.1.6.2 b/metadata/md5-cache/sys-process/glances-3.1.6.2
deleted file mode 100644
index 93cb3a44a7da..000000000000
--- a/metadata/md5-cache/sys-process/glances-3.1.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx_rtd_theme ) test? ( dev-python/future[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( dev-python/sphinx ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=CLI curses based monitoring tool
-EAPI=7
-HOMEPAGE=https://github.com/nicolargo/glances
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 kernel_linux
-KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=dev-python/future[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.6.2.tar.gz -> glances-3.1.6.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ad210a913a212a2f37d51d4d5b070d9
diff --git a/metadata/md5-cache/sys-process/glances-3.2.1 b/metadata/md5-cache/sys-process/glances-3.2.1
index eb09627350f6..59081512667d 100644
--- a/metadata/md5-cache/sys-process/glances-3.2.1
+++ b/metadata/md5-cache/sys-process/glances-3.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=CLI curses based monitoring tool
 EAPI=7
 HOMEPAGE=https://github.com/nicolargo/glances
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=dev-python/defusedxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.2.1.tar.gz -> glances-3.2.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a790adbb7c758d76fbfe9daec51f9143
+_md5_=2d416e6a97a33b383042c2cf96d79e1f
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 0cecbd800c7d..7694d9615447 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.38 b/metadata/md5-cache/virtual/dist-kernel-5.10.38
deleted file mode 100644
index 73a7794e3873..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.38
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.38 ~sys-kernel/gentoo-kernel-bin-5.10.38 ~sys-kernel/vanilla-kernel-5.10.38 )
-SLOT=0/5.10.38
-_md5_=c5791419f38d013507695e09c730fb4b
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.43 b/metadata/md5-cache/virtual/dist-kernel-5.10.43
deleted file mode 100644
index e42d5cccbd9b..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.43
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.43 ~sys-kernel/gentoo-kernel-bin-5.10.43 ~sys-kernel/vanilla-kernel-5.10.43 )
-SLOT=0/5.10.43
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.44 b/metadata/md5-cache/virtual/dist-kernel-5.10.44
deleted file mode 100644
index fd85debef0c0..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.44
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.44 ~sys-kernel/gentoo-kernel-bin-5.10.44 ~sys-kernel/vanilla-kernel-5.10.44 )
-SLOT=0/5.10.44
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.45 b/metadata/md5-cache/virtual/dist-kernel-5.10.45
deleted file mode 100644
index 022f0b1cf12c..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.45
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.45 ~sys-kernel/gentoo-kernel-bin-5.10.45 ~sys-kernel/vanilla-kernel-5.10.45 )
-SLOT=0/5.10.45
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.46 b/metadata/md5-cache/virtual/dist-kernel-5.10.46
deleted file mode 100644
index a53afb895289..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.46
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.46 ~sys-kernel/gentoo-kernel-bin-5.10.46 ~sys-kernel/vanilla-kernel-5.10.46 )
-SLOT=0/5.10.46
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.47 b/metadata/md5-cache/virtual/dist-kernel-5.10.47
index c9493ab29d32..dc674456eb8d 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.47
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.47
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.47 ~sys-kernel/gentoo-kernel-bin-5.10.47 ~sys-kernel/vanilla-kernel-5.10.47 )
 SLOT=0/5.10.47
-_md5_=3c8f423a93a67dff00cfa7548459db74
+_md5_=c5791419f38d013507695e09c730fb4b
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.50 b/metadata/md5-cache/virtual/dist-kernel-5.10.50
new file mode 100644
index 000000000000..60c6c5211f2f
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.50
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.50 ~sys-kernel/gentoo-kernel-bin-5.10.50 ~sys-kernel/vanilla-kernel-5.10.50 )
+SLOT=0/5.10.50
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.10 b/metadata/md5-cache/virtual/dist-kernel-5.12.10
deleted file mode 100644
index fe642003ba62..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.10
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.10 ~sys-kernel/gentoo-kernel-bin-5.12.10 ~sys-kernel/vanilla-kernel-5.12.10 )
-SLOT=0/5.12.10
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.11 b/metadata/md5-cache/virtual/dist-kernel-5.12.11
deleted file mode 100644
index 5717f7e602ed..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.11
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.11 ~sys-kernel/gentoo-kernel-bin-5.12.11 ~sys-kernel/vanilla-kernel-5.12.11 )
-SLOT=0/5.12.11
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.12 b/metadata/md5-cache/virtual/dist-kernel-5.12.12
deleted file mode 100644
index 7dd32384a38f..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.12
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.12 ~sys-kernel/gentoo-kernel-bin-5.12.12 ~sys-kernel/vanilla-kernel-5.12.12 )
-SLOT=0/5.12.12
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.13 b/metadata/md5-cache/virtual/dist-kernel-5.12.13
deleted file mode 100644
index d948a851d862..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.13
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.13 ~sys-kernel/gentoo-kernel-bin-5.12.13 ~sys-kernel/vanilla-kernel-5.12.13 )
-SLOT=0/5.12.13
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.14 b/metadata/md5-cache/virtual/dist-kernel-5.12.14
deleted file mode 100644
index daa733471f5a..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.14
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.14 ~sys-kernel/gentoo-kernel-bin-5.12.14 ~sys-kernel/vanilla-kernel-5.12.14 )
-SLOT=0/5.12.14
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.17 b/metadata/md5-cache/virtual/dist-kernel-5.12.17
new file mode 100644
index 000000000000..b5862e89a982
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.12.17
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.17 ~sys-kernel/gentoo-kernel-bin-5.12.17 ~sys-kernel/vanilla-kernel-5.12.17 )
+SLOT=0/5.12.17
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.120 b/metadata/md5-cache/virtual/dist-kernel-5.4.120
deleted file mode 100644
index 65ba1919583d..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.120
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=amd64 arm64 ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.120 ~sys-kernel/gentoo-kernel-bin-5.4.120 ~sys-kernel/vanilla-kernel-5.4.120 )
-SLOT=0/5.4.120
-_md5_=c8c6493287598df855d40cc3fe189a3a
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.125 b/metadata/md5-cache/virtual/dist-kernel-5.4.125
deleted file mode 100644
index d08fc61cad55..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.125
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.125 ~sys-kernel/gentoo-kernel-bin-5.4.125 ~sys-kernel/vanilla-kernel-5.4.125 )
-SLOT=0/5.4.125
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.126 b/metadata/md5-cache/virtual/dist-kernel-5.4.126
deleted file mode 100644
index 7eefdaff1ef4..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.126
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.126 ~sys-kernel/gentoo-kernel-bin-5.4.126 ~sys-kernel/vanilla-kernel-5.4.126 )
-SLOT=0/5.4.126
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.127 b/metadata/md5-cache/virtual/dist-kernel-5.4.127
deleted file mode 100644
index 586b36c5505a..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.127
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.127 ~sys-kernel/gentoo-kernel-bin-5.4.127 ~sys-kernel/vanilla-kernel-5.4.127 )
-SLOT=0/5.4.127
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.128 b/metadata/md5-cache/virtual/dist-kernel-5.4.128
deleted file mode 100644
index 4070628309b0..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.128
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.128 ~sys-kernel/gentoo-kernel-bin-5.4.128 ~sys-kernel/vanilla-kernel-5.4.128 )
-SLOT=0/5.4.128
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.129 b/metadata/md5-cache/virtual/dist-kernel-5.4.129
index b2de6731ac68..1d05a5a52def 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.129
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.129
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.129 ~sys-kernel/gentoo-kernel-bin-5.4.129 ~sys-kernel/vanilla-kernel-5.4.129 )
 SLOT=0/5.4.129
-_md5_=fbd9cdacb9673c96feaf6d5ab26b7101
+_md5_=c8c6493287598df855d40cc3fe189a3a
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.132 b/metadata/md5-cache/virtual/dist-kernel-5.4.132
new file mode 100644
index 000000000000..640b476c281a
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.132
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.132 ~sys-kernel/gentoo-kernel-bin-5.4.132 ~sys-kernel/vanilla-kernel-5.4.132 )
+SLOT=0/5.4.132
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/fam-0-r1 b/metadata/md5-cache/virtual/fam-0-r1
index 2ab3e2155841..8da0fe6e616e 100644
--- a/metadata/md5-cache/virtual/fam-0-r1
+++ b/metadata/md5-cache/virtual/fam-0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual package to choose between gamin and fam
 EAPI=7
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=app-admin/gamin-0.1.10-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(-)?] >=app-admin/fam-2.7.0-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(-)?] )
 SLOT=0
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aacb2e41db6365c1622fc04110b622c4
+_md5_=37f1876011c3c1af21df2547aace661f
diff --git a/metadata/md5-cache/virtual/gsasl-2 b/metadata/md5-cache/virtual/gsasl-2
index c890743764ff..31dc37ecc1a5 100644
--- a/metadata/md5-cache/virtual/gsasl-2
+++ b/metadata/md5-cache/virtual/gsasl-2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU SASL library
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 RDEPEND=|| ( net-libs/libgsasl net-misc/gsasl )
 SLOT=0
-_md5_=216aa61ac8f49669570c990e9d577ed6
+_md5_=8d302de255e3bde7f01fc779296285a9
diff --git a/metadata/md5-cache/virtual/jdk-1.8.0-r5 b/metadata/md5-cache/virtual/jdk-1.8.0-r5
deleted file mode 100644
index 0a2d2ff48e44..000000000000
--- a/metadata/md5-cache/virtual/jdk-1.8.0-r5
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Java Development Kit (JDK)
-EAPI=7
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
-RDEPEND=|| ( dev-java/openjdk-bin:8 dev-java/openjdk:8 dev-java/icedtea-bin:8 dev-java/icedtea:8 )
-SLOT=1.8
-_md5_=830cc8aa044be132445b66dcc845ecfa
diff --git a/metadata/md5-cache/virtual/jdk-1.8.0-r6 b/metadata/md5-cache/virtual/jdk-1.8.0-r6
new file mode 100644
index 000000000000..170c2264f0c6
--- /dev/null
+++ b/metadata/md5-cache/virtual/jdk-1.8.0-r6
@@ -0,0 +1,8 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Java Development Kit (JDK)
+EAPI=7
+IUSE=headless-awt
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
+RDEPEND=|| ( dev-java/openjdk-bin:8[headless-awt=] dev-java/openjdk:8[headless-awt=] dev-java/icedtea-bin:8[headless-awt=] dev-java/icedtea:8[headless-awt=] )
+SLOT=1.8
+_md5_=acd6a359020da66943924a643c924e19
diff --git a/metadata/md5-cache/virtual/jdk-11-r1 b/metadata/md5-cache/virtual/jdk-11-r1
deleted file mode 100644
index 523fa858ab6e..000000000000
--- a/metadata/md5-cache/virtual/jdk-11-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Java Development Kit (JDK)
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-RDEPEND=|| ( dev-java/openjdk-bin:11[gentoo-vm(+)] dev-java/openjdk:11[gentoo-vm(+)] )
-SLOT=11
-_md5_=dc8a9b532b7b9d43bef8cfada4edc530
diff --git a/metadata/md5-cache/virtual/jdk-11-r2 b/metadata/md5-cache/virtual/jdk-11-r2
new file mode 100644
index 000000000000..ac945ad14d39
--- /dev/null
+++ b/metadata/md5-cache/virtual/jdk-11-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Java Development Kit (JDK)
+EAPI=7
+IUSE=headless-awt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+RDEPEND=|| ( dev-java/openjdk-bin:11[gentoo-vm(+),headless-awt=] dev-java/openjdk:11[gentoo-vm(+),headless-awt=] )
+SLOT=11
+_md5_=de8fb76c9f83004ac2b4b436145b2c8a
diff --git a/metadata/md5-cache/virtual/szip-2.1 b/metadata/md5-cache/virtual/szip-2.1
index 2b6093a44eaa..52bce0577cb8 100644
--- a/metadata/md5-cache/virtual/szip-2.1
+++ b/metadata/md5-cache/virtual/szip-2.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for szip compression drop-in replacements
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+EAPI=8
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( sci-libs/libaec[szip] sci-libs/szip )
 SLOT=0/2
-_md5_=3370a29553f9a1db483c2d7fc48d1bd4
+_md5_=39f259b8ea991db36c7ef7c0e7beeac4
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 6722d46e99ce..4afacb7014e8 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.66 b/metadata/md5-cache/www-apache/mod_qos-11.66
index 5f6d59ff2c57..637d682e2779 100644
--- a/metadata/md5-cache/www-apache/mod_qos-11.66
+++ b/metadata/md5-cache/www-apache/mod_qos-11.66
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib
 DESCRIPTION=A QOS module for the apache webserver
 EAPI=7
 HOMEPAGE=http://mod-qos.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.66.tar.gz
 _eclasses_=apache-module	46dd6706a4df4d5086a9c2b19dc2c344	autotools	2a36908d5f63f41614b450a2459567da	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=776cbb587cc79c78c954da07d434f85f
+_md5_=57b734f18023d6d43e5eb5dfbc91a85e
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.10 b/metadata/md5-cache/www-apache/passenger-6.0.10
new file mode 100644
index 000000000000..ffc5792f0951
--- /dev/null
+++ b/metadata/md5-cache/www-apache/passenger-6.0.10
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
+DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
+EAPI=7
+HOMEPAGE=https://www.phusionpassenger.com/
+IUSE=apache2 debug test apache2 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby30(-)] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.10.tar.gz
+_eclasses_=apache-module	46dd6706a4df4d5086a9c2b19dc2c344	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2ffd088cbb0aa43837bc81e35480a6d6
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.6 b/metadata/md5-cache/www-apache/passenger-6.0.6
deleted file mode 100644
index 3b547d6e582a..000000000000
--- a/metadata/md5-cache/www-apache/passenger-6.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby27(-)] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
-EAPI=6
-HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=apache2 debug test apache2 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby27(-)] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.6.tar.gz
-_eclasses_=apache-module	46dd6706a4df4d5086a9c2b19dc2c344	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7750c5e4334fc42ca59f5972e92c1e54
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index d419401a5c1f..5bccf8cf5ba3 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1 b/metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1
index 98e20a258ab5..ee853b8786e6 100644
--- a/metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1
+++ b/metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=FDL-1.3 GPL-3
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=https://blazeblogger.googlecode.com/files/blazeblogger-1.2.0.tar.gz doc? ( https://blazeblogger.googlecode.com/files/blazeblogger-doc-1.2.0.tar.gz )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d7a2bacc011002b4e6b4788cf073deb5
diff --git a/metadata/md5-cache/www-apps/gitit-0.13.0.0-r1 b/metadata/md5-cache/www-apps/gitit-0.13.0.0-r1
index 696f2333ee41..2e4fb1303c79 100644
--- a/metadata/md5-cache/www-apps/gitit-0.13.0.0-r1
+++ b/metadata/md5-cache/www-apps/gitit-0.13.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/pandoc-2.9:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/configfile-1:=[profile?] >=dev-haskell/doctemplates-0.7.1:=[profile?] >=dev-haskell/feed-1.0:=[profile?] <dev-haskell/feed-1.4:=[profile?] >=dev-haskell/filestore-0.6.4:=[profile?] <dev-haskell/filestore-0.7:=[profile?] >=dev-haskell/happstack-server-7.5:=[profile?] >=dev-haskell/hoauth2-1.3.0:=[profile?] >=dev-haskell/hslogger-1:=[profile?] >=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?] >=dev-haskell/http-4000.0:=[profile?] >=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.1.6:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.11:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/recaptcha-0.1:=[profile?] dev-haskell/safe:=[profile?] >dev-haskell/sha-1:=[profile?] >=dev-haskell/skylighting-0.8.2.3:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.3:=[profile?] >=dev-haskell/url-2.1:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?] dev-haskell/xhtml:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] >=dev-haskell/xml-conduit-1.5:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.1:= plugins? ( dev-haskell/ghc-paths:=[profile?] >=dev-lang/ghc-8.0.1:=[profile?] )
 SLOT=0/0.13.0.0
 SRC_URI=https://hackage.haskell.org/package/gitit-0.13.0.0/gitit-0.13.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ace84f13a75812e57fccf8272447c90b
diff --git a/metadata/md5-cache/www-apps/grafana-bin-7.4.5 b/metadata/md5-cache/www-apps/grafana-bin-7.4.5
deleted file mode 100644
index 2471ea43ab26..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-7.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install
-DEPEND=acct-group/grafana acct-user/grafana
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/grafana acct-user/grafana media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-7.4.5.linux-amd64.tar.gz -> grafana-bin-7.4.5.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f217df93344bb7425de43d6589f8bf3
diff --git a/metadata/md5-cache/www-apps/grafana-bin-7.5.1 b/metadata/md5-cache/www-apps/grafana-bin-7.5.1
deleted file mode 100644
index 2b805f99ed77..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-7.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install
-DEPEND=acct-group/grafana acct-user/grafana
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/grafana acct-user/grafana media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-7.5.1.linux-amd64.tar.gz -> grafana-bin-7.5.1.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f217df93344bb7425de43d6589f8bf3
diff --git a/metadata/md5-cache/www-apps/grafana-bin-7.5.2 b/metadata/md5-cache/www-apps/grafana-bin-7.5.2
deleted file mode 100644
index 874d8ae1cfb4..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-7.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install
-DEPEND=acct-group/grafana acct-user/grafana
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/grafana acct-user/grafana media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-7.5.2.linux-amd64.tar.gz -> grafana-bin-7.5.2.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f217df93344bb7425de43d6589f8bf3
diff --git a/metadata/md5-cache/www-apps/grafana-bin-7.5.4 b/metadata/md5-cache/www-apps/grafana-bin-7.5.4
deleted file mode 100644
index a267bb0be7cf..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-7.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install
-DEPEND=acct-group/grafana acct-user/grafana
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/grafana acct-user/grafana media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-7.5.4.linux-amd64.tar.gz -> grafana-bin-7.5.4.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f217df93344bb7425de43d6589f8bf3
diff --git a/metadata/md5-cache/www-apps/grafana-bin-7.5.6 b/metadata/md5-cache/www-apps/grafana-bin-7.5.6
deleted file mode 100644
index 98e9a242fa85..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-7.5.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install
-DEPEND=acct-group/grafana acct-user/grafana
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/grafana acct-user/grafana media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-7.5.6.linux-amd64.tar.gz -> grafana-bin-7.5.6.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f217df93344bb7425de43d6589f8bf3
diff --git a/metadata/md5-cache/www-apps/grafana-bin-7.5.9 b/metadata/md5-cache/www-apps/grafana-bin-7.5.9
new file mode 100644
index 000000000000..e0b4c2f43c2e
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-7.5.9
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/grafana acct-user/grafana
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=8
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/grafana acct-user/grafana media-libs/fontconfig
+SLOT=0
+SRC_URI=https://dl.grafana.com/oss/release/grafana-7.5.9.linux-amd64.tar.gz -> grafana-bin-7.5.9.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=87020bbe75dfbe46fa0bdfc645aee504
diff --git a/metadata/md5-cache/www-apps/grafana-bin-8.0.0 b/metadata/md5-cache/www-apps/grafana-bin-8.0.0
deleted file mode 100644
index 90b03c7ebd42..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-8.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install
-DEPEND=acct-group/grafana acct-user/grafana
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/grafana acct-user/grafana media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-8.0.0.linux-amd64.tar.gz -> grafana-bin-8.0.0.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f217df93344bb7425de43d6589f8bf3
diff --git a/metadata/md5-cache/www-apps/grafana-bin-8.0.5 b/metadata/md5-cache/www-apps/grafana-bin-8.0.5
new file mode 100644
index 000000000000..5ea6edbc335e
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-8.0.5
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/grafana acct-user/grafana
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=8
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/grafana acct-user/grafana media-libs/fontconfig
+SLOT=0
+SRC_URI=https://dl.grafana.com/oss/release/grafana-8.0.5.linux-amd64.tar.gz -> grafana-bin-8.0.5.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=87020bbe75dfbe46fa0bdfc645aee504
diff --git a/metadata/md5-cache/www-apps/hugo-0.83.1 b/metadata/md5-cache/www-apps/hugo-0.83.1
deleted file mode 100644
index 0e0158e5cb65..000000000000
--- a/metadata/md5-cache/www-apps/hugo-0.83.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16.0 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=The world's fastest framework for building websites
-EAPI=7
-HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
-IUSE=doc +sass
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 Unlicense BSD BSD-2 MPL-2.0 MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/gohugoio/hugo/archive/v0.83.1.tar.gz -> hugo-0.83.1.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.55.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.55.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.58.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.58.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.2.0.zip -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.2.0.zip mirror://goproxy//cloud.google.com/go/firestore/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.9.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.9.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/aws/@v/v0.0.0-20181029163544-2befc13012d0.zip -> contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.zip mirror://goproxy//contrib.go.opencensus.io/exporter/aws/@v/v0.0.0-20181029163544-2befc13012d0.mod -> contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.zip -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.zip mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod mirror://goproxy//contrib.go.opencensus.io/integrations/ocsql/@v/v0.1.4.zip -> contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.zip mirror://goproxy//contrib.go.opencensus.io/integrations/ocsql/@v/v0.1.4.mod -> contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.zip -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.zip mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.zip -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.zip mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.zip -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-service-bus-go/@v/v0.10.1.zip -> github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/!azure/azure-service-bus-go/@v/v0.10.1.mod -> github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.9.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.9.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.7.zip -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.7.zip mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.7.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.7.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.zip -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.zip mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!geert!johan/go.incremental/@v/v1.0.0.zip -> github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!geert!johan/go.incremental/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.zip -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!google!cloud!platform/cloudsql-proxy/@v/v0.0.0-20191009163259-e802c2cb94ae.zip -> github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.zip mirror://goproxy//github.com/!google!cloud!platform/cloudsql-proxy/@v/v0.0.0-20191009163259-e802c2cb94ae.mod -> github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.zip -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2-0.20200305040604-4f3623dce67a.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.1.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.1.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.1.17-0.20190424132513-439c674f7ae0.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.zip -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/kong-hcl/@v/v0.1.8-0.20190615233001-b21fea9723c8.zip -> github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.zip mirror://goproxy//github.com/alecthomas/kong-hcl/@v/v0.1.8-0.20190615233001-b21fea9723c8.mod -> github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip 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/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.18.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.13.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.13.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.23.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.23.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.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/bep/debounce/@v/v1.2.0.zip -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/bep/debounce/@v/v1.2.0.mod -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.zip -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.mod -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/bep/godartsass/@v/v0.12.0.zip -> github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/bep/godartsass/@v/v0.12.0.mod -> github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/bep/golibsass/@v/v0.7.0.zip -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/bep/golibsass/@v/v0.7.0.mod -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/bep/gowebp/@v/v0.1.0.zip -> github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bep/gowebp/@v/v0.1.0.mod -> github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.zip -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.mod -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.zip -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.zip mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.zip -> github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.zip mirror://goproxy//github.com/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.mod -> github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.zip -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.zip mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/daaku/go.zipexe/@v/v1.0.0.zip -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/daaku/go.zipexe/@v/v1.0.0.mod -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20161028175848-04cdfd42973b.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.zip -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/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.zip -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.zip mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.zip -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.mod -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.14.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.14.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.14.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.14.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.16.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.16.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.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/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.60.0.zip -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.60.0.zip mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.60.0.mod -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.60.0.mod mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.61.0.zip -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.zip mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.61.0.mod -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.zip -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.zip mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.zip -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.zip mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.zip -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.zip 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.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/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-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.2.2.zip -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gobuffalo/flect/@v/v0.2.2.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.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/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gohugoio/go-i18n/@v/v2.1.3-0.20210430103248-4c28c89f8013+incompatible.zip -> github.com%2Fgohugoio%2Fgo-i18n%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013+incompatible.zip mirror://goproxy//github.com/gohugoio/go-i18n/@v/v2.1.3-0.20210430103248-4c28c89f8013+incompatible.mod -> github.com%2Fgohugoio%2Fgo-i18n%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013+incompatible.mod mirror://goproxy//github.com/gohugoio/go-i18n/v2/@v/v2.1.3-0.20210430103248-4c28c89f8013.zip -> github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.zip mirror://goproxy//github.com/gohugoio/go-i18n/v2/@v/v2.1.3-0.20210430103248-4c28c89f8013.mod -> github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.mod mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.zip -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.zip mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.mod -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.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-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.zip -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.zip -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200507031123-427632fa3b1c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200507031123-427632fa3b1c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.zip -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.zip -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/wire/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/wire/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.zip -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/csrf/@v/v1.6.0.zip -> github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/gorilla/csrf/@v/v1.6.0.mod -> github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.zip -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip 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.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.zip -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.zip 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.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.zip 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.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.zip 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.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.zip 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/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.zip -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.zip mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/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/jdkato/prose/@v/v1.2.1.zip -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/jdkato/prose/@v/v1.2.1.mod -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.zip -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.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.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.zip -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.zip -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.zip -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kyokomi/emoji/v2/@v/v2.2.8.zip -> github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.zip mirror://goproxy//github.com/kyokomi/emoji/v2/@v/v2.2.8.mod -> github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-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.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.zip 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/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.zip -> github.com%2Fmatryer%2Ftry%2F@v%2Fv0.0.0-20161228173917-9ac251b645a2.zip mirror://goproxy//github.com/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.mod -> github.com%2Fmatryer%2Ftry%2F@v%2Fv0.0.0-20161228173917-9ac251b645a2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190702010315-6dee0af9227d.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.zip -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.zip mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.mod -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-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/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/montanaflynn/stats/@v/v0.6.3.zip -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.6.3.zip mirror://goproxy//github.com/montanaflynn/stats/@v/v0.6.3.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.zip -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.mod -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/neurosnap/sentences/@v/v1.0.6.zip -> github.com%2Fneurosnap%2Fsentences%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/neurosnap/sentences/@v/v1.0.6.mod -> github.com%2Fneurosnap%2Fsentences%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.zip -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.zip mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.mod -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.mod mirror://goproxy//github.com/nicksnyder/go-i18n/v2/@v/v2.1.2.zip -> github.com%2Fnicksnyder%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.2.zip mirror://goproxy//github.com/nicksnyder/go-i18n/v2/@v/v2.1.2.mod -> github.com%2Fnicksnyder%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.5.0.zip -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.5.0.mod -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/nkovacs/streamquote/@v/v0.0.0-20170412213628-49af9bddb229.zip -> github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.zip mirror://goproxy//github.com/nkovacs/streamquote/@v/v0.0.0-20170412213628-49af9bddb229.mod -> github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.zip -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20210226163009-20ebb0f2a09e.zip mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20210226163009-20ebb0f2a09e.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.zip -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.zip -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.zip -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.zip mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.0.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.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/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.zip -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.zip mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.mod -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.zip 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/sanity-io/litter/@v/v1.5.0.zip -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/sanity-io/litter/@v/v1.5.0.mod -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shogo82148/go-shuffle/@v/v0.0.0-20180218125048-27e6095f230d.zip -> github.com%2Fshogo82148%2Fgo-shuffle%2F@v%2Fv0.0.0-20180218125048-27e6095f230d.zip mirror://goproxy//github.com/shogo82148/go-shuffle/@v/v0.0.0-20180218125048-27e6095f230d.mod -> github.com%2Fshogo82148%2Fgo-shuffle%2F@v%2Fv0.0.0-20180218125048-27e6095f230d.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.zip 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.6.0.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.zip -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.mod -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20161117074351-18a02ba4a312.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.16.zip -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.16.zip mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.16.mod -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.16.mod mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.14.zip -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.14.zip mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.14.mod -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.14.mod mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.zip -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.mod -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.zip -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.zip -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.22.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.zip -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.mod -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.15.0.mod -> go.opencensus.io%2F@v%2Fv0.15.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//gocloud.dev/@v/v0.20.0.zip -> gocloud.dev%2F@v%2Fv0.20.0.zip mirror://goproxy//gocloud.dev/@v/v0.20.0.mod -> gocloud.dev%2F@v%2Fv0.20.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.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-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-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/image/@v/v0.0.0-20210220032944-ac19c3e999fb.zip -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20210220032944-ac19c3e999fb.zip mirror://goproxy//golang.org/x/image/@v/v0.0.0-20210220032944-ac19c3e999fb.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20210220032944-ac19c3e999fb.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.zip -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.zip mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20181128092732-4ed8d59d0b35.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200317113312-5766fd39f98d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200317113312-5766fd39f98d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501145240-bc7a7d42d5c3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200724161237-0e2f3a69832c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200724161237-0e2f3a69832c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210412220455-f1c623a9e750.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210412220455-f1c623a9e750.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190422233926-fe54fb35175b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200317043434-63da46f3035e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200317043434-63da46f3035e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200325010219-a49f79bcc224.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200325010219-a49f79bcc224.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200601175630-2caf76543d99.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200601175630-2caf76543d99.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200606014950-c42cb6316fb6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200606014950-c42cb6316fb6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200608174601-1b747fd94509.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200608174601-1b747fd94509.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.26.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.26.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.45.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.45.0.zip mirror://goproxy//google.golang.org/api/@v/v0.45.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.45.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-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-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200317114155-1f3552e48f24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200317114155-1f3552e48f24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200325114520-5b2d0af7952b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200325114520-5b2d0af7952b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200603110839-e855014d5736.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200603110839-e855014d5736.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200608115520-7c474a2e3482.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200608115520-7c474a2e3482.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210402141018-6c239bbf2bb1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210413151531-c14fb6ef47c3.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210413151531-c14fb6ef47c3.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.zip -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod mirror://goproxy//gopkg.in/neurosnap/sentences.v1/@v/v1.0.6.zip -> gopkg.in%2Fneurosnap%2Fsentences.v1%2F@v%2Fv1.0.6.zip mirror://goproxy//gopkg.in/neurosnap/sentences.v1/@v/v1.0.6.mod -> gopkg.in%2Fneurosnap%2Fsentences.v1%2F@v%2Fv1.0.6.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/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.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.zip -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.zip -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.zip -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.zip mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bd3f32b0548a38ef7858ac923d781a5b
diff --git a/metadata/md5-cache/www-apps/hugo-0.84.4 b/metadata/md5-cache/www-apps/hugo-0.84.4
index 3a68723291e2..11ca5fabe9e5 100644
--- a/metadata/md5-cache/www-apps/hugo-0.84.4
+++ b/metadata/md5-cache/www-apps/hugo-0.84.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Unlicense BSD BSD-2 MPL-2.0 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.84.4.tar.gz -> hugo-0.84.4.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.55.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.55.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.58.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.58.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.9.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.9.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/aws/@v/v0.0.0-20181029163544-2befc13012d0.mod -> contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod mirror://goproxy//contrib.go.opencensus.io/integrations/ocsql/@v/v0.1.4.mod -> contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-service-bus-go/@v/v0.10.1.mod -> github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.9.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.9.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.7.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.7.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.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/!geert!johan/go.incremental/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!google!cloud!platform/cloudsql-proxy/@v/v0.0.0-20191009163259-e802c2cb94ae.mod -> github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2-0.20200305040604-4f3623dce67a.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.1.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.1.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.2.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.1.17-0.20190424132513-439c674f7ae0.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/kong-hcl/@v/v0.1.8-0.20190615233001-b21fea9723c8.mod -> github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.18.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.13.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.13.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.23.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.23.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bep/debounce/@v/v1.2.0.zip -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/bep/debounce/@v/v1.2.0.mod -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.zip -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.mod -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/bep/godartsass/@v/v0.12.0.zip -> github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/bep/godartsass/@v/v0.12.0.mod -> github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/bep/golibsass/@v/v1.0.0.zip -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/bep/golibsass/@v/v1.0.0.mod -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bep/gowebp/@v/v0.1.0.zip -> github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bep/gowebp/@v/v0.1.0.mod -> github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.zip -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.mod -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.mod -> github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.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/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/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/daaku/go.zipexe/@v/v1.0.0.mod -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20161028175848-04cdfd42973b.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/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/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.zip -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.mod -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.16.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.16.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.61.0.zip -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.zip mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.61.0.mod -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-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-openapi/jsonpointer/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/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-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.2.2.zip -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gobuffalo/flect/@v/v0.2.2.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.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/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gohugoio/go-i18n/v2/@v/v2.1.3-0.20210430103248-4c28c89f8013.zip -> github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.zip mirror://goproxy//github.com/gohugoio/go-i18n/v2/@v/v2.1.3-0.20210430103248-4c28c89f8013.mod -> github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.mod mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.zip -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.zip mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.mod -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.zip -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.zip -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200507031123-427632fa3b1c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200507031123-427632fa3b1c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/wire/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/wire/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.zip -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/csrf/@v/v1.6.0.mod -> github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/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/jdkato/prose/@v/v1.2.1.zip -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/jdkato/prose/@v/v1.2.1.mod -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.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-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kyokomi/emoji/v2/@v/v2.2.8.zip -> github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.zip mirror://goproxy//github.com/kyokomi/emoji/v2/@v/v2.2.8.mod -> github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-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.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.zip 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/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.mod -> github.com%2Fmatryer%2Ftry%2F@v%2Fv0.0.0-20161228173917-9ac251b645a2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190702010315-6dee0af9227d.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.zip -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.zip mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.mod -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.6.3.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.zip -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.mod -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/neurosnap/sentences/@v/v1.0.6.mod -> github.com%2Fneurosnap%2Fsentences%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.zip -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.zip mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.mod -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.mod mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.5.0.zip -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.5.0.mod -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/nkovacs/streamquote/@v/v0.0.0-20170412213628-49af9bddb229.mod -> github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.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.5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20210226163009-20ebb0f2a09e.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.0.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.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/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.zip -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.zip mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.mod -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.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/sanity-io/litter/@v/v1.5.0.zip -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/sanity-io/litter/@v/v1.5.0.mod -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.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.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shogo82148/go-shuffle/@v/v0.0.0-20180218125048-27e6095f230d.mod -> github.com%2Fshogo82148%2Fgo-shuffle%2F@v%2Fv0.0.0-20180218125048-27e6095f230d.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/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.6.0.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.zip -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.mod -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20161117074351-18a02ba4a312.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.16.zip -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.16.zip mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.16.mod -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.16.mod mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.18.zip -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.18.zip mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.18.mod -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.18.mod mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.14.zip -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.14.zip mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.14.mod -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.14.mod mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.18.zip -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.18.zip mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.18.mod -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.18.mod mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.zip -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.mod -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.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/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.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/yuin/goldmark/@v/v1.1.22.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.8.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.8.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.8.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.8.mod mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.zip -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.mod -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.15.0.mod -> go.opencensus.io%2F@v%2Fv0.15.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//gocloud.dev/@v/v0.20.0.zip -> gocloud.dev%2F@v%2Fv0.20.0.zip mirror://goproxy//gocloud.dev/@v/v0.20.0.mod -> gocloud.dev%2F@v%2Fv0.20.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.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-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20210220032944-ac19c3e999fb.zip -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20210220032944-ac19c3e999fb.zip mirror://goproxy//golang.org/x/image/@v/v0.0.0-20210220032944-ac19c3e999fb.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20210220032944-ac19c3e999fb.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20181128092732-4ed8d59d0b35.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200317113312-5766fd39f98d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200317113312-5766fd39f98d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501145240-bc7a7d42d5c3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200724161237-0e2f3a69832c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200724161237-0e2f3a69832c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210412220455-f1c623a9e750.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210412220455-f1c623a9e750.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190422233926-fe54fb35175b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200317043434-63da46f3035e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200317043434-63da46f3035e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200325010219-a49f79bcc224.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200325010219-a49f79bcc224.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200601175630-2caf76543d99.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200601175630-2caf76543d99.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200606014950-c42cb6316fb6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200606014950-c42cb6316fb6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200608174601-1b747fd94509.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200608174601-1b747fd94509.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.26.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.26.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.45.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.45.0.zip mirror://goproxy//google.golang.org/api/@v/v0.45.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.45.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-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-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200317114155-1f3552e48f24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200317114155-1f3552e48f24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200325114520-5b2d0af7952b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200325114520-5b2d0af7952b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200603110839-e855014d5736.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200603110839-e855014d5736.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200608115520-7c474a2e3482.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200608115520-7c474a2e3482.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210402141018-6c239bbf2bb1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210413151531-c14fb6ef47c3.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210413151531-c14fb6ef47c3.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod mirror://goproxy//gopkg.in/neurosnap/sentences.v1/@v/v1.0.6.mod -> gopkg.in%2Fneurosnap%2Fsentences.v1%2F@v%2Fv1.0.6.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.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.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcf7db235c52dae75505af941bf35fa7
diff --git a/metadata/md5-cache/www-apps/hugo-0.85.0 b/metadata/md5-cache/www-apps/hugo-0.85.0
new file mode 100644
index 000000000000..483e4add717b
--- /dev/null
+++ b/metadata/md5-cache/www-apps/hugo-0.85.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16.0 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=The world's fastest framework for building websites
+EAPI=7
+HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
+IUSE=doc +sass
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 Unlicense BSD BSD-2 MPL-2.0 MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/gohugoio/hugo/archive/v0.85.0.tar.gz -> hugo-0.85.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.55.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.55.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.58.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.58.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.9.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.9.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/aws/@v/v0.0.0-20181029163544-2befc13012d0.mod -> contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod mirror://goproxy//contrib.go.opencensus.io/integrations/ocsql/@v/v0.1.4.mod -> contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-service-bus-go/@v/v0.10.1.mod -> github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.9.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.9.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.7.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.7.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.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/!geert!johan/go.incremental/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!google!cloud!platform/cloudsql-proxy/@v/v0.0.0-20191009163259-e802c2cb94ae.mod -> github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2-0.20200305040604-4f3623dce67a.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.1.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.1.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.2.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.1.17-0.20190424132513-439c674f7ae0.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/kong-hcl/@v/v0.1.8-0.20190615233001-b21fea9723c8.mod -> github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.18.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.13.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.13.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.23.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.23.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bep/debounce/@v/v1.2.0.zip -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/bep/debounce/@v/v1.2.0.mod -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.zip -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.mod -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/bep/godartsass/@v/v0.12.0.zip -> github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/bep/godartsass/@v/v0.12.0.mod -> github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/bep/golibsass/@v/v1.0.0.zip -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/bep/golibsass/@v/v1.0.0.mod -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bep/gowebp/@v/v0.1.0.zip -> github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bep/gowebp/@v/v0.1.0.mod -> github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.zip -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.mod -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.mod -> github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.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/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/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/daaku/go.zipexe/@v/v1.0.0.mod -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20161028175848-04cdfd42973b.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/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/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.zip -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.mod -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.16.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.16.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.61.0.zip -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.zip mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.61.0.mod -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-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-openapi/jsonpointer/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/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-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.2.2.zip -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gobuffalo/flect/@v/v0.2.2.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.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/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gohugoio/go-i18n/v2/@v/v2.1.3-0.20210430103248-4c28c89f8013.zip -> github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.zip mirror://goproxy//github.com/gohugoio/go-i18n/v2/@v/v2.1.3-0.20210430103248-4c28c89f8013.mod -> github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.mod mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.zip -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.zip mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.mod -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.zip -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.zip -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200507031123-427632fa3b1c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200507031123-427632fa3b1c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/wire/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/wire/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.zip -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/csrf/@v/v1.6.0.mod -> github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/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/jdkato/prose/@v/v1.2.1.zip -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/jdkato/prose/@v/v1.2.1.mod -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.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-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kyokomi/emoji/v2/@v/v2.2.8.zip -> github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.zip mirror://goproxy//github.com/kyokomi/emoji/v2/@v/v2.2.8.mod -> github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-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.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.zip 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/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.mod -> github.com%2Fmatryer%2Ftry%2F@v%2Fv0.0.0-20161228173917-9ac251b645a2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190702010315-6dee0af9227d.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.zip -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.zip mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.mod -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.6.3.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.zip -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.mod -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/neurosnap/sentences/@v/v1.0.6.mod -> github.com%2Fneurosnap%2Fsentences%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.zip -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.zip mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.mod -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.mod mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.5.0.zip -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.5.0.mod -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/nkovacs/streamquote/@v/v0.0.0-20170412213628-49af9bddb229.mod -> github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.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.5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20210226163009-20ebb0f2a09e.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.0.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.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/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.zip -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.zip mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.mod -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.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/sanity-io/litter/@v/v1.5.0.zip -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/sanity-io/litter/@v/v1.5.0.mod -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.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.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shogo82148/go-shuffle/@v/v0.0.0-20180218125048-27e6095f230d.mod -> github.com%2Fshogo82148%2Fgo-shuffle%2F@v%2Fv0.0.0-20180218125048-27e6095f230d.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/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.6.0.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.zip -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.mod -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20161117074351-18a02ba4a312.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.16.zip -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.16.zip mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.16.mod -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.16.mod mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.18.zip -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.18.zip mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.18.mod -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.18.mod mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.14.zip -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.14.zip mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.14.mod -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.14.mod mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.18.zip -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.18.zip mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.18.mod -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.18.mod mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.zip -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.mod -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.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/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.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/yuin/goldmark/@v/v1.1.22.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.8.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.8.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.8.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.8.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.9.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.9.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.9.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.9.mod mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.zip -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.mod -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.15.0.mod -> go.opencensus.io%2F@v%2Fv0.15.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//gocloud.dev/@v/v0.20.0.zip -> gocloud.dev%2F@v%2Fv0.20.0.zip mirror://goproxy//gocloud.dev/@v/v0.20.0.mod -> gocloud.dev%2F@v%2Fv0.20.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.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-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20210220032944-ac19c3e999fb.zip -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20210220032944-ac19c3e999fb.zip mirror://goproxy//golang.org/x/image/@v/v0.0.0-20210220032944-ac19c3e999fb.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20210220032944-ac19c3e999fb.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20181128092732-4ed8d59d0b35.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200317113312-5766fd39f98d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200317113312-5766fd39f98d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501145240-bc7a7d42d5c3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200724161237-0e2f3a69832c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200724161237-0e2f3a69832c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210412220455-f1c623a9e750.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210412220455-f1c623a9e750.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190422233926-fe54fb35175b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200317043434-63da46f3035e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200317043434-63da46f3035e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200325010219-a49f79bcc224.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200325010219-a49f79bcc224.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200601175630-2caf76543d99.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200601175630-2caf76543d99.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200606014950-c42cb6316fb6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200606014950-c42cb6316fb6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200608174601-1b747fd94509.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200608174601-1b747fd94509.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.26.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.26.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.45.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.45.0.zip mirror://goproxy//google.golang.org/api/@v/v0.45.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.45.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-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-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200317114155-1f3552e48f24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200317114155-1f3552e48f24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200325114520-5b2d0af7952b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200325114520-5b2d0af7952b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200603110839-e855014d5736.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200603110839-e855014d5736.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200608115520-7c474a2e3482.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200608115520-7c474a2e3482.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210402141018-6c239bbf2bb1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210413151531-c14fb6ef47c3.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210413151531-c14fb6ef47c3.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod mirror://goproxy//gopkg.in/neurosnap/sentences.v1/@v/v1.0.6.mod -> gopkg.in%2Fneurosnap%2Fsentences.v1%2F@v%2Fv1.0.6.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.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.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=81034b26fe0d0140cd3c60174eda6475
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.8.3 b/metadata/md5-cache/www-apps/icingaweb2-2.8.3
new file mode 100644
index 000000000000..c2f84393bcfc
--- /dev/null
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.8.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config install postinst setup
+DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+DESCRIPTION=Icinga Web 2 - Frontend for icinga2
+EAPI=7
+HOMEPAGE=http://www.icinga.org/
+IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
+SLOT=0
+SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.8.3 -> icingaweb2-2.8.3.tar.gz
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3d74192f386d2a874e3ef602a3797a14
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.9.0 b/metadata/md5-cache/www-apps/icingaweb2-2.9.0
new file mode 100644
index 000000000000..20626dd5e708
--- /dev/null
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config install postinst setup
+DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+DESCRIPTION=Icinga Web 2 - Frontend for icinga2
+EAPI=7
+HOMEPAGE=http://www.icinga.org/
+IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
+SLOT=0
+SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.9.0 -> icingaweb2-2.9.0.tar.gz
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=50ff6e859d11a87577f4b54f0976b614
diff --git a/metadata/md5-cache/www-apps/nanoblogger-3.5_rc1-r1 b/metadata/md5-cache/www-apps/nanoblogger-3.5_rc1-r1
index e4c5c8b4339f..7b8d74e15985 100644
--- a/metadata/md5-cache/www-apps/nanoblogger-3.5_rc1-r1
+++ b/metadata/md5-cache/www-apps/nanoblogger-3.5_rc1-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=mirror://sourceforge/nanoblogger/nanoblogger-3.5-rc1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e771b5b432aab8ed8289a4e3fa514e55
diff --git a/metadata/md5-cache/www-apps/zeppelin-bin-0.8.2 b/metadata/md5-cache/www-apps/zeppelin-bin-0.8.2
deleted file mode 100644
index 46afb100363f..000000000000
--- a/metadata/md5-cache/www-apps/zeppelin-bin-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Web-based interactive data analytics notebook launcher
-EAPI=7
-HOMEPAGE=https://zeppelin.apache.org
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/zeppelin/zeppelin-0.8.2/zeppelin-0.8.2-bin-all.tgz -> zeppelin-bin-0.8.2.tgz
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=cec6fa1a56bd7e322210e89da02ea17b
diff --git a/metadata/md5-cache/www-apps/zeppelin-bin-0.8.2-r1 b/metadata/md5-cache/www-apps/zeppelin-bin-0.8.2-r1
index 885a59b849ef..49fcb3846caa 100644
--- a/metadata/md5-cache/www-apps/zeppelin-bin-0.8.2-r1
+++ b/metadata/md5-cache/www-apps/zeppelin-bin-0.8.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Web-based interactive data analytics notebook launcher
 EAPI=7
 HOMEPAGE=https://zeppelin.apache.org
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/zeppelin/zeppelin-0.8.2/zeppelin-0.8.2-bin-all.tgz -> zeppelin-bin-0.8.2.tgz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=6636a93e08cb70d579c7b98ef37983be
+_md5_=4842011208366903cf6a3eb4a45eb2a5
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 2e13dab66832..d1954a4b6204 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-91.0.4472.106 b/metadata/md5-cache/www-client/chromium-91.0.4472.106
index 075942711a8d..d7be024cd0c2 100644
--- a/metadata/md5-cache/www-client/chromium-91.0.4472.106
+++ b/metadata/md5-cache/www-client/chromium-91.0.4472.106
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= de
 REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-91.0.4472.106.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-91-patchset-6/chromium-91-patchset-6.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz ) ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/chromium-91-ppc64le-6.tar.xz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=538bca738d962e3af8b6f00fcb9b28d2
diff --git a/metadata/md5-cache/www-client/chromium-91.0.4472.114 b/metadata/md5-cache/www-client/chromium-91.0.4472.114
index ee78e86e4faa..a043cc1f7e3c 100644
--- a/metadata/md5-cache/www-client/chromium-91.0.4472.114
+++ b/metadata/md5-cache/www-client/chromium-91.0.4472.114
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= de
 REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-91.0.4472.114.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-91-patchset-6/chromium-91-patchset-6.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz ) ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/chromium-91-ppc64le-6.tar.xz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=538bca738d962e3af8b6f00fcb9b28d2
diff --git a/metadata/md5-cache/www-client/chromium-91.0.4472.164 b/metadata/md5-cache/www-client/chromium-91.0.4472.164
new file mode 100644
index 000000000000..89e2d07c077a
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-91.0.4472.164
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-91.0.4472.164.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-91-patchset-6/chromium-91-patchset-6.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz ) ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/chromium-91-ppc64le-6.tar.xz )
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c50de3dc5af1718a36ea43b3ea0ddda6
diff --git a/metadata/md5-cache/www-client/chromium-92.0.4515.80 b/metadata/md5-cache/www-client/chromium-92.0.4515.80
index 1db7f1097c6b..fe021c901943 100644
--- a/metadata/md5-cache/www-client/chromium-92.0.4515.80
+++ b/metadata/md5-cache/www-client/chromium-92.0.4515.80
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= de
 REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-92.0.4515.80.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-92-patchset-7/chromium-92-patchset-7.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz ) ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/chromium-91-ppc64le-6.tar.xz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=77dc14e96282048020838ae73ee685da
diff --git a/metadata/md5-cache/www-client/chromium-93.0.4557.4 b/metadata/md5-cache/www-client/chromium-93.0.4557.4
index 200135c91091..6e9dcfb6de24 100644
--- a/metadata/md5-cache/www-client/chromium-93.0.4557.4
+++ b/metadata/md5-cache/www-client/chromium-93.0.4557.4
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= de
 REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-93.0.4557.4.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-93-patchset-5/chromium-93-patchset-5.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5b237dffa391ebf033bf5094442cd43b
diff --git a/metadata/md5-cache/www-client/firefox-78.11.0 b/metadata/md5-cache/www-client/firefox-78.11.0
index 46e2f4400283..e03ff6362d30 100644
--- a/metadata/md5-cache/www-client/firefox-78.11.0
+++ b/metadata/md5-cache/www-client/firefox-78.11.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland ) wifi? ( dbus )
 SLOT=0/esr78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/source/firefox-78.11.0esr.source.tar.xz -> firefox-78.11.0esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-14.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.11.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.11.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.11.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.11.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.11.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.11.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.11.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.11.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.11.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.11.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.11.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.11.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.11.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.11.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.11.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.11.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.11.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.11.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.11.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.11.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.11.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.11.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.11.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.11.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.11.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.11.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.11.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.11.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.11.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.11.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.11.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.11.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.11.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.11.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.11.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.11.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.11.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.11.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.11.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.11.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.11.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.11.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.11.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.11.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.11.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.11.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.11.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.11.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.11.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.11.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.11.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.11.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.11.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.11.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.11.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.11.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.11.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.11.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.11.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.11.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.11.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.11.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.11.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.11.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.11.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.11.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.11.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.11.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.11.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.11.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.11.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.11.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.11.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.11.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.11.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.11.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.11.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.11.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.11.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.11.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.11.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.11.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.11.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.11.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.11.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.11.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.11.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.11.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.11.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.11.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.11.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.11.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.11.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.11.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.11.0esr-zh-TW.xpi )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e778cf24719769d5baf77f6f365b3329
diff --git a/metadata/md5-cache/www-client/firefox-78.12.0 b/metadata/md5-cache/www-client/firefox-78.12.0
new file mode 100644
index 000000000000..17154f302b34
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-78.12.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.21.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland ) wifi? ( dbus )
+SLOT=0/esr78
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/source/firefox-78.12.0esr.source.tar.xz -> firefox-78.12.0esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-15.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.12.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.12.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.12.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.12.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.12.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.12.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.12.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.12.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.12.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.12.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.12.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.12.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.12.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.12.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.12.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.12.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.12.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.12.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.12.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.12.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.12.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.12.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.12.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.12.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.12.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.12.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.12.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.12.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.12.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.12.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.12.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.12.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.12.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.12.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.12.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.12.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.12.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.12.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.12.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.12.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.12.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.12.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.12.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.12.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.12.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.12.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.12.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.12.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.12.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.12.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.12.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.12.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.12.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.12.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.12.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.12.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.12.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.12.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.12.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.12.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.12.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.12.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.12.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.12.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.12.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.12.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.12.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.12.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.12.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.12.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.12.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.12.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.12.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.12.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.12.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.12.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.12.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.12.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.12.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.12.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.12.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.12.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.12.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.12.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.12.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.12.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.12.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.12.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.12.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.12.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.12.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.12.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.12.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.12.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.12.0esr-zh-TW.xpi )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=541774007b390bbc7fffde9ed0e8fd02
diff --git a/metadata/md5-cache/www-client/firefox-89.0 b/metadata/md5-cache/www-client/firefox-89.0
index 2810b72d82f3..cb743527526d 100644
--- a/metadata/md5-cache/www-client/firefox-89.0
+++ b/metadata/md5-cache/www-client/firefox-89.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.64 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
 SLOT=0/89
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/89.0/source/firefox-89.0.source.tar.xz -> firefox-89.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-89-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-89-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-89-patches-02.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ach.xpi -> firefox-89.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/af.xpi -> firefox-89.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/an.xpi -> firefox-89.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ar.xpi -> firefox-89.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ast.xpi -> firefox-89.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/az.xpi -> firefox-89.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/be.xpi -> firefox-89.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/bg.xpi -> firefox-89.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/bn.xpi -> firefox-89.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/br.xpi -> firefox-89.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/bs.xpi -> firefox-89.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-89.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ca.xpi -> firefox-89.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/cak.xpi -> firefox-89.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/cs.xpi -> firefox-89.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/cy.xpi -> firefox-89.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/da.xpi -> firefox-89.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/de.xpi -> firefox-89.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/dsb.xpi -> firefox-89.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/el.xpi -> firefox-89.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/en-CA.xpi -> firefox-89.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/en-GB.xpi -> firefox-89.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/eo.xpi -> firefox-89.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/es-AR.xpi -> firefox-89.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/es-CL.xpi -> firefox-89.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/es-ES.xpi -> firefox-89.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/es-MX.xpi -> firefox-89.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/et.xpi -> firefox-89.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/eu.xpi -> firefox-89.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/fa.xpi -> firefox-89.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ff.xpi -> firefox-89.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/fi.xpi -> firefox-89.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/fr.xpi -> firefox-89.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-89.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-89.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/gd.xpi -> firefox-89.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/gl.xpi -> firefox-89.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/gn.xpi -> firefox-89.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-89.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/he.xpi -> firefox-89.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-89.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/hr.xpi -> firefox-89.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/hsb.xpi -> firefox-89.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/hu.xpi -> firefox-89.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-89.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ia.xpi -> firefox-89.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/id.xpi -> firefox-89.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/is.xpi -> firefox-89.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/it.xpi -> firefox-89.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ja.xpi -> firefox-89.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ka.xpi -> firefox-89.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/kab.xpi -> firefox-89.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/kk.xpi -> firefox-89.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/km.xpi -> firefox-89.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/kn.xpi -> firefox-89.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ko.xpi -> firefox-89.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/lij.xpi -> firefox-89.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/lt.xpi -> firefox-89.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/lv.xpi -> firefox-89.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/mk.xpi -> firefox-89.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/mr.xpi -> firefox-89.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ms.xpi -> firefox-89.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/my.xpi -> firefox-89.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-89.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-89.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/nl.xpi -> firefox-89.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-89.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/oc.xpi -> firefox-89.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-89.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/pl.xpi -> firefox-89.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-89.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-89.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/rm.xpi -> firefox-89.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ro.xpi -> firefox-89.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ru.xpi -> firefox-89.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/si.xpi -> firefox-89.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/sk.xpi -> firefox-89.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/sl.xpi -> firefox-89.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/son.xpi -> firefox-89.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/sq.xpi -> firefox-89.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/sr.xpi -> firefox-89.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-89.0-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/szl.xpi -> firefox-89.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ta.xpi -> firefox-89.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/te.xpi -> firefox-89.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/th.xpi -> firefox-89.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/tl.xpi -> firefox-89.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/tr.xpi -> firefox-89.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/trs.xpi -> firefox-89.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/uk.xpi -> firefox-89.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ur.xpi -> firefox-89.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/uz.xpi -> firefox-89.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/vi.xpi -> firefox-89.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/xh.xpi -> firefox-89.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-89.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-89.0-zh-TW.xpi )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=55f661ca4493c79581351c8aa6a331d7
diff --git a/metadata/md5-cache/www-client/firefox-89.0.1 b/metadata/md5-cache/www-client/firefox-89.0.1
index 3747fe3ed329..d5c3fa07f7ee 100644
--- a/metadata/md5-cache/www-client/firefox-89.0.1
+++ b/metadata/md5-cache/www-client/firefox-89.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.64 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
 SLOT=0/89
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/89.0.1/source/firefox-89.0.1.source.tar.xz -> firefox-89.0.1.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-89-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-89-patches-03.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-89-patches-03.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ach.xpi -> firefox-89.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/af.xpi -> firefox-89.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/an.xpi -> firefox-89.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ar.xpi -> firefox-89.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ast.xpi -> firefox-89.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/az.xpi -> firefox-89.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/be.xpi -> firefox-89.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/bg.xpi -> firefox-89.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/bn.xpi -> firefox-89.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/br.xpi -> firefox-89.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/bs.xpi -> firefox-89.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-89.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ca.xpi -> firefox-89.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/cak.xpi -> firefox-89.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/cs.xpi -> firefox-89.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/cy.xpi -> firefox-89.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/da.xpi -> firefox-89.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/de.xpi -> firefox-89.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-89.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/el.xpi -> firefox-89.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-89.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-89.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/eo.xpi -> firefox-89.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-89.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-89.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-89.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-89.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/et.xpi -> firefox-89.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/eu.xpi -> firefox-89.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/fa.xpi -> firefox-89.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ff.xpi -> firefox-89.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/fi.xpi -> firefox-89.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/fr.xpi -> firefox-89.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-89.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-89.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/gd.xpi -> firefox-89.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/gl.xpi -> firefox-89.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/gn.xpi -> firefox-89.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-89.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/he.xpi -> firefox-89.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-89.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/hr.xpi -> firefox-89.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-89.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/hu.xpi -> firefox-89.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-89.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ia.xpi -> firefox-89.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/id.xpi -> firefox-89.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/is.xpi -> firefox-89.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/it.xpi -> firefox-89.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ja.xpi -> firefox-89.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ka.xpi -> firefox-89.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/kab.xpi -> firefox-89.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/kk.xpi -> firefox-89.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/km.xpi -> firefox-89.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/kn.xpi -> firefox-89.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ko.xpi -> firefox-89.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/lij.xpi -> firefox-89.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/lt.xpi -> firefox-89.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/lv.xpi -> firefox-89.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/mk.xpi -> firefox-89.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/mr.xpi -> firefox-89.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ms.xpi -> firefox-89.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/my.xpi -> firefox-89.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-89.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-89.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/nl.xpi -> firefox-89.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-89.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/oc.xpi -> firefox-89.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-89.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/pl.xpi -> firefox-89.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-89.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-89.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/rm.xpi -> firefox-89.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ro.xpi -> firefox-89.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ru.xpi -> firefox-89.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/si.xpi -> firefox-89.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/sk.xpi -> firefox-89.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/sl.xpi -> firefox-89.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/son.xpi -> firefox-89.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/sq.xpi -> firefox-89.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/sr.xpi -> firefox-89.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-89.0.1-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/szl.xpi -> firefox-89.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ta.xpi -> firefox-89.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/te.xpi -> firefox-89.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/th.xpi -> firefox-89.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/tl.xpi -> firefox-89.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/tr.xpi -> firefox-89.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/trs.xpi -> firefox-89.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/uk.xpi -> firefox-89.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ur.xpi -> firefox-89.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/uz.xpi -> firefox-89.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/vi.xpi -> firefox-89.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/xh.xpi -> firefox-89.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-89.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-89.0.1-zh-TW.xpi )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=71e59e25864b759ebff2474a8f2cabb9
diff --git a/metadata/md5-cache/www-client/firefox-89.0.2 b/metadata/md5-cache/www-client/firefox-89.0.2
index b316d426b7fa..507e5b14e5c1 100644
--- a/metadata/md5-cache/www-client/firefox-89.0.2
+++ b/metadata/md5-cache/www-client/firefox-89.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.64 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
 SLOT=0/89
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/89.0.2/source/firefox-89.0.2.source.tar.xz -> firefox-89.0.2.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-89-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-89-patches-03.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-89-patches-03.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ach.xpi -> firefox-89.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/af.xpi -> firefox-89.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/an.xpi -> firefox-89.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ar.xpi -> firefox-89.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ast.xpi -> firefox-89.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/az.xpi -> firefox-89.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/be.xpi -> firefox-89.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/bg.xpi -> firefox-89.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/bn.xpi -> firefox-89.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/br.xpi -> firefox-89.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/bs.xpi -> firefox-89.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-89.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ca.xpi -> firefox-89.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/cak.xpi -> firefox-89.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/cs.xpi -> firefox-89.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/cy.xpi -> firefox-89.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/da.xpi -> firefox-89.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/de.xpi -> firefox-89.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-89.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/el.xpi -> firefox-89.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-89.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-89.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/eo.xpi -> firefox-89.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-89.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-89.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-89.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-89.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/et.xpi -> firefox-89.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/eu.xpi -> firefox-89.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/fa.xpi -> firefox-89.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ff.xpi -> firefox-89.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/fi.xpi -> firefox-89.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/fr.xpi -> firefox-89.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-89.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-89.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/gd.xpi -> firefox-89.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/gl.xpi -> firefox-89.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/gn.xpi -> firefox-89.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-89.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/he.xpi -> firefox-89.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-89.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/hr.xpi -> firefox-89.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-89.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/hu.xpi -> firefox-89.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-89.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ia.xpi -> firefox-89.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/id.xpi -> firefox-89.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/is.xpi -> firefox-89.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/it.xpi -> firefox-89.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ja.xpi -> firefox-89.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ka.xpi -> firefox-89.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/kab.xpi -> firefox-89.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/kk.xpi -> firefox-89.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/km.xpi -> firefox-89.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/kn.xpi -> firefox-89.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ko.xpi -> firefox-89.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/lij.xpi -> firefox-89.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/lt.xpi -> firefox-89.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/lv.xpi -> firefox-89.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/mk.xpi -> firefox-89.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/mr.xpi -> firefox-89.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ms.xpi -> firefox-89.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/my.xpi -> firefox-89.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-89.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-89.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/nl.xpi -> firefox-89.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-89.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/oc.xpi -> firefox-89.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-89.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/pl.xpi -> firefox-89.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-89.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-89.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/rm.xpi -> firefox-89.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ro.xpi -> firefox-89.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ru.xpi -> firefox-89.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/si.xpi -> firefox-89.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/sk.xpi -> firefox-89.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/sl.xpi -> firefox-89.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/son.xpi -> firefox-89.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/sq.xpi -> firefox-89.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/sr.xpi -> firefox-89.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-89.0.2-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/szl.xpi -> firefox-89.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ta.xpi -> firefox-89.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/te.xpi -> firefox-89.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/th.xpi -> firefox-89.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/tl.xpi -> firefox-89.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/tr.xpi -> firefox-89.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/trs.xpi -> firefox-89.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/uk.xpi -> firefox-89.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ur.xpi -> firefox-89.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/uz.xpi -> firefox-89.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/vi.xpi -> firefox-89.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/xh.xpi -> firefox-89.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-89.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-89.0.2-zh-TW.xpi )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=71e59e25864b759ebff2474a8f2cabb9
diff --git a/metadata/md5-cache/www-client/firefox-90.0 b/metadata/md5-cache/www-client/firefox-90.0
new file mode 100644
index 000000000000..86622d743554
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-90.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.47.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.66 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.7.4: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 ) sndio? ( media-sound/sndio ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_szl l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.66 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.7.4: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 ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
+SLOT=0/90
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/90.0/source/firefox-90.0.source.tar.xz -> firefox-90.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-90-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-90-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-90-patches-01.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ach.xpi -> firefox-90.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/af.xpi -> firefox-90.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/an.xpi -> firefox-90.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ar.xpi -> firefox-90.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ast.xpi -> firefox-90.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/az.xpi -> firefox-90.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/be.xpi -> firefox-90.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/bg.xpi -> firefox-90.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/bn.xpi -> firefox-90.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/br.xpi -> firefox-90.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/bs.xpi -> firefox-90.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-90.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ca.xpi -> firefox-90.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/cak.xpi -> firefox-90.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/cs.xpi -> firefox-90.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/cy.xpi -> firefox-90.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/da.xpi -> firefox-90.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/de.xpi -> firefox-90.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/dsb.xpi -> firefox-90.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/el.xpi -> firefox-90.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/en-CA.xpi -> firefox-90.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/en-GB.xpi -> firefox-90.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/eo.xpi -> firefox-90.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/es-AR.xpi -> firefox-90.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/es-CL.xpi -> firefox-90.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/es-ES.xpi -> firefox-90.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/es-MX.xpi -> firefox-90.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/et.xpi -> firefox-90.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/eu.xpi -> firefox-90.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/fa.xpi -> firefox-90.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ff.xpi -> firefox-90.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/fi.xpi -> firefox-90.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/fr.xpi -> firefox-90.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-90.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-90.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/gd.xpi -> firefox-90.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/gl.xpi -> firefox-90.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/gn.xpi -> firefox-90.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-90.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/he.xpi -> firefox-90.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-90.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/hr.xpi -> firefox-90.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/hsb.xpi -> firefox-90.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/hu.xpi -> firefox-90.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-90.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ia.xpi -> firefox-90.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/id.xpi -> firefox-90.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/is.xpi -> firefox-90.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/it.xpi -> firefox-90.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ja.xpi -> firefox-90.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ka.xpi -> firefox-90.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/kab.xpi -> firefox-90.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/kk.xpi -> firefox-90.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/km.xpi -> firefox-90.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/kn.xpi -> firefox-90.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ko.xpi -> firefox-90.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/lij.xpi -> firefox-90.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/lt.xpi -> firefox-90.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/lv.xpi -> firefox-90.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/mk.xpi -> firefox-90.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/mr.xpi -> firefox-90.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ms.xpi -> firefox-90.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/my.xpi -> firefox-90.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-90.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-90.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/nl.xpi -> firefox-90.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-90.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/oc.xpi -> firefox-90.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-90.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/pl.xpi -> firefox-90.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-90.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-90.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/rm.xpi -> firefox-90.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ro.xpi -> firefox-90.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ru.xpi -> firefox-90.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/si.xpi -> firefox-90.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/sk.xpi -> firefox-90.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/sl.xpi -> firefox-90.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/son.xpi -> firefox-90.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/sq.xpi -> firefox-90.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/sr.xpi -> firefox-90.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-90.0-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/szl.xpi -> firefox-90.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ta.xpi -> firefox-90.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/te.xpi -> firefox-90.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/th.xpi -> firefox-90.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/tl.xpi -> firefox-90.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/tr.xpi -> firefox-90.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/trs.xpi -> firefox-90.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/uk.xpi -> firefox-90.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ur.xpi -> firefox-90.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/uz.xpi -> firefox-90.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/vi.xpi -> firefox-90.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/xh.xpi -> firefox-90.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-90.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-90.0-zh-TW.xpi )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=48d7f3319df476e70f6327eae6f06f60
diff --git a/metadata/md5-cache/www-client/firefox-bin-78.11.0 b/metadata/md5-cache/www-client/firefox-bin-78.11.0
index 596a7e2c9e28..2e0fb93240a5 100644
--- a/metadata/md5-cache/www-client/firefox-bin-78.11.0
+++ b/metadata/md5-cache/www-client/firefox-bin-78.11.0
@@ -11,5 +11,5 @@ RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus
 RESTRICT=strip
 SLOT=0/esr78
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/en-US/firefox-78.11.0esr.tar.bz2 -> firefox-bin_x86_64-78.11.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-i686/en-US/firefox-78.11.0esr.tar.bz2 -> firefox-bin_i686-78.11.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.11.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.11.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.11.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.11.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.11.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.11.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.11.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.11.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.11.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.11.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.11.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.11.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.11.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.11.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.11.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.11.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.11.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.11.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.11.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.11.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.11.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.11.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.11.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.11.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.11.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.11.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.11.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.11.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.11.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.11.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.11.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.11.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.11.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.11.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.11.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.11.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.11.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.11.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.11.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.11.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.11.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.11.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.11.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.11.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.11.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.11.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.11.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.11.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.11.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.11.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.11.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.11.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.11.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.11.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.11.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.11.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.11.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.11.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.11.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.11.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.11.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.11.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.11.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.11.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.11.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.11.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.11.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.11.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.11.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.11.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.11.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.11.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.11.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.11.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.11.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.11.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.11.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.11.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.11.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.11.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.11.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.11.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.11.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.11.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.11.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.11.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.11.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.11.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.11.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.11.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.11.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.11.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.11.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.11.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.11.0esr-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	fce6ad998516159787b92e8043167889	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a6dc0753e28af35a2034105b44ced6e1
diff --git a/metadata/md5-cache/www-client/firefox-bin-78.12.0 b/metadata/md5-cache/www-client/firefox-bin-78.12.0
new file mode 100644
index 000000000000..ef1527b16a50
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-78.12.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=0/esr78
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/en-US/firefox-78.12.0esr.tar.bz2 -> firefox-bin_x86_64-78.12.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-i686/en-US/firefox-78.12.0esr.tar.bz2 -> firefox-bin_i686-78.12.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.12.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.12.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.12.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.12.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.12.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.12.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.12.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.12.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.12.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.12.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.12.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.12.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.12.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.12.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.12.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.12.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.12.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.12.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.12.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.12.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.12.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.12.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.12.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.12.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.12.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.12.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.12.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.12.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.12.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.12.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.12.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.12.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.12.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.12.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.12.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.12.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.12.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.12.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.12.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.12.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.12.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.12.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.12.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.12.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.12.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.12.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.12.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.12.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.12.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.12.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.12.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.12.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.12.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.12.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.12.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.12.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.12.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.12.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.12.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.12.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.12.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.12.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.12.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.12.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.12.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.12.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.12.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.12.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.12.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.12.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.12.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.12.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.12.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.12.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.12.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.12.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.12.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.12.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.12.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.12.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.12.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.12.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.12.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.12.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.12.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.12.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.12.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.12.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.12.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.12.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.12.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.12.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.12.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.12.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.12.0esr-zh-TW.xpi )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=703b728d79212d7fddf5f753511b713b
diff --git a/metadata/md5-cache/www-client/firefox-bin-89.0 b/metadata/md5-cache/www-client/firefox-bin-89.0
index 82d0a0988c51..6e641436dd61 100644
--- a/metadata/md5-cache/www-client/firefox-bin-89.0
+++ b/metadata/md5-cache/www-client/firefox-bin-89.0
@@ -11,5 +11,5 @@ RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus
 RESTRICT=strip
 SLOT=0/89
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/en-US/firefox-89.0.tar.bz2 -> firefox-bin_x86_64-89.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/en-US/firefox-89.0.tar.bz2 -> firefox-bin_i686-89.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ach.xpi -> firefox-89.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/af.xpi -> firefox-89.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/an.xpi -> firefox-89.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ar.xpi -> firefox-89.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ast.xpi -> firefox-89.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/az.xpi -> firefox-89.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/be.xpi -> firefox-89.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/bg.xpi -> firefox-89.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/bn.xpi -> firefox-89.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/br.xpi -> firefox-89.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/bs.xpi -> firefox-89.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-89.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ca.xpi -> firefox-89.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/cak.xpi -> firefox-89.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/cs.xpi -> firefox-89.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/cy.xpi -> firefox-89.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/da.xpi -> firefox-89.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/de.xpi -> firefox-89.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/dsb.xpi -> firefox-89.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/el.xpi -> firefox-89.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/en-CA.xpi -> firefox-89.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/en-GB.xpi -> firefox-89.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/eo.xpi -> firefox-89.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/es-AR.xpi -> firefox-89.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/es-CL.xpi -> firefox-89.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/es-ES.xpi -> firefox-89.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/es-MX.xpi -> firefox-89.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/et.xpi -> firefox-89.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/eu.xpi -> firefox-89.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/fa.xpi -> firefox-89.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ff.xpi -> firefox-89.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/fi.xpi -> firefox-89.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/fr.xpi -> firefox-89.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-89.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-89.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/gd.xpi -> firefox-89.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/gl.xpi -> firefox-89.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/gn.xpi -> firefox-89.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-89.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/he.xpi -> firefox-89.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-89.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/hr.xpi -> firefox-89.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/hsb.xpi -> firefox-89.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/hu.xpi -> firefox-89.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-89.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ia.xpi -> firefox-89.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/id.xpi -> firefox-89.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/is.xpi -> firefox-89.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/it.xpi -> firefox-89.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ja.xpi -> firefox-89.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ka.xpi -> firefox-89.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/kab.xpi -> firefox-89.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/kk.xpi -> firefox-89.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/km.xpi -> firefox-89.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/kn.xpi -> firefox-89.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ko.xpi -> firefox-89.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/lij.xpi -> firefox-89.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/lt.xpi -> firefox-89.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/lv.xpi -> firefox-89.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/mk.xpi -> firefox-89.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/mr.xpi -> firefox-89.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ms.xpi -> firefox-89.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/my.xpi -> firefox-89.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-89.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-89.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/nl.xpi -> firefox-89.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-89.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/oc.xpi -> firefox-89.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-89.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/pl.xpi -> firefox-89.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-89.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-89.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/rm.xpi -> firefox-89.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ro.xpi -> firefox-89.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ru.xpi -> firefox-89.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/si.xpi -> firefox-89.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/sk.xpi -> firefox-89.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/sl.xpi -> firefox-89.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/son.xpi -> firefox-89.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/sq.xpi -> firefox-89.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/sr.xpi -> firefox-89.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-89.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ta.xpi -> firefox-89.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/te.xpi -> firefox-89.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/th.xpi -> firefox-89.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/tl.xpi -> firefox-89.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/tr.xpi -> firefox-89.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/trs.xpi -> firefox-89.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/uk.xpi -> firefox-89.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/ur.xpi -> firefox-89.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/uz.xpi -> firefox-89.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/vi.xpi -> firefox-89.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/xh.xpi -> firefox-89.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-89.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-89.0-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	fce6ad998516159787b92e8043167889	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dfa8761fe8a182c31d47e474ccda49b1
diff --git a/metadata/md5-cache/www-client/firefox-bin-89.0.1 b/metadata/md5-cache/www-client/firefox-bin-89.0.1
index 5b465bfa6d7d..37e95f44179e 100644
--- a/metadata/md5-cache/www-client/firefox-bin-89.0.1
+++ b/metadata/md5-cache/www-client/firefox-bin-89.0.1
@@ -11,5 +11,5 @@ RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus
 RESTRICT=strip
 SLOT=0/89
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/en-US/firefox-89.0.1.tar.bz2 -> firefox-bin_x86_64-89.0.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/en-US/firefox-89.0.1.tar.bz2 -> firefox-bin_i686-89.0.1.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ach.xpi -> firefox-89.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/af.xpi -> firefox-89.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/an.xpi -> firefox-89.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ar.xpi -> firefox-89.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ast.xpi -> firefox-89.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/az.xpi -> firefox-89.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/be.xpi -> firefox-89.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/bg.xpi -> firefox-89.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/bn.xpi -> firefox-89.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/br.xpi -> firefox-89.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/bs.xpi -> firefox-89.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-89.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ca.xpi -> firefox-89.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/cak.xpi -> firefox-89.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/cs.xpi -> firefox-89.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/cy.xpi -> firefox-89.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/da.xpi -> firefox-89.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/de.xpi -> firefox-89.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-89.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/el.xpi -> firefox-89.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-89.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-89.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/eo.xpi -> firefox-89.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-89.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-89.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-89.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-89.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/et.xpi -> firefox-89.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/eu.xpi -> firefox-89.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/fa.xpi -> firefox-89.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ff.xpi -> firefox-89.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/fi.xpi -> firefox-89.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/fr.xpi -> firefox-89.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-89.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-89.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/gd.xpi -> firefox-89.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/gl.xpi -> firefox-89.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/gn.xpi -> firefox-89.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-89.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/he.xpi -> firefox-89.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-89.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/hr.xpi -> firefox-89.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-89.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/hu.xpi -> firefox-89.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-89.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ia.xpi -> firefox-89.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/id.xpi -> firefox-89.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/is.xpi -> firefox-89.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/it.xpi -> firefox-89.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ja.xpi -> firefox-89.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ka.xpi -> firefox-89.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/kab.xpi -> firefox-89.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/kk.xpi -> firefox-89.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/km.xpi -> firefox-89.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/kn.xpi -> firefox-89.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ko.xpi -> firefox-89.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/lij.xpi -> firefox-89.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/lt.xpi -> firefox-89.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/lv.xpi -> firefox-89.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/mk.xpi -> firefox-89.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/mr.xpi -> firefox-89.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ms.xpi -> firefox-89.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/my.xpi -> firefox-89.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-89.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-89.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/nl.xpi -> firefox-89.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-89.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/oc.xpi -> firefox-89.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-89.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/pl.xpi -> firefox-89.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-89.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-89.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/rm.xpi -> firefox-89.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ro.xpi -> firefox-89.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ru.xpi -> firefox-89.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/si.xpi -> firefox-89.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/sk.xpi -> firefox-89.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/sl.xpi -> firefox-89.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/son.xpi -> firefox-89.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/sq.xpi -> firefox-89.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/sr.xpi -> firefox-89.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-89.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ta.xpi -> firefox-89.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/te.xpi -> firefox-89.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/th.xpi -> firefox-89.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/tl.xpi -> firefox-89.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/tr.xpi -> firefox-89.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/trs.xpi -> firefox-89.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/uk.xpi -> firefox-89.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/ur.xpi -> firefox-89.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/uz.xpi -> firefox-89.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/vi.xpi -> firefox-89.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/xh.xpi -> firefox-89.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-89.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-89.0.1-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	fce6ad998516159787b92e8043167889	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dfa8761fe8a182c31d47e474ccda49b1
diff --git a/metadata/md5-cache/www-client/firefox-bin-89.0.2 b/metadata/md5-cache/www-client/firefox-bin-89.0.2
index cf39da336436..7a316b2dda0c 100644
--- a/metadata/md5-cache/www-client/firefox-bin-89.0.2
+++ b/metadata/md5-cache/www-client/firefox-bin-89.0.2
@@ -11,5 +11,5 @@ RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus
 RESTRICT=strip
 SLOT=0/89
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/en-US/firefox-89.0.2.tar.bz2 -> firefox-bin_x86_64-89.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/en-US/firefox-89.0.2.tar.bz2 -> firefox-bin_i686-89.0.2.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ach.xpi -> firefox-89.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/af.xpi -> firefox-89.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/an.xpi -> firefox-89.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ar.xpi -> firefox-89.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ast.xpi -> firefox-89.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/az.xpi -> firefox-89.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/be.xpi -> firefox-89.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/bg.xpi -> firefox-89.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/bn.xpi -> firefox-89.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/br.xpi -> firefox-89.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/bs.xpi -> firefox-89.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-89.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ca.xpi -> firefox-89.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/cak.xpi -> firefox-89.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/cs.xpi -> firefox-89.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/cy.xpi -> firefox-89.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/da.xpi -> firefox-89.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/de.xpi -> firefox-89.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-89.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/el.xpi -> firefox-89.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-89.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-89.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/eo.xpi -> firefox-89.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-89.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-89.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-89.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-89.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/et.xpi -> firefox-89.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/eu.xpi -> firefox-89.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/fa.xpi -> firefox-89.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ff.xpi -> firefox-89.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/fi.xpi -> firefox-89.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/fr.xpi -> firefox-89.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-89.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-89.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/gd.xpi -> firefox-89.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/gl.xpi -> firefox-89.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/gn.xpi -> firefox-89.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-89.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/he.xpi -> firefox-89.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-89.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/hr.xpi -> firefox-89.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-89.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/hu.xpi -> firefox-89.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-89.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ia.xpi -> firefox-89.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/id.xpi -> firefox-89.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/is.xpi -> firefox-89.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/it.xpi -> firefox-89.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ja.xpi -> firefox-89.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ka.xpi -> firefox-89.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/kab.xpi -> firefox-89.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/kk.xpi -> firefox-89.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/km.xpi -> firefox-89.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/kn.xpi -> firefox-89.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ko.xpi -> firefox-89.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/lij.xpi -> firefox-89.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/lt.xpi -> firefox-89.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/lv.xpi -> firefox-89.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/mk.xpi -> firefox-89.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/mr.xpi -> firefox-89.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ms.xpi -> firefox-89.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/my.xpi -> firefox-89.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-89.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-89.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/nl.xpi -> firefox-89.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-89.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/oc.xpi -> firefox-89.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-89.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/pl.xpi -> firefox-89.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-89.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-89.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/rm.xpi -> firefox-89.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ro.xpi -> firefox-89.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ru.xpi -> firefox-89.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/si.xpi -> firefox-89.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/sk.xpi -> firefox-89.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/sl.xpi -> firefox-89.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/son.xpi -> firefox-89.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/sq.xpi -> firefox-89.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/sr.xpi -> firefox-89.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-89.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ta.xpi -> firefox-89.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/te.xpi -> firefox-89.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/th.xpi -> firefox-89.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/tl.xpi -> firefox-89.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/tr.xpi -> firefox-89.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/trs.xpi -> firefox-89.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/uk.xpi -> firefox-89.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/ur.xpi -> firefox-89.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/uz.xpi -> firefox-89.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/vi.xpi -> firefox-89.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/xh.xpi -> firefox-89.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-89.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-89.0.2-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	74cd9920d64148719fb62c462935c1b5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	fce6ad998516159787b92e8043167889	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dfa8761fe8a182c31d47e474ccda49b1
diff --git a/metadata/md5-cache/www-client/firefox-bin-90.0 b/metadata/md5-cache/www-client/firefox-bin-90.0
new file mode 100644
index 000000000000..b289ed6a2142
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-90.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=0/90
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-US/firefox-90.0.tar.bz2 -> firefox-bin_x86_64-90.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-US/firefox-90.0.tar.bz2 -> firefox-bin_i686-90.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ach.xpi -> firefox-90.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/af.xpi -> firefox-90.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/an.xpi -> firefox-90.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ar.xpi -> firefox-90.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ast.xpi -> firefox-90.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/az.xpi -> firefox-90.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/be.xpi -> firefox-90.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/bg.xpi -> firefox-90.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/bn.xpi -> firefox-90.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/br.xpi -> firefox-90.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/bs.xpi -> firefox-90.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-90.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ca.xpi -> firefox-90.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/cak.xpi -> firefox-90.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/cs.xpi -> firefox-90.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/cy.xpi -> firefox-90.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/da.xpi -> firefox-90.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/de.xpi -> firefox-90.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/dsb.xpi -> firefox-90.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/el.xpi -> firefox-90.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/en-CA.xpi -> firefox-90.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/en-GB.xpi -> firefox-90.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/eo.xpi -> firefox-90.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/es-AR.xpi -> firefox-90.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/es-CL.xpi -> firefox-90.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/es-ES.xpi -> firefox-90.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/es-MX.xpi -> firefox-90.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/et.xpi -> firefox-90.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/eu.xpi -> firefox-90.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/fa.xpi -> firefox-90.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ff.xpi -> firefox-90.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/fi.xpi -> firefox-90.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/fr.xpi -> firefox-90.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-90.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-90.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/gd.xpi -> firefox-90.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/gl.xpi -> firefox-90.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/gn.xpi -> firefox-90.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-90.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/he.xpi -> firefox-90.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-90.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/hr.xpi -> firefox-90.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/hsb.xpi -> firefox-90.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/hu.xpi -> firefox-90.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-90.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ia.xpi -> firefox-90.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/id.xpi -> firefox-90.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/is.xpi -> firefox-90.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/it.xpi -> firefox-90.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ja.xpi -> firefox-90.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ka.xpi -> firefox-90.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/kab.xpi -> firefox-90.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/kk.xpi -> firefox-90.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/km.xpi -> firefox-90.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/kn.xpi -> firefox-90.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ko.xpi -> firefox-90.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/lij.xpi -> firefox-90.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/lt.xpi -> firefox-90.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/lv.xpi -> firefox-90.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/mk.xpi -> firefox-90.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/mr.xpi -> firefox-90.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ms.xpi -> firefox-90.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/my.xpi -> firefox-90.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-90.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-90.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/nl.xpi -> firefox-90.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-90.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/oc.xpi -> firefox-90.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-90.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/pl.xpi -> firefox-90.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-90.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-90.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/rm.xpi -> firefox-90.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ro.xpi -> firefox-90.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ru.xpi -> firefox-90.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/si.xpi -> firefox-90.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/sk.xpi -> firefox-90.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/sl.xpi -> firefox-90.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/son.xpi -> firefox-90.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/sq.xpi -> firefox-90.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/sr.xpi -> firefox-90.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-90.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ta.xpi -> firefox-90.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/te.xpi -> firefox-90.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/th.xpi -> firefox-90.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/tl.xpi -> firefox-90.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/tr.xpi -> firefox-90.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/trs.xpi -> firefox-90.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/uk.xpi -> firefox-90.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/ur.xpi -> firefox-90.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/uz.xpi -> firefox-90.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/vi.xpi -> firefox-90.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/xh.xpi -> firefox-90.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-90.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-90.0-zh-TW.xpi )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f68f15ff882e834c193324b7804bf863
diff --git a/metadata/md5-cache/www-client/google-chrome-91.0.4472.114 b/metadata/md5-cache/www-client/google-chrome-91.0.4472.114
deleted file mode 100644
index 90529c2144b0..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-91.0.4472.114
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Google
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_91.0.4472.114-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0ee4a56f10b145d892581d5e32ef181c
diff --git a/metadata/md5-cache/www-client/google-chrome-91.0.4472.164 b/metadata/md5-cache/www-client/google-chrome-91.0.4472.164
new file mode 100644
index 000000000000..ddb62d8a8099
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-91.0.4472.164
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Google
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_91.0.4472.164-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0ee4a56f10b145d892581d5e32ef181c
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.101 b/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.101
new file mode 100644
index 000000000000..438b53a94600
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.101
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Google
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_92.0.4515.101-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bcc54f6c33b23e21a948dc2d14b06bdc
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.80 b/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.80
deleted file mode 100644
index 08e81d517749..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.80
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Google
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_92.0.4515.80-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcc54f6c33b23e21a948dc2d14b06bdc
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4557.4 b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4557.4
deleted file mode 100644
index 378fd1663a85..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4557.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Google
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4557.4-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcc54f6c33b23e21a948dc2d14b06bdc
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4573.0 b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4573.0
new file mode 100644
index 000000000000..17e5b62458d0
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4573.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Google
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4573.0-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bcc54f6c33b23e21a948dc2d14b06bdc
diff --git a/metadata/md5-cache/www-client/links-2.22 b/metadata/md5-cache/www-client/links-2.22
deleted file mode 100644
index fd7ef7862f2e..000000000000
--- a/metadata/md5-cache/www-client/links-2.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0= ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) virtual/pkgconfig fbcon? ( virtual/os-headers ) livecd? ( virtual/os-headers ) X? ( dev-util/desktop-file-utils ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A fast and lightweight web browser running in both graphics and text mode
-EAPI=6
-HOMEPAGE=http://links.twibright.com/
-IUSE=brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0= ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
-REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
-SLOT=2
-SRC_URI=http://links.twibright.com/download/links-2.22.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=10eaefc99a51c1cf4629d67ff547228f
diff --git a/metadata/md5-cache/www-client/links-2.23-r1 b/metadata/md5-cache/www-client/links-2.23-r1
new file mode 100644
index 000000000000..24170eed3281
--- /dev/null
+++ b/metadata/md5-cache/www-client/links-2.23-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0= ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) fbcon? ( virtual/os-headers ) livecd? ( virtual/os-headers )
+DESCRIPTION=A fast and lightweight web browser running in both graphics and text mode
+EAPI=8
+HOMEPAGE=http://links.twibright.com/
+IDEPEND=X? ( dev-util/desktop-file-utils )
+IUSE=brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0= ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
+REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
+SLOT=2
+SRC_URI=http://links.twibright.com/download/links-2.23.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7002a5e3eef4f053c9e0b0bb528b1c3f
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.15 b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.15
index 36226235f6b0..11e6352acb96 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.15
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.15
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.15-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.22 b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.22
index 02463878a3dd..7e6f22a82e24 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.22
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.22
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.22-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.30 b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.30
index f0ac86082512..c7812be08fd4 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.30
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.30
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.30-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.916.1 b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.916.1
index 35d67142dfdb..988c54df8a31 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.916.1
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.916.1
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_93.0.916.1-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.926.1 b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.926.1
index 6b373ef91c2a..d8755c79076e 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.926.1
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.926.1
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_93.0.926.1-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.933.1 b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.933.1
index a838010e2004..7a2f7b3c7e2b 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.933.1
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.933.1
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_93.0.933.1-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/opera-77.0.4054.146 b/metadata/md5-cache/www-client/opera-77.0.4054.146
index 821bebc726a6..56d44cf86931 100644
--- a/metadata/md5-cache/www-client/opera-77.0.4054.146
+++ b/metadata/md5-cache/www-client/opera-77.0.4054.146
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera/desktop/77.0.4054.146/linux/opera-stable_77.0.4054.146_amd64.deb https://download2.operacdn.com/pub/opera/desktop/77.0.4054.146/linux/opera-stable_77.0.4054.146_amd64.deb https://download3.operacdn.com/pub/opera/desktop/77.0.4054.146/linux/opera-stable_77.0.4054.146_amd64.deb https://download4.operacdn.com/pub/opera/desktop/77.0.4054.146/linux/opera-stable_77.0.4054.146_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-91.0.4472.19.tar.xz )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d17979a5c4b36fa9bc46c4217dfcc983
diff --git a/metadata/md5-cache/www-client/opera-beta-77.0.4054.38 b/metadata/md5-cache/www-client/opera-beta-77.0.4054.38
index 189ab6d6aeba..c3de481c2174 100644
--- a/metadata/md5-cache/www-client/opera-beta-77.0.4054.38
+++ b/metadata/md5-cache/www-client/opera-beta-77.0.4054.38
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-beta/77.0.4054.38/linux/opera-beta_77.0.4054.38_amd64.deb https://download2.operacdn.com/pub/opera-beta/77.0.4054.38/linux/opera-beta_77.0.4054.38_amd64.deb https://download3.operacdn.com/pub/opera-beta/77.0.4054.38/linux/opera-beta_77.0.4054.38_amd64.deb https://download4.operacdn.com/pub/opera-beta/77.0.4054.38/linux/opera-beta_77.0.4054.38_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-91.0.4472.19.tar.xz )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1bf7fd06da390c6e0914466401d0d1c1
diff --git a/metadata/md5-cache/www-client/opera-beta-77.0.4054.91 b/metadata/md5-cache/www-client/opera-beta-77.0.4054.91
index 549bcfc971fd..534d30402c43 100644
--- a/metadata/md5-cache/www-client/opera-beta-77.0.4054.91
+++ b/metadata/md5-cache/www-client/opera-beta-77.0.4054.91
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-beta/77.0.4054.91/linux/opera-beta_77.0.4054.91_amd64.deb https://download2.operacdn.com/pub/opera-beta/77.0.4054.91/linux/opera-beta_77.0.4054.91_amd64.deb https://download3.operacdn.com/pub/opera-beta/77.0.4054.91/linux/opera-beta_77.0.4054.91_amd64.deb https://download4.operacdn.com/pub/opera-beta/77.0.4054.91/linux/opera-beta_77.0.4054.91_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-91.0.4472.19.tar.xz )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1bf7fd06da390c6e0914466401d0d1c1
diff --git a/metadata/md5-cache/www-client/opera-beta-78.0.4093.34 b/metadata/md5-cache/www-client/opera-beta-78.0.4093.34
index 10d81e070ee2..e058b9c9a8f3 100644
--- a/metadata/md5-cache/www-client/opera-beta-78.0.4093.34
+++ b/metadata/md5-cache/www-client/opera-beta-78.0.4093.34
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-beta/78.0.4093.34/linux/opera-beta_78.0.4093.34_amd64.deb https://download2.operacdn.com/pub/opera-beta/78.0.4093.34/linux/opera-beta_78.0.4093.34_amd64.deb https://download3.operacdn.com/pub/opera-beta/78.0.4093.34/linux/opera-beta_78.0.4093.34_amd64.deb https://download4.operacdn.com/pub/opera-beta/78.0.4093.34/linux/opera-beta_78.0.4093.34_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4515.20.tar.xz )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5c15c634a063e31582a9d6d3c4bf9b75
diff --git a/metadata/md5-cache/www-client/opera-developer-78.0.4093.0 b/metadata/md5-cache/www-client/opera-developer-78.0.4093.0
index c1ad77432651..cab5473868f1 100644
--- a/metadata/md5-cache/www-client/opera-developer-78.0.4093.0
+++ b/metadata/md5-cache/www-client/opera-developer-78.0.4093.0
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/78.0.4093.0/linux/opera-developer_78.0.4093.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/78.0.4093.0/linux/opera-developer_78.0.4093.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/78.0.4093.0/linux/opera-developer_78.0.4093.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/78.0.4093.0/linux/opera-developer_78.0.4093.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4515.20.tar.xz )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5c15c634a063e31582a9d6d3c4bf9b75
diff --git a/metadata/md5-cache/www-client/opera-developer-79.0.4100.0 b/metadata/md5-cache/www-client/opera-developer-79.0.4100.0
index faeca4543ba9..f6631a66be1d 100644
--- a/metadata/md5-cache/www-client/opera-developer-79.0.4100.0
+++ b/metadata/md5-cache/www-client/opera-developer-79.0.4100.0
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/79.0.4100.0/linux/opera-developer_79.0.4100.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/79.0.4100.0/linux/opera-developer_79.0.4100.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/79.0.4100.0/linux/opera-developer_79.0.4100.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/79.0.4100.0/linux/opera-developer_79.0.4100.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4515.20.tar.xz )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5c15c634a063e31582a9d6d3c4bf9b75
diff --git a/metadata/md5-cache/www-client/opera-developer-79.0.4105.0 b/metadata/md5-cache/www-client/opera-developer-79.0.4105.0
index 3a60420088c2..310e6acb9a39 100644
--- a/metadata/md5-cache/www-client/opera-developer-79.0.4105.0
+++ b/metadata/md5-cache/www-client/opera-developer-79.0.4105.0
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/79.0.4105.0/linux/opera-developer_79.0.4105.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/79.0.4105.0/linux/opera-developer_79.0.4105.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/79.0.4105.0/linux/opera-developer_79.0.4105.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/79.0.4105.0/linux/opera-developer_79.0.4105.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4515.20.tar.xz )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5c15c634a063e31582a9d6d3c4bf9b75
diff --git a/metadata/md5-cache/www-client/pybugz-0.13 b/metadata/md5-cache/www-client/pybugz-0.13
index 6d999a77b469..37772a14f6ce 100644
--- a/metadata/md5-cache/www-client/pybugz-0.13
+++ b/metadata/md5-cache/www-client/pybugz-0.13
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/williamh/pybugz/archive/0.13.tar.gz -> pybugz-0.13.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=590f7589c2591269843379af9f2a6213
diff --git a/metadata/md5-cache/www-client/pybugz-9999 b/metadata/md5-cache/www-client/pybugz-9999
index e6d37dca1249..e046fef71971 100644
--- a/metadata/md5-cache/www-client/pybugz-9999
+++ b/metadata/md5-cache/www-client/pybugz-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b7c838a38c4913472a74caec4bf48e1d
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.7.1-r1 b/metadata/md5-cache/www-client/seamonkey-2.53.7.1-r1
index 4ed0f9986a88..e3b59c53af3c 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.7.1-r1
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.7.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.7.1/source/seamonkey-2.53.7.1.source.tar.xz -> seamonkey-2.53.7.1.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.7.1/source/seamonkey-2.53.7.1.source-l10n.tar.xz -> seamonkey-2.53.7.1.source-l10n.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.53.6_beta1-patches-01.tar.xz system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.3-system_libvpx-1.8.patch.xz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	5366c6998d5538c65a3126b1b22094d5	mozextension	02419f8d0c6b57fd23bb4e875a37996a	mozlinguas-v2	7dd55f04a3aceef648244656b82152bb	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	5366c6998d5538c65a3126b1b22094d5	mozextension	02419f8d0c6b57fd23bb4e875a37996a	mozlinguas-v2	7dd55f04a3aceef648244656b82152bb	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ee4e6211ffb20c2a503dbec9dd9ab28d
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.8 b/metadata/md5-cache/www-client/seamonkey-2.53.8
index ed9c1a9a1e91..3da181277bf7 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.8
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.8
@@ -11,5 +11,5 @@ RDEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.8/source/seamonkey-2.53.8.source.tar.xz -> seamonkey-2.53.8.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.8/source/seamonkey-2.53.8.source-l10n.tar.xz -> seamonkey-2.53.8.source-l10n.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.53.8_beta1-patches-01.tar.xz system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.3-system_libvpx-1.8.patch.xz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	5366c6998d5538c65a3126b1b22094d5	mozextension	02419f8d0c6b57fd23bb4e875a37996a	mozlinguas-v2	7dd55f04a3aceef648244656b82152bb	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	5366c6998d5538c65a3126b1b22094d5	mozextension	02419f8d0c6b57fd23bb4e875a37996a	mozlinguas-v2	7dd55f04a3aceef648244656b82152bb	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2a946d9f6ed1a02cb75e86dc83ca5991
diff --git a/metadata/md5-cache/www-client/surf-9999 b/metadata/md5-cache/www-client/surf-9999
index 883769c81cc3..95dde44b4298 100644
--- a/metadata/md5-cache/www-client/surf-9999
+++ b/metadata/md5-cache/www-client/surf-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install postinst prepare setup unpack
-DEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=a simple web browser based on WebKit/GTK+
 EAPI=7
 HOMEPAGE=https://surf.suckless.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !sci-chemistry/surf !savedconfig? ( net-misc/curl x11-apps/xprop x11-misc/dmenu x11-terms/st ) tabbed? ( x11-misc/tabbed )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ec6f093b41858bbae1b0cab06d7be896
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=14460765860fe0e1a08b0c0a714a2815
diff --git a/metadata/md5-cache/www-client/surfraw-2.3.0-r3 b/metadata/md5-cache/www-client/surfraw-2.3.0-r3
index 82bf5cfdff9a..f564f71cfd96 100644
--- a/metadata/md5-cache/www-client/surfraw-2.3.0-r3
+++ b/metadata/md5-cache/www-client/surfraw-2.3.0-r3
@@ -9,5 +9,5 @@ RDEPEND=dev-lang/perl
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/surfraw/Surfraw/-/archive/surfraw-2.3.0/Surfraw-surfraw-2.3.0.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e48ca3fb0ffd128f79318fd5471fec8
diff --git a/metadata/md5-cache/www-client/surfraw-99999 b/metadata/md5-cache/www-client/surfraw-99999
index 76cbfac8a83a..6f2ccf89a962 100644
--- a/metadata/md5-cache/www-client/surfraw-99999
+++ b/metadata/md5-cache/www-client/surfraw-99999
@@ -8,5 +8,5 @@ PROPERTIES=live
 RDEPEND=dev-lang/perl
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d2b31c609f4bf5e6f42fc13152d8ab5
diff --git a/metadata/md5-cache/www-client/vivaldi-4.0.2312.36 b/metadata/md5-cache/www-client/vivaldi-4.0.2312.36
deleted file mode 100644
index 7dcd6d7f0851..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-4.0.2312.36
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm ~arm64
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.36-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.36-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.36-1_arm64.deb )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=85d450b4be07e6001b151344ae41d3bf
diff --git a/metadata/md5-cache/www-client/vivaldi-4.0.2312.38 b/metadata/md5-cache/www-client/vivaldi-4.0.2312.38
index 447212fdf6b2..5117c885afa2 100644
--- a/metadata/md5-cache/www-client/vivaldi-4.0.2312.38
+++ b/metadata/md5-cache/www-client/vivaldi-4.0.2312.38
@@ -4,11 +4,11 @@ DESCRIPTION=A browser for our friends
 EAPI=7
 HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
+KEYWORDS=-* amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.38-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.38-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.38-1_arm64.deb )
 _eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
+_md5_=85d450b4be07e6001b151344ae41d3bf
diff --git a/metadata/md5-cache/www-client/vivaldi-4.0.2312.41 b/metadata/md5-cache/www-client/vivaldi-4.0.2312.41
new file mode 100644
index 000000000000..b8485d148986
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-4.0.2312.41
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.41-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.41-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.41-1_arm64.deb )
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.9.2289.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.9.2289.3
deleted file mode 100644
index 69a4cafdbba0..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.9.2289.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.9.2289.3-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.9.2289.3-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.9.2289.3-1_armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.9.2289.3-1_i386.deb )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=edbda6a3c5d148fc64f36b9df74c6180
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2339.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2339.3
deleted file mode 100644
index e60a66514814..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2339.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2339.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2339.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2339.3-1_arm64.deb )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2345.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2345.3
deleted file mode 100644
index da1012919e08..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2345.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2345.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2345.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2345.3-1_arm64.deb )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2358.15 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2358.15
new file mode 100644
index 000000000000..bc7240d68efa
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2358.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2358.15-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2358.15-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2358.15-1_arm64.deb )
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
diff --git a/metadata/md5-cache/www-client/w3m-0.5.3_p20210102 b/metadata/md5-cache/www-client/w3m-0.5.3_p20210102
index 6178b1a1766d..aae663ec978c 100644
--- a/metadata/md5-cache/www-client/w3m-0.5.3_p20210102
+++ b/metadata/md5-cache/www-client/w3m-0.5.3_p20210102
@@ -5,11 +5,11 @@ DESCRIPTION=Text based WWW browser, supports tables and frames
 EAPI=7
 HOMEPAGE=https://github.com/tats/w3m
 IUSE=fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja lynxkeymap nls nntp ssl unicode X xface
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=w3m
 RDEPEND=dev-libs/boehm-gc:= sys-libs/ncurses:0= sys-libs/zlib gdk-pixbuf? ( x11-libs/gdk-pixbuf X? ( x11-libs/gdk-pixbuf-xlib ) ) !gdk-pixbuf? ( imlib? ( media-libs/imlib2[X?] ) ) gpm? ( sys-libs/gpm ) ssl? ( dev-libs/openssl:0= ) X? ( x11-libs/libXdmcp x11-libs/libXext ) xface? ( media-libs/compface )
 REQUIRED_USE=fbcon? ( ?? ( gdk-pixbuf imlib ) ) X? ( ?? ( gdk-pixbuf imlib ) )
 SLOT=0
 SRC_URI=https://github.com/tats/w3m/archive/v0.5.3+git20210102.tar.gz -> w3m-0.5.3+git20210102.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4c2fbd04b207de8dbffd697ca669629b
+_md5_=cb02e5c314ab61df26512ccd93877a31
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 83e8ccc1490c..425e1b3cb353 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/buku-4.5 b/metadata/md5-cache/www-misc/buku-4.5
index 21f3aa6b5bed..bc4c12691488 100644
--- a/metadata/md5-cache/www-misc/buku-4.5
+++ b/metadata/md5-cache/www-misc/buku-4.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jarun/buku/archive/v4.5.tar.gz -> buku-4.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2af6152e72c31a6fcd9ae462542b32d4
diff --git a/metadata/md5-cache/www-misc/buku-4.6 b/metadata/md5-cache/www-misc/buku-4.6
index d6ef4d26ab98..87044910e378 100644
--- a/metadata/md5-cache/www-misc/buku-4.6
+++ b/metadata/md5-cache/www-misc/buku-4.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jarun/buku/archive/v4.6.tar.gz -> buku-4.6.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c0eacbe862376a17ba148974ef690d91
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.23 b/metadata/md5-cache/www-misc/urlwatch-2.23
index 14c090cf5513..df5983e29bbe 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.23
+++ b/metadata/md5-cache/www-misc/urlwatch-2.23
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ) ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/minidb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ) ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minidb[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A tool for monitoring webpages for updates
 EAPI=7
 HOMEPAGE=https://thp.io/2008/urlwatch/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/minidb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minidb[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.23.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4aa56b699758d19701ebaf5427641836
+_md5_=ef2709640db6f217688cbf5294936d44
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index ee06156da645..3f01dad343cc 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.114 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.114
deleted file mode 100644
index 68b23f4afefa..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.114
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_91.0.4472.114-1_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=479a55ea044ba46c0c088e62c24c75c3
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.164 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.164
new file mode 100644
index 000000000000..6b99f639dec0
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.164
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=stable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_91.0.4472.164-1_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=479a55ea044ba46c0c088e62c24c75c3
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.101_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.101_beta
new file mode 100644
index 000000000000..11f6c9a07d52
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.101_beta
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=beta
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_92.0.4515.101-1_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.80_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.80_beta
deleted file mode 100644
index f062eabb8e5d..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.80_beta
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_92.0.4515.80-1_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4557.4_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4557.4_alpha
deleted file mode 100644
index 86762c6fdcb1..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4557.4_alpha
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
-RESTRICT=bindist mirror strip
-SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4557.4-1_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4573.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4573.0_alpha
new file mode 100644
index 000000000000..46d86f664a3e
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4573.0_alpha
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
+RESTRICT=bindist mirror strip
+SLOT=unstable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4573.0-1_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index baa1a95c0484..cf76bcc0a7ad 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/apache-2.4.48-r1 b/metadata/md5-cache/www-servers/apache-2.4.48-r1
index 2892a7f04986..2747d79af5fb 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.48-r1
+++ b/metadata/md5-cache/www-servers/apache-2.4.48-r1
@@ -5,7 +5,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers +apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_lua apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_uwsgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_memcache apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.48
 RDEPEND=apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) virtual/tmpfiles
@@ -13,4 +13,4 @@ REQUIRED_USE=apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_tar
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.48.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
 _eclasses_=apache-2	2ac8b88289753f6ba063ef5f5c99b369	autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f7d3b9a0f623076c5f216948802f2dc7
+_md5_=223220d801f50a3b5c22295bd5d8bb7e
diff --git a/metadata/md5-cache/www-servers/nginx-1.20.1-r2 b/metadata/md5-cache/www-servers/nginx-1.20.1-r2
index 8d3d6b858e1b..12a016dcc0d3 100644
--- a/metadata/md5-cache/www-servers/nginx-1.20.1-r2
+++ b/metadata/md5-cache/www-servers/nginx-1.20.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_h
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nginx.org/download/nginx-1.20.1.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.0.tar.gz -> njs-0.6.0.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.0.tar.gz -> njs-0.6.0.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6b91b2325c76c8d93b50236654048dda
diff --git a/metadata/md5-cache/www-servers/nginx-1.21.0-r2 b/metadata/md5-cache/www-servers/nginx-1.21.0-r2
index c38b01fd1398..a381c5d5e31c 100644
--- a/metadata/md5-cache/www-servers/nginx-1.21.0-r2
+++ b/metadata/md5-cache/www-servers/nginx-1.21.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_h
 RESTRICT=test
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.21.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.0.tar.gz -> njs-0.6.0.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.0.tar.gz -> njs-0.6.0.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=883016f41909de25c2cac21f4ce5abf6
diff --git a/metadata/md5-cache/www-servers/nginx-1.21.1 b/metadata/md5-cache/www-servers/nginx-1.21.1
index 3a6e90ebb527..483e7f65136f 100644
--- a/metadata/md5-cache/www-servers/nginx-1.21.1
+++ b/metadata/md5-cache/www-servers/nginx-1.21.1
@@ -13,5 +13,5 @@ REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_h
 RESTRICT=test
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.21.1.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.1.tar.gz -> njs-0.6.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.1.tar.gz -> njs-0.6.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	74cd9920d64148719fb62c462935c1b5	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f1101a7354586e278cfc6d3ddf81cfa
diff --git a/metadata/md5-cache/www-servers/pound-2.7f-r1 b/metadata/md5-cache/www-servers/pound-2.7f-r1
deleted file mode 100644
index 1000fdb7e856..000000000000
--- a/metadata/md5-cache/www-servers/pound-2.7f-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=dev-libs/libpcre dev-libs/openssl:0
-DESCRIPTION=A http/https reverse-proxy and load-balancer
-EAPI=5
-HOMEPAGE=http://www.apsis.ch/pound/
-KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc ~sparc x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libpcre dev-libs/openssl:0
-SLOT=0
-SRC_URI=http://www.apsis.ch/pound/Pound-2.7f.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f31b17f87349d2a40e69063eccf86e38
diff --git a/metadata/md5-cache/www-servers/puma-5.3.2-r1 b/metadata/md5-cache/www-servers/puma-5.3.2-r1
index 09aa4be48400..6828912c1b43 100644
--- a/metadata/md5-cache/www-servers/puma-5.3.2-r1
+++ b/metadata/md5-cache/www-servers/puma-5.3.2-r1
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] test? ( dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] test? ( dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] test? ( dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] test? ( dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] test? ( dev-ruby/rack[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby30(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby30(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) 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(-)] )
+DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
 EAPI=7
 HOMEPAGE=https://puma.io/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
-RDEPEND=dev-libs/openssl:0= ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[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 )
+RDEPEND=dev-libs/openssl:0= ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v5.3.2.tar.gz -> puma-5.3.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1b1bf903476e3bfbd3040c7348d1a3a9
+_md5_=7052b16ab7df080f0b24b434a6ca34d4
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.6 b/metadata/md5-cache/www-servers/tomcat-10.0.6
deleted file mode 100644
index adc63cecd39f..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-10.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.6:5.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.6:5.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=10
-SRC_URI=mirror://apache/tomcat/tomcat-9/v10.0.6/src/apache-tomcat-10.0.6-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=478c19bd09da8f15c83db184bd9691f5
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.66 b/metadata/md5-cache/www-servers/tomcat-8.5.66
deleted file mode 100644
index 73ade878af5d..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.66
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.66:3.1 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 doc? ( dev-java/glassfish-xmlrpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.66:3.1 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.66/src/apache-tomcat-8.5.66-src.tar.gz
-_eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3f7e14674b55bc6c97420a9a72c22843
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.68 b/metadata/md5-cache/www-servers/tomcat-8.5.68
index 8fe82e8b52b2..65c3adc8aca6 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.68
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.68
@@ -4,11 +4,11 @@ DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.68:3.1 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.68/src/apache-tomcat-8.5.68-src.tar.gz
 _eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c8342ad182cce8844d89c373dc5d9699
+_md5_=3f7e14674b55bc6c97420a9a72c22843
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.46 b/metadata/md5-cache/www-servers/tomcat-9.0.46
deleted file mode 100644
index 759e6af9407d..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.46
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.46:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 virtual/jdk:1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.46:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.46/src/apache-tomcat-9.0.46-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c5e92e213c87dbc4b8af9469f5201dca
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r102 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r102
index b9aac89b3e2a..7c08feb73028 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r102
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r102
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl
 REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 ) ) python-asyncio? ( || ( python_targets_python3_8 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dc8e8959ac90d912951518be748ef4d7
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r103 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r103
index 20f451c2663d..869c40c9ed44 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r103
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r103
@@ -5,11 +5,11 @@ DESCRIPTION=uWSGI server for Python web applications
 EAPI=7
 HOMEPAGE=https://projects.unbit.it/uwsgi/
 IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio python-gevent ruby +lua_single_target_lua5-1 php_targets_php7-3 php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( net-libs/libnsl php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ruby? ( 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_ruby30? ( dev-lang/ruby:3.0 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
 REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python-asyncio? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	74cd9920d64148719fb62c462935c1b5	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=981aa943402bed66f58cd7bf3c8137e1
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8f7b227ea5931075d08f8460254506d3
diff --git a/metadata/md5-cache/www-servers/varnish-6.0.6 b/metadata/md5-cache/www-servers/varnish-6.0.6
deleted file mode 100644
index ba182ded378b..000000000000
--- a/metadata/md5-cache/www-servers/varnish-6.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils virtual/pkgconfig
-DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
-EAPI=7
-HOMEPAGE=https://varnish-cache.org/
-IUSE=jemalloc jit static-libs python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~mips ~ppc ~ppc64 x86
-LICENSE=BSD-2 GPL-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= sys-devel/gcc
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0/1
-SRC_URI=http://varnish-cache.org/_downloads/varnish-6.0.6.tgz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=378cba7f708bfa79c98ba4c4bfb433d1
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 52be6906d6ed..5c74fc7f7b49 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/fonttosfnt-1.2.2 b/metadata/md5-cache/x11-apps/fonttosfnt-1.2.2
index 9f0fb74d25d9..3c4d8b601ac9 100644
--- a/metadata/md5-cache/x11-apps/fonttosfnt-1.2.2
+++ b/metadata/md5-cache/x11-apps/fonttosfnt-1.2.2
@@ -4,10 +4,10 @@ DEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libfontenc x11-base/xorg-p
 DESCRIPTION=X.Org fonttosfnt application
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/fonttosfnt
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libfontenc
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/fonttosfnt-1.2.2.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=457f56266202da1d7327953836e2320c
+_md5_=768c85c8c060f1242eb23b3bb08e285c
diff --git a/metadata/md5-cache/x11-apps/xeyes-1.1.2 b/metadata/md5-cache/x11-apps/xeyes-1.1.2
index f827081eed5d..ca644a95bca8 100644
--- a/metadata/md5-cache/x11-apps/xeyes-1.1.2
+++ b/metadata/md5-cache/x11-apps/xeyes-1.1.2
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/
 DESCRIPTION=X.Org xeyes application
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xeyes
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xeyes-1.1.2.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=d07354cc6821c38fb7bcfb98be47f06f
+_md5_=69be6abd701a6999037a967414f2ec0b
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index e34c32a678f3..42ed5c7645b7 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0
index f459eaebc198..9a6dc7aeb887 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=X.org input driver based on libinput
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
 IUSE=kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.11.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-1.1.0.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=01a1497323f08ac4ecbd3d2704b59093
+_md5_=0cd633ec6b2b04ff44f74bb2771e48de
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 12d36e25af2b..cba53fc6c28e 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libX11-1.7.2 b/metadata/md5-cache/x11-libs/libX11-1.7.2
index a042598f3766..6ff8a10172bf 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.7.2
+++ b/metadata/md5-cache/x11-libs/libX11-1.7.2
@@ -5,11 +5,11 @@ DESCRIPTION=X.Org X11 library
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
 IUSE=ipv6 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 doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.11.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(-)?] !<x11-base/xorg-proto-2019.2 x11-misc/compose-tables
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.2.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=76cfd588f53ed308e7f96a3f7d13ceec
+_md5_=0aa811eab4fcc9d59db28f25947338ee
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.106 b/metadata/md5-cache/x11-libs/libdrm-2.4.106
index bd9875861f87..0901bbdfcd73 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.106
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.106
@@ -5,11 +5,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=7
 HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.106.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4ced6c6dc9b048a26062029cc5cc8c03
+_md5_=23ffa4c2746a1554782077da520e1be7
diff --git a/metadata/md5-cache/x11-libs/xapps-2.0.6 b/metadata/md5-cache/x11-libs/xapps-2.0.6
deleted file mode 100644
index ddb2c6fc7070..000000000000
--- a/metadata/md5-cache/x11-libs/xapps-2.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.40.6 sys-devel/gettext gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
-DESCRIPTION=Cross-desktop libraries and common resources
-EAPI=7
-HOMEPAGE=https://github.com/linuxmint/xapp/
-IUSE=gtk-doc introspection static-libs python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/xapp/archive/2.0.6.tar.gz -> xapps-2.0.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=514e3c8ba5aecfb1d064d8fad83b794d
diff --git a/metadata/md5-cache/x11-libs/xapps-2.2.1 b/metadata/md5-cache/x11-libs/xapps-2.2.1
index fc619f7a5802..6a3a47f561e0 100644
--- a/metadata/md5-cache/x11-libs/xapps-2.2.1
+++ b/metadata/md5-cache/x11-libs/xapps-2.2.1
@@ -5,11 +5,11 @@ DESCRIPTION=Cross-desktop libraries and common resources
 EAPI=7
 HOMEPAGE=https://github.com/linuxmint/xapp/
 IUSE=gtk-doc introspection static-libs python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/xapp/archive/2.2.1.tar.gz -> xapps-2.2.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c6d812675310e0fbd1c5245976d8bdb9
+_md5_=514e3c8ba5aecfb1d064d8fad83b794d
diff --git a/metadata/md5-cache/x11-libs/xapps-2.2.2 b/metadata/md5-cache/x11-libs/xapps-2.2.2
new file mode 100644
index 000000000000..57dec939515d
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/xapps-2.2.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.40.6 sys-devel/gettext gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
+DESCRIPTION=Cross-desktop libraries and common resources
+EAPI=7
+HOMEPAGE=https://github.com/linuxmint/xapp/
+IUSE=gtk-doc introspection static-libs python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/xapp/archive/2.2.2.tar.gz -> xapps-2.2.2.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c6d812675310e0fbd1c5245976d8bdb9
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 8cc651ff4541..5ac74b370e82 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/autorandr-1.11 b/metadata/md5-cache/x11-misc/autorandr-1.11
index ecfb3abbbb5a..0449156564ff 100644
--- a/metadata/md5-cache/x11-misc/autorandr-1.11
+++ b/metadata/md5-cache/x11-misc/autorandr-1.11
@@ -11,5 +11,5 @@ RDEPEND=launcher? ( x11-libs/libxcb ) udev? ( virtual/udev ) python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/phillipberndt/autorandr/archive/1.11.tar.gz -> autorandr-1.11.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=8be217f62ceafee110b507cbb73f0a11
diff --git a/metadata/md5-cache/x11-misc/autorandr-9999 b/metadata/md5-cache/x11-misc/autorandr-9999
index a88531f50996..9a28cd660734 100644
--- a/metadata/md5-cache/x11-misc/autorandr-9999
+++ b/metadata/md5-cache/x11-misc/autorandr-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=launcher? ( x11-libs/libxcb ) udev? ( virtual/udev ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=8be217f62ceafee110b507cbb73f0a11
diff --git a/metadata/md5-cache/x11-misc/colord-1.3.5 b/metadata/md5-cache/x11-misc/colord-1.3.5
index 9a74e2f40378..95d42d17eb91 100644
--- a/metadata/md5-cache/x11-misc/colord-1.3.5
+++ b/metadata/md5-cache/x11-misc/colord-1.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-1.3.5.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8a668d87bd358d736c8249d3cb9f65e9
diff --git a/metadata/md5-cache/x11-misc/colord-1.4.5-r1 b/metadata/md5-cache/x11-misc/colord-1.4.5-r1
index 0f220788879c..ead7d366f773 100644
--- a/metadata/md5-cache/x11-misc/colord-1.4.5-r1
+++ b/metadata/md5-cache/x11-misc/colord-1.4.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=scanner? ( udev ) vala? ( introspection )
 RESTRICT=!test? ( test ) test
 SLOT=0/2
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-1.4.5.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7291764972db51d045c66e52133297be
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.7.2 b/metadata/md5-cache/x11-misc/compose-tables-1.7.2
index 28d32f3706c2..18660f3f5ea4 100644
--- a/metadata/md5-cache/x11-misc/compose-tables-1.7.2
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.7.2
@@ -4,10 +4,10 @@ DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans
 DESCRIPTION=X.Org Compose Key tables from libX11
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=!<x11-libs/libX11-1.7.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.2.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=b12a55f711a4c5694faff62a57459ae6
+_md5_=b3edb83f4dbca27b244be000c82351da
diff --git a/metadata/md5-cache/x11-misc/dunst-9999 b/metadata/md5-cache/x11-misc/dunst-9999
index bc80ff66d8bf..3325aba0d888 100644
--- a/metadata/md5-cache/x11-misc/dunst-9999
+++ b/metadata/md5-cache/x11-misc/dunst-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig wayland? ( dev-libs/wayland-protocols ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] wayland? ( dev-libs/wayland )
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] wayland? ( dev-libs/wayland )
 DESCRIPTION=Customizable and lightweight notification-daemon
 EAPI=7
 HOMEPAGE=https://dunst-project.org/ https://github.com/dunst-project/dunst
 IUSE=test wayland
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] wayland? ( dev-libs/wayland )
+RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] wayland? ( dev-libs/wayland )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e355faef434a0f7578c972775de0ba2c
+_md5_=211115f87e90d51f7a651cbafeb490cb
diff --git a/metadata/md5-cache/x11-misc/i3blocks-1.5-r1 b/metadata/md5-cache/x11-misc/i3blocks-1.5-r1
index 3b42bfdaab95..bc42540a1166 100644
--- a/metadata/md5-cache/x11-misc/i3blocks-1.5-r1
+++ b/metadata/md5-cache/x11-misc/i3blocks-1.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PDEPEND=contrib? ( x11-misc/i3blocks-contrib )
 SLOT=0
 SRC_URI=https://github.com/vivien/i3blocks/archive/1.5.tar.gz -> i3blocks-1.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=61df1b893178755afeba4fd75b1fd0dd
diff --git a/metadata/md5-cache/x11-misc/i3blocks-contrib-2.0.0 b/metadata/md5-cache/x11-misc/i3blocks-contrib-2.0.0
index 6b1fd13c51f5..3fcdf7824827 100644
--- a/metadata/md5-cache/x11-misc/i3blocks-contrib-2.0.0
+++ b/metadata/md5-cache/x11-misc/i3blocks-contrib-2.0.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=A set of scripts for i3blocks, contributed by the community
 EAPI=7
 HOMEPAGE=https://github.com/vivien/i3blocks-contrib
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=!<x11-misc/i3blocks-1.5 >=x11-misc/i3blocks-1.5
 SLOT=0
 SRC_URI=https://github.com/vivien/i3blocks-contrib/archive/v2.0.0.tar.gz -> i3blocks-contrib-2.0.0.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88255168c1fe64a3fc2e3d56f1dec4cd
+_md5_=68358dee8df08de3fe238737be8e7c23
diff --git a/metadata/md5-cache/x11-misc/kdocker-5.2 b/metadata/md5-cache/x11-misc/kdocker-5.2
index b655e72a97c0..96074b771556 100644
--- a/metadata/md5-cache/x11-misc/kdocker-5.2
+++ b/metadata/md5-cache/x11-misc/kdocker-5.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/user-none/KDocker/archive/5.2.tar.gz -> KDocker-5.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c4d1cb5235d26f0ee5d55fc5906390c6
diff --git a/metadata/md5-cache/x11-misc/kdocker-5.3 b/metadata/md5-cache/x11-misc/kdocker-5.3
index 9fd593402169..beab77975ac9 100644
--- a/metadata/md5-cache/x11-misc/kdocker-5.3
+++ b/metadata/md5-cache/x11-misc/kdocker-5.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/user-none/KDocker/archive/5.3.tar.gz -> KDocker-5.3.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d56217f9a23793044a18828eaf36e393
diff --git a/metadata/md5-cache/x11-misc/slock-1.4-r1 b/metadata/md5-cache/x11-misc/slock-1.4-r1
index 02375fd6225a..e764d6541cfe 100644
--- a/metadata/md5-cache/x11-misc/slock-1.4-r1
+++ b/metadata/md5-cache/x11-misc/slock-1.4-r1
@@ -5,10 +5,10 @@ DESCRIPTION=simple X display locker
 EAPI=7
 HOMEPAGE=https://tools.suckless.org/slock
 IUSE=+filecaps savedconfig
-KEYWORDS=amd64 ~arm64 ~hppa ~ppc64 x86
+KEYWORDS=amd64 arm64 ~hppa ~ppc64 x86
 LICENSE=MIT
 RDEPEND=virtual/libcrypt:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/slock-1.4.tar.gz
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bbdb75264e212b3abd891d5b40159721
+_md5_=352a9b8d338854e9fbba9712cd11a11e
diff --git a/metadata/md5-cache/x11-misc/tabbed-0.6-r1 b/metadata/md5-cache/x11-misc/tabbed-0.6-r1
index fc02559439e6..08b36018b8e2 100644
--- a/metadata/md5-cache/x11-misc/tabbed-0.6-r1
+++ b/metadata/md5-cache/x11-misc/tabbed-0.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple generic tabbed fronted to xembed aware applications
 EAPI=7
 HOMEPAGE=https://tools.suckless.org/tabbed
 IUSE=savedconfig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/tabbed-0.6.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7333a2ab2e083a76b07ac7cbc512b401
+_md5_=28357ff121418e46864d87f7ec4b29b4
diff --git a/metadata/md5-cache/x11-misc/wbar-2.3.4-r3 b/metadata/md5-cache/x11-misc/wbar-2.3.4-r3
index 6a503129b699..ee10dbf548a4 100644
--- a/metadata/md5-cache/x11-misc/wbar-2.3.4-r3
+++ b/metadata/md5-cache/x11-misc/wbar-2.3.4-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/imlib2[X] x11-libs/libX11 gtk? ( dev-libs/glib gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://wbar.googlecode.com/files/wbar-2.3.4.tgz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7707b88dbbabd30f4748ae719f485222
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.37 b/metadata/md5-cache/x11-misc/xmobar-0.37
index 2700e65b2d34..9ab98db9f8b5 100644
--- a/metadata/md5-cache/x11-misc/xmobar-0.37
+++ b/metadata/md5-cache/x11-misc/xmobar-0.37
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[
 RESTRICT=!test? ( test )
 SLOT=0/0.37
 SRC_URI=https://hackage.haskell.org/package/xmobar-0.37/xmobar-0.37.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b9d53e42c7522e0aede8a43364189fa7
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.7.1 b/metadata/md5-cache/x11-misc/xwallpaper-0.7.1
index e0735c4cf7f5..7e7ed63df8de 100644
--- a/metadata/md5-cache/x11-misc/xwallpaper-0.7.1
+++ b/metadata/md5-cache/x11-misc/xwallpaper-0.7.1
@@ -5,10 +5,10 @@ DESCRIPTION=Wallpaper setting utility for X
 EAPI=7
 HOMEPAGE=https://github.com/stoeckmann/xwallpaper
 IUSE=jpeg png seccomp xpm
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=ISC
 RDEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://github.com/stoeckmann/xwallpaper/releases/download/v0.7.1/xwallpaper-0.7.1.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4baa6599ed0ed8e5067a6ffde08bba33
+_md5_=6853746ed89710f3de48f0fefc752520
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 92e44aae7962..09e9a1a0880e 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/pidgin-window_merge-0.3-r1 b/metadata/md5-cache/x11-plugins/pidgin-window_merge-0.3-r1
new file mode 100644
index 000000000000..43d906c9388e
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/pidgin-window_merge-0.3-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=dev-libs/glib:2= net-im/pidgin:0=[gtk] virtual/pkgconfig
+DESCRIPTION=A Pidgin plugin that merges the Buddy List window with a conversation window
+EAPI=8
+HOMEPAGE=https://github.com/dm0-/window_merge
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2= net-im/pidgin:0=[gtk]
+SLOT=0
+SRC_URI=https://github.com/downloads/dm0-/window_merge/window_merge-0.3.tar.gz
+_md5_=fe89a6bc1acfab98e49775c9cb4515e9
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 619ae91259b9..05b960b338fb 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.7.2 b/metadata/md5-cache/x11-terms/alacritty-0.7.2
index 823f78d9da43..64d5caafca95 100644
--- a/metadata/md5-cache/x11-terms/alacritty-0.7.2
+++ b/metadata/md5-cache/x11-terms/alacritty-0.7.2
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=https://github.com/alacritty/alacritty/archive/v0.7.2.tar.gz -> alacritty-0.7.2.tar.gz https://crates.io/api/v1/crates/ab_glyph_rasterizer/0.1.4/download -> ab_glyph_rasterizer-0.1.4.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/andrew/0.3.1/download -> andrew-0.3.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.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/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/byteorder/1.4.2/download -> byteorder-1.4.2.crate https://crates.io/api/v1/crates/calloop/0.6.5/download -> calloop-0.6.5.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/clipboard-win/3.1.1/download -> clipboard-win-3.1.1.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/cocoa/0.23.0/download -> cocoa-0.23.0.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/copypasta/0.7.1/download -> copypasta-0.7.1.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.2/download -> core-graphics-0.22.2.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-text/19.1.0/download -> core-text-19.1.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/crossfont/0.2.0/download -> crossfont-0.2.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/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.2/download -> dlib-0.4.2.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dtoa/0.4.7/download -> dtoa-0.4.7.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/embed-resource/1.5.1/download -> embed-resource-1.5.1.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.14/download -> filetime-0.2.14.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/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.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/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.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/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glutin/0.26.0/download -> glutin-0.26.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.5/download -> glutin_egl_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.5/download -> glutin_gles2_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.7/download -> glutin_glx_sys-0.1.7.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.5/download -> glutin_wgl_sys-0.1.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.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/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy-bytes-cast/5.0.1/download -> lazy-bytes-cast-5.0.1.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.86/download -> libc-0.2.86.crate https://crates.io/api/v1/crates/libloading/0.6.7/download -> libloading-0.6.7.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.2/download -> lock_api-0.4.2.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.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/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memmap2/0.1.0/download -> memmap2-0.1.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.6/download -> miow-0.3.6.crate https://crates.io/api/v1/crates/ndk/0.2.1/download -> ndk-0.2.1.crate https://crates.io/api/v1/crates/ndk-glue/0.2.1/download -> ndk-glue-0.2.1.crate https://crates.io/api/v1/crates/ndk-macro/0.2.0/download -> ndk-macro-0.2.0.crate https://crates.io/api/v1/crates/ndk-sys/0.2.1/download -> ndk-sys-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.18.0/download -> nix-0.18.0.crate https://crates.io/api/v1/crates/nom/6.1.0/download -> nom-6.1.0.crate https://crates.io/api/v1/crates/notify/4.0.15/download -> notify-4.0.15.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/owned_ttf_parser/0.6.0/download -> owned_ttf_parser-0.6.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.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/png/0.16.8/download -> png-0.16.8.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-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.4/download -> redox_syscall-0.2.4.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.22/download -> regex-syntax-0.6.22.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/rusttype/0.9.2/download -> rusttype-0.9.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.123/download -> serde-1.0.123.crate https://crates.io/api/v1/crates/serde_derive/1.0.123/download -> serde_derive-1.0.123.crate https://crates.io/api/v1/crates/serde_json/1.0.62/download -> serde_json-1.0.62.crate https://crates.io/api/v1/crates/serde_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.12.2/download -> smithay-client-toolkit-0.12.2.crate https://crates.io/api/v1/crates/smithay-clipboard/0.6.3/download -> smithay-clipboard-0.6.3.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.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/syn/1.0.60/download -> syn-1.0.60.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.23/download -> thiserror-1.0.23.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.23/download -> thiserror-impl-1.0.23.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/ttf-parser/0.6.2/download -> ttf-parser-0.6.2.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/urlocator/0.1.4/download -> urlocator-0.1.4.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.10.0/download -> vte-0.10.0.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.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/wayland-client/0.28.3/download -> wayland-client-0.28.3.crate https://crates.io/api/v1/crates/wayland-commons/0.28.3/download -> wayland-commons-0.28.3.crate https://crates.io/api/v1/crates/wayland-cursor/0.28.3/download -> wayland-cursor-0.28.3.crate https://crates.io/api/v1/crates/wayland-egl/0.28.3/download -> wayland-egl-0.28.3.crate https://crates.io/api/v1/crates/wayland-protocols/0.28.3/download -> wayland-protocols-0.28.3.crate https://crates.io/api/v1/crates/wayland-scanner/0.28.3/download -> wayland-scanner-0.28.3.crate https://crates.io/api/v1/crates/wayland-sys/0.28.3/download -> wayland-sys-0.28.3.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/winit/0.24.0/download -> winit-0.24.0.crate https://crates.io/api/v1/crates/winreg/0.8.0/download -> winreg-0.8.0.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xcursor/0.3.3/download -> xcursor-0.3.3.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e23637fd52010846b592d83696dda1c
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.8.0 b/metadata/md5-cache/x11-terms/alacritty-0.8.0
index 911fb413ea10..6d26c04e3fd4 100644
--- a/metadata/md5-cache/x11-terms/alacritty-0.8.0
+++ b/metadata/md5-cache/x11-terms/alacritty-0.8.0
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=https://github.com/alacritty/alacritty/archive/v0.8.0.tar.gz -> alacritty-0.8.0.tar.gz https://crates.io/api/v1/crates/ab_glyph_rasterizer/0.1.4/download -> ab_glyph_rasterizer-0.1.4.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/andrew/0.3.1/download -> andrew-0.3.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.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/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/calloop/0.6.5/download -> calloop-0.6.5.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/clipboard-win/3.1.1/download -> clipboard-win-3.1.1.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/cocoa/0.23.0/download -> cocoa-0.23.0.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/copypasta/0.7.1/download -> copypasta-0.7.1.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.2/download -> core-graphics-0.22.2.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-text/19.2.0/download -> core-text-19.2.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossfont/0.3.0/download -> crossfont-0.3.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/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.2/download -> dlib-0.4.2.crate https://crates.io/api/v1/crates/dlib/0.5.0/download -> dlib-0.5.0.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/embed-resource/1.6.2/download -> embed-resource-1.6.2.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.14/download -> filetime-0.2.14.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/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.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/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.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/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glutin/0.26.0/download -> glutin-0.26.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.5/download -> glutin_egl_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.5/download -> glutin_gles2_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.7/download -> glutin_glx_sys-0.1.7.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.5/download -> glutin_wgl_sys-0.1.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.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/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy-bytes-cast/5.0.1/download -> lazy-bytes-cast-5.0.1.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.94/download -> libc-0.2.94.crate https://crates.io/api/v1/crates/libloading/0.6.7/download -> libloading-0.6.7.crate https://crates.io/api/v1/crates/libloading/0.7.0/download -> libloading-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.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/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memmap2/0.1.0/download -> memmap2-0.1.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ndk/0.2.1/download -> ndk-0.2.1.crate https://crates.io/api/v1/crates/ndk-glue/0.2.1/download -> ndk-glue-0.2.1.crate https://crates.io/api/v1/crates/ndk-macro/0.2.0/download -> ndk-macro-0.2.0.crate https://crates.io/api/v1/crates/ndk-sys/0.2.1/download -> ndk-sys-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.18.0/download -> nix-0.18.0.crate https://crates.io/api/v1/crates/nix/0.20.0/download -> nix-0.20.0.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.crate https://crates.io/api/v1/crates/notify/4.0.16/download -> notify-4.0.16.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/owned_ttf_parser/0.6.0/download -> owned_ttf_parser-0.6.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.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/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.8/download -> redox_syscall-0.2.8.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rusttype/0.9.2/download -> rusttype-0.9.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/serde_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/slab/0.4.3/download -> slab-0.4.3.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.12.3/download -> smithay-client-toolkit-0.12.3.crate https://crates.io/api/v1/crates/smithay-clipboard/0.6.3/download -> smithay-clipboard-0.6.3.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.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/syn/1.0.72/download -> syn-1.0.72.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.24/download -> thiserror-1.0.24.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.24/download -> thiserror-impl-1.0.24.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/ttf-parser/0.6.2/download -> ttf-parser-0.6.2.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.28.5/download -> wayland-client-0.28.5.crate https://crates.io/api/v1/crates/wayland-commons/0.28.5/download -> wayland-commons-0.28.5.crate https://crates.io/api/v1/crates/wayland-cursor/0.28.5/download -> wayland-cursor-0.28.5.crate https://crates.io/api/v1/crates/wayland-egl/0.28.5/download -> wayland-egl-0.28.5.crate https://crates.io/api/v1/crates/wayland-protocols/0.28.5/download -> wayland-protocols-0.28.5.crate https://crates.io/api/v1/crates/wayland-scanner/0.28.5/download -> wayland-scanner-0.28.5.crate https://crates.io/api/v1/crates/wayland-sys/0.28.5/download -> wayland-sys-0.28.5.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/winit/0.24.0/download -> winit-0.24.0.crate https://crates.io/api/v1/crates/winreg/0.8.0/download -> winreg-0.8.0.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xcursor/0.3.3/download -> xcursor-0.3.3.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc4c40147ed080ddd36d89ee873f49cd
diff --git a/metadata/md5-cache/x11-terms/alacritty-9999 b/metadata/md5-cache/x11-terms/alacritty-9999
index dc1be721aaf8..5a802c9e790b 100644
--- a/metadata/md5-cache/x11-terms/alacritty-9999
+++ b/metadata/md5-cache/x11-terms/alacritty-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	c7fefacaebdcb455d2a7b59429eb47a6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d2df49f71e58ca2ad9b817a2881c761
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.40.3 b/metadata/md5-cache/x11-terms/gnome-terminal-3.40.3
new file mode 100644
index 000000000000..fb1a1fa5623e
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.40.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/libxml2:2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.64.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Gnome Terminal
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/
+IUSE=debug +gnome-shell +nautilus vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.64.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-terminal/3.40/gnome-terminal-3.40.3.tar.xz !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/gnome-terminal-3.40.1-cntr-ntfy-autottl-ts.patch.xz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3afdedb4c6d2ba654f3e7636c408880d
diff --git a/metadata/md5-cache/x11-terms/kitty-0.21.2 b/metadata/md5-cache/x11-terms/kitty-0.21.2
new file mode 100644
index 000000000000..5f0834a51319
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-0.21.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/lcms media-libs/libcanberra media-libs/libpng:0= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-misc/xkeyboard-config x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) media-libs/mesa[X] sys-libs/ncurses dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/kovidgoyal/kitty
+IUSE=debug wayland python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/lcms media-libs/libcanberra media-libs/libpng:0= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-misc/xkeyboard-config x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.21.2/kitty-0.21.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4dae6e7123e692bec5e1f060c37e25cd
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index a2eea3d797b2..e55b29415d4d 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -11,4 +11,4 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=83d83b645fddfbae46fe5fce3ae516df
+_md5_=5c548f9373bebe212e7d637cff228604
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.21.2 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.21.2
new file mode 100644
index 000000000000..9296e0a166e5
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-0.21.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Terminfo for kitty, an OpenGL-based terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/kovidgoyal/kitty
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.21.2/kitty-0.21.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bfabdc8957c0f5d7ed02adeff8669c46
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.9.1-r1 b/metadata/md5-cache/x11-terms/mlterm-3.9.1-r1
deleted file mode 100644
index 89e5a6cb349a..000000000000
--- a/metadata/md5-cache/x11-terms/mlterm-3.9.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) canna? ( app-i18n/canna ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=A multi-lingual terminal emulator
-EAPI=7
-HOMEPAGE=http://mlterm.sourceforge.net/
-IUSE=+X bidi brltty cairo canna debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) canna? ( app-i18n/canna ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft )
-REQUIRED_USE=|| ( X fbcon wayland )
-SLOT=0
-SRC_URI=mirror://sourceforge/mlterm/mlterm-3.9.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=d42d9ec16fd34ce63494c698cd9c45d8
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.9.1-r2 b/metadata/md5-cache/x11-terms/mlterm-3.9.1-r2
new file mode 100644
index 000000000000..30cd399bbba2
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/mlterm-3.9.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=A multi-lingual terminal emulator
+EAPI=7
+HOMEPAGE=http://mlterm.sourceforge.net/
+IUSE=+X bidi brltty cairo debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=BSD
+RDEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft )
+REQUIRED_USE=|| ( X fbcon wayland )
+SLOT=0
+SRC_URI=mirror://sourceforge/mlterm/mlterm-3.9.1.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=ea025d3c0c78506cca02bbc4493f7d49
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9.26-r1 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.26-r1
deleted file mode 100644
index 3c86b8654d62..000000000000
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9.26-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.7-r6:= media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender x11-libs/libXt gdk-pixbuf? ( x11-libs/gdk-pixbuf ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft ) x11-base/xorg-proto
-DESCRIPTION=rxvt clone with xft and unicode support
-EAPI=7
-HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
-IUSE=24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel +perl startup-notification unicode3 +utmp +wtmp xft
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.7-r6:= media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender x11-libs/libXt gdk-pixbuf? ( x11-libs/gdk-pixbuf ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft )
-SLOT=0
-SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.26.tar.bz2 https://dev.gentoo.org/~marecki/dists/rxvt-unicode/rxvt-unicode-9.26_24-bit-color_aur-20210516+eautoreconf.patch.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c015774016df886a15fbb2cfa64bacee
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9.26-r2 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.26-r2
new file mode 100644
index 000000000000..3c2f23bec4cc
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9.26-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=sys-libs/ncurses-5.7-r6:= media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender x11-libs/libXt gdk-pixbuf? ( x11-libs/gdk-pixbuf ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft ) x11-base/xorg-proto
+DESCRIPTION=rxvt clone with xft and unicode support
+EAPI=7
+HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
+IUSE=24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel +perl startup-notification unicode3 +utmp +wtmp xft
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.7-r6:= media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender x11-libs/libXt gdk-pixbuf? ( x11-libs/gdk-pixbuf ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft )
+SLOT=0
+SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.26.tar.bz2 https://dev.gentoo.org/~marecki/dists/rxvt-unicode/rxvt-unicode-9.26_24-bit-color_aur-20210516+eautoreconf.patch.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=69f49857c4adc7b8c1fafb122edb94a6
diff --git a/metadata/md5-cache/x11-terms/st-0.8.4 b/metadata/md5-cache/x11-terms/st-0.8.4
index 32b9712a8b9e..cabad8bb8512 100644
--- a/metadata/md5-cache/x11-terms/st-0.8.4
+++ b/metadata/md5-cache/x11-terms/st-0.8.4
@@ -4,10 +4,10 @@ DESCRIPTION=simple terminal implementation for X
 EAPI=7
 HOMEPAGE=https://st.suckless.org/
 IUSE=savedconfig savedconfig
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 x86
 LICENSE=MIT-with-advertising
 RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://dl.suckless.org/st/st-0.8.4.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0e5e0adcdf99c892cb04f4087632d825
+_md5_=9e411094c7a38090a6665a63d136bc6f
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index d0419dc79f75..2b8ede365c84 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20210401 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20210401
deleted file mode 100644
index 6b50a3be072d..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20210401
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Free and open source SVG icon theme
-EAPI=7
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20210401.tar.gz -> papirus-icon-theme-20210401.tar.gz
-_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3d8b0317eec7f8b6b9798dbb32cdd52b
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20210701 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20210701
new file mode 100644
index 000000000000..54ef4fd7f218
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20210701
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free and open source SVG icon theme
+EAPI=7
+HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20210701.tar.gz -> papirus-icon-theme-20210701.tar.gz
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=41a1da4d87eaec5c558d37dbb21f99b3
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 27a8cfca5b4d..35d71caca44c 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/awesome-4.3-r101 b/metadata/md5-cache/x11-wm/awesome-4.3-r101
index bd96fefbf573..1e0f071cc875 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.3-r101
+++ b/metadata/md5-cache/x11-wm/awesome-4.3-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b218af7fd0b341d93ce2878699d16894
diff --git a/metadata/md5-cache/x11-wm/awesome-9999 b/metadata/md5-cache/x11-wm/awesome-9999
index 6e1cdf4a4af4..252f7e1f4189 100644
--- a/metadata/md5-cache/x11-wm/awesome-9999
+++ b/metadata/md5-cache/x11-wm/awesome-9999
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	74cd9920d64148719fb62c462935c1b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	lua-utils	a2950af9f524361296ff10564515822c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b88f4902eddb626b8585be2ec95c6d72
diff --git a/metadata/md5-cache/x11-wm/dwm-6.2 b/metadata/md5-cache/x11-wm/dwm-6.2
index b5371b9b2d5d..be37c1060e38 100644
--- a/metadata/md5-cache/x11-wm/dwm-6.2
+++ b/metadata/md5-cache/x11-wm/dwm-6.2
@@ -4,10 +4,10 @@ DESCRIPTION=a dynamic window manager for X11
 EAPI=7
 HOMEPAGE=https://dwm.suckless.org/
 IUSE=xinerama savedconfig
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://dl.suckless.org/dwm/dwm-6.2.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9e2a30253b84b8034d2b1658cd8bb59b
+_md5_=dfdebe4ac1b02bd2be9b557f5c23aa67
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3 b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
index 0768cecd897c..baca55fa10d3 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.3.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=657c6b3a8c580331de90442b2c0a2764
+_md5_=9bb475d8a0d7dddb64ed5c418a11ab49
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-9999 b/metadata/md5-cache/x11-wm/herbstluftwm-9999
index 04e0433ac936..41c6819d0c4d 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-9999
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7aaa31cdf80211b5fdceb02c952882d2
+_md5_=7bdfd7adc559cbae84421625cdde1459
diff --git a/metadata/md5-cache/x11-wm/icewm-2.3.4 b/metadata/md5-cache/x11-wm/icewm-2.3.4
deleted file mode 100644
index c59beece4c1e..000000000000
--- a/metadata/md5-cache/x11-wm/icewm-2.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/asciidoc virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare pretend unpack
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender dev-libs/glib:2 x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) !gdk-pixbuf? ( imlib? ( gnome-base/librsvg:2 media-libs/imlib2 ) !imlib? ( media-libs/libpng:0= virtual/jpeg ) ) xinerama? ( x11-libs/libXinerama ) || ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) x11-base/xorg-proto gdk-pixbuf? ( gnome-base/librsvg:2 )
-DESCRIPTION=Ice Window Manager with Themes
-EAPI=7
-HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
-IUSE=+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama
-KEYWORDS=amd64 ppc ~ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender dev-libs/glib:2 x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) !gdk-pixbuf? ( imlib? ( gnome-base/librsvg:2 media-libs/imlib2 ) !imlib? ( media-libs/libpng:0= virtual/jpeg ) ) xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=|| ( alsa ao )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ice-wm/icewm/releases/download/2.3.4/icewm-2.3.4.tar.lz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=4ac06f1d07e8b8dfc66075ed2f059d77
diff --git a/metadata/md5-cache/x11-wm/mutter-40.3 b/metadata/md5-cache/x11-wm/mutter-40.3
new file mode 100644
index 000000000000..ea089c08817e
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/mutter-40.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/wayland dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 || ( x11-libs/libxcvt <x11-base/xorg-server-1.20.11-r3[xorg,-minimal] ) ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.67.3:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.15.0 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME compositing window manager based on Clutter
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
+IUSE=elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.67.3:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.15.0 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
+REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=mirror://gnome/sources/mutter/40/mutter-40.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a09dbdb7179c208bb9c9d383fff57354
diff --git a/metadata/md5-cache/x11-wm/xmonad-0.15 b/metadata/md5-cache/x11-wm/xmonad-0.15
index 239825ea9c53..bc95a22c9527 100644
--- a/metadata/md5-cache/x11-wm/xmonad-0.15
+++ b/metadata/md5-cache/x11-wm/xmonad-0.15
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/data-default:=[profile?] dev-haskell/extensible-exceptions:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15
 SRC_URI=https://hackage.haskell.org/package/xmonad-0.15/xmonad-0.15.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6fc8c2c92ee8804f2052153b8ad31a2c
diff --git a/metadata/md5-cache/x11-wm/xmonad-contrib-0.16 b/metadata/md5-cache/x11-wm/xmonad-contrib-0.16
index ea200732a600..305772d6feaf 100644
--- a/metadata/md5-cache/x11-wm/xmonad-contrib-0.16
+++ b/metadata/md5-cache/x11-wm/xmonad-contrib-0.16
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?] >=dev-lang/ghc-8.0.1:= >=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
 SLOT=0/0.16
 SRC_URI=https://hackage.haskell.org/package/xmonad-contrib-0.16/xmonad-contrib-0.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	4b1080271e43b6d7693aa7052f970626	haskell-cabal	d4945ecec5436543b0dfacf1a2a7b065	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8c21bc5d1e74bc834c79eed11cb8f0d8
diff --git a/metadata/md5-cache/x11-wm/xpra-4.2.1 b/metadata/md5-cache/x11-wm/xpra-4.2.1
new file mode 100644
index 000000000000..81d2aab5bad9
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/xpra-4.2.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig python_single_target_python3_8? ( >=dev-python/cython-0.16[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cython-0.16[python_targets_python3_9(-)] ) doc? ( app-text/pandoc ) 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] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
+EAPI=7
+HOMEPAGE=https://xpra.org/
+IUSE=brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dev-python/pillow[jpeg?,python_targets_python3_8(-)] cups? ( dev-python/pycups[python_targets_python3_8(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_8(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_8(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] media-libs/opencv[python_targets_python3_8(-),python] ) ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dev-python/pillow[jpeg?,python_targets_python3_9(-)] cups? ( dev-python/pycups[python_targets_python3_9(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_9(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_9(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] media-libs/opencv[python_targets_python3_9(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) 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] ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( client server ) cups? ( dbus ) opengl? ( client ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://xpra.org/src/xpra-4.2.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=35d2d1e753606cc78ea86e9ea74c4a62
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 7f968b1ff1af..60491ecbde17 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.2-r1 b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.2-r1
deleted file mode 100644
index aa971e49b16f..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) ) dev-lang/perl dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.16/xfce4-panel-4.16.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f237d8aed9b60617ba4efa8dd52999ab
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.3 b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.3
index cc362c00644c..4f3fcc507c40 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.3
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.3
@@ -5,11 +5,11 @@ DESCRIPTION=Panel for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.16/xfce4-panel-4.16.3.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9f14f4302490bd25b3782b4a6071d3d6
+_md5_=b7e1093a9fbacc69d070c93ba9057404
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.16.0 b/metadata/md5-cache/xfce-base/xfconf-4.16.0
index cf8effe78067..c75f68b07fd3 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.16.0
+++ b/metadata/md5-cache/xfce-base/xfconf-4.16.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.50 sys-apps/dbus >=xfce-base/libxfce4util-4.14:= intro
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.16/xfconf-4.16.0.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c846c00e210ae6bf152796d45fdcb716
diff --git a/metadata/news/2021-07-15-opentmpfiles-deprecation/2021-07-15-opentmpfiles-deprecation.en.txt b/metadata/news/2021-07-15-opentmpfiles-deprecation/2021-07-15-opentmpfiles-deprecation.en.txt
new file mode 100644
index 000000000000..9f952d4a0208
--- /dev/null
+++ b/metadata/news/2021-07-15-opentmpfiles-deprecation/2021-07-15-opentmpfiles-deprecation.en.txt
@@ -0,0 +1,69 @@
+Title: systemd-tmpfiles replaces deprecated opentmpfiles
+Author: Georgy Yakovlev <gyakovlev@gentoo.org>
+Author: Sam James <sam@gentoo.org>
+Posted: 2021-07-15
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: sys-apps/opentmpfiles
+Display-If-Installed: sys-apps/systemd-tmpfiles
+
+A tmpfiles [0] implementation provides a generic mechanism to define
+the creation of regular files, directories, pipes, and device nodes,
+adjustments to their access mode, ownership, attributes, quota
+assignments, and contents, and finally their time-based removal.
+It is commonly used for volatile and temporary files and directories
+such as those located under /run/, /tmp/, /var/tmp/, the API file
+systems such as /sys/ or /proc/, as well as some other directories
+below /var/. [1]
+
+On 2021-07-06, the sys-apps/opentmpfiles package was initially masked
+due to a root privilege escalation vulnerability (CVE-2017-18925 [2],
+bug #751415 [3], issue 4 [4] upstream).
+
+The severity of this vulnerability is disputed due to the practical
+obstacles to its exploitation in any default or supported configuration.
+
+That said, the use of opentmpfiles is discouraged by its maintainer due
+to the unpatched vulnerability and other long-standing bugs [5]. It has
+now been declared obsolete in favour of systemd-tmpfiles by opentmpfiles
+upstream.
+
+Users will start seeing their package manager trying to replace
+sys-apps/opentmpfiles with sys-apps/systemd-tmpfiles because it is
+another provider of virtual/tmpfiles.
+
+Despite the name, 'systemd-tmpfiles' does not depend on systemd, does
+not use dbus, and is just a drop-in replacement for opentmpfiles. It is
+a small binary built from systemd source code, but works separately,
+similarly to eudev or elogind. It is known to work on both glibc and
+musl systems.
+
+Note that systemd-tmpfiles is specifically for non-systemd systems. It
+is intended to be used on an OpenRC system.
+
+If you wish to selectively test systemd-tmpfiles, follow those steps:
+
+ 1. # emerge --oneshot sys-apps/systemd-tmpfiles
+ 2. # reboot
+ 3. # rm /etc/runlevels/boot/opentmpfiles-setup
+ 4. # rm /etc/runlevels/sysinit/opentmpfiles-dev
+
+No other steps required.
+
+If you still wish to use opentmpfiles for the time being, you can unmask [6]
+opentmpfiles:
+ 1. In /etc/portage/package.unmask, add a line:
+ -sys-apps/opentmpfiles-
+ 2. # emerge --oneshot sys-apps/opentmpfiles
+
+Note that opentmpfiles is likely to be removed from gentoo repository
+in the future. You may wish to put it in a local overlay instead [7].
+
+[0] https://www.freedesktop.org/software/systemd/man/systemd-tmpfiles.html
+[1] https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html
+[2] https://nvd.nist.gov/vuln/detail/CVE-2017-18925
+[3] https://bugs.gentoo.org/751415
+[4] https://github.com/OpenRC/opentmpfiles/issues/4
+[5] https://bugs.gentoo.org/741216
+[6] https://wiki.gentoo.org/wiki/Knowledge_Base:Unmasking_a_package
+[7] https://wiki.gentoo.org/wiki/Custom_ebuild_repository#Creating_a_local_repository
diff --git a/metadata/news/2021-07-16-pulseeffects-easyeffects/2021-07-16-pulseeffects-easyeffects.en.txt b/metadata/news/2021-07-16-pulseeffects-easyeffects/2021-07-16-pulseeffects-easyeffects.en.txt
new file mode 100644
index 000000000000..afefdc6e0144
--- /dev/null
+++ b/metadata/news/2021-07-16-pulseeffects-easyeffects/2021-07-16-pulseeffects-easyeffects.en.txt
@@ -0,0 +1,33 @@
+Title: PulseEffects-5+ are now media-sound/easyeffects
+Author: Marek Szuba <marecki@gentoo.org>
+Posted: 2021-07-16
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: media-sound/pulseeffects
+
+Since version 5.0.0, media-sound/pulseeffects have explicitly required
+media-video/pipewire rather than just a PulseAudio client (i.e. either
+PipeWire or plain media-sound/pulseaudio). Following up on this change,
+upstream has decided to rename the project to EasyEffects starting with
+version 6.0.0.
+
+Gentoo will follow the upstream renaming but in a slightly different
+fashion:
+ - versions older than 5.0.0, i.e. ones not depending on
+   media-video/pipewire, will continue to use the name
+   media-sound/pulseeffects;
+ - versions: 5.0.0 and newer, i.e. all requiring media-video/pipewire,
+   will be available as media-sound/easyeffects.
+
+media-sound/easyeffects is already available in the tree, and the
+remaining PipeWire-dependent versions of media-sound/pulseeffects will
+be removed on 2021-07-23. Therefore, PipeWire users of
+media-sound/pulseeffects should switch to media-sound/easyeffects by
+deselecting the old package and installing the new one, e.g.
+
+emerge --deselect media-sound/pulseeffects
+emerge media-sound/easyeffects
+
+No action is required of media-sound/pulseeffects users who either use
+PulseAudio exclusively or wish to retain the ability to use this
+package with both PulseAudio and PipeWire.
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 15ded97a92dd..e97dcc6f525c 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 12569 BLAKE2B 264c5f7a58edeb190a94a6d82fb0381f81e083c47429444470eadad9c04d4e0038c4307a12aae15116285d6a4d2b7804c988b894effcc9333bbd6dd384886dfa SHA512 fa50fc0872c4f137cbcd2d43a301a63e1dfcfd89cba13d72eeb2d48513c8460e66d2b77a6743baef13946d882ab70aed120cdf8755d1cd8eff76fc0e780ab977
-TIMESTAMP 2021-07-12T07:09:00Z
+MANIFEST Manifest.files.gz 12937 BLAKE2B b67d6f5f22884e63e4c0f83264d7e6d68fc0526ff33c69a3576e0e5e9c8efccb1907d22d356ee4a397aa70ba9113cb0088e5398317a03fa33db8ae72b561b19e SHA512 5c063a98b2f883695d6c90f6ac28151f0416e3f5c5e1b57359c01ada17f290c7119a2d0d7ca51484bfbc33ddaa124c9524490aa328265bca01129ccefee350c4
+TIMESTAMP 2021-07-17T17:39:10Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDr6oxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmDzFb5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBLbA//Y42m4HapgaJsN6tyAoNlVqzId8JuD56gOzRyqAaOLtPCAOs+B1DWu+M+
-vDoBv2STypz8o7e7FfTse1kLOhgUZaNzlU6/UjWlP5I1REKakAFEPl5zDFHzIwje
-5oUFgpe0MJW3bt+MUDH8M3C/YOTNHRXeT8Pq5EfUH+4wbImIcKWBml44+KGfChMd
-ZmiSZjv/rlqBSIXd+MRg8Bb6C74iYKGpv7z3Z8yS4cWNyVLUwpogSfi8WmoCWvBw
-l/a2Nd327g0Se200LC3vBf4JsKbxNjsmlsLDahyHpt/ou+IBxCs59Q466Fj+kMbJ
-3fmmjqTYecBs1IWP2Paq1JANElFnF3B5+/WHO5OHsElDDNV25YMg24qq0Z4Zvj5T
-aXsnCPBt7uhxHGWHy8OCf65c3oYMtnVzJhY+Kldr/LG3DJqrvGqQVerCcNaPY/ME
-2g5H+MAyOfzvqDOiigkrTfvMepbumuYM26zxoBEsSjdISDfLS0wARhr6aM3WHa7m
-W98T34pLxzFyQ4s4O+dtOvhDVIjoY8DcWFHak9mEeLDRjI/GkfsENMti5pDc2NaZ
-4UIPCLz16FOzGLypIvy+KpeHFyPEa+IoW+tdbtn6dcTIrVdjStQl6XfanocuoBP5
-UxFvrjSVJm2vf4QSnaVN2fLNGHVvuHcKzUllbhHFAC6ODGL8MvY=
-=HV2F
+klC7ZA//ezSl74d4/ms/vvGMp4ym4VZpKRtl3Kqr9s15yuOuLKuZYQocIThhu0+f
+TuVUqBPkmJrSihBmIBx1WfqR12s5LGeogq79qQZBDK//ZYNI+AtuyshlqKq7+HZU
+Ab3LIBYSsuVPZsh0wjZOK5Kw9N7g9yixAHQHh7A6EXQPzEhFb5XtlROv3YSqnTGN
+NP6fZ6gxqbJrFTezdH5NIcko4ti3xANAAbwFny6kH32y4WIUnhB6osXNsHlZvrMQ
+X5LURrooybuPd8eUkCOuWTo1IQJs/f172nnCog1mKtuxI+A0nxvetmjZ9Q7S6IQL
+kIggHkNYq5jQFxhSPTv2vBDhbP29PkBFi166wniDIKtHbHmrFH3QqQExOad4Kz7+
+8b8zX5+G/ZJG+2GAwFPIkM88ygahQgqv5e1uGErAWpjtjEpzV5EDR8iRQW1YiQgw
+PTNuBBMipwFFeodwQElOho0Zp72SnHidKJnlBo9esrtb/CwPZj5in9rdLl42V6Cc
+fNQgH/90hkH6MxTksHOYK/MwSCpL5DBNKCmayFJPeLgSMOToP7oy6hmgiqVymlDm
+Eh98yb2K+ZHVl2dCZo5jQdbt1LpdGRVFXGp1Jvzx2zVRYg0pL60lXR20MUzl+Und
+orafHtvj5Ces6ZPM9phh6k1M50FqUj/GCIyQrqrGraiUMKn6oAk=
+=atCV
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 3ca366be0fa1..06b2346a272b 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 80697622a60d..598a38ee3e84 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 12 Jul 2021 07:08:55 +0000
+Sat, 17 Jul 2021 17:39:07 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 64c32b404f09..0e28f3af939d 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-a93dbc1701de3b983c6f791391f7967d4b919b4a 1625833988 2021-07-09T12:33:08+00:00
+39030e75ff64153246c72edd13c30e5295b8a0ff 1626435584 2021-07-16T11:39:44+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 2fa53d0d36d7..7790cafe8170 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -2552,6 +2552,10 @@
       <name>Michał Górny</name>
       <role>Deputy Lead</role>
     </member>
+    <member>
+      <email>sam@gentoo.org</email>
+      <name>Sam James</name>
+    </member>
     <member is-lead="1">
       <email>soap@gentoo.org</email>
       <name>David Seifert</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index fd0c9fb72653..a6dbe2309a84 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jul 12 07:08:55 AM UTC 2021
+Sat Jul 17 05:39:07 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 03beb21a1c80..8e449a55ecfa 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 12 Jul 2021 07:15:01 +0000
+Sat, 17 Jul 2021 17:45:02 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b8d5c9b31e2e..f592de6cc4d2 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-306af4461c0564ab68dbac9f5f88c4800cc32635 1626073482 2021-07-12T07:04:42+00:00
+50621430eec12294296e278150b450391cea1278 1626543065 2021-07-17T17:31:05+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8bf5d00d3ad4..7395fd20a713 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1626073501 Mon 12 Jul 2021 07:05:01 AM UTC
+1626543301 Sat 17 Jul 2021 05:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 80697622a60d..598a38ee3e84 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 12 Jul 2021 07:08:55 +0000
+Sat, 17 Jul 2021 17:39:07 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f8b4fa046cb4..f98129d66ca2 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest
index 27c3013b575d..f3e0effcbd06 100644
--- a/net-analyzer/arp-scan/Manifest
+++ b/net-analyzer/arp-scan/Manifest
@@ -1,4 +1,4 @@
 DIST arp-scan-1.9.7.tar.gz 459544 BLAKE2B bd70b2dd9e005096ce80fca07b8f2d8482b1073d25a2a9f82e8f5c1206148dbeab095046292cb46b5823aa18b56c208a5e86d0b7252d8566ddee5cd714b78cc6 SHA512 2aa808521a64cd3e2a6a270c6725f2cffa4cfce5c251e5483053c8ea9f56fb1368dd9aae2afcf8fffe1030fe2fc37723f0701c9eafa7cd1d52df459c07a80870
-EBUILD arp-scan-1.9.7.ebuild 472 BLAKE2B 9e1d1d684de88508e55728e88bbe1983baca6b270553657766df91e6a33ee3d833fb3f3c371d9f706105f207e4412eb7ab9a9c87a1db78cf8d480198ea861625 SHA512 71dff6ec3626642fc15632a2f1e76f50eeb4d0e3ef2503ceb541dcfe4455001040fd601ba3d87240894aac982037a9e27a1e8a4c2de6045e521504ef92faa194
+EBUILD arp-scan-1.9.7.ebuild 479 BLAKE2B fad6f12f076725b94ff61b9c215c5e326d70c41363326066b686659546b6975ad27adb670dd2dc0722bf58b0ea9a20285b6ee66a4119f0fdaf15d1807eb63959 SHA512 7b638d6ceccee9688888eda60f5da27f329444dfdd37499dcd322530dec625fb63722ce4baa0c5d54b06c3658bb74d113ddc2e4b45c0b4408d3624649a65e107
 EBUILD arp-scan-99999.ebuild 437 BLAKE2B 7a306bfc3b31f3da8e1d5974fc50f90e32f3f01d766cbcc7f9b9408347a37a771da8f83df3a8fd0dcffe5ab80528927e5876f584e08361644a282e445c4f7bfe SHA512 eb8d8ac754ec26d4c122586596a649afee8f9de1a701ee36d24838a37dd3f6256a5820c818c8fdcda171eeacc29dbda8e03778b92a300c6b1ee31c7820e467b0
 MISC metadata.xml 362 BLAKE2B 3f812777c8a9dff2088b34b8aee211726af3c08ae94980169a99596cff8cce2f5c3b876a4f059a8b29868d4d7879d8b33237d4544a157611d24b5d428eda02ec SHA512 abdb943e2a29ad44cad2b8bfb4c5479c0d7ba2bf4c7142dac9c156eeafa6e0f779a72a7db253539299f697c3c1c939420ddf1798e696c364ff58c1854d0d463b
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
index 2278aa10e0d5..699942037b59 100644
--- a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
+++ b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64 ~riscv"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/arp-sk/Manifest b/net-analyzer/arp-sk/Manifest
index 59d9b07d63e1..c49a037743cb 100644
--- a/net-analyzer/arp-sk/Manifest
+++ b/net-analyzer/arp-sk/Manifest
@@ -1,4 +1,4 @@
 AUX arp-sk-0.0.16-libnet1_2.patch 1362 BLAKE2B eb3f8387f9d43d957e6a2a111bce2ea336d705d74761f22d4d4adf92f00c00b4f81de66112b4134540aa86847874c8abca19af4bc62fc75635f149d62effa336 SHA512 04cd17513d19f0e70b54840148fb8d603c06385e601f352cfadc381de5109b547e204414830fa195cfac56e662ffdfb234f54b8fec9ab68316cfdd4220bdb922
 DIST arp-sk-0.0.16.tgz 211636 BLAKE2B 9ba786829061161c0c38950a7c374968126d4cfb269b10b67b5a1dce2a7cb1016833a4a2adc9fef0f8fb61dbbdc8d959a7cf63379e69bff3fc4dc9a9201348af SHA512 d827ab5c701e1e3a6444dbe7e1e7c0a73ee2bfb2339a55fc7d3591ee8e9e9aadef4dfd4aaf331251fbe22d83c9b1135068e5afa6303eae934b3fd149ca0819a6
-EBUILD arp-sk-0.0.16-r2.ebuild 760 BLAKE2B 9cc5f1a59cc69023bc4554e42bd4fe3ab0f784b4480663b305f28bf11291b507ade7aeb4a0ad9867656df6c00f35895b94e64003e948b847b2c16d4b84c59587 SHA512 140170f9044b36764c87ceed5db474335bf2489dca4f6b299f5b76aada3c0550961b8e1946de9e3c59bce9503abefadba1e75c01e0c6b64ff8c33712c1bc6091
+EBUILD arp-sk-0.0.16-r2.ebuild 767 BLAKE2B 0f46b731f5c075665a90f047fb4844075ddc71e4bd5190ef10213d9a724503785fd425c96873fb4ab851222d64fe67d31829c56355a335887b4f21831c5e03a3 SHA512 b8feda546f715dfbb97234b049f1d8d1c8676d431c572e9e6b7211b4d4748bafcbaf76f07c4352f232fd1d8e0410c3f3ce4dde341f91f40cde0621317d71bd1a
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
index dd4c76e5f827..e18045a7f774 100644
--- a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
+++ b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sid.rstack.org/arp-sk/files/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 
 DEPEND=">=net-libs/libnet-1.1"
 RDEPEND="${DEPEND}"
diff --git a/net-analyzer/arpoison/Manifest b/net-analyzer/arpoison/Manifest
index e1f520078481..944b871e1689 100644
--- a/net-analyzer/arpoison/Manifest
+++ b/net-analyzer/arpoison/Manifest
@@ -1,3 +1,3 @@
 DIST arpoison-0.7.tar.gz 8458 BLAKE2B b0050aa6f3246fec9fb4db8bbb3f9f5f1d52b5b6c37851f0c6bec8b6c89fabd7f1811ae40a4c81af6eae16761f38fb749d0f2a58311645ef360d798b6ccbbb50 SHA512 d5af078c8e2c64eb721da75b5d6659ca017267f146d0dca7e0f1ba77bfd93a0f56363428c198e9c46537768d3568d813c150bfbc091430fc355a269f9327108f
-EBUILD arpoison-0.7.ebuild 682 BLAKE2B 07b902eab99e1eb73d41c4c6b969b590ca546af9a67cdaf207cd0fb8cb9afa270ff438e1abc6c59c02412029a21528bf6e00295beb4bca7f545fd1ba84d3e63f SHA512 43f2e47ddbce39799b11f4bf45027f3f3eb8abaa3554719b9b3510fba45ecdc8d4f2448f942581f020cfc22b72042958d2984a653ce5aa6f11fef4db21cd51d0
+EBUILD arpoison-0.7.ebuild 689 BLAKE2B 06b8e83b18b207b64463c8e880a4fdb2e794167a006e806695a471e9368e95e59aa2119ee47eef2573b4ac315f1b80eb47a4b2cc6e782c425be206081f4209da SHA512 2acb0792c5ec6a251acff5fd58ef4ed06410fc44fe4f68c30786eb41cfaf184ce8950804ad3f1a18d8960c95657d93ff476a430793038eec07cd00f02c366b7c
 MISC metadata.xml 358 BLAKE2B 8ef81a7500bfd11eb443af7fdbe30ce89f91875ddd9434367e7eafb73604d13e6702fd34c88bb863bceeeb95822cff1354313d2146117c1ef32166527bd82716 SHA512 9a11704d5314e9ab1a061a179e757146b29c52334511578fe958455d417652c0ab523a58a17580ea6892e528d44b06aa8510293664d78ed01f35e32ef1d7bc18
diff --git a/net-analyzer/arpoison/arpoison-0.7.ebuild b/net-analyzer/arpoison/arpoison-0.7.ebuild
index 811f1ecb2690..edd9d089302e 100644
--- a/net-analyzer/arpoison/arpoison-0.7.ebuild
+++ b/net-analyzer/arpoison/arpoison-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ppc ~riscv x86"
 
 RDEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/arptools/Manifest b/net-analyzer/arptools/Manifest
index 2d3a5bbaf657..74512b2bcfb7 100644
--- a/net-analyzer/arptools/Manifest
+++ b/net-analyzer/arptools/Manifest
@@ -1,3 +1,3 @@
 DIST arptools-1.0.2.tar.gz 87475 BLAKE2B 1bbfa8082db28abaa78a3f9f363ed255909e6c6dc2a9fabc1668f66228977b9ecc5b70d4cf3514affb324daf31b906b40b1ec7d88ecc9568504362789ece42fb SHA512 c976a5a7778a9330ebda6ed69ef045ede3747b98d27a7e575f985646a52bf57e4a6584da280a0a13520a43b5d765b2ddbec2239d7c3ac865ffdf1ae23f5ff347
-EBUILD arptools-1.0.2.ebuild 453 BLAKE2B 773d31baa61523dde742c83e4953a6109cf6596b48d25858b888429bb833d8090bfdf64759dc6d2131ebd62d36424eab2f6e5eb8e27c96caccdc226921d4f74c SHA512 86332d662a4cd15b1b297ccce0c82a32866c291e77253ce78046c8f660bb83c159c766700e41ee74abce583f0eaaf5e390defe959006a87aef24a40cb07a9b4c
+EBUILD arptools-1.0.2.ebuild 460 BLAKE2B d4d61cd148e6164e35bf8d4eeaa0e575934999be543900742cd1354808748302a8375f5c6db9430b0be5b34d4e4ceeea0e998cd3057a585fdc47e87b9949ef9c SHA512 c38c1f7c814d3b8f77244a04601ee679f721b96b1185401aba30513bceee63706c5d483e4e2ba893ec3ed8a4e4fbb218a6b56ce0fbf8d60b1b48a3a1896f4015
 MISC metadata.xml 355 BLAKE2B 6a7a59a25152c35d3e60e6bf42556371caffd13ce3d559a8f5d9117dd9cb45c7b25bca6dbe527f6ad63cccc9bc0eb10e096a5a3bd0dbfefdf94fdd73958e1ef9 SHA512 bc5735d7a66320f39e87c77951652a28e4100b4236cf37ebeed12e62966b1a211f8af0cc78774c537e485488108ee5fb2bada682d4e5da91cfba36483986d1ca
diff --git a/net-analyzer/arptools/arptools-1.0.2.ebuild b/net-analyzer/arptools/arptools-1.0.2.ebuild
index 44c7fa89a834..09eeb07231da 100644
--- a/net-analyzer/arptools/arptools-1.0.2.ebuild
+++ b/net-analyzer/arptools/arptools-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://www.burghardt.pl/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index ffe75b5e2597..048a909aa046 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -4,5 +4,5 @@ AUX arpwatch.initd-r2 828 BLAKE2B fc9836855074520ab6e8e4d7412f9094677fe25dba61bb
 AUX arpwatch.service 362 BLAKE2B 45e527e7b5261a8009acdca0665077422235d5b21ebbb6818d878e21e4869fdf69317306bc4ef02617b8989a38f50a9467d69d904ada80fde1be61f77b806e2c SHA512 06424dea166eac23d4686fb96b1f14bdd46965bf400028f870ea2260e7d54a54663987c62e34e93730e6dea42e0e662578268252b31f29c26c0975bb4cb6873f
 DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282
 DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
-EBUILD arpwatch-3.1-r3.ebuild 2104 BLAKE2B 18cd2eaf7aa8294e6dc9076af175c40cbcff034faf9f68ddbd54c027098114fa4bb2ece01577f4d6d1284f3ed048ff1ee65fd09aea525483174eebac6ce4e68e SHA512 3f1e239705dce0adc0f7c6c453fcf0785f7718513ea1601816a5406f374a8550a97e0ba649486deef145f7146df15692c789c36685ca379c8d36faf7193f5aa8
+EBUILD arpwatch-3.1-r4.ebuild 1907 BLAKE2B 01289c40c54d5256b4a0126ed6a47f1867b3e3c09eaae502cb99f380db186df6cab0afb62506ff57730c7e8a4f85e8f8256ef03be5f4d6cdd87d41c865898d77 SHA512 a98018fed7d74aa617991db685a16894a2d3c2c06458bf39a3368a745ba651ee18c9e31a74a64ed0e9a8c788bb0c6ef860680b14d452fa4218950e7b92451b58
 MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00
diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r3.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r3.ebuild
deleted file mode 100644
index 708a82a43c69..000000000000
--- a/net-analyzer/arpwatch/arpwatch-3.1-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
-HOMEPAGE="https://ee.lbl.gov/"
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-ETHERCODES_DATE=20200628
-SRC_URI="
-	https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
-"
-
-KEYWORDS="amd64 ~hppa ppc sparc x86"
-IUSE="selinux"
-
-DEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:=
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-arpwatch )
-	virtual/mta
-"
-
-pkg_setup() {
-	# We need to create /var/lib/arpwatch with this group, so it must
-	# exist during src_install.
-	enewgroup arpwatch
-}
-
-pkg_postinst() {
-	# The user, however, is not needed until runtime.
-	enewuser arpwatch -1 -1 -1 arpwatch
-}
-
-src_install() {
-	dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh
-	doman arpsnmp.8 arpwatch.8
-
-	insinto /usr/share/arpwatch
-	newins "${WORKDIR}"/ethercodes.dat-${ETHERCODES_DATE} ethercodes.dat
-
-	insinto /usr/share/arpwatch/awk
-	doins d.awk duplicates.awk e.awk euppertolower.awk p.awk
-
-	diropts --group=arpwatch --mode=770
-	keepdir /var/lib/arpwatch
-	dodoc README CHANGES
-
-	newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch
-	newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch
-
-	systemd_dounit "${FILESDIR}/arpwatch.service"
-	systemd_install_serviced "${FILESDIR}/arpwatch.conf"
-}
-
-pkg_postinst() {
-	# Previous revisions installed /var/lib/arpwatch with the wrong
-	# ownership. Instead of the intended arpwatch:root, it was left as
-	# root:root. If we find any such mis-owned directories, we fix them,
-	# and then set the permission bits how we want them in *this*
-	# revision.
-	#
-	# The "--from" flag ensures that we only fix directories that need
-	# fixing, and the "&& chmod" ensures that we only adjust the
-	# permissions if the owner also needed fixing.
-	chown \
-		--from=root:root \
-		--no-dereference \
-		:arpwatch \
-		"${ROOT}"/var/lib/arpwatch && \
-		chmod 770 "${ROOT}"/var/lib/arpwatch
-}
diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild
new file mode 100644
index 000000000000..da747fae6e86
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
+HOMEPAGE="https://ee.lbl.gov/"
+LICENSE="BSD GPL-2"
+SLOT="0"
+
+ETHERCODES_DATE=20200628
+SRC_URI="
+	https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
+"
+
+KEYWORDS="amd64 ~hppa ppc ~riscv sparc x86"
+IUSE="selinux"
+
+DEPEND="
+	acct-group/arpwatch
+	net-libs/libpcap
+	sys-libs/ncurses:=
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-user/arpwatch
+	selinux? ( sec-policy/selinux-arpwatch )
+	virtual/mta
+"
+
+src_install() {
+	dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh
+	doman arpsnmp.8 arpwatch.8
+
+	insinto /usr/share/arpwatch
+	newins "${WORKDIR}"/ethercodes.dat-${ETHERCODES_DATE} ethercodes.dat
+
+	insinto /usr/share/arpwatch/awk
+	doins d.awk duplicates.awk e.awk euppertolower.awk p.awk
+
+	diropts --group=arpwatch --mode=770
+	keepdir /var/lib/arpwatch
+	dodoc README CHANGES
+
+	newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch
+	newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch
+
+	systemd_dounit "${FILESDIR}/arpwatch.service"
+	systemd_install_serviced "${FILESDIR}/arpwatch.conf"
+}
+
+pkg_postinst() {
+	# Previous revisions installed /var/lib/arpwatch with the wrong
+	# ownership. Instead of the intended arpwatch:root, it was left as
+	# root:root. If we find any such mis-owned directories, we fix them,
+	# and then set the permission bits how we want them in *this*
+	# revision.
+	#
+	# The "--from" flag ensures that we only fix directories that need
+	# fixing, and the "&& chmod" ensures that we only adjust the
+	# permissions if the owner also needed fixing.
+	chown \
+		--from=root:root \
+		--no-dereference \
+		:arpwatch \
+		"${ROOT}"/var/lib/arpwatch && \
+		chmod 770 "${ROOT}"/var/lib/arpwatch
+}
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index 22f60973c8bc..c0f45a49aa5d 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1,5 +1,5 @@
 AUX bmon-3.6-docdir-examples.patch 235 BLAKE2B f187f4bbc8b7e4de5e9bb1f289ef201ed17e6a64e0062ad370f5dcce1160da1774590aa824f2adf9b73c058b95ac2428e24bf8c5e78a1c16b45f4f1f33a889ca SHA512 2b74637c6dacfa03e680774787d8287ae084ba426a3e0e178b74f1468179916509ee5de2e0c93f7abe04356d0146ad6dd8e191d9a66718ec8eaf50cb6126afc8
 DIST bmon-4.0.tar.gz 61843 BLAKE2B d376cc6ca9f64c71cd7f8aa281e36e0f8717939c2ada3d9ed6d1231e1f6bc489146fa5f88a327abd6bc63803d2ed21eafff2888427bfd11d51156380ed6d6d1c SHA512 2a5b527a78cc1084c3b96d8d621b002ee86d377776d7e25f711dc2869e59bcd6277cc5f103549fe0b635b1368228a66941d5069fd1240cff678b308d7e17218d
-EBUILD bmon-4.0.ebuild 929 BLAKE2B 61446651eb9067c74cad0600a06f89dc18ed8af70575f0fe6a499581f2667a3cb77aaadfc1d0a032901e282d85085f6b9eb28923b20a370a93f3803ee0412bb3 SHA512 710bb706b73528474c23b200a6edf6f66c9dd8d023ee3d41e4d99de1eaf755e60830b7676ba833a84a227d303f908be7e2208180a7ec537a84d120695d679088
+EBUILD bmon-4.0.ebuild 936 BLAKE2B dd032963664c08effde8d1c436818acb81072405e908d9edf72afa5ade6a1423cff70ab91288261c8ab9afd51bc02bb37269c6f95be64d4b17f2ea59bc60b10c SHA512 a0eb82a484b50b1c28ec9951dfcb751e4ca608d0668c98d30fa21c56a3374f139ba015ed7eaf342777f391f6dbf488c0470ab9007824d8698065d95942c1fd49
 EBUILD bmon-999.ebuild 853 BLAKE2B 4deb4540fd1df9306c8f80aa1d6e03565294465ad8764bc22d2c2ef27679da665b11b472f86462aa27df2889dea88789ce4f98737d7d81fd20664ee18001c590 SHA512 75cffd2603d9ea72ffdffd9bf0ba6f40eb6d275804cc45f228be44897b89aff2edb07997b931446302276c1723bc8009e50dde1e9713fd7a4f41d5d97d1a8a9c
 MISC metadata.xml 355 BLAKE2B 7d9ea44a97e5083c50bf60c34b30057ef90fd3263133f0600940747444d7485fccf3b47d988eb4cf968aee96bfff6b551b72adb003ca4fb6a2b58e31781fa936 SHA512 44b31fb1a2801c74cd4ba7260566447df31b9dd7bd55ed1ffdabc0bcfef8d5459e753cbbb0a2a31c5f2d87e7853972281cb9412b642e282be9a02be2f519fcef
diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild
index 13ecfa5de9dd..aa90421f0516 100644
--- a/net-analyzer/bmon/bmon-4.0.ebuild
+++ b/net-analyzer/bmon/bmon-4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.3-r2:0=
diff --git a/net-analyzer/ibmonitor/Manifest b/net-analyzer/ibmonitor/Manifest
index ac954d84bfbd..c61499128804 100644
--- a/net-analyzer/ibmonitor/Manifest
+++ b/net-analyzer/ibmonitor/Manifest
@@ -1,3 +1,3 @@
 DIST ibmonitor-1.4.tar.gz 17025 BLAKE2B 33dcd54d3750b5e0dc70caaaf30f58f1dc2215cb2ba24174fafbfa356f27ae98133407505038df19104e9f8e1971ed4f8bf9ffeff37196d4640e90a4054970c6 SHA512 ef74dee22dbb88d07c37af9aaa0a0a49b6c49ff1b45a1637d06acbe32e4bc4e84d79cfe06ee7ba2b04d62fa3cfa0a10605eccde549d2fe04890dfa179adf20db
-EBUILD ibmonitor-1.4-r1.ebuild 433 BLAKE2B 76b16d31ee5e6f44923651c2161762dd0772210f6142a2df332d81027045c8ce41539ac4a532d12247db9bb0eb83dc9c23de50f6796ae5f5a106cfa14e90084e SHA512 7bddd623b45008ff4500af1f14e515f2fec75402d354a3f77b4200798e78240064d846fcb9afaccdd2d2ac7832b28ef84712a9490ec0a95d3f58eb8f61a3a31c
+EBUILD ibmonitor-1.4-r1.ebuild 440 BLAKE2B 7cbd7eecaefa395271e0f9ad01d3b29db08abe10a88e67795543bdcdbce3344554b7c585cf27ec59aaf6b4cdb953ffa69dcaf0a7eab6236ecd65261901eb1cdf SHA512 56f8a994071b3646cc188e562cb67b6c64fc56eaec5cb7f5069586c3edff245ac6d05d6c6a7d28bbf88557f8652d62f1b0b2ea69470d3d31fecea0517c220802
 MISC metadata.xml 359 BLAKE2B 8885ea2805f5ef76dbec58e1cddbbaf2df2ae0447ed5448788afeff96f35b51d62f07fe05e86f7ff34f6890b2b88bd66155c815c6681c6dc7753e08c70b8b0cd SHA512 a86cf3607c903fcc1ce55ab441ddc138653d40eb196e175d211998e11bc850427789d00ad466a3d2ddf990e9a61876938914499992b5a1b56595e7b220a8a31d
diff --git a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
index 4b5b559a57ba..d5cc1beaa4c3 100644
--- a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
+++ b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="Interactive bandwidth monitor"
 HOMEPAGE="http://ibmonitor.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~hppa ~ppc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~riscv x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 06f453a779f1..71032a053203 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,3 @@
-AUX icinga2-2.12.1-boost-1.74.0.patch 19210 BLAKE2B e6e09b631dc70b740212ad20d4e1bb38c7c8cf75c535f8935531bb02d0d3a9c3917bc272046315782aca2aa9e9f541c6686ef14810acfd854af9c64d647a554d SHA512 6f5b457dd4ef8d08fd4063a1a9babdc81d8f6789547448180795a30b46c4868ff1c520cc6e9b9140c866e0b62c9caae30ef4af53a963e29a0d2b4280acac1360
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.12.4.tar.gz 7535804 BLAKE2B 495a53fc0887ff2e1b5e058c52af63c155da600b4c82e38653a56c4b1dab497ef477254b19727c6c366b48c41a052b68c9910cb4bc4782605612a3d63ccf646c SHA512 3a817eb6f1be256f6eca5136e3d74c49e1cc2a7af382a906abebc6d573579e755decf72bfce62fad48f9c5a37fe6bc304c5849d1008ab7ce4939213f720ab37b
diff --git a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch b/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
deleted file mode 100644
index e6ad4807993a..000000000000
--- a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
+++ /dev/null
@@ -1,436 +0,0 @@
-From c30bae2994f1e5f33f6da51eb96d423e9bf0f75c Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Thu, 20 Aug 2020 18:25:48 +0200
-Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=98fs::copy=5Foption=E2=80=99=20has?=
- =?UTF-8?q?=20not=20been=20declared=20with=20boost=201.74.0?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It was deprecated in
-https://github.com/boostorg/filesystem/commit/f199152b7df036ff1606c85e4ea1b28edfeda6cc
----
- lib/base/utility.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
-index 1add7616c6..d8e6f20b0c 100644
---- a/lib/base/utility.cpp
-+++ b/lib/base/utility.cpp
-@@ -725,7 +725,11 @@ void Utility::CopyFile(const String& source, const String& target)
- {
- 	namespace fs = boost::filesystem;
- 
-+#if BOOST_VERSION >= 107400
-+	fs::copy_file(fs::path(source.Begin(), source.End()), fs::path(target.Begin(), target.End()), fs::copy_options::overwrite_existing);
-+#else /* BOOST_VERSION */
- 	fs::copy_file(fs::path(source.Begin(), source.End()), fs::path(target.Begin(), target.End()), fs::copy_option::overwrite_if_exists);
-+#endif /* BOOST_VERSION */
- }
- 
- /*
-From 45dd71e0f9a93369e08d6cb26f97940f9c9594aa Mon Sep 17 00:00:00 2001
-From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
-Date: Wed, 26 Aug 2020 13:56:26 +0200
-Subject: [PATCH] Introduce HttpUtility::Set()
-
-refs #8185
----
- lib/cli/consolecommand.cpp           |  9 ++++---
- lib/perfdata/elasticsearchwriter.cpp | 13 ++++-----
- lib/perfdata/influxdbwriter.cpp      |  7 ++---
- lib/remote/configfileshandler.cpp    |  4 +--
- lib/remote/eventshandler.cpp         |  2 +-
- lib/remote/httpserverconnection.cpp  | 40 ++++++++++++++--------------
- lib/remote/httputility.cpp           |  4 +--
- lib/remote/httputility.hpp           | 28 +++++++++++++++++++
- lib/remote/infohandler.cpp           |  6 ++---
- plugins/check_nscp_api.cpp           |  9 ++++---
- 10 files changed, 77 insertions(+), 45 deletions(-)
-
-diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp
-index 41b6590e4c..42c5c63133 100644
---- a/lib/cli/consolecommand.cpp
-+++ b/lib/cli/consolecommand.cpp
-@@ -3,6 +3,7 @@
- #include "cli/consolecommand.hpp"
- #include "config/configcompiler.hpp"
- #include "remote/consolehandler.hpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include "base/configwriter.hpp"
- #include "base/serializer.hpp"
-@@ -580,11 +581,11 @@ Dictionary::Ptr ConsoleCommand::SendRequest()
- 
- 	http::request<http::string_body> request(http::verb::post, std::string(l_Url->Format(false)), 10);
- 
--	request.set(http::field::user_agent, "Icinga/DebugConsole/" + Application::GetAppVersion());
--	request.set(http::field::host, l_Url->GetHost() + ":" + l_Url->GetPort());
-+	HttpUtility::Set(request, http::field::user_agent, "Icinga/DebugConsole/" + Application::GetAppVersion());
-+	HttpUtility::Set(request, http::field::host, l_Url->GetHost() + ":" + l_Url->GetPort());
- 
--	request.set(http::field::accept, "application/json");
--	request.set(http::field::authorization, "Basic " + Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword()));
-+	HttpUtility::Set(request, http::field::accept, "application/json");
-+	HttpUtility::Set(request, http::field::authorization, "Basic " + Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword()));
- 
- 	try {
- 		http::write(*l_TlsStream, request);
-diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp
-index 6870198e45..3764bf536b 100644
---- a/lib/perfdata/elasticsearchwriter.cpp
-+++ b/lib/perfdata/elasticsearchwriter.cpp
-@@ -2,6 +2,7 @@
- 
- #include "perfdata/elasticsearchwriter.hpp"
- #include "perfdata/elasticsearchwriter-ti.cpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include "icinga/compatutility.hpp"
- #include "icinga/service.hpp"
-@@ -474,27 +475,27 @@ void ElasticsearchWriter::SendRequest(const String& body)
- 
- 	http::request<http::string_body> request (http::verb::post, std::string(url->Format(true)), 10);
- 
--	request.set(http::field::user_agent, "Icinga/" + Application::GetAppVersion());
--	request.set(http::field::host, url->GetHost() + ":" + url->GetPort());
-+	HttpUtility::Set(request, http::field::user_agent, "Icinga/" + Application::GetAppVersion());
-+	HttpUtility::Set(request, http::field::host, url->GetHost() + ":" + url->GetPort());
- 
- 	/* Specify required headers by Elasticsearch. */
--	request.set(http::field::accept, "application/json");
-+	HttpUtility::Set(request, http::field::accept, "application/json");
- 
- 	/* Use application/x-ndjson for bulk streams. While ES
- 	 * is able to handle application/json, the newline separator
- 	 * causes problems with Logstash (#6609).
- 	 */
--	request.set(http::field::content_type, "application/x-ndjson");
-+	HttpUtility::Set(request, http::field::content_type, "application/x-ndjson");
- 
- 	/* Send authentication if configured. */
- 	String username = GetUsername();
- 	String password = GetPassword();
- 
- 	if (!username.IsEmpty() && !password.IsEmpty())
--		request.set(http::field::authorization, "Basic " + Base64::Encode(username + ":" + password));
-+		HttpUtility::Set(request, http::field::authorization, "Basic " + Base64::Encode(username + ":" + password));
- 
- 	request.body() = body;
--	request.set(http::field::content_length, request.body().size());
-+	HttpUtility::Set(request, http::field::content_length, request.body().size());
- 
- 	/* Don't log the request body to debug log, this is already done above. */
- 	Log(LogDebug, "ElasticsearchWriter")
-diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
-index 4692b8b5df..0ddd582447 100644
---- a/lib/perfdata/influxdbwriter.cpp
-+++ b/lib/perfdata/influxdbwriter.cpp
-@@ -2,6 +2,7 @@
- 
- #include "perfdata/influxdbwriter.hpp"
- #include "perfdata/influxdbwriter-ti.cpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include "icinga/service.hpp"
- #include "icinga/macroprocessor.hpp"
-@@ -501,11 +502,11 @@ void InfluxdbWriter::Flush()
- 
- 	http::request<http::string_body> request (http::verb::post, std::string(url->Format(true)), 10);
- 
--	request.set(http::field::user_agent, "Icinga/" + Application::GetAppVersion());
--	request.set(http::field::host, url->GetHost() + ":" + url->GetPort());
-+	HttpUtility::Set(request, http::field::user_agent, "Icinga/" + Application::GetAppVersion());
-+	HttpUtility::Set(request, http::field::host, url->GetHost() + ":" + url->GetPort());
- 
- 	request.body() = body;
--	request.set(http::field::content_length, request.body().size());
-+	HttpUtility::Set(request, http::field::content_length, request.body().size());
- 
- 	try {
- 		if (stream.first) {
-diff --git a/lib/remote/configfileshandler.cpp b/lib/remote/configfileshandler.cpp
-index d714f4d864..5c2bfdb405 100644
---- a/lib/remote/configfileshandler.cpp
-+++ b/lib/remote/configfileshandler.cpp
-@@ -82,9 +82,9 @@ bool ConfigFilesHandler::HandleRequest(
- 
- 		String content((std::istreambuf_iterator<char>(fp)), std::istreambuf_iterator<char>());
- 		response.result(http::status::ok);
--		response.set(http::field::content_type, "application/octet-stream");
-+		HttpUtility::Set(response, http::field::content_type, "application/octet-stream");
- 		response.body() = content;
--		response.set(http::field::content_length, response.body().size());
-+		HttpUtility::Set(response, http::field::content_length, response.body().size());
- 	} catch (const std::exception& ex) {
- 		HttpUtility::SendJsonError(response, params, 500, "Could not read file.",
- 			DiagnosticInformation(ex));
-diff --git a/lib/remote/eventshandler.cpp b/lib/remote/eventshandler.cpp
-index e92b14a2d4..e41b4711c6 100644
---- a/lib/remote/eventshandler.cpp
-+++ b/lib/remote/eventshandler.cpp
-@@ -100,7 +100,7 @@ bool EventsHandler::HandleRequest(
- 	server.StartStreaming();
- 
- 	response.result(http::status::ok);
--	response.set(http::field::content_type, "application/json");
-+	HttpUtility::Set(response, http::field::content_type, "application/json");
- 
- 	IoBoundWorkSlot dontLockTheIoThread (yc);
- 
-diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
-index d4eac7d074..688392c821 100644
---- a/lib/remote/httpserverconnection.cpp
-+++ b/lib/remote/httpserverconnection.cpp
-@@ -184,12 +184,12 @@ bool EnsureValidHeaders(
- 				{ "status", String("Bad Request: ") + errorMsg }
- 			}));
- 		} else {
--			response.set(http::field::content_type, "text/html");
-+			HttpUtility::Set(response, http::field::content_type, "text/html");
- 			response.body() = String("<h1>Bad Request</h1><p><pre>") + errorMsg + "</pre></p>";
--			response.set(http::field::content_length, response.body().size());
-+			HttpUtility::Set(response, http::field::content_length, response.body().size());
- 		}
- 
--		response.set(http::field::connection, "close");
-+		HttpUtility::Set(response, http::field::connection, "close");
- 
- 		boost::system::error_code ec;
- 
-@@ -247,20 +247,20 @@ bool HandleAccessControl(
- 				auto& origin (request[http::field::origin]);
- 
- 				if (allowedOrigins.find(origin.to_string()) != allowedOrigins.end()) {
--					response.set(http::field::access_control_allow_origin, origin);
-+					HttpUtility::Set(response, http::field::access_control_allow_origin, origin);
- 				}
- 
- 				allowOriginHeader.Done();
- 
--				response.set(http::field::access_control_allow_credentials, "true");
-+				HttpUtility::Set(response, http::field::access_control_allow_credentials, "true");
- 
- 				if (request.method() == http::verb::options && !request[http::field::access_control_request_method].empty()) {
- 					response.result(http::status::ok);
--					response.set(http::field::access_control_allow_methods, "GET, POST, PUT, DELETE");
--					response.set(http::field::access_control_allow_headers, "Authorization, X-HTTP-Method-Override");
-+					HttpUtility::Set(response, http::field::access_control_allow_methods, "GET, POST, PUT, DELETE");
-+					HttpUtility::Set(response, http::field::access_control_allow_headers, "Authorization, X-HTTP-Method-Override");
- 					response.body() = "Preflight OK";
--					response.set(http::field::content_length, response.body().size());
--					response.set(http::field::connection, "close");
-+					HttpUtility::Set(response, http::field::content_length, response.body().size());
-+					HttpUtility::Set(response, http::field::connection, "close");
- 
- 					boost::system::error_code ec;
- 
-@@ -288,10 +288,10 @@ bool EnsureAcceptHeader(
- 
- 	if (request.method() != http::verb::get && request[http::field::accept] != "application/json") {
- 		response.result(http::status::bad_request);
--		response.set(http::field::content_type, "text/html");
-+		HttpUtility::Set(response, http::field::content_type, "text/html");
- 		response.body() = "<h1>Accept header is missing or not set to 'application/json'.</h1>";
--		response.set(http::field::content_length, response.body().size());
--		response.set(http::field::connection, "close");
-+		HttpUtility::Set(response, http::field::content_length, response.body().size());
-+		HttpUtility::Set(response, http::field::connection, "close");
- 
- 		boost::system::error_code ec;
- 
-@@ -320,8 +320,8 @@ bool EnsureAuthenticatedUser(
- 			<< "Unauthorized request: " << request.method_string() << ' ' << request.target();
- 
- 		response.result(http::status::unauthorized);
--		response.set(http::field::www_authenticate, "Basic realm=\"Icinga 2\"");
--		response.set(http::field::connection, "close");
-+		HttpUtility::Set(response, http::field::www_authenticate, "Basic realm=\"Icinga 2\"");
-+		HttpUtility::Set(response, http::field::connection, "close");
- 
- 		if (request[http::field::accept] == "application/json") {
- 			HttpUtility::SendJsonBody(response, nullptr, new Dictionary({
-@@ -329,9 +329,9 @@ bool EnsureAuthenticatedUser(
- 				{ "status", "Unauthorized. Please check your user credentials." }
- 			}));
- 		} else {
--			response.set(http::field::content_type, "text/html");
-+			HttpUtility::Set(response, http::field::content_type, "text/html");
- 			response.body() = "<h1>Unauthorized. Please check your user credentials.</h1>";
--			response.set(http::field::content_length, response.body().size());
-+			HttpUtility::Set(response, http::field::content_length, response.body().size());
- 		}
- 
- 		boost::system::error_code ec;
-@@ -421,12 +421,12 @@ bool EnsureValidBody(
- 				{ "status", String("Bad Request: ") + ec.message() }
- 			}));
- 		} else {
--			response.set(http::field::content_type, "text/html");
-+			HttpUtility::Set(response, http::field::content_type, "text/html");
- 			response.body() = String("<h1>Bad Request</h1><p><pre>") + ec.message() + "</pre></p>";
--			response.set(http::field::content_length, response.body().size());
-+			HttpUtility::Set(response, http::field::content_length, response.body().size());
- 		}
- 
--		response.set(http::field::connection, "close");
-+		HttpUtility::Set(response, http::field::connection, "close");
- 
- 		http::async_write(stream, response, yc[ec]);
- 		stream.async_flush(yc[ec]);
-@@ -511,7 +511,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
- 			parser.header_limit(1024 * 1024);
- 			parser.body_limit(-1);
- 
--			response.set(http::field::server, l_ServerHeader);
-+			HttpUtility::Set(response, http::field::server, l_ServerHeader);
- 
- 			if (!EnsureValidHeaders(*m_Stream, buf, parser, response, m_ShuttingDown, yc)) {
- 				break;
-diff --git a/lib/remote/httputility.cpp b/lib/remote/httputility.cpp
-index 91902ba501..e46e990ecf 100644
---- a/lib/remote/httputility.cpp
-+++ b/lib/remote/httputility.cpp
-@@ -56,9 +56,9 @@ void HttpUtility::SendJsonBody(boost::beast::http::response<boost::beast::http::
- {
- 	namespace http = boost::beast::http;
- 
--	response.set(http::field::content_type, "application/json");
-+	HttpUtility::Set(response, http::field::content_type, "application/json");
- 	response.body() = JsonEncode(val, params && GetLastParameter(params, "pretty"));
--	response.set(http::field::content_length, response.body().size());
-+	HttpUtility::Set(response, http::field::content_length, response.body().size());
- }
- 
- void HttpUtility::SendJsonError(boost::beast::http::response<boost::beast::http::string_body>& response,
-diff --git a/lib/remote/httputility.hpp b/lib/remote/httputility.hpp
-index 6465b4af92..be600d4090 100644
---- a/lib/remote/httputility.hpp
-+++ b/lib/remote/httputility.hpp
-@@ -5,8 +5,12 @@
- 
- #include "remote/url.hpp"
- #include "base/dictionary.hpp"
-+#include "base/string.hpp"
- #include <boost/beast/http.hpp>
-+#include <boost/lexical_cast.hpp>
- #include <string>
-+#include <type_traits>
-+#include <utility>
- 
- namespace icinga
- {
-@@ -26,6 +30,30 @@ class HttpUtility
- 	static void SendJsonBody(boost::beast::http::response<boost::beast::http::string_body>& response, const Dictionary::Ptr& params, const Value& val);
- 	static void SendJsonError(boost::beast::http::response<boost::beast::http::string_body>& response, const Dictionary::Ptr& params, const int code,
- 		const String& verbose = String(), const String& diagnosticInformation = String());
-+
-+	template<class Message, class Key, class Value, typename std::enable_if<std::is_arithmetic<Value>::value, int>::type = 0>
-+	static void Set(Message& message, Key&& key, Value value)
-+	{
-+		Set(message, std::forward<Key>(key), boost::lexical_cast<std::string>(value));
-+	}
-+
-+	template<class Message, class Key>
-+	static void Set(Message& message, Key&& key, const String& value)
-+	{
-+		Set(message, std::forward<Key>(key), value.GetData());
-+	}
-+
-+	template<class Message, class Key>
-+	static void Set(Message& message, Key&& key, String&& value)
-+	{
-+		Set(message, std::forward<Key>(key), value.GetData());
-+	}
-+
-+	template<class Message, class Key, class Value, typename std::enable_if<!std::is_arithmetic<Value>::value, int>::type = 0>
-+	static void Set(Message& message, Key&& key, Value&& value)
-+	{
-+		message.set(std::forward<Key>(key), std::forward<Value>(value));
-+	}
- };
- 
- }
-diff --git a/lib/remote/infohandler.cpp b/lib/remote/infohandler.cpp
-index 18c18c0e04..daec628047 100644
---- a/lib/remote/infohandler.cpp
-+++ b/lib/remote/infohandler.cpp
-@@ -29,7 +29,7 @@ bool InfoHandler::HandleRequest(
- 
- 	if (url->GetPath().empty()) {
- 		response.result(http::status::found);
--		response.set(http::field::location, "/v1");
-+		HttpUtility::Set(response, http::field::location, "/v1");
- 		return true;
- 	}
- 
-@@ -74,7 +74,7 @@ bool InfoHandler::HandleRequest(
- 
- 		HttpUtility::SendJsonBody(response, params, result);
- 	} else {
--		response.set(http::field::content_type, "text/html");
-+		HttpUtility::Set(response, http::field::content_type, "text/html");
- 
- 		String body = "<html><head><title>Icinga 2</title></head><h1>Hello from Icinga 2 (Version: " + Application::GetAppVersion() + ")!</h1>";
- 		body += "<p>You are authenticated as <b>" + user->GetName() + "</b>. ";
-@@ -92,7 +92,7 @@ bool InfoHandler::HandleRequest(
- 
- 		body += R"(<p>More information about API requests is available in the <a href="https://icinga.com/docs/icinga2/latest/" target="_blank">documentation</a>.</p></html>)";
- 		response.body() = body;
--		response.set(http::field::content_length, response.body().size());
-+		HttpUtility::Set(response, http::field::content_length, response.body().size());
- 	}
- 
- 	return true;
-diff --git a/plugins/check_nscp_api.cpp b/plugins/check_nscp_api.cpp
-index 3f6843ec29..ad15e62527 100644
---- a/plugins/check_nscp_api.cpp
-+++ b/plugins/check_nscp_api.cpp
-@@ -16,6 +16,7 @@
- #include "base/tcpsocket.hpp" /* include global icinga::Connect */
- #include "base/tlsstream.hpp"
- #include "base/base64.hpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include <remote/url-characters.hpp>
- #include <boost/program_options.hpp>
-@@ -365,11 +366,11 @@ static Dictionary::Ptr FetchData(const String& host, const String& port, const S
- 
- 	http::request<http::string_body> request (http::verb::get, std::string(url->Format(true)), 10);
- 
--	request.set(http::field::user_agent, "Icinga/check_nscp_api/" + String(VERSION));
--	request.set(http::field::host, host + ":" + port);
-+	HttpUtility::Set(request, http::field::user_agent, "Icinga/check_nscp_api/" + String(VERSION));
-+	HttpUtility::Set(request, http::field::host, host + ":" + port);
- 
--	request.set(http::field::accept, "application/json");
--	request.set("password", password);
-+	HttpUtility::Set(request, http::field::accept, "application/json");
-+	HttpUtility::Set(request, "password", password);
- 
- 	if (l_Debug) {
- 		std::cout << "Sending request to " << url->Format(false, false) << "'.\n";
-From 7e62a68eadada58e762d3f4261750796adffd440 Mon Sep 17 00:00:00 2001
-From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
-Date: Wed, 26 Aug 2020 13:48:39 +0200
-Subject: [PATCH] Define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
-
-refs #8185
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 046f23cf22..46e765415e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -172,6 +172,9 @@ add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
- 
- add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
- 
-+# Required for Boost v1.74+
-+add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
-+
- link_directories(${Boost_LIBRARY_DIRS})
- include_directories(${Boost_INCLUDE_DIRS})
- 
diff --git a/net-analyzer/ifstat/Manifest b/net-analyzer/ifstat/Manifest
index c19aaff461f7..620d7aa6e2fc 100644
--- a/net-analyzer/ifstat/Manifest
+++ b/net-analyzer/ifstat/Manifest
@@ -1,5 +1,5 @@
 AUX ifstat-1.1-hardened.patch 416 BLAKE2B f7cd655039a5fd68d49b8885b954dc1655551b8d9e120e698f1831e65b6d65ff7175b7cfe91cd58f117df8ac64eb05b17820ca963c078855989a5820b1d5da2c SHA512 64ff9119a6c492f0d011fcc0868425479b4b9bb8520b4f5e8323b106b9be555e763a9e73ef1e6833f652ebb51d048611d3504b26a94adebf5e21cd695c4417fc
 AUX ifstat-1.1-make.patch 4110 BLAKE2B b7495a19db3dde53c3172bdf44e1b4381df2dfcc58a000236b458cc962d017ecd5e8c08f036d964d706f33d9f77d3b870655245d5b74d3d43c333a46fa0d7bac SHA512 28b292b00b465a44344556c8f96bb237a0185ac176f0bea2374a0d6c03bc834997450c0c152a00a469f2a6837c3f60aa66cc85615d50cb5aeec1a379e155775a
 DIST ifstat-1.1.tar.gz 67920 BLAKE2B b9aeb18488f419fd6a03f698ed41d442b812765d5c1636dc6ea1e0484b5b1a6bc40b484bf88a715c63417d52db92927c128477714264ee3fe14ceb482330cb06 SHA512 b1aef8e7b14cbf265e2d42277478fd12a565287f90f37b0a826ba3e7d29640df757c7d56f149e406bf5890663ed734b2c658c4f1e2b258ded3649f2fc3e9ac64
-EBUILD ifstat-1.1-r2.ebuild 675 BLAKE2B 68dd58ffd07dbdf52a6abd89fdc527f51b1c0bcf8896d8599e42ff56ee3b2f25465a120880140d7e98f8bc5e51be252511dc5ef71dbc6dc9fb2ecc0714252bd2 SHA512 4267310e3125f76fda4565fb419af4eb44e9e341cc2cc01d3d199032566267bbdcd6811c145ff7e9f8db6f8707223822d27b0ee1e24556f44fa81639c70157ac
+EBUILD ifstat-1.1-r2.ebuild 682 BLAKE2B 2f84fbb0374caa09801848df5bc6576ced62a07ee76287c052d725f4fd12d4ae0b5a15d46ea5a505600c4c35bcb266f42e6a0b74a7e4082e6026805db2568260 SHA512 7551ce3d83f1f83e452eab22ef099fc5827d243e5c6ba9cd8f3f70de7c1a6eafe74ef2962d89ad317ec765f9535884e2cca2d69c30a6987f5bcec665737b848e
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
index 616e7250a9ca..6ece35858b77 100644
--- a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
+++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://gael.roualland.free.fr/ifstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="snmp"
 
 DEPEND="snmp? ( >=net-analyzer/net-snmp-5.0 )"
diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest
index 1d766ec1611d..856f9877e50d 100644
--- a/net-analyzer/ifstatus/Manifest
+++ b/net-analyzer/ifstatus/Manifest
@@ -5,5 +5,5 @@ AUX ifstatus-2.0.0-tinfo.patch 191 BLAKE2B 3294763f55f0219c9f19d317b931470aaa15b
 DIST ifstatus-v1.1.0.tar.gz 25233 BLAKE2B de9d088bf7001799c3a54775c0c63d5dcf4f1f3f4998ce02b82a11bea7a6dabb1263829ff42ba1cd05ebd6b202827196757727c24db022ffa7d06ece38db6616 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766
 DIST ifstatus-v2.0.0.tar.gz 24058 BLAKE2B 09a2b0af26cb05dfc24eefdbb6ac52b0ac289a687301f5fa67f0fcaf2622da96e149af3f7c08257e0ef8418f4f08b5ca1b77af71ba7c00dabddcb87cc95ddce7 SHA512 e1720f5dcc26788149cc72ccb72b85fffc72b367f2268e1e4f06a8fe4d80685146d310746c0b1a913e24995f6e93011d7d75ea5b4f9ca479af2d79264b89e27d
 EBUILD ifstatus-1.1.0-r2.ebuild 923 BLAKE2B 94fbf50de6b256cf4752b7aa589004d8b2f740e0f7a6b0c9809a7368a129fd3015bb0430a448787f2ffb01e77ba6402e9d4ecdee5263bc3b832cbecb7c582007 SHA512 f83e52bf3eeebbd30b7a50dd7b88d0c659bce4515d93481ec9349c03fe251a7a209a7ee9d5839e08bbeb807d47309de324189cc2aa684c483c8247ef62204ce4
-EBUILD ifstatus-2.0.0.ebuild 897 BLAKE2B 54a12fd4efefd2a57b95b813e7fd781b549b71fb54109afd11b675a1995b7ef7a815cfe1c83e3ac4aaa44fb7f5a63d488215332b269e43d34ca48812e9e55c2a SHA512 ffdb8ca33899b719854ce7aac7ede18d140713fa3d2337850d893b1513af2723dee4bdc81c77bc185892f484d345750d1c8ce9b9d4885b8d98b746536eb1453d
+EBUILD ifstatus-2.0.0.ebuild 904 BLAKE2B 35a7c27dc34bee5079597b98fc6697880a609f7131c51a013df95fbca6839923229e0b838b15e1c812c1e9a3211e84dc8d3aa18bf7f1a06a8b815c599a2c8bcf SHA512 d884bb335fbcf282f4f90c02988a3d4db86875957e1dc1fb8d704fd64d652c1bbc9eb95d6807828b02612c209f40ac36d30e03e32eda9af4c0c6edbcdf0130ea
 MISC metadata.xml 358 BLAKE2B e6d48885bc56f4b4057509378e2f84fe2468c417805bcaca14686a250420762c76bd3a656612019d5784a65df12e85b4dbaf89265d9b91d9455190d234f28813 SHA512 b23a7f0e009c71d86cd145b033b4bc7f77e7a316f048d8236e9bb2bf9cd34671ec24af37b11ef934791c6f046e1a761087c7f5e570bac80b09e30862e162d005
diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
index 400d6a60c000..89f9ddd12d83 100644
--- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
+KEYWORDS="amd64 arm ~ppc ~riscv x86"
 
 RDEPEND=">=sys-libs/ncurses-4.2:0="
 DEPEND="${RDEPEND}"
diff --git a/net-analyzer/iplog/Manifest b/net-analyzer/iplog/Manifest
index 97d7dcc672cb..098900827ba4 100644
--- a/net-analyzer/iplog/Manifest
+++ b/net-analyzer/iplog/Manifest
@@ -2,4 +2,5 @@ AUX 2.2.3-DLT_LINUX_SSL.patch 7265 BLAKE2B a20edebe47d65d066b1b3e214d8365b4a5811
 AUX iplog.rc6 776 BLAKE2B fba34208b2d16ba508cc9c3592e21eb7f0a479a89bf4617320bd9627047024f0cadde7fef55304baf25f7ccc56836e899b71801141b1802facc8b885b9b121ad SHA512 f0c3965810f7005e1ae183a2f3ed66ba06c054fcfd78da6277eaa364518ebffb9f44a0c99200b0d3042a63d4c57141d5b29823e8bc1d3f030e00d8e913021a34
 DIST iplog-2.2.3.tar.gz 133639 BLAKE2B f8108259f3f9b662297785988c40711d9d4ce6381377ed9a797f441c84fd1dcd9f0c3832e07ed9a660ddcc41bc52777136204274de873b72bce151327738ec2d SHA512 d7669e39b728af366b5199c58d396c6907496b4895ffb1ba0cba54fae0646f9792170f932de1eae9634b5ac356644a5d6d0ccaf7bc77a62641695992245c9aed
 EBUILD iplog-2.2.3-r2.ebuild 711 BLAKE2B d316c3319b05b81dc972e9bbfaa9b995de0d8efc184d4452ad9d88391f62a115db5f3ab9efee212dd2fd20d99f4fec7f41cfd14b03cfb455274dbe5bd9e2761a SHA512 bd905fd7a0a16565c57fc1e127756deef649c3b5ac8ff9f362bc305190070be9aab391db1bde97b4f7f8d5c8a9687d05aa611222d0bde46b1d992ded2022d106
+EBUILD iplog-2.2.3-r3.ebuild 705 BLAKE2B 6c0684735df2d67fdc627638ebc444c040cafb26fc545f00f6f4d3c76ac2899245ffc6cd5373da2a2d6130837b343f625fe5cd694e0058e00525c1e67ac4188e SHA512 8427570ca75e36dcbc79e711c9fab08d1ea24bf71b9d3d90e6980ccbe64c5233452ef12e87aa4996144665b966d30ca7e1cb826d63dbb176de6d7fbc1d8e6d99
 MISC metadata.xml 354 BLAKE2B df8c5f493f148b6744299baaaa5aba3f014c69968c7db943873938efaee876b21c85049573a2c0371bb5c525d89e060256616c15d381876b1e9942b5d39b8577 SHA512 fd3b53459e130f0350e47e4e677afaa53773c45a22963c22cb61aa2fc14401867eeb07efb09ff17db75814aeb65dff8715719209d74706a0ec616ec817a3d648
diff --git a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
new file mode 100644
index 000000000000..09cfb969491a
--- /dev/null
+++ b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="TCP/IP traffic logger"
+HOMEPAGE="http://ojnk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 FDL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PV}-DLT_LINUX_SSL.patch )
+
+DOCS=( AUTHORS NEWS README TODO example-iplog.conf )
+
+src_compile() {
+	append-cppflags -D_REENTRANT
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" all
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/iplog.rc6 iplog
+}
diff --git a/net-analyzer/kapacitor/Manifest b/net-analyzer/kapacitor/Manifest
index 2de96a10214c..426764d9b84e 100644
--- a/net-analyzer/kapacitor/Manifest
+++ b/net-analyzer/kapacitor/Manifest
@@ -1,9 +1,5 @@
 AUX kapacitor.confd 336 BLAKE2B c5bef1b3d07b7473121ab1693e33393dfdf2f086d0a5d114952b9c526cac1a17e4c39a3c601ab573187f65bf9b13392cb90b2333d18f8b2ce70a9e2b117a09b1 SHA512 feb56f42b5dd734004762a08760be81d0f38697ee23bcab7e33f94573e1742da91589b4c0307e0e9d5f72a757793b3e6b59636350447afe03e315486231e699e
 AUX kapacitor.rc 710 BLAKE2B 6229b4a729d623794dbee189be53d1485d9f5c7a2728b7cf0842e49eb51e48490ea868667728d6ccc38287e6f4e2079ce5db6bb86bdd608f9491bbbb195df9ca SHA512 ad1780dac6fc4ad899e88a5e66466ef7a5d54fe77ff3326e37c75506a3de5496a20610035ce7cd860a4b043fdad1f8c0a71c47533e0e9ddcab387d31e6086711
-DIST kapacitor-1.4.1.tar.gz 7543899 BLAKE2B 142ea7899be3728d2e857a83beebb8ff32dae6b7a71097de1474878a1728c6597937d03a828746af2464d6406ae80796b11579a10baacb66843bd535f971d940 SHA512 315e01e97f6a89afbbd0e36c17ee64d2744bc8ccce2e318f17ad5fba75599fdc55c303069c32aed07ba73c8ba9cdbacdb76c7ffe0c81681c1ef0be0ba405802e
-DIST kapacitor-1.5.1.tar.gz 5668659 BLAKE2B 5caf7a51945d84010f25dcbe198d4a1b7fc21f2ef7036a0489d6274212068937942f0490637a11ab05399d3a95ec1d96f3d42f0a2b3e3b7b4ff1377ef1e220e6 SHA512 6e25f89d9b75c6c14350a189be7bcd4210a331025a4bd0a8fa363dee8abbe8c582013a9c3020e638e9490ded12d70212963dc01bd3570395412641e2911d93f5
 DIST kapacitor-1.5.5.tar.gz 5708426 BLAKE2B 432d24f3bbe0f42e36b881e0c709cebd96dd3674ddf752f6a25cfb333108c903073b887e12d630d6c9e33a77b1256ea090cfe216cd9eb30b9bee53c48b7ab154 SHA512 34a2577a9c6f069ab8f747b9bd2f80f941bbedcccd740c24ec9f308804ec259e78cf14c924fcee3315b6f9f7f59adb9c50aedf06587898b8a0fb54f721d79212
-EBUILD kapacitor-1.4.1-r1.ebuild 1257 BLAKE2B fd245b633ce69fc8b9ba050952ef8be7be86576ef62a3ea9ce2f4141bc5c8725419230bd6f7ddcbc6efa34e59f75fd8ff9696c37939cf5a9d5f38a73cc5a64bc SHA512 db7bee7212c8871a8d73f1d3bf40d12acf40925f6d7cc4a5dcfed60a8a9a446129c3752565ef105a396b177501d4327bf3234814b32985b92c4245528519e9d8
-EBUILD kapacitor-1.5.1.ebuild 1257 BLAKE2B fd245b633ce69fc8b9ba050952ef8be7be86576ef62a3ea9ce2f4141bc5c8725419230bd6f7ddcbc6efa34e59f75fd8ff9696c37939cf5a9d5f38a73cc5a64bc SHA512 db7bee7212c8871a8d73f1d3bf40d12acf40925f6d7cc4a5dcfed60a8a9a446129c3752565ef105a396b177501d4327bf3234814b32985b92c4245528519e9d8
 EBUILD kapacitor-1.5.5.ebuild 1291 BLAKE2B 2358a6e632ff90c5d81e8c5b6aac80b51556a8a1b227c613066136b963a5544cc7b8a98c5d7512d78f0d63d779cf29f0f479a070fcc94618abcc3154471bb02a SHA512 21fb950d58cee3883fe29da65f44a015fa3ee09bf981c7a2d72d7cd9c4ad10391a96d1b695c9641c93e87f41fb2a32431fa82a28fdafda243c81697b508d6e74
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild b/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild
deleted file mode 100644
index dd499480fbdd..000000000000
--- a/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/kapacitor
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
-	enewgroup kapacitor
-	enewuser kapacitor -1 -1 /var/lib/kapacitor kapacitor
-}
-
-src_compile() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-	set -- env GOPATH="${S}" go build -v -work -x ./...
-	echo "$@"
-	"$@" || die "compile failed"
-	popd > /dev/null
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-	set -- env GOPATH="${S}" go install -v -work -x ./...
-	echo "$@"
-	"$@" || die
-	dobin "${S}"/bin/kapacitor{,d}
-	insinto /etc/kapacitor
-doins etc/kapacitor/kapacitor.conf
-keepdir /etc/kapacitor/load
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/kapacitor
-	systemd_dounit scripts/kapacitor.service
-	keepdir /var/log/kapacitor
-	fowners kapacitor:kapacitor /var/log/kapacitor
-	newconfd "${FILESDIR}"/kapacitor.confd kapacitor
-	newinitd "${FILESDIR}"/kapacitor.rc kapacitor
-	popd > /dev/null || die
-}
diff --git a/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild b/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild
deleted file mode 100644
index dd499480fbdd..000000000000
--- a/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/kapacitor
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
-	enewgroup kapacitor
-	enewuser kapacitor -1 -1 /var/lib/kapacitor kapacitor
-}
-
-src_compile() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-	set -- env GOPATH="${S}" go build -v -work -x ./...
-	echo "$@"
-	"$@" || die "compile failed"
-	popd > /dev/null
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-	set -- env GOPATH="${S}" go install -v -work -x ./...
-	echo "$@"
-	"$@" || die
-	dobin "${S}"/bin/kapacitor{,d}
-	insinto /etc/kapacitor
-doins etc/kapacitor/kapacitor.conf
-keepdir /etc/kapacitor/load
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/kapacitor
-	systemd_dounit scripts/kapacitor.service
-	keepdir /var/log/kapacitor
-	fowners kapacitor:kapacitor /var/log/kapacitor
-	newconfd "${FILESDIR}"/kapacitor.confd kapacitor
-	newinitd "${FILESDIR}"/kapacitor.rc kapacitor
-	popd > /dev/null || die
-}
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 6f4a67f30a76..cfaec065f941 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,8 +1,4 @@
 AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad202c2d2dbf3ede5af55dbe46cc15a064d37178b27670e30aa7bea07147456ce4d3e1ce9f495fa6df9deb4095367a7427e217719 SHA512 3ead6340800ac15fbe76e223599a5b3dbc6b6b13b72b684919aa43487838564ad7117b4e67fa7f36f0f58554fd8b8d6233efbcb82e6927a0c31f22c6a9ab5dbb
-DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
 DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070 SHA512 0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7
-DIST monitoring-plugins-2.3.tar.gz 2528556 BLAKE2B d8c8886aea900a172e5693de766edb6b7ef7aac5ee94fec1f5c14cb0e9873623b14a965cc8852abb4ed44934d5111a86e130e7c37201a03de42bc996797302de SHA512 926065667dff6c608ae5b7da39f6416bfc2443b9e1cdef68cd5d19be99da1b6fc6f23ef87b05731312b5d7ad76d01f0242fc9e544dbb4dd00dbafa0e27434d2e
-EBUILD monitoring-plugins-2.2-r4.ebuild 2949 BLAKE2B ddde634c6dc7c986e4d08c80dd4d6d1024c1bcf8957810a1323e7ca4d6951d096efdd331e88b7ab39e3efc5421eb17769330b2a4868245559eea207db5fe9408 SHA512 a3e2b240dcc91492325cb6c24672cbaf481a43f0bffc241c13faf682e87aa1c27f1a1369614592784d6cb0e2ce2708a85109ae98a52d5703e245fd3dcef1c9d1
-EBUILD monitoring-plugins-2.3.1.ebuild 3037 BLAKE2B 07312abcb23007ba40f6be8d03e6884f2b0a5b69bd6c33d4e960aa7c482ad325499a00ff9f99a8c0dcb3a49d4e9ce174d65efbe0ca473e867ba66f540de0643b SHA512 fd969ca834c14f3443e43e7b49f917accd1cbfac84a5a87495faff56d404c406de0eb8521138579a50c533ab161e0002bcff37bd0734ec9fe83e7c75976a0e66
-EBUILD monitoring-plugins-2.3.ebuild 3037 BLAKE2B 07312abcb23007ba40f6be8d03e6884f2b0a5b69bd6c33d4e960aa7c482ad325499a00ff9f99a8c0dcb3a49d4e9ce174d65efbe0ca473e867ba66f540de0643b SHA512 fd969ca834c14f3443e43e7b49f917accd1cbfac84a5a87495faff56d404c406de0eb8521138579a50c533ab161e0002bcff37bd0734ec9fe83e7c75976a0e66
+EBUILD monitoring-plugins-2.3.1.ebuild 3034 BLAKE2B d9c3b074d9fe133c3cccb3679aac0edff0690fbe5b0f7e67b8b8a232008188ad020fa1f6ddcf753c045ff2d1834f0134c3f3ca2a5856104ac14ba12834c2d026 SHA512 e82fc24872ee362fce26de6836fa912ab0582222c10179d8e159ce678fb0f9455f5b7c5e41a2991711ab6305eaa0a7bebf0cd38926b8fd4ea4cedbe9682fa73d
 MISC metadata.xml 1434 BLAKE2B 0d6304a4cc6f3d5b9ea268d7c6613f4613ac68ee1ae9d40079796716eb845ea97a1d8d6418d5dbaccdb7686754913f06dee8255ea12d91d3d8dc94e12fb55970 SHA512 0a9e64da453edddc864fc8b1c0fb13c63976f99968060a9ef2dc1d5e36b84dda9a79ac7dbe795401ef0680b35e397b08920a9a5ea4f861575bc61a76e89cde42
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
deleted file mode 100644
index 62c9fc037488..000000000000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic user
-
-DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
-HOMEPAGE="https://www.monitoring-plugins.org/"
-SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 sparc x86"
-IUSE="gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-		gnutls? ( net-libs/gnutls )
-	)
-	radius? ( net-dialup/freeradius-client )"
-
-DEPEND="${REAL_DEPEND}
-	dns? ( net-dns/bind-tools )
-	game? ( games-util/qstat )
-	fping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( net-misc/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
-	!net-analyzer/nagios-plugins"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with !gnutls openssl /usr)
-				  $(use_with gnutls gnutls /usr) )
-	else
-		myconf+=( --without-openssl )
-		myconf+=( --without-gnutls )
-	fi
-
-	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered. Bug #468296.
-	myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		$(use_with radius) \
-		"${myconf[@]}" \
-		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-		--sysconfdir="/etc/nagios"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-		NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_preinst() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags that determine what you"
-	elog "are able to monitor. Depending on what you want to monitor, some"
-	elog "or all of these USE flags need to be set."
-	elog
-	elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
index 8beced678194..1e9762f79b2b 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 sparc x86"
 IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
deleted file mode 100644
index 8beced678194..000000000000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
-HOMEPAGE="https://www.monitoring-plugins.org/"
-SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
-	curl? (
-		dev-libs/uriparser
-		net-misc/curl
-	)
-	ldap? ( net-nds/openldap )
-	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-		gnutls? ( net-libs/gnutls )
-	)
-	radius? ( net-dialup/freeradius-client )"
-
-DEPEND="${REAL_DEPEND}
-	dns? ( net-dns/bind-tools )
-	game? ( games-util/qstat )
-	fping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( net-misc/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
-	acct-group/nagios
-	acct-user/nagios
-	!net-analyzer/nagios-plugins"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with !gnutls openssl /usr)
-				  $(use_with gnutls gnutls /usr) )
-	else
-		myconf+=( --without-openssl )
-		myconf+=( --without-gnutls )
-	fi
-
-	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered. Bug #468296.
-	myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with curl libcurl) \
-		$(use_with curl uriparser) \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		$(use_with radius) \
-		"${myconf[@]}" \
-		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-		--sysconfdir="/etc/nagios"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-		NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags that determine what you"
-	elog "are able to monitor. Depending on what you want to monitor, some"
-	elog "or all of these USE flags need to be set."
-	elog
-	elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 8a0ebd8d3e26..0c0d977ec8cc 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -17,8 +17,8 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.1.tar.gz 6781346 BLAKE2B 4242ca77372005f995dfd228bec51d35b6b0f8c0ab0e44ed40cdb3cc0578b64e97444ffcb074dceca30739deadb46e68f1c75e87d3f1768d81b5e084b0fc0f5f SHA512 ae158ab41961ee2064d85187337979e6ff6ba90f3136b8a960e9ae46ee1408d9d2f0c5c4dfc3a3302e6dbb357cddf1221489435288c4f52182a03e94a9e450c3
 DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
-EBUILD net-snmp-5.9-r2.ebuild 5608 BLAKE2B 17feaec47a68f5665973fe3e4fcd15af4e7c4573b8f9f6a84afe92672bdf307105d34045229b288afccaea0e16af8f23e3ad969518e6ef82d523b513e94b1401 SHA512 a7300befc2a3881a35cc93a02d7220ffc00fc17a2381a43a0f2a4125087db5b9bc43df33dbacaa7369a13fc4d5b2c4d9cf69eb64fd2ee4d6df915385274e0d5a
-EBUILD net-snmp-5.9-r3.ebuild 5635 BLAKE2B 8fb50677140ae8caf1a56b48dce264f8365defb02c15520136c0e3a5918584fa32f2746e84273818f938c55299a3fdf1a4ec2b163cf8aa455016783a5caa0675 SHA512 2a67bfaa5f11412afa6554f90ae16f39bc3363b0e24f4a4e79e719988c013915870621f25f35c20124b94d4d61d163baa12ca07ce18400172f74ef5fdd6c3501
-EBUILD net-snmp-5.9.1.ebuild 5614 BLAKE2B af8ab61e148bc9365b8699ece5f3187f71dc89aa92b74581ab7ba2fd1c3fc78af031c0f37e695c4911245c49049e884bf70e854b2bb1c7eb3e9e2c17f68be67c SHA512 2abbabb0770c21d55f743701a658a962c799b638c0fb59acde91a46561c6f89d6cb7da9b4695670d08379d7d3d55e7f7b7473f225968e8831615611455f7ba54
-EBUILD net-snmp-99999999.ebuild 5549 BLAKE2B b64e1ae224dda1392ae768d0c56dcd6a09d5cf55fe7c5634a0939f855e181984dd5d05796bed0008b3255fbb4db52275a1ace5fa45216153f9ebbb399f31bc2b SHA512 a46dea376c2ff87316ea32d6af07e2a7f24b862d53ef5044570cdd942574b7a728b637416f0c051f7e8360046045991165abc13f64ebfc7143e8396d5c3a255f
+EBUILD net-snmp-5.9-r4.ebuild 5629 BLAKE2B 439d9cd186268992d80e9eb16a2bf6e12f0de8b90a2ab26aa2e2dff051935eca0ba311b1846d8d2cf1e36bf0eb6e4e01970a41c70bf6db18b7aa4921a5ff7206 SHA512 6d7f7dd284a1e2c7d1e51baa7859730e6d9c2377c1d0b5a47da2a91c64f61eac022670f7753a584033957420b70ca7eef337d114481450c7b79605d38d960649
+EBUILD net-snmp-5.9-r5.ebuild 5662 BLAKE2B d14240cfddbef0c37f02bbbd1c800150bfcbcdf7f6393b623fa46c68db6d73c959b0fca8c0061d6c47f06de8b66cd9fcb8c764b5d00737691ada8b355139502a SHA512 9d49e677d6043923dab24b4f6d16d7cdb95654b4821cbcecb8ea78482945f6be628feeb97f06566bfb7711e694ac9f1c4048917053a798fdf255ce7e4e5f4131
+EBUILD net-snmp-5.9.1-r1.ebuild 5634 BLAKE2B 58de0495733237de84445e4f58916c8ad33f094b3b604ebf81eb3fa2848ea3b702403981a9a86b952b01777d9a28a2446ffdfac2b70cb9e568fb1f928e0f349f SHA512 b9843b80740af9b420fd6995862b5d5e0908d58de62b1ee1c83ee28269b54843742b20b518d0623fa073b56826627cab09ecc3ce641f0be53887eef53952bb6d
+EBUILD net-snmp-99999999.ebuild 5569 BLAKE2B 480033a169a3b41ebd885b4509f9fbc7dc2bddaa1c92a15b49dd9404873164b820c1848231e7ad85aec518077a25c3b710a2dce1f0d93e41f6be75719b47df2f SHA512 0fcef63310424172ce656f5317089571b8d3193e33754f13ecb9dbd6c63745b0bd5f60db8d0f626658362becec6a7a05f1eb45e64025c4db9ba0051ab292a3b5
 MISC metadata.xml 1383 BLAKE2B 66b4b2fb72a10c172e0ccdc89aa8903176393f381762e467b1bf7f16be20896b94ea68c67d125f5db7c42c85093f8b4208ded932afebee4a52e47bb691cf708b SHA512 6468e1fcfcbf83104c6165728825d36160e8df8975bc88a8933b6bfd4b28185ba08608e01d7721858760d47bb70d637ca36c6a3e443f02fb799a27fd89a60627
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
deleted file mode 100644
index 5ee941602786..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_OPTIONAL=yesplz
-DISTUTILS_SINGLE_IMPL=yesplz
-GENTOO_DEPEND_ON_PERL=no
-PATCHSET=3
-PYTHON_COMPAT=( python3_{7,8,9} )
-WANT_AUTOMAKE=none
-inherit autotools distutils-r1 perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-	https://dev.gentoo.org/~jer/${P}.tar.xz
-"
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0/40"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="
-	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
-	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
-"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-
-COMMON_DEPEND="
-	bzip2? ( app-arch/bzip2 )
-	elf? ( dev-libs/elfutils )
-	lm-sensors? ( sys-apps/lm-sensors )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	netlink? ( dev-libs/libnl:3 )
-	pcap? ( net-libs/libpcap )
-	pci? ( sys-apps/pciutils )
-	perl? ( dev-lang/perl:= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	ssl? (
-		>=dev-libs/openssl-0.9.6d:0=
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-RESTRICT=test
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
-	"${FILESDIR}"/${PN}-5.8-pcap.patch
-	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
-	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
-	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
-	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
-	"${FILESDIR}"/${PN}-99999999-tinfo.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
-	eapply "${WORKDIR}"/patches/*.patch
-
-	default
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with kmem kmem-usage) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pcap) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--disable-static \
-		--enable-shared \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	emake sedscript
-
-	local subdir
-	for subdir in snmplib agent/mibgroup agent apps .; do
-		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
-	done
-
-	use doc && emake docsdox
-}
-
-src_install() {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/html/*
-	fi
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild
deleted file mode 100644
index 3a88621c46cb..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=yes
-DISTUTILS_SINGLE_IMPL=yes
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8,9} )
-WANT_AUTOMAKE=none
-
-inherit autotools distutils-r1 perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-	https://dev.gentoo.org/~jer/${P}.tar.xz
-"
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0/40"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="
-	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
-	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
-"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	bzip2? ( app-arch/bzip2 )
-	elf? ( dev-libs/elfutils )
-	lm-sensors? ( sys-apps/lm-sensors )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	netlink? ( dev-libs/libnl:3 )
-	pcap? ( net-libs/libpcap )
-	pci? ( sys-apps/pciutils )
-	perl? ( dev-lang/perl:= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	ssl? (
-		>=dev-libs/openssl-0.9.6d:0=
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
-	"${FILESDIR}"/${PN}-5.8-pcap.patch
-	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
-	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
-	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
-	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
-	"${FILESDIR}"/${PN}-5.9-r3-f2fs.patch
-	"${FILESDIR}"/${PN}-99999999-tinfo.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
-	eapply "${WORKDIR}"/patches/*.patch
-
-	default
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with kmem kmem-usage) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pcap) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--disable-static \
-		--enable-shared \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	emake sedscript
-
-	local subdir
-	for subdir in snmplib agent/mibgroup agent apps .; do
-		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
-	done
-
-	use doc && emake docsdox
-}
-
-src_install() {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/html/*
-	fi
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
new file mode 100644
index 000000000000..85e04734976d
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=yesplz
+DISTUTILS_SINGLE_IMPL=yesplz
+GENTOO_DEPEND_ON_PERL=no
+PATCHSET=3
+PYTHON_COMPAT=( python3_{7,8,9} )
+WANT_AUTOMAKE=none
+inherit autotools distutils-r1 perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://www.net-snmp.org/"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+	https://dev.gentoo.org/~jer/${P}.tar.xz
+"
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/40"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="
+	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
+	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	bzip2? ( app-arch/bzip2 )
+	elf? ( dev-libs/elfutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	pci? ( sys-apps/pciutils )
+	perl? ( dev-lang/perl:= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	ssl? (
+		>=dev-libs/openssl-0.9.6d:0=
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+RESTRICT=test
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
+	"${FILESDIR}"/${PN}-5.8-pcap.patch
+	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
+	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
+	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+	"${FILESDIR}"/${PN}-99999999-tinfo.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pcap) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--disable-static \
+		--enable-shared \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	emake sedscript
+
+	local subdir
+	for subdir in snmplib agent/mibgroup agent apps .; do
+		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
+	done
+
+	use doc && emake docsdox
+}
+
+src_install() {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
new file mode 100644
index 000000000000..2446c7771b5c
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=yes
+DISTUTILS_SINGLE_IMPL=yes
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{7,8,9} )
+WANT_AUTOMAKE=none
+
+inherit autotools distutils-r1 perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://www.net-snmp.org/"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+	https://dev.gentoo.org/~jer/${P}.tar.xz
+"
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/40"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="
+	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
+	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	bzip2? ( app-arch/bzip2 )
+	elf? ( dev-libs/elfutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	pci? ( sys-apps/pciutils )
+	perl? ( dev-lang/perl:= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	ssl? (
+		>=dev-libs/openssl-0.9.6d:0=
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
+	"${FILESDIR}"/${PN}-5.8-pcap.patch
+	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
+	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
+	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+	"${FILESDIR}"/${PN}-5.9-r3-f2fs.patch
+	"${FILESDIR}"/${PN}-99999999-tinfo.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pcap) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--disable-static \
+		--enable-shared \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	emake sedscript
+
+	local subdir
+	for subdir in snmplib agent/mibgroup agent apps .; do
+		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
+	done
+
+	use doc && emake docsdox
+}
+
+src_install() {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
new file mode 100644
index 000000000000..ac38c56a767e
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=yes
+DISTUTILS_SINGLE_IMPL=yes
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{7,8,9} )
+WANT_AUTOMAKE=none
+
+inherit autotools distutils-r1 perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://www.net-snmp.org/"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+	https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/40"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="
+	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
+	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	bzip2? ( app-arch/bzip2 )
+	elf? ( dev-libs/elfutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	pci? ( sys-apps/pciutils )
+	perl? ( dev-lang/perl:= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	ssl? (
+		>=dev-libs/openssl-0.9.6d:0=
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
+	"${FILESDIR}"/${PN}-5.8-pcap.patch
+	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
+	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
+	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+	"${FILESDIR}"/${PN}-99999999-tinfo.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pcap) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--disable-static \
+		--enable-shared \
+		--with-default-snmp-version="3" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	emake sedscript
+
+	local subdir
+	for subdir in snmplib agent/mibgroup agent apps .; do
+		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
+	done
+
+	use doc && emake docsdox
+}
+
+src_install() {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.1.ebuild
deleted file mode 100644
index a33f94b2f9ae..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.9.1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=yes
-DISTUTILS_SINGLE_IMPL=yes
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8,9} )
-WANT_AUTOMAKE=none
-
-inherit autotools distutils-r1 perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-	https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0/40"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="
-	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
-	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
-"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	bzip2? ( app-arch/bzip2 )
-	elf? ( dev-libs/elfutils )
-	lm-sensors? ( sys-apps/lm-sensors )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	netlink? ( dev-libs/libnl:3 )
-	pcap? ( net-libs/libpcap )
-	pci? ( sys-apps/pciutils )
-	perl? ( dev-lang/perl:= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	ssl? (
-		>=dev-libs/openssl-0.9.6d:0=
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
-	"${FILESDIR}"/${PN}-5.8-pcap.patch
-	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
-	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
-	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
-	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
-	"${FILESDIR}"/${PN}-99999999-tinfo.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
-	eapply "${WORKDIR}"/patches/*.patch
-
-	default
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with kmem kmem-usage) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pcap) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--disable-static \
-		--enable-shared \
-		--with-default-snmp-version="3" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	emake sedscript
-
-	local subdir
-	for subdir in snmplib agent/mibgroup agent apps .; do
-		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
-	done
-
-	use doc && emake docsdox
-}
-
-src_install() {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/html/*
-	fi
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index 652062a60647..5517dfe32065 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -32,6 +32,7 @@ REQUIRED_USE="
 RESTRICT="test"
 
 COMMON_DEPEND="
+	virtual/libcrypt:=
 	bzip2? ( app-arch/bzip2 )
 	elf? ( dev-libs/elfutils )
 	lm-sensors? ( sys-apps/lm-sensors )
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index f1fdd52fdd34..702e9b4eb5e7 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -3,5 +3,5 @@ DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c572
 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812
 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46
 EBUILD netcat-110-r9.ebuild 1648 BLAKE2B fa3fc6c694fc056d1f55d96855784ff492a40d312639820519a786b24549e9031e43016ea791d99fdc82c06fd7c4e0d2ffa59d85e9159948d4f1fd830ae53645 SHA512 2d35b812bafa2865c55370c4825e78e53a5c9f2bb7add8f64194713312856872ac2a37de4b5aa69a23fc45fa96c413ee77e450c2e93c750c8f01c0ca93be956c
-EBUILD netcat-110.20180111-r1.ebuild 1313 BLAKE2B 0a8c5670241d928d62dc4bd180fc32f368b158cd983a59b84bcd41c6a89fe3d4dcbeec067dd28fb506f1cc9e6771d350d7390cf412d9ef920173b36c9204106e SHA512 73b1be505bfccfa2e150cb9618f69c27db596ed1ca6f845ee187c864b8ef153ddc3bf835eb31522308fc0894cabc96240999be24e8f906ab898435efc67b6f34
+EBUILD netcat-110.20180111-r1.ebuild 1320 BLAKE2B bcbffe3eb6c486b9500b8ab08c1ad097ece37ddb05966814d3e55a0cf9af501f146307bc489e9fcd9a2cc427be66d6125c12a730ecee65d83056d29334cd9f28 SHA512 9407ca2c7173f8faa09716ebf1f42e61349a125643af6f7318080cf8899626c85db707df0c9fef64fdce5166fa32ecedbad95ce4f68bfb829869600d72930225
 MISC metadata.xml 520 BLAKE2B 554d3e1e5b791ebc008ad728157d01fd711b4e57d96ef0294c55e43bb21d6b0bd6a606aa9e5b5cfd6b768d362f260dea119f662bd31b24594a55652a1c5ddd22 SHA512 1b5f4d4aa398bbe08e2bb73c609624e6ed320d39e96531a328fb0547e6a0dda5bbf72aaee358948e2f06c60d578f91a51965fc268601b044c16cc62a2829a3e9
diff --git a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
index bbbdcf9ba346..3e8c204b0133 100644
--- a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
+++ b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/nc110"
 
 LICENSE="netcat"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ipv6 static"
 
 src_prepare() {
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index d37121cccec6..bdf0f2ba6379 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -6,5 +6,5 @@ AUX netperf-2.7.0-inline.patch 902 BLAKE2B d31b677da87044cc87779013e3c12b88ea82e
 AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc
 AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
-EBUILD netperf-2.7.0-r2.ebuild 1898 BLAKE2B 6910a1658dc4576594b8df29a0fc4280cde378832330afe791fec3c1b50c58b0669a2a29f1c08a39573ca0d27076b4b5bdfac79b3b89b7238f43929add57873c SHA512 1e7bf240e650e62a2b7e59570a1aa04ea67e79e6895a9b88b6ae1ad24df44c44d224dac6456e2ab4ffa43efe511c8329ceb127574343a655587ca0e31aba8f47
+EBUILD netperf-2.7.0-r3.ebuild 1910 BLAKE2B 2201aa7888ebbbfe4d999d1e76c161966d01b8a4e6b5f89e23569d705e2409361166ac7d6facd2b811ed483a585ed14abf03d0e6273ff812de587bc6b6a4ae0a SHA512 beeac77a9eecfe95f3db6be742022c9d0b36261a167ff77203dcff251b7a154615a9c39690c4cb0a4e019b913127aa996f8d81399889647f786ec3bb1b8e6e64
 MISC metadata.xml 855 BLAKE2B 20c4b64a1abe9e4f83a56e759b9d7cfb161886dd06a4672dc96828a80d3f91c064665138a87c263815c217091a869e7ced811fca059405bf047de337814c52a5 SHA512 628efc289da10094d7fab1c0c47e8acd67260fffc036e2d4eaa1430e1b91fd2610d681134211cff4dcd5f84858199a4bbf36aaaa73f3e507bef1114a64b4e588
diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
deleted file mode 100644
index 6a56ebb79e3c..000000000000
--- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic user
-
-DESCRIPTION="Network performance benchmark"
-SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-HOMEPAGE="http://www.netperf.org/"
-LICENSE="netperf"
-SLOT="0"
-IUSE="demo sctp"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-scripts.patch
-	"${FILESDIR}"/${PN}-2.6.0-log-dir.patch
-	"${FILESDIR}"/${PN}-2.7.0-includes.patch
-	"${FILESDIR}"/${PN}-2.7.0-space.patch
-	"${FILESDIR}"/${PN}-2.7.0-inline.patch
-)
-
-pkg_setup() {
-	enewuser netperf
-	enewgroup netperf
-}
-
-src_prepare() {
-	# Fixing paths in scripts
-	sed -i \
-		-e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
-		doc/examples/sctp_stream_script \
-		doc/examples/tcp_range_script \
-		doc/examples/tcp_rr_script \
-		doc/examples/tcp_stream_script \
-		doc/examples/udp_rr_script \
-		doc/examples/udp_stream_script \
-		|| die
-
-	default
-}
-
-src_configure() {
-	append-cflags -fcommon
-
-	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
-	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
-	append-cppflags -D_GNU_SOURCE
-
-	econf \
-		$(use_enable demo) \
-		$(use_enable sctp)
-}
-
-src_install() {
-	default
-
-	# Move netserver into sbin as we had it before 2.4 was released with its
-	# autoconf goodness
-	dodir /usr/sbin
-	mv "${ED}"/usr/{bin,sbin}/netserver || die
-
-	# init.d / conf.d
-	newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf
-	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
-
-	keepdir /var/log/${PN}
-	fowners netperf:netperf /var/log/${PN}
-	fperms 0755 /var/log/${PN}
-
-	# documentation and example scripts
-	dodoc AUTHORS ChangeLog NEWS README Release_Notes
-	dodir /usr/share/doc/${PF}/examples
-	# Scripts no longer get installed by einstall
-	cp doc/examples/*_script "${ED}"/usr/share/doc/${PF}/examples || die
-}
diff --git a/net-analyzer/netperf/netperf-2.7.0-r3.ebuild b/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
new file mode 100644
index 000000000000..93441fc7cb54
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Network performance benchmark"
+SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+IUSE="demo sctp"
+
+DEPEND="
+	acct-group/netperf
+	acct-user/netperf
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-fix-scripts.patch
+	"${FILESDIR}"/${PN}-2.6.0-log-dir.patch
+	"${FILESDIR}"/${PN}-2.7.0-includes.patch
+	"${FILESDIR}"/${PN}-2.7.0-space.patch
+	"${FILESDIR}"/${PN}-2.7.0-inline.patch
+)
+
+src_prepare() {
+	# Fixing paths in scripts
+	sed -i \
+		-e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
+		doc/examples/sctp_stream_script \
+		doc/examples/tcp_range_script \
+		doc/examples/tcp_rr_script \
+		doc/examples/tcp_stream_script \
+		doc/examples/udp_rr_script \
+		doc/examples/udp_stream_script \
+		|| die
+
+	default
+}
+
+src_configure() {
+	append-cflags -fcommon
+
+	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
+	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
+	append-cppflags -D_GNU_SOURCE
+
+	econf \
+		$(use_enable demo) \
+		$(use_enable sctp)
+}
+
+src_install() {
+	default
+
+	# Move netserver into sbin as we had it before 2.4 was released with its
+	# autoconf goodness
+	dodir /usr/sbin
+	mv "${ED}"/usr/{bin,sbin}/netserver || die
+
+	# init.d / conf.d
+	newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf
+	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
+
+	keepdir /var/log/${PN}
+	fowners netperf:netperf /var/log/${PN}
+	fperms 0755 /var/log/${PN}
+
+	# documentation and example scripts
+	dodoc AUTHORS ChangeLog NEWS README Release_Notes
+	dodir /usr/share/doc/${PF}/examples
+	# Scripts no longer get installed by einstall
+	cp doc/examples/*_script "${ED}"/usr/share/doc/${PF}/examples || die
+}
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 2e31899b5ba2..0d46c108bd10 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -2,7 +2,6 @@ AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2
 AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab
 AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8
 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
-AUX nfdump-1.6.21-remove-strict-rfc-7011-handling.patch 1726 BLAKE2B 6f2d2c0ebb336eafba60aabec9bc2eb120c61b67401704786ed105eaeba090d893004ea4c8be4e40b360cf91c2b306c4cbb9ef9f60dc6b5c3b92fe1c5c5d904f SHA512 e7ca0512b01a0838ec9a6d52710da23ce6db5021af19a354bc59cbaf7c6b246fee50e7c3ae9b71eb34e94396cffba7f1069140c0f476c8a2b61fa9a06113f425
 AUX nfdump-1.6.22-libtool-archives-slibtool.patch 3503 BLAKE2B 1118f50a17b134dfbd93cbb66e54c3228906782fabc6e0df174c912569120c588a03170a8bfd715389611b0dcc5b469415d2932f610f8b5398b8424f6e0c5342 SHA512 646606077ef1771b8f4c776939773ab7b2875c4f28710f44df826b7d8d5e5b8a163fff60eb6869ee4dfab8a7edc0f277e19ed88511719d2455b9bc5133e81124
 DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61
 DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch
deleted file mode 100644
index a36af2242d42..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f5ae2b821c22ebe0c96f3516d4e90f4255633828 Mon Sep 17 00:00:00 2001
-From: Peter Haag <peter@people.ops-trust.net>
-Date: Sat, 8 Aug 2020 16:46:04 +0200
-Subject: [PATCH] Re-address issue #231 - remove strict rule rfc 7011
-
----
- ChangeLog   | 3 +++
- bin/ipfix.c | 3 ---
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index a0b2b67..8b92e58 100755
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,6 @@
-+2020-08-02
-+- Re-address issue #231 - remove strict rule rfc 7011
-+
- 2020-08-02
- - Release 1.6.21
- - Address issue #159. Implement rfc 7011 and include sender UDP port into unique template identification
-diff --git a/bin/ipfix.c b/bin/ipfix.c
-index a730a8b..19c9d63 100644
---- a/bin/ipfix.c
-+++ b/bin/ipfix.c
-@@ -158,7 +158,6 @@ typedef struct exporterDomain_s {
- 
- 	// exporter information
- 	exporter_info_record_t info;
--	in_port_t	port;				// follow rfc 7011 - matching src port
- 
- 	uint64_t	packets;			// number of packets sent by this exporter
- 	uint64_t	flows;				// number of flow records sent by this exporter
-@@ -383,7 +382,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain);
- 
- 	while ( *e ) {
- 		if ( (*e)->info.id == ObservationDomain && (*e)->info.version == 10 && 
--			 (*e)->port == fs->port &&
- 			 (*e)->info.ip.V6[0] == fs->ip.V6[0] && (*e)->info.ip.V6[1] == fs->ip.V6[1]) 
- 			return *e;
- 		e = &((*e)->next);
-@@ -412,7 +410,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain);
- 	(*e)->info.header.size  = sizeof(exporter_info_record_t);
- 	(*e)->info.id 			= ObservationDomain;
- 	(*e)->info.ip			= fs->ip;
--	(*e)->port				= fs->port;
- 	(*e)->info.sa_family	= fs->sa_family;
- 	(*e)->info.version 		= 10;
- 	(*e)->info.sysid	 	= 0;
diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest
index 4394008cc7bf..41f71b6fb5b0 100644
--- a/net-analyzer/scanlogd/Manifest
+++ b/net-analyzer/scanlogd/Manifest
@@ -2,6 +2,6 @@ AUX scanlogd-2.2.7-gentoo.patch 407 BLAKE2B e859b5d31f0a599f7a7a10863b1a88344055
 AUX scanlogd.rc 382 BLAKE2B 086a833826e21d94c5e8d8bca522dcd69f8a1d42164094b0bcbf9141353e9b3dcb09d718a6c0b4e2b3c4ba7a2dda1fe01700085a3c910b7b169cda79382ce1d2 SHA512 d4f5a640fa9a6a44370fafb621ee8fd91357b0870d04d6852017ca4c108a50a1d76a6e1ac09dcf76f3238893c6084fb998e69b5f5f227b72b8307c8e1d6dc170
 DIST scanlogd-2.2.7.tar.gz 11352 BLAKE2B 480e1ef78ac35ff04fb44961aa501f997786e20a3501f54f74b9e5761edba4736341d364a9a10772d795cb6025b88399bf3b56b0a980a0d2d0787f7a66eeeb22 SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b
 DIST scanlogd-2.2.8.tar.gz 12190 BLAKE2B 26396c3174de3d3cceed9833354cae7d7bbcf3078a81472ae1fa28856f011e6984fa8182a994d5a10632c19f15f86e31f1ee73309273cad04e05fec942afa0a4 SHA512 92f7a28dd40593dad6afae4fd0572efeceea3f43f334ff82c349538d4a28e9ab624912f82fc5c102a4a9937009bbf7b76a81029588e2815ff9b305144143572a
-EBUILD scanlogd-2.2.7.ebuild 947 BLAKE2B 20bef542281a5979bb04919116210524eef1d4115013f645d6eb9514f70ca4d70dbc691036f2a14cf68b1a6aa501e99ab1c749931921ed658b015f62b679ef78 SHA512 fbb3e20a7d7e91fff05c0093593a599f76393635518dc1313ff520a392e4238f199de538400a2ede78a30a4ae9956f14d59b70e18833b654b0ac15c783b58208
-EBUILD scanlogd-2.2.8.ebuild 963 BLAKE2B 327c2ba0abf77d73676381e6731ec3108859feda67063cadd95650335ba53f5b17419cbe7e53953df10148c54de8920921727eb438d0d7f9a08ebfa7994e5632 SHA512 cc1285616e9700f2b0b607593f41b501ca62ab61ca4694b5debd70203933fa6b188cc738175640d5ab84af73029b176e3744705226de6fd44a057b92997f168d
+EBUILD scanlogd-2.2.7-r1.ebuild 903 BLAKE2B 81092044beb603269002db1767c42c2d9a1028842307f012699ca8f2d2c5673f7d4ffe30346e349e667b9c7d0a3e901fbdaf7ea5eddbbb75b52a4e68807a7625 SHA512 eceb8f2d589dbcc0e4786a34e6f8c9ef3a7037715cdfa133da2e4e1b697222ae224056a537124b95e7032e684165c99e47661561d9342a8d64d5c1e0342ca3f7
+EBUILD scanlogd-2.2.8-r1.ebuild 919 BLAKE2B b0b643c645c3158a1d221a0783ab975667818a01c72aa2782348a45c5c53be6c4f2389485e204ed5044f1c722f85ef9a0bb47acabcd8bab2c5669cd7453bc4bc SHA512 197f6aba10a39537aa2d561df78fdd44ac770de8f65a49d2526d46787b4a8c4bbcfbfd4c73f5d9e90623bc23291e8fb7f52ae022912c8a79f9d7c03e425bd806
 MISC metadata.xml 443 BLAKE2B d202f0eaa045670664aaf485c576200a334ba1345a0b03f551e2aa6501e489fbbbd76a9e2fb848a5e8a8e1f8817997c0a00ee41dd048d7a3786d1db90506f92c SHA512 85a26f92ab115fb66fe3d6658ec35891b7a2a45a27e44aa02bf0524e61ee3b517cc3cefa2ffb72c7c1ba8ca306e209e8c411da0e5071b3fc6781747e407f7526
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
new file mode 100644
index 000000000000..7598563d3815
--- /dev/null
+++ b/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="A port scan detection tool"
+SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz"
+HOMEPAGE="http://www.openwall.com/scanlogd/"
+
+LICENSE="scanlogd GPL-2" # GPL-2 for initscript
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE="+nids pcap"
+REQUIRED_USE="?? ( nids pcap )"
+
+DEPEND="
+	nids? ( net-libs/libnids )
+	pcap? ( net-libs/libpcap )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/scanlogd
+	acct-user/scanlogd
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	restore_config params.h
+	tc-export CC
+}
+
+src_compile() {
+	local target=linux
+	use nids && target=libnids
+	use pcap && target=libpcap
+	emake ${target}
+}
+
+src_install() {
+	dosbin scanlogd
+	doman scanlogd.8
+	newinitd "${FILESDIR}"/scanlogd.rc scanlogd
+	save_config params.h
+}
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
deleted file mode 100644
index 7fb4b5b2a9d4..000000000000
--- a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit savedconfig toolchain-funcs user
-
-DESCRIPTION="A port scan detection tool"
-SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz"
-HOMEPAGE="http://www.openwall.com/scanlogd/"
-
-LICENSE="scanlogd GPL-2" # GPL-2 for initscript
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="+nids pcap"
-REQUIRED_USE="?? ( nids pcap )"
-
-DEPEND="
-	nids? ( net-libs/libnids )
-	pcap? ( net-libs/libpcap )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	restore_config params.h
-	tc-export CC
-}
-
-src_compile() {
-	local target=linux
-	use nids && target=libnids
-	use pcap && target=libpcap
-	emake ${target}
-}
-
-src_install() {
-	dosbin scanlogd
-	doman scanlogd.8
-	newinitd "${FILESDIR}"/scanlogd.rc scanlogd
-	save_config params.h
-}
-
-pkg_preinst() {
-	enewgroup scanlogd
-	enewuser scanlogd -1 -1 /dev/null scanlogd
-}
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
new file mode 100644
index 000000000000..df7a9b460ecc
--- /dev/null
+++ b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="A port scan detection tool"
+SRC_URI="https://www.openwall.com/scanlogd/${P}.tar.gz"
+HOMEPAGE="https://www.openwall.com/scanlogd/"
+
+LICENSE="scanlogd GPL-2" # GPL-2 for initscript
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+nids pcap"
+REQUIRED_USE="?? ( nids pcap )"
+
+DEPEND="
+	nids? ( net-libs/libnids )
+	pcap? ( net-libs/libpcap )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/scanlogd
+	acct-user/scanlogd
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.7-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	restore_config params.h
+
+	tc-export CC
+}
+
+src_compile() {
+	local target=linux
+
+	use nids && target=libnids
+	use pcap && target=libpcap
+	emake ${target}
+}
+
+src_install() {
+	dosbin scanlogd
+
+	doman scanlogd.8
+	newinitd "${FILESDIR}"/scanlogd.rc scanlogd
+
+	save_config params.h
+}
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.8.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.8.ebuild
deleted file mode 100644
index c21dc3ec5c8f..000000000000
--- a/net-analyzer/scanlogd/scanlogd-2.2.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit savedconfig toolchain-funcs user
-
-DESCRIPTION="A port scan detection tool"
-SRC_URI="https://www.openwall.com/scanlogd/${P}.tar.gz"
-HOMEPAGE="https://www.openwall.com/scanlogd/"
-
-LICENSE="scanlogd GPL-2" # GPL-2 for initscript
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+nids pcap"
-REQUIRED_USE="?? ( nids pcap )"
-
-DEPEND="
-	nids? ( net-libs/libnids )
-	pcap? ( net-libs/libpcap )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.7-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	restore_config params.h
-
-	tc-export CC
-}
-
-src_compile() {
-	local target=linux
-
-	use nids && target=libnids
-	use pcap && target=libpcap
-	emake ${target}
-}
-
-src_install() {
-	dosbin scanlogd
-
-	doman scanlogd.8
-	newinitd "${FILESDIR}"/scanlogd.rc scanlogd
-
-	save_config params.h
-}
-
-pkg_preinst() {
-	enewgroup scanlogd
-	enewuser scanlogd -1 -1 /dev/null scanlogd
-}
diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest
index a509c5b73df6..81af2aaf51c5 100644
--- a/net-analyzer/scanssh/Manifest
+++ b/net-analyzer/scanssh/Manifest
@@ -1,5 +1,5 @@
 AUX scanssh-2.0-fix-warnings.diff 1071 BLAKE2B c92997cd26cd03ec451ebf83a54f19ba86d6b33f90dd666c8637fceb222849b3d2703ca9c8c1645a95186059ccf049ae462d7a4c58486ee8c0d086cb8f73e625 SHA512 b9080dbe7551e905db0744ca36b8690d05d784ad7c4c77f4fcbe64ff603353e998cc28ae45c26e230f594278cdb6f130029aa633166e6636933be44845c27b06
 AUX scanssh-2.0-libdir.diff 4916 BLAKE2B 23fb00f8880e9a2407e919c626328430fc7c09d21bcdb535cf2411b41fc4c623ab04e2411dbdd239e62cc4f6545b9d67d29bab879f6ac268c241d1cd884b2592 SHA512 be01518f156b724439837150f9f02148d6f92c0bac2557419f2f9def9244d29006a6c84ceecf193b6f57830c697d9b650102625cf78787fc59709a2ef2b7847f
 DIST scanssh-2.1.2.tar.gz 147470 BLAKE2B 4cb31a27dd925f071bcb958fc72bef7b7f0455b7d718a15536dae40cee969739628da64a3972e2c5cc9813ef24c5634ca019571783ea20df87c7df80f32da876 SHA512 af4e705c43156b907d6864b12f5832bb4e43d0ff284e34e96b32bbe7986299954d1175880ffe7588f91a939d140b45592fc72dc2bf397f140aed929dbe44a453
-EBUILD scanssh-2.1.2.ebuild 853 BLAKE2B f0d75a289370b7d1dca290e1865181eb758bae4a2f740f7cfd8e327ef054262306f74033e0c9bf7551cd57901e83c17bb10155d24068dd0a31dde53c05cb8cab SHA512 c0d3d279f685f27aa46e8194fe00af6b93354157deefb1ec926e38203409a7312b58b9305c96cb3bf5457adbe118f5343f969004fcdb2bedb99b006c18cdcf8d
+EBUILD scanssh-2.1.2.ebuild 860 BLAKE2B 0d8ba021d32cf1656aa6823c96e716f3120ee3406de26bd78f827d13257c88a9acf54865c1b191a65c89c194bffd1e3dc34de664eb2f17bfe0bee9c9dbb31135 SHA512 acfa6e2a2f041773d15d8894ce95c2be194f100c9276f47081b5ad371299190620813f20c989ce065de6eb6950e1478ea5df35a607c81f86b8d43246869273d9
 MISC metadata.xml 436 BLAKE2B a9ebfd202e124281faf98318aafe911ae9e32201540c68b5e0bc4246d56af9695bb1f3f55b50bf04ffb13afddc8128fb15d75e7995a986577529c2c527278595 SHA512 98f0bb0894f2208336cb9e42bc4445a13c01a851d1a0f964519029c639ec37d7d476cc128e0e9acc0558ad23f2312c8189784f7e08a4cd0e80fb92823fce1da7
diff --git a/net-analyzer/scanssh/scanssh-2.1.2.ebuild b/net-analyzer/scanssh/scanssh-2.1.2.ebuild
index 54e673333041..02520623012d 100644
--- a/net-analyzer/scanssh/scanssh-2.1.2.ebuild
+++ b/net-analyzer/scanssh/scanssh-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ofalk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~riscv sparc x86"
 
 DEPEND="
 	dev-libs/libdnet
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
index 135abdcaf99d..b89822176e00 100644
--- a/net-analyzer/sguil-sensor/Manifest
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -2,5 +2,5 @@ AUX log_packets.confd 527 BLAKE2B 568a785fab6f027218269378d345986c354246dad66673
 AUX log_packets.initd 2093 BLAKE2B a251bc9692a599e66943d5b3f6615f281d7872da22a76699875853f72836102cdb94fdf558250ee74e8618f8c45725dea0410e5fb635f153aadf5499575b4fe9 SHA512 43bc027f4769e986641a9820a1dfcb8a794ae417cb49efe333fd6a960953e1f9854c660e95ae9c0e14f4c1ec59da9e3096ae7352bbbb77805dc71729ed76514d
 AUX sensor_agent.initd 742 BLAKE2B 6d8a1aee38f81f4d9d971ec3a2d56112c0789ca60d5ee51ff7444109e55ddac889db81199e5883070031fe247cc06506febcb3ae27b5a215974a4f953121b887 SHA512 3a025479579ee9eec6a26d2a2c70efc362d37b7821dfa211236d8fe9dc2ea7b7b0694dccfd9b208655702401c1b0e3ecb08bac9e3b177ee77f161e5c774c1611
 DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
-EBUILD sguil-sensor-1.0.0-r1.ebuild 2221 BLAKE2B 43bfb72e7e71d1439b1ed4a69f7266bb48c27e70f56250cfe61b15586be71bcca8159103db13c0b303ff5d43aa1f999db1c4418ef6f17c37679b82748bda42d2 SHA512 6153b71c0dbba34bfba56d4d760ee6fa7b9b82c9e5e9932401454398f2620fe01ce44e80556bcf8d4e67fe28c95f05d5c3adf411ade18978cf7f708d059a289b
+EBUILD sguil-sensor-1.0.0-r2.ebuild 2172 BLAKE2B 593b13514336c426aab68cd358755fc1d69e56c4aeff981cf695a12518fcffdca896d783e050e40187606fe8620da165f3fc4cc8486427bab0353710698a2d15 SHA512 f91c13a27f86830e127a01bfe051c36aad9e18e8dd3e3c86cc6f49c530b18fa8555e5ef50f3dea6c6c3646c93c5dcefd8189b18462f962f892712875e672e94c
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild
deleted file mode 100644
index 7007abd7517f..000000000000
--- a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-MY_PV="${PV/_p/p}"
-DESCRIPTION="Sensor part of sguil Network Security Monitoring"
-HOMEPAGE="https://github.com/bammv/sguil"
-SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
-
-LICENSE="GPL-3 GPL-2+ QPL-1.0 GPL-2"    # GPL-2 for init script
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-lang/tcl-8.3:0=[-threads]
-	>=dev-tcltk/tclx-8.3
-	dev-tcltk/tls
-	>=net-analyzer/barnyard-0.2.0-r1
-	>=net-analyzer/snort-2.4.1-r1
-	dev-ml/pcre-ocaml
-	net-analyzer/sancp
-"
-
-S="${WORKDIR}/sguil-${MY_PV}"
-
-pkg_setup() {
-	enewgroup sguil
-	enewuser sguil -1 -1 /var/lib/sguil sguil
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:gateway:${HOSTNAME}:" \
-		-e 's:/snort_data:/var/lib/sguil:' \
-		-e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:DEBUG 1:DEBUG 0:g' \
-		sensor/sensor_agent.conf || die
-
-	sed -i \
-		-e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \
-		sensor/sensor_agent.tcl || die
-}
-
-src_install() {
-	dodoc doc/*
-
-	dobin sensor/sensor_agent.tcl
-
-	newinitd "${FILESDIR}/log_packets.initd" log_packets
-	newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent
-	newconfd "${FILESDIR}/log_packets.confd" log_packets
-	insinto /etc/sguil
-	doins sensor/sensor_agent.conf
-
-	# Create the directory structure
-	diropts -g sguil -o sguil
-	keepdir /var/lib/sguil /var/lib/sguil/archive \
-		"/var/lib/sguil/${HOSTNAME}" \
-		"/var/lib/sguil/${HOSTNAME}/portscans" \
-		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
-		"/var/lib/sguil/${HOSTNAME}/dailylogs" \
-		"/var/lib/sguil/${HOSTNAME}/sancp"
-
-}
-
-pkg_postinst() {
-	elog
-	elog "You should check /etc/sguil/sensor_agent.conf and"
-	elog "/etc/init.d/logpackets and ensure that they are accurate"
-	elog "for your environment. They should work providing that you"
-	elog "are running the sensor on the same machine as the server."
-	elog "This ebuild assumes that you are running a single sensor"
-	elog "environment, if this is not the case then you must make sure"
-	elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable."
-	elog "You should crontab the /etc/init.d/log_packets script to restart"
-	elog "each hour."
-	elog
-}
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r2.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..d783b8e9738b
--- /dev/null
+++ b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_p/p}"
+DESCRIPTION="Sensor part of sguil Network Security Monitoring"
+HOMEPAGE="https://github.com/bammv/sguil"
+SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
+S="${WORKDIR}/sguil-${MY_PV}"
+
+LICENSE="GPL-3 GPL-2+ QPL-1.0 GPL-2"    # GPL-2 for init script
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	acct-group/sguil
+	acct-user/sguil
+"
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/tcl-8.3:0=[-threads]
+	>=dev-tcltk/tclx-8.3
+	dev-tcltk/tls
+	>=net-analyzer/barnyard-0.2.0-r1
+	>=net-analyzer/snort-2.4.1-r1
+	dev-ml/pcre-ocaml
+	net-analyzer/sancp
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:gateway:${HOSTNAME}:" \
+		-e 's:/snort_data:/var/lib/sguil:' \
+		-e 's:DAEMON 0:DAEMON 1:' \
+		-e 's:DEBUG 1:DEBUG 0:g' \
+		sensor/sensor_agent.conf || die
+
+	sed -i \
+		-e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \
+		sensor/sensor_agent.tcl || die
+}
+
+src_install() {
+	dodoc doc/*
+
+	dobin sensor/sensor_agent.tcl
+
+	newinitd "${FILESDIR}/log_packets.initd" log_packets
+	newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent
+	newconfd "${FILESDIR}/log_packets.confd" log_packets
+	insinto /etc/sguil
+	doins sensor/sensor_agent.conf
+
+	# Create the directory structure
+	diropts -g sguil -o sguil
+	keepdir /var/lib/sguil/archive \
+		"/var/lib/sguil/${HOSTNAME}" \
+		"/var/lib/sguil/${HOSTNAME}/portscans" \
+		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
+		"/var/lib/sguil/${HOSTNAME}/dailylogs" \
+		"/var/lib/sguil/${HOSTNAME}/sancp"
+
+}
+
+pkg_postinst() {
+	elog
+	elog "You should check /etc/sguil/sensor_agent.conf and"
+	elog "/etc/init.d/logpackets and ensure that they are accurate"
+	elog "for your environment. They should work providing that you"
+	elog "are running the sensor on the same machine as the server."
+	elog "This ebuild assumes that you are running a single sensor"
+	elog "environment, if this is not the case then you must make sure"
+	elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable."
+	elog "You should crontab the /etc/init.d/log_packets script to restart"
+	elog "each hour."
+	elog
+}
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 52d564d41520..3f50ba420da4 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -3,5 +3,5 @@ AUX smokeping.conf 32 BLAKE2B ea64af0cebbb847c89503b3d893c902ab2d761afbce6594731
 AUX smokeping.init.5 1360 BLAKE2B 4213a42dcd43c1166c5f10d287c9e50be37265f8be6db3a8b9e18351dfbe7259a8ca98eff044cd1c7ef657356e3960e60745aea63a79bdc73fd009b3bd746bd7 SHA512 64adf577c9d7d79c268cf46c40ed7db23c93cbd49897070d9028ee6636794b1c101d1a9d1ff6f92c24512e18bf0f06b10b67117090918920fb8b8189dec85d4f
 AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab419afd2fa7c59c1a569fe244c7f7c18e01519d82389bf66f5b6935dd212b3bf68ace9b480e981c311001 SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344
 DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830
-EBUILD smokeping-2.7.3.ebuild 4197 BLAKE2B ba54d0bbf60fdf40623a98015425bac299c8b864cc8c60ecd2f377089c6cd9b7c1708afd6b1525bb426b427b9259e37dff15ec5935554424fb0f9d570cbeb983 SHA512 0d405286984f37e95c2d51a9a19b0223097dd9b06489c65ef00a612bc1df0b2cdca21d91a055f0520d1c354a6fa392d37506d94079a0ba866c9a69440a74f18a
+EBUILD smokeping-2.7.3-r1.ebuild 4020 BLAKE2B 4bd615ccfeb02ead87f489c2fed34973359bb0922337d7386f2c4053e5ee325e6949d220058ef1e84e94613c7f43bacbfa48e720ea278307bd1aee2a13b18d13 SHA512 951cdd387b25a9a918e01dc6d959b129ba4a9be9fe9dc3d487d3014720dd7acf2faac9a276e13b74d0813ab7dad5ca4e8e391c8ed16970b4ddf3995f0babd9a7
 MISC metadata.xml 468 BLAKE2B d219af56f99fd891f8990b2298c9daa86d8fa3f8433b04eeabab1d47492a4ba186906a265612422517f9fb373217473fd047412dc08b7b1bf3f2aaccc92ec2d9 SHA512 0ca877d24981625a5d601cd19fc18fe37b48526c7266c248ee0ba955ecc873b31ea5f06d3feb692566d228a481193fab1f70c53aaa0be089aee490d80f80e815
diff --git a/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild b/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
new file mode 100644
index 000000000000..497f430571fb
--- /dev/null
+++ b/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd tmpfiles
+
+DESCRIPTION="A powerful latency measurement tool"
+HOMEPAGE="https://oss.oetiker.ch/smokeping/"
+SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="apache2 curl dig echoping ipv6 radius"
+
+DEPEND="
+	acct-group/smokeping
+	acct-user/smokeping
+	>=dev-lang/perl-5.8.8-r8
+	>=dev-perl/SNMP_Session-1.13
+	>=net-analyzer/fping-2.4_beta2-r2[suid]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI
+	dev-perl/CGI-Session
+	dev-perl/Config-Grammar
+	dev-perl/Digest-HMAC
+	dev-perl/FCGI
+	dev-perl/IO-Socket-SSL
+	dev-perl/IO-Tty
+	dev-perl/Net-DNS
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SNMP
+	dev-perl/Net-Telnet
+	dev-perl/libwww-perl
+	dev-perl/perl-ldap
+	virtual/perl-libnet
+	dev-perl/CGI-Fast
+	!apache2? ( virtual/httpd-cgi )
+	apache2? (
+		>=www-apache/mod_perl-2.0.1
+		www-apache/mod_fcgid
+	)
+	curl? ( >=net-misc/curl-7.21.4 )
+	dig? ( net-dns/bind-tools )
+	echoping? ( >=net-analyzer/echoping-6.0.2 )
+	ipv6? ( >=dev-perl/Socket6-0.20 )
+	radius? ( dev-perl/Authen-Radius )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
+	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
+	# bundled(?) dev-perl/SNMP_Session
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die
+	echo ${PV} > VERSION || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/smokeping \
+		--with-htdocs-dir=/var/www/localhost/smokeping
+}
+
+src_compile() {
+	LC_ALL=C emake
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)
+	default
+
+	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	mv "${ED}/etc/smokeping/basepage.html.dist" "${ED}/etc/smokeping/basepage.html" || die
+	mv "${ED}/etc/smokeping/config.dist" "${ED}/etc/smokeping/config" || die
+	mv "${ED}/etc/smokeping/smokemail.dist" "${ED}/etc/smokeping/smokemail" || die
+	mv "${ED}/etc/smokeping/smokeping_secrets.dist" "${ED}/etc/smokeping/smokeping_secrets" || die
+	mv "${ED}/etc/smokeping/tmail.dist" "${ED}/etc/smokeping/tmail" || die
+
+	sed -i \
+		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
+		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
+		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
+		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
+		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
+		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
+		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
+		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
+		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
+		"${ED}/etc/${PN}/config" || die
+
+	sed -i \
+		-e '/^<script/{s:cropper/:/cropper/:}' \
+		"${ED}/etc/${PN}/basepage.html" || die
+
+	sed -i \
+		-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
+		"${ED}/usr/bin/smokeping" "${ED}/usr/bin/smokeping_cgi" || die
+
+	sed -i \
+		-e 's:etc/config.dist:/etc/smokeping/config:' \
+		"${ED}/usr/bin/tSmoke" || die
+
+	sed -i \
+		-e 's:/usr/etc/config:/etc/smokeping/config:' \
+		"${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
+
+	dodir /var/www/localhost/cgi-bin
+	mv "${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
+		"${ED}/var/www/localhost/cgi-bin/smokeping.fcgi" || die
+
+	fperms 700 /etc/${PN}/smokeping_secrets
+
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		doins "${FILESDIR}/79_${PN}.conf"
+	fi
+
+	# Create the files in /var for rrd file storage
+	keepdir /var/lib/${PN}/.simg
+	fowners smokeping:smokeping /var/lib/${PN}
+
+	if use apache2 ; then
+		fowners apache:apache /var/lib/${PN}/.simg
+		fowners -R apache:apache /var/www
+	else
+		fowners smokeping:smokeping /var/lib/${PN}/.simg
+	fi
+
+	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
+}
diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
deleted file mode 100644
index ec3971888746..000000000000
--- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd tmpfiles user
-
-DESCRIPTION="A powerful latency measurement tool"
-HOMEPAGE="https://oss.oetiker.ch/smokeping/"
-SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="apache2 curl dig echoping ipv6 radius"
-
-DEPEND="
-	>=dev-lang/perl-5.8.8-r8
-	>=dev-perl/SNMP_Session-1.13
-	>=net-analyzer/fping-2.4_beta2-r2[suid]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	dev-perl/CGI
-	dev-perl/CGI-Session
-	dev-perl/Config-Grammar
-	dev-perl/Digest-HMAC
-	dev-perl/FCGI
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tty
-	dev-perl/Net-DNS
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SNMP
-	dev-perl/Net-Telnet
-	dev-perl/libwww-perl
-	dev-perl/perl-ldap
-	virtual/perl-libnet
-	dev-perl/CGI-Fast
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	radius? ( dev-perl/Authen-Radius )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
-	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
-	# bundled(?) dev-perl/SNMP_Session
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/smokeping \
-		--with-htdocs-dir=/var/www/localhost/smokeping
-}
-
-src_compile() {
-	LC_ALL=C emake
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	default
-
-	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
-	dotmpfiles "${FILESDIR}"/${PN}.conf
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	mv "${ED}/etc/smokeping/basepage.html.dist" "${ED}/etc/smokeping/basepage.html" || die
-	mv "${ED}/etc/smokeping/config.dist" "${ED}/etc/smokeping/config" || die
-	mv "${ED}/etc/smokeping/smokemail.dist" "${ED}/etc/smokeping/smokemail" || die
-	mv "${ED}/etc/smokeping/smokeping_secrets.dist" "${ED}/etc/smokeping/smokeping_secrets" || die
-	mv "${ED}/etc/smokeping/tmail.dist" "${ED}/etc/smokeping/tmail" || die
-
-	sed -i \
-		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${ED}/etc/${PN}/config" || die
-
-	sed -i \
-		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${ED}/etc/${PN}/basepage.html" || die
-
-	sed -i \
-		-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${ED}/usr/bin/smokeping" "${ED}/usr/bin/smokeping_cgi" || die
-
-	sed -i \
-		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${ED}/usr/bin/tSmoke" || die
-
-	sed -i \
-		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
-
-	dodir /var/www/localhost/cgi-bin
-	mv "${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${ED}/var/www/localhost/cgi-bin/smokeping.fcgi" || die
-
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf"
-	fi
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-		fowners -R apache:apache /var/www
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${EROOT}"/var/lib/${PN} || die
-	chmod 755 "${EROOT}"/var/lib/${PN} || die
-}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index d4276f45dcae..0dee5dd858d0 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -7,6 +7,6 @@ DIST tcpdump-4.99.1-upstream.tar.gz 2014324 BLAKE2B 0a10fe68afdfe80d3e7e661352fc
 DIST tcpdump-4.99.1-upstream.tar.gz.sig 442 BLAKE2B 9a80b1796ef777bd06d0b8953fe1ff446431d0ff1dffcd58e29a0b771f6734f70f3f0da7c36a1eaa1b6e57719d79c601872a84b7734208a7e8951cad9aca86ee SHA512 b438643701efbbb5579d9d51ed48756a47dd644e0acb10b0edff6d04f3ae4cea6528b40820a656407b73f983b2a634e0165a6c8c0fca3b557394a14e2f2384ab
 EBUILD tcpdump-4.9.3-r4.ebuild 1700 BLAKE2B 807df788ac7f23cfe14a7c8116607bdb8bbdf346df552feeb8b72bd23f6f4867b8701e2b72ff585be5f5a658c12cb1dc955d205437bf9ec80e5e969c9aa7103b SHA512 4f1ea4403015d9b0e01c155f0df4695c4e71a997ac2e35334f3cb2f9cdff6f79dc23e29a963d9305c3d946b98dbd59ee45a22e91c0de13bdac502511bf1b65ef
 EBUILD tcpdump-4.99.0.ebuild 2299 BLAKE2B b12600c20ca80aed3aef1c0206be94cd61cfca8a4ecadb25f1de82b748d416daaa1772533c688a06a609edc4d8fc19f6b526041f6d57a6da8210974cb743cf1d SHA512 8eaed7d2f02b9e1fd3d517f09fce49a5e46c60e027f951a61c2ef7cf2bc51b3c8e2def33703a1104e48f12f02cdd633895f7d83bddb871b1c8ca082d9222c436
-EBUILD tcpdump-4.99.1.ebuild 2334 BLAKE2B 65fb84d912677ab22d69486393fbd393f533e4f5139539db9d747691eb235de69ae9c5e42ee73df8380ded0886b6b087ef2ed74722854a6c295a6f23f89062d4 SHA512 0635653eb3c24cb6032c19c48b4fa0cdef6c86d72eec132d77a9e8cd63dcec0a544870fb609e1b85e1ce9761e9a8ded6c9488321cdaa9ca327f3ec30c4b8c944
+EBUILD tcpdump-4.99.1.ebuild 2327 BLAKE2B aa7b320f779d6f686fd9d966182615887795c24c714fd5919ea9b34ac87f3d02bfb10e3bb349a8702e3779cdb66f9a0f7103267a69162340fad4baa89eac552a SHA512 820f8ce08e064cf52cd7a652eacfa27c2fcf5b93c9ddb2041fce5cecd32ab6fc11db47cd2f253f16e50e31a0945dc27b119dd98d2b721336171cbe6b34f3d916
 EBUILD tcpdump-9999.ebuild 2144 BLAKE2B f1291e3a4d1f0244dbe4a7e80b40b9ce1f44b5d1f5e76a6888f4cbf77c704497bc316e25f8785faa75319e658e3f162dcde20ce86e2ba497481dfae0c7def580 SHA512 5a64ffdb86df8529d264554aa097cd824e5c26690a9b1a258f5b56238f6af5ee80920109cd1c9e3c128eeb0acfbceffb889ecf2a1310865615c73da1186a3c0c
 MISC metadata.xml 700 BLAKE2B 75eb9e5a825df6e9f4d4ef871e18eeaf6960ee25bbb42d5cb4bcd78775a7ead3ca45c76dd54ccee34c30e56d39303ee4d374a13bbaf449cbcf72242b7c9306f0 SHA512 c248231c288d69b2f71e86054095b599d72e971b9f8e67bacd851907b70b6a252fbf85a47f2b7f0cd3422ec7ef69410e2b3dbbe6de6b96320718dd5400900c74
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
index aa2fc80a8e54..d23c0f647d4e 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
 
-	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"
 fi
 
 LICENSE="BSD"
diff --git a/net-analyzer/tcptraceroute/Manifest b/net-analyzer/tcptraceroute/Manifest
index d32a0aee6ff6..ef3a0c7e4304 100644
--- a/net-analyzer/tcptraceroute/Manifest
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -1,4 +1,4 @@
 AUX tcptraceroute-1.5_beta7-cross-compile-checks.patch 1228 BLAKE2B f18640804c946225fed7324203c928062b37001053ac87a8f78c500b1bb6c65f3263650484f51ccf20b09bb8d1ce95f871b2ad53f8752154e0134b5e26b2e01a SHA512 a994d9d0dfd633fd9f091c77a0ca96b0b73dc9a7373631feece29fef3f3daeb38dddf7fc6fc829c64cb8eb3809d7e25d22f3c18d2202188df9d94ca237601815
 DIST tcptraceroute-1.5_beta7.tar.gz 119059 BLAKE2B e2d627c7fa96439e77be7d2fb5d57e0b92451367c95022876895fcbebdc0adf8c78b262e41ecb8a2696e8377e9862b45f2139cb8ca9d92a696d9a0dc319d4a64 SHA512 ad5588e62a56f1b5fa851b68280a88e66a900777fe4fd67587262245cd9da17b536b7dc972abe540fc124a93ac76abcabbc55bc32f9f8ee872d5df57b08f7222
-EBUILD tcptraceroute-1.5_beta7-r3.ebuild 880 BLAKE2B 36134fa45277ae34998f7dc9c8670e306d1a1ffd71ec036682aa2f7b2117b9225c1369a33108fef63392dcbffb64c4460fbe606e17fb192583fc60ea80016b70 SHA512 29153fadcec39febd3976118d2aec6f052babf67eaae7e44747b2e8574bfa72e8ba82f0243fbb0622a8afcb8404a11cbe87a8fd98ae83ee84e6e8c80aca4a7ac
+EBUILD tcptraceroute-1.5_beta7-r3.ebuild 887 BLAKE2B 3bbcb548f2a1e76e9a95d00e6aa20bc0780ba90d30ab1501307eeab57f2cc42b270b550d5ad62b902c6ae7a0b39b1ac830963164f403fc94d196fff529c66863 SHA512 9fd970e74a7f39bd735319488b206df65527296c2eecd4d5a1d95a5b34b24c66dc011f40339963da4e5c2b364456f76dce6679379e771212032f3c61e11dde7e
 MISC metadata.xml 362 BLAKE2B 7e5066833673e1881f77a10c92f8ff281c050140a6a77154fedb4f469b99d6c53abbdb0a35702d5325e294f7acfe8b050254be7ffac4c3832455777c65a98cd5 SHA512 783a1867b40907e8704e19ec6d423f4db8a97ba683f64efc72ea7bf4e4157e9bf630470fcf8a0410d6fa9bc5cf63f810f1f577828bdfe1203f2f56e55458c7cf
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
index bfb827e2b245..eb1c9f51819d 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mct/${PN}/archive/${P/_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/traceroute-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest
index e94860afc806..c892c4dee44e 100644
--- a/net-analyzer/traceroute-nanog/Manifest
+++ b/net-analyzer/traceroute-nanog/Manifest
@@ -1,4 +1,4 @@
 DIST traceroute-nanog_6.4.2-1.diff.gz 18417 BLAKE2B eec999aae1e728e9c255715042ee7be66bc32c19eff3ab32b85fecd281032d24eea27fa19d27793d9820b61539791ed82b0a0a7845636970a8d2433d0e3ba40a SHA512 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e
 DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 BLAKE2B 427a7af1f65271b1b4f46522d76da00628e1c6b877b576ff571dc09d7c1bd0232abd626296b46a16785cccaf091b086ea61b5081035572b846e04fff97d0dafb SHA512 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304
-EBUILD traceroute-nanog-6.4.2_p1.ebuild 960 BLAKE2B cee2985f53c2dc93dbd4502ee2a7ddaabff4765ce18dbb2ef64648466dc9d231ecf7b46029cdfd3019b21b8afaecacbaf265a2afcfdd36a160ddf01c85aebe5c SHA512 71a07b76da6ffd54424e4705590c201aef0abc041614ec60e3200f5ecf25722b7349a8eaa18230ba34f7aed06f77109d29fa80d1b3118d62b6cc87dda5e54e05
+EBUILD traceroute-nanog-6.4.2_p1.ebuild 967 BLAKE2B 1e7e46eb3e693abfd58787468ff7c6ae3e7b77896c27f7022fbaaa9589bd962c3f9f99121c517151be2707dc967771d8296271ef246bca4b7d8eb2408a612bf6 SHA512 40cfcfc62e8b66c3b0c8d7dab4b9fa591653817f4a135efde647cdaeb7ed1074e89d73bdf346c41d9e160110aab72432df51606a2a5af1a63e0c438749f49d54
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
index e2c94b97847c..d40f8a60a493 100644
--- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~ppc ~riscv x86"
 
 S=${WORKDIR}/${P/_p*}.orig
 
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index 1dfa1c9ebd06..f3339d31c67c 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -1,3 +1,3 @@
 DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
-EBUILD traceroute-2.1.0.ebuild 873 BLAKE2B 7c263a7bc0158c287d4f0669ddeca20ddace934eb80617fcbe3aa45fd6a5ab13774cbc537796a1dfe5e9e8c7b5f360cae04c525a4fe9815a76d43f2e21cf9f8c SHA512 6b22f08031b842653d6da87d875894da775908495eae5b0146f4ba836d47c11b8ebcf5c9aedabb640a421202d6cfaeb03be572401b970d80ea73d5ff948a8fd8
+EBUILD traceroute-2.1.0.ebuild 880 BLAKE2B 0ac79e4e9d577a8b4b03e1a2ceb3fe49e4ade295fd2ef6ce4ea09ca65e45861ddead151f7d175f80fa13251c2fd848696a5d5260440d268a7daa81db6e7b7605 SHA512 6a62cfdcedaca43fe6d0b29bd43da46e8da87bf06b1195c99a4efb6e9dc4709f9f5f78abfbf7f3bdec4251d3ec38aeaf2d3c14c1ed3f1be8f0d1e9dc4938519e
 MISC metadata.xml 360 BLAKE2B ddaa20a837ed3daa2311c49dc988b9bd60e6a1dcb8a0a45d007ad78854d4e105a7303e816d5b13e12071ce264ab6b1f4df79f552d4920b9406117b0ca51e1384 SHA512 2114a7680804da45f09166e88f811d0b9088bbdedb0d3b587737bc3f4d723dfafe78e6ccf6c5f2b2c4c69838c9412dba3d9af682376b05bf1f4065f2a7c51bf5
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index 08c8de8deef6..5f737abdef45 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~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"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3f183980811d..2cef3cd98047 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,6 +2,8 @@ AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
 AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8 SHA512 eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d
-EBUILD wireshark-3.4.6.ebuild 7206 BLAKE2B 79a328e8d05370dcf7685a955ffde5d4edf073738ff643598ff7afd7000df5aca7ae4ac49639eb9c42b9d7c9d1714e257544b930ef8911e876d2146f724a7589 SHA512 58e84bb0ba2f577a76e4d92cff014d2a48f1cd661a3dba75f4613095a1a9ac1daa580157bbf54d834568001a752cdf0c2f362ea3b604362fc40520a06bb13873
-EBUILD wireshark-9999.ebuild 7211 BLAKE2B 1777dc913003253d12da947db992439d02897edc59de2a1fcc05d0504d6c72ff8d4a7db8912e8d6cf02498b0f7dc9525cf111d837252a14c0c55c0be96a35af2 SHA512 a7e50a1464efa1160e9927798b059796529f8b32e6da6762f20f3e582f1a0bf43746f1f5af3bd95bcc33b9f77e52b2557d32ed99f7784c59d04ed2035e0598bb
+DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 SHA512 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
+EBUILD wireshark-3.4.6.ebuild 7206 BLAKE2B 4808491b469daf8b3185292bcfbbe215a9f32abd4ab0d0f4f78163633524b7b2457b17dc109a653a2ff2aa3f296aa7d9284bbf90c379e593e4bb33e1a6e81675 SHA512 5308aaf15324c020d1fa5bb68ba366f1dc686e0f40b1ea203cd1950cbcaa6e678380c0bc8bf24ec644649a07e364d8318b131cc234db94be2add86046c4626c7
+EBUILD wireshark-3.4.7.ebuild 7211 BLAKE2B 2b907655ef70a51ea09d2e597b84e625b9bf75ea3a23c44768176402dc17a6ed3732bcd6c5bec2dd53e4054920402b2412d2dc28aa0a9666dec990cce66624d3 SHA512 20443697c5a2ed143a16d4327bc1af599414beaac337aef6bd77bc6236a39a2d7f862aeeb42007df91a844a1a70d83403b0a82ae2678653bf4c65f4254c82948
+EBUILD wireshark-9999.ebuild 7211 BLAKE2B 2b907655ef70a51ea09d2e597b84e625b9bf75ea3a23c44768176402dc17a6ed3732bcd6c5bec2dd53e4054920402b2412d2dc28aa0a9666dec990cce66624d3 SHA512 20443697c5a2ed143a16d4327bc1af599414beaac337aef6bd77bc6236a39a2d7f862aeeb42007df91a844a1a70d83403b0a82ae2678653bf4c65f4254c82948
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/wireshark-3.4.6.ebuild b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
index 5e3828b57219..234f78724444 100644
--- a/net-analyzer/wireshark/wireshark-3.4.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
 
diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
new file mode 100644
index 000000000000..7fd9e324e1a4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
+	inherit git-r3
+else
+	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+	S="${WORKDIR}/${P/_/}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+
+CDEPEND="
+	acct-group/pcap
+	>=dev-libs/glib-2.32:2
+	>=net-dns/c-ares-1.5
+	dev-libs/libgcrypt:0
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
+	ilbc? ( media-libs/libilbc )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( ${LUA_DEPS} )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	plugin-ifdemo? ( plugins )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+	"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_ILBC=$(usex ilbc)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LTO=$(usex lto)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_OPUS=$(usex opus)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	myctestargs=(
+		--disable-capture
+		--skip-missing-programs=all
+		--verbose
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+
+	for dir in "${dirs[@]}" ; do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${ED}"/usr/share/appdata ]]; then
+		rm -r "${ED}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the pcap group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 32f8fdef83b9..7fd9e324e1a4 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
 
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index c39b58c3dfd9..c177ac8fb0aa 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 95d7724e4cac..a3f5b894ea27 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,7 +1,7 @@
 AUX README.mpls 530 BLAKE2B 21d57668272eb02c994d0ae38a9895f095ad024bab1613995313480f5d314a5772c30bb0edb1032658993d897b58f5d2744abbc43e0416e63d8fe27dfc968819 SHA512 2b617365fce74cceeb14e53f476b454c4420273661050d25e1c524cf5d56a7554318a268f7b9ebb100592b61a01d274efaeed28abb9ca0adaeb71ef981201b36
 AUX modules.ppp 299 BLAKE2B d5c0dcf135dd0a33288f27c95133d4dc980b84dc62bf8eca5b35040f4bfa5d0480cddc48263f390be8df0e0d8de704a62c490172b523612dd945a284e374372f SHA512 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041
-DIST ppp-2.4.9-patches-02.tar.xz 18056 BLAKE2B d2632811b7146214ad4cf59bee2834abda59b04c44990d5c135d85fad883371b4813e145e11a6bdff449670acda2e2ef3647c54387800f23111e975b54c5e08c SHA512 5978aa12cd669f858acf2ca9d604d9e830c4d2bd21ed1473823d4da02866d693724d0682c0d65fa4569b89d6b6e430505d307556a61f4ff927590d1357d52e93
+DIST ppp-2.4.9-patches-03.tar.xz 18520 BLAKE2B b3da095672fa57727ba11a5dba761ea3f24ee330f27252f0379dab5761d5381809176faafed86d97a6b89cc8a4cb958baa07f4900e22fe6e76b6c852e0703f0c SHA512 9a035acf1915225340c12e6242f0c5db399b5f5970888d7f1799a5f125cf97b95d9fcb8c9aa2f6bd56c1544d2b10585f772d4fc1025002e3e8403011e3d2c029
 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
-EBUILD ppp-2.4.9-r3.ebuild 7384 BLAKE2B 96764eb3928fcef33bf7fe4e490ec8c335407f6113add330d793dc13f1e9e6802f11bc572893995ef252fc40366cb3b8d2da40b8655b29934652f8823edff836 SHA512 279cf2740d60c144154f2535bebaa40dcedd39129b71483ff39fec3ea635c5302a036fda264fa5a80a5ed84eb62597cb980066431eb001e0e307b8017dd8ee57
+EBUILD ppp-2.4.9-r4.ebuild 7384 BLAKE2B 405c4ec32ad0e0913addd6f23bbc82222fb2e58bfee35f6ed8ce3ccd09f694559e22186c66e980dec33ce636e3cd9188660502bb8512925c1abde9c08fc20fea SHA512 19830cae579f86a05a730536198f31b5f748f12a7aaf53b61922aa030fe4c8fd31599fd78c6eb27b917de291210573e7dc437a9c5c65949683f1a7909975457a
 MISC metadata.xml 1096 BLAKE2B 6079f546fb5586c7b57529e6748125390f89a43c5d73d3d8454a8bf59ce2b33403884f5cc73b9bd8a45c9446b84f046961907d03ab6d36b6a28fcf42b2fe9aeb SHA512 04f921e7c99468c4d0fe62d902b53be82d87e59dbf477a39cb047b406eb21bcc001e2fef800dae3e44f04289bcf93fa6ebe81c333756e984631ac05fc1a7a847
diff --git a/net-dialup/ppp/ppp-2.4.9-r3.ebuild b/net-dialup/ppp/ppp-2.4.9-r3.ebuild
deleted file mode 100644
index ee2c42158a53..000000000000
--- a/net-dialup/ppp/ppp-2.4.9-r3.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info pam toolchain-funcs
-
-PATCH_TARBALL_NAME="${PN}-2.4.9-patches-02"
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="https://ppp.samba.org/"
-SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz
-	http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
-
-LICENSE="BSD GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius"
-
-DEPEND="
-	dev-libs/openssl:0=
-	virtual/libcrypt:=
-	activefilter? ( net-libs/libpcap )
-	atm? ( net-dialup/linux-atm )
-	gtk? ( x11-libs/gtk+:2 )
-	pam? ( sys-libs/pam )
-"
-RDEPEND="${DEPEND}
-	!<net-misc/netifrc-0.7.1-r2"
-BDEPEND="virtual/pkgconfig"
-PDEPEND="net-dialup/ppp-scripts"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
-
-	eapply "${WORKDIR}"/patches
-
-	if use atm ; then
-		einfo "Enabling PPPoATM support"
-		sed -i '/^#HAVE_LIBATM=yes/s:#::' \
-			pppd/plugins/pppoatm/Makefile.linux || die
-	fi
-
-	if ! use activefilter ; then
-		einfo "Disabling active filter"
-		sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
-	fi
-
-	if use pam ; then
-		einfo "Enabling PAM"
-		sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
-	fi
-
-	if ! use ipv6 ; then
-		einfo "Disabling IPv6"
-		sed -i '/^HAVE_INET6/s:^:#:' pppd/Makefile.linux || die
-	else
-		echo "+ipv6" >> etc.ppp/options || die
-	fi
-
-	einfo "Enabling CBCP"
-	sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
-
-	if use dhcp ; then
-		einfo "Adding ppp-dhcp plugin files"
-		sed \
-			-e '/^SUBDIRS :=/s:$: dhcp:' \
-			-i pppd/plugins/Makefile.linux || die
-	fi
-
-	if ! use eap-tls ; then
-		einfo "Disabling EAP-TLS pppd auth support"
-		sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die
-		einfo "Disabling EAP-TLS plugin support"
-		sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \
-			pppd/plugins/Makefile.linux || die
-	fi
-
-	# Set correct libdir
-	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
-		pppd/{pathnames.h,pppd.8} || die
-
-	if use radius ; then
-		# Set the right paths in radiusclient.conf
-		sed -e "s:/usr/local/etc:/etc:" \
-			-e "s:/usr/local/sbin:/usr/sbin:" \
-			-i pppd/plugins/radius/etc/radiusclient.conf || die
-		# Set config dir to /etc/ppp/radius
-		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-			pppd/plugins/radius/{*.8,*.c,*.h} \
-			pppd/plugins/radius/etc/* || die
-	else
-		einfo "Disabling radius"
-		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
-	fi
-
-	# Respect our pkg-config settings.
-	sed -i \
-		-e 's:pkg-config:$(PKG_CONFIG):' \
-		contrib/pppgetpass/Makefile.linux || die
-	sed -i \
-		-e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) --libs libcrypto`:}' \
-		pppd/Makefile.linux || die
-
-	eapply_user #549588
-}
-
-src_compile() {
-	tc-export AR CC PKG_CONFIG
-	emake CC="${CC}" COPTS="${CFLAGS} -D_GNU_SOURCE"
-
-	# build pppgetpass
-	cd contrib/pppgetpass || die
-	if use gtk ; then
-		emake -f Makefile.linux
-	else
-		emake pppgetpass.vt
-	fi
-}
-
-src_install() {
-	local i
-	for i in chat pppd pppdump pppstats ; do
-		doman ${i}/${i}.8
-		dosbin ${i}/${i}
-	done
-	fperms u+s-w /usr/sbin/pppd
-
-	# Install pppd header files
-	emake -C pppd INSTROOT="${D}" install-devel
-
-	dosbin pppd/plugins/pppoe/pppoe-discovery
-
-	dodir /etc/ppp/peers
-	insinto /etc/ppp
-	insopts -m0600
-	newins etc.ppp/pap-secrets pap-secrets.example
-	newins etc.ppp/chap-secrets chap-secrets.example
-
-	insopts -m0644
-	doins etc.ppp/options
-
-	if use pam; then
-		pamd_mimic_system ppp auth account session
-	fi
-
-	local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
-	insinto "${PLUGINS_DIR}"
-	insopts -m0755
-	doins pppd/plugins/minconn.so
-	doins pppd/plugins/passprompt.so
-	doins pppd/plugins/passwordfd.so
-	doins pppd/plugins/winbind.so
-	doins pppd/plugins/pppoe/pppoe.so
-	doins pppd/plugins/pppol2tp/openl2tp.so
-	doins pppd/plugins/pppol2tp/pppol2tp.so
-	if use atm ; then
-		doins pppd/plugins/pppoatm/pppoatm.so
-	fi
-	if use dhcp ; then
-		doins pppd/plugins/dhcp/dhcpc.so
-	fi
-	if use radius ; then
-		doins pppd/plugins/radius/rad{ius,attr,realms}.so
-
-		#Copy radiusclient configuration files (#92878)
-		insinto /etc/ppp/radius
-		insopts -m0644
-		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-
-		doman pppd/plugins/radius/pppd-rad{ius,attr}.8
-	fi
-
-	insinto /etc/modprobe.d
-	insopts -m0644
-	newins "${FILESDIR}/modules.ppp" ppp.conf
-
-	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dodoc "${FILESDIR}/README.mpls"
-
-	dosbin scripts/p{on,off,log}
-	doman scripts/pon.1
-
-	# Adding misc. specialized scripts to doc dir
-	dodoc -r scripts
-	docinto scripts
-	dodoc -r scripts/chatchat
-
-	if use gtk ; then
-		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-	doman contrib/pppgetpass/pppgetpass.8
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists ; then
-		echo
-		ewarn "If the following test report contains a missing kernel configuration option that you need,"
-		ewarn "you should reconfigure and rebuild your kernel before running pppd."
-		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
-		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
-		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
-		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
-		if use activefilter ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
-			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
-		fi
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
-		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
-		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
-		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
-		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by pppoe plugin)"
-		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by pppoe and dhcpc plugins)"
-		if use atm ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
-			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
-		fi
-		check_extra_config
-	fi
-
-	# create *-secrets files if not exists
-	[[ -f "${EROOT}/etc/ppp/pap-secrets" ]] || \
-		cp -pP "${EROOT}/etc/ppp/pap-secrets.example" "${EROOT}/etc/ppp/pap-secrets"
-	[[ -f "${EROOT}/etc/ppp/chap-secrets" ]] || \
-		cp -pP "${EROOT}/etc/ppp/chap-secrets.example" "${EROOT}/etc/ppp/chap-secrets"
-
-	# lib name has changed
-	sed -i -e "s:^rp-\(pppoe.so\):\1:" "${EROOT}/etc/ppp/options" || die
-
-	echo
-	elog "Pon, poff and plog scripts have been supplied for experienced users."
-	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
-	elog "/usr/share/doc/${PF}/scripts directory."
-
-	if [[ -n ${REPLACING_VERSIONS} ]] ; then
-		ewarn '"rp-pppoe.so" plugin has been renamed to "pppoe.so"'
-	fi
-}
diff --git a/net-dialup/ppp/ppp-2.4.9-r4.ebuild b/net-dialup/ppp/ppp-2.4.9-r4.ebuild
new file mode 100644
index 000000000000..6459f5145ad8
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.9-r4.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info pam toolchain-funcs
+
+PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03"
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="https://ppp.samba.org/"
+SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz
+	http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius"
+
+DEPEND="
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	activefilter? ( net-libs/libpcap )
+	atm? ( net-dialup/linux-atm )
+	gtk? ( x11-libs/gtk+:2 )
+	pam? ( sys-libs/pam )
+"
+RDEPEND="${DEPEND}
+	!<net-misc/netifrc-0.7.1-r2"
+BDEPEND="virtual/pkgconfig"
+PDEPEND="net-dialup/ppp-scripts"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+
+	eapply "${WORKDIR}"/patches
+
+	if use atm ; then
+		einfo "Enabling PPPoATM support"
+		sed -i '/^#HAVE_LIBATM=yes/s:#::' \
+			pppd/plugins/pppoatm/Makefile.linux || die
+	fi
+
+	if ! use activefilter ; then
+		einfo "Disabling active filter"
+		sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
+	fi
+
+	if use pam ; then
+		einfo "Enabling PAM"
+		sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
+	fi
+
+	if ! use ipv6 ; then
+		einfo "Disabling IPv6"
+		sed -i '/^HAVE_INET6/s:^:#:' pppd/Makefile.linux || die
+	else
+		echo "+ipv6" >> etc.ppp/options || die
+	fi
+
+	einfo "Enabling CBCP"
+	sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+	if use dhcp ; then
+		einfo "Adding ppp-dhcp plugin files"
+		sed \
+			-e '/^SUBDIRS :=/s:$: dhcp:' \
+			-i pppd/plugins/Makefile.linux || die
+	fi
+
+	if ! use eap-tls ; then
+		einfo "Disabling EAP-TLS pppd auth support"
+		sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die
+		einfo "Disabling EAP-TLS plugin support"
+		sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \
+			pppd/plugins/Makefile.linux || die
+	fi
+
+	# Set correct libdir
+	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+		pppd/{pathnames.h,pppd.8} || die
+
+	if use radius ; then
+		# Set the right paths in radiusclient.conf
+		sed -e "s:/usr/local/etc:/etc:" \
+			-e "s:/usr/local/sbin:/usr/sbin:" \
+			-i pppd/plugins/radius/etc/radiusclient.conf || die
+		# Set config dir to /etc/ppp/radius
+		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+			pppd/plugins/radius/{*.8,*.c,*.h} \
+			pppd/plugins/radius/etc/* || die
+	else
+		einfo "Disabling radius"
+		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
+	fi
+
+	# Respect our pkg-config settings.
+	sed -i \
+		-e 's:pkg-config:$(PKG_CONFIG):' \
+		contrib/pppgetpass/Makefile.linux || die
+	sed -i \
+		-e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) --libs libcrypto`:}' \
+		pppd/Makefile.linux || die
+
+	eapply_user #549588
+}
+
+src_compile() {
+	tc-export AR CC PKG_CONFIG
+	emake CC="${CC}" COPTS="${CFLAGS} -D_GNU_SOURCE"
+
+	# build pppgetpass
+	cd contrib/pppgetpass || die
+	if use gtk ; then
+		emake -f Makefile.linux
+	else
+		emake pppgetpass.vt
+	fi
+}
+
+src_install() {
+	local i
+	for i in chat pppd pppdump pppstats ; do
+		doman ${i}/${i}.8
+		dosbin ${i}/${i}
+	done
+	fperms u+s-w /usr/sbin/pppd
+
+	# Install pppd header files
+	emake -C pppd INSTROOT="${D}" install-devel
+
+	dosbin pppd/plugins/pppoe/pppoe-discovery
+
+	dodir /etc/ppp/peers
+	insinto /etc/ppp
+	insopts -m0600
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
+
+	insopts -m0644
+	doins etc.ppp/options
+
+	if use pam; then
+		pamd_mimic_system ppp auth account session
+	fi
+
+	local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
+	insinto "${PLUGINS_DIR}"
+	insopts -m0755
+	doins pppd/plugins/minconn.so
+	doins pppd/plugins/passprompt.so
+	doins pppd/plugins/passwordfd.so
+	doins pppd/plugins/winbind.so
+	doins pppd/plugins/pppoe/pppoe.so
+	doins pppd/plugins/pppol2tp/openl2tp.so
+	doins pppd/plugins/pppol2tp/pppol2tp.so
+	if use atm ; then
+		doins pppd/plugins/pppoatm/pppoatm.so
+	fi
+	if use dhcp ; then
+		doins pppd/plugins/dhcp/dhcpc.so
+	fi
+	if use radius ; then
+		doins pppd/plugins/radius/rad{ius,attr,realms}.so
+
+		#Copy radiusclient configuration files (#92878)
+		insinto /etc/ppp/radius
+		insopts -m0644
+		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+
+		doman pppd/plugins/radius/pppd-rad{ius,attr}.8
+	fi
+
+	insinto /etc/modprobe.d
+	insopts -m0644
+	newins "${FILESDIR}/modules.ppp" ppp.conf
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc "${FILESDIR}/README.mpls"
+
+	dosbin scripts/p{on,off,log}
+	doman scripts/pon.1
+
+	# Adding misc. specialized scripts to doc dir
+	dodoc -r scripts
+	docinto scripts
+	dodoc -r scripts/chatchat
+
+	if use gtk ; then
+		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
+		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+	else
+		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+	fi
+	doman contrib/pppgetpass/pppgetpass.8
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_src_exists ; then
+		echo
+		ewarn "If the following test report contains a missing kernel configuration option that you need,"
+		ewarn "you should reconfigure and rebuild your kernel before running pppd."
+		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
+		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
+		if use activefilter ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
+		fi
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
+		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by pppoe plugin)"
+		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by pppoe and dhcpc plugins)"
+		if use atm ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
+			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+		fi
+		check_extra_config
+	fi
+
+	# create *-secrets files if not exists
+	[[ -f "${EROOT}/etc/ppp/pap-secrets" ]] || \
+		cp -pP "${EROOT}/etc/ppp/pap-secrets.example" "${EROOT}/etc/ppp/pap-secrets"
+	[[ -f "${EROOT}/etc/ppp/chap-secrets" ]] || \
+		cp -pP "${EROOT}/etc/ppp/chap-secrets.example" "${EROOT}/etc/ppp/chap-secrets"
+
+	# lib name has changed
+	sed -i -e "s:^rp-\(pppoe.so\):\1:" "${EROOT}/etc/ppp/options" || die
+
+	echo
+	elog "Pon, poff and plog scripts have been supplied for experienced users."
+	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
+	elog "/usr/share/doc/${PF}/scripts directory."
+
+	if [[ -n ${REPLACING_VERSIONS} ]] ; then
+		ewarn '"rp-pppoe.so" plugin has been renamed to "pppoe.so"'
+	fi
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b4f49076cd66..605c464f5cf2 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index a37085ec1759..4d12d9ed9634 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -17,5 +17,5 @@ DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 2fef7e1be8a427b2c426c2af58bf4c22795e64
 DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd SHA512 7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9
 EBUILD djbdns-1.05-r33.ebuild 3671 BLAKE2B a1316a82339046ec5560d0b1b458fbbaf202d7e8ebcfbccd9568ddf7fa5cbe84a827fd2b9e3720567fbb8cf27bbe50e51867425a9b249b1d8830501120487671 SHA512 5f73d51ada1789dd96c372b5ca9a587031136fcf60a72e0ecac7a0481a73f52394016723f98dcf6a16f7e7af4f0e4d9626678db77aa16fde067349d334c0287e
-EBUILD djbdns-1.05-r35.ebuild 3569 BLAKE2B 6f602fa7d150737f3d41f5a4f6d121bb58135ca194220902413a7849d0c33bd6062927b3bee6855fa40a291541737694538d7b1c44719c2722a70ad22d38d5e9 SHA512 3247af298946d5a746e24b5643de79b962d525669bc72498dd72b1ce51c58b36185313480421cb0d4c37765ceb00f35a12fc457cbb3fe1db32d0ca0e34c46044
+EBUILD djbdns-1.05-r35.ebuild 3565 BLAKE2B 042fd688e007c1cf25403283d657cae13b7d335995ec4df44ff3e0d2a8eaaf88c66bceecbc388eea7ffa7fde3ccc2a12dcd0f6b5ee0dab2eea6fcfde7d6ec9f1 SHA512 8ab1fbecd6ee931dca4f8752ec57c63249c0b1c7fd70fe423f34b5d9dc396f7b49d139e5baa1dffad87db10f21d5b804cef9a56c72b85d7280bc370e00e287f4
 MISC metadata.xml 244 BLAKE2B c21c7a6cd7f859220baee98b22912e06955a7d63b4fc954a40507126ef6cb30659a3b7e89e798bb7d074814810f9625d3979ed2ac8877e213dc378da841bc786 SHA512 125b00b9e85650a6dcc365871f9f8be44d85cde4b938a66f7d96b6dc0237a1cae68b30be1ee16d7850998fc31be35eaf459df1bb7d9ea169904854b532f37bab
diff --git a/net-dns/djbdns/djbdns-1.05-r35.ebuild b/net-dns/djbdns/djbdns-1.05-r35.ebuild
index 8cc9d5c60aac..6b06f4f1eebe 100644
--- a/net-dns/djbdns/djbdns-1.05-r35.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r35.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 51c1d764cd29..e2c3a85295b0 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,15 +1,8 @@
 AUX getdns-1.4.2-stubby.service.patch 568 BLAKE2B f2e605116f924b109bf2cd734c8eb79314aeb02b0e30e2fd8d62117b44a74f20e64b1b527253a09525ad9ab26aa2a64a51940773064de87e295d1831dfe9e51b SHA512 67c88787d48662d5c555cd2cdff5916a2211aaf45a13b41e0a909d703dcbc66cb3de834cc94b7c3d292d16a99d024b07098b4e0bb1c790e48201ca9ffb598bd2
 AUX getdns-1.7.0-docdir.patch 769 BLAKE2B d6eabd639382b1fdaefb344c440dabbdcd5a61e5999a31d8565c994baf80bb9a05efad6cd54dd5dd871c4d6c4b05febb9302a68c8bb36184b5d024c5f6fcfd30 SHA512 7eb0895ca0707f396a326469b3ecf09e43cb52f7d83e2288570f88b13cc884770a2aa634f8f0128ee38c2f4ea43074e80797ae8c07788dcca66706af2cd050b7
 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
-AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0
 AUX stubby.initd-r2 685 BLAKE2B d079db5129c02d7b4bdbfdd28733426b39f9e094e76f14e5a32b948f40717faa1886f9093059ddca9e4cd58e6621e06ff75ff94ef713338b1e0335785274f954 SHA512 11b9a6d1a60543ed6e897c87b9c78c72a241388486f1d389918f5a11176a208d885e641fe304bd2ca91284861e37422b8c387ebc8aaa820093b3e70d31b28cf1
 AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805
-DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6 SHA512 4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0
-DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4 SHA512 42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4
-DIST getdns-1.6.0-beta.1.tar.gz 669637 BLAKE2B cab019c38a0e7268a3ffef7ffd6b52ab3565bbf0b4ea4e897d60cfc0885ee7d32d8bd22e58f24b554e03d4297945d4eaa915aff254f43d4e82455f1070923d46 SHA512 b36d05b09b5ab7c384fdb93820bc6ad253e9a44da9c7ea38c735882e56e03eaba1793ea22068d03867ed2ade71682686a359b1b0a821eed4a5f3bebeeaeeb7e2
 DIST getdns-1.7.0.tar.gz 690885 BLAKE2B 25e81c01c5da0a5494dc25077257f8f98210b442b7ca65c895aa2a40af180e840aa53205ae84ed242cbd6c55f8830caf255db9d7f607dde39f118ab7494a7072 SHA512 d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6
-EBUILD getdns-1.5.1.ebuild 1829 BLAKE2B 1b98cf3a49cb0aa8dd24faa08702a7f92e810b1142ce285c07f8ad46db9da383786ccf64822a026231f95a755d0ab28a42a29f7bb014aaa687af21836fff00e4 SHA512 8f883b33c97371fa82b5699ac28beaa6d3fd03c2904ba974b16d352f2561ab5967e7d1c7dadad904b0c121e37384d7f0f48adf5784120ed11adca96680793227
-EBUILD getdns-1.5.2-r2.ebuild 2027 BLAKE2B c538bbd971332f280f1a1ef538d8f7a39fe46ad2cc2c9c8762c3d7e7dbf6224de7534c5a98dd093afa751630ef86f197a1582d1e5a4038cc74a425ba17e0c951 SHA512 97576f96435a75a8e51ae9a600f1329e924124b5d220766168e255a9e944a74a543181c20a27e4cc0f618d2cef47e555eef951b54aede0a536579a88a7acdcd5
-EBUILD getdns-1.6.0_beta1-r2.ebuild 2030 BLAKE2B bb96fe0fa12f242604f63add83ee05ace04d3d7686a51e7daa17c009bd745a8e7c31e070aa0fea88c66cd0321b1b954ef0b665ef5b7b45b9b412539c76e70c36 SHA512 d08b2a2c7b135578e07b08338a2a3a135e82e042b8d02263e4c93f9e42350c4dcb8be1c9a2bea0e9f09d968c1789902cdb425f7f61be7cf1f8620edc678958fa
-EBUILD getdns-1.7.0.ebuild 2205 BLAKE2B 285d36c359549142a8038426220cc5a8b55a536ea92a56ba4982d51e7badfcfa9f738fbb1391d01a3cd940e6be6db1ab38004eef696ece5953f0f5f0d1b110af SHA512 c56e15e027e77f28d99ada24268a581079b75e4998bd76335574345d86d2c27eb93762f2c3d47d596f2f76f58a29ee0f9657ce7ce9e3c20a88967b7158fcc80d
-MISC metadata.xml 823 BLAKE2B 6f036445b01fd8b4c4a0ddac2f04ed45cb980dc31ca5aa5a25b5da8272541ab7b8d6b6d9fcd8b3d122de378a71b2e8f1dffa158da6a0db84d7e61b9e6f8d134b SHA512 2ac45a84c1d38e601cc9a1bb2af25a4843b8b43902736fce9fe8fba7fb6a2f6b98c020e4a76c8443526c51af7f91602daa01e84e69fe29bc838ad79eb147ded2
+EBUILD getdns-1.7.0.ebuild 2204 BLAKE2B 116183bd38d48b081e2ced7f848b7d6041836f3b0252feb6bfb63a4684ff471daac34ef73ac9c313f8b5de658d1e283430678471264234545f2d53bf5f399850 SHA512 f80e4c56c358af1d40b90db57e4f8fe456a92edfa36ec0cddd9248ee2d494008525cf509bc986bcf6ff0586b980bdd222b6231f9b8488ca05a8142b4a0ce49b5
+MISC metadata.xml 745 BLAKE2B 9cb2fc16135f99e9d57f767fbfa621d1ebe4fe1544b7aa27d38abb874868f641cc47bcf4fb5dae852110bca97ed7f5ceb8afd79faa9577350f986e83c83a4ca3 SHA512 fa3dcfa3e3e8b05f41d428c028171f74fbd7120bb16b10802f176a8a03baaba7cfc079f5d02125ad5602b03d3f6588fc47c4638a75d614a32e70ec8069db4ca4
diff --git a/net-dns/getdns/files/stubby.initd-r1 b/net-dns/getdns/files/stubby.initd-r1
deleted file mode 100644
index e6b799919e28..000000000000
--- a/net-dns/getdns/files/stubby.initd-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-stubby_opts="-C ${STUBBY_CONFIG_FILE:-/etc/stubby/stubby.yml} -v ${STUBBY_LOGLEVEL:-5}"
-command="capsh"
-command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${stubby_opts} >>/var/log/stubby.log 2>&1'"
-pidfile="/var/run/stubby/stubby.pid"
-name="DNS Privacy Daemon"
-
-depend()
-{
-	provide dns
-	need localmount net
-	after bootmisc
-	use logger
-}
-
-start_pre()
-{
-	checkpath -d -m 1755 -o stubby:stubby /var/run/stubby
-	checkpath -f -m 0644 -o stubby:stubby /var/log/stubby.log
-}
diff --git a/net-dns/getdns/getdns-1.5.1.ebuild b/net-dns/getdns/getdns-1.5.1.ebuild
deleted file mode 100644
index 9333b5ff65f1..000000000000
--- a/net-dns/getdns/getdns-1.5.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps systemd user tmpfiles
-
-DESCRIPTION="Modern asynchronous DNS API"
-HOMEPAGE="https://getdnsapi.net/"
-SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +getdns-query +getdns-server-mon +idn libev libevent libuv static-libs stubby +threads +unbound"
-
-# https://bugs.gentoo.org/661760
-# https://github.com/getdnsapi/getdns/issues/407
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/libbsd:=
-	dev-libs/libyaml:=
-	idn? ( net-dns/libidn2:= )
-	dev-libs/openssl:0=
-	libev? ( dev-libs/libev:= )
-	libevent? ( dev-libs/libevent:= )
-	libuv? ( dev-libs/libuv:= )
-	unbound? ( >=net-dns/unbound-1.4.16:= )
-"
-RDEPEND="
-	${DEPEND}
-	stubby? ( sys-libs/libcap:= )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
-
-src_configure() {
-	econf \
-		--runstatedir=/var/run \
-		$(use_enable static-libs static) \
-		$(use_with getdns-query getdns_query) \
-		$(use_with getdns-server-mon getdns_server_mon) \
-		$(use_with idn libidn2) \
-		$(use_with libev) \
-		$(use_with libevent) \
-		$(use_with libuv) \
-		$(use_with stubby) \
-		$(use_with threads libpthread) \
-		$(use_with unbound libunbound) \
-		--without-libidn \
-		--with-piddir=/var/run/stubby
-}
-
-src_install() {
-	default
-	if use stubby; then
-		newinitd "${FILESDIR}"/stubby.initd-r1 stubby
-		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/stubby.logrotate stubby
-		systemd_dounit "${S}"/stubby/systemd/stubby.service
-		dotmpfiles "${S}"/stubby/systemd/stubby.conf
-	fi
-}
-
-pkg_postinst() {
-	if use stubby; then
-		enewgroup stubby
-		enewuser stubby -1 -1 -1 stubby
-		fcaps cap_net_bind_service=ei /usr/bin/stubby
-	fi
-}
diff --git a/net-dns/getdns/getdns-1.5.2-r2.ebuild b/net-dns/getdns/getdns-1.5.2-r2.ebuild
deleted file mode 100644
index 805ea4a5e29b..000000000000
--- a/net-dns/getdns/getdns-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps systemd user tmpfiles
-
-DESCRIPTION="Modern asynchronous DNS API"
-HOMEPAGE="https://getdnsapi.net/"
-SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv nettle static-libs stubby +threads +unbound"
-
-REQUIRED_USE="gnutls? ( nettle )"
-
-# https://bugs.gentoo.org/661760
-# https://github.com/getdnsapi/getdns/issues/407
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/libbsd:=
-	dev-libs/libyaml:=
-	idn? ( net-dns/libidn2:= )
-	!gnutls? ( dev-libs/openssl:0= )
-	gnutls? ( net-libs/gnutls:0=[dane] )
-	libev? ( dev-libs/libev:= )
-	libevent? ( dev-libs/libevent:= )
-	libuv? ( dev-libs/libuv:= )
-	nettle? ( dev-libs/nettle:0= )
-	unbound? ( >=net-dns/unbound-1.4.16:= )
-"
-RDEPEND="
-	${DEPEND}
-	stubby? ( sys-libs/libcap:= )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
-
-src_configure() {
-	econf \
-		--runstatedir=/var/run \
-		$(use_enable static-libs static) \
-		$(use_with getdns-query getdns_query) \
-		$(use_with getdns-server-mon getdns_server_mon) \
-		$(usex gnutls '--with-gnutls' '' '' '') \
-		$(use_with idn libidn2) \
-		$(use_with libev) \
-		$(use_with libevent) \
-		$(use_with libuv) \
-		$(use_with nettle) \
-		$(use_with stubby) \
-		$(use_with threads libpthread) \
-		$(use_with unbound libunbound) \
-		--without-libidn \
-		--with-piddir=/var/run/stubby
-}
-
-src_install() {
-	default
-	if use stubby; then
-		newinitd "${FILESDIR}"/stubby.initd-r1 stubby
-		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/stubby.logrotate stubby
-		systemd_dounit "${S}"/stubby/systemd/stubby.service
-		dotmpfiles "${S}"/stubby/systemd/stubby.conf
-	fi
-}
-
-pkg_postinst() {
-	if use stubby; then
-		enewgroup stubby
-		enewuser stubby -1 -1 -1 stubby
-		fcaps cap_net_bind_service=ei /usr/bin/stubby
-	fi
-}
diff --git a/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild b/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild
deleted file mode 100644
index ab3972e67e66..000000000000
--- a/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-_SRCURI_P="${P/%_beta1/-beta.1}"
-
-inherit cmake fcaps systemd tmpfiles
-
-DESCRIPTION="Modern asynchronous DNS API"
-HOMEPAGE="https://getdnsapi.net/"
-SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby +unbound"
-
-S="${WORKDIR}/${_SRCURI_P}"
-
-# https://bugs.gentoo.org/661760
-# https://github.com/getdnsapi/getdns/issues/407
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/libbsd
-	dev-libs/libyaml
-	dev-libs/openssl:=
-	idn? ( net-dns/libidn2:= )
-	gnutls? (
-		net-libs/gnutls:0=[dane,openssl]
-		dev-libs/nettle:0=
-	)
-	libev? ( dev-libs/libev:= )
-	libevent? ( dev-libs/libevent:= )
-	libuv? ( dev-libs/libuv:= )
-	>=net-dns/unbound-1.5.9:=
-"
-RDEPEND="
-	${DEPEND}
-	stubby? (
-		acct-group/stubby
-		acct-user/stubby
-		sys-libs/libcap
-	)
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_RUNSTATEDIR=/var/run
-		-DBUILD_DOXYGEN=$(usex doc)
-		-DBUILD_GETDNS_QUERY=$(usex getdns-query)
-		-DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon)
-		-DBUILD_STUBBY=$(usex stubby)
-		-DENABLE_STATIC=$(usex static-libs)
-		-DENABLE_UNBOUND_EVENT_API=$(usex unbound)
-		-DUSE_GNUTLS=$(usex gnutls)
-		-DUSE_LIBEV=$(usex libev)
-		-DUSE_LIBEVENT2=$(usex libevent)
-		-DUSE_LIBIDN2=$(usex idn)
-		-DUSE_LIBUV=$(usex libuv)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if use stubby; then
-		newinitd "${FILESDIR}"/stubby.initd-r2 stubby
-		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/stubby.logrotate stubby
-		systemd_dounit "${S}"/stubby/systemd/stubby.service
-		dotmpfiles "${S}"/stubby/systemd/stubby.conf
-	fi
-}
-
-pkg_postinst() {
-	if use stubby; then
-		fcaps cap_net_bind_service=ei /usr/bin/stubby
-	fi
-}
diff --git a/net-dns/getdns/getdns-1.7.0.ebuild b/net-dns/getdns/getdns-1.7.0.ebuild
index 39b9a79e1866..0be2dffb7beb 100644
--- a/net-dns/getdns/getdns-1.7.0.ebuild
+++ b/net-dns/getdns/getdns-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound"
 
 S="${WORKDIR}/${_SRCURI_P}"
diff --git a/net-dns/getdns/metadata.xml b/net-dns/getdns/metadata.xml
index eef66059a1eb..9c8f002f154a 100644
--- a/net-dns/getdns/metadata.xml
+++ b/net-dns/getdns/metadata.xml
@@ -13,6 +13,5 @@
 		<flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> support</flag>
 		<flag name="libev">Enable <pkg>dev-libs/libev</pkg> support</flag>
 		<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
-		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> as crypto backend</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 5b41b1eb53fe..fe462a6d7284 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -4,7 +4,9 @@ AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11
 DIST knot-2.9.8.tar.xz 1194284 BLAKE2B c4329e5b2fc499851112d008af10c1a73bbe50cd07a4b5af984e99f389606b6f11c0b321dc26c14f872eb7cc70a99290a033f9aa9ff23a2b3694427605ffc704 SHA512 8104c3bdef2db4a79d6cd0fa4a30be1aa6edfa01363b97738d873445198cd031b4f5ab581d1a5277de49a8a042bb5340334be0579ceefa4b614e34c2cd454904
 DIST knot-3.0.4.tar.xz 1347928 BLAKE2B c97df0c04dbd6b96d2f2805a2bbb07bc3fd0ac64160619a55fdf93ac02e6d3f797dfae43ac8bc79450c59c88e0a521911517577ea19d67bb41186cfcd07dd743 SHA512 d674faaafcbe882539d28e53f1cd6cdda61ca8065f66dc0b9127f249f34b59a9d3d1ac206799c2974a2d38264842a2387db35f814bd05f3eaeac0b35b90b21ac
 DIST knot-3.0.6.tar.xz 1333296 BLAKE2B 74ee1133dbf954234c4b07a29986cb91363256f3450b3d270f6d458d723e89bd1f7434881aa51632f02c369a16ca461e8ab892c34a2cf2ed612aa9040c91d535 SHA512 f1bfb0bc3a4cf622a68562409e71c8b84ee628a5452b48e172148bcac9cd0827b60a0c060075b80a086ca65da958d2d63e33ef7e373ab300b50089d06af3e5d0
+DIST knot-3.0.7.tar.xz 1334788 BLAKE2B 0ac740b25912ae84714e078963880c27082f8d0e668f0df3b04a6a8a3588d0ffaf0ded9f6e3dd64cf9bc0b08673219e32ac3ffb86f64b9ea97cb61ab9cb545d4 SHA512 89e17cd2bc5a07b05ccd11cfd58481078eff4076a537d1623ed575c1ab87eac87ce949c12dc35eb15dc7e4358a405c19a6660b4da9abc230077a251792f196bd
 EBUILD knot-2.9.8.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
 EBUILD knot-3.0.4.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
 EBUILD knot-3.0.6.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
+EBUILD knot-3.0.7.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
 MISC metadata.xml 1707 BLAKE2B 6eeedcb9dea44ad97afe8ed57bc529ea23bfa93c72163c566cc527a0284addbaea3f2fed4804853c8fb0431f38691356eae305c32f7e4a1256ef634894ce2a44 SHA512 e555e86949c2671b21e7e62a7aa346417f36ca9953fa45c5a4d1a0a4d46aec8bb4dde6c07121e1f5ebe12116756f3f7daf27455305b9158577f060c6237d047a
diff --git a/net-dns/knot/knot-3.0.7.ebuild b/net-dns/knot/knot-3.0.7.ebuild
new file mode 100644
index 000000000000..ff2ab85cf4eb
--- /dev/null
+++ b/net-dns/knot/knot-3.0.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="https://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+KNOT_MODULES=(
+	"+cookies"
+	"+dnsproxy"
+	"dnstap"
+	"geoip"
+	"+noudp"
+	"+onlinesign"
+	"+queryacl"
+	"+rrl"
+	"+stats"
+	"+synthrecord"
+	"+whoami"
+)
+IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
+
+RDEPEND="
+	acct-group/knot
+	acct-user/knot
+	dev-db/lmdb
+	dev-libs/libedit
+	dev-libs/userspace-rcu:=
+	dev-python/lmdb
+	net-libs/gnutls:=
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c:=
+	)
+	geoip? ( dev-libs/libmaxminddb:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+		libidn2? ( net-dns/libidn2:= )
+	)
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local u
+	local my_conf=(
+		--with-storage="${EPREFIX}/var/lib/${PN}"
+		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable fastparser)
+		$(use_enable dnstap)
+		$(use_enable doc documentation)
+		$(use_enable utils utilities)
+		--enable-systemd=$(usex systemd)
+		$(use_with idn libidn)
+	)
+
+	for u in "${KNOT_MODULES[@]#+}"; do
+		my_conf+=("$(use_with ${u} module-${u})")
+	done
+
+	econf "${my_conf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+
+	default
+
+	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
+
+	newinitd "${FILESDIR}/knot.init" knot
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index b5c229403dbf..9b56a9b3f651 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -6,5 +6,5 @@ AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b0
 AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924
 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def
 DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424
-EBUILD opendnssec-2.0.3-r1.ebuild 6772 BLAKE2B 3504ea046ae454d4b8ef71cc3c59c1a557e64504664b9368676617ca057502cf7cfdf6522482ab3081558307232a744dc3ace782254e253e89cfefa2ee22ee22 SHA512 fcfd24a3da0b1e83ec1d70fef0a6d8c461c2eb020b429460d4e5e45443778485059bfc5cdea2ce30764a4bfd6c12456706135ab7afbe20c6905bce0b249344f6
+EBUILD opendnssec-2.0.3-r2.ebuild 6846 BLAKE2B aee3a4fb1f3037143d7f08726f2f3bdeb8c737a710b051faf33c669ddd6b4e79b35449635fffe46472fd4f1b45cfd3e0c192ed05a18b2a3ff1b7e6e24d664b12 SHA512 c443bcfffee145b1a71d629de68ec08ae68e3f6fa670ac48e179348f5bee8e91ec07a8d3dfe8b7fff3d6b8765e6bfca812a3617365a726a14bd5104157704d73
 MISC metadata.xml 717 BLAKE2B a78c51d08bd665681b9977050e8337fbe95adface07632923e7bfa7f5ca9cbef0443bf8ada06480b862219720d71669220eeeca21d06edf68ba3452667faa861 SHA512 203b2e6d467ecd5832d7a56a9d31d37f6427c6cf3d9ad45d4b18d4b9b3f74ac53dcfb03bea0bd2c68d34a9474992216c198173e65c8f7edc00f61ead434c2b1d
diff --git a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
deleted file mode 100644
index eea0ece708cc..000000000000
--- a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit autotools user
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +mysql readline +signer sqlite test ${PKCS11_IUSE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-libs/ldns
-	mysql? (
-		dev-db/mysql-connector-c:0=
-		dev-perl/DBD-mysql
-	)
-	opensc? ( dev-libs/opensc )
-	readline? ( sys-libs/readline:0 )
-	softhsm? ( dev-libs/softhsm:* )
-	sqlite? (
-		dev-db/sqlite:3
-		dev-perl/DBD-SQLite
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	test? (
-		app-text/trang
-	)
-"
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	^^ ( softhsm opensc external-hsm )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch"
-	"${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
-	"${FILESDIR}/${PN}-drop-privileges-2.0.x.patch"
-	"${FILESDIR}/${PN}-use-system-trang.patch"
-	"${FILESDIR}/${PN}-openssl1.1.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS )
-
-check_pkcs11_setup() {
-	# PKCS#11 HSM's are often only available with proprietary drivers not
-	# available in portage tree.
-
-	if use softhsm; then
-		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
-		elog "Building with SoftHSM PKCS#11 library support."
-	fi
-	if use opensc; then
-		PKCS11_LIB=opensc
-		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
-		elog "Building with OpenSC PKCS#11 library support."
-	fi
-	if use external-hsm; then
-		if [[ -n ${PKCS11_SCA6000} ]]; then
-			PKCS11_LIB=sca6000
-			PKCS11_PATH=${PKCS11_SCA6000}
-		elif [[ -n ${PKCS11_ETOKEN} ]]; then
-			PKCS11_LIB=etoken
-			PKCS11_PATH=${PKCS11_ETOKEN}
-		elif [[ -n ${PKCS11_NCIPHER} ]]; then
-			PKCS11_LIB=ncipher
-			PKCS11_PATH=${PKCS11_NCIPHER}
-		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
-			PKCS11_LIB=aepkeyper
-			PKCS11_PATH=${PKCS11_AEPKEYPER}
-		else
-			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
-			ewarn "library. To set a path, set one of the following environment variables:"
-			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
-			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
-			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
-			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
-			ewarn "Example:"
-			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
-			ewarn "or store the variable into /etc/portage/make.conf"
-			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
-		fi
-		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
-	fi
-}
-
-pkg_pretend() {
-	if has_version "<net-dns/opendnssec-1.4.10"; then
-		################################################################################
-		eerror "You are already using OpenDNSSEC."
-		eerror "In order to migrate to version >=2.0.0 you need to upgrade to"
-		eerror "version >=1.4.10 first:"
-		eerror ""
-		eerror "   emerge \"<net-dns/opendnssec-2\""
-		eerror ""
-		eerror "See https://github.com/opendnssec/opendnssec/blob/2.0/master/MIGRATION"
-		eerror "for details."
-		eerror ""
-		die "Please upgrade to version >=1.4.10 first for proper db migraion"
-	fi
-
-	check_pkcs11_setup
-}
-
-pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-
-	# pretend does not preserve variables so we need to run this once more
-	check_pkcs11_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-cunit \
-		--localstatedir="${EPREFIX}/var" \
-		--disable-static \
-		--with-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
-		$(use_with readline) \
-		$(use_enable signer)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -delete
-
-	# Remove subversion tags from config files to avoid useless config updates
-	sed -i \
-		-e '/<!-- \$Id:/ d' \
-		"${ED}"/etc/opendnssec/* || die
-
-	# install db update/migration stuff
-	insinto /usr/share/opendnssec/db
-	if use sqlite; then
-		doins enforcer/utils/convert_mysql_to_sqlite
-	fi
-	if use mysql; then
-		doins enforcer/utils/convert_sqlite_to_mysql
-	fi
-
-	insinto /usr/share/opendnssec/db/sql
-	if use sqlite; then
-		doins enforcer/src/db/schema.sqlite
-	fi
-	if use mysql; then
-		doins enforcer/src/db/schema.mysql
-	fi
-
-	insinto /usr/share/opendnssec/db/1.4-2.0_db_convert
-	doins enforcer/utils/1.4-2.0_db_convert/find_problematic_zones.sql
-	doins enforcer/utils/1.4-2.0_db_convert/README.md
-	if use sqlite; then
-		doins enforcer/utils/1.4-2.0_db_convert/sqlite_convert.sql
-		doins enforcer/utils/1.4-2.0_db_convert/convert_sqlite
-	fi
-	if use mysql; then
-		doins enforcer/utils/1.4-2.0_db_convert/convert_mysql
-		doins enforcer/utils/1.4-2.0_db_convert/mysql_convert.sql
-	fi
-
-	# patch scripts to find schema files
-	sed -i \
-		-e 's,^SCHEMA=../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
-		-e 's,^SCHEMA=../../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
-		"${ED}"/usr/share/opendnssec/db/convert_* \
-		"${ED}"/usr/share/opendnssec/db/1.4-2.0_db_convert/convert_* || die
-
-	# fix permissions
-	fowners root:opendnssec /etc/opendnssec
-	fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
-	fowners opendnssec:opendnssec /var/lib/opendnssec/{,enforcer,signconf,signed,signer,unsigned}
-
-	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
-	local v
-	if use softhsm; then
-		elog "Please make sure that you create your softhsm database in a location writeable"
-		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
-		elog "Suggested configuration is:"
-		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
-		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
-		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
-	fi
-	for v in $REPLACING_VERSIONS; do
-		case $v in
-			1.4.*)
-				ewarn ""
-				ewarn "You are upgrading from version 1.4."
-				ewarn ""
-				ewarn "A migration is needed from 1.4 to 2.0."
-				ewarn "For details see /usr/share/doc/${P}/MIGRATION*"
-				ewarn ""
-				ewarn "For your convenience the mentioned migration scripts and README"
-				ewarn "have been installed to /usr/share/${PN}/db/1.4-2.0_db_convert"
-				ewarn ""
-			;;
-		esac
-	done
-}
diff --git a/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild b/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..17efc48d4904
--- /dev/null
+++ b/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_}"
+PKCS11_IUSE="+softhsm opensc external-hsm"
+
+inherit autotools
+
+DESCRIPTION="An open-source turn-key solution for DNSSEC"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +mysql readline +signer sqlite test ${PKCS11_IUSE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/opendnssec
+	acct-user/opendnssec
+	dev-lang/perl
+	dev-libs/libxml2
+	dev-libs/libxslt
+	net-libs/ldns
+	mysql? (
+		dev-db/mysql-connector-c:0=
+		dev-perl/DBD-mysql
+	)
+	opensc? ( dev-libs/opensc )
+	readline? ( sys-libs/readline:0 )
+	softhsm? ( dev-libs/softhsm:* )
+	sqlite? (
+		dev-db/sqlite:3
+		dev-perl/DBD-SQLite
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	test? (
+		app-text/trang
+	)
+"
+
+REQUIRED_USE="
+	^^ ( mysql sqlite )
+	^^ ( softhsm opensc external-hsm )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch"
+	"${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
+	"${FILESDIR}/${PN}-drop-privileges-2.0.x.patch"
+	"${FILESDIR}/${PN}-use-system-trang.patch"
+	"${FILESDIR}/${PN}-openssl1.1.patch"
+)
+
+DOCS=( MIGRATION NEWS )
+
+check_pkcs11_setup() {
+	# PKCS#11 HSM's are often only available with proprietary drivers not
+	# available in portage tree.
+
+	if use softhsm; then
+		PKCS11_LIB=softhsm
+		if has_version ">=dev-libs/softhsm-1.3.1"; then
+			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
+		else
+			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
+		fi
+		elog "Building with SoftHSM PKCS#11 library support."
+	fi
+	if use opensc; then
+		PKCS11_LIB=opensc
+		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
+		elog "Building with OpenSC PKCS#11 library support."
+	fi
+	if use external-hsm; then
+		if [[ -n ${PKCS11_SCA6000} ]]; then
+			PKCS11_LIB=sca6000
+			PKCS11_PATH=${PKCS11_SCA6000}
+		elif [[ -n ${PKCS11_ETOKEN} ]]; then
+			PKCS11_LIB=etoken
+			PKCS11_PATH=${PKCS11_ETOKEN}
+		elif [[ -n ${PKCS11_NCIPHER} ]]; then
+			PKCS11_LIB=ncipher
+			PKCS11_PATH=${PKCS11_NCIPHER}
+		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
+			PKCS11_LIB=aepkeyper
+			PKCS11_PATH=${PKCS11_AEPKEYPER}
+		else
+			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
+			ewarn "library. To set a path, set one of the following environment variables:"
+			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
+			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
+			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
+			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
+			ewarn "Example:"
+			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
+			ewarn "or store the variable into /etc/portage/make.conf"
+			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
+		fi
+		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
+	fi
+}
+
+pkg_pretend() {
+	if has_version "<net-dns/opendnssec-1.4.10"; then
+		################################################################################
+		eerror "You are already using OpenDNSSEC."
+		eerror "In order to migrate to version >=2.0.0 you need to upgrade to"
+		eerror "version >=1.4.10 first:"
+		eerror ""
+		eerror "   emerge \"<net-dns/opendnssec-2\""
+		eerror ""
+		eerror "See https://github.com/opendnssec/opendnssec/blob/2.0/master/MIGRATION"
+		eerror "for details."
+		eerror ""
+		die "Please upgrade to version >=1.4.10 first for proper db migraion"
+	fi
+
+	check_pkcs11_setup
+}
+
+pkg_setup() {
+	# pretend does not preserve variables so we need to run this once more
+	check_pkcs11_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-cunit \
+		--localstatedir="${EPREFIX}/var" \
+		--disable-static \
+		--with-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
+		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
+		$(use_with readline) \
+		$(use_enable signer)
+}
+
+src_compile() {
+	default
+	use doc && emake docs
+}
+
+src_install() {
+	default
+
+	# remove useless .la files
+	find "${ED}" -name '*.la' -delete
+
+	# Remove subversion tags from config files to avoid useless config updates
+	sed -i \
+		-e '/<!-- \$Id:/ d' \
+		"${ED}"/etc/opendnssec/* || die
+
+	# install db update/migration stuff
+	insinto /usr/share/opendnssec/db
+	if use sqlite; then
+		doins enforcer/utils/convert_mysql_to_sqlite
+	fi
+	if use mysql; then
+		doins enforcer/utils/convert_sqlite_to_mysql
+	fi
+
+	insinto /usr/share/opendnssec/db/sql
+	if use sqlite; then
+		doins enforcer/src/db/schema.sqlite
+	fi
+	if use mysql; then
+		doins enforcer/src/db/schema.mysql
+	fi
+
+	insinto /usr/share/opendnssec/db/1.4-2.0_db_convert
+	doins enforcer/utils/1.4-2.0_db_convert/find_problematic_zones.sql
+	doins enforcer/utils/1.4-2.0_db_convert/README.md
+	if use sqlite; then
+		doins enforcer/utils/1.4-2.0_db_convert/sqlite_convert.sql
+		doins enforcer/utils/1.4-2.0_db_convert/convert_sqlite
+	fi
+	if use mysql; then
+		doins enforcer/utils/1.4-2.0_db_convert/convert_mysql
+		doins enforcer/utils/1.4-2.0_db_convert/mysql_convert.sql
+	fi
+
+	# patch scripts to find schema files
+	sed -i \
+		-e 's,^SCHEMA=../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
+		-e 's,^SCHEMA=../../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
+		"${ED}"/usr/share/opendnssec/db/convert_* \
+		"${ED}"/usr/share/opendnssec/db/1.4-2.0_db_convert/convert_* || die
+
+	# create directories
+	keepdir /var/lib/opendnssec/{,enforcer,signconf,signed,signer,unsigned}
+
+	# fix permissions
+	fowners root:opendnssec /etc/opendnssec
+	fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
+	fowners opendnssec:opendnssec /var/lib/opendnssec/{,enforcer,signconf,signed,signer,unsigned}
+
+	# install conf/init script
+	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
+	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
+}
+
+pkg_postinst() {
+	local v
+	if use softhsm; then
+		elog "Please make sure that you create your softhsm database in a location writeable"
+		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
+		elog "Suggested configuration is:"
+		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
+		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
+		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
+	fi
+	for v in $REPLACING_VERSIONS; do
+		case $v in
+			1.4.*)
+				ewarn ""
+				ewarn "You are upgrading from version 1.4."
+				ewarn ""
+				ewarn "A migration is needed from 1.4 to 2.0."
+				ewarn "For details see /usr/share/doc/${P}/MIGRATION*"
+				ewarn ""
+				ewarn "For your convenience the mentioned migration scripts and README"
+				ewarn "have been installed to /usr/share/${PN}/db/1.4-2.0_db_convert"
+				ewarn ""
+			;;
+		esac
+	done
+}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 7206d3108d97..2798ad8d273a 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -2,7 +2,7 @@ AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf40345342288
 AUX pdns-4.4.1-boost-1.76.patch 830 BLAKE2B b74f9deece5c1bd71f6c3df571f288cbab01c567be4236bb3f94187e076fef461d8cc45e2bbe905adb83cbc785f00f91d191e30745ce42325d902b36f73c9b06 SHA512 0ab0a02d30ee5c8aa0b906c1a58e94b7e8aba8e382f963b528b52c926f000ccf00687a0445e0de5b3ab875910e4affd1f1697d4cab7a4e72d558790abd85112d
 AUX pdns-r1 2815 BLAKE2B cd607cb30a94540eca9cfa2defb7c996f6e151875fcaad8ad3357261937868bc346962f1080ad45a0ef38c2dfc126eb11e41837ee0784f677d1e7c071589a057 SHA512 4c0442d8d92d95268d4971f80782d2772e2a22c43da00566a9328c79a834e4355b2610d133034351d7137ed6cd7fda300f3db8093b09d5852cea44d983de1e39
 DIST pdns-4.4.1.tar.bz2 1276990 BLAKE2B 9771cf3273ab7e8ab4607a91563bfe0dc3f4532b5420861d816eacd2798d66de3a1eb824c191264f9106ec47bd6003d99108b8df678190055948779b9b3b070f SHA512 a6f31972f77ded8ecfb523e8810dd90e5b7aa628746fee2a9a0daae2a7935800f111ce8617ffd71d5ce3881947d4ffc36c9cb37996a7bcc514536bb4abe1f79e
-DIST pdns-4.5.0-rc2.tar.bz2 1266366 BLAKE2B 9081f8cce94ababb0165c64756d3d8065730607950f974fb0a0219732774f925ba6b8f93cd22dc7c76d49e0179d4cd678216aa3feefd09b7235695e1de3fddcf SHA512 7b98c469e13a9d4878e9f1b11e16dffa9d8ab690e8f538a285a59f226cac629f3ec2bded025d77c6f8aacf8a04ff9ee43e9057d832475388b3620cde55b0d2a2
+DIST pdns-4.5.0.tar.bz2 1267077 BLAKE2B 62e0d90db3f6fd7566184a80519c95d89e3360c28450ef4fd9bdaba3f0bc38a517827ef4bacfa66a3ac7ffb2654b31a9d81406dd3ae35b0ceb34c79f2c18ac29 SHA512 7643cbd08e7cf6c2f5911784222b1e1f686153f4c8c4d5e0ee756a5c08b4fe52b617a948ef7f258ceddc45f31331c68a10034176fbd07cb2e2ba38174e54a17f
 EBUILD pdns-4.4.1-r1.ebuild 4429 BLAKE2B e530739c8ce95a3099792a6cad1ea2c2e3d2e99f851e9a766f2e35da9491f4bfea6ca7715fea57044c293e80fb3f7770917cc243c241911bde87625a10891f14 SHA512 7738879bbf4dc54acff95dbafdba2eef075f025df74a38984072750fffeb0d6ee7652e02a5783d4ccb416d658d3cbeafbec24369ce8befc0c16650dcefbe6bc0
-EBUILD pdns-4.5.0_rc2.ebuild 4261 BLAKE2B d53acbdaf0a9ed86fdf73584a7ffa5a8130a1e675125012a5b31359004b6ab8287d2949fca7c564d598d867faf48cd0ffe9420dd22934e385184d4429d8cd406 SHA512 584af45d783e50b35516d68b14dac18f6b035b0b72c49d3b7d61b3a5bd876d720820d37060493f1baf77bc40faa58b8f502a22539e66c5f39096c68d687c60ce
+EBUILD pdns-4.5.0.ebuild 4258 BLAKE2B 0ac75cefd60a8e7947265a16ce9cf5f0611166d31c2373770b276ddf4fdc284f0a83d488fd8ea7f8cb3b731e4032eeeab8e07b8959b41a750a79be95b1bf0ae5 SHA512 77809ef2a8cd48f57c272ad9260751fa13088c4a42c660623b00246165c48ff888f3f6a2591e8dab6485eb13675d6171be2d8e96f2fe7efe1f8721140137b8f0
 MISC metadata.xml 1111 BLAKE2B 5a55e94593f1c010f9ee71fa2d3bc887a0eddc8627db36a1792b911a1cfe3fa3d5a33923b95d18a02f36097717d76ed2aae711c2deb793625b1186090ad072c8 SHA512 c010bbd0daa87980a4d9f164fc3d15239251890e56c63b1165d55a92b9c0f24e5f141439bdfc13b4efa4483e0fc199cd6107e2f152d26d4ca954f4c3d0cc4913
diff --git a/net-dns/pdns/pdns-4.5.0.ebuild b/net-dns/pdns/pdns-4.5.0.ebuild
new file mode 100644
index 000000000000..c45db0959c30
--- /dev/null
+++ b/net-dns/pdns/pdns-4.5.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="debug doc geoip ldap lua-records mydns mysql postgres remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	mydns? ( mysql )"
+
+DEPEND="${LUA_DEPS}
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.35:=
+	lua-records? ( >=net-misc/curl-7.21.3 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )"
+RDEPEND="${DEPEND}
+	acct-user/pdns
+	acct-group/pdns"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${P/_/-}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-modules= \
+		--with-dynmodules="${dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable lua-records) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	local old
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 3.2 || continue
+
+		echo
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
+
+		break
+	done
+
+	if use postgres; then
+		for old in ${REPLACING_VERSIONS}; do
+			ver_test ${old} -lt 4.1.11-r1 || continue
+
+			echo
+			ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend."
+			ewarn "This security fix needs to be applied manually to the database schema."
+			ewarn "Please refer to the official security advisory for more information:"
+			ewarn
+			ewarn "  https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html"
+
+			break
+		done
+	fi
+}
diff --git a/net-dns/pdns/pdns-4.5.0_rc2.ebuild b/net-dns/pdns/pdns-4.5.0_rc2.ebuild
deleted file mode 100644
index 0333a674c4fa..000000000000
--- a/net-dns/pdns/pdns-4.5.0_rc2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua-single
-
-DESCRIPTION="The PowerDNS Daemon"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="" # ~amd64
-
-# other possible flags:
-# db2: we lack the dep
-# oracle: dito (need Oracle Client Libraries)
-# xdb: (almost) dead, surely not supported
-
-IUSE="debug doc geoip ldap lua-records mydns mysql postgres remote sodium sqlite systemd tools tinydns test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	mydns? ( mysql )"
-
-DEPEND="${LUA_DEPS}
-	dev-libs/openssl:=
-	>=dev-libs/boost-1.35:=
-	lua-records? ( >=net-misc/curl-7.21.3 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
-	sqlite? ( dev-db/sqlite:3 )
-	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
-	sodium? ( dev-libs/libsodium:= )
-	tinydns? ( >=dev-db/tinycdb-0.77 )"
-RDEPEND="${DEPEND}
-	acct-user/pdns
-	acct-group/pdns"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${P/_/-}
-
-src_configure() {
-	local dynmodules="pipe bind" # the default backends, always enabled
-
-	#use db2 && dynmodules+=" db2"
-	use ldap && dynmodules+=" ldap"
-	use mydns && dynmodules+=" mydns"
-	use mysql && dynmodules+=" gmysql"
-	#use oracle && dynmodules+=" goracle oracle"
-	use postgres && dynmodules+=" gpgsql"
-	use remote && dynmodules+=" remote"
-	use sqlite && dynmodules+=" gsqlite3"
-	use tinydns && dynmodules+=" tinydns"
-	use geoip && dynmodules+=" geoip"
-	#use xdb && dynmodules+=" xdb"
-
-	econf \
-		--disable-static \
-		--sysconfdir=/etc/powerdns \
-		--libdir=/usr/$(get_libdir)/powerdns \
-		--with-service-user=pdns \
-		--with-service-group=pdns \
-		--with-modules= \
-		--with-dynmodules="${dynmodules}" \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		--with-lua="${ELUA}" \
-		$(use_enable debug verbose-logging) \
-		$(use_enable lua-records) \
-		$(use_enable test unit-tests) \
-		$(use_enable tools) \
-		$(use_enable systemd) \
-		$(use_with sodium libsodium) \
-		${myconf}
-}
-
-src_compile() {
-	default
-	use doc && emake -C codedocs codedocs
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-	fperms 0700 /etc/powerdns
-	fperms 0600 /etc/powerdns/pdns.conf
-
-	# set defaults: setuid=pdns, setgid=pdns
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
-		"${D}"/etc/powerdns/pdns.conf
-
-	newinitd "${FILESDIR}"/pdns-r1 pdns
-
-	keepdir /var/empty
-
-	if use doc; then
-		docinto html
-		dodoc -r codedocs/html/.
-	fi
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/dnsdomain2.schema
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "PowerDNS provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-
-	local old
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 3.2 || continue
-
-		echo
-		ewarn "To fix a security bug (bug #458018) had the following"
-		ewarn "files/directories the world-readable bit removed (if set):"
-		ewarn "  ${EPREFIX}/etc/powerdns"
-		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
-		ewarn "Check if this is correct for your setup"
-		ewarn "This is a one-time change and will not happen on subsequent updates."
-		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
-
-		break
-	done
-
-	if use postgres; then
-		for old in ${REPLACING_VERSIONS}; do
-			ver_test ${old} -lt 4.1.11-r1 || continue
-
-			echo
-			ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend."
-			ewarn "This security fix needs to be applied manually to the database schema."
-			ewarn "Please refer to the official security advisory for more information:"
-			ewarn
-			ewarn "  https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html"
-
-			break
-		done
-	fi
-}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 16c44327085d..586859877a7d 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index d61999ed8419..7c6b6739bba5 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -3,10 +3,16 @@ AUX 4.4/samba4.initd-r1 1112 BLAKE2B 91d28710ccd512e19307bfd5ba97710ca071b478696
 AUX 4.4/system-auth-winbind.pam 590 BLAKE2B d8c0190dff88c5b65f7f01b3a84fd776194d3b4ce5c973bd1145e6a12750f01882b2873be03b537e9a68899c0a19fee7a4834385961090e4cb69dda7ae1763c0 SHA512 0886cfd99b3c3dc117b2a83b04bf59d080ebf77d6ea91f24cfc4d8be7af9db377e0efc2216e7c1f8a180b09fb425476ef6874180d9f0fa47e4889faf1d429679
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2
+DIST samba-4.13.10.tar.gz 18450805 BLAKE2B 3e9e1c951efe45b1954428c479aefc715b1fff6264d3735873710ca35a6b28320dd82a21e6abb5d75d500dc93514730f88907f51c601b68dceb1261b13163bf2 SHA512 dc4ad2dabc630575150d7b6db7818cd62827bdd9cc955c856bf0ba1684a1258d6306acd6e373aff1893255ad42d97fe8bf67c6fc30c5cffb1624fbfe4a238865
 DIST samba-4.13.9.tar.gz 18443813 BLAKE2B 24046586f666e9db02e1dd71d7eb854691f39e6b575b9652a8b7c1aa5569c856dfd48911e3f221de74f9deec5808152fa2836d03bb9810d55d4f526f1567574b SHA512 35c98979c1141fe4bd700e3c8f2439ec08876697faeaced6668ea6a9fea1d8303ca34e82123499aa4a41054b9ed6e1260ae779ea8d59978ba6de6b5861f21948
 DIST samba-4.14.4.tar.gz 18645552 BLAKE2B 4fbf4b000496b66c7c464a4b522108fde12df30dda90d0a86143c2a9ffa9d8907bbeab1bbad8974f87d4851f0afc31315ab52f27b23d19131934e89659c4e270 SHA512 200b2b2b08b369915e045f22ee993d5deea7a2533c6c582d4b88c614adcad5529109d449e843a2a1f292e5cfb1877d66421b5b0801ad988896cbe5413717e4dc
 DIST samba-4.14.5.tar.gz 18653694 BLAKE2B 6c8fdafb20d6a42797a2f55f29e9f4a239845fd802c0384c0cb88d916f240a1ed18fb3e9a041eb70e8c2f56abb6c63f3229d40d710ab5ddf3697e0161d61726f SHA512 ef50aae93141a41034a10eb0b1a135d4b8b28c63663b930d24d6199d9ffd1fd139b6443d1859df19d3299b507a4a1c2810de057e2affd4e8b8cfc7175fdd7b39
-EBUILD samba-4.13.9-r1.ebuild 9898 BLAKE2B c99d4c8205f5a241394e87e175dfef55ba13ceae777eb8d65b27d82cacbe969f45475fc854b8709bf8c705e3537dfe93c1cd6edcdfc30fcc08a50e79074443eb SHA512 a345cfcebaacdcd46c057a2606ea2061050f61fe7510d7d8985155a26dee200b3f188bd5a88b88831c12bf658cc0cc6f30d7f45b37b57d43eb0867d7b8fc79e3
-EBUILD samba-4.14.4-r1.ebuild 10018 BLAKE2B af501d67d4de9708b2b206d8813c651d06188e9d23c1ae240444b82d4102e2c3c13827fbb91d89d0bbc1003565c146e921454475f764073b0d5fbf55e794f8c3 SHA512 3386f473d5b48d8c573d180e7acac786203aa314d8aac5491ac022d01272d25049871da1bbe3df36e958a42fd280245fba873ad155fd5159946c082e049131be
-EBUILD samba-4.14.5-r1.ebuild 10018 BLAKE2B af501d67d4de9708b2b206d8813c651d06188e9d23c1ae240444b82d4102e2c3c13827fbb91d89d0bbc1003565c146e921454475f764073b0d5fbf55e794f8c3 SHA512 3386f473d5b48d8c573d180e7acac786203aa314d8aac5491ac022d01272d25049871da1bbe3df36e958a42fd280245fba873ad155fd5159946c082e049131be
+DIST samba-4.14.6.tar.gz 18661572 BLAKE2B d3bd9ba13c89afab1a2d119cbd0488240802710b24c6f681ba962804c6f5097003ed939da8747582aab710405f09ca90eded06eeddd3dd42a5aaa2a99be6be1b SHA512 0ce3f46b2693daa27656fe9a04925cbe7dd398342cab352f0422a350eb9f91d1ea6d64fb18d04010b93fb3c0b9fe6434b23deb1f26018bd1f9bdc1b0f97beca2
+DIST samba-4.15.0rc1.tar.gz 18860258 BLAKE2B c6c49a32de44e491a6ca3018b0f00c350590f15e18a21342979191d88b84584374d0c2ec38091e281c262a90a75fbf5b8d3c23d0a2fc7beb097723006bf3b4e5 SHA512 df5c285cbe37acc95513ed740e82df5823cfcfc6701606998115e82e6c9e8576ca1f8fb93e52d9a7f109f78878575e34d214c30ed5cfa177117d280e0e27597d
+EBUILD samba-4.13.10-r1.ebuild 9925 BLAKE2B 7499784a22a0684626ab7f7106a75fb327601e19910473f27e512383aebb2b075394a094f797c3b21aff4d54bf5c2f12c66c46cd91603d5bfabc389df20d6d3a SHA512 ec553079dc8c7f3cfbc6249692cd2504931006027a40916797e01f2b15205542137ead14ccb259f063293260a8651d0fad7224fc90e21cd0981a80ac70527120
+EBUILD samba-4.13.9-r2.ebuild 9918 BLAKE2B 78785e116b4322bc801c72f0e9f5afdf2afe893752cbfb310fec4df18837bd8eb97538e2a4ca34bda0c0c5b1e5114c950bf897c56515279cca74636e7092a620 SHA512 4eba7e521b6ac0cbccdef79a04aeae79d70963417a2abe20c9eb3c13dd91b4ddedad4b6a2e34134cb55fd37b487f9f597856463006b088ea00301c00bcf9ba68
+EBUILD samba-4.14.4-r2.ebuild 10038 BLAKE2B c8e42cd30cb2890d5f794aec3948d7dcb8fb7bf4f7c69cab1e0ab485e98493513beeb7126e912fa1787dd932ad77b1242cac385170678e426faeb5c051c9ef9c SHA512 3e733d2ea93c4d48f7d952cd56d9e62398533a360ab475af74b1aa8b92996c93cb03a99fe5942bb463e270fcb227a9197940f29584a6139a851c9b706be8ef51
+EBUILD samba-4.14.5-r2.ebuild 10038 BLAKE2B c8e42cd30cb2890d5f794aec3948d7dcb8fb7bf4f7c69cab1e0ab485e98493513beeb7126e912fa1787dd932ad77b1242cac385170678e426faeb5c051c9ef9c SHA512 3e733d2ea93c4d48f7d952cd56d9e62398533a360ab475af74b1aa8b92996c93cb03a99fe5942bb463e270fcb227a9197940f29584a6139a851c9b706be8ef51
+EBUILD samba-4.14.6-r1.ebuild 10038 BLAKE2B c8e42cd30cb2890d5f794aec3948d7dcb8fb7bf4f7c69cab1e0ab485e98493513beeb7126e912fa1787dd932ad77b1242cac385170678e426faeb5c051c9ef9c SHA512 3e733d2ea93c4d48f7d952cd56d9e62398533a360ab475af74b1aa8b92996c93cb03a99fe5942bb463e270fcb227a9197940f29584a6139a851c9b706be8ef51
+EBUILD samba-4.15.0_rc1-r1.ebuild 9937 BLAKE2B 66e8112d122f032041ca131ac23e9dcb05fb890b71628c1b0de901cce427a829b59e9d7bb2e9758c1244efae2cb457a85add9a378ab34ef7bfc642353e792afd SHA512 ca5e1a4151930d9872be5489dcbc578b2d5332690c723405e49319c4a2aa9f78ead1b9888322e1391b41afe7ee5dff7a37b485a4fb5f9ce7054fb1f6557f2aff
 MISC metadata.xml 2165 BLAKE2B 5fa428c3ddb3f45073923778fc80ca4d62090232b9bb6bcfdd0a16a6c4c51304794db41359c17b6ba9492b30dba0f42ff7ada6c8a30c5df80e83e748d8009ee9 SHA512 8723f3a16210e8da11eb1d3ea8142bff3deeaecc44c62da68a789b5364bf3456aef65794b205d24cc41eff7ba03fffd38266aea2dd1883eff5c9ca305d2032ed
diff --git a/net-fs/samba/samba-4.13.10-r1.ebuild b/net-fs/samba/samba-4.13.10-r1.ebuild
new file mode 100644
index 000000000000..11a2973e57fe
--- /dev/null
+++ b/net-fs/samba/samba-4.13.10-r1.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addns? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.13.9-r1.ebuild b/net-fs/samba/samba-4.13.9-r1.ebuild
deleted file mode 100644
index b63fcec649a1..000000000000
--- a/net-fs/samba/samba-4.13.9-r1.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.13.9-r2.ebuild b/net-fs/samba/samba-4.13.9-r2.ebuild
new file mode 100644
index 000000000000..4f9c3873ee67
--- /dev/null
+++ b/net-fs/samba/samba-4.13.9-r2.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addns? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.14.4-r1.ebuild b/net-fs/samba/samba-4.14.4-r1.ebuild
deleted file mode 100644
index 64232a3a2cd9..000000000000
--- a/net-fs/samba/samba-4.14.4-r1.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-		addc? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
-		)
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.14.4-r2.ebuild b/net-fs/samba/samba-4.14.4-r2.ebuild
new file mode 100644
index 000000000000..fb2a26e35c4f
--- /dev/null
+++ b/net-fs/samba/samba-4.14.4-r2.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
+		)
+		addns? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.14.5-r1.ebuild b/net-fs/samba/samba-4.14.5-r1.ebuild
deleted file mode 100644
index 64232a3a2cd9..000000000000
--- a/net-fs/samba/samba-4.14.5-r1.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
-		addc? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
-		)
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.14.5-r2.ebuild b/net-fs/samba/samba-4.14.5-r2.ebuild
new file mode 100644
index 000000000000..fb2a26e35c4f
--- /dev/null
+++ b/net-fs/samba/samba-4.14.5-r2.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
+		)
+		addns? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.14.6-r1.ebuild b/net-fs/samba/samba-4.14.6-r1.ebuild
new file mode 100644
index 000000000000..fb2a26e35c4f
--- /dev/null
+++ b/net-fs/samba/samba-4.14.6-r1.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
+		)
+		addns? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.15.0_rc1-r1.ebuild b/net-fs/samba/samba-4.15.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..1921330d5a32
--- /dev/null
+++ b/net-fs/samba/samba-4.15.0_rc1-r1.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	ads? ( acl ldap python winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
+		)
+		ads? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	if [[ "${PV}" != *_rc* ]] ; then
+		elog "For further information and migration steps make sure to read "
+		elog "https://samba.org/samba/history/${P}.html "
+		elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+	fi
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 8f27f5b6d68d..b189fec04ba9 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index 22db95d79ea3..0350dc15fffc 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,5 +1,3 @@
-DIST neochat-1.1.1.tar.xz 195780 BLAKE2B b9eae0344d4e99c3b5ef9d7be0d633216fa989064c8499cd24b7fc65371bffc34551875a84edfabd2f359b091b588b04720309bb84b8fcfb1123f759bacd4dbd SHA512 ee50dfb7ba2aae8c6b03728e1326b03b0bc21df459397f137547b4684596fd07c42ae494037af894b2b37b53ade010463ee2f067ccede559ca868a723c83e17b
 DIST neochat-1.2.0.tar.xz 244064 BLAKE2B dcf728036269e3aefc524c1fea56f07f76c4132d810e2edb2c199ff8df7fd77ff8d90a5fbd6d13d59dae8894ccc312cf38107a3b5ba5a08fd80b31a0f8a53a0c SHA512 50837f44b899999753208363283c20a6b858bdaf26bba9e9762a04c2e65534014df88a9404ce7659a87d5e896e08a5e5f4ac23e3922ebe4cb6c7715b07058af7
-EBUILD neochat-1.1.1.ebuild 1178 BLAKE2B aaf035503fe6dbc079158e022279a3ad28cfcfdda5c46a360d0a5022952a08e8bf42432ecbe7f573fcd39ee702c43a8e6297e2acd365fb3193d5ed1523d7ed4c SHA512 ec8a90a38708c229d40c088c5374955eb2bf86f3471990ab0f2a4144d2866c95403c8c3fd6e251bb71e1a8335f2db07edc7dbacd8de7b8ded9e45a1e5b08cf5c
 EBUILD neochat-1.2.0.ebuild 1223 BLAKE2B e47931d4fae6c76714030e9d9cbc868359e1c862944c7c6818749ad9351ebc304c69d7608c087a8375b717514899fa2fbf40fda82ca00ecace0d8a46fb40260d SHA512 14f2f41b9ccde648165d71322d6bb533fee2db0ebc079fee942d066dfcc0ce8b6cd61557bae43251765f14aed5e072952e2414647c8b82373c81e05b086bac38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-im/neochat/neochat-1.1.1.ebuild b/net-im/neochat/neochat-1.1.1.ebuild
deleted file mode 100644
index 29cd32e584dc..000000000000
--- a/net-im/neochat/neochat-1.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.77.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Client for Matrix, the decentralized communication protocol"
-HOMEPAGE="https://apps.kde.org/neochat/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
-	app-text/cmark:=
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	media-libs/kquickimageeditor:5
-	>=net-libs/libquotient-0.6
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 0ffed0c0470c..24142f5142b6 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -11,6 +11,6 @@ DIST pidgin-2.14.5.tar.bz2 8696780 BLAKE2B 4563b6aabdaba8af7dd7a1f8978418bcdcc34
 DIST pidgin-2.14.6.tar.bz2 8672222 BLAKE2B d2e6428728f18096c957b10d7cc5e79704c0fbb403967e3968f59393db125307fc6fc84c90d66788b4a27bd9707b126c1f0df532c2a1e7d1b62356127e87371c SHA512 19ea12b6c9e99b6215a7d955f02d52ad19de8c4beb00806276c8c184d5cc338db119197e0cc9f4685705bd8b83f35c8f63565095b49a319f9696aab37735951b
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
 EBUILD pidgin-2.14.3-r1.ebuild 7896 BLAKE2B da92c7b805ada2398e14ac3bea9e7bf18e2e6ff8e22681a09ccfa26a2f042baa425c81820deb95ebe55d314c67f94d1f8bc5dba681a172033ccae7895aa0d5b6 SHA512 75eeee3de9fc161a67c9113b34b2533b927b42882745ad1ced19717aaa99e0e325ab239f67d084ab7093282434ba25ad49c5923f17b1b9b74c090c52888c61ce
-EBUILD pidgin-2.14.5.ebuild 7564 BLAKE2B ce2a64defa1f3146e49a7bc3614dbd071e9ab492206125ce9a679ca917f0c37d102cc168d54577ae89ef458af79002c1eaebe0c4bce7673a29e5a2e7abb092fa SHA512 c3a65efb90af2cc9496c63159bdd83080f5237ca698db8651bf6412250e9668b579a2447fccd30a84dc0cc67674a34d8b0a7aa234407d28ec2fbedf7fa2514ec
+EBUILD pidgin-2.14.5.ebuild 7562 BLAKE2B d8d867a76c4a95379cfc95638c8e15b2433792d49fbc7c98a26d4aee840842cbff97c748924cca9e2fefc5ce7e66be7c7effbf1f1cbe76ac5dc90217dc807d58 SHA512 fb64ce4d38c7327b2e4c0ef66b356f63077d955f2c3c468fb9fc300d866d03f185454a392e8080e785c4d73cf7343d4bb514dfc575d60071ae32fe5fade80b5d
 EBUILD pidgin-2.14.6.ebuild 7528 BLAKE2B e52ef0a392052d35a9d5baef958e8e090212d7fd51aabe20648dae787cddc0cc84c1ef46d99deff8cfd7e29f64c4677aa7a495d052198764c90d05d75fb70113 SHA512 e78ebfd31d3297d6c4932622c02762d73ab6c5ea195bd509ab8262d91eb77e3c1df649b251da3516139420809a8bd2f49f7f7c784a43d5f4cd642c4b8f66f6f2
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/pidgin-2.14.5.ebuild b/net-im/pidgin/pidgin-2.14.5.ebuild
index 1c4eac7d357c..602e11022512 100644
--- a/net-im/pidgin/pidgin-2.14.5.ebuild
+++ b/net-im/pidgin/pidgin-2.14.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 tk +xscreensaver zephyr zeroconf"
diff --git a/net-im/poezio/Manifest b/net-im/poezio/Manifest
index cbd8c503047f..59eee9975898 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1,4 +1,6 @@
+AUX Do-not-install-man-pages-and-files-in-usr-share-poez.patch 1171 BLAKE2B e9b4e52563be878b51556df03d63f12abc5cab1029a4ef37ee342247aa8fdbcfc6d4b92a8c87c5ec1186892e987ed899bce721a767f27e57ce1259eae67e2fa1 SHA512 25dd661bd43016381c0360b3039fdc1e0b93515869310579a7e22ea265e966ff0433ce59cc42e43192741a38e4bad52d9d0d1b7522287f74f3d6fb98d1eac6de
 DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6
-EBUILD poezio-0.13.1-r1.ebuild 1160 BLAKE2B 34b4dd398b936f9c3adbbe6c3a89a954a1749d92089541612288e6063c34035c3017218fc518c5aff71df67b368fb233ee818acb55aa499e79475c2d4a9ebc56 SHA512 2248557d7659952914bd24c0f03f8847177b2f7e0a46c88f6654dd7a584ec1b0317a8269abf94e2731c91382026063ee54cb062ecfeb18ba399f7441e8cb28e1
-EBUILD poezio-9999.ebuild 1161 BLAKE2B f0d80d98f10e133038c23578d3ba37d0b5a7b2f489413767554181fc52f709796e9c9d3df1e91c2a176a8a0e15ec0899a23586a193528890547cccd78973e354 SHA512 a61e2738d03662435d88bcb643b5537d3e96f4ca2d50a95fb27004f5e4e110304fe771ed5127f0fc35da029a0a4dcf15a4fd7730bc7638b11603c6bdba4a07b5
+EBUILD poezio-0.13.1-r1.ebuild 1161 BLAKE2B a7976c7b606455b2c9254f068ced7b172b3c61ef0849ae89053f6cb04db9b6433acb807c08e918b303037d5277529fe2c31284b06780eb332ac174b623040519 SHA512 0c71b88d20078f1be6fe0e5b45d7868ebd070ee019236363400db24c3330b7f4cea034e82dbf3e365dea1cb60c47bbcb04406dbe8e5d35993c65f48cd6338999
+EBUILD poezio-0.13.1-r2.ebuild 1413 BLAKE2B df4598dbc7901d42f3c05aac396bb8f9648157788ce831625a3d1b005e008c162bc7cf5614636c870d2f07aeaa5f88f164a4621d733f125470bcb0e9023f1086 SHA512 8101f429724b49eb448bf195f70e90d82d6bc5d2fb1298b319f045ab30c2b0a1e951caa7ac2a32d25907168d6fe4be1c2fab867cece022c5a5a624a6e6c8e99d
+EBUILD poezio-9999.ebuild 1414 BLAKE2B 6259c3f7ce2e922c0f2f080e3800d97a0514458c8fc3dc4566fc7a55e5f1666a604006daf4db116f31734dcf04759ce4979a60cdab81d6297f31ab9313b21ec2 SHA512 e39dd8db7ca0760b18fab75003ba91a8ed0831ba4dd04d37fd58419b31ced344b1a8d6923a2faf2d0c4063f734e0310f5105193cf57fc94b8a474ef3074874d7
 MISC metadata.xml 427 BLAKE2B c73646308afc13732dd104f4123e42f0906fdd14fd635dc64b8ec30519f4295e2577452a2c6a595f31b6ce91e0ffbee53a6b16e7a1938d5d072b7a24412ecec4 SHA512 ef402902e54cacbe357137c8f64bfbe081c151e39c7c1bbf715ad6e7d7acc0a7cabaf5e184184b0034973368b2fb70ad5787074d3570bc8cfd0caf0635119c71
diff --git a/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch b/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
new file mode 100644
index 000000000000..9506cdb14908
--- /dev/null
+++ b/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
@@ -0,0 +1,31 @@
+From 343c1e9be4cbf76c0ae437143b4000e36a1488ca Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Mon, 12 Jul 2021 15:08:30 +0200
+Subject: [PATCH] Do not install man pages and files in /usr/share/poezio
+
+Signed-off-by: Florian Schmaus <flo@geekplace.eu>
+---
+ setup.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index d1dde4d2f02f..bee8e4834b81 100755
+--- a/setup.py
++++ b/setup.py
+@@ -156,13 +156,9 @@ setup(
+     scripts=['scripts/poezio_logs'],
+     entry_points={'console_scripts': ['poezio = poezio.__main__:run']},
+     data_files=([
+-            ('share/man/man1/', ['data/poezio.1', 'data/poezio_logs.1']),
+-            ('share/poezio/', ['README.rst', 'COPYING', 'CHANGELOG']),
+             ('share/applications/', ['data/io.poez.Poezio.desktop']),
+             ('share/metainfo/', ['data/io.poez.Poezio.appdata.xml'])
+         ]
+-        + find_doc('share/doc/poezio/source', 'source')
+-        + find_doc('share/doc/poezio/html', 'build/html')
+         + sphinx_files_found
+     ),
+     install_requires=['slixmpp>=1.6.0', 'aiodns', 'pyasn1_modules', 'pyasn1', 'typing_extensions', 'setuptools'],
+-- 
+2.31.1
+
diff --git a/net-im/poezio/poezio-0.13.1-r1.ebuild b/net-im/poezio/poezio-0.13.1-r1.ebuild
index ae4c009726e2..a080438c959f 100644
--- a/net-im/poezio/poezio-0.13.1-r1.ebuild
+++ b/net-im/poezio/poezio-0.13.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 readme.gentoo-r1
 
diff --git a/net-im/poezio/poezio-0.13.1-r2.ebuild b/net-im/poezio/poezio-0.13.1-r2.ebuild
new file mode 100644
index 000000000000..df3051da179c
--- /dev/null
+++ b/net-im/poezio/poezio-0.13.1-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
+HOMEPAGE="https://poez.io/"
+LICENSE="ZLIB"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git"
+	inherit git-r3
+
+	# We build the html documentation using sphinx.
+	BDEPEND="dev-python/sphinx"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/slixmpp-1.5.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/Do-not-install-man-pages-and-files-in-usr-share-poez.patch"
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Delete unmaintained plugin which requires an excessive external dep
+	rm plugins/mpd_client.py || die
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if [[ -n "${EGIT_REPO_URI}" ]]; then
+		emake -C doc html
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman data/poezio.1 data/poezio_logs.1
+
+	if [[ -n "${EGIT_REPO_URI}" ]]; then
+		docinto html
+		dodoc -r doc/build/html/*
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "screen autoaway support" dev-python/pyinotify
+}
diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild
index f39bc56b1eb6..608644fde1b2 100644
--- a/net-im/poezio/poezio-9999.ebuild
+++ b/net-im/poezio/poezio-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
-inherit distutils-r1 readme.gentoo-r1
+inherit distutils-r1 optfeature xdg
 
 DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
 HOMEPAGE="https://poez.io/"
@@ -16,6 +16,9 @@ SLOT="0"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git"
 	inherit git-r3
+
+	# We build the html documentation using sphinx.
+	BDEPEND="dev-python/sphinx"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64"
@@ -25,16 +28,14 @@ RDEPEND="
 	dev-python/aiodns[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/slixmpp-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/slixmpp-1.7.1[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests pytest
+PATCHES=(
+	"${FILESDIR}/Do-not-install-man-pages-and-files-in-usr-share-poez.patch"
+)
 
-DOC_CONTENTS="
-Install these optional runtime dependencies for additional features.
-* dev-python/pyinotify for screen autoaway plugin support.
-"
-DISABLE_AUTOFORMATTING=true
+distutils_enable_tests pytest
 
 src_prepare() {
 	default
@@ -42,11 +43,27 @@ src_prepare() {
 	rm plugins/mpd_client.py || die
 }
 
+src_compile() {
+	distutils-r1_src_compile
+
+	if [[ -n "${EGIT_REPO_URI}" ]]; then
+		emake -C doc html
+	fi
+}
+
 src_install() {
 	distutils-r1_src_install
-	readme.gentoo_create_doc
+
+	doman data/poezio.1 data/poezio_logs.1
+
+	if [[ -n "${EGIT_REPO_URI}" ]]; then
+		docinto html
+		dodoc -r doc/build/html/*
+	fi
 }
 
 pkg_postinst() {
-	readme.gentoo_print_elog
+	xdg_pkg_postinst
+
+	optfeature "screen autoaway support" dev-python/pyinotify
 }
diff --git a/net-im/ricochet/Manifest b/net-im/ricochet/Manifest
index 0cefa0115574..25f8f6d22705 100644
--- a/net-im/ricochet/Manifest
+++ b/net-im/ricochet/Manifest
@@ -1,4 +1,4 @@
 DIST ricochet-1.1.4.tar.gz 1292671 BLAKE2B 15a71496b01992060fbdbedb0c73365aa250d9e6c4b5bb6223cbcd727a1cf062b1b9cd094d17ae33471e6095a071b1ea6d553a1bb2168974d45486995e204e9b SHA512 9f20fe8e34ea1d8d5b252eee1e164f0a97bf5b3818e864270ea79c0f018b229ec04b1b27acf44415bb646d48b9d1a0ada455a4f77fafdb6e4d21e62292b778a1
-EBUILD ricochet-1.1.4.ebuild 1189 BLAKE2B 3fb8f5b0ebc1f430685ddcbebc45fb147aebe5a6d700c7235081c1751ce3d7c1bee9ed470b12ea841b816e9ebf880003db4d6c7a6ede2e045996bf49e445ba69 SHA512 3f29132f06e5bf9585edf41b8223530fb924719c4329c1ac7978cfe69c759e65ebda4e98d3d198e5d0f8a0bf490aad650ad7708bf9133fa59d9dec53be80443f
+EBUILD ricochet-1.1.4.ebuild 1187 BLAKE2B 7508b27bf257a4ac1028559dd636155a72aec1fa4ce1d6ace1bc62e80ef053e366408d9399367ab572b8e3e997c0512a0483e48796fe7b7d815bf0a145e9aae3 SHA512 888e9d1379c3ac0c60210b714a24e2a94ae1944658e8b134a153ba89f9da4c02e9aff474c3db4d907803f4949ec4afb0b7426b5578a5a2838b5a03613287d78f
 EBUILD ricochet-9999.ebuild 1386 BLAKE2B de9f48d1c8f32a1e6da667c1c6ec1ec8d8de17358fa0b8f808bdf6d6c9983e9c2ad17bd3ab2f512c242bad1d415ffb125702455f4336f3b6bb99f852df5a9165 SHA512 07d4cb78a76185e183f0aab83f39d01f0bab8b47f3845816c3ba31ce6cfa5f0c876da95386a9d98f9e42808ed58be8d1a34f965221aff14852a9c9feb2e5d553
 MISC metadata.xml 394 BLAKE2B 6f163c48ab23759d5b574e628a3ee88ff40d9a6a0e460799cda903edf6be1e5fd60646452713eeb20f062cdd57971767af7e3344a55b0a60d798bc47f3b2d12c SHA512 ad270cdc7063ae6c541d29e1224ce6608ebada07b212d836030ee3377c0596ea37789fa6cdb8e96bcfa84b295611a95d450c37726e88876d66c5a8ece4f327da
diff --git a/net-im/ricochet/ricochet-1.1.4.ebuild b/net-im/ricochet/ricochet-1.1.4.ebuild
index 44bcd7daf218..016274c26dde 100644
--- a/net-im/ricochet/ricochet-1.1.4.ebuild
+++ b/net-im/ricochet/ricochet-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ricochet-im/ricochet"
 else
 	SRC_URI="https://github.com/ricochet-im/ricochet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Privacy-focused instant messaging through Tor hidden services"
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index 2b1db4704b83..b3736a3acb05 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1,3 +1,5 @@
+DIST rocketchat-3.2.3.x86_64.rpm 55375960 BLAKE2B e72e0f29662bc9667c782866c42d334239fbe39b20a7ca232aeafe5f16244248ee940f301b0a0f4d2101150746e48d0ff47bdf55d99371a06226937876dd9765 SHA512 ced1fce3b7f12ceda10a1879612065a0e65dc6ccc4cb3a3a282cae578267a03468ea85820a6a765af3d1d72dbde9a04a0d5199a150ce257dd4d44151e4d6ca06
 DIST rocketchat-3.3.0.x86_64.rpm 56322356 BLAKE2B 9d1caaceb16fa68fdfb11d41dae4a7d464e7bb9f92fa3f734f273447228faee53e958e0e87934e9cc5c4b1a133e18ebe610dcf429b780993a20e9a44251d7480 SHA512 e3bda69d0395823a40c56909ef4ae6faee1dcc733eee20ef3067cd7bf57066056505efa2a3817d2640ea7bee0cc0920cdf187dddd53320c224cbe2c3efc21088
+EBUILD rocketchat-desktop-bin-3.2.3.ebuild 1054 BLAKE2B af7071c42fb61e4360912f65503c13d34ad5602c4098a4a5e75f59b29c5639135be010ba654a56889153cf2be104071e2b437b61e5a05c92ad95c90fea3751b7 SHA512 27bf6e40c117830db529e11a2c0efe5fb8940553001eff84c1e420eeb100bc3bbe1a132d7109ee9b55fc195a0e8d802a7d3d11c1cd21333038e6e86b2c92f6a6
 EBUILD rocketchat-desktop-bin-3.3.0.ebuild 1054 BLAKE2B af7071c42fb61e4360912f65503c13d34ad5602c4098a4a5e75f59b29c5639135be010ba654a56889153cf2be104071e2b437b61e5a05c92ad95c90fea3751b7 SHA512 27bf6e40c117830db529e11a2c0efe5fb8940553001eff84c1e420eeb100bc3bbe1a132d7109ee9b55fc195a0e8d802a7d3d11c1cd21333038e6e86b2c92f6a6
 MISC metadata.xml 433 BLAKE2B 2a8918ee8e1f2c6995797e050b172cf935e2f5a484ff5ece8d6fdc672a98032e07e52841c5698f030c93eff16fc087bf35c9f8fee2dc8c8d5f2de79066a9bab0 SHA512 f7a8f577fa0298a391e3aabc9388e78c1cbc0f093c739d41f970f02c165569d69133391e9acb746606ad054c974b0ab7a8f8da9652f83362e0c8e63980bb6d4a
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.3.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.3.ebuild
new file mode 100644
index 000000000000..0c6ba72c3682
--- /dev/null
+++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm xdg
+
+DESCRIPTION="The Ultimate Open Source Web Chat Platform"
+HOMEPAGE="https://rocket.chat"
+SRC_URI="https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${PV}/rocketchat-${PV}.x86_64.rpm"
+
+KEYWORDS="-* ~amd64"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/libappindicator
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/noto-emoji
+	media-libs/alsa-lib
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libnotify
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+"
+
+QA_PREBUILT="/opt/Rocket.Chat/*"
+
+S="${WORKDIR}"
+
+src_install() {
+	# remove files useless for Gentoo
+	rm -r usr/lib || die
+	cp -a "${S}"/* "${ED}" || die
+}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index ad400056cda7..d3a90deeba15 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.7.1_amd64.deb 111629162 BLAKE2B 59166fbe11a92d15155af01f64dac541485dfe57e62925106495eb5111030943696b5d63958658ccb9f3f0c0acffd25e08f441f64748da9314962c0b802979b1 SHA512 be5f5df7579ef1641e96afe7315e5b687ad9cd622df0d601f351f218f7b4b0413499f925b2f349402027ef95ef67b116ef183ce5b8bee6cd730bbb04f947684b
-EBUILD signal-desktop-bin-5.7.1.ebuild 4539 BLAKE2B 68fbffd904eb5151818c7a09c390b15ab6a3cb274cd334bbbb670ec93e88ba8e67a66cfce553c442344e22c9400f6799d6514172f05018eb6211e0deaa374bc2 SHA512 3b107e732006c53e882c3dce1aaae720a9992ddca0833aa4f8926f23e59bef2277fef788ae1241bbcfe2f73d75ea31d4791eadd9bcf0007ad5fa13bf09c1f4a5
+DIST signal-desktop_5.8.0_amd64.deb 111604106 BLAKE2B 33a6e3a6cc57e193f4a5d85fee99f10a20a3eeacf39d8fc82bd23a7b62f43d17a605e1111b84ad1ded7292ca04f4cd1dcb367b5b44d69edc91fe32084a3ab7b1 SHA512 a85242647370913de2e623798f0851ff9c50c3dd67e7990637450537120ad75d8473424ef7c41efc08df549384392844df9e6851a19600bd3a436309db5da3b7
+EBUILD signal-desktop-bin-5.8.0.ebuild 5012 BLAKE2B a1643e0d6e909fdd2314b8889b971b94099863c554ac23b03faabdbd915fde783580b2bc4327b11395a52d507719864a163e0b425980a247d3c9298a11a6ab11 SHA512 b96169f7370e9523d01a2809d685553ef4701c95d4e16de86dea786ca1d2711cf7c6bb489cde64d45352deb9ec1f1834a95c0d0b5dc244d77201622db2f3d081
 MISC metadata.xml 396 BLAKE2B 38a79e09275e5b085003b4fd511917b1ada4b25a7f7d8693da9fa35be6f924fd3a8cac88aa689a482391b3ccc89a07ec1946b8d0dc1ec5c45f23b94f65095ade SHA512 e173a6d2920e003012ffa756fc3e0aa15bbea2eb63b37b9387ec016680cdef7d7db0d510f4663e2a941df4b587c367d3af66ef0fa8d0c4b069648b1dbfd0d4ad
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.7.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.7.1.ebuild
deleted file mode 100644
index 31d7022a98d0..000000000000
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.7.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-bin/}"
-
-inherit pax-utils unpacker xdg
-
-DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
-HOMEPAGE="https://signal.org/
-	https://github.com/signalapp/Signal-Desktop"
-SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
-
-LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+sound"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk
-	app-accessibility/at-spi2-core
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[X(+)]
-	net-print/cups
-	sys-apps/dbus[X]
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/pango
-	sound? (
-		|| (
-			media-sound/pulseaudio
-			media-sound/apulse
-		)
-	)
-"
-
-QA_PREBUILT="opt/Signal/signal-desktop
-	opt/Signal/chrome-sandbox
-	opt/Signal/crashpad_handler
-	opt/Signal/libEGL.so
-	opt/Signal/libffmpeg.so
-	opt/Signal/libGLESv2.so
-	opt/Signal/libnode.so
-	opt/Signal/libvulkan.so.1
-	opt/Signal/libVkICD_mock_icd.so
-	opt/Signal/libvk_swiftshader.so
-	opt/Signal/libvulkan.so
-	opt/Signal/swiftshader/libEGL.so
-	opt/Signal/swiftshader/libGLESv2.so
-	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64/node_sqlite3.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/@signalapp/signal-client/prebuilds/linux-x64/node.napi.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/build/Release/ffi_bindings.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/prebuilds/linux-x64/node.napi.uv1.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux_x64.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ref-array-napi/node_modules/ref-napi/build/Release/binding.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/build/Release/binding.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/prebuilds/linux-x64/electron.napi.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/prebuilds/linux-x64/node.napi.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/8.10.6/lib/libvips-cpp.so.42
-	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so
-	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node"
-
-RESTRICT="splitdebug"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	sed -e 's| --no-sandbox||g' \
-		-i usr/share/applications/signal-desktop.desktop || die
-	unpack usr/share/doc/signal-desktop/changelog.gz
-
-	rm opt/Signal/resources/app.asar.unpacked/node_modules/{ffi-napi/prebuilds/linux-arm64/node.napi.uv1.armv8.node,ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ref-napi/prebuilds/linux-arm64/node.napi.armv8.node} || die
-}
-
-src_install() {
-	insinto /
-	dodoc changelog
-	doins -r opt
-	insinto /usr/share
-
-	if has_version media-sound/apulse[-sdk] && ! has_version media-sound/pulseaudio; then
-		sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop || die
-	fi
-
-	doins -r usr/share/applications
-	doins -r usr/share/icons
-	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
-	fperms u+s /opt/Signal/chrome-sandbox
-	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
-
-	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "For using the tray icon on compatible desktop environments, start Signal with"
-	elog " '--start-in-tray' or '--use-tray-icon'."
-}
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.8.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.8.0.ebuild
new file mode 100644
index 000000000000..4af36932f98e
--- /dev/null
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.8.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin/}"
+
+inherit pax-utils unpacker xdg
+
+DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
+HOMEPAGE="https://signal.org/
+	https://github.com/signalapp/Signal-Desktop"
+SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
+
+LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+sound"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[X(+)]
+	net-print/cups
+	sys-apps/dbus[X]
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+	sound? (
+		|| (
+			media-sound/pulseaudio
+			media-sound/apulse
+		)
+	)
+"
+
+QA_PREBUILT="opt/Signal/signal-desktop
+	opt/Signal/chrome-sandbox
+	opt/Signal/crashpad_handler
+	opt/Signal/libEGL.so
+	opt/Signal/libffmpeg.so
+	opt/Signal/libGLESv2.so
+	opt/Signal/libnode.so
+	opt/Signal/libvulkan.so.1
+	opt/Signal/libVkICD_mock_icd.so
+	opt/Signal/libvk_swiftshader.so
+	opt/Signal/libvulkan.so
+	opt/Signal/swiftshader/libEGL.so
+	opt/Signal/swiftshader/libGLESv2.so
+	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64/node_sqlite3.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/@signalapp/signal-client/prebuilds/linux-x64/node.napi.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/build/Release/ffi_bindings.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/node_modules/ref-napi/prebuilds/linux-x64/electron.napi.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/node_modules/ref-napi/prebuilds/linux-x64/node.napi.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/prebuilds/linux-x64/node.napi.uv1.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux_x64.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ref-array-napi/node_modules/ref-napi/build/Release/binding.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/build/Release/binding.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/prebuilds/linux-x64/electron.napi.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/prebuilds/linux-x64/node.napi.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/8.10.6/lib/libvips-cpp.so.42
+	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so
+	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup-x64.so
+	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node"
+
+RESTRICT="splitdebug"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	sed -e 's| --no-sandbox||g' \
+		-i usr/share/applications/signal-desktop.desktop || die
+	unpack usr/share/doc/signal-desktop/changelog.gz
+
+	rm opt/Signal/resources/app.asar.unpacked/node_modules/{ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/node.napi.armv8.node,ffi-napi/prebuilds/linux-arm64/node.napi.uv1.armv8.node,ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ref-napi/prebuilds/linux-arm64/node.napi.armv8.node} || die
+}
+
+src_install() {
+	insinto /
+	dodoc changelog
+	doins -r opt
+	insinto /usr/share
+
+	if has_version media-sound/apulse[-sdk] && ! has_version media-sound/pulseaudio; then
+		sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop || die
+	fi
+
+	doins -r usr/share/applications
+	doins -r usr/share/icons
+	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
+	fperms u+s /opt/Signal/chrome-sandbox
+	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
+
+	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "For using the tray icon on compatible desktop environments, start Signal with"
+	elog " '--start-in-tray' or '--use-tray-icon'."
+}
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index 29883372b476..cf22c704145a 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,4 +1,3 @@
-AUX fix-url-opening-1.4.00.4855.patch 439 BLAKE2B 57c5a432cf829c58942ac5b9910fee17fe6e08c7bd200d72e474e3919a46258f169b364c999c9b177236e55c318da20d9527475859e55e7f76d919563b3653d9 SHA512 a06d8e576b8a687e552173cff26071778f75b85a5ce3e36c40ba15b7d21d4c9e8323a07dbac2e6d7a5e834d9cbdc359c31868aaef796e4a17e968771d8aa070e
 DIST teams_1.4.00.13653_amd64.deb 83232268 BLAKE2B bc59aa1f4b9d5f1740fedc7bfc3c2cec6f8b4c1979a55e5a68742c36ea4399ba0e8c276de2d9e5b8de39363a9359136a5d1be59a6019af8bd5ac9922a5aab2c9 SHA512 d15b6cca0321e5e569e6a1f4ad0801f7a2de1e9312e8f584f07a4bc8bcac8a55626eb060a41baf31b9f4cfcd1cf2757e2f2b946f671f0e4c95c81f9eea0f8e2c
 DIST teams_1.4.00.7556_amd64.deb 77232550 BLAKE2B f663a79a9edb29aecb240722f46cb29aa6f4e2cca6dbe1a29801aee2e9c408b1ad00ab0d2b8fac3c7c4c227429b0382a06b46114921d2f435fbe1c80415ea9d4 SHA512 0afe2714e290e8b2d30039e27a2af4d22cbd03bc4bfe90d6979714ae1cc75bc5226af8932dc38528a5dc5bd6b4820c4b9d9444abcb558a76438c62cff285ffac
 EBUILD teams-1.4.00.13653-r1.ebuild 3461 BLAKE2B b1dc71a2776ee581fe3ad3d3a91f4e2f47a87d63dea88b5081ea3269565ece5644ca1f2445dd8b01fc59d02a9bbf4a4763a4dd06bad85521ee1bee786ba92859 SHA512 5aacf0035908751601a5bba7821cec053f9a9672c43bd41de29563e4c69d48a22c9d3217d0302eaa8c2d528683ac8865bc58adc745d1ee69c1fa0e5b33758150
diff --git a/net-im/teams/files/fix-url-opening-1.4.00.4855.patch b/net-im/teams/files/fix-url-opening-1.4.00.4855.patch
deleted file mode 100644
index 9ff555305119..000000000000
--- a/net-im/teams/files/fix-url-opening-1.4.00.4855.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/usr/bin/teams	2021-03-12 09:58:20.095552303 +0100
-+++ b/usr/bin/teams	2021-03-12 09:58:41.938137585 +0100
-@@ -8,5 +8,5 @@ TEAMS_LOGS="$HOME/.config/Microsoft/Micr
- 
- mkdir -p "$TEAMS_LOGS"
- 
--nohup "$TEAMS_PATH" --disable-namespace-sandbox --disable-setuid-sandbox "$@" > "$TEAMS_LOGS/teams-startup.log" 2>&1 &
-+nohup "$TEAMS_PATH" "$@" --disable-namespace-sandbox --disable-setuid-sandbox > "$TEAMS_LOGS/teams-startup.log" 2>&1 &
- 
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 67e6595d805d..6a15a2f9a7ac 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -4,8 +4,13 @@ AUX tdesktop-2.7.4-fix-disable-dbus-integration.patch 494 BLAKE2B 75e8be933873cc
 AUX tdesktop-2.7.4-voice-crash.patch 8437 BLAKE2B 6d03b16e8d60318e135340feeb39d6a077bc935f3ca6789da72ab063575128f356f8d4187552ac1ae1c270aed857802375016f84f8d2666facb7ea89c72284c3 SHA512 cabdadddc7a6873c7c6fc8128ceddf2712c0c73d3316520482162e5c67937bda2a627ddb2f078558a52e812c2a876351196488a5a75381d84a43815b873bac5b
 AUX tdesktop-2.7.4-voice-ffmpeg44.patch 1118 BLAKE2B 21b34c6fbb002be362beb807a8323119b46bf6875de3367006a981808d4648fa56e859728ee10ae51a5655fc921e49412ac4bb81e17667b2e28017a64a10a3f2 SHA512 72ef9bddef1f40e09b9c4334153f1ab8aaddf63d95d9f25dc1b0a0826b7f2ae24f7c5fc4cb5ce90aae2c3144a5d52c4cb870d643f447d654190c4a2c78079354
 AUX tdesktop-2.7.4-webview-fix-gcc11.patch 1035 BLAKE2B 929ff52fdadc65d7ce8bc53850adc48ec17c80d6f1e450a50e421c2fc28ee4f07ca88f1371f9812f3e7e2ef402d465418755ce392abd60fe032fa31c216c2753 SHA512 545e307974eff96ff27d9e99ba1272ff0094c403bcbfed4f67f72d8c45c2c6d0682edcee873a11d6aaed8d4f2b7dd820cbc13dc89e7c1072e04105b99a638831
+AUX tdesktop-2.8.9-disable-jemalloc-separately.patch 3723 BLAKE2B 1597dff53ee7a7045b0216ef263fd4c10656a270d0b4fdc3fa9827ba8f2d58288e053c230910717e892854fcf7bb7513b08693d8377f301f5a9d1b74d71d9eb3 SHA512 7cf20bd994a48322f9d3034617a5bf041a1ae7ab5e7cc3da0ac2a9e741ca74975dc5a4188036412317fc77da6b7badf56c582f831daa6a1badfcfb82b6cc2bd3
+AUX tdesktop-2.8.9-disable-webkit-separately.patch 4643 BLAKE2B 7d84cedd4b7b5879fb402193774e40c2b72f6028592e4dc1df1c4a9002dd4e9cbaff505dceb77e443b84c26b4dff6abfc5a99ff28699fb031cc9cb0ea3612280 SHA512 fc3da934e04d19b6f1be42cb095e3aba2a13f0e6a14164558f3da45152b9fa19bc8235d08fd6537933b9fb25d7aee27ec7763173e6395f55bcb9869f71b31088
+AUX tdesktop-2.8.9-webview-fix-glib.patch 1838 BLAKE2B 16b861f0fda72ba1725779880eb67b3adfd0a3dad4c7614beb8f96fa55fecc613f248477557569904c44e6875adbf7912ac9281f1ff71b4b8a6e5d97f9f71e97 SHA512 c3932b6471150d71469606bdbc93d26b57e8eb556e24df9366bad9e51aed073ab18dd7ee14b7445f8df180806a0ca591afdc8c00b0ce34db29575d2dc114b58a
 DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14
 DIST tdesktop-2.8.1-full.tar.gz 37129127 BLAKE2B 06f2a3050f0e0f321c766c54e19faf3ea172c41088e2ffdbb5928a41ba01de1fc845a84addded17d113316857c68f265642a8ab32feb79a87beef548c739b56c SHA512 df35cc00dc47a8c65b32b62c139cc3a49333f573aa88fb70cc65197524f9b9b4756c58752866c843704ea4df5d6224eb4cba5b32953dd9a4d721b0ee0e1efc69
+DIST tdesktop-2.8.10-full.tar.gz 37105631 BLAKE2B 71a08e0d2fda90898e711dd285478e565ddf7f6bd71db8910688c7f0bb550f04136cb3ccec101d5e89860471ffdd7a868dd90a6317924e96c8ad558d4e3079f2 SHA512 910e34718a061d643937393fa105f2236549059eaecc56aab1203a0efa3a7538f7a2d9b432c8b0a9269118ef3bff56dc1edf856476629efe666d16851e68932f
 EBUILD telegram-desktop-2.7.4-r1.ebuild 4589 BLAKE2B fee2f81578a4c774fe33592641a6a19592e8fd67623f3424ea599c2adbf425861478f34f01fad970fca31d9fe7545f15fe3d53ec195f60933e701fe287fa59d5 SHA512 ed7de5b99a43621b38ee7589a1f842647f7a9e2619b6984d061183ea3ec5d891c55df2cc5e04568924e30252de26bd3450ec1abce6e8d8edd2ff8be6104900dd
 EBUILD telegram-desktop-2.8.1.ebuild 4362 BLAKE2B 8388d5963edc83635719974c4c1372becc37e3a4c53aab0b63883c0c4b3c49f8f312d6781ce7a976dde5f066738398245b0fddb899e5440e96622ad99b736b2d SHA512 b351769398c4585e65382200954732e4574d0bb19e05899f67a600102e2ec604086cf07cbc724a6d108f42081a367f47170bfef94bdf356cef1de8665e8e9c19
+EBUILD telegram-desktop-2.8.10.ebuild 4492 BLAKE2B 1499b0b473e0d4be84048009de7279a6b47795b9242ec2e3eee3e126f7902bb67963e22888cb10a67e8fdc33589d6591cf9905c38f1a3e8b68a84a2c84dd3fb0 SHA512 258dcacb57cb3326d4e17638c593f71227d8a277e9255183be6548c136dadb7d9e925618df37066611cf121c5647a6b58000047cdde6020eb992215b2b2e9345
 MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f
diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-jemalloc-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-jemalloc-separately.patch
new file mode 100644
index 000000000000..dff2455d4e3d
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-jemalloc-separately.patch
@@ -0,0 +1,100 @@
+Allow controlling the use of jemalloc
+
+Jemalloc is often controlled through USE=jemalloc in Gentoo. Removing or
+replacing it is trivial, and I'm not aware of any particular advantages that
+come with using this allocator, especially for an IM client. Benchmarks
+regarding this allocator provide a huge variety of results depending on the
+workload and system, so it's hard to establish when this allocator provides any
+tangible advantage.
+
+Considering things like Hardened Gentoo, the user might prefer to use a more
+exploit-resistant allocator, like GrapheneOS/hardened_malloc, and I've heard
+Musl is hardening their allocator as well.
+
+I trust the user can better judge if they need this in their particular setup.
+
+If a telegram dev is reading this, feel free to drop me a message (metadata.xml
+contains the maintainer's address), if you believe it should be forced due to
+usability concerns, or if you can provide me with some context I might be
+missing. Jemalloc is currently enabled by default.
+
+--- tdesktop-2.8.9-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp
++++ tdesktop-2.8.9-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+@@ -48,7 +48,10 @@
+ #include <gio/gio.h>
+ #include <glibmm.h>
+ #include <giomm.h>
++
++#ifndef DESKTOP_APP_DISABLE_JEMALLOC
+ #include <jemalloc/jemalloc.h>
++#endif // !DESKTOP_APP_DISABLE_JEMALLOC
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+@@ -727,8 +730,10 @@
+ namespace Platform {
+ 
+ void start() {
++#ifndef DESKTOP_APP_DISABLE_JEMALLOC
+ 	auto backgroundThread = true;
+ 	mallctl("background_thread", nullptr, nullptr, &backgroundThread, sizeof(bool));
++#endif // !DESKTOP_APP_DISABLE_JEMALLOC
+ 
+ 	LOG(("Launcher filename: %1").arg(QGuiApplication::desktopFileName()));
+ 
+--- tdesktop-2.8.9-full.orig/cmake/external/CMakeLists.txt
++++ tdesktop-2.8.9-full/cmake/external/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ 	add_checked_subdirectory(hunspell)
+ endif()
+ add_checked_subdirectory(iconv)
+-if (LINUX)
++if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC)
+     add_checked_subdirectory(jemalloc)
+ endif()
+ add_checked_subdirectory(jpeg)
+--- tdesktop-2.8.9-full.orig/cmake/options.cmake
++++ tdesktop-2.8.9-full/cmake/options.cmake
+@@ -56,6 +56,13 @@
+     )
+ endif()
+ 
++if (DESKTOP_APP_DISABLE_JEMALLOC)
++    target_compile_definitions(common_options
++    INTERFACE
++        DESKTOP_APP_DISABLE_JEMALLOC
++    )
++endif()
++
+ if (DESKTOP_APP_USE_PACKAGED)
+     target_compile_definitions(common_options
+     INTERFACE
+--- tdesktop-2.8.9-full.orig/cmake/options_linux.cmake
++++ tdesktop-2.8.9-full/cmake/options_linux.cmake
+@@ -58,10 +58,12 @@
+     endif()
+ endif()
+ 
+-target_link_libraries(common_options
+-INTERFACE
+-    desktop-app::external_jemalloc
+-)
++if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
++    target_link_libraries(common_options
++    INTERFACE
++        desktop-app::external_jemalloc
++    )
++endif()
+ 
+ if (DESKTOP_APP_USE_PACKAGED)
+     find_library(ATOMIC_LIBRARY atomic)
+--- tdesktop-2.8.9-full.orig/cmake/variables.cmake
++++ tdesktop-2.8.9-full/cmake/variables.cmake
+@@ -38,6 +38,7 @@
+ option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF)
+ option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target})
+ option(DESKTOP_APP_DISABLE_WEBKIT "Disable WebkitGTK library (Linux only)." OFF)
++option(DESKTOP_APP_DISABLE_JEMALLOC "Disable use of the jemalloc allocator (Linux only)." OFF)
+ option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target})
+ option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
+ option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch
new file mode 100644
index 000000000000..388e09fa58d2
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch
@@ -0,0 +1,122 @@
+Allow controlling the use of webkit-gtk
+
+WebKitGTK is used to display payment pages when buying things in Telegram
+shops. This library can be disabled properly alongside the GTK integration with
+its flag. However, I reckon *most* users want the GTK integration (fixes
+pasting big images, amongst other things), but hardly anyone actually buys
+things through Telegram. Controlling these two things separately is trivial, and
+the user gets a nice dialog telling them WebKitGTK isn't available in the event
+they *do* attempt to use the related features.
+
+NOTE: GTK integration *must* be enabled for WebKitGTK to work.
+
+--- tdesktop-2.8.9-full.orig/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp
++++ tdesktop-2.8.9-full/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp
+@@ -587,9 +587,11 @@
+ 		if (const auto integration = BaseGtkIntegration::Instance()) {
+ 			return integration->exec(parentDBusName);
+ 		}
++#ifndef DESKTOP_APP_DISABLE_WEBKIT
+ 	} else if (type == Type::Webview) {
+ 		Webview::WebKit2Gtk::SetServiceName(serviceName.toStdString());
+ 		return Webview::WebKit2Gtk::Exec(parentDBusName.toStdString());
++#endif
+ 	} else if (type == Type::TDesktop) {
+ 		ServiceName = serviceName.toStdString();
+ 		if (const auto integration = Instance()) {
+@@ -602,7 +604,9 @@
+ 
+ void GtkIntegration::Start(Type type) {
+ 	if (type != Type::Base
++#ifndef DESKTOP_APP_DISABLE_WEBKIT
+ 		&& type != Type::Webview
++#endif
+ 		&& type != Type::TDesktop) {
+ 		return;
+ 	}
+@@ -613,11 +617,13 @@
+ 
+ 	if (type == Type::Base) {
+ 		BaseGtkIntegration::SetServiceName(kBaseService.utf16().arg(h));
++#ifndef DESKTOP_APP_DISABLE_WEBKIT
+ 	} else if (type == Type::Webview) {
+ 		Webview::WebKit2Gtk::SetServiceName(
+ 			kWebviewService.utf16().arg(h).arg("%1").toStdString());
+ 
+ 		return;
++#endif
+ 	} else {
+ 		ServiceName = kService.utf16().arg(h).toStdString();
+ 	}
+--- tdesktop-2.8.9-full.orig/Telegram/lib_webview/CMakeLists.txt
++++ tdesktop-2.8.9-full/Telegram/lib_webview/CMakeLists.txt
+@@ -48,7 +48,7 @@
+     nuget_add_webview(lib_webview)
+     nuget_add_winrt(lib_webview)
+ elseif (LINUX)
+-    if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
++    if (NOT DESKTOP_APP_DISABLE_WEBKIT)
+         find_package(PkgConfig REQUIRED)
+ 
+         if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
+--- tdesktop-2.8.9-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
++++ tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
+@@ -11,14 +11,14 @@
+ namespace Webview {
+ 
+ Available Availability() {
+-#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#ifndef DESKTOP_APP_DISABLE_WEBKIT
+ 	return WebKit2Gtk::Availability();
+-#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#else // !DESKTOP_APP_DISABLE_WEBKIT
+ 	return Available{
+ 		.error = Available::Error::NoGtkOrWebkit2Gtk,
+ 		.details = "This feature was disabled at build time.",
+ 	};
+-#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#endif // DESKTOP_APP_DISABLE_WEBKIT
+ }
+ 
+ bool SupportsEmbedAfterCreate() {
+@@ -26,11 +26,11 @@
+ }
+ 
+ std::unique_ptr<Interface> CreateInstance(Config config) {
+-#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#ifndef DESKTOP_APP_DISABLE_WEBKIT
+ 	return WebKit2Gtk::CreateInstance(std::move(config));
+-#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#else // !DESKTOP_APP_DISABLE_WEBKIT
+ 	return nullptr;
+-#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#endif // DESKTOP_APP_DISABLE_WEBKIT
+ }
+ 
+ } // namespace Webview
+--- tdesktop-2.8.9-full.orig/cmake/options.cmake
++++ tdesktop-2.8.9-full/cmake/options.cmake
+@@ -49,6 +49,13 @@
+     )
+ endif()
+ 
++if (DESKTOP_APP_DISABLE_WEBKIT)
++    target_compile_definitions(common_options
++    INTERFACE
++        DESKTOP_APP_DISABLE_WEBKIT
++    )
++endif()
++
+ if (DESKTOP_APP_USE_PACKAGED)
+     target_compile_definitions(common_options
+     INTERFACE
+--- tdesktop-2.8.9-full.orig/cmake/variables.cmake
++++ tdesktop-2.8.9-full/cmake/variables.cmake
+@@ -37,6 +37,7 @@
+ option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF)
+ option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF)
+ option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target})
++option(DESKTOP_APP_DISABLE_WEBKIT "Disable WebkitGTK library (Linux only)." OFF)
+ option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target})
+ option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
+ option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch b/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch
new file mode 100644
index 000000000000..02c96d28b2c1
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch
@@ -0,0 +1,31 @@
+Fixes an issue with glib headers including a C++ header inside extern "C"
+
+This patch is a hacky workaround, proper solution doesn't seem trivial.
+
+In file included from /usr/include/glib-2.0/glib/gatomic.h:31,
+                 from /usr/include/glib-2.0/glib/gthread.h:32,
+                 from /usr/include/glib-2.0/glib/gasyncqueue.h:32,
+                 from /usr/include/glib-2.0/glib.h:32,
+                 from /usr/include/gtk-3.0/gdk/gdkconfig.h:13,
+                 from /usr/include/gtk-3.0/gdk/gdk.h:30,
+                 from /usr/include/gtk-3.0/gtk/gtk.h:30,
+                 from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h:11,
+                 from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp:7:
+/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/include/g++-v11/type_traits:56:3: error: template with C linkage
+   56 |   template<typename _Tp, _Tp __v>
+      |   ^~~~~~~~
+In file included from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp:7:
+/var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h:9:1: note: extern "C" linkage started here
+    9 | extern "C" {
+      | ^~~~~~~~~~
+
+--- tdesktop-2.8.9-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,6 +6,7 @@
+ //
+ #pragma once
+ 
++#include <type_traits>  // Required for glib/gatomic.h
+ extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild
new file mode 100644
index 000000000000..69bfb7c3a172
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit xdg cmake python-any-r1 flag-o-matic
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+
+MY_P="tdesktop-${PV}-full"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+dbus enchant +gtk +hunspell +jemalloc +spell wayland webkit +X"
+REQUIRED_USE="
+	spell? (
+		^^ ( enchant hunspell )
+	)
+	webkit? ( gtk )
+	gtk? ( dbus )
+"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/glibmm:2
+	dev-libs/xxhash
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X(-)?]
+	>=dev-qt/qtimageformats-5.15:5
+	>=dev-qt/qtnetwork-5.15:5[ssl]
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtwidgets-5.15:5[png,X(-)?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	~media-libs/libtgvoip-2.4.4_p20210302
+	>=media-libs/libtgvoip-2.4.4_p20210302-r2
+	media-libs/openal
+	media-libs/opus:=
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20210626
+	media-video/ffmpeg:=[opus]
+	sys-libs/zlib:=[minizip]
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	wayland? ( kde-frameworks/kwayland:= )
+	webkit? ( net-libs/webkit-gtk:= )
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/range-v3
+	=dev-cpp/ms-gsl-3*
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# https://github.com/desktop-app/cmake_helpers/pull/91
+	# https://github.com/desktop-app/lib_webview/pull/2
+	"${FILESDIR}/tdesktop-2.8.9-disable-webkit-separately.patch"
+	# Not going to attempt upstreaming this after the reaction to
+	#  "disable-webkit-separately"
+	"${FILESDIR}/tdesktop-2.8.9-disable-jemalloc-separately.patch"
+	# Not a proper fix, not upstreamed
+	"${FILESDIR}/tdesktop-2.8.9-webview-fix-glib.patch"
+)
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# no explicit toggle, doesn't build with the system one #752417
+	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
+		cmake/external/rlottie/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
+	local mycmakeargs=(
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
+
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X OFF ON)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
+		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
+		-DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON)
+		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex jemalloc OFF ON)
+		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON)  # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF)  # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	use gtk || elog "enable 'gtk' useflag if you have image copy-paste problems"
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 0fd6efd9da89..5e413036f4df 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 29c5236da7c9..ace90a45f0c7 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,7 +1,5 @@
 AUX ergo.confd 92 BLAKE2B 02dd8cc089593bb207268c1f91e106b2e78b5aba92774cf7b0ee0b38a09c55db409fce72517965f1929d26bdafbe1b9d781708500b286c05f7e161819c177c86 SHA512 3908e273045e5d94f358913e669bf2802a82306ce8eabffa6b7b6e5f022f2fe069a577c69c4070ddf61ec85287b2bca362a02585ecdb779cba4435750de5c5b2
 AUX ergo.initd 382 BLAKE2B 916ef2bc1371e4f62328b22f4072d5c2a39249bfa53e59d6e8877d2ad8a92ed333dae806d65269a343351a93f5d995383c01f65291cc2f24db0ebba0e4fb24f1 SHA512 0b2c1cc5e12458e02efd7e5a6e80f301ce96163c68f1e7e5311dded5c6c99b5ea4a9d707c2f549b56ee77fa4b5758a4d66ce78602011bc30a8ef48d762bd5de4
-AUX oragono.confd 104 BLAKE2B 8e1f9372d43f979a768b516f0b7c4e00540a1547592bae12b576e8b182b94eefadfda09208e14a7f3fe1c8480d447e487a1df86807041bca33a53b87f208822a SHA512 7b54c8ad9ed552fd91bda17605118599a8f3853156c0d8b9d1c64630b984095096c74dcd38000b2d13ab0e3015ee81e994ea5d90b20edbc6b5c174f6efbdb307
-AUX oragono.initd 228 BLAKE2B 5ccdbc0762223f0311ea80f104cb814bd1990720bc35befbb3b19d4e71226e773ea60a2a37ab249fa18f01ca680d6c2f5b86d8cf283a0eef8a08a28f438dd458 SHA512 428c1a350d3720434a727f1f68463519941e6e27f985be51417001bbfb55b7a68fc874977dec6d63bd1fb1dff496e88b9bccb2a6e079f34b726ce78d76a8f53b
 DIST ergo-2.7.0.tar.gz 3115191 BLAKE2B 13bc6f4ddb26369912ed28205f4cee1f39d483481ffe5c6b87db1b2a49c0357d639c35d72d667bd63e2d1feec4cca4d0fb696e3edc2941be8f1bea8c5730adb7 SHA512 ac1171c68c07d0e1f5204ba14acc3eff7eb367e1a85cdeef79fb91bb9acc98109507a34a788cf99cd32125fb1a0f0b5b5c8afbb46b631d5d0da8dc70ab5c651c
 EBUILD ergo-2.7.0-r1.ebuild 1497 BLAKE2B 76a7e0043b50b1d9d7504eb560164bfb77193aa903db01bb9bd8ba90e82ac78e1091ca942e167cfacb88b11365ba0e1f37d649143b205e5e5c98ad21ea0f1204 SHA512 f545f00d43e7548f6696764592267120d2e7ceb5dc24dbdb4f9bb060f290256b61a4ec7415f1477c68102bf5babf1cd1bc497172d4d1107b5fc1b16e04ffce5b
 MISC metadata.xml 319 BLAKE2B d82fdd20f65f3c9c6d544701fd4542c7ea14a10869210f24a966e6c512127c132d9a8e58e116196999159cbcff6017b20ec5c5f4b918471a32cb91e81e84fdf2 SHA512 721af15195dda9a790c7cd38bd36792a0411bb45a34e5b0a2b5e9d3343a1c41d7aa583e8be8ea97a639cafafe70c8a5e0219d6b5f175e5eeb166d6afca2e464b
diff --git a/net-irc/ergo/files/oragono.confd b/net-irc/ergo/files/oragono.confd
deleted file mode 100644
index 3e694bb97038..000000000000
--- a/net-irc/ergo/files/oragono.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/conf.d/oragono: config file for /etc/init.d/oragono
-ORAGONO_CONFIGFILE="/etc/oragono/ircd.yaml"
-
diff --git a/net-irc/ergo/files/oragono.initd b/net-irc/ergo/files/oragono.initd
deleted file mode 100644
index 2379aaea301c..000000000000
--- a/net-irc/ergo/files/oragono.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-command=/usr/bin/oragono
-command_args="--conf ${ORAGONO_CONFIGFILE:-"/etc/oragono/ircd.yaml"}"
-pidfile=/var/run/oraogno.pid
-name="Oragono"
-description="Oragono IRC daemon"
-
-depend() {
-	use dns
-	provide ircd
-}
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index 387862e28aaf..19fe7a20c5d6 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -9,5 +9,5 @@ DIST iroffer-dinoex-3.31.tar.gz 527712 BLAKE2B 8e57058af9aad9537d29a15140ab59c92
 DIST iroffer-dinoex-3.32.tar.gz 1321125 BLAKE2B 3a124d16911d97d0ec937b86c9e0ad513ebdcea5e09e4cb1a53753c03d5e13347d0bf1116bf9abe0137fb7a05bbc7a8e31c2c0da5c15cc4e0b55e067d62b1461 SHA512 03d662cf7eb3093b1f050eda8777011d6e7a833dc2fcf65d29ef0294a0d6ce4e2cea273e2d4e6ee6ba2364c088890ac6338a3aa8e6477d5e2a1a990a6e4e9603
 EBUILD iroffer-dinoex-3.30-r2.ebuild 2687 BLAKE2B 25b349d31f8a3655cf21d637a345943c6ce7ee4b2695b15c1b7b7da984e6d7a6dcd924253b7a11659e37f6b92afd07a03ee4715d10c3668e35f30594492a635c SHA512 3257dccaaf88e8b1b2e944ee377b9f8a06820390987ff8239ea2284daddb72e7424b8ce03b6631469fc4e062fc0c8481acfac1514d6a7bd42c7ef0a252d962a1
 EBUILD iroffer-dinoex-3.31-r1.ebuild 2680 BLAKE2B 44b2423584680bdbd0fb3facc9f01378157585052acbce8b165dd0a4c403b94966af0f2426e10c4125e0a787d2c5cd39a326ac89ff3fa7f8a47ee6b773282371 SHA512 45f2af4d26491526f3b651fb93904992b7d1f16ef36befb9252174d920e579b02b2ae2fa76af80d3cef0ae28d0691e7ad2f647c82dde2ee7fe07d29ea3ab650f
-EBUILD iroffer-dinoex-3.32-r2.ebuild 2634 BLAKE2B 55c332bd03d6701c2587467e65b5866a27da23139ca41e32d9ed68b4162e655f39035a7c09b3c4761fb356dadb4c6512e088f4d90dc10b0cf45070fb41043ca8 SHA512 f332b27eb258c950081fe86a7fc37b845fa12fe512129cd76d870f9d6ec450cb9d7b90aed20c1365a03a89f6ca22c6237d3b71e0fa5a61fa884b5583809d70b5
+EBUILD iroffer-dinoex-3.32-r2.ebuild 2632 BLAKE2B b0e9e83a5f0c9dbdd10830ada51c0e9109529c57b24f60717ffe870b7367ee5742109d53e417703e8a94a03f8b516bc2e5ac2b587d5c332bf0653540739e5b78 SHA512 a07f3c06f516f3809c9273bc14f811ad715a817c9721a7e60c847a8d6bd20193ba864bae72a7862ac5022724fd076b5daf9d3849440bfddde46d38f146093eff
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild
index 748af554e358..ce098c683324 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
 
 REQUIRED_USE="
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 28e1db6b6f2f..9cea84d34355 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,8 +1,6 @@
 AUX konversationrc 346 BLAKE2B 8d236be66f983b3670bbd49578c73a1a868be0b498f965e5f91ecc96f956ba6151ebf6a90cbacd304c9fd16fe62c6cecae7027b5582d1c1b97516c7c89430c68 SHA512 37333594ee6835e61a3dec4c3f48e9a83d69b252768aa22830102199811059cbae8188388e7911503e14c0ef05dbc7d7d7f50c94d0fca4659c6b739e3b8c24dc
 DIST konversation-20.12.3.tar.xz 4242136 BLAKE2B 2483b34dde69a73029d15e8d626c77ebc9f91aaca0dc7b83f4b92629bbf773873de52bf8fd1ead3d862fbb496f2dcc3823320d983ea0c0f2c0ba8ac831ce379f SHA512 022854edac9e2b834e9c6795cd02e9d9fe5ab54f4d3facaff9f60cac680e1b6df12ef3ac3281a07d4ce732f491fe2b49f47fd467751c9b87549e02df3ef27bae
-DIST konversation-21.04.2.tar.xz 4252240 BLAKE2B 1e5459f3c0bf0168b4936550ec88064328ff68c00c093c26cee54a89936044653d0f4833fbd6173460958dc925d97d78d1ca74b450ba9237250687dfc751e651 SHA512 4b05d290c9c8350b60a77d9fc9dcc53671496218e162319bc37ec20cd26cbc8db8f9e3b1ad7e9c86cf9a656da5a6fdb814c80e9bb3413e12e436267b8da04f7e
 DIST konversation-21.04.3.tar.xz 4251844 BLAKE2B 0db25135752635392248288699ab6a28042fa5a5dbe73c5186d782fe5a68eb3b6396b87830f5ec91da00c434e0462ffae042332e9c82f1e342fd77a0762afe7f SHA512 af2e7d232412f316090be72cc2b412b19c8735be4e04c9286561ed3cf83b5858b83572f33ee70281610c7fe5e339683d33e9d1f9ddb57eb5198db91e82613869
 EBUILD konversation-20.12.3-r1.ebuild 1900 BLAKE2B 7d40422131f9c31abeda4c3d47b087bcd347cc94bd27c309c14d9df3c25e7c105d72ed1295710ef1450d4c6501a6ee87a18a5a39612bd544315a1e81a00a2c8c SHA512 aecec20212c5cdc90ebc7509f5865463a49dbbdb2113882fdf7e84bcef37a58a9f349335b2c4a4fc62de973851308b14b21ea892fa461d6c7280eb6e9e112236
-EBUILD konversation-21.04.2-r1.ebuild 1892 BLAKE2B ccf0502196052468c5ae2cc654c2d4a84d3510583a9f0275c904b95d6859192fd868e862ea361328ee7b7c4fbb4b0aae4c1349c26bfecf326bf47ba01193b744 SHA512 01ecd6b2e19274f36847f57317b09d272080aa06d6fabbb671464846acdc529eadee70721b2b5e392d6842ffb7f3b1ae9cbae4614e91bca61034aab4a76ca21e
 EBUILD konversation-21.04.3.ebuild 1892 BLAKE2B ccf0502196052468c5ae2cc654c2d4a84d3510583a9f0275c904b95d6859192fd868e862ea361328ee7b7c4fbb4b0aae4c1349c26bfecf326bf47ba01193b744 SHA512 01ecd6b2e19274f36847f57317b09d272080aa06d6fabbb671464846acdc529eadee70721b2b5e392d6842ffb7f3b1ae9cbae4614e91bca61034aab4a76ca21e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/konversation-21.04.2-r1.ebuild b/net-irc/konversation/konversation-21.04.2-r1.ebuild
deleted file mode 100644
index 73a3fb36feee..000000000000
--- a/net-irc/konversation/konversation-21.04.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_GEAR="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+crypt"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	crypt? ( >=app-crypt/qca-2.3.0:2 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:5
-	crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package crypt Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# Bug 616162
-	insinto /etc/xdg
-	doins "${FILESDIR}"/konversationrc
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index d336ac3efc3a..df66ff1eaa6f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index 7eaa23fe9d34..b650f65d4fac 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -3,6 +3,6 @@ AUX libesmtp-1.1.0-fix-soname.patch 672 BLAKE2B 2bb9a535b94e444af19597f0ca0c06b0
 DIST libesmtp-1.0.6.tar.bz2 365506 BLAKE2B 9ce8c9f210e6c41c95bba55a7aec79c176c4582f5dafc1aba4fbf9adb411b75ab89d400ac7a12b7d5d24ede414cb8e2ca306299a2e156515e611d074142cf5e8 SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda
 DIST libesmtp-1.1.0.tar.gz 169134 BLAKE2B 94ef87c65101557f6d60a6bcd7a8b0de638c24d46536ddf602da05c09858780b0a50f9fd8dae1e54a5e9a7826d45fa6da10bad751a9be50475a8f441c94ad455 SHA512 fc2a9d9922a1807cce8c8cee627ea8fd3a79c33f0987c5a487080b1a1659fd504bc45da2f919d30eced33ab3e950105383a46ecf3365493134adc1183eb99e53
 EBUILD libesmtp-1.0.6-r3.ebuild 957 BLAKE2B 5279f6b740d8edcb07f731eb26041e3b5a229dc5960e38070e1b348d32bb205d667377c347b9714631cb82b385a09716b97dd097f06b25f59e203fa05dc3aef5 SHA512 a7e378fe2263209bb204fae15074eaa0af492e0ddb0a9d8e862120d02622b384cea9730c984b7579ad6870d0491392c4c7456a6328d311ca03b19c9aa4f33fcf
-EBUILD libesmtp-1.1.0-r1.ebuild 1279 BLAKE2B e112228fb18dc0ef14c807e6f4f25842a48d7d523879119b8d28c9407e4462dd8549e4ab6a966affe183c88a3f1d56cf85ecd76c7151e52493b4e54e568d31c3 SHA512 0faf5e81f53d82a30594834f569dcc31eeb56e9fe07e6714cfab3beea5deed0ccd090983d6674d276b4bc685ed253f42716475cf994eeef923e34e6fa42a1a87
+EBUILD libesmtp-1.1.0-r1.ebuild 1277 BLAKE2B 7a04f8d272a517db0897fc03b0015c7a54c43433bca1f2b8524325bfa9517bdcec79535f5e2357de5c6bdcb776213fa266ec89bfbba9b2be3dd44cc6933f3d0e SHA512 154d92d47c34e5adce2f5ab2d28e6e2ad6cf32fd6e82d38ac3c2e9efd0c72d0dfed58bd97809d8523af9436b3f90f67192b0270bfebba4e8cf946ebb102d843b
 EBUILD libesmtp-9999.ebuild 961 BLAKE2B bf1d5b91f7d31f016aa779b13821dc47af17a926c3457e6ea20455dfc6159654f455c648ca11375d0b38469fe5279bfdabdf04aa4ec398eecb386aa1f12ca7f2 SHA512 01375e20aa83e2f0732891d609c9b55df0b116d7a9b36a2e4a1022326aa75133890276faf13fba046369fa981d892f1891f2c02b5262f652f25d3b7985c57b2d
 MISC metadata.xml 330 BLAKE2B 960a34feef0d9e57b37adc3e5776686215c7476dc5331f39b247786ecec58407e74aae1898d60d54209e00573e5486e3b042ebabfb686d4840172371ed1d5509 SHA512 97671749440b8ca99218706c398b65e45fdd0c6a4529877aafad2deb0598c7a7fdd7b6aa84079b194c345b4eee550551aa5d2af60216f95fa0701f6b4ac3c1d6
diff --git a/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
index 1e8152918fe6..3e5af3196398 100644
--- a/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/libESMTP-${PV}"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1 GPL-2"
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index cdaa512be405..7c38b8fc97f6 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,3 +1,3 @@
 DIST libgsasl-1.10.0.tar.gz 1854755 BLAKE2B 691c143ece57b0b895f17ff3bfce8e216adb2ffcc7f6058501626b7b2e83d9eb0a85a036b6c7978b10eefbc94aab7b191e056341732d155597be5037e527b0e0 SHA512 33a8ea43be90a00fcda1b099ced8086b2ef9f72ee0dbce07bca04c944fa2d17588b6e5a32b7ab4ffeaf7ee695f9c84d3eb89c757c71934300d35580e423196dd
-EBUILD libgsasl-1.10.0.ebuild 1418 BLAKE2B c5aecec746c7e679d82bec53ebf1def856f863df9f8d5928cd6ab303e8194d3f9ed9e831a81952270bf085cb9203433798998b6e4a2f5afd570847e8027a1ad8 SHA512 69c48a70ff298b654926c3619e7829922890bc4af03b29ca9ce0fdfc8ec1b92b9ce86d3be569ff95cf4a762d0b53922c585f285fd44d545cb127e7411d215499
+EBUILD libgsasl-1.10.0.ebuild 1425 BLAKE2B 29313052e359e57704b12dc7d2065bc7008e023b81b4f5be2ca2196ea2e41812adb68a77270a38a6365d362bfbcd0b8d0c647d512397aafeeb2535f621bd3f80 SHA512 714120a7a4a5d58fa665fbc0c74fbc1a656238b5ac2987db2a2cef93ebddc2b633452bdc05c691837ba22a1fe352f5a2e6f9f08fec32bbd1abd503d3c4041e8a
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/libgsasl-1.10.0.ebuild b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
index e7c73d483335..830b362924bf 100644
--- a/net-libs/libgsasl/libgsasl-1.10.0.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 
 DEPEND="
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 34be3366626d..d53e1091783a 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,7 +1,5 @@
 DIST libktorrent-20.12.3.tar.xz 604488 BLAKE2B e51bba82990632744aaadf3e40043fa80e64395f6f3721992780ff77d7663a0a3600aaf7d2653a00f32366555f1000a961c3e99de6d2e2cfecc4c1f79d1ebb00 SHA512 e2259251e8edbef6154674898614f81b3a29d5c711e9f751435450edbbb987c5e2a1d8ff864da5aa180b5d1adc3ef611f46175f2126faca52d1b1338d986d1cb
-DIST libktorrent-21.04.2.tar.xz 607488 BLAKE2B 8ff38ddef534bc56b12d67435a3787cbb6c25b03d57c127950b7021e5a47a6fa416cd22508b0ca2697993e36cd5ccad28f49011a313f33290ba0d1b00ffc8058 SHA512 05c0472371ec476f1ad5665f491106d08e6cb8b53599bca97365ee2c7c31903748899f685fcfa44d356c3d2cfce8e70cc2df0970668373be9a36c5e589a3dec2
 DIST libktorrent-21.04.3.tar.xz 607516 BLAKE2B 5dfea2102fc865d61f2ebf2b1f7045c7ce0f542830f9c7e511d5139f910ff3797a949f85a593a17c56287c3433c086a198f96353a61a4cfc923d96aa30ab4545 SHA512 2c8ee156b0b1e51b96b2670c5fe3f00aa131a34bcebdfdd69898a723fd01a8d2da52a94a1914c13e82b7362a71beaefc03b27eb450dbc84bc43953771bf9b886
 EBUILD libktorrent-20.12.3.ebuild 1448 BLAKE2B 9e40d97d0aef21c498dd61cd924dd4e8f0cf3385d4269176fffc3bb5634b3959de35d723cc3708e0c9f8ac43d61cc893f60981d937ae32b6c039b4cc4a7fe708 SHA512 c3792ec5496f2534b6ac95a7368abc02bc7fbea277b3eac4be062b59f4fc7c3099113713a81a003e43187d7d618c258922320a3e4a420c230ab61f3f5e926aa2
-EBUILD libktorrent-21.04.2.ebuild 1440 BLAKE2B ae855b981c48206979a2abe3f6556584857b4b8c6fd456293e2e9baf0faaacec8997653ddd5e8c098cae4a91be9a04cb10ee1372566dfcf929f2546ccf21ffe0 SHA512 e5a2548d353d0048a7da3af7b4bcc1d459f9ff2049049d70556d0b96cc380456e1226067f9780e66609b014f491c69f23b77e5d64088cc69537799ae5089cffa
 EBUILD libktorrent-21.04.3.ebuild 1440 BLAKE2B ae855b981c48206979a2abe3f6556584857b4b8c6fd456293e2e9baf0faaacec8997653ddd5e8c098cae4a91be9a04cb10ee1372566dfcf929f2546ccf21ffe0 SHA512 e5a2548d353d0048a7da3af7b4bcc1d459f9ff2049049d70556d0b96cc380456e1226067f9780e66609b014f491c69f23b77e5d64088cc69537799ae5089cffa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-21.04.2.ebuild b/net-libs/libktorrent/libktorrent-21.04.2.ebuild
deleted file mode 100644
index 9f24c96e7f05..000000000000
--- a/net-libs/libktorrent/libktorrent-21.04.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_GEAR="true"
-KDE_ORG_CATEGORY="network"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2
-	>=dev-libs/gmp-6.0.0a:0=
-	dev-libs/libgcrypt:0=
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-libs/botan[gmp(-)]
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
-	sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
-		CMakeLists.txt || die
-	sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
-		KF5TorrentConfig.cmake.in || die
-}
-
-src_test() {
-	# failing network tests
-	local myctestargs=(
-		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
-	)
-
-	ecm_src_test
-}
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 7a3937193c3c..23f866986b05 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -9,5 +9,5 @@ DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc
 DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
 EBUILD libnet-1.0.2a-r7.ebuild 1409 BLAKE2B f1906501d9d776e35207b85e259bcc66058b64dc7b025fdb0aa1f7b580ed8066e65c17a8686173c264dc0fe51086b73259ca1d7c6583bb9c0de53ce63cb7b6b9 SHA512 7b44ebfe6aee06809dd721aeed50dbf443a27a531a99ee24abd31f535acf3454374bafbd2d79af0c0b95f8b51400ed1e10dd93207e98b0cff215553419098e3b
 EBUILD libnet-1.2.9999.ebuild 682 BLAKE2B f4de78e01f11b24255ab6713c484ab9954ed6cd4be54d7da340c780ee5813291157ae2fe881141faeea2d0b2df67af71ab06a11949c57d8db4a5f3f28533cd30 SHA512 4d899c428e510ad9ed76eb0b573fcac4903f3d8782398890984c0eb85186bc0e84326c35c04ec04dfc78891f8f48d7a3b47c19d4715d695edb7facc573859d73
-EBUILD libnet-1.2.ebuild 890 BLAKE2B fd865116bd86b149c9efd1682a89ac101864b867897e77af0637081c296457cd493519af371f4cfd9f1e0b2202707646997d858de3e9a8add3391434557b9399 SHA512 85e4f6c1fb9b22049b3341518fc2e43813772ab0e579e0d656be9c4e26c6a77bc67b3c73d293a9546052a356b31162b9f5e35137263a58c98f8b81411b4a1125
+EBUILD libnet-1.2.ebuild 897 BLAKE2B 6f39fc6d12af4ad0d85270a592ce5e31177ad691150f4f38045ad148eef13c1aabc1d4b4f99991af6b97067c7e4621bb21ff3b89f2bca7c704a7350cfe20fcf7 SHA512 b9bddbed7b42a0406162185372754c30a88107c52b61a43ad5dee511bd9d9823ede49c46a090c4da17a91cabbf0eddbafe8eee91a478b9af32d473082180ede8
 MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c
diff --git a/net-libs/libnet/libnet-1.2.ebuild b/net-libs/libnet/libnet-1.2.ebuild
index 3e584a429106..4071d7c28158 100644
--- a/net-libs/libnet/libnet-1.2.ebuild
+++ b/net-libs/libnet/libnet-1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 
 DOCS=(
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
index 8487a913995a..123ce94eb5c3 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,3 +1,3 @@
 DIST libntlm-1.6.tar.gz 688608 BLAKE2B 8e545619b1fb00d778bbebf6ab9748005928a2669dab8c3d9c6285127b551c1bf039e1748a710e5eb551e7cbcb1a8775b57c21b163ca2a0206a4b9948b11df8a SHA512 d68bc6b5cd7f5f70385ba78275a810fa46e60f761f0949f2262eef35ae052661739ef17ce3fc4ab75f7e8cfc788b1ccd7766d4ff0ee78db08ea4de3e224653f2
-EBUILD libntlm-1.6.ebuild 547 BLAKE2B 9654965d1079713e706a6c93424a876f003afe70210d2cdbc6a93e4b46a4424b022804893516687629e203df44ec0e948d809d75d2ba1e44fd60d02cf5b72060 SHA512 8652fa3ee3b4d12032627d2bf9fb021e8b88b055e10e9aa5b62e3421985b8d35653574b02b741338f909b6c489e426887298b87a959c7b09b331bbb8e87690be
+EBUILD libntlm-1.6.ebuild 556 BLAKE2B d05268ed6137b125442b542c78c975833b8f713b39cfc62ea6df28e0267a5a02a3ceb028c18734809a4d4a93a4246a052976ca4485a65af6b2346ca232e278e0 SHA512 7adfa09345eed782b9e44eb51d84d7c6a9d9efd16bf7c5296e35fb51fc73004d93728fadaf8af5d660aa73277f31ae6917c4ef680fdc816679c5099330185e8d
 MISC metadata.xml 561 BLAKE2B 400bca5cfe90103ba77808cdf4fbd777b3c19dfabff4336df9bde7e8529da948a4b48b06f1f5151e6f62aa45e5a4cad51b4af7dd2799c9aa8dea89f390936eab SHA512 60e06d45b1482e819824259dcc992d355961754d481700ab41f1e3050ec70893f9075c19bc846591f3aaba9a135de5610686cc82feff1b8119a1466865b08a94
diff --git a/net-libs/libntlm/libntlm-1.6.ebuild b/net-libs/libntlm/libntlm-1.6.ebuild
index d7355b7a51d8..9bb9c39d844f 100644
--- a/net-libs/libntlm/libntlm-1.6.ebuild
+++ b/net-libs/libntlm/libntlm-1.6.ebuild
@@ -4,12 +4,12 @@
 EAPI=7
 
 DESCRIPTION="Microsoft's NTLM authentication (libntlm) library"
-HOMEPAGE="http://www.nongnu.org/libntlm/"
-SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
+HOMEPAGE="https://www.nongnu.org/libntlm/"
+SRC_URI="https://www.nongnu.org/${PN}/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 6dcb719e8b1b..3100fdb24611 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,7 +1,5 @@
 AUX libquotient-0.6.3-no-android.patch 930 BLAKE2B 15ae94889d5543b9d8e6113752df00fef0bcabd2c44adf4146d2751077ec08db17048d4c8716bd245b4f6856e581970c1d230511a681dbb6ae64178bc3fcf75e SHA512 ef3414f3e3dda3926c246d0360be227c52a1ce0aa970f65aff29d2dcbe2c605fc2f583cebba4ad3f8934b872a035a3cc7a9895847eaf9faddf0f46023647f7b9
 AUX libquotient-0.6.3-no-tests.patch 1421 BLAKE2B 97f6b9c3cfe5b32607d64fadbd8e72aa0d1f5d14382edd2792fd564cc226cc473ccda18e770d1b449c158b156bb67dcbbbc36f8587436bec28295b8737279f9e SHA512 76d47d6837c4cfb86be95253ad89fb31de60181b12433a579072b567d18c49a040aafeeb51f333ae4038b141724fbaf68a28a440a1a986f5c61eb25b093b2139
-DIST libquotient-0.6.6.tar.gz 560130 BLAKE2B a8f12af320e0f67b0fe40ec3892cfb2bb7686f066633c061936007e0eceefe5133d3c021a0d1856504f606b5c1bdb66ffa9d8d304b0b631be34f938ffaa061d6 SHA512 7560194bee5b6478ac8efd15d6cfef9cc003073744b4860e3177e51e49135cf2ad96c69e8cd21e64c1f9902ea4d27c26d84d200fc862c5c0daeb0cc4bb4ea65d
 DIST libquotient-0.6.7.tar.gz 560174 BLAKE2B 1f0fe371bf84925c7a8b7728a1e484e9cb7c7d5887539c86a863d05d34727b2385425743260c7c0b33205473215475c7bd5ec8b709032a00591dbfd7cafa721c SHA512 7f7c56ef5f775d38a0bd9f112f2fb7473d42d1e886d17e84d4be1afda146999658eea8691c38071fd87aec7ece52b97bc837cc98452cc698cf152003474193f2
-EBUILD libquotient-0.6.6.ebuild 872 BLAKE2B 292ac644871226e3b07e6d3920553e59be3e8c722d60909ca607378fd8fc270b2e8435c3f4d268ab02c9e32a28fd82ae03e3fda70bd24eda9c15b1f277a48993 SHA512 a2be01c7c8855ad00d385684df470f97dedf767d71078f76649283364292778c3875b46f89f88e2edcd021b21563ac1b19748b96a01721d363821f8a3c0a2276
 EBUILD libquotient-0.6.7.ebuild 872 BLAKE2B 292ac644871226e3b07e6d3920553e59be3e8c722d60909ca607378fd8fc270b2e8435c3f4d268ab02c9e32a28fd82ae03e3fda70bd24eda9c15b1f277a48993 SHA512 a2be01c7c8855ad00d385684df470f97dedf767d71078f76649283364292778c3875b46f89f88e2edcd021b21563ac1b19748b96a01721d363821f8a3c0a2276
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libquotient/libquotient-0.6.6.ebuild b/net-libs/libquotient/libquotient-0.6.6.ebuild
deleted file mode 100644
index ebeb0a0321d5..000000000000
--- a/net-libs/libquotient/libquotient-0.6.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt5-based SDK to develop applications for Matrix"
-HOMEPAGE="https://github.com/quotient-im/libQuotient"
-SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/libQuotient-${PV}"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# downstream patches
-	"${FILESDIR}"/${PN}-0.6.3-no-android.patch
-	"${FILESDIR}"/${PN}-0.6.3-no-tests.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DQuotient_INSTALL_TESTS=OFF
-		-DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks.
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index 6305e2ef6f78..2c9806b1e741 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1,4 +1,3 @@
-AUX libslirp-4.3.1-bug-756910-check-pkt_len.patch 1404 BLAKE2B 6e9d046f5f25bbdb574534cdd26ab69c708a56893336a09a7e146d654c4e74af338ad178c0067662e696453930f627117f386f8d99d20a555b28452e309884b4 SHA512 2ebf8293aed6c09c1a03123e5b3acca602ad1fd293653f093e1c69d691e2d4db15c1f9d10262fc0e5019771f81e1812788b6e5234a602f13b3b73172d6f6419f
 DIST libslirp-4.6.1.tar.gz 135569 BLAKE2B 7a890912f2a8ce9d6820870e2d29b9c7a2253c403c2bcb127a38e02b2b81d1e262f34571c8a4c05fbf46874b9b2967cb5597cabe169ad54f12702fdd8b90bb3c SHA512 04a9dd88cd58c849a24b9cff405d951952760d99ea2bef0b070463dff088d79f44557a13c9427ba0043f58d4b9e06b68ff64a4f23a7b0d66df594e32e1521cae
 EBUILD libslirp-4.6.1.ebuild 818 BLAKE2B 66dc681fe6639558ed0b6d5f452819d521013109e5b581ec7f2f547c9357a7904d84d88d605b1245c54d6e909691a04df13939b42ef71e6117d0c29143487485 SHA512 034dfd20907fd88bf11c144eccb55e41f3245057155b559f1257b48aa5c2912f8e535aa1ccaaf63c499086a0f08c31e660adf2e64dde0aebfcf81f1ebeed5d0d
 MISC metadata.xml 346 BLAKE2B f8c280b0fc3fadde1f7d8524d281b6c818d0489c98a3d54e9bcb54cf576bf34648041ddd2a9635544378e18fff67d34036626ae4f74ddc8a850347858137b458 SHA512 b237a26cef7a0e4e023b953ad63505c00338d7aab0434bdb346ac3e9810f81813a3567f7dbc2d13b03e0c63d50b9f151a9ece7051a90a0568281e410da2ba9da
diff --git a/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch b/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch
deleted file mode 100644
index aef7f19ba13a..000000000000
--- a/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Prasad J Pandit <pjp@fedoraproject.org>
-Date: Thu, 26 Nov 2020 13:57:06 +0000
-Subject: [PATCH] slirp: check pkt_len before reading protocol header
-
-While processing ARP/NCSI packets in 'arp_input' or 'ncsi_input'
-routines, ensure that pkt_len is large enough to accommodate the
-respective protocol headers, lest it should do an OOB access.
-Add check to avoid it.
-
-Reported-by: Qiuhao Li @outlook.com;
-Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
----
- src/ncsi.c  | 4 ++++
- src/slirp.c | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/src/ncsi.c b/src/ncsi.c
-index 3c1dfef..75dcc08 100644
---- a/src/ncsi.c
-+++ b/src/ncsi.c
-@@ -148,6 +148,10 @@ void ncsi_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
-     uint32_t checksum;
-     uint32_t *pchecksum;
- 
-+    if (pkt_len < ETH_HLEN + sizeof(struct ncsi_pkt_hdr)) {
-+        return; /* packet too short */
-+    }
-+
-     memset(ncsi_reply, 0, sizeof(ncsi_reply));
- 
-     memset(reh->h_dest, 0xff, ETH_ALEN);
-diff --git a/src/slirp.c b/src/slirp.c
-index 9bead0c..abb6f9a 100644
---- a/src/slirp.c
-+++ b/src/slirp.c
-@@ -860,6 +860,10 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
-         return;
-     }
- 
-+    if (pkt_len < ETH_HLEN + sizeof(struct slirp_arphdr)) {
-+        return; /* packet too short */
-+    }
-+
-     ar_op = ntohs(ah->ar_op);
-     switch (ar_op) {
-     case ARPOP_REQUEST:
--- 
-2.28.0
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index fda00b3b4ab7..eb88157f2677 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,3 +1,3 @@
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
-EBUILD libsmi-0.5.0-r1.ebuild 900 BLAKE2B d3439e47c97c7bc0d30dcbec6fae773c23c4956e99da0312e99678728a22250a99e5aba303057b1080bd5add9c3e26f8dda1db4ba73c0ad8a9d7b7998d9b5367 SHA512 5d122626c97849b08ee395820b0461d5dcf5075e9c91e4e71514b3e4612e59a178146baa45f0bff88c709af25b00cc6e2bd5f516acd9495447b03a2833ba3f55
+EBUILD libsmi-0.5.0-r1.ebuild 907 BLAKE2B c16fa7382be51b7eb8859589354b8ddf728a4ef1ea6662393b1c445413b24a1eaea2afb17e7bcb81cfd665db84f61d22a926c82cc029f39b3787d254910cb176 SHA512 4db1b07cc48706b826ad2956293fc335e9476a92fbf6e31a9a758810ea9e184761ecc29332b4a7633938f3b1ef5b57e41d5810469835c05ed9574209ca88b43c
 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 712c25b0a296..251bbb48b8a7 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 ~riscv ~s390 sparc x86"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 32c7f6fe9bac..61ab267a3f4a 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,5 +1,5 @@
-DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9
 DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
-EBUILD nativebiginteger-0.9.47.ebuild 1597 BLAKE2B 6314ef37308dd62a44bda83f61c483fde01c555f10618f03494be0335766d197fe8180bb8c1ca3398721cf0e58c0c2aebe2a40b9d1f5ca0283259a3707812597 SHA512 7d6e296766446dde688e3767fb499abfe6b5909e6830fb590e859ad0bfc56d4d8d13b41b9e277053015192e43e5e99337f30c46f7628fcb2c3ac980649b26598
+DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec
 EBUILD nativebiginteger-0.9.48.ebuild 1597 BLAKE2B 6314ef37308dd62a44bda83f61c483fde01c555f10618f03494be0335766d197fe8180bb8c1ca3398721cf0e58c0c2aebe2a40b9d1f5ca0283259a3707812597 SHA512 7d6e296766446dde688e3767fb499abfe6b5909e6830fb590e859ad0bfc56d4d8d13b41b9e277053015192e43e5e99337f30c46f7628fcb2c3ac980649b26598
+EBUILD nativebiginteger-0.9.50.ebuild 1597 BLAKE2B 513a3b204f66ddab99bc3c7e6b6e61b992fc1816816ca3405a3e69c73f98498f3cd859f8a9651080d50480d9e5c7007042603a764a850b2cc54c4a56eaf015d9 SHA512 4c744c1f5c8ae58c79ee3deed71332f9991fa22dd006b6935a0ee1f154d633f1066d9d03f462b4d746feb9f35d5b9f9f9221bff0f4e24ca2239feb5e52cb438d
 MISC metadata.xml 397 BLAKE2B efe84f4793a6cf028961509b2bf0d26648884712cfa1cf18a42f78eb65e4073ad03463aa2d60f9146d5b50da58f5fada3c4da78c67236d41c410627a58c03b7d SHA512 5514f5621b1267b52e458073b4dde8baa377ffb243d01649eecc7ebd5465e70d745403a904d40d6e2be08862aefdb52707fb7bd01be16b7aff77390a22cebf6c
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.47.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.47.ebuild
deleted file mode 100644
index e0d376b7aa6d..000000000000
--- a/net-libs/nativebiginteger/nativebiginteger-0.9.47.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 toolchain-funcs
-
-DESCRIPTION="jbigi library used by net-vpn/i2p"
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	virtual/jdk:1.8
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/i2p-${PV}/core"
-
-PATCHES=(
-	"${FILESDIR}/${P}-asmfix.patch"
-)
-
-src_compile() {
-	local compile_lib
-	compile_lib() {
-		local name="${1}"
-		local file="${2}"
-		shift 2
-
-		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
-			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
-			"${file}" -o "lib${name}.so"
-	}
-
-	cd "${S}/c/jbigi/jbigi" || die "unable to cd to jbigi"
-	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
-		die "unable to build jbigi"
-
-	if use amd64 || use x86; then
-		cd "${S}/c/jcpuid" || die "unable to cd to jcpuid"
-		compile_lib jcpuid src/jcpuid.c -Iinclude ||
-			die "unable to build jcpuid"
-	fi
-
-	if use test; then
-		cd "${S}/java/src" || die "unable to cd to java/src"
-		ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
-			die "unable to build tests"
-	fi
-}
-
-src_test() {
-	cd "${S}/java/src" || die "unable to cd to java/src"
-	"$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
-		die "unable to pass tests"
-}
-
-src_install() {
-	dolib.so c/jbigi/jbigi/libjbigi.so
-
-	if use amd64 || use x86; then
-		dolib.so c/jcpuid/libjcpuid.so
-	fi
-}
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.50.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.50.ebuild
new file mode 100644
index 000000000000..efda38f2b606
--- /dev/null
+++ b/net-libs/nativebiginteger/nativebiginteger-0.9.50.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 toolchain-funcs
+
+DESCRIPTION="jbigi library used by net-vpn/i2p"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	virtual/jdk:1.8
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/i2p-${PV}/core"
+
+PATCHES=(
+	"${FILESDIR}/${P}-asmfix.patch"
+)
+
+src_compile() {
+	local compile_lib
+	compile_lib() {
+		local name="${1}"
+		local file="${2}"
+		shift 2
+
+		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
+			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
+			"${file}" -o "lib${name}.so"
+	}
+
+	cd "${S}/c/jbigi/jbigi" || die "unable to cd to jbigi"
+	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
+		die "unable to build jbigi"
+
+	if use amd64 || use x86; then
+		cd "${S}/c/jcpuid" || die "unable to cd to jcpuid"
+		compile_lib jcpuid src/jcpuid.c -Iinclude ||
+			die "unable to build jcpuid"
+	fi
+
+	if use test; then
+		cd "${S}/java/src" || die "unable to cd to java/src"
+		ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
+			die "unable to build tests"
+	fi
+}
+
+src_test() {
+	cd "${S}/java/src" || die "unable to cd to java/src"
+	"$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
+		die "unable to pass tests"
+}
+
+src_install() {
+	dolib.so c/jbigi/jbigi/libjbigi.so
+
+	if use amd64 || use x86; then
+		dolib.so c/jcpuid/libjcpuid.so
+	fi
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 4117f84c39fe..154258ff0dce 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -9,14 +9,14 @@ AUX nodejs-14.16.1-v8_icu69.patch 2938 BLAKE2B d69206f4903c63df7bf1882bc9d41510a
 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a986c18f55abd8c7cd22ec399ccde22fa5b008d3e07c0f07713b5a45a1ee2a0bc370c04408800db2ee59cd92fcb5be SHA512 eaead633611bda04ab9be200aeddf3b4004b8104e9c6af246023b8008003dd3a7103e1508ea690443e59c6591521b04a2d71c7344343f2a20d1c935ef51c66a0
-DIST node-v12.22.2.tar.xz 23665228 BLAKE2B 2213029c3a819981bab8b50d3e5d1a2f4c05bee797cf0e5f28d8bf621ac394b14dcfa63e682a00b21b023579155f2f373d21ff75e2fb2f25af484a02362cdd29 SHA512 6722498b51b7240d08068687e015920189a04ce3a19669089f96a15eafd14876db3dc49372674177f0d78bebc31eb873e22a07947a8e156ca5d3e240a42b8cc6
+DIST node-v12.22.3.tar.xz 23662268 BLAKE2B b686d96ce1a2e1678c1565dbc6025738be85dc6b0e21b39742265639eb8da590b33f86afa5ca3ecaa4c70e4155a97e413e4d6e5da9ec0c5cb19a876241e599e5 SHA512 11684b6df15b6b74b8674ebf2c2bb950d1e52b83f90478638e85dd11a163dc7c62ae888bc4c1c29e89179e0c47fdccc26bee2817d64eb3ff926b2d3e648c351c
 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
 DIST node-v14.17.3.tar.xz 33585080 BLAKE2B 37267c9da2d773dbbe95f7378f5b0c2b0dc397b17850be325f9fec637c6745dede4ca4136ba4bf109d72d8982ee985f1e077cc706165f1be2e3dc3053edfe229 SHA512 c6096715299f155b96df873976da91e854da7e99cde635cdb65d5c962abc5283dac86b8ddce4f5a9f7498f9793ff08943645b5e5b0b23395dfe035f7295218bb
-DIST node-v16.4.2.tar.xz 33575848 BLAKE2B 9543912af397714f482672426ee62298f48fe035e8e2951957eb7eb18ccf28587821c6d11375fa0361610b44a8be5ce4917522f7850ecbfe7a671379ac1564c8 SHA512 3520e378badbcc5ad2bf158e500ce598833564740ac02031bc5b12938ce57b0bd068b76360067d5914078356372563ead6db01e56a501f3ebf894ce1f2d43ba6
-EBUILD nodejs-12.22.1.ebuild 6412 BLAKE2B 7e5671b07a93b739c8b3a84730f0a873dc18c6746fe25a112ef8efc6bcc44c5c68a4df3eb16cea05cbe0ef786857a4b417c463ae3469d3d09c1d1bb1ae5e1725 SHA512 b38fef7e77ac63f589d52b4836483aaa36ec36597f130e83334b3a59a9bc7e7c98fa3d2ada868472db556240b355ebf4415b656823adc60b5f1965a010e97a4a
-EBUILD nodejs-12.22.2.ebuild 7045 BLAKE2B e9dde41d247bb9f8c072b0aabe3f04ab263ef1ea3b6bb14057087847a5642556d1c0f9d46257422850446ad21b847ffb1505e3651aa78096a9e7b40733d55faa SHA512 ece228de136e6041b996a8d9ed0099ddad524309c8e00738233476f72463fff9e306aa3211c4a914e3599f8951579a05fdbeb412693401dcd97852d638f5b426
-EBUILD nodejs-14.16.1.ebuild 6109 BLAKE2B 424c91ecf24cfc9777aa2302a6c0a842429482fbf57a7bc8570721e7ba64da3d4611023144dd3747cb438a4512f07bf6ef8f8089eaa17b09ab9efd02cc3ab140 SHA512 36b29089855c5de94bd109100de3fe9ffadea6148d3d8f893542b67a09f3db1652a1e5bc134b64116c880a2c313418b4bfc369912f5c6e1444400af3a814acd6
-EBUILD nodejs-14.17.3.ebuild 7039 BLAKE2B c7da8b757fb4d9005d5f4fdc56f796c1942b437a2328b2754c2d3348511746cf6f8dc821aa51a4a72b2370169ba7675e61d1bd30560fdfd5aa905ce26283b0b9 SHA512 ed81d9c85b32c9ca09791415bac534eae905936ff9bb9f96bc6ec4a9d7506ef22fb368f27d865aa2cf6452508e9eabced88f2d659be3242c1da5ed4ffe8513f9
-EBUILD nodejs-16.4.2.ebuild 6557 BLAKE2B 2cdad96f1bdba316385661d349b07791863ec9049743e8b9eef509aa7aa9eb41bad55d6f3bba8d2011a2ec3a3c3349b7c12cbb3aa9f90cac5fb43a061782d022 SHA512 db8c7d0615cefc6a03a08861a5d121ad73bc07364ba7e1ad4889fa08dd542f9d686751ab0936fd032aaf7db6e557a4f56d2145ff91d07477509ebfdef1bd644b
-EBUILD nodejs-99999999.ebuild 6483 BLAKE2B d6f89474114f81e20edeafc824f96cb0ce23d9523439274ac51024e5632a03aa2d74878731149fea994d1a6474aff7936fd3247904d8d7db6cc29d96c3bad7ee SHA512 bbe34c8746cbc2c70cbe36f1da08ee32009f058ce2fde2b35095c1ed3582d67cfa10672b3901cf38180058d2452a6761605017ac84b63f993c42da0d731b9851
+DIST node-v16.5.0.tar.xz 33639108 BLAKE2B b5a719143761f2dec1c1e94b53a2b5679e4d3ec8026f411f98eb6f5579688fd0d291187f633d3caeae8adfc39ff8ba28de25f6f34536c8181fe80d18ad833531 SHA512 33dd76f7d7f1c949e1f709b869db9b047241a7752897514831f92b3b3877a7098c41c74207f5c0bbb2e62c5cbdaa29297b6d253133878a013482118c8172d08d
+EBUILD nodejs-12.22.1.ebuild 6450 BLAKE2B 5a540cf0588d177b2be4af525f3cc3b8d0de648b27c51ea2f1d07304711573180ab601f1149a4e8453446e8237f33f1a7b47d44956000856a85fde56693b48ec SHA512 c22aaa0bcfc45a6597162ed09df0facceb2352e2265e718e177d905afc96edb7c1e7c3647cfe98c9ab4a3c11aad7f9f2e7726a66fb680202ec83ff6310057d5e
+EBUILD nodejs-12.22.3.ebuild 7082 BLAKE2B 2dcbc77c9bacdbdf1dc17f8fa7fb2f23a12f29a1a8dea30384a990b167b2d8c83f5c37a24f5f1dbb7d9dd8541ec341521df849956f94c07f2bc068ef7a53ddaa SHA512 01f8eb0fb4099299aa914db07710237e5d6fe9121fe5cfe849b84bc55aa555096aef4de7f3aa5ee031b6bf749726364f8c9f0cbff546b20111242105260f3ee8
+EBUILD nodejs-14.16.1.ebuild 6147 BLAKE2B 6172c84baadb436d99ce1bb4dfa21deae28452a4fa7efe136a2868d837c0b26db3c92494fcc018e178080aca31be2ec69232cdeee5794ac4a8ba001305514dba SHA512 73fa6ae5d4c1b7e69e7f04adcdb0ecf431d349dd194671442dba28ce8db60e3383154888a743145c3ffe248d51896fb4b9032a980aaf048cc49e80a7a0c3ef29
+EBUILD nodejs-14.17.3.ebuild 7076 BLAKE2B d8dd5aa80e760e2d62f868829e27f7bccd91e79fc20afc95d8a3809879b695bf064ded2724336239d2fc1b87d62d589a5cdac06efac8a2566a5eeaf0c327fb5e SHA512 4b8934373e309a86d5ef50d013609a7ba894e8f217d4a0da27892561765ac9e0cf670f413d52840e9538afd80b7e5ea8bc921c5302bdc173864eb539794d9074
+EBUILD nodejs-16.5.0.ebuild 6502 BLAKE2B 48bf9356926c2a31339d4841ad2481c81b5add8c1b0fd24975b79aa81cdb4b56f1f1fff4ef395461d7a8e3d47a7708d825f1ebcd885f7fef10b47ee84a6cfbb6 SHA512 c2ae73ad5ab86facf062a9ae0e84ddf12396d38e802dc36b48fb46944decfa24a31be956804a6b6dd4b0bafbe139d62fed95f5445e5ac6013683cda8bee338cf
+EBUILD nodejs-99999999.ebuild 6483 BLAKE2B d4ad4b4ca614a7ead97e4ae37493dfb4bb5da2a4d04bcf8126720401f2a76515608f6de44a6378813c98bdfb112d741072b9e3d9474e3d6248db556d452299e9 SHA512 398caa97aa48d604c91ad8dfc74b4d5b4fcb28a42d535b401253b04f79b0f7c450f25ec03b7b54d41755fa7bb734fe6031e2d0515849301b080dff1dfe98ab9b
 MISC metadata.xml 1000 BLAKE2B 2dd8788da6451360d25beeca97fe03a52761cf0478ddd03e4680e805b0f31309fb16e44c65f1ca7475f197e4f2f53b14a0a07d08d1324387191e0389d124e6a0 SHA512 a2dc0a100769ba541ac469df0ea74c20b057620fedfaeaf87516d62fb0eea00d1a42ec39f14713e37a44079a076a2770497e81ff0e9b987c70f234c6458e114c
diff --git a/net-libs/nodejs/nodejs-12.22.1.ebuild b/net-libs/nodejs/nodejs-12.22.1.ebuild
index 3c19482c9e73..930eb364bbf3 100644
--- a/net-libs/nodejs/nodejs-12.22.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.22.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -32,7 +32,10 @@ RDEPEND="
 	>=net-libs/nghttp2-1.40.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	system-ssl? (
+		>=dev-libs/openssl-1.1.1:0=
+		<dev-libs/openssl-3.0.0_beta1:0=
+	)
 "
 BDEPEND="
 	${PYTHON_DEPS}
diff --git a/net-libs/nodejs/nodejs-12.22.2.ebuild b/net-libs/nodejs/nodejs-12.22.2.ebuild
deleted file mode 100644
index 9c4fe05c005f..000000000000
--- a/net-libs/nodejs/nodejs-12.22.2.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.9
-	>=dev-libs/libuv-1.39.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/http-parser-2.9.3:=
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
-	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
-	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
-	"${FILESDIR}"/${PN}-12.22.1-v8_icu69.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			else
-				# configure.py will abort on this later if we do not
-				die "${PN} only supports LTO for gcc"
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother.
-	rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-flags '-flto*'
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-http-parser
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
-	if has usersandbox ${FEATURES}; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.22.3.ebuild b/net-libs/nodejs/nodejs-12.22.3.ebuild
new file mode 100644
index 000000000000..e9733db68f60
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.22.3.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.39.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/http-parser-2.9.3:=
+	>=net-libs/nghttp2-1.40.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	system-ssl? (
+		>=dev-libs/openssl-1.1.1:0=
+		<dev-libs/openssl-3.0.0_beta1:0=
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
+	"${FILESDIR}"/${PN}-12.22.1-v8_icu69.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			else
+				# configure.py will abort on this later if we do not
+				die "${PN} only supports LTO for gcc"
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother.
+	rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
+	if has usersandbox ${FEATURES}; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-14.16.1.ebuild b/net-libs/nodejs/nodejs-14.16.1.ebuild
index 45b882f86ba9..6143804f9ac8 100644
--- a/net-libs/nodejs/nodejs-14.16.1.ebuild
+++ b/net-libs/nodejs/nodejs-14.16.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -31,7 +31,10 @@ RDEPEND=">=app-arch/brotli-1.0.9
 	>=net-libs/nghttp2-1.41.0
 	sys-libs/zlib
 	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+	system-ssl? (
+		>=dev-libs/openssl-1.1.1:0=
+		<dev-libs/openssl-3.0.0_beta1:0=
+	)"
 BDEPEND="${PYTHON_DEPS}
 	sys-apps/coreutils
 	virtual/pkgconfig
diff --git a/net-libs/nodejs/nodejs-14.17.3.ebuild b/net-libs/nodejs/nodejs-14.17.3.ebuild
index a6c178ef153a..08988afc0b4d 100644
--- a/net-libs/nodejs/nodejs-14.17.3.ebuild
+++ b/net-libs/nodejs/nodejs-14.17.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
@@ -37,7 +37,10 @@ RDEPEND=">=app-arch/brotli-1.0.9
 	>=net-libs/nghttp2-1.41.0
 	sys-libs/zlib
 	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+	system-ssl? (
+		>=dev-libs/openssl-1.1.1:0=
+		<dev-libs/openssl-3.0.0_beta1:0=
+	)"
 BDEPEND="${PYTHON_DEPS}
 	sys-apps/coreutils
 	virtual/pkgconfig
diff --git a/net-libs/nodejs/nodejs-16.4.2.ebuild b/net-libs/nodejs/nodejs-16.4.2.ebuild
deleted file mode 100644
index 15a3869fc671..000000000000
--- a/net-libs/nodejs/nodejs-16.4.2.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9
-	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.0
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
-	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
-	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-flags '-flto*'
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
-	if has usersandbox ${FEATURES}; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-16.5.0.ebuild b/net-libs/nodejs/nodejs-16.5.0.ebuild
new file mode 100644
index 000000000000..15f03fd11176
--- /dev/null
+++ b/net-libs/nodejs/nodejs-16.5.0.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.0
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	# All this test does is check if the npm CLI produces warnings of any sort,
+	# failing if it does. Overkill, much? Especially given one possible warning
+	# is that there is a newer version of npm available upstream (yes, it does
+	# use the network if available), thus making it a real possibility for this
+	# test to begin failing one day even though it was fine before.
+	rm -f test/parallel/test-release-npm.js
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		keepdir /etc/npm
+
+		# Install bash completion for `npm`
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
+	if has usersandbox ${FEATURES}; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 1141e04146e1..a2a2634d16c8 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 1c455019bcea..f3d3e617d988 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 34c5a56d0fed..c2d74b102e63 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -12,7 +12,6 @@ AUX courier-imap-4.0.6-r1-gentoo-pop3d.rc 859 BLAKE2B 08d54a0f52be098842b8a182fe
 AUX courier-imap-4.17-aclocal-fix.patch 299 BLAKE2B 605f76516a72269720d07e1e8fc88e55ba4ed184dd5e8633a04a657e408dc9d31a20a945cab2fe41247abfd65823b90de71339288a5005a6eca6e6a6f41c7210 SHA512 a5771c2718d08386a3c36a1bb2812959c68af70049cb3833e49dd034126ae6ae278b51afd40301cc7ff6850efe8772889d05d90b0229be79d82cfd827f2ef75e
 AUX courier-imap-4.17-db4-bdbobj_configure.ac.patch 1499 BLAKE2B d619e493b066e0d60d083339ea2c7d09902a6aaa7a49996d47f895cf4e72ff5adc6a06e79c0173c548db10c66c31cae7b9aa69d5516c5acb487517ece328ed0a SHA512 2d1db6d13194b5e0866fadab40453264a07df8bf26b241af9f130b79dd800a4bb888a28151c7833b375315f43c9c42946312bc36220232a372179b23e5107b30
 AUX courier-imap-4.17-db4-configure.ac.patch 1464 BLAKE2B 7f3aa5c86c7d12d369844757dbb3038afe9d12a034ec5d63860df76dba86ce18724fefc2c12f5596a27620ae05849ec9595ba1e410cadb0853dc4c322f965dd9 SHA512 55433b330d1039cd177af058cbc4a2bf7a65e53b8ecf29955c499dd6a68d634d7582449f54d1c70675ed759586e4d9dc7f43ce3703113e76df81b2a8703085bd
-AUX courier-imap-4.17-disable-fam-configure.ac.patch 807 BLAKE2B 69e7a2f30944191129daef4632e65d74d529f595101f6af804a4c9d9c4e5bf8026aa759963d27ad0a40cf3e25ad9c6cb2083ae8ad69107953b6a988b4d650667 SHA512 c1933ab15843a7009f7d7408eb5085452b5575e01727980e3df2a2b79256fc7f8d0d62403ad6906f250249cbbbc516d442b29d5fc70537fa7aa67837366be164
 AUX courier-imap-5.0.8-ar-fix.patch 263 BLAKE2B d21499a4bda24e7434cc41a29a9eadfeab41e52fd4b6a2d58569789aa76f8c73578d1a3c412021cfcbf56d8e33138c545d6d921e1030120dee8309e37679ec14 SHA512 a25d0e40a43a3539c7f5bb0e694a410fbdb3a5538ee8c5c82bd0c361023f4d5d8f40002fe2b79f517366cbe004d42238d6190642d003660ffd132142a959c840
 AUX courier-imap-gentoo.readme 2827 BLAKE2B fc45b7180165b5ed69a1722c268d5a6f742a16effe3f883b7ed268ee8b76527675d7b792712bfdb2b68d5bfe49fbc9d2e6af61ba2bd5b3dbed28f9be6ba397b8 SHA512 a677218ed39483dbe07358382f557a877486d5028b890ce25822663a6fff58a4744d245537a5395c7a403a566522753c91f9c0c511b9a7229ac1ea2ba4a9c54c
 AUX courier-imap.cron 32 BLAKE2B ccdf922262a94899370df48f49654e57c77758abb7843e112bf3232752ae25e9fc19337a425bd30914e1207a5bdcc1ca258ab8780a3516790c31eaff51a77039 SHA512 a4d3c648e83d3e067321cb28e613eddd1f689532e67811ae612089c43b1d8b163459d138fdd695cc11a0aef399028c880f7a97b33745e1fcd84ffd9b61e6ee93
diff --git a/net-mail/courier-imap/files/courier-imap-4.17-disable-fam-configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.17-disable-fam-configure.ac.patch
deleted file mode 100644
index 6d26895c0d7b..000000000000
--- a/net-mail/courier-imap/files/courier-imap-4.17-disable-fam-configure.ac.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Bug #48838. Patch to enable/disable FAM support (20 Aug 2004
-langthang@gentoo.org). This patch should fix bug #51540. The fam USE
-flag is not needed for shared folder support.
-
---- a/libs/maildir/configure.ac.orig	2004-06-08 15:44:23.000000000 -0700
-+++ b/libs/maildir/configure.ac	2004-08-14 15:28:20.525714876 -0700
-@@ -73,6 +73,12 @@
- dnl Checks for library functions.
- AC_CHECK_HEADER(fam.h, :, :)
- AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
-+AC_ARG_WITH(fam, [  --with-fam              Compile with FAM support],
-+       fam="$withval",
-+       fam="no")
-+
-+if test "$fam" != "no"
-+then
- AC_CHECK_LIB(fam, FAMOpen,  [
- 			LIBFAM=-lfam
- 			AC_DEFINE_UNQUOTED(HAVE_FAM,1,
-@@ -87,6 +93,7 @@
- AC_MSG_ERROR([[FAM development libraries not found.]]) ]
- 					)
- 		  ])
-+fi
- 
- AC_SUBST(LIBFAM)
- 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index c04bd5cc6487..63883cbd36aa 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,19 +1,11 @@
-AUX dovecot-2.3.13-32-bit-tests-1.patch 1988 BLAKE2B 80ccc0e20513b1670eb11c796d5dfe4ed7ab9f61519cf3a3b6c96b6949bac47d1e935bf6bc44afa2c5fe016fbfc08c21ce30827297dcb501c94b2b06b1f90602 SHA512 e9d538f0e0b8a81b8c8b2ff0de729427339e7951239df713f12aaccf00f9ce8f22e1741a53c5d656456450db5cac77124330aec35dcf9d58b8643d0b3bb8fa99
-AUX dovecot-2.3.13-32-bit-tests-2.patch 847 BLAKE2B 726e75638e6e070b34410062d0c55fade6552768985a887e95fe523ea83b891c65ee921c99d2af7e09aac232bf4be10136ffb7ea2545c2fe45f18d9ab1f009f7 SHA512 8ae0f4d7ef2c12ba1fcb998dbecc6d455132ff92cdb1297cc43029a0b7fc8686f81758cc3694195c5942d4a19a852a9f14dc56a018139f16ae550c13997cc653
 AUX dovecot-autoconf-lua-version-v2.patch 524 BLAKE2B a0cb51a21169e55fe0ae92ed7fad3ccc898585ed4b0c9ed3db243b6f41165d5a4ad6470a6a76f5a04a44d450068da1b7173707f272f65a72265d4b49a630ac2e SHA512 cc9319926f90a4c4aaf1d1e77944bfa5df9f7f15ee9581469ff8c1a069ef18e55addb69fcfe88e024cad8544c0efb90f5b83c2b6d803e0c68770467849d31f78
 AUX dovecot-autoconf-lua-version.patch 538 BLAKE2B 3978ebff83cb42591f60fc1cc155bd67a743d78c24d7d7ddfc0776c8df53fbdfad5cee79d1377e6436d69f6ca429ccf33b154adf470f8fc9d6429a746d49788f SHA512 a3e7403fb636078607b5452a580d229ce1d2e240d30e24138f33c3964ff008d99fef6477605f3d64dbdd8fc53187c9c6ad4eb82c58375b329dc9f8be87192eb7
 AUX dovecot-socket-name-too-long.patch 356 BLAKE2B ada5007b620cd5eef5a950d64add7d83ac366f126e1a9a70268e528d44a0a036fec096015bee2421caeca8a052d118011c5911b3c432fa73e846c66781df4da9 SHA512 f362bad725c9e408830dc9d5908a2b35b8ee82cb05f3d58795079b32d5ac4712779e71bd0f479fe072906fcaf01e4e08f08cedb9fd5ee08931409887480b8349
-AUX dovecot-unwind-generic.patch 645 BLAKE2B 6598abbd2819f7109d4caacbce5123b8810b93b623956561a12a749cbc582667caa160eac62305067db6037f820c8e1a8bd8a22da09a454afcb9e21209cc5fd3 SHA512 6ede0edd5bd6d1123ff1567886898eee5795baa549c610ba8a3567c0f8fee27d69028aaf8b6067c2f37b915a07e165aa0d6a2d5fb8314deffd61a187b18de4ae
 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063
-DIST dovecot-2.3-pigeonhole-0.5.13.tar.gz 1908839 BLAKE2B 37fbd9d9b41ca1893c19ac546dd9b272b361752c70eed0596bbb743cd8c30d942427d5814ab551bb39eb844c7bd05074bb49b11a6b81747e2fc535b0f9993f14 SHA512 fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3
 DIST dovecot-2.3-pigeonhole-0.5.14.tar.gz 1910607 BLAKE2B 5c08214535d298ce2b8defd8c945e96597a98bda6493a3e27481fdadc0e149e6dd01c6ececaa583dd331614669bd8e033cd1b91d64d03a9e0cdcef67fa9c27b8 SHA512 c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc
 DIST dovecot-2.3-pigeonhole-0.5.15.tar.gz 1935601 BLAKE2B e26405cc9a93681206e27c2b548e3409ae4444c1c011127b27eda364fec27d572dc01c7ea63688693bde10a8b4086bf67e14bb67e917d62db426d8871d6af0ec SHA512 521070080802bf2a50cd0ff0af5dc991c04d70b807abc2cd9aa567444a4869f5f42800f19d9b740a519bd4069437139e70ca6ae4b905479fcec8faa133ac5f54
-DIST dovecot-2.3.13.tar.gz 7456073 BLAKE2B 6cf3e7d9c6cf90279e0d72782cca88a11617f3f08e3c27da7948f46b8796575e42c776323cd56bc4208474831d4480afcac35ebe0b74d99db40acd4cda2279be SHA512 758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95
 DIST dovecot-2.3.14.1.tar.gz 7534719 BLAKE2B 1ba5143711fe340b9fad61db41ba658485e42be52f3b0f196eeb9b8e4b7c1b865b6a08f879dadeb2db3979b17be34699ce5febc4545887307f62bd5b72076f86 SHA512 b71b82c2918ac9940ef6bc274bc9c2b3e56a08cf5054244d80547ad89c421b9180c5afa8b5b140831239fbe2cbeeceb83a0052e037eb198d8fc27d07cba4ba35
-DIST dovecot-2.3.14.tar.gz 7483769 BLAKE2B bf2606ed64bef66fdeb165da65295031e692b7ba5186847c027adbd50093a9684b57eb724595c27838d91769e097ab2a82978ba845bf4e026dcfd78aa1372501 SHA512 69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103
 DIST dovecot-2.3.15.tar.gz 7608561 BLAKE2B 85134064dbff0b4f50831a835fb6eafc92081d75d91ab331fa0ae79c453382a88485bad8c774491968b879478dc66841a9c6170e5931d562cf5eaa6af755440b SHA512 75bbdbeac663da109f78dba06c42bb5193e911c6b3c64f055fc4473ae9afaf0c8304c49fc7f06c5c6b61e67dd13dc21fbed6ff160a99f38f547c88ba05e6b03a
-EBUILD dovecot-2.3.13-r101.ebuild 8799 BLAKE2B 1b60d430b63be9f3333ead9e6bfe1b35311fd0d5a7824866492e2796f8850e2f00dc35f1b719b3b6bee54d430bef674d4a2f1bdac0fac1504e34553269d79eb3 SHA512 4b760a68411a82f3ff0e0ed63255d1f9e8a7e5c1d04eee49c5ad22ce74f23742447918beea2c64d027cb09794f306bdf8993f275d0be5323f1548c64468bf917
-EBUILD dovecot-2.3.14-r1.ebuild 8700 BLAKE2B 5c0873e78e7f677f6bd7bef39aa0906e90b027ca486735514aab4b9c75af092ff94f27aeae1efb083e55d0e628c0644cfb297f7f444fe44ea1e676aea85d1326 SHA512 4ffefeeb0170dcba4bf7608472d9123f12681705e3dee9405eb7470c3f17da5fe257d2413c0d431efbb115f397953f36ddcde4b4684742361369babe811a7238
-EBUILD dovecot-2.3.14.1-r1.ebuild 8700 BLAKE2B 98f66ada2690611ffef33172f76a9ebddf31ba2cdf08ae2674c288a2f45a6419ece119539b9105fd12d354a9c454fdbda80d51fa1f305a91c6bc96275a65ae4a SHA512 e6a2ebdac1e20eff7a0b165cc19e61a45dce1a557cb9cdd064ceb58377dcf1acfbe272306ceea7ec0887dc5a5a8105287d518fecb769a5e4ff782f190f1f352a
+EBUILD dovecot-2.3.14.1-r1.ebuild 8699 BLAKE2B 025b31d9339716d42205d8ba732895affc49f3ca967b2f5fe07f908e0af64a06da4da2e2c06f269b4994a784007743c2ff8a0cac4aa73c223bd9b3f1dc6f9635 SHA512 52cecfeb9b0a6c7cf422ad4ee30dba6bee0e6b813ba43514bc62d899763a470c71b50c83e063867e8bd5b4a0010b8a29d5dbeaebcb9b51d8d74864d5483de89c
 EBUILD dovecot-2.3.15-r1.ebuild 8778 BLAKE2B a227a487ac527def77fe99bf806b43ba919e8da6c93967dc7791585e900594159431d496069797c23134ff18992c8496344fba73c940844d3abcee11525ba567 SHA512 2be8de3ef63c0fa8f37794295d03dd4ecc5d294af2c39134bdb5c92e8f6de8e02455d9712f4d811339a7ce4a279ecd9cd6945f838d0ecb966829f3aae9e05a72
 MISC metadata.xml 1025 BLAKE2B 8b0f7c2bbb9cfd58d34cafaea132e3d52236f91db59e53a91c0816f12813311b9d9e6d19d2341a044a4a2af5ed961eec8417d0df6826a8cbb02dff528f3cb533 SHA512 0175bb9a54384bf69d99ace11ce8a76dcca1426e4a4edc3a3e6404a0dc1bed8f6912add47735d1924410dca2d80fcfa8c9cab4df4dc7ee25f4dcc1ec004f8665
diff --git a/net-mail/dovecot/dovecot-2.3.13-r101.ebuild b/net-mail/dovecot/dovecot-2.3.13-r101.ebuild
deleted file mode 100644
index f13784a01b28..000000000000
--- a/net-mail/dovecot/dovecot-2.3.13-r101.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.13"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="argon2? ( dev-libs/libsodium:= )
-	bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( sys-libs/pam:= )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	dev-libs/openssl:0=
-	suid? ( acct-group/mail )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	unwind? ( sys-libs/libunwind:= )
-	zlib? ( sys-libs/zlib:= )
-	zstd? ( app-arch/zstd:= )
-	virtual/libcrypt:=
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	acct-group/dovecot
-	acct-group/dovenull
-	acct-user/dovecot
-	acct-user/dovenull
-	net-mail/mailbase"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-autoconf-lua-version.patch
-	"${FILESDIR}/${PN}"-unwind-generic.patch
-	"${FILESDIR}/${PN}"-socket-name-too-long.patch
-	"${FILESDIR}/${P}"-32-bit-tests-1.patch
-	"${FILESDIR}/${P}"-32-bit-tests-2.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	#elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no LUAPC="${ELUA}" econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--without-libbsd \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with unwind libunwind ) \
-		$( use_with zlib ) \
-		$( use_with zstd ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install() {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.14-r1.ebuild b/net-mail/dovecot/dovecot-2.3.14-r1.ebuild
deleted file mode 100644
index 450c88e67af4..000000000000
--- a/net-mail/dovecot/dovecot-2.3.14-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.14"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="argon2? ( dev-libs/libsodium:= )
-	bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( sys-libs/pam:= )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	dev-libs/openssl:0=
-	suid? ( acct-group/mail )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	unwind? ( sys-libs/libunwind:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-	virtual/libcrypt:=
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	acct-group/dovecot
-	acct-group/dovenull
-	acct-user/dovecot
-	acct-user/dovenull
-	net-mail/mailbase"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-autoconf-lua-version.patch
-	"${FILESDIR}/${PN}"-socket-name-too-long.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	#elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no LUAPC="${ELUA}" econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--without-libbsd \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with unwind libunwind ) \
-		$( use_with zlib ) \
-		$( use_with zstd ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install() {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.14.1-r1.ebuild b/net-mail/dovecot/dovecot-2.3.14.1-r1.ebuild
index fb2c91d54574..8c8d1142c3ba 100644
--- a/net-mail/dovecot/dovecot-2.3.14.1-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.14.1-r1.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
diff --git a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch b/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch
deleted file mode 100644
index 204424c5ebb0..000000000000
--- a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugs.gentoo.org/764713
-https://github.com/dovecot/core/commit/2cc1feca9087651902a5ea3cda021c8a0b3217ce.patch
-
-From 2cc1feca9087651902a5ea3cda021c8a0b3217ce Mon Sep 17 00:00:00 2001
-From: Paul Howarth <paul@city-fan.org>
-Date: Mon, 4 Jan 2021 16:31:03 +0000
-Subject: [PATCH] lib: Fix timeval_cmp_margin for 32-bit systems
-
-The test suite compares times with seconds values of -INT_MAX and
-INT_MAX. The result of this comparison does not fit in a value of
-type int and so the test suite fails on 32-bit systems where time_t
-is an int. To fix this, calculations on seconds values are done
-using long long integers.
-
-Broken by 16ab5542
----
- src/lib/time-util.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/time-util.c b/src/lib/time-util.c
-index 294bb02310..3f4cd01c9e 100644
---- a/src/lib/time-util.c
-+++ b/src/lib/time-util.c
-@@ -38,21 +38,23 @@ int timeval_cmp(const struct timeval *tv1, const struct timeval *tv2)
- int timeval_cmp_margin(const struct timeval *tv1, const struct timeval *tv2,
- 	unsigned int usec_margin)
- {
--	long long usecs_diff;
-+	long long secs_diff, usecs_diff;
- 	int sec_margin, ret;
- 
- 	if (tv1->tv_sec < tv2->tv_sec) {
- 		sec_margin = ((int)usec_margin / 1000000) + 1;
--		if ((tv2->tv_sec - tv1->tv_sec) > sec_margin)
-+		secs_diff = (long long)tv2->tv_sec - (long long)tv1->tv_sec;
-+		if (secs_diff > sec_margin)
- 			return -1;
--		usecs_diff = (tv2->tv_sec - tv1->tv_sec) * 1000000LL +
-+		usecs_diff = secs_diff * 1000000LL +
- 			(tv2->tv_usec - tv1->tv_usec);
- 		ret = -1;
- 	} else if (tv1->tv_sec > tv2->tv_sec) {
- 		sec_margin = ((int)usec_margin / 1000000) + 1;
--		if ((tv1->tv_sec - tv2->tv_sec) > sec_margin)
-+		secs_diff = (long long)tv1->tv_sec - (long long)tv2->tv_sec;
-+		if (secs_diff > sec_margin)
- 			return 1;
--		usecs_diff = (tv1->tv_sec - tv2->tv_sec) * 1000000LL +
-+		usecs_diff = secs_diff * 1000000LL +
- 			(tv1->tv_usec - tv2->tv_usec);
- 		ret = 1;
- 	} else if (tv1->tv_usec < tv2->tv_usec) {
diff --git a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch b/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch
deleted file mode 100644
index 8956773b43ef..000000000000
--- a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/764713
-https://github.com/dovecot/core/commit/01366bd18ea98bf6979328ff8580488920a33f0c
-
-From 01366bd18ea98bf6979328ff8580488920a33f0c Mon Sep 17 00:00:00 2001
-From: Aki Tuomi <aki.tuomi@open-xchange.com>
-Date: Thu, 4 Feb 2021 08:44:46 +0200
-Subject: [PATCH] lib: test-time-util - Use correct types for test case
-
-Fixes type mismatch on 32-bit systems.
----
- src/lib/test-time-util.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/test-time-util.c b/src/lib/test-time-util.c
-index cfa322048e..139db0ec5d 100644
---- a/src/lib/test-time-util.c
-+++ b/src/lib/test-time-util.c
-@@ -358,7 +358,8 @@ static void test_str_to_timeval(void)
- {
- 	struct {
- 		const char *str;
--		unsigned int tv_sec, tv_usec;
-+		time_t tv_sec;
-+		suseconds_t tv_usec;
- 	} tests[] = {
- 		{ "0", 0, 0 },
- 		{ "0.0", 0, 0 },
diff --git a/net-mail/dovecot/files/dovecot-unwind-generic.patch b/net-mail/dovecot/files/dovecot-unwind-generic.patch
deleted file mode 100644
index f7bc8d94ff23..000000000000
--- a/net-mail/dovecot/files/dovecot-unwind-generic.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug 728336
---- a/m4/want_unwind.m4
-+++ b/m4/want_unwind.m4
-@@ -4,9 +4,9 @@
-     PKG_CHECK_EXISTS([libunwind], [
-       PKG_CHECK_MODULES([LIBUNWIND], [libunwind],[
-         dnl see if there is target-specific library
--        AC_CHECK_LIB([unwind-${build_cpu}], [_U${build_cpu}_init_local],[
-+        PKG_CHECK_MODULES([LIBUNWIND_GENERIC], [libunwind-generic],[
-           have_libunwind=yes
--          LIBUNWIND_LIBS="$LIBUNWIND_LIBS -lunwind-${build_cpu}"
-+          LIBUNWIND_LIBS="$LIBUNWIND_LIBS $LIBUNWIND_GENERIC_LIBS"
-           AC_DEFINE([HAVE_LIBUNWIND],,[Define this if you have libunwind])
-         ],[
-            have_libunwind=no
diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
index f9cb5e7ad8d8..a7fafa4915e1 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -1,4 +1,3 @@
 DIST fdm-2.0.tar.gz 313596 BLAKE2B 8b323f4a8953a46773a4e5a1214444dc97db4346f50990fcfb4c9d79ae40bbb73b61e3bf41bc95b76e44f6bed7b398cb210d58901823752e92ca7b83189cbc7e SHA512 14e923202d17083ceb3b91b3a442d7e512c37f3d29535f22d8c0c4e1d57c97acc5d5465d643ed0cf437b3945ef777a6e38da3117219c2d54dcec88ecab1e10d9
-EBUILD fdm-2.0-r1.ebuild 905 BLAKE2B 5f14bf6c0de3dcb8e20dbeb5f06759e7d7b328c38f1155c3b819bc055b330314bd0043bbd031f8bf6ad508eaa245cc85a90a2a9af556f759673dab5810269369 SHA512 9b927d9b865f4c4b0b8e417b689a4d1068c129199ecbda7286dad073896418128597750ead7fb819a7c551d0638d7d5ef71d4d30f9ab1ff1f2b8b7f4e8f2d8b8
-EBUILD fdm-2.0.ebuild 781 BLAKE2B cf0dc7932dc397b139ddaaa8250c648a479df2c30d756336010d3cc29b86240dc5dc3d1f2543cd478c585066977fe2d0183c1545ab4aa6c301cc195033d694d2 SHA512 5e6431de86fcd9fe8366ba284a31341b9ce8d696b8ed48fbfcc5945761789cd80b8c2f9a7ce81f3ef3602b213da48f0f041da5efebe0d418116ed5ec25551fa5
+EBUILD fdm-2.0-r1.ebuild 903 BLAKE2B 6ce5748e6f8ea135ef5f1988069260d71c0d788594608a3204c58be47cc21e201ddcc1ff1489462fb727832ce05c24a43fd2b3ce8f383134c6f78aeb718ac95c SHA512 806b6b91db64f8e0e3acbac89a7e502b204fe33b948b73273f9ca151a21dca1096a29b165c3d8e097961990d54fa33946e47ba9a43db1cb1e81a5557026410b7
 MISC metadata.xml 295 BLAKE2B 258b3dde768bd93f75108c451644287a850dd28a867429953e65ce650dd9911982f6c47672d6fe75d67f572d28f6d6e3d15393f7e88f9beff7917dea30f53ca4 SHA512 702eb19cdd97836f450877ec4fb366447b32b5eb4c181930c0960b1d5c2638ba1a0c995cb599fa272fd31c80b5ecba93ba4b713d9e913103d5509ba2959f8eb6
diff --git a/net-mail/fdm/fdm-2.0-r1.ebuild b/net-mail/fdm/fdm-2.0-r1.ebuild
index 565b705e22c6..b371fd17ac37 100644
--- a/net-mail/fdm/fdm-2.0-r1.ebuild
+++ b/net-mail/fdm/fdm-2.0-r1.ebuild
@@ -9,7 +9,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 pcre"
 
 DEPEND="
diff --git a/net-mail/fdm/fdm-2.0.ebuild b/net-mail/fdm/fdm-2.0.ebuild
deleted file mode 100644
index 694efe073883..000000000000
--- a/net-mail/fdm/fdm-2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="fetch, filter and deliver mail"
-HOMEPAGE="https://github.com/nicm/fdm"
-SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples pcre"
-
-DEPEND="dev-libs/openssl:0=
-	sys-libs/tdb
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES README TODO MANUAL )
-
-src_configure() {
-	econf $(use_enable pcre)
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-	fi
-}
-
-pkg_preinst() {
-	# This user is hard-coded in fdm.h. If fdm is started as root,
-	# it will attempt to drop privileges (to this user).
-	enewuser _fdm
-}
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 6e8bebbc8527..5253383f106b 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -7,5 +7,5 @@ AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
 DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
-EBUILD mailutils-3.12-r2.ebuild 3684 BLAKE2B 99098d620b861b623f583385af6155c3de34fa6fc27942dcb8e531330f1a074402881a2302de90832175c0315d5589c414d60069a7cecb18edf3b34045f5d108 SHA512 0e99fb4390e2706f31c17ae1860976ac529229843b787a7800fcbaeb4ad60d409aae7f18b2c546287c17fff4b97fa36f9089bacbaee862c1f8b0df8814429248
+EBUILD mailutils-3.12-r2.ebuild 3691 BLAKE2B d2dfeab68b8c1165d6cfee0c9333e99c42499fd9e43475f45fd44338926a1810fdbfa0283f72471148b625b3538605b484618c18e935a109e92064cb15d3b8b3 SHA512 40b34e364f380074a48647e6d897f6f7841dadc3ca7c1723289b11bdabf98f1757b6e990bf4b510b1322dcc943bdaf703ca0e6d5703a4445314c70801671147c
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/mailutils-3.12-r2.ebuild b/net-mail/mailutils/mailutils-3.12-r2.ebuild
index dd4838682aa9..7abe9fabe3e0 100644
--- a/net-mail/mailutils/mailutils-3.12-r2.ebuild
+++ b/net-mail/mailutils/mailutils-3.12-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 535870f2ced7..d37350d6ce93 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,6 +1,9 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
+AUX mu-1.4.15-guile3-1.patch 5237 BLAKE2B 49fb8d7c75d0dc758b7a0cc4d69fca9a1d776c522037271e985b8667c82e04b5487a9a3f4a0537a1aaf81950f95e06e258abc79a1b9d572f8a9cce4144d883b1 SHA512 ca2a06e604ea86b24f5f11d1901ab27dfd54346c4cc9417ae95ac9d0472e4f0e1bf3aad638cc06d8b354339defbbd5972096b563d362c0d23265ae60e1e0790c
+AUX mu-1.4.15-guile3-2.patch 506 BLAKE2B ff01cdf9d9da6d4a2f2517c9a6df56e13929e4e9795f951c8f0cd3778c6a4f82cec305e2d24e05040b2395796690b9205e22699ce102745e9367e926ef6eaccd SHA512 c1da640ac0d900653b21d64b3078b8c3a02bc38a2745adb76a2c3c27f8829d0678daa18bb58e238d07a2d01d716a4291746840ad5438caa9637454f17ac8ddb4
 DIST mu-1.4.15.tar.gz 2309695 BLAKE2B 9808e59b758525937ec97e0ca6515108c1fb4287f3134d0c6038a74ef57b4992fede6b8957ba4e7e1681d8d307aec32fa6b2931e588004849e6c1dfb7da2f7f5 SHA512 dd0426c1fb7fe2430b47fc1232e067d1c017b3c428bbd8012c542f6e1ffa7741bb145c6851f40cbc945403534dabb4aa99faf369166167d187f083dde1d30546
 DIST mu-1.4.15.tar.xz 846052 BLAKE2B 933d04696c4ac145f20ca6c84f6fbe62f70fa3e45e50dfdf2e48a7007acecc56d8650f965dc6810fc7f8bbdae6595b7b7349f2675b08cd9fb619ee9eb24eb251 SHA512 e7741b77bce5c7c1c818549e803fb386f0b8727b995a7ac9b961b74e89cc7dbeed52b45d70895995a1640cfd36a49b052eeeed9be6c48999f2182a68bf5c205e
 EBUILD mu-1.4.15-r1.ebuild 1374 BLAKE2B 6b14c1413eff8c536636d0a4e4a9ddc7db6a725f30ea34e48fe74154a5ba233aad28d268202adf1859cf7955dc78d083a72f97133951afc6c1d4ceea4fbdfdf9 SHA512 ad2787b57a340441aa760c7ff19dd906cfe7abf796136d5d72c6e2dade58dcd61f4204e192beff1d5f1f14636ecf6e451903073fea6f80dc0e8c676282bb7618
+EBUILD mu-1.4.15-r2.ebuild 1535 BLAKE2B 78399a21ac72dd380d097c76b15e7146e5e1d470fc16ec5c548ab18a56b4e0419751b68f3515bedebd591ad44bd68cbf7d451821a5b3c2cb1eec43a208516046 SHA512 18d3d5d1f811925cd2cb01c0c4302b76a841d0cd46e6fbc9cf52ffec716fd2f34775d06df10a1c51e6553e763d6be9675fe1ce0612781c2b2abab1c0e9d79fd6
 EBUILD mu-1.4.15.ebuild 1772 BLAKE2B 8b31278a7ee402b88f93ddea57340c8067be56a7b9377d20d705bffb56c2baac4e0c9c1bde2ce0b1b432e68b7bf40229e4ac775fa66a43df126f7cf22aa504ab SHA512 a611058c25591343bf57a5a820481516b71005e811e60a26b47d25f04f7ec8c5ca9b9936d5259f8fbd9f17c296a01246a48b451ef21a52268991b19dd6960441
 MISC metadata.xml 925 BLAKE2B e2267c540c5107d64c6fd7ab7c0e20476a473fe704facc4d692f7f90272ed05fdff5af673dcc492a134371ee81ad0c3794e7bd22e7cd10b4cc5e744fb26d25bf SHA512 e7f92466cfd6fb8bdc66c1262bc4b426f73f1cebea24fe4cd2f6a5f256df46ad7a9ad545faeb91bfeb2ea17fad848b2b7f7eeef576ef0e010b5a87d821a0c5e3
diff --git a/net-mail/mu/files/mu-1.4.15-guile3-1.patch b/net-mail/mu/files/mu-1.4.15-guile3-1.patch
new file mode 100644
index 000000000000..671a4685a275
--- /dev/null
+++ b/net-mail/mu/files/mu-1.4.15-guile3-1.patch
@@ -0,0 +1,141 @@
+From 623cf787ad009c42b2adf3767be5f01fec56ff5a Mon Sep 17 00:00:00 2001
+From: Danny O'Brien <danny@codetherapy.space>
+Date: Mon, 7 Sep 2020 19:52:17 -0700
+Subject: [PATCH] guile: support version 3.0.
+
+Includes an update to the guile m4 package, and tweaks the build so that
+both 2.2 and 3.0 should work fine.
+---
+ configure.ac                  | 14 +++++++-------
+ guile/Makefile.am             |  2 +-
+ guile/mu/Makefile.am          |  4 +---
+ m4/Makefile.am                |  2 +-
+ m4/{guile-2.2.m4 => guile.m4} | 15 +++++++++------
+ 5 files changed, 19 insertions(+), 18 deletions(-)
+ rename m4/{guile-2.2.m4 => guile.m4} (97%)
+
+diff --git a/configure.ac b/configure.ac
+index eb5629696..cc43f43db 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -212,22 +212,22 @@ AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes"
+ ###############################################################################
+ 
+ ###############################################################################
+-# build with guile2.2 when available and not disabled.
++# build with guile 3.0/2.2 when available and not disabled.
+ AC_ARG_ENABLE([guile], AS_HELP_STRING([--disable-guile],[Disable guile]))
+ AS_IF([test "x$enable_guile" != "xno"],[
+-  PKG_CHECK_MODULES(GUILE22, guile-2.2, [have_guile22=yes],[have_guile22=no])
+-  # this is a bit hacky; GUILE_PKG
+-  AS_IF([test "x$have_guile22" = "xyes"],[
+-    GUILE_PKG([2.2])
++  PKG_CHECK_MODULES(GUILE, [guile-3.0], [have_guile=yes],[
++    PKG_CHECK_MODULES(GUILE, [guile-2.2], [have_guile=yes], [have_guile=no])])
++  AS_IF([test "x$have_guile" = "xyes"],[
++    GUILE_PKG([3.0 2.2])
+     GUILE_PROGS
+     GUILE_FLAGS
+     AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary])
+     AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])
+     AC_SUBST(GUILE_SNARF, [guile-snarf])
+-    guile_version=$($PKG_CONFIG guile-2.2 --modversion)
++    guile_version=$($PKG_CONFIG guile-$GUILE_EFFECTIVE_VERSION --modversion)
+   ])
+ ])
+-AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile22" = "xyes"])
++AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile" = "xyes"])
+ ###############################################################################
+ 
+ ###############################################################################
+diff --git a/guile/Makefile.am b/guile/Makefile.am
+index ed613068b..5c06ccc95 100644
+--- a/guile/Makefile.am
++++ b/guile/Makefile.am
+@@ -69,7 +69,7 @@ SUFFIXES = .x .doc
+ 
+ # FIXME: GUILE_SITEDIR would be better, but that
+ # breaks 'make distcheck'
+-scmdir=${prefix}/share/guile/site/2.2/
++scmdir=${prefix}/share/guile/site/${GUILE_EFFECTIVE_VERSION}
+ scm_DATA=mu.scm
+ 
+ EXTRA_DIST=$(scm_DATA)
+diff --git a/guile/mu/Makefile.am b/guile/mu/Makefile.am
+index f531822cd..9339ad973 100644
+--- a/guile/mu/Makefile.am
++++ b/guile/mu/Makefile.am
+@@ -16,9 +16,7 @@
+ 
+ include $(top_srcdir)/gtest.mk
+ 
+-# FIXME: GUILE_SITEDIR would be better, but that
+-# breaks 'make distcheck'
+-scmdir=${prefix}/share/guile/site/2.2/mu/
++scmdir=${prefix}/share/guile/site/${GUILE_EFFECTIVE_VERSION}/mu/
+ 
+ scm_DATA=		\
+ 	stats.scm	\
+diff --git a/m4/Makefile.am b/m4/Makefile.am
+index eeb8a05a4..27a49eebe 100644
+--- a/m4/Makefile.am
++++ b/m4/Makefile.am
+@@ -41,7 +41,7 @@ EXTRA_DIST=				\
+ 	ax_lib_readline.m4		\
+ 	ax_require_defined.m4		\
+ 	ax_valgrind_check.m4		\
+-	guile-2.2.m4			\
++	guile.m4			\
+ 	lib-ld.m4			\
+ 	lib-link.m4			\
+ 	lib-prefix.m4
+diff --git a/m4/guile-2.2.m4 b/m4/guile.m4
+similarity index 97%
+rename from m4/guile-2.2.m4
+rename to m4/guile.m4
+index 89823e9c3..696897364 100644
+--- a/m4/guile-2.2.m4
++++ b/m4/guile.m4
+@@ -47,8 +47,8 @@
+ # for an available version of Guile.
+ #
+ # By default, this macro will search for the latest stable version of
+-# Guile (e.g. 2.2), falling back to the previous stable version
+-# (e.g. 2.0) if it is available.  If no guile-@var{VERSION}.pc file is
++# Guile (e.g. 3.0), falling back to the previous stable version
++# (e.g. 2.2) if it is available.  If no guile-@var{VERSION}.pc file is
+ # found, an error is signalled.  The found version is stored in
+ # @var{GUILE_EFFECTIVE_VERSION}.
+ #
+@@ -60,8 +60,11 @@
+ # @code{AC_SUBST}.
+ #
+ AC_DEFUN([GUILE_PKG],
+- [PKG_PROG_PKG_CONFIG
+-  _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
++ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++  if test "x$PKG_CONFIG" = x; then
++    AC_MSG_ERROR([pkg-config is missing, please install it])
++  fi
++  _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0])"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do
+@@ -221,7 +224,7 @@ AC_DEFUN([GUILE_SITE_DIR],
+ # as well.
+ #
+ # By default, this macro will search for the latest stable version of
+-# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older
++# Guile (e.g. 3.0). x.y or x.y.z versions can be specified. If an older
+ # version is found, the macro will signal an error.
+ #
+ # The effective version of the found @code{guile} is set to
+@@ -237,7 +240,7 @@ AC_DEFUN([GUILE_SITE_DIR],
+ AC_DEFUN([GUILE_PROGS],
+  [_guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
+   if test -z "$_guile_required_version"; then
+-    _guile_required_version=2.2
++    _guile_required_version=3.0
+   fi
+ 
+   _guile_candidates=guile
diff --git a/net-mail/mu/files/mu-1.4.15-guile3-2.patch b/net-mail/mu/files/mu-1.4.15-guile3-2.patch
new file mode 100644
index 000000000000..6aa47d252306
--- /dev/null
+++ b/net-mail/mu/files/mu-1.4.15-guile3-2.patch
@@ -0,0 +1,17 @@
+---
+ lib/mu-script.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/mu-script.c b/lib/mu-script.c
+index 1175a60e3..92a63992e 100644
+--- a/lib/mu-script.c
++++ b/lib/mu-script.c
+@@ -318,7 +318,7 @@ mu_script_guile_run (MuScriptInfo *msi, const char *muhome,
+ 	g_return_val_if_fail (muhome, FALSE);
+ 
+ 	argv = g_new0 (char*, 6);
+-	argv[0] = g_strdup("guile2.2");
++	argv[0] = g_strdup(GUILE_BINARY);
+ 	argv[1] = g_strdup("-l");
+ 
+ 	if (access (mu_script_info_path (msi), R_OK) != 0) {
diff --git a/net-mail/mu/mu-1.4.15-r2.ebuild b/net-mail/mu/mu-1.4.15-r2.ebuild
new file mode 100644
index 000000000000..fa8dc2e30146
--- /dev/null
+++ b/net-mail/mu/mu-1.4.15-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/archives/refs/tags/${PV}.tar.gz -> mu-${PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="emacs guile mug"
+
+DEPEND="
+	dev-libs/glib:2=
+	dev-libs/gmime:3.0=
+	>=dev-libs/xapian-1.4:=
+	emacs? ( >=app-editors/emacs-24.4:* )
+	guile? ( >=dev-scheme/guile-2.2:* )
+	mug? (
+		net-libs/webkit-gtk:4=
+		x11-libs/gtk+:3=
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.15-guile3-1.patch
+	"${FILESDIR}"/${PN}-1.4.15-guile3-2.patch
+)
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable emacs mu4e)
+		$(use_enable mug gtk)
+		$(use_enable mug webkit)
+		$(use_enable guile)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "After upgrading from an old major version, you should"
+		elog "rebuild your mail index."
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+
+		elisp-site-regen
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a8cebe3539f9..a938578b99dc 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9cbac42c0bb5..15309054f5df 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -18,10 +18,14 @@ AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38f
 AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b573839db7860fd10828f444aef0f08d189a4e129a5545538424c1698e7d9d980cdbb44da2e68ff73dd0c75 SHA512 81747f6e6b4142b341797a8b2e9b212a48870d8db661669759020cc4c3ab0b66996a37dbd35afaa842dc00cd43aa834d3146021420b3f29b0d2f8b6e11d3fca7
 DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2 SHA512 bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051
 DIST asterisk-16.18.0.tar.gz 27843069 BLAKE2B 643c371b4747111e233c0758efb529e7f54f1deeff10e65fb05f3a1a58c4ba5c139bdb583d2a2552e29aacac5d0f3980fd9aeb19fda2513843fbe0c849dec217 SHA512 025a30a1eed1d2cd14eb1345e1e0edfcc23b4c517e0d33da7d06d97b3ffa3c9ce9c2fe9449109eefade6d62b6205b598fecb69245adb04f03bd53f8482fbd7ad
+DIST asterisk-16.19.0.tar.gz 27872364 BLAKE2B 3510f300c2cd0d67232e5d36752f60a2e67dde988de1ca41b5709dc29aa462f268b49b6c48cf669a7b5fdc0aec038dbfb1d56f7ebe6e9a7285d2cee34b3fc789 SHA512 e50b7c42591ff7fedba3e591a4e696ace62731d81b4d054757a91d8997ee454e949c56a4cf19e37c160407b23ec8c654c1b8af18712d09078e6149b5b22c5040
 DIST asterisk-18.4.0.tar.gz 27926601 BLAKE2B 1a4089ee274732462a8e480d449e4043f7393a6df0b78dd3ea341d3996b9e433066e6d7c53b3ab334db5946a4b847ac02abb4afc5747b6f541cad81a6d58d468 SHA512 024d0a5c75d55fe614ba6219aece62778e9522a0f8365d57192aa5aa22be94d45a3bed69ac14659738e97dd98967533c13096a855366083e6df2b7800e684602
+DIST asterisk-18.5.0.tar.gz 27956264 BLAKE2B 1b2cc477dd37be81b7c1611f1334db8e5095a2d76b1cfa0148072f7c3e9247e3d43da8b0bf502e18c2f553a893b1cc0a1aa9f2ca0942b012d0261c6171536370 SHA512 f31ac2ccd4b9af3ee4ad1c1368519e889d2e3e5b6b22e6f1b6dc020ffbdc8caccf0c03ba620f4a8b6346403abffde23d93fa8c06a6d7d993074edfaa0cf256df
 EBUILD asterisk-13.38.2-r1.ebuild 9682 BLAKE2B 59116ae296d6506307e01059a3925f6a3c5e5faab53ea264817a006b2abea0ba7579377b3c55a254d402a05676e11957715c1c64c160d1aa13a8b4a1d34f3998 SHA512 1c1662f449aa828ac2b9215fffb37e499f818ef94ce4927fa16eb2d5181a60d3489db025641118e94943844ceee646138e95526988a90e87dff7eb5882730410
 EBUILD asterisk-13.38.2-r4.ebuild 10809 BLAKE2B 8e47dca23cbd7496fb96f02b7a5378d30c91843bd0e6742f6bd86e6e358b351a9f8b2b2c20cbca93b341a8b6d53d5c62fa6fd3b8545439ad237337c7d20fcb86 SHA512 2d37bf064823b4e5f9607ef52cd0494829442ef9d765d7fca586555a521030b1ba59dd4f9ae680bfdb33cb386a3308f66243375cc75ad3a4537a3273acba68c9
 EBUILD asterisk-13.38.2-r5.ebuild 10809 BLAKE2B 2a6b5c1c0cfacf96196b1f3d076554277377e1745ebb7cb7d0d801dbbd364e52a23464a78e4fc324895de7efaef495a38ca1db25f257b74f95e4c53fd591363b SHA512 24e91b215398d4d4c7e032b0b7de4aecd87e3764dda842a092a6d31f68dd3bb55df84c32c0bbb95f13aaccb42f700640a336a4fa8df02cc58dae80ef51f92ab3
 EBUILD asterisk-16.18.0-r2.ebuild 9871 BLAKE2B 51969cf5594b9d613d9059d5a4af13f12d9d98f346403a9a388ff330c3eaaa865ffb27adc642e16e6dcf8299c6080f62f0b9e8e47c30a8eacfe0ace39d4ce5f7 SHA512 002af728e030d3cf06eef8f021f7584e522bf3b5eff9f64b50f848b39d6f9eaf74e6e55ee42578c981bfa14841511de8744389906ef4bd23e2cc09e78100b83e
+EBUILD asterisk-16.19.0-r1.ebuild 11217 BLAKE2B 6053903a9a4f68d75f46ce622cc72ebaa752e7518ee0bffc49dadb19d53c4dc83b11888321277ad625f1455e9d1a53e0a435b2bb39f1ec28e0612f7af26efb4a SHA512 6328832a8f58950859ff47a4e374dd4803ea54442531ea6dc5153e0a8e02726cb6e7751025d0ebaafd7ba1160e1ab498eff76d2054e76aa6d2024c74b3244f65
 EBUILD asterisk-18.4.0-r2.ebuild 11234 BLAKE2B 26543c5d82e172047b5fdc3129defa36f2508b791f8a2cd132fb7f78494d12cb406c52ad2cb544589bc959754e35ca7e1edf3117a36857c95a3edda816c1841d SHA512 f2e84a8c058440b529fbaaebbbd13f7a8d85d4bf8af573f4318532ca53e650b153d8610180ffe9bfdf32594387f83b56219332849a404f2626cea8ccfe88ee2e
+EBUILD asterisk-18.5.0-r1.ebuild 11190 BLAKE2B 85fcf0ea3ba693936835c47971d85b962def77113c77fd5d3c878e8f15ae7f8a5cf23d899d6779034f27ae78e7710a3ca27fa5302975d272f67ab11e086b2553 SHA512 2039c5d624abc31fd43840e7fbd57c483f0c8a543d79dce32c690800f88f49f1ee52dd63ee9ea2791afd876b934d87202316852d35833c93e28ba8c4c2b6fff6
 MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-16.19.0-r1.ebuild b/net-misc/asterisk/asterisk-16.19.0-r1.ebuild
new file mode 100644
index 000000000000..9548b400631a
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.19.0-r1.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-18.5.0-r1.ebuild b/net-misc/asterisk/asterisk-18.5.0-r1.ebuild
new file mode 100644
index 000000000000..1334c613ae61
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.5.0-r1.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	_menuselect --enable app_voicemail menuselect.makeopts
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-headers install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/bopm/Manifest b/net-misc/bopm/Manifest
index cb629865ee99..8809df025ada 100644
--- a/net-misc/bopm/Manifest
+++ b/net-misc/bopm/Manifest
@@ -6,5 +6,5 @@ AUX bopm.conf.d-r1 221 BLAKE2B ca4f3eb206dfc18d5714d1e5530bc1d562d1e6262ce26cc93
 AUX bopm.init.d 450 BLAKE2B 22516346f9461d43c364115f04256090a8eef2e83dceb6432ce5e3dafe264fb043c0a15c0531042e0c0fcaf068f74ff15d5b93f85b07a5793c9e0dbaf191ab7e SHA512 14f310b94d66d904b83b475210b5b78730a0d7776b725a46c01f3da1a62599fffd964231133e9f4514d49c770bb406e94ce748cf7d67d2b6a3b174c71b8d0e6e
 AUX bopm.init.d-r2 435 BLAKE2B 824a52870c1724d1e6ce0b3bf319e5c7718d2591e87fb9b1115fe3a07b8ef5f4234d2d935b31701934ba7ab23b6340c068d6843227760fbbea00df4df8a260d9 SHA512 ba5dab8f556108a7e273788a8483443c250f8b8c24d17f522b795b8383d2f257babd9543921f038461f16c34e6103e526c63c8c5d2e00be80f5f8ab0fd8040d3
 DIST bopm-3.1.3.tar.gz 819273 BLAKE2B a0630ca3835467ae15622aa2ec5ee6174b57f43e7d22b1cd03884dcbc2e6d4967118e5c22f238b00a9495f76ec92537d0c4fb517ba7cf3e2c355cee366777804 SHA512 974c243e4fb7e184d3aa570dda2d919cea33df71215746d156b37b7fa3d6f45cd5448c847a7321d4ca22356fffa372f5486e6c3cd958698e173d79731f8ef8af
-EBUILD bopm-3.1.3-r4.ebuild 1401 BLAKE2B 635d6656a807d702aece550b9332f6a87beac0e0bf564a10b759695c036bfaa35fe9fb6281833c506e93717c0167e302a534ba0764d09ba0f151828647d8b096 SHA512 409e437e4d03693b4ed96f2367c8f0ad5e71e1b14125d5cfd6809066694cc7d83206aedc4292af456b2d4819c339bbe222587df44e2ea2401c22175e3e042a6d
+EBUILD bopm-3.1.3-r6.ebuild 1650 BLAKE2B 5b9e970140edbd3abd7d7a24ab8b37e7e31ea7bd3dd50be82bc411bff616fee6199aac9cb983a793fe88580ee75d1d7d4bf50be618a0ad1e5c9d3788f8684f8d SHA512 cb4cb072c6586fcea5be1b2c10b86d9c61bf11e03d7393031ebfc8e50b8763f2c533d2765201e96df8ee0a482519a1629efe1cfca951fb4967ec12d5133a1cc7
 MISC metadata.xml 320 BLAKE2B 0df7bccca17096486031e49410ea661aa6e82e5b9da83c14e193805a2635438487c8d95107b8594a6917983f7976f89fc7a89af6f3cb6cf403e4318d40b09812 SHA512 7df57a22ef6611ea0872ba4b2fd29f6f48d88c18719f032a1f664a4e97945b89d707cec3bd95a1bb9714a4916cc70863a0f1d35e43f977dd829bcdd7ffa329b6
diff --git a/net-misc/bopm/bopm-3.1.3-r4.ebuild b/net-misc/bopm/bopm-3.1.3-r4.ebuild
deleted file mode 100644
index d90d4d376cd0..000000000000
--- a/net-misc/bopm/bopm-3.1.3-r4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools user
-
-DESCRIPTION="Blitzed Open Proxy Monitor"
-HOMEPAGE="https://github.com/blitzed-org/bopm"
-SRC_URI="http://static.blitzed.org/www.blitzed.org/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-njabl.patch
-	"${FILESDIR}"/${P}-autotools.patch
-	"${FILESDIR}"/${P}-quarantine-bad-pid-file.patch
-)
-
-pkg_setup() {
-	enewuser bopm
-}
-
-src_prepare() {
-	sed -i \
-		-e "s!/some/path/bopm.pid!/run/${PN}/${PN}.pid!" \
-		-e "s!/some/path/scan.log!/var/log/${PN}/scan.log!" \
-		bopm.conf.sample || die
-
-	mv configure.{in,ac} || die
-	mv src/libopm/configure.{in,ac} || die
-
-	default
-	cp bopm.conf{.sample,} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --localstatedir="${EPREFIX}"/var/log/${PN}
-}
-
-src_install() {
-	default
-
-	# Remove libopm related files, because bopm links statically to it
-	# TODO: Do we really want libopm? It's gone now.
-	# (was: "If anybody wants libopm, please install net-libs/libopm")
-	rm -r "${ED}"/usr/$(get_libdir) "${ED}"/usr/include || die
-
-	newinitd "${FILESDIR}"/bopm.init.d-r2 ${PN}
-	newconfd "${FILESDIR}"/bopm.conf.d-r1 ${PN}
-
-	dodir /var/log/bopm
-	fperms 700 /var/log/bopm
-	fowners bopm:root /var/log/bopm
-
-	fperms 600 /etc/bopm.conf
-	fowners bopm:root /etc/bopm.conf
-}
diff --git a/net-misc/bopm/bopm-3.1.3-r6.ebuild b/net-misc/bopm/bopm-3.1.3-r6.ebuild
new file mode 100644
index 000000000000..ae8dd5a2d897
--- /dev/null
+++ b/net-misc/bopm/bopm-3.1.3-r6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Blitzed Open Proxy Monitor"
+HOMEPAGE="https://github.com/blitzed-org/bopm"
+SRC_URI="http://static.blitzed.org/www.blitzed.org/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+
+RDEPEND="acct-user/opm"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-njabl.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-quarantine-bad-pid-file.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e "s!/some/path/bopm.pid!/run/${PN}/${PN}.pid!" \
+		-e "s!/some/path/scan.log!/var/log/${PN}/scan.log!" \
+		bopm.conf.sample || die
+
+	mv configure.{in,ac} || die
+	mv src/libopm/configure.{in,ac} || die
+
+	default
+	cp bopm.conf{.sample,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --localstatedir="${EPREFIX}"/var/log/${PN}
+}
+
+src_install() {
+	default
+
+	# Remove libopm related files, because bopm links statically to it
+	# TODO: Do we really want libopm? It's gone now.
+	# (was: "If anybody wants libopm, please install net-libs/libopm")
+	rm -r "${ED}"/usr/$(get_libdir) "${ED}"/usr/include || die
+
+	newinitd "${FILESDIR}"/bopm.init.d-r2 ${PN}
+	newconfd "${FILESDIR}"/bopm.conf.d-r1 ${PN}
+
+	dodir /var/log/bopm
+	fperms 700 /var/log/bopm
+	fowners opm:root /var/log/bopm
+
+	fperms 600 /etc/bopm.conf
+	fowners opm:root /etc/bopm.conf
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		if has_version "<${CATEGORY}/${PN}-3.1.3-r6" ; then
+			ewarn "You need to update permissions on:"
+			ewarn "- /var/log/bopm"
+			ewarn "- /etc/bopm.conf"
+			ewarn "to be owned by opm:root"
+		fi
+	fi
+}
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest
index d764cf8f4ad4..68124fbd6a90 100644
--- a/net-misc/connman-notify/Manifest
+++ b/net-misc/connman-notify/Manifest
@@ -1,3 +1,4 @@
 DIST connman-notify-0_pre20191003.tar.bz2 9102 BLAKE2B 7c31de51b21f7cae475b543cf74bba1d969c779f00d1dab7ebce2da6758e1dec6c3c06ae1f0ab133292fc03c1dc61cd1c18c4719311f7a7b65f1771afb097b64 SHA512 6ca8dce104fc5c94af8ef4fab94e44f6a921017d58bbe12660f6bb6a6a0ab6b0808bb7584b75d2acaa486d4cbe718f436fcf7924d6baac97b59a2b77a13215f4
-EBUILD connman-notify-0_pre20191003-r2.ebuild 947 BLAKE2B e35b01aaff21a376caeafe9eb750cccc6594ed80ca06bbac27aa1a447fbb487f722a798b5cfb2dd7f34d568a2bd1d236297f28c0c96d4639b085c57979e850bf SHA512 e49827a6f26fe43145de0acbc0c8985c5b685a8c47c4e21bfd33302c5c6e6d43fb24ecf0ce0c56b765c9f197146af156c9b06340ff779a4e7a356ab55c34f98d
+EBUILD connman-notify-0_pre20191003-r2.ebuild 948 BLAKE2B 0f5626e262c13a4a09e42aaf0b23b9034f5589ea41c6b34881f21a637ee5237ba68b43397649eae60fbe3a2e969ff2e81f176f855bb5f84128f89e8ecb0ce674 SHA512 27463c9750c2c1d39b0580bdc299c4a38d34766411c7f8fe399ac84d4a8e23eb5f2fffea827b07346cae117510fc6bf10d9ca7d2444856684ff11a52f40c074c
+EBUILD connman-notify-0_pre20191003-r3.ebuild 969 BLAKE2B 8c500f60718391885b7d805304390ac4814a06e02b1d720ab41af955fd47f9aeeb4b4d01f04a7d901bce897d844c2423120d875685863a5ff7fed2c44ecb1585 SHA512 c1db99b1759a772a9fec828878c79f6db72cb8eb2d58487e0e5b5d9cf03d46ae352218fc8bb987b2352601ebc71f1dc6c08f189b67747690632765c54dd38897
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
index 7111e0e57bbf..69220f55962a 100644
--- a/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit desktop python-single-r1 vcs-snapshot
 
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
new file mode 100644
index 000000000000..e9555e6bfa2b
--- /dev/null
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit desktop python-single-r1
+
+MY_COMMIT="4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52"
+
+DESCRIPTION="Desktop notification integration for connman"
+HOMEPAGE="https://gitlab.com/wavexx/connman-notify/"
+SRC_URI="https://gitlab.com/wavexx/connman-notify/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
+
+EGIT_REPO_URI="https://gitlab.com/wavexx/connman-notify.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	net-misc/connman
+	virtual/notification-daemon"
+
+S=${WORKDIR}/${PN}-${MY_COMMIT}-${MY_COMMIT}
+
+src_install() {
+	python_fix_shebang ${PN}
+	dobin ${PN}
+	dodoc README.rst
+
+	make_desktop_entry ${PN} ${PN} ${PN} Network
+}
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 7b6842008b4d..a2aa5f75f02c 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-gui-2.2.19.tar.gz 5162823 BLAKE2B 58ed776ac542ff06e288c8af80af256e69d5c7bee637fd3ba539d0601035ea72f8673fb6fa31bef4671d1934d0e5bf06a28aa1281e2e6fb71408e8e09fcfdc05 SHA512 a1ca103f57edc639f60bb447f04b86f439e29500a8446c046cd2fbe5f9267e87394e1f2cd21e8f894c1e520ff0493f16235debba26d3855e1d1a423e2b7bb9af
 DIST gns3-gui-2.2.21.tar.gz 5162935 BLAKE2B ebe60ecd2c2228a783ae8c0aa65213534a81495c7d0afbd5fee7023dcf87e2d25c6575f8b966299f2953e16749ef92d17b07a1cbcac211effb28baca6851aaa8 SHA512 64ec5b49e6dc2ae6af2618b5ad0f06d306c43989802db1f0e30e5fe1ca92bdbb53d011820ed622690f3d97987be94daf3bf9a9b6e6fd4fd04fa6e8bffa846423
-EBUILD gns3-gui-2.2.19.ebuild 1099 BLAKE2B bb40c8d8b4fa70391019d3cdb7c09081db92ea33303185a6d4d5a9811ff48bb0fedf9239ae82da2f60f73907cc6e4bc35cd5bfd7cf230c6b8d632cb8df66323f SHA512 aef0c60f7051d94577c2affc687c924095970e810bdab540ed0fbd690722ab20bd61bc4f844d0b2ab795c91a45f4fede9e86ba87f0696af979c3ece6b9a806aa
+DIST gns3-gui-2.2.22.tar.gz 5043351 BLAKE2B 98bae9bcec74511f33134c0430937788d0ade66648081eda1a394aa032914410d3765a9cbe6c0167911aad9df6392810fdcbaf43d3d27862fbd881d847324d37 SHA512 12a7e014b6f86d643641fc3511387cfe7b9bccf3a8ed9b49e21aaa73f3fd2412a413e83264e306e837b76a5f707caddf08151f95c55a4c2bb197a73cd0429de4
 EBUILD gns3-gui-2.2.21.ebuild 1099 BLAKE2B 4a3c36f87a3fa83d4414161b661c7dfff3c11d7439b408b60644c928826c0d6e9a24c6262d75d287e06d51e6677c3f12bd7a5a79d8ab14fd816165d3c692faa2 SHA512 892e9d0c5292d90b3ff34b300c67134a503e31ca9b5978015df670efa81bd663a080a090029c5532e27d60d6a63902456238d4e92e0709a5af314b2214ad5878
+EBUILD gns3-gui-2.2.22.ebuild 1024 BLAKE2B c3585ad5af11292a85bef8cb9fee2dc74af2943828c493c9aa6f9f8718d60481c44ed0f38baf3daa1337e418a96bb35b919e728e0d233bdcdaf11ad714c7081e SHA512 3080d89cc01c1bde3500e74f2bb5e47b7f3df22c361c00205dc277d489cd6069bdaa34657d036912dddc22c3ec39d9070ec040f44c60f04710d808f7ec148d80
 MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.19.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.19.ebuild
deleted file mode 100644
index f682826007ae..000000000000
--- a/net-misc/gns3-gui/gns3-gui-2.2.19.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1 desktop xdg
-
-DESCRIPTION="Graphical Network Simulator"
-HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-#net-misc/gns3-server version should always match gns3-gui version
-RDEPEND="
-	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
-	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	default
-
-	# newer python packages are fine
-	sed -i -e 's/[<>=].*//' requirements.txt || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "resources/images/gns3.ico"
-	make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
-}
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.22.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.22.ebuild
new file mode 100644
index 000000000000..4e0c4f33f2ce
--- /dev/null
+++ b/net-misc/gns3-gui/gns3-gui-2.2.22.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 virtualx xdg
+
+DESCRIPTION="Graphical Network Simulator"
+HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+#net-misc/gns3-server version should always match gns3-gui version
+RDEPEND="
+	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	# newer python packages are fine
+	sed -i -e 's/[<>=].*//' requirements.txt || die
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index fd9eb7d840c6..c4e19fdb56ed 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-server-2.2.19.tar.gz 9050750 BLAKE2B 213ab73e53ce1b87ae56739d4b1097c57f9d5b6b8c40aff8f95d4e32c21ef2f5a4689307920a9d2176adfa15c27e0e6cbb9e634934431111c82b0d91b5afb61f SHA512 f42ece97f9da398f3ab62fb80e2b13a5a1e51d1964a65014932b585673964265e361c5f5fdfbc453858fc868bae8cdbb897f93738abbd12c1f3b037595306039
 DIST gns3-server-2.2.21.tar.gz 9054117 BLAKE2B dbbbba4dfe8d084184d38750c67152b99ee286dae88d92c15f153077396cdb008214da89d9161516daef0fbde8de3ba30f6628b9d138799d9ed8c1bc21c17f29 SHA512 adb7b08c88525f8b292688cd31973a00723b8d7989399d861e629bf754408901c2b00c67d425aacd7c234d9bab5d46542024196a4b44066eb1dbf39cf3d521bb
-EBUILD gns3-server-2.2.19.ebuild 1920 BLAKE2B 97df3dc66e92ef74325c411945666fdd2be613ff9f43bc3cad09e7fb891c8a914612c398968b8158848775eeb7fbea32c4dc9499b15ad1a1386acc44404ba561 SHA512 a3ea580135874ec73009f732b72fda4b9b3b785937c9347b13434ed613cfa223607e2d0813c11d895f46195d84170b2569ec085399a6328aa1a307fa75a28c2a
+DIST gns3-server-2.2.22.tar.gz 9011028 BLAKE2B 910711cac6f649d8dd3f7a4d2a9aa77839c9dda9f4280e7079b86857c542907feaa1205b7060ce7cc8956a2fbd220d5393cda319f64ff17eeb5ce476922afccc SHA512 444f483e69a56ab82c053c042b8791711e2fc6b7c800d30c08f2221405418a5c78d780f0f959c80d56ce864230ae17b04639c74a6559c7f5abce65f9c808a282
 EBUILD gns3-server-2.2.21.ebuild 2113 BLAKE2B 843ae1b77b7bae4847d7b2fcd176d550b34fcc26fa4b530ed0d82aaf4667a39480f24903cf5549f3162e136f6dca0d6b8782a6557320868846410b162d9feaf3 SHA512 e10ab97da6dc98892bb04802dfd0d9b56aabf39c9624bcb929c9634c5456f8942fbd793259fd5efe6f6b938cfc3481680f148af28f9aab5d3f641e4fbc0d6c0d
+EBUILD gns3-server-2.2.22.ebuild 2233 BLAKE2B 58febe525be2f40d6294398ae76b7b7f87261b0a97f246512a07db590aa545b7b3dda22f0fb8ffa317c202867dbcb99748bc3e771f660278a67d2f2bf260b2c6 SHA512 ffbde90e9fd1a526f74a5031af44d8550d75e0a051f5aa7f68facf72b01cbbacfef183e898c32472a2187dd9557616a20704a954080e261214fc9c700034936f
 MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-server/gns3-server-2.2.19.ebuild b/net-misc/gns3-server/gns3-server-2.2.19.ebuild
deleted file mode 100644
index c02bcf1c7998..000000000000
--- a/net-misc/gns3-server/gns3-server-2.2.19.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 systemd optfeature
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=app-emulation/dynamips-0.2.18
-	>=dev-python/aiofiles-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
-	>=net-misc/ubridge-0.9.14
-"
-
-src_prepare() {
-	default
-
-	# newer python packages are fine
-	sed -i -e 's/[<>=].*//' requirements.txt || die
-
-	# Remove Pre-built busybox binary
-	rm gns3server/compute/docker/resources/bin/busybox || die
-
-	# Package installs 'tests' package which is forbidden
-	rm -r tests || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	systemd_dounit init/gns3.service.systemd
-
-	mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
-	ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die
-}
-
-pkg_postinst() {
-	optfeature "QEMU Support" "app-emulation/qemu"
-	optfeature "Virtualbox Support" "app-emulation/virtualbox"
-	optfeature "Docker Support" "app-emulation/docker"
-	optfeature "Wireshark Support" "net-analyzer/wireshark"
-	elog
-	elog "The following packages are currently unsupported:"
-	elog "iouyap and vpcs"
-}
diff --git a/net-misc/gns3-server/gns3-server-2.2.22.ebuild b/net-misc/gns3-server/gns3-server-2.2.22.ebuild
new file mode 100644
index 000000000000..b670345461be
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.2.22.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature systemd
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=app-emulation/dynamips-0.2.18
+	>=dev-python/aiofiles-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+	>=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+	>=net-misc/ubridge-0.9.14
+	sys-apps/busybox
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	# newer python packages are fine
+	sed -i -e 's/[<>=].*//' requirements.txt || die
+
+	# Remove Pre-built busybox binary
+	rm gns3server/compute/docker/resources/bin/busybox || die
+
+	# prevent installing tests directory, see:
+	# https://github.com/GNS3/gns3-server/pull/1930
+	sed -i 's/"tests"/"tests*"/' setup.py || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	systemd_dounit init/gns3.service.systemd
+
+	mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
+	ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die
+}
+
+pkg_postinst() {
+	elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	elog ""
+	optfeature "QEMU Support" "app-emulation/qemu"
+	optfeature "Virtualbox Support" "app-emulation/virtualbox"
+	optfeature "Docker Support" "app-emulation/docker"
+	optfeature "Wireshark Support" "net-analyzer/wireshark"
+	elog ""
+	elog "The following packages are currently unsupported:"
+	elog "iouyap and vpcs"
+}
diff --git a/net-misc/gofish/Manifest b/net-misc/gofish/Manifest
index 61f19c0531e8..5d9af1318170 100644
--- a/net-misc/gofish/Manifest
+++ b/net-misc/gofish/Manifest
@@ -1,8 +1,5 @@
 AUX gofish-1.2-r1.confd 21 BLAKE2B 3a7fb9d9e622954e7bf2cabc4c3dcfa3b948303810e091f4f8d1a8fc73ba1d7bbe778714b4fb5cb3138c7913b5e74dc45cd964794b602d94149480d70fd8cfed SHA512 869e3a142459145c162cbcb9ae147169bff1158db0027c79c1374bf2f5160827e249ee7a59f3b0721d6392b585ce5a6ca65bdc0950092d8663d3dc9ffb65a2d7
 AUX gofish-1.2-r1.rc 276 BLAKE2B 0a0441c2357a0089aced9143de03c628d0b7b2e8fb1544ac7a3a7b7f0364745866977519654d9ebdc9037307424c981f6bb1627605f581a17cc58bd402d2c835 SHA512 0d8ccd935ce7a4d25be0f67d6095fdbcbd5e11b49aabdbd64cfba5f297cdcbc3db70b3759da4158cca00bf50faa6874c6cc3b2cc51dfebfa3c0b1c65c252db3f
-AUX gofish.confd 429 BLAKE2B 508d6970cf449da1b1b9cf3940d3df024f66ace3ec1f64415eccfab8d3a8c27be54c3b00fbbbc058fc17d583dd863323aad0a88291ffaee2015a6352202a004d SHA512 3a3fc8a701149195d6a18aa38cf22030415fcaf1e72bb9603175345d639a055e7b13130d4a2ef3308eaf946ed4d0c8d21378f8793e344d2baf6dc4c9ad0b7db6
-AUX gofish.rc 607 BLAKE2B 85733d62a2b59a0feb900169cac3ce58f49a40664c7a536b23e4efde8db0888957773ace3cd0f317b821be4532cfd8b9ff7f6641f66cfcac15af6e62bee959fb SHA512 dbae20d8b5bd17e05612bf85acea2a6d0433a7c59670e6d7c2807274da8d8a81a82cdb15eac7dda572be062ef2aa87b62dabc0dfc208013eaeb682f7bc49f9e1
 DIST gofish-1.2.tar.gz 212596 BLAKE2B ca202a55463fbc0b09ed902556d038101b4963ef24920ccd527c2b0c99a2905431c3bdffb2777605010b62db48dd80362ecc68e6ddcfecc7f5f4245bece4d749 SHA512 f7999a5e2b4f80d6402f26d9434f844b26b47b43a6b00055e72ba399426672ed299ca759252d8eb732b23a4c2c369a92c11c0d496f16f4bf3a999398cf6c5bee
-EBUILD gofish-1.2-r1.ebuild 638 BLAKE2B 6eea9492afa5815f033e3a15331980c733c4725faeb907261c22caaef6936ac3269e4d970c6e3e45a37140b2ff65855c8a9cb5af0cfe26f03e09e8ecd9851f71 SHA512 3022adbcf217df44bad004f97a97ea3c965e61babdf47d3fc4715f4d9f9ae7da3325458a234f0bab6a19f5eb77112e6660e3854945eff386164f2c5419473424
-EBUILD gofish-1.2.ebuild 652 BLAKE2B c75e3dd069dc503b10b0eac2a817607a272587062562a0b0cf5cfe3abd2fc2f770bfb1968c341d5da1f54322959f4e02c4087f76a7ccb80fda78eab6d81efdc3 SHA512 0e85d33f0c2fb1aafb733d8f4aaac19329865f0c66e4224c686caea4aa27e790e3a1e7420f1912315323ed8664354d93da2b2bc044347a7ab6a73bb42dc72d37
+EBUILD gofish-1.2-r1.ebuild 637 BLAKE2B b5afbe1797212677f509b6cdbb0cd948f3d3cff76f5becbe44968931182b9e7c995dee9261789dc3f1617d7bd756ef70effc34dc0307036527caaa955523b4c8 SHA512 55b4ce851b73d818a2b0c0d571901f66688dbd316d73f4f9d81bc513a56a196aafb73c521972d4349f071f4e7be4aa9bc17380bec07d4c488516ddd9b12ef8f7
 MISC metadata.xml 466 BLAKE2B 5cfa732e72370b818e728f16af957fcd57c4a10d03dca70bd83014074d659e2a695752a4f3bb536b30eca784b812004638fae7d7fb25cb1381b18c7881220aaf SHA512 957563aed285486e3453274fcb2a50f3492aee99f537f6028f8cedc95a88d033e7c0639dca64e34048fd6889c3148483a886e8f0e10063e85445febdea41ddc0
diff --git a/net-misc/gofish/files/gofish.confd b/net-misc/gofish/files/gofish.confd
deleted file mode 100644
index af244521a7e7..000000000000
--- a/net-misc/gofish/files/gofish.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Config file for gofish Gentoo start-script.
-# Should be stored as: /etc/conf.d/gofish
-#
-
-# Application name
-GOFISH_APP=gofish
-
-# Path to gofish executable
-GOFISH_EXEC=/usr/sbin/gofish
-
-# The gofish config file
-GOFISH_CONF_FILE=/etc/gofish.conf
-
-# The start options
-GOFISH_START_OPTS="-d"
-
-# The stop options
-GOFISH_STOP_OPTS=""
-
-# The reload options
-GOFISH_RELOAD_OPTS=""
-
-# The pid file
-GOFISH_PIDFILE=/var/run/gofish.pid
-
-
diff --git a/net-misc/gofish/files/gofish.rc b/net-misc/gofish/files/gofish.rc
deleted file mode 100644
index 5667b78a7c1b..000000000000
--- a/net-misc/gofish/files/gofish.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-#
-# Startup script for the Gofish Gopher Server (for Gentoo Linux)
-#
-# config: /etc/conf.d/gofish
-##
-# use: rc-update add gofish default
-#
-
-opts="start stop"
-
-depend() {
-       need net
-}
-
-
-start() {
-       ebegin "Starting ${GOFISH_APP} "
-       start-stop-daemon --start --verbose --pidfile ${GOFISH_PIDFILE}  \
-           --exec  ${GOFISH_EXEC} -- ${GOFISH_START_OPTS}
-       eend $?
-}
-
-
-stop() {
-       ebegin "Stopping ${GOFISH_APP} "
-       start-stop-daemon --stop --quiet --pidfile  ${GOFISH_PIDFILE}  \
-           --exec ${GOFISH_EXEC} -- ${GOFISH_STOP_OPTS}
-       eend $?
-}
-
-
-
diff --git a/net-misc/gofish/gofish-1.2-r1.ebuild b/net-misc/gofish/gofish-1.2-r1.ebuild
index fa82bccbe174..ab81b6ae1b8b 100644
--- a/net-misc/gofish/gofish-1.2-r1.ebuild
+++ b/net-misc/gofish/gofish-1.2-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	acct-group/gopher
diff --git a/net-misc/gofish/gofish-1.2.ebuild b/net-misc/gofish/gofish-1.2.ebuild
deleted file mode 100644
index 6ab8823d84a2..000000000000
--- a/net-misc/gofish/gofish-1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Gofish gopher server"
-HOMEPAGE="http://gofish.sourceforge.net"
-SRC_URI="mirror://sourceforge/gofish/${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-
-pkg_setup() {
-	enewgroup gopher
-	enewuser gopher -1 -1 -1 gopher
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--disable-mmap-cache
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc Configure_GoFish
-	newinitd "${FILESDIR}"/gofish.rc gofish
-	newconfd "${FILESDIR}"/gofish.confd gofish
-}
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 573214c62b28..492dcbd9b33f 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,3 +1,3 @@
 DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a
-EBUILD gsasl-1.10.0.ebuild 1779 BLAKE2B 416e387229cc0a178d948053793d7f6c010f32cae055900323a5152d1863e706bde9659dabf9ca96559e1c88711366dd7d840cf1b40fa45b74990cd39c21b2e3 SHA512 dba3b09d9e235753231b83ca2689018336c17d063b98ed485a490296df56d29f436a8f4f8f20bb97adcacef745f876522ee722ad69d38b51fea4980543bc6327
+EBUILD gsasl-1.10.0.ebuild 1786 BLAKE2B 1e1dc3cf3ea470466f85523c7d886d1081f0d81a6efe45092a8651e6ac21b6a00f464d2e5477e7a57af704e6471f82ec40e258a8cc1bdc7aa64e0115a7192e2a SHA512 affca58c28af42840e3649f69d901b1cddf7320cb89ea587a4b252a1b5b7ff5281374245dcd053f8caa8bcea38380af5678ade58856e1457a878be1ad915099b
 MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0
diff --git a/net-misc/gsasl/gsasl-1.10.0.ebuild b/net-misc/gsasl/gsasl-1.10.0.ebuild
index a9891b41bfc4..93ca9ea43387 100644
--- a/net-misc/gsasl/gsasl-1.10.0.ebuild
+++ b/net-misc/gsasl/gsasl-1.10.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
 
 DEPEND="
diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index 8f61d2eb07fb..82f32c5e4b9c 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -1,5 +1,4 @@
-AUX ices.initd 328 BLAKE2B c2084fe4a4885cddc5b5c449144029575889801dff93cbb41933341a07eefc39731b66d749ebec24cdf077163211e490ad8e92c66efe6c4e489b5d78a3f91a4c SHA512 55ad0dbde053d3d2b666e597b4720511c67adbd445b0c98fa1d096c400b77e1ed181b62859cdc97a071097b9abc194fea315052b35316537dac2f2d1cbf1b282
 AUX ices.initd-r1 307 BLAKE2B 3dc8638cb74d79ab772c3618812fac27ab856f74e39c8e5b6a8dc211ffb842d474ff4177ab7e450f542011cbdf66d7bd1e956570cd77ae4768ee3f8375e0bfb1 SHA512 de3aa2919cb715c6036d1b993275560819528e8c6d616362e414e9bc6cf77a67393f68c1643ebfac1b43e8d3bf2ce3bde004894921d8bfdf66eb667fbaa7bae9
 DIST ices-2.0.2.tar.bz2 293818 BLAKE2B d037c6ce6e5d009a12fd9d8efba321b87562a0d492a5191a93b3ff991c1252af1aaa21c41b8171d6eaa9f518712d893b187765cab5a7a9de3560231ec4315b67 SHA512 ff257b478a7237886ba59bf7d1a494ebd4c7c12fd74e8e10c00ea65710249ead1b5b1ae8d9540fab05f2e4486949c6e350f3da59a1d1bf261397ca257806b2c7
-EBUILD ices-2.0.2.ebuild 861 BLAKE2B d29f4dd5774c568ea6d180621f971bc01c09788bddfa67b3e12b70926ba71546afaedb24c0995497996ceb114a85d8d9fba788d70486278e607f09393248b352 SHA512 30755da6e5409c9f61f79f27938e6fe4f044a13fa667e7901f7bb2824faa596a4b507e033a65405192884b76e6e891f89c957209d37b12ba64c489a6016e20ba
+EBUILD ices-2.0.2-r1.ebuild 835 BLAKE2B b3b27868fee36daa93078f030352758504ff9b60085fef4a1cbe73524c5ff2f7d83192832684f2f1f4bfe63f160daaeb884053796ca3a20804f0ed98a676705e SHA512 f95065d4985d16f908af3f15a316ef91705382e7de190464e0a63c851997f7fbfeb9896847cd7c85d8b8ddb661a1ad2122e0eebbd7d60635c796a57f86802855
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/net-misc/ices/files/ices.initd b/net-misc/ices/files/ices.initd
deleted file mode 100644
index ada3b4943e28..000000000000
--- a/net-misc/ices/files/ices.initd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting IceS 2"
-	start-stop-daemon --background --start --pidfile /var/run/ices.pid --make-pidfile --exec /usr/bin/ices /etc/ices2/ices.xml
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping IceS 2"
-	start-stop-daemon --stop --pidfile /var/run/ices.pid --name ices
-	eend $?
-}
diff --git a/net-misc/ices/ices-2.0.2-r1.ebuild b/net-misc/ices/ices-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..001620dd1b72
--- /dev/null
+++ b/net-misc/ices/ices-2.0.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding"
+HOMEPAGE="https://icecast.org/ices/"
+SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ppc64 sparc x86"
+
+RDEPEND="
+	acct-group/ices
+	acct-user/ices
+	dev-libs/libxml2
+	>=media-libs/libshout-2
+	>=media-libs/libvorbis-1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf --sysconfdir=/etc/ices2
+}
+
+src_install() {
+	default
+	insinto /etc/ices2
+	doins conf/*.xml
+	docinto html
+	dodoc doc/*.{html,css}
+	newinitd "${FILESDIR}"/ices.initd-r1 ices
+	keepdir /var/log/ices
+	fperms 660 /var/log/ices
+	fowners ices:ices /var/log/ices
+	rm -rf "${D}"/usr/share/ices
+}
diff --git a/net-misc/ices/ices-2.0.2.ebuild b/net-misc/ices/ices-2.0.2.ebuild
deleted file mode 100644
index 34319a5138bc..000000000000
--- a/net-misc/ices/ices-2.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding"
-HOMEPAGE="https://icecast.org/ices/"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
-	>=media-libs/libshout-2
-	>=media-libs/libvorbis-1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewgroup ices
-	enewuser ices -1 -1 -1 ices
-}
-
-src_configure() {
-	econf --sysconfdir=/etc/ices2
-}
-
-src_install() {
-	default
-	insinto /etc/ices2
-	doins conf/*.xml
-	dohtml doc/*.{html,css}
-	newinitd "${FILESDIR}"/ices.initd-r1 ices
-	keepdir /var/log/ices
-	fperms 660 /var/log/ices
-	fowners ices:ices /var/log/ices
-	rm -rf "${D}"/usr/share/ices
-}
diff --git a/net-misc/ip-sentinel/Manifest b/net-misc/ip-sentinel/Manifest
index f7f477daf5c7..1f0cf863a9ff 100644
--- a/net-misc/ip-sentinel/Manifest
+++ b/net-misc/ip-sentinel/Manifest
@@ -3,5 +3,5 @@ AUX ip-sentinel.cfg 278 BLAKE2B bf582820bb9a22a0cb3e5b82ae934697c77d9f777e31ae1b
 AUX ip-sentinel.conf.d 357 BLAKE2B a8f08e6c63e4b1413f9021985086a573c4691c70f3d2f7447e0f23a4bfc80253b32971fff473e7ca1c71ee1f7bed192d2e8cd1ca01385153d156dc4bb1a25e7d SHA512 c35614e812cc0b3caea671cf2703493030f6de96f8b5afc80455c93f3e6181ddaf7eb6c22d8b63244f219b506db4bddfdf9792bf89ec17d7c56d274d003d4506
 AUX ip-sentinel.init 1047 BLAKE2B 3073e1145b94e93b08400a06ed7a0f0ba4a7d11bd996f4daaf3e27ca857dd2b5c74d30e644ebdc3a5fa1911ef378d3a9306a011d293f5d46d25f989c5f3ac44d SHA512 89729f42d31a81902e957e67089c0e3ead7f8e8f9554ef787bd6c05f210f231d56812a5dcf56d5be58c360dd31fa38873dfa17d1ae0423a80d1e93055853ed75
 DIST ip-sentinel-0.12.tar.bz2 165803 BLAKE2B 5b77dc771c432ddb556cc30cc9fce4226fed47958930cad4364af63146f8feeb5177542bccecbd276161acaa2232315022a59b8b83ba7763523886b4cb82b364 SHA512 dfa025fd96260073903ffe33dbaa5a146658dee2b8cb9bc04da0894a8de83207971a7f1e731128e42a0421052cdc352ed43a0298916f521d5f230533266e5077
-EBUILD ip-sentinel-0.12-r1.ebuild 2179 BLAKE2B aed07a13e13ad7502d8f7b8675ae23858a49d21466a459f5c3e8d131b803c432883cbdfe93b4d760a357e12d72343819db9ce9361b9651e8e420a13e50ac5796 SHA512 328522239664f4f0f726bd46184e4df20e5d131f3f0de777407c6d6b10253cff3f1c3f5556cfd2efbd5ac2d374418c6389d949e176274c5eaed827bd8f6e7492
+EBUILD ip-sentinel-0.12-r2.ebuild 2144 BLAKE2B a30287f1ab38cee2d4f353644cae1d9b160bcf5eafb7c7e0df2c27b1f7f4c50ffcafde662ee48bc735a1cdddc4edede172c4f8233761af8b828f4b4aec9044d6 SHA512 7b4fbb37bcb9f541a389def64766a5b76e87f7ae22a93dde1fcbc0249827c2ea84a8b1285f051a37d3970af79acb985c7d1e7b06e66557c163c87278d89db450
 MISC metadata.xml 1303 BLAKE2B 7e42bf502035f8efb315fa524c938ff417f26dd88042ee673ffc9ed7aaa7efa52ef7a7ea08b7576bf32b8e213b6107c85b633967c261ead2349e78674793a36e SHA512 9ca404d2b97faf88cf40cf991584dfb1888e78b41817cc6dacfb2ac2bf13afdbb9c8496f61236e85ce2932c12d889975758108df0229760a16fa4478e5c0ffed
diff --git a/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild b/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild
deleted file mode 100644
index 2cd5fcce6a09..000000000000
--- a/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit user
-
-DESCRIPTION="Prevent unauthorized usage of IP addresses"
-HOMEPAGE="https://www.nongnu.org/ip-sentinel/"
-LICENSE="GPL-2"
-SRC_URI="https://savannah.nongnu.org/download/ip-sentinel/${P}.tar.bz2"
-SLOT="0"
-KEYWORDS="x86"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-PATCHES=(
-	"${FILESDIR}"/${P}-fixed-dietlibc-compat-stuff.patch
-)
-
-pkg_setup() {
-	enewgroup ipsentinel
-	enewuser ipsentinel -1 -1 -1 ipsentinel
-}
-
-src_prepare() {
-	default
-
-	# disable failing tests
-	echo true > src/testsuite/prioqueue-check.sh
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/ip-sentinel.init ip-sentinel
-	newconfd "${FILESDIR}"/ip-sentinel.conf.d ip-sentinel
-
-	insinto /etc
-	newins "${FILESDIR}"/ip-sentinel.cfg ip-sentinel.cfg
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/ip-sentinel 2>/dev/null`
-
-	if [ ! -d "${CHROOT:=/chroot/ip-sentinel}" ] ; then
-		ebegin "Setting up the chroot directory"
-			mkdir -m 0755 -p "${CHROOT}/etc"
-			cp -R /etc/ip-sentinel.cfg "${CHROOT}/etc"
-		eend
-
-		if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/ip-sentinel`" ] ; then
-			sed -e '/^#[[:blank:]]\?CHROOT/s/^#[[:blank:]]\?//' \
-				-i /etc/conf.d/ip-sentinel
-		fi
-	else
-		eerror
-		eerror "${CHROOT} already exists. Quitting."
-		eerror
-	fi
-}
-
-pkg_postinst() {
-	elog "You can edit /etc/conf.d/ip-sentinel to customize startup daemon"
-	elog "settings."
-	elog
-	elog "Default ip-sentinel config is in /etc/ip-sentinel.cfg"
-	elog
-	elog "The ip-sentinel ebuild has chroot support."
-	elog "If you like to run ip-sentinel in chroot AND this is a new install OR"
-	elog "your ip-sentinel doesn't already run in chroot, simply run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/ip-sentinel, otherwise /chroot/ip-sentinel will be used."
-	echo
-	ewarn "And please! DO NOT START THIS DAEMON thoughtlessly."
-	ewarn "If you DO this will BLOCK ALL communication inside your ethernet"
-	ewarn "segment!!! If you have any doubts do not start ip-sentinel."
-}
diff --git a/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild b/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild
new file mode 100644
index 000000000000..44c2ea9d4979
--- /dev/null
+++ b/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Prevent unauthorized usage of IP addresses"
+HOMEPAGE="https://www.nongnu.org/ip-sentinel/"
+SRC_URI="https://savannah.nongnu.org/download/ip-sentinel/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+PATCHES=( "${FILESDIR}"/${P}-fixed-dietlibc-compat-stuff.patch )
+
+RDEPEND="
+	acct-group/ipsentinel
+	acct-user/ipsentinel
+"
+
+src_prepare() {
+	default
+
+	# disable failing tests
+	echo true > src/testsuite/prioqueue-check.sh
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/ip-sentinel.init ip-sentinel
+	newconfd "${FILESDIR}"/ip-sentinel.conf.d ip-sentinel
+
+	insinto /etc
+	newins "${FILESDIR}"/ip-sentinel.cfg ip-sentinel.cfg
+}
+
+pkg_config() {
+	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/ip-sentinel 2>/dev/null`
+
+	if [ ! -d "${CHROOT:=/chroot/ip-sentinel}" ] ; then
+		ebegin "Setting up the chroot directory"
+			mkdir -m 0755 -p "${CHROOT}/etc"
+			cp -R /etc/ip-sentinel.cfg "${CHROOT}/etc"
+		eend
+
+		if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/ip-sentinel`" ] ; then
+			sed -e '/^#[[:blank:]]\?CHROOT/s/^#[[:blank:]]\?//' \
+				-i /etc/conf.d/ip-sentinel
+		fi
+	else
+		eerror
+		eerror "${CHROOT} already exists. Quitting."
+		eerror
+	fi
+}
+
+pkg_postinst() {
+	elog "You can edit /etc/conf.d/ip-sentinel to customize startup daemon"
+	elog "settings."
+	elog
+	elog "Default ip-sentinel config is in /etc/ip-sentinel.cfg"
+	elog
+	elog "The ip-sentinel ebuild has chroot support."
+	elog "If you like to run ip-sentinel in chroot AND this is a new install OR"
+	elog "your ip-sentinel doesn't already run in chroot, simply run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Before running the above command you might want to change the chroot"
+	elog "dir in /etc/conf.d/ip-sentinel, otherwise /chroot/ip-sentinel will be used."
+	echo
+	ewarn "And please! DO NOT START THIS DAEMON thoughtlessly."
+	ewarn "If you DO this will BLOCK ALL communication inside your ethernet"
+	ewarn "segment!!! If you have any doubts do not start ip-sentinel."
+}
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 123d55131d84..54c9c025a60c 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -2,7 +2,7 @@ AUX mikutter 137 BLAKE2B f76eb22d6492f8737ce7de92068f551ece304a7d983a922555db1d6
 DIST mikutter-4.0.6.tar.gz 2322108 BLAKE2B 46d0cda2bc173ee971e516f017f66e26e9f7a4abd7330111ef66cd40bd0c6dd407b3d6988fa5955ca33a2c375cb77b4c234c8439dc27b6baf43dfcc9a34f4052 SHA512 16dca21bf7f989d2af71a8acc26816dbd7ebff7866b65d4c376b87cf2ba7757d8978a25483cb548448e3341c51d7767b638775e2696f64484b4f5ec8cdce050e
 DIST mikutter-4.1.5.tar.gz 2331485 BLAKE2B 25113ed59cad43094b77bacdf2e42079d9fb5a641a0b2e7ac9529e66183b6f7f953182350cf1d7f8703c10dda0a973edddd54b6c092fc3bf4c3ffe1cc243c2bf SHA512 a8d4be8fb4bf73a9b383ee0d18a6a6c91b6a4ad4ff5837c483da6274b70e4390600d729e303e00a3d4068791e80e0c83619760a3b885cbc4e3717eefb48b3c7c
 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
-EBUILD mikutter-4.0.6.ebuild 2842 BLAKE2B 3e58510c4bfbbb648fe4d635f706305052fc3e45856749f7741b36b4720ce928193822969f8489d1af2babc838a2d21d1845a3d07935027d327ff0bcdc9304b4 SHA512 6951f54995cad1162278b876b9cb7665c5154093d56dd9731184a999a8bca69aa836ccd2273ebaa4a4b80c30dcdc9936fa0c9a28d2fbd6e42ad01fdeafc060fb
-EBUILD mikutter-4.1.5.ebuild 2913 BLAKE2B 62aab5d7da3e7a3c823594d5f530e4bae3e4df538e13ddfc36433e3617c19885e8e2cb7dcc68f7cbfff6f0f2234b32d2b19557b073fb1772030231de69e8dee7 SHA512 5b7859c8371e92ad97d0312984cd2029c517a6f1c8e44769f4e2993072b2e710ff6f052966a023929b8408ae83e49268e63c715461fb2fd3a1a0184b1b4b8abe
-EBUILD mikutter-9999.ebuild 2842 BLAKE2B 3e58510c4bfbbb648fe4d635f706305052fc3e45856749f7741b36b4720ce928193822969f8489d1af2babc838a2d21d1845a3d07935027d327ff0bcdc9304b4 SHA512 6951f54995cad1162278b876b9cb7665c5154093d56dd9731184a999a8bca69aa836ccd2273ebaa4a4b80c30dcdc9936fa0c9a28d2fbd6e42ad01fdeafc060fb
+EBUILD mikutter-4.0.6-r1.ebuild 2842 BLAKE2B 368b17c9ada5dd40769217aa855a0d0a15effe69e57079dce86a0367a9b260ab0af3b554a755e052767978056bbf796de8fd222cfc487b99ba962b693596ae79 SHA512 ce83f8171810471109b22af7b28361af1bb787e4827431028e1b8f13dc0b3b2a079e8f28269c408c0726388515108f584cf45fc371c08eb6a5eb174ad1f161c0
+EBUILD mikutter-4.1.5-r1.ebuild 2913 BLAKE2B 83da434712c11500321e94f2ca68b8fe9ff64007762475ebc254d3d5c34028a38ace04cb0a87d25f7d8480cb3152605f0041afc7b0a7d384f4c6673a40a62aef SHA512 8721c6633be245ad1fcb2a0a1b06462fb0acf5081b693a75c5838614352042ef54d6dfc68bc8b0d2c509dd571ae2964a2572cedc3a2051c472bfcfa78b4ae089
+EBUILD mikutter-9999.ebuild 2842 BLAKE2B 368b17c9ada5dd40769217aa855a0d0a15effe69e57079dce86a0367a9b260ab0af3b554a755e052767978056bbf796de8fd222cfc487b99ba962b693596ae79 SHA512 ce83f8171810471109b22af7b28361af1bb787e4827431028e1b8f13dc0b3b2a079e8f28269c408c0726388515108f584cf45fc371c08eb6a5eb174ad1f161c0
 MISC metadata.xml 214 BLAKE2B 8c736c7fcedf2d2c712e43cb3a7850254057fca17f9ec3647598d76e726cd4eea542ce40b339abb3f96a56b17a3f355d9508a5980dd7c7e243bbc19b68a6a5b7 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3
diff --git a/net-misc/mikutter/mikutter-4.0.6-r1.ebuild b/net-misc/mikutter/mikutter-4.0.6-r1.ebuild
new file mode 100644
index 000000000000..0a87e3d4a471
--- /dev/null
+++ b/net-misc/mikutter/mikutter-4.0.6-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+inherit desktop ruby-ng
+
+PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git
+		https://github.com/toshia/twitter_api_keys.git"
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
+else
+	SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
+		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Simple, powerful and moeful twitter client"
+HOMEPAGE="https://mikutter.hachune.net/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+libnotify"
+
+DEPEND=""
+RDEPEND="
+	libnotify? ( x11-libs/libnotify )
+	media-sound/alsa-utils"
+
+ruby_add_rdepend "=dev-ruby/addressable-2.8*
+	=dev-ruby/delayer-1.1*:1
+	=dev-ruby/delayer-deferred-2.1*
+	!<dev-ruby/delayer-deferred-2.1.3
+	=dev-ruby/diva-1.0*
+	!<dev-ruby/diva-1.0.2
+	dev-ruby/httpclient
+	dev-ruby/json:2
+	=dev-ruby/memoist-0.16*
+	!<dev-ruby/memoist-0.16.2
+	dev-ruby/moneta
+	dev-ruby/nokogiri
+	>=dev-ruby/oauth-0.5.4
+	=dev-ruby/pluggaloid-1.2*
+	dev-ruby/rcairo
+	=dev-ruby/ruby-gettext-3.3*
+	!<dev-ruby/ruby-gettext-3.3.5
+	=dev-ruby/ruby-gtk2-3.4*
+	=dev-ruby/typed-array-0.1*
+	!<dev-ruby/typed-array-0.1.2
+	virtual/ruby-ssl"
+
+all_ruby_unpack() {
+	if [ "${PV}" = "9999" ];then
+		git-3_src_unpack
+	else
+		default
+	fi
+}
+
+all_ruby_install() {
+	local rubyversion
+
+	if use ruby_targets_ruby26; then
+		rubyversion=ruby26
+	elif use ruby_targets_ruby25; then
+		rubyversion=ruby25
+	fi
+
+	exeinto /usr/share/mikutter
+	doexe mikutter.rb
+	insinto /usr/share/mikutter
+	doins -r core plugin
+	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
+		| newbin - mikutter
+	dodoc README
+	make_desktop_entry mikutter Mikutter \
+		/usr/share/mikutter/core/skin/data/icon.png
+
+	insinto /usr/share/mikutter/plugin/twitter_api_keys
+	newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in
+}
+
+pkg_postinst() {
+	echo
+	elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running"
+	elog "  emerge --config =${PF}"
+}
+
+pkg_config() {
+	local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin
+	local CK CS
+
+	echo
+	einfon "Please input your Consumer Key for Twitter: "
+	read -r CK
+
+	echo
+	einfon "Please input your Consumer Secret for Twitter: "
+	read -r CS
+
+	if [ -z "${CK}" -o -z "${CS}" ]; then
+		eerror "Consumer Key or Consumer Secret is missing."
+		return
+	fi
+
+	sed -e "/consumer_key = /s!''!'${CK}'!" \
+		-e "/consumer_secret = /s!''!'${CS}'!" \
+		${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \
+			${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb
+
+	echo
+	einfo "Consuker Key/Consumer secret is set."
+}
diff --git a/net-misc/mikutter/mikutter-4.0.6.ebuild b/net-misc/mikutter/mikutter-4.0.6.ebuild
deleted file mode 100644
index 64060b71b8ef..000000000000
--- a/net-misc/mikutter/mikutter-4.0.6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-inherit desktop ruby-ng
-
-PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git
-		https://github.com/toshia/twitter_api_keys.git"
-	inherit git-r3
-	SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
-else
-	SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
-		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Simple, powerful and moeful twitter client"
-HOMEPAGE="https://mikutter.hachune.net/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+libnotify"
-
-DEPEND=""
-RDEPEND="
-	libnotify? ( x11-libs/libnotify )
-	media-sound/alsa-utils"
-
-ruby_add_rdepend "=dev-ruby/addressable-2.7*
-	=dev-ruby/delayer-1.1*:1
-	=dev-ruby/delayer-deferred-2.1*
-	!<dev-ruby/delayer-deferred-2.1.3
-	=dev-ruby/diva-1.0*
-	!<dev-ruby/diva-1.0.2
-	dev-ruby/httpclient
-	dev-ruby/json:2
-	=dev-ruby/memoist-0.16*
-	!<dev-ruby/memoist-0.16.2
-	dev-ruby/moneta
-	dev-ruby/nokogiri
-	>=dev-ruby/oauth-0.5.4
-	=dev-ruby/pluggaloid-1.2*
-	dev-ruby/rcairo
-	=dev-ruby/ruby-gettext-3.3*
-	!<dev-ruby/ruby-gettext-3.3.5
-	=dev-ruby/ruby-gtk2-3.4*
-	=dev-ruby/typed-array-0.1*
-	!<dev-ruby/typed-array-0.1.2
-	virtual/ruby-ssl"
-
-all_ruby_unpack() {
-	if [ "${PV}" = "9999" ];then
-		git-3_src_unpack
-	else
-		default
-	fi
-}
-
-all_ruby_install() {
-	local rubyversion
-
-	if use ruby_targets_ruby26; then
-		rubyversion=ruby26
-	elif use ruby_targets_ruby25; then
-		rubyversion=ruby25
-	fi
-
-	exeinto /usr/share/mikutter
-	doexe mikutter.rb
-	insinto /usr/share/mikutter
-	doins -r core plugin
-	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
-		| newbin - mikutter
-	dodoc README
-	make_desktop_entry mikutter Mikutter \
-		/usr/share/mikutter/core/skin/data/icon.png
-
-	insinto /usr/share/mikutter/plugin/twitter_api_keys
-	newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in
-}
-
-pkg_postinst() {
-	echo
-	elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running"
-	elog "  emerge --config =${PF}"
-}
-
-pkg_config() {
-	local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin
-	local CK CS
-
-	echo
-	einfon "Please input your Consumer Key for Twitter: "
-	read -r CK
-
-	echo
-	einfon "Please input your Consumer Secret for Twitter: "
-	read -r CS
-
-	if [ -z "${CK}" -o -z "${CS}" ]; then
-		eerror "Consumer Key or Consumer Secret is missing."
-		return
-	fi
-
-	sed -e "/consumer_key = /s!''!'${CK}'!" \
-		-e "/consumer_secret = /s!''!'${CS}'!" \
-		${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \
-			${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb
-
-	echo
-	einfo "Consuker Key/Consumer secret is set."
-}
diff --git a/net-misc/mikutter/mikutter-4.1.5-r1.ebuild b/net-misc/mikutter/mikutter-4.1.5-r1.ebuild
new file mode 100644
index 000000000000..25c639c91cdf
--- /dev/null
+++ b/net-misc/mikutter/mikutter-4.1.5-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+inherit desktop ruby-ng
+
+PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git
+		https://github.com/toshia/twitter_api_keys.git"
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
+else
+	SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
+		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Simple, powerful and moeful twitter client"
+HOMEPAGE="https://mikutter.hachune.net/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+libnotify"
+
+DEPEND=""
+RDEPEND="
+	libnotify? ( x11-libs/libnotify )
+	media-sound/alsa-utils"
+
+ruby_add_rdepend "=dev-ruby/addressable-2.8*
+	>=dev-ruby/delayer-1.1.2
+	!>=dev-ruby/delayer-2.0
+	>=dev-ruby/delayer-deferred-2.2.0
+	!>=dev-ruby/delayer-deferred-3.0
+	>=dev-ruby/diva-1.0.2
+	!>=dev-ruby/diva-2.0
+	dev-ruby/httpclient
+	dev-ruby/json:2
+	>=dev-ruby/memoist-0.16.2
+	!>=dev-ruby/memoist-0.17
+	dev-ruby/moneta
+	dev-ruby/nokogiri
+	>=dev-ruby/oauth-0.5.4
+	>=dev-ruby/pluggaloid-1.5.0
+	!>=dev-ruby/pluggaloid-2.0
+	dev-ruby/rcairo
+	>=dev-ruby/ruby-gettext-3.3.5
+	!>=dev-ruby/ruby-gettext-3.4
+	=dev-ruby/ruby-gtk2-3.4*
+	>=dev-ruby/typed-array-0.1.2
+	!>=dev-ruby/typed-array-0.2
+	dev-ruby/twitter-text
+	virtual/ruby-ssl"
+
+all_ruby_unpack() {
+	if [ "${PV}" = "9999" ];then
+		git-3_src_unpack
+	else
+		default
+	fi
+}
+
+all_ruby_install() {
+	local rubyversion
+	local r
+
+	for r in $USE_RUBY; do
+		if use ruby_targets_${r}; then
+			rubyversion=${r}
+		fi
+	done
+
+	exeinto /usr/share/mikutter
+	doexe mikutter.rb
+	insinto /usr/share/mikutter
+	doins -r core plugin
+	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
+		| newbin - mikutter
+	dodoc README
+	make_desktop_entry mikutter Mikutter \
+		/usr/share/mikutter/core/skin/data/icon.png
+
+	insinto /usr/share/mikutter/plugin/twitter_api_keys
+	newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in
+}
+
+pkg_postinst() {
+	echo
+	elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running"
+	elog "  emerge --config =${PF}"
+}
+
+pkg_config() {
+	local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin
+	local CK CS
+
+	echo
+	einfon "Please input your Consumer Key for Twitter: "
+	read -r CK
+
+	echo
+	einfon "Please input your Consumer Secret for Twitter: "
+	read -r CS
+
+	if [ -z "${CK}" -o -z "${CS}" ]; then
+		eerror "Consumer Key or Consumer Secret is missing."
+		return
+	fi
+
+	sed -e "/consumer_key = /s!''!'${CK}'!" \
+		-e "/consumer_secret = /s!''!'${CS}'!" \
+		${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \
+			${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb
+
+	echo
+	einfo "Consuker Key/Consumer secret is set."
+}
diff --git a/net-misc/mikutter/mikutter-4.1.5.ebuild b/net-misc/mikutter/mikutter-4.1.5.ebuild
deleted file mode 100644
index 37c694971242..000000000000
--- a/net-misc/mikutter/mikutter-4.1.5.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-inherit desktop ruby-ng
-
-PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git
-		https://github.com/toshia/twitter_api_keys.git"
-	inherit git-r3
-	SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
-else
-	SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
-		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Simple, powerful and moeful twitter client"
-HOMEPAGE="https://mikutter.hachune.net/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+libnotify"
-
-DEPEND=""
-RDEPEND="
-	libnotify? ( x11-libs/libnotify )
-	media-sound/alsa-utils"
-
-ruby_add_rdepend "=dev-ruby/addressable-2.7*
-	>=dev-ruby/delayer-1.1.2
-	!>=dev-ruby/delayer-2.0
-	>=dev-ruby/delayer-deferred-2.2.0
-	!>=dev-ruby/delayer-deferred-3.0
-	>=dev-ruby/diva-1.0.2
-	!>=dev-ruby/diva-2.0
-	dev-ruby/httpclient
-	dev-ruby/json:2
-	>=dev-ruby/memoist-0.16.2
-	!>=dev-ruby/memoist-0.17
-	dev-ruby/moneta
-	dev-ruby/nokogiri
-	>=dev-ruby/oauth-0.5.4
-	>=dev-ruby/pluggaloid-1.5.0
-	!>=dev-ruby/pluggaloid-2.0
-	dev-ruby/rcairo
-	>=dev-ruby/ruby-gettext-3.3.5
-	!>=dev-ruby/ruby-gettext-3.4
-	=dev-ruby/ruby-gtk2-3.4*
-	>=dev-ruby/typed-array-0.1.2
-	!>=dev-ruby/typed-array-0.2
-	dev-ruby/twitter-text
-	virtual/ruby-ssl"
-
-all_ruby_unpack() {
-	if [ "${PV}" = "9999" ];then
-		git-3_src_unpack
-	else
-		default
-	fi
-}
-
-all_ruby_install() {
-	local rubyversion
-	local r
-
-	for r in $USE_RUBY; do
-		if use ruby_targets_${r}; then
-			rubyversion=${r}
-		fi
-	done
-
-	exeinto /usr/share/mikutter
-	doexe mikutter.rb
-	insinto /usr/share/mikutter
-	doins -r core plugin
-	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
-		| newbin - mikutter
-	dodoc README
-	make_desktop_entry mikutter Mikutter \
-		/usr/share/mikutter/core/skin/data/icon.png
-
-	insinto /usr/share/mikutter/plugin/twitter_api_keys
-	newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in
-}
-
-pkg_postinst() {
-	echo
-	elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running"
-	elog "  emerge --config =${PF}"
-}
-
-pkg_config() {
-	local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin
-	local CK CS
-
-	echo
-	einfon "Please input your Consumer Key for Twitter: "
-	read -r CK
-
-	echo
-	einfon "Please input your Consumer Secret for Twitter: "
-	read -r CS
-
-	if [ -z "${CK}" -o -z "${CS}" ]; then
-		eerror "Consumer Key or Consumer Secret is missing."
-		return
-	fi
-
-	sed -e "/consumer_key = /s!''!'${CK}'!" \
-		-e "/consumer_secret = /s!''!'${CS}'!" \
-		${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \
-			${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb
-
-	echo
-	einfo "Consuker Key/Consumer secret is set."
-}
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index 64060b71b8ef..0a87e3d4a471 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	libnotify? ( x11-libs/libnotify )
 	media-sound/alsa-utils"
 
-ruby_add_rdepend "=dev-ruby/addressable-2.7*
+ruby_add_rdepend "=dev-ruby/addressable-2.8*
 	=dev-ruby/delayer-1.1*:1
 	=dev-ruby/delayer-deferred-2.1*
 	!<dev-ruby/delayer-deferred-2.1.3
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 874a3ec7e0a7..bb6e2fda8dd0 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,7 +1,5 @@
-DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5f0e962c472b109afc1a54854d30123c4732f9b9e8ba28d9324508894faaa78f3b484c99c0063d1ea2f499b7 SHA512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b
 DIST putty-0.75.tar.gz 2731167 BLAKE2B 529b2c65853b8f915afd0563c1a055244d919794a71cff43573910fa2d4a81efca060c12320a0d07ddf3b03064b7e27d00ae396d6a2c1e46dc1a06403cae5c17 SHA512 3dbc15485008a98daf60236061253e66b94a6e5da123fc84c5f0ac006c84e17c70fe748987677775e3b54a12297eb826cccf70a4fc039b633bc2d512938b3028
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.74.ebuild 1700 BLAKE2B 52a4eebdf6da39c2ec1ed1a9e0ca292a971c7c999715d9fcf963a81da7a5909504de04253be6ff5cbf6f867dbca775976efebd6d406a5eaf052c0032b226ac30 SHA512 74cfeb3aaee1a92541c76787181ede728f1622ddbae203282d021770df6ac12bb3ba968314919c3bfff8e1e028ce7c9ff9f366cceb06a48df4e2b8ae0413ef76
 EBUILD putty-0.75.ebuild 1700 BLAKE2B 52a4eebdf6da39c2ec1ed1a9e0ca292a971c7c999715d9fcf963a81da7a5909504de04253be6ff5cbf6f867dbca775976efebd6d406a5eaf052c0032b226ac30 SHA512 74cfeb3aaee1a92541c76787181ede728f1622ddbae203282d021770df6ac12bb3ba968314919c3bfff8e1e028ce7c9ff9f366cceb06a48df4e2b8ae0413ef76
 EBUILD putty-9999.ebuild 1746 BLAKE2B 112f9ce331c974edf1a5e7e9dd778bed19e5072be100302fe601a92cc9456be965dc0f2cf015a4630385b8c766b12bc497ef4504ee2bbcafea9e8dfe7e812f4d SHA512 87cae42323cbc63e4a739b7eed25925ed91467a5b06fbc68721f6f7afaa7af3e23e94428d1a497a7509fb44673d101b7b6b58e7f5140fa1bd008f1f95212ffab
 MISC metadata.xml 1010 BLAKE2B a21ec4ee14bf1b61343ad8f504ee9ccfcf090ad6212c5ffe570b44e3443baeacb1fc3dc3080ce8611f730edf54e8a459d4669fc1bb7ca0c52b35567facab075d SHA512 1649e0d50d4f8318c2869a7e6ebb697f05c16f5e4e9bbe1b35ba38c1513c4bb14f2d4283fd3fd91fe30ab9bcf318f619d7c39ee1bcc3c476b95555e2939b2c8b
diff --git a/net-misc/putty/putty-0.74.ebuild b/net-misc/putty/putty-0.74.ebuild
deleted file mode 100644
index 62ac436ba4c6..000000000000
--- a/net-misc/putty/putty-0.74.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
-SRC_URI="
-	https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2
-	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
-"
-IUSE="doc +gtk gtk2 ipv6 gssapi"
-RDEPEND="
-	!net-misc/pssh
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		x11-libs/libX11
-		x11-libs/pango
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3[X] )
-	)
-	gssapi? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-"
-REQUIRED_USE="
-	gtk2? ( gtk )
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${S}"/unix || die
-	econf \
-		$(use_with gssapi) \
-		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
-}
-
-src_compile() {
-	emake -C "${S}"/doc
-	emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_test() {
-	emake -C unix cgtest
-	unix/cgtest || die
-}
-
-src_install() {
-	dodoc doc/puttydoc.txt
-
-	if use doc; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	cd "${S}"/unix || die
-	default
-
-	if use gtk ; then
-		for i in 16 22 24 32 48 64 128 256; do
-			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
-		done
-
-		# install desktop file provided by Gustav Schaffter in #49577
-		make_desktop_entry ${PN} PuTTY ${PN} Network
-	fi
-}
-
-pkg_postinst() {
-	use gtk && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && xdg_icon_cache_update
-}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 1086e40023b9..d9ab1c94675c 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,13 +1,5 @@
-DIST Remmina-v1.4.13.tar.gz 2519879 BLAKE2B ff2410ffbdea4509866b41e47eaa8caafb7f45091047eff9a830590b7a04c25cbbdec5788ccf9f35afdee613722e74e7595b73b4c3c8eea2fa3ffb4e09411d99 SHA512 cf82dc90f021635bcde906a73a2ad59087fe7cbe1bdd69a828ffc1e04ea0cc1bfa23386b70c36df85ae41dfa17f2d4379bedff29c03d9838c6ac18347e06b6dc
-DIST Remmina-v1.4.16.tar.gz 2615347 BLAKE2B 5cff71d94bf66dd0116be739646c33a601a83deb8fef1cfcddf9c197eb34458ea97f6e45e96e7e0bab7fbfb6d95c6150e5c72c6d5aae5f23bfedc8f080e00ade SHA512 a9b42ba95ab9c5f985c5c359d0fb138d73ca5f0f9199cb9e84e522d1e11c50f9fe2b8c943d64242e367f4185fd9eb0c764321ba9d4ab9a09c5c5c1dc37c0ba78
-DIST Remmina-v1.4.17.tar.gz 2618015 BLAKE2B 2b4fbc6cd80dba7d73d8ce7cb5627b6fb67c0cc0c76f124da629f2ebee2c5d0542c3e6b626cdc19630f49f1227fada7e5344ff2f49eeabbc8709c50f5d1f58eb SHA512 e833a4c602ce68354b6d65ea0d7e32c19a242bb72d5fcfd558106b6f53d9397b278472070bc53579185ebbc8fb2ea88718e05f05fdb743df5b46051eb3423d78
 DIST Remmina-v1.4.18.tar.gz 2578470 BLAKE2B 341352b6661a640cf99c5ca6a79f3f1a77cbd0a6027e4bd4a6360f2ed17e1a5abb58ca8a8638988842efb7218072e5cb4a3e56e0f35b7c06f9094c0e00d72689 SHA512 98f14caf39afd8531ce1af2e5f9addc1c68fa12eb66845f0436eec623e8bdbdd75ec14c59544e6e6414b2e4c522ac2b8213fd30561a902768d805ceb1d768f69
-DIST Remmina-v1.4.19.tar.gz 2452278 BLAKE2B 7f5ef0f0a13a73eb4893c4a49f6f97eb0141e3c385306503e63f81efdb5d85453ba9d5f030e6e73502c8ad314d701422e4e03d2ce9e69c5fb8003f01a08a5a42 SHA512 c07cee297aee28e772e39bc600144f946f6f315b6e48077c2f756125e51b1e82bc0cee39b9e81ba4568608b14bfd9c7dfc633240eb64245bdeeb537bc812dc6a
 DIST Remmina-v1.4.20.tar.gz 2489535 BLAKE2B 8d557dfc8629572d3fc930aea85e62fdc6294521c4997e1d211b8aac385f1bab3a13f082cff7f40e3add839d3922b4884736a9a50eb3e043df4c6314d3e456c5 SHA512 27a4bfbcb77f1cebe527bdcdd78f1dedb703c888c9452bdac7162e18e7eee0bf2e49143f3a3f98d451d4c1cf7cd6b9f89ae9fb67755930501e4f08e08d311892
-EBUILD remmina-1.4.13.ebuild 2491 BLAKE2B 70f498068e3529e7e8a3d46d937f4a76faee8b5eae69d12f07a5c8785f5c2c496f4331d5770cb6e4cf6b408fae859c14a40573892484a1a75dcc97b83163d108 SHA512 d142b8d3bbf6b4520a77564d6be9e01cc02e9df66e82ac38ef70f2e1cfce9378418f107d4859416606bf5aadc108792bc1039b4f63161ea97cb2d7ca0546d470
-EBUILD remmina-1.4.16.ebuild 2526 BLAKE2B ca1d007130661aafd360d7e11275b4227580a6f252a605b5be69f857e6f4815d58386592d23675817b143602450015c26e8cec88530d694ad34dd5e8dd347faa SHA512 52b8ac1fc61154b8359b1a037717a0f485439efcfe3f3261879d17701d46a48ea3641c130b84f77feb8afc093710d1cceee13cc173cc26dd88a6a7bcfadca7bb
-EBUILD remmina-1.4.17.ebuild 2526 BLAKE2B ca1d007130661aafd360d7e11275b4227580a6f252a605b5be69f857e6f4815d58386592d23675817b143602450015c26e8cec88530d694ad34dd5e8dd347faa SHA512 52b8ac1fc61154b8359b1a037717a0f485439efcfe3f3261879d17701d46a48ea3641c130b84f77feb8afc093710d1cceee13cc173cc26dd88a6a7bcfadca7bb
 EBUILD remmina-1.4.18.ebuild 2524 BLAKE2B be9d8782355c80121ae005c7d1cebec007604ad6046cd66f8fb5e6f8ae3bce69d9564e50e24ee0ba14fe03a418b099729cd70cd7914ec3d56bd47dc74d27e6d5 SHA512 2e67e4196ab4966a96e6af90827347dd28824a89593e57ee39c82b67f85783bdd2d900046de7a0e5a21c49bd3e08ecfa1c2f061036832721fa2d4665bd41ff9c
-EBUILD remmina-1.4.19.ebuild 2452 BLAKE2B 49759438820a9042ecc3f7d4e707dafd110f836c88bf97f450c85f3a05e738e95e2f4055e51c695ad59bc36a3cf39113f7f3840807ae64de9192eabe5c063f44 SHA512 e73efd10390baab1341d68eff931eeb633d36128f626028f703eb63a0545d6e379b696b82814e0a9c4d401697abb88c6ef9ed4bc5ed5a5b44be0e8ded6e53205
-EBUILD remmina-1.4.20.ebuild 2434 BLAKE2B f6e1d5209505d3958459c4e66f4bd8fab3436ffbe5a37eac7e5727ab91094f6cbdaac69bfac88c487cb9ddf8cd5397386ddeb74ab6edbad36eca762ff298a72a SHA512 9a13e927c740f733653621eb981012f83c43c6b0e64f7b0c9cdb3aad9659af955987a340c72ca3655cf3813e556f6644739df19fef0380c0571e865d8e5fe7c3
+EBUILD remmina-1.4.20.ebuild 2283 BLAKE2B 59ab932746408a1a0b15fdffa70760b25b68dc80a06b950d59b46a8d916ccaabcb4453d4bb7de2cb79be7fdb4ea2989f3989cbd80d73e11298bc8b5279e472ed SHA512 61acc96a8a3f6222350eff12fcf565f37815273992df0c7de76a56a659665d860d10672a5c3509d7c8aadde8ac5ab4901ebd29f8e4ceccf47fd50d8542b412ed
 MISC metadata.xml 1179 BLAKE2B cd5ed669c77987fc48b69e50632cbdcff804a9eea251b1f2591e47ee22f9e7d0e7922fc23b7b8f8846e15d8d201b9bf177fcba75d3bca75118f912f63ee58f88 SHA512 88b7748273b1cb9e625352a30820fdeb56e78207e5d06049c20406b371859713fcf5a7053578c9df41369ba12d35b3031e1e95919a34529f5f95246727a33c9c
diff --git a/net-misc/remmina/remmina-1.4.13.ebuild b/net-misc/remmina/remmina-1.4.13.ebuild
deleted file mode 100644
index a300a82d205c..000000000000
--- a/net-misc/remmina/remmina-1.4.13.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="appindicator crypt cups examples gnome-keyring kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/wayland
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	gnome-keyring? ( app-crypt/libsecret )
-	kwallet? ( kde-frameworks/kwallet )
-	dev-libs/openssl:0=
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex appindicator)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.16.ebuild b/net-misc/remmina/remmina-1.4.16.ebuild
deleted file mode 100644
index e7bceef93c0f..000000000000
--- a/net-misc/remmina/remmina-1.4.16.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	dev-libs/wayland
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex appindicator)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.17.ebuild b/net-misc/remmina/remmina-1.4.17.ebuild
deleted file mode 100644
index e7bceef93c0f..000000000000
--- a/net-misc/remmina/remmina-1.4.17.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	dev-libs/wayland
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex appindicator)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.19.ebuild b/net-misc/remmina/remmina-1.4.19.ebuild
deleted file mode 100644
index 33fd67a9140e..000000000000
--- a/net-misc/remmina/remmina-1.4.19.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libappindicator:3
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	dev-libs/wayland
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.20.ebuild b/net-misc/remmina/remmina-1.4.20.ebuild
index f0ee1b9f9517..bce90bb5c37f 100644
--- a/net-misc/remmina/remmina-1.4.20.ebuild
+++ b/net-misc/remmina/remmina-1.4.20.ebuild
@@ -7,14 +7,14 @@ inherit cmake optfeature xdg
 
 MY_P="${PN^}-v${PV}"
 
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
 HOMEPAGE="https://remmina.org/"
 SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
+IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit zeroconf"
 
 DEPEND="
 	dev-libs/glib:2
@@ -38,7 +38,6 @@ DEPEND="
 	spice? ( net-misc/spice-gtk[gtk3] )
 	ssh? ( net-libs/libssh:0=[sftp]
 		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
 	vnc? ( net-libs/libvncserver[jpeg] )
 	webkit? ( net-libs/webkit-gtk:4 )
 	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
@@ -77,7 +76,6 @@ src_configure() {
 		-DWITH_SPICE=$(usex spice)
 		-DWITH_LIBSSH=$(usex ssh)
 		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
 		-DWITH_LIBVNCSERVER=$(usex vnc)
 		-DWITH_WWW=$(usex webkit)
 		-DWITH_AVAHI=$(usex zeroconf)
@@ -94,5 +92,4 @@ pkg_postinst() {
 	xdg_pkg_postinst
 
 	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
 }
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index 74be4ad5a950..90dda1b6fb53 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -2,6 +2,5 @@ AUX scponly-4.8-gcc4.4.0.patch 555 BLAKE2B 0eff2d5cd94f60540dd1bbb6b6f9f1486abbb
 AUX scponly-4.8-rsync.patch 7838 BLAKE2B 1d6191aee86b0e3e75e527dbb1f8dbf631940a34da3f29f36b0e55577555dc9ad02e2e787a8cd53aeab5a28d93da7dd528a486f1133fd7a04b91971774b4b2a1 SHA512 37885c9b46422ac034182f9c9f230b4e806ce8c894ebb6c621f0e2b3d5f46c91db902c2dae6aefe5471907025d400320e4eff37cc7c5cc4c6f7d8c88a38e53f8
 AUX scponly-4.8-sftp-server-path.patch 2692 BLAKE2B ead282d46cb25a6d8606fa65e538142c15dd0be82956c2c8a48c7d46cc9ec59605a4f1c10fc5235acb584945b00ee4c187391d198571d841b45225c328765b49 SHA512 86171549d894426d12eb2f8d65959d1be2e137327c135be31c762820a55256f5c4ac90a01f989c8bffd2b46b275de408912306209b5aba9a94b81dbc06ff5a24
 DIST scponly-4.8.tgz 101687 BLAKE2B aa7250464fa3b51a439d35418c64d49f8595eaac6ffe710137c7c53b96bcf66a5ead38e9520b2cead7a829b57520f988f873eb713d5f52045cba4ef02c8e9b61 SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b
-EBUILD scponly-4.8-r6.ebuild 6863 BLAKE2B 4799a68568747249a5e10d5cf652d85a6740d3f0d322e806662836315565b2113573bc5d376e1369940c6f488948448b564690861f058e42be9e7c2ba941b459 SHA512 59b49748f350181c4d25b5f847ced5d0749e85b7f716f667ce5b83a64681b28c2991365e3ef9d9e8ebd21fab024dac2370a17ec6d914ffdcbcc3bdd11adacb43
 EBUILD scponly-4.8-r7.ebuild 6929 BLAKE2B 6acb6a90fa08450656a9edef983620e89fd0e3f30afdeb3c730d06394be0179d63f1e31f894a84c9d4c21883371518a3ba83669b0065cbfb5c3afbae5327a39f SHA512 13052ec55d53c1d8d919c4e5fb3b781be250d07ea17a9a9f226c694c3c5d3b33019643220db85e723a1bc276c9614a8efe7837b7b2de39a2d03598b1d26c9227
 MISC metadata.xml 1760 BLAKE2B 0e8926cd16ce210ce1545243103305d7c2943fbb0dd41b09d819225aa67995c7c0a3e5d7cc892422480e237d8f9b89b4b95f137abf9a8ed3287c953517e296be SHA512 0a25c9484e1f10839f62d09f2eabd6cee41c70045a6d6e0e321bf6f19b414923369bc4d4aead8828835f81094459ed7230c2ddcec496677a94c276be255381e9
diff --git a/net-misc/scponly/scponly-4.8-r6.ebuild b/net-misc/scponly/scponly-4.8-r6.ebuild
deleted file mode 100644
index 8e34824af99f..000000000000
--- a/net-misc/scponly/scponly-4.8-r6.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 toolchain-funcs user
-
-DESCRIPTION="A tiny pseudoshell which only permits scp and sftp"
-HOMEPAGE="https://github.com/scponly/scponly"
-SRC_URI="mirror://sourceforge/scponly/${P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="+sftp scp winscp gftp rsync unison subversion wildcards quota passwd logging"
-REQUIRED_USE="
-	|| ( sftp scp winscp rsync unison subversion )
-"
-
-RDEPEND="
-	sys-apps/sed
-	net-misc/openssh
-	quota? ( sys-fs/quota )
-	rsync? ( net-misc/rsync )
-	subversion? ( dev-vcs/subversion )
-	unison? ( net-misc/unison:= )
-"
-DEPEND="${RDEPEND}"
-
-myuser="scponly"
-myhome="/home/${myuser}"
-mysubdir="/pub"
-
-PATCHES=(
-	"${FILESDIR}/${P}-rsync.patch"
-	"${FILESDIR}/${P}-gcc4.4.0.patch"
-)
-
-DOC_CONTENTS="
-	You might want to run\n
-	emerge --config =${CATEGORY}/${PF}\n
-	\nto setup the chroot. Otherwise you will have to setup chroot manually
-	Please read the docs in /usr/share/doc/${PF} for more informations, also
-	the SECURITY file.
-"
-
-src_configure() {
-	CFLAGS="${CFLAGS} ${LDFLAGS}" econf \
-		--with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \
-		--disable-restrictive-names \
-		--enable-chrooted-binary \
-		--enable-chroot-checkdir \
-		$(use_enable winscp winscp-compat) \
-		$(use_enable gftp gftp-compat) \
-		$(use_enable scp scp-compat) \
-		$(use_enable sftp sftp) \
-		$(use_enable quota quota-compat) \
-		$(use_enable passwd passwd-compat) \
-		$(use_enable rsync rsync-compat) \
-		$(use_enable unison unison-compat) \
-		$(use_enable subversion svn-compat) \
-		$(use_enable subversion svnserv-compat) \
-		$(use_enable logging sftp-logging-compat) \
-		$(use_enable wildcards wildcards)
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHOR BUILDING-JAILS.TXT CHANGELOG CONTRIB README SECURITY TODO
-
-	( docinto chroot; dodoc setup_chroot.sh config.h )
-	# don't compress setup-script, so it is usable if necessary
-	docompress -x /usr/share/doc/${PF}/chroot
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	# two slashes ('//') are used by scponlyc to determine the chroot point.
-	enewgroup "${myuser}"
-	enewuser "${myuser}" -1 /usr/sbin/scponlyc "${myhome}//" "${myuser}"
-
-	readme.gentoo_print_elog
-}
-
-pkg_config() {
-	# pkg_postinst is based on ${S}/setup_chroot.sh.
-
-	einfo "Collecting binaries and libraries..."
-
-	# Binaries launched in sftp compat mode
-	if has_version "=${CATEGORY}/${PF}[sftp]" ; then
-		BINARIES="/usr/$(get_libdir)/misc/sftp-server"
-	fi
-
-	# Binaries launched by vanilla- and WinSCP modes
-	if has_version "=${CATEGORY}/${PF}[scp]" || \
-		has_version "=${CATEGORY}/${PF}[winscp]" ; then
-		BINARIES="${BINARIES} /usr/bin/scp /bin/ls /bin/rm /bin/ln /bin/mv"
-		BINARIES="${BINARIES} /bin/chmod /bin/chown /bin/chgrp /bin/mkdir /bin/rmdir"
-	fi
-
-	# Binaries launched in WinSCP compatibility mode
-	if has_version "=${CATEGORY}/${PF}[winscp]" ; then
-		BINARIES="${BINARIES} /bin/pwd /bin/groups /usr/bin/id /bin/echo"
-	fi
-
-	# Rsync compatability mode
-	if has_version "=${CATEGORY}/${PF}[rsync]" ; then
-		BINARIES="${BINARIES} /usr/bin/rsync"
-	fi
-
-	# Unison compatability mode
-	if has_version "=${CATEGORY}/${PF}[unison]" ; then
-		BINARIES="${BINARIES} /usr/bin/unison"
-	fi
-
-	# subversion cli/svnserv compatibility
-	if has_version "=${CATEGORY}/${PF}[subversion]" ; then
-		BINARIES="${BINARIES} /usr/bin/svn /usr/bin/svnserve"
-	fi
-
-	# passwd compatibility
-	if has_version "=${CATEGORY}/${PF}[passwd]" ; then
-		BINARIES="${BINARIES} /usr/bin/passwd"
-	fi
-
-	# quota compatibility
-	if has_version "=${CATEGORY}/${PF}[quota]" ; then
-		BINARIES="${BINARIES} /usr/bin/quota"
-	fi
-
-	# build lib dependencies
-	LIB_LIST=$(ldd ${BINARIES} | sed -n 's:.* => \(/[^ ]\+\).*:\1:p' | sort -u)
-
-	# search and add ld*.so
-	for LIB in /$(get_libdir)/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 \
-		/usr/libexec/ld.so /$(get_libdir)/ld-linux*.so.2 /usr/libexec/ld-elf.so.1; do
-		[ -f "${LIB}" ] && LIB_LIST="${LIB_LIST} ${LIB}"
-	done
-
-	# search and add libnss_*.so
-	for LIB in /$(get_libdir)/libnss_{compat,files}*.so.*; do
-		[ -f "${LIB}" ] && LIB_LIST="${LIB_LIST} ${LIB}"
-	done
-
-	# create base dirs
-	if [ ! -d "${myhome}" ]; then
-		einfo "Creating ${myhome}"
-		install -o0 -g0 -m0755 -d "${myhome}"
-	else
-		einfo "Setting owner for ${myhome}"
-		chown 0:0 "${myhome}"
-	fi
-
-	if [ ! -d "${myhome}/etc" ]; then
-		einfo "Creating ${myhome}/etc"
-		install -o0 -g0 -m0755 -d "${myhome}/etc"
-	fi
-
-	if [ ! -d "${myhome}/$(get_libdir)" ]; then
-		einfo "Creating ${myhome}/$(get_libdir)"
-		install -o0 -g0 -m0755 -d "${myhome}/$(get_libdir)"
-	fi
-
-	if [ ! -e "${myhome}/lib" ]; then
-		einfo "Creating ${myhome}/lib"
-		ln -snf $(get_libdir) "${myhome}/lib"
-	fi
-
-	if [ ! -d "${myhome}/usr/$(get_libdir)" ]; then
-		einfo "Creating ${myhome}/usr/$(get_libdir)"
-		install -o0 -g0 -m0755 -d "${myhome}/usr/$(get_libdir)"
-	fi
-
-	if [ ! -e "${myhome}/usr/lib" ]; then
-		einfo "Creating ${myhome}/usr/lib"
-		ln -snf $(get_libdir) "${myhome}/usr/lib"
-	fi
-
-	if [ ! -d "${myhome}${mysubdir}" ]; then
-		einfo "Creating ${myhome}${mysubdir} directory for uploading files"
-		install -o${myuser} -g${myuser} -m0755 -d "${myhome}${mysubdir}"
-	fi
-
-	# create /dev/null (Bug 135505)
-	if [ ! -e "${myhome}/dev/null" ]; then
-		install -o0 -g0 -m0755 -d "${myhome}/dev"
-		mknod -m0777 "${myhome}/dev/null" c 1 3
-	fi
-
-	# install binaries
-	for BIN in ${BINARIES}; do
-		einfo "Install ${BIN}"
-		install -o0 -g0 -m0755 -d "${myhome}$(dirname ${BIN})"
-		if [ "${BIN}" = "/usr/bin/passwd" ]; then  # needs suid
-			install -p -o0 -g0 -m04711 "${BIN}" "${myhome}/${BIN}"
-		else
-			install -p -o0 -g0 -m0755 "${BIN}" "${myhome}/${BIN}"
-		fi
-	done
-
-	# install libs
-	for LIB in ${LIB_LIST}; do
-		einfo "Install ${LIB}"
-		install -o0 -g0 -m0755 -d "${myhome}$(dirname ${LIB})"
-		install -p -o0 -g0 -m0755 "${LIB}" "${myhome}/${LIB}"
-	done
-
-	# create ld.so.conf
-	einfo "Creating /etc/ld.so.conf"
-	for LIB in ${LIB_LIST}; do
-		dirname ${LIB}
-	done | sort -u | while read DIR; do
-		if ! grep 2>/dev/null -q "^${DIR}$" "${myhome}/etc/ld.so.conf"; then
-			echo "${DIR}" >> "${myhome}/etc/ld.so.conf"
-		fi
-	done
-	ldconfig -r "${myhome}"
-
-	# update shells
-	einfo "Updating /etc/shells"
-	grep 2>/dev/null -q "^/usr/bin/scponly$" /etc/shells \
-		|| echo "/usr/bin/scponly" >> /etc/shells
-
-	grep 2>/dev/null -q "^/usr/sbin/scponlyc$" /etc/shells \
-		|| echo "/usr/sbin/scponlyc" >> /etc/shells
-
-	# create /etc/passwd
-	if [ ! -e "${myhome}/etc/passwd" ]; then
-		(
-			echo "root:x:0:0:root:/:/bin/sh"
-			sed -n "s|^\(${myuser}:[^:]*:[^:]*:[^:]*:[^:]*:\).*|\1${mysubdir}:/bin/sh|p" /etc/passwd
-		) > "${myhome}/etc/passwd"
-	fi
-
-	# create /etc/group
-	if [ ! -e "${myhome}/etc/group" ]; then
-		(
-			echo "root:x:0:"
-			sed -n "s|^\(${myuser}:[^:]*:[^:]*:\).*|\1|p" /etc/group
-		) > "${myhome}/etc/group"
-	fi
-}
diff --git a/net-misc/sipcalc/Manifest b/net-misc/sipcalc/Manifest
index 74b029d038f6..457a905b2026 100644
--- a/net-misc/sipcalc/Manifest
+++ b/net-misc/sipcalc/Manifest
@@ -1,4 +1,3 @@
 DIST sipcalc-1.1.6.tar.gz 117628 BLAKE2B 6da2a64f63ac9a4a53a588f8d82cfca230ba0f97893d89310ea0d83a8d6cc6b6a4c53fa1dc7ed9ac20b6bd8cc39e479c3b5d35658c58069e561b55d841e3a3ee SHA512 9d2047a6fb6ef177d455f44abea19bab7d0131b16eb2444b2b074e94e776854fa74084ab625d2be9b64d136979ede71722c2e24dca12ff54e4a5bb02f947570e
-EBUILD sipcalc-1.1.6-r1.ebuild 430 BLAKE2B 25591bf6debb2e1789f220aee280e3acd5b7c29bf588a230b1da657a3403cd2eb989095da8d2d8b4ce4ebba306eefa41c3a02f68d569838e018c7557c1ce2997 SHA512 071827ab68fffb2b7077db0446112928e5fd786104cff39b848a0cfc8952d54a023687288d05b8bee6b8ee13a7664e78c0093ed03baf37d78c7a02e904a73602
-EBUILD sipcalc-1.1.6.ebuild 395 BLAKE2B a0723c01782024f886664e1601e0795f3d44daef110d86872a99db28c1a57d76ccb9c828e0838d3c4dd8d587980a61744bb57a3199c78c5e1470af93f3706df1 SHA512 b8ffde5a7516d98a361497dc58464f8130333ef7605ba915e40e45fd86f7d95b5c2a257a453491d3b3066233e0289abd7950b3fc8774d5f0e646ba3c12ff31ca
+EBUILD sipcalc-1.1.6-r1.ebuild 420 BLAKE2B 24a5bb79cc46b61d26a9215f7d25ac14d03c3e5106e4363fc08091da1b3df8a09e31100309626c1828d9c759aec980c67c441da8c3b17b6a9604641dbba4dc04 SHA512 f65801a76ad8d3f4b934ef6217fdeb54a577f45e86f60faa0387a10aa53e23ecaf5ed7b5d36f628a6e233116c50a855879fc0d1d344a577a0b4fa3b10f20b48b
 MISC metadata.xml 402 BLAKE2B 53ffb74b2ed29b592030bb97f860016e844e0ad32d78131e5fad2b040f633ef90834bf7f7cc1a06cb951009eec5a0a5d59bbf159681235951c9bc085c2001deb SHA512 4af5280a5c2dfe1b04ab551cc65c9ff0e7b0ac8281eeafbfc1b14fa95c4a59b74a18133b31c08b584f51c55276542df9c6742c54734125fca8ed278cf1b41ce5
diff --git a/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild b/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild
index 17eccb499d61..421b296d3495 100644
--- a/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild
+++ b/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-DESCRIPTION="Sipcalc is an advanced console-based IP subnet calculator"
+DESCRIPTION="Advanced console-based IPv4/IPv6 subnet calculator"
 HOMEPAGE="http://www.routemeister.net/projects/sipcalc/
 	https://github.com/sii/sipcalc"
 SRC_URI="http://www.routemeister.net/projects/${PN}/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/net-misc/sipcalc/sipcalc-1.1.6.ebuild b/net-misc/sipcalc/sipcalc-1.1.6.ebuild
deleted file mode 100644
index 4d992820870b..000000000000
--- a/net-misc/sipcalc/sipcalc-1.1.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sipcalc is an advanced console-based IP subnet calculator"
-HOMEPAGE="http://www.routemeister.net/projects/sipcalc/"
-SRC_URI="http://www.routemeister.net/projects/${PN}/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/net-misc/spread/Manifest b/net-misc/spread/Manifest
index 1f88ba0e06fb..806222224cc4 100644
--- a/net-misc/spread/Manifest
+++ b/net-misc/spread/Manifest
@@ -1,6 +1,6 @@
 AUX spread.init.d 519 BLAKE2B cc0795f77e5b94ebecdd178beb487555a039b8679a8cdd0edbcc54c1b0faa6bd52f481fc11e58ee98f0a6b8c6432d8fe79c1a2791093a6a8430ec49a3706fe58 SHA512 20852b8fe9b14a1b3cde97683042060382f7a66c28e2072ede63bca9752cd0c4307e5aad689b3274018cf83b0918d0418a99b162af67a332ecc0d90d0deb475a
 DIST spread-src-4.4.1.tar.gz 760038 BLAKE2B 250e6347695f5f6e8047bf527c92baa3cfb6c44ce88ea08ff6ab066b937fab29531743133e73e155a5cc07109b1942efe46fd1d3b74202264a2e8ef0f518a0ad SHA512 19f3fe897e4a4bd68dffc7d28d7b99826bbcbb5c2f44eb18127ed486063594bfd788c03c8c338b9b329302659325fa84a9cbfee3f202a9970afb1a560bb6f496
 DIST spread-src-5.0.1.tar.gz 803058 BLAKE2B b115675cb8ad89bfda7921d7ede0d168bfa833297a13cf5bba866505813fc255d3585b4a02e51409acda73597803ac691b0b6d329b189405004fce5505af7f1c SHA512 f57dbabb6e4d343434fe1c48bb8868cf601e22c599a520521a23c6dfa215b1d835fb2a7dc3b7cf124352060d12566c5f64114544428cc5a95e7899208379b115
-EBUILD spread-4.4.1.ebuild 701 BLAKE2B ed2d42efea2341e3f86d3ccb6f4200f3d957a3fa385308fce5b6ff73d980427e3163298f39ec42a9e9e19885107aa72d64a12f119fda16aa1247d1dd7527f86a SHA512 597b098fd422b7d99d9a9a044d3aefaa989de71579bb629fe3819f34a700582c37d97a876b5b660723df94fe93effd1c5e6f4c513130d11b8f9e6cee6c1858b8
-EBUILD spread-5.0.1.ebuild 703 BLAKE2B a06866661e1bba22c60437c70f2d78939cf868ebf75cb4f7552ac30b062ab449e4ccd4f59d4ab3c803d2ff0fbc2217564807d44d4200924ce10e0a1298cadd28 SHA512 bb618e00444c2d02c096d3c98eb97216307fa626059ed3c5750a775e9aa14bd918f7562d865092234f562b9cdbcb4b4a71bf3a28a64950b94149a7d04964984f
+EBUILD spread-4.4.1-r1.ebuild 644 BLAKE2B 2c97f4c1319fbbc8830ab46db001d50ad9b2ef1e0ec7dfc870288f953013a10086f34a769e841ea857d482f03032766c2113793fa74cf3540c5d5fc4e8d90134 SHA512 f41fa156f4a190578e62052466d3938425dd50bb6b0cb59eb466ff3cae2e359aca046ffb67bc1c8f51a9dfe4e358160dec396061192378c35c5c0adc16201a2f
+EBUILD spread-5.0.1-r1.ebuild 646 BLAKE2B ad58e577c8eca88537e74422ef22dfcf8c522f047a9d637a0a6cadafbcfc127d2c15661669b12433a148ab53805edf2f86e7b841db1e34e8b5659557748062e8 SHA512 b23eb9333ef93c8da58fa039cbcc676a8b709ea734e8278db5b346d0d5d5f08b0b3e8e0ccbe51130e746f5fb0d31f4e61dd153fcc2acb40da39f357698733e1c
 MISC metadata.xml 245 BLAKE2B 922e349900957e202d9925c3b56ddbc4e93034b041d2d500a4f85b60a78f34089bae6ab910423c336af01717f3a3c6003ebbcb6f51d0d7e1a07574e70e7cfe86 SHA512 4706a02393a13e76abffdbffc63ca8bcc70dd9d7145241e0469ab0511df26bf7d6be8d31fdabff7916d23ab1dc886e3d9886551d8ad80074488a31d02952ad16
diff --git a/net-misc/spread/spread-4.4.1-r1.ebuild b/net-misc/spread/spread-4.4.1-r1.ebuild
new file mode 100644
index 000000000000..70da45c67ba2
--- /dev/null
+++ b/net-misc/spread/spread-4.4.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="spread-src"
+
+DESCRIPTION="Distributed network messaging system"
+HOMEPAGE="http://www.spread.org"
+SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Spread-1.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	acct-group/spread
+	acct-user/spread
+"
+
+src_prepare() {
+	default
+
+	# don't strip binaries
+	sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+	newinitd "${FILESDIR}"/spread.init.d spread
+}
diff --git a/net-misc/spread/spread-4.4.1.ebuild b/net-misc/spread/spread-4.4.1.ebuild
deleted file mode 100644
index f7a6437d93e7..000000000000
--- a/net-misc/spread/spread-4.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit user
-
-MY_PN="spread-src"
-
-DESCRIPTION="Distributed network messaging system"
-HOMEPAGE="http://www.spread.org"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Spread-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	enewuser spread
-	enewgroup spread
-}
-
-src_prepare() {
-	default
-
-	# don't strip binaries
-	sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
-	newinitd "${FILESDIR}"/spread.init.d spread
-}
diff --git a/net-misc/spread/spread-5.0.1-r1.ebuild b/net-misc/spread/spread-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..85b0f141896f
--- /dev/null
+++ b/net-misc/spread/spread-5.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="spread-src"
+
+DESCRIPTION="Distributed network messaging system"
+HOMEPAGE="http://www.spread.org"
+SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Spread-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/spread
+	acct-user/spread
+"
+
+src_prepare() {
+	default
+
+	# don't strip binaries
+	sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+	newinitd "${FILESDIR}"/spread.init.d spread
+}
diff --git a/net-misc/spread/spread-5.0.1.ebuild b/net-misc/spread/spread-5.0.1.ebuild
deleted file mode 100644
index b7526d4dcd16..000000000000
--- a/net-misc/spread/spread-5.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit user
-
-MY_PN="spread-src"
-
-DESCRIPTION="Distributed network messaging system"
-HOMEPAGE="http://www.spread.org"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Spread-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	enewuser spread
-	enewgroup spread
-}
-
-src_prepare() {
-	default
-
-	# don't strip binaries
-	sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
-	newinitd "${FILESDIR}"/spread.init.d spread
-}
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index fa998e9f2d15..94d52e65317a 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -2,9 +2,6 @@ AUX x2gocleansessions.service 198 BLAKE2B 2660b62182aecd274786220abe4616f3862934
 AUX x2goserver-4.1.0.0-Xresources.patch 1139 BLAKE2B f48f329836a86958866836949a44ccd6c37dc56b3da85366d8ab9a5ec003bc50a10f262211c9de3f2512aa497746d4ad43d1043fe6a36caf3905981f3d551e3c SHA512 42dba64bb8a0c278ca81f4e41236c17ea01c8294914f0051d4781c701b4356ccc05ee6835b0688b79205e0cd7a4c9ebbe418aac685a982db00fa293d48a61300
 AUX x2goserver-4.1.0.0-skip_man2html.patch 2936 BLAKE2B 6b18439c5dc994c5a8ec073e2767047dcd94ebb61b0418ba5d55d55d2860530ab818b87192bdc85124be6a9d52d5c19872063555b7bdcd721429ccfa8593cabb SHA512 7b56c725c42f0813ecb88ed7f34feb0cecd1eaedd157c19068f3e6607bd8510fbba177079744f9e93fc83a4bcc65e7df40f8b1bb6acf4124fda847bc4fb86986
 AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f91dd100562bb3029202a0bb0174fcb71dd776b075a708558eeaf8b1d9914c671bd8e59799772be44 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c
-DIST x2goserver-4.1.0.2.tar.gz 138053 BLAKE2B 5281f05d8531ace6e9228faf5c73590b17e4f743ab6a01779bcf0252c2c34d4525919ae71deef190bf835713be2f43d25fa41fd5c82e99280f0dc77927af7006 SHA512 32f9f38889b79a836bba12bf8df61d0a1530959b1e0da52935a330472a3933288edc611a4843ae145261e954a61e5b61a00a7cb0563b276bcad0587e00c09672
 DIST x2goserver-4.1.0.3.tar.gz 141581 BLAKE2B 79401a146e8a18451d6521f4b9556b2f22746bd752f39dc45764bacca085f2bb66a92327aaeb292979ce43ffbde24541e492cec814f1f8a535614cbdc2dc3ebd SHA512 9d7257dd454bfedca9e3ef1b07bc38b540cb833fae4535f2225a1f0bfea93c0f04c638d411b57c50e7170106a5ae1d7f41c19f043832129a7a9460dcfd34c56a
-EBUILD x2goserver-4.1.0.2.ebuild 2593 BLAKE2B 4a996297ca35b0306bd1057565099a511f78fc47095b780718327785349d241fdbae42ba02da49f1643251a1bbe20d7a8f9c8ce5a6c39ce2d0a1748790872969 SHA512 11e50cf4858d7363b27b6000f92111fc70be01d986b2452d600dfe2f71c435764ceee9de3d4050ce65924ec1c03f6d97d576bd8058ec5cb9d216318156267bca
-EBUILD x2goserver-4.1.0.3-r1.ebuild 2526 BLAKE2B bcf8660139ec8f5a3f0b890201d2b8a0547a683fd7538700759f120f686d73a79a9a78bf7d69e10c97769a207693eca1ff74af014225277e869ecf2ac17574bc SHA512 b4f5094d66f77d2424f2f7913ed65b582f15ab6752941dbdf0938d2233bcfcff97acd6b20496dc9173a6e710cc9ac3528195f19a2f7932c495f4760bfe693c54
-EBUILD x2goserver-4.1.0.3.ebuild 2690 BLAKE2B 50641b4a750a3026657805e966292d4ec4122450e4702cd4ba661e6b33a2a265423e1a5830f03db6fc3d87c5e44023ff972b0b9406952ced3c6e8e61215b33cb SHA512 b271f0d8bede6fa5d39697f20ff0970964aef86fd8a2a16b7580536d0555be2a0a8bdace517380c4f3dbbdacef297451d640ad064f898724b705d725eeea76ce
+EBUILD x2goserver-4.1.0.3-r1.ebuild 2524 BLAKE2B 5e788c529470b0e79259e6f6250f4bfaf6a552054276d06267c0a5baeefd42e9d903ae96c224aac7afae531dadf85299a0d1e483f39bc7b69ccecede5d16bd0f SHA512 7cfe8711457cbf38e6061b95e10395399b53112ca271a30636036249dacb74c1b0b5eb4bc73d5830c27722738419438f5e854a9ad853b635a50251c8b963fc6f
 MISC metadata.xml 346 BLAKE2B 0b995b0163615cb9c993c9ebdfd75d144052fcb65fed6d5f2e3cdaceaedaf8d4c7b6dfdf32e98a1f0c1cfae022617f216f73845177f5e9f904a77f043b78e851 SHA512 860975e20db2fefc93338ee5c21a2491f56c4f96924788098c94c9dcd0faebec15fdc7f06c04c571bae291a47ac6be4980799057d56ef33afefec3d878260c2e
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
deleted file mode 100644
index ca896382fcee..000000000000
--- a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd toolchain-funcs user xdg
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="dev-lang/perl:=
-	dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	dev-perl/File-Which
-	dev-perl/Switch
-	dev-perl/Try-Tiny
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc[nls]
-	>=net-misc/nx-3.5.99.14
-	net-misc/openssh
-	>=sys-apps/iproute2-4.3.0
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( net-fs/sshfs )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
-	"${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
-)
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	default
-	# Multilib clean
-	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		PREFIX=/usr
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		NXLIBDIR="/usr/$(get_libdir)/nx" \
-		PREFIX=/usr \
-		install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym ../../usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if use sqlite ; then
-		if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then
-			elog "To use sqlite and update your existing database, run:"
-			elog " # x2godbadmin --updatedb"
-		else
-			elog "To use sqlite and create the initial database, run:"
-			elog " # x2godbadmin --createdb"
-		fi
-
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL database, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
index 7e6f6226496a..c702e328a829 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
deleted file mode 100644
index 84cebf81ce7e..000000000000
--- a/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd toolchain-funcs user xdg
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="dev-lang/perl:=
-	dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	dev-perl/File-Which
-	dev-perl/Switch
-	dev-perl/Try-Tiny
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc[nls]
-	>=net-misc/nx-3.5.99.14
-	net-misc/openssh
-	>=sys-apps/iproute2-4.3.0
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( net-fs/sshfs )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
-	"${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
-)
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	default
-	# Multilib clean
-	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
-
-	# Do not compress man pages by default
-	sed '/^[[:space:]]*gzip.*man/d' -i */Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		PREFIX=/usr
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		NXLIBDIR="/usr/$(get_libdir)/nx" \
-		PREFIX=/usr \
-		install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym ../../usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if use sqlite ; then
-		if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then
-			elog "To use sqlite and update your existing database, run:"
-			elog " # x2godbadmin --updatedb"
-		else
-			elog "To use sqlite and create the initial database, run:"
-			elog " # x2godbadmin --createdb"
-		fi
-
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL database, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 2aa1f89e68eb..2df236dcb9c6 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2021.05.16.tar.gz 3336051 BLAKE2B b73206355187a9f61c51749ce01db40757937f79f988a3b81513a5cbe2c854d1b7f2268d7e02c4a0eb3d46c0852990950dfd400acc09f7616aeccb2e8cba6cf9 SHA512 a78ebfc16cc52458e2a036deb48693110f20c046ca3a509be9adbca76d23429953fcf3cd3aab8390a19af747291950bb9261e5339e5cbb0903b98848216c7aca
 DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3
-EBUILD youtube-dl-2021.05.16.ebuild 2185 BLAKE2B ae2b6ad60b6ec44cceeb957c121976720ef9eea4e446e604e598e3e69eb3ed981c838f1bebd16d30c559ec1c1366eca418f6594a34ea64cfc6b407298d62f51e SHA512 2c7917b52f4b75ac4429ff546bf099057ca7d4d4c3ddc9ad9a05b6d07a5ddec6bd3df7530362d6973002776656847905c0e8dd01f60bac56b2495697474272e5
-EBUILD youtube-dl-2021.06.06.ebuild 2157 BLAKE2B 63acd2a5c3cc48f9cd3dd9edaeb9c6c6dd29f2d58222fd6cd9f870c25e6e284bcfd7ce78efc422f82a60f7e8fd605d797f8b79774b6229345d20a8618d8d0044 SHA512 154191b8d145b9669ce427bfcb918b5bd69f2c8417b236b2485687d0f3a71927404203ac5ef11519a3289491d98b909a26d21d7cba64dbcde9870178a18071eb
+EBUILD youtube-dl-2021.06.06.ebuild 2152 BLAKE2B af86d64eaf6fd32e80916fa1b42c4e99742ecab1aef7208a5a8d8c13f81992f7e032fe8ae6c4bb4931061eaa62965b7cb023aae869141730b62659606cdfd6d2 SHA512 35d7f7c29caed0f0cc741d62b665b4d19df036c33143fd31b5e582fb0ada17994c97db8803a0c6f4294af49dff1dbeecb779c1f896ace5a4777e22f37d2606f5
 EBUILD youtube-dl-9999.ebuild 2150 BLAKE2B 845e5d04d4ce84654c07ac59a7d3ee585fd8c514fc26ef6bf6d768c9812e8f72a8be6c41b76c74d995b8e0cef84e5d5e9dc3a4f20d6789c7160bc287cf0a011f SHA512 bc42946c393450632744e8c2e06a2defaa4066322756caccf8010a6d3c9db12d9296f9f366b7e8375283d166655089f06beb4cb3be313c1a7ec2bc74f4d576f0
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
deleted file mode 100644
index f6c4602df69f..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..10})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit 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-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 youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	if ! has_version media-video/ffmpeg; then
-		elog "${PN} works fine on its own on most sites. However, if you want"
-		elog "to convert video/audio, you'll need 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."
-	fi
-	if ! has_version media-video/rtmpdump; then
-		elog
-		elog "Videos or video formats streamed via RTMP protocol can only be"
-		elog "downloaded when media-video/rtmpdump is installed."
-	fi
-	if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
-		elog
-		elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
-		elog "or media-video/mpv to be installed."
-	fi
-	if ! has_version media-video/atomicparsley; then
-		elog
-		elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
-		elog "from the metadata into the resulting MP4/M4A files."
-	fi
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
index 5d46a59d125b..f22b67f5220c 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
@@ -12,7 +12,7 @@ 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-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index c05c770f7799..f8d5ea0471ef 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/automatic/Manifest b/net-p2p/automatic/Manifest
index db39dcace054..7f24dee94534 100644
--- a/net-p2p/automatic/Manifest
+++ b/net-p2p/automatic/Manifest
@@ -4,5 +4,4 @@ AUX automatic.logrotate 94 BLAKE2B 6f505920dca44514ccec80d4bd917c5254d6955aad195
 AUX automatic.service 303 BLAKE2B 90b2d3ed19c6347b31b90bca68f482d580f56b62212eea17b6d0b8a10bd7ee15ea3937ece839485da7efba4d61597c032f1dccd9fc0802967f7bf0fbf33f6b4d SHA512 4e398133d71b834855d77c6d23f8d4ae87100c48661825797ccfc0e7613933a2a8dd4eddffeac51ffbaa1619847d2e2de0b4ecb20bfa1b13f9596cb57cda392c
 DIST automatic-0.8.3.tar.gz 102181 BLAKE2B cdba7706f16eb552d2da960ae03206acce45149d6e8d8f32654c05b6dc3293368afe3c44a7c0d254fd895c7f5fe30fe541139375793a143c4a3d605d27486824 SHA512 34061065d53ab362c9bfab9b66aebf7090b7079e5988b1984398410ab07ca2bdfdf3c65dd90bb076b6189120877784294484803d4ce5fa813d3bc13207aeebdd
 EBUILD automatic-0.8.3-r1.ebuild 1712 BLAKE2B b0468fb8ab99eec1a00d3b8f5605cc21350d5dfa18a5560bae79668b2fbc5ab6059fc2f408bd4a1c86c7e0b98b88db1445d8167dd99c2054dc13497d47587d60 SHA512 23b3bc1f2d035f8b16593f4ab730ac88a900c00985fa28fc8909c0aaae9d3ea2f6456239ad245abd9588070b9015e5407a16b02d40a0d664338881104e329caf
-EBUILD automatic-0.8.3.ebuild 1625 BLAKE2B 7b6d3dd41a9de064b13f17aca11dfa4c0e611547ab24cbc2aada82faa54cadc6b1df0845c8fb983282d39894f426a496322a7fcc7b87764c330735b1bf0aa44c SHA512 3b5f8123160274ec07c4e12d57ba6a182e4340ab4a2ce2bd39d05d7e93a5acad8aa3dbc5bad6a866a206eeb7724393845a28f9c02ea1635c7bfbaef33f343a94
 MISC metadata.xml 724 BLAKE2B e0857678dafe9aee71474b61bfa686da4819ef7acdfc156387e4b75438b2fadd70039cafb30b395ef201ee2308987bd0762fa2a81c7cf5668c7f66f2510d8664 SHA512 e1a244c20a21e91d017b5c391eb8e065b496529bafd77daee94fdf3d4af3099b2f02186a7204453675dd81f66b0fe711fabdcbd20456d89a011a124fa4757004
diff --git a/net-p2p/automatic/automatic-0.8.3.ebuild b/net-p2p/automatic/automatic-0.8.3.ebuild
deleted file mode 100644
index 3eb191d1c6b1..000000000000
--- a/net-p2p/automatic/automatic-0.8.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools user
-
-DESCRIPTION="RSS downloader for Tranmission"
-HOMEPAGE="https://github.com/1100101/Automatic"
-SRC_URI="https://github.com/1100101/Automatic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${P^}"
-
-RDEPEND="dev-libs/libxml2:2
-	dev-libs/libpcre:3
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	app-admin/logrotate"
-
-src_prepare() {
-	default
-
-	# https://bugs.gentoo.org/426262
-	mv configure.{in,ac} || die "rename failed"
-
-	# Remove CFLAGS and CXXFLAGS defined by upstream
-	sed -i \
-		-e 's/CFLAGS="-Wdeclaration-after-statement -O3 -funroll-loops"/CFLAGS+=""/' \
-		-e 's/CXXFLAGS="-O3 -funroll-loops"/CXXFLAGS+=""/' \
-		configure.ac || die "sed for CXXFLAGS and CFLAGS failed"
-
-	eautoreconf
-}
-
-src_install() {
-	# Install and copy documentation
-	default
-
-	# Install Gentoo init script and its config
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	# Create automatic related directories
-	keepdir /var/lib/${PN}/
-	keepdir /var/log/${PN}/
-
-	# Install logrotate for automatic
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	# Add automatic group and user to system
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-
-	elog ""
-	elog "To run automatic you should move /etc/automatic.conf-sample to /etc/automatic.conf and config it."
-	elog "If things go wrong, increase verbose level in /etc/conf.d/automatic and check log file in /var/log/automatic/"
-	elog ""
-}
diff --git a/net-p2p/go-ipfs-bin/Manifest b/net-p2p/go-ipfs-bin/Manifest
index d7dd2301c708..1a1d3f2b330b 100644
--- a/net-p2p/go-ipfs-bin/Manifest
+++ b/net-p2p/go-ipfs-bin/Manifest
@@ -2,14 +2,9 @@ AUX ipfs-at.service 354 BLAKE2B 77bf7a265a0b29945e6661d03f9deec5884076f24afffc9e
 AUX ipfs.confd 30 BLAKE2B 7ecaa40f2a4097690f9d8091da5891e0bbfb0f298bed4a59769c8d0ef978a2471865a01177950da5869b61f3b8c124f43eab97daf297c06efecdc25785a5846d SHA512 c55afeb3efe381d18258ddf00f58325b77156375cf223fb2daa049df056efe22e9139cce0f81dc4c73759dad5097af5f3201414beb5950bd894df9ae8c7c4ed1
 AUX ipfs.init 464 BLAKE2B f5927ab792427a87c330772fca4adc177ae84899be5c6b856f763d6e71d1cbdf1d151bf6eea46ff13ba5ce5996a55468a4749d37c1e8306c4d07f897f17430a1 SHA512 6616a0114039a7c178ee9788c748e4abf143a875df2a9d6d823249d7adef2024cd3f537cf45a624e76751792e8c24b1d42b0dd536686b14d6f53f59ca53ca1f4
 AUX ipfs.service 364 BLAKE2B c3d87df9588d6faed1710c592a5f3b2b1baad5442ee9fd63435d8ffff0f4e441afdded35f703c3bc56b505f99b61ac7c1ff3859e0251b87195cf4ed24abc1502 SHA512 dd0943c2b76cf73b686af3d69aac7321036f548b19c662c107ce51a34f8786fd80075e1369f4ed8d2b67280db93bf9772a3ca85e41f126d88e45604473e0d5c9
-DIST go-ipfs-bin-0.4.22.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
 DIST go-ipfs-bin-0.7.0.bash 21018 BLAKE2B 81150944c71fe86b07db8bc2240899cb95637e74e05dd898c2aabd26e47b7222d6e79d4270c4a681450d8d148cf5dcf96d4376de110e6221943e0214ebf1bf61 SHA512 3a5259147652beda38b32e8fa13165775dfd7116ffdc839e350bb8009197c18dc03a69bd3a62233de0ace5fd52e76b6b1d9e88df888ec268e98519b5a35fe89c
-DIST go-ipfs_v0.4.22_linux-386.tar.gz 18865892 BLAKE2B 4ff67301ce6eec8cb38015f6dba16e10ee1fa3efffb47b2c3a9fe76fba875907ccd53ec011abe5b496de4dd2dff0a30f4e526e232f47c174b83004efdcc30764 SHA512 a6d16217412d1be0cdc0a2df604740054758b767994bbcb7ffc745abd90c64c28031b543bcb5589c715fa7115effc9a3b898ada8ad96c604507b428ed2538378
-DIST go-ipfs_v0.4.22_linux-amd64.tar.gz 20900056 BLAKE2B f068c367fb454a62c76f9828927aae0870f54853d0aeddfe6ca774490107c26df88ce41efa016732dffaf269d3dc2d16e1744f9cc35d4f86e355744eb3172a10 SHA512 49b99fec741d67f7bad8fb6fbbd984967f06dfc3de846d10dca34b166f621a182d12f13cf5ccf4e4f33747b67cede6f4205b4cd9b57ce5244128d1385ec82c85
-DIST go-ipfs_v0.4.22_linux-arm.tar.gz 18199193 BLAKE2B 25316649add6256c4f12efb9bb43848e2049cc7bcbe89dbe77309e1cf793e2ebd28559a05d0974af53488c414a26c28499d80f2f13f80454d4217019c58edc65 SHA512 c803964828ccbac40797e58dc82d10bdf899db26ef71ddd2443882bd4f84ff4a5aee4995a04135cb31b8f991381ce8004c51b06501aaef4d58dbcac239519822
 DIST go-ipfs_v0.7.0_linux-386.tar.gz 22038249 BLAKE2B 85c85948d69dcec0c73ac38bad4eb4cd65ef7148199a6afcdf7f419981a12db3d37f4923746feaa608bbcf455065570e264039020c5517f8b0a5ffa163bf4177 SHA512 f2e8db09918aed702f4c952ff014612e06ee59a24f1b796a7d0c56300b82caf388c0201506a174de34aa0e9f0a646e2792a521ceab947d65d82386aefd54799b
 DIST go-ipfs_v0.7.0_linux-amd64.tar.gz 25954590 BLAKE2B 0bd139f77272ac9d5e4e1f3caa8a4967d17ba8fa9caa4eb4859933423c882844eca5403ca90a2cbeae95f080eb21bd64c7f46a391eac3d5717a5e2dcbf2d8aac SHA512 1d5910f27e8d7ea333145f15c6edcbacc1e8db3a99365f0847467bdfa7c73f4d7a05562e46be8e932056c8324ed0769ca1b6758dfb0ac4c2e1b6066b57c4a086
 DIST go-ipfs_v0.7.0_linux-arm.tar.gz 21087228 BLAKE2B ec3122077a487726fe227816f97462bf9caf40d30c44ff6bf67e6266eda7cfff456855cdf8f91c1bc01dcca58b0e76cc931c05179326414e39adb6bf4d7fae18 SHA512 a1a9b6e2833da94d9059f1d03e30e7349ab4f00fc0e8580909f35dbb28f0fdf6cea712a96928f72aa2fadf3efc1328187f4fc863e5ce74e4be699542e262a904
-EBUILD go-ipfs-bin-0.4.22.ebuild 1325 BLAKE2B 347eff8b98a137099b9b4d36ba64ce773da594dda87073099c36c3a337912f61ab67da7c8a179ee229fefb5d600bed892f24dd470b872c5982d94675ab3da4d9 SHA512 bf0eb3b77f96471fb63a13caf1e87dc19dbd2748882a0b3c9c72ac67fd3f6c350f07ffb22d0f80146f88b30bb3b5d152cff442e499c0bff41fb0cca2fbd64c94
 EBUILD go-ipfs-bin-0.7.0.ebuild 1300 BLAKE2B 189949433e69e43b7f8164824b31a4138e2e78fac07d9d82b4618fc0cec1ba3378082ed16af2d6f00169d6def2c3938ae877bf1cade90f6881a2087201fb1938 SHA512 08e4c322aa2fbfe49a2221077d8954029dc6459f5a91d8b723b4c773176fdccce6a83f18fd30311d5be242760c13804344f5d3d0c3f5de1bf1a00bd84bf72e21
 MISC metadata.xml 521 BLAKE2B 7d136cffdae521412f8934493a623e3ac749f70b06c90cf76937dd12ba26ad3b3565d8350626f906195f85961e6bccab3032680012ab58cc344b191823ebe4e8 SHA512 ac4f1bdff15ad8dd25faa2ad2ebef168e372b45ee3cb4268e1c2484a8dc5eba554f42919e569cb39682855732397b639152025012d6fa177d691a7d1155e09b8
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.22.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.22.ebuild
deleted file mode 100644
index c4af0136eb9e..000000000000
--- a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.22.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 systemd
-
-DESCRIPTION="Main implementation of IPFS"
-HOMEPAGE="https://ipfs.io/"
-SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
-	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
-	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
-
-	https://raw.githubusercontent.com/ipfs/go-ipfs/v${PV}/misc/completion/ipfs-completion.bash -> ${P}.bash"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-
-RDEPEND="
-	acct-group/ipfs
-	acct-user/ipfs
-	sys-fs/fuse:0
-"
-
-S="${WORKDIR}/go-ipfs"
-
-QA_PREBUILT="/usr/bin/ipfs"
-
-src_install() {
-	dobin ipfs
-
-	systemd_dounit "${FILESDIR}/ipfs.service"
-	systemd_newunit "${FILESDIR}/ipfs-at.service" "ipfs@.service"
-
-	newinitd "${FILESDIR}/ipfs.init" ipfs
-	newconfd "${FILESDIR}/ipfs.confd" ipfs
-
-	newbashcomp "${DISTDIR}/${P}.bash" "ipfs"
-	keepdir /var/log/ipfs
-}
-
-pkg_preinst() {
-	fowners -R ipfs:ipfs /var/log/ipfs
-}
-
-pkg_postinst() {
-	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
-	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
-	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
-}
diff --git a/net-p2p/go-ipfs/Manifest b/net-p2p/go-ipfs/Manifest
index 8feb2e3b70cb..d818d1598035 100644
--- a/net-p2p/go-ipfs/Manifest
+++ b/net-p2p/go-ipfs/Manifest
@@ -1745,4 +1745,4 @@ DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f36
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 EBUILD go-ipfs-0.7.0.ebuild 82738 BLAKE2B eefa46f1053c9716dd43a8ae120736781adfed53be40f9f9602aae273aa9f1d28f28c05c50721e4be446b9ba6bc36a046aa1f103d6031ff643aeac597fc22bc2 SHA512 38a823e3878a19fbef7be5fe8356606b34a1156642a5940de9b38b28ef7da656dad9f34b1ca3a40e92e6250219ffe8a575e2bb0178a2c6bb63c69503e8a09dcf
 EBUILD go-ipfs-0.8.0.ebuild 75130 BLAKE2B 4831e021e5501bf17e2e6b0629dbcd02c4b8d66cb05b9d988c1886bc2ebcf22170c7337feb5ebe150bb7dfccbb12bbd8fe0fc7ac223e172cc1c2b3845d7e45ed SHA512 3dd920602303f27eb6bdfabd6535aad97d7cbb4417aebbb4be5d2c8ab82163037b43ae3d699113b432d7aa200e446f069048945a40329fc9c65e9e3d57940928
-MISC metadata.xml 396 BLAKE2B 264f50317693f9929b7995e1188ffe4ab7616fbdb9be8a5a445cf03dfb9fed58742a11ab6df154c20395441195c64fb3ee68278612478527579f3beec202c0e0 SHA512 0632b981dc48dbd6432ef940c5a8e8c3836773e14a67bb81bde469410b6bdace1c4eeb7d27ff6ac72291213d201435f9f884535378bedfe7957d72240cf707c2
+MISC metadata.xml 521 BLAKE2B 7d136cffdae521412f8934493a623e3ac749f70b06c90cf76937dd12ba26ad3b3565d8350626f906195f85961e6bccab3032680012ab58cc344b191823ebe4e8 SHA512 ac4f1bdff15ad8dd25faa2ad2ebef168e372b45ee3cb4268e1c2484a8dc5eba554f42919e569cb39682855732397b639152025012d6fa177d691a7d1155e09b8
diff --git a/net-p2p/go-ipfs/metadata.xml b/net-p2p/go-ipfs/metadata.xml
index 72bff73de1e0..744411f3075f 100644
--- a/net-p2p/go-ipfs/metadata.xml
+++ b/net-p2p/go-ipfs/metadata.xml
@@ -5,6 +5,10 @@
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>hurikhan77+bgo@gmail.com</email>
+		<name>Kai Krakow</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index bef4402c52d1..4e6ed0f6de68 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,3 +1,3 @@
-DIST gtk-gnutella-1.2.0.tar.xz 20467452 BLAKE2B 8884c74e5c7ba52ce870289579cb26608fd8eb0fff14986fba40e200181e28908aa42c7a345f1c69dd5b1099135b4a0458d266abdf94361cc0a37b8949867322 SHA512 8d4da23acce22af42b39ca4af2ee4d250cadea9f8c549d712ffdfb797b53311ce8db9fcb38bc1f5547b7df32e95ebc53676bff1127805e867b23d0598b1fa4cd
-EBUILD gtk-gnutella-1.2.0-r1.ebuild 1879 BLAKE2B 3a834f074c28a97d0577900d77d8b7e123487b60a55257b7a5f0b97c38b93ad66304eb272d552e6e3df3721f7967736391d0371a8804a35a1502d6ef01ea623d SHA512 7d0dcc558027da78e334e0a9caaea188393602f478987c67d7f5522dc6e7c223f2886ffecbdcac67b7576f213d3a19f4772190f7e00db23c5af5d92aeb07a9db
+DIST gtk-gnutella-1.2.1.tar.gz 25055800 BLAKE2B 09f68979bc4df130e2b7b4a78017c2834feab1173d6242fe07856be038b9c671609fee7a7ec270fd6f9592a2fb2bfa0bf8a08472da0f41f6e3dc2dfaafd5ed58 SHA512 e53c8e0f7d11f699e9eb77546f3d6ca240ee9fa92e8817af4631250d86714b97eb36fbcd83e46d8429cbd12532c9c9a343a2ba69eba6deda4bc9c5610e98efc8
+EBUILD gtk-gnutella-1.2.1.ebuild 1955 BLAKE2B 8909b8ddab6c94525ea72f5d7dd0514dfd6a8f2be7305594dc001c1a65fc56be119ba4351fa71331ff1d1de04ade63e0e6fe66304146aa6518a3a0069db99752 SHA512 772f019794f4abdfcb1721f7a97b6e2ac3272cd182790752218ee3bfb6ead7395b6ca57f67d542f09af0cee18b5788a7308ff7f31e2687710cf1b4ba74da1d1d
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0-r1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0-r1.ebuild
deleted file mode 100644
index 2d4f8c1d8292..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit strip-linguas toolchain-funcs
-
-IUSE="nls dbus ssl +gtk"
-
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="CC-BY-SA-4.0 GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	dev-libs/glib:2
-	sys-libs/zlib
-	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
-	dbus? ( >=sys-apps/dbus-0.35.2 )
-	ssl? ( >=net-libs/gnutls-2.2.5 )
-	nls? ( >=sys-devel/gettext-0.11.5 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	strip-linguas -i po
-
-	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
-	for ling in ${LINGUAS}; do
-		echo $ling >> po/LINGUAS
-	done
-
-	default
-}
-
-src_configure() {
-	# There is no option to turn off optimization through the build.sh
-	# script.
-	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
-
-	# The build script does not support the equivalent --enable
-	# options so we must construct the configuration by hand.
-
-	local myconf
-
-	if ! use nls; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	if ! use dbus; then
-		myconf="${myconf} --disable-dbus"
-	fi
-
-	if ! use ssl; then
-		myconf="${myconf} --disable-gnutls"
-	fi
-
-	if use gtk; then
-		myconf="${myconf} --gtk2"
-	else
-		myconf="${myconf} --topless"
-	fi
-
-	./build.sh \
-		--configure-only \
-		--prefix="/usr" \
-		--cc=$(tc-getCC) \
-		${myconf}
-}
-
-src_compile() {
-	# Build system is not parallel-safe, bug 500760
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/bin
-	emake INSTALL_PREFIX="${D}" install
-	dodoc AUTHORS ChangeLog README TODO
-
-	# Touch the symbols file into the future to avoid warnings from
-	# gtk-gnutella later on, since we will most likely strip the binary.
-	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
-}
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.1.ebuild
new file mode 100644
index 000000000000..0c8fc17fa879
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic strip-linguas toolchain-funcs
+
+IUSE="nls dbus ssl +gtk"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="https://github.com/gtk-gnutella/gtk-gnutella/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
+
+SLOT="0"
+LICENSE="CC-BY-SA-4.0 GPL-2"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+RDEPEND="
+	sys-libs/binutils-libs:=
+	dev-libs/glib:2
+	sys-libs/zlib
+	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
+	dbus? ( >=sys-apps/dbus-0.35.2 )
+	ssl? ( >=net-libs/gnutls-2.2.5 )
+	nls? ( >=sys-devel/gettext-0.11.5 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	filter-flags -flto
+	strip-linguas -i po
+
+	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
+	for ling in ${LINGUAS}; do
+		echo $ling >> po/LINGUAS
+	done
+
+	default
+}
+
+src_configure() {
+	# There is no option to turn off optimization through the build.sh
+	# script.
+	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
+
+	# The build script does not support the equivalent --enable
+	# options so we must construct the configuration by hand.
+
+	local myconf
+
+	if ! use nls; then
+		myconf="${myconf} --disable-nls"
+	fi
+
+	if ! use dbus; then
+		myconf="${myconf} --disable-dbus"
+	fi
+
+	if ! use ssl; then
+		myconf="${myconf} --disable-gnutls"
+	fi
+
+	if use gtk; then
+		myconf="${myconf} --gtk2"
+	else
+		myconf="${myconf} --topless"
+	fi
+
+	./build.sh \
+		--configure-only \
+		--prefix="/usr" \
+		--cc=$(tc-getCC) \
+		${myconf}
+}
+
+src_compile() {
+	# Build system is not parallel-safe, bug 500760
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/bin
+	emake INSTALL_PREFIX="${D}" install
+	dodoc AUTHORS ChangeLog README TODO
+
+	# Touch the symbols file into the future to avoid warnings from
+	# gtk-gnutella later on, since we will most likely strip the binary.
+	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
+}
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index e9c0e7b926ce..6bbd813ed092 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,7 +1,5 @@
 DIST ktorrent-20.12.3.tar.xz 2141556 BLAKE2B 8c1bfd675597a724ae6143bddb88005da0ec852a93ef3cc843605b4a3a47d80acba23df2a2cc13ff49efa9e4576269f3157e8456c80388b7e309527befbf0297 SHA512 fb54341368b3260ceefdb9be8bbc62c74397ada1a824a96f9de316caa365be438adc96ed15ee0bc44b7cc0db8eb1082c9ffb49eacb9448c31e8fbfe6e6314e93
-DIST ktorrent-21.04.2.tar.xz 2091444 BLAKE2B f68c89b60dcd92e9986c034974b40ba97aa6f0738a7ed24416b9eff73d3d8d06db0f4314cb851e6762544f3eecdad93a04dce7f75fa10001640019d9fc9af5c3 SHA512 0ce49277ade0b358746c76107d96346b36a20a9d73428696f6daf04734f909953fb2926eebc3a9015855c7f962adbd566434e056022259bb940d472fb23b1687
 DIST ktorrent-21.04.3.tar.xz 2091116 BLAKE2B bd03c3730a5082c17c58d6453d035fa785b5ee6e0f253d5cd37adb5e43508315deedbdd423a2e453a116a8ab9dedfe78cef063fd11262579d910b1a0f5a36e05 SHA512 70e8baf2d04fe86be09fd4583ba20375ccbec67e5e8b7a8aac252bbe04469ccfb36c55fc5088497f8575f3bef59cff40f48f648d73071e06f676b45504aa935e
 EBUILD ktorrent-20.12.3.ebuild 3088 BLAKE2B f7285f9e6d0071698ec7af6c329a4537e4766aa073265af0c08c50921cd853c4e7db6c8f256102c2292c982c4aadee50b7872a49e6cfbbf621b33bcd4715835f SHA512 736a156c76972306a0e08d376fee53dde944a9434890eca28f8e70535d6a041f7518b20ebc2439e7d612726dc25ad45f506a1c2ba88eee4972947415295d865e
-EBUILD ktorrent-21.04.2.ebuild 3080 BLAKE2B 34e6edcc5b843aff51bd44c57ff24b9714b403c76810543fad88339bbbf8cdc3accc64af42cfe11a17e6c7edca51adc152da42ad7bd5c0d3b22a5bd0aa164577 SHA512 756fc3a8b501bb779aeb28ab21958dd9f7754e694e4dde186ef81948f7bb99a7e7df84d142d2ca08b0fa775810ac15438a75006cdfd12ad0594319b28fe7f58f
 EBUILD ktorrent-21.04.3.ebuild 3080 BLAKE2B 34e6edcc5b843aff51bd44c57ff24b9714b403c76810543fad88339bbbf8cdc3accc64af42cfe11a17e6c7edca51adc152da42ad7bd5c0d3b22a5bd0aa164577 SHA512 756fc3a8b501bb779aeb28ab21958dd9f7754e694e4dde186ef81948f7bb99a7e7df84d142d2ca08b0fa775810ac15438a75006cdfd12ad0594319b28fe7f58f
 MISC metadata.xml 1389 BLAKE2B b928cdf2526433fcf48c5600049b27c9f7c12aa043a332931b5a567d1baff9fa0bb0ac6e4e8de056947637d1253ee338a8b6620e52b294b20cdd7127a3b1c81d SHA512 4cf5204afc5a9f451752efcf1bae64a947c3bbb0d259641a85771071a7c390ee50818518a15c38f47f7778cdb3ff10732428dfff3c99a09049ca8c2486736991
diff --git a/net-p2p/ktorrent/ktorrent-21.04.2.ebuild b/net-p2p/ktorrent/ktorrent-21.04.2.ebuild
deleted file mode 100644
index 2728b9034f1a..000000000000
--- a/net-p2p/ktorrent/ktorrent-21.04.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KDE_GEAR="true"
-KFMIN=5.80.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/ktorrent/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
-+mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
-
-BDEPEND="sys-devel/gettext"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=net-libs/libktorrent-${PVCUT}:5
-	infowidget? ( dev-libs/geoip )
-	kross? (
-		>=kde-frameworks/karchive-${KFMIN}:5
-		>=kde-frameworks/kitemviews-${KFMIN}:5
-		>=kde-frameworks/kross-${KFMIN}:5
-	)
-	mediaplayer? (
-		>=media-libs/phonon-4.11.0
-		>=media-libs/taglib-1.5
-	)
-	rss? (
-		>=dev-qt/qtwebengine-${QTMIN}:5
-		>=kde-frameworks/syndication-${KFMIN}:5
-	)
-	shutdown? ( kde-plasma/libkworkspace:5 )
-	stats? ( >=kde-frameworks/kplotting-${KFMIN}:5 )
-	upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	ipfilter? (
-		app-arch/bzip2
-		app-arch/unzip
-		kde-apps/kio-extras:5
-		>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
-		-DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
-		-DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
-		-DWITH_SYSTEM_GEOIP=$(usex infowidget)
-		-DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
-		-DENABLE_SCRIPTING_PLUGIN=$(usex kross)
-		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
-		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
-		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
-		$(cmake_use_find_package rss KF5Syndication)
-		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
-		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
-		-DENABLE_STATS_PLUGIN=$(usex stats)
-		-DENABLE_UPNP_PLUGIN=$(usex upnp)
-		-DENABLE_SEARCH_PLUGIN=$(usex webengine)
-		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
-	)
-# add back when ported
-# 		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
-	ecm_src_configure
-}
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index dab730f4a27f..d458549a89ff 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,5 +1,6 @@
+AUX cpp17-byte-namespace.patch 2224 BLAKE2B 8d69353ae9a5d3297f304d2b130ed06f5f2f8aef5ae1116a69e36019c70e3c991354b0d8ad27951910b67b8a87641b563c7065c4e50f11452c0f9be79971cbae SHA512 8f7e1893846568e41e651f63ed9a003090adbe3ec7a6ccb18a1e2638ccbc9b249e99b27babfca030129d8b4c1f72b752a5c6eb18cc21a066cd08ff414c92a8d8
 AUX mldonkey.confd 949 BLAKE2B 05e1ceaa111249a979931c14eb599201e525f50af2370318c4bd0b6025694b55167e400c784774719dc084e326de378365e6a53badaf48cc1681003ef5b55ceb SHA512 d45f8ca35aacbd4f05a936c591866b7cb4b19e6c69139f728160c8dc09b3d4c1f689d28fa7287692f8382c291b50ff91b3ea594fe781f861efa991f2927e882c
 AUX mldonkey.initd 3509 BLAKE2B d3098a027f044f3bfc7559fa1869f7080844de1cec93fe26424322aafd482c7f010fef96854115e42e4b2a37f31b1d0f6caf94abf0c97c52d794db4767f5c0c1 SHA512 0c423feb9abbe7b08d77a3221a3638a0a93526bbf68c5e60e944413f4fd13ac44813609179b981c31d19e1e8fe11333f16dc8388a144208694cb84c008dbbed3
 DIST mldonkey-3.1.7-2.tar.bz2 2801815 BLAKE2B f914648b4e2a358e51518f3b58dc0df803cdb28d7706783504644266690514c17c2cae0688011073391db221eb8f38c7cbaf1e913220d824e41ca2e23d4c8587 SHA512 11cb0fa0db95e918c291009f4121a1b34cf485e5ac6826a72a4dc520dd78d21ced40d205fa26eb451c7d3eb31f2193cbb64e46c99c85dc932762c1bcc4da4934
-EBUILD mldonkey-3.1.7-r2.ebuild 4605 BLAKE2B 3842e7aa6cd7aace9be040d80ac2f905b5e3cac9db08ec2bf71cb6d854c3ba25e82dc638a4f4b4d8984e04a2a9b9a95e3a4571f48dbd43f728ae9674afb40d62 SHA512 c565722c0523bd174fb42703ebd44d43d2422e07334c4bd5493254e3d15b5faba71e4d9daf8585e38e61f52cd7110d428ee199beefdc64a8348057d14ffd82c5
+EBUILD mldonkey-3.1.7-r2.ebuild 4659 BLAKE2B 60a14309d772b80cd916b1b187795e69592c7604eae0034b7bb64040d5848d2f17945ef0606000f208e79ffe737dfacf796187899c1c16ab1402a66796d05e34 SHA512 5346ed2cf24081cafbd05ac373a02ae9f8f9e21b720992d0d476d3cb366fbf488a4acba0c7e112dd2a15e6b61f2ae53058352432b43803ec366abccf21840e59
 MISC metadata.xml 809 BLAKE2B 1e1d3eb87ffee2ab5b4fe9860de53679b7b29095d14811687d53cc9f4dc150bfe728375ab8acb48348d8f1a85d8f93e0d008f14cfd8e15129377fb26fe719dab SHA512 1d58b72d25faafecbe527956dd19820a78566e27dd10c996fc36a81807a48245efbb6d5a037304770b823e0c9930dc333db22749a8ebc3d056a4118f8d970286
diff --git a/net-p2p/mldonkey/files/cpp17-byte-namespace.patch b/net-p2p/mldonkey/files/cpp17-byte-namespace.patch
new file mode 100644
index 000000000000..0b1ca44e8eed
--- /dev/null
+++ b/net-p2p/mldonkey/files/cpp17-byte-namespace.patch
@@ -0,0 +1,63 @@
+diff -ur a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
+--- a/src/utils/lib/CryptoPP.cc	2021-07-06 22:20:46.675183781 +0200
++++ b/src/utils/lib/CryptoPP.cc	2021-07-06 22:20:51.025182789 +0200
+@@ -9482,7 +9482,7 @@
+ #define PRIVKEYSIZE 384
+ 
+ static Signer* s_signer = NULL;   
+-static byte m_publicKey[MAXPUBKEYSIZE+1];
++static CryptoPP::byte m_publicKey[MAXPUBKEYSIZE+1];
+ static unsigned long m_publicKeyLen = 0;
+ 
+ void cc_lprintf_nl(const char * msg, bool verb);
+@@ -9555,7 +9555,7 @@
+ 
+ 
+ // return signatureSize (buf)
+-int createSignature(byte *buf, int maxLen, byte *key, int keyLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
++int createSignature(CryptoPP::byte *buf, int maxLen, CryptoPP::byte *key, int keyLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
+ 
+ 	int result = 0;
+ 
+@@ -9570,7 +9570,7 @@
+ 		CryptoPP::SecByteBlock sBB(s_signer->SignatureLength());
+ 		CryptoPP::AutoSeededRandomPool rng;
+ 	
+-		byte bArray[MAXPUBKEYSIZE+9];
++		CryptoPP::byte bArray[MAXPUBKEYSIZE+9];
+ 
+ 		memcpy(bArray,key,keyLen);
+ 		PokeUInt32(bArray+keyLen,cInt);   
+@@ -9597,7 +9597,7 @@
+ 
+ }
+ 
+-int verifySignature(byte *key, int keyLen, byte *sig, int sigLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
++int verifySignature(CryptoPP::byte *key, int keyLen, CryptoPP::byte *sig, int sigLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
+   using namespace CryptoPP;
+ 
+ 	bool result = false;
+@@ -9607,7 +9607,7 @@
+ 		StringSource ss_Pubkey(key, keyLen,true,0);
+ 		Verifier pubKey(ss_Pubkey);
+ 
+-		byte bArray[MAXPUBKEYSIZE+9];
++		CryptoPP::byte bArray[MAXPUBKEYSIZE+9];
+ 	
+ 		memcpy(bArray,m_publicKey,m_publicKeyLen);
+ 		PokeUInt32(bArray+m_publicKeyLen,cInt); 
+diff -ur a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
+--- a/src/utils/lib/CryptoPP.h	2021-07-06 22:20:46.675183781 +0200
++++ b/src/utils/lib/CryptoPP.h	2021-07-06 22:20:56.271848200 +0200
+@@ -181,10 +181,9 @@
+ #	define __USE_W32_SOCKETS
+ #endif
+ 
+-typedef unsigned char byte;		// put in global namespace to avoid ambiguity with other byte typedefs
+-
+ NAMESPACE_BEGIN(CryptoPP)
+ 
++typedef unsigned char byte;		// put in global namespace to avoid ambiguity with other byte typedefs
+ typedef unsigned short word16;
+ typedef unsigned int word32;
+ 
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild
index 8557ea1a285e..c1bb19df5b69 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild
@@ -51,6 +51,8 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="!ocamlopt? ( strip )"
 
+PATCHES=( "${FILESDIR}/cpp17-byte-namespace.patch" )
+
 S="${WORKDIR}/${P}-2"
 
 pkg_setup() {
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 971a414a782e..4837630a14ab 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index a5e963e627e8..029ebdd08e08 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,5 +1,4 @@
 AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3
-AUX cups-filters-1.27.4-make-missing-testfont-non-fatal.patch 510 BLAKE2B 9b48f841b7034b4c56ed6ea7d229696aacc232b9d78c9984dad6db8f6e967e239c77dbb35886230ac968966ee04912add135a5932ca1483674e1bf2c087e81fc SHA512 ce14af0a4d2db1e67471b8986290261ac17709720fe5a52a6a81bda19e4ae7e4ab92a8f1e954b82b792690f9eae8116c59ee3a11594256a36bf8cff32846e97c
 AUX cups-filters-1.28.2-make-missing-testfont-non-fatal.patch 477 BLAKE2B 30e8fd049fb4d16439405aa052134d828a5f9e5e3f79c02e6121d3c15c5374c62d370fe88ab4b761e849ab48ecc0bdde97d36c6fd98056d0dc195464c7648a2d SHA512 797e8530f5a44b4e4975399076e4e1c537da968a9ed8272baaf1e457a025bc22478045e780208b1607dbcd4eb31b91ac605781cf6eae47ffcdd748e34d126327
 DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B b4f493681ac2a701648b3b9b071f4ebfb432dd4660b610579ff2ed6cba4f6cd4351d5a1f28f5c096b3ba20d9c45dc87837bf127b9bc98680a98dec58dd0a68ea SHA512 ac139ae7452342bd46e464bff3438d437f1c9a2e719a7b32b7abc22c2667acaa93dfb976decb277a02572e688ecd86289e01fca817bef93018dff2076fb2a30c
 DIST cups-filters-1.28.7.tar.xz 1503052 BLAKE2B b9d3280871faa79a7c277731bf6eb1eef161537829d4bc07ec36075ebc12a3617dce66994ed708991757ce7d78fc5ab010925a1d3d9811fd11cf1172f4786442 SHA512 fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727
diff --git a/net-print/cups-filters/files/cups-filters-1.27.4-make-missing-testfont-non-fatal.patch b/net-print/cups-filters/files/cups-filters-1.27.4-make-missing-testfont-non-fatal.patch
deleted file mode 100644
index 50866e4a7291..000000000000
--- a/net-print/cups-filters/files/cups-filters-1.27.4-make-missing-testfont-non-fatal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -789,7 +789,7 @@ AC_ARG_WITH([test-font-path],
- 	[with_test_font_path=`find /usr/share/fonts -name DejaVuSans.ttf || echo /usr/share/fonts/dejavu/DejaVuSans.ttf`]
- )
- AC_CHECK_FILE("$with_test_font_path", [], [
--	AC_MSG_ERROR([Requested font file is missing. Please install a package providing it.])
-+	AC_MSG_WARN([Specified font for tests not found. Expect test failures!])
- ])
- AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])
- 
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index f14a7d85f97c..caa7eaf5cd82 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 455aa9831670..cdbb029b5898 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -12,5 +12,5 @@ AUX sockd.conf-with-libwrap.patch 870 BLAKE2B 8c56ab479f99f6dff61882c01842ef0780
 AUX sockd.conf-with-pam.patch 295 BLAKE2B f41c2109e21878d2b473c6cffb4fe845d59ac0478f5196f7ccdc42baafd674e0960169e3a9dbc4fedb4a27cb7df8bd0dfc255595a72c39185c7ffb177fb53da8 SHA512 78728605362360650e6a20869744fc941782b75d149c0835542faaad931104cb32dda56de77a7b4f9a4fa683053139c551bcf77607a047fb1be68b6da9388630
 AUX socks.conf 4185 BLAKE2B cb41b40e858c83d06bd5e199c4fc991e8dda0ee64d48fd94e52d6ef836e79d6a6f5f50b6dd55074e92b6f96f20db65922f53869f08506100ae8b59b722643cdd SHA512 d15ea77e20ad750f10285a42c9c6305cbed48313dea205139d8cf59fda4a4640bdd5c5bd2c295b32e0015b774d463f9ad34fa5a22fb188ae921dba1a533553eb
 DIST dante-1.4.1.tar.gz 1284288 BLAKE2B 34c78007245339088d79e0b969b8f55d20b0ee59d89c1bf19510b563799ac3c54c6b8b5f37bfb64410d60e893beb0e2d1d79893c0264b7481aeb4cdab2037e90 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e
-EBUILD dante-1.4.1-r5.ebuild 2674 BLAKE2B 75c79249b1ab1164b1e140bae35582d84cdea4d40381095f3b13b32222960bae8fd523e8514b6e0505398894dfbe4e740af178c2c9a8c9e36e1fa8e879ff8aaf SHA512 c1acc1cd04f33cf1aaf4977690e49fbcfe3681c38574346af8a6c6933cf8d1dbeed97d1d7f3bb10dab19583987a542422a6f52eb9e411d88eb26c61a1d2b079d
+EBUILD dante-1.4.1-r6.ebuild 2694 BLAKE2B edf168174ddfdf936f54c70f92740e7cf67a134eeff76dcb36f8942c08fca5dedc492eb5e0a62f750a826e984ef978d06932aac5b37d7e62244ca8991cb7c410 SHA512 06b0c07dd52ed64cc7cb4efc490745c062206eaf431ee2e70ef981695de5ea38b0774c82cecc7dd9a7844b2b4b38aba9a2600be10f1f552a7fd71de13cc75d09
 MISC metadata.xml 212 BLAKE2B 3fa0112dac8ca387a2efccd5fcf038abfa26b67a2a512f3eb68491666f2ccb3fd63d1aa63044b0911aa6e5a8e856c762b3120045946afbf256611526d102558e SHA512 81dddbd7e6951957aa574cacaea6594ca44449251e028abd1a34e45e0b32dce1948c815478a65b4ed504364e4dd09f5a2c39d1f7019fc9b827a9ba28f52aca00
diff --git a/net-proxy/dante/dante-1.4.1-r5.ebuild b/net-proxy/dante/dante-1.4.1-r5.ebuild
deleted file mode 100644
index 76bd958c87e3..000000000000
--- a/net-proxy/dante/dante-1.4.1-r5.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="https://www.inet.no/dante/"
-SRC_URI="https://www.inet.no/dante/files/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="debug kerberos pam selinux static-libs tcpd upnp"
-
-CDEPEND="
-	kerberos? ( virtual/krb5 )
-	pam? ( sys-libs/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	upnp? ( net-libs/miniupnpc:= )
-	userland_GNU? ( sys-apps/shadow )
-"
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/sockd
-	acct-user/sockd
-	selinux? ( sec-policy/selinux-dante )
-"
-
-DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-socksify.patch
-	"${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch
-	"${FILESDIR}"/${PN}-1.4.0-cflags.patch
-	"${FILESDIR}"/${PN}-1.4.0-HAVE_SENDBUF_IOCTL.patch
-	"${FILESDIR}"/${PN}-1.4.1-sigpwr-siginfo.patch #517528
-	"${FILESDIR}"/${PN}-1.4.1-miniupnp14.patch #564680
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
-		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
-		-i doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
-		|| die
-
-	sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# hardcoded the libc name otherwise the scan on a amd64 multilib system
-	# ends up finding /usr/lib32/libc.so.5. That cascades and causes the
-	# preload/libdsocks to not be built.
-	econf \
-		--with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
-		--with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
-		--enable-preload \
-		--enable-clientdl \
-		--enable-serverdl \
-		--enable-drt-fallback \
-		--with-libc=libc.so.6 \
-		$(use_enable debug) \
-		$(use_with kerberos gssapi) \
-		$(use_with pam) \
-		$(use_with upnp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap)
-}
-
-src_install() {
-	default
-
-	# default configuration files
-	insinto /etc/socks
-	doins "${FILESDIR}"/sock?.conf
-	pushd "${ED}"/etc/socks > /dev/null
-	use pam && eapply -p0 "${FILESDIR}"/sockd.conf-with-pam.patch
-	use tcpd && eapply -p0 "${FILESDIR}"/sockd.conf-with-libwrap.patch
-	popd > /dev/null
-
-	# init script
-	newinitd "${FILESDIR}"/${PN}-1.3.2-sockd-init dante-sockd
-	newconfd "${FILESDIR}"/dante-sockd-conf dante-sockd
-
-	systemd_dounit "${FILESDIR}"/dante-sockd.service
-
-	# example configuration files
-	docinto examples
-	dodoc example/*.conf
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-proxy/dante/dante-1.4.1-r6.ebuild b/net-proxy/dante/dante-1.4.1-r6.ebuild
new file mode 100644
index 000000000000..6b433c56f7a1
--- /dev/null
+++ b/net-proxy/dante/dante-1.4.1-r6.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="A free socks4,5 and msproxy implementation"
+HOMEPAGE="https://www.inet.no/dante/"
+SRC_URI="https://www.inet.no/dante/files/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="debug kerberos pam selinux static-libs tcpd upnp"
+
+CDEPEND="
+	virtual/libcrypt:=
+	kerberos? ( virtual/krb5 )
+	pam? ( sys-libs/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	upnp? ( net-libs/miniupnpc:= )
+	userland_GNU? ( sys-apps/shadow )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/sockd
+	acct-user/sockd
+	selinux? ( sec-policy/selinux-dante )
+"
+
+DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-socksify.patch
+	"${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch
+	"${FILESDIR}"/${PN}-1.4.0-cflags.patch
+	"${FILESDIR}"/${PN}-1.4.0-HAVE_SENDBUF_IOCTL.patch
+	"${FILESDIR}"/${PN}-1.4.1-sigpwr-siginfo.patch #517528
+	"${FILESDIR}"/${PN}-1.4.1-miniupnp14.patch #564680
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
+		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
+		-i doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
+		|| die
+
+	sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# hardcoded the libc name otherwise the scan on a amd64 multilib system
+	# ends up finding /usr/lib32/libc.so.5. That cascades and causes the
+	# preload/libdsocks to not be built.
+	econf \
+		--with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
+		--with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
+		--enable-preload \
+		--enable-clientdl \
+		--enable-serverdl \
+		--enable-drt-fallback \
+		--with-libc=libc.so.6 \
+		$(use_enable debug) \
+		$(use_with kerberos gssapi) \
+		$(use_with pam) \
+		$(use_with upnp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	# default configuration files
+	insinto /etc/socks
+	doins "${FILESDIR}"/sock?.conf
+	pushd "${ED}"/etc/socks > /dev/null
+	use pam && eapply -p0 "${FILESDIR}"/sockd.conf-with-pam.patch
+	use tcpd && eapply -p0 "${FILESDIR}"/sockd.conf-with-libwrap.patch
+	popd > /dev/null
+
+	# init script
+	newinitd "${FILESDIR}"/${PN}-1.3.2-sockd-init dante-sockd
+	newconfd "${FILESDIR}"/dante-sockd-conf dante-sockd
+
+	systemd_dounit "${FILESDIR}"/dante-sockd.service
+
+	# example configuration files
+	docinto examples
+	dodoc example/*.conf
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 8dcb64c8eddd..2d89e64586c6 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -10,17 +10,17 @@ DIST haproxy-2.3.10.tar.gz 2942240 BLAKE2B 1fecbf3dde98b4839911e3e6437fa01ebf2e8
 DIST haproxy-2.3.12.tar.gz 2950703 BLAKE2B cd3aedaf82bc914d7d62d894187941f64f130b3a9019d5aeba08214f85acd928b7760ce9b5062ffcbc79f8378fa221b6d44b374dac924c33afd5bcc4c3b212ed SHA512 6f5dffaf80d88882848ca6df1fdd68fae17cbf039e311b54f622faa68c36007b827f4f2e71bc1260dd7a395bdc70637a9bac7ea7be414f1971172aaf5f474386
 DIST haproxy-2.4.1.tar.gz 3575591 BLAKE2B ae5d9f12cf2ef8e114f3ec65a3f636c81b3816ea8dd20635ebc2f2e62ed351463ea97f834a166e2d0e8debc168ef23cbe1fab2f4951a2528bb4e02720e59138f SHA512 6251f0ac77b7bceb349a174faff003bbe621490e5380dcdcd06bf712e13e0c94fd08a3651a62e68c862978031ca2fc9ac8432ea4c6062bb1c718db697030de9d
 DIST haproxy-2.4.2.tar.gz 3579220 BLAKE2B fc7f5d0c7ea8be103e74b8a62502c2ffd458ac4f573c7045ec64f66cab127408f5bf088109ac7a2c5f9faeca3580b804dc66b90654122873fe39ba2c01f31217 SHA512 8dc6386e0e0bf7ceed8b6c23ad2d608f6c59777c5ab9731e6bdd13883a31ec5faeee2ceb683589357c028a10c9fbe0a0247baff6825cd5b95e6c82cbe358e4d1
-EBUILD haproxy-1.8.30-r1.ebuild 4837 BLAKE2B 26a5dde732555de4c52f431b434f0da2ac5cd987b78d5e59843733a957ccbc5065cbbf2ead3777a49c5c14c82ee7671bee2346c20275162769fccd483b3a4a0b SHA512 57967a9c823303ec75167266515483d41fdf268efe4ce4758410b410542c58d4e78d9c4ea0e43956422a13882661023ce4d3a0d32148029ab31df02d71d2e3f2
-EBUILD haproxy-2.0.14-r3.ebuild 5374 BLAKE2B 3f78134a9664ea1657504c00b69bb6bbd549cce4a8e7a0937ab5a9106197376a0ecf5c2316a506472d2f69571c9f748afc73f3978c65c4832bc0d7ecbffed352 SHA512 8f8754662639d3cb8f423c72419e6350824be54b6072309d0a76481fc3b8c14b9afe74a8abaf6110a6bae9bd4d3fee5257e65d4215588f80bd7a44a432cc2947
-EBUILD haproxy-2.0.22-r1.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
-EBUILD haproxy-2.0.9999.ebuild 5255 BLAKE2B 8be39d642abc7d83e8dcb644b3d899d432628012786e81b0e318d7be2a661d931c7d8c98e8a737075fc9217078e190ad957de8a7972fd4ea68af7310a0873129 SHA512 d61ec07f2266a999eb7156a180a48e523d5e9b6dec06c28b6ed5de46e7d30283a67b43ac2827acaeb92cc4e40f409973004d8264b60f82feda08a27e759ae999
-EBUILD haproxy-2.2.14-r1.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
-EBUILD haproxy-2.2.5-r2.ebuild 5433 BLAKE2B d950a2af4fb256a93ae8408dc128a3517f53c713a960ff099e31c1e65813fd84aea65754de40af24dd80018d71185b8814750ab8c4c43d7bf5bd1ad8c41d1e1d SHA512 4026e4a4ac7df45ca589de96fb9d29dd01c9ee0f00173b910e53646a21e0e7ce540709499f5f2329efa4f21d4c6ac7c24efd4a304ec5bc22ed0c1d2c9e6fb32b
-EBUILD haproxy-2.2.9999.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
-EBUILD haproxy-2.3.10-r1.ebuild 5286 BLAKE2B 3d404dcaedfe5d35d1c7d2c8fa368587667a6cab6ce74200a70e0c6c864af03ec41391fd3b2619be7efb951c4596f85383cf43ad85790fc06065c8ceeffef57e SHA512 36bfc5b7c49567f7f73b1118c63fc267c81b65d221f7340cae02a0c461a60a76e9f5a37fe6b3212959cd4342e084ab2bf7dd7fcdbbeda899c0bfa52cd7216940
-EBUILD haproxy-2.3.12.ebuild 5286 BLAKE2B 3d404dcaedfe5d35d1c7d2c8fa368587667a6cab6ce74200a70e0c6c864af03ec41391fd3b2619be7efb951c4596f85383cf43ad85790fc06065c8ceeffef57e SHA512 36bfc5b7c49567f7f73b1118c63fc267c81b65d221f7340cae02a0c461a60a76e9f5a37fe6b3212959cd4342e084ab2bf7dd7fcdbbeda899c0bfa52cd7216940
-EBUILD haproxy-2.3.9999.ebuild 5286 BLAKE2B 3d404dcaedfe5d35d1c7d2c8fa368587667a6cab6ce74200a70e0c6c864af03ec41391fd3b2619be7efb951c4596f85383cf43ad85790fc06065c8ceeffef57e SHA512 36bfc5b7c49567f7f73b1118c63fc267c81b65d221f7340cae02a0c461a60a76e9f5a37fe6b3212959cd4342e084ab2bf7dd7fcdbbeda899c0bfa52cd7216940
-EBUILD haproxy-2.4.1-r1.ebuild 5596 BLAKE2B dffc5406de3de58636319929e2ffd815a38b8c3dcdf9725de37ff9ce2a49def84d1c2bdf3960570f06ebfd3072f8d653a3688d5bf518d01b581f7e886adc856e SHA512 a1678e0082ecea92def7aa8418e1a5c151c708deadb1b33cc2f6d70a2b58f58b6bae30225ffc9bfd8de48b149eb7e7cea2b50b1d3208a29b20a77b11e5296774
-EBUILD haproxy-2.4.2.ebuild 5596 BLAKE2B dffc5406de3de58636319929e2ffd815a38b8c3dcdf9725de37ff9ce2a49def84d1c2bdf3960570f06ebfd3072f8d653a3688d5bf518d01b581f7e886adc856e SHA512 a1678e0082ecea92def7aa8418e1a5c151c708deadb1b33cc2f6d70a2b58f58b6bae30225ffc9bfd8de48b149eb7e7cea2b50b1d3208a29b20a77b11e5296774
-EBUILD haproxy-2.4.9999.ebuild 5596 BLAKE2B dffc5406de3de58636319929e2ffd815a38b8c3dcdf9725de37ff9ce2a49def84d1c2bdf3960570f06ebfd3072f8d653a3688d5bf518d01b581f7e886adc856e SHA512 a1678e0082ecea92def7aa8418e1a5c151c708deadb1b33cc2f6d70a2b58f58b6bae30225ffc9bfd8de48b149eb7e7cea2b50b1d3208a29b20a77b11e5296774
+EBUILD haproxy-1.8.30-r1.ebuild 4957 BLAKE2B f3e1cbb6527f82f778f3f91ad60325149785a194412744c396e8ff245abd18febc04a0a442fd5f3413efd848d4ba580ba53fe46c74d09857278f3beddbf9391c SHA512 8f93cccad5a28dc83e153381163a2808aa6c0551a87b988823f167610a0dcf4b3b0b6e0bc8a8f5d3645f5ed3dc49e191410c260ddb40d2724cf87c8bdc8c4d56
+EBUILD haproxy-2.0.14-r3.ebuild 5494 BLAKE2B a6efb4609772ffd91f4899f25f2a01ba9f3c78fed7d135390c471f39450abec57d3a6dc1dd9920a47cb594f1dee6961501c9b33888f1f2d468205a84546b1313 SHA512 2b3021e1fbd1de2a6463b923db6d0cdd5300b7fbef481fd908049f002bc904424236722aea066e4eff7d5521043e68275030ac5d19b8f550e5687bd2d7d964e2
+EBUILD haproxy-2.0.22-r1.ebuild 5497 BLAKE2B 6c1b0208a38102c6117501816630c2d2fe98e17476272b329d0deac7727f1088e93e83c1d62d04c8de91057187559729bc73cc47f6a53f747972173448a6d1b3 SHA512 7d5a714596536a4de323c6d4b00e8e7ad07b4e3216aa4b53430746b2475482cfeb587675df723b662ffbb24fa11782bc11ff10715cde2522e3d4017672fbaccc
+EBUILD haproxy-2.0.9999.ebuild 5375 BLAKE2B 1cd0568fef4b2a780e92d9c38ab81824a0b2c58e6c2efb8089e0149fbfd97fcab686f273d725e562ed21708c9e42f155f068ef91ddad182ae5eed19758fcf7f1 SHA512 e3b20b5e12fc5491530958221e1950b341e5a0ec4cc7a987058fb3f7726ab09f3e210a430a17975a556d03bb05c3e1ee12ccf31dedf8e5e938021fa0a2a73aab
+EBUILD haproxy-2.2.14-r1.ebuild 5497 BLAKE2B 6c1b0208a38102c6117501816630c2d2fe98e17476272b329d0deac7727f1088e93e83c1d62d04c8de91057187559729bc73cc47f6a53f747972173448a6d1b3 SHA512 7d5a714596536a4de323c6d4b00e8e7ad07b4e3216aa4b53430746b2475482cfeb587675df723b662ffbb24fa11782bc11ff10715cde2522e3d4017672fbaccc
+EBUILD haproxy-2.2.5-r2.ebuild 5553 BLAKE2B 13e8bffe7cb811a922a8ee942661d6dae2feea11620ca4e9053b466e62de1289a21d22cff68f6c0c9859d8b60a4d4048f230774ec1b88a998c95fb7f0656072f SHA512 a1262be1df48b4fc3c90cc978465bf748b3f2fda92be922c4cf399c463d74454ebca2f2d75cb3c8ba46871659f9cb9626b8cd3393f54d706e17f7cc65ae89022
+EBUILD haproxy-2.2.9999.ebuild 5497 BLAKE2B 6c1b0208a38102c6117501816630c2d2fe98e17476272b329d0deac7727f1088e93e83c1d62d04c8de91057187559729bc73cc47f6a53f747972173448a6d1b3 SHA512 7d5a714596536a4de323c6d4b00e8e7ad07b4e3216aa4b53430746b2475482cfeb587675df723b662ffbb24fa11782bc11ff10715cde2522e3d4017672fbaccc
+EBUILD haproxy-2.3.10-r1.ebuild 5406 BLAKE2B 16fc3419b214b36b1549dfbb381d765fe2b6928b9e59c8a70e92f1bed201b318d886d968794a17f5d9e6b0b2b313c34fc3c251ec58997adaac73b94f7b044ab0 SHA512 d8a82e34b9da85c0450363e595a7c0a3cc198de910ed6c2f2619550611e6944e8075a9a93a32b344b0055fd2792ac3c7a7ed6d434eb3661fcff025ccaa3a7383
+EBUILD haproxy-2.3.12.ebuild 5406 BLAKE2B 16fc3419b214b36b1549dfbb381d765fe2b6928b9e59c8a70e92f1bed201b318d886d968794a17f5d9e6b0b2b313c34fc3c251ec58997adaac73b94f7b044ab0 SHA512 d8a82e34b9da85c0450363e595a7c0a3cc198de910ed6c2f2619550611e6944e8075a9a93a32b344b0055fd2792ac3c7a7ed6d434eb3661fcff025ccaa3a7383
+EBUILD haproxy-2.3.9999.ebuild 5406 BLAKE2B 16fc3419b214b36b1549dfbb381d765fe2b6928b9e59c8a70e92f1bed201b318d886d968794a17f5d9e6b0b2b313c34fc3c251ec58997adaac73b94f7b044ab0 SHA512 d8a82e34b9da85c0450363e595a7c0a3cc198de910ed6c2f2619550611e6944e8075a9a93a32b344b0055fd2792ac3c7a7ed6d434eb3661fcff025ccaa3a7383
+EBUILD haproxy-2.4.1-r1.ebuild 5716 BLAKE2B 393dfa2861333ddec855ca6f606276da1b95e0b12d1832317e3126351db5fb13910da014839c310d5ecda8fdf5a850f5b53aa9fd5f38365e9bc94f57586ce0d0 SHA512 711d1321262ee4c7d395d95de2a2db6ed34e47d599259fa8562546e20c9ce3d7ed82789aa5a79cbb790891ab4732f0df9f229ff7db34b7b2233c33b14ac020b3
+EBUILD haproxy-2.4.2.ebuild 5716 BLAKE2B 393dfa2861333ddec855ca6f606276da1b95e0b12d1832317e3126351db5fb13910da014839c310d5ecda8fdf5a850f5b53aa9fd5f38365e9bc94f57586ce0d0 SHA512 711d1321262ee4c7d395d95de2a2db6ed34e47d599259fa8562546e20c9ce3d7ed82789aa5a79cbb790891ab4732f0df9f229ff7db34b7b2233c33b14ac020b3
+EBUILD haproxy-2.4.9999.ebuild 5716 BLAKE2B 393dfa2861333ddec855ca6f606276da1b95e0b12d1832317e3126351db5fb13910da014839c310d5ecda8fdf5a850f5b53aa9fd5f38365e9bc94f57586ce0d0 SHA512 711d1321262ee4c7d395d95de2a2db6ed34e47d599259fa8562546e20c9ce3d7ed82789aa5a79cbb790891ab4732f0df9f229ff7db34b7b2233c33b14ac020b3
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
index 90d010744750..e6b1932baf9b 100644
--- a/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
index 49cfe55e3a3f..68db0dd89896 100644
--- a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
index 42c17e31be40..6335de9e4750 100644
--- a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index 0dd6f7085108..41c1558bb74b 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	systemd? ( sys-apps/systemd )
 	slz? ( dev-libs/libslz:= )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
index 42c17e31be40..6335de9e4750 100644
--- a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
index f773d9548c6c..5ef90b045a36 100644
--- a/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -67,6 +71,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 42c17e31be40..6335de9e4750 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
index 143c6394abda..56c62e7ad7df 100644
--- a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.3.12.ebuild b/net-proxy/haproxy/haproxy-2.3.12.ebuild
index 143c6394abda..56c62e7ad7df 100644
--- a/net-proxy/haproxy/haproxy-2.3.12.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.12.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.3.9999.ebuild b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
index 143c6394abda..56c62e7ad7df 100644
--- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
index 31171c86ed5b..9183ede9a103 100644
--- a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -43,7 +47,7 @@ DEPEND="
 	)
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -61,6 +65,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.4.2.ebuild b/net-proxy/haproxy/haproxy-2.4.2.ebuild
index 31171c86ed5b..9183ede9a103 100644
--- a/net-proxy/haproxy/haproxy-2.4.2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.2.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -43,7 +47,7 @@ DEPEND="
 	)
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -61,6 +65,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 31171c86ed5b..9183ede9a103 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -43,7 +47,7 @@ DEPEND="
 	)
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -61,6 +65,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/redsocks/Manifest b/net-proxy/redsocks/Manifest
index c3b182c37d09..8935f83e3443 100644
--- a/net-proxy/redsocks/Manifest
+++ b/net-proxy/redsocks/Manifest
@@ -1,9 +1,7 @@
 AUX redsocks.conf 350 BLAKE2B 52bf1cb52f94d7eb2ab151905fb8b66644868c9cfb72b1d73951b0442bb300062f5c7b7776f80d1c74733a3980f73aecbc75b1b7364c5dc0bccc9d324b5504d5 SHA512 c6ce0622a54fafef31f40ed01b210c5ffb9af0504303fc5d2a4fb335ac3617fc7832c16b0885471e6f1eea168a0e4aa490089a00fd28e26ce0f9b59db0ac238b
-AUX redsocks.init 1282 BLAKE2B 1efeb84d25630df8501b53d36f056a62733ab2f1c40a591d1c2b321224e3ed526fae1a0cbb4502c233c66b2c7c0541c0893311b749fb486176b978d79b10097b SHA512 81af76d7917273028cda3fa62e2c04ae27f763d93c6abac12c9b47877ae64918b4b07ed680fefb0e11ac3476c3f490f5e6d315ba8b0cf9a40b756cd32fc5234c
-AUX redsocks.init-r1 926 BLAKE2B b167e64335e45806c2791e72667f984f7b9ffb23d2be6c38bc4575d8487320eeb8ae270c0940fc4c198d7064323f3ba561c6954657fb4015a62f30d00ae06274 SHA512 c8c52571fd167d9ca6bb75e5b44741e87f5c57b6752b16026691a71a932cfa55ed43d186cd9d662997020faf370ce3e797ccc555e641149d5f5f8e43bb94901c
+AUX redsocks.init-r2 983 BLAKE2B 66e08407136d5c57d93ef4523a0f8d04dbd6a0213b0455c602e39a06df5b80341d8b6eaea24df5bafaa2d9e8c1d60a93095cecd0d21c971b46dc56aa36f15013 SHA512 f3eb3a99bf5687395b3a3460455db49f9a8c720735c0f96204b8e3bfab232f2e9c3824f360b363675d8997cdfbbece8cd94c80c5fa3365752f22c5d3b0e97488
 AUX redsocks.service 437 BLAKE2B 919055f6cd25a605b3cff1ad63e69579975868952ef362ddf6f025404a0109e159af51854ef3d24663322f1515508b2dfe89b00bc53070a63d515b3bcd0858a8 SHA512 73d2b6df7d1688b2605ec56f1843de1b58a5e3d8e88267cd99aa774303f8184ff5c7756b4fdd7215e3ccba8637eb8e41dac121fbe0339730fa1e51943957ce27
 DIST redsocks-0.5.tar.gz 496403 BLAKE2B 7416340a7142669c72a8aeebc2c0775a393781de7fcbb63e4fbc71ce828658bc2b0615b394a990683c9fd13f41f050c92609dd956b4468bb06ec1ff261324c23 SHA512 678faca95b3570f793754abfe752b3d3580ea125aac8615ca2a1fce92cd50e7919832afe7cf5d1cc40b700045fca08f86ea1697d062ac8e7be706d166e69ff70
-EBUILD redsocks-0.5-r1.ebuild 1130 BLAKE2B 4f67d7a965df21a88953fb1150b702fffe6ec31c3512bd967a7cdac4abe063fc8242ba6df9a14eda38c7e8dcae11589c0a5ac2b9411b60f261782a5007a8501a SHA512 49a61fb4abf69bcf23fb34d95143052430d19a4a65dc469aafcd3354a5de7428fc07b9878b22acc89ce67d4d582cf19828ce6475995c077cfb2af71f1902a179
-EBUILD redsocks-0.5.ebuild 1130 BLAKE2B 3fb70113213f328699d3a3649d4453c74e252ef7c20bc377587b0b21ae099df730aa8e922d265ca71368bf4ad6b89ebd0080128d58da9167895da32b886c0619 SHA512 c832d72a0858e49c70807c825518c5d4bd68a689234f2087ad37aca39f26130498d2753b059651f39f7897be4cb41a589e8ee4e0a66c1c1df318a975e2ec7bc7
-EBUILD redsocks-9999.ebuild 1130 BLAKE2B 3fb70113213f328699d3a3649d4453c74e252ef7c20bc377587b0b21ae099df730aa8e922d265ca71368bf4ad6b89ebd0080128d58da9167895da32b886c0619 SHA512 c832d72a0858e49c70807c825518c5d4bd68a689234f2087ad37aca39f26130498d2753b059651f39f7897be4cb41a589e8ee4e0a66c1c1df318a975e2ec7bc7
+EBUILD redsocks-0.5-r2.ebuild 1060 BLAKE2B c8c52c9be1ae3f1d0ef6cf063ad668a9f6d793cbb25861a6a23978c26482ec10d47f97ffeb2ed2d432a314be24f00dfe10a954c176e03617ea4f794828152946 SHA512 0878adddcd6e1e117e4faaa50d9f540639d9aa96807035c5a88cabe605350e33e9bb96b94640a284c39c1f57ddf71aa02713d3f3e4eeb0991e387ed0d97986d5
+EBUILD redsocks-9999.ebuild 1060 BLAKE2B c8c52c9be1ae3f1d0ef6cf063ad668a9f6d793cbb25861a6a23978c26482ec10d47f97ffeb2ed2d432a314be24f00dfe10a954c176e03617ea4f794828152946 SHA512 0878adddcd6e1e117e4faaa50d9f540639d9aa96807035c5a88cabe605350e33e9bb96b94640a284c39c1f57ddf71aa02713d3f3e4eeb0991e387ed0d97986d5
 MISC metadata.xml 1060 BLAKE2B b7db194e1155a93ff22b6ca713a442ae08f21ae27f9835e0f3ec09ccf86d4f33fa2d4da20251c58acdbeeeaa6bef3fe95de7e22f67eae2acf28406f53e494569 SHA512 5b48446a0edf223af4775df8ebf02b71112cbda5494853e97c0dfaa7aaeecc2529af8c340ab36507c96eaaade07e6ac73bcf51d23acc4a5ddaaf69bbe093a321
diff --git a/net-proxy/redsocks/files/redsocks.init b/net-proxy/redsocks/files/redsocks.init
deleted file mode 100644
index 853d9b57a6bb..000000000000
--- a/net-proxy/redsocks/files/redsocks.init
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${REDSOCKS_BINARY:=/usr/sbin/redsocks}
-: ${REDSOCKS_CONFIG:=/etc/redsocks.conf}
-: ${REDSOCKS_PIDFILE:=/run/redsocks/redsocks.pid}
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f "${REDSOCKS_CONFIG}" ] ; then
-		eerror "No ${REDSOCKS_CONFIG} file exists!"
-		return 1
-	fi
-
-        "${REDSOCKS_BINARY}" -t -c ${REDSOCKS_CONFIG} || return 1
-}
-
-start() {
-        checkconfig || return 1
-
-        ebegin "Starting ${SVCNAME}"
-        start-stop-daemon --start --exec "${REDSOCKS_BINARY}" \
-            -p "${REDSOCKS_PIDFILE}" -c ${REDSOCKS_CONFIG}
-        eend $?
-}
-
-stop() {
-        if [ "${RC_CMD}" = "restart" ] ; then
-                checkconfig || return 1
-        fi
-
-        ebegin "Stopping ${SVCNAME}"
-        start-stop-daemon --stop --exec "${REDSOCKS_BINARY}" \
-            -p "${REDSOCKS_PIDFILE}" -c "${REDSOCKS_CONFIG}"
-        eend $?
-}
-
-reload() {
-        checkconfig || return 1
-
-        ebegin "Reloading ${SVCNAME}"
-        start-stop-daemon --signal HUP --exec "${REDSOCKS_BINARY}" \
-	    -p "${REDSOCKS_PIDFILE}" -c "${REDSOCKS_CONFIG}"
-        eend $?
-}
diff --git a/net-proxy/redsocks/files/redsocks.init-r1 b/net-proxy/redsocks/files/redsocks.init-r1
deleted file mode 100644
index 861054fc914a..000000000000
--- a/net-proxy/redsocks/files/redsocks.init-r1
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command=${REDSOCKS_BINARY:=/usr/sbin/redsocks}
-: ${REDSOCKS_CONFIG:=/etc/redsocks.conf}
-pidfile=${REDSOCKS_PIDFILE:=/run/redsocks/redsocks.pid}
-command_args="-p ${pidfile} -c ${REDSOCKS_CONFIG}"
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f "${REDSOCKS_CONFIG}" ] ; then
-		eerror "No ${REDSOCKS_CONFIG} file exists!"
-		return 1
-	fi
-
-        "${command}" -t -c ${REDSOCKS_CONFIG} || return 1
-}
-
-start_pre() {
-        checkconfig || return 1
-}
-
-stop_pre() {
-        if [ "${RC_CMD}" = "restart" ] ; then
-                checkconfig || return 1
-        fi
-}
-
-reload() {
-        checkconfig || return 1
-
-        ebegin "Reloading ${SVCNAME}"
-        start-stop-daemon --signal HUP --pidfile "${pidfile}"
-        eend $?
-}
diff --git a/net-proxy/redsocks/files/redsocks.init-r2 b/net-proxy/redsocks/files/redsocks.init-r2
new file mode 100644
index 000000000000..8ea9998a5da3
--- /dev/null
+++ b/net-proxy/redsocks/files/redsocks.init-r2
@@ -0,0 +1,45 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=${REDSOCKS_BINARY:=/usr/sbin/redsocks}
+: ${REDSOCKS_CONFIG:=/etc/redsocks.conf}
+pidfile=${REDSOCKS_PIDFILE:=/run/redsocks/redsocks.pid}
+command_args="-p ${pidfile} -c ${REDSOCKS_CONFIG}"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	use dns
+}
+
+checkconfig() {
+	if [ ! -f "${REDSOCKS_CONFIG}" ] ; then
+		eerror "No ${REDSOCKS_CONFIG} file exists!"
+		return 1
+	fi
+
+        "${command}" -t -c ${REDSOCKS_CONFIG} || return 1
+
+	checkpath -d -o "redsocks:redsocks" -q "/run/redsocks"
+}
+
+start_pre() {
+        checkconfig || return 1
+}
+
+stop_pre() {
+        if [ "${RC_CMD}" = "restart" ] ; then
+                checkconfig || return 1
+        fi
+}
+
+reload() {
+        checkconfig || return 1
+
+        ebegin "Reloading ${SVCNAME}"
+        start-stop-daemon --signal HUP --pidfile "${pidfile}"
+        eend $?
+}
diff --git a/net-proxy/redsocks/redsocks-0.5-r1.ebuild b/net-proxy/redsocks/redsocks-0.5-r1.ebuild
deleted file mode 100644
index 665f5a700021..000000000000
--- a/net-proxy/redsocks/redsocks-0.5-r1.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
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/darkk/${PN}.git"
-fi
-
-inherit systemd toolchain-funcs user ${GIT_ECLASS}
-
-DESCRIPTION="Transparent redirector of any TCP connection to proxy"
-HOMEPAGE="http://darkk.net.ru/redsocks/"
-LICENSE="Apache-2.0 LGPL-2.1+ ZLIB"
-SLOT="0"
-IUSE="doc"
-RESTRICT="test"
-
-DEPEND="dev-libs/libevent:0="
-RDEPEND="${DEPEND}
-	net-firewall/iptables"
-
-[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}"
-
-pkg_setup() {
-	enewgroup redsocks
-	enewuser redsocks -1 -1 /run/redsocks redsocks
-}
-
-src_compile() {
-	CC="$(tc-getCC)" emake
-}
-
-src_install() {
-	dosbin redsocks
-	doman debian/redsocks.8
-	use doc && dodoc README doc/*
-	insinto /etc
-	newins debian/redsocks.conf redsocks.conf
-
-	newinitd "${FILESDIR}"/redsocks.init-r1 redsocks
-	newconfd "${FILESDIR}"/redsocks.conf redsocks
-
-	systemd_dounit "${FILESDIR}"/redsocks.service
-}
diff --git a/net-proxy/redsocks/redsocks-0.5-r2.ebuild b/net-proxy/redsocks/redsocks-0.5-r2.ebuild
new file mode 100644
index 000000000000..5a182c79906f
--- /dev/null
+++ b/net-proxy/redsocks/redsocks-0.5-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/"${PN}"-release-"${PV}"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/darkk/${PN}.git"
+fi
+
+inherit systemd toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="Transparent redirector of any TCP connection to proxy"
+HOMEPAGE="http://darkk.net.ru/redsocks/"
+LICENSE="Apache-2.0 LGPL-2.1+ ZLIB"
+SLOT="0"
+IUSE="doc"
+RESTRICT="test"
+
+DEPEND="dev-libs/libevent:0="
+RDEPEND="
+	${DEPEND}
+	acct-group/redsocks
+	acct-user/redsocks
+	net-firewall/iptables
+"
+
+src_compile() {
+	CC="$(tc-getCC)" emake
+}
+
+src_install() {
+	dosbin redsocks
+	doman debian/redsocks.8
+	use doc && dodoc README doc/*
+	insinto /etc
+	newins debian/redsocks.conf redsocks.conf
+
+	newinitd "${FILESDIR}"/redsocks.init-r2 redsocks
+	newconfd "${FILESDIR}"/redsocks.conf redsocks
+
+	systemd_dounit "${FILESDIR}"/redsocks.service
+}
diff --git a/net-proxy/redsocks/redsocks-0.5.ebuild b/net-proxy/redsocks/redsocks-0.5.ebuild
deleted file mode 100644
index 187dcecd68ad..000000000000
--- a/net-proxy/redsocks/redsocks-0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/darkk/${PN}.git"
-fi
-
-inherit systemd toolchain-funcs user ${GIT_ECLASS}
-
-DESCRIPTION="Transparent redirector of any TCP connection to proxy"
-HOMEPAGE="http://darkk.net.ru/redsocks/"
-LICENSE="Apache-2.0 LGPL-2.1+ ZLIB"
-SLOT="0"
-IUSE="doc"
-RESTRICT="test"
-
-DEPEND="dev-libs/libevent:0="
-RDEPEND="${DEPEND}
-	net-firewall/iptables"
-
-[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}"
-
-pkg_setup() {
-	enewgroup redsocks
-	enewuser redsocks -1 -1 /run/redsocks redsocks
-}
-
-src_compile() {
-	CC="$(tc-getCC)" emake
-}
-
-src_install() {
-	dosbin redsocks
-	doman debian/redsocks.8
-	use doc && dodoc README doc/*
-	insinto /etc
-	newins debian/redsocks.conf redsocks.conf
-
-	newinitd "${FILESDIR}"/redsocks.init redsocks
-	newconfd "${FILESDIR}"/redsocks.conf redsocks
-
-	systemd_dounit "${FILESDIR}"/redsocks.service
-}
diff --git a/net-proxy/redsocks/redsocks-9999.ebuild b/net-proxy/redsocks/redsocks-9999.ebuild
index 187dcecd68ad..5a182c79906f 100644
--- a/net-proxy/redsocks/redsocks-9999.ebuild
+++ b/net-proxy/redsocks/redsocks-9999.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/"${PN}"-release-"${PV}"
 	KEYWORDS="~amd64 ~x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/darkk/${PN}.git"
 fi
 
-inherit systemd toolchain-funcs user ${GIT_ECLASS}
+inherit systemd toolchain-funcs ${GIT_ECLASS}
 
 DESCRIPTION="Transparent redirector of any TCP connection to proxy"
 HOMEPAGE="http://darkk.net.ru/redsocks/"
@@ -21,15 +22,12 @@ IUSE="doc"
 RESTRICT="test"
 
 DEPEND="dev-libs/libevent:0="
-RDEPEND="${DEPEND}
-	net-firewall/iptables"
-
-[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}"
-
-pkg_setup() {
-	enewgroup redsocks
-	enewuser redsocks -1 -1 /run/redsocks redsocks
-}
+RDEPEND="
+	${DEPEND}
+	acct-group/redsocks
+	acct-user/redsocks
+	net-firewall/iptables
+"
 
 src_compile() {
 	CC="$(tc-getCC)" emake
@@ -42,7 +40,7 @@ src_install() {
 	insinto /etc
 	newins debian/redsocks.conf redsocks.conf
 
-	newinitd "${FILESDIR}"/redsocks.init redsocks
+	newinitd "${FILESDIR}"/redsocks.init-r2 redsocks
 	newconfd "${FILESDIR}"/redsocks.conf redsocks
 
 	systemd_dounit "${FILESDIR}"/redsocks.service
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index fab5ef80b48d..d9eaeabdb4ee 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index a02b7f87c25b..9f7ba98348c3 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,6 +1,7 @@
-AUX i2p-0.9.47-DataHelper-decompress-fix-length-check.patch 1110 BLAKE2B 9e34a568f94baed130c6f9dd3cda2f6ae6e409d7c41bff8fca5226fa6e84d989b46e84672440c8dcfb861d237075093c8a7bfab50d7b2385ca376e11524bc876 SHA512 204150b938fafe5b521d381ed6c517624cec3b47d564d84ae21e7884d87348a3fd4387b193e466df5c152f6262e29e1e88f9f970a78cf516839099b16fd5938a
 AUX i2p.init 391 BLAKE2B e62a23021db61ba93adaf1ff9c2f0bb9372cee3921544c9ca498f3472dc64c700a0fb78d2fed9dafc0fa98c97670f67266a2e0f8c594c7c1352d15e1b23d7586 SHA512 12c69b2c5918a23219d84f2c1ded286ced6f78564241372bead318ddcb77876e90c800735f7ed6e92c03f69dfeb990ec43e40efd1e9ee32888b404d1e2e9643a
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
 DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
+DIST i2psource_0.9.50.tar.bz2 32409456 BLAKE2B 0c45b48ae6e1957b6c5d828757c70489d260fe15276559e5c366c68c10274b9020b2978bf0674a8628638f41b1e269af0c4d35c20c1f0cee419857c0c803dd82 SHA512 2d6b1d3ed4d32af36d0d3b257dca6fad981e3fa0cd3e45b8227e76e57de092c11ff7c239e879739d330ae809bcf6c71640de32de0c52c54ef8597f0c0e1467ec
 EBUILD i2p-0.9.48.ebuild 4767 BLAKE2B afe3a7ff68167e428630be309ee2aaa7241c8b07318ac0e736040f33366183dbdf49e2bdc0e80e9579b83c06e3373a0e7397d0aa16e82411d203a979031037e4 SHA512 dab89bf22336afad01ba285b64b893a22b627122c675697ca9d73fc9a9132b99cf0cc44fd3e009fdcdc1e819be5a3be2bf1b219a9b9133f0ef0560348fd3db6a
+EBUILD i2p-0.9.50.ebuild 4799 BLAKE2B 895096a59bffbff9345f8c8250ad92b5bbe30c58c515bf8be1f2380c1acf2cbd718a51d57a6406e217af969fe1838a7c51f6f517a09cf2c25d717551b92b0306 SHA512 e76c98981e9e17046d30ba626a01a30ed2e5be9335bea79417baac0a618a5c0b70b9e8c6696be30a0f88f38414e36ddfc112dc796a11ed6ccb48850eb34221c5
 MISC metadata.xml 739 BLAKE2B 68bcb6a0d90cad753651e15a66cf169d6a7649eecb25917bd03ca1489d7cfc7e49bf54f84ec05149689802f9ddedd4d6421a0c0281a4684a55b854e04e6c0734 SHA512 e161bd04600c577d14beef7e95a58da20661555a481a9993a56daaa0f219b15d1e2f5502464a407645973d84ed0092cefb172d8565ac4fca3b592dd412bf96b5
diff --git a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch b/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
deleted file mode 100644
index b728cc28cb15..000000000000
--- a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# from https://trac.i2p2.de/ticket/2770
-From ceb0749e0d5c3c496b4a91bc3a9d3b5e296fc456 Mon Sep 17 00:00:00 2001
-From: zzz <zzz@mail.i2p>
-Date: Wed, 2 Sep 2020 15:57:04 +0000
-Subject: [PATCH] Util: Fix decompression of compressed zero bytes (ticket
- #2770)
-
----
- core/java/src/net/i2p/data/DataHelper.java | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
-index aaa47797c3..39f766e6fa 100644
---- a/core/java/src/net/i2p/data/DataHelper.java
-+++ b/core/java/src/net/i2p/data/DataHelper.java
-@@ -1902,7 +1902,8 @@ public static String unescapeHTML(String escaped) {
-      */
-     public static byte[] decompress(byte orig[], int offset, int length) throws IOException {
-         if (orig == null) return orig;
--        if (length < 23)
-+        // normal overhead is 23 bytes, but a compress of zero bytes is 20 bytes
-+        if (length < 20)
-             throw new IOException("length");
-         if (length < 65559 && orig[offset + 10] == 0x01)
-             return zeroDecompress(orig, offset, length);
diff --git a/net-vpn/i2p/i2p-0.9.50.ebuild b/net-vpn/i2p/i2p-0.9.50.ebuild
new file mode 100644
index 000000000000..3468bcd0dd19
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.50.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2 systemd
+
+DESCRIPTION="A privacy-centric, anonymous network"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
+SLOT="0"
+
+# Until the deps reach other arches
+KEYWORDS="~amd64 ~x86"
+IUSE="nls test"
+RESTRICT="!test? ( test )"
+
+# dev-java/ant-core is automatically added due to java-ant-2.eclass
+CP_DEPEND="
+	dev-java/java-service-wrapper:0
+	dev-java/tomcat-servlet-api:4.0
+"
+
+DEPEND="${CP_DEPEND}
+	dev-java/eclipse-ecj:*
+	nls? ( >=sys-devel/gettext-0.19 )
+	virtual/jdk:1.8
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+		dev-java/mockito:0
+	)
+"
+
+RDEPEND="${CP_DEPEND}
+	acct-user/i2p
+	acct-group/i2p
+	virtual/jre:1.8
+	net-libs/nativebiginteger:0
+"
+
+EANT_BUILD_TARGET="pkg"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET="junit.test"
+JAVA_ANT_ENCODING="UTF-8"
+
+src_prepare() {
+	if use test; then
+		# no *streaming as requiring >dev-java/mockito-1.9.5
+		sed -e "/streaming.*junit\.test/d" \
+			-i build.xml ||
+			die "unable to remove ministreaming tests"
+	fi
+
+	# as early as possible to allow generic patches to be applied
+	default
+
+	java-ant_rewrite-classpath
+
+	java-pkg-2_src_prepare
+
+	# We're on GNU/Linux, we don't need .exe files
+	echo "noExe=true" > override.properties || die
+	if ! use nls; then
+		echo "require.gettext=false" >> override.properties || die
+	fi
+
+	# avoid auto starting browser
+	sed -i "s|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|" \
+		installer/resources/clients.config || die
+
+	# generate wrapper classpath, keeping the default to be replaced later
+	i2p_cp="" # global forced by java-pkg_gen-cp
+	java-pkg_gen-cp i2p_cp
+	local lib i=2
+	local classpath="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n"
+	for lib in ${i2p_cp//,/ }
+	do
+		classpath+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
+	done
+
+	# add generated classpath, hardcode system VM, setting system's conf
+	sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${classpath}|" \
+		-e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
+		-e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/$(get_libdir)/java-service-wrapper|" \
+		-e "s|\(wrapper\.java\.library\.path\)\.2=.*|\1.2=${EPREFIX}/usr/share/i2p/lib\n\1.3=/usr/$(get_libdir)|" \
+		-e "s|\(wrapper\.java\.additional\.1=-DloggerFilenameOverride\)=.*|\1=${EPREFIX}/var/log/i2p/router-@|" \
+		-e "s|\(wrapper\.logfile\)=.*|\1=${EPREFIX}/var/log/i2p/wrapper|" \
+		-e "/wrapper\.java\.additional\.2\(\.stripquote\|\)/d" \
+		-i installer/resources/wrapper.config ||
+		die "unable to apply gentoo config"
+	local prop i=2
+	for prop in \
+		"i2p.dir.base=${EPREFIX}/usr/share/i2p" \
+		"i2p.dir.app=${EPREFIX}/var/lib/i2p/app" \
+		"i2p.dir.config=${EPREFIX}/var/lib/i2p/config" \
+		"i2p.dir.router=${EPREFIX}/var/lib/i2p/router" \
+		"i2p.dir.log=${EPREFIX}/var/log/i2p" \
+		"i2p.dir.pid=${EPREFIX}/tmp" \
+		"i2p.dir.temp=${EPREFIX}/tmp"
+	do
+		echo "wrapper.java.additional.$((i++))=-D$prop" >> installer/resources/wrapper.config ||
+			die "unable to apply gentoo config"
+	done
+}
+
+src_test() {
+	# store built version of jars, overwritten by testing
+	mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
+		die "unable to save jars before tests"
+
+	# generate test classpath
+	local classpath
+	classpath="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3,mockito)"
+	EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${classpath}" java-pkg-2_src_test
+
+	# redo work undone by testing
+	mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
+		die "unable to restore jars after tests"
+}
+
+src_install() {
+	# cd into pkg-temp.
+	cd "${S}/pkg-temp" || die
+
+	# we remove system installed jar and install the others
+	rm lib/{javax.servlet,wrapper}.jar || \
+		die "unable to remove locally built jar already found in system"
+	java-pkg_dojar lib/*.jar
+
+	# create own launcher
+	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+
+	# Install main files and basic documentation
+	insinto "/usr/share/i2p"
+	doins blocklist.txt hosts.txt *.config
+	dodoc history.txt INSTALL-headless.txt LICENSE.txt
+	doman man/*
+
+	# Install other directories
+	doins -r certificates docs eepsite geoip scripts
+	java-pkg_dowar webapps/*.war
+
+	# Install daemon files
+	newinitd "${FILESDIR}/i2p.init" i2p
+	systemd_dounit "${FILESDIR}/i2p.service"
+
+	# setup log
+	keepdir /var/log/i2p
+	fowners i2p:i2p /var/log/i2p
+
+	# setup user
+	keepdir /var/lib/i2p
+	fowners i2p:i2p /var/lib/i2p
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 22dc25a5d736..f46b3eb3da4d 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 351c2f1bbc9c..044e36198db9 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,16 +1,12 @@
 AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch 1912 BLAKE2B c7226ccbf1b794b5f3d6504dcb6950bc7e7bd69995243d0e4cf30dfb161f95e15c18c96724f82916e8c83cac6ff255ed957b60c9ee9ad53e108c69eb509074d5 SHA512 65a970fa82ded9f6e97ef2f0d856010f96468cbd375447e1c47d6073be5a364f747b7b5ea93a0bc3b7dba0470dc8dccd9b5d1f6567f18b38042e424d3e06171b
 AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce6d00ea244d91e76b696e60ddb9096aa48572b68474f321f05b0e3e9525932e6fdaeacc3b141dc4b118d5fa305b7a0510e9c57c935e489a9c159dcd826ad870 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32
-AUX 69-btattach-bcm.rules 2141 BLAKE2B 07fe8306e29f05082a603bd5a4b9d51c8c23b4ed48eaeebd01591970c0e29ea37198abaa8725023fd00cd38c67451910b6028d6725be3aca5ed1c495e02555ee SHA512 ecf535d737b9f1dc7a077f2a13e3712c959c505a93c24f48d63b04db0d42f8feef3918d48b7db5e8e115574a9b62f47aaa9c3e77230cff682d3f35da2f09047e
 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5
-AUX bluetooth-init.d-r4 280 BLAKE2B ecb807dec050b7c754e87b43848292ffd68afb36465739462208d1564c59d59b3c8801dca5f9ba8547efc982d972cdaeef340403c82c9fa1ad8922b0396d29bd SHA512 05fd235483c65decc8badeca1b3ec60ae59f4881cc9125f6b148afe2cbc269a636df620b6bab72ce20b6b265c73074b1afef1029aecd884dc1dbb2694c0d16d9
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
 AUX bluez-5.58-rfkill.patch 2475 BLAKE2B 0f4cfd4aa97a2e4479c4b109533b4ca39cd6155a1f0a1ee854e2e972dbf294eb870a3371dfebc6fde53cfb2f45d05e0721a3d137511e8822d8628a37570713fd SHA512 094858b34c2f60dafc70ccf0aec5971c47c656c9f74dce54a68e59ca0d3a8fb2902f597588b4f64fc47a6377ef9f3198a194f09c018c9881d1df70a9f652b531
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
-AUX btattach-bcm-service.sh 935 BLAKE2B cae7d78269b56038883ff74ddc7c5a3238fe4399a37cbba5c414d0396f2aff7c2a4965b56a1125dc8568e7bc848011106ab993e4c1211e704f485259373ab65a SHA512 259d10df16f4b23364da971063345b25cbf7c6a1b9f2576d3ecbd48620675392601cba017a591af1f44fe8eff8ea0c8cabeafa8adbddeb3e1014f428d37d1690
-AUX btattach-bcm_at.service 132 BLAKE2B 0af9a066a8d08d917fe80676f460297e244152d88ee02774b1e30c50febdb3fa9838c3818b80fbbf9248020dce4e1e33e2babf15a18609fddc1fd61465ecb6ed SHA512 ca6c89a676386cdaad6bfdd8a80062abe217ebd2b4484a125e4b5d0832b2c03ebed986f1806ff785664c99e1244bc164f1d152e5015fc87e46f2f6d847567b29
 DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3
 DIST bluez-5.60.tar.xz 2124312 BLAKE2B 52cd08192cbfb7adc2e11f270442af62307dbf3cb940554f77e1ec4c30036ca1c05970d7d48719d3036173135f2b14123f2d0aad8147f0a919773d211238a11e SHA512 069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b
-EBUILD bluez-5.58-r1.ebuild 9365 BLAKE2B 61fcd02b0ef1ba228e98bd3099f6bdc1f7e70aab8e4513be9dde873c89b2fd31b2fcd3475531f1fecfd68e6c3d776a4d74513cacc53fd01d17b68612689faa7c SHA512 51910209550a5d30a103cbcfba228df6a6da8fb918907bbfc53d5feec7e090bde2e804cfeb62047dab8eb6a602567ce28e06bd7d5f102f569ec3bd5335455ea4
+EBUILD bluez-5.58-r1.ebuild 9364 BLAKE2B f17abcbe1458dc6d3339d18014a8cb125f309c97fe2eb219ad31ce3756b4c14f2c0dcc41a0b65bdcc0ab412ae9916fc8ec3898ac2968e21e7923ce28561a373e SHA512 425d8d072d9786c7e1b5d04c9317636d1c84661f6c0baf8b3c1bc5aded148b9d51531e8ebf669431f795524374976ff3b9f538723d5018a7709c2f5b5aebff6e
 EBUILD bluez-5.58.ebuild 9421 BLAKE2B 1f0dfb997e628516a64113539e77bb545eda978bb12ce4579c05bcd8300f15c81ba84e00145018bf15837e46955d243310be80b16e320312330927183d9b709e SHA512 ac32dd551cc508a44ff9e3a045f5535bdcae4279f2da7529208a390f4e247de6c253252aed3fc3114967a3ea576de16858f40b091bf0479a8b7a961fede43804
 EBUILD bluez-5.60.ebuild 9290 BLAKE2B 39092d23738b7292373d1fbb82122159d85d9be1ffcd4cb65e09d125537dcfe43c0ffd859fd33c0d515d46dd7261a0394ec715e570e1802cc126bd14dbb3569c SHA512 c8873673fde7237d870dc58ce3f8d18edcde46c2b8f69b1828c1971a3d4fc46a4c2a3a8fb15ce944e6f3f003af80ac07be5740847e46e9adb441382ee3fced42
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.58-r1.ebuild b/net-wireless/bluez/bluez-5.58-r1.ebuild
index dc6017eb67c7..5020f2ad5398 100644
--- a/net-wireless/bluez/bluez-5.58-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.58-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/bluez/files/69-btattach-bcm.rules b/net-wireless/bluez/files/69-btattach-bcm.rules
deleted file mode 100644
index dfe8d1e785c8..000000000000
--- a/net-wireless/bluez/files/69-btattach-bcm.rules
+++ /dev/null
@@ -1,33 +0,0 @@
-# Some devices have a bluetooth HCI connected to an uart, these needs to be
-# setup by calling btattach. The systemd btattach-bcm.service takes care of
-# this. These udev rules hardware-activate that service when necessary.
-#
-# For now this only suports ACPI enumerated Broadcom BT HCIs.
-# This has been tested on Bay and Cherry Trail devices with both ACPI and
-# PCI enumerated UARTs.
-
-# Note we check for the platform device not for the acpi device, because
-# some DSDTs list multiple bluetooth adapters, but only some (or none)
-# are enabled. Only enabled adapters get a platform device created.
-ACTION!="add", GOTO="btattach_bcm_rules_end"
-SUBSYSTEM!="platform", GOTO="btattach_bcm_rules_end"
-
-KERNEL=="BCM2E1A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E39:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E3A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E3D:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E3F:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E40:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E54:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E55:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E64:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E65:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E67:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E71:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E7B:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E7C:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E7E:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E95:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E96:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-
-LABEL="btattach_bcm_rules_end"
diff --git a/net-wireless/bluez/files/bluetooth-init.d-r4 b/net-wireless/bluez/files/bluetooth-init.d-r4
deleted file mode 100644
index e69c66867fa0..000000000000
--- a/net-wireless/bluez/files/bluetooth-init.d-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/run/bluetoothd.pid"
-command="/usr/libexec/bluetooth/bluetoothd"
-command_background=1
-
-depend() {
-	after coldplug
-	need dbus localmount hostname
-}
diff --git a/net-wireless/bluez/files/btattach-bcm-service.sh b/net-wireless/bluez/files/btattach-bcm-service.sh
deleted file mode 100644
index c7f8b1784679..000000000000
--- a/net-wireless/bluez/files/btattach-bcm-service.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Simple shell script to wait for the tty for an uart using BT HCI to show up
-# and then invoke btattach with the right parameters, this is intended to be
-# invoked from a hardware-activated systemd service
-#
-# For now this only suports ACPI enumerated Broadcom BT HCIs.
-# This has been tested on Bay and Cherry Trail devices with both ACPI and
-# PCI enumerated UARTs.
-#
-# Note the kernel bt developers are working on solving this entirely in the
-# kernel, so it is not worth the trouble to write something better then this.
-
-BT_DEV="/sys/bus/platform/devices/$1"
-BT_DEV="$(readlink -f $BT_DEV)"
-UART_DEV="$(dirname $BT_DEV)"
-
-# Stupid GPD-pocket has USB BT with id 0000:0000, but still claims to have
-# an uart attached bt
-if [ "$1" = "BCM2E7E:00" ] && lsusb | grep -q "ID 0000:0000"; then
-	exit 0
-fi
-
-while [ ! -d "$UART_DEV/tty" ]; do
-	sleep .2
-done
-
-TTY="$(ls $UART_DEV/tty)"
-
-exec btattach --bredr "/dev/$TTY" -P bcm
diff --git a/net-wireless/bluez/files/btattach-bcm_at.service b/net-wireless/bluez/files/btattach-bcm_at.service
deleted file mode 100644
index 1e7c7dbe582e..000000000000
--- a/net-wireless/bluez/files/btattach-bcm_at.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=btattach for Broadcom devices
-
-[Service]
-Type=simple
-ExecStart=/usr/libexec/bluetooth/btattach-bcm-service.sh %I
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 559e0358de8a..f41373c9f8b3 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -4,6 +4,6 @@ AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f3
 DIST iwd-1.14.tar.xz 933764 BLAKE2B edc6a925872afb6b98f5bbe16fc1cb6b8459a1aff33ec1f9e2d6bd45e605e34debaffa3048b6506cd3e8006c57d6efc9ae341f73050668454ad85fe7e6b4f256 SHA512 bff9b5a744e8eb4e285f28d976e9335d2c85b57fc1eb023c3aa9442e451523b3b9f080d2c02fc5432735c398857b64d115ed2929dd4bb910925cbf18df0b0874
 DIST iwd-1.15.tar.xz 940724 BLAKE2B 6dae8a71e15136bcc9d8bb44cc6b152848207d89af2f447f48e834a3feda72a0a018dd1db3cb3a0e92c834cb2a19d8f9e4a9c900d91f96df378772d220205d65 SHA512 71e1f5f1b9d4e09a158b9bf801cee8af5ed8a19a3e80ad677e28ccab29ae10a79ebb7dbeaed60dd24283b6a40dbda8c212400b6d5ac659ed6056588a8663f0d4
 EBUILD iwd-1.14.ebuild 4928 BLAKE2B a562a3ec297608b899413a35973b37da935260225be99a7eb864deaa0c2d960edf07e7d98620d68868c660e964a0a93daf179531c1caf3f1e687160c984e7cc2 SHA512 cbca49ef774352a05f7fc52e285d7ef494838a281c08d2c2f9276187e38dd8450c28ba5243fed7a4a2515b37562b21bc3bc013bc2333769b04f89fe2a4ab31cc
-EBUILD iwd-1.15.ebuild 4934 BLAKE2B f2edb470ebceb31d24b7ce68a3f41a26c76fe728f0a4a0faf93984013fa4adfbddf319770f10e69a8be62f79bff8949826962b04e06ede4f738badbf9ab63418 SHA512 d7f68296316fd0a40dafc426daacde4dd56cf1fc1aa8e1c9d7e1b5dabb55a8e8e27a7ed28cff09ece612ba6ed679775c0bbbf37542fcb88915380391487ca749
+EBUILD iwd-1.15.ebuild 4932 BLAKE2B 25440fbe7f4207ab40a7a0f666ff8fd230bbfb3133ce1514230b792789ce4fecd9d27c754615089471b343eb424ffeb92a4feda4ab6bfb02e2379183c4031328 SHA512 494b2ae2283a86827a13ba8a0b0d00fd9e3b8b29fd70ac6a8b8106acbcbff75a1cf1a420489160a554e75486691e3cd81a2a24ae8289ba8a403b0377edbef168
 EBUILD iwd-9999.ebuild 4930 BLAKE2B ef4e6abb91312e52edc376f99664863d83ff87340a7a83e617b826d48fd85c8b70c95e0929a1c3461ec03bc45724ace0f287ce5b03cb381e6221b9414f38b93e SHA512 485aaca5116e7f13b5a76816bf0b98731c95f305b69e40ae717bad2da2760b8759eb2043c8f6888fa790854ed5f8b0039d920572af5e6396fd297aa2e2d06256
 MISC metadata.xml 832 BLAKE2B 904ff92a3b4e243fe9780fcb0ca0376c33f93669a77dbc8cfb345257dfec77057a54a41688b0cf5a9230a058d4e258096fa9664867b1c43dbc1bdc9662441838 SHA512 f8b8cb1b2d49159a23b8bfc27b6e54c0fd5509c16b6425881dd80f833586dde918f9a2d94a608b61689e30891c10780318197f10e703d9587a12179f98121442
diff --git a/net-wireless/iwd/iwd-1.15.ebuild b/net-wireless/iwd/iwd-1.15.ebuild
index 2197a22c78c3..109522fe0d6b 100644
--- a/net-wireless/iwd/iwd-1.15.ebuild
+++ b/net-wireless/iwd/iwd-1.15.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 	MYRST2MAN="RST2MAN=:"
 fi
 
diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest
index cc786eaa0a26..2a45d98ba608 100644
--- a/net-wireless/qdmr/Manifest
+++ b/net-wireless/qdmr/Manifest
@@ -1,4 +1,4 @@
-DIST qdmr-0.7.3.tar.gz 3751755 BLAKE2B 45285a703e7ec8795f4a8285c76363fa60c87b0f95c6bc72fb8edc289ea873c00e7f32b9e1e674aa97f2832f5651ba69081f80a120bb09f82af3cac1198d9e67 SHA512 bf5a70a4312d37cfbb78fa63d3aa678322433708f27e46f473f9084eceeabeb20db88826758180085d4894580fa49c8cb92f1f6304f186ad67ae8b1baa3b076e
-EBUILD qdmr-0.7.3.ebuild 913 BLAKE2B d294e2546f9d6e470f2f170a5b5114caf845bf0ed13c619f83c37988f48961d218c958c0b905a6fb05c330758d48c098923561e6ce39304d8ac7c43cc4e2e4c7 SHA512 60f76dad956ca78f91cf4133e8e574a28071723e87dd3cb16b641a3908b76f40d4c60566ea2bbe43c1b7ed632b8cdcd71b41dcb0b25df3a97e8d53d56a3a32fd
+DIST qdmr-0.8.0.tar.gz 3858103 BLAKE2B 1e3e16854ae12b4ae7d1b484c03ee6bea16b06d4b7b8619b084b93216fdafc0b5f9736a32f8b195b73fabc04503a0c3c0f874f4ec2ed81bd2cf564ae6cf4525f SHA512 1964981e77e738215abf3459ccaf46e7b0207f31a8e315b4d36f902e722472b1e37348a87e0cc724294df7a843244b15096b591722490b9955da9a27a8843c79
+EBUILD qdmr-0.8.0.ebuild 913 BLAKE2B d294e2546f9d6e470f2f170a5b5114caf845bf0ed13c619f83c37988f48961d218c958c0b905a6fb05c330758d48c098923561e6ce39304d8ac7c43cc4e2e4c7 SHA512 60f76dad956ca78f91cf4133e8e574a28071723e87dd3cb16b641a3908b76f40d4c60566ea2bbe43c1b7ed632b8cdcd71b41dcb0b25df3a97e8d53d56a3a32fd
 EBUILD qdmr-9999.ebuild 913 BLAKE2B d294e2546f9d6e470f2f170a5b5114caf845bf0ed13c619f83c37988f48961d218c958c0b905a6fb05c330758d48c098923561e6ce39304d8ac7c43cc4e2e4c7 SHA512 60f76dad956ca78f91cf4133e8e574a28071723e87dd3cb16b641a3908b76f40d4c60566ea2bbe43c1b7ed632b8cdcd71b41dcb0b25df3a97e8d53d56a3a32fd
 MISC metadata.xml 318 BLAKE2B 9cacba8715336d0e5ad5f9dedb1cc57a8c771941c98111cfbd3b5e1cf8a3ddacc5d26bae6e0109222af160e7103fcb826ba1af5eda0623501890c1ca30853564 SHA512 51568083da9127e860cab2a69cc25f99d6431c65577d2b26c4eee688154e65406a66cd6323662ea0531babae8c3dd643ea8430349e21539465dd8be3039604df
diff --git a/net-wireless/qdmr/qdmr-0.7.3.ebuild b/net-wireless/qdmr/qdmr-0.8.0.ebuild
index ae09930cdab3..ae09930cdab3 100644
--- a/net-wireless/qdmr/qdmr-0.7.3.ebuild
+++ b/net-wireless/qdmr/qdmr-0.8.0.ebuild
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 84138cb0bfd3..e26c59109d36 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 41ae83a7573f..7abfa2b749c2 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2021-07-17)
+# Haskell isn't stable on amd64 (or anywhere)
+# bug #801652
+dev-util/diffoscope haskell
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-07)
 # openjfx:8 will never be stabilized
 # openjfx:11 probably will neither
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 2635ab9f45fa..5646312f4808 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-07-17)
+# Java isn't available here right now
+dev-util/diffoscope pdf
+
 # Miroslav Å ulc <fordfrog@gentoo.org> (2021-04-12)
 # no stable virtual/jdk on this arch
 media-libs/rubberband jni
@@ -345,7 +349,6 @@ net-vpn/strongswan strongswan_plugins_unbound
 
 # Benda Xu <heroxbd@gentoo.org> (2015-01-03)
 # not tested
-app-i18n/anthy canna-2ch
 app-i18n/scim-anthy kasumi
 
 # Markus Meier <maekke@gentoo.org> (2014-11-29)
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 971f51be2dea..b65584cb4309 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -82,7 +82,6 @@ dev-python/socketpool eventlet gevent
 # These pull in:
 # - direct ruby dependency:
 app-admin/augeas test
-app-i18n/canna doc
 sys-block/thin-provisioning-tools test
 # - texlive japan modules: ruby runtime scripts
 app-text/texlive l10n_ja context
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask
index 2168b261a6c0..0587005a8db1 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-03)
@@ -53,11 +53,6 @@ hddtemp
 # Unmask this here, since only ppc64 can use it
 -ibm
 
-# USE=audit masked prior to testing on alpha, arm, hppa, ppc64, s390, sh.
-# Bug #184563, 2007-09-18
-# Robin H. Johnson <robbat2@gentoo.org>
-audit
-
 # unregisterised ghc arch for now.
 # no ghci - no TH
 template-haskell
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 885311c091f4..6ba073273821 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-14)
+# LuaJIT does not support riscv
+app-text/texlive-core luajittex
+dev-texlive/texlive-basic luajittex
+
 # Marek Szuba <marecki@gentoo.org> (2021-07-11)
 # Causes 35 tests to fail with "fatal llvm error"
 dev-db/postgresql llvm
@@ -15,10 +20,8 @@ mail-mta/courier fax
 
 # Ye Cao <ye.c@rioslab.org> (2021-07-02)
 # Dependencies not keyworded, not tested
-app-text/texlive-core xetex
 dev-python/ipython nbconvert notebook
-dev-python/matplotlib cairo excel wxwidgets
-media-sound/alsa-utils libsamplerate
+dev-python/matplotlib wxwidgets
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-02)
 # Yixun Lan <dlan@gentoo.org> (2021-05-24)
@@ -34,12 +37,10 @@ www-client/elinks samba
 app-editors/emacs gconf m17n-lib xwidgets
 #  - net-fs/openafs
 app-crypt/heimdal afs
-#  - MANY, to be reviewed
-dev-cpp/eigen doc test
+#  - sci-libs/hdf5
+dev-libs/starpu hdf5
 #  - dev-python/pygraphviz & sci-libs/gdal, dev-python/pandas
 dev-python/networkx extras pandas
-#  - sci-libs/umfpack (and a lot of its own deps in turn)
-dev-python/scipy sparse
 #  - sys-cluster/ceph
 net-analyzer/rrdtool rados
 #  - sys-cluster/rdma-core | sys-fabric/ofed, sys-cluster/knem, sys-fabric/infinipath-psm, sys-fabric/librdmacm
@@ -47,10 +48,6 @@ sys-cluster/openmpi openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_ps
 #  - sci-libs/hdf5, sys-fabric/ofed, dev-db/mariadb | dev-db/mysql
 sys-cluster/slurm hdf5 ofed slurmdbd
 
-# Ye Cao <ye.c@rioslab.org> (2021-06-24)
-# Dependencies not keyworded, not tested
-media-gfx/imagemagick openexr wmf
-
 # Yixun Lan <dlan@gentoo.org> (2021-05-24)
 # Dependencies not keyworded, not tested
 dev-libs/libdbusmenu test
@@ -126,10 +123,9 @@ dev-libs/libpcre jit
 # This includes also packages which do not support python-3 or
 # do not support python-3.7 yet.
 
-app-admin/syslog-ng amqp geoip2 kafka mongodb redis spoof-source smtp snmp test
+app-admin/syslog-ng amqp geoip2 kafka mongodb redis spoof-source smtp test
 app-arch/p7zip wxwidgets
 app-doc/doxygen doc
-app-editors/emacs mailutils
 app-text/asciidoc test
 app-text/ghostscript-gpl cups
 app-text/po4a test
@@ -159,7 +155,7 @@ net-irc/irssi socks5
 net-libs/gnutls doc test-full
 net-libs/ldns doc python
 net-libs/libpcap rdma
-net-misc/ntp openntpd snmp vim-syntax zeroconf
+net-misc/ntp openntpd vim-syntax zeroconf
 net-nds/openldap cxx kerberos sasl
 sys-apps/kmod doc
 sys-apps/portage apidoc
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index df40319274bd..c18421fa6944 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -22,10 +22,6 @@ lua_single_target_luajit
 lua_targets_lua5-2
 lua_targets_luajit
 
-# Ben Kohler <bkohler@gentoo.org> (2019-01-09)
-# no fam providers keyworded yet
-fam
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-11-27)
 # valgrind has no RISCV port.
 valgrind
@@ -35,7 +31,6 @@ bluetooth
 emacs
 fuse
 java
-kerberos
 latex
 libedit
 mono
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 737847d26d77..64d1d2f1313a 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2021-07-17)
+# Haskell isn't stable on amd64 (or anywhere)
+# bug #801652
+dev-util/diffoscope haskell
+
 # Sam James <sam@gentoo.org> (2021-03-04)
 # Dependencies not yet stable, drags in
 # large amount of fabric. bug #763954
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index eb7bc3a9dd50..aa66e55ed5b5 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -91,12 +91,12 @@ sys-libs/libcxx libcxxabi
 # the flag.
 sys-kernel/vanilla-kernel initramfs
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2019-11-06)
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
 # Upstream plans to drop libcrypt.so.1/crypt.h from glibc
 # distribution and rely on external providers like libxcrypt.
-# Gentoo will follow suit but today we are not yet ready.
-# Unmask at your risk. Bug #699422 tracks the effort.
-sys-libs/glibc crypt
+# Here we are following that path too.
+<sys-libs/glibc-2.33-r2 crypt
+>=sys-libs/libxcrypt-4.4.23-r1 system compat
 
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
 # <dev-scheme/guile-2 is package.mask'd, so force USE=guile2
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 83513d5d82c1..925b60a9c4da 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,17 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-14)
+# Several known issues (possibly with older pastix versions as well but
+# in v6 they result in clear errors):
+# * CUDA support needs testing, may or may not work as it is;
+# * With MPI enabled two tests fail (when linked against openmpi, at least)
+#   due to incorrect implementation of either MPI support itself or
+#   said tests - example_drv_facto0_d_reentrant tries to initialise MPI
+#   more than once, test_bvec_gemv_tests calls MPI_Query_thread() after
+#   invocation of MPI_FINALIZE.
+>=sci-libs/pastix-6.0.0 cuda mpi
+
 # Alfredo Tupone <tupone@gentoo.org> (2021-06-27)
 # lto does not work on dev-lang/gnat-gpl-2021
 dev-lang/gnat-gpl:10 lto
@@ -267,10 +278,12 @@ dev-python/statsmodels doc
 # broken static-linking in glibc and maybe others
 >app-shells/mksh-57-r1 static
 
-# Patrick McLean <chutzpah@gentoo.org> (2019-11-07)
-# Collides with sys-libc/glibc[crypt]
-# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely)
-sys-libs/libxcrypt split-usr system
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Upstream plans to drop libcrypt.so.1/crypt.h from glibc
+# distribution and rely on external providers like libxcrypt.
+# Here we are following that path too.
+>=sys-libs/glibc-2.33-r2 crypt
+<sys-libs/libxcrypt-4.4.23-r1 split-usr system
 
 # Michał Górny <mgorny@gentoo.org> (2019-10-05)
 # net-libs/openslp is being removed.
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index eaa49d098f58..7c7be35a0f19 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,10 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Sam James <sam@gentoo.org> (2021-07-12)
-# Haskell isn't stable on amd64 (or anywhere)
-# bug #801649
-dev-util/diffoscope haskell
+# Patrick McLean <chutzpah@gentoo.org> (2021-07-13)
+# Pulls in dev-libs/pmdk which has Haskell deps, a dep on rocr-runtime
+# all of which are not stable anywhere.
+sys-cluster/ceph pmdk rbd-rwl
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-05-30)
 # dev-perl/Net-Netmask-2.0.100 needs ... and ... which ends
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 1201801394bb..d805d7c7b66b 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-12)
+# Effectively EOL, no packages in the tree strictly require this
+# particular version
+lua_single_target_lua5-2
+lua_targets_lua5-2
+
 # Hans de Graaff <graaff@gentoo.org> (2021-07-09)
 # Mask Ruby 2.5 as EOL
 ruby_targets_ruby25
@@ -12,12 +18,6 @@ ruby_targets_ruby25
 # PostgreSQL 9.5 masked for removal
 postgres_targets_postgres9_5
 
-# David Seifert <soap@gentoo.org> (2021-06-20)
-# Abandoned upstream, last release 17 years ago, unmaintained, tons of
-# QA bugs, eclass is terrible. Bug #796878, removal in 30 days.
-canna
-canna-2ch
-
 # Brian Evans <grknight@gentoo.org> (2021-01-07)
 # PHP 7.2 is security vulnerable and end-of-life
 # Please upgrade to a newer slot
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 2cdc63f8b852..afb5ebda7f3e 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Hank Leininger <hlein@korelogic.com> (2021-07-14)
+# Uses glibc-specific rexec(3) function, bug #715898
+net-misc/netkit-rsh
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Mask the libxcrypt-based virtual
+~virtual/libcrypt-2
+
 # David Seifert <soap@gentoo.org> (2021-02-08)
 # nvidia-drivers only works against glibc.
 x11-drivers/nvidia-drivers
@@ -36,6 +44,13 @@ dev-libs/elfutils
 # Linux debugger needs a port to musl.
 app-emulation/dosemu
 
+# Mikle Kolyada <zlogene@gentoo.org> (2020-03-20)
+# No source builds for musl
+app-emulation/firecracker
+
+# Old undated blocks of masks
+#
+
 sys-libs/uclibc-ng
 sys-libs/glibc
 
@@ -47,8 +62,8 @@ sys-fs/udev
 # systemd sources fail to build without glibc
 sys-boot/systemd-boot
 
-# Ian Stakenvicius, 2017-06-14
-# on behalf of mozilla@gentoo.org
+# Ian Stakenvicius <axs@gentoo.org> (2017-06-14)
+# (on behalf of <mozilla@gentoo.org>)
 # Mask firefox-54 and above as it requires rust
 # now, and rust reportedly will not build yet.
 >=www-client/firefox-54.0
@@ -57,7 +72,3 @@ sys-boot/systemd-boot
 dev-lang/rust-bin
 mail-client/thunderbird-bin
 www-client/firefox-bin
-
-# Mikle Kolyada <zlogene@gentoo.org> (2020-03-20)
-#  No source builds for musl
-app-emulation/firecracker
diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force
index c26a7ba83f24..da728fcc47ae 100644
--- a/profiles/features/musl/package.use.force
+++ b/profiles/features/musl/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Do not force system install for libxcrypt here
+>=sys-libs/libxcrypt-4.4.23-r1 -system -compat
+
 # Force system-libevent use flag on mozilla packages, since the building of
 # bundled libevent cannot accomodate a system without sysctl.h
 # See bug 574830 for more info.
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index afdd59ca5f50..58cd6477116c 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org>
+# Restore mask here that is gone elsewhere
+sys-libs/libxcrypt split-usr system
+
 # James Le Cuirot <chewi@gentoo.org> (2020-05-16)
 # execinfo.h is required for debug.
 dev-games/cegui debug
diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc
index 76ef2455b35a..5423535d0fc9 100644
--- a/profiles/features/prefix/standalone/profile.bashrc
+++ b/profiles/features/prefix/standalone/profile.bashrc
@@ -1,5 +1,5 @@
 # -*- mode: shell-script; -*-
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # RAP specific patches pending upstream:
@@ -109,4 +109,11 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/php && ${EBUILD_PHASE} == prepare ]]; then
     ebegin "Prefixifying ext/iconv/config.m4 paths"
     sed -i -r "/for i in/s,(/usr(/local|)),${EPREFIX}\1,g" "${S}"/ext/iconv/config.m4
     eend $?
+elif [[ ${CATEGORY}/${PN} == dev-util/cmake && ${EBUILD_PHASE} == prepare ]]; then
+    einfo "Removing Debian magic..."
+    for f in Modules/{CMakeFindPackageMode,FindPkgConfig,GNUInstallDirs,Platform/{GNU,Linux}}.cmake; do
+	ebegin "  Updating $f"
+	sed -i -e 's,EXISTS "/etc/debian_version",FALSE,' "${S}"/$f
+	eend $?
+    done
 fi
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
index fe51d352f2f1..ba157ac6b0c5 100644
--- a/profiles/features/uclibc/package.mask
+++ b/profiles/features/uclibc/package.mask
@@ -5,6 +5,10 @@ sys-libs/musl
 sys-libs/glibc
 sys-libs/pam
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Mask the libxcrypt-based virtual
+~virtual/libcrypt-2
+
 # Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
 # Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106)
 sys-apps/systemd-tmpfiles
diff --git a/profiles/features/uclibc/package.use.force b/profiles/features/uclibc/package.use.force
new file mode 100644
index 000000000000..82ca48bfea6c
--- /dev/null
+++ b/profiles/features/uclibc/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 2021 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Do not force system install for libxcrypt here
+>=sys-libs/libxcrypt-4.4.23-r1 -system -compat
diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask
index 1c6069c30db8..b3f8a9ebe24a 100644
--- a/profiles/features/uclibc/package.use.mask
+++ b/profiles/features/uclibc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org>
+# Restore mask here that is gone elsewhere
+sys-libs/libxcrypt split-usr system
+
 # Anthony G. Basile <blueness@gentoo.org>
 # sanitize is broken on at least all hardened uclibc
 sys-devel/gcc sanitize
diff --git a/profiles/package.mask b/profiles/package.mask
index 221b957f41ca..c8ae98b46fec 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,70 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2021-07-17)
+# Deprecated upstream, replaced with factory_bot.
+# Last release in 2017, no dependencies.
+# Masked for removal in 30 days.
+dev-ruby/factory_girl
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-17)
+# Deprecated upstream, no longer needed with rspec 2+
+# Last release in 2016, factory_girl was last dependency.
+# Masked for removal in 30 days.
+dev-ruby/bourne
+
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-07-16)
+# library with no consumer, multiple vulnerabilities
+# removal in 30 days (bug #713098)
+dev-java/xmlrpc
+
+# Kai Krakow <hurikhan77+bgo@gmail.com> (2021-07-16)
+# To be replaced by net-p2p/go-ipfs, no migration needed.
+# Simply deselect the masked package and install the replacement.
+# Masked for removal in 30 days. Bug #802381
+net-p2p/go-ipfs-bin
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-15)
+# Dead upstream, no longer maintained, last release in 2013.
+# No dependencies.
+# Masked for removal in 30 days.
+dev-ruby/spork
+
+# John Helmert III <ajak@gentoo.org> (2021-07-14)
+# Dead upstream, unfixed security issue.
+# Removal on 2021-08-13.  Bugs #755896, #781467.
+net-proxy/polipo
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-14)
+# New, considerably refactored major version with a new build system.
+# Masked for further testing.
+>=sci-libs/pastix-6.0.0
+
+# Marco Scardovi <marco@scardovi.vom> (2021-07-13)
+# These packages were only ported for netbox. Not useful for anything else
+# No revdeps. Removal in 30 days (Bug #801991)
+dev-python/markuppy
+dev-python/tablib
+
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-07-12)
+# Version 3.3.0 suffers from ridiculously high CPU usage, this version has
+# therefore been retracted upstream.
+# https://github.com/RocketChat/Rocket.Chat.Electron/issues/2068
+# https://github.com/RocketChat/Rocket.Chat.Electron/issues/2070
+=net-im/rocketchat-desktop-bin-3.3.0
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-12)
+# No releases since March 2015, no upstream repo activity since November
+# 2019. Unmaintained in Gentoo. Depends on effectively EOLed Lua 5.2,
+# fails to build against any other version. Removal in 30 days (Bug #801883)
+app-crypt/cardpeek
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-12)
+# Effectively EOL, no packages in the tree strictly require this
+# particular version. Removal, of both the ebuilds and target support,
+# in 30 days (bug #801865).
+dev-lang/lua:5.2
+
 # Craig Andrews <candrews@gentoo.org> (2021-07-10)
 # Masked until November, 2021
 # This release adds enforcement of the Taproot protocol change to the Bitcoin
@@ -235,16 +299,6 @@ dev-java/jcodings
 dev-java/joni
 dev-java/jvyamlb
 
-# David Seifert <soap@gentoo.org> (2021-06-20)
-# Abandoned upstream, last release 17 years ago, unmaintained, tons of
-# QA bugs, eclass is terrible. Bug #796878, removal in 30 days.
-app-dicts/canna-cannadic
-app-dicts/canna-2ch
-app-emacs/yc
-app-i18n/canna
-app-i18n/canfep
-app-i18n/im-canna
-
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-06-20)
 # no consumer, removal in 30 days
 # see bug: https://bugs.gentoo.org/796587
@@ -289,29 +343,6 @@ sys-apps/rescan-scsi-bus
 # Removal on 2021-07-15.
 media-sound/sc2mpd
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-06-14)
-# The original Python Language Server by Palantir is no longer actively
-# developed [1]. Development on a language server for Python is continued by
-# the Spyder IDE community under a new name and in a new package. To continue
-# using pyls, please switch to the maintained forks [2]:
-# dev-python/python-language-server --> dev-python/python-lsp-server
-# dev-python/python-jsonrpc-server --> dev-python/python-lsp-jsonrpc
-# dev-python/pyls-black --> dev-python/python-lsp-black
-# -
-# Note that dev-python/pyls-spyder has already switched to the new language
-# server as of version 0.4.0. Users of the Spyder IDE will automatically
-# switch to the new language server when upgrading to version 4.2.5-r1 or
-# 5.0.4-r1. Manual adjustments to the settings may be required in certain
-# configurations [3].
-# -
-# Masked for removal in 30 days (2021-07-14).
-# [1] https://github.com/palantir/python-language-server/issues/935
-# [2] https://bugs.gentoo.org/795924
-# [3] https://bugs.gentoo.org/783615
-dev-python/python-language-server
-dev-python/python-jsonrpc-server
-dev-python/pyls-black
-
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-06-14)
 # DeprecatedDep jre-1.3, upstream dead,removal in 30 days
 # see bug: https://bugs.gentoo.org/787410
@@ -324,12 +355,6 @@ media-gfx/povtree
 >=dev-lang/ocaml-4.12
 =dev-ml/camlp4-4.12
 
-# Tomáš Mózes <hydrapolic@gmail.com> (2021-06-10)
-# Based on unsupported grub-legacy, replaced by
-# pvgrub2.
-# Removal on 2021-07-08.  Bug #790668.
-app-emulation/xen-pvgrub
-
 # Sam James <sam@gentoo.org> (2021-06-10)
 # Fails to build with modern libetpan. Unmaintained.
 # See bug #699570, bug #448574.
@@ -621,11 +646,6 @@ kde-apps/kdebase-meta:5
 # Mask for testing revdeps.
 >=dev-games/mygui-3.4.0
 
-# Patrick McLean <chutzpah@gentoo.org> (2020-02-07)
-# Mask until sys-libs/libxcrypt[system] is unmasked
-# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely)
-~virtual/libcrypt-2
-
 # Lars Wendler <polynomial-c@gentoo.org> (2019-11-14)
 # Breaks archives containing relative paths
 # when being called with --no-absolute-filenames
@@ -712,12 +732,6 @@ sys-devel/automake:1.10
 # use. See bugs 603346 and 604998 for more information.
 app-admin/amazon-ec2-init
 
-# Michał Górny <mgorny@gentoo.org> (2016-11-17)
-# New version masked for testing. It supports source-window buffer size
-# over 2G but it 'currently performs 3-5% slower and has 1-2% worse
-# compression'.
->=dev-util/xdelta-3.1.0
-
 # Robin H. Johnson <robbat2@gentoo.org> (2014-08-04)
 # Masked for testing, presently fails upstream testsuite:
 # FAIL:07:02:35 (00:00:00) db_dump/db_load(./TESTDIR.3/recd001.db:child killed: kill signal): expected 0, got 1
diff --git a/profiles/use.desc b/profiles/use.desc
index 271a22f65be8..1e80f0ad87a0 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -35,7 +35,6 @@ build - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used for creating
 bzip2 - Use the bzlib compression library
 cairo - Enable support for the cairo graphics library
 calendar - Add support for calendars (not using mcal!)
-canna - Add support for the Canna kana to kanji conversion engine
 caps - Use Linux capabilities library to control privilege
 cdb - Add support for the CDB database engine from the author of qmail
 cdda - Add Compact Disk Digital Audio (Standard Audio CD) support
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0dd7d0dd2379..74a2d5db2ee3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -715,8 +715,6 @@ app-forensics/libewf:fuse - Enable fuse support for ewfmount
 app-forensics/libewf:uuid - Enable UUID support in the ewftools
 app-forensics/sleuthkit:aff - Enable extra aff formats
 app-forensics/sleuthkit:ewf - Enable libewf support
-app-i18n/anthy:canna-2ch - Enable support for app-dicts/canna-2ch
-app-i18n/canna:canuum - Build canuum
 app-i18n/fcitx:autostart - Enable XDG-compatible autostart of Fcitx
 app-i18n/fcitx:enchant - Enable Enchant backend (using app-text/enchant) for spelling hinting
 app-i18n/fcitx:gtk2 - Install input method module for GTK+ 2
@@ -1648,6 +1646,7 @@ dev-java/commons-logging:avalon-framework - Add optional support for avalon-fram
 dev-java/commons-logging:avalon-logkit - Add optional support for avalon-logkit
 dev-java/commons-logging:log4j - Add optional support for log4j
 dev-java/commons-logging:servletapi - Add optional support for servletapi
+dev-java/dom4j:jaxen - Includes org.jaxen.dom4j package
 dev-java/ecj-gcj:native - Build a native binary along with the jar. Provides faster execution time, but needs about 1G memory and some patience to compile.
 dev-java/eclipse-ecj:ant - Support using ecj in Ant builds via dev-java/ant-eclipse-ecj
 dev-java/emma:launcher - Install /usr/bin/emma. Collides with sci-biology/emboss.
@@ -1698,6 +1697,7 @@ dev-java/openjfx:media - Compile media module, based on gstreamer-minimal (does
 dev-java/openjfx:source - Install JavaFX sources
 dev-java/rxtx:lfd - Installs and uses LockFileServer daemon (lfd)
 dev-java/sbt:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
+dev-lang/R:lto - Use link-time optimization for R and its recommended packages.
 dev-lang/bas:lr0 - Use the LR0 parser instead of the recursive descending parser
 dev-lang/crystal:blocking-stdio-hack - Keep STDIO file descriptors in blocking mode.
 dev-lang/crystal:debug - Build each module as a separate object file. Speeds build up.
@@ -1770,6 +1770,7 @@ dev-lang/nqp:moar - Build the MoarVM backend (experimental/broken)
 dev-lang/ocaml:flambda - Enables the Flambda optimizer: A new intermediate representation (introduced in ocaml 4.03) in the depths of the compiler designed to allow for better inlining.
 dev-lang/ocaml:spacetime - Enables the Spacetime memory profiler. See https://caml.inria.fr/pub/docs/manual-ocaml/spacetime.html for more information.
 dev-lang/perl:ithreads - Enable Perl threads, has some compatibility problems
+dev-lang/php:apparmor - Support FPM application confinement through sys-libs/libapparmor
 dev-lang/php:argon2 - Enable password hashing algorithm from app-crypt/argon2
 dev-lang/php:bcmath - Add support for libbcmath
 dev-lang/php:cli - Enable CLI SAPI
@@ -2411,7 +2412,6 @@ dev-python/cvxopt:glpk - Use GNU Linear Programming Kit sci-mathematics/glpk
 dev-python/drf-yasg:validation - Enable swagger spec validation using swagger-spec-validator
 dev-python/editorconfig-core-py:cli - Install command line interface as well as python library
 dev-python/falcon:cython - Build cython-based python modules
-dev-python/gmpy:mpir - Use sci-libs/mpir as gmp implementation
 dev-python/hiredis:system-libs - Use dev-libs/hiredis from system
 dev-python/hypothesis:cli - Install a CLI tool used to write tests.
 dev-python/icalendar:doc - Generate examples and other extra documentation
@@ -3155,16 +3155,13 @@ games-misc/xcowsay:fortune - Enable support for fortune cookies via games-misc/f
 games-mud/tf:atcp - enable ATCP support.
 games-mud/tf:gmcp - enable GMCP support.
 games-mud/tf:option102 - enable telnet option 102 support.
-games-puzzle/cuyo:music - Enable playing of background music
 games-puzzle/gnome-tetravex:cli - Build the gnome-tetravex-cli command-line interface
 games-puzzle/gnome-tetravex:gui - Build the gnome-tetravex graphical Gtk user interface
 games-puzzle/nightsky:bundled-libs - Use the upstream provided bundled libraries.
-games-puzzle/numptyphysics:user-levels - Install some fun user-created levels
 games-puzzle/pingus:music - Enable playing of background music
 games-puzzle/tiny-and-big:bundled-libs - Use the upstream provided bundled libraries.
 games-puzzle/world-of-goo-gog:bundled-libs - Use bundled libs
 games-puzzle/world-of-goo-hb:bundled-libs - Use bundled libs
-games-puzzle/xlogical:alt_gfx - Use alternate graphics which are closer to the original Amiga version
 games-roguelike/FTL:bundled-libs - Use bundled libraries.
 games-roguelike/angband:sound - Enable and install sounds
 games-roguelike/stone-soup:ncurses - Enable for console (uses ncurses) based build. (can be enabled on top of tiles)
@@ -4554,6 +4551,9 @@ media-sound/dir2ogg:mac - Add support for decoding Monkey's Audio files
 media-sound/dir2ogg:wma - Add support for wma files through mplayer
 media-sound/drumstick:fluidsynth - Enable support for media-sound/fluidsynth
 media-sound/drumstick:network - Build Network RT backend
+media-sound/easyeffects:bs2b - Enable use of media-libs/libbs2b
+media-sound/easyeffects:calf - Enable use of media-plugins/calf for adding various FX
+media-sound/easyeffects:rubberband - Enable usse of media-libs/rubberband for the pitch shifting FX
 media-sound/easytag:nautilus - Build gnome-base/nautilus extension
 media-sound/ecasound:lv2 - Add support for Ladspa V2
 media-sound/ecasound:oil - Use dev-libs/liboil for inner loop optimizations
@@ -4705,7 +4705,6 @@ media-sound/pulseaudio-modules-bt:native-headset - Build with native HSP (Headse
 media-sound/pulseaudio-modules-bt:ofono-headset - Build with oFono HFP (Hands Free Profile) headset for bluez 5, requires net-misc/ofono.
 media-sound/pulseeffects:bs2b - Enable use of media-libs/libbs2b
 media-sound/pulseeffects:calf - Enable use of media-plugins/calf for adding various FX
-media-sound/pulseeffects:mda-lv2 - Enable use of media-plugins/mda-lv2 for the loudness FX
 media-sound/pulseeffects:rubberband - Enable usse of media-libs/rubberband for the pitch shifting FX
 media-sound/qmidiarp:lv2 - Enables Ladspa V2 plugins.
 media-sound/qmmp:analyzer - Enable visual analyzer
@@ -5514,7 +5513,6 @@ net-dns/getdns:getdns-server-mon - Add getdns_server_mon tool
 net-dns/getdns:libev - Enable dev-libs/libev support
 net-dns/getdns:libevent - Enable dev-libs/libevent support
 net-dns/getdns:libuv - Enable dev-libs/libuv support
-net-dns/getdns:nettle - Use dev-libs/nettle as crypto backend
 net-dns/getdns:stubby - Add Stubby DNS Privacy Deamon
 net-dns/getdns:unbound - Enable net-dns/unbound libraries support
 net-dns/hash-slinger:ipsec - Enable support for IPSECKEY records (ipseckey)
@@ -7321,6 +7319,8 @@ sci-libs/lis:saamg - Build the Smoothed Aggregation Algebraic MultiGrid precondi
 sci-libs/mathgl:hdf - Add support for the Hierarchical Data Format v.4 sci-libs/hdf
 sci-libs/mathgl:octave - Add bindings for sci-mathematics/octave
 sci-libs/matio:sparse - Extend formats for sparse matrix (not matlab)
+sci-libs/metis:double-precision - Use double- rather than single-precision floating-point representation
+sci-libs/metis:int64 - Use 64- rather than 32-bit integer representation (needed for > 2^31 vertices)
 sci-libs/mpir:cpudetection - Enables runtime cpudetection (useful for bindist, compatability on other CPUs)
 sci-libs/mumps:metis - Enable matrix ordering with METIS (sci-libs/metis, sci-libs/parmetis)
 sci-libs/mumps:scotch - Enable matrix ordering with sci-libs/scotch
@@ -7352,8 +7352,12 @@ sci-libs/p4est:romio - Build with support for the ROMIO MPI-IO component
 sci-libs/p4est:vtk-binary - Enable binary vtk output. If disabled vtk files will be written in ASCII text format.
 sci-libs/parmetis:double-precision - Floating-point operation done as double precision
 sci-libs/parmetis:int64 - Build the 64 bits integer library (needed for > 2^31 vertices)
-sci-libs/pastix:int64 - Build the 64 bits integer library
-sci-libs/pastix:starpu - Build and link with dev-libs/starpu
+sci-libs/pastix:cuda - Enable GPU support using CUDA kernels
+sci-libs/pastix:fortran - Install the Fortran interface
+sci-libs/pastix:int64 - Use 64- rather than 32-bit integer representation
+sci-libs/pastix:metis - Enable matrix ordering with sci-libs/metis
+sci-libs/pastix:scotch - Enable matrix ordering with sci-libs/scotch
+sci-libs/pastix:starpu - Enable support for ther dev-libs/starpu runtime
 sci-libs/pcl:cuda - Adds support for NVIDIA CUDA.
 sci-libs/pcl:openni - Adds support for Kinect-like 3D sensors devices with dev-libs/OpenNI.
 sci-libs/pcl:openni2 - Adds support for Kinect-like 3D sensors devices with dev-libs/OpenNI2 (should be preferred over openni).
@@ -7959,7 +7963,6 @@ sys-boot/refind:ntfs - Builds the EFI binary ntfs filesystem driver
 sys-boot/refind:reiserfs - Builds the EFI binary reiserfs filesystem driver
 sys-boot/silo:tilo-only - Install only the tilo netboot tool
 sys-boot/vboot-utils:libzip - Use dev-libs/libzip.
-sys-boot/woeusb:minimal - Install only woeusb tool
 sys-cluster/ceph:babeltrace - Add support for LTTng babeltrace
 sys-cluster/ceph:cephfs - Build support for cephfs, a POSIX compatible filesystem built on top of ceph
 sys-cluster/ceph:diskprediction - Enable local diskprediction module to predict disk failures
@@ -8441,6 +8444,7 @@ sys-process/systemd-cron:yearly - Support /etc/cron.yearly
 sys-process/tini:args - Enable argument parsing.
 virtual/blas:eselect-ldso - Enable runtime library switching by eselect and ld.so.
 virtual/cblas:eselect-ldso - Enable runtime library switching by eselect and ld.so.
+virtual/jdk:headless-awt - Don't install the X backend for AWT, needed by some GUIs
 virtual/lapack:eselect-ldso - Enable runtime library switching by eselect and ld.so.
 virtual/lapacke:eselect-ldso - Enable runtime library switching by eselect and ld.so.
 virtual/linux-sources:firmware - Install linux kernel firmware
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 6a45d6450d2b..f88ca29952ab 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
index 77b53be5d459..753eec8caa44 100644
--- a/sci-libs/adolc/Manifest
+++ b/sci-libs/adolc/Manifest
@@ -3,6 +3,6 @@ AUX adolc-2.5.0-pkgconfig-no-ldflags.patch 364 BLAKE2B a35ab92ca491110c390a4d0f9
 AUX adolc-2.6.2-dash.patch 4516 BLAKE2B 8db052472bd3051ed0b8b1a180aac4098862695cefeed0f0f94600d447b2ef5b888ba072613ea101ac1435569eb9d5bcba1aa64b23a0bc7cf01a4ef20d3f760b SHA512 9b904d8c0ab3c286af27b293b5ffe516b9c1da53169702f94a9213496b6626e1a587e8ab8d9d25b983872c1a97620a8d5386d9053ba1a4c973ef5e145f655bc5
 AUX adolc-2.7.2-swig-python-configure.patch 15544 BLAKE2B 83a31d310e6ae4245085af960ef8440983defd75fa04fac63c24171640886c17a093f44a868c397db8f4189db61f523aa98b75bcab2238ab4931d6b94290f5c7 SHA512 661c4a939d58b7593dc4fbce5874c4e0e918ea54ca1163ae2984aeef528fe4a2c67128070d4f6fc3e33aab2d1e7b7d5e2ae244cea34111c69c72478e5949755f
 DIST adolc-2.7.2.tar.gz 2447479 BLAKE2B 0f871ce1dcb50bb14684e45e265cf45807f514dd3ca0dbaaedede2c7117d34cc5a34b0096a34c8ec37023e50aec7fd4be6561819d6297771e7f7fcaa7ba0e507 SHA512 b896650077367fd7388a6c5a40e5d8bb3f19af9e3bc5b067fd1d9a769809b77ccdfb5ef11ef481ab791c0f040401aaed0053cba55d4c2a3383c0d056122280f6
-EBUILD adolc-2.7.2.ebuild 1606 BLAKE2B de92e105f686f16a783c647d96bdefb30c3c6b71fd28397d5a16491f4f564df361d7361719a378ac1716822cba472705fc6b599e8f151f5feab81a92dd6d0221 SHA512 2a2457fc2493b3187d4ab4b1e712ea33e1a7c4a11192abc4c121acd6e6ddc4d943e7e60de95f03d5b2a401d57847b9a538aa1bb56cd20b20ef3d6a2dac126966
+EBUILD adolc-2.7.2.ebuild 1613 BLAKE2B 71c11d6a6f78075579e2d9ef292db161a0a84ba852684cc488702e99c300a3145f2ee6e66ff3960b159db976912a4367255a06ab93819d3ec7d9d986c691e8b1 SHA512 4fb9f21c7266211c6ca18bc2b8bfce56b61605b65d26711ffa8bf1c925bcec7b5d98d919740d47f230fbf536c133e6c5516c2cf6641385c515abf3ce7a5ba817
 EBUILD adolc-9999.ebuild 1395 BLAKE2B 3b2710b10396198d359317d216ef5c96d9f5d5d4a4c441feb6fa78f58f4486c279f3535f44c0a4c53d526fd21fb4a4fba74629b17de7e4b71e0bed263b9e9d59 SHA512 73c8e2de97ce8572e2a4d51ee60f9c6413bd373d2156812ac902c964260ec3de34129526dda755acdf6f082ce357b75eb3fa2b0b80b76db5588539e2076a477b
 MISC metadata.xml 736 BLAKE2B ddc9935966f95c209568fca01f222894812328b0411a75ee3ff369220860c274d52280c39f916dfdf9fd30ee3a67134a1bdab19feba1bf35b0e2695fa4577a97 SHA512 00cb5d1b587dc4220507a52f2e979fbbeed9035e59e1de26781e33b16d6a16474ad4aeae45ea7a1b8de9193fbe0671ffdd19a07431c33e22ff5586c7216b0522
diff --git a/sci-libs/adolc/adolc-2.7.2.ebuild b/sci-libs/adolc/adolc-2.7.2.ebuild
index e395d9b86954..0f101d7e1fbb 100644
--- a/sci-libs/adolc/adolc-2.7.2.ebuild
+++ b/sci-libs/adolc/adolc-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/coin-or/ADOL-C"
 else
 	SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/ADOL-C-releases-${PV}"
 fi
 
diff --git a/sci-libs/alglib/Manifest b/sci-libs/alglib/Manifest
index 376739447eff..e0e7ed69338a 100644
--- a/sci-libs/alglib/Manifest
+++ b/sci-libs/alglib/Manifest
@@ -1,5 +1,4 @@
 AUX CMakeLists.txt-3.8.2 1159 BLAKE2B bd12bd65ddc7e60d1e84b04d5c01391420accf099f17801680446856e817bd606315ee54a44b0bd559fe0a9fce35dfab8b9dfa2dd7edc406d57563ea0f77999a SHA512 193661b9f949972048132bc07b4619c2f0d38135d6f0030621cd8aabf87e9e78a6bec18cdb4fb9cb9e547fee9f4387e21ba3a02d45c41033a9c0be9221cf7d3c
-AUX alglib-3.10.0-disable-minlm-test.patch 709 BLAKE2B 160bd6a598eb9c822b16da6455bae980cf6bfd77c9889c0d2385b896ec502030741c1f6a929f48a49c73fe35e696cf83b97d72a007e91899bd61d369b195b9e9 SHA512 00d62278a65f30d97dd7df8ac20d17dbc40117c25e2cef64652f2afd0bda7c277f8600ccfa7036da8a4a4173e0f0f433d898b87c04ab6d2d89e2547f8a305ee9
 DIST alglib-3.17.0.cpp.gpl.tgz 3065026 BLAKE2B bc939568a6bfb5e2717995e31b9d7cb485885217ff8d15c2bea3185b1ef62536766f80e02d43999c016e24b10181bddd4ad4ff27611ab19ebcc778a5cb15d55e SHA512 0e4b943b03707950813aea707ae3569ce75a22216c9a4b256b646db16609995b3b63a958b0b8fbe3d7d623d5ac03efbe7c4b1589961f2ca9cdefbd7e1cc0c721
 EBUILD alglib-3.17.0.ebuild 668 BLAKE2B 1ba7311c6e907b70553362ab8a8147416364c23cb51421142cad4235c6e8789f4b99765c7843e6e4a87e707e1af95624cadf9759880c9200972da08b60bd870e SHA512 c338df5444fbcc6a50cf60dde6e2979372bdd95dd90a765ca11c5f39bffe1983f434058bedddfbe39429b5debb9e050ca22d32c0ac7d10210be9c38cf0473630
 MISC metadata.xml 1592 BLAKE2B 96df655b24fc1e27a90f6a31388135e9ec14965eef850c14468797dbb19670ef4695219459b2af337613a92cc25a7eb12a1b07f95a3e1e4b058d9f9c38ded770 SHA512 e16165304d85c3201c428b46bb85006281a2faac170f6b7f2966bc683f57387a0d4b68eddd6ad2d4ed9d26af992f4f9b2616c761f0bf1102c6749a8025478844
diff --git a/sci-libs/alglib/files/alglib-3.10.0-disable-minlm-test.patch b/sci-libs/alglib/files/alglib-3.10.0-disable-minlm-test.patch
deleted file mode 100644
index fc2dfae6c012..000000000000
--- a/sci-libs/alglib/files/alglib-3.10.0-disable-minlm-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: disable minlm test, because it fails sometimes on some platforms.
-Author: Anton Gladky <gladk@debian.org>
-Last-Update: 2015-05-29
-
-Index: cpp/tests/test_c.cpp
-===================================================================
---- cpp.orig/tests/test_c.cpp
-+++ cpp/tests/test_c.cpp
-@@ -93354,7 +93354,6 @@ _s_testrecord unittests[] =
-     {"spline1d",testspline1d,_pexec_testspline1d},

-     {"normestimator",testnormestimator,_pexec_testnormestimator},

-     {"minqp",testminqp,_pexec_testminqp},

--    {"minlm",testminlm,_pexec_testminlm},

-     {"lsfit",testlsfit,_pexec_testlsfit},

-     {"parametric",testparametric,_pexec_testparametric},

-     {"linlsqr",testlinlsqr,_pexec_testlinlsqr},

diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 534acf76139b..e5d2b6c01d27 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,5 +1,5 @@
 AUX amd-2.4.6-dash_doc.patch 488 BLAKE2B ed5872a7b0a2dc90bf69a2c74db9dc9379afd54831c87ce4ba577a3d70f2a5f2cdcda1a8ea2b1932974c18a45ab6b8043d0de8217054464881476c2041ca1e29 SHA512 7ac31c0b64b3986c6c6e44babe326c385eacb8a4a5c542ea1e7bf8b566eceb3e70a3d3cdf48a783507c9ecc1b21b53487523838d8f2936e0d2cbae688e30bee2
 DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
-EBUILD amd-2.4.6-r1.ebuild 906 BLAKE2B 342dfe81efbb87dadfd3806fb0eb31b04c311dc771ef5e25b15d7f2b17076ff9e8664ae63f5652b13c9dc612ddb6444ff3f0a65afb14898651cbc2e8d673958d SHA512 67c8d84c2636c582c179287faa4e44196eaef4c39e5bdaf54565fcf4ee65152e61934fa92533361c5ba7b9ce7e7405c0752d4fded945942ca88230119ff3b286
+EBUILD amd-2.4.6-r1.ebuild 913 BLAKE2B 38f993d136a21c675d4d5881e273a73b09c55d98b43797b268c32e39a1da4017d9172eb1aaaea86c39f5177bfaa27878174a50e32a4ca087207757721ea071e8 SHA512 4ea33ee07f29510747a9481f2c96f97f584f40db9ad2a05087e3485d7089322ea3906989e8436101f16a5a3165b4486b8495fbc67a5865b51797b6071b0c3591
 EBUILD amd-2.4.6.ebuild 793 BLAKE2B f9a25cd98333d370724cc165fffd407b7a05b94751e91ba852dff3df31c5f82b3926fd5ba4eae1a144f28eb6bf1b69837db8ce59ac77cbcbd2396de0c5745a72 SHA512 e305f6c46b7d8bad62dd081099e0b281c66f2c8027132ea092c02a72b8ac838fe6fd6d2d157d472bb405f2ce39dccb75e00b7e154980d570293f6b569e9ac510
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.4.6-r1.ebuild b/sci-libs/amd/amd-2.4.6-r1.ebuild
index d6fb2915b940..abd35c1a71ae 100644
--- a/sci-libs/amd/amd-2.4.6-r1.ebuild
+++ b/sci-libs/amd/amd-2.4.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index 460e6e1892c0..aa460590d56e 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,5 +1,5 @@
 AUX camd-2.4.6-dash_doc.patch 498 BLAKE2B 93871bfdc9fbe1bc77f7cdc66d18d7517e318edcdbc09e1efa63a9400de5a3e91fa1febdc24394743b710090d7a78fc9e864732c4979db73f679cbd008fea670 SHA512 61a38299792ade16a067e7960d5922ffeb6be838eab73f8be493b999c9256875a07b28066e1965b59f9d9e5f63f616a1674f8987ff847e49ac4ff2a8fe05c73f
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
-EBUILD camd-2.4.6-r1.ebuild 839 BLAKE2B 89f1ed9d821b1572d2ff8c2db64a3f7a1c7997f0ccfd6cbf4b2f28748d7efbd5ca0ef6cd3774c4a809565e3b307c1b090bdbc1356b5661aaff2d67ccebfeedc1 SHA512 87b094ef4bc8863148b626eaf1a31c7e32c7b33311ba93d3d30accbf860bc265c8a50f27fb88b2e6e4b55b0074cff189cacea7d492688d746347721272268ad4
+EBUILD camd-2.4.6-r1.ebuild 846 BLAKE2B 29fe717acbc0e52ae6824e6ed147357c7c6f725ea4c53972a2767b6419b52e31ea3915fd86705fed86edb7dbc00a1bb51a93098486930eacb93ea5c3772e0f9e SHA512 00c3174718c29cc174311fb35b31378bcac6623f1297df4804c419de19d6d961cc12bc32e0831f6ce1caab3bce353d422db37af5b510617cb0ccf304e2ad3614
 EBUILD camd-2.4.6.ebuild 717 BLAKE2B aaea2b067e019608d3bd31ec989d25b926299da54b35fb9b60e0b9bfcd050e9c7ddddf987c9d1b36de838fd3360812d3ded619b576e4f042f9f3dc9e243b84df SHA512 3344d69aec563ab8d21a0aacdc6a14587b182bd460f4849a396ecd51fd2a2ee63bd483eddcafb12c489c23369356a3f4eeb14a7369da11d55f4d93616058c950
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.4.6-r1.ebuild b/sci-libs/camd/camd-2.4.6-r1.ebuild
index fcffa7a9f901..32c654a6328d 100644
--- a/sci-libs/camd/camd-2.4.6-r1.ebuild
+++ b/sci-libs/camd/camd-2.4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index aec3283fc94b..c094cf71469d 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,3 +1,3 @@
 DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c
-EBUILD ccolamd-2.9.6.ebuild 646 BLAKE2B 8efdebb1b2b8625c5cf7a7ddb7269ea1578da6783b3d867654735373caeafc9206f29329e29bfd2f2eed18996b36f3b9a97ec17da579d4ca726f184d7d0c443c SHA512 3e24429b62dc4450369da335b7b3cf1c2135f5d7805b8d8fb7a795c17c5451d464f5d4e3ba643da1d09100b22150c6c8ba12137cf1b717bf1f4ef4ec4fcd4b68
+EBUILD ccolamd-2.9.6.ebuild 653 BLAKE2B 5114799817376c87cef3f8bff4a05cab2ef877ccb173dc5fd8a6899ef19ebaa822630fa1369b58609bd98781795085b2d7641f07db0e6ad042361cdb9f3c8a68 SHA512 694d11491a0999467ada4f46471d1a784be40681d83717f25bebbd42904f58bfa8a1070ef70df698723b3fa500f64996399ce3edaec24421cd9876adc8f59460
 MISC metadata.xml 470 BLAKE2B b20ae7c51907e135898a4ca6eee1454c1760d8f6c061d6d8c9bdf6082773e003326c65ba4489831139bc9af96f2321a09b22fbe106aa87b8f6dbb4781163edb9 SHA512 99c2d290fea618dfd8997209d8e6db971a2ab74d1be5fb270f2177c9843b0f324710491977c7cf2427806295d05e341ece4399afd8a0d43bca8b42b0fdea7beb
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index dc269a9c4432..a34ba16ca8c5 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage//${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index 2e2abe68faf6..1d0963cade12 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -1,6 +1,4 @@
 AUX 50cdf 124 BLAKE2B 93acfc3dd493c8518497ed7dafa35cc61f66501bd9d7c4db1f4072cdda9742f2927b5f388dde26d33e76d4d33405a8a92fbf133a1ed729ce8cba21458f552123 SHA512 4fe515d03379f2b6e1723c771f73e65be9f67365a46e75dbeb3358bbdc6f3446b91efd989363bf229b7ae93a446ddedeefd883a0d59d28c1480a10a8994eeadc
-AUX cdf-3.2-soname.patch 738 BLAKE2B 4c6a94feeefa623e88622b6dfd76581ef6d0c0d91c376e597bfa1e0130a734ea6dd40ad5235272788d7338220710d26e634639383d8cf5cdbd1901778484a580 SHA512 f3bb09e43b3b36ed346dc7690cc0c75a28e8dcfb2c1ebbf8a0577abdc2d15bbcbce7b0da9c5de23ef65e669bd118692db498aef230e9395dd4b67dba48258a8d
-AUX cdf-3.5.0.2-Makefile.patch 3973 BLAKE2B 2106f52abb639b4f31f08372de81db5cb96dbdccd0a55821605e659b7f85fad554cd8d4212fa4b9e6fd6225e5f3fd6c98e76d7aa7c2fe05dd96ea49d3c8444fe SHA512 9842d43d8e2910f8d7cc00c27711f84cde622ab69084ce1c798625475034b73db857410d6fc1311933512bb3a235cfe2fb0808d2eebfc6165e3962e04aaed4e1
 AUX cdf-3.8.0-respect-flags.patch 3080 BLAKE2B 1a89fef44861e1954d42fa68f8dc9398299656eaa08686ea07577e329c70f28ea5967079a94819c8f8b4d99369ec8041fa37443a9be0d3e580fe396dacb1b3fd SHA512 7d6dd822f81a2d80b73cc55b76b46c0016ab1dc4c754a90b57c2d2c99912c045853cf132d7c26dbfe804fc4cc908647ad7832b3048edfe5b2b4e735b23499953
 DIST cdf380crm.pdf 2671048 BLAKE2B 2605d6465c744b57f11d08605aa888ead724b7553a0efd8830dae759eb54c6d0df807cca1c6611fd40b4c5eb9327fbfcd66f0f7cf82b69bf7619385928ebc6dd SHA512 fc1eef589ff0f3cd989d8743cc1d6cfeb5946cf9ae8e4a328ba746b33fe0f6a286cf7b7b7e7cab5e0231bef566c03d7b68afe6c0879e5fb32fc1e6c980f7e081
 DIST cdf380csrm.pdf 2409166 BLAKE2B 7e97e61865531b788553ca9747513ec32bc5e1a743e10e5bad5f62980a883d00cfeede975b83826ad72327071062080cd1db611fd40c4e5b3d22caf7d4dd3d0f SHA512 d669f032722e270d3f16f8d9a8920d4536430bd83a509591cf82b447770d16a9c6d9aba17e096f78445c4f0b7f4ab85082cf2480bc9384b46677a2325be0f163
diff --git a/sci-libs/cdf/files/cdf-3.2-soname.patch b/sci-libs/cdf/files/cdf-3.2-soname.patch
deleted file mode 100644
index e4f28617faca..000000000000
--- a/sci-libs/cdf/files/cdf-3.2-soname.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/lib/Makefile.orig	2007-12-03 17:47:58.476149933 +0000
-+++ src/lib/Makefile	2007-12-03 17:50:34.353032850 +0000
-@@ -94,7 +94,7 @@
- 
- shared.yes: libcdf.$(SHAREDEXT)
- 
--libcdf.so \
-+libcdf.$(SHAREDEXT) \
- libcdf.dylib \
- libcdf.sl: $(OBJs)
- 	@if [ -f $@ ] ; then rm $@ ; else $(NULL) ; fi
-@@ -102,8 +102,8 @@
- 	  echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
- 	       $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
- 	else \
--	  echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
--	       $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
-+	  echo $(LD) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS); \
-+	       $(LD) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS); \
- 	fi
- 
- libcdf.o: $(OBJs)
diff --git a/sci-libs/cdf/files/cdf-3.5.0.2-Makefile.patch b/sci-libs/cdf/files/cdf-3.5.0.2-Makefile.patch
deleted file mode 100644
index 3bab69dfc6ac..000000000000
--- a/sci-libs/cdf/files/cdf-3.5.0.2-Makefile.patch
+++ /dev/null
@@ -1,110 +0,0 @@
- Makefile           | 27 ++++++++++++++++-----------
- src/tools/Makefile |  6 +++---
- 2 files changed, 19 insertions(+), 14 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 7f240db..222c4f1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -771,17 +771,17 @@ all
- "PIC=$(PIC_$(OS)_$(ENV))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
- "LDx=$(LD_$(OS)_$(ENV))" \
--"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSshr_$(OS)_$(ENV))" \
- "SHAREDEXT=$(SHAREDEXT_$(OS))" \
--"LDOPTIONS=$(LDOPTIONS_$(OS)_$(ENV))" \
-+"LDOPTIONS=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))" \
- "AROPTIONS=$(AROPTIONS_$(OS))" \
- "RANLIB=$(RANLIB_$(OS))" \
- all
- 	@cd $(TOOLSsrcDIR); $(MAKE) \
- "CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
--"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
- "CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
-@@ -791,9 +791,9 @@ all
- "FCx=$(FC_$(OS))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
- "SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
--"FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
-+"FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
- "FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
--"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
- "SHAREDEXT=$(SHAREDEXT_$(OS))" \
-@@ -829,12 +829,17 @@ install: install.$(PART)
- install.all: install.definitions install.include install.lib \
- 	     install.tools install.help_ notify.user copy.leapseconds
- 
--install.definitions: create.bin copy.definitions change.definitions
-+install.definitions: create.bin
- install.include: create.include copy.include
- install.tools: create.bin copy.tools
- install.help_: create.help copy.help
- 
- install.lib: create.lib copy.lib.a
-+	@if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
-+	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
-+	 else \
-+	   $(NULL) ; \
-+	 fi
- 	@if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
- 	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
- 	 else \
-@@ -940,8 +945,8 @@ copy.include:
- 	      cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
- 
- copy.lib.so:
--	@echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
--	      cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
-+	@echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
-+	      cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
- 
- copy.lib.sl:
- 	@echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
-@@ -2128,15 +2133,15 @@ show.posix.alphaI: show.supported
- show.supported:
- 	@echo SHARED is $(SUPPORTED.$(SHARED_$(OS)))
- 	@echo CURSES is $(SUPPORTED.$(CURSES_$(OS)_$(ENV)))
--	@echo FOPTIONS=$(FOPTIONS_$(OS))
-+	@echo FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS))
- 	@echo FOPTIONSld=$(FOPTIONSld_$(OS))
- 	@echo SHAREDEXT=$(SHAREDEXT_$(OS))
--	@echo LDOPTIONSlibcdf=$(LDOPTIONS_$(OS)_$(ENV))
-+	@echo LDOPTIONSlibcdf=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))
- 	@echo RANLIB=$(RANLIB_$(OS))
- 	@echo FCx=$(FC_$(OS))
- 	@echo CCx=$(CC_$(OS)_$(ENV))
- 	@echo PIC=$(PIC_$(OS)_$(ENV))
--	@echo COPTIONS=$(COPTIONS_$(OS)_$(ENV))
-+	@echo COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))
- 	@echo COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))
- 	@echo CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))
- 	@echo SYSLIBSexe=$(SYSLIBSexe_$(OS)_$(ENV))
-diff --git a/src/tools/Makefile b/src/tools/Makefile
-index 3773c0c..1cabf61 100644
---- a/src/tools/Makefile
-+++ b/src/tools/Makefile
-@@ -40,12 +40,12 @@ CURSESLIB=-lncurses
- INCLUDEcdf= ../include
- 
- CC=$(CCx)
--CFLAGS=$(COPTIONS) -I$(INCLUDEcdf)
--CFLAGSld=$(COPTIONSld)
-+CFLAGS:=$(CFLAGS) $(COPTIONS) -I$(INCLUDEcdf)
-+CFLAGSld=$(LDFLAGS) $(COPTIONSld)
- 
- WHICHOS=$(shell uname -a | cut -f1 -d" ")
- ifeq ("$(WHICHOS)","Darwin")
--  LIBCDFa=../lib/libcdf.a
-+  LIBCDFa=../lib/libcdf.so.3
- else
-   WHICHOS=$(shell uname -a | cut -f7 -d" ")
-   ifeq ("$(WHICHOS)","Cygwin")
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 663c80ef12fc..24d16e6f7a1e 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,5 +1,5 @@
 DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
 DIST cholmod-3.0.14.tar.bz2 696981 BLAKE2B 855927c18833235b3f0835bfba455d83957b9161c0ee885c2d31d126f0f473067f55bcf2cfa163c72efb5de573589ffa54b484a8cf89bc44c9dbf64d43fda5d9 SHA512 f8c12fc3c8787be38bca6c6f84a8279c1380fbe4fabbfba754235fdb042d7050bfb7b5a21ea87ef59dbd5184d28e8cb7667966c38f5dcad78fe8d47111896a3c
-EBUILD cholmod-3.0.13.ebuild 1660 BLAKE2B 6f53739a8ea19773b34526ece750fe0e8c2d3ffa221058b4e201bbe6180c55535c9edf902b4a8c576343e5e22cbd3cbb03dd4594a6455d438cacd81450f1f0c0 SHA512 bbd5b01ef11bddcb0d10bea1917ce1b25c6d64321ecae25c63f5070d392f71c62e687847bbae1cc41fccf36db3295dffdf284f47d17de8979f550830037bebd8
-EBUILD cholmod-3.0.14.ebuild 1635 BLAKE2B 9e662356e5f6d8c240ea96103c50571b0731806b5bc98ac43af836bd844c7cbe17a06e8de50ce5c1b9b461457a212e991335f9a15dbab1288959b206dced4154 SHA512 c83648e864f4897ce8b6516231f97bddf627ae93f1a472e5dd1a3f096d2fbff3f42d8d61910658be4a74077311b4fc52b000c1c1213566de393b57f85c21ed31
+EBUILD cholmod-3.0.13.ebuild 1627 BLAKE2B 048e38fcd2db3af79b6f42d8c3d7001e5eb85c3a197ed91f95c9181c394a6b3225fe5790c0b950137cf7f82ef67ab440e922c48a5e894c2c57f8a83d1c7c74bd SHA512 da32e2d9b18a4dd1576646fab8e920c7e6070303b48da0b49521fff1be0d3e0f05f99f181bc6f78ed1373496c47c09a8dbf19870218ac1394a6f2c77537ec483
+EBUILD cholmod-3.0.14.ebuild 1609 BLAKE2B 4c02785d996dcddb8024ffde1918ef73788c2243a0079bea4e2363bb8399e3dba6e4351dff6293248b69043d6d30adfd19705f558361246ded0337de9d62f24e SHA512 c2d57530410cdff7eb5741e5b027f7c26649ff14721ce46b497aac0f06868bb55eeb7b609a41a9abce599c987b726731f5c82a932ad8e420fe9131e38af30bc7
 MISC metadata.xml 807 BLAKE2B e5a0fd3e5c5466397e9972ece2046b051f3b8fba8141e9e3a91b8ea474007b8a38998c16b3462e362d3713748620e41d2e35196d53d815c0865df7a494b3c104 SHA512 84f642bfb6676da3f9c66dddd635661c259e6182bf12c567655961c902189183570889630988f582c6913ddfa621944f0db4c22c7e9b8a715d1da8fb2fdd64f4
diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild
index a2dc0b63a54f..6d21a365986a 100644
--- a/sci-libs/cholmod/cholmod-3.0.13.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild
@@ -27,10 +27,7 @@ DEPEND="
 	partition? (
 		>=sci-libs/camd-2.4
 		>=sci-libs/ccolamd-2.9
-		|| (
-			>=sci-libs/metis-5.1.0
-			sci-libs/parmetis
-		)
+		>=sci-libs/metis-5.1.0
 	)"
 RDEPEND="${DEPEND}"
 
diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14.ebuild
index 30450952421b..111b80f90346 100644
--- a/sci-libs/cholmod/cholmod-3.0.14.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc +lapack +matrixops +modify +partition"
 
 BDEPEND="virtual/pkgconfig
@@ -27,10 +27,7 @@ DEPEND="
 	partition? (
 		sci-libs/camd
 		sci-libs/ccolamd
-		|| (
-			>=sci-libs/metis-5.1.0
-			sci-libs/parmetis
-		)
+		>=sci-libs/metis-5.1.0
 	)"
 RDEPEND="${DEPEND}"
 
diff --git a/sci-libs/coinor-clp/Manifest b/sci-libs/coinor-clp/Manifest
index 26c6493171d2..25a04bdd7057 100644
--- a/sci-libs/coinor-clp/Manifest
+++ b/sci-libs/coinor-clp/Manifest
@@ -1,3 +1,3 @@
 DIST coinor-clp-1.17.6.tar.gz 2158530 BLAKE2B b1bf6ecfdf3669ff4393e31c23d24f9160124dcd69df611c96feaa73acf796bc3a13a54542a5d0495e9a68789e762f5392bd7f23c0fee20c0699df2d0b084891 SHA512 8a799d87ba988a27e3ba526ded65425979b4364e374db4e943f41a523f3743efb88a9964eb575c058151e47f58be6ba0ac1b368177f0322850be3704be6f24d1
-EBUILD coinor-clp-1.17.6.ebuild 3799 BLAKE2B 56ce86a7c360da03022760aa1966fefcfce74b0e293f7fca912f91e1a9608c4d16b3596b60a6bf382ac53154389ca48edbb40a6d47744d0acd5bacf5da258885 SHA512 677c64320b62e1e11fb371faad35319073a750dbeb20d786620452f44a9ca14717ff7c8de0d123711de3fcc9ef52e0c7a0f89e728bdc78949fa744287300f677
+EBUILD coinor-clp-1.17.6.ebuild 3774 BLAKE2B 93ae581cc8b89606016253634ff6cbeb6b8c46f0bbb886c04bd4a015898bb288c65d5e927aed677cca29b74b323fe25ce48d29aa443f716e22f1777d7de63992 SHA512 9f6db4bda4db2491059cf27a6123bb811086eb10f4e2d2fe02b1ff1827c7390f7c2e578bd110a63570b992b5049b3e80906f3b0e7507017e7665d52a246aeeef
 MISC metadata.xml 1118 BLAKE2B 04fd6128b056520e45ed7bfa076c756fe667a1251f3aad4568bdf587cf6209e845a3c5f1114e09e29729e7de238974452f13a2acf82692792e1ec2cee200c50d SHA512 1d15db43e8a887fb1c2130bd85cbcb8886f4153f0d157dca468b6d77cf1eed907473232a06fd41ca811743c6ee514ae61c356a8c7ac2795e43a40b2760fd6940
diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
index 7449be2ae9f2..d3e93719609a 100644
--- a/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
+++ b/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ BDEPEND="virtual/fortran
 DEPEND="sci-libs/coinor-osi:=
 	sci-libs/coinor-utils:=
 	glpk? ( sci-mathematics/glpk:= sci-libs/amd )
-	metis? ( || ( sci-libs/metis sci-libs/parmetis ) )
+	metis? ( sci-libs/metis )
 	mumps? ( sci-libs/mumps[-mpi] )
 	sparse? ( sci-libs/cholmod )"
 RDEPEND="${DEPEND}"
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index d73b4e813310..b140318c99c4 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,3 +1,3 @@
 DIST colamd-2.9.6.tar.bz2 298903 BLAKE2B e1e3cfa0153e21b742854d28fb6d3ede287c2ec22cfef4268a8aba8bb239be527433907f6984dad976341cf6e1ca9cb39f5c97029ad9bed032a874add9aa0e02 SHA512 f302d18f9ba004c9d1b0e1ada76e70f20fa1d11896815e5300983513b7ed4a7b969adef33adb1a57d67ce856a5ded410874c23d9bba42b6bf1a6a790430f5137
-EBUILD colamd-2.9.6.ebuild 641 BLAKE2B bf35053ff07d1e4e7c29237d6407a727a17bfd64203f32447eb4cc43c3de0d6e88388067306f03d59c06b03ee33f90482eefe85525bcb7b9f1cb4a0e23378f9c SHA512 1551cc6febde6498ea7a2796fd90b3f6ea812e776602552b8cb82a1675556302696afa94f8710ebf8f08fcc8dbcd0dacf7b91cf88d9fa073ab0ec88f95527713
+EBUILD colamd-2.9.6.ebuild 648 BLAKE2B e0d0ec6182a9c9da9df9e1803d7053bf7d8acbc53fa66982f7b07594424db4d98f504c1efa2e7069ab1df57344702d913dc3dbdfc38abefda5119694ea77d7d4 SHA512 aff4021d9a4216a78ecc06510622b56c26d0c1299c5eeb07a2eced09b77ee0f9a6e1b9fe412c59b2b776cce38e43447fdc890b4ae3fdb7eb9d746115d499f248
 MISC metadata.xml 827 BLAKE2B d1b92027b2b820c67cb091e71c22c5ebcfe8e560968b8cf76f5cb61b6c26a71b66f4801343a531fbc8941b5b678bff44e2ab3aa6bec49db9b0264ea2273ac816 SHA512 367258fb10bcde8e5136c541ef1e134c4e882b296c45300c8d70945222c0730572b1dc116b80057c3a9d6a64c175fb86915847522000740d9a39e6fcd8eb5004
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
index f68a50a39544..da5d428764e2 100644
--- a/sci-libs/colamd/colamd-2.9.6.ebuild
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
diff --git a/sci-libs/colpack/Manifest b/sci-libs/colpack/Manifest
index 23a7ff25cc8c..3e2a052e524b 100644
--- a/sci-libs/colpack/Manifest
+++ b/sci-libs/colpack/Manifest
@@ -1,3 +1,3 @@
 DIST colpack-1.0.10.tar.gz 658087 BLAKE2B af6409969f0dfee465ad88515d0d4f82525047a8268ac9fd4b0784de1f4fd30ce7ba968502a5d92ad3a86f554fb8f1a786defb09396c8e678f62aeaa3cc25397 SHA512 566b7906c5d0dbcd6dcb9c359510ee8b13bf3249e56d8f88f7806493d1df14f54638a0558d601ab4dbc28f36093795eede57a059a7c4e66438b47bf5a0119808
-EBUILD colpack-1.0.10.ebuild 958 BLAKE2B e34413307614e6d549acafc44630ad6c791b34fb55474d513912735753accb733819346436707305ee3519cb664cd01096c873efd05892fb4d0e740fa40f6bb4 SHA512 ad5cdca234c0de46707099144be187105cd5d87c012dbdeadb4dc3123f2b97f1f9346d932074e36c3692191b0b07949e15fe3a6d355ad78fce31ceb8cab4e932
+EBUILD colpack-1.0.10.ebuild 966 BLAKE2B d38d495c35f37a2a93de88ad45e01a7b3952fc4593b763110922e51a1b4f827ce857c848144527924f32ecc881a6f8d6cffbb8a23f773d076c31641662fdea19 SHA512 2ffffa4c116dce839513ad60980cada1b6b0839bc446edac4af269267d5efdec3d16dc8a89d876b81ad55b149790174b3857c9a90ff782aa6316bb836cccfd6d
 MISC metadata.xml 605 BLAKE2B c7dd1378bd62eeaf69648625deda27806662c0f2fa83112fcc757925412c3d1d2ce218d64be2ad98dc54088618ff874d6a4e7f266e5fc006e98e257d757f4190 SHA512 28e191bbb72a212832b13ad84064538a884835b1f3e4f8e50d4b247b17189a12fa1de32138a675ab1e9fed58b40101c50d2e4472c554cf25f6f919f24059c17b
diff --git a/sci-libs/colpack/colpack-1.0.10.ebuild b/sci-libs/colpack/colpack-1.0.10.ebuild
index b432192067c6..357b7485b32f 100644
--- a/sci-libs/colpack/colpack-1.0.10.ebuild
+++ b/sci-libs/colpack/colpack-1.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,12 +8,12 @@ inherit autotools toolchain-funcs
 MYPN="ColPack"
 
 DESCRIPTION="C++ algorithms for specialized vertex coloring problems"
-HOMEPAGE="http://cscapes.cs.purdue.edu/coloringpage/"
+HOMEPAGE="https://cscapes.cs.purdue.edu/coloringpage/"
 SRC_URI="https://github.com/CSCsw/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="openmp"
 
 S="${WORKDIR}/${MYPN}-${PV}"
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 0cde14dd9b54..9a0c2c37d2da 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -4,7 +4,10 @@ DIST dealii-9.2.0-offline_documentation.tar.gz 277987911 BLAKE2B d14e15bc252f481
 DIST dealii-9.2.0.tar.gz 24688964 BLAKE2B 60a8ede72a49cb2e658b3d6d53fb332a96f44a7fb9bb499ba54175138d49f38a9b75d9bea2eaddcaa3f50d97ce53961692b35f89578f535d32301680e6f1d68b SHA512 7c76435e45c9c302c4f95f588229f5a9b81f0450bd029729553c706a25dfd16f5c02c50fd2618d7e285d18927b63426110d2c6a074242b91cf789bd4bc77acc5
 DIST dealii-9.3.0-offline_documentation.tar.gz 342390250 BLAKE2B 5ed1e5d5f7cd6a44f0dccc4b092c241fadc430facb77ec2a9ffb30d00dc13751f0ac08e2f05960584fbb60b26b64fa070c437f392e2e62b4ba1328e4efcd0677 SHA512 ff04cf3690160119041a9dc102ece81c351c41809fe1717cbc95aa97f2f1fe2ccc36e1b4b3045b73056a54fc7e3a27d3d734908760e9c34203b566b328b104b7
 DIST dealii-9.3.0.tar.gz 24458373 BLAKE2B 27cdaee4e7ec9c170e11c5ba9bff8fd654bb2a9452df3402d5639268a6fe31565faa38d240810a0323b7253f2ed665c25fa0948c56b9924f1836531f2414bc92 SHA512 d558b5dda1067f7d995bc5f265614e3bc5e70190d24c1c61047af1ddc52fa007013c51901b9b8eacfbe8b360dffcb22aca87e0019ee09581b928e00c39198c98
-EBUILD dealii-9.2.0-r1.ebuild 5158 BLAKE2B 943d46bfc24058b7f57d4e0644c5808fe9b7123da2f3c527712c2d50a7774890a6a1e004b500e488489576ec4a55537d5ec2f861b2bd95335db7489aacb17624 SHA512 55670d51feaf635cdab52f3745be686d6acaecc13b4a58e673ce92f865adde68adc224623f44e27fb9cef8e7505b02fbb6a96710daaca5d28bed8d4029a498ed
-EBUILD dealii-9.3.0-r1.ebuild 5288 BLAKE2B 8bef90aca441b30b84d8b755257f1bfc9384121f3621337b61830b512a06c2b0b247a3ed49e0deede86360af0da0df6e0052ce182f35e879d1d1544cd418f452 SHA512 e006d8ec3699468c66ee6a565174d9617e6f26b48e71074fa7cb37931b0222ed4aef0a5cb9a3ec302175d3bec108b6f1ee9623aff8b91230e15940e71abf897b
-EBUILD dealii-9999.ebuild 5339 BLAKE2B 4c92f7953990bd19ff1ec7144b46ffff5ba04d9dfe6a1483c5b7c66ae9cba3ea63c79a616a8ce5801b4a69044ed164abc00c57319a78611d388450d686a6f42d SHA512 2dc18b083efd54210ef6b04d8f6d9aa810bef9395f1e043ab57d0e938cd13a99dcbf2055118d3851c3ebc45e4aa76dd438dac65096d9dd61dd304ad61913d53c
+DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18
+DIST dealii-9.3.1.tar.gz 24459280 BLAKE2B c7f1d461017da24efd6f3247217fd1b889e0cbf2ac62c3fd305e03aed90d5ba82b58ceb84d34a84608b833b734e12abc77a63693aaa6eed767b4f5f157233ba0 SHA512 c3ba3e16fa4792bb4f3e85163e67b08271c84faff72c49b858a955851401adf2499e278790803061a61c4024964f6da3f0ef7b09c0370d8d0b5af16b7c3bdaef
+EBUILD dealii-9.2.0-r1.ebuild 5191 BLAKE2B bc3895d34609823b0538d30a9bb068e8844d0e86aa76565e24548d5dd27ae182c50c7a1f0e7a73dc2e175a0664e04d12366720dfd4221a2ed72272cf083d875a SHA512 7b5a428482ca1011b77aad608322d0fa403f4df1e95f60a6c69c6f16a0aceaef86bbfc73ee714b4741caa32b418edf8a10bc6f3f3c08bf20371a11de659bd063
+EBUILD dealii-9.3.0-r1.ebuild 5321 BLAKE2B 0e665c64f381364e1319d2f79c66076c5e5d8c64a0449bf47e265f210553ca379f04e4bffcd1c77b4ff7fb3d0a62560f861e6815c3daa7d285f3c90c0e107d67 SHA512 42fc31b610dd96b26c2b96e35304a4f16e65d5bdedec2a23bd4dd1220c0a6e1c9d940b6e91832dd99bfce2f743339ac4d51bf6aabd2a1c3e60278b77f2596797
+EBUILD dealii-9.3.1.ebuild 5321 BLAKE2B 9184a815e1979ef36752a2596617d17057584b073d6fa9de0c62baba62399271abb059490efe0beb35ac89d05b9960d0213887ab831abf5604fe894c2c2d5d15 SHA512 5823d35c1a2c10fb40ad6a897e517e72e206e79df1f1361461b5ae029d08d1605266a8f5a9aa3484bfc31141cef28d756b0bf7f19d09f91ab90ff3208ef63663
+EBUILD dealii-9999.ebuild 5372 BLAKE2B 629be1d6fe6a18cc64e7733f11ea2af64003c367bc3f272e5c42e2bf0ee499597dec6379fc65f571fbdd3c2d0f2fe1e14759b74a43614787f819fa353e4a10d6 SHA512 e350d34c18c3c100ac2827e1f8c22704a4b42f677b774d5d68193da72b802c8e294849783b6c9a5f1afe51f73308637e3be18b0bd9b3ae8b49a2eeda35e1335b
 MISC metadata.xml 2636 BLAKE2B 8874dd9c20a2dbd781f4a157b3639b1d66faf1b3f32dc6ac1c42fea274c0035b9632108117472b62d9161fab705f5a365aeaaaa44f555a5c2658ebd0a0fff045 SHA512 149082068c7287346a42b901501eddeea6feaaf9cc91c46681f63e63c68dd2a7e3161c3520417a44dc7eec7e673c76c6e967b5b46e898714ce65c4ea4924d25d
diff --git a/sci-libs/dealii/dealii-9.2.0-r1.ebuild b/sci-libs/dealii/dealii-9.2.0-r1.ebuild
index 468137f5fed7..fa6f92f0b59e 100644
--- a/sci-libs/dealii/dealii-9.2.0-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.2.0-r1.ebuild
@@ -52,7 +52,10 @@ RDEPEND="dev-libs/boost
 	gsl? ( sci-libs/gsl:= )
 	hdf5? ( sci-libs/hdf5[mpi=] )
 	lapack? ( virtual/lapack )
-	metis? ( >=sci-libs/parmetis-4 )
+	metis? (
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
+	)
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
 	nanoflann? ( sci-libs/nanoflann )
diff --git a/sci-libs/dealii/dealii-9.3.0-r1.ebuild b/sci-libs/dealii/dealii-9.3.0-r1.ebuild
index faa68c5b29d2..65d0d5b7a333 100644
--- a/sci-libs/dealii/dealii-9.3.0-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.0-r1.ebuild
@@ -58,7 +58,10 @@ RDEPEND="dev-libs/boost
 	gsl? ( sci-libs/gsl:= )
 	hdf5? ( sci-libs/hdf5[mpi=] )
 	lapack? ( virtual/lapack )
-	metis? ( >=sci-libs/parmetis-4 )
+	metis? (
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
+	)
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
 	opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= )
diff --git a/sci-libs/dealii/dealii-9.3.1.ebuild b/sci-libs/dealii/dealii-9.3.1.ebuild
new file mode 100644
index 000000000000..3b4964437572
--- /dev/null
+++ b/sci-libs/dealii/dealii-9.3.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib
+
+# deal.II uses its own FindLAPACK.cmake file that calls into the system
+# FindLAPACK.cmake module and does additional internal setup. Do not remove
+# any of these modules:
+CMAKE_REMOVE_MODULES_LIST=""
+
+DESCRIPTION="Solving partial differential equations with the finite element method"
+HOMEPAGE="https://www.dealii.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dealii/dealii.git"
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
+		doc? (
+			https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
+			)"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="
+	adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
+	cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
+	+lapack metis mpi muparser opencascade p4est petsc
+	scalapack slepc +sparse static-libs sundials symengine trilinos
+"
+
+# TODO: add slepc use flag once slepc is packaged for gentoo-science
+REQUIRED_USE="
+	p4est? ( mpi )
+	slepc? ( petsc )
+	trilinos? ( mpi )"
+
+# FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where
+# the names of the correct include and library directories are not easily
+# accessible. Just fix the version for the time being.
+CAS_VERSION=7.5.2
+
+RDEPEND="dev-libs/boost
+	app-arch/bzip2
+	sys-libs/zlib
+	dev-cpp/tbb
+	adolc? ( sci-libs/adolc )
+	arpack? ( sci-libs/arpack[mpi=] )
+	assimp? ( media-libs/assimp )
+	cuda? ( dev-util/nvidia-cuda-sdk )
+	ginkgo? ( sci-libs/ginkgo )
+	gmsh? ( sci-libs/gmsh )
+	gsl? ( sci-libs/gsl:= )
+	hdf5? ( sci-libs/hdf5[mpi=] )
+	lapack? ( virtual/lapack )
+	metis? (
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
+	)
+	mpi? ( virtual/mpi )
+	muparser? ( dev-cpp/muParser )
+	opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= )
+	p4est? ( sci-libs/p4est[mpi] )
+	petsc? ( sci-mathematics/petsc[mpi=] )
+	scalapack? ( sci-libs/scalapack )
+	slepc? ( sci-mathematics/slepc[mpi=] )
+	sparse? ( sci-libs/umfpack )
+	sundials? ( sci-libs/sundials:= )
+	symengine? ( >=sci-libs/symengine-0.4:= )
+	trilinos? ( sci-libs/trilinos )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+)
+
+src_configure() {
+	# deal.II needs a custom build type:
+	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
+
+	local mycmakeargs=(
+		-DDEAL_II_PACKAGE_VERSION="${PV}"
+		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
+		-DDEAL_II_ALLOW_AUTODETECTION=OFF
+		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
+		-DDEAL_II_COMPILE_EXAMPLES=OFF
+		-DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
+		-DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
+		-DDEAL_II_COMPILE_EXAMPLES=OFF
+		-DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
+		-DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
+		-DDEAL_II_SHARE_RELDIR="share/${PN}"
+		-DDEAL_II_WITH_ZLIB=ON
+		-DDEAL_II_WITH_ADOLC="$(usex adolc)"
+		-DDEAL_II_WITH_ASSIMP="$(usex assimp)"
+		-DDEAL_II_WITH_ARPACK="$(usex arpack)"
+		-DDEAL_II_WITH_CUDA="$(usex cuda)"
+		-DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
+		-DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
+		-DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
+		-DDEAL_II_WITH_GMSH="$(usex gmsh)"
+		-DDEAL_II_WITH_GSL="$(usex gsl)"
+		-DDEAL_II_WITH_HDF5="$(usex hdf5)"
+		-DDEAL_II_WITH_LAPACK="$(usex lapack)"
+		-DDEAL_II_WITH_METIS="$(usex metis)"
+		-DDEAL_II_WITH_MPI="$(usex mpi)"
+		-DDEAL_II_WITH_MUPARSER="$(usex muparser)"
+		-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
+		-DDEAL_II_WITH_P4EST="$(usex p4est)"
+		-DDEAL_II_WITH_PETSC="$(usex petsc)"
+		-DDEAL_II_WITH_SCALAPACK="$(usex scalapack)"
+		-DDEAL_II_WITH_SLEPC="$(usex slepc)"
+		-DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
+		-DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
+		-DDEAL_II_WITH_UMFPACK="$(usex sparse)"
+		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
+		-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
+		-DDEAL_II_WITH_TBB=ON
+		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
+	)
+
+	# Do a little dance for purely cosmetic "QA" reasons.
+	use opencascade && mycmakeargs+=(
+		-DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade-${CAS_VERSION}"
+		-DOPENCASCADE_INCLUDE_DIR="${CASROOT}/include/opencascade-${CAS_VERSION}"
+	)
+
+	# Do a little dance for purely cosmetic "QA" reasons. The build system
+	# does query for the highest instruction set first and skips the other
+	# variables if a "higher" variant is set
+	if use cpu_flags_x86_avx512f; then
+		mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
+	elif use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
+	elif use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use doc && [[ ${PV} != *9999* ]]; then
+		# copy missing images to the build directory:
+		cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
+			"${BUILD_DIR}"/doc/doxygen/deal.II || die
+		# replace links:
+		sed -i \
+			's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
+			"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
+	fi
+	cmake_src_install
+
+	# decompress the installed example sources:
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index d52bf8a2523b..fe9accb88f89 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -43,7 +43,7 @@ REQUIRED_USE="
 # FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where
 # the names of the correct include and library directories are not easily
 # accessible. Just fix the version for the time being.
-CAS_VERSION=7.5.1
+CAS_VERSION=7.5.2
 
 RDEPEND="dev-libs/boost
 	app-arch/bzip2
@@ -59,7 +59,10 @@ RDEPEND="dev-libs/boost
 	gsl? ( sci-libs/gsl:= )
 	hdf5? ( sci-libs/hdf5[mpi=] )
 	lapack? ( virtual/lapack )
-	metis? ( >=sci-libs/parmetis-4 )
+	metis? (
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
+	)
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
 	opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= )
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 50bebc23fafe..e889710d79db 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,3 +1,4 @@
+AUX indilib-1.9.1-fix-include.patch 732 BLAKE2B e34651a2b03e71fd5da51432fb9d3eee4523f7b0fce5322a732d462448181c3a0f134261bf66110a9456117bd7fbbf7b2228987b78843033d6f8524b141dcf13 SHA512 e31be023ccc34a4437728b73569c7599b1bd43b9e86f1c886f95884e722cdf1b8a5cb263c6934ddeb172b92cecd122d7cf7e1a59137476dd16ee31e0790cd0bd
 DIST indilib-1.8.8.tar.gz 2234987 BLAKE2B 542c77e1826002e6268be82048014cdd7db2e58d6860bf21e058775acccbca49091218c24d5910f91705aebcf592e21f9008d780f39bb0458115b073319e3949 SHA512 0598b117fa582daaaf7c71524fd40866a37fcdc47b523b2ee1ed3301701c7351b027a3aab794e2e1405aec7293ecc6705d5f7852bb472cd21f40d7e3d7733d1d
 DIST indilib-1.8.9.tar.gz 2253721 BLAKE2B 477880606867ef58e334efeb8d891996187833cdb2f6344018a47c36ad51cfe983e645d92be3e868246bc8dd730d51927834ad73efb2db5edb2ce238ae6d32f6 SHA512 7d561e3619a1ff9e4ec96c54d339f5a85b6d2f4adde57630044fa7f2a8d70c74488ab22eb6221de62c0738bb9c9d187b86b67c4e47f4f98a237d4f69731fe906
 DIST indilib-1.9.0.tar.gz 2291283 BLAKE2B 1ef715cfb388a686ad2121e1fcf2589a5d88e68e5cbdb11d72797dead63032782c32e9ae16a88304e59bb0cbb53aaefb6b919125b566958884cc252607c876d5 SHA512 7b02afb24bb2b71a7384c045af6654bb1e19f9b0fe525b31ad0ff3ecc5f1c4b9d53e4f9af225ae3845bd17d44cb7cb2274a72e331498828a2098a9984488b28e
@@ -5,5 +6,5 @@ DIST indilib-1.9.1.tar.gz 2322783 BLAKE2B 801071bf9190e4c27b4f3bf9fa2d9a44c4e297
 EBUILD indilib-1.8.8.ebuild 1188 BLAKE2B 5afef4724dc43ac28d5f3d0c3449dd48c2caec78a1dfdda6dc1e27f32b014a542d965a17c0cd872fc3bb01b5baf3df41665a8a356f923cf50de608c052dddec7 SHA512 744705826bf3d864f6e847fe80839e0c5aba5ec075c64d5a0995f0e6241c88bb0b37131df0ec4272a3a0ee50bef2cb6fe771fc1e802e778d1dca1ec39becfa38
 EBUILD indilib-1.8.9.ebuild 1189 BLAKE2B 60b9a949b599b8a1a9772355a68d9257501a85eb1d6155e95afc0c7766ad13564e77e669f6341377674c0b5cd5886649e402944dedee06fe975642132a48add3 SHA512 96428f3be5dafea90c4ce14da7dae749c6124bd3824500928f3f25c89c4c26dd054b07e3536f9db30140d7a539775148f7fa9da739b0ff4c2da5fa22651cdc68
 EBUILD indilib-1.9.0.ebuild 1191 BLAKE2B 1047b62c8a546e70dd5fe645eebaf6f5c5615d9beed2d9d406197f731ebd13d72b1047ace29f3988d3ea097e561b1b52d718f33b33dde4ecf97c49c07ba3faf1 SHA512 388fb2ff99e874e029fa999f934459c156d821738f3d3c4327429b7604121d50a06276dc768bc0c2d1e770132cf665f35003d2923f6adb828f2e821ff2332e05
-EBUILD indilib-1.9.1.ebuild 1262 BLAKE2B f64f108f2f1fc68ebd4055b997dc0550577d726224354f3d48d752e0487f473c7f912c04f8da43fcf08a92addb1a57c24574420b94a98fe38b4bf4a4b8b5dbb7 SHA512 9a10fe92cd75719051d1e179dcac41635cdaab9a0a7e7b5d245a86e27ff29dbc7d9a0a7485c92b4b07d788eff8c23483ff17bdf79b120ca6cd5cc4b2b40e6518
+EBUILD indilib-1.9.1-r1.ebuild 1322 BLAKE2B 6c2d3c36a97a9fa8619660f052bf3921a4066264f026d3bd6b82e7a663d5195b107f1dd7a041a1686a3fd4f593efc9372f8581e8a37dc3dc2d21dc5e71acaa3a SHA512 be70f46eb97391ca80c45393eb5aa6aa713651a971d9a67a9927f0fca032b51a75ced63947bef557621995f4345513179e7e9b6c4c59da751537ad9ba9af5a2d
 MISC metadata.xml 561 BLAKE2B 08059ed028ee0f961a58fe6e8ba141160437cee5e944bc72ad82a5731b0f187cd412ea2669a2d726d7c602a0dc8c659a79672f0e3786f502db22754076498854 SHA512 c0f2d64008a0ea23319101a2ca7e928940c81a6959544410476f80482cc560e42c991228ec96a1f8eab7d333f22a8853a40162228953a6dad6e5cdb67e8f3d7b
diff --git a/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch b/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch
new file mode 100644
index 000000000000..7e3e24880d43
--- /dev/null
+++ b/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch
@@ -0,0 +1,26 @@
+From 907b3d81f27593e709af9e3f2cdc6dab05d6d80a Mon Sep 17 00:00:00 2001
+From: Paolo Stivanin <paolostivanin@users.noreply.github.com>
+Date: Tue, 29 Jun 2021 08:52:04 +0200
+Subject: [PATCH] Fix indimacros include path on baseclient.h (#1503)
+
+---
+ libs/indibase/baseclient.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/indibase/baseclient.h b/libs/indibase/baseclient.h
+index 6d5e49b9a..2656d7486 100644
+--- a/libs/indibase/baseclient.h
++++ b/libs/indibase/baseclient.h
+@@ -20,11 +20,11 @@
+ 
+ #include "indiapi.h"
+ #include "indibase.h"
++#include "indimacros.h"
+ 
+ #include <string>
+ #include <vector>
+ 
+-#include <indimacros.h>
+ #include <memory>
+ 
+ // #define MAXRBUF 2048 // #PS: defined in indibase.h
diff --git a/sci-libs/indilib/indilib-1.9.1-r1.ebuild b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..eb8784d34540
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="https://www.indilib.org/"
+SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/lib/}"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="ogg rtlsdr test websocket"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-misc/curl
+	sci-libs/cfitsio:=
+	sci-libs/fftw:3.0=
+	sci-libs/gsl:=
+	sci-libs/libnova:=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libusb:0
+	ogg? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	rtlsdr? ( net-wireless/rtl-sdr )
+	websocket? ( dev-libs/boost:= )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-kernel/linux-headers )
+	test? ( >=dev-cpp/gtest-1.8.0 )
+	websocket? ( dev-cpp/websocketpp )
+"
+
+PATCHES=(
+	"${FILESDIR}"/indilib-1.9.1-fix-include.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DINDI_BUILD_QT5_CLIENT=OFF
+		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
+		$(cmake_use_find_package ogg OggTheora)
+		$(cmake_use_find_package rtlsdr RTLSDR)
+		-DINDI_BUILD_UNITTESTS=$(usex test)
+		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
+}
diff --git a/sci-libs/indilib/indilib-1.9.1.ebuild b/sci-libs/indilib/indilib-1.9.1.ebuild
deleted file mode 100644
index 10abb64d7eb3..000000000000
--- a/sci-libs/indilib/indilib-1.9.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/lib/}"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="ogg rtlsdr test websocket"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio:=
-	sci-libs/fftw:3.0=
-	sci-libs/gsl:=
-	sci-libs/libnova:=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libusb:0
-	ogg? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	rtlsdr? ( net-wireless/rtl-sdr )
-	websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-kernel/linux-headers )
-	test? ( >=dev-cpp/gtest-1.8.0 )
-	websocket? ( dev-cpp/websocketpp )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINDI_BUILD_QT5_CLIENT=OFF
-		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
-		$(cmake_use_find_package ogg OggTheora)
-		$(cmake_use_find_package rtlsdr RTLSDR)
-		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-}
diff --git a/sci-libs/libaec/Manifest b/sci-libs/libaec/Manifest
index 3f6cb667479b..f9c2fc6cb814 100644
--- a/sci-libs/libaec/Manifest
+++ b/sci-libs/libaec/Manifest
@@ -1,3 +1,3 @@
 DIST libaec-1.0.4.tar.gz 2775768 BLAKE2B e083c5e268296227b5193c2192f7c52d47f8cef08823de013453ffd2c5f8c115921a79c60286e7582cbfcbb914c5e8ad4c2493e4ec89395df3be2206bc893591 SHA512 74d01208ad3a426d68895dbfa8a830c96618a219f27745ecfd94b248462748e772c266e7fb0d4e4f4c75f8953a97f835fb2ece67317cf9e9a7495360362d22eb
-EBUILD libaec-1.0.4.ebuild 745 BLAKE2B 15fb3d9c5e6cb36aa8b37c81f15d2de56fc5c4d3e8d4c72ec14b3a47d3acf85fac212f96c9ed206d1b6e46912df7277bb13093b7279dbf04d73851153c60f283 SHA512 16a174299e151ceecc7ec2a7f3f792b29d2ed0bca618588a3417d68d276771e7c5aff18726e462b547d6a14cb1240bc900f6c38e4c97580ef4c651263374caba
+EBUILD libaec-1.0.4.ebuild 752 BLAKE2B 69a347bf06cf69874142484f14037de94bf358bc6969616cfe707721df850f43336bc6ee5cb4045420c39f79293043daa62d08684cb899f3f5b83cdac32c56d8 SHA512 37fc7ee6489b05edc05f63636ff8e65be8f417f0dbc57bc94940fa80835800a908527c4986b51e90bcd01557ec60688fd85630574159f8de4ff34229068e3c63
 MISC metadata.xml 719 BLAKE2B d8294233ada6c2318c05d70c6062e7b7db0b0bab38410e9bd0c7d6f9834d1515cb138095d555f27f36c829fbbf7c83c141c1ce74213fba849da8704adf63889d SHA512 f0197c0cf374cb0771e4b2e3bfcc80f639d3e660943df1cab79eec68b515a605855f792b0b1627d24409cfb6cc2890ca7e96f4aace01639106ee50e14574ccf6
diff --git a/sci-libs/libaec/libaec-1.0.4.ebuild b/sci-libs/libaec/libaec-1.0.4.ebuild
index 94b3844dae5d..67a349d6b185 100644
--- a/sci-libs/libaec/libaec-1.0.4.ebuild
+++ b/sci-libs/libaec/libaec-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0/2"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+szip"
 
 RDEPEND="szip? ( !sci-libs/szip )"
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 5426c179e873..c2ad881b4d53 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -3,5 +3,5 @@ AUX 3.14-makefile.patch 1634 BLAKE2B f25e5225e07040e43cc6057558914f177de4e3d4025
 DIST libsvm-3.24.tar.gz 876441 BLAKE2B 6781804ba9706de5ad363bcbda20f2ec181cc4ee9613c9e7429f03872f7a03b04859df2ec00692d9de3ea237d1e478435a4d4db3ce7e5292689a2eab26a1fe46 SHA512 ff3c39bc84291bfb707151d7b8b6fb2eece937afa769cb8ee579d00ee4c30e943d476cd7bb18851d482c9bed89cf94fb3fd8abca4d47253360e12e9406f2f24b
 DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
 EBUILD libsvm-3.24.ebuild 2674 BLAKE2B 710e0e5791defed993a820b2bc8cc500d6df28b739b726bc4a4181b16892035c3d0e088cbb92284915c131905673acaf0e169ad03928d14f306c9bdc76c18145 SHA512 909838eeb6af0280d4cc7ec27e84c9ffa5c44544bb2a3a5ca9da862e4ace9f40a8b8ecff6131ef7504558ec35ecba3c24be27806bc45088aaee46dd157d13d79
-EBUILD libsvm-3.25.ebuild 2683 BLAKE2B b57d0d18bebd2f4b441a0d36831206e1354e108fe0f7a5576b2328f99068c37ad67d236afb24ca8e12d19f84175d9ac04302792cc8cf3e99f96b410664ba20fa SHA512 f8fe08780d85e0d2882829c1f3e28e7b331b1b6751f768e778d8dba12c2b248bccfa3c0fe931fcd2d4789ea7d666c14b95b8423a14fe3b40b7a5df5661944b62
+EBUILD libsvm-3.25.ebuild 2681 BLAKE2B 9fe64026721f8a0c0d9968735ab39c985e918a92f108d28f2f29e35fcae894c0e9a640f486458a502ac585de7e2690e4b3b5b931366193c18afc2f04be729645 SHA512 5ad00b4477540542650d388b1cb58e7aa24c6015b00f52626b3e47ee4da1a0766cba9e4b1c973275688dc0d891be59a71388a17766d741b7e9e85cd515c6a994
 MISC metadata.xml 815 BLAKE2B b73e733b7881fd6c9b45f7605259a7d99e9bef6729936b7502df8c857e40e8552ebc0be25065a7d1391dd9b98cb4dd81b5dfd12722e5852f18c85ee693b2d20f SHA512 0e26fd0b3ddb08f769e92249819e93483cbca426465b8cd623703be2c242b5c8dd9731c978f6965e2c39d680229d5b15587ec0a16aea0b6fcf8172cf70e7f7ec
diff --git a/sci-libs/libsvm/libsvm-3.25.ebuild b/sci-libs/libsvm/libsvm-3.25.ebuild
index f4a2fdf7ebd9..edd16c69d55d 100644
--- a/sci-libs/libsvm/libsvm-3.25.ebuild
+++ b/sci-libs/libsvm/libsvm-3.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="java openmp python tools"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index 8fc46cfd531f..516dcbfc6050 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -3,5 +3,6 @@ AUX metis-5.1.0-multilib.patch 579 BLAKE2B 3e9edf7809a43026bfc7a320b1ff37f2e00a0
 AUX metis-5.1.0-remove-GKlib-O3.patch 267 BLAKE2B ef39556238377c12a311685ca96188f8b4c3db1398b55941d273592ff40cad49d3ec5c7606177edacad25af4684d9ae65dacaa9a7ca9ad957d326b874b87f3cf SHA512 8b4f4eb0753063e64533e0101b9e78bf2a711e6b2d080607ab06025ad681788225abe7555db28edee00a98ba41badc41341bb3cec2bd654fc738d63d78867968
 AUX metis-5.1.0-shared-GKlib.patch 590 BLAKE2B 63a10fd00f21cff949660c598fa4519432559965c72f31c35d2a726dbbdfb9d2591c99e92c9520c2021e8ce0c485aa9834445e9f5dfe388f93106e49eee562af SHA512 3157e364f56661c7bc896016b2cda83658f2b00fe7c936e732e80e366ccf6421a1ab6f95d5a74fdb790f4ec8789d048aab9d68b0ccf1eb03f94621f78adb1a3a
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
-EBUILD metis-5.1.0-r4.ebuild 1478 BLAKE2B de2c08a22218ddaca73624764bf9ee1d13598588ecf27e46a59afce16df57b5f5a1836e98d820702c6dc24412ce459dcda8cc65ae72ac73e12176ea988f9d204 SHA512 bd41163f6c7d425125d3a2901eab1a3425d0f476d0268d03d91098d949533a865dbb11729ddb722e47b638ff92416d0cd7bc71219dd44e5804f93660aef08e9a
-MISC metadata.xml 618 BLAKE2B 862f647c5562ab3d781bd3cb6a4ec1470cd45941043bbf1b9d09d41c5ad528546e338663400d322d8b1cb6b57e33910a9520b818a81c376451af0da6c037aa34 SHA512 7f46d28a97805eddd9d547ba66263cd395be46b495f4a9651312cfb421714b614d2c7415142c929c99386d32799fe78ea10110471b702487be4072b981ca17ee
+EBUILD metis-5.1.0-r4.ebuild 1476 BLAKE2B 87c34e6e1637d9f26fdd5cd5ee91bd0251073f76ca6bf9f352a9015a6c3191c0e9c94bd7b48f288e35b8db739c8bbcd6aa0adbd1478ac7c07d5ae0d7d469db03 SHA512 fbe4473b0afef5bf9b2e2ce1c1f7a193d2398492dc4f836180b968aeff01aac21fea79424378e4bfdb47e6f586cf6091f45cb7799c872542aee47f8dbd998c5b
+EBUILD metis-5.1.0-r5.ebuild 1812 BLAKE2B 64973cd56608538c3dceb82f66aafb8f40d335acf7966d5b9854dcd373a7eb9ea1b6f3d66bc068d3efe41a5829eadcf094be9b22f768779de974862b17fe5412 SHA512 267d581d645f6041d88729eb79c5ad7c8c109a0b5ee3ace113de9bb05dbab4d813c59ef64d28b83be06f4ca457ed1152ebd73a4cc0f80cd677a771974838a4fa
+MISC metadata.xml 861 BLAKE2B 6aef18847710e42d21884dbd4c8285ee0527efec9a7444b1a3d8613011408d2f54cd4bdfa761316b7c1a16a1acb1e02b820ea2e8fea9080d59a2eb98a0b07229 SHA512 5d13498d10d46c9b8561e9b222adfbd1ba5998059c72f84cc39206155d421ccb06dfeb24ac71cee2566244c6af0c03070820e130bdeb7f01b09928d72ad0985a
diff --git a/sci-libs/metis/metadata.xml b/sci-libs/metis/metadata.xml
index 142ea93c83ad..cfc70289ed32 100644
--- a/sci-libs/metis/metadata.xml
+++ b/sci-libs/metis/metadata.xml
@@ -11,5 +11,9 @@
   orderings for sparse matrices. The algorithms implemented in METIS are
   based on the multilevel recursive-bisection, multilevel k-way, and
   multi-constraint partitioning schemes.
-</longdescription>
+  </longdescription>
+  <use>
+    <flag name="double-precision">Use double- rather than single-precision floating-point representation</flag>
+    <flag name="int64">Use 64- rather than 32-bit integer representation (needed for &gt; 2^31 vertices)</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/metis/metis-5.1.0-r4.ebuild b/sci-libs/metis/metis-5.1.0-r4.ebuild
index 1e704d508cc9..a2a82573dad6 100644
--- a/sci-libs/metis/metis-5.1.0-r4.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r4.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake fortran-2
+inherit cmake
 
 DESCRIPTION="A package for unstructured serial graph partitioning"
-HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
+HOMEPAGE="https://www-users.cs.umn.edu/~karypis/metis/metis/"
 SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc openmp"
 
 RDEPEND="!sci-libs/parmetis"
diff --git a/sci-libs/metis/metis-5.1.0-r5.ebuild b/sci-libs/metis/metis-5.1.0-r5.ebuild
new file mode 100644
index 000000000000..dec369ccd8f4
--- /dev/null
+++ b/sci-libs/metis/metis-5.1.0-r5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A package for unstructured serial graph partitioning"
+HOMEPAGE="https://www-users.cs.umn.edu/~karypis/metis/metis/"
+SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc double-precision examples int64 openmp"
+
+RDEPEND="!<sci-libs/parmetis-4.0.3-r2"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shared-GKlib.patch
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${P}-remove-GKlib-O3.patch
+)
+
+src_prepare() {
+	if use int64; then
+		sed -i -e '/^#define IDXTYPEWIDTH/s/32/64/' include/metis.h || die
+	fi
+
+	if use double-precision; then
+		sed -i -e '/^#define REALTYPEWIDTH/s/32/64/' include/metis.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGKLIB_PATH="${S}"/GKlib
+		-DSHARED=yes
+		-DOPENMP=$(usex openmp)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cd graphs || die
+	local PATH="${BUILD_DIR}"/programs/:${PATH}
+
+	ndmetis mdual.graph || die
+	mpmetis metis.mesh 2 || die
+	gpmetis test.mgraph 4 || die
+	gpmetis copter2.graph 4 || die
+	graphchk 4elt.graph || die
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc manual/manual.pdf
+	if use examples; then
+		docinto examples
+		dodoc -r programs graphs
+	fi
+
+	cat >> "${T}"/metis.pc <<- EOF || die
+		prefix=${EPREFIX}/usr
+		exec_prefix=\${prefix}
+		libdir=\${exec_prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+
+		Name: METIS
+		Description: Software for partioning unstructured graphes and meshes
+		Version: ${PV}
+		Cflags: -I\${includedir}/metis
+		Libs: -L\${libdir} -lmetis
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${T}"/metis.pc
+}
diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
index 4c7676dc3c30..c55aaaa1b224 100644
--- a/sci-libs/mumps/Manifest
+++ b/sci-libs/mumps/Manifest
@@ -1,3 +1,3 @@
 DIST MUMPS_5.3.5.tar.gz 3940501 BLAKE2B f1767483bb23744a2c5ed11b0823c5b023377d5212abbe29a177cce5b5e51e6f2f391d7caa17022646e36c9e4b4fb4af80b03ac6cf8e89f37502ed960138bbbe SHA512 6e3bb081f38af8540ada7b4fb54c6e766739c854e2a3dd253e3e012eee05dae30064b1b4a8d7493f10691725aba4cc9e80544b0fe5b71670cb0b2726ccfc4439
-EBUILD mumps-5.3.5.ebuild 5744 BLAKE2B eb5800c68323aa3dfd22102984072cd8b0b77c80014206796840eb94249d956df9a891fd060d2c8e6d5a7b3a9714932435b6c13c4ed6a27c05689c8ddfc016e2 SHA512 8b9b3e348cbe0324550d99f9ed1c31da9d6d91b45b4a275f7eef559fb946f8a39d3b2726ecc2c285dbff2022a55effc7b8347dba36853fcf82089ca206ded70d
+EBUILD mumps-5.3.5.ebuild 5709 BLAKE2B 9fdfaad7401159ab5213ed0ea8ce0808d27abebd624b16389796f3a1d64f079744862b0ab16884f58cc87b39da7b95909aa3ff76ff241ccb3f81d33b84fa7fb0 SHA512 09a8bbe8322a2112b591dcc5f7c5fe9dd49b9fc06c71cfed3d84e72d733dbb56b844ae202347d5c389c226b4cbe1a5d66f61323ea36f626cb6e50827c40b740f
 MISC metadata.xml 864 BLAKE2B 78db103b861071cbad317a65db2bb1c7eafc6c3936728cf3854ea05e92210abbf552e01dcbc974dc5238fc1a432ad7ff48fab3d662ea6081ff70fd86263ac11b SHA512 c285d7ed4bd26bb603f40f9d5e4e7262aea8a2679d14f65a4f8959a9bf2c622310422790e6221708fa227cd2c3bb2f4ba140eb5f23acc71b3f1ca20c04c4711a
diff --git a/sci-libs/mumps/mumps-5.3.5.ebuild b/sci-libs/mumps/mumps-5.3.5.ebuild
index 23e0f15d16a2..76f2dbe8d4d0 100644
--- a/sci-libs/mumps/mumps-5.3.5.ebuild
+++ b/sci-libs/mumps/mumps-5.3.5.ebuild
@@ -21,8 +21,8 @@ BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	virtual/blas
 	metis? (
-		   || ( >=sci-libs/metis-5 >=sci-libs/parmetis-4 )
-		   mpi? ( >=sci-libs/parmetis-4 )
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
 	)
 	mpi? ( sci-libs/scalapack )
 	scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] )
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index f3cfdc4f20f2..c6fd47d10f96 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -6,8 +6,10 @@ DIST openblas-0.3.12.tar.gz 12325103 BLAKE2B 3d6706e59e83f87dd58b287753bf697de99
 DIST openblas-0.3.13.tar.gz 12437434 BLAKE2B d8f9d3296506c6148cd506278f0b6a2a4fe50975a7fd3f54108e98e88a13002b1035f5697322ba73df7c6397faee6d0772c1d4d46b66db8e862f17b980dbdf97 SHA512 86e7f496587cc35d7feede99cbe3cf627ef690dd7489bb03b95f7d15ed758e32baf17d79f17b1de187184394233f60a8249a64dd53c3d59a9540db92269b7ee4
 DIST openblas-0.3.14.tar.gz 12460465 BLAKE2B 9505ff6e132581ecc86159fb84192c6bbce0f2974293eaf1b4aca6b96b5da85823bfc1bced65a96930674fd4781ea3e375aed09cbdc9930cef26694c9f8e1c80 SHA512 c7d5947ada525a32bc6e97ff94272df9730fa5fb06102e06e80472baedc1a9119d82050cdaede192db15f816ae7143784d7801b61b64fab5b5cf97cdbd5e625e
 DIST openblas-0.3.15.tar.gz 12498434 BLAKE2B acf3d15e002686bcd84323616387dcf540b58d57392a4862cb556da58d873a8c40783fc4fdae45170aeb204ede3451843c44e3f5e264f76c9a7486b30b3f4cc7 SHA512 c07964ead5ffe9cf088364697bfe5cb409170663e420bdcd08a6366a028625d2a3c23ee4ddbaf0e625860a9fd08cbbb39f97eb985c366c052696d6f8598a844f
+DIST openblas-0.3.16.tar.gz 12511373 BLAKE2B 7856ffa249f6a18102188b32f40327682c9e5f5fd5430e6bd628fd9b00a852a106a9053fe3116cd349ac35f30126bfa19c2dd9dcdfe79f7748a327bf6e53cf7d SHA512 cf5592fca7ff88ad6dc70fc0d87f6f63d3c76c923ebe9a7f62732739151b460a9b2e0d3a34ca541d7f0fb61e80b30d495020bd2c556fcaa408b9a4155f1b2d1a
 EBUILD openblas-0.3.12-r1.ebuild 5733 BLAKE2B b272b29e82e16ba4a47e16e78d97e4049dec58fddee0cad16d963012ef6344772f3661751ae796b6f28247172edd94d5db2b1eb3d84e195ec617f447d02b1b15 SHA512 3794725cf6daedb442892fe8971303d6d6fde25f0d55aec63f2ce7c8c5ffdb2cf48640a96d6f2ca839590bd1de1321e382ec47c4545cecef8573b9030d5ed692
 EBUILD openblas-0.3.13.ebuild 5734 BLAKE2B f2d4bde48b206c4d6e97029b617f0538978144b0e3e239cf79837bf6e1525dbe398a0d3af121368299752646217e3cd3e29c4f3d1e4e549fcb9ce9c1598c5f25 SHA512 846370655b16dbc45a518374e4c1714eb135a6fab2c36059c602ee4dc236b952eba54123e536a07b484d994a68f26b94ac740ef7f645083c0ccb855492195627
 EBUILD openblas-0.3.14.ebuild 5733 BLAKE2B b272b29e82e16ba4a47e16e78d97e4049dec58fddee0cad16d963012ef6344772f3661751ae796b6f28247172edd94d5db2b1eb3d84e195ec617f447d02b1b15 SHA512 3794725cf6daedb442892fe8971303d6d6fde25f0d55aec63f2ce7c8c5ffdb2cf48640a96d6f2ca839590bd1de1321e382ec47c4545cecef8573b9030d5ed692
 EBUILD openblas-0.3.15.ebuild 5734 BLAKE2B f2d4bde48b206c4d6e97029b617f0538978144b0e3e239cf79837bf6e1525dbe398a0d3af121368299752646217e3cd3e29c4f3d1e4e549fcb9ce9c1598c5f25 SHA512 846370655b16dbc45a518374e4c1714eb135a6fab2c36059c602ee4dc236b952eba54123e536a07b484d994a68f26b94ac740ef7f645083c0ccb855492195627
+EBUILD openblas-0.3.16.ebuild 5734 BLAKE2B f2d4bde48b206c4d6e97029b617f0538978144b0e3e239cf79837bf6e1525dbe398a0d3af121368299752646217e3cd3e29c4f3d1e4e549fcb9ce9c1598c5f25 SHA512 846370655b16dbc45a518374e4c1714eb135a6fab2c36059c602ee4dc236b952eba54123e536a07b484d994a68f26b94ac740ef7f645083c0ccb855492195627
 MISC metadata.xml 1560 BLAKE2B 1f49ef5d206bfe68783b2d7f235e5fc651ac750f84403eac6519a2c69c4eb35a31f784c67fd8e4c9f8e9ecdea46e5b325ed0725b45654528d56fe6d30460a829 SHA512 e3113c317b18c389e8055ec16e61426abf6f088f796e75939e78789884e2084d038bad754b2424a68e79fe1b83509d00b93bcfd72c2e3530185c780861b47f1d
diff --git a/sci-libs/openblas/openblas-0.3.16.ebuild b/sci-libs/openblas/openblas-0.3.16.ebuild
new file mode 100644
index 000000000000..4566f928af81
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.3.16.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/OpenBLAS-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test"
+REQUIRED_USE="?? ( openmp pthread )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	eselect-ldso? (
+		>=app-eselect/eselect-blas-0.2
+		>=app-eselect/eselect-lapack-0.2
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
+	"${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
+)
+
+pkg_pretend() {
+	elog "This software has a massive number of options that"
+	elog "are configurable and it is *impossible* for all of"
+	elog "those to fit inside any manageable ebuild."
+	elog "The Gentoo provided package has enough to build"
+	elog "a fully optimized library for your targeted CPU."
+	elog "You can set the CPU target using the environment"
+	elog "variable - OPENBLAS_TARGET or it will be detected"
+	elog "automatically from the target toolchain (supports"
+	elog "cross compilation toolchains)."
+	elog "You can control the maximum number of threads"
+	elog "using OPENBLAS_NTHREAD, default=64 and number of "
+	elog "parallel calls to allow before further calls wait"
+	elog "using OPENBLAS_NPARALLEL, default=8."
+}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+
+	# List of most configurable options - Makefile.rule
+
+	# https://github.com/xianyi/OpenBLAS/pull/2663
+	tc-export CC FC LD AR AS RANLIB
+
+	# HOSTCC is used for scripting
+	export HOSTCC=$(tc-getBUILD_CC)
+
+	# threading options
+	use openmp && tc-check-openmp
+	USE_THREAD=0
+	if use openmp; then
+		USE_THREAD=1; USE_OPENMP=1;
+	elif use pthread; then
+		USE_THREAD=1; USE_OPENMP=0;
+	fi
+	export USE_THREAD USE_OPENMP
+
+	# We need to filter these while building the library, and not just
+	# while building the test suite. Will hopefully get fixed upstream:
+	# https://github.com/xianyi/OpenBLAS/issues/2657
+	use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
+
+	# disable submake with -j and default optimization flags
+	# in Makefile.system
+	# Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT...
+	export MAKE_NB_JOBS=-1 \
+	       COMMON_OPT=" " \
+	       FCOMMON_OPT=" "
+
+	# Target CPU ARCH options
+	# generally detected automatically from cross toolchain
+	use dynamic && \
+		export DYNAMIC_ARCH=1 \
+		       NO_AFFINITY=1 \
+		       TARGET=GENERIC
+
+	export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \
+	       NUM_THREADS=${OPENBLAS_NTHREAD:-64}
+
+	# setting OPENBLAS_TARGET to override auto detection
+	# in case the toolchain is not enough to detect
+	# https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
+	if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then
+		export TARGET="${OPENBLAS_TARGET}"
+	fi
+
+	export NO_STATIC=1
+
+	BUILD_RELAPACK=1
+	if ! use relapack; then
+		BUILD_RELAPACK=0
+	fi
+
+	export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK
+}
+
+src_prepare() {
+	default
+
+	# Disable tests by default
+	sed -e "/^all ::/s/tests //" -i Makefile || die
+
+	# if 64bit-index is needed, create second library
+	# with LIBPREFIX=libopenblas64
+	if use index-64bit; then
+		cp -aL "${S}" "${S}-index-64bit" || die
+	fi
+}
+
+src_compile() {
+	default
+	cd interface || die
+	emake shared-blas-lapack
+
+	if use index-64bit; then
+		emake -C"${S}-index-64bit" \
+		      INTERFACE64=1 \
+		      LIBPREFIX=libopenblas64
+	fi
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	emake install DESTDIR="${D}" \
+	              OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
+	              OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
+
+	dodoc GotoBLAS_*.txt *.md Changelog.txt
+
+	if use index-64bit; then
+		dolib.so "${S}-index-64bit"/libopenblas64*.so*
+	fi
+
+	if use eselect-ldso; then
+		insinto /usr/$(get_libdir)/blas/openblas/
+		doins interface/libblas.so.3
+		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
+		doins interface/libcblas.so.3
+		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
+
+		insinto /usr/$(get_libdir)/lapack/openblas/
+		doins interface/liblapack.so.3
+		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
+		doins interface/liblapacke.so.3
+		dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so
+	fi
+}
+
+pkg_postinst() {
+	use eselect-ldso || return
+	local libdir=$(get_libdir) me="openblas"
+
+	# check blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm() {
+	if use eselect-ldso; then
+		eselect blas validate
+		eselect lapack validate
+	fi
+}
diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index e78ffc1c26a9..c46e5b19c64d 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -1,4 +1,7 @@
+AUX parmetis-4.0.3-01-cmake-paths.patch 1145 BLAKE2B 68b601d3421e88114a4cf3c6e580f92a9b5efa301e4480b55e820cfb18f75b1062b8ddec6e3aab0e49f97cbe0e8e8ac42d1db6f7f99f8f4d4bcdd2dad4ce8d2c SHA512 96892b7e8e8e4779233dfbc5737506a80454447eac0f0cbf07fa76aecc37dfe61bc16e5638bc36bc4f99ee89b259bd5f13a5fe4c5218b076810a498387ee01cf
+AUX parmetis-4.0.3-02-unbundle-metis.patch 300 BLAKE2B 4baa2ef83d09746ec74e058eb4aba8e5bf6cbdf1f1ed44bf2b5d7a858afc677ac639a605cdb060960d646f2effa6c6eb6b173ebc78a09253046c1fffef7bbe32 SHA512 9f242db228d02c57d93c710be4f1cf8535012d13134064ea21588faa884f689ceac8deab9cee1f00a7192d64601753121a906622dbc900c6efc7e86d0e857744
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
 DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132
 EBUILD parmetis-4.0.3-r1.ebuild 4028 BLAKE2B e5529c9b1ac73f54184fb85e7a8f3dc0bc5c80d5ae6e17ad23944fa45e227466ec9e4c671a366a7a8353bcbf05f5e320b7a581a14e4634d7c2472f549ef023ad SHA512 5c0945e3974c92c0f05d5bd0fb968e2d0b1efad060fe443d3b433408628b2182294526087f33d8387d0f37a4de35a8995dab4957d4fd585dad3c79a4e8bcf8fa
+EBUILD parmetis-4.0.3-r2.ebuild 1612 BLAKE2B 2b05eb691b497566512e5f0a8c594787605e9d12f2e035823280f7c128bf9b4e8bf280217052771d8689f9f57dc844e233f62826ffae4dca293a9cc06ef9239d SHA512 c4d03e7570394df645c2cfbdbd05c4ebf2edbdffc4dbce2fb262edbb33282724900f9354bc2488be3d042067d32b42d2e84e1667b5f6a3efcb1f282d708c7580
 MISC metadata.xml 851 BLAKE2B 8c8fc30f50378b05ae59ca1f829da71f2a5cf66dfab03f645ceed4379bc8edc176fb9e5d1f1f83bbb695519a9e14bfd7855e040f56070a344791eb70eed12721 SHA512 6309c02babe871cd0bdaf509caab79dd8b81face5f6f5a39a1473284dbae6859223ae4f65d61fcf08370bac29dfd0e174cb722fbeeaeb5c80d53b749c265c73a
diff --git a/sci-libs/parmetis/files/parmetis-4.0.3-01-cmake-paths.patch b/sci-libs/parmetis/files/parmetis-4.0.3-01-cmake-paths.patch
new file mode 100644
index 000000000000..cdff3c0ea490
--- /dev/null
+++ b/sci-libs/parmetis/files/parmetis-4.0.3-01-cmake-paths.patch
@@ -0,0 +1,37 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ cmake_minimum_required(VERSION 2.8)
+ project(ParMETIS)
+ 
++include(GNUInstallDirs)
++
+ set(GKLIB_PATH METIS/GKlib CACHE PATH "path to GKlib")
+ set(METIS_PATH METIS CACHE PATH "path to METIS")
+ 
+@@ -36,7 +38,6 @@
+ add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis)
+ add_subdirectory(include)
+ add_subdirectory(libparmetis)
+-add_subdirectory(programs)
+ 
+ # This is for testing during development and is not being distributed
+ #add_subdirectory(test)
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -1 +1 @@
+-install(FILES parmetis.h DESTINATION include)
+\ No newline at end of file
++install(FILES parmetis.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+--- a/libparmetis/CMakeLists.txt
++++ b/libparmetis/CMakeLists.txt
+@@ -9,6 +9,6 @@
+ set_target_properties(parmetis PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
+ 
+ install(TARGETS parmetis
+-  LIBRARY DESTINATION lib
+-  RUNTIME DESTINATION lib
+-  ARCHIVE DESTINATION lib)
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/sci-libs/parmetis/files/parmetis-4.0.3-02-unbundle-metis.patch b/sci-libs/parmetis/files/parmetis-4.0.3-02-unbundle-metis.patch
new file mode 100644
index 000000000000..f4e04eb48a94
--- /dev/null
+++ b/sci-libs/parmetis/files/parmetis-4.0.3-02-unbundle-metis.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,7 +35,6 @@
+ include_directories(${METIS_PATH}/include)
+ 
+ # List of directories that cmake will look for CMakeLists.txt
+-add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis)
+ add_subdirectory(include)
+ add_subdirectory(libparmetis)
+ 
diff --git a/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild b/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
new file mode 100644
index 000000000000..6d9599fec417
--- /dev/null
+++ b/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Parallel (MPI) unstructured graph partitioning library"
+HOMEPAGE="https://www-users.cs.umn.edu/~karypis/metis/parmetis/"
+SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples openmp pcre"
+RESTRICT="mirror bindist"
+
+DEPEND=">=sci-libs/metis-5.1.0-r5
+	virtual/mpi[fortran]
+	pcre? ( dev-libs/libpcre:= )"
+RDEPEND="${DEPEND}
+	!<sci-libs/metis-5.1.0-r5"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.3-01-cmake-paths.patch
+	"${FILESDIR}"/${PN}-4.0.3-02-unbundle-metis.patch
+)
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		use openmp && tc-check-openmp
+	fi
+}
+
+src_prepare() {
+	export CC=mpicc CXX=mpicxx
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGKLIB_PATH="${S}/metis/GKlib"
+		-DGKRAND=ON
+		-DMETIS_PATH="${EPREFIX}/usr"
+		-DOPENMP=$(usex openmp)
+		-DPCRE=$(usex pcre)
+		-DSHARED=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc Changelog
+	use doc && dodoc manual/manual.pdf
+	if use examples; then
+		docinto examples
+		dodoc -r Graphs programs
+	fi
+
+	cat > ${PN}.pc <<-EOF
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -l${PN}
+		Cflags: -I\${includedir}/${PN}
+		Requires: metis
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index 4ac8b8f3e799..4a559ccbe1c3 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -1,7 +1,14 @@
 AUX pastix-5.2.2.22-isnan-floating-point-cast.patch 1901 BLAKE2B 3bb02c4898367e02091793064ba23b329913d8567eeb721bc0de0e70acb63e4ab5345ebde859bf6c8b3b8796a6bad1d722cc51b9f5f41cd046974defa0f3e026 SHA512 23b3e4854afb459e0f68c4322bd85db6addc6ec043bb9c404a9a60667de6b01bb17c3d7795f8fd5dacaa0b5db6c45a6f1e1358590c77326610bc271903b920ee
 AUX pastix-5.2.2.22-nosmp-undefined-variable.patch 494 BLAKE2B 06a9e3933d0a181f535ad2922c3b39375d50b81abc572a1363e5e1130e3647083940ffc929e40cf93d35e364eb7e36d84d57a53bd9fe247ff8f7fefde93a08f7 SHA512 c12719176b352b396cc58d7a4474955df0cb01459edce1b2f220c6352d99bf608d39c3b4d6b54b0ae8b4643879ed79b7a5fbd03b746dba0bf4cc265d81d6d38e
+AUX pastix-6.0.3-cmake-examples-optional.patch 5248 BLAKE2B eb6e08274d2bbac53c4fe02497880f61a83eb357dc95ec6ea1049322556010a0e5514d8c6d0f273b00b7b46047394edf2108ee14ef0cde65f99ebe1eb2160786 SHA512 00c214c45cf4a1c06ca4dcf3cffde9915de67f2656b0712ca23f6ff2c4aa29845f37fd7940d011fbbba170d3a47b6d74ec6cb165474c2eb30a292374e0d52953
+AUX pastix-6.0.3-cmake-installdirs.patch 13450 BLAKE2B 9c7535b4074496a97d0673fad73e7729f34c71ad992441fa2dbc1d8801b6cf1d74773872b71fad5dec8f21ac26065abf0e7de12cbec2c9a52098be6368dd7b31 SHA512 89de15236d23fb8e7f9d064789e2a6314a615803a41deeb08f22f4ee5aea92263da939ce967310fd93a5cd89051c0f0a0d3df71b0ea4968cefbec3c5cf5185fe
+AUX pastix-6.0.3-cmake-python-optional.patch 1861 BLAKE2B 5097879c1481ce7514903a182007d0d87a9e59a350f72ebba21b5719e893308617416c3661058744f7a83009cb6c7d8949ba6e57966e0a798aa4b1c96aa1f928 SHA512 ecff70d902a4424b4ee996b563e54b7190ee1d3324ef7079fafdef2f23abbc9a18899f827156ed4145a3d977f5b6c980acafb96f479be693b6658f7d21e5cced
+AUX pastix-6.0.3-cmake-spm-project.patch 319 BLAKE2B 11d63d28bb5e843571306321a0c3153eac0cfa5150918db2ae019d8defda1689dd41d584bbd866f4016f3f98102c61a4bb5a18419f88bfc197cd3659afb95311 SHA512 58aebfea042443daf75fb155c39d44e5a2d4ffdc27043b66a6c6089613363b0613ab8ac9e11cde1b749e87ec160aaa0355a0c3a2bb01fbedb43c4d28951e7747
+AUX pastix-6.0.3-multiple-coeftabMemory.patch 260 BLAKE2B 968d32d2994afca84fcee7bc4b93aa7cf77dda2d66c2617095ee191572fb9c37d631e83954efdb53aba0997b426f85a6529d40a3c8f85f62de684548cc760447 SHA512 2f73d7f2ebbc92b46f13e0bed42ed76fd6831af5706988e5111971adb3ba46d8bca9fd563f40cb8a10fae1a65e180c2f1866b51ab0c4c95ef801c590513301f2
+DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544
 DIST pastix_5.2.2.22.tar.bz2 2664470 BLAKE2B b1fbd12bf2c882aa8fd2c4891a6890df4bdc4488cedca2a7861e676ec5678063927f2e4a4edc47aa7ca0422b283f8f012aa1032af7212fe39f4c55e7f0f7adc4 SHA512 15ecdb10b5229e40f744c1ad54be7cac6560cb92e90df1937c90ca7da290df6bdb6f24a1e1c54197731b9df3e0dcc0b9fa39750479fcf03a0c08c304c5b9df70
 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
-EBUILD pastix-5.2.2.22-r1.ebuild 3653 BLAKE2B 2fde445d7fa06f9c7f38fd61d23550df25a3c5b414eb309c7b2a5ebaac6ff844052e8cf612ba5d6e308c970e6d2d5d317b52a62365bec4fecd2e70614595fbf5 SHA512 884c7d5eec941cc2fc55597a62d674ec239a62ea3d66ec9811671b2841dcb0723937298abc9599011fc431bc8cf2c27aea9ea396936e78edccd4e8d4c19d57bb
-EBUILD pastix-5.2.3.ebuild 3340 BLAKE2B f8f0da2f1af8e8736c7697d1aabfa8d98975a743d1a3166233db6af4652c94baac68704c3817736f5b64c19bb407f2b345596af9d690852ee97623fceb8bee05 SHA512 9c31a8358f22cf6350da37a10a50e2963b48023d1c93d51039d1068cce46c8f8bab8b871cc4c35692b97342c9ab1d9c4938137b0bd440f2b8a0e0e47a0b350ad
-MISC metadata.xml 1055 BLAKE2B 237a5db431f2c60ea448c9627f943e88a7fd50509884af078c1de5b9ed51317806d815cf8f8ad9c1f85272077438df2d8c76e26fa9a1c9133bb17f3b1cd056ed SHA512 42f9f1f03c4a2df46918ef461d814ca3c0e80e0fa5420327a45d6ca7ec87dd3f14ad0e5a4384b49aebae971578a425b475fa0e1ed6b73370afb743222765bfde
+EBUILD pastix-5.2.2.22-r1.ebuild 3654 BLAKE2B d70d097c0a3f21422e40544bd0fc0ccd672df019c19400f4df5e2c6670c7c8fd69574a9bb60c88ac93a23ddb103503b68fe5013713a3f03f21e891207451b542 SHA512 c7c15a392edd6ff9e60b3e87b3878b17bcacb8fa506451f72347eb7c8d2a62c2eab7cef4aab640b5ba712b51a9cca6f7729c316f9159943f44105774d8195cfe
+EBUILD pastix-5.2.3.ebuild 3357 BLAKE2B c93431fa3f05b734306c3bbb4013cbdd8b4de61ddf215a64ebda59243a7ea04ebced5a88347be628576dc45edcdbc9f4f095e209785e62c7d3bc9b80670a7489 SHA512 ad8ba565ac13098b3b06c4f0d8572250bf3848b79422f9aa6ccace31012dc9323b634404fbbe99bc5e66fe93d31c37ab4bc855d6fa7bd86a8b99267473badfa9
+EBUILD pastix-6.0.3.ebuild 2387 BLAKE2B 4a925c57aa18beb437a145329e079413357ed6000606017a01ce4551dfb027abf452ae19addea10785dca0b8041597977ddbb5cf75743e860766d42a28916f94 SHA512 a753e8e4ce38ab3fcf4fb04aca8230aa9e9464854e8535cb020571a68b13f52efe472b7f2e3013f0fb1a26e7a766cbd2f4fb0bf0aad260e919eebbba69193a90
+MISC metadata.xml 1382 BLAKE2B 6645d0fa68bd78ec49fab235ec144026bde5af864fc07ec2f0a912fb30ff4fa7cc0fe2fc0998c110b78a1838347a4e8f1c9895285cc901bb47bcc32d0cfcd18f SHA512 c65101556a21a4f3348766deb2ad4593ebdfaf76e372886a438efc2f8b9d9f7291ee173b8339ddd245fce393f8e26f632fe184ef1585645d830649218987ff40
diff --git a/sci-libs/pastix/files/pastix-6.0.3-cmake-examples-optional.patch b/sci-libs/pastix/files/pastix-6.0.3-cmake-examples-optional.patch
new file mode 100644
index 000000000000..5f0701168271
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-6.0.3-cmake-examples-optional.patch
@@ -0,0 +1,170 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,6 +94,9 @@
+   "Build PaStiX with PaRSEC runtime support" OFF)
+ 
+ # Internal options
++option(INSTALL_EXAMPLES
++  "Install example code" OFF)
++
+ option(PASTIX_GENERATE_MODEL
+   "Enable performances profiling for model generation" OFF)
+ 
+--- a/example/CMakeLists.txt
++++ b/example/CMakeLists.txt
+@@ -38,15 +38,18 @@
+   )
+ set (example_install_dir "${CMAKE_INSTALL_DOCDIR}/examples/c")
+ 
++if (BUILD_TESTING)
+ foreach (_file ${EXAMPLES})
+   get_filename_component(_name_we ${_file} NAME_WE)
+   add_executable(${_name_we} ${_file})
+   target_link_libraries(${_name_we} pastix)
+   target_link_libraries(${_name_we} ${BLAS_LIBRARIES})
+-
+-  install(TARGETS ${_name_we} RUNTIME DESTINATION ${example_install_dir} )
+-  install(FILES   ${_file}            DESTINATION ${example_install_dir} )
+ endforeach()
++endif()
++
++if (INSTALL_EXAMPLES)
++
++install(FILES ${EXAMPLES} DESTINATION ${example_install_dir} )
+ 
+ ### Install a makefile for user compilation test
+ set( EXAMPLE_LIBS ${DEPS_LIBRARIES} )
+@@ -61,4 +64,6 @@
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/make/Makefile"
+   DESTINATION ${example_install_dir})
+ 
++endif (INSTALL_EXAMPLES)
++
+ include(CTestLists.txt)
+--- a/example/old/CMakeLists.txt
++++ b/example/old/CMakeLists.txt
+@@ -15,14 +15,17 @@
+   )
+ set (example_install_dir "${CMAKE_INSTALL_DOCDIR}/examples/c/old")
+ 
++if (BUILD_TESTING)
+ foreach (_file ${EXAMPLES})
+   get_filename_component(_name_we ${_file} NAME_WE)
+   add_executable("old_${_name_we}" ${_file})
+   target_link_libraries("old_${_name_we}" pastix)
+-
+-  install(TARGETS old_${_name_we} RUNTIME DESTINATION ${example_install_dir} )
+-  install(FILES   ${_file}                DESTINATION ${example_install_dir} )
+ endforeach()
++endif()
++
++if (INSTALL_EXAMPLES)
++
++install(FILES ${EXAMPLES} DESTINATION ${example_install_dir} )
+ 
+ ### Install a makefile for user compilation test
+ set( EXAMPLE_LIBS
+@@ -36,3 +39,4 @@
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/make/Makefile"
+   DESTINATION ${example_install_dir} )
+ 
++endif (INSTALL_EXAMPLES)
+--- a/spm/wrappers/fortran90/CMakeLists.txt
++++ b/spm/wrappers/fortran90/CMakeLists.txt
+@@ -43,15 +43,19 @@
+   )
+ set ( example_install_dir "${CMAKE_INSTALL_DOCDIR}/examples/fortran" )
+ 
++if (BUILD_TESTING)
+ foreach (_file ${EXAMPLES})
+   get_filename_component(_name_we ${_file} NAME_WE)
+   add_executable(${_name_we} examples/${_file})
+   target_link_libraries(${_name_we} spmf)
+ 
+-  install(TARGETS ${_name_we}       RUNTIME DESTINATION ${example_install_dir} )
+-  install(FILES   examples/${_file}         DESTINATION ${example_install_dir} )
+-
+   add_test(fortran_${_name_we} ./${_name_we})
+ 
+ endforeach()
++endif()
+ 
++if (INSTALL_EXAMPLES)
++  foreach (_file ${EXAMPLES})
++    install(FILES examples/${_file} DESTINATION ${example_install_dir} )
++  endforeach()
++endif()
+--- a/spm/wrappers/python/CMakeLists.txt
++++ b/spm/wrappers/python/CMakeLists.txt
+@@ -31,11 +31,13 @@
+   DESTINATION "${Python_SITELIB}/spm" )
+ 
+ # Install python examples
++if (INSTALL_EXAMPLES)
+ install(FILES
+   ${CMAKE_CURRENT_SOURCE_DIR}/spm_driver.py
+   ${CMAKE_CURRENT_SOURCE_DIR}/spm_scipy.py
+   DESTINATION "${CMAKE_INSTALL_DOCDIR}/examples/python"
+   )
++endif()
+ 
+ ## CTest execution
+   set( PYTHON_TESTS
+--- a/wrappers/fortran90/CMakeLists.txt
++++ b/wrappers/fortran90/CMakeLists.txt
+@@ -45,14 +45,13 @@
+   )
+ set ( example_install_dir "${CMAKE_INSTALL_DOCDIR}/examples/fortran" )
+ 
++if (BUILD_TESTING)
++
+ foreach (_file ${EXAMPLES})
+   get_filename_component(_name_we ${_file} NAME_WE)
+   add_executable(${_name_we} examples/${_file})
+   target_link_libraries(${_name_we} pastixf spmf)
+ 
+-  install(TARGETS ${_name_we}       RUNTIME DESTINATION ${example_install_dir} )
+-  install(FILES   examples/${_file}         DESTINATION ${example_install_dir} )
+-
+   add_test(fortran_${_name_we} ./${_name_we})
+ 
+ endforeach()
+@@ -66,10 +65,16 @@
+ add_executable(${_name_we} examples/${_file})
+ target_link_libraries(${_name_we} pastixf spmf)
+ 
+-install(TARGETS ${_name_we}       RUNTIME DESTINATION ${example_install_dir} )
+-install(FILES   examples/${_file}         DESTINATION ${example_install_dir} )
+-install(FILES   examples/test_seq.in      DESTINATION ${example_install_dir} )
+-install(FILES   examples/test_mt.in       DESTINATION ${example_install_dir} )
++endif (BUILD_TESTING)
++
++if (INSTALL_EXAMPLES)
++  foreach (_file ${EXAMPLES})
++    install(FILES examples/${_file} DESTINATION ${example_install_dir} )
++  endforeach()
++  install(FILES examples/fmultilap.f90 DESTINATION ${example_install_dir} )
++  install(FILES examples/test_seq.in DESTINATION ${example_install_dir} )
++  install(FILES examples/test_mt.in DESTINATION ${example_install_dir} )
++endif()
+ 
+ # Add OpenMP if available
+ find_package(OpenMP)
+--- a/wrappers/python/CMakeLists.txt
++++ b/wrappers/python/CMakeLists.txt
+@@ -32,6 +32,7 @@
+   DESTINATION "${Python_SITELIB}/pypastix" )
+ 
+ # Install python examples
++if (INSTALL_EXAMPLES)
+ install(FILES
+   ${CMAKE_CURRENT_SOURCE_DIR}/examples/simple.py
+   ${CMAKE_CURRENT_SOURCE_DIR}/examples/simple_obj.py
+@@ -39,6 +40,7 @@
+   ${CMAKE_CURRENT_SOURCE_DIR}/examples/schur_obj.py
+   DESTINATION "${CMAKE_INSTALL_DOCDIR}/examples/python"
+   )
++endif()
+ 
+ ## CTest execution
+   set( PYTHON_TESTS
diff --git a/sci-libs/pastix/files/pastix-6.0.3-cmake-installdirs.patch b/sci-libs/pastix/files/pastix-6.0.3-cmake-installdirs.patch
new file mode 100644
index 000000000000..a586981f37e7
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-6.0.3-cmake-installdirs.patch
@@ -0,0 +1,424 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,6 +13,7 @@
+ 
+ include(CMakeDependentOption)
+ include(CheckFunctionExists)
++include(GNUInstallDirs)
+ 
+ # The current version number
+ set(PASTIX_VERSION_MAJOR 6)
+@@ -516,7 +517,7 @@
+ configure_file (
+   "${CMAKE_CURRENT_SOURCE_DIR}/include/pastix/config.h.in"
+   "${PROJECT_INCLUDE_DIR}/pastix/config.h")
+-install(FILES "${PROJECT_INCLUDE_DIR}/pastix/config.h" DESTINATION include/pastix)
++install(FILES "${PROJECT_INCLUDE_DIR}/pastix/config.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pastix)
+ 
+ include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+@@ -844,9 +845,9 @@
+ # endforeach()
+ 
+ install(TARGETS pastix
+-  RUNTIME DESTINATION bin
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib)
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ # Install header files
+ set(PASTIX_HDRS
+@@ -861,8 +862,8 @@
+ )
+ install(FILES
+   include/pastix.h
+-  DESTINATION include )
+-install(FILES ${PASTIX_HDRS} DESTINATION include/pastix )
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
++install(FILES ${PASTIX_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pastix )
+ 
+ ## Executable and tests
+ enable_testing()
+@@ -934,8 +935,6 @@
+   "${CMAKE_CURRENT_SOURCE_DIR}/pastixf.pc.in"
+   PROJECTNAME PASTIX )
+ 
+-generate_env_file( PROJECTNAME PASTIX )
+-
+ #############################################################
+ #
+ #      Build documentation
+--- a/cmake_modules/morse_cmake/modules/GenPkgConfig.cmake
++++ b/cmake_modules/morse_cmake/modules/GenPkgConfig.cmake
+@@ -196,7 +196,7 @@
+     # ------------
+     install(FILES
+       "${CMAKE_BINARY_DIR}/lib/pkgconfig/${fname}.pc"
+-      DESTINATION lib/pkgconfig )
++      DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
+ 
+   endforeach()
+ 
+@@ -232,7 +232,7 @@
+   # installation
+   # ------------
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bin/${LONAME}_env.sh"
+-    DESTINATION bin)
++    DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ endmacro(generate_env_file)
+ 
+--- a/example/CMakeLists.txt
++++ b/example/CMakeLists.txt
+@@ -36,6 +36,7 @@
+   simple.c
+   step-by-step.c
+   )
++set (example_install_dir "${CMAKE_INSTALL_DOCDIR}/examples/c")
+ 
+ foreach (_file ${EXAMPLES})
+   get_filename_component(_name_we ${_file} NAME_WE)
+@@ -43,8 +44,8 @@
+   target_link_libraries(${_name_we} pastix)
+   target_link_libraries(${_name_we} ${BLAS_LIBRARIES})
+ 
+-  install(TARGETS ${_name_we} RUNTIME DESTINATION examples )
+-  install(FILES   ${_file}            DESTINATION examples )
++  install(TARGETS ${_name_we} RUNTIME DESTINATION ${example_install_dir} )
++  install(FILES   ${_file}            DESTINATION ${example_install_dir} )
+ endforeach()
+ 
+ ### Install a makefile for user compilation test
+@@ -58,6 +59,6 @@
+   "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.in"
+   "${CMAKE_CURRENT_BINARY_DIR}/make/Makefile" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/make/Makefile"
+-  DESTINATION examples)
++  DESTINATION ${example_install_dir})
+ 
+ include(CTestLists.txt)
+--- a/example/old/CMakeLists.txt
++++ b/example/old/CMakeLists.txt
+@@ -13,14 +13,15 @@
+   simple.c
+   step-by-step.c
+   )
++set (example_install_dir "${CMAKE_INSTALL_DOCDIR}/examples/c/old")
+ 
+ foreach (_file ${EXAMPLES})
+   get_filename_component(_name_we ${_file} NAME_WE)
+   add_executable("old_${_name_we}" ${_file})
+   target_link_libraries("old_${_name_we}" pastix)
+ 
+-  install(TARGETS old_${_name_we} RUNTIME DESTINATION examples/old )
+-  install(FILES   ${_file}                DESTINATION examples/old )
++  install(TARGETS old_${_name_we} RUNTIME DESTINATION ${example_install_dir} )
++  install(FILES   ${_file}                DESTINATION ${example_install_dir} )
+ endforeach()
+ 
+ ### Install a makefile for user compilation test
+@@ -33,5 +34,5 @@
+   "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.in"
+   "${CMAKE_CURRENT_BINARY_DIR}/make/Makefile" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/make/Makefile"
+-  DESTINATION examples/old )
++  DESTINATION ${example_install_dir} )
+ 
+--- a/kernels/CMakeLists.txt
++++ b/kernels/CMakeLists.txt
+@@ -149,8 +149,8 @@
+ 
+ ### Install library
+ install(TARGETS pastix_kernels
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib)
++	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ### Add generated files to the global property
+ add_documented_files(
+--- a/kernels/gpus/CMakeLists.txt
++++ b/kernels/gpus/CMakeLists.txt
+@@ -66,8 +66,8 @@
+ #     ${cuda_generated_files})
+ #   cuda_add_cublas_to_target( pastix_cucores_sm${_smtarget} )
+ #   install(TARGETS pastix_cucores_sm${_smtarget}
+-#     LIBRARY DESTINATION lib
+-#     ARCHIVE DESTINATION lib )
++#     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++#     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+ #   # if( NOT CMAKE_BUILD_SHARED_LIBS )
+ #   #   target_link_libraries( pastix_cucores pastix_cucores_sm${_smtarget} )
+ #   # endif()
+@@ -79,7 +79,7 @@
+ cuda_add_cublas_to_target( pastix_kernels_cuda )
+ 
+ install(TARGETS pastix_kernels_cuda
+-  LIBRARY DESTINATION lib
+-  ARCHIVE DESTINATION lib )
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+ 
+ cuda_build_clean_target()
+--- a/sopalin/parsec/CMakeLists.txt
++++ b/sopalin/parsec/CMakeLists.txt
+@@ -114,8 +114,8 @@
+ endif (MPI_C_FOUND)
+ 
+ install(TARGETS pastix_parsec
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib)
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ### Add non-generated documented files to the global property
+ add_documented_files(
+--- a/sopalin/starpu/CMakeLists.txt
++++ b/sopalin/starpu/CMakeLists.txt
+@@ -96,8 +96,8 @@
+ endif (MPI_C_FOUND)
+ 
+ install(TARGETS pastix_starpu
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib)
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ### Add non-generated documented files to the global property
+ add_documented_files(
+--- a/spm/CMakeLists.txt
++++ b/spm/CMakeLists.txt
+@@ -139,7 +139,7 @@
+ configure_file (
+   "${CMAKE_CURRENT_SOURCE_DIR}/include/spm_config.h.in"
+   "${CMAKE_CURRENT_BINARY_DIR}/include/spm_config.h")
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/spm_config.h" DESTINATION include)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/spm_config.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ include_directories(include)
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}/include")
+@@ -231,14 +231,14 @@
+ endif (MPI_C_FOUND)
+ 
+ install(TARGETS spm
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib)
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ install(FILES
+   include/spm.h
+   include/spm_const.h
+   include/spm_datatypes.h
+-  DESTINATION include )
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
+ 
+ ### Build pkg-config and environment file
+ include(GenPkgConfig)
+@@ -251,8 +251,6 @@
+   "${CMAKE_CURRENT_SOURCE_DIR}/tools/spmf.pc.in"
+   PROJECTNAME SPM )
+ 
+-generate_env_file( PROJECTNAME SPM )
+-
+ ### Add documented files to the global property
+ add_documented_files(
+   DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+--- a/spm/cmake_modules/morse_cmake/modules/GenPkgConfig.cmake
++++ b/spm/cmake_modules/morse_cmake/modules/GenPkgConfig.cmake
+@@ -196,7 +196,7 @@
+     # ------------
+     install(FILES
+       "${CMAKE_BINARY_DIR}/lib/pkgconfig/${fname}.pc"
+-      DESTINATION lib/pkgconfig )
++      DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
+ 
+   endforeach()
+ 
+@@ -232,7 +232,7 @@
+   # installation
+   # ------------
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bin/${LONAME}_env.sh"
+-    DESTINATION bin)
++    DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ endmacro(generate_env_file)
+ 
+--- a/spm/wrappers/fortran90/CMakeLists.txt
++++ b/spm/wrappers/fortran90/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ 
+ # Coherce CMake to install the generated .mod files
+ set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/mod_files)
+-install(DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/ DESTINATION include)
++install(DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ add_library( spmf
+   src/spm_enums.F90
+@@ -30,9 +30,9 @@
+ 
+ target_link_libraries( spmf spm )
+ install(TARGETS spmf
+-  RUNTIME DESTINATION bin
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib )
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+ 
+ #
+ # Add examples
+@@ -41,14 +41,15 @@
+   spm_driver.f90
+   spm_user.f90
+   )
++set ( example_install_dir "${CMAKE_INSTALL_DOCDIR}/examples/fortran" )
+ 
+ foreach (_file ${EXAMPLES})
+   get_filename_component(_name_we ${_file} NAME_WE)
+   add_executable(${_name_we} examples/${_file})
+   target_link_libraries(${_name_we} spmf)
+ 
+-  install(TARGETS ${_name_we}       RUNTIME DESTINATION examples )
+-  install(FILES   examples/${_file}         DESTINATION examples )
++  install(TARGETS ${_name_we}       RUNTIME DESTINATION ${example_install_dir} )
++  install(FILES   examples/${_file}         DESTINATION ${example_install_dir} )
+ 
+   add_test(fortran_${_name_we} ./${_name_we})
+ 
+--- a/spm/wrappers/python/CMakeLists.txt
++++ b/spm/wrappers/python/CMakeLists.txt
+@@ -9,6 +9,8 @@
+ #
+ ###
+ 
++find_package(Python COMPONENTS Interpreter REQUIRED)
++
+ # Configure enum.py
+ if (SPM_INT64)
+   set(SPM_PYTHON_INTEGER c_int64)
+@@ -26,23 +28,20 @@
+   ${CMAKE_CURRENT_SOURCE_DIR}/spm/__spm__.py
+   ${CMAKE_CURRENT_SOURCE_DIR}/spm/spm.py
+   ${CMAKE_CURRENT_SOURCE_DIR}/spm/enum.py
+-  DESTINATION lib/python/spm )
++  DESTINATION "${Python_SITELIB}/spm" )
+ 
+ # Install python examples
+ install(FILES
+   ${CMAKE_CURRENT_SOURCE_DIR}/spm_driver.py
+   ${CMAKE_CURRENT_SOURCE_DIR}/spm_scipy.py
+-  DESTINATION examples
++  DESTINATION "${CMAKE_INSTALL_DOCDIR}/examples/python"
+   )
+ 
+ ## CTest execution
+-find_package(PythonInterp QUIET)
+-if (PYTHONINTERP_FOUND)
+   set( PYTHON_TESTS
+     spm_driver spm_scipy )
+ 
+   foreach(example ${PYTHON_TESTS} )
+     add_test(python_${example} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${example}.py)
+   endforeach()
+-endif()
+ 
+--- a/wrappers/fortran90/CMakeLists.txt
++++ b/wrappers/fortran90/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ 
+ # Coherce CMake to install the generated .mod files
+ set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/mod_files)
+-install(DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/ DESTINATION include)
++install(DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ add_library( pastixf
+   src/pastix_enums.F90
+@@ -30,9 +30,9 @@
+ 
+ target_link_libraries( pastixf pastix )
+ install(TARGETS pastixf
+-  RUNTIME DESTINATION bin
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib )
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+ 
+ #
+ # Add examples
+@@ -43,14 +43,15 @@
+   fstep-by-step.f90
+   fmultidof.f90
+   )
++set ( example_install_dir "${CMAKE_INSTALL_DOCDIR}/examples/fortran" )
+ 
+ foreach (_file ${EXAMPLES})
+   get_filename_component(_name_we ${_file} NAME_WE)
+   add_executable(${_name_we} examples/${_file})
+   target_link_libraries(${_name_we} pastixf spmf)
+ 
+-  install(TARGETS ${_name_we}       RUNTIME DESTINATION examples )
+-  install(FILES   examples/${_file}         DESTINATION examples )
++  install(TARGETS ${_name_we}       RUNTIME DESTINATION ${example_install_dir} )
++  install(FILES   examples/${_file}         DESTINATION ${example_install_dir} )
+ 
+   add_test(fortran_${_name_we} ./${_name_we})
+ 
+@@ -65,10 +66,10 @@
+ add_executable(${_name_we} examples/${_file})
+ target_link_libraries(${_name_we} pastixf spmf)
+ 
+-install(TARGETS ${_name_we}       RUNTIME DESTINATION examples )
+-install(FILES   examples/${_file}         DESTINATION examples )
+-install(FILES   examples/test_seq.in      DESTINATION examples )
+-install(FILES   examples/test_mt.in       DESTINATION examples )
++install(TARGETS ${_name_we}       RUNTIME DESTINATION ${example_install_dir} )
++install(FILES   examples/${_file}         DESTINATION ${example_install_dir} )
++install(FILES   examples/test_seq.in      DESTINATION ${example_install_dir} )
++install(FILES   examples/test_mt.in       DESTINATION ${example_install_dir} )
+ 
+ # Add OpenMP if available
+ find_package(OpenMP)
+--- a/wrappers/python/CMakeLists.txt
++++ b/wrappers/python/CMakeLists.txt
+@@ -9,6 +9,8 @@
+ #
+ ###
+ 
++find_package(Python COMPONENTS Interpreter REQUIRED)
++
+ # Configure enum.py
+ if (PASTIX_INT64)
+   set(PASTIX_PYTHON_INTEGER c_int64)
+@@ -27,7 +29,7 @@
+   ${CMAKE_CURRENT_SOURCE_DIR}/examples/pypastix/pastix.py
+   ${CMAKE_CURRENT_SOURCE_DIR}/examples/pypastix/enum.py
+   ${CMAKE_CURRENT_SOURCE_DIR}/examples/pypastix/solver.py
+-  DESTINATION lib/python/pypastix )
++  DESTINATION "${Python_SITELIB}/pypastix" )
+ 
+ # Install python examples
+ install(FILES
+@@ -35,12 +37,10 @@
+   ${CMAKE_CURRENT_SOURCE_DIR}/examples/simple_obj.py
+   ${CMAKE_CURRENT_SOURCE_DIR}/examples/schur.py
+   ${CMAKE_CURRENT_SOURCE_DIR}/examples/schur_obj.py
+-  DESTINATION examples
++  DESTINATION "${CMAKE_INSTALL_DOCDIR}/examples/python"
+   )
+ 
+ ## CTest execution
+-find_package(PythonInterp QUIET)
+-if (PYTHONINTERP_FOUND)
+   set( PYTHON_TESTS
+     simple step-by-step schur simple_obj schur_obj )
+ 
+@@ -57,5 +57,4 @@
+     set_tests_properties( python_${example} PROPERTIES
+       ENVIRONMENT "${TEST_ENV_LIST}" )
+   endforeach()
+-endif()
+ 
diff --git a/sci-libs/pastix/files/pastix-6.0.3-cmake-python-optional.patch b/sci-libs/pastix/files/pastix-6.0.3-cmake-python-optional.patch
new file mode 100644
index 000000000000..71d356fae2f1
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-6.0.3-cmake-python-optional.patch
@@ -0,0 +1,64 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -100,6 +100,9 @@
+ option(PASTIX_WITH_FORTRAN
+   "Enable Fortran files/interface/examples to be compiled" ON)
+ 
++option(PASTIX_WITH_PYTHON
++  "Install Python wrapper and examples" ON)
++
+ cmake_dependent_option(PASTIX_DISTRIBUTED
+  "Enable the distributed interface (requires PASTIX_WITH_MPI)" OFF "PASTIX_WITH_MPI" OFF)
+ 
+--- a/spm/CMakeLists.txt
++++ b/spm/CMakeLists.txt
+@@ -83,6 +83,13 @@
+     "Enable Fortran files/interface/examples to be compiled" ON)
+ endif()
+ 
++if ( DEFINED PASTIX_WITH_PYTHON )
++  set( SPM_WITH_PYTHON ${PASTIX_WITH_PYTHON} )
++else()
++  option(SPM_WITH_PYTHON
++    "Install Python wrapper and examples" ON)
++endif()
++
+ if (SPM_WITH_FORTRAN)
+   include(FortranCInterface)
+   FortranCInterface_HEADER(src/FCmangle.h
+--- a/spm/wrappers/CMakeLists.txt
++++ b/spm/wrappers/CMakeLists.txt
+@@ -13,8 +13,10 @@
+   add_subdirectory( fortran90 )
+ endif()
+ 
+-if (BUILD_SHARED_LIBS)
+-  add_subdirectory( python )
+-else()
+-  message(STATUS "--- Python wrapper is disabled with static libraries")
+-endif()
++if (SPM_WITH_PYTHON)
++  if (BUILD_SHARED_LIBS)
++    add_subdirectory( python )
++  else (BUILD_SHARED_LIBS)
++    message(FATAL_ERROR "--- Python wrapper requested but it cannot be built with static libraries")
++  endif (BUILD_SHARED_LIBS)
++endif (SPM_WITH_PYTHON)
+--- a/wrappers/CMakeLists.txt
++++ b/wrappers/CMakeLists.txt
+@@ -13,8 +13,10 @@
+   add_subdirectory( fortran90 )
+ endif()
+ 
+-if (BUILD_SHARED_LIBS)
+-  add_subdirectory( python )
+-else()
+-  message(STATUS "--- Python wrapper is disabled with static libraries")
+-endif()
++if (PASTIX_WITH_PYTHON)
++  if (BUILD_SHARED_LIBS)
++    add_subdirectory( python )
++  else (BUILD_SHARED_LIBS)
++    message(FATAL_ERROR "--- Python wrapper requested but it cannot be built with static libraries")
++  endif (BUILD_SHARED_LIBS)
++endif (PASTIX_WITH_PYTHON)
diff --git a/sci-libs/pastix/files/pastix-6.0.3-cmake-spm-project.patch b/sci-libs/pastix/files/pastix-6.0.3-cmake-spm-project.patch
new file mode 100644
index 000000000000..f2ca9a5699d1
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-6.0.3-cmake-spm-project.patch
@@ -0,0 +1,12 @@
+--- a/spm/CMakeLists.txt
++++ b/spm/CMakeLists.txt
+@@ -8,9 +8,6 @@
+ #  @date 2013-06-24
+ #
+ ###
+-cmake_minimum_required (VERSION 3.0)
+-project (SPM C Fortran)
+-
+ # Check if compiled independently or within another project
+ if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+   set( BUILD_AS_SUBPROJECT OFF )
diff --git a/sci-libs/pastix/files/pastix-6.0.3-multiple-coeftabMemory.patch b/sci-libs/pastix/files/pastix-6.0.3-multiple-coeftabMemory.patch
new file mode 100644
index 000000000000..84dfdd4cc101
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-6.0.3-multiple-coeftabMemory.patch
@@ -0,0 +1,11 @@
+--- a/sopalin/coeftab.h
++++ b/sopalin/coeftab.h
+@@ -41,7 +41,7 @@
+ /**
+  * @brief List of functions to compute the memory gain in low-rank per precision.
+  */
+-coeftab_fct_memory_t coeftabMemory[4];
++extern coeftab_fct_memory_t coeftabMemory[4];
+ 
+ /**
+  * @}
diff --git a/sci-libs/pastix/metadata.xml b/sci-libs/pastix/metadata.xml
index 387eff2e8edd..1a653c7ffd2f 100644
--- a/sci-libs/pastix/metadata.xml
+++ b/sci-libs/pastix/metadata.xml
@@ -17,7 +17,11 @@
   block structure of the incomplete factors.
 </longdescription>
   <use>
-    <flag name="int64">Build the 64 bits integer library</flag>
-    <flag name="starpu">Build and link with <pkg>dev-libs/starpu</pkg></flag>
+    <flag name="cuda">Enable GPU support using CUDA kernels</flag>
+    <flag name="fortran">Install the Fortran interface</flag>
+    <flag name="int64">Use 64- rather than 32-bit integer representation</flag>
+    <flag name="metis">Enable matrix ordering with <pkg>sci-libs/metis</pkg></flag>
+    <flag name="scotch">Enable matrix ordering with <pkg>sci-libs/scotch</pkg></flag>
+    <flag name="starpu">Enable support for ther <pkg>dev-libs/starpu</pkg> runtime</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
index 4e3808900012..16806da1420a 100644
--- a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
+++ b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ PID=35070
 #SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${MYPN}_${PPV}${CID}.tar.bz2"
 
 DESCRIPTION="Parallel solver for very large sparse linear systems"
-HOMEPAGE="http://pastix.gforge.inria.fr"
+HOMEPAGE="https://pastix.gforge.inria.fr"
 SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${PN}_${PV}.tar.bz2"
 
 LICENSE="CeCILL-C"
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
index 3cd36ee0e4bd..767d81754b5e 100644
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ b/sci-libs/pastix/pastix-5.2.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit fortran-2 toolchain-funcs
 
@@ -16,12 +16,12 @@ inherit fortran-2 toolchain-funcs
 # package id: change every version, see the link on inriaforge
 PID=218
 DESCRIPTION="Parallel solver for very large sparse linear systems"
-HOMEPAGE="http://pastix.gforge.inria.fr"
+HOMEPAGE="https://pastix.gforge.inria.fr"
 SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.tar.bz2"
 
 LICENSE="CeCILL-C"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi +smp starpu static-libs"
 
 RDEPEND="
@@ -30,8 +30,8 @@ RDEPEND="
 	virtual/blas
 	mpi? ( virtual/mpi )
 	starpu? ( dev-libs/starpu:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}_${PV}/src"
 
diff --git a/sci-libs/pastix/pastix-6.0.3.ebuild b/sci-libs/pastix/pastix-6.0.3.ebuild
new file mode 100644
index 000000000000..a711d69037f3
--- /dev/null
+++ b/sci-libs/pastix/pastix-6.0.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9,10} )
+
+inherit cmake fortran-2 python-single-r1
+
+# package id: changes every version, see the link on inriaforge
+PID=38205
+DESCRIPTION="Parallel solver for very large sparse linear systems"
+HOMEPAGE="https://pastix.gforge.inria.fr"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/${PID}/${P}.tar.gz"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda examples +fortran int64 metis mpi +python +scotch starpu test"
+
+RESTRICT="!test? ( test )"
+
+# REQUIRED_USE explanation:
+# 1. Not a typo, Python is needed at build time regardless of whether
+#    the bindings are to be installed or not
+# 2. While not enforced by upstream build scripts, having no ordering at all
+#    results in rather spectacular test and runtime failures.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( metis scotch )"
+
+RDEPEND="sys-apps/hwloc:0=
+	virtual/blas
+	virtual/cblas
+	virtual/lapack
+	virtual/lapacke
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	metis? ( sci-libs/metis[int64(+)=] )
+	mpi? (
+		virtual/mpi[fortran]
+		metis? ( sci-libs/parmetis )
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/scipy[${PYTHON_USEDEP}]
+		')
+	)
+	scotch? ( >=sci-libs/scotch-6.1.0-r1:0=[int64=,mpi?] )
+	starpu? ( >=dev-libs/starpu-1.3.0:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.3-cmake-installdirs.patch
+	"${FILESDIR}"/${PN}-6.0.3-cmake-examples-optional.patch
+	"${FILESDIR}"/${PN}-6.0.3-cmake-python-optional.patch
+	"${FILESDIR}"/${PN}-6.0.3-cmake-spm-project.patch
+	"${FILESDIR}"/${PN}-6.0.3-multiple-coeftabMemory.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=yes
+		-DINSTALL_EXAMPLES=$(usex examples)
+		-DPASTIX_INT64=$(usex int64)
+		-DPASTIX_ORDERING_METIS=$(usex metis)
+		-DPASTIX_ORDERING_SCOTCH=$(usex scotch)
+		-DPASTIX_WITH_CUDA=$(usex cuda)
+		-DPASTIX_WITH_FORTRAN=$(usex fortran)
+		-DPASTIX_WITH_MPI=$(usex mpi)
+		-DPASTIX_WITH_PYTHON=$(usex python)
+		-DPASTIX_WITH_STARPU=$(usex starpu)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+}
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 72d0155b8d87..e4c7bac01ea6 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -3,5 +3,6 @@ AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c
 DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc851c3b6831eb2d16b7cf34a71d55463b266ffdee4c6addd4e66ca7caf75e63825051e600ee8a32494e5033cabbd SHA512 e6d217a23e39635f8749811a3fc64c8da14d0396a71b4042a4f8f3ce32ff1f0b4ed033ebae90f3785443dae9b35ded68ea512ed1e3e7f9ea9a471a499ae26b89
 DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2
 EBUILD scotch-6.0.4-r2.ebuild 5046 BLAKE2B 8e69b5110256582554ea1bdbc288f30bba8cb4316692f995f898e7fc16e27011b0d8dae00aba4d3fad6cfadcc82589625e42c43ebdf48f0c61440336d0cc61ec SHA512 5cd78fc6579b56ee2faf5a1b1ae6d584fede1e074513ed612b15b9bf4494ae3b7d89c3c9c9092df972576cc8a3955759667fe0dbfc6a27468089145fd8665497
-EBUILD scotch-6.1.0.ebuild 4935 BLAKE2B 94eba9a49a1ba532cd2fb6c70d09e06d298e4eb92313ee0fb8ab73a21661564a8da8eb2917415fc57c28c06e2e39a14cbdd6d823b21a1eade7fde27b845a168c SHA512 35a08e93c0b5e6d8e2e41d34ce8103598ccc1948520e4c569862fb3680faa7087a4495cb0b9c950a1559b7be3b9274928212919d3e7bc17f597d0c1ae5a170a4
+EBUILD scotch-6.1.0-r1.ebuild 4954 BLAKE2B 6f3067d0ffa3e230bdcdf6748dac63153f4978f4b018527efb7fa92eaf3fbd361bcc257d36559936a2c5be25c2591eb26fb1a266b1b1208c4a722f0ce126712b SHA512 ca7f02520153c68aafbcb687fd85a548ed5aa6df44b5c086063a6507152737b58b2b1c987676526882524f6d120939c88b4c16d193a8819049b1e5f76bef8e80
+EBUILD scotch-6.1.0.ebuild 4942 BLAKE2B abbe129155d654ca4bf9ea5be27a703f44beb31bf2626042f763120ecdf70aad3a145e2dee2068b34038d92d634d29fe189353176eed242f37487aa62cf2f874 SHA512 4364a04ccfd41d423d439072a45be468ce844b916fd2f302e0e4dc7585217ff39ed0e52406fb96016e5b457606175b64c118f9d525629ed506bf11c700548d9e
 MISC metadata.xml 1168 BLAKE2B e77807bd62ed2b78c83b9b0c99b4dd62f79259bacd1559a017ad7e22d5e7b23bfde27c512630da9243739f11a180ae76f280bf5b524ca5ef2b8adc95bf2ce207 SHA512 15d84db92f7c2fb144f9385686041193cd35b2dda682eb0cef254e9ee62a20d38b748131d3878f4a326568993a23eb0c971909d62402ea3f1c30f4ec89300968
diff --git a/sci-libs/scotch/scotch-6.1.0-r1.ebuild b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
new file mode 100644
index 000000000000..ff3058c464b6
--- /dev/null
+++ b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+SOVER=$(ver_cut 1)
+
+DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
+HOMEPAGE="https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch"
+SRC_URI="https://gitlab.inria.fr/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="CeCILL-2"
+SLOT="0/${SOVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc int64 mpi static-libs test tools threads"
+# bug #532620
+REQUIRED_USE="test? ( threads )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+static_to_shared() {
+	local libstatic=${1}; shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname ${SOVER})
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		VERS_COMP=${PV//.}
+		[[ "${#VERS_COMP}" -gt 1 ]] && \
+			ln -s ${soname} ${libdir}/${libname}$(get_libname ${SOVER})
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
+}
+
+src_prepare() {
+	default
+	use int64 && append-cflags -DINTSIZE64 -DIDXSIZE64
+	if use threads; then
+		append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)"
+	else
+		append-cflags "-DSCOTCH_PTHREAD_NUMBER=1"
+		sed -i \
+			-e 's/ -DSCOTCH_PTHREAD//' \
+			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
+	fi
+
+	# Be careful with replacing here, bug #577272
+	sed -e "s/= gcc$/= $(tc-getCC)/" \
+		-e "s/-O3/${CFLAGS} -pthread/" \
+		-e "s/= ar$/= $(tc-getAR)/" \
+		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
+		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
+		-e "/^LDFLAGS/ s/$/ ${LDFLAGS}/" \
+		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
+}
+
+src_compile() {
+	emake -C src CLIBFLAGS=-fPIC scotch esmumps
+	static_to_shared lib/libscotcherr.a
+	static_to_shared lib/libscotcherrexit.a
+	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr
+	static_to_shared lib/libesmumps.a -Llib -lscotch
+	static_to_shared lib/libscotchmetis.a -Llib -lscotch
+
+	if use mpi; then
+		emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps
+		export LINK=mpicc
+		static_to_shared lib/libptscotcherr.a
+		static_to_shared lib/libptscotcherrexit.a
+		static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt
+		static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch
+		static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch
+	fi
+	if use static-libs; then
+		emake -C src clean
+		emake -C src
+		use mpi && emake -C src ptscotch
+	fi
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/lib" emake -C src check
+}
+
+src_install() {
+	dolib.so lib/lib*$(get_libname)*
+	use static-libs && dolib.a lib/*.a
+
+	#install metis headers into a subdir
+	#to allow usage of real metis and scotch
+	#in the same code
+	insinto /usr/include/scotch/metis
+	doins include/*metis*
+	rm include/*metis*
+	insinto /usr/include/scotch
+	doins include/*
+
+	cat <<-EOF > scotchmetis.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: scotchmetis
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
+		Private: -lm -lz -lrt
+		Cflags: -I\${includedir}/scotch/metis
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins scotchmetis.pc
+
+	# not sure it is actually a full replacement of metis
+	#alternatives_for metis scotch 0 \
+	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
+
+	if use mpi; then
+		cat <<-EOF > ptscotchparmetis.pc
+			prefix=${EPREFIX}/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ptscotchparmetis
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
+			Private: -lm -lz -lrt
+			Cflags: -I\${includedir}/scotch/metis
+			Requires: scotchmetis
+		EOF
+			insinto /usr/$(get_libdir)/pkgconfig
+			doins ptscotchparmetis.pc
+			# not sure it is actually a full replacement of parmetis
+			#alternatives_for metis-mpi ptscotch 0 \
+			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
+	fi
+
+	dodoc README.txt
+
+	if use tools; then
+		local b m
+		pushd bin > /dev/null || die
+		for b in *; do
+			newbin ${b} scotch_${b}
+		done
+		popd > /dev/null || die
+
+		pushd man/man1 > /dev/null || die
+		for m in *.1; do
+			newman ${m} scotch_${m}
+		done
+		popd > /dev/null || die
+	fi
+
+	use doc && dodoc doc/*.pdf
+}
diff --git a/sci-libs/scotch/scotch-6.1.0.ebuild b/sci-libs/scotch/scotch-6.1.0.ebuild
index ebd2b1e8d84b..60cc08c6645a 100644
--- a/sci-libs/scotch/scotch-6.1.0.ebuild
+++ b/sci-libs/scotch/scotch-6.1.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi static-libs test tools threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index 5db0ee0ef71a..5bf38319c5a8 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -1,3 +1,3 @@
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
-EBUILD spqr-2.0.9.ebuild 1084 BLAKE2B fc8915b515cac36436d02c89f36d6fc707685095cfba07602a81c0bd7735f9557b40ffc7696f276c45bc5db3ae08eda8aea0c0077ccbaf25be807f98511f1875 SHA512 54ba1edac7a24f2750fd18d73ee883f00b6c0a5447948140802826d969db8b1ea6a6c078cb3010957dd35af15df641b821698192df742ada788c445e0335ff8d
+EBUILD spqr-2.0.9.ebuild 1091 BLAKE2B 5bac9a253dd349701303f59311b3a99580c4794726a518951c0a840160ab64d3b1b0eef85bdf4e97d8946a5079a2d1fb779475c5ccd0496dffb86df177214e22 SHA512 c4b6965c18c5ae02b055d20d62d02909cf06e101a364f53f87d5d6e0f2348c4fa1ea91f8c0b54cbfa824d805ba7eb8897599245a8ff6ebf0d273554c202a6eb8
 MISC metadata.xml 851 BLAKE2B 9fcb15232c55f46ea54af4b61f977e2c4f98e34950b30ed63a559c28c82f8d2b29882224e08121a47dd5b9ff245aaeaafcb03545c6567fbe5462e941ed650654 SHA512 de53a20986b9063a61fc548fdd1c059ac598b9a7db72bca683494fe6d82701e69e30d682e98adf4a72a43f30157f71d37c29930f00156626d369b6560b6ccda6
diff --git a/sci-libs/spqr/spqr-2.0.9.ebuild b/sci-libs/spqr/spqr-2.0.9.ebuild
index 72475fd658a1..7dab6a1a5d55 100644
--- a/sci-libs/spqr/spqr-2.0.9.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc partition tbb"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest
index 230f21166be8..e3a219614b21 100644
--- a/sci-libs/suitesparseconfig/Manifest
+++ b/sci-libs/suitesparseconfig/Manifest
@@ -1,3 +1,3 @@
 DIST suitesparseconfig-5.4.0.tar.bz2 257352 BLAKE2B 3832e34281c742a7d704dde866c53c742420486d782075e047b605fb2062d77353cda8670138c4bef62c73d16e123a8a74f65272a01766f124c1e53f9ba32e9d SHA512 e91f60f426b73add473c6341e30512b8fbe65b7850cd83f3852e78f1e74ce067b7ae1577ccc795698e680a841a9d32c2ca073651a4fe95f0b723578721aec874
-EBUILD suitesparseconfig-5.4.0.ebuild 777 BLAKE2B 1f7299b50bd8ada06fee936a0a34c3533d664d18f1296768bbe8435d9039e32b4d8f7c43f56f31640168b9fe67c436f53a57cee27e86fb12f1fca06effb6d420 SHA512 9b6d8e43d6c4e423c62dd95518cbbc0c72db0a18840e2dba44aa234844b56e17a47573eb799403a6d06eeb7912ad48f22b4d29cb070eb1cb2c694f138a45f24e
+EBUILD suitesparseconfig-5.4.0.ebuild 784 BLAKE2B 27b7baedd61060a48969227d5dbea86288104cf87bf763d312081563daa58205dae0c963bb4ad3d0a127deb038659aa9f3527430ce89c0032709f95b8657c862 SHA512 fc8319b8da3ea819426537c3d549c74f19791f2caa0c4fb77e48050717dca9a00532dd81c802f285dd827b45e34545c86b8866b22a96817df87786c4544675f4
 MISC metadata.xml 476 BLAKE2B f583e4dc6801797ee1572a38f1e4aaaac0811a709ce56a28d8e1f4f13f60f62a702b034809edc488d0b91920f8c5d40d48226213837d92a3e496cf65a6061c04 SHA512 fbbcd2de1d7b23e4eb45d8102fe76aa4251b83ce2b1fd7ef9cb599c7716ff662b8182060ce7b350ed3541b39483cf72c7c9ac810db1fe739f82406606412acb8
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
index 0db3b3f8a76c..c0b64751ce24 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 # SuiteSparse_config directory".
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index dd1d4373af30..04ec7f1bfd1a 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -4,7 +4,7 @@ AUX sundials-5.7.0-fix-license-install-path.patch 529 BLAKE2B 71aaf0c6362e77379f
 DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
 DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
 DIST sundials-5.7.0.tar.gz 22612286 BLAKE2B a21db0d07b8f2056ba244ca52f13bde51a2f745535c7381a4eecf9d8037df3d50f010c8fecd8e37d71150f101c8177b2e3f0ffbed8139702993e01b8ad52e707 SHA512 5e2b6145fdaa72e7d13f43e75e5bc08b9d7eb5b9e048207d5772ddab767e198af5be24b73a942a564a49d56ca0b47fe6493bd2de34a8a93948ccd1c13e5dd170
-EBUILD sundials-3.2.1.ebuild 2122 BLAKE2B 14b9cb8eaef1bb2a8dd749a5be242f7a026a040d316828aee9f6aab481df29fb5102862bacfbe7fd83c4ba74b10f633b3e76a754dcb2eccf7ae7d634d1886ff6 SHA512 e076b7de37302cd96f6c4b01931e02d4627b69514c69b1a8275373ac11196a6b19602a96f56c1be527ee1ed501dd4fd0df2517bda45d9721f15a6ba05e3fe606
-EBUILD sundials-5.2.0.ebuild 2181 BLAKE2B 105f2ddbd0d5ac00d4bce9a7b797eb8ea6cb9ee34f53db9a5e311cb2a8e1c6ce07f1c148f709db7dc08fdca506be63603dc81f84e28f879d5f4f764fa05d86f4 SHA512 a55f211ab31db02a3a43e3a2d0b8c6ed05a9a3f8fc91039c2b3f531d1ea87a9d80342d9a06819dec430db43f7bc240d9b53a61d63eb39c9c26ea1b00ee2b0e10
-EBUILD sundials-5.7.0.ebuild 2181 BLAKE2B ea0d04faa0d8d7ab2628e484c4fbe4951d1a88d886984672448d5ce3c4f81261de3a57184c41712344da7297bb4a6d8781e8d46382a8a685361a4258f71cc192 SHA512 ee874ca5bd81b49411eab3aa4c412f0aa1ee647fb76f5c7235986aecdff615dc6b8383bb6eb151b2b71d3e4a478ce9c1cb923b07240f54cea7bda0c6c7ee40a8
+EBUILD sundials-3.2.1.ebuild 2132 BLAKE2B b3ee9f4c99687181f963f5cdbd9d769293af28133c45513827081bd3708e6146afec228185355ec04e0204e8408ed70647e98655cb81c8d37e7fca06b739f2a9 SHA512 53c7d6434c0e32de3ce2e7975ec8dbcce0df268081bc0a1fe3372ca0e8c1223001e75f6ddbef7be66b1da3f5d2b9b0d715690c3985031731200480fe5b39f7ae
+EBUILD sundials-5.2.0.ebuild 2191 BLAKE2B 522ba0de818acec9ae05b929a032b6ae43389b215d53ff84ef296024fe18c893d60af374d3a1433ca8c46b5e32f0163c4142b1ba5d00ce3ffe76acc7bdf6e3b2 SHA512 4c1b05f3c4bb9160d20bff5e43a1b7d1d05529cacc8676f19056a7865f52081d1c9e07b8c535b7e8b8ad2c163f76622c5063d43003ee365f7cb591dcfdd2a9ef
+EBUILD sundials-5.7.0.ebuild 2191 BLAKE2B 7cae104967366aa6fe22b7974b4f5d827672d56a16a416cba9dfc7ee405d0c206bf9423b76e08d6dd3da6f91a749ea1d0beb33554cbd68a571e4a6c6b63ce727 SHA512 d6535c05b58aa9eee2c58744c7e748cfd79a7a064311184cab3fd4819ccf06b9fa8f576a8e2b87b6e9ac42b97ab650ab9eaa46ae8cb72e18778aac2f88f59b81
 MISC metadata.xml 1059 BLAKE2B 48ccadfac9b7ea4203334ffdadaa76ab3164273835c727e76085db3a5afc179404eb21c74aad77ceb368397377afb0efa27d798c849eab2ffc35153cd4fe7588 SHA512 47da8b9edc993c480a045642ad2746ff6180e54e1ad368823fd81b0d217e72c31394d7575cb4c2d5e5cfea065dffb01751bc8b1088f0f1a6feaaea15c2c7fb8f
diff --git a/sci-libs/sundials/sundials-3.2.1.ebuild b/sci-libs/sundials/sundials-3.2.1.ebuild
index 36bca3f96aa9..d58d6a9829ff 100644
--- a/sci-libs/sundials/sundials-3.2.1.ebuild
+++ b/sci-libs/sundials/sundials-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,7 +54,7 @@ src_configure() {
 		-DSUPERLUMT_ENABLE="$(usex superlumt)"
 		-DEXAMPLES_ENABLE="$(usex examples)"
 		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples"
 		-DUSE_GENERIC_MATH=ON
 	)
 	use sparse && mycmakeargs+=(
diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
index 3d60a524cc2c..c99c2b643966 100644
--- a/sci-libs/sundials/sundials-5.2.0.ebuild
+++ b/sci-libs/sundials/sundials-5.2.0.ebuild
@@ -64,7 +64,7 @@ src_configure() {
 		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
 		-DEXAMPLES_ENABLE="$(usex examples)"
 		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples"
 		-DUSE_GENERIC_MATH=ON
 	)
 	use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
diff --git a/sci-libs/sundials/sundials-5.7.0.ebuild b/sci-libs/sundials/sundials-5.7.0.ebuild
index de4ffc5ebcaf..dc933a9a83e0 100644
--- a/sci-libs/sundials/sundials-5.7.0.ebuild
+++ b/sci-libs/sundials/sundials-5.7.0.ebuild
@@ -64,7 +64,7 @@ src_configure() {
 		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
 		-DEXAMPLES_ENABLE="$(usex examples)"
 		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples"
 		-DUSE_GENERIC_MATH=ON
 	)
 	use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 18f0da948dd6..83a42260d26a 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -4,5 +4,5 @@ AUX superlu-5.2.2-no-internal-blas.patch 658 BLAKE2B 63c782d994b8caded0b707c2a26
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
 DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c
 EBUILD superlu-4.3-r2.ebuild 1635 BLAKE2B ba4e27e4efb6af31a9455169962183e0fd5846edcd2be58bf351d05efa049720841b24cb693f13b709b3141aabb2bcfc4b24ea6c5c0cb7aec273099d587b2c97 SHA512 c3a96fbda74aef2a155ccd532b5f0d42500ae693878359707c1055d7f9fbbe960c15e23fe27f364333112270311ca3e9a150606d2f03d4b023376a083d366265
-EBUILD superlu-5.2.2.ebuild 1170 BLAKE2B 2c65c4428e1564385032efb8c6d40cceca3c0b64f5c56d4f44f11e5f92f4eb241dd15e4510eff40546557eb211dbd04d5b2c1235db997850f65d394705587d3b SHA512 1480bbac2e9beb3333cd4c4c569da6e3089b9e8ae823e8f770ad464994a741497e65f39068eae439c29e6ef5a3d466ad06695ddb0b29058de2f342ade16f6ce6
+EBUILD superlu-5.2.2.ebuild 1177 BLAKE2B 5fd56a2a11d6b43057959bc45d8024c49d9a50e315ecfe5298181f90ad8a6add020d162495c0dec055386c20dd9e710eee31fce20d16e941c1b8d1ea51aa3d86 SHA512 8d95d9fe90b804249efae84486924baad16183813a98412f445dd68c0ba7a4607178988ad2b1220f49f269ab29f4f248b998c922d76b2dc068ecbffd3415df52
 MISC metadata.xml 1404 BLAKE2B 3ab566d18d18307d9fc7dea889e492e19b76aa9fdebe0dce86b46b1cf7a2d53f65404f56da04cc8420e6a7c21867b948e537833693cb60521746c5a48f16bc6b SHA512 8b758572ed599bdf43898050e265ce8ea82c4952af97471c09ee0013e56cf6928df3f3a436516c4fae7a38a13bba4a3437e130f294f942eaaae05125fa5fbdea
diff --git a/sci-libs/superlu/superlu-5.2.2.ebuild b/sci-libs/superlu/superlu-5.2.2.ebuild
index 6753908584c6..8c50ab63c95f 100644
--- a/sci-libs/superlu/superlu-5.2.2.ebuild
+++ b/sci-libs/superlu/superlu-5.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU//${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index aba0f14a0e2e..555551cc9c28 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,3 +1,5 @@
+DIST szip-2.1.1.tar.gz 415774 BLAKE2B e0f8d1f6528801c422a4db0f0cad43dd2c17f913dfff85962f4b4d448176903bcb385f631d32c5328cfb114527220baa9fb7d560364f700a61d4930ce799a7a4 SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd
 DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 714 BLAKE2B 9dc26725ac8c60c2ef6584e8539a53b65fd57f06bc0f532d2fa01c237965682d4af51c8b80d62522d4caf7bb52b65a377e3b544e6be2385a2e7f8314327d034c SHA512 9b7048475053f2086c4d5a76e790f077bb2d6a3c3058a8e6dfb59c6f03544c91bfae640fdd44d5ef6d1aa787c869fb7a92d3f5ce5ca6795a62c98e22adb57796
+EBUILD szip-2.1-r2.ebuild 721 BLAKE2B 158b84da0268e40008349a0c99448b28ede89802cbafebea5d85f3aa055f614ec7417cc0a0f4d93b16678e93c37dd25bd7463f79d2d0123008a72b76a4ecfcbf SHA512 25e9de35c1298ff24cb3476084102cad0bfd1effe2c79f24b147846eeb5906222325ef719d125de41b15d6db007ea962a018472840b0f7446ec6eae0f39f5ec1
+EBUILD szip-2.1.1.ebuild 734 BLAKE2B 78d794364d8a991f06531ba165dbf5d466624680c64ab138cf4aeff46d48c460c2b105e760d542cc5e76867524fb625a018132952aba28f4ef8590444ab782a8 SHA512 2567122aa671952e4e259a36b35caad512411cbd573ce1639bc14f10b74f679fe4dd961d3bdc2ad8432bc74315a99dec9f369d98b1af6a8b34320b4971e231fb
 MISC metadata.xml 765 BLAKE2B a720dfb9f71c9f9adc5e539b2a791b8edcd2fce2b1540b17066c09e1d3895d40e147ddd2ef86499c6a9db3c2c68c3bb9aae3357f13d86370d7fba8069f968368 SHA512 c56edc42adeff2e523e9a312b0393f45647b2a902334221d2b9842afa1ecd885a17f108041cad69a0797bdc1eb58c75672226a0c3a2f4c8f561ab8a70eb28b27
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index 7a6d73025d4d..7d7d1addd355 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
 
 LICENSE="szip"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/sci-libs/szip/szip-2.1.1.ebuild b/sci-libs/szip/szip-2.1.1.ebuild
new file mode 100644
index 000000000000..cf6d7a964766
--- /dev/null
+++ b/sci-libs/szip/szip-2.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Extended-Rice lossless compression algorithm implementation"
+HOMEPAGE="https://www.hdfgroup.org/doc_resource/SZIP/"
+SRC_URI="https://support.hdfgroup.org/ftp/lib-external/${PN}/${PV}/src/${P}.tar.gz"
+
+LICENSE="szip"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="!sci-libs/libaec[szip]"
+DEPEND=""
+
+DOCS=( RELEASE.txt HISTORY.txt test/example.c )
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/sci-libs/taucs/Manifest b/sci-libs/taucs/Manifest
index f72dcd1cdcc3..b0b16e8de1bc 100644
--- a/sci-libs/taucs/Manifest
+++ b/sci-libs/taucs/Manifest
@@ -1,4 +1,4 @@
 AUX taucs-2.2-respect-ar.patch 635 BLAKE2B 59ea54427651adc597caf85bf5eafe8055a6223e3c588939519e660661ffec4082d574c08aebff8106508f4b5afe147d1f7ef5c1972b17461d286273c9cbb76a SHA512 b18551f3d386ebd203b422c9848bfb14c7d8bb67e0facb450869d0846ca23e35902339cfa519ef7b33d1cf0dfb6301bad5b9f2fcd2035d1e02b150a0c15a26e3
 DIST taucs-2.2.tgz 1573863 BLAKE2B 21cf7479d7ce1f27678431e0d3dcaea1b3f8b11071b44651207791d6980bf5be0ed51cab7915f9e8da88d5da777c0f03a8d058e2ac8881e0d0b244ddfd796f5c SHA512 d8652de2da343dfd19c4278ac99313bcb577d976decdd3bd3875f0c9576832605b787feaef916eb4e82f22907c8bd029125c2ae56c827639e4d535ad62f20fcf
-EBUILD taucs-2.2-r1.ebuild 1997 BLAKE2B 4d07ae35b27129cf2c6a17910111d52b5b33e370bcc18087b95f25af494ee0d6943b201767d0d508d57039da8acdaf3874e3ea97804342ebc63306db917ac5fe SHA512 315061fe8bad3c7119fd0ed59bb54f9d223315f5caab6638743a2c81bc9e2595914ab7fc349bf6feec4d0247b9de58c68d632e6f4ce6e1de121c9b7a44aa271e
+EBUILD taucs-2.2-r1.ebuild 1967 BLAKE2B a9e232cadb1bd1a1f35335fd645b4103a2e9d44539bae7b83b009c79c1ae946fa6c423ef6def6f1a806ecc527f2305d4e650f667cd1ee14b3d221d42e415a450 SHA512 e2931a7f3ef767f77a04bb1b7bb9ad2d200181a45b34d782d92f73049c8406e3b7230a30bf3744231c6565e5705df539a4d0aa38fec0a0a877d1d0a63cc1e124
 MISC metadata.xml 1069 BLAKE2B 783b081a16b2dd176345b558851e2c75b18b0168b058dee68140dfcdd453e821da618d11f27526af9d0f366d5107b881d4fc0011d0942de57de6a34dbbcd59f1 SHA512 c5437d4746e208ca8e43f36460b6db73c6c25193b01b3f08d112f4b0fe6b48f53fb8cede5a53e432817243665d7a8e32c00cc19ea8dd0cd9e16dadc5f7a5ee23
diff --git a/sci-libs/taucs/taucs-2.2-r1.ebuild b/sci-libs/taucs/taucs-2.2-r1.ebuild
index 7b91afeeed64..5d5cecde57a0 100644
--- a/sci-libs/taucs/taucs-2.2-r1.ebuild
+++ b/sci-libs/taucs/taucs-2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,12 +16,9 @@ IUSE="doc"
 RESTRICT="test"
 
 RDEPEND="
+	sci-libs/metis
 	virtual/blas
-	virtual/lapack
-	|| (
-		sci-libs/metis
-		sci-libs/parmetis
-	)"
+	virtual/lapack"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest
index ddd4bb13b153..3e6bbec07381 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -1,4 +1,4 @@
 DIST trilinos-13.0.0-patches-r0.tar.xz 7672 BLAKE2B 6412f1226549086ef2fca3c4d8bba3c5541489879f4fa37c3598a7271128e3232fa1cc56a51d44fb88d679458a79a082c3984085ddbe4bc0884b0cb45ba683c0 SHA512 91372fe0f47a1f5d4dbc1856e2cfb9d4f1eb8cc0de941013a7a6e791730c9e10decdcd4ca39b36bae836ac66040bee70af187b4a056d46b0da0fe72e8c5943fc
 DIST trilinos-13.0.1.tar.gz 157950374 BLAKE2B 79f337b02a0fe9ddf7b55334e035946204b3bb469b92fff4063896a378c82d9c5f04c0bf0e9ddd21603ecf9d84a91860606482b545916f16029a11d2b6c64aa0 SHA512 22241a9ad8b6b6ab9117aba254f65195fc0c8e1b52eacb16e763c999086b6da6b0c180d8864fbe421704e0fe0c433d37512099755d54e60f13ed525dc6c0fd57
-EBUILD trilinos-13.0.1.ebuild 6486 BLAKE2B 4e8818107f9b7252031d4c006813e48cda70b03ccb4f45fefe81bac57b44ae75bea8ec59203995d55c27a6bf67e7ebfec6d156db928efe5ea94e02f1f8bd6333 SHA512 48948df368a736614b2a89fcea6d58b35d248f88a7098f5ba20d8a7f26d8ed7c849cf274e07ea4f3e5f8c07a4d1e53a1651596cd96064fee95f9574104197b40
+EBUILD trilinos-13.0.1.ebuild 6461 BLAKE2B d82b9cd918fb3a43c5112d840e817d8f8ae67a29a504b9a771c027830df3ad8891dfdefcf4dd0ab20110460fc3f6a29212d9bae0c5eb9a08e74d71371f97afc3 SHA512 705a0e3975384c78bd28c3608d98fc19fbe68ab5fd71952558b3703cd93d91a665b5a0c1e3d5293db95b593d99bc6eeb9674902447f3ed37cc6404933fc8f698
 MISC metadata.xml 2778 BLAKE2B 45cb2a647a1730c9b6b21271364b5f4acaf145f6ae33db356d0b9be7584705c29a645d3f96abfe0a9b87540ae55ab586ec202191776f4472b66291c274b9f24b SHA512 c58e98197353efe1c6fef038dd53d4a938e85aa66fc53f00cab0133d8ee89c629eead55c270c88583778b193f0a85b498c7235fc3f1e8f45a1abfff2d5f0cbec
diff --git a/sci-libs/trilinos/trilinos-13.0.1.ebuild b/sci-libs/trilinos/trilinos-13.0.1.ebuild
index 511aa77ec426..462a25dc6efd 100644
--- a/sci-libs/trilinos/trilinos-13.0.1.ebuild
+++ b/sci-libs/trilinos/trilinos-13.0.1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 	hwloc? ( sys-apps/hwloc )
 	matio? ( sci-libs/matio )
 	mkl? ( sci-libs/mkl )
-	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
+	metis? ( sci-libs/metis )
 	mumps? ( sci-libs/mumps )
 	netcdf? ( sci-libs/netcdf )
 	petsc? ( sci-mathematics/petsc )
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index 6884c9af823c..23b7501e096d 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -1,3 +1,3 @@
 DIST umfpack-5.7.9.tar.bz2 772026 BLAKE2B 6d6dc1ba47b8f473884c1cb17d3eaa363d88281512e33586a0af0c2bcb7a523272bef4d8da0a29e2a5a84c8f0cd0ee6830ec10247971db63b4c319e6fa9a3c42 SHA512 5ad57467b5b7e4579f3cc9e2e7c92a0262ac2ef991a606d079b749b66e10da60aceaa4b0e741c116f8866da23c0f7c06368fe2b08d66d51383683f0dcbeddba3
-EBUILD umfpack-5.7.9.ebuild 955 BLAKE2B dbb8e9cc519a5191e824339c5aad31a14c58b777fefb60313789042f20940f25708cb3d18531f1bdbe1b7ee51c64045af127d9efa99b9bfc886098e609a1cb52 SHA512 ef8c7e190eb9590eddfdd8821ef931c54204e7eea96de7fbfd940d0b763eb22b3d5058562fb849080560cef67f1536caa21196aa8b961c60de9146fb4d599a6b
+EBUILD umfpack-5.7.9.ebuild 962 BLAKE2B 59bcdc2ba82de1619395654faa263987a1d21743387e3f673b79d8d50ae9e4554c2a12200eef514f24929b7ef5b7b599084242ff221a99ee86794cca92a8425e SHA512 bd39011b24e397b3e85ddf6aae36e901c967671ab07cbc2f0144c4a540df112fd8775d295b453dd2093eaf38bc5be8837a532c339452610f653adf4499a1a5bc
 MISC metadata.xml 667 BLAKE2B 1e0018ea7f7433ce19bfc6e364a30731e5e02f657502f721513da4191752b97c7a3d8352707e1036f0e5fe81ffb81ed3862cc2b213ca89e80067a06a82e5b078 SHA512 c204d7f86f2338f9571a46773c251dab31caa3d5bfbe4ae87326466026616d80737435d8cdbf0ae8cb5e109d8b52a5b6ccba09f8b52f38dfe9058049ef541007
diff --git a/sci-libs/umfpack/umfpack-5.7.9.ebuild b/sci-libs/umfpack/umfpack-5.7.9.ebuild
index 6f99b79f5072..cdb347c9c849 100644
--- a/sci-libs/umfpack/umfpack-5.7.9.ebuild
+++ b/sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cholmod doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 5b39bcc12246..9171dd5e88e5 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index cd18f8668205..5be33ed07c1f 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -4,5 +4,5 @@ AUX glpk-4.65-longstep_verbosity.patch 844 BLAKE2B c1d14e6dfd596694bf1da06012971
 DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375
 DIST glpk-5.0.tar.gz 4132649 BLAKE2B f8204f66a97af950c13ee72ee9541f305745741d1231325670ede14663cb6c28ec6fbc44b3625973f1924ca078183d1d43f494ad43a7b48b45be131882b00001 SHA512 4e92195fa058c707146f2690f3a38b46c33add948c852f67659ca005a6aa980bbf97be96528b0f8391690facb880ac2126cd60198c6c175e7f3f06cca7e29f9d
 EBUILD glpk-4.65.ebuild 1821 BLAKE2B 47fa4cb29950a15f1293571e82a5780b64d486b5cb3fef2ff7f1cf948122282bba52dc123287eb8e6e12e9d3bf48f4addd1063d92f9d0e3372141a5adba82f98 SHA512 159df1be098e9fee4297e150a7656ff1b129145fe7aa744fb6627863ce2628077cde4e5442dd7266f4abfc342303872e50d7c69d19d1c5758fa2cb922f2fab35
-EBUILD glpk-5.0-r1.ebuild 2329 BLAKE2B ba339c80c007b8880a0b9f2ace42aa1639acee1aee03d4c9f9c35cda190d6fc1b94c7a34d75dc240770143faeb15f3e4f6b4653da45eea19e20d863cb1087097 SHA512 a5cc73dac8f85f90d3b246ce73b41a5afb56cb6e83bd0ec1152f8e109fbd1683c007ee475b82452260abf85f4acb1af14346874fd58be2b8e99fac43a9cf9b33
+EBUILD glpk-5.0-r1.ebuild 2336 BLAKE2B 821974d489f02a21438766a8678587370bcef97676439c6dbe198a3d26164eadb96e2e77c08658336b0a29d5c10b90d52cc47ebdabe63345f9347e05a2e3159f SHA512 7d14e21f0d29dae45379a0f5c4c43e36ab7570c3a0bc1ba3e2b1a2b4ab751f1e9dd260ee6417b75d567aef32767603f2dbd7e86dd2c79ea90dfd0f4fae9ecd4c
 MISC metadata.xml 1028 BLAKE2B 01e42a8b9c7ec521837e6a21d212ce7c747d47fcdaa47b58ac0bf411c158155caefc316f71f2f495244f559cb77de428954d293efde12cbd4418c9dfad3893a9 SHA512 1c7e827666da76204db3894e0d5bdc7ba253152935fe214445ada4f1d6876cff44b3092fc736c8da9fb915d80479a600175e579e71cfcd817e5e52065ae6446c
diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild
index 8bf55ceb4aa2..1d6d7344baa2 100644
--- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild
+++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/40"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gmp odbc mysql"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-mathematics/lcalc/Manifest b/sci-mathematics/lcalc/Manifest
index 91bed20cbffa..113816374ed7 100644
--- a/sci-mathematics/lcalc/Manifest
+++ b/sci-mathematics/lcalc/Manifest
@@ -1,3 +1,3 @@
-DIST lcalc-2.0.2.tar.xz 849376 BLAKE2B a6e14a368bcf6e36f19a8b7d22b74555101f4a25d8e178ac51b8138610cc43ad3e9a71eac70596360627fb62791a28a9cca0148abb1966689037b63dfcee99d8 SHA512 b551d712d500cf061966afe85abbcc1fc27ac9c93676cf546d0c3c9a6ad13bf36efe2761394f4aa334a508640fe5ca40bcabec982126e6f5d34b6ab0be52ee75
-EBUILD lcalc-2.0.2.ebuild 925 BLAKE2B 797247eafa59fefda565c24c7c8698cc284faf32cc59b3a0b4c4285e2c77a6a9a884f714aaf168313debaba42546a01ee46600510e517419ec7707289961ee33 SHA512 cd69b786fce42c423067f5e62913ba8c32c99850d7d03c0f4400a7a0c9591dfa07b60e23867d37ec3cd8d7aebf29534ea5e0c17fb9de743db9fd0b8277d43902
+DIST lcalc-2.0.3.tar.xz 825904 BLAKE2B c2daab62de1d5bfb024a8246a965d850480cf313efe4f0ddb7561c28d2cae2aa231fea5c07e073d21e04cfcf2b558f931472825f9100e6ab4585ac87d80b4d3a SHA512 33d7cff04d88b62775a69b5b38eea41c24bdb88592d5185fbf9c13ea0c62a7c07c041f7f4e5c06415a3983b0ba369f3c9766a556090a6282e1cd7003ad25ba46
+EBUILD lcalc-2.0.3.ebuild 925 BLAKE2B 66c21602cb5f2d6f18e2c8b7932b25a17a8b62cb4ae91ddbc36b74a0b846d65baea04b4c231b07aebeace81e29c57bccce4761a906764c03bdbdc1d3055d61f5 SHA512 5e4281cf2131eb78f77a59d47129559e1fc0979bedd312a7a40bd6e6406ee0478acf5516c8693922ca14fdbc6bd1ec2eab500d9da7bd6478cc2bbfd304aba3c3
 MISC metadata.xml 1164 BLAKE2B 0b8bfe9b7d489fba6618a15f52b58a176247d656c36e985d37a67fbc53af2a3479e3b87a113e96c958235758ff88f1c1ed3905c45e74f093359fd70605b03ccf SHA512 424af9bcee1342d88f3b5ec6a4fca3bc4be9a2fda41db399526c805b73bf67896a0f0e12b876166cc72b0093b0add8764d325b387476b2bf61cb560d7b41fdce
diff --git a/sci-mathematics/lcalc/lcalc-2.0.2.ebuild b/sci-mathematics/lcalc/lcalc-2.0.2.ebuild
deleted file mode 100644
index 029a32215c02..000000000000
--- a/sci-mathematics/lcalc/lcalc-2.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Command-line utility and library for L-function computations"
-HOMEPAGE="https://gitlab.com/sagemath/lcalc"
-SRC_URI="https://gitlab.com/sagemath/lcalc/uploads/e7158e6f51f40012ea97fbb9c798da56/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-# The subslot is the libLfunction soname major version
-SLOT="0/1"
-KEYWORDS="~amd64"
-
-# Omit USE=mpfr for now because it's broken upstream:
-#
-#   https://gitlab.com/sagemath/lcalc/-/issues/7
-#
-IUSE="+double double-double quad-double pari"
-REQUIRED_USE="^^ ( double double-double quad-double )"
-
-BDEPEND="dev-util/gengetopt"
-DEPEND="double-double? ( sci-libs/qd:= )
-	quad-double? ( sci-libs/qd:= )
-	pari? ( sci-mathematics/pari:= )"
-REPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_with pari) \
-		  --enable-precision="$(usev double)$(usev double-double)$(usev quad-double)"
-}
diff --git a/sci-mathematics/lcalc/lcalc-2.0.3.ebuild b/sci-mathematics/lcalc/lcalc-2.0.3.ebuild
new file mode 100644
index 000000000000..5b9484978747
--- /dev/null
+++ b/sci-mathematics/lcalc/lcalc-2.0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Command-line utility and library for L-function computations"
+HOMEPAGE="https://gitlab.com/sagemath/lcalc"
+SRC_URI="https://gitlab.com/sagemath/lcalc/uploads/32cb4e639e3c1051eb6caf19dfe0769b/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+# The subslot is the libLfunction soname major version
+SLOT="0/1"
+KEYWORDS="~amd64"
+
+# Omit USE=mpfr for now because it's broken upstream:
+#
+#   https://gitlab.com/sagemath/lcalc/-/issues/7
+#
+IUSE="+double double-double quad-double pari"
+REQUIRED_USE="^^ ( double double-double quad-double )"
+
+BDEPEND="dev-util/gengetopt"
+DEPEND="double-double? ( sci-libs/qd:= )
+	quad-double? ( sci-libs/qd:= )
+	pari? ( sci-mathematics/pari:= )"
+REPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with pari) \
+		  --enable-precision="$(usev double)$(usev double-double)$(usev quad-double)"
+}
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index af8cd148f9cb..09e146dc18c6 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -2,7 +2,6 @@ AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91
 AUX singular-4.0.3-gfan_linking.patch 705 BLAKE2B 9ec4dafad75885132d4f6bea65f945a5f6f383e39f3d375a70e12a86db983cc3d64e14b148db07c9577a46d2a8f534f43988d264fdb43dc61b247843af5f438d SHA512 4c2ab45f449f9c3d79165e1c9a0634fb08a9cd34dbc898e0e172409f6914ccd6e1c4e1719ccf0b36e591b4840e8cba08576ac1b57fadd08f8344b45e1af40d89
 AUX singular-4.1.3-doc_install.patch 2834 BLAKE2B d8e35169534ed9087fc1faf6029a111819d2198d5fa61134ba083920604f93a346e6f274da02361b0c03ba05fea2c4f1b23fe2af8a46d8e6705cf4ccd025751a SHA512 36d3b6f2d90479ae508c7771d4fd7724ada5f5102ece78c4d5bc113c23848973706f19a9e1467de322ecee29712dc1d915f41b491bef23529a43380ff69d84ef
 AUX singular-4.2.0-doc_install-v2.patch 2918 BLAKE2B 9b844a51165425e696db1270dcbdf6343356c313e797cee04bf8c0bad3c0c659302a88866877b729d50ba2e5717b4a1ec209f8ff57c1f71509e551ccc780f4bf SHA512 fc3aaf5b330057b1283a877d1ee5c97e6088a2eadfeaa2d85667ca3f8c661f400d52f7e29eb27da94c6be7b9809f8aea88dc2e33affc4b3a29d334b3e5798e78
-AUX singular-4.2.0-doc_install.patch 3390 BLAKE2B 753101890dadfdbd5c0e53a7e2c94572a02d43f0370f861ea164b4db38daf010ec30c8b939f030998f3b18e49f397b4a379991ad91f9edc83c26bc06354fe53f SHA512 8a6e95ca94faada5b9d4c568e1e2f2fa67ff34b514eba7c9d9f8b0701a1e1eb56d26d7740818149f534b28e6c98c08205d429297efaa905549def320573c7a26
 AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511ff38cd36422fea07ad0ae5f229761e31229d8ed61fa278d47b1326abc0919c85522d80f8085d3f2019463ae50fa48589c837 SHA512 bc1635cc592c5b624c87bfffbafb8d1c1cc094e2e629027c89255552ec15918bbdc3275605f8612cc418d4efc58efa46465d286cd9118cdf06a079ba40ff52ae
 AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
diff --git a/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch b/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch
deleted file mode 100644
index b0656d9fb676..000000000000
--- a/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 74ec250d3d89d0125c409b3340aca50a00b067ad Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sun, 30 May 2021 08:28:41 -0400
-Subject: [PATCH 3/3] autotools: support docdir and htmldir.
-
-Instead of hard-coding the "doc" and "html" subdirectories,
-allow them to be ./configured.
----
- Makefile.am             | 8 ++++----
- configure.ac            | 5 +++++
- resources/configure.ac  | 4 ++++
- resources/feResource.cc | 2 +-
- 4 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index fbea51d..c5d78a7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -16,10 +16,10 @@ bin_SCRIPTS = libsingular-config
- 
- install-data-local:
- 	if test -e $(srcdir)/doc/doc.tbz2; then\
--	  (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\
--	   mkdir $(DESTDIR)$(datadir)/info;\
--	   mkdir $(DESTDIR)$(datadir)/doc;\
--	   mv  $(DESTDIR)$(datadir)/singular/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
-+	   mkdir -p $(DESTDIR)$(docdir);\
-+	   (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(docdir); tar -jx --no-same-owner -f -));\
-+	   mv  $(DESTDIR)$(docdir)/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
-+	   @INSTALL_DATA@ doc/singular.idx  $(DESTDIR)$(datadir)/singular/.;\
- 	fi
- 
- uninstall-local:
-diff --git a/configure.ac b/configure.ac
-index 490a45f..997db6c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -228,6 +228,11 @@ AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
- AC_SUBST(DATA_DIR, "$config_datadir")
- 
-+AX_RECURSIVE_EVAL([[$]docdir], [config_docdir])
-+AX_NORMALIZE_PATH([config_docdir],['/'])
-+AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir])
-+AC_SUBST(DOC_DIR, "$config_docdir")
-+
- SING_SHOW_FLAGS([Compiler/linker flags: ])
- 
- 
-diff --git a/resources/configure.ac b/resources/configure.ac
-index 0dc468f..da68144 100644
---- a/resources/configure.ac
-+++ b/resources/configure.ac
-@@ -72,5 +72,9 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
- AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
- 
-+AX_RECURSIVE_EVAL([[$]htmldir], [config_htmldir])
-+AX_NORMALIZE_PATH([config_htmldir],['/'])
-+AC_DEFINE_UNQUOTED([HTML_DIR],"$config_datadir",[htmldir])
-+
- AC_CONFIG_FILES([singular_resources.pc Makefile])
- AC_OUTPUT
-diff --git a/resources/feResource.cc b/resources/feResource.cc
-index 3d75bc9..7e4fc8c 100644
---- a/resources/feResource.cc
-+++ b/resources/feResource.cc
-@@ -85,7 +85,7 @@ VAR feResourceConfig_s feResourceConfigs[] =
-   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
-   {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%D/info/singular.hlp", (char *)""},
-   {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%D/singular/singular.idx",  (char *)""},
--  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%D/singular/html",              (char *)""},
-+  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    HTML_DIR,              (char *)""},
-   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "https://www.singular.uni-kl.de/Manual/",    (char *)""},
-   {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
-   {"Path",      'p',    feResPath,  NULL,                   "%b;%P;$PATH",             (char *)""},
--- 
-2.31.1
-
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 417254d90921..016d11a827ab 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/netlogo-bin/Manifest b/sci-misc/netlogo-bin/Manifest
index 4f821e55ae56..e1f1c01829d9 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -1,8 +1,5 @@
 AUX behaviorsearch-6.0.2.sh 1588 BLAKE2B 7dd66ab3e2210e6932101301942287c76f7526ca68dd9901657330f6baeae93ac834022d001fdc885b0bf2b77c278fc30f0d024bee8f866bd37e0a971c2e6036 SHA512 9f5538dcd6b6d9f7c94b147876a3ca826017814b3bd2db8689782ef1df239d052e3784107f533e265b896f541812f42310fd6597e1c047173841faf248fa592c
-AUX hubnet.sh 159 BLAKE2B 58c5ad561c056db21caa67067267bd7c564b77f16b90ba97ee5397ea58df0cbfdd571cf1d5b2a2e9be5306c879e22f97ae9c8905cbb8b207ef4b4bd6c755ecd1 SHA512 dd9587ceca13079ca7a10e632e885af1ea0b5b0e15c56c989c59a0eda786982aca6465c356daebcd034ea466a956ddcd2fe923d8e749b7c94da28a9c462f6757
 AUX hubnetclient-6.0.2.sh 2007 BLAKE2B 11d3da62d0c51941e7655250c0864a42cdc11509b8bb04162f2e3b649aa181c964d667c3c9955221d16acc1f7fb0d9f56f9015c0e2df7065903165094aa584a4 SHA512 2d365440ed1b5236515a9d7ac09a4f8c3af623855bc23f52918a7295023ccac2d90ca58611519ba7a85ad10eefcd18773a8649fbe2c84b97cc15f9b7d1b297e9
-AUX netlogo-3d.sh 170 BLAKE2B 841ec01083567b2a194b6ee31d30f821402848a7fd56e130df4eee3a42bc6d00ce9729ce23e018484f842c1aab09c5ef2442819ef238c23790c1d75bb16e405a SHA512 f962a3bc75a5bccbb0230bb8058da95b570139adb39fd75641f2c01e6e93e66bbe96b532294fc9bd2ac983c4c67e940638951f358e703b031b33f2f91b370860
-AUX netlogo-5.0.3.sh 148 BLAKE2B 819476a2afd15b6a5a1ce4cddb7181747492faea35c77968220b5aa51bee9b83cfd654a1f9c148e1b191dceb42a4cca35a7b78bb7546d335b3a5c07e31e64391 SHA512 a0470a9725536a0d73b6ff66067545f38320898dd7c8539459857af780d12125169460ba15a87d96b0909aebbbeeb1a37d6df15f905e8585a0eab041eec78844
 AUX netlogo-6.0.2.sh 1975 BLAKE2B 63424bfc1a547593382d45747b5c20d6260488e161347fc5a5e6b85cdc27166f9bc49e223b223fb5f62247a9e9100df01f87c90b725c732291386d026a8c9a5c SHA512 94b9341d9d6999eca24f634566d707f90756aa19efab5767ab7e68bd6bb49bfea0e1769dc95895a0b4157443a5ed500470f8d7a28992b742d4f454512a53b117
 AUX netlogo3d-6.0.2.sh 2072 BLAKE2B b1e50dde00ab399ac3cd8ec4b29257c071ceb83f3e28684510e3bd12ee49bd478f96bacaab04de51799162e9ff368810c65df4c8c83459115cd49554e0988278 SHA512 2199d968bfbbec8c3346961faf3069564fe7017df3bc2426ccc60248ef9340376b378007083ee1bba6bc162dcfbc9ffe40c30331f771ae5faf9e7e9282c20c2e
 DIST NetLogo-6.0.2-32.tgz 192943415 BLAKE2B c7d20154ade89ae54f98fa08ae4832d9c81a97d1a7a93aaf0de75bd2914bae340ddd71dc3862957bf7e22863d5df9c5464a2bcd517ff0e9b087105237a8d5ac9 SHA512 ac8652a2487b01d02af0c8510ce4c80b2bf84cf2afc3d1bfbda198c1b7aeb0c5cbd85664e9841bc7704aec048482bc78306035673d2d59be67fb2ae50b63106b
diff --git a/sci-misc/netlogo-bin/files/hubnet.sh b/sci-misc/netlogo-bin/files/hubnet.sh
deleted file mode 100644
index 65b833e50aa9..000000000000
--- a/sci-misc/netlogo-bin/files/hubnet.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-NETLOGO_INSTALL_PATH="/usr/share/netlogo-bin"
-cd ${NETLOGO_INSTALL_PATH}
-java -classpath $(java-config -p netlogo-bin) org.nlogo.hubnet.client.App
diff --git a/sci-misc/netlogo-bin/files/netlogo-3d.sh b/sci-misc/netlogo-bin/files/netlogo-3d.sh
deleted file mode 100644
index cdf52a61e25a..000000000000
--- a/sci-misc/netlogo-bin/files/netlogo-3d.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-NETLOGO_INSTALL_PATH="/usr/share/netlogo-bin"
-cd ${NETLOGO_INSTALL_PATH}
-java -classpath $(java-config -p netlogo-bin) -Dorg.nlogo.is3d=true -jar NetLogo.jar
diff --git a/sci-misc/netlogo-bin/files/netlogo-5.0.3.sh b/sci-misc/netlogo-bin/files/netlogo-5.0.3.sh
deleted file mode 100644
index 8bc82fa8d8a1..000000000000
--- a/sci-misc/netlogo-bin/files/netlogo-5.0.3.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-NETLOGO_INSTALL_PATH="/usr/share/netlogo-bin"
-cd ${NETLOGO_INSTALL_PATH}
-java -classpath $(java-config -p netlogo-bin) -jar NetLogo.jar
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 4de97ff0c193..bd8870c5e2bb 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index fa1b08156a55..7183b4d4a7b5 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -4,5 +4,5 @@ AUX epix-1.2.19-autotools.patch 2020 BLAKE2B 0b5df14c1e31526aadb6bd06ed979616c0a
 DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45
 DIST epix-1.2.19_withpdf.tar.bz2 1757443 BLAKE2B 4c7d78f27d355e078ebbe81f9c5d9b1d342f4f04d5f91260460d0559bfb7fc8204668072c06c8d493eb739c492b2935bffd24cb77cd554cd863734b7d84ff6e1 SHA512 b51821256ccaf9957562964b1342ee1656d1d8456081869797d8c704df3098d2643135767987b0673aa64a16703cb2e21deea4aef7d1598e67b9661b98245cda
 EBUILD epix-1.2.11-r3.ebuild 1520 BLAKE2B 18be4038da89c7d289e5187ac9a767acc77ea0e62a1389d168ca79d5a9e78976f11ce1fd2179067471da4c5d819016553fcefeaa21513456f309f4540c8cea41 SHA512 3f9fecddb0699610577dd3ff8215b2be5ac6abb012e8867535cd86ee67bc065268c3cf26af0fdb35963c8bf8e42df48acc1ad71a2f01cc97a13b86d1ea9739f7
-EBUILD epix-1.2.19.ebuild 1589 BLAKE2B b8362a7275984713e54a8c46fa60345d447a066bd9fb6025919ab033831e8411190e94c185aab3a9e1f2fa7a3d2d878b9994cb09530d4d50956ded8a04af7f58 SHA512 8641470529ff7bae179757304680fbf65f0d11227a376edae3a4fb380b2813326d5ae6704376324412af5556f62ac877d50d650cc9fc02430f8fa19275dfef33
+EBUILD epix-1.2.19.ebuild 1480 BLAKE2B 96d0ef8565607b7747ecb957b5d8e1e602105dcd9109fa75a02c3df7428de703c75cd80ae9dea9001e3cb5f6d6dfccc010b99639364f2ea1ec954991c7ec9386 SHA512 38f51107585e055446f8dcd475d5308e0d213438c5bd4a9785d652a899cbae4c75a7fc879a447b60b4f2013bb379528311652085394c0b53931a75efd01d67c3
 MISC metadata.xml 779 BLAKE2B 2e6405de37d7ed3e85eb865d140a599b1de484f9cc5c35eda7be384259b34bbed06aa84dffc8a5b1b05c6db18a5d0bd1b0f28c9969a8aac933582bf0d1c9cc2a SHA512 b0cb62a782873b0e2e115f18495f520f3fb5cf06052d6fdae023a65a3a40fb2eaf355ffacf0243149d9890d8f56be87dbbdaf459b05ae32b877037e7ff2bc5e9
diff --git a/sci-visualization/epix/epix-1.2.19.ebuild b/sci-visualization/epix/epix-1.2.19.ebuild
index 9324913332a0..f8355a91afbb 100644
--- a/sci-visualization/epix/epix-1.2.19.ebuild
+++ b/sci-visualization/epix/epix-1.2.19.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit elisp-common bash-completion-r1 autotools
+inherit autotools bash-completion-r1 elisp-common
 
 DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
 HOMEPAGE="https://mathcs.holycross.edu/~ahwang/current/ePiX.html"
 SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs examples"
 
@@ -24,9 +24,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 SITEFILE=50${PN}-gentoo.el
 
-PATCHES=(
-	"${FILESDIR}/${P}-autotools.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
 
 src_prepare() {
 	default
@@ -34,26 +32,28 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-epix-el
+	econf --disable-epix-el
 }
 
 src_install() {
 	default
+
+	newbashcomp bash_completions epix
+	bashcomp_alias epix flix elaps laps
+
 	if use emacs; then
 		# do compilation here as the make install target will
 		# create the .el file
-		elisp-compile *.el || die "elisp-compile failed!"
-		elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
+		elisp-compile *.el
+		elisp-install ${PN} *.elc *.el
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
-	newbashcomp bash_completions epix
-	bashcomp_alias epix flix elaps laps
+
 	if use doc; then
 		dodoc doc/*gz
 		docompress -x /usr/share/doc/${PF}/manual{.pdf,.ps,_src.tar}.gz
 	fi
+
 	if use examples; then
 		cd samples || die
 		docinto examples
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1b2f976c85a3..7286e4f1b8ef 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index 61e3a43e3ca8..8a3e212a1e92 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,4 +1,4 @@
 AUX fakechroot-2.20.1-glibc-2.33.patch 13065 BLAKE2B 3ed7c151bd07c323c3bf0e6eb925d6964dcf18fbb92c17cee3537ec0c707ce727e624a17335ad60fa74f06c86a41abd011f3c0f1f1fa50a2f58b4c35cd1bfdd7 SHA512 8cddb31f70d819ffe1058f5f764d12634b5bf290379f709e6d3a08796b7c8ba2a97157a19b7fe9c886f65f495a7e42ca84fa3f9651d3692df11b0f69e9588be0
 DIST fakechroot-2.20.1.tar.gz 504343 BLAKE2B 73459895319c1fd6297ab455e0d15f4b9985f433d958598d8581a35268e4df0f631b39d026061fe5c00ec6b805f3bf4f5f261039b93176db460b6f936c0de1b8 SHA512 9ddc715ff5c550b700c2384284c9f0cf6c2a99353a06d8e4c3b8363f4affdf9a11757ed5d1c9b85c83499b3bec054544290508a20f2ee16d46e66dc824a924ed
-EBUILD fakechroot-2.20.1.ebuild 629 BLAKE2B d73a6d8658653e8faa6b177494fd3405b616b8744ee88d738baa867ba72b42aaabff8bbfbeaa7eb4c5dd075506030dfeaa6c64980b89410e537769ba4c9b2155 SHA512 759acc61dcd8f58c91292782c8f232b542c68007dfb778bd16850e14886b34ce48adca1c4f06f4374c4653fc0bbc4b71e24b2374f89709eed4c412f294e3070e
+EBUILD fakechroot-2.20.1.ebuild 592 BLAKE2B 3e2f4b9323b3ed118c5449cbc16fbe894e03f92640ea4a548d45d65a387ba16f509275a925d326ae219c8a446159f80c92e64a9daa4e8bca3f8bd83b566bcf83 SHA512 fc41327b742410adb4baafc2d45399b3ed36f17660ea6c6b15fd0c50c5dedf32a670eb65ca12fa1184344c53f0924a20f9f6dfbd9f7ecfbc4a6ac4f43cfb2a96
 MISC metadata.xml 249 BLAKE2B c28e86a35ce07ccc4abb7f53597931333d12ba3676c698252179744b361ff822b6346565d8eaa3d1ccd699569240dfd11387f8a80c456bdcec42707863e9377f SHA512 3a7a3d57ead4b33905b475bd13d7a4e6db1c9badcc8d5954d2a9fc4232146e8ace0fecff65c66070fa47ed989b5ee68b87ec5351daacc88d7c9c06f02c8d2b64
diff --git a/sys-apps/fakechroot/fakechroot-2.20.1.ebuild b/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
index f5bfa37c4782..9b303ca2be1b 100644
--- a/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
+++ b/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Provide a faked chroot environment without requiring root privileges"
 HOMEPAGE="https://github.com/dex4er/fakechroot"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/dex4er/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 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 ~riscv ~s390 ~sparc x86"
 
 RESTRICT="test"
 
@@ -17,11 +17,7 @@ PATCHES=(
 	"${FILESDIR}/fakechroot-2.20.1-glibc-2.33.patch"
 )
 
-src_configure() {
-	econf --disable-static
-}
-
 src_install() {
 	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
+	find "${ED}" -name '*.la' -exec rm -f '{}' +
 }
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index d70546d1e406..fbc3ee88531b 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -5,6 +5,6 @@ AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c805
 AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5
 DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
 EBUILD file-5.40-r2.ebuild 3419 BLAKE2B 2d48c15c53d7e1fcf49d0a4fba5345ffdb60f70541cc7432461507974ede6846cb8608a81dd61865e895b4818a727a5b025fe12f31c45a256c1f5086b41b4102 SHA512 57d2bb5db419fe4708f502d3a33c13c934b148e47ccc6cee69c24229d02fd6200aeaefb1a8278f30f48eeb69bbd4cf831b5439a4585fa641d068aa0c05f95d65
-EBUILD file-5.40-r3.ebuild 3478 BLAKE2B f7df8bd044bf132d596992cb40e8338328db30baf505af44bd34e5a37cb39291d0ffd65bae615550124cfef6fdb1587f0f7b69f1c33ac48d400f4b8606730756 SHA512 7338f2be3118728bef6c82b58da590ca766ba41571fa16fff30d0d391818d0806d1c9b77dc8af9fb5e96dc6c37614a09aebd630eb8970715cf59fe09141b23c3
+EBUILD file-5.40-r3.ebuild 3477 BLAKE2B bc9788f59c6a5506a58664e5a2abf4f4ae410cc5b53900842f5fb7742033c137c12383941bc5716a7b333dbc554fa4313336cd7a459963d1a4aad6e4e1f2ae02 SHA512 86127e57f6b45b3420842c973af1ce29e61bc2c1e27d886245be7647159068432663db3cbc6a6eb3bfa89500fdab85deb3290297167307240b32d6f522243a46
 EBUILD file-9999.ebuild 3273 BLAKE2B 691dabede60ccb8f756ee3a03a5e2db17f58e556cc19f28493685996ac637e7343803a5667e591fc1b336611458b8550c222238983d797fa21e1fe66c60d1625 SHA512 20a7db1cd42cb5c47d5a0c7a607b3e547e1e76b6fe3effd8a456425929312981b47d940c4deee82f14b20e6be50416206aae4b32cbab80bbdf459cce76443347
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.40-r3.ebuild b/sys-apps/file/file-5.40-r3.ebuild
index a35b94c33d95..90b41899e807 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 8ad17fba60b3..198bf00718af 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,4 +1,6 @@
 DIST firejail-0.9.64.4.tar.xz 431116 BLAKE2B 1e64af1459cdbd6e753299796b2521efdc1fe364a66b8f0f40df1adabec32d0673cb9805a2ab385b96b64aca16e038e615ab1e4dc4df1dbcaa0b5b24f54c89d0 SHA512 580a074cb40e7559f6d532418b5e05e042c30306e8507d32ac3c71a51dec6648035ad810d253da02caaa4adc41f773dfdab55528618f5ca30ff30d4e7bbd12c9
+DIST firejail-0.9.66.tar.xz 449992 BLAKE2B 43243e4d2773f007c9a7ce4e63b009b63113055baaffa5125d279124967f5c07d510edf431b568bbf5d6cf04501f5645accb5756af80298750d8f0ef35f9a88b SHA512 c00222f975df9832940b7e3ef71dc2d2bbab3540db259f8d3011fb6198f1b66d9191dff4609163a2cfe0e2a1f739e144b496260a457ea92601f163675735cbe7
 EBUILD firejail-0.9.64.4.ebuild 2514 BLAKE2B 5169243203fa8e77926aaccce08a9ad82277f8e9d272c99a87e885ab4a6bc251ec30b2c2e9f754ba35744f2933d0845a636ca15132c529a97f304a1be1828963 SHA512 da06a3199f3714b07bb99831d59e796b940d600334b9d8df8d4f2c887cdbd9205a9933e028353b41ae58afa3ecedd3f39c65c11ed01d2b344b4adb9cbc321082
-EBUILD firejail-9999.ebuild 2304 BLAKE2B 88ce4ea8d871af749c4f19ede13aa7d35b9037451b3e782b1a9558bf2a00274470b99d8e3d315f4a91af7084aabd5133562827e347852364ef0e0bbf07932f9e SHA512 c3c3c7d8e953630bb9f0765506780512e324ca8cf467a7a23568e2de3544c223bbe5e027b6fac32bb3be2716e64beb5084ca8959bd235b7638114e9e15be8814
+EBUILD firejail-0.9.66.ebuild 2627 BLAKE2B 33b429e1b4aa19a46242dae15fc02cbadc83acd170cfc143592e191c3fecee8fae48aa7a6ff4be3dcbea4c7fb5fc6a2552b6ef96380b4aa6277462905cce72b1 SHA512 ab36c185d9d890ff478334468d806d8c77fc5bea9fa834279e0721c42f2896331c20f5a7607604eee19f7c73053f346c8db25ee2a65fab530ecc606a37cd5813
+EBUILD firejail-9999.ebuild 2627 BLAKE2B 33b429e1b4aa19a46242dae15fc02cbadc83acd170cfc143592e191c3fecee8fae48aa7a6ff4be3dcbea4c7fb5fc6a2552b6ef96380b4aa6277462905cce72b1 SHA512 ab36c185d9d890ff478334468d806d8c77fc5bea9fa834279e0721c42f2896331c20f5a7607604eee19f7c73053f346c8db25ee2a65fab530ecc606a37cd5813
 MISC metadata.xml 1813 BLAKE2B 464550e81aed6c70688f7f146e0200fd351ae2a6163a41df836ece5e0dd54e0710ff3baefed509ac73ac81f37783acfe9baf3026f31ec4f668b2fb0f87e326d3 SHA512 23eee71dbf308db9f76cb42622442f9749b353577fb624bceb12c9e377fdcc0c45efe52c1c028d439835185502acf9822ffb53ee514ce5113710d036994ff6da
diff --git a/sys-apps/firejail/firejail-0.9.66.ebuild b/sys-apps/firejail/firejail-0.9.66.ebuild
new file mode 100644
index 000000000000..e3bf15c00bbd
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.66.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit toolchain-funcs python-single-r1 linux-info
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
+	EGIT_BRANCH="master"
+fi
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home +suid test +userns +whitelist X"
+# Needs a lot of work to function within sandbox/portage
+# bug #769731
+RESTRICT="test"
+
+RDEPEND="!sys-apps/firejail-lts
+	apparmor? ( sys-libs/libapparmor )
+	contrib? ( ${PYTHON_DEPS} )
+	dbusproxy? ( sys-apps/xdg-dbus-proxy )"
+
+DEPEND="${RDEPEND}
+	sys-libs/libseccomp
+	test? ( dev-tcltk/expect )"
+
+REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	CONFIG_CHECK="~SQUASHFS"
+	local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
+	check_extra_config
+	use contrib && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	find -type f -name Makefile.in -exec sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
+
+	sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
+
+	# fix up hardcoded paths to templates and docs
+	local files=$(grep -E -l -r '/usr/share/doc/firejail([^-]|$)' ./RELNOTES ./src/man/ ./etc/profile*/ ./test/ || die)
+	for file in ${files[@]} ; do
+		sed -i -r -e "s:/usr/share/doc/firejail([^-]|\$):/usr/share/doc/${PF}\1:" "${file}" || die
+	done
+
+	# remove compression of man pages
+	sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
+
+	if use contrib; then
+		python_fix_shebang -f contrib/*.py
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-firetunnel \
+		$(use_enable apparmor) \
+		$(use_enable chroot) \
+		$(use_enable dbusproxy) \
+		$(use_enable file-transfer) \
+		$(use_enable globalcfg) \
+		$(use_enable network) \
+		$(use_enable private-home) \
+		$(use_enable suid) \
+		$(use_enable userns) \
+		$(use_enable whitelist) \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+
+	if use contrib; then
+		python_scriptinto /usr/$(get_libdir)/firejail
+		python_doscript contrib/*.py
+		insinto /usr/$(get_libdir)/firejail
+		dobin contrib/*.sh
+	fi
+}
diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild
index bcd7e7b29268..e3bf15c00bbd 100644
--- a/sys-apps/firejail/firejail-9999.ebuild
+++ b/sys-apps/firejail/firejail-9999.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit toolchain-funcs python-single-r1 linux-info
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
@@ -21,7 +21,7 @@ HOMEPAGE="https://firejail.wordpress.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home +suid test +userns +whitelist"
+IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home +suid test +userns +whitelist X"
 # Needs a lot of work to function within sandbox/portage
 # bug #769731
 RESTRICT="test"
@@ -38,16 +38,25 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	CONFIG_CHECK="~SQUASHFS"
+	local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
+	check_extra_config
+	use contrib && python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	default
 
-	find -type f -name Makefile.in -exec sed -i -r -e '/^\tinstall .*COPYING /d; /CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
+	find -type f -name Makefile.in -exec sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
 
 	sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
 
+	# fix up hardcoded paths to templates and docs
+	local files=$(grep -E -l -r '/usr/share/doc/firejail([^-]|$)' ./RELNOTES ./src/man/ ./etc/profile*/ ./test/ || die)
+	for file in ${files[@]} ; do
+		sed -i -r -e "s:/usr/share/doc/firejail([^-]|\$):/usr/share/doc/${PF}\1:" "${file}" || die
+	done
+
 	# remove compression of man pages
 	sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
 
@@ -79,6 +88,8 @@ src_compile() {
 src_install() {
 	default
 
+	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+
 	if use contrib; then
 		python_scriptinto /usr/$(get_libdir)/firejail
 		python_doscript contrib/*.py
@@ -86,9 +97,3 @@ src_install() {
 		dobin contrib/*.sh
 	fi
 }
-
-pkg_postinst() {
-	CONFIG_CHECK="~SQUASHFS"
-	local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
-	check_extra_config
-}
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 0bb640e30391..a72a3f891836 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -4,6 +4,6 @@ DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96be
 DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c
 DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331
 EBUILD gptfdisk-1.0.6-r1.ebuild 1317 BLAKE2B c9643518d97dc57249f180f465ec41f8fd72ff29e4f6afb0974847bf3ddfe3cbcab95cb74a3607ae840a50c7f5d2847ef4bbbe820d667df07227f8ec007c0b23 SHA512 c0df406581b8c115c60115f7be89445dc71618c68da11f33e04d2e9fe96bc02f60e90ed1e0b6ed10a42790670cd52d43e8a174e09d529de024b3b450c80519ed
-EBUILD gptfdisk-1.0.7-r1.ebuild 1318 BLAKE2B fa659d24ef760b83ea639bdeffb42de1e555214e70e08dfda305a5a159b4240aa5ff9359e1e055f88048c16a8563bfaada97373fd8ff09311e69d9b84005bc73 SHA512 a725243e3592c49183db636311f991e7cf490b6b5545352851e0bd82b2a16881c7248d852a019034d08edee3c28e12027fb73858f76da892fc2c1793f771f649
+EBUILD gptfdisk-1.0.7-r1.ebuild 1317 BLAKE2B 66957609e2ba084bd42a3426b56b6f28373d180a22eb140a89d629b75d347e56820571943b1998fd3e19134c9c43c4ef9a11bedb7b20580acffb94ba631c3f98 SHA512 9daccd9888d62a118923dac26faf0e9e3d419cc029476cb526db16550fabb8df5aa5dfc34e2914bdf4517bfe7d57a0eb54ca20705e915ae15faee9b9f8a5963d
 EBUILD gptfdisk-1.0.8.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.7-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7-r1.ebuild
index 416ea4f72fae..fc304f20f405 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.7-r1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index f7912af2d2d5..ecd7c3d1db43 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,5 +1,3 @@
-DIST hwinfo-21.72-1.3.src.rpm 926285 BLAKE2B b8a38b2f04649e268a6d6fbebabd724a0c678e81ea9c09c3453ababa26e91ba5fe55c7feccf157ab81ab676e6610ba1700ef1691bdd06fbcbc1cdd86806282d2 SHA512 4e51ee4f8e03eee82317557aa39b5018cc2370b33bfdb280ecb8716687d951f8c34fa7598a1e0eff03025991eee654af488e3343d93167e4cf16380d047c2de3
 DIST hwinfo-21.74-1.1.src.rpm 967046 BLAKE2B 305db6eb3184de0e84d166f0e32988ea2a0ec65eceb322c8c451f33ab8656c38a21a74f416ff08442bcbc5fa91fb4fa8439d907c2c244fe62a2048be7f84b181 SHA512 1a681b51934fbed229b7daa96b5e4e0d8fc62d480927034d0c95ae8c89dc2ae43214c63cca273379162353aeb2bf81883e7c02006c4f45fd1deab0d74f8a2988
-EBUILD hwinfo-21.72.ebuild 1377 BLAKE2B dd5ca41d5f58ef3149c13490b6ba9f1b0a3583cf6a3ea839e5af6c80f9990cd6fbf921847ce2a9468306e176108c93131a0d60aba9378cba01e007c49cbd26c7 SHA512 973c96a71d3701e726d1c121a4ce375e84a914478ce74616d7eea666ecf6f1c33434841d831528817f4bf33fb0ba29f51e96bb9b903d52ded6a343536b662e14
 EBUILD hwinfo-21.74.ebuild 1546 BLAKE2B c9dfb7a7d72ba0e2d64bd2d1073decdf1c84a011d8e1924bda302b31f4f837d3566b2c43fcfac34205a13597dbaf81262d5f746e06f705a93ed2e58f29e241cc SHA512 26e7c91ad4cb94548e82dbf3d64c0441a2ead9f2006423cb625655832dabe4248b68bf34fbe1109ddf03a6a2385f7f097085a93e0397fab36f7252a25ee60d11
 MISC metadata.xml 334 BLAKE2B 08e4d837af5734c290c474fe28c4082531eb9b07be2fddef29e16e4dda6aee904bc8674830842b1c1f9736a92a4ccf21992ffdb6f0f3b7e62be73f3d3e93c6d5 SHA512 94c2a056338c3e3e40737e45468d77e170341185017098fc8892cbac1a0993321a1ee8dd007c075430d999fce90508f1e3d4a4f71fda6bfeb6f7c15b199c2405
diff --git a/sys-apps/hwinfo/hwinfo-21.72.ebuild b/sys-apps/hwinfo/hwinfo-21.72.ebuild
deleted file mode 100644
index 56ec5be6e5ce..000000000000
--- a/sys-apps/hwinfo/hwinfo-21.72.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib rpm toolchain-funcs
-
-DESCRIPTION="Hardware detection tool used in SuSE Linux"
-HOMEPAGE="https://www.opensuse.org/"
-SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.3.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	amd64? ( dev-libs/libx86emu )
-	x86? ( dev-libs/libx86emu )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.17"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	# Respect AR variable.
-	sed -i \
-		-e 's:ar r:$(AR) r:' \
-		src/{,isdn,ids,smp,hd}/Makefile || die
-
-	# Respect LDFLAGS.
-	sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
-
-	# Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
-	sed -i \
-		-e 's:make:$(MAKE):' \
-		-e 's:-pipe -g::' \
-		-e 's:LDFLAGS.*=:LDFLAGS +=:' \
-		Makefile{,.common} || die
-	# Workaround from Arch, for using raw tarballs from git
-	echo 'touch changelog' > git2log
-	default
-}
-
-src_compile() {
-	tc-export AR
-	emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-	keepdir /var/lib/hardware/udi
-
-	dodoc changelog README*
-	docinto examples
-	dodoc doc/example*.c
-	doman doc/*.{1,8}
-}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index bd7b5c705330..c940f60d6cfd 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -2,7 +2,7 @@ AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe SHA512 ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
-EBUILD hwloc-1.11.13.ebuild 2168 BLAKE2B bcab74bebc629a2749bbb6577dc73c2acde8bad4a356456b731f0898df24b8698e0cea6d388495b27934995fd298875e23cd54a7bd103771579166faddeaf31f SHA512 e7d42be1f8d54b9149d4ee105fc6e4e9097a6b488d9dbb4a4d9f04b9f2d4f8e3452eea6aa7706b991900f26b2f4ae08a6419e8267661648e494850de7be39fab
+EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B 0518fb6472ee433835781125b914e68c788e5d219c5a120ddf99df6d3770de279c769a0c4fdfa6638a0b747190adf9f32e090cf1f4ecfc5d678a8f09dcb22058 SHA512 cad8bbd45d68521c0e5aa1fbdbdb763eeafdcb7b406aed1fd1d61dde9285d523da2e031c907f9dc5729d921298dafff126a1b493b66b21f0c7bd00e67f50d03a
 EBUILD hwloc-2.3.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0
 EBUILD hwloc-2.5.0.ebuild 2933 BLAKE2B 29056c11f00907327a283b9a42ca73824c90dd75de0bf6d12ee7101ab37ae98478b8d265ac7f316e1fffa79d3af42134f06dc0302644dc4730621ad3ca247101 SHA512 a8f6ea94b0026eb3260f152d3ee50b4985bcaf564f302df367e3e5fffacb1368c396e09933db8f37a17d5d6f27197ebc450da07305ffb6a666a7011a2061087a
 MISC metadata.xml 1703 BLAKE2B c5f42e16f680cf88bd41907ab37ce4df2da9ee08a52a26559688df97ad92773830f084cc6f358862096f24930f69982cfa7f2fb1baa0ea1373b7359f96565f4e SHA512 590d0cb5b6819359159152dab18bc12c65c5f70c0a75658a760d7f2bb97ef4e18045130a6167f5ecc41f08e92a179f6dd51abe34f35db3338e4539948913daf0
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 151384ff11a5..e6046bb1b546 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal toolchain-funcs
+inherit autotools cuda flag-o-matic multilib-minimal toolchain-funcs
 
 MY_PV=v$(ver_cut 1-2)
 
@@ -32,8 +32,8 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
 	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
 DOCS=( AUTHORS NEWS README VERSION )
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index b82fdc3fdf6b..bb124145e36f 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -1,3 +1,4 @@
 DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf0c05e1e2bb4268435e17adb8858439ac6bf0e1783cfdd24a48fcb2dcf7c1cb20eee09aeb90db08c2e94224d01efeff7 SHA512 2ccdc5b30df6d96ac7a75d01d674b295bcdb0d445169716638a20c9884b090bbfe509e0aee79cb674a2d9b0eb18ea6284b9d4e2939cb5bf290cade4c1a02487a
 EBUILD kmscon-8_p20180906-r1.ebuild 2914 BLAKE2B 5ae857b7cc683e7e634b37d4902964d302ade0fc77863b8e2ffda7a61232273dcc8a844d245e8eafa51263358f95c6b31959d9cc524ce51b033d51080565f001 SHA512 e596373113c4f1294fa7cbd6eaee31111ae15eb9332b6f3e1d97d856242ab75020016b214df8e9c19bf59c53f6d931c8635e0cded8faf3790f0133af7c7bf01a
+EBUILD kmscon-8_p20180906-r2.ebuild 2923 BLAKE2B 19a579e503918fca6eb448dd5895690592f683f1aaed5a0c5288766469b3b595a89d84f862ae4527fdae04572d0e359a5c034c56ea637a81faf4005c07135243 SHA512 af719304d99eca7210695deb8410309370c7defba815002c28e9dffefb5d78033f7b02c9eff86d3b7931e78fa0dc99dc8139ac169870a98e946b0ba152cfea0f
 MISC metadata.xml 664 BLAKE2B 3e24275e972d23c41dbab76a90f4a47b589f652f580f5e019b44d5e926556ac2e5138a23f36beee31c53f3f5c344908832ca0d008826a720256d756425048063 SHA512 96f2c383dda46a41505e4aaf01376ed51cb2856516b800652d9ddb43c4794c1f57840368d31b822230ed3f16b6009699ee0ccec62f4967cbdaa8781a845d96b3
diff --git a/sys-apps/kmscon/kmscon-8_p20180906-r2.ebuild b/sys-apps/kmscon/kmscon-8_p20180906-r2.ebuild
new file mode 100644
index 000000000000..7e56c83f9f9a
--- /dev/null
+++ b/sys-apps/kmscon/kmscon-8_p20180906-r2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="01dd0a231e2125a40ceba5f59fd945ff29bf2cdc"
+SRC_URI="https://github.com/Aetf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+inherit autotools flag-o-matic systemd toolchain-funcs vcs-snapshot
+
+DESCRIPTION="KMS/DRM based virtual Console Emulator"
+HOMEPAGE="https://github.com/Aetf/kmscon"
+
+LICENSE="MIT LGPL-2.1 BSD-2"
+SLOT="0"
+IUSE="debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode"
+
+COMMON_DEPEND="
+	>=virtual/udev-172
+	x11-libs/libxkbcommon
+	>=dev-libs/libtsm-4.0.0:=
+	media-libs/mesa[X(+)]
+	drm? ( x11-libs/libdrm
+		>=media-libs/mesa-8.0.3[egl,gbm] )
+	gles2? ( >=media-libs/mesa-8.0.3[gles2] )
+	systemd? ( sys-apps/systemd )
+	pango? ( x11-libs/pango dev-libs/glib:2 )
+	pixman? ( x11-libs/pixman )"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xkeyboard-config"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+REQUIRED_USE="gles2? ( drm )"
+
+# args - names of renderers to enable
+renderers_enable() {
+	if [[ "x${RENDER}" == "x" ]]; then
+		RENDER="$1"
+		shift
+	else
+		for i in $@; do
+			RENDER+=",${i}"
+		done
+	fi
+}
+
+# args - names of font renderer backends to enable
+fonts_enable() {
+	if [[ "x${FONTS}" == "x" ]]; then
+		FONTS="$1"
+		shift
+	else
+		for i in $@; do
+			FONTS+=",${i}"
+		done
+	fi
+}
+
+# args - names of video backends to enable
+video_enable() {
+	if [[ "x${VIDEO}" == "x" ]]; then
+		VIDEO="$1"
+		shift
+	else
+		for i in $@; do
+			VIDEO+=",${i}"
+		done
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_configure() {
+	# Video backends
+
+	if use fbdev; then
+		video_enable fbdev
+	fi
+
+	if use drm; then
+		video_enable drm2d
+	fi
+
+	if use gles2; then
+		video_enable drm3d
+	fi
+
+	# Font rendering backends
+
+	if use unicode; then
+		fonts_enable unifont
+	fi
+
+	if use pango; then
+		fonts_enable pango
+	fi
+
+	# Console rendering backends
+
+	renderers_enable bbulk
+
+	if use gles2; then
+		renderers_enable gltex
+	fi
+
+	if use pixman; then
+		renderers_enable pixman
+	fi
+
+	# kmscon sets -ffast-math unconditionally
+	strip-flags
+
+	# xkbcommon not in portage
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		$(use_enable optimizations) \
+		$(use_enable systemd multi-seat) \
+		--with-video=${VIDEO} \
+		--with-fonts=${FONTS} \
+		--with-renderers=${RENDER} \
+		--with-sessions=dummy,terminal
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit "${S}/docs"/kmscon{,vt@}.service
+}
+
+pkg_postinst() {
+	grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \
+	ewarn "It is recommended that you comment out the ERASECHAR line in" && \
+	ewarn " /etc/login.defs for proper backspace functionality at the" && \
+	ewarn " kmscon login prompt.  For details see:" && \
+	ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797"
+}
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 4d1946ef13ef..543d36eb30f2 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,5 +1,3 @@
 DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
-DIST lshw-B.02.19.2.tar.gz 2467937 BLAKE2B 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f SHA512 f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5
-EBUILD lshw-02.19.2b.ebuild 2170 BLAKE2B 53389e8191f2ce6d24642f4fb5044ef244b2e91853bf8d336867d8c0941d50b228ccbd80c70a0a0d796589a5183768d65ace2309e9bc3d858a0d2efbd50415c0 SHA512 8cb20b1db28313a113c1c00e2c405447babc76c5564cc176a55d4af13796530554b20ddc8f523d0365c93064529a3b09b60e0229f535a8683fa2d0fced468603
 EBUILD lshw-02.19.2b_p20210121.ebuild 2255 BLAKE2B 332f1b5d59a98901e28f3c39ee1a883f91a5c63a52c81f46f98e95a4baf7665d14a59ea9db80cb87c322d7cf0e2731e64f9734ca34de09d730bfb51ee90258e7 SHA512 d9c6a1a153a8325c0d0d5e361a8bf148ba174504127b6345997b693feb3be26876a8b8980683f1b19009f36800fc2a2cd3bffd7603d246b4d74873a19fd2c707
 MISC metadata.xml 461 BLAKE2B 85843f85ec415a571d44f8c7bd8b04baa11e58141cc6bc7c0a0561628e858f9c8881d5737314873f5d4ba6788b36d54a9bb434ccdba3d2f1c435957b3972acce SHA512 b824f0e4251e52f1bb5283faba663d74b93c35bc23963e84826be85eeaffb6481b66ffc2548736cc66227be24bfb230cbf77cfe9d72d7ac7053abb26f980c6b3
diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild b/sys-apps/lshw/lshw-02.19.2b.ebuild
deleted file mode 100644
index 1f5b1927f7aa..000000000000
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES='fr'
-
-inherit desktop flag-o-matic plocale toolchain-funcs
-
-MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)
-
-DESCRIPTION="Hardware Lister"
-HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
-SRC_URI="https://www.ezix.org/software/files/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gtk sqlite static"
-
-REQUIRED_USE="static? ( !gtk !sqlite )"
-
-DEPEND="${RDEPEND}"
-RDEPEND="sys-apps/hwids
-	gtk? ( x11-libs/gtk+:2 )
-	sqlite? ( dev-db/sqlite:3 )"
-BDEPEND="gtk? ( virtual/pkgconfig )
-	sqlite? ( virtual/pkgconfig )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
-
-src_prepare() {
-	default
-
-	plocale_find_changes "src/po" "" ".po" || die
-	sed -i \
-		-e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \
-		src/po/Makefile || die
-	sed -i \
-		-e 's:\<pkg-config\>:${PKG_CONFIG}:' \
-		-e 's:+\?make -C:${MAKE} -C:' \
-		-e '/^CXXFLAGS/s:=-g: +=:' \
-		-e '/^CXXFLAGS/s:-g ::' \
-		-e '/^LDFLAGS/s: -g::' \
-		-e '/^all:/s: $(DATAFILES)::' \
-		-e '/^install:/s: all::' \
-		src/Makefile src/gui/Makefile || die
-	sed -i \
-		-e '/^CXXFLAGS/s:\?=-g: +=:' \
-		-e '/^LDFLAGS=/d' \
-		src/core/Makefile || die
-	sed -i \
-		-e '/^#define PCIID_PATH/s:DATADIR"\/pci.ids.*:"/usr/share/misc/pci.ids":' \
-		src/core/pci.cc || die
-	sed -i \
-		-e '/^#define USBID_PATH/s:DATADIR"\/usb.ids.*:"/usr/share/misc/usb.ids":' \
-		src/core/usb.cc || die
-}
-
-src_compile() {
-	tc-export CC CXX AR PKG_CONFIG
-	use static && append-ldflags -static
-
-	# Need two sep make statements to avoid parallel build issues. #588174
-	local sqlite=$(usex sqlite 1 0)
-	emake VERSION=${MY_PV} SQLITE=${sqlite} all
-	use gtk && emake SQLITE=${sqlite} gui
-}
-
-src_install() {
-	emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
-	if use gtk ; then
-		newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
-		make_desktop_entry \
-			"${EPREFIX}"/usr/sbin/gtk-lshw \
-			"${DESCRIPTION}"
-	fi
-}
diff --git a/sys-apps/ripgrep-all/Manifest b/sys-apps/ripgrep-all/Manifest
new file mode 100644
index 000000000000..5b6d2824a723
--- /dev/null
+++ b/sys-apps/ripgrep-all/Manifest
@@ -0,0 +1,163 @@
+DIST addr2line-0.12.0.crate 118232 BLAKE2B d77089cd1503623fcdce779f1c669754ebdb4726ed88a15fde25b0a7d87e05e4cd41d8cbcccb3250fecb79c96b565e7ab7ed75a92f3143d67b496a94fe394db6 SHA512 aebc4c2c3c87a6fb5e076264dd7abc72fd639a0c1eee0c538a7fcccb3fb97e9f1f0f5c9bbc40678870a1054efa902d7c9e00deada4e4c3293e04476ad3dfe018
+DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
+DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
+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 backtrace-0.3.48.crate 65706 BLAKE2B 100e0193b65b8aedabf3f8b5ae2ba8090161503f340c72f52ef2b4e02e940ae46011c22f1a6441358d832759a1dc56a82fad0eae3ca49f34a2e31c37111316f6 SHA512 260ec9f4c2f14d8830e69435e1f0883621b3afcb2dad06624d5c29398c4109d1397fbc06dcbf1d85afea45515e8bd6d211a98b963c67da818ab4f95f8fe4060a
+DIST bincode-1.2.1.crate 15489 BLAKE2B 98d8a7b3653dc75aed07a637707a8a0d7b574c9a7e9ab8aa39d6f235d003ee15dc4abdd76e3ba171b10aafc98dc16f9ef8413f4154c30848ca0c12d4972f527e SHA512 b86915db2079128d6abe52c8f3fa0ec21815faa988bf678a162c2caaeb0d2ecf2f5df496d5dab08f399578b4f0258f252e890d9ab9e8347c50e5d7a2ab374db7
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
+DIST bzip2-0.3.3.crate 15346 BLAKE2B b3e5178400a2235f500c3f77ad538fa3c271e261cbb4a4128d89371fac0f117a12c6a84696cc8ae9462a9a1a8712ed5a2086c94af14ffc575e0ee1676fb2207a SHA512 f2a844655fbd9abc866e691b57ddad166f09a183b8bd33cc6ff5952fe7f11141b1843728c6ad23fdf88a181fd40a3599df3e716c5f004ef097af6b99162a55d2
+DIST bzip2-sys-0.1.8+1.0.8.crate 632179 BLAKE2B 08bb520d2dc35e64364b995ead41d94a8c3d19ff70b5abf5abb321fc833e802e2532724072e64b37ef5fa2008545ef6cbf87db8d35edd83c22e856c6ccbf578b SHA512 f12fab697a813907ff4ebe802f7699ce1e93c533e3795db4fbeaa4f4cc368b4b6a47cb31989de0000acc82d71e4d28ccbc365c08a60aad73bc3c9488a7d3b768
+DIST cachedir-0.1.1.crate 11647 BLAKE2B 421b1ca5ab0edb6daa4d211a9dbd4ffe6f832aaa78ce0a3806402714566d556f346098fc67fd285623f03f3446559aaea6de7b0e5839d9383a3019dcffa64f0f SHA512 8704f97195d4766b813ef1fba5d1e864ba512cbe549fbd6ef397f4e9128438551ef32b0376fb8df40bfd9fbd5352b96fc09daa5991504e4f546748db3491aa00
+DIST cc-1.0.53.crate 51740 BLAKE2B 04d9d6d7e5999c9463dd86eaed965ec728c285ea0e642a02383b45ea820bcbb37c91116646b0fa2636e7176030bcff29612a72482df8c7a02a7262a805791e55 SHA512 8c7224b21a36d46afcdb7b2475686edb2d31b784e95e792f81acd5d5840b0065ca8869ca1c8c5a70cfb3e31dbe5c006360b054c1f11a92f0e1937e4e6d335229
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
+DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crossbeam-0.7.3.crate 9906 BLAKE2B fcdfb2fc07670cc90e1a60f58b798ecf913cc27153123c430e6920cdbce8459837d8a2ac7436f1fa37389b3912fb3166917af812fee474b73923c8af316a5b84 SHA512 9b06c2379364827df715a1cf6a842d6d793f53082e21eb6daeea0ac03dbc2e6a7902d0cbd39dc8d81d82b02641925f4a70b443d65a413f8e497eb3a9be55a8d0
+DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
+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-queue-0.2.1.crate 14543 BLAKE2B 0decf8fc19f33912d129eb73ac981142e9788fa546ac75ef449b298ff55cb20871cc00ff075814ee3c20924ce890fdf455c607313b9fd07252b576777bfc1713 SHA512 9a6cf2cda3a76f3efe30290413bf3cd539406039d29f42e06326822fcd32aed3dbdfcfddccdc5871b824951653836a8943e0d771c261fcf7878a8526927b5ca7
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST encoding_rs-0.8.23.crate 1403543 BLAKE2B 1ab7da7a4313dc3e0613a077bd9d036e91eec75913cb9b742879eab17e0af7dd76b69d7a17133f0c0c35a1f8c0628058415751105c95b63e2f578e9a57cbb71e SHA512 7036f64c0f26b3d993c1ffb64ccdf95a122ae93a9ef691f9903f90925b222b3aabaf379e951b5e9fc40726a1ed52ba54f3eededbc1e6b68385c99cf2c34d5ba5
+DIST encoding_rs_io-0.1.7.crate 16969 BLAKE2B 8d51835dc0882d0e0512f0a177f10da3a1c384f38cb4eb163f957cc134ef5b7aee65d951cf65c99cc80b087e0e92ca4dae431e3a8987fe6b86bbf0dd1bfa8ef8 SHA512 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c
+DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST exitfailure-0.5.1.crate 11425 BLAKE2B b1cdddca62262c80b9dc7598f6816084302f6ae3023ae527eb78bf7b164c10b33977808f0ca631ada23e0a6265b7be784098b13b14b613283ccec2294eada3c6 SHA512 df59d550c3e0b7effb7e7f18ffbf87934bc2e9a8e6b98e1294cd59a75f77df55eaef5628b82e68340256324b67bcde9d0d4dded66434939a9517bc24a4166908
+DIST failure-0.1.8.crate 37582 BLAKE2B 007652720edab76efca83ef23a6f29dfec2a8949e88f697a4609257d158d345ebd617577df9cda69a25cae70e02f96479f427ee3059362771a4a1459bc4bd1c9 SHA512 a8762c978c286f921ef9c46dd17f57656739b339656ad237f6fb43062a8b2ad97cb98b977ae04735312d5328894b45c512fe42e33a9bdc4ea898330816b7a884
+DIST failure_derive-0.1.8.crate 4950 BLAKE2B c068f2a122e1137aa8a31e3a3c4c333f1e66f1b93df144f5a07772167f9085241292b85c55adf33851c319a418bac19fd31f4fb22b87ebbbf2814cbc815b77b3 SHA512 3f11adeb616a2d57e1a33ec2a5eb71c79a5df7946a27b74acc7c89a67c5dc6d01222731b37b405e33493570a98c96c7d2c7b8535928d7cf82536bcd9f0df809c
+DIST fallible-iterator-0.2.0.crate 18509 BLAKE2B 9630fcadb2f30fbd8a2a057eb992bf33c0aa2d163e6fbd43de9c8c350e3e932ebca79a6576b215e17a0566898f6e37aef806a643d20c16a6aa73ca515fcf30c0 SHA512 c558fea3fcf3a7756acc0b63d38f76dfe7eeed4dd9c12c46b7a7e8b8bea64d00e0cc115492e8b3a1a19e86e6083477dcf7d2d72ef960b44f24d61819a3077e79
+DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a5248d090d1f25804b92838f41131e475abb83ae0b89401248feeb52a49dbffd499ccc0ba0f2f1d044f2f3e9b06662be01fe2257a4e885 SHA512 34824e2007cb944eaf54b10d6d3885bb17ef2a2976c6dd7695ff82a937cc95eb65d343dd7a5cd2fab5aa5859faae3352a9e1c78f239ff736900c1dbc3f5ef7dc
+DIST filetime-0.2.10.crate 13880 BLAKE2B bc2289129c0d79f37b2589ee31f7bd9719c1aa97854c0c06f321a394202bb96e86b9ec8f8727735e4925e214e6c7f75d87578ab44530a123807b5b7eae7b1097 SHA512 45d1b6fd6017bd1a479a4e343b8651c8d426616cb68914c728456fae2a27bb1a45fafcafeb9a12c89c4eed835327e461bf92b80eed0f3a4e84b196b584b8698e
+DIST fixedbitset-0.1.9.crate 11974 BLAKE2B 22d60a9dbac0717c00f95ebd687eefecea597edc5216ba080224eedcf732d4bc901b9f9d6c9dcbd10c0876376de49a7efb4e6ccf90c6776dd9edb5a7f19b9c20 SHA512 07b45fb7e676c6a1b450d23ff53651e1ea1eafdbfc5bc304b13255e0c30f72718fb37fe0f17f2baff799015aa29405b8a677eac604e3219e5ed3f9abecda1964
+DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
+DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST gimli-0.21.0.crate 645352 BLAKE2B b32a76d22a63958f6007110d53e27416a4f8ba429a28dc5b33fafb424dee57adec97de558f016010c83a0259d49acf9ce99edb973583d071dc441208c2da8061 SHA512 6c346c622a795a855e01db47b85684f6a8b4ca8b41cac472e3b6bc9ec6afbab344df9c3b2451332f6264b7c93d4d05986847ad47cbc7e2ee3049da5a9d6265b6
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hermit-abi-0.1.13.crate 9230 BLAKE2B 9591171d6f303a4a462d23edc2f8d493bdc23b6c2da4b464444718bfc89078e5a627e1543b7ab5be9d4e05f16c3508e55642360bb8d2cbd5edc2ce39b28d022e SHA512 ac424683ee3cfff9c63c735ac91008df722a2709d12744f009466574098433677266799e8ca817d3d3cad8f10f3c02e8081c67ff479701eabdc4543c0a79bd25
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
+DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.70.crate 472909 BLAKE2B bbc4b3ec2ebad2bed2a164e407e344ee4a70a7d83a00b8501d82d70a03dd76a3af40b5a494676d203c37683d602437737c8fd1cf1e7f513bfe5db2820ff29b39 SHA512 a543b972e73d5bf142988464cd62f4402b782796074aabf4ec9396e341050d545b83212c7e4c62c224d5e06de4d794c67fea91b83d605626df115b30d8f326de
+DIST libsqlite3-sys-0.18.0.crate 2281735 BLAKE2B 169784f7ddf0f92c7c38c5ab7194a9c912bfc19b28351bae7c9012e2071aacad1287443dc76433a905995f995b9aca7dd656a08b7f9f7246971773801db21bf5 SHA512 b11a1c3694778b4e175ee459068c9a05ecb9f736b22708fa5f673514a0721537a078fda92b7a49b846e48217d8aed3066944f7be2e87fd28486eecf2ee4f4a80
+DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
+DIST lmdb-rkv-0.14.0.crate 26090 BLAKE2B 80095eb7d78d1748f3c9f59262917077cbd6d347e367e0fd8a348dac161f8c1e7160e535a5ccf848be9f13d53d0563617b8af1428633ec42add1ddde019a68e4 SHA512 e29aa28a891dd5f1e8afda6f7aaa36c8914bdb67927ca46ceda9623eaa03256b848f2109bcf39b8023f02a4e298c6071b3c2bfdd51473681a35717a706726db3
+DIST lmdb-rkv-sys-0.11.0.crate 164817 BLAKE2B 009f65739436e79e1ed6d95b8b36ffebccd3e5e8f6e01ff5e0147a571c5dcdaf5c09ebe2c627b91eb026d37692d79f59d2d20d9baec2a06dfe7b34123a3cd666 SHA512 7361f28cbabbd7c2d26b55989f09fed9264157e46933c7754084d5a3718f0fef1399f8fb4b071fc0befb4e36db7bc2b2e17e66ffc270f70e600798cd5a136df2
+DIST lock_api-0.2.0.crate 17694 BLAKE2B a1fed36e21d635cc69f47c22f3311180dcd5dcf0d31f55a76ed5ac644d8aae2232d945d10d9040681fee42569e8808fc071612110424358df798d70a47c919a9 SHA512 23ba50a3b69903a83de43c63c09c56bb24fb69e2c43d020d1dd5df61bf45ad2ee3f49ab4263e069e311a48b5b7220f3e2d1417c7c98e3c6350f0036007564a0e
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST lru-cache-0.1.2.crate 9307 BLAKE2B 606072bc5390a13cf24b4c64c77ba7f84c4c2b1a73c4abe8ead4e1d19067b063888d5cbe478dc9108d193f0a66aa5fb2ddc073f3edfac466de34f85a52a15ef2 SHA512 ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1
+DIST lzma-sys-0.1.16.crate 632423 BLAKE2B ce0df380c47e64bff3e95b60ee3772e0d1cef19b530461657c3ab8ac0153f4ede615013c8bcb2b4b9e1f1d37bd142bc940ab5e62625bb750562e5c75bc7b8cc0 SHA512 b9c3ed5d383f96f886471e89d8f194c70b022359e5e5504c3926aedaee76ff755e301b2f0aed95e8717ff1d9f2ff4baeb84a91d7fa41f1e0e0d069a74879e757
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST memoffset-0.5.4.crate 6927 BLAKE2B 0563c8182c5242b8396292bc6b8f7daf27bfca5a9057fca6854e1329e76c94be6c1e9d7d25aecb09c8140cb9bede4bcf224311a37e9e730149f8b0265e1eccd3 SHA512 5f8f6a0f12af165a98e6401a694ae35fe5ed21865d6f25d95b64c363304841ef05ad0800dc841477fbf85080975d49a5a182964d6240c182b9d55ef3b5877a49
+DIST miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93
+DIST nom-2.2.1.crate 95289 BLAKE2B 1f5ae66f897499f3a24d89b133cecfde5f38b80a05da4dcd4cdbd87cce6f37a690ebd624c0c190c77338afae74e25cbbc9b1f2fc765ec474eb8798372d11ed4f SHA512 f628351d0c9d4346aed3406777bb87d34a53be739b98712f80e17fc31598a75d165f81870f2e633599190ae1be850147502b5b7855bc184fddaa2dabd3314377
+DIST num-0.2.1.crate 9082 BLAKE2B d82bf8cf2f53ad30cee1364d65358e8421aedf66126184936d575e359307373ede66358e7672e1eedf3b8ec6a997439a077943c6f20045aa24a89bcdeb611e70 SHA512 9d094e0a29b2bb42d382d5167150418bc2ed81e8deb3c6636c99c86ca14abf5f69b82a49f1678dd110119eeaec2f476fe7a5d57e60558473a6b7c710dec7f778
+DIST num-complex-0.2.4.crate 24679 BLAKE2B 175ee644720b6bbff108eb4ef94d0fea8f340533c2be0e18524e54777734d1c7dc10a7c36b1f2ca3f032ddcb3dc351e60564340aa59b29aa4fa7ecb2487314c4 SHA512 53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea
+DIST num-integer-0.1.42.crate 19463 BLAKE2B 91ea6900dba5a38bc7ac4de0db8706f5335baab636937e9efdb1b82ff0e8ece4451503de3ac9e473a4dd7c70d599066f14840789fa88aeedafa585f0f98ed61a SHA512 8c7e0529888e18b872a634e8983034b0357143aa72914b45c02ee87447204296970e9b1ed078d9436ecc779f25360b1a1cfaae5a9bf7c8ffc68793d7c25593b2
+DIST num-iter-0.1.40.crate 9659 BLAKE2B a4bfe3834feadd3731dc74872949522f92eb48d4adf63aeb93b73fb53474b408daa12075f1f2128ad929dfcfb103ee670cd61c95b7b79ead5656372e43b79b4f SHA512 c2ef7ee3761f57bc768cb892abdcf9ce8d65b4ba0b5e130d30eda0531368c836a61b1fa4bc3fb95feadd2f3fd787c986e7ee8c26256c05f2a89ba9bbc2c32141
+DIST num-rational-0.2.4.crate 21694 BLAKE2B 6e8dbb873b1c62046c3fc45eeea0533a8375224fee6537e369a6042a42f98865c010635f3723c8116c32b365f8dd553831efeac4a1fb2bd0cbb169c90d7035cd SHA512 06e55f17a1ea58fd465a232ebd687686c922669f0b561f648717164f3fcc8fe2bb43213d1e6377158d2542f633ef2e1482a7c3cef8090328c34feacf7f9bdd93
+DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
+DIST object-0.19.0.crate 166974 BLAKE2B 29d60bed376fea4db8b8ae4c214eec006682d2317a9789a55c1737e41591d8f668afbbdd3eab6e40346647692c5410caaeae456a172aadf0d3517c53eeb560bd SHA512 6482cae0233de235cef2e09b72f981a88747d4531cb04e41151ac5083120d1c3dc0646b017b310e51ab3c304a91502a343f0970e61046f54bc8e332b27b0bc73
+DIST ordered-float-1.0.2.crate 9458 BLAKE2B 6a2611ecf0ed5c1a999b3b192edaba940caf8b07a432b4f3e27003d246f9b1eae346747da60019a9a60a92ccb867fd2451ad3f4e6acddb9c08ba817912806115 SHA512 aec5c5e00fc17e47687d69fdc6cc3d4cae337b2af6f28cc869ba5e98aa64c81493c8f822e6b68f6cc109b99a7b19363211b28cd3cd9263cd61f2ccad3d3f7399
+DIST ordermap-0.3.5.crate 35246 BLAKE2B a663aced769ea6bebedf21b95e98756796b9640d89e1cde828f7af32921cd7354dc7dc232fed40f4c65d54ab3e472200e07a057cfe634002d1371c9f93003e20 SHA512 4413319af191656c82c6f4b185840486d2021ab4a91e412e5472329af928a6519690734613f9616c285c6a4c967a4c718483583e0a5d4b16bd98b01f3d226ddd
+DIST parking_lot-0.8.0.crate 34446 BLAKE2B 0b5c1f386f5e67606f911aaefd9022abe01486aba5109ccc5ed72d2e5e87bb2ea93430114c12e0c1d76a799fb5db04c6e689f98bfe66ec693b7a63cb28287c26 SHA512 82937f87811a987652fad9c4018efa2dd214b4142c5a94c6629fc5bb0e9c49c13d9503783e3932fd0834f2a1afde6dce80aa488b2bcd32c95bf9a9d5ce139f93
+DIST parking_lot_core-0.5.0.crate 29706 BLAKE2B 80f7fdd38ba3afd6882a0c636bba79d995131451bc17d75e9100447812e57b4fbce260a5b957de065d687a655457ed51fa58978438446cdd4235813591a8d2bd SHA512 fd90b0a82713d329045da37ad4ab6b66d1e860f0a6ddcdf102e8740b98badfc83d6c056210618fb339271f1f68545090287528590d337d34a31bd7fdb70b0dc8
+DIST paste-0.1.12.crate 9854 BLAKE2B 51d34ad87527c94fee968dec174e8bf55afa4d55d80c1fe2ccdd7779a2cb183bbdd42e78ad4be9832e32e7282bd61d8b9b0e17af8f64e328accbde8ad1fa7466 SHA512 079bbbad01e965dab1404b51a2ee7920e85cf7d827ca95e6a86460c3c033e26e3fa54d490d3a42abc7092d117cfc5f8b91b5cb7ea9556b75f32be7c70737c0ee
+DIST paste-impl-0.1.12.crate 7906 BLAKE2B cc09da67e026ffd5f8695b0cc7ff89b60c5efa74b731568cf386407028ff18de2b71bc1c79bb8029302a82b41b4a945fa25f4dcdb415e88afb314c84431b59a2 SHA512 30dd06ad50a50e68798968a38060a92f17cc437d4e28559bbc38f40086c3346467621ece99380e97dc4b86d447389361a1cb823aa3cdf23ac4bfd42ee7491c87
+DIST path-clean-0.1.0.crate 4909 BLAKE2B b3becf5a47e303dc0f61590256728a09450d0c8ae2da11482e336c919541955100c5265c90e3440b3176ee3afa3a00df36a49f2803f91a17c0cc41700e86c5f0 SHA512 c4338b6dd98785f285642faa44ad0c25d1c7cbfb0e27b0b2159054c62efb7ee9c7999cdb0668f77581d6565ea3254d67916982a4b5720133f385771828284709
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST petgraph-0.4.13.crate 111936 BLAKE2B 426d865c16930715a2207f778ff108370cee0ff8929d49b00d5497e4fb28cc62c2fe34704b75f55fea416339be6c7417545a23b085d33af74b0ec31378edf2b0 SHA512 670753503b9ee5eb28b73e9ad6367f5cc97064182ed82d691ab95e3948b1d879aec9c74eabad11c232f40cb18d2629e1bdfedb3f0d444d65526a2bd7e69bb60b
+DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST podio-0.1.6.crate 10186 BLAKE2B 30f1ccfce0a1026ccbffbbbfae035fd3575b43c9226b6fb05c1dc7cceb31ec02de1dfed3cc497dd4fbcc611a767e3b5cfa3c751598663dd5c30ec457c6b5d946 SHA512 91901b941780db01f01848ed63fe44decf3543dd5163804fbd0118435ea60b43baba9d24bb1d182e929744a32ab4b2a0bb7fa9b6e9f3d32966bdd6b8ccc631f7
+DIST ppv-lite86-0.2.8.crate 20848 BLAKE2B ca85104fc1d6b300aab69c7b9367ba04f77ccde38bb7aad80cf1f615490696b27d61dcf242574abebe54b288414fdec2b63c756e47f188386a0f5523482ad9f5 SHA512 224db067f771eb48e4b0ddc2b7a1baf7389a47675ba93da50e3e4d6c88cef09e0f4529f399350b1b3feac7a88469406aa9b967377177a8c89605c49e1179771b
+DIST proc-macro-error-1.0.2.crate 23699 BLAKE2B 2d8310300002d1dc3fa68391190c5536e1faf6be05f1dd2ed1429d530dc527f431bdb93a994f2e68ff6120523b0d10a4a2ab35a0703f3013b404d0b82ab68372 SHA512 a9ec65c02f853f05f6adbfd398a82e84dac5bc376f041ede65a47b510914f5def1ae480c1a7e68aa6fab836efb6bda0d712d45243472b73c12d1ce7cdf8c3583
+DIST proc-macro-error-attr-1.0.2.crate 6974 BLAKE2B 4b8fb0c70873eb487dbfbcd37d5a5dae6d877a910f3523d9985a511ea97795082548f03bef926ca91028340dada954217926e7b9d8cc70765343f6d86c1e7c01 SHA512 1fe7ea1e005ab4d6b777b2caa4a5c2ad7655b5375fa987b0b2cfbec6a0673d844aee2dc273dd327687dcdf21a165261e78175eed69e881dfbe1f2992eb505c78
+DIST proc-macro-hack-0.5.15.crate 12806 BLAKE2B 7c6beaad31a2da23028e0a5517737fd9d8f8c81894c4aa09f15e7d323cfc6ee27ad69c5797843d05b360466e46d2e339b4c0b2a03f6a0d3e3bb2114db8c192b1 SHA512 a49115f1271c6a9df57fbfa647b725f84dcf87c6c3894c35d878a13fa5981c790de16f02823c2ea1b07da5fcde85e9b13398e7317aecb4119b80a4ced5dcf59b
+DIST proc-macro2-1.0.13.crate 34303 BLAKE2B 090da288cbd3d21ef2faefee80fdb17a4184789f6ec47cbcfb6ee40eef25df8a64c22385ee1cb054d121db8919a337c82798452cc054aca19a415732350efac5 SHA512 bb8043709f54fc3f845c1c6ec937a393f3418165ad854fe9a15bc1cd40c8c1545fc127b0fdf337f49135e2e2b7f9b5203ebcad92d32987792eb22622a53af4c0
+DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
+DIST quote-1.0.6.crate 24225 BLAKE2B e8706bf2e19b89855d5636704253d674fc9804e0d9713d1c1dccd5fe06af273f8604f80b6727f788de6416e62dde67a13abc2f3aa81cd5ea45eb0c73069ee300 SHA512 1febd6748602d4d96fbacb1f37bbc93c71d9fbeb9be7e9c6be2e871614048a1b2921c1ae702bd8db5d449308e7946ebff095689ef0bafe52af37c04936a8115e
+DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
+DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a
+DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
+DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
+DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
+DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST ripgrep-all-0.9.6.tar.gz 6429257 BLAKE2B 184ad8835c00913eba07c6f922683b372f790ba9a04141bb98fa7510095cc392b750361ddd0cbe0e2ebf832b24249c0203f07b1e494ae7810ca1585868895bf2 SHA512 45fc258e8ef44ddd7ce6b4c7dc5c60a439c8e5aafd253ea41621afcc50aaecd300d8792c4cbdc9247a5656d9c3db0a33053de96ca41f0831421ea8ce382ca7de
+DIST rkv-0.10.4.crate 45110 BLAKE2B ef132f136558648990ce3a1f253d30734390774264f395a5fe23cc97ab29e706fe8b78d4b991885a83de1d30dc0bf0d4f58931053ac64ac634f5050dd2142a0f SHA512 5c48db9ab5c45b4ed8fcf4278b95dc8509f28708918a84fa94ca3fc908a0fa62f6745ed46df8f2a0a1071eb1787a2f5f61538dce32ef356ae0c168c09f9dee35
+DIST rusqlite-0.23.1.crate 112106 BLAKE2B 81aef08730b86d6ad5a9320a0aa7c6f1abfd7e938908f78784305e7deca4af2bf79c53041ff1e63a12a3b150530c646ef63f6f036e914913cbece7715afdaa30 SHA512 e93a38e80e55c4a523b757981b285547e7988d83610c707013f995d2eacfb3d65b9f2d245db10790e89a2fc59eda7c5330f17d45baa55ae3c63dba523a36dcb7
+DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST ryu-1.0.4.crate 42039 BLAKE2B a1cd38c85ff105a0aea5e0cf09aa2be15d07e5344fb4a52b00bcbee6c6f966276aed1163b480b2acf669276368f04217eb7c0a6c279140f34bb54b1802e1ca06 SHA512 a1b28c07b32374757019f93eae30f82ae00682d5e9838f50864dd4ca898b8220b9bdb0f5df55d23d6bfc7386a3ac93697a18c82215f2e946e06c079962123703
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.110.crate 73947 BLAKE2B ceb9896bd205026825767951c6dd4c11aa5ce485ecded75eeae2f88627f4851c378c311d7ad8d06395f2ed976e342d31e11787ddf926dfeb0643ca0575b32ccf SHA512 508fc3195ba0deb75980a758a4392462068fdde9a87fe2f379ab9b28c573c5af45617b82e5fdd1e34cefa075888da7f533675b05d57757f0c0200b4fa5698863
+DIST serde_derive-1.0.110.crate 49751 BLAKE2B 14f3ffe6d6ce5aed13a800c2802459bca54546d3a77dd05c4c095f10ffabec8e66195cd69994b46162a96bd95fc5fb0d78a08864b7709a8f6c32643183cb90be SHA512 b02a831fced998388a39ad5e8ec12de5c7d09e18b69f15b112870d1e5976f74e0cfcd28a68dbcaef87c4be30001bd2cae076de234a59e8f39ea0be3014a395a5
+DIST serde_json-1.0.53.crate 73130 BLAKE2B 28f118648c77c8ada5a434416ec6b28615d8a9b677da7f34c8ba1104730087ac6d93e010a767199a98208ebe5dbde1203a47f28a2394a3ecb75b3d115a3b27b4 SHA512 8932a9f9f783b7124c7a41c9c3c0c1934c0e5b8b628fc9bab5ae0f78370231649f17de8015f9d6facf4ccd0305c68d8c648799e239bf32558c6be9bbe3819e22
+DIST size_format-1.0.2.crate 9234 BLAKE2B 88bc6ef9ef5ab210f5024f33ccd6403e53fa81ffc70ff5c4342440302dcdf87161e0644255c99e3697a6a5b0da754df0eea07b295a351b30a1737a55f453ad5f SHA512 847b607636deed445f233072074166a0af0692b57dfe7524f4d4d9ce79d8fc857f909fe9230085ac77d5290fefdbf4642b675bebabef71d88792d53e80fcc906
+DIST smallvec-0.6.13.crate 22760 BLAKE2B 83e573aadf1742122bbe1897bee09867d9225624474cf8c9a1bdd087a8e69eecf9567e8bdd2bcecdc8cc08f5f4c4f081bcf718ab062ee399c9a09b7f8c54948f SHA512 497e1a77414d545b44f099a69529c6c9a8be8cbc80a84bdc9e85428263518e6949b81498b9ce6ab2795508b1c3beb5e7e5aaa3623bbed2c041f8c3f4a0adfe33
+DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.3.14.crate 50408 BLAKE2B ec0e00f6ba689773450c653e94866807a098eddb2e2f7245bbcb14afa075fcbb23c4f831d1f558333d03bc5255d1344a06f1c698a0efe3888f3fb9532bc125ff SHA512 f05d7edf430626c9281e97782bfe1d42aeebe0eb4d4689e0251906dcc67f039fa1a24e1059db88e3f4aded2a094cd1dbe68551a64116fe0b92e460080c4b116b
+DIST structopt-derive-0.4.7.crate 19395 BLAKE2B 47d504003f99fca23ab9eb6e76ca6fc60a5509adadf6419dc15c82b00ec00ea826636e290628a6e94cd7e4745b2aefe2856035743cafa97ddca24351ca9353ba SHA512 db052fa7932d0050e93db82cad44283e04883436a2af5f63833330013985e9ac3d661bada194429aeb606781d2517383b7f5bd876125a4e02142dd6ccc6fb750
+DIST syn-1.0.22.crate 200450 BLAKE2B 325403804ad8723d2e63132dd9aab16fdfe305d9bac0b2fbfd1597f562e259290ff34946a0aad9b6dc36524632f0ba3a8b2261147cee2d9eedceed8d21a60ee7 SHA512 4d3beb6d448d24bb7413b6f9fcc5887fafdbdb9392c196bc7c1c0ee6dcf41fee2eb9166d8e69279437d266772a2581733868e763c19db32334f01c8c92fa11e3
+DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
+DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
+DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
+DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST tree_magic_fork-0.2.2.crate 36275 BLAKE2B daedefe9cbb8a46e97e861cf6b9421bf8251ed99c8d60a24be51b7fb1286aa645afd2dce2c2861d99c665a5319bd440b6a7bef1059b32bcb6e0258f9680c9e2c SHA512 85e7cc211d871c4d3bfb4a2637e1809f5eaf162b284132dd2b4ac9bf02aa213d5052e51ebf814ec4a78c74b5b626c4b64baa617be7475d97b9251f622852a892
+DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
+DIST uuid-0.8.1.crate 37015 BLAKE2B 776df691d501be1d8ffa00d04baf4f3319702bce172328a090aff341ab767e50f1a0bb57f744b5d0616a81422e04d2ec9a7aabd7b7df7451ce4b90e91c3cdc5c SHA512 754cd59021053cd3ec6b929cf6ed15127a8d0d9be1777e100153d6a23160a251c146eb180fccd1e515d1d0728332bbdb7c36e8f111958489234db6299df28f7c
+DIST vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
+DIST xz2-0.1.6.crate 24512 BLAKE2B 47f260f4ce920bf8eff1446981672c9d877b4e5908fe20053ed15419e3cebd540fcedecf71ace32b25bfc5d6731092a565a2a8ac303ed21ae47460c1b3414833 SHA512 c0880b2bbf890e962b27efda6c513d1626332ff400dd08a9126a6e1d1375e0d0e3bf243b10df78e2397b611d0365b6526d96974c4ff332bb81edba71b6ebc811
+DIST zip-0.5.5.crate 33064 BLAKE2B b10857e79c0548ce0aec9d1d7689e4b9c9d78756c7eaa97462dd201e05877f60fd1bb6f88e9a219bf96063f0716d2246629dac15f802305ea9188d02e61634e5 SHA512 d7f32cba1de57b62546316f3ce81f24dcdf47287555294ca61470d14b61c11f1347c22f2d51df55d351e910720c0b12d1196164964232c9c5fb349ab2630a6ff
+DIST zstd-0.5.1+zstd.1.4.4.crate 26509 BLAKE2B 909a36290f48e65147f43a2a08edcfca42471efb28f2ef28f2e45246f91498d184749fc19a56aeddc0db3ff91a003cc39909e92fe3f899879fc9aa8b32f26ce1 SHA512 565a3898c24eb5efac75df6b76d327ce8a2e62f261e63c4e307ad8583604333d9e3ba6567b3d83c7eb771a1117b743e594dacfe3fdf7542800da921ec0ebef2d
+DIST zstd-safe-2.0.3+zstd.1.4.4.crate 16090 BLAKE2B afa8563797ea2684972c5d440cba2bea070a487d182d782bd1a14eab6d2cfded1bfd6634b1ac3e39a5548d24e90415d0d9a77c951572f9c3657a7f81fcabbd56 SHA512 05f45aa3440e84e72f9a2bc647a5c1b146399dc5424767fc6371aadb8f48cab24dcac5fbd1c856b770c9c777b983382482d76ab8b10b99ae9569f5ffda852ae5
+DIST zstd-sys-1.4.15+zstd.1.4.4.crate 2014730 BLAKE2B ac978e2103688671f1dccb30da144a144e76a5aa054aca4a46e9fa18070e432e0498cf36d6e6294b21b1f4d30fca46a3c1df2eed5841674ce81f2d90b4021391 SHA512 523eb1f4183deca8be3cb018e43b9e51f1910b9e04b42795fb23e036c6f13e2b81ac70ea11837200dc3061622562d360499ed3b939fd8ff23c486fbcc35ec779
+EBUILD ripgrep-all-0.9.6.ebuild 3596 BLAKE2B 5f249d1cc8f0f1b323aa9f2d43db45c1c059d78638cc59ef03385b9bb5a39a59e8f81f400acfce251b4b8e5e6ac3eca570112456d19fdc1f8b2486bafe210bbd SHA512 3503bbad9bb449d8be8e444366ffd83a2a1e82d72ce62e77057fda3b7bc87aede7c888bf4af69068e09bd437152c1bf3028e2f3d2ef3f112ee6ab86cd15f2df8
+MISC metadata.xml 246 BLAKE2B efcbb4db7ac6eb97dc4625930f11c2d780be8fb04e89f2a6d7ef4a853f07b59b3058542d61769f3185b626f35bbe09bd6ee9e34323cef4239f1241dc3ff160ca SHA512 92d34b6d6b6116064cbdd8c79bba97e2f60f56a078c70efbbe87c9cd90cb96bf4522fcf437075bf30417e2ef20f696e6cd4e586203e85a00269aca13f1fb23be
diff --git a/sys-apps/ripgrep-all/metadata.xml b/sys-apps/ripgrep-all/metadata.xml
new file mode 100644
index 000000000000..7a926064dca8
--- /dev/null
+++ b/sys-apps/ripgrep-all/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type='person'>
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/ripgrep-all/ripgrep-all-0.9.6.ebuild b/sys-apps/ripgrep-all/ripgrep-all-0.9.6.ebuild
new file mode 100644
index 000000000000..42c4e92f3cf4
--- /dev/null
+++ b/sys-apps/ripgrep-all/ripgrep-all-0.9.6.ebuild
@@ -0,0 +1,195 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Partially auto-generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+CRATES="
+	addr2line-0.12.0
+	adler32-1.0.4
+	aho-corasick-0.7.10
+	ansi_term-0.11.0
+	arrayref-0.3.6
+	atty-0.2.14
+	autocfg-0.1.7
+	autocfg-1.0.0
+	backtrace-0.3.48
+	bincode-1.2.1
+	bitflags-1.2.1
+	byteorder-1.3.4
+	bzip2-0.3.3
+	bzip2-sys-0.1.8+1.0.8
+	cachedir-0.1.1
+	cc-1.0.53
+	cfg-if-0.1.10
+	chrono-0.4.11
+	clap-2.33.1
+	cloudabi-0.0.3
+	crc32fast-1.2.0
+	crossbeam-0.7.3
+	crossbeam-channel-0.4.2
+	crossbeam-deque-0.7.3
+	crossbeam-epoch-0.8.2
+	crossbeam-queue-0.2.1
+	crossbeam-utils-0.7.2
+	encoding_rs-0.8.23
+	encoding_rs_io-0.1.7
+	env_logger-0.7.1
+	exitfailure-0.5.1
+	failure-0.1.8
+	failure_derive-0.1.8
+	fallible-iterator-0.2.0
+	fallible-streaming-iterator-0.1.9
+	filetime-0.2.10
+	fixedbitset-0.1.9
+	flate2-1.0.14
+	fnv-1.0.7
+	fuchsia-cprng-0.1.1
+	generic-array-0.12.3
+	getrandom-0.1.14
+	gimli-0.21.0
+	glob-0.3.0
+	heck-0.3.1
+	hermit-abi-0.1.13
+	humantime-1.3.0
+	idna-0.2.0
+	itoa-0.4.5
+	jobserver-0.1.21
+	lazy_static-1.4.0
+	libc-0.2.70
+	libsqlite3-sys-0.18.0
+	linked-hash-map-0.5.3
+	lmdb-rkv-0.14.0
+	lmdb-rkv-sys-0.11.0
+	lock_api-0.2.0
+	log-0.4.8
+	lru-cache-0.1.2
+	lzma-sys-0.1.16
+	matches-0.1.8
+	maybe-uninit-2.0.0
+	memchr-2.3.3
+	memoffset-0.5.4
+	miniz_oxide-0.3.6
+	nom-2.2.1
+	num-0.2.1
+	num-complex-0.2.4
+	num-integer-0.1.42
+	num-iter-0.1.40
+	num-rational-0.2.4
+	num-traits-0.2.11
+	object-0.19.0
+	ordered-float-1.0.2
+	ordermap-0.3.5
+	parking_lot-0.8.0
+	parking_lot_core-0.5.0
+	paste-0.1.12
+	paste-impl-0.1.12
+	path-clean-0.1.0
+	percent-encoding-2.1.0
+	petgraph-0.4.13
+	pkg-config-0.3.17
+	podio-0.1.6
+	ppv-lite86-0.2.8
+	proc-macro-error-1.0.2
+	proc-macro-error-attr-1.0.2
+	proc-macro-hack-0.5.15
+	proc-macro2-1.0.13
+	quick-error-1.2.3
+	quote-1.0.6
+	rand-0.6.5
+	rand-0.7.3
+	rand_chacha-0.1.1
+	rand_chacha-0.2.2
+	rand_core-0.3.1
+	rand_core-0.4.2
+	rand_core-0.5.1
+	rand_hc-0.1.0
+	rand_hc-0.2.0
+	rand_isaac-0.1.1
+	rand_jitter-0.1.4
+	rand_os-0.1.3
+	rand_pcg-0.1.2
+	rand_xorshift-0.1.1
+	rdrand-0.4.0
+	redox_syscall-0.1.56
+	regex-1.3.7
+	regex-syntax-0.6.17
+	remove_dir_all-0.5.2
+	rkv-0.10.4
+	rusqlite-0.23.1
+	rustc-demangle-0.1.16
+	rustc_version-0.2.3
+	ryu-1.0.4
+	scopeguard-1.1.0
+	semver-0.9.0
+	semver-parser-0.7.0
+	serde-1.0.110
+	serde_derive-1.0.110
+	serde_json-1.0.53
+	size_format-1.0.2
+	smallvec-0.6.13
+	smallvec-1.4.0
+	strsim-0.8.0
+	structopt-0.3.14
+	structopt-derive-0.4.7
+	syn-1.0.22
+	syn-mid-0.5.0
+	synstructure-0.12.3
+	tar-0.4.26
+	tempfile-3.1.0
+	term_size-0.3.2
+	termcolor-1.1.0
+	textwrap-0.11.0
+	thread_local-1.0.1
+	time-0.1.43
+	tree_magic_fork-0.2.2
+	typenum-1.12.0
+	unicode-bidi-0.3.4
+	unicode-normalization-0.1.12
+	unicode-segmentation-1.6.0
+	unicode-width-0.1.7
+	unicode-xid-0.2.0
+	url-2.1.1
+	uuid-0.8.1
+	vcpkg-0.2.8
+	vec_map-0.8.2
+	version_check-0.9.1
+	wasi-0.9.0+wasi-snapshot-preview1
+	winapi-0.3.8
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	xattr-0.2.2
+	xz2-0.1.6
+	zip-0.5.5
+	zstd-0.5.1+zstd.1.4.4
+	zstd-safe-2.0.3+zstd.1.4.4
+	zstd-sys-1.4.15+zstd.1.4.4
+"
+
+inherit cargo
+
+DESCRIPTION="Like ripgrep, but also search in PDFs, E-Books, Office documents, archives, etc."
+HOMEPAGE="https://github.com/phiresky/ripgrep-all"
+SRC_URI="
+	https://github.com/phiresky/ripgrep-all/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+"
+
+LICENSE="AGPL-3+ Apache-2.0 BSD-2 ISC MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/pandoc
+	app-text/poppler
+	sys-apps/ripgrep
+	media-video/ffmpeg
+"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="
+	usr/bin/rga
+	usr/bin/rga-preproc
+"
diff --git a/sys-apps/salinfo/Manifest b/sys-apps/salinfo/Manifest
index 6aac0613ddf2..d96e12c4e92b 100644
--- a/sys-apps/salinfo/Manifest
+++ b/sys-apps/salinfo/Manifest
@@ -1,4 +1,4 @@
 AUX salinfo-1.2-build.patch 1198 BLAKE2B 2f2ecac3141170e0efa253fc6e550d7de60162a7187b2cc4ac304c1ca62b052f14480ba281d74765cef03bbaa606f6a507f6717586f07ed5089c649b040683c9 SHA512 fd037371b22fe3d6038ad2555fd6af485d45688006b02a35bace25c7a98b9f5b9f13cff0a0be4c47f356952b24b9622328b465e8439cd7056f7b288866068bec
 DIST salinfo-1.2.tar.gz 40511 BLAKE2B 6556593181a27bf6f608470c2ad42a76a65c3d07691357a1412bb8d1bd157309427dc43c0ceec8ecc1a11cb14cd92de22e83fefe0c09ff80c3040ab12ac3aa7a SHA512 6a92eb6ff38965a93ea61f034ba3607b871b7250cb640ced21b0eabaf94214ad2df78a3fb059fa0c61eb7aa90a6fc4e592ea852b89629b259c36d2b17fb7c4ca
-EBUILD salinfo-1.2.ebuild 611 BLAKE2B 9230640e94af5287b8a95af17ef6cd6a598fab3d080ac92844a495c3f2429f03bbb36099a7fd2c106f74ff8158a2b3203934e0fded460ec3f3a35221d01c408d SHA512 ef03e9d379002272ebd5ace3539139f0fdaf99eeae7dc2d5851ccb885d65a6bb5280a4a8801aa65e57e4155b5b466578a8837bcaf6a270b496a005842c6842e1
+EBUILD salinfo-1.2.ebuild 611 BLAKE2B 4c05bd34ed41745becc748a7046177d2f4fb083ab535480db37835df5e7e4c7809947e7d0656a066d1d546fb37228841f02213a664de05a625e5f6fa8fb3893b SHA512 a3e7ec04bf33e76bc46060ed6a64970d8f4a26e22bb8843cdfc550da11e89a9a8d30a0ea9af6564161ce78c711229170b72b3a9b12012aaac2d6305637acad8a
 MISC metadata.xml 258 BLAKE2B ecb1fdb19c796780954401c2028e1c6e3eb0c20e0932cdd7386662f2fe654bf6bb29e447627b840fb34db165fb8d5eef0433a2eb56addd0b9799fb2ad92ab726 SHA512 0efa4eca2fddcb607098b6696ac01fc1d98cacfb3cab6e64821e306e8cc66d32bbeaa2a89960ccb9da74620d6ca3f85baf60891f5e70f647fae9e2a84781dd1a
diff --git a/sys-apps/salinfo/salinfo-1.2.ebuild b/sys-apps/salinfo/salinfo-1.2.ebuild
index 4bfa4cf70ca6..7bab3829ffdf 100644
--- a/sys-apps/salinfo/salinfo-1.2.ebuild
+++ b/sys-apps/salinfo/salinfo-1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
diff --git a/sys-apps/sparc-utils/Manifest b/sys-apps/sparc-utils/Manifest
index 67633d764205..34067326a0e3 100644
--- a/sys-apps/sparc-utils/Manifest
+++ b/sys-apps/sparc-utils/Manifest
@@ -3,4 +3,5 @@ AUX sparc-utils-1.9-no-implicit.patch 584 BLAKE2B 153440b685bfd044c24f3da8559889
 DIST sparc-utils_1.9-4.diff.gz 9083 BLAKE2B e4b16c26fe67be73d0fd3ad8e1e80b19356d5961abac344f28650e4d355cac9c557999591947391c41be88d819ebb703ae1ff177b4fbe0d9bea7a411a791821f SHA512 ef79dc480471117da3a778450b3a122eaf64fdee69d35ff30b301f2360ff5d76c6343ce37c25cc188891c1619809daa0595d01c6e85781ddd7ddf1713c8378b7
 DIST sparc-utils_1.9.orig.tar.gz 110080 BLAKE2B 52f47c130fb8e24b0340589c846292fb2e4e9b211a10cddf52a7a63edd70673e2b7d05c2415e558c5f2d1235f33f4ae65b777d3f8b2cf2c50a601d1f0a7a941a SHA512 bde05f1a98211aaf502be6dfd757ddfb21c136cedbb46ca84a4539706c71901815c9d8bedfebc3800c7340634b32276197c75f92f9cc829e4f50c37d203e9358
 EBUILD sparc-utils-1.9-r6.ebuild 1585 BLAKE2B b91d32f573e973dd9fcfa68f28652da3d3a7ed29a786f40222fa865a65d887ab923e4d16be613d61190d3358af87f7975f49881bba375c09a47d229efd9d1c39 SHA512 79cb400fb36e2aab458eba75f9580ead604451986bee29b275570b5c1b91143fcbf0ccf5b657a383feeefb243c411cf13c239ba0ec23197c53fd94560c759703
+EBUILD sparc-utils-1.9-r7.ebuild 1586 BLAKE2B 6863cba0c0ee442437137d0c142dcc419816326787f43a5644a6c4cdd3eab50582927d815d920753bb2cdbf42549c9bf83a8f022c179d8e1191e39bd128d1325 SHA512 0a600262916b855c200e89cfc4f72478ad9340d2ac7748bb2b755c1af0a164ca66093f6f3b63ef5bcbdc112ee7b2d29460682479503dd0dbcf078bcc5848261c
 MISC metadata.xml 416 BLAKE2B 3d0e052bc957750b869856cabb6e94d86dc1655e63da29ac3753c16d8437e7a9a97c89e225f03b6267bb32bdbe6215c25717f088684e493b5785a6d334854dd1 SHA512 c057eea9ea65b87cb366e802dd8962901024335a85b3ec53caa6c342c9e1a23e656dcadc2a70692e5e7ab55a0ac82637ef052699844f50061461a645613b688d
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r7.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r7.ebuild
new file mode 100644
index 000000000000..585dd2e6facb
--- /dev/null
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Various sparc utilities from Debian GNU/Linux"
+HOMEPAGE="https://packages.debian.org/sparc-utils"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/s/${PN}/${PN}_${PV}-4.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~sparc"
+IUSE=""
+
+DEPEND="virtual/os-headers"
+RDEPEND=">=sys-apps/util-linux-2.13-r1"
+
+S=${WORKDIR}/${P}.orig
+
+PATCHES=(
+	"${WORKDIR}/${PN}_${PV}-4.diff"
+	"${FILESDIR}"/${P}-no-implicit.patch
+	"${FILESDIR}"/elftoaout-2.3-64bit_fixes-1.patch
+)
+
+src_compile() {
+	emake -C elftoaout-2.3 \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake -C src piggyback piggyback64 \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake -C prtconf-1.3 all \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	# since the debian/piggyback64.1 manpage is a pointer to the
+	# debian/piggyback.1 manpage, copy debian/piggyback.1 to
+	# debian/piggyback64.1
+
+	cp "${S}"/debian/piggyback.1 "${S}"/debian/piggyback64.1 || die
+
+	dobin elftoaout-2.3/elftoaout
+	dobin src/piggyback
+	dobin src/piggyback64
+	dosbin prtconf-1.3/prtconf
+	dosbin prtconf-1.3/eeprom
+
+	doman elftoaout-2.3/elftoaout.1
+	doman prtconf-1.3/prtconf.8
+	doman prtconf-1.3/eeprom.8
+	doman debian/piggyback.1
+	doman debian/piggyback64.1
+}
+
+pkg_postinst() {
+	ewarn "In order to have /usr/sbin/eeprom, make sure you build /dev/openprom"
+	ewarn "device support (CONFIG_SUN_OPENPROMIO) into the kernel, or as a"
+	ewarn "module (and that the module is loaded)."
+}
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index c94cd4577bec..d3705b3f59e4 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -7,6 +7,6 @@ DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7ed
 DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
 DIST systemd-tmpfiles-248.3-musl.tar.xz 22904 BLAKE2B a277ce86577644cecbca5dbfde34aec494e3e14075ab4f7fcbb02f9307d714a93ca63f38e346a1e98391ca9c55860c7e90789cd5edb9b196cf638d54bfe1153b SHA512 d3db6a90bed6b6c1a9f6bce138137554742d1bc60da142fbadbd49b64677a562e47d8140b9c413857106e053d740476744b7f7e05af9dd4a1329058c78cef940
-EBUILD systemd-tmpfiles-246.ebuild 4798 BLAKE2B 7a79b8e66836982ce2fccb0292cb39974db018a99846e692875743b726932246e7f56ccb581df4957938f369bb879ac52ccd701281c8ed8c02a22d246a9f803a SHA512 d15bcb442ae7706039c0443f8467a6dfe6702964a2f8fa735869c49bea280c6232794f8c8cb9bd3d8226df9006e469df4fb56475590b3f31ce5529f079fbd584
-EBUILD systemd-tmpfiles-248.3.ebuild 5456 BLAKE2B 0905dc2c8a65a9843200b11b073624fb2fd924ab2ba882afa9c43144c2b92969f116f1899f76d92eb2bb6a952372f86227a7986b4a6155d7060f11f60066d881 SHA512 6f6360edafb9a60789fe7d45e7ede624c2d7920492d9a326929f656e66b791f760cb808dbbf981f0a20cb0d0f46ffaa387ada4748de604c8c5d2ad35b0ddbbb2
+EBUILD systemd-tmpfiles-246.ebuild 4802 BLAKE2B cea13522b54ef9644dc274e4ccf3c3f2532f93eec3b7edb467e0505479a42463576dd971377407067f59f34edcc0e6a5f994ed16a6b9a0a532ee23241d80ffde SHA512 1cbf46e13a8a48e9e6659e580dfa81c356337ed63baae7a8ebae055e60932ad83283de1be9922104f57d61fc44dab9750fb7cad37a5e5f4896544e3c932453cd
+EBUILD systemd-tmpfiles-248.3.ebuild 5460 BLAKE2B f4fb7202ef3ad1dcef75f0164310a2c98b2f63721459637f7c3ad7649f4cf747fca5dc9a92fcf442dfd5991d0cbb498a2b6d97b67b902c0c1bbd7a7977118d4c SHA512 35767f532eaaacf6d90ea2329ea9ae6d928e6c3a26e0c6dcdce08bbd6da42395322881ee4d03dc497124afae2cab812ab557eb963ef638e0bfa103f2fa11061f
 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 d5f47ffac79e..cf8eccb94f0b 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -18,18 +18,20 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	sys-apps/acl:0=
 	>=sys-apps/util-linux-2.30:0=
-	>=sys-kernel/linux-headers-${MINKV}
 	sys-libs/libcap:0=
 	selinux? ( sys-libs/libselinux:0= )
-"
-RDEPEND="${DEPEND}
 	!sys-apps/opentmpfiles
 	!sys-apps/systemd
 "
 
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+"
+
 BDEPEND="
 	${PYTHON_DEPS}
 	app-text/docbook-xml-dtd:4.2
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
index 9b9579d77a8f..ee49640987f2 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
@@ -24,18 +24,20 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	sys-apps/acl:0=
 	>=sys-apps/util-linux-2.30:0=
-	>=sys-kernel/linux-headers-${MINKV}
 	sys-libs/libcap:0=
 	selinux? ( sys-libs/libselinux:0= )
-"
-RDEPEND="${DEPEND}
 	!sys-apps/opentmpfiles
 	!sys-apps/systemd
 "
 
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+"
+
 BDEPEND="
 	${PYTHON_DEPS}
 	app-text/docbook-xml-dtd:4.2
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 3c2e4763be98..82fca44b96b3 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -14,5 +14,5 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r18.ebuild 2100 BLAKE2B 90fd62cae5fd2118e238476b77d20a64659a55152986771cc86a434b0765ec498dbfb50e00144db392b194e7ad8591002ff4814eea1e50c1426bb1c782342ac2 SHA512 d65d879f22d849f7ccc31c7199fa0c5b900c72cd53a2ae6a100a8aaee93433dc3f06a9399f7836df8a6617380d2e2939297b070f11464c90328a9168d30dc70c
+EBUILD ucspi-tcp-0.88-r18.ebuild 2099 BLAKE2B 741c2af0f4265292b8c7a026d3f838947a82f32c602935d49c73a954038cce8cc95a1a5d65db3acae0a3b813d041cb318e131f8aa5fa4ec9cc9f3e5e1e9a5b71 SHA512 a43ff16d2b499a200f453acba1356569aab1972c3f345c24d9561951633ba79ab77e43872c34a2874104ee93c294743e2616e5ab1b308492ca06b111554a1b08
 MISC metadata.xml 600 BLAKE2B eee72034e2adba51553bf32dd54e0ec2026a97fd709cc828f28e22525dc66cbff4bdc8801f7c5b4fa655fdbd682ceeb71639f22094b96150cca02f7db538554a SHA512 8cc6d3b8383d604b971b5cfd48060d5190269beacd1060ca279cb5eb0defc54e36fd1972ccecdff5f3fa912ca0a80e177433226876ba72158e93a5a6c1cadffa
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index 2089ae8eda88..a16a279be269 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index 4cc7dbb4c1e8..dad6ce1786eb 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -1,5 +1,7 @@
 AUX usb_modeswitch.sh-tmpdir.patch 596 BLAKE2B 6198685654131161989e03ac28ec4f4db5a2d8ba57c4f3c4b5c1fe96086c36bf450b4854995d098610faf12f89eaf55a5bcd95f1a68f0f2d2c3956ee92870947 SHA512 45e3a3f78a9404293a8b7e864f22db94a617be1d34d2c91fdaddc9b6a183dee1e3e2b5f4376e417d2c56b13b772a70e5e5cb53d0a08adf4cdbe60f1378abfa1c
 DIST usb-modeswitch-2.6.0.tar.bz2 44971 BLAKE2B c1b7484e2c9df9eb0097b3d560adedafe169bf797cc6d8702a83bf47ebadcb9601f32112b14fb65fe164455c536a0d5f66319d5927d81e59298b7820c9fe9b11 SHA512 43e6d885380602ddaaf771af73a302a7de30f7ae6ea58b2b572a9ad9ec77a453789020595de33a8b04ec209414fe08face2bbf84c67271d7b6b90700face09ef
+DIST usb-modeswitch-2.6.1.tar.bz2 45471 BLAKE2B a28b3549410f781b58cec78003f7d2c917f65113415111df6e28ed56e5b34d9ee20ec33b6f6e9737ddb56bf3887c900706090f10ff4bf9e0797c17f77320081e SHA512 5d800b45257ca1182a13155dc37b614ee2d93273ed226cc9d05b6ae423f9e88b7c9aca6829604bdb86f68707ddf2c51c9ad2bcf898b8261b2c5bb56a21351e1e
 DIST usb-modeswitch-data-20191128.tar.bz2 34069 BLAKE2B f6bf0c54ea51cda361ef9476875e0311f2c0e839c9e5f0a9ca2a0e5444fa16be65a436d98291e97d338d0416a7367c6abcae1a9877470246ed9f84d25dbe3e06 SHA512 4b5954ad83f7281e42321c16f5cc5b956923cc0e2db5f238cc64b3ea37a419768f01f2e26310f2b4fe9a9a5b1d901517933effd6e6edd23bc9b8d0c039ed0ba2
 EBUILD usb_modeswitch-2.6.0.ebuild 1600 BLAKE2B 71de1cffe48eb806663a702c21a16556e1158db2465d6740b8577a677d7982a27b238d12c548c015f4b6d2310e201b96fa84b6173ae76c1a4207342bb9e966eb SHA512 2aa20d35a72b4d2a81181d83811aaa52b91c989b9065289d1c7e10513673e42a6b7132470201a411014b55a76f0e7d176fca148a63a944a1c0b8b851f21d9979
+EBUILD usb_modeswitch-2.6.1.ebuild 1599 BLAKE2B c9ad624c9c51522a96e6cd0d0abefe7a8eeea0aa028677dfdd0326270dd4b49a3e44c176249ffff0a4e9d75ebe5194a6d6edf4af42d7e39fc67db3089b2d62a2 SHA512 cb941368055621a361669afaa70cb14b2384f4f9d4f911dba8db2229e2e843c7c7587fb634b9dd98661dba011a321365c4bf8b66420667ec2e8bc7318044b6c1
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.6.1.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.6.1.ebuild
new file mode 100644
index 000000000000..c737fd67678e
--- /dev/null
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.6.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd toolchain-funcs udev
+
+MY_PN=${PN/_/-}
+MY_P=${MY_PN}-${PV/_p*}
+#DATA_VER=${PV/*_p}
+DATA_VER="20191128"
+
+DESCRIPTION="Tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
+HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
+SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
+	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/udev
+	virtual/libusb:1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~USB_SERIAL"
+
+PATCHES=( "${FILESDIR}/usb_modeswitch.sh-tmpdir.patch" )
+
+src_prepare() {
+	default
+	sed -i -e '/install.*BIN/s:-s::' Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		SYSDIR="${D}/$(systemd_get_systemunitdir)" \
+		UDEVDIR="${D}/${EPREFIX}$(get_udevdir)" \
+		install
+
+	# Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
+	# which is why we need to force the .service file to be installed:
+	systemd_dounit ${PN}@.service
+
+	dodoc ChangeLog README
+
+	pushd ../${MY_PN}-data-${DATA_VER} &>/dev/null || die
+	emake \
+		DESTDIR="${D}" \
+		RULESDIR="${D}/${EPREFIX}$(get_udevdir)/rules.d" \
+		files-install db-install
+	docinto data
+	dodoc ChangeLog README
+	popd &>/dev/null || die
+
+	keepdir /var/lib/${PN}
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index d20d983e28e2..b4da0be3be32 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index f5d9e88c7f73..3627118542c2 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -6,5 +6,5 @@ DIST polkit-0.119.tar.gz 1387409 BLAKE2B aeb605598393d1cab40f7c77954008a03926005
 EBUILD polkit-0.116-r3.ebuild 3326 BLAKE2B 6c47cc7f2661cc86f895ae4c677e3775f098486c15a53b4d45940cabe89d513dbba7b0da11e0b04385cbd76ecebb1ba132981d69db6e8cb8c4b91da57d5b3120 SHA512 f78c37869b914d29b131d8a4d8054d83b5be5d486d37e9fb76240064ee7256be477e2c7c457473ade00a3592fcd48a01a66054109dff4cdc10dedf8f596b60ed
 EBUILD polkit-0.117-r2.ebuild 3330 BLAKE2B 844d327d9f6c391ea89b305677adf98e823718f620c307586bf96172678dc94a4b1a5ad870e6ebacf0fd579839b73359de33fa0173f46c425e0f7cd0228c6bd3 SHA512 99673f56722f4e105eaad28a3f8e1a9aee1664e5552e940bf286bf84a76a52145745905f080f859ce4991a29ce6f3e47f6ab3d59a012e69ffd71de98557ca8bd
 EBUILD polkit-0.118-r2.ebuild 3304 BLAKE2B 357bae54102dec597d008e5c7fd7196cdbb6ad5cd5e8af4a7f2353fe8fab374ccf891945e0103705f81084d702229cbb77dd3ee307a888e3302da9a908e10557 SHA512 440163dba19a321a4b58bc4195d9e0db9876e8f4f6700c4a8d4d22a84b5f45a663b25d897a4fe7b5cfea69a3354046fe90830a82ac2151b3712dabfe20a5fa4b
-EBUILD polkit-0.119-r2.ebuild 3303 BLAKE2B 82cacc19d7dd2c8fb1de02b5e8bff0544e74e792a922ccac9f4e0f430dad8c29ad78b804eda2e78539f17f3d5f0ad8cbc2a6a7d894b64d7031f939f92518ead0 SHA512 7e94c1a4ee1e4693fc6e3c10b9db6c7049ec607812d68a0bd021cfde10ca4cd46b1fd9c680aa71b685bbce689a561526997dbd1feaa2a7888b7a09849a7dcf7d
+EBUILD polkit-0.119-r2.ebuild 3302 BLAKE2B e56f5505dfdfa245ed3dd78199de5439d7ff6d5ddb8778d785c69e3900dfdc7f9d4aa46e101bab2eee7ebdb4097eecfda0f9d29be97dbd348629cc218a988d87 SHA512 32e836e9c17bb7aae519031beaf35a3cba4da983bb29e875b7dcbc8ffae5d0a15218147904d0d942557210e240ffb252d9d548c6bf508027be337feba9e61923
 MISC metadata.xml 409 BLAKE2B 5460681a61f218f9347ddaaf9f4171aba5d270d9742588e9c2d9f78d4ba495a811062098ae65ce866ce6c5177adaf6b943db33739214ccaecc2a5e3914c67809 SHA512 e5a26398bdbc9251d175235e40477f20b814753e16565e6ca4f56a7d2f7b22c7238fcadd07519eecef7dee3428bd5b76b377ff19b24b7be5b0f52d4cfff32743
diff --git a/sys-auth/polkit/polkit-0.119-r2.ebuild b/sys-auth/polkit/polkit-0.119-r2.ebuild
index 41df2eecdaa9..1fd9a3e3feeb 100644
--- a/sys-auth/polkit/polkit-0.119-r2.ebuild
+++ b/sys-auth/polkit/polkit-0.119-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv ~s390 x86"
 IUSE="elogind examples gtk +introspection kde nls pam selinux systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 6112c5868653..2066669fcef6 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 4c605a61c7fa..22d80efcaf28 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,7 +1,5 @@
 DIST partitionmanager-20.12.3.tar.xz 2085060 BLAKE2B b6f94220f157e33d287f967d0ed568b07622cdbedda82e2659257b92487a40cc8519922f62c705b9eefca5404c0f43b6b331679fd4b18fb5957bbc850417c296 SHA512 480f706b3c1fd7fcd3df49bf9f2277a4337ca696e912664fa9283110be2575b84694b1145d02bf9c4c968ea1be1864c01125e9fe3892d910b898a4afb2aac130
-DIST partitionmanager-21.04.2.tar.xz 2097448 BLAKE2B e84e99f7eb4cec2394835fcca7dab81c04418588d07b7d93f434528c2882236b2f9a7b7ed94992e1142b31d59de589f669f862938c9b6d8d7950e5f2e1d66ebf SHA512 6e4437810b1cf24872f7a16a2abfc9b2a2426b14cae10563a0917eae15b04d7cae27d2df7137112d79a89fa27cd9a57ddc0a77d085945436a47e9910fc462054
 DIST partitionmanager-21.04.3.tar.xz 2097428 BLAKE2B 821ea6c8cd61a250acd433e55dddc3ddc6e115f8908f79b7d243e0ba5bda69f8edc38e6b2aef1d014258d38111b8cdd361632015af031fd85ced9d13f3ba6129 SHA512 cfaf08ee27a4976de38cee282092915aa154a3c4c0561b1ce9a971e991038473dcce4ffd4f20d845eb5d29e48a223f16b3d4a670d0442b8267c4ed0c86dff4a4
 EBUILD partitionmanager-20.12.3.ebuild 941 BLAKE2B ffa89f5fcebe8b912f97b879fb36d1e7998660366b9b19a81dd7cc860e51419a532b0415be587d090af24d02aad8d5b32c98e159001fec2d32873806d284d7a0 SHA512 eebc080000ac20184cfa03e78c7be88d14e3a701e8cdd1f85eb50ebc67192628408c2f79d23e0facb4488064bfd7be62393a6bf03e97a98e7045a3d18ac544d9
-EBUILD partitionmanager-21.04.2.ebuild 933 BLAKE2B 875a518c404bf5ff689394cdf27b42dc55f6fb76578232f9f59a11654e680aa26aeec85c265174302e237cf855d433e9359db5898f3ec78609927775376c410e SHA512 656821a719b0f638437414b6e62a4b7e8d9233392ace32ece4fea3a075a0ff2a9cef1614977e6e16baa4ef317bf7bf2985dad467c65086ce89b758b51d1c8606
 EBUILD partitionmanager-21.04.3.ebuild 933 BLAKE2B 875a518c404bf5ff689394cdf27b42dc55f6fb76578232f9f59a11654e680aa26aeec85c265174302e237cf855d433e9359db5898f3ec78609927775376c410e SHA512 656821a719b0f638437414b6e62a4b7e8d9233392ace32ece4fea3a075a0ff2a9cef1614977e6e16baa4ef317bf7bf2985dad467c65086ce89b758b51d1c8606
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-block/partitionmanager/partitionmanager-21.04.2.ebuild b/sys-block/partitionmanager/partitionmanager-21.04.2.ebuild
deleted file mode 100644
index c53fb9a3e278..000000000000
--- a/sys-block/partitionmanager/partitionmanager-21.04.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KDE_GEAR="true"
-KFMIN=5.80.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Utility for management of disks, partitions and file systems"
-HOMEPAGE="https://apps.kde.org/partitionmanager/"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=sys-libs/kpmcore-${PVCUT}:5=
-"
-RDEPEND="${DEPEND}"
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 74a0a0f7b373..8a5aabd915a9 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index c974f543daa8..443d9226102a 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -7,4 +7,5 @@ AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799
 DIST elilo-3.16-all.tar.gz 485844 BLAKE2B 813762ffef32a640c074973a07d886e0de137be10ff08e9375cd894b0d83dd8bc96cc33f80da1e698db49cc9f105a905abb2fa04048eaca394d3d70e79cb8534 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842
 DIST elilo_3.14-3.debian.tar.gz 32179 BLAKE2B 84f8055d3e33b99ce91079768da80a8800c3c2f569ce5619641a983efb943055dfd9a8fb2fda8e5e6d60009ffefbcc1573098f022f06635d4d5304bc3bfddf1e SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f
 EBUILD elilo-3.16-r4.ebuild 2277 BLAKE2B 7b29d8511271cf92005dcc7a936c599843c8988182f7261edfa2afb6231918110bc13f2abb5c232d1c1b03f76d45dc364c31d80654eaef45571c1e78c031f094 SHA512 fd87496911f805e11ddb83ea44bc246812329bc236582c2d9ba2ac48ef50b4bcaad84b2db34f0628d35282df141f0ad95028a93b4103b550d6412d07a51c3c58
+EBUILD elilo-3.16-r5.ebuild 2268 BLAKE2B 2f0863a55a5fa846a8f81afcefb37b1ed00403985bd7cfa427505b1d52967adf9e6fd554ea4f3ec6fa941d22e59a9214e2bd4104238d37474f72f6a6a4c7563a SHA512 7d33c42bba010f6bee117e2349459d7b376b034961f430470906d13288a89ad17f5fbbd04bb0462330b6fec7893594f5f3fc7c3811132988fce9b6c4c037bab4
 MISC metadata.xml 326 BLAKE2B cc7b85b290136d54ab8857ad992bef9eca8cbb607949a50ff090ddfbbab704d87d3e028415845fddc57ea984215dfe0048d1a219dcd386dcf1c1062f657f5db8 SHA512 e40b5a31e5e5954c817f994c6215488a34b32191cfc597e5514bef2fa1ae1e36f0aca1b7e80043e452946051885a04081875edd53d285fc557cbe3277ae3d624
diff --git a/sys-boot/elilo/elilo-3.16-r5.ebuild b/sys-boot/elilo/elilo-3.16-r5.ebuild
new file mode 100644
index 000000000000..fed811421390
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16-r5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="https://sourceforge.net/projects/elilo/"
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+	mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+	dev-util/patchutils"
+# dosfstools[compat] to enable 'dosfsck' symlink
+RDEPEND="sys-boot/efibootmgr
+	sys-fs/dosfstools[compat]"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+	"${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
+	"${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
+	"${FILESDIR}"/${PN}-3.16-FLAGS.patch
+	"${FILESDIR}"/${PN}-3.16-ARCH.patch
+)
+
+src_unpack() {
+	unpack ${A} ./${P}-source.tar.gz
+	mv debian "${S}"/ || die
+}
+
+src_prepare() {
+	default
+
+	case $(tc-arch) in
+	ia64)  iarch=ia64 ;;
+	x86)   iarch=ia32 ;;
+	amd64) iarch=x86_64 ;;
+	*)     die "unknown architecture: $(tc-arch)" ;;
+	esac
+
+	# Now Gentooize it.
+	sed -i \
+		-e '1s:/bin/sh:/bin/bash:' \
+		-e "s:##VERSION##:${PV}:" \
+		-e 's:Debian GNU/:Gentoo :g' \
+		-e 's:Debian:Gentoo:g' \
+		-e 's:debian:gentoo:g' \
+		-e "s:dpkg --print-architecture:echo ${iarch}:" \
+		debian/elilo.sh || die
+}
+
+src_compile() {
+	# "prefix" on the next line specifies where to find gcc, as, ld,
+	# etc.  It's not the usual meaning of "prefix".  By blanking it we
+	# allow PATH to be searched.
+	local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+	emake -j1 \
+		prefix= \
+		AS="$(tc-getAS)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		HOSTARCH=${iarch} \
+		ARCH=${iarch} \
+		EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+		GNUEFILIB="${libdir}" \
+		EFILIB="${libdir}" \
+		EFICRT0="${libdir}" \
+		NATIVE_CFLAGS="${CFLAGS}" \
+		NATIVE_LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	exeinto /usr/lib/elilo
+	doexe elilo.efi
+
+	newsbin debian/elilo.sh elilo
+	dosbin tools/eliloalt
+
+	insinto /etc
+	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+	doman debian/*.[0-9]
+}
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index b7954416ffe7..fd76e2dabe7d 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,7 +1,5 @@
 AUX os-prober-1.76-exherbo.patch 905 BLAKE2B e8d78b730d33b5760128eaf910f20ac01dc7db3e2b3a271279859869e3c8451e7c8dd72ed5b2784a0dfbf3f31747a81509445d3793a8ed8070a1a721b1b84186 SHA512 0c3c2e4cde868e186131b08268e6344841f0830be5bf4131e5a7ded93a222097599b0a011168e4b7bd0bc97b69ece194df1d46d98eac2c921f16b3e76d004cc8
 AUX os-prober-1.78-btrfsfix.patch 14379 BLAKE2B 5aff7aad1957966355748eafb7b1b426e81428c1de9d1053e708cccb271efe97c8728887a7dbc969a78e4ff3d92cbb0b1badf7551532030b585c5211a7308323 SHA512 deefcd22ac50b9a5cdc4609eda6cc5c58f40989c17e56a8f098f529bacfef7bb65fca9775e7ea85540b850eecfd1380d9474388644f13c47459c14bc6cbe681f
-DIST os-prober_1.77.tar.xz 26660 BLAKE2B cff8d96927cf251e9d8ee95561289e9c49a89fbcf9045e7c7169f73b1eeb151797db7b075ebc14dbbdd96996d007b07001e2843cf835defd675f63595614297b SHA512 4d9c22ccc4d950644a06a17ec4424aca5ff82aeb20052dc389dd451b6b9a1799c5a9438644a29093153730af42066abbbbb78f593f2564314c9adbd43f60e39b
 DIST os-prober_1.78.tar.xz 26848 BLAKE2B eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7 SHA512 7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
-EBUILD os-prober-1.77.ebuild 1851 BLAKE2B 1570c05454c7c27e271944a94b9d6488e5c8a37231b8559b87a46551e1445d8dc25f93c87d3345b72f36da1f80e8a16914b737fb25f2ea742c758776129da5cf SHA512 9b58de5bc06dd75de053d0a103af0cd701d2b7b3e639c9d8c9b77d90d3070506cfc83fd75ea32a123c918ca58366e1a26a1b71ec2308f38d0b4af32e98b8a3c5
 EBUILD os-prober-1.78.ebuild 2232 BLAKE2B 918f76cc26698560bf10124b36643a18783fc15471494b20ebb86b11e6ffaebf88477248651db89ac4c7cd32683cd7065b72acf0a72d1b94576a5dcb782609d6 SHA512 4219e33567ebaa6e6b293fcf36d8681d4ff99ff0d6ed2399926be671ad4eef1a1ef1a6d290b0406c56583e0b1acfe01c833365bb5362ce4be0cf0f12ba0776f0
 MISC metadata.xml 383 BLAKE2B db5402f4cacef3df1728248b8fa2bf1d817d56ea41b8049e021382502dee75e1669ad691c4c7761b53127e9d3779683e9304139e28727e2ac7f36db587eb5ea0 SHA512 52ab18611ec550ab9f95f2e9e1e406dfece82615db0f1f66d862ea19603b11e0c2a358fcf430300db972be34177e787d0867a7f9530aaf598e488e13ba517f7e
diff --git a/sys-boot/os-prober/os-prober-1.77.ebuild b/sys-boot/os-prober/os-prober-1.77.ebuild
deleted file mode 100644
index 7c4cb9daf1b6..000000000000
--- a/sys-boot/os-prober/os-prober-1.77.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="https://packages.debian.org/source/sid/os-prober"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# grub-mount needed per bug #607518
-RDEPEND="sys-boot/grub:2[mount]"
-DEPEND=""
-
-# bug 594250
-QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.76-exherbo.patch )
-
-DOC_CONTENTS="
-	If you intend for os-prober to detect versions of Windows installed on
-	NTFS-formatted partitions, your system must be capable of reading the
-	NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g
-"
-
-src_prepare() {
-	default
-	# use default GNU rules
-	rm Makefile || die 'rm Makefile failed'
-}
-
-src_compile() {
-	tc-export CC
-	emake newns
-}
-
-src_install() {
-	dobin os-prober linux-boot-prober
-
-	# Note: as no shared libraries are installed, /usr/lib is correct
-	exeinto /usr/lib/os-prober
-	doexe newns
-
-	insinto /usr/share/os-prober
-	doins common.sh
-
-	keepdir /var/lib/os-prober
-
-	local debarch=${ARCH%-*} dir
-
-	case ${debarch} in
-		amd64)		debarch=x86 ;;
-		ppc|ppc64)	debarch=powerpc ;;
-	esac
-
-	for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
-		exeinto /usr/lib/${dir}
-		doexe ${dir}/common/*
-		if [[ -d ${dir}/${debarch} ]]; then
-			doexe ${dir}/${debarch}/*
-		fi
-		if [[ -d ${dir}/${debarch}/efi ]]; then
-			exeinto /usr/lib/${dir}/efi
-			doexe ${dir}/${debarch}/efi/*
-		fi
-	done
-
-	if use amd64 || use x86; then
-		exeinto /usr/lib/os-probes/mounted
-		doexe os-probes/mounted/powerpc/20macosx
-	fi
-
-	einstalldocs
-	dodoc debian/changelog
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index ebf4c9fdfa3e..f7b75054f759 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -2,5 +2,5 @@ AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e
 AUX syslinux-6.04_pre1-fcommon.patch 2111 BLAKE2B 6b0d047cc729e7e9c9658ccd6ecd1166eb1ff2be569132f94b0d2bdc71eb9412a05bf23aa287626949a6ea376b2a8d02877d72182d4ea50d54e445df9c38ac81 SHA512 50c58bc44c77a5a68910cd40370f4259afd1392fe8e1b5c6ac25f7e610d994ebc8d17434eb8d3f832a14f098e16b5b597c723f98ce8c12a89118f5b8d2c65529
 AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
-EBUILD syslinux-6.04_pre1-r2.ebuild 3230 BLAKE2B 3660882a2e363ea40753282b37eabf2ed8ba1ee13b9220631ef2e964553f141110bc4a22380ce8d5a4541fb34df1ba0630bc01a3ee3c439f18b8bf314409f2d8 SHA512 8c3412e81543f1e2e93ae5c5b7c3a6643b3059ab0cd0eb2e630e65f07ee1ce1899ea8ca11cadc77c012809affd611736dba3eabda81a67c6082991dc2e291690
+EBUILD syslinux-6.04_pre1-r2.ebuild 3251 BLAKE2B 6a9d50d935e133a6937b55c05b5f06f53c01ea20427583b4cdf5d7d1976778d653fe77d083ac3df86d9c38ff10e01db9f735e878ebf26f99937174fe29b30b77 SHA512 621bafdbdca728e8c7abf3331e13eba7a0d672215adf7fab51225394c9ee4e433323751911a58984785a9a58d01dc393752632f3d3d28c46699201d364db20d2
 MISC metadata.xml 411 BLAKE2B d3b00622fd68d6ae1b4ba7aa30c33c790b2fbdc688637d3c573cb4496f3952a62f8ae20384badda70b9cbd4ed036e0884becd212d63ec015decc511f1ee7970e SHA512 e8256115d61eeef51be14bea35df6765b356471d145ad8e43e75e6301a4557d526af5fd99b8957fb02ecd9c4a7a0bd0d3db4790abef935887bff8a102709c518
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
index 2371fdae8151..b0ed750f5a1e 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -22,7 +22,8 @@ SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE="custom-cflags"
 
-RDEPEND="sys-fs/mtools
+RDEPEND="sys-apps/util-linux
+	sys-fs/mtools
 	dev-perl/Crypt-PasswdMD5
 	dev-perl/Digest-SHA1"
 DEPEND="${RDEPEND}
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index 4e67cad98fcd..6365bd8f3773 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,3 +1,5 @@
 DIST woeusb-3.3.1.tar.gz 386399 BLAKE2B 1423ecca39018c674b0eea36de732f54cfcdd14b8cc465e6d3c0639192cbd8355436b7a39ba453b19fa6f1c5b1f6938ef12f49710bc2a4af0f2eaed967e03ce7 SHA512 e3460efabaee199eb5ffc73ca99fe2d9141ed3a5f72acd2f8910b093b2b3a93928ee4eeb27d634293448f036101d8bf24aef65dc338c80e6e3e1738004594d52
+DIST woeusb-5.1.2.tar.gz 160660 BLAKE2B 86fd0581ea2524d61ef48d9adf633d350ae214842ee8f26c2937f312fce864fa188fb40dd35e8e9b15c3eef46869f0099ee005e3c49fc219486d006357f74f09 SHA512 ee1341cdcaf203e4c5007e3ac19deb0b3bbee9e7eeb5ca9a74742d107b1b3e77e5b938d2f7de9ce23b7fba51d6a266ea26fb221300613c1c4c8d0cd4f8299f8b
 EBUILD woeusb-3.3.1.ebuild 1047 BLAKE2B 53560251d0e8cc1a50bd04fc86e4022c7056ec411f7783255198f079d36d4e1c90c3e6980751decaa81ba85327aa22e72834ec0c938770134e811ca7e2e1741a SHA512 a8f12e189cd110e7d8e5f7fb9da13b53b2478f29d07e9aca11cfb5f142fc6ed792285a1b4a73dad47e2197ea265c5983d7ed3da56e96ff11e026a376d63bd037
-MISC metadata.xml 206 BLAKE2B 34bcbd403ba7357d68ee29e45bf98a056293c51377315378def09dfa5609c349f083c127d5c8dcf69b8623de07b5d4cef13b5595d2af8ce920f770ca29621e90 SHA512 6a0d1c469bd37165942bfdf61f8e71e1243282e18f46813ad3f4e12cde7053b7c7c98a3aec5806ae139c13dab13377707dcd7ecc8954df666c15d0b606f7be79
+EBUILD woeusb-5.1.2.ebuild 699 BLAKE2B 53a49822ed6b709665b30e012da3c08a1c9c67481caca1e223b81f618b4f559692bfeac7246104c92d06b28401584b4b413268d945a6b5f6687e1c7f445f223f SHA512 5869c9f80674c7d419276c6b7f4d032f486fba312626a7529a28cfc0da61d6f4297cfe97a81f8a4ac57f8dc17910aaafbfca190310b2b4898b63b22c366e0d58
+MISC metadata.xml 473 BLAKE2B c799db6c2eb4a7c3ce65860cb5deabdd9ce211015dbb22a6bc5ba641081cd08114b15f82beb095813673835aa7bbe79243cb054bca8439769a9f9630d59f6fba SHA512 b39ae796636cf8f7c368a74cc497ab9a1be27a3b94b50a391c6aa5c4b1a8ee8c726e6733c8745021e5d0305652182ebc25edfd2a2ce2593b561483f68f19b4f3
diff --git a/sys-boot/woeusb/metadata.xml b/sys-boot/woeusb/metadata.xml
index 33ad81821b88..1974cac0c1ce 100644
--- a/sys-boot/woeusb/metadata.xml
+++ b/sys-boot/woeusb/metadata.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<use>
-	<flag name="minimal">Install only woeusb tool</flag>
-</use>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">WoeUSB/WoeUSB</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-boot/woeusb/woeusb-5.1.2.ebuild b/sys-boot/woeusb/woeusb-5.1.2.ebuild
new file mode 100644
index 000000000000..77f857db0839
--- /dev/null
+++ b/sys-boot/woeusb/woeusb-5.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Creates windows installer on usb media from an iso image"
+HOMEPAGE="https://github.com/WoeUSB/WoeUSB"
+SRC_URI="https://github.com/WoeUSB/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-4.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # No test suite
+
+RDEPEND="
+	app-arch/wimlib
+	sys-apps/util-linux
+	sys-block/parted
+	sys-boot/grub:2[grub_platforms_pc]
+	sys-fs/dosfstools
+	sys-fs/ntfs3g
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/WoeUSB-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "s/@@WOEUSB_VERSION@@/${PV}/" sbin/"${PN}" || die
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index e4213a71d8aa..806aa22205fd 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ampi/Manifest b/sys-cluster/ampi/Manifest
index e0a6038d4089..84f8ce4c2afb 100644
--- a/sys-cluster/ampi/Manifest
+++ b/sys-cluster/ampi/Manifest
@@ -1,3 +1,3 @@
 DIST ampi-0_pre20140616.tar.gz 1127315 BLAKE2B e003f44f74449b40f5cb2c98ca4d0eebd39aa82363c519e86b58cdd11056153d8cf9b196819cb654fcfb9eaa12ef9ca8a819a1c06a1a1f34d599541b5ac6aece SHA512 b6a8790c1686a32546194fa6c3818aa9d2ba08911621d5251e85a4114dad75e350f18560cf0527811c487f804265bc09a4b80faeab5eafbd670e4dfa103fe078
-EBUILD ampi-0_pre20140616.ebuild 500 BLAKE2B cdb0993f74f840679985ec7bf9b8c605df846ce662b2f3159d8d052c9d4d92049631f27fde9ab1aefbde4acc9726c899be72386aaeb8991cb6be0d4ff369ab15 SHA512 e1b59c0af768fc9b863cfb0153ac24ea2037a9ace4c89638a28b7ee388e6a13865fab1aaf2fb52e8259a4a7d1afcf6f24ab30a4cb67f19470752b34395276685
+EBUILD ampi-0_pre20140616.ebuild 516 BLAKE2B 3591b399e0e5e33d1896ede3566790f4de473078fb0ac0e98296a2e8dd83ed7ce803464f381b90ae6bd532b5d02a39d3f83d37bafe00abe89921c68d7644a50b SHA512 77bf3aff6604a79a6027034ef497ea6be1a7de7abb32a17be48164239beeb8ebbd4657f5483f35632810ab04c1afe68c6bb74cf58a2d1968fbc37b9aab11ac56
 MISC metadata.xml 257 BLAKE2B e4f657523a349a531d465953f61a55f61c3d1262af149695624b6f601aa464e39a1bceec34b26d97804e441ac6b45e48f930006a77e60e031a3e321b8297ed4a SHA512 ac9b4b4f3ef6a190cf1465bfac8aaf69c9c7b91e2cf3876e19a0b39264accaae12e301a2059bacff7781d0fb1f40499cb2930be0cd3f7ef9cb1a40d266ad059f
diff --git a/sys-cluster/ampi/ampi-0_pre20140616.ebuild b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
index e0473fa93aee..8966cb761423 100644
--- a/sys-cluster/ampi/ampi-0_pre20140616.ebuild
+++ b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit autotools
 
@@ -11,11 +11,12 @@ SRC_URI="https://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="virtual/mpi"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	eautoreconf
 }
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 3f1bf307ce95..96941eb47f0a 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -52,9 +52,11 @@ DIST ceph-14.2.22.tar.gz 130597047 BLAKE2B 58bbb3243de076ed1d25dfd7bd75717c50ad1
 DIST ceph-15.2.12.tar.gz 148509713 BLAKE2B 4962e7d574b38592a874a1b3fa8610bb2d0afc8713d995d67a790c025bb086cb619cbbaec76482ec096b4c55b9f1df383f5bd4806a231bc88e70ac3efbac24b5 SHA512 08266a2e9a7ca5a37e03f340873571fd012c630dd898a87241cd97c29760b2bf41fe64c8883e7b08e0f83c26245072cd26e69ecb1db02378d1ec38335ba1cd0f
 DIST ceph-15.2.13.tar.gz 148542333 BLAKE2B 2e9668bcb0fd283ec4ab51b0c6142fc9a3b6310eb5d34e07da5e6b73b55dd7976db5ab9c78a93684ddc2f51873b1a17c4d31c5f5647b2d43a2826ee5362f7e5d SHA512 bde28c331c489db0845959f65c425146c317466a7793f56a83e2827dec35b8cd6f600bf9056151c1e6926cc0155deebbc8681c240ac9f37ad876b9a6afae96da
 DIST ceph-16.2.4.tar.gz 155840423 BLAKE2B a803ffa61ac9fd6d42790d6d8e12aa8df843968627df0051475355f3ba0dc1272afa3d9e2716115ad769b2f322d7bd239d99b89e51610e89ce9efe39af4f01ae SHA512 8904e7fcabd50276e4e86735fd85dba96f417c194c219025146f994707def7abe372528b0f2e862e274b2f405d7b791bac86b6cbb8d57cecd6f44023a2ffb6f6
+DIST ceph-16.2.5.tar.gz 155933825 BLAKE2B 3c8f3f1663b91d4de1e3736317add0b88d9083db5ab2fc3e2e913278977deec076bd4410e309f4e47ccc169d74356c2ab1221c94532cc45ee75ec73673fc42a0 SHA512 5c32f9aa817ecfa788725bcfe5743756853ca9b3f9ee453242110f1b5e1bdd1feaef79ad9ccf2b185445c9644bcecb1355e151a2255bfd27edc9818e0d6d4c4a
 EBUILD ceph-14.2.21-r2.ebuild 10431 BLAKE2B da08ec46959c57da162051019010c20bd718e1def03a99f7a74dfae5a8305b63d720b5da00fd26c0527683d13e703d223c09d86fad88c251934b28a20d444efb SHA512 38ca1c08982148a210c9aeb308407cc118c67e315aee6d20f2255f01f48656dfa622d610337dcbd5b83d27cfba60649c1d8aa07beed84d9ffe8fb74c644a4d8c
 EBUILD ceph-14.2.22.ebuild 10379 BLAKE2B 970b467d01d8b294f5c886e843e0f85c19dccf6bfe17726f7e6a34ec2e34557b90a96305d2b62e45a9e3264e5eb9335b1f29cc37a52fb116387b85aa62d685f6 SHA512 f64bf074c77fc603b4ade5c2ac341218c932f4058eadbaeff29bbf6f10facf60b09698bf0a6fa2de6d7feb6271dbe2ff9ad41e2e60b8b0d57ab2a9517f346775
 EBUILD ceph-15.2.12-r2.ebuild 10780 BLAKE2B c3ceaef839451ad3c05d8d3ffa389a3e8a2a65563a0276c3b5b6f9e81a02590a77561d5a1ee7ac6842ad1295d3f2908fe3c4aede5edb50f15eaec2ebe2dbeae2 SHA512 f2d503964a06f6ebab1e080ae574744c455ba34323ab04de7d98ff7f6b33b8d0439b179412fd3410ab2602443f2c5757621238a4006edc73aaddb001b9b81c8b
 EBUILD ceph-15.2.13-r2.ebuild 10676 BLAKE2B df69ca97ef59cd7934aab08fa4e754e69ccf0a000e06523bd444681fde18171adc71acd4b99d5935174542cc0c3eb12ae39e557a078bc296e482047092514b1d SHA512 474f065867fbdf66832e4d910d90447406dcb0483727ce42e8e5ae13b8222294e05838fa18990998b3cb693a27e0fc2de4a06402120535088a12c374ede8f814
 EBUILD ceph-16.2.4-r2.ebuild 11991 BLAKE2B 62c9ee82927b0ae110e8bad74e76a39cf3ccbf1e4d5d247784d4962fa619fceec2c463885c574fedb5ec75d4f369a0152afd007550d60fe8833dd1faa0c71d26 SHA512 09d8ce0d5aa9ae0b11b6c2918ef06807a9065b8d4341df7c0ff9b5f87ef1896589d2d1437eb70a4ed0cf5f0a29c01d998318797a358a96b5b56fe5caa8dbbeeb
+EBUILD ceph-16.2.5.ebuild 11991 BLAKE2B 62c9ee82927b0ae110e8bad74e76a39cf3ccbf1e4d5d247784d4962fa619fceec2c463885c574fedb5ec75d4f369a0152afd007550d60fe8833dd1faa0c71d26 SHA512 09d8ce0d5aa9ae0b11b6c2918ef06807a9065b8d4341df7c0ff9b5f87ef1896589d2d1437eb70a4ed0cf5f0a29c01d998318797a358a96b5b56fe5caa8dbbeeb
 MISC metadata.xml 2318 BLAKE2B f9cf86426b0d8ea87cb80cb03315e9b0b581f604b2e1f28011dd49ab885232184fbcb6e496e8305d92e2c45bea973b8627235115e6bc7b7590874ac2ce9a00cc SHA512 e4eb8fb92dfe9161c217d880db3733aec36efc74431f529b12212702abbf633647bb8a22bfe7864d7389e8ed893bc37518e228ce165140058f98aec534b8f3de
diff --git a/sys-cluster/ceph/ceph-16.2.5.ebuild b/sys-cluster/ceph/ceph-16.2.5.ebuild
new file mode 100644
index 000000000000..834efe8eb5e6
--- /dev/null
+++ b/sys-cluster/ceph/ceph-16.2.5.ebuild
@@ -0,0 +1,450 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_OPTIONAL=1
+LUA_COMPAT=( lua5-3 )
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
+		lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs \
+		systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
+	jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq
+	+radosgw rbd-rwl rbd-ssd rgw-lua +ssl spdk +sqlite system-boost systemd
+	+tcmalloc test uring xfs zbd zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+DEPEND="
+	${LUA_DEPS}
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	<app-arch/snappy-1.1.9:=
+	app-arch/zstd:=
+	app-shells/bash:0
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-cpp/gflags:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	dev-libs/libfmt:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	dev-libs/libevent:=
+	<dev-libs/rocksdb-6.15:=
+	dev-libs/xmlsec:=[openssl]
+	dev-cpp/yaml-cpp:=
+	dev-libs/nss:=
+	dev-libs/protobuf:=
+	net-dns/c-ares:=
+	net-libs/gnutls:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-apps/sed
+	sys-apps/util-linux
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	sys-process/numactl:=
+	virtual/libcrypt:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse:0= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	jaeger? ( dev-cpp/nlohmann_json:= )
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	pmdk? ( dev-libs/pmdk:= )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/icu:=
+		dev-libs/expat:=
+		dev-libs/openssl:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	rbd-rwl? ( dev-libs/pmdk:= )
+	ssl? ( dev-libs/openssl:= )
+	sqlite? ( dev-db/sqlite:= )
+	system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zbd? ( sys-block/libzbd:= )
+	zfs? ( sys-fs/zfs:= )
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/ragel
+	dev-util/valgrind
+	sys-apps/coreutils
+	sys-apps/findutils
+	sys-apps/grep
+	sys-apps/sed
+	sys-apps/which
+	sys-devel/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	jaeger? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-apps/nvme-cli
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[-device-mapper-only(-)]
+	virtual/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
+		)
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+# diskprediction needs older scipy not compatible with py38
+# bug #724438
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	${LUA_REQUIRED_USE}
+	?? ( jemalloc tcmalloc )
+	jaeger? ( !system-boost )
+	diskprediction? ( mgr )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+"
+RESTRICT="!test? ( test )"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# create a non-debug release
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI=no
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-14.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-16.2.2-cflags.patch"
+	"${FILESDIR}/ceph-16.2.2-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+	"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
+	"${FILESDIR}/ceph-16.2.0-install-libblk.patch"
+	"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
+	"${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch"
+	"${FILESDIR}/ceph-16.2.0-liburing.patch"
+	"${FILESDIR}/ceph-16.2.2-system-zstd.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="6G"
+
+	if use system-boost; then
+		CHECKREQS_DISK_USR="350M"
+	else
+		CHECKREQS_DISK_USR="510M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	lua_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use system-boost; then
+		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
+			| xargs --null sed -r \
+			-e 's|Boost::|boost_|g' \
+			-e 's|Boost_|boost_|g' \
+			-e 's|[Bb]oost_boost|boost_system|g' -i || die
+	fi
+
+	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
+
+	if ! use diskprediction; then
+		rm -rf src/pybind/mgr/diskprediction_local || die
+	fi
+
+	# force lua version to use selected version
+	local lua_version
+	lua_version=$(ver_cut 1-2 $(lua_get_version))
+	sed -i "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" src/CMakeLists.txt
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_BLUESTORE_PMEM=$(usex pmdk)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_SPDK=$(usex spdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_GRAFANA=$(usex grafana)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=OFF
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PYTHON3=3
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
+		-DWITH_RADOSGW_LUA_PACKAGES=$(usex rgw-lua "$(usex radosgw)" "NO")
+		-DWITH_RBD_RWL=$(usex rbd-rwl)
+		-DWITH_RBD_SSD_CACHE=$(usex rbd-ssd)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_LIBURING=$(usex uring)
+		-DWITH_SYSTEM_LIBURING=$(usex uring)
+		-DWITH_LIBCEPHSQLITE=$(usex sqlite)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZBD=$(usex zbd)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED="ON"
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_SYSTEM_ROCKSDB=ON
+		-DWITH_RDMA=OFF
+		-DWITH_TBB=OFF
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
+	)
+
+	# this breaks when re-configuring for python impl
+	[[ ${EBUILD_PHASE} == configure ]] && mycmakeargs+=(-DWITH_JAEGER=$(usex jaeger))
+
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			case "${flag}" in
+				avx*)
+					local var=${flag%f}
+					mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_NASM_X64_${var^^}=1")")
+				;;
+				*) mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")");;
+			esac
+		done
+	fi
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	cmake_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake_build VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake VERBOSE=1 install
+	popd >/dev/null || die
+
+	python_optimize
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+
+	fi
+
+	udev_dorules udev/*.rules
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	python_setup
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 7f17000f21ed..3ce08552dbe0 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -2,11 +2,19 @@ AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kube-apiserver-1.18.19.ebuild 975 BLAKE2B 46fc8c70b370b4ae9fe2a3a5f627bdf7f45626605daec2b36a9b6352624bb62a37c3dc9c338e2fe2ad59aa6005be64390b6ef2c3b69b71e0f0a58f4d102cf4c0 SHA512 a8e56862b198c338faff6d950db23c33c562f0da0981ac0e24524238070250012b5f25b64b6b956a042e0a029589461fec7bf12aa844f90b2bbd15f70f7c6022
+EBUILD kube-apiserver-1.18.20.ebuild 976 BLAKE2B 812d6dedcd0657a5132b6ddb630a82ad8bc017536beec23d688cd4bd2d30aae0804d3768e9ede78ada2691dd621cf9f96af132b9d265c8432d5624a3381c81e6 SHA512 0f5348ce253d37772042fb19f6bcd037cd0f88f8ce5ec146e8a927a594a72a52bfa7fd35e7b4906369705522aaebac4d669aed232dba59965c430e527cfac586
 EBUILD kube-apiserver-1.19.11.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
+EBUILD kube-apiserver-1.19.12.ebuild 1012 BLAKE2B 06cc1b6c301fc5ee4e7e9aff9bfec6c0e51764494609e2c154ad8e0cb33cb1dcf493cd99fbb0ed8bcdb753db31b142ffa50d11e666d01e6f10352d41d3582c7a SHA512 9c46b95d73968b35414d69e16bb18b56fad6abe9d0aab2c84d855cd9dc1e75f53406d6fea8fa4da9971747bbb84c021227684898e7f4d3f6b9bd699a8c1f417c
 EBUILD kube-apiserver-1.20.7.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
+EBUILD kube-apiserver-1.20.8.ebuild 1012 BLAKE2B 06cc1b6c301fc5ee4e7e9aff9bfec6c0e51764494609e2c154ad8e0cb33cb1dcf493cd99fbb0ed8bcdb753db31b142ffa50d11e666d01e6f10352d41d3582c7a SHA512 9c46b95d73968b35414d69e16bb18b56fad6abe9d0aab2c84d855cd9dc1e75f53406d6fea8fa4da9971747bbb84c021227684898e7f4d3f6b9bd699a8c1f417c
 EBUILD kube-apiserver-1.21.1.ebuild 1011 BLAKE2B e12c4b1626234585bd58ceb9d8adf620a6277f2c41e9d880333d77a5c41a4250b470b13c2f000e99361fce1eb2e1cf2e02d9ecedfd0d47c306a744697a4900b8 SHA512 8928db8027f8022c2555a4aee889f8eb42d62bcc478cffd7eaa86e7a584b4f2d36f4e4ee445445c5c6989bdd96b665df0730ae7621db88a55a9f010c4695a280
+EBUILD kube-apiserver-1.21.2.ebuild 1012 BLAKE2B d3f9db4f7631a00bee5bec5e14addbaa8f16c1fcdd499b434d5dc255acba09e0c6c537607e4a2ad3b9f027bc7a24000b44826eb8e25aa3fc5b4236695ea14f67 SHA512 643bd11525041d2507413fac4998100281c9b784a52cf814849d61bb374d17ff66644ca4c857968c08554eaa1f77481a0406bb8002695e72d1c8f677ee9326ab
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.18.20.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.20.ebuild
new file mode 100644
index 000000000000..49d7e68c4096
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.18.20.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.19.12.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.12.ebuild
new file mode 100644
index 000000000000..eddbed5f2447
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.19.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.20.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.20.8.ebuild
new file mode 100644
index 000000000000..eddbed5f2447
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.20.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.21.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.21.2.ebuild
new file mode 100644
index 000000000000..4ad13d1aaaca
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.21.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 223c6f84fb78..0b175db98ed1 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -2,11 +2,19 @@ AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2c
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kube-controller-manager-1.18.19.ebuild 966 BLAKE2B 2f0ddb82c8607d193aef1444912d82125578d41d62fc2b48b1512e2775903fccde7cd139c3c718b484f80fb6fa13567c33f78574a69a198ee6a459fd1ed7d68e SHA512 ba9c6f7a4bd05686357f7a7fb771c34bdc6dfdcb7bac2fbaf1fc6c977b9c5a05b65d55f188b8cc02583328baf80087d9b3f633f17a3f5f291cffaab542389c4f
+EBUILD kube-controller-manager-1.18.20.ebuild 967 BLAKE2B f3bd71d34cc101f228dfd1a9a96b342493f5546d6f408076908efb7e134bcc6bd9a898908fd85a71889a2d5360e96cf7f09ab1320db0d237240992250d8e5d51 SHA512 10cfe6208b1ee4252aeb659a15bd256177c8699aae94d0d2bacc51e617adad9b6ff9c297acedbdd2711b5c6cf979087a45620e0b14c5d9ee8e5a59749bb39463
 EBUILD kube-controller-manager-1.19.11.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
+EBUILD kube-controller-manager-1.19.12.ebuild 1014 BLAKE2B bf46369c9a72568037c40455a8342cc94c7f6a928bbd4012cadf2aed7c057f3f1490dc232e4aee7c2848e4591a10ebfcfb50b08170cfbc1015ffd8a0894ac2a9 SHA512 5c88fc9377e1244a97eb0b23458c1b7e935d749aea5b7f045a6e32607bd2dd9a04321167dd5d4915aa78aadd75798e388cd2cb40277b787daccbd750e765210f
 EBUILD kube-controller-manager-1.20.7.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
+EBUILD kube-controller-manager-1.20.8.ebuild 1014 BLAKE2B bf46369c9a72568037c40455a8342cc94c7f6a928bbd4012cadf2aed7c057f3f1490dc232e4aee7c2848e4591a10ebfcfb50b08170cfbc1015ffd8a0894ac2a9 SHA512 5c88fc9377e1244a97eb0b23458c1b7e935d749aea5b7f045a6e32607bd2dd9a04321167dd5d4915aa78aadd75798e388cd2cb40277b787daccbd750e765210f
 EBUILD kube-controller-manager-1.21.1.ebuild 1013 BLAKE2B 4590d4d6cb14abec9f934f70408129c8d4aa8da8e6ff7561089e57aa344feced5dfc761def4631228a0eb25caaa3f7bdbaf94b943e234c19b23ed8c3618fcc44 SHA512 d956b305015ddb278f46fefaffd53124fafe416ac155590108cc7496709f96caeae812b151bde8771fc2741be7adb16a10ee621b9362e8177b0ab8be8a90afd9
+EBUILD kube-controller-manager-1.21.2.ebuild 1014 BLAKE2B fff067c08b078e53395d941ce9b944510376aa4f16d7534ab0512492ff94a4a458590d45176ae1d9f55921de7c80a0a38b017de4dfa00e7de19d07ed1b384449 SHA512 6554108b79864865e2e7e3921573925b99d4b1257c38fb81cff2f932ae74ed06c6e090c66a108c90348266c0146bfb34230b2543f41aee933104e7ef3e116d16
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.20.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.20.ebuild
new file mode 100644
index 000000000000..fd520d1073ea
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.20.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.12.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.12.ebuild
new file mode 100644
index 000000000000..e61ad6675f61
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.8.ebuild
new file mode 100644
index 000000000000..e61ad6675f61
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.2.ebuild
new file mode 100644
index 000000000000..68d01d0642b7
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index dc7130e1e7ce..aaf4b7afc708 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -2,11 +2,19 @@ AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kube-proxy-1.18.19.ebuild 892 BLAKE2B 07e99c7043554ba3fe7d71838d72daccd1c753ce9db9d9619971b87a798d0d68c39b3b87bfbd3bbbe94d5f457cb9f1564d9ed1ec0c9bbe51b8cefd9ee43e3b4f SHA512 1b913f8b0f6ebcd62af8786e9b96f2be14778eb582a48ac2f4756ace84c90452246686ee1e75be448d945c666e63b1c5f6125200a704ebcf7fe6fab4e5dbd527
+EBUILD kube-proxy-1.18.20.ebuild 893 BLAKE2B fb0815f05971fdcbf04f6b94850dcc5a3c1bd6692fcbf2c1bb6b5f9a5df5d21f25d44d4bafacd21ea9cd6cb5a52d47e9c6e26b9bf76c5139d3ba734b383c5c6b SHA512 5121058bbd622bfd4bb9b4a60a86ed6d7ed72ab581f72178a500d13a8a588404e639ae350242a22d4acc386209a2dce39103a5606ded2a6a677c201ce6f7a449
 EBUILD kube-proxy-1.19.11.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
+EBUILD kube-proxy-1.19.12.ebuild 929 BLAKE2B 81abfe44a4025e907542f6935af1c953920d3c730008b4db082800626542265955c07b4277e39d9b8517273fc89bb87e7ca29217dd68cad235d8138fb005232b SHA512 fe6d3657c95c46a1bc87f2c0abb9e8e98eeb11c8cd48810ae94a49739b04f401b32b00522c14a488d7f043d721cda9967937b1c177765cdfa07c9add4300a99c
 EBUILD kube-proxy-1.20.7.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
+EBUILD kube-proxy-1.20.8.ebuild 929 BLAKE2B 81abfe44a4025e907542f6935af1c953920d3c730008b4db082800626542265955c07b4277e39d9b8517273fc89bb87e7ca29217dd68cad235d8138fb005232b SHA512 fe6d3657c95c46a1bc87f2c0abb9e8e98eeb11c8cd48810ae94a49739b04f401b32b00522c14a488d7f043d721cda9967937b1c177765cdfa07c9add4300a99c
 EBUILD kube-proxy-1.21.1.ebuild 928 BLAKE2B 530e14d24d0bfcedef386d4e5c6b5089ef8428e814264d64d8611a2f3bbcf7be57176731f63ff8299a090c12e323c90e702ad6d99dfebffc4343ac15a3f4ff39 SHA512 ee958c9c6ea19156fbbc863d819bd52db1fae84e8e2d2cfc9a4d282fe0495e19bbadd24ae7f74c13b61cd3716c45001ba2cec471450c8db81ae5562cc3902ab2
+EBUILD kube-proxy-1.21.2.ebuild 929 BLAKE2B 457168acecb296450df17416cccfa8c23a41236489150d3e47da3287b0e43d0e2ae1a24b4088685c7a9e40a71218a56ee30b718464e158874482b15a5dd335ac SHA512 8dbb6193562898f48c70a83d5b1ae8f3109f05bcab2208031f285bb8a90a3c828761b0144234ae2963eecb7dac10fccccf586d566b7314bcf4f14947064483bb
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.18.20.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.20.ebuild
new file mode 100644
index 000000000000..dc462bedf2c4
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.18.20.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.19.12.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.19.12.ebuild
new file mode 100644
index 000000000000..d62b6c41d8fd
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.19.12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.20.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.20.8.ebuild
new file mode 100644
index 000000000000..d62b6c41d8fd
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.20.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.21.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.21.2.ebuild
new file mode 100644
index 000000000000..6c8c309ffd31
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.21.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index f51fe6fe02a2..f9ddf1face0e 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -2,11 +2,19 @@ AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c26912
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kube-scheduler-1.18.19.ebuild 950 BLAKE2B c7e4bf0bfca4b9e3fbf29ba120a85ebd3302c94500e57e3fd21193958ed9099627e51e178510d5a0d6974c1c07812495a60d3f595c25f6c2794667bddb06e4a3 SHA512 3da62f1f16b14858ce36d9506b009135aa1a627be5e466a782bc3784c605e494d4b618195bcc7e7bb760ace5574c8e7964bd99d2ec52fd81327c3a1259e18f8e
+EBUILD kube-scheduler-1.18.20.ebuild 951 BLAKE2B 9a79b2d2568fd0666080b980a2f47094ea036d8352345b4a0489f48a950946c88eb85ff7950234ecef0f43e3ae5885b254b19ad3a7d1adaeabb696ca42f32ab0 SHA512 d177752bc34802343e103bed6dadc1900766727c4b3251003df10b20ab744b4d44be1abc6297143b481872c7a74990f980bb39a65300ac8a5f5d46ed515b79ef
 EBUILD kube-scheduler-1.19.11.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
+EBUILD kube-scheduler-1.19.12.ebuild 987 BLAKE2B 2bb55884a676b43cd0678ed33f450622a4503b72e3f6a94c511b56c6c148bc8c606f79a07a0e4160c85a8369dffd3b09e3cd6e48b6fb06f4bc8b407fff01dd30 SHA512 f95df23f7b81dcd24ab696830e58eac93da20653e31b3486b2781540b4d138c5390503fb15b498a67ac6253c779e83677915f4f13f41c08a7d79acf6a9666485
 EBUILD kube-scheduler-1.20.7.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
+EBUILD kube-scheduler-1.20.8.ebuild 987 BLAKE2B 2bb55884a676b43cd0678ed33f450622a4503b72e3f6a94c511b56c6c148bc8c606f79a07a0e4160c85a8369dffd3b09e3cd6e48b6fb06f4bc8b407fff01dd30 SHA512 f95df23f7b81dcd24ab696830e58eac93da20653e31b3486b2781540b4d138c5390503fb15b498a67ac6253c779e83677915f4f13f41c08a7d79acf6a9666485
 EBUILD kube-scheduler-1.21.1.ebuild 986 BLAKE2B 2fd297a5e2a967da944d6fc98882330685cfe1dbaa2fb2188003099883cfad4dd8cefb8f9a1af2d44f98fecebf35c76213c9663993d3f0d4f0636851bfb00b4c SHA512 514528bd0183987f4e60f6df9eaee374844ad444d49f707ee33ebd14c5bce619941913705dc20b1abd513e87596f9ba29692176f998b2ee79d5035bc8b789939
+EBUILD kube-scheduler-1.21.2.ebuild 987 BLAKE2B 60f25a20a95753c4a57a7962c98fbc8fa6d2948ed783b50ce281238b484355ffa037c5201bf02a4d1db8c3824cf07b0cadf4edf094e943506850582e8fb89cfd SHA512 def9c3a32e1b7fb792f029302d29cb4d5d19cb9c91b5f5011c98e6c4cf8d243aa5861ced10436e93c8f5b057eb0532137bc14182e14777977ca0393c636af3ec
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.18.20.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.20.ebuild
new file mode 100644
index 000000000000..68467bd70d77
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.18.20.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.19.12.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.12.ebuild
new file mode 100644
index 000000000000..98230502bf76
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.19.12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.20.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.20.8.ebuild
new file mode 100644
index 000000000000..98230502bf76
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.20.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.21.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.21.2.ebuild
new file mode 100644
index 000000000000..0e9f9a6dd32b
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.21.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 7fbdbaa7c169..df148c5c9184 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,9 +1,17 @@
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kubeadm-1.18.19.ebuild 872 BLAKE2B 1f3aaf9c5520fada96580be3d4a31911514b21acb2aa311697b00454fa27badca0ab6b5daa5ca7f79311708f2902a0acdeb26eabb417476d168a67e403457091 SHA512 6cfd03238748f6b67c7c408f3184413afe075f5df7053d062a2a5f736b0206edde4bdd0b7f771004aed14a26104654ae32b78ffeb90059f06d52be1b7a321d7e
+EBUILD kubeadm-1.18.20.ebuild 873 BLAKE2B caa208d5cc70aeae8698a818fd5ba149796697eee8297966b71a6355b4feadb1b8b5a07ad0cd7bb4510dbeeed9bd30b78416a49a8d8c1d8d4b942bbccbd14458 SHA512 5482f2f8b4c9538894008358257e468f7ff8f1c2a936edb923775c955e1a8ceadf484987fb102b218548061480912f93af0351938fda9324b05f7d0bf15b5c81
 EBUILD kubeadm-1.19.11.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
+EBUILD kubeadm-1.19.12.ebuild 907 BLAKE2B 5e04bb4a35a8a99082f8b6b656ce6498e2121ab448f2a02b109ea84cd50d99b71e24f39e6cb4f39de0212d45629c3e533b45a9073afb4a368b593ad8ad1c4b8f SHA512 8baef54420d2354ef809920131cd7ee027030020f4a239534fba3e838807e1b95092ea692feaf4b7dfdd4a297a37a21413bf3a5f0ec0eca603abad652890ab8d
 EBUILD kubeadm-1.20.7.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
+EBUILD kubeadm-1.20.8.ebuild 907 BLAKE2B 5e04bb4a35a8a99082f8b6b656ce6498e2121ab448f2a02b109ea84cd50d99b71e24f39e6cb4f39de0212d45629c3e533b45a9073afb4a368b593ad8ad1c4b8f SHA512 8baef54420d2354ef809920131cd7ee027030020f4a239534fba3e838807e1b95092ea692feaf4b7dfdd4a297a37a21413bf3a5f0ec0eca603abad652890ab8d
 EBUILD kubeadm-1.21.1.ebuild 906 BLAKE2B 976b6b81abac175c8b5d91ebb43e8c9bc30135ddd787992783860bca174e847bf371ad55c46b4b70a824dc0446853ec0735eb497f27cb80121c4a40cd50ec13f SHA512 9dcbc099f39ba5c0696bdab617cd67100d88809180e7bb08d671cceb903eb323f31e093e0d46cd42a4f9f7f281dfc6cd6ac82d5a398d88b7c3d41c95a5a76c9f
+EBUILD kubeadm-1.21.2.ebuild 907 BLAKE2B 9afd971b3448c327ce26750d0d90ff79d4416a158e0cafb37bf834ef47056e9e087cc06cdeabeec88b9c1426cf0106c1e7c7e1945b8523e518ac8e69c51e87ff SHA512 0861a7d79b74f60623f11c7de08306732793ba1edcf185e7abc8e779757c744b94191f4a829932818468de05b350636a81d36344d3a128e404a7a1b33526a0d0
 MISC metadata.xml 917 BLAKE2B ead95efd60868ca415983905cf72f7a3b00dd7048fe6fad5caf52fa78ab1ce77109e3e29ac5708b5240dc27b58b69858ca23b6952f2b087f5e311359e9929010 SHA512 3be4ae4aec07e6cdfb6eb1aebabb71fd49e9e9dbf9a183c4a1b19c74f3419c32a01b537425f30844ad642e04d72411ecfafd19c2ebdb0df8715ae139d9145949
diff --git a/sys-cluster/kubeadm/kubeadm-1.18.20.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.20.ebuild
new file mode 100644
index 000000000000..b7becaae8f36
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.18.20.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/kubeadm
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.19.12.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.12.ebuild
new file mode 100644
index 000000000000..e8e9bef16ed9
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.19.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.20.8.ebuild b/sys-cluster/kubeadm/kubeadm-1.20.8.ebuild
new file mode 100644
index 000000000000..e8e9bef16ed9
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.20.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.21.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.21.2.ebuild
new file mode 100644
index 000000000000..b98e9b739641
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.21.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index e96c6029be35..d2de9eb706a6 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,9 +1,17 @@
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kubectl-1.18.19.ebuild 871 BLAKE2B 8358e454dd4e2bef7e0bebda1043376bd103079110b5edaecb2ad51249f812363cc245f51d5150e5f00a5aa8c384b5b32d05171327075fd7aa27d22dbca24c07 SHA512 43373bb937da14b667cc037665c2c36f79382c2f4c0c08f6af931067356f044d8c03579451ffb6fe096836e411579e8e02e1780b552c6d55ce4f625ba8fff3b5
+EBUILD kubectl-1.18.20.ebuild 872 BLAKE2B 6630bf8f8b331fdeae6f434d2d13699ffcfa38fa14ba897317a492997d153f1c9cea7dc57923d948ca6661b2077fe606bd34cd8523bcbd4a47f81a6c66aa766c SHA512 3fd64b13dfda775b85e8679d8f6cba25ea3d9bab6b040cd6653439a2f405b1745000ca242de4d5f13e431aa4b256c88c714dfea259866489977c2beaffe2688f
 EBUILD kubectl-1.19.11.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
+EBUILD kubectl-1.19.12.ebuild 902 BLAKE2B 6f454846b9f0f28044dd85192f039fb6dedd3643d91e13c67b219a49cf011fa6c3c3eed9995b6c7ec0bfcca0150a7d2118d9a6c9d24d1da9de28dc06f6bd2bc0 SHA512 15c047f5caf38d5d6e550609c376ceb558542846077f7433d48261a8f60b9aaa9700a87dd63b52d0a4be0aa6453bd500171877ec038fdd4e010723d7582768e9
 EBUILD kubectl-1.20.7.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
+EBUILD kubectl-1.20.8.ebuild 902 BLAKE2B 6f454846b9f0f28044dd85192f039fb6dedd3643d91e13c67b219a49cf011fa6c3c3eed9995b6c7ec0bfcca0150a7d2118d9a6c9d24d1da9de28dc06f6bd2bc0 SHA512 15c047f5caf38d5d6e550609c376ceb558542846077f7433d48261a8f60b9aaa9700a87dd63b52d0a4be0aa6453bd500171877ec038fdd4e010723d7582768e9
 EBUILD kubectl-1.21.1.ebuild 901 BLAKE2B 9aefec009262faa0888202910542873bcee4eb1245658cfc33d71dbffe9c4e942967ccf9d274411ceb42d88f18f25292809679138205b93de18181d96b59ff04 SHA512 c9a161914ea33735b68cd899fffd96cf54dbb89c09c0ff79eb26b01c39936f809a9b0d3a86725199ca157de4f7c874c534514e90505a7e3c4fda872485d06c51
+EBUILD kubectl-1.21.2.ebuild 902 BLAKE2B 5907f4fb13676ce0fddae866a732043d9c965f1f201b65ed0077240fe1f7fd7df28ea180a2541085486f4c0f612e604bd6e357fe038edc72abff6538b276a57d SHA512 4b717de62be84d6237e8b87b8550687bf8451d1a635b06b2f07567fb00a13f62b4d16f488074e10d0eacdc9dd9020ef7e5e1469bad3993e4350c8adbf1b51223
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubectl/kubectl-1.18.20.ebuild b/sys-cluster/kubectl/kubectl-1.18.20.ebuild
new file mode 100644
index 000000000000..1e44048f862a
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.18.20.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.19.12.ebuild b/sys-cluster/kubectl/kubectl-1.19.12.ebuild
new file mode 100644
index 000000000000..99f1f19c12d4
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.19.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.20.8.ebuild b/sys-cluster/kubectl/kubectl-1.20.8.ebuild
new file mode 100644
index 000000000000..99f1f19c12d4
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.20.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.21.2.ebuild b/sys-cluster/kubectl/kubectl-1.21.2.ebuild
new file mode 100644
index 000000000000..5603ed030db7
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.21.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 6dc8342b06d1..f94f1f77a9ef 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -4,11 +4,19 @@ AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a005854898
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kubelet-1.18.19.ebuild 967 BLAKE2B d1d54a616a42fcef1f24483e2db99d09297ae0af42778816ebb487b33c4eae4940e6fa4b45158f85f5740ef90c05800b3ba97bd5938793d6915d9e6f451c10a4 SHA512 c5e4163bf6d69dbf6a8d19e00c92421ecd62494b99f3c4aea29319d6ae156da99e69a89e9bee5911a6644bf2e43e2ea505e5331809739e5b6c75eae9931020ef
+EBUILD kubelet-1.18.20.ebuild 968 BLAKE2B f677dcad1302346ca4763a62da621f7f7f96b3927d298eb854cb842fb332cc4d21e3fdc8fd79f07f9b5843eb53cc523419d9c7a8ba29bf48b9545a1af0c37d95 SHA512 2d8118164c53702d34080ae0f68669cb95c146afa537dd5d0a3c97020a85cc52aba7e96621a8fd11b765a96cfd28f1b421632c5bb788e013fb5e306951bb5035
 EBUILD kubelet-1.19.11.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
+EBUILD kubelet-1.19.12.ebuild 1004 BLAKE2B ae16a92a877501f8a611ad0f34065652b0819d753277857698dc6cbb007eb273722b596a375047247d6f6625f124f7b5e7407e7b350fb8a4b6641afcc35f37e2 SHA512 0c0474deb8a6fa845e2bd0d0e27d432ca2f0888246454ea91feb265cb490a8c4b3722f79a19c3732f80df3b7ad9f87992ef92e8577b9520e9d92c18010a6714f
 EBUILD kubelet-1.20.7.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
+EBUILD kubelet-1.20.8.ebuild 1004 BLAKE2B ae16a92a877501f8a611ad0f34065652b0819d753277857698dc6cbb007eb273722b596a375047247d6f6625f124f7b5e7407e7b350fb8a4b6641afcc35f37e2 SHA512 0c0474deb8a6fa845e2bd0d0e27d432ca2f0888246454ea91feb265cb490a8c4b3722f79a19c3732f80df3b7ad9f87992ef92e8577b9520e9d92c18010a6714f
 EBUILD kubelet-1.21.1.ebuild 1003 BLAKE2B ec935db07373229e5f1a47afb0700bfc1c57d98ce22096442ec9bd96c249f0b281988086e9680b61a865aa0a29328fcca1fded077adc36e3ed887e90482926b0 SHA512 57e849382861127150d322b947f22a7e84b4b4a19459a99fb48be480e109e5ff32a546139eb0ab191a149aa0c857d3f909ac21eaff3e41d2d9a95bcb88858a4f
+EBUILD kubelet-1.21.2.ebuild 1004 BLAKE2B f88397138d1ad4d29a043f56763236cf87f6c219c6d4ee45fc9d45df3f1a6758a10ebdf6cfdb2757fd420595c5720e9d0bd3df0dbb159859cedfc40f2662f5dd SHA512 fdcb1d7d2e8959cfbe3e6c3d138cc2f20cea6024f3cb89959bb8a7f68d5e2188d1b5bffd299a9484c4e37e446e128470a1f56d9278c46ce2c539ccabf2444ce3
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubelet/kubelet-1.18.20.ebuild b/sys-cluster/kubelet/kubelet-1.18.20.ebuild
new file mode 100644
index 000000000000..53a67a3c87c8
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.18.20.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.19.12.ebuild b/sys-cluster/kubelet/kubelet-1.19.12.ebuild
new file mode 100644
index 000000000000..78302b14a815
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.19.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.20.8.ebuild b/sys-cluster/kubelet/kubelet-1.20.8.ebuild
new file mode 100644
index 000000000000..78302b14a815
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.20.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.21.2.ebuild b/sys-cluster/kubelet/kubelet-1.21.2.ebuild
new file mode 100644
index 000000000000..25f142b537a3
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.21.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 368331142eb1..41c097e21d43 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -13,15 +13,15 @@ DIST openmpi-4.0.2.tar.bz2 9819372 BLAKE2B 000faa8ff032f9aa6bf5f0a14fb9a363080cf
 DIST openmpi-4.0.3.tar.bz2 9856669 BLAKE2B 571e8038cdf125bfb452fbee44d8397f8e724498971409fb25e11cc90ad4d7f9106f4ad093d4722754303808b82c58bf3b39a72a2567192efd1b98422f09160f SHA512 01f773064c575a0fe6ab081c20c5cf07ba1c9eada5ecfe520d14ce2b9fc6d021d0f56a0159fa354fd6c8e2bb7354a272aa8d0063b351f59251deb56474849acc
 DIST openmpi-4.0.4.tar.bz2 9748444 BLAKE2B 3c3258b7cd71156deec317479ac1ea9766b09447b77174e448a63dab30f75a525c4142159ff58ad0b6208282e36d568e4cd4e7cc1f8b9b34cad8561ce2969a72 SHA512 6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64
 DIST openmpi-4.0.5.tar.bz2 9752045 BLAKE2B 9709dc8c251d4f2be14d0ab498c5d0d0e59f95db98fb16d9e84fe3d30af5a8e2f9636bbceaf7ae4086a3312bcd6299f0e9e1ca609d658930a1f5abe1018311e1 SHA512 b7a1a5ccfc0eaa0f0504ff770b550480f7ae6727fa891e3310d9340a0d844a2ceddf62c2e59efd047ab9416b24c829919bbccd29606ca0e0d7a0569dad800011
-EBUILD openmpi-1.10.7.ebuild 6265 BLAKE2B 33362f7aa92673ae525b737239a81d608db4b783e62130bf30a6cc1b29d6f59cf2f3bff21e3d0389e582d81b25e7949eab5de965e124e7b3d5b6b538343f33e8 SHA512 5434a10d4c06ad6cc4da12ec45192ce2f08ff0c95bf138487b75b81dfb6a6055b5bcb6d81827e885935ef8481907f631268e9d6065fba330ec3e553f9ce10806
+EBUILD openmpi-1.10.7.ebuild 6255 BLAKE2B 9c95f5795f1ae64079ee6196437bd10fa74cd94cbe38c2923d582ba50041e61fec23accffb9e21c259495b79a37d8a5cc151e6d81818fb7f7840bd40de666671 SHA512 45d7ca9d261a9309acc1e857e3e26ba63d0a39c95bcabca2023b2573c336d2d4ebe25213a037a986bfac38385cf5977ddabe16f7cebcf18a2f697a363fcf2469
 EBUILD openmpi-1.4.5.ebuild 2413 BLAKE2B 0e4c9ad51c2f7f44449b0a5d3e1400de600f5337d591dcb89eb938455afa24d891573e03abdfa7434432b8377ffb3f9aefc291881713de0b80fe50322b962ba7 SHA512 187962e3788b94607b9a22728c6f90405cd4c49007413e9d0cfb4df45d5e67f30bcd2129ae8132d08460d9760891f2b15539f995e481962d91c2b7c5a7005002
 EBUILD openmpi-1.6.5-r1.ebuild 4944 BLAKE2B 8e5686a037431c45d7ebde9e82e633f138dc887ca2f1cc2ae24e76dc800ace2a79f63f6c7804794cde1cad5ec7e84b00ded707d84424d7a6413da9c80359fb51 SHA512 008b5b5ad61126d5a758784f6c2c805a55837de6dc109c11758941e2e3a414d3361ba3dbb3959185e2b6b3f02eb7ecf4a8aadb76bea0b872e463c13620a48a08
 EBUILD openmpi-1.7.5-r1.ebuild 4695 BLAKE2B c00f8c11c18323c38a9ed700693d9b67313588d04facacf24f29fae2d625aaa6fe5643adb01f9505effefd5314ce016730a1ff350ab7d467876be6d36d556135 SHA512 07050a17e0f331301f07b7de3473c9f7eb0e89741e39206b69f18d0cb48beb0541c29557ebc7e833a0e79df6405a22eace83799b6b4745a9bdda26d6919ddcc5
 EBUILD openmpi-1.8.8.ebuild 5249 BLAKE2B 6fbf1a0adad811879e393672e6425f1766fbe69e51479a8eaa9cb456f506077833fe07e8befe274546de5e0fe5a93c96b17e5ff1a23a71d8518e9d05a5851380 SHA512 f423c2423f12ca013c393bc14c42841acf910674770124eb4f8a81220606e80ae46795d27524242ea98e83f5d5aaf4bc53358097cffc4b54ce908b93b4eb41bd
-EBUILD openmpi-2.0.4.ebuild 5877 BLAKE2B 353ab1af6828784e696f0688487cb6ad45f6af3a40c4fa636f7b28156623c92ff8af82ed20dc39fd4372abf9cff0d29ffdb265a1e4d810ae73cf1d8eb9e1f1a3 SHA512 e38b332dae2e88edeca894cf82a1b6e89e76438836cd7d841f08b717a2bf13c068eac380c13411417c3d2511893111e49971f1ad706ae57b52860d1064d539d5
-EBUILD openmpi-2.1.6.ebuild 5495 BLAKE2B c31d193ddfe6a521d3173cbf0d4301a0c39dbebeb9981eba5a78c2c23172630d3bc6a969ccaa231dfd2e38101951b69b755c1effaf139a99f89b795884ebbd25 SHA512 b945303b1f459ede6d85b551db588f63ae604817ebae9c8475a70c424313d488bc85b48b2990d2766e7e284ea2a74d7f11ca19fb6cea726db22a0a663538ab1c
-EBUILD openmpi-3.0.4.ebuild 5381 BLAKE2B 806722e9526f4659ac549e306c169d2647078a1fc86389b5490133034f41d4cd60eef31e83d962ca1ac798c5506ae9e4774a90cefa1af210f7c166138d554f3b SHA512 33586d6a1d613b2efbf6b73892c3c554fb5afbda87051ef0894168caf28f10f269a18d1faf779cdff8a7b1a8a18e4d4b8d04745852d809f11df90b9550c7b3a2
-EBUILD openmpi-3.1.4.ebuild 5381 BLAKE2B 806722e9526f4659ac549e306c169d2647078a1fc86389b5490133034f41d4cd60eef31e83d962ca1ac798c5506ae9e4774a90cefa1af210f7c166138d554f3b SHA512 33586d6a1d613b2efbf6b73892c3c554fb5afbda87051ef0894168caf28f10f269a18d1faf779cdff8a7b1a8a18e4d4b8d04745852d809f11df90b9550c7b3a2
+EBUILD openmpi-2.0.4.ebuild 5865 BLAKE2B d16aaad399c13dedfeaffdc1c171c3a93a3394969b258c8b6a1b3b44494d8bdbb680f04c6a77cccef65baec41da2c7c9a408c895bdf74a8509239e786380c807 SHA512 82a99b9e2fde11a9f9b847077e0c685f467b7764d638580bbe6175c6d0065a085cf44d30101859ca7025eddaa5b041d370a7e1cb4acb104eb273d38e88c8e33f
+EBUILD openmpi-2.1.6.ebuild 5470 BLAKE2B 3b2c88ac0478b6828001366437acb965d62061a956de45fb7b9e7917641757a65dddfaf63b6c80475837d5742f92d60cc4bf140ea6f42f78b1491f56fd324f52 SHA512 166142b1364b7964991129d1340549148f0cf96124493495e83a0a2ea011dc60424f297f0c5c101b3d3b0d14c58e6bd45d05b50ae0f0d13fe22cda183542bffe
+EBUILD openmpi-3.0.4.ebuild 5356 BLAKE2B 2330d221b4b6f8cfb83abddd5c9d0ea62c733bfb3c2b2e0f9a05be4cf54516208ef508bcf782ef3ff0b22221b5eb91bc8e963db2032495e58b4620fec52a9084 SHA512 7ff7298fe6e6bf4d20d2ab5c75b47c5f354a34c24a057ca18150a971665b93926355b6de7d2434bd4c4237072a5346641b02debcedb48d4aecfb5d1f782876a2
+EBUILD openmpi-3.1.4.ebuild 5356 BLAKE2B 2330d221b4b6f8cfb83abddd5c9d0ea62c733bfb3c2b2e0f9a05be4cf54516208ef508bcf782ef3ff0b22221b5eb91bc8e963db2032495e58b4620fec52a9084 SHA512 7ff7298fe6e6bf4d20d2ab5c75b47c5f354a34c24a057ca18150a971665b93926355b6de7d2434bd4c4237072a5346641b02debcedb48d4aecfb5d1f782876a2
 EBUILD openmpi-4.0.2.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.3.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.4.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index 15fdb90992dc..662924556001 100644
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -29,7 +29,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -160,30 +160,33 @@ multilib_src_install() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
 		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
-		rm "${ED}"usr/include/mpif* "${ED}"usr/bin/mpif* || die
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
 	fi
 }
 
 multilib_src_install_all() {
 	# From USE=vt see #359917
-	rm -rf "${ED}"usr/share/libtool &> /dev/null || die
+	rm -rf "${ED}"/usr/share/libtool &> /dev/null || die
 
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
 	fi
 
 	# Avoid collisions with libevent
-	rm -rf "${ED}"usr/include/event2 &> /dev/null || die
+	rm -rf "${ED}"/usr/include/event2 &> /dev/null || die
 
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}" -name '*.la' -delete || die
 
 	if use java; then
-		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
 		java-pkg_dojar "${mpi_jar}"
 		# We don't want to install the jar file twice
 		# so let's clean after ourselves.
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
index 39c9e77772d7..93c7bfd018cf 100644
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -29,7 +29,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux"
@@ -149,24 +149,27 @@ multilib_src_install() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
 		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
-		rm "${ED}"usr/include/mpif* "${ED}"usr/bin/mpif* || die
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
 	fi
 }
 
 multilib_src_install_all() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
 	fi
 
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}" -name '*.la' -delete || die
 
 	if use java; then
-		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
 		java-pkg_dojar "${mpi_jar}"
 		# We don't want to install the jar file twice
 		# so let's clean after ourselves.
diff --git a/sys-cluster/openmpi/openmpi-2.1.6.ebuild b/sys-cluster/openmpi/openmpi-2.1.6.ebuild
index 8fead75c26b0..bb8a65b2cf1c 100644
--- a/sys-cluster/openmpi/openmpi-2.1.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -140,14 +140,14 @@ multilib_src_install() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
 		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
 		rm \
-			"${ED}"usr/include/mpif* \
-			"${ED}"usr/bin/mpif* \
-			"${ED}"usr/bin/oshfort \
-			"${ED}"usr/bin/shmemfort \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			"${ED}"/usr/bin/oshfort \
+			"${ED}"/usr/bin/shmemfort \
 			|| die
 	fi
 }
@@ -155,14 +155,14 @@ multilib_src_install() {
 multilib_src_install_all() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
 	fi
 
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}" -name '*.la' -delete || die
 
 	if use java; then
-		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
 		java-pkg_dojar "${mpi_jar}"
 		# We don't want to install the jar file twice
 		# so let's clean after ourselves.
diff --git a/sys-cluster/openmpi/openmpi-3.0.4.ebuild b/sys-cluster/openmpi/openmpi-3.0.4.ebuild
index 108954556787..6d1e97a1de5c 100644
--- a/sys-cluster/openmpi/openmpi-3.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -137,14 +137,14 @@ multilib_src_install() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
 		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
 		rm \
-			"${ED}"usr/include/mpif* \
-			"${ED}"usr/bin/mpif* \
-			"${ED}"usr/bin/oshfort \
-			"${ED}"usr/bin/shmemfort \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			"${ED}"/usr/bin/oshfort \
+			"${ED}"/usr/bin/shmemfort \
 			|| die
 	fi
 }
@@ -152,14 +152,14 @@ multilib_src_install() {
 multilib_src_install_all() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
 	fi
 
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}" -name '*.la' -delete || die
 
 	if use java; then
-		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
 		java-pkg_dojar "${mpi_jar}"
 		# We don't want to install the jar file twice
 		# so let's clean after ourselves.
diff --git a/sys-cluster/openmpi/openmpi-3.1.4.ebuild b/sys-cluster/openmpi/openmpi-3.1.4.ebuild
index 108954556787..6d1e97a1de5c 100644
--- a/sys-cluster/openmpi/openmpi-3.1.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.1.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -137,14 +137,14 @@ multilib_src_install() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
 		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
 		rm \
-			"${ED}"usr/include/mpif* \
-			"${ED}"usr/bin/mpif* \
-			"${ED}"usr/bin/oshfort \
-			"${ED}"usr/bin/shmemfort \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			"${ED}"/usr/bin/oshfort \
+			"${ED}"/usr/bin/shmemfort \
 			|| die
 	fi
 }
@@ -152,14 +152,14 @@ multilib_src_install() {
 multilib_src_install_all() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
 	fi
 
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}" -name '*.la' -delete || die
 
 	if use java; then
-		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
 		java-pkg_dojar "${mpi_jar}"
 		# We don't want to install the jar file twice
 		# so let's clean after ourselves.
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index a312afe03e8c..b32f84d8f1c5 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,5 +1,5 @@
 DIST singularity-3.7.4.tar.gz 6446703 BLAKE2B f9263a18c138cffa116ab06d59533948e48500fad69917598adc36b47fb0b8bf81e868ea924d1cd0e39ca6345a2fdc38a1c9788944729a43c4c8b63bbe82a184 SHA512 a02d8e5c3c229e454c7736173cbe3709ccaafb0ffedcf537501eb091cd3ee54899542e0c6e1221f35dcffbaf48d27be7e91a9bd510bdaacfd8a2285ea41e6f3d
 DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c SHA512 b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272
 EBUILD singularity-3.7.4.ebuild 1920 BLAKE2B dfb08d92fd548420df98f8f7a231840b13c6fcab2f74a673c324a2f123a212128eb4a0968f3834b6a2b11c5239b42ce80f0f78906bec6de40a5f81efa96f771e SHA512 e420cac5eea34e0d6dab96bbd02dfacfc7fcea64469fa2d542dd474249f88fa37367792d7d124b7fbe923da60ef66c817b4f4a69c50a722c8ed5166a5a48c48d
-EBUILD singularity-3.8.0.ebuild 1902 BLAKE2B 2eb0b09273480ac09f1ff9fbfc759046253660bba7c049b80890ea91ba78c4cf05b583ec4eb8db40450cdc1e06261fbced9c4f6d22cfe05ded82ec66c9eb4206 SHA512 e9a894fc5313729fa28c4353cf4b0ca298a2aeb9ebeaaa67b03a9aa0cf90e7c8e39fd7effd6f8f50c5f85e1d0ba60be77a2d4f58b881d2ffc75c20f6956f0982
+EBUILD singularity-3.8.0.ebuild 1900 BLAKE2B a24c10ad485b5359a304caf1c85dcd1529e41d50070f842b9d36f1ef79c76edd51ed44f8bceddeea729038eb299e1a917036fef34f036413255033e3e4c0d3ae SHA512 32764eddc65b36a265c7527852b4b1709dca3f1cc17ad38ea75950fd2972643f0f13238df1e481fe392762ef6755e83707b64037b36f73dd18a923ee0f28058c
 MISC metadata.xml 451 BLAKE2B 0cca32721561e4100348cd884b88edad067a426736df27d4be6926525f9dd1315387dbefff84b983e69ab1972a44cd3a3a2c643bae676b413dab3482005d4ceb SHA512 da6f640f7df71bfe98fdabfe8ea69b1929b80b3c23d869dc496515a76d3f76c5d89d38843faf850184ddd7f624dd1e821dd50103f92e81aeb620a4bcd7151609
diff --git a/sys-cluster/singularity/singularity-3.8.0.ebuild b/sys-cluster/singularity/singularity-3.8.0.ebuild
index 2c112879880a..e0cda2b957ce 100644
--- a/sys-cluster/singularity/singularity-3.8.0.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network +suid"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.
diff --git a/sys-cluster/zetcd/Manifest b/sys-cluster/zetcd/Manifest
index 6befb12379db..ecbb0c27c697 100644
--- a/sys-cluster/zetcd/Manifest
+++ b/sys-cluster/zetcd/Manifest
@@ -5,5 +5,5 @@ DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz
 DIST github.com-google-go-genproto-ee236bd376b077c7a89f260c026c4735b195e459.tar.gz 968271 BLAKE2B 25c00f9bdb5b6069b3e06bd4e26b5df95110843c894216eef033e10660a5103d4b471ad8b014630292c5001f976c54e1da5dfb4c89d6f655715241d41ee99b7b SHA512 a3a9e923926da62e097ee1775332cc5550334e4f96975f2ac5f0d3bdaa148f6583dcce10db68d1d4606ee471072b3248f40ae276bd9409c0d31a9f9bb3803bc1
 DIST github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz 220340 BLAKE2B 788b394df3b791a558c5aeb0fc1e330053d0dcc58d47308d337498743284a7b0a01eb28a853d619ae0038b27db4c93883cef672f74d7a7442d856b19e3e1cfb2 SHA512 ca79d38bc7d68f1d98869bee21dcdc563c3fee1a8d28b77d474752376fb91cc7b368466dfac41ddebbec13c1560ac3c22257a52deb6d844add5d208646d2e3f5
 DIST zetcd-0.0.4.tar.gz 1781564 BLAKE2B f6d5b69b9679dd53aa2f993979fbe8acc7711544fc43f58624d05223b90ff1aff76a8760708cbe8d3d424516ba67fc44967f1c54c025cd471d95465b2d6ba000 SHA512 d01cf89f500c6caf0ca4b60adda82d662d3f8948aeb3963f72872363f31ecd4e99b2b839ad8ae826906b0abdc46fbdacd6f996778d2a51cf2a1ddc6ba09b3fc6
-EBUILD zetcd-0.0.4.ebuild 1396 BLAKE2B 90880cf3a536c267949ce68487ab426b5e9a1fc8cafd80471b6b7b2797e807665113519d5b90f4028af7492c8abb759dab09c4af3ecf3887a027d5b597ac76bf SHA512 6d9496328e56a2b02f05b88367b58900f570daf2635e0dcf725feaeba8c66b5e76bd1aa14865af1b6eaa0d1fae4c98d01509ca9f4d97821115c40521de697773
+EBUILD zetcd-0.0.4-r2.ebuild 1386 BLAKE2B 74aa134c48e0dc58f6bcc530f3e178c8be1a78d2bae269c9a07719fd1cd98e0a38311b5fc275c48ae22e2ec9c5ec6495efd9700fd2fd5736adbc2fbea42b7781 SHA512 35ee46e0abec9043321f1b09005e6894e096d4b41c2f1afc53e814566130ab8032cf50ed3cd9a1fb7c1ccc80274bb4eb26921e2d17c155b897d05d2b6be1dacc
 MISC metadata.xml 244 BLAKE2B ff259b94f4e824620ba81fdbc657d5308919c840834f07290dd71a3482d366a970d82829447e4afd3498cdf88673e0ce28dba2507e8e0685aee062cc23db89b7 SHA512 e177f12585fce0e2369a90e7cd55b725cd4f41462826859edfeefea5ba8c430ef4df82ccd6843c9813fcba9141be34897917c55677753214d6ecf47c39d3df03
diff --git a/sys-cluster/zetcd/zetcd-0.0.4-r2.ebuild b/sys-cluster/zetcd/zetcd-0.0.4-r2.ebuild
new file mode 100644
index 000000000000..a1a5da597d9c
--- /dev/null
+++ b/sys-cluster/zetcd/zetcd-0.0.4-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/coreos/zetcd"
+
+EGO_VENDOR=( "github.com/coreos/etcd 714e7ec8db7f8398880197be10771fe89c480ee5"
+	"google.golang.org/grpc 777daa17ff9b5daef1cfdf915088a2ada3332bf0 github.com/grpc/grpc-go"
+	"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+	"google.golang.org/genproto ee236bd376b077c7a89f260c026c4735b195e459 github.com/google/go-genproto"
+)
+
+ZETCD_COMMIT="e4352ce3cc940bc5b60bb3dd69c14f16dac2980a"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="A ZooKeeper personality for etcd"
+HOMEPAGE="https://github.com/coreos/zetcd"
+SRC_URI="
+	${ARCHIVE_URI}
+	${EGO_VENDOR_URI}
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DEPEND="
+	acct-group/zetcd
+	acct-user/zetcd
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}" go build -o ${EGO_PN}/bin/zetcd -v \
+		-ldflags "-X ${EGO_PN}/version.Version=${PV} -X ${EGO_PN}/version.SHA=$ZETCD_COMMIT" \
+		${EGO_PN}/cmd/zetcd || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/bin/*
+	dodoc src/${EGO_PN}/README.md
+	keepdir /var/log/zetcd
+	fowners -R ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/sys-cluster/zetcd/zetcd-0.0.4.ebuild b/sys-cluster/zetcd/zetcd-0.0.4.ebuild
deleted file mode 100644
index 0f92ae748b79..000000000000
--- a/sys-cluster/zetcd/zetcd-0.0.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/coreos/zetcd"
-
-EGO_VENDOR=( "github.com/coreos/etcd 714e7ec8db7f8398880197be10771fe89c480ee5"
-	"google.golang.org/grpc 777daa17ff9b5daef1cfdf915088a2ada3332bf0 github.com/grpc/grpc-go"
-	"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-	"google.golang.org/genproto ee236bd376b077c7a89f260c026c4735b195e459 github.com/google/go-genproto"
-)
-
-ZETCD_COMMIT="e4352ce3cc940bc5b60bb3dd69c14f16dac2980a"
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A ZooKeeper personality for etcd"
-HOMEPAGE="https://github.com/coreos/zetcd"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}" go build -o ${EGO_PN}/bin/zetcd -v \
-		-ldflags "-X ${EGO_PN}/version.Version=${PV} -X ${EGO_PN}/version.SHA=$ZETCD_COMMIT" \
-		${EGO_PN}/cmd/zetcd || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/bin/*
-	dodoc src/${EGO_PN}/README.md
-	keepdir /var/log/zetcd
-	fowners -R ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/sys-cluster/zookeeper-bin/Manifest b/sys-cluster/zookeeper-bin/Manifest
index 2c5bd25092bf..b52b47ef50aa 100644
--- a/sys-cluster/zookeeper-bin/Manifest
+++ b/sys-cluster/zookeeper-bin/Manifest
@@ -1,12 +1,6 @@
 AUX log4j.properties 2191 BLAKE2B 64ca568213fcc1168a10b8ca5914361f2d4543e8d5a2e22bf81ee807df2c4f7ca269a1f8d355ee8e889aa50c250e24f65c3900a32f06233e6c3dbc9b460c48b2 SHA512 a465aef274e3f325730c150fdebe3ca27f9debe723af6680b187daf83d6da663fa8a51bb9813ec8cba3b4d59c9e28848032083a44686b08fd2c246a461ada0c6
 AUX zookeeper.confd 398 BLAKE2B d49c6c7358ce2f6911d359142e0f6abe2662c0e5c2bcf1ac114cd272d44efcfad05d31d58ef368a470e6f844df999068b68a7c1e8392138fc07887333e7bd41f SHA512 76ad4796faa2d267ae30d85e573de2dbad00c566764cf6757d71c00c68b10c99383dd87d2352f521c872ce22edde85bb2d3896bb6258f57ce3fc6b423a16296f
 AUX zookeeper.initd 373 BLAKE2B c60740f691d186861e3f101c84e5904774de6235a0423f4f639843b105d6ce9b4ebd9555db13f5ac1447c154881b3c95fbd4738d496f6008d9e52de1cc3e74eb SHA512 34a4011ecb5d8739e57dbc9222b528a0b323c6aa0aa45391621e724106571a632908782e3a4e14e953be72fa0e525b4c7cab0440af37bbef26a100fd1d92da81
-DIST apache-zookeeper-3.5.9-bin.tar.gz 9623007 BLAKE2B cb8a599a86f57cb0eb91d58925d363271749e0ca93b0d40be5852f859848bf557f4bc6016707cb99ad75e95204b7b8e0417acdff5ebc8328e3a12c5fe7faf285 SHA512 0e5a64713abc6f36d961dd61a06f681868171a9d9228366e512a01324806d263e05508029c94d8e18307811867cdc39d848e736c252bf56c461273ef74c66a45
-DIST apache-zookeeper-3.6.2-bin.tar.gz 12515974 BLAKE2B 6770397b818558464843638bb9beebc1e23fc737ed88b28966494f69a28adb9624d9ea67225f8b528babd78a6ce7650218933b80db520ea08e31231e1bbe478c SHA512 caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199
-DIST zookeeper-3.4.13.tar.gz 37191810 BLAKE2B 994eecf982a19bbf3ae648c5d140746f5836f0f5d8921ed005ebccdedf0098591005b9038eb75fc660b48ae12b09b8db9dd68d3ac3b4ac9f847de214996e1efd SHA512 3481bd19945d80848f81d9dc2896a682ae8b62269b8164ffbae532e55aa4219961403e0208c8e72cf784605eae436d70ddae2b26e0deba0f1f84c74188c32c0a
 DIST zookeeper-bin-3.7.0.tar.gz 12387614 BLAKE2B 5b5467b4c7e206704177d41289c3c52fb0487f990fcc460d2749215551ab08eee672b6b52b8d43796c52660a46d3bed837fe26f042c30506b537457f54a95bd7 SHA512 64e2701c019ed46f45f4d53b2c5eaeaf7cf48c342bbafa032a0819d527fc77caebfada6bdad34e5171e6d838f40b16c95b62ce378b53dfc827af2d60cec0b17c
-EBUILD zookeeper-bin-3.4.13-r1.ebuild 1715 BLAKE2B 8ce26ac2d66e2e9591b57a344bf4ae0448d6bf6178c0552255f1137fa4d1038385c1880f31485c928a09719ec9b37a8f9950aa57ebbf60d3c8095d13b48254d4 SHA512 cedb27ee795393d4cdfc342fb549cd603cbb1585ef6ea74a3d2c334d6dd0213d39d9e680408e895b2d0e403724029a3e60e1cd194d008b53f43f95a13898974a
-EBUILD zookeeper-bin-3.5.9.ebuild 1477 BLAKE2B f6cc7898f223a134e7ec0f64f63ab1487e255c8be6690e583f89ad19e04c9f795dc17d24599684cd7f5a2a91575a90fdef57f4e5c2b5b34c9cac4dbd84748c91 SHA512 de17264957bbc15d231a14d88c82538d1ae0fcc490c9feb72534fb1d04517e9e66235266b8ec09f6d87b1e7b813799dd33b0fa80930d339a8f3710bb31c3d536
-EBUILD zookeeper-bin-3.6.2.ebuild 1477 BLAKE2B f6cc7898f223a134e7ec0f64f63ab1487e255c8be6690e583f89ad19e04c9f795dc17d24599684cd7f5a2a91575a90fdef57f4e5c2b5b34c9cac4dbd84748c91 SHA512 de17264957bbc15d231a14d88c82538d1ae0fcc490c9feb72534fb1d04517e9e66235266b8ec09f6d87b1e7b813799dd33b0fa80930d339a8f3710bb31c3d536
-EBUILD zookeeper-bin-3.7.0.ebuild 1492 BLAKE2B f76741fe53ab3cc99240af760f451a304ec5b1c6a666d28c0d5d3228ca78afd6fb8be4e778f1ff26064af4304fe14bde94f492f330fa8aebd6cc9016e41f834f SHA512 6d7cf7057665bb2076e48777f3c22df094886d113ffd6d7845c8a16eaae43b728524075c36129efc314b830ae42e8b2ec2b92b8589ff09d7325379b261ddf33e
+EBUILD zookeeper-bin-3.7.0.ebuild 1490 BLAKE2B 03572804661466c353c36c37eba0847148dc8a7bd5643c100c59183c054b25800803524d66e36e818e9316b8bc82425ebcd62d0a157383746458df279674e828 SHA512 e90e8b9acd7e360b310576fdb538289e536783e42e1b7f5c1c6b972008d792edcdc3e802b09724e2b92cc6eb160022ff4675f68ffb5e215e0ef3437c91dc50f7
 MISC metadata.xml 377 BLAKE2B ab2582cf60510f072415cc1dd008bd744f66d76fe6b34b779eba8acf7c28a0d055d70d16c2712af7324b6b11193ed2526b6b8bb1b101084e8a5ca8d96993ef3d SHA512 2ad1600101d36b70c32cb76894e55f01717a544d689bd28ffb41a727d7d23b6f8e9565eea71f252a721bcd4e516692921796f24266485a216a6015a5a9e74f26
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
deleted file mode 100644
index d6622479c88c..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-utils-2 user
-
-MY_P="zookeeper"
-MY_PN=${MY_P}-${PV}
-
-DESCRIPTION="A high-performance coordination service for distributed applications."
-HOMEPAGE="http://zookeeper.apache.org/"
-SRC_URI="mirror://apache/${MY_P}/${MY_PN}/${MY_PN}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.7"
-
-S=${WORKDIR}/${MY_PN}
-
-INSTALL_DIR=/opt/${PN}
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-pkg_setup() {
-	enewgroup zookeeper
-	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
-}
-
-src_prepare() {
-	# whyyyy u -Werror ?! so horribal!
-	sed -e 's/-Werror//g' -i src/c/Makefile.* || die "Failed to rectify the Makefile"
-}
-
-src_configure() {
-	cd "${S}"/src/c || die
-	econf
-}
-
-src_compile() {
-	cd "${S}"/src/c || die
-	emake
-}
-
-src_install() {
-	local DATA_DIR=/var/lib/${MY_P}
-
-	# cleanup sources
-	rm -rf src/ || die
-	rm bin/*.cmd || die
-
-	keepdir "${DATA_DIR}"
-	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
-	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
-
-	dodir "${INSTALL_DIR}"
-	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
-	# data dir perms
-	fowners zookeeper:zookeeper "${DATA_DIR}"
-
-	# log dir
-	keepdir /var/log/zookeeper
-	fowners zookeeper:zookeeper /var/log/zookeeper
-
-	# init script
-	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
-	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
-
-	# env file
-	cat > 99"${PN}" <<-EOF
-		PATH=${INSTALL_DIR}/bin
-		CONFIG_PROTECT=${INSTALL_DIR}/conf
-	EOF
-	doenvd 99"${PN}"
-}
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild
deleted file mode 100644
index da7b8c2abcdc..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-utils-2 user
-
-MY_P="apache-zookeeper"
-MY_PN=${MY_P}-${PV}-bin
-
-DESCRIPTION="A high-performance coordination service for distributed applications."
-HOMEPAGE="http://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/${MY_PN}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.7"
-
-S=${WORKDIR}/${MY_PN}
-
-INSTALL_DIR=/opt/${PN}
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-pkg_setup() {
-	enewgroup zookeeper
-	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
-}
-
-src_install() {
-	local DATA_DIR=/var/lib/${MY_P}
-
-	# cleanup sources
-	rm bin/*.cmd || die
-
-	keepdir "${DATA_DIR}"
-	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
-	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
-
-	dodir "${INSTALL_DIR}"
-	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
-	# data dir perms
-	fowners zookeeper:zookeeper "${DATA_DIR}"
-
-	# log dir
-	keepdir /var/log/zookeeper
-	fowners zookeeper:zookeeper /var/log/zookeeper
-
-	# init script
-	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
-	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
-
-	# env file
-	cat > 99"${PN}" <<-EOF
-		PATH=${INSTALL_DIR}/bin
-		CONFIG_PROTECT=${INSTALL_DIR}/conf
-	EOF
-	doenvd 99"${PN}"
-}
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild
deleted file mode 100644
index da7b8c2abcdc..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-utils-2 user
-
-MY_P="apache-zookeeper"
-MY_PN=${MY_P}-${PV}-bin
-
-DESCRIPTION="A high-performance coordination service for distributed applications."
-HOMEPAGE="http://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/${MY_PN}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.7"
-
-S=${WORKDIR}/${MY_PN}
-
-INSTALL_DIR=/opt/${PN}
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-pkg_setup() {
-	enewgroup zookeeper
-	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
-}
-
-src_install() {
-	local DATA_DIR=/var/lib/${MY_P}
-
-	# cleanup sources
-	rm bin/*.cmd || die
-
-	keepdir "${DATA_DIR}"
-	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
-	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
-
-	dodir "${INSTALL_DIR}"
-	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
-	# data dir perms
-	fowners zookeeper:zookeeper "${DATA_DIR}"
-
-	# log dir
-	keepdir /var/log/zookeeper
-	fowners zookeeper:zookeeper /var/log/zookeeper
-
-	# init script
-	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
-	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
-
-	# env file
-	cat > 99"${PN}" <<-EOF
-		PATH=${INSTALL_DIR}/bin
-		CONFIG_PROTECT=${INSTALL_DIR}/conf
-	EOF
-	doenvd 99"${PN}"
-}
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild
index 758806fe6c01..b5c177878c77 100644
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild
+++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/apache-${MY_P}-bin"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="mirror binchecks"
 
 BDEPEND="
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 6c6c2644bcc7..2abdc832e2fa 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index 8a9337b90ccd..3432acdf16f1 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -1,16 +1,7 @@
-DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
-DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
-DIST binutils-2.33.1-patches-1.tar.xz 17944 BLAKE2B 811ad416fe9c059f645856a3123ed32303afe1d0f166a15cb6de0673b5494fdcc4c165da4a68eb7ab73f007618e3a97a5578c4b47de21e57fe501d6a21b6d595 SHA512 63b439637206d21e46d2b79383b38da2b28365a0fdea1f5ac3b665cd05e0b55cd1d7763c05567a5f7ae2c645d2ae639a27e465d535b928d9f8f0e6b94f31e1f7
-DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
-DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
-DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
 DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7ed8fbc43b60a58be1dfed05eae8a8fee857241d9e112ae673da6fc9778767675f536ece818cb85567367bb1c8f87a0693623f SHA512 35de5f227c745c5fb800784fe657b2a6216faf43e2498e8481e7b0dc79b0d2f86b3b6a10b896e060319a77a51c61d2e1b7a951ae962b3a6ef8c1a2a261d9bb6c
 DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348
 DIST binutils-2.36.1-patches-3.tar.xz 32720 BLAKE2B 2a5a60168ec5ff612e7e58530092f306460cdb4a963320978dffcc22d73684486a14a5981f6eab2f7fc270def22cdc9954de455d680b2de4befc1ad4916347ba SHA512 e429cc82451675f14715d4e7640fe7b995495c8759a8e919c4291f8ca8358a663012f05c1ec6e60b1261114848379fefc9df723929770462dd676fa04fc7aa54
 DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
-EBUILD binutils-hppa64-2.32-r1.ebuild 12648 BLAKE2B aa452384823e5b0be386bc4a7501d49b2de644af4492a05992f7dddd680c5e87481dbf5a38fff342526e571e271adc6af68b33bda2e83059877a307b4d892b81 SHA512 df21c036804f909f7c8b3ccec6119c6f35189cfe3988390be4dbe3f36cc7ead39eea4415cae689dcdcaa9387bb7d97477e50f329c7a11f75d28880a6f676b1eb
-EBUILD binutils-hppa64-2.33.1.ebuild 12302 BLAKE2B 84e6b959af5995933200f19231c033fbc7bec57f54c7a28d92733556a2194e963120469d68ca488788e32f3199312bf2f08351e1d541e847c15e67d451648b79 SHA512 4b1330e3070fb3ccbaea43f261ce9a96786779d3c876d41fa4e80e73206395ef1586bc7e82e959b744ebe0c6ca798aaa41d48a19c77380b627f0824aad405bba
-EBUILD binutils-hppa64-2.34-r2.ebuild 12447 BLAKE2B 84e65ce3f3dabab20ac002cbbe67b0545e1f15adfc262c5319d579320c1fcc30eefbac6618d320802c2160d351ade699f0cf8964209268f44ca1e97512719d50 SHA512 8f4e0cc1d2771c9d2323e623bc4667ab5199929631877802fbd69b48ede3f7055df305e237a021c8f0e38801eabebcc15c411e6d85e013a4a3115e5976810665
 EBUILD binutils-hppa64-2.35.2.ebuild 12393 BLAKE2B 7c6521094cd088a4d9ddab7391c2994e9506a53083a269d1fcee519f5ad8ded88e53d6957656ba5287643c17a87ae7c584e49771aa635d573f40ff3c060c153d SHA512 5855d3967d920f93ed177626a9eb64348e951341751d42b3d67b98dacedea9b250473a5e3baee3d08510a8a3d2f8340ba775ee71207df125d1490b4a23dea281
 EBUILD binutils-hppa64-2.36.1-r1.ebuild 12394 BLAKE2B 50ccc0adbf2573870d042e29ca46585bfc8d5adfb19cb151989434f6d420a8cc02ef5eb45697af83472e74c8516ae2538eaf70cc3489d0f6f12bba462411b542 SHA512 1a23658a100282335ad60958c3f55f6b9d18676e99f69afe441721721fd60b3fad8116d155cd77aac9bccf0aef4b600350aa23bba81288925116ee60e4d14cd6
 MISC metadata.xml 767 BLAKE2B 1b1533f4fce4b4ea9e2bebbe19c55d55d226120dd255fa421b46971ac554696209fa9df92e40279561876895392827415ee77f7502fec5b0ac684a60f0697de6 SHA512 3aa7ebfd1f6efc14d1d6b19406e08c100854c1e1b933cd8682e90825e8fcb71ec3086e2772422931fe88797c1b54d02422e0700488637f6bd594bf6d1d6181a9
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild
deleted file mode 100644
index d3887bea1c76..000000000000
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CTARGET=hppa64-${CHOST#*-}
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs versionator
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-# USE="+cxx" is a transitional flag until llvm migrates to new flags:
-#    bug #677888
-IUSE="+cxx default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="cxx? ( gold plugins ) default-gold? ( gold )"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-#                      Default: slyfox
-
-PATCH_VER=2
-PATCH_DEV=dilfridge
-
-case ${PV} in
-	9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		SLOT=${PV}
-		;;
-	*.9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		EGIT_BRANCH=$(get_version_component_range 1-2)
-		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-		SLOT=$(get_version_component_range 1-2)
-		;;
-	*)
-		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(get_version_component_range 1-2)
-		KEYWORDS="-* hppa"
-		;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-S=${WORKDIR}/${P/-hppa64/}
-
-src_unpack() {
-	case ${PV} in
-		*9999)
-			git-r3_src_unpack
-			;;
-		*)
-			;;
-	esac
-	default
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		# Use upstream patch to enable development mode
-		rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-
-	# the hppa64 hack; this should go into 9999 as a PN-conditional
-	# tweak the default fake list a little bit
-	cd "${D}"/etc/env.d/binutils
-	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild
deleted file mode 100644
index ecd3f2f999b8..000000000000
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CTARGET=hppa64-${CHOST#*-}
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=1
-PATCH_DEV=dilfridge
-
-case ${PV} in
-	9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		SLOT=${PV}
-		;;
-	*.9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		EGIT_BRANCH=$(ver_cut 1-2)
-		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-		SLOT=$(ver_cut 1-2)
-		;;
-	*)
-		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(ver_cut 1-2)
-		KEYWORDS="-* hppa"
-		;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-S=${WORKDIR}/${P/-hppa64/}
-
-src_unpack() {
-	case ${PV} in
-		*9999)
-			git-r3_src_unpack
-			;;
-		*)
-			;;
-	esac
-	default
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-
-	# the hppa64 hack; this should go into 9999 as a PN-conditional
-	# tweak the default fake list a little bit
-	cd "${D}"/etc/env.d/binutils
-	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild
deleted file mode 100644
index 9eace9459ce4..000000000000
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CTARGET=hppa64-${CHOST#*-}
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=6
-PATCH_DEV=dilfridge
-
-case ${PV} in
-	9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		SLOT=${PV}
-		;;
-	*.9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		EGIT_BRANCH=$(ver_cut 1-2)
-		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-		SLOT=$(ver_cut 1-2)
-		;;
-	*)
-		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(ver_cut 1-2)
-		KEYWORDS="-* hppa"
-		;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-S=${WORKDIR}/${P/-hppa64/}
-
-src_unpack() {
-	case ${PV} in
-		*9999)
-			git-r3_src_unpack
-			;;
-		*)
-			;;
-	esac
-	default
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-
-	# the hppa64 hack; this should go into 9999 as a PN-conditional
-	# tweak the default fake list a little bit
-	cd "${D}"/etc/env.d/binutils
-	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 6749a09a467e..423e9982fcc2 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -4,7 +4,6 @@ AUX binutils-2.33-gcc-10.patch 815 BLAKE2B 84cf88e34afea70ea3728e2a78f0ba004e249
 AUX binutils-2.35.1-cet.patch 2675 BLAKE2B b720e43514b25897a332648bfb15e16278f76606413991ce75c0233af27bbc434c36e85d36d4207339211382c0c5de5e9892f9e533e9d24b5257864939ac4874 SHA512 4fd4787c7ff2f7c2fed338ccc0f478b120d566959c0de5dde03cdcfdb37911bc22c5c11a124a000d84138a23c30ee3fa65c024eb72d1c924f926b04e079412a5
 AUX binutils-2.35.2-powerpc-tests.patch 6108 BLAKE2B 20f9664b0d23e17584a0de5b6e28b3ed18cd072683b760c8fa6c43185a59ab9e7310059a89e6643a7372897c3e903598e800310091ad5a5366800c1997e380c5 SHA512 113bc477103f410fbb8d8ae97963a5093574b10542c339a04474bc6e6e06dab2cf03648ec78ffa489acfd208fafbb33bf769000c32178558c4fc72c7f0649b2b
 AUX binutils-configure-LANG.patch 2082 BLAKE2B 5db7ce0626dee8f3d84547eaccc5a2808bbb55657dd22c890782446fc9fe3e84683277d8da675067d9fd494d99dd292883174e133e440ce6a90d22a9f1aa9142 SHA512 1caf25d5e332d7de313b6be73e753fdde7b02235af564a9c06517f5874127998eeed731388617b75f54be6fec21835b78a54ce6c7162a33e25411fe3c78efee7
-DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
 DIST binutils-2.32-patches-3.tar.xz 151372 BLAKE2B 70d5f78d9f3e3bf9ff096b6f24babcc35c63395a5e1155a981a5ceb4b7a5706ad2ee0c77c74e910fc0eefeaed19763113186deb9665eed538dc3b8e227bef12d SHA512 5e91eff63332c2aca86a82a287ca4959a6098065ed88078265a3d79a2c851abd113e9736b75d8102a208996ed1191b0e23569921217ece975f1d9005a55afd0d
 DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
 DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
@@ -15,7 +14,6 @@ DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7e
 DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348
 DIST binutils-2.36.1-patches-3.tar.xz 32720 BLAKE2B 2a5a60168ec5ff612e7e58530092f306460cdb4a963320978dffcc22d73684486a14a5981f6eab2f7fc270def22cdc9954de455d680b2de4befc1ad4916347ba SHA512 e429cc82451675f14715d4e7640fe7b995495c8759a8e919c4291f8ca8358a663012f05c1ec6e60b1261114848379fefc9df723929770462dd676fa04fc7aa54
 DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
-EBUILD binutils-2.32-r1.ebuild 12355 BLAKE2B de4b9e2d35beb09424d710bb9c5c1b7323e31c7b0d07a0b8fc93bbc099f36a2a30a81b17a7beda6c4876cc07376756de3c9fbad16597a8f12d0881b47544daff SHA512 1d0ea4f4453030931145a0802a497fe4be31b5870359575bfeb9ff2502eff613522a3e2b11f03c338ff72c54ac1054d70a5b29e7d5645adf9e699a0c233fc7b4
 EBUILD binutils-2.32-r2.ebuild 12173 BLAKE2B fb2dd9286d25b3e9b6bfbebfd70965e72b0458b3d87830be8f8e2f14866818441118f809392c34f2ea535d2f54821c3460108ed71bbd9e78286cad1190a669c3 SHA512 cb442d2e13a2c33fd3e89cd948b5bfbb453d7f37ba18cd061c21c69fceb8cdcfb047d4b009d1ec5d6f3d90c37ad9fa30cdfaf2422ccc6c410720ee0989c11cae
 EBUILD binutils-2.33.1-r1.ebuild 11909 BLAKE2B 7401764d65bb05f67b9892bbd6e1b66ebb61d87f11cfc3d61185da584e38a0dc6d52af8bd717ea53d0ba816f25b6983c229364528b396c8a60e7bb7889f25abb SHA512 d05b41f4a983a6e86a9fe993fc852cb4d978b9a75d0dc9205584e1024af4bb979d14edd961e1df0d7d0e3b908d332d6df2c4e160a8311066f95bdc9284c94a2f
 EBUILD binutils-2.34-r2.ebuild 12005 BLAKE2B 8455ac022e79d7099fa863cd969cff17aa6ff3e3a260120da75b2564bc8eaae3287b3f1242df8daa68f95bb47b491502552f67bb84d91ad9c11684663a4b86eb SHA512 36f794faedf862a43ae5e3895100506c18b12be46ba9e152d694be932a9f9f754539c4faaa9a72ffdcd2410b5555e97af22c1947233a26548242d8e5de37f152
diff --git a/sys-devel/binutils/binutils-2.32-r1.ebuild b/sys-devel/binutils/binutils-2.32-r1.ebuild
deleted file mode 100644
index 7bd6b4fbdc07..000000000000
--- a/sys-devel/binutils/binutils-2.32-r1.ebuild
+++ /dev/null
@@ -1,434 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs versionator
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-# USE="+cxx" is a transitional flag until llvm migrates to new flags:
-#    bug #677888
-IUSE="+cxx default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="cxx? ( gold plugins ) default-gold? ( gold )"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-#                      Default: dilfridge :)
-
-PATCH_VER=2
-PATCH_DEV=dilfridge
-
-case ${PV} in
-	9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		SLOT=${PV}
-		;;
-	*)
-		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(get_version_component_range 1-2)
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-		;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-# Disable gold testsuite since it always fails.
-PATCHES=( "${FILESDIR}/${PN}-2.29.1-nogoldtest.patch" )
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	case ${PV} in
-		*9999)
-			git-r3_src_unpack
-			;;
-		*)
-			;;
-	esac
-	default
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		# Use upstream patch to enable development mode
-		rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die
-
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-
-	# enable verbose test run and result logging
-	emake -k check RUNTESTFLAGS='-a -v' VERBOSE=1
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 2862ede76c9b..1d77aa3cc1da 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,8 +1,4 @@
-DIST crossdev-20201129.tar.xz 28372 BLAKE2B b59d94a69b83f8db9193bd54ff6059b20617b6dd60c0f9a0ec5acdf4b93adf747886598b9af7d69d2fd9705fab709041a96c149286e623b6557ea709bf2f840a SHA512 7b49795ea266d90e45c48b092bffa485a7207c66550d797297cb7e0756f7c497d045b3cb9b90f50b80a3ada4916a3ba273b2c19b9d02c834fb47d906efe3a8ba
-DIST crossdev-20210608.tar.xz 28464 BLAKE2B 5a52427b86b0dbfaf5711a04382486ff247ba69ff18bdad4840f173e7ba55efe547aad550086570335377192ec9b3f0b36da1921ad7044b9e21bb2bd3a21779e SHA512 246eb7ce4db4a6fe8af461700878e30c2f83548c72960aba7e936b1bbb4e83cfdc1fe39b6fd21924075b745ff87130d0b8a5ce569c49474e0e0432f85a74c89c
 DIST crossdev-20210621.tar.xz 28588 BLAKE2B 33ff6069c85cbcff6bf34bf5f6dd8050bd5f9d34e3478c0200965dffd4cee46e71acf4210f533c9b22fd6fe979fa5f447d30b5aaa3a6fc0845b201a80dcb28d8 SHA512 8f8bed6ce53503fa4c2bbce4327d8e1d5ce8edab5ff698f11f312007912a2d73be56242269f798bb633ad3648f6cf936e00e019c05e5781b523059befc26f42c
-EBUILD crossdev-20201129.ebuild 836 BLAKE2B 08fa2496f60df3331c9612db4d2b9b4905376898fe30147d20c8744b59ce48ba3e49d31180213af44db69c5ea260918e7a9b1ca92bb1e525185d2366a729f112 SHA512 9a8d45838396fcdabffe832c5da9acc9f0685dc3a1d641b58cecd1e0ee2ae65387567530298d643f87dcedae521f5abf7b62c8f6bcb46a1f6e0193dee0df2a02
-EBUILD crossdev-20210608.ebuild 843 BLAKE2B d8bbe8cd8cb80231109e9fc8a52a78069c241300d21aa61f338e288cb4df3b8220d918ef7d5173e417be42d459f37d0a32bf56ac70993d517c049b9e1af2ef24 SHA512 053c7df70e84e292b2b2450888078be08616c20b4057c918c649f0d44f60dc122db0ecf9a17addf3f3b83ec2ce6a62631acac93230a7f51ab3374fb006f036cd
 EBUILD crossdev-20210621.ebuild 835 BLAKE2B 7bd6d380e0f5350789565ae0015f0af94867dfb66a34f8e0444976628a882a339ed301604e52173c3198ccc356fcdd5c995df119751083ba5c158d46071be0f3 SHA512 e7878f12d7bc34b4b4071109f2aee8a2c97a3cead759dfc1ea7577a04ac5931b93bc450daef6f0ed7d24dcbd6efc2ccdbf53d2ab58775ae71b136d00ce9daecc
 EBUILD crossdev-99999999.ebuild 849 BLAKE2B 97867ab9bc03eace8979101a71a718e7a96ec83eb3f18f720bd0f1d90011dc1d15b49f23f6ea096f63f91ca2f95c9e2b3a9ea9c5e9a18c861f3345f055cac0d6 SHA512 6417d57459a0e10fbab5b4ccf0fb529011e503e6e4b6968a4ce79f71cce95e5844d9a37e4302bbee33db02ec680021f5b3b13038f92a489c167eb35ef4e36119
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20201129.ebuild b/sys-devel/crossdev/crossdev-20201129.ebuild
deleted file mode 100644
index 710a287c866c..000000000000
--- a/sys-devel/crossdev/crossdev-20201129.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-BDEPEND="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/crossdev/crossdev-20210608.ebuild b/sys-devel/crossdev/crossdev-20210608.ebuild
deleted file mode 100644
index edc534a73039..000000000000
--- a/sys-devel/crossdev/crossdev-20210608.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-BDEPEND="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/gcc/Manifest b/sys-devel/gcc/Manifest
index 67c75fa775d3..44d4a5c4dc69 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,26 +1,18 @@
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
-DIST gcc-10.2.0-patches-6.tar.bz2 24103 BLAKE2B f719012f86136ad9c4ea1397548caca6e69687534599a88cc25fe0e4f83dd7fd34c07375fa6e612e2b430e078c1a59913160cce07312e94fa1ce575a33e5457b SHA512 61d97dba29024c7a22806689ebf33f5cb9ce099230bcc344f2865b976c3fdfd8ebec5962eaffd0156de75eca58499ba785867bd4a4ac92c6f799ab1bee8844a1
-DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
 DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c835374113c6ff2cf1430a5568b3d1b27183e6de6751367c1e5720c85ac4c45132848888d5510c63f95e88a1f623b6bcf4000 SHA512 6dc435c8619a1532000fae843b9964d0d1e28d3cc9cc1962ab7391570a0cf1135424ea5c0b0d3d5ec5ea863f02e963be2ec4c94822f217fc692a1d808325404e
 DIST gcc-10.3.0-patches-2.tar.bz2 17688 BLAKE2B 8dc949208e0a4a3f0f106fabb9eb6e6787b1a829f9cfed6009d1328220e71926489b4f82a270cabcfa64af46e9892e72f5af2ce991c209055fcfab103cdfdde8 SHA512 053e67f778105062f1246cc09f6f8973d663855ab6d0ba976575e4b8f62e667dc05c058d4b3ae33c135292533c8f9a44b6f7a71f14435962b4becaf49848dc80
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
 DIST gcc-11.1.0-patches-1.tar.bz2 12130 BLAKE2B 4d763b83dba7875bbbe8bbb9b6c392791ba97037d17347548604ffa7c70b32fdafcd45b0722ae40aa3aa8cbb34b9f3e3aa399d0096e35e74f75b174aad0c032e SHA512 e4e363c6a81bbc423ec36b6c57801ea2a70961ee7d7d0333924c7012b2b6fd4008f53e9208b5d1f6025f9e74a95d46c121b4b8909827070b46091228688996a4
-DIST gcc-11.1.0-patches-2.tar.bz2 18492 BLAKE2B 37ffb2b2a92287c434d3730772b73b88926788db8b609611447318a28fd43963fa04ee664bb1c83815ee80742457ab703f7bc2d1e6d700e342760b1d9cd13867 SHA512 62297a37b0f1ff48858c59f761291f0fc4efe14bd471d53763899c2f272cc21764d4521682219a57857118e846766dcb9e24646f749d735acd58bb2d7b8b05d6
 DIST gcc-11.1.0-patches-3.tar.bz2 19670 BLAKE2B bd37b28beb8ee387d03466bdb8e81b6f8f8a4bec3cdd012db84439166855eb6f465e2232e0472f9369a74c240af2a035d1023abcdd5058a7d9e27b0cb1709716 SHA512 b18102b70b77ec1328eec7f9e03fd083649af97845a6ecd68bf3cac128571e3b25a99823ce29cede8c6bcb9b0f31288a2e5a8f5d59cfad2b1278c420bf9e2149
 DIST gcc-11.1.0.tar.xz 78877216 BLAKE2B fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed SHA512 fd6bba0f67ff48069d03073d1a9b5e896383b1cfc9dde008e868e60a9ec5014a837d56af0ecbf467b3fb9b37ec74a676e819a18b44393a0a3c4280175b5d7ad8
 DIST gcc-12.0.0-patches-1.tar.bz2 12137 BLAKE2B 1b5a07c4e0996b559cc5d57c5a0ade76983d80f3dc8f87e67b95b54114f7adcf3a78bd409123e7f414e33cf3114da9fab3491fd7cb39e337a22c1d6b562842e5 SHA512 fb5464a0b55446b2c99b6cb50e70404a723925b6bea322855ed4d2f66bdff70aab22e93d1e6d7d72d8a1451cac919d0d07b2a6caf0d953fa1692fb3422b2528c
-DIST gcc-6.5.0-patches-5.tar.bz2 13723 BLAKE2B db0170d6db74dcb6dc3ec937379c188814cfe88b5204aa0c1cc925083d8f178be4896e98ff44fe224060e4e1fea98ef3c90aa8339b2cf78d33cd2dc8b94e3bdc SHA512 d79cf975157c5285faa893da0259b0013df66b01ad597322f05ece0343dd7912d8d793663448c04f37be93092e2fde06f84374e142cb81b12ba5964b37b0de89
 DIST gcc-6.5.0-patches-6.tar.bz2 15320 BLAKE2B fe6b60cd45d00187e4e41e607af6a1137481a6d8f4421a0ead7da9fd86d0cd19bf428e5d150e1de4e0616606f8d6c31738da24be8151c58f7760aa92432ea3d0 SHA512 87c2a6726373999472cbd6211e486864266c833d5a07f8fb02dd3054b7dd3f86aa86ea47b17928045ef6e46d82f429f879d6f69d8adf3b6f2956f4ac6b3f80f1
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
-DIST gcc-7.5.0-patches-3.tar.bz2 11613 BLAKE2B 84d59103bffaec8fc57e69dbb17f53882935b20c23d54db5f805e8270fa16d8e572ee4a369ecc82d2279cf66a71d1eb2a7f0c9792d4495d2f68946d6b6403f15 SHA512 6e5bea150c56ce3d43c9b0878691ed54ecc5d2a12482e99261efa74af7f1d59ec94c2d0c363792d99e0d3a0abd739d5d06b861da4dea2c1676e5d498b5815d55
 DIST gcc-7.5.0-patches-4.tar.bz2 13183 BLAKE2B 38a56910f01ef4172182d2145cef1df53b57eaa8f0655223cf54689e7ce12a264bfbb3735bde42b8a8594ab44031d9c48dc0d5303fab6537746f05e4d46b427a SHA512 28d3732d5351dabd1452ee0462865a0de00103d9ea66941e38499c532b34ee8beb150b0b32af58cde901e437b4c256593c29736a5e7df2575aa0d0c43b6cf6eb
 DIST gcc-7.5.0.tar.xz 62783088 BLAKE2B 8a5efeef517a5da1634d063aaa83bf5e002f86acdf27419f1067f5c3d087333d9eea0c8db427b8bd895af646990bb00ee173069980ca49cec848434a4127256f SHA512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60
-DIST gcc-8.4.0-patches-2.tar.bz2 16254 BLAKE2B 5ee50ee1a3f6cdb392b370a0f62af7e8fd2fb2cadc46d4faf37ddbae23812a0e9f2e35a4ed6a08c41ffe648c21e9982e965d3ab91f68ae941c6cad74098afa2f SHA512 26fd2ad9f29dfd1db671d4966c16165a6fb75bd74f440871fb41dcb9b6102f07347ae8df67baa9e4d52aec91d3d67803a952b7bd45159fde56e1a1f28237c5eb
-DIST gcc-8.4.0-patches-3.tar.bz2 16890 BLAKE2B 29b537faf6fbf5ee43a72ea622090c17a28e19b903807d64302ef9a53c4eddc796c32e4f522ae0b724dda527ee073ba436e8803384d6d73d5e715653f89f59a3 SHA512 3f44e05d271c877eb2183731d4faccfdd66ac392bb8a541256d4d58c9e26bd205a53b9c881cc9c457cece55596cfbd8c6278be9509f3b151bb5e43206ce80188
-DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c76660fc17b0475a1164753979563bec25ed46c4e6c718cb9f64c047f57780e8d5be919657a1653f8221c1c9a SHA512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280
 DIST gcc-8.5.0-patches-1.tar.bz2 15655 BLAKE2B 7a0c15ba27e0bc1f19527a972f5100fb88fe367b29e46c6c7a0c3d00ae2c0c63449cf95775238a2369cd4d6f0e5c58da086ccf4c13d06b1264063a801dffcec2 SHA512 72dabf104a938f9eaab1f188ee945d4b22b9e85650fc1a878314ab37a4e5682b43476a6a9e87561d9b8eabcb40fd8e377369b03a0e73ac12d1b0f5ab6529419f
 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
@@ -29,25 +21,18 @@ DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B b06fdfce4402850bb1c6c211ace4c3a07
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
 DIST gcc-9.4.0-patches-1.tar.bz2 14012 BLAKE2B d5fbfd73d9c3a5b66be5b124d981fe5a7468363c83784989a50731f87931435f4b6302e4c20a64b20680581ed40005eff7bdd5855526a093f73a04c3c1ddab31 SHA512 b84884c7d2197cb14229d3321b98cd66c783cf9ebf7e5d1b1186e6cf32ee9e47d004ebad26118f9c848f9bc0a3783ceb23d9b65101d98c3bfa99874e66ee7cbc
 DIST gcc-9.4.0.tar.xz 72411232 BLAKE2B 4bb000d33d6bd2d6cc91c040713f27f79dcf726ef8ab1542c711e0c25651507628510b1373bc73aef71ffb660afddb2eb8d8c8540f5f1498ee243cfff6c0be67 SHA512 dfd3500bf21784b8351a522d53463cf362ede66b0bc302edf350bb44e94418497a8b4b797b6af8ca9b2eeb746b3b115d9c3698381b989546e9151b4496415624
-EBUILD gcc-10.2.0-r5.ebuild 446 BLAKE2B 457a8d7dffd7b9e2838578b22e8aa3e1be75f93124ef0a018df1820970fa3fa11fa55b0c2d0c4819f6a7c407563163558ac8716bd468805fb17b91fb7b2fcbce SHA512 1223c8c71f1a6bb7f5d0862071593279708904e0c377134090c3ce3883e40471b49111f8740bb2042c38759c811cfda8b64250901a58a9246ad182d96ec293bf
-EBUILD gcc-10.3.0-r1.ebuild 452 BLAKE2B 283109b3e26107988f0a69843767cae1039b6ebe0d04f465bfeaca9bf557608b8409287896c8d69388e13d43e9d156feeb98daff605dc2d012c290083cd0afc6 SHA512 6d8ad6930e0ede1fbe6a99ca3efc5e8f7bcc2f8493f038711faf163192d9b866bfd325650ce23effe0910b8bcfde635560e95a0560181f9c8aaadce6c4579763
+EBUILD gcc-10.3.0-r1.ebuild 448 BLAKE2B 452e8a0efe85f778cb14941ef9ace829dff846b4468487980bfa9aeea64120e7f0fbe487dc2588756ffe8edd23ba83fecbef2d4047a3ace8d116b98bfdf89e38 SHA512 42c28db455c62214a49bd43e489fae6982f96384654c793494eebb4cf0e86c719a0e590af5d4169a598093c383e53e0709447555ba707b4e4caaf1108e6100ce
 EBUILD gcc-10.3.0-r2.ebuild 454 BLAKE2B 0de39fc69fdd7684e75614d7af30b0c0113e8f770839fafd133041663ea9dfdc73beda6f95774f8c0dd1eb01b9acc358b2810b381a41ceae2b46eed6c8e18e0c SHA512 a5e61ec3f2e9b8870ab80879a43ca148ecd6310f02a82f123c7a4a5f93380372d5e9f6ad21cf39370eefd34800139b7626529a49f1ee7b2bbbd337f7143dc354
 EBUILD gcc-10.3.0.ebuild 447 BLAKE2B ea4aa1b2beea36b702347947e95094e936c687404d7ae42061bb739a449f65acc887a2a57349cf21f470c856759523912751a32fe28bd2da84169ee12ab1ebce SHA512 b39876cce4822b1199ee4f62d2583e37f051f9d9b2d95e236076263399b07cf899cfc3b5e65218a8fe0e1bda13d9e0c26013986eb96d335b1026921fe20f7f1a
 EBUILD gcc-10.3.1_pre9999.ebuild 649 BLAKE2B 7c2d1e2d939433104d3fb01de2dbdb12b6022a503d2252d8371f699577eb289276897440113bc70745deb7057819d63890be8c0fd0022c02cc6d565fb1c1307e SHA512 eaca9dd9ac89a354beae99d38d7df2004289d281236f4a41457afbba563dcc8f6c1bfe24e8ea9219019c2b7e1c9abb67f428c96389fc9f6b8263db2af66ff3ef
-EBUILD gcc-11.1.0-r1.ebuild 454 BLAKE2B 6b8367c626296ed37660438eb4447698b053617ea4663d1b34f30559d6b1e42944b330492f69d66b13042440674a785c5410a2b7b19d0b857b8a9574a88a8ffd SHA512 136b2c2654ad8f799c65ebc880f3597c79e30f6a1eabf66484eeef5dc1e0c5961d1053dd245858bde0a985b14e74dad3990427011d2e8c222290e409e7aa3e3d
 EBUILD gcc-11.1.0-r2.ebuild 454 BLAKE2B e99d90cca50914b672f9462925c18484b55d73478e3cdfb45f9d9999333cbadb64047087aac25775e494c750159fa118fd0014843cc93d7b2046f6458ef80a52 SHA512 0209cbe81e71912fe53cbef3ca3bd048951b132f79c2d3a39b9a847032f3f172c1f5259d13f23b0a3d9bfec274c98807b233b06233333ebf28b4f00656e67285
-EBUILD gcc-11.1.0.ebuild 454 BLAKE2B fbe3eddd0a4daac59ae8dc821ffbf6fad2ce6cc84a2eb534c7ea3fd1cef6bd28e4c5e4b6fa30028e2a10daf18ef63046b8865f527c021fff5d7a2a57fb93daf6 SHA512 ef018491e72a13e18b28ab878c28db23a5c91af6b86102cc325651ecc20f27b840dbfb367b643c1203ef1f2ccdbe7a7fa84aff225c8b0b974c0321ce256f8fbd
 EBUILD gcc-11.1.1_pre9999.ebuild 649 BLAKE2B de4b651b108ff8d9923e377295d1fc5338bb86305200766e3ba922cc0266e14904feeeadd534ea953c8771bed0fe74dafb4a1b31fd0789d143b355def18ee0c4 SHA512 7ae3da7bc046186cebebf2e2217db6ea594a5b43af5cb201eecb754a64f324f7da7c0b99cc3696bf8ba8ffacad8dd7f813150d43d1b247d3f62b842efd3e9d0c
-EBUILD gcc-12.0.0_pre9999.ebuild 530 BLAKE2B 6711f72065debe067dac4ba251854dbb9199fc2a763b0b9a016aa8444446ffb9df57a9b94f6d4cb3126defcedbcfc6680f8012dccbb98e4252f7f9e665593c0b SHA512 8392389fd8a3ef951b2d5522df365c6e43fc6737b0a973be59633a2ac303dd962cf953ee7d6cc7604aeb98642f8e676cc60231aab207cd127879a1dd30c0b8f0
-EBUILD gcc-6.5.0-r3.ebuild 437 BLAKE2B 876f078017272532c785511ad26ee578a8a9f2a2f3af8513a736d2953f673fe9a6b14636a82e265dbe5ff0658a692557fb4bdffb4bbe434337711fd1db4d5b1b SHA512 6a18a2130439fa89e1589046759b3dff1b2631cce4be607b221b5d5ea1c3a90815ab5fb0988a4297a1d3b0478a993830e18d2571dc3357bfc15483c0d5a569ed
+EBUILD gcc-12.0.0_pre9999.ebuild 530 BLAKE2B c3c820c72fdd572ec504101a905f04e10ef18d13afd54183227f49612f22e5eced8bd1a6edd72e924f5b13dce89434acd02962d7dd744e6b7b174b781d33b1c3 SHA512 a47c5ad7d191db46601afe6aeedfb1bf957c2c48fd71c4fe734ddb523d5662eb599f876eb00ceb8f4dcd574bbc8aeda3ee1d3a6194fd8265ebd38e850edeea44
 EBUILD gcc-6.5.0-r4.ebuild 445 BLAKE2B 2f3d0d7d881671cb42296b53441f8c379bea95dcb83348fc9d993b1c586c828a82188ca39688a728a32e1d37f19a5bc5148e339654477c5383d90e29dc527ca3 SHA512 1c2fcee4393c001dfe1718ac6bc7ace20df0b77bfc9cf1c94683a60f3c0d42cf62b8e6afe4d8938937eef870083b7026491cc3c4952d67fa81894e543ec4653a
-EBUILD gcc-7.5.0-r1.ebuild 448 BLAKE2B 23ddd9c8e9948b14c1dcb2d7c859bc552393ac164a94c9c13db396bfcd4a2acca197859c4c0b5680ed8b1b484db3547f952b3a8a4562945ab7a1940df0ca6776 SHA512 b5a4bb11218b847a95e40775bfd5cccd04e6a4e9d3ae9bbc225c6d19d0ed7dced9500d4cf3318b91b3499d40e3d134bc9e5bf658f9492a4ecc0060a3b7dbe69c
 EBUILD gcc-7.5.0-r2.ebuild 456 BLAKE2B 4d675d65bb34c51225f2f490409ed63f0f95a3f9bec9c1e034127ad0ac4fed7f104fc5febb761133873505807c6cc6b44b8ce8d51d0faef26843feed6cf1f933 SHA512 057ed372182d4bd5afb51459e0bc563fa05590feb5e0a859123a2d20d9f052cd23d2ac70923f58c827ebec3e419cfb6cb1d370feb58d39a02089fa3bd4d90921
-EBUILD gcc-8.4.0-r1.ebuild 444 BLAKE2B 9ccc45a2aee8c0a692f7b56efbdd817d5a9202a531de95dfc09a283dc67494df97843146bca9aca701522c22932036a9236ea678f3d643d049faa05bec53ae22 SHA512 d2fefd74e875ce17e2f4bf8e4135bb36a45cfbb1ab7c7ff4847eaf53a368656c8e5a1eba039a909623cc4bd4f4905249da6b291c7327b791a25dbab0008c4f5c
-EBUILD gcc-8.4.0-r2.ebuild 445 BLAKE2B 2a338d5c15c368d8b2e6e9d723f85819850b6fb010397eec72b1a873b8c4f9700f0786e63a09840900a4fdd16b9dda9421f9f5192bf922bf1c088ad22508c3fe SHA512 1ee71f7b6138366a6f416d8e7aaa72b00ee798e8b2c098c5cdbebfd5bb7c94268aa4eb618c29367755ae1a6cb209245dcf4456005121b7a4f2dd26d779030401
 EBUILD gcc-8.5.0-r1.ebuild 452 BLAKE2B 5ac3065a75d23a3e5237ba6fa1b7961fc643338e5cd98ddecb66305b442e06458ca9a7c553467cfa24ea328a862a283623f477e1600aac012adce50ad2ffd522 SHA512 4dadf7904ba6a82199710628afb03b158caca2893b77f6b999e8098a9a155013c9785307ab16a122e6ed7d25b93380a79f571d2e4c5e4eacf9a132ad7ef713a3
 EBUILD gcc-8.5.0.ebuild 444 BLAKE2B 502cc25c645a8568cda444c75f5ab23498e121b77e3d50e100fa32663707f61ff4796bd13b54d72a6e2d348b7b50b0f783e1a24f6cf94304094850f02fc371e6 SHA512 696de505f81344d66c437d2402b9b45b4a8c9dafbf65d2778c3b178a74b86892c6c48d2f41db7ad79ae615b33796b366a33e8dfd438ae28615c0e43a2b4e6d33
 EBUILD gcc-9.3.0-r1.ebuild 444 BLAKE2B c685901b60756470f23e04507cff20f5318c08a53aada84f45ffb597b9ad4e73f2c8cbfec46eba9e7bbc5dd79df128da1348e42b5dfcb31f45d79df000546ccd SHA512 798982969ce659602d05ac1b29e68900502384cf76d9ed1c1b1867e6ed0329045e11c1d1f6895e659d2175feb27e12388f4ab27ace6e6c978a57905bd95a9874
 EBUILD gcc-9.3.0-r2.ebuild 445 BLAKE2B a64400ef8197562d691c905b9cb999c6725bc803b3cc544d14bfe14fb73b24d1c8fca8a896d4baec35d5b7b8ac070bbe73b7453146ebb35f37792ac11c32490c SHA512 4e7424149d44b289f4cbe53418cd93d76d3209291d98615d41460665eb884eb54389ec75da24362587811baedc5a3cea4ecf710f03358e15ef2068b4b5565f55
-EBUILD gcc-9.4.0.ebuild 449 BLAKE2B c38cd6b3b6e03902c17524467129a02e426d06a11ae454ed2584aff52c07d67c437b98caf66f05eca3f7f3c8497b9a84d485be63b0f94dd83fb332267363a65c SHA512 256de517224b9e38c9f60ad602e3ce8cce21dfebba0bace5c60a52edd9a969740d7ec673975444042dfb65c90cce2857c996c6d3f2ef63320caee47c56bb3bcf
+EBUILD gcc-9.4.0.ebuild 447 BLAKE2B ec9816f03fa2a18c0ec61d209ed1997f8150852ce548e7e28f3b2aa3c4566cfccd095a4cc50d25e6dfc373f533f4e6754b3f45506be4a88b1b395c1105702f42 SHA512 20830d6739ab72d65a3aca53f879ce7ae4dcaa5b151eeeec24ee5aeac20ca13b949d8ece516add29031806d46fd44141b338f7341663ae448b6e220ed01cfba0
 MISC metadata.xml 2704 BLAKE2B 3e64655ebe03af9038fa2087b8d929e05136f833fe8667d2e1452a5f5140a1ffa64e39eb7e8e26859cf390d3a2b32842e41fa492697acd8cdac1336a34bba33e SHA512 dc9ec372f6feb99232ab0599351430440b4ddc71e2bf2be1ca4cf235337acfef5443e3ca44f12438f1b0f654b8eaaae66622728f6bcd8f15d3db78374ab781df
diff --git a/sys-devel/gcc/gcc-10.2.0-r5.ebuild b/sys-devel/gcc/gcc-10.2.0-r5.ebuild
deleted file mode 100644
index 03ab3d6d9ed4..000000000000
--- a/sys-devel/gcc/gcc-10.2.0-r5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="6"
-
-inherit toolchain
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-10.3.0-r1.ebuild b/sys-devel/gcc/gcc-10.3.0-r1.ebuild
index 6a6c8083e88c..d00929868398 100644
--- a/sys-devel/gcc/gcc-10.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-11.1.0-r1.ebuild b/sys-devel/gcc/gcc-11.1.0-r1.ebuild
deleted file mode 100644
index 8249dc84117d..000000000000
--- a/sys-devel/gcc/gcc-11.1.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="2"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/21_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-11.1.0.ebuild b/sys-devel/gcc/gcc-11.1.0.ebuild
deleted file mode 100644
index 8fe90739f9f6..000000000000
--- a/sys-devel/gcc/gcc-11.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="1"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/21_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
index 1b0bb53d40b5..e804e6bb8c7a 100644
--- a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PATCH_GCC_VER="12.0.0"
 PATCH_VER="1"
diff --git a/sys-devel/gcc/gcc-6.5.0-r3.ebuild b/sys-devel/gcc/gcc-6.5.0-r3.ebuild
deleted file mode 100644
index 9cea619a7e52..000000000000
--- a/sys-devel/gcc/gcc-6.5.0-r3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="5"
-
-inherit toolchain
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-7.5.0-r1.ebuild b/sys-devel/gcc/gcc-7.5.0-r1.ebuild
deleted file mode 100644
index 689958930bd1..000000000000
--- a/sys-devel/gcc/gcc-7.5.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="3"
-
-inherit toolchain
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-8.4.0-r1.ebuild b/sys-devel/gcc/gcc-8.4.0-r1.ebuild
deleted file mode 100644
index e5b72b981c98..000000000000
--- a/sys-devel/gcc/gcc-8.4.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="2"
-
-inherit toolchain
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-8.4.0-r2.ebuild b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
deleted file mode 100644
index 2f88dda2bf46..000000000000
--- a/sys-devel/gcc/gcc-8.4.0-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="3"
-
-inherit toolchain
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-9.4.0.ebuild b/sys-devel/gcc/gcc-9.4.0.ebuild
index a27042634cf5..96796a936b12 100644
--- a/sys-devel/gcc/gcc-9.4.0.ebuild
+++ b/sys-devel/gcc/gcc-9.4.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 477b343a9200..a7940daa1d97 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index e5ec417d49d8..c67f2375f237 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -16,6 +16,6 @@ DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c
 EBUILD seabios-1.12.0-r1.ebuild 4058 BLAKE2B 960efadabb9000c6aecde46e41760d414f92f7b915ae546faf831cd52954b8f78e98419faeb54200189d0210c2d72057fa05997fa848fc10a42cbdff3d665a47 SHA512 9a9fe25e5766f9fc88fc22ac3fe796a3229a36bdba5c08a7648df8dcea0e8502fa9ada2ab3ab1aee2466f67bbb678e3e500ee99e2fe24b3e8b77c4bdded33a32
 EBUILD seabios-1.12.0.ebuild 3439 BLAKE2B 4e88e25af3df5c52d44259b8078f2c6a7baf5d88dfd572ab7e25c1d0a35737eca941002fb2e111a70143d95af61b012bbeb1da7e33a1b900471a4c3720cd6f70 SHA512 7e9a0e45766736bfc4aa71736aeee1e5301a044cb84f0ea7060be4cfc2e6f7da97ca789d136b85911d05a25aa1abcc6f644ebdf2da3c5e7a4371171d18614423
 EBUILD seabios-1.14.0-r1.ebuild 3921 BLAKE2B a09d2c72a1403fd258a62e6b7af04efa19316ba3a9c042467ad1afba80176391c27b8e5f10d45ba7fa5894b541c3c7af1d4e4878d076a93ea530b96e14f26535 SHA512 8b9793cd7d7dada46e7b6e25c314e5227950e7eeed7608ecc2768b9f640c7d10a91db2b6e6d8b54e36c2c196ac907db781023b440ec360caf7dbeae6c6a9cff3
-EBUILD seabios-1.14.0-r2.ebuild 4301 BLAKE2B 20170f07e98923f4dff387ca2aba5a79aa620fa7eea042c550e56e3dc7ffbda5e7e423afe4dd13d93b35b2b0633f28688967986332d9789667303bbf2ad72102 SHA512 6458ca85ffaeed8f21ed3697ed4e4896752459409cae0041c5011eb2e2cdf6686cf5a2ba691ff33e74fd80c9abd6276b983a7ddaea4367f5524ed32bf9a4aeb7
+EBUILD seabios-1.14.0-r2.ebuild 4300 BLAKE2B 8e38950eba25614f57641b009f5dfd5915063589fa4ab0e4c9727be0bad83232e32782dc1431a46c624243bca22f088af3434ab24681dc4068db3dacc8da95b8 SHA512 e61accc0b997bdf5c63f2b17c1997ccb1ea1da9aaee15174e7cc45332199d4153d293e9685f6bbc5a9ba44b541e04f84265cf78fe232f344e7597a6ed1428c90
 EBUILD seabios-1.14.0.ebuild 3772 BLAKE2B d85c7bcbf55536018caf679e2d611eedf5536557aa6e6f7a76e664b9db3922fcb40b4d19c8dd2f29b711f9afbea824537dc7029dfd3595ef388c8fa04e6d482d SHA512 7b67858c146b4e7a515269d32363fc2cdbee0f4a36b094ddf60b9f2c8fc34f74d82d9364d19c6dffe3d1d56f158b2c232b4b3b114e37c13d0f84907cd87dd033
 MISC metadata.xml 551 BLAKE2B 1bc4f5bcc0dd85ff4e14ededc83e631c942995a8f0ba9534d72b6d5b671ad471eeb0c43a02ce4cf7c0b79d7f0d5583d419c46aaa8c297f1544353b8f42cdefa4 SHA512 5a580198036d96152d46c79b19317e35e5ba15f998ccaeade825189ee640a6ca50552a46f56f783ebba288df3953d461695039539c47baa27e3c9da1f8b1ccc0
diff --git a/sys-firmware/seabios/seabios-1.14.0-r2.ebuild b/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
index 14f243acf1b4..22c08e1b9bed 100644
--- a/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
+++ b/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
 	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
 	inherit git-r3
 else
-	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_URI="
 		!binary? ( https://www.seabios.org/downloads/${P}.tar.gz )
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 33e4da92cfc5..7eca20e48d0d 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 3008b3a8dea3..80e76341e978 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,10 +1,8 @@
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
-DIST btrfs-progs-v5.11.1.tar.xz 2213548 BLAKE2B f428e8ffb62f60e6772102f4623b9965edc5d18fa60aa8cb60fd92b4867ee29e3067a6b9d0935c738acce5f0abfc4b88c900121ee233aa881857ed4690e38e3b SHA512 f93a54bd2256851a74fc8e52b26f697bd7bf788cb2481512c92ebf1b9a2f2968b62d680f9f000d6162bd6f22b5d632b2149a88adad8c489e1332f810b439da90
 DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
-DIST btrfs-progs-v5.12.tar.xz 2220396 BLAKE2B be3eaadca7386ab1348c4bef6cf10270a42ac34c8e7e1cb54b9db600fde6a5958cff9453e6c287fba23f928116eeccca5d90f78f9c042b972a3ac66a31566e3b SHA512 af9ab8bf232e0c62cc093d848b95991924cc3a84020fb9c85765a63a1cc132403e784bf18f81b71b2af9daa0038a7b11e578ee7b50d90481a888f7a967a5b197
+DIST btrfs-progs-v5.13.tar.xz 2234256 BLAKE2B dd6dc6977c2a21471b59573c3ae6f7853d5ec4434549873174a6bde6b3ed4c5ed03c5adaed896538cb74699f538ec13403c193f132fcc8a2ba1b4f6bbdbac67e SHA512 7832ca02b77410edd8d80f10c6f1482dee944073518dbacd5773e70f27b7c632231ea66bdb64aa4611869465c15d2d60d364bfd25c2e40e0a2c198edbf9741cd
 EBUILD btrfs-progs-5.10.1.ebuild 3064 BLAKE2B d0bbb45eab6acfe22503d7537d29d40d3182208c57617baa476e993fb105c0057db34132f03391eed7683da07ffe9a059885778553522a434b21717ba50ad822 SHA512 8b24f2934aee146ccd6e9ac06f5a0b12b90263121e2e6a976ac02774bca0c9f4c3d0f2a7d14e79c026c87c6ed6576ec3c07375607d55ccbb2879edc5b5a84d17
-EBUILD btrfs-progs-5.11.1.ebuild 3070 BLAKE2B 56289d7f3b80ee4370957694f696b9b3862b7e050d02a1dcda2564eabb68abf20b841fa8259475ffdbe39a1f092a268a79579bcf5526d3dc2a3d35eb7222e41b SHA512 1fe2eaed192f6a96f9eb3adbe41c58e58b282ac120e3ba44a792004ef6d26d5bea05e7c091417461d8d032373f87ecff4bf1a871000e1bc16251b859723d4ced
 EBUILD btrfs-progs-5.12.1.ebuild 3103 BLAKE2B cfe3377527fb701da2cf02fc6857a828cffa42f3b672854e12dfd355a5c3e52708df6bc74f00abdbe0548220220508a090039ea9107cdaa0dcf14e80eb2d00ee SHA512 feffef7dd3b8be3da822a2fa5d5bcd6465607b6fab93df44630cf3d1b386e80669d88537b433cd6cfdf21ff98a3011393106607b213f89c55b99f7b1570307cf
-EBUILD btrfs-progs-5.12.ebuild 3103 BLAKE2B cfe3377527fb701da2cf02fc6857a828cffa42f3b672854e12dfd355a5c3e52708df6bc74f00abdbe0548220220508a090039ea9107cdaa0dcf14e80eb2d00ee SHA512 feffef7dd3b8be3da822a2fa5d5bcd6465607b6fab93df44630cf3d1b386e80669d88537b433cd6cfdf21ff98a3011393106607b213f89c55b99f7b1570307cf
+EBUILD btrfs-progs-5.13.ebuild 3103 BLAKE2B cfe3377527fb701da2cf02fc6857a828cffa42f3b672854e12dfd355a5c3e52708df6bc74f00abdbe0548220220508a090039ea9107cdaa0dcf14e80eb2d00ee SHA512 feffef7dd3b8be3da822a2fa5d5bcd6465607b6fab93df44630cf3d1b386e80669d88537b433cd6cfdf21ff98a3011393106607b213f89c55b99f7b1570307cf
 EBUILD btrfs-progs-9999.ebuild 3103 BLAKE2B cfe3377527fb701da2cf02fc6857a828cffa42f3b672854e12dfd355a5c3e52708df6bc74f00abdbe0548220220508a090039ea9107cdaa0dcf14e80eb2d00ee SHA512 feffef7dd3b8be3da822a2fa5d5bcd6465607b6fab93df44630cf3d1b386e80669d88537b433cd6cfdf21ff98a3011393106607b213f89c55b99f7b1570307cf
 MISC metadata.xml 523 BLAKE2B 7757fa4d4f1400bf08e2975e5214a1dd0c8258b61366c98089ca9c497b8c62e497cdedad605370f7034519b91c266b23e2e42bcafef3bb2bb69cb6b93319fa00 SHA512 3830f8f555ade672eeb52394a5b262e06e69b8b27d947d81dcde9b341fea9f16b77df8101ee5cd3314b6552543431a5f32a2592bf77a7a50e28cc56c95a4b164
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild
deleted file mode 100644
index e7da9aa59cf0..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-BDEPEND="
-	doc? (
-		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
-		app-text/docbook-xml-dtd:4.5
-		app-text/xmlto
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable doc documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-
-	# install prebuilt subset of manuals
-	use doc || doman Documentation/*.[58]
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild
index 90b1aa08f672..90b1aa08f672 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 45c4bb714cc5..54fdb74719ba 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -5,6 +5,6 @@ DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e9494
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2 SHA512 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
 DIST cryptsetup-2.4.0-rc0.tar.xz 11145080 BLAKE2B e6425a54d14d93b712df42e7b9460e23afb8bcb74bbe164522a2399a26d3eb668bfcc6387e5934056cdf46fcf0c136601dc1617dcb96ded6d4251a8335442e27 SHA512 ed80cc7a1763cf0e788bd72eee979640d6133b98a7b294a3fa09c608273eef172c2d56d80802433143d01063a0c142e68ea06465392b273fc2615b8f90273b25
 EBUILD cryptsetup-2.3.4-r1.ebuild 3853 BLAKE2B d66f995f69cac742d0d1e6c22bccda546c49c74fc495fd43dad6469cb948214923f85119eae86f8d87989a6f689d20113048427d6238f2ee75910274a1fe3512 SHA512 ad6cd0dc0f2ca709ee380046c2d5b5b23f198fd2fff59197f052138b765752ee018b24e76de3ad929ca15fae14d736b25b643f7055f682cc02b61de4083976b6
-EBUILD cryptsetup-2.3.6.ebuild 3854 BLAKE2B 1bac5b091ad3fade727d2c5dafb797c4ca8f4f7a435cb43e13ca7b81e76ee7196f2385c596bf3fdebb08cc5159c48b6c26b2beae8c9789a6434c6ef73fec9216 SHA512 4671b8d6d72f45940ff305ee2b48f708d66de9e14fc24a4bf785646a98ead9012ad876aa79a8313226152b7e7be46120df7348c554051cb06652383323cd0063
+EBUILD cryptsetup-2.3.6.ebuild 3853 BLAKE2B d66f995f69cac742d0d1e6c22bccda546c49c74fc495fd43dad6469cb948214923f85119eae86f8d87989a6f689d20113048427d6238f2ee75910274a1fe3512 SHA512 ad6cd0dc0f2ca709ee380046c2d5b5b23f198fd2fff59197f052138b765752ee018b24e76de3ad929ca15fae14d736b25b643f7055f682cc02b61de4083976b6
 EBUILD cryptsetup-2.4.0_rc0.ebuild 4063 BLAKE2B 0bb3d1c586db729de6c1d2a48ed8ddf3e0cb41dda4185797b48dfab31bb61633df662b1a200f83285a48b1ed2c6bc8139066f2556e3742851639f3d5b8767c4d SHA512 50f77d38592217e2f72dd866c54115e52a2dbcea0c8a1feeb68cb11280ecc590f03eb1ea6112cf9d3b9ff730a365bc757b235a5a1f30dfbf9d0b83039f44a527
 MISC metadata.xml 1075 BLAKE2B cd8afdb9fb1117d48e88b4aa6dd7ec9b6e072fe12d8880de6dd4dfe2fe018bf25910da08056274f43ee6b93e672041b25f214694b2f6e46bc75c8fb63318b1b3 SHA512 6539b510c89c1e335897c7c32550f86fdc0bd7958977fc9d4188e664a21db84c8b333938a4e03e147f023d1404ac6291999a4bd943a131bbc1bc26d907877e25
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
index 9d0266bbbdae..e96df12d24be 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-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"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest
index efb68caef8d6..7078d8e1489b 100644
--- a/sys-fs/genfstab/Manifest
+++ b/sys-fs/genfstab/Manifest
@@ -1,3 +1,3 @@
 DIST genfstab-24.tar.gz 14281 BLAKE2B 93987794ba12e08daefd20ef596e915a70a11a9e641470b6f93873b738b4c4bb22f808513c63e7675cade43b992f308d26f3a2db0b211e99518a3d3702d6b897 SHA512 8c4d40e98b7a35abcd5fb2bf496722aa65819e4124a37385090fa70b55118ea3590ecb4e16f117bf93118a36bf402c4616ba0cb1837869b11db54a827332c661
-EBUILD genfstab-24.ebuild 465 BLAKE2B f0a595b1f929dd1033c7266f889c9262a4577e3bad9282321042390d4f8ce7a610df80b54903ca1586e2a9a9f1e707a75af72cf0f898ead342e4dbeec757f661 SHA512 9a42728709900e0e8c691e527e267798d58544e337bada26a037db136d8cf09923a2b71e9e06c2cd2d9816c0bf7dc7df4f14b9b1ac6719f3bf6d1c405efba562
+EBUILD genfstab-24.ebuild 464 BLAKE2B 8157fc8b781e77cab58918e6fc4b5092c14e432809f57a35f2630a1d8312231f536f3bb1592af71688da9363cb5c13b0a02deb61f24fb4f85adedbd87834de13 SHA512 f722595cddfec818b06ded7f353d63d64f2233574b2626b0a3f9d1cf64395294f4ab04e9075b178fa5d6228db362f11438035990cc3f5a352021aec916dc3f3a
 MISC metadata.xml 468 BLAKE2B b299a989190e27686497f3aad1f8b3ee071ab3bc488e4d3669f945057c604dd3aaf1679f4c51e44fc5739557325ce22f5bf2df4a0c75e1775d9d5c11969141e4 SHA512 935bab43b088e8bd1fcf4995616dabcea498f8e8e8483dc6f3bcd67e7114400b91eed55a05d47e907efac8c81c0e13560effae85bcac19d01f24b01f3b97b11d
diff --git a/sys-fs/genfstab/genfstab-24.ebuild b/sys-fs/genfstab/genfstab-24.ebuild
index d26d48dc6e40..b0dcb0a50058 100644
--- a/sys-fs/genfstab/genfstab-24.ebuild
+++ b/sys-fs/genfstab/genfstab-24.ebuild
@@ -10,6 +10,6 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 BDEPEND="app-text/asciidoc"
diff --git a/sys-fs/lufis/Manifest b/sys-fs/lufis/Manifest
index 4e69e5b409e0..b2b3c1c123ce 100644
--- a/sys-fs/lufis/Manifest
+++ b/sys-fs/lufis/Manifest
@@ -1,5 +1,5 @@
 AUX lufis-allow-uid-and-gid-addon.patch 1090 BLAKE2B 49bd9cbec1b101174b0aab1a11723104a858ff68652f960e14ab1b05e24a70fac014e8fbf6bf8c611671783579bafa93a4cd983c2fc43b34556de0af9466d534 SHA512 7e5680560b624e033530dea158684d92c134bd8b73ab0d9030eb2c73416785c546915aeb8e13dd815730dca65925659394b86c0a8ad1b94acac04e8e787762e4
 DIST lufis-0.3.tar.gz 18158 BLAKE2B cad5154f244232262ae3fef7f792bea58b18019e29df8c0763cf39a6d61bd84abc030bcb3e20eb47a557a8edcde8f7ff1ea6c9873da885bea5184845f15e54bd SHA512 86f0c77e748ab7ba3f92ed9563011e8262b435a8878bf3629c8fa4a8e1bec058249a288e2aafd395f524748b419a599c6533900348b4e23239f47930a874e14e
-EBUILD lufis-0.3-r1.ebuild 635 BLAKE2B c18d3a14093862628908d35c605f66754ac2ce1d51a70ada29abf3bdc09bb254f511c28e5cb3939c1286d6baf75f08859634abee3c588c5584642f22bf864c03 SHA512 096b4132956092042f269eeb833e4d6d907d78e1fd29755f78581ca0b9c340dc491a1bb038449fff54cd3eaf4bf3d6306b40344b09e1328f911193c530438003
+EBUILD lufis-0.3-r1.ebuild 634 BLAKE2B dca854b4bcb65c5b9ab3dc90fa49db8ff2f8630c160b9a8c266e4bdbf41a86d6300d8c1202bbd455e7348d79617192d084355b280ef328a381dfc06d3c47b33d SHA512 15a26248b7c630a0ab311a18d785d0d4d21294bfcb2e203035d1f062bdce618a80cf5a51cd236ab594b3a1bbfcb7791ff8a946d4d2793ff4543c77ae8b4c26fc
 EBUILD lufis-0.3.ebuild 622 BLAKE2B c06f03c41e5f1b10b023c6ee6eb2a0db6ab8f378c3d4c4e5c8555209428d0678d0a1ddae79b501d04972f74e7e1a7fc4ff94a8360f978b3daad3adbbd93bf6c2 SHA512 b951e7334dffb752df47920e1482dbd57590ad02df59f9e9278395f33f8e20c82edd22330b5251d68f013c60719289321ad6e5aa17707067dda813db2dcd032a
 MISC metadata.xml 246 BLAKE2B fd5580dee18582c2dcb849e4f5f46b7f430a240ddf6b50d7ecd3b096a72f55cf7e16206474766dd4688fb3d43c31fc85523a897f15e613e8ed013f91950241dc SHA512 41ea0697fbdeac910a35652ecb4de0a35d7a531956c7c0ace6364c9cef6e1348ecd427a1c5b9301b779d2f189ffbdcd04c7c9f59fb429ef73b75af9d140a92af
diff --git a/sys-fs/lufis/lufis-0.3-r1.ebuild b/sys-fs/lufis/lufis-0.3-r1.ebuild
index 5f2f2645949e..a7f5d38b0a24 100644
--- a/sys-fs/lufis/lufis-0.3-r1.ebuild
+++ b/sys-fs/lufis/lufis-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index ad563bfc3489..4c4604da9d4f 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -25,6 +25,7 @@ AUX lvm2-2.03.05-pthread-pkgconfig.patch 1442 BLAKE2B 6d2864c91fc38ba3c8e9764161
 AUX lvm2-2.03.06-example.conf.in.patch 1833 BLAKE2B 21f9d51be4a704417dc35ed7d5ae385dab1376e3f25c030d215fd3b5d0a495f97d4230dd13cf88472b9699321f091ce90ac7162644f9c7f04ed9d8c5fd0eafe9 SHA512 49b0db05552be36153986322e28098ffc006ff2bad3fc91de99ce63f75207b0bbdfd8e4cdb5fb07decb4a84c883b552135a8b203186a10f2360a3616caf10957
 AUX lvm2-2.03.12-dynamic-static-ldflags.patch 2591 BLAKE2B b1edda6bd715d805ae12967ca453e08859c44f5e48d32e6d264682a6aac6a27fb47aa8fcb36b68b28e3237d76c8b5d060b050736c38d6913a7647b6168a98c3d SHA512 5c9c1d65579a14585c68a348c00b867a48398ebe7a871e6bfcc8cd3a6776c260aa6200f22c108f95ecd65b61ba4b260a5e6acae17dc8c9e639692bbcca2bdf37
 AUX lvm2-2.03.12-static-libm.patch 1000 BLAKE2B 4bde7eda80a00f7c692341ebc74ab30308f3157162caba4d789dac42318fd5a16d6b1471463bc2a1f02f50313ce274ecc5aeb039c90e0b979d73146cc9497fba SHA512 cc7764fdaadd767e88d68a3a071f72a7ce30e5bc98fb55b49cf8ba00c3c5a1cac288f2aad0fec94eba5dd2100108756f1315b9704e872d7d64100bbeff1b7a17
+AUX lvm2-2.03.12-static-pkgconfig-libs-2.patch 1260 BLAKE2B 3ee43306af649c4d23ac9b096f0649b48f40416a6e77098e449429e6b8a881a23e8e1158be72ab4c2b5d9bf11dda4b983da1b03d13ec614250d530b57d6d8ec1 SHA512 94704e273c82272fcb3e77da66894204f96bfa28343d3f3edc3aa90aeba6334872bace17c57c64cf35114113cd6d20d628702d1516b7c1296f6ceafd75c5c3b6
 AUX lvm2-2.03.12-static-pkgconfig-libs.patch 4438 BLAKE2B 0b24f49401f0ac5c440e3b6dbb768d368ed30609cdb9720598700855c2d8394feb5f495945ef67129ce3897b50a1d029ac8e46a7303461f2163b52605b694a02 SHA512 a68db7128107220631db0b3752a1c4ff89d376a50e71700c24ed12833a1a1394caf88769ab376277a838f1878991c0c208b3d40e61ffd616b988c2f6dacf3095
 AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf951477445dd619a052f50cab9da39d8a38c9d480fc2d20fe899e01dcbcdaea0696d5c3e65af128652feea3186857d206e SHA512 f3143c6e1d00893009c68141f5ffd7e1e6bcf5b7ef0ff8505bc6c7049d83b2f9ddd2dc5a3cfdc2641a20603830b5dba07d73740cc5ce82e6b1b602a9b737a241
 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
@@ -32,7 +33,7 @@ AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b56
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
 DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
 DIST LVM2.2.03.12.tgz 2594040 BLAKE2B 4e5630f27c818b79a1241b96a9d58d7078ece4a061b9bb4f26fddf77036fa2a319cc4f23835a6c784b025b3ddd07a18ce0a7ad3038fc90e90c2990d309a5d64a SHA512 e4d3bfb38b346251a2ea2cee7b79f2e12ed407652b659b35b65f58c8bb252943cee1c511713aeec8ff3400790e0e99ea6b83e8740050defe5cbb118f18bf7700
-EBUILD lvm2-2.02.187-r2.ebuild 10034 BLAKE2B 3a2417d5126141dd67488386fd2520856580fc82f1a9d6763373b5f3050a673a43787a7deef7b4b2ffa23558eea504e5c1ee81e2c9c0af8a9185a54ed657fd5b SHA512 d8e223ac76bb91c9596e0c9ba49dd150fb36403bd57dabe31d3bc2ebdd3c4c729ff33b2c85ed1154e4d5f38654739505dcd634ba9dfaa94f1f9d97ce7e37db7d
-EBUILD lvm2-2.02.188.ebuild 10042 BLAKE2B 6b0117f19053c1083231f5e555ddfac6467b23308eb2d8da0461038c00bbb558ecc32204ce62d6ba7bb248594048ad3d0be681b3d623323b56c5278d5ed1dac3 SHA512 e06227795ad67abbeff1ed7c57d87b0c58ee0be191b0e58abd45f859b230a3af4f2bda08bf51767550e33b34deb80735f2d81ae1176d0507aa999440d8da3569
-EBUILD lvm2-2.03.12.ebuild 9485 BLAKE2B e971fe6fc271ac3bf5f526db5b95ccfe8e7c8abe13d9368bebbad3449f218b11b5c37d97cf6fbbe389f646aeaee9b0ad9e8dd3069cd6891d983159d2956eecb8 SHA512 c9e89d9332032bb673edb4e5b7c2755722b0d67a4583c738f339b27ba271785a42e9d0d2eeb939da42115a596a25057ba10c86845e1f69bd2e51dccbcc58acf5
+EBUILD lvm2-2.02.187-r2.ebuild 10056 BLAKE2B 31cdeefe94de7cbdffe76ff3aa1d19d6f06044d6c7d25745d6445a25f811b9b05b4e513e08cfe84a41fc11534ec640757eb288bd7e6c9e02e7ec9ee20bd29e97 SHA512 fd0393f7e0a8bffb07b7bdbdee016afd3f3fccb6ba6a36aa017b378f1793049ebdfe41bc1a6ed09d7389441a0f4494b65b18d0ea951ce49dccf9c3507809b438
+EBUILD lvm2-2.02.188.ebuild 10064 BLAKE2B 77886e23d429faedd93225821f21b13ac620bb0ad0577ceca2802cbe85113ec147b1bf810138b356fe10a2a0f4d08ecf931fb559d4a1f7c58739fad600c2f14a SHA512 5759fee7cfa8df1f7d222a197e5aa9c71ae9340b445837f93af85200fdcfa68a1f16638e6671aa0313423899c1967e8e1d9f14df4605c822cb3e6d53b12ff0b1
+EBUILD lvm2-2.03.12.ebuild 9566 BLAKE2B eab74b57cfb62358727f33610296192498065c3fc7e7b1afc5e95a689db66920c9dbe77790977c34922b6ef26aec483157c36da5f294bba04f07f395d39f7e75 SHA512 10bd2e82478ddb205995d7fb0c0dca575304befeeda501a3535cc2e8a3bd96c781d5c1a6b389d4aaf1339d684f2a02a62d73486f71ef775123ba0c40d44ffdc3
 MISC metadata.xml 1034 BLAKE2B f0f14e228cefe806333830eec09a076c06985750b08669036f951e7aefb45b2482091f4da404ccce7e5180e7294adc2940311d360773a7ec72e16f96d9d82961 SHA512 ccdb84869eaa98af048d561791879796ea8a82cb2603241496ce050133402f66e0e5b7d6eab161bc9739451712e73370616698ff492377e54d8dd5582abfbc69
diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch b/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch
new file mode 100644
index 000000000000..a3a4642e8281
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch
@@ -0,0 +1,38 @@
+From 27ab05863dc56fcd7254bccf30797f9e3c448cac Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 12 Jul 2021 10:36:04 -0400
+Subject: [PATCH] libdm: add SELINUX_STATIC_LIBS and UDEV_STATIC_LIBS to
+ make.tmpl.in
+
+Fixes link failure for dmsetup.static.
+---
+ libdm/make.tmpl.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
+index a306101d5..2309fb3e5 100644
+--- a/libdm/make.tmpl.in
++++ b/libdm/make.tmpl.in
+@@ -55,7 +55,7 @@ RM = rm -f
+ 
+ LIBS += @LIBS@ $(PTHREAD_LIBS) $(SELINUX_LIBS) $(UDEV_LIBS) $(RT_LIBS) $(M_LIBS)
+ # Extra libraries always linked with static binaries
+-STATIC_LIBS = $(PTHREAD_LIBS)
++STATIC_LIBS = $(PTHREAD_LIBS) $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS)
+ DEFS += @DEFS@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
+@@ -71,8 +71,10 @@ PTHREAD_LIBS = @PTHREAD_LIBS@
+ READLINE_LIBS = @READLINE_LIBS@
+ EDITLINE_LIBS = @EDITLINE_LIBS@
+ SELINUX_LIBS = @SELINUX_LIBS@
++SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
+ UDEV_CFLAGS = @UDEV_CFLAGS@
+ UDEV_LIBS = @UDEV_LIBS@
++UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
+ BLKID_CFLAGS = @BLKID_CFLAGS@
+ BLKID_LIBS = @BLKID_LIBS@
+ SYSTEMD_LIBS = @SYSTEMD_LIBS@
+-- 
+2.32.0
+
diff --git a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
index 339b9d3d225f..2d515b2b1447 100644
--- a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+	static? ( !systemd )
 	systemd? ( udev )"
 
 DEPEND_COMMON="
diff --git a/sys-fs/lvm2/lvm2-2.02.188.ebuild b/sys-fs/lvm2/lvm2-2.02.188.ebuild
index 05bdee02a554..d685c793532f 100644
--- a/sys-fs/lvm2/lvm2-2.02.188.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.188.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+	static? ( !systemd )
 	systemd? ( udev )"
 
 DEPEND_COMMON="
diff --git a/sys-fs/lvm2/lvm2-2.03.12.ebuild b/sys-fs/lvm2/lvm2-2.03.12.ebuild
index 5a5bd509c37a..93957db3a69f 100644
--- a/sys-fs/lvm2/lvm2-2.03.12.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.12.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+	static? ( !systemd )
 	systemd? ( udev )"
 
 DEPEND_COMMON="
@@ -60,6 +61,7 @@ PATCHES=(
 	#"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
 	"${FILESDIR}"/${PN}-2.03.12-dynamic-static-ldflags.patch #332905
 	"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch
 	"${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450
 	"${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756
 	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 03b9a747708d..0f373b56d4ec 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -2,6 +2,6 @@ DIST mtools-4.0.27.tar.bz2 420579 BLAKE2B 3044fff1896427227e4585df81c208f7580302
 DIST mtools-4.0.31.tar.bz2 446527 BLAKE2B 4b954362d0c177c5a2f7b098065f841ca075092b8c49230ca4098a1a34fe64bce32d31df1aae702f12b174a8176026687de9dea5344f3878c1acdba4a8a0c753 SHA512 6c50eadcd32563b593b58984fd6426faabab208283c0b81c7df194cc27fb7d6bf873916b152c74c4800374f0b70f7dd41c768d823d9efc78cab6efbb6ee37df5
 DIST mtools-4.0.32.tar.bz2 436537 BLAKE2B 6b057be3d053ecf1ebee72b6b73324ec2cdbd7daf87c927f6ec2f6ef203345ddb869d6d7cb645e21054304ae68fc7a33e77e7a0f0cb606d3b755da36e66ca69a SHA512 a66e7483c422abdaddbe9e6b2cd0ecc2f87b0bc4f40929ac2e4db8b8d88cfacf118b126cba3207307bff376d5572170a1ee5803618de0544f68d420ed06bcab9
 EBUILD mtools-4.0.27.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a
-EBUILD mtools-4.0.31.ebuild 1053 BLAKE2B e2f1e01bc4e7ca2ec6780695dcc1ea308bd546c331486810267d494761f1cc728dd1994d531643537d603fddae96bc100a4c71082542344aabeb16bfc0803bf3 SHA512 c6d35dffd8ed5b889b44aed6518cd8aef7e647d9b03c2db36a906e87469d04cbae976b991e2cdc5b7703738d0178c08042ac380c617bff1ef30e5f8e73a77a58
+EBUILD mtools-4.0.31.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a
 EBUILD mtools-4.0.32.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.31.ebuild b/sys-fs/mtools/mtools-4.0.31.ebuild
index 87146d25de94..eba20aaf2121 100644
--- a/sys-fs/mtools/mtools-4.0.31.ebuild
+++ b/sys-fs/mtools/mtools-4.0.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 9100350e73d5..baf1d364ff58 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -8,7 +8,7 @@ DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102
 EBUILD udev-245.5-r1.ebuild 5928 BLAKE2B 5fc1655db3633cd1a7459bc05d2065a0878a43e8cf48ac6a5957a71b662f9ddce8dd18c906de8707fdf411378ffe82e71b6217f2d6e8ea0136830718af125af3 SHA512 4450cd68fcebc939de12f641f4404570e48b6cb623a4ccc8536dad9d3ca92534d5d2b44b68fa723baf24446b034193788ca4e32ade975f2e4c7413cea3f99092
 EBUILD udev-246-r1.ebuild 5927 BLAKE2B a8830dbfefdb6c12fa7e8d6034bcb9c94b0eb81eee871655e8f57bb3732d693b345588ab6e3f1c211695fdd15e7402bea08ac097c7721998f9625a77ca725430 SHA512 a113458cf68bff8881e0b1c7ff80bc4ff4dbe715dcec7f4f83b264e8f5f0f4c0153a6365ce3e1105d1dbbe8144016d94c1c530397e3ae768f9bc2bb3030428a9
 EBUILD udev-247.2.ebuild 5648 BLAKE2B c99ee7449eecca95e92f2178a2b7e0b38fc9d2211b171539af45d28fd407c31012ab0ca4b877392f39d7e42828686661abfff2ca72efe01ca8f0bdf64b6018fb SHA512 98f3bcc0e3a6277685e52e570e4a6f3d279329ad3fbe6dc0bbb33a0ee7fa7491b422878afde0eeab00223567de3126c331df1de83fa30350919f56d1e7bfa75a
-EBUILD udev-248.ebuild 5461 BLAKE2B 20ac6f812475c24362dd6258d474c1bdd611efd8c3ff4955328046b9e32862bad3b43b9405ac07525c8cedf4093da671c5ab37d2b3d3e106ad94a962e9bd9121 SHA512 ac27997375f9d2a62e37c9d6c60b49dd6d18f702113790a4adbba1800f71a775aa46c7d345c0722e31f529baecc0b7a2c029fb472ba7fcf7b28d36761977dce2
-EBUILD udev-249-r1.ebuild 5616 BLAKE2B d6a83d6572c3916eeefbe84f3dce9b0ecd839d120084b7747f0d06858544270871940d072267994155ec364551000c449d00cf99282608e5e0b2ba489ff238f5 SHA512 e40f6d47c4f9002cdcfe30aac2cc028f7b0d75bd72d39feb07215e093df5fe7c00ca49c4f7db680b485460ed70e94d32908d95a3392c621a151ea807e5b6ec25
-EBUILD udev-9999.ebuild 5575 BLAKE2B 8298696ad05cb845a59b117bec1231a25b8a1ebf3284515607b77827b69d68a59ae9fb61f66dca95bdf37072c9aa3d845154653311e9c1ecc541e1a934e4b7d7 SHA512 14efa15db19ebe88fa20a20ab2193c67bbdfc31709d010fbfa5cf793223ce8605c126fe2134fbdabb92409ce748979edb22440851d47e61019e1f9d41f4eff0c
+EBUILD udev-248.ebuild 5435 BLAKE2B 73db98a1a0f358cfde36d7ab34e61ec52a69ba6cd2189536aa3adb3d09c6e946c3d5d6d726616cc9feeb3d7c4c39aab3d3a8826ab62ac07506838448518edff9 SHA512 415134bdcc7221eba54e940be02d081e89228b54ae3efa03ee6c1abb5458592440b26cab31a0ea6e21a288933cd2ff16330cb8c9ba91f2df323a34b65fe0a600
+EBUILD udev-249-r1.ebuild 5736 BLAKE2B dafb410a1b719d4febd2366584b55c66b5967e2eaf9d14225be7a5a8ca55222f66c4c4ac15741834d15085349186be4cdecfc58ffd710b5292f53f2b5ce8a723 SHA512 af851c186240a0814dbb1992884cd7f01b7b24520138e2147a001f7de05a73b28daa06ab6a99395f09db9167345e118b8f90f46adcaac6905207ef4367ce1836
+EBUILD udev-9999.ebuild 5695 BLAKE2B b32ab2f191c4163bf0949446646dd24fcf2b6e1c08454922108e0e41cc7fc6709ee4f27504ac4bd49a387958f2c3c2359b3e4e9d1869510a632dfb77589057ec SHA512 254593d7c82cef560530a29453ac96292bc84558188e55d5533e3e77916f9cd0708fae3ad1caba750e121de1aab90d4eed098920365583361e2cb4f76d676b50
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-248.ebuild b/sys-fs/udev/udev-248.ebuild
index 676b5a0be4e7..48130385ec4b 100644
--- a/sys-fs/udev/udev-248.ebuild
+++ b/sys-fs/udev/udev-248.ebuild
@@ -19,7 +19,7 @@ else
 	MY_P="${MY_PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -139,7 +139,7 @@ multilib_src_compile() {
 		${libudev}
 	)
 	if use static-libs; then
-		targets+=( src/udev/libudev.a )
+		targets+=( libudev.a )
 	fi
 	if multilib_is_native_abi; then
 		targets+=(
@@ -166,7 +166,7 @@ multilib_src_install() {
 
 	dolib.so {${libudev},libudev.so.1,libudev.so}
 	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
+	use static-libs && dolib.a libudev.a
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins src/libudev/libudev.pc
diff --git a/sys-fs/udev/udev-249-r1.ebuild b/sys-fs/udev/udev-249-r1.ebuild
index 0154e132439e..412b8abefde7 100644
--- a/sys-fs/udev/udev-249-r1.ebuild
+++ b/sys-fs/udev/udev-249-r1.ebuild
@@ -41,6 +41,7 @@ BDEPEND="
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
 "
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
@@ -71,6 +72,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-apps/hwids-20140304[udev]
 	>=sys-fs/udev-init-scripts-34"
 
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]] ; then
 		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
@@ -141,7 +146,7 @@ multilib_src_compile() {
 		src/libudev/libudev.pc
 	)
 	if use static-libs; then
-		targets+=( src/udev/libudev.a )
+		targets+=( libudev.a )
 	fi
 	if multilib_is_native_abi; then
 		targets+=(
@@ -171,7 +176,7 @@ multilib_src_install() {
 
 	dolib.so {${libudev},libudev.so.1,libudev.so}
 	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
+	use static-libs && dolib.a libudev.a
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins src/libudev/libudev.pc
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index d23c86c0aeb8..889f61023243 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -41,6 +41,7 @@ BDEPEND="
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
 "
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
@@ -71,6 +72,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-apps/hwids-20140304[udev]
 	>=sys-fs/udev-init-scripts-34"
 
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]] ; then
 		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
@@ -140,7 +145,7 @@ multilib_src_compile() {
 		src/libudev/libudev.pc
 	)
 	if use static-libs; then
-		targets+=( src/udev/libudev.a )
+		targets+=( libudev.a )
 	fi
 	if multilib_is_native_abi; then
 		targets+=(
@@ -170,7 +175,7 @@ multilib_src_install() {
 
 	dolib.so {${libudev},libudev.so.1,libudev.so}
 	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
+	use static-libs && dolib.a libudev.a
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins src/libudev/libudev.pc
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index fb44dbc3d009..dc044a03b403 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,3 +1,4 @@
 DIST udiskie-2.3.3.tar.gz 92133 BLAKE2B 515673182297f02761f8c354ab9450b04b4533b8165035322c104cbc9aa41da83898dc7e2c371da47dcc8c5dc7ef6adbe5b05f913d77b395d5d8457f9260e845 SHA512 0b0b37dba437fd4af45d0344f36b36ccf0626d18fc29e020270cd567d4912fe1362182a28b55f3dfe1a23922d416cc8d952555e350c7b2d90fb49702dc497ebb
-EBUILD udiskie-2.3.3.ebuild 1003 BLAKE2B 025bf87e0e856e135cc21b078fcf83226c935ae95e855fdcd82bbab75e5cece01fe495ddf338b724ccf22390fec0f4f79d4824a633ce87ed81dcd7418f707550 SHA512 5e9ab3c79b78afa2f6c3143f1df0bfd4138696ae6f49208675d8ae1ff3097cb88895efe174fac0827bffa20d56e3073046a715c0197b823359ca589153370091
+EBUILD udiskie-2.3.3-r1.ebuild 1079 BLAKE2B 9b785883113e3c678863f37126bd5202271ecb58f02bfdbffc98b552a3191838491f20321e78ec24e4d257c557cd5ee1e4234526d6878e0dd48e2e5e2ba9f295 SHA512 a9c93d8317e62a4f299aad6953b4fd826c5ff5f132b74d726ba4741db314fce60d02e61383ccbe7942ca641926d01c11bd65f2c39bebd6da0797a3fe10ac6349
+EBUILD udiskie-2.3.3.ebuild 1004 BLAKE2B 9f34d757a24e3b6580e4030ee6c73a49d8a4357121dde2b5368175ebaa560961207a6f81d2cc339a14c41b3ae2dc682ab9e5c88cbc05b5299fb57b5833adf942 SHA512 d51f8e3e5edbf842b2d5ff040d310b9d516eb58be78806c0cb4af7d0ec5258d70d7e66883186b7c4ae6782d61b6589faca23fd190904ddafcbe647f8b7b3f8bc
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-2.3.3-r1.ebuild b/sys-fs/udiskie/udiskie-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..d2dcca70c9a1
--- /dev/null
+++ b/sys-fs/udiskie/udiskie-2.3.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="An automatic disk mounting service using udisks"
+HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	sys-fs/udisks:2"
+DEPEND="app-text/asciidoc
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/python-keyutils[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
+	default
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C doc
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/${PN}.8
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-fs/udiskie/udiskie-2.3.3.ebuild b/sys-fs/udiskie/udiskie-2.3.3.ebuild
index 4d0eaef9ab3e..083c3ad9c7a5 100644
--- a/sys-fs/udiskie/udiskie-2.3.3.ebuild
+++ b/sys-fs/udiskie/udiskie-2.3.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 gnome2-utils
 
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 731c7fcab1ec..21bfb06d5b8c 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 2f00e7ccd621..468ac591dd28 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -8,21 +8,14 @@ DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22
 DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
 DIST bcache-tools-1.0.8_p20141204.tar.gz 22158 BLAKE2B dd36102c5668cab3072ea635a5a30128df6cd75b75e7f8bba17ad0a830746ff2f75a46b56d4211aeb4657453d3bbeb98b8b794c53ff724b3fbf0874068d70dc9 SHA512 53d6e764d6d42c4367b0bd98199cae3c18054d5707a7880af3a422f9db332b44941015eaed7e1cd170b3546307ed54a2f99558a68d98c76b7bb6234d29206b54
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
-DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
-DIST btrfs-progs-v5.11.tar.xz 2212292 BLAKE2B e19933e1c0d3f80db931554c1cb4b1d25c5b2f2c5ea0ec19623696b24d696247536d615d569cc28c9a84b1484e38141945465251272b2d1df2cadde5af4dee88 SHA512 20b10ba0f6978d0cb202f055edf41abeb36b629fd6d5cc7cb9ebc82ef79d2bef31ff7c9681770c7ea7b126cfb4cafd6d610476fd5cc7506189f74dc214445cf0
 DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
 DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B 9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d SHA512 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6
-DIST btrfs-progs-v5.7.tar.xz 2182728 BLAKE2B 47573baa26cde058003b402dadba28f278b4b3ffd270d002ab8fd72d94ee41d3fdfb3d36c0c579e24ea6afae4b2dea2ca704d9dd809fcd10fbc146d63d48980c SHA512 72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
-DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b
-DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a
 DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
-DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
-DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae SHA512 60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2 SHA512 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
 DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3
@@ -30,33 +23,23 @@ DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
 DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31 SHA512 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
 DIST eudev-3.2.10.tar.gz 1961960 BLAKE2B 3708c78fad3abad6aa4b2beaaa325e25e118621aa2e6cb351732f6d8349dc17da9be852cab79045c7a513e927c2d1266c6443814fd264943765d98fb5b404e75 SHA512 d0a076d8a54e9d4ca9ca48cf885d082965144b322950d351b7ead4a5035c2dad6fd66b7f137d7281982876c3c50330cdd5e599788f23e1369388181dd178941d
-DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f
-DIST expat-2.2.10.tar.xz 425432 BLAKE2B 5d84d7dec5aae6ca7906bd2a2b8a249457111e064295b83b6c9927b5ef0dc97e7220bac1da17781e24541259ae81b60a2314cd372bfbdfc2e08fab082377df4a SHA512 a8e0c8a9cf7e6fbacdc6e709f3c99c533ab550fba52557d24259bb8b360f9697624c7500c0e9886fa57ee2b529aadd0d1835d66fe8112e15c20df75cd3eb090f
 DIST expat-2.2.9.tar.xz 422460 BLAKE2B ea0e0bd005bbfd355e819e2b157859878a20ad9a6807cc5a10a6656f062e2443adb483adb0452d751b3d460834e3f613b8ecf7cdaf743be1b15815d005d01fa6 SHA512 e082874efcc4b00709e2c0192c88fb15dfc4f33fc3a2b09e619b010ea93baaf7e7572683f738463db0ce2350cab3de48a0c38af6b74d1c4f5a9e311f499edab0
 DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191
 DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780018e3895baf18abe3ca00c9ec7f6606183a4f986037201db79697c07d03adf57c5a87e7888b8823d83aa8a SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
 DIST genkernel-4.0.10.tar.xz 460816 BLAKE2B d5922eede1192bb95ca235106a70118826c2c4c078f741e25954485f142d858bf612f35b94553fc409e4f6641b256a2940f83131c5b4bc7d6dbae85019bee7ff SHA512 29dc29b346b132cc6e7ea5298e49c93d01ba28531928cb7a6125864c7d03b74f70bc74043b220dfbbb6651ad67fcbc3d8ed8a2d0f40d271b83e9a8ab0325a2dd
-DIST genkernel-4.1.2.tar.xz 465288 BLAKE2B 89e26a861854d0cde808331db4bf3055495e9ec4be16952c495e481a5f9684601603ba22e5edda8f882fcddd68d1e406756cdc519936b90e33fe640107c8e529 SHA512 4b10f25ed8d97ffe075372aac22e0aff7be72405f02d9d8faddcc70063d04719dc93f9836d4f8375afca9b6870fcb15bda6ed796e5b2d2ef208ba3203d229a3e
-DIST genkernel-4.2.1.tar.xz 481988 BLAKE2B d2f4263ea1d66927e7087ad4c852e83a66d5fbf57a937fb20223d54533ec1d894236c9305e82ec91a44272abc990be5feb29572ce8a407f61eb015a262518734 SHA512 6999706a695817fe453d17ce5b18e3cb234d25abd61ada7eea0769eed6541306e5d76d21061a65f66d7ae3622936531b5af01099b35ccfc1b4d372b0ff5241ce
 DIST genkernel-4.2.3.tar.xz 486688 BLAKE2B bd6546ef3c7205e14b8d7e563899fc13bd0c1f90e929c6a805f9e89758fb56fac5cc4ebf6f44d708cf199fc6e2a42704a9d4314bdcceb11e402afb9877608cc6 SHA512 a35b87931e080fe1b61032f8ea655b774c29d652086b7bf31f98aa829490edf8a9e9dbd41c5b8274b64db1946b162977d907f3665da1d99a62666f745f62b6f1
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
-DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc
-DIST hwids-20201207.tar.gz 3749352 BLAKE2B a968e6daf5686c4f73d9d900fbe80a5b3844c006102ed8801f88e378dc43c1bb66aaeced42bc2703a9c8ad624a1a7167bba485b1bf0c0d0e6043920e015c9177 SHA512 ec638edd1bbf00bd66e9baa50e3b9c9a5004a96a359e6bea306f1509c69bb3c7ede3569174007ab8bde11d49300da452b06be96136cde6bd2d84a76cff9251c2
 DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
-DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
 DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
-DIST libgcrypt-1.9.2.tar.bz2 3206187 BLAKE2B e0ceb02b0c26a7246c4146640a9dcea01429a365bd484532b9d85fdb0c8f4ac1308862e70899a1593f4665e4b2d16ceaa10029702f67720897975258a25d8ab0 SHA512 d2e3dc89788763229f554382b3cf0c3a2680f774258abc4c1fd9ef1ad44920d57d14422af9b6b405e42742e691d19ab2ee458fddf057e778964519eee090f016
 DIST libgcrypt-1.9.3.tar.bz2 3219061 BLAKE2B 51a6273ba28829c016d9a93fffa181aec24170d0e4d3a363c788f336219e1531274344adeea289f3cc09161fdb2e56846551367a8ac880b14e03a52ab0dd551a SHA512 977e766887c14f19aa1b9fcc0214303036a649e41cd4278de76da7d734cf36888e2e1b6275590dac523dcb4ba8ab07993e6ee8209fd5f1a3383d738b09a060d6
 DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
-DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
-DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
 DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
 DIST libxcrypt-4.4.23.tar.gz 536009 BLAKE2B b7311dec9e528abf6229f6c105e806a31a1e525e71d26252c8f30a3e1dbd61a7752b7303bd167d9ddc99b04261f02e3c7b50cc36bbc3348a337f4089f6e1c6f3 SHA512 4d5854a082a8c707416507611881c1407f0ea0bda0557c5f7ae6b70d8dd1c7a0828afe29d8f2e7754f5f97b824aaa03671dae6d4dad329fcd131b94b77ddb713
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
@@ -65,31 +48,22 @@ DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd5178328859
 DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
-DIST strace-5.11.tar.xz 1926632 BLAKE2B df47612c0928466f8b5788c4a7dc74208fe76c6967d3219b0eb753131fba315e715626c2cd1ed56d3e8ba0eb9a338589a8cbd6205fe876123ac26fdf0fab8d31 SHA512 688bec8d620c7ca701561ed7479e42687cc30737f944b82201731d827775cd2864787ecca7c93ba149b06d5d654d9f6bd109a977f8138bab34339cd5930828f0
 DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
 DIST strace-5.7.tar.xz 1805044 BLAKE2B 487a1481357642be21c83cf387710bc75f17bd0af87ff07f914faa99120a619f33d2caba034d50dbdbc03aa3f758dae86d04fc6c25b3f6254ac3f0578a19884a SHA512 aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1
-DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad06bc297b68561ec7073297c2e5aaf2c3d9a102382f5833bedacb2a54540068a9f9438094c9180f45b5dc4715 SHA512 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
 DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
 DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
 DIST unionfs-fuse-0.24.tar.bz2 30381 BLAKE2B c3886d7b0cbd4ac62712d7d94bf9544481200e4354539b29770a88974ea3298b0f594cecfc6f7accff3595004ad1453075b947a2633b5300a3684fedba4995e5 SHA512 e0e414f4edbf641ec9d0135a8723e43fc75412359b482f7aedd66fe8245e4df03943c5ecb6f8de4fdbd97f0346033c691e766cc4f4a755f5b43748e1441d3fbd
 DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
 DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
-DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
-DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec27a133edf857116603de38f7e13f527687691d0c8aa68f4f6868be6f3bcc64573d759308d74731107e02067449ce6 SHA512 cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
 DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615
-DIST xfsprogs-5.11.0.tar.xz 1297180 BLAKE2B 0ae0c2eccdf124b9fc2f9a4ef71073324f3645bc9a4f2959978fa06ee4dae4ecaf4eee40e6b130b65eb390d8af0f9d1485aeac073a8ac5e30fce46eef9cdb7a4 SHA512 7a77f938a54176652ce0b53cab13509754aab560c02d74ab03a9fcebf2728d703f89ad9d281ef00fcc0dbabb5497cab2b2b656bbe7598037a16fff70126e5d66
 DIST xfsprogs-5.12.0.tar.xz 1299332 BLAKE2B 96e8831ca83d362792853188939017b53343232c99ed514fda50ea9afa828ea8f8ecc753249b211037c2635b45bfbcc849f90fe277102e4745e6b4f13fc6fc20 SHA512 d31263529cd5e0aad2b4414aca91f352c6df9de9a241655e43b5592a3ca120efdcfcd8cf84401ebd1b3fcf67027f0923fecc6f961bdaf12fb00c3ac67abd5fe7
 DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
-DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
-DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
 EBUILD genkernel-3.5.3.3.ebuild 4938 BLAKE2B 4732c963327740e9f21d4b86e7665045c1a84796a89efc8232f5f425e18e97392bcde59930a8f35900c48bc282b04967b348d51fb4bb0ef7124aea0902b634ea SHA512 2850327475b71ba566b4388eba43c376955a22b587fb0ad40c568abeefadbb5367aed0f30217bafa2d9411e3e975fac8e325bfcae34f27771dfa3ffecae07409
 EBUILD genkernel-4.0.10.ebuild 9572 BLAKE2B aaa3dda80524b29233e333e13e9076148d1c1fdbc36c9a700c1974c3f924a6d5f006265a44029ab75888966cb634d2a642ee984e1a91a4a6cc4fd61b7d3d7a7b SHA512 1cf0391bfc65f9445030fcb5aaa22c65bb8b72bdd376b37e915f9080bde240cf0118cd337feb18aee7fc0d4b0603540f5d55f2856e3f04cca4a120c5915db5b4
-EBUILD genkernel-4.1.2-r3.ebuild 11101 BLAKE2B caaf2120d79157e1ff0f9c7a6b0c4045781883bfc8f74fbc57e63eba94ae3883955898e91ca0afa4215a9ccb2d5b2f67f16b23a9ce5dd68f5aafdbce358ea085 SHA512 d4143ccfc3cdd8f7807ed900bf02897b214b0052c6988266fc2f03f2bdadae3ae0f61ab58301b69586178d734a2684a15e56175b753706ec269891da13870ed8
-EBUILD genkernel-4.2.1-r1.ebuild 11121 BLAKE2B af17aa02ff1b8dba065b61d4d00e15865ad2a7b1f7339276b8c8960054685811cf26f0e894bfd498d563e1d6daf0400f324051efdbb2ac00d66826c0d1f7d967 SHA512 27e57755c3f397457fc556017634eb97b317a1ec694973bf341e466684d8c8b964d5f654e9722e151fd80ce8a5fb33e1fefba2940345ac46f5cb608dbc4c84fc
-EBUILD genkernel-4.2.3.ebuild 11463 BLAKE2B affad651c75155274cbdb43ae73267d9d20b7d6a62f4d4e52bfd8f14f33922d38a9e07ba8380ea04dd6029f0dfbfa46052d75a0e49434428ceb856ace3b57cc3 SHA512 cd678a9141f05971833d122217ee4442214b8f81544e1eade762b1ad0501c89fc9805c7333ee026abec11a48e7ef435a78861befb45791486fc5d360396ed833
+EBUILD genkernel-4.2.3.ebuild 11456 BLAKE2B 0bd7fd835261fc446c1b71abfb12b9362842041d86b21a459e7dd9b4df0e8ad5b8f61533671b02e68477e2fc6a841a63f05e1d68c8b6caf18b1172efe0e52a04 SHA512 9b7733843b2cc4fc3020eac3d62702dec630098252100598eb69c20789963c6781aa06c4fddb6d0b13b2bcaae6b37a23a7450b4882851914f2243a95749a689e
 EBUILD genkernel-9999.ebuild 11463 BLAKE2B affad651c75155274cbdb43ae73267d9d20b7d6a62f4d4e52bfd8f14f33922d38a9e07ba8380ea04dd6029f0dfbfa46052d75a0e49434428ceb856ace3b57cc3 SHA512 cd678a9141f05971833d122217ee4442214b8f81544e1eade762b1ad0501c89fc9805c7333ee026abec11a48e7ef435a78861befb45791486fc5d360396ed833
 MISC metadata.xml 637 BLAKE2B c2ab07375e789025a16008cad8253de5cdc09626b5f0b107e0f5187f9306c526816d4ba63e3737724855db3459190710434cb0984f2603b73619458ff65196fc SHA512 d2fadbfefd976cc9ae5c0fc66e184f050a1a8f208f777d8a51687a5a6bc171a46b010dfe055d69d41020ff1fea10b9ca54bd2d3e0414dfb8d0caa6317a05f66b
diff --git a/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild b/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild
deleted file mode 100644
index 8635d2185822..000000000000
--- a/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-inherit bash-completion-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.73.0"
-VERSION_BTRFS_PROGS="5.7"
-VERSION_BUSYBOX="1.32.0"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.3.4"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.80"
-VERSION_EUDEV="3.2.9"
-VERSION_EXPAT="2.2.9"
-VERSION_E2FSPROGS="1.45.6"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20200813.1"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="27"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.8.6"
-VERSION_LIBGPGERROR="1.39"
-VERSION_LVM="2.02.187"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.8"
-VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.36"
-VERSION_XFSPROGS="5.7.0"
-VERSION_XZ="5.2.5"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.4.5"
-
-COMMON_URI="
-	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
-	https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	dev-util/gperf
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool
-	virtual/pkgconfig
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=( "${FILESDIR}"/${P}-post-release-fixes.patch )
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_XZ:${VERSION_XZ}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	if [[ ${n_root_args} > 1 ]] ; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "If you are appending non-persistent device names to kernel command-line,"
-		ewarn "next reboot could fail in case running system and initramfs do not agree"
-		ewarn "on detected root device name!"
-	fi
-
-	if [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to be causing problems for any UDEV-enabled service."
-		fi
-	fi
-}
diff --git a/sys-kernel/genkernel/genkernel-4.2.1-r1.ebuild b/sys-kernel/genkernel/genkernel-4.2.1-r1.ebuild
deleted file mode 100644
index 8ef9edd2ce09..000000000000
--- a/sys-kernel/genkernel/genkernel-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-inherit bash-completion-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.75.0"
-VERSION_BTRFS_PROGS="5.11"
-VERSION_BUSYBOX="1.33.0"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.3.5"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.81"
-VERSION_EUDEV="3.2.10"
-VERSION_EXPAT="2.2.10"
-VERSION_E2FSPROGS="1.46.2"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20201207"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="28"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.9.2"
-VERSION_LIBGPGERROR="1.41"
-VERSION_LVM="2.02.187"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.11"
-VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.36.2"
-VERSION_XFSPROGS="5.11.0"
-VERSION_XZ="5.2.5"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.4.9"
-
-COMMON_URI="
-	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
-	https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	dev-util/gperf
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool
-	virtual/pkgconfig
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=( "${FILESDIR}"/genkernel-4.2.1-post-release-fixes.patch )
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_XZ:${VERSION_XZ}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	if [[ ${n_root_args} > 1 ]] ; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "If you are appending non-persistent device names to kernel command-line,"
-		ewarn "next reboot could fail in case running system and initramfs do not agree"
-		ewarn "on detected root device name!"
-	fi
-
-	if [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to be causing problems for any UDEV-enabled service."
-		fi
-	fi
-}
diff --git a/sys-kernel/genkernel/genkernel-4.2.3.ebuild b/sys-kernel/genkernel/genkernel-4.2.3.ebuild
index a7c583a33ed9..43f0f5489aaa 100644
--- a/sys-kernel/genkernel/genkernel-4.2.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.3.ebuild
@@ -90,7 +90,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
 		${COMMON_URI}"
-	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"
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e010bf535ed3..b7298e24d742 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,31 +1,15 @@
-DIST genpatches-5.10-41.base.tar.xz 1421952 BLAKE2B 513d7aac0ee791d615fdaf336a29e677a6ef43411dc04e86173eec95322b3d01b658fdbde8dcd6bd9a195bc95a8f86e9d895d5825a4898d608a156a6cc26faec SHA512 8566ae1faf7812c52a29844365a0ef8f026b845a7a7e85a04a4ddb490cbb00748b6ddc843244aa1871abcc23c3dc9095d43cfa14efaee14b7d58564a87870d57
-DIST genpatches-5.10-41.extras.tar.xz 1768 BLAKE2B 70b1c510506b1df8ef210b10a203711d07d0b170bb40a4619cfcb99754f20fc14b648f1c2f4516f3baebf327706444d6d8e375bc3277c03b2f623c959c863791 SHA512 198db6b840eb22deb594e336a3c64bb32c13a12ad682b5d431d0365d276b6412ada9594c85d274ecfb20ee2bf2045bc60dc244edf7d0c8d0ac1f21ecab4f9748
-DIST genpatches-5.10-46.base.tar.xz 1555716 BLAKE2B 51ecab1f2ea13578ff938e82338654560f9d2bd76dc1be42611a325a02cd715dd3388c1ba648d9a54eea9fc1a7bc5d5a9022d9b2cb85eeefe6bb36b0486ac365 SHA512 1d63725fd225a8b83977cd224a6db73c2163d0ea977b92f9b8c7e6a47c8d68bbbf6e1abb7bcfc7f25724717e34edd132a550920f48c87f169c7614253a4c9cda
-DIST genpatches-5.10-46.extras.tar.xz 3404 BLAKE2B d03f28caa10fc24b4623e0c19c5dd1161f653a70868b0990c75a4beb72f8755b086f4e36da5806c3d6fa269e547f1aa557dea25f6dc94bb74d295ecdcfe33815 SHA512 dc6cbe9433e8e7620cbb39245249c8f318e6e40ed5bcee1aace03981b15d9ccde5eb0ede9ca2ab881944a27ac1e480fb3991dd183cd292e74bcc43370e5e667a
-DIST genpatches-5.10-47.base.tar.xz 1555884 BLAKE2B a4078ace7edfd91eb3ec2f63cb121571b2d5137837a33c96ed5e09201f34cf82fe3b7e88c6684f40a2125d88aeebe275e826ccb2d63b8bc96863edba5055643d SHA512 eea3cbb4b0a9c5979f4a7504eab5eb7e041601c78d3c1f4037c2eb91fe54e7e73c7bcbd88f6e69dc859f9eb7d029bc9f55b6ffa652bf6bc742013fa8d3b0c71a
-DIST genpatches-5.10-47.extras.tar.xz 3412 BLAKE2B 779b0a8bb908156bc902106a98e4308b3ebfe42ecfd5d651aab4dbb95c0ee890e353d26d51e1fdb7c7305419e8eda5103a01405be5b015ebeccde869798c68a4 SHA512 dadec8511140903f38e7d6657f3e8b750382cbb18271448d3d23a03962b0ceb4b70950d6dfdb643fc2223f53254b824a04d2eec540626a20a50b998a9ddfdc13
-DIST genpatches-5.10-48.base.tar.xz 1580692 BLAKE2B 85f19398f7a3967b471077c1957aa21ee6b34c1a0876ae6a64e5aaecec7a9c91274eeab73574e22961dd8f8e19bc4a69f4fcfb26e9809287ef0da964f64bd69c SHA512 20b894e85f002b057377b7685bc4a957ff1a2990ee6bf94d1db9e8ea1a3e9d20478445ae5aaaf005269505599c4a9b9b26a4ea7129d3c5e2ad18a530c4b6f5eb
-DIST genpatches-5.10-48.extras.tar.xz 3408 BLAKE2B 6f347e53aa1eabf134fdd4f234d794820d9aedf126084615fe5eaf29c8e8f30828678b9df544ed39a9ea47e9bd9e5b1a93ea94a90a7aaf1234354cdd011cbabb SHA512 3d19cb7079c56c7675a16302c272a1da1b72b902d66f341428747aa12d1fbf949366e12ed5501bc15d92ca89eb93b32eea283156ac5317a75f11806907e55cad
-DIST genpatches-5.10-49.base.tar.xz 1588092 BLAKE2B d31ab75b6106e81654a69d1d0cb1d765cad83fcdb20a4cad9bf44749146aeb4c19cb6c8bb743b26ec48cb6439c64f8b3af9011468ba6b140dfcdd00adf14286f SHA512 cf6973eed088a99b9e9bc5822f87e75bec61f94207a783f25ec5e835fde565dfbc04fe3dc5c6709f213479b86bbfab26003661108607a17df0169ee2ae5f43c3
-DIST genpatches-5.10-49.extras.tar.xz 3412 BLAKE2B 3feb28c887152586b0e5c282e898d447451cdc7b0dcd0749d69890b72fc1d38f9a0a9dfe62d09c8f37ee198ff809edd949137503dafbd63120b566a837c83e32 SHA512 dc916a8848358891c749ab2853d49a2e5a3e7cc0c696b4f523902c5526fe3463730209bcd9a229dea86ed628a8da63b16316b565752e4eba6ee68381af92b6c7
 DIST genpatches-5.10-50.base.tar.xz 1622300 BLAKE2B edc737c022aa9855ce8afa6120618376dc1fed512f34a8269fb209389abb8292d14ee1c3020a33af181d099b6acbe970f960921790f5b356d742ee61750d34f8 SHA512 c543389c2cb737b874d91b4dba700c7709aa3997a3bf7c6831bd0b543f8611f37a5d87c4b3f9b775dee2bc3a3856ff0b34dd35ad8cd8ced60d00a880e7e7bc75
 DIST genpatches-5.10-50.extras.tar.xz 3412 BLAKE2B cb86ec70bae4b4260f973dbb23251e0c9f9841b12cd3e1e405215e9d54828ed4f7e32aeed131000f7ee467c3b23068f1dc6ca7e056a8b0308add810a0d6bc7c4 SHA512 39dffaddc87116a9ce91fdd07e9dfe7b4ab9c8c74328f3a6e7fffd5b2258837f2e6ccbf27d394fb4be15792c032b12a6289d3903a7e9e221fd411028d78f0073
 DIST genpatches-5.10-51.base.tar.xz 1649104 BLAKE2B 611e698ca58531702279ae9874c07bb3ff44a15cb8df4bf7e53b74ee1f5e7c846c058bbe16d57578a59e6baa1fd427e27bcea6a68516e16b285623ff2ccedc55 SHA512 1b7002696deb32915ccb459ab6e5e500fe8f27657dc0c93e99d129b7b843cf6574a5c1f04b70c5c3d7f405a6f17a5dd63fa1987a1e11ae6f770399cf7fb749c8
 DIST genpatches-5.10-51.extras.tar.xz 3412 BLAKE2B dbbe9031fdf275673014bafe3ee7d15e668f61187b6809df769a660830d026172b1eef1eefbbae61a2471004c14deba15913b0d4b57cfdf3750954ca075074b0 SHA512 6276fbea90ad4655021bcfb4e22c247e861807fa0c1a0ea6ce2fa439264422beaf74d0c8e08bf5fb0951727e1c4c189db5fe6672ff182d6c993919c0fcbeacbf
 DIST genpatches-5.10-52.base.tar.xz 1649944 BLAKE2B 9712926fab35abb79b0c4bcc448fca65c1941f0840bbcfa3dc3c13a22f7711105bf3dd9536d3ff00fc5717eed70df5977d6771c3bd62a51cb8d36df824432831 SHA512 04519253c689cb6d88e82b624ef2928fe1bb8203113267c74cba5c1dd87cda072071c795410598f7f5ccd2533b65958027c959809c4b12503ecf9a4d7eb3fe50
 DIST genpatches-5.10-52.extras.tar.xz 3412 BLAKE2B a458b569dfb6643b5a13fcce6c5df46c844119009c0593c6e655a2b0b7589af70a682745fc79f14fbc4fd7e45c52a924b8cc4665a31665a6abe1ba0c8d779bc2 SHA512 5a8f76b2791fefc6f0990402bd5307870517e79daccd52b4d126b8b278dafc086b47649631b3b07f220e3b06d03f12f765bbfb837988257db737c34806a78744
+DIST genpatches-5.10-53.base.tar.xz 1650792 BLAKE2B f4e4f7c7e49b78db706c2e5e47c1e0a3e99576316150f4c2443cca5885e18969181fc94febd3814de4fe9256b1324446be160b3d9992edd0375ff12496c501f0 SHA512 533a45b4fb2bbf531fcc8eb38928593a21af77144ea510e13d0d1d84919425a26371b9e1b5052fe6e7c1551683a5f88e1fd24512d9d2142fa8437f69de1c47ba
+DIST genpatches-5.10-53.extras.tar.xz 3420 BLAKE2B 3079e8f65de0ae8d927cce28fdaf97b902d5cbe3f419c9247a76d27bad296f5f002773ad176dbd086ed04d5346da86db91f1c2bc87247e14a86e0790cc2b1ebb SHA512 0402a07c174f9ab289654e0ff15647d53e5624fc729b73f7028f6c1619285914c5a672b42bd9029fc4f1f773631f86d51e6b48a5c96f84825761b42b76ea18f9
 DIST genpatches-5.10-54.base.tar.xz 1652540 BLAKE2B 37ecda0a4f76784572985be5073e7a3f33eb3aa43e641a2bc083e987c88c45cbc277bdeb20bb6ae4d264a17b65273119790ba8dcba7e22fd76ea8d0bd1be1cfb SHA512 85587df46e72cde33fb869f16b7fcc995a4d947552ab4bfb45ffcc852dad1f4b56a58d81446a00a142b9e628bd2fcc8c4922b50a282706f430b0bd9e20aa34e4
 DIST genpatches-5.10-54.extras.tar.xz 3416 BLAKE2B 3602707190ed04f62c4b2e8e0e765a53cf436b437373e71b6afd392cf05a73ac9e24f89293aac17c3730cdd696485ebf9d98161b248c9acafbfbe0b0c2db8ab8 SHA512 e4aad3f799dbcf00f813e39c8b9b355f17914a33d1ef422b3e7ee48c48e77a69925cc5664f0f171d1a632f622417b9d7ec88e56b1575c8e5f82af94f64337f42
-DIST genpatches-5.12-11.base.tar.xz 611232 BLAKE2B af0db172fa831bc84b1935d387e3d7b360c5a94d8499b6fa204f21b7a822c844e88a87f4a2724d0b8b508676ee564dbbe304893bfdd3197d67c8f6aeae011cb2 SHA512 f422bc1aca29732db09184ca2fcf7478536a87e73b59325f063c73103c8ce425858baa78b185eab61a80dda15e3818b45a669c69f7898382aa3563b315ad45b3
-DIST genpatches-5.12-11.extras.tar.xz 3412 BLAKE2B 2eba600cd1e769a7252b063968b87cf5f54f285f791f84089fd1f3060e3400a76dd645841bbb213830cedf274e41959ed48cbee081d556c82f059e2a3de4db51 SHA512 2bc29ba1aa4b71b2407906f2c86339eb15fb124f964ddd3fa9f4a39dd94ac18fc95d0780cf1fdb99286b1a27aa88ada32665feffd9a3ca7f53bfb66f0212e7e2
-DIST genpatches-5.12-12.base.tar.xz 650292 BLAKE2B 81b5a3b95390522c328acdb390fd1e8515028e55dee9a3693992ce2aa5c2defcea37b14c385d72e0c6a9b31f239c7d02eea45e4428332f477e897fa94c02d71e SHA512 bea0fee6fade3b1322a52ec2201b828ab28bfb3c0528ea562ac7e3cfaebeb758b971820a2b1ba695dafe219ceb2548c07713b3684491b893e6055ce4f8943916
-DIST genpatches-5.12-12.extras.tar.xz 3412 BLAKE2B 8fcf6c407be25db368dbb3e6be3907d3431228b5c39819dba7c67d61e5171a7ad9a86f3e117b99b9e0d626219ad9db0938c15c4b96c934b88f693a3e9661d458 SHA512 39750768e4822ea8e3f88540fc8ebad9fd721e2a3a8703102d58e30513b47069cb8a77e15e41d0f90d1d69053007bd476ce0741cd3135a428d039ebd426cdc57
-DIST genpatches-5.12-13.base.tar.xz 661044 BLAKE2B f9b14633dd2895fab6d47ccf99d425b4d4c260c58bd2511c8166fc440c1cff337711b805b2ef76f787c6232115df96ec9706a3c1e65e6bc2c8a8b6dd1436dc0f SHA512 8039f529138bcc3b8a485b25a16b1f436b7756d91c018a70a6f6951dc7ce329a1f8441bad90ede66329283ee6ee314c22411e283bb76f46d0ad9e03b0a8e2b24
-DIST genpatches-5.12-13.extras.tar.xz 3412 BLAKE2B abef35f4ac38e4b0ab7863376e72534c27d32f3b974f4368be54c0d9ace766749ca4334f7622b2963e1dd51a05f1262d58f7de03ed8d0a73c3f2b68a2b48ab76 SHA512 72bb3380b6382938d9b3957e4f47267616b8dd50d7a4991750b131c844c882b1d67801fd917c89444bde9d875cdfdf9d8e25bda079d5d97f42af7c2655343f61
-DIST genpatches-5.12-14.base.tar.xz 660992 BLAKE2B 31b0a7625c6a7f0ab32a3f201f2d655b7d4f85da68c7e851d93a3187c62d781ce0971dd2943447d77757ee43186f963c4d010e1c0b031d4ca8aed2963244f270 SHA512 7f2824af00bbda537ecd841fb7e9d298682c079efd5b27a5d9f78af3410eee8e30b0a5314ac24af7a4401b7425501f1ffebff8c8549899f702bbcbdd263b046d
-DIST genpatches-5.12-14.extras.tar.xz 3408 BLAKE2B 35b8f90835a53d0a06b6f0f405e9954dbe7c9d5e4ff9ebc5cd493c08f40a07ec4e91d7fc8c58e00437020925da11663a73d91a7d1adf176f553c2f83742ee6ea SHA512 9939e4cbed0aa434a3ea11b520a1a65dc91abfdaba6a87498b89afd2dd95aaf570ee0c72e153582aad5c8ee458722dd3c40cde1a35ebf69e5ccddaf1966e771c
-DIST genpatches-5.12-15.base.tar.xz 661028 BLAKE2B 5d03f3d861ebfb8b43ae658d972f783b23dcae40fbfc2b9019b7970d98da7c3f9d2b86861a48847cb1b9da0b82a4987895b15829fcd6dd2f666458303fd137fa SHA512 93b6ed386a0c62c18b768b6b6cb6cb97b39ee58a06f7dbc9ed3d80a8a5d272d79cf193cbce4dd1d5c9c7cd89f11e34730a237a8fa34ea282803631a17e8902b3
-DIST genpatches-5.12-15.extras.tar.xz 3412 BLAKE2B fd2a4a96e260b7ac35e575cd77a852078d11e0135fa8a6a2e410262b75800da43b8f614e6216347cffa4896bb3527cbcfe8306b94d19785647da277a5bd82a83 SHA512 89a6d01a55346bf1091c7f6290d4f32cb18f6504b9e221c455da8db38534017448d6d6b603c9f7c09dc4df81ca0f2e6ad358afd4d97efd7be92b7c8382975af7
+DIST genpatches-5.10-56.base.tar.xz 1790176 BLAKE2B 90510133af510c12c515c33e7e970fd974fb51a3a85dc519a9ab378aaa19a2ca965b0983ca5148f43a122e65584ac76c67c79c39fae3bb917ff49633563adac7 SHA512 1f416bcc1b7cea2a8708272d1d9d0c71b55c6fab33330f19baa7811eb3b859afe66e9a24f83a2b4652a932c02d7016fcc81aa53c9faa970c1885fb672b79ff9d
+DIST genpatches-5.10-56.extras.tar.xz 3420 BLAKE2B 96690a61ee421300a6385513e2804a2832622c4da07f4d0a20ca10274d822811f08b2a1c58dd486555d76bcf5dda75318784b95b6585b1504d9d977dbfd13cf0 SHA512 912ea13685c563e3adfb98bdcd743edc8e27cf87ed3c332bb7204235005c4ba85e847881e6394dabb27d83031c1035a840fa72d7ab9f23627a3a4dcd1210cfa3
 DIST genpatches-5.12-16.base.tar.xz 707164 BLAKE2B 05331662b6c219900a5d70aa3f9030e82cff6ca09de9645e178f5976daf8003335ac2a9163e405282096bba6057ca645f81fddda41eb7b10f1125524b4cadcc5 SHA512 dc8efddc386fc5350802edb5f95f62f61a8d3c2033a0efa0fe9450ff0ba84a65cbb4482a0de9fea6f67200fb938f3d73c27124f9bcf706485f32f25cf8e89cd9
 DIST genpatches-5.12-16.extras.tar.xz 3412 BLAKE2B d0e429e2c9e1a2733a216e57c32c73f55285edc74f801017261925f246e44148c58cd8745caa6afc9cafa9c090d01206acc3cb96dc0ab260a834a0b3dd0e8918 SHA512 24a1f8b2f2993c157fa0efe5649b7494084d925f8665a8c0727ad431da00fcc8bfa7e00ac1d2b308b1297c1c202eac687d7539999eed38f44e71a9cb94327ef6
 DIST genpatches-5.12-17.base.tar.xz 738268 BLAKE2B 61336204dbaf80bb44c29927ff59ed6ccd6f29a1a139132364aa2ad7c89b0af4df6df75e800cc14b444edb9897f4474015369b9cea878fef487c8a3e2123a715 SHA512 f4b5773b9885817889895725ece76d50da95439769d96fd4058d690937027ee6baffec62941b15df04b7e12df29d1177257daba39c41418e2f2a400565aacaf9
@@ -34,16 +18,8 @@ DIST genpatches-5.12-18.base.tar.xz 738968 BLAKE2B cf0e62aad4cbe5c00d09a47e90176
 DIST genpatches-5.12-18.extras.tar.xz 3420 BLAKE2B 783c9491317343e26eb9a25b48486c8b9c47f80e2c3048cea50e17ef1e6dcd9e5ab40a3f02bd02b5949933ca6634ffaaeb507416534ca35308ba35e5bbcfcff3 SHA512 53f513fe4ab0bae00b69055f8962cb8200ea90bdfba9c4ab95bdcb58f6654f5739438a6540a18a530e8160375c8d5ee2a767054b509c3a79dbda02721857403a
 DIST genpatches-5.12-19.base.tar.xz 744220 BLAKE2B 63163732eeff70cf0eb344950247f69992145a4e7cbbe966eadaffda3be3f0e645b3d7cfc9c2284156385e761c02613ceec331b777b282da77b3d169cf3fb807 SHA512 8689a4f3fec6c29a88f7389296659579c13a2b664b94dc8147bd1b266019c310c30d19198db01feb60a421b1362aa15e72feb4cb19ac2ac2136ce12c42a21915
 DIST genpatches-5.12-19.extras.tar.xz 3420 BLAKE2B dd43bf044652067aec7069cc2e8c1b9441ac06750b64dfd355ad53221df08fb68981363b9749a6f93ebfe81e728ad8791f7a5ad2e9d4557da6d2a1904efc05cd SHA512 501379a816043c5bc0c4724a999957d8c5b4cca214d12e2d64577ff24943230e6ae5e60512b634a5507ea5f8823e7511b20a5c099bab149309045e0fd17c4b24
-DIST genpatches-5.4-123.base.tar.xz 3488228 BLAKE2B 0fe5c3056c3cb060f4921e3b7a4046e03e4e777d033619f0496eda68c645c6209fb07713a4bc2565000f9c17e6203a8bc5392fc597dd49167bb0348988b53026 SHA512 e71b8f9d622d3ea2fa8165a39a27240ac007d899d7324c60240221d7761c1287f14b631b074536460702922b8daf00bc2714358aaf7f69ac257af7d5d5b18bd1
-DIST genpatches-5.4-123.extras.tar.xz 1772 BLAKE2B da9bc0d9513d010364506850d1c23d13e1a1ef8c4cb8d60e3430d12f4cc2ea87a74643ba9fa1a061eabdee9985b1931aab1b2587ee26bec9b2cf165b90fe83e5 SHA512 ff3b417825ba200b32abf888b6cf6e8d754526e57a30c06fbe4f961c84f67cd921b93b9848fc6b49f120b4cf8ddba9284755da73869db35327af7549d63f3cd1
-DIST genpatches-5.4-128.base.tar.xz 3571424 BLAKE2B a58c2b8f20730c3357ce30cbc8b24f0609bd7ca2a8f5d37780cfbe4edb560fa49bcf1925ec40dbf61aebfe9a87be0f35ade4b999509420eb0caf5731ce649e89 SHA512 c84d65acdc4274b528306af958b0c72851fdce008c9ed6f78965ea22f09f8668b6075cfda9101b2e7a7bc55ccea64491000b1aede8cffa4ad927c7c1bb003489
-DIST genpatches-5.4-128.extras.tar.xz 1772 BLAKE2B 3af29c49caf9303615ee76319d3da53295281e8fcaee54d37b122e47b745ded99a109db2eb31508dbe83a5997b7973287297d29af2ddd475bdab1a0bc05a1045 SHA512 27eb4d3327e24acd5f4601281f624439ff47bc6173ab58b23ab162a42df66bd02402f2e4f4e97a49b0b0b788b615869dc4a0dc3ce964247ff7bc6166fd9dc6c4
-DIST genpatches-5.4-129.base.tar.xz 3586716 BLAKE2B c5be8295127bc1c16c1d24feea5793f7f52b1be2ff48db6494674430bcd608a1e0950da553e7c5418ffc70e8909da5158d54877412fcb1afdbe34733fd54f207 SHA512 0ffb95795a9300962cb4ab7c017859ceff7ea6322ad59592b4dfe98ef56fb86db9bd8bf5c243cef93a0502c849f2c466f33efa1df420126199f7fd0650dea3b2
-DIST genpatches-5.4-129.extras.tar.xz 1772 BLAKE2B aae80fd4b863f4a2552caf05fced29209f840d22b5bb9fa3eacd06ee7348e0fbee023512e331e3b2f515341ac9354fb7bd1f4e79e38be3a7d8696eaf257a547c SHA512 f0392e91fcf8402cf6d94bbc42b89bbbc028959c1e5243b5cd8e608950539ac81ba62836a1c7755ec01dcd7f8549c9c1898adb24c8a3c7c1a5d5e866cd7ef0dd
-DIST genpatches-5.4-130.base.tar.xz 3592548 BLAKE2B b88b67f8e4f214a1bb7c35128b57f55579a3f5aeaae5d46f7ff4b229cf4f4e2f9c248d0f6c792793f60961a3493e091f74fdf48f14b0edccbf162f749fafa203 SHA512 6dd6c0ccb7cdcd72051da86eb3b89881e98f44b215431220445af892bffb79d73ff0af67168432e597e08dbf46996a250782c74fb9bbb3945d05527df208df5c
-DIST genpatches-5.4-130.extras.tar.xz 1772 BLAKE2B c1754871b41af183a22e9c30cdae5332ac9fbc104c6daa978796d15446c83acced9c9a2f55ed44d27787f33bef69f0ef885ce7642183b54d32924905c881fa1f SHA512 0bf0917a43e3ce3945317cf698e74af72bc83270c81e5ddb7d6ac3705310ef6935a54b0732d1f302b49d6c7c1275550a341a52d490ce7f4ff5f6c9702e9138c0
-DIST genpatches-5.4-131.base.tar.xz 3611404 BLAKE2B 9793458c63d97afc9731c210a64297b11eee5ac5ec52bcfca728fd3fdbe7fbad662ebafbf446e83538e843b585eaf333e5b8e02d83d504ab8700c325339eb742 SHA512 2a8db971cc4c603d85ae6064c112d2ff83c02720c58d07881acaf2b4208b6eb05128d1e3ab89b446c4abe345bdf7df21ce2e5a8c61fa3b1c44dad8085bc4bd57
-DIST genpatches-5.4-131.extras.tar.xz 1772 BLAKE2B c4933c4c6470123bbe2011673a18ae7910de41dbd8b0c6b5ce431a06d2cbdecf62a5e0ca9d28738e82e30c55dae29acc30b7e68801075e5d7d17f425909e6fbe SHA512 495876695c819ff98dc98fb34e8ee4b0eb6e82a69a7f519055d0cd2c6e3da584a97252861f269a8f2160c3e98f3a2907620f4b9e5bd145feae51fb3b17a3d2c8
+DIST genpatches-5.12-20.base.tar.xz 920044 BLAKE2B 97f6f4af62985d17004816190f55919cd937e29e24c753c0c6d82ec6bacf89b4faf01585f941ae33c5b37d994888b7362d2ef22add518e4f6a2df3fe3b23953d SHA512 6f5940eb48c8167c7492701968e72138ec8a35fcf889a45158321a4507c45c5a930b68b2156410fbd063155093767a239d4d9cb3711c81ef47a13313b327c07e
+DIST genpatches-5.12-20.extras.tar.xz 3420 BLAKE2B c161c55413cea9c5776773d0910219a801d21c6e16de8816bc909d120477e7d6ab0d40c8a4bcb7b09f2227dc70c8cffa86392147acec9e20d2bf0179231c0926 SHA512 143eb7972c11aa69d2a81421309ba84de370ae28511366dc8264c52a073a4069bbca19cceb6fc0bef9410441ced95d1984a18142df3207aa20ee783e40688801
 DIST genpatches-5.4-132.base.tar.xz 3628504 BLAKE2B d3d99348c475bbeda9a1d0a7e3637ddc9c0896ae0de51fb6e9bd111ac94e3fefc717f84aea32a14410aa7257cc95b381c54b1501ae720c4eda569d0024206463 SHA512 d12584ab78c9cd7d3af459701eeed80519bea7e03dca6630205cc279bdd65c71a14d8738f2c29816a5b08381301210116fb769b583e3f6b83ed5e54755a00003
 DIST genpatches-5.4-132.extras.tar.xz 1768 BLAKE2B abad0014d2d982087ac982d0f017587fba8ea2b5180e67a92ed4b5a62c4129a5d275f6556cbf782b459900e03696355e4017c4c833cefc571c7cf4bbf2b5c907 SHA512 121ad821cd6628166a1ca005f2b408737ba8c9c1b8315c13926bda862b49d2ed330fea169a348b0209d903fca7a8d4ebdb50cf7dd527efde49ca9d69de4106df
 DIST genpatches-5.4-133.base.tar.xz 3628504 BLAKE2B d3d99348c475bbeda9a1d0a7e3637ddc9c0896ae0de51fb6e9bd111ac94e3fefc717f84aea32a14410aa7257cc95b381c54b1501ae720c4eda569d0024206463 SHA512 d12584ab78c9cd7d3af459701eeed80519bea7e03dca6630205cc279bdd65c71a14d8738f2c29816a5b08381301210116fb769b583e3f6b83ed5e54755a00003
@@ -52,21 +28,8 @@ DIST genpatches-5.4-134.base.tar.xz 3632276 BLAKE2B 475eaa6bb0c7291fbed3722ecfa8
 DIST genpatches-5.4-134.extras.tar.xz 1768 BLAKE2B 894032d098f79b3c247b1e0ab19646e9c79414c4070fbf19679286f7305dbabee8c39c11dfe7c7a1009f36d64f99b0627b75b455cda62b2143fc5a5102937cd8 SHA512 5d6b703ae705a8587a7abea96e64cc51f34d8762e5a93c5c9f410a52d7bac4c44aca2d21bbede8354ad5aa1fbef45aeaffedc7db69c21ea2a94c22a0069da398
 DIST genpatches-5.4-135.base.tar.xz 3632876 BLAKE2B cc4bc930c2f181b98dde258a696bcdd8f23fcb9098707d5f158f24cd5fca4f8958dc321e8ad348b9ffd96c53bb231bc2f171b9e491427fffb2fd05dc5fd23ceb SHA512 1250c964bc3c062cb9e8109da1d1276cb5e2d7c25e1175ee56672d1a6da4be3c73f52fdc9547a70c627057265fd5af6b6b99d977c0c85a45376bf5b99bedcdf7
 DIST genpatches-5.4-135.extras.tar.xz 1772 BLAKE2B 3adbde4f0977e2da60f29937e53a1f0892ce6278745c63511e486587efc10c1c6a4a8e05375492382d1102090733d4a1fa93f380b47e734affa2ce65382e255f SHA512 6ef12e03081b927af5bd6b820f150116fa3e848a457aa9fccdd4172c3e85dbf6ba78050878884d325b059f1fa4681de85a38d475ecd55dafddc60bd8362cba77
-DIST gentoo-kernel-5.10.38-1.amd64.xpak 65538346 BLAKE2B 76d5e8b10d970fc54d1dcb5d21702a1726e91cc9e8076b4d2372aec073798a23335271859f1a950b87243367cd8d7f346e3a782f01a83f04cb8c26686cb222a0 SHA512 0f6077e98326eb33a602c7bb76641f4ba43f6c9510b8ae729e0ef134f915727eb556b7d6123ec79ec648b36b242a545f6e98515d1586d7612491c4e14bc9cf87
-DIST gentoo-kernel-5.10.38-1.arm64.xpak 59263514 BLAKE2B 38a1a90a97261a72cf285351c5a3cefc352d306933616bb874408c788b4fa7b3d9746a25d75e77729931fb1dc28e9279b20f22936f95c354100e7d08c90c1156 SHA512 041defc35d7d94bb3890cb8b9a402465927d6a9bce07a2443ad720a8dc210cc67028be067be29bd1c64c0a2f6d55a4512cae4442fb4db63446911de799090af5
-DIST gentoo-kernel-5.10.38-1.x86.xpak 57251643 BLAKE2B 398526f7c368f91ed6d3043483a48988730fb9ee928b9eff3b7495cdd5ec0bada1f8b81895ecde852dc0832b97dadb4dd4ec1f2304e273e664d4d18bd90af57a SHA512 5477ac06ecaf2ffec60befee3d09f358461b423744f03f6c9d90b4528c032602e29a1df862c65525bd076806735764d312e7a277faadf63053b3d7a3fc818c48
-DIST gentoo-kernel-5.10.43-1.amd64.xpak 65520009 BLAKE2B 9d71c795fe52691e17dccadc9a305f9f17234a48b9f6e214388752ec0aeb0ba69a61be21e7fe0f8d7f0544dc8941087547c73fc4c9ffc6b6ce22d1a48faae72d SHA512 9727fad904712e4c343608b7648be662b2b1d7d9f086fe8bf302074e86c8e0339b27e69a006e5a19152d1233594753732f9c79b3b6ffbbdb35cb04da375f13e7
-DIST gentoo-kernel-5.10.43-1.arm64.xpak 61590121 BLAKE2B d55c9cb746f754ecdf1c12cd814dee77c444a86f94c9bfe15a566c7f7ee2e19b8674c5ac0fecc5042137de87e7af7102ffa4721ab282eaed3584ab46c99f669d SHA512 e8f84d16e506786be5fbaef1171283864292899338ec44e0408d960dd56a8cb87b91282879e39cb7e5dc0756aa3d76b551eb157b0f46f72b6cc119853450f42e
-DIST gentoo-kernel-5.10.43-1.x86.xpak 57258100 BLAKE2B 09b65aadff24fa8997c3e63a5935d228e67292293fbd664c833391708a073781954c8676ae59cf61b19af9b25ccf248297405fc96bbda296da77073fb74dd623 SHA512 08bb9c6cd4d62fd75407877e793812906210e8cb9f0f71c4f9ea8d81f62679461511df601fbf78618a1654b10d3784aba3a242afd68f056631537daddfeb741d
-DIST gentoo-kernel-5.10.44-1.amd64.xpak 65489526 BLAKE2B 705a0b9ed1fb7d38f0cf32b1c8babcb62db42ccdd389294dc107a81ae466abac01666715f547ddfd44e97493ecbd37b57c0a2490e776faf6da6a1dfa5a4b9a79 SHA512 0d3a14cc22704eb811025cc1c26ecffac5c6cf4c7b9b074b10e70a7430fc33858a0644f6e79abf311d560a131d673fd3d02188f1c9f80e4e8f3c9e192b50e091
-DIST gentoo-kernel-5.10.44-1.arm64.xpak 59235832 BLAKE2B def6fe6ff8574d07c43032b7836fac56db19069aaef79455da649e62036a3d9e28f8fe49299eda9c9662c11317f96396de74f91d52ac6074e37ded58b532921e SHA512 382f164b45c918ed340cdc81c93d98750e85e5d4eb5c8cc0f2a76d782352a73a9c3bc4472cf535a85f9e39651495e6725100e4b0170e53e693c31b3c5a80bcef
-DIST gentoo-kernel-5.10.44-1.x86.xpak 57201843 BLAKE2B 860cf1f1243722b9f446cb56dd5ff4a4a750f154d468d0b418af8d4d9775cfd5ea0e1bbc2a5232b4c5a1321b0643cd2d89c0625c506c23b3f7149701debeccc3 SHA512 a46300fdb0230f52765fe683afb6f447b8f58169a242bcf5edeb4f5de501d6eca5effb7b952c1339b25c24a39262d085429670a470756535d1f3ccc4b648b357
-DIST gentoo-kernel-5.10.45-1.amd64.xpak 65488471 BLAKE2B 81d1b308c05d0a2ef3da8832514b371b2565dd1f03eb2aebda7e730f506b800a48fc9d03eab968aed099c8a7fc415df3d9debe574d278ccebad685c4c7f16624 SHA512 4098f1891bbb45f8f465fe34427019de00218021b96bed8a86c8c0bae039c228ba4434b57f09e4e9fe72aebb25aada333cb43ec5d627e2f8a972cd031a887d26
-DIST gentoo-kernel-5.10.45-1.arm64.xpak 59270155 BLAKE2B a1d78e6e9c32475c565974f9d18eaf30deaaeae3fd1209775b8d606c233c65bc21d3c9179e4be49396e740fbe105526d47b5f0dbc0d32f90dfd4ef078888a210 SHA512 246e7ac8584eac7568c666ca572b001ff7f94c3ccf9bd96833d69c695c1591ad89cf7c8be9bcd0dca5917ff7a28da4ec248347792b7b7d329eb8bb9c12488815
-DIST gentoo-kernel-5.10.45-1.x86.xpak 57212061 BLAKE2B 9fb4a758766b3ef0c9c0ed2229169930b761943cef6aecd5d82dbf60a70a92b4c9c40e20a237738e36ea35c887e46cb2898c9ba1c770e357910427c023e2eee3 SHA512 7e6abec71f771283e43ddd5a647843918f3aa979fcda6c336bf1f797ed1f8e144e9b8468166d6ef6c82652bba403d776280f7c21366a14459fbd4c5e2966c8ec
-DIST gentoo-kernel-5.10.46-1.amd64.xpak 65480369 BLAKE2B 69fef95b1daaad661467171df16ff1e3143bdf46740193351913ca752ed4c4f386cff57a57b9519b676ea02dade4b80152e1179f31c8a56b0fc221e4c9134e73 SHA512 64f99b39684fac2363e29e95a43643f77d05088650342f8e53f29d1ff2589429db1cca9ca3eb6ada83f987a889dc878e6e5f59188c236a112c20cfc8dba632b6
-DIST gentoo-kernel-5.10.46-1.arm64.xpak 59246438 BLAKE2B d263f86f320e8206f71eb1a80cc79b89aaa96efe722343e041023d2d0950e69ba3c6020cf2c984ff4e93c816cfa843e253e284caafb10fbf1b08d3bbe1413a45 SHA512 df4fb4cdc173135835508ef13f363406c9f9757eb1e67360f19e8179d067c21367ef783443086c348b2101e12fd1619292cf256ca90401c955dbd95d7056dc77
-DIST gentoo-kernel-5.10.46-1.x86.xpak 57216120 BLAKE2B fe702f3ff06d1394887c1c4ef91ea6e10582b1b33e1b8d821b07feec6f9a54220b0d1e878e4b63961c817f574c727e55ac0b9db459fb3d3ad2c81e7a838e077c SHA512 75d6cad82e5ef99cac80acca448ffaba9f03e2985fa78d4ebfd8c39c694ddf7b803a3720aab731987094428a9afc195860f3013c0e33892bdafcbee6f5455c61
+DIST genpatches-5.4-136.base.tar.xz 3704860 BLAKE2B bbecfa854caf388d59da60c37b555090e323fd7117db68e4bf9cb84ec8605a286c7a1e0fff02622043b7884f4e57ff5f0cd18f7cbc70736eb04b08a2cd7d5aa4 SHA512 e8b3883e06f0fe00e598dd36911697cbe8e938f7664d9c8b8625921e7720ee50b8ec0ba159d0f50488357ec2baed0e640cdb7fd5d2a2f26dffa3a76640b40871
+DIST genpatches-5.4-136.extras.tar.xz 1772 BLAKE2B 956980231960a32019c0ef8fe608f58b7caa291fb5e9f06f1f9435111aeba9c89fc14f028247bc97218022c2393cf16faf4b94e1b32f5b7be263b263bf69cb45 SHA512 007b267166f1e0481ab1ad3172492fd1f7929e1387f230ed24177e7564c4319b8d3f7c7e075942d4340ba19a9889fbcfd580ee335025314cf13a3cb9ff42886e
 DIST gentoo-kernel-5.10.47-1.amd64.xpak 65480161 BLAKE2B 60863347327dbb67ba16881c01244ab01f7246267989018373a85c5fb479521f4c70574274a5b7caf98dd78f9601e80a887cc115e87f8004bba292d438879970 SHA512 a73474d584215180daf7c2aa9bd985b29234bcc319b9b8a4691467993cabd8c532efa611bfc3b13b323d5635cda556b57e704c11d8a43b13a3efaba8cb84fe64
 DIST gentoo-kernel-5.10.47-1.arm64.xpak 59021827 BLAKE2B 7a322a113ffd53ec9c8ea8fbe06b9d4a4cc43b2519c3f33ea4b875c53192e58cbac345c21904f9f4a718576bf59d5062e7a0b46cea6c51453565afe8e01fdd55 SHA512 c7fb021069e49177605eca80b9b5ece948394dacc0b2fb280bfb834606db5d4e05f7516f20539c5a5f5075fe7ad216b8b5cef7d6e829099ca80a0b2c03ed21fb
 DIST gentoo-kernel-5.10.47-1.x86.xpak 57221591 BLAKE2B e069b66b20c0c9fe3ab35cea65dbe797b1a5a9b2c80b11d5e49113ace7d9df5eff6a5b1aafcd7a65f5df96d21796fa89ea75b825cfef61058a5f5af13f6e5c7e SHA512 14982da4f9fd7ac365641a5a7f6eda290691bf4c36d67a2f4353d1e16c0bd3e64e3c9cf47c517c295c229cacf70c157614808054b3b96363f128c71d6fb8abed
@@ -74,42 +37,20 @@ DIST gentoo-kernel-5.10.48-1.amd64.xpak 65536136 BLAKE2B be9827d86c0fe12b750aa5e
 DIST gentoo-kernel-5.10.48-1.arm64.xpak 59043938 BLAKE2B 3747e7835e6d3ac4b0659d97a9d45eb9276a09258dac16488e7d701202d524a91406c179a388e215dea878614d66d01a5ffb4d45e898662d11dc597535993571 SHA512 167b5760026c6fff7bcc1ee4b5ae6e6befc287dab065495fdd712fef5249571ba6c72a270e54d9ff4ba41b81a08cced954994016b63e37813911372d686e3046
 DIST gentoo-kernel-5.10.48-1.x86.xpak 57223594 BLAKE2B cdaf9e1f4d49cfb1e772a5c5ad92bfcdca846a16a540032136845c1fc7256c6df405e2d1613377dc5046209a750bfb9b6d543203d604853b2f2d7dfb6e786c5e SHA512 3c1e1895a89cff6f03fda61613c8bc1c62cce4c98992e354b9572965728ece2e7556121edc725a942a23b9eccdc52d6282ef3bd929cb79052ce2ff495a849db4
 DIST gentoo-kernel-5.10.49-1.amd64.xpak 65485861 BLAKE2B 8968b059a030ec15baa34647f0738e7f7666e889feb070e6476a38fd4c13d60e30b0837b62e258dc74c8e8b936c7dc0c717c110e117750e79bb24980530d2ca8 SHA512 d3524763ee27f9529ea8dcc02335f59b04c2da8fcb9c093154b38632fdcee654e2641c888e4fcc9edfa54131763d2182d34df4ef8dc68a5033921130ecb87f9a
+DIST gentoo-kernel-5.10.49-1.arm64.xpak 59061383 BLAKE2B aaa58b2c6ffe3cba529597af8b6fffa0d4c091dda190a1e59f53787788b8884e36f0e0b56e48f12a861f97713992972f5cbfa1eecd6ca21ca1a4b2d21590d01f SHA512 c8d05a0d7c5296d0000e16c04c23ecbb290205a1fc502b7f923b83f8cc366f421a9bef20204977144d2ced491a705b0bc291da507861172514831b1e59db3921
 DIST gentoo-kernel-5.10.49-1.x86.xpak 57214239 BLAKE2B 9f9740028a1c6498781a283f0fe823a137c9e49c3c51a217a89c54aaf9bd3ebf8c8c4205ac6c8e92c0a9b8c375b40b27d30054db05ce30908a9f40be17a3cfc4 SHA512 65626b07476e7d6c82643691f0197e63dd2756789b1a241c6918b305e1dc98500e27114fa781c93f46028aeff6f4194f0b84768d155829add3d50eb8febeebcd
-DIST gentoo-kernel-5.12.10-1.amd64.xpak 66370289 BLAKE2B 74f9046d711902b5cb650c0c1eac07f4dab42037fc93ee3f9ec70b14a708d1244ec65d54e11e1ab169384bdf2663816dba33e58d22853f30133341296ce65db8 SHA512 e42a2d5122d17a6abfe75c17585e96d0fcb87ab21dd3bfbddce6f22c7b73b66daf358b642c4b3658d2d5e43a3c586da5bd48e90e00520ec2cbd696493510f410
-DIST gentoo-kernel-5.12.10-1.arm64.xpak 62567249 BLAKE2B e20ff0b59f3f0781cbb7d1a2eb290e46cdb8fc0f4aa189bb70f7ad5d02b54a5a30bdb3d91c779bfdb04daf01efe5c85376c4a3faa52cead80743aae588993e26 SHA512 ee5daf6872844476018ddab8445e3dbd25d1585a8cd2b6195028b8f8690cb262befcfdef3e0267a422f30c4ca0036dd6c985331cbacdc0c8e79f9c7c9755f4ba
-DIST gentoo-kernel-5.12.10-1.x86.xpak 58113734 BLAKE2B 093fc8ae00efefb2eb38cd0ce145f16e046be2f5110ad18d957ae122b97a1d4a6e6d8cce4c42f53ece1dabe9ebd99640c922686a8a00f7186bdc5f8b82f44144 SHA512 5c58a7277e1c3b1017ead2584dd6c768b2b4476f0da0c3dbd28facec64c1f37a3db9119d869720f6f63e3e1c53ffb8d69efef8f5008e0a71f8f55098d2ce9d83
-DIST gentoo-kernel-5.12.11-1.amd64.xpak 66335668 BLAKE2B eb8860e2dc03a9b8b0b350ffd84d2fac5a00ef144b57a3bb2623f1d7cf46c965509c026e92c706b6ef4c3fe32ed8c48bb525b434e928eb6ff8702bdf2744b598 SHA512 e6ebde7de77315b1e0f85e6e2e8b76caec0218bffcb9e9e3f563abb6c792c2fdd62e5c30e6b25e1c9b2ec4d095e7a02479293a0f7e7b6ed6a258b6aebe102d85
-DIST gentoo-kernel-5.12.11-1.arm64.xpak 60224274 BLAKE2B 2a3d2b3a5e1ae0f561c1fd41297f06f13ef7c68e6f8e3c8192253b888f8f738e7adcb98dfd5b4e246e951af7a5f1c2ed19fd2b6f423701c2651ccb1ffd5a0dd6 SHA512 b9d494dd138dfde68a71605f61b2f8d28236bcd0c836950c417c82c26335bc238c12cc0e09b752db12b9bfd5553eef56169f3809af35021756888e39cddf7029
-DIST gentoo-kernel-5.12.11-1.x86.xpak 58070750 BLAKE2B 9e5c5e03bde9f2c707c9914d620d9c12fc148088b57ea89cf06922c3111058979ef4a9b2a6332a29b7a563cdabaf9c350da5e7048ad2995cd4274f8daa0fa895 SHA512 95e96a56c9ad5820545e3f085ababbe12daf9dd4582088f86a0a33dca45694c9290d1b65f13097b2e0729cf94a06b3e99500561c868bed3dc45d956970c03f71
-DIST gentoo-kernel-5.12.12-1.amd64.xpak 66332975 BLAKE2B c1ff082fa8e12ad8faab5b9a955970b894d213d3398ca41be4031dfce75f51e6e4662928494771a05501ca65cfe7ebb0dbd881f9bd225bbf457612be7dccd508 SHA512 ba42bd62c809cfa4fe7933e269e8e1ddc4c4de8ae4fe18265a262d6d97bfd654df02a4aa3135e160c3720e3bb6620d5d1b8d8b75e37a62cffabcd1e16cb74542
-DIST gentoo-kernel-5.12.12-1.arm64.xpak 60233927 BLAKE2B f132efcd02a435b994591d3e1ff277c6d65f9412a0122ef17b808666f11ab97414528f40e61bcecde0b7a40c0f06c5ad5981156c17ab7997865358cd342ac640 SHA512 df7ce3a345a7eb98a2ac9750d6b1d2039886130e514d7f84b4c4f64afc3fdf3a2ccb238c203c73242a4863e7efe5b4f779de66b8054aedbc97bbc1f17e7e1616
-DIST gentoo-kernel-5.12.12-1.x86.xpak 58065273 BLAKE2B 7acd669230139ee760f566df9fb94b5e5fb686dc5bd1b854a1c2516fd7f86b58d925ba883c92f27da9e6dc9c72ba219d02b1da8eafae0bcd580be132036c7c41 SHA512 306d5281684d6e16321eaf7f7ceecccdba5b5e3bca47d75298e8a61a4849af8a01dbeee6ec62c1685f2a2c7418e3922ddd0b5d216d54756e70f898b0033caee2
-DIST gentoo-kernel-5.12.13-1.amd64.xpak 66367685 BLAKE2B 5003780ce8ce24b1110a8e78b919fc3b92da0cd94f189d75a6d66f3c8a47b7b52d6943c411a1f2f4dc3f36c4004859af61f3faf0a974cc9ea14a6b2c3376e9d7 SHA512 75f3c38008cf79c789d3c890c8b7d7b00c94f94b8711967d684a7d5cfae088d88935f7fe0815603ce6d0e21f92e956c7afc40cbd7f09675dfdf9bc572a648adf
-DIST gentoo-kernel-5.12.13-1.arm64.xpak 60225483 BLAKE2B 1bfa9a9a4e3fd86c5ea134527b268e2a646880ac68ee8804b1defa7551aab4fa4405a0e383cd5128446fd9f126dce6a0aeab95524d9674ba013cce512e7a7ef7 SHA512 1a3b12bb5435ca7ee194b8263aa19c3b13bba210d357922bf11f6d974b3217a55c6b85a5df98b81a31444a24289a14d790be2fb658973118d69cbd2f7f1e2a47
-DIST gentoo-kernel-5.12.13-1.x86.xpak 58064879 BLAKE2B d249693501238524606aa8c7544888745d45582f0ec94ab23c69c4c75e92e7d7619f7f2c3a2620f68b94d7c9605cd36baf5c927353385cd717f7b1a2acd7be1d SHA512 3b947c243ec8517b32314947b140922f5fc6c80fb75bb5eb96fe84a537baccd096088b3643ec00c25e5f87610705383736b4decf37bc4edd61ddf77b457f750f
-DIST gentoo-kernel-5.12.14-1.amd64.xpak 66384986 BLAKE2B 42979ab70fc69caf68d60bce85895d1d1c93b9587f1a545ae98639f2c7800e712fa9c8acf5fb6d2e41ca2a088f9b51af881008ec98299368030a52146ac28604 SHA512 16c05df2857f7058e8becf5fa9451cdfde76a34615de0803c3586ffd1c8b22429eb3eb1d00679d40123bd96c0d43e4bf8f237dbfbcec9b3dea729ec1a6e758f8
-DIST gentoo-kernel-5.12.14-1.arm64.xpak 59994823 BLAKE2B c36896fc4771218013fff34d504507a0312ccae2c76e486396e6c6fec39d79a3e38bf056f355188ea78f45a249e3798be1943295ebb07e2af77ef8b73ad7f9fe SHA512 f2bad60254ee49d7439a789756ccf064cbdcd9e8e8e298edc4c75cdf2a03ff3c5827880167139e4334457af7062c55fde37e8ea92a728e16c224f424f0a9fba3
-DIST gentoo-kernel-5.12.14-1.x86.xpak 58064174 BLAKE2B b614ad928d99685a4b93482155e1bfdaec106c868fc7e619dee0fe9c68d101ceabb16cb203555fac00332f19dda028a30b5aece8d046ed24ae3948efbb081046 SHA512 664f8db652b124b4db2ebcf331d295529f2832d033b81e21a0517da5c002bb6c96dfba77c389af87641174468f4693332c1d0ca2d295e69b7229d068613ce332
+DIST gentoo-kernel-5.10.50-1.amd64.xpak 65470237 BLAKE2B 344e0c3468f3f8e3bfcc5382ade67d094f35cfa5a245215c664ccdc51869a975f3407a8a55c96f50743b8122a9357795bf8c586785468180d9e9d215c365cfa0 SHA512 35ad272024189d313b1a17465c96c7ce0ae1308c1e23d915805b57755be7154cfc6f759f6c5c8fff49450a1f2a6ab4a5457feecf24361680086b5cf8e912087c
+DIST gentoo-kernel-5.10.50-1.arm64.xpak 59074365 BLAKE2B 769503e2640312c7e6770c205319d81b765ff902c4924ebb85d013b464491e62feeb0e7e232da0c368554fcf2888e22f9ae139161227a096d0c249ecedda5774 SHA512 c5121f1b31eeb193ef44db835134dcd9b7a7d4b14ef3541f49e424dd49966b62cf23dcb2a7f37bf0aee054ceb3798ae20b9d804cfd50a2440482ecb2f01b9a88
+DIST gentoo-kernel-5.10.50-1.x86.xpak 57209152 BLAKE2B 81e7a7ca00686315c4fc3c1a2523dcf5ffd1ab2f85b837ae5ac43cda2dfb372d005f455c22f5483ae2befe7e88fde0784a9b7ade9d4b4da5666aabf9fd09c0e7 SHA512 70896b6fd4fa2032f8994b582271126b0bea3eb2d2048ebbe9f7107d4ef4674c6db6cf111884277373b50248575a0b7cdaebf576e032ba0394ca89b28bf0702b
 DIST gentoo-kernel-5.12.15-1.amd64.xpak 66395917 BLAKE2B b77c5e26863dc1c10da3c82904ef035f93c7bbbf60925f7c91836b7cfbb3d32335a8cad78a9b1a90a6d462f34fb798c393f7f992c54ffe6e1a5391b1e63652a4 SHA512 3efe58c6e9d948981fe51fc93ceb73de2f9a049cd396c62e743b3c5033eaf60b05d3100b2377060d1ba6245118281a49447bb5404dd4cc12b616a682fc4c252a
 DIST gentoo-kernel-5.12.15-1.arm64.xpak 59971350 BLAKE2B 4231ed09d6efd9acae82078d259bef241223770fc95c24145a940ff3e4d712cfe52677a358d4fe26a6bf74129feaa3abad67e2d17eedd1e04f34758fd7ac5e1e SHA512 9eb582dab725c1716b777986e0adf90b353ca481763b27c65240d6b4d8e52d54ca394848b3ff7977651606341e39fbc19b0002caaa8174916f298bfe480087d9
 DIST gentoo-kernel-5.12.15-1.x86.xpak 58062337 BLAKE2B 2ea33f13f41f6153e117dc99fdb805ff6a24071b6231730ff159ea2597e203655e5d6daa632f4fc8ace6444d8ffec7e624d222500b32e7b33035ac5a56b3efcb SHA512 62cae2c8e1fb42b3cf2ab48ade6fcbffcc03fe3b48c0d00fa7f2d3229e43a615887907e70b3219c3b040061134134f95c11c9b2d33a1f0ae568df7ec47507395
 DIST gentoo-kernel-5.12.16-1.amd64.xpak 66344196 BLAKE2B bf0ee9d5f5186527a829b8c040167c176f5a26aeb24fe31522349b161ebb2e5007c0c993c6a99a1d224713522f82c2c235d0b40466952c2afccacddf874444ed SHA512 3f2d4b25c2978a54ed5ce384a902a782c757dd2edd627a08122d9d85c7e89f6d642ade287c66f751d5bae099a708c4852f3b853991ebbcb1dafad9162fcdbf56
+DIST gentoo-kernel-5.12.16-1.arm64.xpak 59977017 BLAKE2B 86b31e93fc1f2314ba095632ee257a4dc4daa6eb98a64d6bcf4c18393f2b050bfba7fd7407b637e7d8e1a20eb85fca1b9d5f84e2fe74f04dbdbc3acc01140975 SHA512 667e8d094835b606d7871843dac991fec62331edd7ef0bc03c9f2dc2bb7183c0265a831f2076b23ffbc3a008e677368a369a815f04f51bc2529505fb3731caa9
 DIST gentoo-kernel-5.12.16-1.x86.xpak 58066447 BLAKE2B 34d639113540707e4fe2f104f7672b9f0447bc19c46b547b3ba0f2b21b6f58594bfe0cc3d63f382ea51b69a71b571cfd427263b2e0d97c9308d122e6f1639675 SHA512 49f9485f3ed2c85d592f668753c352d0095e555e2f1a72292d224c19868b0b3717afde7bbf7ab87b5c1d8985280059098d5b3931c3c904e34cd740b53bb88325
-DIST gentoo-kernel-5.4.120-1.amd64.xpak 61385726 BLAKE2B 4eda28bcfaaeb8caaa0d74c6fb37b203528ccd9853c775bcd40dc9f4698edc282a5c70602b42945b98840b1ea3d6b0d620b7726c65c83c16363e1c7542822cc1 SHA512 c36c7c5f309dea87df6af0567929f7fe09656ac49e33fd7edca62522aa45656e53d717dca5a9702b246446f25d7c3249ef0fdae8554f71cedf90339bc8b620eb
-DIST gentoo-kernel-5.4.120-1.arm64.xpak 56380077 BLAKE2B d9d0a98d00b17925c852b75875ba4eb373624cd1fc35df60aa50796e81facb5067146f3008313b5776aae7b251ae6559118cb36f1480813073341dfa37de01ac SHA512 c207f79b59ae38ab58a2f7341c8d21e3fc388eb949417a033d4dfd9fb0a7acdcac4a1d5ce8528708e7a2dfba1b241f0cf03235b5c2fb9dd1c930a36a8bebd2f5
-DIST gentoo-kernel-5.4.120-1.x86.xpak 53191725 BLAKE2B 816d230d0755058eb5ff090977e607b5d077ff5d49766da19416593aafaa529becb742abe6ef59f0212e64affe95e45a313559b5741257c05826be539e9a849f SHA512 86ce9f57c0b14f6edf3403fe2868d7c32f7d55ffa714ffeecd4c3830eb88633aaa71455e8a962a2ace0363981b2b820b4fab50ed10893ccf7470945c6e31a196
-DIST gentoo-kernel-5.4.125-1.amd64.xpak 61394912 BLAKE2B ea62eb77e681dc424c5674e9fba88ce3c351273a9e8580c7787bb8c1ae4b9ccfe341f646590398880078cfe8e1750cb349116c02e1bf9fe46c53ccac9f170dac SHA512 8686d58efd6491e99e9680bb3ca398dfed63507c76c77c03ef3ee1f05d3e739bfd9a6a53b14df2f9200a2365485d42ba20989dec700eca764bf289985cf1f010
-DIST gentoo-kernel-5.4.125-1.arm64.xpak 56377793 BLAKE2B ec11f0815df1cc702a0bf384e91ea103c7926655b64f746598a55a4e7af231780ab69ca64197d500e707e62b377320eb861d236ec624ce5f0af1daff4312d701 SHA512 a74116b40eacb1f349cae3fdc4342b6c64f39926731beff4fd8550f186d46b16c8062b532f3384fdcdd0a2f18997aacc32d5ced0905e5dbca910308020b1751f
-DIST gentoo-kernel-5.4.125-1.x86.xpak 53179979 BLAKE2B 6788fa462f05eb162fd10aa4348b032fc5bb7776ae23aebf6df39ba5b442be2cd7e6c0cc7f8b50816c0d59f0f964cfb6e806a2ac70e7b1553a090e534a8c0f8e SHA512 2191a0ee564549d4ecb0dd9ef622e32c49fe41a84e27b73e425178f02193c69cade6330301c02cf9cec7f44f1e3e3ac3b5828a04f157c6b5c784494add7a0143
-DIST gentoo-kernel-5.4.126-1.amd64.xpak 61351554 BLAKE2B 9aadbf998b8cd535f6e8cb880d37d74a50a98b8e37cb5245e1ca67345d2ec6ac7736d147d7805b3e3bb5506d128ce88db19d306c9f6a56e4f9b54be6e0d57d3a SHA512 79ed0fafc60d887aa27b7f266eedd0a0ec2ad9aa92c9c3e77ffd7b6e7153e51c537cfdc137c49476b073fc1b4dedfb651303c6e1419e7603f85fb6a20937d312
-DIST gentoo-kernel-5.4.126-1.arm64.xpak 56367523 BLAKE2B fb9ff4bb7e39bbdccc43b10fe4e94ef3c71ec97546d8b9a6cfcd71e86532700867959c298dc276d1f1da443c551c312b769a185dc9dbdd0c100cb6e509468f1f SHA512 e231972171447ba6586c51b979415f0fb5ce3bb7c002a4ce12c8d166d732d73850a82b978ea2b9a15d93ae9f4be9241106f3d50abd30aa9c05d4805526c4904e
-DIST gentoo-kernel-5.4.126-1.x86.xpak 53132617 BLAKE2B f258618c899740fe2e7d2fad65d3e589b0a48a7057a11f57ceafbf84900cf8ba1eec594d93960a0686378575238f3b2841921c3805ea82e4d8b666f36fb95981 SHA512 cd9489c2e4d2142237d4bdc7c473c6122eff0ff69a48d49f7d43082665dd62c58eb4f2f41b2de55c4a31da62c1826cc2a26b8561a062b55bf504f7eec3c68f97
-DIST gentoo-kernel-5.4.127-1.amd64.xpak 61364361 BLAKE2B 9ff813492bd7bc1f135b36bc323b8a2cf45407ecb0ab48cc9a69ad5f7677c02b678844dc33e2700bd23aeacbb468bba1b082b3a13d7c112b317f3aa6442cd406 SHA512 76abd4492ca0abf2017f14d6545aecbf49ff68addef44a0f6197cbd3ec1d5f45d53162afab355c9abc43e0b51d5069e76f1c06d71c137c2df4817011a2bc3e87
-DIST gentoo-kernel-5.4.127-1.arm64.xpak 56394161 BLAKE2B e3b9dc7334615ed225ba0cf71f18e45d7f4c0afb82f467597801094361df137feda3c26051c4bb1eef76b9bf9c77394b6029d4fe703746262f1fe3e7ce623ca9 SHA512 2f59983a0e5ca2e08c598aada66e3d5c052a0f67448bf979261d75e0e38d8f0e5e3921aa4f09564709262d86aac2361ccb367c6ba78addba6a6731eb98a10c87
-DIST gentoo-kernel-5.4.127-1.x86.xpak 53135461 BLAKE2B f363e24cdeae29dad876a1aaa8c0159d627d27d632de2d9509cc4f78cea4cc8ce963956771b542219f9a948e8b1a2d6aa5b80878a21d99cc0c1c3bbdc14f538c SHA512 9f9bb382a88c4f73b94956cb765c9ef5e380ee4e12b67ffb22cbfc8815bdcbf1a62b68ba770fe03d7ec3d753bbb8b3c11845ebcfcb2ef263cab9442c9fe0d340
-DIST gentoo-kernel-5.4.128-1.amd64.xpak 61349719 BLAKE2B 11cbd06fa2e8489c57ef2383f5fdfd0a270f7994bbabf1c9dab589ce12278ba9d02a3549da1ac0f0c553a991d54fa2db42c67a26d15c1bdbbe496f3711d73b1d SHA512 6b59014f8b33f1ad3f5b1c233f4ec737ed7058ceac83e1c92c42ff1de5c7358067eeed6d491d9a03c33705b8d5df15e47388e444d8237b6fae389ba78947035e
-DIST gentoo-kernel-5.4.128-1.arm64.xpak 56376275 BLAKE2B fad0b8cb4f9279ba59b660700ba21b36e432b8e89fe6623aa5799a7951c7641f20676e5e540237a92b671ee11cddcc4e338ad079d7cdd48af35a57d53aa65419 SHA512 96aa492cbb67adee064ebf9b97fd4f3e176e7ce4a7ed83038959fc7e06c42115fbf02cfcc40dd457bcd3f4f7769919e40eac3f2e13c0183a729596700a1706c6
-DIST gentoo-kernel-5.4.128-1.x86.xpak 53129699 BLAKE2B 0f51b8436776dc077e5f7540948e61cc5a2be00518e7da6372cd7f59de108d2efdf3f477d934efff979d94df21ed76568404298df91df6493d079aca2fad03e6 SHA512 e63f619c19f00c1dc1c5e11d0937ce4a0e9acef643336b51a8dc203a93dd1c3641eec8fda00713c6c40570e52a22a8714983de6819a4b9efaa6a37c6231653f4
+DIST gentoo-kernel-5.12.17-1.amd64.xpak 66386296 BLAKE2B d3295c68205b40db976ab8a8a98a354990339fac12c7bc7b7e5267e4e5d794dbf707641c62a7fcfcc0302282c9bb3f2e2397383f8e288e611a64413a04cccc25 SHA512 86e51ff6e17adaa8a3210c7ce1926cb0f3ab71fcafa54b883c288a67334d02a5d1045b8329f3f300f9a8bc723af6ad7b1601521066c64afe5c030492a8283986
+DIST gentoo-kernel-5.12.17-1.arm64.xpak 59979517 BLAKE2B 8fdb4bd2ad39ccbd9a4176c5a1154eabcd8ba94eed84d497ef69fe280aecf8dbb2031a15b54974fc94497a35c94712e0a3ccf9bb38fc868211753161b0eec3c9 SHA512 f9fe1524596a0d9c5fc1cbf5985480c53412605ead30254bc17696fe7807b7c9feeb84c86e44fabe015013be6efa8848303b1a35f53af662369023e3a29203fe
+DIST gentoo-kernel-5.12.17-1.x86.xpak 58117300 BLAKE2B eecdaefb730a38d2b4b5d02dd880f03c841694fea4f940de0dbea28bbf3539b24e34eea97d11adbcd68f709d7d8b1663ab0efa587b6ca163f68a2caf7b04368f SHA512 2d8e4b3beafcae99ade25195a45ab26305e8f600be33992357678e31c3e0304e6812f79894a705d72e418fde7825f50ca905e92b559e4d392f151b776ca1aabd
 DIST gentoo-kernel-5.4.129-1.amd64.xpak 61346649 BLAKE2B 37d29b604a69fd8bc84c41bc619bef982d10cf31d7220ff79bb853a674eb594418338748968042d19352458ba61015bf631c8f36f3a1a6674bcaf228dfaac240 SHA512 30601d1b125d1bf1999e49f817d8a553f387c512a85cd2921e201e7e06b85b90148aef276fdcdfa50f5da477a067bae52af5c400f1cb596f9fec21bb3162db44
 DIST gentoo-kernel-5.4.129-1.arm64.xpak 56131771 BLAKE2B 5567df5a41ccd99aca489b8b35718eefdfc9ddb0d9bbe6158abb32c59490278c6e1456ed021f9a08f7bb9b0c206fe503ab31cedadf0276a01f7fbe56e8ea8270 SHA512 8be57abcb7533b8f47a3bc11302e3f9b0ff8c33f67e6830210030a2caf3215b708856c899ecb7dddf9af707e39594f035a21e503c98a909ca1ddfb156d121554
 DIST gentoo-kernel-5.4.129-1.x86.xpak 53134201 BLAKE2B c7d76168ceb139ff7e206e5005d6cad2c7c54320967ca9e9c8dcf493677527fa3712d43c9b6dba96a54ad8b1d68cce937dd3643b0ac2d1e8a32c1d27361f578a SHA512 edf3c3f744738bbc06f13307259ef6315cb5bda60d9ca165853b7ea4b2f983ba72efa3bb1b4db1a0b21deb5060b7636a5c41840b36cd1ee224bce69358db6e4d
@@ -117,51 +58,34 @@ DIST gentoo-kernel-5.4.130-1.amd64.xpak 61373618 BLAKE2B 4431a12633d68d87e95826f
 DIST gentoo-kernel-5.4.130-1.arm64.xpak 56048219 BLAKE2B 72e54faf0ed99e570e71504afe5b721875fc4d491d73cff91c6534abd612962d9360c1efb01c0757ba9764211b3030b5c6032d63106b7eee9d8fb9d55683da36 SHA512 4b7cab1a6fd68b9c46cf4f4d5d78eb6d66bff424af9c3d2a844a072ee2578f679d636c2f185b033a55ae12ee3d7cfec5aeb2accb87a3a5e6ae1e19601c620374
 DIST gentoo-kernel-5.4.130-1.x86.xpak 53128397 BLAKE2B a4183f65fe7bc2b869b3556342434b90f577c88266a4462cfe4fd080584c333b7c934649894d9c570f1949b018614b96e17cd6b118aad08fd22e48d3a44515ea SHA512 2ec7337c2ca20eb43c0423318199e36b8d64454d0594910d84d965d725ac416509f8be2b60d70f76f8a8d40a8c17b0d928f6cf8e20b8271d3f7008921d4ca10d
 DIST gentoo-kernel-5.4.131-1.amd64.xpak 61358364 BLAKE2B 198334bf55e0b55316d6e0373a5cfbcd707a7cae0492b5dd72befd10dac53bc9369dc85f47483e79abf4d8db0a56ccc79ee47b55ebcae49c3df93882a3c13db3 SHA512 2c4b41fa72283ba2d09d09254141e3f1b5aa1cfdf80d84efde927a54a0ce1b3d911cfdbbe065ad3983134eee8f68c3656a722b5236edd7cc5295fdd02f339bb4
+DIST gentoo-kernel-5.4.131-1.arm64.xpak 56106784 BLAKE2B 927c175773ca2897140764a5d5558818b51de95596c7a87f8cf42127f0698735e06e34458537d334810287d020aba039fe57863d2f78691de5caa90f031cca9b SHA512 205fd52209234d26857eb962e1ea956ea5e7c44852663cb1e0a63a095e35f30a0448eb15c8a5ebda53129b4054c5172fe9db88c544ab842c5611dc4150d535a4
 DIST gentoo-kernel-5.4.131-1.x86.xpak 53137168 BLAKE2B 3b7a631de49d5ba7de28e839bb5c67218b7e2f13ad051efde3d9b70142be81636e21d0d3cf48b94911851e5dab38db523e552a52034aa8901bc331fea86127ae SHA512 49a7e2eef8572a51c9cdf24f16908d4527fa5d27db4a673fcea03277864fde724d92e667d4cb4ae0dea0d92a783720c19d5a5160439dcbe404694236a02a5b90
+DIST gentoo-kernel-5.4.132-1.amd64.xpak 61362216 BLAKE2B a298c4bb4f756cf0f1d27416b1737a9e263648f4bb8220c97e8b8733ffd4758406b00678e5e5b1996a22f8a8a18d728dc41f749602924d7e8b74221aac9b05fc SHA512 80d4a79e8df63a57fe66437aab0850e2f6617791571abd142282abcd1c961fddb73b7ab5beb60e24c903bb1fe38b6433c2cd4afdfcf5de3de3cf81e3023eba6a
+DIST gentoo-kernel-5.4.132-1.arm64.xpak 56070122 BLAKE2B ae7f2da1bbfd0eb682503a5c5b61f8642fcca276c8ebb3fbb67a81620fb0c2969ec42d9079d4067e16738d0ab5f15eb70993bf152453799acc4fe6b7a4d85391 SHA512 a49284da190cb8c633c457698f46fac8287122f774f45f6662970c281a8dafac536bc3a42b6a7720d834d4c9427685a0ed9b08ef2710a6a4ffcb2887e1b6b2e6
+DIST gentoo-kernel-5.4.132-1.x86.xpak 53136062 BLAKE2B 79c432723db6a8e0d38a2f9d01611e91a76b1ed9de959177e10325b14854786629785685226b1107454a6c7088386695c75f4157b3d164e226c64b322ac63684 SHA512 671bfce54c06eb0957db4db797a7768664be911388583626a013a57fc2f5ab2bd2b4d92063563d38a0659cc912c8b8e114971dcd3ec7b66da8be65224bbe695d
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-EBUILD gentoo-kernel-bin-5.10.38-r1.ebuild 2540 BLAKE2B c4dc49f7fd4ecba25e760b9320095f5f44df7431fd9ea9f6fcb4d147d3284b902fe2280d654c5541f0c744cc4cf90edb0f704168723bab0bb17f7ed28232dd4d SHA512 781f7471efe3c24bd3eb63cd0d59655741d953f0ff13188482049ac263fbe45283f907d69e160f0d1a5b5e9c9c59ee3238f75fa20851ba4efc586e6ec7b6beec
-EBUILD gentoo-kernel-bin-5.10.38.ebuild 2673 BLAKE2B c07502536fd1fce0c1455c4901e2daf99983fc26069e30c3c395ab1ad0d7730aabfda15f30bb1fcd07c291616ee3a38c1e6df6c9afac41f46d3709e58ad40177 SHA512 7349a18625a8df057addf156dfd63b072f16064c995b8127714582278747d44ef3302c17e1036b954aecb8e2116d44c7f19b56301276bc49f9cd50726c723072
-EBUILD gentoo-kernel-bin-5.10.43-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
-EBUILD gentoo-kernel-bin-5.10.43.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
-EBUILD gentoo-kernel-bin-5.10.44-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
-EBUILD gentoo-kernel-bin-5.10.44.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
-EBUILD gentoo-kernel-bin-5.10.45-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
-EBUILD gentoo-kernel-bin-5.10.45.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
-EBUILD gentoo-kernel-bin-5.10.46-r2.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
-EBUILD gentoo-kernel-bin-5.10.46.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
-EBUILD gentoo-kernel-bin-5.10.47-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
-EBUILD gentoo-kernel-bin-5.10.47.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
+EBUILD gentoo-kernel-bin-5.10.47-r1.ebuild 2542 BLAKE2B 7d14a8ba016657b55a1f1a74a30c59c7c1f7176126efed01f11ada2c3dc3c9fd16fc42812bfdfbe8b7fc5517e15f684429ad7d2906529514ee286ddea6535db1 SHA512 2c65c2db43dbe0a3355f625f9a04aa2447ccff66e7c29ad1f56270626d6c770e2e0dc7e4c87bbb931092a43372dd58dbc204e7fc1e7d0b34e50ca9089f92117c
+EBUILD gentoo-kernel-bin-5.10.47.ebuild 2675 BLAKE2B 7dd3210328d31c0727a866ba4d939c2944d0782f9e4193bb91b1a548092ddf632eb2d7a80132d318cfd6444183a3277cbdb5f2308bf58de118c21ff36280fffc SHA512 c1c1ca765d27a7f5fe006a3df33b6059fcda6d5897ddced7144dc81ea1fef67fcdd0e5bcbeac7d4762b438098968af81761e9350d3a3accec3e425cab7303f91
 EBUILD gentoo-kernel-bin-5.10.48-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
 EBUILD gentoo-kernel-bin-5.10.48.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
+EBUILD gentoo-kernel-bin-5.10.49-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
 EBUILD gentoo-kernel-bin-5.10.49.ebuild 2677 BLAKE2B 8606b62a0a1d65a3e857c221480f04b1549c55db2c853064857657ef25b1d2a099dea316804f836c0369938d5a951a3361224d23b09f8db6511a4ebcdb61ad7e SHA512 c6d131b80829f7eab85293df669cb4264b1248f4b662041ce32eecff612b3c67cdd903ac80b674119ccf35f6b2e702a6a3778c80857fc7f61a24b219973937d2
-EBUILD gentoo-kernel-bin-5.12.10-r1.ebuild 2544 BLAKE2B e0ac33f846032b242bae33740ecdd0ee19a8ee4e01b4dff1b6d50c8805b8a49c7597adf457e9e437e3805f199db9348aabb082cfa66a5e85279d11b1fc4e96af SHA512 4b00af7a0e5bc28996fb73e8e9edf02253c492e028cab7dae7b8ac9959099a76f9d6c90d3246b387403cc53f4fccc685665f22f42ed177098b0cfc9062e60b8f
-EBUILD gentoo-kernel-bin-5.12.10.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
-EBUILD gentoo-kernel-bin-5.12.11-r1.ebuild 2544 BLAKE2B e0ac33f846032b242bae33740ecdd0ee19a8ee4e01b4dff1b6d50c8805b8a49c7597adf457e9e437e3805f199db9348aabb082cfa66a5e85279d11b1fc4e96af SHA512 4b00af7a0e5bc28996fb73e8e9edf02253c492e028cab7dae7b8ac9959099a76f9d6c90d3246b387403cc53f4fccc685665f22f42ed177098b0cfc9062e60b8f
-EBUILD gentoo-kernel-bin-5.12.11.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
-EBUILD gentoo-kernel-bin-5.12.12-r1.ebuild 2544 BLAKE2B e0ac33f846032b242bae33740ecdd0ee19a8ee4e01b4dff1b6d50c8805b8a49c7597adf457e9e437e3805f199db9348aabb082cfa66a5e85279d11b1fc4e96af SHA512 4b00af7a0e5bc28996fb73e8e9edf02253c492e028cab7dae7b8ac9959099a76f9d6c90d3246b387403cc53f4fccc685665f22f42ed177098b0cfc9062e60b8f
-EBUILD gentoo-kernel-bin-5.12.12.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
-EBUILD gentoo-kernel-bin-5.12.13-r2.ebuild 2544 BLAKE2B e0ac33f846032b242bae33740ecdd0ee19a8ee4e01b4dff1b6d50c8805b8a49c7597adf457e9e437e3805f199db9348aabb082cfa66a5e85279d11b1fc4e96af SHA512 4b00af7a0e5bc28996fb73e8e9edf02253c492e028cab7dae7b8ac9959099a76f9d6c90d3246b387403cc53f4fccc685665f22f42ed177098b0cfc9062e60b8f
-EBUILD gentoo-kernel-bin-5.12.13.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
-EBUILD gentoo-kernel-bin-5.12.14-r1.ebuild 2544 BLAKE2B e0ac33f846032b242bae33740ecdd0ee19a8ee4e01b4dff1b6d50c8805b8a49c7597adf457e9e437e3805f199db9348aabb082cfa66a5e85279d11b1fc4e96af SHA512 4b00af7a0e5bc28996fb73e8e9edf02253c492e028cab7dae7b8ac9959099a76f9d6c90d3246b387403cc53f4fccc685665f22f42ed177098b0cfc9062e60b8f
-EBUILD gentoo-kernel-bin-5.12.14.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
+EBUILD gentoo-kernel-bin-5.10.50-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
+EBUILD gentoo-kernel-bin-5.10.50.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
 EBUILD gentoo-kernel-bin-5.12.15-r1.ebuild 2544 BLAKE2B e0ac33f846032b242bae33740ecdd0ee19a8ee4e01b4dff1b6d50c8805b8a49c7597adf457e9e437e3805f199db9348aabb082cfa66a5e85279d11b1fc4e96af SHA512 4b00af7a0e5bc28996fb73e8e9edf02253c492e028cab7dae7b8ac9959099a76f9d6c90d3246b387403cc53f4fccc685665f22f42ed177098b0cfc9062e60b8f
 EBUILD gentoo-kernel-bin-5.12.15.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
+EBUILD gentoo-kernel-bin-5.12.16-r1.ebuild 2544 BLAKE2B e0ac33f846032b242bae33740ecdd0ee19a8ee4e01b4dff1b6d50c8805b8a49c7597adf457e9e437e3805f199db9348aabb082cfa66a5e85279d11b1fc4e96af SHA512 4b00af7a0e5bc28996fb73e8e9edf02253c492e028cab7dae7b8ac9959099a76f9d6c90d3246b387403cc53f4fccc685665f22f42ed177098b0cfc9062e60b8f
 EBUILD gentoo-kernel-bin-5.12.16.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
-EBUILD gentoo-kernel-bin-5.4.120-r1.ebuild 2542 BLAKE2B 7d14a8ba016657b55a1f1a74a30c59c7c1f7176126efed01f11ada2c3dc3c9fd16fc42812bfdfbe8b7fc5517e15f684429ad7d2906529514ee286ddea6535db1 SHA512 2c65c2db43dbe0a3355f625f9a04aa2447ccff66e7c29ad1f56270626d6c770e2e0dc7e4c87bbb931092a43372dd58dbc204e7fc1e7d0b34e50ca9089f92117c
-EBUILD gentoo-kernel-bin-5.4.120.ebuild 2675 BLAKE2B 1f4ef28d7861df8008454ab1e24ab367bcd4afda3b75a13e5b8f46ec185ffb8a72a09a0c3d214a45b03fc0eaf5b76ef5994e9fe1376504457df968b3d583ab8e SHA512 3e6694941c7d3f0710826405c3471ab1bd8756f74408dc29ffd67bc0bde612cefc2a557e118aacc35cc1278c986655a8eb909e3883af72c4ac35b4635ebf69ce
-EBUILD gentoo-kernel-bin-5.4.125-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
-EBUILD gentoo-kernel-bin-5.4.125.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
-EBUILD gentoo-kernel-bin-5.4.126-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
-EBUILD gentoo-kernel-bin-5.4.126.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
-EBUILD gentoo-kernel-bin-5.4.127-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
-EBUILD gentoo-kernel-bin-5.4.127.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
-EBUILD gentoo-kernel-bin-5.4.128-r2.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
-EBUILD gentoo-kernel-bin-5.4.128.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
-EBUILD gentoo-kernel-bin-5.4.129-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
-EBUILD gentoo-kernel-bin-5.4.129.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
+EBUILD gentoo-kernel-bin-5.12.17-r1.ebuild 2544 BLAKE2B e0ac33f846032b242bae33740ecdd0ee19a8ee4e01b4dff1b6d50c8805b8a49c7597adf457e9e437e3805f199db9348aabb082cfa66a5e85279d11b1fc4e96af SHA512 4b00af7a0e5bc28996fb73e8e9edf02253c492e028cab7dae7b8ac9959099a76f9d6c90d3246b387403cc53f4fccc685665f22f42ed177098b0cfc9062e60b8f
+EBUILD gentoo-kernel-bin-5.12.17.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
+EBUILD gentoo-kernel-bin-5.4.129-r1.ebuild 2542 BLAKE2B 7d14a8ba016657b55a1f1a74a30c59c7c1f7176126efed01f11ada2c3dc3c9fd16fc42812bfdfbe8b7fc5517e15f684429ad7d2906529514ee286ddea6535db1 SHA512 2c65c2db43dbe0a3355f625f9a04aa2447ccff66e7c29ad1f56270626d6c770e2e0dc7e4c87bbb931092a43372dd58dbc204e7fc1e7d0b34e50ca9089f92117c
+EBUILD gentoo-kernel-bin-5.4.129.ebuild 2675 BLAKE2B 7dd3210328d31c0727a866ba4d939c2944d0782f9e4193bb91b1a548092ddf632eb2d7a80132d318cfd6444183a3277cbdb5f2308bf58de118c21ff36280fffc SHA512 c1c1ca765d27a7f5fe006a3df33b6059fcda6d5897ddced7144dc81ea1fef67fcdd0e5bcbeac7d4762b438098968af81761e9350d3a3accec3e425cab7303f91
 EBUILD gentoo-kernel-bin-5.4.130-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
 EBUILD gentoo-kernel-bin-5.4.130.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
+EBUILD gentoo-kernel-bin-5.4.131-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
 EBUILD gentoo-kernel-bin-5.4.131.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
+EBUILD gentoo-kernel-bin-5.4.132-r1.ebuild 2543 BLAKE2B d1e8f61d2ff09be1d60ec4f673354d6626c15d1f34d8eecd6c27421ba5f95ae75851025897652df3c8e11bf79787b76897b0d73fea95b8200cac5d528fbdc251 SHA512 60859b2b74ee6cc3c80d776bc9936b8a72fb978aad9cc174f79db047ecb0dfd203ccf458884a371fac4cdde3eb713788f44d67441e278da58ee91be82ba85cea
+EBUILD gentoo-kernel-bin-5.4.132.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
 MISC metadata.xml 352 BLAKE2B d14768a94b44290d052fa5b86553dc09bdc609c629fc96da7d5314510091484d7f22f2f4b4244fb033046eb949da8fdf6b9535d698ea3323f2da79400454b8d2 SHA512 a7b17e6764a339943b587985b95d828e84a076ceb3c372181794c905f6ce1a5554be69cb55560d823d71d8ea66666bcd5474fec1ead721633477eba31cf1cc8a
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.38-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.38-r1.ebuild
deleted file mode 100644
index 60eaf1c927d7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.38-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.38.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.38.ebuild
deleted file mode 100644
index 9b0ea91ee5e3..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.38.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.44.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.44.ebuild
deleted file mode 100644
index 19484744cb5c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.44.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.45.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.45.ebuild
deleted file mode 100644
index 19484744cb5c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.45.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.46.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.46.ebuild
deleted file mode 100644
index 19484744cb5c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.46.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.47-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.47-r1.ebuild
index b63276300c50..7b7cd8e944d3 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.47-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.47-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~arm64"
+KEYWORDS="arm64"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}"
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.47.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.47.ebuild
index 19484744cb5c..ce8b125f8437 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.47.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.47.ebuild
@@ -26,7 +26,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}"
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.43-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.49-r1.ebuild
index b63276300c50..b63276300c50 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.43-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.49-r1.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.44-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.50-r1.ebuild
index b63276300c50..b63276300c50 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.44-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.50-r1.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.50.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.50.ebuild
new file mode 100644
index 000000000000..b23f3e054425
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.50.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.10.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.10.ebuild
deleted file mode 100644
index c31025c57600..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.10.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.11.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.11.ebuild
deleted file mode 100644
index c31025c57600..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.11.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.12-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.12-r1.ebuild
deleted file mode 100644
index 9cc54d1c175f..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.12-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.12.ebuild
deleted file mode 100644
index c31025c57600..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.12.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.13-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.13-r2.ebuild
deleted file mode 100644
index 9cc54d1c175f..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.13-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.14-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.14-r1.ebuild
deleted file mode 100644
index 9cc54d1c175f..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.14-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.14.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.14.ebuild
deleted file mode 100644
index 550411ea18c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.14.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.10-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.16-r1.ebuild
index 9cc54d1c175f..9cc54d1c175f 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.10-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.16-r1.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.11-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.17-r1.ebuild
index 9cc54d1c175f..9cc54d1c175f 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.11-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.17-r1.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.13.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.17.ebuild
index 550411ea18c7..550411ea18c7 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.13.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.17.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.120-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.120-r1.ebuild
deleted file mode 100644
index 7b7cd8e944d3..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.120-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.120.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.120.ebuild
deleted file mode 100644
index 03adecd203fb..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.120.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.125-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.125-r1.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.125-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.125.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.125.ebuild
deleted file mode 100644
index 550411ea18c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.125.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.126-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.126-r1.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.126-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.126.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.126.ebuild
deleted file mode 100644
index 550411ea18c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.126.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.127-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.127-r1.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.127-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.127.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.127.ebuild
deleted file mode 100644
index 550411ea18c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.127.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.128-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.128-r2.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.128-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.128.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.128.ebuild
deleted file mode 100644
index 550411ea18c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.128.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129-r1.ebuild
index b63276300c50..7b7cd8e944d3 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~arm64"
+KEYWORDS="arm64"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}"
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129.ebuild
index 19484744cb5c..ce8b125f8437 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.129.ebuild
@@ -26,7 +26,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}"
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.45-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.131-r1.ebuild
index b63276300c50..b63276300c50 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.45-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.131-r1.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.46-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.132-r1.ebuild
index b63276300c50..b63276300c50 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.46-r2.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.132-r1.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.43.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.132.ebuild
index 19484744cb5c..19484744cb5c 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.43.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.132.ebuild
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index eb7f42f0a4b9..5fedb4970562 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,52 +1,28 @@
 AUX 5.10.47-ppc64-kvm.patch 2365 BLAKE2B 4932dc893c372de7059f14ce0e1c0c3b33e21dbfa9f743411e6a5186e430ff75d62610ab0de2c0061dbe0e103609fba2e5c76bf7e7f34b5346db3f12439dd835 SHA512 a8d95435437aade216fe9fcde894fc5e632a0f5089eb73a083e6d3638dda20f746509c0df808f58d4de3ab909a3d5cb349a45ba182e6e62bcbcdc858c60a517a
-DIST genpatches-5.10-41.base.tar.xz 1421952 BLAKE2B 513d7aac0ee791d615fdaf336a29e677a6ef43411dc04e86173eec95322b3d01b658fdbde8dcd6bd9a195bc95a8f86e9d895d5825a4898d608a156a6cc26faec SHA512 8566ae1faf7812c52a29844365a0ef8f026b845a7a7e85a04a4ddb490cbb00748b6ddc843244aa1871abcc23c3dc9095d43cfa14efaee14b7d58564a87870d57
-DIST genpatches-5.10-41.extras.tar.xz 1768 BLAKE2B 70b1c510506b1df8ef210b10a203711d07d0b170bb40a4619cfcb99754f20fc14b648f1c2f4516f3baebf327706444d6d8e375bc3277c03b2f623c959c863791 SHA512 198db6b840eb22deb594e336a3c64bb32c13a12ad682b5d431d0365d276b6412ada9594c85d274ecfb20ee2bf2045bc60dc244edf7d0c8d0ac1f21ecab4f9748
-DIST genpatches-5.10-47.base.tar.xz 1555884 BLAKE2B a4078ace7edfd91eb3ec2f63cb121571b2d5137837a33c96ed5e09201f34cf82fe3b7e88c6684f40a2125d88aeebe275e826ccb2d63b8bc96863edba5055643d SHA512 eea3cbb4b0a9c5979f4a7504eab5eb7e041601c78d3c1f4037c2eb91fe54e7e73c7bcbd88f6e69dc859f9eb7d029bc9f55b6ffa652bf6bc742013fa8d3b0c71a
-DIST genpatches-5.10-47.extras.tar.xz 3412 BLAKE2B 779b0a8bb908156bc902106a98e4308b3ebfe42ecfd5d651aab4dbb95c0ee890e353d26d51e1fdb7c7305419e8eda5103a01405be5b015ebeccde869798c68a4 SHA512 dadec8511140903f38e7d6657f3e8b750382cbb18271448d3d23a03962b0ceb4b70950d6dfdb643fc2223f53254b824a04d2eec540626a20a50b998a9ddfdc13
-DIST genpatches-5.10-48.base.tar.xz 1580692 BLAKE2B 85f19398f7a3967b471077c1957aa21ee6b34c1a0876ae6a64e5aaecec7a9c91274eeab73574e22961dd8f8e19bc4a69f4fcfb26e9809287ef0da964f64bd69c SHA512 20b894e85f002b057377b7685bc4a957ff1a2990ee6bf94d1db9e8ea1a3e9d20478445ae5aaaf005269505599c4a9b9b26a4ea7129d3c5e2ad18a530c4b6f5eb
-DIST genpatches-5.10-48.extras.tar.xz 3408 BLAKE2B 6f347e53aa1eabf134fdd4f234d794820d9aedf126084615fe5eaf29c8e8f30828678b9df544ed39a9ea47e9bd9e5b1a93ea94a90a7aaf1234354cdd011cbabb SHA512 3d19cb7079c56c7675a16302c272a1da1b72b902d66f341428747aa12d1fbf949366e12ed5501bc15d92ca89eb93b32eea283156ac5317a75f11806907e55cad
-DIST genpatches-5.10-49.base.tar.xz 1588092 BLAKE2B d31ab75b6106e81654a69d1d0cb1d765cad83fcdb20a4cad9bf44749146aeb4c19cb6c8bb743b26ec48cb6439c64f8b3af9011468ba6b140dfcdd00adf14286f SHA512 cf6973eed088a99b9e9bc5822f87e75bec61f94207a783f25ec5e835fde565dfbc04fe3dc5c6709f213479b86bbfab26003661108607a17df0169ee2ae5f43c3
-DIST genpatches-5.10-49.extras.tar.xz 3412 BLAKE2B 3feb28c887152586b0e5c282e898d447451cdc7b0dcd0749d69890b72fc1d38f9a0a9dfe62d09c8f37ee198ff809edd949137503dafbd63120b566a837c83e32 SHA512 dc916a8848358891c749ab2853d49a2e5a3e7cc0c696b4f523902c5526fe3463730209bcd9a229dea86ed628a8da63b16316b565752e4eba6ee68381af92b6c7
-DIST genpatches-5.10-50.base.tar.xz 1622300 BLAKE2B edc737c022aa9855ce8afa6120618376dc1fed512f34a8269fb209389abb8292d14ee1c3020a33af181d099b6acbe970f960921790f5b356d742ee61750d34f8 SHA512 c543389c2cb737b874d91b4dba700c7709aa3997a3bf7c6831bd0b543f8611f37a5d87c4b3f9b775dee2bc3a3856ff0b34dd35ad8cd8ced60d00a880e7e7bc75
-DIST genpatches-5.10-50.extras.tar.xz 3412 BLAKE2B cb86ec70bae4b4260f973dbb23251e0c9f9841b12cd3e1e405215e9d54828ed4f7e32aeed131000f7ee467c3b23068f1dc6ca7e056a8b0308add810a0d6bc7c4 SHA512 39dffaddc87116a9ce91fdd07e9dfe7b4ab9c8c74328f3a6e7fffd5b2258837f2e6ccbf27d394fb4be15792c032b12a6289d3903a7e9e221fd411028d78f0073
 DIST genpatches-5.10-51.base.tar.xz 1649104 BLAKE2B 611e698ca58531702279ae9874c07bb3ff44a15cb8df4bf7e53b74ee1f5e7c846c058bbe16d57578a59e6baa1fd427e27bcea6a68516e16b285623ff2ccedc55 SHA512 1b7002696deb32915ccb459ab6e5e500fe8f27657dc0c93e99d129b7b843cf6574a5c1f04b70c5c3d7f405a6f17a5dd63fa1987a1e11ae6f770399cf7fb749c8
 DIST genpatches-5.10-51.extras.tar.xz 3412 BLAKE2B dbbe9031fdf275673014bafe3ee7d15e668f61187b6809df769a660830d026172b1eef1eefbbae61a2471004c14deba15913b0d4b57cfdf3750954ca075074b0 SHA512 6276fbea90ad4655021bcfb4e22c247e861807fa0c1a0ea6ce2fa439264422beaf74d0c8e08bf5fb0951727e1c4c189db5fe6672ff182d6c993919c0fcbeacbf
 DIST genpatches-5.10-52.base.tar.xz 1649944 BLAKE2B 9712926fab35abb79b0c4bcc448fca65c1941f0840bbcfa3dc3c13a22f7711105bf3dd9536d3ff00fc5717eed70df5977d6771c3bd62a51cb8d36df824432831 SHA512 04519253c689cb6d88e82b624ef2928fe1bb8203113267c74cba5c1dd87cda072071c795410598f7f5ccd2533b65958027c959809c4b12503ecf9a4d7eb3fe50
 DIST genpatches-5.10-52.extras.tar.xz 3412 BLAKE2B a458b569dfb6643b5a13fcce6c5df46c844119009c0593c6e655a2b0b7589af70a682745fc79f14fbc4fd7e45c52a924b8cc4665a31665a6abe1ba0c8d779bc2 SHA512 5a8f76b2791fefc6f0990402bd5307870517e79daccd52b4d126b8b278dafc086b47649631b3b07f220e3b06d03f12f765bbfb837988257db737c34806a78744
 DIST genpatches-5.10-54.base.tar.xz 1652540 BLAKE2B 37ecda0a4f76784572985be5073e7a3f33eb3aa43e641a2bc083e987c88c45cbc277bdeb20bb6ae4d264a17b65273119790ba8dcba7e22fd76ea8d0bd1be1cfb SHA512 85587df46e72cde33fb869f16b7fcc995a4d947552ab4bfb45ffcc852dad1f4b56a58d81446a00a142b9e628bd2fcc8c4922b50a282706f430b0bd9e20aa34e4
 DIST genpatches-5.10-54.extras.tar.xz 3416 BLAKE2B 3602707190ed04f62c4b2e8e0e765a53cf436b437373e71b6afd392cf05a73ac9e24f89293aac17c3730cdd696485ebf9d98161b248c9acafbfbe0b0c2db8ab8 SHA512 e4aad3f799dbcf00f813e39c8b9b355f17914a33d1ef422b3e7ee48c48e77a69925cc5664f0f171d1a632f622417b9d7ec88e56b1575c8e5f82af94f64337f42
+DIST genpatches-5.10-56.base.tar.xz 1790176 BLAKE2B 90510133af510c12c515c33e7e970fd974fb51a3a85dc519a9ab378aaa19a2ca965b0983ca5148f43a122e65584ac76c67c79c39fae3bb917ff49633563adac7 SHA512 1f416bcc1b7cea2a8708272d1d9d0c71b55c6fab33330f19baa7811eb3b859afe66e9a24f83a2b4652a932c02d7016fcc81aa53c9faa970c1885fb672b79ff9d
+DIST genpatches-5.10-56.extras.tar.xz 3420 BLAKE2B 96690a61ee421300a6385513e2804a2832622c4da07f4d0a20ca10274d822811f08b2a1c58dd486555d76bcf5dda75318784b95b6585b1504d9d977dbfd13cf0 SHA512 912ea13685c563e3adfb98bdcd743edc8e27cf87ed3c332bb7204235005c4ba85e847881e6394dabb27d83031c1035a840fa72d7ab9f23627a3a4dcd1210cfa3
 DIST genpatches-5.11-25.base.tar.xz 1030312 BLAKE2B c3e0f5840c32292d36be31a8606934bfa1ccb7e31f04cd214574009577907d00912bacce1f85dddeda77ba99f40f61fa5aa5259a693c74abd63a05be5a44f2aa SHA512 5adbe3770562b57d7180a44ccca8e665cc5b0d9ba5168c4b3555b348708edd7469464bd770124d9a8641095bdbe786d843ae3da64b845d577999c9e40360c970
 DIST genpatches-5.11-25.extras.tar.xz 1772 BLAKE2B 0bd2afbd93cd7553c8e058f61c515ed9d47e9f328529e6cf36a7100b363dc8e4c3004afa06a0c0b95963bcf69a216ae6a7bf595062401725a4a25f942f44a3e8 SHA512 114094a87bad0dc4a265847fa18b88a2795daf151de8451bb4fbe4af70f3f4bcff8905d8d90522f85914bb7ba7227ebab7f69ab59112afb2187332b393450fec
-DIST genpatches-5.12-11.base.tar.xz 611232 BLAKE2B af0db172fa831bc84b1935d387e3d7b360c5a94d8499b6fa204f21b7a822c844e88a87f4a2724d0b8b508676ee564dbbe304893bfdd3197d67c8f6aeae011cb2 SHA512 f422bc1aca29732db09184ca2fcf7478536a87e73b59325f063c73103c8ce425858baa78b185eab61a80dda15e3818b45a669c69f7898382aa3563b315ad45b3
-DIST genpatches-5.12-11.extras.tar.xz 3412 BLAKE2B 2eba600cd1e769a7252b063968b87cf5f54f285f791f84089fd1f3060e3400a76dd645841bbb213830cedf274e41959ed48cbee081d556c82f059e2a3de4db51 SHA512 2bc29ba1aa4b71b2407906f2c86339eb15fb124f964ddd3fa9f4a39dd94ac18fc95d0780cf1fdb99286b1a27aa88ada32665feffd9a3ca7f53bfb66f0212e7e2
-DIST genpatches-5.12-12.base.tar.xz 650292 BLAKE2B 81b5a3b95390522c328acdb390fd1e8515028e55dee9a3693992ce2aa5c2defcea37b14c385d72e0c6a9b31f239c7d02eea45e4428332f477e897fa94c02d71e SHA512 bea0fee6fade3b1322a52ec2201b828ab28bfb3c0528ea562ac7e3cfaebeb758b971820a2b1ba695dafe219ceb2548c07713b3684491b893e6055ce4f8943916
-DIST genpatches-5.12-12.extras.tar.xz 3412 BLAKE2B 8fcf6c407be25db368dbb3e6be3907d3431228b5c39819dba7c67d61e5171a7ad9a86f3e117b99b9e0d626219ad9db0938c15c4b96c934b88f693a3e9661d458 SHA512 39750768e4822ea8e3f88540fc8ebad9fd721e2a3a8703102d58e30513b47069cb8a77e15e41d0f90d1d69053007bd476ce0741cd3135a428d039ebd426cdc57
-DIST genpatches-5.12-13.base.tar.xz 661044 BLAKE2B f9b14633dd2895fab6d47ccf99d425b4d4c260c58bd2511c8166fc440c1cff337711b805b2ef76f787c6232115df96ec9706a3c1e65e6bc2c8a8b6dd1436dc0f SHA512 8039f529138bcc3b8a485b25a16b1f436b7756d91c018a70a6f6951dc7ce329a1f8441bad90ede66329283ee6ee314c22411e283bb76f46d0ad9e03b0a8e2b24
-DIST genpatches-5.12-13.extras.tar.xz 3412 BLAKE2B abef35f4ac38e4b0ab7863376e72534c27d32f3b974f4368be54c0d9ace766749ca4334f7622b2963e1dd51a05f1262d58f7de03ed8d0a73c3f2b68a2b48ab76 SHA512 72bb3380b6382938d9b3957e4f47267616b8dd50d7a4991750b131c844c882b1d67801fd917c89444bde9d875cdfdf9d8e25bda079d5d97f42af7c2655343f61
-DIST genpatches-5.12-16.base.tar.xz 707164 BLAKE2B 05331662b6c219900a5d70aa3f9030e82cff6ca09de9645e178f5976daf8003335ac2a9163e405282096bba6057ca645f81fddda41eb7b10f1125524b4cadcc5 SHA512 dc8efddc386fc5350802edb5f95f62f61a8d3c2033a0efa0fe9450ff0ba84a65cbb4482a0de9fea6f67200fb938f3d73c27124f9bcf706485f32f25cf8e89cd9
-DIST genpatches-5.12-16.extras.tar.xz 3412 BLAKE2B d0e429e2c9e1a2733a216e57c32c73f55285edc74f801017261925f246e44148c58cd8745caa6afc9cafa9c090d01206acc3cb96dc0ab260a834a0b3dd0e8918 SHA512 24a1f8b2f2993c157fa0efe5649b7494084d925f8665a8c0727ad431da00fcc8bfa7e00ac1d2b308b1297c1c202eac687d7539999eed38f44e71a9cb94327ef6
-DIST genpatches-5.12-17.base.tar.xz 738268 BLAKE2B 61336204dbaf80bb44c29927ff59ed6ccd6f29a1a139132364aa2ad7c89b0af4df6df75e800cc14b444edb9897f4474015369b9cea878fef487c8a3e2123a715 SHA512 f4b5773b9885817889895725ece76d50da95439769d96fd4058d690937027ee6baffec62941b15df04b7e12df29d1177257daba39c41418e2f2a400565aacaf9
-DIST genpatches-5.12-17.extras.tar.xz 3412 BLAKE2B abbc0dbb59a91d6733f5c56918aee4d0bedfaa9f87687979f0b2b01778e2a934396c5b797050d1d05e52c2432f6fd32891176b4cb64709273ba810a1b7166884 SHA512 d36015ad8ee2bf8efb5c0b0786a661326d7833ab1d185e9e06791474b03036022bc6d6d1a22c1d4d086922b9db43ecec97a8dd5ff9daafd591a7b3092f839e5f
 DIST genpatches-5.12-18.base.tar.xz 738968 BLAKE2B cf0e62aad4cbe5c00d09a47e901761762934f34257e7064e65e9e9a29203c80a88ce31d55bff7156d8a09070dd67c79c383b0f1516757fbec1f5c722e844bff4 SHA512 31283759d7bb2a9b674489f4074a3027d52b5276df9e574d2d040007cdf679237ced0466724ddd81cb20714c7676f12b09f7c0014c1335227dc3bcc0358da701
 DIST genpatches-5.12-18.extras.tar.xz 3420 BLAKE2B 783c9491317343e26eb9a25b48486c8b9c47f80e2c3048cea50e17ef1e6dcd9e5ab40a3f02bd02b5949933ca6634ffaaeb507416534ca35308ba35e5bbcfcff3 SHA512 53f513fe4ab0bae00b69055f8962cb8200ea90bdfba9c4ab95bdcb58f6654f5739438a6540a18a530e8160375c8d5ee2a767054b509c3a79dbda02721857403a
 DIST genpatches-5.12-19.base.tar.xz 744220 BLAKE2B 63163732eeff70cf0eb344950247f69992145a4e7cbbe966eadaffda3be3f0e645b3d7cfc9c2284156385e761c02613ceec331b777b282da77b3d169cf3fb807 SHA512 8689a4f3fec6c29a88f7389296659579c13a2b664b94dc8147bd1b266019c310c30d19198db01feb60a421b1362aa15e72feb4cb19ac2ac2136ce12c42a21915
 DIST genpatches-5.12-19.extras.tar.xz 3420 BLAKE2B dd43bf044652067aec7069cc2e8c1b9441ac06750b64dfd355ad53221df08fb68981363b9749a6f93ebfe81e728ad8791f7a5ad2e9d4557da6d2a1904efc05cd SHA512 501379a816043c5bc0c4724a999957d8c5b4cca214d12e2d64577ff24943230e6ae5e60512b634a5507ea5f8823e7511b20a5c099bab149309045e0fd17c4b24
-DIST genpatches-5.4-123.base.tar.xz 3488228 BLAKE2B 0fe5c3056c3cb060f4921e3b7a4046e03e4e777d033619f0496eda68c645c6209fb07713a4bc2565000f9c17e6203a8bc5392fc597dd49167bb0348988b53026 SHA512 e71b8f9d622d3ea2fa8165a39a27240ac007d899d7324c60240221d7761c1287f14b631b074536460702922b8daf00bc2714358aaf7f69ac257af7d5d5b18bd1
-DIST genpatches-5.4-123.extras.tar.xz 1772 BLAKE2B da9bc0d9513d010364506850d1c23d13e1a1ef8c4cb8d60e3430d12f4cc2ea87a74643ba9fa1a061eabdee9985b1931aab1b2587ee26bec9b2cf165b90fe83e5 SHA512 ff3b417825ba200b32abf888b6cf6e8d754526e57a30c06fbe4f961c84f67cd921b93b9848fc6b49f120b4cf8ddba9284755da73869db35327af7549d63f3cd1
-DIST genpatches-5.4-128.base.tar.xz 3571424 BLAKE2B a58c2b8f20730c3357ce30cbc8b24f0609bd7ca2a8f5d37780cfbe4edb560fa49bcf1925ec40dbf61aebfe9a87be0f35ade4b999509420eb0caf5731ce649e89 SHA512 c84d65acdc4274b528306af958b0c72851fdce008c9ed6f78965ea22f09f8668b6075cfda9101b2e7a7bc55ccea64491000b1aede8cffa4ad927c7c1bb003489
-DIST genpatches-5.4-128.extras.tar.xz 1772 BLAKE2B 3af29c49caf9303615ee76319d3da53295281e8fcaee54d37b122e47b745ded99a109db2eb31508dbe83a5997b7973287297d29af2ddd475bdab1a0bc05a1045 SHA512 27eb4d3327e24acd5f4601281f624439ff47bc6173ab58b23ab162a42df66bd02402f2e4f4e97a49b0b0b788b615869dc4a0dc3ce964247ff7bc6166fd9dc6c4
-DIST genpatches-5.4-129.base.tar.xz 3586716 BLAKE2B c5be8295127bc1c16c1d24feea5793f7f52b1be2ff48db6494674430bcd608a1e0950da553e7c5418ffc70e8909da5158d54877412fcb1afdbe34733fd54f207 SHA512 0ffb95795a9300962cb4ab7c017859ceff7ea6322ad59592b4dfe98ef56fb86db9bd8bf5c243cef93a0502c849f2c466f33efa1df420126199f7fd0650dea3b2
-DIST genpatches-5.4-129.extras.tar.xz 1772 BLAKE2B aae80fd4b863f4a2552caf05fced29209f840d22b5bb9fa3eacd06ee7348e0fbee023512e331e3b2f515341ac9354fb7bd1f4e79e38be3a7d8696eaf257a547c SHA512 f0392e91fcf8402cf6d94bbc42b89bbbc028959c1e5243b5cd8e608950539ac81ba62836a1c7755ec01dcd7f8549c9c1898adb24c8a3c7c1a5d5e866cd7ef0dd
-DIST genpatches-5.4-130.base.tar.xz 3592548 BLAKE2B b88b67f8e4f214a1bb7c35128b57f55579a3f5aeaae5d46f7ff4b229cf4f4e2f9c248d0f6c792793f60961a3493e091f74fdf48f14b0edccbf162f749fafa203 SHA512 6dd6c0ccb7cdcd72051da86eb3b89881e98f44b215431220445af892bffb79d73ff0af67168432e597e08dbf46996a250782c74fb9bbb3945d05527df208df5c
-DIST genpatches-5.4-130.extras.tar.xz 1772 BLAKE2B c1754871b41af183a22e9c30cdae5332ac9fbc104c6daa978796d15446c83acced9c9a2f55ed44d27787f33bef69f0ef885ce7642183b54d32924905c881fa1f SHA512 0bf0917a43e3ce3945317cf698e74af72bc83270c81e5ddb7d6ac3705310ef6935a54b0732d1f302b49d6c7c1275550a341a52d490ce7f4ff5f6c9702e9138c0
-DIST genpatches-5.4-131.base.tar.xz 3611404 BLAKE2B 9793458c63d97afc9731c210a64297b11eee5ac5ec52bcfca728fd3fdbe7fbad662ebafbf446e83538e843b585eaf333e5b8e02d83d504ab8700c325339eb742 SHA512 2a8db971cc4c603d85ae6064c112d2ff83c02720c58d07881acaf2b4208b6eb05128d1e3ab89b446c4abe345bdf7df21ce2e5a8c61fa3b1c44dad8085bc4bd57
-DIST genpatches-5.4-131.extras.tar.xz 1772 BLAKE2B c4933c4c6470123bbe2011673a18ae7910de41dbd8b0c6b5ce431a06d2cbdecf62a5e0ca9d28738e82e30c55dae29acc30b7e68801075e5d7d17f425909e6fbe SHA512 495876695c819ff98dc98fb34e8ee4b0eb6e82a69a7f519055d0cd2c6e3da584a97252861f269a8f2160c3e98f3a2907620f4b9e5bd145feae51fb3b17a3d2c8
+DIST genpatches-5.12-20.base.tar.xz 920044 BLAKE2B 97f6f4af62985d17004816190f55919cd937e29e24c753c0c6d82ec6bacf89b4faf01585f941ae33c5b37d994888b7362d2ef22add518e4f6a2df3fe3b23953d SHA512 6f5940eb48c8167c7492701968e72138ec8a35fcf889a45158321a4507c45c5a930b68b2156410fbd063155093767a239d4d9cb3711c81ef47a13313b327c07e
+DIST genpatches-5.12-20.extras.tar.xz 3420 BLAKE2B c161c55413cea9c5776773d0910219a801d21c6e16de8816bc909d120477e7d6ab0d40c8a4bcb7b09f2227dc70c8cffa86392147acec9e20d2bf0179231c0926 SHA512 143eb7972c11aa69d2a81421309ba84de370ae28511366dc8264c52a073a4069bbca19cceb6fc0bef9410441ced95d1984a18142df3207aa20ee783e40688801
 DIST genpatches-5.4-133.base.tar.xz 3628504 BLAKE2B d3d99348c475bbeda9a1d0a7e3637ddc9c0896ae0de51fb6e9bd111ac94e3fefc717f84aea32a14410aa7257cc95b381c54b1501ae720c4eda569d0024206463 SHA512 d12584ab78c9cd7d3af459701eeed80519bea7e03dca6630205cc279bdd65c71a14d8738f2c29816a5b08381301210116fb769b583e3f6b83ed5e54755a00003
 DIST genpatches-5.4-133.extras.tar.xz 1768 BLAKE2B abad0014d2d982087ac982d0f017587fba8ea2b5180e67a92ed4b5a62c4129a5d275f6556cbf782b459900e03696355e4017c4c833cefc571c7cf4bbf2b5c907 SHA512 121ad821cd6628166a1ca005f2b408737ba8c9c1b8315c13926bda862b49d2ed330fea169a348b0209d903fca7a8d4ebdb50cf7dd527efde49ca9d69de4106df
 DIST genpatches-5.4-134.base.tar.xz 3632276 BLAKE2B 475eaa6bb0c7291fbed3722ecfa8c05c5352677844481d4b37f2d5ba4b8a77697b6f43f1005aa1f899a561b3ba38670a160026fb935c2a1e75db7f1a9c292044 SHA512 4bfbf7ea9d909f2913094e7c0a34fd570540c4e9bc471ab8e90b2c73d1c99e6da23a11c0e254f4adfa6d155c51c763224a4851f4105a2a8ed69fd11c73a58101
 DIST genpatches-5.4-134.extras.tar.xz 1768 BLAKE2B 894032d098f79b3c247b1e0ab19646e9c79414c4070fbf19679286f7305dbabee8c39c11dfe7c7a1009f36d64f99b0627b75b455cda62b2143fc5a5102937cd8 SHA512 5d6b703ae705a8587a7abea96e64cc51f34d8762e5a93c5c9f410a52d7bac4c44aca2d21bbede8354ad5aa1fbef45aeaffedc7db69c21ea2a94c22a0069da398
 DIST genpatches-5.4-135.base.tar.xz 3632876 BLAKE2B cc4bc930c2f181b98dde258a696bcdd8f23fcb9098707d5f158f24cd5fca4f8958dc321e8ad348b9ffd96c53bb231bc2f171b9e491427fffb2fd05dc5fd23ceb SHA512 1250c964bc3c062cb9e8109da1d1276cb5e2d7c25e1175ee56672d1a6da4be3c73f52fdc9547a70c627057265fd5af6b6b99d977c0c85a45376bf5b99bedcdf7
 DIST genpatches-5.4-135.extras.tar.xz 1772 BLAKE2B 3adbde4f0977e2da60f29937e53a1f0892ce6278745c63511e486587efc10c1c6a4a8e05375492382d1102090733d4a1fa93f380b47e734affa2ce65382e255f SHA512 6ef12e03081b927af5bd6b820f150116fa3e848a457aa9fccdd4172c3e85dbf6ba78050878884d325b059f1fa4681de85a38d475ecd55dafddc60bd8362cba77
+DIST genpatches-5.4-136.base.tar.xz 3704860 BLAKE2B bbecfa854caf388d59da60c37b555090e323fd7117db68e4bf9cb84ec8605a286c7a1e0fff02622043b7884f4e57ff5f0cd18f7cbc70736eb04b08a2cd7d5aa4 SHA512 e8b3883e06f0fe00e598dd36911697cbe8e938f7664d9c8b8625921e7720ee50b8ec0ba159d0f50488357ec2baed0e640cdb7fd5d2a2f26dffa3a76640b40871
+DIST genpatches-5.4-136.extras.tar.xz 1772 BLAKE2B 956980231960a32019c0ef8fe608f58b7caa291fb5e9f06f1f9435111aeba9c89fc14f028247bc97218022c2393cf16faf4b94e1b32f5b7be263b263bf69cb45 SHA512 007b267166f1e0481ab1ad3172492fd1f7929e1387f230ed24177e7564c4319b8d3f7c7e075942d4340ba19a9889fbcfd580ee335025314cf13a3cb9ff42886e
 DIST gentoo-kernel-config-5.10.32.tar.gz 1269 BLAKE2B 4a21a57d567d9a527ef829f375275c65347b2e6461b00e50099458c496af0a7b3b863a6e1d8421ad18c52c64c1c4cd7e5fd416673b67738cde6253af8a9f18db SHA512 a83ef22a7f9f83f01bd65a5470f0678111b0a7dcf1dc564e04264f68cc54833dbed4cccffe2864caf3ac14169611259f0bb786c1aefe194372d6d3f67fa64c00
 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
@@ -70,28 +46,16 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-EBUILD gentoo-kernel-5.10.38.ebuild 2649 BLAKE2B 4a5b2c47d3b2c31ff70a8204ec7356a6c9771d67e727b270691703c508b49ac77f0d1e6249ee15a226be73f852c4d8dc7310bec54617799be08cca97ea6635a6 SHA512 e6df60ce2b59cdd066ba9b53e46ad6019617c825d82bb4d0ae05ef5c3741f396f6394735dfd9c58e3dec892f16be4501cafea449e11081e2c1892fcb826a01d9
-EBUILD gentoo-kernel-5.10.43.ebuild 3115 BLAKE2B b181170fcc157f8993e546ef416340fa8d4dc54da784f6ab4d959abfb5882f244aa0bedbf2bc9173544158387758930ebcaf2abcabc708780727fb9d43ad0cc0 SHA512 fc8c5c9591b0be1d88c28d8d3ba3c24125bae848ef20242e970f8db1b7960da6cfeac91422362f3e7f921cf9016608c878ed6d8f08193b650d6b1167b0312df5
-EBUILD gentoo-kernel-5.10.44.ebuild 3115 BLAKE2B b181170fcc157f8993e546ef416340fa8d4dc54da784f6ab4d959abfb5882f244aa0bedbf2bc9173544158387758930ebcaf2abcabc708780727fb9d43ad0cc0 SHA512 fc8c5c9591b0be1d88c28d8d3ba3c24125bae848ef20242e970f8db1b7960da6cfeac91422362f3e7f921cf9016608c878ed6d8f08193b650d6b1167b0312df5
-EBUILD gentoo-kernel-5.10.45.ebuild 3115 BLAKE2B b181170fcc157f8993e546ef416340fa8d4dc54da784f6ab4d959abfb5882f244aa0bedbf2bc9173544158387758930ebcaf2abcabc708780727fb9d43ad0cc0 SHA512 fc8c5c9591b0be1d88c28d8d3ba3c24125bae848ef20242e970f8db1b7960da6cfeac91422362f3e7f921cf9016608c878ed6d8f08193b650d6b1167b0312df5
-EBUILD gentoo-kernel-5.10.46.ebuild 3115 BLAKE2B b181170fcc157f8993e546ef416340fa8d4dc54da784f6ab4d959abfb5882f244aa0bedbf2bc9173544158387758930ebcaf2abcabc708780727fb9d43ad0cc0 SHA512 fc8c5c9591b0be1d88c28d8d3ba3c24125bae848ef20242e970f8db1b7960da6cfeac91422362f3e7f921cf9016608c878ed6d8f08193b650d6b1167b0312df5
-EBUILD gentoo-kernel-5.10.47.ebuild 3154 BLAKE2B 27c05046f247dac381eccea7f7d5d883c2293fe5a9db33301fbb6c12494f61fac0b26056422a30539c7bf7882b2476bc7dfce4580795d4a7131fbb693533b8a6 SHA512 d9c25489fbe2c0d47d87738f27a7cd201acd6b93c529cf20537268c33fade77a0e5b4894479ab4d12d929c6830065ce73b83d1cf65a77f8a6802fee9e8426ea9
+EBUILD gentoo-kernel-5.10.47.ebuild 3151 BLAKE2B 5e626f1c6cb593f74f91ba51fc32592defb54a855e3233e42ec5b8dea8505b9a9c484dac7d0e93d7527d3d36aaf006e29bfd4144a5ebd9f56d5e79fd2267f4eb SHA512 b27e5448ed222bdb087f042b9aa7fe1c67116ee450713c32d4b4f74c093f1c92f7ed4d286213c54b388bcb99b706e0f9fd86e1e989d798f183b9a2d2c970578d
 EBUILD gentoo-kernel-5.10.48.ebuild 3261 BLAKE2B dc00f4b4097d80741e58be68b390c20861b5afc043239301a235535200a38ea69c5a462b40aed4c1afce0922391fd2edaea4915200b5a3cb74fc48850b310e07 SHA512 c20c2cb324d527f218be834effe7761e5629cb4ee6b18a3f8752ca8b4ca45a697659ac53949b6eaa0c205a76d7758cee93b1720128f35ac05a54ee606a161c52
 EBUILD gentoo-kernel-5.10.49.ebuild 3115 BLAKE2B c8b654f3f3b7a9ecdb1f42915e4c87a771eae4961d2c060ee44aa627c5b94b8b16c150abf61540290f164439553ecd844ef59a06103c46fcc9b872112064f2bf SHA512 262bf2ed73d487fb017bcd2c6d9b230c9e79207c1c44e7a093b985bd5a04e56a0f34415209423fe8be6b73666c635cd172be3d173c72162e7af22c6770a10efe
+EBUILD gentoo-kernel-5.10.50.ebuild 3115 BLAKE2B 5c1a0b136cbcfa49036153ad7dacbe9d365ed5fcd1d3b481ae48bf0afaa40f9016e5f0fbfd7425aa4a4de0ab4a03cce825669ef878bdaaebb0f6669f445b0ad6 SHA512 6937e12ea7750e73b6e4b8627cc9a06a64dfd02a35bf84ca99c5a0d69acf0c27e322cc4c52345c1b64bf4b6f0390253800936ae012e5b25416a0056658cbe4b2
 EBUILD gentoo-kernel-5.11.22.ebuild 3115 BLAKE2B 7f6880aed41811c1ee5d8ef3a1ee419bcc9c369f6d6160f745fa3c7ccfccd6fa03d7494946816c7c1a13f08ab14440e451ef8ea57adb9ad3d7623e266bca4b13 SHA512 28b3fec1616e8d22e7db4c4fc37ccf769fbf02e19b9bd39776f7698783f1f0a1faf86411cae27a48409c793c6ac690c1f0d6971bc3da8bcf7b08f87c25effe82
-EBUILD gentoo-kernel-5.12.10.ebuild 3114 BLAKE2B 70462d1e30a5e19fc733f2cd099ad684a0160aac51a3f64ca22e0011aa26adfdc3db740160af90ebecd6fe9a60b5692de17ddbedcc97e7674c0948087bbb4e8d SHA512 1bde06bf6a8fb9d8bcd7666a50636f9e290dfff4bbf56312f582a821debc217a1d64b04d8d0e288efdd6c5878aba7fc0e3b646424b3c453bb9072af00cfea47d
-EBUILD gentoo-kernel-5.12.11.ebuild 3114 BLAKE2B 70462d1e30a5e19fc733f2cd099ad684a0160aac51a3f64ca22e0011aa26adfdc3db740160af90ebecd6fe9a60b5692de17ddbedcc97e7674c0948087bbb4e8d SHA512 1bde06bf6a8fb9d8bcd7666a50636f9e290dfff4bbf56312f582a821debc217a1d64b04d8d0e288efdd6c5878aba7fc0e3b646424b3c453bb9072af00cfea47d
-EBUILD gentoo-kernel-5.12.12.ebuild 3114 BLAKE2B 70462d1e30a5e19fc733f2cd099ad684a0160aac51a3f64ca22e0011aa26adfdc3db740160af90ebecd6fe9a60b5692de17ddbedcc97e7674c0948087bbb4e8d SHA512 1bde06bf6a8fb9d8bcd7666a50636f9e290dfff4bbf56312f582a821debc217a1d64b04d8d0e288efdd6c5878aba7fc0e3b646424b3c453bb9072af00cfea47d
-EBUILD gentoo-kernel-5.12.13.ebuild 3114 BLAKE2B 277aaef8e2f2530b9f58ce35c24cb921f21db82b12fe4bdb82fcac183f614b1cf94d8278177b3af2a2be97f05a4e8c9e9d39a8370533d211b710dc74742c8146 SHA512 601c60f0768b77048be74a2cc29d48b2fbaa298e5565ccdc1687af1f272546af257302e4e13736464ad7e50e6dc8718392792f272c4de0a4a2f72a6d78fca37d
-EBUILD gentoo-kernel-5.12.14.ebuild 3114 BLAKE2B 277aaef8e2f2530b9f58ce35c24cb921f21db82b12fe4bdb82fcac183f614b1cf94d8278177b3af2a2be97f05a4e8c9e9d39a8370533d211b710dc74742c8146 SHA512 601c60f0768b77048be74a2cc29d48b2fbaa298e5565ccdc1687af1f272546af257302e4e13736464ad7e50e6dc8718392792f272c4de0a4a2f72a6d78fca37d
 EBUILD gentoo-kernel-5.12.15.ebuild 3114 BLAKE2B 277aaef8e2f2530b9f58ce35c24cb921f21db82b12fe4bdb82fcac183f614b1cf94d8278177b3af2a2be97f05a4e8c9e9d39a8370533d211b710dc74742c8146 SHA512 601c60f0768b77048be74a2cc29d48b2fbaa298e5565ccdc1687af1f272546af257302e4e13736464ad7e50e6dc8718392792f272c4de0a4a2f72a6d78fca37d
 EBUILD gentoo-kernel-5.12.16.ebuild 3114 BLAKE2B 277aaef8e2f2530b9f58ce35c24cb921f21db82b12fe4bdb82fcac183f614b1cf94d8278177b3af2a2be97f05a4e8c9e9d39a8370533d211b710dc74742c8146 SHA512 601c60f0768b77048be74a2cc29d48b2fbaa298e5565ccdc1687af1f272546af257302e4e13736464ad7e50e6dc8718392792f272c4de0a4a2f72a6d78fca37d
-EBUILD gentoo-kernel-5.4.120.ebuild 2818 BLAKE2B aa94f3446a0a3adc6491ab27f321c7d098e8c71e65731671af35928d8076c7ced15e18de3cd8080f47c71ad8dd2ffb1d2814ac697966cf1dee0f09dc3685e39a SHA512 36a81ed7856c80169da08e494a399c19d2d0a722cb031ba99d6f8a9fdba2022cbeefa0aca8758784f716a99b49336d95579571d4959a2237bcf7345091fe6509
-EBUILD gentoo-kernel-5.4.125.ebuild 2822 BLAKE2B 2959f3b551ba9e1b275bd3b6c4b1d3c64c7c295fb6b63a5496680ae1e42f40812e4114c0034a2493e2b6bd93fb323a1176e815b9ff1883b3ec4e9304beec6037 SHA512 28da53ae1d4380489599d320992dc9ae54bfec92030160c2a278dffa2c0bd895f9f5005e085b97f664dea86f0013dc382e93045a0ed08dd096deac57541d642d
-EBUILD gentoo-kernel-5.4.126.ebuild 2822 BLAKE2B 2959f3b551ba9e1b275bd3b6c4b1d3c64c7c295fb6b63a5496680ae1e42f40812e4114c0034a2493e2b6bd93fb323a1176e815b9ff1883b3ec4e9304beec6037 SHA512 28da53ae1d4380489599d320992dc9ae54bfec92030160c2a278dffa2c0bd895f9f5005e085b97f664dea86f0013dc382e93045a0ed08dd096deac57541d642d
-EBUILD gentoo-kernel-5.4.127.ebuild 2822 BLAKE2B 2959f3b551ba9e1b275bd3b6c4b1d3c64c7c295fb6b63a5496680ae1e42f40812e4114c0034a2493e2b6bd93fb323a1176e815b9ff1883b3ec4e9304beec6037 SHA512 28da53ae1d4380489599d320992dc9ae54bfec92030160c2a278dffa2c0bd895f9f5005e085b97f664dea86f0013dc382e93045a0ed08dd096deac57541d642d
-EBUILD gentoo-kernel-5.4.128.ebuild 2822 BLAKE2B 2959f3b551ba9e1b275bd3b6c4b1d3c64c7c295fb6b63a5496680ae1e42f40812e4114c0034a2493e2b6bd93fb323a1176e815b9ff1883b3ec4e9304beec6037 SHA512 28da53ae1d4380489599d320992dc9ae54bfec92030160c2a278dffa2c0bd895f9f5005e085b97f664dea86f0013dc382e93045a0ed08dd096deac57541d642d
-EBUILD gentoo-kernel-5.4.129.ebuild 2821 BLAKE2B 1a1b162c59f951c0f20f3476401897e696be92e4199cbad03d446896371f1c1c33e9d6183cd32d17c163ab5678dd402b48abaa6e7ea0f2a9153c0fefcd33256d SHA512 79fa2ed72babfd66c11ac08380a71aa47794ac96e46dac8de9d89e7470b59c940c1ad7d1d185f1821dc8a5bbe70457babe25c8ec7e9aa34d95582b74b1d61380
+EBUILD gentoo-kernel-5.12.17.ebuild 3114 BLAKE2B 277aaef8e2f2530b9f58ce35c24cb921f21db82b12fe4bdb82fcac183f614b1cf94d8278177b3af2a2be97f05a4e8c9e9d39a8370533d211b710dc74742c8146 SHA512 601c60f0768b77048be74a2cc29d48b2fbaa298e5565ccdc1687af1f272546af257302e4e13736464ad7e50e6dc8718392792f272c4de0a4a2f72a6d78fca37d
+EBUILD gentoo-kernel-5.4.129.ebuild 2818 BLAKE2B e989342b15abf7771213d72c62618b85237bcb207ee7948f29f804ae51c44dab105cce5ae65d79d3365dd575d8f2436ab0f4586ff87ef730f99d6859661bf9e4 SHA512 92a1296b128a1166c5c545d606536142f54be6753fc7a97cf75e4d8ed08ffc9b572f737ca7bd0a51055105ea0d7ac0675de4fd796966658ef3988dd3bce98422
 EBUILD gentoo-kernel-5.4.130.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
 EBUILD gentoo-kernel-5.4.131.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
+EBUILD gentoo-kernel-5.4.132.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
 MISC metadata.xml 464 BLAKE2B 8f1b0ec7ef58c31bba668cd26cb39bdd0e676c22fc9def7802ea02c6fdaa32ca2d129519c51dcf7a6711ff2f5e22b3e8fa10ed5667b129f9be698bf828644c98 SHA512 2b01cf5cd40c16da8bfe767614ec47c8b95ed915a9cf3208276dbd75c9e7c065cc43c036d0e141433b6d19c2cee88fc8ae344ed596d8c1caa31c05e722373a06
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.38.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.38.ebuild
deleted file mode 100644
index 2a2bb8e011aa..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.38.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.43.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.43.ebuild
deleted file mode 100644
index 5151cab9b14f..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.43.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.44.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.44.ebuild
deleted file mode 100644
index 5151cab9b14f..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.44.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.45.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.45.ebuild
deleted file mode 100644
index 5151cab9b14f..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.45.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.46.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.46.ebuild
deleted file mode 100644
index 5151cab9b14f..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.46.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.47.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.47.ebuild
index 85ca3ef0d124..caee494ebeba 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.47.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.47.ebuild
@@ -38,7 +38,7 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="debug hardened"
 REQUIRED_USE="arm? ( savedconfig )"
 
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.50.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.50.ebuild
new file mode 100644
index 000000000000..660215fc8655
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.50.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.10.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.10.ebuild
deleted file mode 100644
index 5597a415b914..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.10.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.12.5
-CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11.ebuild
deleted file mode 100644
index 5597a415b914..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.11.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.12.5
-CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.12.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.12.ebuild
deleted file mode 100644
index 5597a415b914..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.12.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.12.5
-CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.14.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.14.ebuild
deleted file mode 100644
index 8cc6b8c1b940..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.14.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.12.5
-CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
-GENTOO_CONFIG_VER=5.10.42
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.13.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.17.ebuild
index 8cc6b8c1b940..8cc6b8c1b940 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.13.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.17.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.120.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.120.ebuild
deleted file mode 100644
index d5d431bf311b..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.120.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.125.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.125.ebuild
deleted file mode 100644
index 030d19868e30..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.125.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.126.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.126.ebuild
deleted file mode 100644
index 030d19868e30..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.126.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.127.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.127.ebuild
deleted file mode 100644
index 030d19868e30..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.127.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.128.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.128.ebuild
deleted file mode 100644
index 030d19868e30..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.128.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.129.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.129.ebuild
index a58c8e68cc85..bfc431677a85 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.129.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.129.ebuild
@@ -38,7 +38,7 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.132.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.132.ebuild
new file mode 100644
index 000000000000..1bf22439675a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.132.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index d0563c0ed121..8299bc22a3db 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,15 +1,6 @@
 DIST genpatches-4.14-238.base.tar.xz 4958488 BLAKE2B bc8f9683f75806ac2b097b260b2945f5e94cfee79f1c93cead80548fbdc53ca50856bc606275f5886c0a8eda89d802b73c261591d78b4347e722b78a4bba1fc5 SHA512 3c684e4bd75543087265803cb04ba0b583f99a18f9457b622d7a5759332ea25466e8108b329f72be209b4b4de8f38053da7b4355302e70b377908667bc3d347f
 DIST genpatches-4.14-238.experimental.tar.xz 6088 BLAKE2B cd7e9c9f0006636f3d5a887af29761b9b303f6598a67a142ced55484c2140339a5e6f9d58acb02f80e32651414153e8611e2a5f553ef2dd8339049cc1948f714 SHA512 a037c1f59ad7d05326b46ae751e77c10ca94f37dda9174529f6c2c1d6abb7132e97c7e497973128c22ae69cc063ff3a132beded8208a3e507d26c4dacab37e62
 DIST genpatches-4.14-238.extras.tar.xz 3340 BLAKE2B 68ad2adcef36600040c6f4458dc77ebc4648d7e2be2d7fa43e6273f4a50667a0372f395a149ebc9665fc64751cf5bdae62377b233eae9b7ed7217c83c13e5e36 SHA512 4da6c7ffb8807700a5992c9f573ea15db02dce7a6c7190a0e1e2c7379165e79fd5a8cde46a36ec368793ceaadf48da82c6953a7c12a496371a32e6336b68adfe
-DIST genpatches-4.14-244.base.tar.xz 5065596 BLAKE2B 0f3fa81eeb1a468c78e1035084c38d2c91803234211a6ae221ca30330333a1eaaf94e168f8d5e4a330c65766d7e881520a040fb1bb3e9caff7a64aee88085bbd SHA512 bee609b3bb439cd46f9eb829b307c3e04a12858b2005ebdecc601321ca12c47b595da6b8a0687aa8fffaadd4024e8b5c1229e4dbf9045016f103fee6ad32f260
-DIST genpatches-4.14-244.experimental.tar.xz 5712 BLAKE2B fa97572c7809853564dcc0880d7d0296becc392a8cb2a689fa7fcc667d425b8dcf884d06b7bcfa5ca3a41dd8b8b33550aaf002fa6bbf650eca9319297a2878a6 SHA512 d862c08014ca3cca23c9037a15e0a4bc3d15724ceebb2f9ff96c29ceb0d9abaf116cfdf9b26e5416e6bdef60bb2902e83d457ea315015e2718766222652820f7
-DIST genpatches-4.14-244.extras.tar.xz 3340 BLAKE2B 3a183c7510f1b307645965cadba0c0d227e32bc974e25455a67a91a756edc1db83d6d1190a0fcb1a350ed406641862e926ae22f8b9e024790473e32f54477d61 SHA512 50bd0e579dedb525fc4fede7e17d67140bb50e1fd193e8132aa380363f25d00c4a262bb3ae27978d8cb36acf2e6cfe189dca97ba0fa645dfc9a4a015702144ea
-DIST genpatches-4.14-245.base.tar.xz 5088568 BLAKE2B e3ee618f5d01c6a644c5569a251f4c2ac0ff1289016bb88d9d4f2e4a06e5a617999f916fa6c9b1ab15ffc5e1c489e6e930dedb4c574904e9a44255aba98ef790 SHA512 257f7ab39bd26da027968de2b33d04a2579f21d0a0c01677d721ba9eaea38ea79b0dab8781cd35d3e2982b7bcddde640a325b90dd85e19a2a5ffe9cda5c3a694
-DIST genpatches-4.14-245.experimental.tar.xz 5712 BLAKE2B 753174ec3f8660c5f42d12e0060dc56ff12664213741c7decad7efe423e11f834b8658df9484a4871b931c85402b935d9769d6c0228302dba5f8e929d768e97b SHA512 9a3c93867b620d8d96ce66245ccc533771b066ba4e43105ea3e7ea2a996018002694c2681872cef876f6ad4c7212c292b38db57c2863308150031c4e997b39d4
-DIST genpatches-4.14-245.extras.tar.xz 3340 BLAKE2B ffc618ba8382228cb3d320a7866d6aecf0606a4fafed465f1fd2c8b47fedb3dd388b9d9ee5de369e7e05cf7709a328afefb9a7730b4c2ded14df45da8d1b079d SHA512 9869d74dd0216cda2b520b109d01807e0d789c71532e4b39ba44ff9e392a4cb3318567818ea47ec2ee86491cd85e478b04ff6686e1ab9e2a59c0584d413f55da
-DIST genpatches-4.14-246.base.tar.xz 5099372 BLAKE2B b9485affaa8aa743b1829152bf496a45fcf7df5368deca1ed7a09ee502f3c2477b157b789283c4f06144a043a36b98190e71b806e28970efe94d4596806804ae SHA512 584a0d75d5d49fc5c723a507952cf202cb89deecc0db17368ea1efae4bc840c69b3b23f5b4fdf04db1dc07d9752dd35157d56889092ac067a139c7a932031492
-DIST genpatches-4.14-246.experimental.tar.xz 5708 BLAKE2B bd2289396f4bc31cb6baaa41c7f9800b7e13ae9ff70389dbf03a3d9a3f9cb2a1540f0149c868081941961dfec82af68991c942a2f09b43640acb850d314b1a44 SHA512 01465675ac4eeba6971ee15b4c49e87a8098cd773c82e7acd9a7358f77e9ec27fa84c9556e45cb1d1a5c4aa1eb780b3864f3891c97acc27a59974c7e911552b1
-DIST genpatches-4.14-246.extras.tar.xz 3340 BLAKE2B 9b6104df10a436d6623f9d4a8650fb8366984f418fe8603dee66d50dec3e67f45ef7543b0addf53d586cc3d589cbd0fdfbf5c3db34314ac6c444139a46c334c2 SHA512 8d4a45d811d7b196498225897b55e13c56c61454a047971ea069c2a358425fbfeb43dc8b7f2e4419d2759c419394f7128b82a5833b6042d7b2590e5e2e0982cb
 DIST genpatches-4.14-247.base.tar.xz 5107448 BLAKE2B d5cea860bde0f14801a65df86acae8354c9ce0dacd8acd1d42bff26d4152aee4ca09c3c734716f407800f968ff6187d28b3ea5bbf5c2965279625b20ef587973 SHA512 8e520df902c3b0ba17f99db2e75d62d1fe190c8d0fd94d1f8b209333c6bf73c1324d40c6477e5da71d44c68e087deb3720997e69eeabb8b67db1a515a1f01a12
 DIST genpatches-4.14-247.experimental.tar.xz 5712 BLAKE2B 5bf84f6e5978cacf77a471e906e6acc4afbcbd4fa42b1fe4235144e8ac022e497adad8949ad61f1f30296ddd1a225d1cfee50421f9937a9e5b785ba05ba34a84 SHA512 38783f67f4b75e7324e0ff21ce0c9f126ee190679b819171988477ec56f0700826b415c99e9f6fa2bdd8050602db14d8d74201a0d71e9372403a8511cdffe487
 DIST genpatches-4.14-247.extras.tar.xz 3340 BLAKE2B 253bdbc0df0d88ebaa2c8b51979c539d739df6a54a7d66585a97938cfa2314945fcd5ecbc0e9c51eaed5b26306afdf8a84727125c158b306d289ab8321c2732b SHA512 0f2dd824b3eaec2b9db162317cfafbcfe5e3690d074728e3e4f03a33090702d6a50d89700e99b9861585cc7dd2da2a4a29e9000197c05cb17a7becbcc237d824
@@ -22,15 +13,6 @@ DIST genpatches-4.14-249.extras.tar.xz 3340 BLAKE2B 0c33e0d9b6ec90831af0a42660dc
 DIST genpatches-4.19-183.base.tar.xz 4496972 BLAKE2B 50b2a224e191ab6aac262b592752b78cc2259bde77a3191d069afc5f27a987b1749f9886883e3d20e2e52d2a1a38b01fb53d8bc5872220b88bf794476899136e SHA512 954ee22987946fa1961ed843fad5439e9adae501e7e6b37c9a5f42b3e89a87c0b4b688111bb3df2643db1febf6cd6297b0eaaef3484a4087cb5f41239978d3d4
 DIST genpatches-4.19-183.experimental.tar.xz 7500 BLAKE2B fa2afd996ff04ceda3c59126fe7de12085c9abbf91101d88c94e9c0e01e8590c8b129aeabef872a238f51d230eb3acb21b0f30e6169dcf5f9c8bf62e2c34a054 SHA512 e36f71faca3ad33c465148fcf8f5ae44bf1ae07e06cd03b32420930b09bd9a698306e26579d69c14a87735805380bef8424cdddd375df878eca920ed5f78986e
 DIST genpatches-4.19-183.extras.tar.xz 3316 BLAKE2B 776b600248dbebfb9f87af1b6149ac9867f94559d1e7cb4b9018144d2fc6c901cda19099e0cbc07f1b5837d6cf9a0dfdfa2e034a1ead20dfb042c029a36a62b4 SHA512 00dca69d69edf3dc7c902d992e08c67a9907d398c29d60fab3df4703efb6ee296c2693fc5acc2c47f32bc93fb8be33ab0bee1be98ec1a009810e26cf12d94b14
-DIST genpatches-4.19-191.base.tar.xz 4656276 BLAKE2B ac8bfe61392e48ea172f46fc5ae2722b1e621772867a6fbf0d54e8fe1b561c61e277b3f906363b0026ef84c4241a1d9bcfcfec9f231b3f8d8c3a128ebcdfc5d2 SHA512 66b23b28eb498153f5233a1bbe758a1acf6ea9dc06ed49a2e3975d4a9904f9ae7221c70c280aad52b7770481277402e4307bb5b19b4dc2b6c844123293a2c0c8
-DIST genpatches-4.19-191.experimental.tar.xz 5468 BLAKE2B a7a954f3eb3a8e3ecdd0d8c26da229efb75c5a898ac846eb2680e61ad27be7c912bbe7750ce877413987fbb59d7c49204383d2cbcd34f47dfd574dcde39f6804 SHA512 da6607314fa96c3c0d01cfab074fb0cd677c667566ae205a9978529a86744fd2c0237f48a77b6f2b34274ac531c3cbc83f26110b3a11da80ac90308167d22a4a
-DIST genpatches-4.19-191.extras.tar.xz 3316 BLAKE2B 5e01bf56c303ccf715aaeb6ce9291c0b5b37dd452812e03701495f5a55c69b19fa8f38c3bbee72b6e76fc52279959db9778c5da098bd518833deffcbde3ecc81 SHA512 f2b421abc495d9979795623ace56829f777ea9982cb3bdf798198829ec1c6ef85a7f5e3b983ab5c3b2b8660d0f7ac8442f47809c26471d5f02af399e5639f6b7
-DIST genpatches-4.19-192.base.tar.xz 4684416 BLAKE2B 693ba848fbd0baa16e824265a783355d7b70237ca094c02d82f824f1dab7089ebbb370f647f71ae090933fc78444c259ca3105ee72d3a3cf248156e2f80a0d78 SHA512 8b0084a5e37dc1e572ec877e0d23a45954d93319b28cf9094cdeb40e498f34c14b2eba5b5dcdcec8dfc83ee94a5a2298e87ba7a79634772b74deb71a96534c67
-DIST genpatches-4.19-192.experimental.tar.xz 5464 BLAKE2B 7eac91d5066fe75322b75a5904de8bb2e458a1e2329d8d530f304bd179d51415134d94a322b2599d2c3d3fb9456d82b0bebc4af95e05f0ae4c28fb02b446add6 SHA512 cbc59fb07a6a2c4f55a40c30167aff54fff5907ecd6b40aa7233bbaae4232a5907ee7a8a93b93392edbb9d339b4c04421381ba84dcddfe4989e715f833e01df0
-DIST genpatches-4.19-192.extras.tar.xz 3316 BLAKE2B b721bbde314f1ad3b8972ba55f2761bab9ca0c3c11e89d946dee2a4b3ec1c01c573b3c6abd44042b1c65251190f7fd664c94c533f274198a40bffe1c10892c34 SHA512 3d5e8389279ed354e1318010381266eba34044870825f7792b497dfbedb83bf5aeb69e0c31780264b105ab14574927e839b04778207ce8ef6d988ecc11190380
-DIST genpatches-4.19-193.base.tar.xz 4700392 BLAKE2B f7ac0b412de67d3c3f412a67ac15b789805ec871dc5ac42c1708f44c9bd54374a6d1471540fae1f49c4d67547a47c3bf349ff6caaa24ad271f8cbdd5f3bae069 SHA512 a1e9e5c0605faa448e43640974b9c6be9bb78ed50ef4dcd54827207ff0a4e12c86177d0af8940f5bd286615601c079656d1911e4e0173ac78fc9015244383f5d
-DIST genpatches-4.19-193.experimental.tar.xz 5464 BLAKE2B 78ea1986ac95fe33f0e6f101263da77ab2be28646f35fd1735f90cba94da357eb73c85fa72227810fb79f627650690b36ca3388dfbb21a894859534c80844c39 SHA512 0dee7118a6c3af9c5c1db3a548dbbf8376f8cc5337c89ed9e7029bdd8fb52372e73db3a5fe9ebc1bd5c945943ad06a2a5f8aa1920f9d05b101e8a160b4ba52ca
-DIST genpatches-4.19-193.extras.tar.xz 3312 BLAKE2B 45c532c6a41c4cc580e64781ad759bfe9a3139d747ea7a67ed29050427b5b5ec02790e23c378ccd77514b47b2c63ed91e00883fb3143c034fad7affc6f5bff48 SHA512 be008950b87c82a8b5c2a7b83a950a98fff5c2a8eb45a709c5eb94a90a81c5675d19d3bb3b6dc805ce5e773ab308c79a5a273812c7b3e905b9f98c16a12f40c4
 DIST genpatches-4.19-194.base.tar.xz 4712324 BLAKE2B 6cef5b01739c78bc0a1f29dd9bd0af3ef06819426c609c76d00c22bd67c6ca4c360ffa69248b1c0e61ccde50337c95a69948e3ed0facf13fc185151cc79f6663 SHA512 f6d2d5b0dd6fbc23690ba3754f747e9879c545e73a15f23c06782b8da03cb8a54fcde3fc49d72c893d8f224d05a50bb1d6c9086f34d3156cbb115b1d2b4ea746
 DIST genpatches-4.19-194.experimental.tar.xz 5468 BLAKE2B 3f751917e74a5d93d7ba7a4572b6e87c466a4eb600d1de1880a35d28d534f2ab5aa74a10b904b4bb79c633fee2d79b309c52975f9d48fe10d8de5c1d5723bc7b SHA512 b968e71daa28a1848c577947eee08e35a36d6fcd0256bd308b5f7ee23876bf0377bcb84fcdfd6394bfc264fb880bb9c59939683dd848e02156eae8656f918cfb
 DIST genpatches-4.19-194.extras.tar.xz 3316 BLAKE2B 4adfa0a49bc354ef59df796aef9ae4e8e98be1e54242483fdc444ca692edf1f5df5a57829428e070a8b5da5286ffd369c8cd4d76a91f1475efec4b343c2f3704 SHA512 afbdd15975f89046d6da8e103caa2ddf57a9c1d6659be0d4d60868a1c111277b8b44ee1576fdb55b76c00e6f4602bb954b9a4a538b1d4f1ccce2b8f2cc2be408
@@ -43,15 +25,6 @@ DIST genpatches-4.19-196.extras.tar.xz 3316 BLAKE2B 842e58bbbcd28356d449dfd58cf4
 DIST genpatches-4.4-266.base.tar.xz 4099364 BLAKE2B 0bb0dfcabbd191b2dbfd73171ae5871580f75fba2a4343237c0ad6e68a9868d0818633bbf27abc82600f78bd983b50833b3d70d477369ecbbf16c87cfaeee2ec SHA512 cca98ce814f7eb12fb57163982111d2f063d0998d149e95c5bb8c06339461e5bc52e1201c1045342fbd2304be2838b9960272e5594dd62c89fcb4f100bb05ecb
 DIST genpatches-4.4-266.experimental.tar.xz 83304 BLAKE2B d05c680a7df6aedbd790086b4654a90a810656b98dd912bcbd1d2cd1bc27e98104a3ea863315ccba7de2dfcefa4e337b510f604ab5a80059c9d090fe7d282a77 SHA512 b3e816541e7fa68f3bbfc443e9d89837c4bf8b28303853f3a05db4f2748725c3a7c4879820334b0850ed2f3b29e477f763aa004e7426bf2fb7d688b1221e63dc
 DIST genpatches-4.4-266.extras.tar.xz 1788 BLAKE2B d7d582abe322309701d006c6744eebd331fac15bcb06ae76367e772fc815a28405fadfa9714669368b0a7c074ef1ac695dc7619da09ae9b70d2700bdb7a47726 SHA512 81ad23a472cc8052d6b94ab846850d796019314f6cded442572ed683c35bd99bb30f801c7f4d1b75262f633d299b0dde2df879d61848e3c6440b1a2760577904
-DIST genpatches-4.4-272.base.tar.xz 4153664 BLAKE2B 423f371f354fcc80f5e04170a3bfbcd12e65d6ad0655e5405e806d63fe7386fd74b57f7351eec172029b5fa01b30ef7494026d04e91aff117445f5263c97fb1d SHA512 2e29b3f9fca31d2db7fb530e3b772a16813823be04b52a0574ef8e500a0dff35519a1c7303c6df8f4840185ad07a09d8fe808d8304fcd0d25c6030f2b17dc9a3
-DIST genpatches-4.4-272.experimental.tar.xz 83280 BLAKE2B 70b056c4b8a0bcb8dd8342c35a02da074dce52282b191f4fd5e1a4e5f0d6e33c004b783feb6031b6ff588d788a28abe2aa5237de8fd22660ba39c0329d59c4e3 SHA512 3c1f0ee57aeb174cce0fe198137a8ead9c6a65f0f5addb237efd9a3cc94ad80c42ff70150e205d4eace5a0733fa330e994d7c6822acde35825b034737bf63b32
-DIST genpatches-4.4-272.extras.tar.xz 1788 BLAKE2B 174fd84f69a26acefd0a57c9132eb048c1b3ac6f74d1a49f0ace0ff34772a227b7d33c6617aef397a87eba1d4c9b89884a2f1753e70a41969e0514f7a58df9f8 SHA512 fc54dc626b17e86243661a333c6684795dcb01ee401ae01cc9afee019b1c31191823ac1fa0b9da8c9809ee43b20832054be16deb63a265c61e200a8d87877f01
-DIST genpatches-4.4-273.base.tar.xz 4168408 BLAKE2B dcc4926adccc04d30902c44e32b5b969c2acfcf64fa789b94cb4483eed0a2695d5ff219114867138c623923868270c0e206dc516ded54301c1cf6ef35943dd0d SHA512 cd54b48caad1fdc7098293f3665cd951074cb5a67a0566ad8245f08f76b9fc3c76618cd740c3d89aaf72f0d8fc2c66f2f79e1a97f3ae246bb94013dc95b03edf
-DIST genpatches-4.4-273.experimental.tar.xz 83300 BLAKE2B 50caae5bbdcb90369de02c890164e552b2c4024c135360d99b192bdbbc6c1a3161ca83c18ffbeead127f9e75c24708948fca71616ca44623f75e747fe1cc5f90 SHA512 2f3504c8bca529be121ac580c1f66454b994d02f49bed243d144cdd7e81764a94e55e1aa0c5e721b1906c83755743ec65f431a283eacfead1f019dc30b3c51cf
-DIST genpatches-4.4-273.extras.tar.xz 1788 BLAKE2B 5d479ad6922af8f9075cf6d7a98de0ab2e59afd5de8fe16460fa71369252edabd77fbae4501a1f0a52070866ed0cfb83e651ffd758812e2ef3ff5c8f5a578eff SHA512 17cf36324dec82eff4cb2b82a1ad3b5e35bb247f439b71ea0ad06566a9735121cc3eb8b5076f5c7bb2e30d0460755c308730bb4646d339786cb94d9a98fd0e77
-DIST genpatches-4.4-274.base.tar.xz 4173624 BLAKE2B e418fa1fc9ad658229df97a6f5e2094a7e0aa5f5b129f8e4311697745a66989b0facded3a578a6b15abd2fd1fede86b86059a78a2b4f6ce5539436da72605efb SHA512 ec74ea20e28884472f0602b94c13c6c63426b6461f3ab60255926343327f4b8bc44eaf6c613943d768832dcfb574e3d9f1d9e1d97b12dba4485059ee97ab0272
-DIST genpatches-4.4-274.experimental.tar.xz 83304 BLAKE2B f78e869d0f32bf61c7c15bf5e24caa360154ee280fc66b2ce9ba8205c42178aa25023450a40bce0377aa6966623f04f10284ec7c9202ae8e739a9c49d99a8fbe SHA512 3ce25a93e6bc376c63a793459e75681dde043eb5718a535b362f7388bda13d8f8b6ec40064fc51c66da889e2d3c1233bb4469385b66908f5c9dee657a973fb7c
-DIST genpatches-4.4-274.extras.tar.xz 1788 BLAKE2B 7177e395fe01fd1e5a5f1573e75b49d8a6700bf8fd4f070955f54fee14488d186abadec5261ebfa267c98eea5ab8e5a872fbd1fd156c49aeafa3cdfb7d13d688 SHA512 df2bf238b750bd14b7e754c386b6e92976eabe714e44004b88d5aa9d5001d10ad7808da01e5d27456f595197e11233017b212571885913555285e044dabc1ba6
 DIST genpatches-4.4-275.base.tar.xz 4178476 BLAKE2B 5648738b5733b326f8168cbec702e25d7c44b2b292c7192635848a3d3fbdf4f452d64f45673f1039edd36a2c3b6ee34579639f34e06aa77c09f1aa81d47e8cea SHA512 2e8bf2a19029aa5a4328cfc81d05e27ac5032ab5af0395705b45f907755dd6213921ef7006ccdb501cf3d2f15e7c23c89a8c51fa805e8f802a62f318aa0272ee
 DIST genpatches-4.4-275.experimental.tar.xz 83296 BLAKE2B 0f4030cb28fc44e8424fa86c0a7ca3d7dcf1db9d2bf2ff620694b253074ec80128ef6922377125f122fed7ffe4b221d720d014d41b39909172548e86770126b1 SHA512 95783facf5a29120966a7e88061902db6f44497b5d1567d0fcaa5a2c79be23a9f8ffac99d9d158c906e6e2e0c3abaab42a5a2f295f9967662a5c899f1cc0ba6d
 DIST genpatches-4.4-275.extras.tar.xz 1792 BLAKE2B dafef2721ddd49c2df9beb1a07d3217c5adbb646a2637fcf96315fdc8f69ca8234864db40cdbe45742572accb6b742766976d74999df1ce3248904084f4af523 SHA512 e5811be3e7abebe6cc81a7629e5a60b8df74fe8dec9b991650830bdc32726338c8af928ed493acce58a2027ce5058fe8266fb6044b9cf81a2aed0cbcb2a06cee
@@ -64,15 +37,6 @@ DIST genpatches-4.4-277.extras.tar.xz 1788 BLAKE2B a29ac28fe994f402aa15021d8e265
 DIST genpatches-4.9-268.base.tar.xz 4614764 BLAKE2B a5156251e1106347dcda111db6abbcb5f174c42dabfc3694f6b8fc45ded4414e41d8a56d062ae29828b8b033f08b3f541229c033c45d862bad6a52ab539667ac SHA512 468092419b2badd24cd4fbb87fcbe965b5e94145e4fb049916385dbcd1080d1b7a63fe0e17b046a5996a44ab915613d0d7389550fc74eb03f6669be0d6db60e4
 DIST genpatches-4.9-268.experimental.tar.xz 106408 BLAKE2B 31f60f4d61bfd60d001a708584aa3f84a688a4e0e28665c6d82c4c2ad60201e3fb64b69e0611a1e607dee3036a5dcc56bb0ef01766122b666136e104fe1d6dbe SHA512 1b9eb7c2881216e49c0cb81f541b3ed3042f86b3c1ed43f463456ea3f41feb453026d524860fd7b9eb1a51177a1a911b33d9b34162bbc5281552bab3fef33c2c
 DIST genpatches-4.9-268.extras.tar.xz 3340 BLAKE2B ec67f3d538afcd97de03ced99050a5ffa7529a880b86ea2258e66e5de4981aa12f12c7127ff302084fec9ed71416c66b349de3727f46e4f0262eea7a2a20da8f SHA512 33e415c7360542bf1e8a0e77ef7e3f8b3c4b8f761f1b07607740222a1be15ec88b3036330a35daf900f93e25dbedef16506ff40553b65a8b6e3b3f5d1d79c6a1
-DIST genpatches-4.9-274.base.tar.xz 4681728 BLAKE2B 53f0651102238168e205271b311c46ed422f81760430aaa0bd2dacd52c9818e92719bfac2ff9b7c16cf1d904d01a9b6f51af54c52c0bc023f182bb45ea14352a SHA512 7b7bff4ed98e8c9ec99dfcd85189a3986edbb5d2b117a715ec1402afb3a29c4c69aa152d08f4b685e4791ac6e9318515552d1b954b61558fcf7f1e7502c73915
-DIST genpatches-4.9-274.experimental.tar.xz 106404 BLAKE2B 0d33a806f73ccfc1a6a1ad10973a8150ab05717aa9610cf9057f12ae533503148c942bb55ce4a9daa33eba9058d8d8547d1f34fb2ad282dc21bf143a13b7e1ef SHA512 9a338aacbcab7dfa4d30bdf9b974b3a59972bb9ce6b2fde88ebf4607b1df8f4083661c21fa8bb0dcee3092fd0ed3fe32b940489fc57eed51136ddf06b87b1911
-DIST genpatches-4.9-274.extras.tar.xz 3340 BLAKE2B 38bec65335ff3f4e4a3d35a62397f9ddddcdca68db8562a055a0f2bf7b698cb987df32a2e8c3b2449a32d044d7db9e5f38f265205e8e95144379b01fcf2a8792 SHA512 38849c5a0b0637aca4b6bef6112a0d502a4df90dcc98dc17af305b42fe665299cc930ff2ce00dd4c518194ddcc64894e328878c1f1a1816f8b7d74620696c412
-DIST genpatches-4.9-275.base.tar.xz 4698836 BLAKE2B e39b5e563fc0993509d20e83cbf6effe0ecb248f65b2c32b4c338bad685ba23417e29689d665e65b66cd6c3644226cb28c6330c1b83048802c777c6cf1e9dd18 SHA512 5120ccf8b313c1f2647a9d3d87ccbd91254ec8dfc40d8d11f322e94aa64e7772d43557fe6334ed0ffd3aa1606bfece4d209b86fbb7aecfa0452fa6cd5e293cf1
-DIST genpatches-4.9-275.experimental.tar.xz 106392 BLAKE2B d9890ce4c52fa52b69ad1ec7d0066f3e05ce038373c8a7e008dcbb65eb8b32925db34d278313cbd4f81923017cfbf9a38f7872e6f428852e65690662c0847fa2 SHA512 8a54ba5c20b5daf71194b5547f6d468e406cf9a0cdd977cd8b10a7915ca67531f150ece94755b78cc1e94280152e3beefd87fb697b90d4628883a819d27a5574
-DIST genpatches-4.9-275.extras.tar.xz 3340 BLAKE2B 933a93c010a1510e88b64f49e8b4687f29f02cd9931556e2ff370d471d3ab9c006a9576edda9e609553c54fabec2a35c91ffe8cced999614d4a19f82d4bc549a SHA512 6d3f6c17d958f057047f5a2cd98cfbeef54bbe8dcce3656d9cb27cd4225965a3868d2b9cb7bd9f51d8875246034fec420e45d933db76851dbfa5ac44dcd3472b
-DIST genpatches-4.9-276.base.tar.xz 4704964 BLAKE2B 832a836eda7eb51f67b512b96ce108c6eb954380b2d51a776c5949a7feecaad5527d4754def286c5b8f88afdfc23b3549daa173eccc8b628067c7bcf353bd913 SHA512 36bc8287c7273855cfae81608ff219ce5e1fab820d508e833b7eb635861c2b384895e536e858332365f1b3a7259b3fbd189ea7257d2cc3e5971e7d3c151225a8
-DIST genpatches-4.9-276.experimental.tar.xz 106360 BLAKE2B 55dfd8d7ff7c83b5ee2da75d8884f75d1758dab5bd53f16490117b12ecd0a50405bfd3e980736fd692e11aee50dbb3afb59a9691708c9744e11b64f156d90c0a SHA512 b0f6b12ca2886770ff703765cf676544b8ab627ac56c875c4bfde6debc7af5e5f079de748f7ed2b17eae4b2c8314e1d58fac9b5ef72f5d47ddcd6cd0ca0a6c4b
-DIST genpatches-4.9-276.extras.tar.xz 3340 BLAKE2B 49d1e671b2afebf1da1d393dca7e01d2655d101deaffa5fd6b37a955b87437b0121915587ae7e8c1b3774706674cbe6288f403fa04d86394e549d9387d294152 SHA512 f8c9a1f9b402be956f1101db50fda0169e4e668fb56373e6ba9a26e7ceb5e6c22a3185a23368b3f727f93bf657b9da08c061aae7e4aac27520c4c5a2561f4fe9
 DIST genpatches-4.9-277.base.tar.xz 4711552 BLAKE2B 2b14d2bc5bdd854ceda754ee74b21082040f8e0ccc4c87b5c64ccccdc39bc629b713f576daca50a1c29a9f51b49626653852f60eeabaf05cbc2ed9bcc1293282 SHA512 fc749ecab3a1db32eda67bd619e86f391d3f1f9ae84a4df96436021544d98cdeb93aa4f7c8928ba3be90d43285203deb2e80d9db32b90ab33a7a5676bb5c63aa
 DIST genpatches-4.9-277.experimental.tar.xz 106388 BLAKE2B c3afec3646685cfa9a4a90f8b9dd480033048e07ef333b02cb78f0452ad5bc891bcfd7a7417038a57923d45469400687b44443c481643f6c9278e8621e056839 SHA512 5d1ddcd63e54342c8baa0446b9cf684a2d22756b66d068b04bbab349314a64b9e1a9df5673b956a6c00b7b43d1045012de3727cf86a5689badc3af51ab448aab
 DIST genpatches-4.9-277.extras.tar.xz 3344 BLAKE2B 51ff57fd8cc27bee7f7515c8b995d94b2c06334283cf5b287f7d8780e288b7189159cee57223b6ea06259ff22fce5d1f14425f9eb4589afa7df25b94dc25d46d SHA512 3f3cdfb08923815d87a7ae5c8fa961f45e7af6a8e0fa551dd84ac67e7ec4e72ae75223b3f29090a9e2b9884e08c0dde30084ff70ebdbff924b810c1dfeb4a807
@@ -85,27 +49,6 @@ DIST genpatches-4.9-279.extras.tar.xz 3340 BLAKE2B d07f121d92d4940b4a98b388f0cf9
 DIST genpatches-5.10-30.base.tar.xz 991908 BLAKE2B 524e7e66358b3bf311f1347e6a8c8daeed82e6a71340e51157a207580e4e028f230caea696c1e611d57d129113948938a62ef105adcf8f09c5041baedde93aa4 SHA512 3986617d71cd582ece369693624f0013cd88b57a65c3a051975da30931973b161e01fce104abc6d2f08295a2c27e536b98782435c1110086175c7fd5051d62d1
 DIST genpatches-5.10-30.experimental.tar.xz 16544 BLAKE2B 3d9225f0f460fe316053360606a8284faccef03af7e22e1156045e71a24ea83fa900258cc80439089b0d5b54ac2022f548bc3f47fc04d7645d3c27033bc9f2bb SHA512 fce31c497391aff783eab83aa3a23949e13009a0422b6b5b1cbf295e133b8140215690c56c9550bd8b532e95490e40626a33bff152da066933e5a5270e392953
 DIST genpatches-5.10-30.extras.tar.xz 1772 BLAKE2B 7fd98f16922f7a3ea703a5dd2622152b761a47fb7da8a108281e4a9ecb37f9295347a23081b2859039b8b47049ac530d74a05358b7fdb4a8c9a97fffd8103c44 SHA512 ca23be16f47ebea149496eafb0ce9c6068a3a46be01abf9d95b5e693e5a5063e7692003bc23658269d55f923233f1124854515a3f35a94dc385410c6978e25ac
-DIST genpatches-5.10-43.base.tar.xz 1461848 BLAKE2B fb1bf2fe69c6698cdbd3458950109dcfd534b31fe22a51019514b619d119bd26b36ba1697164044d5b2dbbe3c3f8e72b076b87dd32ce59866932d9ee67bee591 SHA512 9bf520ec729d96f4f8dfa0d8f30cf12abe87d3f4278120afcc152c8c995662ee081d419a3b29bbc85c5e4a7b23cda1ec1b372c46058319bdd06a9b475f3d84d0
-DIST genpatches-5.10-43.experimental.tar.xz 16880 BLAKE2B c34833a3be158df518f2e4eb1f93265741cab07acc5677eea0e3b9c48702a95414c30e33855c74154c6f85ac4793bf9e0fe273ddb019522c3bf1b6847604d8a9 SHA512 cd56d4ff2d9d3addd9e32441c734771237731317f0c0a421aa24062e240ff73da0e2b3f8f5e304976b3ec442004337d4ee70deb205e968f53ad5750bf519399b
-DIST genpatches-5.10-43.extras.tar.xz 1772 BLAKE2B 1c2c2ec1b7a2814572b464a02e582821bb04c143524dd98ccdb330463230e1370167b8fdcf269d137f4087d21b60ba07dc72c5da2d47f8dafbb1a9598611b804 SHA512 e8085e8d9c5a82d9d8b10d2212577fc3878beaad4e52f145bd5490b3e7f440762f95ecb7a2266eb99a91ce7d98fbf48f241eba86329aa35a1d9103733e7195a1
-DIST genpatches-5.10-44.base.tar.xz 1463796 BLAKE2B b4e002718b2542c1806eb89cd552f11e3ed9b3a2c2e531c590d05d8796bd6a462457c1afebf1794e10dd2419c45102acb7d4e371055b1ae750a959bb3720ab96 SHA512 4e0d54ddc9a43427c418a9c0891b8dd02088a9b75ca011328401af994c54a5fc5498db228f3ecd6aa752afd058483f460e86fbe4393c24815974300108e7324c
-DIST genpatches-5.10-44.experimental.tar.xz 16884 BLAKE2B 7aabc8ea6c04605b411c104a19cff77abe49203dd181d16e0aefe4415be0b6e84689d8813e2282afeea2ba94393178f170e161cc393404a29b370dc63af9431e SHA512 1d68344f2da1ce8dad039440da7f619a408f44f4659500ee71ffad7d57f6d3ec217ab1778c3a3ee7631b5c92f88e2bab4ccb98484801cf6da098634d759d3178
-DIST genpatches-5.10-44.extras.tar.xz 1768 BLAKE2B 287454aae7ff60ac375b570e5132c33f81471348af58b999ca1355d15e7fd1f0839c369e28e18496dd0f9a43d6bbaed03318a9358a5b9384c3f27c109f7447e5 SHA512 d69a0a32dbd79eafe4168bccf55c0b0765e5311bd2f81ef93ce4f709990b6a789eb057b2afac7364b18e5f811b9610e7d8e10efff07a6e396c8e897b76a50378
-DIST genpatches-5.10-45.base.tar.xz 1520656 BLAKE2B b2dbe0274ff6a90e2e8b5edd99b1505654f4e7fa777e8944a0e7ccbc23c3c8f938e061d470adb678f4a177738b22d855812c38890592a55f6746ff1f52da4e93 SHA512 b997601f68c852ceed6307c2966ba7eb6f7f4e17f30be38153b6b6604d0bea18ab0f4f66a1bb79474b0b330e30288c441026df18bbb761acb071b0f8ab8f00c2
-DIST genpatches-5.10-45.experimental.tar.xz 16892 BLAKE2B 82e65ff2e2bd809215aa7ac1865e18a1d30ad18e6fe6adb6ce7134afa69724e80ec9a71cdbc27b0a397625ad8d32bf5c238f979047d25198c08d36a53d654b63 SHA512 d60bdf2376a7d1c10af26edd9c6b2f6fd24f9314fbb6d6c16648f6d32f0159ba799536281978f6f9391180329fbe56831c2b9fd3754cfda123d325184bda9a66
-DIST genpatches-5.10-45.extras.tar.xz 1768 BLAKE2B c7a3221f2c330d1463f88ce23d0ac70692ec4f390b7a10cb6ce6be19e948f8595b2b7ad0fae90b4cf1c94bb8c1469be545cf3352b91e99b93cfedc7cfcc9d7ae SHA512 51e28cb3d536e4df5743c55e1f95803a44ffaca7da75ac73dbe575051ddf3198dff4c69a0bf32fd479962ce518f5ed57be8fc3c71f426edfafb814c350f16393
-DIST genpatches-5.10-47.base.tar.xz 1555884 BLAKE2B a4078ace7edfd91eb3ec2f63cb121571b2d5137837a33c96ed5e09201f34cf82fe3b7e88c6684f40a2125d88aeebe275e826ccb2d63b8bc96863edba5055643d SHA512 eea3cbb4b0a9c5979f4a7504eab5eb7e041601c78d3c1f4037c2eb91fe54e7e73c7bcbd88f6e69dc859f9eb7d029bc9f55b6ffa652bf6bc742013fa8d3b0c71a
-DIST genpatches-5.10-47.experimental.tar.xz 16880 BLAKE2B b41c87dfe62096e757def2d23e5e45721a235ca650b3a6605da24cb273c8c1ff4eaf087ca723f1982db95e057b784adac6707e852b8cd9ef042bff129848f062 SHA512 f7ed7f2e9532171b730d71468fb32103efc696c99617aec34aabc82b61b1f773730edbba50bcbec19f533cee1b3f8a75e1e979398ecfa07cb6ece2fb22593ead
-DIST genpatches-5.10-47.extras.tar.xz 3412 BLAKE2B 779b0a8bb908156bc902106a98e4308b3ebfe42ecfd5d651aab4dbb95c0ee890e353d26d51e1fdb7c7305419e8eda5103a01405be5b015ebeccde869798c68a4 SHA512 dadec8511140903f38e7d6657f3e8b750382cbb18271448d3d23a03962b0ceb4b70950d6dfdb643fc2223f53254b824a04d2eec540626a20a50b998a9ddfdc13
-DIST genpatches-5.10-48.base.tar.xz 1580692 BLAKE2B 85f19398f7a3967b471077c1957aa21ee6b34c1a0876ae6a64e5aaecec7a9c91274eeab73574e22961dd8f8e19bc4a69f4fcfb26e9809287ef0da964f64bd69c SHA512 20b894e85f002b057377b7685bc4a957ff1a2990ee6bf94d1db9e8ea1a3e9d20478445ae5aaaf005269505599c4a9b9b26a4ea7129d3c5e2ad18a530c4b6f5eb
-DIST genpatches-5.10-48.experimental.tar.xz 16876 BLAKE2B 2e94960ef66cbb06bf80538dc8ca6c22d5c7fe1da0f97c55b0e9d5a9254290c1b2561f51fc00bd78e4effd9b24d95fca811b7561b894192fc006d99885d47b69 SHA512 c925634b043cd9cc23bdbe220519d50772abf449f146d391e2ba080c286e3080eb05a73a5b988b3c79a102cc01a8edc4f41dbf8fc7309de3ae69fdb5a118b48e
-DIST genpatches-5.10-48.extras.tar.xz 3408 BLAKE2B 6f347e53aa1eabf134fdd4f234d794820d9aedf126084615fe5eaf29c8e8f30828678b9df544ed39a9ea47e9bd9e5b1a93ea94a90a7aaf1234354cdd011cbabb SHA512 3d19cb7079c56c7675a16302c272a1da1b72b902d66f341428747aa12d1fbf949366e12ed5501bc15d92ca89eb93b32eea283156ac5317a75f11806907e55cad
-DIST genpatches-5.10-49.base.tar.xz 1588092 BLAKE2B d31ab75b6106e81654a69d1d0cb1d765cad83fcdb20a4cad9bf44749146aeb4c19cb6c8bb743b26ec48cb6439c64f8b3af9011468ba6b140dfcdd00adf14286f SHA512 cf6973eed088a99b9e9bc5822f87e75bec61f94207a783f25ec5e835fde565dfbc04fe3dc5c6709f213479b86bbfab26003661108607a17df0169ee2ae5f43c3
-DIST genpatches-5.10-49.experimental.tar.xz 16884 BLAKE2B 08a47b1b0257e2ab6e87b0cd8f8cd554b2f76619580b2277712fc6c25d2fb403bf960a5d65d77648ea33084e76697dffc52799d860d8c8070e5c68a8951ea51a SHA512 1e1d0c07e2818b80e0431cb9308e07b0e3b846f4fb569fe9c87f753d2af33bcf304e3c5333bcccf82fe0155da301af70c2e38cf71892a413af5c032e30151443
-DIST genpatches-5.10-49.extras.tar.xz 3412 BLAKE2B 3feb28c887152586b0e5c282e898d447451cdc7b0dcd0749d69890b72fc1d38f9a0a9dfe62d09c8f37ee198ff809edd949137503dafbd63120b566a837c83e32 SHA512 dc916a8848358891c749ab2853d49a2e5a3e7cc0c696b4f523902c5526fe3463730209bcd9a229dea86ed628a8da63b16316b565752e4eba6ee68381af92b6c7
-DIST genpatches-5.10-50.base.tar.xz 1622300 BLAKE2B edc737c022aa9855ce8afa6120618376dc1fed512f34a8269fb209389abb8292d14ee1c3020a33af181d099b6acbe970f960921790f5b356d742ee61750d34f8 SHA512 c543389c2cb737b874d91b4dba700c7709aa3997a3bf7c6831bd0b543f8611f37a5d87c4b3f9b775dee2bc3a3856ff0b34dd35ad8cd8ced60d00a880e7e7bc75
-DIST genpatches-5.10-50.experimental.tar.xz 16872 BLAKE2B 59569d38336aeaf22b1a70be155f0a61a7f75e849ba393301d9b893e7e85a19244fcb930f505a4f49b5bb19d5ce300ea8fca0a1c42926452f9c1714f6b25fbbf SHA512 98f9e3035ef63bdeac3dc420a4d3cf24d05bc5e7b983981fc09f62fd083314967fe01832ced586c5217e26cac9f85b652c3d4809e737757515d02d899eca617d
-DIST genpatches-5.10-50.extras.tar.xz 3412 BLAKE2B cb86ec70bae4b4260f973dbb23251e0c9f9841b12cd3e1e405215e9d54828ed4f7e32aeed131000f7ee467c3b23068f1dc6ca7e056a8b0308add810a0d6bc7c4 SHA512 39dffaddc87116a9ce91fdd07e9dfe7b4ab9c8c74328f3a6e7fffd5b2258837f2e6ccbf27d394fb4be15792c032b12a6289d3903a7e9e221fd411028d78f0073
 DIST genpatches-5.10-51.base.tar.xz 1649104 BLAKE2B 611e698ca58531702279ae9874c07bb3ff44a15cb8df4bf7e53b74ee1f5e7c846c058bbe16d57578a59e6baa1fd427e27bcea6a68516e16b285623ff2ccedc55 SHA512 1b7002696deb32915ccb459ab6e5e500fe8f27657dc0c93e99d129b7b843cf6574a5c1f04b70c5c3d7f405a6f17a5dd63fa1987a1e11ae6f770399cf7fb749c8
 DIST genpatches-5.10-51.experimental.tar.xz 16896 BLAKE2B 00e6f591d455066708af75fb5b4c5371dcd8ea83e503ec67d6257e3669d07959894b267c057594d4b576d71afc1f51b99f411282a4a1ec6fcef071da8299afe8 SHA512 b90a786db611df460521ee2225d6081bb90daeca8e5d637dc43844385b3a531a251cef15ec2a065080580ad795552928874a2445c329bfb2caf6aa1d0230fa7f
 DIST genpatches-5.10-51.extras.tar.xz 3412 BLAKE2B dbbe9031fdf275673014bafe3ee7d15e668f61187b6809df769a660830d026172b1eef1eefbbae61a2471004c14deba15913b0d4b57cfdf3750954ca075074b0 SHA512 6276fbea90ad4655021bcfb4e22c247e861807fa0c1a0ea6ce2fa439264422beaf74d0c8e08bf5fb0951727e1c4c189db5fe6672ff182d6c993919c0fcbeacbf
@@ -118,18 +61,12 @@ DIST genpatches-5.10-53.extras.tar.xz 3420 BLAKE2B 3079e8f65de0ae8d927cce28fdaf9
 DIST genpatches-5.10-54.base.tar.xz 1652540 BLAKE2B 37ecda0a4f76784572985be5073e7a3f33eb3aa43e641a2bc083e987c88c45cbc277bdeb20bb6ae4d264a17b65273119790ba8dcba7e22fd76ea8d0bd1be1cfb SHA512 85587df46e72cde33fb869f16b7fcc995a4d947552ab4bfb45ffcc852dad1f4b56a58d81446a00a142b9e628bd2fcc8c4922b50a282706f430b0bd9e20aa34e4
 DIST genpatches-5.10-54.experimental.tar.xz 16868 BLAKE2B af882931bd84ccc327825237f71dce6ea78af43a48e338c9e0580ce140562953fde5ef9d5d35e6cd81428771565cf8a99da1cdc2154adfbe0022cfca93101e26 SHA512 58c6d20ce2bc06e50b7697e2705e6cae16d82fadb5f86a6213f26cdc0aeea7bf40f34335a405caae3106f629d09fe8944bd85c7cae2a09231dc2bd5a8a0e5d84
 DIST genpatches-5.10-54.extras.tar.xz 3416 BLAKE2B 3602707190ed04f62c4b2e8e0e765a53cf436b437373e71b6afd392cf05a73ac9e24f89293aac17c3730cdd696485ebf9d98161b248c9acafbfbe0b0c2db8ab8 SHA512 e4aad3f799dbcf00f813e39c8b9b355f17914a33d1ef422b3e7ee48c48e77a69925cc5664f0f171d1a632f622417b9d7ec88e56b1575c8e5f82af94f64337f42
-DIST genpatches-5.12-10.base.tar.xz 564792 BLAKE2B 127e64196c8aa0b65dab7de4dad4b97052c53451f27a1948453d8910afd59b3a5c4ffc316a439bd053b433b057df127bb252d994f6447a82dc1434eb317e0d1f SHA512 e4c9eebb61de9af0fa4a53472c18f39f87196a804c63ff796eff992f75450719400e7bed5cd8ddce6b09db8330be443ddb2ce0241d8058aedcdb5e332a4178eb
-DIST genpatches-5.12-10.experimental.tar.xz 70008 BLAKE2B 5f0fd437d51b9ef16ffa3ef8750a7fc3ce5464a3f19e4c16b7e345b3fa3c36575609d7b9f82be33c8a1c919c67f2beb91d5c37f542436dda9af301b4bb78100b SHA512 ce221e96214790b911d5aaedb7b1336ed86ef1350412fba0e20e15241a892df17a8c97768bb9ece7f4abfc61374f0a9dea72a0de197f6821ed3be700a66818fe
-DIST genpatches-5.12-10.extras.tar.xz 1772 BLAKE2B 31e3959f1dab1ae1ff5f39b75c455e559e96bd4527e94677494accfa75fd14df2667ecea8ba5df59d3fa1ec9464ba18a257a8a5e76c0602049732f66829785ad SHA512 6e2bf6f7eada61ece1f65d1461377ba5532dd45b57b58b7ee6dae9485809d4c329c6ba8d6d0d0ee9027612a01946f756069b50c44d60d2f543e9864231abd676
-DIST genpatches-5.12-11.base.tar.xz 611232 BLAKE2B af0db172fa831bc84b1935d387e3d7b360c5a94d8499b6fa204f21b7a822c844e88a87f4a2724d0b8b508676ee564dbbe304893bfdd3197d67c8f6aeae011cb2 SHA512 f422bc1aca29732db09184ca2fcf7478536a87e73b59325f063c73103c8ce425858baa78b185eab61a80dda15e3818b45a669c69f7898382aa3563b315ad45b3
-DIST genpatches-5.12-11.experimental.tar.xz 70012 BLAKE2B d1be6bdf13b41eacb153e139b8f42bdecd4cad87c05810f18073fd017dba48369f3d2ce5f3b187ff0464fde146104ad0c37115f29c9294ec22381d4facf5bec9 SHA512 68c56214ff113267964041b124916fe088ef73deff69955a4fa3dd7b3c384f91304073348264d3d89ae264f70eaa33f9443d5348ff9a7c0ce0354083131cfa3c
-DIST genpatches-5.12-11.extras.tar.xz 3412 BLAKE2B 2eba600cd1e769a7252b063968b87cf5f54f285f791f84089fd1f3060e3400a76dd645841bbb213830cedf274e41959ed48cbee081d556c82f059e2a3de4db51 SHA512 2bc29ba1aa4b71b2407906f2c86339eb15fb124f964ddd3fa9f4a39dd94ac18fc95d0780cf1fdb99286b1a27aa88ada32665feffd9a3ca7f53bfb66f0212e7e2
-DIST genpatches-5.12-12.base.tar.xz 650292 BLAKE2B 81b5a3b95390522c328acdb390fd1e8515028e55dee9a3693992ce2aa5c2defcea37b14c385d72e0c6a9b31f239c7d02eea45e4428332f477e897fa94c02d71e SHA512 bea0fee6fade3b1322a52ec2201b828ab28bfb3c0528ea562ac7e3cfaebeb758b971820a2b1ba695dafe219ceb2548c07713b3684491b893e6055ce4f8943916
-DIST genpatches-5.12-12.experimental.tar.xz 70008 BLAKE2B 6f1504992cb0c7ee60c0473a6665c4f24c86e712e922fd35ccd74120d8ac087a259a2f3a684c56d5cf92338718ed32fa43f9ef270cfc92cb0ca6b0534cf4d4cb SHA512 61b7883d2d852fbb25540072a0a05daa90d346249c13418b7e40e23e5f5aaf3e6940ea8a03bfee7a823c205a363c5be420d1e578de4bebc1187e27b9d2dc2e88
-DIST genpatches-5.12-12.extras.tar.xz 3412 BLAKE2B 8fcf6c407be25db368dbb3e6be3907d3431228b5c39819dba7c67d61e5171a7ad9a86f3e117b99b9e0d626219ad9db0938c15c4b96c934b88f693a3e9661d458 SHA512 39750768e4822ea8e3f88540fc8ebad9fd721e2a3a8703102d58e30513b47069cb8a77e15e41d0f90d1d69053007bd476ce0741cd3135a428d039ebd426cdc57
-DIST genpatches-5.12-15.base.tar.xz 661028 BLAKE2B 5d03f3d861ebfb8b43ae658d972f783b23dcae40fbfc2b9019b7970d98da7c3f9d2b86861a48847cb1b9da0b82a4987895b15829fcd6dd2f666458303fd137fa SHA512 93b6ed386a0c62c18b768b6b6cb6cb97b39ee58a06f7dbc9ed3d80a8a5d272d79cf193cbce4dd1d5c9c7cd89f11e34730a237a8fa34ea282803631a17e8902b3
-DIST genpatches-5.12-15.experimental.tar.xz 70196 BLAKE2B 08c54b0250ff53189d23a0b7ca7d0395a54a246870cd8b7f385affe5fe687282ed21fe49d9df97f9d628065b90529fee26982ea63db7230b2f2a64583f5359d5 SHA512 8005f3be1a37ff5e49748ff1617e8cd18f98790539326de78e91aa396737c5f3016c58dbe46eb502453a5408e84d9877dac2db6b293c9d6d85222c07a0b2547b
-DIST genpatches-5.12-15.extras.tar.xz 3412 BLAKE2B fd2a4a96e260b7ac35e575cd77a852078d11e0135fa8a6a2e410262b75800da43b8f614e6216347cffa4896bb3527cbcfe8306b94d19785647da277a5bd82a83 SHA512 89a6d01a55346bf1091c7f6290d4f32cb18f6504b9e221c455da8db38534017448d6d6b603c9f7c09dc4df81ca0f2e6ad358afd4d97efd7be92b7c8382975af7
+DIST genpatches-5.10-55.base.tar.xz 1653096 BLAKE2B 405282f84e50eb5d88148b8249896ccea1ed1fcb5c8c5106ad35164c9af73eab2aab11f27805a08c9c2b99fdb52f7095c7a761b8fa3c4126410490ac4eb6c9e1 SHA512 08fb0ed8674606e9b70c9478d851decf028dfeb8df1afbc102a336f3c2fd943dd598752414d4df5a3c4d9ade53ca12830786920f409e1a197dd47c89381d8e2c
+DIST genpatches-5.10-55.experimental.tar.xz 16876 BLAKE2B 1833425f196cdbf6ba3af545095d0166f74e889c943b468070f28be1364b5b0508990cd0bbcbdebaced9a839fa624f477ba5ecc6770e0da42eb2b4a3f8be32ab SHA512 bba8db2862c4d478b80fa1e6e3a36853417f32d7b4bd1f514c0a4121580b490285b6a2edf8dbfd5f37b8c287c59ddd464988faf715b9bef1015eb653af6febac
+DIST genpatches-5.10-55.extras.tar.xz 3416 BLAKE2B baf2a2a3e18cf75f0bf03bed74edd5ece9bfc11c4870e36f8f3873a7308c685b2947ec1ecd52d909f9a683c1a38a1a820d41ed90f098a792002569c3f9f1a601 SHA512 ae8591c2aa132a67b5258ce1829fd59d8dd343628c9b9d2625798077b3bb0d7fdd577db8fab9a64851af383d40fb2344c1eb03287fbb9eb58a3e6c63c0b611fb
+DIST genpatches-5.10-56.base.tar.xz 1790176 BLAKE2B 90510133af510c12c515c33e7e970fd974fb51a3a85dc519a9ab378aaa19a2ca965b0983ca5148f43a122e65584ac76c67c79c39fae3bb917ff49633563adac7 SHA512 1f416bcc1b7cea2a8708272d1d9d0c71b55c6fab33330f19baa7811eb3b859afe66e9a24f83a2b4652a932c02d7016fcc81aa53c9faa970c1885fb672b79ff9d
+DIST genpatches-5.10-56.experimental.tar.xz 16872 BLAKE2B 8868d1cdd3e218cdbf605003e08ae4eab06b403521887672ef66ca9dd6690b1de99e9dd3d506693d2847bf3ffc64df88b7c8d223f3f25e30844489c478d61882 SHA512 dfb4facefe62afc5e6236d7f167f23ec25bdd33bd385948e02e0888286111ea9494418da6cc5e4aef3f1a4f3f91703d3408a04c10a91c38fcf21174432c13ad8
+DIST genpatches-5.10-56.extras.tar.xz 3420 BLAKE2B 96690a61ee421300a6385513e2804a2832622c4da07f4d0a20ca10274d822811f08b2a1c58dd486555d76bcf5dda75318784b95b6585b1504d9d977dbfd13cf0 SHA512 912ea13685c563e3adfb98bdcd743edc8e27cf87ed3c332bb7204235005c4ba85e847881e6394dabb27d83031c1035a840fa72d7ab9f23627a3a4dcd1210cfa3
 DIST genpatches-5.12-16.base.tar.xz 707164 BLAKE2B 05331662b6c219900a5d70aa3f9030e82cff6ca09de9645e178f5976daf8003335ac2a9163e405282096bba6057ca645f81fddda41eb7b10f1125524b4cadcc5 SHA512 dc8efddc386fc5350802edb5f95f62f61a8d3c2033a0efa0fe9450ff0ba84a65cbb4482a0de9fea6f67200fb938f3d73c27124f9bcf706485f32f25cf8e89cd9
 DIST genpatches-5.12-16.experimental.tar.xz 70220 BLAKE2B da9191304daa4ccc631f905ca97c981fffe89e390e653da84c16c0963d76b99d27bccdc7f41b764249b10fd6981fe645c66de435e8a8aea646b8f27259ab220b SHA512 abcd1bec81840eafa84e6835f6e003490b43614cb82ab31f6315657401f76363d87aecd92f44c7c6dece5abdaa1d55b6b3fbde8d534a4e5bad8ea09ec09feeca
 DIST genpatches-5.12-16.extras.tar.xz 3412 BLAKE2B d0e429e2c9e1a2733a216e57c32c73f55285edc74f801017261925f246e44148c58cd8745caa6afc9cafa9c090d01206acc3cb96dc0ab260a834a0b3dd0e8918 SHA512 24a1f8b2f2993c157fa0efe5649b7494084d925f8665a8c0727ad431da00fcc8bfa7e00ac1d2b308b1297c1c202eac687d7539999eed38f44e71a9cb94327ef6
@@ -142,42 +79,21 @@ DIST genpatches-5.12-18.extras.tar.xz 3420 BLAKE2B 783c9491317343e26eb9a25b48486
 DIST genpatches-5.12-19.base.tar.xz 744220 BLAKE2B 63163732eeff70cf0eb344950247f69992145a4e7cbbe966eadaffda3be3f0e645b3d7cfc9c2284156385e761c02613ceec331b777b282da77b3d169cf3fb807 SHA512 8689a4f3fec6c29a88f7389296659579c13a2b664b94dc8147bd1b266019c310c30d19198db01feb60a421b1362aa15e72feb4cb19ac2ac2136ce12c42a21915
 DIST genpatches-5.12-19.experimental.tar.xz 70184 BLAKE2B 9946d739b840ff39fdc31a0b9935a605d2997254bfcf29df2006547d35a8157f3d1bd942c4a022ac3a02ad781e68ab46dfe2a38b170d7e1f7c9d783c0d23da4f SHA512 206c29e54d6aa435bcb9d7b6b54aa7897387d53475b9431d1957665692f6d9487f0cbf52b1dcfb86f373f08ba75c1ce8b59b31ae10181c3e60978f8a359370d7
 DIST genpatches-5.12-19.extras.tar.xz 3420 BLAKE2B dd43bf044652067aec7069cc2e8c1b9441ac06750b64dfd355ad53221df08fb68981363b9749a6f93ebfe81e728ad8791f7a5ad2e9d4557da6d2a1904efc05cd SHA512 501379a816043c5bc0c4724a999957d8c5b4cca214d12e2d64577ff24943230e6ae5e60512b634a5507ea5f8823e7511b20a5c099bab149309045e0fd17c4b24
-DIST genpatches-5.12-8.base.tar.xz 486256 BLAKE2B 55607b8e42132706dd6d5b2716ec252fdae5b7b2d0e4c7874aa4d9f558172f207d7597eb77030651a5c490b86eedeaf1174e9908277e989e06a4cc048b1ceecd SHA512 3651b48fd077624d7e9b9471bddfa3ed0b5d4656374b73b92192de26925a12b3c4923dba9764ff12c1fad94047b404c61f23cd2eb4d4383775eaaa0ded3e7907
-DIST genpatches-5.12-8.experimental.tar.xz 70020 BLAKE2B 7f59721ed84415f1c2fff54fe5dfba2522d9498a63823d1246ba202b80838fd0c8ed16911ba48392f689515aa68535ce69b5b9968e25023edc07229139e901f7 SHA512 826b2cfdf0cadba52cadc17fcdcb7bdaf558d232565ee6055c45bce5a65b0e5aef47907a8c6edf62bb69d58be8e81339863bfe1803a21e215d2c00e5bb957cc0
-DIST genpatches-5.12-8.extras.tar.xz 1772 BLAKE2B f8d4e1f2152ffa0fa46f592051faee455f0319ac11911c79d34f393109bac49d74d5c938f38037871ef777183b124066f4dfc46381c51a337fdef54589c981a0 SHA512 13ce1243c7f4b30a24c70cac04bdbe6ca29fa608638e5c47036ba4fa3e839dd0b7dd5d6cf2c628a7d86418c7eb5c520334d84b2b33e5db206c947fc5d4c6a8eb
-DIST genpatches-5.12-9.base.tar.xz 488148 BLAKE2B 9109501b6334e1856f13f4f4e82d34a3804cc00f58e7ddede2d005b27a5de419c8fe973dea126917213b223712089746f493e0600ccd6e528af8ad34b6d2248d SHA512 6db027554a275335ab74c2a59eaf5baef4d05735421e2aeacef1c4027020e60052cd4404fb2cc0d1c7be820064c98e9bc40363d6d86203823b5db10a34d81da9
-DIST genpatches-5.12-9.experimental.tar.xz 70020 BLAKE2B c4c906ecc872f02c819db878d49e9d7e6675e80b104b02c15baf8f04f7559d1102bd68dc6dc507ce16b397ed6b88ca0bc7809d2a0084b3ff0593ed36c6355634 SHA512 8aef1ad08b7faab6f2d027e077195fd9330d458dac106f921748f1df42966c3e016ab1e53b286b8ad6ac19c9f3f445e27e424172fe56fb3f175cf46b98b18da7
-DIST genpatches-5.12-9.extras.tar.xz 1772 BLAKE2B 127b452d6bca348b7ef8b501b6a2b619cd35d3f9a02b23430e273471f1f3512edd85ad9b015af74d500cd261225bf40a2c333dd5a54fe5182f83c159e13cc9c2 SHA512 edc9edaea4db7e5b31ba565af9026f171f1f6292bc5be4589a8b61b3cd6bb4b86f304543f2e51e4279ae3391b2b5751e13c68dea94e50a2dbcb9192b79fe55c4
-DIST genpatches-5.13-1.base.tar.xz 3840 BLAKE2B 5843b75d53225fb5f3ad278a69884c70d3eda165faeec7895dac661d035324c69fb32ec4ca729a025bc8e73b81a17f085f60294b621a646dcdf8bb389fc37e41 SHA512 62f49080e44895da1ecf0dd4d88dbcf3fc1f6b227c09aebf7b4acd407655e0a7627cfaf870b26ec5ab508ab2e9ce36e86ca92bceb19566c8e4a2c509a7c459af
-DIST genpatches-5.13-1.experimental.tar.xz 5436 BLAKE2B 266c9ff4d958fe80d4acd9e19538b67363ffcd2ff41ff83441cbe4808365a9bf4f32e395092eeaecd4e031b52cf17d0ae8616fa5ddd902a707e90736c654e486 SHA512 aa82c4c1d09d7fb47860e55f20595844170b7080134c8eaf350316f1c11c6ec2ff8fef9b4cef2e0e38128d372614861258a78da2c0a5d2e1053860643f16fe05
-DIST genpatches-5.13-1.extras.tar.xz 3412 BLAKE2B a93dc7964a3b26817e6a561b314e93958d887a08a519a8a8b1bf2e4bb78790ed03a217a54cb6d9b2af6f7a2f4e78f8a0fbebe2aac0c34c1c9b0ed884db3bbbb7 SHA512 f4470e1f4d72ef0d54b6b0bd6c427f722ffac8de9e8b0a29b69e032ce71d9c18ae447fa855bf4e9e45cd2084f0b7837d0514aebfd18f6a04a7a88a191e966435
+DIST genpatches-5.12-20.base.tar.xz 920044 BLAKE2B 97f6f4af62985d17004816190f55919cd937e29e24c753c0c6d82ec6bacf89b4faf01585f941ae33c5b37d994888b7362d2ef22add518e4f6a2df3fe3b23953d SHA512 6f5940eb48c8167c7492701968e72138ec8a35fcf889a45158321a4507c45c5a930b68b2156410fbd063155093767a239d4d9cb3711c81ef47a13313b327c07e
+DIST genpatches-5.12-20.experimental.tar.xz 70180 BLAKE2B ed944f05cc2eeeea261df754172d711799f7425ad7f4a7c4781d8f6087ef88f3f146e91e06758effa41ccde82bcf7fd30bd22549889dc354a8a4e87d2a0670be SHA512 32dada6499e5506e7c8849e78f228ddf254ab6b43de268f4fc75aadfc27d154b4c88963688462598e14d306ef98a0bcf64c1d93e553b0ce5b30939e2a2f6795c
+DIST genpatches-5.12-20.extras.tar.xz 3420 BLAKE2B c161c55413cea9c5776773d0910219a801d21c6e16de8816bc909d120477e7d6ab0d40c8a4bcb7b09f2227dc70c8cffa86392147acec9e20d2bf0179231c0926 SHA512 143eb7972c11aa69d2a81421309ba84de370ae28511366dc8264c52a073a4069bbca19cceb6fc0bef9410441ced95d1984a18142df3207aa20ee783e40688801
 DIST genpatches-5.13-2.base.tar.xz 4716 BLAKE2B e954c7b553a44cf7772f305652b04e7c3e40faa3e3b03f8a32ba443ade2fc04cab4c97327703861887dd83ce593d5d4181008990e1aa6c7ba43f2e1f4bb9ae62 SHA512 9bdd1e674e4382631e43b6f668bba77ea13a1b2b0d1f7c3c8feda6d1dae4c55086981e6a196ec9ef8218f937b72a201e9c2843867882dfa5be651da50e3836c1
 DIST genpatches-5.13-2.experimental.tar.xz 5416 BLAKE2B 38bba121d747f24f7a861cc288a5c5148a76f963a3801b41812ac7a75490725a7b483d7ea3cae9ede81739698c785f5f8fdc5fe430a761d3ef5952d9e3c30853 SHA512 c9d28367d658148c5c75b40995032851a8260efe50ea9306c6e250e0d205feff7451a59985a02cc0a5bf768e3c57b95616e0390d5d6636d9dcf3c2e079ef8313
 DIST genpatches-5.13-2.extras.tar.xz 3420 BLAKE2B 70f0775b125a8c478271a89e43e1b783499e38dc27bef5ff4010bdbce2d46530fb3981da66dc7c09b05776af7f93ce8c6073b8e42e76e60c2402b7297a5da0bb SHA512 4283e8a9776bf17e6fb652e96dfe18b08c783b5949de2f3e33bbd268fba6ead12c1dee6edcf0d3447714f55a1026822da9f51d17f0c9e0fe886b22ce9c93a07d
 DIST genpatches-5.13-3.base.tar.xz 4500 BLAKE2B 4494d102338a20d809f58bb0183941af6514066686fda0b797a05a8365f2032d87c279bb8564bea7f09ac722a17ee6ec16db9477163871b94e19a1952568498a SHA512 b74573debdcc1adff3f126e62be817a9de39ed81ee4558d99e1f36a850f571570242d93ca66f953ae94c120ba73a872b72a06ed9873eacc92c5897ec63943c40
 DIST genpatches-5.13-3.experimental.tar.xz 5412 BLAKE2B 9b39fcf72ef6589ff05d9642fa2d90a9d71561067545b20310941c91fa7d029320b1afcc8bf9c4096c05ed9f32a1d911eefc14a737b72758070f69a754997865 SHA512 c98795281349182740c9904983ac4b7058dee98dad8fbb71a0f3d7328457ba53169cec02fbf211dfe0a0185cf0fefd6f9e058e938f9c6472bc468c0a53bb1e90
 DIST genpatches-5.13-3.extras.tar.xz 3420 BLAKE2B 43b09abc693f25ce0bde5df7b4bb784b976f5e82f7e345bef56461cc7e0755dfa48f9ef5cacdd74da537cb07b31bbfc6888cfcf60e9a8d450594156263dc8883 SHA512 dbe419b0f8565d255d350832cb0efd3207e3ea001284c54fdc9adad8f8c5d7df2ff9b90ff33b283cc75a2360c7bd90aaa503fa76919c7b8362b76731ad9c9c20
+DIST genpatches-5.13-4.base.tar.xz 239480 BLAKE2B fe5e924166c1e918f62c5bdce54df39745dae94e8c3fc6bd1233d17fbb0d7b9045799e9c237449ab8bee7f553e72c7cf6e4d74bcb303b9921bceb8c298908d97 SHA512 c494a85355cecb639ef38d41675c25dbf98179d683f2a09a57472bee4666d2eef74e4c1d29b3e245e3e7f0f4da569b89198423ed4481e7b05d845633df2b0f9e
+DIST genpatches-5.13-4.experimental.tar.xz 67644 BLAKE2B d623268e2e5e25507f7fb1466ca67eea6a712c5aedf48e9652d2a2ca11d2a320a4d60d1af12bba3070c79a1607ee2da0e1d2932ef4aaa3663b9cc0b114a20258 SHA512 353df2e0fa7aafa84c764f19a491678be7b725d35045276f8a234bb1bbbc5e821dad5c8cc61ea57903067bad26e92ec4b1279468588c8be5e211dbbe210607ca
+DIST genpatches-5.13-4.extras.tar.xz 3420 BLAKE2B 5333de23430c97826059a92ca80479aa05c5a14eb182325828cbad66789110c2e7e5a187d8be5537fd37225008b1efe66aab9f1b6fce827ab68782ab46cdbb10 SHA512 931ba6d447745480cc6048720ad4aef8476f4e6eef89488ef9ee3046df559e102a587b874d1059010cdaaf82746b24daea7699ff94407a8d6972832a34cf9429
 DIST genpatches-5.4-112.base.tar.xz 3278220 BLAKE2B 11c4a33da1081ce777019604d06740368895e74893cb88f4ba6e3988fe3204f2d5a0ffe2204f77aed427ce8decdd77c5ea7dd374e893cbf7ab346b8fb87a918d SHA512 d2c5378076390358ec60346e832a9454f1b61e67c68da4c6652d7d6cfa29223417fd0b95ea526cead86af5692e4e702a0ee5a169a894d04644f95bbbdd7d727e
 DIST genpatches-5.4-112.experimental.tar.xz 18528 BLAKE2B 94a47359c6c95a9775de669f02c14b0f7cbcc93b77aa8cbb20951ebc67d49fdfe1d0df1dc1b9b4431c91f64c96eff5a4d60d5888f75ecafa37e66194c1e61752 SHA512 53ce013556fd289ac5cce25c925877ca02ff9a4555dc3cc644437944f56bfd45358021f78e234276e2ac5e3725e22b336ae4ffc45acfab3c05c53ba82ddd573f
 DIST genpatches-5.4-112.extras.tar.xz 1768 BLAKE2B 7f77e833bc17035063b98d89135455fe6200eda135a92221c0f2eef63c6b41235653a8d11a7c99e542010c2195c1af8f5ae84a7da27d159fef67be5192537722 SHA512 6dda1c917736f8a45b1d79e3d7f30b243f922b274425975f520d1d2a5a0fb95b0ab242e0f24bd3a5e0b09e8eac76b6f71eab94cbe1747e3162ce85d892a6da5c
-DIST genpatches-5.4-126.base.tar.xz 3514976 BLAKE2B 9d3ddbf2a9d2957a76f3c172afbc040f7ecf97ecb9014277c110aded0fb808c2b09a1191a7596a396d2b2fc2fe91e964b3ec3ff99688eca9b0da256f57454680 SHA512 5f89c7034d55f3465ca9ab8a2d976af139a49d269ae0f04a05dc5a8ae6bb88e436ecfe7bd6bdc3c3d8beb6d6f681c8e87003d2595b8c9677f41d5b64629be411
-DIST genpatches-5.4-126.experimental.tar.xz 16916 BLAKE2B e982120e42e594c54dfe95b52130824056b18cb56dfabc8ef05046db6cde1f2ed9b5eebd8397dac1e17412bbae92638229695e9b4c50f0f466403ea7993f470a SHA512 1878ac9998900d1dcbb6b248903dc5e58b3f7d8e63b1384b1b4f5de7c3d263747a13a81f5c0aeee299a83e4d7d83222f89714337259b0b7d21e180a7df30c7c0
-DIST genpatches-5.4-126.extras.tar.xz 1772 BLAKE2B 900e7881ef06469e55c4c79b140454d14dc2a8f244b4972439c2fec1c50b95ac8cbe2713dbc64a8e0c7789b517d1350ee91eb75bdd8d45a12289b2445b567acf SHA512 477e1626042f16a139972960be3e62a1f04103607cff026dfd1fe32d79699503d3a336b7241d0b5f6d843d3441a436b59a9c51408fc5ac7e905b1adea52a4e8f
-DIST genpatches-5.4-127.base.tar.xz 3553224 BLAKE2B 99331a43982e2dc9efab061b25663e59284e7f1758f683f288fe09ebddc0790ea901e722cde8b9955085afdbb4f2bb45b546ab632a45d310aef9fc16d6cdb0fb SHA512 a78106c658cf7cd1ad08ee100f9cfeade4e1eaf0da9c6e3819a59e54dad9a17a36ee46d8c38dedae58c5f30444054906344e813f9a2d8f0405be2a588a1f9c8b
-DIST genpatches-5.4-127.experimental.tar.xz 16912 BLAKE2B 23b0f9d02d47edfcd8a1050a2b87db0bd598c9a3d779dc6435bf184f5be0d811a6218be493eba58ae25c07245ca7d748b2153ce362e5cf15d59ba7df377d2cd6 SHA512 e0f66d4d85fdb72c1fcde05f8f10df1127045c576b19d6919f3e5878126e380a8582bb64e52d54775c9a3ac32b419055e5d443d1e253d03974d78fa2adc5a422
-DIST genpatches-5.4-127.extras.tar.xz 1772 BLAKE2B da124b0076e952e1468ee4adc8965a6c346b945fd56e828903fd8dd2689d8433ad07457792ac7a78431a76c142d9c77955b2fbdba042063b80df331acdeb8cf8 SHA512 284260c19cf81d0c444747e1adc588ddc3442c3e69a1729841e39b8e4df9dc4cff8e852fc7db56033a1f2b3770a7c34010dd331eab71910da1a719347f56eed7
-DIST genpatches-5.4-128.base.tar.xz 3571424 BLAKE2B a58c2b8f20730c3357ce30cbc8b24f0609bd7ca2a8f5d37780cfbe4edb560fa49bcf1925ec40dbf61aebfe9a87be0f35ade4b999509420eb0caf5731ce649e89 SHA512 c84d65acdc4274b528306af958b0c72851fdce008c9ed6f78965ea22f09f8668b6075cfda9101b2e7a7bc55ccea64491000b1aede8cffa4ad927c7c1bb003489
-DIST genpatches-5.4-128.experimental.tar.xz 16916 BLAKE2B fae9a053f2c59a3ac82d5532008c8d1bac3e90ef951e7d87ec568c4c04a6b981613922a1209b0edf14480e12dc4b641b9acc670683a8ddbb91fb3bde18800ef8 SHA512 e82f8dac19c41f2b51656fdff0f8e5f52da6b03d377dd60d4ed8a991655576b791aec76ab93dcf9672e077ed9739cd6c38be44c27f76e02d7eb3073c15c93bfe
-DIST genpatches-5.4-128.extras.tar.xz 1772 BLAKE2B 3af29c49caf9303615ee76319d3da53295281e8fcaee54d37b122e47b745ded99a109db2eb31508dbe83a5997b7973287297d29af2ddd475bdab1a0bc05a1045 SHA512 27eb4d3327e24acd5f4601281f624439ff47bc6173ab58b23ab162a42df66bd02402f2e4f4e97a49b0b0b788b615869dc4a0dc3ce964247ff7bc6166fd9dc6c4
-DIST genpatches-5.4-129.base.tar.xz 3586716 BLAKE2B c5be8295127bc1c16c1d24feea5793f7f52b1be2ff48db6494674430bcd608a1e0950da553e7c5418ffc70e8909da5158d54877412fcb1afdbe34733fd54f207 SHA512 0ffb95795a9300962cb4ab7c017859ceff7ea6322ad59592b4dfe98ef56fb86db9bd8bf5c243cef93a0502c849f2c466f33efa1df420126199f7fd0650dea3b2
-DIST genpatches-5.4-129.experimental.tar.xz 16904 BLAKE2B 10496b94fad4baa1798999dcbb87546184de0b86f95a85d45d5b067ece12d2524806444b6da7f67b42f7388a0f3a010f701ecd28af3378f094f73cfa830be5e0 SHA512 ca4917c567ceb41f5b050b78d79c1bf71ddff9936c35d602ae144e3a3551a67056b0d2c69b8e4a1ed8b11590e9ab840052dec3da7c894bcf7358dd826959e9f7
-DIST genpatches-5.4-129.extras.tar.xz 1772 BLAKE2B aae80fd4b863f4a2552caf05fced29209f840d22b5bb9fa3eacd06ee7348e0fbee023512e331e3b2f515341ac9354fb7bd1f4e79e38be3a7d8696eaf257a547c SHA512 f0392e91fcf8402cf6d94bbc42b89bbbc028959c1e5243b5cd8e608950539ac81ba62836a1c7755ec01dcd7f8549c9c1898adb24c8a3c7c1a5d5e866cd7ef0dd
-DIST genpatches-5.4-130.base.tar.xz 3592548 BLAKE2B b88b67f8e4f214a1bb7c35128b57f55579a3f5aeaae5d46f7ff4b229cf4f4e2f9c248d0f6c792793f60961a3493e091f74fdf48f14b0edccbf162f749fafa203 SHA512 6dd6c0ccb7cdcd72051da86eb3b89881e98f44b215431220445af892bffb79d73ff0af67168432e597e08dbf46996a250782c74fb9bbb3945d05527df208df5c
-DIST genpatches-5.4-130.experimental.tar.xz 16912 BLAKE2B 164bfa43cd61896d51af3a44a44ede7ad2affd9a02508faf1f902c591794f50161ebb77605d9203d69fd56af0b29aff39e36e7ccc16558bc5719740be4487093 SHA512 7e35702d325cd0d80af102c50d2b65a21a992ea9a902687607e31387ba348aac7beaf56ca146b7b67fea97b961da130e62558b3b55af0ce4029309785c7e87c2
-DIST genpatches-5.4-130.extras.tar.xz 1772 BLAKE2B c1754871b41af183a22e9c30cdae5332ac9fbc104c6daa978796d15446c83acced9c9a2f55ed44d27787f33bef69f0ef885ce7642183b54d32924905c881fa1f SHA512 0bf0917a43e3ce3945317cf698e74af72bc83270c81e5ddb7d6ac3705310ef6935a54b0732d1f302b49d6c7c1275550a341a52d490ce7f4ff5f6c9702e9138c0
-DIST genpatches-5.4-131.base.tar.xz 3611404 BLAKE2B 9793458c63d97afc9731c210a64297b11eee5ac5ec52bcfca728fd3fdbe7fbad662ebafbf446e83538e843b585eaf333e5b8e02d83d504ab8700c325339eb742 SHA512 2a8db971cc4c603d85ae6064c112d2ff83c02720c58d07881acaf2b4208b6eb05128d1e3ab89b446c4abe345bdf7df21ce2e5a8c61fa3b1c44dad8085bc4bd57
-DIST genpatches-5.4-131.experimental.tar.xz 16904 BLAKE2B f13ba2f5dd0d4f696e5390e7e7a53ff5c034b4fab098c38d68801bb7c4ad0c32fe429f9d8122a0e946dc372f370ec1ab25fc2c72ce59da3ea6b8fa6610da70df SHA512 c7932b23a32331a98e93da82cc412a2a817031f7758d532a851a91e82e304f4f228c628b6ab6122d54c50099ad77290bb8fcf43387ce0a1a21e6e7c41b181dff
-DIST genpatches-5.4-131.extras.tar.xz 1772 BLAKE2B c4933c4c6470123bbe2011673a18ae7910de41dbd8b0c6b5ce431a06d2cbdecf62a5e0ca9d28738e82e30c55dae29acc30b7e68801075e5d7d17f425909e6fbe SHA512 495876695c819ff98dc98fb34e8ee4b0eb6e82a69a7f519055d0cd2c6e3da584a97252861f269a8f2160c3e98f3a2907620f4b9e5bd145feae51fb3b17a3d2c8
 DIST genpatches-5.4-133.base.tar.xz 3628504 BLAKE2B d3d99348c475bbeda9a1d0a7e3637ddc9c0896ae0de51fb6e9bd111ac94e3fefc717f84aea32a14410aa7257cc95b381c54b1501ae720c4eda569d0024206463 SHA512 d12584ab78c9cd7d3af459701eeed80519bea7e03dca6630205cc279bdd65c71a14d8738f2c29816a5b08381301210116fb769b583e3f6b83ed5e54755a00003
 DIST genpatches-5.4-133.experimental.tar.xz 16924 BLAKE2B 3886b92a856e20c4493f189e923b2987cd0aca115b3bee0a9fd6cc3e9775e1f97ea4ec9974a1aadbc515177bf7f014fdbf4f7b8ab497c328cbf20ab2634c5f36 SHA512 11ea3979f0134d7ff899aaa30bea6265ae366b08f064167d1d5c30cfe9f821837d4f0d59b386b0b5afe447fe262b3ba6dcfc74dade2a610edff6e570e59a3b0c
 DIST genpatches-5.4-133.extras.tar.xz 1768 BLAKE2B abad0014d2d982087ac982d0f017587fba8ea2b5180e67a92ed4b5a62c4129a5d275f6556cbf782b459900e03696355e4017c4c833cefc571c7cf4bbf2b5c907 SHA512 121ad821cd6628166a1ca005f2b408737ba8c9c1b8315c13926bda862b49d2ed330fea169a348b0209d903fca7a8d4ebdb50cf7dd527efde49ca9d69de4106df
@@ -187,6 +103,9 @@ DIST genpatches-5.4-134.extras.tar.xz 1768 BLAKE2B 894032d098f79b3c247b1e0ab1964
 DIST genpatches-5.4-135.base.tar.xz 3632876 BLAKE2B cc4bc930c2f181b98dde258a696bcdd8f23fcb9098707d5f158f24cd5fca4f8958dc321e8ad348b9ffd96c53bb231bc2f171b9e491427fffb2fd05dc5fd23ceb SHA512 1250c964bc3c062cb9e8109da1d1276cb5e2d7c25e1175ee56672d1a6da4be3c73f52fdc9547a70c627057265fd5af6b6b99d977c0c85a45376bf5b99bedcdf7
 DIST genpatches-5.4-135.experimental.tar.xz 16912 BLAKE2B c234446b36bf86e724e8720b365197a1069a399eceeebb94dde9cfd89e8675e256a770c80ef1c179c16adb13d0addb72677ebea436fa8277a4697f5f24c75a3e SHA512 3af8e6bf588da4cff5ee24765ba2012b470e3147f54fa04acf23143f0c2ea382bcc3e4cc283bf7edc67cddddec9810bf7a564dc12a40928b2031048b75307f09
 DIST genpatches-5.4-135.extras.tar.xz 1772 BLAKE2B 3adbde4f0977e2da60f29937e53a1f0892ce6278745c63511e486587efc10c1c6a4a8e05375492382d1102090733d4a1fa93f380b47e734affa2ce65382e255f SHA512 6ef12e03081b927af5bd6b820f150116fa3e848a457aa9fccdd4172c3e85dbf6ba78050878884d325b059f1fa4681de85a38d475ecd55dafddc60bd8362cba77
+DIST genpatches-5.4-136.base.tar.xz 3704860 BLAKE2B bbecfa854caf388d59da60c37b555090e323fd7117db68e4bf9cb84ec8605a286c7a1e0fff02622043b7884f4e57ff5f0cd18f7cbc70736eb04b08a2cd7d5aa4 SHA512 e8b3883e06f0fe00e598dd36911697cbe8e938f7664d9c8b8625921e7720ee50b8ec0ba159d0f50488357ec2baed0e640cdb7fd5d2a2f26dffa3a76640b40871
+DIST genpatches-5.4-136.experimental.tar.xz 16908 BLAKE2B 56a6235380be6e6ef111e112e49e356ae72333a1b9629db909b659475d259eb4a72e9028435a2b07e94436713ff5565d86103603ee58b4febabed35077d99dda SHA512 6578f9d5e38675137e9cf3185782c13c3368f2acc1ded5d4ebcff75ded8d5188ce0dc1a698c3096672cef167a8393933e2c1c95ca42139b9c58a7d8ea8805300
+DIST genpatches-5.4-136.extras.tar.xz 1772 BLAKE2B 956980231960a32019c0ef8fe608f58b7caa291fb5e9f06f1f9435111aeba9c89fc14f028247bc97218022c2393cf16faf4b94e1b32f5b7be263b263bf69cb45 SHA512 007b267166f1e0481ab1ad3172492fd1f7929e1387f230ed24177e7564c4319b8d3f7c7e075942d4340ba19a9889fbcfd580ee335025314cf13a3cb9ff42886e
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
@@ -196,66 +115,39 @@ DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275b
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-sources-4.14.228.ebuild 730 BLAKE2B 0ea6cfce4008ca1cd501f2d9afe56649e5622466259cc9862701c5aa817d13ea1f9f5a2b33e10eda8e6500de48ff0102eb19412e998e4f51280c2db266efed49 SHA512 00b661de35eac3c6e9f700a472da6300b4dcc09edcd5c8be082b149e929ca6ee935fb8ec2591be574dea779956ec8f34b711507ba5bb4dfe87c9a6ac4583707c
-EBUILD gentoo-sources-4.14.234.ebuild 736 BLAKE2B 02002a0ca55eb4fab6c5bc2d8e3ca1e8938cf508f4577afc7646d5324a75358b1b7159a6d87f983b6b1102abe6314f7f3a8c7698cfcd752d4a797b6e8ee29d26 SHA512 a76c288bdd25fe0abbffac4bf7b95a15e1b6d77d1b48a595b348cc8985f149534b0ccf081591e96943a88f3baeac53fe13620c0c3b42a438afb3b43d25d3844e
-EBUILD gentoo-sources-4.14.235.ebuild 736 BLAKE2B 86010318fd91409d890e9e488abb8fb548848b28c348037ba87b658482189ab858bc57e514dc9fe62d2fb8966fb4f438a2f30f32a5348cbd49fa07bf382147d1 SHA512 e4e4658c3631469d82c3ce2ec2f636ab1b4236c0af1aa371110a19d5cdd544af92ec9af628f8dafa2aef634f943d83c2c70e7ee67e7d4b766d8b40cc75cc6707
-EBUILD gentoo-sources-4.14.236.ebuild 736 BLAKE2B c9088071279534b756d50899dd0f23d0c104b016cda4041993a1fd86b43eda5b68c477e2614e2f66a00fff06f03da237fa5ab87fc18a4417514359f71f9f58fa SHA512 f0f934ffc3526d17a71654a7516f572164eb89cf6e08793c3da2d49923aa4f75aa4f29dc59006510af8e96ecf63e3033b248ec31527d5c9917d2b684b16432c4
 EBUILD gentoo-sources-4.14.237.ebuild 736 BLAKE2B fd0ee1ba2e0693c8ef6beba267b24f1ed9693f7ccce237bd69902194f32af021364f59e70d75350a8de86f64592ebd76c8df9363b90156daed0c85ac9da1d9d9 SHA512 88f6071ef9ce884e78d0b6103c553052d764df3379b61913f863c75913742b2a050af92c954cbc738a31628864c2067ec1ff24046966c612903fc16cbcbc0967
 EBUILD gentoo-sources-4.14.238.ebuild 736 BLAKE2B 81401ca1413b9f382166315d6b6d941e3f91bf263d0dfddfb76c2abbcd10550280cf8e25163961e18afbbe617da1beed6a939e7aef960f2c1b12e718d8cf14c8 SHA512 7c38b5038b6ac3d2e042ed8497bd703ccc5f20f959bffd81ffabdfb1de4a77d09252bfe8c2b96d017db07960c6c9a722755cf8ae98625873f35abf3550245324
-EBUILD gentoo-sources-4.14.239.ebuild 736 BLAKE2B a15f685da3928db4bc55b834ef11dc402be8c89b11fc604ef92f90c8552ce73535ef136358814e9257a5a5e131d0a0b258f5fa0fe2cc666f24d69640ac35d31f SHA512 d866889d27add356716e51c7f8574c1b5a690267756ce7610a4914c750d138e01eeb2a975180ea716c332dd4fb087ed5643c01725ca1ede21897e48aa28610ef
+EBUILD gentoo-sources-4.14.239.ebuild 731 BLAKE2B b7562b2deb5cc2c393715dccc6de35d4924fe77518874732d97aba46e6966db1716cdfef560148094b7f387a9627a61fdfaeffcac6202c5a752941554ed894b4 SHA512 628d2980bec33b85403276d624db54f35aa26364ea2ebe7d853786012ddfd54f627c29bcccd9843485120aabd82b95acaef3d9f5fa292d1e0f7b0ed5d90d6b8a
 EBUILD gentoo-sources-4.19.184.ebuild 730 BLAKE2B ddf0c5eb2cd1d4f63fcbcb73f785d64ce9528f93b402c3ffcb9833f5e20b106270281ca1f029c73e34b171e3295d3e731408628488fcb2d29837856f456c1bca SHA512 c90d6fa4f952be01379ce52faf5eace8012b3f3fbe484e226dd794e57c565abc0e386d99af8784f299a908b5c411c3da227257ff3aa79266f0e8fe6d25b6e416
-EBUILD gentoo-sources-4.19.192.ebuild 736 BLAKE2B b055056a45604794709cce3c3d98f8044803c6205cf8e9e1a18978fe20379d9de99a6b5754d80219d1cccc56ece1fe03e9f380130b284f5b8d90cdfc2a7474f3 SHA512 fbc3373054640bcc64650ed01cb5d9900f63747e13b45be59a22b284c7073d2804fe564945f3c4cdc30819b2bd88f0aa8b478bb6f3f702a18578cd92673ff112
-EBUILD gentoo-sources-4.19.193.ebuild 736 BLAKE2B c7ceedac16cf8e4c467705ead39658c3a9c0c29a6cf4e6506e00dc6a5795a023196145aa1b48544de334e54620d560f48da962f95c575beeeb61def626edecec SHA512 9d1fdbfc0b4404a61ef89da4af0001942b29e78e24e949dfb970b460133b9734d9d2770af9b8c66a69f80cfc0b6d41f74464843ae46e757f9f7ca3463934ade4
-EBUILD gentoo-sources-4.19.194.ebuild 736 BLAKE2B 1cfd451fe62b64343e684549d41aa6444daa4f6ef34dadf2b93afe4f6b1096a9404440ef67f1646f45d61525a9ae5df669340fd21e4c429cfba69d8e5d8d9e75 SHA512 ff16e2f20fa39bac4054d4c9ebeafa647c2c84c193e4f1c3ea928e0e2a0eb434e56dfdbbe0df8e9d6705bf555566df58d32cda79d65253e7dd1ef8012c116ac5
 EBUILD gentoo-sources-4.19.195.ebuild 736 BLAKE2B ec4e58b03fc87c3f212a0f48e9942d72db88fbb77e8bc7b9c5a91711bb8680490ce6242b7f1d9c601ae71db137a6710361ff0a0918c1303592dc9420efa1ff51 SHA512 ea06962f3f91985e0ca48c97c2361617a7caf957d599dbb034a28e067462c8eca985575840bb90c0732cd3af77838fc672cbffb7d898503bd9215252861f1108
 EBUILD gentoo-sources-4.19.196.ebuild 736 BLAKE2B 164506c5da82e63fe18f14b1a5cb983f1743ace1d2b7256a16e3b9ebbeeee18f056d3568aa04dc0683623f15837e7cd903a40e19fed24f14d401c84d4d36b109 SHA512 b86015c63054a820c4bd175c87fad2ed37f43e60795c41084e473c5a729f1e576f695d857468c1482395e31cc809ea211893c73175342f29e2e5928290744591
-EBUILD gentoo-sources-4.19.197.ebuild 736 BLAKE2B 51fef02fed5b2af1cc2bdb2ac9d686425c8301f948d9b1c835dd6c4c27aaab5a76e302975c9108f90a04173c2dc5fde8ea49320f96cfa384e4e08a3fad87fbc0 SHA512 97f46101748f98acff74cbbb2e11305436be2bb4e06bafd1e6777b5bff77d4e443ae9de7a6e2328802f037477b262ba8d1e4149959f47a66ba35629672def0a1
+EBUILD gentoo-sources-4.19.197.ebuild 731 BLAKE2B 72189a16b1b6b6495bdf1c83d017982d32976a5c1857ce4a423ef671a30f36cf0ceac411a84df15cb19fc23b9dcf9ca3e31d04dbec9d46b322874f7f1da93b4f SHA512 d064f0732aedf7f3f7b80afe55fcf57fe8a7720f0b2dd8f86443be62d2ae5287178c600033b59bebdb2849a8e7f57703dee5d4cd5d6566569fe3c2f91f0bd871
 EBUILD gentoo-sources-4.4.264.ebuild 730 BLAKE2B b225029e1e846bef13164648f68ddc270c3f0b0e288c4b9ebc1fb70f9452199a35d789aafe1d87abb5b1e239e88649deea2ae76ed4b7d7c510f3a5490b652f67 SHA512 8f29096cdc3a3d39f91d0298b1e0ce3cd2b8196639a46fb44ad63f9559a626af2966926721f1bc7cda3e8211d38094ccb4c59717355a2ab21a1f8760247032d7
-EBUILD gentoo-sources-4.4.270.ebuild 736 BLAKE2B ade4cdbacefa273537df56e728e6ef7067d65c7d356e1ca1c5ab671ca04078e049a8a60916a22ce6820c4ebaa23e2dd1196abb71b044e1a7f7ff76339e811a63 SHA512 1806c04f261f81fe350be3e6215f9f9d0eb3c2ceee58d5c304b74d879af62c9055ac144db9ff7676982b0a0c1f22a3db4c3bc98df59b3c54c2ffcf6e97341f72
-EBUILD gentoo-sources-4.4.271.ebuild 736 BLAKE2B cb8159a36c2762264aad025cd37167e2068aa419ebd4f3a2a8c24bee0ddadc09882e5cd084ca3bbb976a9effec8afe9044b649d2990925c581905df89a0bd5bc SHA512 8206cc4dcec2828dcddc931bf0129b035ae3f0db9c338a81795cda08a2f3537dc865baab77d2fcf7b8b20f5468051c2209ad0addbc1a76281ced19b8d5e2345d
-EBUILD gentoo-sources-4.4.272.ebuild 736 BLAKE2B 1d4442ab9e3c6b52d232e0974429be6e48a89f116bdd10d1a4fb0b260a21e557a69ebd0f016e82ec8ea09fad95fbc874f97566dba939049f0eb5cc167dd4721f SHA512 70ff1dd8ce031fdc60530bb9765054bdd81a652dade16b93bbe332b933066b001be7a2bdd3cfe099ee05f54235ed8a959715a39ee6eace0eeb69f3bd96d3adf2
 EBUILD gentoo-sources-4.4.273.ebuild 736 BLAKE2B e21f5dc4247fe89ecc80fd898a10919c961ae459034546990e6eda0b08f90019282026cb3efece13c61a3db18fb13539e31bbb6872a3ef5e3637f835e89f9582 SHA512 0938e6548e5ab85aac72d818d99ede8834fcafc743b51902ae6c7d5e2d1a24e6b4a552f71664244702733d703bd8667afbe9ff8f5945622d40d08485432e8c8b
 EBUILD gentoo-sources-4.4.274.ebuild 736 BLAKE2B 5f1bfc97d63f61fbefe569ac4e2cc249051f8b46df1f1a731be14f5cc7cdb4630a9f6591327509c7ba22ce10fc3dd038356eb9cc8a73b40e2a59e201e672f695 SHA512 93ca84928e6abc2e7dc302a7058bf173e845520352de0cb6047305939ab163fca2498e68544655b50637530dc75c3e2595851522ca1706f8b39d472215f0cc31
-EBUILD gentoo-sources-4.4.275.ebuild 736 BLAKE2B c7794bf1180aa0889f39d43a4dbd659dfef77e36bf96c166c08d475d34556741bdde2646c0f4f3ab2003f694cbae0d023ef7f0bc6da4df3c67ec1124567b3d0c SHA512 f09c41aa4d8298fd32aaf69acf67f86d79e59b28e4eac0077bd3f2db0c89b9a17018ad68e193a08216f2fc90b0dc5d013ecc4a9fd0a8db323089610c83f95400
+EBUILD gentoo-sources-4.4.275.ebuild 731 BLAKE2B 91ca4ac459629b148082292bf6e7ce2a2ff52cd0625b775b0e1e03e3ce7e587521aa47594f7d5f8518c1e1a86f72e882669fc0da8e35c00e856b34ad3eab42eb SHA512 1ea0f051b468b919ac541204aac9ff65f89143b1da6bd2c52b7c9fb5d8a493dd095eb1a6bf3d37b5e0fc6663761254d4910f86a1c92498bd7ecd948e71b42563
 EBUILD gentoo-sources-4.9.264.ebuild 730 BLAKE2B 2a501bdbfaf50966fa41f4f55e8299c66cf17a55dd511a79c6b07e773c97a8425591459a8fafa808d8f2a66c2abb04e9c04c3f2cd58c8ff3fbcd0545512d1a9a SHA512 5f577814debb29ce50991b639299f390a7806ae46436172fa043cc7bf17aad07bebbf6913d3f86eb39db567946d36e5bfd9cc42e31ab3ae604c988f590408e24
-EBUILD gentoo-sources-4.9.270.ebuild 736 BLAKE2B 8b4068858d56604a61ad571b43b0918493ca059b14d8cab44cac9116b05b9fb0002d5140c550be173e9335a2787a71a057ca7987694742d19f929d066d732497 SHA512 2d71228b3876340f1b86ac7cf57d6201432eebc056970a66b1e95e9d484802b2a40be7be5c148bd09b89db404362be339727ec978a9dbe508c924b53dab3f73d
-EBUILD gentoo-sources-4.9.271.ebuild 736 BLAKE2B e21f5dc4247fe89ecc80fd898a10919c961ae459034546990e6eda0b08f90019282026cb3efece13c61a3db18fb13539e31bbb6872a3ef5e3637f835e89f9582 SHA512 0938e6548e5ab85aac72d818d99ede8834fcafc743b51902ae6c7d5e2d1a24e6b4a552f71664244702733d703bd8667afbe9ff8f5945622d40d08485432e8c8b
-EBUILD gentoo-sources-4.9.272.ebuild 736 BLAKE2B 5f1bfc97d63f61fbefe569ac4e2cc249051f8b46df1f1a731be14f5cc7cdb4630a9f6591327509c7ba22ce10fc3dd038356eb9cc8a73b40e2a59e201e672f695 SHA512 93ca84928e6abc2e7dc302a7058bf173e845520352de0cb6047305939ab163fca2498e68544655b50637530dc75c3e2595851522ca1706f8b39d472215f0cc31
 EBUILD gentoo-sources-4.9.273.ebuild 736 BLAKE2B c7794bf1180aa0889f39d43a4dbd659dfef77e36bf96c166c08d475d34556741bdde2646c0f4f3ab2003f694cbae0d023ef7f0bc6da4df3c67ec1124567b3d0c SHA512 f09c41aa4d8298fd32aaf69acf67f86d79e59b28e4eac0077bd3f2db0c89b9a17018ad68e193a08216f2fc90b0dc5d013ecc4a9fd0a8db323089610c83f95400
 EBUILD gentoo-sources-4.9.274.ebuild 736 BLAKE2B 2fb8027ecc0f8c418053c09ce9fb99c71beaeaf7072a8e8174e0886b914704539f216ce478c885e833d17bde94cc49656d7c2ec6fdb64581bf13392b2779144b SHA512 d2adf24f6c1ca64ab89409f12890fbfcc2922568cde938c6ca2f2740fa1e7dbe8b6b9d40efd7d97a641b573d70c950d973bd8826afc7e38811f54fcb671a6fa9
-EBUILD gentoo-sources-4.9.275.ebuild 736 BLAKE2B 5b94aa0b678a6c75150fde124feccbdbaa98bc8c00f99ecc7bb07d0d519c801d142214094fcde281769b45be49d2877829ed8177c5fc5f8c51c257f4e35384ed SHA512 b955f4cdc0d7d500493742de88408e74507cd93a53d19a2d2a13e362ae22b543137bf5e8e06561f6d2141fd06299d634b1c31cf0355d91b504be140585f81bf8
+EBUILD gentoo-sources-4.9.275.ebuild 731 BLAKE2B 4fdca5ebbf5fab26380c2b57c2a4fca441fcff67a3b8a876663e5c75c5ac556b9725fa7977c3de38e6fc4ff81a49c5bc1dbfce7673e473d801a8d48db5b84c29 SHA512 07128bd5c5f17220bc31ede4696eeb295134227dcb3416e045987dadba8f9822d037ed6d5dd45fdaedb3de7188fba152bb0e05afdc7c0d8f2282002e34c637d7
 EBUILD gentoo-sources-5.10.27.ebuild 735 BLAKE2B 98d0fd573c312cd08b5dc8611caf34fa674597ca8848c1a7447027172a123f4b505e0e19dadc944e89fdef0edc7ad46e8a85601c188babbeb9e52505a78ec3df SHA512 c54e0337f08b52db08de8a4aeb884ea302582aa06fc768462959731d2e2d800e383e3ccbcdc0ef3269f53a9b4a2cac34b291af343ba533f09ec500e51298c71c
-EBUILD gentoo-sources-5.10.40.ebuild 742 BLAKE2B da08b73bc2434aee7febf060504779dee520a2557d2741ba95d6165a3fcf18a84baa26753e71cc1336a69013a0399700039ca6ea5e38bdf9eff348707a1224ce SHA512 aa624e466eb20676725a8d6870fda441fbb330aec2c78a1a5177e4d0fc23b741cdc8c3a10f90e69b297405a9ddcf83903356421467098d45d0ea4657321e603f
-EBUILD gentoo-sources-5.10.41.ebuild 742 BLAKE2B dfc75b552ed9dc69990e58c131572cbac0e339e843a3e6622874cb6da3277550fe806214d02aa2dc7e7a79b690b7ec613668bbd0202d8e7c6a3855cdde3498d3 SHA512 beb4e0a1c36376eca34db27a93d0601adbe1013a59d84e7651176aff9c4f3df33161bf6a2e2bd336a0c8f32e759f0fdfd9c1cb289762f389d40062fb5ab95300
-EBUILD gentoo-sources-5.10.42.ebuild 742 BLAKE2B 7bb991acef6c57a132b124773cba6389469bc10baa706b16d747284a537d5e7b8e67488361777ba93737ac30bdb1f501260c87162bce07b1b5e2aea8bde99d30 SHA512 160dcfe06aff2a4a16f9c339919ddeb2bbaaa0dce4b2b3810597bddbea02347bd589acdc03c69c5c0efda0fdf95fe3257aa26d07ab095b99f210532313b92c16
-EBUILD gentoo-sources-5.10.43-r1.ebuild 742 BLAKE2B 192b9bac14627b8ed5d94684fa1165e9e8a33151ac31d679fc6a806824c04388dfce8c9fbe1422b61ef0ddb5210f77517ea0642b79d81c330cc3448f68e6646f SHA512 33d6b354b54877f2a79a776171cc2ff29187686773413f3e1bf735d59fb432d8447d6170e3d16411e67785151b33173f559fe7b3a29d8d96c3a2c73dc5ba6a35
-EBUILD gentoo-sources-5.10.44.ebuild 742 BLAKE2B a945d8ae3bad1c8db5d0c9fe0a2d7ce7e17cf74651714da03e1f3fb64265d2f1ca9f24472fb505b854ca6280ec31050cfe1385a65945f2425c12fe42df9b2a4f SHA512 1f4cf0a105db558583466a50426278774a57e0fea68f8a2ec0ae818f658920431145a2c09a1b7f3ce88ea1a17e8c1d3a029d28de6252d1d1a84dfc33af5033d2
-EBUILD gentoo-sources-5.10.45.ebuild 742 BLAKE2B 3539213f2914e8310af55264eb876fa6a0eb313233d59c998c049f4719b0a63566f0859a4f381a950421f1c2f524456763522e3f253e937ddbde59dac25b9f30 SHA512 c9de10a3027e197e7b460267dfd38f35adb6a8f094fb86b2860f4ea4c09181dd66c8f26e53366808cd7138be8c5bde5f98ef44e8f4c823729816ff7928c524fd
-EBUILD gentoo-sources-5.10.46.ebuild 742 BLAKE2B e5c4f813a6944a0d08bacbdb16236411ad7a4a1cdfa8da342c262ed17a65e591e289feb534995e54b45d2367f5a79bdaf7f53e21891c8a6130dbaee16ab9705f SHA512 8d5accea3390f0127a11ee5922d3dcfd63e04eefb4e9488b3604e21454283185b1828353eddd2e7d9e8392be058d126dae0f601f3e5a05bac84461011eea2fdd
 EBUILD gentoo-sources-5.10.47.ebuild 742 BLAKE2B d51ab789337f67bd3dde1cb420a198c6d36e59ba6c3ec910d25cf35559c7da9203b83c82418b9673f7fcd7c7c9fb4c6a477ca98914d0806bae6e11025c428375 SHA512 9ef2a11a10e8ac030715c2fa017c56227ab90ededd3282eb6c73ff3cd14c6f126ad51ae28435c8d116ce647f1717eabe259542cecf0e8de108645b7744bc4121
 EBUILD gentoo-sources-5.10.48-r1.ebuild 742 BLAKE2B ec54453426c392de505a73c7e84701f022addd016aabdd5048833fee4905d6b61d0fc3224889fa740589d1bfce7d9a268be730a5cfa975c381efd73b9a92b1d2 SHA512 da4d56efb70e572d69d9f5b9db9ff3d478b8eeb8d63f3686085f91519349cd05e709ee7c675a06e517141a727cc744d147cd4155a9191091aefaf3c2cfee086f
 EBUILD gentoo-sources-5.10.48.ebuild 742 BLAKE2B 7107fc96ac45b0b38615105357f79c0ac702a410530aa84e82d4439414b6fe7075210146b96064752ce5e4cf6f0a97e2a5505af548aa142aace920b916b82bfb SHA512 02b3cbfbc28146d4035c0f35aefda9700abfe0cdc589db8473cc3f156d14cee09c8ac30ba630b8c1474151e78246b4726424a7d550bcf8f10fafdd31694386a4
+EBUILD gentoo-sources-5.10.49-r1.ebuild 737 BLAKE2B b26562ed2893074b8b697a91d65c64da9b023cb3d2c1a9d92f7143ad25c3d57a82b7b2ff2b0995732360e1966198e93b050485bcda469ae41521fdc8bf19ea91 SHA512 445b77134e0c3eb336b6e057f22e268f124e3bce97cb8c3d7eede458513b1ee93800d2276020fc9c553a6833fa8bf626e15c827a0530760b582f7547ea29331b
 EBUILD gentoo-sources-5.10.49.ebuild 742 BLAKE2B 87ffb627f6472ba032d24ff092e56c7d7c2bca47c8b83ebdeaf265e0ee02ca2a306a1538141ea86e148b5c880dd82bc7280aeb59465e3bcf44a9cd72d2fa1d1a SHA512 d84d64a3a82cf4d73f6784cb78919d24f500956a59c6606c44ccde8f81fd1b4c33e47ad170c5e66ff77eba71e0f49477caee6414f2559aba924ee37df5aaafcf
-EBUILD gentoo-sources-5.12.10.ebuild 742 BLAKE2B 177619fa73367368d948c7da8465e000c088bf39d8cc835978182a5c26c2414cc9ff6439d860bfa4a309fb74d209ba11be443aed406a4fd5ffefa547b566e447 SHA512 56c9564e1f120839827d8fd2025358501ee8e27723c7e6050b324c28c056c8149b94baae1890741d1ac9ef561ea06efeb25f3497d1ec8ddd8eef0e372594ffa7
-EBUILD gentoo-sources-5.12.11.ebuild 742 BLAKE2B 912e2e96442b8fa8ac6b75e07db59c3aca473418dbd84d535b4134ba157f9378da0eaa0b790c8b27bf1b50e4fe66cde4089005177f7cae4ad4e4f7bb28c358c9 SHA512 2307a536d0c58b9e6617ed9ee192779b72adbb04ce23af63b5bd5dca1acda42e2673e336ffaeff1545e921cbfba2d6c59c269cb30787dfbe8c42ecaded326c39
-EBUILD gentoo-sources-5.12.12.ebuild 742 BLAKE2B 4dc7fa51525f77f3d70a38c58905ac7b79c168bf3eee100d7d1416028194d9c9483ec03b9badcc2482830651278bbb92e4775d6ac252323b389ce82a0289af3d SHA512 c48442b7ea067a591b4b7995b4aa0e4baeb93d6e60e82e788ab1e7a6fca2a2ae4c9d6c879872881ffeda82ac89966c7f30a6cf9f68873f660e6c9dfdad656ac5
+EBUILD gentoo-sources-5.10.50.ebuild 742 BLAKE2B 49b5222cb5a2af9dfaa9193e1f47f0f1c5b4dda8b2140e5dd8c99c8618172de9ab749bd7cd9f53c06f54b65e670991382054ac4a44f9f5c6668ec55def4d4dec SHA512 2747bbdcf94deb8d2c0c5932664ed3dc011b8710c9fc6023f79692fe83329e134ba8534515cacf4d7c45eca2fd81201a0bc860db2fc3eb256e71d5bff8f70430
 EBUILD gentoo-sources-5.12.13.ebuild 742 BLAKE2B 6dd2933fdc1e5e7695f7c485caf70e2c003df0d45d5787520ef57e4b893e810de6126c829562d76cdf8ef9c81829cc5208658c07aaa0df4e0ea93012f77a0848 SHA512 371b32f76a40447fbfc0e3186d66836aa59694ce2477ad5882e4f84f5a7f474d7e91efb101c77aa5d5aecffb0fed401db380994d2e09384fe12bd143e66109aa
 EBUILD gentoo-sources-5.12.14.ebuild 742 BLAKE2B 0011b967dffca4a422612aa99e11aecdfb3b89994fd000b9d8c9a393cd0869ee909b87183e7b32fb439118f51433019d4b38cab00fa5b87f6524f8c60d1a4cca SHA512 f2dffaa4502cf79989ac6d89f91870808ae669f24e11643693bbe064410681f91b90347cd72785c6fe9e5ad03c65232e9cd43290220d94dcc92c19706e39d84a
 EBUILD gentoo-sources-5.12.15.ebuild 742 BLAKE2B 009ef74072b955bd91ebed9dd57379c5fa006ce41f9dd2576ee3f1e631d353db4357594d905c49e60f4e525801bc792e06346256bb9a07b526635d8aafd915de SHA512 82a31faab79dd64b0bbb6b6292493a7e17a78c1cc67ea848fb75546f5767dcaed074587a1f8f8f2f62ed0fe40cad6a3aa4ae5021cba3cf2e3d6354f65ec9769b
 EBUILD gentoo-sources-5.12.16.ebuild 742 BLAKE2B 9d1c324dd905846ea2a8ef16c26506f888a972422f27edebaa279892ff016af743a51c15314fb52738384a76eab25276b1f10bf99a181bae8ef0c58a5902392c SHA512 97b4fc5ac42d5fdd33c5a6260aeb9891c987ebf2aa691444c8a82d862977e6f49d9a3e445616e80139dd3b38bf50196e1b94e22bea395f768cf8183c49c009b6
-EBUILD gentoo-sources-5.12.7.ebuild 741 BLAKE2B 13a5181db2a567cfc3612769bcadd2615cd2ce980fb5bd3b481782f47e767b850367ecafaf2a187159d74fbf17ca3c5ea97b443b9d0405c3bce3237a8d302937 SHA512 401691d121ded72ae783ce88a34ce90fb331c896543ff7c36adec17c9636815eb6047074d89847aa416d49f65d842bd0a1d593734bb3cb0554d9bf129e58be41
-EBUILD gentoo-sources-5.12.8.ebuild 741 BLAKE2B 0e17ff625974f666144c6a21bd1d33ad8c2234f495d2183d19c7ff68111b28d8f4a7768f5f31d88879ad2359083ec37e56589c1c3df2508e036206dd7dcf2e67 SHA512 c5c265b4856d21e1fe83ea78d50b845a67ef854a0def9592bc2eca6db378e04580f1f8b97bc9177fe1edd8686264ea75232f06249c095b434098e3d955cccdba
-EBUILD gentoo-sources-5.12.9.ebuild 742 BLAKE2B 2c3c5824603974dc74fa131d03911f66805806307c25d36f22f4299d5985e967cda8edeeb463f84bd4d706f7e0327e0802e04ecb7f274d5610137e5b1a415fb8 SHA512 d5c7cc74fc768631441ed7908317c44f35fc990f3e282fd7b3439761890f3fae66bab5c325f37625744541224c9404a07290f87593bb5680d6d29cffaacad825
+EBUILD gentoo-sources-5.12.17.ebuild 742 BLAKE2B a512f8d8b70a74e03621732d4287f1a8c31000e57adf5a8e33cbda8e534b0cf7891da50d2924bda3f96b3af00709bc640029333fd56a58bfb8d30c84207f7ac1 SHA512 b42e4b8fe534e771535185489a359c010a9d51e885bb340305d9fd86b7af8d94bac927149255e8803c6ffb09c3e6323ca87ba90aea2fc211f00fb4e6e95dfa41
 EBUILD gentoo-sources-5.13.0-r1.ebuild 741 BLAKE2B 96e194fa252b7a4485c9cc6f61fa333b76de2efc6bcda7a543a07c538d99bb133d02ec2db8a85ab2459582f640f319f94c853fd315a9c087eded3997d3be58c2 SHA512 8bcffae16797e3e19cfc6aabcb451f20cd084b3274b77e7de9ecb7dfbb921ef47bf3ecfae4339ca3bc75ed0edb37a2351776680eb3c370d1cfdb0c4a158e8b26
-EBUILD gentoo-sources-5.13.0.ebuild 741 BLAKE2B 89497a5c56b8973215d9c8e23087d2a2bd678c8df3076b01d8b3b98b41c890e6d2457974c8181d3ae824e8ba24d54add12b67d10ef03cdf9555b2384dfb70c3d SHA512 986a1ee8ae3432c1856794b728b4019e6c19ba743393902a62eeb38cf682b8871f30777c75979eda2c5f13d6133a5d8e2988d91c9139a91751276bcbaab3c163
 EBUILD gentoo-sources-5.13.1.ebuild 741 BLAKE2B b651a0df239d0cde7c39551582a7944fcc454dc8f1f979fc5f3318d3081e0441a6e387cf59d2fd3c03e4694f3626baa9a0cb8c5945a55fcfd1412532dc8d7a6d SHA512 18eeebcd26c1c329c8a03e191c076a4f1216038f4e9de55a0e048b94e329ae9f0697b0015df83bdd0276da99c2c1b4a15c5c48871d5b32330e4d4efa145abdf8
+EBUILD gentoo-sources-5.13.2.ebuild 741 BLAKE2B 3977d83b09bc03fa2660d69ed1724c2846d92c5d70067d34f5389aca142f8da42387048960075820c03a27bcb9eeddd598717d8d33f1da51e02c3c90c4be7c09 SHA512 3acf0e57d7e236260378f16bcb150708876ca95a4d4884762cd817b321a5afda05ab73aee5c38b4e46853bd15999095b55e17c020ff78ea55a705c4e794a0356
 EBUILD gentoo-sources-5.4.109.ebuild 729 BLAKE2B 8ced97c7ed03b8b845f8ef82b92f5e97caeb46ab526d082b4188fc8288acc3800c81d94630f070d0383fba1d53e64993dbd0388c5ebc4cf4d6a738a53a1eb939 SHA512 a3c9b230dc32c700a262e5ea808b5ef0c2ad4824f1ca48e9b6ac3d8b9660b1779a6bd3cfd07c3e5b37d26449e79e706cd8808574485aa6592ce6aa7cd7f08bb4
-EBUILD gentoo-sources-5.4.123.ebuild 736 BLAKE2B a19b850cd91a7d1653e64bef49640873cc8ee96bf8c139a835b9f56ed04a8703154eefd30e86592790869faa38a623148adaafa993b84f258badbcf23f8e44c7 SHA512 e6abbf7d1d671dbbb1d74e0226dcc2fdf50cc7e28b1b073ba849d5333e2dc4332ad937cc00ae539d020fabe5d4fd2408c0de786a570ee1ca7308c0751afed0e5
-EBUILD gentoo-sources-5.4.124.ebuild 736 BLAKE2B 63e5a7b10b68680aa7f2eca6c4e5ab20d943cba323e10e00bf3d301d513faa32d01bc37a16337f16d363f4559a220cca4d4be0d621b1f346a603e6bd05fcdeb2 SHA512 090c2dfad7b041b1cc9304cd3af0e712f94e96f9a65378269196f47a975d0d88aa7f8e0880d3d0ce1ddf5fed5acb89201512431fdd59aa36faf80b91b51b5e5c
-EBUILD gentoo-sources-5.4.125.ebuild 736 BLAKE2B 3b7e486e5305a428061b830568fafc8924179125042d257529ff9468615c13569d4f684c234c51b1a8166e630e21ea8ef52fea1778e5a908fedcd77b66d9f18e SHA512 73f1ae91a057163fd59ec1cab5b684aef3da8882dd39a4be4676bd08ba795ed9d5b63d6b69a6ecb39f2f742f7c646071db2fc676f71a9cbdccbfce48c9d6b219
-EBUILD gentoo-sources-5.4.126.ebuild 736 BLAKE2B fdfe4bf89cefb47fcab057ccc162358bf9081d115d968443747099bab1ab1273f93dc0774094ab351b2c9a48da94dd10247f37d591c697dcd01501500c8a9c9f SHA512 2cf5d139ca4af9013da79ea5490067bfded4c1ef4a800ab7143fe10579e00b3b16314b825c32fcdbcc770b106e60ea59b56876803a7375d46f835055e0970e2d
-EBUILD gentoo-sources-5.4.127.ebuild 736 BLAKE2B 32a76344fbd727945fccc824df4ae497987ef5cd0acda250442741563c8d344db44ae2d32c46825a939744f170d276e3d86a8beaf4be992916f4833c536806d0 SHA512 82e923f3243900cdf4900fb866865bc6d6f1ee58ce6a496d7b9317c4e8be689cc6e0a446821800128b2e36d048823df1d7308c887ea414221b67405c540b26d2
-EBUILD gentoo-sources-5.4.128.ebuild 736 BLAKE2B eac05ac5e1571ca71fe076569cdbf3b58f7dc5e970e9d0ed95ed292b90493889f09c7ba5bfab2767b48e7db8b3ef2e1634b7f18af87363ef93b440dfe5664b68 SHA512 65b5a275ea995d19a129d064f6ad6f7b2eb81e99fe2cddb32cf2a803b241e67fc8128aec6891d52c03d37e2964a68d6c7a7ae110047d6c4d328992990288b4c9
 EBUILD gentoo-sources-5.4.129.ebuild 736 BLAKE2B 5a3fc5737e569783d5bd82c0d3c502f3d4b0275edd585cd32b7fa4a0792232d4ca44867bcc08cf2ad4cd53b945d4549931c46c453139317d63ffcc31009f5d38 SHA512 4029c4937302bc88612177188091b3b3e03ff4a54646ba08018e1e45e7e7713937e2408ae3b7531668bb4d3f3c823d3ddb835c905628f6233a7fd637aadd7187
 EBUILD gentoo-sources-5.4.130.ebuild 736 BLAKE2B 08c3928d982c2acd70daa37d89717c33407a5dfd635cf98fd37d3cf77184740970288bcb9488eacf00b6c55becfc0f014a83acc4ac4aa5e443e1f7d668a86852 SHA512 a3aabb66615082fc97087651c4bff889333524f0384618a24996c922c01964e5bd4ed947fa0fa40bd50667010f01f9bddd7f664039311aeb8c1af0c4bf76483f
-EBUILD gentoo-sources-5.4.131.ebuild 736 BLAKE2B 7657ecdfc76763ac38fba9ffe1e97753a4ac77ffd0ae38f2fd6c30bfef89e2893121581862137ee9f6fbced49446075cec71c0b574769fe51e57fd2148cf1026 SHA512 b3e7de193d1eab60db40eb653159e1f1640cc38866f2681ef3ecfd8a36c921de56b6417be1943b6f51d85a18c2ebc286b52e7bc8e6a2d75351bf08a67e8e5940
+EBUILD gentoo-sources-5.4.131.ebuild 731 BLAKE2B 351da3aea83b95dc4db3723394804986b3a5c4d530775c156716d6de8f821f82ba7afcec66dc05d9612303f2c593621fd35116841625ffe8d06d0ea83dc0d2ec SHA512 f54d0ee21a2e138d844f36ee3f5f09b146c6bcd0b3393dca39b2e9a38a44809fa5ac0d8d7fe226c5dbf70f691c4bf8945eafdb1df98deaf9da46d8de9a2e5884
+EBUILD gentoo-sources-5.4.132.ebuild 736 BLAKE2B da34b33dcefef9940b57f43accdf74b591d410db1097af4ec291e4cf52f50aad0c69c647c1613792f11846b33f0c1cd91374c01f2c8122313c05879b0df0d193 SHA512 13af297c52628b695bbd12a065bd50e5740f891463e0bba2a3ec766c4ac6072f4f42d2163dbc89f2c97e7876a77b4fa4729fe7b1579262c1171f985d1641ed1f
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.234.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.234.ebuild
deleted file mode 100644
index 8b54a356181e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.234.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="244"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.235.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.235.ebuild
deleted file mode 100644
index 63a8006fd7aa..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.235.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="245"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.236.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.236.ebuild
deleted file mode 100644
index 4a317ce7a1b0..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.236.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="246"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.239.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.239.ebuild
index 590194dc8239..a95331ec5f27 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.239.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.239.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.192.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.192.ebuild
deleted file mode 100644
index 20847e73807e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.192.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="191"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.193.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.193.ebuild
deleted file mode 100644
index 32ed235c0d6e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.193.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="192"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.194.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.194.ebuild
deleted file mode 100644
index d87f38a9a226..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.194.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="193"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.197.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.197.ebuild
index e20a8e324492..a95b50fca65c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.197.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.197.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.270.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.270.ebuild
deleted file mode 100644
index 47d4dec4470d..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.270.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="272"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.271.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.271.ebuild
deleted file mode 100644
index abee1bd6d08b..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.271.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="273"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.272.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.272.ebuild
deleted file mode 100644
index 2f0bc3d4e976..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.272.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="274"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.275.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.275.ebuild
index 6f9d9a27c692..bc4f2dd9d414 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.275.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.275.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.270.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.270.ebuild
deleted file mode 100644
index d03ad26f97ec..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.270.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="274"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.271.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.271.ebuild
deleted file mode 100644
index c1d00315e710..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.271.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="275"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.272.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.272.ebuild
deleted file mode 100644
index c44ff3d043a4..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.272.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="276"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.275.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.275.ebuild
index aeb65b787c76..1ffbf3ff98db 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.275.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.275.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.10.40.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.40.ebuild
deleted file mode 100644
index ac7df045a1e8..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.40.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="43"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.41.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.41.ebuild
deleted file mode 100644
index 9df799a8caa6..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.41.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="44"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.42.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.42.ebuild
deleted file mode 100644
index 7604093f6a8d..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.42.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="45"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.43-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.43-r1.ebuild
deleted file mode 100644
index 9dc8fd585476..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.43-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="47"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.44.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.44.ebuild
deleted file mode 100644
index a8dc4731a96f..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.44.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="48"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.45.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.45.ebuild
deleted file mode 100644
index e1e385017f58..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.45.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="49"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.46.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.46.ebuild
deleted file mode 100644
index 12ad4f7901cf..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.46.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="50"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.49-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.49-r1.ebuild
new file mode 100644
index 000000000000..44e27263ca05
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.49-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="55"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.50.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.50.ebuild
new file mode 100644
index 000000000000..ec269bd57e76
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.50.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="56"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.12.10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.10.ebuild
deleted file mode 100644
index d26d016aebda..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.12.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="11"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.12.11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.11.ebuild
deleted file mode 100644
index 30c06292d476..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.12.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="12"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.12.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.12.ebuild
deleted file mode 100644
index 25483056082b..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.12.12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="15"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.12.17.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.17.ebuild
new file mode 100644
index 000000000000..c48337532672
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.12.17.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="20"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.12.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.7.ebuild
deleted file mode 100644
index 7857bbd871c5..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.12.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="8"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.12.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.8.ebuild
deleted file mode 100644
index a323f8709bcc..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.12.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="9"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.12.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.9.ebuild
deleted file mode 100644
index 3e1a89ccc214..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.12.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="10"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.13.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.13.0.ebuild
deleted file mode 100644
index dd467d00c474..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.13.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.13.2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.13.2.ebuild
new file mode 100644
index 000000000000..354185ded37b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.13.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="4"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.123.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.123.ebuild
deleted file mode 100644
index 199ebde0819c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.123.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="126"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.124.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.124.ebuild
deleted file mode 100644
index 558b7bdb0075..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.124.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="127"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.125.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.125.ebuild
deleted file mode 100644
index 52eb79d85635..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.125.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="128"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.126.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.126.ebuild
deleted file mode 100644
index 8f63ef02d4ba..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.126.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="129"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.127.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.127.ebuild
deleted file mode 100644
index d264f28f7f8c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.127.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="130"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.128.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.128.ebuild
deleted file mode 100644
index 9e8d38d9e04a..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.128.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="131"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.131.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.131.ebuild
index 6dafb4afcd6f..12352ff8ed5b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.131.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.131.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.132.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.132.ebuild
new file mode 100644
index 000000000000..71daa7dab960
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.132.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="136"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/linux-docs/Manifest b/sys-kernel/linux-docs/Manifest
index 0cb53e4f839e..71abc2ea8a41 100644
--- a/sys-kernel/linux-docs/Manifest
+++ b/sys-kernel/linux-docs/Manifest
@@ -1,3 +1,3 @@
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
-EBUILD linux-docs-5.10.17.ebuild 924 BLAKE2B 2e30864848042e4ecc5a1dd23e18232c4673522589e1777c6c6dedce5b054dc2143f9f85d1bfc0de480b5a3d8b96a573f91430c4ad0c5d9df6229e6d4cdd7bf4 SHA512 de5c5196463dd23898de44f4392b138da1b42f355fedd3e46fedcd48462d611747c7dc4989f56e497b26c1e89006e1fbc74788eb3a7180bf85f46e5d23681009
+EBUILD linux-docs-5.10.50.ebuild 964 BLAKE2B 4d321d457393c92f9794669bce9762a1d74df3951d9e27f6d3a2f537bf0c372cf61887d17f8d759eb02b53c6182ddb9004bf6c9aa8423ebccb45eaeefee15812 SHA512 48a765078fff4ba4d72890f98320d242528b61c04ffef9c2ed75cf04ff39c69566575a1b8eea2b48aeba6609876fc44bd7951ae68ab10cdbc2e9030b95207628
 MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/sys-kernel/linux-docs/linux-docs-5.10.17.ebuild b/sys-kernel/linux-docs/linux-docs-5.10.17.ebuild
deleted file mode 100644
index bd48e869dd87..000000000000
--- a/sys-kernel/linux-docs/linux-docs-5.10.17.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-inherit python-any-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-MY_P=linux-${MY_PV}
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Developer documentation generated from the Linux kernel"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v5.x/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	dev-python/sphinx
-	dev-python/sphinx_rtd_theme
-	media-libs/fontconfig"
-
-src_prepare() {
-	default
-	# Fix the Python shebangs.
-	python_fix_shebang "${S}/Documentation/sphinx/"
-}
-
-src_compile() {
-	local ARCH=$(tc-arch-kernel)
-	unset KBUILD_OUTPUT
-	HTML_DOCS=( Documentation/output/. )
-	emake htmldocs
-}
-
-src_install() {
-	einstalldocs
-}
diff --git a/sys-kernel/linux-docs/linux-docs-5.10.50.ebuild b/sys-kernel/linux-docs/linux-docs-5.10.50.ebuild
new file mode 100644
index 000000000000..cbc47ead1f0c
--- /dev/null
+++ b/sys-kernel/linux-docs/linux-docs-5.10.50.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+inherit python-any-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+MY_P=linux-${MY_PV}
+
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Developer documentation generated from the Linux kernel"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v5.x/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="graphviz"
+
+DEPEND=""
+RDEPEND="graphviz? ( media-gfx/graphviz )"
+BDEPEND="${PYTHON_DEPS}
+	dev-python/sphinx
+	dev-python/sphinx_rtd_theme
+	media-libs/fontconfig"
+
+src_prepare() {
+	default
+	# Fix the Python shebangs.
+	python_fix_shebang "${S}/Documentation/sphinx/"
+}
+
+src_compile() {
+	local ARCH=$(tc-arch-kernel)
+	unset KBUILD_OUTPUT
+	HTML_DOCS=( Documentation/output/. )
+	emake htmldocs
+}
+
+src_install() {
+	einstalldocs
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index de9aae99c573..7069ad582603 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -5,19 +5,15 @@ DIST 5020_BMQ-and-PDS-io-scheduler-v5.12-r1.patch 267548 BLAKE2B 77a1646ffbc67ed
 DIST 5021_BMQ-and-PDS-gentoo-defaults-v5.11-r2.patch 348 BLAKE2B e81fa7e5157ad317babd4c636facb34b577c8cb850a77c945e94d62547ec687d61dbef3766e3772ba880e2b657bbbbf400a2d9c86efdced2dada7a108b4c1593 SHA512 192431f1b1c19e91d4fcf16e3a275151043c8f065eb5a909f68ff640108537f9d5105be9175a8eea12b0bbfc871ab1595f3e051e64c39bb2a32f8c75a1137bb3
 DIST 5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch 348 BLAKE2B 50ac91380b7221aa30ead9e842f038117b0f4ef4b6538b8f083a9f4467db23ab2f74643e65197dd9201da9b6cde17b192ed09e7d544ad095391c2cde6d9f2b8f SHA512 166a73397b133e20b92c37b72ae1edfe4cce017293b978b523980e28526950dfedf1081252191ff95462896a16ee790dadf55cda2edc49452b960079d89a6a9b
 DIST 5022_BMQ-and-PDS-compilation-fix.patch 1045 BLAKE2B 8bfdf114f40a4d4851c511003d0454b450ad1cffc59f360bef53b7cff9272a743e59da42e8ca067e2f48c1abd89dd4e03dcb681f9fb7a3180eff260cfed713ee SHA512 9af31d2be69411810b60e2a257e5a51e92a31ccf48f0191a6918ef2c4b6015221b7def543ea06309e0413ae7c76913bf35c0068825a1a9bfc98cd00fa0e9cc70
-DIST genpatches-5.10-1.base.tar.xz 3840 BLAKE2B 08ac1f83dc9a1cfc1d4cf0a3a5ab4c9d4686a80348247ec7cd1da6e49db92d6932a1864113f2631d5528a4ba732945b2afe73d03061bd3c532b3d1e4d9571999 SHA512 04356093c4df6a7ee0876b89be5b90f8bc90c920628e5fe69b5787ce82e003be05eaac142310f10f32d0549a6676af846734ae4ac188c2b96c2eca2cb0a6f4b0
-DIST genpatches-5.10-1.extras.tar.xz 1768 BLAKE2B e99d5d2137d5752845ba8284a0dd57620851c3620603e871973af5841b54e9bfdde92ea2408ddedb55355f2c954c80641b06098060043916d2483e10cfb8293a SHA512 0034e5ab57cccb2e969a3b9e1f674614ca853779c552c37be9c5afb0a37112bf8f2c30e1b21832d56320c70c1d622081b60369c6a86fa737a23c3ed953267453
 DIST genpatches-5.11-1.base.tar.xz 3440 BLAKE2B eb1e9a9f2060023cb410bf3db8c4f4fe283eff47f545a434dfc1edb98aa513940f30a2a88566422192b79f7ab36c607b9bc63253c067070d9a479d6318fd34b3 SHA512 a862fe33272bb6b0e4095c862c74361f015fc57316b9dbbdf2782f2e57c131fbe7fe9b9ba81c3d5a7d71788f2d56abdbd28f1c7571973c3f378cd05199c0421f
 DIST genpatches-5.11-1.extras.tar.xz 1772 BLAKE2B e6f8eae67db54099424f33e17bbfa66d36ae44c98d5f58969634a709a4b949a675a7ec1053eab4db4f745513d9730b68439ecf888e92f0fc9ef369822b39a388 SHA512 cf9d0ee27618b1b49322cefda8d85f66fd94820b9902948c8dd9a33d4e14acf511e7aabf611df5e070a4011e06d80164a512d124f5686b5b16fd81409098d8eb
 DIST genpatches-5.12-1.base.tar.xz 3440 BLAKE2B 642d0cf2382de42feb6b5942f6449000b1b638ab80e0a4dec4a70c17201806f20e6e83542e11b44841fbf5806bced3b6ea3fb5f516846ca502eb22ceb4202f77 SHA512 27f023e4533601910c2bb5ba65171e7c0092f5b20fe76711c3bdb9b171bb9ed47dff2e5911d904dc97d28be181d48a74cc0960d8b77eba0b4cf84f05ba7c108a
 DIST genpatches-5.12-1.extras.tar.xz 1772 BLAKE2B 3de99462690e77f87a30d211f7fc14937b41123739c28b1aeea2935383766685a5befa631cfc19afe583db9ca0aafa2ce4140a327707161e73ab14135e837432 SHA512 67c1d650540e50079264e66ce072e546f9001f776188760f794514f6edf78b85e115710b031573bd6cdd53aa599fa9afb743272dac19817a83df5f97354fef3c
-DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
-DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
-DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
+DIST genpatches-5.13-1.base.tar.xz 3840 BLAKE2B 5843b75d53225fb5f3ad278a69884c70d3eda165faeec7895dac661d035324c69fb32ec4ca729a025bc8e73b81a17f085f60294b621a646dcdf8bb389fc37e41 SHA512 62f49080e44895da1ecf0dd4d88dbcf3fc1f6b227c09aebf7b4acd407655e0a7627cfaf870b26ec5ab508ab2e9ce36e86ca92bceb19566c8e4a2c509a7c459af
+DIST genpatches-5.13-1.extras.tar.xz 3412 BLAKE2B a93dc7964a3b26817e6a561b314e93958d887a08a519a8a8b1bf2e4bb78790ed03a217a54cb6d9b2af6f7a2f4e78f8a0fbebe2aac0c34c1c9b0ed884db3bbbb7 SHA512 f4470e1f4d72ef0d54b6b0bd6c427f722ffac8de9e8b0a29b69e032ce71d9c18ae447fa855bf4e9e45cd2084f0b7837d0514aebfd18f6a04a7a88a191e966435
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
-DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST pf-sources-5.10_p12.patch 5244822 BLAKE2B ca004890e20a07864e858bf1834265f125d1a1a7130ecd2f4a1718b4be61dd8dbfd6c4ca7f5740219afc83f1a4645d159d57b546937bcabec59511abe3d78e58 SHA512 5aa8f303798f93e5ad2042878fa15f5ab717ad265fc6db5d35e2b429cf240ce57f042ff8c2c0ac442e552a4925093e1550f1405caffcce648b46140fb809266b
+DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST pf-sources-5.11_p8.patch 5688583 BLAKE2B 5d845677efd1d6ac95282d24223c7aa26d33ea74670b37184fda20dded42b5de1c4b4fd06f29afb12c8fd3372feb208b7d655c1dba3b60cfd1f4dc5cecfe5116 SHA512 62105aa308543ae5bb2e79be77dd77f3d4d3430669423c6e9e528acb114edf3b3a3cdcc2371ea566a6a51dbc16ebfba64187dabf485a96dea7c0127162173675
 DIST pf-sources-5.12_p1.patch 2785321 BLAKE2B 6010dcc736c6e068cb5aed9df790df6795f8b85f4169b9b6b66eb020f0e1821cd29630f421842c172f52fb41e4ac94f1671d506ec3f72f0bc883adbadd258302 SHA512 a861f3f96205de0c86a506bfd470116eeaabc8ec574e1940572abdfe166e16539f2fe874af5a0ea234741e5385e88491a49ba390a5493efc2fcc0c0283b43aa6
 DIST pf-sources-5.12_p2.patch 4252808 BLAKE2B 2c23009ba31caa7f5e6268d854af2bb2f9db2831a67cb34ef535fe1914d913f057f514aa8ce7c1a8a63374498c56d9bcce0662ed4ec3a888e2e7518b339196c1 SHA512 e2da600deeea7e16667bd0c9e0be9349f47441a4d9c2f06f66fb4f2a78c1b2c596a502cc35c6d9aea3ffcdb26461299f3446b5bb5a9b88b059806eb4db80d2b2
@@ -25,8 +21,8 @@ DIST pf-sources-5.12_p3.patch 4818489 BLAKE2B f2d729477ebe5016889de4d216e7ae824d
 DIST pf-sources-5.12_p4.patch 5002181 BLAKE2B 6e018a8c9f4eaec7b565fb3ad38cf371a59bce2620f2a95d6c1bac33205e717eb6ba312d573130d9316b744de6444714dd484a9d2906352a9bf9a953b3f5c2c2 SHA512 aeafa5a290fa3e3d942986ed6deff4f5ef60f0cb8307c1d77cbe34a5007d674e037c0cedc14ea9d090aa4f1ba4f69e80936af1d61391a656608a29528e4702cf
 DIST pf-sources-5.12_p5.patch 5560118 BLAKE2B 4d47eee16ca58acb4aa38cbdde09742fed9575457dc2e90df00b0d0dc557a8f35156acb3777598a619834201c842d598fa2cb6087ebfe01722f5b67c85ce4bc3 SHA512 72d387fa0d76dbe6a5692a894de384adba6faf8e5523a849dd94d3d44cc12bbc07ae0b8c4a9da255cf4215488ef38987902698c62e191077c4613cf40b2faf63
 DIST pf-sources-5.12_p6.patch 5790826 BLAKE2B 286f6311197cb12613e9a082896c08107153998dfc667f813212750e52c2cd5278e7e456b8658810442cb08c8559366b8d230a75a9db293f72f8a0db27285afd SHA512 ad8caafef8e9566ff9bf919dd7c4d8396f7ec8ea61e27b03451b24c2c007cf888de5f9dec9b9a4f3021c956d4cf4827af32db6a187c57248e6098e5574d48b5c
-DIST pf-sources-5.9_p7.patch 3027972 BLAKE2B 9247ea63b30f9d42d79303b73a900d468a71e703333932f7f15ae697cdba52c46358297023e037226c219fad5df912fb5d21e6f4b7190556ca799fa84924480e SHA512 c69e14f59bf98944b3329c65b7e2c271d74a756bc8c890130bf3cc68b4b96d31f1c33c4edb128580fcaefeb6e42dd04b1eb3d7f071b2d58bc764d26322bda8cd
-EBUILD pf-sources-5.10_p12.ebuild 1956 BLAKE2B 766738ea4460211f97ce61460a834e35215511ed63f252053d725bd16295e734fbbfe7044dfc598ebcdf19db1cff47ac5a9289a16c8f0ddef3e0e5a7075e2ed5 SHA512 4c5be584a0b6db1a0aacc690cb67ccad426c069d689eddcfdd9fca777ffee441b576a14d2edffaa3150ae542f05d55b3be0037e382a293470ec58457aed65e00
+DIST pf-sources-5.13_p2.patch 2756507 BLAKE2B 8602f98e8fc857621418513956ed9103404d4e690420f3631c9c63ce4939a4cbdd4c05ddcc0c43c9db82369337e220c9bded31055b567f138249bf3e089eea95 SHA512 2b18e4b7d408b1cdb0c857e2bab71fbc9b20cc7616608f6056940ecb1318192539abfaf1147e663b7285085fee4d7c9117fe5a33e0db7ce0ef6e76ee27757169
+DIST prjc_v5.13-r1.patch 258898 BLAKE2B 013be3c3e9b342268359ecbcc10c7b95c7fe3741d2b9058db87da59d40aa9b34db898d31f1f1a0dab80598cab313499d8083ccea141c5200b5593c9d44647de7 SHA512 ad9276a80e28eec461a307ad44a1ed5acebf810b14ce8c9e6f1dc211be6ed7e72f535175fb65f3115fa217f8b635122c65c2c002ff00ba458c867d8bb6257f36
 EBUILD pf-sources-5.11_p8.ebuild 2305 BLAKE2B d82fd3ea8f7f664fdaf64c6ff2c019f1b0653cb1be2f021e459b38d995e006b82cba24136ef0edacba783f6a03bd9a3ce761d8c49571ccca1976f370df4c6125 SHA512 fe5258be1c9275c3c0cf5899e8b3cce08b7e33863f26c782bcc88a5c0420a3303660621524679608d741c97290778cf9cbd460acc6122c2fcdd16a17b5b7d4f0
 EBUILD pf-sources-5.12_p1.ebuild 2323 BLAKE2B 419cd340106f1ae9b7985e74c97e437868a841e8d59a021442df835c6db371321e1ee59713b2a69b08c17622b58234afcc81123279515bf8a6fc9d818eb1f087 SHA512 f224f798a50227e391968e07136b14a869e5f49eef4f42d44fd227ea1f17cebfa26b90da6811662a97d89049ff5245b63c58e5b315b5c70870978f9e4a55f980
 EBUILD pf-sources-5.12_p2.ebuild 2323 BLAKE2B 419cd340106f1ae9b7985e74c97e437868a841e8d59a021442df835c6db371321e1ee59713b2a69b08c17622b58234afcc81123279515bf8a6fc9d818eb1f087 SHA512 f224f798a50227e391968e07136b14a869e5f49eef4f42d44fd227ea1f17cebfa26b90da6811662a97d89049ff5245b63c58e5b315b5c70870978f9e4a55f980
@@ -34,5 +30,5 @@ EBUILD pf-sources-5.12_p3.ebuild 2323 BLAKE2B 893bfd56485b862dcff19cebc24e79bf1d
 EBUILD pf-sources-5.12_p4.ebuild 2600 BLAKE2B 2f0f87c73b392c19c1cc81533ad6dfa847f9569a68be97275f935e1afa07efc23399ca000ae1d8ffbc306bba36e8f42138e5579bfa417335987649d80064d3b4 SHA512 9790aba1dc7d66a08e5352aaf288ad0e22dba44e3b7252f6ff3aa359609b81c86a1aed5f4ef3b04d2241229f312b05743aa299d6aa1b5fb3c1029d9018c2a1d6
 EBUILD pf-sources-5.12_p5.ebuild 2600 BLAKE2B 2f0f87c73b392c19c1cc81533ad6dfa847f9569a68be97275f935e1afa07efc23399ca000ae1d8ffbc306bba36e8f42138e5579bfa417335987649d80064d3b4 SHA512 9790aba1dc7d66a08e5352aaf288ad0e22dba44e3b7252f6ff3aa359609b81c86a1aed5f4ef3b04d2241229f312b05743aa299d6aa1b5fb3c1029d9018c2a1d6
 EBUILD pf-sources-5.12_p6.ebuild 2760 BLAKE2B 9b45a1bec8a722502d3f91fb82f9c44654abd1d7df72b27f34ddd105a2b78ece01f9542efabada927743268aef5dbef6fb3b84fff35fc8c9dfe0c4c5edbabd46 SHA512 479dea03a3062b376134f7a23bfa64e84ee1f6f0e6691117843b05eed9019813a4c8206be8e85cf18044375515e67e72bfe9ac17ff4552236d84ca26930f9fd1
-EBUILD pf-sources-5.9_p7.ebuild 1931 BLAKE2B d4078db28cec85fce53decefee620f24fe27f1bdb1b55d9a317661fcdc7d696c68fafe2cf83635deb7524f6ad3a11cf651f8751b6d760818bc2607fe853aa9a9 SHA512 e844c6f1f67b7bffa763809088e0843209f095e4d8b7beb44da19cd63d1e224053ee2785a01449f35aff53c55547bac4b37235ea366a70119c0cc34f5e67a01a
+EBUILD pf-sources-5.13_p2.ebuild 2258 BLAKE2B 057d9e0756294794903bd1f12eb2c6a970351b3556043c20fa49829f6fdacc1ad32e029c739cd1e7f4538cd8299d0fe10aac80d78aef3fa88b37baed7abde357 SHA512 b27deaec1354a5bb1f16d32cdc5626e2533324e303e547da722d8a9686c5b577cfb2e4c02d05724083f5d822d7e44ad1ad5de92bc946c769db38cdd098f3f917
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.10_p12.ebuild b/sys-kernel/pf-sources/pf-sources-5.10_p12.ebuild
deleted file mode 100644
index b51842937478..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.10_p12.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES().
-	default
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.13_p2.ebuild b/sys-kernel/pf-sources/pf-sources-5.13_p2.ebuild
new file mode 100644
index 000000000000..8dbab3d94ab7
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.13_p2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+SHPV="${PV/_p*/}"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
+	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r1.patch
+	https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/prjc_v${SHPV}-r1.patch"
+	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch" )
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	# kernel-2_src_prepare doesn't apply PATCHES().
+	default
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild b/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild
deleted file mode 100644
index 3535b5a2333a..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux
-# updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_prepare() {
-	default
-	kernel-2_src_prepare
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 5b0a405e014e..7a37b444b79a 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -12,70 +12,37 @@ DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.12.5 211204 BLAKE2B 6276cd8eca1d82933cbd3e95608e334730b739936c27a922ac0a7319f64acbe46294c5920b67213b694ff9ccda5b0ca99e6e2519b496e608ddaa35b27e26ed3f SHA512 c6955e7cc1ad874a3af42136b7ed958f04905de8f337d83fc36d59fdde5a469f260f8f29e9f6ac516b3c138679de0e37949b144773e24a4892ebcc8f729845de
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-DIST linux-5.10.43.tar.sign 991 BLAKE2B d114489e69719cf29bdb0d9407b68fb1fcb7a3396c1fcf1a4717a928c59ceca184a81e06d284e1f94f93f283b4c24bb5e86d9087309b279cc1bd887ddcc94f1f SHA512 fe03dabd070a06176541953d3e8fc640af77a7485e1861b11968dc124118ab95b0a2eb7a3081e94faf62c6165d8752c84fbddd4f65513b17ab9e78e583d9f2ad
-DIST linux-5.10.43.tar.xz 116339780 BLAKE2B 5a49e2c876fa175eae6a206353eb4946e44424db75958c0e9470ae6945e5f590483036464819ac8dd94041f6f466da0779ba797b4ef389de8185f9a16878a8a4 SHA512 e55a656f7c4e6a8c738c0d5ab18e84e3b832bad564b0f96b76dc1bcc3e4e7c5f3971d16fd42ad61770a1e6f5e55ed4b505f84890cfb9b9e5be90691eff7ae2cf
-DIST linux-5.10.44.tar.sign 991 BLAKE2B 4070d508a3391e98616cc61318b466657aa06d3c8cc6bf1fcca3538460e3b41f634f8378a0cee4a0c95cca5145d17e89057df98fb9f4d8455046833783a74286 SHA512 2d23c8b86b8d9cf1ef787b94f8ac176e0da73dc0e4620ed19908d00f40f2246be1f8a98e79015b075e7b2c886f3ffe5d3699fe4f11f765c5961d6906031a48d7
-DIST linux-5.10.44.tar.xz 116348264 BLAKE2B 5555b99c0fa5d0f5fc800156efcbc26adff40c2cef83a2c1d68ad009c767651392e137dd5a47b95e591078c18b8db6a9540829bb4dfaf799fe8915a691ddbf34 SHA512 444f4a57ebf77ad5a856c6fa2563948c594f4b2238ac1b3c78eddb89084fc888f634f9f61af309b6d146216dbdb4c10bbc06dfab4ccde0c1ce69ffa580558fbc
-DIST linux-5.10.45.tar.sign 991 BLAKE2B 8ae31db4144f20edac3c980887aaf0516ac65621b0f36a0a9bfc716f1a3c42f4252c872574f4ddcff4dd9e95827c473d13570c9f5c9cb2ddc4150453d588758a SHA512 6dc26ae65b896e21c48724848e08fd92690d79b4cea6aa81463e0f56c2750f2357ec41c14a38b2e82fb1e87ab7bb781ba8106fba1c5f5887d23a1ec7f2890610
-DIST linux-5.10.45.tar.xz 116351768 BLAKE2B 5b5c04201f8b77a3154b874c0321d6e7c526b2f2d663bdb7878faf8b2d80b2f4a4324f5a2cc0161f42b6e72c8bc546b62162ee6c1bcd33c61d02ccea330a5d37 SHA512 08f4760c72a0971d92990bb8015ef56b7a58390ef88d72d0b38c73e52ea474ca6890140fb2d102e3f8ed0af5903d9ba4f606bc500bb96d53dac311a268e8126e
-DIST linux-5.10.46.tar.sign 991 BLAKE2B 59c326a6c54fead30828fdfc17759ec883136b8d135b8b40bcf221b607a749b0c953ebf84cd2648822cddfbac61bb866905aa3ad17a33de91d3ee21fbc0182fd SHA512 dadad6a2e7b858bfbd75cc8c731172657e06a5d8cecbbc2bb4267be53ad2e637879d0f2a19f2271362dce5a5b6950360cdbc54d58d2773a7a5ad63e8f71a3565
-DIST linux-5.10.46.tar.xz 116363464 BLAKE2B 43ba518dc50ec98eae0e73f10cbf9883b65d825cd5ec4df16650288f5c383349448460db8e44e40bbb2872d2374320bee9fd1c5f7673cf4633b6eced275518be SHA512 f9dd7e507952bd16a7e20bf5f7c99a2bf921e041834d12a7297910902dee5336f3170e43bc81b632b1d34926ea941f60a3e8e5e679f5ad9bb329d02ddae449a8
 DIST linux-5.10.47.tar.sign 991 BLAKE2B f0399021e8a5c19d7d871fb62a97dfba2b4431d0d0d2a09a1d8764ab332b6b224a0227f4ace19a29dd43e73a56df048a0e69e47837559b699cc703a793653820 SHA512 7632d72b182f13ef9e639118d0aad863203f91f140ae6ab9201b18bdbf14326f03a4a95ad51253e7ba2214c134b4d13652e33c88e13817edd889d81687039c38
 DIST linux-5.10.47.tar.xz 116362372 BLAKE2B 6cfe773c5004d742e1f47f8ec408cd37b8183de5662370437b62a53ccb7960dc97499a90e41d94c8ff25207c4cc9428ca9fe6e15388e4be83ba34e83bb2df9da SHA512 80760ce0e55f146b1434cb21975cb1b3f94a6fa7f5c8edd9e534084596e8262ee5945f2b25b98039d9d405232083f995782bbdaafbb7b387bb785eafc3e2e9c8
 DIST linux-5.10.48.tar.sign 991 BLAKE2B be367b874b4e24d84498e0d427225ed8ed33719fb5e698af2477d25092b4768586360f625141439ef52f459ee86d4c00bc5cc62eccf0d80663506077760ffdd5 SHA512 5928797677ffe2a6f045855d623720ee5ee4aac49e4693bbcf5392a976e9ce05553ea3c110f29133a35bb67444b4239652048af0576a9a5ec9148108a6d9182c
 DIST linux-5.10.48.tar.xz 116361056 BLAKE2B 176c4ab03ef0df041eb98e03c1907e8b46ecbfa5ff77c95fd638e9123cedbd386bddb9bf884f682a78fa0292e3c2e4740bfe2c152e98f8c8079eb135d5ee729e SHA512 18958e0af1b6170e7388fe3bd1669af266980d7d8678ea2198a4828a1b0d261754a1c16e1044d5230275205395a34bfe943d868ab7e084b1a547123f7f9421ce
 DIST linux-5.10.49.tar.sign 991 BLAKE2B 21e7ae30246ef738b4d75fe2c57a2481027d1f6f1eb1789c15bd7b854b9de4527b4a6905109ba860072617e90ffcdddbada2fb97804be76be4ef7111ab365a83 SHA512 ab5969287e54b0926ecdeb0776b832cd645fe919bff7eba7255cabf3019b4acffaf208e2c8072c587c818ebdf591852b61d3395e0feedb673ae856a20f49cc65
 DIST linux-5.10.49.tar.xz 116374664 BLAKE2B 493574a46a965e34a6bd5c922e50969588472e7eabb0d524c82bbfbc86c312184e85a14a4cc9d7f7cdaa1a82c3982af7ec950eecfcee5f529b4790147861c49d SHA512 883763a2ce23c5c9d63f3707003dca1cf5422bdaecb3eef6dddbd402c78dad6f7e9a27051eddd5de89dc3db3b4bdc4d04db2fbf381961ac0d3c75e03a688bfb1
-DIST linux-5.12.10.tar.sign 991 BLAKE2B e13957f787397e09e04c1fcca75af58b80f0340150c9c738628826c17b77efcf14ad65a45363193c2fc2780630b1b8315f427323e2b15f65ca1ee0294300da49 SHA512 0113060125fe4a5015c0bcec82e873db3d5a4a5ea82764f15509f0abfd51af34b25adec164d2e765cbe3c059caf71a5047881cabada9599cfba6c947ae4dd6d6
-DIST linux-5.12.10.tar.xz 118148040 BLAKE2B b40ef5a11ca435299899e8131fa72af147455cd8ebee4c0e187572b1f628e66d2b6fbb318308bc911a598d8303d1ab3622d52966deaa5c48d59dcd65f4f58687 SHA512 b7f897582fbce307f8d24c4a1ea490050afd7d1e1af24ffa621e863238cb9ff8f1c1a378392a546a5880c9db50c8420504a052ff67d86c9ae3f82145d9f5f42b
-DIST linux-5.12.11.tar.sign 991 BLAKE2B 4b01328a96e7dd0ac1487ed4d8d3f5369af6ec2a886cd0a6acb456271765c1e45aeb620b0bf61867973e3fb03a53eee0b0efcf60755257f696fe2bce8e8d3233 SHA512 67dd3f239f23686a5c9749c3122d549570403d71b95587371b56172077fdfcc9955ec70f64b6c71fc9869d55de5515f903235a21904840915a83e3b41f489b2d
-DIST linux-5.12.11.tar.xz 118156204 BLAKE2B b5955fc1dc1ae416ef90c44d871f109d6a9130e5fc8b60f73cf98e14f4ce48b0030c79053d88c335c43ac6ab6f5786f9f054577f76c30f5505ed2d70e62d9aa0 SHA512 2001467f50c0bdeb59469f61b20e446a9719be934df0ddc17d6e8f9cd0a00c64e9aae01d216475c9423311dc38080b02cc2e5b93d7b3522e9c36a531b175ef9f
-DIST linux-5.12.12.tar.sign 991 BLAKE2B 3cdb4aa22a5c4957c7ca6bd5e5f6e7ec7bbb124586a338b857d421397d2a5210968ed175ead994d201b339503e5499be6eb3f277e2c2af02a194e0dc5c8672a5 SHA512 a550e600649885a533b2f86f6f3812b240c09d316ed363fdd016bcd7429e5a0438fa03b024d2399e3e9008d00e44ce9b9643d3e78fddcda2b5b026f51474da65
-DIST linux-5.12.12.tar.xz 118165564 BLAKE2B f9aef3da2f65916cc30da9a066217d3379036e6a32a732224da7fee86c80810315484f48132b50b8cf8eb5e0b055ad1b7bbe63dadd0eb54b0b0626bc57c20963 SHA512 2804753d92afa66888f38260fb04dca4256be3a35217529f969aa387e4b23bf0442c5b929bfdcc0eb82e173e6ae632256d7f23179348cf2cb7796622322f22e0
-DIST linux-5.12.13.tar.sign 991 BLAKE2B c6a2a416bcfebdc1661f7674643e0f8107d4ce0d35962ad12a21004b7070cac86e517d2b067cb9aabed47051bb3f8aa32d0f2c98bbb0c12a6d1f89ee2ce8577a SHA512 984f031a8cdc3161dcf8e7a6d48e07aec9bb7e9148c8fb36cc23aa219d5f74ddff844771ba7f4a335fef3399e88f84bc61dcdc7a68b6d5eef86ce5a3463b1cb2
-DIST linux-5.12.13.tar.xz 118162216 BLAKE2B 3a959a1779a8c19f59346e4b5cb6f9af84fdca993b248b2ea7c9fac6cd4c1f73d7a268a0f287143bdd4924711cf54223669a4e706327a40776ad0b9683b505de SHA512 e6a2487c09898f29164a22f23209f2a2ef2e3dfea263e659e007208289c518f5cc16c8316c2db49195362dcba61ffdfe64a3c57c254acfcd9e82dc19f6808be5
-DIST linux-5.12.14.tar.sign 991 BLAKE2B 433f6791cd56ec4f0f633fa406b1ef1df1c801fd0c794025bce4dae3cc28e6166f1321de0abf3892e71ddf50315cee5e761e44640972474f625a64b28f96cfdf SHA512 28c218c982ca0f959dc2cf646090737647c150756bb0c31e0d90fd0c7cae9ac936ba4ed0e337824e7828622928e7fe1cd87ecb06a3331b932a21136f5f99047c
-DIST linux-5.12.14.tar.xz 118157096 BLAKE2B 3bc213b432d61c358f85b932dec8bd44a1ef73442f20424ad5ce374b6982a6909c5b318d5e9848996989d5e421ab6c2128cdb51a3724adc95222f96a859486a1 SHA512 189bdb55fd874ba860833626a4142920c853f886562e52a6f182a9f63f1c9989a3d2b0733eb5ad55953dbbb10834cdb80ec9a5b42d44af8615c8a216ab037b79
+DIST linux-5.10.50.tar.sign 991 BLAKE2B 6dd2c571f60a04e291ae5158a4968735e43d0aa95168fb6440807609dcc114c35f9441a07b56580051513d7f5a417e181ad536a8d723a26a4bbddce059bd0f9b SHA512 3911fa933ba6c389bf920d4a5b665718175272652d74f382f857dfc0f92d4aa60daab55b2381ef3d20c165524f1e9636f2ee9c071959c902485bb8c5d22ea45d
+DIST linux-5.10.50.tar.xz 116381152 BLAKE2B 30dbd248f8d66b9d1ddb96c90667a781ad20897c37266236cd26ac81a30875ca4483c2626388aa28ace35a5e1072318c7bb6d2dba5cb1cd17650b6766c6d0ed3 SHA512 ffce6eae6da7b0bb7dff46cbea59e2e7331de0469f6d1331e29b0e7b92e25350fcd7011e759dac768f5642034c7f0f8610ac3f8000b801e2aecc1f7bbb452912
 DIST linux-5.12.15.tar.sign 991 BLAKE2B 668cc702b2c1bdac78b334b2c9c8f0bee20f1c6fae584c7bde8787831b8182024639f9862845520cbee9400abbe5248f418cc654cb1013e82afd2f42391faf67 SHA512 ec28cd3d5a8c293193579221adeb4077eb43c061fa12c825875ccdbabb6490962edb4177515ec56def97554ce2f042848fe126fd4f90fc6e550f223c9e9576ab
 DIST linux-5.12.15.tar.xz 118166168 BLAKE2B 2d94859080bba686786b690733d6df4a17f6183c690854545b87d784d16fbc5050fc07be08b2360cc1d0a6fe11bd8f18add68c893d92bb52e10bb0f61ff4eb76 SHA512 99ac7c8550548f2626ff891024c9e613c98011f3513b17b46d4a0af98242449ff373e7429ccad7c893dddcd413961d1726b121242b3f1f6f4eace523b70754c2
 DIST linux-5.12.16.tar.sign 991 BLAKE2B abb400dbf710771ed416ad144501d9d65096da1957b80a7ccedbfffb5277d4db5e33bf4bf7c96bab5a0f7e6ca5bd09af5eed0ecd133aec9bb274099b3d32f016 SHA512 7c2ae2bad8f0d456d3a2b5ea5983092883c724b9b5bba21a99ab1eeb744d5a764d69e7d77b28a2499dbfd04e1e764ebf93a30e13e37c92f806b8d825bfdcefdf
 DIST linux-5.12.16.tar.xz 118169272 BLAKE2B 6585efa7db0e0f42ba8c1e64a5452a547c9f4d073756047d6ac8453d752c022f414b984df457242d8d9595cee4aedc4d3b5b59ae3566a2e824a2294e5111956d SHA512 6b3a5ebe96faf6dd7ae613e8d158c2f14341758ffdd84fb408eeb886ef3c03d25348d3b2aa74c4b48f3c187f511bff70d1090c0359b13b2d9a179cda7dd7bede
-DIST linux-5.4.120.tar.sign 991 BLAKE2B 12c786791b72afccc4a3f9c412b900f25355920c3b253160bc9da0193983dfaaf4ed81886e5ffc252b07b34dec6d6daa59625bf46b1ebd6a7aca8522235923f6 SHA512 67b32fb8cfcd125ee66201d76eec364d7d8839a3055d43eac88eb812201969d0ed9d94d8c57e9be8b35f0a8972475381c6d41e480c7c6086cf351d4388f80c04
-DIST linux-5.4.120.tar.xz 109107108 BLAKE2B d3ccfefaadfe4186cce3232dc0b58759914d0f9eb0ac7c82b855d0230a512b92e37801b75e32dde57ef5d6d6ee04c3bbd59f58a20e73304cf235c90c7dd2855b SHA512 b376e262164d8a79a4ffe478e42e38929fcc4b7f08dfaed24a842c238d55162ebcc1f6a5d0926a618e03f98f7f9623997306ffa66c6425f3e77865c2d70e1d54
-DIST linux-5.4.125.tar.sign 991 BLAKE2B 3745764832f01f1d0247bf1ff6a4ea9e719d1a2881a563ab2bf665d1b0a9646ee831fe93f456df09cf7843a4c6310705b5ccc908ec927370992828a44327bc04 SHA512 d15ef5591e875300e1e6e6d0b9b809f2f022cd6064f1313c2b77b1a07c79a49a857657730eee0d0599933ee2e6940ffec2556220955c6a4bcddf5172ca1325f5
-DIST linux-5.4.125.tar.xz 109119576 BLAKE2B 8b79f1fa8e27cb8a620126a7b47d371f67780f07687952d57491f7cf1267fd6c49031bb636521481014737a2118e6831ca45cb511aee374783989cbfc098d7fc SHA512 182c6114e667ef7eb2550b147a03892c0eec58890059049bd8ebcfb540d455dd5125c588b3523f01f533445c54fc8883a1e26a0307c6943908978b55facd50ee
-DIST linux-5.4.126.tar.sign 991 BLAKE2B c77a7cd7ca08f66cb83c1036b4effd8e20ef6e490a147f2c5067e9eaad8e7e3759c774407a7eec4a76d49c0218ad1babbd8dface66f87a9d6819dbc075eb6900 SHA512 75b910f0a267aec59788e51c4625a2643f349ce465b9ab2dc0b0bd240b0c1f70ae0129ab6419014b19a2942af4b9af4d65069ada06002d26e3ac623daea5d596
-DIST linux-5.4.126.tar.xz 109116396 BLAKE2B 620d9e68ef32dbe8ed88800e251a76b77826ed24a7f333fe62dcc7182643016ad348aea289acfdd3f0cb9a5325682453160afd2f377a8e1809fd19b38187519e SHA512 1139726aa6a421c529894a6b657f3d1c54ac5df5f277b453d4726e80e93d3298d53f878b6f7ba98bf38754b9a4438f378c9581a8db588766f27c3e6e5d4a9b44
-DIST linux-5.4.127.tar.sign 991 BLAKE2B 7942bf63d20cac4e56d258585cf3d4d9508e7e6aad9328a65b0971acb8aa5200f031f4a7225d01eb80e17a0a40a908e6dcf49dec251f59b5bfa16cda3e67d3fa SHA512 ed6e9c01b277391cb1455154bab0baf20b7b8c4eb44761eb4fbc4a01027417ad4dcda0a2a737876a321b86eb92011cac08dfc92e4e08d3c19f65a1cfed5513a1
-DIST linux-5.4.127.tar.xz 109118628 BLAKE2B a7b890d06f3eb0a734d1f4b76adb3e4bf28a9ce7c65eea1c2bc31bfef44bb7960cfffcff5765b640a5ddb6da96e97a1fb0f644eaffe44b33103983723077e18e SHA512 7f3cdbc82ea3b75a3d3a1cfc2cf459fb2d8a8d8b14ec772fcf6a8ab6a394d66ab796f641efb2bcb907bdb89111e9089c1b6c80d47ceccaa5502aa872fd1393ad
-DIST linux-5.4.128.tar.sign 991 BLAKE2B 65e2027513dc5527ce90f36b9ef313701cee499c83d03f140b337d6a30a74f1f8fb4a286737514ed34ed310f791ee58138b2adb5216f202bad051b7fbd0ffcf8 SHA512 42df2576670874e3bdc392db6664460bd5a5a819d6f0234f8092c9818580afd1e2185fe8ccd4e84516063459e49c33e609e9e9a69ad616db8caf5fa8bf57f199
-DIST linux-5.4.128.tar.xz 109120108 BLAKE2B bbc701f3b470ea629f199c2cbf62652bf717c5067e172286f619b4a62c662ce7bfbe4b54ce99098b726af7526e7eee38572f0c51309b63bef3ef0f4f997a5298 SHA512 28c259cca5be2c618d8b03cd25bb342290e3902544687fc4af201e1df666ef96ee6ca02546e93e62f42661ba1076f745f47652b42d5c036176a2b51af024e914
+DIST linux-5.12.17.tar.sign 991 BLAKE2B 297f49dae14617bfbdd3d18f5faf4cf6eb481bca133d8f4b742c96f13fa5983adb54583328f7826602d6bf9a5b691fc1893a97e5cb9256f53a5b1e945670bdf9 SHA512 86b77938f25291ba6df62828e4447778315bd020fa823baae518a9ea2c7ad5655aad4ea239a806b9913210cfbe3d699f413e57dba4070a047812fbc5a0e615e7
+DIST linux-5.12.17.tar.xz 118176892 BLAKE2B 0eede859861f88a8d6384517982472580aeb6c38eeb037188571d58b6b83d4fbe7130917b7ae2ccd9f9b2f6f23f7a542d7a396f73adb9adb642a79b3e1f4e95d SHA512 0de689b1c8a1529a4f261ecca456dd99d88537d63e13bd42f6a122bbf27d0d355b2fa2da7fa9ed334685fb99c1bdba245edb083f0274afaac822aa12973a9c26
 DIST linux-5.4.129.tar.sign 991 BLAKE2B 534f683bf0e6962b130f52c9f3e1a391131be8383bbc79bf5112615924ab86c7603e2125bbccc746573f118ee4776c7176ae9acc35c77cee6638795674f51939 SHA512 811e615527279fc3c2f39cb658d0667f4c8a3af787d0232e15b08bce409861575257968d3e04a47493fe198bc7bf51719b14b30e941f1e873d1d7e893516d8db
 DIST linux-5.4.129.tar.xz 109122036 BLAKE2B 73f422c32b382a5ef3f6cf8078447e68752408d78fac20d41f6fb4fa69bdb0706ff9ff5d7c480b0b1e3832559e9b253b1fbe0cbd4611c383cccd41e49012a8af SHA512 d5d420427433cc9bcfb5ff72c6b39c4c36adf745dc51e31109adcbc1ed1fd4ea02047940d01958b4bfcee98caac8f0154bf7a8497afa0e5f081712f035da8bd7
 DIST linux-5.4.130.tar.sign 991 BLAKE2B 7d20be27037339889e8e207910a0bb9cc7326cd96aeef1a0de35cd9a7398d0f13df0b4dfd996b7d14802beb7d8beddd3468e417139c2b360292b473a31a686e3 SHA512 51c8c517bc446eb6aa11d072f8e349b9dc564bc7ba5b35783223e9898e957ec175ebeb96ae486bdc5a20e0227bb563fc915033b039951e9265fc7258a6a343ca
 DIST linux-5.4.130.tar.xz 109118364 BLAKE2B e2c30781868d0d7b721d679b29af3f4260a471a2bf328119b562abb4c896db939252ea2f9ef650414925e4d9c0a150289dd960dc61dc5c654f44a773adc1e6c6 SHA512 d2bdf3ac52644c9dab720b5a74ccd8715b12cce9a227d3c5375d0e61e6bc95517b95c7ef825854b5039494690f4a1574db9f162b5f3bdb1d2d67dedc6c683ba7
 DIST linux-5.4.131.tar.sign 991 BLAKE2B 957f1dbfc098f63c35afa810ba8e0e10cec81e2a7599cda699dfd76dca0db4633245320575edc4c17d18d3c02806810a9dcb1c6366680893ac83214f8389f6e0 SHA512 f415553fb817866082ae561e7c641fa3ab3929afee437bf4c669ea6af2519cc098cda0b30f49a93387bab8c68748aff9e2e8e55c93c282a37fe43fb8f6c66d8e
 DIST linux-5.4.131.tar.xz 109116196 BLAKE2B 7736ea4b9c0e1f667375c91fc77c9d2ff2b40558dfddc17a691ebd9f558ea8b7c9b8d8af50ab7ebd52ba007be848a9680165bdf5289174ccd2678d4e905047c3 SHA512 d594f7fa2a598c9f24c1f669b9f3a27978f3dbec40a41f597f3ec3a0365ab565d5af042ffa65ca56f166b5a58ada57b0ded52667732eb460c2a7d01798328e36
-EBUILD vanilla-kernel-5.10.43.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
-EBUILD vanilla-kernel-5.10.44.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
-EBUILD vanilla-kernel-5.10.45.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
-EBUILD vanilla-kernel-5.10.46.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
+DIST linux-5.4.132.tar.sign 991 BLAKE2B 82af107e50984e97cc4f633f72fdfe9969633d7a2de1d77994d7ecf5a5ae088621f3767b0039564ab9dc5bd1638ca547d3ac6357bc3a36d84483ecad0c2287b2 SHA512 e1f30383e632ba75a92e0e08e95c17a1096bac63a0c33c420a25141da9a3f27ee25c12f4ccf910f365678852880189bcfc54def53460b54722ac16f38a420ff9
+DIST linux-5.4.132.tar.xz 109135532 BLAKE2B 7899934f816fdb7f8b9ba14a93da39fc90cbbc6be36b6bdede5031df2e8ca0e1d5bb469341c5d86d8197f889d8afc6152bef4fd71053f128393215be48b01239 SHA512 5d63778b2dc0fb7d288ffd357c38beafad062d1eef0a29ddec3e8b3eeaea6f52af06b4fd0af1dd2138fe1264e54f53042ca9397202932da58bc4cd10787fdbfc
 EBUILD vanilla-kernel-5.10.47.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.10.48.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.10.49.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
-EBUILD vanilla-kernel-5.12.10.ebuild 2912 BLAKE2B d1606ffc26790b5bd830d4e43bd873a6bfe974203474136ef5a61ccdeece3a312af4517e4c06f59597f986dff1d4560727d09f1e2d135e14a27978216ba8ed32 SHA512 a8071db701fd3454c62d2643378d9686026b0b43abcee339493cb5f8c3c7fa2f79d39de573b881d24434e804eda0d5d74ac7f7f5e7402b3cd17883f7557b94f2
-EBUILD vanilla-kernel-5.12.11.ebuild 2912 BLAKE2B d1606ffc26790b5bd830d4e43bd873a6bfe974203474136ef5a61ccdeece3a312af4517e4c06f59597f986dff1d4560727d09f1e2d135e14a27978216ba8ed32 SHA512 a8071db701fd3454c62d2643378d9686026b0b43abcee339493cb5f8c3c7fa2f79d39de573b881d24434e804eda0d5d74ac7f7f5e7402b3cd17883f7557b94f2
-EBUILD vanilla-kernel-5.12.12.ebuild 2912 BLAKE2B d1606ffc26790b5bd830d4e43bd873a6bfe974203474136ef5a61ccdeece3a312af4517e4c06f59597f986dff1d4560727d09f1e2d135e14a27978216ba8ed32 SHA512 a8071db701fd3454c62d2643378d9686026b0b43abcee339493cb5f8c3c7fa2f79d39de573b881d24434e804eda0d5d74ac7f7f5e7402b3cd17883f7557b94f2
-EBUILD vanilla-kernel-5.12.13.ebuild 2912 BLAKE2B d1606ffc26790b5bd830d4e43bd873a6bfe974203474136ef5a61ccdeece3a312af4517e4c06f59597f986dff1d4560727d09f1e2d135e14a27978216ba8ed32 SHA512 a8071db701fd3454c62d2643378d9686026b0b43abcee339493cb5f8c3c7fa2f79d39de573b881d24434e804eda0d5d74ac7f7f5e7402b3cd17883f7557b94f2
-EBUILD vanilla-kernel-5.12.14.ebuild 2912 BLAKE2B d1606ffc26790b5bd830d4e43bd873a6bfe974203474136ef5a61ccdeece3a312af4517e4c06f59597f986dff1d4560727d09f1e2d135e14a27978216ba8ed32 SHA512 a8071db701fd3454c62d2643378d9686026b0b43abcee339493cb5f8c3c7fa2f79d39de573b881d24434e804eda0d5d74ac7f7f5e7402b3cd17883f7557b94f2
+EBUILD vanilla-kernel-5.10.50.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.12.15.ebuild 2912 BLAKE2B d1606ffc26790b5bd830d4e43bd873a6bfe974203474136ef5a61ccdeece3a312af4517e4c06f59597f986dff1d4560727d09f1e2d135e14a27978216ba8ed32 SHA512 a8071db701fd3454c62d2643378d9686026b0b43abcee339493cb5f8c3c7fa2f79d39de573b881d24434e804eda0d5d74ac7f7f5e7402b3cd17883f7557b94f2
 EBUILD vanilla-kernel-5.12.16.ebuild 2912 BLAKE2B d1606ffc26790b5bd830d4e43bd873a6bfe974203474136ef5a61ccdeece3a312af4517e4c06f59597f986dff1d4560727d09f1e2d135e14a27978216ba8ed32 SHA512 a8071db701fd3454c62d2643378d9686026b0b43abcee339493cb5f8c3c7fa2f79d39de573b881d24434e804eda0d5d74ac7f7f5e7402b3cd17883f7557b94f2
-EBUILD vanilla-kernel-5.4.120.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
-EBUILD vanilla-kernel-5.4.125.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
-EBUILD vanilla-kernel-5.4.126.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
-EBUILD vanilla-kernel-5.4.127.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
-EBUILD vanilla-kernel-5.4.128.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
+EBUILD vanilla-kernel-5.12.17.ebuild 2912 BLAKE2B d1606ffc26790b5bd830d4e43bd873a6bfe974203474136ef5a61ccdeece3a312af4517e4c06f59597f986dff1d4560727d09f1e2d135e14a27978216ba8ed32 SHA512 a8071db701fd3454c62d2643378d9686026b0b43abcee339493cb5f8c3c7fa2f79d39de573b881d24434e804eda0d5d74ac7f7f5e7402b3cd17883f7557b94f2
 EBUILD vanilla-kernel-5.4.129.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 EBUILD vanilla-kernel-5.4.130.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 EBUILD vanilla-kernel-5.4.131.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
+EBUILD vanilla-kernel-5.4.132.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 MISC metadata.xml 352 BLAKE2B d14768a94b44290d052fa5b86553dc09bdc609c629fc96da7d5314510091484d7f22f2f4b4244fb033046eb949da8fdf6b9535d698ea3323f2da79400454b8d2 SHA512 a7b17e6764a339943b587985b95d828e84a076ceb3c372181794c905f6ce1a5554be69cb55560d823d71d8ea66666bcd5474fec1ead721633477eba31cf1cc8a
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.44.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.44.ebuild
deleted file mode 100644
index 12c958a4bb2d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.44.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.45.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.45.ebuild
deleted file mode 100644
index 12c958a4bb2d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.45.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.46.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.46.ebuild
deleted file mode 100644
index 12c958a4bb2d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.46.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.43.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.50.ebuild
index 12c958a4bb2d..12c958a4bb2d 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.43.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.50.ebuild
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.11.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.11.ebuild
deleted file mode 100644
index 32d99a8f85d0..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.11.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.12.5
-CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.12.ebuild
deleted file mode 100644
index 32d99a8f85d0..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.12.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.12.5
-CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.13.ebuild
deleted file mode 100644
index 32d99a8f85d0..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.13.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.12.5
-CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.14.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.14.ebuild
deleted file mode 100644
index 32d99a8f85d0..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.14.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.12.5
-CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
-GENTOO_CONFIG_VER=5.10.32
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.17.ebuild
index 32d99a8f85d0..32d99a8f85d0 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.10.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.17.ebuild
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.125.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.125.ebuild
deleted file mode 100644
index dc33930084ad..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.125.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.126.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.126.ebuild
deleted file mode 100644
index dc33930084ad..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.126.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.127.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.127.ebuild
deleted file mode 100644
index dc33930084ad..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.127.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.128.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.128.ebuild
deleted file mode 100644
index dc33930084ad..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.128.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.114
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.120.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.132.ebuild
index dc33930084ad..dc33930084ad 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.120.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.132.ebuild
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 54f00b8d10fe..5e4b4ba3dc9d 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -10,16 +10,16 @@ DIST patch-4.14.239.xz 4328180 BLAKE2B 75c1b4410196289ce504da4422d92c27210031ae7
 DIST patch-4.19.197.xz 4078072 BLAKE2B c50bdb43e0ec2d1ed60b072ae7764736c3aabaffd0166995926dcbd43b1747c24bf0f358e978bdad44263f7616b4d9a37fc1c86bb64160e9f0f7d7ad791f3177 SHA512 a8d9ba04702037aca994308b33da85b30cc7e4cee6342fea8b219d3688363a73976df7f6b2df3c35d04ffda1b0868d43a51d160ea2ad6643e71b01c3d5800ae2
 DIST patch-4.4.275.xz 3580680 BLAKE2B 49a46e98c2dd4753f89c4d94f7afdefb0b14d701bbce73fed32a00723245d7419ca76460a00398f4492bc71937fefb2d535f0dba6ede9258fbcc38983675afa2 SHA512 b85f8fbcfc5289c3b18bf0f438bc03abb348c9285b76782f17fcdc0c4b380cc131d0d5008d319d7d5e5cef33b0ac71993cb91137fbd9b8004cf44c2ba08d8de0
 DIST patch-4.9.275.xz 4008012 BLAKE2B f79df47900dda5fbf517142f9aa0d6b77e73435d3534070df323635666d74feaf362689a78982c6c04155da684abdbde1347ae3236245155d59576d81340bdcd SHA512 deb78bd9699449a952486bfd155bf23f14ed68632a55923abe3e210c4ea2787c875c7975bc9b0084adfe5e34d33f334f687fa67ceec26f99c6bec70f8739deaf
-DIST patch-5.10.49.xz 1559144 BLAKE2B 1146ae6c6e444f6f47a24675790bd3211fbb912ff40d58f7de7a594c4a1f593b375cf954b26bab1bb919a56a8e9bdab0e6980ce841035221b9b8390d1bed001a SHA512 b395aae022e4c0dc71712c43bf2c35f90256422dc7c0a09b55696e2c222bef122bcc81a7f1c1be5d7152fd3f6471ec9e7b7a2030221985d088498c620523eace
-DIST patch-5.12.16.xz 721932 BLAKE2B 6507110c9cf6c8176a9838b187b6eae437b44f6c9f1d446827285f3b27de6a8ae764bbf0ff56251e97e377fc14ecb0c475d7a1a4e689ab7db18646ec63009d0a SHA512 6ac154d40031946793285175f45ba4d1f0de27b70e204ef03d0e94674c66f9259139a23b60cf7125a9626fdc4e2a917c4d1c5fb80cae5a64f021aac75a382ba4
-DIST patch-5.13.1.xz 820 BLAKE2B ba521422f958141f8a1d326d8b615b181187be4aad3ee7cc4adddfdfac5806e7631bbdb3d6cc581b012cf6ea86da85c652ac1db114bdf95b7228704dc5dbbbfc SHA512 32992e98fb1d656d745ff5548639a11e7ac31ed10e0f632a80f1005daca81899fa2919552c6371e3f887ddd1252e6f45ba0ec1257f9706620acded3755c6c0db
-DIST patch-5.4.131.xz 3069328 BLAKE2B 6f8f104f1b0f8f17f6219e53cc4dda51bc8dd6ea4fd3b1d93291fc120df941dd5bc313c8fa74e29c2adbc5e202fcd8dead9ae9170cc69a3f453009763a7fcbd5 SHA512 af5629d70d3b023a8c4cea321b98a897981a1d6459557491939a2705e566053b7524aa8f7b8a20dd93962944fb5c032e4408cd81cf2716e834be262fb6e2d84c
+DIST patch-5.10.50.xz 1687320 BLAKE2B 99a7f9fb1d35d3966ae9c848f3c26923344c62d1cb6b2f0a7ee464e56aee9dc07e20270bf006f00dc8e6238d51fdafd2bb78759cac63ac9f45a656169ff31406 SHA512 250e72c20446b85ca25da64e0777de9047db3c15322d349e4adff0e758ee3f40428ef169da7372205a463bf8a1e2c5d9a1e908bcfbf3840523161193703d2b8b
+DIST patch-5.12.17.xz 889940 BLAKE2B 78c10887c9c28261f5a99c3ed19c9390d8af92ee49dd4dd13092493e71c446fa58b9025eecb3ea8f605f1c3644c5ef85a25c056a4fbe143eb91f49eb9b2b866b SHA512 1c42b4efa3d26fb4bdc96c422a32646b2d9018cb84d231ccae4c64e1cdd342ed43828c6da3eb40cbe80550734254b8e824cec98cb1635d47baef75bae37bfd31
+DIST patch-5.13.2.xz 236184 BLAKE2B 8a67bd04ba1e1526ae9d05e62d7ec13cb410b2cb2e034eeab143734c44cc9807acd4d6e12e69508521527e8c23d5d8fac405befa029003f4d25adc56660f51e0 SHA512 21da1b2dea3d761e3db983e1145d9449f4b65d05367ab1f3c05f164d5053a012c33ee5a28c428b357140f0a9cca1bec47d9a9d6023afae56c3a481510b8ba83a
+DIST patch-5.4.132.xz 3130452 BLAKE2B 834d0104eafabc9ab7e384a5890fd5a13601769954cc2b59b8eab09bd7078a3f12c6e7b31c0c64cf8c1c2673ac2e7ee0752b23ba75a147f87984f104ddc46dc4 SHA512 a230a137a62daf339ce6147b72b9709ac5a50b4d7cf5909472858f1ab786600fe4dd8243aae3934297e96dcf08dbd8aac115bb21e075af41ff0157587b05ecf7
 EBUILD vanilla-sources-4.14.239.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
 EBUILD vanilla-sources-4.19.197.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
 EBUILD vanilla-sources-4.4.275.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
 EBUILD vanilla-sources-4.9.275.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.10.49.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.12.16.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.13.1.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.4.131.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.10.50.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.12.17.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.13.2.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.4.132.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
 MISC metadata.xml 516 BLAKE2B ec4d6b5a7084baa9ed012e2108690e78422b269c88926baa66e8d0705dd5a7cc82fd76edcaeaf9a481c8b5099f65fe612388a826541a6e9a9c5256ab8aabdd92 SHA512 138d42372bcd976186c5c51f1e62b498df6b35662beeba737a46350e9e9f87b3d8bd97aeb57db43c99fc219ebb992aa2612c3ac8473cf4cc68e7d084c0fd8b93
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.49.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.50.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.49.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.50.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.12.16.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.12.17.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.12.16.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.12.17.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.13.1.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.13.2.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.13.1.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.13.2.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.131.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.132.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.131.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.132.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1d2da81958f1..7b439f064e6d 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c1b125267d5c..3828852b7f2c 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -33,6 +33,8 @@ EBUILD glibc-2.30-r9.ebuild 43403 BLAKE2B 039f1e866d0ecbe7e6805265694800ed4873a5
 EBUILD glibc-2.31-r7.ebuild 44522 BLAKE2B 1adfba68c35d3af5ec8476b2fe5d3bebf13880eeacb5aaa8438b41b98f5b275f0816a0e654446f62ee2f34f412c5c6e72befcc0deb8988b6faec2c53a07601a9 SHA512 5247b1d75efa86b1a1c85a09219f54d402aae8aaecf0e377ca663a984daf7c69ea97b3072fe83a20002ec7d72661ec7737fbc72982122b58c26cb5bc89997548
 EBUILD glibc-2.32-r8.ebuild 44853 BLAKE2B 724f95c0ed2cda18dc2edcaa03b0783a2bc603b72a67e1451535040ddc83be6d1a90ad4b30f9623140b5c0a329ecafb6f19793390137e629d43a3c26e202b28a SHA512 0973b86c266e40203e301cf0c6f8fddc4273c002ffb8fd6c16f6e78f2cfdfbea95fda04adfebb8ee84a14dc950763ba706eadadb2e83f7982b800bee636d5d8f
 EBUILD glibc-2.33-r1.ebuild 45207 BLAKE2B 0512c0b719895136a6a5ab76e2625805539c8733403d3738ddc5d069f5d74fdc3592e3fa4fd8865d839c179189260fa74f6a37eaa4ae1e26f008eab60484cbf7 SHA512 42c84f34a6559ebd3d957d6a73a757a542f83f34ba32c98bd013b8b392329816f3e2c09c37afb24fbbfb1a6720ccd2321ed3d555102c0b5a0e797a36995eb6f8
+EBUILD glibc-2.33-r2.ebuild 45214 BLAKE2B ea9dab58bfaf378357bb9a3dd7759926b0cf1489c9782263d2abc850f8bc71d755c400919ddc29801eea40d13ed96cf83404f0009cf7680e4c8733b829995dbf SHA512 d5846e7f146776ae4d687807593b6740fc34d01be29323d33584b6038d69fa3898830e421e3c3574df12d7abf9603758f6087eecf2b6aee64b56f164802b6fae
+EBUILD glibc-2.33-r3.ebuild 45676 BLAKE2B adc5022730aa9ba5727bfe2e7876d665a4b64912e46de5e2317035dcd8b6af2e21e2b0ae58abfdcfc2b6bcedb295cecb08b49e536536725625452d2054ad72b0 SHA512 a0a484393f03dc48e8bcc09b7e95f8546b38c4d7db51b0efc2554220eafed05ff784ef481621bdf8accd1c60688e87dd9ecb894492da6fc4e8ffba4786953156
 EBUILD glibc-2.33.ebuild 43992 BLAKE2B b5fd1fa3b2e2b727574028241e7805cab448b37d3975502f12140e2cd6cf98784af36393a1116c13ebaa490db3f18b7b20a56bd53343015abc521201c193eb3f SHA512 911c152ce3ff50ff79db9d53b570ff0fcf837549a072656fef8ad429d02788f89d6ee1266605c539dcbcf273aa791cf075043e8b4895eb8d67404be531631086
-EBUILD glibc-9999.ebuild 45226 BLAKE2B fd577636a5b85c4d7610c79e18898ca13aad7643760c7a17f4625964f59b757bbe44eaba7f19c88a17fd1887d8b17fed996465c7ac93d9bbce68ab7ea90576b0 SHA512 38cec7e40c3b2406d86b7ab05f42e5cd9a4556f8444914c2410b589db96a1ec4fd739ceed7f0c550aac90aab4a3f1024100c55364d6eb7612926251b8483f32e
+EBUILD glibc-9999.ebuild 45687 BLAKE2B 8235f45d86c52e6d4b670d56664049f6b60d8e2800c77f35ca05bda1a0aed93f7c075e03d249bae77967fcd2f659c027c6a449da3f8cb0982f0f8ad76bb585b1 SHA512 46a7c9c4b896378f72ce4c637026484decd921e4c3eba571e15f2dce5d4987d386b677b92b62cb59e3625ac3de199645159043756fb74b285ed155ca6d9a7531
 MISC metadata.xml 1611 BLAKE2B 3bd777c160ea20cdbd86cca791d9fd4ff02f8d100344235ec74fff37d5cae1e7119e0ec26969707e75a983dcdb23e994559c8be128ef40fa0ec9ed655017466d SHA512 08be6d085ac47b140fff17a3be8cee77e066a4536cdce76fa44c77875dec2a9dc236ff67ff44301abf75cb196d1902feb2a139dda420220248b46dd9cdb16b9f
diff --git a/sys-libs/glibc/glibc-2.33-r2.ebuild b/sys-libs/glibc/glibc-2.33-r2.ebuild
new file mode 100644
index 000000000000..5e971e697fef
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.33-r2.ebuild
@@ -0,0 +1,1520 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+TMPFILES_OPTIONAL=1
+
+inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=4
+PATCH_DEV=dilfridge
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20201208
+
+LOCALE_GEN_VER=2.10
+
+SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
+SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+#   arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+#   enumeration: bug #697910. This is quite subtle:
+#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+#     via 'ps_pglobal_lookup' symbol defined in gdb.
+#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+#     (unexported) is used to sanity check compatibility before enabling
+#     debugging.
+#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+#   * normal 'strip' command trims '.symtab'
+#   Thus our main goal here is to prevent 'libpthread.so.0' from
+#   losing it's '.symtab' entries.
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
+
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-0.1.10
+	sys-devel/bison
+	doc? ( sys-apps/texinfo )
+	!compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
+"
+COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+	!<net-misc/openssh-8.1_p1-r2
+"
+DEPEND="${COMMON_DEPEND}
+	compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
+	test? ( >=net-dns/libidn2-2.3.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/gzip
+	sys-apps/grep
+	virtual/awk
+	sys-apps/gentoo-functions
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	BDEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.27
+		>=${CATEGORY}/gcc-6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	BDEPEND+="
+		>=sys-devel/binutils-2.27
+		>=sys-devel/gcc-6
+	"
+	DEPEND+=" virtual/os-headers "
+	RDEPEND+="
+		>=net-dns/libidn2-2.3.0
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+	# 9) Failures of unknown origin
+	tst-latepthread
+
+	# buggy test, assumes /dev/ and /dev/null on a single filesystem
+	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
+	# https://sourceware.org/PR25909
+	tst-support_descriptors
+
+	# Flaky test, known to fail occasionally:
+	# https://sourceware.org/PR19329
+	# https://bugs.gentoo.org/719674#c12
+	tst-stack4
+)
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	# Most of the time CC is already set, but not in early sanity checks.
+	nonfatal emake glibc-test CC="${CC-$(tc-getCC ${CTARGET})}"
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# TODO: See cross-compile issues listed above for x86.
+			[[ ${ABI} == x86 ]] &&
+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
+				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		ppc|ppc64)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				cpu="sparc64"
+				case $(get-flag mcpu) in
+				v9)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				*)
+					cpu="sparcv9"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+		# Lock glibc at -O2; we want to be conservative here.
+		filter-flags '-O?'
+		append-flags -O2
+	fi
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# ld can't use -r & --relax at the same time, bug #788901
+	# https://sourceware.org/PR27837
+	filter-ldflags '-Wl,--relax'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	replace-flags -O0 -O1
+
+	filter-flags '-fstack-protector*'
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
+		;;
+	esac
+	return 0
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	# only test gcc -- can't test linking yet
+	tc-has-tls -c ${CTARGET}
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+	local VAR=CFLAGS_${ABI}
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other.
+	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET})}
+	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ -z ${ROOT} ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers ; then
+		ebegin "Checking gcc for __thread support"
+		if ! eend $(want__thread ; echo $?) ; then
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "Please update your binutils/gcc and try again."
+			die "No __thread support in gcc!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+			if ! eend_KV ${build_kv} ${want_kv} ; then
+				echo
+				eerror "You need linux-headers of at least ${want_kv}!"
+				die "linux-headers version too low!"
+			fi
+		fi
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	# All the checks...
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+}
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	# Consistency is not guaranteed between pkg_ and src_ ...
+	sanity_prechecks
+
+	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	setup_env
+
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
+}
+
+src_prepare() {
+	local patchsetname
+	if ! use vanilla ; then
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${RELEASE_VER}-${PATCH_VER}"
+		fi
+		einfo "Applying Gentoo Glibc Patchset ${patchsetname}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	# move the external locale-gen to its old place
+	mkdir extra || die
+	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+}
+
+glibc_do_configure() {
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	# CXX isnt handled by the multilib system, so if we dont unset here
+	# we accumulate crap across abis
+	unset CXX
+
+	einfo "Configuring glibc for nptl"
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM READELF; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is buil first time
+		# when ${CTARGET}-g++ is not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
+
+	# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
+	# can't detect them automatically due to ${CHOST} mismatch and fallbacks
+	# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
+	export NM="$(tc-getNM ${CTARGET})"
+	export READELF="$(tc-getREADELF ${CTARGET})"
+	einfo " $(printf '%15s' 'Manual NM:')   ${NM}"
+	einfo " $(printf '%15s' 'Manual READELF:')   ${READELF}"
+
+	echo
+
+	local myconf=()
+
+	case ${CTARGET} in
+		m68k*)
+			# setjmp() is not compatible with stack protection:
+			# https://sourceware.org/PR24202
+			myconf+=( --enable-stack-protector=no )
+			;;
+		*)
+			# Use '=strong' instead of '=all' to protect only functions
+			# worth protecting from stack smashes.
+			# '=all' is also known to have a problem in IFUNC resolution
+			# tests: https://sourceware.org/PR25680, bug #712356.
+			myconf+=( --enable-stack-protector=$(usex ssp strong no) )
+			;;
+	esac
+	myconf+=( --enable-stackguard-randomization )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_enable crypt)
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable static-pie)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+
+		# locale data is arch-independent
+		# https://bugs.gentoo.org/753740
+		libc_cv_complocaledir='${exec_prefix}/lib/locale'
+
+		# -march= option tricks build system to infer too
+		# high ISA level: https://sourceware.org/PR27318
+		libc_cv_include_x86_isa_level=no
+		# Explicit override of https://sourceware.org/PR27991
+		# exposes a bug in glibc's configure:
+		# https://sourceware.org/PR27991
+		libc_cv_have_x86_lahf_sahf=no
+		libc_cv_have_x86_movbe=no
+
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	# We take care of patching our binutils to use both hash styles,
+	# and many people like to force gnu hash style only, so disable
+	# this overriding check.  #347761
+	export libc_cv_hashstyle=no
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+
+	local myxfailparams=""
+	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+		for myt in ${XFAIL_TEST_LIST[@]} ; do
+			myxfailparams+="test-xfail-${myt}=yes "
+		done
+	fi
+
+	# sandbox does not understand unshare() and prevents
+	# writes to /proc/, which makes many tests fail
+
+	SANDBOX_ON=0 LD_PRELOAD= emake ${myxfailparams} check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+	echo "$@"
+	"$@"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	# Avoid stripping binaries not targeted by ${CHOST}. Or else
+	# ${CHOST}-strip would break binaries build for ${CTARGET}.
+	is_crosscompile && dostrip -x /
+	# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
+	# See Note [Disable automatic stripping]
+	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+
+	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		# riscv
+		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
+		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+			# ELFv2 (glibc does not support ELFv1 on LE)
+			ppc64   /lib64/ld64.so.2
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+			# ELFv1 (glibc does not support ELFv2 on BE)
+			ppc64   /lib64/ld64.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# In the LSB 5.0 definition, someone had the excellent idea to "standardize"
+	# the runtime loader name, see also https://xkcd.com/927/
+	# Normally, in Gentoo one should never come across executables that require this.
+	# However, binary commercial packages are known to adhere to weird practices.
+	# https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
+	local lsb_ldso_name native_ldso_name lsb_ldso_abi
+	local lsb_ldso_abi_list=(
+		# x86
+		amd64	ld-linux-x86-64.so.2	ld-lsb-x86-64.so.3
+	)
+	for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
+		lsb_ldso_abi=${lsb_ldso_abi_list[i]}
+		native_ldso_name=${lsb_ldso_abi_list[i+1]}
+		lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
+		has ${lsb_ldso_abi} $(get_install_abis) || continue
+
+		if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
+			dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	keepdir /usr/lib/locale
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins posix/gai.conf nss/nsswitch.conf
+
+	# Gentoo-specific
+	newins "${FILESDIR}"/host.conf-1 host.conf
+
+	if use nscd ; then
+		doins nscd/nscd.conf
+
+		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		systemd_dounit nscd/nscd.service
+		newtmpfiles nscd/nscd.tmpfiles nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}/"
+		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		einfo "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		./ld-*.so --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ -n ${ROOT} ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+
+	if [[ -L ${EROOT}/usr/lib/locale ]]; then
+		# Help portage migrate this to a directory
+		# https://bugs.gentoo.org/753740
+		rm "${EROOT}"/usr/lib/locale || die
+	fi
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+	fi
+
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		use compile-locales || run_locale_gen "${EROOT}/"
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+}
diff --git a/sys-libs/glibc/glibc-2.33-r3.ebuild b/sys-libs/glibc/glibc-2.33-r3.ebuild
new file mode 100644
index 000000000000..73e8908484d0
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.33-r3.ebuild
@@ -0,0 +1,1534 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+TMPFILES_OPTIONAL=1
+
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=4
+PATCH_DEV=dilfridge
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+else
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20201208
+
+LOCALE_GEN_VER=2.10
+
+SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
+SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+#   arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+#   enumeration: bug #697910. This is quite subtle:
+#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+#     via 'ps_pglobal_lookup' symbol defined in gdb.
+#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+#     (unexported) is used to sanity check compatibility before enabling
+#     debugging.
+#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+#   * normal 'strip' command trims '.symtab'
+#   Thus our main goal here is to prevent 'libpthread.so.0' from
+#   losing it's '.symtab' entries.
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
+
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-0.1.10
+	sys-devel/bison
+	doc? ( sys-apps/texinfo )
+	!compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
+"
+COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+	!<net-misc/openssh-8.1_p1-r2
+"
+DEPEND="${COMMON_DEPEND}
+	compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
+	test? ( >=net-dns/libidn2-2.3.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/gzip
+	sys-apps/grep
+	virtual/awk
+	sys-apps/gentoo-functions
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	BDEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.27
+		>=${CATEGORY}/gcc-6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	BDEPEND+="
+		>=sys-devel/binutils-2.27
+		>=sys-devel/gcc-6
+	"
+	DEPEND+=" virtual/os-headers "
+	RDEPEND+="
+		>=net-dns/libidn2-2.3.0
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+	# 9) Failures of unknown origin
+	tst-latepthread
+
+	# buggy test, assumes /dev/ and /dev/null on a single filesystem
+	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
+	# https://sourceware.org/PR25909
+	tst-support_descriptors
+
+	# Flaky test, known to fail occasionally:
+	# https://sourceware.org/PR19329
+	# https://bugs.gentoo.org/719674#c12
+	tst-stack4
+)
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	# Most of the time CC is already set, but not in early sanity checks.
+	nonfatal emake glibc-test CC="${CC-$(tc-getCC ${CTARGET})}"
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# TODO: See cross-compile issues listed above for x86.
+			[[ ${ABI} == x86 ]] &&
+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
+				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		ppc|ppc64)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				cpu="sparc64"
+				case $(get-flag mcpu) in
+				v9)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				*)
+					cpu="sparcv9"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+		# Lock glibc at -O2; we want to be conservative here.
+		filter-flags '-O?'
+		append-flags -O2
+	fi
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# ld can't use -r & --relax at the same time, bug #788901
+	# https://sourceware.org/PR27837
+	filter-ldflags '-Wl,--relax'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	replace-flags -O0 -O1
+
+	filter-flags '-fstack-protector*'
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
+		;;
+	esac
+	return 0
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	# only test gcc -- can't test linking yet
+	tc-has-tls -c ${CTARGET}
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+	local VAR=CFLAGS_${ABI}
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other.
+	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET})}
+	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ -z ${ROOT} ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers ; then
+		ebegin "Checking gcc for __thread support"
+		if ! eend $(want__thread ; echo $?) ; then
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "Please update your binutils/gcc and try again."
+			die "No __thread support in gcc!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+			if ! eend_KV ${build_kv} ${want_kv} ; then
+				echo
+				eerror "You need linux-headers of at least ${want_kv}!"
+				die "linux-headers version too low!"
+			fi
+		fi
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	# All the checks...
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+}
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	# Consistency is not guaranteed between pkg_ and src_ ...
+	sanity_prechecks
+
+	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	setup_env
+
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
+}
+
+src_prepare() {
+	local patchsetname
+	if ! use vanilla ; then
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${RELEASE_VER}-${PATCH_VER}"
+		fi
+		einfo "Applying Gentoo Glibc Patchset ${patchsetname}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	# move the external locale-gen to its old place
+	mkdir extra || die
+	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+}
+
+glibc_do_configure() {
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	# CXX isnt handled by the multilib system, so if we dont unset here
+	# we accumulate crap across abis
+	unset CXX
+
+	einfo "Configuring glibc for nptl"
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM READELF; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is buil first time
+		# when ${CTARGET}-g++ is not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
+
+	# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
+	# can't detect them automatically due to ${CHOST} mismatch and fallbacks
+	# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
+	export NM="$(tc-getNM ${CTARGET})"
+	export READELF="$(tc-getREADELF ${CTARGET})"
+	einfo " $(printf '%15s' 'Manual NM:')   ${NM}"
+	einfo " $(printf '%15s' 'Manual READELF:')   ${READELF}"
+
+	echo
+
+	local myconf=()
+
+	case ${CTARGET} in
+		m68k*)
+			# setjmp() is not compatible with stack protection:
+			# https://sourceware.org/PR24202
+			myconf+=( --enable-stack-protector=no )
+			;;
+		*)
+			# Use '=strong' instead of '=all' to protect only functions
+			# worth protecting from stack smashes.
+			# '=all' is also known to have a problem in IFUNC resolution
+			# tests: https://sourceware.org/PR25680, bug #712356.
+			myconf+=( --enable-stack-protector=$(usex ssp strong no) )
+			;;
+	esac
+	myconf+=( --enable-stackguard-randomization )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_enable crypt)
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable static-pie)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+
+		# locale data is arch-independent
+		# https://bugs.gentoo.org/753740
+		libc_cv_complocaledir='${exec_prefix}/lib/locale'
+
+		# -march= option tricks build system to infer too
+		# high ISA level: https://sourceware.org/PR27318
+		libc_cv_include_x86_isa_level=no
+		# Explicit override of https://sourceware.org/PR27991
+		# exposes a bug in glibc's configure:
+		# https://sourceware.org/PR27991
+		libc_cv_have_x86_lahf_sahf=no
+		libc_cv_have_x86_movbe=no
+
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	# We take care of patching our binutils to use both hash styles,
+	# and many people like to force gnu hash style only, so disable
+	# this overriding check.  #347761
+	export libc_cv_hashstyle=no
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+
+	local myxfailparams=""
+	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+		for myt in ${XFAIL_TEST_LIST[@]} ; do
+			myxfailparams+="test-xfail-${myt}=yes "
+		done
+	fi
+
+	# sandbox does not understand unshare() and prevents
+	# writes to /proc/, which makes many tests fail
+
+	SANDBOX_ON=0 LD_PRELOAD= emake ${myxfailparams} check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+	echo "$@"
+	"$@"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	# Avoid stripping binaries not targeted by ${CHOST}. Or else
+	# ${CHOST}-strip would break binaries build for ${CTARGET}.
+	is_crosscompile && dostrip -x /
+	# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
+	# See Note [Disable automatic stripping]
+	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+
+	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		# riscv
+		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
+		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+			# ELFv2 (glibc does not support ELFv1 on LE)
+			ppc64   /lib64/ld64.so.2
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+			# ELFv1 (glibc does not support ELFv2 on BE)
+			ppc64   /lib64/ld64.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# In the LSB 5.0 definition, someone had the excellent idea to "standardize"
+	# the runtime loader name, see also https://xkcd.com/927/
+	# Normally, in Gentoo one should never come across executables that require this.
+	# However, binary commercial packages are known to adhere to weird practices.
+	# https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
+	local lsb_ldso_name native_ldso_name lsb_ldso_abi
+	local lsb_ldso_abi_list=(
+		# x86
+		amd64	ld-linux-x86-64.so.2	ld-lsb-x86-64.so.3
+	)
+	for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
+		lsb_ldso_abi=${lsb_ldso_abi_list[i]}
+		native_ldso_name=${lsb_ldso_abi_list[i+1]}
+		lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
+		has ${lsb_ldso_abi} $(get_install_abis) || continue
+
+		if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
+			dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	keepdir /usr/lib/locale
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins posix/gai.conf nss/nsswitch.conf
+
+	# Gentoo-specific
+	newins "${FILESDIR}"/host.conf-1 host.conf
+
+	if use nscd ; then
+		doins nscd/nscd.conf
+
+		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		systemd_dounit nscd/nscd.service
+		newtmpfiles nscd/nscd.tmpfiles nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}/"
+		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		einfo "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		./ld-*.so --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ -n ${ROOT} ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+
+	if [[ -L ${EROOT}/usr/lib/locale ]]; then
+		# Help portage migrate this to a directory
+		# https://bugs.gentoo.org/753740
+		rm "${EROOT}"/usr/lib/locale || die
+	fi
+
+	# Keep around libcrypt so that Perl doesn't break when merging libxcrypt
+	# (libxcrypt is the new provider for now of libcrypt.so.{1,2}).
+	# bug #802207
+	if has_version "${CATEGORY}/${PN}[crypt]"; then
+		PRESERVED_OLD_LIBCRYPT=1
+		preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1)
+	else
+		PRESERVED_OLD_LIBCRYPT=0
+	fi
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+	fi
+
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		use compile-locales || run_locale_gen "${EROOT}/"
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+
+	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
+		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
+	fi
+}
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index e2bc0dad8669..b3fc7c71c7b2 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 TMPFILES_OPTIONAL=1
 
-inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing tmpfiles
 
 DESCRIPTION="GNU libc C library"
@@ -1489,6 +1489,16 @@ pkg_preinst() {
 		# https://bugs.gentoo.org/753740
 		rm "${EROOT}"/usr/lib/locale || die
 	fi
+
+	# Keep around libcrypt so that Perl doesn't break when merging libxcrypt
+	# (libxcrypt is the new provider for now of libcrypt.so.{1,2}).
+	# bug #802207
+	if has_version "${CATEGORY}/${PN}[crypt]"; then
+		PRESERVED_OLD_LIBCRYPT=1
+		preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1)
+	else
+		PRESERVED_OLD_LIBCRYPT=0
+	fi
 }
 
 pkg_postinst() {
@@ -1518,4 +1528,8 @@ pkg_postinst() {
 			fi
 		done
 	fi
+
+	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
+		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
+	fi
 }
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index e8181d5fb444..5fa9f88ce09b 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,7 +1,5 @@
 DIST kpmcore-20.12.3.tar.xz 584264 BLAKE2B de80d48bb6becb3e8d6f5b9b4456e4ad4e220ca52d76700c6be33942c5d762e1fc39b43b3595894a3d28605d7010662ebec588c3f1d3a4525a9efe797dbf65ed SHA512 90083374bbc4b91e948e9ef8e3e272cf7bd6b038261414c7e08eea1a903bd61c723f29a4afe462e29c1a083c6771be435fd4dfbf8a364c2c167f1eed19d04323
-DIST kpmcore-21.04.2.tar.xz 586284 BLAKE2B 33ade0b66b5f48fac3566226556b0f5316c3e5cac8c4f9c9a37737d84d8df585d3e7754bcf146e86ca7c074a18aead0eeb427906d11a21d37780231dcec39704 SHA512 0dc18d52cfd36530bc40ffbbed178d069d30ece50142221077700fca6c7aee2b4dfeb4974c9d01eb67e01cfb1e02e7a64a12131dace06edcff938c4fb587b7f3
 DIST kpmcore-21.04.3.tar.xz 586264 BLAKE2B b9733f8b941fed98503e78b9c0357e002df92a39c4e70885822f6bb8944cf2c76be1fbba23e4cedf104b46a95832e72d2384c0d78abde312e0b2be40aa4d5745 SHA512 44614e3a0db646b81e56b87daa841b7b7e03ff97699ea393d83b6cc61e6c12efa36ac6b8aba87da612f2973a1d108bdad21ef0d73fc2db98595e5b711e5a0fcf
 EBUILD kpmcore-20.12.3.ebuild 749 BLAKE2B 0e0cd54e67d6fed17f721cf615ac5ebb0a405ed67a7338834d235e15e156119cbd0f8fe9489abb13231e47b89b975314f0fc84f7576833b1262cd6823a4cc1ba SHA512 4db6919ded366d2c343f68c84e929727a0cc6cc2762f886f4a087829b1c30b1f350d20fdaa57fe89cc041f96b30150e79f5966b7f9f968c41a5b79cc63af67d9
-EBUILD kpmcore-21.04.2.ebuild 741 BLAKE2B 41fa2450cc6387ee771ba56aa2e62343b656fd6dcf55076a3105550205dd10f72d0a974fcde784117a1c94274e2c2b4ad2c29c3891391b091944ba130cb39a4e SHA512 c9e94cf51a85e97536686f65011166b5d88504348c99d2d0ceab5fc259f3f42c06d46a986806ed963042b93419c67e41c753df38fe222b58485f2e4f25f9bdc3
 EBUILD kpmcore-21.04.3.ebuild 741 BLAKE2B 41fa2450cc6387ee771ba56aa2e62343b656fd6dcf55076a3105550205dd10f72d0a974fcde784117a1c94274e2c2b4ad2c29c3891391b091944ba130cb39a4e SHA512 c9e94cf51a85e97536686f65011166b5d88504348c99d2d0ceab5fc259f3f42c06d46a986806ed963042b93419c67e41c753df38fe222b58485f2e4f25f9bdc3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-libs/kpmcore/kpmcore-21.04.2.ebuild b/sys-libs/kpmcore/kpmcore-21.04.2.ebuild
deleted file mode 100644
index 202540698757..000000000000
--- a/sys-libs/kpmcore/kpmcore-21.04.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_NONGUI="true"
-KDE_GEAR="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for managing partitions"
-HOMEPAGE="https://apps.kde.org/partitionmanager/"
-
-LICENSE="GPL-3"
-SLOT="5/10"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# bug 689468, tests need polkit etc.
-RESTRICT+=" test"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=sys-apps/util-linux-2.33.2
-	sys-auth/polkit-qt
-"
-RDEPEND="${DEPEND}"
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index bfcd6b2ec19d..1f4f2e863810 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -2,6 +2,8 @@ AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e
 AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d2509c0bbe0fc59f81bab22add57ffe0c603a8fb0c9be038d06693dcbb1d3817d4ad97a5931120b18bd9783efaac599fe0ccbc SHA512 2f313c3377385279ca3da6db21d926df0559d971e1fd42f8cce57b4001078c3817f472b85088a1f3b0e5ddcdfbbfd943199485d6e4a00412f62c883c6ea04afd
 DIST ldb-2.2.1.tar.gz 1676819 BLAKE2B 794575d5bd7d33dcd586cb5de6c392411795c467f472f517d5182a2559698a5489e703c8360baf2d0b1bff080c943a403a666d0ef7a9a180ae90052055966f40 SHA512 a2b1598869e3d9f17c5b82fc2b7289f1f08a7378a1d72609af5ed5cc91fb571ac67d3a8c22d64dad5dcc9fe32520baccd5cc37d5b4fc5f1b00a7064902296344
 DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835aeca80ee81a58ed20cab4f8cbd96e394f59460df11e2424e2e263d5fb01b9cebbfb4ca1bcc77162e93ed3f SHA512 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348
+DIST ldb-2.4.0.tar.gz 1689484 BLAKE2B 904d74900011ce3f63ad1c24fe88b1a090e835c68829ddfda5e8af2c0ab3674d7a8cd9a62b95c1f38f26578d0704556d3562e46e21a54cbb44a15b9d83676521 SHA512 6c500b723c081488bc0717b6a5b0e8966c5d8a751232f8856281a6fe4d358ae6b5878c8400a82fa666379066105fbb9259b2967313e73efabef0e1386095e2ee
 EBUILD ldb-2.2.1.ebuild 2933 BLAKE2B 2da626474cc1e846f539bacdaa6b03b71881ce4c1a812845aad18e2374b3606ee31b03bd73826709506ac4db412203d5d8b3d46858b4ef8a597d29e09d2901fa SHA512 926b82a29f8ab2d77186f871357c162e07ef659725fb0ac166d1a5dc648e40ed2dadb1de479eebf37911237ea001386808493669cdf160ca2c29609c9d0f6c01
 EBUILD ldb-2.3.0.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2
+EBUILD ldb-2.4.0.ebuild 2940 BLAKE2B 9a996a55327e08ce837707401c74954ecf843b6ae4359443a418ff064cfcf6890e25823e04891072f78dd1a904764bc1c7c55ea41ebc46a5fe437096ad906f09 SHA512 294509cde935f913f0211e6a095f13fb3bc8fd419f2d12986dc6e7bc556ade0057a8909f4e2a602845a6b5e5747ac58f8818177ebe48e86a473a34975b84c348
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/ldb-2.4.0.ebuild b/sys-libs/ldb/ldb-2.4.0.ebuild
new file mode 100644
index 000000000000..6886630a2b9c
--- /dev/null
+++ b/sys-libs/ldb/ldb-2.4.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="LDAP-like embedded database"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc +ldap +lmdb python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( python )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
+	ldap? ( net-nds/openldap )
+	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
+	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+)
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	# waf requires a python interpreter
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(usex ldap '' --disable-ldap)
+		$(usex lmdb '' --without-ldb-lmdb)
+		--disable-rpath
+		--disable-rpath-install --bundled-libraries=NONE
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--builtin-libraries=NONE
+	)
+	if ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	else
+		use python || myconf+=( --disable-python )
+	fi
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/.
+	fi
+
+	use python && python_optimize #726454
+}
+
+pkg_postinst() {
+	if has_version sys-auth/sssd; then
+		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
+		ewarn "so please try to rebuild it before reporting bugs."
+		ewarn "See https://bugs.gentoo.org/404281"
+	fi
+}
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 3c5235e8b857..5981cdecce20 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -4,5 +4,7 @@ AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d3737337
 DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b SHA512 5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
 DIST libxcrypt-4.4.23-autotools.tar.xz 630204 BLAKE2B a1c82906f59f6d0ed8f00de8fecf2c3c20608f0e3422bc0692b290c4eefd536019395e28b380031ae16be4ef37671327aca20dc63ca0367f73c2e85dfa5e3199 SHA512 30acea7e643a87d2c032c97ad8ca6c8c445c2e4af66d22906e332311a5b54a6905cc7ca74af7215a2e9ca362e1af2a8a3be8b3e0f0872f42ce0e5ea3e63bad46
 EBUILD libxcrypt-4.4.20.ebuild 5783 BLAKE2B 1e2095164227fc440d80c20c0bdabc1880058052b7de330ccd7b48900ea9e791956a735855f213210c01baeaa869909c52932197f70795e6e5d062389c745702 SHA512 54dea2fc4e9c1105b8d9188a723483fa334e5c697d057f96344fa55c43ec65abfe5ee7329318393b7d6439fa5e48516d15a64d9d5c317103615f52b4eef13285
+EBUILD libxcrypt-4.4.23-r1.ebuild 5820 BLAKE2B 3c526b6a73e403ec587bb4259df85ac7287ab931d317e6e8b8753e10f660c2c830741d936ca9d76c4a9447c13ccf4a026fb60dbd19fa75f504fc0764840f688d SHA512 874bfeaa73f58e8275840fa2cf1200e1858124ae591d6a813fe90220a85b8f06b2cdfe5ec86ad19d5fe9acf70b76a8f27ec879e10fc0ead6690c1971874de667
+EBUILD libxcrypt-4.4.23-r2.ebuild 5856 BLAKE2B 8647acbc70466d29e59a22106f4bbf113c00a90bd9b9ab88c32a6f1f3ff85798e16484691512e75e28a98d66e68dc3a4d4b76681d6688fd4f8fdb1ab47b1c73f SHA512 85b4edfd836ddb381477862833a96bf390e211356d7f5fe61703398ba4757c168944cafa02772a3c8eb645e4bbab9445576315fcfcf03a4cf309dd0375d929bd
 EBUILD libxcrypt-4.4.23.ebuild 5792 BLAKE2B 732a9dfe8569dc7f11088467be788b6724a006d99ca5268e086ae6f17c302c5c6d72a1dbe43d69352de626824fb650dc99b277cec7aeb471daaa10c4b5f58fbd SHA512 411efce10b7dccf76e5e2ca9ffefff548a94aafb702eb26352845fb9d859e14d055cb9767d7fc8d8de2d73106ee0154fca39b0939b961dd070fa29748c96d996
 MISC metadata.xml 830 BLAKE2B 21022e8e6a34737874590a560010f2a8fd1fb11275b4f675d195b66af70ebf8f28a2d881bab0a6653b0b1fbc09c14b99339f43d6f07fd8ffe282f951c64a4f96 SHA512 03dafb661b2273d25c7e282bb91ba01a371734446e12d140d5c5c469172e62f768de6d2a0f5bcdcdae7275f4ba0ad46de69c546b381c1f0bf338cdb487267773
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild
new file mode 100644
index 000000000000..59a192d732e9
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit multibuild python-any-r1 multilib-minimal
+
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
+HOMEPAGE="https://github.com/besser82/libxcrypt"
+if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+	inherit autotools
+	SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
+fi
+
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+compat split-usr +static-libs system test"
+REQUIRED_USE="split-usr? ( system )"
+RESTRICT="!test? ( test )"
+
+DEPEND="system? (
+		elibc_glibc? ( sys-libs/glibc[-crypt(+)] )
+		!sys-libs/musl
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl
+	sys-apps/findutils
+	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+	has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=(
+		$(usex compat 'xcrypt_compat' '')
+		xcrypt_nocompat
+	)
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# WARNING: Please read on bumping or applying patches!
+	#
+	# There are two circular dependencies to be aware of:
+	# 1)
+	# 	if we're bootstrapping configure and makefiles:
+	# 		libxcrypt -> automake -> perl -> libxcrypt
+	#
+	#   mitigation:
+	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
+	#		and the ebuild uses that.
+	#		(Don't include the pre-generated Perl artefacts.)
+	#
+	#	solution for future:
+	#		Upstream are working on producing `make dist` tarballs.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# 2)
+	#	configure *unconditionally* needs Perl at build time to generate
+	#	a list of enabled algorithms based on the set passed to `configure`:
+	#		libxcrypt -> perl -> libxcrypt
+	#
+	#	mitigation:
+	#		None at the moment.
+	#
+	#	solution for future:
+	#		Not possible right now. Upstream intend on depending on Perl for further
+	#		configuration options.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# Therefore, on changes (inc. bumps):
+	#	* You must check whether upstream have started providing tarballs with bootstrapped
+	#	  auto{conf,make};
+	#
+	#	* diff the build system changes!
+	#
+	if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+		# Facilitate our split variant build for compat + non-compat
+		eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+get_xclibdir() {
+	printf -- "%s/%s/%s\n" \
+		"$(usex split-usr '' '/usr')" \
+		"$(get_libdir)" \
+		"$(usex system '' 'xcrypt')"
+}
+
+multilib_src_configure() {
+	local -a myconf=(
+		--disable-werror
+		--libdir="${EPREFIX}"$(get_xclibdir)
+		--with-pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+		--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
+	)
+
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			myconf+=(
+				--disable-static
+				--disable-xcrypt-compat-files
+				--enable-obsolete-api=yes
+			)
+			;;
+		xcrypt_nocompat-*)
+			myconf+=(
+				--enable-obsolete-api=no
+				$(use_enable static-libs static)
+			)
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake check
+}
+
+src_test() {
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	(
+		shopt -s failglob || die "failglob failed"
+
+		# Make sure our man pages do not collide with glibc or man-pages.
+		for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
+			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
+				|| die "mv failed"
+		done
+	) || die "failglob error"
+
+	# Remove useless stuff from installation
+	find "${ED}"/usr/share/doc/${PF} -type l -delete || die
+	find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# Don't install the libcrypt.so symlink for the "compat" version
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			rm "${ED}"$(get_xclibdir)/libcrypt$(get_libname) \
+				|| die "failed to remove extra compat libraries"
+		;;
+		xcrypt_nocompat-*)
+			if use split-usr; then
+				(
+					if use static-libs; then
+						# .a files are installed to /$(get_libdir) by default
+						# Move static libraries to /usr prefix or portage will abort
+						shopt -s nullglob || die "failglob failed"
+						static_libs=( "${ED}"/$(get_xclibdir)/*.a )
+
+						if [[ -n ${static_libs[*]} ]]; then
+							dodir "/usr/$(get_xclibdir)"
+							mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \
+								|| die "Moving static libs failed"
+						fi
+					fi
+
+					if use system; then
+						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
+						# to allow linker to correctly find shared libraries.
+						shopt -s failglob || die "failglob failed"
+
+						for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do
+							lib_file_basename="$(basename "${lib_file}")"
+							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
+							dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}"
+						done
+
+						rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
+					fi
+				)
+			fi
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+}
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild
new file mode 100644
index 000000000000..9a542cc2117c
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.23-r2.ebuild
@@ -0,0 +1,211 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit multibuild python-any-r1 multilib-minimal
+
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
+HOMEPAGE="https://github.com/besser82/libxcrypt"
+if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+	inherit autotools
+	SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
+fi
+
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
+SLOT="0/1"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+compat split-usr +static-libs system test"
+REQUIRED_USE="split-usr? ( system )"
+RESTRICT="!test? ( test )"
+
+DEPEND="system? (
+		elibc_glibc? (
+			sys-libs/glibc[-crypt(+)]
+			!sys-libs/glibc[crypt(+)]
+		)
+		!sys-libs/musl
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl
+	sys-apps/findutils
+	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+	has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=(
+		$(usex compat 'xcrypt_compat' '')
+		xcrypt_nocompat
+	)
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# WARNING: Please read on bumping or applying patches!
+	#
+	# There are two circular dependencies to be aware of:
+	# 1)
+	# 	if we're bootstrapping configure and makefiles:
+	# 		libxcrypt -> automake -> perl -> libxcrypt
+	#
+	#   mitigation:
+	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
+	#		and the ebuild uses that.
+	#		(Don't include the pre-generated Perl artefacts.)
+	#
+	#	solution for future:
+	#		Upstream are working on producing `make dist` tarballs.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# 2)
+	#	configure *unconditionally* needs Perl at build time to generate
+	#	a list of enabled algorithms based on the set passed to `configure`:
+	#		libxcrypt -> perl -> libxcrypt
+	#
+	#	mitigation:
+	#		None at the moment.
+	#
+	#	solution for future:
+	#		Not possible right now. Upstream intend on depending on Perl for further
+	#		configuration options.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# Therefore, on changes (inc. bumps):
+	#	* You must check whether upstream have started providing tarballs with bootstrapped
+	#	  auto{conf,make};
+	#
+	#	* diff the build system changes!
+	#
+	if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+		# Facilitate our split variant build for compat + non-compat
+		eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+get_xclibdir() {
+	printf -- "%s/%s/%s\n" \
+		"$(usex split-usr '' '/usr')" \
+		"$(get_libdir)" \
+		"$(usex system '' 'xcrypt')"
+}
+
+multilib_src_configure() {
+	local -a myconf=(
+		--disable-werror
+		--libdir="${EPREFIX}"$(get_xclibdir)
+		--with-pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+		--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
+	)
+
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			myconf+=(
+				--disable-static
+				--disable-xcrypt-compat-files
+				--enable-obsolete-api=yes
+			)
+			;;
+		xcrypt_nocompat-*)
+			myconf+=(
+				--enable-obsolete-api=no
+				$(use_enable static-libs static)
+			)
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake check
+}
+
+src_test() {
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	(
+		shopt -s failglob || die "failglob failed"
+
+		# Make sure our man pages do not collide with glibc or man-pages.
+		for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
+			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
+				|| die "mv failed"
+		done
+	) || die "failglob error"
+
+	# Remove useless stuff from installation
+	find "${ED}"/usr/share/doc/${PF} -type l -delete || die
+	find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# Don't install the libcrypt.so symlink for the "compat" version
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			rm "${ED}"$(get_xclibdir)/libcrypt$(get_libname) \
+				|| die "failed to remove extra compat libraries"
+		;;
+		xcrypt_nocompat-*)
+			if use split-usr; then
+				(
+					if use static-libs; then
+						# .a files are installed to /$(get_libdir) by default
+						# Move static libraries to /usr prefix or portage will abort
+						shopt -s nullglob || die "failglob failed"
+						static_libs=( "${ED}"/$(get_xclibdir)/*.a )
+
+						if [[ -n ${static_libs[*]} ]]; then
+							dodir "/usr/$(get_xclibdir)"
+							mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \
+								|| die "Moving static libs failed"
+						fi
+					fi
+
+					if use system; then
+						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
+						# to allow linker to correctly find shared libraries.
+						shopt -s failglob || die "failglob failed"
+
+						for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do
+							lib_file_basename="$(basename "${lib_file}")"
+							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
+							dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}"
+						done
+
+						rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
+					fi
+				)
+			fi
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+}
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index e28bbbcb9b5e..08975f2d922a 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,3 +1,5 @@
 DIST talloc-2.3.2.tar.gz 661344 BLAKE2B 957eedc4a367051cb99fa4d2edb8e778de8e0187bb5c0d84a1afef20aab122a8b7310d10c694e15ddd6a0a45194889fe3d26dae0ceb8e406d51512af95a23014 SHA512 c851a6f43025720453a3bff8734bfcfff0e29fb7cf2ffcc6c03b6ab8589098daf01d668deec61aa2f238d4df3eb3c47bd080e26eec760cf04a70e1afcad5c5e1
+DIST talloc-2.3.3.tar.gz 650493 BLAKE2B 4312d8bbd54da2cb8917946e46bb77dae1c6fdfeb72bd85d86ef8d5900f2132a36c5f0075608116a9bf036a2f02671472d389eed704f8e2923f8320d29aa12bd SHA512 1e4b90769b9be72421d76bf9149fd0736f43d034b1573ab2dfb5cd613b4fb3fdf67d575f81789851787e1cbbc7353cdfc114cefbccb15fc0f39e222f40aff65f
 EBUILD talloc-2.3.2.ebuild 3424 BLAKE2B 560a71b2392812d40361647d548ed8b5e99f4fa40ba85ee8d1fa88194b4f63722b28209247ac05b05fc5252c6fbcaa37ff934debe3a9c4604b69f4f4f7ca4c12 SHA512 de4dff8f5d23a3ea40ad1dfbfcb4d4766d34779a9884bad411559c91ec12dd2cff0e08a020a5e62e32bd3b96efc0328624ab3ee650ffa3b41b1b8640e8bf0097
+EBUILD talloc-2.3.3.ebuild 3432 BLAKE2B 12e83f9e80b453352453e3164430e9ae24b3bfc8b59fa37cef4c7aefb83e2d0bbef1aaeb29f373bf0d45c9f817505229f4ef2512e14d8634c4d80b54a8428c72 SHA512 bd8526c909c9c4cf6460615917e1fd57d330a50633e30c2a87601a22fcd107d219b10c1f0d7085e48d9cfa25dc0b6d8e37cf3e2c118bc0bf90cf88205c78c325
 MISC metadata.xml 325 BLAKE2B 9c8711270f9afc5d7ec24204c9d74ab94fb2fb3ebccc65d77386725e9f9694838aa71c068c9754971bd6e404dc4ed1bc8bc40b1a4277ffe78415cae6d64c30c2 SHA512 a87ba9777fd7d2007cce3e495ccff8a6f0a7e86379f28dede1e1940c0da95f4690319cf7212b683464a4b265c043f80e80070dc306a0c9cb625080f6e1e85d68
diff --git a/sys-libs/talloc/talloc-2.3.3.ebuild b/sys-libs/talloc/talloc-2.3.3.ebuild
new file mode 100644
index 000000000000..2b8eb265c04f
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.3.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils python-single-r1 multilib-minimal
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="https://talloc.samba.org/"
+SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+ LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	!elibc_FreeBSD? (
+		!elibc_SunOS? (
+			!elibc_Darwin? (
+				dev-libs/libbsd[${MULTILIB_USEDEP}]
+			)
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	!!<sys-libs/talloc-2.0.5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# python goes only for native
+	/usr/include/pytalloc.h
+)
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Drop irritating ABI names (e.g. cpython-37m)
+		# We're only installing one implementation anyway
+		sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die
+		sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die
+	fi
+
+	# what would you expect of waf? i won't even waste time trying.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=(
+		$(usex compat --enable-talloc-compat1 '')
+		$(multilib_native_usex python '' --disable-python)
+		$([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions')
+	)
+	waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# waf is stupid, and no, we can't fix the build-system, since it's provided
+	# as a brilliant binary blob thats decompressed on the fly
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libtalloc.${PV}.dylib || die
+
+		if use python ; then
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+		fi
+	fi
+}
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 8a0e4bb4347c..999aaea3d990 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,3 +1,5 @@
 DIST tdb-1.4.3.tar.gz 702836 BLAKE2B 6593c3be527b383a7e8fd85b3613cf2429f6b665a7c609a56f57a6f5b41a080c1a681d712afd423c2bc1c741e06d7cd2c90949d9c5bf78ca834b18c64e23d51c SHA512 99488839e7da396f04df60412d21a7d3e09efeab52772d6cb5e9470a3dfd585d73ef2422c51cd0d8ccc123a65d455de400d5d6b24a21a2a50d3da60d9a70e67a
+DIST tdb-1.4.4.tar.gz 714367 BLAKE2B fdd84fc76a428b3b98ca481a9ef42c46d21f67f6ca8d92a90e6f0c1d24aa8f1f3b773c8fdcb43b572f8a1441349af491cb5d4ad9440d0b95fb51b89591510e27 SHA512 ef0a997aacebcc804e84ec4a14de8189513ddd1083ba677e421269c21a94f5ca8fc188185645855e5ef81417f4843c8649417ff28f286b768d690907d5d4cb07
 EBUILD tdb-1.4.3.ebuild 1390 BLAKE2B dd53828ff444e148af6dca3f49e3ebda352539e6d6eefa343150159d856ac7c3696e7974a479f4b5aeff96bae69dc66b89c0b57a0b132a772531787ec7c7b8cb SHA512 be7b77a732c8d106dc013e7a1d3b4c51f0c0226cad7fccd14c3886e91ada643bc9c5adf1549315ce008ffc45c2d3191ada3d47ad47accdd99753365f907f2fc7
+EBUILD tdb-1.4.4.ebuild 1398 BLAKE2B 306aacc6fb82041dba544daae875aa5abd299e878147ba67a43aae84ca0477736b617a28ed01c72a77505134551a884d0478473366581a82f9ba50f18367870f SHA512 0b7bbb861859b1dea999c9e580b48e5937956755fb6db3b3b5402b4c194e448d5798c87c0b4e5aed7b274865e4b6ec0d1259d299b7af6b27d99b7e89f6c9a51c
 MISC metadata.xml 244 BLAKE2B d1692c5795a32dd5189e7374f1821bb98cd9efe798e851c04aab69aeab42c100e910d7a4532757f9f83bf1b345aa8e7adcfb3b6dba412dda8d4796313b833958 SHA512 d5cb5e719f70141aa6d7783bb63ebfd6158e9af82700041559c92ed45c688c6162b19a3d1ece204c9bf6cd92f2e7513ef8cc780bd442b312a9a3650a0232a34b
diff --git a/sys-libs/tdb/tdb-1.4.4.ebuild b/sys-libs/tdb/tdb-1.4.4.ebuild
new file mode 100644
index 000000000000..c91a2b724ca3
--- /dev/null
+++ b/sys-libs/tdb/tdb-1.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Simple database API"
+HOMEPAGE="https://tdb.samba.org/"
+SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.2
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+src_prepare() {
+	default
+	python_fix_shebang .
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=()
+	if ! multilib_is_native_abi || ! use python ; then
+		extra_opts+=( --disable-python )
+	fi
+
+	waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
+	unset MAKEOPTS
+	waf-utils_src_compile
+}
+
+multilib_src_test() {
+	# the default src_test runs 'make test' and 'make check', letting
+	# the tests fail occasionally (reason: unknown)
+	emake check
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 8cd97db136cd..dba493ee156c 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,3 +1,5 @@
 DIST tevent-0.10.2.tar.gz 800731 BLAKE2B 5ea6b83378b04dbe1666432db0dbd4c0df2e6b0bf5ebcc8ec4ec9bdeb834efec75c87b2019dc78c691aba6c4f6467394101febd6010f106046a1fb8848e27405 SHA512 1da8f28898f35daab515892b880d1de601062cc3e2b2570cd62e6913df17b0195a05acb7b484c628cddc0eb8b0cde893105ede3feb32bc5764e7d25684f332ba
+DIST tevent-0.11.0.tar.gz 866327 BLAKE2B 9e6e958597e21c0d228346aa102987f89bb6630a5661cef21b908735469a59e7b4f46bc4473e9c25fe636913a1eebc1f26234448c09739ad812cd3ce97bf5048 SHA512 740346b19bf290ff31b0c1b36e232021b8ad107c3ce27e0e8b1ec1a77485214b07a9b7837ba57f3650a50e4c04f530674e486b5fa4d118a1778259be63b49790
 EBUILD tevent-0.10.2.ebuild 1623 BLAKE2B 454a90d64c58f9007774de91e3156791206da74101d3f459ab62c617691d9cc133b03f48d3bcdc8c1849c89669d62cdf650f3591be8271b0b2cb2db15b034290 SHA512 851b32b81404c903406fa697109815d473228d0e0a2e23b24304d24f47822fda5c02959370a98552737e37735ef2c26bc37ff9a8ae9ce6a34e2a90b3ab1308af
+EBUILD tevent-0.11.0.ebuild 1656 BLAKE2B 582f0ec98a19bfe5040afd37b971c0bf767d1070af6376bc1ab16c6d03bf65a91f2d6d504f36935ec219a340534b0897607f2cdf171894e988dc8e8fdd802fc3 SHA512 f411d5d167f65cd63c8e96317bb32b5e12ce33b6373e8279ed506b6dcef7abcacb35dd3182dc556f8a948d9cf90a7e6cffb9c18f0c05af38856b04e01c1f4210
 MISC metadata.xml 238 BLAKE2B d8df54241ec3e8c56cd49149dcf4a8eef0eefcd7eacce01bb0f1d5dcdc492b45d25f9388caf582e979dc9eb283ba88b8ab5ee28812072280566b797180eb649e SHA512 f8a66c9ca8ad8a98b25a6f0280652c9262ae5c23cc9cf813bd304722b80e404585689a9b618de7f3d57be64ec28e83d9aa8b84036dcdb2a91117f454b1ef7e93
diff --git a/sys-libs/tevent/tevent-0.11.0.ebuild b/sys-libs/tevent/tevent-0.11.0.ebuild
new file mode 100644
index 000000000000..4539b95bc280
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.11.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="https://tevent.samba.org/"
+SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="elibc_glibc python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
+	python? (
+		${PYTHON_DEPS}
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/cmocka-1.1.3
+	elibc_glibc? (
+		net-libs/libtirpc[${MULTILIB_USEDEP}]
+		|| (
+			net-libs/rpcsvc-proto
+			<sys-libs/glibc-2.26[rpc(+)]
+		)
+	)
+"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--bundled-libraries=NONE \
+		--builtin-libraries=NONE \
+		$(multilib_native_usex python '' '--disable-python')
+}
+
+multilib_src_compile() {
+	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
+	unset MAKEOPTS
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	multilib_is_native_abi && use python && python_domodule tevent.py
+}
+
+multilib_src_install_all() {
+	insinto /usr/include
+	doins tevent_internal.h
+}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 2af1423c030e..5c99c53b7ef4 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index a331584ed52d..4ba0c6aa2738 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,7 +1,6 @@
-AUX upower-0.99.9-pending-charge1.patch 1351 BLAKE2B 719581956d7bed9efb148bb84a83b0b90cabadf1113fece846416b980c1919895bd1e85575bba0198d856d5a39209ab7c919e2142361ee2cf6361f631f312fc9 SHA512 f100c9cb06c8407fdb8cc2ea27651f3e1eb563e40b98b2a0d7589577652d5c14d824a4de3d503cb858fa5d4360993f63da49cd5f4c8caaec43fde4f20e075f47
-AUX upower-0.99.9-pending-charge2.patch 2016 BLAKE2B 87a3078acf6c95dd8237f894aa25dbf803d42f766682e3e53f5ec30fcd7725178ebab94111945fbf0b4d0e16b656e8723240b14358d1c6e5285086b30da541d2 SHA512 15aa04bcd892feec125508d6a9edb8df98cd5317fce27d9c8907994f1d735be32934c5010566f0a38221ef20b48d8faf73841df6e35447ef0efccdaab371fb0b
+AUX upower-0.99.12-fix-power_now-energy_rate-readings.patch 1636 BLAKE2B e61167d5a1f6b65cdb611f6cf7b9b5879de58d692176079041a785ca6ecf799b728b32a37e0e3ed7cb0ad06e03db2f16c3eac84d3879398f9be8d9f4fff22d72 SHA512 7aa880a8fd6887a0a9e7d118ef7fa2cde59f9d9b1f16dec17ac7ac013346f9e06f9ae55c343b7830b370f500da201cd2b107f8f586f90d4f7b5695fd33389565
 DIST upower-0.99.11.tar.xz 430128 BLAKE2B 77604d02a69de98e4c7b268d11d189aa42ace2d62b982fda9bc41131ce383ede32953ada31eae0bbfd1121600af5863924d48c636e60a28f505a6998dcac227c SHA512 67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803
-DIST upower-0.99.9.tar.xz 448408 BLAKE2B 5fa2436f33c94cffb736d8e3fad433acf58954cf06ccd403a0361214be5afc45d79ea279f3c5c48dcd58b92ccaf995777c95987d1749fd8c8c8958317e439570 SHA512 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f
+DIST upower-0.99.12.tar.xz 423640 BLAKE2B 4c5c6357f0a2f8d721ebae9736912b1871a898c7ce65708626f9a9465cde87036ba6ab8050d97f5b9074d92e2700d8ed1e71b67f43cd6305eb4e89336f1b628f SHA512 9858a0e5f65271522cc5f36b0cd8722a5fb3effba37dbc5b22f08606701d4242ee54329d07460768004a24dc42705a84140ac6d9691afb7f09584b2e61fe3413
 EBUILD upower-0.99.11.ebuild 2105 BLAKE2B c94253f904dba7fa27380996fa645218c34342d55e3b4a43cd38614d60176c3140ae4ac520d4c1ad05ada307f860a373bd8397915c7c644792c3a934b303bd68 SHA512 d778181809780a53677aa234ea64d5c4ba840b9f7ab465a1160d1efc1c4b26427032f1b09739333387406ed62a61cc9626e3e72da756869d0a1707fc8c45d45e
-EBUILD upower-0.99.9-r1.ebuild 2344 BLAKE2B 3b286baaa33786c5964f86e0153900c1614f5ad37f5ecdd0d3d1c9587bd14ca1759169e3f3bab6f71f2347f7c0453f5b4903f6deb935b0ac3c196e21f139f33f SHA512 05292d9d5f90fbc9c0478db5d2b8b96fb17725cdae9411f4d5fd653d27e2402e50c07feb52b373754330e03210dd1f6735b144a5361c9c004c989a1fda19868a
+EBUILD upower-0.99.12.ebuild 2784 BLAKE2B 18938d1b0df3c95ff2adfde2e08b95f3dc6a8df7406dacf3189a74f48afbed79f23ceee21e67f22713a4a9dd178f92be0117121b75f93c236f89b48e82cf74a6 SHA512 4f3df68697b4d1523f3cc1f88ca3119b8373e48225302ed2f87d259a97c0376c409b74eebb31d8775913d1b5f9e3760a6fd404eadabebb005bdc36cc1f2cb260
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/files/upower-0.99.12-fix-power_now-energy_rate-readings.patch b/sys-power/upower/files/upower-0.99.12-fix-power_now-energy_rate-readings.patch
new file mode 100644
index 000000000000..c3dd864a6b1d
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.12-fix-power_now-energy_rate-readings.patch
@@ -0,0 +1,43 @@
+From 2949136b152e94aa3b57da5130bcb9022724debe Mon Sep 17 00:00:00 2001
+From: Philipp Zabel <p.zabel@pengutronix.de>
+Date: Thu, 17 Jun 2021 18:14:53 +0200
+Subject: [PATCH] linux: Fix < 0.01 W energy-rate readings from power_now sysfs
+ property
+
+Currently, if a power supplies' power_now sysfs file reports discharge
+rates < 0.01 W, the code will try to calculate the discharge rate from
+the legacy sysfs files. On new kernels where those don't exist, this
+produces wrong results.
+
+For example, on a dual-battery Thinkpad T450s, while the external
+battery is discharging, the internal battery reports power_now = 0,
+but the corresponding upower energy-rate field incorrectly reads
+about 2.3 W.
+
+This patch fixes the issue by falling back to the legacy code only if
+the legacy current_now sysfs file exists.
+
+Closes: #7, #44
+---
+ src/linux/up-device-supply.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
+index 3ebbd88..4236ce4 100644
+--- a/src/linux/up-device-supply.c
++++ b/src/linux/up-device-supply.c
+@@ -682,8 +682,9 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply,
+ 	state = up_device_supply_get_state (native);
+ 
+ 	/* this is the new value in uW */
+-	energy_rate = fabs (g_udev_device_get_sysfs_attr_as_double_uncached (native, "power_now") / 1000000.0);
+-	if (energy_rate < 0.01) {
++	if (g_udev_device_has_sysfs_attr (native, "power_now")) {
++		energy_rate = fabs (g_udev_device_get_sysfs_attr_as_double_uncached (native, "power_now") / 1000000.0);
++	} else {
+ 		gdouble charge_full;
+ 
+ 		/* convert charge to energy */
+-- 
+GitLab
+
diff --git a/sys-power/upower/files/upower-0.99.9-pending-charge1.patch b/sys-power/upower/files/upower-0.99.9-pending-charge1.patch
deleted file mode 100644
index 9ce91c10a66e..000000000000
--- a/sys-power/upower/files/upower-0.99.9-pending-charge1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a074a5462ab9749ad4aaca52e0202602897660aa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita@endlessm.com>
-Date: Thu, 1 Nov 2018 14:45:28 -0700
-Subject: [PATCH] daemon: Make comment more succinct
-
-This will help make it more clear when adding an extra state on the
-following commit. It also makes the language consistent between the
-different lines. There are no changes on the meaning of these lines nor
-any functional changes on this commit.
----
- src/up-daemon.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/up-daemon.c b/src/up-daemon.c
-index 1a5dddc..95fff6b 100644
---- a/src/up-daemon.c
-+++ b/src/up-daemon.c
-@@ -209,9 +209,9 @@ up_daemon_update_display_battery (UpDaemon *daemon)
- 		    power_supply == FALSE)
- 			continue;
- 
--		/* If one battery is charging, then the composite is charging
--		 * If all batteries are discharging, then the composite is discharging
--		 * If all batteries are fully charged, then they're all fully charged
-+		/* If one battery is charging, the composite is charging
-+		 * If all batteries are discharging, the composite is discharging
-+		 * If all batteries are fully charged, the composite is fully charged
- 		 * Everything else is unknown */
- 		if (state == UP_DEVICE_STATE_CHARGING)
- 			state_total = UP_DEVICE_STATE_CHARGING;
--- 
-2.18.1
-
diff --git a/sys-power/upower/files/upower-0.99.9-pending-charge2.patch b/sys-power/upower/files/upower-0.99.9-pending-charge2.patch
deleted file mode 100644
index a79ebac7ed18..000000000000
--- a/sys-power/upower/files/upower-0.99.9-pending-charge2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a074631c0b1748c8a791c4f0dad99da75805a328 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita@endlessm.com>
-Date: Mon, 15 Oct 2018 17:05:27 -0700
-Subject: [PATCH] daemon: Consider pending-charge when calculating the display
- state
-
-Without this change if all batteries in the system are in the
-pending-charge state, the display device state is set to unknown, and
-its icon to battery-missing-symbolic.
-
-This change makes the pending-charge state be considered when
-calculating the DisplayDevice state, setting it to pending-charge if at
-least one battery in the system is pending-charge and no other is
-charging or discharging.
-
-Closes: #81
-Closes: #19
----
- src/up-daemon.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/up-daemon.c b/src/up-daemon.c
-index 95fff6b..690f379 100644
---- a/src/up-daemon.c
-+++ b/src/up-daemon.c
-@@ -210,14 +210,18 @@ up_daemon_update_display_battery (UpDaemon *daemon)
- 			continue;
- 
- 		/* If one battery is charging, the composite is charging
--		 * If all batteries are discharging, the composite is discharging
-+		 * If all batteries are discharging or pending-charge, the composite is discharging
- 		 * If all batteries are fully charged, the composite is fully charged
-+		 * If one battery is pending-charge and no other is charging or discharging, then the composite is pending-charge
- 		 * Everything else is unknown */
- 		if (state == UP_DEVICE_STATE_CHARGING)
- 			state_total = UP_DEVICE_STATE_CHARGING;
- 		else if (state == UP_DEVICE_STATE_DISCHARGING &&
- 			 state_total != UP_DEVICE_STATE_CHARGING)
- 			state_total = UP_DEVICE_STATE_DISCHARGING;
-+		else if (state == UP_DEVICE_STATE_PENDING_CHARGE &&
-+			 (state_total == UP_DEVICE_STATE_UNKNOWN || state_total == UP_DEVICE_STATE_PENDING_CHARGE))
-+			state_total = UP_DEVICE_STATE_PENDING_CHARGE;
- 		else if (state == UP_DEVICE_STATE_FULLY_CHARGED &&
- 			 state_total == UP_DEVICE_STATE_UNKNOWN)
- 			state_total = UP_DEVICE_STATE_FULLY_CHARGED;
--- 
-2.18.1
-
diff --git a/sys-power/upower/upower-0.99.12.ebuild b/sys-power/upower/upower-0.99.12.ebuild
new file mode 100644
index 000000000000..7701fb98f1cc
--- /dev/null
+++ b/sys-power/upower/upower-0.99.12.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd xdg-utils
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
+HOMEPAGE="https://upower.freedesktop.org/"
+COMMIT="244f5966c58773bbd3b4c507c549560f"
+SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar.xz"
+# No tarball released at the usual location
+#SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # based on SONAME of libupower-glib.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# gtk-doc files are not available as prebuilt in the tarball
+IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2
+	sys-apps/dbus:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	kernel_linux? (
+		dev-libs/libgudev:=
+		virtual/udev
+		ios? (
+			>=app-pda/libimobiledevice-1:=
+			>=app-pda/libplist-2:=
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-devicekit )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+DOCS=( AUTHORS HACKING NEWS README )
+
+PATCHES=( "${FILESDIR}/${P}-fix-power_now-energy_rate-readings.patch" ) # bug 796896
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+}
+
+src_configure() {
+	local backend
+
+	if use kernel_linux ; then
+		backend=linux
+	elif use kernel_FreeBSD ; then
+		backend=freebsd
+	else
+		backend=dummy
+	fi
+
+	local myeconfargs=(
+		--disable-tests
+		--enable-man-pages
+		--libexecdir="${EPREFIX}"/usr/lib/${PN}
+		--localstatedir="${EPREFIX}"/var
+		--with-backend=${backend}
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdutildir="$(systemd_get_utildir)"
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_with ios idevice)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+	keepdir /var/lib/upower #383091
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.99.12; then
+		elog "Support for Logitech Unifying Receiver battery state readout was"
+		elog "removed in version 0.99.12, these devices have been directly"
+		elog "supported by the Linux kernel since version >=3.2."
+		elog
+		elog "Support for CSR devices battery state was removed from udev rules"
+		elog "in version 0.99.12. This concerns the following Logitech products"
+		elog "from the mid 2000s:"
+		elog "Mouse/Dual/Keyboard+Mouse Receiver, Freedom Optical, Elite Duo,"
+		elog "MX700/MX1000, Optical TrackMan, Click! Mouse, Presenter."
+	fi
+}
diff --git a/sys-power/upower/upower-0.99.9-r1.ebuild b/sys-power/upower/upower-0.99.9-r1.ebuild
deleted file mode 100644
index a67c244bb30d..000000000000
--- a/sys-power/upower/upower-0.99.9-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd xdg-utils
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-
-# No tarball released, use the same commit as Fedora
-#SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-COMMIT="2282c7c0e53fb31816b824c9d1f547e8"
-SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-
-# gtk-doc files are not available as prebuilt in the tarball
-IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
-
-COMMON_DEPS="
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.34:2
-	sys-apps/dbus:=
-	introspection? ( dev-libs/gobject-introspection:= )
-	kernel_linux? (
-		dev-libs/libgudev:=
-		virtual/libusb:1
-		virtual/udev
-		ios? (
-			>=app-pda/libimobiledevice-1:=
-			>=app-pda/libplist-1:=
-			)
-		)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPS}
-	doc? ( dev-util/gtk-doc )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	dev-util/intltool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
-
-DOCS=( AUTHORS HACKING NEWS README )
-
-PATCHES=(
-	# daemon: Consider pending-charge when calculating the display state
-	# (from 'master')
-	"${FILESDIR}/${P}-pending-charge1.patch"
-	"${FILESDIR}/${P}-pending-charge2.patch"
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-}
-
-src_configure() {
-	local backend
-
-	if use kernel_linux ; then
-		backend=linux
-	elif use kernel_FreeBSD ; then
-		backend=freebsd
-	else
-		backend=dummy
-	fi
-
-	local myeconfargs=(
-		--disable-static
-		--disable-tests
-		--enable-man-pages
-		--libexecdir="${EPREFIX}"/usr/lib/${PN}
-		--localstatedir="${EPREFIX}"/var
-		--with-backend=${backend}
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdutildir="$(systemd_get_utildir)"
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_with ios idevice)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-	keepdir /var/lib/upower #383091
-}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 1def5b86e504..5c7a362cd933 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/at/Manifest b/sys-process/at/Manifest
index bb977fa50416..c3b767d8403d 100644
--- a/sys-process/at/Manifest
+++ b/sys-process/at/Manifest
@@ -7,11 +7,7 @@ AUX at-3.1.8-more-deny.patch 175 BLAKE2B 622b50e7c03d738602a95e0465bd3dd4c1152e0
 AUX at.pamd-3.1.13-r1 208 BLAKE2B 725552bae7c0a3d5d10b5bf66ee5460a33b415f8316b798c650297ade2bd98a14fdf9533c0129dbfcabc76d35652d9b5ef5789fd7fd7ac42d43f8e480569c176 SHA512 7ebbeed1fb9c9d8c26f677956ae3fb5d947aa8e1f1dbc2c576b1ee4b2d8c92d206ad361d61772e6a28b40e747ad009d16ed1d3516fa2549b1f01f6f0886612b8
 AUX atd.confd 214 BLAKE2B 73cb9a8efa568f11620029521e93b7a2e424eeb860d462663ea4eabbe236b386c54392824b224e3de1d245ef40fef503477502531b1d95c40def08710f788772 SHA512 12f1423e2d0841a98ce506ebbf24280bc634b76a2b15cb1c6e12285fc7fd859428380841754ab2e3a0b7c3d7cc9957b53d4e018651ef097ca1af83f92cfa130a
 AUX atd.rc8 289 BLAKE2B f1ef6e087b1eee30b272a88feeb7f45ec1e4bc78f3c016b48c0ff353e6171a6e73eb3b3e043e5b8500864bab07aa419928a8e0c132bb56f18975b800d51534dc SHA512 a8517b4a754ad096aa72d975b556925c566963657402ffe0c00ed3fbc22a84f6c32917c8d2021e6244339d171352e429d1c360ad6c500de6c60a444e07d006f3
-AUX atd.service 215 BLAKE2B cf87d9dec0b5a24c5c94b41f2c7aae52c369b9f05ea77a09d2853c87c5746b00f0d980559560441e8a1a0a262734bb534987b73802c5e670ee491e8c03f1b280 SHA512 8795fe73ea9837b98732018d6e154797e1d31e4696416c910e4637ffc2c516626fed836d2a0f571a890b55c513f07d69b3c9c8d73d1070c6df88a8e9e1812902
-DIST at_3.1.23.orig.tar.gz 126284 BLAKE2B b2af9dfa4ed87ee93489b98acae6b7eb005d6db7e2401ec7d4d21353af636b232d57e92e4cd6e81f52115aa9d29fadf440809a9d77cb1eb5d40d42ec7fe640b0 SHA512 ee5cf5abf32cf1e89746e427d1cc20005ef49fad47db55512c90042a77e86b2c15f5de029c79573bc86ce4aead6ed2d561b89812510aadbc5763f9288b467cfd
-DIST at_3.2.1.orig.tar.gz 127577 BLAKE2B 4e8f4aa889075dcede894062b2926afd7892ef15d4ca5bf855b699d1dab9f49a56fd5bd8da376b178032e70cdef72eba2a7d9d6da577982773351633ce85d003 SHA512 8109b2acf220ffc14ea78e7d5671507e8cad41a163c1d7f96de18aae05c8617071c6306e04446450190f492a65ca31f51ed040fba5719b67625a58f738fc9c9e
+AUX atd.service 172 BLAKE2B 84ff9c4a55ba895e87303f31f124562fa22eff29059c07d2ab3cc81ecdfd742776c389baa80f8ddc25c01220801465218e62f4dd73e77435eb05023c4cc5aa87 SHA512 6ac20de3e0d03f3fd99b302b8de6f8dc5228d0cca3b383d9f6b1f1abe82d8d5f4d7a23a4cae6d710eabd21fc28c568a63c0c802eb6237ca91fa48318b99a6f39
 DIST at_3.2.2.orig.tar.gz 127677 BLAKE2B f4b0e1cd09d1e679d0bcc287462300827d12663927dce1534a74bd4ecd670f903a81cd6147c03b0e55192655c2a99250c27ad0e9892342d91b0279210fb79a64 SHA512 e6f5aeddd89438aadff627d654ebc821a0b0e1a600ebaacc8a5fd3ec2c7c716f593757d00501311736d28f6d4276899667d6901d70836af208ff7d181b5b680f
-EBUILD at-3.1.23-r1.ebuild 2345 BLAKE2B ff5875022ee0f9832492cd1a5b3e1c5d31f8cfc0c8a1247c90381ab4271aaefcca310436b0df30b8cb57aa5c1b4937c735c8bd0459d06bf58d4283a97c6d8d34 SHA512 7557c33f4e574451a7933e2d9320d7aedc2ccb21241110d9b67753027c5b3e2b5ac26eae5f52613c68590b7e0dfb0464b5629ba48566eefb0278e6c2c051c884
-EBUILD at-3.2.1-r1.ebuild 2519 BLAKE2B 19e6d644eee4c4d337b5add0774464abcce526741e0e8122e9492ca8a4d023290fa89e32504d7c988767c826fa1d782b26e2dbb1febe7fd094d3acce177bfa87 SHA512 f600308040e4d6fb7b9eebb80eff56846f1215853a7d935926e6375d5e64e48e95d0b728c0c10452d6496c1bd889fdea1d319ed29ec70a3b187d003e852b2201
-EBUILD at-3.2.2-r1.ebuild 2458 BLAKE2B 6894ede799696ca08f3142af2253080166e257bf24e16ab085d0371b033e5978cad34bf2e5c5306c9e39afa381aa8db1d5bc462455cca581d646cd0ea4678b6b SHA512 070a035f05e2407b7276c79a16bfe64fa32de837ab5765e564acbf727008e0c5243dcdeadab38928132f963285bb167919e3ef529aff1857c286224897cc4fe8
+EBUILD at-3.2.2-r2.ebuild 2458 BLAKE2B 6894ede799696ca08f3142af2253080166e257bf24e16ab085d0371b033e5978cad34bf2e5c5306c9e39afa381aa8db1d5bc462455cca581d646cd0ea4678b6b SHA512 070a035f05e2407b7276c79a16bfe64fa32de837ab5765e564acbf727008e0c5243dcdeadab38928132f963285bb167919e3ef529aff1857c286224897cc4fe8
 MISC metadata.xml 364 BLAKE2B d51cc643a5646e05725088bafb99711097593b9c7e6c78207dd6668c8c4c2830964dcceb5c66cb60b8cde463ad14e968c4d2950326e86c931e84199a3efb909a SHA512 5c5d603a57b16255de5c049c237206242c440c61ee03237b85f7909e434f877fe84082f2989d6b70646c106a4b97ef380f6fbc87ead1fbca0a3886c38d65c57d
diff --git a/sys-process/at/at-3.1.23-r1.ebuild b/sys-process/at/at-3.1.23-r1.ebuild
deleted file mode 100644
index 1c90b968d05a..000000000000
--- a/sys-process/at/at-3.1.23-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam user systemd
-
-DESCRIPTION="Queues jobs for later execution"
-HOMEPAGE="https://packages.qa.debian.org/a/at.html"
-SRC_URI="mirror://debian/pool/main/a/at/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="pam selinux"
-
-DEPEND="virtual/mta
-	>=sys-devel/autoconf-2.64
-	sys-devel/bison
-	>=sys-devel/flex-2.5.4a
-	pam? ( sys-libs/pam )"
-RDEPEND="virtual/mta
-	virtual/logger
-	selinux? ( sec-policy/selinux-at )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.8-more-deny.patch
-	"${FILESDIR}"/${PN}-3.1.14-Makefile.patch
-	# fix parallel make issues, bug #244884
-	"${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch
-	"${FILESDIR}"/${PN}-3.1.13-configure.in-fix-PAM-automagick-dep.patch
-	# Fix parallel make issue (bug #408375)
-	"${FILESDIR}"/${PN}-3.1.13-parallel-make-fix.patch
-	"${FILESDIR}"/${PN}-3.1.13-getloadavg.patch
-)
-
-pkg_setup() {
-	# Cannot be moved into pkg_preinst!
-	enewgroup at 25
-	enewuser at 25 -1 /var/spool/at/atjobs at
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local my_conf=(
-		--sysconfdir=/etc/at
-		--with-jobdir=/var/spool/at/atjobs
-		--with-atspool=/var/spool/at/atspool
-		--with-etcdir=/etc/at
-		--with-daemon_username=at
-		--with-daemon_groupname=at
-		$(usex pam '' --without-pam)
-		$(use_with selinux)
-	)
-	econf ${my_conf[@]}
-}
-
-src_install() {
-	emake install IROOT="${D}"
-
-	newinitd "${FILESDIR}"/atd.rc8 atd
-	newconfd "${FILESDIR}"/atd.confd atd
-
-	if use pam; then
-		newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
-	fi
-
-	# Preserve existing .SEQ files (bug #386625)
-	local seq_file="${EROOT}/var/spool/at/atjobs/.SEQ"
-	if [ -f "${seq_file}" ] ; then
-		einfo "Preserving existing .SEQ file (bug #386625)."
-		cp -p "${seq_file}" "${ED}"/var/spool/at/atjobs/ || die
-	fi
-
-	systemd_dounit "${FILESDIR}/atd.service"
-	keepdir /var/spool/at/atspool
-}
-
-pkg_postinst() {
-	einfo "Forcing correct permissions on /var/spool/at"
-	local atspooldir="${EROOT}/var/spool/at"
-	chown at:at "${atspooldir}/atjobs"
-	chmod 1770  "${atspooldir}/atjobs"
-	chown at:at "${atspooldir}/atjobs/.SEQ"
-	chmod 0600  "${atspooldir}/atjobs/.SEQ"
-	chown at:at "${atspooldir}/atspool"
-	chmod 1770  "${atspooldir}/atspool"
-}
diff --git a/sys-process/at/at-3.2.1-r1.ebuild b/sys-process/at/at-3.2.1-r1.ebuild
deleted file mode 100644
index ec5f18b84236..000000000000
--- a/sys-process/at/at-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam user systemd
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Queues jobs for later execution"
-HOMEPAGE="http://blog.calhariz.com/index.php/tag/at https://packages.qa.debian.org/a/at.html"
-SRC_URI="http://software.calhariz.com/at/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/a/at/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam selinux"
-
-DEPEND="virtual/mta
-	>=sys-devel/autoconf-2.64
-	sys-devel/bison
-	>=sys-devel/flex-2.5.4a
-	pam? ( sys-libs/pam )"
-RDEPEND="virtual/mta
-	virtual/logger
-	selinux? ( sec-policy/selinux-at )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.8-more-deny.patch
-	"${FILESDIR}"/${PN}-3.1.14-Makefile.patch
-	# fix parallel make issues, bug #244884
-	"${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch
-	"${FILESDIR}"/${PN}-3.1.13-configure.in-fix-PAM-automagick-dep.patch
-	# Fix parallel make issue (bug #408375)
-	"${FILESDIR}"/${PN}-3.1.13-parallel-make-fix.patch
-	"${FILESDIR}"/${PN}-3.1.13-getloadavg.patch
-)
-
-pkg_setup() {
-	# Cannot be moved into pkg_preinst!
-	enewgroup at 25
-	enewuser at 25 -1 /var/spool/at/atjobs at
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local my_conf=(
-		--sysconfdir="${EPREFIX}"/etc/at
-		--with-jobdir="${EPREFIX}"/var/spool/at/atjobs
-		--with-atspool="${EPREFIX}"/var/spool/at/atspool
-		--with-etcdir="${EPREFIX}"/etc/at
-		--with-daemon_username=at
-		--with-daemon_groupname=at
-		$(usex pam '' --without-pam)
-		$(use_with selinux)
-	)
-	econf ${my_conf[@]}
-}
-
-src_install() {
-	emake install IROOT="${D}"
-
-	newinitd "${FILESDIR}"/atd.rc8 atd
-	newconfd "${FILESDIR}"/atd.confd atd
-
-	if use pam; then
-		newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
-	fi
-
-	# Preserve existing .SEQ files (bug #386625)
-	local seq_file="${EROOT}/var/spool/at/atjobs/.SEQ"
-	if [[ -f "${seq_file}" ]] ; then
-		einfo "Preserving existing .SEQ file (bug #386625)."
-		cp -p "${seq_file}" "${ED}"/var/spool/at/atjobs/ || die
-	fi
-
-	systemd_dounit "${FILESDIR}/atd.service"
-	keepdir /var/spool/at/atspool
-}
-
-pkg_postinst() {
-	einfo "Forcing correct permissions on /var/spool/at"
-	local atspooldir="${EROOT}/var/spool/at"
-	chown at:at "${atspooldir}/atjobs"
-	chmod 1770  "${atspooldir}/atjobs"
-	chown at:at "${atspooldir}/atjobs/.SEQ"
-	chmod 0600  "${atspooldir}/atjobs/.SEQ"
-	chown at:at "${atspooldir}/atspool"
-	chmod 1770  "${atspooldir}/atspool"
-}
diff --git a/sys-process/at/at-3.2.2-r1.ebuild b/sys-process/at/at-3.2.2-r2.ebuild
index d2bd7c31d8a6..d2bd7c31d8a6 100644
--- a/sys-process/at/at-3.2.2-r1.ebuild
+++ b/sys-process/at/at-3.2.2-r2.ebuild
diff --git a/sys-process/at/files/atd.service b/sys-process/at/files/atd.service
index 164fc2c0cb74..5e5898e0fa16 100644
--- a/sys-process/at/files/atd.service
+++ b/sys-process/at/files/atd.service
@@ -6,8 +6,6 @@ After=networking.target
 Type=forking
 ExecStart=/usr/sbin/atd
 PIDFile=/run/atd.pid
-StandardOutput=syslog
-StandardError=syslog
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index c33315b4be79..549b5a2ca67d 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -9,8 +9,10 @@ AUX auditd-init.d-2.4.3 2054 BLAKE2B 20e68ab676c925b8567a7e9a12d2ac055fd90477cbb
 DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B 60d8b813f57338ce267a09913e68a0726acf5cf878cd2893fe2493f80d2b0ac1e0504dc7a72e85134ae2597b268cb1772b4e7c6c2f19149fc905f6928e2db47f SHA512 78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101
 DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4 SHA512 7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a
 DIST audit-3.0.1.tar.gz 1180286 BLAKE2B f29687ebc76f4eb88184cce1a3da0b8ca4464b2f81f56d71048ac4a64a713f33d6964e46e78b73c72b6ac2495f80114866773b3b86753c1d0dead25df73f7c43 SHA512 ad2897c9f539681f0f65b08cd0e650c528957fd4799755c2bcc47f869e04272aad31684c46847124d7b42dde243a16ba2754936890189610814c7007c0381d8c
+DIST audit-3.0.2.tar.gz 1184356 BLAKE2B 13f76e9c40bc8ffc53b5499076b5cb75c2690d95414a0e1942fa9725b9617f10327a2ee676dc10cc46ba76d223f77509d305bcd22344b678443b7707cc6d10cd SHA512 9e831ed6f30ac7d58f028cede97adba431bde18dfd9045c19f5e03eff52cd28db3a6792e5969f555ce51aa562662b59fa5cc5265586c6acf0b3aa1feae4d720f
 DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617 SHA512 b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88
 EBUILD audit-2.8.5-r2.ebuild 6395 BLAKE2B 262e839797410f22028128fa7ac232094e19c7a58557b9ff8c354599c409fe1c91fc94ba66ed9500f7ff90df1734d6d6354d7d22601ed0a5ad1bc56ebd1222bb SHA512 0695411810fd45c27d4b9e389f7807dc8d31acddc1a50d02407dc2b5bafe9cda36c902c8b86f6b4b564281e9b4327001a0ce0902bd6396f3dd4f06032fcae90a
 EBUILD audit-3.0.1.ebuild 4262 BLAKE2B 95c293ae585d4c8e5decbf05938012ab0fab3c4dafc6348977107043f6e02252947eec36c7d0fe446c872caf7143b56fa70641e8a399a7e0b4a467d6ccb02571 SHA512 fff5966e9deeaca3387d1de975e8e934c7dcce303fa6a1ea6a2ab60fe92a37e16eaf2af8b3a65ddd12c0ba20267a785cf57f0c00e31a710e86b3949f588586e2
+EBUILD audit-3.0.2.ebuild 4215 BLAKE2B 1c349d818cd2d82a4956f61ff927a1da22cc3cfce0933b5f23a4f406d33ff4cfdb8bc54f779c8c7621f7e8ed53fb7d3447cf13f3584e9b9c6fd3c7c6a00d34e9 SHA512 34d842ff81a353ff5b5dd4ea96d83a935b394de4d10aabbe3b4fc9ab6a5c773166406c456f861acac6fab2b9fda781d94df8d766072ed566e3e6c87fc2fe0795
 EBUILD audit-3.0.ebuild 4185 BLAKE2B 94e5e7ea609ef9aedd3b8d464d36eaceda40db0d966e78a12f6c0cec4ea957007b761d8aece1d45bc3dcacb74d1696fb74926e8da3527c8c76fc7e76189fba7e SHA512 5426f21df0fc7bc6f96b3e77fe5073d01da2839ea83a591c327e3094b59d0878769c6b73cef20b44e6e4308a0ea266776cc1dbd1fcbb0645a555493a0bbfa8ed
 MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-3.0.2.ebuild b/sys-process/audit/audit-3.0.2.ebuild
new file mode 100644
index 000000000000..861a82aa1f1b
--- /dev/null
+++ b/sys-process/audit/audit-3.0.2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools multilib multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
+SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="gssapi ldap python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Testcases are pretty useless as they are built for RedHat users/groups and kernels.
+RESTRICT="test"
+
+RDEPEND="gssapi? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	sys-libs/libcap-ng
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.34" # This is linux specific.
+BDEPEND="python? ( dev-lang/swig:0 )"
+
+CONFIG_CHECK="~AUDIT"
+
+src_prepare() {
+	# audisp-remote moved in multilib_src_install_all
+	sed -i \
+		-e "s,/sbin/audisp-remote,${EPREFIX}/usr/sbin/audisp-remote," \
+		audisp/plugins/remote/au-remote.conf || die
+
+	# Disable installing sample rules so they can be installed as docs.
+	echo -e '%:\n\t:' | tee rules/Makefile.{am,in} >/dev/null
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local -a myeconfargs=(
+		--sbindir="${EPREFIX}/sbin"
+		$(use_enable gssapi gssapi-krb5)
+		$(use_enable ldap zos-remote)
+		$(use_enable static-libs static)
+		--enable-systemd
+		--without-golang
+		--without-python
+		--without-python3
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python; then
+		python_configure() {
+			mkdir -p "${BUILD_DIR}"
+			pushd "${BUILD_DIR}" &>/dev/null || die
+			ECONF_SOURCE=${S} econf "${myeconfargs[@]}" --with-python3
+			popd &>/dev/null || die
+		}
+		python_foreach_impl python_configure
+	fi
+}
+
+src_configure() {
+	tc-export_build_env BUILD_{CC,CPP}
+	local -x CC_FOR_BUILD="${BUILD_CC}"
+	local -x CPP_FOR_BUILD="${BUILD_CPP}"
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+
+		local native_build="${BUILD_DIR}"
+		python_compile() {
+			emake -C "${BUILD_DIR}"/bindings/swig top_builddir="${native_build}"
+			emake -C "${BUILD_DIR}"/bindings/python/python3 top_builddir="${native_build}"
+		}
+		use python && python_foreach_impl python_compile
+	else
+		emake -C common
+		emake -C lib
+		emake -C auparse
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install
+
+		local native_build="${BUILD_DIR}"
+		python_install() {
+			emake -C "${BUILD_DIR}"/bindings/swig DESTDIR="${D}" top_builddir="${native_build}" install
+			emake -C "${BUILD_DIR}"/bindings/python/python3 DESTDIR="${D}" top_builddir="${native_build}" install
+			python_optimize
+		}
+		use python && python_foreach_impl python_install
+
+		# things like shadow use this so we need to be in /
+		gen_usr_ldscript -a audit auparse
+	else
+		emake -C lib DESTDIR="${D}" install
+		emake -C auparse DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS ChangeLog README* THANKS
+	docinto contrib
+	dodoc contrib/avc_snap
+	docinto contrib/plugin
+	dodoc contrib/plugin/*
+	docinto rules
+	dodoc rules/*rules
+
+	newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
+	newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+	[ -f "${ED}"/sbin/audisp-remote ] && \
+	dodir /usr/sbin && \
+	mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
+
+	# Gentoo rules
+	insinto /etc/audit
+	newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
+	doins "${FILESDIR}"/audit.rules.stop*
+
+	# audit logs go here
+	keepdir /var/log/audit
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# Security
+	lockdown_perms "${ED}"
+}
+
+pkg_postinst() {
+	lockdown_perms "${EROOT}"
+}
+
+lockdown_perms() {
+	# Upstream wants these to have restrictive perms.
+	# Should not || die as not all paths may exist.
+	local basedir="$1"
+	chmod 0750 "${basedir}"/sbin/au{ditctl,ditd,report,search,trace} 2>/dev/null
+	chmod 0750 "${basedir}"/var/log/audit 2>/dev/null
+	chmod 0640 "${basedir}"/etc/audit/{auditd.conf,audit*.rules*} 2>/dev/null
+}
diff --git a/sys-process/below/Manifest b/sys-process/below/Manifest
new file mode 100644
index 000000000000..aa3a3c00b960
--- /dev/null
+++ b/sys-process/below/Manifest
@@ -0,0 +1,206 @@
+DIST ahash-0.6.3.crate 53912 BLAKE2B 65fea8e66df2d6c29f2173b5c01b8df1ba41a2bc4b03b3a2950b84f81a099e4cee004bcacc296603f0a4b2afacf7faf77cdec56e6bb6d8ae0d7c55e802b8f73a SHA512 9d7b31b6da2999757f64d7963dcc9af946a70bac7b528ca103dad992a8e14f643e1c51843c77256919403b470b9591fab0c476bb511197a5608645c0e3ec2dc5
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
+DIST array-macro-1.0.5.crate 7610 BLAKE2B c6017a43affe36d0cfcb65659828a0ead9c380822c873c0d65a81f09dd036f7a0424b1a0be46e95196dd1ff72cb60cdf10d9bfc85455f2e1b49fe75b5549bb10 SHA512 ff17096ec140d91da52348bc40f5539e2eb6431ac8189a0da13deaf8892470f60ab1c07ffee210780abb53b342f894981d7c6acadefe0714e150363e20c8a00e
+DIST async-trait-0.1.50.crate 25321 BLAKE2B a5742a3496530b52b32b61aaab483d1ea066119c67290162fbfa2d45c47318fef2d9428c4bd60427ac2e7ee62575f54f46c61c55042eccef3868408d07e3a958 SHA512 0f2694fdce91f28041e6afdff1be574f19665ff874337b24322214393ba58a0b16dce5b4a6e0d0e5b6881ffbf071aa117c90210322bb4397124d16e58d63de13
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST below-0.2.0.tar.gz 722158 BLAKE2B 4affc0070074d51bcfde1129e1cbf8fabf1c5d453c22be52e1dd07270c31499d13cfefb605c1ed24614487d75d19f15d56d56325e7762b29853fbb4932dedbbb SHA512 612ebdfdaf4c3c34c346cc59ec12eb401d658f6f61005e0cb65576484f23ef163a0bd20253dbadee177465adec7537fbbb62f9c9be2e1d6ec435a5b1fd758d95
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST bytes-0.5.6.crate 46291 BLAKE2B 6d33ab47d04f2e469db2add31db118f95cad53002be7969738923d62a4fe3605ccbe9fbcae6d8741310c543625e80d9adac7d9e9fed01b71cb3943ddd015d920 SHA512 a1caa1f58754f4d2e54b8df8d0ca0083ee5282f5e4d3bb5b1735022933dd2e66fb3f39c7a82216bf7a7e29591695c2e10c8b7144c83ac598e34193f2425a32cc
+DIST bytes-1.0.1.crate 48142 BLAKE2B 3ffe07c5429d7d2df821c04325b8dc84b343c634b4699e9c08b07181e741c06233a0501d987b95f513be57ac169537bd0812defd118305e0648ef41f6802d19a SHA512 885d3229e51c0deffe06824e81e8a016e3244106e7ed382a721a938cd2e69fcad7f5e757f95cb07ee1be83de04fcf98f9774f8f2e07aaa9a1ff068eaabf2fe87
+DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
+DIST cargo_metadata-0.12.3.crate 16789 BLAKE2B f8556eb5a5925201654dab0eb5b9db6a7c2f2a179e1e2243ad7df8fb037e01509da939f22fd848e8c5e3f35f546ded1d43dfeddce3795eb9b4a84ebf135c58a1 SHA512 fc67003f014d6b13b12d8a897168665dbafed7516662bce53bff3dec75892a930f602a4ddf9e2be44fdbdb77b4f2641c0adb116be31929142c3d4a2e6cee4e1f
+DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
+DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
+DIST crossterm-0.19.0.crate 104572 BLAKE2B 13b341870516c5ce4f3ac1d4f40567a2a465d65f9dbe9f627821bd6dde994fa5f8d9802a1b42f19ff91d5511ef7d03a0b62361fe8addbb18e74c624dbe66c9e9 SHA512 c46c095d73be48a3c1875806547ba708a40abfc8e5cd89514162e0d1636675c4f4e2857ac3b4b32239d14f7ab57a61018b6a919160b2136ae761dbbde726b932
+DIST crossterm_winapi-0.7.0.crate 15187 BLAKE2B 5407aca29ccb36473b34527d977fd3fe9d190d2dd940da7077535351458fc0a06af114c145a0f3e741402f2df98a98605a8fb02e2e07c5bb107679a24260fc96 SHA512 5efbe7992b4a19725b5992e0b29a77673e8ecc03d28da35580a5cddaeb32b7e30c7bdb53a2392ebb5b1218617045c306d78451f109d5b836f0e00dcab59e0dfd
+DIST cursive-0.16.3.crate 28536 BLAKE2B 92b519931620ee0c98180bc9cd74dfd325cb8ff464a6b0f59c0e72b8c059396ae17afc8aaca9b8ad35999868606d2500c0066e62cb86a7e83d2da9fcb82672f6 SHA512 ba70f3bdc96886c031c854218332bc275e0a72a092f51857fa52dda166db9b03aabbdbb9a320f895772f059ddaa03f38cb510b2750f04c1ace091bd79aa7dc46
+DIST cursive_buffered_backend-0.5.0.crate 6279 BLAKE2B 5d770cb19fdffc57cad5c44f2d500dbdc774fa7bc330416a477032f3fb3dd472d3260347d75ecfc43d1bd9df4698662208119e9ab224125a1a07de74e2726a01 SHA512 5128c6cc87aacbfe72cc3bf68b02e7b970367f10b3f2609523d1fea5012f9bc06e639ef9d7c9381b3f26ee254295042b0a5cad858461524502ece962490827d6
+DIST cursive_core-0.2.2.crate 147357 BLAKE2B afa7fc14cd76bfdfee17cbd847d0a3fa59b0e0ad4f91fb0f83cc5afc398817c3e97570087bd2735c8be6a5217d281aecc07e7504665d76c4a11ac99a2c7ac838 SHA512 24418b74c02de0cf0a5b95108425933201e45ca64a307b8bdf3c360d257add6f31edd5fc2ae24d2f91e5725b982a8f45d3a06f3d8661651ce924f91497c84da8
+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 derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
+DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
+DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
+DIST enum-map-0.6.4.crate 9477 BLAKE2B 49d4b3da2fad85876be96d3c3f0af465b37ff025544f8c0d7c65566f1746883f38ba25991200d6a3ee7547728545eb751d111dfceff3fcdd5a215d517eba02c8 SHA512 8b87df558b41a93e11e2c1ec2a22c0993d0ef353a9925cb363559e9252ea3daee3239537a4d86a59211820047e9eb85085b8018b0be1dedb49db89b08b1f87b0
+DIST enum-map-derive-0.4.6.crate 2217 BLAKE2B c7eb6d2ab31516063c5a0628b5493ce16f1eab6dfab586b8192b06d9cc04a3c35d31e1ce215832fa9f51fd924da75b72bd6fdf6a1eb816dff5e3b4980c1458fe SHA512 fbace5d639c0bf1f4444a12686a5b5cf05b7a6c50d552cade8491db5c503b0e11da2d8bfbcf24fec66486e22a5627e22264f9bad5417b6908948398b783cf847
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST futures-0.1.31.crate 157731 BLAKE2B bd1c51f7b5c6018547d1aee3ec550fa55ca955b48c04c8e9e91e5aa944540fa69fe590d2296085d7e772c7aaac37dce00624323bd6e31f92af269dcdbf30d511 SHA512 4be7199261201ef4dcdac5a5a237a70eee33d8fad9a81f76d739f4fc7ad39c87fb2f4719ed7e7a7bc5773c5b51196e4aa4ced5375292198c8d89a03f1692b341
+DIST futures-0.3.15.crate 46425 BLAKE2B f3885930da0f5d57cfa80c42e1805bca3be6ce20247bceb827862d1b9f25e2770da050ce89a5043884c63cddbcdf415306e39d32b8a1cbe6c6ae16563211c114 SHA512 75a9f0f16c693a1a24d5aaff57aba72abf4f2cd74cb335d905a42e31b9ea20ea0e8fb24e4685d39239f3b7df8a78b13944c04f208798f43249db5e8a36a7affb
+DIST futures-channel-0.3.15.crate 31867 BLAKE2B 4dfffcba38e26f7805b55e09413e114976e205507f21454eda084ac975034183ca1083f4d9df624bf17c05d98d1e3a84e0b6cfbb99521792d56cd2e1d3dce997 SHA512 d612c1425286eaa1a713e073edfae8ab8fb4e0b7c82ffdade57bc5dd06c54de6de46119b1cd87d7686cd4efbec38228c4a82d250ac693daa39dcfbf365b7ad25
+DIST futures-core-0.3.15.crate 14514 BLAKE2B c24ac1060c981887896b73ddaf85007a8a56c4fe03c6ea731d3e8389294bc7d97cc478d8ba7ff5d0e7a2cb17f54d1c7b2bbb2a2a0646c44fe1f5bff670495cea SHA512 e8c6710882e7328493e7975fecc360f2071ae39d1ea88a04a38e4228c48f9af4c545c6aead868d13689cfe33f4c98c5b5bff2f9cfdb0105368b11ab2d652efb4
+DIST futures-executor-0.3.15.crate 17166 BLAKE2B cee50035f9d0c5fccbeddc4cb66778a3cee5b76a0fdba39f4aef2c569e06d5c2bae96eee8f5a3cd42ff2163891104c89856758889ac687f2276a5cb1f1af9e08 SHA512 fb1337a2500d084145fd3dd2821db6d9419ebb781adf3e7b2ce4836c17a10ee4d5dc2b0c73414fde4c78dab89884620753424802902886a5d4ab8e4730110fb9
+DIST futures-io-0.3.15.crate 9058 BLAKE2B ab496ea8852ac74edf96f7c91bf074739bf3972d22c2dfa1ba3138244910e39098c99994679b0f4211ed9e49542523bce2caf7bbe972da6a550dd6169a69df50 SHA512 9e8787d8066636351de2958169d6ad21d02a3b871cb242dd4fef64b97dcfc14397740107f13d1e48c27640b768fada821fb433187b5d0f0a03e7555d15eb5917
+DIST futures-macro-0.3.15.crate 10872 BLAKE2B 82cc8ee228b31fff8d4663c4a3ca02cf67a77f53730f20e4d153614ef3bfca5fb3be81cc25b233a75ab4630887c19ef52f3f5751844f1199377ce59aa426b4be SHA512 68aaf9a5f53d93a24ed080021ecc07de04f88443829e244e4926fdfb440cf9a57f0853b3b071ce7444a755463a34140e0368a8f8b185bdd031915d01c843ef17
+DIST futures-sink-0.3.15.crate 7672 BLAKE2B 10386b796da43d3c2c18a53ce0e0f0db862ebc45f71bf277e2e0912d2fbe04ffe8411ac1f0f4b530fbcd1e37258df46640db7e68d84c5fe8863508ae530eeff4 SHA512 319a8367c2ad4f9410a3eba4a345ab2d49a896d9b9b2ef2a888918ff0289491283afd17a29e618eb4e064b7c76008e28d5b16f00e888fd5a506b65d5b79a2dc7
+DIST futures-task-0.3.15.crate 11811 BLAKE2B 65c6fbbc9f3b2f39765550f673d5e21eb455521db8b9251645b173fdd898bde9ba69f8efa8597e1ffb051e7c8f2749f2141affa5a5c64c92604992410aaba199 SHA512 66529a849c924ac08603f5ade52954bbcfc3e1796f20dd49eb0289d2ad9cab34e31f07e942736b635d6c1903dba299a7d9a36defbd4902c019ca382c4a376040
+DIST futures-util-0.3.15.crate 141962 BLAKE2B f31ef9a97f05807c995aa73d181050a0ab6af4369058f548c9a6ea6f7e055ecfd5e3c6efadccea2c3d39982cda280ca6a6b7f9a404e8c6bf19df64206598b851 SHA512 a89ffe93d277a93e9c825cdeccfe50dd797d9de6360a1ba44748a46bff6238261e60c9eea9659a0c7e13294973c0976595b20b0740c36c1f9204144102e204ca
+DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
+DIST half-1.7.1.crate 36168 BLAKE2B 632fefc24ad4b44c64ef6d3da745392ac016580baa5ba898c45bf41598ebb9ea86bb11c041b8813df73aaa755e323cc762b9e95b834aff7118d0d77e1834e7d5 SHA512 cd678b9277fd909083b67eb86c1fe92f464c92e1932246c6793dd835069aac5af6b9dc16bfbdcfbcdd75d3a641bc1f2240effd83dff6068a41b6c54d3739f73e
+DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
+DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST hostname-0.3.1.crate 9272 BLAKE2B cafcae4bbfadd51d058e3daba3e63d897bc3418723d8e843fd941d9663dbc89dba131c77d14ce7a5da552650ea3c40c4e418c88d465f1bab2fa20c178596852d SHA512 a90407996353c9bcf5b76be03713e3a0455ac80a50892e77a508744cf436a938ddb87ef97d8cc91ec7dc4353cfb7bca0fd28c90a72f8a9ecd4f29220d174edf2
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
+DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
+DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
+DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
+DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
+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 libbpf-cargo-0.7.1.crate 680376 BLAKE2B 9ad6d5c2bf37794f080cff5c3756782c22fc91825f714fb6c3f70151dd4896f11ebfd31cd0b12196443cb77fae9cfdd90c9ae0659b8689076e41b7ebefc10185 SHA512 a8c6320057d9ff5944bf6001bf07ea3545208e6628eabe714b9684fe16e53aa5e8b92a48fe627ceeca2d36def97b56a30352c91a590fc7983987000ef1a57b7a
+DIST libbpf-rs-0.10.0.crate 558928 BLAKE2B 1971bdaf176e6967c1a2fbd5efd4b25fa7b4b46397cfe459846b295ec8737f7266f403f1c0b3a40e72477e9b2f364e0bd0bba04dbd779f35aaa299070b413a34 SHA512 74024134b9facbc1c09cf4e92733d2d85019b6bf52bcea72b04aefa7df789566b7a27b98e3287524f1d52ed55e14fdcdbe3ad10e262d0364b2ff6c9ac409d08b
+DIST libbpf-sys-0.3.0-2.crate 993083 BLAKE2B 9319a42fcc0a1be679ed7a9adedbbe4c0804b0efbef3a9241e02bdc546e2b423b64fe271743f82289e5a924cb8903f6093329cdc5f012d8e033516ba7fa17b5c SHA512 1f95174e799bec47e140da4e640102f8ecf29183742a88972b2d3537f34e69623dc0ece364476bff1654e64e1b3c4c0813dd49be608d37a1e8f9593105da78e5
+DIST libc-0.2.96.crate 517567 BLAKE2B b08930af5819ab11016c85849571a0bf431c2dff09d433d18772995dc86d4f12ddbdda497a264a37ad0717c8bdc21f40cdcee026879f205f860be5004123d0fb SHA512 9df4196531ec2076cc0bc0dcfa9cfaafe0a4dc7e79b21f2f75855e1f60961330fc0f960b61bfc1e94ebffae94831408332e47c237daae78d4292b95620b98c0b
+DIST lock_api-0.4.4.crate 20356 BLAKE2B 1b4a648467eba49232df5c595d7c5a0444018269a67db1768c7711d9d1a903a1dd00f99d8654c30186a470c035abdcec9994c8b1a347fc559c684b1792ec7f49 SHA512 655c8a1503b6e7f833b4c62109e1c5005727054847bff81e17d4159f91c02ac97512da0673ab227d17bc9ed0342fe3476247daf74cbc9a0b470e68c648ba706e
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
+DIST match_cfg-0.1.0.crate 7153 BLAKE2B d3f40e5b16761fed337ed18dfa9db9e46aa2ad84ca8cfdc7cf7c72bea7cff8d084d95214ce013b3515bbe5b1ad4b8527bfce692569551e4588fe6f396a8a96ee SHA512 fd36f2b128d70a0f278e708bcb3274d90380229f754aed7ce9b808138b0189d5e1a07e0ba732216f788a530cecddcdd980559b3f71efa371d8805a213ff8f2d6
+DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
+DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
+DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
+DIST mio-0.7.11.crate 86660 BLAKE2B c55020ecb53cfbff143314d0adfce7e5124f66004711df9dd5f95d18d89b994a13e61b4a12b19a482cc0232393690ac87fc7d56d7d431d85e6826c2f5822b56d SHA512 abcb2d29868ba749ffbf2f4eadd5c24ea80bdc7d62aa09fa0a70d9963e73fd5f603fb9b73410db5f72a051a153e0ef5526992aaaf1b212ff0e961bc31d107c63
+DIST mio-named-pipes-0.1.7.crate 15140 BLAKE2B 5e19ee9baaac61efa0c683f46acec94dbb5a932a6012370976e444d265f71b7dc168c9de838389c5fd492c5bdb15dbc1f8e8956640b11fe5b4e3e09a5b7f12ea SHA512 bd78651d89c292c792c108ab5d199da436ad62097c0fa1563523b8fd5a3c7dc0a7a948df38a4ad05a8e97d7f30652de6ef15d9f0be9157653de11c790ed25c90
+DIST mio-uds-0.6.8.crate 11496 BLAKE2B e52d131f292c7c09fa116ec5c760d50e8389c27fd7b79a4418f0222ae124fba0e5943b5494866e9db75407ab9f6b1a9c7aa7fdf2c4d601e8c785dacd8166f6da SHA512 b6c752ae9f25c37fc7e23e06a8843089c5291d60e53a6e9093eed1d8baf64c9e0ff14bb2ea1c0c8815b00026b28fefab2aa34104bdbce7e99549786d0f507a73
+DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
+DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
+DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
+DIST nix-0.17.0.crate 195654 BLAKE2B 6857f84b3deb5800fe3167efd226f042bbcbbc61a4153ce59f69fb544616842c3f6d4566444201c669c6235d1d7577302e5404399f4937f1c0bbbd17fd47ef71 SHA512 3f2bc4f0e9dcb9753535aec9d626ad8126f0a9ea18f73760ba72be0f35d82542c659b4c443783010de133a318f423a16f71cd1f1dd5b5a1f4f71ff7bda247b63
+DIST nix-0.19.1.crate 213462 BLAKE2B 6abc355e7635272adf3933ec5835704a1b1b13b2d2a0e1a4d93280d91093184c7a0a115b75aecd44420b5f4f8e766fa0a86ae3cb96f71ab91bcbd0455a2bcc09 SHA512 0ac549babd0ea438825ad875dbaa4563d8eb90d83160dde429c0a97bb77d4ed3f19f1ad17437c61da69aed3f23382d464e99bbed0199678f7de41cd38953b51c
+DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
+DIST num-0.3.1.crate 9414 BLAKE2B b3b4ab10882c481cc2a8777eb44fb268a5ae1e76768df4f16b7c4f76bacfb6974a9ffa9d0b510c9763af49aa30b3cdfdc344a919700e65da5402d90c3d5ad083 SHA512 38eaf591bdd1a8f758f80f6fcd815f32c064738ba21fd97078200945cc5a2025f88b79efb36538e425df43441adb33144e20e68dc351101845074260d10ab85c
+DIST num-complex-0.3.1.crate 24541 BLAKE2B 10777a6df568fb94740a2bf2a84d68c5612efae200f99be1c20114d0adb0672f08b512f499ea4f86e19e3f20e98a7213fe116509651071b979e59515fb9958f8 SHA512 d24d613f20e04dcfdee68e95b2d4b06ba99db637a96e41a55c4f599626951a44cc5f8adf8e8c86003d42c316aaea0c27739e812fcd4d4bb6efca5b2d9cecdd71
+DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
+DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092bdd6e65b91c472967c006fb3cd6b944c4bef913465e39e6a2fd734ac2b1ce1f21b332b2faece823fe410b54340 SHA512 46b0e05c4f4587121ec300da51cbf02e04ee8f8441eb4dcaab5a2ccee3b40210f1badde56addf053fb876aed3749dfb5f01e757042573fdf99defc77fb265f3e
+DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
+DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST num_enum-0.5.1.crate 8210 BLAKE2B 45d15065b7baa1ecae1860315865e502038dce1bd79631bf8e659dd5346ad1e7ec61df0aef1ad64caa73fc615b3aadd894f490adb34c9227c671c079b11d154d SHA512 96e31e53697e70a91afc49f5474dadb88e6fcf772dc9f14d39a153aaed7e12500500c6a9395b1fd4870be29ea13d13818b30cd5b1d59844773bf2edbc76d7677
+DIST num_enum_derive-0.5.1.crate 7579 BLAKE2B 0bfbaeef5f7b565254c4a3017ce38ca462142accfedeae5ee03f4110ad987255445209ca9a3883dd37f1ae0254755badde9daf251b74739c436573191729bc40 SHA512 fce1142f78ccad3cef1de504a0c89d38e057849abc5ad0c8e27d284c599b39b521cecf3ec70e055ed82871657e6aacbdc6e7b38d637a5d151aa9956e9ca9df09
+DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
+DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
+DIST openat-0.1.21.crate 17503 BLAKE2B 1237236d5f5a5ae70615ba64e40fadf44e0eb1267b6b6875d8f1e87fafb3e1948a507b38d6276a16b765eaaf294a0f08c760d5c4bc40655134bb2e1ee30f3736 SHA512 2fd1ace390652f0616dcf2cf53fbedd0f54404d325494bbb0e3e6bab19aa388f05cedf6ded212e5568b6114b732a0ce6573f323a593f9dace8374cd19c24898f
+DIST os_info-2.0.1.crate 20268 BLAKE2B 73bf110ae6b4c6ae4367471ad05f95c86212aab1df9c85fe9b2bcf9a15be8d542bc864ba539172975b1bb2f172261bd13cf7489877e89f15bb50890fbe6a21dc SHA512 3a8b476e0160846d3d45d147691e9fb4c5a2b999f57f21fbd45921b6ac05a68ce9eff52cff8c6efae896afd10c821ef56f86080d0415ea1b3cde1579360767e8
+DIST owning_ref-0.4.1.crate 12658 BLAKE2B 42bda4584b2f017e7b48bfc1fab9aaf59d49b8942eceaff6f6d95e5e1fd456d952693ef70ca1a496c48d3bfbf69604dd47adb97af31fdd803a6119f11503920d SHA512 15ecf5c53a675f7c96f850f54bea5fde63f8cfe22ad5c01941f67695154a39950087bd72bbd9a2f9e76825a3fb8dd1d20ba92335f265f4aa273e1086773b918c
+DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
+DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
+DIST paste-1.0.5.crate 17669 BLAKE2B fa8eafd98dec09e488cb7ce0600c18554887249f1f1dd4c4cf3d1902b7ace184324a4b9afe16a7f16bbbac0d7b15885649bcf8a33473413e37fcfe3fa1b57c4a SHA512 c363e56e1b9bc2e401827c292625951cf577ede568033cee53da2ec2383c4ca17082b52b82477c48d65881a8c76f535a66768022d1eae2cd5f55218dbfb9be22
+DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
+DIST pin-project-lite-0.1.12.crate 16854 BLAKE2B 48ecd648fd7a7694a48144e9e3f05a3e2878e52a5e5ecf2c6cc2cdc556957282bbaa3bb04f6418cbcfb254cceab5a0bca92173cf293db5cfc9c9589ec1597543 SHA512 4285eb45548b1827b54890162c68698e50d3747eba7b4c1c75a8104124846bc745a40d9acce18115bd06993d7d8f11232168e5e6f4159d3d273ff800706e5bc4
+DIST pin-project-lite-0.2.6.crate 25494 BLAKE2B 851a8388c3837d8516d98b561a3ae95b584e7b0e56cb04a300b45e5a97b4c81bde991a9625f42a596244f3f8638c26d6ddf46cdc7697aa24c823e991d0c107db SHA512 21b298896a10c2b21e481f5769a9ce557ec376819681599699f0881769d2dd378bd0bfdf7c43cc16eb521c48c67207e63373622fff84ff26da88703a57461461
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
+DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
+DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
+DIST proc-macro-crate-0.1.5.crate 8096 BLAKE2B 0a992f7aecf05335008731adc40e8ce6c4ef5e114228b51ea856112f850a24e995e4682c8d2ffbc703b9b5cfddad68342cc9d0f7d13b13a96961287bdc22c4a0 SHA512 b2922ea8beb762f42f7646398eff9d03a5fe3d942f1d0cce564eff8af41ed14f175986d07ac5bab75e7634f964b8ad24a6f05f597c90b83761bb4c1d2b2fed59
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
+DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
+DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
+DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
+DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
+DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
+DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
+DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
+DIST redox_termios-0.1.2.crate 3268 BLAKE2B 5f3f4e2b7e7a8172f92e8161eb1dcd208b86320868ec351e2f7b47d8ed170b3f44ad8180e44ea7a554de0e53fc268365e683244ad59e4afabd11a09ae378d2b0 SHA512 d8624b2c78d02c5d3afcbecea9ad8d218bff508703cb50684d6ae05614a9f41bf2aa8c47440fbb7d964f01eb9085364222833fbf9c45984508e9d755dac563c1
+DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST rustversion-1.0.5.crate 16984 BLAKE2B 314d4a7b78a91fe6a0f35d850ef7a4dda72859fec7f603307154d2b25722ef6be71d5986991b4958009ba066d3078a53131691b0d375677985b9e351876dcd15 SHA512 43f3ed12e007e0a7bf0ecbe44edec5ff092c88973903ad8032b12d678d98d8827a9e51040fa157b0d5b07d26a5b6cd314b410553fec46689b3a31b392c24770a
+DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST scroll-0.10.2.crate 27810 BLAKE2B 969202d13e99c12bdd7e5aa6cd6bcd47686d53c8180de6f40f86bdfa0b3cb817fb350a5b6ed29f9f76ec4c554a370731aaee330c86288e0d2a3ad478da413f20 SHA512 70d4f17d4af5be439bfd0a2114eac6eb8b13860e30d5b092aea0cf62bcf817d29ef7d68c5d7488abc8f90f7ca99d4cf2cf44799e6541058f2f4d0c0d99ca5764
+DIST scroll_derive-0.10.5.crate 5783 BLAKE2B 1ba52fb972bb051fb0e2f9827db55966058e6747a41b54de9d43d9e34105c1c4ad45f758ffca597d7aa13f8ba2d2abbb2d1648883f51458c1b8fdedef5234cd2 SHA512 029e024921d558c14113f16b6c406c766e9065d37b6e0a43dacf4da6845eadb780580a7e0e9d5c78cea02859e2acd842e23855cee193b1a533183550f2d595cc
+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.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
+DIST serde_cbor-0.11.1.crate 43947 BLAKE2B 4c1dc444089276b4bfb1b1237eeaefbb6954fa8b613e539fa6eabe01ddda990be50c5e5ce72e5f765835224e9de4fb0fdb26d2fada2b18d6b03f77665e2c41cc SHA512 165192ed999cfdbe162abd3aff92f86f4300ffa9347e57fda2ef3c32c69a18183d468db059d9dd80218bf01de15fec6fde7cf6dbb8cc2a6158785484353f2192
+DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
+DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
+DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
+DIST signal-hook-0.3.9.crate 48416 BLAKE2B 1075d4b767f3d3c2e556ad1ca2511eee4eea8674989ee76cf4234ebac78f1351291f3dfff72605ec9fe92e978fc9ba25298182564e5a17676fb14441de6bb6e4 SHA512 bcb6cfd4d062ed4a2a83a7fbb35ec90f7dfa5e875807fe6b7c65d0393447b56fee613eac2b3dd08dae0cf2e3cdee920f2c3b3d27ccd1f6f8dbec849c3e6e4261
+DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
+DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15
+DIST slog-2.7.0.crate 45432 BLAKE2B 69b3e8d826cb3a60b2707e6b0afac2226daab5a72a29c3bc1bbc141cc8f082e53a1cea43d3b4e5c7e54821eca0990248f17536aa52df116c356958c780e528b3 SHA512 13bab46e288596d856adac80a6481d803646f27ef7bc1669ee2f7667b321b33beceb050348007a0ef28d0722bb597fed2139eef4685d01269ffe271830d1b15b
+DIST slog-async-2.6.0.crate 18190 BLAKE2B ceab9f0cd8ffbe8a29250682501c88766c5cfa384451db5e658ad881a7ef500af8b48cb822d627582193f49c0a67666656248af3c9c6724781d5dd0cb8b76a2a SHA512 c07300222637e5ea109a86d61af056e3db81671de162177e6ac111042a88fd8caf7386d508946c2443583ad51765ff66bf05ef27167e21921b5a93935a520867
+DIST slog-term-2.8.0.crate 25251 BLAKE2B c701ed6b0e48303ebc2cce9de9dcadf861c6ef3c775b6074e767981854df98e59b2d2db8a9197173438cbd4180712fd5e3099f552aa9e6021f25bf606240efb7 SHA512 be9cdfa8e3838c1163d7ef1d84d6ce34fa4a8c2910f94572d1645bc9277f1c6ceefa105ced6659ac1eaef5f8f50325e063dc8e7661c1b7c4f3d7b255388b2f21
+DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
+DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
+DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
+DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
+DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
+DIST strum_macros-0.18.0.crate 10229 BLAKE2B cdfb1d626f8b338ec7002056e70d539e41af7ae060fb85d787d66218f6b7f58c260f99f02e0c3ba9512de371d35456ffab29a7633d0d6f716c1879adadf08b3b SHA512 df13553e2b89b2c87be3948f4881434a5eb851d0318fafab9eeb9764ea56ae8ebd50639d10fa508f674442a859d4cbd4d344c7d1253fc7f8eed3443891f4defd
+DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
+DIST take_mut-0.2.2.crate 4263 BLAKE2B 3660c519b5ce8a39ab4f06dd61ac062f645de321f36913e948e8f10ead18866e2aae2609eb1f7f5faa7cc2500083743fcad816578defaddede456c6c05b3244e SHA512 f75a5ce723e710809130878b0ff5df368f5929201e557661dd0154f3b31ea58d7d30d84672ca5a684fbfcae5f82ab2c21b1b5d9edc4c67d08c221228bd9de814
+DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
+DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
+DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5447399b06de99534b0cb2160963792824ac74a350444ce41a4fa16d6a9792a68d84578a15ab37ab76ca2 SHA512 9de6e836f1fd205b3b58645ec880eaabfc0fd8991e3980ef90bc6184b370a14676edb688a2a75bce412dd8ebd97345aef742afe5b964250e2b6f84e6b15b486a
+DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042dbd25f4456a7e3859521d4f32ab755780e58070f29eb7903f3b4f8129eb9447cda953b9190f9df3b7eb3aea SHA512 228b6fa7e2f280d6bfc7cef77e7a1d0d8f597178e66af0bde1b1fb6553857b511ba8a6786165815aac6d8a082fd37191f4ea35a47f1e1182f7f2c6086eb34a8c
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
+DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
+DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
+DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
+DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST tokio-0.2.25.crate 413390 BLAKE2B 3fc36579030bac46a733bbb061088eee56e9a172241f74d744de972065507db14202a0533a5d231bbba495404c16b5d6bec0d11ebb11e258ff0273b47b2f7d90 SHA512 19b8d46a81230be0a06d6354c2775b20fe0c108b4c504f5fe798952bf84f8ecfd9fd149ba899ee67a1158e1b0ea9eab49f6249a655eb0ab1cf418c0097b30705
+DIST tokio-macros-0.2.6.crate 6460 BLAKE2B 239493963b5fb28eb9ea7dd568576db4d38c7e6b8ead4d072862891ca5aa096a8ae61481f3cc256d1bba2a2ae9a62660a8a0ac3a1b0408cf33f4b204a252d095 SHA512 1e3f7f42dcece16d8785e500816768ecdef944b0297bea9ca215c15aadf1dc89030061cd4ac01fc9d3c32ee83c6471dccbf7e99ff8f2385853e831e08954a51f
+DIST toml-0.5.7.crate 54372 BLAKE2B 8147ee2e9412cb79f00585cc54b06943ab3fe3e852b4b033fb06ef13122b07216c0b2f7c84aa548f9b0cb11c2190da3c69ed8b91eacfbe1519a5d94398b358b9 SHA512 5537a103d2329feb55a470f39962d6484da515c2727d379be108a778c8fcc551065942133ad9f943f0fe96847a9d0dcbce009cd0ce1ef3df355e34fb1439dc77
+DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
+DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST users-0.9.1.crate 20456 BLAKE2B 49a2dd188f8d944d361a4e58f3f437718af7510c2b684e22209058e97dfd9d5ecec2c901cbe2cef36ab74d11091b1280de8b94135da523f57b02372ed5571fe0 SHA512 e372f8402d241e924c77a13621053836a1a36a6a6b9b66d5e187a582be0a85638270ea140c048e07f6739ed228711095fc98705303c499f2b542fd548df0819a
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST vsprintf-2.0.0.crate 3043 BLAKE2B 78ac38ef0b2135c1e0c15f0d8a8da06d67323259e47fbaefd6b5c6ca4e451111d3bd30c01f270bd858fe9e60c087d945cb2fcf1840c811af7c79f33276d58608 SHA512 0db4b0a607eebe6592f26a96d832bbba0d3807ccd73472f2250c5e77b73b58439e876a961999e51796485609fbd1bcd89ca4e561c318fa86021285c495dfa0a1
+DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST wasmer_enumset-1.0.1.crate 11873 BLAKE2B fbe1cc45c2393fa62be6340d9445e1bd2208fde54f4e748302d1cd1a5a2951d36fa07caca1d2c892b31e8d01924abf97ec11b7159dde59ec72571d275c884de1 SHA512 3af873c3b6de090666e75c75303ea4dccee85839b09039a6f98f3c7b62c7f7fb070951d26bd35c17b81c1b668956eddf19a57201d981d4536d594d38b14e9a25
+DIST wasmer_enumset_derive-0.5.0.crate 5657 BLAKE2B 4a96b0aebadc1bd84b4a9c9717c6fc39a2df84bde4827a2b57283dea95a204d7aece342bf7cf3eedbe0fa0d279d0b31bcc9d7610b20363651d67f62b2125d690 SHA512 5e2877f23bfbe38fcacb6551b2c4cba4dd67c23b33909a79bd3472ccbae3fecad328e3542986cb926d68a8571c9af17dbd3f4bf833a47afa66337fd62fe35f04
+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
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+DIST xi-unicode-0.3.0.crate 87001 BLAKE2B 1d44488a32dc9bd9284df6ee26f0f05c5145c458dc76943cfab88f2f2544762477bbe1378bc1f5e365cd5a5ecf79e41fa66140190047f37ea5dfe678c97a542e SHA512 39875839dcf90b391e76a6b2c2efb2e6f8bfdfdaa59c4815bab8f24412f840c6b01232b5bd79a8f8c6bf7733333e5915c2a7235d27f890b883d6658094bf6271
+DIST zstd-0.7.0+zstd.1.4.9.crate 27411 BLAKE2B 7f35f179c893476e8c15ac4b013290bc226114fc4ae1fe3742345365f92ab32965e04f4c52bca39c598cc05ebe7c575b5ce4bc6a4a0b6974520810203f30cd5d SHA512 b01ff06d3863ede51fcdfd99ef2e2a669f0532f56d55c0ebf0a041187c335018c6911b96f25dc7836ed4545486fd7affe926e90fa8e1901f4335d5df3abc7110
+DIST zstd-safe-3.1.0+zstd.1.4.9.crate 10261 BLAKE2B b6f064d82eb5162a64ceaee7a26a042ac043967b1a7112c30bf78cab406f9faea8f835e4e1187af0a2746f6ba8d369dee7a2f4e74fc992992af1c22dbc2d7894 SHA512 99cfc605240399bda04e71f12dd0d4d8f5134504d9f30ed663832876906584480f24b53c312dec31005e8b079ba0286cdfb9b3ec4eb616d406f8465d35fd343a
+DIST zstd-sys-1.5.0+zstd.1.4.9.crate 1901023 BLAKE2B 64e4444e478d6728f8e90ed03e86f07b7f14a55562c4093cb64af98f3b2857ffd50021f683aee84072140e2823476c06b0e3aacd7ea12770e9240b70dea05eba SHA512 0e4984d49e1d71796f6335eb37f229422307d359b98e9ebfde2807446478d95a101f506991a1eba8c7aba498019089422631dc0e5f8b58fc55758b00f4f8afb7
+EBUILD below-0.2.0.ebuild 4327 BLAKE2B 9fa138f8ab8bc5e37b5ff3fd6d342943ccadebaa742d50258d4a5549d0fa7c1054c8044402733cccb4254f756f6942ea831e96e9691e927e8526f6710a956c4c SHA512 319421011f5f86ce1253657a489d40628e61bfd4a165a026a2edd975130cade1fcf06272e0ad542de155bb8391679fede086f986c00e3d8dbfb19a594c09a1e4
+MISC metadata.xml 1093 BLAKE2B 130366867f7fd554d1abff758801a67900f992a594e3a5e30515ead93fa9668826a2dd509e46a9279c9d6912d3fb9a6dba6a8d5a4150137a771b50660eb2a959 SHA512 4124eb9b7ccfbc1ebb46967cf8fb36722a61ac420e801df61b3e5fa00d75518a8e712e7aedf972c55ed1673f06f5fd4b6d2d9bb6c2163fd87494c06bcb03fbd9
diff --git a/sys-process/below/below-0.2.0.ebuild b/sys-process/below/below-0.2.0.ebuild
new file mode 100644
index 000000000000..35d3c669a729
--- /dev/null
+++ b/sys-process/below/below-0.2.0.ebuild
@@ -0,0 +1,247 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+ahash-0.6.3
+aho-corasick-0.7.18
+ansi_term-0.11.0
+anyhow-1.0.40
+array-macro-1.0.5
+async-trait-0.1.50
+atty-0.2.14
+autocfg-1.0.1
+bitflags-1.2.1
+bytes-0.5.6
+bytes-1.0.1
+cargo-platform-0.1.1
+cargo_metadata-0.12.3
+cc-1.0.68
+cfg-if-0.1.10
+cfg-if-1.0.0
+chrono-0.4.19
+clap-2.33.3
+crossbeam-channel-0.5.1
+crossbeam-utils-0.8.5
+crossterm-0.19.0
+crossterm_winapi-0.7.0
+cursive-0.16.3
+cursive_buffered_backend-0.5.0
+cursive_core-0.2.2
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+derivative-2.2.0
+dirs-next-2.0.0
+dirs-sys-next-0.1.2
+either-1.6.1
+enum-map-0.6.4
+enum-map-derive-0.4.6
+fnv-1.0.7
+fuchsia-cprng-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.31
+futures-0.3.15
+futures-channel-0.3.15
+futures-core-0.3.15
+futures-executor-0.3.15
+futures-io-0.3.15
+futures-macro-0.3.15
+futures-sink-0.3.15
+futures-task-0.3.15
+futures-util-0.3.15
+getrandom-0.1.16
+getrandom-0.2.3
+half-1.7.1
+heck-0.3.3
+hermit-abi-0.1.18
+hostname-0.3.1
+humantime-1.3.0
+ident_case-1.0.1
+instant-0.1.9
+iovec-0.1.4
+itertools-0.8.2
+itoa-0.4.7
+jobserver-0.1.22
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libbpf-cargo-0.7.1
+libbpf-rs-0.10.0
+libbpf-sys-0.3.0-2
+libc-0.2.96
+lock_api-0.4.4
+log-0.4.14
+maplit-1.0.2
+match_cfg-0.1.0
+memchr-2.4.0
+memmap-0.7.0
+mio-0.6.23
+mio-0.7.11
+mio-named-pipes-0.1.7
+mio-uds-0.6.8
+miow-0.2.2
+miow-0.3.7
+net2-0.2.37
+nix-0.17.0
+nix-0.19.1
+ntapi-0.3.6
+num-0.3.1
+num-complex-0.3.1
+num-integer-0.1.44
+num-iter-0.1.42
+num-rational-0.3.2
+num-traits-0.2.14
+num_cpus-1.13.0
+num_enum-0.5.1
+num_enum_derive-0.5.1
+numtoa-0.1.0
+once_cell-1.7.2
+openat-0.1.21
+os_info-2.0.1
+owning_ref-0.4.1
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+paste-1.0.5
+pest-2.1.3
+pin-project-lite-0.1.12
+pin-project-lite-0.2.6
+pin-utils-0.1.0
+pkg-config-0.3.19
+plain-0.2.3
+ppv-lite86-0.2.10
+proc-macro-crate-0.1.5
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro-hack-0.5.19
+proc-macro-nested-0.1.7
+proc-macro2-1.0.27
+quick-error-1.2.3
+quote-1.0.9
+rand-0.4.6
+rand-0.7.3
+rand-0.8.3
+rand_chacha-0.2.2
+rand_chacha-0.3.1
+rand_core-0.3.1
+rand_core-0.4.2
+rand_core-0.5.1
+rand_core-0.6.2
+rand_hc-0.2.0
+rand_hc-0.3.0
+rand_pcg-0.2.1
+rdrand-0.4.0
+redox_syscall-0.2.8
+redox_termios-0.1.2
+redox_users-0.4.0
+regex-1.5.4
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+rustversion-1.0.5
+ryu-1.0.5
+same-file-1.0.6
+scopeguard-1.1.0
+scroll-0.10.2
+scroll_derive-0.10.5
+semver-0.11.0
+semver-0.9.0
+semver-parser-0.10.2
+semver-parser-0.7.0
+serde-1.0.118
+serde_cbor-0.11.1
+serde_derive-1.0.118
+serde_json-1.0.64
+signal-hook-0.1.17
+signal-hook-0.3.9
+signal-hook-registry-1.4.0
+slab-0.4.3
+slog-2.7.0
+slog-async-2.6.0
+slog-term-2.8.0
+smallvec-1.6.1
+stable_deref_trait-1.2.0
+static_assertions-1.1.0
+strsim-0.8.0
+strsim-0.9.3
+structopt-0.3.21
+structopt-derive-0.4.14
+strum_macros-0.18.0
+syn-1.0.73
+take_mut-0.2.2
+tempdir-0.3.7
+tempfile-3.2.0
+term-0.7.0
+termion-1.5.6
+textwrap-0.11.0
+thiserror-1.0.25
+thiserror-impl-1.0.25
+thread_local-1.1.3
+threadpool-1.8.1
+time-0.1.43
+tokio-0.2.25
+tokio-macros-0.2.6
+toml-0.5.7
+ucd-trie-0.1.3
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.2.2
+users-0.9.1
+vec_map-0.8.2
+version_check-0.9.3
+void-1.0.2
+vsprintf-2.0.0
+walkdir-2.3.2
+wasi-0.10.2+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+wasmer_enumset-1.0.1
+wasmer_enumset_derive-0.5.0
+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
+ws2_32-sys-0.2.1
+xi-unicode-0.3.0
+zstd-0.7.0+zstd.1.4.9
+zstd-safe-3.1.0+zstd.1.4.9
+zstd-sys-1.5.0+zstd.1.4.9
+"
+
+inherit cargo
+
+DESCRIPTION="An interactive tool to view and record historical system data"
+HOMEPAGE="https://github.com/facebookincubator/below"
+SRC_URI="
+	https://github.com/facebookincubator/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)
+"
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 ISC LGPL-2.1 MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+BDEPEND="
+	|| (
+		dev-lang/rust[rustfmt]
+		dev-lang/rust-bin[rustfmt]
+	)
+	virtual/pkgconfig
+"
+RDEPEND="
+	virtual/libelf
+	sys-libs/zlib
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/libbpf
+	sys-libs/ncurses
+"
+
+QA_FLAGS_IGNORED="usr/bin/below"
+
+src_install() {
+	cargo_src_install --path resctl/below
+
+	keepdir /var/log/below
+}
diff --git a/sys-process/below/metadata.xml b/sys-process/below/metadata.xml
new file mode 100644
index 000000000000..97a5348f1ec2
--- /dev/null
+++ b/sys-process/below/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>hodges.daniel.scott@gmail.com</email>
+		<name>Daniel Hodges</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		below is an interactive tool to view and record historical system data. It has support for:
+		information regarding hardware resource utilization,
+		viewing the cgroup hierarchy,
+		cgroup (v2) and process information,
+		pressure stall information (PSI),
+		record mode to record system data,
+		replay mode to replay historical system data,
+		live mode to view live system data,
+		dump subcommand to report script-friendly information (eg JSON and CSV).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">facebookincubator/below</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index ab9c5b6034cd..e3c08aca94d9 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -2,13 +2,7 @@ AUX cronie-1.2-cron.deny 148 BLAKE2B 3da92c65667ccacd74e32443e1cd5623d8040a75d78
 AUX cronie-1.3-initd 274 BLAKE2B 11ea62f09ca1263b9daecfcccc422d4ce28c200e03a1edbae91db9cae770910490a5c34f0f3e8a6a7ccc677aca6c555450fd9b2e7ec7aade163552f5613cbbd8 SHA512 f80a745dd00c62518dff3faff45bc79df97254e275bd5d26a1edc7452c23cebffa1d3eb3cb1767b23f40eae462f9432cca87b5b075a143169e056b38f21e85ae
 AUX cronie-1.4.3-pamd 231 BLAKE2B d993c025529e817435264c798bec757ead59d77540e1ff08a0f43d2d686d5c82eb9101455bc3191417323286a483e68795ec3a376c73b216ac4ea6d77fbaf2bf SHA512 32268d8b097e60eb039c023647ecd651b6940a8fe1587111ce0d49314bbb2de451214f98b7b703fd284e231c10bc4e616d4d0c63c107d9cdbc2bb470a17f2c3a
 AUX cronie-1.5.3-systemd.patch 980 BLAKE2B dc11e7e1f072270f24e4ae420c2bde63412ec8d322d65972eb574cab2594388157c1ea4fb9297500de5ba4c32639792e810590e44dbc2650ae5bb5eab11c160b SHA512 a1e9fef4cff7503357785645ee91cccf54dcfd8433ed9d1fd22813849bcb47f0bb6f96b404a66450d865d586041415b480e53ef1599318df32331a657456b92f
-AUX cronie-1.5.5-autoconf270.patch 582 BLAKE2B 8bfc34dfa925abab58ac156845d848b4d714430c3cfed0a453b565e76e6462f3214acaa338bb9d36b72a1d3484d7daf16f5ea41d42ccb8cbca024394d3e85c00 SHA512 7a7f5496e68fd43c804a7b39e32e0b7cc07183c02cc60bea91cf949e9783d85cd8e8143b53e0a1341dbc8dc209c688a35ae04940b2ae953db723eae6f0962639
-AUX cronie-1.5.6-autoconf-2.70.patch 1303 BLAKE2B eae651f061c318c890e1854dd66d600fa301d0060ca200621ce5cd0fa654221cb75ed512921ddc0287e5c2708eb31b7bfd6dd10a75107f4048ac85cc143ec612 SHA512 bb3986249c9cf8d9456ce65925a77b8f25b99b8d7443b7cc09903efbd55702bbbcbc7f65ef7ab55a5bd2a6c62adeb4abf90d41ba946b82b7db9a4b122c834d50
 AUX cronie-crontab 476 BLAKE2B 7e2de210328ad714647b9ec50c611573ba166b63f68643aa001f8ca2d2c6e6a5b1300cbd8e1be2ba4374def366698abe6f990673b427e7db4883a9cb74bd06c0 SHA512 0d42a8e749db5c7f057b980678dbfada3dcf1418000168380097032a69a48ab4bc8fa228fb45c65c9c2a1a8d5290da3ca84816963fb7096fd13e293a68fea0c5
-DIST cronie-1.5.5.tar.gz 124642 BLAKE2B 19bb690a2ae66b9b99dcd0536c115fbdf46c0f1c58922e08fb31d9789df3358438001bd4b6b55d16e99e3927364c618ac22cb04661db1245d09709fcb58eef1e SHA512 88b0e877e5b36a0063b37a6ce82133117c95ebd4435ce843e09c6247ac50f36c66503b850aafa75512fab07d46a110ddfdf52e7e984638ed794588e338547166
-DIST cronie-1.5.6.tar.gz 148374 BLAKE2B d511ea49804bf8e1fb10bd43bd37c03594ca4836c79a25b6c8a3e29efe50c11d0ecb6252e4d45bb186c33e2034040c7fdf009d20c305a03198365aba93979fd1 SHA512 bfae9b03627256367c7cdecd8ee13a3625386ea01ffa318d6f2b2d9c3f8efd5e31572125fbf7efd6ade8a22e5cd69e36e915a4ca8f554b553478059bc8be3337
 DIST cronie-1.5.7.tar.gz 148739 BLAKE2B 3e9f8b78a29d2304e2ece7ce2b794b80e6023428d5b07f21936f3690eae2741b9e6814f966d8e3cb3d4f9daf32b3fe730ce6adebb76f8779c3f5039d2a19b6a4 SHA512 cddf1ffd518bf8daed8ae2634ace41da669f6d1039b1936b602200e2f2902944d8e84c80f73f6ab67b2fa755c4192f9181cf44d87bc893201b756367ab55148e
-EBUILD cronie-1.5.5-r1.ebuild 2602 BLAKE2B 67149bc5f6e388930042163ebb28b62e5d2dc6710283c635ad4bf036d7d0c08d6aafca69bbf92e62340313ae3dd0fdb3f0034e5c4f87e2f4c03a821ea2f23d53 SHA512 77b5a10e3ad99ecc1d555c429060979d2fc9e8d4310383ee426d33b6f100a206b3e2f13d89e01a1d607bf6703388f8baa9d395068c70bfa5e9654868285479f6
-EBUILD cronie-1.5.6.ebuild 2591 BLAKE2B b125c30b1623a190c0408a03c5de7a919552076ac4b290a7433768aa5a54af95ad827a3482f76fe9b79c8a41c04710a9f84500588335e87f0fa3e6dda510c49c SHA512 0dfe51d1ba61b20a91192342577a1bf133a054139db34304b5f90a2ad9b4de7cc795aea7096694cc8aa3a7fb1d1566f7d8bfd423c6b81df7d7deab8f857aae63
 EBUILD cronie-1.5.7.ebuild 2537 BLAKE2B ebd00129a9ffe27521e930a1a6202bb949647ea72143528e547b2bca5a5506bec6bd0c4ef554c62aece7219ae9e191d9852fde0e19dd250455f4934bd3760711 SHA512 6952dbe0d7563415ff11b40c42843af15c668a790cc1269353f223e17fd745ae98cba8792a82b1ef462899a424ed58f11b8824c740dbe00aae2ade607a059278
 MISC metadata.xml 813 BLAKE2B f6af6d92d0a7c0fa8f38574b969dde935bbfc791f05e55c90c21a12c82738c436daa3e40c75d800c683f5ddc9bda177d78218d6b897e00ed0355fe1447d950b9 SHA512 f45dc3cca0b355df94bc5b67aaea6d903440e47f317e8abe8b963a77f18477ac02fd7f21eb7a7cb168216e17f5783461dc9fc5a2e01dc7d408481c75cfc4740a
diff --git a/sys-process/cronie/cronie-1.5.5-r1.ebuild b/sys-process/cronie/cronie-1.5.5-r1.ebuild
deleted file mode 100644
index 87d7137e8e3b..000000000000
--- a/sys-process/cronie/cronie-1.5.5-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools cron flag-o-matic pam systemd user
-
-DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
-HOMEPAGE="https://github.com/cronie-crond/cronie"
-SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
-
-LICENSE="ISC BSD BSD-2 GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+anacron +inotify pam selinux"
-
-DEPEND="
-	pam? ( sys-libs/pam )
-	anacron? (
-		!sys-process/anacron
-		!sys-process/systemd-cron
-		elibc_musl? ( sys-libs/obstack-standalone )
-		elibc_uclibc? ( sys-libs/obstack-standalone )
-	)
-"
-RDEPEND="${DEPEND}
-	sys-apps/debianutils
-"
-
-#cronie supports /etc/crontab
-CRON_SYSTEM_CRONTAB="yes"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.3-systemd.patch"
-	"${FILESDIR}/${P}-autoconf270.patch" #750728
-)
-
-pkg_setup() {
-	enewgroup crontab
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with inotify)
-		$(use_with pam)
-		$(use_with selinux)
-		$(use_enable anacron)
-		--enable-syscrontab
-		--with-daemon_username=cron
-		--with-daemon_groupname=cron
-	)
-
-	if use anacron; then
-		if use elibc_musl || use elibc_uclibc ; then
-			append-cflags "-lobstack"
-		fi
-	fi
-	SPOOL_DIR="/var/spool/cron/crontabs" \
-	ANACRON_SPOOL_DIR="/var/spool/anacron" \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docrondir -m 1730 -o root -g crontab
-	fowners root:crontab /usr/bin/crontab
-	fperms 2751 /usr/bin/crontab
-
-	newconfd "${S}"/crond.sysconfig ${PN}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}-crontab" crontab
-	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
-
-	insinto /etc/cron.d
-	doins contrib/0hourly
-
-	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
-
-	if use pam; then
-		newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
-	fi
-
-	systemd_newunit contrib/cronie.systemd cronie.service
-
-	if use anacron ; then
-		local anacrondir="/var/spool/anacron"
-		keepdir ${anacrondir}
-		fowners root:cron ${anacrondir}
-		fperms 0750 ${anacrondir}
-
-		insinto /etc
-		doins contrib/anacrontab
-
-		insinto /etc/cron.hourly
-		doins contrib/0anacron
-		fperms 0750 /etc/cron.hourly/0anacron
-	else
-		insinto /etc/cron.d
-		doins contrib/dailyjobs
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	cron_pkg_postinst
-
-	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
-		ewarn "You should restart ${PN} daemon or else you might experience segfaults"
-		ewarn "or ${PN} not working reliably anymore."
-		einfo "(see https://bugs.gentoo.org/557406 for details.)"
-	fi
-}
diff --git a/sys-process/cronie/cronie-1.5.6.ebuild b/sys-process/cronie/cronie-1.5.6.ebuild
deleted file mode 100644
index d676c18a563a..000000000000
--- a/sys-process/cronie/cronie-1.5.6.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools cron flag-o-matic pam systemd
-
-DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
-HOMEPAGE="https://github.com/cronie-crond/cronie"
-SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
-
-LICENSE="ISC BSD BSD-2 GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+anacron +inotify pam selinux"
-
-DEPEND="
-	acct-group/crontab
-	pam? ( sys-libs/pam )
-	anacron? (
-		!sys-process/anacron
-		!sys-process/systemd-cron
-		elibc_musl? ( sys-libs/obstack-standalone )
-		elibc_uclibc? ( sys-libs/obstack-standalone )
-	)
-"
-RDEPEND="${DEPEND}
-	sys-apps/debianutils
-"
-
-#cronie supports /etc/crontab
-CRON_SYSTEM_CRONTAB="yes"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.3-systemd.patch"
-	"${FILESDIR}/${PN}-1.5.6-autoconf-2.70.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with inotify)
-		$(use_with pam)
-		$(use_with selinux)
-		$(use_enable anacron)
-		--enable-syscrontab
-		--with-daemon_username=cron
-		--with-daemon_groupname=cron
-	)
-
-	if use anacron ; then
-		if use elibc_musl || use elibc_uclibc ; then
-			append-cflags "-lobstack"
-		fi
-	fi
-	SPOOL_DIR="/var/spool/cron/crontabs" \
-	ANACRON_SPOOL_DIR="/var/spool/anacron" \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docrondir -m 1730 -o root -g crontab
-	fowners root:crontab /usr/bin/crontab
-	fperms 2751 /usr/bin/crontab
-
-	newconfd "${S}"/crond.sysconfig ${PN}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}-crontab" crontab
-	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
-
-	insinto /etc/cron.d
-	doins contrib/0hourly
-
-	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
-
-	if use pam ; then
-		newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
-	fi
-
-	systemd_newunit contrib/cronie.systemd cronie.service
-
-	if use anacron ; then
-		local anacrondir="/var/spool/anacron"
-		keepdir ${anacrondir}
-		fowners root:cron ${anacrondir}
-		fperms 0750 ${anacrondir}
-
-		insinto /etc
-		doins contrib/anacrontab
-
-		insinto /etc/cron.hourly
-		doins contrib/0anacron
-		fperms 0750 /etc/cron.hourly/0anacron
-	else
-		insinto /etc/cron.d
-		doins contrib/dailyjobs
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	cron_pkg_postinst
-
-	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
-		ewarn "You should restart ${PN} daemon or else you might experience segfaults"
-		ewarn "or ${PN} not working reliably anymore."
-		einfo "(see https://bugs.gentoo.org/557406 for details.)"
-	fi
-}
diff --git a/sys-process/cronie/files/cronie-1.5.5-autoconf270.patch b/sys-process/cronie/files/cronie-1.5.5-autoconf270.patch
deleted file mode 100644
index d92761d6d4db..000000000000
--- a/sys-process/cronie/files/cronie-1.5.5-autoconf270.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 8191b84648efc4dd583fbbfc4350a9cc9bfd58fb Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz@fedoraproject.org>
-Date: Mon, 2 Nov 2020 11:05:26 +0100
-Subject: [PATCH] configure.ac: Drop the bug report e-mail from AC_INIT()
-
-Fixes #70
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 34ff51e..5b746ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([cronie],[1.5.5],[mmaslano@redhat.com,tmraz@fedoraproject.org])
-+AC_INIT([cronie],[1.5.5])
- AC_CONFIG_HEADER([config.h])
- AC_PREREQ(2.60)
- 
diff --git a/sys-process/cronie/files/cronie-1.5.6-autoconf-2.70.patch b/sys-process/cronie/files/cronie-1.5.6-autoconf-2.70.patch
deleted file mode 100644
index 958047784c5f..000000000000
--- a/sys-process/cronie/files/cronie-1.5.6-autoconf-2.70.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 44f6a0db3bac50deb11d15d3d847c41932afbfea Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 17 Mar 2021 17:44:38 +0100
-Subject: [PATCH] configure.ac: Don't use AM_CONDITIONAL inside an if statement
-
-or else configure might break:
-
-  configure: error: conditional "NEED_OBSTACK" was never defined.
-  Usually this means the macro was only invoked conditionally.
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8c575dd..b578431 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -260,11 +260,11 @@ if test "$enable_anacron" != no; then
- 	dnl obstack.h is part of GLIBC and may not be present on other systems,
- 	dnl eg. musl and AIX. There, we static link in our own copy.
- 	AC_CHECK_HEADER(obstack.h, [have_obstack=yes], [have_obstack=no], [])
--	AM_CONDITIONAL([NEED_OBSTACK], [test "$have_obstack" = no])
--	if test "$have_obstack" = no; then
--		CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/obstack"
--	fi
- fi
-+AM_CONDITIONAL([NEED_OBSTACK], [test "$have_obstack" = no])
-+AS_IF([test "$enable_anacron" != no && test "$have_obstack" = no], [
-+	CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/obstack"
-+])
- 
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
--- 
-2.31.0
-
diff --git a/sys-process/daemontools/Manifest b/sys-process/daemontools/Manifest
index 7f9a3f38ce6d..02584c0e8371 100644
--- a/sys-process/daemontools/Manifest
+++ b/sys-process/daemontools/Manifest
@@ -4,5 +4,5 @@ AUX svscan.init 681 BLAKE2B fbee204b3d8b109bca9912e23487a4ee28fabe3761b7b5fbf6d9
 AUX svscan.init-0.76-r7 688 BLAKE2B f5dcf76ed7c0a4aacabd20c1d2462fdfe5ffc22c5ae1b5eb45e58a238dd7a16c2efe647dfa94a3e014234288919df83b2825a1c63048ba89acd5476fb6085395 SHA512 171ca666fc788c564e1d081e90591e98367c9a9db37d9a05d31aa80c01c9f089360f91fb2b71337f7a046e857548c287df5aef054c43d5c93cc083163d602cc4
 DIST daemontools-0.76-man-20020131.tar.gz 8005 BLAKE2B 0c8f0ae71754516fda772b3771a9e68499aed17f3035dee3c2bb36012fb4e411cac9146eb5889306f00e03a14ef65194e1b6f76d45890175642405797da2201b SHA512 1767fafb2d92902f903637f08363031971bda007d1b7b53059551c740976d1c643229ccc44171796c1dcb43cbd875a17178edc634e140671817e0ef0ba3ad80b
 DIST daemontools-0.76.tar.gz 36975 BLAKE2B cb45c92fc06169b617befe9f9193377a07d31e9e6ae05526c299ce2a63c8009b599384a87f768fbe9283b229083ef74007b85662976cf7add5c855f5018fafa8 SHA512 e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7
-EBUILD daemontools-0.76-r8.ebuild 1369 BLAKE2B c07b3a92a75b95a4b71889595ea1966387a060a54a37612a422d37b00426bb26124c0d0e4a555ddc9f37143c526e35ea790a90ac11c6461bc8f58ad01ed4a216 SHA512 a3d9dc207c65b67d5d20d3c9e7130dedf6640f0363d3e48a8f4bdf84920997fa3d4c882b1a5510a88cc46a5282547a88b910f507529af7e698dd75dba3055a33
+EBUILD daemontools-0.76-r8.ebuild 1368 BLAKE2B 6a95002ca807ba1fffa69aa4a5846f4073e69a69257e9ab768dff797c16e2c833b94bfe74446ccf421801a7be3eeebc656d2f0e43e3ec4710e7bafc9847e2dda SHA512 12fc78050f193f5a6358008cab807cbcc0cc213ccb9e3e027e332cb59555c29a4f37cc73bcd4681152169b8658718c41d454a45a08759ca5560f51a495e6c350
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/daemontools/daemontools-0.76-r8.ebuild b/sys-process/daemontools/daemontools-0.76-r8.ebuild
index a20353e88856..d3d7d7abe836 100644
--- a/sys-process/daemontools/daemontools-0.76-r8.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz
 
 LICENSE="public-domain"
 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="selinux static"
 
 DEPEND=""
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 6357d05e7e88..a909090de804 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,6 +1,4 @@
 AUX disable-update-check.patch 992 BLAKE2B d06bc123aef2aec89bb4cca40334183aa5b6d198fcf9abffd15ad60f1c7c43f1e9a3103ebb5f2f743c83cc9d09cdf610c4e5d5caea89523f9ed37f3a4801e774 SHA512 02b06b01f8e3782da632677aa84b9131cb33dae3270677a1a4b0af3c139d100fa54c90c412d1e608e08859facb31e04768927e4862cfc4d9cfcbd061020a5dac
-DIST glances-3.1.6.2.tar.gz 6775046 BLAKE2B 3f65acbb69f8fc4323cbfbd30e79a0d30a9e38e9ff52ea0dc2286213daa66929e6abfccec34e94704fb87f6931f2a17fb30205c14da91f36b37617431bf58363 SHA512 2c62a82ebbc0d562d65f6e1ab39bac14a4b13d13e5fcbb1e98c119d6ea375387ef33b78cd911804504e3fdaa94260de27c211ed1132aae61f10fef8ff8a80fec
 DIST glances-3.2.1.tar.gz 6851329 BLAKE2B 3f8eb91a0957961d0ed2465d8025d25158303cc8332b7a976c2af0bbd671405aae3b71b1d3a63eeb86ddb0d6e500b955bb0e1e5a93c0ba0b88835f88872eb979 SHA512 e2f8a46a9bc3b2e3aa16d0716b34e06991029df9dec4c29ef70c65b5fb7c96dee3c71cc565b551e35a31aa1c7e1a92538b158c2e660d15b22defad8ae04c4eb3
-EBUILD glances-3.1.6.2.ebuild 2687 BLAKE2B ca3ed19299ceba3335e62ada116093489a26367bfd6167a0128e17ce0b0356745cde6bd16c4ed763597f28bf00df12b74ad864a0cbb7124ac087ef540f0f635d SHA512 053e8cebcd8b57b5f17ea13f9245eaa4b3d7c97280ace37b1c58a75e74f9f8ed7099504d86350e4a5303b26159bc9b324abccab800b940c85807f85d4a4bd3f2
-EBUILD glances-3.2.1.ebuild 2733 BLAKE2B 393a144a7bf121db50759bb0640a9ef5e6baf94eca10e438ab7fcabdb2ea3bf5266213d5966c05ac08353dfb71713e6483cf6827f370366f1290ac51e4e710b1 SHA512 742c0881b94a3d3e29659505b0dd9e910c923c0436cc2bd250221ef932de52cb723411d6a48c89e9c7493e34daa9a338b99e2272f87025cf1b7a476f5cb46dce
+EBUILD glances-3.2.1.ebuild 2730 BLAKE2B 2d283e515974bad92aa7564bf014db086714853b9e5d7e79501907ead2efd781c727e4a985da85661b1646cc296699fd97100ca6cdeae31f00801bde753fb4b3 SHA512 4279c64766099feb65e67a8689dcf2ce5d54033887c786883ffe03910e7bccf30f4b5ae019ff388cae4b7c3220fbc04a65da2623c98e89b56b77d1950f15933f
 MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73
diff --git a/sys-process/glances/glances-3.1.6.2.ebuild b/sys-process/glances/glances-3.1.6.2.ebuild
deleted file mode 100644
index 19815f285685..000000000000
--- a/sys-process/glances/glances-3.1.6.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 linux-info optfeature
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
-
-# PYTHON_USEDEP omitted on purpose
-BDEPEND="doc? ( dev-python/sphinx_rtd_theme )"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-PATCHES=(
-	"${FILESDIR}/disable-update-check.patch"
-)
-
-distutils_enable_tests setup.py
-distutils_enable_sphinx docs --no-autodoc
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-python_prepare_all() {
-	# Remove duplicate entries of a prebuilt doc build and
-	# ensure install of the file glances.conf in /etc/${PN}
-	sed \
-		-e '/share\/doc\/glances/d' \
-		-e "s/'CONTRIBUTING.md',//" \
-		-e "s:'conf/glances.conf':('${EPREFIX}/etc/glances', ['conf/glances.conf':g" \
-		-i setup.py || die
-	sed -i "s/, 'irq']/]/" unitest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	# add an intended file from original data set from setup.py to DOCS
-	local DOCS=( README.rst CONTRIBUTING.md conf/glances.conf )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	#optfeature "Action script feature" dev-python/pystache
-	optfeature "Autodiscover mode" dev-python/zeroconf
-	optfeature "Cloud support" dev-python/requests
-	optfeature "Quicklook CPU info" dev-python/py-cpuinfo
-	optfeature "Docker monitoring support" dev-python/docker-py
-	#optfeature "Export module" \
-	#	unpackaged/bernhard \
-	#	unpackaged/cassandra-driver \
-	#	unpackaged/potsdb \
-	#	dev-python/couchdb-python \
-	#	dev-python/elasticsearch-py \
-	#	dev-python/influxdb \
-	#	dev-python/kafka-python \
-	#	dev-python/pika \
-	#	dev-python/paho-mqtt \
-	#	dev-python/prometheus_client \
-	#	dev-python/pyzmq \
-	#	dev-python/statsd
-	#optfeature "Nvidia GPU monitoring" unpackaged/nvidia-ml-py3
-	optfeature "SVG graph support" dev-python/pygal
-	optfeature "IP plugin" dev-python/netifaces
-	optfeature "RAID monitoring" dev-python/pymdstat
-	#optfeature "SMART support" unpackaged/pySMART.smartx
-	optfeature "RAID support" dev-python/pymdstat
-	optfeature "SNMP support" dev-python/pysnmp
-	#optfeature "sparklines plugin" unpackaged/sparklines
-	optfeature "Web server mode" dev-python/bottle dev-python/requests
-	optfeature "WIFI plugin" net-wireless/python-wifi
-}
diff --git a/sys-process/glances/glances-3.2.1.ebuild b/sys-process/glances/glances-3.2.1.ebuild
index 1ed7716ee7bb..753157555415 100644
--- a/sys-process/glances/glances-3.2.1.ebuild
+++ b/sys-process/glances/glances-3.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 3399c17c566a..ff1c16a87bcc 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 696eb45743fc..3e26d7f873b6 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,25 +1,13 @@
-EBUILD dist-kernel-5.10.38.ebuild 383 BLAKE2B 80eec9edaf8e2502e3d24e3c4c48b98ef709ff2236aab76f8a1885f3423822c2f323cdb401e881f49f19c2a10024d69e97080e4ea265e62b7538c6500871d2af SHA512 232d47e93114609f82b9fb34db5cdf25f4519d5ae9942cebbf6018b554fc4f9a0486b37b8b83646b504fc8a75856af061c1c7d9516f91556ef01adb11b775322
-EBUILD dist-kernel-5.10.43.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.10.44.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.10.45.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.10.46.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.10.47.ebuild 386 BLAKE2B 11a2689e371fbe27889a66cd11c9bf8a830cf158d323c2f0f7cd189f842acb7d0219fdb13ffa8d303ff0ec9aebf8b4e838424d34e1ca9a885efea01ee2480c2a SHA512 728e27fec63978d59d57adcccd3b8fa2fd36c15a786eefcab7f2a9e8006127adbd6fad7855b7a8a7007ebecc1f01fec1ada67614b36e715740855119419ddb73
+EBUILD dist-kernel-5.10.47.ebuild 383 BLAKE2B 80eec9edaf8e2502e3d24e3c4c48b98ef709ff2236aab76f8a1885f3423822c2f323cdb401e881f49f19c2a10024d69e97080e4ea265e62b7538c6500871d2af SHA512 232d47e93114609f82b9fb34db5cdf25f4519d5ae9942cebbf6018b554fc4f9a0486b37b8b83646b504fc8a75856af061c1c7d9516f91556ef01adb11b775322
 EBUILD dist-kernel-5.10.48.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.10.49.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.10.50.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.22.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.10.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.11.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.12.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.13.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.14.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.12.15.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.12.16.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.4.120.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200bc799f0aba6693f174bc043be6a179616a25797d8411897c3fe6dcac975f3d7917d33171d3e0cfea8e842586ff68808 SHA512 763d2b93d60d712cdca6dfb85666b79d3e678a8ea3969609c8edd8f96f05d372cb768718893cbf7dc85e0a4615b1d3842fc1423d287e07c598d30f0bd321cf29
-EBUILD dist-kernel-5.4.125.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
-EBUILD dist-kernel-5.4.126.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
-EBUILD dist-kernel-5.4.127.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
-EBUILD dist-kernel-5.4.128.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
-EBUILD dist-kernel-5.4.129.ebuild 381 BLAKE2B 06adfc11a548a12345ed06ea95e1f0838a10a4ec5e311afa4ebdf9eaa2e816a83e8a34804b4d4838a14d2ae82e50213feff3819306c2f29067b478bdcb2f9252 SHA512 bc8a6969e370ed09d999dcc6dd975f69e4dab85d4511694d95bbd97a0aa0059fb1a5499f3b53d7970b7f87ef325b20d80eb1cf0b204f58f490b628e04045891e
+EBUILD dist-kernel-5.12.17.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.4.129.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200bc799f0aba6693f174bc043be6a179616a25797d8411897c3fe6dcac975f3d7917d33171d3e0cfea8e842586ff68808 SHA512 763d2b93d60d712cdca6dfb85666b79d3e678a8ea3969609c8edd8f96f05d372cb768718893cbf7dc85e0a4615b1d3842fc1423d287e07c598d30f0bd321cf29
 EBUILD dist-kernel-5.4.130.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.131.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+EBUILD dist-kernel-5.4.132.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 MISC metadata.xml 290 BLAKE2B bcb7e629ba04928387a13bfb6b95fc2acce4d8b2bdf2669ea1c6299a954c8e94b0e3b4d65cd4b424dd8da2e33405bfd0cac3a12ff2603faad3f69b516d0f0aa4 SHA512 6b8c9a6b6055c46b0cce5bbd155d53a0dd1115edaad016bade7fc1cbe3ee4a9c2097fa3392f9df6830546b36c65cdf99cf2ffda40a313117ab5f32249677c753
diff --git a/virtual/dist-kernel/dist-kernel-5.10.38.ebuild b/virtual/dist-kernel/dist-kernel-5.10.38.ebuild
deleted file mode 100644
index 340ca7eb117e..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.38.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.45.ebuild b/virtual/dist-kernel/dist-kernel-5.10.45.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.45.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.46.ebuild b/virtual/dist-kernel/dist-kernel-5.10.46.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.46.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.47.ebuild b/virtual/dist-kernel/dist-kernel-5.10.47.ebuild
index 00a3441127f5..340ca7eb117e 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.47.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.47.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.10.43.ebuild b/virtual/dist-kernel/dist-kernel-5.10.50.ebuild
index 3df38272de32..3df38272de32 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.43.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.50.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.12.10.ebuild b/virtual/dist-kernel/dist-kernel-5.12.10.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.12.11.ebuild b/virtual/dist-kernel/dist-kernel-5.12.11.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.11.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.12.12.ebuild b/virtual/dist-kernel/dist-kernel-5.12.12.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.12.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.12.13.ebuild b/virtual/dist-kernel/dist-kernel-5.12.13.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.13.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.12.14.ebuild b/virtual/dist-kernel/dist-kernel-5.12.14.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.14.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.44.ebuild b/virtual/dist-kernel/dist-kernel-5.12.17.ebuild
index 3df38272de32..3df38272de32 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.44.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.12.17.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.4.120.ebuild b/virtual/dist-kernel/dist-kernel-5.4.120.ebuild
deleted file mode 100644
index 98a5bc7d0b98..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.120.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.126.ebuild b/virtual/dist-kernel/dist-kernel-5.4.126.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.126.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.127.ebuild b/virtual/dist-kernel/dist-kernel-5.4.127.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.127.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.128.ebuild b/virtual/dist-kernel/dist-kernel-5.4.128.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.128.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.129.ebuild b/virtual/dist-kernel/dist-kernel-5.4.129.ebuild
index cffc4720f148..98a5bc7d0b98 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.129.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.129.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.4.125.ebuild b/virtual/dist-kernel/dist-kernel-5.4.132.ebuild
index 11d6573ded7c..11d6573ded7c 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.125.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.132.ebuild
diff --git a/virtual/fam/Manifest b/virtual/fam/Manifest
index 919b47fed888..0f4913ec7412 100644
--- a/virtual/fam/Manifest
+++ b/virtual/fam/Manifest
@@ -1,2 +1,2 @@
-EBUILD fam-0-r1.ebuild 478 BLAKE2B d0c4f234effc20e84e5760a28f3b8f48b4bf5a49b07ec17e5ad220068383c3566c92cca51a1b0369f7791cc192116914c02cf7bc9711ec55955b00ac0f600a3b SHA512 b89284d44a1df30ed5df59599cf78fccedecc49461b0265748595e3e1deade16abe1c4867d378d63acdb69046248ba292b095d185aba74ff42e520639bec9168
+EBUILD fam-0-r1.ebuild 485 BLAKE2B c083f6fb60a0a172e95bb6241c7e6b9dfcd38928c25c50f1083984e3082575991a08866c0c210a058327499ab2d4474799ed545919d04a45a5f9c46e47e546a4 SHA512 6cba11578629165f0460c1ae0703dcad241e21e6d386f59b4d7fe80fabbf2fe46b0d8a65c82d748c7c434e4ea318a66ce94a78380961134464c5796d3564cd2b
 MISC metadata.xml 252 BLAKE2B 269351d5fec6de1f8236181ef68d9a75ee1f8dca300a841e4e710502a04cc5383cd310672f7b629185647e441fb4e0b49edce1a39f3c2b2607c5e9d4897fdcb0 SHA512 5829caf1025801115ab3af6b5036f61fbdacf2d84cac533fc0d61e348d8387d19796469c213422f98fd61587ecb483b00b6993ae30434fa5e89e5361aeadc6bf
diff --git a/virtual/fam/fam-0-r1.ebuild b/virtual/fam/fam-0-r1.ebuild
index b3b834c9ea12..42f95524f48d 100644
--- a/virtual/fam/fam-0-r1.ebuild
+++ b/virtual/fam/fam-0-r1.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="A virtual package to choose between gamin and fam"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/gsasl/Manifest b/virtual/gsasl/Manifest
index 1ef330636086..a0e8631e9710 100644
--- a/virtual/gsasl/Manifest
+++ b/virtual/gsasl/Manifest
@@ -1,2 +1,2 @@
-EBUILD gsasl-2.ebuild 339 BLAKE2B 225cc3f4b86e59bc40c362cf54826a739c85301047f7b7d05b54ee6da737831d38be8e763e96dcf4252675d12c377afa8aaad2a664c8aa02f845bd728105c0a3 SHA512 01d789107c134b43399dcbffbaa026f7ee1502fb554c18a71e67e0a7189501f3fff77f173ae95aea9315fb1ae482e1cc99ddeb6852c476f6bef963de69809b51
+EBUILD gsasl-2.ebuild 346 BLAKE2B cd8559ae2c49b6382fc9325b1ce2a99b45cc71de95d4af8fd01428af9834482fe685409f9a9ee8ce5d3e0b10a2e8b17ef3b189041f0e5da981e149e735c26631 SHA512 323b7c61dbfd53891c1671ad3491cbe61bc8ed08a409ad4d0a05aacc8cc00149f26d1867740837d15303f68bbe1bebd1eaa99446bfe6bad5cfe50455b1e68815
 MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/virtual/gsasl/gsasl-2.ebuild b/virtual/gsasl/gsasl-2.ebuild
index 768f5a318046..a3693b92cfff 100644
--- a/virtual/gsasl/gsasl-2.ebuild
+++ b/virtual/gsasl/gsasl-2.ebuild
@@ -6,6 +6,6 @@ EAPI=7
 DESCRIPTION="Virtual for the GNU SASL library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="|| ( net-libs/libgsasl net-misc/gsasl )"
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 7b500dd9b40d..b92d566685fd 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,3 +1,3 @@
-EBUILD jdk-1.8.0-r5.ebuild 401 BLAKE2B ff964f93a5917410534587538f59c0dec6861e044c8b159d0ae6b0164cb5bcdbdb3e35128dfbb523d13c7fef66614754d557f0bd866b900c406bf5830ea72bc8 SHA512 55fcfacd3ddc255cc936c2a4c761ff7962acebc3c1197076851b90de29e421a8119a7467a9228d7bbd142a6124532d5a2325c6285dac20ef1fe19ae372492cda
-EBUILD jdk-11-r1.ebuild 320 BLAKE2B afe18794e5b998b9c09ba77b554a160c0ee4041f9ee87cbc32d17242c03bed968fae47413760da5474d204f974365f95a8ee4d3c12bfa2413cc4f3c2d22bae7a SHA512 e6093468ac7127de8bafb4b4f5309dee990b1916bc6e835d4eafb9c9c9b0686fd6805dd02dbb260262eb64147772900321165793da858c50e66e49df86728444
-MISC metadata.xml 260 BLAKE2B b37eb6d2d2182a4b64e7c3a9881a08a7072533de1f0920927c3c197f53db2a0ad57a44bdf47cf75cf08a93d6c55b2f6e0694227bcf07a606e337345131719cee SHA512 c4b63e127973fa92d06e9e1efb5d42571a9963a23c60e50039d8a4fc31b2ddfeac407deae9e03c2c1636957b3b3c53ba3944c03978958bada06a7996337fbb7c
+EBUILD jdk-1.8.0-r6.ebuild 481 BLAKE2B 4dceecb033e5ac793574de2b244c3562690d17b8c8fbdca133d70810904a715d61f9ac440ce023011c6c4057a95cad88facaccaf98f3e0c45f56e31672afd3e3 SHA512 5e0fa11e168efa9cdf3d9ccdd76b2e3da8b240a419505e93eb28d6d83cd39e0629855674ab5a737c19d1157d352234a0b5fa7a852c75ded74848b8eafbe057bd
+EBUILD jdk-11-r2.ebuild 368 BLAKE2B cee739058d7440f90d7df0dcd51852d760f05f7bf7a358ea3b46d12563bf946e0379ba78d87e358816bcd133c089c6e684d8377aafee24bbb37b3f01dfbeb10b SHA512 c98d5bf5af5ad469dcdc00da7aa89e8888f9bed61a1578a635ee3aead34f2374e1bd0a23e1b82b8ad6f666783c292930b49c0fe43181e1b2113740362f8ecee4
+MISC metadata.xml 367 BLAKE2B 80910cdb666e867df5c978ec9023f5efeff97090011483ba43a203c17d1d7448d2c1badf16e2285ed95d9b04383dbea73bc82ea0e1d9136cbbdea9580f2cf6e1 SHA512 35453938f1c92944314b416ad3a24bc7015b3146ea5fb650d82ab05dc6b161982e81f4a5ca432773227de2896c6dcdc9594bca8d85f626d9d195bdf9c2818974
diff --git a/virtual/jdk/jdk-1.8.0-r5.ebuild b/virtual/jdk/jdk-1.8.0-r5.ebuild
deleted file mode 100644
index f20b926921f3..000000000000
--- a/virtual/jdk/jdk-1.8.0-r5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
-
-RDEPEND="|| (
-		dev-java/openjdk-bin:8
-		dev-java/openjdk:8
-		dev-java/icedtea-bin:8
-		dev-java/icedtea:8
-)"
diff --git a/virtual/jdk/jdk-1.8.0-r6.ebuild b/virtual/jdk/jdk-1.8.0-r6.ebuild
new file mode 100644
index 000000000000..62bdccc8153a
--- /dev/null
+++ b/virtual/jdk/jdk-1.8.0-r6.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
+SLOT="1.8"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="headless-awt"
+
+RDEPEND="|| (
+		dev-java/openjdk-bin:8[headless-awt=]
+		dev-java/openjdk:8[headless-awt=]
+		dev-java/icedtea-bin:8[headless-awt=]
+		dev-java/icedtea:8[headless-awt=]
+)"
diff --git a/virtual/jdk/jdk-11-r1.ebuild b/virtual/jdk/jdk-11-r1.ebuild
deleted file mode 100644
index 4548106d09bf..000000000000
--- a/virtual/jdk/jdk-11-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-RDEPEND="|| (
-		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-)"
diff --git a/virtual/jdk/jdk-11-r2.ebuild b/virtual/jdk/jdk-11-r2.ebuild
new file mode 100644
index 000000000000..d7963a0f6c84
--- /dev/null
+++ b/virtual/jdk/jdk-11-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="headless-awt"
+
+RDEPEND="|| (
+		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=]
+		dev-java/openjdk:${SLOT}[gentoo-vm(+),headless-awt=]
+)"
diff --git a/virtual/jdk/metadata.xml b/virtual/jdk/metadata.xml
index e6adb0833e2b..f07a294e100c 100644
--- a/virtual/jdk/metadata.xml
+++ b/virtual/jdk/metadata.xml
@@ -5,5 +5,8 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<use>
+		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
+	</use>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/virtual/szip/Manifest b/virtual/szip/Manifest
index 809fb6841502..87be20e4b1ef 100644
--- a/virtual/szip/Manifest
+++ b/virtual/szip/Manifest
@@ -1,2 +1,2 @@
-EBUILD szip-2.1.ebuild 334 BLAKE2B a28c8a392964dd84e3ada6393dbb1dd8a5a2b71c30cdd2014e7d99a8ae39628c824f6a5389a4f99b84790dc9e4defef217e78fb7f9c60d5ad2f51bb83fefb0eb SHA512 78560edc629b609cce2e507f547edbde617fe341bb336c52d395e3124edd3570760d52dc3acc92361925d44126dc2afa109e98ccfa7e3929b032479f701f64d8
+EBUILD szip-2.1.ebuild 341 BLAKE2B 8e46c9e097d239573d641429a1e086d6ca647908f746535650abc01dfa17e3d07c3bd69afb5e3cd55ce76d4815e7122902c51662d3ac8b675efa7c0d0bc0af21 SHA512 b7702ccaf2374f2703730431ecfb557c8d7f3384e7c464a497b9e820b7119c3ecc9463d0d2dfc687bb986d4594cb355878c5c7c4a8bac54b666db0b98d64aca7
 MISC metadata.xml 277 BLAKE2B f7ddd373063940f565a3c424a8cc9a3e092d44389a56930db8a875b880d5a6b2ecf644d4605342199f3dde5332caf903bf094daa554bd9abac6919230e371e21 SHA512 970154fcadc29300b663def3d2b5c46b1cb934694850e67ebb72cd9a5d838b602690379db0eac0cb013f618d977e2141df4dee89d0c5fefeb2b672a7dc86ab17
diff --git a/virtual/szip/szip-2.1.ebuild b/virtual/szip/szip-2.1.ebuild
index fc67b7848ae1..606cfe14fd83 100644
--- a/virtual/szip/szip-2.1.ebuild
+++ b/virtual/szip/szip-2.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Virtual for szip compression drop-in replacements"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="|| (
 	sci-libs/libaec[szip]
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 032f02faae73..ef50a92b1cb8 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 1ddcfc3538db..56c260fbfbd8 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -4,5 +4,5 @@ DIST mod_qos-11.65.tar.gz 1247087 BLAKE2B 145af39814f974855520415c3bf114aa11ac90
 DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6
 EBUILD mod_qos-11.61.ebuild 1018 BLAKE2B a767c7a386589ba71393c8f7c9b6cf1086d02dc70b9b2349230cf91628bae7ee4633eef70d932ac34a780156fe12deab23c8782653e4bf9e444e200b7e7ee78e SHA512 880a9b2920d2604630d0f9a813bfc38a1a469f4de9a3c731bef61dbe122f094e4b681d783228aaa71b0229d08e95d9362d23adccc8556985eb193a5b0dacfd51
 EBUILD mod_qos-11.65.ebuild 1165 BLAKE2B 3e289624c4779988e86e9f5814929aab89f09f20c37909375f2d2084c10a691f65899349556562e1030b89eb207b3bb25b6e168e5e3c6d4bd28312674e59b126 SHA512 d7e2a30f9021da10dee0c0961c064d9649a74354406d8741f815163ca40c391e35f6509fac8453c450c94b4982eb5c3dd780ff824478c19c9466860e77f21d35
-EBUILD mod_qos-11.66.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
+EBUILD mod_qos-11.66.ebuild 1141 BLAKE2B 4c08f022489736efcf3833b70c6ae90663ccb34bbed965e14b55e4c028c039e1e438618ebd153eca1e22c2b0f1a541a68c2383d4b80d8cbb7bd549a766bb6f06 SHA512 54ab558430ec323df724e4f4d2a2c0019c94f97d656b1d75107b0e1ac0a905fe4cce2422f28d79342aae2b41f7466461fd6480518a0d6d89c3396f26dedfab4e
 MISC metadata.xml 325 BLAKE2B 322d2ee01e15bccbfc982530d0d51a66646a30d3c937d514dd5967ad5501325ecb6d2ead18b63f6255532fbcd80208b29fa325d90cfe8d65414fa7013c2af7e0 SHA512 392b5e28cca1b7b253349524117b22242a465f5413ed06ad844f51873f0c8b2c1d90d6b6b79c7dd6ebc2004be5d0b1757cd24ddcfb56ee12d0e1be325a460be5
diff --git a/www-apache/mod_qos/mod_qos-11.66.ebuild b/www-apache/mod_qos/mod_qos-11.66.ebuild
index 412c8e3c8eb5..58b9e562e955 100644
--- a/www-apache/mod_qos/mod_qos-11.66.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.66.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/libpcre:3
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 21b844d8b662..62f59d054015 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,10 +1,10 @@
 AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b0245c2c37c27cc69eeba9be62c8b626b8fdf26c18ddffe0a06743abf1d529318f46c0091f64370f2a9d82f1b54116 SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d
 AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9
 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
-DIST passenger-6.0.6.tar.gz 7347506 BLAKE2B 16332ca5c299c366c891eef0267889d024417bacafafb9b6faed94434f16a3823fd21e9251eeefe190a682e8530b49cde4af22008b1537466ee3d685554dcbac SHA512 57a013dbbddab13862c2d5445d048aafdc5a56297c56d3d642a39fe7757d3bcbd7e9e21aca36ebeb0f54a03d26e0886031a947cb098026a516900cc5bff42f0c
+DIST passenger-6.0.10.tar.gz 8178910 BLAKE2B 9c7b8e05130e7242cb13986b97582786d77c2d5341620bd3594f428ecf26bf983262ad92b7b8a21666bfa262de0f4d148cef56de2015c0e2b42a3d7d87db2b43 SHA512 5ef2170cb9e55de37cc2b561f2f5c6a6406c71d70b248078ac5086d9d6e9ba90efcf223f1ed6b14774c8eb008d7cb6e98f3d5f8a088126ea697638a8dce6741c
 DIST passenger-6.0.8.tar.gz 7567855 BLAKE2B ea8577c07a57eaea4e3b2b236808c9e54badb35368e948132af04220026b2676a71d066625a64cd98ce35118ae613bcbca8a0a1f8e0bc2a8d321c1165dec72f5 SHA512 ad35bee4a1c855b8f5401ab44e2a9b0cf3281e7fb1d8e09c8b12c54a465545d43285301c7d0fe16914e3c0fd5407d0d5cef31bb296f850d787903e6e006b368f
 DIST passenger-6.0.9.tar.gz 8180342 BLAKE2B 41bdfe06fe3dd94cbcbe44b8a9e2945447662a00b082c94d84196c13ec597c8aa6f5b34ff7855d06a983a27673c6e5c65426dfee20bcd601cea03cc2035a9da0 SHA512 fbb7a5a9e222672ea2db13f92de0710b84cde530d67633ad31265a1e34bf8a79f006a9db35eec45200d61c1084f0846275a06b55c717cf35ccdc7a8e878d37b4
-EBUILD passenger-6.0.6.ebuild 4069 BLAKE2B f644fe935ff16ea908a7f6580d5fd12740b82ccfa26fae074d94df6f4ea46dec16ffab107ce9ef113e210f7eb90d5c9af4a92491f787271088b5c12a6811edbb SHA512 17357f9f346368021aca4acd3cb7516e7d1b340b5838c62fc7b43c3f7125d6fd2cfb5e116b3ca3ab7070c8203f6790a5c23beeea42fff0255337dab42b6df483
+EBUILD passenger-6.0.10.ebuild 4025 BLAKE2B 0689d1e5588c8de1de39522b958e7504b45a7d250e76a4343594cafbe3509f63c74827c5dbfab5e1c908ce1374cab25054ff68ab1acbc1d868bd07fe54412936 SHA512 415c10f66957e2a12a720b8f3672278d128491a1f4b7b93b69482ea4d8bb6044b5ce713dbadae4ed3f6b389f75cd527ba2a5cff811aa72a93573fb0c56435f9d
 EBUILD passenger-6.0.8.ebuild 4076 BLAKE2B c715fd27326957b5398514c2288562ab600628cf00d37c7bd8309859587ae3d7a5da6f3d9e5ba339bd0c44c2ec67afeefa080399591eb4ae4616599bb70c8665 SHA512 ab6c553a6a1850915e70228e31f48867fe6e825089a350a7cfa30eab7bf04db3258e9848ff62012a925dc714e8fe0b2612deef577e50d0315b357a2aa9a96fc6
 EBUILD passenger-6.0.9.ebuild 4032 BLAKE2B 323cef5a46100ef17eac571e87047e2458aa5f20796f6f1f40930bb87ce8f586724ac4971759623c888106eacaedffb7a814f0a662f32534be5f481cf38b754d SHA512 4aeaa508c085c0a2478c72301f9d0da0183445864b0af6242ae889615e1ff30889488d368aac77d6cf1af4042757e17b10de1ae66a8519dda01f85994405591e
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.10.ebuild b/www-apache/passenger/passenger-6.0.10.ebuild
new file mode 100644
index 000000000000..52d626c53cbf
--- /dev/null
+++ b/www-apache/passenger/passenger-6.0.10.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="apache2 debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.8.0
+	net-misc/curl[ssl]
+	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+want_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+	depend.apache_pkg_setup
+}
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+
+	# Make sure apache support is not attempted with -apache2
+	if ! use apache2 ; then
+		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
+	fi
+}
+
+all_ruby_compile() {
+	if use apache2 ; then
+		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+		 APXS2="${APXS}" \
+		 HTTPD="${APACHE_BIN}" \
+		 FS_LIBDIR='/usr/'$(get_libdir) \
+		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+		 RANLIB=$(tc-getRANLIB) \
+		 ruby -S rake apache2 || die "rake failed"
+	fi
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	RANLIB=$(tc-getRANLIB) \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	if use apache2 ; then
+		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+		apache-module_src_install
+
+		# Patch in the correct libdir
+		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+	fi
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	RANLIB=$(tc-getRANLIB) \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apache/passenger/passenger-6.0.6.ebuild b/www-apache/passenger/passenger-6.0.6.ebuild
deleted file mode 100644
index 66e88d824559..000000000000
--- a/www-apache/passenger/passenger-6.0.6.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/"
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="apache2 debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
-	>=dev-libs/libuv-1.8.0
-	net-misc/curl[ssl]
-	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-want_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-	depend.apache_pkg_setup
-}
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
-		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
-		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
-	# Avoid fixed debugging CFLAGs.
-	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
-	# Use sed here so that we can dynamically set the documentation directory.
-	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
-		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-		src/ruby_supportlib/phusion_passenger.rb || die
-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
-	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
-
-	# Make sure we use the system-provided version where possible
-	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# Fix hard-coded use of AR
-	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
-
-	# Make sure apache support is not attempted with -apache2
-	if ! use apache2 ; then
-		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
-	fi
-}
-
-all_ruby_compile() {
-	if use apache2 ; then
-		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-		 APXS2="${APXS}" \
-		 HTTPD="${APACHE_BIN}" \
-		 FS_LIBDIR='/usr/'$(get_libdir) \
-		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-		 RANLIB=$(tc-getRANLIB) \
-		 ruby -S rake apache2 || die "rake failed"
-	fi
-}
-
-each_ruby_compile() {
-	append-flags -fno-strict-aliasing
-
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	RANLIB=$(tc-getRANLIB) \
-	${RUBY} -S rake native_support || die "rake failed"
-}
-
-all_ruby_install() {
-	if use apache2 ; then
-		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
-		apache-module_src_install
-
-		# Patch in the correct libdir
-		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
-	fi
-
-	dodoc CHANGELOG README.md
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	EXTRA_LDFLAGS="${LDFLAGS}" \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	RANLIB=$(tc-getRANLIB) \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 934ab79a89c5..096375a97a47 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index c2c65a120618..64b34721de50 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,20 +1,12 @@
 AUX grafana-r1.confd 870 BLAKE2B e222e17f5a14dc48f9bbc922250754d88610a951b1e6230736fffc0624a24a140bd9a9f11c6900e0f57b652ce3f334963ea453a5db5ee667863c6b69acc0f207 SHA512 cb6836ba69b9d1f0c50778823c507eaffd963341edbc4ea5409d0b068cfcecececfacac71e34b1d546a85674f67b12db99f384e5c6aa2186abe86814818d5db1
 AUX grafana.initd 1498 BLAKE2B ac97391c228c09353ef11efb0de37f25802484fbbf71bccedfc9858079ca679ba1567a2a7a40e250ed1fa7477189c30b8c5f175e607b455ae755566a9d89098d SHA512 c3ef1926fabe53728adca6954eb48e8d69c33b4238795e2d0d0406e55e08b3f84760b1abfec556f258af3184e10e6fa116c1b21c704575a54f88050a5266ec87
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-7.4.5.tar.gz 51268864 BLAKE2B c59e16dd8cde882c8f7ffaa3352aeaf38f2fa1e5da3d340796403b0719d33b9eeb5fb7d8ac54b8321f2617d534a3121d2f8a86462e7cf07019baf2a08b141cc2 SHA512 8ad7e2fa9ca92a406690f5a14ea111ff329e6abb4330d4ede5bb34870c3d28cdec940db4c849bb99c097276ad10a3d4c70cf6b73ed8286d45fdf056673d0892f
-DIST grafana-bin-7.5.1.tar.gz 55420645 BLAKE2B 1100f68eeaeda5dd4d7928c0e16bcefe686427866472a750228eaa5612bc7c7d40db24d8767ae8e9766d70593de2504c57cb8a145efa1ff81074d38c69452ca7 SHA512 bee8b95820a8d8983aa430ee1e7de65da0b90ecfe0eeab8d8a5486af818a4bede73846bcc5aae2c9735204be004171ae98bccd7546d3c0220030260f1f1ed203
-DIST grafana-bin-7.5.2.tar.gz 52181388 BLAKE2B 7203ffb42169d9b92b2f251015195373abe58619ec7da7e65037d30a7a856e02dd07abc93c41b4f911fa1bd8b382d29e753f75b6717e65f211687127f0ce7ad9 SHA512 4eeff81371149f22f0c708d467623ace32ef1c9cd812d232c21323eeeb9bfa4e54658bca875b6c40c9b25caa4a56ea43e39b5389753348cc79710228ae135309
-DIST grafana-bin-7.5.4.tar.gz 52194914 BLAKE2B d2a6666d0d45116fe8b3241d38bef837e306c621fd9eb1b4e3b99ece17465e93643a9a0ba98504255b32826a97d91559bc04ba2eed9bfa9398d7346e8147439e SHA512 690038d39269341f435b79d430e11d8e1a54367ae2ccf3b5f625b8e7b87bbce2f9c650e1b446522a475c7c3b7da91786e93d5964150c9c208471febc1e498300
-DIST grafana-bin-7.5.6.tar.gz 52195022 BLAKE2B e74d54600813905d380b39adb12caf04aebd40e2ba1f9079eb36aa71f6b4813f89e1c68a5dd54149f06774aeba49d17009c751ef2dfd5de5cd4ec0ece9a90847 SHA512 f5472c6e12e9f67d96ef50e7646efc994cfe706837ffc38c0e35caae6aac309fa4a28f2ac7eb40ad2a829ea84c84d59ee76149793bf9e025f1e038276521174b
 DIST grafana-bin-7.5.7.tar.gz 52194760 BLAKE2B 4cc60188bb750c0d36d8b50336f51f8410cca5a730a93cd1536479dabefba79c955cddec554e7fabed782bdcbdf751c33794f893b4e0981214f3fc1041ee976a SHA512 ea5e9eef7a013e770abe827029bbb2b8b3ccfe28db985541597677671510e4c76b42009ceddfc687d23c249be792b99f1e8d5d518a271f36c4497d38380f0b54
-DIST grafana-bin-8.0.0.tar.gz 55509260 BLAKE2B 1341781f711a8f554f502bc312663be20eee6f5c6ba2f0817eaf1ca5daf2f6f9b29dcff1a23f053692a320281f0f8c208670f14b334559c2d0dc1ad35cf13127 SHA512 778e3c8fce0ec4ed29af4c095baf25e4641477a2fc5fe91ff45d75ecc74ae7a65b29e62708137479628eff00e454d03fb92344692ec05484f8f1c7949527a516
+DIST grafana-bin-7.5.9.tar.gz 52215297 BLAKE2B 06fa63811f950081a581d402527a14660a7eac3cb00455357329b0da27874244e38265f78b2dbfd41d9ce8f7551f1dc9fc297138600e6d7430c70e3c82423178 SHA512 0e6e9504f6767d5d226954a3c61544353c4442ad56ed86124e3520c2bb35e4a401c3fc5fb462dbdacb5c31f80de3478d7db9c06f2a85131346185426b67e0837
 DIST grafana-bin-8.0.2.tar.gz 55512802 BLAKE2B fd535c8e1fca3136913ef1008c6e5ef8efa2871accc7a035354afd4b79a6e4d6340749c460c8c3d15e9edc07c426640b349c688a64ab678d61809f88f81b913a SHA512 d2421ba74b3eaaff3091fcf5015e6ca5cc050e205276b4d873a8d1fb3071cddd20fa846d9a03044752079564a458172e084ef69db4609fb520897a4f1d6fa4f2
-EBUILD grafana-bin-7.4.5.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
-EBUILD grafana-bin-7.5.1.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
-EBUILD grafana-bin-7.5.2.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
-EBUILD grafana-bin-7.5.4.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
-EBUILD grafana-bin-7.5.6.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
+DIST grafana-bin-8.0.5.tar.gz 55588076 BLAKE2B 85845c7492a4dd76b47d959cadbcfb1bffa1f00b295296e4e8ae3033e4a52f654551a66f781f34d4ab4666bf05681bf3ced870fab6c59f758f9814fe67e5b1d7 SHA512 c0df8ee147c4876e29fd8b4f7943550b4c615787ecd50e7a40eee68d8f64bd4e9958e2473e00fc4244e4440f01750cf7b349a4baa769d69ee61c043538679a56
 EBUILD grafana-bin-7.5.7.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
-EBUILD grafana-bin-8.0.0.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
+EBUILD grafana-bin-7.5.9.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
 EBUILD grafana-bin-8.0.2.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
+EBUILD grafana-bin-8.0.5.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-7.4.5.ebuild b/www-apps/grafana-bin/grafana-bin-7.4.5.ebuild
deleted file mode 100644
index 229e2a789b9e..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.4.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana-r1.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		elog "${PN} has built-in log rotation. Please see [log.file] section of"
-		elog "/etc/grafana/grafana.ini for related settings."
-		elog
-		elog "You may add your own custom configuration for app-admin/logrotate if you"
-		elog "wish to use external rotation of logs. In this case, you also need to make"
-		elog "sure the built-in rotation is turned off."
-	fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-7.5.1.ebuild b/www-apps/grafana-bin/grafana-bin-7.5.1.ebuild
deleted file mode 100644
index 229e2a789b9e..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.5.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana-r1.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		elog "${PN} has built-in log rotation. Please see [log.file] section of"
-		elog "/etc/grafana/grafana.ini for related settings."
-		elog
-		elog "You may add your own custom configuration for app-admin/logrotate if you"
-		elog "wish to use external rotation of logs. In this case, you also need to make"
-		elog "sure the built-in rotation is turned off."
-	fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-7.5.2.ebuild b/www-apps/grafana-bin/grafana-bin-7.5.2.ebuild
deleted file mode 100644
index 229e2a789b9e..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.5.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana-r1.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		elog "${PN} has built-in log rotation. Please see [log.file] section of"
-		elog "/etc/grafana/grafana.ini for related settings."
-		elog
-		elog "You may add your own custom configuration for app-admin/logrotate if you"
-		elog "wish to use external rotation of logs. In this case, you also need to make"
-		elog "sure the built-in rotation is turned off."
-	fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-7.5.4.ebuild b/www-apps/grafana-bin/grafana-bin-7.5.4.ebuild
deleted file mode 100644
index 229e2a789b9e..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.5.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana-r1.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		elog "${PN} has built-in log rotation. Please see [log.file] section of"
-		elog "/etc/grafana/grafana.ini for related settings."
-		elog
-		elog "You may add your own custom configuration for app-admin/logrotate if you"
-		elog "wish to use external rotation of logs. In this case, you also need to make"
-		elog "sure the built-in rotation is turned off."
-	fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-7.5.6.ebuild b/www-apps/grafana-bin/grafana-bin-7.5.6.ebuild
deleted file mode 100644
index 229e2a789b9e..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.5.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana-r1.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		elog "${PN} has built-in log rotation. Please see [log.file] section of"
-		elog "/etc/grafana/grafana.ini for related settings."
-		elog
-		elog "You may add your own custom configuration for app-admin/logrotate if you"
-		elog "wish to use external rotation of logs. In this case, you also need to make"
-		elog "sure the built-in rotation is turned off."
-	fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-7.5.9.ebuild b/www-apps/grafana-bin/grafana-bin-7.5.9.ebuild
new file mode 100644
index 000000000000..937332ec5f09
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-7.5.9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "${PN} has built-in log rotation. Please see [log.file] section of"
+		elog "/etc/grafana/grafana.ini for related settings."
+		elog
+		elog "You may add your own custom configuration for app-admin/logrotate if you"
+		elog "wish to use external rotation of logs. In this case, you also need to make"
+		elog "sure the built-in rotation is turned off."
+	fi
+}
diff --git a/www-apps/grafana-bin/grafana-bin-8.0.0.ebuild b/www-apps/grafana-bin/grafana-bin-8.0.0.ebuild
deleted file mode 100644
index 229e2a789b9e..000000000000
--- a/www-apps/grafana-bin/grafana-bin-8.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana-r1.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		elog "${PN} has built-in log rotation. Please see [log.file] section of"
-		elog "/etc/grafana/grafana.ini for related settings."
-		elog
-		elog "You may add your own custom configuration for app-admin/logrotate if you"
-		elog "wish to use external rotation of logs. In this case, you also need to make"
-		elog "sure the built-in rotation is turned off."
-	fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-8.0.5.ebuild b/www-apps/grafana-bin/grafana-bin-8.0.5.ebuild
new file mode 100644
index 000000000000..937332ec5f09
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-8.0.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "${PN} has built-in log rotation. Please see [log.file] section of"
+		elog "/etc/grafana/grafana.ini for related settings."
+		elog
+		elog "You may add your own custom configuration for app-admin/logrotate if you"
+		elog "wish to use external rotation of logs. In this case, you also need to make"
+		elog "sure the built-in rotation is turned off."
+	fi
+}
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 670f2d2da457..0a85a6717570 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,5 +1,4 @@
 DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod 22 BLAKE2B c2b56c0b043a2c0225c3b4142f179a2d2e4938dad64b95c8662a6d641e69a455b50ed79c66a3bcc10982792d3b7742ac96a2d74eefa7fec40a7c3146e5c949cd SHA512 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
-DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.zip 220785 BLAKE2B 2f8ac1b8023d5c4bf650fedd47e7d07cd9dbd973fef92cb2e4f8933f7f801c4704168e1d5a47e0f65b0ba06d8ff8276e06c4eca5c71cd418b53fe2c9a5ed1361 SHA512 785a166a0b658958784508e790b83fbffe772713fb6225e837c6f62149f09f93b1a013999becd8074d7d66a26b7cc237f7fccc66a436257ac8a222fe011ae316
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
@@ -31,18 +30,14 @@ DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod 489 BLAKE2B 036e068699429032701dd26044fd2353645e54260a7aab7f924fbfa1e1954eb814addbd9a0751ed1c786ed6c44566db5289cd4ba9e54727d5b24b6edd38a8562 SHA512 5f6a8f8f2d4ab26bdf3f150f22e6ef4feb26f264630315fdde8c171b6c2da5314057c4d763d4c61a66bc42badeba2745f576d52009c4549919e4afafa748b3be
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod 649 BLAKE2B d4ef60eed1eb5c4b84623a6bfb8bcdd52be49ea6723e2c39f8c7c87e34943aed3629d7413fbffbbac9e888bfbafd6f0f07ee84002901afb3a8cf1090b87b53a3 SHA512 3adbceec8b4bd989e804054b56e271f73658adc8a4a8bd53e32ced709a8796b33d9cf09f5ea3165dff931acc942de45508ae79634dcd9722c2220814b275f425
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8e88465ca9c754b798d6f1f270e1fe5891221d482f6b5854524d09e3d19b6f75e494f69b4861e2f1b2329c08fe9e4235005f2dff41928950dccc3 SHA512 74886885016c92ce56b584665bdcc925404bab745a25ace03dacc2ace3f812a0d568ab8d19044097906b9da479037c41468c33f1243e6d55b36fba4571117607
-DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.zip 435519 BLAKE2B 82e17fb4d65077c8b6b018853203880b5b55293d1763ba7d3fffbcaa04a086d86e68012513a85a72e077a8e24570176242e7b84fd9029899c5794cec51c33b12 SHA512 f9841e6e63f490e02a3660894a079aa6664df8adfff6eb0bf3b10ab9d8a6e625af1bc24ce447f29a8b25869eea35a9d1c05493b380e4aa52cf35b261ce780228
 DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
 DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
-DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.zip 279892 BLAKE2B fd5e1c812d8f1205c9618fad851923013eb1451463e96b472ddb1b355dfab1abd41b469e49da0329687a3d7876578127a47fc91bc95efb2e6547570b8f2cb5c0 SHA512 08a1fad4b3a243f047da01abdeecd206c699f6cf5910c8bea430b478d383c8f0a49e54576a51277d292cac1bdfdf739702e67bb1c869e92a5a8b37e05c52c882
 DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod 568 BLAKE2B d3d62f2d5c018c4ea3c829f7485e5a1239e2d810f79306af4d08ac32acda4d33e8e90c66c63540c4c95231f5fa116634758858dbf4af2a953a17b0db2b5c1cc9 SHA512 adb3d294ec1e9476bed820afa92aea5cabf77e7996d83bd1f03dff8447dfb13dd18ab4f091ad6ee209128151dcbfedb4967f99ccf7e10f5286e90b2ad56441d6
 DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.2.0.mod 501 BLAKE2B 1e22788217aaa9af1032f156836507be223e081aab468603c247bb43c13130ccb479db21770c6f5b8aba377eb11cc6cf31eac2d0510d6bab8027998056a09cc9 SHA512 757a0382094c23828b55177c6a0bba135f0ee308030afcfc0efa48b705c6b39720ed44b60e69ce08f7c0d26bf548ac4511e2ffe7abdbb22271345dac02ab150b
-DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.2.0.zip 324305 BLAKE2B 655225ba92be46880108cfc2645cf27015864d1238a8204eb3edcf713551d9a914506a54855a8f9738a1fe3d3412b1dbb0ae2395f7cf7907adb9faea942b2cb5 SHA512 d2fcf62f14dc2db1a79888555eeeff4ad2f8e6a04d4dfd397c4ea09ae14c2e51917400217734510c7c995c4eb8e03b4f699484c3761ec393ca070a6808765b70
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod 625 BLAKE2B 43378388e5a3391a431d0e842e23ef1fc74263a797bfefacebb61ad88b42f21d133d99638f06e03cadb7894d271884f06d1f3ad9743648c31b7d22bf7e19283d SHA512 0e2dc636df1de8119b3b4153466d8f31b4e2e9fa637c625ea0a7fd94951ee38edc02064cc00d7fe9a4d9f7e3d1ed521809003602398d68508772b11939755cdf
-DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.zip 155284 BLAKE2B 2f34e52933d8270823785913452ef79e28734c0b9854ced38e741a40d710ab44e43e7a4ca15f7b7f94f3d267743e3e404cf34d99746443514668c3c4d89e407e SHA512 fe4b98a54e759038763f6b83a4fc34af85e1b9815b0ff86db179d516b7ce4a7e7330c52fd553f5bd7de15358cfcd6c48212cc11f3eaae3ecc98ea4a0d3ecf082
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod 622 BLAKE2B eda541042b6fe3c3f77512f322d535505b5545eb72dec0f4f3440af05e037bda987f1f97faf7a94ec946201e8ca26a2220bc570d7a9c40a08cfadd724fc2973e SHA512 2825d124965f45e40b36bc1d2f8133f8a1fb5ff94dd95d2ae4383bc4a300ddfe0efb75ace2f9408582525c377769bd1f75cd3c0c655c74aa75708f7a66c56352
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip 435484 BLAKE2B 9328cbd2918a76440a5c293799c51ece96f5b09a1bf355856880d3c8311df149bd28ba481e77e32aba48a49d5a532d1f2ea3e0c45d5a63391823fa1d2f24acbf SHA512 33e6cfa9a71e774e3d4b70afa390b86fa3700c5f833c6ba64d22d4bb8e06f51c33cd4880a11b4b69086423bf808cffecf1742d5ff1cdf025790f230b1a0bc27b
@@ -51,29 +46,20 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.9.0.mod 622 BLAKE2B a42e9934050061d92d67584c4aab99d959950f2987eaf561c87bea21e71e9f6480f3a48af9f4aff60afa0b96a4e719271d3c1457ef82f68bbd7de32e6490bf2a SHA512 ef04f114d4be7dd29ccc816c60f5a928ff0ca29cd9fef913acba94e4fc2c28f9e6fda22795245280fde536d755f1875e3c54f60b4cbb40b2d2afacf5c51c4350
 DIST contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod 120 BLAKE2B 326a975321b8f3912d8c91f69fd27e3e59b8e0921c4cd41fabe2ae77a2d5ce183e4ab7ae5acc98e72626ce30a1d4c16a3cf808618b8beec553b217aa5f73935a SHA512 e47a5e15b0e0b884fb8a9b27778f557cb170c974200848447a59c43953c3d0c3fc6895ad962e47cc6839a1a8efb1680fc1ae229abb9324227ccac9ed5954e2bc
-DIST contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.zip 34195 BLAKE2B d82028d4a0ca1e648593bdd63e03a0e2d059b430674a536aa5631c8202a92a15025b2532b8d290e55a356b2bbe96808351944aadd5f3d3bdf1dd0f2e1dc6fefd SHA512 c66e173a0a3b71288f3db631d41fb01ed790d0b0deb6fb49f96671f624ad7a7cae35956c6f42b9e77d27eaa306b32db5453e91c9d326d6044dd2c3479963e4bd
 DIST contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod 608 BLAKE2B aa76097167ec8e4f5c737e48499fbbdf6d69cd880cdc9fb4fae17d3944c07c754457fdbfd91435d673f2a27c8fd022947dd04f30c9f4f1426c64b057b2e55193 SHA512 79bbca334f01782edaec3ca700d70c7da4c50f388c1678e7e3696114cf93c08ce334a47cfdddf31c2cdd2259267c6f2059465e5be5c77f0b61f6fd18711ab8f0
-DIST contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.zip 92361 BLAKE2B fbbe8d2f47969068e96c8d4af4287e764e15d7ed4471367a29c9f7c19920317f780a846126c4d9af8d314f52af81f851b95dfaae08c8794e2441c528248cc1eb SHA512 1b7907c655008bbca1fb6697e104c894c9d1143e66a69f8169a7fe342b32cacbf9b1e3b22047f97a76460c34b93af3c49faa4731f8341cc7badac45de805d175
 DIST contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod 51 BLAKE2B ad5183c28197a963db05cf512f677e170d45629ee83351071da4fda3085c20efd3f3722896bae3f9a9ea802f38a2faa6c837ea98863e0ae9934a3bf93bf39b15 SHA512 3b21ef555adc99c8acd8a037ac9205a0ca2a629b43095c1a7f850d22695c1c9f4149f10256cfd0d0420d9dbf1345df8cdfb81c5a0162f06dbfc989d969694c2e
-DIST contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.zip 19693 BLAKE2B 91bb6f36249caf7187a958008e531869581b4dc715b94647616412f7fe3e872493d1bc06ecc7b857dd482274338b9bc59ffc2c8cd98bdd0ec4bb67b5cc30aa5d SHA512 6570d9d1cb6a9289369362bccd4e2bd5930c0c9fe64efa2cd972855d9df14269947ac62ec323c56e398e8750337f729c0d34b25a0980c0f5c1c9d4856e58fe10
 DIST contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod 41 BLAKE2B 639bac549658805f4d1a72df67aa74331c31c3baea598a2b27970d3561c7a7b905bcc0492ad52dbc94c34792569b3df637234f446f3ca4e487051115d7737a83 SHA512 58d1897cf3f5b661e344d5bf91b93e91d5cd8e741ea5f213687cd5ced518d102a9a92f0c6354fbca2bf88d4c6057f78d56900e75591490f0a22ea87ad536b21a
-DIST contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.zip 11667 BLAKE2B c3b9bbb9972457a0d78cca9a0b29eca0ec84f08ad63cac508a11deb48273b291c2c889c4cc454df61547b6643d60dbb6f7b04974580c301f4a58e3fdb3b2a1f6 SHA512 34e14eadee9b13bb3bb7e9a2cdd6b919a06f6e296dd2b57de235002c9ef1dcfa33088b96dc063db652fb89bf5a668346b28bb4792c1a9cb88f9ee479f45f5a7e
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
-DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.zip 33828 BLAKE2B e46dda9bfc9513a2d03150e0f90c57b4028a60daa7a975a61a7e0deb82f83779b679d176527da6d2f763f174d6635c7aca9d0d1e0775d38a157f69e33fd1343d SHA512 4206fa50ea8f056656804388954562efcc78a14ed8f249801c601ccd399f70ea101e5299e07bd9b86e6e137a3cd2103209ef186193a1129e108b224ee5497432
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod 372 BLAKE2B 80a7e0aac984acb79239b3309290cd8ef1eeca8d9f53b3c91628cbe6dd112706d2313c47e33ac52ea9e8a6417289dacae8e2e72a03e679836d3ed89cb86c0aee SHA512 6db1a52bbab1332ab7e761532cb110394afa1dd69cc5f7443c3fb733c7d95fa712cf6bf8a78fc3f51d89b2d368a248e532bab06bc93e2e663b8f836c91aef0de
-DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip 29788 BLAKE2B c1e493471bca24ac64c8119e624ea077a74678a492b036deb907ede12b5e93c3ef699820cb2ec9468a98d00e83d84c6bb45cf274b4812a0f319a0248610a4d2c SHA512 a412fbe597ab0c47223d733303ed2277656fe35866f52e4ed1f25cc03b691f15f5592cb07b3c5fb39d4cb98c6d73dbc8e1e7869cea17241a33dfc29db0a1d121
 DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod 114 BLAKE2B 076d15a6625743dbc5baa1feb35668127bd5f390b60c80f044162dc587771709b6c41f91bb862110a120a90d5279944257b673fb39030e629992c80a822e565c SHA512 f3656f04c653b5651210e048b1663ed87b8899e4af6d2ccd0d3ed4ad97abe511d61e8b1f9a68582ffd49eb6b6e81c31ce955ffe79ab398836cb6fd5e37147a0e
 DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.mod 114 BLAKE2B 970e1a4ad4507dea0b0edd259c1ca8439bff37a76b9f706cbde70a15c57a90ad7fea738c03762e83824052cb84d025ea65e32d76b395dd7a968daada036918c4 SHA512 d03d2cd1f8e526d2efbea4cbb3d5915b70095cd921a111d97b5acea9dd1e7594f5fa1719df17637606945269563c9e6c64deb00af61adf2ad1581dcc485aaeea
 DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.zip 22219 BLAKE2B d516576021eaafe8bf16205681fb2da682eb151e889320ca8cf110275959dee546bb30c8485dffb76a7e8a5cbdf2cc5040bc0169505feada70dce48d664cff10 SHA512 6044ee433265b00ce865312c00aa848f2578affe0fa86a6ce5d05697539e373783eadfabac905e2114ee1efabd16151e6004c15e4b0ae7b79545667450a8ae5d
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
-DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip 31945637 BLAKE2B 88c8cbb805b85e39cbd230a85cacdd69d9d9e6f2fd472e576b4c89101b29b9fc4bdab6fc2beb02c6b51cbd5cf154e3a2a4381af8678efabfa8ca6075b17a7b00 SHA512 85de16c81247e5a6368a2e9248f380451c052577efceba6737b075e69d0bd8904155166a290eda7c57a6c2d8c6fe9861ca4cdbed042bc836b953db56cce5b183
 DIST github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.10.1.mod 713 BLAKE2B 16d9893b3493e0f179b686b8491147fac015db12de6de3aa409d72e54542baf77f1d21f1f4d998501596127e89b4dec0c6faef550caf74574c8646868b0b5471 SHA512 efb83d67febd645eff032bef3dddee73a8e5adbe39bd0a75f817ea9e2c5c08e0790c8ac59bfa3f208fa262dbb240fc6c52a6c751cfb6d4811fcded8fc25b2e37
-DIST github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.10.1.zip 137546 BLAKE2B fc09ea7337963b9bb155a831b43fa459c38dacdc1ff464b8392929586487868cba8d4c073adf79dabf2d89919c49924b6beb99b22a2f8b1801a9520a112e6c25 SHA512 f386765fb146f8d937a3dd928d6246edbd99ded0817e65e27dbd787ad73864615073a85c0e2e05f6b1de23f11417522b925475267c45977ea73407185cd64eab
 DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.mod 429 BLAKE2B b675ecf9a3bb141f3e33250d2c804b3b2ab8ce044c22dd520b3f4443b3f4e8e8b236c8f95d08eb9a5d91ba1c07478e12af603d0d707a37e3314ab72e88f58097 SHA512 8f53393ef593edfe234ad7385327bbacebd57a6f909090dfb1fe1a786e859d19c36fe1fc19ce459238796ad45ade1e0e962cd02776afd48ffa0d9fb4f679e0bc
 DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.zip 219290 BLAKE2B 9cf47edf730f65e172f9fd241937d4b3f43fae39750fc1a22b0233aeea377f6ef0003154ca40abce97a3c4974c23b296cd9c4178fafb9221dd5c8554fa79f66d SHA512 a24e70ba30499b3ca6cf9e6b3a44b91cd5ed6fe1eefa3a22cc5310e49c4aa0f19aa2ace9f6a6d81e5862d453d387ae04c9d68047c02aa92095ef67e9c667cfbb
 DIST github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod 154 BLAKE2B c0e49a0b41ded8b417acf12a7f23f0f1ac5de4b0e61f47847a7cfc9dc67487c8964e902207bdb07b011077db144abea07ebd3472774515bbee4121a8d1cfff62 SHA512 07acb7ce7c6070a744ff3120705ab69de9d190a2d0174058e9aac2e534f4500a2a2cb79a3973f0e0ceaa712f9369295861bc77c9456662bf002c301ab6471a67
 DIST github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.7.mod 154 BLAKE2B c0e49a0b41ded8b417acf12a7f23f0f1ac5de4b0e61f47847a7cfc9dc67487c8964e902207bdb07b011077db144abea07ebd3472774515bbee4121a8d1cfff62 SHA512 07acb7ce7c6070a744ff3120705ab69de9d190a2d0174058e9aac2e534f4500a2a2cb79a3973f0e0ceaa712f9369295861bc77c9456662bf002c301ab6471a67
-DIST github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.7.zip 605024 BLAKE2B bd05871bc9b5558805820adbf63a882c7b597caf21e6373c774d5f62282a253d06cdcc5c444e14ae878c0d673a77656bcf90bf5c45a96da006749fb84fcf2541 SHA512 2d36d0cab535408da4b32e363711bbbae4bcecb6d1ea53934782e856076688dd47c313a2420ba4e8958366c8942340b0e438ab1071329f36edb2272fced639fb
 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.3.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.zip 104877 BLAKE2B d266dc408ad799bb289293df8dfb2ccd6008b01dbbf0436e5b49ffe48da4cca98fff7759010750e63c9cd3c7ce8bbd89b1b1642e1a08c0b81d801ceb1d168ffe SHA512 a9622ef347ea7bb305a20121552e185c3854c901f3495a5eb48da7eb9cbe58fc1f63bed48f659cbfcff87fdae961dd4c214e9191cd89ec0303f502a26ef4fb1d
@@ -92,11 +78,8 @@ DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip 18897
 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.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip 9849 BLAKE2B 710903822f31a6678941a4489984af5b5cb7a82a97476a642fbe35061d4df496ce79159a82e4e7871fb9dfdbc3cead15416d29ac8d293165bfeb29b4c973c546 SHA512 1529a7855dce3307332e12e3b717b8c6ed9c274637e357007801df890332304f88f7aa159da3bc3685701f49edd78cbd10895131daea9c6c034d7619d21847a5
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod 111 BLAKE2B c5ae8e34a416406d265d2cacc6ebaf2e3f801eb0338d488eb413da396159a70b217309e4d560f1d50d173e3c717c7248f8969ba6da948bb86cba04ae0e30f32e SHA512 e3af601d732c07f5e995c21ea484fc2087aa693afacd77df8e9c1abf687c1476e41b50cd5178d07585672f0ef52cf454879ed13bd1a1ab6611428a320b73ea9d
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip 8761 BLAKE2B bff49ea7cc3b504f9d69bd3d06184ec123cd5d6f9d25368dbf194114925f343bd7f40874933a64e9ad16c6c887cb02df9764a502bc4b2114528a003c993bac7d SHA512 5d9abd4b8468b2ffb9feb70c9a87d2ca57dad721053759c016ba61034a05b72b5d5539a2def3b7f0dfe0f6caec415b0c5a5ff5a8e329554bbae4d85d61c8bef9
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod 160 BLAKE2B 57c363c25bf42b884a85ac5a6f152745ba3138a2869041fb383de44432f6c38f39a8b11405ec9134a3e940d66d864d3686769686d81d7ce1e99c2dd22bec2cd1 SHA512 6fccb53dcdc93b44c1f2c071f09c27b0536f6ef071b6e96296c31b50e81eee3d4224e9d3e863f84c85fec70adb48f57324d363b735d4eb1ce5aa5709fd4889cf
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip 16166 BLAKE2B 506805cb5cfc3a2d4aee18916c7a31ab5c58749335a5c8d4ff56a14fec30a1dd0659fa59602ac679b4cb893271b3424a13fe4bb3fecf5d6260a7cbb5099133a6 SHA512 e5270951b7410810a10dd0dfea3424174903bd9189420e0e7b96a4802f2e5a356bd105c2710595dcea0331566e1c207b1de0899d1bf3f56b3c9ac49de75f3698
 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
@@ -106,21 +89,15 @@ DIST github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c6
 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!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.zip 254689 BLAKE2B e0ae1bc62b4d9c7645e6afb460000124adc56a3b95a1afbb99ec00f36b57fee4dca2ad24813512f460d8aa274693a105fcaaff0e523b9ee0a3bfd22bad8a4b75 SHA512 7bb2037721647f941eb8dec5bdcf00d72febf118b34819d6bf3cdbaae1bd2cedd867cd210acfdba5afdf48be8b315d934447aa5674901e95a7868e707d337547
 DIST github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod 53 BLAKE2B ed6781e3006723a251f94bf5f96aba2964e7926617255ddedfb932ba74fd3265fe28ec906b90f7f1956509f521dc2c29701fcc7301513eb1a1764d33e50c2c8b SHA512 e46209635777bfc42c4399ff0eef13320a9b5d7a23dbe26f79da44a462b14941a949d812c586c023e3b4e617e741612ada3db8da7ae4e70ab242b8ffc123e880
-DIST github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.zip 14754 BLAKE2B 81a27e05e924226bce0c278ef45a0fd3f5d28dca993cb90e6d894ee3f20b201564c86e8cc42ebd74b7ce60ecf3076449fd1d6d712731236006b6885a59f3aaa5 SHA512 434edd6b40c635fa800ce450dfdfb5316ea013243cd5747af7dedbbb13cd3a0f3eafa9756454d952111d264928e8c905f0284b0f2ea68ee0624b8df263089a24
 DIST github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod 349 BLAKE2B c25e546d66f5bb4679a66949169f3a4568602a7b6f8ac1386bfa7993704d79821c07d4f0931cc2779fb862b73465ed41d0f050f59149bc39dfa1602ea706f207 SHA512 51a8db67904d3f632dfad620e223c7b59efe42d8254bd4e0ef49ef1a40759e1dbe4558f87209059841b80e0ccda5130cabef7c869a399eff3786d4b4d8d3a747
-DIST github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.zip 80720 BLAKE2B 0f98b82434ec6889c62c05d62eb2efc4adbdf049ad40da000496d2ca3d22049053c16a54a2a00f302446aaa8f8381b99335e87833a4a334953dc2029811102cf SHA512 0dc1448e065a172bb8439ec31911a713c4692b371710e51eb1e2cacec7425600ef411b17e4a9451fb0171f049f7f6bc6329e2b1e24d48c6cfd7e174d0deb0950
 DIST github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.mod 294 BLAKE2B 20956ac752467ca515120a0687536d96510b679e06ea04d946bf1a2365699ce63e3e76b924f6157714cd1b0b6119666958abde5bcb5e6b8d256e30363ff5f723 SHA512 e70098303230e59faac8940def165cdd46223ce203e9ec6db498178d391b983f01b6554668fddff92aaa9e56fbc859b4a43c8f8cc5b13215d1dfa3234fb885f1
-DIST github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.zip 91956 BLAKE2B de375c190fbd9f90ba4df335ab1c753a04712e0ba225c1250bbc2ebaa432c32ad49bee56dffa6d1857a99b45690949e549bb7132dd8856c5078e38a12f43fcc5 SHA512 dbc020240a44530cb2588186970f95228ae8050f9051d7c11e25118dae5e9b812ea9b20ffa8f30229aef3c5e08a89b3e9f798f4be8350bac6a02062e44653b1a
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
-DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip 17606 BLAKE2B ee5acf57c658d87b97b533d695cb72c9d83e281f9e533271f03d85d52f92c3c90e240f3b6d2a01bebbea6befb147ab66d7f75c403fb8bb3e58a2bc0bb1269f6e SHA512 89912d8630bed5c71dcf391b57e4537b93f01c4f1cf320a8c11d5d34d47fa4e3ea4abbfb3bc3aa76ad3cf08350da67e190cd80322597d0de3123fbaccbcea9e4
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip 15402 BLAKE2B efbf0c8a3f7e771b5a90ff620bfd513d476e21a672e3f7446202861121dcea08fa95d33b0438b6f1882273630e3cfe756c5934a14a1ab6b2676b117273616097 SHA512 4c39d0907455b1c60e539e8497477e676bf7656c3b30996d55104d6129ebaa02079e5d7d27856352446ec2570c54f0d945be83e2a3445a025c85d12834120ea6
 DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
 DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip 8169 BLAKE2B 61db06641c2c1db4102b72c097f63fae0bff296481556fa16e66ddd1808478aded29256befdc3d767b72f3abc91e376ae61656f8da2cfbfbb5ffbfe3fde20361 SHA512 9746be89f7fc5d50acd6376f77d43754e4a40d9da173a0b3226b78b1b1fab9afd859f15332ae5a429ce1e0e85227ceef05d94f2237c4969a8e6fc5e8454937e6
 DIST github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod 39 BLAKE2B 040b84d78188cff54576ac29dc39bcb557c56bcbcdbf6767a3321163859ae29dddca6e8b3294490238eaca9da7281e6b48ebcc6045a38c5f31795d0a831103f1 SHA512 4d33264b51c07e85a857699f5dc7b1b8a45cf1a330d8bc333525cd22513c4aaa9ddb44530e2f3e47192b21c72ddbffe465c31672a4bb441b863d90020a631a4e
-DIST github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip 15095 BLAKE2B 94141df8d22f3961f193f9c107624666dee96f267a7e0c5bbbe70426433ed86dd9a617184e5ee31e668aed94f5f011a6529ec9a45b065a86bba84c2e81ce5490 SHA512 4b7371bb63b8b32da05ff5c5c2aa6e584f9c406164177b5ccad8165b8f3a4972683a4c0756bdb591d28f6b61f22784a391f443503fc3d8e108f92b8c4b6ce0be
 DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod 36 BLAKE2B d0745757255951a92d471fdb1eeaae2e118d367caf0fcea00a405536d7e30609f22276e7a453aac1ca38063635df798a0843f279c178d394a7cbef9c9f9b3c27 SHA512 87ff97fea3e25aa903503e56fe5afc337918f7253dd7175833adb144a7296451a7d4ebd76df504737a5b4c5237b1102920728d21a587957d5d25db5d38e1217b
 DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip 73310 BLAKE2B b0aaa346be477c14bd504f98219659c8a82ba08afdd94f1a5ffbb44cfcb6cc9b014c1ee35aec6071d4733134931e6d2a569940e9f1f06a5e69b00f56d82579e9 SHA512 adf9a3b8bda92edd028f497ca10648900a7aac4dae9372469b511afc74e79f8b990e448f375ab2a8df651a491bab5413196c06db531adc10358865f74de6f26b
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod 674 BLAKE2B 41eb6ab1dedaf85f4eae33fd39f9bcaab0aad42ade09b145bb36f0f1e254c8e0b55584f4bfedd0c813ba7bdd0c26ba2ea09b8af9e8c7b622710550918d9c02fe SHA512 b8d1d453815756d8d12d6a5009921a7967dee726884bef700ddfe5318b16a29f834734857f223c6d6a5d8d676c65d1c8ccdfbdbda849969c0c572c63adb59fa3
@@ -134,20 +111,14 @@ DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod 219 BLAKE2B 188d73a4d4cf4bcb52cea7b32d8d8898086532d50e8ed0e92825e2b34ae1e035111dbc27b995b9a12d70e6be509d99bc693a0af8e3734641dc23cd1da39cf984 SHA512 165cb7ab17309c66d509af018c8a521bd90f9a58fec8fa9437e5b32aa2105ef1be19a1a0a1b13a51300e308c5e63c6cb74897ad938bd6f8b3bfb2d372347d02f
-DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.zip 288228 BLAKE2B 55b0644a2737a940dc6d78df93b79773155be35683c9de26966409c798ae1eedc8abe0165b432ffcea4e26146f32fdf724a52476cf03d9156336af22aec3c0b7 SHA512 9e19a102b7cfe10551ca6efc98b55cdf9ee2705d0c4076930ad7ee01453417bcdeadaa3350b3b8d52d3c166c17748afa477bdcb91966483ad89bb6db2e14194a
 DIST github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod 216 BLAKE2B 60964b79efee4fbf34288b3d659551eb51191e85a067b5c73751f22496bb8baafb68199cdf4580bf256133c1cc51e9229952cd4436b241f98db4d1e5e7b61fd1 SHA512 44eabb63e8480c53e9abf8ea92ef6cdb6dd5a6318f62993f5e21e4d1ebf80fff7217a5f5137da822e6d84f1ea7b078f04ff97f8e33fb36b9b37a478b0eefd527
-DIST github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.zip 7177 BLAKE2B a9299c6c794e9742d437fbc40bb581eb235cc01cb66fa6e00fb0e8ee72f4d51c6e62a64ad8776c4532681539d81069eb5080ce5a034a4c1344733e92f3656850 SHA512 0519ff39b0441bda32c75bb0292f16c7c24381f0f6c9ffd5487a56f8e407916000db3f3fc17636287ef2ac7c33d73e3585f46476e2b02091595f84a50ce745e0
 DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod 34 BLAKE2B 6b3b01c8066b701d0ea30efa5b144fe9bfe8e9f196ce4f0dce058e0947890e4f2d458bdade3816c3df1e35a972bbeef478c91e02579f81116603d0dc20855315 SHA512 5896c9174737c300a726f70b7d6300b892e790e41598b5f82ec82aca020f93159f9ea94afb6a4db605aca196d527a7a42df9b1babb73b8d182fe6749e95975d0
 DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.mod 34 BLAKE2B 6b3b01c8066b701d0ea30efa5b144fe9bfe8e9f196ce4f0dce058e0947890e4f2d458bdade3816c3df1e35a972bbeef478c91e02579f81116603d0dc20855315 SHA512 5896c9174737c300a726f70b7d6300b892e790e41598b5f82ec82aca020f93159f9ea94afb6a4db605aca196d527a7a42df9b1babb73b8d182fe6749e95975d0
 DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.zip 6034 BLAKE2B 0277fff4a4d5b85593dfeb5e0816403df0df388c48b191308d451d63315d3990ad830d2c5ac68eed1966e44b6bb43c15104829a4eb601c54927c4a496be98867 SHA512 b106acfcdd91be28498eae7a4c469fba1831ea790c4c44504ae74e3aea68d94c0b222dec088f6aa3f524b278bd05de0d744ef932a95350ef3c6eae1290542d1f
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
-DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip 66023 BLAKE2B c023de8e6a5f0b13a7ad1484f21f04643782d802becae77f247709f0c16ab8aff7caf748736561138448efe1cd52c0ac1903b22b92ec56efe817935ccd45ff22 SHA512 356c87eec65f0dc8a680b7a19e888d87fb8c808ec675501df635560fd5d3b57da36ecc2cd9eeb4a5e454c5564d4cf1a062b47b7a050e116b57c87afbe020eb53
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
-DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip 5176 BLAKE2B 58fdc8010b4ee8363336ef720c8ef2d126c2b7dd79357ca4f99a1094957965544430420f6ae4155490f75242cd7a7cd20993a9ae15087ccdf33327c551caff59 SHA512 0dd4cbe03b224bfe68d00d121f758796f6e63b96eeee17261bc7d8f6ad1ef9878976b8eae5eadc2f6abee28670a83e6925596f4d35bea529fcd735772fc9a049
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
-DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip 3902 BLAKE2B 8662340cd5095c6ccf535a54e79af09fe46640ba0b119b44a29052ad012519d9b5886bd4ea81f4946d0c4573f63538b450ee864a48d8c04e1c9e7358c2588e8a SHA512 c73ff22440aa8f5825b7e6820c270582d5512cc096e69b6ee034ed67ec3eb87b3266b82eacf37b985e872a693256be6f377814d3cc604180ea939b42971ebe80
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
-DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 37264 BLAKE2B 13a34ae8ce6866da183bb7f9f5dcdb702ffe846a3c5e789e99f6e112a1e64b1dbbe8777727e5678b4bdcac75ec32ddc52ff303b95b5ee3fd22423eaab44809c2 SHA512 e1b8ad2c09c16599c6e5053f871df9f66698c7a632276c1e68c80c9737216751939b7b7024449ed63da0a292688b4d7a441d64512aa4bd8684e418f4e5da4446
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
@@ -158,15 +129,12 @@ DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.mod 178 BLAKE2B 1aa7ac654a057
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.zip 20523441 BLAKE2B e4f22fcf748989ca8a447415710b424fc60b9e2c6828cc01c6bfff15fb42f4fc2d2a8bc97f371a492097fc1bd026bd1845a5fa99cf1caa17abbce330f419111e SHA512 bfc1080f37adaea751ddc4a3c861add5552c4578269d4c233ad71e08653d961a621d55f42a9ea06d31432c70dabd8d07d3850a13c7990bde77f4b275ae33a185
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
-DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip 14678 BLAKE2B 3f95d78aa356a314f8da501f8085a880201766e184abb6c222c45e09c0c3b5e1e1eb7b89cc8ed46b77b09be8860fdf3e28525d9a451964ad64a96c6ee848a41d SHA512 be60a4c8059a9cb07ceb12e079b1224b6f871ecb1d7953906ab303cfe86d00cb979e203299f00fe828b2f6d2a3f5d55814c50809e9b872ab6d96db73f3771498
 DIST github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.mod 31 BLAKE2B 77d3cd0b41521832b89f14be184b784eb6d3751282c4eed77939e9ac164a2a0735d7e025cb02027888cb6e2544b5d7163de967a238cfadafe88c081d0d737c08 SHA512 408521f704ab6f3454c32473fd7eeb4bd8c9cd1b74db9bd69cdb822a5098354bee05b1f9cab5cba15e8445de7d3038d1b7e36b1291b05bf46ed2a9346d7c3d20
 DIST github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.zip 4207 BLAKE2B ef5d5b2f9c3c5fc7d33693ef58d1852dfce3ab089741cbd3fdbe97bb36c66cc30d51b6d8d9b2bf3acdce358f7f412924d748275124718a7e254890186ec12661 SHA512 1782e6ff636479b2b7450881664f064db6468bf341ee6bcf103ae37b292e7247cda869550935909b2302335f03c6b706100ab998b5634f24c2785a590b374a87
 DIST github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.mod 29 BLAKE2B 4cece08b1112e806860f0665a6838e88abd4491465357cd0ab27c3bf8d953bb31acd10bfa99014185a77d3ee92d7e4b430c86a8c4778eb7cd2339c8b5154e369 SHA512 818cc980e9190e6dd4a8f4345cb9a260cff8ac3e3642390b50fececc8c194d83a57ed3af1e99ae503cea18fb6433df192981f31acfa86cd45979284967321e65
 DIST github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.zip 6740 BLAKE2B dfa98bfd1df8237b8d8c369fbd127a3f63a5daed9ca1b56611346ff433be9d826895ca4e2a669c046a80a4a3c3378337959a4881835ab7cb27c5617d02e09c90 SHA512 4a8e1105204e1ca18f874ba873bb7c15ff45c1279c6be42ac4fe2935ee8d86d5c432fd520ed3c830840306a1938c8aa9ada4a7c8aec7adf575a73fc86bdba034
 DIST github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.mod 162 BLAKE2B 4a7fbdfed3483f23dd651d8049a6990d1f70e1af3d540133e9eb28b9cc9bbfb588531bec0befdf991e839b5da913ef6ccbc2aac1a84bbe19d69213ecdaad3936 SHA512 fc5337dfa70de63356c3d589e979cd5c37d84e38026e411835a66fd087c5994c34621848ab99dcc838fa83f1d9e8d45e0139700598f792fc36096f3001bad991
 DIST github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.zip 48330 BLAKE2B b43702657c4e9b748977428f68d98bcd39be746cbf623529abc3dfe0f8a0fdb2aa0469094514595c484d125e87dd299f529f9e40a521e6f68a5f5bf265e4e4b6 SHA512 dfb0e12fc6686919afd93015495e693038825229c4449568a43d19df154797ecc0864a02a0978a21bc39f35d11a41861a58b10bea9b537fadd1daae410425029
-DIST github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.7.0.mod 87 BLAKE2B d00a18c1859bad94dfd08ec6e3f110f887d2f33434f42a1b556a7f880e2d5fd82a145448a7160b8ac9c8683c80d8d5655a9968c3e102a04e9dba1c22c6f29823 SHA512 88edf10bc2fcc343c9d07c5a2396f192d6fd734ff169f7b6302748966cec0ab972e40c64c415771493bbad04543a878ad7b9280766e5d71dce37518652169e8d
-DIST github.com%2Fbep%2Fgolibsass%2F@v%2Fv0.7.0.zip 492475 BLAKE2B f4a84abe97df3f69c5a96a1d84b33f01d7d91185e47b34def4bbe73a2a3a3a93c1b6b61e74c1f300dbccac556e34014f651683fdae658c2baff707365513a0e6 SHA512 7bd09650d91bf16f4852a4c93b10690f0a04ffbbb9985c125a28ecdd95420b127859e72ebd1aa750d2b9d2ac965f792c6d323e694563b015597b64999dd90e59
 DIST github.com%2Fbep%2Fgolibsass%2F@v%2Fv1.0.0.mod 87 BLAKE2B d00a18c1859bad94dfd08ec6e3f110f887d2f33434f42a1b556a7f880e2d5fd82a145448a7160b8ac9c8683c80d8d5655a9968c3e102a04e9dba1c22c6f29823 SHA512 88edf10bc2fcc343c9d07c5a2396f192d6fd734ff169f7b6302748966cec0ab972e40c64c415771493bbad04543a878ad7b9280766e5d71dce37518652169e8d
 DIST github.com%2Fbep%2Fgolibsass%2F@v%2Fv1.0.0.zip 497800 BLAKE2B 3d96db9382de68bdb973e049f3fc8ed14b96432892ae6e4d4ca2ab85e8f007152f0de9290d633123d852db6531ce147d19adcbf17558d8a125024d38fcbc9d6f SHA512 d263da34a260ca1e51777d66430aa644e72c64c306abd2fbf86848d72531b77c01e14e8fc1fbb1f0da008e7a6671ef44a435683dd51b99e0e1c79c92fa31f30b
 DIST github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.mod 113 BLAKE2B c4a5e5e0ee3ab55a42f0ae67c640ca2865a75c5586048e6ccc390249411186463c6333a4d85f841a2d6cd2dbc1e637990f66648fa2a45bbaba4711809ff73c83 SHA512 319582eb993de2b527ac02146bf757ca36640bcf1216e113a1285faeedb222890eb5d264c11cc9dc44704fc6da929c5df271f9e5ef121bf04d98a3d5635fdb2d
@@ -174,44 +142,28 @@ DIST github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.zip 4392761 BLAKE2B 88c3577addad834
 DIST github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.mod 176 BLAKE2B 6910a08bcd7e5c56d1de06787dfbce567ec00658047cf7911af84d5abb4a4f4be26a49e510db91da10710ccf710cffac4b29ec7750f9d0ca84cc598444b55b4a SHA512 ad71b79e925da23c03dbd96b2dcadebfc09e2bfaad735e2058d708e46e13085946f262f5ee220bfd1172e71ff7473f4f1f511e573cac7b6f62a136155f1823f1
 DIST github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.zip 11353 BLAKE2B 5097b03788270309f3cd886b3fa9c71e8324849bc835f4eaba6045489c373d8ed67e74629baf27189c45d861c9ec69b564b8e92d7bc226ae5293278925ef016d SHA512 961e58a2f52be77d4783afef09c80ff16eb396829f8c57958bfe5c7a3daf447da57118f923b1b01f32efb80a3dca0bedcaa3bbfea215e8e6c1da9b14a2c8ddfe
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
-DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip 9262 BLAKE2B 50feca006319c5a8d957976be1c02a0a6a7247441fa0e903b1a03de85859f2afd0c93cf8599f60974686f47bdb7f0c94e58c6ec01ffa3fc33cf5d04da3bfd08d SHA512 0e52838ad73009c795d6a43d7d52d082b0ec134e0f07015fa51caab7d1dd141b19df7807a7ab146312848567f8635966c6ce7ac22b934a630e0131383caef9cf
 DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod 568 BLAKE2B a2769032d81e02d8f4945648d36e862a996841d0e138077fd190b47b700fa08cd4e8e8d300925fcae5ebe48ea972afed0dcde81870f3673a3227ba90beb5e341 SHA512 262ec838f5c4b97bc186533c20456e62633038ae74747c7b884788bd06ce01863a59237557877d35f37338ebc018d2c1c8ae963e4a42dd42e0823a5b3ec81bb3
-DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.zip 33436 BLAKE2B a29e29c85f1087c3f07ecb3b602e4f19d29c4d6c42a24b7b10a6046b077ff0d7c85344c12dd0023ba675a3319255c53bc8a9989072048c641d4eb3c25ae44aa4 SHA512 cf29e5474361f66354cc6956bcb7e6990573bd7f49889187016f0d09919e3dbd4f6dcb4adea8148881fcf559f2dd422ec77c04c33aa9d5068d40c6d224fa5a6f
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
-DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip 210929 BLAKE2B 7b1c57ae92e16ffa7370b069f7037dca01e73cbe8cc5723c092139779bdbae2c5a4483d623ec2b62322818bf324f2ef41e27b03a9b9ed82bafc5a1cdcc6f18b0 SHA512 4dbdefde602fa13bb1f0ab9dc6e947dc158defd284753b51bbddf9e52410dac5429e145637f155bb8703cfe8723fd2f5e4ec7898552d4a2956c8dfa01d4946cb
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
-DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
 DIST github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.mod 32 BLAKE2B 49a6d3b092b95b721fa95ebc79b370a112c44474130a63854c5a0cadba149824fda5fb32cd9d262241a38f57659ebd71e809e531264d77cf2551da543b8ec0c7 SHA512 bac95e43558eaf04fc634b9b87039bc3e7ffa17e84cd94c6be19a6ffc0fe1c90dfe67b43b5d6c4262b4fb2c6ddb30f19090320ffbc20cc75c1a1649bb4441e27
-DIST github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.zip 7535 BLAKE2B 18509c6612cccaf0cfe0280b65c483f44926335b2352de4b181cd7446b714e80ae8d0d98c23db395672e54254a32beeae055e221a3379972f11aef669a4d22ab SHA512 429b010ef403fee1ae132dfe56e709831de5fb672df3b93465008096a71051148cdefd7a56f3f3ab8cde20f7a5ed0ca6c18d887922aa2bb7709ef8cf67f8acf1
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
-DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip 5802 BLAKE2B 7e7b32a77adacd47318e42255dbbb59c85b38dbd3f80adf2795ed3b2d01ed714e8c6f1139b91c6ce19066414acd53eed14762806f28b6978bddb918fe756414b SHA512 4021b26f08a3fb25b71a3191445c9be56424f3f118f5a4839ee8957a9cabeeb33f8d5e4735ffdbccc20b84b45e4a61d3da9c2ecb6cceef6638901143bb6ea339
 DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
-DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip 56640 BLAKE2B 4a31c288981856d09a5a4fcf4f0b8223502952284ec1e2ae698214e2f950cbf618c3a938096bba4f8f3531b8b75d62c17396ae7a5b7a29304c138e32f4529978 SHA512 e63fa5b49cd41a7166b01167bab86540635ea079a36763e559da108046923897adc43b0ff7e19faa7060e0580b2042981c9a32d10ffcdcf6fea1f22eaf32313c
 DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
-DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip 5024 BLAKE2B debe8a3f8f81708baa936e0b9c2acca92d41e718efd59a605a5352d8eea7918211c89dce1a093755bd6b051e78eaff1036c86ad48c7700d1e332c4b83a8a44f1 SHA512 05859e1e715542b64c7d63789b447f971f7cceb6fd01bd78e661891acdd94da873ae6d3f612748fefaf9507d374b62526fcfe7db5655cc297c07208bc9f22bc2
 DIST github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod 40 BLAKE2B 7ab19e087a8058fa51d0e17ecfe123b7187acfddc96633385d54e68cd4522de69b5005da6f6f47970cf92a0c1f6164c2dfd439b620fa51c0d64d13dc0945bf05 SHA512 427d6b45641cc39b572963ab5d482860e50d5727ea8591598787d0bcdf00ca5cb12d24dd28bbbac45855f38d07d07bc686af5276f75ff5b0f6fc94eaffce150a
 DIST github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip 6901 BLAKE2B fefb4882a93946812fc98c20dbb38cc8172fd207742552d233f3a3076de1da102a58188662e14bb86cb1b1b1ff50b898e0642f151c42f3cb13eb19d02e83cd14 SHA512 7b037e25dcc46063606f753e419143a8baa19a817fead39f7322370f8f4cc8abb3937c8790db85799d8a86582c0dbd9e7f2ef74408d837ecc646f23bec2bc6ad
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
-DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip 246908 BLAKE2B 94b71d3c77553dca4889c6f066f6741fa9d17a0ea86b564e3e8ff05b015b87c18fd3fcbe2b3d942a8569c99ef4bdf42c686bd58485e9373447d25724ceb934ca SHA512 47991999bacf78ddfd33a4af3c0d5b8a418cb7664e05bc59d886150025a1d5aad831deacbd6da76d5a21a97ed115d4210c374459e7af8ed7b93c4c1c0e7a42fa
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
-DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.zip 51948 BLAKE2B 5183d2b0afae1e37076f61b14b46b64728003edc647db49ff9a3e03696099298f1ffc7f3ff20f3eb160ec9fba76f31faa93336017bc15d9f3f82dd53552805d6 SHA512 2c36296bb2f6b5b05d5328ab64232aeb6ff3ae985a2b69c292848a63fb5384da405b276889eea785dcdc2f8732911f8018a9f1802b88fb2dcd4590151bfbed66
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
-DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.zip 112043 BLAKE2B ebb78032f634a43306bc3f098aa44a7c47bd50b2552c4ae5726b3b20cfa688a77764242c9942942076594d4805dfaa6d32aebe1819202b4dc060978ce9301d92 SHA512 2ae536eec8ee6a515e3b53c16d59d7b40311f3e4c0c69206a5f6adaa412daa03c47e01ac9ba183633bc332d1ce863fd66a7f3452710874b3f8aa96c5c5e39102
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
-DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.zip 2274142 BLAKE2B b0f2794434f22f46f5c662808165244bc55181b892a43980cefee2d208ad23b561f42e8f528fc905bb01aadf787ca4a324957b7593a563cc4ecf84cff504d8e9 SHA512 4f82743aafe5725ca7fa89eb27adba939fce03e4c2b759604e2fe146c72ffa1ab2d6565a33c418aa2d3a1395ef2662b6d0bc1519ee5ff368d631083818d8f16b
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
-DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip 13848 BLAKE2B dc2ec3bf79baaafad410ac2b4625dbc1c520803659b480c2014ffef484d409135ea5d09035669457162457962dc6b3532a480893f399b876810fbc1adfdab8e2 SHA512 918009558869443193fed748b3cc807dbfc540967d60e0315c74c6a09324d7d783067e0f21c5461ebadcdec3c7e6417522565a00e33617af8a8168281a0040c3
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
-DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip 109838 BLAKE2B 82e02c44f4fa60aa7257b79e385af47e23508e260415f0f768e4f7aac6a5962c713488458a50f1bc98308446ee3f45de973d5240811dc5a113e5b9577f33bab3 SHA512 7acd6ca00d067e6a81fbb12697ae9d46fa9880834934065549bb23671153012a8596d4c7875705578ca58a259ff81b1165e45aa65c93406d2c324c61954ea4df
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
-DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip 57782 BLAKE2B cdd50ecc0cbd0c7e58f3e6ff91cd26f7a212f4f62cb10358e1729b6b8be346390f1659ec7443a0c48f280c4a499f399b3ab3c03ba897ba8a7a61c336ff6f7c29 SHA512 e0ac39873cc584e40df505c3c01d20771d3a5e06f1c2c78a046971a220f029795b4cce7da71b497bfb618c0159897640c6606a4bd0d446826b142430f7f66204
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
 DIST github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod 43 BLAKE2B b7f6d4dca865e691a66b70dde813bf817f089aeaffc8c49d2d61f6efdc1271ecf380740213d28b12585ca60e0a00d8707ba0880710a1b82e578bad08f4a9d979 SHA512 55103bdbd54979e045985ac6176821e9eb480611acc20f430311cc02944dc8a303468536651a54cbe653117890a3e4c6ad48b02e638abe96cc8df7b4df7fcdd9
-DIST github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.zip 2549 BLAKE2B d3468e1da2501f5e44ae53da42ac1bc17cdd5ad316aab316439794bd5a5535453e837bd7e2ba7c8310b518264556fb8ef017f756d979a66823189d62056ea330 SHA512 cfaca8d3db40e499e9e86bc00477263f2bc9d3956de17fb0d34ef8cc19b72461b8df3ea526f2962936dd33b88be7dcce1d3c1cc27b62ca4e8d6bcf482bed7427
 DIST github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod 39 BLAKE2B 066fe4ec077d7fc003ec3450de6899062f4e0500efa3b410cf2afd8315c2f7166e4a21605d5970d3be17692b8b4d2fd0e4b48b32a01a09a310799c3faa1c31b3 SHA512 ce1047915fc0d4f3dc7148b20b90edbd878c7f0016823997aa5dc030d000f59658ddffcd911fc98a387387ac2175ddad9ceb9c8af18e0595549ea2c3859df6a9
 DIST github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip 6032 BLAKE2B 0265eaf68c186fc505148e41ca53a84aa096eae82243502ccb3b3703bd248c3b42ff0cd87015d11e427dccc9564c69d58676df34c353d7fac22ab2260061b137 SHA512 04bbd7a8cef79a432684a2c84f4180401893fda4f43f18e7e78d9dff6380b645aa86a41c54526f8f18b8599889c4a167da364e197f6d090fa3450f71d6aa5177
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
@@ -219,11 +171,9 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
 DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod 40 BLAKE2B 3090a8e1737078a28e24c1a01f78a18ca2ab94c0cd297a9ab04f970ffe05a6db291561b893c345c1d4f023a0743adf0a769f58365251ec94e3925da9187aaf62 SHA512 de55ba427379e57d671a31a72b9295e8e7fbe3bc0b80d05e63ccd31c1fd7030e74fd39fb0347d87f10f19bed208df6317714b0d1028057fa40e633820d49a03a
-DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.zip 5629 BLAKE2B 4fc866fd2f2167df11e059bf3a04bc62c0ddbbc11c92b79d66b82083d97eef09592b55dd8d8546a5e0dd56a3d326badb4081e9d97d5f6eb3f2f9168deaa6589c SHA512 d4842f3039d8a747907de9ee6b44c44ccbf593499aaf38776442da41068b923762f34eda9188efab7b6a01451c9b1f8da3f195164fdfe069958e486bf9046376
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
 DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
-DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.zip 5339 BLAKE2B 109e19e492b3715ef695cfaa6d9e7191cc8527c2a91e9874781e30d9b763a1e5dfec2c13a376dbdc27d8a5720f808667e29bf0efa4ed7e9ad88445b140a849eb SHA512 00b81917f2e0f16f9d274afe68ce49a32495d20784e6f3e9e38bb3683e52c3c230746b5c86af179d56e60e4c79013b13d2d81abe7282dbef77a7a81c0c826ad7
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip 9787 BLAKE2B bf52b08f028e5117fe9cf9554ffcfbddec214b1dc972e8be2511b5571fa15cd433b3528ddf9c8805b3a71455a94f859d3aa90348e4648300121be269d2ad5f84 SHA512 83a35ee1aaa0aa34e86db32471f18c2ecee57c8962eacd44ce492a29cd9f630318411535d3474ad10c5ec5a5634caf619eae8a06e911c37c6e8fc8d022aebe3e
 DIST github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.mod 38 BLAKE2B 53e4f01285bd3e0176f76755dd39e5d3c05960b0153c3843b5c51dc54a9bceea0eaf68e0caddaf07c0005720b151fded30fea3000eb5ba0d0d72a919211bf9d7 SHA512 6c59ddd505b41a0f1d937cc69ce0b4126febb1bb82d59cd88b4543af0a44e78d4ad17f03be10737183e01377e3a48d2691c6247f4cd5d4b89f7b6080c3c3bb8a
@@ -240,15 +190,10 @@ DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod 543 BLAKE2B c757618d90ca032a7a1dba4ea988603324c82b3c8df0248caae59c5d33d601def8c5f6238acd40166aae227759bffe4ba9ef746ffb045da14416441e22f894bb SHA512 90f3298da3bac3bed1dcc040304c84939efe3757cfa4ea0d4367a459b3328f26da343a7aeb8d9b9185ac9e324e5cc6287243b51102edac6089b50209226b5018
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
-DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.zip 3876882 BLAKE2B 35d81ce14034f9c36483438f53a86b96d800f968ac0a4c39722750a484c354269307662e337e4d7dd5937014241aeb1bfba7f135bcdb4d6d1a3817cc037f447f SHA512 3e7eff7aeabe092ea86d8a449ffa0b7e7a5d7a464967108d051c18c1227fe1437a97397da51d096d2a6641215e0af5378a4896495d3822fab1286dc962b96936
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
-DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip 194391 BLAKE2B 78828261a7d5bee8399f689ed8de5a90e1a74e54a935d166078a477c79aaacb04663382c8531663a5ec8b3d225bd9e11e3ee4f3eb9fc94b2714fd6c8d34e9a25 SHA512 6091a63fbfe97f1b9bc5a9524e1065666ce653ae85b9dc7999f322f08dd48fe1959be515d2daed0dcacc3a83b80505dad5cf5a9d190cf8136a7a663a460806a0
-DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.14.mod 102 BLAKE2B 53e3f5b20fb5e67da1cf1a3bd65c4856d02e1b8ad159ff0ce91805fcb84315df35b16f594b80b742c063f90ac7d311e59d7a9fed438bef1d2b9d03ac124becc7 SHA512 e1d10f40cfd36946008cad4f1a4957607878e149302565b69ae024124f94ef6db05325b4f25c4491d600cd2a2d05f3e6e8d8ae9018804236669e55653d2eba56
-DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.14.zip 1435798 BLAKE2B 6d6c1aaa4bb9a15bcb1a0177dec6414aa714f4d50c2440fc58464a31a884604c56c0f120069f0a3f88d76cf821e4a3dc293bddc4072c0e8cea74c12ababca4ea SHA512 ae608df416fba7888af5b57e737657a7583808480166352e53090819992f02915473488462e1ea742f6204f398c24d952621fbed23861cec07307453cbe9be55
 DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.mod 102 BLAKE2B 53e3f5b20fb5e67da1cf1a3bd65c4856d02e1b8ad159ff0ce91805fcb84315df35b16f594b80b742c063f90ac7d311e59d7a9fed438bef1d2b9d03ac124becc7 SHA512 e1d10f40cfd36946008cad4f1a4957607878e149302565b69ae024124f94ef6db05325b4f25c4491d600cd2a2d05f3e6e8d8ae9018804236669e55653d2eba56
 DIST github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.zip 1443941 BLAKE2B d912a9a5c8b6b6d14d4dd236405761953fa54abf2b69f3dd5f96c5ccc53dfcbb0e66d22b3fdb99fdfe70cfae9ac205e703708f9fd2be96828355cbbf7aab3c53 SHA512 3da8c431c8dfd7dfde14fbd312029f44b1af76c0a2567604c2f6af3644539c425dc9de76fd3853a9a55c819b365b81f035c45719b292bbb61347da56e7141fe5
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip 6665 BLAKE2B f9bdacdd7f4cb7149fbf6297d3ab38c3a9527e0af158b933fbc673b96c5ffb684d6511b1679e03a142e4db5dafffc7b1e2edf24ac2d0f4e8faad32041e3e1165 SHA512 77f320b3a94a6da76051d6c15a7c31bfe9dd50b463ad9a354b0ccd4e24df3ea14ce026a1f509d2125f9603ff95db4ee001f9910fd6db05c9bca7b1b15ec304f2
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.2.mod 121 BLAKE2B 3b2b42800cf70cdfcc5a34ccde0b38f8bb16756e47fd83215563e653667a993416007880ac26a9f41f1f18318d9803b9ee90eaa98b2d4de16edcb7b74eb54760 SHA512 1a666d5599c4bbdfc3c174047e187af75d1a3e66e344ae76d714b387c39dda9632bb6c7ea1ead5a830a2aea1c5a5e2d051d552535cc7e0bc3dbf71383a1c4e5b
@@ -259,47 +204,34 @@ DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod 121 BLAKE2B 023fc722091
 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.9.mod 106 BLAKE2B 4876f70d70d2d8703d7b6abea5457e093043912d6a672bf7794a892d1c17b159ed2b92dee05ba1625a1b7cd6c8d66d6dc715bfc1d7c0f1c47965ae8e30506bb2 SHA512 ea3a26ed1f6df26a7e2aa64ea9d5d4a4c3005163cd8adc05028cf25d56d01d115bcda38b7af992242013c2610f26a184ce43dd1826309c95fa008fa9c8c387d9
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip 42349 BLAKE2B f2c476034a47330b5424159be4a323bded799ca489163c8d485e95f17ce519d6c4d771a35eaed83e831acbe20c1d9ec5b782469ce20aa224ab03de459228fe59 SHA512 8df5f490e26760bcfbfee216b5479321d060d4e48911c98e4d3375a6f84bd161b5d80769fb0326b3122534ff726e8a987bdce365464cdd042ab4cb5366d674aa
-DIST github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.60.0.mod 237 BLAKE2B de6f73ced4b250b844c4cf9cc9a2c2da83b5a73d324fbc08de4459012c613b058b9b0b9d9d6bde96486332905b161511963e203350cc001ae8440393d09daa3e SHA512 dd5c50969b1b1f80c1c67cb3bed9e8c3165b07da631b8707c51d9b449388b68cc81fd67e0ce386d9fcb0f53ff2af1e214e9aecc499ade6f73e871900496283ac
-DIST github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.60.0.zip 171803 BLAKE2B c8ae9b182f6ec04bcb088d487bb9660ef3c3c1f0a17a424a5cfe94dc7366978f5f4cae0ff2787fc594b15a0b375ae037ccba26ab52012ba1f4c02e1d4eaa055d SHA512 0efc4304512b22bb163c9912efd6e66fa08660233d84bb77bf34ec61249dff46b94da6ba4b119df884c8d6cedfa3d4caf12edf155498e049f9b46332d2a9b837
 DIST github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.mod 237 BLAKE2B de6f73ced4b250b844c4cf9cc9a2c2da83b5a73d324fbc08de4459012c613b058b9b0b9d9d6bde96486332905b161511963e203350cc001ae8440393d09daa3e SHA512 dd5c50969b1b1f80c1c67cb3bed9e8c3165b07da631b8707c51d9b449388b68cc81fd67e0ce386d9fcb0f53ff2af1e214e9aecc499ade6f73e871900496283ac
 DIST github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.zip 172308 BLAKE2B 174b47754a80e77a179af5819e210752f1ea8fc1997ac13d0d68d52cc74071f704fb0597d6dc627dc273e7c1eeb00e289afa2482cca830338b99aee3235ae859 SHA512 a68cfac86b7567d486a16b6031f0bb52a11265221a74d424c354016432f933b58fb0877f07c6c769ffeb92588de3855feb908e02749ea6d5ddc177d7dfcb7135
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
 DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
-DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.zip 810677 BLAKE2B 02db07e3f8a7b1cdd68e743ed58954362678f9d7012edc313db47b4daba4f78c3ccdfee133e6eaae4465cdd8c5db4779f238d7b83c4f91be7a3241c0fe07a2f3 SHA512 3ed59b94c35c8cfff89fec746f3f798f12303e684d60b70c344fbd2cbd44c1e21e09e828940502c87b2360b472c7d231c7f8ce94332dacf406154f71ad9baaa8
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
-DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.zip 646118 BLAKE2B f4aded80944f832675836dee07772f793c2b804106d1c04337c3bec96fd6926e38c6f502f90a117f32cf21f8e66855f66168ee9bb92a9faca586c79483c67c34 SHA512 1a579a0ec442953be35894ef6f5abe14df780dda894f6596f361decaa72d0c88efa09250995d244496453ae45fff667a0772b60e0d774ff8f8b15d0c56fc4d58
 DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
-DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.zip 50099 BLAKE2B 82c3e54f4692d1756ee00acfc4f17398e7684afb5aad3b37fef57019a050f6af0dad1eaf568759db87f0a775909b8ed02b8b35dd0d4919a91bfc69d0d0fef7d7 SHA512 c1b42db3dc1c419c911e064b493115c46b1a3b5fa76295ed30acc9eacbcba524d1385ad566343ffff7694fb1b449b922daba7c269875fcf7a87f04b334f55da9
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
-DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.zip 423237 BLAKE2B 5214c96dcd8d592de4a7a10a497bf8c39c668c96de8a81b4d6ac1a51d43b05953526a4d2e83568da3761a8bff76b53cea5644e7b1d0d33fece5abaf93f11eae9 SHA512 4353387fced40671cde472058e1aa3dd8559208e035690d1f763de2d6c68437fc8d8637a49ce2e2cb292bb30de639046238a0fe4877d8712875aa505f11ebc1b
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
-DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip 17559 BLAKE2B a527ab39ba8646129de4c22303bc8c1c58e9834b8ee898a55cfd6940c665134305290fe531e9c8f5c9a1d8d7171db671e479af5679c8abfc4b60c1200761d894 SHA512 a47e8dfb165764ae38985658525e16d7e0942248aae078d2bed543c355ab177e49743556503b59a27cdb33935954ba5d8f08d890b29e5d7fe5d606f2c5b57bdd
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod 210 BLAKE2B b3f610a7bbe7758041e145a17de7becfe6ef0d80bf8a2e6bb9de47883483b3ced7f09e0ef1d170f42f1c5928913cf80043727b3e62fc0025943f6a327a884f64 SHA512 d927113c08de347570e5ecf4ef7019c7574e9fa2d751273e8c68f114b49aa4a9d9c39e32937ddd1ad3d665757d59a4e498fe275578d40a6b0dc644ca7dd8fca2
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip 18595 BLAKE2B 1d2f10a892b679a58ee2a5f73f423d91127bb8208fdf1bff862c8634d4fe1a93dbf721ece4c87b470232b78924a4ef190536dccc9acfa4a16f0ef21609e73d9b SHA512 c6b3a6bcbb93b2882a9873d0362b8618499f0f7d0aca697c5b9de04fef7f3c462fa11a55a175a0c1ceebf34bdad9df365dfa622dffc59abc4d881136aff5dd4f
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip 49381 BLAKE2B f83648e2877f57671b8a5133f7b6d0ee36e6d48deb9d4684e839e1d3eee54d721aa536eb41c713f584418916e7dd1192742a87faee77a015496aecbc58759ff3 SHA512 64d7a667df12bb1257a8f1effeb177b0970fb326a54a72c211c781920fa8af98234c0fc22e699af099f0efa3696be2dd5314c9731fcaf74113aa25ffcbc1ba19
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
-DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip 113293 BLAKE2B 1bc68747a73c39e2b21bd2c45dbdc3cb41a6c69f9a2a5167a6960b4ed583fbc888a41f559a8866a004703939230ccf3536cb2dae43ff5a078d21151a115898c2 SHA512 d18a710e77e830e7a1e80a16a7743cfac418832c16a8e08da7749af791e2bc8116c2c3e7f028bcf9c4431cf8e61478d6f1a3549a47e569f725db2a623460986b
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
-DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip 10204 BLAKE2B 37977dbc6c256bcd404d5b7076ac49d1c3c3c495ad0869cbdf8943b24b80ea5f155c80a0a23571b778e7fcb381140988fd19cae6b8ad681e115260b0fe19394c SHA512 1e834ba368fcac6e13fd8b3a478cbe9b181ec3660087733b68adc0dd41838e54367d22f9bc53e602ece889e6051e319fbf80d5874abcf4daeb0bfb9b64e298e6
 DIST github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.mod 87 BLAKE2B 8987dfaa8538dab39b20427e86bfc7fbe79e3607ab9e7546aac1a4e664a4cd0602bbd122e679f0c61581bedfb5f91b9f74c4b56af94e61f9366c997b0c0a26b3 SHA512 372bb29a2759f7e4a3715857547c8b4c4000342269b7467daa8e5fabfef0898f90d16830fcce0668f3e6be3ded165b6ad6fb5268bf423e30be80882bd48cc29f
 DIST github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.zip 39972 BLAKE2B a34f2f5dbeb231ee78b50cffb53043c53d1e2d79feb715ce18b730966e6421ec4a7a11a7e60b7f037d30303e85e0d6d144e551088f41be9745794fca20a3ff29 SHA512 9039139827535c3f1c65624fc70d8b351602e2891b3716e6c51bbf059f0c15fdcf24470bd80c13ab026851426d9f57baa7bbcbf4a1d44c2b1c1c23f86306f74c
 DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod 30 BLAKE2B c4b58079c7f353b01123ed35c24b8c9dc43139a9c87b12fd90cb99e41b97d6e2ce646710b261dedd2a6c9572ee42e677be0ffb43cbb8cb55b99d1eb92ac68f4b SHA512 e0a6df51284e6b2faa2ae12bbc2c53c649fc503427f0651fefe99cd852a012a76a9c5d967cd1a088e1b3270f9b68abc39f56a6d823c5913fa025b771145f80c6
 DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip 50402 BLAKE2B 361f6199022b22ba47eb17a7d85a670c4843cc4269df2587e8d9fcd1083525308b74f0a164dd1a59aec04b473da7eaf003bd005b92558126f282600b3cd4e262 SHA512 87e7c1792bb3a5ba1c78ea5844c0083abcc10f60d19019bcb763cac5aa7dd7625903e074228562207e836803a83bfb086148d886edc6d24e5fae7fc6d8abf11a
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip 2656615 BLAKE2B 08542db845ecffd88d279cd63919a705d566084bb556aa4a6c98164a11520ec6476841128134f8fac2e5132d5fb298c9ef6670074891e91ca90577a8535049ff SHA512 2e51e876c4533c4b34f0017f6f13ff3c34922a1905f6a4f90bab241152dbb344689d8d1f5ff1040c79632feb21fbd8f213831179bd424579ac9b5bb602325bac
-DIST github.com%2Fgohugoio%2Fgo-i18n%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013+incompatible.mod 35 BLAKE2B 0279c894fe94bee0cfb2114dc65e0d32e482b24c532fdef703d490e1d39d6d9e1023232fe5dc7105b03bcc0b84526cf27368ae0ddde12cc7f18b682e617d97d0 SHA512 b7cdbb624e0f377548e615fc2f58d3030f49a895d391a4999b3416fd9c0331d238803412ad7b656a7e63d94d1bf5928fd25edcb4ea9fad7ddad5a50d75ebc403
-DIST github.com%2Fgohugoio%2Fgo-i18n%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013+incompatible.zip 7214 BLAKE2B 610ac670efb15cfb4f04b50eb65a4a6684dc673f134e939998eccbff4ea85ceed06b13c4d86646d84f837d287a1f4a01bff7f4e52287d7977ba9b235900ec74a SHA512 9c78df5234b8c38b1979fdcaff4be7f773eac53f71d40deb3ba11134a80a79c2720174b23c95971c5f88dcdb799e3ca261e77a2655a6a382da42ab401ff85974
 DIST github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.mod 146 BLAKE2B 01738ecc540c339d328e4dee9c085dd41088e9532f871bddeec5cdece988ed7833d9edcbe41c8ccd5e1d6e4027b9477a56961b5c42bff405c39cc154d5b1bb23 SHA512 fa4246cb1847c86a59379846a5cf51d9f3bb18e9e9ef1207c497067487e1f462e99cf7862db8ad00d0b505afa0a23208804e00bba0347649598fd4df63e6bc95
 DIST github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.zip 59095 BLAKE2B 56223cef275e2ac1327ee1f02fb6c82c5ca51863a947cb3170cfee5647e928325e0bfd1ed37ae095a80e8d887da63536b4274e1251e1b6c8e5e89b6029f0d486 SHA512 fe06fa7ce1ff3978483aed46554ce0490fd51bf83bf2549cb2205164c2e0b79ae9438516b0c645e6366801d9ce6ab5bbe5a28d5f91b6d4976e87d5582a96e643
 DIST github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.mod 56 BLAKE2B edfe5d1a8e265dfcf7af99dfb905c3aa581d1af863b62e3bcec04463aeda3e2ac2c3a1dca8564e5fb1b84dc17843aa9e10464c91c3a78d2a7cae00c5a7f6f3af SHA512 9bf57307b2d5f1d1f5d45fc25c44584bdf84fba5d018708ce63d67fda8f7c35bf51810d05420d923b5628334bc0ed15ef0533d62d6ae952deb58ea90ce7ddbca
 DIST github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.zip 1468 BLAKE2B 9972ef48d939b2f0d22d9f5a82b35e85524847f0f050e70d280532885c1f8c46222a1d967a55b66d655944cd863bee0dbd918fa8a059f10493306d135c1a5237 SHA512 3f963a0afbd49c81c90995bc21b9c2b68a9f3f49c21546fa93e501d82d33f102956a45caeecd47da957604e628d2a345175bd5f447b06e708c0d00502f23e45b
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
-DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
@@ -313,7 +245,6 @@ DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod 132 BLAKE2B f3b71704fc425084aaee253539f0748260138ee1fb493a98c2d0acc7c4c0b3533efd5d13e4ec578d0ac070f7d6fe01447f6270bc420cdb78cf3dc854d38ce5d8 SHA512 8529555c2751bec1c55edb40c210cd6afeb4b5f9f0cc38f99911c9da7afd6363a42bf225c742116707cd22aec2fc217802ce1c8d52e11185a80cdf398e8c4941
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.zip 120225 BLAKE2B e84b38f741c6f3d965e6f50d533566b0cab8e84f25922e84e7ebcb131ee9840868c846a09d7dcd3fbb51596ba87e726d911389180f4c5e2d64c3aec404b1f3de SHA512 519ab053be60c4e48000bd9777cfc342f5272fd32d08a1351aa499aa24ae6f4f8c8dac85ecb59c1541d5296c89c538f24d7fa755bfdf18852cfa725dbfce3e70
 DIST github.com%2Fgolang%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
@@ -334,7 +265,6 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod 192 BLAKE2B 08ac45ddd213c2
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip 206858 BLAKE2B 42c113333104cf0335d16d24748ca111dc44a52b3c6ceb8e11388c85b8ac80c5c324ca9c6d90d08c07dc865909eed4510fb145153024890e4e160cde2b877269 SHA512 6df84a92489b04e55e35bb2334f7e9e55f4fac646e9ad904eca189d069443609fe1affc4cf5e92d0f90ea9c75162a72f134c6298f828608efe9a71b6e496eeb5
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
-DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
@@ -369,11 +299,8 @@ DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod 3
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
-DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.zip 1847493 BLAKE2B ea595a724c96dfb6f2b3e063163c2cf30d79051824ad515e10ed4bdb6bb5223b006b0d7ce328f5c7f6c15b3c0ebdc01f71df0a38d82fded401a4d7c037cf7b4d SHA512 cca5b261a581863e5a51acc064a1209ae6c838dd952cd5c6de9d6988a85e7234be5be143bf2e8968a8a3ae7388a6c7cf2616e24ae0c746b8dd5f3e71cc227bff
 DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
-DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.zip 14941 BLAKE2B 54d7bbbcbafc2a66cd2b59dc0c045b948275fab52203bd01444d4cf8e064b71a7f10a212734a1ef20998b33477d3b00f0405913e94dfaa11a02938944961f700 SHA512 6e4bb9ee5e5681a5de794a744e184c36824772563c5a26de2478301674bc50b93e091fab34a531f0eca13be1255f69a2748c32e2996d7c1e2d940302ad3b01f5
 DIST github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod 37 BLAKE2B 889b8d124501cd0e4e911f4778d36265620b7e42c785ffe0c3a80121f8a283bac29eeef29697a90e176a08665b5482a3b45b85c29cc002f1e69ce6586e8730c3 SHA512 907a01931662330c0a6698ae295bd892db2385a82d60a647096a25c33f541c2a7a770bd52ab2358d61e3464ee8fba19307462c7e8471523b950311d6c8e03470
-DIST github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.zip 10142 BLAKE2B 3dc4ae2693c5e15f8fc772550546a836e370ba6c26367532c84cd9b003c6cd21ca7366c8f76eea1d9788ccd573947af81bc0e0f21aab9ac1450fc23eb10fc687 SHA512 09f630c41d25f192451cd1ab10d95c85ede4e7f1b621f9caac8892e7e46c654c84eee0bcba91005706dc58c856e1ec0b0f405f1f7e2d2c61d6b9b474da8cf77b
 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.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip 21638 BLAKE2B 63e755faff06cc528386a19bdc3396a6deccf4872ca8d20484291c279b7c93bec50af19c31d6b41e37ff9144085af7e267ff63490bca1f2524c52a52e28c645f SHA512 b4c3f39d7ef5d42eb89e78e7924cc6edcb682062bb0a96295742359089fddf2806557877bb8ad609ee9c53ecf9d0fce15d0c8366d193ae89a979f834bec64ed1
@@ -387,69 +314,43 @@ DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
 DIST github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod 114 BLAKE2B 615da5161a82a6671eafe81e6b9d13163a96ba28ac37c9138e841a4155bd4252d02780b16004bf34ed5cd9148d939c1df73ae5de111756048a136745da0b04b4 SHA512 b91d15dce663147faec7143ccd4a4ea0cfbe4945b71a3e695268896ac1cb060b8d48ba5e656276c8536122d979ed767a1a4c8d5db8e520ae70df8f65d1bf8c9a
-DIST github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.zip 27333 BLAKE2B 8edda15582f8a851519837bc13e479d168b04cc2388a304fc8f5b0d399ed7d9695e9c6daa20a2b98a5c021e9b95145209605319b7d27654d6a4055a2f6d24c70 SHA512 d71564923b9a80ce3f6e9a14d5ac384b1466eb86fb88e01b0ed79830016b8db0de568253dfc2fe627e6147651e9a8e909fd1bfc6ba4863fbc637f0345b9245ad
 DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod 35 BLAKE2B 549faba95b001f14aa66c628d300b6b0e496c92cbd87ed5814b4dbddd422df6d5d7a38af10ea061e512df4129189d221bca001f2b23ce7bbd13fa0b7152bbf4b SHA512 b4c8a43e739f69430d5004c01d083be6f65a70301adc0cbe824955a3b7b50dd2b6033fe8db18419390cb577f89533e9b0399a169f1b10ea39fb2f0c0e3cc47a9
-DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.zip 28305 BLAKE2B 2f73bc0c17f4efc34baf6742a85e17ee6a57413a99e0182a68881bd3f951c20935c61fc683afcec3ac921e592cc50e784a2e256f7a09e59d59fc14fa19016257 SHA512 2b415676c23f840946a0ed06e187186229422927f8ffa0cafdca08fdb60cad0a13095ffac52cb51742b898ce85b8cf60761c87ff470c035ae51336d7ad56eeef
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod 39 BLAKE2B ce025298653101cca2bccaa3f6797881c47f92443d0835d57c2900c62bb34a82d1399884826c863a7a51fbf731c1a8f836674f4416ec2364a20c690d788eaf14 SHA512 3398e8e140093ee9f7c27ce680fc141df5bbeacffb365a98b64898fb6b28cca8eadcbed1d593b90a101a1aede53a5602eb3455e4ec364ea4b76aa3ca043f68f8
-DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip 57100 BLAKE2B 002b1bb18bc81e6a124d511aaa6270763eef5c9af2117cec54f4dae6be22f0bd0de2594158484ae32933f24f1107f4bd490dec99f119a1c7d2cb2f722a9160c8 SHA512 d4bab61fba7c23094263e73459f6b4bd15bdbe02ef6349619cf89e1064a7d44c20534d6267034a0af4f2aa1a7aff0f02c35f424d25e6dc7c4d5e911e6e9fed32
 DIST github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod 39 BLAKE2B 18dedfc007aad3087ef83c141ac6fc1835681c7f09af9a657f879e1f2bfce5e8d501113ca0e044435979b1dfb0ac5ad6954661f91118af7ff00b929076a39206 SHA512 f5596bc3919bf32ebdb9851ba6b8e5931eb88583e5129c277f6d5de4b339433ca8a180c40b1bfb44420c35cc8a01f53e4bf1cf6f0aef6f3b790590234bbebf61
-DIST github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.zip 74512 BLAKE2B d5f52e8fcecdd611a6dbf872a5420497e160a66afdcbe5285830cb8566bd32064e81173c971daab09f5ed8164ef571ec502a41ad49675b536ce597e49e6b90ef SHA512 60b35862bcce859368f01f47562308cfe0fd47932811375d1357a02aa21ebae6905c8aaa8533aa5f873005affd450c35f35f7b5e58b58ac46f92882c271509b6
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip 79096 BLAKE2B dfe472a48935e77689778e60ac3379abac11b1fd632c35033f4ba19afc601175a26e38bcdcaecdc56250d1b90aaa2f7f499010040eccc49e477dc904202de4b7 SHA512 4506c31c8d95fadde5570686eff451f177ff4bcc80469a5bdba92b65afcfb2597d05f14ca724e8dd40b43b867ab9eef1f62d98d7afed6bf93cd33b689d646c3c
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
-DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.zip 165533 BLAKE2B 04307e864994ddb9d843c45b57eb5bcac0c5d13aa18e63da83767803e4c1dda72d0c17070d566f6040bbd561fbe46c97bd2027477bbc23acc8b27fe68d48e4ef SHA512 dc279707dde421e9650071c85d85e5311053b1ade53dbaff95e71f3619b54d91200a8836f342d5bae6a324aa27474329bc93323e13ef8a64f79114159bfb79f2
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
-DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip 35110 BLAKE2B 4ebd3cf0dc4580a53cbefe7a955cf05cb6d1d60a69951ea4e18eaaf108ce2cd5bfd0b2dc4bed62a12b48922f6f9dcdf1e598b77a946bfa0267314caea827286d SHA512 5c8e6beedefdf390a9eda76fd8d5042323e1c9a6306605ec7ca8b1612bc038a6cb0c02ca1093e0b6373a05ea64b7eb0c0bc62720a74b37d4ceb61564f4d46753
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
-DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.zip 424517 BLAKE2B 4533ca4e12b0577325f0621480d91994f88dc645887e534056cd77c4c83cd37f701c249e91def9bd4bb7374d50b030cc6182f2668196769f186c85c33a6d7fb8 SHA512 1b8fd632eea86272aa5300bcac20d0a52877ce911ec568f33ce16580e965d082facd040927f8d095deea000409baee5dacf8dff1dabcf396bab678f038ca5494
 DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod 449 BLAKE2B 1fbabe18b977c8e6283312fc1f8d8b35514104080a4880afd4445b92fa20af4db49ef3f7fe1da703d4237e6bd78902e64fcc7e9d4db85e84153c2bdbc6a6366b SHA512 a6d33e281b580e5a3461edadbf4e5ebe6aa74a8a929b9f0e96582592b24c85eea1ab202457f88f648018cf5991d267811132ec77255ab4886b6ccf958487d5eb
-DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.zip 126149 BLAKE2B f9ef1d24cb6101f8a40e5043cb7136fd74e88644949f75d69fea72e7ef7800ecb83e31af2a75baab144cc4cb08ff2825632d2b6ebbd03ae616a9a55f8028183d SHA512 378eb0393b0afb17d47919ebdd5b6dccdb45976573809796a970c22fc2cd7ff0187821b3f342a1d4f3763acf6b971a44c0a026004bcf86170dbe34d654d1ba8d
 DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
-DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.zip 21684 BLAKE2B d03dc86a6b954f949402a5ae79587002daca93d74c42bfc2159e17c43b6667703ce42accc3b7e3e359e9ed45a14062c46a293b9ef844a615f483df948747691d SHA512 9aeac7b0d9f2125f3efe8bc01c2dc48c928e50acec8ec3747316bbf780cca31c00a78bd9ad2f56f6a574d669ac681d8a46b23369fad859d41b4eded2d8b6b900
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
-DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
-DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip 9560 BLAKE2B 2c8039854037c0f11590c80605cd30bce58baed3e8ba11840e98e8b450d0b2303704d1a55252589529021af473fe1f47f7bf6a3edab5ecab4de4888088843b2a SHA512 d439e95bfd858cf71659e8ce905748749e9e15cf577b98b66d7d8dd6adbff8262219d0c26bbbe9a24021ed5d683d7b81dc560eec4a97f09a1b44fb8983a4177b
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
-DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
-DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip 62565 BLAKE2B 81458eb1985472e46b2db22532790ea707b1c1fdd55a26df8cd371966a8ce672d35aaee79dc1984f3ed7c2ffc6d303c1c0132f7ca28487fbb379ef6e70cf34eb SHA512 4e898272a286e7abd48722e31c8f256cefb377d22bb8fba47db0bdd8d0a871659cfe1589d0d0254d7bee4ac9aa4edd5ced714546a5710e6dfc66d1f961e0f12d
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
-DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6e5519fc2dc1209382c6ffb6f73d29dc97b6cfa03ef525d6095e65870a1ce25ca59d56648e24bc399f53f6879c0a3ce91e27645a48734602292c7d99bfe16 SHA512 8f86f79788cec64d9ce4f02af2ab7acd64f2014e5b592256f07563841444520bf4810a1dfa76abf04909dbe5f3298c67c0a88e636e45a181e461a2fac08d385c
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
-DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.zip 14906 BLAKE2B fc4a7df96ed503f3fe01d0bdbeac5e1ca6885dc2a5b7b22f0f7c2c7d8b2ca787b3a52a1bfcf082b6082e6fcf836c004c8c15d08a48422b83e9d12db72829f3e2 SHA512 10495832f2b8589ab1faac8140f9fb1b35a207683e214efbc11798583d6bf1479b13492d9f9e02dd7368054ea2a0571f87a5a8ae1e37c82454cae86f26db533a
 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
-DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip 130743 BLAKE2B d7e78c75b2a9cf89b07fc1c1ebd0f93668d595e21d13f45fe7cb98f09a8e7539cbc2acd2d14527370c6d4e219c0d5dadf414a8504930b499dd306a08117d774f SHA512 718496a1cd900d52b314a0113729906e42940f9e3caed0f989f16d7e28a5b8476400c00917f05e669737c5c45da3af95741c99a188698b628497ab2eb18ec49b
 DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
-DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip 6210 BLAKE2B b5d3b234531523546445cfc48d9c4198fd0ffe8c91ad6d2b3349f28d5073a6d3cd76f0db36380d69ea5617357a8677a81ef8cebe04c0dbc4538bec1810f817ae SHA512 50519f8c8efb7b3494c857373cb119b924f2ace674f07bd0d0da5939a75f8c154b5cc8875fd35135228a9e8e221fccc174aa298d21bd490b89a0f2d9aeb38e09
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
-DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
 DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
-DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.zip 525053 BLAKE2B c667a83b0ff18782c883406910620d3eb32b541043520e782953a71c33ebdbdc149612f87df68fb645f72db9c888c1d0ea8165210c35498bb840b9047ff0d1aa SHA512 5e60b4baa404de9210496a710ef1bd73b8795f679c6079719d7ff30c5a545f9ee407108981a3019bba008100f35b722f9eade9e48c09df4b8a245b0dac228ccd
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
-DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19fcac3ee740e1b4898414cf09a2813bdb6922705cdcad5913d7fe4682d11219ef10d8bd3921fcf93c7d568daadd33b8e7c307a55eea6ac0d54ca SHA512 19403c36137b6ec9247fab3a9255dc98ad9dc46ba03ad3788e11298f8a310756b24dbfd3a0d9893ad93dc111dd228c421f96daae09e2058438c3c7c58386a71b
 DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
-DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip 9174 BLAKE2B d972fd0c0a8b7135723ae51a6e57ce7b686c7d4b88313c2df73fc537874405595f82f58f5ca51da4036667f6d48f74022225209bcf148228e1d0deb0a6d3d709 SHA512 f2935ed7cc01bfb3aa7ff86dc4172edcf5fe20727c59a43676565d81c878de1dc6a0c49bd51076bf2e078ff71f72ad689802c0286d26e0bad26b2ded74d222d2
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
-DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.zip 14575 BLAKE2B aa85d696951ae3aefd27eb419d146d6475bd8d9039d2385fd44a1ec7d0ebda4d1d82a7cea586a6090d67b0d7f692ea958b62ea1d8d75caba640ddc58469b7996 SHA512 498f6c6cefcfd5558cac0f3485e2a11f4ce9aeb9ccf4d9c460354da5268d17bd5a301ac60cf93d73062a236330d254da8c2ca02fe0a339d25f9a70fe064ac610
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
-DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.zip 103250 BLAKE2B d322a7ccfc3ca434f8f44cc07769e4179197d1d48d85bf7c4e666f9a6c12640dc4196937af09ba7a07c9da1bdbba5749f2c37744ae28b7c526174aa7af072866 SHA512 af29d68cb9eeadc11a5d0e9033ac0c9a9aa9972935b2cc7eb76e951db9b12124f16b0a6ad91a5990b37c08c8b39258f32a9e63afad75e114fc853ec89504db93
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
-DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.zip 540021 BLAKE2B edeffa17022930bd4a779b44fdfbfac3b301ffa9853841ad8ec2f047a4276580d385867dabc3f965822d80ce75a777272cba283347db6856215c89ecebc2c176 SHA512 acc3212eb8404e04fd4016dcfbdeaf519e7ff7a0b1c651d3ba9ffb3dac0565f4195ebca66c0d9fe2a6439d8057699a743447fc78ed671dfb971f1e818e6abf3a
 DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
 DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
-DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.zip 59110 BLAKE2B 9209419562e983f7c24938065b8522e281fc54b68197df5647b7858e4da017445dfa489bde8eec52dc5293e9b2475f6726df1d4959d8e5189610cfe00e752f27 SHA512 4c9b7051d50831e3f7caf018f501c7a4344ca917b58167fd159c298b09e3cb03320227e9bcd5e21736a26b70ce28521cc5fae3ad9b8b9afbb82097ff63781e5e
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
 DIST github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.mod 287 BLAKE2B aa66f52ed9a8a62883f7845028a47ddda8e356c692702422165b54c99e6c470267f6ebd42268bc6aab66a954a96d3157dfc1a9f942ededa71c73200d06def8e8 SHA512 023f33e7422d9fa87a20dc0a6361e4260722761d621041f46623b39705710cc085c912ee12e1380e9b364b9d05315972e84e6684a5e92157d2eb467cfeee71ea
 DIST github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.zip 4455658 BLAKE2B a619d4bc5867a9a3db50f69575229b93c20497f628ecb7b8d2acc8dab72eec045717e7dd28362acf02e48acccb4c0775cba9be9a4b5e3c489bdda7fd4a86672f SHA512 0101fdd8bb80f7453c537cac883ecb415503ecbe84c179e2dbf3b7f85036f2c06e805d4c89306049403346619e039a46ec8d9ad2da5ccdf5355baa8442846c9e
 DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
-DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.zip 73484 BLAKE2B f672190275344f13b69502306133f6d009fe380f079ff20aa18366ba790ba6bdac3bfec7e7c27d8da21a463a5adf3a0a5d7bee2a08cbd12d9f7c8fff2450fe55 SHA512 a66fd5693b4a57cbb994d48bbde37ad226f57bb73a0bad7da5e5763af5826795bc282d2fb23e60565286223050d4f2c2a5cab9bf7ef646cb571f4d844dfc2749
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod 92 BLAKE2B 8b5eebcb883871ea090297a64f2ac5171b87eb4881fab71e73fc737e2ca4c301d8fa3a14f184d5c468120ea4b3f22c89867c952795fedbea7abc9b7e618d14c1 SHA512 8361dae50e9bc2db7887bd94f516f817dfc1a3c509c776640b0f9380343236d52a3f43a5ca0093a49a4ab6b5474ec2ad24a4c8549d5949e4f5fed0b322b83c21
@@ -458,33 +359,23 @@ DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip 195725 BLAKE2B d41015
 DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod 209 BLAKE2B 00b0c468a857190cd26890babb3e946e9ebbe5ebf0b94ae01519ba32a96f3d99b031140d6de003caee9ca076b33736c96fe4474fb715def44f6ea1eda3ef258c SHA512 8e54b9d01e16e47686cd7aa3b4b184b61a24b7d54fb83a37897c8b76621b3f4594fa86f05b8f08908f6999862e741309c49dcd90bcc928501be084b5667ddfbc
 DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip 94054 BLAKE2B 33e25f87bb306decf63ba4d67e841b59b5fe1410ab5a75829f5f33f396b74335d28876bd0c3deba8edd37e7d5f938ec3fafc3982dea464958fd0d34f419bfafb SHA512 297e929f6acaed88fa197463d38b50725f8f3d953faf813da2c1aba2e179191cc1863e3b0910159d419c842eb319268985aaba4ed4486d5ef9b9c4173e02fcb6
 DIST github.com%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%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip 8857 BLAKE2B 2887917f30fc4cba4c028ce8d42262b007ecd785df9f4ba1dd74f9ddf68376a6c3af924449684c8ff8ca530b249445a7ac0ea36a63fdb18d767ed3649a63f7e0 SHA512 999ed7f22551e55d6b4b59af2ff2692ddddb251de4c61a835ccbb9f8386ae426ef8df6c3434b8e8e143faacf82ab64e022350f9d57ec51544a27042465cf920f
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip 130029 BLAKE2B d93b46be80649fe8a93eafb6d1bf323daed352a9502bc00034da2bb868b757a32ee2417d0c1fb4f79693f076317d98c35987807f4823fc508043115aa3646a8b SHA512 ff2823c8371568a825075309054e424816e45c0242efea76d94127a72b875ff54d7c7f415bf7aefcb8f0df0863f56d9288df64869edbfba29fb15c693f968b17
 DIST github.com%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%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip 42083 BLAKE2B 5f9cc715c99fa4058551abcdabb96e2294cd50c79f49e8acd42b0e37cc990599a1eab827121b259b47d7af6fc62f1b75791c4916feafe6be08e2df3932e49fba SHA512 9f5d126347316b497910b30fa2905e6b6c119fa975adc6bd4f17f5a346cbe110c10f33a7df6ecc63e086c082f61ce493e4ca5efefbf2eb8d024f2a07cd80e093
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
-DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.zip 27708 BLAKE2B 9eb8dcb372c62b421c7fc99730e388309bd1cfa623becfa8fc674ba212ffa3a177ef7191c4933141c3d2a191c9c683647d38ff01a3075c01ac89ac1019de6030 SHA512 61701d7f06488873031e92a31095560fa32f80948ecf169391a64b32c1162fd59d2efc2cd6a62ba0d60a392eaa8676156d088e15da4dcc441a07e65320c1cb0c
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
-DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.zip 18257 BLAKE2B da8b70d502d0a158f016e697781f7dfa36fb36511d78ecb936a1f28d01d5ecf8294dbaacd3af1af421c541356db6cec80f47d405e886110e92b1b8be82dee68d SHA512 840140a0059fab470fa431ed5d76a6405c7954c0776d128290d25a3a4746a92d08b48aa35514fe8525e2ad3051dec4436f0c1f0e4b35e07ce082a0d7b019b64b
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
-DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip 18981 BLAKE2B c940bf7f20236ef2b770dc683b5bd5525bc1413c86ae63dd328b2ab1aec7a319d5201733cc832b31185027e27739a6dcd5277d76856f1f95197b3b7797a23bf1 SHA512 9eba5f95e6c5d29b2928708ed91b1cd5a023f0b7053b5529095112a2190d097ba26be7f63b7719f7ee2ed29e698bfe7c4dfa0b33f60b4e475fd1d420453fe7e2
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
-DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
 DIST github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod 26 BLAKE2B cb393cd37dc2b7c07fc316b588fac0f245ee33a37ff3d4ca0df67ce952976463df9a79d600a37d5cbd3f596c0135c2c0330aba871cc941cea13325eb24e6e56d SHA512 c151e8d0c5002b25d399fe4a7420e5735cca46dc6f3bd18837f110f5a72659406a3b92d7f870898c97f58b6f42364d4c97e9457491a0534ce456ec46d15b1697
-DIST github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.zip 5552 BLAKE2B db12ce748ecb80b3417133273f1ddc61efb8898b55fe4f387bb9b08800bba65623128557f7e939470116b96b0ee1dff0b2496e264616e1c0e3a5ba1cbe367be6 SHA512 1133134d79de4e0b45085c13c228358b77e0a01b77c39bb9d1b0af668aea816cfc9fd1efd9a325b75b65543ec7d71fceaf8c6d8190801ccfc4ff41bee9db8bc8
 DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
-DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip 9142 BLAKE2B 0db0e9a6ba33fd156c75943cce1b95385e53593d7f6957f0e6375b38625e1ee60a86b80229ce6cf0ee33de603fb0788892d0a3c3cd20a6969c1acca2521953da SHA512 5e493f08d6a45e8e12160b8c51eb380156ba1d2382523e1be159fa16d15d7ac32c8bbf2861e74791a0fdaa06155e95ad12b5f4999515a9a69dad1384ebbdfad0
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip 11508 BLAKE2B 609b34f41f3c1579ae15bbdd5f9632dd58e9082917acce355ffc5402c33ea45bb0bda32d009a0a58c6cd60327aa87008453e0c4c36ed2a1be41c4f5337de72d9 SHA512 0f792e6f960b0cb8f9a30c25d3a3f30e7c459a05d7f03f68c98cb581967fc48b377314cb83b990c9509cde5680389bee0ce2b0b1efedbceb5592f38a9ae6a3ec
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
-DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.zip 14199 BLAKE2B b9bb1dffef78db4dcaef4486c1a9d6b5977cda3b4e33e7ae585a72deaae1e2dbcf37eda3fe15917ae3e2879c04b1dad2699d363e87fe92ede94b36e06ccb90cc SHA512 1c5bd671c28d8ef4fec6e870899a41c4abaad744e558eb4dc167235e14c9baa685f0e3eb31c0dcec2f638f162109c99c3a52bbd0ed0a704afd3a4d010fcb17b7
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
@@ -492,7 +383,6 @@ DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip 25634 BLAKE2B a236740e2
 DIST github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.mod 44 BLAKE2B 2242b2706d4f626d9444ea7cb67d47f53a99acf13fc4f805dcb3ef14fbad775834c6930440d3d4ff2e8d82ce3d309504a9c93ef324e751106f7d64e2c30e4fe7 SHA512 ae329a4404643963820f154403e791cb2ea2022b5d4e2372586f7b425ce5a4de7dca515a23230bce3b8ee11e9ed4b48da2b7898015d1e2a9beb5e566acd3ed80
 DIST github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.zip 99690 BLAKE2B 84e12b534d9a085c28082997935d98c169e930ff6e9f3f587cdc57c8d41f61b14354cfc79d274601550d394538fae717766f28dd2963164bc06c869aef44b6af SHA512 150be797df56a47504437587af8bb899b9e44ec9ee93214e86992761321f67a481466b42b70244b5ed43fd913b04fd870cd0b1e3b2cb19c251e246753b6aab2b
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
-DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.zip 113516 BLAKE2B 885fbeb080558f74b09f37e15be84799ffbdf002a4a10c112a0556f740e4b21086ce86b7bac60f593facea80b9da8065a840b061162516e8395986f016173e78 SHA512 8ab5fdea76b41e30cb451748e1184f220dea3d5eacd8f3db9f4df802551e7740a37cc81a64d817e1a89c68879aef7ed355a5b4de8debf5a3da8dbb70af5b56cc
 DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.mod 41 BLAKE2B 6269fdf51dccf032b87cf8e7ea710c01933f0be0fea993963af14eb9274fa1a8bb078ad75f90279b4ba1b83d70035725c2f19f0241db615828231a2fa32c2cff SHA512 00bd89d63559cd13e21f6e60155e7c1c200848129dfbe4819a964efd14eb36141ee3dd9fd0c43fe28c7ff9f9255e8954e9d2145eb409f3e30b3474054737811c
 DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.zip 8896006 BLAKE2B 4616e73bd66ae641c72c3a20cf83fb8786cfaadb05ee3f395c8aafef2999a5f3d21551e055c1cd189d302a9ed30c6322ebe8580361f43ed63c7f50f75cedea6e SHA512 2ee5192fc0c5784460652b06722f1e4752327691ed6105bff971e23842ef9ff5645bf55a404d461a8ed5b0d56f70e48078a8dbef1542c332ab498ba40ca342a2
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
@@ -501,10 +391,8 @@ DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mo
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.zip 109298 BLAKE2B 071e3d180a6bf5ed529b06a689bfb83f4486cdd9a9c7689c2436eae3fbab75ca0b330f76a8419838c782ca490c3cefc148adc3e102f9f9b6bf60e5c583773a82 SHA512 3f949f7f223ca1534c86497257d15ccf29a9996a2fa0f1ddfa9336314a3e2d51a01f364beddcc8865b7d2bd9420f5e477dfa4d667545458ea5cb04b9e454c03e
 DIST github.com%2Fmatryer%2Ftry%2F@v%2Fv0.0.0-20161228173917-9ac251b645a2.mod 30 BLAKE2B f00882e1ca299718f10afb3cd662ecb428c04d1a239a17a66c82f631d81dd44b5a5b9b468d15b1cf188d1778747a4b72bf2c0c13fc2db98d8ec0372cd16e87cf SHA512 a5fa95d6c5fc23283fdd629d47a0a1ebfd759ea04e6721f1989fdfbe0d47577ac6f4dc8ec0d01a96a6f8a52b1f22da15c1e05759495852af8624ad648ac01d70
-DIST github.com%2Fmatryer%2Ftry%2F@v%2Fv0.0.0-20161228173917-9ac251b645a2.zip 4444 BLAKE2B ddb340d235a3f2c8095faa18789c508e3f29aedbf495a6bdd995ad9964de0fadaf2dfb3853e734fcd45f8958014845468819f4808bc1ffc2b0ca05e46874afc3 SHA512 9981e3c188ab4816247bc755b3fdc0d2b1f71a1dd68228eb347d9fc5558dba18eca44f3d735bcc00428e72264829291070b6a0eca82faedef606e318c6d6591e
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
 DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod 35 BLAKE2B 0a7015c7402b5f49d0778bb3fdd06dab38d0a0252c40d08b0e236c94b78b7d6d7970e63efd25ee038f94b0d150979c1f81753ba1d73b34cb79ae5d57f18fee2e SHA512 66fe9fc0d2bd738f679bc576f84a807e5fa393b174d1193b448a84098cf1d5f17f884d4dc7d177092d3675176ad79070d51db45b3a5e3383246710e0f63d2018
 DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod 35 BLAKE2B 0a7015c7402b5f49d0778bb3fdd06dab38d0a0252c40d08b0e236c94b78b7d6d7970e63efd25ee038f94b0d150979c1f81753ba1d73b34cb79ae5d57f18fee2e SHA512 66fe9fc0d2bd738f679bc576f84a807e5fa393b174d1193b448a84098cf1d5f17f884d4dc7d177092d3675176ad79070d51db45b3a5e3383246710e0f63d2018
 DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod 201 BLAKE2B e7d70655a2b746b1ebac46650c7539e492dd2b40c44d7fcaa397167be74f2bdd8a3997d4e31fb30739dc562eb883b82df5f7b95125ee6569e598517b13452d02 SHA512 65713ddcb3bf3c4b8352e7f07ebaa48ea539170b9bfa1026e7ec95084dc0ad4ae9217fcad5793ce9b01582c5cf225fbbadb0d79380df07f48703373b2e7f5237
@@ -516,87 +404,62 @@ DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc016
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
 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%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
-DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip 205179 BLAKE2B fb8268a263b729fdeebf985c355c67aa1f3d2d9cfa21dc8268852df9788a2b27b06586be0d715e0d65211272b41117810e2441594bb1f74013cfcfd794baed18 SHA512 21644fd845a9e20e7b142e5671cc53cc39a0de3461b8374b6fb1719b44d464014041458e547e1621a765c3156742b0d5f2c6bd168f4ea49e9819af0d9f25ac79
 DIST github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.mod 30 BLAKE2B 8f61bdebac4f364bc3cc298f81f8f8dd5ce9d73ba1b2aac72a3fa4af3541321bbf14536df81ee032dc56c7579c63f0a77bc9d848349a2458800b131683668ce6 SHA512 842856979fe9c022b2c1b961d66394e39722eb5a69f24e8a6018f70d0a3bc14e9e1e5f5106653a84cd09300be20b9f0ddaa4640ef799b8b6fb2a6cb9f8e42216
 DIST github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.zip 227924 BLAKE2B 2836092f4781c5c37de10b7e808d33b2b1c77eaeac537dda1f1b789dfdcf64f297b633592102ccfee77e1af3817f934eb3c89cb30fc0d044900bcb7f149a3768 SHA512 69025f1dbfe177075bb788a7763160cb653e89843935828d37454c1eb4d60977cbb897f1bc181b37bf3c02b514b23d492e5631f4f57566d0f5b5043c5c6dc047
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
-DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip 30028 BLAKE2B 2d6bd9a97203fa6b04ff50734a1f7da69641cc4fab3830aef9820c63f680182efebc9802ab33aa471c4701bce8ae571cb1ca13a8f48f820358b921ca19ef98ee SHA512 37d61427d0ff8e8b7f9183046aaaf829e5006abb3b0e3824c0dfab2c96f03dbecbaab9ea983a8835da953ec664cc6074097f13382edd4fb19ee7eeb21cff4668
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
 DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
-DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip 4603 BLAKE2B 409e75eaeb540957751fdf5471d8db1aecefc29511c1344edb6b9091c1052bcf22c06611d929b652682434fbd50f0b730d959e69a1979737ef29cb101ac5aba2 SHA512 e4c9a39de4fcc5087e1dfc0071920c53a95fdbd23c8e0b30cf56f7d11625e6eec44f5fd0ab6b942a5cbed86ee2b02d525f03ee026f7d60f70d1e14a82d9b335b
 DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
-DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.zip 19998 BLAKE2B 744a88d9e7abc1a41322870a5bf3cb7f132c768f29975271342723f7395b2d29034be3f706eb239c8b3c50874c5512233be3fa0deedde611805e592bc2992957 SHA512 a81874721f0491ef2bc82d3c3a0e40aaa4db4754d04783375853b05d29f3e57b01df01e81d786771c6612024875797ac7ea6a3142fc0c6957ffadebb4b29576d
 DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8ffe9f17b9bfd55d7f3b44a0571132809a2d18960cad73780b88d31a723fb380b82c2c3952030a0bb4802929b625583e8aec8875c36a2720c0135ed8b59fe4d1 SHA512 414c86e4d26a8cd2f215353f04ca7ba0eaa17af36e3d3708164cb3698b8d198355bc7bf57897fb9d96cfa822ed50681a18157540a752998060c1549348791755
 DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip 8207 BLAKE2B e83d1907a09b00eac0ff79803983863e643961fefe9ff69fe0c8ca7ea590d0878d416109df385eddaa7eaea4cbb86fa60ad0df16a09254fc16d06cadfab82219 SHA512 c4d665252984e51420039cea5d2fb7e435b31cf8df3fc915bf01eb19b739514ccfd632c6e4b4f93df575b0e1fb02ed7ea822a5e02790442bae4e421b7cff44b4
 DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
-DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip 2536 BLAKE2B 5f26ee7bc9146338a1bea319bd563161f921017bb208967b7745a06e7482232f00f7c32f23cd526efb44211e9275d0fd27556f77ad3fbb033677b12e79d520ea SHA512 c27fae2305ad9b3dabd7bf99214b86540ad21a6b2bc746c67251813769da9d49aea1cfe473fb4effa9ab7ed9e1397c36c9906445a68e84be1215ed2b3148ab9c
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip 31024 BLAKE2B 0764e170ebb5ee0b3c4a827b6df9eb62d6804202375a3c37b115879f7c716c026f80aa08118b6bb7ac1a1572070efe8acb235e1ae2e1a4f154a5cff4f4a4bc80 SHA512 e61765ecbb25ee639710d666f5523cbdca9ac5792782926d5ae7e0b13545e0bc5d0aa5d090bfb5e2b6ea218b55fa3fe4ceb8a51e5ac432f7d6e5c9eb86aa043c
 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
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
-DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
 DIST github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.6.3.mod 37 BLAKE2B 19d1ea7d880f811795d06af263c6f11c05c45b65e95a035b0a46bc132f456c41a5ec726fd934672b88129ce172ddbf5d584f524939f494cf3f6ae66671d6ea31 SHA512 b624ab08a47139a1fa45e00136e8199f27fb2d82b9589ea9227a323a7d7f3e0f58114876c0af82281ff3300eba8b1241ba804d73e63370768f58881bf45fabf7
-DIST github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.6.3.zip 72307 BLAKE2B 246050936050da88e35973e490ab27bcedcc82dda43e806f1abebd9c177aaabbe8dc4b770fee02d8d74c3de3c3b7c668c733aa387faf8f43e81c06bfe48ea0f6 SHA512 6038ed1bbbde855f5665a7b1ea92ace0f4040a1316df2c0d524e0f4bc2cfa82f674b592c0913c69de7a227fba3a0752abe58a14de249dfdefee11bb70d9acfc2
 DIST github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.mod 35 BLAKE2B f58a5fde6532fc5ee36b27749d6cdc79d003130d6cbbe38a471e8986967c1bf31f33dbe364ebebcf0a94d8f7f5ea0eed2d2a357b5787e26c097d9cfa5cbf53a0 SHA512 e5eae9fae34286738bc0adffcc16776ce9b376de39317205dbfa2440dfdaf606a8d974cff8926524e45e89bb70f0a5803e3732baece125babae0bbd35808fb4a
 DIST github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.zip 452025 BLAKE2B 74c3cc4c35d6ca1dbcd6f1a5f3a4e4273326dcc342dcf8d1d8c27c4242abf1a5c3013a70cefcddd6de3c356b098d71f9d727b0f0ba5acc26a9dcf14b00c697f5 SHA512 4741aa973a2a39b9c8c83ba7716388b2a4870fc0bab2c30a2b9ae3977e30d544c8de887fb37b68aabc194826b56cc765b534e75f8ab47e06de692ae1a4fce2f6
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
-DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.zip 24318 BLAKE2B ca6af09a05d68b30a5d7b0a25a5aabda5253db4ea60dae79a02dba819771740b51101ea6abf43e456a5371a1f4ce541ef7152e41a292fc0888b4aae156ee6263 SHA512 2da970823cf8360fe51c74349dcc50161299c67db7d364bf16941325a357cda0ff9a216a2423bd463e36f2a6d888848fbe671e1998892c78edc2690e28e93d38
 DIST github.com%2Fneurosnap%2Fsentences%2F@v%2Fv1.0.6.mod 38 BLAKE2B df9b03103264ed2e69f5152e8734647e146a7147a42b3a49b516637429a7cac22dcb2b64edfa9501b6b0e0e6c882e1fe89f58a734d29dab85703f0d83c87f640 SHA512 bfdd222f9d7b497dbbe46de76390a81b47e160b694489a507559e9772e741d86eecd3894bd3c50533b44ba58bb72fcc74adc80ad29a397915b3f5f84e03a5f59
-DIST github.com%2Fneurosnap%2Fsentences%2F@v%2Fv1.0.6.zip 5275653 BLAKE2B bd2a0a63098a9d9cdc7c379af111261b9577398914dc153b53ff0e282790ceb64b8ee2dd18d7085ac8716670497d13e4790cbcca5f5a7772fa564aaa90bb0d75 SHA512 5caf8a601784c1b22f8483358b3dcfc33883aaef819a821f452dc60bd9eba56e1c23875cf075dd658a0bcb4b103d48a91827f6f55481566d2775030e724a1250
 DIST github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.mod 30 BLAKE2B f341cbc3c99d90e1f30ce42b1e0442916e1c5e79d673a0a77347b4f9de6a145c630e4e4b8c11a4aed24f4d8e7344121524605bf85f6c8a29055ce2ad83ecc42e SHA512 2014d24781e25f535cef3ec241bf618048237c877e4299a1fcfc8f2598cf59f8f7cda2e1ec3617dab6879bb612addb6f796764a0de6c5400fe3c8ba77c3c41cd
 DIST github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.zip 21438 BLAKE2B 4a8c00534953ce7dd836750cebad46a6c74581d6260c6da1bb4fab90b3ef9e811a0beb8c85ebe1080e670a470a5480ca01c0a7bf061ac79353e8fe3fd837ffa4 SHA512 7a4b7824bc8b2431d731acca009b1cb2de5e9432a9a2c43f5dfd3b65cd83696b8f299c6f98a97b16fbde101e8a3bedf1d21f0ba2633c377c77d44df44b4e1d62
-DIST github.com%2Fnicksnyder%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.2.mod 147 BLAKE2B 50123ac6ecf98a09050ab5e225400c4fa316045d7573956246447ca48901353531921f0bc886ae486d9ff96c01fbaf8f81da054a33bc46257b7c94650a6b12e0 SHA512 3eab2496fda3b346141d048edd95ec1763786f231c03574bbded4055201bebbaefdba06bbfebc1fc49647ee7f09e5a01c7cd6d5138c8368a37e4cef1df9d96c0
-DIST github.com%2Fnicksnyder%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.2.zip 55521 BLAKE2B cc3d4da7e7efb86d2405241df4102805896a7f7e2b37308f673df689b69fb44c3f402961a0833ef772abdc42be96f1e1ae4e8728eb9d8982d948da4f99fc99c8 SHA512 1626a7a814e8fd7a8cb24a54eaa07eb034b4bd7fe970ff2ab18bec48185a782a0db9736d4656e261927c96c1f0fd4d6dd4ce4734d7d4fe0d1f900716ee3ee09b
 DIST github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.mod 190 BLAKE2B 30d59887c087a5ca82b81e2de06fe6c7bdd2af6ac343771c59c3b1d5b448275393c1c12614b6151f3522a2c70a0128734332790fd5eec23a389699fe6a06698c SHA512 8c0d4ab0bd0db4918602873db64313df8020a367f99bdc69605ec7ada0de0139d991d7132e52811aa7aab5c1d8e28892f13a3f338c6dcd71b473936310a216b3
 DIST github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.zip 281619 BLAKE2B ca2216b33ebef368a7d6e6462775236aa72addaa43138aa9d019c19b910e0684ee10e2b3ed97770d433d7e9b8ce9c54cf786cac347bb2a04d704a1629ea5e0c6 SHA512 263217452eec0cc3f2abfef19d9a148a7020951a1e60e06da3fbce50a2a90993e34c5437ff12d5062d35d676f0b66ec2d29c0e0b00e1cdbb42d313be3c70f785
 DIST github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.mod 38 BLAKE2B 8d79ae5544eb700b505659942ce726874401d745f09108817e3d5ef9f520a3967b5f8fdae71f0206a9397ec3b298fb7531846cf6a7d66c72769f9f80d05f1187 SHA512 54cda8d52ccfb537609ca642d4b86226da9e8f9795f482137708c1e455b01e3163f0fa446442fb353fb345ade0967d9059e0a365c33bbf39551abb530f422e3f
-DIST github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.zip 5055 BLAKE2B 05f16eadb8230e3f77c7b09e3f8157e3d71acfd2448f22316f66355576ea505bb5db330bd91673c503ff2d62f8bb2b7aa0b296b6d31c94a4f70985817511c0f0 SHA512 787d861f037142b5edbff8e013ade0f75e419aa7b8ba92cabed16c721fc6c751c92890b9fbda0d6fd72a78705ce0645b55fc80be1be12665be3b9921fbfa3b5f
 DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
-DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip 21676 BLAKE2B e526b9b4942340554bbdd07d83f4cb9678348c600793658644deeb1c64880d420fac1a95002cfd846e7c24d5aa5b1768b5bb1f71a1aed5e44e3755fe2a7c80c0 SHA512 6e24127bb86e9a0990567541b268c9ffb3a91d9cbb379b59b5120ed7f34d6e7f5f32b9efcbbe17553466fc07c06d34017644d7f751775b734b186af1e94d9629
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod 96 BLAKE2B 7014a0ac5adf29ba3e90a2ef7400121b655c47924fa0fffe686fdf4234b4e01fe92ba04e82b5153b63c8d20c8b466af03f0fd0975f5a9d6e8dc2f305e4712cef SHA512 79c65033c9ed8b95230cc1f11ae5f1684a3a0d48ca9c47bc33d46376b732be4d08a8b6d39788e388b86ec16e502e378fea4654424e81ab3fa372ff30e87bfdfb
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.zip 24933 BLAKE2B 930a6651270418384adf858856eb9b603a289230f1f6ffc65d0f816f7b20a8d7e1f5dd3c6bc27eea4369670da7e5e5b512fc966b0b6d06eb6735625a53c85eff SHA512 51ac6647cf44f5ba36d9209576dff1f2f133ec8b0a13a957e4642e3034b2d2b755de8ebf34a0c77f146b3f33044cc2f71a85e512690553e3a3bf311c2f46bae8
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
-DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip 25325 BLAKE2B 5a4a2551f61bf5c4d0da0dc32ebdc22b9c8c8e52bd1f4e74a658c919ce8c685e8aa7d8a8eece85a8b4958a30459c7daf90424b7dc67c3460323c340aa2743e33 SHA512 da2634fbe6ebfafe3e70a9b6bdd1d9cbba051086a27f9b23eb49d04d2148c10b53b53f6b59161655e813bf7451d5663e8bd2a5b64476950435c3211a69e27b41
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.mod 45 BLAKE2B 0a144164f01fb7455ab76875415874dc845b22f9cba88105b7453e5c4c07c21f00a3ce83b8802f333bd775fdce8bc8e998ad41f6fc65a34e92750fef0a7689c7 SHA512 fdeaa2c0dbeb52934d9b48cf468c923f89058e3a454cfa153c9392ab908e3868d501d7bc2b923f33ad5949df6fd9ef07e1336b2dd98f9efa70b1ca4a23918ce0
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.zip 120127 BLAKE2B 27ecee9d31e38e3f41fa64e4e9a8ec5e5163635345f7fb68ed7337a8adf3c3624725dd2801f568e4c24ff16ed68509028548005314fa67075e55e7ac1d1e4da9 SHA512 624827611a0c8d886d4f0178707a25c2422298a080c0f62d1ac4ec75f8bffeb54d20b0a33adfbfa16737250cc44b05de92cd18e876fb382f2cf14684faaee32e
 DIST github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20210226163009-20ebb0f2a09e.mod 36 BLAKE2B 6dca2b9e42788fa6d795f38bc9450cfb0399c88fd99b99244259a71517335de20af643cbc6c1bd3fe629557ec6ce9437112d68bd67f6a85bc55e1ed00299e565 SHA512 8b928ed342c4e92a9a3e36f1a1bb917ec38a145502d8192fd81ed78b4a9c24d1b24a2cb06b0c6cc5bf7a26bff4ea8354066f6b0456f1eafcde0921335afc3975
-DIST github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20210226163009-20ebb0f2a09e.zip 219375 BLAKE2B 24d68cc3c10553d43ba0bcebc5b7e016e2b4463d72f30d049651b61707f2abda165fb3b2f0ead978ae34768054daa5ed62f0f8fbe4f49518d8a7f4bc9d7f2387 SHA512 18f43e293821920124a2571732900ca437a87ccc587369feabdb400b6b65b5868394496bf51a4a7a7441f19bf68fb0b53b007c0e69acc1e87eae4186e8659a53
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
 DIST github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod 196 BLAKE2B ad2d0b1c9f2c509812872f3e24d86ad3a1b193e624092b8225cf1f3bdfcb28e634ce330934bd742617b3d141ccda41de177231cc7501fea2b18a6e798e27aa77 SHA512 0fb15e3a1ab36a6d413110e7d6e7e441c9d7943f4d7bab935b2ce53feeb7e560d63960f1a9ce340d6b3f3e7fc400824354945a12628c65de1ce2d81856b119f2
-DIST github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.zip 93587 BLAKE2B 0bd587930daa052a5b8ca423bce03f65b294a43d5bc80eb58b8c8216cbd16fbe97f68ad8657b7a84b074a5a2f123732a49664bc164853c45cc64604776eb8afb SHA512 a5165f51332ab17faa90372acf37ed1a46db8cda405547954d839ade13dd5a465f75d428a6479fd49b291aa82ca4813c9efb8c26f3e9164f57ebf60a19c77e0b
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
-DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip 30137 BLAKE2B 0a91beca32707841cfe1369c4139ca20fe8ad59c60e029ab9aa81f1473f35a52bcece594ada0b5c39a7c74b7e5c242f211516a325b89e02e7f1fedc7c8027988 SHA512 ea36b27874c4cb46a27507907458e217c72f988f857dd43986bb58317d9564d6b2dd7ca84f6e70de92030114b3e6893dea61f315535254a826f897b60cc9f601
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
-DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.zip 200189 BLAKE2B 24e41bedec6cddfe974d388ea7be6b0072a7e4dceab0b0d50cc0c1942f37f18a16ab7f690333f7f921e8a3f425ffc10472b40117bf80a5f8f1bcae3a39faea84 SHA512 567f4d656b23eabc175cca4517c3e357182ca92fda27ff1825ad81b8ac93c8e65e11ea3c5f5a6928350f344abb282dd5b8122465d897f2c1183b75474c4d5167
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
-DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip 69219 BLAKE2B 6ecc62f2f3ae4622ba6e19c51f7ff7ca3bafcadcb38cb7a9d79dfcc2ddd7183d79dca8e0d6b534f5a2dc508c21e0fb349310b4feaac35c1f7b1166c3febd1228 SHA512 934c3e50ebdc1ea65ccfd4de1e2e0f0ebdece54be1cccaffa5e325c667ab22bae84a7fc7ead1066e75094697a86452fdc36fab57b955f42337708de32e7eec32
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
-DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.zip 151345 BLAKE2B 9d387efcfa29f1f3c5337a601bad568aa33e0b673edb4d862ac113425b8d7563cdcfadaa5dc7c1ed83253bcb240586b2b5c7059e094c02974b8cc7b5a8cfd64d SHA512 45cad5ca810917c0d1fcd63926c999f7019225a8434794b40860d4fb1d07549bdec160278587baecefe380b988f306d334f3dceb416d010a6a13416c236b419f
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.zip 125624 BLAKE2B 3f82f687d40baf1a7958877d0a6e758746064cfdca3810f352f8b794b983546e0efa4677fb0cac4d54caa9325cddc722ef0ba18259c3bc8b17b025c8cde364d4 SHA512 9c63d39efa12d06bd8f2819752d608ffd1b9ef3c4b0cda1163c2fa80052d8bc1891a91d2d42055fe60fadaffa01119d39c54db81a1d94dee5cb81275f73d8d98
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
-DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.zip 2440454 BLAKE2B e230d0def98fede5217a4b305b203eea723f27562cc27cf39f3226063bb7db0d3ad5d8105757bad66502ab7d83958c77b82945c3c532c3ca883ed5199e5d713d SHA512 fc26a92f68dbc1c4e8cfd7bc5948a9a6b6e3fafc002d3c94c18e58cb70f12415054c7d0c94d5c0eef549f72e83e561e3535a9c86398c18e5e27a11b14c8bdf5a
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
-DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.zip 3684 BLAKE2B ba35916611754bc0db281769ccb0b92a8304fef4d249b40b7c19b5fd835896cd48cedabd361fe8bbbb2304521e3f8c731f75eccde79a004f6d2dec0c7d6d5daf SHA512 16d6453d372773c9cc23b851d3cb7d84d4d3c090bbc1be102980c0daba0fe3ef102ba8372b8bd99f7ba18582d33d1af152087d544ad8dbe98d7d2acc9d91c353
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.mod 143 BLAKE2B 3d38c3c71eb98ba07078facac07e01a8f9607194ef88e5579ef7dda31eb7d7ff8a6ed0c16be73195def8240f0a0153ca307e5c72990ef7893180aef97627265c SHA512 bc2d283acf4fb65e4fc2004cdff9aac92589fa4ef457d186bb4eb407b813ae5e119b389d3cc31041c52f2bdb3beecdd311f54426e38c9027e3412420202b47a0
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.zip 204687 BLAKE2B 0603ffc67c8a4afa708e16bb1a9aea894411e9d1289441af0c1a1af44c84d4f66ff37af61e02eb2e41d61e56af200fd957f178541a09012714dcab0be43ae528 SHA512 aaa16baed362ba198bab40f9c7a30ce6b2499b133cb5c641d825a8a5deb4d1626a5a84f530725171cc0fce690ace571d4c977ed859b61799b6576bc2fb5a6e5c
@@ -607,27 +470,21 @@ DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 8
 DIST github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.mod 35 BLAKE2B 7251cfadfa22c0c57f7a488965d5107c55aeec8daa23dc37d845248b4c2659f6dde54ad64873a38f2bd6ae32324bfd01d5734591160c8dd2faeab2cc4f12a72a SHA512 631314183e232ea80b4cd52fe6b2b8116af4960427e7cf71b1a7c6a5884063f39ab649ff8178897d2a7ef14057e1aea53bb2e6f85a84be90b89c17866987f878
 DIST github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.zip 985726 BLAKE2B f983de8ebbd14b1e521e57adbf348c946ac0ebad1d5fc91b080e752e48c0648c7a46c74cf7a32e627b6f0a2d63cfb10311aa32d333d5370b539a3f4c1523dff4 SHA512 baaf37e35d0e6d1e7f186fae593d4e596528291c6aae14b2ac341dc0848a15866a33a5142e65c9aa3ca9f5fcd05a44694f912da64369a4c292bdba35bc030c95
 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
-DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.zip 5643 BLAKE2B c6fff7979b6a647b76551dfb80f7e61f7b86cf2c1e70f58d6be6609af8197119dd562acb78a395d7e62cb22fc2c60c4c69a036da7cc30f6990a01900c71284f6 SHA512 ed6672528754c42370277b8ceb0f1a06e2b36cfed8526d077192d71c9412430f338612671a0a0c807dee15741f83ac6cf1225bb900194758b736466fd95d3cf7
 DIST github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.mod 274 BLAKE2B 4c342f63063d4e810f971cbfd09e076bc8763b0c0ca985a26b83e0f0431babafe7724a45df3e4d8e0f094bfa786f3e2b2cc0b5b470a2a6920f8e06595dc585bf SHA512 892695c807816eb820f586b9fc1bb16fdbdc8aa9d81203f97b5d1f9df4ef6ad02b3ba259bbb9abb5a1c96ec403c7e5ac1ea84eff453a7fa8027ff7af35582ca2
 DIST github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.zip 20333 BLAKE2B ba3e6ab98617ba9efa07a39d59f32729e6e5bf0cc26d2b8f615a8124a3f3050bbb35156d945e639f91902ecbfc8a43b6fbb3af461244e169d6f14f07df72121f SHA512 f1942787f505cdccf80d6eadac7cdf4828571e96f0550c616ec3aa52a8f0f8df0a1e18067dc0413d4869e7364d8839195adb31c7d64918bca2b774252d2489e4
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
-DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 4415 BLAKE2B f50a9fd1f74506625ae9460c6071bbbd1dd3ad3d83264fb7def028c757e8ad8f865fc7255db6e9b5cdb7a1744ac1f741bc6184f064eee7108f6fc0facc81f639 SHA512 acd19ece301ac146ae50dd784e3dc1c2cbc0c00a562fc5d2759b7b8a4acf0b5bf83d5bcd54122130877a1568a13709c28ab7e1cc7ba269ec91aa1b1a86c2065a
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a
 DIST github.com%2Fshogo82148%2Fgo-shuffle%2F@v%2Fv0.0.0-20180218125048-27e6095f230d.mod 40 BLAKE2B 5afb548ac6ef611fdd2966e8d985b6276118f90532b4968743f9589316581d75f578942615c1534c1cbffbb58a9e077601bc0752f3c2066b8dc2f1d20da61d5e SHA512 aa5970cf21c0a1932738f32f9933905203bb40be1767f5573e49e3b44b425b5e40d0132fd6f0acc9c8fa38148cb84f24bb10fcd6b99a704ce9ba0d8616cab4e3
-DIST github.com%2Fshogo82148%2Fgo-shuffle%2F@v%2Fv0.0.0-20180218125048-27e6095f230d.zip 6823 BLAKE2B 92782987b6690f8b89c28a34a3dec587299bdf204565d3d5bb0e8fc5b63cb8f68ae75859620d465ebcc99da11b179001382fb3133add18058dc8fc99fce10c4e SHA512 b6ee1c82072d31ed8c89fe6446d97adfde1b2591004d9ec6549a53c10802acf4fc83587bf0cdb52c373401fd669dc0d2f6f14e29d7d5fef00f1a61af6818bcdb
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
-DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip 52967 BLAKE2B ffc9e503771f88257408708b3e0bf6f1d0c9a36dfb10d6f4f6377fa7e97599b1993f6198a8dc013d29ef17929a83562eac4f5eba1e8f51148b189a94128a4314 SHA512 d30efcc17654904bafaa3cbac0c2aae4b44f83dd347c8ae4ea77f5b637ef4371e08e6d8483ccb8a73273ff9fc91dcad43e8c536ebf5de9b69bac66cdfbf6efe8
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
-DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip 26744 BLAKE2B dbc7578fcac5c616d1cb5dd7cae959ee8df0496532db36d78d617ff265f213e4e5a336d33b795e793100c1b8e604919ca6fabb1736bcea0c02bdd0f8f0cc931a SHA512 dc990fd4f640acaa66baed26f2e82e0a6c46e293b016bd1573e72600e1256146f1b8abf746ebd96771bad4f3d95dded70c9f884908580ffffc4162efa0450735
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
-DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.zip 10334 BLAKE2B dc4e7a5b7ff1179feed6341345c4a811b5c4e14bde5af612b9db64902f810e788fbb6ca224b3678dfee03e894fb1cecb5c3269f13b36ea5d52fd4dd8b8a28fe0 SHA512 33a0601227477c0fb56907b633936ee96c46bf0f8c0a9140facfc61e839f62e167e90b76fad14d4b0124b6066376eed464d0f76e08f0d308634c33eb6fd171d4
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod 163 BLAKE2B 78976e3b857b07f201d0e0d65209cab8ed73cc9aa10f2977646b655d541e9a6a3dbf1d40e037ef0dd36c0c6f6813cf807e7211afc3683b9bc95f3b3e4bf5e6fb SHA512 1f0348cb522ec6a39f5667339dbdad2a16521eab1d7cf710e6b939c8156c928d7ed1da3c4cf1d976f6c8b9e41e74a43ef1328407119fd55d8fcbc0d91eb1dd7b
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.zip 88927 BLAKE2B 2ca68ce31cadf36091026bf56b454440a78d46efb0babf98972f771804272666baab6228a0a8b45f8d1ce266ebdf30a12f6c88f2777f73a397886381c16dd8cc SHA512 fbc261addef367881288523c9b4738673b64b65fd2240700740e0f0a476437e2aa917243a9b49bfc29e79d279c6584f888b2735782bd598e90d1e7696f43983a
@@ -646,12 +503,9 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod 1694 BLAKE2B 195244bf4042b519551efc149dfbd9fe10ff87e5b2ffe6f9a2d3777516315db8b43968533ff089b257c10f94f99babd076ff0a7203a434a79ea5aa7e39eb9818 SHA512 9f614a57ccae909af00a67e464b04eb91a92eebf1c28de3809351363b441d22a4a6628a1902fde8b67956d0bdedd91423d20158eaa6b9cd994fb7e284a35e061
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip 85562 BLAKE2B 0172a0ee31dd7fd1f744e7f7dd0fce8a282e9c1699939da18b3d2ca31395c47fa1a6cbef122fa3c2ca3e29d45df00ee0adf2d4f77f011491f7e36c2fa809cd1e SHA512 59ebf64cf72d1435cdb310a021f89e98f0e6dc0a531dc9b639a4f40c07297abb401598365ca535a8c3b222483264b75ea02f5447bd6f78a4eaff16884bdae096
-DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.mod 1694 BLAKE2B 195244bf4042b519551efc149dfbd9fe10ff87e5b2ffe6f9a2d3777516315db8b43968533ff089b257c10f94f99babd076ff0a7203a434a79ea5aa7e39eb9818 SHA512 9f614a57ccae909af00a67e464b04eb91a92eebf1c28de3809351363b441d22a4a6628a1902fde8b67956d0bdedd91423d20158eaa6b9cd994fb7e284a35e061
-DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.zip 85905 BLAKE2B 4991f928bfae17cd4c242dac625f63815342168da5e7ec7ec416856ea2b08c9cf4fdb02a90568624e3bccc39ed887eb6ad6e0e5bd140f73dd0c8bf87a6fcff06 SHA512 2bfa48ce8085921796ed788b03f818c1972313162482f023e1dea5b6513ea4e89d0e656159d0051ed0420e2e138c33a5c76c73a0d6ec8fc7344548b1061cbc86
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
@@ -672,26 +526,21 @@ DIST github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.18.zip 133036 BLAKE2B 60b4c1
 DIST github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.mod 41 BLAKE2B cf1f752c1456da4e2e16c0c10e58c3b37a10203ad5d2a5a754a10d1c745ace1cf8c99f5335129b5d2da25d938c90dad59925f3109e634e344bdad23f1709b324 SHA512 074740b374382fa54c03de7a99e25cecfbb84a04354646a28b85902f1b21bd707df1bf639055c530eee18c80fbf4738c00a7c4b27036484248d89b88379a0a07
 DIST github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.zip 3808 BLAKE2B 0aaad022d517aaa16298930ad9b5e5970a45191f56fb51ad5d5cca3484e42359075bfc8d477dda06b2ca1f78a16bcbc504fdf2621a230b5065d5093533c3865e SHA512 92423fb0308c197aa64dd82c3b76319f44e69c60bdf00e4b79ffbfcc423a2286f1d1485e2507afa1ad3a6a77fb612c12ea2a492e91019bfcf7af678f12a5f9ff
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
-DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip 13644 BLAKE2B 484e5ae252f421994b2a23fe3e278992a11d79948509e202366a1b496c8f82e7289eabec3f5d2e0489da66bffe73c4c8c58224993ac621a1bd65a11abeb28a76 SHA512 8d7a4d0cf4d179438a0c8ecdf887169d45b3bdc5746f2e11a07c9621dae098c69b3b6a54ebae249efe9aa78669e81db9bf384919204b3d0af866808915eaa6f1
 DIST github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod 41 BLAKE2B b7c7dfaa36f45deedb2b403a7a0f09577321cdcd86d714724f9d8dd8044c05aae91dbee433deec1dc094d8af6ceb8d01924bf4a9812b7521ce52ffe5678e4a22 SHA512 887a7529d78ca53e5e8822ac041705ae20c34c337b1bb94d3f6b671e4afd2dbdcce3a52aac4a42defe3da92fde14eef180bc01293040f6150c362f23408e3fa3
-DIST github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.zip 7534 BLAKE2B bbd5a4b5c1f2d17f54800767ad056762abc4735e1676d57438d194e8b724b630f879cc74809a6fb7e96010cdd5fa3b1b868d7e50465ec879af3b07f67e2bf2d7 SHA512 57e0273e7abf184636ab99f9c14633ed37b24d04bfa7d62e67988712874206c6c1af2432980a8dcbcb214e037627a66afbaaf573b8d3a127b11ee5e95301da7e
 DIST github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod 89 BLAKE2B 6dd7632179015369088b8e1271127271daac6a3af65032e723691e1d19ae50428b705a8f417950dd1b86c6aae63a0518636029f589eb4ef722e1c21ef0d0aa9a SHA512 02820d9107d43b1d41e74fb2281edb421bd95f852ae1062536d3f2ad9d6e97e2154b90a831f4618a0f83f9c4a828c176759132c0565a7a4d99dfe3b76e5f6d10
-DIST github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.zip 10068 BLAKE2B 4b23d896561e9ec170f394bcc218207086fec727cf381c6beb8f6321fc2b1fb3be09052a1ea88a38bc63ca2e21c97bd1386a4bd07dc91c2a2cba04899ed5bb9f SHA512 e5bd007f40a7f3fd77260100079aa6d9b620a002b67bd37471650bdaab8f64b754dd7181ade80b6de822163f8fde5cf877f02d32dd3365aeeb88700a2c6740ed
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
-DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip 5264 BLAKE2B f6d986c7f5fbb1960fa1b62a5722d426c3ab79d865cb179bb9bca5a213bb2008a3cf4edb59dba1a336928cb0bd05d31f7083f394cec09270e66b55cd4a045b37 SHA512 2a8e1f10d10e4479568374b9e51b1b8dbbf1077d8af413d7dcd254ba1dc1cd38ee19e75a4661a4e237d3662e51cbcf96a08bc69a2e5beaf34a2559fcfb9d653c
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
-DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
-DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.zip 268257 BLAKE2B fd5ded7eb3aac03b098895d8efbd8bbba306b411dc58033bfb9355441e6f94268c4ea44ab6b52894929493ae19f4b605433d6a0aa2a1eed7c9ec15d1ef0d3de6 SHA512 bae490d3f532680ce28d3230fd76b3dd6100725056fdcda4588d88d6be212ac59ff449bc9a08a378f0743e45dd45ad5aa0d2cc18b762e3e715ea9e30f8be8dd5
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.8.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.8.zip 269331 BLAKE2B 5c88fd187bb06dc240425206944ed80d2e349d2627b47c9639da9e55ef0b090471cf4ab28c526c3b4036dfb582daf1e7e2b8eff4ad69d474918cd6dddad364f8 SHA512 89727577cd23d040c04b894ce9ab15a1a55ff25fa5b398df80905b9c265a0ae8e2cc08ad88a6997e4ce6ac570effd8b8d4104a97f331414e9a8d5659f615cb61
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.9.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.9.zip 269444 BLAKE2B 516a3be35860fc05b87d19a49c86ba5c607a7d3c73657c063ac780e0ae30a0c39ba493c8b86a98b658721235f15969618a42a9440db5dd56d09afc2d9ae575b7 SHA512 39c91b13e32e86eaac78a543123f4cb16d1db2485a129e74aeac30fea3267374ebdf740fb3f2d473e5628582f1be9ad2475c2c39e6b65540de9b36093d03598e
 DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.mod 481 BLAKE2B 7f6b0f2bfcc73b9f02244e0310b0ee8f511ba654cbaf737dd896ba2090168795835635fa5f520c6584a47a156c7c1c71150a60e8d283f7cc5edd8b140f70ea2d SHA512 42b1f424182644a589d0add502d537fcc508077e5db59757f70b8c9bada92a71ec9345149cdcdf5c33f479c3beef0740d297f3b64f9897aa12e7a858dcb3e9b9
 DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip 12715 BLAKE2B f681c484ec877951d3c6f2bda0b6cff6ac109443637c887d9eeb74c70d37ceb8dbad999a8656f42175a8c91317a6a6c4e25ca829375137ec4fb7dd5957479b4a SHA512 b47bcfca1fd927ba733de1cae29328ad44293ea0b33cd498b878733ccf7faadb221c3f9f1d5913e00d8cbff3565bcb5ead52a03dfca3cbf5d098e7d8c96cb713
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
-DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.zip 111427 BLAKE2B 62d61989ac2e7f9b83238e9dbc3027600235213fb39846ce0bb45c84431d80fc3d570d27fba6538668e5a91a8e8331e4bbb081e9106a4409a191209be122fa7a SHA512 f4c1b9f826415b753235e6f71dfb0c2e25ae4dab4acfd632a6ace744e437ae0df9d86dafc79569c6184895e5398108a098a5e5eda57589046316ebc767571cdc
 DIST go.opencensus.io%2F@v%2Fv0.15.0.mod 24 BLAKE2B 85855582571fd53e79b7badaf424c22a945e7367d8161f2c348ab762392114632264cc36187001da7e54eed58ebdbc519770977fcc56c3f846ce3bab22115835 SHA512 3b5d738ca5504c5c7f74f7557e389a002365294cd58bba99e8af5aca5a6fd4a0108f8ac5e8267eeaf73cfdec7bc3b2db0e445bd337670ea92470a05106f67461
 DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
 DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
@@ -702,11 +551,8 @@ DIST go.opencensus.io%2F@v%2Fv0.22.5.mod 478 BLAKE2B aa63f336c10d04557c0f24301af
 DIST go.opencensus.io%2F@v%2Fv0.23.0.mod 300 BLAKE2B 768900ce7738c5e1de5c550f1dadf600bae434c89eec337e532e50542487226c79bd113e2b8223c63c241be631ebf5b177441b1b583317425f850a0efc6a02bb SHA512 67849dda4a765e79351214a3641bf601dcdb404f83fd48cde5c6b4fd7249868567424b9f70e0bdf041f6e50f6fcb82239600be8f62253835e4c7c8a17c8d8871
 DIST go.opencensus.io%2F@v%2Fv0.23.0.zip 309862 BLAKE2B cc1876f2670ad970a82ad2b58cac621086428e29145ec62f9917902100236471547339be24e2656fd5c3d6ed4b2a10861edb5879e85c0bb9308b0b334df0f4d3 SHA512 90ec312a3ef194251f06ca8c6535b97b0303b72c55cdb602f6f33b1c691188fd5289e4c7323d01d5c66b15411b28a4fea4bc817c41fad6a7d206448fbfa498c9
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
-DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip 17248 BLAKE2B da92637915783bd89117a7b763271151c72f3494eeebdc23d4a0197f5ed394d4ceb3b105e1eb5f0892ac61e0fe617050c1d741b17ea37ff8eff42758329ca68f SHA512 ad71851217d27e72d13db4d8aa1accc069f5ad5ef3fb9ab922c79cc0e6f0ee10025d499478d99e2f46418b36b4410c5bbdf8ea421919d6f60ec95f08c904b267
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
-DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip 14488 BLAKE2B 3bb8df1a459b2cf1dd63ab200f06a9f41f968f828b815b70bff899972a4c913656dbd3856dc6f4626836175d32b63c439e32a5aeb6a034f4733e2d09ef53f7f9 SHA512 d5fff733045694509ef1100fb8701526002b0841a11b5e1acbdea7e186c80738f651bd973c5eba2db5d2b8fff1b3057ea5d7d0e46645268b2f3619656238fdf4
 DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
-DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip 224175 BLAKE2B 839e4b40c818d9ed889cb4f00b3b4c1e1a21add9e4732da956da63d77e5b8c2211443c9c2528f3c7a6886455d94d0818932e19876cf5576318426451d10eebb5 SHA512 deff970d323e0023cb39fd3aa38c419ccafef4c10af4edc8e9b70671e5892d60229e47f176495bdc4602b1cc4f344e8724e06eb740dd7858fde006bf121d5c1e
 DIST gocloud.dev%2F@v%2Fv0.20.0.mod 2531 BLAKE2B 180b21496d187a85b4bd44c6a5ddf24e4db8ddd4038357f1c80e6298ad39ef9b1583d6ea10523f0c3a8e3a84edfdf1b81d9a81026e5e92b760ed170d186d3f22 SHA512 c3f2198d36fd12e817e6d802e8fdab098b8217873a696c89d129c7a89d6ce5504814638be47ceab6d1812a54376e54675b66239e1221c2842173a1a1fe834e75
 DIST gocloud.dev%2F@v%2Fv0.20.0.zip 2499064 BLAKE2B 1029ed1539cefcab6f3ab971283e4bf432d12293700bd94e66f5fc649b4096c7b6ed41e984ba29d9b75becb68d0fec40005197a7a3f5653786e6eda4232aa258 SHA512 537b647e3da16123ad319802b8393898b98e31d1674771f31240e5f96b06519f1e57a5d54cef348e6defa8345939f541025a0421555a22745d1c4068bef5244b
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
@@ -729,7 +575,6 @@ DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAK
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.zip 1564884 BLAKE2B 88e3cf309f9f29f1d6e997f3efb29cbaff2ed09577a9212a97d8e1a64b118dcf9128e46ee725f70d550b968570e8e74187feea3c6bf66843ebbe32043dd85c94 SHA512 5de4e96349919839fb4a91a9b0bb3ba8d94efe63970e44bb76ea366bb0abd3e4e70b36260346054c1525f04d518cf7270400eac7c054cc10c7be63d87d318a4a
 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%2Fimage%2F@v%2Fv0.0.0-20210220032944-ac19c3e999fb.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
@@ -748,7 +593,6 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod 97 BLAK
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip 46110 BLAKE2B fa560c7a47a9724e278b64c4c96c4f28fbc5d1163a8e919f4e656527871420139d0c521172d9e7bf22401a21e6a0d4a802df9e7c6326f45d159138c5ec46b780 SHA512 393b1eb08da86deb3931b57743706b705567979f1e5f5b72520afa4690ad325ce6ae885520594683e510aa26889000fb5c042654612d902de092f29cd6a65786
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
-DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.zip 1415491 BLAKE2B 5668c3fcff6c5a939df1a046cc7d99cab6a4b42c62011a9e3c53801a6b2d0e2dd16e7d6ace213c91050315eaae10df3313d7b69a17a566b9be770a844f2292a1 SHA512 10d21e1b4d90603de97c769b2a4172a6410579941f12b8e55f2c4459c31e9e128c8f70ad5845f093fcfd93541570b63323dc0376e18925d3d9013d79d30f587f
 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
@@ -881,7 +725,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.zip 1668821
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip 1634371 BLAKE2B b13afd43d8734f143af16046780b9225a874157e0562068c8c3198dd23f7ff4b3e14f6654b578bc7520dd3c299411ca2d77999a8ab8459a765d05e74d03e81db SHA512 b7c4ff1752cb582263b837048e28b52fa219db5f7316739692d4c2d20bb2a9b8ad3645e92b3b1a72cba0817e4587ae04465dd351bb17a719bc92e193cb29cc76
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip 23281 BLAKE2B b2fedb31c347f2b5b8bc3c0311f5078ab84359736379206227bd7ad4378cffb67f39cf078707a7095ecfac3c243bbac54b64cf41375a4261fbc9af9887d134de SHA512 267fab133c0ae306a1f484d17a9c3bc7bafb1ae77df3412ea4047de34a940b6425524a93b7b41d010cbf32160482fa3a370f93654e4ff73b6d11e45463bc185a
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -894,7 +737,6 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd921
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 BLAKE2B 7b29c746b75b42c23fca353b8299a4feaf69556ce1395872470e891835a8dec88a4e4c3b64ba6dcb4b5512aafb9bb44cc38c68915a0f6702f1027cda89d03d81 SHA512 58cb42ebeb88c06e049caf8c609e95243e7bdba51057de7d7301885aa904111dbe85962b5faef216ae45aa73f371b5de6516800a6f5765219cfde3fb06372afe
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -1071,20 +913,16 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip 1557709 BLAKE2B bc672854cc46d48461bf28395c5be02fe99ff9da1d23e212078e549bf3e2beeaf953cc185e059c73a374f3e2662cb81fd6c3ff53472934964b8461f370b51a78 SHA512 de309c033d05be35503d6073e14ead585db4e6b75d478a674a37f93c7757e914c67bad446cf7ce04ccd49659d1ab2f9a024ee639a7536480ef92bb6b8b52dfdb
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
-DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
-DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip 15087 BLAKE2B 14023bf31885491762c00236992ef2c36894ab2d0c4838c24726a4de3b40a467b20b3eb41cfb1cff4dc5daf5a54d1d65c9a86837bf4f9875387d8cf57f002f61 SHA512 7fbe6eda590414d8c4f6da89d904308acb31b043054fc07d0443f788a405d8545944246842caec4cd9e19b6116359a65617726fb9cb56cd153c916855c32a6ee
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip 60242 BLAKE2B c813626bb38afad9bc3064400989ee298d938a1b9a6e619c512965361f80c7da9a5654fc47b5deba2fa758822dc542c9a6d1f756be881830a6b68e3a39e06a41 SHA512 b47b1ad2eff5abead86f0611bf6355e699ae5fe3ded89fab6efc3b940eba7ff295aa2ffd64bf3eb93cfe9b77fcdd82f8db25fe0ca91823019c9b3fb89feadc75
 DIST gopkg.in%2Fneurosnap%2Fsentences.v1%2F@v%2Fv1.0.6.mod 39 BLAKE2B cd7a3249615dce91fbe569b8f698d9c49d53d314e694b89bd504457749f1a0e12a02f30cb8f923bef0827fe69bf9f99fa2050f46b0fc51f1a2c18d4d6b319972 SHA512 a575f862e4d3f90ac0dc914d616fa948cd4e1bd2fcb22b412c71eeab1d2ee4a7b5c5df8961b8ded44be2f14001b27187f240782951291e08933a066b9825e4e4
-DIST gopkg.in%2Fneurosnap%2Fsentences.v1%2F@v%2Fv1.0.6.zip 5275825 BLAKE2B 83fcfeb18c2759e096c42793acd23cca369eff82e26c5d3e08c148e5b0e68def231f5db05ae2fe89e273175b6306cb5d1ce7409a37afb6b316e790d7126b14de SHA512 cd09ce1765c02e707310b61188792c994cae0bce45472e66d880c3958208780fdfc5746e80f495b86f63ddf957d80db8e923b7f870beafbf0d8eb2f2a3e15b41
 DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
-DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip 2645616 BLAKE2B e128dd04ef8a6855c7c0a5dadcfec1e24402799efeb868d894f783c5554a44214fe69781652887a3d496aa1bb58766d33cdf74d106cd0004ec5e018ea078455e SHA512 4b72a2b0ad43f1b1fe1c60e0dc51d39ff04b5bf2b9a761fce22c65904961267f4c61d598b2035137cdb1e1dcce9420cb36fe8882f7cade6dbb7adb3e5795f8a9
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
@@ -1102,15 +940,11 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
-DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip 561290 BLAKE2B 2bdf9fb92ee838f5a9112bc5e3ace3e1cdc7a4dd5b3940c94b36abdbd6def28f9629a49e9ec901a32b76c944cc82af19f0f99f281b15ce666ebf153d062bc052 SHA512 9d01facc2b973a45604ac010f0bf0ec6aa3121966eaea6d7e1ac15869a8f5892077c3bbf0cbc21517890e24379848b8def33bf7dee7b1152ce232dd996ad017f
-DIST hugo-0.83.1.tar.gz 38662011 BLAKE2B 47e5a1a7a27da2e3e39eebd140c479751693610d0809aafb286287cb6263ab5b561628c6d378516128c37ce9118550f9ebb5b1f80f6d124f87fdeabef3ae3725 SHA512 04d15866c450fd375c95e5b636d43d1c0b56eb4ff9941501516c17a4b821428729482c0f57f28aca23ca434bb34b70f1c1425ff59ac9304e928fb8b161a90993
 DIST hugo-0.84.4.tar.gz 38962300 BLAKE2B 68c9b220c1796fea8285a79a237744f8a668954e78fa7538830b0333863991b7e05e727102ef6c89f11caacf98fde40207421f95e74e26ed0fa6a783cf3d015d SHA512 f78ceb7514d87591703ac0f0ff2dfdd6a09d738d319a28f2d9ec13b44ab45d6d9ff02e7378c3764349827fd08d735ebc28b625085130db165232689655dff1e2
+DIST hugo-0.85.0.tar.gz 38968286 BLAKE2B 37f80c7ecea465b8fc7ee9b8a8467c90b22e3f88636ef6e10b09210c13c39c8d75983bedca4cbe6f0e0fae156129642669cc6e0e361712b23449520fb2aa419a SHA512 213ff0d1d87cca7ff87731216d0d0a80c2e5abbcca39a4222615a5a43f7f13f5456609ef47ab7d493a30af8ec65fb8dcfb21bcaacb43fc2d550178f5fe448966
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
-DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.zip 450232 BLAKE2B 2d10520e06557fa00e94a1ccd80b9b937bcaf404f81f853a020eed606c7a297db037baf784518e060604319ba5454423e4995ab005be18ae1398c5ef16f24719 SHA512 0a15b90c2a4577cbc298a34f714660e9fdc488b1fb72b33d0ae296cb6f15a691091d5e6d3c801998b9c2b7236b163118577b2816316078d613f74cd803947534
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
-DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.zip 2223 BLAKE2B d7baac004b449fac4cb12e355d2db4a7a423a79f9081cc5a37556cc610e2451611da6213561cdb5f65efa8a6eff93bf9d7e7486874b387078937faa82f713d9c SHA512 61a37f3b082f3cbfc9b7e6d8d1a049bd8e50589e88e7393d69a8273ee844c1259ae0ee768e0381b00107ab9c22d24a9b3c472e61479a69bf39640882ad4f98e6
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
-DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.zip 14308 BLAKE2B ab689e6dddb3329d175584ce49d3a73dcc3e3fa2875c4d0c49a16fdcbfca813ade95bd13bc4f428bb745b6a5bb3dc20517f3cf0f3a429b540ae63c126b11dae5 SHA512 bd4d07093c5263a9af31226e56fd426bcb5c8ffc6e69dac19139ab267a108340e228bd44d9859f48dc92e1c3480432093d8a9fc66cd6aa8d259a1a952f317072
-EBUILD hugo-0.83.1.ebuild 58917 BLAKE2B 86d7c7bb3538c0c2b84303a107d51c57dcd4f9f1db7bc777e1dbe81fb801d5584f76d35abecda16fd5d4b57d8076e94e02a1755b1c183c1df6a50af1e27043d9 SHA512 5236a3257813494ec83c02f0b4e406117170b6ab30a5407c622235fcf980f58dc14f75d2a7535c1a05c8d0ba40268f7f66ccce0a12ccfe4e64941d30fba0310a
 EBUILD hugo-0.84.4.ebuild 51562 BLAKE2B 4469984f2afd7ac212b3e1be733639ac4cfacd4caa0c56e091904069b1986cfc6d82b2d7f0e8e2b6757aec8412ded84adbf2ca7939162da9f791a051f292e0c7 SHA512 bc9f6332e4c061f456dd84c43720e2f1e0dc1b42256d9435f9c535e390fb642f50864228c327b0f28444d634eb66b043aff38e650a6ba97b216ca4cc2163ba83
+EBUILD hugo-0.85.0.ebuild 51639 BLAKE2B af5ec52e7649a912e825e4e8b601d300b11fd991164d9413eef5239bfa55548cab2bf0944439b0b0d5bdd4a951e04bb94d179fca7d2b4bbdb4b56a9bf03d5dfc SHA512 aecedbcc535e61cc8fe5e83d3d58fd47614409d0905cd1b23ee5eaaf1d01b25590bc892291dfbc13575a6bc9bfa01e359d8617f4e20fd92de1d6bd9ced4c4e73
 MISC metadata.xml 726 BLAKE2B dedf419edaeb32c30b19c00dc42027ee4621ee836b44df94a6a35d63396074f379088d48c5f8a99a68a23166d4e595e3cc81f03b281fe9118693931e22d7ea63 SHA512 d7d396fc8f553322e50809f42977da39e82a7b51c56e47b4b23c1ef99bb2e5b2928232a518cecf3059d48fbd2f8a83bbc54f3a23c7f614802f38db413924349c
diff --git a/www-apps/hugo/hugo-0.83.1.ebuild b/www-apps/hugo/hugo-0.83.1.ebuild
deleted file mode 100644
index 305cb371ee4c..000000000000
--- a/www-apps/hugo/hugo-0.83.1.ebuild
+++ /dev/null
@@ -1,1149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module bash-completion-r1
-
-DESCRIPTION="The world's fastest framework for building websites"
-HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
-
-EGO_SUM=(
-	"bazil.org/fuse v0.0.0-20180421153158-65cc252bf669"
-	"bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod"
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"cloud.google.com/go v0.39.0/go.mod"
-	"cloud.google.com/go v0.44.1/go.mod"
-	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.44.3/go.mod"
-	"cloud.google.com/go v0.45.1/go.mod"
-	"cloud.google.com/go v0.46.3/go.mod"
-	"cloud.google.com/go v0.50.0/go.mod"
-	"cloud.google.com/go v0.52.0/go.mod"
-	"cloud.google.com/go v0.53.0/go.mod"
-	"cloud.google.com/go v0.54.0/go.mod"
-	"cloud.google.com/go v0.55.0/go.mod"
-	"cloud.google.com/go v0.56.0/go.mod"
-	"cloud.google.com/go v0.57.0/go.mod"
-	"cloud.google.com/go v0.58.0/go.mod"
-	"cloud.google.com/go v0.62.0/go.mod"
-	"cloud.google.com/go v0.65.0/go.mod"
-	"cloud.google.com/go v0.72.0/go.mod"
-	"cloud.google.com/go v0.74.0/go.mod"
-	"cloud.google.com/go v0.78.0/go.mod"
-	"cloud.google.com/go v0.79.0/go.mod"
-	"cloud.google.com/go v0.81.0"
-	"cloud.google.com/go v0.81.0/go.mod"
-	"cloud.google.com/go/bigquery v1.0.1/go.mod"
-	"cloud.google.com/go/bigquery v1.3.0/go.mod"
-	"cloud.google.com/go/bigquery v1.4.0/go.mod"
-	"cloud.google.com/go/bigquery v1.5.0/go.mod"
-	"cloud.google.com/go/bigquery v1.7.0/go.mod"
-	"cloud.google.com/go/bigquery v1.8.0"
-	"cloud.google.com/go/bigquery v1.8.0/go.mod"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"cloud.google.com/go/datastore v1.1.0"
-	"cloud.google.com/go/datastore v1.1.0/go.mod"
-	"cloud.google.com/go/firestore v1.1.0/go.mod"
-	"cloud.google.com/go/firestore v1.2.0"
-	"cloud.google.com/go/firestore v1.2.0/go.mod"
-	"cloud.google.com/go/pubsub v1.0.1/go.mod"
-	"cloud.google.com/go/pubsub v1.1.0/go.mod"
-	"cloud.google.com/go/pubsub v1.2.0/go.mod"
-	"cloud.google.com/go/pubsub v1.3.1"
-	"cloud.google.com/go/pubsub v1.3.1/go.mod"
-	"cloud.google.com/go/storage v1.0.0/go.mod"
-	"cloud.google.com/go/storage v1.5.0/go.mod"
-	"cloud.google.com/go/storage v1.6.0/go.mod"
-	"cloud.google.com/go/storage v1.8.0/go.mod"
-	"cloud.google.com/go/storage v1.9.0/go.mod"
-	"cloud.google.com/go/storage v1.10.0"
-	"cloud.google.com/go/storage v1.10.0/go.mod"
-	"contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0"
-	"contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod"
-	"contrib.go.opencensus.io/exporter/stackdriver v0.12.1"
-	"contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod"
-	"contrib.go.opencensus.io/integrations/ocsql v0.1.4"
-	"contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod"
-	"contrib.go.opencensus.io/resource v0.1.1"
-	"contrib.go.opencensus.io/resource v0.1.1/go.mod"
-	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9"
-	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0"
-	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.2.2"
-	"github.com/Azure/azure-pipeline-go v0.2.2/go.mod"
-	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
-	"github.com/Azure/azure-service-bus-go v0.10.1"
-	"github.com/Azure/azure-service-bus-go v0.10.1/go.mod"
-	"github.com/Azure/azure-storage-blob-go v0.9.0"
-	"github.com/Azure/azure-storage-blob-go v0.9.0/go.mod"
-	"github.com/Azure/go-amqp v0.12.6/go.mod"
-	"github.com/Azure/go-amqp v0.12.7"
-	"github.com/Azure/go-amqp v0.12.7/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.3"
-	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.3"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69"
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/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"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/GeertJohan/go.incremental v1.0.0"
-	"github.com/GeertJohan/go.incremental v1.0.0/go.mod"
-	"github.com/GeertJohan/go.rice v1.0.0"
-	"github.com/GeertJohan/go.rice v1.0.0/go.mod"
-	"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae"
-	"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/PuerkitoBio/purell v1.1.1"
-	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
-	"github.com/akavel/rsrc v0.8.0"
-	"github.com/akavel/rsrc v0.8.0/go.mod"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
-	"github.com/alecthomas/chroma v0.7.2-0.20200305040604-4f3623dce67a/go.mod"
-	"github.com/alecthomas/chroma v0.8.2/go.mod"
-	"github.com/alecthomas/chroma v0.9.1"
-	"github.com/alecthomas/chroma v0.9.1/go.mod"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
-	"github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod"
-	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
-	"github.com/alecthomas/kong v0.2.4"
-	"github.com/alecthomas/kong v0.2.4/go.mod"
-	"github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8"
-	"github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
-	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1"
-	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/aws/aws-sdk-go v1.15.27/go.mod"
-	"github.com/aws/aws-sdk-go v1.19.18/go.mod"
-	"github.com/aws/aws-sdk-go v1.31.13/go.mod"
-	"github.com/aws/aws-sdk-go v1.38.23"
-	"github.com/aws/aws-sdk-go v1.38.23/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/bep/debounce v1.2.0"
-	"github.com/bep/debounce v1.2.0/go.mod"
-	"github.com/bep/gitmap v1.1.2"
-	"github.com/bep/gitmap v1.1.2/go.mod"
-	"github.com/bep/godartsass v0.12.0"
-	"github.com/bep/godartsass v0.12.0/go.mod"
-	"github.com/bep/golibsass v0.7.0"
-	"github.com/bep/golibsass v0.7.0/go.mod"
-	"github.com/bep/gowebp v0.1.0"
-	"github.com/bep/gowebp v0.1.0/go.mod"
-	"github.com/bep/tmc v0.5.1"
-	"github.com/bep/tmc v0.5.1/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c"
-	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cespare/xxhash v1.1.0"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927"
-	"github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod"
-	"github.com/chzyer/logex v1.1.10"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/cli/safeexec v1.0.0"
-	"github.com/cli/safeexec v1.0.0/go.mod"
-	"github.com/client9/misspell v0.3.4"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
-	"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
-	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403"
-	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
-	"github.com/coreos/bbolt v1.3.2"
-	"github.com/coreos/bbolt v1.3.2/go.mod"
-	"github.com/coreos/etcd v3.3.13+incompatible"
-	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.3.0"
-	"github.com/coreos/go-semver v0.3.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/daaku/go.zipexe v1.0.0"
-	"github.com/daaku/go.zipexe v1.0.0/go.mod"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/devigned/tab v0.1.1"
-	"github.com/devigned/tab v0.1.1/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"
-	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/disintegration/gift v1.2.1"
-	"github.com/disintegration/gift v1.2.1/go.mod"
-	"github.com/dlclark/regexp2 v1.1.6/go.mod"
-	"github.com/dlclark/regexp2 v1.2.0/go.mod"
-	"github.com/dlclark/regexp2 v1.4.0"
-	"github.com/dlclark/regexp2 v1.4.0/go.mod"
-	"github.com/dustin/go-humanize v1.0.0"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d"
-	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanw/esbuild v0.11.14"
-	"github.com/evanw/esbuild v0.11.14/go.mod"
-	"github.com/evanw/esbuild v0.11.16"
-	"github.com/evanw/esbuild v0.11.16/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fortytw2/leaktest v1.3.0"
-	"github.com/fortytw2/leaktest v1.3.0/go.mod"
-	"github.com/frankban/quicktest v1.4.1/go.mod"
-	"github.com/frankban/quicktest v1.7.2/go.mod"
-	"github.com/frankban/quicktest v1.11.2/go.mod"
-	"github.com/frankban/quicktest v1.12.0"
-	"github.com/frankban/quicktest v1.12.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.9"
-	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
-	"github.com/getkin/kin-openapi v0.60.0"
-	"github.com/getkin/kin-openapi v0.60.0/go.mod"
-	"github.com/getkin/kin-openapi v0.61.0"
-	"github.com/getkin/kin-openapi v0.61.0/go.mod"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1"
-	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
-	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
-	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4"
-	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
-	"github.com/go-ini/ini v1.25.4"
-	"github.com/go-ini/ini v1.25.4/go.mod"
-	"github.com/go-kit/kit v0.8.0"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-openapi/jsonpointer v0.19.5"
-	"github.com/go-openapi/jsonpointer v0.19.5/go.mod"
-	"github.com/go-openapi/swag v0.19.5"
-	"github.com/go-openapi/swag v0.19.5/go.mod"
-	"github.com/go-sql-driver/mysql v1.5.0"
-	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
-	"github.com/go-stack/stack v1.8.0"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/gobuffalo/flect v0.2.2"
-	"github.com/gobuffalo/flect v0.2.2/go.mod"
-	"github.com/gobwas/glob v0.2.3"
-	"github.com/gobwas/glob v0.2.3/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gohugoio/go-i18n v2.1.3-0.20210430103248-4c28c89f8013+incompatible"
-	"github.com/gohugoio/go-i18n v2.1.3-0.20210430103248-4c28c89f8013+incompatible/go.mod"
-	"github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013"
-	"github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013/go.mod"
-	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95"
-	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95/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-20190129154638-5b532d6fd5ef/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
-	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
-	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/mock v1.4.0/go.mod"
-	"github.com/golang/mock v1.4.1/go.mod"
-	"github.com/golang/mock v1.4.3/go.mod"
-	"github.com/golang/mock v1.4.4/go.mod"
-	"github.com/golang/mock v1.5.0"
-	"github.com/golang/mock v1.5.0/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.3.3/go.mod"
-	"github.com/golang/protobuf v1.3.4/go.mod"
-	"github.com/golang/protobuf v1.3.5/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-	"github.com/golang/protobuf v1.4.0/go.mod"
-	"github.com/golang/protobuf v1.4.1/go.mod"
-	"github.com/golang/protobuf v1.4.2/go.mod"
-	"github.com/golang/protobuf v1.4.3/go.mod"
-	"github.com/golang/protobuf v1.5.0/go.mod"
-	"github.com/golang/protobuf v1.5.1/go.mod"
-	"github.com/golang/protobuf v1.5.2"
-	"github.com/golang/protobuf v1.5.2/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-cmp v0.4.1/go.mod"
-	"github.com/google/go-cmp v0.5.0/go.mod"
-	"github.com/google/go-cmp v0.5.1/go.mod"
-	"github.com/google/go-cmp v0.5.2/go.mod"
-	"github.com/google/go-cmp v0.5.3/go.mod"
-	"github.com/google/go-cmp v0.5.4/go.mod"
-	"github.com/google/go-cmp v0.5.5"
-	"github.com/google/go-cmp v0.5.5/go.mod"
-	"github.com/google/go-replayers/grpcreplay v0.1.0"
-	"github.com/google/go-replayers/grpcreplay v0.1.0/go.mod"
-	"github.com/google/go-replayers/httpreplay v0.1.0"
-	"github.com/google/go-replayers/httpreplay v0.1.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible"
-	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod"
-	"github.com/google/martian/v3 v3.0.0/go.mod"
-	"github.com/google/martian/v3 v3.1.0"
-	"github.com/google/martian/v3 v3.1.0/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
-	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
-	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
-	"github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod"
-	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
-	"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
-	"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
-	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
-	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5"
-	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
-	"github.com/google/renameio v0.1.0"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/subcommands v1.0.1"
-	"github.com/google/subcommands v1.0.1/go.mod"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/google/uuid v1.1.2"
-	"github.com/google/uuid v1.1.2/go.mod"
-	"github.com/google/wire v0.4.0"
-	"github.com/google/wire v0.4.0/go.mod"
-	"github.com/googleapis/gax-go v2.0.2+incompatible"
-	"github.com/googleapis/gax-go v2.0.2+incompatible/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/csrf v1.6.0"
-	"github.com/gorilla/csrf v1.6.0/go.mod"
-	"github.com/gorilla/handlers v1.4.1"
-	"github.com/gorilla/handlers v1.4.1/go.mod"
-	"github.com/gorilla/mux v1.7.3/go.mod"
-	"github.com/gorilla/mux v1.8.0"
-	"github.com/gorilla/mux v1.8.0/go.mod"
-	"github.com/gorilla/securecookie v1.1.1"
-	"github.com/gorilla/securecookie v1.1.1/go.mod"
-	"github.com/gorilla/websocket v1.4.2"
-	"github.com/gorilla/websocket v1.4.2/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.0"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-	"github.com/hashicorp/consul/api v1.1.0"
-	"github.com/hashicorp/consul/api v1.1.0/go.mod"
-	"github.com/hashicorp/consul/sdk v0.1.1"
-	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.0.0"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.3"
-	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.0"
-	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-	"github.com/hashicorp/go-syslog v1.0.0"
-	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go.net v0.0.1"
-	"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"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/hashicorp/logutils v1.0.0"
-	"github.com/hashicorp/logutils v1.0.0/go.mod"
-	"github.com/hashicorp/mdns v1.0.0"
-	"github.com/hashicorp/mdns v1.0.0/go.mod"
-	"github.com/hashicorp/memberlist v0.1.3"
-	"github.com/hashicorp/memberlist v0.1.3/go.mod"
-	"github.com/hashicorp/serf v0.8.2"
-	"github.com/hashicorp/serf v0.8.2/go.mod"
-	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639"
-	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jdkato/prose v1.2.1"
-	"github.com/jdkato/prose v1.2.1/go.mod"
-	"github.com/jessevdk/go-flags v1.4.0"
-	"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-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.4.0"
-	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
-	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
-	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
-	"github.com/joho/godotenv v1.3.0"
-	"github.com/joho/godotenv v1.3.0/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/json-iterator/go v1.1.6"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jstemmer/go-junit-report v0.9.1"
-	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kisielk/errcheck v1.1.0"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/fs v0.1.0"
-	"github.com/kr/fs v0.1.0/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pretty v0.2.1"
-	"github.com/kr/pretty v0.2.1/go.mod"
-	"github.com/kr/pty v1.1.1"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kylelemons/godebug v1.1.0"
-	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"github.com/kyokomi/emoji/v2 v2.2.8"
-	"github.com/kyokomi/emoji/v2 v2.2.8/go.mod"
-	"github.com/lib/pq v1.1.1"
-	"github.com/lib/pq v1.1.1/go.mod"
-	"github.com/magefile/mage v1.11.0"
-	"github.com/magefile/mage v1.11.0/go.mod"
-	"github.com/magiconair/properties v1.8.1"
-	"github.com/magiconair/properties v1.8.1/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e"
-	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
-	"github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2"
-	"github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.1"
-	"github.com/mattn/go-ieproxy v0.0.1/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.14"
-	"github.com/miekg/dns v1.0.14/go.mod"
-	"github.com/miekg/mmark v1.3.6"
-	"github.com/miekg/mmark v1.3.6/go.mod"
-	"github.com/mitchellh/cli v1.0.0"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/gox v0.4.0"
-	"github.com/mitchellh/gox v0.4.0/go.mod"
-	"github.com/mitchellh/hashstructure v1.0.0"
-	"github.com/mitchellh/hashstructure v1.0.0/go.mod"
-	"github.com/mitchellh/iochan v1.0.0"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/mapstructure v1.3.3"
-	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
-	"github.com/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 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/montanaflynn/stats v0.6.3"
-	"github.com/montanaflynn/stats v0.6.3/go.mod"
-	"github.com/muesli/smartcrop v0.3.0"
-	"github.com/muesli/smartcrop v0.3.0/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/neurosnap/sentences v1.0.6"
-	"github.com/neurosnap/sentences v1.0.6/go.mod"
-	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646"
-	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod"
-	"github.com/nicksnyder/go-i18n/v2 v2.1.2"
-	"github.com/nicksnyder/go-i18n/v2 v2.1.2/go.mod"
-	"github.com/niklasfasching/go-org v1.5.0"
-	"github.com/niklasfasching/go-org v1.5.0/go.mod"
-	"github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229"
-	"github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod"
-	"github.com/oklog/ulid v1.3.1"
-	"github.com/oklog/ulid v1.3.1/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.5"
-	"github.com/olekukonko/tablewriter v0.0.5/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/pelletier/go-toml v1.9.0"
-	"github.com/pelletier/go-toml v1.9.0/go.mod"
-	"github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e"
-	"github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pkg/sftp v1.10.1"
-	"github.com/pkg/sftp v1.10.1/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3"
-	"github.com/prometheus/client_golang v0.9.3/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-	"github.com/prometheus/common v0.4.0"
-	"github.com/prometheus/common v0.4.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084"
-	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-	"github.com/prometheus/tsdb v0.7.1"
-	"github.com/prometheus/tsdb v0.7.1/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/rogpeppe/go-internal v1.8.0"
-	"github.com/rogpeppe/go-internal v1.8.0/go.mod"
-	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6"
-	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd"
-	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod"
-	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f"
-	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-	"github.com/sanity-io/litter v1.5.0"
-	"github.com/sanity-io/litter v1.5.0/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shogo82148/go-shuffle v0.0.0-20180218125048-27e6095f230d"
-	"github.com/shogo82148/go-shuffle v0.0.0-20180218125048-27e6095f230d/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.2.0"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v1.6.4"
-	"github.com/smartystreets/goconvey v1.6.4/go.mod"
-	"github.com/soheilhy/cmux v0.1.4"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72"
-	"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.6.0"
-	"github.com/spf13/afero v1.6.0/go.mod"
-	"github.com/spf13/cast v1.3.0/go.mod"
-	"github.com/spf13/cast v1.3.1"
-	"github.com/spf13/cast v1.3.1/go.mod"
-	"github.com/spf13/cobra v1.1.3"
-	"github.com/spf13/cobra v1.1.3/go.mod"
-	"github.com/spf13/fsync v0.9.0"
-	"github.com/spf13/fsync v0.9.0/go.mod"
-	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-	"github.com/spf13/jwalterweatherman v1.1.0"
-	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.7.0/go.mod"
-	"github.com/spf13/viper v1.7.1"
-	"github.com/spf13/viper v1.7.1/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/objx v0.2.0"
-	"github.com/stretchr/objx v0.2.0/go.mod"
-	"github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/subosito/gotenv v1.2.0"
-	"github.com/subosito/gotenv v1.2.0/go.mod"
-	"github.com/tdewolff/minify/v2 v2.9.16"
-	"github.com/tdewolff/minify/v2 v2.9.16/go.mod"
-	"github.com/tdewolff/parse/v2 v2.5.14"
-	"github.com/tdewolff/parse/v2 v2.5.14/go.mod"
-	"github.com/tdewolff/test v1.0.6"
-	"github.com/tdewolff/test v1.0.6/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-	"github.com/valyala/bytebufferpool v1.0.0"
-	"github.com/valyala/bytebufferpool v1.0.0/go.mod"
-	"github.com/valyala/fasttemplate v1.0.1"
-	"github.com/valyala/fasttemplate v1.0.1/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/yuin/goldmark v1.1.22/go.mod"
-	"github.com/yuin/goldmark v1.1.25/go.mod"
-	"github.com/yuin/goldmark v1.1.27/go.mod"
-	"github.com/yuin/goldmark v1.1.32/go.mod"
-	"github.com/yuin/goldmark v1.2.1/go.mod"
-	"github.com/yuin/goldmark v1.3.5"
-	"github.com/yuin/goldmark v1.3.5/go.mod"
-	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691"
-	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691/go.mod"
-	"go.etcd.io/bbolt v1.3.2"
-	"go.etcd.io/bbolt v1.3.2/go.mod"
-	"go.opencensus.io v0.15.0/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.opencensus.io v0.22.2/go.mod"
-	"go.opencensus.io v0.22.3/go.mod"
-	"go.opencensus.io v0.22.4/go.mod"
-	"go.opencensus.io v0.22.5/go.mod"
-	"go.opencensus.io v0.23.0"
-	"go.opencensus.io v0.23.0/go.mod"
-	"go.uber.org/atomic v1.4.0"
-	"go.uber.org/atomic v1.4.0/go.mod"
-	"go.uber.org/multierr v1.1.0"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.10.0"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"gocloud.dev v0.20.0"
-	"gocloud.dev v0.20.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
-	"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-20191030013958-a1ab85dbe136/go.mod"
-	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
-	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
-	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
-	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6"
-	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-	"golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb"
-	"golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
-	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
-	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5"
-	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
-	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028"
-	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-	"golang.org/x/mod v0.1.0/go.mod"
-	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
-	"golang.org/x/mod v0.2.0/go.mod"
-	"golang.org/x/mod v0.3.0/go.mod"
-	"golang.org/x/mod v0.4.0/go.mod"
-	"golang.org/x/mod v0.4.1"
-	"golang.org/x/mod v0.4.1/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
-	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
-	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
-	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
-	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
-	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
-	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
-	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
-	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
-	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
-	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
-	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
-	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
-	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
-	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
-	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
-	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
-	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
-	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4"
-	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78"
-	"golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
-	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
-	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
-	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
-	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
-	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-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-20181128092732-4ed8d59d0b35/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
-	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
-	"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
-	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
-	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
-	"golang.org/x/sys v0.0.0-20200317113312-5766fd39f98d/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
-	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
-	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
-	"golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod"
-	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
-	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
-	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
-	"golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod"
-	"golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod"
-	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
-	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
-	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
-	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
-	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
-	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
-	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
-	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
-	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
-	"golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750"
-	"golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750/go.mod"
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/text v0.3.4/go.mod"
-	"golang.org/x/text v0.3.5/go.mod"
-	"golang.org/x/text v0.3.6"
-	"golang.org/x/text v0.3.6/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
-	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
-	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
-	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
-	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
-	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
-	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
-	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
-	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
-	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
-	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
-	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
-	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
-	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
-	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
-	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
-	"golang.org/x/tools v0.0.0-20200317043434-63da46f3035e/go.mod"
-	"golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod"
-	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
-	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
-	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
-	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
-	"golang.org/x/tools v0.0.0-20200601175630-2caf76543d99/go.mod"
-	"golang.org/x/tools v0.0.0-20200606014950-c42cb6316fb6/go.mod"
-	"golang.org/x/tools v0.0.0-20200608174601-1b747fd94509/go.mod"
-	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
-	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
-	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
-	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
-	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
-	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
-	"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
-	"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
-	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
-	"golang.org/x/tools v0.1.0"
-	"golang.org/x/tools v0.1.0/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.5.0/go.mod"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0/go.mod"
-	"google.golang.org/api v0.13.0/go.mod"
-	"google.golang.org/api v0.14.0/go.mod"
-	"google.golang.org/api v0.15.0/go.mod"
-	"google.golang.org/api v0.17.0/go.mod"
-	"google.golang.org/api v0.18.0/go.mod"
-	"google.golang.org/api v0.19.0/go.mod"
-	"google.golang.org/api v0.20.0/go.mod"
-	"google.golang.org/api v0.22.0/go.mod"
-	"google.golang.org/api v0.24.0/go.mod"
-	"google.golang.org/api v0.26.0/go.mod"
-	"google.golang.org/api v0.28.0/go.mod"
-	"google.golang.org/api v0.29.0/go.mod"
-	"google.golang.org/api v0.30.0/go.mod"
-	"google.golang.org/api v0.35.0/go.mod"
-	"google.golang.org/api v0.36.0/go.mod"
-	"google.golang.org/api v0.40.0/go.mod"
-	"google.golang.org/api v0.41.0/go.mod"
-	"google.golang.org/api v0.43.0/go.mod"
-	"google.golang.org/api v0.45.0"
-	"google.golang.org/api v0.45.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.1/go.mod"
-	"google.golang.org/appengine v1.6.5/go.mod"
-	"google.golang.org/appengine v1.6.6/go.mod"
-	"google.golang.org/appengine v1.6.7"
-	"google.golang.org/appengine v1.6.7/go.mod"
-	"google.golang.org/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-20190508193815-b515fa19cec8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
-	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
-	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
-	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
-	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
-	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
-	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
-	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
-	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
-	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
-	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
-	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
-	"google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24/go.mod"
-	"google.golang.org/genproto v0.0.0-20200325114520-5b2d0af7952b/go.mod"
-	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
-	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
-	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
-	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
-	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
-	"google.golang.org/genproto v0.0.0-20200603110839-e855014d5736/go.mod"
-	"google.golang.org/genproto v0.0.0-20200608115520-7c474a2e3482/go.mod"
-	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
-	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
-	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
-	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
-	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
-	"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
-	"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
-	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
-	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
-	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
-	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
-	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
-	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
-	"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
-	"google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3"
-	"google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.0/go.mod"
-	"google.golang.org/grpc v1.21.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.25.1/go.mod"
-	"google.golang.org/grpc v1.26.0/go.mod"
-	"google.golang.org/grpc v1.27.0/go.mod"
-	"google.golang.org/grpc v1.27.1/go.mod"
-	"google.golang.org/grpc v1.28.0/go.mod"
-	"google.golang.org/grpc v1.29.1/go.mod"
-	"google.golang.org/grpc v1.30.0/go.mod"
-	"google.golang.org/grpc v1.31.0/go.mod"
-	"google.golang.org/grpc v1.31.1/go.mod"
-	"google.golang.org/grpc v1.33.2/go.mod"
-	"google.golang.org/grpc v1.34.0/go.mod"
-	"google.golang.org/grpc v1.35.0/go.mod"
-	"google.golang.org/grpc v1.36.0/go.mod"
-	"google.golang.org/grpc v1.36.1/go.mod"
-	"google.golang.org/grpc v1.37.0"
-	"google.golang.org/grpc v1.37.0/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"google.golang.org/protobuf v1.22.0/go.mod"
-	"google.golang.org/protobuf v1.23.0/go.mod"
-	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
-	"google.golang.org/protobuf v1.24.0/go.mod"
-	"google.golang.org/protobuf v1.25.0/go.mod"
-	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
-	"google.golang.org/protobuf v1.26.0"
-	"google.golang.org/protobuf v1.26.0/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/ini.v1 v1.51.0/go.mod"
-	"gopkg.in/ini.v1 v1.51.1"
-	"gopkg.in/ini.v1 v1.51.1/go.mod"
-	"gopkg.in/neurosnap/sentences.v1 v1.0.6"
-	"gopkg.in/neurosnap/sentences.v1 v1.0.6/go.mod"
-	"gopkg.in/resty.v1 v1.12.0"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gopkg.in/yaml.v2 v2.3.0/go.mod"
-	"gopkg.in/yaml.v2 v2.4.0"
-	"gopkg.in/yaml.v2 v2.4.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
-	"honnef.co/go/tools v0.0.1-2020.1.4"
-	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
-	"rsc.io/binaryregexp v0.2.0"
-	"rsc.io/binaryregexp v0.2.0/go.mod"
-	"rsc.io/quote/v3 v3.1.0"
-	"rsc.io/quote/v3 v3.1.0/go.mod"
-	"rsc.io/sampler v1.3.0"
-	"rsc.io/sampler v1.3.0/go.mod"
-	)
-
-go-module_set_globals
-
-SRC_URI="
-	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-"
-
-LICENSE="Apache-2.0 Unlicense BSD BSD-2 MPL-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +sass"
-
-BDEPEND=">=dev-lang/go-1.16.0"
-
-src_compile() {
-	mkdir -pv bin || die
-	go build -ldflags \
-		"-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" \
-		$(usex sass "-tags extended" "") -o "${S}/bin/hugo" || die
-	bin/hugo gen man --dir man || die
-
-	bin/hugo gen autocomplete --completionfile hugo || die
-
-	if use doc ; then
-		bin/hugo gen doc --dir doc || die
-	fi
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-
-	dobashcomp hugo || die
-
-	if use doc ; then
-		dodoc -r doc/
-	fi
-}
diff --git a/www-apps/hugo/hugo-0.85.0.ebuild b/www-apps/hugo/hugo-0.85.0.ebuild
new file mode 100644
index 000000000000..6fd2f589ad8e
--- /dev/null
+++ b/www-apps/hugo/hugo-0.85.0.ebuild
@@ -0,0 +1,995 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module bash-completion-r1
+
+DESCRIPTION="The world's fastest framework for building websites"
+HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.39.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.44.3/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.55.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.58.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go v0.72.0/go.mod"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go v0.78.0/go.mod"
+	"cloud.google.com/go v0.79.0/go.mod"
+	"cloud.google.com/go v0.81.0"
+	"cloud.google.com/go v0.81.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/firestore v1.1.0/go.mod"
+	"cloud.google.com/go/firestore v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.9.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod"
+	"contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod"
+	"contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod"
+	"contrib.go.opencensus.io/resource v0.1.1/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.2.2"
+	"github.com/Azure/azure-pipeline-go v0.2.2/go.mod"
+	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
+	"github.com/Azure/azure-service-bus-go v0.10.1/go.mod"
+	"github.com/Azure/azure-storage-blob-go v0.9.0"
+	"github.com/Azure/azure-storage-blob-go v0.9.0/go.mod"
+	"github.com/Azure/go-amqp v0.12.6/go.mod"
+	"github.com/Azure/go-amqp v0.12.7/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.3"
+	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.3"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69"
+	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/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/GeertJohan/go.incremental v1.0.0/go.mod"
+	"github.com/GeertJohan/go.rice v1.0.0/go.mod"
+	"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/akavel/rsrc v0.8.0/go.mod"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+	"github.com/alecthomas/chroma v0.7.2-0.20200305040604-4f3623dce67a/go.mod"
+	"github.com/alecthomas/chroma v0.8.2/go.mod"
+	"github.com/alecthomas/chroma v0.9.1"
+	"github.com/alecthomas/chroma v0.9.1/go.mod"
+	"github.com/alecthomas/chroma v0.9.2"
+	"github.com/alecthomas/chroma v0.9.2/go.mod"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+	"github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod"
+	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
+	"github.com/alecthomas/kong v0.2.4/go.mod"
+	"github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1"
+	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.27/go.mod"
+	"github.com/aws/aws-sdk-go v1.19.18/go.mod"
+	"github.com/aws/aws-sdk-go v1.31.13/go.mod"
+	"github.com/aws/aws-sdk-go v1.38.23"
+	"github.com/aws/aws-sdk-go v1.38.23/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/bep/debounce v1.2.0"
+	"github.com/bep/debounce v1.2.0/go.mod"
+	"github.com/bep/gitmap v1.1.2"
+	"github.com/bep/gitmap v1.1.2/go.mod"
+	"github.com/bep/godartsass v0.12.0"
+	"github.com/bep/godartsass v0.12.0/go.mod"
+	"github.com/bep/golibsass v1.0.0"
+	"github.com/bep/golibsass v1.0.0/go.mod"
+	"github.com/bep/gowebp v0.1.0"
+	"github.com/bep/gowebp v0.1.0/go.mod"
+	"github.com/bep/tmc v0.5.1"
+	"github.com/bep/tmc v0.5.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/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/cli/safeexec v1.0.0"
+	"github.com/cli/safeexec v1.0.0/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/daaku/go.zipexe v1.0.0/go.mod"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/devigned/tab v0.1.1/go.mod"
+	"github.com/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/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/disintegration/gift v1.2.1"
+	"github.com/disintegration/gift v1.2.1/go.mod"
+	"github.com/dlclark/regexp2 v1.1.6/go.mod"
+	"github.com/dlclark/regexp2 v1.2.0/go.mod"
+	"github.com/dlclark/regexp2 v1.4.0"
+	"github.com/dlclark/regexp2 v1.4.0/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanw/esbuild v0.11.16"
+	"github.com/evanw/esbuild v0.11.16/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fortytw2/leaktest v1.3.0"
+	"github.com/fortytw2/leaktest v1.3.0/go.mod"
+	"github.com/frankban/quicktest v1.4.1/go.mod"
+	"github.com/frankban/quicktest v1.7.2/go.mod"
+	"github.com/frankban/quicktest v1.11.2/go.mod"
+	"github.com/frankban/quicktest v1.12.0"
+	"github.com/frankban/quicktest v1.12.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/getkin/kin-openapi v0.61.0"
+	"github.com/getkin/kin-openapi v0.61.0/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/go-ini/ini v1.25.4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.5"
+	"github.com/go-openapi/jsonpointer v0.19.5/go.mod"
+	"github.com/go-openapi/swag v0.19.5"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobuffalo/flect v0.2.2"
+	"github.com/gobuffalo/flect v0.2.2/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013"
+	"github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013/go.mod"
+	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95"
+	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/mock v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.1/go.mod"
+	"github.com/golang/protobuf v1.5.2"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-replayers/grpcreplay v0.1.0"
+	"github.com/google/go-replayers/grpcreplay v0.1.0/go.mod"
+	"github.com/google/go-replayers/httpreplay v0.1.0"
+	"github.com/google/go-replayers/httpreplay v0.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible"
+	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0"
+	"github.com/google/martian/v3 v3.1.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+	"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/subcommands v1.0.1/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/google/wire v0.4.0"
+	"github.com/google/wire v0.4.0/go.mod"
+	"github.com/googleapis/gax-go v2.0.2+incompatible"
+	"github.com/googleapis/gax-go v2.0.2+incompatible/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/csrf v1.6.0/go.mod"
+	"github.com/gorilla/handlers v1.4.1/go.mod"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/mux v1.8.0/go.mod"
+	"github.com/gorilla/securecookie v1.1.1/go.mod"
+	"github.com/gorilla/websocket v1.4.2"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/consul/api v1.1.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jdkato/prose v1.2.1"
+	"github.com/jdkato/prose v1.2.1/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-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.4.0"
+	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/fs v0.1.0/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.1"
+	"github.com/kr/pretty v0.2.1/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/kyokomi/emoji/v2 v2.2.8"
+	"github.com/kyokomi/emoji/v2 v2.2.8/go.mod"
+	"github.com/lib/pq v1.1.1/go.mod"
+	"github.com/magefile/mage v1.11.0"
+	"github.com/magefile/mage v1.11.0/go.mod"
+	"github.com/magiconair/properties v1.8.1"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.1"
+	"github.com/mattn/go-ieproxy v0.0.1/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/miekg/mmark v1.3.6"
+	"github.com/miekg/mmark v1.3.6/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/hashstructure v1.0.0"
+	"github.com/mitchellh/hashstructure v1.0.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.3"
+	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/montanaflynn/stats v0.6.3/go.mod"
+	"github.com/muesli/smartcrop v0.3.0"
+	"github.com/muesli/smartcrop v0.3.0/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/neurosnap/sentences v1.0.6/go.mod"
+	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646"
+	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod"
+	"github.com/niklasfasching/go-org v1.5.0"
+	"github.com/niklasfasching/go-org v1.5.0/go.mod"
+	"github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.5"
+	"github.com/olekukonko/tablewriter v0.0.5/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.9.0"
+	"github.com/pelletier/go-toml v1.9.0/go.mod"
+	"github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/sftp v1.10.1/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.8.0"
+	"github.com/rogpeppe/go-internal v1.8.0/go.mod"
+	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6"
+	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd"
+	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/sanity-io/litter v1.5.0"
+	"github.com/sanity-io/litter v1.5.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shogo82148/go-shuffle v0.0.0-20180218125048-27e6095f230d/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.6.0"
+	"github.com/spf13/afero v1.6.0/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v1.1.3"
+	"github.com/spf13/cobra v1.1.3/go.mod"
+	"github.com/spf13/fsync v0.9.0"
+	"github.com/spf13/fsync v0.9.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.7.0"
+	"github.com/spf13/viper v1.7.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/subosito/gotenv v1.2.0"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/tdewolff/minify/v2 v2.9.16"
+	"github.com/tdewolff/minify/v2 v2.9.16/go.mod"
+	"github.com/tdewolff/minify/v2 v2.9.18"
+	"github.com/tdewolff/minify/v2 v2.9.18/go.mod"
+	"github.com/tdewolff/parse/v2 v2.5.14"
+	"github.com/tdewolff/parse/v2 v2.5.14/go.mod"
+	"github.com/tdewolff/parse/v2 v2.5.18"
+	"github.com/tdewolff/parse/v2 v2.5.18/go.mod"
+	"github.com/tdewolff/test v1.0.6"
+	"github.com/tdewolff/test v1.0.6/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/valyala/bytebufferpool v1.0.0/go.mod"
+	"github.com/valyala/fasttemplate v1.0.1/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/yuin/goldmark v1.1.22/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark v1.3.8"
+	"github.com/yuin/goldmark v1.3.8/go.mod"
+	"github.com/yuin/goldmark v1.3.9"
+	"github.com/yuin/goldmark v1.3.9/go.mod"
+	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691"
+	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.opencensus.io v0.15.0/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.opencensus.io v0.22.5/go.mod"
+	"go.opencensus.io v0.23.0"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"gocloud.dev v0.20.0"
+	"gocloud.dev v0.20.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"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-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb"
+	"golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78"
+	"golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-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-20181128092732-4ed8d59d0b35/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200317113312-5766fd39f98d/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod"
+	"golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750"
+	"golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750/go.mod"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/text v0.3.6"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200317043434-63da46f3035e/go.mod"
+	"golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200601175630-2caf76543d99/go.mod"
+	"golang.org/x/tools v0.0.0-20200606014950-c42cb6316fb6/go.mod"
+	"golang.org/x/tools v0.0.0-20200608174601-1b747fd94509/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+	"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+	"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.1.0"
+	"golang.org/x/tools v0.1.0/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.5.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.26.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/api v0.35.0/go.mod"
+	"google.golang.org/api v0.36.0/go.mod"
+	"google.golang.org/api v0.40.0/go.mod"
+	"google.golang.org/api v0.41.0/go.mod"
+	"google.golang.org/api v0.43.0/go.mod"
+	"google.golang.org/api v0.45.0"
+	"google.golang.org/api v0.45.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/appengine v1.6.7"
+	"google.golang.org/appengine v1.6.7/go.mod"
+	"google.golang.org/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-20190508193815-b515fa19cec8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24/go.mod"
+	"google.golang.org/genproto v0.0.0-20200325114520-5b2d0af7952b/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200603110839-e855014d5736/go.mod"
+	"google.golang.org/genproto v0.0.0-20200608115520-7c474a2e3482/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
+	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+	"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
+	"google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3"
+	"google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/grpc v1.31.1/go.mod"
+	"google.golang.org/grpc v1.33.2/go.mod"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/grpc v1.35.0/go.mod"
+	"google.golang.org/grpc v1.36.0/go.mod"
+	"google.golang.org/grpc v1.36.1/go.mod"
+	"google.golang.org/grpc v1.37.0"
+	"google.golang.org/grpc v1.37.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.51.0/go.mod"
+	"gopkg.in/ini.v1 v1.51.1"
+	"gopkg.in/ini.v1 v1.51.1/go.mod"
+	"gopkg.in/neurosnap/sentences.v1 v1.0.6/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	)
+
+go-module_set_globals
+
+SRC_URI="
+	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
+
+LICENSE="Apache-2.0 Unlicense BSD BSD-2 MPL-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +sass"
+
+BDEPEND=">=dev-lang/go-1.16.0"
+
+src_compile() {
+	mkdir -pv bin || die
+	go build -ldflags \
+		"-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" \
+		$(usex sass "-tags extended" "") -o "${S}/bin/hugo" || die
+
+	bin/hugo gen man --dir man || die
+	bin/hugo gen autocomplete --completionfile hugo || die
+
+	if use doc ; then
+		bin/hugo gen doc --dir doc || die
+	fi
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	dobashcomp hugo
+
+	if use doc ; then
+		dodoc -r doc/*
+	fi
+}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index ebe710c8e34e..732d9ad57358 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,4 +1,8 @@
 DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 7e6a44574999967a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9 SHA512 252ecb36751add239897b6344dd622542f892b1850398fe724d0ab91e8d691cefe0b33c727c28aa630c93b76b381aabe69721db034c4de0518f346bbd5b698de
+DIST icingaweb2-2.8.3.tar.gz 8514052 BLAKE2B 507753833ed8a0de816651f3fdb06f3fdf04b3fa9c43fad5046c28924c93f3c3e491d9a4e1532f08ac0d6abe97c1343b85cdb23de9ece9f16858b91886283e9c SHA512 236385dc54dbd11d8e100059bb7e29b3a4efc23888f187e13e563510dfb1f3d20e5c4107e2dadfa6842e6689aaa21d4e9465abd0a234c52229354f43ec44cfb4
+DIST icingaweb2-2.9.0.tar.gz 10895850 BLAKE2B cf0f1375e3eb29ddbbf6691afd1c240ae1431b7dd82bd591dd3fe135602d1eabc418c6279fe7bd8f8e519f264b69a9da8bb1d09d286f37aa2f7e5ed21ddacd5a SHA512 d8f2817c025160cd8f59f33d678ca6eea9b893b80ca5c45c719d8778269da46322e720a1c73d7bcd7be73a07f08dbe279ffb78220f2a6c00f7e07e9f0f88d4d4
 EBUILD icingaweb2-2.8.2-r1.ebuild 2309 BLAKE2B 3fcaed75fcbb6cd194810b19f9a1f47394a4a4e41aff82598152b224f937faa156a8142e63018e140c430be2fc38deb2f86e09001540fd2ea85dd252d9f21882 SHA512 ce4a4933dc9c5e6a05639be9c92199cf83a5a9690f5fde5fac7a9ba68c816308d7c0977544bdf8b0d04124ebd5df13ef54393c0e984d15fdc937f735e7327a0a
+EBUILD icingaweb2-2.8.3.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
+EBUILD icingaweb2-2.9.0.ebuild 2410 BLAKE2B 5308c70815caf5d6246345ef85953dbced9f959d936504296e05aabf54047dbda5a5b4645c7656fefa19aaec26699412df47335e983acdfb3699c916beb13583 SHA512 9b37521628b155a9cf17da90c2690c106dbda1f0b5b3155687bc854b4304505e490d3636e3acf30270b112e863825b364c7d6071fbdfdcc436bb6095e7ecb0e6
 EBUILD icingaweb2-9999.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
 MISC metadata.xml 443 BLAKE2B 408760755558425f54f2a06aace2d16f0dfb1f585b9226d5745e69dddd020116ffe8f64f475205ed5454f1cac25b3c3ade29aad2e404d39bccc0697be89287f1 SHA512 81020a9b2ca89e23526a3d46de4f845ab433c66989db2483a9cfdfb8ae998c00b24b7acb8211c3041d43685742bd6f2f58762d0ac93608263c0cdfe83bba4128
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
new file mode 100644
index 000000000000..c5f119e375d9
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit depend.apache multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
+		nginx? ( >=www-servers/nginx-1.7.0:* )
+		|| (
+			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)
+		acct-group/icingacmd
+		acct-group/icingaweb2"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild
new file mode 100644
index 000000000000..84db9d6e0716
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit depend.apache multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
+		nginx? ( >=www-servers/nginx-1.7.0:* )
+		|| (
+			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)
+		acct-group/icingacmd
+		acct-group/icingaweb2"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/zeppelin-bin/Manifest b/www-apps/zeppelin-bin/Manifest
index 5226916f6ac5..7e23b3bd8a7b 100644
--- a/www-apps/zeppelin-bin/Manifest
+++ b/www-apps/zeppelin-bin/Manifest
@@ -1,5 +1,4 @@
 AUX zeppelin.init.d 492 BLAKE2B f6a551375b34ffc8ab0c2f5fe259614a8dd7024e6578919943755121d796ffc815678133446ce65b0c7eadbe18bcd0441327e29fb4cd8226f949a769f1f7e1bd SHA512 a70788870d766256c3e515748d9680e19ea0a574b81c47e5a4456a81179701db551079e2a066e5dba69c3db5d10509250780b6e54f2b43f5fc8602252292ab1b
 DIST zeppelin-bin-0.8.2.tgz 998508624 BLAKE2B cccfa95426d8d0407d7a226f5d71c15ca55da8893a7fff9e3a612c63034ab1838f8f7d5a529bb393b825c6c3bd19e197f4e913c2c5b8dd04fb282affc43788ab SHA512 91a785153bc47b087f90fac0f83066fdede041d5193506b231af1b6855b150307873c92cea462c6dd48ef6d38caa37934591a08542199ac4b02d9493298fbd43
-EBUILD zeppelin-bin-0.8.2-r1.ebuild 852 BLAKE2B 74b788341a1205b37b50952d1d5302bb19a25ee2dda661da7364bda8824cf0c13fbe2847a63ed17868dc1c2fa2859a559c9b6224b6607be87503fb4b6966c916 SHA512 4e184fdc60b322239dff7ce9fd02fbe1ff6a8f05fdfd7d7c2d00e612814392dcbebc9cba11b08e1d64af9e3d21ebcea82156b4da8d135ca9c2240ccf046d1d1f
-EBUILD zeppelin-bin-0.8.2.ebuild 905 BLAKE2B 0bc8aeba198f6b4424bf7120a90278576a53ea71ac7eb60ec4184786bfe73d46523c44947b186622e9ccc1b0fd06979c4daabdaf497aecbf52e524af8e1b336f SHA512 07a10e5d231d06968f64cdbc4a0c362222b946ac885af5f09a95594e0e6040953f581316d63d39391b34e5950252d64dd17a564b676fa705a7bb946c8a05adeb
+EBUILD zeppelin-bin-0.8.2-r1.ebuild 850 BLAKE2B c47748659f5ccddfdefe8cb0f3e4a25ff783cbcff9f218159dd4807722c7dcdd733674c26e3f2a74883158d22c752330e3785dedbfc439cb0d21b479e8e28a73 SHA512 6042414563eae0b5a5ea2a28bc9c34af67498538a1b8e5f37a793f3bc5de5a93c3493b65dbc79af8efb14223310a6fb20e9dcf81a61b1e953b95576803261ee7
 MISC metadata.xml 339 BLAKE2B 1dcf764353ed060bc2bc430af6e22ab96fd2d703eea4718b3ffe794f936d344392b477bbbb30712808180172107a92d3ee16c236674f044c2275fd2111d16542 SHA512 e836e7f499e4d8b2cf9e9d2c4b2df437683186a92c8adda12f662224681edb76507bc3af84e5dd71cfe02320f3d4f3f481556bf2156ed052a2c1f758bf52180e
diff --git a/www-apps/zeppelin-bin/zeppelin-bin-0.8.2-r1.ebuild b/www-apps/zeppelin-bin/zeppelin-bin-0.8.2-r1.ebuild
index e1df14facd06..b98e468a55f9 100644
--- a/www-apps/zeppelin-bin/zeppelin-bin-0.8.2-r1.ebuild
+++ b/www-apps/zeppelin-bin/zeppelin-bin-0.8.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://zeppelin.apache.org"
 SRC_URI="mirror://apache/zeppelin/${MY_PN}-${PV}/${MY_P}.tgz -> ${P}.tgz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	acct-group/zeppelin
diff --git a/www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild b/www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
deleted file mode 100644
index 62d7b66262ba..000000000000
--- a/www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 user
-
-MY_PN="zeppelin"
-MY_P="${MY_PN}-${PV}-bin-all"
-
-DESCRIPTION="Web-based interactive data analytics notebook launcher"
-HOMEPAGE="https://zeppelin.apache.org"
-SRC_URI="mirror://apache/zeppelin/${MY_PN}-${PV}/${MY_P}.tgz -> ${P}.tgz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-INSTALL_DIR="/opt/${P}"
-
-pkg_setup() {
-	enewgroup zeppelin
-	enewuser zeppelin -1 /bin/sh /home/zeppelin zeppelin
-}
-
-src_install() {
-	keepdir /var/log/zeppelin
-	fowners -R zeppelin:zeppelin /var/log/zeppelin
-
-	newinitd "${FILESDIR}/zeppelin.init.d" zeppelin
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP * "${ED}/${INSTALL_DIR}" || die
-	dosym "${P}" /opt/zeppelin
-	fowners -R zeppelin:zeppelin "${INSTALL_DIR}"
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index e919f6b72fe5..38a312474738 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index deb0128f3bfc..7f7c9e9f823d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -12,6 +12,7 @@ DIST chromium-91-patchset-6.tar.xz 4280 BLAKE2B 18887953453133589cfc5df58d247250
 DIST chromium-91-ppc64le-6.tar.xz 28968 BLAKE2B 5153be672aec91899d9eabe3ddf4c3d0b4b2d307e396afa2a83bf3102bc540fa62d69df365057128227428bd3abfc8cab9203fae41e5150191025d8ecea935ab SHA512 78071d204bf04a13a132a63a3d268a0d6d05a895c1ee55a41176fb5cca975c502e69a83ca0388ecea92c041f24235c452abdfbf0ee557e93db6685589fb9428b
 DIST chromium-91.0.4472.106.tar.xz 950214296 BLAKE2B 1c68c3d6ccb593b4516482ba8f18f3bf769fe90ca423692f8e8d9fabd36fa8cda7a66f870fc30478ea4e1f9bd147bb6cadb77df4d9e0ef846c30e653b15dcc98 SHA512 142507bbf5fcc47d7eeb5f890ed70eae403271a7f537903545ad09ac26501aae914f327c3287d5588ed4ab601012584f6204cca6896ed2705326b090df2fe00c
 DIST chromium-91.0.4472.114.tar.xz 950268264 BLAKE2B e811ec3550434a5f5dcff3f5a0c07d2a951b0479ae8ef7de0dc82c60d63bb19a04ed065b2f8f12b0ba4786244fd0fdba9a38e1f0ae076a9be2fc50bc293453b5 SHA512 7a04d966e8c8b75b5fe063730cbc4734cc9a5a38a50a573193243301930719cef26e2b741f2f893350bb717261302e5d00b0b3264a3fdb8f80a5460223eac5de
+DIST chromium-91.0.4472.164.tar.xz 950253100 BLAKE2B 4de7222dbf8fb22115518625ebc8eb62eca281bd4a28ee9d4f4450545aa4155a5bf7478f56d9ba482c102deea5c7b3214299549480c19d972b1380931f7ba4df SHA512 3d15b7df6d6627084bc82cfb6f9c52f917cdb03cea73f85199e6d41eb9636db867e56ea60d69a8bbc92dd8cb59f13b4ae6c609d59f32fe04f88c33252225f8a5
 DIST chromium-92-patchset-7.tar.xz 4004 BLAKE2B 8587663a072eb08abacbc2e54924855f29efefdbec46acf5cb8b0cc40b816b96ba7694c4ab1abe997572a6dbecf94ea27f368a7337263adfff44f2b4b042d862 SHA512 65c8267ab0921719c71d4b03a4315bbb1ceec35ce4794de9dcc6099b2c349baf4782b67316ebb8c9db233630b7fc89fa0baf719f9f0f41eb39972cdeb437e612
 DIST chromium-92.0.4515.80.tar.xz 957805500 BLAKE2B 9c622d45fd62b58ff1c8f3cb8745502747e3a6ee8f453a35927212f2ff71cfeb216cc7fc1e78010e4f5178b18062ddc36aa74c1dcb3daf32ba8ef08285fb196f SHA512 04ba2c24c987e9885674e7efd2a2b9415673424f1f3a18e1d79afb2683d984927b15067003040e8fb92ff8be31cda042aac052e9369a1a3709d6b11bf9d1df7a
 DIST chromium-93-patchset-5.tar.xz 4404 BLAKE2B f347a66c5767bb03dd6a0feda433f51f5110e0429c6f55494000bd1a61a4f3b6a218e7f12ce91a02adae94ee0a85d0aceb12aef5a0537e9362f23817edb662c0 SHA512 39d3bd5ad51e33d5d82a42d5289ab137bdb3280e4d2d647fce86eb59d14a01e9f31531cf82ba9055168c18d1fb96e3013e2d40dc89b30c725c89241d34b7b25d
@@ -20,6 +21,7 @@ DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f20
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-91.0.4472.106.ebuild 30004 BLAKE2B fabf65aec811906477c4b76c05dee55ae9c20a7573ebacf4cefa3b4a0ab89b690a1c1c5dcc009e5bb416b75c3fa509fbb76306ff23d6702a8981b7b5bd3cecdb SHA512 43b03f73cde551bc677c392e5134d2bb89629f5a3690e67b75d9f3a1c6c7b8e646794d8eb17d72468d8c80d1e6cd6c8f8513fc2678d4672c97d4b918490569f9
 EBUILD chromium-91.0.4472.114.ebuild 30004 BLAKE2B fabf65aec811906477c4b76c05dee55ae9c20a7573ebacf4cefa3b4a0ab89b690a1c1c5dcc009e5bb416b75c3fa509fbb76306ff23d6702a8981b7b5bd3cecdb SHA512 43b03f73cde551bc677c392e5134d2bb89629f5a3690e67b75d9f3a1c6c7b8e646794d8eb17d72468d8c80d1e6cd6c8f8513fc2678d4672c97d4b918490569f9
+EBUILD chromium-91.0.4472.164.ebuild 30006 BLAKE2B 5f95c42c89373c0919ca54ec360c7f7d22c3bf2b40cbe46431daa8d63f3a7c99b122fa9c776a23e8231e4f5f0705d54c3272c3e77b7fbab1686d8658a11834d4 SHA512 d4adad4c344b94fe788c93ab153506383aff1fde7bcc0d42fbf1f0dcf5fd9ad60133fc0165b5905b1f0966f50c04d92bba7bdb137d852bcb524297c0fb5609cc
 EBUILD chromium-92.0.4515.80.ebuild 30444 BLAKE2B a314df934fe51f40e3704b53a8a80dff887c1d30d7e061a0ab07d84d3ef2abde18729319f5f5f7d620f66ff5bb910fb76efb1f10c61ee5b36df8cb7a5b84afa8 SHA512 6850e0abf148208e97204fa2e2969f3fe4e59e3dbb1c7769cf1b35d26e74625fd5bff32d6fed30467eaf1b749327352d2badc9abcde97f04da0fa4b38f6a86be
 EBUILD chromium-93.0.4557.4.ebuild 30009 BLAKE2B 92c05652ec1bea212aecfa5d20c1a010e0f1661f0e5aa6c38fc8314276eff6a24b5ed12f3356606f7a55ae1b93ab7ebddbf406791bb7a0a057509fe1e7408e06 SHA512 ae84f16552a0420515db6e89f1bc53d04272b78617769a911d869a0b6fe1e208059cd28dc6ca57d9504b1ac0580480aa889574ad8edafe3b59b61656d389c304
 MISC metadata.xml 1519 BLAKE2B e4364e8141099703f087f1733b2d28aa688930f5e9cf4659fc3561af30d4490c611b76728b2bf2d745eb07b1482f59923166ca340740d48a0321fffc908ef4ed SHA512 b6a1e1f04b7e1b92ea2172c4aa89ce67186a6c8abe6dc6502db7b0588a9b3be2d0fa8d43c797f83b95f7d1c7a20381c26ee534082c4b81b17d4105b63aad06e4
diff --git a/www-client/chromium/chromium-91.0.4472.164.ebuild b/www-client/chromium/chromium-91.0.4472.164.ebuild
new file mode 100644
index 000000000000..cd69cc5880ad
--- /dev/null
+++ b/www-client/chromium/chromium-91.0.4472.164.ebuild
@@ -0,0 +1,944 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="6"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+PPC64LE_PATCHSET="6"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
+	arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
+	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-$(ver_cut 1)-ppc64le-${PPC64LE_PATCHSET}.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid )
+	screencast? ( wayland )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxcb:=
+	x11-libs/libxshmfence:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libxkbcommon:=
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:0/0.3 )
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	app-arch/unzip
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-12"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-12"
+	DEPEND+=" >=sys-libs/libcxx-12"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-69.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			CPP="${CHOST}-clang++ -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="8G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-89-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-91-ThemeService-crash.patch"
+		"${FILESDIR}/chromium-91-system-icu.patch"
+		"${FILESDIR}/chromium-shim_headers.patch"
+	)
+
+	# seccomp sandbox is broken if compiled against >=sys-libs/glibc-2.33, bug #769989
+	if has_version -d ">=sys-libs/glibc-2.33"; then
+		ewarn "Adding experimental glibc-2.33 sandbox patch. Seccomp sandbox might"
+		ewarn "still not work correctly. In case of issues, try to disable seccomp"
+		ewarn "sandbox by adding --disable-seccomp-filter-sandbox to CHROMIUM_FLAGS"
+		ewarn "in /etc/chromium/default."
+		PATCHES+=(
+			"${FILESDIR}/chromium-glibc-2.33.patch"
+		)
+	fi
+
+	use ppc64 && eapply -p0 "${WORKDIR}/${PN}"-ppc64le
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# bundled highway library does not support arm64 with GCC
+	if use arm64; then
+		rm -r third_party/highway/src || die
+		ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die
+	fi
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/fabricjs
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/highway
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/harfbuzz-ng/utils
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libjxl
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tcmalloc
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite-support
+		third_party/tint
+		third_party/ruy
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/utf
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		tools/grit/third_party/six
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	if use js-type-check; then
+		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
+	fi
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# highway/libjxl relies on this with arm64
+	if use arm64 && tc-is-gcc; then
+		append-cxxflags -flax-vector-conversions
+	fi
+
+	# highway/libjxl fail on ppc64 without extra patches, disable for now.
+	use ppc64 && myconf_gn+=" enable_jxl_decoder=false"
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use wayland || use headless; then
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=false"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# https://bugs.gentoo.org/717456
+	# don't inherit PYTHONPATH from environment, bug #789021
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0"
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
+			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. You have to enable it"
+		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+		elog "in /etc/chromium/default."
+	fi
+	if use screencast; then
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index ed8127212911..e9a92adf1b4a 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -101,6 +101,101 @@ DIST firefox-78.11.0esr-vi.xpi 562862 BLAKE2B 1563fc0ce49d784985f4de6015dd52f6c3
 DIST firefox-78.11.0esr-xh.xpi 427833 BLAKE2B 484282b3729b6218e07bb153120c50c8aefdaf2b8adf307d990a28f795069906f452088d78d8b274d2872c1e98612dafae745041fe0eee4218b1728d1f2018d4 SHA512 6f24d33b00abd875db1472ffbc52a5efebc67a8ff29732d098ec6b80c090f26953eac1a5693a86acfa16816ab1506662b29515a22d354bad265893eeea2dbe7e
 DIST firefox-78.11.0esr-zh-CN.xpi 564767 BLAKE2B 6a77c82c031ae8e2ba8d6ef4f294049f219bf573e678fc9fce4b23a19a89ab9d15487e760e809eda5798f5ed213d3e21c20bf34782e201b1fe04e51d0af078c0 SHA512 f2680016d879ce3ebe93f308cccdb59d40a850641e6e433a3b7620566591877746957fd541b49e466d69ef708f4422bab26316c4632459b4c8c1546ad5581a89
 DIST firefox-78.11.0esr-zh-TW.xpi 564742 BLAKE2B 3357a373a38d89cf4807ffa7d306091f65397f97ef3346603493b93e5daff42f0c55826d329df8d1bde7ff104862eac756aa811a4754d401448638fd251cf0f4 SHA512 08290cc90f946732c63aeb247ef4babc90128f04dcf3c32b623d0d822941bef9df1a2239c5bc1d067f04e4ba099cefe5255e4e43750f1053e133773258a68d43
+DIST firefox-78.12.0esr-ach.xpi 460283 BLAKE2B a00bee0c7f0ec9c27454f618c0402721db074b6319c1b0964a5ccde3710175a20f9a6727eef881d8d3db7205b2f7bf5bcbf5c050c39cbd20f95cf23c6ee480f8 SHA512 6542b5683dd352ecafecb42a9bbdc438cdd927deb9e1c8f55f52a1c12690d1ac1281c379ed7dcedd6a62b4ff37b816b5a7870b0aa9a725444640a87b1e6749dc
+DIST firefox-78.12.0esr-af.xpi 428351 BLAKE2B b4f671687a03ed5e12e5c805b501ad3a975090168a60d4549326cfae17d0e31cbb7458e8118a8f85d566a75de97cd2b7a0f92f77f21e9b4a5cfd57163a54b163 SHA512 fa91d12158cf7d41000c3cb4beb0290c4fe760e5dcd27cd23d77b228f509558830ff4d2c29248bfc08f69c0a8592302cc6aa59fccb5b16f292e290bf9801f7f4
+DIST firefox-78.12.0esr-an.xpi 508377 BLAKE2B 63f4678044c1ff6088279a5fe25bc7a0eb0fb8eb8c2ca326c14ffad242be91892e8277bda016e852d61834bd095408d9c822e329918748248e4f8f0864c64718 SHA512 b1cbcf41150858ec827d485ca819490907d5604ceac758d478a5f39a20b1f204dfc674fa5563c25e8fd93d85f83faab3673e4d08becd6c628d1d8c118c22bbee
+DIST firefox-78.12.0esr-ar.xpi 560954 BLAKE2B 625905b86f9a7b9b8063873f7ba91d59196abc95a27b15764fbdd3bfea24d7aa69c7a9c4934fa9b0d8f210ff90b9782d981221bc8d892b5fa83b1c355166d554 SHA512 c0b09fe41708f1cab137a270ac848627ec98fc43e47c6a405d32db7e01a13338516cefb2f3cdf1a8590af00e75c3d4bec782646d6d143d2b103c7e5eb861dfdb
+DIST firefox-78.12.0esr-ast.xpi 456387 BLAKE2B d8a5fd537ccbbfcd654ac58ba963123380363bc5acc3261fcc5f4051d93e254a9f9cf2929de1dbb9c2092e2494c9744c973e1b8a2a12650655f8d25fba7fc749 SHA512 ec5e717088863808fe34f088336f13add49035ea8d7f323fc3c094316cf8044772d5ced904904cd170f471186028c0ecca21ea52cacffcff185548172f0abd69
+DIST firefox-78.12.0esr-az.xpi 497433 BLAKE2B bec0f0209a6f5d9043f4789df51c34519c5f33c08a2f6620041f591599929514658bfc7a5ea2cd457ded405f58e000861b6c9186972ee4390555d7fe0c5fb489 SHA512 49e2fc648e30e419407714677b59194196404c50c92e4d1affa01d66cb7719302979f3d4b74c7fca83fdbfc7ec5c406cf876b1fd342384870c39e08f72346d48
+DIST firefox-78.12.0esr-be.xpi 608650 BLAKE2B 0ab6829a8f7d49678d905f99e53375946a733e12ed46cd693fdae3da19aade621b572028f938d33c91da3e69280b53c6ab6a19690648a414127bf55a3279ea7f SHA512 de62c7f2e5c8ef8323eac321ff3c735cc165fcc53ecb044dbeec35a2196c52fe9cc083c95ce755b97c320f123500565e471fd8b0edcadee2b998d005402e6b84
+DIST firefox-78.12.0esr-bg.xpi 553973 BLAKE2B af6c0b0aaa207b9714269c2844eaaf4b7bbdff58350022bc816001711517f50e30b3eee62ed8dee53b906eb990373cd462d45b62cd112d44ac04e047638b5afc SHA512 3f50b3a300270a12b220ed903ba79738e807d71d731bb8755a543984b84272a7f67e1e4a05fc5ed7c87f391de69e9ede628f50a4f8faede4acf224adf0de4f7e
+DIST firefox-78.12.0esr-bn.xpi 572610 BLAKE2B d54b5abf4704b472537badef7559170f3663cabf6c7a48563fbac1b1f12f16bc048cc28e382f66aaa064fe5ab25b57e9ed58e94e9b285184d5a8ee1c2adc526c SHA512 3b116f3385d67f6901a801a758a02c834a9019696c498d085b7c0dec28d723b66f6485063db1ce7024e8b53793a3f146cac7337c130afd060c810d1e39ccd652
+DIST firefox-78.12.0esr-br.xpi 507129 BLAKE2B 19172ffbdc74639390d9beee945183e4f3ae068200af8caf697839774b942d251f36970f95b1ee17ea5726a4050a3ae77f22182810cb10668a17574aec522b4b SHA512 fc0c7f25f3b8a08052d5880e6c18df752b650c349411e464938d64850c7f8c5a471f5a7048fc13a6c7e8a0ef1b3bf7a7bec9da3b70bc4ca101f24288a09979d4
+DIST firefox-78.12.0esr-bs.xpi 463802 BLAKE2B b151773b4bb7e1c51566205e645c8a65a996bfcbd3a60f0648977f8a0784a6dae69ac799efbef5ba9daac906e48cc218e55d7c9a89181d8bd598930be5aac4a6 SHA512 85a7cf7f28c984f1330ef0e2b964d446bacb4f3369d1800031cccb61c43e10e990726af3d8aa8478af6eb416773c9e66f50793c87528435bbbd7b0c50e4d3b91
+DIST firefox-78.12.0esr-ca-valencia.xpi 517178 BLAKE2B d1574689812e3c1b01323d9eec83475d89e333e7ab8bdbb2b4cc11eed3cf7c56088adc3d1da7731c5ae65f3b9c0a76ab0743f50f3529dcd38d62be55c2862a9c SHA512 20b4b91a5e69975479a92f563042128d66d319843a71f7555f7fc53a1b9296d8eb8c60a3c647176a70408b616b5c5e44b901ed67bba46670dbf6cc31edc84e53
+DIST firefox-78.12.0esr-ca.xpi 514183 BLAKE2B 297626859bcd85f1e77f0eb37fb9c98175f8a7e6b45bf072405746b9428c2b789318db2f65fdb5dd906f8e21f7678d39efa62f031c4e884a689de5c7c2d7f3ea SHA512 24bcab6bb8d1e16d6098ace8502703e33e2c88c9d31a695c0783b103dc0212dbc48178a488a35b54fdc0a70675f0e37244cc4ae7bfa39d13614ff89fb2b2f7d9
+DIST firefox-78.12.0esr-cak.xpi 551556 BLAKE2B dfb1d7f88d2ceefd923f4af7239079ce2b1d0336cef47f26e35d5aead93351b05b26317875adf870acc817b71e02cfbf39e322377b3f89f93707182da13ed8d0 SHA512 1a1be2a52f85d06ddded2077ae330767c4629c363f7c11a1e4ac104d36ee4ae8640ae10d3dca1c94018c3cee6d94bbb241de6aacc49440479d5725074742fc75
+DIST firefox-78.12.0esr-cs.xpi 540329 BLAKE2B feaa6692d66d57084cedeacec0f3a49a5f175d59699af6980a12880ed3cb615fa5552f53a660adf9125a90703be743be15d6cdc651a68456ea22c4ac81a388ab SHA512 fa25f5f1cbe7dcff4e78fa02fc6996d1503c35b5b0a581172c6c111c86e1c65ef00dbac01372a33d929f03b15371545bb99801138afb26e39181248e663087f5
+DIST firefox-78.12.0esr-cy.xpi 530698 BLAKE2B 1e6cf6f9ac920a03315fd6901d79942cfc87387b00930b3a1feea7680d62a0683737463ba034530f65e9f85d1d99a3e2afc927cb6e221fcf1b1b9afe61d98919 SHA512 9456922b7291077fe26db1e4515742be7f860d294610022d384fbed1d5adf2ac973870e48e9695781fa82eeb92b431fd03dd15ff31a2f31082e340653c7a93f7
+DIST firefox-78.12.0esr-da.xpi 520269 BLAKE2B 3dc9ce7d730472394c3b237d5f9eef4b92dea1490cba2e73286aa48de477986ca6afe8a8a9f697ade06569f7ccb507a35ced025276b69d86b8ee7f0043ec1362 SHA512 6535bbd10493833c9f490806ebfcc7a02a122bd17c82468637e1e6c67f1f09aa207d5ee7a00f79796a70defe5ee53486db4e6f5ed9a712f06072ffe103948f9c
+DIST firefox-78.12.0esr-de.xpi 542853 BLAKE2B c52079da5fd96cc7a9f6636200764544c8d0c082cf9bb7dc3878740391b1b4eeca39721ae7a313e8614b71a80e856f413e79546b2cf62555f03800812759ce44 SHA512 1c66836985c31b6d46d4898ff6a73f2920d09d487f7deb4e5e0556cd84c7878da4c4ccd3131bee5ad8740bfe3b248c62e220d9a6c157dd5800111b288c339e9f
+DIST firefox-78.12.0esr-dsb.xpi 554280 BLAKE2B 3d14eaf320d18d7daabc8a0af83a34f52a616ed66f454ff2f8441cc776af604ddc90830f5bb6e1f777070607c73f25b522ca0c11faa34907ad52120e41ac56fa SHA512 4a05f52721ce363f4d977f92475029fa5a86445742acb1d3e4f023ba7875e9cc4b4ed290f75f3263c276066344e8d5af49fff4feba38485980b664c4f2bc93db
+DIST firefox-78.12.0esr-el.xpi 626568 BLAKE2B f89bfc615907dcfe53d870d6bab773f086c84e03d7632e826983da5271504528d3b453295d3edd1e5a9ce887af338f5fdc226c4fa7155f3fa9fc08c0ae09d378 SHA512 5997b04af48084cf9087110a42740e4e71d48ac4e0d52984e2e4dd62045001f14fb41105a693fb81a423bd985c464402a27d0217d0aef9efbb2e5fe975d74b33
+DIST firefox-78.12.0esr-en-CA.xpi 497732 BLAKE2B d7a74ba343baa1910eba123f801b82e18d9fdd1054e0df87ae234dc97ba5daa6a81d5b7dcd6fa403e0c52e884459c807b335094b4a8dbb09793a37d3731a4809 SHA512 78c05aa972db64a70980ea967f87edfd1edd08935313f70a43c0918c693e372dbff6f3ff1d233ca96268747e3f950e4666f23971d5d380f05a144d1be75d30b0
+DIST firefox-78.12.0esr-en-GB.xpi 497581 BLAKE2B 166282a2040172f9e8d209b9a8b098d4f56d1a4888ebc9b7ecd937991305827bf5f8bdafc75bf85effe97d4f809ca7a233b6f5ffd345e893fa3a5bc15fbf6445 SHA512 af372200fad2cfa9f653ac349289f0c20937f5ec798832e0d202f2f330fcba5fd04168b5960a5b8a534a1904bd5206f6745102e73ed6775dcd5120a120ba421c
+DIST firefox-78.12.0esr-eo.xpi 525738 BLAKE2B fa6cfd49fcda4fdfb54c93295978512a016f115cc0da9e54cc82f0da9c4fac90b2e2ea52d3ea41ee6b0654c90656b17d33ce316dee349da0dbe719eefdd6c6cf SHA512 8b11970ac93265c61c6518fa06eea0749f15f3cb94058e4f4c0db166fdde7261bb5bd9eca1e5f54db271570bf63d7f84d1ff5e141b20ec23ba09aeb9f30ab1e1
+DIST firefox-78.12.0esr-es-AR.xpi 535801 BLAKE2B 60688df3b040e8b17738c5c8f60e29bd9bca88f8d272e09ea9db60af859981ada067ab5ab7418153805a730e9fab1afcc0df2d55601c4d1dbc334d8ad56e42a4 SHA512 6567391847b866c5c4d53bc628259e69ca1038c468f0030536525d1bc5df19fab8654015f6404684156521a664422d41fdd341d8d4324e0ad8ecad1a96e759ca
+DIST firefox-78.12.0esr-es-CL.xpi 535347 BLAKE2B d31a9937488d728c9142f774a230f82fe955f4e735b9c4c71ba063e4c0fe80fc13a1227876dd14fec6bfe069cbe07e10e8ed93577bd214f5cd27581eeddd4b02 SHA512 49c96e3e2e79cd8b57d47e62a9f023ce52cf3b2ca82cd3d7f03d26f3c7433f080e915d4b0d0460af6d7f287ebdb8307e20a395ffcbcf926add14b31814f488c9
+DIST firefox-78.12.0esr-es-ES.xpi 522691 BLAKE2B ffdc2051ae8566d8320aa5cb100fab84df2e5ee1686353f21bffaeb15b7058e8920c46ac1a86f014ae2535435542e410b9464501d2306bc8215678eed917439d SHA512 754223da264548ed628611da8deec195ae5ac978c9f6244d2f132a7449c6693a09e0c808023dc3e18413e6372ea9957a8ed3d584fa06795b8355aac2823288c4
+DIST firefox-78.12.0esr-es-MX.xpi 532295 BLAKE2B dcc9269f6c4a5f55c871f11f81d29146d83c4e97b33ab509419b598d6716ce097760bbd677f7a5f0367323f31273837552db505c88920994a5e42f85616d84b6 SHA512 b3fd9d7fa72e730a215f3ef8b9cf45be999b5c393dd9a7f9a460bf83c52f10ca1057c52763f336dd3c5db3ad70bf9d0a6583a227b4403a4eb0137d33d0dfa24c
+DIST firefox-78.12.0esr-et.xpi 485252 BLAKE2B 181287684643149c2256a4c33c9486b947c8fcd973aa8bf76870082ab61ae735e997293abc852ff98611ecb1ccb9ee2f6f091604d3e7a67bfa570d741143ab93 SHA512 7661ba4923fbfda802225135ff2df04f5e6ea731bc8e3268dfef95749023b810997932efab11453f8b470d27372887e41d0231fd9a82936d376ad5a66705b4bf
+DIST firefox-78.12.0esr-eu.xpi 505876 BLAKE2B df642126d782f09639ea28f7cab53173f2039b0455f35589ecf9a1f07ec12331e555661c550bcb79391cb8203702312a36ec7385341ddfb487efa2cb218bd00f SHA512 905a1f112d2d5dc5e1ac465a4234ff64d08f44394c609c7dc11a895aa203b69bf9dfbf381b204b025d09a6a0db2eb95ceecb61d3b8f01014a9b003863480dacb
+DIST firefox-78.12.0esr-fa.xpi 538927 BLAKE2B bdab40593d23214daac28c7f6a2e4fda159b9af828158132354077596402dee1a09806ec8a699390f75dae82e548639b81a43ab4fbcbb331d9c2dce5309f4331 SHA512 34d8d6ed8aca43b5b70f595fc866390e389cdc79d7b48b8e66eb179c76f6cc09919b66fdee485b7646f386b79a1aaa6998f7b7c672ed7c286e646058484cc79b
+DIST firefox-78.12.0esr-ff.xpi 481609 BLAKE2B d076044f29ac3dcad8fe8dbcbcf2a8e8c6c52611d3cab47bc1a9341a42030c3cd48dfa595b8277933a4d038d81979a4cfc002d9a84c6203b2257126bed5e624f SHA512 620194c07b9a6eaaadc99617111c602d05ee573c8c3b95ed494e8322508b39d1e548d77f9014dd8ba3a2c2340239e1fab86a2788e1ade99b4dc6e16a205f7ee5
+DIST firefox-78.12.0esr-fi.xpi 517919 BLAKE2B 598654771e21d1c9964288f3c4fd53d2de6eb61cbe56fb6c0794904e8b12fcc0736191767658e9d5395ee99cdee0de56c2a7b07de16295573a4b7062d3703924 SHA512 a01cd7389cbb0a6adf05683a80b43b32119970181b0c32bec0383374e2fb4a5f767c3eeffff669a563fd6ae908ba431f67449d79433adc0c89133e59e6e67a22
+DIST firefox-78.12.0esr-fr.xpi 545884 BLAKE2B 1741066c45d77d6dfd4c33efa22cd04c343050a02e3f977cec5914729af87fd8cef2a2aea73afff9c9ab6b953d528bea7360b987ade059514ca03e72b937941b SHA512 4657093bf73e284491811cb3b98fde6b3b6fb47793a962700945f86091e677dcbb4431efa6a84b6f58320ab57ee88c0d8735a74c740ae6f21b76105740b26c1f
+DIST firefox-78.12.0esr-fy-NL.xpi 532485 BLAKE2B 8f3a639b2259781068c75163ed1a09ec9d11cfc0e07151caeaab881f75c551b1abebcc36a9c2373c5488ceac53762b911f348ff3781de598ee93e914f3c0bd5f SHA512 e816b480705a9e2ac5b46ec5e781ee15a5096f0ab78376599bbd447fc87007623b4324d675509e0115d20257d1efb03d66ee60d72530aa5c28db8d9a9afae4e9
+DIST firefox-78.12.0esr-ga-IE.xpi 466890 BLAKE2B 1642e6587825a9220424de58c5f7933402713cc8b43173247ad8bf47bcc1fe56feb5070616e29d6fcc4af66a2ff4023850d2873958082c6257656624daf73769 SHA512 fc1a6f74877ad6beb275b836f6ba1ed2b66e26170c15ecbd50a40d7cfa35b8e77b7eaea851e308213c73f57538a1fb32deadb44dad5a9d9bdec9de261c9cab08
+DIST firefox-78.12.0esr-gd.xpi 491887 BLAKE2B 86bb50326f52ec809777b1aa6dcfe3c5df6436eb0855ffc0ee7946a2266d4e70b8c596e4743be66c0d96d2e78eba74cfaacc044a4dff75dfa143899b964f3bb1 SHA512 41fe61ff05a39220faffb5c3cf131a92e00eda26f41bff0c61f8802abea179e0fb757ff74a2855921f2523cd1dd2bea4cb03589fc70210f7c6f25bdab321b726
+DIST firefox-78.12.0esr-gl.xpi 528408 BLAKE2B 7700bde64cc4ef05bbe29de4c7f066ca064c4f557787119e8bec5097ec947846d57f0a4494bc4bacb05d9044d8433db899840c7181f60b0d258290177530433d SHA512 9120e09f38178c72aa190ec1a78e1f750c748b1b5d62cea5abea3d7767cf7cd14000ae83dffba272311daecd3b811e00728f125d301de5a3fa7a78c1520e87ff
+DIST firefox-78.12.0esr-gn.xpi 546465 BLAKE2B d55ec543e9a8b4192e3d2b28f75305f9ee04d5dbab51a23edd216e20c70fd752e94567cd573eacd1727654a1e48ddd6c4640f43abd784f31aa4406769a25b7f1 SHA512 43c83e5bb7bb3d95856c05fd3a962eaf4cd01bde39576f43da4bc35e49b571c81f7baf4c84a8836d2bbfe5b50ce1c21bdf97c702511d74562e138bfe9c0e3b9a
+DIST firefox-78.12.0esr-gu-IN.xpi 541422 BLAKE2B ba3a82771dede3eb4a6971dd6c28a248139428dca3977df7a4279bd5a2028a2d01f3d078b748dc0c86923fa8677b2ebdbcfc1b99598b93d89d9688957404b3ca SHA512 62cd42cee8dc8531e1ddedfcb27e17d06f46ada4ae7be3c402badaa57fd84a3fcc70f6dd6afb1a2eb8b6ceefb979899aae1a67e08d73db073fd8f0d29a9a19c8
+DIST firefox-78.12.0esr-he.xpi 545595 BLAKE2B 8b2c65e9ecb12a9bca63694c4fa3ef6cd1cd04093e9f4da42bbf0b2bedbf90feca27a99d66652fd735f84c3f5f85e57b55734fddeaf748a8bac8212975343ed5 SHA512 209f3f6b1b2dd176fa340c65d3d880cbf7f02a850969ee333f0d98b7bf69bb2ea5a1c0dd434c0bbe06fa1ff74170f4bbb57112af072c5a045486ad9a3331e436
+DIST firefox-78.12.0esr-hi-IN.xpi 567860 BLAKE2B c6a65ab10c21bed41dc7eededef8092ddbdb0b09c6c4de87d4f0558c69c6d063595aa9c97ef3b7fc7f6fc88393609421cf5048b3e1d8130fd5c4e8361f70040c SHA512 cc2e2b370c0eabf2892993c1b97f0481f515b981c7f1fb4cbed8068fd13ffcc7ec0a3707dad53f691b5cf77816e24a8a04eadd88995daf572e34ed16ff95cb12
+DIST firefox-78.12.0esr-hr.xpi 522698 BLAKE2B 13c644feb97ebd9a5f0a0469bfb766a541fffd127fee2942cb9514404b9583c9d1ffb5eae668e2dd73190a82147fb304235f91c84fbe57c0cb359ccaed032bc1 SHA512 d5efdd70d10dd0a401d3d80976be737d5012ef33d95332b73d773793ffe567a7a447c8a65b9a2d931a4e6273c7623771b2c50a0c9424ada6dfc25b0722fe9911
+DIST firefox-78.12.0esr-hsb.xpi 550669 BLAKE2B 3a4224cf17d1faa79eb19c33922a1189604d8bbe206dd837931df509b0eab67d46ac90cc8a3464114c694037ef8896bff197d8fb0a74372093de70f765414810 SHA512 17e8bd7d8ea4e9b36ce32313792f2125f78db679218d530c4c226e8c86711a3bc79dc1ba40b66c04741a2601b4fd6bdad5d5eb732e365219fe2f2518256338a1
+DIST firefox-78.12.0esr-hu.xpi 554886 BLAKE2B 3ffed6828c76c5c51d6774653ad61777ee89943625c8ce59643f1af0df6e2a4d5dc918778c7c1bda9b3f72cce6fa534221d9b895ead11818348f9c7a0fa1bdfe SHA512 df432acbf507eca5bea458ce545de7521719ef1392a91e9717d538dc29d83135c9c5aa8bace1ca08788672eab7974d35883a4064d443aa6404cb408db784d77e
+DIST firefox-78.12.0esr-hy-AM.xpi 588981 BLAKE2B 7ff31af1fa503573f59ba57d072a24cd7ba8185a28256dd66c3e176ba21619b4175d4b40e3787c76ffd7944a8da059da588167cd773e3d8d5643e95e1fb33930 SHA512 3169381fbb21cbedd115613fc9ec96b1fa4fc9e6bc819a3e94134a05a8ac14ad5f2241426cf928d3ebdb3a48db8e49fd1596ead5a8cc40b9ad12385e6cdfe604
+DIST firefox-78.12.0esr-ia.xpi 518808 BLAKE2B 769860bd1a8940bfa4cff65682501db93e653facbe4c1ab1ebc4068864885266c0e203bbefe58f477e1fb3e397cb5ed7b0a1fdbd840bca9b89f7e2bda5bff705 SHA512 4d02668a8e6c30fbffe327692a0dda509daffd1f5eec08026f9b3944825333b0a38d3f71810220369b0bbee5f4c0082eb6d2fbbeea2aec873de720c4538e49d4
+DIST firefox-78.12.0esr-id.xpi 509561 BLAKE2B fcb2f7a558f6592260bec964de149001be7078e338f4d09446b01f1fa0d196252d2ce2fc1d2ffa4ea0de45d492323b4e9bd94ab268baa7f2f3f9c91aec7514e1 SHA512 098bbe019415541975e375f02de131af3a50b6ebaa3c39399b14b907e67740a28dbcfe4b15f0755011c5273504ecf74828c65c5d219b7a3dd7d9b9bd9de19179
+DIST firefox-78.12.0esr-is.xpi 477012 BLAKE2B 5bf1cbea09a85303ef4d3e25798c94a3a3e23d770536ad08c645490c042fad85f1254946aebe85c5388d54115d5c9bbc30c9c1ddf2e34ef40bc2b4b4c8642760 SHA512 fb385a03d574a8d280a54c977be14996d33d46d5b5495368e4226ecefb12e479bb57b21e28f3c23c14f4d1f0353c725cea3ea5e3e3498e4ade2a91ad59e0f847
+DIST firefox-78.12.0esr-it.xpi 449807 BLAKE2B 0b2b52d50fd220c7d250701bfa12ebeaa5863c78e8759948e481e22ea76cb10a406b2b32135a73f23155dd4c594002db777ca9ff4c4a64c0b87e642bdaf68c81 SHA512 b586eda2043774edc5008bfceef5f779d2e468f7304eea9bcf2d956078d95f04dc6dc49ce996496a131bbd366bb6b588d20b914ee393f175c94bfc52713af199
+DIST firefox-78.12.0esr-ja.xpi 578200 BLAKE2B 5178f4003c7ae8806b52223d1e1b599a693519f9daeacd5532c8dd6fcebc7cc82cb5539873eb4395dbb2a22ef6da5d09a9d9f9b0d395c7365fa1e6fe45e1b0b3 SHA512 268afcab72d2a5406b77d992ce005e336520f957bb81dac3491ea74b2d9e2906aa34dfb7f7ebb70b290737382237481bcfea0ce9f4c3316bd3c76f9698661e07
+DIST firefox-78.12.0esr-ka.xpi 579082 BLAKE2B ef8c55d39a2aa255eff85a7eb66f2a2d5c267948887fb9e975ba86d323518d863122bd5d48b2de158f35b084f54d6621189f4cb7df44dc271e85ab494fe113d4 SHA512 8db2582ed315e846e6eba468fb804cd7940984edf29a7b992a96eaebdca35110465457d55eeb5ba2557b4e868a0b0b600ccbb2023603104d7c934f80e022d951
+DIST firefox-78.12.0esr-kab.xpi 539732 BLAKE2B 8f5a140b2d2abf4958c6e437f26d49e6ce06511ac798505a2a7573010bde510ef523fa92d809e6dbe7dafe1e370932fd5db039099b2c619908d095d94b470ea5 SHA512 e4455e2031b86ae7b0b76da7b90f68cdec247ef9cadda2cbb7b86b85b80f296418cb3a034c6c630c9d62c056a35f0010b0f58ad53e634f7db68e4a4cdf09fa6a
+DIST firefox-78.12.0esr-kk.xpi 593260 BLAKE2B 68eea4cb0f257d4e1d0771d3e06324d4a556ba0c063a3d17f641330b289cd85c677f01c644713a882fdf3a94650d4824957dbebea37d0d87628c872c8f77a7c6 SHA512 e216c3727e7c1ef3c04862c207a9b22ee18202ace5dae589d19735e82496fa10560ca7c5e97750829ba7b9df57f0695778dc60794c837710be2509f139783fa5
+DIST firefox-78.12.0esr-km.xpi 527366 BLAKE2B d166e62391f2a93ee7ed06801bb1ea0d702ae4977c610aa013dbe7e21d2f7d243ed969370a8815a4173b5ed691b375804632222367e8b9c537ac7a03c3768e39 SHA512 ae50dcd81d874cd8802270903f4db23d7fac0ae9e913a674a2b487062cc901102723b3155e83a423ca07eb814f75fe5ab39b83ef36e203842c96af7d0bc587c6
+DIST firefox-78.12.0esr-kn.xpi 506748 BLAKE2B d753d31da106fb6857dddb21b95f755d8d8cd24f02e58a8d3b189530c568bbc94942d62afcaf49f3c82b209baeb455252a97892482538564c0986408c1fff3f9 SHA512 5134e70ab4ebd1b121a063e918924139a601c86af006d9e8f3a5025c68a6af550319511b4f032eda1c2a45fd7e857577d3ad4b7a6f86753b3f84c065e200ebf7
+DIST firefox-78.12.0esr-ko.xpi 567527 BLAKE2B 14b9d67c582ce2cacf1196ccfaa9f612e98547f30f321000650978422a2a0cd33f9c6f9f135b289baee75f28f3c30675ab486d37d4b028c39da9b26466a36837 SHA512 36bfd233884dff29ef3a41370df17cdd1f306b1b35bd81e8d2881c09a5f73536f834c6bce7f0b81b3b89862b19fdd507ce321e2b467de20586e829189a74f90b
+DIST firefox-78.12.0esr-lij.xpi 475236 BLAKE2B 89d82e8b109a625ad2b7440a908fce782b43e7bbc1b58b3c60a652334f25b2896640e1b97bf541c59cade8c6840425d6ef0cd9c8d8fef3224f77184f5515b5e8 SHA512 78b62ae948e65b53573c1c393b52242129e12e1a30dfff36ef2d435be0466c14cf09f28dca92b7d6ce67430a6c5f057178bb601d3378036db0cbd1ca13b5cc5e
+DIST firefox-78.12.0esr-lt.xpi 540687 BLAKE2B 36f07f0bd85470537f06e6f2a40ad5ff5143c256a44f6ee332caa4ff77f2dd87990c18368bd85ece775558f9312f3201bc30ec3b354ce3d25e822e6c98f6c938 SHA512 1df7b888852aa29de0de945e1d901a18b35537e4ab9ff9807e9efd3ff2c385292873862836bd40ad8eef1cfd5f6aa6b2fe7288334e2ee295ae12cdf29e6a3eb2
+DIST firefox-78.12.0esr-lv.xpi 467454 BLAKE2B 2eb95094f103059c77dcdad427394b70c26033b8fe9c2867750829b90deea9d1ffec738770fc0fa23ce2f84b8c92775307fc3ece15d2749419270ac1787e2d27 SHA512 4517bf89ecf9fdab3b68b58ae53709b327b38f6c546aec85ca339427e1e2f4e846b91f680d7dd59bdb935ad9c81dc2a85bb5e2803fa70a077a10fe082388def4
+DIST firefox-78.12.0esr-mk.xpi 460012 BLAKE2B 01b91f2059dea0e6aecebd98daf280a1d299a80d7777cd0e363b60cebc1f6bab04ae8cf6c666bedef33b9246cf623e8074ac9eca26d7a325451b5e1c673e9eee SHA512 641986710a8da7c4dd334039e403a8f42f0f143752555af72079246e001e8a4d7b8d013e900fb2b755ea60a2df2a748cd802398f694d6fb9e2c1cc61ee118f28
+DIST firefox-78.12.0esr-mr.xpi 541569 BLAKE2B ac084f640e23cdd07f93dc3b68d61eda67815c70f13d616d8440553f06d4f831d7815e390c88466d5fdff4767efc61196971bed750080b7940ca53ca76e5b26c SHA512 98282c85887e71dcdc08be45c46baf8893e9818880ad7096c57d946c2e08808fad74222c907c593a6f1d67f50f1cf6fa65e158f2379b3ff2e45c641c8975ab34
+DIST firefox-78.12.0esr-ms.xpi 453061 BLAKE2B 0fe96bd6db5f8f0fb9423a659a052a51a1bade98d9ec613efa29db87b6483e792ddbb6d6b6368cb7d9a1f52be42099d3fb927a4a438cb4aac32968089fac2376 SHA512 122da1a5bd6c521fbd93657afb26a734082f23b9e6e3d32c28345692c86665fe1310c74bebefdf65715451632e4f03bb3a0697e010712da7b90251e3e7a4c9ca
+DIST firefox-78.12.0esr-my.xpi 526323 BLAKE2B acd832cfa37ea57d3f475fc7d83747dedf76a81d3d783b83fc1dce42949e0cbbe905390945df314b14d67a4ae8a685abf8c20258bcb85bd04104faaebf18bfa3 SHA512 92b0fe9a657e3ca85d9b1c81d3435d94028e041098b7e1b52a26d4e9f378319cf70e9649585fdba5dac919c8189289394347466dd8be0492f05239ecfc4e5ca8
+DIST firefox-78.12.0esr-nb-NO.xpi 518519 BLAKE2B 3acb4ebe5add5433b603729a4afd3d07b5c611b14996f4723c865a4e4f77e77c7ab7b0a00c697190ad52733323a8d9807be5cf273bf4767b0b823fb0efc1be43 SHA512 9f1a0bfcd1c668ddcb7ce1ea52ce25ea3c490fb16ee8e4e475668b1e3a7e2e10db7dc36fa118b911f7b3b7e71054b664589763cb760232028552ea2220415a48
+DIST firefox-78.12.0esr-ne-NP.xpi 483409 BLAKE2B 24bc0e9eaca3055f2e6ed764b5ab230b161404694a7cff3c0d61de5d742fca558d894f72b00d8b9c2d7be5b96ea88eaf1656e90843f62afc325044fdc80bbd4d SHA512 ee4af731da6b770ea503aad20900da86aad7ebfb9e4509035a0efafb658eb62ef6633ebd6facdf38404dc2bf6e656eceeab6c4e358e472b7a220d7419ec28bb3
+DIST firefox-78.12.0esr-nl.xpi 526209 BLAKE2B cc7926d00063e84f4a9bfba8719d276c4c847152da283f0b36dce24cc1ab1f0ac0bffe29ce574362286c664564380e88f1575b19af5121f54caeca02f79a132a SHA512 5be0868df240c3f2bc5f62d62e33557bb5899d4afb8f775270a2a7e8d3cedd62b06f1bbad6ee4b42efe47faa974d2af684a629b910ffe3aa11877f0f0e772515
+DIST firefox-78.12.0esr-nn-NO.xpi 520165 BLAKE2B 5c730388fd83f76227e016a0cec35db136d4549105c7c55182125bbad7ed7b6797dab79d5a56cc1edb06d04cc6cff6734b9fc45db7c20b2efeee201f654d8247 SHA512 571606c967cc2d8343a9cd144b4c2b4f8739d43a899a60674d38822a8d8c488a6f4f38a3d7fe79b32a0e2c70b8d358ee0b6229bff4eeb16ad75e452629d78df6
+DIST firefox-78.12.0esr-oc.xpi 542161 BLAKE2B 56862a01dc976698fc1fa822cd4a540040cce2a98dbd8c68822d4d02daca9c30c785f2df4a4efa525f971aabbe90aa2f8d499b4b60ecf7fe064e4902a710742d SHA512 ebe47b83828bb15fd17829d5a741adaefba99702ea6642d0df89767ac0567905e0ba4d7c5014b453bb0ad235c317d1d9908fa9f3c956221d2330adab6ff09d06
+DIST firefox-78.12.0esr-pa-IN.xpi 580361 BLAKE2B 5708b864aa5bae9961c5aaeb75bc2d82e118e9ed4e5ce60b2202aeecb2ae9a55f3c2e5ea497352c7c5a5310be08c42ea7099199ccaa6ba5de5bd3ffce26f7406 SHA512 3a539f44c67f97f2e4a1c9cc29934e5135e241fe0adfd579571305baacfa545e602f78a2ac183086add7df444256eabee7e3ab32a626bc8d3ccb46d668831094
+DIST firefox-78.12.0esr-pl.xpi 545587 BLAKE2B ede715662416623631f16a1f3ded4a9beb8483a6155d541ab0d316902748295025fcc5a58a376d437ce496a0e23bb67772acf83b6477f70b0d0006c2ef58f5f4 SHA512 426b6385cee5ec7e1fdc97f8ebab31d9d3e7c7228cd791f2653a6e153c9c210e25ccb9040fdea89779664e8469958a3fce2036e31c00a51d48ef97eb1709cf85
+DIST firefox-78.12.0esr-pt-BR.xpi 527570 BLAKE2B 51dc9cf77c2f98cf5ed9045d355f8045dfa9bb3008dcaceb820b6df22d15e3fdf2d7fbcad986d17a93541051e863360786a3063d87233a9986f3a51cbcb821ea SHA512 9475a182f30f5124e9480def4c4d481ef744e9a57dd44418d9219ac464a9c52c35b50d713420b5957d3c18ac0b278ff0e9fd7ebbc8e7d723e3e54b697bf44786
+DIST firefox-78.12.0esr-pt-PT.xpi 532051 BLAKE2B 0296ef68afc434d5f382fae28f7d196fe535370fcf3aad8381fd485d52337e1655e7e175a73f69bea8f4ec9ea51c81f616fe6e01d893d43f37ff15a32e72c5bb SHA512 63cdc360ce7a950285c9ad2a8fefb15e1653db6cf03b5dc7ef94113be7a9abb79277e7a483a9969e317df5a80c0a780b480e36ec4b54b81e061eb6f8d78228f7
+DIST firefox-78.12.0esr-rm.xpi 526719 BLAKE2B 06fa9e1e88a49dff5b9e2d3a8257aa04f07f53761f9786b41f837315605c7df7d65c99a1d7faefa9d70a205801ef3a6de5e6037c3ebe740bbc848d2cec29526a SHA512 0562f349ff89dc6d58449ea84be5b7a3729b6a0a9da10eabe3e33ae0fdd67a356022e416a9164a76ee2b6ee53dafc683a5005709674a78c9b533c66cc45d0275
+DIST firefox-78.12.0esr-ro.xpi 535573 BLAKE2B 6873bee12b50838cf27b91c1d6bdd63a9e1cbe3c63e89c79ad2b8828f33c29dd95915cceec5fe42a3be12f8c1f59dd0225a9ace3bbef0d4e8cfcadf9724fe6f1 SHA512 73abbb7242568011eb39662e15ec2d63fc43fe269b21f82227d4b9a7eb89e9b3a7cc6ed9617600365360636a8df968cec87c966fd501ef1b4b12d276dd11c5f6
+DIST firefox-78.12.0esr-ru.xpi 614597 BLAKE2B 736786d92085cbb194dd371aee0a517ca6a17d9f6fc0db45e653af2052c5f5f39fe267b7ea826d102c68f699e991473474b0398175db17e3dcd58963a680d5b3 SHA512 432e4594e3c6446d9cfd24089a70960da19876b1e79e30f736471ac32f5772bce10c6c58be70237963174e828bb0f9ddbfbed2a314376d248fda9fe7d1d33f50
+DIST firefox-78.12.0esr-si.xpi 492527 BLAKE2B 1972bbf48b423af6d7642ab712affd8be3d2d9f22ee6fcd4d0ab5d79b34338d73bbd0f53f3809cf9a9c4adcb7a65a30ad5c751a8281efde29396e5eccdf49b20 SHA512 d223b49e703f2e4a0f26dee7353bbff6e865659abcb1e13dec3d2904e3c6a6d3d8c83216c038e425a65752e82b0ebe96368292f7d1229abe77994558394e439a
+DIST firefox-78.12.0esr-sk.xpi 534223 BLAKE2B 2b5e1c5e6013b69a7fd7bd47036c87fc12c4c53b8c3a8c2620dabe82594f4316dd71a038a47c3135a0b87a87cdf702ae0540f58906c0f6e0b181e0b9f68c2c4d SHA512 a3db60cc1d983eb7d1a3e3db671d82b80c657f294628a7d22652de82ed95ae3f149b7ff1e196d25fd6e25689c75c62b3027431fb33682ee9e7cfa5ab5ba529a7
+DIST firefox-78.12.0esr-sl.xpi 520944 BLAKE2B 9b4024810e61b3af52c866ab4abbcd660cd5da7a36245cfc134afa00e5e503edb22987c72a3d4180fee4aaee30549614063b297dd1a9db510705a665e4c59096 SHA512 69c1f56fcc966b29746f85a180e331c0646dd430f53cdcfcae3c958077d0bdc0d6332dc3c15910fa2e9dda6809fbe1c3982c9aa1f7bd7db6fcecd9d2fa4d99ac
+DIST firefox-78.12.0esr-son.xpi 424572 BLAKE2B d36a4002006b7c7f2a259e6b40bb4f385a2740b4e8ba9d3bd7b278baa24b0a1e62243982f34819f17a6824cc66f5ca4e7f32a355291ea33d8865172eda58cb69 SHA512 3a412d3ff10a11b9aab2751f7b15617cdfc4297d77301ed054119d4bf8746ebc132067e3dbb4100884de735d83f16ad326b4a7b4cabe150da609d8cafdade4a5
+DIST firefox-78.12.0esr-sq.xpi 544911 BLAKE2B a06a917f6dc1c3d0ccd712b3bd2ec1ce54c801c212c15da968282a7e169399690e7530b5b553dd11d3548df95e676c4882d54d394e593385a42c631d128be9ab SHA512 749552c95096d15e7c7eebd680dcd31d2565383222e4ccc8cc3fdf30b4536749726a5a6813c4ac665b57711265b1686073464743ba788d30f3b832c5107388e7
+DIST firefox-78.12.0esr-sr.xpi 561391 BLAKE2B c34eb03fcc556e2db09496931bd2d08ba9dc8a4ecff89ca03e19e8679deb0f4d03ffcea9f7d67eedb292a0dd4c65a66345eef45d5a284c72663c33b1bfb1d50c SHA512 8b5110e43de2c7afa4e6fe152c768ce1eeb3e21938abe34e27d9dce69f890ce3b3d90144639642afcb5c3a348ded6c412c7e48594c95657ee33275b056754868
+DIST firefox-78.12.0esr-sv-SE.xpi 529708 BLAKE2B fbd72399195f0824350510000c07ab0b8595d3315ba7ad983d4147aa86955a0843b5086046cf6d80bd8769ee7a21240d368b2ffa88194c2c07cfef55aa6adb98 SHA512 efdfa3f39ac1ec45d736590fbd5a36b81c5b6996e30129d2a7bec93f8d90fd6db31f997fe28f6dd430e10d9333edf5f5f2bbd72116ae73368b52522716f62b19
+DIST firefox-78.12.0esr-ta.xpi 521544 BLAKE2B e776dc5d8b1e01021a99ef84c94721342322a44399b689101d230881f9d212211e10a842a68675f2e11ae016eac93f061abd553998531b3c0d8a4f9e9f163680 SHA512 86c6631376f95e6c08d4e1d3bc0a2d5adb89cac885909d1f6a3b6ba8753d8d432784442aff27c71a673b9e0392b687e952284cd8ab3e36d06ac52e8a2ca55779
+DIST firefox-78.12.0esr-te.xpi 558391 BLAKE2B 2e0b60ebb90905fc49a2a2a5813aecc763ff598fa96f5af9f3f89ecde2914fff793d9029df1970cacc18a9b078b473ce62b0885df7f4832abeedda8cc03e520b SHA512 9058cdb3773e10366bac36dc77a122f4e6e83b84374c9d00861d40d28eb241425426644270eb31eea8098f8fac8b17da8db67b7f266bc7f6e86eb4e94863ea8d
+DIST firefox-78.12.0esr-th.xpi 592243 BLAKE2B ab688f807db0004f9e0de221079b1d107f5202686316c4a3c9bb7e899b057ca8682f29873039aaf9ae2f6cde0bd9141efc51eff00be1292df6ae43263dd80ff7 SHA512 310a04fbfa68f4f93becaf6baf10c98741f802556228076fe332672131b04903d35ea5354719a6b05a672e3b0b5ddee984abca97c62bbf198ac42b8ab2ed6995
+DIST firefox-78.12.0esr-tl.xpi 521109 BLAKE2B 4410a08723fbe30017adce09bb067712dc81580b6718ea6a9ae59222243d279f7418803fd624572cd5b543dac8922e5cb4d1613c70fc68f7ca9e09268c98ce97 SHA512 f7ab25435fb1a5c0550f7d15bca7ca93a8866c549756240ff6f7aabb843b7d780caf3b6fae8ab20685c03c65e419f88b3b4f6551d6524dc9ddd1d7cb857b92c9
+DIST firefox-78.12.0esr-tr.xpi 539884 BLAKE2B b2e56de6ae0ad00cc7c52d102d291d8d978bf0c24c88cfd5a6a9b856b9b31b40bfb6a26f709d51c848422c9925924bcb94f513a97d413cc33b0046d4cca42d64 SHA512 2eedae3645dc963a6016120007a634a0cfc4f1b38d27dc530340b6e8b8312c4d3a53de1529924688dd9d17b735cfeb27c6df10942dd72c2d138d35c27508bc25
+DIST firefox-78.12.0esr-trs.xpi 501218 BLAKE2B d9a566f1c0f5a5dcdc99e9c6b8e5fcd2b778b7589a3e2b5139b082189185d97f8dc7d35edf4a6980c964624d600495e902b2788dbd6b4359ec6aa45cbdecc744 SHA512 5faf29b0ee329c6dd2822491debe57c4f6ea8e6ec4275f25229a074d4274a6a843fd71c51d2714f44c07067dd92ac641548666fa017da644c300ff51ecd67588
+DIST firefox-78.12.0esr-uk.xpi 608585 BLAKE2B 96dcd88731f6ea3c9bf8cb1c0a6c10e37bd3dc5a8610a9e52b8bdc493bd898cd28c098e0850563d775f4f9c9e596f4b368baacea8eb9848d6aa3e428fed52676 SHA512 8d1176dfed8fbe3023fc850b2171e386ab6f2e1c38d3480fc7664291d8d59bfb8da90fc25562652e724de08454d3e2a57f537e3217c6540b75acb85db2de141d
+DIST firefox-78.12.0esr-ur.xpi 557951 BLAKE2B 201bec421aee0cdb63d211de89da044e5b6250c318831d1284dfbac2096404b9ba77b0ffd2b99c08653f9cfad3770b4045e90404eaa0e5587720c2adb8455fcb SHA512 d1bda9bb3207dbe654027175883c11cb9a82c11c23adee9a978ad5a6e9d5317cfaf0e87b4896c3f8ede86dcbb525b43be03218c2768b646023dad9a0c5ba6049
+DIST firefox-78.12.0esr-uz.xpi 477555 BLAKE2B 986bb748a2faa8b9a0aaa5ec874eea0a410502643ce71ebaafaeb184b97d4c4badb818a280339cedf6f401b34f79166c14dca08dbb8e714367f674b17bdee34a SHA512 1770757a2c1c3d9197ed08d6dc6514e8565292e1153c2c6d810ef299c5e070df1b67fb5996195541e880c71a63bb254905cd217f2532cbc7e75369241530494c
+DIST firefox-78.12.0esr-vi.xpi 562863 BLAKE2B b0c80866ab862e0d9d43306e897c8b3a06df6a03d62de0cb186b08ffc9307a68d17b361614046eb15388258af87938c93df9517e59b8736af2114e46a7a8cd2f SHA512 ea8aebe03949c8a364d0b47196bff4dbeff1eff1594f8b36dace7c6d401c3c353ed80bc89bdaf505f2b40abcb7c9c5ff13d38748f194629663f6e1cccb7c783f
+DIST firefox-78.12.0esr-xh.xpi 427839 BLAKE2B b6cf89388e45ca74b4d3042f9bf30535cd26a42aeda03b03340f2779ec0fe177653f43ffc3a6fad9a3ed98049950ad18b05a76b043d91ddad40f311e065fede2 SHA512 c146d9d5140ee3023a749d21bf4645e07f0ceae8f8b9d6ba91dd776c57e69b1c56e402fa3ec2b1d8da4918ee60e82b423c9994737e288d8a799c8c5ab1119116
+DIST firefox-78.12.0esr-zh-CN.xpi 564771 BLAKE2B b745ddf8c8ad7686e5ca7142338ef4b2f2e362874d9b087c4f4980f4d9e96f076bb318e0782c8c2404c00e71f585aaa76b26da0e369fb02b9121402b5471fa06 SHA512 cb707c11c8c0554e6255e725ab5c68f3b15c2d34d85f84fc6ab4ee7eae83fa91b35be282d592b845f09539ec43d1dde8167bad1eb24b86adbbe236c72854764a
+DIST firefox-78.12.0esr-zh-TW.xpi 564742 BLAKE2B 3d4b211b35c9aabe2c610b621c175bcfa4fb0f1ba4af607407b9002a475407f53cb8f2e7250a96fa93abd5ee74bd3ee5b0aff01a91e45ca7211fadb2b03e5e1c SHA512 a241c3af98170e0885b63ec0c140fb1ad7749a5bc762b7154b77282d33bbcf7926550182d261e3ac4b0084d4b8d98b30111dc459f3cbf2d9ccdf9f6b811222b5
 DIST firefox-89.0-ach.xpi 467444 BLAKE2B 7620cb550d3f7b980cdf45ed15d2b964fdcd125c794a9f2b78892dec5d0250d15428ada892d5ac75223d6fc225aaff0d862624b7edc98e91549535b0ffbab909 SHA512 dd416ae0e9097a293acc6a70b2d857cf6b9ad65ff1d54d51c751cb938e7e703faf117d037ed3fc84b2e2108884369a803f7a7745c86130682ddedd3cdac81de5
 DIST firefox-89.0-af.xpi 431273 BLAKE2B 5bcda20dbce7e0af3afbadd46406250647f13b43fb38fae5de471e9c993e3f1a0f5e562042ccdf169ceee1796f94570b30560012a27dd1f9a544bda9a0407ea6 SHA512 f18b464c4f1db7e6a28570023ac503fa4daa851125d3570649c9cd02337a3e08266295450c9c9d6a31d93045afab58750bd2152e4c94133cf75e29d638b66559
 DIST firefox-89.0-an.xpi 515265 BLAKE2B a1495c217bf92f5861a3ce8f6f1d3d5e43a6c48a3769e9b0280a7643badb649d560031965eb469cfee466bd75680c6ef5004ba3678b8e1a337d987d02b7c9acc SHA512 3e86112841abe359e490a415eb596a5f2b50e2ae5d5fb99f0d608a54b03eb35ef3986a6adc54046bbf89163ef0bc17862e90f78ebd18bb6a39bb111d05216843
@@ -386,16 +481,117 @@ DIST firefox-89.0.2-vi.xpi 587754 BLAKE2B fef2b5a71876894290dea36db697a604992763
 DIST firefox-89.0.2-xh.xpi 431446 BLAKE2B 55de4b86003b82a1f6c0263cdd385f0bcb661e977505b721712553a527017970beb1b8faa15f192549780c93bfca6153c89cef8b9976ff2dbdcc9f05ef039087 SHA512 075a0b90852a6f476b2ca3b3de5d26484e34943292017c1e0376f64e278cdb750c8ecd337a07138f97a27e36d85b939e0faa035ae8a9d68ec9adb30de83a292e
 DIST firefox-89.0.2-zh-CN.xpi 589249 BLAKE2B 86579e39b1ec66fa2dca51d662e4fc437e1c8f9433fed471d0a12a8b1209c4060f2e745d7eed8ef81e7e7762eaa3ff19c45c85588aa69014230fa538cdc4219c SHA512 2b2fe05e56525cdf594a781d05626206474b706db9e89ee55531e43cc2f9161002e9286c50497d7e6c608978216292691f1944292c5c4da6c872b44891c818d1
 DIST firefox-89.0.2-zh-TW.xpi 589746 BLAKE2B a350222846df22392e9130bc12e03241ff7259bf20ba3495aa27e593c2418af4378bb7e6e526cd780b4a4c7ec1b35ddb87efeedf9c0c94ca034a923eda3ad3a0 SHA512 b6a65deb40680233a1724121090ae57eae2b2764ba92af7720cd4b185b9583a9b68dd9a87eb9e8c3bf563b7037cc3ff33bbe36c8a7facf624b1d75dc785032d3
+DIST firefox-90.0-ach.xpi 467563 BLAKE2B 32799fb03cbe4c5566709b2109595c651f47095ff6996d8fcf751a900d691232f705d01cc3e5ebefb3854051702ec8daa0829ea7a1c35fa77a3449292bb88af6 SHA512 c623c3bd9e1d33aed1c15eabbb1996f3e345385cde7c0f07b7f8d08cc555c6cc845e7253a7d23c85616c1d82ebf79785657ecca6d7ef2177c76f73b619c7aa28
+DIST firefox-90.0-af.xpi 430689 BLAKE2B 3deb87157618596702035faed14d3a15980b2e02dd70ed29b90b8583084649b853aa71bcc306b8f2b25b17f8143cca4b9faf30913a5e284399c1b972fa4324a2 SHA512 8be725c9bd68647eb1de148682abe62220d2314a177af5de4986cc3b1b29b57204461aa131c8934bff6dff01fa482eeb454ff5b5779b1f059a66b3901a5dddd4
+DIST firefox-90.0-an.xpi 515442 BLAKE2B 48bfa7ee2a1f7bc1fe923d35feeb0a822c3fa576c70eefd9dd2b422a8d1140aefa8ace259d4a43c4161df62b85a824e402839548560e06655e8e9408ec9fecd5 SHA512 955f6cdb3bbc460f35a937e756e94c27336bc2fc03fbe9c617fb0a1b078e60bc21aecf5ccda5c04e6aba5ebe8572ec8896dce160e5454c686732cf7198af4c62
+DIST firefox-90.0-ar.xpi 580212 BLAKE2B d205daeab110cb91d0d0e00b52bc91e0bd50e28be89e09d3ed8a66562f5c0765e26ad085fff82cae0597bc8db14ac839be9714d24274ac42e198939dfc912942 SHA512 483e09e14a2069fa894c59700714330f6b6f71079a38375286e1d6de492fd8d06470447394db0bcdeae1f7f9585b0af3a0d13cb9ccb1f5048703adb5f2cde0db
+DIST firefox-90.0-ast.xpi 507901 BLAKE2B 53b3f9cd8c2ad1b0e92fd84bb168be6bbc5f9c9812135b2a07c26eb35c60ef96f2ea08ea5543edc6ffe8ae4feabe40d580bebc3d5b754ed391f77a0cf9e2c78d SHA512 ba6323fdb588370374f7ed3a119202bbc164efc6e880304b7684e3a324295b2e2f6ae69a7ab475c1d0c06140fc67f169189a19dd99c912d065aac9d0010b8338
+DIST firefox-90.0-az.xpi 503451 BLAKE2B a95953ea4e141533a6565194424c52ae18a256149ee5f7cdf1ae96b445dab707c91620a1c24052bfaab698bd9ae98c5b721ccfe6b931e9aa970ef50617794dee SHA512 a91d46a1e25c47af6c0a35e137cb30792e01279ec916b37819191421f9da3df89edbaf1d78bb66f2cc6bf097a231dffe99af17ee09b9b2882949a42be868c2ec
+DIST firefox-90.0-be.xpi 636663 BLAKE2B 137119942714f79c097328ca988e69fd6cf43f3fec8660f69931b0cf3a68b07d5b556ba648d83fee4d0153c5dd6b9996799b7af971477ed04b91957d6629d016 SHA512 a5bd4b5906994e348dc84cf87e536f60d1ec2de6e3ac16419cd5bfeea07c7ec26bed55aa0a7e567fec57091807c40b7f83eb5320e62f359108229ae6768d3e55
+DIST firefox-90.0-bg.xpi 590433 BLAKE2B 27bd2a13abfb6c2b1bdd4c18fa38616ee13d40b8f2ac654c0c4b943cc6ab7d6faa8157ac56862ae103f48efc6bc92be9c6b7143fec331651c3bbd46f4c4e3ae7 SHA512 7fa0da1229bee97bb794ab738f317dc92b944be545493f650d70a2df074c841b930aaa7b30a0ad31aa221bcb574c26a66a866b9b5d3fc71ac02721b66a3f8d38
+DIST firefox-90.0-bn.xpi 579581 BLAKE2B d71bee924b6b5ebad242afca2c2c6e3fe100d6ecc0ebebd1e1c92aab5f0c0186f4a09e36b72965612f19e5cee33fed0295fbf563b1be1b7c24893da92bb27dcd SHA512 54d35473905340f350238b0228ce6062fd297a8e0e75a2b810c8b23f4ebacbe665c66c41edb3399abea54da0764e524269b82b9971d164b68244f942bfd2d38e
+DIST firefox-90.0-br.xpi 537482 BLAKE2B d8338903de341d8953cc26e55f24576542ce260f176419c58bdddfeae8fd820ad0ababd0386b865833fa6a8f7ce89325b9fac6b440c09e9319ed30dd7f0ae925 SHA512 7f440a95f5685485f1f044d8a51c7f2f620d068378326f2d4fe5f3d7064a647a9a1a8766f76e80044d1a0d257571dcd1d8f4bc9645d4b97d5afd99bcc4006aba
+DIST firefox-90.0-bs.xpi 472329 BLAKE2B 369fa1661afa09732076ba20289879b40182e6a557ea5e8b3bfb28b6b80f3105d632635c83dae7dfa81848124423af48063378292aa62ead619c8efeba971ecf SHA512 93d02208fc1f1e52e88d4fce0203197e4f408b756c99d9d2afd87f8538d62d0d28b3b30924a5227afb9e43aafb1b0e9026e8f62ecc5c50a6e02ed3a233f8be2d
+DIST firefox-90.0-ca-valencia.xpi 548463 BLAKE2B 675978a75975c1675995c530a50acbc69512cfb01a6f3e0702aea62a3485c7300914e0a73028751c9523d9ac04c446cf64bfd031750e0b4bf5a2ed1622528206 SHA512 bcade267cfff945acf73bc25e54832860fb67ae4c5c6aa2b6b4bdca8ed96f51139bb89fd3b06bec778202c1c3b742b446df5b70fde360340cc070099bf3dc4db
+DIST firefox-90.0-ca.xpi 546572 BLAKE2B d31c776a9eda8701f64a3098afc2d7a8dd978f7f9cd65227d1fec33ff76f9ef4e298233f01f9e5f4cab95655b45c4e1fe0af18fea7b1a0f85aa6efccb9aad997 SHA512 24d176445e59841bedbc23dde5a63444ebd39ad34267bb0b175104160ca1307308f623428db91719c99b54e5e7ad6d33954e1ba55078bc09ad4dbedaffb02ce5
+DIST firefox-90.0-cak.xpi 573760 BLAKE2B 5f0e5d496b3d63013370df4711b7c66755eb0fe27313efd0631902633b37798bae92bcda2e80a438c884b1c6fba7b31a8cd9622196b40caa332feb682adb90a1 SHA512 3df9279d559302c71ad08b23fae14916104d7e71e1d526c0b9afbd010e251d20cdd4be1d9c02003518416521100193ee4a540387fff22c05d856f00b644815be
+DIST firefox-90.0-cs.xpi 577416 BLAKE2B 45c175f808c506bdc127dcee988c8b9d87f5937f1fe2715131a5c61798bb36a0fc37877ff7b1c77d05809d2cb599d26b76c171c18992b0c6800cf42ae3ca610f SHA512 f56a9995af925c012aefdbe6b033c5d0462261969fbdbcb5fc4df4d52a5dff4195966807168e0980dde23d1019f76261bcb1579f0798f518bd6a038449ed1ce6
+DIST firefox-90.0-cy.xpi 554150 BLAKE2B a490d71b138ae067a38282f171d7a68a1a05bbaf3a48686e4d82e77800e8e7b3064ee2aa1710a844b58cfa81338560099556b4380d73705b1691194afc896d6e SHA512 d31a25aecd483615a92c1e49f89a144b95b83c7824a768074d3f459dcad1f0a21e26a4e84defc02b107934cc1216aa067902be1513567af2517cb4e38f7cf2d9
+DIST firefox-90.0-da.xpi 543825 BLAKE2B 6ed1d88c459ca069111b03c3c989a64e9fa1bb93e25566b88a01f279bfc2488d2d26ace09c39dc6c26d3dc2382b26681c02492738bf25cf6845b679a44656bf4 SHA512 bd378ab445b1af8e7f5ac84158ad195ed5af17cad78102581aa308a53dccb9ece7678a744ac2fa66a27aed57f8648cc00a805ea3463926e24f111b5bebfc9a45
+DIST firefox-90.0-de.xpi 565902 BLAKE2B 4d4c383c0641a8db0444154d1dedd4bde0bc248b0e4f30b808da0504af397822beaee86e7018ef508f8f157619323e2a2ec2abf208215957b82ed3dd4ad0add0 SHA512 56378a0c6339e2020b43b5b00bf33682c1e9bed838f3018875b517ae031e2a2be041f699607ff1799897898f9025a14383eeb85a2e02577b06bfe3d21c862fb7
+DIST firefox-90.0-dsb.xpi 578727 BLAKE2B fa48732ba44d60039b66432c40a06a024a5fb70e671dfb4fedf44190fcf4fc70d471627e21000fe83a526d80ca303e936a6caecfe4a858537296bfcb4bd92366 SHA512 3a2dfec000f1767625a2acf64c7235e393ca5025d40b8cf7798b314fe38eff436eb0282c723fa18dd472249d7161eaa70df237b243c129515e67ee77d58e2e8c
+DIST firefox-90.0-el.xpi 653307 BLAKE2B 316f9167cbdc85f5d3c4d68d03e60f96a39b2afad05b058488427c3eca2eb3365575c3593af1bef3bbfc9384738f5f51f14ea1bceb20e922c69878a2cab72062 SHA512 0ab23944c3fd8cf5469d4735885957b3c0d60e61211bed09032eb0c7535f342ca15f1dcf75291c3ce5a53bd24b359bf76ecf97b105d6a89bf7b0e7ba88546e26
+DIST firefox-90.0-en-CA.xpi 520977 BLAKE2B fd3b74f5c93a4c8965e9a8904291932b703113e8486b956fe2446c3ebc39cd152a125a7400c818a3df94c8706cc0ae080b11c0a2b943148bcbe674221dd53c8a SHA512 e76081f56521ca5fb5a7b1e468c445f4dd4ea3fa45f5bbb4aa27b5ac918221030cc1609c533493c294e18c3e5bb1534ca32f0db94995bb8b9d76adca14274d34
+DIST firefox-90.0-en-GB.xpi 521292 BLAKE2B 40bb93be468cd6236d665b7e9b6b3dd6dcbb1305f72c909db2124009a086f3e3c41ff45f6177688b8a282b4190fdc77634326ca1eca6c67ab2706e08e63ab98a SHA512 0ead74b6066df59c9991b23a165f2fa0b9410f21c987502c4957718aea8e84a912ff418c98b2fcc0b013dbd93e32cdce4f2aa266c4b77719b8fc48f9a452ee61
+DIST firefox-90.0-eo.xpi 546166 BLAKE2B 2682594a5035eacf42878eae40671d1118335879bb13b7653b5e6dbf8ac0ce872ab7584c7a9ab167782daf10f6e4f830c6ff132e1fd6e5cffc10729cf2b869db SHA512 d71d6184f8c674f0ee7bcc0ba18c9b63fb3794c17f6bea96d4d37631af85d83c450f5bbbb8373847be7aa2a9b0153eb361666312ddf14b8e5b3cb4b732465536
+DIST firefox-90.0-es-AR.xpi 559086 BLAKE2B d5af456783fca0cb9cd49f8b6c54e250492c3d7aa18abe59d37f73166bf91758b12bb4818256e228c17f978fed692169e62b0b1a672256f2fd1b09787d757085 SHA512 118b985ab82a2ff336e54fe33e50ecf8596709b98bb22746f3fbab2d7ea0c1a5b54e6053715ed0f8492ad5cdb1d75bc7530d044d955d10c34ffc81579efe7a5e
+DIST firefox-90.0-es-CL.xpi 558215 BLAKE2B 1d2a20619f8a8e8d741e83d04996ff38431d2146a33859d9aae6acdf61f35adce111907d39178289ecff29a5ddffea8c687672f7b7a5498339476285fe5939c6 SHA512 499375fa66f30eab47e2025165f8bb1552aa7f6035a5b791033183538b4da932733671d1c49cafcefe63b7d772fe20c394d9bdcb91742b2af75543a025c4dd64
+DIST firefox-90.0-es-ES.xpi 548981 BLAKE2B 16bc31f2d79673e3eec33e2cffdb3ba5558885b128c07fad0f9c3792f3622851fa368a4abe4a7ce64e3266a04ab957dbf9160dd08e55496fd523820475da3a96 SHA512 a5521aa49cdaea721f2e86ef87a9a44ce962f6608af701a8cd584bce2f40dd21b88068fb1ae35ac8e31d2e5898fa1448e9e60ad63e4485171adc3dce4cf88fad
+DIST firefox-90.0-es-MX.xpi 562423 BLAKE2B 31f0a644fcfddac653df3a65737538c8328db89acaff6f0a5d9e1a6a235b3ce3d8f6659453b6cfddd668444600b354da0f75ca5a2527374521ace8b71a7d03c0 SHA512 39e86fd91bd0dfb9f2bf9b2a125f5f24933eee46e5bd4c0b8a8fde58be2553d06aa64e78d55d5bb71fa4a18e32821d9cfa5091bc9e0f2638a6c00a7ad2b18f6d
+DIST firefox-90.0-et.xpi 496625 BLAKE2B f8fccd6f5b29b327e615a952a37a42253977b199b97bbe0c1d133f3b012945ee1847e7491390be2491ca1a51b5fdac2f7c28784532f98916f1d5ad8d79eb8ae9 SHA512 0619938c68e77355853d35c93c94395e1af3397b0d59cacdf4390294e9dfe8d16d4f296a15c597cc2ed1bfdcb98977ccd0e41562f21c95d55d406fe94cf9c467
+DIST firefox-90.0-eu.xpi 544754 BLAKE2B 04ddc2acad0d690a825f698fac1546eaf3ea3a9883ea21cb04af71a67413a1c4d622530e3eca331f3ef0985ab361b85a88b144146b637f240c7142d32b79ce45 SHA512 13ca48fe8d68b7c5793835347b53370acda59e675f71d1f6e45ff2335b1e248d40011461046a9e20ed8b91284809de16e003156922fb9ded9de03f1952e9b180
+DIST firefox-90.0-fa.xpi 565131 BLAKE2B 88a9a812d8a789cd4b29954878881a521284034729f5fa02ba05d7e977adfe42dd8e84fb5087b7b8c9240211e606d43e7e22c680948d3efb2363e37163cc4e67 SHA512 15494cce88efe9dc6ed69ce3b83af28af3eaa6789bd9cf229ca95ed874b24b8ea55313ef892cca042ce70179fa3562333dc6052d31a5c21589c55bd518ad3ea4
+DIST firefox-90.0-ff.xpi 488036 BLAKE2B 78ca239db016327e60435dc49399833dc1a0dc6390a2746792322dc630bc67e6d31448abbf67e251c6df4bbe9d5946431e79e66fcd87a28156a77fa67f81b1dd SHA512 333952b47705ce0c3ea7bced147c4e5f67bffd2200571e612f89267a7cd9807dc1f27d3a5ed5a7ae524bab6745d3943765934a9bfae9e91eed0b26ec3523c13d
+DIST firefox-90.0-fi.xpi 545674 BLAKE2B b699657eb06eee0d8e4ccb38f41202a8c885a59715e11591875584386bf62d8ee9d2abe0148e6a8a7b5ddd7da4405c1cea547bd28b4ef27d3446af99ac4a4fb9 SHA512 71bf27f517554ce4e39d925952cb7bdf45c2b98a54873c5c3e49a92e101755c26e9b2a569e64a3b09d553e1815ca14e260c0fcb414b71a7c483177d77f79bd00
+DIST firefox-90.0-fr.xpi 570206 BLAKE2B 1f653ef6818815ce44d3e80631262d0f32e77417ae2cfbeb52665d997cf863f0829b0d2f55744344950bb803e41ca318dc38ea687f55f3abe31a3a986ae2ea95 SHA512 6f95585d94320ff0653eb6843637bc7e5108a6d6eacd65f6f0013566574006455d465b998c70ca8fa925c619c1af4c776d954dfd2d6b54668b00a607eb1c44f3
+DIST firefox-90.0-fy-NL.xpi 555035 BLAKE2B 81d94d506b33e9104eec3ee6a6c5b624c59d8dc6251986267b5353e1d632bb4806ae56ec8128945c027ef1da98ddf8402c03c64f3730cf32946b91a2bd503730 SHA512 bd14c44c5ad8a99706bb48c55e639b527abdcd56bf397831b646a1f87b10ae67d4c65f4efb2881accc317371f6508d371e0868718f8222c504c4c69315302e94
+DIST firefox-90.0-ga-IE.xpi 473114 BLAKE2B bf1f0c5bad975b321d14f3b9fe4801ecc54ce06b1e8d00ddbbb9788cf5784ded58cbc0f7e8e509cdcca627d874360b6af44e0049a8e574faf423271a1c85c681 SHA512 92a4ca47b73bb7f378b8e853dc64acf6f88cad51107b6bdc881ab949d516427f38d1a19053cc76ebdebe5d130c543b8966f0ec7caadfd2b4c2a55d21dddab3f8
+DIST firefox-90.0-gd.xpi 550980 BLAKE2B 74731a77f743e5794413c9d54d907989237a5442b2d3f9823bc82c8cff0551d8a24647da04d0f5c9f0199a6bc0c5e2f891d6f9b0a469f29815e00116b5e79e43 SHA512 6ff0f12fbaf7876830fdeec899a2ead59915dd1bff05cb360276c7687cd9190348121b5e8f507b3b0a7a4bd9608687d22e4c1958fd7e8359bf36d613cea22fa8
+DIST firefox-90.0-gl.xpi 554479 BLAKE2B f9ec20a5f708c5b75a24375ba007895b24d5f2b7564b8fea002e4ab71ba4e7e88096be816a140bfb46ad3ec298261dbb92d1f6b40b18132c852d11d9b76a0f57 SHA512 377687e31df8be4ffbf99fc0012638ba431b5b196ed8e8648456e1b50c27ab930d13e186ee80bbf2d4c68dd986a6c0b66a69d72dca15bdfe8cda9bc49b20286e
+DIST firefox-90.0-gn.xpi 571173 BLAKE2B 550bdf08040e6625aa93e3d3a817d659d3f02b9c6100e6ce2d3c59a6e41928308df4d234ed23b3b462f3c99b705479a72fd183b089600a242abbe4718ea5e88f SHA512 b53cdd1412cd9a0b35ece0209dbcdbe46f38ce491e645536288a55772f9e0d66417f3547adcab771d3965d10e524e750a622fc369309e7d0fef51c025a9eedd1
+DIST firefox-90.0-gu-IN.xpi 547532 BLAKE2B c4105a4770f38b5574306ec5061190485b9f5e3139c75081b2c62b70f647336806cf7327d090434e89ffbe17265a9e82914e3b31ce57186c77fbe2284f8d55a3 SHA512 657619850f6e9570336908aff0f1fd062e7faca8536629af44120395310bf5363cfa050e6edfe53676cc7f1cb2138240e1eac59a4b5c95b7442dddb693688489
+DIST firefox-90.0-he.xpi 569002 BLAKE2B f7a1c2569dc773c7e2f24ad9d2ee413e984d5ac3e406ade513d2d822d91fffc7eef3d9d178042bb6f9e72473327b4202559af244282456e749986820cfb50bdf SHA512 44a3df4722d0a56cbbb1cb3fd0ca9cb0cf87bfad587e087a0e789dbf4ec2efa3685eaea907842ae7e08768b394ebb324b63b8b372e33083e731b686f997444db
+DIST firefox-90.0-hi-IN.xpi 579612 BLAKE2B d18e5f0686fb7d288c23daa014f775e16bd8146e9a8de2bef800c73a3c8bf637e7d867ec0d575450b2299bf15ed5c9a4dc729e103528d8b3cd5803225e092c2d SHA512 0525344c2de8b733d6b0f0daf54700117e02c321f0b0a896b4d61506d5c5ec3fa68d653c9b039789761c4f9b9c37f3f46e938be7d36f19c36c62710aa3355f05
+DIST firefox-90.0-hr.xpi 549979 BLAKE2B 4b038eeb74e0099f17d98cead4035bdd6e1c098feda4b62f65c6ffb69cf9e596bbea1021b5b4f2f7766d4a94cd7e86f8b3fc5b4fc33ca682f5e098560228c7da SHA512 b0ee7854b55035421d2fb0b0da76f5d37a856f2d061d1c7117dbe3154cd6f013b3f52b691a76d3276b8c537f6ecb71fabacf99deb7d8da41ce194bd9455673d7
+DIST firefox-90.0-hsb.xpi 574891 BLAKE2B 8ce631e8e0da25b626a467ff2541f463fa37f047212a8324b0d50538aa1d437721c4b86030065f2ea0250c88c15582de8060c2fdc60912f9b748b3dd4b4eb9e2 SHA512 606503c1f799c0c77e944360b51b9d664c58600592c3a95ff9e0c10ca382f99ede94dc5f0854067c0e753943b7645c34046783ba91da30443e63ec4afaa86e6c
+DIST firefox-90.0-hu.xpi 578489 BLAKE2B 359b978f4c6487cd0ddf7707899cbe3e6bbf4437cf7833402a5f70a7e495bc1baca851e0c8e7a9d918e1b6b591cc80ac268b5ff904e8a74da31bcdc716742f66 SHA512 c581748c74b1f7aeea3788610bc9774a960731c3c2144d23ace39095f9a8ece066033e44ba26975ea665c333167daa0f1a9b4337afb675cd22ff4cebc3fa0281
+DIST firefox-90.0-hy-AM.xpi 604406 BLAKE2B 53477d73f7f82279f6419abfe24e6f4e1209c34c9ab2e8660aec885dc4e85c2a3ee6b8f899928f7ad1de724ea8420c99c3374ef1ad9ae72660ac8229c045908c SHA512 1223f05cbb0ce94c757becd3ee047eea6eff6ef70b1dd906e813418b2e38b41f670dddae33e3df8aad17a3c560e8ef091259b4dd5c3b53292594427a8386561f
+DIST firefox-90.0-ia.xpi 543872 BLAKE2B 5bd6328d26698b038c874d72d729580a9f2aa9ec0df27812441c000f34ba8df0bab67955ce1b709de41f6a8f7599470b401e43c9d2f466a10b0d9800a970d07c SHA512 338d93e7c2784bbc8791c58c6cc26eb25af1d49286dae31fd502e88a42c1d7ed8b11e4ab871ad3e98fb06c5f6bce6aa2ec8382a5706e2adfe17794cd8d87796e
+DIST firefox-90.0-id.xpi 540015 BLAKE2B 1942af5461812b4eba250e3689aed4858aa09611b834c98c2b4a38e69646864be37b2e266bd475e1b47f6ca3bdd21b1ceaa1570c9f4b2962164f93b8a23f2d64 SHA512 75cea336b92b702fb929f6479e8d6850cb2d658fd0d55433a5f46c0400f2d056ecb80069dd8fad082c32a88968d75b584451cd355b743d4e69c97cc6783673a5
+DIST firefox-90.0-is.xpi 483692 BLAKE2B f799ad05234f80b23a89236caaf6b0bd90b71f6b2196a1bcd88176b950e557b8a21ee71413471ddccdc5fa26a683d56333e9011189debb60bd23a7f9345c50ff SHA512 476a9cd620e89bd0fa3ec56ae9d0e3950f2ff78d21c69476df563fa2ee97a0751605426eea7c42063330c3b0cb3e46d337206b26592a5c162f32bcca4dcb1e66
+DIST firefox-90.0-it.xpi 472093 BLAKE2B 34dcc7ddbbfa669839c8b68d93f3908e50705df18a12dd487c29d4ddce71fcec585d746d71454908df4a0e0a9a6a3581a38ec06a233adcd0260dd891be738fd7 SHA512 415f5a8d510d23f294cfb56c38e16c0d7ceb1546553691ddac2290f72570909a171100c834311d98e9a4d8442630b2e0409859557432d77338ae3c9d47a267cb
+DIST firefox-90.0-ja.xpi 605292 BLAKE2B 7f8f68b679ccb019b5b547f8ed918c6d498338c07196212026228cf835e0256177dc9656ed75d05ce140d453cc2a1543c9020e8ea805b74ac58714c7c3fcd615 SHA512 3e9f688b8abc8b0bfbc1b5c836416cf6b62b072f6e1e1ab73feceb9f0eff2481cd360c6ebbe3da1e587711d05b39b763cdf0307394e885553c9aafdb1247e896
+DIST firefox-90.0-ka.xpi 606614 BLAKE2B 64955d19b193741b711e42cac6ba1f2bc9bf3834676ba3bf2911a1f7c91664f4f07dc4b80dda3619e1ec5819301ae69ae6aaec6c5994b9acbd6c112bb3c57569 SHA512 8a58f5ff2639a88dfd7d62675e12f70e97465452b3390a28dab31796553bcba1bc0ff858184059e7bd8b27a22f1c8dc6cc87b4440c66a7b6618ea0d1d1fbe6ad
+DIST firefox-90.0-kab.xpi 562715 BLAKE2B 82a78fa9b01453d2f4da7df71467cedf19decd1ccb78ac669f9be5f1390227d30815fb6bbac065e6881f610193decd1e4f10bfe2add01629f7b4554879460d8e SHA512 102cb22cbbafc580a3cb484b48d9bb0d5c55310ed7b68afe8821e113c8b11ca4527cd41251bb7f6378281e7bbab3025fca06b9da2a0baeaf11a72d9a87abaad7
+DIST firefox-90.0-kk.xpi 621566 BLAKE2B f3934bdeb01d07c045c12d49a6f414164aa3913971c3d6e51a9c1fe84698b15e13d31b9bd4e9f3268c077a7d308f6a1478f53a7d66a36502ab180bc625cc65d4 SHA512 e4cd27c5be6ee30f7b92edeefd3231517c3a0a7ee6a1da4d368bba4dcf9a533d48c01487f83b0f790c9569b172dde21037d0a893a64a4a35a198e85cf4eb49af
+DIST firefox-90.0-km.xpi 546420 BLAKE2B 67e38cda07fff9b6db7d52d719dbd373126fff7afb267b90c2b738970a8f80093974817c12bc9189beed7456d5ce07ed14b6a134c9d7ae3cb462fcc4a8d3e172 SHA512 0f3f9163e91f33482e635274d9a21d0242b872ff8963ee730e485ed8ac41195b80b83cb5eb085ea8525d58062b3ba1e148995aee90d1f091ac7f9d7343305784
+DIST firefox-90.0-kn.xpi 510713 BLAKE2B 8221d950f5b2c800091cfa603c2b09cb62faf7e168d4c69d34183ade90e65236ccddbdc5a08229afdd57b4ec3820c142cefab8f83d5b547c8e54fcec484e4ba6 SHA512 cef6240588221b3aa827c43dd12c36501b3df882407d027709994a41f1966503e868cbab83a5852499e5ca6b4a13e1d6c3b147b946a31d2c74e3e4ff3f808962
+DIST firefox-90.0-ko.xpi 590162 BLAKE2B f0b389d55b1c2fb4ef73ebbd232bcee385b9ce836ea9b841d3fd1ed17742da4e0ca7e289064ecc1839294047946d7ba2c5f69b4a135142c5b6671116d1adfed8 SHA512 88aa8474636ecb8a21e775a0511f0924e7e97847e5ece11ff1ae77731b15fe81e0983248bb6db98c607d678c844f02deb5ae2aaa193b0f85b8c705561e5368c3
+DIST firefox-90.0-lij.xpi 484749 BLAKE2B c213b46be98218aa9e44de3de39abec400066cd4ff42eeb0def53b777b24b1679e7381a8f73de402cd84bc6829ab52822184056a68f16df525e9e257327d287d SHA512 18cffdf992ca4a0e3a1dda002cfec132d8cb366970345f6fe40b265d2ac029029c0452bcc645c256dfbe2d91be4cfec7ccd244ea89843e381c4b50cec6ae9526
+DIST firefox-90.0-lt.xpi 571831 BLAKE2B 237d0eb3920a75fe20b9333a1457b244ab7624c1b99a8238626c26abbe808ff1e7d7d9d2df1118cb56cb6f381e692419c276d69891cf391dd70a59e6e266da57 SHA512 52400b77a1e418361253cdf61d5db08d4694c6137f249903d6a7497318d1719dc0a02a7f17d4cf08f6980fa88928d2ee2037376822ee627db75b0cbf06136ecb
+DIST firefox-90.0-lv.xpi 475673 BLAKE2B 7fd9ddd74129fadb9d0698f7c02e3d87c98f1e2cd1cf1d11a785f8221a8901266b313c3086831de27311d0555b082b8c9ee4b2fad7b37048c9b726f35bb0be10 SHA512 cf262dd372f1824c4301c18f6bba7b19b4c076d98edf7bc60c22f59db4cf1a5c7388bc8286e228bc20c7da43903f42613f4bdb33be0a2e70e7e9ee6629c6c447
+DIST firefox-90.0-mk.xpi 472340 BLAKE2B 9ba7fb3ac2ae0371fb200dbfabde855aef92e7994ce2e06ce09d160effac79ed9f9ef0ce6427bcee19d4d6cc22e0eebc4cee3983556fb4d81e07eee10c4158a5 SHA512 7866cd1e1313acb83783ceec316e83ca793021c015520538ebbcbf0950ee6e37ff40b04702ff58d9a180a700d202f5ac7a09361db7f9e974446448a5ceccff93
+DIST firefox-90.0-mr.xpi 547698 BLAKE2B 902ecabf3432b85d02b4181bba82da18abdc6a9d770aaf3c6bc5b5c19dd3203a5d9455d5dff894991d31c13788f1e6373321f894cf2bb65da8cea19f760149e7 SHA512 adc65c9bd3935ee226422fcf550c65fc3677c463a8a01355848df59cd80103d34d7f321e2f26c3d4c2d03e38168367cccbf933bf3d2026e57c01a32f19f95f2f
+DIST firefox-90.0-ms.xpi 459295 BLAKE2B 89c1840a161d6bf24bc9dd355b4d5eb942160f70e46d22691f508b6a65df2269993b0f9fe6c69fae38c9eb25ada957ee412484be65ca426aefd95dfb7d0c350b SHA512 b200d7aacbb54f60f11a496174e078f5168ececdd1ef31b563d991eb92e9e86bc3f8ce953b50eb8452084366713893c2cf54f403468d55a18c2e893d3214a1ef
+DIST firefox-90.0-my.xpi 531247 BLAKE2B f9b26f3915563af5a346529c07c56df081c9b53c92c8059644f144e981c9072f1b69dc869665d2bbdda74ce199a7b620eadf53369eff13c362b036820b6bf789 SHA512 1d0cc706fc66a204c4191919ec6f1f59a9151629e67930af77aada670a9374afaaf9673daf0baf94d0ea4700f5a6fc7c4dd58c76f92afd12e9897e1bd31200b1
+DIST firefox-90.0-nb-NO.xpi 540500 BLAKE2B 2be7d15aa82bb0ccecd7b2a74369dfc9117f90b4e7e136c7a5827871ace948b09ae54ed799dd389e6f016d54713748ca0413320b6cdfa5616788e3554a5445fc SHA512 352986e7bb4c197c919e45ab2fb0f5c5072187e0876a03093cbd6eba86d7fcd67ca3296d6e2f1f7c3f4acb378d497e52140f735befff8632e1bbef4d283c49ca
+DIST firefox-90.0-ne-NP.xpi 488256 BLAKE2B 9c59fa0abf571db52d06447afa84d019c0717b538765c0ed130a5f8e5f663ecf9690eb2bc975bfa45f002a4fce696699390d46c521d71e08af364373986963c9 SHA512 083ca5e10e202ed937709d2fb593f5d5a5c98bed8dc7c16a79c1bdc11542207279f39d6ab670e78ee439e75b6d94883e6c3591c73455ee4bbdb4ff7c64d9eaae
+DIST firefox-90.0-nl.xpi 548829 BLAKE2B 11b64e8506a8933c75d681f42647329022dfaec7c2ffdfd4558a3a35941c76d42dd742e17bd3f8265c06ce6be42feafc669237b46d291367ae318ef9002e1dad SHA512 bd9e67ad5bba772759bc637cebfa7b73e8eddf80e7acb80ef33015885c9ee55686888b2cf35f9c98ea0af2ce7aa577ae89da1ad44544b0268708337a4f6dc4e6
+DIST firefox-90.0-nn-NO.xpi 543209 BLAKE2B e094273a22660d972e3a66bb10d541584b90f6fe852d12f33637122bc4ccf361cbfc96ccfd8522e1038b6b51fbc43008f4453a8d346c007cb915afbb2c07e057 SHA512 eb6e3dfd45a89156ecf3ee959988257a01b4f31d855e631f8a388067d284b3be4a894b8deeea4b97d08aeaa236bab3e43f89661bb63cf6404ae63561c61756cc
+DIST firefox-90.0-oc.xpi 565284 BLAKE2B 3a905daa05ecf231b4d7de04b0156d904038ae8138d80d47f7679a3cdaf7c7e75c102b34f6102ace9747ed24def71cb116d19130b65c904ed07c55b47d5830dd SHA512 85fdc257a7895fb754d08005838a8be181e9fcb26bd83b03a08387a6c697ecbb121ebde701b2f7b2fe0cda4803ec6dae4b213882f5b84b091b2c639e823a691e
+DIST firefox-90.0-pa-IN.xpi 612467 BLAKE2B 765bf9ea57a6b5123a3af78a86db9977abf18f521e35954f9bd1f4191c89f4fbb8bbeb8bbd1746a38a8bb383f91476a7859dc782d4763104da1b9075c77ddeff SHA512 330a98398a366f2069367e20a7301834b96ee61626d0f8b13ff634e4b015438d204b836be47e48fec6568a279c8e5b7b04208a8b7c64e900dff47e16d0ef2703
+DIST firefox-90.0-pl.xpi 568697 BLAKE2B 6951be0a265cac3e51563448637b5b01bae34ebc0fba0cb9ae507429ae29052fcdf3401742ed48facfdababa61e0277aa296d3046621ae8f44984aaa43dc7d04 SHA512 6c46d7345fdf4aeb661d36fe64d7fae2032f9f0744138d64ca3be402947fba6406762b668b01b072972c61ff341dbd6660d12d53253147d91aeba8a88af4660f
+DIST firefox-90.0-pt-BR.xpi 554550 BLAKE2B f0cbc8f961504ec05c6a0619d973bf75e9e6382a9f3788ce7f8ba252a319e0d9fa17b6a08d0f61c02b71b3ae7e69f16542f567ee48bfe3347078c79c9b9451c7 SHA512 f1360b80a15f0884f881be20481250efe8defe00bbf6a9ee101f7ed5ff4475d2f1547a1b4ccd41d4d27b36b3bfaa0c5ac33b7b47a1160c62cc72ccd2d8b0c2c7
+DIST firefox-90.0-pt-PT.xpi 558175 BLAKE2B 93e7a8fbfd4cf67f71966de9cba7bcaeb6c5df845a81a060bed0ece24f7c3755959792e8f39342b657efab22e6b444233f7520485574950b2bf31beeff5b8610 SHA512 ce6830c9d7d5371cac1efb519fbd0d58af7e5354c2f31daf358eafc22b319322c0d7860ee524a75ae22014df001c90d840a3af59748db676de1c31c5fb96174c
+DIST firefox-90.0-rm.xpi 547502 BLAKE2B 7a4c701b1860734901d2af53e3dfde54f5d31aba55c545b388b729c6fd62fe5e55c54099ed743f7d0f255e74de81374bdb700c1c531977ef967a19c3d4fae3dd SHA512 b1bb9253705ca113dc5451556baa42eab4a901dd935e0fdae63b4eb97b8b709c2719cc7f923f312d8884267f7e9d9b60636b637566fb86cd9c0a537a50237368
+DIST firefox-90.0-ro.xpi 542098 BLAKE2B 848dd7d8771330e0b587330c75dd3d4d1dc41a6ec5ee11cf99e7e1ec6a79f872eaa300525e9bab5b35ee472d58017293c4442e9b5aea5d66600d52e01c946416 SHA512 a75f500a885aaa90a9a68194f76d8c200b6fc844b72b950ed7ceba2d926c6c1eaa7de6494f509f6c3eb33b10eb50a2759c558f25e714f7a05c5f2d373f86c2b4
+DIST firefox-90.0-ru.xpi 641411 BLAKE2B 25947442f4a5b6531e40e8f6a9d330b43c3a57f0fb9e1e584045b301926ac7e9de979bf5c5a13ea786b8fa9374a6beede07f471294d2f6b5bcdea11c2f22ca98 SHA512 64fc6ca0bf408fbaca4e1e3b015dc18b52d5fe215d219a09bc4d117c15977aaee5bde4ee3cf072bd45a3db2fdf8308b30a219a2e4ef272fe152c4c2129a47a9f
+DIST firefox-90.0-si.xpi 497028 BLAKE2B 59def630b55ffa186422fe06e5f54fb42ea80bc9b20044a5ed1185b4869dfb308c702882949cc8e4f185e2832da1d79c327d7edc27644ffcc23b0c988b8aef2a SHA512 81ab21fef01677b4977f82e69e8a6d6f5bb0fea2964c3a069b2fbfb09a154eb2e8db89bcdcacc4872cb327821dff9da8eae2f6b4dcc3a2123198942549a283fa
+DIST firefox-90.0-sk.xpi 578299 BLAKE2B 9a248c7b33a399b1126c19ea63a350061ead767635d79ca7568d3bdf24ef3e17bf11d9214345547f1339d304d75d1eebef717f6755a44c8e3ee63d5abaa28a13 SHA512 404bc0e44abd28792e79846dd53cd1d2357c107aebd880513a413ad5646f4d4d3ae9cecd1f3d552a7cde24bd2f8460505d0a6bf599059b75fea4dcce9ef32602
+DIST firefox-90.0-sl.xpi 547668 BLAKE2B 305438177f2c39dac8efccc2641fffe907c8f926b86b83154ba921888bf2564efe2356cbded91e5894a8a2f4eada25598068b3f2b9766133c4fbe5974696ea98 SHA512 9552189f41d5588c162c4956dc2610a122994a6a6050fd47a5c3746eb053f6c663a3ad2654f44449b1622952b194046202847df1ef9c96b6634d2279e31c0b4a
+DIST firefox-90.0-son.xpi 428005 BLAKE2B 32c27d503af60de3df42737c2c8063dc525ee9d6dc84a0d8e8a75d0e592177afedc0060d5c6366e0d38e29a7a2915c2b4e32e71df2442ff52c1dde249bbe2e4e SHA512 ae15d8df9b7f1d0a31cf91ab3002f44956428eb75ba3ac7799d1ac162775403018fc63b3fd83e300a32b9b96b03b01aa35113fb03f90b797928a8078be281413
+DIST firefox-90.0-sq.xpi 568611 BLAKE2B 69aa2a14bb28482f147ca7c7546345129c5297eb3d47656b598b1d3f3283851a48deb6cbd027da25cbb9f9857cf3c729bc51e74a3e1b58ec91829922409bb9a1 SHA512 079b802601f6f13ee2056b06cc31c5710bd26889983a4e853e9c49eb9d9be99277cdc383eb26b4329a43345f439059e494517de77b51dc0bdcc2253ac664e0ff
+DIST firefox-90.0-sr.xpi 602753 BLAKE2B 03c78a2e23fba5dcaa060ccef08087c1ee1ba04219f43f30eb99720233482c1bcb67cf482b4f87756ad842a24c8063515f4933cff3b23c7dc34669e38e8fd1e3 SHA512 ec1f954224cd30c9ca72c3d2c24d7a51c83265510cc4789122b594dcbcf73ae0af0135975e5eac6e2c3df726ec4cb8659accac74a36ff1fb924af2377593925b
+DIST firefox-90.0-sv-SE.xpi 551938 BLAKE2B 5ccd1c13e64cedbec503ab876761fa904a813a550fcefd3d6d33e5759dac84a1453c98eb50192da8f07b1c927d7dad8f94c96b06339c5a7f2c5c30d96b5f26d3 SHA512 c0b18e725b1f808dee8db82113652340aef16022fa1f0be7f0da482e02bb99f6551ba9d4042f4c11722cc49a67d4de959de2c9bc6c41ab82d8549187bf518d08
+DIST firefox-90.0-ta.xpi 526006 BLAKE2B 838a382789cf83960cdff73da19c86b72da5368715e37146ace0905a130a3ee824d2c0d9ef1cc01ad523dfaa7e4a8a206a7e9defe2a86850b33b8f06664b882f SHA512 78cf985604d0a7d2b94c3761e6715741ecffc1e764473b722ee9a30be33db4f31beef4c3b929f453fa3d9a8de262a5353d351b393883f9d9459a9be666ec4a31
+DIST firefox-90.0-te.xpi 568740 BLAKE2B 03f5b4c5210bf79df7e23c0f167d85a3fa64ef9b08e7fa77616157a3162524a7986c9a6618c2af7498bf8f61361a5e3dc8a55b9e76a9ed2de47cd8949e76f860 SHA512 2436f569124c4f962cf979a834aae9e2da29277252d257b64160621efba26bd0e3f0628e18f49370e88910cacf7996dc053fa9bbdb51ef61b31b40b2c6b58859
+DIST firefox-90.0-th.xpi 620997 BLAKE2B 551c532cc3b6ca37a26d56bf5a84cd6f9300fda37e53a4bf8971c74b8796620d3f155d87f0847266987636033361466bdfa6e4ab8d157b191ef7ac8a3f9e623d SHA512 9b274c1bfd61f0fef46121f281474a283925dd0d7d07c956582ede8eff6e77d86154ead2f78a55670422e405a2452f3eaf3e5edf8158e334db126a5cfe4738d1
+DIST firefox-90.0-tl.xpi 533270 BLAKE2B 985d7179e6cc12521caa360d60ebb2d98efcaada1dc9c62fcc544ed96508ffa480e2226dad62c8f9b2570786300e6412eb877865fc899571b455a5355cb757a6 SHA512 57f03b901d7b801bef5f2a10ca54b4655679096055defd815222f9a7d9fb32725f161b33f0d1b90fd3e12d50f41cac08cc880467b50040adf8148784243c28d8
+DIST firefox-90.0-tr.xpi 564315 BLAKE2B 9c95d193b314848144e9eb97486b5714dc5d6397d0dd4e46c93f6e34f1b29edeb8b44b48708bb7d8aa7db689a2aa5bbd6f75637d7b2c6b09a7da53627eba9a8f SHA512 e1bc5f933c4f0072d7ec06d9090fc3ff586b1c9865810f7a2508d25a482096106624c474f4bf44f0a59543315a4e118da42225c8d19a6b03a36e8a01ad7b2240
+DIST firefox-90.0-trs.xpi 506674 BLAKE2B d4db6aa6e5004ee1573b367276c5bb842606cbf14acc687e51e586a0d8c0b972178b1b46a6d9a7348a53472b9f97b5f6493c2538bc4bfcafc2fdd07802381a36 SHA512 144a47fd20ac3c5b49b65b27e8703393cba1e61c0afac30ef24e5873b0e6f46b1f25ae0f1a64c1e7f43c11248c5cea9fa8a69e4011c833603d6c079045e3b545
+DIST firefox-90.0-uk.xpi 635104 BLAKE2B f4c5074c2bbf9213a2d2cc18f1042a3bfd8f1b2aa3adcfd721911df9530a140c4c08abad281b9ca35709ea644b27549a63892f4e56a5b7c46913e929f89378e4 SHA512 d509610a5a3467e845d825d36376c885d24b7d6a7e9baba2104a5bc12fcd51617aa8303fcac74d9194bdfcf4eda119129d3efdb76fe1d2e6e8b364fcacb7b596
+DIST firefox-90.0-ur.xpi 577979 BLAKE2B 9b9273337bf7c0aea20e372f680cea4a85a907a90ebc03ddfba4526b2c865576315c9e0384f380aa3ea6b16cdf588bdae1f10e003fcafa33fd44017eaf650c6e SHA512 276b26cbc2f47a19ff8dfb47e28ff3791436f0cede7f996dbdf092bf64ca36cfd2e164e4c8857225a3b0446a40d897aab69da9174c920780c7067b811917f2d0
+DIST firefox-90.0-uz.xpi 483028 BLAKE2B af935ab295326af2ab09f88d4ac9620a868355c1540c1fbfaee49b8b3efd41ecbcb9845d247d59cdf57bb25d471fd8202ae9dcc180f237b23f44dcd1cc3f24af SHA512 414bb6a1569fad5606b56df540bd5f1c5f4ee4531bc4b0c5b868ab41382e6dba91ba145f276485087a7b432d484def7229fdfdc73b40e826300e91a4b5017c7c
+DIST firefox-90.0-vi.xpi 586288 BLAKE2B 3e357d30dd5feddebba17a4fcb19cd4ea24ef8fbd4e6212757eb252284860b62a8786ec2631a8c02a992e9308d70c57284b58ec85a9e98a39ed736012977f01a SHA512 553533e250cb3d555fb90e2b8f3867ba0cfed55898810c136270407156ec6471ebe75cc930bd405b1afa81aa50c638b048ab1c3b187d1a3b289d0648d8eb396e
+DIST firefox-90.0-xh.xpi 430173 BLAKE2B f33cf177ca73a5e507f273d22842ee507252615260561dd7b34319491f8936b2b38ea4882800f4beeb4a5d99e7f702628f471e8539e3ac943f794fc9f23e777f SHA512 8af951cf3e3c57f0b881983862e4f75c7c696a24ad25ae01bf649c0aa2d36b3e658723b3ec964741adcfb49f1f7380214cef88500bb8bde74fb030aa9043f150
+DIST firefox-90.0-zh-CN.xpi 587658 BLAKE2B 316f42f5d3e28960afc1a9586771d8fc1f7c2a1ab429a1daf391817d089a02a92e3a757d0c73cfb43320d13f497d11b508848daf4bc1150353c37411f56823fa SHA512 bc7c6cb7300b0a3b002975a7e7b1c93bf89c4ffec272ceb980aa74bdaf4ed1d7786c545f1212dbe4aa7106eddf5b377cd0c9d0cc7e971b768246ad7ad9983733
+DIST firefox-90.0-zh-TW.xpi 588100 BLAKE2B 671eb44db05a61d0077e6320147df6aad5723721eaf39f256b636abba15c03fb37439fb931cd7159badfa4c3f6b7a71b4503b72d0d27573e33e540a351c71e99 SHA512 be1a2f630027ed5fe1e1961fdf13da78af800178153b8bd389c512e5e5bb5093ab3b3169232810e4e863f96514b6fa0c69c92107465525c863934726f68da21d
 DIST firefox-bin_i686-78.11.0.tar.bz2 73244377 BLAKE2B 8ee51b43884f5deff7cfd85abcc229a7319b94e092ba08a699c0a8762d8e60a2e5cc616320f9bf05e2ae26881717be04819f3da0753a3e0de06be41f9426d8c8 SHA512 b8cb0fd0cd618002e481a8176920324bc32d8bc18258b3b041cc496243e3702aef4f02060dd04d8d80adfa84480a7a7c79878ce4fdf6de9d7086f6b4edda8eab
+DIST firefox-bin_i686-78.12.0.tar.bz2 73197436 BLAKE2B 086bd8ae3d4819cddf522689a36ca7b81e8b9fab45ec620cae6b5187c0872115fb25b70e3b9ae884d1f1b683d09915a3fcb0b44189d7f6eb3957e6071e8e16e8 SHA512 0dcbfffa11354c47a730dd840c41a5e4baa73ca459f86ff43618fa9d03665f88add2cc20788a5fc243f2baefccc08728f10f86a2ad14237f2e92c2cdf0299adb
 DIST firefox-bin_i686-89.0.1.tar.bz2 77562544 BLAKE2B c775364b7c43fb6a75151b42838808c092ecf00bf3c82caf9444708cf5df9d184637504729bac88d8c7622dddd81775a64ae39290bed68eb6f8f2397c4e3843d SHA512 75d4d2a29a910a01bf97eddef0c85b80b1378358887daaf349eea69b005128cb595229c4892636d5d9f9bbc1f8f010bfee5244fa4ad11696910fe4ebcd90f5fa
 DIST firefox-bin_i686-89.0.2.tar.bz2 77726055 BLAKE2B 0ab8d83c5d426d2dce56d0cf57a7e7fef0e238765b1084c04734a6866950c335bbd92d4403f000a7acb64a0e426cd67e4e82c6d102b0f4f8f6f827db44296444 SHA512 a04f757349ea73b38865570ca9494935268b8c51aa6b6f5d6f7c6e60d0665f8853c0f492fbea0d3b7d645fa3f658c36c9d09bea6db8b304ead418a9f7d91797f
 DIST firefox-bin_i686-89.0.tar.bz2 77691631 BLAKE2B ac5bae3c723a91cc8a954cfe769a54c0cc7a3ecac7a318dd9d73d11d8086ee807f832d3fd8077e7366659a3cbd5b8dfc7e8ad61bccb6713dd34a4cc5d226e1f4 SHA512 db1043d27472ee14174178a09d556e00e80780881ec38e0ecd26da1dd8ea0a6c5ae103f4ddd9ec6c532f45efe2b1f28dbaca599ce99e41cd2defae2b87ee1c6d
+DIST firefox-bin_i686-90.0.tar.bz2 77991092 BLAKE2B 9b5bffb1ab5e4797181cab5abe7d27f86dbb049a0947ced53bf98a52ed108eae214930113e05edf8c14f1a22473cb2764fe3d4d9c5d42bfd91c97d8febf98e0e SHA512 a08a88cda4d6fd0a5924a89392d3a00c9b462cadc275d3a60113e8bbeb5b5d8252190ef21be960c4ac1bcb7af34c2822d0983cd146c1e032e808b82eb4d4262d
 DIST firefox-bin_x86_64-78.11.0.tar.bz2 71103504 BLAKE2B a0b3281f0321f50db94c0d4deaf0b01234350eb992001668dc0f825c76ecc097e234439f425b1c282e4dee81c33d2b54e845444de9984111b7102c8fbe794eee SHA512 77bc1b70ba15d6c9103d4ec7703092d7af0927ed239f53ae047cd7e2d948442bde8342fe53ae6eb6feeac337fc44a979627f1fa1d3ab556fa687ce6c9155ac31
+DIST firefox-bin_x86_64-78.12.0.tar.bz2 71136111 BLAKE2B 28f60503f7994c7e91afc0caa6eb11b0b50c4ca996fc66d4347f2e13813ff2c0d1e75f8633a1bf8b9d43229432a05c1cf1c53e48f535640d249acb90c0f748e6 SHA512 2af1d840bd968cd6065eaa7e2f3110303309f500ffde1d83c4133b5a620f9b94f48ac92af8c40099cc11a387aca349a11fb6816479a3e9b210f97b7a04c3a308
 DIST firefox-bin_x86_64-89.0.1.tar.bz2 74816154 BLAKE2B 0e89238e8e7b7d146fd0c8770988d37fa5dbf2a1bb63a6ca8d95bbda4ad37ef953f17d4c4a1a499b3807c0d7fcdbc3b8876afa3381548bcf8da524a8ef8ffa01 SHA512 a667b38b482350b211f805912548c5da21f32f9f8777b3d83d81f7ae2f7b5beeb2b67eb8a30fe448b993ddce951de12668c2fd6382e56877055e2c26b5563779
 DIST firefox-bin_x86_64-89.0.2.tar.bz2 74722786 BLAKE2B 3b15a8ebf4c0fc8ce194170b190e424593d5f0fe9e58373cf1a3f92f0848c6e921d403d3adede598ae10afd29348710dbd66c08879235e13753623c44b940bd3 SHA512 9ab9ef926e3d3e042eff38a3e75ea55f736032abea48d391cab28efed542c7715987cbac33745b186b5996fa038b732f5c6f4ebe9e6a101b4e13dcf540fbf275
 DIST firefox-bin_x86_64-89.0.tar.bz2 74773632 BLAKE2B 0e743c72f112a80c1e640be0e7a240f23727f7efa8348dd9bfccf8fc8acf2da5072b7549c59febb91d7a86b3a9629ab5dda3695ade4f3bc54901c55bf0cbf1d1 SHA512 c1d02511f202622b7a22f427d47f5ab067a0f579386b2a77923cfb24998d2491d0b87e3c26618d854e2dfdd1cef76fd5817325ea41463f5c1dd8c746525874e7
+DIST firefox-bin_x86_64-90.0.tar.bz2 74998559 BLAKE2B e46e806967537c912711af960ec410d2378799634cd71e35a07629471c90c311748df34252b26fcbc9ec4502f7f2511cb1402cb36ad4e347544812dce9a94ffe SHA512 c93beaa41d2278e3b4cb0929e1319273829eb901d19d21c0648d733eec32a54d26d32d727851304cc65f777013a8168122e8ee95a41db278074a3a1d9231d1d1
 EBUILD firefox-bin-78.11.0.ebuild 11363 BLAKE2B 52d08fee2a6dafb1ca52a887bbec112f633afee3eafe7d96974a07e821ef7feb9ce3891528a0ad2ffaadb6e293c609ba751ed5e3fddabc16dc95a406b231a93c SHA512 914af427e1effbca5432966971c0ba89ca94004554ba93d4562da788a85b98073c4ccc91754036a69e4e05ad72049e93e4e08f63644555b1bcb703eb8454d30c
+EBUILD firefox-bin-78.12.0.ebuild 11540 BLAKE2B 1c49df21f84cdb50ac72e1f246e9d8ace457609f39e9e8b958bd6f488df8a2f27af21449588bece5a6e3552f2e1b4e7adc7813e88a23407eb9c42c99c6662382 SHA512 c42081fe1315e4d8795bd4272c383d0e3c2037fa9adc5316153a124076f3b9e5eb1077751287fa0ff5cfc74d869953fa6226bba3b71c038513381e7bc44a4e55
 EBUILD firefox-bin-89.0.1.ebuild 11357 BLAKE2B 24f2c82268dbed148716d4ee50a50c71533f7bd7914bd4fb333616cbe07b3916a894a57da93438a064882795660f805abdf4453da6d66c374f57080e624558cf SHA512 7325bfe17fb5346722c4cf5f2dc03c0d6b36f988de21b6d375b1329e3810a9ff80e877ceac2ad31281923abb5269088c504b90f9fa591792815f1dfa1021bc22
 EBUILD firefox-bin-89.0.2.ebuild 11357 BLAKE2B 24f2c82268dbed148716d4ee50a50c71533f7bd7914bd4fb333616cbe07b3916a894a57da93438a064882795660f805abdf4453da6d66c374f57080e624558cf SHA512 7325bfe17fb5346722c4cf5f2dc03c0d6b36f988de21b6d375b1329e3810a9ff80e877ceac2ad31281923abb5269088c504b90f9fa591792815f1dfa1021bc22
 EBUILD firefox-bin-89.0.ebuild 11357 BLAKE2B 24f2c82268dbed148716d4ee50a50c71533f7bd7914bd4fb333616cbe07b3916a894a57da93438a064882795660f805abdf4453da6d66c374f57080e624558cf SHA512 7325bfe17fb5346722c4cf5f2dc03c0d6b36f988de21b6d375b1329e3810a9ff80e877ceac2ad31281923abb5269088c504b90f9fa591792815f1dfa1021bc22
+EBUILD firefox-bin-90.0.ebuild 11510 BLAKE2B 5efff8a24494246164446815ce83035bd9361d5e664d4eb2d19b0ac6e4efbb23ae9064efedaf501963736621595910d7586517adc6dc76e8bcf703bfaf1ff952 SHA512 2f1da478e0ec5b497d97346e69a4158a685cae285b78c31fa7413c685893f7fe4bfc27db3311e412876e693bdbfe754ba29fd7870ad7c7f30214131c0d9ce0f2
 MISC metadata.xml 425 BLAKE2B b26681e09f7a128942a50f9edf7ea7db4060a91bf5384200793ee3020b48907d034617dba59b6f71a54414270b1f94909eb2d2e659cf845ce2ac7ee095405fed SHA512 abc41a669eb3f658829ad46631cdb560b4bb26297f6398981a66e19b54bc2403b3b2913c904421b1afaa92884d55a910a1fbe3f029911b2073557d1311236ff0
diff --git a/www-client/firefox-bin/firefox-bin-78.12.0.ebuild b/www-client/firefox-bin/firefox-bin-78.12.0.ebuild
new file mode 100644
index 000000000000..1068c1c84a26
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-78.12.0.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/esr$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+CDEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-libs/atk
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^} (bin)"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/www-client/firefox-bin/firefox-bin-90.0.ebuild b/www-client/firefox-bin/firefox-bin-90.0.ebuild
new file mode 100644
index 000000000000..ecadc88f7e5b
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-90.0.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+CDEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-libs/atk
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^} (bin)"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index b2b0f1e97acc..5de3ab18d0dd 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -103,7 +103,104 @@ DIST firefox-78.11.0esr-xh.xpi 427833 BLAKE2B 484282b3729b6218e07bb153120c50c8ae
 DIST firefox-78.11.0esr-zh-CN.xpi 564767 BLAKE2B 6a77c82c031ae8e2ba8d6ef4f294049f219bf573e678fc9fce4b23a19a89ab9d15487e760e809eda5798f5ed213d3e21c20bf34782e201b1fe04e51d0af078c0 SHA512 f2680016d879ce3ebe93f308cccdb59d40a850641e6e433a3b7620566591877746957fd541b49e466d69ef708f4422bab26316c4632459b4c8c1546ad5581a89
 DIST firefox-78.11.0esr-zh-TW.xpi 564742 BLAKE2B 3357a373a38d89cf4807ffa7d306091f65397f97ef3346603493b93e5daff42f0c55826d329df8d1bde7ff104862eac756aa811a4754d401448638fd251cf0f4 SHA512 08290cc90f946732c63aeb247ef4babc90128f04dcf3c32b623d0d822941bef9df1a2239c5bc1d067f04e4ba099cefe5255e4e43750f1053e133773258a68d43
 DIST firefox-78.11.0esr.source.tar.xz 333002576 BLAKE2B a8268886f86afb41b86d227f8a8f642674ea9c0a85365acb517c6997099dbddad9779efa772cce645da6443a78d6e94c89a750152386f8dff7bbbf31bf5df129 SHA512 d02fc2eda587155b1c54ca12a6c5cde220a29f41f154f1c9b71ae8f966d8cc9439201a5b241e03fc0795b74e2479f7aa5d6b69f70b7639432e5382f321f7a6f4
+DIST firefox-78.12.0esr-ach.xpi 460283 BLAKE2B a00bee0c7f0ec9c27454f618c0402721db074b6319c1b0964a5ccde3710175a20f9a6727eef881d8d3db7205b2f7bf5bcbf5c050c39cbd20f95cf23c6ee480f8 SHA512 6542b5683dd352ecafecb42a9bbdc438cdd927deb9e1c8f55f52a1c12690d1ac1281c379ed7dcedd6a62b4ff37b816b5a7870b0aa9a725444640a87b1e6749dc
+DIST firefox-78.12.0esr-af.xpi 428351 BLAKE2B b4f671687a03ed5e12e5c805b501ad3a975090168a60d4549326cfae17d0e31cbb7458e8118a8f85d566a75de97cd2b7a0f92f77f21e9b4a5cfd57163a54b163 SHA512 fa91d12158cf7d41000c3cb4beb0290c4fe760e5dcd27cd23d77b228f509558830ff4d2c29248bfc08f69c0a8592302cc6aa59fccb5b16f292e290bf9801f7f4
+DIST firefox-78.12.0esr-an.xpi 508377 BLAKE2B 63f4678044c1ff6088279a5fe25bc7a0eb0fb8eb8c2ca326c14ffad242be91892e8277bda016e852d61834bd095408d9c822e329918748248e4f8f0864c64718 SHA512 b1cbcf41150858ec827d485ca819490907d5604ceac758d478a5f39a20b1f204dfc674fa5563c25e8fd93d85f83faab3673e4d08becd6c628d1d8c118c22bbee
+DIST firefox-78.12.0esr-ar.xpi 560954 BLAKE2B 625905b86f9a7b9b8063873f7ba91d59196abc95a27b15764fbdd3bfea24d7aa69c7a9c4934fa9b0d8f210ff90b9782d981221bc8d892b5fa83b1c355166d554 SHA512 c0b09fe41708f1cab137a270ac848627ec98fc43e47c6a405d32db7e01a13338516cefb2f3cdf1a8590af00e75c3d4bec782646d6d143d2b103c7e5eb861dfdb
+DIST firefox-78.12.0esr-ast.xpi 456387 BLAKE2B d8a5fd537ccbbfcd654ac58ba963123380363bc5acc3261fcc5f4051d93e254a9f9cf2929de1dbb9c2092e2494c9744c973e1b8a2a12650655f8d25fba7fc749 SHA512 ec5e717088863808fe34f088336f13add49035ea8d7f323fc3c094316cf8044772d5ced904904cd170f471186028c0ecca21ea52cacffcff185548172f0abd69
+DIST firefox-78.12.0esr-az.xpi 497433 BLAKE2B bec0f0209a6f5d9043f4789df51c34519c5f33c08a2f6620041f591599929514658bfc7a5ea2cd457ded405f58e000861b6c9186972ee4390555d7fe0c5fb489 SHA512 49e2fc648e30e419407714677b59194196404c50c92e4d1affa01d66cb7719302979f3d4b74c7fca83fdbfc7ec5c406cf876b1fd342384870c39e08f72346d48
+DIST firefox-78.12.0esr-be.xpi 608650 BLAKE2B 0ab6829a8f7d49678d905f99e53375946a733e12ed46cd693fdae3da19aade621b572028f938d33c91da3e69280b53c6ab6a19690648a414127bf55a3279ea7f SHA512 de62c7f2e5c8ef8323eac321ff3c735cc165fcc53ecb044dbeec35a2196c52fe9cc083c95ce755b97c320f123500565e471fd8b0edcadee2b998d005402e6b84
+DIST firefox-78.12.0esr-bg.xpi 553973 BLAKE2B af6c0b0aaa207b9714269c2844eaaf4b7bbdff58350022bc816001711517f50e30b3eee62ed8dee53b906eb990373cd462d45b62cd112d44ac04e047638b5afc SHA512 3f50b3a300270a12b220ed903ba79738e807d71d731bb8755a543984b84272a7f67e1e4a05fc5ed7c87f391de69e9ede628f50a4f8faede4acf224adf0de4f7e
+DIST firefox-78.12.0esr-bn.xpi 572610 BLAKE2B d54b5abf4704b472537badef7559170f3663cabf6c7a48563fbac1b1f12f16bc048cc28e382f66aaa064fe5ab25b57e9ed58e94e9b285184d5a8ee1c2adc526c SHA512 3b116f3385d67f6901a801a758a02c834a9019696c498d085b7c0dec28d723b66f6485063db1ce7024e8b53793a3f146cac7337c130afd060c810d1e39ccd652
+DIST firefox-78.12.0esr-br.xpi 507129 BLAKE2B 19172ffbdc74639390d9beee945183e4f3ae068200af8caf697839774b942d251f36970f95b1ee17ea5726a4050a3ae77f22182810cb10668a17574aec522b4b SHA512 fc0c7f25f3b8a08052d5880e6c18df752b650c349411e464938d64850c7f8c5a471f5a7048fc13a6c7e8a0ef1b3bf7a7bec9da3b70bc4ca101f24288a09979d4
+DIST firefox-78.12.0esr-bs.xpi 463802 BLAKE2B b151773b4bb7e1c51566205e645c8a65a996bfcbd3a60f0648977f8a0784a6dae69ac799efbef5ba9daac906e48cc218e55d7c9a89181d8bd598930be5aac4a6 SHA512 85a7cf7f28c984f1330ef0e2b964d446bacb4f3369d1800031cccb61c43e10e990726af3d8aa8478af6eb416773c9e66f50793c87528435bbbd7b0c50e4d3b91
+DIST firefox-78.12.0esr-ca-valencia.xpi 517178 BLAKE2B d1574689812e3c1b01323d9eec83475d89e333e7ab8bdbb2b4cc11eed3cf7c56088adc3d1da7731c5ae65f3b9c0a76ab0743f50f3529dcd38d62be55c2862a9c SHA512 20b4b91a5e69975479a92f563042128d66d319843a71f7555f7fc53a1b9296d8eb8c60a3c647176a70408b616b5c5e44b901ed67bba46670dbf6cc31edc84e53
+DIST firefox-78.12.0esr-ca.xpi 514183 BLAKE2B 297626859bcd85f1e77f0eb37fb9c98175f8a7e6b45bf072405746b9428c2b789318db2f65fdb5dd906f8e21f7678d39efa62f031c4e884a689de5c7c2d7f3ea SHA512 24bcab6bb8d1e16d6098ace8502703e33e2c88c9d31a695c0783b103dc0212dbc48178a488a35b54fdc0a70675f0e37244cc4ae7bfa39d13614ff89fb2b2f7d9
+DIST firefox-78.12.0esr-cak.xpi 551556 BLAKE2B dfb1d7f88d2ceefd923f4af7239079ce2b1d0336cef47f26e35d5aead93351b05b26317875adf870acc817b71e02cfbf39e322377b3f89f93707182da13ed8d0 SHA512 1a1be2a52f85d06ddded2077ae330767c4629c363f7c11a1e4ac104d36ee4ae8640ae10d3dca1c94018c3cee6d94bbb241de6aacc49440479d5725074742fc75
+DIST firefox-78.12.0esr-cs.xpi 540329 BLAKE2B feaa6692d66d57084cedeacec0f3a49a5f175d59699af6980a12880ed3cb615fa5552f53a660adf9125a90703be743be15d6cdc651a68456ea22c4ac81a388ab SHA512 fa25f5f1cbe7dcff4e78fa02fc6996d1503c35b5b0a581172c6c111c86e1c65ef00dbac01372a33d929f03b15371545bb99801138afb26e39181248e663087f5
+DIST firefox-78.12.0esr-cy.xpi 530698 BLAKE2B 1e6cf6f9ac920a03315fd6901d79942cfc87387b00930b3a1feea7680d62a0683737463ba034530f65e9f85d1d99a3e2afc927cb6e221fcf1b1b9afe61d98919 SHA512 9456922b7291077fe26db1e4515742be7f860d294610022d384fbed1d5adf2ac973870e48e9695781fa82eeb92b431fd03dd15ff31a2f31082e340653c7a93f7
+DIST firefox-78.12.0esr-da.xpi 520269 BLAKE2B 3dc9ce7d730472394c3b237d5f9eef4b92dea1490cba2e73286aa48de477986ca6afe8a8a9f697ade06569f7ccb507a35ced025276b69d86b8ee7f0043ec1362 SHA512 6535bbd10493833c9f490806ebfcc7a02a122bd17c82468637e1e6c67f1f09aa207d5ee7a00f79796a70defe5ee53486db4e6f5ed9a712f06072ffe103948f9c
+DIST firefox-78.12.0esr-de.xpi 542853 BLAKE2B c52079da5fd96cc7a9f6636200764544c8d0c082cf9bb7dc3878740391b1b4eeca39721ae7a313e8614b71a80e856f413e79546b2cf62555f03800812759ce44 SHA512 1c66836985c31b6d46d4898ff6a73f2920d09d487f7deb4e5e0556cd84c7878da4c4ccd3131bee5ad8740bfe3b248c62e220d9a6c157dd5800111b288c339e9f
+DIST firefox-78.12.0esr-dsb.xpi 554280 BLAKE2B 3d14eaf320d18d7daabc8a0af83a34f52a616ed66f454ff2f8441cc776af604ddc90830f5bb6e1f777070607c73f25b522ca0c11faa34907ad52120e41ac56fa SHA512 4a05f52721ce363f4d977f92475029fa5a86445742acb1d3e4f023ba7875e9cc4b4ed290f75f3263c276066344e8d5af49fff4feba38485980b664c4f2bc93db
+DIST firefox-78.12.0esr-el.xpi 626568 BLAKE2B f89bfc615907dcfe53d870d6bab773f086c84e03d7632e826983da5271504528d3b453295d3edd1e5a9ce887af338f5fdc226c4fa7155f3fa9fc08c0ae09d378 SHA512 5997b04af48084cf9087110a42740e4e71d48ac4e0d52984e2e4dd62045001f14fb41105a693fb81a423bd985c464402a27d0217d0aef9efbb2e5fe975d74b33
+DIST firefox-78.12.0esr-en-CA.xpi 497732 BLAKE2B d7a74ba343baa1910eba123f801b82e18d9fdd1054e0df87ae234dc97ba5daa6a81d5b7dcd6fa403e0c52e884459c807b335094b4a8dbb09793a37d3731a4809 SHA512 78c05aa972db64a70980ea967f87edfd1edd08935313f70a43c0918c693e372dbff6f3ff1d233ca96268747e3f950e4666f23971d5d380f05a144d1be75d30b0
+DIST firefox-78.12.0esr-en-GB.xpi 497581 BLAKE2B 166282a2040172f9e8d209b9a8b098d4f56d1a4888ebc9b7ecd937991305827bf5f8bdafc75bf85effe97d4f809ca7a233b6f5ffd345e893fa3a5bc15fbf6445 SHA512 af372200fad2cfa9f653ac349289f0c20937f5ec798832e0d202f2f330fcba5fd04168b5960a5b8a534a1904bd5206f6745102e73ed6775dcd5120a120ba421c
+DIST firefox-78.12.0esr-eo.xpi 525738 BLAKE2B fa6cfd49fcda4fdfb54c93295978512a016f115cc0da9e54cc82f0da9c4fac90b2e2ea52d3ea41ee6b0654c90656b17d33ce316dee349da0dbe719eefdd6c6cf SHA512 8b11970ac93265c61c6518fa06eea0749f15f3cb94058e4f4c0db166fdde7261bb5bd9eca1e5f54db271570bf63d7f84d1ff5e141b20ec23ba09aeb9f30ab1e1
+DIST firefox-78.12.0esr-es-AR.xpi 535801 BLAKE2B 60688df3b040e8b17738c5c8f60e29bd9bca88f8d272e09ea9db60af859981ada067ab5ab7418153805a730e9fab1afcc0df2d55601c4d1dbc334d8ad56e42a4 SHA512 6567391847b866c5c4d53bc628259e69ca1038c468f0030536525d1bc5df19fab8654015f6404684156521a664422d41fdd341d8d4324e0ad8ecad1a96e759ca
+DIST firefox-78.12.0esr-es-CL.xpi 535347 BLAKE2B d31a9937488d728c9142f774a230f82fe955f4e735b9c4c71ba063e4c0fe80fc13a1227876dd14fec6bfe069cbe07e10e8ed93577bd214f5cd27581eeddd4b02 SHA512 49c96e3e2e79cd8b57d47e62a9f023ce52cf3b2ca82cd3d7f03d26f3c7433f080e915d4b0d0460af6d7f287ebdb8307e20a395ffcbcf926add14b31814f488c9
+DIST firefox-78.12.0esr-es-ES.xpi 522691 BLAKE2B ffdc2051ae8566d8320aa5cb100fab84df2e5ee1686353f21bffaeb15b7058e8920c46ac1a86f014ae2535435542e410b9464501d2306bc8215678eed917439d SHA512 754223da264548ed628611da8deec195ae5ac978c9f6244d2f132a7449c6693a09e0c808023dc3e18413e6372ea9957a8ed3d584fa06795b8355aac2823288c4
+DIST firefox-78.12.0esr-es-MX.xpi 532295 BLAKE2B dcc9269f6c4a5f55c871f11f81d29146d83c4e97b33ab509419b598d6716ce097760bbd677f7a5f0367323f31273837552db505c88920994a5e42f85616d84b6 SHA512 b3fd9d7fa72e730a215f3ef8b9cf45be999b5c393dd9a7f9a460bf83c52f10ca1057c52763f336dd3c5db3ad70bf9d0a6583a227b4403a4eb0137d33d0dfa24c
+DIST firefox-78.12.0esr-et.xpi 485252 BLAKE2B 181287684643149c2256a4c33c9486b947c8fcd973aa8bf76870082ab61ae735e997293abc852ff98611ecb1ccb9ee2f6f091604d3e7a67bfa570d741143ab93 SHA512 7661ba4923fbfda802225135ff2df04f5e6ea731bc8e3268dfef95749023b810997932efab11453f8b470d27372887e41d0231fd9a82936d376ad5a66705b4bf
+DIST firefox-78.12.0esr-eu.xpi 505876 BLAKE2B df642126d782f09639ea28f7cab53173f2039b0455f35589ecf9a1f07ec12331e555661c550bcb79391cb8203702312a36ec7385341ddfb487efa2cb218bd00f SHA512 905a1f112d2d5dc5e1ac465a4234ff64d08f44394c609c7dc11a895aa203b69bf9dfbf381b204b025d09a6a0db2eb95ceecb61d3b8f01014a9b003863480dacb
+DIST firefox-78.12.0esr-fa.xpi 538927 BLAKE2B bdab40593d23214daac28c7f6a2e4fda159b9af828158132354077596402dee1a09806ec8a699390f75dae82e548639b81a43ab4fbcbb331d9c2dce5309f4331 SHA512 34d8d6ed8aca43b5b70f595fc866390e389cdc79d7b48b8e66eb179c76f6cc09919b66fdee485b7646f386b79a1aaa6998f7b7c672ed7c286e646058484cc79b
+DIST firefox-78.12.0esr-ff.xpi 481609 BLAKE2B d076044f29ac3dcad8fe8dbcbcf2a8e8c6c52611d3cab47bc1a9341a42030c3cd48dfa595b8277933a4d038d81979a4cfc002d9a84c6203b2257126bed5e624f SHA512 620194c07b9a6eaaadc99617111c602d05ee573c8c3b95ed494e8322508b39d1e548d77f9014dd8ba3a2c2340239e1fab86a2788e1ade99b4dc6e16a205f7ee5
+DIST firefox-78.12.0esr-fi.xpi 517919 BLAKE2B 598654771e21d1c9964288f3c4fd53d2de6eb61cbe56fb6c0794904e8b12fcc0736191767658e9d5395ee99cdee0de56c2a7b07de16295573a4b7062d3703924 SHA512 a01cd7389cbb0a6adf05683a80b43b32119970181b0c32bec0383374e2fb4a5f767c3eeffff669a563fd6ae908ba431f67449d79433adc0c89133e59e6e67a22
+DIST firefox-78.12.0esr-fr.xpi 545884 BLAKE2B 1741066c45d77d6dfd4c33efa22cd04c343050a02e3f977cec5914729af87fd8cef2a2aea73afff9c9ab6b953d528bea7360b987ade059514ca03e72b937941b SHA512 4657093bf73e284491811cb3b98fde6b3b6fb47793a962700945f86091e677dcbb4431efa6a84b6f58320ab57ee88c0d8735a74c740ae6f21b76105740b26c1f
+DIST firefox-78.12.0esr-fy-NL.xpi 532485 BLAKE2B 8f3a639b2259781068c75163ed1a09ec9d11cfc0e07151caeaab881f75c551b1abebcc36a9c2373c5488ceac53762b911f348ff3781de598ee93e914f3c0bd5f SHA512 e816b480705a9e2ac5b46ec5e781ee15a5096f0ab78376599bbd447fc87007623b4324d675509e0115d20257d1efb03d66ee60d72530aa5c28db8d9a9afae4e9
+DIST firefox-78.12.0esr-ga-IE.xpi 466890 BLAKE2B 1642e6587825a9220424de58c5f7933402713cc8b43173247ad8bf47bcc1fe56feb5070616e29d6fcc4af66a2ff4023850d2873958082c6257656624daf73769 SHA512 fc1a6f74877ad6beb275b836f6ba1ed2b66e26170c15ecbd50a40d7cfa35b8e77b7eaea851e308213c73f57538a1fb32deadb44dad5a9d9bdec9de261c9cab08
+DIST firefox-78.12.0esr-gd.xpi 491887 BLAKE2B 86bb50326f52ec809777b1aa6dcfe3c5df6436eb0855ffc0ee7946a2266d4e70b8c596e4743be66c0d96d2e78eba74cfaacc044a4dff75dfa143899b964f3bb1 SHA512 41fe61ff05a39220faffb5c3cf131a92e00eda26f41bff0c61f8802abea179e0fb757ff74a2855921f2523cd1dd2bea4cb03589fc70210f7c6f25bdab321b726
+DIST firefox-78.12.0esr-gl.xpi 528408 BLAKE2B 7700bde64cc4ef05bbe29de4c7f066ca064c4f557787119e8bec5097ec947846d57f0a4494bc4bacb05d9044d8433db899840c7181f60b0d258290177530433d SHA512 9120e09f38178c72aa190ec1a78e1f750c748b1b5d62cea5abea3d7767cf7cd14000ae83dffba272311daecd3b811e00728f125d301de5a3fa7a78c1520e87ff
+DIST firefox-78.12.0esr-gn.xpi 546465 BLAKE2B d55ec543e9a8b4192e3d2b28f75305f9ee04d5dbab51a23edd216e20c70fd752e94567cd573eacd1727654a1e48ddd6c4640f43abd784f31aa4406769a25b7f1 SHA512 43c83e5bb7bb3d95856c05fd3a962eaf4cd01bde39576f43da4bc35e49b571c81f7baf4c84a8836d2bbfe5b50ce1c21bdf97c702511d74562e138bfe9c0e3b9a
+DIST firefox-78.12.0esr-gu-IN.xpi 541422 BLAKE2B ba3a82771dede3eb4a6971dd6c28a248139428dca3977df7a4279bd5a2028a2d01f3d078b748dc0c86923fa8677b2ebdbcfc1b99598b93d89d9688957404b3ca SHA512 62cd42cee8dc8531e1ddedfcb27e17d06f46ada4ae7be3c402badaa57fd84a3fcc70f6dd6afb1a2eb8b6ceefb979899aae1a67e08d73db073fd8f0d29a9a19c8
+DIST firefox-78.12.0esr-he.xpi 545595 BLAKE2B 8b2c65e9ecb12a9bca63694c4fa3ef6cd1cd04093e9f4da42bbf0b2bedbf90feca27a99d66652fd735f84c3f5f85e57b55734fddeaf748a8bac8212975343ed5 SHA512 209f3f6b1b2dd176fa340c65d3d880cbf7f02a850969ee333f0d98b7bf69bb2ea5a1c0dd434c0bbe06fa1ff74170f4bbb57112af072c5a045486ad9a3331e436
+DIST firefox-78.12.0esr-hi-IN.xpi 567860 BLAKE2B c6a65ab10c21bed41dc7eededef8092ddbdb0b09c6c4de87d4f0558c69c6d063595aa9c97ef3b7fc7f6fc88393609421cf5048b3e1d8130fd5c4e8361f70040c SHA512 cc2e2b370c0eabf2892993c1b97f0481f515b981c7f1fb4cbed8068fd13ffcc7ec0a3707dad53f691b5cf77816e24a8a04eadd88995daf572e34ed16ff95cb12
+DIST firefox-78.12.0esr-hr.xpi 522698 BLAKE2B 13c644feb97ebd9a5f0a0469bfb766a541fffd127fee2942cb9514404b9583c9d1ffb5eae668e2dd73190a82147fb304235f91c84fbe57c0cb359ccaed032bc1 SHA512 d5efdd70d10dd0a401d3d80976be737d5012ef33d95332b73d773793ffe567a7a447c8a65b9a2d931a4e6273c7623771b2c50a0c9424ada6dfc25b0722fe9911
+DIST firefox-78.12.0esr-hsb.xpi 550669 BLAKE2B 3a4224cf17d1faa79eb19c33922a1189604d8bbe206dd837931df509b0eab67d46ac90cc8a3464114c694037ef8896bff197d8fb0a74372093de70f765414810 SHA512 17e8bd7d8ea4e9b36ce32313792f2125f78db679218d530c4c226e8c86711a3bc79dc1ba40b66c04741a2601b4fd6bdad5d5eb732e365219fe2f2518256338a1
+DIST firefox-78.12.0esr-hu.xpi 554886 BLAKE2B 3ffed6828c76c5c51d6774653ad61777ee89943625c8ce59643f1af0df6e2a4d5dc918778c7c1bda9b3f72cce6fa534221d9b895ead11818348f9c7a0fa1bdfe SHA512 df432acbf507eca5bea458ce545de7521719ef1392a91e9717d538dc29d83135c9c5aa8bace1ca08788672eab7974d35883a4064d443aa6404cb408db784d77e
+DIST firefox-78.12.0esr-hy-AM.xpi 588981 BLAKE2B 7ff31af1fa503573f59ba57d072a24cd7ba8185a28256dd66c3e176ba21619b4175d4b40e3787c76ffd7944a8da059da588167cd773e3d8d5643e95e1fb33930 SHA512 3169381fbb21cbedd115613fc9ec96b1fa4fc9e6bc819a3e94134a05a8ac14ad5f2241426cf928d3ebdb3a48db8e49fd1596ead5a8cc40b9ad12385e6cdfe604
+DIST firefox-78.12.0esr-ia.xpi 518808 BLAKE2B 769860bd1a8940bfa4cff65682501db93e653facbe4c1ab1ebc4068864885266c0e203bbefe58f477e1fb3e397cb5ed7b0a1fdbd840bca9b89f7e2bda5bff705 SHA512 4d02668a8e6c30fbffe327692a0dda509daffd1f5eec08026f9b3944825333b0a38d3f71810220369b0bbee5f4c0082eb6d2fbbeea2aec873de720c4538e49d4
+DIST firefox-78.12.0esr-id.xpi 509561 BLAKE2B fcb2f7a558f6592260bec964de149001be7078e338f4d09446b01f1fa0d196252d2ce2fc1d2ffa4ea0de45d492323b4e9bd94ab268baa7f2f3f9c91aec7514e1 SHA512 098bbe019415541975e375f02de131af3a50b6ebaa3c39399b14b907e67740a28dbcfe4b15f0755011c5273504ecf74828c65c5d219b7a3dd7d9b9bd9de19179
+DIST firefox-78.12.0esr-is.xpi 477012 BLAKE2B 5bf1cbea09a85303ef4d3e25798c94a3a3e23d770536ad08c645490c042fad85f1254946aebe85c5388d54115d5c9bbc30c9c1ddf2e34ef40bc2b4b4c8642760 SHA512 fb385a03d574a8d280a54c977be14996d33d46d5b5495368e4226ecefb12e479bb57b21e28f3c23c14f4d1f0353c725cea3ea5e3e3498e4ade2a91ad59e0f847
+DIST firefox-78.12.0esr-it.xpi 449807 BLAKE2B 0b2b52d50fd220c7d250701bfa12ebeaa5863c78e8759948e481e22ea76cb10a406b2b32135a73f23155dd4c594002db777ca9ff4c4a64c0b87e642bdaf68c81 SHA512 b586eda2043774edc5008bfceef5f779d2e468f7304eea9bcf2d956078d95f04dc6dc49ce996496a131bbd366bb6b588d20b914ee393f175c94bfc52713af199
+DIST firefox-78.12.0esr-ja.xpi 578200 BLAKE2B 5178f4003c7ae8806b52223d1e1b599a693519f9daeacd5532c8dd6fcebc7cc82cb5539873eb4395dbb2a22ef6da5d09a9d9f9b0d395c7365fa1e6fe45e1b0b3 SHA512 268afcab72d2a5406b77d992ce005e336520f957bb81dac3491ea74b2d9e2906aa34dfb7f7ebb70b290737382237481bcfea0ce9f4c3316bd3c76f9698661e07
+DIST firefox-78.12.0esr-ka.xpi 579082 BLAKE2B ef8c55d39a2aa255eff85a7eb66f2a2d5c267948887fb9e975ba86d323518d863122bd5d48b2de158f35b084f54d6621189f4cb7df44dc271e85ab494fe113d4 SHA512 8db2582ed315e846e6eba468fb804cd7940984edf29a7b992a96eaebdca35110465457d55eeb5ba2557b4e868a0b0b600ccbb2023603104d7c934f80e022d951
+DIST firefox-78.12.0esr-kab.xpi 539732 BLAKE2B 8f5a140b2d2abf4958c6e437f26d49e6ce06511ac798505a2a7573010bde510ef523fa92d809e6dbe7dafe1e370932fd5db039099b2c619908d095d94b470ea5 SHA512 e4455e2031b86ae7b0b76da7b90f68cdec247ef9cadda2cbb7b86b85b80f296418cb3a034c6c630c9d62c056a35f0010b0f58ad53e634f7db68e4a4cdf09fa6a
+DIST firefox-78.12.0esr-kk.xpi 593260 BLAKE2B 68eea4cb0f257d4e1d0771d3e06324d4a556ba0c063a3d17f641330b289cd85c677f01c644713a882fdf3a94650d4824957dbebea37d0d87628c872c8f77a7c6 SHA512 e216c3727e7c1ef3c04862c207a9b22ee18202ace5dae589d19735e82496fa10560ca7c5e97750829ba7b9df57f0695778dc60794c837710be2509f139783fa5
+DIST firefox-78.12.0esr-km.xpi 527366 BLAKE2B d166e62391f2a93ee7ed06801bb1ea0d702ae4977c610aa013dbe7e21d2f7d243ed969370a8815a4173b5ed691b375804632222367e8b9c537ac7a03c3768e39 SHA512 ae50dcd81d874cd8802270903f4db23d7fac0ae9e913a674a2b487062cc901102723b3155e83a423ca07eb814f75fe5ab39b83ef36e203842c96af7d0bc587c6
+DIST firefox-78.12.0esr-kn.xpi 506748 BLAKE2B d753d31da106fb6857dddb21b95f755d8d8cd24f02e58a8d3b189530c568bbc94942d62afcaf49f3c82b209baeb455252a97892482538564c0986408c1fff3f9 SHA512 5134e70ab4ebd1b121a063e918924139a601c86af006d9e8f3a5025c68a6af550319511b4f032eda1c2a45fd7e857577d3ad4b7a6f86753b3f84c065e200ebf7
+DIST firefox-78.12.0esr-ko.xpi 567527 BLAKE2B 14b9d67c582ce2cacf1196ccfaa9f612e98547f30f321000650978422a2a0cd33f9c6f9f135b289baee75f28f3c30675ab486d37d4b028c39da9b26466a36837 SHA512 36bfd233884dff29ef3a41370df17cdd1f306b1b35bd81e8d2881c09a5f73536f834c6bce7f0b81b3b89862b19fdd507ce321e2b467de20586e829189a74f90b
+DIST firefox-78.12.0esr-lij.xpi 475236 BLAKE2B 89d82e8b109a625ad2b7440a908fce782b43e7bbc1b58b3c60a652334f25b2896640e1b97bf541c59cade8c6840425d6ef0cd9c8d8fef3224f77184f5515b5e8 SHA512 78b62ae948e65b53573c1c393b52242129e12e1a30dfff36ef2d435be0466c14cf09f28dca92b7d6ce67430a6c5f057178bb601d3378036db0cbd1ca13b5cc5e
+DIST firefox-78.12.0esr-lt.xpi 540687 BLAKE2B 36f07f0bd85470537f06e6f2a40ad5ff5143c256a44f6ee332caa4ff77f2dd87990c18368bd85ece775558f9312f3201bc30ec3b354ce3d25e822e6c98f6c938 SHA512 1df7b888852aa29de0de945e1d901a18b35537e4ab9ff9807e9efd3ff2c385292873862836bd40ad8eef1cfd5f6aa6b2fe7288334e2ee295ae12cdf29e6a3eb2
+DIST firefox-78.12.0esr-lv.xpi 467454 BLAKE2B 2eb95094f103059c77dcdad427394b70c26033b8fe9c2867750829b90deea9d1ffec738770fc0fa23ce2f84b8c92775307fc3ece15d2749419270ac1787e2d27 SHA512 4517bf89ecf9fdab3b68b58ae53709b327b38f6c546aec85ca339427e1e2f4e846b91f680d7dd59bdb935ad9c81dc2a85bb5e2803fa70a077a10fe082388def4
+DIST firefox-78.12.0esr-mk.xpi 460012 BLAKE2B 01b91f2059dea0e6aecebd98daf280a1d299a80d7777cd0e363b60cebc1f6bab04ae8cf6c666bedef33b9246cf623e8074ac9eca26d7a325451b5e1c673e9eee SHA512 641986710a8da7c4dd334039e403a8f42f0f143752555af72079246e001e8a4d7b8d013e900fb2b755ea60a2df2a748cd802398f694d6fb9e2c1cc61ee118f28
+DIST firefox-78.12.0esr-mr.xpi 541569 BLAKE2B ac084f640e23cdd07f93dc3b68d61eda67815c70f13d616d8440553f06d4f831d7815e390c88466d5fdff4767efc61196971bed750080b7940ca53ca76e5b26c SHA512 98282c85887e71dcdc08be45c46baf8893e9818880ad7096c57d946c2e08808fad74222c907c593a6f1d67f50f1cf6fa65e158f2379b3ff2e45c641c8975ab34
+DIST firefox-78.12.0esr-ms.xpi 453061 BLAKE2B 0fe96bd6db5f8f0fb9423a659a052a51a1bade98d9ec613efa29db87b6483e792ddbb6d6b6368cb7d9a1f52be42099d3fb927a4a438cb4aac32968089fac2376 SHA512 122da1a5bd6c521fbd93657afb26a734082f23b9e6e3d32c28345692c86665fe1310c74bebefdf65715451632e4f03bb3a0697e010712da7b90251e3e7a4c9ca
+DIST firefox-78.12.0esr-my.xpi 526323 BLAKE2B acd832cfa37ea57d3f475fc7d83747dedf76a81d3d783b83fc1dce42949e0cbbe905390945df314b14d67a4ae8a685abf8c20258bcb85bd04104faaebf18bfa3 SHA512 92b0fe9a657e3ca85d9b1c81d3435d94028e041098b7e1b52a26d4e9f378319cf70e9649585fdba5dac919c8189289394347466dd8be0492f05239ecfc4e5ca8
+DIST firefox-78.12.0esr-nb-NO.xpi 518519 BLAKE2B 3acb4ebe5add5433b603729a4afd3d07b5c611b14996f4723c865a4e4f77e77c7ab7b0a00c697190ad52733323a8d9807be5cf273bf4767b0b823fb0efc1be43 SHA512 9f1a0bfcd1c668ddcb7ce1ea52ce25ea3c490fb16ee8e4e475668b1e3a7e2e10db7dc36fa118b911f7b3b7e71054b664589763cb760232028552ea2220415a48
+DIST firefox-78.12.0esr-ne-NP.xpi 483409 BLAKE2B 24bc0e9eaca3055f2e6ed764b5ab230b161404694a7cff3c0d61de5d742fca558d894f72b00d8b9c2d7be5b96ea88eaf1656e90843f62afc325044fdc80bbd4d SHA512 ee4af731da6b770ea503aad20900da86aad7ebfb9e4509035a0efafb658eb62ef6633ebd6facdf38404dc2bf6e656eceeab6c4e358e472b7a220d7419ec28bb3
+DIST firefox-78.12.0esr-nl.xpi 526209 BLAKE2B cc7926d00063e84f4a9bfba8719d276c4c847152da283f0b36dce24cc1ab1f0ac0bffe29ce574362286c664564380e88f1575b19af5121f54caeca02f79a132a SHA512 5be0868df240c3f2bc5f62d62e33557bb5899d4afb8f775270a2a7e8d3cedd62b06f1bbad6ee4b42efe47faa974d2af684a629b910ffe3aa11877f0f0e772515
+DIST firefox-78.12.0esr-nn-NO.xpi 520165 BLAKE2B 5c730388fd83f76227e016a0cec35db136d4549105c7c55182125bbad7ed7b6797dab79d5a56cc1edb06d04cc6cff6734b9fc45db7c20b2efeee201f654d8247 SHA512 571606c967cc2d8343a9cd144b4c2b4f8739d43a899a60674d38822a8d8c488a6f4f38a3d7fe79b32a0e2c70b8d358ee0b6229bff4eeb16ad75e452629d78df6
+DIST firefox-78.12.0esr-oc.xpi 542161 BLAKE2B 56862a01dc976698fc1fa822cd4a540040cce2a98dbd8c68822d4d02daca9c30c785f2df4a4efa525f971aabbe90aa2f8d499b4b60ecf7fe064e4902a710742d SHA512 ebe47b83828bb15fd17829d5a741adaefba99702ea6642d0df89767ac0567905e0ba4d7c5014b453bb0ad235c317d1d9908fa9f3c956221d2330adab6ff09d06
+DIST firefox-78.12.0esr-pa-IN.xpi 580361 BLAKE2B 5708b864aa5bae9961c5aaeb75bc2d82e118e9ed4e5ce60b2202aeecb2ae9a55f3c2e5ea497352c7c5a5310be08c42ea7099199ccaa6ba5de5bd3ffce26f7406 SHA512 3a539f44c67f97f2e4a1c9cc29934e5135e241fe0adfd579571305baacfa545e602f78a2ac183086add7df444256eabee7e3ab32a626bc8d3ccb46d668831094
+DIST firefox-78.12.0esr-pl.xpi 545587 BLAKE2B ede715662416623631f16a1f3ded4a9beb8483a6155d541ab0d316902748295025fcc5a58a376d437ce496a0e23bb67772acf83b6477f70b0d0006c2ef58f5f4 SHA512 426b6385cee5ec7e1fdc97f8ebab31d9d3e7c7228cd791f2653a6e153c9c210e25ccb9040fdea89779664e8469958a3fce2036e31c00a51d48ef97eb1709cf85
+DIST firefox-78.12.0esr-pt-BR.xpi 527570 BLAKE2B 51dc9cf77c2f98cf5ed9045d355f8045dfa9bb3008dcaceb820b6df22d15e3fdf2d7fbcad986d17a93541051e863360786a3063d87233a9986f3a51cbcb821ea SHA512 9475a182f30f5124e9480def4c4d481ef744e9a57dd44418d9219ac464a9c52c35b50d713420b5957d3c18ac0b278ff0e9fd7ebbc8e7d723e3e54b697bf44786
+DIST firefox-78.12.0esr-pt-PT.xpi 532051 BLAKE2B 0296ef68afc434d5f382fae28f7d196fe535370fcf3aad8381fd485d52337e1655e7e175a73f69bea8f4ec9ea51c81f616fe6e01d893d43f37ff15a32e72c5bb SHA512 63cdc360ce7a950285c9ad2a8fefb15e1653db6cf03b5dc7ef94113be7a9abb79277e7a483a9969e317df5a80c0a780b480e36ec4b54b81e061eb6f8d78228f7
+DIST firefox-78.12.0esr-rm.xpi 526719 BLAKE2B 06fa9e1e88a49dff5b9e2d3a8257aa04f07f53761f9786b41f837315605c7df7d65c99a1d7faefa9d70a205801ef3a6de5e6037c3ebe740bbc848d2cec29526a SHA512 0562f349ff89dc6d58449ea84be5b7a3729b6a0a9da10eabe3e33ae0fdd67a356022e416a9164a76ee2b6ee53dafc683a5005709674a78c9b533c66cc45d0275
+DIST firefox-78.12.0esr-ro.xpi 535573 BLAKE2B 6873bee12b50838cf27b91c1d6bdd63a9e1cbe3c63e89c79ad2b8828f33c29dd95915cceec5fe42a3be12f8c1f59dd0225a9ace3bbef0d4e8cfcadf9724fe6f1 SHA512 73abbb7242568011eb39662e15ec2d63fc43fe269b21f82227d4b9a7eb89e9b3a7cc6ed9617600365360636a8df968cec87c966fd501ef1b4b12d276dd11c5f6
+DIST firefox-78.12.0esr-ru.xpi 614597 BLAKE2B 736786d92085cbb194dd371aee0a517ca6a17d9f6fc0db45e653af2052c5f5f39fe267b7ea826d102c68f699e991473474b0398175db17e3dcd58963a680d5b3 SHA512 432e4594e3c6446d9cfd24089a70960da19876b1e79e30f736471ac32f5772bce10c6c58be70237963174e828bb0f9ddbfbed2a314376d248fda9fe7d1d33f50
+DIST firefox-78.12.0esr-si.xpi 492527 BLAKE2B 1972bbf48b423af6d7642ab712affd8be3d2d9f22ee6fcd4d0ab5d79b34338d73bbd0f53f3809cf9a9c4adcb7a65a30ad5c751a8281efde29396e5eccdf49b20 SHA512 d223b49e703f2e4a0f26dee7353bbff6e865659abcb1e13dec3d2904e3c6a6d3d8c83216c038e425a65752e82b0ebe96368292f7d1229abe77994558394e439a
+DIST firefox-78.12.0esr-sk.xpi 534223 BLAKE2B 2b5e1c5e6013b69a7fd7bd47036c87fc12c4c53b8c3a8c2620dabe82594f4316dd71a038a47c3135a0b87a87cdf702ae0540f58906c0f6e0b181e0b9f68c2c4d SHA512 a3db60cc1d983eb7d1a3e3db671d82b80c657f294628a7d22652de82ed95ae3f149b7ff1e196d25fd6e25689c75c62b3027431fb33682ee9e7cfa5ab5ba529a7
+DIST firefox-78.12.0esr-sl.xpi 520944 BLAKE2B 9b4024810e61b3af52c866ab4abbcd660cd5da7a36245cfc134afa00e5e503edb22987c72a3d4180fee4aaee30549614063b297dd1a9db510705a665e4c59096 SHA512 69c1f56fcc966b29746f85a180e331c0646dd430f53cdcfcae3c958077d0bdc0d6332dc3c15910fa2e9dda6809fbe1c3982c9aa1f7bd7db6fcecd9d2fa4d99ac
+DIST firefox-78.12.0esr-son.xpi 424572 BLAKE2B d36a4002006b7c7f2a259e6b40bb4f385a2740b4e8ba9d3bd7b278baa24b0a1e62243982f34819f17a6824cc66f5ca4e7f32a355291ea33d8865172eda58cb69 SHA512 3a412d3ff10a11b9aab2751f7b15617cdfc4297d77301ed054119d4bf8746ebc132067e3dbb4100884de735d83f16ad326b4a7b4cabe150da609d8cafdade4a5
+DIST firefox-78.12.0esr-sq.xpi 544911 BLAKE2B a06a917f6dc1c3d0ccd712b3bd2ec1ce54c801c212c15da968282a7e169399690e7530b5b553dd11d3548df95e676c4882d54d394e593385a42c631d128be9ab SHA512 749552c95096d15e7c7eebd680dcd31d2565383222e4ccc8cc3fdf30b4536749726a5a6813c4ac665b57711265b1686073464743ba788d30f3b832c5107388e7
+DIST firefox-78.12.0esr-sr.xpi 561391 BLAKE2B c34eb03fcc556e2db09496931bd2d08ba9dc8a4ecff89ca03e19e8679deb0f4d03ffcea9f7d67eedb292a0dd4c65a66345eef45d5a284c72663c33b1bfb1d50c SHA512 8b5110e43de2c7afa4e6fe152c768ce1eeb3e21938abe34e27d9dce69f890ce3b3d90144639642afcb5c3a348ded6c412c7e48594c95657ee33275b056754868
+DIST firefox-78.12.0esr-sv-SE.xpi 529708 BLAKE2B fbd72399195f0824350510000c07ab0b8595d3315ba7ad983d4147aa86955a0843b5086046cf6d80bd8769ee7a21240d368b2ffa88194c2c07cfef55aa6adb98 SHA512 efdfa3f39ac1ec45d736590fbd5a36b81c5b6996e30129d2a7bec93f8d90fd6db31f997fe28f6dd430e10d9333edf5f5f2bbd72116ae73368b52522716f62b19
+DIST firefox-78.12.0esr-ta.xpi 521544 BLAKE2B e776dc5d8b1e01021a99ef84c94721342322a44399b689101d230881f9d212211e10a842a68675f2e11ae016eac93f061abd553998531b3c0d8a4f9e9f163680 SHA512 86c6631376f95e6c08d4e1d3bc0a2d5adb89cac885909d1f6a3b6ba8753d8d432784442aff27c71a673b9e0392b687e952284cd8ab3e36d06ac52e8a2ca55779
+DIST firefox-78.12.0esr-te.xpi 558391 BLAKE2B 2e0b60ebb90905fc49a2a2a5813aecc763ff598fa96f5af9f3f89ecde2914fff793d9029df1970cacc18a9b078b473ce62b0885df7f4832abeedda8cc03e520b SHA512 9058cdb3773e10366bac36dc77a122f4e6e83b84374c9d00861d40d28eb241425426644270eb31eea8098f8fac8b17da8db67b7f266bc7f6e86eb4e94863ea8d
+DIST firefox-78.12.0esr-th.xpi 592243 BLAKE2B ab688f807db0004f9e0de221079b1d107f5202686316c4a3c9bb7e899b057ca8682f29873039aaf9ae2f6cde0bd9141efc51eff00be1292df6ae43263dd80ff7 SHA512 310a04fbfa68f4f93becaf6baf10c98741f802556228076fe332672131b04903d35ea5354719a6b05a672e3b0b5ddee984abca97c62bbf198ac42b8ab2ed6995
+DIST firefox-78.12.0esr-tl.xpi 521109 BLAKE2B 4410a08723fbe30017adce09bb067712dc81580b6718ea6a9ae59222243d279f7418803fd624572cd5b543dac8922e5cb4d1613c70fc68f7ca9e09268c98ce97 SHA512 f7ab25435fb1a5c0550f7d15bca7ca93a8866c549756240ff6f7aabb843b7d780caf3b6fae8ab20685c03c65e419f88b3b4f6551d6524dc9ddd1d7cb857b92c9
+DIST firefox-78.12.0esr-tr.xpi 539884 BLAKE2B b2e56de6ae0ad00cc7c52d102d291d8d978bf0c24c88cfd5a6a9b856b9b31b40bfb6a26f709d51c848422c9925924bcb94f513a97d413cc33b0046d4cca42d64 SHA512 2eedae3645dc963a6016120007a634a0cfc4f1b38d27dc530340b6e8b8312c4d3a53de1529924688dd9d17b735cfeb27c6df10942dd72c2d138d35c27508bc25
+DIST firefox-78.12.0esr-trs.xpi 501218 BLAKE2B d9a566f1c0f5a5dcdc99e9c6b8e5fcd2b778b7589a3e2b5139b082189185d97f8dc7d35edf4a6980c964624d600495e902b2788dbd6b4359ec6aa45cbdecc744 SHA512 5faf29b0ee329c6dd2822491debe57c4f6ea8e6ec4275f25229a074d4274a6a843fd71c51d2714f44c07067dd92ac641548666fa017da644c300ff51ecd67588
+DIST firefox-78.12.0esr-uk.xpi 608585 BLAKE2B 96dcd88731f6ea3c9bf8cb1c0a6c10e37bd3dc5a8610a9e52b8bdc493bd898cd28c098e0850563d775f4f9c9e596f4b368baacea8eb9848d6aa3e428fed52676 SHA512 8d1176dfed8fbe3023fc850b2171e386ab6f2e1c38d3480fc7664291d8d59bfb8da90fc25562652e724de08454d3e2a57f537e3217c6540b75acb85db2de141d
+DIST firefox-78.12.0esr-ur.xpi 557951 BLAKE2B 201bec421aee0cdb63d211de89da044e5b6250c318831d1284dfbac2096404b9ba77b0ffd2b99c08653f9cfad3770b4045e90404eaa0e5587720c2adb8455fcb SHA512 d1bda9bb3207dbe654027175883c11cb9a82c11c23adee9a978ad5a6e9d5317cfaf0e87b4896c3f8ede86dcbb525b43be03218c2768b646023dad9a0c5ba6049
+DIST firefox-78.12.0esr-uz.xpi 477555 BLAKE2B 986bb748a2faa8b9a0aaa5ec874eea0a410502643ce71ebaafaeb184b97d4c4badb818a280339cedf6f401b34f79166c14dca08dbb8e714367f674b17bdee34a SHA512 1770757a2c1c3d9197ed08d6dc6514e8565292e1153c2c6d810ef299c5e070df1b67fb5996195541e880c71a63bb254905cd217f2532cbc7e75369241530494c
+DIST firefox-78.12.0esr-vi.xpi 562863 BLAKE2B b0c80866ab862e0d9d43306e897c8b3a06df6a03d62de0cb186b08ffc9307a68d17b361614046eb15388258af87938c93df9517e59b8736af2114e46a7a8cd2f SHA512 ea8aebe03949c8a364d0b47196bff4dbeff1eff1594f8b36dace7c6d401c3c353ed80bc89bdaf505f2b40abcb7c9c5ff13d38748f194629663f6e1cccb7c783f
+DIST firefox-78.12.0esr-xh.xpi 427839 BLAKE2B b6cf89388e45ca74b4d3042f9bf30535cd26a42aeda03b03340f2779ec0fe177653f43ffc3a6fad9a3ed98049950ad18b05a76b043d91ddad40f311e065fede2 SHA512 c146d9d5140ee3023a749d21bf4645e07f0ceae8f8b9d6ba91dd776c57e69b1c56e402fa3ec2b1d8da4918ee60e82b423c9994737e288d8a799c8c5ab1119116
+DIST firefox-78.12.0esr-zh-CN.xpi 564771 BLAKE2B b745ddf8c8ad7686e5ca7142338ef4b2f2e362874d9b087c4f4980f4d9e96f076bb318e0782c8c2404c00e71f585aaa76b26da0e369fb02b9121402b5471fa06 SHA512 cb707c11c8c0554e6255e725ab5c68f3b15c2d34d85f84fc6ab4ee7eae83fa91b35be282d592b845f09539ec43d1dde8167bad1eb24b86adbbe236c72854764a
+DIST firefox-78.12.0esr-zh-TW.xpi 564742 BLAKE2B 3d4b211b35c9aabe2c610b621c175bcfa4fb0f1ba4af607407b9002a475407f53cb8f2e7250a96fa93abd5ee74bd3ee5b0aff01a91e45ca7211fadb2b03e5e1c SHA512 a241c3af98170e0885b63ec0c140fb1ad7749a5bc762b7154b77282d33bbcf7926550182d261e3ac4b0084d4b8d98b30111dc459f3cbf2d9ccdf9f6b811222b5
+DIST firefox-78.12.0esr.source.tar.xz 333737488 BLAKE2B 775a55511a48f4210807d2648833bca6f95d9f4cd48b5d0de8cf0bf2609590c1615fca7ff855ae3643a25466d131e15dc293e6a57aa05e1d91d2cf819b0b89ca SHA512 646eb803e0d0e541773e3111708c7eaa85e784e4bae6e4a77dcecdc617ee29e2e349c9ef16ae7e663311734dd7491aebd904359124dda62672dbc18bfb608f0a
 DIST firefox-78esr-patches-14.tar.xz 82976 BLAKE2B 08cc3618c8069f4169b7647e7eb699153d558bb89f8a4f1ed74d5ccd339f77119cd8f253df011f0c2f255ad889b65e843171d7559f469788463ca7e9aa2e96aa SHA512 1611c6f9d2c7d586e7b53810c1cfdb2682f5d289b1b019b71694b1ab2d8bbdfe827a73cfaf59f7e4808c0b90409ca4fa57e27655d8cdf0c578ffdbad33659f26
+DIST firefox-78esr-patches-15.tar.xz 65604 BLAKE2B 86e421e555ffd5f7f201d0f1a1c446c649739c67cdf8dca536efa115e09d9c357ce1551b7270c77e8bfe7dd53e0f3e6386496283879cf5e0c59b3c864951ebb3 SHA512 b229e895f083a0404cda1da0d8ae937429d5975ac52ab20e8b15611d9c737381a1076ebfa8c8a127dacac0e12a2a905ffd579facde2d80c6facc911e5739e34b
 DIST firefox-89-patches-02.tar.xz 34192 BLAKE2B 06d54c82c2c9202fd176ea850872be626d3da38cc42f14def0a29a18f4cb52b851b7984c3880d35cf16b66cd5316d8a65212d6242350f1bb4f981d5deb050e16 SHA512 0e43645a81c75dc22da7091e00b9a1cdf055d6b4c2ded7ca1c15badb87fcfd29a7afb43ca0142627388d81c8728095a41b7e2a5983cdb1ea447269d8e6057003
 DIST firefox-89-patches-03.tar.xz 34700 BLAKE2B d2d7bc89abc5c6e3f18fed724dc81c347f99cbc8c162acf50823c51ab62a0fb8c54a2be8f3e77d928a3b31d806d5407b374152e356fa98f366c0f33a7f0781bd SHA512 c20b701c1d427eeaea4856b0e36ebc57a1a6e7aa676c6c34185ed8b597d744da26fb889e6170ca3c82996de9ec1b5efe16e02d1cbdb3d1562af92f272c18243c
 DIST firefox-89.0-ach.xpi 467444 BLAKE2B 7620cb550d3f7b980cdf45ed15d2b964fdcd125c794a9f2b78892dec5d0250d15428ada892d5ac75223d6fc225aaff0d862624b7edc98e91549535b0ffbab909 SHA512 dd416ae0e9097a293acc6a70b2d857cf6b9ad65ff1d54d51c751cb938e7e703faf117d037ed3fc84b2e2108884369a803f7a7745c86130682ddedd3cdac81de5
@@ -397,8 +494,108 @@ DIST firefox-89.0.2-zh-CN.xpi 589249 BLAKE2B 86579e39b1ec66fa2dca51d662e4fc437e1
 DIST firefox-89.0.2-zh-TW.xpi 589746 BLAKE2B a350222846df22392e9130bc12e03241ff7259bf20ba3495aa27e593c2418af4378bb7e6e526cd780b4a4c7ec1b35ddb87efeedf9c0c94ca034a923eda3ad3a0 SHA512 b6a65deb40680233a1724121090ae57eae2b2764ba92af7720cd4b185b9583a9b68dd9a87eb9e8c3bf563b7037cc3ff33bbe36c8a7facf624b1d75dc785032d3
 DIST firefox-89.0.2.source.tar.xz 371053016 BLAKE2B b066b3fbe4f4751ed3cdb62e428a86c4e36996fff6689c20e25d9dd8f93a5ff049cabe5f5dab84f9daea4977d6310f43d0098d3e3fd733f2155162a6ce4785e9 SHA512 ffd98ab0887611c5b4aba68346c49a7a31a58150fd8bbae610a4d941c4cff0acef0daaebfbb577787a759b4c1ef3c1199f02681148612f4f5b709983e07e0ccb
 DIST firefox-89.0.source.tar.xz 371153536 BLAKE2B da5d1347149664c2da3315f9ede38c576d64a532daf10a46dfd2f7cb226110aaec84ce9285e50c151c8665fe2bf3df1d8de8e744b0b8ccfb41103920c10a6b3e SHA512 5089720feda15d054d0aa4c3bdeb84760314dadd6381d7360e688d8e396154868220c6315add650d8d2a42652cb8a9bfeb833885812ef0bd70a74ee58ad18aa3
+DIST firefox-90-patches-01.tar.xz 33084 BLAKE2B 943f5f9f87c6ce110dbc52e78a58ca64ab11cbf3af01bed8c0d6f537baebc0ef89455f01b966f9f052f62ec7124fd0b4019e27e410ffaa0530874e5dda73b01f SHA512 90689ad703de17c02581a6b8aa1c013b9ab96da22a17dbb8e06fc9a5fb04d00358df9e44285b5350708b366b32a7e6c6130ef8dcdb74b0f2b5c0dd44293ba825
+DIST firefox-90.0-ach.xpi 467563 BLAKE2B 32799fb03cbe4c5566709b2109595c651f47095ff6996d8fcf751a900d691232f705d01cc3e5ebefb3854051702ec8daa0829ea7a1c35fa77a3449292bb88af6 SHA512 c623c3bd9e1d33aed1c15eabbb1996f3e345385cde7c0f07b7f8d08cc555c6cc845e7253a7d23c85616c1d82ebf79785657ecca6d7ef2177c76f73b619c7aa28
+DIST firefox-90.0-af.xpi 430689 BLAKE2B 3deb87157618596702035faed14d3a15980b2e02dd70ed29b90b8583084649b853aa71bcc306b8f2b25b17f8143cca4b9faf30913a5e284399c1b972fa4324a2 SHA512 8be725c9bd68647eb1de148682abe62220d2314a177af5de4986cc3b1b29b57204461aa131c8934bff6dff01fa482eeb454ff5b5779b1f059a66b3901a5dddd4
+DIST firefox-90.0-an.xpi 515442 BLAKE2B 48bfa7ee2a1f7bc1fe923d35feeb0a822c3fa576c70eefd9dd2b422a8d1140aefa8ace259d4a43c4161df62b85a824e402839548560e06655e8e9408ec9fecd5 SHA512 955f6cdb3bbc460f35a937e756e94c27336bc2fc03fbe9c617fb0a1b078e60bc21aecf5ccda5c04e6aba5ebe8572ec8896dce160e5454c686732cf7198af4c62
+DIST firefox-90.0-ar.xpi 580212 BLAKE2B d205daeab110cb91d0d0e00b52bc91e0bd50e28be89e09d3ed8a66562f5c0765e26ad085fff82cae0597bc8db14ac839be9714d24274ac42e198939dfc912942 SHA512 483e09e14a2069fa894c59700714330f6b6f71079a38375286e1d6de492fd8d06470447394db0bcdeae1f7f9585b0af3a0d13cb9ccb1f5048703adb5f2cde0db
+DIST firefox-90.0-ast.xpi 507901 BLAKE2B 53b3f9cd8c2ad1b0e92fd84bb168be6bbc5f9c9812135b2a07c26eb35c60ef96f2ea08ea5543edc6ffe8ae4feabe40d580bebc3d5b754ed391f77a0cf9e2c78d SHA512 ba6323fdb588370374f7ed3a119202bbc164efc6e880304b7684e3a324295b2e2f6ae69a7ab475c1d0c06140fc67f169189a19dd99c912d065aac9d0010b8338
+DIST firefox-90.0-az.xpi 503451 BLAKE2B a95953ea4e141533a6565194424c52ae18a256149ee5f7cdf1ae96b445dab707c91620a1c24052bfaab698bd9ae98c5b721ccfe6b931e9aa970ef50617794dee SHA512 a91d46a1e25c47af6c0a35e137cb30792e01279ec916b37819191421f9da3df89edbaf1d78bb66f2cc6bf097a231dffe99af17ee09b9b2882949a42be868c2ec
+DIST firefox-90.0-be.xpi 636663 BLAKE2B 137119942714f79c097328ca988e69fd6cf43f3fec8660f69931b0cf3a68b07d5b556ba648d83fee4d0153c5dd6b9996799b7af971477ed04b91957d6629d016 SHA512 a5bd4b5906994e348dc84cf87e536f60d1ec2de6e3ac16419cd5bfeea07c7ec26bed55aa0a7e567fec57091807c40b7f83eb5320e62f359108229ae6768d3e55
+DIST firefox-90.0-bg.xpi 590433 BLAKE2B 27bd2a13abfb6c2b1bdd4c18fa38616ee13d40b8f2ac654c0c4b943cc6ab7d6faa8157ac56862ae103f48efc6bc92be9c6b7143fec331651c3bbd46f4c4e3ae7 SHA512 7fa0da1229bee97bb794ab738f317dc92b944be545493f650d70a2df074c841b930aaa7b30a0ad31aa221bcb574c26a66a866b9b5d3fc71ac02721b66a3f8d38
+DIST firefox-90.0-bn.xpi 579581 BLAKE2B d71bee924b6b5ebad242afca2c2c6e3fe100d6ecc0ebebd1e1c92aab5f0c0186f4a09e36b72965612f19e5cee33fed0295fbf563b1be1b7c24893da92bb27dcd SHA512 54d35473905340f350238b0228ce6062fd297a8e0e75a2b810c8b23f4ebacbe665c66c41edb3399abea54da0764e524269b82b9971d164b68244f942bfd2d38e
+DIST firefox-90.0-br.xpi 537482 BLAKE2B d8338903de341d8953cc26e55f24576542ce260f176419c58bdddfeae8fd820ad0ababd0386b865833fa6a8f7ce89325b9fac6b440c09e9319ed30dd7f0ae925 SHA512 7f440a95f5685485f1f044d8a51c7f2f620d068378326f2d4fe5f3d7064a647a9a1a8766f76e80044d1a0d257571dcd1d8f4bc9645d4b97d5afd99bcc4006aba
+DIST firefox-90.0-bs.xpi 472329 BLAKE2B 369fa1661afa09732076ba20289879b40182e6a557ea5e8b3bfb28b6b80f3105d632635c83dae7dfa81848124423af48063378292aa62ead619c8efeba971ecf SHA512 93d02208fc1f1e52e88d4fce0203197e4f408b756c99d9d2afd87f8538d62d0d28b3b30924a5227afb9e43aafb1b0e9026e8f62ecc5c50a6e02ed3a233f8be2d
+DIST firefox-90.0-ca-valencia.xpi 548463 BLAKE2B 675978a75975c1675995c530a50acbc69512cfb01a6f3e0702aea62a3485c7300914e0a73028751c9523d9ac04c446cf64bfd031750e0b4bf5a2ed1622528206 SHA512 bcade267cfff945acf73bc25e54832860fb67ae4c5c6aa2b6b4bdca8ed96f51139bb89fd3b06bec778202c1c3b742b446df5b70fde360340cc070099bf3dc4db
+DIST firefox-90.0-ca.xpi 546572 BLAKE2B d31c776a9eda8701f64a3098afc2d7a8dd978f7f9cd65227d1fec33ff76f9ef4e298233f01f9e5f4cab95655b45c4e1fe0af18fea7b1a0f85aa6efccb9aad997 SHA512 24d176445e59841bedbc23dde5a63444ebd39ad34267bb0b175104160ca1307308f623428db91719c99b54e5e7ad6d33954e1ba55078bc09ad4dbedaffb02ce5
+DIST firefox-90.0-cak.xpi 573760 BLAKE2B 5f0e5d496b3d63013370df4711b7c66755eb0fe27313efd0631902633b37798bae92bcda2e80a438c884b1c6fba7b31a8cd9622196b40caa332feb682adb90a1 SHA512 3df9279d559302c71ad08b23fae14916104d7e71e1d526c0b9afbd010e251d20cdd4be1d9c02003518416521100193ee4a540387fff22c05d856f00b644815be
+DIST firefox-90.0-cs.xpi 577416 BLAKE2B 45c175f808c506bdc127dcee988c8b9d87f5937f1fe2715131a5c61798bb36a0fc37877ff7b1c77d05809d2cb599d26b76c171c18992b0c6800cf42ae3ca610f SHA512 f56a9995af925c012aefdbe6b033c5d0462261969fbdbcb5fc4df4d52a5dff4195966807168e0980dde23d1019f76261bcb1579f0798f518bd6a038449ed1ce6
+DIST firefox-90.0-cy.xpi 554150 BLAKE2B a490d71b138ae067a38282f171d7a68a1a05bbaf3a48686e4d82e77800e8e7b3064ee2aa1710a844b58cfa81338560099556b4380d73705b1691194afc896d6e SHA512 d31a25aecd483615a92c1e49f89a144b95b83c7824a768074d3f459dcad1f0a21e26a4e84defc02b107934cc1216aa067902be1513567af2517cb4e38f7cf2d9
+DIST firefox-90.0-da.xpi 543825 BLAKE2B 6ed1d88c459ca069111b03c3c989a64e9fa1bb93e25566b88a01f279bfc2488d2d26ace09c39dc6c26d3dc2382b26681c02492738bf25cf6845b679a44656bf4 SHA512 bd378ab445b1af8e7f5ac84158ad195ed5af17cad78102581aa308a53dccb9ece7678a744ac2fa66a27aed57f8648cc00a805ea3463926e24f111b5bebfc9a45
+DIST firefox-90.0-de.xpi 565902 BLAKE2B 4d4c383c0641a8db0444154d1dedd4bde0bc248b0e4f30b808da0504af397822beaee86e7018ef508f8f157619323e2a2ec2abf208215957b82ed3dd4ad0add0 SHA512 56378a0c6339e2020b43b5b00bf33682c1e9bed838f3018875b517ae031e2a2be041f699607ff1799897898f9025a14383eeb85a2e02577b06bfe3d21c862fb7
+DIST firefox-90.0-dsb.xpi 578727 BLAKE2B fa48732ba44d60039b66432c40a06a024a5fb70e671dfb4fedf44190fcf4fc70d471627e21000fe83a526d80ca303e936a6caecfe4a858537296bfcb4bd92366 SHA512 3a2dfec000f1767625a2acf64c7235e393ca5025d40b8cf7798b314fe38eff436eb0282c723fa18dd472249d7161eaa70df237b243c129515e67ee77d58e2e8c
+DIST firefox-90.0-el.xpi 653307 BLAKE2B 316f9167cbdc85f5d3c4d68d03e60f96a39b2afad05b058488427c3eca2eb3365575c3593af1bef3bbfc9384738f5f51f14ea1bceb20e922c69878a2cab72062 SHA512 0ab23944c3fd8cf5469d4735885957b3c0d60e61211bed09032eb0c7535f342ca15f1dcf75291c3ce5a53bd24b359bf76ecf97b105d6a89bf7b0e7ba88546e26
+DIST firefox-90.0-en-CA.xpi 520977 BLAKE2B fd3b74f5c93a4c8965e9a8904291932b703113e8486b956fe2446c3ebc39cd152a125a7400c818a3df94c8706cc0ae080b11c0a2b943148bcbe674221dd53c8a SHA512 e76081f56521ca5fb5a7b1e468c445f4dd4ea3fa45f5bbb4aa27b5ac918221030cc1609c533493c294e18c3e5bb1534ca32f0db94995bb8b9d76adca14274d34
+DIST firefox-90.0-en-GB.xpi 521292 BLAKE2B 40bb93be468cd6236d665b7e9b6b3dd6dcbb1305f72c909db2124009a086f3e3c41ff45f6177688b8a282b4190fdc77634326ca1eca6c67ab2706e08e63ab98a SHA512 0ead74b6066df59c9991b23a165f2fa0b9410f21c987502c4957718aea8e84a912ff418c98b2fcc0b013dbd93e32cdce4f2aa266c4b77719b8fc48f9a452ee61
+DIST firefox-90.0-eo.xpi 546166 BLAKE2B 2682594a5035eacf42878eae40671d1118335879bb13b7653b5e6dbf8ac0ce872ab7584c7a9ab167782daf10f6e4f830c6ff132e1fd6e5cffc10729cf2b869db SHA512 d71d6184f8c674f0ee7bcc0ba18c9b63fb3794c17f6bea96d4d37631af85d83c450f5bbbb8373847be7aa2a9b0153eb361666312ddf14b8e5b3cb4b732465536
+DIST firefox-90.0-es-AR.xpi 559086 BLAKE2B d5af456783fca0cb9cd49f8b6c54e250492c3d7aa18abe59d37f73166bf91758b12bb4818256e228c17f978fed692169e62b0b1a672256f2fd1b09787d757085 SHA512 118b985ab82a2ff336e54fe33e50ecf8596709b98bb22746f3fbab2d7ea0c1a5b54e6053715ed0f8492ad5cdb1d75bc7530d044d955d10c34ffc81579efe7a5e
+DIST firefox-90.0-es-CL.xpi 558215 BLAKE2B 1d2a20619f8a8e8d741e83d04996ff38431d2146a33859d9aae6acdf61f35adce111907d39178289ecff29a5ddffea8c687672f7b7a5498339476285fe5939c6 SHA512 499375fa66f30eab47e2025165f8bb1552aa7f6035a5b791033183538b4da932733671d1c49cafcefe63b7d772fe20c394d9bdcb91742b2af75543a025c4dd64
+DIST firefox-90.0-es-ES.xpi 548981 BLAKE2B 16bc31f2d79673e3eec33e2cffdb3ba5558885b128c07fad0f9c3792f3622851fa368a4abe4a7ce64e3266a04ab957dbf9160dd08e55496fd523820475da3a96 SHA512 a5521aa49cdaea721f2e86ef87a9a44ce962f6608af701a8cd584bce2f40dd21b88068fb1ae35ac8e31d2e5898fa1448e9e60ad63e4485171adc3dce4cf88fad
+DIST firefox-90.0-es-MX.xpi 562423 BLAKE2B 31f0a644fcfddac653df3a65737538c8328db89acaff6f0a5d9e1a6a235b3ce3d8f6659453b6cfddd668444600b354da0f75ca5a2527374521ace8b71a7d03c0 SHA512 39e86fd91bd0dfb9f2bf9b2a125f5f24933eee46e5bd4c0b8a8fde58be2553d06aa64e78d55d5bb71fa4a18e32821d9cfa5091bc9e0f2638a6c00a7ad2b18f6d
+DIST firefox-90.0-et.xpi 496625 BLAKE2B f8fccd6f5b29b327e615a952a37a42253977b199b97bbe0c1d133f3b012945ee1847e7491390be2491ca1a51b5fdac2f7c28784532f98916f1d5ad8d79eb8ae9 SHA512 0619938c68e77355853d35c93c94395e1af3397b0d59cacdf4390294e9dfe8d16d4f296a15c597cc2ed1bfdcb98977ccd0e41562f21c95d55d406fe94cf9c467
+DIST firefox-90.0-eu.xpi 544754 BLAKE2B 04ddc2acad0d690a825f698fac1546eaf3ea3a9883ea21cb04af71a67413a1c4d622530e3eca331f3ef0985ab361b85a88b144146b637f240c7142d32b79ce45 SHA512 13ca48fe8d68b7c5793835347b53370acda59e675f71d1f6e45ff2335b1e248d40011461046a9e20ed8b91284809de16e003156922fb9ded9de03f1952e9b180
+DIST firefox-90.0-fa.xpi 565131 BLAKE2B 88a9a812d8a789cd4b29954878881a521284034729f5fa02ba05d7e977adfe42dd8e84fb5087b7b8c9240211e606d43e7e22c680948d3efb2363e37163cc4e67 SHA512 15494cce88efe9dc6ed69ce3b83af28af3eaa6789bd9cf229ca95ed874b24b8ea55313ef892cca042ce70179fa3562333dc6052d31a5c21589c55bd518ad3ea4
+DIST firefox-90.0-ff.xpi 488036 BLAKE2B 78ca239db016327e60435dc49399833dc1a0dc6390a2746792322dc630bc67e6d31448abbf67e251c6df4bbe9d5946431e79e66fcd87a28156a77fa67f81b1dd SHA512 333952b47705ce0c3ea7bced147c4e5f67bffd2200571e612f89267a7cd9807dc1f27d3a5ed5a7ae524bab6745d3943765934a9bfae9e91eed0b26ec3523c13d
+DIST firefox-90.0-fi.xpi 545674 BLAKE2B b699657eb06eee0d8e4ccb38f41202a8c885a59715e11591875584386bf62d8ee9d2abe0148e6a8a7b5ddd7da4405c1cea547bd28b4ef27d3446af99ac4a4fb9 SHA512 71bf27f517554ce4e39d925952cb7bdf45c2b98a54873c5c3e49a92e101755c26e9b2a569e64a3b09d553e1815ca14e260c0fcb414b71a7c483177d77f79bd00
+DIST firefox-90.0-fr.xpi 570206 BLAKE2B 1f653ef6818815ce44d3e80631262d0f32e77417ae2cfbeb52665d997cf863f0829b0d2f55744344950bb803e41ca318dc38ea687f55f3abe31a3a986ae2ea95 SHA512 6f95585d94320ff0653eb6843637bc7e5108a6d6eacd65f6f0013566574006455d465b998c70ca8fa925c619c1af4c776d954dfd2d6b54668b00a607eb1c44f3
+DIST firefox-90.0-fy-NL.xpi 555035 BLAKE2B 81d94d506b33e9104eec3ee6a6c5b624c59d8dc6251986267b5353e1d632bb4806ae56ec8128945c027ef1da98ddf8402c03c64f3730cf32946b91a2bd503730 SHA512 bd14c44c5ad8a99706bb48c55e639b527abdcd56bf397831b646a1f87b10ae67d4c65f4efb2881accc317371f6508d371e0868718f8222c504c4c69315302e94
+DIST firefox-90.0-ga-IE.xpi 473114 BLAKE2B bf1f0c5bad975b321d14f3b9fe4801ecc54ce06b1e8d00ddbbb9788cf5784ded58cbc0f7e8e509cdcca627d874360b6af44e0049a8e574faf423271a1c85c681 SHA512 92a4ca47b73bb7f378b8e853dc64acf6f88cad51107b6bdc881ab949d516427f38d1a19053cc76ebdebe5d130c543b8966f0ec7caadfd2b4c2a55d21dddab3f8
+DIST firefox-90.0-gd.xpi 550980 BLAKE2B 74731a77f743e5794413c9d54d907989237a5442b2d3f9823bc82c8cff0551d8a24647da04d0f5c9f0199a6bc0c5e2f891d6f9b0a469f29815e00116b5e79e43 SHA512 6ff0f12fbaf7876830fdeec899a2ead59915dd1bff05cb360276c7687cd9190348121b5e8f507b3b0a7a4bd9608687d22e4c1958fd7e8359bf36d613cea22fa8
+DIST firefox-90.0-gl.xpi 554479 BLAKE2B f9ec20a5f708c5b75a24375ba007895b24d5f2b7564b8fea002e4ab71ba4e7e88096be816a140bfb46ad3ec298261dbb92d1f6b40b18132c852d11d9b76a0f57 SHA512 377687e31df8be4ffbf99fc0012638ba431b5b196ed8e8648456e1b50c27ab930d13e186ee80bbf2d4c68dd986a6c0b66a69d72dca15bdfe8cda9bc49b20286e
+DIST firefox-90.0-gn.xpi 571173 BLAKE2B 550bdf08040e6625aa93e3d3a817d659d3f02b9c6100e6ce2d3c59a6e41928308df4d234ed23b3b462f3c99b705479a72fd183b089600a242abbe4718ea5e88f SHA512 b53cdd1412cd9a0b35ece0209dbcdbe46f38ce491e645536288a55772f9e0d66417f3547adcab771d3965d10e524e750a622fc369309e7d0fef51c025a9eedd1
+DIST firefox-90.0-gu-IN.xpi 547532 BLAKE2B c4105a4770f38b5574306ec5061190485b9f5e3139c75081b2c62b70f647336806cf7327d090434e89ffbe17265a9e82914e3b31ce57186c77fbe2284f8d55a3 SHA512 657619850f6e9570336908aff0f1fd062e7faca8536629af44120395310bf5363cfa050e6edfe53676cc7f1cb2138240e1eac59a4b5c95b7442dddb693688489
+DIST firefox-90.0-he.xpi 569002 BLAKE2B f7a1c2569dc773c7e2f24ad9d2ee413e984d5ac3e406ade513d2d822d91fffc7eef3d9d178042bb6f9e72473327b4202559af244282456e749986820cfb50bdf SHA512 44a3df4722d0a56cbbb1cb3fd0ca9cb0cf87bfad587e087a0e789dbf4ec2efa3685eaea907842ae7e08768b394ebb324b63b8b372e33083e731b686f997444db
+DIST firefox-90.0-hi-IN.xpi 579612 BLAKE2B d18e5f0686fb7d288c23daa014f775e16bd8146e9a8de2bef800c73a3c8bf637e7d867ec0d575450b2299bf15ed5c9a4dc729e103528d8b3cd5803225e092c2d SHA512 0525344c2de8b733d6b0f0daf54700117e02c321f0b0a896b4d61506d5c5ec3fa68d653c9b039789761c4f9b9c37f3f46e938be7d36f19c36c62710aa3355f05
+DIST firefox-90.0-hr.xpi 549979 BLAKE2B 4b038eeb74e0099f17d98cead4035bdd6e1c098feda4b62f65c6ffb69cf9e596bbea1021b5b4f2f7766d4a94cd7e86f8b3fc5b4fc33ca682f5e098560228c7da SHA512 b0ee7854b55035421d2fb0b0da76f5d37a856f2d061d1c7117dbe3154cd6f013b3f52b691a76d3276b8c537f6ecb71fabacf99deb7d8da41ce194bd9455673d7
+DIST firefox-90.0-hsb.xpi 574891 BLAKE2B 8ce631e8e0da25b626a467ff2541f463fa37f047212a8324b0d50538aa1d437721c4b86030065f2ea0250c88c15582de8060c2fdc60912f9b748b3dd4b4eb9e2 SHA512 606503c1f799c0c77e944360b51b9d664c58600592c3a95ff9e0c10ca382f99ede94dc5f0854067c0e753943b7645c34046783ba91da30443e63ec4afaa86e6c
+DIST firefox-90.0-hu.xpi 578489 BLAKE2B 359b978f4c6487cd0ddf7707899cbe3e6bbf4437cf7833402a5f70a7e495bc1baca851e0c8e7a9d918e1b6b591cc80ac268b5ff904e8a74da31bcdc716742f66 SHA512 c581748c74b1f7aeea3788610bc9774a960731c3c2144d23ace39095f9a8ece066033e44ba26975ea665c333167daa0f1a9b4337afb675cd22ff4cebc3fa0281
+DIST firefox-90.0-hy-AM.xpi 604406 BLAKE2B 53477d73f7f82279f6419abfe24e6f4e1209c34c9ab2e8660aec885dc4e85c2a3ee6b8f899928f7ad1de724ea8420c99c3374ef1ad9ae72660ac8229c045908c SHA512 1223f05cbb0ce94c757becd3ee047eea6eff6ef70b1dd906e813418b2e38b41f670dddae33e3df8aad17a3c560e8ef091259b4dd5c3b53292594427a8386561f
+DIST firefox-90.0-ia.xpi 543872 BLAKE2B 5bd6328d26698b038c874d72d729580a9f2aa9ec0df27812441c000f34ba8df0bab67955ce1b709de41f6a8f7599470b401e43c9d2f466a10b0d9800a970d07c SHA512 338d93e7c2784bbc8791c58c6cc26eb25af1d49286dae31fd502e88a42c1d7ed8b11e4ab871ad3e98fb06c5f6bce6aa2ec8382a5706e2adfe17794cd8d87796e
+DIST firefox-90.0-id.xpi 540015 BLAKE2B 1942af5461812b4eba250e3689aed4858aa09611b834c98c2b4a38e69646864be37b2e266bd475e1b47f6ca3bdd21b1ceaa1570c9f4b2962164f93b8a23f2d64 SHA512 75cea336b92b702fb929f6479e8d6850cb2d658fd0d55433a5f46c0400f2d056ecb80069dd8fad082c32a88968d75b584451cd355b743d4e69c97cc6783673a5
+DIST firefox-90.0-is.xpi 483692 BLAKE2B f799ad05234f80b23a89236caaf6b0bd90b71f6b2196a1bcd88176b950e557b8a21ee71413471ddccdc5fa26a683d56333e9011189debb60bd23a7f9345c50ff SHA512 476a9cd620e89bd0fa3ec56ae9d0e3950f2ff78d21c69476df563fa2ee97a0751605426eea7c42063330c3b0cb3e46d337206b26592a5c162f32bcca4dcb1e66
+DIST firefox-90.0-it.xpi 472093 BLAKE2B 34dcc7ddbbfa669839c8b68d93f3908e50705df18a12dd487c29d4ddce71fcec585d746d71454908df4a0e0a9a6a3581a38ec06a233adcd0260dd891be738fd7 SHA512 415f5a8d510d23f294cfb56c38e16c0d7ceb1546553691ddac2290f72570909a171100c834311d98e9a4d8442630b2e0409859557432d77338ae3c9d47a267cb
+DIST firefox-90.0-ja.xpi 605292 BLAKE2B 7f8f68b679ccb019b5b547f8ed918c6d498338c07196212026228cf835e0256177dc9656ed75d05ce140d453cc2a1543c9020e8ea805b74ac58714c7c3fcd615 SHA512 3e9f688b8abc8b0bfbc1b5c836416cf6b62b072f6e1e1ab73feceb9f0eff2481cd360c6ebbe3da1e587711d05b39b763cdf0307394e885553c9aafdb1247e896
+DIST firefox-90.0-ka.xpi 606614 BLAKE2B 64955d19b193741b711e42cac6ba1f2bc9bf3834676ba3bf2911a1f7c91664f4f07dc4b80dda3619e1ec5819301ae69ae6aaec6c5994b9acbd6c112bb3c57569 SHA512 8a58f5ff2639a88dfd7d62675e12f70e97465452b3390a28dab31796553bcba1bc0ff858184059e7bd8b27a22f1c8dc6cc87b4440c66a7b6618ea0d1d1fbe6ad
+DIST firefox-90.0-kab.xpi 562715 BLAKE2B 82a78fa9b01453d2f4da7df71467cedf19decd1ccb78ac669f9be5f1390227d30815fb6bbac065e6881f610193decd1e4f10bfe2add01629f7b4554879460d8e SHA512 102cb22cbbafc580a3cb484b48d9bb0d5c55310ed7b68afe8821e113c8b11ca4527cd41251bb7f6378281e7bbab3025fca06b9da2a0baeaf11a72d9a87abaad7
+DIST firefox-90.0-kk.xpi 621566 BLAKE2B f3934bdeb01d07c045c12d49a6f414164aa3913971c3d6e51a9c1fe84698b15e13d31b9bd4e9f3268c077a7d308f6a1478f53a7d66a36502ab180bc625cc65d4 SHA512 e4cd27c5be6ee30f7b92edeefd3231517c3a0a7ee6a1da4d368bba4dcf9a533d48c01487f83b0f790c9569b172dde21037d0a893a64a4a35a198e85cf4eb49af
+DIST firefox-90.0-km.xpi 546420 BLAKE2B 67e38cda07fff9b6db7d52d719dbd373126fff7afb267b90c2b738970a8f80093974817c12bc9189beed7456d5ce07ed14b6a134c9d7ae3cb462fcc4a8d3e172 SHA512 0f3f9163e91f33482e635274d9a21d0242b872ff8963ee730e485ed8ac41195b80b83cb5eb085ea8525d58062b3ba1e148995aee90d1f091ac7f9d7343305784
+DIST firefox-90.0-kn.xpi 510713 BLAKE2B 8221d950f5b2c800091cfa603c2b09cb62faf7e168d4c69d34183ade90e65236ccddbdc5a08229afdd57b4ec3820c142cefab8f83d5b547c8e54fcec484e4ba6 SHA512 cef6240588221b3aa827c43dd12c36501b3df882407d027709994a41f1966503e868cbab83a5852499e5ca6b4a13e1d6c3b147b946a31d2c74e3e4ff3f808962
+DIST firefox-90.0-ko.xpi 590162 BLAKE2B f0b389d55b1c2fb4ef73ebbd232bcee385b9ce836ea9b841d3fd1ed17742da4e0ca7e289064ecc1839294047946d7ba2c5f69b4a135142c5b6671116d1adfed8 SHA512 88aa8474636ecb8a21e775a0511f0924e7e97847e5ece11ff1ae77731b15fe81e0983248bb6db98c607d678c844f02deb5ae2aaa193b0f85b8c705561e5368c3
+DIST firefox-90.0-lij.xpi 484749 BLAKE2B c213b46be98218aa9e44de3de39abec400066cd4ff42eeb0def53b777b24b1679e7381a8f73de402cd84bc6829ab52822184056a68f16df525e9e257327d287d SHA512 18cffdf992ca4a0e3a1dda002cfec132d8cb366970345f6fe40b265d2ac029029c0452bcc645c256dfbe2d91be4cfec7ccd244ea89843e381c4b50cec6ae9526
+DIST firefox-90.0-lt.xpi 571831 BLAKE2B 237d0eb3920a75fe20b9333a1457b244ab7624c1b99a8238626c26abbe808ff1e7d7d9d2df1118cb56cb6f381e692419c276d69891cf391dd70a59e6e266da57 SHA512 52400b77a1e418361253cdf61d5db08d4694c6137f249903d6a7497318d1719dc0a02a7f17d4cf08f6980fa88928d2ee2037376822ee627db75b0cbf06136ecb
+DIST firefox-90.0-lv.xpi 475673 BLAKE2B 7fd9ddd74129fadb9d0698f7c02e3d87c98f1e2cd1cf1d11a785f8221a8901266b313c3086831de27311d0555b082b8c9ee4b2fad7b37048c9b726f35bb0be10 SHA512 cf262dd372f1824c4301c18f6bba7b19b4c076d98edf7bc60c22f59db4cf1a5c7388bc8286e228bc20c7da43903f42613f4bdb33be0a2e70e7e9ee6629c6c447
+DIST firefox-90.0-mk.xpi 472340 BLAKE2B 9ba7fb3ac2ae0371fb200dbfabde855aef92e7994ce2e06ce09d160effac79ed9f9ef0ce6427bcee19d4d6cc22e0eebc4cee3983556fb4d81e07eee10c4158a5 SHA512 7866cd1e1313acb83783ceec316e83ca793021c015520538ebbcbf0950ee6e37ff40b04702ff58d9a180a700d202f5ac7a09361db7f9e974446448a5ceccff93
+DIST firefox-90.0-mr.xpi 547698 BLAKE2B 902ecabf3432b85d02b4181bba82da18abdc6a9d770aaf3c6bc5b5c19dd3203a5d9455d5dff894991d31c13788f1e6373321f894cf2bb65da8cea19f760149e7 SHA512 adc65c9bd3935ee226422fcf550c65fc3677c463a8a01355848df59cd80103d34d7f321e2f26c3d4c2d03e38168367cccbf933bf3d2026e57c01a32f19f95f2f
+DIST firefox-90.0-ms.xpi 459295 BLAKE2B 89c1840a161d6bf24bc9dd355b4d5eb942160f70e46d22691f508b6a65df2269993b0f9fe6c69fae38c9eb25ada957ee412484be65ca426aefd95dfb7d0c350b SHA512 b200d7aacbb54f60f11a496174e078f5168ececdd1ef31b563d991eb92e9e86bc3f8ce953b50eb8452084366713893c2cf54f403468d55a18c2e893d3214a1ef
+DIST firefox-90.0-my.xpi 531247 BLAKE2B f9b26f3915563af5a346529c07c56df081c9b53c92c8059644f144e981c9072f1b69dc869665d2bbdda74ce199a7b620eadf53369eff13c362b036820b6bf789 SHA512 1d0cc706fc66a204c4191919ec6f1f59a9151629e67930af77aada670a9374afaaf9673daf0baf94d0ea4700f5a6fc7c4dd58c76f92afd12e9897e1bd31200b1
+DIST firefox-90.0-nb-NO.xpi 540500 BLAKE2B 2be7d15aa82bb0ccecd7b2a74369dfc9117f90b4e7e136c7a5827871ace948b09ae54ed799dd389e6f016d54713748ca0413320b6cdfa5616788e3554a5445fc SHA512 352986e7bb4c197c919e45ab2fb0f5c5072187e0876a03093cbd6eba86d7fcd67ca3296d6e2f1f7c3f4acb378d497e52140f735befff8632e1bbef4d283c49ca
+DIST firefox-90.0-ne-NP.xpi 488256 BLAKE2B 9c59fa0abf571db52d06447afa84d019c0717b538765c0ed130a5f8e5f663ecf9690eb2bc975bfa45f002a4fce696699390d46c521d71e08af364373986963c9 SHA512 083ca5e10e202ed937709d2fb593f5d5a5c98bed8dc7c16a79c1bdc11542207279f39d6ab670e78ee439e75b6d94883e6c3591c73455ee4bbdb4ff7c64d9eaae
+DIST firefox-90.0-nl.xpi 548829 BLAKE2B 11b64e8506a8933c75d681f42647329022dfaec7c2ffdfd4558a3a35941c76d42dd742e17bd3f8265c06ce6be42feafc669237b46d291367ae318ef9002e1dad SHA512 bd9e67ad5bba772759bc637cebfa7b73e8eddf80e7acb80ef33015885c9ee55686888b2cf35f9c98ea0af2ce7aa577ae89da1ad44544b0268708337a4f6dc4e6
+DIST firefox-90.0-nn-NO.xpi 543209 BLAKE2B e094273a22660d972e3a66bb10d541584b90f6fe852d12f33637122bc4ccf361cbfc96ccfd8522e1038b6b51fbc43008f4453a8d346c007cb915afbb2c07e057 SHA512 eb6e3dfd45a89156ecf3ee959988257a01b4f31d855e631f8a388067d284b3be4a894b8deeea4b97d08aeaa236bab3e43f89661bb63cf6404ae63561c61756cc
+DIST firefox-90.0-oc.xpi 565284 BLAKE2B 3a905daa05ecf231b4d7de04b0156d904038ae8138d80d47f7679a3cdaf7c7e75c102b34f6102ace9747ed24def71cb116d19130b65c904ed07c55b47d5830dd SHA512 85fdc257a7895fb754d08005838a8be181e9fcb26bd83b03a08387a6c697ecbb121ebde701b2f7b2fe0cda4803ec6dae4b213882f5b84b091b2c639e823a691e
+DIST firefox-90.0-pa-IN.xpi 612467 BLAKE2B 765bf9ea57a6b5123a3af78a86db9977abf18f521e35954f9bd1f4191c89f4fbb8bbeb8bbd1746a38a8bb383f91476a7859dc782d4763104da1b9075c77ddeff SHA512 330a98398a366f2069367e20a7301834b96ee61626d0f8b13ff634e4b015438d204b836be47e48fec6568a279c8e5b7b04208a8b7c64e900dff47e16d0ef2703
+DIST firefox-90.0-pl.xpi 568697 BLAKE2B 6951be0a265cac3e51563448637b5b01bae34ebc0fba0cb9ae507429ae29052fcdf3401742ed48facfdababa61e0277aa296d3046621ae8f44984aaa43dc7d04 SHA512 6c46d7345fdf4aeb661d36fe64d7fae2032f9f0744138d64ca3be402947fba6406762b668b01b072972c61ff341dbd6660d12d53253147d91aeba8a88af4660f
+DIST firefox-90.0-pt-BR.xpi 554550 BLAKE2B f0cbc8f961504ec05c6a0619d973bf75e9e6382a9f3788ce7f8ba252a319e0d9fa17b6a08d0f61c02b71b3ae7e69f16542f567ee48bfe3347078c79c9b9451c7 SHA512 f1360b80a15f0884f881be20481250efe8defe00bbf6a9ee101f7ed5ff4475d2f1547a1b4ccd41d4d27b36b3bfaa0c5ac33b7b47a1160c62cc72ccd2d8b0c2c7
+DIST firefox-90.0-pt-PT.xpi 558175 BLAKE2B 93e7a8fbfd4cf67f71966de9cba7bcaeb6c5df845a81a060bed0ece24f7c3755959792e8f39342b657efab22e6b444233f7520485574950b2bf31beeff5b8610 SHA512 ce6830c9d7d5371cac1efb519fbd0d58af7e5354c2f31daf358eafc22b319322c0d7860ee524a75ae22014df001c90d840a3af59748db676de1c31c5fb96174c
+DIST firefox-90.0-rm.xpi 547502 BLAKE2B 7a4c701b1860734901d2af53e3dfde54f5d31aba55c545b388b729c6fd62fe5e55c54099ed743f7d0f255e74de81374bdb700c1c531977ef967a19c3d4fae3dd SHA512 b1bb9253705ca113dc5451556baa42eab4a901dd935e0fdae63b4eb97b8b709c2719cc7f923f312d8884267f7e9d9b60636b637566fb86cd9c0a537a50237368
+DIST firefox-90.0-ro.xpi 542098 BLAKE2B 848dd7d8771330e0b587330c75dd3d4d1dc41a6ec5ee11cf99e7e1ec6a79f872eaa300525e9bab5b35ee472d58017293c4442e9b5aea5d66600d52e01c946416 SHA512 a75f500a885aaa90a9a68194f76d8c200b6fc844b72b950ed7ceba2d926c6c1eaa7de6494f509f6c3eb33b10eb50a2759c558f25e714f7a05c5f2d373f86c2b4
+DIST firefox-90.0-ru.xpi 641411 BLAKE2B 25947442f4a5b6531e40e8f6a9d330b43c3a57f0fb9e1e584045b301926ac7e9de979bf5c5a13ea786b8fa9374a6beede07f471294d2f6b5bcdea11c2f22ca98 SHA512 64fc6ca0bf408fbaca4e1e3b015dc18b52d5fe215d219a09bc4d117c15977aaee5bde4ee3cf072bd45a3db2fdf8308b30a219a2e4ef272fe152c4c2129a47a9f
+DIST firefox-90.0-si.xpi 497028 BLAKE2B 59def630b55ffa186422fe06e5f54fb42ea80bc9b20044a5ed1185b4869dfb308c702882949cc8e4f185e2832da1d79c327d7edc27644ffcc23b0c988b8aef2a SHA512 81ab21fef01677b4977f82e69e8a6d6f5bb0fea2964c3a069b2fbfb09a154eb2e8db89bcdcacc4872cb327821dff9da8eae2f6b4dcc3a2123198942549a283fa
+DIST firefox-90.0-sk.xpi 578299 BLAKE2B 9a248c7b33a399b1126c19ea63a350061ead767635d79ca7568d3bdf24ef3e17bf11d9214345547f1339d304d75d1eebef717f6755a44c8e3ee63d5abaa28a13 SHA512 404bc0e44abd28792e79846dd53cd1d2357c107aebd880513a413ad5646f4d4d3ae9cecd1f3d552a7cde24bd2f8460505d0a6bf599059b75fea4dcce9ef32602
+DIST firefox-90.0-sl.xpi 547668 BLAKE2B 305438177f2c39dac8efccc2641fffe907c8f926b86b83154ba921888bf2564efe2356cbded91e5894a8a2f4eada25598068b3f2b9766133c4fbe5974696ea98 SHA512 9552189f41d5588c162c4956dc2610a122994a6a6050fd47a5c3746eb053f6c663a3ad2654f44449b1622952b194046202847df1ef9c96b6634d2279e31c0b4a
+DIST firefox-90.0-son.xpi 428005 BLAKE2B 32c27d503af60de3df42737c2c8063dc525ee9d6dc84a0d8e8a75d0e592177afedc0060d5c6366e0d38e29a7a2915c2b4e32e71df2442ff52c1dde249bbe2e4e SHA512 ae15d8df9b7f1d0a31cf91ab3002f44956428eb75ba3ac7799d1ac162775403018fc63b3fd83e300a32b9b96b03b01aa35113fb03f90b797928a8078be281413
+DIST firefox-90.0-sq.xpi 568611 BLAKE2B 69aa2a14bb28482f147ca7c7546345129c5297eb3d47656b598b1d3f3283851a48deb6cbd027da25cbb9f9857cf3c729bc51e74a3e1b58ec91829922409bb9a1 SHA512 079b802601f6f13ee2056b06cc31c5710bd26889983a4e853e9c49eb9d9be99277cdc383eb26b4329a43345f439059e494517de77b51dc0bdcc2253ac664e0ff
+DIST firefox-90.0-sr.xpi 602753 BLAKE2B 03c78a2e23fba5dcaa060ccef08087c1ee1ba04219f43f30eb99720233482c1bcb67cf482b4f87756ad842a24c8063515f4933cff3b23c7dc34669e38e8fd1e3 SHA512 ec1f954224cd30c9ca72c3d2c24d7a51c83265510cc4789122b594dcbcf73ae0af0135975e5eac6e2c3df726ec4cb8659accac74a36ff1fb924af2377593925b
+DIST firefox-90.0-sv-SE.xpi 551938 BLAKE2B 5ccd1c13e64cedbec503ab876761fa904a813a550fcefd3d6d33e5759dac84a1453c98eb50192da8f07b1c927d7dad8f94c96b06339c5a7f2c5c30d96b5f26d3 SHA512 c0b18e725b1f808dee8db82113652340aef16022fa1f0be7f0da482e02bb99f6551ba9d4042f4c11722cc49a67d4de959de2c9bc6c41ab82d8549187bf518d08
+DIST firefox-90.0-szl.xpi 525929 BLAKE2B 2b9b3105bd355c7c55743bf639afb46a83ae6c7978629623816fe6ddd3c76f7c2e0adb130f454ef1e86ebc8bd1d8dd7ab9c7cb66c226135c302e859cdab4caf5 SHA512 6802fed96cf50625b1e39c60c6f6b8d62bcef6d22e0cf214a42b52ffa6e964d2325b43b72e2cb873284160398791f9c9e71d4d33ef9bd047ed9943c584f49f12
+DIST firefox-90.0-ta.xpi 526006 BLAKE2B 838a382789cf83960cdff73da19c86b72da5368715e37146ace0905a130a3ee824d2c0d9ef1cc01ad523dfaa7e4a8a206a7e9defe2a86850b33b8f06664b882f SHA512 78cf985604d0a7d2b94c3761e6715741ecffc1e764473b722ee9a30be33db4f31beef4c3b929f453fa3d9a8de262a5353d351b393883f9d9459a9be666ec4a31
+DIST firefox-90.0-te.xpi 568740 BLAKE2B 03f5b4c5210bf79df7e23c0f167d85a3fa64ef9b08e7fa77616157a3162524a7986c9a6618c2af7498bf8f61361a5e3dc8a55b9e76a9ed2de47cd8949e76f860 SHA512 2436f569124c4f962cf979a834aae9e2da29277252d257b64160621efba26bd0e3f0628e18f49370e88910cacf7996dc053fa9bbdb51ef61b31b40b2c6b58859
+DIST firefox-90.0-th.xpi 620997 BLAKE2B 551c532cc3b6ca37a26d56bf5a84cd6f9300fda37e53a4bf8971c74b8796620d3f155d87f0847266987636033361466bdfa6e4ab8d157b191ef7ac8a3f9e623d SHA512 9b274c1bfd61f0fef46121f281474a283925dd0d7d07c956582ede8eff6e77d86154ead2f78a55670422e405a2452f3eaf3e5edf8158e334db126a5cfe4738d1
+DIST firefox-90.0-tl.xpi 533270 BLAKE2B 985d7179e6cc12521caa360d60ebb2d98efcaada1dc9c62fcc544ed96508ffa480e2226dad62c8f9b2570786300e6412eb877865fc899571b455a5355cb757a6 SHA512 57f03b901d7b801bef5f2a10ca54b4655679096055defd815222f9a7d9fb32725f161b33f0d1b90fd3e12d50f41cac08cc880467b50040adf8148784243c28d8
+DIST firefox-90.0-tr.xpi 564315 BLAKE2B 9c95d193b314848144e9eb97486b5714dc5d6397d0dd4e46c93f6e34f1b29edeb8b44b48708bb7d8aa7db689a2aa5bbd6f75637d7b2c6b09a7da53627eba9a8f SHA512 e1bc5f933c4f0072d7ec06d9090fc3ff586b1c9865810f7a2508d25a482096106624c474f4bf44f0a59543315a4e118da42225c8d19a6b03a36e8a01ad7b2240
+DIST firefox-90.0-trs.xpi 506674 BLAKE2B d4db6aa6e5004ee1573b367276c5bb842606cbf14acc687e51e586a0d8c0b972178b1b46a6d9a7348a53472b9f97b5f6493c2538bc4bfcafc2fdd07802381a36 SHA512 144a47fd20ac3c5b49b65b27e8703393cba1e61c0afac30ef24e5873b0e6f46b1f25ae0f1a64c1e7f43c11248c5cea9fa8a69e4011c833603d6c079045e3b545
+DIST firefox-90.0-uk.xpi 635104 BLAKE2B f4c5074c2bbf9213a2d2cc18f1042a3bfd8f1b2aa3adcfd721911df9530a140c4c08abad281b9ca35709ea644b27549a63892f4e56a5b7c46913e929f89378e4 SHA512 d509610a5a3467e845d825d36376c885d24b7d6a7e9baba2104a5bc12fcd51617aa8303fcac74d9194bdfcf4eda119129d3efdb76fe1d2e6e8b364fcacb7b596
+DIST firefox-90.0-ur.xpi 577979 BLAKE2B 9b9273337bf7c0aea20e372f680cea4a85a907a90ebc03ddfba4526b2c865576315c9e0384f380aa3ea6b16cdf588bdae1f10e003fcafa33fd44017eaf650c6e SHA512 276b26cbc2f47a19ff8dfb47e28ff3791436f0cede7f996dbdf092bf64ca36cfd2e164e4c8857225a3b0446a40d897aab69da9174c920780c7067b811917f2d0
+DIST firefox-90.0-uz.xpi 483028 BLAKE2B af935ab295326af2ab09f88d4ac9620a868355c1540c1fbfaee49b8b3efd41ecbcb9845d247d59cdf57bb25d471fd8202ae9dcc180f237b23f44dcd1cc3f24af SHA512 414bb6a1569fad5606b56df540bd5f1c5f4ee4531bc4b0c5b868ab41382e6dba91ba145f276485087a7b432d484def7229fdfdc73b40e826300e91a4b5017c7c
+DIST firefox-90.0-vi.xpi 586288 BLAKE2B 3e357d30dd5feddebba17a4fcb19cd4ea24ef8fbd4e6212757eb252284860b62a8786ec2631a8c02a992e9308d70c57284b58ec85a9e98a39ed736012977f01a SHA512 553533e250cb3d555fb90e2b8f3867ba0cfed55898810c136270407156ec6471ebe75cc930bd405b1afa81aa50c638b048ab1c3b187d1a3b289d0648d8eb396e
+DIST firefox-90.0-xh.xpi 430173 BLAKE2B f33cf177ca73a5e507f273d22842ee507252615260561dd7b34319491f8936b2b38ea4882800f4beeb4a5d99e7f702628f471e8539e3ac943f794fc9f23e777f SHA512 8af951cf3e3c57f0b881983862e4f75c7c696a24ad25ae01bf649c0aa2d36b3e658723b3ec964741adcfb49f1f7380214cef88500bb8bde74fb030aa9043f150
+DIST firefox-90.0-zh-CN.xpi 587658 BLAKE2B 316f42f5d3e28960afc1a9586771d8fc1f7c2a1ab429a1daf391817d089a02a92e3a757d0c73cfb43320d13f497d11b508848daf4bc1150353c37411f56823fa SHA512 bc7c6cb7300b0a3b002975a7e7b1c93bf89c4ffec272ceb980aa74bdaf4ed1d7786c545f1212dbe4aa7106eddf5b377cd0c9d0cc7e971b768246ad7ad9983733
+DIST firefox-90.0-zh-TW.xpi 588100 BLAKE2B 671eb44db05a61d0077e6320147df6aad5723721eaf39f256b636abba15c03fb37439fb931cd7159badfa4c3f6b7a71b4503b72d0d27573e33e540a351c71e99 SHA512 be1a2f630027ed5fe1e1961fdf13da78af800178153b8bd389c512e5e5bb5093ab3b3169232810e4e863f96514b6fa0c69c92107465525c863934726f68da21d
+DIST firefox-90.0.source.tar.xz 378743212 BLAKE2B 5f70cd3a8b0ece81c332de6be85f7fdcace3936e4f67b4f3cf080766c28fb1f90694e157dbd4f6fa8ed8aed5550a899eee8f000c2bea228af4546cfb02757ade SHA512 233ad59e4ab2f08d2253b49235b51b26fa32fb7c285928110573ccbe67c79965d9401a6c58a3af2ad22b8a58ca5d9b3154e3e8c9d29b153acd16152d9b75442c
 EBUILD firefox-78.11.0.ebuild 34070 BLAKE2B 11606c90bf3c12271ef312aa067401e35aead267b40c6b918ed9a7d87113fc09ded50d5bef859997382cd2f9b33b46a86fa9c0d11406c78325654f6a471f5df8 SHA512 5840743899fef2473bf72c146767be95843758826d7a9a4b027a6772eb572f8f4f522ff975c088bd21888fdaae4e8395a9370d0257a05f2270d289b0ad79bb66
+EBUILD firefox-78.12.0.ebuild 34233 BLAKE2B 82fb1bfff27d50408ce56311ef52980ea2ec091469432a6af369a112a9bf3394473113c3ab83d470cf1ef001fdcbb7c25ae187347e895440ef405579fe8932a2 SHA512 66a473292653070f2f628a4f93002de011690ef7837ebf30963ceed04ff9570f01875b87e399f02dc90636977ed50e583e34698363a7fe9bc15268912611e068
 EBUILD firefox-89.0.1.ebuild 34087 BLAKE2B 04586ee4ab959c80c56317329e24b1af104758187bae2103ce81c8be21d8cd05a888e44c1cff3668c998d62118e7f09e9b383b679baf24e35a44fb181b02a9b4 SHA512 bf8a35aae22c49d29ac20768a222aebc601f91cf9d00c69145c778bed70a52813134fca01d51f9da308cc9c5e017fc670be2423af40a68700c441af1016c0665
 EBUILD firefox-89.0.2.ebuild 34087 BLAKE2B 04586ee4ab959c80c56317329e24b1af104758187bae2103ce81c8be21d8cd05a888e44c1cff3668c998d62118e7f09e9b383b679baf24e35a44fb181b02a9b4 SHA512 bf8a35aae22c49d29ac20768a222aebc601f91cf9d00c69145c778bed70a52813134fca01d51f9da308cc9c5e017fc670be2423af40a68700c441af1016c0665
 EBUILD firefox-89.0.ebuild 34087 BLAKE2B ce7444269154d92c92311f1ac22cec0a1d08545c9e706f665236dbb9db357c51942c04bc48e05785f8df09863b11672ec2f541cc04d1565d36376562fb999932 SHA512 624d2ff7a355ea39b2a43f2fb68f59113845025aafb9e5a3a9938677926206d79795dcbc054afe373b2c6a78c294c32f45676c0fe37b12ca29ceceaeedf14d94
+EBUILD firefox-90.0.ebuild 34223 BLAKE2B 037f674055e4d81adf41ca0f708a5c728a3932ff86673261031aa4ac94ba3e785af06ac1e13615bb836456049a37632f8c0301538863056702d702b564293e2e SHA512 e999a8e1f13e4d79ce8f346a0d3899cbe54e444641d445769f15075f932e60e4916b6082ec353ad1965411f180557654c087e6d171e9f59384c3d9f243659445
 MISC metadata.xml 2150 BLAKE2B cd105f3b1d98b1fde124c6362c2e23563c03086a507bdc0eb0e4944f2050787f96967c4cba6f4605e4adcdb200d0c0fded6cc2bcda7ea7720d270e1fd6f33525 SHA512 a588a09ad3481522b44097b3c5e51211d5fc918a6733f3b6f1b1cd7994523894917fa737de944c235d45bfb9b57def205ce645ff1ac62ef7d6c3f3c51d387556
diff --git a/www-client/firefox/firefox-78.12.0.ebuild b/www-client/firefox/firefox-78.12.0.ebuild
new file mode 100644
index 000000000000..3e0e8d7fc1ea
--- /dev/null
+++ b/www-client/firefox/firefox-78.12.0.ebuild
@@ -0,0 +1,1187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-78esr-patches-15.tar.xz"
+
+LLVM_MAX_SLOT=12
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
+	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/esr$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
+	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
+	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp wayland wifi"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	screencast? ( wayland )
+	wifi? ( dbus )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.14.3
+	>=net-libs/nodejs-10.21.0
+	virtual/pkgconfig
+	>=virtual/rust-1.41.0
+	|| (
+		(
+			sys-devel/clang:12
+			sys-devel/llvm:12
+			clang? (
+				=sys-devel/lld-12*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)
+	amd64? ( >=dev-lang/yasm-1.1 )
+	x86? ( >=dev-lang/yasm-1.1 )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+CDEPEND="
+	>=dev-libs/nss-3.53.1
+	>=dev-libs/nspr-4.25
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:0/0.3 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.6.8:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-67.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			# temp fix for https://bugs.gentoo.org/768543
+			# we can assume that rust 1.{49,50}.0 always uses llvm 11
+			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
+			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
+			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
+
+			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
+				local version_llvm_rust="11"
+			else
+				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+			fi
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable screencast pipewire
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
+
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	elif tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Build system requires xargs but is unable to find it
+	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/www-client/firefox/firefox-90.0.ebuild b/www-client/firefox/firefox-90.0.ebuild
new file mode 100644
index 000000000000..b2acecd2054c
--- /dev/null
+++ b/www-client/firefox/firefox-90.0.ebuild
@@ -0,0 +1,1182 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-90-patches-01.tar.xz"
+
+LLVM_MAX_SLOT=12
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
+	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
+	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux
+	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp wayland wifi"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	screencast? ( wayland )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.19.0
+	>=net-libs/nodejs-10.23.1
+	virtual/pkgconfig
+	>=virtual/rust-1.47.0
+	|| (
+		(
+			sys-devel/clang:12
+			sys-devel/llvm:12
+			clang? (
+				=sys-devel/lld-12*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+	)
+	amd64? ( >=dev-lang/nasm-2.13 )
+	x86? ( >=dev-lang/nasm-2.13 )"
+
+CDEPEND="
+	>=dev-libs/nss-3.66
+	>=dev-libs/nspr-4.29
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:0/0.3 )
+	system-av1? (
+		>=media-libs/dav1d-0.8.1:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.7.4: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 )
+	sndio? ( media-sound/sndio )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE szl ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			# temp fix for https://bugs.gentoo.org/768543
+			# we can assume that rust 1.{49,50}.0 always uses llvm 11
+			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
+			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
+			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
+
+			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
+				local version_llvm_rust="11"
+			else
+				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+			fi
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
+			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
+			# bug 792705
+			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
+			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable sndio
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	elif tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index da283313ed70..1aedae40acbf 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_92.0.4515.80-1_amd64.deb 83997848 BLAKE2B 232dc1fa14bce6419f609f42f5ffe257aa9fe64a5b01ff6e058026c0e89ed86043935881cc1d930b9b0ad58785b58b01568f25c3436e0e5f8901b0cf18d732ad SHA512 d71c9f6025fecb4b40436c8a8624376323f652388043987d2ce66281501043046952c0bde345ed0011ea8b4c79bef724d2bb9e887fd216ce656326048d40174b
-EBUILD google-chrome-beta-92.0.4515.80.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
+DIST google-chrome-beta_92.0.4515.101-1_amd64.deb 79846520 BLAKE2B 6f2dc28106ec483ab2222ab442862aa486978dbfd549a989e4126bfe824ce515b946452ffafa895af3f050643c386777df16a1ddb5eeab2388e4f30494261ad2 SHA512 e258c1c45ddc99ca287c9ec9bd0f1538a03862671797420d8dd3afe8d81208e7c5e972a8597a290b46d1aaedeaaeeb4aacd57f9b0d7675a03b1ae8f05c58c832
+EBUILD google-chrome-beta-92.0.4515.101.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.80.ebuild b/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.101.ebuild
index 823e4a8ef49e..823e4a8ef49e 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.80.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.101.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index f6eb22e92d4f..2d08226cd237 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_93.0.4557.4-1_amd64.deb 81938736 BLAKE2B da06bf54a1dec12dc65c5d12cc22e941d7b2f425fc26e833b836722446acb56f5c1248c65988654f2dbd410a9ae70266f8fb9674674a17c289cccd7eab5ce2fd SHA512 823073884a9947c93899a8aa0a61946205731549b15852f435c3b8c7733bd6457096459c445f5334db0d0ef81370971b7f3fd33d47eb2d18a592103c31852d2e
-EBUILD google-chrome-unstable-93.0.4557.4.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
+DIST google-chrome-unstable_93.0.4573.0-1_amd64.deb 82156356 BLAKE2B 747e668f35787115de94514420576228733e63221964b5eb6b0ada4258eb69a9a8a473500e726c93828d73a56cfc3d76ac56ed075ca56e7f9b2d7d7aa7b0c762 SHA512 c8c79600525aac5bfc81cbac749c348bc7d875f8c43969f8d2271db7d1493615e816fc95e5f4624bb3ab164477f837104b631dcab3617a75cc1747bb8a2cb6df
+EBUILD google-chrome-unstable-93.0.4573.0.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4557.4.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4573.0.ebuild
index 823e4a8ef49e..823e4a8ef49e 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4557.4.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4573.0.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 79bbc5ba5fbc..f1543f0b0e72 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_91.0.4472.114-1_amd64.deb 83565736 BLAKE2B c7e98f10708ba839c6d2e4ced39ac4a2258d2ade9f958f22d97fdd479951d87b8ea60863bc2d7fb8520225b76668f8720a3ee1ada496cd666c31c218b9b54653 SHA512 48ff385ab69630b2e734c1c502bc31048bf05958308fb5d478a40f37fe161889b3e0903e5f9b59cf3bfc93b10f6b5a640a6540bb6c247558529253ff864805a7
-EBUILD google-chrome-91.0.4472.114.ebuild 2711 BLAKE2B 0e222b8062c222ef468bf0c359495bc03a7ad587fa2a4e9c6868252c1dea481841c65d26910c9d3795288e241181b61b9b07544bff7fd6236a12b009e3c0cec9 SHA512 3c0ab6db4ac6b352765aa6c37cc2e62ba7ffa237a3b72865dca0b61c879c6b5dbbd620284fec368548ee0ac8cce31a0435a020359e8523d2d8248ceeb0f60567
+DIST google-chrome-stable_91.0.4472.164-1_amd64.deb 83570528 BLAKE2B a55d57182e7b70869ffd910807cfec90b8bb4c74b5591a3df13aff5a0b108754d24912479cd3130e6d56eaa34d217d35dade1ead033093c1947367759e5d4d23 SHA512 257ac9584926c174a9607a43dd75c137be29b9a38176bdced3ab101bf149cb8ebb9f1718976573f2c22f1cfec92308a759a48fe52a92791d3c0641bfb989c784
+EBUILD google-chrome-91.0.4472.164.ebuild 2711 BLAKE2B 0e222b8062c222ef468bf0c359495bc03a7ad587fa2a4e9c6868252c1dea481841c65d26910c9d3795288e241181b61b9b07544bff7fd6236a12b009e3c0cec9 SHA512 3c0ab6db4ac6b352765aa6c37cc2e62ba7ffa237a3b72865dca0b61c879c6b5dbbd620284fec368548ee0ac8cce31a0435a020359e8523d2d8248ceeb0f60567
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-91.0.4472.114.ebuild b/www-client/google-chrome/google-chrome-91.0.4472.164.ebuild
index 5378595af7f2..5378595af7f2 100644
--- a/www-client/google-chrome/google-chrome-91.0.4472.114.ebuild
+++ b/www-client/google-chrome/google-chrome-91.0.4472.164.ebuild
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 5908cf0396ac..4a16c49fcb73 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,5 +1,4 @@
-DIST links-2.22.tar.bz2 6481705 BLAKE2B a6855fcc62377116fe61adb01623c0cd757ee47ae36bfb35ae657a6d6587f9e47b6b1f78ad73e3fca911ad4aee8c15f364d4af911d694f04229b107d10d6f422 SHA512 d2c9f764d64c2d73b85c998db9fc8c241556977380eef1f4041623ca306f5798227b2b57daecf09ee85e0b07f8738bdfe0b84fefc924d6e05d931e29d29ba40e
 DIST links-2.23.tar.bz2 6521143 BLAKE2B baefdadddc0d44511488ca1a085a45f3235b9c58ae6013c1efce495a33e86b96575eba6a15df4f14ea82b7d1ffb69ea312d5d5223ba9c605709bdb5d153ef6cb SHA512 3c233dab2e7e5ca72f582c5af9c5799b3d6c1a5a64d4e9e0209f78f347a245dc760c2340f71839fd42e1c9f358599b8baa12aa024938f2ab1b6424c8fb0b9a7d
-EBUILD links-2.22.ebuild 3377 BLAKE2B 3d20a0be3d96ff064abc2c47895032fd5674cc1123e89f13d69b40a7208e821f13aab9f5ad5c50e87cae272059472e1c57d0ae3e095cda73171bbc6e8d56b584 SHA512 1d67d4b8d420894d6dc0d95ad430ab316204055c3bd5b5413cb7c277d19da218bb98d78effe4c47ab6f3d4a9a987108835ea46e40d2e865240e3ba429899cfb6
+EBUILD links-2.23-r1.ebuild 3404 BLAKE2B 50ca2c575d8e94cb526b33134734a6e4ea17ae2bca2a022300e0be6c4fc7fe0c9aff5eaabee770a86bd6eab783124ee90a93ed5346b1ffc01e702289ac10200f SHA512 6863e084013309e586f19e491fea60d4d090f2c833923b9e3fbd0a7d9b2c2e07c59b310d3956696b087270b29be5c10a7a4581f5b875f31461ea8dde9052c822
 EBUILD links-2.23.ebuild 3377 BLAKE2B 3d20a0be3d96ff064abc2c47895032fd5674cc1123e89f13d69b40a7208e821f13aab9f5ad5c50e87cae272059472e1c57d0ae3e095cda73171bbc6e8d56b584 SHA512 1d67d4b8d420894d6dc0d95ad430ab316204055c3bd5b5413cb7c277d19da218bb98d78effe4c47ab6f3d4a9a987108835ea46e40d2e865240e3ba429899cfb6
 MISC metadata.xml 671 BLAKE2B a27e4d153f5b73c96a6e15b21306a3d47c1df9cc9492b115d58ddcf3af8ba8b7c5b51b985c32b31fd04e88b400022f1db873063fab519792aa18c67538f0b790 SHA512 6913a9c3b54ac53235f85ef4a4ba8c370b7ffa4fd429e2a3d1a065eab96ba5e36f35b704622c9599585cdcbad43e14783ef92934c0e250bc315a3d9754aac360
diff --git a/www-client/links/links-2.22.ebuild b/www-client/links/links-2.22.ebuild
deleted file mode 100644
index 45a610a3fcaf..000000000000
--- a/www-client/links/links-2.22.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop xdg-utils
-
-DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
-HOMEPAGE="http://links.twibright.com/"
-SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
-
-GRAPHICS_DEPEND="media-libs/libpng:0="
-
-RDEPEND="
-	brotli? (
-		app-arch/brotli
-	)
-	bzip2? (
-		app-arch/bzip2
-	)
-	fbcon? (
-		${GRAPHICS_DEPEND}
-	)
-	freetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	gpm? (
-		sys-libs/gpm
-	)
-	jpeg? (
-		virtual/jpeg:0
-	)
-	libevent? (
-		dev-libs/libevent:0=
-	)
-	livecd? (
-		${GRAPHICS_DEPEND}
-		sys-libs/gpm
-		virtual/jpeg:0
-	)
-	lzip? (
-		app-arch/lzip
-	)
-	lzma? (
-		app-arch/xz-utils
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	svga? (
-		${GRAPHICS_DEPEND}
-		media-libs/svgalib
-	)
-	tiff? (
-		media-libs/tiff:0
-	)
-	X? (
-		${GRAPHICS_DEPEND}
-		x11-libs/libXext
-	)
-	zlib? (
-		sys-libs/zlib
-	)
-	zstd? (
-		app-arch/zstd
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	fbcon? ( virtual/os-headers )
-	livecd? ( virtual/os-headers )
-	X? ( dev-util/desktop-file-utils )"
-
-REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
-	svga? ( suid )"
-
-DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
-
-src_prepare() {
-	use X && xdg_environment_reset
-
-	if use unicode; then
-		pushd intl > /dev/null || die
-		./gen-intl || die
-		./synclang || die
-		popd > /dev/null || die
-	fi
-
-	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
-	sed -i \
-		-e '/AC_PROG_CXX/s:dnl ::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.in || die #467020
-
-	# Upstream configure produced by broken autoconf-2.13. This also fixes
-	# toolchain detection.
-	mv configure.in configure.ac || die
-
-	default
-	eautoreconf #131440 and #103483#c23
-}
-
-src_configure() {
-	local myconf
-
-	if use livecd; then
-		export ac_cv_lib_gpm_Gpm_Open=yes
-		myconf+=' --with-fb --with-libjpeg'
-	else
-		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
-	fi
-
-	if use X || use fbcon || use svga || use livecd; then
-		myconf+=' --enable-graphics'
-	fi
-
-	econf \
-		--without-directfb \
-		--without-librsvg \
-		$(use_with brotli) \
-		$(use_with bzip2) \
-		$(use_with fbcon fb) \
-		$(use_with freetype) \
-		$(use_with ipv6) \
-		$(use_with jpeg libjpeg) \
-		$(use_with libevent) \
-		$(use_with lzip) \
-		$(use_with lzma) \
-		$(use_with ssl) \
-		$(use_with svga svgalib) \
-		$(use_with tiff libtiff) \
-		$(use_with X x) \
-		$(use_with zlib) \
-		$(use_with zstd) \
-		${myconf}
-}
-
-src_install() {
-	HTML_DOCS="doc/links_cal/*"
-	default
-
-	if use X; then
-		newicon Links_logo.png links.png
-		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
-		local d="${ED}"/usr/share/applications
-		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
-		if use ssl; then
-			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
-			"${d}"/*.desktop || die
-		fi
-	fi
-
-	use suid && fperms 4755 /usr/bin/links
-}
-
-pkg_postinst() {
-	use X && xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	use X && xdg_desktop_database_update
-}
diff --git a/www-client/links/links-2.23-r1.ebuild b/www-client/links/links-2.23-r1.ebuild
new file mode 100644
index 000000000000..59c9f75ec2ed
--- /dev/null
+++ b/www-client/links/links-2.23-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND="
+	brotli? (
+		app-arch/brotli
+	)
+	bzip2? (
+		app-arch/bzip2
+	)
+	fbcon? (
+		${GRAPHICS_DEPEND}
+	)
+	freetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	gpm? (
+		sys-libs/gpm
+	)
+	jpeg? (
+		virtual/jpeg:0
+	)
+	libevent? (
+		dev-libs/libevent:0=
+	)
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+	)
+	lzip? (
+		app-arch/lzip
+	)
+	lzma? (
+		app-arch/xz-utils
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+	)
+	tiff? (
+		media-libs/tiff:0
+	)
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+	)
+	zlib? (
+		sys-libs/zlib
+	)
+	zstd? (
+		app-arch/zstd
+	)"
+
+DEPEND="${RDEPEND}
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
+
+BDEPEND="virtual/pkgconfig"
+
+IDEPEND="X? ( dev-util/desktop-file-utils )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	use X && xdg_environment_reset
+
+	if use unicode; then
+		pushd intl > /dev/null || die
+		./gen-intl || die
+		./synclang || die
+		popd > /dev/null || die
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	mv configure.in configure.ac || die
+
+	default
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		--without-directfb \
+		--without-librsvg \
+		$(use_with brotli) \
+		$(use_with bzip2) \
+		$(use_with fbcon fb) \
+		$(use_with freetype) \
+		$(use_with ipv6) \
+		$(use_with jpeg libjpeg) \
+		$(use_with libevent) \
+		$(use_with lzip) \
+		$(use_with lzma) \
+		$(use_with ssl) \
+		$(use_with svga svgalib) \
+		$(use_with tiff libtiff) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with zstd) \
+		${myconf}
+}
+
+src_install() {
+	HTML_DOCS="doc/links_cal/*"
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
+		if use ssl; then
+			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop || die
+		fi
+	fi
+
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && xdg_desktop_database_update
+}
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index 4b3eee71c609..85be44c012a8 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -4,5 +4,5 @@ DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926
 DIST surf-2.1.tar.gz 22555 BLAKE2B 3170b0b26893361ec84f2552051dc85b4a6fc132ff09a2dc2e9256f8ec8cdf93650c41b4d0466ebb5b608e2bde9282c1d1f64bb6f17114c58da7616994473f22 SHA512 06f31f683a941d9a587d908ae7f6949255937b0b0c9c133a18c6fa753c7da75de267adda1c83dd9ba0a8535e2b6d4ff2b5408cc5e8a2e315d4198fe68df5db12
 EBUILD surf-2.0.ebuild 1216 BLAKE2B ac3980a08b6fd54ebb1c8424578ede2d0a1e4a911071cc62b8c506901f26453a031c4297c45d7fdae68ae391ad13c991c6df2590640cd5f77222030d9ea95b83 SHA512 a176f138ebb9779d94a94e5ff274390be1043b20cccf1130b14f8212d19c0a43063d6b34b6f7f2fc2daf9a2de4f3f52f3b80de55bb2af7ca075dc7c673ec44d1
 EBUILD surf-2.1.ebuild 1403 BLAKE2B 927a745af173f49f4c33c2d47f087611f457eb5281423b6076b282fe1a99174d38457e98a234ccee933161c03994fe19a3f487e05e55a4ae68d4b52c1f20e515 SHA512 266442cc185292cd2751e95f252f56e86d743d5b3dcb0ceac6460b77c1c9c5908a8b667d6877062227b80296c9e8c2f50f21a4f0e4d9fe34e16a49fe84793999
-EBUILD surf-9999.ebuild 1408 BLAKE2B 249f77689e9884282f0ceeebe759c2a3c145563e3117e0a8b1e90fc76d3df03a19220fec0821986843d87a2382e177d67e72036a2d529d2611ab0ea0c0189509 SHA512 c63155a275f7e57e163f4a46424c6d96e2cbf776616291b6aa874925d4a038d423315582e55883d974d4a66050609b7e888e2ef3d18466778273f05112e9de19
+EBUILD surf-9999.ebuild 1855 BLAKE2B 2c8c238e27d72a3a3b61ff02b203177b213a6d2de9b243c750137b6a99b63f4257fde60f5ccd85cffbcb921b2d98327c0812b70c3c74a05828294a0d3777d051 SHA512 8d72209cdc9d1fd76ae8b09c7a132209635c97c52b58f0ac680726a8460958234f23f77f8f7612e43d1af54354a0a47f33d1846f81356dd9d852fec4cb52e446
 MISC metadata.xml 697 BLAKE2B 80822c37adf6994ccf8277a1f618ade740bdadd90040adf5e5f4a2662da26c6be937796d991754bb420eebb9cae8cc320366ec4c76e838fc19aa4e45178048a3 SHA512 eedcd0841b7d3994c675240fcb812c16b0f1a5032a7a6d828880a039aa60090668fae92ac6d54252c50f7492bc439c0da48018b2defffadb89bf563444474c27
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 2b48a07f1c22..9dce31f41287 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit savedconfig toolchain-funcs
+inherit savedconfig toolchain-funcs desktop xdg
 
 DESCRIPTION="a simple web browser based on WebKit/GTK+"
 HOMEPAGE="https://surf.suckless.org/"
@@ -73,4 +73,25 @@ src_install() {
 	fi
 
 	save_config config.h
+
+	newicon "${S}"/"${PN}".png "${PN}".png
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;"
+	make_desktop_entry \
+		"surf" \
+		"Surf" \
+		"surf" \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=surf"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index b72bb6df3f67..a99b030c22d7 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,18 +1,9 @@
-DIST vivaldi-snapshot_3.9.2289.3-1_amd64.deb 83539836 BLAKE2B d8a9dcc850dbd4d15f1b80b05469b9e075a5e4d8b3b02dd008e6f0d4929590a5bc9ec28a35e000eaf51b915c2ad385a4080a2c04a70b4f19cadcc259cdb98718 SHA512 6c09de35d3c4e0f9b79c1fa1076754213b5acbcddb648731b9d214b1fa4820544842da2e11be6f71e547f431c3410479402003c6755664d2c36a1caa1cf6c23b
-DIST vivaldi-snapshot_3.9.2289.3-1_arm64.deb 79023788 BLAKE2B 163adf52c555f47ea1ac6b9f6e6ef457cf901a4be0b04590da482b22c330381437de9c23016759d5eb6d8da82061b451067840ffe097de3e273b569067d5d939 SHA512 5c8596448bdffd22bf6837b0fa966b049af8efa22a4da009f953e17743bd9497dc825589ea92bb672ebe1ce8a0003ace6f9a91f3d5e2c8d9092f9049d59ccc80
-DIST vivaldi-snapshot_3.9.2289.3-1_armhf.deb 75093252 BLAKE2B 0deaff270b851a9febdbae29102d5e5e0e221ddee7e285db1fe13fbb3ba8b44d82cab61220a66d12ab31fb36300236b107848c401e2e1203bfd5330be254ac78 SHA512 1fc4a6f6b5abca3e45b7208c8416029c40641c5213fc472bf54ef6ea5284c7bfccfe1cdf66c623c88b7fe200fe8d7356c99a9baacd85944b0818006d9d54fe02
-DIST vivaldi-snapshot_3.9.2289.3-1_i386.deb 82584664 BLAKE2B f5447df81bf87b128cf9e65443913f61b29417e2ade09407c4131a0211006b7779816d28ae777aaf8792bd3745e9669dbce03bdda83616e5a669333f9e520a06 SHA512 dedfa2249ebeae7a5f55a26235f25a351988e9ae9d6d6a383d4e5c2a0680eafeb3e30603e6476b0d814a9f5b1958b7e0894a4b60b47e5bb72d2af2e577ae35aa
-DIST vivaldi-snapshot_4.1.2339.3-1_amd64.deb 85079208 BLAKE2B c3d32b5ef68cf8e8f5a260911c10d38180c7efba5005fbb57f5ac36cf2a5e521766d502e51c80230b23557fae1cf1a2e7cfc1c531008efc500a2aab3fdc6b87a SHA512 355b40e4c74488628e762770c2ccffc975f703c3b88ddc4f03b1c89f04e6afaa12e8ddf5b0588d7d56b511477580dec6b4489b41fd0167af190aea0707037577
-DIST vivaldi-snapshot_4.1.2339.3-1_arm64.deb 80603108 BLAKE2B 7f39d0d6ae13276f54779e2d7a1818c3f03dcdaa693eccfe1e0b63c99d5b42bff7724bb452e8481b2f190e47e749413022563c26f2ac3735b364d2ce13974f41 SHA512 0cc4885f6b87a744f8296444532baa11bafa30554fb167e1dd1d38c4f9043ce4cd1f3c3d672b4693eacf34469e264c2579ea10dec0330fab8e82dc65723f8809
-DIST vivaldi-snapshot_4.1.2339.3-1_armhf.deb 76480984 BLAKE2B 9e463d3f5858762d5311349e9a61b8b1a5f3657645939bd6702dfe6ab6e97f484dc11135a9205d94cd0d9073f3eb121a7ece94ba99dc378340cc9eb856508a2d SHA512 f70d5d0d74ce0aa3a4eddc98fbdd52d45d4d77c955f9f0f5e4753e464a96b63609b77381e1c820f94652bc355fde1a8dc58d33bd6e40144265cf3cc3a5243792
-DIST vivaldi-snapshot_4.1.2345.3-1_amd64.deb 84486756 BLAKE2B d5dccb6a46036962ea15a0cec8a86af76b1c3532d1c77eb1cfbddad5cbeafe4c14ba0b8bfcf1e400b4e3e62fe99f8a9058b358fca2b0295be78db9c0d1416b07 SHA512 2281bb9ae1236cc97292401170e36d92d586f17fec83d4a60f339d926fd55c6c7d1c68e8a5a92d6242c95be656e521fb9b3b06c9804beeb94694e0e33dad6b17
-DIST vivaldi-snapshot_4.1.2345.3-1_arm64.deb 80613128 BLAKE2B a4450a40bda954d548716e66ebfc8bffb72e8fb45dbeeef59fe2baea6482954c78c17ea76b8d43fcc389121e88676fa1bc82071caec34658dfaa92701632e9b7 SHA512 41464c87b886f68a654a42994daa688a83fd8589616b476a22971c8c0ac605831d94155dff1bd168914b63cf356f380dc268c037c2c36beca3e96adbb88a5213
-DIST vivaldi-snapshot_4.1.2345.3-1_armhf.deb 76498924 BLAKE2B 5eb1a39b69adf07ec8e6f670a778ccd1046b4c26a66c3475e532a1adf410b6be8a1c98df90b320dc90611007dd6b50af1c666c2bd3dde74d659c7eeca88fad97 SHA512 7c54ac4fc8aec5e3830bba7d66261065ee1c0df08b7802f71e73ea9006e8c1a86a3f91fac7963b0445f3a8d4157c98b35f741455743d944e1ee0f77cff271fe2
 DIST vivaldi-snapshot_4.1.2352.3-1_amd64.deb 85091424 BLAKE2B c5d0211ae23e3d46281860ec1d896a7705300203b6ef0d7dfc95457376daf54dc027081ba8dd9e689a7781d4002c9932a8c1822bf7fe69ac878f4c80b22d5fd1 SHA512 c8f9d891d001bd5a0b05155b1f71cf8083c940936c2a42447aa3367a3e87ae35e787f5ea594bd26b7b34a7ec64a8d47d7a3427636c6d1f1f5259a08a7822fd20
 DIST vivaldi-snapshot_4.1.2352.3-1_arm64.deb 80640544 BLAKE2B 4beffa4351157bed1e8b87af926876bae7b145d35062d8320cef059d9959789f6b11fb7a41ab3fba2adc5f5639a161d6d56675ebcfcf998ccaf9a532c111981d SHA512 75c3871455b06bb338ecd3b44995a445ddd8fb47277cefc5126e044859ea42f295cf793c9d1817e1917dc1172992ea009635859596a9bf850cfa5e9fb5c2f876
 DIST vivaldi-snapshot_4.1.2352.3-1_armhf.deb 76513320 BLAKE2B 3916f00208317b05cc6bb48481ed625e9407721b6e2f35c8f384703308e9da0edd476529d8b3ff57d647b25d7b97116567b005e800fc875cbdf0a48880aa5edd SHA512 04c77b4e6142b516a19bc2fdddced5000f30673e3997cf4fd380cb020f6cad64e1bfaed60d18d366b27d3b1a9a963e1a0ef669c418828a70e0e01cace1588a5b
-EBUILD vivaldi-snapshot-3.9.2289.3.ebuild 3342 BLAKE2B 6cedcc20db6fef8468a74fa7b0102b7e0de08029e179dfac685f636184a7250f7494d2a5b52ea2e3ecb9f73321e9cb8f57e2aa8ff0a7c86901c7ca1f6639f301 SHA512 8a2ead0fe7aa024f0565e6ed4effba0dc47d51da8c79fea96f7ada0deb504115140b3ef4e97d8a97e65fdea479b27019ee34ac11f31c87e5233067ec6af0db0d
-EBUILD vivaldi-snapshot-4.1.2339.3.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
-EBUILD vivaldi-snapshot-4.1.2345.3.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+DIST vivaldi-snapshot_4.1.2358.15-1_amd64.deb 85118372 BLAKE2B ba0812c276d36c7fcdb1cce040ee0daa32afa9fc95695136cc202a86110132050ddffd80ec9d2f10293030f3af8e6c47382da7d8b59bca62e5a5636fc8980222 SHA512 ce7819f297cce1dde4746bfde503abb2133defc0ef80d89c371ed1d6bea76e5123c7f449c4edb0cc0212d2f7f1e651fe4d8960162320e04c48761666cd61f1ef
+DIST vivaldi-snapshot_4.1.2358.15-1_arm64.deb 80658544 BLAKE2B bd42810379f787abe46f88ba2844c209f1c8d41089b3a7a9a487f2e8b6599f0577ea46df3dfd4c3ff35f3ecf9ba9b86920131e6b16313a5852efb00e683f6860 SHA512 60f75623b5891978bc35f032fc676671d1d1277989a7b42a2fcae318943eb60d8830f76738b08b11833d205b8d27ce00deed7969a2a80de1c421987526b642fd
+DIST vivaldi-snapshot_4.1.2358.15-1_armhf.deb 76520492 BLAKE2B bc96e33a3b9395402df488f54819759eaa169665376b6f779917f1d1d284c0dc43cc276b5428746ab02157093ea8a6323dfc86db4265721fd83dea6715f9bfc3 SHA512 2db620443b842929bef57e1ab64a23540d02b03cfd08ef67d45fe73d6a7ac948e895ccddd571c9b1145bfa8a7255ab878ff2b65578b7be358da770f88653f407
 EBUILD vivaldi-snapshot-4.1.2352.3.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+EBUILD vivaldi-snapshot-4.1.2358.15.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.9.2289.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.9.2289.3.ebuild
deleted file mode 100644
index 232d99b73e99..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.9.2289.3.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kab
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-IUSE="proprietary-codecs widevine"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	[[ ${PN} = vivaldi-snapshot ]] &&
-		dosym ${PN} /${VIVALDI_HOME}/vivaldi
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2339.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2358.15.ebuild
index c2409d01a97f..c2409d01a97f 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2339.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2358.15.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index d268e0068b0f..9289f18b8d65 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,13 +2,13 @@ DIST vivaldi-stable_3.7.2218.58-1_amd64.deb 78992560 BLAKE2B da8f3eacd8d0c826006
 DIST vivaldi-stable_3.7.2218.58-1_arm64.deb 71046428 BLAKE2B 8f0dd3e845f2e4587d238c8f48447e514ac7605acab8d67f30c30ce2df04fae600382218087aea68f75621887f5a71506389c81f9b31614e20d3d7611d7bfe0e SHA512 2126c24ae8a7e4370f4ced2b37580871394de1f38a02b88d24c974ee23c13a4264ca8c11e0c5b7ad542812531898d9ee425657d9c7eeba4e08c718c07c7337bd
 DIST vivaldi-stable_3.7.2218.58-1_armhf.deb 69900368 BLAKE2B a85b97405c80dd10907d9b0b9846b8c2b1101346cdce4b19ddeb1192de64c49056e086903829b30b9e6bb4928c3de500138cda460596dff7c2505fae0661d6ca SHA512 2d37b2080dbacbd6986e9d346be4e0aefd48a25f039668e2c1e697a025c294e4f945fdd3d86ae34688335e0d2b496355461756ae650e0b0fd212fbd983494ae0
 DIST vivaldi-stable_3.7.2218.58-1_i386.deb 76040556 BLAKE2B 4710993024a401a8b9e25dd5cae55d5e5077423a7f7bba7af55150675d7848427f6bdca1fa8666f338b7609cbb11254c75df901e3c33fc6b75c5824c17808b71 SHA512 d5a8658d80aa8a4b5ec38491f3a4f6fb16c5a0de7934d4f7f518efaee36afc1d9585695c121f5cd65d961ae134c7cae0cd6bf0b07858ef2f906d715ca424ead4
-DIST vivaldi-stable_4.0.2312.36-1_amd64.deb 84302392 BLAKE2B 96c6cde74ed82d015c042c90e82d839de56cd9de39076a17f8e0e662334504169778441bd1151e0d58403a146f84f0d9c26ba195eac9bbd3b7e2926fb2c7a751 SHA512 9635c01218278ca348ae57d3fdf37ef37726bdb495b650c29d95431b9f47355ecc90cf3296ab287f195f56f8482ae31e76a2953327a5b3e48c09907fe1286845
-DIST vivaldi-stable_4.0.2312.36-1_arm64.deb 79722080 BLAKE2B cd34349f2a7b0d7e2bd453fd8201e3a15fde904fa73e64c31acc33c68302d8bb3443379239b9b10e517a3a2112695ee4e7ed0e8b31e3563908543804f619810b SHA512 9ff85712f870490b1efd261bde39174a2f24af9a07c322b2556121004a3646948d1813256a46090fa7e443e044672833cd4626ca2ec014f9dad71ca9bd5ab22d
-DIST vivaldi-stable_4.0.2312.36-1_armhf.deb 75847636 BLAKE2B 1c32ebbcabc34b76f00927bd3902c24ec6c21a9268c8591b685c96c23eb446bc773db38c9e78558e2259b0986e561122f75d1e32c2128135291807d2cf55e094 SHA512 83ea795dc117a7476f998fb4602d59f6b1f4f0e3c13b1b1aa52bb68de24cf9faeb57821a4b3f24f16b835062b8d9fe91bea56a167702b4a9cfe907112a3c7a68
 DIST vivaldi-stable_4.0.2312.38-1_amd64.deb 84294796 BLAKE2B 0942e8590d6af17eecb036ca22958c3aea4da3c02bcbf8253a85f921a4f1a292310f37f238830291afc7219b7f8bd81195956602f330bb4e836080e841ed92b4 SHA512 4081f8c702003c19d0568a939f689df1f7783ce406cfc71d40aeb69ab9f6dbcad4c959c74b9ebd6e66e822af3f5ed60906f654e5ddda8165751fc3b0493811d7
 DIST vivaldi-stable_4.0.2312.38-1_arm64.deb 79737624 BLAKE2B 367fdec2e15913c5282165f266ce057cd94043e7523f3839266f789a7a43c44d839b2e5394c07bae071bbfe86f89134ed59ca0dd0c76114c127da354fc2dc3fa SHA512 a40ddb6c928135c89e6ba5c654c46d9154c544132abad5f42685d2b4da55d5b71cc7acac58e45150d67106aaddd66e9f00d586f087b3f6fe5b2594fa7fee65b0
 DIST vivaldi-stable_4.0.2312.38-1_armhf.deb 75853312 BLAKE2B 24650e64ac1630b1e12d3671760d49cc31b529a35d0075b61485d3b15b0d50006119d16a20a16f395a0054f77b78bec4277919a156fb842adb1a50d68781ea26 SHA512 1f4a3188d14d89a45bbafdcb8c595b65f5649d7a39d04b7f477d8297a5f01b18fa3a0b1016d90306a5d01dd847211d0dd1796dcb08421bbb37abb735871e10db
+DIST vivaldi-stable_4.0.2312.41-1_amd64.deb 84277076 BLAKE2B ce8510c543837484ee8965e14736bb58dc8d3075132f91260540d0ece800aea2cb4f23c3ae5bbe9bef7bf5f46433aa46d54dbdafc8ba39501cba35e5e7362c18 SHA512 e5032b90f7b02ee6048461a8cab2d606a65d3606c9eba5d78683fff3be28fc3fb2a753c58c36f966eedde00bb70a772d9c492b3e0ee1d3b85f28855ee1ae383a
+DIST vivaldi-stable_4.0.2312.41-1_arm64.deb 79731100 BLAKE2B c14a931f593350c9fcc8570649bc1eb4423ae57353722ff1efdaae0b40e54e09b824ed912137606ae8692bf1cb31ce28cb444e1e4f3a4b87ba350227dddd2d65 SHA512 97441983c680d5808434a60b985122d7e7740c10f2f14d38d24f472c339984ef69f4d52b3a4a7a1b28c100dc5589cfd68420c16eccbc6fa72a10a8add9b9da97
+DIST vivaldi-stable_4.0.2312.41-1_armhf.deb 75855988 BLAKE2B f2210d7dc9115b6dd285fcaa273e99bcc21c1ef8590222ff9d0ca0bd4dd9d171f7692660cfde3413b5700e97668e52aa13628d4cc65692a72c45774689fa2900 SHA512 c123c8730bfd2b70cc9ab673df42ae5d2434e0284bdae949e4f439c91bba17292981839abe7b62227d39f17a5a92b8434de04b0657e9e4b02b0414032cde8c16
 EBUILD vivaldi-3.7.2218.58.ebuild 3553 BLAKE2B 3b6cd7c057d571f6a40d6578fd6a973cf5462aa7b64a854b5b6c88ea56b855311b8f23e1ca34a3c1350929fdaa6aa029c693783665cb034f4e759bf4f57e208d SHA512 757316d9fa2eb0d653591bde29b1a3520aafe713475d61ce3f71ca7f709119448ccf172870a1c0fd3fbe9890938dbeb47bc5f01c0b02b6c70accc10f74402fef
-EBUILD vivaldi-4.0.2312.36.ebuild 3549 BLAKE2B 91580e4afcd928523049e88050387f7f18bca8c311d1dc9e82e4a369a125a786a7ee9fc1986bf98bbc9e98e00b50ab42ac9d0198d6e0834159a814c89197c2bd SHA512 bf2443fe71ff0f4289b766c012099b738647bd1782654754ff951d25c6ec85ac1c52a894a12db07f0b8b3dcc52748c3a212c673948c7c747f9c6f50e4cea28c8
-EBUILD vivaldi-4.0.2312.38.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+EBUILD vivaldi-4.0.2312.38.ebuild 3549 BLAKE2B 91580e4afcd928523049e88050387f7f18bca8c311d1dc9e82e4a369a125a786a7ee9fc1986bf98bbc9e98e00b50ab42ac9d0198d6e0834159a814c89197c2bd SHA512 bf2443fe71ff0f4289b766c012099b738647bd1782654754ff951d25c6ec85ac1c52a894a12db07f0b8b3dcc52748c3a212c673948c7c747f9c6f50e4cea28c8
+EBUILD vivaldi-4.0.2312.41.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi/vivaldi-4.0.2312.36.ebuild b/www-client/vivaldi/vivaldi-4.0.2312.36.ebuild
deleted file mode 100644
index ba5f6dc05f73..000000000000
--- a/www-client/vivaldi/vivaldi-4.0.2312.36.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kab
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-KEYWORDS="-* amd64 ~arm ~arm64"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
-RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
-RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
-RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
-
-LICENSE="Vivaldi"
-SLOT="0"
-IUSE="proprietary-codecs widevine"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	[[ ${PN} = vivaldi-snapshot ]] &&
-		dosym ${PN} /${VIVALDI_HOME}/vivaldi
-}
diff --git a/www-client/vivaldi/vivaldi-4.0.2312.38.ebuild b/www-client/vivaldi/vivaldi-4.0.2312.38.ebuild
index c2409d01a97f..ba5f6dc05f73 100644
--- a/www-client/vivaldi/vivaldi-4.0.2312.38.ebuild
+++ b/www-client/vivaldi/vivaldi-4.0.2312.38.ebuild
@@ -95,7 +95,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2345.3.ebuild b/www-client/vivaldi/vivaldi-4.0.2312.41.ebuild
index c2409d01a97f..c2409d01a97f 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2345.3.ebuild
+++ b/www-client/vivaldi/vivaldi-4.0.2312.41.ebuild
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 1efc72f8c3d2..f3e068cd3f60 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -7,5 +7,5 @@ DIST w3m-0.5.3+git20190105.tar.gz 2183651 BLAKE2B 624fe3b8c1daa2a6d4ce21e051ee36
 DIST w3m-0.5.3+git20210102.tar.gz 2189272 BLAKE2B f82c13c26b1c83cda90655abdcf30422e257a5c2e48c32d5636a70f895078d11a95fc6ce623fa94624bb2a1125b71e7654d872dfb91fd86c4290278de3cf88f8 SHA512 357eeecf0f63bfd5174c9670533882323879657bdecefd0758d853ca645e368331bfdf91e99c0917f19829e184ce892ecdc99bd865851707d93baccfb4b97632
 EBUILD w3m-0.5.3_p20180125.ebuild 3174 BLAKE2B 82af9dec3ebf3ad6b17312088d25a478862ddbd934c757cece1c71cd3fc280b5346982242a067a0c54af6c8a99da4503c8cc4129afe663b2248503e7845dd5ee SHA512 3b8147f5fa12b9c8e53ed5c71e17725278c0f2c58d9599e87888680b5adba05628505564a801bbaffe31ce29f64a4e41a3471caf2141335cfc48addc5e24b18b
 EBUILD w3m-0.5.3_p20190105.ebuild 3133 BLAKE2B 810108dd19184d7680ed672a3d591e8b284bbb1a4521fc9ec947f83ef889571e660e64d9a5ef834faa13dbbf2d2bef57e8e2f9c8731664cb06869d746f079267 SHA512 77eaf6c86f64f9dd4f39ca83987d1217531dc996584e9312208996b2277c784e51d0eae54aa99b5dbc9e104fe08e3f65bfea1d2c464085280bbd62eee82d1dfe
-EBUILD w3m-0.5.3_p20210102.ebuild 3280 BLAKE2B 0f556af29b905b325cd9058c1fe0538fa6561e21a7670bc7dd052068c80ad4d8a5f1fd388452b132bdd6f9a4a0a68fbf72a51b5ddd3355a9be4ca0f571f1da81 SHA512 8c86881c4c14e248583751cbe6a9fa7a41c207e615e781537d8d6f25f9548e8de1df8eb7990149000313181ad19350ab8c1e3c1d9c6b3f9d4cd2807387d6c097
+EBUILD w3m-0.5.3_p20210102.ebuild 3273 BLAKE2B 3a1224bc9807f749d8cc8136a73bd7cca2d654b48116786a1017269ccbede2c347ddeeac7f1d40a4ff93a501458454d83c8367d0efaee7f5a70b0196d88ae297 SHA512 1bd9d4ebf1f3f473010ca715abffa6b8dbb946366ca7e75cbb4c88c2da33b8488b11e26419c8d5810285e153ddf5a710077bc0015a66ad688549c91301670fa1
 MISC metadata.xml 522 BLAKE2B 4f89e2d965f7cc320983d501b67f2dda0134745d63e98b488fb3bdcfd6dfd2ce2e0fe12f8b6fea88818166298906c661db47405ab4de1f27cbbec37ca52fdedc SHA512 1fb6f6e6121f5673e809a626f840ff524b6e58260a9e2ac5b537e1f3d04cf2371b1ff03808da757848931275751a09fdc872f431b9162927fabc0b3e64305317
diff --git a/www-client/w3m/w3m-0.5.3_p20210102.ebuild b/www-client/w3m/w3m-0.5.3_p20210102.ebuild
index 685509be4802..b1c935d420a4 100644
--- a/www-client/w3m/w3m-0.5.3_p20210102.ebuild
+++ b/www-client/w3m/w3m-0.5.3_p20210102.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_p/-git}"
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja lynxkeymap nls nntp ssl unicode X xface"
 
 REQUIRED_USE="
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index c69dd30e2074..402a76d333c4 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index f258fdd251fe..e46ea23c3d9d 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,5 +1,5 @@
 DIST urlwatch-2.22.tar.gz 136306 BLAKE2B e7f10872e5d7f42ec0ac1073783431c4b0e4fcdcf40884a9f7f52aee36705fbdbaaf5f9e671223715040c6f68cc580f531ba753c9326a2b1380d2fb707f66f1c SHA512 f2c1e0d279689d1e5761203ba139614b972c6266c30877262d59759b0ce63342a820a063f001039848427ea4af4325505c636762cdedb3dc60ebd09e859914f4
 DIST urlwatch-2.23.tar.gz 137917 BLAKE2B 330c52cad62985d24b2cc4c7345156abe9d5d369f8b3f4402856eb96a98f75422de49045bc10910e5cc81306744aad2dce7c05667a6f4eeb22b2bba47869f260 SHA512 e54f8fe2d8307ca9f2f222e6a2082d517a330db60e410b7c991283a2bf88aa861306965b23ca644811aa69425ec2281f7f48d5e34047b808c0897f45ffc7fcbc
 EBUILD urlwatch-2.22.ebuild 2028 BLAKE2B 29c2150b76f1a657c37703a3dc593a408ee4ad8d6d4937517da45f89a27325cd8d883c387be8b0160cf4a2e12f91a1d0e8bc2282f3b9843e99264ebcfc8df8b4 SHA512 a79088a228028ffaed1f6c07d390bad9907f1c36d573139f516eadac2911d1d3472e35a968e3940aaa5a79a13697ca3c4c0381353e07b1de6f3e6c86e6c3d08e
-EBUILD urlwatch-2.23.ebuild 2259 BLAKE2B 8b0ab0f9a743c31bedd8fbbfbff4f910bdf73105cc8e7a58514b98288efb0c37c39151c050b83f233551e2fce4dad68703b413a2fadce882184d4dcf6886b0e6 SHA512 208d1772be17b1c38c6d2b7d6b954464baa40dc61955136d91a16228376e4499eb38a9832e2ca075797a93e2d04bdc40d94e264f51b4354d465325eade8f21bd
+EBUILD urlwatch-2.23.ebuild 2227 BLAKE2B 663cb030d7db26a9a6e32d73995c032f02817b6922903dee9d5a081faa5269f7e79a19dcdf56a405819ecfcf034a2f0098307491d78459c8adf57d5ccea377f9 SHA512 f25b7d344ca21326a0df8515f5d64947e87922b66f0951fd75e35c61cc6183c14dac9e51f43a3c8a5ff8e790764cff021d57afd816b257c9c67b7f7b5376eecd
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/urlwatch-2.23.ebuild b/www-misc/urlwatch/urlwatch-2.23.ebuild
index 4f3817d27e8e..5328b1778a19 100644
--- a/www-misc/urlwatch/urlwatch-2.23.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.23.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index e3b88e0898e2..7e3f115a07a5 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index e4ef36eb57be..468175d81893 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_92.0.4515.80-1_amd64.deb 83997848 BLAKE2B 232dc1fa14bce6419f609f42f5ffe257aa9fe64a5b01ff6e058026c0e89ed86043935881cc1d930b9b0ad58785b58b01568f25c3436e0e5f8901b0cf18d732ad SHA512 d71c9f6025fecb4b40436c8a8624376323f652388043987d2ce66281501043046952c0bde345ed0011ea8b4c79bef724d2bb9e887fd216ce656326048d40174b
-DIST google-chrome-stable_91.0.4472.114-1_amd64.deb 83565736 BLAKE2B c7e98f10708ba839c6d2e4ced39ac4a2258d2ade9f958f22d97fdd479951d87b8ea60863bc2d7fb8520225b76668f8720a3ee1ada496cd666c31c218b9b54653 SHA512 48ff385ab69630b2e734c1c502bc31048bf05958308fb5d478a40f37fe161889b3e0903e5f9b59cf3bfc93b10f6b5a640a6540bb6c247558529253ff864805a7
-DIST google-chrome-unstable_93.0.4557.4-1_amd64.deb 81938736 BLAKE2B da06bf54a1dec12dc65c5d12cc22e941d7b2f425fc26e833b836722446acb56f5c1248c65988654f2dbd410a9ae70266f8fb9674674a17c289cccd7eab5ce2fd SHA512 823073884a9947c93899a8aa0a61946205731549b15852f435c3b8c7733bd6457096459c445f5334db0d0ef81370971b7f3fd33d47eb2d18a592103c31852d2e
-EBUILD chrome-binary-plugins-91.0.4472.114.ebuild 1171 BLAKE2B e81b97fb2023b7dca16db3eb99b30a844f31546669b0e95a972777acbd37aa8765c3a5a40123d8c7f93dd2ec627d1417100c4cdcac6f013e9402c2ff392f13eb SHA512 7fbadae792a71fd25142c1fea11f26af0508be8d29b3e59c349a0e3d02d3c5f9898f9ad2914bc7b4d8bfe0ac53544ae87fd7367cf1b008774fbd3490169c1900
-EBUILD chrome-binary-plugins-92.0.4515.80_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
-EBUILD chrome-binary-plugins-93.0.4557.4_alpha.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
+DIST google-chrome-beta_92.0.4515.101-1_amd64.deb 79846520 BLAKE2B 6f2dc28106ec483ab2222ab442862aa486978dbfd549a989e4126bfe824ce515b946452ffafa895af3f050643c386777df16a1ddb5eeab2388e4f30494261ad2 SHA512 e258c1c45ddc99ca287c9ec9bd0f1538a03862671797420d8dd3afe8d81208e7c5e972a8597a290b46d1aaedeaaeeb4aacd57f9b0d7675a03b1ae8f05c58c832
+DIST google-chrome-stable_91.0.4472.164-1_amd64.deb 83570528 BLAKE2B a55d57182e7b70869ffd910807cfec90b8bb4c74b5591a3df13aff5a0b108754d24912479cd3130e6d56eaa34d217d35dade1ead033093c1947367759e5d4d23 SHA512 257ac9584926c174a9607a43dd75c137be29b9a38176bdced3ab101bf149cb8ebb9f1718976573f2c22f1cfec92308a759a48fe52a92791d3c0641bfb989c784
+DIST google-chrome-unstable_93.0.4573.0-1_amd64.deb 82156356 BLAKE2B 747e668f35787115de94514420576228733e63221964b5eb6b0ada4258eb69a9a8a473500e726c93828d73a56cfc3d76ac56ed075ca56e7f9b2d7d7aa7b0c762 SHA512 c8c79600525aac5bfc81cbac749c348bc7d875f8c43969f8d2271db7d1493615e816fc95e5f4624bb3ab164477f837104b631dcab3617a75cc1747bb8a2cb6df
+EBUILD chrome-binary-plugins-91.0.4472.164.ebuild 1171 BLAKE2B e81b97fb2023b7dca16db3eb99b30a844f31546669b0e95a972777acbd37aa8765c3a5a40123d8c7f93dd2ec627d1417100c4cdcac6f013e9402c2ff392f13eb SHA512 7fbadae792a71fd25142c1fea11f26af0508be8d29b3e59c349a0e3d02d3c5f9898f9ad2914bc7b4d8bfe0ac53544ae87fd7367cf1b008774fbd3490169c1900
+EBUILD chrome-binary-plugins-92.0.4515.101_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
+EBUILD chrome-binary-plugins-93.0.4573.0_alpha.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
 MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.114.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.164.ebuild
index 575d76b0e179..575d76b0e179 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.114.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.164.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.80_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.101_beta.ebuild
index 969dd2f57c6a..969dd2f57c6a 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.80_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.101_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4557.4_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4573.0_alpha.ebuild
index 969dd2f57c6a..969dd2f57c6a 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4557.4_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4573.0_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 320a03b0c914..f71f1e48d641 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 455c6fa5119c..76e5acb8809c 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -9,5 +9,5 @@ DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f162
 EBUILD apache-2.4.46-r7.ebuild 7717 BLAKE2B 7a2c274d2763e0fd67612a7c8471f9142b76ac4bc3a1cf5ce1ac74556b75b355e949d0ce825a093c4d539f7dced7ae0fe36761622574893c711d86c0d3d64bb8 SHA512 50a3104db3454f6479ef5ee96da8001dfc742b048289bfc3f2eeeeb8bbca4df89dd4a0c2f3f71d592f4524fdd52787368e95f0ffd8ed8762f0741e2e7ab06262
 EBUILD apache-2.4.46-r8.ebuild 7970 BLAKE2B 4ee72658964c0e283b676b31a9b1aa593c6f469ef6f75d7d8cfcafc3fa7c43d4485fc9dd9075c4154fb76a84adb2bf753a84dbf470d74b9e405ca0cb61962be7 SHA512 770a785f3665e5b4d84b2bb931f853addaa8d49bd71b110d8c17bdc60aae7a28227177d4b3ebb8c9c84bce11899146b0519fa676754b763ff81741d525a7527f
 EBUILD apache-2.4.47-r1.ebuild 7970 BLAKE2B 4ee72658964c0e283b676b31a9b1aa593c6f469ef6f75d7d8cfcafc3fa7c43d4485fc9dd9075c4154fb76a84adb2bf753a84dbf470d74b9e405ca0cb61962be7 SHA512 770a785f3665e5b4d84b2bb931f853addaa8d49bd71b110d8c17bdc60aae7a28227177d4b3ebb8c9c84bce11899146b0519fa676754b763ff81741d525a7527f
-EBUILD apache-2.4.48-r1.ebuild 7994 BLAKE2B eec637c1f9747c3def06c0805d55f1be228504b55fbd35cdcd9301118cf8bc4737b20263ba8bca8ca8147a9eab2e771fc87fb5406b319997e7f23d1cc4efbd8a SHA512 1d8d7a1ce59306d93679c26724281d541b38b6e728fa5dd91f1c23f2970e637b51247f7c52a12297aeb146d1e9b4d72b9e90897a8c488dbf85e0a488c6bcf830
+EBUILD apache-2.4.48-r1.ebuild 7993 BLAKE2B 8c32f3bb85832186986812db2135cbc920b68e0b6ecc87a4a735463fd4696a232de13d014a2b3bf160d4146ac96bd103eea0c13517b0459e8fcd09efb205a1fb SHA512 b0b4ebd398164bfaa028f2de08a36a2b80bad91b6635f67c0d456bd91544051e5dc738ee3499be56aaff9cb579df00c2b00cbdc4cbaee7981779cf1165d19e0f
 MISC metadata.xml 900 BLAKE2B bc278df7a16090cb248b55179c0228b3c9ab846d918799e7b74b21d55f6410556909016ba6960cc77909fd4f8f85b8ebf25ba261553b8c5d42803d750a462cac SHA512 f98af69b59e4403ff194387781e92fe825df71a5d2f8d1c8a960b222eb548e1723335e13479b6e225e62b92b9af09cbd418fa95ddb676a5f039445945d5ae686
diff --git a/www-servers/apache/apache-2.4.48-r1.ebuild b/www-servers/apache/apache-2.4.48-r1.ebuild
index ba6572574d29..8012fad06ea6 100644
--- a/www-servers/apache/apache-2.4.48-r1.ebuild
+++ b/www-servers/apache/apache-2.4.48-r1.ebuild
@@ -140,7 +140,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
 # FIXME! Move this to eclass once all ebuilds are EAPI-7
 RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )"
diff --git a/www-servers/pound/Manifest b/www-servers/pound/Manifest
index 1adc85ad358c..c643a9a67718 100644
--- a/www-servers/pound/Manifest
+++ b/www-servers/pound/Manifest
@@ -1,7 +1,5 @@
 AUX pound-2.2.cfg 905 BLAKE2B 3d9315ded29dbdc7981227341d552a8673f4e943555b0a00ec020613d87c84486ae0d2ad9d47ac7aa75c5db5aefc2c480c471f199e037f91ba7e0052466896fa SHA512 f96bcbb977768fb2ff90228bdf106cbd056331b6a494dafb36762d8d0d4db6d6603dcdc7d4d2eed96f807df6f02aeb50f4bf9e8d28bb98188d10147bdf7927ca
 AUX pound.init-1.9 495 BLAKE2B 9489ff9c18d6524dfb5b3b9af1f67898ac32b5e8ff2432b430dd91ea02f37d0e8c3447e0788e781438a93fbb0420d9d079bf7f68d36b092d4c0be56f0f19b853 SHA512 fab1936ce907bdb5b215eada2c05025bd4dd158d0dfb0cdeb9f32ec4284bcdc75625ed7933913d080c3c26edbd8dcbbd197a729fa9c130fbff12d7bfdfd8d41f
-DIST Pound-2.7f.tgz 186719 BLAKE2B 39a31b43c5945db1b5ad008e2f43d3026728ea5bdc3de0fa8c0b68a743d0bea4b86dd61a527ea140e6b0546732f0c66c863e78131432af32ab5b0874a7c1f705 SHA512 292f4f7b4363365829f204b687080eae9e17b9a67ae7eb6021eb5a028321191d97abd9633d5664db5ebca6467795f73a787be4a0bd29360d737865930ff81830
 DIST Pound-3.0.tgz 75905 BLAKE2B 8834d2d57c81bf792d803bc2aef7ad5d17243539ea3fddab777ab3dbd7f903a2f771762ee8d4818c63b7c6380c253dc7c7465e10225f884c2bb968af3dfab831 SHA512 28426fa2d66efa310fce43fc57b87b6cd9d646573161ab880b139feec856710306002af623f023907bb77f8b37979cf2332dc3e16cde48c6d349d813c6ac47e2
-EBUILD pound-2.7f-r1.ebuild 1212 BLAKE2B 1e1e6d2feb7eafa6564dddf435e6fc54b0dfc2df394d6e8ec2028689e3246b28070280edd165f89a1d66c8338da2027605623bef2b702676b11b45bf4c03fe64 SHA512 7c547c436b4ec84601dc0fa2adff3d34323429a98b7e7bd4606abf695fb3655e720f4c0ded6ade2820b5d056f49534334407c5f3e4801f23caa55c79f8293b97
 EBUILD pound-3.0.ebuild 999 BLAKE2B ff36810dd873caf72f17abcf4e3e071f8ecfa61bfd3065bdd1a6e0661530c0ed3a2b050d533a355b05802fa619770fb5c77f065b14219d31eb3e288d1280d407 SHA512 60c18211a955ed374f48df80ec0ac0705c842357cfb5379ec61c46dc1edde8a1a47da36cc738a1912a48ef89456c8fd5cc7ed1111edac88f66d6c77201373a86
 MISC metadata.xml 578 BLAKE2B 24020874dd95fe9c002b654c60d9eac93b881eae6d4bd7cb64475344a16830b5727097e86e396866f6fabb949ea2606962dc8968278d6ea7ebddab7f63e9b99a SHA512 6405f3f81cc0aeeb98ec133af5af9c5611e3642b97918cce90e96b7698b500bd085422d439862813adbea3f9f8905a414f4afeb12b61d84a1c0d2bb83f19da5f
diff --git a/www-servers/pound/pound-2.7f-r1.ebuild b/www-servers/pound/pound-2.7f-r1.ebuild
deleted file mode 100644
index 2054ebbc149e..000000000000
--- a/www-servers/pound/pound-2.7f-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P=${P/p/P}
-DESCRIPTION="A http/https reverse-proxy and load-balancer"
-HOMEPAGE="http://www.apsis.ch/pound/"
-SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
-
-DEPEND="dev-libs/libpcre
-	dev-libs/openssl:0
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dodir /usr/sbin
-	cp "${S}"/pound "${D}"/usr/sbin/
-	cp "${S}"/poundctl "${D}"/usr/sbin/
-
-	doman pound.8
-	doman poundctl.8
-	dodoc README FAQ
-
-	dodir /etc/init.d
-	newinitd "${FILESDIR}"/pound.init-1.9 pound
-
-	insinto /etc
-	newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
-}
-
-pkg_postinst() {
-	elog "No demo-/sample-configfile is included in the distribution -"
-	elog "read the man-page for more info."
-	elog "A sample (localhost:8888 -> localhost:80) for gentoo is given in \"/etc/pound.cfg\"."
-	echo
-	ewarn "You will have to upgrade you configuration file, if you are"
-	ewarn "upgrading from a version <= 2.0."
-	echo
-	ewarn "The 'WebDAV' config statement is no longer supported!"
-	ewarn "Please adjust your configuration, if necessary."
-	echo
-}
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index daf73c5f430d..9cae9c8b374e 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,3 +1,3 @@
 DIST puma-5.3.2.tar.gz 297673 BLAKE2B e3bfa38347526063587db966d20ea68f32cd88616d89b5f2d9152228d5d420b50c2918e24304c1bc8119af5790a2464f0a055ab92862a56262013ddbba006a1f SHA512 32e80b413184d371d451a35985a371a7655df0f7e81624f2a05e3cf65c2e1b035275a8e25ab03d13c9c1f921ec30cdeb3659e1201baae5940dcb3edcb525ff25
-EBUILD puma-5.3.2-r1.ebuild 1844 BLAKE2B 50310a07c3e6556f5037dd3d4fdff779b4e4ebe62cff105dc5f916af588eda62d8b2cd302747ac6e528a4ccbc41a22392ef43757608a2feadd3f53241a3c818f SHA512 320ff5bca4e37ced62da5f8ce0c42aa1ac2cb6aa76e8ede8405762871e04ea785cc15786e2d9d424df08a7f8531cf76d2776bb6a7210affc8d2967d7567887d6
+EBUILD puma-5.3.2-r1.ebuild 1851 BLAKE2B 56e2293d48a3a862bea7b875afb7bc86d743996abdb0d9c2f7db0b962e5bd1616ea213b2c8eb6f4cdbaa6b2c0a9ae1d7a1f87e2943931c05cd14c9efd4acf095 SHA512 d3de6f6d1c5ace870b89e08a9169dd05ce10e5cc65e8c7013bcb1cd7b6902e9acfb73ce6d95f3ca7806c1b8106460529a51000f3e6b49296fb38c4c6780faa73
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-5.3.2-r1.ebuild b/www-servers/puma/puma-5.3.2-r1.ebuild
index 058aacf262e4..aa275d9b6699 100644
--- a/www-servers/puma/puma-5.3.2-r1.ebuild
+++ b/www-servers/puma/puma-5.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7273ff4be726..a1645dec26da 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -9,26 +9,20 @@ AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4 SHA512 229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100
 DIST apache-tomcat-10.0.7-src.tar.gz 6001147 BLAKE2B f1aee4748d404d02188369603824dcc97765e907cfc3872f54b1859ae950a9475d72862caa2179ac39e4cbdb8c23424f89c4cbbfff8a2e079a842b0054257009 SHA512 395b0280666c6779f6378cb87e9abdb637a823e7f89452b7324329f4c0a1fe0b315275dca5df2f80a38c6f1ef98541bd1ea762df7af9cb15e4466c3b89e4e7a8
 DIST apache-tomcat-10.0.8-src.tar.gz 6010420 BLAKE2B 86390f04147d3082fbc9f15704121cbd6aa8ba756b4bc03e64a49aae3dca96c6b503949da0096f8ddf143bdeb1320b7601008683ce94bdad9ef235e1f73ad948 SHA512 c264be4cb29d87c95918d2723ab20bc7e2cb5149cb366cca348c6cd311b0f38ac500ed6b4756b20245a446ead50e7208f77093d6081563ed76d6691abfcbe14c
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
 DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
 DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb
-DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
 DIST apache-tomcat-9.0.48-src.tar.gz 6080015 BLAKE2B 9b2cac8143ca8186857d7d53e8737f2f7d2ec8e0ca03d32447ad25b429cbf37c1c7b39bc6e4b93679c08bd5f4940280d00946a70e9fa82f8c2a596ea18a2a4c6 SHA512 9b762f6d1a1f6c75e10f1bc05c39a647ae2165f3b81c09ff73cc286f3c487b034b9d14c73b808c73b35f55f642848831a0329d9d611c8bbb3928559e552a3ff3
 DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b
-EBUILD tomcat-10.0.6.ebuild 5920 BLAKE2B e688681999674380319dcb3651162c089aec032501ee1b96d2f12e9c3d7cb5b30a197683323ca18181d68ee7a70cb5ab979669dcb12d55d9dadf75b3eec0d136 SHA512 21dfc89a64db1f34b9e4314ef8b7b1144b205548d81c93b9a89e65703619d8bc54d7359f70c78b6aa39a5f1368b63b49b32a8169259c35926536cb1bedcabc6b
 EBUILD tomcat-10.0.7.ebuild 5920 BLAKE2B e688681999674380319dcb3651162c089aec032501ee1b96d2f12e9c3d7cb5b30a197683323ca18181d68ee7a70cb5ab979669dcb12d55d9dadf75b3eec0d136 SHA512 21dfc89a64db1f34b9e4314ef8b7b1144b205548d81c93b9a89e65703619d8bc54d7359f70c78b6aa39a5f1368b63b49b32a8169259c35926536cb1bedcabc6b
 EBUILD tomcat-10.0.8.ebuild 5920 BLAKE2B 6bc1cb899bfac912196be33f6e4f03dda576987af8786ae5233981b930a39d1b1f7600410d7a0c9cb80e8a0e345e12218de8129121c58480c882ba4f350b12c6 SHA512 7a68ce76cb33398a8a4d3a1eb93139be2f14e5e22c75421dc03136aeed06a8bcc3d5d5bd94bea93d8f8c6c2d0625fb0c2d1aac73838ff3d6eaeaddf900b6fd6b
 EBUILD tomcat-7.0.109.ebuild 4147 BLAKE2B 8023fb9265a3e57bbdb506559bfe9a337f566e09b6cccd0e74e84341e54d1434134eb0aecaf72a97113826d8f7359dea1e5672db44e9dfb706b020cf79c51802 SHA512 0730da2fe90a5fa203e03eef5044eb8b90c5b800d064d65467370834b788c3de03ea5c57ccfe20b29deac9c560c68029e94a80be180b240356565121d453a2a4
-EBUILD tomcat-8.5.66.ebuild 4736 BLAKE2B 99ac3fe1e217729c87256b892cbd781cbda8f3235b526d19f087fcb39613f725825fde1802c013427c5b2621ca9e1380a2afe0f7fc4600570c640619d52cef0a SHA512 122f809b5148b3da0e83a3fe2e3fc4db4a6db8e0b8ec1270cde7a282ee074eaba6a8b716814b2065b9f29730a8dca221712830088f378417dd47789ab0174c62
-EBUILD tomcat-8.5.68.ebuild 4737 BLAKE2B 0fc89880a266872832a8f199af5cfc3aa6ec0e14ab8214eca907dbf91e68f5306c23fcef1fdfa852c7e8051ec6953086338380552ea1c08ec45a828d6fc35d9a SHA512 f3b4c598e3a022baf63a81068751a4c73f3106a1583c5d9d3493fd6aa5fc7a87e91cc023203b81c86ed3683bacdaed728886bbffadd1bb102b5e2a678f75b26a
+EBUILD tomcat-8.5.68.ebuild 4736 BLAKE2B 99ac3fe1e217729c87256b892cbd781cbda8f3235b526d19f087fcb39613f725825fde1802c013427c5b2621ca9e1380a2afe0f7fc4600570c640619d52cef0a SHA512 122f809b5148b3da0e83a3fe2e3fc4db4a6db8e0b8ec1270cde7a282ee074eaba6a8b716814b2065b9f29730a8dca221712830088f378417dd47789ab0174c62
 EBUILD tomcat-8.5.69.ebuild 4737 BLAKE2B 0fc89880a266872832a8f199af5cfc3aa6ec0e14ab8214eca907dbf91e68f5306c23fcef1fdfa852c7e8051ec6953086338380552ea1c08ec45a828d6fc35d9a SHA512 f3b4c598e3a022baf63a81068751a4c73f3106a1583c5d9d3493fd6aa5fc7a87e91cc023203b81c86ed3683bacdaed728886bbffadd1bb102b5e2a678f75b26a
-EBUILD tomcat-9.0.46.ebuild 5632 BLAKE2B 62c2441708f0213f2ca077bc7b8b52ecbf8d46f5f7c1720d30c6d93b21f82fa73613e06a9067b07a54dab2910344e7c2cdbe966f4fe5a6476998901bff4d5bc6 SHA512 d7a0f0c44598be1ff78d891894b91d9ffa2e8906a5733d1d8054f50250e7b7cb009d26416a11fad64a3b7bf6a0228930b1cf340e5a61dc4605e3865edb75c4ab
 EBUILD tomcat-9.0.48.ebuild 5632 BLAKE2B 62c2441708f0213f2ca077bc7b8b52ecbf8d46f5f7c1720d30c6d93b21f82fa73613e06a9067b07a54dab2910344e7c2cdbe966f4fe5a6476998901bff4d5bc6 SHA512 d7a0f0c44598be1ff78d891894b91d9ffa2e8906a5733d1d8054f50250e7b7cb009d26416a11fad64a3b7bf6a0228930b1cf340e5a61dc4605e3865edb75c4ab
 EBUILD tomcat-9.0.50.ebuild 5632 BLAKE2B 616ff7cfe9e1e408be386a2c6f9146370440ac4cd84a3afa15893bc5e00afa73a47b8760d5c2434099b38cfaa069bd65f23efe78eee64b0abcbf499bb72a97d4 SHA512 9eca0997e3559fad1b90b567a68e915e6d22a25e05eacd08cb7abba0575e7e6db76168a3aa1fd33d60b19754d6082f1578417deb4c04ae82fb1575531e50709a
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/tomcat-10.0.6.ebuild b/www-servers/tomcat/tomcat-10.0.6.ebuild
deleted file mode 100644
index d66b5ff36790..000000000000
--- a/www-servers/tomcat/tomcat-10.0.6.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="10"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="5.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/glassfish-xmlrpc-api:0
-	dev-java/jakartaee-migration:0
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	dev-java/ant-core
-	virtual/jdk:1.8
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/jakarta/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "Please note that since version 10 the primary package for all implemented APIs"
-	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
-	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.66.ebuild b/www-servers/tomcat/tomcat-8.5.66.ebuild
deleted file mode 100644
index 0d566b00a7b8..000000000000
--- a/www-servers/tomcat/tomcat-8.5.66.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	dev-java/ant-core
-	virtual/jdk:1.8
-	doc? (
-		dev-java/glassfish-xmlrpc-api:0
-		dev-java/wsdl4j:0
-	)
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-8.5.66-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.68.ebuild b/www-servers/tomcat/tomcat-8.5.68.ebuild
index ce92130bddc8..0d566b00a7b8 100644
--- a/www-servers/tomcat/tomcat-8.5.68.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.68.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.46.ebuild b/www-servers/tomcat/tomcat-9.0.46.ebuild
deleted file mode 100644
index e39b539c70d3..000000000000
--- a/www-servers/tomcat/tomcat-9.0.46.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/glassfish-xmlrpc-api:0
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-core-1.9.13
-	virtual/jdk:1.8
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-9.0.46-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 8dab517e3b8b..61de2645b586 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -3,5 +3,5 @@ AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.19.1.tar.gz 804398 BLAKE2B 73fc19990866eb1058a742b34a817b3bd87e00c838da055bece2bff5e13c161f53c642866ed591aa4afeb23ef924205502f2cb0a4cf9d303b5b63fb9a53f57e2 SHA512 34b55f7c7a77dc0b0dab34d1a9ca9a4cba8a9261969656c88435e7f32fe8a0c5654e1562706775f77e2f60c4ad0f5c6055257a23ab7d387c1579639e054807b5
 EBUILD uwsgi-2.0.19.1-r102.ebuild 11527 BLAKE2B 9fc8b239c913b4bb7cdbf389549d5a70c8ec1433b188787fb5d0260d6766f1afee6bead57da94ea1b40b3db8bba93622cb0d34deab2cc283babf940344ec6355 SHA512 8b76bda9d5db446f7376201a0f6d639bb3e3534701b9d45ba91c0a22f76cc290dd2b9ffd1dd9d57905f0d5ce59a9c8c1a6cbd3034e292c5f45d91ff5d38e4875
-EBUILD uwsgi-2.0.19.1-r103.ebuild 11532 BLAKE2B 6cc9feedfcb8343fbce50495993bc02cf6d002849a1cc99e850f24079b21e1b7d62f24e34e059f29cfa285d344eaaeb643b3531b6454138364b327ae64375d03 SHA512 4e3bf5648c9269f100357de4f20e4b34c5819ca15529db94f603489cb8c5aae27d09985dcd7bb1f9b94e6fc9bb5f3f44186982d99f3d57f3e01d63911aac48dd
+EBUILD uwsgi-2.0.19.1-r103.ebuild 11531 BLAKE2B 3c9e8d071aa31f0a630e4b46ca7887d2d4babd13bf800c24ff9d161db8abdfadf3b0e0a76a68a1dc499e97dfa942dfa1bb3df57888c7840372647c6540134df9 SHA512 d98e62940fb008aff7eadd28b10c74c8f92f80b85e78faa8d4b1a6e6325c40ab8de989ed7deb1a4f9738cc6686b06ddab14b0ce85db9cf9b9cebc5c8cd3d55b0
 MISC metadata.xml 1411 BLAKE2B 89114f75b2150f4340e30cd106115f0e9aa1a00389558f6f75aa86c0bf5a11d5df5ecb794c12f7bb39791d8edef40415cbca4403f8f2b65bd642ce52e95357a3 SHA512 33d3767a25dfca633e5149a20900d56998c40204a4c55e3814248574d0c8525883a842222ed5f8ac739a06cd09d806c189ff6f742d1277bcd3f8e8afdea84445
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r103.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r103.ebuild
index e909f50f6393..567debaeaf20 100644
--- a/www-servers/uwsgi/uwsgi-2.0.19.1-r103.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r103.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
 	http ugreen signal syslog rsyslog
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 51ce42f88e92..ce56dfddd6b1 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -7,12 +7,10 @@ AUX varnishlog.confd 82 BLAKE2B 31a9d78501d3738a573684677cde67a08e81fbcc8f735141
 AUX varnishlog.initd 707 BLAKE2B 90e75e267a2ad8688ace41d4eff20e8601e0b20abc9b73e669d1b0e8ded99294ce655a1ca67b972ce7b8ad439424ba3bff22841eaee2e1f0a21bff19302f5d31 SHA512 c67a7898f40849989edcbe74e1a418e196f48e178ca30126bc13db226e4f4c2c2ba74d9d0650ef68ed88732917fc06b80ef1f62c2d9d2c14a89f26fd25aed0f7
 AUX varnishncsa.confd 84 BLAKE2B fbb338ec2163562d7679a7371cda3cd297449186bfcaa668e3924d944dc78eae8d8bf5c60230202fee4093119ccc74d67ad8f3e6774091c6c2b5c9b184d4b5eb SHA512 a5426ff66b89d2afb6273f05e4117b3eec5ce0162a624d52c92b418960f72e58bd01224165613221af76ec241bd98e1eb985b2ef7b83a5b615e9ece67234dcc8
 AUX varnishncsa.initd 716 BLAKE2B 33fd6b044ab50aef629fa4501eb4a78bd3d690db52b86a33d1d4e87c1da28088b9f25ce917d16a9ed777b1d6e1ece5a916af0c4ff293db82b94d264fd5baafa9 SHA512 1d0c781675ecba5adce02c37a02c431c4b44d64310a0945bff4f6f57f7d0c87cb7dda874311e44d667317d5beda113b62f4ba49c81534a0c078314b3fa15a512
-DIST varnish-6.0.6.tgz 3136931 BLAKE2B 2ce379622b20a939a977a426cb842ba62e4fd5fd3ba785ec21888956b6a8c16e95bd834962a7ba05dc426dfc36067cabb4f8ade2bee7fe2a094a1f2c4c4c9e06 SHA512 c0881ab051bca928c12f35494c5e2a8109390abdf3acf368da404c5537d1ee0f1153b6e329058a7e1168eacf5af9b86ccf9a6e58cd89dd7d51b8b71d25aa7ba0
 DIST varnish-6.3.2.tgz 3323908 BLAKE2B 5bde1b2ececeb8aed884db22ed75bfd74f82d68416e71400a4c0d27483fcceb029fe8e724e30754899c872d7028da5cb759545f0743a11d0e90b0fd604af0ad7 SHA512 0f476c642df834737d446b3bc6ac8afa5981d1de5810dc6e8556eb22b2ca26d64eb531f4ad3332eb86e231a7443fe35393177ec6dbee97a837f405d1aa9d03cd
 DIST varnish-6.4.0.tgz 3404617 BLAKE2B 0ef0f7303f5c926bb1b80ec14cdd9755d65c1938fa8645240800ac2997f954022133625a74dd9c30ce21850674c3b00777fcc896309f528e6ba90d347333d7f7 SHA512 cda8f9e1d301a2b79db14685a23e25e36225f37065a1b7f37c5ae12fbb0483be51be9ffcc8ba72c1f65f5a022d1e408825694daed6780e206b9ba91feb2a07a1
 DIST varnish-6.5.0.tgz 3476969 BLAKE2B bafa8704f28dfa96f681805cc053dd6415e143016b1bbff7f8962f2c3ac5cd07be6dc2f4129a423ddfcbf9f9f8afc57388930685d0ed400f3c06ba03bd667d87 SHA512 43f8cd6429a903a353ac4448b6e9aff445b0d52178141a148d3b29b987c0974841820af0da4917731775b46899c12b0327d64d12e3ddbb8fd438e2802ac66a1c
 DIST varnish-6.5.1.tgz 3460024 BLAKE2B 20abebf1df826987623c951122dd8ab2b500c0a64aca192fb12db8846e60938c2f444cf5f471d02aee4f3aeea05f4074bec335e963ab8a2fd59bef47e77df501 SHA512 0f34f2c6fe68bfcdba488cda40cc387b3c10343923a75a6a1791c890d20e79c64069697c45720cd5f0cba666d506d3ab6bb814ef4f9120cf0c8519a01144844f
-EBUILD varnish-6.0.6.ebuild 2225 BLAKE2B cbb8de522d410905edf55051c476d2b7b5cbc6d251306d8c2b2996afeee4be9e06bf68a201478c0365db9f6e8e7854d1d23db1f68b019f7954188b57559ae8f7 SHA512 c53402e45e255c9349227943675b7c5bbc17a294aa80bc03f9d0c225773757c8139370cf81fdcea5bd7ae809eb9290ec8fa92a713e123c0ef382857a192b9883
 EBUILD varnish-6.3.2.ebuild 2142 BLAKE2B 84d773d218c330e2b9dc0aaccd4460cb66e452562449d194f25688e23a1564692d6bd2da2e765c2d8fd592b7ab250690fd71790375119180a5cc30397f1d3753 SHA512 9ba6c279d716c158df6784949d450d3c755d664d75d78cdfd54d619389fa2984d205cb4f73da4e3f22ed38df6ad941886f80522a8babc40a9bfba625caf5a46b
 EBUILD varnish-6.4.0.ebuild 2144 BLAKE2B ed913f10eda43049bce760b54e4d032d8ef5fdd85f224f41d50e51fa57749875c6d00531fb31313fcda43b89e64e6301b7c28d3d2f2b9399927c296f2439112a SHA512 66d1273707e09f049d0095825eba1382332686ed441bc681582d3bf6485a53122ec510a786ea56c48f1506ac00ea5462c016537c72494bb13681bdd9dbe2e050
 EBUILD varnish-6.5.0.ebuild 2148 BLAKE2B 0a9046dc717ee032241f567e4835932d49b0f88adc5822670cff04b377a30ca8c440bf4f06119f9711de37c0d818ea612d47aee47714d889aeb9c039c3d947b8 SHA512 86a6d7af15583e3cbea9e9dd56d60801723a3d979c224a75ba22168c8afae0732d226837b23ff0d8619bec76275ec9977c581a8b49b85c6b25cd7f9671bd9fd9
diff --git a/www-servers/varnish/varnish-6.0.6.ebuild b/www-servers/varnish/varnish-6.0.6.ebuild
deleted file mode 100644
index 3152d2d829a9..000000000000
--- a/www-servers/varnish/varnish-6.0.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit user autotools systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="https://varnish-cache.org/"
-SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
-	sys-libs/readline:0=
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses:0="
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-pkg_setup() {
-	ebegin "Creating varnish user and group"
-	enewgroup varnish
-	enewuser varnish -1 -1 /var/lib/varnish varnish
-	eend $?
-}
-
-src_prepare() {
-	# Remove -Werror bug #528354
-	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
-
-	# Upstream doesn't put varnish.m4 in the m4/ directory
-	# We link because the Makefiles look for the file in
-	# the original location
-	ln -sf ../varnish.m4 m4/varnish.m4
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable jit pcre-jit ) \
-		$(use_with jemalloc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
-	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
-	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
-	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
-	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
-	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
-	diropts -m750
-
-	keepdir /var/lib/varnish
-	keepdir /var/log/varnish
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	insinto /etc/varnish/
-	doins lib/libvmod_std/vmod.vcc
-	doins etc/example.vcl
-
-	dodoc README.rst
-	dodoc doc/changes.rst
-
-	fowners root:varnish /etc/varnish/
-	fowners varnish:varnish /var/lib/varnish/
-	fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 7903f47983d6..1285821a1ed8 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index a8a31cfb417e..629d25247a51 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -3,5 +3,5 @@ DIST fonttosfnt-1.2.1.tar.bz2 146512 BLAKE2B 54b92f586248978f56b1b114a1ec02b19f7
 DIST fonttosfnt-1.2.2.tar.bz2 146855 BLAKE2B 167db11bd49675d411ec06f5581edd7a87d0518755aba05b330db8d24ec1b5f142228c3b3a0be6a740fee8835a25523cd9fc4d7b8e915cc9d51fb95786254770 SHA512 ceac6ccb064043d46f9f16f31fb89c6cbf7f026d049f7b5325d6af97e809b4cd068e6149413bb328c0af601a98b5070e21d469888a6853f6cabecd5b46f60240
 EBUILD fonttosfnt-1.2.0.ebuild 356 BLAKE2B e9d3f967a9627ddc95c971f99db33075a699b03340351821fba43022a81c0825a5831d45d1210c5c51be69ed4c5176ec193db214f50e1875d3f78b2bdbc271a5 SHA512 e43910fc1d262e11e982663ed0ae8284890f0aa3a2b441702b9263619ef575732176154860452cbd009c15330366a4ee877ea16508c2a1d5a02f5fc7dc85db23
 EBUILD fonttosfnt-1.2.1.ebuild 356 BLAKE2B d3046317971c869dbdaa434699dbade16acffdca3cb4d94361824ac058eb915a2c4a9495bbe10b77542b81e48dba5e3a9c9c4e7dc0e6ad6e9d6f2f58f94d852f SHA512 71f9dd2dede55007f4f5bd2c815fda111f479ef360e9d4826a50258aabf12bae5709870270e3b7962f5416ed7cddf549fbfe9b39f5cd619884331c68533f8567
-EBUILD fonttosfnt-1.2.2.ebuild 360 BLAKE2B 17fffb44352bb0da429926ff71762870f950619ba9fd97d536ac98ddc4ad403e9ea6eb7f2478cf56eabc3f503d600d1da84072e4bff030e2c90265926b4c6a39 SHA512 1cc8d16b078f4b734172a0132187202501c70059229579543e09feebffcef6e2299f1b81fbbe7d48c38bc54c5e46ef3916d652aae478d9eb24014f7b4017377c
+EBUILD fonttosfnt-1.2.2.ebuild 359 BLAKE2B 01ee4c83392145c48e391f10ca39d166bf16c976d8da6cc9e71ade690fbbe11b577010da552b10c45435503ba98260903d9c40e1e6914ae3d67131cebeddad3c SHA512 d7a5b6b1e29c16af79bea5e370bd55a1b8e2f30cedec4482aafa46af1fdecb1ef60af3e2868c3bcc66dc3c4e9b52142e3e6c10e6606e2056a5d403e08fd36d6e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
index d39f3e862a89..9c308ccfea51 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE=""
 RDEPEND="media-libs/freetype:2
 	x11-libs/libX11
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
index 58b2c5a2959e..746d57187ca1 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,3 +1,3 @@
 DIST xeyes-1.1.2.tar.bz2 133160 BLAKE2B c3f31a2df7988517e4f8903fce6b0cbfbaad01e84d89c7b9f7755eccebba95fbb8b75377644ae97f090e9f4a3a245698966e78f738275f7513f5927193b5dd19 SHA512 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0
-EBUILD xeyes-1.1.2.ebuild 451 BLAKE2B 849312db8da2bd40307af1154979264db3bb180ee0e098ec6b7946648ef5949ba74cff897054ea5eb03d15b1aa877cd880631ff0927e707b2edf92b7b16a9bfb SHA512 9cd10484ea788bc0370b6e3abe265370c668add37dbab66bd212b53cc82b5cb93713fea3a6b094a8735399bb4d850f75db51171829714e20a6a42a92a554b7ad
+EBUILD xeyes-1.1.2.ebuild 458 BLAKE2B 1da942e5c3fd0d300826043cb13ec2763672b8c8eb50fc2b13fc2c4e4cff888c6cdd0d51cabf8c8400a84a2851bb3a4edbff284ab27a2c8771e92c9d5bbd978b SHA512 c18c7606a4e7ed92e7cfd0af9533f49dec1690cf598a5d18b1a890939f5767c4e18692020a4655c2ec93ddb824af4407fe79c9b33e390f7c5d2d13810099f189
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xeyes/xeyes-1.1.2.ebuild b/x11-apps/xeyes/xeyes-1.1.2.ebuild
index 538de503da5a..1f6d5e4e9507 100644
--- a/x11-apps/xeyes/xeyes-1.1.2.ebuild
+++ b/x11-apps/xeyes/xeyes-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xeyes application"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 32003a97ebf2..10508f916f3e 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index 6defc7383144..bf69442b40bf 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-input-libinput-1.0.1.tar.bz2 379125 BLAKE2B 4cfb4ee34e2bb134c4e0345cb0ff40ce73f336cd60715095af3de1a1231ad192f24cf8b69b6b4339b037cb9a2bae6d33d92e6631d81ed2d24f6684767d804b4e SHA512 bb3cc4e9507d5ff6e430aabb5c87e412e8bbc5fd18b85fa4826123cb6be2f8f41078863fda09304f9dbd1264bbf1c3c7d6c11700ede0a5db733fbd1a03ec915b
 DIST xf86-input-libinput-1.1.0.tar.bz2 380727 BLAKE2B 03f394340bb79ee928509471200434fd8efa1385a1747bd1c95743e2d235f806c7b2816496ec74518c18dc967c6761ea779d0c66b525aa80ac6a36bb80c4a45b SHA512 7def9a4834a9203d1672613b1a4b384a0eb3d664818865b375969bf9ca96c512b752859acc8916de9224f7e488f8d59953308e53b983dfa8031ca01fd707fa2b
 EBUILD xf86-input-libinput-1.0.1.ebuild 452 BLAKE2B 0779a934b634a38c08d843f571c6096859a98db0460467deaba93ba73f1705ca2f8ebbdc6e0780f2e593ae0c7f204a86e2ea3779a5e8a89694264856cafafb68 SHA512 69579671a84bd692308c9de79c50a9989cddc0a079f1c01a0cc68a6ea1c175c6d501d8acd25a75b13cee876d1d56489e9848f793a05e6c782078c85a5c6b702a
-EBUILD xf86-input-libinput-1.1.0.ebuild 458 BLAKE2B 3863039d7305bb5ee0c99a320b56514db82f624b4d5cecbfecacdc909222258b290bb20d20d24f82f476edc71826fdff9d3a07da198f28a810d23fd601c16759 SHA512 a6d1b0a04795af3a11f2be8ee0d11935dc26d26a7005ae50024f3e17979b7033bee0763034b6bd59732df83a834b82c9f795890f9a176a39fc27b8f0b9e00545
+EBUILD xf86-input-libinput-1.1.0.ebuild 456 BLAKE2B 3d0d5941ecf23f51dfc94b2d5672813412228dceaeee707be15e9283c32581c7406a7bb6fb9ddb303018d22288d870af093baa0e14ad57ed6be2d21a719b7bb9 SHA512 43e6ad7af31c1b1a8edee483bde5c753abda5441b835b98b7bba17080d94b481c62d669f777dc1e52634343b12050c26c1adeb1cb50d2e0b822fd362f25e1088
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild
index 97515fc67145..280f61547b7b 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-3
 
 DESCRIPTION="X.org input driver based on libinput"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libinput-1.11.0:0="
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 13010f191e63..bba089b87382 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 155f6d756c96..c744c3aa99cb 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -3,5 +3,5 @@ DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8
 DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
 EBUILD libX11-1.7.0.ebuild 879 BLAKE2B 86220953f41861753950b58fea111d9f7023514f9d8af00520d67753ab84ca7c9ea4d04be650c7fabf40a560c9ed60a0d4e9b6b29bd983c388622ddabfc2b657 SHA512 f276e0a0894432c99d6c16b4cd86501c83d141d1cf1301105a53bce3910cf0611576c9b748b4d3a95957ec9409d738dff2bab944b5637d1ab0cde89b8cb9d3ed
 EBUILD libX11-1.7.1.ebuild 933 BLAKE2B 3f04d4391f7a64679b7a10aeb3f68b1178ad9bf6389bd6607fda2cb654694a9b862da89856dc7e60e951a11908f065ca269a829f7181bf7b20300ba7dee73fba SHA512 8dc77dae5065e805a0f8af0c0f2c95c3c2541fc9b5cc19decc064cda661640673ecc2d8ca56daeb95e0ff1618fdd109376f6d0b13f7d54022789afe051e76ff7
-EBUILD libX11-1.7.2.ebuild 938 BLAKE2B 844ddee613fdefcdb058d0b58681997dad49d7e6eabf3184d0280fce5ee5cfae399d5af54c1d4d805473f9ece90dbd1dc2668982d4086dc486a0e9660abec003 SHA512 42a6be332d686dfc4182ba6a3e6ac4d71d05278dc6b9d18d785b2d7a482e6ece10f006e3fb2de5989099f0833f1826f9b275451804f639a64521bdb66ab9fa84
+EBUILD libX11-1.7.2.ebuild 936 BLAKE2B 3d163f67f803b0cf4c3bc8a0af1ae7c4ce802a4392ec0e6d9cf40a05614fd8fd0ce1e6a5d9ad53be49b8101248c2ea1d62bf3106b05d2384327e6771da3a29e8 SHA512 bd5b28d4814328d6669c6355ddb3ecfa47b81b3ec0bb58a4cd9eaf825bd13d1e7c13d09fd3c41b9a1092b7ec917ca8e69e0636242842d456d7608250cb928f5f
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.2.ebuild
index fb5b68059871..848b6ade703a 100644
--- a/x11-libs/libX11/libX11-1.7.2.ebuild
+++ b/x11-libs/libX11/libX11-1.7.2.ebuild
@@ -10,7 +10,7 @@ inherit toolchain-funcs xorg-3
 # Note: please bump this with x11-misc/compose-tables
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 7cbc4a1639e4..67fa585e3e8f 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -2,7 +2,7 @@ DIST libdrm-2.4.105.tar.xz 420376 BLAKE2B 1443dd378263358e7af64ee63ac6d25d2c5efa
 DIST libdrm-2.4.106.tar.xz 418176 BLAKE2B b0f935297239560179ec8994b62c7161494d4c1aa33bbfdc4d5e4ecff97d252f7556575391ebf486e24257c365415e656b9f84ac883dc9d56baf39e79ff8c5f2 SHA512 33140e579906ab54b716149056af500c628ce41cd9ae3b0c33496693d2f5903fbcfccee8a942dd1560e1591111ed240da42612d5af5e75558db6f6a85d14617d
 DIST libdrm-2.4.107.tar.xz 425612 BLAKE2B a685cd9a6549c7bdf1efb4e7ebddd0ea49554fa718f8328c868a1f245e7c072933e49546591c056ba7ece8d8841b8138e4247dd8697238a18c2cd92fe5446341 SHA512 c7542ba15c4c934519a6a1f3cb1ec21effa820a805a030d0175313bb1cc796cd311f39596ead883f9f251679d701e262894c5a297d5cf45093c80a6cd818def0
 EBUILD libdrm-2.4.105.ebuild 1988 BLAKE2B cfb94eaf9f6bc949b597d915556b52f9de85d0c10aa20aca571a27f99500f9543dc368771ee61c59b89e18f5d9ecbd72eb17f716b9a7ecea35a6d7b4f9b18efd SHA512 32c0df2d09c9088ff2fd2dcfff73ebd78355c8132e2f042413300b31e63b4ffb878f57cc513733da190b6e19b241b5c2a0cba5b7aaf7d5f46d3f5358664ffa8f
-EBUILD libdrm-2.4.106.ebuild 1747 BLAKE2B 7c973324315284b00954709be7e6151f3b23bca0e04109bc605063d5cad186b812e072007269afafb5390df603d1894a27c48407eb7e50d6cc720972ab1cabfe SHA512 3cc01a6b0a1491258db56ff25e6e8a76e75c53f69411e964f11e3031f779805e31c8263a21d20d126bc986b5002876fbccb63bb415b1e0fee18db533ea19b9de
+EBUILD libdrm-2.4.106.ebuild 1745 BLAKE2B 6503e8c9743223faacd60ede3bab2aa848d73557a8d705aaf329333a16e1204ad5b97897d41c5850ca4026c9b21af01bbfb1100a2ad7598e771d58744b15ebed SHA512 8c4f0ca72b8fc0166182ac1533274cf7296d1bae0890728e5886e6f53c8160c16734ef3b685b6ac8fb13c85600e55daba55acc1760d394848f058aa0fe982df6
 EBUILD libdrm-2.4.107.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
 EBUILD libdrm-9999.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.106.ebuild b/x11-libs/libdrm/libdrm-2.4.106.ebuild
index c496d7b4e6b9..d27d24510b94 100644
--- a/x11-libs/libdrm/libdrm-2.4.106.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.106.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	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"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 64e0b81ca168..e2fb0911c352 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,5 +1,5 @@
-DIST xapps-2.0.6.tar.gz 231023 BLAKE2B bc3907966c132c683e75769f8f45839d45229c77933ef861f58b03a21cca15a4f3dd610acb6a19fc16d35ddb189340cdef80704e78c89a3e49659a2f82be121e SHA512 bac6e105e2b1e237958fb610a9bd697a023c10a45131da7dee984532986022895414d81849f53bc0007c319c2139c6d39474e2e7fd9ce4e53365517f4ba4f012
 DIST xapps-2.2.1.tar.gz 239789 BLAKE2B ee7f3f2b3c54b0b40158dff6abbe2233c0d1a1fa4e134ce4bd6ee48842335b16e0d94ad430cb59301529dd85e2705cbb1c1f5ba10844b6fb85f598ca0c42d1db SHA512 412f5c207d81d2507f2aa5cc69beed2036db07058f08613793aa7c277bac30191a02d9aff4eca0aeb8829e3e39d5f3a87e34232bf51220c4d4bc7c8ee37b9e65
-EBUILD xapps-2.0.6.ebuild 2137 BLAKE2B 7d58cac8c262526bcab27af3cddb3ace003d65f89b4dbb41566e516a3e67fc515832115085c6c1f42e6a93bb02fdba198b665cf11a0ed0f246dad47bd51065bd SHA512 52d1fe7c51936c187a9c2bbb5ab7df97e657fa8a1ca5d0f874913bc75f5f25498abd28dc56c1fabd785d867f2cffe50abe36428f2afa8ea1797532eecc45e901
-EBUILD xapps-2.2.1.ebuild 2139 BLAKE2B 4a91afb77aadf2ffa5c7b31e06559f74be2c7f782bc7e491acad2e58e5fc3251dece2b9905d05e59c3608ccc776c964862b12a4c3c715b4c76e70317d732da7a SHA512 45d015894b5c354d486ae1f8bafac913b309a5ea86ec576396d4965664d7bd11f49ed83b3ec5a1b21ccc5f7b2a2ee36929e2d305ccbc5b54de0726be1065fe98
+DIST xapps-2.2.2.tar.gz 239823 BLAKE2B a45b2707c505c9ed69b9748c846f69ef7668600619bc3d0f86c693c99e536afb9994ff4ed10cbf0efc194a1e861cf0911af50170e97a7b858b1363c370551799 SHA512 ab37714849365a81b2a500ed38ada9bf6b52edc17d3b3bfa6d41551a18af1b983f8fe084dee94939e81647814a77d2c219b87694349ac5d0d0ac59ba5ad79aa7
+EBUILD xapps-2.2.1.ebuild 2137 BLAKE2B 7d58cac8c262526bcab27af3cddb3ace003d65f89b4dbb41566e516a3e67fc515832115085c6c1f42e6a93bb02fdba198b665cf11a0ed0f246dad47bd51065bd SHA512 52d1fe7c51936c187a9c2bbb5ab7df97e657fa8a1ca5d0f874913bc75f5f25498abd28dc56c1fabd785d867f2cffe50abe36428f2afa8ea1797532eecc45e901
+EBUILD xapps-2.2.2.ebuild 2139 BLAKE2B 4a91afb77aadf2ffa5c7b31e06559f74be2c7f782bc7e491acad2e58e5fc3251dece2b9905d05e59c3608ccc776c964862b12a4c3c715b4c76e70317d732da7a SHA512 45d015894b5c354d486ae1f8bafac913b309a5ea86ec576396d4965664d7bd11f49ed83b3ec5a1b21ccc5f7b2a2ee36929e2d305ccbc5b54de0726be1065fe98
 MISC metadata.xml 484 BLAKE2B de6e513c5b0bf8090a3987c27f28c2c178ea1d4b7c90711dfed21e881989dd5894ee7a822f85135a4f2e0ca240d37158bce8206063892f4d9712387e6586926e SHA512 22a7d6e00716057a38f97ae73d4cb906bbc6c3aeabc23d586ba1788be0f77ebac6930870f55f931ab0fb6fa8ad41e7a6ac8e94eab3c459ebcb5f296b7f6dfcde
diff --git a/x11-libs/xapps/xapps-2.0.6.ebuild b/x11-libs/xapps/xapps-2.0.6.ebuild
deleted file mode 100644
index bade1ef0d30b..000000000000
--- a/x11-libs/xapps/xapps-2.0.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2-utils vala meson python-r1 xdg-utils
-
-DESCRIPTION="Cross-desktop libraries and common resources"
-HOMEPAGE="https://github.com/linuxmint/xapp/"
-LICENSE="GPL-3"
-
-SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/xapp-${PV}"
-KEYWORDS="amd64 ~arm64 x86"
-
-SLOT="0"
-IUSE="gtk-doc introspection static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.44.0:2
-	dev-libs/gobject-introspection:0=
-	dev-libs/libdbusmenu[gtk3]
-	gnome-base/libgnomekbd
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
-	>=x11-libs/gtk+-3.16.0:3[introspection?]
-	x11-libs/libxkbfile
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	vala_src_prepare
-	default
-
-	# don't install distro specific tools
-	sed -i "/subdir('scripts')/d" meson.build || die
-
-	# Fix meson helpers
-	python_setup
-	python_fix_shebang meson-scripts
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dpy-overrides-dir="/pygobject"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# copy pygobject files to each active python target
-	# work-around for "py-overrides-dir" only supporting a single target
-	install_pygobject_override() {
-		PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die)
-		einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}"
-		mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
-		cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
-		python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/"
-	}
-	python_foreach_impl install_pygobject_override
-	rm -r "${D}/pygobject" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/x11-libs/xapps/xapps-2.2.1.ebuild b/x11-libs/xapps/xapps-2.2.1.ebuild
index a7434062a552..bade1ef0d30b 100644
--- a/x11-libs/xapps/xapps-2.2.1.ebuild
+++ b/x11-libs/xapps/xapps-2.2.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3"
 
 SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/xapp-${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 SLOT="0"
 IUSE="gtk-doc introspection static-libs"
diff --git a/x11-libs/xapps/xapps-2.2.2.ebuild b/x11-libs/xapps/xapps-2.2.2.ebuild
new file mode 100644
index 000000000000..a7434062a552
--- /dev/null
+++ b/x11-libs/xapps/xapps-2.2.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2-utils vala meson python-r1 xdg-utils
+
+DESCRIPTION="Cross-desktop libraries and common resources"
+HOMEPAGE="https://github.com/linuxmint/xapp/"
+LICENSE="GPL-3"
+
+SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/xapp-${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+SLOT="0"
+IUSE="gtk-doc introspection static-libs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.44.0:2
+	dev-libs/gobject-introspection:0=
+	dev-libs/libdbusmenu[gtk3]
+	gnome-base/libgnomekbd
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
+	>=x11-libs/gtk+-3.16.0:3[introspection?]
+	x11-libs/libxkbfile
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	vala_src_prepare
+	default
+
+	# don't install distro specific tools
+	sed -i "/subdir('scripts')/d" meson.build || die
+
+	# Fix meson helpers
+	python_setup
+	python_fix_shebang meson-scripts
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dpy-overrides-dir="/pygobject"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# copy pygobject files to each active python target
+	# work-around for "py-overrides-dir" only supporting a single target
+	install_pygobject_override() {
+		PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die)
+		einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}"
+		mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
+		cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
+		python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/"
+	}
+	python_foreach_impl install_pygobject_override
+	rm -r "${D}/pygobject" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index dd41cdc91797..e4bdadcd6418 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index c99e1ce5ce61..718921a481ee 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -3,5 +3,5 @@ DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8
 DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
 EBUILD compose-tables-1.7.0.ebuild 875 BLAKE2B 175050ee8e184a4f740f4fc2bbfc55076ffd7609ab1736f0f8fa915d5c58938734e8d2f8bcc4e4554e4a41987b62d1bde5d427a9b16a3fb3a175a4639ca7c99f SHA512 8b38cb39673e97611c30dfb27e0a6bb751c9c9027e098fa09da52d31322cf8c17fa8052906c2aa6238d7253c66c31d9a6a67927af2ee93c8ef9f2570146f5828
 EBUILD compose-tables-1.7.1.ebuild 921 BLAKE2B 17b09ddcc3e3edb7f3680b303de817b1fa68e0b092b81e574bce64c738673a7406d412413f89f46fb5cd99b62e5f0e1db48ebfea0f7eaf0bf84d818820f959a5 SHA512 529bdff9f93c80a549f2dbee98aa78b5e4063ab4edf4dbcd93825b9fde10a847ff4a7af95b42cd71f56b9db39319331869101f3eb000daa65ef8d0cab07cd1b0
-EBUILD compose-tables-1.7.2.ebuild 926 BLAKE2B 998346d5e3eae7077dfa3419e4e20e3d50d1100baacb2c5a093b7f7e3ecdee5cce5f7ab556ab0869a23b2dfe63c72199390b0680fd987206eb7e302fc60ce561 SHA512 af64c60c001b100651d12fe3e6321da48ddab7b188318b5d2139d137ebd7553b10292146b6d88f8934b1e64a826569f1ddf36fad03682ec63e0d9fe8c38dd30e
+EBUILD compose-tables-1.7.2.ebuild 924 BLAKE2B 87f2ace30201d761a0ca63f3c09864a4cac930be8830d313f0e393a7de25d9e9eb45246a96b38c06bea3abb98a638ddad3046fa9e81ca7142fe4aa49d33c1664 SHA512 9c6dc79ad6be05ac6629bcfe66e48a7e4c4eed10ea4481e8a931fba2375f2fd0cc1c13553edb07348004f1e383e1f8007ba0ffbe1e1f4f95368bf11709cfcf34
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
index 712cf489a8a0..5b0de90716c7 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 3ce1fd842e9f..fe76d7cb6db7 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -5,5 +5,5 @@ DIST dunst-1.6.1.tar.gz 217267 BLAKE2B 267e5be6a079097fb5a677bd2451b0e5bcbcddadf
 EBUILD dunst-1.4.1.ebuild 1042 BLAKE2B 80f0cab6a7592ed4da0bdee6a8d595f0910567357e3eaf808d279264fc40d1be9d5bd028fff0ac568c9a083e35b5bd461f8d1cd8bb4301926da8fb052668cade SHA512 1fa787b051a4fb4472da55f44bf8d7ddd0175becb13423d7af68468b4e4706dda2be7995443c658cdf65d7561801886bdf8a7a359c623edb61ca671e7d394bab
 EBUILD dunst-1.5.0.ebuild 951 BLAKE2B 92ce2b3a4e3b66fa84184f3a80847d9ae4d6d4fcef3fb83ec9353828132702a51653cba91b322725490ed8d554b3e0854015b0cb089181db03a5490ce893a055 SHA512 85c7b4acb808207ede30e9f28047861a295c377c3311dbd1112a5fc01c61b415ccd966e88ef501dd14f6c6d73d802f47a1af60d19bae3d3c0b8c1fd7013bd45e
 EBUILD dunst-1.6.1.ebuild 1340 BLAKE2B bf51111b1f244cdaeca167b8bcd63786c61fc809d6ae0c42278830fdaac06ee384739c5d112911b7fe21d33c9ec210297b48a3799817903e7ddc68581e18dbde SHA512 5e8ae0babb55274f447dd0e892b50c2f37d149a43da9671ca1ffa1a2cf05ec5d4d0e17202e5112431aee141706f90ccff5533c43434f9f6b9c5cbac5b4c79786
-EBUILD dunst-9999.ebuild 1342 BLAKE2B ff602cf08af41dd3645840569e3aed19cd7937b0377e86a43f256103c85c9c9fef6c2a223fd3ab568befa2159418f7993f6865b3138e8b9cb292da19ef11d340 SHA512 b3b5be65c50a80f3031e6e2925f0a0ed654913e605c329619ea4853bd61fa49791d7cf22c32be9f36b3eac98d47bbc6262633eac331594ddd8819a42375e01f7
+EBUILD dunst-9999.ebuild 1453 BLAKE2B 3ce3bef467d44bd753c714af4f2e1b52bd746abe49b210d8e8dbb0fe4ce465a2e0437f979110b3085c227315ce179762a814ff3ee1e2b4de53997561f5e4663b SHA512 bf09009b644600ccb85d58dd9f90c37aa8b2b3a9a9e29bae9fdf12128da782171db7377d56fbc896ccae21c99e965c4ee59ec45340f0b1e84eb936f3313fbbc6
 MISC metadata.xml 561 BLAKE2B 5e945d9c374ed86d48f7f5b1efefb11c8b12dff0c73b903e283f24c84ed698d6213d6b38a741272572068919583e3c87dad0d7e8f5c70a63be760cb6453bd403 SHA512 85eb2d4acb0da5bb6375a86a41861f6998db6c4a7f9c15fc06531a15cc25528b1b690768f258730edc88533df06680acddc453d194374c52d431339c6014bf22
diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild
index 9e6ef65b51bb..dbbb4b319428 100644
--- a/x11-misc/dunst/dunst-9999.ebuild
+++ b/x11-misc/dunst/dunst-9999.ebuild
@@ -27,6 +27,7 @@ DEPEND="
 	x11-libs/gdk-pixbuf
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
+	x11-libs/libXext
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libnotify
@@ -40,7 +41,15 @@ BDEPEND="
 	wayland? ( dev-libs/wayland-protocols )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-1.6.1-no-Os.patch )
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^DEFAULT_CFLAGS/s/-g //" \
+		-e "/^DEFAULT_CFLAGS/s/-Os //" \
+		config.mk \
+		|| die "sed failed"
+}
 
 src_configure() {
 	tc-export CC PKG_CONFIG
diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest
index 9690d5500df6..86a871601f1d 100644
--- a/x11-misc/i3blocks-contrib/Manifest
+++ b/x11-misc/i3blocks-contrib/Manifest
@@ -3,5 +3,5 @@ AUX i3blocks-contrib-respect-CFLAGS.patch 654 BLAKE2B f3633b4046a55d31d5ae694b37
 DIST i3blocks-contrib-1.4.0_p20201127.tar.gz 738457 BLAKE2B 1db16c40323d0c191bb44c50d6a66523391adfdf9652976f78238fffe0ee50d99d3bd6fbcfd1a0eeef8308fd466a3eeda479299f462b4d4d31ae2f2bc7ea6b31 SHA512 ff09c7b8e4b630d014f0441342835dbf03642f32de6806a1204eccb6166eade190abe43b331ef72aaa3ba5a77f9690ae8c36a9ef9aa6d312ae5e543a46b99a72
 DIST i3blocks-contrib-2.0.0.tar.gz 840332 BLAKE2B e220566edea4249c25ac80dcba3e24fc37de842049ad072a14fd5003e298ec9a4b4f36cd3937682ab00355b1f1c3fc7ea795ac6593f24aed2438b465ad338d8f SHA512 30cf9297e710a2d685b275d424de817e7940a487c615e64ffaf15e0f90e937bedbd3921dfeece081e32f720b6add92c0790fa7a29e4e8f81f85c3a74cbcea835
 EBUILD i3blocks-contrib-1.4.0_p20201127.ebuild 1624 BLAKE2B 6d3f5b71827ba487e3ac28f5cf96e78e2b989cf04365de398cf588ed028684a5e1ef7fa734d607dbb0428de3b7cf00d4a6381acdec9da6411b6c93d2074557be SHA512 6a1fc2e5d85a16d625f7d102e5727cbb6d170553fbeab8d9ccbf26c9d34ef871bd6308ab0ae008cce389f187d73fcb053a530118e428982198c24c6cc7341acd
-EBUILD i3blocks-contrib-2.0.0.ebuild 1922 BLAKE2B f803a2e88353b291057ec0cb4e02d2a17695ecc9671a8875d687562ff934301c96341593f593c3d7f195e0786a995e003caebc752efaac8cc88e75646e83696d SHA512 e1b278894d337fb1d2fa04ad00506de585f20130d8c9e99490a632e03179f70907de18a45941fd08630768d29e58f62f81939c33b9fcda0596a08ae7f8122d10
+EBUILD i3blocks-contrib-2.0.0.ebuild 1920 BLAKE2B da6ea6a3475355e05694d10e0b442b01f40f99c4e6c9018aa597d95187a091ed1bc1d0295d6844ea7a206fcd6d9b1410734c3df7665843ec2d29fb956a06214a SHA512 13e66f0fddb02e20401d10f5190e394d29096c815435e68115b249c3ddf3bc6e2abab15441db8310af60eab7d43fa7e87649accec06ff94b65b23df26106de5e
 MISC metadata.xml 332 BLAKE2B 174061304cb0b09fdc2279117f1dd3974b94104fe9926f854f149c580d6e64b4e2201f5a48f989b4f11a3db95e9e5051d393365069d95ca0f83b2db8b972b868 SHA512 911353979e4ca52a7fb5213811cfbac924f05eaa11f92313d65cc96d67eead4872deda29a5aa2572e67d63f2feb0f6e54bb4fd1d4bc41e4c9d6406e6153bb5f8
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
index 88dab674b534..b588938c6635 100644
--- a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vivien/i3blocks-contrib/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=""
 RDEPEND="!<x11-misc/i3blocks-1.5
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 0a5187c5b222..6cb9e898c677 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,4 +1,4 @@
 AUX slock-1.4-fix-link-paths.patch 558 BLAKE2B f2ef75f836b02ec23b98fdb9f302e671ec8a284b75d83f701e14f5d44a746916b670768730759d4767c9617259b6ad1ec6aceecd851973038ffc2382edd99558 SHA512 3610b7e03e7089ffb4207b136f08ac0944d411284dbbf6614c615596451dcab11ad001c01c4f32c0f040138c99d6764428d60050da59933619a8bbf7fd2a011e
 DIST slock-1.4.tar.gz 6889 BLAKE2B 67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f
-EBUILD slock-1.4-r1.ebuild 1246 BLAKE2B 88e425b7de3f48060cccf815f9f778d2681c9b61aaf51d18c96846609a415edce8eb75d4cdbd9afac755cdeafd96436782cc27d0e631b203774c11229d1ac516 SHA512 1758c511f74cc49dc0a28ef9be30a93ebed4467c19f821d6fcbabfc901c800ab809d4780537584c9a4acf9147b08fc370788e0b439b2bdad31ab2890b581f5ee
+EBUILD slock-1.4-r1.ebuild 1245 BLAKE2B ed18dc22ffb299afd7a1e4db0020fa9fefd61121314ba38aae0fe679be18f8d915f87af88dd4d55500da94b0a1caf52276a5d5c6b5ca0ca5592ad21f6a6f5704 SHA512 14b23e80aac03935b325a64ea74d2bbab0275e6e64d01397b534577c6c25bb8aa1909f4e926c173927946ae27967f6aa6b86604eb553135a3be3127375abbace
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-misc/slock/slock-1.4-r1.ebuild b/x11-misc/slock/slock-1.4-r1.ebuild
index 615682671a07..5c0b10dd2b89 100644
--- a/x11-misc/slock/slock-1.4-r1.ebuild
+++ b/x11-misc/slock/slock-1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc64 x86"
 
 RDEPEND="
 	virtual/libcrypt:=
diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest
index 7e4aea6a6623..668f5093e238 100644
--- a/x11-misc/tabbed/Manifest
+++ b/x11-misc/tabbed/Manifest
@@ -1,3 +1,3 @@
 DIST tabbed-0.6.tar.gz 12926 BLAKE2B e92e2c7132f7a760286c61c99faa0b26e411326e172c231f3354e61f8151f561babd4a35998bc06cb7fd87dc962334ef0ddac78ba284cd3090bb1c2dcfa159be SHA512 bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553
-EBUILD tabbed-0.6-r1.ebuild 971 BLAKE2B 298465669b8ec4577e3b1cec38a92d3f29609e46576a7323523bbd23dfcc5e3399c87b163a46e0a24b10265954d48f7c093ffa011b79bbae0b9405c290163830 SHA512 5883eac292d6a93b0ad2d0b289fac82c3867f3984a81e7c67cc3ccd013f936903165576e4c1b588d95e4805e346aa7f5472e60dfa715e6c83f61d7c3a4c25040
+EBUILD tabbed-0.6-r1.ebuild 969 BLAKE2B be21de436a42fb6249b12675bc05ea6db5ea054fd8b912286ce80bdaaf264b5c91cd5e8a8cb5829e69028228e22b0b2c08aa05b687a17ad37ab13227f6289d27 SHA512 84cac979d2bc0a2ff7627d3358cc108ba48e1b22e1bb19544fa6dff8b0ccb34db1dc97429f4046b7c4b7daa4e132fe02aaa23eb77f2d6d7590effb47cfb98c08
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-misc/tabbed/tabbed-0.6-r1.ebuild b/x11-misc/tabbed/tabbed-0.6-r1.ebuild
index eb431ad1830f..c2e509149082 100644
--- a/x11-misc/tabbed/tabbed-0.6-r1.ebuild
+++ b/x11-misc/tabbed/tabbed-0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index b9e9959418c4..41a8456db8bd 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,6 +1,6 @@
 DIST xwallpaper-0.6.6.tar.xz 85368 BLAKE2B fcb0861d4cecbafc980208b3d2a174b9931a93cd8110b6f2c38eddae19e890295ce5d6d75dc4f09924279a2b0463234f4efdb4dda758ed14ed728abfec6b9bf3 SHA512 e37055b9adfa6950fb423228ff880afaa03dbdf2a7ced6ab1e110dbf4813f68aae3c9147668ebd20665b582bea195470c39b6948cd36879afe54d61c90b6f8d9
 DIST xwallpaper-0.7.1.tar.xz 86260 BLAKE2B b8327b15bc421275660cc81d14e4952b37a1310fd50eea61b772115e2c345c01cae9c4f908d9ca55427e642b10bea7277af02e1d3525db6c1d6e80a356db1b2b SHA512 706f814ee892f9d136ef20bb3c9bb4b8537e3ed7029b3b20fbebb1504426529d2fa6a45117a391419253543a48230f5786ffa3f871f85477699c08dfa3ba5c92
 EBUILD xwallpaper-0.6.6.ebuild 956 BLAKE2B 60de096484a1ec26cb1f81e8ef5bfe891e2e65130216e675fac462e0bb3dcc216d36bc9b8df93a9ac07d3b84896d06042b5679a15e79e6c71adfc360053727d2 SHA512 8b15ba0f030336a0dd7140e2274be8ff171cfe5e85b6788ef4771ff65c0f74bf16df9709bbbc12915ab313a5200d0e820995d9f93f1d5934421025791cd39a62
-EBUILD xwallpaper-0.7.1.ebuild 974 BLAKE2B 2dea058464f7422dce6f78ac919e5fe6932ea641a7265ef316c54969c15656723f48d7820f7e8e8aa1680379407dc6d60c17e23e7b76f303a13878a65ed38071 SHA512 6d6db6da087120f12f689e48d7a81f8aa94e0d9316e97b4317e986c3f5d12a7b133df683dbe794b6cacdfddc3204457bfafccfc6e6625abb88854903f8b2f555
+EBUILD xwallpaper-0.7.1.ebuild 971 BLAKE2B 42e1e0addea931748d0e8ea7aeb1e62bb53f99cb7adeae748edd538c981436264d684ef9a1bf94e3d3b4f5a2fab05f42798bad35ebe1e92aae17f2d2d4deaab7 SHA512 ec15f6d477ac8dc5ea5af86c2cbe725860241dde179eaac399ee6d2824ee786e62b99217ce1b2e543664074961590755fe23211cd678a0259855e289be6a23ad
 EBUILD xwallpaper-9999.ebuild 967 BLAKE2B 015785bb4227a1269a03488df74bf4258cf6e39d621be80bf8b0c11d22dd863f9c1f9034dbf08b41717cd4a5b445cd6bd3cc22e987ccb0b7e859ca5376748e5d SHA512 ce4fb8f6f20922422e2f7ff1a5537f3f03f9664db850461e411b3a5f4e89e60c4cfc7e848f12d6f574dd5b7f12f3849c78b6ae56c23989a10d8cf444c34f4b37
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild
index cd4455983d77..9f494806c799 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.1.ebuild
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index ec331c84c4d7..c0789bfe34bd 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-window_merge/Manifest b/x11-plugins/pidgin-window_merge/Manifest
index a6ba968d1641..ccf0bb4ff3d7 100644
--- a/x11-plugins/pidgin-window_merge/Manifest
+++ b/x11-plugins/pidgin-window_merge/Manifest
@@ -1,3 +1,4 @@
 DIST window_merge-0.3.tar.gz 328953 BLAKE2B 2277f2c5cb83d98ed34b4e0961281b7c8ebf8209b31471447bf64e9405c9cd0c2e0edc0388f64904f377d77a9916c411cecbc9c6cf235f2127685cf553906c69 SHA512 6863c58b3054aac51ed109ca8fff5e02459220648e6afa700c7231e259e71893ec7ca237263c230632a512d470c6907d3e8cfc9516cb752c1e78bbfdb05a50d3
+EBUILD pidgin-window_merge-0.3-r1.ebuild 774 BLAKE2B d9dadf3a1574d3fff4a4aa31e02f1a23b2bb9a61578acd93092a1bae48cdd496cd8fb20b6508f40c23fb6ce7fa18a41a9d94e6b50e500b66d00ca9677cd05f8a SHA512 5f12a0ac477e1032f40a0ddfd4f24e548c31016d22d4565ccbe86d42a3af32ff4e0193dce771a480ab570b99d01577e3595ae0058105fc8a8d1dbb7d60a13ac1
 EBUILD pidgin-window_merge-0.3.ebuild 703 BLAKE2B 3a58c80676252168eaa458902ce2dcf2cb18d5e6052778994ecaa7c1cb2b088774d53216258f3f65658c92c6786a199f35391520b3970fc3b0834ad871deda36 SHA512 d21a89d2586ba066c074d34445d3d9b570b8b9c3c2529f1865c1576f286289f31ea6be1a669f84a8943faaf37ae8b85f9268fc2748ffeab18187202e6d60b4f0
 MISC metadata.xml 333 BLAKE2B 254ce7c009bb5e0034835e975d04ff077bbe0e24e6d226c0381a91a087ce16fcd815cd411db181a8b34463f903fc4afd624a7531c340c083ffe1982c20b6cd33 SHA512 9865a245036486f3b8a82077de63f67f7c37d73fc13c3b385103166610bd45e1d284d96b0358ca1fb84d7aaf15b111e12a59e6fdf3984ae9d0fb145b5e89871c
diff --git a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3-r1.ebuild b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3-r1.ebuild
new file mode 100644
index 000000000000..5fbc54811550
--- /dev/null
+++ b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A Pidgin plugin that merges the Buddy List window with a conversation window"
+HOMEPAGE="https://github.com/dm0-/window_merge"
+SRC_URI="https://github.com/downloads/dm0-/${PN#pidgin-}/${P#pidgin-}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2=
+	net-im/pidgin:0=[gtk]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P#pidgin-}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	ewarn "This plugin and infopane plugin (purple-plugin_pack) activated"
+	ewarn "at the same time cause a segfault in pidgin"
+	ewarn "see https://github.com/dm0-/window_merge/issues/4"
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 03dee7620478..998fff391f6b 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 200c1d00d889..c501e12a4019 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -2,6 +2,8 @@ AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c
 DIST gnome-terminal-3.40.1-cntr-ntfy-autottl-ts.patch.xz 33548 BLAKE2B 50952d21a6a5758b500665aed21b95d8b4295240e24ea69dd806321a32338aeb904c60cd7dbb713d3d456bdc9199c7c4b4e2d65bc7078fa9bbf6a7d94c227265 SHA512 0efc106b35c25199ed8d4edc5c36a10a1013e62100c0b3397a5bb04386d7d2f548e811451c8577bc123ffbe935cea2a8f10d08473de5fadc4d07db0f301ab3bc
 DIST gnome-terminal-3.40.1.tar.xz 2596912 BLAKE2B 6b199941a2d30a8bd06d779d8d5a1fc9096b7183718705b74842566033ddd36c18a32a68014b5c7ab545bf0bb4f780fa950c7d6d04149f89f640f0db6f105b59 SHA512 8e16b3c8513cf3c503a4a35e2c238ea41b087d426787402e0db5ef7e4bc5303d5a34a6455f651760327560f73edf3256177bbe3633e8a5b8abe8edab2bda7698
 DIST gnome-terminal-3.40.2.tar.xz 2608032 BLAKE2B 8d7a355623d6eee9f4e3d4ff219dbd12c34987ea1ab1b7dc960c5bf19772d57de3bd81f63ceae61e87e932f05d47208390738dd8df30cbca71d8d0ad5d4b7887 SHA512 d3c75dcf46775492149f98c0c1a9739ac8c8e816487160c1e859034bc8cbcaeb0ff81f7e87e577e248f662db64ee914974bda0cb3e548ab12fb4b431d82af100
+DIST gnome-terminal-3.40.3.tar.xz 2609060 BLAKE2B cc0ef61b2ffbe7dd93117acad6ad2b1f737fb74417c2c84a98cdf3c28d29a7aaeaae4461a0160549eaac8bf9fdc1852e67ffb2e2570b456132bc1726a7033486 SHA512 a4de627f88069f3a1cc69a53dfe4c29ebdd22ee604b0e0b1702dd1c7a14a5fb877968c020bece7f0d5d7dc496019ffef0f9b2d15cb17c80c0a99b331a64f8346
 EBUILD gnome-terminal-3.40.1.ebuild 2709 BLAKE2B af7fe18e29037aed64c447c0b6534273ec302b45bea17add41c00d02551b5542a220901d80d1f423e87d60cd4fa338b797bf1f24639ee22f881cf836f4a1932d SHA512 3af557dea4ff3098ecaad69594c6f500d211837112574183c939bfbdfe7b5ef7dab1cef1c65d2c646b969b8b72e9fa1a2cf5d54b07d1d4de7a1cfdccf4ef1dea
 EBUILD gnome-terminal-3.40.2.ebuild 2709 BLAKE2B af7fe18e29037aed64c447c0b6534273ec302b45bea17add41c00d02551b5542a220901d80d1f423e87d60cd4fa338b797bf1f24639ee22f881cf836f4a1932d SHA512 3af557dea4ff3098ecaad69594c6f500d211837112574183c939bfbdfe7b5ef7dab1cef1c65d2c646b969b8b72e9fa1a2cf5d54b07d1d4de7a1cfdccf4ef1dea
+EBUILD gnome-terminal-3.40.3.ebuild 2711 BLAKE2B 762e695dfbac737ef21648c7081dc6b3800f356ed6a9cf5574dd8ab1afc08b0a53871dfe693d0e17625e3571b557c9268b05d91aa3a362693e621a14049bf013 SHA512 65924ea97931d3760555e63862b6b27bbfbf5e2d4182c0eaa1a96e315ed42fd76664aeed88d27947dcb2f897d3d50d5e84868cd7231f22578498f6053348b1b5
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.40.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.40.3.ebuild
new file mode 100644
index 000000000000..b16c95d6f7e6
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.40.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.40.1-cntr-ntfy-autottl-ts.patch.xz )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.22.27:3
+	>=x11-libs/vte-0.64.0:2.91[!vanilla?]
+	>=dev-libs/libpcre2-10
+	>=gnome-base/dconf-0.14
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	gnome-shell? ( gnome-base/gnome-shell )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+"
+DEPEND="${RDEPEND}"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
+	notifications of long-running commands finishing, you will need
+	to add the following line to your ~/.bashrc:\n
+	. /etc/profile.d/vte-2.91.sh"
+
+src_prepare() {
+	if ! use vanilla; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
+		# Fedora patches:
+		# Restore transparency support (with compositing WMs only)
+		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
+		# Restore "Set title" support
+		# Automatic title updating based on currently running foreground process
+		# https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
+		# Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
+		eapply "${WORKDIR}"/${PN}-3.40.1-cntr-ntfy-autottl-ts.patch
+	fi
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable gnome-shell search-provider) \
+		$(use_with nautilus nautilus-extension)
+}
+
+src_install() {
+	DOCS=( AUTHORS ChangeLog HACKING NEWS )
+	gnome2_src_install
+	if ! use vanilla; then
+		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
+		insinto /usr/share/glib-2.0/schemas
+		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 924f6329d14b..861286aace1b 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -3,8 +3,10 @@ AUX kitty-terminfo-setup-0.20.1.patch 2148 BLAKE2B 820a445fb3b803164efb01c0ecc5e
 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
 DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
 DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
+DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
 EBUILD kitty-terminfo-0.19.3.ebuild 995 BLAKE2B 5df1fb3ae3fd494e4ed2c8af9405443e24f8ee726f65f0736993c40f401c1831b394d14d15302bea50ff5203090568e2a8246a950db3480b170788df18904559 SHA512 ad1dc540be07de9c8c0e8dd7e524b5786f9b668b511c28ec388037b05b36f4a4b91f4948b377eed1f9d98881deee7da48c4aaa182131228aa678ec0d02696f93
 EBUILD kitty-terminfo-0.20.1.ebuild 995 BLAKE2B 69179592c87c135e8ec646b5fe9d483aefb3d0131414a6e2ede8837c58e22b1f8accb19220e66ed7e1793e1f7c2d57362dd22ea20e0f3cb86608dc631e3128b7 SHA512 5241997e9566a8c8a31320804e0e0c282dc0f20d2e941415ef661ff3b8931d1dae73821a0668617eaef2d8c8950319adc2ace55522dbe5fd445b4abdadd466d4
 EBUILD kitty-terminfo-0.20.3.ebuild 997 BLAKE2B 7ea814c3fe8ddfb828ae8f3a2cb1c9b284153c6055889344808a1f4b5be8c71b312ef759b243eda4dfcc5981b1311c18a6abb089c1f04ee3c92d3d8cda1dcda0 SHA512 017794236bf42ce2c6a49983f99229894211769d6b9ac0bc19bf21766fcc9b34e988dd1d7b5cff1bef4b9840af79381aac21e736bba3187fe48565ac40b5bdaa
+EBUILD kitty-terminfo-0.21.2.ebuild 997 BLAKE2B 7ea814c3fe8ddfb828ae8f3a2cb1c9b284153c6055889344808a1f4b5be8c71b312ef759b243eda4dfcc5981b1311c18a6abb089c1f04ee3c92d3d8cda1dcda0 SHA512 017794236bf42ce2c6a49983f99229894211769d6b9ac0bc19bf21766fcc9b34e988dd1d7b5cff1bef4b9840af79381aac21e736bba3187fe48565ac40b5bdaa
 EBUILD kitty-terminfo-9999.ebuild 918 BLAKE2B 925db099759156ab53f750cdac53fb15bd453e1e493b419e7c807f236fd97f893718df6e7e5a4d8ef0d880544c8c4aaa16da684f5a1bb318c4d1b31432acd09a SHA512 c493c3d9fff637dc4dc8df0a3ec293f1389b5f4695a2d3b0669b6ffdcaec528db6f1b121ca10f10f69141b6bf6710c947b1b610db33dc146b7829d56d8668769
 MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.21.2.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.21.2.ebuild
new file mode 100644
index 000000000000..be10def6c282
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.21.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/kitty-terminfo-setup-0.20.1.patch
+)
+
+# kitty-terminfo is a split package from kitty that only installs the terminfo
+# file. As tests are designed to be run with the whole package compiled they
+# would fail in this case.
+RESTRICT="test"
+
+src_compile() {
+	"${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		linux-terminfo || die "Failed to compile kitty."
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/*
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 4e4b34ac2fc1..51b1d80f1f87 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -6,13 +6,15 @@ AUX kitty-0.20.1-flags.patch 1995 BLAKE2B e563ab5c09d43e8701e6ec5df519c47ae95205
 AUX kitty-0.20.1-remove-terminfo.patch 754 BLAKE2B 12fae3be4b6a9ae6a2c49671e95c24fb9c73e5d18261e4817e5abbbe4419804dc9ba3b387d77fd4fb296108f294c3a8a7f7285814edfa8d5d9e62b7b5cca36b1 SHA512 17101f03975210e183ee1a4370d65a5bd40812dbf253f66038c8f534085974369ee909302109a8315f1c982d00299aef5a7a52a98dadd7ff46f9431ead6f748b
 AUX kitty-0.20.1-tests.patch 514 BLAKE2B 69c4277b4ffc257cc8320dbfc5be95d72bcb35b70a377f8ef24ecd9a20036313ce52f245efd5f620b47ddea6f688cb0d3b4154d8787a3908d5c255ca26143f80 SHA512 bb5dd23b0e83118fd33296e1ee8c6485e51f29518406e1e875b2f5ec8e7de4103c9ec2b4c99516a3d4fe6134ccf5bf0d54e4a37bee89e64f294da4b0350d337c
 AUX kitty-0.20.3-flags.patch 2252 BLAKE2B 62743ee798196ec14ae3899e481271890507563b438ef87f8e7d19f2cfa79def5118aba39bdf402d6d505b208d1082af156c4feb4a113a5bd1fec481c1ffe20f SHA512 2480194e3f5dbee2fe2e70c5c54c69cb497d3dae9914508d3c0488de9227169cb8c023834627d0c55f863498d89890c31110fa3c3ee740b241b99bf299557007
-AUX kitty-9999-flags.patch 2264 BLAKE2B f97139220f48a65fcb7da0cf166b27b9827d5e01f21bc0549f0bf3ce87287f787b167283cf05d82ca15bef7c996da4c512aa6e483900ea4a6c44015de362d11c SHA512 845bd40360730d498de16764423263014bd299c7a9072f12810e859ba851d88d7f1429d2844c7defd0b389694be7ea3dbc2d4e4a4718e35f090440b7d0ef0e84
-AUX kitty-9999-remove-terminfo.patch 666 BLAKE2B e551e919d3a2ea31d53122e1bdd02e492e3ca0f6a0335b94d1e37585f82b2b0340743cd3536b43b9f26865917a01526e09379b02c9f2e55104bb8f4ec8b91b11 SHA512 2ca3ce3bdcbc1c0ec824d496d1682c800960f42289d75d2e92022873c8cf6a6a5095d97241fe5eb3b05949e18ae113719c7542643244d03521c01a857c59f48f
+AUX kitty-0.21.2-flags.patch 2264 BLAKE2B f97139220f48a65fcb7da0cf166b27b9827d5e01f21bc0549f0bf3ce87287f787b167283cf05d82ca15bef7c996da4c512aa6e483900ea4a6c44015de362d11c SHA512 845bd40360730d498de16764423263014bd299c7a9072f12810e859ba851d88d7f1429d2844c7defd0b389694be7ea3dbc2d4e4a4718e35f090440b7d0ef0e84
+AUX kitty-0.21.2-remove-terminfo.patch 666 BLAKE2B e551e919d3a2ea31d53122e1bdd02e492e3ca0f6a0335b94d1e37585f82b2b0340743cd3536b43b9f26865917a01526e09379b02c9f2e55104bb8f4ec8b91b11 SHA512 2ca3ce3bdcbc1c0ec824d496d1682c800960f42289d75d2e92022873c8cf6a6a5095d97241fe5eb3b05949e18ae113719c7542643244d03521c01a857c59f48f
 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
 DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
 DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
+DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
 EBUILD kitty-0.19.3.ebuild 2263 BLAKE2B e7fa23f06184f5542b6356c302b6b6620a911c44f485d1b7cf5069e1917bd93ebdbacc0a7038ca5ea2780f8a9775b8abbf827b5dc99e7978126702d40b1b6472 SHA512 52ba77ad622151de1db9b2a532d20b6f56b3e837d5e27d81fa6c973f8c853eabf82e190b077e9f9558c62a4c69e95e83682c5df1becd3b296deffd8ea9e430b4
 EBUILD kitty-0.20.1.ebuild 2441 BLAKE2B a2ec955b3c8c6933357bd064df5b61444c31320e99955ff549e2f9c4c932daa7e83bca770008e4c326ce47d75ddd9a3187f7328593cce94c8356c71222f3db77 SHA512 5f42829e8227f4bfb6c30f1d8a028802ff5ee5e4bf240010b70fc04c50d239234dc276eab090f9807aba3f8468baa3399413a160d308977ec82c6dda2f15ee74
 EBUILD kitty-0.20.3.ebuild 2358 BLAKE2B 5a2b447aafd0495c1c3541fd7a6bc4e8ca16f4ef5434053ed66c103faf22825675571fedb92e9613895db1ff3b3fd961f8d812df679e8acf885f502fb36105ed SHA512 c409ff2ecf6c3de4fde17ffdeb2261d8e3750921db12462e76970e8b78bd2a3a8b084229085565cb83b505d8fcc08022975686f7cc475c2479f2aa6d7d9866d0
-EBUILD kitty-9999.ebuild 2177 BLAKE2B 60b8835d09ca32f7e948cfa411f8ea19aaaeec27ef2edcd7858081b69967dc77a5a771234e49c62c2f984e53b6fd4aacc11fe3f6296ed151c462e60110a25bc7 SHA512 1eb053e488ba994f77110c6db603dde52f65034cdd162d87eea369cc91720042a6531150e1e20ccf37669e3c23155e813063537013c2883098735b2b87991309
+EBUILD kitty-0.21.2.ebuild 2385 BLAKE2B e3a15649b6306a1f3640a1156bf370c08ebc7067fbfff5ade44edfef4681917e12a18dbd72ae35fa5a5bda78724f02fa6764b720e1e67865abb2b7844d6eb3b5 SHA512 851155bdfc081ec53abe58b45e48939e310447385315c53c629b7efbd8aa8b4fbdcc46cbca96e714af6057c3f3e0ee7865593f2ae608b27038a1260d1cbd2a1c
+EBUILD kitty-9999.ebuild 2193 BLAKE2B c6ca8073d4b7a494de76138d2fa616248709ee63af84d5e73db675c18a31e93dc2b59bd4a5893b8b63b36b94fcf28fd9699fbddbe82e764a43b798a46981689a SHA512 f89506c59ee43361904740007cb859571e5a03259fffa40998f92b805ede9db5dfbf04b0a1c2fb0314347a60199c9d38d4086ee888042c51e5c39fcba498b160
 MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-0.21.2-flags.patch
index 0e773c677650..0e773c677650 100644
--- a/x11-terms/kitty/files/kitty-9999-flags.patch
+++ b/x11-terms/kitty/files/kitty-0.21.2-flags.patch
diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch
index 39fe84b3b2a0..39fe84b3b2a0 100644
--- a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
+++ b/x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch
diff --git a/x11-terms/kitty/kitty-0.21.2.ebuild b/x11-terms/kitty/kitty-0.21.2.ebuild
new file mode 100644
index 000000000000..b24a298847b8
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.21.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit optfeature python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-1.5.0:=
+	media-libs/lcms
+	media-libs/libcanberra
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
+	x11-libs/libxcb[xkb]
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXrandr
+	x11-misc/xkeyboard-config
+	x11-terms/kitty-terminfo
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.17
+	)
+"
+
+DEPEND="${RDEPEND}
+	media-libs/mesa[X]
+	sys-libs/ncurses
+"
+
+BDEPEND="virtual/pkgconfig"
+
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.21.2-flags.patch
+	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+	"${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch
+	"${FILESDIR}"/${PN}-0.20.1-tests.patch
+)
+
+src_prepare() {
+	default
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+		# also disable wayland tests
+		sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die
+		sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die
+	fi
+
+	# respect doc dir
+	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
+
+	tc-export CC
+}
+
+src_compile() {
+	"${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		--update-check-interval=0 \
+		linux-package || die "Failed to compile kitty."
+}
+
+src_test() {
+	export KITTY_CONFIG_DIRECTORY=${T}
+	"${EPYTHON}" test.py || die
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/*
+	dobin linux-package/bin/kitty
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	optfeature "Displaying images in the terminal" virtual/imagemagick-tools
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index e67ade738230..eee99356183e 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -57,8 +57,8 @@ BDEPEND="virtual/pkgconfig"
 	$(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-remove-terminfo.patch
+	"${FILESDIR}"/${PN}-0.21.2-flags.patch
+	"${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch
 	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 )
 
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 705e68e48796..8f628e32f0b5 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,4 +1,4 @@
 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a
 DIST mlterm-3.9.1.tar.gz 4175186 BLAKE2B 030d9144e7c835c895269fd19f89ece7c0dae9ca3f1d4425a1d409b9ac78a530431a4e05ef685d178748a35f9fae77414286a38a412a0496433b8324a22a73dd SHA512 1337b884971b2c4c2c3140388f07927101a947b0268f547611f4f4ece49c8d0954c068789ee7c92c82db114021c77c08416db30233149c8964e827ab901cc870
-EBUILD mlterm-3.9.1-r1.ebuild 3010 BLAKE2B 474dc231171b58e349a2cc64ecaedd72cea37b4e529e2e9a4443df18742759c1856012c3e480804c1ac0918df8d7cbee038ccc2b0c6417636e4e9cc1a04e39a1 SHA512 b9569fdfce2efe0a3871871868ef84d977d247c7a7e71b8817503eabd09768eb481b07ed34a039907e8397a88ddfa609441f262ee83892daa49d603be6ab471e
+EBUILD mlterm-3.9.1-r2.ebuild 2973 BLAKE2B cf51084e396f0979293a1f685053b9d8c26851ee1ba4b60793eaa4c09f928e931a8014461884002a0d31fe4559f48560184d37ff588b7de87e5e6b77fa696ab8 SHA512 343b9295a3d186d7a276ca5cbd63a17b416308ddfdb607565784f565f97505c5f69746d4677cdeb5848118947d63f03b87b57ba9f13d01680da6990c13cc8aa8
 MISC metadata.xml 1172 BLAKE2B dc41afdd4c3092178dc5ff06da8bd06f992ee362c08c068a4b7b1dba7c45ea4874a12506d4737f2189686f2fc1ca5a6ba969a27750a8a62ba28472bab1cc1f66 SHA512 8113ba6d80d5bcb62c71f49bda2cb1febb32cba21387377765b0fa640d00d476e8422b4e1bf2ee5a04d197308f0f4d3871e495fd4b2d43dbea3c59582c9e1453
diff --git a/x11-terms/mlterm/mlterm-3.9.1-r1.ebuild b/x11-terms/mlterm/mlterm-3.9.1-r1.ebuild
deleted file mode 100644
index 540972d7eb7f..000000000000
--- a/x11-terms/mlterm/mlterm-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit desktop
-
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+X bidi brltty cairo canna debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
-REQUIRED_USE="|| ( X fbcon wayland )"
-
-RDEPEND="virtual/libcrypt:=
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-	bidi? ( dev-libs/fribidi )
-	brltty? ( app-accessibility/brltty )
-	cairo? ( x11-libs/cairo[X(+)] )
-	canna? ( app-i18n/canna )
-	fbcon? ( media-fonts/unifont )
-	fcitx? ( app-i18n/fcitx )
-	freewnn? ( app-i18n/freewnn )
-	gtk? ( x11-libs/gtk+:3 )
-	harfbuzz? ( media-libs/harfbuzz[truetype(+)] )
-	ibus? ( app-i18n/ibus )
-	libssh2? ( net-libs/libssh2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	nls? ( virtual/libintl )
-	regis? (
-		|| (
-			media-libs/sdl-ttf
-			media-libs/sdl2-ttf
-		)
-	)
-	scim? ( app-i18n/scim )
-	skk? (
-		|| (
-			virtual/skkserv
-			app-i18n/skk-jisyo
-		)
-	)
-	uim? ( app-i18n/uim )
-	utempter? ( sys-libs/libutempter )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-font.patch )
-DOCS=( doc/{en,ja} )
-
-src_prepare() {
-	# default config
-	sed -i \
-		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \
-		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
-		etc/main
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bidi fribidi)
-		$(use_enable brltty brlapi)
-		$(use_enable canna)
-		$(use_enable debug)
-		$(use_enable fcitx)
-		$(use_enable freewnn wnn)
-		$(use_enable harfbuzz otl)
-		$(use_enable ibus)
-		$(use_enable libssh2 ssh2)
-		$(use_enable m17n-lib m17nlib)
-		$(use_enable nls)
-		$(use_enable scim)
-		$(use_enable skk)
-		$(use_enable uim)
-		$(use_with X x)
-		--with-gui=$(usex X "xlib" "")$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
-		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
-		--with-utmp=$(usex utempter utempter none)
-		--enable-optimize-redrawing
-		--enable-vt52
-		--disable-static
-	)
-
-	local scrollbars="sample,extra"
-	local tools="mlclient,mlcc,mlfc,mlmenu,${PN}-zoom"
-	if use gtk; then
-		myconf+=(
-			--with-gtk=3.0
-			--with-imagelib=gdk-pixbuf
-		)
-		scrollbars+=",pixmap_engine"
-		tools+=",mlconfig,mlimgloader"
-	else
-		myconf+=( --without-gtk )
-	fi
-	if use regis; then
-		tools+=",registobmp"
-	fi
-	myconf+=( --with-scrollbars="${scrollbars}" )
-	myconf+=( --with-tools="${tools}" )
-
-	addpredict /dev/ptmx
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	docinto contrib/icon
-	dodoc contrib/icon/README
-
-	doicon contrib/icon/${PN}*
-	make_desktop_entry ${PN} ${PN} ${PN}-icon "System;TerminalEmulator"
-}
diff --git a/x11-terms/mlterm/mlterm-3.9.1-r2.ebuild b/x11-terms/mlterm/mlterm-3.9.1-r2.ebuild
new file mode 100644
index 000000000000..80652a1c4df1
--- /dev/null
+++ b/x11-terms/mlterm/mlterm-3.9.1-r2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop
+
+DESCRIPTION="A multi-lingual terminal emulator"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="+X bidi brltty cairo debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
+REQUIRED_USE="|| ( X fbcon wayland )"
+
+RDEPEND="virtual/libcrypt:=
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+	bidi? ( dev-libs/fribidi )
+	brltty? ( app-accessibility/brltty )
+	cairo? ( x11-libs/cairo[X(+)] )
+	fbcon? ( media-fonts/unifont )
+	fcitx? ( app-i18n/fcitx )
+	freewnn? ( app-i18n/freewnn )
+	gtk? ( x11-libs/gtk+:3 )
+	harfbuzz? ( media-libs/harfbuzz[truetype(+)] )
+	ibus? ( app-i18n/ibus )
+	libssh2? ( net-libs/libssh2 )
+	m17n-lib? ( dev-libs/m17n-lib )
+	nls? ( virtual/libintl )
+	regis? (
+		|| (
+			media-libs/sdl-ttf
+			media-libs/sdl2-ttf
+		)
+	)
+	scim? ( app-i18n/scim )
+	skk? (
+		|| (
+			virtual/skkserv
+			app-i18n/skk-jisyo
+		)
+	)
+	uim? ( app-i18n/uim )
+	utempter? ( sys-libs/libutempter )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${PN}-font.patch )
+DOCS=( doc/{en,ja} )
+
+src_prepare() {
+	# default config
+	sed -i \
+		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \
+		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
+		etc/main
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bidi fribidi)
+		$(use_enable brltty brlapi)
+		$(use_enable debug)
+		$(use_enable fcitx)
+		$(use_enable freewnn wnn)
+		$(use_enable harfbuzz otl)
+		$(use_enable ibus)
+		$(use_enable libssh2 ssh2)
+		$(use_enable m17n-lib m17nlib)
+		$(use_enable nls)
+		$(use_enable scim)
+		$(use_enable skk)
+		$(use_enable uim)
+		$(use_with X x)
+		--with-gui=$(usex X "xlib" "")$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
+		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
+		--with-utmp=$(usex utempter utempter none)
+		--enable-optimize-redrawing
+		--enable-vt52
+		--disable-canna
+		--disable-static
+	)
+
+	local scrollbars="sample,extra"
+	local tools="mlclient,mlcc,mlfc,mlmenu,${PN}-zoom"
+	if use gtk; then
+		myconf+=(
+			--with-gtk=3.0
+			--with-imagelib=gdk-pixbuf
+		)
+		scrollbars+=",pixmap_engine"
+		tools+=",mlconfig,mlimgloader"
+	else
+		myconf+=( --without-gtk )
+	fi
+	if use regis; then
+		tools+=",registobmp"
+	fi
+	myconf+=( --with-scrollbars="${scrollbars}" )
+	myconf+=( --with-tools="${tools}" )
+
+	addpredict /dev/ptmx
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	docinto contrib/icon
+	dodoc contrib/icon/README
+
+	doicon contrib/icon/${PN}*
+	make_desktop_entry ${PN} ${PN} ${PN}-icon "System;TerminalEmulator"
+}
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 048b020140ca..50eb814e2402 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -10,6 +10,6 @@ DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad
 DIST rxvt-unicode-9.26.tar.bz2 904950 BLAKE2B 1790d02eeadf630cc9bc718288af2f6bd19c3e320d3dbfa44c8cef516c8e790e0abfbfe4e557795749ddd3ec41b8358f6eac623c060240f091b3e84a549151ad SHA512 35560b57730e17c9542ea4a615fd86ce703c4e6421323e8fe1570007737a880fde90d17943e5af9e170be4111b9769f4aa7e57efca5428421fdc1c299112f8e0
 DIST rxvt-unicode-9.26_24-bit-color_aur-20210516+eautoreconf.patch.xz 11716 BLAKE2B 7e18b0f884dbb9574515db8cfb4e1521e1e3287ac194750db288409c7e4d0bb120964e4559ce7e3b91e169935ded93f3af3045fc7c1737a5a6de2710ee2e107b SHA512 8cbcc1c04bdb83996ce08ece559ef9e7f5f530140a2a66291e0ffd049808da60787a68520b4a990dc12e1272de861a85b199ddd10ac8b245eafbfe16dc521199
 EBUILD rxvt-unicode-9.22-r9.ebuild 3305 BLAKE2B 10fa2f2fc53f8da9a499703af03be15e464775ed0f0411de2da90ba669061fa846a3a0bb3f75c61da5de6c71e950e9d79c657f9bc5f542be6e0dd6e420982786 SHA512 0907a7236e52c83777d76dbc758d655b27a78778e42d5c0965715b0f3dd60dd717356dce745cf9bb557a5ee1c4ffe55cad8c2d5d599b1bac6855fe6671dc70d9
-EBUILD rxvt-unicode-9.26-r1.ebuild 2991 BLAKE2B 7d1bb895119ebfd3ee8c7e3d3b3c17a3205e1dd9d8d01ca046b685e221621595e5815502fc97af44a73968a797705d1296e823878275401b7212dc1d9f3cc9f6 SHA512 1e3a66b801942e0593f2ea8705d977d9b4d644a8742479a5cd566d70e664f6143741caa86bfadc4623e9acbab143525ff7c15a4aa465ddc25d91b59a61cd9547
+EBUILD rxvt-unicode-9.26-r2.ebuild 3154 BLAKE2B df176b51dff7fd03116c03a1a624984f0e44c3e494dce1affde7485a877462b84325dca3e81ae2238950e2ca0eca69f64a4e4ab00688ab702892afd0e7aa9d28 SHA512 a3552cfe279b8cca277754bb01ce15c6c5e745720ceb23152cf150d224eff062f198ddf80e91eefd511647680dc46568c6229d2807b185a85fc4e2303fc604a5
 EBUILD rxvt-unicode-9999.ebuild 2163 BLAKE2B bbad76d956512288ef1284526f8ea4d1c039df62868e74078a93640dae7e95361f05d0062e2cf7dcf74e6b5f799e99cf6bd0712263290d9caef92dfd058507e5 SHA512 0b8d154abbc49368df6cbe4efa50e482f7b4226507f2babcc7932ed7ff39dc7d666e544e8f80d797de0f1a1a0047e1763c81254005ca319009a568b87ce84a89
 MISC metadata.xml 1789 BLAKE2B c39987eb81fcc288562d729cd49f6dadbc17229e0b486960ca28a8ab8b039b2486cb0c5c3ded5748340f2d21448f98c836b1d62a3445f9942f1a69a9c9e3c365 SHA512 1e3670faa96a27ae4bb7ec9ad41b475c39e17756c1f53786a172af68c157a774788fee75c22685d03be70b9450664b441408b4ead18e1e267ce69770f2e5afe4
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild
deleted file mode 100644
index 4fa68cb62a3e..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic systemd prefix
-
-COLOUR_PATCH_NAME="${PN}-9.26_24-bit-color_aur-20210516+eautoreconf.patch"
-
-DESCRIPTION="rxvt clone with xft and unicode support"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
-	https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
-	+perl startup-notification unicode3 +utmp +wtmp xft"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r6:=
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
-	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
-	perl? ( dev-lang/perl:= )
-	startup-notification? ( x11-libs/startup-notification )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-# WARNING: will bdepend on >=sys-devel/autoconf-2.71 (masked as of 2021-07-07) if eautoreconf has to be called
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
-	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
-	"${WORKDIR}"/${COLOUR_PATCH_NAME}
-)
-DOCS=(
-	Changes
-	README.FAQ
-	doc/README.xvt
-	doc/changes.txt
-	doc/etc/${PN}.term{cap,info}
-	doc/rxvt-tabbed
-)
-
-src_prepare() {
-	default
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
-
-	# use xsubpp from Prefix - #506500
-	hprefixify -q '"' -w "/xsubpp/" src/Makefile.in
-}
-
-src_configure() {
-	# --enable-everything goes first: the order of the arguments matters
-	econf --enable-everything \
-		$(use_enable 24-bit-color) \
-		$(use_enable 256-color) \
-		$(use_enable blink text-blink) \
-		$(use_enable fading-colors fading) \
-		$(use_enable font-styles) \
-		$(use_enable gdk-pixbuf pixbuf) \
-		$(use_enable iso14755) \
-		$(use_enable mousewheel) \
-		$(use_enable perl) \
-		$(use_enable startup-notification) \
-		$(use_enable unicode3) \
-		$(use_enable utmp) \
-		$(use_enable wtmp) \
-		$(use_enable xft)
-}
-
-src_compile() {
-	default
-
-	sed -i \
-		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
-		"${S}"/doc/rxvt-tabbed || die
-}
-
-src_install() {
-	default
-
-	systemd_douserunit "${FILESDIR}"/urxvtd.service
-	systemd_douserunit "${FILESDIR}"/urxvtd.socket
-
-	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
-		"System;TerminalEmulator"
-}
-
-pkg_postinst() {
-	if use 24-bit-color; then
-		ewarn
-		ewarn "You have enabled 24-bit colour support in ${PN}, which is UNOFFICIAL and INCOMPLETE."
-		ewarn "You may or may not encounter visual glitches or stability issues. When in doubt,"
-		ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)."
-		ewarn
-	fi
-}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild
new file mode 100644
index 000000000000..f439e028a7e1
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic systemd prefix
+
+COLOUR_PATCH_NAME="${PN}-9.26_24-bit-color_aur-20210516+eautoreconf.patch"
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
+	https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
+	+perl startup-notification unicode3 +utmp +wtmp xft"
+
+RDEPEND=">=sys-libs/ncurses-5.7-r6:=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
+	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
+	perl? ( dev-lang/perl:= )
+	startup-notification? ( x11-libs/startup-notification )
+	xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+# WARNING: will bdepend on >=sys-devel/autoconf-2.71 (masked as of 2021-07-07) if eautoreconf has to be called
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
+	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+)
+DOCS=(
+	Changes
+	README.FAQ
+	doc/README.xvt
+	doc/changes.txt
+	doc/etc/${PN}.term{cap,info}
+	doc/rxvt-tabbed
+)
+
+src_prepare() {
+	default
+
+	# Current patch is too aggressive to apply unconditionally, see Bug #801571
+	if use 24-bit-color; then
+		eapply "${WORKDIR}"/${COLOUR_PATCH_NAME}
+	fi
+
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
+	# use xsubpp from Prefix - #506500
+	hprefixify -q '"' -w "/xsubpp/" src/Makefile.in
+}
+
+src_configure() {
+	# --enable-everything goes first: the order of the arguments matters
+	local myconf=(
+		--enable-everything
+		$(use_enable 256-color)
+		$(use_enable blink text-blink)
+		$(use_enable fading-colors fading)
+		$(use_enable font-styles)
+		$(use_enable gdk-pixbuf pixbuf)
+		$(use_enable iso14755)
+		$(use_enable mousewheel)
+		$(use_enable perl)
+		$(use_enable startup-notification)
+		$(use_enable unicode3)
+		$(use_enable utmp)
+		$(use_enable wtmp)
+		$(use_enable xft)
+	)
+	if use 24-bit-color; then
+		myconf+=( --enable-24-bit-color )
+	fi
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		"${S}"/doc/rxvt-tabbed || die
+}
+
+src_install() {
+	default
+
+	systemd_douserunit "${FILESDIR}"/urxvtd.service
+	systemd_douserunit "${FILESDIR}"/urxvtd.socket
+
+	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+		"System;TerminalEmulator"
+}
+
+pkg_postinst() {
+	if use 24-bit-color; then
+		ewarn
+		ewarn "You have enabled 24-bit colour support in ${PN}, which is UNOFFICIAL and INCOMPLETE."
+		ewarn "You may or may not encounter visual glitches or stability issues. When in doubt,"
+		ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)."
+		ewarn
+	fi
+}
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 866b026ae93d..454ffa9ca3cd 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,4 +1,4 @@
 DIST st-0.8.4.tar.gz 47330 BLAKE2B 709278a669414d7d44beba02ebb606853dbaa9cfe71650e40a11d3691d6bee2c0b2e8db57ca2df52776ca564a20f64f3ef7acec8dbad6d66408d314fe26fb794 SHA512 f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a
-EBUILD st-0.8.4.ebuild 1396 BLAKE2B 8e01a488315ebfd3e99db6e98ab6b1c5c5d4d2557d6a80efc0eaad9b951dc8ac5839ce68053fc7b78f082685b4cc9df566eba5a6c1db25b0196b43e56b3406d1 SHA512 0d831ddceaa1371d27b72b7221f0319c34911e3b4574b6e047ee85b0ed2fe9cde399731206e4d217b90e4b2b963e286633c9117906bd897d0666e35c5458238c
+EBUILD st-0.8.4.ebuild 1395 BLAKE2B 6e94dcd8ebaad5dd8d0586b7fba47be61b87bc0a65b6e6fc9e96641eee8e47806b219a172d947a096c98e4ca3fd4fd0fa6805ac9d7119af75f2a85dd8ea282ed SHA512 1e7c151f505b8045cf57cca506d6944ccf588184d211b78250a66b7eb4d51e0ae1330a9b3b2e0ae7c4d2c6222f457e3258c2fc6e1e13ffd44d918c3c10dc0117
 EBUILD st-9999.ebuild 1367 BLAKE2B 17a55761d49fe1ae3c88a730ccae177895e4174b8755680d53836045bfeab38e2eae9cba338d8fbd4d66184b840f46035c9960972108d9d8239ee8c4c7107e5e SHA512 f30b676ff15da80725d672c35bf3581d7424c431dcede7c2412dfe2390fc31e4982de33c7cb2edd0a26d29de29a48a4a264ad9e86ca0518d36bca2f078f7cc4c
 MISC metadata.xml 253 BLAKE2B c8d50d54b7f2ccbb05e040cf1d70b8cdfc51eca4935ec7a7b19ac9c22c5afd74a86ef411c87234ae6d41b60e1e0e5464d5411d888653d1a10ed79af4d77ec9f1 SHA512 80c74cb698ccf335fdf96109313b0916ae86bf371a1024b65704b537cef4234ddf09d6cca8b86c51e04558115e4f7ae7bcd6787ba23e2b4774c36aa4e65b5c52
diff --git a/x11-terms/st/st-0.8.4.ebuild b/x11-terms/st/st-0.8.4.ebuild
index 59951e850953..48b193a1e0cd 100644
--- a/x11-terms/st/st-0.8.4.ebuild
+++ b/x11-terms/st/st-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
 IUSE="savedconfig"
 
 RDEPEND="
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 6e251473f162..7774705b01b3 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index 3877371d1c56..96f8c1aa9bb1 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -1,7 +1,7 @@
-DIST papirus-icon-theme-20210401.tar.gz 27153786 BLAKE2B 95f8b10cd13540f3d2b9f1b1febf0649764d8761f1b4a9d6a2038073b1e8e73e331226ee8c6a4069ac7d26052d49db3b18565ecfd08edd197d4f729769ddca9d SHA512 317eed658897dd55d8393669cb62b2a8f9211120b8e132263c70ddd2f5710973c78230f37bd0f60c75b7b67912d7d2cff2d048dd7b29ffb9c68c73c2ab89ee2b
 DIST papirus-icon-theme-20210501.tar.gz 27320777 BLAKE2B 4839189681e898eacc873a4077d92200085a1dbfb8e4d3298c8e6da0cc9966c9ceea903957abf8f4106538764fa73d27ec8375b8011b1196a4c97c6f8b23ce15 SHA512 65f096428756e52a4c373c206a320e2185fc176238100fd2e8dc9281c7772e3a3381a6ce2d4642be9ff0ea97f5e5292b1a5b631c07459d5863ee7e5cfcced8ac
 DIST papirus-icon-theme-20210601.tar.gz 27817563 BLAKE2B 3f0be519dfdba08f1cc4e43f7ca92e117185ec18b48fa7fb037db686449ffb4f7b4bff949b55d914620d2b29676e43f05542db31daf18ddd8f175ee64328e449 SHA512 30b59e4f05718efb7790fa4e734d91886408adeb7e0adc9d98e7572ba5f4163fa81574ac8811b88106eebefd1b0dc71ffb4be07aac8f4720aa7b2a206a00150a
-EBUILD papirus-icon-theme-20210401.ebuild 526 BLAKE2B e2d070dfe2862e3567eea4a27de10b02bd512361bcc10a320932dc9ca6d0569f87f13fc9382fabb387f0cb19c46266b938a8c2d5de0c0bdca169753ada0ace82 SHA512 003c299b5e41a702e059bf289ce95123e90df76340b9f39be0e2476d4e04aa9aff1327ad11c926a42b711903514a8877a1850860f0ac8c22719fb25c374f5ea3
+DIST papirus-icon-theme-20210701.tar.gz 28129228 BLAKE2B cb4b8891607bfa2b245858c746e590d4a1aca973037669268be682a06ada5074e298666a1d9a9ee9ce66be92778fcf34d3cf306c9864332ea7ebc25f52568f30 SHA512 0ec131bac6a0804d0a61d0c01c30d8d55f4438e93e17849a5c3cb741c4d8aa050977b24101d7f33416a7d617b53c5dca28ce38316e52bd5f72d9034147983d4d
 EBUILD papirus-icon-theme-20210501.ebuild 526 BLAKE2B e2d070dfe2862e3567eea4a27de10b02bd512361bcc10a320932dc9ca6d0569f87f13fc9382fabb387f0cb19c46266b938a8c2d5de0c0bdca169753ada0ace82 SHA512 003c299b5e41a702e059bf289ce95123e90df76340b9f39be0e2476d4e04aa9aff1327ad11c926a42b711903514a8877a1850860f0ac8c22719fb25c374f5ea3
 EBUILD papirus-icon-theme-20210601.ebuild 525 BLAKE2B 9e249794c8469d8c1c89a453e97c4b2c710b87936ec9d660701911e1076b0c29e1e44de2fdda7321c84d5ba4a42a5cc475537cbf59096b4575bafb263f1684ec SHA512 34dd9949f2acfebb50499f9d2d6d08f630dc6f8794eb501906cdf27e192577b200627ca3d415331a4c7f1eb2b507f2afc5eb590abbf913c82fdd7a5dc7a1acd8
+EBUILD papirus-icon-theme-20210701.ebuild 528 BLAKE2B fa548e79eaf5dc78baa49423599053003e2c29f3141277160a7e83efd9e490bf84ddedce4d9c0f47df783972638d874f08e9131e8dc99e7fec565f5c5c66995d SHA512 68fcb1553d7ec3bad175ab2ffea2de4d6b30a3490febc3f26542b79fbcb43f889ee4181b3c34c5b0774374077bcb5f85089eeaa57cdb954ac636f8244064fc79
 MISC metadata.xml 614 BLAKE2B 267c9f0f783830dfb301b27762e98525ee0acef15b6b11aba2d6d21418e9e0c114a0d9893583d4c98120bc6f96d8730034a1af9461517c1d429358a42c445b7c SHA512 a9099c1f35dd984fa9364aaba6ee943102a2165c141e1977d018ec9460e12cda70655871029d834fd4cc59886b1e4b556c4c8fe612aa6dcd73bd09fb1ba99433
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210401.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210401.ebuild
deleted file mode 100644
index fa344b3837b2..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210401.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Free and open source SVG icon theme"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210701.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210701.ebuild
new file mode 100644
index 000000000000..27d277b2e336
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210701.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="Free and open source SVG icon theme"
+HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
+SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r ePapirus Papirus{,-Dark,-Light}
+
+}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 8623f36352f3..df6b1b05d518 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index fb95c28bafa0..4954ef153fe0 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,6 +1,6 @@
 AUX dwm-session2 170 BLAKE2B 10158b31ae25da00d7034ce88c321f0703f3374bcf0140ce4ad3ff00483ca634075b2b5b4fc3a97b105e66128c1c882154cd815bb420d473ad1e6af0ff1dce75 SHA512 e882c447824ec430862f9af968aad0f2276b7ab28cf60b8f8e49551e3b9cc2a249429987f4a7d6577eb18182b7709fb4d7c5c4651192a04dc2394ba9afa89f08
 AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bca7a3e03af26222fd569aa3c38fa486e4998b64808fee5a3f17d4891eea0b410c54f726850004 SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8
 DIST dwm-6.2.tar.gz 25273 BLAKE2B 2bb9e5b900a1d73f3eb94cb8454580ec98930dbacbabec1f2bbd394eb96696873434b6ddea4ac95eb9d171de2c09c5d4ca0b30649836f7e25f4769f44d25a6eb SHA512 01abcab954e5b7c20d011e6fd9c28025271fea2e85610c928812f7c6a09f99d7f9e93d11ffc2d6a7aca894b3fa7e507c6c2fe5f26ff5ddcfc650a9bbaaa41e06
-EBUILD dwm-6.2.ebuild 1082 BLAKE2B af26ecd1f549e53bb570170d7ed1d19564c017651d84a0aa09481aec41ec360ee7d6adcfc69470320578de269d6acb15bc360f61a557df26a664513e96717564 SHA512 c07e11b8cd40c564aefa8fd5f253d977b8fd1d8b8216afe02e0a63c755441bace04e5310ea116209cce8b57e85ea86af957e0c4b3d27b3c271f6fa9a9016933e
+EBUILD dwm-6.2.ebuild 1081 BLAKE2B fcb099706d18beaf5bf66453ad4f8122e4f846624f0e76f28dc9ed2d9d2337fe389db0fe1631268e5bddaee2f249b6afcafca04330746172da7191f5ce4f8d65 SHA512 445d9bf397ed86ffc1427f0accaf253c33b0de94a8269bd0077c77fe59931c96cab890e5ae2e163831963b54651f3b103457662ae5cc4a702c3088d1c5012a30
 EBUILD dwm-9999.ebuild 1051 BLAKE2B b6cb69a1d68690bc904fd8276f60e3a4384cbcb54e7e334fe4562495485a7e382e613cd0481c63634c645c89012ad5a77375b8b9a8e297627ab917493a5a5e20 SHA512 377b6dbc10ef70c55e66af4c89b304ce6f146ccc81041ab814bb30e7bacba809e24383317bf9a932cf49bae025b4951c81f8c42dbb554d8cbe7113fd79f39482
 MISC metadata.xml 502 BLAKE2B b05ffe00847e6d0b692d8a2767cf8da56a2b3a39a4d9fbf7a85e061a766c7c678cf23aff242d64533ee08fe92c80e23738fad353dfb811ffdf37671e5017ca5f SHA512 4759b9534c9076acafaa85ccb6b56306f616604357b55a95a7dc3bc91f4a05f65042b06069586a2febad362c9c27275faad2821cbcc9045b673ddca1f84e00d9
diff --git a/x11-wm/dwm/dwm-6.2.ebuild b/x11-wm/dwm/dwm-6.2.ebuild
index 70a24ff487d9..cbc0d85abd5d 100644
--- a/x11-wm/dwm/dwm-6.2.ebuild
+++ b/x11-wm/dwm/dwm-6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 030432b7d4fb..091319e58492 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,4 @@
 DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3 SHA512 73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c
-EBUILD herbstluftwm-0.9.3.ebuild 2802 BLAKE2B c2fffe4ff4474fad1493863b90af5e8cf165d58a5aee0a07542ee5dce0c0a3346b934d90745f19bf6c7dbd42eff3bbb2d6bd2e8f8b23d81acd42bd5e39224e8b SHA512 c616a044c4bfe582502475b47c012bbc102f82cfc1c0a35067b1065331dbd5a3b74f5dd564079549d2ee5228de6a59b475b4bb4cb30ca370d42a0914140693e3
-EBUILD herbstluftwm-9999.ebuild 2804 BLAKE2B 3b0dfd324aacc7f358b6de74a575558843d1d78b26db8372c7c792204df22ca1b7d36b83d4c61800639027d1573489bb32624a73ec65f0cef86e607529af35ed SHA512 b012accaea69ca4bd340fc38d4317caab55a3468a4ee2bef34eb2d0b720258935352d1fc9f7df46158399f29bbcc23bd7fa4c0eaef1f513cae6b773402f495e3
+EBUILD herbstluftwm-0.9.3.ebuild 2982 BLAKE2B e9cbbe5b76e1553cdf2bd3197b93a3e7ad22612b8284c8ef20008bf9fab94f2117879f2f3c529766048f03ba0a22035750a62f5c8d78ab7b2d8e5ddb192bbcfc SHA512 107c2485d18e30abac5801a946cd565700ce90d75057a762ecb4c8a8d503b9c9f011396b6bf746ae90eb7da922ef5b043c915eea57bf348ea386b66b55c53d53
+EBUILD herbstluftwm-9999.ebuild 2984 BLAKE2B df15aa0ba6046e3f5aaeee12e872a544a1b94aaa96a27ca477493ae7be13cf18700474589198d1280cf44a8760061e609f0151338e91a5ad8fce5754dc139c3a SHA512 a60df5c98a7ad7329161d5ea4f26ac302f89f1ae1384aec815f0f91e11bc03e15bcdc3313a4cc43fa9961773c0c11e358800c5f5427a45ce5e87ecbb2a52025a
 MISC metadata.xml 448 BLAKE2B 454fa91d4bf0e1b7f3bf133e1de6cecd55588ac8c49d15c6624f0baf3fcc08663f52c972a8d7ebcb41107825f5bd70c2b8f7e67e10db674d0493d600a2f88de4 SHA512 22390ec4b20611620ea61bc0d93e7f9e67c154843bd3094592f4b69728eccbaaa5ea811872f5d63d55e0c7e0d0c65d7941eb2e57c74c85bfa63469fd4432531d
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
index 65e8342992a3..fe478ccf2e52 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
@@ -129,5 +129,12 @@ distutils_enable_tests pytest
 src_test() {
 	ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient"
 	ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm"
+
+	pushd python > /dev/null || die
+	distutils_install_for_testing
+	popd > /dev/null || die
+
+	# Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
+	export PYTHONPATH
 	python_test
 }
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index c167e7f353e2..37035a6a5ff8 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -129,5 +129,12 @@ distutils_enable_tests pytest
 src_test() {
 	ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient"
 	ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm"
+
+	pushd python > /dev/null || die
+	distutils_install_for_testing
+	popd > /dev/null || die
+
+	# Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
+	export PYTHONPATH
 	python_test
 }
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index d25f65ca44b9..d7f5ed30912f 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,6 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-DIST icewm-2.3.4.tar.lz 1708239 BLAKE2B d19a7864642795b93a8d30a63c6ba0dcac4ee9b9e3a2b9e314e115aea8200f688ed46f70268f16d09c8c7a02c4ac9653c3937d1b029bdc5b69ddd5d3fba658c9 SHA512 97d613c3dda84bc52d6b31772df5422aef84b6055b7240e90e5e1a5433d0250ad8fde7a01c4d5c3e714265fed4a3feefde3d6e6b4e1433896c16d2b4708edb1a
 DIST icewm-2.5.0.tar.lz 1722504 BLAKE2B caf5d61559dd5bb25583bebeaca82e54049e2a97d8e5eeb93942908481f68614cfe55afd4041b5d60e58e732fef1694f67c5918a130bc55b252ebae67a51482a SHA512 1f59b4dbe90ca47031e5abf999cdb23a8e9ea956d5a76a0dde9b3489dec4530bf0ce72e10b337615d0bcadf04007b00a7db6f43082504bef65b109f9115d9f52
 DIST icewm-2.6.0.tar.lz 1722772 BLAKE2B 4d7055b77d88d0731517b668f525161a97b571f68cf0b2944e9b364653cb022f0b29d664ccc9539d1807005ab8954aa3ce31244911c2fafaa673ef5afeb447f1 SHA512 fe491c8c59aa530d48a20134857c787eccfeda5bd9529e063d865bd3c5f243ef41fbecba40aa06e7fa8037af89839958095debebc5d9b1acc9b5670bd0e12eb6
-EBUILD icewm-2.3.4.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
 EBUILD icewm-2.5.0.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
 EBUILD icewm-2.6.0.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-2.3.4.ebuild b/x11-wm/icewm/icewm-2.3.4.ebuild
deleted file mode 100644
index 6215cdd777d4..000000000000
--- a/x11-wm/icewm/icewm-2.3.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools unpacker
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-REQUIRED_USE="|| ( alsa ao )"
-#?? ( gdk-pixbuf imlib )
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-# These are the core dependencies of icewm.
-# Look into configure.ac and search for PKG_CHECK_MODULES([CORE]
-CORE_DEPEND="
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-"
-
-RDEPEND="
-	${CORE_DEPEND}
-	dev-libs/glib:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	alsa? (
-		media-libs/alsa-lib
-		media-libs/libsndfile[alsa]
-	)
-	ao? (
-		media-libs/libao
-		media-libs/libsndfile
-	)
-	bidi? ( dev-libs/fribidi )
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	!gdk-pixbuf? (
-		imlib? (
-			gnome-base/librsvg:2
-			media-libs/imlib2
-		)
-		!imlib? (
-			media-libs/libpng:0=
-			virtual/jpeg
-		)
-	)
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	$(unpacker_src_uri_depends)
-	x11-base/xorg-proto
-	gdk-pixbuf? ( gnome-base/librsvg:2 )
-"
-
-BDEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.8 )
-"
-
-pkg_pretend() {
-	if use gdk-pixbuf && use imlib ; then
-		einfo 'Confilcting USE flags have been enabled:'
-		einfo '"gdk-pixbuf" and "imlib" exclude each other!'
-		einfo 'Using "gdk-pixbuf".'
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local icesound
-	if use alsa && use ao ; then
-		icesound="alsa,ao"
-	elif use alsa ; then
-		icesound="alsa"
-	elif use ao ; then
-		icesound="ao"
-	fi
-
-	local myconf=(
-		--enable-logevents
-		--enable-xrandr
-		--with-cfgdir="${EPREFIX}"/etc/icewm
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--with-icesound="${icesound}"
-		--with-libdir="${EPREFIX}"/usr/share/icewm
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable debug logevents)
-		$(use_enable gdk-pixbuf)
-		$(use_enable imlib imlib2)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-shape
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-		)
-	fi
-
-	econf "${myconf[@]}"
-
-	sed \
-		-e "s:/icewm-\$(VERSION)::" \
-		-e "s:ungif:gif:" \
-		-i src/Makefile || die
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
-
-	default
-
-	docinto html
-	dodoc doc/icewm.html
-	dodoc man/*.html
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 9101a466b6ab..eb9de8d78da0 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -6,9 +6,11 @@ DIST mutter-40.1-r1-patchset.tar.xz 25312 BLAKE2B bcb58a50d63076ec012a2866dcbaba
 DIST mutter-40.1.tar.xz 2680816 BLAKE2B 924fd977e1c6669abd5adea1855c3a0a4027ae7e96ab3c6ccbe3d54da5f431e386f9c2f8f060dc9cd066c7414a2bb90a05760fa3413c6805cd8b73cb5d3aed90 SHA512 c2b6603e1d55492916f742f9cb8e15588cb30e78c37de987404ac40d3befa65e417184305ad87fdffc41052a094790f9e324a1ea7482e5de4f0439dceefed118
 DIST mutter-40.2.1.tar.xz 2681780 BLAKE2B b273bc9979e285bd6c48afb367f0973114dbc9af086b5aadf41e6dc1cca54f7ca25975a4e2fe5b4acb020fa8f5fc136f0661be2b06deaacf25c363a187567b73 SHA512 f9b50b10f6a4ee8ba3d8d721734d25184675c2af1f14cb8da8cac6a6a60397c36bf39e87db06ac0ed8a0f3cbf78859e57fa965ac0d2593ed9c6aa9692d90d5b2
 DIST mutter-40.2.tar.xz 2681840 BLAKE2B 7785086a9aff9f273735e0a0716a8535a7e69b35c5b4312d8a363b4058e84e499a15c1d9b085c40d1303e69e661fd74c286da89a83a27d86e1a56c537f7e2e18 SHA512 9582004efde7a4b2ad21c390f4a4558c99709e21bdcac3f161f185612de9aaeb60cbfcf5dd1684726ae18244540aa4b6bcd2b9f362b92eb8c74304c43c9e1113
+DIST mutter-40.3.tar.xz 2682460 BLAKE2B 41e505adc9aa6ca53d1f43d71051bc09c0f4f528803f10c8f4ad8fe2cf28f5a02a3d3dca1a4a02b702a40177501663e20b68415295805b6c0503690dbb5e53fc SHA512 beb9cb1b8dee153fe204aa5d799e4ba44380c8483362ab4f7b149c715be6fa929345386b78af73ca6ae7e864dd2923e5c0de88404f8ffe5d22f2ae9238bcc074
 EBUILD mutter-3.36.7-r1.ebuild 4749 BLAKE2B 69075255e249f22d91a87e440d986cfbd125c91bc878f715a1430d90996bf4183c2281c88b935ca44b8940ddf4f7850f5a42d7550f138ddead7eb6ddd62a4a8e SHA512 c2a5b423e410bb6a8a9304acea03fbefba0ce3385d3dabb8adc46baa63d9daef02a59b051a371b62acdc6acfed3c443a8cc229928a2305a11766005ded637c2a
 EBUILD mutter-40.1-r2.ebuild 4698 BLAKE2B 2e596db628643d0ea02b06c1f0a4c1fa3a59cd4f179edadacaf903b238af01e200745977570db0a9d70e3f27655bc685ca734977284f0be6ffa3029d92d85b77 SHA512 c95097736269f708215ee70990be54feadf580898911d859d3d63b4f3991646016625be586c58f718e3904dc80d3b118d4824ea528675894252ac46a0d81b8bf
 EBUILD mutter-40.1-r4.ebuild 4795 BLAKE2B 81cdf5e0012ab9145a9e131f2701dc1335833f177c336b8880d89b23cdbb7afcdd45baaa70232a81424116fd4840e140f0a59a2e74a08e852b6d399a32ad496d SHA512 4d7b383a6185c169a0b2ee6e5139fc614b3c9ff4f19094c9da6783174d0fcd255c191170c31786dd5ffc78531fb014c7253ee5d0f90f36a377f356c885bd5915
 EBUILD mutter-40.2-r1.ebuild 4701 BLAKE2B 1785d0505f6182894f187c84d2d9b04eb7d7914d0182a35ce78f0ba9984aa2fc22df955e092d1583d1e3965fa6437d3815cb081620a3d4ead6a893f0154fa9aa SHA512 42423c360756ec6d3ba7bb3e4d1da26df9c15d4b1e7f3ae139382a24c1e0b85afd77c2fe4f28ff364c794e611b68b15195a5b07ad3cfa1c59422acfb2d689a1a
 EBUILD mutter-40.2.1.ebuild 4857 BLAKE2B 7d7c1edaf536ead824e60131fa5e92e8c1a0fa612f0f2548d4669648dd0453c4325bd05f89163cb6fe9893619d1cdaf32038b0a3154c6fd4452c579cc0e72276 SHA512 43d5d57b0d96cb0a98a8b687672c7398cc23dd99990179d7a9031e669996f9a8ee73e2d83f31d36379844536c23463468db7f21743098478015ffb4789eec777
+EBUILD mutter-40.3.ebuild 4860 BLAKE2B 3b5842456b49e3b986ab280ed7e98e593173f9523c6b441032dd848095924d4007b7eca404b0fda62ee2a7782492b20915ae71febf5011dd0119d050e781d61e SHA512 c161dfc7642449768a163485de2f3e5604b9f967be2babcf463e01f73d8b84d1d33d3a93080f93e764f8744390c346ea7f0b1e2f49d0aa9097e4c99d162d954f
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/mutter-40.3.ebuild b/x11-wm/mutter/mutter-40.3.ebuild
new file mode 100644
index 000000000000..0e7403318d26
--- /dev/null
+++ b/x11-wm/mutter/mutter-40.3.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson udev virtualx xdg
+
+DESCRIPTION="GNOME compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	>=x11-libs/libX11-1.7.0
+	>=media-libs/graphene-1.10.2[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.46[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
+	>=dev-libs/glib-2.67.3:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	gnome-base/gnome-desktop:3=
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	media-libs/mesa[X(+),egl]
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	wayland? (
+		>=dev-libs/wayland-protocols-1.19
+		>=dev-libs/wayland-1.18.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.15.0
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
+		x11-base/xorg-server[wayland]
+		video_cards_nvidia? ( gui-libs/egl-wayland )
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+"
+# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
+BDEPEND="
+	dev-libs/wayland
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	wayland? (
+		>=sys-kernel/linux-headers-4.4
+		|| (
+			x11-libs/libxcvt
+			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
+)
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		$(meson_use udev)
+		-Dudev_dir=$(get_udevdir)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		-Dnative_tests=false
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+
+	if use wayland && use video_cards_nvidia; then
+		emesonargs+=(
+			-Degl_device=true
+			-Dwayland_eglstream=true
+		)
+	else
+		emsonargs+=(
+			-Degl_device=false
+			-Dwayland_eglstream=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index e3a06341668d..97a38c35f6ed 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -5,8 +5,10 @@ AUX xpra-4.0.3-suid-warning.patch 731 BLAKE2B 6e576c088bc59ee7a52e15a8fbceb9117a
 AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
 DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c SHA512 e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39
+DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9 SHA512 553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
 EBUILD xpra-3.0.5-r2.ebuild 3834 BLAKE2B 774548ad7f6e2f9f1cf4751d8ef1119e7fb93ac3d1fb9a1d89367e6ec8a20430fd3787a8681b7abd72a2da4e7b05c4f078f92a7a13fcf96b8e448449aa490254 SHA512 f019c875c6e5feffb6ff09d4ef2c3c9cfeb360c98e03a59863e5c3e0b43c4e143d24434559659f5e85577e2e80a332e7fd7889a48041c32b8e97f810c50be598
 EBUILD xpra-4.1.3.ebuild 4103 BLAKE2B d279ddb09bcb0c784d98387b7e4ef61b73a550b865085f9d24f1863902759cff57f573df5fcb1b8e2c0f1e2e93f09b9e49ec95b323157f3d965e41e40e5e0257 SHA512 27330d1b6a9e95ab2c93bf6620fe357b863d3a1493ea129c6d3154ccd953ed4379f4b21fb8858177d040f5bb01bfa205e2aa49d41c72c5a327453be4c0a1d982
+EBUILD xpra-4.2.1.ebuild 4174 BLAKE2B 407e6d7a2da77c89bac668cb3708f519cd72133f7cea2cd3c7d039e4706417298929d102d24f13b0392f63b4dedbe4bd66feb838d51d26131fdd7d6f4c1b7bff SHA512 35ae0360bfcd7978c5b38be30498e26c78b7c02a6ffa2c18acb2755c08e70356056ab793b896e6e95cf08c24a6349780560054b5e321f318b1c4f53e5cf3fe65
 EBUILD xpra-4.2.ebuild 4174 BLAKE2B 407e6d7a2da77c89bac668cb3708f519cd72133f7cea2cd3c7d039e4706417298929d102d24f13b0392f63b4dedbe4bd66feb838d51d26131fdd7d6f4c1b7bff SHA512 35ae0360bfcd7978c5b38be30498e26c78b7c02a6ffa2c18acb2755c08e70356056ab793b896e6e95cf08c24a6349780560054b5e321f318b1c4f53e5cf3fe65
 MISC metadata.xml 1250 BLAKE2B 925a45bc8dccabae8b537ac5b2bc5ed8a1add84a7fb42d69165fe2a79ec38bc87ac264f16649fa37282dfb4a411e2cc5579802f61dde8129df2f5dade3850bf5 SHA512 a4efcabc1ef671a0c47bc4201b2fd89a0452f620e05d3d9419ee6ba19728275ba7405b943e151944939b6e9cba20ed321c6021b84a438bef61094ca0bd05b204
diff --git a/x11-wm/xpra/xpra-4.2.1.ebuild b/x11-wm/xpra/xpra-4.2.1.ebuild
new file mode 100644
index 000000000000..1f8dc0a75fa6
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.2.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg distutils-r1 tmpfiles prefix udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="https://xpra.org/"
+SRC_URI="https://xpra.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( client server )
+	cups? ( dbus )
+	opengl? ( client )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+		opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+		sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	brotli? ( app-arch/brotli )
+	csc? ( >=media-video/ffmpeg-1.2.2:0= )
+	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+	jpeg? ( media-libs/libjpeg-turbo )
+	pulseaudio? (
+		media-sound/pulseaudio
+		media-plugins/gst-plugins-pulse:1.0
+	)
+	sound? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	vpx? ( media-libs/libvpx media-video/ffmpeg )
+	webp? ( media-libs/libwebp )
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/netifaces[${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+		cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+		lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+		opengl? (
+			client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+		)
+		webcam? (
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pyinotify[${PYTHON_USEDEP}]
+			media-libs/opencv[${PYTHON_USEDEP},python]
+		)
+	')
+	acct-group/xpra
+	virtual/ssh
+	x11-apps/xmodmap
+	ibus? ( app-i18n/ibus )
+	pinentry? ( app-crypt/pinentry )
+	server? (
+		x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
+	')
+	doc? ( app-text/pandoc )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
+	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
+)
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+
+	xdg_pkg_postinst
+}
+
+python_prepare_all() {
+	hprefixify -w '/os.path/' setup.py
+	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
+		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
+
+	sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+		-i setup.py || die
+
+	if use minimal; then
+		sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
+			-i setup.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+		-i setup.py || die
+
+	mydistutilsargs=(
+		--without-PIC
+		--without-Xdummy
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		--without-csc_libyuv
+		--without-cuda_rebuild
+		--without-cuda_kernels
+		$(use_with cups printing)
+		--without-debug
+		$(use_with dbus)
+		$(use_with doc docs)
+		$(use_with ffmpeg dec_avcodec2)
+		$(use_with ffmpeg enc_ffmpeg)
+		$(use_with ffmpeg enc_x264)
+		$(use_with ffmpeg enc_x265)
+		--with-gtk3
+		$(use_with jpeg jpeg_encoder)
+		$(use_with jpeg jpeg_decoder)
+		--without-mdns
+		$(use_with opengl)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		--with-strict
+		$(use_with vpx)
+		--with-warn
+		$(use_with webcam)
+		$(use_with webp)
+		--with-x11
+	)
+
+	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+}
+
+python_install_all() {
+	distutils-r1_python_prepare_all
+
+	# Move udev dir to the right place.
+	local dir=$(get_udevdir)
+	dodir "${dir%/*}"
+	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 3c1932b07f1e..68f09be19682 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 68cd00733a88..0fe6a4550706 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-panel-4.16.2.tar.bz2 1381569 BLAKE2B d4b8455e31f942d0facfc0d90b14fb050142b3d8b3d0e61d5b687f973769e2888ea7f058c4f6a86f96dbd67329719ef49e72896774ac36591c2793847aa411ba SHA512 25b817a9abc4cea57cd29c4558236a5581a03ccb50796c83f7ca1b292e8aa83c7a39b089619959b6f6fd9c5c8bbdf950d9bba1b5c4fb3d0a95cabad8a9ca763d
 DIST xfce4-panel-4.16.3.tar.bz2 1382659 BLAKE2B c7c6b189fbe782df716c4e9b494c7a407a41f60106623c9960119c9cc535d337037bbd6fded40761d0ed918fde42366853a6188120adbfa1e25cc61f5eba9e37 SHA512 08ac27d59a4e08229e170a1c7ffb7a981ae1d3ab1548850cd815a0de64c47d1c20d69f6585c2ec9890b060483bfd569fc52ebd88db0d1264ebca00c1b0bb38fa
-EBUILD xfce4-panel-4.16.2-r1.ebuild 1529 BLAKE2B 9b479e7c3535a274d6fe4570c55487a03101b915a5acce92633f034406d83c019c86287feee5a60e51902329015622826ffcacbe9a0d9b8cb2148d04f802be6c SHA512 4ab0868367fedc799a23c283c99b5aa998c66c97c9ad8a95ea04e10e9ba277457a4631c418acf4c70154670518b8eca8ceea1a049a60e6489ff8202870bf24bb
-EBUILD xfce4-panel-4.16.3.ebuild 1561 BLAKE2B 2fdf36d0da90f6afe2eff3e0c61e64cb0d57be90cbaae9ac4c4f8246882ef02eb9e604f7965af1cc55b4208cda91905ead0df3513c484c30c25900a4f2398373 SHA512 4695b4df675e5c4af81830fd8400b734086bfdc9a6af8c64e6a3943b97b8966724d1d3754fdb7af4eead15ad2fe83ce8a924abe54977393e97834e96b267f8a2
+EBUILD xfce4-panel-4.16.3.ebuild 1560 BLAKE2B 387b7a22bad0e11127f7ba740dba937b3ebe20e07d24d24cbf64ce815489534819c06d203bca78a44c4b00fa495ac727baf7cc4775e3e3cf9cf34232f6993f35 SHA512 4916343f4700ef5d5ae421bdbca3099b440ee96a0bfd11427f5b27a3b4d31106db0989a8d7e84d7c69d01a7988ef1e69ce28d6df1f32b6a7bbabaacd2a0ca1a6
 MISC metadata.xml 376 BLAKE2B 8e3bae72680451c622ad0c7594d756af6027e70fcc35e6f48fab7b63f511322034311ef496595c9edf301d668f4aeea3f8d6950e8db5555b3f90905d60aad8fb SHA512 75403270836578c8c7207777feac8b88b784976f3b887c472d29fdfb5bad7ad738eeae4ec0739a71993988f41378da1187b93b010cddc2d227a59ae9995f67a4
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.2-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.2-r1.ebuild
deleted file mode 100644
index 8d87e930110b..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vala xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbusmenu introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libwnck:3
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-0.5:=
-	>=xfce-base/libxfce4ui-4.15.8:=
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?]
-	>=xfce-base/xfconf-4.13:=
-	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-lang/perl
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable dbusmenu dbusmenu-gtk3)
-		$(use_enable vala)
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.3.ebuild
index 5b54300b0c92..77e87b0de2a0 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.3.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.16.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"